diff --git a/AGENTS.md b/AGENTS.md
index 3dad62d5b..50e6250d7 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -197,14 +197,14 @@ The consent page offers minimal, read-only and full-access templates. Minimal is
 `?codemode=false` asks for direct tools; `?experimentalForge=true` changes how they are built: from code forge generates instead of `mcp-tools.json`. The flag is opt-in while the forge tools soak, and is meant to become how `?codemode=false` works. Code Mode ignores it, since it already reads the Forge spec. The earlier `?forge=true` preview param is gone; it now serves Code Mode.
 
 
-- `src/generated/forge-mcp/` is TypeScript that `forge openapi.forge.json --target mcp` writes, committed and never edited by hand. Each group's `tools.ts` has its tools: schema, hints, the method's extensions, and a `request(args)` function that builds the API request. Each tool also has `responses`: the JSON Schema of every response body the method declares, by status, from the shared `outputs.ts` models; `tools/list` never sends them (see Response schema checks). Each tool with a JSON body on every 2xx response also has `outputSchema`, that body's schema (or `anyOf` the distinct ones) with the models it reaches in `$defs`; `listTools` sends it only when asked (see the output schema bullet below). `schemas.ts` files hold the shared argument models, `source.json` the `openapi.forge.json` release they came from (written by `generate-tools.ts`), `index.ts` exports every tool, `README.md` lists the methods without a tool and why, and `_/tool.ts` is forge's runtime: `listTools`, `toolsByName`, and `buildRequest`, which returns a call's request as plain data (`{ method, url, headers, body? }`) that `plan()` hands over RPC as it is. Forge generates no server. oxfmt and oxlint skip it
+- `src/generated/forge-mcp/` is TypeScript that `forge openapi.forge.json --target mcp` writes, committed and never edited by hand. Each group's `tools.ts` has its tools: schema, hints, the method's extensions, and a `request(args)` function that builds the API request. Each tool also has `responses`: the JSON Schema of every response body the method declares, by status, from the shared `outputs.ts` models; `tools/list` never sends them (see Response schema checks). Each tool with a JSON body on every 2xx response also has `outputSchema`, that body's schema (or `anyOf` the distinct ones) with the models it reaches in `$defs`; `listTools` sends it only when asked (see the output schema bullet below). `schemas.ts` files hold the shared argument models, `source.json` the `openapi.forge.json` release they came from (written by `generate-tools.ts`), `index.ts` exports every tool, `README.md` lists the methods without a tool and why, and `_/tool.ts` is forge's runtime: `listTools`, `toolsByName`, `param`/`pathParam`, which read a parameter from the `path`, `query` or `headers` argument, and `buildRequest`, which returns a call's request as plain data (`{ method, url, headers, body? }`) that `plan()` hands over RPC as it is. Forge generates no server. oxfmt and oxlint skip it
 - The MCP target is proposed for `cloudflare/forge`'s main in cloudflare/forge#71; until it merges, `forge.json` pins a commit of that PR's `mcp` branch. `FORGE_BINARY=… npm run generate:tools` regenerates locally. `.github/workflows/forge-tools.yml` builds that forge, regenerates from the latest `openapi.forge.json` every six hours, runs the type check and tests, and opens or updates the `bot/forge-tools` pull request when the code changes. That pull request also moves `source.json`, the spec pin Code Mode follows, and its summary counts the tools with permissions before and after, warning when a release drops many. The pull request is opened with `GITHUB_TOKEN`, so CI doesn't run on it; the workflow's own type check and tests are the check. Merging it deploys both Workers through Workers Builds. To change the generator, bump `forge.json`'s `ref`
 - The generated tools run in their own Worker, the **forge tools service** (`src/forge-tools/worker.ts`, `wrangler.forge-tools.jsonc`, `cloudflare-api-mcp-forge-tools[-staging|-dev]`), which the main Worker reaches through its `FORGE_TOOLS` service binding. Code Mode isolates never compile the ~10 MB of generated code: workerd compiles every module a Worker uploads at startup, so in the main Worker a lazy import still cost ~27 ms per isolate, and a separate uploaded module didn't help. The service holds no credentials, makes no requests, and has no route. Its RPC methods are `search(code)`, which runs Code Mode's search code in a `LOADER` sandbox against the spec, `listJson({ outputSchema })`, the tools as `tools/list` sends them as one JSON string, with or without their output schemas, which the main Worker parses once per isolate (`getForgeToolList()` in `src/isolate-cache.ts`; decoding ~3,000 nested objects over RPC cost ~200–300 ms of CPU per `tools/list`), `plan(name, args, { baseUrl, sessionAccountId })`, the request a call makes (`src/forge-tools/plan.ts`), `checkResponse(...)`, which checks a trimmed response against the generated response schemas, and `specArtifact(name)`, which streams one of the pinned release's spec artifacts (`spec.json`, `products.json`, `mcp-tools.json`). `scripts/generate-tools.ts` writes those to `src/generated/spec/` as text modules from the same release as the tools (`src/forge-tools/spec.ts` imports them), so a pin bump carries both. It returns a stream because `spec.json` (~27 MB) is close to RPC's 32 MiB message limit. The service bundle is ~51 MB of Workers' 64 MiB limit, about 31 MB of it the spec
-- `src/forge-tools/cloudflare.ts` applies the Cloudflare policy once per service isolate: `account_id` is optional with one description, and so is a merged tool's `account_or_zone_id` (the document gives `account_or_zone` its values). Permissions come from each tool's `x-api-token-group` extension, which clients never see
+- `src/forge-tools/cloudflare.ts` applies the Cloudflare policy once per service isolate: `path.account_id` is optional with one description, and so is a merged tool's `path.account_or_zone_id` (the document gives `account_or_zone` its values); when that leaves no path parameter required, `path` is optional too. Permissions come from each tool's `x-api-token-group` extension, which clients never see
 - `src/tools/forge-tools.ts`, in the main Worker, serves `?codemode=false&experimentalForge=true`: `docs` and `whoami` itself, and the generated tools from the service. It sends each planned request with the session's token, which never leaves the main Worker, and explains refused calls and steps up OAuth scopes like the other direct tools
 - `&experimentalOutputSchema=true` (only with `?codemode=false&experimentalForge=true`) turns on output schemas for 2026-07-28 requests: `tools/list` sends each tool's generated `outputSchema`, and a successful call returns the whole response body, which its output schema describes, as `structuredContent`, never truncated, next to the text, which stays the whole response. A request is 2026-07-28 when its `_meta` envelope names a protocol version (`ctx.mcpReq.envelope`); 2025-era requests are served as without the flag, since their clients expect object output schemas and most generated ones are a `$ref`, `allOf` or scalar. The output schemas come straight from the generator, so the Worker only picks a listing. They are the soak's schemas, so a strict client will reject results the response schema checks flag (Hyperdrive's write-only `origin.password`, cloudflare/forge#63). The listing grows from ~6 MB to ~12 MB (0.64 to 0.98 MB gzipped), loaded only when asked for
 - Workers Builds deploys the service and the main Worker on every push to `main`. Ship a new RPC method in the service before the main Worker calls it, and in a new environment deploy the service first (`npm run deploy:forge-tools` / `deploy:forge-tools:prod`), since the main Worker binds to it. `npm run dev` runs both, and `npm run types` reads both configs to type the binding. Vitest builds the service with `wrangler deploy --dry-run` and runs it as an auxiliary Worker, so tests call it over the real binding
-- Tool names are forge's (`d1_list`, `zones_list`), not `src/openapi.ts`'s, so switching `?codemode=false` to forge renames every tool for its clients; that is why the flag soaks first
+- Tool names are forge's: each group and the method in camelCase, joined by `_` (`d1_list`, `zeroTrust_access_applications_list`), not `src/openapi.ts`'s. Arguments are grouped by where they go: `path`, `query` and `headers`, each keyed by wire name, plus `body` (`{ path: { account_id }, query: { per_page }, body }`), not the endpoint tools' flat arguments. The generated input schemas set `additionalProperties: false`, so clients that validate refuse unknown arguments; forge's `checkArguments` refuses them too, at the top level and inside `path`, `query` and `headers`, and says where a misplaced parameter goes or what a place takes; `plan()` calls it before filling in the account. Wrong types are left to clients, which validate against the generated types, and to the API, whose refusal the result shows. A missing account is asked for as `path.account_id`. So switching `?codemode=false` to forge renames every tool and changes its arguments for its clients; that is why the flag soaks first
 
 ### Skills over MCP
 
diff --git a/forge.json b/forge.json
index f8b797cbd..ff5836322 100644
--- a/forge.json
+++ b/forge.json
@@ -1,5 +1,5 @@
 {
   "$comment": "The forge that generates src/generated/forge-mcp: a commit of cloudflare/forge. Bump ref to pick up generator changes; CI builds it.",
   "repository": "cloudflare/forge",
-  "ref": "580804fccf9c3f04d0449d2bc22506a2f2a8e419"
+  "ref": "b380789daec251e3f01168101e80c18ce1d19513"
 }
diff --git a/src/auth/account-access.ts b/src/auth/account-access.ts
index 0e28388ba..55446f29d 100644
--- a/src/auth/account-access.ts
+++ b/src/auth/account-access.ts
@@ -57,11 +57,16 @@ function formatAccounts(accounts: AccountSchema[]): string {
  * Error for a call that needs an account when none was passed or auto-resolved.
  * Tool results reach only the calling session, so unlike tool metadata they can
  * name its accounts. `discoveryGuidance` is used when the list isn't known.
+ * `argument` names where the account goes, such as `path.account_id`.
  */
-export function missingAccountMessage(props: AuthProps, discoveryGuidance: string): string {
+export function missingAccountMessage(
+  props: AuthProps,
+  discoveryGuidance: string,
+  argument = 'account_id'
+): string {
   const accounts = knownAccounts(props)
   if (accounts?.length) {
-    return `No account selected. Pass account_id with one of this session's accounts:\n${formatAccounts(accounts)}`
+    return `No account selected. Pass ${argument} with one of this session's accounts:\n${formatAccounts(accounts)}`
   }
   if (accounts)
     return 'No account selected: no Cloudflare accounts are authorized for this session.'
diff --git a/src/forge-tools/cloudflare.ts b/src/forge-tools/cloudflare.ts
index 1251bc1ff..2d727c138 100644
--- a/src/forge-tools/cloudflare.ts
+++ b/src/forge-tools/cloudflare.ts
@@ -5,44 +5,64 @@ import {
   PERMISSIONS_EXTENSION
 } from './policy'
 
+/** The account path parameters the server can fill in, with their descriptions. */
+const OPTIONAL_PATH_PARAMS: Readonly<Record<string, string>> = {
+  account_id: FORGE_ACCOUNT_ID_DESCRIPTION,
+  account_or_zone_id: ACCOUNT_OR_ZONE_ID_DESCRIPTION
+}
+
 /**
  * The Cloudflare policy on top of a generated tool:
  *
- * - `account_id` is optional with one description, so tool lists don't depend
- *   on the session; the server fills it in when the session has one account.
+ * - `path.account_id` is optional with one description, so tool lists don't
+ *   depend on the session; the server fills it in when the session has one
+ *   account.
  * - Forge merges methods that exist under both accounts and zones into
  *   `/{account_or_zone}/{account_or_zone_id}/…`. The document gives
  *   `account_or_zone` its two values (cloudflare/forge#59);
- *   `account_or_zone_id` is optional here like `account_id`, since the server
- *   fills in the session's account for `accounts`.
+ *   `path.account_or_zone_id` is optional here like `path.account_id`, since
+ *   the server fills in the session's account for `accounts`.
  *
+ * When that leaves no path parameter required, `path` itself is optional.
  * The tool's request code is kept, so calls build the same requests.
  */
 export function cloudflareTool(tool: Tool): Tool {
-  const properties = tool.inputSchema.properties
-  if (!properties || !('account_id' in properties || 'account_or_zone_id' in properties))
+  const path = tool.inputSchema.properties?.path as PathSchema | undefined
+  const params = path?.properties
+  if (!path || !params || !Object.keys(params).some((key) => key in OPTIONAL_PATH_PARAMS)) {
     return tool
+  }
 
-  const changed: Record<string, JsonSchema> = { ...properties }
-  const optional = new Set<string>()
-  if ('account_id' in changed) {
-    changed.account_id = { type: 'string', description: FORGE_ACCOUNT_ID_DESCRIPTION }
-    optional.add('account_id')
+  const changed: Record<string, JsonSchema> = { ...params }
+  for (const [key, description] of Object.entries(OPTIONAL_PATH_PARAMS)) {
+    if (key in changed) changed[key] = { type: 'string', description }
   }
-  if ('account_or_zone_id' in changed) {
-    changed.account_or_zone_id = { type: 'string', description: ACCOUNT_OR_ZONE_ID_DESCRIPTION }
-    optional.add('account_or_zone_id')
+  const pathRequired = (path.required ?? []).filter((key) => !(key in OPTIONAL_PATH_PARAMS))
+  const { required: _pathRequired, ...pathRest } = path
+  const pathSchema: JsonSchema = {
+    ...pathRest,
+    properties: changed,
+    ...(pathRequired.length > 0 && { required: pathRequired })
   }
-  const required = (tool.inputSchema.required ?? []).filter((key) => !optional.has(key))
+
+  const required = (tool.inputSchema.required ?? []).filter(
+    (key) => key !== 'path' || pathRequired.length > 0
+  )
   const { required: _required, ...schema } = tool.inputSchema
   const inputSchema: InputSchema = {
     ...schema,
-    properties: changed,
+    properties: { ...tool.inputSchema.properties, path: pathSchema },
     ...(required.length > 0 && { required })
   }
   return { ...tool, inputSchema }
 }
 
+/** The `path` argument of a generated tool: an object of its path parameters. */
+interface PathSchema extends JsonSchema {
+  readonly properties?: Readonly<Record<string, JsonSchema>>
+  readonly required?: readonly string[]
+}
+
 /** The API token permissions `tool` accepts, if its method lists them. */
 export function permissionsOf(tool: Tool): string[] | undefined {
   const value = tool.extensions?.[PERMISSIONS_EXTENSION]
diff --git a/src/forge-tools/plan.ts b/src/forge-tools/plan.ts
index f90b29e12..fe85637bb 100644
--- a/src/forge-tools/plan.ts
+++ b/src/forge-tools/plan.ts
@@ -1,6 +1,8 @@
 import {
   buildRequest,
+  checkArguments,
   InvalidArguments,
+  param,
   type Args,
   type HttpRequest,
   type Tool
@@ -25,8 +27,11 @@ export interface PlanOptions {
 export type CallPlan =
   | { readonly kind: 'unknown' }
   | { readonly kind: 'invalid'; readonly message: string }
-  /** The tool takes an account, the caller left it out, and the session has more than one. */
-  | { readonly kind: 'needs_account' }
+  /**
+   * The tool takes an account, the caller left it out, and the session has
+   * more than one. `argument` is where it goes, such as `path.account_id`.
+   */
+  | { readonly kind: 'needs_account'; readonly argument: string }
   | (HttpRequest & {
       readonly kind: 'request'
       /** The tool's path template, such as `/accounts/{account_id}/d1/database`. */
@@ -44,22 +49,24 @@ export type CallPlan =
  * as it is.
  */
 export function planCall(tool: Tool, given: Args, options: PlanOptions): CallPlan {
-  const key = accountKey(tool, given)
-  let args = given
-  if (key && given[key] === undefined) {
-    if (!options.sessionAccountId) return { kind: 'needs_account' }
-    args = { ...given, [key]: options.sessionAccountId }
-  }
-
   let request: HttpRequest
+  let accountId: string | undefined
   try {
+    // Before filling in the account, so a misplaced account_id is reported as such.
+    checkArguments(tool, given)
+    const key = accountKey(tool, given)
+    let args = given
+    if (key && param(given, 'path', key) === undefined) {
+      if (!options.sessionAccountId) return { kind: 'needs_account', argument: `path.${key}` }
+      args = withPathParam(given, key, options.sessionAccountId)
+    }
     request = buildRequest(tool, args, options.baseUrl)
+    accountId = accountIdOf(args)
   } catch (error) {
     if (error instanceof InvalidArguments) return { kind: 'invalid', message: error.message }
     throw error
   }
   const permissions = permissionsOf(tool)
-  const accountId = accountIdOf(args)
   return {
     kind: 'request',
     ...request,
@@ -69,16 +76,28 @@ export function planCall(tool: Tool, given: Args, options: PlanOptions): CallPla
   }
 }
 
-/** The argument that names the account, when the tool takes one for these arguments. */
+/** The path parameter that names the account, when the tool takes one for these arguments. */
 function accountKey(tool: Tool, args: Args): string | undefined {
   if (tool.path.includes('{account_id}')) return 'account_id'
-  if (tool.path.startsWith(ACCOUNT_OR_ZONE_PREFIX) && args.account_or_zone === 'accounts') {
+  if (
+    tool.path.startsWith(ACCOUNT_OR_ZONE_PREFIX) &&
+    param(args, 'path', 'account_or_zone') === 'accounts'
+  ) {
     return 'account_or_zone_id'
   }
   return undefined
 }
 
+/** Returns `args` with the path parameter `key` set to `value`. */
+function withPathParam(args: Args, key: string, value: string): Args {
+  const path = (args.path ?? {}) as Readonly<Record<string, unknown>>
+  return { ...args, path: { ...path, [key]: value } }
+}
+
 function accountIdOf(args: Args): string | undefined {
-  const id = args.account_or_zone === 'accounts' ? args.account_or_zone_id : args.account_id
+  const id =
+    param(args, 'path', 'account_or_zone') === 'accounts'
+      ? param(args, 'path', 'account_or_zone_id')
+      : param(args, 'path', 'account_id')
   return typeof id === 'string' ? id : undefined
 }
diff --git a/src/generated/forge-mcp/_/tool.ts b/src/generated/forge-mcp/_/tool.ts
index 642759cc4..00cc3a9a0 100644
--- a/src/generated/forge-mcp/_/tool.ts
+++ b/src/generated/forge-mcp/_/tool.ts
@@ -3,9 +3,16 @@
 
 import type { Tool as McpTool } from '@modelcontextprotocol/server';
 
-/** The arguments of a tool call, as the client sent them. */
+/**
+ * The arguments of a tool call, as the client sent them: the parameters by
+ * where they go, `path`, `query` and `headers`, each an object keyed by the
+ * parameters' names on the wire, and the JSON body as `body`.
+ */
 export type Args = Readonly<Record<string, unknown>>;
 
+/** Where a parameter goes: the argument that holds it. */
+export type ParamLocation = 'path' | 'query' | 'headers';
+
 /** A JSON Schema, as plain JSON. */
 export type JsonSchema = { readonly [key: string]: unknown };
 
@@ -108,15 +115,103 @@ export class InvalidArguments extends Error {
 }
 
 /**
- * Returns the argument `key`, for the path: a string, number or boolean,
+ * Returns the parameter `name` in `location`: `args[location][name]`, or
+ * `undefined` if either is missing. Throws {@link InvalidArguments} when
+ * `args[location]` isn't an object.
+ */
+export function param(args: Args, location: ParamLocation, name: string): unknown {
+  const values = args[location];
+  if (values === undefined || values === null) {
+    return undefined;
+  }
+  if (typeof values !== 'object' || Array.isArray(values)) {
+    throw new InvalidArguments(`${location} must be an object`);
+  }
+  return (values as Readonly<Record<string, unknown>>)[name];
+}
+
+/**
+ * Returns the path parameter `name`: a string, number or boolean,
  * percent-encoded. Throws {@link InvalidArguments} when it is missing.
  */
-export function pathParam(args: Args, key: string): string {
-  const value = args[key];
+export function pathParam(args: Args, name: string): string {
+  const value = param(args, 'path', name);
   if (value === undefined || value === null || value === '') {
-    throw new InvalidArguments(`Missing path parameter: ${key}`);
+    throw new InvalidArguments(`Missing path parameter: ${name}`);
+  }
+  return encodeURIComponent(scalar(name, value));
+}
+
+/**
+ * Throws {@link InvalidArguments} if `args` has an argument `tool` doesn't
+ * take: a top-level one, naming the place it goes when it is a parameter, such
+ * as `per_page` at the top level instead of in `query`, or one inside `path`,
+ * `query` or `headers`, such as a misspelled `query.nmae`.
+ */
+function checkUnknownArguments(tool: Tool, args: Args): void {
+  const properties = tool.inputSchema.properties ?? {};
+  const placeParams = (place: string): readonly string[] => {
+    const params = properties[place]?.['properties'];
+    return typeof params === 'object' && params !== null ? Object.keys(params) : [];
+  };
+  const problems = Object.keys(args)
+    .filter((key) => !Object.hasOwn(properties, key))
+    .map((key) => {
+      const place = Object.keys(properties).find((name) => placeParams(name).includes(key));
+      return place ? `${key} goes in ${place}: { "${place}": { "${key}": … } }` : `${key} is not an argument`;
+    });
+  for (const place of ['path', 'query', 'headers'] as const) {
+    const given = args[place];
+    if (given === null || typeof given !== 'object' || Array.isArray(given) || !Object.hasOwn(properties, place)) {
+      continue;
+    }
+    const takes = placeParams(place);
+    for (const key of Object.keys(given).filter((name) => !takes.includes(name))) {
+      problems.push(`${place}.${key} is not an argument; ${place} takes ${takes.join(', ')}`);
+    }
+  }
+  if (problems.length > 0) {
+    const takes = Object.keys(properties);
+    throw new InvalidArguments(
+      `Unknown arguments for ${tool.name}: ${problems.join('; ')}. It takes ${takes.length > 0 ? takes.join(', ') : 'no arguments'}.`,
+    );
   }
-  return encodeURIComponent(scalar(key, value));
+}
+
+/**
+ * Throws {@link InvalidArguments} if `tool` can't be called with `args`: an
+ * argument it doesn't take, or a required one left out. {@link buildRequest}
+ * calls it; a server that fills in arguments, such as an account from the
+ * session, can call it first, so a misplaced argument isn't mistaken for a
+ * missing one.
+ */
+export function checkArguments(tool: Tool, args: Args): void {
+  checkUnknownArguments(tool, args);
+  const missing = missingArguments(tool, args);
+  if (missing.length > 0) {
+    throw new InvalidArguments(`Missing required arguments: ${missing.join(', ')}`);
+  }
+}
+
+/**
+ * Returns the required arguments of `tool` that `args` leaves out: a
+ * top-level argument such as `body`, or a parameter such as `query.page` in
+ * a place `args` has.
+ */
+function missingArguments(tool: Tool, args: Args): string[] {
+  const missing = (tool.inputSchema.required ?? []).filter((key) => args[key] === undefined);
+  for (const location of ['path', 'query', 'headers'] as const) {
+    const required = tool.inputSchema.properties?.[location]?.['required'];
+    if (args[location] === undefined || !Array.isArray(required)) {
+      continue;
+    }
+    for (const name of required as readonly string[]) {
+      if (param(args, location, name) === undefined) {
+        missing.push(`${location}.${name}`);
+      }
+    }
+  }
+  return missing;
 }
 
 /**
@@ -126,10 +221,7 @@ export function pathParam(args: Args, key: string): string {
  * Throws {@link InvalidArguments}.
  */
 export function buildRequest(tool: Tool, args: Args, baseUrl: string): HttpRequest {
-  const missing = (tool.inputSchema.required ?? []).filter((key) => args[key] === undefined);
-  if (missing.length > 0) {
-    throw new InvalidArguments(`Missing required arguments: ${missing.join(', ')}`);
-  }
+  checkArguments(tool, args);
   const api = tool.request(args);
   const url = new URL(withoutTrailingSlashes(baseUrl) + api.path);
   for (const [name, value, explode] of api.query ?? []) {
diff --git a/src/generated/forge-mcp/abuseReports/appeals/outputs.ts b/src/generated/forge-mcp/abuseReports/appeals/outputs.ts
index a36891e6c..df40d2699 100644
--- a/src/generated/forge-mcp/abuseReports/appeals/outputs.ts
+++ b/src/generated/forge-mcp/abuseReports/appeals/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `abuse-reports_AppealEligibility` in responses.
  */
-export const abuse_reports_AppealEligibility_output: JsonSchema = {
+export const abuse$$reports_AppealEligibility: JsonSchema = {
   "properties": {
     "appeal_count": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/abuseReports/appeals/tools.ts b/src/generated/forge-mcp/abuseReports/appeals/tools.ts
index a9cc96fa9..734d18a43 100644
--- a/src/generated/forge-mcp/abuseReports/appeals/tools.ts
+++ b/src/generated/forge-mcp/abuseReports/appeals/tools.ts
@@ -3,38 +3,48 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  abuse_reports_AuthErrorResponse_output,
-  abuse_reports_CloudflareAPIErrorResponse_output,
-  abuse_reports_ErrorMessage_output,
-  abuse_reports_Message_output,
-  abuse_reports_UnauthorizedErrorResponse_output,
+  abuse$$reports_AuthErrorResponse,
+  abuse$$reports_CloudflareAPIErrorResponse,
+  abuse$$reports_ErrorMessage,
+  abuse$$reports_Message,
+  abuse$$reports_UnauthorizedErrorResponse,
 } from "../outputs.js";
-import { abuse_reports_AppealEligibility_output } from "./outputs.js";
+import { abuse$$reports_AppealEligibility } from "./outputs.js";
 
 /**
- * The tools of `abuse_reports.appeals`.
+ * The tools of `abuseReports.appeals`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "abuse_reports_appeals_eligibility",
+    name: "abuseReports_appeals_eligibility",
     title: "Check whether a report can be appealed",
-    description: "Returns whether the report is currently appealable, along with the signals behind that decision: whether it already has an open appeal, how many appeals have been submitted against it, and whether it has at least one mitigation that an appeal could reverse.\nReport-level appeals are currently available only for DMCA (copyright) reports. For other report types this operation returns the same `404 Report not found` response as a report that does not exist for the account.",
+    description: "Returns whether the report is currently appealable, along with the signals behind that decision: whether it already has an open appeal, how many appeals have been submitted against it, and whether it has at least one mitigation that an appeal could reverse.\nReport-level appeals are currently available only for DMCA (copyright) reports. For other report types this operation returns the same `404 Report not found` response as a report that does not exist for the account.\n\nGET /accounts/{account_id}/abuse-reports/{report_id}/appeals/eligibility",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
-        "report_id": {
-          "description": "Abuse Report ID",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            },
+            "report_id": {
+              "description": "Abuse Report ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -62,8 +72,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "abuse-reports_AppealEligibility": abuse_reports_AppealEligibility_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
+        "abuse-reports_AppealEligibility": abuse$$reports_AppealEligibility,
+        "abuse-reports_Message": abuse$$reports_Message,
       },
     },
     annotations: {
@@ -151,12 +161,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "abuse-reports_AppealEligibility": abuse_reports_AppealEligibility_output,
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AppealEligibility": abuse$$reports_AppealEligibility,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/abuseReports/emails/outputs.ts b/src/generated/forge-mcp/abuseReports/emails/outputs.ts
index dc7da03e5..b7e3e9c1d 100644
--- a/src/generated/forge-mcp/abuseReports/emails/outputs.ts
+++ b/src/generated/forge-mcp/abuseReports/emails/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `abuse-reports_EmailListItem` in responses.
  */
-export const abuse_reports_EmailListItem_output: JsonSchema = {
+export const abuse$$reports_EmailListItem: JsonSchema = {
   "properties": {
     "body": {
       "type": "string"
@@ -37,7 +37,7 @@ export const abuse_reports_EmailListItem_output: JsonSchema = {
 /**
  * The schema of `abuse-reports_EmailListResponse` in responses.
  */
-export const abuse_reports_EmailListResponse_output: JsonSchema = {
+export const abuse$$reports_EmailListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/abuseReports/emails/tools.ts b/src/generated/forge-mcp/abuseReports/emails/tools.ts
index 59be3d55c..22176b423 100644
--- a/src/generated/forge-mcp/abuseReports/emails/tools.ts
+++ b/src/generated/forge-mcp/abuseReports/emails/tools.ts
@@ -1,52 +1,68 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  abuse_reports_AuthErrorResponse_output,
-  abuse_reports_CloudflareAPIErrorResponse_output,
-  abuse_reports_ErrorMessage_output,
-  abuse_reports_Message_output,
-  abuse_reports_ResultInfo_output,
-  abuse_reports_UnauthorizedErrorResponse_output,
+  abuse$$reports_AuthErrorResponse,
+  abuse$$reports_CloudflareAPIErrorResponse,
+  abuse$$reports_ErrorMessage,
+  abuse$$reports_Message,
+  abuse$$reports_ResultInfo,
+  abuse$$reports_UnauthorizedErrorResponse,
 } from "../outputs.js";
 import {
-  abuse_reports_EmailListItem_output,
-  abuse_reports_EmailListResponse_output,
+  abuse$$reports_EmailListItem,
+  abuse$$reports_EmailListResponse,
 } from "./outputs.js";
 
 /**
- * The tools of `abuse_reports.emails`.
+ * The tools of `abuseReports.emails`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "abuse_reports_emails_list",
+    name: "abuseReports_emails_list",
     title: "List abuse report emails",
-    description: "List emails sent to the customer for an abuse report. Returns all successful customer emails sent for the specified abuse report. Does not include emails sent to hosts or submitters.",
+    description: "List emails sent to the customer for an abuse report. Returns all successful customer emails sent for the specified abuse report. Does not include emails sent to hosts or submitters.\n\nGET /accounts/{account_id}/abuse-reports/{report_id}/emails",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
-        "page": {
-          "description": "Page number to retrieve (default 1)",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of emails per page (default 20, max 100)",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            },
+            "report_id": {
+              "description": "Abuse Report ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_id"
+          ],
+          "type": "object"
         },
-        "report_id": {
-          "description": "Abuse Report ID",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "description": "Page number to retrieve (default 1)",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of emails per page (default 20, max 100)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -112,8 +128,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "abuse-reports_EmailListItem": abuse_reports_EmailListItem_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
+        "abuse-reports_EmailListItem": abuse$$reports_EmailListItem,
+        "abuse-reports_Message": abuse$$reports_Message,
       },
     },
     annotations: {
@@ -251,59 +267,75 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_EmailListItem": abuse_reports_EmailListItem_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_EmailListItem": abuse$$reports_EmailListItem,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/abuse-reports/${pathParam(args, "report_id")}/emails`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "abuse_reports_emails_list_submitted",
+    name: "abuseReports_emails_listSubmitted",
     title: "List emails sent to an abuse report submitter",
-    description: "List successful emails sent to the submitter of a report submitted by the account. Does not include emails sent to customers or hosts.",
+    description: "List successful emails sent to the submitter of a report submitted by the account. Does not include emails sent to customers or hosts.\n\nGET /accounts/{account_id}/abuse-reports/submitted/{report_id}/emails",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
-        "page": {
-          "description": "Page number to retrieve (default 1).",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of emails per page (default 20, max 100).",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            },
+            "report_id": {
+              "description": "Public report code.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_id"
+          ],
+          "type": "object"
         },
-        "report_id": {
-          "description": "Public report code.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "description": "Page number to retrieve (default 1).",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of emails per page (default 20, max 100).",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/abuse-reports_EmailListResponse",
       $defs: {
-        "abuse-reports_EmailListItem": abuse_reports_EmailListItem_output,
-        "abuse-reports_EmailListResponse": abuse_reports_EmailListResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_ResultInfo": abuse_reports_ResultInfo_output,
+        "abuse-reports_EmailListItem": abuse$$reports_EmailListItem,
+        "abuse-reports_EmailListResponse": abuse$$reports_EmailListResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_ResultInfo": abuse$$reports_ResultInfo,
       },
     },
     annotations: {
@@ -337,21 +369,21 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_EmailListItem": abuse_reports_EmailListItem_output,
-        "abuse-reports_EmailListResponse": abuse_reports_EmailListResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_ResultInfo": abuse_reports_ResultInfo_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_EmailListItem": abuse$$reports_EmailListItem,
+        "abuse-reports_EmailListResponse": abuse$$reports_EmailListResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_ResultInfo": abuse$$reports_ResultInfo,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/abuse-reports/submitted/${pathParam(args, "report_id")}/emails`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/abuseReports/mitigations/outputs.ts b/src/generated/forge-mcp/abuseReports/mitigations/outputs.ts
index 5768f0271..caf75aab1 100644
--- a/src/generated/forge-mcp/abuseReports/mitigations/outputs.ts
+++ b/src/generated/forge-mcp/abuseReports/mitigations/outputs.ts
@@ -3,23 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `abuse-reports_MitigatedEntityType` in responses.
- */
-export const abuse_reports_MitigatedEntityType_output: JsonSchema = {
-  "enum": [
-    "url_pattern",
-    "account",
-    "zone",
-    "custom_expression"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_MitigationAppealResult` in responses.
  */
-export const abuse_reports_MitigationAppealResult_output: JsonSchema = {
+export const abuse$$reports_MitigationAppealResult: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -80,7 +67,7 @@ export const abuse_reports_MitigationAppealResult_output: JsonSchema = {
 /**
  * The schema of `abuse-reports_MitigationListItem` in responses.
  */
-export const abuse_reports_MitigationListItem_output: JsonSchema = {
+export const abuse$$reports_MitigationListItem: JsonSchema = {
   "properties": {
     "effective_date": {
       "type": "string"
@@ -89,16 +76,29 @@ export const abuse_reports_MitigationListItem_output: JsonSchema = {
       "type": "string"
     },
     "entity_type": {
-      "$ref": "#/$defs/abuse-reports_MitigatedEntityType"
+      "enum": [
+        "url_pattern",
+        "account",
+        "zone",
+        "custom_expression"
+      ],
+      "type": "string"
     },
     "id": {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/abuse-reports_MitigationStatus"
+      "enum": [
+        "pending",
+        "active",
+        "in_review",
+        "cancelled",
+        "removed"
+      ],
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/abuse-reports_MitigationType"
+      "type": "string"
     }
   },
   "required": [
@@ -111,10 +111,3 @@ export const abuse_reports_MitigationListItem_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `abuse-reports_MitigationType` in responses.
- */
-export const abuse_reports_MitigationType_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/abuseReports/mitigations/schemas.ts b/src/generated/forge-mcp/abuseReports/mitigations/schemas.ts
index be8f6a8ad..d26dc6788 100644
--- a/src/generated/forge-mcp/abuseReports/mitigations/schemas.ts
+++ b/src/generated/forge-mcp/abuseReports/mitigations/schemas.ts
@@ -3,34 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `abuse-reports_AppealReason`.
- */
-export const abuse_reports_AppealReason: JsonSchema = {
-  "description": "Reason why the customer is appealing.",
-  "enum": [
-    "removed",
-    "misclassified"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_AppealType`.
- */
-export const abuse_reports_AppealType: JsonSchema = {
-  "description": "The type of appeal being submitted.",
-  "enum": [
-    "counter_notice",
-    "content_removed"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_DMCACounterNotice`.
  */
-export const abuse_reports_DMCACounterNotice: JsonSchema = {
+export const abuse$$reports_DMCACounterNotice: JsonSchema = {
   "description": "Counter-notice details supporting an appeal.",
   "properties": {
     "city": {
@@ -96,32 +72,22 @@ export const abuse_reports_DMCACounterNotice: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_MitigatedEntityType`.
- */
-export const abuse_reports_MitigatedEntityType: JsonSchema = {
-  "description": "The type of entity targeted by a mitigation.",
-  "enum": [
-    "url_pattern",
-    "account",
-    "zone",
-    "custom_expression"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_MitigationAppeal`.
  */
-export const abuse_reports_MitigationAppeal: JsonSchema = {
+export const abuse$$reports_MitigationAppeal: JsonSchema = {
   "properties": {
     "id": {
       "description": "ID of the mitigation to appeal.",
       "type": "string"
     },
     "reason": {
-      "$ref": "#/$defs/abuse-reports_AppealReason",
-      "description": "Reason why the customer is appealing."
+      "description": "Reason why the customer is appealing.",
+      "enum": [
+        "removed",
+        "misclassified"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -134,7 +100,7 @@ export const abuse_reports_MitigationAppeal: JsonSchema = {
 /**
  * The schema of `abuse-reports_MitigationAppealRequest`.
  */
-export const abuse_reports_MitigationAppealRequest: JsonSchema = {
+export const abuse$$reports_MitigationAppealRequest: JsonSchema = {
   "description": "Submit an appeal for a report. Provide either a list of mitigations to appeal, or an appeal type with its supporting details, but not both. When type is \"counter_notice\", the counter-notice details are required. A \"content_removed\" appeal takes an optional explanation instead and is accepted only while the report is in its Notice and Takedown notice period (`has_pending_notice` on the eligibility response). Reports that allow a single appeal (`max_appeals` of 1) never have a notice period and accept it whenever `appealable` is true.",
   "properties": {
     "appeals": {
@@ -153,17 +119,13 @@ export const abuse_reports_MitigationAppealRequest: JsonSchema = {
       "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/abuse-reports_AppealType",
-      "description": "The type of appeal being submitted."
+      "description": "The type of appeal being submitted.",
+      "enum": [
+        "counter_notice",
+        "content_removed"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `abuse-reports_MitigationType`.
- */
-export const abuse_reports_MitigationType: JsonSchema = {
-  "description": "The type of mitigation applied to a reported entity.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/abuseReports/mitigations/tools.ts b/src/generated/forge-mcp/abuseReports/mitigations/tools.ts
index 56992ded1..f0ec4d50c 100644
--- a/src/generated/forge-mcp/abuseReports/mitigations/tools.ts
+++ b/src/generated/forge-mcp/abuseReports/mitigations/tools.ts
@@ -1,103 +1,119 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  abuse_reports_AuthErrorResponse_output,
-  abuse_reports_CloudflareAPIErrorResponse_output,
-  abuse_reports_ErrorMessage_output,
-  abuse_reports_Message_output,
-  abuse_reports_MitigationStatus_output,
-  abuse_reports_UnauthorizedErrorResponse_output,
+  abuse$$reports_AuthErrorResponse,
+  abuse$$reports_CloudflareAPIErrorResponse,
+  abuse$$reports_ErrorMessage,
+  abuse$$reports_Message,
+  abuse$$reports_UnauthorizedErrorResponse,
 } from "../outputs.js";
-import { abuse_reports_MitigationStatus } from "../schemas.js";
 import {
-  abuse_reports_MitigatedEntityType_output,
-  abuse_reports_MitigationAppealResult_output,
-  abuse_reports_MitigationListItem_output,
-  abuse_reports_MitigationType_output,
+  abuse$$reports_MitigationAppealResult,
+  abuse$$reports_MitigationListItem,
 } from "./outputs.js";
 import {
-  abuse_reports_AppealReason,
-  abuse_reports_AppealType,
-  abuse_reports_DMCACounterNotice,
-  abuse_reports_MitigatedEntityType,
-  abuse_reports_MitigationAppeal,
-  abuse_reports_MitigationAppealRequest,
-  abuse_reports_MitigationType,
+  abuse$$reports_DMCACounterNotice,
+  abuse$$reports_MitigationAppeal,
+  abuse$$reports_MitigationAppealRequest,
 } from "./schemas.js";
 
 /**
- * The tools of `abuse_reports.mitigations`.
+ * The tools of `abuseReports.mitigations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "abuse_reports_mitigations_list",
+    name: "abuseReports_mitigations_list",
     title: "List abuse report mitigations",
-    description: "List mitigations done to remediate the abuse report.",
+    description: "List mitigations done to remediate the abuse report.\n\nGET /accounts/{account_id}/abuse-reports/{report_id}/mitigations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
-        "effective_after": {
-          "description": "Returns mitigation that were dispatched after the given date",
-          "type": "string"
-        },
-        "effective_before": {
-          "description": "Returns mitigations that were dispatched before the given date",
-          "type": "string"
-        },
-        "entity_type": {
-          "$ref": "#/$defs/abuse-reports_MitigatedEntityType",
-          "description": "Filter by the type of entity the mitigation impacts."
-        },
-        "page": {
-          "description": "Where in pagination to start listing abuse reports",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "How many abuse reports per page to list",
-          "type": "integer"
-        },
-        "report_id": {
-          "description": "Abuse Report ID",
-          "type": "string"
-        },
-        "sort": {
-          "description": "A property to sort by, followed by the order",
-          "enum": [
-            "type,asc",
-            "type,desc",
-            "effective_date,asc",
-            "effective_date,desc",
-            "status,asc",
-            "status,desc",
-            "entity_type,asc",
-            "entity_type,desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            },
+            "report_id": {
+              "description": "Abuse Report ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_id"
           ],
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/$defs/abuse-reports_MitigationStatus",
-          "description": "Filter by the status of the mitigation."
+          "type": "object"
         },
-        "type": {
-          "$ref": "#/$defs/abuse-reports_MitigationType",
-          "description": "Filter by the type of mitigation. This filter parameter can be specified multiple times to include multiple types of mitigations in the result set."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "effective_after": {
+              "description": "Returns mitigation that were dispatched after the given date",
+              "type": "string"
+            },
+            "effective_before": {
+              "description": "Returns mitigations that were dispatched before the given date",
+              "type": "string"
+            },
+            "entity_type": {
+              "description": "Filter by the type of entity the mitigation impacts.",
+              "enum": [
+                "url_pattern",
+                "account",
+                "zone",
+                "custom_expression"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Where in pagination to start listing abuse reports",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "How many abuse reports per page to list",
+              "type": "integer"
+            },
+            "sort": {
+              "description": "A property to sort by, followed by the order",
+              "enum": [
+                "type,asc",
+                "type,desc",
+                "effective_date,asc",
+                "effective_date,desc",
+                "status,asc",
+                "status,desc",
+                "entity_type,asc",
+                "entity_type,desc"
+              ],
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter by the status of the mitigation.",
+              "enum": [
+                "pending",
+                "active",
+                "in_review",
+                "cancelled",
+                "removed"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "description": "Filter by the type of mitigation. This filter parameter can be specified multiple times to include multiple types of mitigations in the result set.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_id"
+        "path"
       ],
-      $defs: {
-        "abuse-reports_MitigatedEntityType": abuse_reports_MitigatedEntityType,
-        "abuse-reports_MitigationStatus": abuse_reports_MitigationStatus,
-        "abuse-reports_MitigationType": abuse_reports_MitigationType,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -163,11 +179,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MitigatedEntityType": abuse_reports_MitigatedEntityType_output,
-        "abuse-reports_MitigationListItem": abuse_reports_MitigationListItem_output,
-        "abuse-reports_MitigationStatus": abuse_reports_MitigationStatus_output,
-        "abuse-reports_MitigationType": abuse_reports_MitigationType_output,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_MitigationListItem": abuse$$reports_MitigationListItem,
       },
     },
     annotations: {
@@ -282,72 +295,74 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MitigatedEntityType": abuse_reports_MitigatedEntityType_output,
-        "abuse-reports_MitigationListItem": abuse_reports_MitigationListItem_output,
-        "abuse-reports_MitigationStatus": abuse_reports_MitigationStatus_output,
-        "abuse-reports_MitigationType": abuse_reports_MitigationType_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_MitigationListItem": abuse$$reports_MitigationListItem,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/abuse-reports/${pathParam(args, "report_id")}/mitigations`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["sort", args["sort"], true],
-        ["type", args["type"], true],
-        ["effective_before", args["effective_before"], true],
-        ["effective_after", args["effective_after"], true],
-        ["status", args["status"], true],
-        ["entity_type", args["entity_type"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort", param(args, "query", "sort"), true],
+        ["type", param(args, "query", "type"), true],
+        ["effective_before", param(args, "query", "effective_before"), true],
+        ["effective_after", param(args, "query", "effective_after"), true],
+        ["status", param(args, "query", "status"), true],
+        ["entity_type", param(args, "query", "entity_type"), true],
       ],
     }),
   },
   {
-    name: "abuse_reports_mitigations_review",
+    name: "abuseReports_mitigations_review",
     title: "Request review on mitigations",
-    description: "Request a review of mitigations applied because of an abuse report, or submit a report-level appeal.\n\n- To request a review of specific mitigations, send `appeals` with the mitigation IDs and reasons. Repeating a request for a mitigation with an unresolved appeal is idempotent and returns that mitigation in the in-review state.\n- To submit a report-level appeal, send `type` and, for a `counter_notice`, the counter-notice details in `data`. Report-level appeals are currently available only for DMCA (copyright) reports.",
+    description: "Request a review of mitigations applied because of an abuse report, or submit a report-level appeal.\n\n- To request a review of specific mitigations, send `appeals` with the mitigation IDs and reasons. Repeating a request for a mitigation with an unresolved appeal is idempotent and returns that mitigation in the in-review state.\n- To submit a report-level appeal, send `type` and, for a `counter_notice`, the counter-notice details in `data`. Report-level appeals are currently available only for DMCA (copyright) reports.\n\nPOST /accounts/{account_id}/abuse-reports/{report_id}/mitigations/appeal",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/abuse-reports_MitigationAppealRequest"
         },
-        "report_id": {
-          "description": "Abuse Report ID",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            },
+            "report_id": {
+              "description": "Abuse Report ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "abuse-reports_AppealReason": abuse_reports_AppealReason,
-        "abuse-reports_AppealType": abuse_reports_AppealType,
-        "abuse-reports_DMCACounterNotice": abuse_reports_DMCACounterNotice,
-        "abuse-reports_MitigationAppeal": abuse_reports_MitigationAppeal,
-        "abuse-reports_MitigationAppealRequest": abuse_reports_MitigationAppealRequest,
+        "abuse-reports_DMCACounterNotice": abuse$$reports_DMCACounterNotice,
+        "abuse-reports_MitigationAppeal": abuse$$reports_MitigationAppeal,
+        "abuse-reports_MitigationAppealRequest": abuse$$reports_MitigationAppealRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/abuse-reports_MitigationAppealResult",
       $defs: {
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MitigatedEntityType": abuse_reports_MitigatedEntityType_output,
-        "abuse-reports_MitigationAppealResult": abuse_reports_MitigationAppealResult_output,
-        "abuse-reports_MitigationListItem": abuse_reports_MitigationListItem_output,
-        "abuse-reports_MitigationStatus": abuse_reports_MitigationStatus_output,
-        "abuse-reports_MitigationType": abuse_reports_MitigationType_output,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_MitigationAppealResult": abuse$$reports_MitigationAppealResult,
+        "abuse-reports_MitigationListItem": abuse$$reports_MitigationListItem,
       },
     },
     annotations: {
@@ -403,16 +418,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MitigatedEntityType": abuse_reports_MitigatedEntityType_output,
-        "abuse-reports_MitigationAppealResult": abuse_reports_MitigationAppealResult_output,
-        "abuse-reports_MitigationListItem": abuse_reports_MitigationListItem_output,
-        "abuse-reports_MitigationStatus": abuse_reports_MitigationStatus_output,
-        "abuse-reports_MitigationType": abuse_reports_MitigationType_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_MitigationAppealResult": abuse$$reports_MitigationAppealResult,
+        "abuse-reports_MitigationListItem": abuse$$reports_MitigationListItem,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/abuseReports/outputs.ts b/src/generated/forge-mcp/abuseReports/outputs.ts
index cbbcfaa0a..bcff0998b 100644
--- a/src/generated/forge-mcp/abuseReports/outputs.ts
+++ b/src/generated/forge-mcp/abuseReports/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `abuse-reports_AbuseReport` in responses.
  */
-export const abuse_reports_AbuseReport_output: JsonSchema = {
+export const abuse$$reports_AbuseReport: JsonSchema = {
   "properties": {
     "cdate": {
       "type": "string"
@@ -27,13 +27,28 @@ export const abuse_reports_AbuseReport_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/abuse-reports_ReportStatus"
+      "enum": [
+        "accepted",
+        "in_review"
+      ],
+      "type": "string"
     },
     "submitter": {
       "$ref": "#/$defs/abuse-reports_SubmitterDetails"
     },
     "type": {
-      "$ref": "#/$defs/abuse-reports_ReportType"
+      "enum": [
+        "PHISH",
+        "GEN",
+        "THREAT",
+        "DMCA",
+        "EMER",
+        "TM",
+        "REG_WHO",
+        "NCSEI",
+        "NETWORK"
+      ],
+      "type": "string"
     },
     "urls": {
       "items": {
@@ -56,7 +71,7 @@ export const abuse_reports_AbuseReport_output: JsonSchema = {
 /**
  * The schema of `abuse-reports_AuthErrorResponse` in responses.
  */
-export const abuse_reports_AuthErrorResponse_output: JsonSchema = {
+export const abuse$$reports_AuthErrorResponse: JsonSchema = {
   "properties": {
     "err_code": {
       "type": "string"
@@ -80,101 +95,10 @@ export const abuse_reports_AuthErrorResponse_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_BadActError` in responses.
- */
-export const abuse_reports_BadActError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadAddressError` in responses.
- */
-export const abuse_reports_BadAddressError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadAgentNameError` in responses.
- */
-export const abuse_reports_BadAgentNameError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadCityError` in responses.
- */
-export const abuse_reports_BadCityError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadCommentsError` in responses.
- */
-export const abuse_reports_BadCommentsError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadCountryError` in responses.
- */
-export const abuse_reports_BadCountryError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadEmailError` in responses.
- */
-export const abuse_reports_BadEmailError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadIPError` in responses.
- */
-export const abuse_reports_BadIPError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadJustError` in responses.
- */
-export const abuse_reports_BadJustError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadNameError` in responses.
- */
-export const abuse_reports_BadNameError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadPortsProtocolError` in responses.
- */
-export const abuse_reports_BadPortsProtocolError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadStateError` in responses.
- */
-export const abuse_reports_BadStateError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_BadUrlsError` in responses.
- */
-export const abuse_reports_BadUrlsError_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_CloudflareAPIErrorResponse` in responses.
  */
-export const abuse_reports_CloudflareAPIErrorResponse_output: JsonSchema = {
+export const abuse$$reports_CloudflareAPIErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -211,133 +135,10 @@ export const abuse_reports_CloudflareAPIErrorResponse_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_DBError` in responses.
- */
-export const abuse_reports_DBError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_DedupeError` in responses.
- */
-export const abuse_reports_DedupeError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_DiffEmailError` in responses.
- */
-export const abuse_reports_DiffEmailError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_EmailError` in responses.
- */
-export const abuse_reports_EmailError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_ErrorCode` in responses.
- */
-export const abuse_reports_ErrorCode_output: JsonSchema = {
-  "oneOf": [
-    {
-      "$ref": "#/$defs/abuse-reports_BadActError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadAddressError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadAgentNameError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadCityError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadCountryError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadPortsProtocolError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadStateError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_MaxIPsError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_PortsProtocolError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadCommentsError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadEmailError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadIPError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadJustError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadNameError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_BadUrlsError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_DBError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_DedupeError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_DiffEmailError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_EmailError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_InternalError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_InvalidNotifyError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_MustNotifyError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_NoAgreeError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_NoOriginalWorkError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_NoSigError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_UnexpectedActError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_UnknownError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_UrlNotOrangeError"
-    },
-    {
-      "$ref": "#/$defs/abuse-reports_UrlNotvalidError"
-    }
-  ]
-};
-
 /**
  * The schema of `abuse-reports_ErrorMessage` in responses.
  */
-export const abuse_reports_ErrorMessage_output: JsonSchema = {
+export const abuse$$reports_ErrorMessage: JsonSchema = {
   "properties": {
     "code": {
       "oneOf": [
@@ -359,31 +160,10 @@ export const abuse_reports_ErrorMessage_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_InternalError` in responses.
- */
-export const abuse_reports_InternalError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_InvalidNotifyError` in responses.
- */
-export const abuse_reports_InvalidNotifyError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_MaxIPsError` in responses.
- */
-export const abuse_reports_MaxIPsError_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_Message` in responses.
  */
-export const abuse_reports_Message_output: JsonSchema = {
+export const abuse$$reports_Message: JsonSchema = {
   "properties": {
     "message": {
       "type": "string"
@@ -395,24 +175,10 @@ export const abuse_reports_Message_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_MitigationStatus` in responses.
- */
-export const abuse_reports_MitigationStatus_output: JsonSchema = {
-  "enum": [
-    "pending",
-    "active",
-    "in_review",
-    "cancelled",
-    "removed"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_MitigationSummary` in responses.
  */
-export const abuse_reports_MitigationSummary_output: JsonSchema = {
+export const abuse$$reports_MitigationSummary: JsonSchema = {
   "properties": {
     "accepted_url_count": {
       "type": "integer"
@@ -440,58 +206,16 @@ export const abuse_reports_MitigationSummary_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_MustNotifyError` in responses.
- */
-export const abuse_reports_MustNotifyError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_NoAgreeError` in responses.
- */
-export const abuse_reports_NoAgreeError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_NoOriginalWorkError` in responses.
- */
-export const abuse_reports_NoOriginalWorkError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_NoSigError` in responses.
- */
-export const abuse_reports_NoSigError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_PortsProtocolError` in responses.
- */
-export const abuse_reports_PortsProtocolError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_RateLimitedError` in responses.
- */
-export const abuse_reports_RateLimitedError_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_RateLimitedErrorResponse` in responses.
  */
-export const abuse_reports_RateLimitedErrorResponse_output: JsonSchema = {
+export const abuse$$reports_RateLimitedErrorResponse: JsonSchema = {
   "properties": {
     "err_code": {
-      "$ref": "#/$defs/abuse-reports_RateLimitedError"
+      "type": "string"
     },
     "error_code": {
-      "$ref": "#/$defs/abuse-reports_RateLimitedError"
+      "type": "string"
     },
     "msg": {
       "type": "string"
@@ -499,7 +223,7 @@ export const abuse_reports_RateLimitedErrorResponse_output: JsonSchema = {
     "request": {
       "properties": {
         "act": {
-          "$ref": "#/$defs/abuse-reports_SubmissionReportType"
+          "type": "string"
         }
       },
       "required": [
@@ -524,7 +248,7 @@ export const abuse_reports_RateLimitedErrorResponse_output: JsonSchema = {
 /**
  * The schema of `abuse-reports_RegistrarWhoIsFields` in responses.
  */
-export const abuse_reports_RegistrarWhoIsFields_output: JsonSchema = {
+export const abuse$$reports_RegistrarWhoIsFields: JsonSchema = {
   "properties": {
     "reg_who_authorization_statement": {
       "type": "string"
@@ -591,39 +315,10 @@ export const abuse_reports_RegistrarWhoIsFields_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_ReportStatus` in responses.
- */
-export const abuse_reports_ReportStatus_output: JsonSchema = {
-  "enum": [
-    "accepted",
-    "in_review"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_ReportType` in responses.
- */
-export const abuse_reports_ReportType_output: JsonSchema = {
-  "enum": [
-    "PHISH",
-    "GEN",
-    "THREAT",
-    "DMCA",
-    "EMER",
-    "TM",
-    "REG_WHO",
-    "NCSEI",
-    "NETWORK"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_ResultInfo` in responses.
  */
-export const abuse_reports_ResultInfo_output: JsonSchema = {
+export const abuse$$reports_ResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -651,23 +346,192 @@ export const abuse_reports_ResultInfo_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_SubmissionReportType` in responses.
- */
-export const abuse_reports_SubmissionReportType_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_SubmitErrorResponse` in responses.
  */
-export const abuse_reports_SubmitErrorResponse_output: JsonSchema = {
+export const abuse$$reports_SubmitErrorResponse: JsonSchema = {
   "properties": {
     "err_code": {
-      "$ref": "#/$defs/abuse-reports_ErrorCode"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "error_code": {
-      "$ref": "#/$defs/abuse-reports_ErrorCode"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "msg": {
       "type": "string"
@@ -675,7 +539,7 @@ export const abuse_reports_SubmitErrorResponse_output: JsonSchema = {
     "request": {
       "properties": {
         "act": {
-          "$ref": "#/$defs/abuse-reports_SubmissionReportType"
+          "type": "string"
         }
       },
       "required": [
@@ -700,7 +564,7 @@ export const abuse_reports_SubmitErrorResponse_output: JsonSchema = {
 /**
  * The schema of `abuse-reports_SubmitReportResponse` in responses.
  */
-export const abuse_reports_SubmitReportResponse_output: JsonSchema = {
+export const abuse$$reports_SubmitReportResponse: JsonSchema = {
   "properties": {
     "abuse_rand": {
       "type": "string"
@@ -708,7 +572,7 @@ export const abuse_reports_SubmitReportResponse_output: JsonSchema = {
     "request": {
       "properties": {
         "act": {
-          "$ref": "#/$defs/abuse-reports_SubmissionReportType"
+          "type": "string"
         }
       },
       "required": [
@@ -728,32 +592,10 @@ export const abuse_reports_SubmitReportResponse_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_SubmittedAbuseReportDenialReason` in responses.
- */
-export const abuse_reports_SubmittedAbuseReportDenialReason_output: JsonSchema = {
-  "enum": [
-    "unable_to_confirm",
-    "incomplete_report",
-    "not_on_cloudflare",
-    "duplicate_report",
-    "content_removed",
-    "report_details_mismatch",
-    "no_abuse_found",
-    "missing_original_work",
-    "direct_url_required",
-    "wrong_report_category",
-    "content_unavailable",
-    "law_enforcement_referral_required",
-    "domain_dispute_process_required"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_SubmittedAbuseReportDetail` in responses.
  */
-export const abuse_reports_SubmittedAbuseReportDetail_output: JsonSchema = {
+export const abuse$$reports_SubmittedAbuseReportDetail: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_SubmittedAbuseReportListItem"
@@ -852,7 +694,7 @@ export const abuse_reports_SubmittedAbuseReportDetail_output: JsonSchema = {
  * The schema of `abuse-reports_SubmittedAbuseReportDetailResponse` in
  * responses.
  */
-export const abuse_reports_SubmittedAbuseReportDetailResponse_output: JsonSchema = {
+export const abuse$$reports_SubmittedAbuseReportDetailResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -883,7 +725,7 @@ export const abuse_reports_SubmittedAbuseReportDetailResponse_output: JsonSchema
 /**
  * The schema of `abuse-reports_SubmittedAbuseReportListItem` in responses.
  */
-export const abuse_reports_SubmittedAbuseReportListItem_output: JsonSchema = {
+export const abuse$$reports_SubmittedAbuseReportListItem: JsonSchema = {
   "properties": {
     "cdate": {
       "format": "date-time",
@@ -892,7 +734,22 @@ export const abuse_reports_SubmittedAbuseReportListItem_output: JsonSchema = {
     "denial_reason": {
       "oneOf": [
         {
-          "$ref": "#/$defs/abuse-reports_SubmittedAbuseReportDenialReason"
+          "enum": [
+            "unable_to_confirm",
+            "incomplete_report",
+            "not_on_cloudflare",
+            "duplicate_report",
+            "content_removed",
+            "report_details_mismatch",
+            "no_abuse_found",
+            "missing_original_work",
+            "direct_url_required",
+            "wrong_report_category",
+            "content_unavailable",
+            "law_enforcement_referral_required",
+            "domain_dispute_process_required"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -906,13 +763,29 @@ export const abuse_reports_SubmittedAbuseReportListItem_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/abuse-reports_SubmittedAbuseReportStatus"
+      "enum": [
+        "submitted",
+        "accepted",
+        "denied"
+      ],
+      "type": "string"
     },
     "submitter": {
       "$ref": "#/$defs/abuse-reports_SubmitterDetails"
     },
     "type": {
-      "$ref": "#/$defs/abuse-reports_ReportType"
+      "enum": [
+        "PHISH",
+        "GEN",
+        "THREAT",
+        "DMCA",
+        "EMER",
+        "TM",
+        "REG_WHO",
+        "NCSEI",
+        "NETWORK"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -929,7 +802,7 @@ export const abuse_reports_SubmittedAbuseReportListItem_output: JsonSchema = {
 /**
  * The schema of `abuse-reports_SubmittedAbuseReportListResponse` in responses.
  */
-export const abuse_reports_SubmittedAbuseReportListResponse_output: JsonSchema = {
+export const abuse$$reports_SubmittedAbuseReportListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -971,22 +844,10 @@ export const abuse_reports_SubmittedAbuseReportListResponse_output: JsonSchema =
   "type": "object"
 };
 
-/**
- * The schema of `abuse-reports_SubmittedAbuseReportStatus` in responses.
- */
-export const abuse_reports_SubmittedAbuseReportStatus_output: JsonSchema = {
-  "enum": [
-    "submitted",
-    "accepted",
-    "denied"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_SubmitterDetails` in responses.
  */
-export const abuse_reports_SubmitterDetails_output: JsonSchema = {
+export const abuse$$reports_SubmitterDetails: JsonSchema = {
   "properties": {
     "company": {
       "type": "string"
@@ -1007,7 +868,7 @@ export const abuse_reports_SubmitterDetails_output: JsonSchema = {
 /**
  * The schema of `abuse-reports_UnauthorizedErrorResponse` in responses.
  */
-export const abuse_reports_UnauthorizedErrorResponse_output: JsonSchema = {
+export const abuse$$reports_UnauthorizedErrorResponse: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/abuse-reports_CloudflareAPIErrorResponse"
@@ -1017,31 +878,3 @@ export const abuse_reports_UnauthorizedErrorResponse_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `abuse-reports_UnexpectedActError` in responses.
- */
-export const abuse_reports_UnexpectedActError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_UnknownError` in responses.
- */
-export const abuse_reports_UnknownError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_UrlNotOrangeError` in responses.
- */
-export const abuse_reports_UrlNotOrangeError_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_UrlNotvalidError` in responses.
- */
-export const abuse_reports_UrlNotvalidError_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/abuseReports/schemas.ts b/src/generated/forge-mcp/abuseReports/schemas.ts
index dc308aca2..3787d5c9a 100644
--- a/src/generated/forge-mcp/abuseReports/schemas.ts
+++ b/src/generated/forge-mcp/abuseReports/schemas.ts
@@ -6,11 +6,11 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `abuse-reports_BaseReportFields`.
  */
-export const abuse_reports_BaseReportFields: JsonSchema = {
+export const abuse$$reports_BaseReportFields: JsonSchema = {
   "properties": {
     "act": {
-      "$ref": "#/$defs/abuse-reports_SubmissionReportType",
-      "description": "The report type for submitted reports."
+      "description": "The report type for submitted reports.",
+      "type": "string"
     },
     "comments": {
       "description": "Any additional comments about the infringement not exceeding 2000 characters. Comments are kept internal to Cloudflare and not shared with the host or customer as part of regular processing. For delegated reports, comments may be shared in full.",
@@ -66,7 +66,7 @@ export const abuse_reports_BaseReportFields: JsonSchema = {
 /**
  * The schema of `abuse-reports_CSAMReport`.
  */
-export const abuse_reports_CSAMReport: JsonSchema = {
+export const abuse$$reports_CSAMReport: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_BaseReportFields"
@@ -80,11 +80,11 @@ export const abuse_reports_CSAMReport: JsonSchema = {
           "type": "string"
         },
         "country": {
-          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).\n",
+          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).",
           "type": "string"
         },
         "host_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -92,11 +92,11 @@ export const abuse_reports_CSAMReport: JsonSchema = {
           "type": "string"
         },
         "justification": {
-          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.\n",
+          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.",
           "type": "string"
         },
         "ncmec_notification": {
-          "description": "Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -104,7 +104,7 @@ export const abuse_reports_CSAMReport: JsonSchema = {
           "type": "string"
         },
         "owner_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon",
@@ -127,7 +127,7 @@ export const abuse_reports_CSAMReport: JsonSchema = {
 /**
  * The schema of `abuse-reports_DMCAReport`.
  */
-export const abuse_reports_DMCAReport: JsonSchema = {
+export const abuse$$reports_DMCAReport: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_BaseReportFields"
@@ -160,22 +160,22 @@ export const abuse_reports_DMCAReport: JsonSchema = {
           "type": "string"
         },
         "country": {
-          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).\n",
+          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).",
           "type": "string"
         },
         "host_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send"
           ],
           "type": "string"
         },
         "original_work": {
-          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).\n",
+          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).",
           "type": "string"
         },
         "owner_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send"
           ],
@@ -210,7 +210,7 @@ export const abuse_reports_DMCAReport: JsonSchema = {
 /**
  * The schema of `abuse-reports_GeneralReport`.
  */
-export const abuse_reports_GeneralReport: JsonSchema = {
+export const abuse$$reports_GeneralReport: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_BaseReportFields"
@@ -228,7 +228,7 @@ export const abuse_reports_GeneralReport: JsonSchema = {
           "type": "string"
         },
         "host_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -236,11 +236,11 @@ export const abuse_reports_GeneralReport: JsonSchema = {
           "type": "string"
         },
         "justification": {
-          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.\n",
+          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.",
           "type": "string"
         },
         "owner_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -266,25 +266,10 @@ export const abuse_reports_GeneralReport: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `abuse-reports_MitigationStatus`.
- */
-export const abuse_reports_MitigationStatus: JsonSchema = {
-  "description": "The status of a mitigation",
-  "enum": [
-    "pending",
-    "active",
-    "in_review",
-    "cancelled",
-    "removed"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_NCSEIReport`.
  */
-export const abuse_reports_NCSEIReport: JsonSchema = {
+export const abuse$$reports_NCSEIReport: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_BaseReportFields"
@@ -298,11 +283,11 @@ export const abuse_reports_NCSEIReport: JsonSchema = {
           "type": "string"
         },
         "country": {
-          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).\n",
+          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).",
           "type": "string"
         },
         "host_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -314,7 +299,7 @@ export const abuse_reports_NCSEIReport: JsonSchema = {
           "type": "boolean"
         },
         "owner_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon",
@@ -336,7 +321,7 @@ export const abuse_reports_NCSEIReport: JsonSchema = {
 /**
  * The schema of `abuse-reports_PhishingReport`.
  */
-export const abuse_reports_PhishingReport: JsonSchema = {
+export const abuse$$reports_PhishingReport: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_BaseReportFields"
@@ -350,7 +335,7 @@ export const abuse_reports_PhishingReport: JsonSchema = {
           "type": "string"
         },
         "host_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -358,15 +343,15 @@ export const abuse_reports_PhishingReport: JsonSchema = {
           "type": "string"
         },
         "justification": {
-          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.\n",
+          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.",
           "type": "string"
         },
         "original_work": {
-          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).\n",
+          "description": "Text not exceeding 255 characters. This field may be released by Cloudflare to third parties such as the Lumen Database (https://lumendatabase.org/).",
           "type": "string"
         },
         "owner_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -387,7 +372,7 @@ export const abuse_reports_PhishingReport: JsonSchema = {
 /**
  * The schema of `abuse-reports_RegistrarWhoIsFields`.
  */
-export const abuse_reports_RegistrarWhoIsFields: JsonSchema = {
+export const abuse$$reports_RegistrarWhoIsFields: JsonSchema = {
   "description": "RDP-mandated fields for registrar WHOIS data disclosure requests.",
   "properties": {
     "reg_who_authorization_statement": {
@@ -465,7 +450,7 @@ export const abuse_reports_RegistrarWhoIsFields: JsonSchema = {
 /**
  * The schema of `abuse-reports_RegistrarWhoisReport`.
  */
-export const abuse_reports_RegistrarWhoisReport: JsonSchema = {
+export const abuse$$reports_RegistrarWhoisReport: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_BaseReportFields"
@@ -479,7 +464,7 @@ export const abuse_reports_RegistrarWhoisReport: JsonSchema = {
           "type": "string"
         },
         "owner_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon",
@@ -500,49 +485,10 @@ export const abuse_reports_RegistrarWhoisReport: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `abuse-reports_ReportStatus`.
- */
-export const abuse_reports_ReportStatus: JsonSchema = {
-  "description": "An enum value that represents the status of an abuse record",
-  "enum": [
-    "accepted",
-    "in_review"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_ReportType`.
- */
-export const abuse_reports_ReportType: JsonSchema = {
-  "description": "The abuse report type",
-  "enum": [
-    "PHISH",
-    "GEN",
-    "THREAT",
-    "DMCA",
-    "EMER",
-    "TM",
-    "REG_WHO",
-    "NCSEI",
-    "NETWORK"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `abuse-reports_SubmissionReportType`.
- */
-export const abuse_reports_SubmissionReportType: JsonSchema = {
-  "description": "The report type for submitted reports.",
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_SubmitReportRequest`.
  */
-export const abuse_reports_SubmitReportRequest: JsonSchema = {
+export const abuse$$reports_SubmitReportRequest: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/abuse-reports_DMCAReport"
@@ -571,23 +517,10 @@ export const abuse_reports_SubmitReportRequest: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `abuse-reports_SubmittedAbuseReportStatus`.
- */
-export const abuse_reports_SubmittedAbuseReportStatus: JsonSchema = {
-  "description": "Status visible to the account that submitted the report.",
-  "enum": [
-    "submitted",
-    "accepted",
-    "denied"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `abuse-reports_ThreatReport`.
  */
-export const abuse_reports_ThreatReport: JsonSchema = {
+export const abuse$$reports_ThreatReport: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_BaseReportFields"
@@ -601,7 +534,7 @@ export const abuse_reports_ThreatReport: JsonSchema = {
           "type": "string"
         },
         "host_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -609,11 +542,11 @@ export const abuse_reports_ThreatReport: JsonSchema = {
           "type": "string"
         },
         "justification": {
-          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.\n",
+          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.",
           "type": "string"
         },
         "owner_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send",
             "send-anon"
@@ -634,7 +567,7 @@ export const abuse_reports_ThreatReport: JsonSchema = {
 /**
  * The schema of `abuse-reports_TrademarkReport`.
  */
-export const abuse_reports_TrademarkReport: JsonSchema = {
+export const abuse$$reports_TrademarkReport: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/abuse-reports_BaseReportFields"
@@ -648,18 +581,18 @@ export const abuse_reports_TrademarkReport: JsonSchema = {
           "type": "string"
         },
         "host_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send"
           ],
           "type": "string"
         },
         "justification": {
-          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.\n",
+          "description": "A detailed description of the infringement, including any necessary access details and the exact steps needed to view the content, not exceeding 5000 characters.",
           "type": "string"
         },
         "owner_notification": {
-          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.\n",
+          "description": "Notification type based on the abuse type. For delegated reports, the report—including contact information and comments—will be forwarded to the customer in full regardless of this value. NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.",
           "enum": [
             "send"
           ],
diff --git a/src/generated/forge-mcp/abuseReports/tools.ts b/src/generated/forge-mcp/abuseReports/tools.ts
index 7da90a498..cc92d735f 100644
--- a/src/generated/forge-mcp/abuseReports/tools.ts
+++ b/src/generated/forge-mcp/abuseReports/tools.ts
@@ -1,129 +1,96 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  abuse_reports_AbuseReport_output,
-  abuse_reports_AuthErrorResponse_output,
-  abuse_reports_BadActError_output,
-  abuse_reports_BadAddressError_output,
-  abuse_reports_BadAgentNameError_output,
-  abuse_reports_BadCityError_output,
-  abuse_reports_BadCommentsError_output,
-  abuse_reports_BadCountryError_output,
-  abuse_reports_BadEmailError_output,
-  abuse_reports_BadIPError_output,
-  abuse_reports_BadJustError_output,
-  abuse_reports_BadNameError_output,
-  abuse_reports_BadPortsProtocolError_output,
-  abuse_reports_BadStateError_output,
-  abuse_reports_BadUrlsError_output,
-  abuse_reports_CloudflareAPIErrorResponse_output,
-  abuse_reports_DBError_output,
-  abuse_reports_DedupeError_output,
-  abuse_reports_DiffEmailError_output,
-  abuse_reports_EmailError_output,
-  abuse_reports_ErrorCode_output,
-  abuse_reports_ErrorMessage_output,
-  abuse_reports_InternalError_output,
-  abuse_reports_InvalidNotifyError_output,
-  abuse_reports_MaxIPsError_output,
-  abuse_reports_Message_output,
-  abuse_reports_MitigationSummary_output,
-  abuse_reports_MustNotifyError_output,
-  abuse_reports_NoAgreeError_output,
-  abuse_reports_NoOriginalWorkError_output,
-  abuse_reports_NoSigError_output,
-  abuse_reports_PortsProtocolError_output,
-  abuse_reports_RateLimitedErrorResponse_output,
-  abuse_reports_RateLimitedError_output,
-  abuse_reports_RegistrarWhoIsFields_output,
-  abuse_reports_ReportStatus_output,
-  abuse_reports_ReportType_output,
-  abuse_reports_ResultInfo_output,
-  abuse_reports_SubmissionReportType_output,
-  abuse_reports_SubmitErrorResponse_output,
-  abuse_reports_SubmitReportResponse_output,
-  abuse_reports_SubmittedAbuseReportDenialReason_output,
-  abuse_reports_SubmittedAbuseReportDetailResponse_output,
-  abuse_reports_SubmittedAbuseReportDetail_output,
-  abuse_reports_SubmittedAbuseReportListItem_output,
-  abuse_reports_SubmittedAbuseReportListResponse_output,
-  abuse_reports_SubmittedAbuseReportStatus_output,
-  abuse_reports_SubmitterDetails_output,
-  abuse_reports_UnauthorizedErrorResponse_output,
-  abuse_reports_UnexpectedActError_output,
-  abuse_reports_UnknownError_output,
-  abuse_reports_UrlNotOrangeError_output,
-  abuse_reports_UrlNotvalidError_output,
+  abuse$$reports_AbuseReport,
+  abuse$$reports_AuthErrorResponse,
+  abuse$$reports_CloudflareAPIErrorResponse,
+  abuse$$reports_ErrorMessage,
+  abuse$$reports_Message,
+  abuse$$reports_MitigationSummary,
+  abuse$$reports_RateLimitedErrorResponse,
+  abuse$$reports_RegistrarWhoIsFields,
+  abuse$$reports_ResultInfo,
+  abuse$$reports_SubmitErrorResponse,
+  abuse$$reports_SubmitReportResponse,
+  abuse$$reports_SubmittedAbuseReportDetail,
+  abuse$$reports_SubmittedAbuseReportDetailResponse,
+  abuse$$reports_SubmittedAbuseReportListItem,
+  abuse$$reports_SubmittedAbuseReportListResponse,
+  abuse$$reports_SubmitterDetails,
+  abuse$$reports_UnauthorizedErrorResponse,
 } from "./outputs.js";
 import {
-  abuse_reports_BaseReportFields,
-  abuse_reports_CSAMReport,
-  abuse_reports_DMCAReport,
-  abuse_reports_GeneralReport,
-  abuse_reports_MitigationStatus,
-  abuse_reports_NCSEIReport,
-  abuse_reports_PhishingReport,
-  abuse_reports_RegistrarWhoIsFields,
-  abuse_reports_RegistrarWhoisReport,
-  abuse_reports_ReportStatus,
-  abuse_reports_ReportType,
-  abuse_reports_SubmissionReportType,
-  abuse_reports_SubmitReportRequest,
-  abuse_reports_SubmittedAbuseReportStatus,
-  abuse_reports_ThreatReport,
-  abuse_reports_TrademarkReport,
+  abuse$$reports_BaseReportFields,
+  abuse$$reports_CSAMReport,
+  abuse$$reports_DMCAReport,
+  abuse$$reports_GeneralReport,
+  abuse$$reports_NCSEIReport,
+  abuse$$reports_PhishingReport,
+  abuse$$reports_RegistrarWhoIsFields as abuse$$reports_RegistrarWhoIsFields$,
+  abuse$$reports_RegistrarWhoisReport,
+  abuse$$reports_SubmitReportRequest,
+  abuse$$reports_ThreatReport,
+  abuse$$reports_TrademarkReport,
 } from "./schemas.js";
 
 /**
- * The tools of `abuse_reports`.
+ * The tools of `abuseReports`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "abuse_reports_create",
+    name: "abuseReports_create",
     title: "Submit an abuse report",
-    description: "Submit an abuse report of a particular type.\n\nRequires the abuse-reports entitlement on the account (Enterprise\naccounts have it by default; other accounts must request access) and an\nAPI token with the `Trust and Safety Write` permission. If the account\nis not entitled, the request is rejected with an HTTP `401` response\n(see below).\n\nDelegated reports: In limited circumstances, Cloudflare works with\nselect customers who have established abuse-handling programs. For\nthese customers, Cloudflare may forward abuse reports directly and in\nfull—including reporter contact information, comments, and supporting\nevidence—without redaction or preprocessing by Cloudflare. This allows\nthe customer to investigate and respond using their own policies and\nprocesses. For delegated reports, the report—including contact\ninformation and comments—will be forwarded to the customer in full\nregardless of the `host_notification` and `owner_notification` values.",
+    description: "Submit an abuse report of a particular type.\n\nRequires the abuse-reports entitlement on the account (Enterprise\naccounts have it by default; other accounts must request access) and an\nAPI token with the `Trust and Safety Write` permission. If the account\nis not entitled, the request is rejected with an HTTP `401` response\n(see below).\n\nDelegated reports: In limited circumstances, Cloudflare works with\nselect customers who have established abuse-handling programs. For\nthese customers, Cloudflare may forward abuse reports directly and in\nfull—including reporter contact information, comments, and supporting\nevidence—without redaction or preprocessing by Cloudflare. This allows\nthe customer to investigate and respond using their own policies and\nprocesses. For delegated reports, the report—including contact\ninformation and comments—will be forwarded to the customer in full\nregardless of the `host_notification` and `owner_notification` values.\n\nPOST /accounts/{account_id}/abuse-reports/{report_param}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/abuse-reports_SubmitReportRequest"
         },
-        "report_type": {
-          "$ref": "#/$defs/abuse-reports_SubmissionReportType",
-          "description": "The report type to be submitted. Example: abuse_general"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            },
+            "report_param": {
+              "description": "The report type to be submitted. Example: abuse_general",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_param"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_type",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "abuse-reports_BaseReportFields": abuse_reports_BaseReportFields,
-        "abuse-reports_CSAMReport": abuse_reports_CSAMReport,
-        "abuse-reports_DMCAReport": abuse_reports_DMCAReport,
-        "abuse-reports_GeneralReport": abuse_reports_GeneralReport,
-        "abuse-reports_NCSEIReport": abuse_reports_NCSEIReport,
-        "abuse-reports_PhishingReport": abuse_reports_PhishingReport,
-        "abuse-reports_RegistrarWhoIsFields": abuse_reports_RegistrarWhoIsFields,
-        "abuse-reports_RegistrarWhoisReport": abuse_reports_RegistrarWhoisReport,
-        "abuse-reports_SubmissionReportType": abuse_reports_SubmissionReportType,
-        "abuse-reports_SubmitReportRequest": abuse_reports_SubmitReportRequest,
-        "abuse-reports_ThreatReport": abuse_reports_ThreatReport,
-        "abuse-reports_TrademarkReport": abuse_reports_TrademarkReport,
+        "abuse-reports_BaseReportFields": abuse$$reports_BaseReportFields,
+        "abuse-reports_CSAMReport": abuse$$reports_CSAMReport,
+        "abuse-reports_DMCAReport": abuse$$reports_DMCAReport,
+        "abuse-reports_GeneralReport": abuse$$reports_GeneralReport,
+        "abuse-reports_NCSEIReport": abuse$$reports_NCSEIReport,
+        "abuse-reports_PhishingReport": abuse$$reports_PhishingReport,
+        "abuse-reports_RegistrarWhoIsFields": abuse$$reports_RegistrarWhoIsFields$,
+        "abuse-reports_RegistrarWhoisReport": abuse$$reports_RegistrarWhoisReport,
+        "abuse-reports_SubmitReportRequest": abuse$$reports_SubmitReportRequest,
+        "abuse-reports_ThreatReport": abuse$$reports_ThreatReport,
+        "abuse-reports_TrademarkReport": abuse$$reports_TrademarkReport,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/abuse-reports_SubmitReportResponse",
       $defs: {
-        "abuse-reports_SubmissionReportType": abuse_reports_SubmissionReportType_output,
-        "abuse-reports_SubmitReportResponse": abuse_reports_SubmitReportResponse_output,
+        "abuse-reports_SubmitReportResponse": abuse$$reports_SubmitReportResponse,
       },
     },
     annotations: {
@@ -162,73 +129,51 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_BadActError": abuse_reports_BadActError_output,
-        "abuse-reports_BadAddressError": abuse_reports_BadAddressError_output,
-        "abuse-reports_BadAgentNameError": abuse_reports_BadAgentNameError_output,
-        "abuse-reports_BadCityError": abuse_reports_BadCityError_output,
-        "abuse-reports_BadCommentsError": abuse_reports_BadCommentsError_output,
-        "abuse-reports_BadCountryError": abuse_reports_BadCountryError_output,
-        "abuse-reports_BadEmailError": abuse_reports_BadEmailError_output,
-        "abuse-reports_BadIPError": abuse_reports_BadIPError_output,
-        "abuse-reports_BadJustError": abuse_reports_BadJustError_output,
-        "abuse-reports_BadNameError": abuse_reports_BadNameError_output,
-        "abuse-reports_BadPortsProtocolError": abuse_reports_BadPortsProtocolError_output,
-        "abuse-reports_BadStateError": abuse_reports_BadStateError_output,
-        "abuse-reports_BadUrlsError": abuse_reports_BadUrlsError_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_DBError": abuse_reports_DBError_output,
-        "abuse-reports_DedupeError": abuse_reports_DedupeError_output,
-        "abuse-reports_DiffEmailError": abuse_reports_DiffEmailError_output,
-        "abuse-reports_EmailError": abuse_reports_EmailError_output,
-        "abuse-reports_ErrorCode": abuse_reports_ErrorCode_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_InternalError": abuse_reports_InternalError_output,
-        "abuse-reports_InvalidNotifyError": abuse_reports_InvalidNotifyError_output,
-        "abuse-reports_MaxIPsError": abuse_reports_MaxIPsError_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MustNotifyError": abuse_reports_MustNotifyError_output,
-        "abuse-reports_NoAgreeError": abuse_reports_NoAgreeError_output,
-        "abuse-reports_NoOriginalWorkError": abuse_reports_NoOriginalWorkError_output,
-        "abuse-reports_NoSigError": abuse_reports_NoSigError_output,
-        "abuse-reports_PortsProtocolError": abuse_reports_PortsProtocolError_output,
-        "abuse-reports_RateLimitedError": abuse_reports_RateLimitedError_output,
-        "abuse-reports_RateLimitedErrorResponse": abuse_reports_RateLimitedErrorResponse_output,
-        "abuse-reports_SubmissionReportType": abuse_reports_SubmissionReportType_output,
-        "abuse-reports_SubmitErrorResponse": abuse_reports_SubmitErrorResponse_output,
-        "abuse-reports_SubmitReportResponse": abuse_reports_SubmitReportResponse_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
-        "abuse-reports_UnexpectedActError": abuse_reports_UnexpectedActError_output,
-        "abuse-reports_UnknownError": abuse_reports_UnknownError_output,
-        "abuse-reports_UrlNotOrangeError": abuse_reports_UrlNotOrangeError_output,
-        "abuse-reports_UrlNotvalidError": abuse_reports_UrlNotvalidError_output,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_RateLimitedErrorResponse": abuse$$reports_RateLimitedErrorResponse,
+        "abuse-reports_SubmitErrorResponse": abuse$$reports_SubmitErrorResponse,
+        "abuse-reports_SubmitReportResponse": abuse$$reports_SubmitReportResponse,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/abuse-reports/${pathParam(args, "report_type")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/abuse-reports/${pathParam(args, "report_param")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "abuse_reports_get",
+    name: "abuseReports_get",
     title: "Get an abuse report against the account",
-    description: "Retrieve the details of an abuse report made against a domain or other content associated with the account. To retrieve a report that the account submitted, use the submitted abuse report endpoint instead.",
+    description: "Retrieve the details of an abuse report made against a domain or other content associated with the account. To retrieve a report that the account submitted, use the submitted abuse report endpoint instead.\n\nGET /accounts/{account_id}/abuse-reports/{report_param}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
-        "report_id": {
-          "description": "Public report ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            },
+            "report_param": {
+              "description": "Public report ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_param"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -257,13 +202,11 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "abuse-reports_AbuseReport": abuse_reports_AbuseReport_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MitigationSummary": abuse_reports_MitigationSummary_output,
-        "abuse-reports_ReportStatus": abuse_reports_ReportStatus_output,
-        "abuse-reports_ReportType": abuse_reports_ReportType_output,
-        "abuse-reports_SubmitterDetails": abuse_reports_SubmitterDetails_output,
+        "abuse-reports_AbuseReport": abuse$$reports_AbuseReport,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_MitigationSummary": abuse$$reports_MitigationSummary,
+        "abuse-reports_SubmitterDetails": abuse$$reports_SubmitterDetails,
       },
     },
     annotations: {
@@ -372,56 +315,61 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "abuse-reports_AbuseReport": abuse_reports_AbuseReport_output,
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MitigationSummary": abuse_reports_MitigationSummary_output,
-        "abuse-reports_ReportStatus": abuse_reports_ReportStatus_output,
-        "abuse-reports_ReportType": abuse_reports_ReportType_output,
-        "abuse-reports_SubmitterDetails": abuse_reports_SubmitterDetails_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AbuseReport": abuse$$reports_AbuseReport,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_MitigationSummary": abuse$$reports_MitigationSummary,
+        "abuse-reports_SubmitterDetails": abuse$$reports_SubmitterDetails,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/abuse-reports/${pathParam(args, "report_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/abuse-reports/${pathParam(args, "report_param")}`,
     }),
   },
   {
-    name: "abuse_reports_get_submitted",
+    name: "abuseReports_getSubmitted",
     title: "Get a submitted abuse report",
-    description: "Retrieve a report submitted by the account.",
+    description: "Retrieve a report submitted by the account.\n\nGET /accounts/{account_id}/abuse-reports/submitted/{report_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
-        "report_id": {
-          "description": "Public report code.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            },
+            "report_id": {
+              "description": "Public report code.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/abuse-reports_SubmittedAbuseReportDetailResponse",
       $defs: {
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_RegistrarWhoIsFields": abuse_reports_RegistrarWhoIsFields_output,
-        "abuse-reports_ReportType": abuse_reports_ReportType_output,
-        "abuse-reports_SubmittedAbuseReportDenialReason": abuse_reports_SubmittedAbuseReportDenialReason_output,
-        "abuse-reports_SubmittedAbuseReportDetail": abuse_reports_SubmittedAbuseReportDetail_output,
-        "abuse-reports_SubmittedAbuseReportDetailResponse": abuse_reports_SubmittedAbuseReportDetailResponse_output,
-        "abuse-reports_SubmittedAbuseReportListItem": abuse_reports_SubmittedAbuseReportListItem_output,
-        "abuse-reports_SubmittedAbuseReportStatus": abuse_reports_SubmittedAbuseReportStatus_output,
-        "abuse-reports_SubmitterDetails": abuse_reports_SubmitterDetails_output,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_RegistrarWhoIsFields": abuse$$reports_RegistrarWhoIsFields,
+        "abuse-reports_SubmittedAbuseReportDetail": abuse$$reports_SubmittedAbuseReportDetail,
+        "abuse-reports_SubmittedAbuseReportDetailResponse": abuse$$reports_SubmittedAbuseReportDetailResponse,
+        "abuse-reports_SubmittedAbuseReportListItem": abuse$$reports_SubmittedAbuseReportListItem,
+        "abuse-reports_SubmitterDetails": abuse$$reports_SubmitterDetails,
       },
     },
     annotations: {
@@ -455,19 +403,16 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_RegistrarWhoIsFields": abuse_reports_RegistrarWhoIsFields_output,
-        "abuse-reports_ReportType": abuse_reports_ReportType_output,
-        "abuse-reports_SubmittedAbuseReportDenialReason": abuse_reports_SubmittedAbuseReportDenialReason_output,
-        "abuse-reports_SubmittedAbuseReportDetail": abuse_reports_SubmittedAbuseReportDetail_output,
-        "abuse-reports_SubmittedAbuseReportDetailResponse": abuse_reports_SubmittedAbuseReportDetailResponse_output,
-        "abuse-reports_SubmittedAbuseReportListItem": abuse_reports_SubmittedAbuseReportListItem_output,
-        "abuse-reports_SubmittedAbuseReportStatus": abuse_reports_SubmittedAbuseReportStatus_output,
-        "abuse-reports_SubmitterDetails": abuse_reports_SubmitterDetails_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_RegistrarWhoIsFields": abuse$$reports_RegistrarWhoIsFields,
+        "abuse-reports_SubmittedAbuseReportDetail": abuse$$reports_SubmittedAbuseReportDetail,
+        "abuse-reports_SubmittedAbuseReportDetailResponse": abuse$$reports_SubmittedAbuseReportDetailResponse,
+        "abuse-reports_SubmittedAbuseReportListItem": abuse$$reports_SubmittedAbuseReportListItem,
+        "abuse-reports_SubmitterDetails": abuse$$reports_SubmitterDetails,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
@@ -475,65 +420,98 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "abuse_reports_list",
+    name: "abuseReports_list",
     title: "List abuse reports against the account",
-    description: "List abuse reports made against domains or other content associated with the account. To list reports that the account submitted, use the submitted abuse reports endpoint instead.",
+    description: "List abuse reports made against domains or other content associated with the account. To list reports that the account submitted, use the submitted abuse reports endpoint instead.\n\nGET /accounts/{account_id}/abuse-reports",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
-        "created_after": {
-          "description": "Returns reports created after the specified date",
-          "type": "string"
-        },
-        "created_before": {
-          "description": "Returns reports created before the specified date",
-          "type": "string"
-        },
-        "domain": {
-          "description": "Filter by domain name related to the abuse report",
-          "type": "string"
-        },
-        "mitigation_status": {
-          "$ref": "#/$defs/abuse-reports_MitigationStatus",
-          "description": "Filter reports that have any mitigations in the given status."
-        },
-        "page": {
-          "description": "Where in pagination to start listing abuse reports",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "How many abuse reports per page to list",
-          "type": "integer"
-        },
-        "search": {
-          "description": "Free-text search. Returns reports whose report ID starts with the term or whose domain contains the term, both case-insensitively. Surrounding whitespace is ignored, and an empty value is treated as absent. Combined with the other filters using AND.",
-          "type": "string"
-        },
-        "sort": {
-          "description": "A property to sort by, followed by the order (id, cdate, domain, type, status)",
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/$defs/abuse-reports_ReportStatus",
-          "description": "Filter by the status of the report."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "type": {
-          "$ref": "#/$defs/abuse-reports_ReportType",
-          "description": "Filter by the type of the report."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "created_after": {
+              "description": "Returns reports created after the specified date",
+              "type": "string"
+            },
+            "created_before": {
+              "description": "Returns reports created before the specified date",
+              "type": "string"
+            },
+            "domain": {
+              "description": "Filter by domain name related to the abuse report",
+              "type": "string"
+            },
+            "mitigation_status": {
+              "description": "Filter reports that have any mitigations in the given status.",
+              "enum": [
+                "pending",
+                "active",
+                "in_review",
+                "cancelled",
+                "removed"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Where in pagination to start listing abuse reports",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "How many abuse reports per page to list",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Free-text search. Returns reports whose report ID starts with the term or whose domain contains the term, both case-insensitively. Surrounding whitespace is ignored, and an empty value is treated as absent. Combined with the other filters using AND.",
+              "type": "string"
+            },
+            "sort": {
+              "description": "A property to sort by, followed by the order (id, cdate, domain, type, status)",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter by the status of the report.",
+              "enum": [
+                "accepted",
+                "in_review"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "description": "Filter by the type of the report.",
+              "enum": [
+                "PHISH",
+                "GEN",
+                "THREAT",
+                "DMCA",
+                "EMER",
+                "TM",
+                "REG_WHO",
+                "NCSEI",
+                "NETWORK"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "abuse-reports_MitigationStatus": abuse_reports_MitigationStatus,
-        "abuse-reports_ReportStatus": abuse_reports_ReportStatus,
-        "abuse-reports_ReportType": abuse_reports_ReportType,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -599,12 +577,10 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "abuse-reports_AbuseReport": abuse_reports_AbuseReport_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MitigationSummary": abuse_reports_MitigationSummary_output,
-        "abuse-reports_ReportStatus": abuse_reports_ReportStatus_output,
-        "abuse-reports_ReportType": abuse_reports_ReportType_output,
-        "abuse-reports_SubmitterDetails": abuse_reports_SubmitterDetails_output,
+        "abuse-reports_AbuseReport": abuse$$reports_AbuseReport,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_MitigationSummary": abuse$$reports_MitigationSummary,
+        "abuse-reports_SubmitterDetails": abuse$$reports_SubmitterDetails,
       },
     },
     annotations: {
@@ -720,115 +696,140 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "abuse-reports_AbuseReport": abuse_reports_AbuseReport_output,
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_MitigationSummary": abuse_reports_MitigationSummary_output,
-        "abuse-reports_ReportStatus": abuse_reports_ReportStatus_output,
-        "abuse-reports_ReportType": abuse_reports_ReportType_output,
-        "abuse-reports_SubmitterDetails": abuse_reports_SubmitterDetails_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AbuseReport": abuse$$reports_AbuseReport,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_MitigationSummary": abuse$$reports_MitigationSummary,
+        "abuse-reports_SubmitterDetails": abuse$$reports_SubmitterDetails,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/abuse-reports`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["sort", args["sort"], true],
-        ["search", args["search"], true],
-        ["domain", args["domain"], true],
-        ["created_before", args["created_before"], true],
-        ["created_after", args["created_after"], true],
-        ["status", args["status"], true],
-        ["type", args["type"], true],
-        ["mitigation_status", args["mitigation_status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort", param(args, "query", "sort"), true],
+        ["search", param(args, "query", "search"), true],
+        ["domain", param(args, "query", "domain"), true],
+        ["created_before", param(args, "query", "created_before"), true],
+        ["created_after", param(args, "query", "created_after"), true],
+        ["status", param(args, "query", "status"), true],
+        ["type", param(args, "query", "type"), true],
+        ["mitigation_status", param(args, "query", "mitigation_status"), true],
       ],
     }),
   },
   {
-    name: "abuse_reports_list_submitted",
+    name: "abuseReports_listSubmitted",
     title: "List submitted abuse reports",
-    description: "List abuse reports submitted by the account.",
+    description: "List abuse reports submitted by the account.\n\nGET /accounts/{account_id}/abuse-reports/submitted",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID",
-          "type": "string"
-        },
-        "created_after": {
-          "description": "Return reports submitted after this time.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "created_before": {
-          "description": "Return reports submitted before this time.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "domain": {
-          "description": "Filter by reported domain. This parameter can be specified multiple times.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "id": {
-          "description": "Filter by report code.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page of submitted reports to return.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Number of submitted reports per page.",
-          "type": "integer"
-        },
-        "sort": {
-          "description": "A property and direction to sort by (id, cdate, domain, type, status).",
-          "type": "string"
-        },
-        "status": {
-          "description": "Filter by submitter-facing status. This parameter can be specified multiple times.",
-          "items": {
-            "$ref": "#/$defs/abuse-reports_SubmittedAbuseReportStatus"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID",
+              "type": "string"
+            }
           },
-          "type": "array"
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "type": {
-          "description": "Filter by report type. This parameter can be specified multiple times.",
-          "items": {
-            "$ref": "#/$defs/abuse-reports_ReportType"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "created_after": {
+              "description": "Return reports submitted after this time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "created_before": {
+              "description": "Return reports submitted before this time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "domain": {
+              "description": "Filter by reported domain. This parameter can be specified multiple times.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "id": {
+              "description": "Filter by report code.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page of submitted reports to return.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of submitted reports per page.",
+              "type": "integer"
+            },
+            "sort": {
+              "description": "A property and direction to sort by (id, cdate, domain, type, status).",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter by submitter-facing status. This parameter can be specified multiple times.",
+              "items": {
+                "description": "Status visible to the account that submitted the report.",
+                "enum": [
+                  "submitted",
+                  "accepted",
+                  "denied"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "type": {
+              "description": "Filter by report type. This parameter can be specified multiple times.",
+              "items": {
+                "description": "The abuse report type",
+                "enum": [
+                  "PHISH",
+                  "GEN",
+                  "THREAT",
+                  "DMCA",
+                  "EMER",
+                  "TM",
+                  "REG_WHO",
+                  "NCSEI",
+                  "NETWORK"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "abuse-reports_ReportType": abuse_reports_ReportType,
-        "abuse-reports_SubmittedAbuseReportStatus": abuse_reports_SubmittedAbuseReportStatus,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/abuse-reports_SubmittedAbuseReportListResponse",
       $defs: {
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_ReportType": abuse_reports_ReportType_output,
-        "abuse-reports_ResultInfo": abuse_reports_ResultInfo_output,
-        "abuse-reports_SubmittedAbuseReportDenialReason": abuse_reports_SubmittedAbuseReportDenialReason_output,
-        "abuse-reports_SubmittedAbuseReportListItem": abuse_reports_SubmittedAbuseReportListItem_output,
-        "abuse-reports_SubmittedAbuseReportListResponse": abuse_reports_SubmittedAbuseReportListResponse_output,
-        "abuse-reports_SubmittedAbuseReportStatus": abuse_reports_SubmittedAbuseReportStatus_output,
-        "abuse-reports_SubmitterDetails": abuse_reports_SubmitterDetails_output,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_ResultInfo": abuse$$reports_ResultInfo,
+        "abuse-reports_SubmittedAbuseReportListItem": abuse$$reports_SubmittedAbuseReportListItem,
+        "abuse-reports_SubmittedAbuseReportListResponse": abuse$$reports_SubmittedAbuseReportListResponse,
+        "abuse-reports_SubmitterDetails": abuse$$reports_SubmitterDetails,
       },
     },
     annotations: {
@@ -861,32 +862,29 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "abuse-reports_AuthErrorResponse": abuse_reports_AuthErrorResponse_output,
-        "abuse-reports_CloudflareAPIErrorResponse": abuse_reports_CloudflareAPIErrorResponse_output,
-        "abuse-reports_ErrorMessage": abuse_reports_ErrorMessage_output,
-        "abuse-reports_Message": abuse_reports_Message_output,
-        "abuse-reports_ReportType": abuse_reports_ReportType_output,
-        "abuse-reports_ResultInfo": abuse_reports_ResultInfo_output,
-        "abuse-reports_SubmittedAbuseReportDenialReason": abuse_reports_SubmittedAbuseReportDenialReason_output,
-        "abuse-reports_SubmittedAbuseReportListItem": abuse_reports_SubmittedAbuseReportListItem_output,
-        "abuse-reports_SubmittedAbuseReportListResponse": abuse_reports_SubmittedAbuseReportListResponse_output,
-        "abuse-reports_SubmittedAbuseReportStatus": abuse_reports_SubmittedAbuseReportStatus_output,
-        "abuse-reports_SubmitterDetails": abuse_reports_SubmitterDetails_output,
-        "abuse-reports_UnauthorizedErrorResponse": abuse_reports_UnauthorizedErrorResponse_output,
+        "abuse-reports_AuthErrorResponse": abuse$$reports_AuthErrorResponse,
+        "abuse-reports_CloudflareAPIErrorResponse": abuse$$reports_CloudflareAPIErrorResponse,
+        "abuse-reports_ErrorMessage": abuse$$reports_ErrorMessage,
+        "abuse-reports_Message": abuse$$reports_Message,
+        "abuse-reports_ResultInfo": abuse$$reports_ResultInfo,
+        "abuse-reports_SubmittedAbuseReportListItem": abuse$$reports_SubmittedAbuseReportListItem,
+        "abuse-reports_SubmittedAbuseReportListResponse": abuse$$reports_SubmittedAbuseReportListResponse,
+        "abuse-reports_SubmitterDetails": abuse$$reports_SubmitterDetails,
+        "abuse-reports_UnauthorizedErrorResponse": abuse$$reports_UnauthorizedErrorResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/abuse-reports/submitted`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["sort", args["sort"], true],
-        ["id", args["id"], true],
-        ["domain", args["domain"], true],
-        ["created_before", args["created_before"], true],
-        ["created_after", args["created_after"], true],
-        ["status", args["status"], true],
-        ["type", args["type"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort", param(args, "query", "sort"), true],
+        ["id", param(args, "query", "id"), true],
+        ["domain", param(args, "query", "domain"), true],
+        ["created_before", param(args, "query", "created_before"), true],
+        ["created_after", param(args, "query", "created_after"), true],
+        ["status", param(args, "query", "status"), true],
+        ["type", param(args, "query", "type"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/accounts/applications/outputs.ts b/src/generated/forge-mcp/accounts/applications/outputs.ts
index e13402577..31062ff42 100644
--- a/src/generated/forge-mcp/accounts/applications/outputs.ts
+++ b/src/generated/forge-mcp/accounts/applications/outputs.ts
@@ -6,46 +6,46 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `alexandria_application` in responses.
  */
-export const alexandria_application_output: JsonSchema = {
+export const alexandria_application: JsonSchema = {
   "properties": {
     "application_confidence_score": {
-      "$ref": "#/$defs/alexandria_application_confidence_score"
+      "type": "number"
     },
     "application_score_composition": {
       "$ref": "#/$defs/alexandria_application_score_composition"
     },
     "application_source": {
-      "$ref": "#/$defs/alexandria_application_source"
+      "type": "string"
     },
     "application_type": {
-      "$ref": "#/$defs/alexandria_application_type"
+      "type": "string"
     },
     "application_type_description": {
-      "$ref": "#/$defs/alexandria_application_type_description"
+      "type": "string"
     },
     "category_id": {
-      "$ref": "#/$defs/alexandria_category_id"
+      "type": "integer"
     },
     "created_at": {
-      "$ref": "#/$defs/alexandria_application_created_at"
+      "type": "string"
     },
     "gen_ai_score": {
-      "$ref": "#/$defs/alexandria_application_gen_ai_score"
+      "type": "number"
     },
     "hostnames": {
       "$ref": "#/$defs/alexandria_application_hostnames"
     },
     "human_id": {
-      "$ref": "#/$defs/alexandria_application_human_id"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/alexandria_application_id"
+      "type": "integer"
     },
     "ip_subnets": {
       "$ref": "#/$defs/alexandria_application_ip_subnets"
     },
     "name": {
-      "$ref": "#/$defs/alexandria_application_name"
+      "type": "string"
     },
     "port_protocols": {
       "$ref": "#/$defs/alexandria_application_port_protocols"
@@ -57,10 +57,10 @@ export const alexandria_application_output: JsonSchema = {
       "$ref": "#/$defs/alexandria_application_supported"
     },
     "updated_at": {
-      "$ref": "#/$defs/alexandria_application_updated_at"
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/alexandria_application_version"
+      "type": "string"
     }
   },
   "required": [
@@ -85,55 +85,20 @@ export const alexandria_application_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `alexandria_application_confidence_score` in responses.
- */
-export const alexandria_application_confidence_score_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `alexandria_application_created_at` in responses.
- */
-export const alexandria_application_created_at_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `alexandria_application_gen_ai_score` in responses.
- */
-export const alexandria_application_gen_ai_score_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `alexandria_application_hostnames` in responses.
  */
-export const alexandria_application_hostnames_output: JsonSchema = {
+export const alexandria_application_hostnames: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `alexandria_application_human_id` in responses.
- */
-export const alexandria_application_human_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `alexandria_application_id` in responses.
- */
-export const alexandria_application_id_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `alexandria_application_ip_subnets` in responses.
  */
-export const alexandria_application_ip_subnets_output: JsonSchema = {
+export const alexandria_application_ip_subnets: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -143,46 +108,46 @@ export const alexandria_application_ip_subnets_output: JsonSchema = {
 /**
  * The schema of `alexandria_application_list_item` in responses.
  */
-export const alexandria_application_list_item_output: JsonSchema = {
+export const alexandria_application_list_item: JsonSchema = {
   "properties": {
     "application_confidence_score": {
-      "$ref": "#/$defs/alexandria_application_confidence_score"
+      "type": "number"
     },
     "application_score_composition": {
       "$ref": "#/$defs/alexandria_application_score_composition"
     },
     "application_source": {
-      "$ref": "#/$defs/alexandria_application_source"
+      "type": "string"
     },
     "application_type": {
-      "$ref": "#/$defs/alexandria_application_type"
+      "type": "string"
     },
     "application_type_description": {
-      "$ref": "#/$defs/alexandria_application_type_description"
+      "type": "string"
     },
     "category_id": {
-      "$ref": "#/$defs/alexandria_category_id"
+      "type": "integer"
     },
     "created_at": {
-      "$ref": "#/$defs/alexandria_application_created_at"
+      "type": "string"
     },
     "gen_ai_score": {
-      "$ref": "#/$defs/alexandria_application_gen_ai_score"
+      "type": "number"
     },
     "hostnames": {
       "$ref": "#/$defs/alexandria_application_hostnames"
     },
     "human_id": {
-      "$ref": "#/$defs/alexandria_application_human_id"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/alexandria_application_id"
+      "type": "integer"
     },
     "ip_subnets": {
       "$ref": "#/$defs/alexandria_application_ip_subnets"
     },
     "name": {
-      "$ref": "#/$defs/alexandria_application_name"
+      "type": "string"
     },
     "port_protocols": {
       "$ref": "#/$defs/alexandria_application_port_protocols"
@@ -203,10 +168,10 @@ export const alexandria_application_list_item_output: JsonSchema = {
       "$ref": "#/$defs/alexandria_application_supported"
     },
     "updated_at": {
-      "$ref": "#/$defs/alexandria_application_updated_at"
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/alexandria_application_version"
+      "type": "string"
     }
   },
   "required": [
@@ -215,17 +180,10 @@ export const alexandria_application_list_item_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `alexandria_application_name` in responses.
- */
-export const alexandria_application_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `alexandria_application_port_protocols` in responses.
  */
-export const alexandria_application_port_protocols_output: JsonSchema = {
+export const alexandria_application_port_protocols: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -235,7 +193,7 @@ export const alexandria_application_port_protocols_output: JsonSchema = {
 /**
  * The schema of `alexandria_application_reference` in responses.
  */
-export const alexandria_application_reference_output: JsonSchema = {
+export const alexandria_application_reference: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -258,7 +216,7 @@ export const alexandria_application_reference_output: JsonSchema = {
 /**
  * The schema of `alexandria_application_score_composition` in responses.
  */
-export const alexandria_application_score_composition_output: JsonSchema = {
+export const alexandria_application_score_composition: JsonSchema = {
   "oneOf": [
     {
       "type": "object"
@@ -269,17 +227,10 @@ export const alexandria_application_score_composition_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `alexandria_application_source` in responses.
- */
-export const alexandria_application_source_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `alexandria_application_support_domains` in responses.
  */
-export const alexandria_application_support_domains_output: JsonSchema = {
+export const alexandria_application_support_domains: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -289,7 +240,7 @@ export const alexandria_application_support_domains_output: JsonSchema = {
 /**
  * The schema of `alexandria_application_supported` in responses.
  */
-export const alexandria_application_supported_output: JsonSchema = {
+export const alexandria_application_supported: JsonSchema = {
   "items": {
     "enum": [
       "GATEWAY",
@@ -301,38 +252,10 @@ export const alexandria_application_supported_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `alexandria_application_type` in responses.
- */
-export const alexandria_application_type_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `alexandria_application_type_description` in responses.
- */
-export const alexandria_application_type_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `alexandria_application_updated_at` in responses.
- */
-export const alexandria_application_updated_at_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `alexandria_application_version` in responses.
- */
-export const alexandria_application_version_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `alexandria_applications` in responses.
  */
-export const alexandria_applications_output: JsonSchema = {
+export const alexandria_applications: JsonSchema = {
   "items": {
     "$ref": "#/$defs/alexandria_application_list_item"
   },
@@ -342,7 +265,7 @@ export const alexandria_applications_output: JsonSchema = {
 /**
  * The schema of `alexandria_delete_application_conflict_response` in responses.
  */
-export const alexandria_delete_application_conflict_response_output: JsonSchema = {
+export const alexandria_delete_application_conflict_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -405,7 +328,7 @@ export const alexandria_delete_application_conflict_response_output: JsonSchema
 /**
  * The schema of `alexandria_delete_application_response` in responses.
  */
-export const alexandria_delete_application_response_output: JsonSchema = {
+export const alexandria_delete_application_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/alexandria_api-response-common"
@@ -427,7 +350,7 @@ export const alexandria_delete_application_response_output: JsonSchema = {
 /**
  * The schema of `alexandria_get_application_response` in responses.
  */
-export const alexandria_get_application_response_output: JsonSchema = {
+export const alexandria_get_application_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/alexandria_api-response-common"
@@ -446,7 +369,7 @@ export const alexandria_get_application_response_output: JsonSchema = {
 /**
  * The schema of `alexandria_get_applications_response` in responses.
  */
-export const alexandria_get_applications_response_output: JsonSchema = {
+export const alexandria_get_applications_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/alexandria_api-response-collection"
diff --git a/src/generated/forge-mcp/accounts/applications/schemas.ts b/src/generated/forge-mcp/accounts/applications/schemas.ts
index c460390ad..c2e55a12e 100644
--- a/src/generated/forge-mcp/accounts/applications/schemas.ts
+++ b/src/generated/forge-mcp/accounts/applications/schemas.ts
@@ -14,22 +14,6 @@ export const alexandria_application_hostnames: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `alexandria_application_human_id`.
- */
-export const alexandria_application_human_id: JsonSchema = {
-  "description": "Human-readable identifier for the application.",
-  "type": "string"
-};
-
-/**
- * The schema of `alexandria_application_id`.
- */
-export const alexandria_application_id: JsonSchema = {
-  "description": "Numeric identifier for the application.",
-  "type": "integer"
-};
-
 /**
  * The schema of `alexandria_application_ip_subnets`.
  */
@@ -41,14 +25,6 @@ export const alexandria_application_ip_subnets: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `alexandria_application_name`.
- */
-export const alexandria_application_name: JsonSchema = {
-  "description": "Application name.",
-  "type": "string"
-};
-
 /**
  * The schema of `alexandria_application_port_protocols`.
  */
@@ -79,24 +55,24 @@ export const alexandria_create_application_request: JsonSchema = {
     {
       "properties": {
         "category_id": {
-          "$ref": "#/$defs/alexandria_category_id",
-          "description": "Numeric identifier for an application category."
+          "description": "Numeric identifier for an application category.",
+          "type": "integer"
         },
         "hostnames": {
           "$ref": "#/$defs/alexandria_application_hostnames",
           "description": "Hostnames matched by the application."
         },
         "human_id": {
-          "$ref": "#/$defs/alexandria_application_human_id",
-          "description": "Human-readable identifier for the application."
+          "description": "Human-readable identifier for the application.",
+          "type": "string"
         },
         "ip_subnets": {
           "$ref": "#/$defs/alexandria_application_ip_subnets",
           "description": "IP subnets for this application. Custom application create and update requests accept IPv4 prefix lengths /8 through /32 and IPv6 prefix lengths /32 through /128."
         },
         "name": {
-          "$ref": "#/$defs/alexandria_application_name",
-          "description": "Application name."
+          "description": "Application name.",
+          "type": "string"
         },
         "port_protocols": {
           "$ref": "#/$defs/alexandria_application_port_protocols",
@@ -163,7 +139,7 @@ export const alexandria_create_application_request: JsonSchema = {
       ]
     }
   ],
-  "description": "Defines a custom application. At least one hostname or IP subnet is required.\nSupport domains and port/protocol pairs do not satisfy this requirement.\nA NUL character (U+0000) in any string value returns `400`.\n"
+  "description": "Defines a custom application. At least one hostname or IP subnet is required.\nSupport domains and port/protocol pairs do not satisfy this requirement.\nA NUL character (U+0000) in any string value returns `400`."
 };
 
 /**
@@ -172,7 +148,7 @@ export const alexandria_create_application_request: JsonSchema = {
 export const alexandria_lookup_applications_request: JsonSchema = {
   "properties": {
     "lookup": {
-      "description": "Rule sentence to search for complete application names. Leading and trailing\nwhitespace is trimmed before the length is checked. Control characters other\nthan tab and line breaks return `400`.\n",
+      "description": "Rule sentence to search for complete application names. Leading and trailing\nwhitespace is trimmed before the length is checked. Control characters other\nthan tab and line breaks return `400`.",
       "type": "string"
     }
   },
@@ -186,7 +162,7 @@ export const alexandria_lookup_applications_request: JsonSchema = {
  * The schema of `alexandria_update_application_request`.
  */
 export const alexandria_update_application_request: JsonSchema = {
-  "description": "Update the network matchers for the application. The service preserves omitted\nmatcher lists; send an empty array to clear a list. The resulting application must\ncontain at least one hostname or IP subnet. Support domains and port/protocol pairs\ndo not satisfy this requirement.\nA NUL character (U+0000) in any string value returns `400`.\n",
+  "description": "Update the network matchers for the application. The service preserves omitted\nmatcher lists; send an empty array to clear a list. The resulting application must\ncontain at least one hostname or IP subnet. Support domains and port/protocol pairs\ndo not satisfy this requirement.\nA NUL character (U+0000) in any string value returns `400`.",
   "properties": {
     "hostnames": {
       "$ref": "#/$defs/alexandria_application_hostnames",
diff --git a/src/generated/forge-mcp/accounts/applications/tools.ts b/src/generated/forge-mcp/accounts/applications/tools.ts
index 00dbac511..1257b651e 100644
--- a/src/generated/forge-mcp/accounts/applications/tools.ts
+++ b/src/generated/forge-mcp/accounts/applications/tools.ts
@@ -1,50 +1,34 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  alexandria_api_response_collection_output,
-  alexandria_api_response_common_failure_output,
-  alexandria_api_response_common_output,
-  alexandria_category_id_output,
-  alexandria_messages_output,
+  alexandria_api$$response$$collection,
+  alexandria_api$$response$$common,
+  alexandria_api_response_common_failure,
+  alexandria_messages,
 } from "../outputs.js";
-import { alexandria_category_id } from "../schemas.js";
-import {
-  alexandria_application_confidence_score_output,
-  alexandria_application_created_at_output,
-  alexandria_application_gen_ai_score_output,
-  alexandria_application_hostnames_output,
-  alexandria_application_human_id_output,
-  alexandria_application_id_output,
-  alexandria_application_ip_subnets_output,
-  alexandria_application_list_item_output,
-  alexandria_application_name_output,
-  alexandria_application_output,
-  alexandria_application_port_protocols_output,
-  alexandria_application_reference_output,
-  alexandria_application_score_composition_output,
-  alexandria_application_source_output,
-  alexandria_application_support_domains_output,
-  alexandria_application_supported_output,
-  alexandria_application_type_description_output,
-  alexandria_application_type_output,
-  alexandria_application_updated_at_output,
-  alexandria_application_version_output,
-  alexandria_applications_output,
-  alexandria_delete_application_conflict_response_output,
-  alexandria_delete_application_response_output,
-  alexandria_get_application_response_output,
-  alexandria_get_applications_response_output,
-} from "./outputs.js";
 import {
+  alexandria_application,
   alexandria_application_hostnames,
-  alexandria_application_human_id,
-  alexandria_application_id,
   alexandria_application_ip_subnets,
-  alexandria_application_name,
+  alexandria_application_list_item,
   alexandria_application_port_protocols,
+  alexandria_application_reference,
+  alexandria_application_score_composition,
   alexandria_application_support_domains,
+  alexandria_application_supported,
+  alexandria_applications,
+  alexandria_delete_application_conflict_response,
+  alexandria_delete_application_response,
+  alexandria_get_application_response,
+  alexandria_get_applications_response,
+} from "./outputs.js";
+import {
+  alexandria_application_hostnames as alexandria_application_hostnames$,
+  alexandria_application_ip_subnets as alexandria_application_ip_subnets$,
+  alexandria_application_port_protocols as alexandria_application_port_protocols$,
+  alexandria_application_support_domains as alexandria_application_support_domains$,
   alexandria_create_application_request,
   alexandria_lookup_applications_request,
   alexandria_update_application_request,
@@ -57,58 +41,53 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_applications_create",
     title: "Create application",
-    description: "Create a custom application for an account from a name, category, and optional network matchers.",
+    description: "Create a custom application for an account from a name, category, and optional network matchers.\n\nPOST /accounts/{account_id}/resource-library/applications",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/alexandria_create_application_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "alexandria_application_hostnames": alexandria_application_hostnames,
-        "alexandria_application_human_id": alexandria_application_human_id,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
-        "alexandria_application_name": alexandria_application_name,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols,
-        "alexandria_application_support_domains": alexandria_application_support_domains,
-        "alexandria_category_id": alexandria_category_id,
+        "alexandria_application_hostnames": alexandria_application_hostnames$,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets$,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols$,
+        "alexandria_application_support_domains": alexandria_application_support_domains$,
         "alexandria_create_application_request": alexandria_create_application_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/alexandria_get_application_response",
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_application": alexandria_application_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_application_response": alexandria_get_application_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_application": alexandria_application,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_get_application_response": alexandria_get_application_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     annotations: {
@@ -136,29 +115,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_api_response_common_failure": alexandria_api_response_common_failure_output,
-        "alexandria_application": alexandria_application_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_application_response": alexandria_get_application_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_api_response_common_failure": alexandria_api_response_common_failure,
+        "alexandria_application": alexandria_application,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_get_application_response": alexandria_get_application_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     request: (args) => ({
@@ -169,33 +136,40 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_applications_delete",
     title: "Delete application",
-    description: "Delete a custom application and all of its versions. Deletion is rejected when other resources reference the application.\n\nConfirm with the user before calling this tool. This operation deletes the custom application and all of its versions. This action cannot be undone.",
+    description: "Delete a custom application and all of its versions. Deletion is rejected when other resources reference the application.\n\nConfirm with the user before calling this tool. This operation deletes the custom application and all of its versions. This action cannot be undone.\n\nDELETE /accounts/{account_id}/resource-library/applications/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "id": {
-          "$ref": "#/$defs/alexandria_application_id",
-          "description": "Application ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Application ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
-      $defs: {
-        "alexandria_application_id": alexandria_application_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/alexandria_delete_application_response",
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_delete_application_response": alexandria_delete_application_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_delete_application_response": alexandria_delete_application_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     annotations: {
@@ -229,12 +203,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_api_response_common_failure": alexandria_api_response_common_failure_output,
-        "alexandria_application_reference": alexandria_application_reference_output,
-        "alexandria_delete_application_conflict_response": alexandria_delete_application_conflict_response_output,
-        "alexandria_delete_application_response": alexandria_delete_application_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_api_response_common_failure": alexandria_api_response_common_failure,
+        "alexandria_application_reference": alexandria_application_reference,
+        "alexandria_delete_application_conflict_response": alexandria_delete_application_conflict_response,
+        "alexandria_delete_application_response": alexandria_delete_application_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     request: (args) => ({
@@ -244,52 +218,47 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_applications_get",
     title: "Get application",
-    description: "Retrieve an application available to the account by its numeric application ID.",
+    description: "Retrieve an application available to the account by its numeric application ID.\n\nGET /accounts/{account_id}/resource-library/applications/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "id": {
-          "$ref": "#/$defs/alexandria_application_id",
-          "description": "Application ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Application ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
-      $defs: {
-        "alexandria_application_id": alexandria_application_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/alexandria_get_application_response",
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_application": alexandria_application_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_application_response": alexandria_get_application_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_application": alexandria_application,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_get_application_response": alexandria_get_application_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     annotations: {
@@ -319,29 +288,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_api_response_common_failure": alexandria_api_response_common_failure_output,
-        "alexandria_application": alexandria_application_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_application_response": alexandria_get_application_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_api_response_common_failure": alexandria_api_response_common_failure,
+        "alexandria_application": alexandria_application,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_get_application_response": alexandria_get_application_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     request: (args) => ({
@@ -351,80 +308,84 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_applications_list",
     title: "List applications",
-    description: "List the applications available to an account, both the applications Cloudflare\ncurates and the custom applications the account has defined.\n\nResults are paginated. Page with `cursor` so that applications added or removed\nbetween requests do not make other results repeat or go missing; `offset` paging can\nrepeat or miss results when the list changes between requests. Use `filter` and\n`search` to narrow the list, `order_by` to sort it, and `fields` to reduce each result\nto only the properties you need.\nUse `lookup` to find complete application names mentioned in a rule sentence,\nignoring case. Lookup does not correct misspellings. It ranks matches by\nrelevance and uses the same filters, fields, and pagination as listing.\n`lookup` cannot be combined with `search`.\n\nInvalid UTF-8 or a NUL character (U+0000) in any query parameter name or value\nreturns `400`.\n\nThe authenticated principal must have access to the account identified by\n`account_id`.",
+    description: "List the applications available to an account, both the applications Cloudflare\ncurates and the custom applications the account has defined.\n\nResults are paginated. Page with `cursor` so that applications added or removed\nbetween requests do not make other results repeat or go missing; `offset` paging can\nrepeat or miss results when the list changes between requests. Use `filter` and\n`search` to narrow the list, `order_by` to sort it, and `fields` to reduce each result\nto only the properties you need.\nUse `lookup` to find complete application names mentioned in a rule sentence,\nignoring case. Lookup does not correct misspellings. It ranks matches by\nrelevance and uses the same filters, fields, and pagination as listing.\n`lookup` cannot be combined with `search`.\n\nInvalid UTF-8 or a NUL character (U+0000) in any query parameter name or value\nreturns `400`.\n\nThe authenticated principal must have access to the account identified by\n`account_id`.\n\nGET /accounts/{account_id}/resource-library/applications",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque value from `result_info.cursor` of the previous response. Returns the\nresults that follow it. Send the same `filter`, `search`, `lookup`, and\n`order_by` values as the request that returned it; `limit` and `fields` may\nchange. An empty value is the same as no cursor. A modified cursor, or one used\nwith different values, returns `400`.\n",
-          "type": "string"
-        },
-        "fields": {
-          "description": "Return only the listed properties on each application, as a comma-separated list.\nUse this to keep responses small when you only need part of each application, for\nexample populating a picker with `fields=id,name` instead of downloading every\nhostname and IP subnet.\n\nOmit this parameter to receive the full application object, including\nwhen lookup is used.\n\n`id` is always returned.\n\nSelectable properties: `id`, `name`, `human_id`, `version`, `hostnames`,\n`support_domains`, `ip_subnets`, `port_protocols`, `supported`, `gen_ai_score`,\n`application_confidence_score`, `created_at`, `updated_at`, `review_status`.\n\nUnknown or empty property names return `400`.\n",
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter applications using `key:value` format. Supported filter keys:\n- `name`: application name (for example, `name:HR`).\n- `id`: application ID (for example, `id:498`).\n- `human_id`: human-readable ID (for example, `human_id:HR`).\n- `hostname`: hostname or support domain (for example, `hostname:portal.example.com`).\n- `source`: application source name (for example, `source:cloudflare`).\n- `ip_subnet`: CIDR containment; returns applications where a stored subnet contains the search value (for example, `ip_subnet:10.0.1.5/32` matches `10.0.0.0/16`).\n- `category_id`: category ID (for example, `category_id:12`).\n- `category_name`: category name (for example, `category_name:HR`).\n- `supported`: supported Cloudflare product. Values: `GATEWAY`, `ACCESS`, `CASB`.\n- `review_status`: account-specific Gateway review status. Values: `approved`, `unapproved`, `in_review`, `unreviewed`.\n",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "default": 25,
-          "description": "Number of results to return. Defaults to 25; values are clamped to 1–250.",
-          "type": "integer"
-        },
-        "lookup": {
-          "description": "Find complete, case-insensitive application name mentions in a phrase or\nrule sentence. Misspelled names do not match. Returns matching applications\nranked by relevance. Must be between 2 and 1000 characters, with no control\ncharacters other than tab and line breaks. Uses the same\nfilters, fields, and pagination as listing. `search` cannot be combined\nwith lookup. Results are ranked by relevance, so `order_by` is ignored.\nTo keep the text out of URLs, send it to `POST .../applications/lookup` instead.\n",
-          "type": "string"
-        },
-        "offset": {
-          "default": 0,
-          "description": "Number of results to skip. Defaults to 0; negative values are clamped to 0. Ignored when `cursor` is provided.",
-          "type": "integer"
-        },
-        "order_by": {
-          "description": "Order results using field:direction format. Supported fields are name, id, human_id,\ncategory_id, application_type, application_confidence_score, and gen_ai_score.\nSupported directions are asc and desc. Ignored when search is provided; results are\nranked by relevance instead. Also ignored when lookup is provided.\n",
-          "type": "string"
-        },
-        "search": {
-          "description": "Fuzzy search across application name and hostnames. Results are ranked by relevance. Must be between 2 and 200 characters. Can be combined with filter parameters.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque value from `result_info.cursor` of the previous response. Returns the\nresults that follow it. Send the same `filter`, `search`, `lookup`, and\n`order_by` values as the request that returned it; `limit` and `fields` may\nchange. An empty value is the same as no cursor. A modified cursor, or one used\nwith different values, returns `400`.",
+              "type": "string"
+            },
+            "fields": {
+              "description": "Return only the listed properties on each application, as a comma-separated list.\nUse this to keep responses small when you only need part of each application, for\nexample populating a picker with `fields=id,name` instead of downloading every\nhostname and IP subnet.\n\nOmit this parameter to receive the full application object, including\nwhen lookup is used.\n\n`id` is always returned.\n\nSelectable properties: `id`, `name`, `human_id`, `version`, `hostnames`,\n`support_domains`, `ip_subnets`, `port_protocols`, `supported`, `gen_ai_score`,\n`application_confidence_score`, `created_at`, `updated_at`, `review_status`.\n\nUnknown or empty property names return `400`.",
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter applications using `key:value` format. Supported filter keys:\n- `name`: application name (for example, `name:HR`).\n- `id`: application ID (for example, `id:498`).\n- `human_id`: human-readable ID (for example, `human_id:HR`).\n- `hostname`: hostname or support domain (for example, `hostname:portal.example.com`).\n- `source`: application source name (for example, `source:cloudflare`).\n- `ip_subnet`: CIDR containment; returns applications where a stored subnet contains the search value (for example, `ip_subnet:10.0.1.5/32` matches `10.0.0.0/16`).\n- `category_id`: category ID (for example, `category_id:12`).\n- `category_name`: category name (for example, `category_name:HR`).\n- `supported`: supported Cloudflare product. Values: `GATEWAY`, `ACCESS`, `CASB`.\n- `review_status`: account-specific Gateway review status. Values: `approved`, `unapproved`, `in_review`, `unreviewed`.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 25,
+              "description": "Number of results to return. Defaults to 25; values are clamped to 1–250.",
+              "type": "integer"
+            },
+            "lookup": {
+              "description": "Find complete, case-insensitive application name mentions in a phrase or\nrule sentence. Misspelled names do not match. Returns matching applications\nranked by relevance. Must be between 2 and 1000 characters, with no control\ncharacters other than tab and line breaks. Uses the same\nfilters, fields, and pagination as listing. `search` cannot be combined\nwith lookup. Results are ranked by relevance, so `order_by` is ignored.\nTo keep the text out of URLs, send it to `POST .../applications/lookup` instead.",
+              "type": "string"
+            },
+            "offset": {
+              "default": 0,
+              "description": "Number of results to skip. Defaults to 0; negative values are clamped to 0. Ignored when `cursor` is provided.",
+              "type": "integer"
+            },
+            "order_by": {
+              "description": "Order results using field:direction format. Supported fields are name, id, human_id,\ncategory_id, application_type, application_confidence_score, and gen_ai_score.\nSupported directions are asc and desc. Ignored when search is provided; results are\nranked by relevance instead. Also ignored when lookup is provided.",
+              "type": "string"
+            },
+            "search": {
+              "description": "Fuzzy search across application name and hostnames. Results are ranked by relevance. Must be between 2 and 200 characters. Can be combined with filter parameters.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/alexandria_get_applications_response",
       $defs: {
-        "alexandria_api-response-collection": alexandria_api_response_collection_output,
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_list_item": alexandria_application_list_item_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_applications": alexandria_applications_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_applications_response": alexandria_get_applications_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-collection": alexandria_api$$response$$collection,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_list_item": alexandria_application_list_item,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_applications": alexandria_applications,
+        "alexandria_get_applications_response": alexandria_get_applications_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     annotations: {
@@ -463,79 +424,83 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "alexandria_api-response-collection": alexandria_api_response_collection_output,
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_api_response_common_failure": alexandria_api_response_common_failure_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_list_item": alexandria_application_list_item_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_applications": alexandria_applications_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_applications_response": alexandria_get_applications_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-collection": alexandria_api$$response$$collection,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_api_response_common_failure": alexandria_api_response_common_failure,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_list_item": alexandria_application_list_item,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_applications": alexandria_applications,
+        "alexandria_get_applications_response": alexandria_get_applications_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/resource-library/applications`,
       query: [
-        ["filter", args["filter"], true],
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["cursor", args["cursor"], true],
-        ["order_by", args["order_by"], true],
-        ["search", args["search"], true],
-        ["lookup", args["lookup"], true],
-        ["fields", args["fields"], true],
+        ["filter", param(args, "query", "filter"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["search", param(args, "query", "search"), true],
+        ["lookup", param(args, "query", "lookup"), true],
+        ["fields", param(args, "query", "fields"), true],
       ],
     }),
   },
   {
     name: "accounts_applications_lookup",
     title: "Look up applications in a rule sentence",
-    description: "Find complete application names mentioned in a rule sentence, ignoring case.\nLookup does not correct misspellings. Matches are ranked by relevance.\n\nThis endpoint takes the rule sentence in the request body, so the text stays out\nof URLs and request logs. Use it instead of the `lookup` query parameter on the\nlist endpoint when the text may contain sensitive content.\n\n`fields`, `limit`, and `filter` work the same way as on the list endpoint and are\npassed as query parameters. Results are not paged: `offset`, `cursor`, `order_by`,\n`search`, and `lookup` query parameters return `400`. Unknown request body properties also\nreturn `400`. Invalid UTF-8 or a NUL character (U+0000) in any query parameter\nname or value returns `400`.\n\nThe authenticated principal must have access to the account identified by\n`account_id`.\n\nThis method is beta.",
+    description: "Find complete application names mentioned in a rule sentence, ignoring case.\nLookup does not correct misspellings. Matches are ranked by relevance.\n\nThis endpoint takes the rule sentence in the request body, so the text stays out\nof URLs and request logs. Use it instead of the `lookup` query parameter on the\nlist endpoint when the text may contain sensitive content.\n\n`fields`, `limit`, and `filter` work the same way as on the list endpoint and are\npassed as query parameters. Results are not paged: `offset`, `cursor`, `order_by`,\n`search`, and `lookup` query parameters return `400`. Unknown request body properties also\nreturn `400`. Invalid UTF-8 or a NUL character (U+0000) in any query parameter\nname or value returns `400`.\n\nThe authenticated principal must have access to the account identified by\n`account_id`.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/resource-library/applications/lookup",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/alexandria_lookup_applications_request"
         },
-        "fields": {
-          "description": "Return only the listed properties on each application, as a comma-separated list.\nAccepts the same properties as the list endpoint. `id` is always returned.\nOmit this parameter to receive the full application object.\n",
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter matches using the same `key:value` filters as the list endpoint.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "default": 25,
-          "description": "Maximum number of matches to return. Defaults to 25; values are clamped to 1–250.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "fields": {
+              "description": "Return only the listed properties on each application, as a comma-separated list.\nAccepts the same properties as the list endpoint. `id` is always returned.\nOmit this parameter to receive the full application object.",
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter matches using the same `key:value` filters as the list endpoint.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 25,
+              "description": "Maximum number of matches to return. Defaults to 25; values are clamped to 1–250.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "alexandria_lookup_applications_request": alexandria_lookup_applications_request,
       },
@@ -543,30 +508,18 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/alexandria_get_applications_response",
       $defs: {
-        "alexandria_api-response-collection": alexandria_api_response_collection_output,
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_list_item": alexandria_application_list_item_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_applications": alexandria_applications_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_applications_response": alexandria_get_applications_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-collection": alexandria_api$$response$$collection,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_list_item": alexandria_application_list_item,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_applications": alexandria_applications,
+        "alexandria_get_applications_response": alexandria_get_applications_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     annotations: {
@@ -605,39 +558,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "alexandria_api-response-collection": alexandria_api_response_collection_output,
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_api_response_common_failure": alexandria_api_response_common_failure_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_list_item": alexandria_application_list_item_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_applications": alexandria_applications_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_applications_response": alexandria_get_applications_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-collection": alexandria_api$$response$$collection,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_api_response_common_failure": alexandria_api_response_common_failure,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_list_item": alexandria_application_list_item,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_applications": alexandria_applications,
+        "alexandria_get_applications_response": alexandria_get_applications_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/resource-library/applications/lookup`,
       query: [
-        ["filter", args["filter"], true],
-        ["limit", args["limit"], true],
-        ["fields", args["fields"], true],
+        ["filter", param(args, "query", "filter"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["fields", param(args, "query", "fields"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -645,61 +586,58 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_applications_update",
     title: "Update application",
-    description: "Replace the supplied network matchers for a custom application and create a new version. Omitted matcher lists remain unchanged; send an empty list to clear a matcher type.",
+    description: "Replace the supplied network matchers for a custom application and create a new version. Omitted matcher lists remain unchanged; send an empty list to clear a matcher type.\n\nPATCH /accounts/{account_id}/resource-library/applications/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/alexandria_update_application_request"
         },
-        "id": {
-          "$ref": "#/$defs/alexandria_application_id",
-          "description": "Application ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Application ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "alexandria_application_hostnames": alexandria_application_hostnames,
-        "alexandria_application_id": alexandria_application_id,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols,
-        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_hostnames": alexandria_application_hostnames$,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets$,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols$,
+        "alexandria_application_support_domains": alexandria_application_support_domains$,
         "alexandria_update_application_request": alexandria_update_application_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/alexandria_get_application_response",
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_application": alexandria_application_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_application_response": alexandria_get_application_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_application": alexandria_application,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_get_application_response": alexandria_get_application_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     annotations: {
@@ -727,29 +665,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_api_response_common_failure": alexandria_api_response_common_failure_output,
-        "alexandria_application": alexandria_application_output,
-        "alexandria_application_confidence_score": alexandria_application_confidence_score_output,
-        "alexandria_application_created_at": alexandria_application_created_at_output,
-        "alexandria_application_gen_ai_score": alexandria_application_gen_ai_score_output,
-        "alexandria_application_hostnames": alexandria_application_hostnames_output,
-        "alexandria_application_human_id": alexandria_application_human_id_output,
-        "alexandria_application_id": alexandria_application_id_output,
-        "alexandria_application_ip_subnets": alexandria_application_ip_subnets_output,
-        "alexandria_application_name": alexandria_application_name_output,
-        "alexandria_application_port_protocols": alexandria_application_port_protocols_output,
-        "alexandria_application_score_composition": alexandria_application_score_composition_output,
-        "alexandria_application_source": alexandria_application_source_output,
-        "alexandria_application_support_domains": alexandria_application_support_domains_output,
-        "alexandria_application_supported": alexandria_application_supported_output,
-        "alexandria_application_type": alexandria_application_type_output,
-        "alexandria_application_type_description": alexandria_application_type_description_output,
-        "alexandria_application_updated_at": alexandria_application_updated_at_output,
-        "alexandria_application_version": alexandria_application_version_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_get_application_response": alexandria_get_application_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_api_response_common_failure": alexandria_api_response_common_failure,
+        "alexandria_application": alexandria_application,
+        "alexandria_application_hostnames": alexandria_application_hostnames,
+        "alexandria_application_ip_subnets": alexandria_application_ip_subnets,
+        "alexandria_application_port_protocols": alexandria_application_port_protocols,
+        "alexandria_application_score_composition": alexandria_application_score_composition,
+        "alexandria_application_support_domains": alexandria_application_support_domains,
+        "alexandria_application_supported": alexandria_application_supported,
+        "alexandria_get_application_response": alexandria_get_application_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/billing/history/outputs.ts b/src/generated/forge-mcp/accounts/billing/history/outputs.ts
index f8a504c24..56a3442ca 100644
--- a/src/generated/forge-mcp/accounts/billing/history/outputs.ts
+++ b/src/generated/forge-mcp/accounts/billing/history/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `bill-subs-api_account_billing_history_collection` in
  * responses.
  */
-export const bill_subs_api_account_billing_history_collection_output: JsonSchema = {
+export const bill$$subs$$api_account_billing_history_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-collection"
diff --git a/src/generated/forge-mcp/accounts/billing/history/tools.ts b/src/generated/forge-mcp/accounts/billing/history/tools.ts
index bc6fbb1d3..70237c297 100644
--- a/src/generated/forge-mcp/accounts/billing/history/tools.ts
+++ b/src/generated/forge-mcp/accounts/billing/history/tools.ts
@@ -1,17 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  bill_subs_api_api_response_collection_output,
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_messages_output,
-  bill_subs_api_result_info_output,
+  bill$$subs$$api_api$$response$$collection,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_messages,
+  bill$$subs$$api_result_info,
 } from "../../../outputs.js";
-import { bill_subs_api_identifier } from "../../../schemas.js";
-import { bill_subs_api_account_billing_history_output } from "../outputs.js";
-import { bill_subs_api_account_billing_history_collection_output } from "./outputs.js";
+import { bill$$subs$$api_account_billing_history } from "../outputs.js";
+import { bill$$subs$$api_account_billing_history_collection } from "./outputs.js";
 
 /**
  * The tools of `accounts.billing.history`.
@@ -20,45 +19,58 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_billing_history_list",
     title: "Get Account Billing History",
-    description: "Gets the billing history for an account.",
+    description: "Gets the billing history for an account.\n\nGET /accounts/{account_id}/billing/history",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page.",
-          "type": "integer"
-        },
-        "status": {
-          "description": "Filter billing history by status.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page.",
+              "type": "integer"
+            },
+            "status": {
+              "description": "Filter billing history by status.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_account_billing_history_collection",
       $defs: {
-        "bill-subs-api_account_billing_history": bill_subs_api_account_billing_history_output,
-        "bill-subs-api_account_billing_history_collection": bill_subs_api_account_billing_history_collection_output,
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
+        "bill-subs-api_account_billing_history": bill$$subs$$api_account_billing_history,
+        "bill-subs-api_account_billing_history_collection": bill$$subs$$api_account_billing_history_collection,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
       },
     },
     annotations: {
@@ -97,21 +109,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_account_billing_history": bill_subs_api_account_billing_history_output,
-        "bill-subs-api_account_billing_history_collection": bill_subs_api_account_billing_history_collection_output,
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
+        "bill-subs-api_account_billing_history": bill$$subs$$api_account_billing_history,
+        "bill-subs-api_account_billing_history_collection": bill$$subs$$api_account_billing_history_collection,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billing/history`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/accounts/billing/outputs.ts b/src/generated/forge-mcp/accounts/billing/outputs.ts
index 9a4331f4b..c56598c25 100644
--- a/src/generated/forge-mcp/accounts/billing/outputs.ts
+++ b/src/generated/forge-mcp/accounts/billing/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bill-subs-api_account_billing_history` in responses.
  */
-export const bill_subs_api_account_billing_history_output: JsonSchema = {
+export const bill$$subs$$api_account_billing_history: JsonSchema = {
   "properties": {
     "action": {
       "type": "string"
@@ -61,7 +61,7 @@ export const bill_subs_api_account_billing_history_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_account_credits_response` in responses.
  */
-export const bill_subs_api_account_credits_response_output: JsonSchema = {
+export const bill$$subs$$api_account_credits_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
@@ -115,7 +115,7 @@ export const bill_subs_api_account_credits_response_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_bad_debt_info` in responses.
  */
-export const bill_subs_api_bad_debt_info_output: JsonSchema = {
+export const bill$$subs$$api_bad_debt_info: JsonSchema = {
   "properties": {
     "already_paid": {
       "type": "number"
@@ -139,7 +139,7 @@ export const bill_subs_api_bad_debt_info_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_bad_debt_response_single` in responses.
  */
-export const bill_subs_api_bad_debt_response_single_output: JsonSchema = {
+export const bill$$subs$$api_bad_debt_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
@@ -158,7 +158,7 @@ export const bill_subs_api_bad_debt_response_single_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_client_secret_response_single` in responses.
  */
-export const bill_subs_api_client_secret_response_single_output: JsonSchema = {
+export const bill$$subs$$api_client_secret_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
@@ -182,7 +182,7 @@ export const bill_subs_api_client_secret_response_single_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_unpaid_invoices_response_single` in responses.
  */
-export const bill_subs_api_unpaid_invoices_response_single_output: JsonSchema = {
+export const bill$$subs$$api_unpaid_invoices_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
diff --git a/src/generated/forge-mcp/accounts/billing/paymentMethods/outputs.ts b/src/generated/forge-mcp/accounts/billing/paymentMethods/outputs.ts
index a15394566..de657537e 100644
--- a/src/generated/forge-mcp/accounts/billing/paymentMethods/outputs.ts
+++ b/src/generated/forge-mcp/accounts/billing/paymentMethods/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `bill-subs-api_payment_method` in responses.
  */
-export const bill_subs_api_payment_method_output: JsonSchema = {
+export const bill$$subs$$api_payment_method: JsonSchema = {
   "properties": {
     "address": {
       "type": "string"
@@ -99,7 +99,7 @@ export const bill_subs_api_payment_method_output: JsonSchema = {
  * The schema of `bill-subs-api_payment_method_response_collection` in
  * responses.
  */
-export const bill_subs_api_payment_method_response_collection_output: JsonSchema = {
+export const bill$$subs$$api_payment_method_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-collection"
@@ -121,7 +121,7 @@ export const bill_subs_api_payment_method_response_collection_output: JsonSchema
 /**
  * The schema of `bill-subs-api_payment_method_response_single` in responses.
  */
-export const bill_subs_api_payment_method_response_single_output: JsonSchema = {
+export const bill$$subs$$api_payment_method_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
diff --git a/src/generated/forge-mcp/accounts/billing/paymentMethods/schemas.ts b/src/generated/forge-mcp/accounts/billing/paymentMethods/schemas.ts
index 9f83cd616..48c3c8da6 100644
--- a/src/generated/forge-mcp/accounts/billing/paymentMethods/schemas.ts
+++ b/src/generated/forge-mcp/accounts/billing/paymentMethods/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `bill-subs-api_payment_method`.
  */
-export const bill_subs_api_payment_method: JsonSchema = {
+export const bill$$subs$$api_payment_method: JsonSchema = {
   "properties": {
     "address": {
       "description": "Billing address line 1.",
diff --git a/src/generated/forge-mcp/accounts/billing/paymentMethods/tools.ts b/src/generated/forge-mcp/accounts/billing/paymentMethods/tools.ts
index 2c10b029e..99b5a7dad 100644
--- a/src/generated/forge-mcp/accounts/billing/paymentMethods/tools.ts
+++ b/src/generated/forge-mcp/accounts/billing/paymentMethods/tools.ts
@@ -1,59 +1,67 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  bill_subs_api_api_response_collection_output,
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_messages_output,
-  bill_subs_api_result_info_output,
+  bill$$subs$$api_api$$response$$collection,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_messages,
+  bill$$subs$$api_result_info,
 } from "../../../outputs.js";
-import { bill_subs_api_identifier } from "../../../schemas.js";
 import {
-  bill_subs_api_payment_method_output,
-  bill_subs_api_payment_method_response_collection_output,
-  bill_subs_api_payment_method_response_single_output,
+  bill$$subs$$api_payment_method,
+  bill$$subs$$api_payment_method_response_collection,
+  bill$$subs$$api_payment_method_response_single,
 } from "./outputs.js";
-import { bill_subs_api_payment_method } from "./schemas.js";
+import { bill$$subs$$api_payment_method as bill$$subs$$api_payment_method$ } from "./schemas.js";
 
 /**
- * The tools of `accounts.billing.payment_methods`.
+ * The tools of `accounts.billing.paymentMethods`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "accounts_billing_payment_methods_create",
+    name: "accounts_billing_paymentMethods_create",
     title: "Create Payment Method",
-    description: "Creates a new payment method for an account.",
+    description: "Creates a new payment method for an account.\n\nPOST /accounts/{account_id}/payment-methods",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/bill-subs-api_payment_method"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_payment_method_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method_output,
-        "bill-subs-api_payment_method_response_single": bill_subs_api_payment_method_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method,
+        "bill-subs-api_payment_method_response_single": bill$$subs$$api_payment_method_response_single,
       },
     },
     annotations: {
@@ -92,12 +100,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method_output,
-        "bill-subs-api_payment_method_response_single": bill_subs_api_payment_method_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method,
+        "bill-subs-api_payment_method_response_single": bill$$subs$$api_payment_method_response_single,
       },
     },
     request: (args) => ({
@@ -106,28 +114,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_payment_methods_delete",
+    name: "accounts_billing_paymentMethods_delete",
     title: "Delete Payment Method",
-    description: "Deletes a payment method from an account.",
+    description: "Deletes a payment method from an account.\n\nDELETE /accounts/{account_id}/payment-methods/{payment_method_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
-        "payment_method_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Payment method identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "payment_method_id": {
+              "description": "Payment method identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "payment_method_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "payment_method_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -165,10 +180,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -176,37 +191,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_payment_methods_get",
+    name: "accounts_billing_paymentMethods_get",
     title: "Get Payment Method",
-    description: "Gets a specific payment method for an account.",
+    description: "Gets a specific payment method for an account.\n\nGET /accounts/{account_id}/payment-methods/{payment_method_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
-        "payment_method_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Payment method identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "payment_method_id": {
+              "description": "Payment method identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "payment_method_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "payment_method_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_payment_method_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method_output,
-        "bill-subs-api_payment_method_response_single": bill_subs_api_payment_method_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method,
+        "bill-subs-api_payment_method_response_single": bill$$subs$$api_payment_method_response_single,
       },
     },
     annotations: {
@@ -245,12 +267,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method_output,
-        "bill-subs-api_payment_method_response_single": bill_subs_api_payment_method_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method,
+        "bill-subs-api_payment_method_response_single": bill$$subs$$api_payment_method_response_single,
       },
     },
     request: (args) => ({
@@ -258,43 +280,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_payment_methods_list",
+    name: "accounts_billing_paymentMethods_list",
     title: "List Payment Methods",
-    description: "Lists all payment methods for an account.",
+    description: "Lists all payment methods for an account.\n\nGET /accounts/{account_id}/payment-methods",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_payment_method_response_collection",
       $defs: {
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method_output,
-        "bill-subs-api_payment_method_response_collection": bill_subs_api_payment_method_response_collection_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method,
+        "bill-subs-api_payment_method_response_collection": bill$$subs$$api_payment_method_response_collection,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
       },
     },
     annotations: {
@@ -333,46 +368,53 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method_output,
-        "bill-subs-api_payment_method_response_collection": bill_subs_api_payment_method_response_collection_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method,
+        "bill-subs-api_payment_method_response_collection": bill$$subs$$api_payment_method_response_collection,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/payment-methods`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "accounts_billing_payment_methods_set_default",
+    name: "accounts_billing_paymentMethods_setDefault",
     title: "Set Default Payment Method",
-    description: "Sets a payment method as the default for an account.",
+    description: "Sets a payment method as the default for an account.\n\nPOST /accounts/{account_id}/payment-methods/{payment_method_id}/set-as-default",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
-        "payment_method_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Payment method identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "payment_method_id": {
+              "description": "Payment method identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "payment_method_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "payment_method_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -411,10 +453,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -422,42 +464,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_payment_methods_update",
+    name: "accounts_billing_paymentMethods_update",
     title: "Update Payment Method",
-    description: "Updates a payment method for an account.",
+    description: "Updates a payment method for an account.\n\nPUT /accounts/{account_id}/payment-methods/{payment_method_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/bill-subs-api_payment_method"
         },
-        "payment_method_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Payment method identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "payment_method_id": {
+              "description": "Payment method identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "payment_method_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "payment_method_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_payment_method_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method_output,
-        "bill-subs-api_payment_method_response_single": bill_subs_api_payment_method_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method,
+        "bill-subs-api_payment_method_response_single": bill$$subs$$api_payment_method_response_single,
       },
     },
     annotations: {
@@ -496,12 +547,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_method": bill_subs_api_payment_method_output,
-        "bill-subs-api_payment_method_response_single": bill_subs_api_payment_method_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_method": bill$$subs$$api_payment_method,
+        "bill-subs-api_payment_method_response_single": bill$$subs$$api_payment_method_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/billing/tools.ts b/src/generated/forge-mcp/accounts/billing/tools.ts
index 02cabf85d..dd27c5a6a 100644
--- a/src/generated/forge-mcp/accounts/billing/tools.ts
+++ b/src/generated/forge-mcp/accounts/billing/tools.ts
@@ -1,21 +1,20 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_messages_output,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_messages,
 } from "../../outputs.js";
-import { bill_subs_api_identifier } from "../../schemas.js";
 import {
-  bill_subs_api_account_billing_history_output,
-  bill_subs_api_account_credits_response_output,
-  bill_subs_api_bad_debt_info_output,
-  bill_subs_api_bad_debt_response_single_output,
-  bill_subs_api_client_secret_response_single_output,
-  bill_subs_api_unpaid_invoices_response_single_output,
+  bill$$subs$$api_account_billing_history,
+  bill$$subs$$api_account_credits_response,
+  bill$$subs$$api_bad_debt_info,
+  bill$$subs$$api_bad_debt_response_single,
+  bill$$subs$$api_client_secret_response_single,
+  bill$$subs$$api_unpaid_invoices_response_single,
 } from "./outputs.js";
 
 /**
@@ -23,31 +22,38 @@ import {
  */
 export const tools: readonly Tool[] = [
   {
-    name: "accounts_billing_create_setup_intent",
+    name: "accounts_billing_createSetupIntent",
     title: "Create Setup Intent",
-    description: "Creates a Stripe setup intent for adding a payment method to an account. Returns a client secret for frontend payment method collection.",
+    description: "Creates a Stripe setup intent for adding a payment method to an account. Returns a client secret for frontend payment method collection.\n\nPOST /accounts/{account_id}/client-secret",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_client_secret_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_client_secret_response_single": bill_subs_api_client_secret_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_client_secret_response_single": bill$$subs$$api_client_secret_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -77,11 +83,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_client_secret_response_single": bill_subs_api_client_secret_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_client_secret_response_single": bill$$subs$$api_client_secret_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -89,33 +95,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_get_bad_debt",
+    name: "accounts_billing_getBadDebt",
     title: "Get Account Bad Debt",
-    description: "Gets bad debt information for an account, including outstanding invoices and total debt amount.",
+    description: "Gets bad debt information for an account, including outstanding invoices and total debt amount.\n\nGET /accounts/{account_id}/billing/bad-debt",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_bad_debt_response_single",
       $defs: {
-        "bill-subs-api_account_billing_history": bill_subs_api_account_billing_history_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_bad_debt_info": bill_subs_api_bad_debt_info_output,
-        "bill-subs-api_bad_debt_response_single": bill_subs_api_bad_debt_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_account_billing_history": bill$$subs$$api_account_billing_history,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_bad_debt_info": bill$$subs$$api_bad_debt_info,
+        "bill-subs-api_bad_debt_response_single": bill$$subs$$api_bad_debt_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -145,13 +158,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_account_billing_history": bill_subs_api_account_billing_history_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_bad_debt_info": bill_subs_api_bad_debt_info_output,
-        "bill-subs-api_bad_debt_response_single": bill_subs_api_bad_debt_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_account_billing_history": bill$$subs$$api_account_billing_history,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_bad_debt_info": bill$$subs$$api_bad_debt_info,
+        "bill-subs-api_bad_debt_response_single": bill$$subs$$api_bad_debt_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -159,31 +172,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_get_credits",
+    name: "accounts_billing_getCredits",
     title: "Get Account Credits",
-    description: "Gets the credit balance and eligibility for an account.",
+    description: "Gets the credit balance and eligibility for an account.\n\nGET /accounts/{account_id}/billing/credits",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_account_credits_response",
       $defs: {
-        "bill-subs-api_account_credits_response": bill_subs_api_account_credits_response_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_account_credits_response": bill$$subs$$api_account_credits_response,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -222,11 +242,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_account_credits_response": bill_subs_api_account_credits_response_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_account_credits_response": bill$$subs$$api_account_credits_response,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -234,32 +254,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_get_receipt_pdf",
+    name: "accounts_billing_getReceiptPdf",
     title: "Get Receipt PDF",
-    description: "Downloads a receipt as a PDF document.",
+    description: "Downloads a receipt as a PDF document.\n\nGET /accounts/{account_id}/receipts/{receipt_id}/pdf",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
-        "doctype": {
-          "description": "The document type to generate.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "receipt_id": {
+              "description": "Receipt identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "receipt_id"
+          ],
+          "type": "object"
         },
-        "receipt_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Receipt identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "doctype": {
+              "description": "The document type to generate.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "receipt_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -286,44 +319,51 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/receipts/${pathParam(args, "receipt_id")}/pdf`,
       query: [
-        ["doctype", args["doctype"], true],
+        ["doctype", param(args, "query", "doctype"), true],
       ],
     }),
   },
   {
-    name: "accounts_billing_get_unpaid_invoices",
+    name: "accounts_billing_getUnpaidInvoices",
     title: "Get Unpaid Invoices",
-    description: "Gets unpaid invoice information for an account.",
+    description: "Gets unpaid invoice information for an account.\n\nGET /accounts/{account_id}/billing/unpaid-invoice",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_unpaid_invoices_response_single",
       $defs: {
-        "bill-subs-api_account_billing_history": bill_subs_api_account_billing_history_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_unpaid_invoices_response_single": bill_subs_api_unpaid_invoices_response_single_output,
+        "bill-subs-api_account_billing_history": bill$$subs$$api_account_billing_history,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_unpaid_invoices_response_single": bill$$subs$$api_unpaid_invoices_response_single,
       },
     },
     annotations: {
@@ -353,12 +393,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_account_billing_history": bill_subs_api_account_billing_history_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_unpaid_invoices_response_single": bill_subs_api_unpaid_invoices_response_single_output,
+        "bill-subs-api_account_billing_history": bill$$subs$$api_account_billing_history,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_unpaid_invoices_response_single": bill$$subs$$api_unpaid_invoices_response_single,
       },
     },
     request: (args) => ({
@@ -366,16 +406,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_pay_invoice",
+    name: "accounts_billing_payInvoice",
     title: "Pay Invoice",
-    description: "Pays an outstanding invoice for an account. Returns a Stripe client secret when Strong Customer Authentication (SCA) is required to complete the payment.",
+    description: "Pays an outstanding invoice for an account. Returns a Stripe client secret when Strong Customer Authentication (SCA) is required to complete the payment.\n\nPOST /accounts/{account_id}/pay-invoice",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "properties": {
             "invoice_id": {
@@ -392,23 +428,34 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_client_secret_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_client_secret_response_single": bill_subs_api_client_secret_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_client_secret_response_single": bill$$subs$$api_client_secret_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -441,11 +488,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_client_secret_response_single": bill_subs_api_client_secret_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_client_secret_response_single": bill$$subs$$api_client_secret_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -454,16 +501,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_billing_toggle_pdf_invoices",
+    name: "accounts_billing_togglePdfInvoices",
     title: "Toggle PDF Invoices",
-    description: "Toggles PDF invoice generation for an account.",
+    description: "Toggles PDF invoice generation for an account.\n\nPATCH /accounts/{account_id}/invoices",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "properties": {
             "toggle": {
@@ -472,22 +515,33 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_api-response-single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -517,10 +571,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/categories/outputs.ts b/src/generated/forge-mcp/accounts/categories/outputs.ts
index 97ef66312..46e03534c 100644
--- a/src/generated/forge-mcp/accounts/categories/outputs.ts
+++ b/src/generated/forge-mcp/accounts/categories/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `alexandria_categories` in responses.
  */
-export const alexandria_categories_output: JsonSchema = {
+export const alexandria_categories: JsonSchema = {
   "items": {
     "$ref": "#/$defs/alexandria_category"
   },
@@ -16,19 +16,19 @@ export const alexandria_categories_output: JsonSchema = {
 /**
  * The schema of `alexandria_category` in responses.
  */
-export const alexandria_category_output: JsonSchema = {
+export const alexandria_category: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/alexandria_category_created_at"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/alexandria_category_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/alexandria_category_id"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/alexandria_category_name"
+      "type": "string"
     }
   },
   "required": [
@@ -40,31 +40,10 @@ export const alexandria_category_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `alexandria_category_created_at` in responses.
- */
-export const alexandria_category_created_at_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `alexandria_category_description` in responses.
- */
-export const alexandria_category_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `alexandria_category_name` in responses.
- */
-export const alexandria_category_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `alexandria_get_categories_response` in responses.
  */
-export const alexandria_get_categories_response_output: JsonSchema = {
+export const alexandria_get_categories_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/alexandria_api-response-collection"
@@ -83,7 +62,7 @@ export const alexandria_get_categories_response_output: JsonSchema = {
 /**
  * The schema of `alexandria_get_category_response` in responses.
  */
-export const alexandria_get_category_response_output: JsonSchema = {
+export const alexandria_get_category_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/alexandria_api-response-common"
diff --git a/src/generated/forge-mcp/accounts/categories/tools.ts b/src/generated/forge-mcp/accounts/categories/tools.ts
index e349aba74..77069cfca 100644
--- a/src/generated/forge-mcp/accounts/categories/tools.ts
+++ b/src/generated/forge-mcp/accounts/categories/tools.ts
@@ -1,23 +1,18 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  alexandria_api_response_collection_output,
-  alexandria_api_response_common_failure_output,
-  alexandria_api_response_common_output,
-  alexandria_category_id_output,
-  alexandria_messages_output,
+  alexandria_api$$response$$collection,
+  alexandria_api$$response$$common,
+  alexandria_api_response_common_failure,
+  alexandria_messages,
 } from "../outputs.js";
-import { alexandria_category_id } from "../schemas.js";
 import {
-  alexandria_categories_output,
-  alexandria_category_created_at_output,
-  alexandria_category_description_output,
-  alexandria_category_name_output,
-  alexandria_category_output,
-  alexandria_get_categories_response_output,
-  alexandria_get_category_response_output,
+  alexandria_categories,
+  alexandria_category,
+  alexandria_get_categories_response,
+  alexandria_get_category_response,
 } from "./outputs.js";
 
 /**
@@ -27,38 +22,41 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_categories_get",
     title: "Get application category",
-    description: "Retrieve an application category by its numeric ID.",
+    description: "Retrieve an application category by its numeric ID.\n\nGET /accounts/{account_id}/resource-library/categories/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "id": {
-          "$ref": "#/$defs/alexandria_category_id",
-          "description": "Application category ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Application category ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
-      $defs: {
-        "alexandria_category_id": alexandria_category_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/alexandria_get_category_response",
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_category": alexandria_category_output,
-        "alexandria_category_created_at": alexandria_category_created_at_output,
-        "alexandria_category_description": alexandria_category_description_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_category_name": alexandria_category_name_output,
-        "alexandria_get_category_response": alexandria_get_category_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_category": alexandria_category,
+        "alexandria_get_category_response": alexandria_get_category_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     annotations: {
@@ -88,15 +86,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_api_response_common_failure": alexandria_api_response_common_failure_output,
-        "alexandria_category": alexandria_category_output,
-        "alexandria_category_created_at": alexandria_category_created_at_output,
-        "alexandria_category_description": alexandria_category_description_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_category_name": alexandria_category_name_output,
-        "alexandria_get_category_response": alexandria_get_category_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_api_response_common_failure": alexandria_api_response_common_failure,
+        "alexandria_category": alexandria_category,
+        "alexandria_get_category_response": alexandria_get_category_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     request: (args) => ({
@@ -106,46 +100,58 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_categories_list",
     title: "List application categories",
-    description: "List the categories available for classifying applications, ordered by name.\nResults are paginated by `offset` or `cursor`.",
+    description: "List the categories available for classifying applications, ordered by name.\nResults are paginated by `offset` or `cursor`.\n\nGET /accounts/{account_id}/resource-library/categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque value from `result_info.cursor` of the previous response. Returns the\ncategories that follow it. `limit` may change between requests. An empty value\nis the same as no cursor. A modified cursor, or one returned by a different list,\nreturns `400`.\n",
-          "type": "string"
-        },
-        "limit": {
-          "default": 25,
-          "description": "Number of results to return. Defaults to 25; values are clamped to 1–250.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "description": "Number of results to skip. Defaults to 0; negative values are clamped to 0. Ignored when `cursor` is provided.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque value from `result_info.cursor` of the previous response. Returns the\ncategories that follow it. `limit` may change between requests. An empty value\nis the same as no cursor. A modified cursor, or one returned by a different list,\nreturns `400`.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 25,
+              "description": "Number of results to return. Defaults to 25; values are clamped to 1–250.",
+              "type": "integer"
+            },
+            "offset": {
+              "default": 0,
+              "description": "Number of results to skip. Defaults to 0; negative values are clamped to 0. Ignored when `cursor` is provided.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/alexandria_get_categories_response",
       $defs: {
-        "alexandria_api-response-collection": alexandria_api_response_collection_output,
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_categories": alexandria_categories_output,
-        "alexandria_category": alexandria_category_output,
-        "alexandria_category_created_at": alexandria_category_created_at_output,
-        "alexandria_category_description": alexandria_category_description_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_category_name": alexandria_category_name_output,
-        "alexandria_get_categories_response": alexandria_get_categories_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-collection": alexandria_api$$response$$collection,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_categories": alexandria_categories,
+        "alexandria_category": alexandria_category,
+        "alexandria_get_categories_response": alexandria_get_categories_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     annotations: {
@@ -178,25 +184,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "alexandria_api-response-collection": alexandria_api_response_collection_output,
-        "alexandria_api-response-common": alexandria_api_response_common_output,
-        "alexandria_api_response_common_failure": alexandria_api_response_common_failure_output,
-        "alexandria_categories": alexandria_categories_output,
-        "alexandria_category": alexandria_category_output,
-        "alexandria_category_created_at": alexandria_category_created_at_output,
-        "alexandria_category_description": alexandria_category_description_output,
-        "alexandria_category_id": alexandria_category_id_output,
-        "alexandria_category_name": alexandria_category_name_output,
-        "alexandria_get_categories_response": alexandria_get_categories_response_output,
-        "alexandria_messages": alexandria_messages_output,
+        "alexandria_api-response-collection": alexandria_api$$response$$collection,
+        "alexandria_api-response-common": alexandria_api$$response$$common,
+        "alexandria_api_response_common_failure": alexandria_api_response_common_failure,
+        "alexandria_categories": alexandria_categories,
+        "alexandria_category": alexandria_category,
+        "alexandria_get_categories_response": alexandria_get_categories_response,
+        "alexandria_messages": alexandria_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/resource-library/categories`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/accounts/entitlements/outputs.ts b/src/generated/forge-mcp/accounts/entitlements/outputs.ts
index 1966b8334..2f0fb5c53 100644
--- a/src/generated/forge-mcp/accounts/entitlements/outputs.ts
+++ b/src/generated/forge-mcp/accounts/entitlements/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `entitlements_allocation` in responses.
  */
-export const entitlements_allocation_output: JsonSchema = {
+export const entitlements_allocation: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -63,7 +63,7 @@ export const entitlements_allocation_output: JsonSchema = {
 /**
  * The schema of `entitlements_api_error` in responses.
  */
-export const entitlements_api_error_output: JsonSchema = {
+export const entitlements_api_error: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -82,7 +82,7 @@ export const entitlements_api_error_output: JsonSchema = {
 /**
  * The schema of `entitlements_api_message` in responses.
  */
-export const entitlements_api_message_output: JsonSchema = {
+export const entitlements_api_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -101,7 +101,7 @@ export const entitlements_api_message_output: JsonSchema = {
 /**
  * The schema of `entitlements_api_response_failure` in responses.
  */
-export const entitlements_api_response_failure_output: JsonSchema = {
+export const entitlements_api_response_failure: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -141,7 +141,7 @@ export const entitlements_api_response_failure_output: JsonSchema = {
 /**
  * The schema of `entitlements_entitlement` in responses.
  */
-export const entitlements_entitlement_output: JsonSchema = {
+export const entitlements_entitlement: JsonSchema = {
   "properties": {
     "allocation": {
       "$ref": "#/$defs/entitlements_allocation"
@@ -176,7 +176,7 @@ export const entitlements_entitlement_output: JsonSchema = {
 /**
  * The schema of `entitlements_entitlements_response` in responses.
  */
-export const entitlements_entitlements_response_output: JsonSchema = {
+export const entitlements_entitlements_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -212,7 +212,7 @@ export const entitlements_entitlements_response_output: JsonSchema = {
 /**
  * The schema of `entitlements_feature` in responses.
  */
-export const entitlements_feature_output: JsonSchema = {
+export const entitlements_feature: JsonSchema = {
   "properties": {
     "feature_set": {
       "type": "string"
diff --git a/src/generated/forge-mcp/accounts/entitlements/schemas.ts b/src/generated/forge-mcp/accounts/entitlements/schemas.ts
deleted file mode 100644
index cabb090ee..000000000
--- a/src/generated/forge-mcp/accounts/entitlements/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `entitlements_identifier`.
- */
-export const entitlements_identifier: JsonSchema = {
-  "description": "Identifier tag.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/accounts/entitlements/tools.ts b/src/generated/forge-mcp/accounts/entitlements/tools.ts
index 2aab973d3..7f387822e 100644
--- a/src/generated/forge-mcp/accounts/entitlements/tools.ts
+++ b/src/generated/forge-mcp/accounts/entitlements/tools.ts
@@ -3,15 +3,14 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  entitlements_allocation_output,
-  entitlements_api_error_output,
-  entitlements_api_message_output,
-  entitlements_api_response_failure_output,
-  entitlements_entitlement_output,
-  entitlements_entitlements_response_output,
-  entitlements_feature_output,
+  entitlements_allocation,
+  entitlements_api_error,
+  entitlements_api_message,
+  entitlements_api_response_failure,
+  entitlements_entitlement,
+  entitlements_entitlements_response,
+  entitlements_feature,
 } from "./outputs.js";
-import { entitlements_identifier } from "./schemas.js";
 
 /**
  * The tools of `accounts.entitlements`.
@@ -20,30 +19,37 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_entitlements_get",
     title: "Get account or zone Entitlements",
-    description: "Returns the list of entitlements (features and their allocations) for a given account or zone. Each entitlement describes a product feature the account or zone is permitted to use and the allocation value (boolean, count, range, enum, or string) that governs its behaviour.",
+    description: "Returns the list of entitlements (features and their allocations) for a given account or zone. Each entitlement describes a product feature the account or zone is permitted to use and the allocation value (boolean, count, range, enum, or string) that governs its behaviour.\n\nGET /{account_or_zone}/{account_or_zone_id}/entitlements",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/entitlements_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "entitlements_identifier": entitlements_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -88,13 +94,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "entitlements_allocation": entitlements_allocation_output,
-        "entitlements_api_error": entitlements_api_error_output,
-        "entitlements_api_message": entitlements_api_message_output,
-        "entitlements_api_response_failure": entitlements_api_response_failure_output,
-        "entitlements_entitlement": entitlements_entitlement_output,
-        "entitlements_entitlements_response": entitlements_entitlements_response_output,
-        "entitlements_feature": entitlements_feature_output,
+        "entitlements_allocation": entitlements_allocation,
+        "entitlements_api_error": entitlements_api_error,
+        "entitlements_api_message": entitlements_api_message,
+        "entitlements_api_response_failure": entitlements_api_response_failure,
+        "entitlements_entitlement": entitlements_entitlement,
+        "entitlements_entitlements_response": entitlements_entitlements_response,
+        "entitlements_feature": entitlements_feature,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/logs/audit/outputs.ts b/src/generated/forge-mcp/accounts/logs/audit/outputs.ts
index 02d21007c..60fbf39b3 100644
--- a/src/generated/forge-mcp/accounts/logs/audit/outputs.ts
+++ b/src/generated/forge-mcp/accounts/logs/audit/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `aaa_audit-logs-v2` in responses.
  */
-export const aaa_audit_logs_v2_output: JsonSchema = {
+export const aaa_audit$$logs$$v2: JsonSchema = {
   "properties": {
     "account": {
       "properties": {
@@ -45,7 +45,7 @@ export const aaa_audit_logs_v2_output: JsonSchema = {
       ]
     },
     "id": {
-      "$ref": "#/$defs/aaa_identifier-2"
+      "type": "string"
     },
     "raw": {
       "$ref": "#/$defs/aaa_audit-log-raw"
@@ -91,7 +91,7 @@ export const aaa_audit_logs_v2_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-logs-v2-history-response-collection` in responses.
  */
-export const aaa_audit_logs_v2_history_response_collection_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$history$$response$$collection: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages-2"
@@ -125,7 +125,7 @@ export const aaa_audit_logs_v2_history_response_collection_output: JsonSchema =
  * The schema of `aaa_audit-logs-v2-product-categories-response-collection` in
  * responses.
  */
-export const aaa_audit_logs_v2_product_categories_response_collection_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$product$$categories$$response$$collection: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages-2"
@@ -149,7 +149,7 @@ export const aaa_audit_logs_v2_product_categories_response_collection_output: Js
 /**
  * The schema of `aaa_audit-logs-v2-product-category` in responses.
  */
-export const aaa_audit_logs_v2_product_category_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$product$$category: JsonSchema = {
   "properties": {
     "label": {
       "type": "string"
@@ -170,7 +170,7 @@ export const aaa_audit_logs_v2_product_category_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-logs-v2-product-category-item` in responses.
  */
-export const aaa_audit_logs_v2_product_category_item_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$product$$category$$item: JsonSchema = {
   "properties": {
     "label": {
       "type": "string"
@@ -185,7 +185,7 @@ export const aaa_audit_logs_v2_product_category_item_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-logs-v2-response-collection` in responses.
  */
-export const aaa_audit_logs_v2_response_collection_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_audit-logs-response-collection"
diff --git a/src/generated/forge-mcp/accounts/logs/audit/tools.ts b/src/generated/forge-mcp/accounts/logs/audit/tools.ts
index b2e7376d7..a415572ef 100644
--- a/src/generated/forge-mcp/accounts/logs/audit/tools.ts
+++ b/src/generated/forge-mcp/accounts/logs/audit/tools.ts
@@ -1,27 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  aaa_api_response_common_failure_2_output,
-  aaa_audit_log_action_output,
-  aaa_audit_log_actor_base_output,
-  aaa_audit_log_raw_output,
-  aaa_audit_logs_response_collection_output,
-  aaa_audit_logs_v2_history_not_found_output,
-  aaa_audit_logs_v2_history_result_info_output,
-  aaa_history_status_output,
-  aaa_identifier_2_output,
-  aaa_messages_2_output,
-  aaa_result_info_output,
+  aaa_api$$response$$common$$failure$$2,
+  aaa_audit$$log$$action,
+  aaa_audit$$log$$actor$$base,
+  aaa_audit$$log$$raw,
+  aaa_audit$$logs$$response$$collection,
+  aaa_audit$$logs$$v2$$history$$not$$found,
+  aaa_audit$$logs$$v2$$history$$result$$info,
+  aaa_messages$$2,
+  aaa_result_info,
 } from "../../../outputs.js";
 import {
-  aaa_audit_logs_v2_history_response_collection_output,
-  aaa_audit_logs_v2_output,
-  aaa_audit_logs_v2_product_categories_response_collection_output,
-  aaa_audit_logs_v2_product_category_item_output,
-  aaa_audit_logs_v2_product_category_output,
-  aaa_audit_logs_v2_response_collection_output,
+  aaa_audit$$logs$$v2,
+  aaa_audit$$logs$$v2$$history$$response$$collection,
+  aaa_audit$$logs$$v2$$product$$categories$$response$$collection,
+  aaa_audit$$logs$$v2$$product$$category,
+  aaa_audit$$logs$$v2$$product$$category$$item,
+  aaa_audit$$logs$$v2$$response$$collection,
 } from "./outputs.js";
 
 /**
@@ -31,73 +29,90 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_logs_audit_history",
     title: "Get resource change history from an account audit log entry (Version 2)",
-    description: "Returns the chronological change history for the resource identified by the given audit log entry.\n\nThe endpoint first locates the source audit log entry by `id` (using `action_time` to narrow the lookup window), derives identifying filters from that entry, and then returns matching audit logs within the `since`/`before` window.\n\nThe `result_info.history_status` field indicates the quality of the resource identification used:\n- `exact`: Resource was identified by the resource URI.\n- `approximate`: Resource was identified without the resource URI.\n- `unavailable`: The source audit log entry did not contain enough information to identify the resource; an empty result is returned.",
+    description: "Returns the chronological change history for the resource identified by the given audit log entry.\n\nThe endpoint first locates the source audit log entry by `id` (using `action_time` to narrow the lookup window), derives identifying filters from that entry, and then returns matching audit logs within the `since`/`before` window.\n\nThe `result_info.history_status` field indicates the quality of the resource identification used:\n- `exact`: Resource was identified by the resource URI.\n- `approximate`: Resource was identified without the resource URI.\n- `unavailable`: The source audit log entry did not contain enough information to identify the resource; an empty result is returned.\n\nGET /accounts/{account_id}/logs/audit/{id}/history",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "The unique ID that identifies the account.",
-          "type": "string"
-        },
-        "action_time": {
-          "description": "RFC3339 timestamp of the source audit log entry's action time. Used to narrow the source-entry lookup window. Provide the `action.time` value from the audit log identified by `id`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "before": {
-          "description": "Limits the returned results to logs older than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
-          "format": "date",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "The cursor is an opaque token used to paginate through large sets of records. It indicates the position from which to continue when requesting the next set of records. A valid cursor value can be obtained from the cursor object in the result_info structure of a previous response.",
-          "type": "string"
-        },
-        "direction": {
-          "default": "desc",
-          "description": "Sets sorting order.",
-          "enum": [
-            "desc",
-            "asc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The unique ID that identifies the account.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The ID of the audit log to fetch resource history for.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
           ],
-          "type": "string"
-        },
-        "id": {
-          "description": "The ID of the audit log to fetch resource history for.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "limit": {
-          "default": 100,
-          "description": "The number limits the objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
-          "type": "number"
-        },
-        "since": {
-          "description": "Limits the returned results to logs newer than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
-          "format": "date",
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "action_time": {
+              "description": "RFC3339 timestamp of the source audit log entry's action time. Used to narrow the source-entry lookup window. Provide the `action.time` value from the audit log identified by `id`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "before": {
+              "description": "Limits the returned results to logs older than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
+              "format": "date",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "The cursor is an opaque token used to paginate through large sets of records. It indicates the position from which to continue when requesting the next set of records. A valid cursor value can be obtained from the cursor object in the result_info structure of a previous response.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "desc",
+              "description": "Sets sorting order.",
+              "enum": [
+                "desc",
+                "asc"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 100,
+              "description": "The number limits the objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
+              "type": "number"
+            },
+            "since": {
+              "description": "Limits the returned results to logs newer than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
+              "format": "date",
+              "type": "string"
+            }
+          },
+          "required": [
+            "action_time",
+            "since",
+            "before"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id",
-        "action_time",
-        "since",
-        "before"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_audit-logs-v2-history-response-collection",
       $defs: {
-        "aaa_audit-log-action": aaa_audit_log_action_output,
-        "aaa_audit-log-actor-base": aaa_audit_log_actor_base_output,
-        "aaa_audit-log-raw": aaa_audit_log_raw_output,
-        "aaa_audit-logs-v2": aaa_audit_logs_v2_output,
-        "aaa_audit-logs-v2-history-response-collection": aaa_audit_logs_v2_history_response_collection_output,
-        "aaa_audit-logs-v2-history-result-info": aaa_audit_logs_v2_history_result_info_output,
-        "aaa_history-status": aaa_history_status_output,
-        "aaa_identifier-2": aaa_identifier_2_output,
-        "aaa_messages-2": aaa_messages_2_output,
+        "aaa_audit-log-action": aaa_audit$$log$$action,
+        "aaa_audit-log-actor-base": aaa_audit$$log$$actor$$base,
+        "aaa_audit-log-raw": aaa_audit$$log$$raw,
+        "aaa_audit-logs-v2": aaa_audit$$logs$$v2,
+        "aaa_audit-logs-v2-history-response-collection": aaa_audit$$logs$$v2$$history$$response$$collection,
+        "aaa_audit-logs-v2-history-result-info": aaa_audit$$logs$$v2$$history$$result$$info,
+        "aaa_messages-2": aaa_messages$$2,
       },
     },
     annotations: {
@@ -134,466 +149,482 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-2": aaa_api_response_common_failure_2_output,
-        "aaa_audit-log-action": aaa_audit_log_action_output,
-        "aaa_audit-log-actor-base": aaa_audit_log_actor_base_output,
-        "aaa_audit-log-raw": aaa_audit_log_raw_output,
-        "aaa_audit-logs-v2": aaa_audit_logs_v2_output,
-        "aaa_audit-logs-v2-history-not-found": aaa_audit_logs_v2_history_not_found_output,
-        "aaa_audit-logs-v2-history-response-collection": aaa_audit_logs_v2_history_response_collection_output,
-        "aaa_audit-logs-v2-history-result-info": aaa_audit_logs_v2_history_result_info_output,
-        "aaa_history-status": aaa_history_status_output,
-        "aaa_identifier-2": aaa_identifier_2_output,
-        "aaa_messages-2": aaa_messages_2_output,
+        "aaa_api-response-common-failure-2": aaa_api$$response$$common$$failure$$2,
+        "aaa_audit-log-action": aaa_audit$$log$$action,
+        "aaa_audit-log-actor-base": aaa_audit$$log$$actor$$base,
+        "aaa_audit-log-raw": aaa_audit$$log$$raw,
+        "aaa_audit-logs-v2": aaa_audit$$logs$$v2,
+        "aaa_audit-logs-v2-history-not-found": aaa_audit$$logs$$v2$$history$$not$$found,
+        "aaa_audit-logs-v2-history-response-collection": aaa_audit$$logs$$v2$$history$$response$$collection,
+        "aaa_audit-logs-v2-history-result-info": aaa_audit$$logs$$v2$$history$$result$$info,
+        "aaa_messages-2": aaa_messages$$2,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/logs/audit/${pathParam(args, "id")}/history`,
       query: [
-        ["action_time", args["action_time"], true],
-        ["since", args["since"], true],
-        ["before", args["before"], true],
-        ["direction", args["direction"], true],
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["action_time", param(args, "query", "action_time"), true],
+        ["since", param(args, "query", "since"), true],
+        ["before", param(args, "query", "before"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
     name: "accounts_logs_audit_list",
     title: "Get account audit logs (Version 2)",
-    description: "Gets a list of audit logs for an account.",
+    description: "Gets a list of audit logs for an account.\n\nGET /accounts/{account_id}/logs/audit",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "The unique id that identifies the account.",
-          "type": "string"
-        },
-        "account_name": {
-          "description": "Filters by the account name.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "account_name_not": {
-          "description": "Filters out audit logs by the account name.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "action_result": {
-          "description": "Filters by whether the action was successful or not.",
-          "items": {
-            "enum": [
-              "success",
-              "failure"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "action_result_not": {
-          "description": "Filters out audit logs by whether the action was successful or not.",
-          "items": {
-            "enum": [
-              "success",
-              "failure"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "action_type": {
-          "description": "Filters by the action type.",
-          "items": {
-            "enum": [
-              "create",
-              "delete",
-              "view",
-              "update"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "action_type_not": {
-          "description": "Filters out audit logs by the action type.",
-          "items": {
-            "enum": [
-              "create",
-              "delete",
-              "view",
-              "update"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_context": {
-          "description": "Filters by the actor context.\n- `api`: The action was performed through the API. The specific credential type was not recorded.\n- `api_key`: The action was authenticated with a Cloudflare Global API Key.\n- `api_token`: The action was authenticated with an API token.\n- `dash`: The action was performed through the Cloudflare dashboard.\n- `oauth`: The action was authenticated with an OAuth token.\n- `origin_ca_key`: The action was authenticated with an Origin CA key.\n",
-          "items": {
-            "enum": [
-              "api",
-              "api_key",
-              "api_token",
-              "dash",
-              "oauth",
-              "origin_ca_key"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_context_not": {
-          "description": "Filters out audit logs by the actor context.\n- `api`: The action was performed through the API. The specific credential type was not recorded.\n- `api_key`: The action was authenticated with a Cloudflare Global API Key.\n- `api_token`: The action was authenticated with an API token.\n- `dash`: The action was performed through the Cloudflare dashboard.\n- `oauth`: The action was authenticated with an OAuth token.\n- `origin_ca_key`: The action was authenticated with an Origin CA key.\n",
-          "items": {
-            "enum": [
-              "api",
-              "api_key",
-              "api_token",
-              "dash",
-              "oauth",
-              "origin_ca_key"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_email": {
-          "description": "Filters by the actor's email address.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_email_not": {
-          "description": "Filters out audit logs by the actor's email address.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_id": {
-          "description": "Filters by the actor ID. This can be either the Account ID or User ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_id_not": {
-          "description": "Filters out audit logs by the actor ID. This can be either the Account ID or User ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_ip_address": {
-          "description": "The IP address where the action was initiated.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_ip_address_not": {
-          "description": "Filters out audit logs IP address where the action was initiated.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_token_id": {
-          "description": "Filters by the API token ID when the actor context is an api_token or oauth.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_token_id_not": {
-          "description": "Filters out audit logs by the API token ID when the actor context is an api_token or oauth.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_token_name": {
-          "description": "Filters by the API token name when the actor context is an api_token or oauth.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_token_name_not": {
-          "description": "Filters out audit logs by the API token name when the actor context is an api_token or oauth.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_type": {
-          "description": "Filters by the actor type.",
-          "items": {
-            "enum": [
-              "account",
-              "cloudflare_admin",
-              "delegated_service",
-              "system",
-              "user"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_type_not": {
-          "description": "Filters out audit logs by the actor type.",
-          "items": {
-            "enum": [
-              "account",
-              "cloudflare_admin",
-              "delegated_service",
-              "system",
-              "user"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "audit_log_id": {
-          "description": "Finds a specific log by its ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "audit_log_id_not": {
-          "description": "Filters out audit logs by their IDs.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "before": {
-          "description": "Limits the returned results to logs older than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
-          "format": "date",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "The cursor is an opaque token used to paginate through large sets of records. It indicates the position from which to continue when requesting the next set of records. A valid cursor value can be obtained from the cursor object in the result_info structure of a previous response.",
-          "type": "string"
-        },
-        "direction": {
-          "default": "desc",
-          "description": "Sets sorting order.",
-          "enum": [
-            "desc",
-            "asc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The unique id that identifies the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "id": {
-          "description": "Finds a specific log by its ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "id_not": {
-          "description": "Filters out audit logs by their IDs.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 100,
-          "description": "The number limits the objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
-          "type": "number"
-        },
-        "product_category": {
-          "description": "Filters audit logs by one or more predefined product categories. Each product category expands into a curated set of resource_product values and is unioned with any explicit resource_product filter. Matched case-insensitively; unknown product categories return 400. Repeatable. Use the audit log product categories endpoint to discover the available values.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_cf_ray_id": {
-          "description": "Filters by the response CF Ray ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_cf_ray_id_not": {
-          "description": "Filters out audit logs by the response CF Ray ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_method": {
-          "description": "The HTTP method for the API call.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_method_not": {
-          "description": "Filters out audit logs by the HTTP method for the API call.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_status_code": {
-          "description": "The response status code that was returned.",
-          "items": {
-            "type": "integer"
-          },
-          "type": "array"
-        },
-        "raw_status_code_not": {
-          "description": "Filters out audit logs by the response status code that was returned.",
-          "items": {
-            "type": "integer"
-          },
-          "type": "array"
-        },
-        "raw_uri": {
-          "description": "Filters by the request URI.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_uri_not": {
-          "description": "Filters out audit logs by the request URI.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_id": {
-          "description": "Filters by the resource ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_id_not": {
-          "description": "Filters out audit logs by the resource ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_product": {
-          "description": "Filters audit logs by the Cloudflare product associated with the changed resource.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_product_not": {
-          "description": "Filters out audit logs by the Cloudflare product associated with the changed resource.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_scope": {
-          "description": "Filters by the resource scope, specifying whether the resource is associated with an user, an account, a zone, or a membership.",
-          "items": {
-            "enum": [
-              "accounts",
-              "user",
-              "zones",
-              "memberships"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_scope_not": {
-          "description": "Filters out audit logs by the resource scope, specifying whether the resource is associated with an user, an account, a zone, or a membership.",
-          "items": {
-            "enum": [
-              "accounts",
-              "user",
-              "zones",
-              "memberships"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_type": {
-          "description": "Filters audit logs based on the unique type of resource changed by the action.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_type_not": {
-          "description": "Filters out audit logs based on the unique type of resource changed by the action.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "since": {
-          "description": "Limits the returned results to logs newer than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
-          "format": "date",
-          "type": "string"
-        },
-        "zone_id": {
-          "description": "Filters by the zone ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "zone_id_not": {
-          "description": "Filters out audit logs by the zone ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "zone_name": {
-          "description": "Filters by the zone name associated with the change.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "zone_name_not": {
-          "description": "Filters out audit logs by the zone name associated with the change.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "account_name": {
+              "description": "Filters by the account name.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "account_name.not": {
+              "description": "Filters out audit logs by the account name.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "action_result": {
+              "description": "Filters by whether the action was successful or not.",
+              "items": {
+                "enum": [
+                  "success",
+                  "failure"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "action_result.not": {
+              "description": "Filters out audit logs by whether the action was successful or not.",
+              "items": {
+                "enum": [
+                  "success",
+                  "failure"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "action_type": {
+              "description": "Filters by the action type.",
+              "items": {
+                "enum": [
+                  "create",
+                  "delete",
+                  "view",
+                  "update"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "action_type.not": {
+              "description": "Filters out audit logs by the action type.",
+              "items": {
+                "enum": [
+                  "create",
+                  "delete",
+                  "view",
+                  "update"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_context": {
+              "description": "Filters by the actor context.\n- `api`: The action was performed through the API. The specific credential type was not recorded.\n- `api_key`: The action was authenticated with a Cloudflare Global API Key.\n- `api_token`: The action was authenticated with an API token.\n- `dash`: The action was performed through the Cloudflare dashboard.\n- `oauth`: The action was authenticated with an OAuth token.\n- `origin_ca_key`: The action was authenticated with an Origin CA key.",
+              "items": {
+                "enum": [
+                  "api",
+                  "api_key",
+                  "api_token",
+                  "dash",
+                  "oauth",
+                  "origin_ca_key"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_context.not": {
+              "description": "Filters out audit logs by the actor context.\n- `api`: The action was performed through the API. The specific credential type was not recorded.\n- `api_key`: The action was authenticated with a Cloudflare Global API Key.\n- `api_token`: The action was authenticated with an API token.\n- `dash`: The action was performed through the Cloudflare dashboard.\n- `oauth`: The action was authenticated with an OAuth token.\n- `origin_ca_key`: The action was authenticated with an Origin CA key.",
+              "items": {
+                "enum": [
+                  "api",
+                  "api_key",
+                  "api_token",
+                  "dash",
+                  "oauth",
+                  "origin_ca_key"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_email": {
+              "description": "Filters by the actor's email address.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_email.not": {
+              "description": "Filters out audit logs by the actor's email address.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_id": {
+              "description": "Filters by the actor ID. This can be either the Account ID or User ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_id.not": {
+              "description": "Filters out audit logs by the actor ID. This can be either the Account ID or User ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_ip_address": {
+              "description": "The IP address where the action was initiated.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_ip_address.not": {
+              "description": "Filters out audit logs IP address where the action was initiated.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_token_id": {
+              "description": "Filters by the API token ID when the actor context is an api_token or oauth.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_token_id.not": {
+              "description": "Filters out audit logs by the API token ID when the actor context is an api_token or oauth.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_token_name": {
+              "description": "Filters by the API token name when the actor context is an api_token or oauth.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_token_name.not": {
+              "description": "Filters out audit logs by the API token name when the actor context is an api_token or oauth.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_type": {
+              "description": "Filters by the actor type.",
+              "items": {
+                "enum": [
+                  "account",
+                  "cloudflare_admin",
+                  "delegated_service",
+                  "system",
+                  "user"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_type.not": {
+              "description": "Filters out audit logs by the actor type.",
+              "items": {
+                "enum": [
+                  "account",
+                  "cloudflare_admin",
+                  "delegated_service",
+                  "system",
+                  "user"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "audit_log_id": {
+              "description": "Finds a specific log by its ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "audit_log_id.not": {
+              "description": "Filters out audit logs by their IDs.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "before": {
+              "description": "Limits the returned results to logs older than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
+              "format": "date",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "The cursor is an opaque token used to paginate through large sets of records. It indicates the position from which to continue when requesting the next set of records. A valid cursor value can be obtained from the cursor object in the result_info structure of a previous response.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "desc",
+              "description": "Sets sorting order.",
+              "enum": [
+                "desc",
+                "asc"
+              ],
+              "type": "string"
+            },
+            "id": {
+              "description": "Finds a specific log by its ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "id.not": {
+              "description": "Filters out audit logs by their IDs.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 100,
+              "description": "The number limits the objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
+              "type": "number"
+            },
+            "product_category": {
+              "description": "Filters audit logs by one or more predefined product categories. Each product category expands into a curated set of resource_product values and is unioned with any explicit resource_product filter. Matched case-insensitively; unknown product categories return 400. Repeatable. Use the audit log product categories endpoint to discover the available values.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_cf_ray_id": {
+              "description": "Filters by the response CF Ray ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_cf_ray_id.not": {
+              "description": "Filters out audit logs by the response CF Ray ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_method": {
+              "description": "The HTTP method for the API call.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_method.not": {
+              "description": "Filters out audit logs by the HTTP method for the API call.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_status_code": {
+              "description": "The response status code that was returned.",
+              "items": {
+                "type": "integer"
+              },
+              "type": "array"
+            },
+            "raw_status_code.not": {
+              "description": "Filters out audit logs by the response status code that was returned.",
+              "items": {
+                "type": "integer"
+              },
+              "type": "array"
+            },
+            "raw_uri": {
+              "description": "Filters by the request URI.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_uri.not": {
+              "description": "Filters out audit logs by the request URI.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_id": {
+              "description": "Filters by the resource ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_id.not": {
+              "description": "Filters out audit logs by the resource ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_product": {
+              "description": "Filters audit logs by the Cloudflare product associated with the changed resource.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_product.not": {
+              "description": "Filters out audit logs by the Cloudflare product associated with the changed resource.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_scope": {
+              "description": "Filters by the resource scope, specifying whether the resource is associated with an user, an account, a zone, or a membership.",
+              "items": {
+                "enum": [
+                  "accounts",
+                  "user",
+                  "zones",
+                  "memberships"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_scope.not": {
+              "description": "Filters out audit logs by the resource scope, specifying whether the resource is associated with an user, an account, a zone, or a membership.",
+              "items": {
+                "enum": [
+                  "accounts",
+                  "user",
+                  "zones",
+                  "memberships"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_type": {
+              "description": "Filters audit logs based on the unique type of resource changed by the action.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_type.not": {
+              "description": "Filters out audit logs based on the unique type of resource changed by the action.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "since": {
+              "description": "Limits the returned results to logs newer than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
+              "format": "date",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Filters by the zone ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "zone_id.not": {
+              "description": "Filters out audit logs by the zone ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "zone_name": {
+              "description": "Filters by the zone name associated with the change.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "zone_name.not": {
+              "description": "Filters out audit logs by the zone name associated with the change.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
+          },
+          "required": [
+            "since",
+            "before"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "since",
-        "before"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_audit-logs-v2-response-collection",
       $defs: {
-        "aaa_audit-log-action": aaa_audit_log_action_output,
-        "aaa_audit-log-actor-base": aaa_audit_log_actor_base_output,
-        "aaa_audit-log-raw": aaa_audit_log_raw_output,
-        "aaa_audit-logs-response-collection": aaa_audit_logs_response_collection_output,
-        "aaa_audit-logs-v2": aaa_audit_logs_v2_output,
-        "aaa_audit-logs-v2-response-collection": aaa_audit_logs_v2_response_collection_output,
-        "aaa_identifier-2": aaa_identifier_2_output,
-        "aaa_messages-2": aaa_messages_2_output,
-        "aaa_result_info": aaa_result_info_output,
+        "aaa_audit-log-action": aaa_audit$$log$$action,
+        "aaa_audit-log-actor-base": aaa_audit$$log$$actor$$base,
+        "aaa_audit-log-raw": aaa_audit$$log$$raw,
+        "aaa_audit-logs-response-collection": aaa_audit$$logs$$response$$collection,
+        "aaa_audit-logs-v2": aaa_audit$$logs$$v2,
+        "aaa_audit-logs-v2-response-collection": aaa_audit$$logs$$v2$$response$$collection,
+        "aaa_messages-2": aaa_messages$$2,
+        "aaa_result_info": aaa_result_info,
       },
     },
     annotations: {
@@ -627,97 +658,106 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-2": aaa_api_response_common_failure_2_output,
-        "aaa_audit-log-action": aaa_audit_log_action_output,
-        "aaa_audit-log-actor-base": aaa_audit_log_actor_base_output,
-        "aaa_audit-log-raw": aaa_audit_log_raw_output,
-        "aaa_audit-logs-response-collection": aaa_audit_logs_response_collection_output,
-        "aaa_audit-logs-v2": aaa_audit_logs_v2_output,
-        "aaa_audit-logs-v2-response-collection": aaa_audit_logs_v2_response_collection_output,
-        "aaa_identifier-2": aaa_identifier_2_output,
-        "aaa_messages-2": aaa_messages_2_output,
-        "aaa_result_info": aaa_result_info_output,
+        "aaa_api-response-common-failure-2": aaa_api$$response$$common$$failure$$2,
+        "aaa_audit-log-action": aaa_audit$$log$$action,
+        "aaa_audit-log-actor-base": aaa_audit$$log$$actor$$base,
+        "aaa_audit-log-raw": aaa_audit$$log$$raw,
+        "aaa_audit-logs-response-collection": aaa_audit$$logs$$response$$collection,
+        "aaa_audit-logs-v2": aaa_audit$$logs$$v2,
+        "aaa_audit-logs-v2-response-collection": aaa_audit$$logs$$v2$$response$$collection,
+        "aaa_messages-2": aaa_messages$$2,
+        "aaa_result_info": aaa_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/logs/audit`,
       query: [
-        ["account_name", args["account_name"], true],
-        ["action_result", args["action_result"], true],
-        ["action_type", args["action_type"], true],
-        ["actor_context", args["actor_context"], true],
-        ["actor_email", args["actor_email"], true],
-        ["actor_id", args["actor_id"], true],
-        ["actor_ip_address", args["actor_ip_address"], true],
-        ["actor_token_id", args["actor_token_id"], true],
-        ["actor_token_name", args["actor_token_name"], true],
-        ["actor_type", args["actor_type"], true],
-        ["audit_log_id", args["audit_log_id"], true],
-        ["id", args["id"], true],
-        ["raw_cf_ray_id", args["raw_cf_ray_id"], true],
-        ["raw_method", args["raw_method"], true],
-        ["raw_status_code", args["raw_status_code"], true],
-        ["raw_uri", args["raw_uri"], true],
-        ["resource_id", args["resource_id"], true],
-        ["resource_product", args["resource_product"], true],
-        ["resource_type", args["resource_type"], true],
-        ["resource_scope", args["resource_scope"], true],
-        ["product_category", args["product_category"], true],
-        ["zone_id", args["zone_id"], true],
-        ["zone_name", args["zone_name"], true],
-        ["account_name.not", args["account_name_not"], true],
-        ["action_result.not", args["action_result_not"], true],
-        ["action_type.not", args["action_type_not"], true],
-        ["actor_context.not", args["actor_context_not"], true],
-        ["actor_email.not", args["actor_email_not"], true],
-        ["actor_id.not", args["actor_id_not"], true],
-        ["actor_ip_address.not", args["actor_ip_address_not"], true],
-        ["actor_token_id.not", args["actor_token_id_not"], true],
-        ["actor_token_name.not", args["actor_token_name_not"], true],
-        ["actor_type.not", args["actor_type_not"], true],
-        ["audit_log_id.not", args["audit_log_id_not"], true],
-        ["id.not", args["id_not"], true],
-        ["raw_cf_ray_id.not", args["raw_cf_ray_id_not"], true],
-        ["raw_method.not", args["raw_method_not"], true],
-        ["raw_status_code.not", args["raw_status_code_not"], true],
-        ["raw_uri.not", args["raw_uri_not"], true],
-        ["resource_id.not", args["resource_id_not"], true],
-        ["resource_product.not", args["resource_product_not"], true],
-        ["resource_type.not", args["resource_type_not"], true],
-        ["resource_scope.not", args["resource_scope_not"], true],
-        ["zone_id.not", args["zone_id_not"], true],
-        ["zone_name.not", args["zone_name_not"], true],
-        ["since", args["since"], true],
-        ["before", args["before"], true],
-        ["direction", args["direction"], true],
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["account_name", param(args, "query", "account_name"), true],
+        ["action_result", param(args, "query", "action_result"), true],
+        ["action_type", param(args, "query", "action_type"), true],
+        ["actor_context", param(args, "query", "actor_context"), true],
+        ["actor_email", param(args, "query", "actor_email"), true],
+        ["actor_id", param(args, "query", "actor_id"), true],
+        ["actor_ip_address", param(args, "query", "actor_ip_address"), true],
+        ["actor_token_id", param(args, "query", "actor_token_id"), true],
+        ["actor_token_name", param(args, "query", "actor_token_name"), true],
+        ["actor_type", param(args, "query", "actor_type"), true],
+        ["audit_log_id", param(args, "query", "audit_log_id"), true],
+        ["id", param(args, "query", "id"), true],
+        ["raw_cf_ray_id", param(args, "query", "raw_cf_ray_id"), true],
+        ["raw_method", param(args, "query", "raw_method"), true],
+        ["raw_status_code", param(args, "query", "raw_status_code"), true],
+        ["raw_uri", param(args, "query", "raw_uri"), true],
+        ["resource_id", param(args, "query", "resource_id"), true],
+        ["resource_product", param(args, "query", "resource_product"), true],
+        ["resource_type", param(args, "query", "resource_type"), true],
+        ["resource_scope", param(args, "query", "resource_scope"), true],
+        ["product_category", param(args, "query", "product_category"), true],
+        ["zone_id", param(args, "query", "zone_id"), true],
+        ["zone_name", param(args, "query", "zone_name"), true],
+        ["account_name.not", param(args, "query", "account_name.not"), true],
+        ["action_result.not", param(args, "query", "action_result.not"), true],
+        ["action_type.not", param(args, "query", "action_type.not"), true],
+        ["actor_context.not", param(args, "query", "actor_context.not"), true],
+        ["actor_email.not", param(args, "query", "actor_email.not"), true],
+        ["actor_id.not", param(args, "query", "actor_id.not"), true],
+        ["actor_ip_address.not", param(args, "query", "actor_ip_address.not"), true],
+        ["actor_token_id.not", param(args, "query", "actor_token_id.not"), true],
+        ["actor_token_name.not", param(args, "query", "actor_token_name.not"), true],
+        ["actor_type.not", param(args, "query", "actor_type.not"), true],
+        ["audit_log_id.not", param(args, "query", "audit_log_id.not"), true],
+        ["id.not", param(args, "query", "id.not"), true],
+        ["raw_cf_ray_id.not", param(args, "query", "raw_cf_ray_id.not"), true],
+        ["raw_method.not", param(args, "query", "raw_method.not"), true],
+        ["raw_status_code.not", param(args, "query", "raw_status_code.not"), true],
+        ["raw_uri.not", param(args, "query", "raw_uri.not"), true],
+        ["resource_id.not", param(args, "query", "resource_id.not"), true],
+        ["resource_product.not", param(args, "query", "resource_product.not"), true],
+        ["resource_type.not", param(args, "query", "resource_type.not"), true],
+        ["resource_scope.not", param(args, "query", "resource_scope.not"), true],
+        ["zone_id.not", param(args, "query", "zone_id.not"), true],
+        ["zone_name.not", param(args, "query", "zone_name.not"), true],
+        ["since", param(args, "query", "since"), true],
+        ["before", param(args, "query", "before"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
-    name: "accounts_logs_audit_product_categories",
+    name: "accounts_logs_audit_productCategories",
     title: "List account audit log product categories (Version 2)",
-    description: "Lists the available audit log product categories and the resource products each one expands to. Use these values with the product_category filter on the account audit logs endpoint.",
+    description: "Lists the available audit log product categories and the resource products each one expands to. Use these values with the product_category filter on the account audit logs endpoint.\n\nGET /accounts/{account_id}/logs/audit/product_categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "The unique id that identifies the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The unique id that identifies the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_audit-logs-v2-product-categories-response-collection",
       $defs: {
-        "aaa_audit-logs-v2-product-categories-response-collection": aaa_audit_logs_v2_product_categories_response_collection_output,
-        "aaa_audit-logs-v2-product-category": aaa_audit_logs_v2_product_category_output,
-        "aaa_audit-logs-v2-product-category-item": aaa_audit_logs_v2_product_category_item_output,
-        "aaa_messages-2": aaa_messages_2_output,
+        "aaa_audit-logs-v2-product-categories-response-collection": aaa_audit$$logs$$v2$$product$$categories$$response$$collection,
+        "aaa_audit-logs-v2-product-category": aaa_audit$$logs$$v2$$product$$category,
+        "aaa_audit-logs-v2-product-category-item": aaa_audit$$logs$$v2$$product$$category$$item,
+        "aaa_messages-2": aaa_messages$$2,
       },
     },
     annotations: {
@@ -751,11 +791,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-2": aaa_api_response_common_failure_2_output,
-        "aaa_audit-logs-v2-product-categories-response-collection": aaa_audit_logs_v2_product_categories_response_collection_output,
-        "aaa_audit-logs-v2-product-category": aaa_audit_logs_v2_product_category_output,
-        "aaa_audit-logs-v2-product-category-item": aaa_audit_logs_v2_product_category_item_output,
-        "aaa_messages-2": aaa_messages_2_output,
+        "aaa_api-response-common-failure-2": aaa_api$$response$$common$$failure$$2,
+        "aaa_audit-logs-v2-product-categories-response-collection": aaa_audit$$logs$$v2$$product$$categories$$response$$collection,
+        "aaa_audit-logs-v2-product-category": aaa_audit$$logs$$v2$$product$$category,
+        "aaa_audit-logs-v2-product-category-item": aaa_audit$$logs$$v2$$product$$category$$item,
+        "aaa_messages-2": aaa_messages$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/members/outputs.ts b/src/generated/forge-mcp/accounts/members/outputs.ts
index 28fc304c5..22ff6b632 100644
--- a/src/generated/forge-mcp/accounts/members/outputs.ts
+++ b/src/generated/forge-mcp/accounts/members/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_collection_member_response_with_policies` in responses.
  */
-export const iam_collection_member_response_with_policies_output: JsonSchema = {
+export const iam_collection_member_response_with_policies: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -28,13 +28,13 @@ export const iam_collection_member_response_with_policies_output: JsonSchema = {
 /**
  * The schema of `iam_member_with_policies` in responses.
  */
-export const iam_member_with_policies_output: JsonSchema = {
+export const iam_member_with_policies: JsonSchema = {
   "properties": {
     "email": {
-      "$ref": "#/$defs/iam_email"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_membership_components-schemas-identifier"
+      "type": "string"
     },
     "policies": {
       "items": {
@@ -58,19 +58,33 @@ export const iam_member_with_policies_output: JsonSchema = {
     "user": {
       "properties": {
         "email": {
-          "$ref": "#/$defs/iam_email"
+          "type": "string"
         },
         "first_name": {
-          "$ref": "#/$defs/iam_first_name"
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "id": {
-          "$ref": "#/$defs/iam_common_components-schemas-identifier"
+          "type": "string"
         },
         "last_name": {
-          "$ref": "#/$defs/iam_last_name"
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "two_factor_authentication_enabled": {
-          "$ref": "#/$defs/iam_two_factor_authentication_enabled"
+          "type": "boolean"
         }
       },
       "required": [
@@ -85,7 +99,7 @@ export const iam_member_with_policies_output: JsonSchema = {
 /**
  * The schema of `iam_single_member_response_with_policies` in responses.
  */
-export const iam_single_member_response_with_policies_output: JsonSchema = {
+export const iam_single_member_response_with_policies: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
diff --git a/src/generated/forge-mcp/accounts/members/schemas.ts b/src/generated/forge-mcp/accounts/members/schemas.ts
index 45a12b4ea..c0feb2e04 100644
--- a/src/generated/forge-mcp/accounts/members/schemas.ts
+++ b/src/generated/forge-mcp/accounts/members/schemas.ts
@@ -6,12 +6,12 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_create-member-with-policies`.
  */
-export const iam_create_member_with_policies: JsonSchema = {
+export const iam_create$$member$$with$$policies: JsonSchema = {
   "description": "Add Member with Policies",
   "properties": {
     "email": {
-      "$ref": "#/$defs/iam_email",
-      "description": "The contact email address of the user."
+      "description": "The contact email address of the user.",
+      "type": "string"
     },
     "policies": {
       "description": "Array of policies associated with this member.",
@@ -21,8 +21,12 @@ export const iam_create_member_with_policies: JsonSchema = {
       "type": "array"
     },
     "status": {
-      "$ref": "#/$defs/iam_member-invitation-status",
-      "description": "Status of the member invitation. If not provided during creation, defaults to 'pending'.\nChanging from 'accepted' back to 'pending' will trigger a replacement of the member resource in Terraform.\n"
+      "description": "Status of the member invitation. If not provided during creation, defaults to 'pending'.\nChanging from 'accepted' back to 'pending' will trigger a replacement of the member resource in Terraform.",
+      "enum": [
+        "accepted",
+        "pending"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -35,23 +39,28 @@ export const iam_create_member_with_policies: JsonSchema = {
 /**
  * The schema of `iam_create-member-with-roles`.
  */
-export const iam_create_member_with_roles: JsonSchema = {
+export const iam_create$$member$$with$$roles: JsonSchema = {
   "description": "Add Member with Account Roles",
   "properties": {
     "email": {
-      "$ref": "#/$defs/iam_email",
-      "description": "The contact email address of the user."
+      "description": "The contact email address of the user.",
+      "type": "string"
     },
     "roles": {
       "description": "Array of roles associated with this member.",
       "items": {
-        "$ref": "#/$defs/iam_role_components-schemas-identifier"
+        "description": "Role identifier tag.",
+        "type": "string"
       },
       "type": "array"
     },
     "status": {
-      "$ref": "#/$defs/iam_member-invitation-status",
-      "description": "Status of the member invitation. If not provided during creation, defaults to 'pending'.\nChanging from 'accepted' back to 'pending' will trigger a replacement of the member resource in Terraform.\n"
+      "description": "Status of the member invitation. If not provided during creation, defaults to 'pending'.\nChanging from 'accepted' back to 'pending' will trigger a replacement of the member resource in Terraform.",
+      "enum": [
+        "accepted",
+        "pending"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -68,8 +77,12 @@ export const iam_create_member_policy: JsonSchema = {
   "description": "create_member_policy",
   "properties": {
     "access": {
-      "$ref": "#/$defs/iam_access",
-      "description": "Allow or deny operations against the resources."
+      "description": "Allow or deny operations against the resources.",
+      "enum": [
+        "allow",
+        "deny"
+      ],
+      "type": "string"
     },
     "permission_groups": {
       "$ref": "#/$defs/iam_member_permission_groups",
@@ -88,18 +101,6 @@ export const iam_create_member_policy: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_member-invitation-status`.
- */
-export const iam_member_invitation_status: JsonSchema = {
-  "description": "Status of the member invitation. If not provided during creation, defaults to 'pending'.\nChanging from 'accepted' back to 'pending' will trigger a replacement of the member resource in Terraform.\n",
-  "enum": [
-    "accepted",
-    "pending"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `iam_member_permission_group`.
  */
@@ -159,7 +160,7 @@ export const iam_member_resource_groups: JsonSchema = {
 /**
  * The schema of `iam_update-member-with-policies`.
  */
-export const iam_update_member_with_policies: JsonSchema = {
+export const iam_update$$member$$with$$policies: JsonSchema = {
   "description": "Update Member with Policies",
   "properties": {
     "policies": {
@@ -179,7 +180,7 @@ export const iam_update_member_with_policies: JsonSchema = {
 /**
  * The schema of `iam_update-member-with-roles`.
  */
-export const iam_update_member_with_roles: JsonSchema = {
+export const iam_update$$member$$with$$roles: JsonSchema = {
   "description": "Update Member with Account Roles",
   "properties": {
     "roles": {
diff --git a/src/generated/forge-mcp/accounts/members/tools.ts b/src/generated/forge-mcp/accounts/members/tools.ts
index 90194f067..066e878e0 100644
--- a/src/generated/forge-mcp/accounts/members/tools.ts
+++ b/src/generated/forge-mcp/accounts/members/tools.ts
@@ -1,68 +1,46 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  iam_access_output,
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_id_output,
-  iam_api_response_single_output,
-  iam_common_components_schemas_identifier_output,
-  iam_email_output,
-  iam_first_name_output,
-  iam_grants_output,
-  iam_last_name_output,
-  iam_list_member_policy_output,
-  iam_membership_components_schemas_identifier_output,
-  iam_messages_2_output,
-  iam_permission_group_output,
-  iam_permission_groups_output,
-  iam_permissions_output,
-  iam_policy_identifier_output,
-  iam_resource_group_output,
-  iam_resource_groups_output,
-  iam_result_info_output,
-  iam_scope_key_output,
-  iam_scope_object_key_output,
-  iam_scope_object_output,
-  iam_scope_output,
-  iam_two_factor_authentication_enabled_output,
-} from "../../outputs.js";
-import {
-  iam_access,
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-  iam_email,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_api$$response$$single$$id,
   iam_grants,
-  iam_membership_components_schemas_identifier,
+  iam_list_member_policy,
+  iam_messages$$2,
+  iam_permission_group,
+  iam_permission_groups,
   iam_permissions,
-} from "../../schemas.js";
-import {
-  iam_role_components_schemas_identifier_output,
-  iam_role_output,
-} from "../outputs.js";
+  iam_resource_group,
+  iam_resource_groups,
+  iam_result_info,
+  iam_scope,
+  iam_scope_object,
+} from "../../outputs.js";
 import {
-  iam_role,
-  iam_role_components_schemas_identifier,
-} from "../schemas.js";
+  iam_grants as iam_grants$,
+  iam_permissions as iam_permissions$,
+} from "../../schemas.js";
+import { iam_role } from "../outputs.js";
+import { iam_role as iam_role$ } from "../schemas.js";
 import {
-  iam_collection_member_response_with_policies_output,
-  iam_member_with_policies_output,
-  iam_single_member_response_with_policies_output,
+  iam_collection_member_response_with_policies,
+  iam_member_with_policies,
+  iam_single_member_response_with_policies,
 } from "./outputs.js";
 import {
+  iam_create$$member$$with$$policies,
+  iam_create$$member$$with$$roles,
   iam_create_member_policy,
-  iam_create_member_with_policies,
-  iam_create_member_with_roles,
-  iam_member_invitation_status,
   iam_member_permission_group,
   iam_member_permission_groups,
   iam_member_resource_group,
   iam_member_resource_groups,
-  iam_update_member_with_policies,
-  iam_update_member_with_roles,
+  iam_update$$member$$with$$policies,
+  iam_update$$member$$with$$roles,
 } from "./schemas.js";
 
 /**
@@ -72,14 +50,10 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_members_create",
     title: "Add Member",
-    description: "Add a user to the list of members for this account.",
+    description: "Add a user to the list of members for this account.\n\nPOST /accounts/{account_id}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "oneOf": [
             {
@@ -89,56 +63,53 @@ export const tools: readonly Tool[] = [
               "$ref": "#/$defs/iam_create-member-with-policies"
             }
           ]
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_access": iam_access,
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_create-member-with-policies": iam_create_member_with_policies,
-        "iam_create-member-with-roles": iam_create_member_with_roles,
+        "iam_create-member-with-policies": iam_create$$member$$with$$policies,
+        "iam_create-member-with-roles": iam_create$$member$$with$$roles,
         "iam_create_member_policy": iam_create_member_policy,
-        "iam_email": iam_email,
-        "iam_member-invitation-status": iam_member_invitation_status,
         "iam_member_permission_group": iam_member_permission_group,
         "iam_member_permission_groups": iam_member_permission_groups,
         "iam_member_resource_group": iam_member_resource_group,
         "iam_member_resource_groups": iam_member_resource_groups,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_member_response_with_policies",
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_email": iam_email_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_grants": iam_grants_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_member_with_policies": iam_member_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role": iam_role_output,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_member_response_with_policies": iam_single_member_response_with_policies_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_member_with_policies": iam_member_with_policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role": iam_role,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_member_response_with_policies": iam_single_member_response_with_policies,
       },
     },
     annotations: {
@@ -177,32 +148,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_email": iam_email_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_grants": iam_grants_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_member_with_policies": iam_member_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role": iam_role_output,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_member_response_with_policies": iam_single_member_response_with_policies_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_member_with_policies": iam_member_with_policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role": iam_role,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_member_response_with_policies": iam_single_member_response_with_policies,
       },
     },
     request: (args) => ({
@@ -213,36 +173,40 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_members_delete",
     title: "Remove Member",
-    description: "Remove a member from an account.\n\nConfirm with the user before calling this tool. Are you sure you want to remove this user from the account?",
+    description: "Remove a member from an account.\n\nConfirm with the user before calling this tool. Are you sure you want to remove this user from the account?\n\nDELETE /accounts/{account_id}/members/{member_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "member_id": {
-          "$ref": "#/$defs/iam_membership_components-schemas-identifier",
-          "description": "Membership identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "member_id": {
+              "description": "Membership identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "member_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "member_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -281,11 +245,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -295,57 +258,51 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_members_get",
     title: "Member Details",
-    description: "Get information about a specific member of an account.",
+    description: "Get information about a specific member of an account.\n\nGET /accounts/{account_id}/members/{member_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "member_id": {
-          "$ref": "#/$defs/iam_membership_components-schemas-identifier",
-          "description": "Membership identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "member_id": {
+              "description": "Membership identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "member_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "member_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_member_response_with_policies",
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_email": iam_email_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_grants": iam_grants_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_member_with_policies": iam_member_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role": iam_role_output,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_member_response_with_policies": iam_single_member_response_with_policies_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_member_with_policies": iam_member_with_policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role": iam_role,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_member_response_with_policies": iam_single_member_response_with_policies,
       },
     },
     annotations: {
@@ -385,32 +342,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_email": iam_email_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_grants": iam_grants_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_member_with_policies": iam_member_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role": iam_role_output,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_member_response_with_policies": iam_single_member_response_with_policies_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_member_with_policies": iam_member_with_policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role": iam_role,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_member_response_with_policies": iam_single_member_response_with_policies,
       },
     },
     request: (args) => ({
@@ -420,90 +366,91 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_members_list",
     title: "List Members",
-    description: "List all members of an account.",
+    description: "List all members of an account.\n\nGET /accounts/{account_id}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to order results by.",
-          "enum": [
-            "user.first_name",
-            "user.last_name",
-            "user.email",
-            "status"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "number"
-        },
-        "status": {
-          "description": "A member's status in the account.",
-          "enum": [
-            "accepted",
-            "pending",
-            "rejected"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to order results by.",
+              "enum": [
+                "user.first_name",
+                "user.last_name",
+                "user.email",
+                "status"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            },
+            "status": {
+              "description": "A member's status in the account.",
+              "enum": [
+                "accepted",
+                "pending",
+                "rejected"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_collection_member_response_with_policies",
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_collection_member_response_with_policies": iam_collection_member_response_with_policies_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_email": iam_email_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_grants": iam_grants_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_member_with_policies": iam_member_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_role": iam_role_output,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_collection_member_response_with_policies": iam_collection_member_response_with_policies,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_member_with_policies": iam_member_with_policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_result_info": iam_result_info,
+        "iam_role": iam_role,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     annotations: {
@@ -543,58 +490,43 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_collection_member_response_with_policies": iam_collection_member_response_with_policies_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_email": iam_email_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_grants": iam_grants_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_member_with_policies": iam_member_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_role": iam_role_output,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_collection_member_response_with_policies": iam_collection_member_response_with_policies,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_member_with_policies": iam_member_with_policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_result_info": iam_result_info,
+        "iam_role": iam_role,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/members`,
       query: [
-        ["order", args["order"], true],
-        ["status", args["status"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
+        ["order", param(args, "query", "order"), true],
+        ["status", param(args, "query", "status"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
     name: "accounts_members_update",
     title: "Update Member",
-    description: "Modify an account member.",
+    description: "Modify an account member.\n\nPUT /accounts/{account_id}/members/{member_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "oneOf": [
             {
@@ -605,62 +537,60 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "member_id": {
-          "$ref": "#/$defs/iam_membership_components-schemas-identifier",
-          "description": "Membership identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "member_id": {
+              "description": "Membership identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "member_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "member_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_access": iam_access,
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
         "iam_create_member_policy": iam_create_member_policy,
-        "iam_grants": iam_grants,
+        "iam_grants": iam_grants$,
         "iam_member_permission_group": iam_member_permission_group,
         "iam_member_permission_groups": iam_member_permission_groups,
         "iam_member_resource_group": iam_member_resource_group,
         "iam_member_resource_groups": iam_member_resource_groups,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier,
-        "iam_permissions": iam_permissions,
-        "iam_role": iam_role,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier,
-        "iam_update-member-with-policies": iam_update_member_with_policies,
-        "iam_update-member-with-roles": iam_update_member_with_roles,
+        "iam_permissions": iam_permissions$,
+        "iam_role": iam_role$,
+        "iam_update-member-with-policies": iam_update$$member$$with$$policies,
+        "iam_update-member-with-roles": iam_update$$member$$with$$roles,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_member_response_with_policies",
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_email": iam_email_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_grants": iam_grants_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_member_with_policies": iam_member_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role": iam_role_output,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_member_response_with_policies": iam_single_member_response_with_policies_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_member_with_policies": iam_member_with_policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role": iam_role,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_member_response_with_policies": iam_single_member_response_with_policies,
       },
     },
     annotations: {
@@ -699,32 +629,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_email": iam_email_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_grants": iam_grants_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_member_with_policies": iam_member_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role": iam_role_output,
-        "iam_role_components-schemas-identifier": iam_role_components_schemas_identifier_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_member_response_with_policies": iam_single_member_response_with_policies_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_member_with_policies": iam_member_with_policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role": iam_role,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_member_response_with_policies": iam_single_member_response_with_policies,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/organizations/tools.ts b/src/generated/forge-mcp/accounts/organizations/tools.ts
index 1cf038160..7baae0b96 100644
--- a/src/generated/forge-mcp/accounts/organizations/tools.ts
+++ b/src/generated/forge-mcp/accounts/organizations/tools.ts
@@ -3,12 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  organizations_api_OrganizationFlags_output,
-  organizations_api_OrganizationID_output,
-  organizations_api_Organization_output,
-  organizations_api_Profile_output,
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  organizations$$api_Organization,
+  organizations$$api_OrganizationFlags,
+  organizations$$api_Profile,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../../outputs.js";
 
 /**
@@ -18,17 +17,27 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_organizations_list",
     title: "List account organizations",
-    description: "Retrieve a list of the organizations that \"contain\" this account or are\nmanaging it.\n\nThe returned list will be in order from \"root\" to \"leaf\", where the \"leaf\"\nwill be the organization that _immediately_ contains the specified\naccount.",
+    description: "Retrieve a list of the organizations that \"contain\" this account or are\nmanaging it.\n\nThe returned list will be in order from \"root\" to \"leaf\", where the \"leaf\"\nwill be the organization that _immediately_ contains the specified\naccount.\n\nGET /accounts/{account_id}/organizations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -66,11 +75,10 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -133,12 +141,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/outputs.ts b/src/generated/forge-mcp/accounts/outputs.ts
index a9803e1ae..70aa3c3e5 100644
--- a/src/generated/forge-mcp/accounts/outputs.ts
+++ b/src/generated/forge-mcp/accounts/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `alexandria_api-response-collection` in responses.
  */
-export const alexandria_api_response_collection_output: JsonSchema = {
+export const alexandria_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/alexandria_api-response-common"
@@ -45,7 +45,7 @@ export const alexandria_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `alexandria_api-response-common` in responses.
  */
-export const alexandria_api_response_common_output: JsonSchema = {
+export const alexandria_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/alexandria_messages"
@@ -71,7 +71,7 @@ export const alexandria_api_response_common_output: JsonSchema = {
 /**
  * The schema of `alexandria_api_response_common_failure` in responses.
  */
-export const alexandria_api_response_common_failure_output: JsonSchema = {
+export const alexandria_api_response_common_failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/alexandria_messages"
@@ -98,17 +98,10 @@ export const alexandria_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `alexandria_category_id` in responses.
- */
-export const alexandria_category_id_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `alexandria_messages` in responses.
  */
-export const alexandria_messages_output: JsonSchema = {
+export const alexandria_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -141,14 +134,14 @@ export const alexandria_messages_output: JsonSchema = {
 /**
  * The schema of `iam_account` in responses.
  */
-export const iam_account_output: JsonSchema = {
+export const iam_account: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_common_components-schemas-identifier"
+      "type": "string"
     },
     "managed_by": {
       "properties": {
@@ -182,7 +175,11 @@ export const iam_account_output: JsonSchema = {
       "type": "object"
     },
     "type": {
-      "$ref": "#/$defs/iam_account-type"
+      "enum": [
+        "standard",
+        "enterprise"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -196,7 +193,7 @@ export const iam_account_output: JsonSchema = {
 /**
  * The schema of `iam_response_collection_accounts` in responses.
  */
-export const iam_response_collection_accounts_output: JsonSchema = {
+export const iam_response_collection_accounts: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -218,7 +215,7 @@ export const iam_response_collection_accounts_output: JsonSchema = {
 /**
  * The schema of `iam_response_single_account` in responses.
  */
-export const iam_response_single_account_output: JsonSchema = {
+export const iam_response_single_account: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -237,13 +234,13 @@ export const iam_response_single_account_output: JsonSchema = {
 /**
  * The schema of `iam_role` in responses.
  */
-export const iam_role_output: JsonSchema = {
+export const iam_role: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_role_components-schemas-identifier"
+      "type": "string"
     },
     "name": {
       "type": "string"
@@ -261,17 +258,10 @@ export const iam_role_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_role_components-schemas-identifier` in responses.
- */
-export const iam_role_components_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `organizations-api_MoveAccountResult` in responses.
  */
-export const organizations_api_MoveAccountResult_output: JsonSchema = {
+export const organizations$$api_MoveAccountResult: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
diff --git a/src/generated/forge-mcp/accounts/profile/tools.ts b/src/generated/forge-mcp/accounts/profile/tools.ts
index bca563e8a..f5236e7fb 100644
--- a/src/generated/forge-mcp/accounts/profile/tools.ts
+++ b/src/generated/forge-mcp/accounts/profile/tools.ts
@@ -3,11 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  organizations_api_Profile_output,
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  organizations$$api_Profile,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../../outputs.js";
-import { organizations_api_ModifyProfileRequest } from "../../schemas.js";
+import { organizations$$api_ModifyProfileRequest } from "../../schemas.js";
 
 /**
  * The tools of `accounts.profile`.
@@ -16,18 +16,28 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_profile_get",
     title: "Get account profile",
-    description: "Retrieves the business profile (name, email, phone, address, and external metadata)\nassociated with this account's customer record. Profiles can be shared across accounts and\norganizations. Only available to members of an organization that contains the account.",
+    description: "Retrieves the business profile (name, email, phone, address, and external metadata)\nassociated with this account's customer record. Profiles can be shared across accounts and\norganizations. Only available to members of an organization that contains the account.\n\nGET /accounts/{account_id}/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "The ID of the account whose business profile to retrieve.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account whose business profile to retrieve.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -62,8 +72,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -123,9 +133,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -135,24 +145,34 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_profile_update",
     title: "Update account profile",
-    description: "Partially updates the business profile (name, email, phone, address, and external metadata)\nassociated with this account's parent organization customer record, creating the profile if\nit does not exist. Changes apply to every account and organization sharing that profile.\nOmitted, empty, or null fields are left unchanged. Each profile field is limited to 1,000\nUTF-8 bytes. Only available to members of an organization that contains the account.",
+    description: "Partially updates the business profile (name, email, phone, address, and external metadata)\nassociated with this account's parent organization customer record, creating the profile if\nit does not exist. Changes apply to every account and organization sharing that profile.\nOmitted, empty, or null fields are left unchanged. Each profile field is limited to 1,000\nUTF-8 bytes. Only available to members of an organization that contains the account.\n\nPUT /accounts/{account_id}/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "The ID of the account whose business profile to update.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/organizations-api_ModifyProfileRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account whose business profile to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "organizations-api_ModifyProfileRequest": organizations_api_ModifyProfileRequest,
+        "organizations-api_ModifyProfileRequest": organizations$$api_ModifyProfileRequest,
       },
     },
     annotations: {
@@ -180,8 +200,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/schemas.ts b/src/generated/forge-mcp/accounts/schemas.ts
index 8b8adac91..37d47b7bf 100644
--- a/src/generated/forge-mcp/accounts/schemas.ts
+++ b/src/generated/forge-mcp/accounts/schemas.ts
@@ -3,22 +3,14 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `alexandria_category_id`.
- */
-export const alexandria_category_id: JsonSchema = {
-  "description": "Numeric identifier for an application category.",
-  "type": "integer"
-};
-
 /**
  * The schema of `iam_account`.
  */
 export const iam_account: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/iam_common_components-schemas-identifier",
-      "description": "Identifier"
+      "description": "Identifier",
+      "type": "string"
     },
     "managed_by": {
       "description": "Parent container details",
@@ -44,7 +36,11 @@ export const iam_account: JsonSchema = {
       "type": "object"
     },
     "type": {
-      "$ref": "#/$defs/iam_account-type"
+      "enum": [
+        "standard",
+        "enterprise"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -58,7 +54,7 @@ export const iam_account: JsonSchema = {
 /**
  * The schema of `iam_components-schemas-account`.
  */
-export const iam_components_schemas_account: JsonSchema = {
+export const iam_components$$schemas$$account: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_account"
@@ -78,7 +74,7 @@ export const iam_components_schemas_account: JsonSchema = {
 /**
  * The schema of `iam_create-account`.
  */
-export const iam_create_account: JsonSchema = {
+export const iam_create$$account: JsonSchema = {
   "description": "Create Account",
   "properties": {
     "name": {
@@ -93,7 +89,11 @@ export const iam_create_account: JsonSchema = {
       "type": "boolean"
     },
     "type": {
-      "$ref": "#/$defs/iam_account-type"
+      "enum": [
+        "standard",
+        "enterprise"
+      ],
+      "type": "string"
     },
     "unit": {
       "description": "Information related to the tenant unit. Provide its ID and omit `standalone` to create the Account within an Organization. See https://developers.cloudflare.com/tenant/how-to/manage-accounts/.",
@@ -118,8 +118,8 @@ export const iam_create_account: JsonSchema = {
 export const iam_role: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/iam_role_components-schemas-identifier",
-      "description": "Role identifier tag."
+      "description": "Role identifier tag.",
+      "type": "string"
     },
     "permissions": {
       "$ref": "#/$defs/iam_permissions"
@@ -131,11 +131,3 @@ export const iam_role: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `iam_role_components-schemas-identifier`.
- */
-export const iam_role_components_schemas_identifier: JsonSchema = {
-  "description": "Role identifier tag.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/accounts/subscriptions/outputs.ts b/src/generated/forge-mcp/accounts/subscriptions/outputs.ts
index 4db26e466..13d0fe9d5 100644
--- a/src/generated/forge-mcp/accounts/subscriptions/outputs.ts
+++ b/src/generated/forge-mcp/accounts/subscriptions/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `bill-subs-api_account_subscription_response_collection` in
  * responses.
  */
-export const bill_subs_api_account_subscription_response_collection_output: JsonSchema = {
+export const bill$$subs$$api_account_subscription_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-collection"
@@ -30,7 +30,7 @@ export const bill_subs_api_account_subscription_response_collection_output: Json
  * The schema of `bill-subs-api_account_subscription_response_single` in
  * responses.
  */
-export const bill_subs_api_account_subscription_response_single_output: JsonSchema = {
+export const bill$$subs$$api_account_subscription_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
@@ -49,7 +49,7 @@ export const bill_subs_api_account_subscription_response_single_output: JsonSche
 /**
  * The schema of `bill-subs-api_cancel_reason` in responses.
  */
-export const bill_subs_api_cancel_reason_output: JsonSchema = {
+export const bill$$subs$$api_cancel_reason: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -77,7 +77,7 @@ export const bill_subs_api_cancel_reason_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_cancel_reason_response_single` in responses.
  */
-export const bill_subs_api_cancel_reason_response_single_output: JsonSchema = {
+export const bill$$subs$$api_cancel_reason_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
diff --git a/src/generated/forge-mcp/accounts/subscriptions/schemas.ts b/src/generated/forge-mcp/accounts/subscriptions/schemas.ts
index a0ceb6fa0..fdea36e48 100644
--- a/src/generated/forge-mcp/accounts/subscriptions/schemas.ts
+++ b/src/generated/forge-mcp/accounts/subscriptions/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bill-subs-api_cancel_reason_request`.
  */
-export const bill_subs_api_cancel_reason_request: JsonSchema = {
+export const bill$$subs$$api_cancel_reason_request: JsonSchema = {
   "properties": {
     "other": {
       "description": "Additional cancellation details.",
diff --git a/src/generated/forge-mcp/accounts/subscriptions/tools.ts b/src/generated/forge-mcp/accounts/subscriptions/tools.ts
index c82ebbd10..470944996 100644
--- a/src/generated/forge-mcp/accounts/subscriptions/tools.ts
+++ b/src/generated/forge-mcp/accounts/subscriptions/tools.ts
@@ -3,62 +3,44 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_collection_output,
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_component_value_output,
-  bill_subs_api_component_values_output,
-  bill_subs_api_currency_output,
-  bill_subs_api_current_period_end_output,
-  bill_subs_api_current_period_start_output,
-  bill_subs_api_frequency_output,
-  bill_subs_api_identifier_output,
-  bill_subs_api_install_id_output,
-  bill_subs_api_messages_output,
-  bill_subs_api_name_output,
-  bill_subs_api_price_output,
-  bill_subs_api_rate_plan_output,
-  bill_subs_api_result_info_output,
-  bill_subs_api_schemas_identifier_output,
-  bill_subs_api_state_output,
-  bill_subs_api_subscription_output,
-  bill_subs_api_zone_output,
+  bill$$subs$$api_api$$response$$collection,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_component_value,
+  bill$$subs$$api_component_values,
+  bill$$subs$$api_messages,
+  bill$$subs$$api_rate_plan,
+  bill$$subs$$api_result_info,
+  bill$$subs$$api_subscription,
+  bill$$subs$$api_zone,
 } from "../../outputs.js";
 import {
-  bill_subs_api_component_value,
-  bill_subs_api_component_values,
-  bill_subs_api_frequency,
-  bill_subs_api_identifier,
-  bill_subs_api_install_id,
-  bill_subs_api_rate_plan,
-  bill_subs_api_schemas_identifier,
-  bill_subs_api_subscription_v2,
-  bill_subs_api_zone,
+  bill$$subs$$api_component_value as bill$$subs$$api_component_value$,
+  bill$$subs$$api_component_values as bill$$subs$$api_component_values$,
+  bill$$subs$$api_rate_plan as bill$$subs$$api_rate_plan$,
+  bill$$subs$$api_subscription$$v2,
+  bill$$subs$$api_zone as bill$$subs$$api_zone$,
 } from "../../schemas.js";
 import {
-  bill_subs_api_account_subscription_response_collection_output,
-  bill_subs_api_account_subscription_response_single_output,
-  bill_subs_api_cancel_reason_output,
-  bill_subs_api_cancel_reason_response_single_output,
+  bill$$subs$$api_account_subscription_response_collection,
+  bill$$subs$$api_account_subscription_response_single,
+  bill$$subs$$api_cancel_reason,
+  bill$$subs$$api_cancel_reason_response_single,
 } from "./outputs.js";
-import { bill_subs_api_cancel_reason_request } from "./schemas.js";
+import { bill$$subs$$api_cancel_reason_request } from "./schemas.js";
 
 /**
  * The tools of `accounts.subscriptions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "accounts_subscriptions_cancel_delayed_downgrade",
+    name: "accounts_subscriptions_cancelDelayedDowngrade",
     title: "Cancel Delayed Downgrade",
-    description: "Cancels pending delayed downgrades for the specified subscriptions.",
+    description: "Cancels pending delayed downgrades for the specified subscriptions.\n\nPOST /accounts/{account_id}/subscriptions/cancel-downgrade",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "properties": {
             "subscription_ids": {
@@ -70,15 +52,26 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -116,10 +109,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -130,64 +123,61 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_subscriptions_create",
     title: "Create Subscription",
-    description: "Creates an account or zone subscription.",
+    description: "Creates an account or zone subscription.\n\nPOST /{account_or_zone}/{account_or_zone_id}/subscriptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/bill-subs-api_subscription-v2"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_component_value": bill_subs_api_component_value,
-        "bill-subs-api_component_values": bill_subs_api_component_values,
-        "bill-subs-api_frequency": bill_subs_api_frequency,
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_install_id": bill_subs_api_install_id,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2,
-        "bill-subs-api_zone": bill_subs_api_zone,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value$,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values$,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan$,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_zone": bill$$subs$$api_zone$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_account_subscription_response_single",
       $defs: {
-        "bill-subs-api_account_subscription_response_single": bill_subs_api_account_subscription_response_single_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_account_subscription_response_single": bill$$subs$$api_account_subscription_response_single,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     annotations: {
@@ -226,26 +216,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_account_subscription_response_single": bill_subs_api_account_subscription_response_single_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_account_subscription_response_single": bill$$subs$$api_account_subscription_response_single,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     request: (args) => ({
@@ -254,43 +234,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_subscriptions_create_cancel_reason",
+    name: "accounts_subscriptions_createCancelReason",
     title: "Create Cancel Reason",
-    description: "Records a cancellation reason for an account subscription.",
+    description: "Records a cancellation reason for an account subscription.\n\nPOST /accounts/{account_id}/subscriptions/{subscription_identifier}/cancel-reason",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/bill-subs-api_cancel_reason_request"
         },
-        "subscription_identifier": {
-          "$ref": "#/$defs/bill-subs-api_schemas-identifier",
-          "description": "Subscription identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "subscription_identifier": {
+              "description": "Subscription identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subscription_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subscription_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_cancel_reason_request": bill_subs_api_cancel_reason_request,
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier,
+        "bill-subs-api_cancel_reason_request": bill$$subs$$api_cancel_reason_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_cancel_reason_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_cancel_reason": bill_subs_api_cancel_reason_output,
-        "bill-subs-api_cancel_reason_response_single": bill_subs_api_cancel_reason_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_cancel_reason": bill$$subs$$api_cancel_reason,
+        "bill-subs-api_cancel_reason_response_single": bill$$subs$$api_cancel_reason_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -328,12 +316,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_cancel_reason": bill_subs_api_cancel_reason_output,
-        "bill-subs-api_cancel_reason_response_single": bill_subs_api_cancel_reason_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_cancel_reason": bill$$subs$$api_cancel_reason,
+        "bill-subs-api_cancel_reason_response_single": bill$$subs$$api_cancel_reason_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -344,27 +332,33 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_subscriptions_delete",
     title: "Delete Subscription",
-    description: "Deletes an account's subscription.",
+    description: "Deletes an account's subscription.\n\nDELETE /accounts/{account_id}/subscriptions/{subscription_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
-        "subscription_identifier": {
-          "$ref": "#/$defs/bill-subs-api_schemas-identifier",
-          "description": "Subscription identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "subscription_identifier": {
+              "description": "Subscription identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subscription_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subscription_identifier"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -376,7 +370,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "subscription_id": {
-                  "$ref": "#/$defs/bill-subs-api_schemas-identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -386,10 +380,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -423,7 +416,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "subscription_id": {
-                      "$ref": "#/$defs/bill-subs-api_schemas-identifier"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -438,11 +431,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -452,54 +444,51 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_subscriptions_get",
     title: "List Subscriptions",
-    description: "Lists all of an account or zone's subscriptions.",
+    description: "Lists all of an account or zone's subscriptions.\n\nGET /{account_or_zone}/{account_or_zone_id}/subscriptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_account_subscription_response_collection",
       $defs: {
-        "bill-subs-api_account_subscription_response_collection": bill_subs_api_account_subscription_response_collection_output,
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_account_subscription_response_collection": bill$$subs$$api_account_subscription_response_collection,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     annotations: {
@@ -538,27 +527,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_account_subscription_response_collection": bill_subs_api_account_subscription_response_collection_output,
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_account_subscription_response_collection": bill$$subs$$api_account_subscription_response_collection,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     request: (args) => ({
@@ -566,52 +545,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_subscriptions_get_by_identifier",
+    name: "accounts_subscriptions_getByIdentifier",
     title: "Get Subscription",
-    description: "Gets an account subscription by identifier.",
+    description: "Gets an account subscription by identifier.\n\nGET /accounts/{account_id}/subscriptions/{subscription_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
-        "subscription_identifier": {
-          "$ref": "#/$defs/bill-subs-api_schemas-identifier",
-          "description": "Subscription identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "subscription_identifier": {
+              "description": "Subscription identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subscription_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subscription_identifier"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_account_subscription_response_single",
       $defs: {
-        "bill-subs-api_account_subscription_response_single": bill_subs_api_account_subscription_response_single_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_account_subscription_response_single": bill$$subs$$api_account_subscription_response_single,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     annotations: {
@@ -653,26 +628,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_account_subscription_response_single": bill_subs_api_account_subscription_response_single_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_account_subscription_response_single": bill$$subs$$api_account_subscription_response_single,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     request: (args) => ({
@@ -680,38 +645,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_subscriptions_get_cancel_reason",
+    name: "accounts_subscriptions_getCancelReason",
     title: "Get Cancel Reason",
-    description: "Gets the cancellation reason for an account subscription.",
+    description: "Gets the cancellation reason for an account subscription.\n\nGET /accounts/{account_id}/subscriptions/{subscription_identifier}/cancel-reason",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
-        "subscription_identifier": {
-          "$ref": "#/$defs/bill-subs-api_schemas-identifier",
-          "description": "Subscription identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "subscription_identifier": {
+              "description": "Subscription identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subscription_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subscription_identifier"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_cancel_reason_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_cancel_reason": bill_subs_api_cancel_reason_output,
-        "bill-subs-api_cancel_reason_response_single": bill_subs_api_cancel_reason_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_cancel_reason": bill$$subs$$api_cancel_reason,
+        "bill-subs-api_cancel_reason_response_single": bill$$subs$$api_cancel_reason_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -741,12 +712,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_cancel_reason": bill_subs_api_cancel_reason_output,
-        "bill-subs-api_cancel_reason_response_single": bill_subs_api_cancel_reason_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_cancel_reason": bill$$subs$$api_cancel_reason,
+        "bill-subs-api_cancel_reason_response_single": bill$$subs$$api_cancel_reason_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -756,61 +727,57 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_subscriptions_update",
     title: "Update Subscription",
-    description: "Updates an account subscription.",
+    description: "Updates an account subscription.\n\nPUT /accounts/{account_id}/subscriptions/{subscription_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/bill-subs-api_subscription-v2"
         },
-        "subscription_identifier": {
-          "$ref": "#/$defs/bill-subs-api_schemas-identifier",
-          "description": "Subscription identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "subscription_identifier": {
+              "description": "Subscription identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subscription_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subscription_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_component_value": bill_subs_api_component_value,
-        "bill-subs-api_component_values": bill_subs_api_component_values,
-        "bill-subs-api_frequency": bill_subs_api_frequency,
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_install_id": bill_subs_api_install_id,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2,
-        "bill-subs-api_zone": bill_subs_api_zone,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value$,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values$,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan$,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_zone": bill$$subs$$api_zone$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_account_subscription_response_single",
       $defs: {
-        "bill-subs-api_account_subscription_response_single": bill_subs_api_account_subscription_response_single_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_account_subscription_response_single": bill$$subs$$api_account_subscription_response_single,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     annotations: {
@@ -849,26 +816,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_account_subscription_response_single": bill_subs_api_account_subscription_response_single_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_account_subscription_response_single": bill$$subs$$api_account_subscription_response_single,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/tokens/permissionGroups/tools.ts b/src/generated/forge-mcp/accounts/tokens/permissionGroups/tools.ts
index 6b317458a..37d3edc99 100644
--- a/src/generated/forge-mcp/accounts/tokens/permissionGroups/tools.ts
+++ b/src/generated/forge-mcp/accounts/tokens/permissionGroups/tools.ts
@@ -1,60 +1,68 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_messages_2_output,
-  iam_permissions_group_response_collection_output,
-  iam_result_info_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_messages$$2,
+  iam_permissions_group_response_collection,
+  iam_result_info,
 } from "../../../outputs.js";
-import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../../schemas.js";
 
 /**
- * The tools of `accounts.tokens.permission_groups`.
+ * The tools of `accounts.tokens.permissionGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "accounts_tokens_permission_groups_list",
+    name: "accounts_tokens_permissionGroups_list",
     title: "List Permission Groups",
-    description: "Find all available permission groups for Account Owned API Tokens.\nEach permission group indicates whether the caller can select it when\ncreating a token. Token creation performs the authoritative permission\ncheck.",
+    description: "Find all available permission groups for Account Owned API Tokens.\nEach permission group indicates whether the caller can select it when\ncreating a token. Token creation performs the authoritative permission\ncheck.\n\nGET /accounts/{account_id}/tokens/permission_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "name": {
-          "description": "Filter by the name of the permission group.\nThe value must be URL-encoded.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "scope": {
-          "description": "Filter by the scope of the permission group.\nThe value must be URL-encoded.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "Filter by the name of the permission group.\nThe value must be URL-encoded.",
+              "type": "string"
+            },
+            "scope": {
+              "description": "Filter by the scope of the permission group.\nThe value must be URL-encoded.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_permissions_group_response_collection",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permissions_group_response_collection": iam_permissions_group_response_collection_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permissions_group_response_collection": iam_permissions_group_response_collection,
+        "iam_result_info": iam_result_info,
       },
     },
     annotations: {
@@ -93,19 +101,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permissions_group_response_collection": iam_permissions_group_response_collection_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permissions_group_response_collection": iam_permissions_group_response_collection,
+        "iam_result_info": iam_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/tokens/permission_groups`,
       query: [
-        ["name", args["name"], true],
-        ["scope", args["scope"], true],
+        ["name", param(args, "query", "name"), true],
+        ["scope", param(args, "query", "scope"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/accounts/tokens/tools.ts b/src/generated/forge-mcp/accounts/tokens/tools.ts
index 69abd4590..a4d87eac9 100644
--- a/src/generated/forge-mcp/accounts/tokens/tools.ts
+++ b/src/generated/forge-mcp/accounts/tokens/tools.ts
@@ -1,60 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_id_output,
-  iam_api_response_single_output,
-  iam_cidr_list_output,
-  iam_collection_tokens_response_output,
-  iam_common_components_schemas_identifier_output,
-  iam_condition_output,
-  iam_creator_email_at_creation_output,
-  iam_effect_output,
-  iam_expires_on_output,
-  iam_issued_on_output,
-  iam_last_used_on_output,
-  iam_messages_2_output,
-  iam_modified_on_output,
-  iam_name_output,
-  iam_not_before_output,
-  iam_permission_group_output,
-  iam_permission_groups_output,
-  iam_policy_identifier_output,
-  iam_policy_with_permission_groups_and_resources_output,
-  iam_provisioner_id_output,
-  iam_provisioner_type_output,
-  iam_request_ip_output,
-  iam_resources_output,
-  iam_resources_type_object_nested_output,
-  iam_resources_type_object_string_output,
-  iam_response_single_value_output,
-  iam_result_info_output,
-  iam_single_token_create_response_output,
-  iam_single_token_response_output,
-  iam_token_base_output,
-  iam_token_identifier_output,
-  iam_token_policies_output,
-  iam_token_prefix_output,
-  iam_token_status_output,
-  iam_token_suffix_output,
-  iam_token_verify_response_single_segment_output,
-  iam_token_with_value_output,
-  iam_value_output,
-} from "../../outputs.js";
-import {
-  iam_account_identifier,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_api$$response$$single$$id,
   iam_cidr_list,
-  iam_common_components_schemas_identifier,
+  iam_collection_tokens_response,
   iam_condition,
-  iam_create_payload,
-  iam_effect,
-  iam_expires_on,
-  iam_name,
-  iam_not_before,
+  iam_messages$$2,
   iam_permission_group,
   iam_permission_groups,
   iam_policy_with_permission_groups_and_resources,
@@ -62,10 +19,28 @@ import {
   iam_resources,
   iam_resources_type_object_nested,
   iam_resources_type_object_string,
-  iam_token_body,
-  iam_token_identifier,
+  iam_response_single_value,
+  iam_result_info,
+  iam_single_token_create_response,
+  iam_single_token_response,
+  iam_token_base,
   iam_token_policies,
-  iam_token_status,
+  iam_token_verify_response_single_segment,
+  iam_token_with_value,
+} from "../../outputs.js";
+import {
+  iam_cidr_list as iam_cidr_list$,
+  iam_condition as iam_condition$,
+  iam_create_payload,
+  iam_permission_group as iam_permission_group$,
+  iam_permission_groups as iam_permission_groups$,
+  iam_policy_with_permission_groups_and_resources as iam_policy_with_permission_groups_and_resources$,
+  iam_request_ip as iam_request_ip$,
+  iam_resources as iam_resources$,
+  iam_resources_type_object_nested as iam_resources_type_object_nested$,
+  iam_resources_type_object_string as iam_resources_type_object_string$,
+  iam_token_body,
+  iam_token_policies as iam_token_policies$,
 } from "../../schemas.js";
 
 /**
@@ -75,32 +50,53 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_tokens_create",
     title: "Create Token",
-    description: "Create a new Account Owned API token.",
+    description: "Create a new Account Owned API token.\n\nPOST /accounts/{account_id}/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_create_payload"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "iam_cidr_list": iam_cidr_list$,
+        "iam_condition": iam_condition$,
+        "iam_create_payload": iam_create_payload,
+        "iam_permission_group": iam_permission_group$,
+        "iam_permission_groups": iam_permission_groups$,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources$,
+        "iam_request_ip": iam_request_ip$,
+        "iam_resources": iam_resources$,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested$,
+        "iam_resources_type_object_string": iam_resources_type_object_string$,
+        "iam_token_policies": iam_token_policies$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/iam_single_token_create_response",
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
+        "iam_api-response-single": iam_api$$response$$single,
         "iam_cidr_list": iam_cidr_list,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
         "iam_condition": iam_condition,
-        "iam_create_payload": iam_create_payload,
-        "iam_effect": iam_effect,
-        "iam_expires_on": iam_expires_on,
-        "iam_name": iam_name,
-        "iam_not_before": iam_not_before,
+        "iam_messages-2": iam_messages$$2,
         "iam_permission_group": iam_permission_group,
         "iam_permission_groups": iam_permission_groups,
         "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
@@ -108,43 +104,10 @@ export const tools: readonly Tool[] = [
         "iam_resources": iam_resources,
         "iam_resources_type_object_nested": iam_resources_type_object_nested,
         "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_create_response": iam_single_token_create_response,
+        "iam_token_base": iam_token_base,
         "iam_token_policies": iam_token_policies,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/iam_single_token_create_response",
-      $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_create_response": iam_single_token_create_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
-        "iam_token_with_value": iam_token_with_value_output,
-        "iam_value": iam_value_output,
+        "iam_token_with_value": iam_token_with_value,
       },
     },
     annotations: {
@@ -182,38 +145,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_create_response": iam_single_token_create_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
-        "iam_token_with_value": iam_token_with_value_output,
-        "iam_value": iam_value_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_create_response": iam_single_token_create_response,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
+        "iam_token_with_value": iam_token_with_value,
       },
     },
     request: (args) => ({
@@ -224,36 +171,40 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_tokens_delete",
     title: "Delete Token",
-    description: "Destroy an Account Owned API token.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Destroy an Account Owned API token.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/tokens/{token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "token_id": {
-          "$ref": "#/$defs/iam_token_identifier",
-          "description": "Token identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "token_id": {
+              "description": "Token identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "token_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_token_identifier": iam_token_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -291,11 +242,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -305,61 +255,51 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_tokens_get",
     title: "Token Details",
-    description: "Get information about a specific Account Owned API token.",
+    description: "Get information about a specific Account Owned API token.\n\nGET /accounts/{account_id}/tokens/{token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "token_id": {
-          "$ref": "#/$defs/iam_token_identifier",
-          "description": "Token identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "token_id": {
+              "description": "Token identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "token_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_token_identifier": iam_token_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_token_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_response": iam_single_token_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_response": iam_single_token_response,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     annotations: {
@@ -398,36 +338,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_response": iam_single_token_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_response": iam_single_token_response,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     request: (args) => ({
@@ -437,80 +362,77 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_tokens_list",
     title: "List Tokens",
-    description: "List Account Owned API tokens created for this account. Callers with\n`com.cloudflare.api.account.token.list_self` permission only receive\ntokens they created. Results include active, disabled, and\nrecently-expired tokens when `include_expired` is set to true.",
+    description: "List Account Owned API tokens created for this account. Callers with\n`com.cloudflare.api.account.token.list_self` permission only receive\ntokens they created. Results include active, disabled, and\nrecently-expired tokens when `include_expired` is set to true.\n\nGET /accounts/{account_id}/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "include_expired": {
-          "default": false,
-          "description": "When true, includes recently-expired tokens in the response.",
-          "type": "boolean"
+          "type": "object"
         },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "include_expired": {
+              "default": false,
+              "description": "When true, includes recently-expired tokens in the response.",
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_collection_tokens_response",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_collection_tokens_response": iam_collection_tokens_response_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_collection_tokens_response": iam_collection_tokens_response,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_result_info": iam_result_info,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     annotations: {
@@ -550,83 +472,72 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_collection_tokens_response": iam_collection_tokens_response_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_collection_tokens_response": iam_collection_tokens_response,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_result_info": iam_result_info,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/tokens`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
-        ["include_expired", args["include_expired"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["include_expired", param(args, "query", "include_expired"), true],
       ],
     }),
   },
   {
     name: "accounts_tokens_roll",
     title: "Roll Token",
-    description: "Roll the Account Owned API token secret.\n\nConfirm with the user before calling this tool. Rolling this token will invalidate the current secret and generate a new one. Any integrations using the current secret will stop working.",
+    description: "Roll the Account Owned API token secret.\n\nConfirm with the user before calling this tool. Rolling this token will invalidate the current secret and generate a new one. Any integrations using the current secret will stop working.\n\nPUT /accounts/{account_id}/tokens/{token_id}/value",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "token_id": {
-          "$ref": "#/$defs/iam_token_identifier",
-          "description": "Token identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "token_id": {
+              "description": "Token identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "token_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_token_identifier": iam_token_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_response_single_value",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_value": iam_response_single_value_output,
-        "iam_value": iam_value_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_value": iam_response_single_value,
       },
     },
     annotations: {
@@ -664,11 +575,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_value": iam_response_single_value_output,
-        "iam_value": iam_value_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_value": iam_response_single_value,
       },
     },
     request: (args) => ({
@@ -678,36 +588,58 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_tokens_update",
     title: "Update Token",
-    description: "Update an existing token.",
+    description: "Update an existing token.\n\nPUT /accounts/{account_id}/tokens/{token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_token_body"
         },
-        "token_id": {
-          "$ref": "#/$defs/iam_token_identifier",
-          "description": "Token identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "token_id": {
+              "description": "Token identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "token_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
+        "iam_cidr_list": iam_cidr_list$,
+        "iam_condition": iam_condition$,
+        "iam_permission_group": iam_permission_group$,
+        "iam_permission_groups": iam_permission_groups$,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources$,
+        "iam_request_ip": iam_request_ip$,
+        "iam_resources": iam_resources$,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested$,
+        "iam_resources_type_object_string": iam_resources_type_object_string$,
+        "iam_token_body": iam_token_body,
+        "iam_token_policies": iam_token_policies$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/iam_single_token_response",
+      $defs: {
+        "iam_api-response-single": iam_api$$response$$single,
         "iam_cidr_list": iam_cidr_list,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
         "iam_condition": iam_condition,
-        "iam_effect": iam_effect,
-        "iam_expires_on": iam_expires_on,
-        "iam_name": iam_name,
-        "iam_not_before": iam_not_before,
+        "iam_messages-2": iam_messages$$2,
         "iam_permission_group": iam_permission_group,
         "iam_permission_groups": iam_permission_groups,
         "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
@@ -715,44 +647,9 @@ export const tools: readonly Tool[] = [
         "iam_resources": iam_resources,
         "iam_resources_type_object_nested": iam_resources_type_object_nested,
         "iam_resources_type_object_string": iam_resources_type_object_string,
-        "iam_token_body": iam_token_body,
-        "iam_token_identifier": iam_token_identifier,
+        "iam_single_token_response": iam_single_token_response,
+        "iam_token_base": iam_token_base,
         "iam_token_policies": iam_token_policies,
-        "iam_token_status": iam_token_status,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/iam_single_token_response",
-      $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_response": iam_single_token_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
       },
     },
     annotations: {
@@ -790,36 +687,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_response": iam_single_token_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_response": iam_single_token_response,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     request: (args) => ({
@@ -830,33 +712,35 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_tokens_verify",
     title: "Verify Token",
-    description: "Test whether a token works.",
+    description: "Test whether a token works.\n\nGET /accounts/{account_id}/tokens/verify",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_token_verify_response_single_segment",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_verify_response_single_segment": iam_token_verify_response_single_segment_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_token_verify_response_single_segment": iam_token_verify_response_single_segment,
       },
     },
     annotations: {
@@ -886,14 +770,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_verify_response_single_segment": iam_token_verify_response_single_segment_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_token_verify_response_single_segment": iam_token_verify_response_single_segment,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/tools.ts b/src/generated/forge-mcp/accounts/tools.ts
index d74abb34f..391339880 100644
--- a/src/generated/forge-mcp/accounts/tools.ts
+++ b/src/generated/forge-mcp/accounts/tools.ts
@@ -1,35 +1,28 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  iam_account_type_output,
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_id_output,
-  iam_api_response_single_output,
-  iam_common_components_schemas_identifier_output,
-  iam_messages_2_output,
-  iam_result_info_output,
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_api$$response$$single$$id,
+  iam_messages$$2,
+  iam_result_info,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../outputs.js";
 import {
-  iam_account_identifier,
-  iam_account_type,
-  iam_common_components_schemas_identifier,
-} from "../schemas.js";
-import {
-  iam_account_output,
-  iam_response_collection_accounts_output,
-  iam_response_single_account_output,
-  organizations_api_MoveAccountResult_output,
+  iam_account,
+  iam_response_collection_accounts,
+  iam_response_single_account,
+  organizations$$api_MoveAccountResult,
 } from "./outputs.js";
 import {
-  iam_account,
-  iam_components_schemas_account,
-  iam_create_account,
+  iam_account as iam_account$,
+  iam_components$$schemas$$account,
+  iam_create$$account,
 } from "./schemas.js";
 
 /**
@@ -39,7 +32,7 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_create",
     title: "Create an Account",
-    description: "Create an Account. To create the Account within an Organization, provide `unit.id` and omit `standalone`. To create a standalone Free Account, provide `standalone: true` and omit `unit`. Providing both fields is invalid. If you omit both fields, Cloudflare can determine the destination only when the User is an administrator of exactly one Organization. Cloudflare creates the Account in that Organization; otherwise, the request returns an error. Account names are limited to 65 UTF-8 bytes.",
+    description: "Create an Account. To create the Account within an Organization, provide `unit.id` and omit `standalone`. To create a standalone Free Account, provide `standalone: true` and omit `unit`. Providing both fields is invalid. If you omit both fields, Cloudflare can determine the destination only when the User is an administrator of exactly one Organization. Cloudflare creates the Account in that Organization; otherwise, the request returns an error. Account names are limited to 65 UTF-8 bytes.\n\nPOST /accounts",
     inputSchema: {
       type: "object",
       properties: {
@@ -47,28 +40,32 @@ export const tools: readonly Tool[] = [
           "$ref": "#/$defs/iam_create-account",
           "description": "Parameters for account creation"
         },
-        "idempotency_key": {
-          "description": "Optional key that identifies an Account-creation request. Free Account creation can require exactly one valid key, so API clients should send a key with every Account-creation request. Reuse the same key when retrying the same request.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Idempotency-Key": {
+              "description": "Optional key that identifies an Account-creation request. Free Account creation can require exactly one valid key, so API clients should send a key with every Account-creation request. Reuse the same key when retrying the same request.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account-type": iam_account_type,
-        "iam_create-account": iam_create_account,
+        "iam_create-account": iam_create$$account,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_response_single_account",
       $defs: {
-        "iam_account": iam_account_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_account": iam_response_single_account_output,
+        "iam_account": iam_account,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_account": iam_response_single_account,
       },
     },
     annotations: {
@@ -98,19 +95,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_account": iam_account_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_account": iam_response_single_account_output,
+        "iam_account": iam_account,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_account": iam_response_single_account,
       },
     },
     request: (args) => ({
       path: `/accounts`,
       headers: [
-        ["Idempotency-Key", args["idempotency_key"]],
+        ["Idempotency-Key", param(args, "headers", "Idempotency-Key")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -118,26 +113,35 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_delete",
     title: "Delete a specific account",
-    description: "Delete a specific account (only available for tenant admins at this time). This is a permanent operation that will delete any zones or other resources under the account\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Delete a specific account (only available for tenant admins at this time). This is a permanent operation that will delete any zones or other resources under the account\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "The account ID of the account to be deleted",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account ID of the account to be deleted",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -175,11 +179,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -189,32 +192,36 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_get",
     title: "Account Details",
-    description: "Get information about a specific account that you are a member of.",
+    description: "Get information about a specific account that you are a member of.\n\nGET /accounts/{account_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_response_single_account",
       $defs: {
-        "iam_account": iam_account_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_account": iam_response_single_account_output,
+        "iam_account": iam_account,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_account": iam_response_single_account,
       },
     },
     annotations: {
@@ -280,13 +287,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_account": iam_account_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_account": iam_response_single_account_output,
+        "iam_account": iam_account,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_account": iam_response_single_account,
       },
     },
     request: (args) => ({
@@ -296,45 +301,50 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_list",
     title: "List Accounts",
-    description: "List all accounts you have ownership or verified access to.",
+    description: "List all accounts you have ownership or verified access to.\n\nGET /accounts",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Name of the account.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Name of the account.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_response_collection_accounts",
       $defs: {
-        "iam_account": iam_account_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_collection_accounts": iam_response_collection_accounts_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_account": iam_account,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_collection_accounts": iam_response_collection_accounts,
+        "iam_result_info": iam_result_info,
       },
     },
     annotations: {
@@ -364,38 +374,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_account": iam_account_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_collection_accounts": iam_response_collection_accounts_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_account": iam_account,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_collection_accounts": iam_response_collection_accounts,
+        "iam_result_info": iam_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts`,
       query: [
-        ["name", args["name"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
+        ["name", param(args, "query", "name"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
     name: "accounts_move",
     title: "Move account to organization",
-    description: "Move an account into a destination organization, either assigning a standalone account\nto an organization or moving it between organizations in the same hierarchy. Availability\ndepends on the organization's capabilities.",
+    description: "Move an account into a destination organization, either assigning a standalone account\nto an organization or moving it between organizations in the same hierarchy. Availability\ndepends on the organization's capabilities.\n\nPOST /accounts/{account_id}/move",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "The ID of the account to move.",
-          "type": "string"
-        },
         "body": {
           "description": "The destination organization ID is where the account is to be moved.",
           "properties": {
@@ -408,12 +412,26 @@ export const tools: readonly Tool[] = [
             "destination_organization_id"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account to move.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -448,8 +466,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_MoveAccountResult": organizations_api_MoveAccountResult_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_MoveAccountResult": organizations$$api_MoveAccountResult,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -507,9 +525,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_MoveAccountResult": organizations_api_MoveAccountResult_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_MoveAccountResult": organizations$$api_MoveAccountResult,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -520,39 +538,44 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_update",
     title: "Update Account",
-    description: "Update an existing account. Account names are limited to 65 UTF-8 bytes.",
+    description: "Update an existing account. Account names are limited to 65 UTF-8 bytes.\n\nPUT /accounts/{account_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_components-schemas-account"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account": iam_account,
-        "iam_account-type": iam_account_type,
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_components-schemas-account": iam_components_schemas_account,
+        "iam_account": iam_account$,
+        "iam_components-schemas-account": iam_components$$schemas$$account,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_response_single_account",
       $defs: {
-        "iam_account": iam_account_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_account": iam_response_single_account_output,
+        "iam_account": iam_account,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_account": iam_response_single_account,
       },
     },
     annotations: {
@@ -590,13 +613,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_account": iam_account_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_account": iam_response_single_account_output,
+        "iam_account": iam_account,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_account": iam_response_single_account,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/transformations/outputs.ts b/src/generated/forge-mcp/accounts/transformations/outputs.ts
index f3c447aaf..3ab6d1d97 100644
--- a/src/generated/forge-mcp/accounts/transformations/outputs.ts
+++ b/src/generated/forge-mcp/accounts/transformations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_zone_config_item` in responses.
  */
-export const speed_zone_config_item_output: JsonSchema = {
+export const speed_zone_config_item: JsonSchema = {
   "properties": {
     "cf_zone_tag": {
       "type": "string"
diff --git a/src/generated/forge-mcp/accounts/transformations/tools.ts b/src/generated/forge-mcp/accounts/transformations/tools.ts
index 854232f0c..b082646b1 100644
--- a/src/generated/forge-mcp/accounts/transformations/tools.ts
+++ b/src/generated/forge-mcp/accounts/transformations/tools.ts
@@ -3,12 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import { speed_zone_config_item_output } from "./outputs.js";
+import { speed_zone_config_item } from "./outputs.js";
 
 /**
  * The tools of `accounts.transformations`.
@@ -17,21 +16,28 @@ export const tools: readonly Tool[] = [
   {
     name: "accounts_transformations_list",
     title: "List Image Resizing configurations for account",
-    description: "Returns a list of Image Resizing configurations across all zones for the account.\nThis endpoint is useful for retrieving the transformations (image_resizing) state\nfor all zones belonging to an account.",
+    description: "Returns a list of Image Resizing configurations across all zones for the account.\nThis endpoint is useful for retrieving the transformations (image_resizing) state\nfor all zones belonging to an account.\n\nGET /accounts/{account_id}/settings/transformations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -51,9 +57,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_messages": speed_messages_output,
-        "speed_zone_config_item": speed_zone_config_item_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_messages": speed_messages,
+        "speed_zone_config_item": speed_zone_config_item,
       },
     },
     annotations: {
@@ -101,10 +107,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_messages": speed_messages_output,
-        "speed_zone_config_item": speed_zone_config_item_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_messages": speed_messages,
+        "speed_zone_config_item": speed_zone_config_item,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/accounts/utBilling/outputs.ts b/src/generated/forge-mcp/accounts/utBilling/outputs.ts
index e2dbfd8d7..6e1810f98 100644
--- a/src/generated/forge-mcp/accounts/utBilling/outputs.ts
+++ b/src/generated/forge-mcp/accounts/utBilling/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_ut_billing_response` in responses.
  */
-export const speed_ut_billing_response_output: JsonSchema = {
+export const speed_ut_billing_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -20,20 +20,13 @@ export const speed_ut_billing_response_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/speed_ut_billing_value"
+          "enum": [
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `speed_ut_billing_value` in responses.
- */
-export const speed_ut_billing_value_output: JsonSchema = {
-  "enum": [
-    "on"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/accounts/utBilling/schemas.ts b/src/generated/forge-mcp/accounts/utBilling/schemas.ts
deleted file mode 100644
index 33132de2e..000000000
--- a/src/generated/forge-mcp/accounts/utBilling/schemas.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `speed_ut_billing_value`.
- */
-export const speed_ut_billing_value: JsonSchema = {
-  "description": "Enables Unique Transformations billing for the account.\nNote: once enabled, this setting cannot be set back to \"off\".\n",
-  "enum": [
-    "on"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/accounts/utBilling/tools.ts b/src/generated/forge-mcp/accounts/utBilling/tools.ts
index 2ad8da176..85b4c9765 100644
--- a/src/generated/forge-mcp/accounts/utBilling/tools.ts
+++ b/src/generated/forge-mcp/accounts/utBilling/tools.ts
@@ -3,54 +3,58 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import {
-  speed_ut_billing_response_output,
-  speed_ut_billing_value_output,
-} from "./outputs.js";
-import { speed_ut_billing_value } from "./schemas.js";
+import { speed_ut_billing_response } from "./outputs.js";
 
 /**
- * The tools of `accounts.ut_billing`.
+ * The tools of `accounts.utBilling`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "accounts_ut_billing_edit",
+    name: "accounts_utBilling_edit",
     title: "Change Unique Transformations billing setting",
-    description: "Updates the Unique Transformations billing configuration for an account.\nWhen enabled, billing data is directed to the Transformations pipeline.\nNote: setting the value to \"off\" is not permitted once enabled.",
+    description: "Updates the Unique Transformations billing configuration for an account.\nWhen enabled, billing data is directed to the Transformations pipeline.\nNote: setting the value to \"off\" is not permitted once enabled.\n\nPATCH /accounts/{account_id}/settings/ut-billing",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/speed_ut_billing_value",
-              "description": "Enables Unique Transformations billing for the account.\nNote: once enabled, this setting cannot be set back to \"off\".\n"
+              "description": "Enables Unique Transformations billing for the account.\nNote: once enabled, this setting cannot be set back to \"off\".",
+              "enum": [
+                "on"
+              ],
+              "type": "string"
             }
           },
           "required": [
             "value"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-        "speed_ut_billing_value": speed_ut_billing_value,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -67,11 +71,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_ut_billing_response": speed_ut_billing_response_output,
-        "speed_ut_billing_value": speed_ut_billing_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_ut_billing_response": speed_ut_billing_response,
       },
     },
     annotations: {
@@ -115,12 +118,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_ut_billing_response": speed_ut_billing_response_output,
-        "speed_ut_billing_value": speed_ut_billing_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_ut_billing_response": speed_ut_billing_response,
       },
     },
     request: (args) => ({
@@ -129,23 +131,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "accounts_ut_billing_get",
+    name: "accounts_utBilling_get",
     title: "Get Unique Transformations billing setting",
-    description: "Retrieves the Unique Transformations billing configuration for an account.\nWhen enabled, billing data is directed to the Transformations pipeline.",
+    description: "Retrieves the Unique Transformations billing configuration for an account.\nWhen enabled, billing data is directed to the Transformations pipeline.\n\nGET /accounts/{account_id}/settings/ut-billing",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -162,11 +171,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_ut_billing_response": speed_ut_billing_response_output,
-        "speed_ut_billing_value": speed_ut_billing_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_ut_billing_response": speed_ut_billing_response,
       },
     },
     annotations: {
@@ -211,12 +219,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_ut_billing_response": speed_ut_billing_response_output,
-        "speed_ut_billing_value": speed_ut_billing_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_ut_billing_response": speed_ut_billing_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/acm/customTrustStore/outputs.ts b/src/generated/forge-mcp/acm/customTrustStore/outputs.ts
index 9e9fbebe2..5d588ef6e 100644
--- a/src/generated/forge-mcp/acm/customTrustStore/outputs.ts
+++ b/src/generated/forge-mcp/acm/customTrustStore/outputs.ts
@@ -3,42 +3,46 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-3` in responses.
- */
-export const tls_certificates_and_hostnames_certificate_3_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_custom-trust-store` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_trust_store_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom$$trust$$store: JsonSchema = {
   "properties": {
     "certificate": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-3"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expires_on-2"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_identifier"
+      "type": "string"
     },
     "issuer": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_issuer"
+      "type": "string"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-7"
+      "enum": [
+        "initializing",
+        "pending_deployment",
+        "active",
+        "pending_deletion",
+        "deleted",
+        "expired"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at-2"
+      "format": "date-time",
+      "type": "string"
     },
     "uploaded_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_uploaded_on"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "required": [
@@ -54,20 +58,12 @@ export const tls_certificates_and_hostnames_custom_trust_store_output: JsonSchem
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_custom_trust_store_identifier`
- * in responses.
- */
-export const tls_certificates_and_hostnames_custom_trust_store_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_custom_trust_store_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_trust_store_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_trust_store_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -91,7 +87,7 @@ export const tls_certificates_and_hostnames_custom_trust_store_response_collecti
  * `tls-certificates-and-hostnames_custom_trust_store_response_id_only` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_trust_store_response_id_only_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_trust_store_response_id_only: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -101,7 +97,7 @@ export const tls_certificates_and_hostnames_custom_trust_store_response_id_only_
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -117,7 +113,7 @@ export const tls_certificates_and_hostnames_custom_trust_store_response_id_only_
  * `tls-certificates-and-hostnames_custom_trust_store_response_single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_trust_store_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_trust_store_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -132,26 +128,3 @@ export const tls_certificates_and_hostnames_custom_trust_store_response_single_o
     }
   ]
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_status-7` in responses.
- */
-export const tls_certificates_and_hostnames_status_7_output: JsonSchema = {
-  "enum": [
-    "initializing",
-    "pending_deployment",
-    "active",
-    "pending_deletion",
-    "deleted",
-    "expired"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_updated_at-2` in responses.
- */
-export const tls_certificates_and_hostnames_updated_at_2_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/acm/customTrustStore/schemas.ts b/src/generated/forge-mcp/acm/customTrustStore/schemas.ts
deleted file mode 100644
index ab7f4e743..000000000
--- a/src/generated/forge-mcp/acm/customTrustStore/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-3`.
- */
-export const tls_certificates_and_hostnames_certificate_3: JsonSchema = {
-  "description": "The root CA certificate in PEM format. Only root CA certificates are accepted; intermediate and leaf certificates are not supported.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_custom_trust_store_identifier`.
- */
-export const tls_certificates_and_hostnames_custom_trust_store_identifier: JsonSchema = {
-  "description": "Certificate identifier tag.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/acm/customTrustStore/tools.ts b/src/generated/forge-mcp/acm/customTrustStore/tools.ts
index 3a5a1cf9d..6c8bc7367 100644
--- a/src/generated/forge-mcp/acm/customTrustStore/tools.ts
+++ b/src/generated/forge-mcp/acm/customTrustStore/tools.ts
@@ -1,50 +1,37 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_expires_on_2_output,
-  tls_certificates_and_hostnames_issuer_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_signature_output,
-  tls_certificates_and_hostnames_uploaded_on_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_certificate_3_output,
-  tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-  tls_certificates_and_hostnames_custom_trust_store_output,
-  tls_certificates_and_hostnames_custom_trust_store_response_collection_output,
-  tls_certificates_and_hostnames_custom_trust_store_response_id_only_output,
-  tls_certificates_and_hostnames_custom_trust_store_response_single_output,
-  tls_certificates_and_hostnames_status_7_output,
-  tls_certificates_and_hostnames_updated_at_2_output,
+  tls$$certificates$$and$$hostnames_custom$$trust$$store,
+  tls$$certificates$$and$$hostnames_custom_trust_store_response_collection,
+  tls$$certificates$$and$$hostnames_custom_trust_store_response_id_only,
+  tls$$certificates$$and$$hostnames_custom_trust_store_response_single,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_certificate_3,
-  tls_certificates_and_hostnames_custom_trust_store_identifier,
-} from "./schemas.js";
 
 /**
- * The tools of `acm.custom_trust_store`.
+ * The tools of `acm.customTrustStore`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "acm_custom_trust_store_create",
+    name: "acm_customTrustStore_create",
     title: "Upload Custom Origin Trust Store",
-    description: "Upload a root CA certificate to the Custom Origin Trust Store for a Zone. Only root CA certificates are accepted.",
+    description: "Upload a root CA certificate to the Custom Origin Trust Store for a Zone. Only root CA certificates are accepted.\n\nPOST /zones/{zone_id}/acm/custom_trust_store",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "certificate": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-3",
-              "description": "The root CA certificate in PEM format. Only root CA certificates are accepted; intermediate and leaf certificates are not supported."
+              "description": "The root CA certificate in PEM format. Only root CA certificates are accepted; intermediate and leaf certificates are not supported.",
+              "type": "string"
             }
           },
           "required": [
@@ -52,35 +39,33 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_certificate-3": tls_certificates_and_hostnames_certificate_3,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-3": tls_certificates_and_hostnames_certificate_3_output,
-        "tls-certificates-and-hostnames_custom-trust-store": tls_certificates_and_hostnames_custom_trust_store_output,
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-        "tls-certificates-and-hostnames_custom_trust_store_response_single": tls_certificates_and_hostnames_custom_trust_store_response_single_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-7": tls_certificates_and_hostnames_status_7_output,
-        "tls-certificates-and-hostnames_updated_at-2": tls_certificates_and_hostnames_updated_at_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom-trust-store": tls$$certificates$$and$$hostnames_custom$$trust$$store,
+        "tls-certificates-and-hostnames_custom_trust_store_response_single": tls$$certificates$$and$$hostnames_custom_trust_store_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -126,19 +111,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-3": tls_certificates_and_hostnames_certificate_3_output,
-        "tls-certificates-and-hostnames_custom-trust-store": tls_certificates_and_hostnames_custom_trust_store_output,
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-        "tls-certificates-and-hostnames_custom_trust_store_response_single": tls_certificates_and_hostnames_custom_trust_store_response_single_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-7": tls_certificates_and_hostnames_status_7_output,
-        "tls-certificates-and-hostnames_updated_at-2": tls_certificates_and_hostnames_updated_at_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom-trust-store": tls$$certificates$$and$$hostnames_custom$$trust$$store,
+        "tls-certificates-and-hostnames_custom_trust_store_response_single": tls$$certificates$$and$$hostnames_custom_trust_store_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -147,37 +124,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "acm_custom_trust_store_delete",
+    name: "acm_customTrustStore_delete",
     title: "Delete Custom Origin Trust Store",
-    description: "Removes a root CA certificate from the custom origin trust store. Origins using certificates signed by this CA will no longer be trusted.",
+    description: "Removes a root CA certificate from the custom origin trust store. Origins using certificates signed by this CA will no longer be trusted.\n\nDELETE /zones/{zone_id}/acm/custom_trust_store/{custom_origin_trust_store_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "custom_origin_trust_store_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_identifier",
-          "description": "Certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_origin_trust_store_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_origin_trust_store_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_origin_trust_store_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_response_id_only",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-        "tls-certificates-and-hostnames_custom_trust_store_response_id_only": tls_certificates_and_hostnames_custom_trust_store_response_id_only_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom_trust_store_response_id_only": tls$$certificates$$and$$hostnames_custom_trust_store_response_id_only,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -214,7 +196,7 @@ export const tools: readonly Tool[] = [
         "4XX": {
           "allOf": [
             {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_identifier"
+              "type": "string"
             },
             {
               "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-common-failure"
@@ -223,11 +205,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-        "tls-certificates-and-hostnames_custom_trust_store_response_id_only": tls_certificates_and_hostnames_custom_trust_store_response_id_only_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom_trust_store_response_id_only": tls$$certificates$$and$$hostnames_custom_trust_store_response_id_only,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -235,45 +216,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "acm_custom_trust_store_get",
+    name: "acm_customTrustStore_get",
     title: "Custom Origin Trust Store Details",
-    description: "Retrieves details about a specific root CA certificate in the custom origin trust store, including expiration and subject information.",
+    description: "Retrieves details about a specific root CA certificate in the custom origin trust store, including expiration and subject information.\n\nGET /zones/{zone_id}/acm/custom_trust_store/{custom_origin_trust_store_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "custom_origin_trust_store_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_identifier",
-          "description": "Certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_origin_trust_store_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_origin_trust_store_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_origin_trust_store_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-3": tls_certificates_and_hostnames_certificate_3_output,
-        "tls-certificates-and-hostnames_custom-trust-store": tls_certificates_and_hostnames_custom_trust_store_output,
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-        "tls-certificates-and-hostnames_custom_trust_store_response_single": tls_certificates_and_hostnames_custom_trust_store_response_single_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-7": tls_certificates_and_hostnames_status_7_output,
-        "tls-certificates-and-hostnames_updated_at-2": tls_certificates_and_hostnames_updated_at_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom-trust-store": tls$$certificates$$and$$hostnames_custom$$trust$$store,
+        "tls-certificates-and-hostnames_custom_trust_store_response_single": tls$$certificates$$and$$hostnames_custom_trust_store_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -319,19 +298,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-3": tls_certificates_and_hostnames_certificate_3_output,
-        "tls-certificates-and-hostnames_custom-trust-store": tls_certificates_and_hostnames_custom_trust_store_output,
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-        "tls-certificates-and-hostnames_custom_trust_store_response_single": tls_certificates_and_hostnames_custom_trust_store_response_single_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-7": tls_certificates_and_hostnames_status_7_output,
-        "tls-certificates-and-hostnames_updated_at-2": tls_certificates_and_hostnames_updated_at_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom-trust-store": tls$$certificates$$and$$hostnames_custom$$trust$$store,
+        "tls-certificates-and-hostnames_custom_trust_store_response_single": tls$$certificates$$and$$hostnames_custom_trust_store_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -339,58 +310,63 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "acm_custom_trust_store_list",
+    name: "acm_customTrustStore_list",
     title: "List Custom Origin Trust Store Details",
-    description: "Get Custom Origin Trust Store for a Zone.",
+    description: "Get Custom Origin Trust Store for a Zone.\n\nGET /zones/{zone_id}/acm/custom_trust_store",
     inputSchema: {
       type: "object",
       properties: {
-        "limit": {
-          "description": "Limit to the number of records returned.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Offset the results.",
-          "type": "integer"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of records per page.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "description": "Limit to the number of records returned.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Offset the results.",
+              "type": "integer"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of records per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_trust_store_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_certificate-3": tls_certificates_and_hostnames_certificate_3_output,
-        "tls-certificates-and-hostnames_custom-trust-store": tls_certificates_and_hostnames_custom_trust_store_output,
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-        "tls-certificates-and-hostnames_custom_trust_store_response_collection": tls_certificates_and_hostnames_custom_trust_store_response_collection_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-7": tls_certificates_and_hostnames_status_7_output,
-        "tls-certificates-and-hostnames_updated_at-2": tls_certificates_and_hostnames_updated_at_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_custom-trust-store": tls$$certificates$$and$$hostnames_custom$$trust$$store,
+        "tls-certificates-and-hostnames_custom_trust_store_response_collection": tls$$certificates$$and$$hostnames_custom_trust_store_response_collection,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -436,29 +412,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate-3": tls_certificates_and_hostnames_certificate_3_output,
-        "tls-certificates-and-hostnames_custom-trust-store": tls_certificates_and_hostnames_custom_trust_store_output,
-        "tls-certificates-and-hostnames_custom_trust_store_identifier": tls_certificates_and_hostnames_custom_trust_store_identifier_output,
-        "tls-certificates-and-hostnames_custom_trust_store_response_collection": tls_certificates_and_hostnames_custom_trust_store_response_collection_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-7": tls_certificates_and_hostnames_status_7_output,
-        "tls-certificates-and-hostnames_updated_at-2": tls_certificates_and_hostnames_updated_at_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_custom-trust-store": tls$$certificates$$and$$hostnames_custom$$trust$$store,
+        "tls-certificates-and-hostnames_custom_trust_store_response_collection": tls$$certificates$$and$$hostnames_custom_trust_store_response_collection,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/acm/custom_trust_store`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/acm/totalTls/outputs.ts b/src/generated/forge-mcp/acm/totalTls/outputs.ts
index de886b1e3..1e08e58b5 100644
--- a/src/generated/forge-mcp/acm/totalTls/outputs.ts
+++ b/src/generated/forge-mcp/acm/totalTls/outputs.ts
@@ -3,31 +3,11 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_authority-3` in
- * responses.
- */
-export const tls_certificates_and_hostnames_certificate_authority_3_output: JsonSchema = {
-  "enum": [
-    "google",
-    "lets_encrypt",
-    "ssl_com"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_enabled-3` in responses.
- */
-export const tls_certificates_and_hostnames_enabled_3_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_total_tls_settings_response` in
  * responses.
  */
-export const tls_certificates_and_hostnames_total_tls_settings_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_total_tls_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -37,13 +17,21 @@ export const tls_certificates_and_hostnames_total_tls_settings_response_output:
         "result": {
           "properties": {
             "certificate_authority": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_authority-3"
+              "enum": [
+                "google",
+                "lets_encrypt",
+                "ssl_com"
+              ],
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-3"
+              "type": "boolean"
             },
             "validity_period": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_validity_period"
+              "enum": [
+                90
+              ],
+              "type": "integer"
             }
           },
           "type": "object"
@@ -53,13 +41,3 @@ export const tls_certificates_and_hostnames_total_tls_settings_response_output:
     }
   ]
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_validity_period` in responses.
- */
-export const tls_certificates_and_hostnames_validity_period_output: JsonSchema = {
-  "enum": [
-    90
-  ],
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/acm/totalTls/schemas.ts b/src/generated/forge-mcp/acm/totalTls/schemas.ts
deleted file mode 100644
index 31da53533..000000000
--- a/src/generated/forge-mcp/acm/totalTls/schemas.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_authority-3`.
- */
-export const tls_certificates_and_hostnames_certificate_authority_3: JsonSchema = {
-  "description": "The Certificate Authority that Total TLS certificates will be issued through.",
-  "enum": [
-    "google",
-    "lets_encrypt",
-    "ssl_com"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_enabled-3`.
- */
-export const tls_certificates_and_hostnames_enabled_3: JsonSchema = {
-  "description": "If enabled, Total TLS will order a hostname specific TLS certificate for any proxied A, AAAA, or CNAME record in your zone.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/acm/totalTls/tools.ts b/src/generated/forge-mcp/acm/totalTls/tools.ts
index f527a0635..cef23c824 100644
--- a/src/generated/forge-mcp/acm/totalTls/tools.ts
+++ b/src/generated/forge-mcp/acm/totalTls/tools.ts
@@ -3,42 +3,37 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
-import {
-  tls_certificates_and_hostnames_certificate_authority_3_output,
-  tls_certificates_and_hostnames_enabled_3_output,
-  tls_certificates_and_hostnames_total_tls_settings_response_output,
-  tls_certificates_and_hostnames_validity_period_output,
-} from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_certificate_authority_3,
-  tls_certificates_and_hostnames_enabled_3,
-} from "./schemas.js";
+import { tls$$certificates$$and$$hostnames_total_tls_settings_response } from "./outputs.js";
 
 /**
- * The tools of `acm.total_tls`.
+ * The tools of `acm.totalTls`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "acm_total_tls_edit",
+    name: "acm_totalTls_edit",
     title: "Enable or Disable Total TLS",
-    description: "Set Total TLS Settings or disable the feature for a Zone.",
+    description: "Set Total TLS Settings or disable the feature for a Zone.\n\nPOST /zones/{zone_id}/acm/total_tls",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "certificate_authority": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_authority-3",
-              "description": "The Certificate Authority that Total TLS certificates will be issued through."
+              "description": "The Certificate Authority that Total TLS certificates will be issued through.",
+              "enum": [
+                "google",
+                "lets_encrypt",
+                "ssl_com"
+              ],
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-3",
-              "description": "If enabled, Total TLS will order a hostname specific TLS certificate for any proxied A, AAAA, or CNAME record in your zone."
+              "description": "If enabled, Total TLS will order a hostname specific TLS certificate for any proxied A, AAAA, or CNAME record in your zone.",
+              "type": "boolean"
             }
           },
           "required": [
@@ -46,30 +41,32 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_certificate_authority-3": tls_certificates_and_hostnames_certificate_authority_3,
-        "tls-certificates-and-hostnames_enabled-3": tls_certificates_and_hostnames_enabled_3,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_total_tls_settings_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-3": tls_certificates_and_hostnames_certificate_authority_3_output,
-        "tls-certificates-and-hostnames_enabled-3": tls_certificates_and_hostnames_enabled_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_total_tls_settings_response": tls_certificates_and_hostnames_total_tls_settings_response_output,
-        "tls-certificates-and-hostnames_validity_period": tls_certificates_and_hostnames_validity_period_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_total_tls_settings_response": tls$$certificates$$and$$hostnames_total_tls_settings_response,
       },
     },
     annotations: {
@@ -115,13 +112,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-3": tls_certificates_and_hostnames_certificate_authority_3_output,
-        "tls-certificates-and-hostnames_enabled-3": tls_certificates_and_hostnames_enabled_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_total_tls_settings_response": tls_certificates_and_hostnames_total_tls_settings_response_output,
-        "tls-certificates-and-hostnames_validity_period": tls_certificates_and_hostnames_validity_period_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_total_tls_settings_response": tls$$certificates$$and$$hostnames_total_tls_settings_response,
       },
     },
     request: (args) => ({
@@ -130,33 +124,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "acm_total_tls_get",
+    name: "acm_totalTls_get",
     title: "Total TLS Settings Details",
-    description: "Get Total TLS Settings for a Zone.",
+    description: "Get Total TLS Settings for a Zone.\n\nGET /zones/{zone_id}/acm/total_tls",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_total_tls_settings_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-3": tls_certificates_and_hostnames_certificate_authority_3_output,
-        "tls-certificates-and-hostnames_enabled-3": tls_certificates_and_hostnames_enabled_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_total_tls_settings_response": tls_certificates_and_hostnames_total_tls_settings_response_output,
-        "tls-certificates-and-hostnames_validity_period": tls_certificates_and_hostnames_validity_period_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_total_tls_settings_response": tls$$certificates$$and$$hostnames_total_tls_settings_response,
       },
     },
     annotations: {
@@ -202,13 +200,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-3": tls_certificates_and_hostnames_certificate_authority_3_output,
-        "tls-certificates-and-hostnames_enabled-3": tls_certificates_and_hostnames_enabled_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_total_tls_settings_response": tls_certificates_and_hostnames_total_tls_settings_response_output,
-        "tls-certificates-and-hostnames_validity_period": tls_certificates_and_hostnames_validity_period_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_total_tls_settings_response": tls$$certificates$$and$$hostnames_total_tls_settings_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/addressMaps/accounts/tools.ts b/src/generated/forge-mcp/addressing/addressMaps/accounts/tools.ts
index cbc04a8fd..5a2be6acc 100644
--- a/src/generated/forge-mcp/addressing/addressMaps/accounts/tools.ts
+++ b/src/generated/forge-mcp/addressing/addressMaps/accounts/tools.ts
@@ -3,54 +3,58 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  addressing_api_response_collection_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_messages_output,
+  addressing_api$$response$$collection,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_messages,
 } from "../../outputs.js";
-import { addressing_account_identifier } from "../../schemas.js";
-import { addressing_address_map_identifier } from "../schemas.js";
 
 /**
- * The tools of `addressing.address_maps.accounts`.
+ * The tools of `addressing.addressMaps.accounts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_address_maps_accounts_delete",
+    name: "addressing_addressMaps_accounts_delete",
     title: "Remove an account membership from an Address Map",
-    description: "Remove an account as a member of a particular address map.",
+    description: "Remove an account as a member of a particular address map.\n\nDELETE /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{member_account_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
-        "member_account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            },
+            "member_account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id",
+            "member_account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
-        "member_account_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -84,10 +88,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -95,41 +99,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_accounts_update",
+    name: "addressing_addressMaps_accounts_update",
     title: "Add an account membership to an Address Map",
-    description: "Add an account as a member of a particular address map.",
+    description: "Add an account as a member of a particular address map.\n\nPUT /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{member_account_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
-        "member_account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            },
+            "member_account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id",
+            "member_account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
-        "member_account_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -158,10 +168,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/addressMaps/ips/tools.ts b/src/generated/forge-mcp/addressing/addressMaps/ips/tools.ts
index 938c018d9..7c1843fe4 100644
--- a/src/generated/forge-mcp/addressing/addressMaps/ips/tools.ts
+++ b/src/generated/forge-mcp/addressing/addressMaps/ips/tools.ts
@@ -3,58 +3,58 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  addressing_api_response_collection_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_messages_output,
+  addressing_api$$response$$collection,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_messages,
 } from "../../outputs.js";
-import { addressing_account_identifier } from "../../schemas.js";
-import {
-  addressing_address_map_identifier,
-  addressing_ip_address,
-} from "../schemas.js";
 
 /**
- * The tools of `addressing.address_maps.ips`.
+ * The tools of `addressing.addressMaps.ips`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_address_maps_ips_delete",
+    name: "addressing_addressMaps_ips_delete",
     title: "Remove an IP from an Address Map",
-    description: "Remove an IP from a particular address map.",
+    description: "Remove an IP from a particular address map.\n\nDELETE /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
-        "ip_address": {
-          "$ref": "#/$defs/addressing_ip_address",
-          "description": "An IPv4 or IPv6 address."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            },
+            "ip_address": {
+              "description": "An IPv4 or IPv6 address.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id",
+            "ip_address"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
-        "ip_address"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_ip_address": addressing_ip_address,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -88,10 +88,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -99,25 +99,18 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_ips_delete_bulk",
+    name: "addressing_addressMaps_ips_deleteBulk",
     title: "Remove Multiple IPs from an Address Map",
-    description: "Remove multiple IPs from a particular address map.",
+    description: "Remove multiple IPs from a particular address map.\n\nDELETE /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
         "body": {
           "properties": {
             "ips": {
               "items": {
-                "$ref": "#/$defs/addressing_ip_address"
+                "description": "An IPv4 or IPv6 address.",
+                "type": "string"
               },
               "type": "array"
             }
@@ -126,25 +119,38 @@ export const tools: readonly Tool[] = [
             "ips"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_ip_address": addressing_ip_address,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -178,10 +184,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -190,42 +196,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_ips_update",
+    name: "addressing_addressMaps_ips_update",
     title: "Add an IP to an Address Map",
-    description: "Add an IP from a prefix owned by the account to a particular address map.",
+    description: "Add an IP from a prefix owned by the account to a particular address map.\n\nPUT /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
-        "ip_address": {
-          "$ref": "#/$defs/addressing_ip_address",
-          "description": "An IPv4 or IPv6 address."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            },
+            "ip_address": {
+              "description": "An IPv4 or IPv6 address.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id",
+            "ip_address"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
-        "ip_address"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_ip_address": addressing_ip_address,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -259,10 +270,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -270,25 +281,18 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_ips_update_bulk",
+    name: "addressing_addressMaps_ips_updateBulk",
     title: "Add Multiple IPs to an Address Map",
-    description: "Add multiple IPs to a particular address map.",
+    description: "Add multiple IPs to a particular address map.\n\nPOST /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
         "body": {
           "properties": {
             "ips": {
               "items": {
-                "$ref": "#/$defs/addressing_ip_address"
+                "description": "An IPv4 or IPv6 address.",
+                "type": "string"
               },
               "type": "array"
             }
@@ -297,25 +301,38 @@ export const tools: readonly Tool[] = [
             "ips"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_ip_address": addressing_ip_address,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -344,10 +361,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/addressMaps/outputs.ts b/src/generated/forge-mcp/addressing/addressMaps/outputs.ts
index a0a42bd6d..98f09c3c0 100644
--- a/src/generated/forge-mcp/addressing/addressMaps/outputs.ts
+++ b/src/generated/forge-mcp/addressing/addressMaps/outputs.ts
@@ -6,31 +6,54 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `addressing_address-maps` in responses.
  */
-export const addressing_address_maps_output: JsonSchema = {
+export const addressing_address$$maps: JsonSchema = {
   "properties": {
     "can_delete": {
-      "$ref": "#/$defs/addressing_can_delete"
+      "type": "boolean"
     },
     "can_modify_ips": {
-      "$ref": "#/$defs/addressing_can_modify_ips"
+      "type": "boolean"
     },
     "created_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "default_sni": {
-      "$ref": "#/$defs/addressing_default_sni"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "description": {
-      "$ref": "#/$defs/addressing_description-2"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "enabled": {
-      "$ref": "#/$defs/addressing_enabled"
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "id": {
-      "$ref": "#/$defs/addressing_address_map_identifier"
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -39,13 +62,14 @@ export const addressing_address_maps_output: JsonSchema = {
 /**
  * The schema of `addressing_address-maps-ip` in responses.
  */
-export const addressing_address_maps_ip_output: JsonSchema = {
+export const addressing_address$$maps$$ip: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "ip": {
-      "$ref": "#/$defs/addressing_ip"
+      "type": "string"
     }
   },
   "type": "object"
@@ -54,98 +78,33 @@ export const addressing_address_maps_ip_output: JsonSchema = {
 /**
  * The schema of `addressing_address-maps-membership` in responses.
  */
-export const addressing_address_maps_membership_output: JsonSchema = {
+export const addressing_address$$maps$$membership: JsonSchema = {
   "properties": {
     "can_delete": {
-      "$ref": "#/$defs/addressing_can_delete-2"
+      "type": "boolean"
     },
     "created_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "identifier": {
-      "$ref": "#/$defs/addressing_identifier"
+      "type": "string"
     },
     "kind": {
-      "$ref": "#/$defs/addressing_kind"
+      "enum": [
+        "zone",
+        "account"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `addressing_address_map_identifier` in responses.
- */
-export const addressing_address_map_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_can_delete` in responses.
- */
-export const addressing_can_delete_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_can_delete-2` in responses.
- */
-export const addressing_can_delete_2_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_can_modify_ips` in responses.
- */
-export const addressing_can_modify_ips_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_default_sni` in responses.
- */
-export const addressing_default_sni_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_description-2` in responses.
- */
-export const addressing_description_2_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_enabled` in responses.
- */
-export const addressing_enabled_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `addressing_full_response` in responses.
  */
-export const addressing_full_response_output: JsonSchema = {
+export const addressing_full_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-single"
@@ -176,45 +135,20 @@ export const addressing_full_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `addressing_identifier` in responses.
- */
-export const addressing_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_ip` in responses.
- */
-export const addressing_ip_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_ips` in responses.
  */
-export const addressing_ips_output: JsonSchema = {
+export const addressing_ips: JsonSchema = {
   "items": {
     "$ref": "#/$defs/addressing_address-maps-ip"
   },
   "type": "array"
 };
 
-/**
- * The schema of `addressing_kind` in responses.
- */
-export const addressing_kind_output: JsonSchema = {
-  "enum": [
-    "zone",
-    "account"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_memberships` in responses.
  */
-export const addressing_memberships_output: JsonSchema = {
+export const addressing_memberships: JsonSchema = {
   "items": {
     "$ref": "#/$defs/addressing_address-maps-membership"
   },
@@ -224,7 +158,7 @@ export const addressing_memberships_output: JsonSchema = {
 /**
  * The schema of `addressing_response_collection-3` in responses.
  */
-export const addressing_response_collection_3_output: JsonSchema = {
+export const addressing_response_collection$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-collection"
@@ -246,7 +180,7 @@ export const addressing_response_collection_3_output: JsonSchema = {
 /**
  * The schema of `addressing_single_response-3` in responses.
  */
-export const addressing_single_response_3_output: JsonSchema = {
+export const addressing_single_response$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-single"
diff --git a/src/generated/forge-mcp/addressing/addressMaps/schemas.ts b/src/generated/forge-mcp/addressing/addressMaps/schemas.ts
index 9526160a0..e61335936 100644
--- a/src/generated/forge-mcp/addressing/addressMaps/schemas.ts
+++ b/src/generated/forge-mcp/addressing/addressMaps/schemas.ts
@@ -6,101 +6,24 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `addressing_address-maps-membership-request`.
  */
-export const addressing_address_maps_membership_request: JsonSchema = {
+export const addressing_address$$maps$$membership$$request: JsonSchema = {
   "properties": {
     "identifier": {
-      "$ref": "#/$defs/addressing_identifier",
-      "description": "The identifier for the membership (eg. a zone or account tag)."
+      "description": "The identifier for the membership (eg. a zone or account tag).",
+      "type": "string"
     },
     "kind": {
-      "$ref": "#/$defs/addressing_kind",
-      "description": "The type of the membership."
+      "description": "The type of the membership.",
+      "enum": [
+        "zone",
+        "account"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `addressing_address_map_identifier`.
- */
-export const addressing_address_map_identifier: JsonSchema = {
-  "description": "Identifier of an Address Map.",
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_default_sni`.
- */
-export const addressing_default_sni: JsonSchema = {
-  "description": "If you have legacy TLS clients which do not send the TLS server name indicator, then you can specify one default SNI on the map. If Cloudflare receives a TLS handshake from a client without an SNI, it will respond with the default SNI on those IPs. The default SNI can be any valid zone or subdomain owned by the account.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_description-2`.
- */
-export const addressing_description_2: JsonSchema = {
-  "description": "An optional description field which may be used to describe the types of IPs or zones on the map.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_enabled`.
- */
-export const addressing_enabled: JsonSchema = {
-  "description": "Whether the Address Map is enabled or not. Cloudflare's DNS will not respond with IP addresses on an Address Map until the map is enabled.",
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_identifier`.
- */
-export const addressing_identifier: JsonSchema = {
-  "description": "The identifier for the membership (eg. a zone or account tag).",
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_ip_address`.
- */
-export const addressing_ip_address: JsonSchema = {
-  "description": "An IPv4 or IPv6 address.",
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_kind`.
- */
-export const addressing_kind: JsonSchema = {
-  "description": "The type of the membership.",
-  "enum": [
-    "zone",
-    "account"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_membership_requests`.
  */
diff --git a/src/generated/forge-mcp/addressing/addressMaps/tools.ts b/src/generated/forge-mcp/addressing/addressMaps/tools.ts
index da65e4896..84d900657 100644
--- a/src/generated/forge-mcp/addressing/addressMaps/tools.ts
+++ b/src/generated/forge-mcp/addressing/addressMaps/tools.ts
@@ -3,75 +3,67 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  addressing_api_response_collection_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_api_response_single_output,
-  addressing_messages_output,
-  addressing_timestamp_output,
+  addressing_api$$response$$collection,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_api$$response$$single,
+  addressing_messages,
 } from "../outputs.js";
-import { addressing_account_identifier } from "../schemas.js";
 import {
-  addressing_address_map_identifier_output,
-  addressing_address_maps_ip_output,
-  addressing_address_maps_membership_output,
-  addressing_address_maps_output,
-  addressing_can_delete_2_output,
-  addressing_can_delete_output,
-  addressing_can_modify_ips_output,
-  addressing_default_sni_output,
-  addressing_description_2_output,
-  addressing_enabled_output,
-  addressing_full_response_output,
-  addressing_identifier_output,
-  addressing_ip_output,
-  addressing_ips_output,
-  addressing_kind_output,
-  addressing_memberships_output,
-  addressing_response_collection_3_output,
-  addressing_single_response_3_output,
+  addressing_address$$maps,
+  addressing_address$$maps$$ip,
+  addressing_address$$maps$$membership,
+  addressing_full_response,
+  addressing_ips,
+  addressing_memberships,
+  addressing_response_collection$$3,
+  addressing_single_response$$3,
 } from "./outputs.js";
 import {
-  addressing_address_map_identifier,
-  addressing_address_maps_membership_request,
-  addressing_default_sni,
-  addressing_description_2,
-  addressing_enabled,
-  addressing_identifier,
-  addressing_ip_address,
-  addressing_kind,
+  addressing_address$$maps$$membership$$request,
   addressing_membership_requests,
 } from "./schemas.js";
 
 /**
- * The tools of `addressing.address_maps`.
+ * The tools of `addressing.addressMaps`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_address_maps_create",
+    name: "addressing_addressMaps_create",
     title: "Create Address Map",
-    description: "Create a new address map under the account.",
+    description: "Create a new address map under the account.\n\nPOST /accounts/{account_id}/addressing/address_maps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/addressing_description-2",
-              "description": "An optional description field which may be used to describe the types of IPs or zones on the map."
+              "description": "An optional description field which may be used to describe the types of IPs or zones on the map.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "enabled": {
-              "$ref": "#/$defs/addressing_enabled",
               "default": false,
-              "description": "Whether the Address Map is enabled or not. Cloudflare's DNS will not respond with IP addresses on an Address Map until the map is enabled."
+              "description": "Whether the Address Map is enabled or not. Cloudflare's DNS will not respond with IP addresses on an Address Map until the map is enabled.",
+              "oneOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "ips": {
               "items": {
-                "$ref": "#/$defs/addressing_ip_address"
+                "description": "An IPv4 or IPv6 address.",
+                "type": "string"
               },
               "type": "array"
             },
@@ -81,45 +73,42 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address-maps-membership-request": addressing_address_maps_membership_request,
-        "addressing_description-2": addressing_description_2,
-        "addressing_enabled": addressing_enabled,
-        "addressing_identifier": addressing_identifier,
-        "addressing_ip_address": addressing_ip_address,
-        "addressing_kind": addressing_kind,
+        "addressing_address-maps-membership-request": addressing_address$$maps$$membership$$request,
         "addressing_membership_requests": addressing_membership_requests,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_full_response",
       $defs: {
-        "addressing_address-maps": addressing_address_maps_output,
-        "addressing_address-maps-ip": addressing_address_maps_ip_output,
-        "addressing_address-maps-membership": addressing_address_maps_membership_output,
-        "addressing_address_map_identifier": addressing_address_map_identifier_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_can_delete": addressing_can_delete_output,
-        "addressing_can_delete-2": addressing_can_delete_2_output,
-        "addressing_can_modify_ips": addressing_can_modify_ips_output,
-        "addressing_default_sni": addressing_default_sni_output,
-        "addressing_description-2": addressing_description_2_output,
-        "addressing_enabled": addressing_enabled_output,
-        "addressing_full_response": addressing_full_response_output,
-        "addressing_identifier": addressing_identifier_output,
-        "addressing_ip": addressing_ip_output,
-        "addressing_ips": addressing_ips_output,
-        "addressing_kind": addressing_kind_output,
-        "addressing_memberships": addressing_memberships_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_address-maps": addressing_address$$maps,
+        "addressing_address-maps-ip": addressing_address$$maps$$ip,
+        "addressing_address-maps-membership": addressing_address$$maps$$membership,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_full_response": addressing_full_response,
+        "addressing_ips": addressing_ips,
+        "addressing_memberships": addressing_memberships,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -153,26 +142,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_address-maps": addressing_address_maps_output,
-        "addressing_address-maps-ip": addressing_address_maps_ip_output,
-        "addressing_address-maps-membership": addressing_address_maps_membership_output,
-        "addressing_address_map_identifier": addressing_address_map_identifier_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_can_delete": addressing_can_delete_output,
-        "addressing_can_delete-2": addressing_can_delete_2_output,
-        "addressing_can_modify_ips": addressing_can_modify_ips_output,
-        "addressing_default_sni": addressing_default_sni_output,
-        "addressing_description-2": addressing_description_2_output,
-        "addressing_enabled": addressing_enabled_output,
-        "addressing_full_response": addressing_full_response_output,
-        "addressing_identifier": addressing_identifier_output,
-        "addressing_ip": addressing_ip_output,
-        "addressing_ips": addressing_ips_output,
-        "addressing_kind": addressing_kind_output,
-        "addressing_memberships": addressing_memberships_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_address-maps": addressing_address$$maps,
+        "addressing_address-maps-ip": addressing_address$$maps$$ip,
+        "addressing_address-maps-membership": addressing_address$$maps$$membership,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_full_response": addressing_full_response,
+        "addressing_ips": addressing_ips,
+        "addressing_memberships": addressing_memberships,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -181,36 +159,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_delete",
+    name: "addressing_addressMaps_delete",
     title: "Delete Address Map",
-    description: "Delete a particular address map owned by the account. An Address Map must be disabled before it can be deleted.",
+    description: "Delete a particular address map owned by the account. An Address Map must be disabled before it can be deleted.\n\nDELETE /accounts/{account_id}/addressing/address_maps/{address_map_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -244,10 +228,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -255,66 +239,83 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_edit",
+    name: "addressing_addressMaps_edit",
     title: "Update Address Map",
-    description: "Modify properties of an address map owned by the account.",
+    description: "Modify properties of an address map owned by the account.\n\nPATCH /accounts/{account_id}/addressing/address_maps/{address_map_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
         "body": {
           "properties": {
             "default_sni": {
-              "$ref": "#/$defs/addressing_default_sni",
-              "description": "If you have legacy TLS clients which do not send the TLS server name indicator, then you can specify one default SNI on the map. If Cloudflare receives a TLS handshake from a client without an SNI, it will respond with the default SNI on those IPs. The default SNI can be any valid zone or subdomain owned by the account."
+              "description": "If you have legacy TLS clients which do not send the TLS server name indicator, then you can specify one default SNI on the map. If Cloudflare receives a TLS handshake from a client without an SNI, it will respond with the default SNI on those IPs. The default SNI can be any valid zone or subdomain owned by the account.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "description": {
-              "$ref": "#/$defs/addressing_description-2",
-              "description": "An optional description field which may be used to describe the types of IPs or zones on the map."
+              "description": "An optional description field which may be used to describe the types of IPs or zones on the map.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "enabled": {
-              "$ref": "#/$defs/addressing_enabled",
               "default": false,
-              "description": "Whether the Address Map is enabled or not. Cloudflare's DNS will not respond with IP addresses on an Address Map until the map is enabled."
+              "description": "Whether the Address Map is enabled or not. Cloudflare's DNS will not respond with IP addresses on an Address Map until the map is enabled.",
+              "oneOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
             }
           },
+          "required": [
+            "account_id",
+            "address_map_id"
+          ],
           "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_default_sni": addressing_default_sni,
-        "addressing_description-2": addressing_description_2,
-        "addressing_enabled": addressing_enabled,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response-3",
       $defs: {
-        "addressing_address-maps": addressing_address_maps_output,
-        "addressing_address_map_identifier": addressing_address_map_identifier_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_can_delete": addressing_can_delete_output,
-        "addressing_can_modify_ips": addressing_can_modify_ips_output,
-        "addressing_default_sni": addressing_default_sni_output,
-        "addressing_description-2": addressing_description_2_output,
-        "addressing_enabled": addressing_enabled_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_single_response-3": addressing_single_response_3_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_address-maps": addressing_address$$maps,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response-3": addressing_single_response$$3,
       },
     },
     annotations: {
@@ -348,18 +349,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_address-maps": addressing_address_maps_output,
-        "addressing_address_map_identifier": addressing_address_map_identifier_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_can_delete": addressing_can_delete_output,
-        "addressing_can_modify_ips": addressing_can_modify_ips_output,
-        "addressing_default_sni": addressing_default_sni_output,
-        "addressing_description-2": addressing_description_2_output,
-        "addressing_enabled": addressing_enabled_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_single_response-3": addressing_single_response_3_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_address-maps": addressing_address$$maps,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response-3": addressing_single_response$$3,
       },
     },
     request: (args) => ({
@@ -368,52 +362,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_get",
+    name: "addressing_addressMaps_get",
     title: "Address Map Details",
-    description: "Show a particular address map owned by the account.",
+    description: "Show a particular address map owned by the account.\n\nGET /accounts/{account_id}/addressing/address_maps/{address_map_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_full_response",
       $defs: {
-        "addressing_address-maps": addressing_address_maps_output,
-        "addressing_address-maps-ip": addressing_address_maps_ip_output,
-        "addressing_address-maps-membership": addressing_address_maps_membership_output,
-        "addressing_address_map_identifier": addressing_address_map_identifier_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_can_delete": addressing_can_delete_output,
-        "addressing_can_delete-2": addressing_can_delete_2_output,
-        "addressing_can_modify_ips": addressing_can_modify_ips_output,
-        "addressing_default_sni": addressing_default_sni_output,
-        "addressing_description-2": addressing_description_2_output,
-        "addressing_enabled": addressing_enabled_output,
-        "addressing_full_response": addressing_full_response_output,
-        "addressing_identifier": addressing_identifier_output,
-        "addressing_ip": addressing_ip_output,
-        "addressing_ips": addressing_ips_output,
-        "addressing_kind": addressing_kind_output,
-        "addressing_memberships": addressing_memberships_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_address-maps": addressing_address$$maps,
+        "addressing_address-maps-ip": addressing_address$$maps$$ip,
+        "addressing_address-maps-membership": addressing_address$$maps$$membership,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_full_response": addressing_full_response,
+        "addressing_ips": addressing_ips,
+        "addressing_memberships": addressing_memberships,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -448,26 +437,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_address-maps": addressing_address_maps_output,
-        "addressing_address-maps-ip": addressing_address_maps_ip_output,
-        "addressing_address-maps-membership": addressing_address_maps_membership_output,
-        "addressing_address_map_identifier": addressing_address_map_identifier_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_can_delete": addressing_can_delete_output,
-        "addressing_can_delete-2": addressing_can_delete_2_output,
-        "addressing_can_modify_ips": addressing_can_modify_ips_output,
-        "addressing_default_sni": addressing_default_sni_output,
-        "addressing_description-2": addressing_description_2_output,
-        "addressing_enabled": addressing_enabled_output,
-        "addressing_full_response": addressing_full_response_output,
-        "addressing_identifier": addressing_identifier_output,
-        "addressing_ip": addressing_ip_output,
-        "addressing_ips": addressing_ips_output,
-        "addressing_kind": addressing_kind_output,
-        "addressing_memberships": addressing_memberships_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_address-maps": addressing_address$$maps,
+        "addressing_address-maps-ip": addressing_address$$maps$$ip,
+        "addressing_address-maps-membership": addressing_address$$maps$$membership,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_full_response": addressing_full_response,
+        "addressing_ips": addressing_ips,
+        "addressing_memberships": addressing_memberships,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -475,39 +453,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_list",
+    name: "addressing_addressMaps_list",
     title: "List Address Maps",
-    description: "List all address maps owned by the account.",
+    description: "List all address maps owned by the account.\n\nGET /accounts/{account_id}/addressing/address_maps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_response_collection-3",
       $defs: {
-        "addressing_address-maps": addressing_address_maps_output,
-        "addressing_address_map_identifier": addressing_address_map_identifier_output,
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_can_delete": addressing_can_delete_output,
-        "addressing_can_modify_ips": addressing_can_modify_ips_output,
-        "addressing_default_sni": addressing_default_sni_output,
-        "addressing_description-2": addressing_description_2_output,
-        "addressing_enabled": addressing_enabled_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_response_collection-3": addressing_response_collection_3_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_address-maps": addressing_address$$maps,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection-3": addressing_response_collection$$3,
       },
     },
     annotations: {
@@ -542,19 +520,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_address-maps": addressing_address_maps_output,
-        "addressing_address_map_identifier": addressing_address_map_identifier_output,
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_can_delete": addressing_can_delete_output,
-        "addressing_can_modify_ips": addressing_can_modify_ips_output,
-        "addressing_default_sni": addressing_default_sni_output,
-        "addressing_description-2": addressing_description_2_output,
-        "addressing_enabled": addressing_enabled_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_response_collection-3": addressing_response_collection_3_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_address-maps": addressing_address$$maps,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection-3": addressing_response_collection$$3,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/addressMaps/zones/schemas.ts b/src/generated/forge-mcp/addressing/addressMaps/zones/schemas.ts
deleted file mode 100644
index a5ddc95e9..000000000
--- a/src/generated/forge-mcp/addressing/addressMaps/zones/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `addressing_zone_identifier`.
- */
-export const addressing_zone_identifier: JsonSchema = {
-  "description": "Identifier of a zone.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/addressMaps/zones/tools.ts b/src/generated/forge-mcp/addressing/addressMaps/zones/tools.ts
index a67ca0ba1..92f740cd6 100644
--- a/src/generated/forge-mcp/addressing/addressMaps/zones/tools.ts
+++ b/src/generated/forge-mcp/addressing/addressMaps/zones/tools.ts
@@ -3,56 +3,58 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  addressing_api_response_collection_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_messages_output,
+  addressing_api$$response$$collection,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_messages,
 } from "../../outputs.js";
-import { addressing_account_identifier } from "../../schemas.js";
-import { addressing_address_map_identifier } from "../schemas.js";
-import { addressing_zone_identifier } from "./schemas.js";
 
 /**
- * The tools of `addressing.address_maps.zones`.
+ * The tools of `addressing.addressMaps.zones`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_address_maps_zones_delete",
+    name: "addressing_addressMaps_zones_delete",
     title: "Remove a zone membership from an Address Map",
-    description: "Remove a zone as a member of a particular address map.",
+    description: "Remove a zone as a member of a particular address map.\n\nDELETE /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{member_zone_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
-        "member_zone_id": {
-          "$ref": "#/$defs/addressing_zone_identifier",
-          "description": "Identifier of a zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            },
+            "member_zone_id": {
+              "description": "Identifier of a zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id",
+            "member_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
-        "member_zone_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_zone_identifier": addressing_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -86,10 +88,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -97,25 +99,18 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_zones_delete_bulk",
+    name: "addressing_addressMaps_zones_deleteBulk",
     title: "Remove Multiple Zones from an Address Map",
-    description: "Remove multiple zones as members of a particular address map.",
+    description: "Remove multiple zones as members of a particular address map.\n\nDELETE /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
         "body": {
           "properties": {
             "zones": {
               "items": {
-                "$ref": "#/$defs/addressing_zone_identifier"
+                "description": "Identifier of a zone.",
+                "type": "string"
               },
               "type": "array"
             }
@@ -124,25 +119,38 @@ export const tools: readonly Tool[] = [
             "zones"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_zone_identifier": addressing_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -176,10 +184,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -188,42 +196,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_zones_update",
+    name: "addressing_addressMaps_zones_update",
     title: "Add a zone membership to an Address Map",
-    description: "Add a zone as a member of a particular address map.",
+    description: "Add a zone as a member of a particular address map.\n\nPUT /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{member_zone_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
-        "member_zone_id": {
-          "$ref": "#/$defs/addressing_zone_identifier",
-          "description": "Identifier of a zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            },
+            "member_zone_id": {
+              "description": "Identifier of a zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id",
+            "member_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
-        "member_zone_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_zone_identifier": addressing_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -252,10 +265,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -263,25 +276,18 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_address_maps_zones_update_bulk",
+    name: "addressing_addressMaps_zones_updateBulk",
     title: "Add Multiple Zones to an Address Map",
-    description: "Add multiple zones as members of a particular address map.",
+    description: "Add multiple zones as members of a particular address map.\n\nPOST /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "address_map_id": {
-          "$ref": "#/$defs/addressing_address_map_identifier",
-          "description": "Identifier of an Address Map."
-        },
         "body": {
           "properties": {
             "zones": {
               "items": {
-                "$ref": "#/$defs/addressing_zone_identifier"
+                "description": "Identifier of a zone.",
+                "type": "string"
               },
               "type": "array"
             }
@@ -290,25 +296,38 @@ export const tools: readonly Tool[] = [
             "zones"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "address_map_id": {
+              "description": "Identifier of an Address Map.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_map_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_map_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_address_map_identifier": addressing_address_map_identifier,
-        "addressing_zone_identifier": addressing_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-collection",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -337,10 +356,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/leases/outputs.ts b/src/generated/forge-mcp/addressing/leases/outputs.ts
index be805b164..7b75834e3 100644
--- a/src/generated/forge-mcp/addressing/leases/outputs.ts
+++ b/src/generated/forge-mcp/addressing/leases/outputs.ts
@@ -3,25 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `addressing_cidr-2` in responses.
- */
-export const addressing_cidr_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_created_at` in responses.
- */
-export const addressing_created_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_lease` in responses.
  */
-export const addressing_lease_output: JsonSchema = {
+export const addressing_lease: JsonSchema = {
   "properties": {
     "active_from": {
       "format": "date-time",
@@ -29,21 +14,23 @@ export const addressing_lease_output: JsonSchema = {
     },
     "cidrs": {
       "items": {
-        "$ref": "#/$defs/addressing_cidr-2"
+        "type": "string"
       },
       "type": "array"
     },
     "created_at": {
-      "$ref": "#/$defs/addressing_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/addressing_lease_id"
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/addressing_modified_at"
+      "format": "date-time",
+      "type": "string"
     },
     "owner_id": {
-      "$ref": "#/$defs/addressing_lease_owner_id"
+      "type": "string"
     },
     "purpose": {
       "type": "string"
@@ -52,32 +39,10 @@ export const addressing_lease_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `addressing_lease_id` in responses.
- */
-export const addressing_lease_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_lease_owner_id` in responses.
- */
-export const addressing_lease_owner_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_modified_at` in responses.
- */
-export const addressing_modified_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_response_collection-4` in responses.
  */
-export const addressing_response_collection_4_output: JsonSchema = {
+export const addressing_response_collection$$4: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-collection"
diff --git a/src/generated/forge-mcp/addressing/leases/schemas.ts b/src/generated/forge-mcp/addressing/leases/schemas.ts
deleted file mode 100644
index fc75c93c7..000000000
--- a/src/generated/forge-mcp/addressing/leases/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `addressing_account_identifier-2`.
- */
-export const addressing_account_identifier_2: JsonSchema = {
-  "description": "Identifier of a Cloudflare account.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/leases/tools.ts b/src/generated/forge-mcp/addressing/leases/tools.ts
index c76cf92f8..c81110897 100644
--- a/src/generated/forge-mcp/addressing/leases/tools.ts
+++ b/src/generated/forge-mcp/addressing/leases/tools.ts
@@ -3,21 +3,15 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  addressing_api_response_collection_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_messages_output,
+  addressing_api$$response$$collection,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_messages,
 } from "../outputs.js";
 import {
-  addressing_cidr_2_output,
-  addressing_created_at_output,
-  addressing_lease_id_output,
-  addressing_lease_output,
-  addressing_lease_owner_id_output,
-  addressing_modified_at_output,
-  addressing_response_collection_4_output,
+  addressing_lease,
+  addressing_response_collection$$4,
 } from "./outputs.js";
-import { addressing_account_identifier_2 } from "./schemas.js";
 
 /**
  * The tools of `addressing.leases`.
@@ -26,35 +20,37 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_leases_list",
     title: "List Leases",
-    description: "List all leases owned by the account.",
+    description: "List all leases owned by the account.\n\nGET /accounts/{account_id}/addressing/leases",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier-2",
-          "description": "Identifier of a Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier-2": addressing_account_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_response_collection-4",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_cidr-2": addressing_cidr_2_output,
-        "addressing_created_at": addressing_created_at_output,
-        "addressing_lease": addressing_lease_output,
-        "addressing_lease_id": addressing_lease_id_output,
-        "addressing_lease_owner_id": addressing_lease_owner_id_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at": addressing_modified_at_output,
-        "addressing_response_collection-4": addressing_response_collection_4_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_lease": addressing_lease,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection-4": addressing_response_collection$$4,
       },
     },
     annotations: {
@@ -86,17 +82,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_cidr-2": addressing_cidr_2_output,
-        "addressing_created_at": addressing_created_at_output,
-        "addressing_lease": addressing_lease_output,
-        "addressing_lease_id": addressing_lease_id_output,
-        "addressing_lease_owner_id": addressing_lease_owner_id_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at": addressing_modified_at_output,
-        "addressing_response_collection-4": addressing_response_collection_4_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_lease": addressing_lease,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection-4": addressing_response_collection$$4,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/loaDocuments/outputs.ts b/src/generated/forge-mcp/addressing/loaDocuments/outputs.ts
index fa05c9b03..89ee9a9a7 100644
--- a/src/generated/forge-mcp/addressing/loaDocuments/outputs.ts
+++ b/src/generated/forge-mcp/addressing/loaDocuments/outputs.ts
@@ -3,48 +3,50 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `addressing_auto_generated` in responses.
- */
-export const addressing_auto_generated_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_filename` in responses.
- */
-export const addressing_filename_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_loa_document` in responses.
  */
-export const addressing_loa_document_output: JsonSchema = {
+export const addressing_loa_document: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/addressing_account_identifier"
+      "type": "string"
     },
     "auto_generated": {
-      "$ref": "#/$defs/addressing_auto_generated"
+      "type": "boolean"
     },
     "created": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "filename": {
-      "$ref": "#/$defs/addressing_filename"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/addressing_loa_document_identifier"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "size_bytes": {
-      "$ref": "#/$defs/addressing_size_bytes"
+      "type": "integer"
     },
     "verified": {
-      "$ref": "#/$defs/addressing_verified"
+      "type": "boolean"
     },
     "verified_at": {
-      "$ref": "#/$defs/addressing_verified_at"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "type": "object"
@@ -53,7 +55,7 @@ export const addressing_loa_document_output: JsonSchema = {
 /**
  * The schema of `addressing_loa_document_collection` in responses.
  */
-export const addressing_loa_document_collection_output: JsonSchema = {
+export const addressing_loa_document_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-collection"
@@ -71,32 +73,3 @@ export const addressing_loa_document_collection_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `addressing_size_bytes` in responses.
- */
-export const addressing_size_bytes_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `addressing_verified` in responses.
- */
-export const addressing_verified_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_verified_at` in responses.
- */
-export const addressing_verified_at_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/addressing/loaDocuments/tools.ts b/src/generated/forge-mcp/addressing/loaDocuments/tools.ts
index 4953695ff..9750e3dbe 100644
--- a/src/generated/forge-mcp/addressing/loaDocuments/tools.ts
+++ b/src/generated/forge-mcp/addressing/loaDocuments/tools.ts
@@ -3,56 +3,57 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  addressing_account_identifier_output,
-  addressing_api_response_collection_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_loa_document_identifier_output,
-  addressing_messages_output,
-  addressing_timestamp_output,
+  addressing_api$$response$$collection,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_messages,
 } from "../outputs.js";
 import {
-  addressing_account_identifier,
-  addressing_loa_document_identifier,
-} from "../schemas.js";
-import {
-  addressing_auto_generated_output,
-  addressing_filename_output,
-  addressing_loa_document_collection_output,
-  addressing_loa_document_output,
-  addressing_size_bytes_output,
-  addressing_verified_at_output,
-  addressing_verified_output,
+  addressing_loa_document,
+  addressing_loa_document_collection,
 } from "./outputs.js";
 
 /**
- * The tools of `addressing.loa_documents`.
+ * The tools of `addressing.loaDocuments`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_loa_documents_get",
+    name: "addressing_loaDocuments_get",
     title: "Download LOA Document",
-    description: "Download specified LOA document under the account.",
+    description: "Download specified LOA document under the account.\n\nGET /accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "loa_document_id": {
-          "$ref": "#/$defs/addressing_loa_document_identifier",
-          "description": "Identifier for the uploaded LOA document."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "loa_document_id": {
+              "description": "Identifier for the uploaded LOA document.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_id",
+            "loa_document_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "loa_document_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -77,8 +78,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -86,40 +87,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_loa_documents_list",
+    name: "addressing_loaDocuments_list",
     title: "List LOA Documents",
-    description: "List all LOA documents uploaded under the account.",
+    description: "List all LOA documents uploaded under the account.\n\nGET /accounts/{account_id}/addressing/loa_documents",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_loa_document_collection",
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_auto_generated": addressing_auto_generated_output,
-        "addressing_filename": addressing_filename_output,
-        "addressing_loa_document": addressing_loa_document_output,
-        "addressing_loa_document_collection": addressing_loa_document_collection_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_size_bytes": addressing_size_bytes_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_verified": addressing_verified_output,
-        "addressing_verified_at": addressing_verified_at_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_loa_document": addressing_loa_document,
+        "addressing_loa_document_collection": addressing_loa_document_collection,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -154,20 +154,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_auto_generated": addressing_auto_generated_output,
-        "addressing_filename": addressing_filename_output,
-        "addressing_loa_document": addressing_loa_document_output,
-        "addressing_loa_document_collection": addressing_loa_document_collection_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_size_bytes": addressing_size_bytes_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_verified": addressing_verified_output,
-        "addressing_verified_at": addressing_verified_at_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_loa_document": addressing_loa_document,
+        "addressing_loa_document_collection": addressing_loa_document_collection,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/outputs.ts b/src/generated/forge-mcp/addressing/outputs.ts
index 8da72d19a..85d251a44 100644
--- a/src/generated/forge-mcp/addressing/outputs.ts
+++ b/src/generated/forge-mcp/addressing/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `addressing_account_identifier` in responses.
- */
-export const addressing_account_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_api-response-collection` in responses.
  */
-export const addressing_api_response_collection_output: JsonSchema = {
+export const addressing_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-common"
@@ -49,7 +42,7 @@ export const addressing_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `addressing_api-response-common` in responses.
  */
-export const addressing_api_response_common_output: JsonSchema = {
+export const addressing_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/addressing_messages"
@@ -75,7 +68,7 @@ export const addressing_api_response_common_output: JsonSchema = {
 /**
  * The schema of `addressing_api-response-common-failure` in responses.
  */
-export const addressing_api_response_common_failure_output: JsonSchema = {
+export const addressing_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/addressing_messages"
@@ -105,7 +98,7 @@ export const addressing_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `addressing_api-response-single` in responses.
  */
-export const addressing_api_response_single_output: JsonSchema = {
+export const addressing_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/addressing_messages"
@@ -128,24 +121,10 @@ export const addressing_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `addressing_loa_document_identifier` in responses.
- */
-export const addressing_loa_document_identifier_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `addressing_messages` in responses.
  */
-export const addressing_messages_output: JsonSchema = {
+export const addressing_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -174,25 +153,3 @@ export const addressing_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `addressing_service_identifier` in responses.
- */
-export const addressing_service_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_service_name` in responses.
- */
-export const addressing_service_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_timestamp` in responses.
- */
-export const addressing_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/outputs.ts b/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/outputs.ts
index 0fa49c3d8..2bdd9aed4 100644
--- a/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/outputs.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/outputs.ts
@@ -3,141 +3,102 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `addressing_advertised-2` in responses.
- */
-export const addressing_advertised_2_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_asn-2` in responses.
- */
-export const addressing_asn_2_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_asn_prepend_count` in responses.
- */
-export const addressing_asn_prepend_count_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `addressing_auto_advertise_withdraw` in responses.
- */
-export const addressing_auto_advertise_withdraw_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `addressing_bgp_on_demand` in responses.
  */
-export const addressing_bgp_on_demand_output: JsonSchema = {
+export const addressing_bgp_on_demand: JsonSchema = {
   "properties": {
     "advertised": {
-      "$ref": "#/$defs/addressing_advertised-2"
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "advertised_modified_at": {
-      "$ref": "#/$defs/addressing_modified_at_nullable"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "on_demand_enabled": {
-      "$ref": "#/$defs/addressing_on_demand_enabled-2"
+      "type": "boolean"
     },
     "on_demand_locked": {
-      "$ref": "#/$defs/addressing_on_demand_locked-2"
+      "type": "boolean"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `addressing_bgp_prefix_identifier` in responses.
- */
-export const addressing_bgp_prefix_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_bgp_signal_opts` in responses.
  */
-export const addressing_bgp_signal_opts_output: JsonSchema = {
+export const addressing_bgp_signal_opts: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/addressing_bgp_signaling_enabled"
+      "type": "boolean"
     },
     "modified_at": {
-      "$ref": "#/$defs/addressing_bgp_signaling_modified_at"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `addressing_bgp_signaling_enabled` in responses.
- */
-export const addressing_bgp_signaling_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_bgp_signaling_modified_at` in responses.
- */
-export const addressing_bgp_signaling_modified_at_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `addressing_ipam-bgp-prefixes` in responses.
  */
-export const addressing_ipam_bgp_prefixes_output: JsonSchema = {
+export const addressing_ipam$$bgp$$prefixes: JsonSchema = {
   "properties": {
     "asn": {
-      "$ref": "#/$defs/addressing_asn-2"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "asn_prepend_count": {
-      "$ref": "#/$defs/addressing_asn_prepend_count"
+      "type": "integer"
     },
     "auto_advertise_withdraw": {
-      "$ref": "#/$defs/addressing_auto_advertise_withdraw"
+      "type": "boolean"
     },
     "bgp_signal_opts": {
       "$ref": "#/$defs/addressing_bgp_signal_opts"
     },
     "cidr": {
-      "$ref": "#/$defs/addressing_cidr"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/addressing_bgp_prefix_identifier"
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "on_demand": {
       "$ref": "#/$defs/addressing_bgp_on_demand"
@@ -146,24 +107,10 @@ export const addressing_ipam_bgp_prefixes_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `addressing_on_demand_enabled-2` in responses.
- */
-export const addressing_on_demand_enabled_2_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_on_demand_locked-2` in responses.
- */
-export const addressing_on_demand_locked_2_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `addressing_response_collection_bgp` in responses.
  */
-export const addressing_response_collection_bgp_output: JsonSchema = {
+export const addressing_response_collection_bgp: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-single"
@@ -185,7 +132,7 @@ export const addressing_response_collection_bgp_output: JsonSchema = {
 /**
  * The schema of `addressing_single_response_bgp` in responses.
  */
-export const addressing_single_response_bgp_output: JsonSchema = {
+export const addressing_single_response_bgp: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-single"
diff --git a/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/schemas.ts b/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/schemas.ts
index d35407707..a19ef66cc 100644
--- a/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/schemas.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/schemas.ts
@@ -3,30 +3,14 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `addressing_asn_prepend_count`.
- */
-export const addressing_asn_prepend_count: JsonSchema = {
-  "description": "Number of times to prepend the Cloudflare ASN to the BGP AS-Path attribute",
-  "type": "integer"
-};
-
-/**
- * The schema of `addressing_auto_advertise_withdraw`.
- */
-export const addressing_auto_advertise_withdraw: JsonSchema = {
-  "description": "Determines if Cloudflare advertises a BYOIP BGP prefix even when there is no matching BGP prefix in the Magic routing table. When true, Cloudflare will automatically withdraw the BGP prefix when there are no matching BGP routes, and will resume advertising when there is at least one matching BGP route.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `addressing_bgp_prefix_create`.
  */
 export const addressing_bgp_prefix_create: JsonSchema = {
   "properties": {
     "cidr": {
-      "$ref": "#/$defs/addressing_cidr",
-      "description": "IP Prefix in Classless Inter-Domain Routing format."
+      "description": "IP Prefix in Classless Inter-Domain Routing format.",
+      "type": "string"
     }
   },
   "required": [
@@ -35,28 +19,20 @@ export const addressing_bgp_prefix_create: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `addressing_bgp_prefix_identifier`.
- */
-export const addressing_bgp_prefix_identifier: JsonSchema = {
-  "description": "Identifier of BGP Prefix.",
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_bgp_prefix_update_advertisement`.
  */
 export const addressing_bgp_prefix_update_advertisement: JsonSchema = {
   "properties": {
     "asn_prepend_count": {
-      "$ref": "#/$defs/addressing_asn_prepend_count",
       "default": 0,
-      "description": "Number of times to prepend the Cloudflare ASN to the BGP AS-Path attribute"
+      "description": "Number of times to prepend the Cloudflare ASN to the BGP AS-Path attribute",
+      "type": "integer"
     },
     "auto_advertise_withdraw": {
-      "$ref": "#/$defs/addressing_auto_advertise_withdraw",
       "default": false,
-      "description": "Determines if Cloudflare advertises a BYOIP BGP prefix even when there is no matching BGP prefix in the Magic routing table. When true, Cloudflare will automatically withdraw the BGP prefix when there are no matching BGP routes, and will resume advertising when there is at least one matching BGP route."
+      "description": "Determines if Cloudflare advertises a BYOIP BGP prefix even when there is no matching BGP prefix in the Magic routing table. When true, Cloudflare will automatically withdraw the BGP prefix when there are no matching BGP routes, and will resume advertising when there is at least one matching BGP route.",
+      "type": "boolean"
     },
     "on_demand": {
       "properties": {
diff --git a/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/tools.ts b/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/tools.ts
index 82db1461d..b90d0aac3 100644
--- a/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/tools.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/bgpPrefixes/tools.ts
@@ -3,98 +3,74 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_api_response_single_output,
-  addressing_messages_output,
-  addressing_timestamp_output,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_api$$response$$single,
+  addressing_messages,
 } from "../../outputs.js";
-import { addressing_account_identifier } from "../../schemas.js";
 import {
-  addressing_cidr_output,
-  addressing_modified_at_nullable_output,
-} from "../outputs.js";
-import { addressing_cidr, addressing_prefix_identifier } from "../schemas.js";
-import {
-  addressing_advertised_2_output,
-  addressing_asn_2_output,
-  addressing_asn_prepend_count_output,
-  addressing_auto_advertise_withdraw_output,
-  addressing_bgp_on_demand_output,
-  addressing_bgp_prefix_identifier_output,
-  addressing_bgp_signal_opts_output,
-  addressing_bgp_signaling_enabled_output,
-  addressing_bgp_signaling_modified_at_output,
-  addressing_ipam_bgp_prefixes_output,
-  addressing_on_demand_enabled_2_output,
-  addressing_on_demand_locked_2_output,
-  addressing_response_collection_bgp_output,
-  addressing_single_response_bgp_output,
+  addressing_bgp_on_demand,
+  addressing_bgp_signal_opts,
+  addressing_ipam$$bgp$$prefixes,
+  addressing_response_collection_bgp,
+  addressing_single_response_bgp,
 } from "./outputs.js";
 import {
-  addressing_asn_prepend_count,
-  addressing_auto_advertise_withdraw,
   addressing_bgp_prefix_create,
-  addressing_bgp_prefix_identifier,
   addressing_bgp_prefix_update_advertisement,
 } from "./schemas.js";
 
 /**
- * The tools of `addressing.prefixes.bgp_prefixes`.
+ * The tools of `addressing.prefixes.bgpPrefixes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_prefixes_bgp_prefixes_create",
+    name: "addressing_prefixes_bgpPrefixes_create",
     title: "Create BGP Prefix",
-    description: "Create a BGP prefix, controlling the BGP advertisement status of a specific subnet. When created, BGP prefixes are initially withdrawn, and can be advertised with the Update BGP Prefix API.",
+    description: "Create a BGP prefix, controlling the BGP advertisement status of a specific subnet. When created, BGP prefixes are initially withdrawn, and can be advertised with the Update BGP Prefix API.\n\nPOST /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
         "body": {
           "$ref": "#/$defs/addressing_bgp_prefix_create"
         },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
         "addressing_bgp_prefix_create": addressing_bgp_prefix_create,
-        "addressing_cidr": addressing_cidr,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response_bgp",
       $defs: {
-        "addressing_advertised-2": addressing_advertised_2_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_asn-2": addressing_asn_2_output,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count_output,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw_output,
-        "addressing_bgp_on_demand": addressing_bgp_on_demand_output,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier_output,
-        "addressing_bgp_signal_opts": addressing_bgp_signal_opts_output,
-        "addressing_bgp_signaling_enabled": addressing_bgp_signaling_enabled_output,
-        "addressing_bgp_signaling_modified_at": addressing_bgp_signaling_modified_at_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_ipam-bgp-prefixes": addressing_ipam_bgp_prefixes_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at_nullable": addressing_modified_at_nullable_output,
-        "addressing_on_demand_enabled-2": addressing_on_demand_enabled_2_output,
-        "addressing_on_demand_locked-2": addressing_on_demand_locked_2_output,
-        "addressing_single_response_bgp": addressing_single_response_bgp_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_bgp_on_demand": addressing_bgp_on_demand,
+        "addressing_bgp_signal_opts": addressing_bgp_signal_opts,
+        "addressing_ipam-bgp-prefixes": addressing_ipam$$bgp$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response_bgp": addressing_single_response_bgp,
       },
     },
     annotations: {
@@ -123,25 +99,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_advertised-2": addressing_advertised_2_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_asn-2": addressing_asn_2_output,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count_output,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw_output,
-        "addressing_bgp_on_demand": addressing_bgp_on_demand_output,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier_output,
-        "addressing_bgp_signal_opts": addressing_bgp_signal_opts_output,
-        "addressing_bgp_signaling_enabled": addressing_bgp_signaling_enabled_output,
-        "addressing_bgp_signaling_modified_at": addressing_bgp_signaling_modified_at_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_ipam-bgp-prefixes": addressing_ipam_bgp_prefixes_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at_nullable": addressing_modified_at_nullable_output,
-        "addressing_on_demand_enabled-2": addressing_on_demand_enabled_2_output,
-        "addressing_on_demand_locked-2": addressing_on_demand_locked_2_output,
-        "addressing_single_response_bgp": addressing_single_response_bgp_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_bgp_on_demand": addressing_bgp_on_demand,
+        "addressing_bgp_signal_opts": addressing_bgp_signal_opts,
+        "addressing_ipam-bgp-prefixes": addressing_ipam$$bgp$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response_bgp": addressing_single_response_bgp,
       },
     },
     request: (args) => ({
@@ -150,41 +114,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_prefixes_bgp_prefixes_delete",
+    name: "addressing_prefixes_bgpPrefixes_delete",
     title: "Delete BGP Prefix",
-    description: "Delete a BGP Prefix associated with the specified IP Prefix. A BGP Prefix must be withdrawn before it can be deleted.",
+    description: "Delete a BGP Prefix associated with the specified IP Prefix. A BGP Prefix must be withdrawn before it can be deleted.\n\nDELETE /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "bgp_prefix_id": {
-          "$ref": "#/$defs/addressing_bgp_prefix_identifier",
-          "description": "Identifier of BGP Prefix."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "bgp_prefix_id": {
+              "description": "Identifier of BGP Prefix.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id",
+            "bgp_prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
-        "bgp_prefix_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-common",
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -206,9 +175,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -216,64 +185,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_prefixes_bgp_prefixes_edit",
+    name: "addressing_prefixes_bgpPrefixes_edit",
     title: "Update BGP Prefix",
-    description: "Update the properties of a BGP Prefix, such as the on demand advertisement status (advertised or withdrawn).",
+    description: "Update the properties of a BGP Prefix, such as the on demand advertisement status (advertised or withdrawn).\n\nPATCH /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "bgp_prefix_id": {
-          "$ref": "#/$defs/addressing_bgp_prefix_identifier",
-          "description": "Identifier of BGP Prefix."
-        },
         "body": {
           "$ref": "#/$defs/addressing_bgp_prefix_update_advertisement"
         },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "bgp_prefix_id": {
+              "description": "Identifier of BGP Prefix.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id",
+            "bgp_prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
-        "bgp_prefix_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier,
         "addressing_bgp_prefix_update_advertisement": addressing_bgp_prefix_update_advertisement,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response_bgp",
       $defs: {
-        "addressing_advertised-2": addressing_advertised_2_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_asn-2": addressing_asn_2_output,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count_output,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw_output,
-        "addressing_bgp_on_demand": addressing_bgp_on_demand_output,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier_output,
-        "addressing_bgp_signal_opts": addressing_bgp_signal_opts_output,
-        "addressing_bgp_signaling_enabled": addressing_bgp_signaling_enabled_output,
-        "addressing_bgp_signaling_modified_at": addressing_bgp_signaling_modified_at_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_ipam-bgp-prefixes": addressing_ipam_bgp_prefixes_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at_nullable": addressing_modified_at_nullable_output,
-        "addressing_on_demand_enabled-2": addressing_on_demand_enabled_2_output,
-        "addressing_on_demand_locked-2": addressing_on_demand_locked_2_output,
-        "addressing_single_response_bgp": addressing_single_response_bgp_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_bgp_on_demand": addressing_bgp_on_demand,
+        "addressing_bgp_signal_opts": addressing_bgp_signal_opts,
+        "addressing_ipam-bgp-prefixes": addressing_ipam$$bgp$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response_bgp": addressing_single_response_bgp,
       },
     },
     annotations: {
@@ -309,25 +271,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_advertised-2": addressing_advertised_2_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_asn-2": addressing_asn_2_output,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count_output,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw_output,
-        "addressing_bgp_on_demand": addressing_bgp_on_demand_output,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier_output,
-        "addressing_bgp_signal_opts": addressing_bgp_signal_opts_output,
-        "addressing_bgp_signaling_enabled": addressing_bgp_signaling_enabled_output,
-        "addressing_bgp_signaling_modified_at": addressing_bgp_signaling_modified_at_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_ipam-bgp-prefixes": addressing_ipam_bgp_prefixes_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at_nullable": addressing_modified_at_nullable_output,
-        "addressing_on_demand_enabled-2": addressing_on_demand_enabled_2_output,
-        "addressing_on_demand_locked-2": addressing_on_demand_locked_2_output,
-        "addressing_single_response_bgp": addressing_single_response_bgp_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_bgp_on_demand": addressing_bgp_on_demand,
+        "addressing_bgp_signal_opts": addressing_bgp_signal_opts,
+        "addressing_ipam-bgp-prefixes": addressing_ipam$$bgp$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response_bgp": addressing_single_response_bgp,
       },
     },
     request: (args) => ({
@@ -336,57 +286,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_prefixes_bgp_prefixes_get",
+    name: "addressing_prefixes_bgpPrefixes_get",
     title: "Fetch BGP Prefix",
-    description: "Retrieve a single BGP Prefix according to its identifier",
+    description: "Retrieve a single BGP Prefix according to its identifier\n\nGET /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "bgp_prefix_id": {
-          "$ref": "#/$defs/addressing_bgp_prefix_identifier",
-          "description": "Identifier of BGP Prefix."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "bgp_prefix_id": {
+              "description": "Identifier of BGP Prefix.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id",
+            "bgp_prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
-        "bgp_prefix_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response_bgp",
       $defs: {
-        "addressing_advertised-2": addressing_advertised_2_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_asn-2": addressing_asn_2_output,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count_output,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw_output,
-        "addressing_bgp_on_demand": addressing_bgp_on_demand_output,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier_output,
-        "addressing_bgp_signal_opts": addressing_bgp_signal_opts_output,
-        "addressing_bgp_signaling_enabled": addressing_bgp_signaling_enabled_output,
-        "addressing_bgp_signaling_modified_at": addressing_bgp_signaling_modified_at_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_ipam-bgp-prefixes": addressing_ipam_bgp_prefixes_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at_nullable": addressing_modified_at_nullable_output,
-        "addressing_on_demand_enabled-2": addressing_on_demand_enabled_2_output,
-        "addressing_on_demand_locked-2": addressing_on_demand_locked_2_output,
-        "addressing_single_response_bgp": addressing_single_response_bgp_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_bgp_on_demand": addressing_bgp_on_demand,
+        "addressing_bgp_signal_opts": addressing_bgp_signal_opts,
+        "addressing_ipam-bgp-prefixes": addressing_ipam$$bgp$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response_bgp": addressing_single_response_bgp,
       },
     },
     annotations: {
@@ -425,25 +368,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_advertised-2": addressing_advertised_2_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_asn-2": addressing_asn_2_output,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count_output,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw_output,
-        "addressing_bgp_on_demand": addressing_bgp_on_demand_output,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier_output,
-        "addressing_bgp_signal_opts": addressing_bgp_signal_opts_output,
-        "addressing_bgp_signaling_enabled": addressing_bgp_signaling_enabled_output,
-        "addressing_bgp_signaling_modified_at": addressing_bgp_signaling_modified_at_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_ipam-bgp-prefixes": addressing_ipam_bgp_prefixes_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at_nullable": addressing_modified_at_nullable_output,
-        "addressing_on_demand_enabled-2": addressing_on_demand_enabled_2_output,
-        "addressing_on_demand_locked-2": addressing_on_demand_locked_2_output,
-        "addressing_single_response_bgp": addressing_single_response_bgp_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_bgp_on_demand": addressing_bgp_on_demand,
+        "addressing_bgp_signal_opts": addressing_bgp_signal_opts,
+        "addressing_ipam-bgp-prefixes": addressing_ipam$$bgp$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response_bgp": addressing_single_response_bgp,
       },
     },
     request: (args) => ({
@@ -451,51 +382,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_prefixes_bgp_prefixes_list",
+    name: "addressing_prefixes_bgpPrefixes_list",
     title: "List BGP Prefixes",
-    description: "List all BGP Prefixes within the specified IP Prefix. BGP Prefixes are used to control which specific subnets are advertised to the Internet. It is possible to advertise subnets more specific than an IP Prefix by creating more specific BGP Prefixes.",
+    description: "List all BGP Prefixes within the specified IP Prefix. BGP Prefixes are used to control which specific subnets are advertised to the Internet. It is possible to advertise subnets more specific than an IP Prefix by creating more specific BGP Prefixes.\n\nGET /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_response_collection_bgp",
       $defs: {
-        "addressing_advertised-2": addressing_advertised_2_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_asn-2": addressing_asn_2_output,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count_output,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw_output,
-        "addressing_bgp_on_demand": addressing_bgp_on_demand_output,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier_output,
-        "addressing_bgp_signal_opts": addressing_bgp_signal_opts_output,
-        "addressing_bgp_signaling_enabled": addressing_bgp_signaling_enabled_output,
-        "addressing_bgp_signaling_modified_at": addressing_bgp_signaling_modified_at_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_ipam-bgp-prefixes": addressing_ipam_bgp_prefixes_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at_nullable": addressing_modified_at_nullable_output,
-        "addressing_on_demand_enabled-2": addressing_on_demand_enabled_2_output,
-        "addressing_on_demand_locked-2": addressing_on_demand_locked_2_output,
-        "addressing_response_collection_bgp": addressing_response_collection_bgp_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_bgp_on_demand": addressing_bgp_on_demand,
+        "addressing_bgp_signal_opts": addressing_bgp_signal_opts,
+        "addressing_ipam-bgp-prefixes": addressing_ipam$$bgp$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection_bgp": addressing_response_collection_bgp,
       },
     },
     annotations: {
@@ -534,25 +459,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_advertised-2": addressing_advertised_2_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_asn-2": addressing_asn_2_output,
-        "addressing_asn_prepend_count": addressing_asn_prepend_count_output,
-        "addressing_auto_advertise_withdraw": addressing_auto_advertise_withdraw_output,
-        "addressing_bgp_on_demand": addressing_bgp_on_demand_output,
-        "addressing_bgp_prefix_identifier": addressing_bgp_prefix_identifier_output,
-        "addressing_bgp_signal_opts": addressing_bgp_signal_opts_output,
-        "addressing_bgp_signaling_enabled": addressing_bgp_signaling_enabled_output,
-        "addressing_bgp_signaling_modified_at": addressing_bgp_signaling_modified_at_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_ipam-bgp-prefixes": addressing_ipam_bgp_prefixes_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_modified_at_nullable": addressing_modified_at_nullable_output,
-        "addressing_on_demand_enabled-2": addressing_on_demand_enabled_2_output,
-        "addressing_on_demand_locked-2": addressing_on_demand_locked_2_output,
-        "addressing_response_collection_bgp": addressing_response_collection_bgp_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_bgp_on_demand": addressing_bgp_on_demand,
+        "addressing_bgp_signal_opts": addressing_bgp_signal_opts,
+        "addressing_ipam-bgp-prefixes": addressing_ipam$$bgp$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection_bgp": addressing_response_collection_bgp,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/prefixes/delegations/outputs.ts b/src/generated/forge-mcp/addressing/prefixes/delegations/outputs.ts
index fd843d9e7..5b18acc24 100644
--- a/src/generated/forge-mcp/addressing/prefixes/delegations/outputs.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/delegations/outputs.ts
@@ -3,24 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `addressing_delegated_account_identifier` in responses.
- */
-export const addressing_delegated_account_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_delegation_identifier` in responses.
- */
-export const addressing_delegation_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_id_response` in responses.
  */
-export const addressing_id_response_output: JsonSchema = {
+export const addressing_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-single"
@@ -30,7 +16,7 @@ export const addressing_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/addressing_delegation_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -44,25 +30,27 @@ export const addressing_id_response_output: JsonSchema = {
 /**
  * The schema of `addressing_ipam-delegations` in responses.
  */
-export const addressing_ipam_delegations_output: JsonSchema = {
+export const addressing_ipam$$delegations: JsonSchema = {
   "properties": {
     "cidr": {
-      "$ref": "#/$defs/addressing_cidr"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "delegated_account_id": {
-      "$ref": "#/$defs/addressing_delegated_account_identifier"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/addressing_delegation_identifier"
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "parent_prefix_id": {
-      "$ref": "#/$defs/addressing_prefix_identifier"
+      "type": "string"
     }
   },
   "type": "object"
@@ -71,7 +59,7 @@ export const addressing_ipam_delegations_output: JsonSchema = {
 /**
  * The schema of `addressing_response_collection-2` in responses.
  */
-export const addressing_response_collection_2_output: JsonSchema = {
+export const addressing_response_collection$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-collection"
@@ -93,7 +81,7 @@ export const addressing_response_collection_2_output: JsonSchema = {
 /**
  * The schema of `addressing_single_response-2` in responses.
  */
-export const addressing_single_response_2_output: JsonSchema = {
+export const addressing_single_response$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-single"
diff --git a/src/generated/forge-mcp/addressing/prefixes/delegations/schemas.ts b/src/generated/forge-mcp/addressing/prefixes/delegations/schemas.ts
deleted file mode 100644
index 1f8c4b0e5..000000000
--- a/src/generated/forge-mcp/addressing/prefixes/delegations/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `addressing_delegated_account_identifier`.
- */
-export const addressing_delegated_account_identifier: JsonSchema = {
-  "description": "Account identifier for the account to which prefix is being delegated.",
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_delegation_identifier`.
- */
-export const addressing_delegation_identifier: JsonSchema = {
-  "description": "Identifier of a Delegation.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/prefixes/delegations/tools.ts b/src/generated/forge-mcp/addressing/prefixes/delegations/tools.ts
index 01c06683c..39df6feac 100644
--- a/src/generated/forge-mcp/addressing/prefixes/delegations/tools.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/delegations/tools.ts
@@ -3,31 +3,18 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  addressing_api_response_collection_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_api_response_single_output,
-  addressing_messages_output,
-  addressing_timestamp_output,
+  addressing_api$$response$$collection,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_api$$response$$single,
+  addressing_messages,
 } from "../../outputs.js";
-import { addressing_account_identifier } from "../../schemas.js";
 import {
-  addressing_cidr_output,
-  addressing_prefix_identifier_output,
-} from "../outputs.js";
-import { addressing_cidr, addressing_prefix_identifier } from "../schemas.js";
-import {
-  addressing_delegated_account_identifier_output,
-  addressing_delegation_identifier_output,
-  addressing_id_response_output,
-  addressing_ipam_delegations_output,
-  addressing_response_collection_2_output,
-  addressing_single_response_2_output,
+  addressing_id_response,
+  addressing_ipam$$delegations,
+  addressing_response_collection$$2,
+  addressing_single_response$$2,
 } from "./outputs.js";
-import {
-  addressing_delegated_account_identifier,
-  addressing_delegation_identifier,
-} from "./schemas.js";
 
 /**
  * The tools of `addressing.prefixes.delegations`.
@@ -36,23 +23,19 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_delegations_create",
     title: "Create Prefix Delegation",
-    description: "Create a new account delegation for a given IP prefix.",
+    description: "Create a new account delegation for a given IP prefix.\n\nPOST /accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
         "body": {
           "properties": {
             "cidr": {
-              "$ref": "#/$defs/addressing_cidr",
-              "description": "IP Prefix in Classless Inter-Domain Routing format."
+              "description": "IP Prefix in Classless Inter-Domain Routing format.",
+              "type": "string"
             },
             "delegated_account_id": {
-              "$ref": "#/$defs/addressing_delegated_account_identifier",
-              "description": "Account identifier for the account to which prefix is being delegated."
+              "description": "Account identifier for the account to which prefix is being delegated.",
+              "type": "string"
             }
           },
           "required": [
@@ -61,35 +44,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_cidr": addressing_cidr,
-        "addressing_delegated_account_identifier": addressing_delegated_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response-2",
       $defs: {
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegated_account_identifier": addressing_delegated_account_identifier_output,
-        "addressing_delegation_identifier": addressing_delegation_identifier_output,
-        "addressing_ipam-delegations": addressing_ipam_delegations_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response-2": addressing_single_response_2_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-delegations": addressing_ipam$$delegations,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response-2": addressing_single_response$$2,
       },
     },
     annotations: {
@@ -123,16 +109,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegated_account_identifier": addressing_delegated_account_identifier_output,
-        "addressing_delegation_identifier": addressing_delegation_identifier_output,
-        "addressing_ipam-delegations": addressing_ipam_delegations_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response-2": addressing_single_response_2_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-delegations": addressing_ipam$$delegations,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response-2": addressing_single_response$$2,
       },
     },
     request: (args) => ({
@@ -143,41 +124,45 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_delegations_delete",
     title: "Delete Prefix Delegation",
-    description: "Delete an account delegation for a given IP prefix.",
+    description: "Delete an account delegation for a given IP prefix.\n\nDELETE /accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations/{delegation_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "delegation_id": {
-          "$ref": "#/$defs/addressing_delegation_identifier",
-          "description": "Identifier of a Delegation."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "delegation_id": {
+              "description": "Identifier of a Delegation.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id",
+            "delegation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
-        "delegation_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_delegation_identifier": addressing_delegation_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_id_response",
       $defs: {
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_delegation_identifier": addressing_delegation_identifier_output,
-        "addressing_id_response": addressing_id_response_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_id_response": addressing_id_response,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -211,11 +196,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_delegation_identifier": addressing_delegation_identifier_output,
-        "addressing_id_response": addressing_id_response_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_id_response": addressing_id_response,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -225,41 +209,42 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_delegations_list",
     title: "List Prefix Delegations",
-    description: "List all delegations for a given account IP prefix.",
+    description: "List all delegations for a given account IP prefix.\n\nGET /accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_response_collection-2",
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegated_account_identifier": addressing_delegated_account_identifier_output,
-        "addressing_delegation_identifier": addressing_delegation_identifier_output,
-        "addressing_ipam-delegations": addressing_ipam_delegations_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_response_collection-2": addressing_response_collection_2_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_ipam-delegations": addressing_ipam$$delegations,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection-2": addressing_response_collection$$2,
       },
     },
     annotations: {
@@ -288,17 +273,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegated_account_identifier": addressing_delegated_account_identifier_output,
-        "addressing_delegation_identifier": addressing_delegation_identifier_output,
-        "addressing_ipam-delegations": addressing_ipam_delegations_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_response_collection-2": addressing_response_collection_2_output,
-        "addressing_timestamp": addressing_timestamp_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_ipam-delegations": addressing_ipam$$delegations,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection-2": addressing_response_collection$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/prefixes/outputs.ts b/src/generated/forge-mcp/addressing/prefixes/outputs.ts
index 9bdc4e9c5..44e9db187 100644
--- a/src/generated/forge-mcp/addressing/prefixes/outputs.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/outputs.ts
@@ -3,180 +3,97 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `addressing_advertised` in responses.
- */
-export const addressing_advertised_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_advertised_modified_at_nullable` in responses.
- */
-export const addressing_advertised_modified_at_nullable_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_approved` in responses.
- */
-export const addressing_approved_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_asn` in responses.
- */
-export const addressing_asn_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `addressing_cidr` in responses.
- */
-export const addressing_cidr_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_delegate_loa_creation` in responses.
- */
-export const addressing_delegate_loa_creation_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_description` in responses.
- */
-export const addressing_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_ipam-prefixes` in responses.
  */
-export const addressing_ipam_prefixes_output: JsonSchema = {
+export const addressing_ipam$$prefixes: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/addressing_account_identifier"
+      "type": "string"
     },
     "advertised": {
-      "$ref": "#/$defs/addressing_advertised"
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "advertised_modified_at": {
-      "$ref": "#/$defs/addressing_advertised_modified_at_nullable"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "approved": {
-      "$ref": "#/$defs/addressing_approved"
+      "type": "string"
     },
     "asn": {
-      "$ref": "#/$defs/addressing_asn"
+      "type": "integer"
     },
     "cidr": {
-      "$ref": "#/$defs/addressing_cidr"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "delegate_loa_creation": {
-      "$ref": "#/$defs/addressing_delegate_loa_creation"
+      "type": "boolean"
     },
     "description": {
-      "$ref": "#/$defs/addressing_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/addressing_prefix_identifier"
+      "type": "string"
     },
     "irr_validation_state": {
-      "$ref": "#/$defs/addressing_validation_state"
+      "type": "string"
     },
     "loa_document_id": {
-      "$ref": "#/$defs/addressing_loa_document_identifier"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "modified_at": {
-      "$ref": "#/$defs/addressing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "on_demand_enabled": {
-      "$ref": "#/$defs/addressing_on_demand_enabled"
+      "type": "boolean"
     },
     "on_demand_locked": {
-      "$ref": "#/$defs/addressing_on_demand_locked"
+      "type": "boolean"
     },
     "ownership_validation_state": {
-      "$ref": "#/$defs/addressing_validation_state"
+      "type": "string"
     },
     "ownership_validation_token": {
-      "$ref": "#/$defs/addressing_ownership_validation_token"
+      "type": "string"
     },
     "rpki_validation_state": {
-      "$ref": "#/$defs/addressing_validation_state"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `addressing_modified_at_nullable` in responses.
- */
-export const addressing_modified_at_nullable_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_on_demand_enabled` in responses.
- */
-export const addressing_on_demand_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_on_demand_locked` in responses.
- */
-export const addressing_on_demand_locked_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_ownership_validation_token` in responses.
- */
-export const addressing_ownership_validation_token_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_prefix_identifier` in responses.
- */
-export const addressing_prefix_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `addressing_response_collection` in responses.
  */
-export const addressing_response_collection_output: JsonSchema = {
+export const addressing_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-single"
@@ -198,7 +115,7 @@ export const addressing_response_collection_output: JsonSchema = {
 /**
  * The schema of `addressing_single_response` in responses.
  */
-export const addressing_single_response_output: JsonSchema = {
+export const addressing_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/addressing_api-response-single"
@@ -213,10 +130,3 @@ export const addressing_single_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `addressing_validation_state` in responses.
- */
-export const addressing_validation_state_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/prefixes/schemas.ts b/src/generated/forge-mcp/addressing/prefixes/schemas.ts
deleted file mode 100644
index a8957b403..000000000
--- a/src/generated/forge-mcp/addressing/prefixes/schemas.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `addressing_asn`.
- */
-export const addressing_asn: JsonSchema = {
-  "description": "Autonomous System Number (ASN) the prefix will be advertised under.",
-  "type": "integer"
-};
-
-/**
- * The schema of `addressing_cidr`.
- */
-export const addressing_cidr: JsonSchema = {
-  "description": "IP Prefix in Classless Inter-Domain Routing format.",
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_delegate_loa_creation`.
- */
-export const addressing_delegate_loa_creation: JsonSchema = {
-  "description": "Whether Cloudflare is allowed to generate the LOA document on behalf of the prefix owner.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `addressing_description`.
- */
-export const addressing_description: JsonSchema = {
-  "description": "Description of the prefix.",
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_prefix_identifier`.
- */
-export const addressing_prefix_identifier: JsonSchema = {
-  "description": "Identifier of an IP Prefix.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/prefixes/serviceBindings/outputs.ts b/src/generated/forge-mcp/addressing/prefixes/serviceBindings/outputs.ts
index dc82c9755..a936aab85 100644
--- a/src/generated/forge-mcp/addressing/prefixes/serviceBindings/outputs.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/serviceBindings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `addressing_provisioning` in responses.
  */
-export const addressing_provisioning_output: JsonSchema = {
+export const addressing_provisioning: JsonSchema = {
   "properties": {
     "state": {
       "enum": [
@@ -23,30 +23,23 @@ export const addressing_provisioning_output: JsonSchema = {
 /**
  * The schema of `addressing_service_binding` in responses.
  */
-export const addressing_service_binding_output: JsonSchema = {
+export const addressing_service_binding: JsonSchema = {
   "properties": {
     "cidr": {
-      "$ref": "#/$defs/addressing_cidr"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/addressing_service_binding_identifier"
+      "type": "string"
     },
     "provisioning": {
       "$ref": "#/$defs/addressing_provisioning"
     },
     "service_id": {
-      "$ref": "#/$defs/addressing_service_identifier"
+      "type": "string"
     },
     "service_name": {
-      "$ref": "#/$defs/addressing_service_name"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `addressing_service_binding_identifier` in responses.
- */
-export const addressing_service_binding_identifier_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/prefixes/serviceBindings/schemas.ts b/src/generated/forge-mcp/addressing/prefixes/serviceBindings/schemas.ts
index ae467d3a1..4a499dd20 100644
--- a/src/generated/forge-mcp/addressing/prefixes/serviceBindings/schemas.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/serviceBindings/schemas.ts
@@ -9,12 +9,12 @@ import type { JsonSchema } from "../../../_/tool.js";
 export const addressing_create_binding_request: JsonSchema = {
   "properties": {
     "cidr": {
-      "$ref": "#/$defs/addressing_cidr",
-      "description": "IP Prefix in Classless Inter-Domain Routing format."
+      "description": "IP Prefix in Classless Inter-Domain Routing format.",
+      "type": "string"
     },
     "service_id": {
-      "$ref": "#/$defs/addressing_service_identifier",
-      "description": "Identifier of a Service on the Cloudflare network. Available services and their IDs may be found in the\n**List Services** endpoint.\n"
+      "description": "Identifier of a Service on the Cloudflare network. Available services and their IDs may be found in the\n**List Services** endpoint.",
+      "type": "string"
     }
   },
   "required": [
@@ -23,11 +23,3 @@ export const addressing_create_binding_request: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `addressing_service_binding_identifier`.
- */
-export const addressing_service_binding_identifier: JsonSchema = {
-  "description": "Identifier of a Service Binding.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/prefixes/serviceBindings/tools.ts b/src/generated/forge-mcp/addressing/prefixes/serviceBindings/tools.ts
index 4145a455f..cd9b0564b 100644
--- a/src/generated/forge-mcp/addressing/prefixes/serviceBindings/tools.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/serviceBindings/tools.ts
@@ -3,61 +3,55 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_messages_output,
-  addressing_service_identifier_output,
-  addressing_service_name_output,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_messages,
 } from "../../outputs.js";
 import {
-  addressing_account_identifier,
-  addressing_service_identifier,
-} from "../../schemas.js";
-import { addressing_cidr_output } from "../outputs.js";
-import { addressing_cidr, addressing_prefix_identifier } from "../schemas.js";
-import {
-  addressing_provisioning_output,
-  addressing_service_binding_identifier_output,
-  addressing_service_binding_output,
+  addressing_provisioning,
+  addressing_service_binding,
 } from "./outputs.js";
-import {
-  addressing_create_binding_request,
-  addressing_service_binding_identifier,
-} from "./schemas.js";
+import { addressing_create_binding_request } from "./schemas.js";
 
 /**
- * The tools of `addressing.prefixes.service_bindings`.
+ * The tools of `addressing.prefixes.serviceBindings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_prefixes_service_bindings_create",
+    name: "addressing_prefixes_serviceBindings_create",
     title: "Create Service Binding",
-    description: "Creates a new Service Binding, routing traffic to IPs within the given CIDR to a service running on Cloudflare's network.\n**NOTE:** The first Service Binding created for an IP Prefix must exactly match the IP Prefix's CIDR. Subsequent Service Bindings may be created with a more-specific CIDR. Refer to the  [Service Bindings Documentation](https://developers.cloudflare.com/byoip/service-bindings/) for compatibility details.",
+    description: "Creates a new Service Binding, routing traffic to IPs within the given CIDR to a service running on Cloudflare's network.\n**NOTE:** The first Service Binding created for an IP Prefix must exactly match the IP Prefix's CIDR. Subsequent Service Bindings may be created with a more-specific CIDR. Refer to the  [Service Bindings Documentation](https://developers.cloudflare.com/byoip/service-bindings/) for compatibility details.\n\nPOST /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
         "body": {
           "$ref": "#/$defs/addressing_create_binding_request"
         },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_cidr": addressing_cidr,
         "addressing_create_binding_request": addressing_create_binding_request,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-        "addressing_service_identifier": addressing_service_identifier,
       },
     },
     outputSchema: {
@@ -75,14 +69,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_provisioning": addressing_provisioning_output,
-        "addressing_service_binding": addressing_service_binding_output,
-        "addressing_service_binding_identifier": addressing_service_binding_identifier_output,
-        "addressing_service_identifier": addressing_service_identifier_output,
-        "addressing_service_name": addressing_service_name_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
+        "addressing_provisioning": addressing_provisioning,
+        "addressing_service_binding": addressing_service_binding,
       },
     },
     annotations: {
@@ -121,15 +111,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_provisioning": addressing_provisioning_output,
-        "addressing_service_binding": addressing_service_binding_output,
-        "addressing_service_binding_identifier": addressing_service_binding_identifier_output,
-        "addressing_service_identifier": addressing_service_identifier_output,
-        "addressing_service_name": addressing_service_name_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
+        "addressing_provisioning": addressing_provisioning,
+        "addressing_service_binding": addressing_service_binding,
       },
     },
     request: (args) => ({
@@ -138,41 +124,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_prefixes_service_bindings_delete",
+    name: "addressing_prefixes_serviceBindings_delete",
     title: "Delete Service Binding",
-    description: "Delete a Service Binding",
+    description: "Delete a Service Binding\n\nDELETE /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "binding_id": {
-          "$ref": "#/$defs/addressing_service_binding_identifier",
-          "description": "Identifier of a Service Binding."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "binding_id": {
+              "description": "Identifier of a Service Binding.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id",
+            "binding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
-        "binding_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-        "addressing_service_binding_identifier": addressing_service_binding_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-common",
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -199,9 +190,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -209,35 +200,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_prefixes_service_bindings_get",
+    name: "addressing_prefixes_serviceBindings_get",
     title: "Get Service Binding",
-    description: "Fetch a single Service Binding",
+    description: "Fetch a single Service Binding\n\nGET /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "binding_id": {
-          "$ref": "#/$defs/addressing_service_binding_identifier",
-          "description": "Identifier of a Service Binding."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "binding_id": {
+              "description": "Identifier of a Service Binding.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id",
+            "binding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
-        "binding_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-        "addressing_service_binding_identifier": addressing_service_binding_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -254,14 +250,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_provisioning": addressing_provisioning_output,
-        "addressing_service_binding": addressing_service_binding_output,
-        "addressing_service_binding_identifier": addressing_service_binding_identifier_output,
-        "addressing_service_identifier": addressing_service_identifier_output,
-        "addressing_service_name": addressing_service_name_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
+        "addressing_provisioning": addressing_provisioning,
+        "addressing_service_binding": addressing_service_binding,
       },
     },
     annotations: {
@@ -301,15 +293,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_provisioning": addressing_provisioning_output,
-        "addressing_service_binding": addressing_service_binding_output,
-        "addressing_service_binding_identifier": addressing_service_binding_identifier_output,
-        "addressing_service_identifier": addressing_service_identifier_output,
-        "addressing_service_name": addressing_service_name_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
+        "addressing_provisioning": addressing_provisioning,
+        "addressing_service_binding": addressing_service_binding,
       },
     },
     request: (args) => ({
@@ -317,29 +305,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_prefixes_service_bindings_list",
+    name: "addressing_prefixes_serviceBindings_list",
     title: "List Service Bindings",
-    description: "List the Cloudflare services this prefix is currently bound to. Traffic sent to an address within an IP prefix will be routed to the Cloudflare service of the most-specific Service Binding matching the address.\n**Example:** binding `192.0.2.0/24` to Cloudflare Magic Transit and `192.0.2.1/32` to the Cloudflare CDN would route traffic for `192.0.2.1` to the CDN, and traffic for all other IPs in the prefix to Cloudflare Magic Transit.",
+    description: "List the Cloudflare services this prefix is currently bound to. Traffic sent to an address within an IP prefix will be routed to the Cloudflare service of the most-specific Service Binding matching the address.\n**Example:** binding `192.0.2.0/24` to Cloudflare Magic Transit and `192.0.2.1/32` to the Cloudflare CDN would route traffic for `192.0.2.1` to the CDN, and traffic for all other IPs in the prefix to Cloudflare Magic Transit.\n\nGET /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -359,14 +353,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_provisioning": addressing_provisioning_output,
-        "addressing_service_binding": addressing_service_binding_output,
-        "addressing_service_binding_identifier": addressing_service_binding_identifier_output,
-        "addressing_service_identifier": addressing_service_identifier_output,
-        "addressing_service_name": addressing_service_name_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
+        "addressing_provisioning": addressing_provisioning,
+        "addressing_service_binding": addressing_service_binding,
       },
     },
     annotations: {
@@ -409,15 +399,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_provisioning": addressing_provisioning_output,
-        "addressing_service_binding": addressing_service_binding_output,
-        "addressing_service_binding_identifier": addressing_service_binding_identifier_output,
-        "addressing_service_identifier": addressing_service_identifier_output,
-        "addressing_service_name": addressing_service_name_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
+        "addressing_provisioning": addressing_provisioning,
+        "addressing_service_binding": addressing_service_binding,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/prefixes/tools.ts b/src/generated/forge-mcp/addressing/prefixes/tools.ts
index 336337c37..482178f52 100644
--- a/src/generated/forge-mcp/addressing/prefixes/tools.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/tools.ts
@@ -3,43 +3,17 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  addressing_account_identifier_output,
-  addressing_api_response_collection_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_api_response_single_output,
-  addressing_loa_document_identifier_output,
-  addressing_messages_output,
-  addressing_timestamp_output,
+  addressing_api$$response$$collection,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_api$$response$$single,
+  addressing_messages,
 } from "../outputs.js";
 import {
-  addressing_account_identifier,
-  addressing_loa_document_identifier,
-} from "../schemas.js";
-import {
-  addressing_advertised_modified_at_nullable_output,
-  addressing_advertised_output,
-  addressing_approved_output,
-  addressing_asn_output,
-  addressing_cidr_output,
-  addressing_delegate_loa_creation_output,
-  addressing_description_output,
-  addressing_ipam_prefixes_output,
-  addressing_on_demand_enabled_output,
-  addressing_on_demand_locked_output,
-  addressing_ownership_validation_token_output,
-  addressing_prefix_identifier_output,
-  addressing_response_collection_output,
-  addressing_single_response_output,
-  addressing_validation_state_output,
+  addressing_ipam$$prefixes,
+  addressing_response_collection,
+  addressing_single_response,
 } from "./outputs.js";
-import {
-  addressing_asn,
-  addressing_cidr,
-  addressing_delegate_loa_creation,
-  addressing_description,
-  addressing_prefix_identifier,
-} from "./schemas.js";
 
 /**
  * The tools of `addressing.prefixes`.
@@ -48,36 +22,39 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_create",
     title: "Add Prefix",
-    description: "Add a new prefix under the account.",
+    description: "Add a new prefix under the account.\n\nPOST /accounts/{account_id}/addressing/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
         "body": {
           "properties": {
             "asn": {
-              "$ref": "#/$defs/addressing_asn",
-              "description": "Autonomous System Number (ASN) the prefix will be advertised under."
+              "description": "Autonomous System Number (ASN) the prefix will be advertised under.",
+              "type": "integer"
             },
             "cidr": {
-              "$ref": "#/$defs/addressing_cidr",
-              "description": "IP Prefix in Classless Inter-Domain Routing format."
+              "description": "IP Prefix in Classless Inter-Domain Routing format.",
+              "type": "string"
             },
             "delegate_loa_creation": {
-              "$ref": "#/$defs/addressing_delegate_loa_creation",
               "default": false,
-              "description": "Whether Cloudflare is allowed to generate the LOA document on behalf of the prefix owner."
+              "description": "Whether Cloudflare is allowed to generate the LOA document on behalf of the prefix owner.",
+              "type": "boolean"
             },
             "description": {
-              "$ref": "#/$defs/addressing_description",
-              "description": "Description of the prefix."
+              "description": "Description of the prefix.",
+              "type": "string"
             },
             "loa_document_id": {
-              "$ref": "#/$defs/addressing_loa_document_identifier",
-              "description": "Identifier for the uploaded LOA document."
+              "description": "Identifier for the uploaded LOA document.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
           },
           "required": [
@@ -85,43 +62,34 @@ export const tools: readonly Tool[] = [
             "cidr"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_asn": addressing_asn,
-        "addressing_cidr": addressing_cidr,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation,
-        "addressing_description": addressing_description,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response",
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response": addressing_single_response_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response": addressing_single_response,
       },
     },
     annotations: {
@@ -153,26 +121,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response": addressing_single_response_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response": addressing_single_response,
       },
     },
     request: (args) => ({
@@ -183,33 +136,39 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_delete",
     title: "Delete Prefix",
-    description: "Delete an unapproved prefix owned by the account.",
+    description: "Delete an unapproved prefix owned by the account.\n\nDELETE /accounts/{account_id}/addressing/prefixes/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_api-response-single",
       $defs: {
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -243,11 +202,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-collection": addressing_api_response_collection_output,
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_messages": addressing_messages_output,
+        "addressing_api-response-collection": addressing_api$$response$$collection,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
@@ -257,19 +216,15 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_edit",
     title: "Update Prefix Description",
-    description: "Modify the description for a prefix owned by the account.",
+    description: "Modify the description for a prefix owned by the account.\n\nPATCH /accounts/{account_id}/addressing/prefixes/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/addressing_description",
-              "description": "Description of the prefix."
+              "description": "Description of the prefix.",
+              "type": "string"
             }
           },
           "required": [
@@ -277,44 +232,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_description": addressing_description,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response",
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response": addressing_single_response_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response": addressing_single_response,
       },
     },
     annotations: {
@@ -349,26 +298,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response": addressing_single_response_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response": addressing_single_response,
       },
     },
     request: (args) => ({
@@ -379,50 +313,41 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_get",
     title: "Prefix Details",
-    description: "List a particular prefix owned by the account.",
+    description: "List a particular prefix owned by the account.\n\nGET /accounts/{account_id}/addressing/prefixes/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response",
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response": addressing_single_response_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response": addressing_single_response,
       },
     },
     annotations: {
@@ -461,26 +386,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response": addressing_single_response_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response": addressing_single_response,
       },
     },
     request: (args) => ({
@@ -490,44 +400,36 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_list",
     title: "List Prefixes",
-    description: "List all prefixes owned by the account.",
+    description: "List all prefixes owned by the account.\n\nGET /accounts/{account_id}/addressing/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_response_collection",
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_response_collection": addressing_response_collection_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection": addressing_response_collection,
       },
     },
     annotations: {
@@ -566,26 +468,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_response_collection": addressing_response_collection_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_response_collection": addressing_response_collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/prefixes/validate/tools.ts b/src/generated/forge-mcp/addressing/prefixes/validate/tools.ts
index d677faf85..cf63c49a8 100644
--- a/src/generated/forge-mcp/addressing/prefixes/validate/tools.ts
+++ b/src/generated/forge-mcp/addressing/prefixes/validate/tools.ts
@@ -3,31 +3,14 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  addressing_account_identifier_output,
-  addressing_api_response_common_failure_output,
-  addressing_api_response_single_output,
-  addressing_loa_document_identifier_output,
-  addressing_messages_output,
-  addressing_timestamp_output,
+  addressing_api$$response$$common$$failure,
+  addressing_api$$response$$single,
+  addressing_messages,
 } from "../../outputs.js";
-import { addressing_account_identifier } from "../../schemas.js";
 import {
-  addressing_advertised_modified_at_nullable_output,
-  addressing_advertised_output,
-  addressing_approved_output,
-  addressing_asn_output,
-  addressing_cidr_output,
-  addressing_delegate_loa_creation_output,
-  addressing_description_output,
-  addressing_ipam_prefixes_output,
-  addressing_on_demand_enabled_output,
-  addressing_on_demand_locked_output,
-  addressing_ownership_validation_token_output,
-  addressing_prefix_identifier_output,
-  addressing_single_response_output,
-  addressing_validation_state_output,
+  addressing_ipam$$prefixes,
+  addressing_single_response,
 } from "../outputs.js";
-import { addressing_prefix_identifier } from "../schemas.js";
 
 /**
  * The tools of `addressing.prefixes.validate`.
@@ -36,50 +19,41 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_prefixes_validate_create",
     title: "Validate Prefix",
-    description: "Triggers a new prefix validation. The checks are run asynchronously and include IRR, RPKI, and prefix ownership.",
+    description: "Triggers a new prefix validation. The checks are run asynchronously and include IRR, RPKI, and prefix ownership.\n\nPOST /accounts/{account_id}/addressing/prefixes/{prefix_id}/validate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/addressing_prefix_identifier",
-          "description": "Identifier of an IP Prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "Identifier of an IP Prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-        "addressing_prefix_identifier": addressing_prefix_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/addressing_single_response",
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response": addressing_single_response_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response": addressing_single_response,
       },
     },
     annotations: {
@@ -114,26 +88,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_account_identifier": addressing_account_identifier_output,
-        "addressing_advertised": addressing_advertised_output,
-        "addressing_advertised_modified_at_nullable": addressing_advertised_modified_at_nullable_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_api-response-single": addressing_api_response_single_output,
-        "addressing_approved": addressing_approved_output,
-        "addressing_asn": addressing_asn_output,
-        "addressing_cidr": addressing_cidr_output,
-        "addressing_delegate_loa_creation": addressing_delegate_loa_creation_output,
-        "addressing_description": addressing_description_output,
-        "addressing_ipam-prefixes": addressing_ipam_prefixes_output,
-        "addressing_loa_document_identifier": addressing_loa_document_identifier_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_on_demand_enabled": addressing_on_demand_enabled_output,
-        "addressing_on_demand_locked": addressing_on_demand_locked_output,
-        "addressing_ownership_validation_token": addressing_ownership_validation_token_output,
-        "addressing_prefix_identifier": addressing_prefix_identifier_output,
-        "addressing_single_response": addressing_single_response_output,
-        "addressing_timestamp": addressing_timestamp_output,
-        "addressing_validation_state": addressing_validation_state_output,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_api-response-single": addressing_api$$response$$single,
+        "addressing_ipam-prefixes": addressing_ipam$$prefixes,
+        "addressing_messages": addressing_messages,
+        "addressing_single_response": addressing_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/regionalHostnames/outputs.ts b/src/generated/forge-mcp/addressing/regionalHostnames/outputs.ts
index 391ec7a55..efb20734b 100644
--- a/src/generated/forge-mcp/addressing/regionalHostnames/outputs.ts
+++ b/src/generated/forge-mcp/addressing/regionalHostnames/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `dls_api-response-collection` in responses.
  */
-export const dls_api_response_collection_output: JsonSchema = {
+export const dls_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dls_api-response-common"
@@ -42,7 +42,7 @@ export const dls_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `dls_api-response-common` in responses.
  */
-export const dls_api_response_common_output: JsonSchema = {
+export const dls_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dls_messages"
@@ -68,7 +68,7 @@ export const dls_api_response_common_output: JsonSchema = {
 /**
  * The schema of `dls_api-response-common-failure` in responses.
  */
-export const dls_api_response_common_failure_output: JsonSchema = {
+export const dls_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dls_messages"
@@ -95,17 +95,10 @@ export const dls_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dls_hostname` in responses.
- */
-export const dls_hostname_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dls_messages` in responses.
  */
-export const dls_messages_output: JsonSchema = {
+export const dls_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -135,22 +128,16 @@ export const dls_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `dls_region_key` in responses.
- */
-export const dls_region_key_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dls_regional_hostname_response` in responses.
  */
-export const dls_regional_hostname_response_output: JsonSchema = {
+export const dls_regional_hostname_response: JsonSchema = {
   "properties": {
     "created_on": {
       "allOf": [
         {
-          "$ref": "#/$defs/dls_timestamp"
+          "format": "date-time",
+          "type": "string"
         },
         {
           "type": "string"
@@ -161,13 +148,13 @@ export const dls_regional_hostname_response_output: JsonSchema = {
       ]
     },
     "hostname": {
-      "$ref": "#/$defs/dls_hostname"
+      "type": "string"
     },
     "region_key": {
-      "$ref": "#/$defs/dls_region_key"
+      "type": "string"
     },
     "routing": {
-      "$ref": "#/$defs/dls_routing"
+      "type": "string"
     }
   },
   "required": [
@@ -178,18 +165,3 @@ export const dls_regional_hostname_response_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `dls_routing` in responses.
- */
-export const dls_routing_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `dls_timestamp` in responses.
- */
-export const dls_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/regionalHostnames/regions/tools.ts b/src/generated/forge-mcp/addressing/regionalHostnames/regions/tools.ts
index a4ae48890..f4e3ad0fa 100644
--- a/src/generated/forge-mcp/addressing/regionalHostnames/regions/tools.ts
+++ b/src/generated/forge-mcp/addressing/regionalHostnames/regions/tools.ts
@@ -3,36 +3,41 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dls_api_response_collection_output,
-  dls_api_response_common_failure_output,
-  dls_api_response_common_output,
-  dls_messages_output,
-  dls_region_key_output,
+  dls_api$$response$$collection,
+  dls_api$$response$$common,
+  dls_api$$response$$common$$failure,
+  dls_messages,
 } from "../outputs.js";
-import { dls_identifier } from "../schemas.js";
 
 /**
- * The tools of `addressing.regional_hostnames.regions`.
+ * The tools of `addressing.regionalHostnames.regions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_regional_hostnames_regions_list",
+    name: "addressing_regionalHostnames_regions_list",
     title: "List Regions",
-    description: "List all Regional Services regions available for use by this account.",
+    description: "List all Regional Services regions available for use by this account.\n\nGET /accounts/{account_id}/addressing/regional_hostnames/regions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dls_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "dls_identifier": dls_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -45,7 +50,7 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "key": {
-                    "$ref": "#/$defs/dls_region_key"
+                    "type": "string"
                   },
                   "label": {
                     "type": "string"
@@ -60,10 +65,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dls_api-response-collection": dls_api_response_collection_output,
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
+        "dls_api-response-collection": dls_api$$response$$collection,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_messages": dls_messages,
       },
     },
     annotations: {
@@ -94,7 +98,7 @@ export const tools: readonly Tool[] = [
                   "items": {
                     "properties": {
                       "key": {
-                        "$ref": "#/$defs/dls_region_key"
+                        "type": "string"
                       },
                       "label": {
                         "type": "string"
@@ -114,11 +118,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_api-response-collection": dls_api_response_collection_output,
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_api-response-common-failure": dls_api_response_common_failure_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
+        "dls_api-response-collection": dls_api$$response$$collection,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_api-response-common-failure": dls_api$$response$$common$$failure,
+        "dls_messages": dls_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/regionalHostnames/schemas.ts b/src/generated/forge-mcp/addressing/regionalHostnames/schemas.ts
deleted file mode 100644
index ef80eeda8..000000000
--- a/src/generated/forge-mcp/addressing/regionalHostnames/schemas.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `dls_hostname`.
- */
-export const dls_hostname: JsonSchema = {
-  "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`",
-  "type": "string"
-};
-
-/**
- * The schema of `dls_identifier`.
- */
-export const dls_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `dls_region_key`.
- */
-export const dls_region_key: JsonSchema = {
-  "description": "Identifying key for the region",
-  "type": "string"
-};
-
-/**
- * The schema of `dls_routing`.
- */
-export const dls_routing: JsonSchema = {
-  "description": "Configure which routing method to use for the regional hostname",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/regionalHostnames/tools.ts b/src/generated/forge-mcp/addressing/regionalHostnames/tools.ts
index 70fd6f074..0c1723192 100644
--- a/src/generated/forge-mcp/addressing/regionalHostnames/tools.ts
+++ b/src/generated/forge-mcp/addressing/regionalHostnames/tools.ts
@@ -3,48 +3,38 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  dls_api_response_collection_output,
-  dls_api_response_common_failure_output,
-  dls_api_response_common_output,
-  dls_hostname_output,
-  dls_messages_output,
-  dls_region_key_output,
-  dls_regional_hostname_response_output,
-  dls_routing_output,
-  dls_timestamp_output,
+  dls_api$$response$$collection,
+  dls_api$$response$$common,
+  dls_api$$response$$common$$failure,
+  dls_messages,
+  dls_regional_hostname_response,
 } from "./outputs.js";
-import {
-  dls_hostname,
-  dls_identifier,
-  dls_region_key,
-  dls_routing,
-} from "./schemas.js";
 
 /**
- * The tools of `addressing.regional_hostnames`.
+ * The tools of `addressing.regionalHostnames`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "addressing_regional_hostnames_create",
+    name: "addressing_regionalHostnames_create",
     title: "Create Regional Hostname",
-    description: "Create a new Regional Hostname entry. Cloudflare will only use data centers that are physically located within the chosen region to decrypt and service HTTPS traffic. Learn more about [Regional Services](https://developers.cloudflare.com/data-localization/regional-services/get-started/).",
+    description: "Create a new Regional Hostname entry. Cloudflare will only use data centers that are physically located within the chosen region to decrypt and service HTTPS traffic. Learn more about [Regional Services](https://developers.cloudflare.com/data-localization/regional-services/get-started/).\n\nPOST /zones/{zone_id}/addressing/regional_hostnames",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "hostname": {
-              "$ref": "#/$defs/dls_hostname",
-              "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`"
+              "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`",
+              "type": "string"
             },
             "region_key": {
-              "$ref": "#/$defs/dls_region_key",
-              "description": "Identifying key for the region"
+              "description": "Identifying key for the region",
+              "type": "string"
             },
             "routing": {
-              "$ref": "#/$defs/dls_routing",
               "default": "dns",
-              "description": "Configure which routing method to use for the regional hostname"
+              "description": "Configure which routing method to use for the regional hostname",
+              "type": "string"
             }
           },
           "required": [
@@ -53,20 +43,24 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dls_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dls_hostname": dls_hostname,
-        "dls_identifier": dls_identifier,
-        "dls_region_key": dls_region_key,
-        "dls_routing": dls_routing,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -83,13 +77,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_hostname": dls_hostname_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
-        "dls_regional_hostname_response": dls_regional_hostname_response_output,
-        "dls_routing": dls_routing_output,
-        "dls_timestamp": dls_timestamp_output,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_messages": dls_messages,
+        "dls_regional_hostname_response": dls_regional_hostname_response,
       },
     },
     annotations: {
@@ -128,14 +118,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_api-response-common-failure": dls_api_response_common_failure_output,
-        "dls_hostname": dls_hostname_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
-        "dls_regional_hostname_response": dls_regional_hostname_response_output,
-        "dls_routing": dls_routing_output,
-        "dls_timestamp": dls_timestamp_output,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_api-response-common-failure": dls_api$$response$$common$$failure,
+        "dls_messages": dls_messages,
+        "dls_regional_hostname_response": dls_regional_hostname_response,
       },
     },
     request: (args) => ({
@@ -144,35 +130,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_regional_hostnames_delete",
+    name: "addressing_regionalHostnames_delete",
     title: "Delete Regional Hostname",
-    description: "Delete the region configuration for a specific Regional Hostname.",
+    description: "Delete the region configuration for a specific Regional Hostname.\n\nDELETE /zones/{zone_id}/addressing/regional_hostnames/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
-        "hostname": {
-          "$ref": "#/$defs/dls_hostname",
-          "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/dls_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "hostname": {
+              "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "hostname"
+        "path"
       ],
-      $defs: {
-        "dls_hostname": dls_hostname,
-        "dls_identifier": dls_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dls_api-response-common",
       $defs: {
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_messages": dls_messages_output,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_messages": dls_messages,
       },
     },
     annotations: {
@@ -199,9 +191,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_api-response-common-failure": dls_api_response_common_failure_output,
-        "dls_messages": dls_messages_output,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_api-response-common-failure": dls_api$$response$$common$$failure,
+        "dls_messages": dls_messages,
       },
     },
     request: (args) => ({
@@ -209,17 +201,17 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_regional_hostnames_edit",
+    name: "addressing_regionalHostnames_edit",
     title: "Update Regional Hostname",
-    description: "Update the configuration for a specific Regional Hostname. Only the region_key of a hostname is mutable.",
+    description: "Update the configuration for a specific Regional Hostname. Only the region_key of a hostname is mutable.\n\nPATCH /zones/{zone_id}/addressing/regional_hostnames/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "region_key": {
-              "$ref": "#/$defs/dls_region_key",
-              "description": "Identifying key for the region"
+              "description": "Identifying key for the region",
+              "type": "string"
             }
           },
           "required": [
@@ -227,24 +219,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "hostname": {
-          "$ref": "#/$defs/dls_hostname",
-          "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/dls_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "hostname": {
+              "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "hostname"
+        "path"
       ],
-      $defs: {
-        "dls_hostname": dls_hostname,
-        "dls_identifier": dls_identifier,
-        "dls_region_key": dls_region_key,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -261,13 +258,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_hostname": dls_hostname_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
-        "dls_regional_hostname_response": dls_regional_hostname_response_output,
-        "dls_routing": dls_routing_output,
-        "dls_timestamp": dls_timestamp_output,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_messages": dls_messages,
+        "dls_regional_hostname_response": dls_regional_hostname_response,
       },
     },
     annotations: {
@@ -306,14 +299,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_api-response-common-failure": dls_api_response_common_failure_output,
-        "dls_hostname": dls_hostname_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
-        "dls_regional_hostname_response": dls_regional_hostname_response_output,
-        "dls_routing": dls_routing_output,
-        "dls_timestamp": dls_timestamp_output,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_api-response-common-failure": dls_api$$response$$common$$failure,
+        "dls_messages": dls_messages,
+        "dls_regional_hostname_response": dls_regional_hostname_response,
       },
     },
     request: (args) => ({
@@ -322,29 +311,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_regional_hostnames_get",
+    name: "addressing_regionalHostnames_get",
     title: "Fetch Regional Hostname",
-    description: "Fetch the configuration for a specific Regional Hostname, within a zone.",
+    description: "Fetch the configuration for a specific Regional Hostname, within a zone.\n\nGET /zones/{zone_id}/addressing/regional_hostnames/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
-        "hostname": {
-          "$ref": "#/$defs/dls_hostname",
-          "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/dls_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "hostname": {
+              "description": "DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are supported for one level, e.g `*.example.com`",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "hostname"
+        "path"
       ],
-      $defs: {
-        "dls_hostname": dls_hostname,
-        "dls_identifier": dls_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -361,13 +356,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_hostname": dls_hostname_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
-        "dls_regional_hostname_response": dls_regional_hostname_response_output,
-        "dls_routing": dls_routing_output,
-        "dls_timestamp": dls_timestamp_output,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_messages": dls_messages,
+        "dls_regional_hostname_response": dls_regional_hostname_response,
       },
     },
     annotations: {
@@ -407,14 +398,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_api-response-common-failure": dls_api_response_common_failure_output,
-        "dls_hostname": dls_hostname_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
-        "dls_regional_hostname_response": dls_regional_hostname_response_output,
-        "dls_routing": dls_routing_output,
-        "dls_timestamp": dls_timestamp_output,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_api-response-common-failure": dls_api$$response$$common$$failure,
+        "dls_messages": dls_messages,
+        "dls_regional_hostname_response": dls_regional_hostname_response,
       },
     },
     request: (args) => ({
@@ -422,23 +409,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "addressing_regional_hostnames_list",
+    name: "addressing_regionalHostnames_list",
     title: "List Regional Hostnames",
-    description: "List all Regional Hostnames within a zone.",
+    description: "List all Regional Hostnames within a zone.\n\nGET /zones/{zone_id}/addressing/regional_hostnames",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/dls_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dls_identifier": dls_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -458,14 +452,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dls_api-response-collection": dls_api_response_collection_output,
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_hostname": dls_hostname_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
-        "dls_regional_hostname_response": dls_regional_hostname_response_output,
-        "dls_routing": dls_routing_output,
-        "dls_timestamp": dls_timestamp_output,
+        "dls_api-response-collection": dls_api$$response$$collection,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_messages": dls_messages,
+        "dls_regional_hostname_response": dls_regional_hostname_response,
       },
     },
     annotations: {
@@ -508,15 +498,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_api-response-collection": dls_api_response_collection_output,
-        "dls_api-response-common": dls_api_response_common_output,
-        "dls_api-response-common-failure": dls_api_response_common_failure_output,
-        "dls_hostname": dls_hostname_output,
-        "dls_messages": dls_messages_output,
-        "dls_region_key": dls_region_key_output,
-        "dls_regional_hostname_response": dls_regional_hostname_response_output,
-        "dls_routing": dls_routing_output,
-        "dls_timestamp": dls_timestamp_output,
+        "dls_api-response-collection": dls_api$$response$$collection,
+        "dls_api-response-common": dls_api$$response$$common,
+        "dls_api-response-common-failure": dls_api$$response$$common$$failure,
+        "dls_messages": dls_messages,
+        "dls_regional_hostname_response": dls_regional_hostname_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/addressing/schemas.ts b/src/generated/forge-mcp/addressing/schemas.ts
deleted file mode 100644
index 1fc8f35fb..000000000
--- a/src/generated/forge-mcp/addressing/schemas.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `addressing_account_identifier`.
- */
-export const addressing_account_identifier: JsonSchema = {
-  "description": "Identifier of a Cloudflare account.",
-  "type": "string"
-};
-
-/**
- * The schema of `addressing_loa_document_identifier`.
- */
-export const addressing_loa_document_identifier: JsonSchema = {
-  "description": "Identifier for the uploaded LOA document.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `addressing_service_identifier`.
- */
-export const addressing_service_identifier: JsonSchema = {
-  "description": "Identifier of a Service on the Cloudflare network. Available services and their IDs may be found in the\n**List Services** endpoint.\n",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/addressing/services/tools.ts b/src/generated/forge-mcp/addressing/services/tools.ts
index adaf0bda3..81ed28a67 100644
--- a/src/generated/forge-mcp/addressing/services/tools.ts
+++ b/src/generated/forge-mcp/addressing/services/tools.ts
@@ -3,13 +3,10 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  addressing_api_response_common_failure_output,
-  addressing_api_response_common_output,
-  addressing_messages_output,
-  addressing_service_identifier_output,
-  addressing_service_name_output,
+  addressing_api$$response$$common,
+  addressing_api$$response$$common$$failure,
+  addressing_messages,
 } from "../outputs.js";
-import { addressing_account_identifier } from "../schemas.js";
 
 /**
  * The tools of `addressing.services`.
@@ -18,21 +15,28 @@ export const tools: readonly Tool[] = [
   {
     name: "addressing_services_list",
     title: "List Services",
-    description: "Bring-Your-Own IP (BYOIP) prefixes onboarded to Cloudflare must be bound to a service running on the Cloudflare network to enable a Cloudflare product on the IP addresses. This endpoint can be used as a reference of available services on the Cloudflare network, and their service IDs.",
+    description: "Bring-Your-Own IP (BYOIP) prefixes onboarded to Cloudflare must be bound to a service running on the Cloudflare network to enable a Cloudflare product on the IP addresses. This endpoint can be used as a reference of available services on the Cloudflare network, and their service IDs.\n\nGET /accounts/{account_id}/addressing/services",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/addressing_account_identifier",
-          "description": "Identifier of a Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "addressing_account_identifier": addressing_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -45,10 +49,10 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "id": {
-                    "$ref": "#/$defs/addressing_service_identifier"
+                    "type": "string"
                   },
                   "name": {
-                    "$ref": "#/$defs/addressing_service_name"
+                    "type": "string"
                   }
                 },
                 "type": "object"
@@ -60,10 +64,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_service_identifier": addressing_service_identifier_output,
-        "addressing_service_name": addressing_service_name_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_messages": addressing_messages,
       },
     },
     annotations: {
@@ -94,10 +96,10 @@ export const tools: readonly Tool[] = [
                   "items": {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/addressing_service_identifier"
+                        "type": "string"
                       },
                       "name": {
-                        "$ref": "#/$defs/addressing_service_name"
+                        "type": "string"
                       }
                     },
                     "type": "object"
@@ -114,11 +116,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "addressing_api-response-common": addressing_api_response_common_output,
-        "addressing_api-response-common-failure": addressing_api_response_common_failure_output,
-        "addressing_messages": addressing_messages_output,
-        "addressing_service_identifier": addressing_service_identifier_output,
-        "addressing_service_name": addressing_service_name_output,
+        "addressing_api-response-common": addressing_api$$response$$common,
+        "addressing_api-response-common-failure": addressing_api$$response$$common$$failure,
+        "addressing_messages": addressing_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/agentMemory/tools.ts b/src/generated/forge-mcp/agentMemory/tools.ts
index af1fa81e9..6004a3e27 100644
--- a/src/generated/forge-mcp/agentMemory/tools.ts
+++ b/src/generated/forge-mcp/agentMemory/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 
 /**
- * The tools of `agent_memory`.
+ * The tools of `agentMemory`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "agent_memory_create_namespace",
+    name: "agentMemory_createNamespace",
     title: "Create a namespace",
-    description: "Creates a new memory namespace owned by the account.\n\nThis method is beta.",
+    description: "Creates a new memory namespace owned by the account.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/agent-memory/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "name": {
@@ -29,12 +25,26 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -340,35 +350,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_delete_memory",
+    name: "agentMemory_deleteMemory",
     title: "Delete a memory",
-    description: "Deletes a memory by ID. Removes the memory and any source messages linked to it. Returns the deleted memory.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the memory and any source messages linked to it.",
+    description: "Deletes a memory by ID. Removes the memory and any source messages linked to it. Returns the deleted memory.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the memory and any source messages linked to it.\n\nDELETE /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}/memories/{memory_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "memory_id": {
-          "description": "Memory Identifier.",
-          "type": "string"
-        },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "memory_id": {
+              "description": "Memory Identifier.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name",
+            "memory_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name",
-        "memory_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -723,25 +743,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_delete_namespace",
+    name: "agentMemory_deleteNamespace",
     title: "Delete a namespace",
-    description: "Deletes a namespace.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the namespace along with all memory profiles, memories, and sessions it contains.",
+    description: "Deletes a namespace.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the namespace along with all memory profiles, memories, and sessions it contains.\n\nDELETE /accounts/{account_id}/agent-memory/namespaces/{namespace_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1016,30 +1046,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_delete_profile",
+    name: "agentMemory_deleteProfile",
     title: "Delete a profile",
-    description: "Marks a profile for deletion.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the profile along with all of its memories and messages.",
+    description: "Marks a profile for deletion.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the profile along with all of its memories and messages.\n\nDELETE /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1314,35 +1354,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_delete_session",
+    name: "agentMemory_deleteSession",
     title: "Delete a session",
-    description: "Marks all memories and messages in a profile that are tagged with the given session ID for deletion.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes all memories and messages tagged with this session ID.",
+    description: "Marks all memories and messages in a profile that are tagged with the given session ID for deletion.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes all memories and messages tagged with this session ID.\n\nDELETE /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}/sessions/{session_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Session identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Session identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1617,35 +1667,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_get_memory",
+    name: "agentMemory_getMemory",
     title: "Get a memory",
-    description: "Retrieves a memory by ID.\n\nThis method is beta.",
+    description: "Retrieves a memory by ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}/memories/{memory_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "memory_id": {
-          "description": "Memory Identifier.",
-          "type": "string"
-        },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "memory_id": {
+              "description": "Memory Identifier.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name",
+            "memory_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name",
-        "memory_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2000,25 +2060,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_get_namespace",
+    name: "agentMemory_getNamespace",
     title: "Get a namespace",
-    description: "Gets a namespace by name.\n\nThis method is beta.",
+    description: "Gets a namespace by name.\n\nThis method is beta.\n\nGET /accounts/{account_id}/agent-memory/namespaces/{namespace_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2323,16 +2393,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_ingest",
+    name: "agentMemory_ingest",
     title: "Ingest messages",
-    description: "Processes a conversation and extracts structured memories from it. Agent Memory identifies facts, events, instructions, and tasks automatically.\n\nThis method is beta.",
+    description: "Processes a conversation and extracts structured memories from it. Agent Memory identifies facts, events, instructions, and tasks automatically.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}/ingest",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "messages": {
@@ -2383,21 +2449,35 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2673,52 +2753,68 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_list_memories",
+    name: "agentMemory_listMemories",
     title: "List memories",
-    description: "List memories stored in a profile.\n\nThis method is beta.",
+    description: "List memories stored in a profile.\n\nThis method is beta.\n\nGET /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}/memories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Continuation cursor for paginated results.",
-          "type": "string"
-        },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Session identifier for filtering.",
-          "type": "string"
-        },
-        "type": {
-          "description": "Memory type for filtering.",
-          "enum": [
-            "fact",
-            "event",
-            "instruction",
-            "task"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Continuation cursor for paginated results.",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "session_id": {
+              "description": "Session identifier for filtering.",
+              "type": "string"
+            },
+            "type": {
+              "description": "Memory type for filtering.",
+              "enum": [
+                "fact",
+                "event",
+                "instruction",
+                "task"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3097,52 +3193,68 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/agent-memory/namespaces/${pathParam(args, "namespace_name")}/profiles/${pathParam(args, "profile_name")}/memories`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["cursor", args["cursor"], true],
-        ["session_id", args["session_id"], true],
-        ["type", args["type"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["session_id", param(args, "query", "session_id"), true],
+        ["type", param(args, "query", "type"), true],
       ],
     }),
   },
   {
-    name: "agent_memory_list_namespaces",
+    name: "agentMemory_listNamespaces",
     title: "List namespaces",
-    description: "Lists all namespaces for the given account. Results are paginated.\n\nThis method is beta.",
+    description: "Lists all namespaces for the given account. Results are paginated.\n\nThis method is beta.\n\nGET /accounts/{account_id}/agent-memory/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor returned by a previous list response.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to sort the results in.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to order the results by.",
-          "enum": [
-            "id",
-            "name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor returned by a previous list response.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to sort the results in.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to order the results by.",
+              "enum": [
+                "id",
+                "name"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3479,41 +3591,57 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/agent-memory/namespaces`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["cursor", args["cursor"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
-    name: "agent_memory_list_profiles",
+    name: "agentMemory_listProfiles",
     title: "List profiles",
-    description: "Lists the profiles of a namespace, ordered by name. A profile appears once it has been used.\n\nThis method is beta.",
+    description: "Lists the profiles of a namespace, ordered by name. A profile appears once it has been used.\n\nThis method is beta.\n\nGET /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque continuation cursor returned by a previous list response.",
-          "type": "string"
-        },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque continuation cursor returned by a previous list response.",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3832,22 +3960,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/agent-memory/namespaces/${pathParam(args, "namespace_name")}/profiles`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["cursor", args["cursor"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
-    name: "agent_memory_recall",
+    name: "agentMemory_recall",
     title: "Recall memories",
-    description: "Retrieves memories relevant to the query and returns a synthesized answer.\n\nThis method is beta.",
+    description: "Retrieves memories relevant to the query and returns a synthesized answer.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}/recall",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "query": {
@@ -3882,21 +4006,35 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -4248,16 +4386,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_remember",
+    name: "agentMemory_remember",
     title: "Remember a memory",
-    description: "Stores a single memory explicitly.\n\nThis method is beta.",
+    description: "Stores a single memory explicitly.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}/remember",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "content": {
@@ -4281,21 +4415,35 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -4651,16 +4799,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "agent_memory_summary",
+    name: "agentMemory_summary",
     title: "Get a profile summary",
-    description: "Generates a paste-ready prompt block summarizing everything stored in a memory profile.\n\nThis method is beta.",
+    description: "Generates a paste-ready prompt block summarizing everything stored in a memory profile.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/agent-memory/namespaces/{namespace_name}/profiles/{profile_name}/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "sessionId": {
@@ -4677,21 +4821,35 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "namespace_name": {
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "profile_name": {
-          "description": "Profile name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare Account ID.",
+              "type": "string"
+            },
+            "namespace_name": {
+              "description": "Namespace name.",
+              "type": "string"
+            },
+            "profile_name": {
+              "description": "Profile name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_name",
+            "profile_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_name",
-        "profile_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/ai/authors/tools.ts b/src/generated/forge-mcp/ai/authors/tools.ts
index 667d89110..8810f76f1 100644
--- a/src/generated/forge-mcp/ai/authors/tools.ts
+++ b/src/generated/forge-mcp/ai/authors/tools.ts
@@ -10,17 +10,27 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_authors_list",
     title: "Author Search",
-    description: "Searches Workers AI models by author or organization name.",
+    description: "Searches Workers AI models by author or organization name.\n\nGET /accounts/{account_id}/ai/authors/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/ai/finetunes/assets/tools.ts b/src/generated/forge-mcp/ai/finetunes/assets/tools.ts
index 8c50c0d9f..461dc5383 100644
--- a/src/generated/forge-mcp/ai/finetunes/assets/tools.ts
+++ b/src/generated/forge-mcp/ai/finetunes/assets/tools.ts
@@ -10,21 +10,31 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_finetunes_assets_create",
     title: "Upload a Finetune Asset",
-    description: "Uploads training data assets for a Workers AI fine-tuning job.",
+    description: "Uploads training data assets for a Workers AI fine-tuning job.\n\nPOST /accounts/{account_id}/ai/finetunes/{finetune_id}/finetune-assets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "finetune_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "finetune_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finetune_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finetune_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -102,25 +112,35 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_finetunes_assets_download",
     title: "Download a Finetune Asset",
-    description: "Returns a pre-signed R2 URL for downloading a finetune asset file.",
+    description: "Returns a pre-signed R2 URL for downloading a finetune asset file.\n\nGET /accounts/{account_id}/ai/finetunes/{finetune_id}/finetune-assets/{file_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "file_name": {
-          "type": "string"
-        },
-        "finetune_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "file_name": {
+              "type": "string"
+            },
+            "finetune_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finetune_id",
+            "file_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finetune_id",
-        "file_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/ai/finetunes/public/tools.ts b/src/generated/forge-mcp/ai/finetunes/public/tools.ts
index eb80902d3..fbde8626b 100644
--- a/src/generated/forge-mcp/ai/finetunes/public/tools.ts
+++ b/src/generated/forge-mcp/ai/finetunes/public/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `ai.finetunes.public`.
@@ -10,31 +10,47 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_finetunes_public_list",
     title: "List Public Finetunes",
-    description: "Lists publicly available fine-tuned models that can be used with Workers AI.",
+    description: "Lists publicly available fine-tuned models that can be used with Workers AI.\n\nGET /accounts/{account_id}/ai/finetunes/public",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "limit": {
-          "default": 20,
-          "description": "Pagination Limit.",
-          "type": "number"
-        },
-        "offset": {
-          "default": 0,
-          "description": "Pagination Offset.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "order_by": {
-          "description": "Order By Column Name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 20,
+              "description": "Pagination Limit.",
+              "type": "number"
+            },
+            "offset": {
+              "default": 0,
+              "description": "Pagination Offset.",
+              "type": "number"
+            },
+            "orderBy": {
+              "description": "Order By Column Name.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -203,9 +219,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai/finetunes/public`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["orderBy", args["order_by"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ai/finetunes/tools.ts b/src/generated/forge-mcp/ai/finetunes/tools.ts
index 8e5665b5e..82f00e0fb 100644
--- a/src/generated/forge-mcp/ai/finetunes/tools.ts
+++ b/src/generated/forge-mcp/ai/finetunes/tools.ts
@@ -10,13 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_finetunes_create",
     title: "Create a new Finetune",
-    description: "Creates a new fine-tuning job for a Workers AI model using custom training data.",
+    description: "Creates a new fine-tuning job for a Workers AI model using custom training data.\n\nPOST /accounts/{account_id}/ai/finetunes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -38,11 +35,24 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -197,21 +207,31 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_finetunes_delete",
     title: "Delete a Finetune",
-    description: "Delete a finetune. Any in-flight requests referencing the lora will fail after the files are deleted.",
+    description: "Delete a finetune. Any in-flight requests referencing the lora will fail after the files are deleted.\n\nDELETE /accounts/{account_id}/ai/finetunes/{finetune_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "finetune_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "finetune_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finetune_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finetune_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -320,17 +340,27 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_finetunes_list",
     title: "List Finetunes",
-    description: "Lists all fine-tuning jobs created by the account, including status and metrics.",
+    description: "Lists all fine-tuning jobs created by the account, including status and metrics.\n\nGET /accounts/{account_id}/ai/finetunes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/ai/models/tools.ts b/src/generated/forge-mcp/ai/models/tools.ts
index c9d118117..df370faaf 100644
--- a/src/generated/forge-mcp/ai/models/tools.ts
+++ b/src/generated/forge-mcp/ai/models/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `ai.models`.
@@ -10,61 +10,77 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_models_list",
     title: "Model Search",
-    description: "Searches Workers AI models by name or description.",
+    description: "Searches Workers AI models by name or description.\n\nGET /accounts/{account_id}/ai/models/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "author": {
-          "default": "",
-          "description": "Filter by Author.",
-          "type": "string"
-        },
-        "format": {
-          "description": "If set, return models in the requested marketplace format instead of the default response.",
-          "enum": [
-            "openrouter"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "hide_experimental": {
-          "default": false,
-          "description": "Filter to hide experimental models.",
-          "type": "boolean"
-        },
-        "include_deprecated": {
-          "default": false,
-          "description": "If true, include models for up to three months after their deprecation date. Defaults to false.",
-          "type": "boolean"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 100,
-          "type": "integer"
-        },
-        "search": {
-          "default": "",
-          "description": "Search.",
-          "type": "string"
-        },
-        "source": {
-          "description": "Filter by Source Id.",
-          "type": "number"
+          "type": "object"
         },
-        "task": {
-          "default": "",
-          "description": "Filter by Task Name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "author": {
+              "default": "",
+              "description": "Filter by Author.",
+              "type": "string"
+            },
+            "format": {
+              "description": "If set, return models in the requested marketplace format instead of the default response.",
+              "enum": [
+                "openrouter"
+              ],
+              "type": "string"
+            },
+            "hide_experimental": {
+              "default": false,
+              "description": "Filter to hide experimental models.",
+              "type": "boolean"
+            },
+            "include_deprecated": {
+              "default": false,
+              "description": "If true, include models for up to three months after their deprecation date. Defaults to false.",
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "type": "integer"
+            },
+            "search": {
+              "default": "",
+              "description": "Search.",
+              "type": "string"
+            },
+            "source": {
+              "description": "Filter by Source Id.",
+              "type": "number"
+            },
+            "task": {
+              "default": "",
+              "description": "Filter by Task Name.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "anyOf": [
@@ -217,15 +233,15 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai/models/search`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
-        ["task", args["task"], true],
-        ["author", args["author"], true],
-        ["source", args["source"], true],
-        ["hide_experimental", args["hide_experimental"], true],
-        ["search", args["search"], true],
-        ["include_deprecated", args["include_deprecated"], true],
-        ["format", args["format"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
+        ["task", param(args, "query", "task"), true],
+        ["author", param(args, "query", "author"), true],
+        ["source", param(args, "query", "source"), true],
+        ["hide_experimental", param(args, "query", "hide_experimental"), true],
+        ["search", param(args, "query", "search"), true],
+        ["include_deprecated", param(args, "query", "include_deprecated"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ai/tasks/tools.ts b/src/generated/forge-mcp/ai/tasks/tools.ts
index 6478ad639..bced2f66a 100644
--- a/src/generated/forge-mcp/ai/tasks/tools.ts
+++ b/src/generated/forge-mcp/ai/tasks/tools.ts
@@ -10,17 +10,27 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_tasks_list",
     title: "Task Search",
-    description: "Searches Workers AI models by task type (e.g., text-generation, embeddings).",
+    description: "Searches Workers AI models by task type (e.g., text-generation, embeddings).\n\nGET /accounts/{account_id}/ai/tasks/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/ai/tools.ts b/src/generated/forge-mcp/ai/tools.ts
index b89228a34..8a4f42d9e 100644
--- a/src/generated/forge-mcp/ai/tools.ts
+++ b/src/generated/forge-mcp/ai/tools.ts
@@ -1,32 +1,51 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 
 /**
  * The tools of `ai`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_get_model_schema",
+    name: "ai_getModelSchema",
     title: "Get an AI model's input and output schemas",
-    description: "Retrieves the input and output JSON Schema definitions for an AI model. Use these definitions to determine the model-specific request fields and response format.",
+    description: "Retrieves the input and output JSON Schema definitions for an AI model. Use these definitions to determine the model-specific request fields and response format.\n\nGET /accounts/{account_id}/ai/models/schema",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID used for this AI model request.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID used for this AI model request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "model": {
-          "description": "AI model identifier, including its namespace and model name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "model": {
+              "description": "AI model identifier, including its namespace and model name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "model"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "model"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -209,25 +228,35 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai/models/schema`,
       query: [
-        ["model", args["model"], true],
+        ["model", param(args, "query", "model"), true],
       ],
     }),
   },
   {
-    name: "ai_list_markdown_supported_formats",
+    name: "ai_listMarkdownSupportedFormats",
     title: "List supported Markdown conversion formats",
-    description: "Lists the file extensions and MIME types accepted by Workers AI's Markdown conversion endpoint. Use this list to check whether a file can be converted before uploading it.",
+    description: "Lists the file extensions and MIME types accepted by Workers AI's Markdown conversion endpoint. Use this list to check whether a file can be converted before uploading it.\n\nGET /accounts/{account_id}/ai/tomarkdown/supported",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID used for this AI model request.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID used for this AI model request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -356,14 +385,10 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_run",
     title: "Run an AI model with request options",
-    description: "Runs an AI model using a JSON body containing model, input, and optional options fields. Unlike the model-specific URL endpoint, this endpoint takes the model identifier in the body and nests the model's inputs under input.\n\nUse options.extraHeaders to pass additional provider headers. Accepts Workers AI model identifiers and AI Gateway provider model identifiers.\n\nSee the [Workers AI model catalog](https://developers.cloudflare.com/workers-ai/models/) for Workers AI model inputs, or the provider's documentation for models accessed through AI Gateway.",
+    description: "Runs an AI model using a JSON body containing model, input, and optional options fields. Unlike the model-specific URL endpoint, this endpoint takes the model identifier in the body and nests the model's inputs under input.\n\nUse options.extraHeaders to pass additional provider headers. Accepts Workers AI model identifiers and AI Gateway provider model identifiers.\n\nSee the [Workers AI model catalog](https://developers.cloudflare.com/workers-ai/models/) for Workers AI model inputs, or the provider's documentation for models accessed through AI Gateway.\n\nPOST /accounts/{account_id}/ai/run",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID used for this AI model request.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "input": {
@@ -409,11 +434,25 @@ export const tools: readonly Tool[] = [
             "model"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID used for this AI model request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -539,16 +578,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_run_model",
+    name: "ai_runModel",
     title: "Run a Workers AI model",
-    description: "Runs the Workers AI model specified in the URL path. Send the model's inputs directly in the request body, without a model/input/options wrapper.\n\nAccepts model-specific JSON or binary input. The response format depends on the model and the requested output.\n\nSee the [model catalog](https://developers.cloudflare.com/workers-ai/models/) for supported models and their input formats.",
+    description: "Runs the Workers AI model specified in the URL path. Send the model's inputs directly in the request body, without a model/input/options wrapper.\n\nAccepts model-specific JSON or binary input. The response format depends on the model and the requested output.\n\nSee the [model catalog](https://developers.cloudflare.com/workers-ai/models/) for supported models and their input formats.\n\nPOST /accounts/{account_id}/ai/run/{model_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID used for this AI model request.",
-          "type": "string"
-        },
         "body": {
           "oneOf": [
             {
@@ -1339,15 +1374,29 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "model_name": {
-          "description": "Workers AI model identifier, including its namespace and model name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID used for this AI model request.",
+              "type": "string"
+            },
+            "model_name": {
+              "description": "Workers AI model identifier, including its namespace and model name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "model_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "model_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1868,20 +1917,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_to_markdown",
+    name: "ai_toMarkdown",
     title: "Convert uploaded files to Markdown",
-    description: "Converts files uploaded as multipart form data into Markdown using Workers AI. Returns a conversion result for each file. Use the supported-formats endpoint to check accepted file types.",
+    description: "Converts files uploaded as multipart form data into Markdown using Workers AI. Returns a conversion result for each file. Use the supported-formats endpoint to check accepted file types.\n\nPOST /accounts/{account_id}/ai/tomarkdown",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID used for this AI model request.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID used for this AI model request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2034,13 +2093,10 @@ export const tools: readonly Tool[] = [
   {
     name: "ai_websearch",
     title: "Search the web through AI Gateway",
-    description: "Run a web search through a configured AI Gateway.",
+    description: "Run a web search through a configured AI Gateway.\n\nPOST /accounts/{account_id}/ai/websearch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "byokAlias": {
@@ -2080,11 +2136,24 @@ export const tools: readonly Tool[] = [
             "query"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/aiAudit/robots/outputs.ts b/src/generated/forge-mcp/aiAudit/robots/outputs.ts
index 328337b5b..985ec520b 100644
--- a/src/generated/forge-mcp/aiAudit/robots/outputs.ts
+++ b/src/generated/forge-mcp/aiAudit/robots/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `ai-audit_api-response-common` in responses.
  */
-export const ai_audit_api_response_common_output: JsonSchema = {
+export const ai$$audit_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -36,7 +36,7 @@ export const ai_audit_api_response_common_output: JsonSchema = {
 /**
  * The schema of `ai-audit_api-response-common-failure` in responses.
  */
-export const ai_audit_api_response_common_failure_output: JsonSchema = {
+export const ai$$audit_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -79,7 +79,7 @@ export const ai_audit_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `ai-audit_api_message` in responses.
  */
-export const ai_audit_api_message_output: JsonSchema = {
+export const ai$$audit_api_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -98,7 +98,7 @@ export const ai_audit_api_message_output: JsonSchema = {
 /**
  * The schema of `ai-audit_bulk_robots_rules` in responses.
  */
-export const ai_audit_bulk_robots_rules_output: JsonSchema = {
+export const ai$$audit_bulk_robots_rules: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/ai-audit_robots_rules"
   },
@@ -108,7 +108,7 @@ export const ai_audit_bulk_robots_rules_output: JsonSchema = {
 /**
  * The schema of `ai-audit_content_signal` in responses.
  */
-export const ai_audit_content_signal_output: JsonSchema = {
+export const ai$$audit_content_signal: JsonSchema = {
   "properties": {
     "ai-input": {
       "enum": [
@@ -138,7 +138,7 @@ export const ai_audit_content_signal_output: JsonSchema = {
 /**
  * The schema of `ai-audit_robots_rules` in responses.
  */
-export const ai_audit_robots_rules_output: JsonSchema = {
+export const ai$$audit_robots_rules: JsonSchema = {
   "properties": {
     "sitemaps": {
       "items": {
@@ -165,7 +165,7 @@ export const ai_audit_robots_rules_output: JsonSchema = {
 /**
  * The schema of `ai-audit_user_agent_rules` in responses.
  */
-export const ai_audit_user_agent_rules_output: JsonSchema = {
+export const ai$$audit_user_agent_rules: JsonSchema = {
   "properties": {
     "allow": {
       "items": {
diff --git a/src/generated/forge-mcp/aiAudit/robots/tools.ts b/src/generated/forge-mcp/aiAudit/robots/tools.ts
index 4f438be1a..cdd165770 100644
--- a/src/generated/forge-mcp/aiAudit/robots/tools.ts
+++ b/src/generated/forge-mcp/aiAudit/robots/tools.ts
@@ -1,25 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  ai_audit_api_message_output,
-  ai_audit_api_response_common_failure_output,
-  ai_audit_api_response_common_output,
-  ai_audit_bulk_robots_rules_output,
-  ai_audit_content_signal_output,
-  ai_audit_robots_rules_output,
-  ai_audit_user_agent_rules_output,
+  ai$$audit_api$$response$$common,
+  ai$$audit_api$$response$$common$$failure,
+  ai$$audit_api_message,
+  ai$$audit_bulk_robots_rules,
+  ai$$audit_content_signal,
+  ai$$audit_robots_rules,
+  ai$$audit_user_agent_rules,
 } from "./outputs.js";
 
 /**
- * The tools of `ai_audit.robots`.
+ * The tools of `aiAudit.robots`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_audit_robots_bulk_get",
+    name: "aiAudit_robots_bulkGet",
     title: "Bulk get robots.txt rules",
-    description: "Fetches and parses robots.txt files for multiple domains within a zone in a single request. Each domain must belong to the specified zone. Results are keyed by hostname.",
+    description: "Fetches and parses robots.txt files for multiple domains within a zone in a single request. Each domain must belong to the specified zone. Results are keyed by hostname.\n\nPOST /zones/{zone_id}/ai-audit/robots/bulk",
     inputSchema: {
       type: "object",
       properties: {
@@ -30,15 +30,25 @@ export const tools: readonly Tool[] = [
           "maxItems": 25,
           "type": "array"
         },
-        "zone_id": {
-          "description": "Identifier of the zone.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -55,12 +65,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "ai-audit_api-response-common": ai_audit_api_response_common_output,
-        "ai-audit_api_message": ai_audit_api_message_output,
-        "ai-audit_bulk_robots_rules": ai_audit_bulk_robots_rules_output,
-        "ai-audit_content_signal": ai_audit_content_signal_output,
-        "ai-audit_robots_rules": ai_audit_robots_rules_output,
-        "ai-audit_user_agent_rules": ai_audit_user_agent_rules_output,
+        "ai-audit_api-response-common": ai$$audit_api$$response$$common,
+        "ai-audit_api_message": ai$$audit_api_message,
+        "ai-audit_bulk_robots_rules": ai$$audit_bulk_robots_rules,
+        "ai-audit_content_signal": ai$$audit_content_signal,
+        "ai-audit_robots_rules": ai$$audit_robots_rules,
+        "ai-audit_user_agent_rules": ai$$audit_user_agent_rules,
       },
     },
     annotations: {
@@ -118,13 +128,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "ai-audit_api-response-common": ai_audit_api_response_common_output,
-        "ai-audit_api-response-common-failure": ai_audit_api_response_common_failure_output,
-        "ai-audit_api_message": ai_audit_api_message_output,
-        "ai-audit_bulk_robots_rules": ai_audit_bulk_robots_rules_output,
-        "ai-audit_content_signal": ai_audit_content_signal_output,
-        "ai-audit_robots_rules": ai_audit_robots_rules_output,
-        "ai-audit_user_agent_rules": ai_audit_user_agent_rules_output,
+        "ai-audit_api-response-common": ai$$audit_api$$response$$common,
+        "ai-audit_api-response-common-failure": ai$$audit_api$$response$$common$$failure,
+        "ai-audit_api_message": ai$$audit_api_message,
+        "ai-audit_bulk_robots_rules": ai$$audit_bulk_robots_rules,
+        "ai-audit_content_signal": ai$$audit_content_signal,
+        "ai-audit_robots_rules": ai$$audit_robots_rules,
+        "ai-audit_user_agent_rules": ai$$audit_user_agent_rules,
       },
     },
     request: (args) => ({
@@ -133,24 +143,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_audit_robots_get",
+    name: "aiAudit_robots_get",
     title: "Get robots.txt rules",
-    description: "Fetches and parses the robots.txt file for a zone or a specific subdomain within the zone. Returns parsed user-agent rules, content signals, and sitemaps.",
+    description: "Fetches and parses the robots.txt file for a zone or a specific subdomain within the zone. Returns parsed user-agent rules, content signals, and sitemaps.\n\nGET /zones/{zone_id}/ai-audit/robots",
     inputSchema: {
       type: "object",
       properties: {
-        "subdomain": {
-          "description": "Optional subdomain to fetch robots.txt for. If omitted, fetches robots.txt for the zone apex domain.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "description": "Identifier of the zone.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain": {
+              "description": "Optional subdomain to fetch robots.txt for. If omitted, fetches robots.txt for the zone apex domain.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -167,11 +193,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "ai-audit_api-response-common": ai_audit_api_response_common_output,
-        "ai-audit_api_message": ai_audit_api_message_output,
-        "ai-audit_content_signal": ai_audit_content_signal_output,
-        "ai-audit_robots_rules": ai_audit_robots_rules_output,
-        "ai-audit_user_agent_rules": ai_audit_user_agent_rules_output,
+        "ai-audit_api-response-common": ai$$audit_api$$response$$common,
+        "ai-audit_api_message": ai$$audit_api_message,
+        "ai-audit_content_signal": ai$$audit_content_signal,
+        "ai-audit_robots_rules": ai$$audit_robots_rules,
+        "ai-audit_user_agent_rules": ai$$audit_user_agent_rules,
       },
     },
     annotations: {
@@ -226,18 +252,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "ai-audit_api-response-common": ai_audit_api_response_common_output,
-        "ai-audit_api-response-common-failure": ai_audit_api_response_common_failure_output,
-        "ai-audit_api_message": ai_audit_api_message_output,
-        "ai-audit_content_signal": ai_audit_content_signal_output,
-        "ai-audit_robots_rules": ai_audit_robots_rules_output,
-        "ai-audit_user_agent_rules": ai_audit_user_agent_rules_output,
+        "ai-audit_api-response-common": ai$$audit_api$$response$$common,
+        "ai-audit_api-response-common-failure": ai$$audit_api$$response$$common$$failure,
+        "ai-audit_api_message": ai$$audit_api_message,
+        "ai-audit_content_signal": ai$$audit_content_signal,
+        "ai-audit_robots_rules": ai$$audit_robots_rules,
+        "ai-audit_user_agent_rules": ai$$audit_user_agent_rules,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/ai-audit/robots`,
       query: [
-        ["subdomain", args["subdomain"], true],
+        ["subdomain", param(args, "query", "subdomain"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/aiGateway/customDomains/tools.ts b/src/generated/forge-mcp/aiGateway/customDomains/tools.ts
index cb98b204c..300b0067f 100644
--- a/src/generated/forge-mcp/aiGateway/customDomains/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/customDomains/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.custom_domains`.
+ * The tools of `aiGateway.customDomains`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_custom_domains_create",
+    name: "aiGateway_customDomains_create",
     title: "Create a custom domain for a gateway",
-    description: "Provisions a Cloudflare-for-SaaS custom hostname and returns the CNAME target to point DNS at.",
+    description: "Provisions a Cloudflare-for-SaaS custom hostname and returns the CNAME target to point DNS at.\n\nPOST /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/custom-domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "domain": {
@@ -43,15 +40,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -224,29 +234,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_custom_domains_delete",
+    name: "aiGateway_customDomains_delete",
     title: "Delete a custom domain",
-    description: "Deletes a custom domain from an AI Gateway and removes its Cloudflare for SaaS custom hostname.\n\nConfirm with the user before calling this tool. This deletes the custom domain and its custom hostname. Requests to this hostname will stop reaching the gateway.",
+    description: "Deletes a custom domain from an AI Gateway and removes its Cloudflare for SaaS custom hostname.\n\nConfirm with the user before calling this tool. This deletes the custom domain and its custom hostname. Requests to this hostname will stop reaching the gateway.\n\nDELETE /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/custom-domains/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "hostname": {
-          "description": "Custom hostname that you own, such as `ai.example.com`.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "hostname": {
+              "description": "Custom hostname that you own, such as `ai.example.com`.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "hostname"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -426,29 +446,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_custom_domains_get",
+    name: "aiGateway_customDomains_get",
     title: "Get a custom domain",
-    description: "Retrieves a custom domain attached to an AI Gateway, including its status and CNAME target.",
+    description: "Retrieves a custom domain attached to an AI Gateway, including its status and CNAME target.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/custom-domains/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "hostname": {
-          "description": "Custom hostname that you own, such as `ai.example.com`.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "hostname": {
+              "description": "Custom hostname that you own, such as `ai.example.com`.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "hostname"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -629,46 +659,62 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_custom_domains_list",
+    name: "aiGateway_customDomains_list",
     title: "List custom domains",
-    description: "Lists the custom domains attached to an AI Gateway, including the certificate and validation status of each domain.",
+    description: "Lists the custom domains attached to an AI Gateway, including the certificate and validation status of each domain.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/custom-domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
-        },
-        "search": {
-          "description": "Search by hostname",
-          "type": "string"
-        },
-        "status": {
-          "enum": [
-            "initializing",
-            "pending_dcv",
-            "active",
-            "blocked",
-            "error"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search by hostname",
+              "type": "string"
+            },
+            "status": {
+              "enum": [
+                "initializing",
+                "pending_dcv",
+                "active",
+                "blocked",
+                "error"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -853,10 +899,10 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/custom-domains`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["status", args["status"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["status", param(args, "query", "status"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/aiGateway/customProviders/tools.ts b/src/generated/forge-mcp/aiGateway/customProviders/tools.ts
index 700ea43c7..6eb23e3f2 100644
--- a/src/generated/forge-mcp/aiGateway/customProviders/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/customProviders/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.custom_providers`.
+ * The tools of `aiGateway.customProviders`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_custom_providers_create",
+    name: "aiGateway_customProviders_create",
     title: "Create a custom provider",
-    description: "Creates an account-level custom provider that forwards AI Gateway requests to the HTTPS base URL you supply. Requests reference the provider as `custom-{slug}`, so the slug must be unique within the account.",
+    description: "Creates an account-level custom provider that forwards AI Gateway requests to the HTTPS base URL you supply. Requests reference the provider as `custom-{slug}`, so the slug must be unique within the account.\n\nPOST /accounts/{account_id}/ai-gateway/custom-providers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "base_url": {
@@ -60,11 +57,24 @@ export const tools: readonly Tool[] = [
             "slug"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -301,24 +311,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_custom_providers_delete",
+    name: "aiGateway_customProviders_delete",
     title: "Delete a custom provider",
-    description: "Deletes a custom provider and every pricing rule that belongs to it.\n\nConfirm with the user before calling this tool. This permanently deletes the custom provider and all of its pricing rules. Gateway requests that use `custom-{slug}` for this provider will stop routing.",
+    description: "Deletes a custom provider and every pricing rule that belongs to it.\n\nConfirm with the user before calling this tool. This permanently deletes the custom provider and all of its pricing rules. Gateway requests that use `custom-{slug}` for this provider will stop routing.\n\nDELETE /accounts/{account_id}/ai-gateway/custom-providers/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -530,24 +550,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_custom_providers_get",
+    name: "aiGateway_customProviders_get",
     title: "Get a custom provider",
-    description: "Retrieves a custom provider, including its slug, base URL, and custom headers.",
+    description: "Retrieves a custom provider, including its slug, base URL, and custom headers.\n\nGET /accounts/{account_id}/ai-gateway/custom-providers/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -760,37 +790,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_custom_providers_list",
+    name: "aiGateway_customProviders_list",
     title: "List custom providers",
-    description: "Lists the custom providers configured for the account, ordered by position and then name.",
+    description: "Lists the custom providers configured for the account, ordered by position and then name.\n\nGET /accounts/{account_id}/ai-gateway/custom-providers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "beta": {
-          "type": "boolean"
-        },
-        "enable": {
-          "type": "boolean"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Search by id, name, slug",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "beta": {
+              "type": "boolean"
+            },
+            "enable": {
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search by id, name, slug",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1007,24 +1053,21 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/custom-providers`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["beta", args["beta"], true],
-        ["enable", args["enable"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["beta", param(args, "query", "beta"), true],
+        ["enable", param(args, "query", "enable"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
-    name: "ai_gateway_custom_providers_update",
+    name: "aiGateway_customProviders_update",
     title: "Update a custom provider",
-    description: "Updates the specified fields of a custom provider. Changes clear cached entries for the provider.",
+    description: "Updates the specified fields of a custom provider. Changes clear cached entries for the provider.\n\nPATCH /accounts/{account_id}/ai-gateway/custom-providers/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "base_url": {
@@ -1067,15 +1110,28 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/aiGateway/datasets/tools.ts b/src/generated/forge-mcp/aiGateway/datasets/tools.ts
index 0873ef252..1bfc916b6 100644
--- a/src/generated/forge-mcp/aiGateway/datasets/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/datasets/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.datasets`.
+ * The tools of `aiGateway.datasets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_datasets_create",
+    name: "aiGateway_datasets_create",
     title: "Create a dataset (deprecated)",
-    description: "Creates a dataset that selects gateway logs matching the specified filters for use in evaluations. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Creates a dataset that selects gateway logs matching the specified filters for use in evaluations. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nPOST /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "enable": {
@@ -89,15 +86,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -375,28 +385,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_datasets_delete",
+    name: "aiGateway_datasets_delete",
     title: "Delete a dataset (deprecated)",
-    description: "Deletes a dataset. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Deletes a dataset. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nDELETE /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -666,28 +686,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_datasets_get",
+    name: "aiGateway_datasets_get",
     title: "Get a dataset (deprecated)",
-    description: "Retrieves a dataset and its log filters. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Retrieves a dataset and its log filters. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -958,42 +988,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_datasets_list",
+    name: "aiGateway_datasets_list",
     title: "List datasets (deprecated)",
-    description: "Lists the datasets defined for an AI Gateway. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Lists the datasets defined for an AI Gateway. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "enable": {
-          "type": "boolean"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Search by id, name, filters",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "enable": {
+              "type": "boolean"
+            },
+            "name": {
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search by id, name, filters",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1268,24 +1314,21 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/datasets`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["name", args["name"], true],
-        ["enable", args["enable"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["name", param(args, "query", "name"), true],
+        ["enable", param(args, "query", "enable"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
-    name: "ai_gateway_datasets_update",
+    name: "aiGateway_datasets_update",
     title: "Update a dataset (deprecated)",
-    description: "Replaces the name, log filters, and enabled state of a dataset. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Replaces the name, log filters, and enabled state of a dataset. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nPUT /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "enable": {
@@ -1358,19 +1401,32 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/aiGateway/dynamicRouting/deployments/tools.ts b/src/generated/forge-mcp/aiGateway/dynamicRouting/deployments/tools.ts
index c53c608af..5a9e98a1e 100644
--- a/src/generated/forge-mcp/aiGateway/dynamicRouting/deployments/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/dynamicRouting/deployments/tools.ts
@@ -4,19 +4,16 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.dynamic_routing.deployments`.
+ * The tools of `aiGateway.dynamicRouting.deployments`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_dynamic_routing_deployments_create",
+    name: "aiGateway_dynamicRouting_deployments_create",
     title: "Deploy a dynamic route version",
-    description: "Deploys the specified version of a dynamic route so that it serves traffic. Deploy an earlier version to roll back.\n\nThis method is beta.",
+    description: "Deploys the specified version of a dynamic route so that it serves traffic. Deploy an earlier version to roll back.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "version_id": {
@@ -28,18 +25,31 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -834,27 +844,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_dynamic_routing_deployments_list",
+    name: "aiGateway_dynamicRouting_deployments_list",
     title: "List dynamic route deployments",
-    description: "Lists the deployment history of a dynamic route.\n\nThis method is beta.",
+    description: "Lists the deployment history of a dynamic route.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/aiGateway/dynamicRouting/tools.ts b/src/generated/forge-mcp/aiGateway/dynamicRouting/tools.ts
index b8ca19b2c..5fcd7ced5 100644
--- a/src/generated/forge-mcp/aiGateway/dynamicRouting/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/dynamicRouting/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.dynamic_routing`.
+ * The tools of `aiGateway.dynamicRouting`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_dynamic_routing_create",
+    name: "aiGateway_dynamicRouting_create",
     title: "Create a dynamic route",
-    description: "Creates a dynamic route on an AI Gateway from the specified routing elements. Clients call the route by using `dynamic/{name}` as the model name.\n\nThis method is beta.",
+    description: "Creates a dynamic route on an AI Gateway from the specified routing elements. Clients call the route by using `dynamic/{name}` as the model name.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "elements": {
@@ -351,14 +348,27 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1255,27 +1265,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_dynamic_routing_delete",
+    name: "aiGateway_dynamicRouting_delete",
     title: "Delete a dynamic route",
-    description: "Deletes a dynamic route from an AI Gateway.\n\nThis method is beta.",
+    description: "Deletes a dynamic route from an AI Gateway.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2069,27 +2089,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_dynamic_routing_get",
+    name: "aiGateway_dynamicRouting_get",
     title: "Get a dynamic route",
-    description: "Retrieves a dynamic route with its routing elements, active version, and current deployment.\n\nThis method is beta.",
+    description: "Retrieves a dynamic route with its routing elements, active version, and current deployment.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2986,31 +3016,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_dynamic_routing_list",
+    name: "aiGateway_dynamicRouting_list",
     title: "List dynamic routes",
-    description: "Lists the dynamic routes configured on an AI Gateway.\n\nThis method is beta.",
+    description: "Lists the dynamic routes configured on an AI Gateway.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "type": "string"
-        },
-        "page": {
-          "description": "Page number",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of routes per page",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "description": "Page number",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of routes per page",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3967,21 +4013,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/routes`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "ai_gateway_dynamic_routing_update",
+    name: "aiGateway_dynamicRouting_update",
     title: "Rename a dynamic route",
-    description: "Updates the name of a dynamic route. To change routing behaviour, create and deploy a new version.\n\nThis method is beta.",
+    description: "Updates the name of a dynamic route. To change routing behaviour, create and deploy a new version.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "name": {
@@ -3993,18 +4036,31 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/aiGateway/dynamicRouting/versions/tools.ts b/src/generated/forge-mcp/aiGateway/dynamicRouting/versions/tools.ts
index 9a5a8ddaa..09fb95312 100644
--- a/src/generated/forge-mcp/aiGateway/dynamicRouting/versions/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/dynamicRouting/versions/tools.ts
@@ -4,19 +4,16 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.dynamic_routing.versions`.
+ * The tools of `aiGateway.dynamicRouting.versions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_dynamic_routing_versions_create",
+    name: "aiGateway_dynamicRouting_versions_create",
     title: "Create a dynamic route version",
-    description: "Creates a new version of a dynamic route from the specified routing elements. The version does not serve traffic until you deploy it.\n\nThis method is beta.",
+    description: "Creates a new version of a dynamic route from the specified routing elements. The version does not serve traffic until you deploy it.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "elements": {
@@ -347,18 +344,31 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1153,31 +1163,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_dynamic_routing_versions_get",
+    name: "aiGateway_dynamicRouting_versions_get",
     title: "Get a dynamic route version",
-    description: "Retrieves a saved version of a dynamic route, including its routing elements.\n\nThis method is beta.",
+    description: "Retrieves a saved version of a dynamic route, including its routing elements.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions/{version_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "version_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "version_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id",
+            "version_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id",
-        "version_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2008,27 +2028,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_dynamic_routing_versions_list",
+    name: "aiGateway_dynamicRouting_versions_list",
     title: "List dynamic route versions",
-    description: "Lists the saved versions of a dynamic route.\n\nThis method is beta.",
+    description: "Lists the saved versions of a dynamic route.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/aiGateway/evaluationTypes/tools.ts b/src/generated/forge-mcp/aiGateway/evaluationTypes/tools.ts
index 2608efa1d..c2c51fa1d 100644
--- a/src/generated/forge-mcp/aiGateway/evaluationTypes/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/evaluationTypes/tools.ts
@@ -1,46 +1,62 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.evaluation_types`.
+ * The tools of `aiGateway.evaluationTypes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_evaluation_types_list",
+    name: "aiGateway_evaluationTypes_list",
     title: "List evaluator types (deprecated)",
-    description: "Lists the evaluator types that evaluations can use to score AI Gateway responses. Evaluations are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Lists the evaluator types that evaluations can use to score AI Gateway responses. Evaluations are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/ai-gateway/evaluation-types",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "order_by": {
-          "default": "mandatory",
-          "type": "string"
-        },
-        "order_by_direction": {
-          "default": "desc",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "order_by": {
+              "default": "mandatory",
+              "type": "string"
+            },
+            "order_by_direction": {
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -265,10 +281,10 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/evaluation-types`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order_by", args["order_by"], true],
-        ["order_by_direction", args["order_by_direction"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["order_by_direction", param(args, "query", "order_by_direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/aiGateway/evaluations/tools.ts b/src/generated/forge-mcp/aiGateway/evaluations/tools.ts
index 92dfac6e8..108d933e6 100644
--- a/src/generated/forge-mcp/aiGateway/evaluations/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/evaluations/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.evaluations`.
+ * The tools of `aiGateway.evaluations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_evaluations_create",
+    name: "aiGateway_evaluations_create",
     title: "Create an evaluation (deprecated)",
-    description: "Creates an evaluation that scores the logs in a dataset with the specified evaluator types. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Creates an evaluation that scores the logs in a dataset with the specified evaluator types. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nPOST /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "dataset_ids": {
@@ -44,15 +41,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -526,28 +536,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_evaluations_delete",
+    name: "aiGateway_evaluations_delete",
     title: "Delete an evaluation (deprecated)",
-    description: "Deletes an evaluation and its results. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Deletes an evaluation and its results. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nDELETE /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1013,28 +1033,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_evaluations_get",
+    name: "aiGateway_evaluations_get",
     title: "Get an evaluation (deprecated)",
-    description: "Retrieves an evaluation and its results. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Retrieves an evaluation and its results. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1501,42 +1531,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_evaluations_list",
+    name: "aiGateway_evaluations_list",
     title: "List evaluations (deprecated)",
-    description: "Lists the evaluations run on an AI Gateway. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.",
+    description: "Lists the evaluations run on an AI Gateway. Evaluations and datasets are deprecated and unavailable to new accounts.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
-        },
-        "processed": {
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Search by id, name",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "processed": {
+              "type": "boolean"
+            },
+            "search": {
+              "description": "Search by id, name",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2007,11 +2053,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/evaluations`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["name", args["name"], true],
-        ["processed", args["processed"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["name", param(args, "query", "name"), true],
+        ["processed", param(args, "query", "processed"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/aiGateway/gateways/providers/tools.ts b/src/generated/forge-mcp/aiGateway/gateways/providers/tools.ts
index 501bc0c2f..ff5de13b6 100644
--- a/src/generated/forge-mcp/aiGateway/gateways/providers/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/gateways/providers/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.gateways.providers`.
+ * The tools of `aiGateway.gateways.providers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_gateways_providers_create",
+    name: "aiGateway_gateways_providers_create",
     title: "Store a provider key",
-    description: "Stores an upstream AI provider API key for an AI Gateway in the Secrets Store configured on the gateway, with an optional rate limit. Pass `secret` to store a new key, or omit it to use an existing Secrets Store secret.",
+    description: "Stores an upstream AI provider API key for an AI Gateway in the Secrets Store configured on the gateway, with an optional rate limit. Pass `secret` to store a new key, or omit it to use an existing Secrets Store secret.\n\nPOST /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "alias": {
@@ -50,15 +47,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -270,28 +280,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_gateways_providers_delete",
+    name: "aiGateway_gateways_providers_delete",
     title: "Delete a provider key",
-    description: "Deletes a provider key configuration from an AI Gateway and deletes its secret from the Secrets Store.\n\nConfirm with the user before calling this tool. This deletes the stored provider key and its Secrets Store secret. Requests that rely on this key will stop authenticating with it.",
+    description: "Deletes a provider key configuration from an AI Gateway and deletes its secret from the Secrets Store.\n\nConfirm with the user before calling this tool. This deletes the stored provider key and its Secrets Store secret. Requests that rely on this key will stop authenticating with it.\n\nDELETE /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -495,28 +515,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_gateways_providers_get",
+    name: "aiGateway_gateways_providers_get",
     title: "Get a provider key",
-    description: "Retrieves a provider key configuration for an AI Gateway. The response shows a masked preview of the key, never the key itself.",
+    description: "Retrieves a provider key configuration for an AI Gateway. The response shows a masked preview of the key, never the key itself.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -717,32 +747,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_gateways_providers_list",
+    name: "aiGateway_gateways_providers_list",
     title: "List provider keys",
-    description: "Lists the provider keys stored for an AI Gateway. Responses show a masked preview of each key, never the key itself.",
+    description: "Lists the provider keys stored for an AI Gateway. Responses show a masked preview of each key, never the key itself.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -947,21 +993,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/provider_configs`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "ai_gateway_gateways_providers_update",
+    name: "aiGateway_gateways_providers_update",
     title: "Rotate a provider key",
-    description: "Replaces the stored API key of a provider key configuration. Only the key can change.",
+    description: "Replaces the stored API key of a provider key configuration. Only the key can change.\n\nPUT /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "secret": {
@@ -974,19 +1017,32 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/aiGateway/gateways/tools.ts b/src/generated/forge-mcp/aiGateway/gateways/tools.ts
index 300c92fda..fb64e7119 100644
--- a/src/generated/forge-mcp/aiGateway/gateways/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/gateways/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.gateways`.
+ * The tools of `aiGateway.gateways`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_gateways_create",
+    name: "aiGateway_gateways_create",
     title: "Create a gateway",
-    description: "Creates an AI Gateway in the account with the specified caching, rate limiting, logging, and authentication settings. The gateway ID appears in request URLs and must be unique within the account.",
+    description: "Creates an AI Gateway in the account with the specified caching, rate limiting, logging, and authentication settings. The gateway ID appears in request URLs and must be unique within the account.\n\nPOST /accounts/{account_id}/ai-gateway/gateways",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "authentication": {
@@ -730,11 +727,24 @@ export const tools: readonly Tool[] = [
             "rate_limiting_limit"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2312,24 +2322,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_gateways_delete",
+    name: "aiGateway_gateways_delete",
     title: "Delete a gateway",
-    description: "Permanently deletes an AI Gateway, its configuration, and its stored logs.\n\nConfirm with the user before calling this tool. This permanently deletes the gateway, its configuration, and its stored logs. Requests sent to this gateway will fail. This action cannot be undone.",
+    description: "Permanently deletes an AI Gateway, its configuration, and its stored logs.\n\nConfirm with the user before calling this tool. This permanently deletes the gateway, its configuration, and its stored logs. Requests sent to this gateway will fail. This action cannot be undone.\n\nDELETE /accounts/{account_id}/ai-gateway/gateways/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3932,28 +3952,38 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "id")}`,
     }),
   },
   {
-    name: "ai_gateway_gateways_get",
+    name: "aiGateway_gateways_get",
     title: "Get a gateway",
-    description: "Retrieves the configuration of an AI Gateway.",
+    description: "Retrieves the configuration of an AI Gateway.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5557,32 +5587,42 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "id")}`,
     }),
   },
   {
-    name: "ai_gateway_gateways_get_url",
+    name: "aiGateway_gateways_getUrl",
     title: "Get Gateway URL",
-    description: "Retrieves the endpoint URL for an AI Gateway.\n\nThis method is beta.",
+    description: "Retrieves the endpoint URL for an AI Gateway.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/url/{provider}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "ai_gateway_provider": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "provider": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "provider"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "ai_gateway_provider"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5675,35 +5715,51 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/url/${pathParam(args, "ai_gateway_provider")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/url/${pathParam(args, "provider")}`,
     }),
   },
   {
-    name: "ai_gateway_gateways_list",
+    name: "aiGateway_gateways_list",
     title: "List gateways",
-    description: "Lists the AI Gateways in the account. Use `search` to filter by gateway ID.",
+    description: "Lists the AI Gateways in the account. Use `search` to filter by gateway ID.\n\nGET /accounts/{account_id}/ai-gateway/gateways",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Search by id",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search by id",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -7285,22 +7341,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
-    name: "ai_gateway_gateways_update",
+    name: "aiGateway_gateways_update",
     title: "Update a gateway",
-    description: "Updates the configuration of an AI Gateway, such as its caching, rate limiting, logging, and authentication settings.",
+    description: "Updates the configuration of an AI Gateway, such as its caching, rate limiting, logging, and authentication settings.\n\nPUT /accounts/{account_id}/ai-gateway/gateways/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "authentication": {
@@ -8010,15 +8063,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -9621,7 +9687,7 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "id")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
diff --git a/src/generated/forge-mcp/aiGateway/logs/tools.ts b/src/generated/forge-mcp/aiGateway/logs/tools.ts
index 8b0a20667..5d809871c 100644
--- a/src/generated/forge-mcp/aiGateway/logs/tools.ts
+++ b/src/generated/forge-mcp/aiGateway/logs/tools.ts
@@ -1,132 +1,148 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_gateway.logs`.
+ * The tools of `aiGateway.logs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_gateway_logs_delete",
+    name: "aiGateway_logs_delete",
     title: "Delete Gateway Logs",
-    description: "Deletes gateway log entries matching the specified criteria.\n\nConfirm with the user before calling this tool. This permanently deletes every stored log entry on the gateway that matches the filters. Deleted logs cannot be recovered.",
+    description: "Deletes gateway log entries matching the specified criteria.\n\nConfirm with the user before calling this tool. This permanently deletes every stored log entry on the gateway that matches the filters. Deleted logs cannot be recovered.\n\nDELETE /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
+          ],
+          "type": "object"
         },
-        "filters": {
-          "items": {
-            "properties": {
-              "key": {
-                "enum": [
-                  "id",
-                  "created_at",
-                  "request_content_type",
-                  "response_content_type",
-                  "request_type",
-                  "success",
-                  "cached",
-                  "provider",
-                  "model",
-                  "model_type",
-                  "cost",
-                  "tokens",
-                  "tokens_in",
-                  "tokens_out",
-                  "duration",
-                  "feedback",
-                  "event_id",
-                  "metadata.key",
-                  "metadata.value",
-                  "authentication",
-                  "wholesale",
-                  "compatibilityMode",
-                  "dlp_action",
-                  "user_agent"
-                ],
-                "type": "string"
-              },
-              "operator": {
-                "enum": [
-                  "eq",
-                  "neq",
-                  "contains",
-                  "lt",
-                  "gt"
-                ],
-                "type": "string"
-              },
-              "value": {
-                "description": "Filter values.",
-                "items": {
-                  "anyOf": [
-                    {
-                      "type": "string"
-                    },
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "filters": {
+              "items": {
+                "properties": {
+                  "key": {
+                    "enum": [
+                      "id",
+                      "created_at",
+                      "request_content_type",
+                      "response_content_type",
+                      "request_type",
+                      "success",
+                      "cached",
+                      "provider",
+                      "model",
+                      "model_type",
+                      "cost",
+                      "tokens",
+                      "tokens_in",
+                      "tokens_out",
+                      "duration",
+                      "feedback",
+                      "event_id",
+                      "metadata.key",
+                      "metadata.value",
+                      "authentication",
+                      "wholesale",
+                      "compatibilityMode",
+                      "dlp_action",
+                      "user_agent"
+                    ],
+                    "type": "string"
+                  },
+                  "operator": {
+                    "enum": [
+                      "eq",
+                      "neq",
+                      "contains",
+                      "lt",
+                      "gt"
+                    ],
+                    "type": "string"
+                  },
+                  "value": {
+                    "description": "Filter values.",
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "boolean"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
                     },
-                    {
-                      "type": "null"
-                    }
-                  ]
+                    "type": "array"
+                  }
                 },
-                "type": "array"
-              }
+                "required": [
+                  "key",
+                  "operator",
+                  "value"
+                ],
+                "type": "object"
+              },
+              "type": "array"
             },
-            "required": [
-              "key",
-              "operator",
-              "value"
-            ],
-            "type": "object"
+            "limit": {
+              "default": 10000,
+              "type": "integer"
+            },
+            "order_by": {
+              "default": "created_at",
+              "enum": [
+                "created_at",
+                "provider",
+                "model",
+                "model_type",
+                "success",
+                "cached",
+                "cost",
+                "tokens_in",
+                "tokens_out",
+                "duration",
+                "feedback"
+              ],
+              "type": "string"
+            },
+            "order_by_direction": {
+              "default": "asc",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "limit": {
-          "default": 10000,
-          "type": "integer"
-        },
-        "order_by": {
-          "default": "created_at",
-          "enum": [
-            "created_at",
-            "provider",
-            "model",
-            "model_type",
-            "success",
-            "cached",
-            "cost",
-            "tokens_in",
-            "tokens_out",
-            "duration",
-            "feedback"
-          ],
-          "type": "string"
-        },
-        "order_by_direction": {
-          "default": "asc",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -212,36 +228,46 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/logs`,
       query: [
-        ["order_by", args["order_by"], true],
-        ["order_by_direction", args["order_by_direction"], true],
-        ["filters", args["filters"], true],
-        ["limit", args["limit"], true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["order_by_direction", param(args, "query", "order_by_direction"), true],
+        ["filters", param(args, "query", "filters"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
-    name: "ai_gateway_logs_get",
+    name: "aiGateway_logs_get",
     title: "Get Gateway Log Detail",
-    description: "Retrieves detailed information for a specific AI Gateway log entry.",
+    description: "Retrieves detailed information for a specific AI Gateway log entry.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -574,28 +600,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_logs_get_request",
+    name: "aiGateway_logs_getRequest",
     title: "Get Gateway Log Request",
-    description: "Retrieves the original request payload for an AI Gateway log entry.",
+    description: "Retrieves the original request payload for an AI Gateway log entry.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/request",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "type": "object",
@@ -668,28 +704,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_logs_get_response",
+    name: "aiGateway_logs_getResponse",
     title: "Get Gateway Log Response",
-    description: "Retrieves the response payload for an AI Gateway log entry.",
+    description: "Retrieves the response payload for an AI Gateway log entry.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/response",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "type": "object",
@@ -762,206 +808,222 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_gateway_logs_list",
+    name: "aiGateway_logs_list",
     title: "List Gateway Logs",
-    description: "Lists request/response log entries for the AI gateway with filtering and pagination.",
+    description: "Lists request/response log entries for the AI gateway with filtering and pagination.\n\nGET /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "ai_gateway_provider": {
-          "type": "string"
-        },
-        "cached": {
-          "type": "boolean"
-        },
-        "direction": {
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "end_date": {
-          "format": "date-time",
-          "type": "string"
-        },
-        "feedback": {
-          "enum": [
-            -1,
-            0,
-            1
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id"
           ],
-          "type": "integer"
+          "type": "object"
         },
-        "filters": {
-          "items": {
-            "properties": {
-              "key": {
-                "enum": [
-                  "id",
-                  "created_at",
-                  "request_content_type",
-                  "response_content_type",
-                  "request_type",
-                  "success",
-                  "cached",
-                  "provider",
-                  "model",
-                  "model_type",
-                  "cost",
-                  "tokens",
-                  "tokens_in",
-                  "tokens_out",
-                  "duration",
-                  "feedback",
-                  "event_id",
-                  "metadata.key",
-                  "metadata.value",
-                  "authentication",
-                  "wholesale",
-                  "compatibilityMode",
-                  "dlp_action",
-                  "user_agent"
-                ],
-                "type": "string"
-              },
-              "operator": {
-                "enum": [
-                  "eq",
-                  "neq",
-                  "contains",
-                  "lt",
-                  "gt"
-                ],
-                "type": "string"
-              },
-              "value": {
-                "description": "Filter values.",
-                "items": {
-                  "anyOf": [
-                    {
-                      "type": "string"
-                    },
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cached": {
+              "type": "boolean"
+            },
+            "direction": {
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "end_date": {
+              "format": "date-time",
+              "type": "string"
+            },
+            "feedback": {
+              "enum": [
+                -1,
+                0,
+                1
+              ],
+              "type": "integer"
+            },
+            "filters": {
+              "items": {
+                "properties": {
+                  "key": {
+                    "enum": [
+                      "id",
+                      "created_at",
+                      "request_content_type",
+                      "response_content_type",
+                      "request_type",
+                      "success",
+                      "cached",
+                      "provider",
+                      "model",
+                      "model_type",
+                      "cost",
+                      "tokens",
+                      "tokens_in",
+                      "tokens_out",
+                      "duration",
+                      "feedback",
+                      "event_id",
+                      "metadata.key",
+                      "metadata.value",
+                      "authentication",
+                      "wholesale",
+                      "compatibilityMode",
+                      "dlp_action",
+                      "user_agent"
+                    ],
+                    "type": "string"
+                  },
+                  "operator": {
+                    "enum": [
+                      "eq",
+                      "neq",
+                      "contains",
+                      "lt",
+                      "gt"
+                    ],
+                    "type": "string"
+                  },
+                  "value": {
+                    "description": "Filter values.",
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "boolean"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
                     },
-                    {
-                      "type": "null"
-                    }
-                  ]
+                    "type": "array"
+                  }
                 },
-                "type": "array"
-              }
+                "required": [
+                  "key",
+                  "operator",
+                  "value"
+                ],
+                "type": "object"
+              },
+              "type": "array"
             },
-            "required": [
-              "key",
-              "operator",
-              "value"
-            ],
-            "type": "object"
+            "max_cost": {
+              "type": "number"
+            },
+            "max_duration": {
+              "type": "number"
+            },
+            "max_tokens_in": {
+              "type": "number"
+            },
+            "max_tokens_out": {
+              "type": "number"
+            },
+            "max_total_tokens": {
+              "type": "number"
+            },
+            "meta_info": {
+              "type": "boolean"
+            },
+            "min_cost": {
+              "type": "number"
+            },
+            "min_duration": {
+              "type": "number"
+            },
+            "min_tokens_in": {
+              "type": "number"
+            },
+            "min_tokens_out": {
+              "type": "number"
+            },
+            "min_total_tokens": {
+              "type": "number"
+            },
+            "model": {
+              "description": "Model filter.",
+              "type": "string"
+            },
+            "model_type": {
+              "type": "string"
+            },
+            "order_by": {
+              "default": "created_at",
+              "enum": [
+                "created_at",
+                "provider",
+                "model",
+                "model_type",
+                "success",
+                "cached"
+              ],
+              "type": "string"
+            },
+            "order_by_direction": {
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "provider": {
+              "type": "string"
+            },
+            "request_content_type": {
+              "type": "string"
+            },
+            "response_content_type": {
+              "type": "string"
+            },
+            "search": {
+              "description": "Free-text search over log metadata.",
+              "type": "string"
+            },
+            "start_date": {
+              "format": "date-time",
+              "type": "string"
+            },
+            "success": {
+              "type": "boolean"
+            }
           },
-          "type": "array"
-        },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "max_cost": {
-          "type": "number"
-        },
-        "max_duration": {
-          "type": "number"
-        },
-        "max_tokens_in": {
-          "type": "number"
-        },
-        "max_tokens_out": {
-          "type": "number"
-        },
-        "max_total_tokens": {
-          "type": "number"
-        },
-        "meta_info": {
-          "type": "boolean"
-        },
-        "min_cost": {
-          "type": "number"
-        },
-        "min_duration": {
-          "type": "number"
-        },
-        "min_tokens_in": {
-          "type": "number"
-        },
-        "min_tokens_out": {
-          "type": "number"
-        },
-        "min_total_tokens": {
-          "type": "number"
-        },
-        "model": {
-          "description": "Model filter.",
-          "type": "string"
-        },
-        "model_type": {
-          "type": "string"
-        },
-        "order_by": {
-          "default": "created_at",
-          "enum": [
-            "created_at",
-            "provider",
-            "model",
-            "model_type",
-            "success",
-            "cached"
-          ],
-          "type": "string"
-        },
-        "order_by_direction": {
-          "default": "desc",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
-        },
-        "request_content_type": {
-          "type": "string"
-        },
-        "response_content_type": {
-          "type": "string"
-        },
-        "search": {
-          "description": "Free-text search over log metadata.",
-          "type": "string"
-        },
-        "start_date": {
-          "format": "date-time",
-          "type": "string"
-        },
-        "success": {
-          "type": "boolean"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1330,47 +1392,44 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-gateway/gateways/${pathParam(args, "gateway_id")}/logs`,
       query: [
-        ["search", args["search"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order_by", args["order_by"], true],
-        ["order_by_direction", args["order_by_direction"], true],
-        ["filters", args["filters"], true],
-        ["meta_info", args["meta_info"], true],
-        ["direction", args["direction"], true],
-        ["start_date", args["start_date"], true],
-        ["end_date", args["end_date"], true],
-        ["min_cost", args["min_cost"], true],
-        ["max_cost", args["max_cost"], true],
-        ["min_tokens_in", args["min_tokens_in"], true],
-        ["max_tokens_in", args["max_tokens_in"], true],
-        ["min_tokens_out", args["min_tokens_out"], true],
-        ["max_tokens_out", args["max_tokens_out"], true],
-        ["min_total_tokens", args["min_total_tokens"], true],
-        ["max_total_tokens", args["max_total_tokens"], true],
-        ["min_duration", args["min_duration"], true],
-        ["max_duration", args["max_duration"], true],
-        ["feedback", args["feedback"], true],
-        ["success", args["success"], true],
-        ["cached", args["cached"], true],
-        ["model", args["model"], true],
-        ["model_type", args["model_type"], true],
-        ["provider", args["ai_gateway_provider"], true],
-        ["request_content_type", args["request_content_type"], true],
-        ["response_content_type", args["response_content_type"], true],
+        ["search", param(args, "query", "search"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["order_by_direction", param(args, "query", "order_by_direction"), true],
+        ["filters", param(args, "query", "filters"), true],
+        ["meta_info", param(args, "query", "meta_info"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["start_date", param(args, "query", "start_date"), true],
+        ["end_date", param(args, "query", "end_date"), true],
+        ["min_cost", param(args, "query", "min_cost"), true],
+        ["max_cost", param(args, "query", "max_cost"), true],
+        ["min_tokens_in", param(args, "query", "min_tokens_in"), true],
+        ["max_tokens_in", param(args, "query", "max_tokens_in"), true],
+        ["min_tokens_out", param(args, "query", "min_tokens_out"), true],
+        ["max_tokens_out", param(args, "query", "max_tokens_out"), true],
+        ["min_total_tokens", param(args, "query", "min_total_tokens"), true],
+        ["max_total_tokens", param(args, "query", "max_total_tokens"), true],
+        ["min_duration", param(args, "query", "min_duration"), true],
+        ["max_duration", param(args, "query", "max_duration"), true],
+        ["feedback", param(args, "query", "feedback"), true],
+        ["success", param(args, "query", "success"), true],
+        ["cached", param(args, "query", "cached"), true],
+        ["model", param(args, "query", "model"), true],
+        ["model_type", param(args, "query", "model_type"), true],
+        ["provider", param(args, "query", "provider"), true],
+        ["request_content_type", param(args, "query", "request_content_type"), true],
+        ["response_content_type", param(args, "query", "response_content_type"), true],
       ],
     }),
   },
   {
-    name: "ai_gateway_logs_update",
+    name: "aiGateway_logs_update",
     title: "Patch Gateway Log",
-    description: "Updates metadata for an AI Gateway log entry.",
+    description: "Updates metadata for an AI Gateway log entry.\n\nPATCH /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "feedback": {
@@ -1419,19 +1478,32 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "gateway_id": {
-          "description": "Unique identifier of the AI Gateway within the account.",
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "gateway_id": {
+              "description": "Unique identifier of the AI Gateway within the account.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gateway_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gateway_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/aiSearch/items/tools.ts b/src/generated/forge-mcp/aiSearch/items/tools.ts
index de9e2181b..d0b116a98 100644
--- a/src/generated/forge-mcp/aiSearch/items/tools.ts
+++ b/src/generated/forge-mcp/aiSearch/items/tools.ts
@@ -1,49 +1,65 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_search.items`.
+ * The tools of `aiSearch.items`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_search_items_chunks",
+    name: "aiSearch_items_chunks",
     title: "List Item Chunks.",
-    description: "Lists chunks for a specific item in an AI Search instance, including their text content.\n\nThis method is beta.",
+    description: "Lists chunks for a specific item in an AI Search instance, including their text content.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items/{item_id}/chunks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "item_id": {
-          "type": "string"
-        },
-        "limit": {
-          "default": 20,
-          "type": "integer"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "item_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "item_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 20,
+              "type": "integer"
+            },
+            "offset": {
+              "default": 0,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "item_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -372,42 +388,52 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items/${pathParam(args, "item_id")}/chunks`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items/${pathParam(args, "item_id")}/chunks`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
   {
-    name: "ai_search_items_delete",
+    name: "aiSearch_items_delete",
     title: "Delete Item.",
-    description: "Deletes a file from a managed AI Search instance and removes its indexed data.\n\nThis method is beta.",
+    description: "Deletes a file from a managed AI Search instance and removes its indexed data.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items/{item_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "item_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "item_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "item_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "item_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -651,38 +677,48 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items/${pathParam(args, "item_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items/${pathParam(args, "item_id")}`,
     }),
   },
   {
-    name: "ai_search_items_download",
+    name: "aiSearch_items_download",
     title: "Download Item Content.",
-    description: "Downloads the raw file content for a specific item from the managed AI Search instance storage.\n\nThis method is beta.",
+    description: "Downloads the raw file content for a specific item from the managed AI Search instance storage.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items/{item_id}/download",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "item_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "item_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "item_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "item_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -932,38 +968,48 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items/${pathParam(args, "item_id")}/download`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items/${pathParam(args, "item_id")}/download`,
     }),
   },
   {
-    name: "ai_search_items_get",
+    name: "aiSearch_items_get",
     title: "Get Item.",
-    description: "Retrieves a specific indexed item from an AI Search instance.\n\nThis method is beta.",
+    description: "Retrieves a specific indexed item from an AI Search instance.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items/{item_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "item_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "item_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "item_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "item_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1334,81 +1380,97 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items/${pathParam(args, "item_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items/${pathParam(args, "item_id")}`,
     }),
   },
   {
-    name: "ai_search_items_list",
+    name: "aiSearch_items_list",
     title: "Items List.",
-    description: "Lists indexed items in an AI Search instance.\n\nThis method is beta.",
+    description: "Lists indexed items in an AI Search instance.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "item_id": {
-          "description": "Return only the item with this unique ID. Returns at most one item.",
-          "type": "string"
-        },
-        "key": {
-          "description": "Return only items with this exact key (object key / filename). Each key is unique within a source, so combine with `source` to disambiguate across data sources.",
-          "type": "string"
-        },
-        "metadata_filter": {
-          "description": "JSON-encoded metadata filter using Vectorize filter syntax. Examples: {\"folder\":\"reports/\"}, {\"timestamp\":{\"$gte\":1700000000000}}, {\"folder\":{\"$in\":[\"docs/\",\"reports/\"]}}.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
-        },
-        "search": {
-          "type": "string"
-        },
-        "sort_by": {
-          "default": "status",
-          "description": "Sort order for items. \"status\" (default) sorts items according to status priority, then last_seen_at. \"modified_at\" sorts items according to file modification time (most recent first), falling back to created_at.",
-          "enum": [
-            "status",
-            "modified_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
           ],
-          "type": "string"
-        },
-        "source": {
-          "description": "Return only items with this source_id. Use \"builtin\" for uploaded files, or a source identifier like \"web-crawler:https://example.com\".",
-          "type": "string"
+          "type": "object"
         },
-        "status": {
-          "enum": [
-            "queued",
-            "running",
-            "completed",
-            "error",
-            "skipped",
-            "outdated"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "item_id": {
+              "description": "Return only the item with this unique ID. Returns at most one item.",
+              "type": "string"
+            },
+            "key": {
+              "description": "Return only items with this exact key (object key / filename). Each key is unique within a source, so combine with `source` to disambiguate across data sources.",
+              "type": "string"
+            },
+            "metadata_filter": {
+              "description": "JSON-encoded metadata filter using Vectorize filter syntax. Examples: {\"folder\":\"reports/\"}, {\"timestamp\":{\"$gte\":1700000000000}}, {\"folder\":{\"$in\":[\"docs/\",\"reports/\"]}}.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "search": {
+              "type": "string"
+            },
+            "sort_by": {
+              "default": "status",
+              "description": "Sort order for items. \"status\" (default) sorts items according to status priority, then last_seen_at. \"modified_at\" sorts items according to file modification time (most recent first), falling back to created_at.",
+              "enum": [
+                "status",
+                "modified_at"
+              ],
+              "type": "string"
+            },
+            "source": {
+              "description": "Return only items with this source_id. Use \"builtin\" for uploaded files, or a source identifier like \"web-crawler:https://example.com\".",
+              "type": "string"
+            },
+            "status": {
+              "enum": [
+                "queued",
+                "running",
+                "completed",
+                "error",
+                "skipped",
+                "outdated"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1861,56 +1923,72 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["sort_by", args["sort_by"], true],
-        ["status", args["status"], true],
-        ["source", args["source"], true],
-        ["metadata_filter", args["metadata_filter"], true],
-        ["item_id", args["item_id"], true],
-        ["key", args["key"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
+        ["status", param(args, "query", "status"), true],
+        ["source", param(args, "query", "source"), true],
+        ["metadata_filter", param(args, "query", "metadata_filter"), true],
+        ["item_id", param(args, "query", "item_id"), true],
+        ["key", param(args, "query", "key"), true],
       ],
     }),
   },
   {
-    name: "ai_search_items_logs",
+    name: "aiSearch_items_logs",
     title: "Item Logs.",
-    description: "Lists processing logs for a specific item in an AI Search instance.\n\nThis method is beta.",
+    description: "Lists processing logs for a specific item in an AI Search instance.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items/{item_id}/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "cursor": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "item_id": {
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "item_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "item_id"
+          ],
+          "type": "object"
         },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "limit": {
+              "default": 50,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "item_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2277,23 +2355,20 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items/${pathParam(args, "item_id")}/logs`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items/${pathParam(args, "item_id")}/logs`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
-    name: "ai_search_items_sync",
+    name: "aiSearch_items_sync",
     title: "Sync Item.",
-    description: "Synchronizes an item to an AI Search instance index.\n\nThis method is beta.",
+    description: "Synchronizes an item to an AI Search instance index.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items/{item_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "next_action": {
@@ -2313,25 +2388,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "item_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "item_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "item_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "item_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2822,35 +2910,45 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items/${pathParam(args, "item_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items/${pathParam(args, "item_id")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "ai_search_items_upload",
+    name: "aiSearch_items_upload",
     title: "Upload Item.",
-    description: "Uploads a file to a managed AI Search instance via multipart/form-data.\n\nThis method is beta.",
+    description: "Uploads a file to a managed AI Search instance via multipart/form-data.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3641,19 +3739,16 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items`,
     }),
   },
   {
-    name: "ai_search_items_upsert",
+    name: "aiSearch_items_upsert",
     title: "Create or Update Item.",
-    description: "Creates or updates an indexed item in an AI Search instance.\n\nThis method is beta.",
+    description: "Creates or updates an indexed item in an AI Search instance.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/items",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "key": {
@@ -3678,21 +3773,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -4206,7 +4314,7 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/items`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/items`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
diff --git a/src/generated/forge-mcp/aiSearch/jobs/tools.ts b/src/generated/forge-mcp/aiSearch/jobs/tools.ts
index 5a9f30bfb..8b74c6b75 100644
--- a/src/generated/forge-mcp/aiSearch/jobs/tools.ts
+++ b/src/generated/forge-mcp/aiSearch/jobs/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_search.jobs`.
+ * The tools of `aiSearch.jobs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_search_jobs_cancel",
+    name: "aiSearch_jobs_cancel",
     title: "Cancel an indexing job.",
-    description: "Cancels an in-progress indexing job for an AI Search instance.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation cancels the running indexing job.",
+    description: "Cancels an in-progress indexing job for an AI Search instance.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation cancels the running indexing job.\n\nPATCH /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/jobs/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "action": {
@@ -31,25 +28,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -285,20 +295,17 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/jobs/${pathParam(args, "job_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/jobs/${pathParam(args, "job_id")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "ai_search_jobs_create",
+    name: "aiSearch_jobs_create",
     title: "Create new job",
-    description: "Creates a new indexing job for an AI Search instance.\n\nThis method is beta.",
+    description: "Creates a new indexing job for an AI Search instance.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -307,21 +314,34 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -618,39 +638,49 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/jobs`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/jobs`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "ai_search_jobs_get",
+    name: "aiSearch_jobs_get",
     title: "Get a Job Details",
-    description: "Retrieves details for a specific AI Search indexing job.\n\nThis method is beta.",
+    description: "Retrieves details for a specific AI Search indexing job.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/jobs/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -849,42 +879,58 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/jobs/${pathParam(args, "job_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/jobs/${pathParam(args, "job_id")}`,
     }),
   },
   {
-    name: "ai_search_jobs_list",
+    name: "aiSearch_jobs_list",
     title: "List Jobs",
-    description: "Lists indexing jobs for an AI Search instance.\n\nThis method is beta.",
+    description: "Lists indexing jobs for an AI Search instance.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1174,50 +1220,66 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/jobs`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/jobs`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "ai_search_jobs_logs",
+    name: "aiSearch_jobs_logs",
     title: "List Job Logs",
-    description: "Lists log entries for an AI Search indexing job.\n\nThis method is beta.",
+    description: "Lists log entries for an AI Search indexing job.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/jobs/{job_id}/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id",
+            "job_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1488,10 +1550,10 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/jobs/${pathParam(args, "job_id")}/logs`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/jobs/${pathParam(args, "job_id")}/logs`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/aiSearch/namespace/tools.ts b/src/generated/forge-mcp/aiSearch/namespace/tools.ts
index 35555371c..378dd1fe4 100644
--- a/src/generated/forge-mcp/aiSearch/namespace/tools.ts
+++ b/src/generated/forge-mcp/aiSearch/namespace/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_search.namespace`.
+ * The tools of `aiSearch.namespace`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_search_namespace_create",
+    name: "aiSearch_namespace_create",
     title: "Create a namespace",
-    description: "Create a namespace for organizing AI Search instances.\n\nThis method is beta.",
+    description: "Create a namespace for organizing AI Search instances.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -134,11 +131,24 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -573,23 +583,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_search_namespace_delete",
+    name: "aiSearch_namespace_delete",
     title: "Delete a namespace",
-    description: "Deletes a namespace permanently. The namespace must not contain any instances (instances whose deletion is still in progress do not count), and the default namespace cannot be deleted.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the namespace.",
+    description: "Deletes a namespace permanently. The namespace must not contain any instances (instances whose deletion is still in progress do not count), and the default namespace cannot be deleted.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the namespace.\n\nDELETE /accounts/{account_id}/ai-search/namespaces/{name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -758,27 +778,37 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "name")}`,
     }),
   },
   {
-    name: "ai_search_namespace_get",
+    name: "aiSearch_namespace_get",
     title: "Get a namespace",
-    description: "Retrieve a namespace and its description.\n\nThis method is beta.",
+    description: "Retrieve a namespace and its description.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1141,37 +1171,53 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "name")}`,
     }),
   },
   {
-    name: "ai_search_namespace_list",
+    name: "aiSearch_namespace_list",
     title: "List namespaces",
-    description: "Lists namespaces in the account, including their descriptions and creation times.\n\nThis method is beta.",
+    description: "Lists namespaces in the account, including their descriptions and creation times.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number (1-indexed).",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Filter namespaces whose name or description contains this string (case-insensitive).",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number (1-indexed).",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Filter namespaces whose name or description contains this string (case-insensitive).",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1592,22 +1638,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
-    name: "ai_search_namespace_update",
+    name: "aiSearch_namespace_update",
     title: "Update a namespace",
-    description: "Updates the description and/or the public endpoint configuration of an existing namespace. The default namespace's description cannot be modified, but its public endpoint can.\n\nThis method is beta.",
+    description: "Updates the description and/or the public endpoint configuration of an existing namespace. The default namespace's description cannot be modified, but its public endpoint can.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/ai-search/namespaces/{name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -1727,14 +1770,27 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "namespace": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2163,7 +2219,7 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "name")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
diff --git a/src/generated/forge-mcp/aiSearch/tokens/tools.ts b/src/generated/forge-mcp/aiSearch/tokens/tools.ts
index f6346a842..5befbdd06 100644
--- a/src/generated/forge-mcp/aiSearch/tokens/tools.ts
+++ b/src/generated/forge-mcp/aiSearch/tokens/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `ai_search.tokens`.
+ * The tools of `aiSearch.tokens`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_search_tokens_create",
+    name: "aiSearch_tokens_create",
     title: "Create a token",
-    description: "Create a stored Cloudflare credential for an AI Search instance to access its data source.\n\nThis method is beta.",
+    description: "Create a stored Cloudflare credential for an AI Search instance to access its data source.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "cf_api_id": {
@@ -39,11 +36,24 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -267,24 +277,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_search_tokens_delete",
+    name: "aiSearch_tokens_delete",
     title: "Delete a token",
-    description: "Deletes a stored AI Search credential permanently. Credentials in use by an instance cannot be deleted.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the stored credential.",
+    description: "Deletes a stored AI Search credential permanently. Credentials in use by an instance cannot be deleted.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the stored credential.\n\nDELETE /accounts/{account_id}/ai-search/tokens/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "token_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "token_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -460,28 +480,38 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/tokens/${pathParam(args, "token_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/tokens/${pathParam(args, "id")}`,
     }),
   },
   {
-    name: "ai_search_tokens_get",
+    name: "aiSearch_tokens_get",
     title: "Get a token",
-    description: "Retrieve a stored AI Search credential without exposing its secret.\n\nThis method is beta.",
+    description: "Retrieve a stored AI Search credential without exposing its secret.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/tokens/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "token_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "token_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -730,37 +760,53 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/tokens/${pathParam(args, "token_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/tokens/${pathParam(args, "id")}`,
     }),
   },
   {
-    name: "ai_search_tokens_list",
+    name: "aiSearch_tokens_list",
     title: "List tokens",
-    description: "Lists stored AI Search credentials in the account without exposing their secrets.\n\nThis method is beta.",
+    description: "Lists stored AI Search credentials in the account without exposing their secrets.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number (1-indexed).",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Filter tokens whose name contains this string (case-insensitive).",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number (1-indexed).",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Filter tokens whose name contains this string (case-insensitive).",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1027,22 +1073,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-search/tokens`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
-    name: "ai_search_tokens_update",
+    name: "aiSearch_tokens_update",
     title: "Update a token",
-    description: "Replace a stored AI Search credential and invalidate cached credentials for instances that use it.\n\nThis method is beta.",
+    description: "Replace a stored AI Search credential and invalidate cached credentials for instances that use it.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/ai-search/tokens/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "cf_api_id": {
@@ -1066,15 +1109,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "token_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "token_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1328,7 +1384,7 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/tokens/${pathParam(args, "token_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/tokens/${pathParam(args, "id")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
diff --git a/src/generated/forge-mcp/aiSearch/tools.ts b/src/generated/forge-mcp/aiSearch/tools.ts
index 02addfbb5..4d0f0440a 100644
--- a/src/generated/forge-mcp/aiSearch/tools.ts
+++ b/src/generated/forge-mcp/aiSearch/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 
 /**
- * The tools of `ai_search`.
+ * The tools of `aiSearch`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_search_chat_completions",
+    name: "aiSearch_chatCompletions",
     title: "Chat Completions",
-    description: "Performs a chat completion request against an AI Search instance, using indexed content as context for generating responses.\n\nThis method is beta.",
+    description: "Performs a chat completion request against an AI Search instance, using indexed content as context for generating responses.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/chat/completions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "ai_search_options": {
@@ -292,21 +289,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1015,20 +1025,17 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/chat/completions`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/chat/completions`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "ai_search_create",
+    name: "aiSearch_create",
     title: "Create an AI Search instance.",
-    description: "Create a new AI Search instance with the given configuration. If type is omitted or null, a non-blank HTTP(S) source infers web-crawler and any other source infers r2; r2 sources must name an existing bucket. A missing or blank source without a type creates a managed upload-only instance.\n\nThis method is beta.",
+    description: "Create a new AI Search instance with the given configuration. If type is omitted or null, a non-blank HTTP(S) source infers web-crawler and any other source infers r2; r2 sources must name an existing bucket. A missing or blank source without a type creates a managed upload-only instance.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces/{namespace}/instances",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "ai_gateway_id": {
@@ -1584,16 +1591,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2959,29 +2979,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_search_delete",
+    name: "aiSearch_delete",
     title: "Delete an AI Search instance.",
-    description: "Deletes an AI Search instance and all its indexed data permanently.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the AI Search instance and all its indexed data.",
+    description: "Deletes an AI Search instance and all its indexed data permanently.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the AI Search instance and all its indexed data.\n\nDELETE /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -4223,33 +4253,43 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}`,
     }),
   },
   {
-    name: "ai_search_get",
+    name: "aiSearch_get",
     title: "Get an AI Search instance.",
-    description: "Retrieve the configuration and status of an AI Search instance.\n\nThis method is beta.",
+    description: "Retrieve the configuration and status of an AI Search instance.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5458,64 +5498,80 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}`,
     }),
   },
   {
-    name: "ai_search_list",
+    name: "aiSearch_list",
     title: "List AI Search instances.",
-    description: "Lists all AI Search instances in the account.\n\nThis method is beta.",
+    description: "Lists all AI Search instances in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "hostname": {
-          "description": "Return only instances with this exact Search for Agents hostname (case-insensitive).",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
-        },
-        "order_by": {
-          "default": "created_at",
-          "description": "Field to order results by.",
-          "enum": [
-            "created_at"
-          ],
-          "type": "string"
-        },
-        "order_by_direction": {
-          "default": "desc",
-          "description": "Order direction.",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number (1-indexed).",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
+          "type": "object"
         },
-        "search": {
-          "description": "Filter instances whose id contains this string (case-insensitive).",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "hostname": {
+              "description": "Return only instances with this exact Search for Agents hostname (case-insensitive).",
+              "type": "string"
+            },
+            "order_by": {
+              "default": "created_at",
+              "description": "Field to order results by.",
+              "enum": [
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "order_by_direction": {
+              "default": "desc",
+              "description": "Order direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number (1-indexed).",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Filter instances whose id contains this string (case-insensitive).",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -7086,25 +7142,22 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["hostname", args["hostname"], true],
-        ["order_by", args["order_by"], true],
-        ["order_by_direction", args["order_by_direction"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["hostname", param(args, "query", "hostname"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["order_by_direction", param(args, "query", "order_by_direction"), true],
       ],
     }),
   },
   {
-    name: "ai_search_move",
+    name: "aiSearch_move",
     title: "Move an instance to a different namespace.",
-    description: "Moves an instance from its current namespace to the specified target namespace. Use 'default' with --destination-namespace to move the instance back to the default namespace. Fails with 400 if the target namespace already has an instance with the same id (ids must be unique within a namespace — the same id can exist in different namespaces).",
+    description: "Moves an instance from its current namespace to the specified target namespace. Use 'default' with --destination-namespace to move the instance back to the default namespace. Fails with 400 if the target namespace already has an instance with the same id (ids must be unique within a namespace — the same id can exist in different namespaces).\n\nPATCH /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "new_namespace": {
@@ -7117,20 +7170,33 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "instance_id": {
-          "description": "Instance id.",
-          "type": "string"
-        },
-        "source_namespace": {
-          "description": "Current namespace of the instance.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Instance id.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Current namespace of the instance.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "source_namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -7331,20 +7397,17 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "source_namespace")}/instances/${pathParam(args, "instance_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "ai_search_multi_chat_completions",
+    name: "aiSearch_multiChatCompletions",
     title: "Multi-Instance Chat Completions",
-    description: "Performs a chat completion request against multiple AI Search instances in parallel, merging retrieved content as context for generating a response.\n\nThis method is beta.",
+    description: "Performs a chat completion request against multiple AI Search instances in parallel, merging retrieved content as context for generating a response.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces/{name}/chat/completions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "ai_search_options": {
@@ -7631,15 +7694,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace": {
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "name": {
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -8389,20 +8465,17 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/chat/completions`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "name")}/chat/completions`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "ai_search_multi_search",
+    name: "aiSearch_multiSearch",
     title: "Multi-Instance Search",
-    description: "Performs a semantic search query against multiple AI Search instances in parallel, merging the retrieved results into a single ranked response.\n\nThis method is beta.",
+    description: "Performs a semantic search query against multiple AI Search instances in parallel, merging the retrieved results into a single ranked response.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces/{name}/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "ai_search_options": {
@@ -8686,15 +8759,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace": {
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "name": {
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -9189,35 +9275,45 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/search`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "name")}/search`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "ai_search_purge_cache",
+    name: "aiSearch_purgeCache",
     title: "Purge search cache.",
-    description: "Purges all cached search results for an AI Search instance. A new internal cache key is generated, immediately orphaning all prior cached entries.\n\nThis method is beta.",
+    description: "Purges all cached search results for an AI Search instance. A new internal cache key is generated, immediately orphaning all prior cached entries.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/purge_cache",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -9343,19 +9439,16 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/purge_cache`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/purge_cache`,
     }),
   },
   {
-    name: "ai_search_search",
+    name: "aiSearch_search",
     title: "Search",
-    description: "Executes a semantic search query against an AI Search instance to find relevant indexed content.\n\nThis method is beta.",
+    description: "Executes a semantic search query against an AI Search instance to find relevant indexed content.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "ai_search_options": {
@@ -9626,21 +9719,34 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -10094,35 +10200,45 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/search`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/search`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "ai_search_stats",
+    name: "aiSearch_stats",
     title: "Get instance statistics.",
-    description: "Retrieve usage and indexing statistics for an AI Search instance.\n\nThis method is beta.",
+    description: "Retrieve usage and indexing statistics for an AI Search instance.\n\nThis method is beta.\n\nGET /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}/stats",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "AI Search instance ID. Lowercase alphanumeric, hyphens, and underscores.",
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -10367,19 +10483,16 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}/stats`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}/stats`,
     }),
   },
   {
-    name: "ai_search_update",
+    name: "aiSearch_update",
     title: "Update an AI Search instance.",
-    description: "Updates the configuration of an AI Search instance.\n\nThis method is beta.",
+    description: "Updates the configuration of an AI Search instance.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/ai-search/namespaces/{namespace}/instances/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "ai_gateway_id": {
@@ -10955,20 +11068,33 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "instance_id": {
-          "type": "string"
-        },
-        "namespace": {
-          "default": "default",
-          "description": "Namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "namespace": {
+              "default": "default",
+              "description": "Namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -12282,7 +12408,7 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "instance_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/ai-search/namespaces/${pathParam(args, "namespace")}/instances/${pathParam(args, "id")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
diff --git a/src/generated/forge-mcp/aiSecurity/customTopics/outputs.ts b/src/generated/forge-mcp/aiSecurity/customTopics/outputs.ts
index e14b13fd6..0090f90b2 100644
--- a/src/generated/forge-mcp/aiSecurity/customTopics/outputs.ts
+++ b/src/generated/forge-mcp/aiSecurity/customTopics/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `waf-product-api-bundle_custom-topic` in responses.
  */
-export const waf_product_api_bundle_custom_topic_output: JsonSchema = {
+export const waf$$product$$api$$bundle_custom$$topic: JsonSchema = {
   "properties": {
     "label": {
       "type": "string"
@@ -25,7 +25,7 @@ export const waf_product_api_bundle_custom_topic_output: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_custom-topics` in responses.
  */
-export const waf_product_api_bundle_custom_topics_output: JsonSchema = {
+export const waf$$product$$api$$bundle_custom$$topics: JsonSchema = {
   "properties": {
     "topics": {
       "items": {
@@ -41,7 +41,7 @@ export const waf_product_api_bundle_custom_topics_output: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_response-custom-topics` in responses.
  */
-export const waf_product_api_bundle_response_custom_topics_output: JsonSchema = {
+export const waf$$product$$api$$bundle_response$$custom$$topics: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-single"
diff --git a/src/generated/forge-mcp/aiSecurity/customTopics/schemas.ts b/src/generated/forge-mcp/aiSecurity/customTopics/schemas.ts
index ed09215fb..9805bdd0f 100644
--- a/src/generated/forge-mcp/aiSecurity/customTopics/schemas.ts
+++ b/src/generated/forge-mcp/aiSecurity/customTopics/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `waf-product-api-bundle_custom-topic`.
  */
-export const waf_product_api_bundle_custom_topic: JsonSchema = {
+export const waf$$product$$api$$bundle_custom$$topic: JsonSchema = {
   "properties": {
     "label": {
       "description": "Unique label identifier. Must contain only lowercase letters (a–z), digits (0–9), and hyphens.",
@@ -27,7 +27,7 @@ export const waf_product_api_bundle_custom_topic: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_custom-topics`.
  */
-export const waf_product_api_bundle_custom_topics: JsonSchema = {
+export const waf$$product$$api$$bundle_custom$$topics: JsonSchema = {
   "properties": {
     "topics": {
       "description": "Custom topic categories for AI Security for Apps content detection.",
diff --git a/src/generated/forge-mcp/aiSecurity/customTopics/tools.ts b/src/generated/forge-mcp/aiSecurity/customTopics/tools.ts
index f91475ff5..d9f7b0f18 100644
--- a/src/generated/forge-mcp/aiSecurity/customTopics/tools.ts
+++ b/src/generated/forge-mcp/aiSecurity/customTopics/tools.ts
@@ -3,54 +3,60 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  waf_product_api_bundle_api_response_common_output,
-  waf_product_api_bundle_api_response_single_output,
-  waf_product_api_bundle_messages_output,
+  waf$$product$$api$$bundle_api$$response$$common,
+  waf$$product$$api$$bundle_api$$response$$single,
+  waf$$product$$api$$bundle_messages,
 } from "../../outputs.js";
-import { waf_product_api_bundle_api_response_common_failure_3_output } from "../outputs.js";
-import { waf_product_api_bundle_zone_id } from "../schemas.js";
+import { waf$$product$$api$$bundle_api$$response$$common$$failure$$3 } from "../outputs.js";
 import {
-  waf_product_api_bundle_custom_topic_output,
-  waf_product_api_bundle_custom_topics_output,
-  waf_product_api_bundle_response_custom_topics_output,
+  waf$$product$$api$$bundle_custom$$topic,
+  waf$$product$$api$$bundle_custom$$topics,
+  waf$$product$$api$$bundle_response$$custom$$topics,
 } from "./outputs.js";
 import {
-  waf_product_api_bundle_custom_topic,
-  waf_product_api_bundle_custom_topics,
+  waf$$product$$api$$bundle_custom$$topic as waf$$product$$api$$bundle_custom$$topic$,
+  waf$$product$$api$$bundle_custom$$topics as waf$$product$$api$$bundle_custom$$topics$,
 } from "./schemas.js";
 
 /**
- * The tools of `ai_security.custom_topics`.
+ * The tools of `aiSecurity.customTopics`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_security_custom_topics_get",
+    name: "aiSecurity_customTopics_get",
     title: "Get the AI Security for Apps custom topics of a zone.",
-    description: "Get the custom topic categories defined for the zone. While AI Security for Apps is enabled, it scores every incoming prompt against these topics and writes the scores to the `cf.llm.prompt.custom_topic_categories` field, keyed by topic label. Topics can be configured while the detection is disabled, but no prompt is scored until you enable it.",
+    description: "Get the custom topic categories defined for the zone. While AI Security for Apps is enabled, it scores every incoming prompt against these topics and writes the scores to the `cf.llm.prompt.custom_topic_categories` field, keyed by topic label. Topics can be configured while the detection is disabled, but no prompt is scored until you enable it.\n\nGET /zones/{zone_id}/ai-security/custom-topics",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_zone_id",
-          "description": "Defines the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_zone_id": waf_product_api_bundle_zone_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-topics",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-topic": waf_product_api_bundle_custom_topic_output,
-        "waf-product-api-bundle_custom-topics": waf_product_api_bundle_custom_topics_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-topics": waf_product_api_bundle_response_custom_topics_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-topic": waf$$product$$api$$bundle_custom$$topic,
+        "waf-product-api-bundle_custom-topics": waf$$product$$api$$bundle_custom$$topics,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-topics": waf$$product$$api$$bundle_response$$custom$$topics,
       },
     },
     annotations: {
@@ -79,13 +85,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure-3": waf_product_api_bundle_api_response_common_failure_3_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-topic": waf_product_api_bundle_custom_topic_output,
-        "waf-product-api-bundle_custom-topics": waf_product_api_bundle_custom_topics_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-topics": waf_product_api_bundle_response_custom_topics_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure-3": waf$$product$$api$$bundle_api$$response$$common$$failure$$3,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-topic": waf$$product$$api$$bundle_custom$$topic,
+        "waf-product-api-bundle_custom-topics": waf$$product$$api$$bundle_custom$$topics,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-topics": waf$$product$$api$$bundle_response$$custom$$topics,
       },
     },
     request: (args) => ({
@@ -93,39 +99,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_security_custom_topics_update",
+    name: "aiSecurity_customTopics_update",
     title: "Update the AI Security for Apps custom topics of a zone.",
-    description: "Update the custom topic list of the zone, overwriting it entirely with the topics in the request, so include\nevery topic you want to keep. Changes can take up to a minute to propagate.\n\nEach entry has a `label`, used to reference the topic in rule expressions and analytics, and a `topic`\ndescription, which the classifier scores prompts against while AI Security for Apps is enabled. The following\nrules apply:\n\n- A zone can hold at most 20 topics.\n- `label` must be 2–20 characters, using only lowercase letters (a–z), digits (0–9), and hyphens.\n- `topic` must be 2–50 UTF-8 bytes. Text in any language is supported, including spaces, numbers,\n  punctuation, and symbols. Tabs, line breaks, invalid text, and invisible formatting characters are not allowed.\n- Labels must be unique within the zone, and so must topic descriptions.\n\nConfirm with the user before calling this tool. This operation overwrites the AI Security for Apps custom topics for a zone.",
+    description: "Update the custom topic list of the zone, overwriting it entirely with the topics in the request, so include\nevery topic you want to keep. Changes can take up to a minute to propagate.\n\nEach entry has a `label`, used to reference the topic in rule expressions and analytics, and a `topic`\ndescription, which the classifier scores prompts against while AI Security for Apps is enabled. The following\nrules apply:\n\n- A zone can hold at most 20 topics.\n- `label` must be 2–20 characters, using only lowercase letters (a–z), digits (0–9), and hyphens.\n- `topic` must be 2–50 UTF-8 bytes. Text in any language is supported, including spaces, numbers,\n  punctuation, and symbols. Tabs, line breaks, invalid text, and invisible formatting characters are not allowed.\n- Labels must be unique within the zone, and so must topic descriptions.\n\nConfirm with the user before calling this tool. This operation overwrites the AI Security for Apps custom topics for a zone.\n\nPUT /zones/{zone_id}/ai-security/custom-topics",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waf-product-api-bundle_custom-topics"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_zone_id",
-          "description": "Defines the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waf-product-api-bundle_custom-topic": waf_product_api_bundle_custom_topic,
-        "waf-product-api-bundle_custom-topics": waf_product_api_bundle_custom_topics,
-        "waf-product-api-bundle_zone_id": waf_product_api_bundle_zone_id,
+        "waf-product-api-bundle_custom-topic": waf$$product$$api$$bundle_custom$$topic$,
+        "waf-product-api-bundle_custom-topics": waf$$product$$api$$bundle_custom$$topics$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-topics",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-topic": waf_product_api_bundle_custom_topic_output,
-        "waf-product-api-bundle_custom-topics": waf_product_api_bundle_custom_topics_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-topics": waf_product_api_bundle_response_custom_topics_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-topic": waf$$product$$api$$bundle_custom$$topic,
+        "waf-product-api-bundle_custom-topics": waf$$product$$api$$bundle_custom$$topics,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-topics": waf$$product$$api$$bundle_response$$custom$$topics,
       },
     },
     annotations: {
@@ -154,13 +169,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure-3": waf_product_api_bundle_api_response_common_failure_3_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-topic": waf_product_api_bundle_custom_topic_output,
-        "waf-product-api-bundle_custom-topics": waf_product_api_bundle_custom_topics_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-topics": waf_product_api_bundle_response_custom_topics_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure-3": waf$$product$$api$$bundle_api$$response$$common$$failure$$3,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-topic": waf$$product$$api$$bundle_custom$$topic,
+        "waf-product-api-bundle_custom-topics": waf$$product$$api$$bundle_custom$$topics,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-topics": waf$$product$$api$$bundle_response$$custom$$topics,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/aiSecurity/outputs.ts b/src/generated/forge-mcp/aiSecurity/outputs.ts
index 2ed4f53c8..92ed0d2d2 100644
--- a/src/generated/forge-mcp/aiSecurity/outputs.ts
+++ b/src/generated/forge-mcp/aiSecurity/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../_/tool.js";
  * The schema of `waf-product-api-bundle_api-response-common-failure-3` in
  * responses.
  */
-export const waf_product_api_bundle_api_response_common_failure_3_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$common$$failure$$3: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/waf-product-api-bundle_messages"
@@ -37,7 +37,7 @@ export const waf_product_api_bundle_api_response_common_failure_3_output: JsonSc
 /**
  * The schema of `waf-product-api-bundle_response-settings` in responses.
  */
-export const waf_product_api_bundle_response_settings_output: JsonSchema = {
+export const waf$$product$$api$$bundle_response$$settings: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-single"
@@ -56,7 +56,7 @@ export const waf_product_api_bundle_response_settings_output: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_settings` in responses.
  */
-export const waf_product_api_bundle_settings_output: JsonSchema = {
+export const waf$$product$$api$$bundle_settings: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/aiSecurity/schemas.ts b/src/generated/forge-mcp/aiSecurity/schemas.ts
index 4b178b11d..d96985f95 100644
--- a/src/generated/forge-mcp/aiSecurity/schemas.ts
+++ b/src/generated/forge-mcp/aiSecurity/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `waf-product-api-bundle_settings`.
  */
-export const waf_product_api_bundle_settings: JsonSchema = {
+export const waf$$product$$api$$bundle_settings: JsonSchema = {
   "description": "AI Security for Apps enablement status for a zone.",
   "properties": {
     "enabled": {
@@ -16,11 +16,3 @@ export const waf_product_api_bundle_settings: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `waf-product-api-bundle_zone_id`.
- */
-export const waf_product_api_bundle_zone_id: JsonSchema = {
-  "description": "Defines the zone.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/aiSecurity/tools.ts b/src/generated/forge-mcp/aiSecurity/tools.ts
index 4d4e49d0e..31a124380 100644
--- a/src/generated/forge-mcp/aiSecurity/tools.ts
+++ b/src/generated/forge-mcp/aiSecurity/tools.ts
@@ -3,51 +3,55 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  waf_product_api_bundle_api_response_common_output,
-  waf_product_api_bundle_api_response_single_output,
-  waf_product_api_bundle_messages_output,
+  waf$$product$$api$$bundle_api$$response$$common,
+  waf$$product$$api$$bundle_api$$response$$single,
+  waf$$product$$api$$bundle_messages,
 } from "../outputs.js";
 import {
-  waf_product_api_bundle_api_response_common_failure_3_output,
-  waf_product_api_bundle_response_settings_output,
-  waf_product_api_bundle_settings_output,
+  waf$$product$$api$$bundle_api$$response$$common$$failure$$3,
+  waf$$product$$api$$bundle_response$$settings,
+  waf$$product$$api$$bundle_settings,
 } from "./outputs.js";
-import {
-  waf_product_api_bundle_settings,
-  waf_product_api_bundle_zone_id,
-} from "./schemas.js";
+import { waf$$product$$api$$bundle_settings as waf$$product$$api$$bundle_settings$ } from "./schemas.js";
 
 /**
- * The tools of `ai_security`.
+ * The tools of `aiSecurity`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ai_security_get",
+    name: "aiSecurity_get",
     title: "Get the AI Security for Apps status for a zone.",
-    description: "Get the current AI Security for Apps status for the zone. While enabled, Cloudflare scans prompts sent to endpoints labeled `cf-llm` for personally identifiable information, unsafe topics, and prompt injection attempts.",
+    description: "Get the current AI Security for Apps status for the zone. While enabled, Cloudflare scans prompts sent to endpoints labeled `cf-llm` for personally identifiable information, unsafe topics, and prompt injection attempts.\n\nGET /zones/{zone_id}/ai-security/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_zone_id",
-          "description": "Defines the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_zone_id": waf_product_api_bundle_zone_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-settings",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-settings": waf_product_api_bundle_response_settings_output,
-        "waf-product-api-bundle_settings": waf_product_api_bundle_settings_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-settings": waf$$product$$api$$bundle_response$$settings,
+        "waf-product-api-bundle_settings": waf$$product$$api$$bundle_settings,
       },
     },
     annotations: {
@@ -76,12 +80,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure-3": waf_product_api_bundle_api_response_common_failure_3_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-settings": waf_product_api_bundle_response_settings_output,
-        "waf-product-api-bundle_settings": waf_product_api_bundle_settings_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure-3": waf$$product$$api$$bundle_api$$response$$common$$failure$$3,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-settings": waf$$product$$api$$bundle_response$$settings,
+        "waf-product-api-bundle_settings": waf$$product$$api$$bundle_settings,
       },
     },
     request: (args) => ({
@@ -89,37 +93,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ai_security_update",
+    name: "aiSecurity_update",
     title: "Update the AI Security for Apps status for a zone.",
-    description: "Update the AI Security for Apps status for the zone, enabling or disabling the detection. The detection results are exposed as `cf.llm.prompt.*` fields for use in custom rules and rate limiting rules; changes can take up to a minute to propagate.\n\nConfirm with the user before calling this tool. This operation toggles AI Security for Apps for a zone.",
+    description: "Update the AI Security for Apps status for the zone, enabling or disabling the detection. The detection results are exposed as `cf.llm.prompt.*` fields for use in custom rules and rate limiting rules; changes can take up to a minute to propagate.\n\nConfirm with the user before calling this tool. This operation toggles AI Security for Apps for a zone.\n\nPUT /zones/{zone_id}/ai-security/settings",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waf-product-api-bundle_settings"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_zone_id",
-          "description": "Defines the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waf-product-api-bundle_settings": waf_product_api_bundle_settings,
-        "waf-product-api-bundle_zone_id": waf_product_api_bundle_zone_id,
+        "waf-product-api-bundle_settings": waf$$product$$api$$bundle_settings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-settings",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-settings": waf_product_api_bundle_response_settings_output,
-        "waf-product-api-bundle_settings": waf_product_api_bundle_settings_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-settings": waf$$product$$api$$bundle_response$$settings,
+        "waf-product-api-bundle_settings": waf$$product$$api$$bundle_settings,
       },
     },
     annotations: {
@@ -148,12 +161,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure-3": waf_product_api_bundle_api_response_common_failure_3_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-settings": waf_product_api_bundle_response_settings_output,
-        "waf-product-api-bundle_settings": waf_product_api_bundle_settings_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure-3": waf$$product$$api$$bundle_api$$response$$common$$failure$$3,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-settings": waf$$product$$api$$bundle_response$$settings,
+        "waf-product-api-bundle_settings": waf$$product$$api$$bundle_settings,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/alerting/availableAlerts/outputs.ts b/src/generated/forge-mcp/alerting/availableAlerts/outputs.ts
index 771b37663..04a6b64f5 100644
--- a/src/generated/forge-mcp/alerting/availableAlerts/outputs.ts
+++ b/src/generated/forge-mcp/alerting/availableAlerts/outputs.ts
@@ -6,19 +6,19 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `aaa_alert-types` in responses.
  */
-export const aaa_alert_types_output: JsonSchema = {
+export const aaa_alert$$types: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/aaa_description"
+      "type": "string"
     },
     "display_name": {
-      "$ref": "#/$defs/aaa_display_name"
+      "type": "string"
     },
     "filter_options": {
       "$ref": "#/$defs/aaa_filter_options"
     },
     "type": {
-      "$ref": "#/$defs/aaa_type"
+      "type": "string"
     }
   },
   "type": "object"
@@ -27,7 +27,7 @@ export const aaa_alert_types_output: JsonSchema = {
 /**
  * The schema of `aaa_alerts-response_collection` in responses.
  */
-export const aaa_alerts_response_collection_output: JsonSchema = {
+export const aaa_alerts$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-common-2"
@@ -49,33 +49,12 @@ export const aaa_alerts_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `aaa_description` in responses.
- */
-export const aaa_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_display_name` in responses.
- */
-export const aaa_display_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_filter_options` in responses.
  */
-export const aaa_filter_options_output: JsonSchema = {
+export const aaa_filter_options: JsonSchema = {
   "items": {
     "type": "object"
   },
   "type": "array"
 };
-
-/**
- * The schema of `aaa_type` in responses.
- */
-export const aaa_type_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/availableAlerts/tools.ts b/src/generated/forge-mcp/alerting/availableAlerts/tools.ts
index 577e9f8ff..2498d5415 100644
--- a/src/generated/forge-mcp/alerting/availableAlerts/tools.ts
+++ b/src/generated/forge-mcp/alerting/availableAlerts/tools.ts
@@ -3,54 +3,54 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  aaa_api_response_common_2_output,
-  aaa_api_response_common_failure_3_output,
-  aaa_messages_3_output,
+  aaa_api$$response$$common$$2,
+  aaa_api$$response$$common$$failure$$3,
+  aaa_messages$$3,
 } from "../outputs.js";
-import { aaa_account_id } from "../schemas.js";
 import {
-  aaa_alert_types_output,
-  aaa_alerts_response_collection_output,
-  aaa_description_output,
-  aaa_display_name_output,
-  aaa_filter_options_output,
-  aaa_type_output,
+  aaa_alert$$types,
+  aaa_alerts$$response_collection,
+  aaa_filter_options,
 } from "./outputs.js";
 
 /**
- * The tools of `alerting.available_alerts`.
+ * The tools of `alerting.availableAlerts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "alerting_available_alerts_list",
+    name: "alerting_availableAlerts_list",
     title: "Get Alert Types",
-    description: "Gets a list of all alert types for which an account is eligible.",
+    description: "Gets a list of all alert types for which an account is eligible.\n\nGET /accounts/{account_id}/alerting/v3/available_alerts",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_alerts-response_collection",
       $defs: {
-        "aaa_alert-types": aaa_alert_types_output,
-        "aaa_alerts-response_collection": aaa_alerts_response_collection_output,
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_description": aaa_description_output,
-        "aaa_display_name": aaa_display_name_output,
-        "aaa_filter_options": aaa_filter_options_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_type": aaa_type_output,
+        "aaa_alert-types": aaa_alert$$types,
+        "aaa_alerts-response_collection": aaa_alerts$$response_collection,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_filter_options": aaa_filter_options,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -81,15 +81,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_alert-types": aaa_alert_types_output,
-        "aaa_alerts-response_collection": aaa_alerts_response_collection_output,
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_description": aaa_description_output,
-        "aaa_display_name": aaa_display_name_output,
-        "aaa_filter_options": aaa_filter_options_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_type": aaa_type_output,
+        "aaa_alert-types": aaa_alert$$types,
+        "aaa_alerts-response_collection": aaa_alerts$$response_collection,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_filter_options": aaa_filter_options,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/alerting/destinations/eligible/outputs.ts b/src/generated/forge-mcp/alerting/destinations/eligible/outputs.ts
index d16bb8eb5..d070d42a5 100644
--- a/src/generated/forge-mcp/alerting/destinations/eligible/outputs.ts
+++ b/src/generated/forge-mcp/alerting/destinations/eligible/outputs.ts
@@ -6,39 +6,30 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `aaa_eligibility` in responses.
  */
-export const aaa_eligibility_output: JsonSchema = {
+export const aaa_eligibility: JsonSchema = {
   "properties": {
     "eligible": {
-      "$ref": "#/$defs/aaa_eligible"
+      "type": "boolean"
     },
     "ready": {
-      "$ref": "#/$defs/aaa_ready"
+      "type": "boolean"
     },
     "type": {
-      "$ref": "#/$defs/aaa_schemas-type"
+      "enum": [
+        "email",
+        "pagerduty",
+        "webhook"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `aaa_eligible` in responses.
- */
-export const aaa_eligible_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `aaa_ready` in responses.
- */
-export const aaa_ready_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `aaa_schemas-response_collection` in responses.
  */
-export const aaa_schemas_response_collection_output: JsonSchema = {
+export const aaa_schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-common-2"
@@ -59,15 +50,3 @@ export const aaa_schemas_response_collection_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `aaa_schemas-type` in responses.
- */
-export const aaa_schemas_type_output: JsonSchema = {
-  "enum": [
-    "email",
-    "pagerduty",
-    "webhook"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/destinations/eligible/tools.ts b/src/generated/forge-mcp/alerting/destinations/eligible/tools.ts
index 76b9b27b5..e10508606 100644
--- a/src/generated/forge-mcp/alerting/destinations/eligible/tools.ts
+++ b/src/generated/forge-mcp/alerting/destinations/eligible/tools.ts
@@ -3,17 +3,13 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  aaa_api_response_common_2_output,
-  aaa_api_response_common_failure_3_output,
-  aaa_messages_3_output,
+  aaa_api$$response$$common$$2,
+  aaa_api$$response$$common$$failure$$3,
+  aaa_messages$$3,
 } from "../../outputs.js";
-import { aaa_account_id } from "../../schemas.js";
 import {
-  aaa_eligibility_output,
-  aaa_eligible_output,
-  aaa_ready_output,
-  aaa_schemas_response_collection_output,
-  aaa_schemas_type_output,
+  aaa_eligibility,
+  aaa_schemas$$response_collection,
 } from "./outputs.js";
 
 /**
@@ -23,32 +19,36 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_eligible_get",
     title: "Get delivery mechanism eligibility",
-    description: "Get a list of all delivery mechanism types for which an account is eligible.",
+    description: "Get a list of all delivery mechanism types for which an account is eligible.\n\nGET /accounts/{account_id}/alerting/v3/destinations/eligible",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_schemas-response_collection",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_eligibility": aaa_eligibility_output,
-        "aaa_eligible": aaa_eligible_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_ready": aaa_ready_output,
-        "aaa_schemas-response_collection": aaa_schemas_response_collection_output,
-        "aaa_schemas-type": aaa_schemas_type_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_eligibility": aaa_eligibility,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_schemas-response_collection": aaa_schemas$$response_collection,
       },
     },
     annotations: {
@@ -70,14 +70,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_eligibility": aaa_eligibility_output,
-        "aaa_eligible": aaa_eligible_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_ready": aaa_ready_output,
-        "aaa_schemas-response_collection": aaa_schemas_response_collection_output,
-        "aaa_schemas-type": aaa_schemas_type_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_eligibility": aaa_eligibility,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_schemas-response_collection": aaa_schemas$$response_collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/alerting/destinations/pagerduty/outputs.ts b/src/generated/forge-mcp/alerting/destinations/pagerduty/outputs.ts
index 3a5ffcc49..35709a2c4 100644
--- a/src/generated/forge-mcp/alerting/destinations/pagerduty/outputs.ts
+++ b/src/generated/forge-mcp/alerting/destinations/pagerduty/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `aaa_components-schemas-response_collection` in responses.
  */
-export const aaa_components_schemas_response_collection_output: JsonSchema = {
+export const aaa_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-common-2"
@@ -25,23 +25,16 @@ export const aaa_components_schemas_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `aaa_name` in responses.
- */
-export const aaa_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_pagerduty` in responses.
  */
-export const aaa_pagerduty_output: JsonSchema = {
+export const aaa_pagerduty: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/aaa_uuid"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/aaa_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -50,7 +43,7 @@ export const aaa_pagerduty_output: JsonSchema = {
 /**
  * The schema of `aaa_sensitive_id_response` in responses.
  */
-export const aaa_sensitive_id_response_output: JsonSchema = {
+export const aaa_sensitive_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-single"
@@ -60,7 +53,7 @@ export const aaa_sensitive_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/aaa_token"
+              "type": "string"
             }
           },
           "type": "object"
@@ -70,10 +63,3 @@ export const aaa_sensitive_id_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `aaa_token` in responses.
- */
-export const aaa_token_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/destinations/pagerduty/schemas.ts b/src/generated/forge-mcp/alerting/destinations/pagerduty/schemas.ts
deleted file mode 100644
index bc67f58a8..000000000
--- a/src/generated/forge-mcp/alerting/destinations/pagerduty/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `aaa_integration-token`.
- */
-export const aaa_integration_token: JsonSchema = {
-  "description": "The token integration key",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/destinations/pagerduty/tools.ts b/src/generated/forge-mcp/alerting/destinations/pagerduty/tools.ts
index 4454b4f45..e31f4d810 100644
--- a/src/generated/forge-mcp/alerting/destinations/pagerduty/tools.ts
+++ b/src/generated/forge-mcp/alerting/destinations/pagerduty/tools.ts
@@ -3,22 +3,17 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  aaa_api_response_common_2_output,
-  aaa_api_response_common_failure_3_output,
-  aaa_api_response_single_output,
-  aaa_id_response_output,
-  aaa_messages_3_output,
-  aaa_uuid_output,
+  aaa_api$$response$$common$$2,
+  aaa_api$$response$$common$$failure$$3,
+  aaa_api$$response$$single,
+  aaa_id_response,
+  aaa_messages$$3,
 } from "../../outputs.js";
-import { aaa_account_id } from "../../schemas.js";
 import {
-  aaa_components_schemas_response_collection_output,
-  aaa_name_output,
-  aaa_pagerduty_output,
-  aaa_sensitive_id_response_output,
-  aaa_token_output,
+  aaa_components$$schemas$$response_collection,
+  aaa_pagerduty,
+  aaa_sensitive_id_response,
 } from "./outputs.js";
-import { aaa_integration_token } from "./schemas.js";
 
 /**
  * The tools of `alerting.destinations.pagerduty`.
@@ -27,29 +22,35 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_pagerduty_create",
     title: "Create PagerDuty integration token",
-    description: "Creates a new token for integrating with PagerDuty.",
+    description: "Creates a new token for integrating with PagerDuty.\n\nPOST /accounts/{account_id}/alerting/v3/destinations/pagerduty/connect",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_sensitive_id_response",
       $defs: {
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_sensitive_id_response": aaa_sensitive_id_response_output,
-        "aaa_token": aaa_token_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_sensitive_id_response": aaa_sensitive_id_response,
       },
     },
     annotations: {
@@ -84,13 +85,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_sensitive_id_response": aaa_sensitive_id_response_output,
-        "aaa_token": aaa_token_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_sensitive_id_response": aaa_sensitive_id_response,
       },
     },
     request: (args) => ({
@@ -100,27 +99,34 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_pagerduty_delete",
     title: "Delete PagerDuty Services",
-    description: "Deletes all the PagerDuty Services connected to the account.\n\nConfirm with the user before calling this tool. This operation deletes all PagerDuty services connected to the account.",
+    description: "Deletes all the PagerDuty Services connected to the account.\n\nConfirm with the user before calling this tool. This operation deletes all PagerDuty services connected to the account.\n\nDELETE /accounts/{account_id}/alerting/v3/destinations/pagerduty",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_api-response-common-2",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -148,9 +154,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
@@ -160,31 +166,36 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_pagerduty_get",
     title: "List PagerDuty services",
-    description: "Get a list of all configured PagerDuty services.",
+    description: "Get a list of all configured PagerDuty services.\n\nGET /accounts/{account_id}/alerting/v3/destinations/pagerduty",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_components-schemas-response_collection",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_components-schemas-response_collection": aaa_components_schemas_response_collection_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_name": aaa_name_output,
-        "aaa_pagerduty": aaa_pagerduty_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_components-schemas-response_collection": aaa_components$$schemas$$response_collection,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_pagerduty": aaa_pagerduty,
       },
     },
     annotations: {
@@ -221,13 +232,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_components-schemas-response_collection": aaa_components_schemas_response_collection_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_name": aaa_name_output,
-        "aaa_pagerduty": aaa_pagerduty_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_components-schemas-response_collection": aaa_components$$schemas$$response_collection,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_pagerduty": aaa_pagerduty,
       },
     },
     request: (args) => ({
@@ -237,35 +246,40 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_pagerduty_link",
     title: "Connect PagerDuty",
-    description: "Links PagerDuty with the account using the integration token.",
+    description: "Links PagerDuty with the account using the integration token.\n\nGET /accounts/{account_id}/alerting/v3/destinations/pagerduty/connect/{token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
-        "token_id": {
-          "$ref": "#/$defs/aaa_integration-token",
-          "description": "The token integration key"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "token_id": {
+              "description": "The token integration key",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "token_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_integration-token": aaa_integration_token,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_id_response",
       $defs: {
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -300,11 +314,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/alerting/destinations/webhooks/outputs.ts b/src/generated/forge-mcp/alerting/destinations/webhooks/outputs.ts
index c4b5a36de..9c1cc929a 100644
--- a/src/generated/forge-mcp/alerting/destinations/webhooks/outputs.ts
+++ b/src/generated/forge-mcp/alerting/destinations/webhooks/outputs.ts
@@ -3,58 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `aaa_components-schemas-name` in responses.
- */
-export const aaa_components_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_components-schemas-type` in responses.
- */
-export const aaa_components_schemas_type_output: JsonSchema = {
-  "enum": [
-    "datadog",
-    "discord",
-    "feishu",
-    "gchat",
-    "generic",
-    "opsgenie",
-    "slack",
-    "splunk"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_created_at` in responses.
- */
-export const aaa_created_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_last_failure` in responses.
- */
-export const aaa_last_failure_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_last_success` in responses.
- */
-export const aaa_last_success_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_schemas-single_response` in responses.
  */
-export const aaa_schemas_single_response_output: JsonSchema = {
+export const aaa_schemas$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-single"
@@ -70,55 +22,47 @@ export const aaa_schemas_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `aaa_secret` in responses.
- */
-export const aaa_secret_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_url` in responses.
- */
-export const aaa_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_webhook-id` in responses.
- */
-export const aaa_webhook_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_webhooks` in responses.
  */
-export const aaa_webhooks_output: JsonSchema = {
+export const aaa_webhooks: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/aaa_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/aaa_webhook-id"
+      "type": "string"
     },
     "last_failure": {
-      "$ref": "#/$defs/aaa_last_failure"
+      "format": "date-time",
+      "type": "string"
     },
     "last_success": {
-      "$ref": "#/$defs/aaa_last_success"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/aaa_components-schemas-name"
+      "type": "string"
     },
     "secret": {
-      "$ref": "#/$defs/aaa_secret"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/aaa_components-schemas-type"
+      "enum": [
+        "datadog",
+        "discord",
+        "feishu",
+        "gchat",
+        "generic",
+        "opsgenie",
+        "slack",
+        "splunk"
+      ],
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/aaa_url"
+      "type": "string"
     }
   },
   "type": "object"
@@ -128,7 +72,7 @@ export const aaa_webhooks_output: JsonSchema = {
  * The schema of `aaa_webhooks_components-schemas-response_collection` in
  * responses.
  */
-export const aaa_webhooks_components_schemas_response_collection_output: JsonSchema = {
+export const aaa_webhooks_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-common-2"
diff --git a/src/generated/forge-mcp/alerting/destinations/webhooks/schemas.ts b/src/generated/forge-mcp/alerting/destinations/webhooks/schemas.ts
deleted file mode 100644
index 480808bd8..000000000
--- a/src/generated/forge-mcp/alerting/destinations/webhooks/schemas.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `aaa_components-schemas-name`.
- */
-export const aaa_components_schemas_name: JsonSchema = {
-  "description": "The name of the webhook destination. This will be included in the request body when you receive a webhook notification.",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_secret`.
- */
-export const aaa_secret: JsonSchema = {
-  "description": "Optional secret that will be passed in the `cf-webhook-auth` header when dispatching generic webhook notifications or formatted for supported destinations. Secrets are not returned in any API response body.",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_url`.
- */
-export const aaa_url: JsonSchema = {
-  "description": "The POST endpoint to call when dispatching a notification.",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_webhook-id`.
- */
-export const aaa_webhook_id: JsonSchema = {
-  "description": "The unique identifier of a webhook",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/destinations/webhooks/tools.ts b/src/generated/forge-mcp/alerting/destinations/webhooks/tools.ts
index 1851ac3ec..747e2116a 100644
--- a/src/generated/forge-mcp/alerting/destinations/webhooks/tools.ts
+++ b/src/generated/forge-mcp/alerting/destinations/webhooks/tools.ts
@@ -3,33 +3,17 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  aaa_api_response_common_2_output,
-  aaa_api_response_common_failure_3_output,
-  aaa_api_response_single_output,
-  aaa_id_response_output,
-  aaa_messages_3_output,
-  aaa_uuid_output,
+  aaa_api$$response$$common$$2,
+  aaa_api$$response$$common$$failure$$3,
+  aaa_api$$response$$single,
+  aaa_id_response,
+  aaa_messages$$3,
 } from "../../outputs.js";
-import { aaa_account_id } from "../../schemas.js";
 import {
-  aaa_components_schemas_name_output,
-  aaa_components_schemas_type_output,
-  aaa_created_at_output,
-  aaa_last_failure_output,
-  aaa_last_success_output,
-  aaa_schemas_single_response_output,
-  aaa_secret_output,
-  aaa_url_output,
-  aaa_webhook_id_output,
-  aaa_webhooks_components_schemas_response_collection_output,
-  aaa_webhooks_output,
+  aaa_schemas$$single_response,
+  aaa_webhooks,
+  aaa_webhooks_components$$schemas$$response_collection,
 } from "./outputs.js";
-import {
-  aaa_components_schemas_name,
-  aaa_secret,
-  aaa_url,
-  aaa_webhook_id,
-} from "./schemas.js";
 
 /**
  * The tools of `alerting.destinations.webhooks`.
@@ -38,27 +22,23 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_webhooks_create",
     title: "Create a webhook",
-    description: "Creates a new webhook destination.",
+    description: "Creates a new webhook destination.\n\nPOST /accounts/{account_id}/alerting/v3/destinations/webhooks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
         "body": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/aaa_components-schemas-name",
-              "description": "The name of the webhook destination. This will be included in the request body when you receive a webhook notification."
+              "description": "The name of the webhook destination. This will be included in the request body when you receive a webhook notification.",
+              "type": "string"
             },
             "secret": {
-              "$ref": "#/$defs/aaa_secret",
-              "description": "Optional secret that will be passed in the `cf-webhook-auth` header when dispatching generic webhook notifications or formatted for supported destinations. Secrets are not returned in any API response body."
+              "description": "Optional secret that will be passed in the `cf-webhook-auth` header when dispatching generic webhook notifications or formatted for supported destinations. Secrets are not returned in any API response body.",
+              "type": "string"
             },
             "url": {
-              "$ref": "#/$defs/aaa_url",
-              "description": "The POST endpoint to call when dispatching a notification."
+              "description": "The POST endpoint to call when dispatching a notification.",
+              "type": "string"
             }
           },
           "required": [
@@ -66,26 +46,33 @@ export const tools: readonly Tool[] = [
             "url"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_components-schemas-name": aaa_components_schemas_name,
-        "aaa_secret": aaa_secret,
-        "aaa_url": aaa_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_id_response",
       $defs: {
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -126,11 +113,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
@@ -141,33 +127,39 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_webhooks_delete",
     title: "Delete a webhook",
-    description: "Delete a configured webhook destination.\n\nConfirm with the user before calling this tool. This operation deletes the webhook destination.",
+    description: "Delete a configured webhook destination.\n\nConfirm with the user before calling this tool. This operation deletes the webhook destination.\n\nDELETE /accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
-        "webhook_id": {
-          "$ref": "#/$defs/aaa_webhook-id",
-          "description": "The unique identifier of a webhook"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "The unique identifier of a webhook",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "webhook_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_webhook-id": aaa_webhook_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_api-response-common-2",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -201,9 +193,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
@@ -213,43 +205,41 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_webhooks_get",
     title: "Get a webhook",
-    description: "Get details for a single webhooks destination.",
+    description: "Get details for a single webhooks destination.\n\nGET /accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
-        "webhook_id": {
-          "$ref": "#/$defs/aaa_webhook-id",
-          "description": "The unique identifier of a webhook"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "The unique identifier of a webhook",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "webhook_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_webhook-id": aaa_webhook_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_schemas-single_response",
       $defs: {
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_components-schemas-name": aaa_components_schemas_name_output,
-        "aaa_components-schemas-type": aaa_components_schemas_type_output,
-        "aaa_created_at": aaa_created_at_output,
-        "aaa_last_failure": aaa_last_failure_output,
-        "aaa_last_success": aaa_last_success_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_schemas-single_response": aaa_schemas_single_response_output,
-        "aaa_secret": aaa_secret_output,
-        "aaa_url": aaa_url_output,
-        "aaa_webhook-id": aaa_webhook_id_output,
-        "aaa_webhooks": aaa_webhooks_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_schemas-single_response": aaa_schemas$$single_response,
+        "aaa_webhooks": aaa_webhooks,
       },
     },
     annotations: {
@@ -293,19 +283,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_components-schemas-name": aaa_components_schemas_name_output,
-        "aaa_components-schemas-type": aaa_components_schemas_type_output,
-        "aaa_created_at": aaa_created_at_output,
-        "aaa_last_failure": aaa_last_failure_output,
-        "aaa_last_success": aaa_last_success_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_schemas-single_response": aaa_schemas_single_response_output,
-        "aaa_secret": aaa_secret_output,
-        "aaa_url": aaa_url_output,
-        "aaa_webhook-id": aaa_webhook_id_output,
-        "aaa_webhooks": aaa_webhooks_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_schemas-single_response": aaa_schemas$$single_response,
+        "aaa_webhooks": aaa_webhooks,
       },
     },
     request: (args) => ({
@@ -315,37 +297,36 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_webhooks_list",
     title: "List webhooks",
-    description: "Gets a list of all configured webhook destinations.",
+    description: "Gets a list of all configured webhook destinations.\n\nGET /accounts/{account_id}/alerting/v3/destinations/webhooks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_webhooks_components-schemas-response_collection",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_components-schemas-name": aaa_components_schemas_name_output,
-        "aaa_components-schemas-type": aaa_components_schemas_type_output,
-        "aaa_created_at": aaa_created_at_output,
-        "aaa_last_failure": aaa_last_failure_output,
-        "aaa_last_success": aaa_last_success_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_secret": aaa_secret_output,
-        "aaa_url": aaa_url_output,
-        "aaa_webhook-id": aaa_webhook_id_output,
-        "aaa_webhooks": aaa_webhooks_output,
-        "aaa_webhooks_components-schemas-response_collection": aaa_webhooks_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_webhooks": aaa_webhooks,
+        "aaa_webhooks_components-schemas-response_collection": aaa_webhooks_components$$schemas$$response_collection,
       },
     },
     annotations: {
@@ -389,19 +370,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_components-schemas-name": aaa_components_schemas_name_output,
-        "aaa_components-schemas-type": aaa_components_schemas_type_output,
-        "aaa_created_at": aaa_created_at_output,
-        "aaa_last_failure": aaa_last_failure_output,
-        "aaa_last_success": aaa_last_success_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_secret": aaa_secret_output,
-        "aaa_url": aaa_url_output,
-        "aaa_webhook-id": aaa_webhook_id_output,
-        "aaa_webhooks": aaa_webhooks_output,
-        "aaa_webhooks_components-schemas-response_collection": aaa_webhooks_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_webhooks": aaa_webhooks,
+        "aaa_webhooks_components-schemas-response_collection": aaa_webhooks_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
@@ -411,27 +384,23 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_destinations_webhooks_update",
     title: "Update a webhook",
-    description: "Update a webhook destination.",
+    description: "Update a webhook destination.\n\nPUT /accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
         "body": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/aaa_components-schemas-name",
-              "description": "The name of the webhook destination. This will be included in the request body when you receive a webhook notification."
+              "description": "The name of the webhook destination. This will be included in the request body when you receive a webhook notification.",
+              "type": "string"
             },
             "secret": {
-              "$ref": "#/$defs/aaa_secret",
-              "description": "Optional secret that will be passed in the `cf-webhook-auth` header when dispatching generic webhook notifications or formatted for supported destinations. Secrets are not returned in any API response body."
+              "description": "Optional secret that will be passed in the `cf-webhook-auth` header when dispatching generic webhook notifications or formatted for supported destinations. Secrets are not returned in any API response body.",
+              "type": "string"
             },
             "url": {
-              "$ref": "#/$defs/aaa_url",
-              "description": "The POST endpoint to call when dispatching a notification."
+              "description": "The POST endpoint to call when dispatching a notification.",
+              "type": "string"
             }
           },
           "required": [
@@ -440,31 +409,37 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "webhook_id": {
-          "$ref": "#/$defs/aaa_webhook-id",
-          "description": "The unique identifier of a webhook"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "The unique identifier of a webhook",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "webhook_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_components-schemas-name": aaa_components_schemas_name,
-        "aaa_secret": aaa_secret,
-        "aaa_url": aaa_url,
-        "aaa_webhook-id": aaa_webhook_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_id_response",
       $defs: {
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -505,11 +480,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/alerting/history/outputs.ts b/src/generated/forge-mcp/alerting/history/outputs.ts
index a46c44937..acc0e7828 100644
--- a/src/generated/forge-mcp/alerting/history/outputs.ts
+++ b/src/generated/forge-mcp/alerting/history/outputs.ts
@@ -3,51 +3,43 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `aaa_alert_body` in responses.
- */
-export const aaa_alert_body_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_components-schemas-description` in responses.
- */
-export const aaa_components_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_history` in responses.
  */
-export const aaa_history_output: JsonSchema = {
+export const aaa_history: JsonSchema = {
   "properties": {
     "alert_body": {
-      "$ref": "#/$defs/aaa_alert_body"
+      "type": "string"
     },
     "alert_type": {
-      "$ref": "#/$defs/aaa_schemas-alert_type"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/aaa_components-schemas-description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/aaa_uuid"
+      "type": "string"
     },
     "mechanism": {
-      "$ref": "#/$defs/aaa_mechanism"
+      "type": "string"
     },
     "mechanism_type": {
-      "$ref": "#/$defs/aaa_mechanism_type"
+      "enum": [
+        "email",
+        "pagerduty",
+        "webhook"
+      ],
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/aaa_schemas-name"
+      "type": "string"
     },
     "policy_id": {
-      "$ref": "#/$defs/aaa_policy-id"
+      "type": "string"
     },
     "sent": {
-      "$ref": "#/$defs/aaa_sent"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -57,7 +49,7 @@ export const aaa_history_output: JsonSchema = {
  * The schema of `aaa_history_components-schemas-response_collection` in
  * responses.
  */
-export const aaa_history_components_schemas_response_collection_output: JsonSchema = {
+export const aaa_history_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-collection"
@@ -78,37 +70,3 @@ export const aaa_history_components_schemas_response_collection_output: JsonSche
     }
   ]
 };
-
-/**
- * The schema of `aaa_mechanism` in responses.
- */
-export const aaa_mechanism_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_mechanism_type` in responses.
- */
-export const aaa_mechanism_type_output: JsonSchema = {
-  "enum": [
-    "email",
-    "pagerduty",
-    "webhook"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_schemas-alert_type` in responses.
- */
-export const aaa_schemas_alert_type_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_sent` in responses.
- */
-export const aaa_sent_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/history/schemas.ts b/src/generated/forge-mcp/alerting/history/schemas.ts
deleted file mode 100644
index 4191ec70d..000000000
--- a/src/generated/forge-mcp/alerting/history/schemas.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `aaa_before`.
- */
-export const aaa_before: JsonSchema = {
-  "description": "Limit the returned results to history records older than the specified date. This must be a timestamp that conforms to RFC3339.",
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_per_page`.
- */
-export const aaa_per_page: JsonSchema = {
-  "description": "Number of items per page.",
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/alerting/history/tools.ts b/src/generated/forge-mcp/alerting/history/tools.ts
index e7a215e91..91f4f7433 100644
--- a/src/generated/forge-mcp/alerting/history/tools.ts
+++ b/src/generated/forge-mcp/alerting/history/tools.ts
@@ -1,29 +1,18 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  aaa_api_response_collection_output,
-  aaa_api_response_common_2_output,
-  aaa_api_response_common_failure_3_output,
-  aaa_messages_3_output,
-  aaa_policy_id_output,
-  aaa_result_info_2_output,
-  aaa_schemas_name_output,
-  aaa_uuid_output,
+  aaa_api$$response$$collection,
+  aaa_api$$response$$common$$2,
+  aaa_api$$response$$common$$failure$$3,
+  aaa_messages$$3,
+  aaa_result_info$$2,
 } from "../outputs.js";
-import { aaa_account_id } from "../schemas.js";
 import {
-  aaa_alert_body_output,
-  aaa_components_schemas_description_output,
-  aaa_history_components_schemas_response_collection_output,
-  aaa_history_output,
-  aaa_mechanism_output,
-  aaa_mechanism_type_output,
-  aaa_schemas_alert_type_output,
-  aaa_sent_output,
+  aaa_history,
+  aaa_history_components$$schemas$$response_collection,
 } from "./outputs.js";
-import { aaa_before, aaa_per_page } from "./schemas.js";
 
 /**
  * The tools of `alerting.history`.
@@ -32,61 +21,64 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_history_list",
     title: "List History",
-    description: "Gets a list of history records for notifications sent to an account. The records are displayed for last `x` number of days based on the zone plan (free = 30, pro = 30, biz = 30, ent = 90).",
+    description: "Gets a list of history records for notifications sent to an account. The records are displayed for last `x` number of days based on the zone plan (free = 30, pro = 30, biz = 30, ent = 90).\n\nGET /accounts/{account_id}/alerting/v3/history",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
-        "before": {
-          "$ref": "#/$defs/aaa_before",
-          "description": "Limit the returned results to history records older than the specified date. This must be a timestamp that conforms to RFC3339."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "$ref": "#/$defs/aaa_per_page",
-          "default": 25,
-          "description": "Number of items per page."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "since": {
-          "description": "Limit the returned results to history records newer than the specified date. This must be a timestamp that conforms to RFC3339.",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "before": {
+              "description": "Limit the returned results to history records older than the specified date. This must be a timestamp that conforms to RFC3339.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of items per page.",
+              "type": "number"
+            },
+            "since": {
+              "description": "Limit the returned results to history records newer than the specified date. This must be a timestamp that conforms to RFC3339.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_before": aaa_before,
-        "aaa_per_page": aaa_per_page,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_history_components-schemas-response_collection",
       $defs: {
-        "aaa_alert_body": aaa_alert_body_output,
-        "aaa_api-response-collection": aaa_api_response_collection_output,
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_components-schemas-description": aaa_components_schemas_description_output,
-        "aaa_history": aaa_history_output,
-        "aaa_history_components-schemas-response_collection": aaa_history_components_schemas_response_collection_output,
-        "aaa_mechanism": aaa_mechanism_output,
-        "aaa_mechanism_type": aaa_mechanism_type_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_result_info-2": aaa_result_info_2_output,
-        "aaa_schemas-alert_type": aaa_schemas_alert_type_output,
-        "aaa_schemas-name": aaa_schemas_name_output,
-        "aaa_sent": aaa_sent_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-collection": aaa_api$$response$$collection,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_history": aaa_history,
+        "aaa_history_components-schemas-response_collection": aaa_history_components$$schemas$$response_collection,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_result_info-2": aaa_result_info$$2,
       },
     },
     annotations: {
@@ -124,31 +116,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_alert_body": aaa_alert_body_output,
-        "aaa_api-response-collection": aaa_api_response_collection_output,
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_components-schemas-description": aaa_components_schemas_description_output,
-        "aaa_history": aaa_history_output,
-        "aaa_history_components-schemas-response_collection": aaa_history_components_schemas_response_collection_output,
-        "aaa_mechanism": aaa_mechanism_output,
-        "aaa_mechanism_type": aaa_mechanism_type_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_result_info-2": aaa_result_info_2_output,
-        "aaa_schemas-alert_type": aaa_schemas_alert_type_output,
-        "aaa_schemas-name": aaa_schemas_name_output,
-        "aaa_sent": aaa_sent_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-collection": aaa_api$$response$$collection,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_history": aaa_history,
+        "aaa_history_components-schemas-response_collection": aaa_history_components$$schemas$$response_collection,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_result_info-2": aaa_result_info$$2,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/alerting/v3/history`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["before", args["before"], true],
-        ["page", args["page"], true],
-        ["since", args["since"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["before", param(args, "query", "before"), true],
+        ["page", param(args, "query", "page"), true],
+        ["since", param(args, "query", "since"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/alerting/outputs.ts b/src/generated/forge-mcp/alerting/outputs.ts
index 22693098a..c2c7ee5c2 100644
--- a/src/generated/forge-mcp/alerting/outputs.ts
+++ b/src/generated/forge-mcp/alerting/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `aaa_account-id` in responses.
- */
-export const aaa_account_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_api-response-collection` in responses.
  */
-export const aaa_api_response_collection_output: JsonSchema = {
+export const aaa_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-common-2"
@@ -32,7 +25,7 @@ export const aaa_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `aaa_api-response-common-2` in responses.
  */
-export const aaa_api_response_common_2_output: JsonSchema = {
+export const aaa_api$$response$$common$$2: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages-3"
@@ -58,7 +51,7 @@ export const aaa_api_response_common_2_output: JsonSchema = {
 /**
  * The schema of `aaa_api-response-common-failure-3` in responses.
  */
-export const aaa_api_response_common_failure_3_output: JsonSchema = {
+export const aaa_api$$response$$common$$failure$$3: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages-3"
@@ -84,7 +77,7 @@ export const aaa_api_response_common_failure_3_output: JsonSchema = {
 /**
  * The schema of `aaa_api-response-single` in responses.
  */
-export const aaa_api_response_single_output: JsonSchema = {
+export const aaa_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages-3"
@@ -110,7 +103,7 @@ export const aaa_api_response_single_output: JsonSchema = {
 /**
  * The schema of `aaa_id_response` in responses.
  */
-export const aaa_id_response_output: JsonSchema = {
+export const aaa_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-single"
@@ -120,7 +113,7 @@ export const aaa_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/aaa_uuid"
+              "type": "string"
             }
           },
           "type": "object"
@@ -134,7 +127,7 @@ export const aaa_id_response_output: JsonSchema = {
 /**
  * The schema of `aaa_messages-3` in responses.
  */
-export const aaa_messages_3_output: JsonSchema = {
+export const aaa_messages$$3: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -152,17 +145,10 @@ export const aaa_messages_3_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `aaa_policy-id` in responses.
- */
-export const aaa_policy_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_result_info-2` in responses.
  */
-export const aaa_result_info_2_output: JsonSchema = {
+export const aaa_result_info$$2: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -179,17 +165,3 @@ export const aaa_result_info_2_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `aaa_schemas-name` in responses.
- */
-export const aaa_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_uuid` in responses.
- */
-export const aaa_uuid_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/policies/email/outputs.ts b/src/generated/forge-mcp/alerting/policies/email/outputs.ts
index 6dc7a8a6b..a4863b3d9 100644
--- a/src/generated/forge-mcp/alerting/policies/email/outputs.ts
+++ b/src/generated/forge-mcp/alerting/policies/email/outputs.ts
@@ -6,19 +6,19 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `aaa_unsubscribe_email` in responses.
  */
-export const aaa_unsubscribe_email_output: JsonSchema = {
+export const aaa_unsubscribe_email: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/aaa_account-id"
+      "type": "string"
     },
     "email": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/aaa_policy-id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/aaa_schemas-name"
+      "type": "string"
     },
     "token": {
       "type": "string"
@@ -30,16 +30,16 @@ export const aaa_unsubscribe_email_output: JsonSchema = {
 /**
  * The schema of `aaa_unsubscribe_email_post` in responses.
  */
-export const aaa_unsubscribe_email_post_output: JsonSchema = {
+export const aaa_unsubscribe_email_post: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/aaa_account-id"
+      "type": "string"
     },
     "email": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/aaa_policy-id"
+      "type": "string"
     }
   },
   "type": "object"
@@ -48,7 +48,7 @@ export const aaa_unsubscribe_email_post_output: JsonSchema = {
 /**
  * The schema of `aaa_unsubscribe_email_post_single_response` in responses.
  */
-export const aaa_unsubscribe_email_post_single_response_output: JsonSchema = {
+export const aaa_unsubscribe_email_post_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-single"
@@ -67,7 +67,7 @@ export const aaa_unsubscribe_email_post_single_response_output: JsonSchema = {
 /**
  * The schema of `aaa_unsubscribe_email_single_response` in responses.
  */
-export const aaa_unsubscribe_email_single_response_output: JsonSchema = {
+export const aaa_unsubscribe_email_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-single"
diff --git a/src/generated/forge-mcp/alerting/policies/email/tools.ts b/src/generated/forge-mcp/alerting/policies/email/tools.ts
index 9a1d6adec..03dfe6207 100644
--- a/src/generated/forge-mcp/alerting/policies/email/tools.ts
+++ b/src/generated/forge-mcp/alerting/policies/email/tools.ts
@@ -1,21 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  aaa_account_id_output,
-  aaa_api_response_common_failure_3_output,
-  aaa_api_response_single_output,
-  aaa_messages_3_output,
-  aaa_policy_id_output,
-  aaa_schemas_name_output,
+  aaa_api$$response$$common$$failure$$3,
+  aaa_api$$response$$single,
+  aaa_messages$$3,
 } from "../../outputs.js";
-import { aaa_account_id, aaa_policy_id } from "../../schemas.js";
 import {
-  aaa_unsubscribe_email_output,
-  aaa_unsubscribe_email_post_output,
-  aaa_unsubscribe_email_post_single_response_output,
-  aaa_unsubscribe_email_single_response_output,
+  aaa_unsubscribe_email,
+  aaa_unsubscribe_email_post,
+  aaa_unsubscribe_email_post_single_response,
+  aaa_unsubscribe_email_single_response,
 } from "./outputs.js";
 
 /**
@@ -25,46 +21,58 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_policies_email_details",
     title: "Show email unsubscribe details",
-    description: "Shows details for unsubscribing an email address from a notification policy.",
+    description: "Shows details for unsubscribing an email address from a notification policy.\n\nGET /accounts/{account_id}/alerting/v3/policies/{policy_id}/email/unsubscribe",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The unique identifier of a notification policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         },
-        "email": {
-          "type": "string"
-        },
-        "policy_id": {
-          "$ref": "#/$defs/aaa_policy-id",
-          "description": "The unique identifier of a notification policy"
-        },
-        "token": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "email": {
+              "type": "string"
+            },
+            "token": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "email",
+            "token"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
-        "email",
-        "token"
+        "path",
+        "query"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_policy-id": aaa_policy_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_unsubscribe_email_single_response",
       $defs: {
-        "aaa_account-id": aaa_account_id_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_schemas-name": aaa_schemas_name_output,
-        "aaa_unsubscribe_email": aaa_unsubscribe_email_output,
-        "aaa_unsubscribe_email_single_response": aaa_unsubscribe_email_single_response_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_unsubscribe_email": aaa_unsubscribe_email,
+        "aaa_unsubscribe_email_single_response": aaa_unsubscribe_email_single_response,
       },
     },
     annotations: {
@@ -95,66 +103,76 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_account-id": aaa_account_id_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_schemas-name": aaa_schemas_name_output,
-        "aaa_unsubscribe_email": aaa_unsubscribe_email_output,
-        "aaa_unsubscribe_email_single_response": aaa_unsubscribe_email_single_response_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_unsubscribe_email": aaa_unsubscribe_email,
+        "aaa_unsubscribe_email_single_response": aaa_unsubscribe_email_single_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/alerting/v3/policies/${pathParam(args, "policy_id")}/email/unsubscribe`,
       query: [
-        ["email", args["email"], true],
-        ["token", args["token"], true],
+        ["email", param(args, "query", "email"), true],
+        ["token", param(args, "query", "token"), true],
       ],
     }),
   },
   {
     name: "alerting_policies_email_unsubscribe",
     title: "Unsubscribe email from a Notification policy",
-    description: "Unsubscribes an email address from a notification policy.",
+    description: "Unsubscribes an email address from a notification policy.\n\nPOST /accounts/{account_id}/alerting/v3/policies/{policy_id}/email/unsubscribe",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The unique identifier of a notification policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         },
-        "email": {
-          "type": "string"
-        },
-        "policy_id": {
-          "$ref": "#/$defs/aaa_policy-id",
-          "description": "The unique identifier of a notification policy"
-        },
-        "token": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "email": {
+              "type": "string"
+            },
+            "token": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "email",
+            "token"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
-        "email",
-        "token"
+        "path",
+        "query"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_policy-id": aaa_policy_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_unsubscribe_email_post_single_response",
       $defs: {
-        "aaa_account-id": aaa_account_id_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_unsubscribe_email_post": aaa_unsubscribe_email_post_output,
-        "aaa_unsubscribe_email_post_single_response": aaa_unsubscribe_email_post_single_response_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_unsubscribe_email_post": aaa_unsubscribe_email_post,
+        "aaa_unsubscribe_email_post_single_response": aaa_unsubscribe_email_post_single_response,
       },
     },
     annotations: {
@@ -176,20 +194,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_account-id": aaa_account_id_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_unsubscribe_email_post": aaa_unsubscribe_email_post_output,
-        "aaa_unsubscribe_email_post_single_response": aaa_unsubscribe_email_post_single_response_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_unsubscribe_email_post": aaa_unsubscribe_email_post,
+        "aaa_unsubscribe_email_post_single_response": aaa_unsubscribe_email_post_single_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/alerting/v3/policies/${pathParam(args, "policy_id")}/email/unsubscribe`,
       query: [
-        ["email", args["email"], true],
-        ["token", args["token"], true],
+        ["email", param(args, "query", "email"), true],
+        ["token", param(args, "query", "token"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/alerting/policies/outputs.ts b/src/generated/forge-mcp/alerting/policies/outputs.ts
index e0f0acfaa..7b91bf137 100644
--- a/src/generated/forge-mcp/alerting/policies/outputs.ts
+++ b/src/generated/forge-mcp/alerting/policies/outputs.ts
@@ -3,102 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `aaa_alert_interval` in responses.
- */
-export const aaa_alert_interval_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_alert_type` in responses.
- */
-export const aaa_alert_type_output: JsonSchema = {
-  "enum": [
-    "abuse_report_alert",
-    "access_custom_certificate_expiration_type",
-    "advanced_ddos_attack_l4_alert",
-    "advanced_ddos_attack_l7_alert",
-    "advanced_http_alert_error",
-    "bgp_hijack_notification",
-    "billing_usage_alert",
-    "block_notification_block_removed",
-    "block_notification_new_block",
-    "block_notification_review_rejected",
-    "bot_traffic_basic_alert",
-    "brand_protection_alert",
-    "brand_protection_digest",
-    "clickhouse_alert_fw_anomaly",
-    "clickhouse_alert_fw_ent_anomaly",
-    "cloudforce_one_request_notification",
-    "cni_maintenance_notification",
-    "custom_analytics",
-    "custom_bot_detection_alert",
-    "custom_ssl_certificate_event_type",
-    "dedicated_ssl_certificate_event_type",
-    "device_connectivity_anomaly_alert",
-    "dos_attack_l4",
-    "dos_attack_l7",
-    "expiring_service_token_alert",
-    "failing_logpush_job_disabled_alert",
-    "fbm_auto_advertisement",
-    "fbm_dosd_attack",
-    "fbm_volumetric_attack",
-    "health_check_status_notification",
-    "hostname_aop_custom_certificate_expiration_type",
-    "http_alert_edge_error",
-    "http_alert_origin_error",
-    "image_notification",
-    "image_resizing_notification",
-    "incident_alert",
-    "load_balancing_health_alert",
-    "load_balancing_pool_enablement_alert",
-    "logo_match_alert",
-    "magic_tunnel_health_check_event",
-    "magic_wan_tunnel_health",
-    "maintenance_event_notification",
-    "mtls_certificate_store_certificate_expiration_type",
-    "pages_event_alert",
-    "radar_notification",
-    "real_origin_monitoring",
-    "scriptmonitor_alert_new_code_change_detections",
-    "scriptmonitor_alert_new_hosts",
-    "scriptmonitor_alert_new_malicious_hosts",
-    "scriptmonitor_alert_new_malicious_scripts",
-    "scriptmonitor_alert_new_malicious_url",
-    "scriptmonitor_alert_new_max_length_resource_url",
-    "scriptmonitor_alert_new_resources",
-    "secondary_dns_all_primaries_failing",
-    "secondary_dns_primaries_failing",
-    "secondary_dns_warning",
-    "secondary_dns_zone_successfully_updated",
-    "secondary_dns_zone_validation_warning",
-    "security_insights_alert",
-    "sentinel_alert",
-    "stream_live_notifications",
-    "synthetic_test_latency_alert",
-    "synthetic_test_low_availability_alert",
-    "traffic_anomalies_alert",
-    "tunnel_health_event",
-    "tunnel_update_event",
-    "universal_ssl_event_type",
-    "web_analytics_metrics_update",
-    "zone_aop_custom_certificate_expiration_type"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_enabled` in responses.
- */
-export const aaa_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `aaa_filters` in responses.
  */
-export const aaa_filters_output: JsonSchema = {
+export const aaa_filters: JsonSchema = {
   "properties": {
     "actions": {
       "items": {
@@ -381,7 +289,7 @@ export const aaa_filters_output: JsonSchema = {
 /**
  * The schema of `aaa_mechanisms` in responses.
  */
-export const aaa_mechanisms_output: JsonSchema = {
+export const aaa_mechanisms: JsonSchema = {
   "properties": {
     "email": {
       "items": {
@@ -398,7 +306,7 @@ export const aaa_mechanisms_output: JsonSchema = {
       "items": {
         "properties": {
           "id": {
-            "$ref": "#/$defs/aaa_uuid"
+            "type": "string"
           }
         },
         "type": "object"
@@ -409,7 +317,7 @@ export const aaa_mechanisms_output: JsonSchema = {
       "items": {
         "properties": {
           "id": {
-            "$ref": "#/$defs/aaa_uuid"
+            "type": "string"
           }
         },
         "type": "object"
@@ -423,37 +331,110 @@ export const aaa_mechanisms_output: JsonSchema = {
 /**
  * The schema of `aaa_policies` in responses.
  */
-export const aaa_policies_output: JsonSchema = {
+export const aaa_policies: JsonSchema = {
   "properties": {
     "alert_interval": {
-      "$ref": "#/$defs/aaa_alert_interval"
+      "type": "string"
     },
     "alert_type": {
-      "$ref": "#/$defs/aaa_alert_type"
+      "enum": [
+        "abuse_report_alert",
+        "access_custom_certificate_expiration_type",
+        "advanced_ddos_attack_l4_alert",
+        "advanced_ddos_attack_l7_alert",
+        "advanced_http_alert_error",
+        "bgp_hijack_notification",
+        "billing_usage_alert",
+        "block_notification_block_removed",
+        "block_notification_new_block",
+        "block_notification_review_rejected",
+        "bot_traffic_basic_alert",
+        "brand_protection_alert",
+        "brand_protection_digest",
+        "clickhouse_alert_fw_anomaly",
+        "clickhouse_alert_fw_ent_anomaly",
+        "cloudforce_one_request_notification",
+        "cni_maintenance_notification",
+        "custom_analytics",
+        "custom_bot_detection_alert",
+        "custom_ssl_certificate_event_type",
+        "dedicated_ssl_certificate_event_type",
+        "device_connectivity_anomaly_alert",
+        "dos_attack_l4",
+        "dos_attack_l7",
+        "expiring_service_token_alert",
+        "failing_logpush_job_disabled_alert",
+        "fbm_auto_advertisement",
+        "fbm_dosd_attack",
+        "fbm_volumetric_attack",
+        "health_check_status_notification",
+        "hostname_aop_custom_certificate_expiration_type",
+        "http_alert_edge_error",
+        "http_alert_origin_error",
+        "image_notification",
+        "image_resizing_notification",
+        "incident_alert",
+        "load_balancing_health_alert",
+        "load_balancing_pool_enablement_alert",
+        "logo_match_alert",
+        "magic_tunnel_health_check_event",
+        "magic_wan_tunnel_health",
+        "maintenance_event_notification",
+        "mtls_certificate_store_certificate_expiration_type",
+        "pages_event_alert",
+        "radar_notification",
+        "real_origin_monitoring",
+        "scriptmonitor_alert_new_code_change_detections",
+        "scriptmonitor_alert_new_hosts",
+        "scriptmonitor_alert_new_malicious_hosts",
+        "scriptmonitor_alert_new_malicious_scripts",
+        "scriptmonitor_alert_new_malicious_url",
+        "scriptmonitor_alert_new_max_length_resource_url",
+        "scriptmonitor_alert_new_resources",
+        "secondary_dns_all_primaries_failing",
+        "secondary_dns_primaries_failing",
+        "secondary_dns_warning",
+        "secondary_dns_zone_successfully_updated",
+        "secondary_dns_zone_validation_warning",
+        "security_insights_alert",
+        "sentinel_alert",
+        "stream_live_notifications",
+        "synthetic_test_latency_alert",
+        "synthetic_test_low_availability_alert",
+        "traffic_anomalies_alert",
+        "tunnel_health_event",
+        "tunnel_update_event",
+        "universal_ssl_event_type",
+        "web_analytics_metrics_update",
+        "zone_aop_custom_certificate_expiration_type"
+      ],
+      "type": "string"
     },
     "created": {
-      "$ref": "#/$defs/aaa_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/aaa_schemas-description"
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/aaa_enabled"
+      "type": "boolean"
     },
     "filters": {
       "$ref": "#/$defs/aaa_filters"
     },
     "id": {
-      "$ref": "#/$defs/aaa_policy-id"
+      "type": "string"
     },
     "mechanisms": {
       "$ref": "#/$defs/aaa_mechanisms"
     },
     "modified": {
-      "$ref": "#/$defs/aaa_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/aaa_schemas-name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -463,7 +444,7 @@ export const aaa_policies_output: JsonSchema = {
  * The schema of `aaa_policies_components-schemas-response_collection` in
  * responses.
  */
-export const aaa_policies_components_schemas_response_collection_output: JsonSchema = {
+export const aaa_policies_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-common-2"
@@ -482,17 +463,10 @@ export const aaa_policies_components_schemas_response_collection_output: JsonSch
   ]
 };
 
-/**
- * The schema of `aaa_schemas-description` in responses.
- */
-export const aaa_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_single_response` in responses.
  */
-export const aaa_single_response_output: JsonSchema = {
+export const aaa_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-single"
@@ -507,11 +481,3 @@ export const aaa_single_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `aaa_timestamp` in responses.
- */
-export const aaa_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/policies/schemas.ts b/src/generated/forge-mcp/alerting/policies/schemas.ts
index 1f96172ae..640389e94 100644
--- a/src/generated/forge-mcp/alerting/policies/schemas.ts
+++ b/src/generated/forge-mcp/alerting/policies/schemas.ts
@@ -3,101 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `aaa_alert_interval`.
- */
-export const aaa_alert_interval: JsonSchema = {
-  "description": "Optional specification of how often to re-alert from the same incident, not support on all alert types.",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_alert_type`.
- */
-export const aaa_alert_type: JsonSchema = {
-  "description": "Refers to which event will trigger a Notification dispatch. You can use the endpoint to get available alert types which then will give you a list of possible values.",
-  "enum": [
-    "abuse_report_alert",
-    "access_custom_certificate_expiration_type",
-    "advanced_ddos_attack_l4_alert",
-    "advanced_ddos_attack_l7_alert",
-    "advanced_http_alert_error",
-    "bgp_hijack_notification",
-    "billing_usage_alert",
-    "block_notification_block_removed",
-    "block_notification_new_block",
-    "block_notification_review_rejected",
-    "bot_traffic_basic_alert",
-    "brand_protection_alert",
-    "brand_protection_digest",
-    "clickhouse_alert_fw_anomaly",
-    "clickhouse_alert_fw_ent_anomaly",
-    "cloudforce_one_request_notification",
-    "cni_maintenance_notification",
-    "custom_analytics",
-    "custom_bot_detection_alert",
-    "custom_ssl_certificate_event_type",
-    "dedicated_ssl_certificate_event_type",
-    "device_connectivity_anomaly_alert",
-    "dos_attack_l4",
-    "dos_attack_l7",
-    "expiring_service_token_alert",
-    "failing_logpush_job_disabled_alert",
-    "fbm_auto_advertisement",
-    "fbm_dosd_attack",
-    "fbm_volumetric_attack",
-    "health_check_status_notification",
-    "hostname_aop_custom_certificate_expiration_type",
-    "http_alert_edge_error",
-    "http_alert_origin_error",
-    "image_notification",
-    "image_resizing_notification",
-    "incident_alert",
-    "load_balancing_health_alert",
-    "load_balancing_pool_enablement_alert",
-    "logo_match_alert",
-    "magic_tunnel_health_check_event",
-    "magic_wan_tunnel_health",
-    "maintenance_event_notification",
-    "mtls_certificate_store_certificate_expiration_type",
-    "pages_event_alert",
-    "radar_notification",
-    "real_origin_monitoring",
-    "scriptmonitor_alert_new_code_change_detections",
-    "scriptmonitor_alert_new_hosts",
-    "scriptmonitor_alert_new_malicious_hosts",
-    "scriptmonitor_alert_new_malicious_scripts",
-    "scriptmonitor_alert_new_malicious_url",
-    "scriptmonitor_alert_new_max_length_resource_url",
-    "scriptmonitor_alert_new_resources",
-    "secondary_dns_all_primaries_failing",
-    "secondary_dns_primaries_failing",
-    "secondary_dns_warning",
-    "secondary_dns_zone_successfully_updated",
-    "secondary_dns_zone_validation_warning",
-    "security_insights_alert",
-    "sentinel_alert",
-    "stream_live_notifications",
-    "synthetic_test_latency_alert",
-    "synthetic_test_low_availability_alert",
-    "traffic_anomalies_alert",
-    "tunnel_health_event",
-    "tunnel_update_event",
-    "universal_ssl_event_type",
-    "web_analytics_metrics_update",
-    "zone_aop_custom_certificate_expiration_type"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_enabled`.
- */
-export const aaa_enabled: JsonSchema = {
-  "description": "Whether or not the Notification policy is enabled.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `aaa_filters`.
  */
@@ -448,8 +353,8 @@ export const aaa_mechanisms: JsonSchema = {
       "items": {
         "properties": {
           "id": {
-            "$ref": "#/$defs/aaa_uuid",
-            "description": "UUID"
+            "description": "UUID",
+            "type": "string"
           }
         },
         "type": "object"
@@ -460,8 +365,8 @@ export const aaa_mechanisms: JsonSchema = {
       "items": {
         "properties": {
           "id": {
-            "$ref": "#/$defs/aaa_uuid",
-            "description": "UUID"
+            "description": "UUID",
+            "type": "string"
           }
         },
         "type": "object"
@@ -471,11 +376,3 @@ export const aaa_mechanisms: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `aaa_schemas-description`.
- */
-export const aaa_schemas_description: JsonSchema = {
-  "description": "Optional description for the Notification policy.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/policies/tools.ts b/src/generated/forge-mcp/alerting/policies/tools.ts
index a9625b420..6a03555d5 100644
--- a/src/generated/forge-mcp/alerting/policies/tools.ts
+++ b/src/generated/forge-mcp/alerting/policies/tools.ts
@@ -3,42 +3,24 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  aaa_api_response_collection_output,
-  aaa_api_response_common_2_output,
-  aaa_api_response_common_failure_3_output,
-  aaa_api_response_single_output,
-  aaa_id_response_output,
-  aaa_messages_3_output,
-  aaa_policy_id_output,
-  aaa_result_info_2_output,
-  aaa_schemas_name_output,
-  aaa_uuid_output,
+  aaa_api$$response$$collection,
+  aaa_api$$response$$common$$2,
+  aaa_api$$response$$common$$failure$$3,
+  aaa_api$$response$$single,
+  aaa_id_response,
+  aaa_messages$$3,
+  aaa_result_info$$2,
 } from "../outputs.js";
 import {
-  aaa_account_id,
-  aaa_policy_id,
-  aaa_schemas_name,
-  aaa_uuid,
-} from "../schemas.js";
-import {
-  aaa_alert_interval_output,
-  aaa_alert_type_output,
-  aaa_enabled_output,
-  aaa_filters_output,
-  aaa_mechanisms_output,
-  aaa_policies_components_schemas_response_collection_output,
-  aaa_policies_output,
-  aaa_schemas_description_output,
-  aaa_single_response_output,
-  aaa_timestamp_output,
-} from "./outputs.js";
-import {
-  aaa_alert_interval,
-  aaa_alert_type,
-  aaa_enabled,
   aaa_filters,
   aaa_mechanisms,
-  aaa_schemas_description,
+  aaa_policies,
+  aaa_policies_components$$schemas$$response_collection,
+  aaa_single_response,
+} from "./outputs.js";
+import {
+  aaa_filters as aaa_filters$,
+  aaa_mechanisms as aaa_mechanisms$,
 } from "./schemas.js";
 
 /**
@@ -48,32 +30,99 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_policies_create",
     title: "Create a Notification policy",
-    description: "Creates a new Notification policy.",
+    description: "Creates a new Notification policy.\n\nPOST /accounts/{account_id}/alerting/v3/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
         "body": {
           "properties": {
             "alert_interval": {
-              "$ref": "#/$defs/aaa_alert_interval",
-              "description": "Optional specification of how often to re-alert from the same incident, not support on all alert types."
+              "description": "Optional specification of how often to re-alert from the same incident, not support on all alert types.",
+              "type": "string"
             },
             "alert_type": {
-              "$ref": "#/$defs/aaa_alert_type",
-              "description": "Refers to which event will trigger a Notification dispatch. You can use the endpoint to get available alert types which then will give you a list of possible values."
+              "description": "Refers to which event will trigger a Notification dispatch. You can use the endpoint to get available alert types which then will give you a list of possible values.",
+              "enum": [
+                "abuse_report_alert",
+                "access_custom_certificate_expiration_type",
+                "advanced_ddos_attack_l4_alert",
+                "advanced_ddos_attack_l7_alert",
+                "advanced_http_alert_error",
+                "bgp_hijack_notification",
+                "billing_usage_alert",
+                "block_notification_block_removed",
+                "block_notification_new_block",
+                "block_notification_review_rejected",
+                "bot_traffic_basic_alert",
+                "brand_protection_alert",
+                "brand_protection_digest",
+                "clickhouse_alert_fw_anomaly",
+                "clickhouse_alert_fw_ent_anomaly",
+                "cloudforce_one_request_notification",
+                "cni_maintenance_notification",
+                "custom_analytics",
+                "custom_bot_detection_alert",
+                "custom_ssl_certificate_event_type",
+                "dedicated_ssl_certificate_event_type",
+                "device_connectivity_anomaly_alert",
+                "dos_attack_l4",
+                "dos_attack_l7",
+                "expiring_service_token_alert",
+                "failing_logpush_job_disabled_alert",
+                "fbm_auto_advertisement",
+                "fbm_dosd_attack",
+                "fbm_volumetric_attack",
+                "health_check_status_notification",
+                "hostname_aop_custom_certificate_expiration_type",
+                "http_alert_edge_error",
+                "http_alert_origin_error",
+                "image_notification",
+                "image_resizing_notification",
+                "incident_alert",
+                "load_balancing_health_alert",
+                "load_balancing_pool_enablement_alert",
+                "logo_match_alert",
+                "magic_tunnel_health_check_event",
+                "magic_wan_tunnel_health",
+                "maintenance_event_notification",
+                "mtls_certificate_store_certificate_expiration_type",
+                "pages_event_alert",
+                "radar_notification",
+                "real_origin_monitoring",
+                "scriptmonitor_alert_new_code_change_detections",
+                "scriptmonitor_alert_new_hosts",
+                "scriptmonitor_alert_new_malicious_hosts",
+                "scriptmonitor_alert_new_malicious_scripts",
+                "scriptmonitor_alert_new_malicious_url",
+                "scriptmonitor_alert_new_max_length_resource_url",
+                "scriptmonitor_alert_new_resources",
+                "secondary_dns_all_primaries_failing",
+                "secondary_dns_primaries_failing",
+                "secondary_dns_warning",
+                "secondary_dns_zone_successfully_updated",
+                "secondary_dns_zone_validation_warning",
+                "security_insights_alert",
+                "sentinel_alert",
+                "stream_live_notifications",
+                "synthetic_test_latency_alert",
+                "synthetic_test_low_availability_alert",
+                "traffic_anomalies_alert",
+                "tunnel_health_event",
+                "tunnel_update_event",
+                "universal_ssl_event_type",
+                "web_analytics_metrics_update",
+                "zone_aop_custom_certificate_expiration_type"
+              ],
+              "type": "string"
             },
             "description": {
-              "$ref": "#/$defs/aaa_schemas-description",
-              "description": "Optional description for the Notification policy."
+              "description": "Optional description for the Notification policy.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/aaa_enabled",
               "default": true,
-              "description": "Whether or not the Notification policy is enabled."
+              "description": "Whether or not the Notification policy is enabled.",
+              "type": "boolean"
             },
             "filters": {
               "$ref": "#/$defs/aaa_filters",
@@ -84,8 +133,8 @@ export const tools: readonly Tool[] = [
               "description": "List of IDs that will be used when dispatching a notification. IDs for email type will be the email address."
             },
             "name": {
-              "$ref": "#/$defs/aaa_schemas-name",
-              "description": "Name of the policy."
+              "description": "Name of the policy.",
+              "type": "string"
             }
           },
           "required": [
@@ -95,31 +144,37 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_alert_interval": aaa_alert_interval,
-        "aaa_alert_type": aaa_alert_type,
-        "aaa_enabled": aaa_enabled,
-        "aaa_filters": aaa_filters,
-        "aaa_mechanisms": aaa_mechanisms,
-        "aaa_schemas-description": aaa_schemas_description,
-        "aaa_schemas-name": aaa_schemas_name,
-        "aaa_uuid": aaa_uuid,
+        "aaa_filters": aaa_filters$,
+        "aaa_mechanisms": aaa_mechanisms$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_id_response",
       $defs: {
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -154,11 +209,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
@@ -169,35 +223,41 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_policies_delete",
     title: "Delete a Notification policy",
-    description: "Delete a Notification policy.\n\nConfirm with the user before calling this tool. This operation deletes the notification policy.",
+    description: "Delete a Notification policy.\n\nConfirm with the user before calling this tool. This operation deletes the notification policy.\n\nDELETE /accounts/{account_id}/alerting/v3/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
-        "policy_id": {
-          "$ref": "#/$defs/aaa_policy-id",
-          "description": "The unique identifier of a notification policy"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The unique identifier of a notification policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_policy-id": aaa_policy_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_api-response-collection",
       $defs: {
-        "aaa_api-response-collection": aaa_api_response_collection_output,
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_result_info-2": aaa_result_info_2_output,
+        "aaa_api-response-collection": aaa_api$$response$$collection,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_result_info-2": aaa_result_info$$2,
       },
     },
     annotations: {
@@ -232,11 +292,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-collection": aaa_api_response_collection_output,
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_result_info-2": aaa_result_info_2_output,
+        "aaa_api-response-collection": aaa_api$$response$$collection,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_result_info-2": aaa_result_info$$2,
       },
     },
     request: (args) => ({
@@ -246,45 +306,43 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_policies_get",
     title: "Get a Notification policy",
-    description: "Get details for a single policy.",
+    description: "Get details for a single policy.\n\nGET /accounts/{account_id}/alerting/v3/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
-        "policy_id": {
-          "$ref": "#/$defs/aaa_policy-id",
-          "description": "The unique identifier of a notification policy"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The unique identifier of a notification policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_policy-id": aaa_policy_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_single_response",
       $defs: {
-        "aaa_alert_interval": aaa_alert_interval_output,
-        "aaa_alert_type": aaa_alert_type_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_enabled": aaa_enabled_output,
-        "aaa_filters": aaa_filters_output,
-        "aaa_mechanisms": aaa_mechanisms_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policies": aaa_policies_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_schemas-description": aaa_schemas_description_output,
-        "aaa_schemas-name": aaa_schemas_name_output,
-        "aaa_single_response": aaa_single_response_output,
-        "aaa_timestamp": aaa_timestamp_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_filters": aaa_filters,
+        "aaa_mechanisms": aaa_mechanisms,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_policies": aaa_policies,
+        "aaa_single_response": aaa_single_response,
       },
     },
     annotations: {
@@ -322,21 +380,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_alert_interval": aaa_alert_interval_output,
-        "aaa_alert_type": aaa_alert_type_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_enabled": aaa_enabled_output,
-        "aaa_filters": aaa_filters_output,
-        "aaa_mechanisms": aaa_mechanisms_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policies": aaa_policies_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_schemas-description": aaa_schemas_description_output,
-        "aaa_schemas-name": aaa_schemas_name_output,
-        "aaa_single_response": aaa_single_response_output,
-        "aaa_timestamp": aaa_timestamp_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_filters": aaa_filters,
+        "aaa_mechanisms": aaa_mechanisms,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_policies": aaa_policies,
+        "aaa_single_response": aaa_single_response,
       },
     },
     request: (args) => ({
@@ -346,39 +396,38 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_policies_list",
     title: "List Notification policies",
-    description: "Get a list of all Notification policies.",
+    description: "Get a list of all Notification policies.\n\nGET /accounts/{account_id}/alerting/v3/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_policies_components-schemas-response_collection",
       $defs: {
-        "aaa_alert_interval": aaa_alert_interval_output,
-        "aaa_alert_type": aaa_alert_type_output,
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_enabled": aaa_enabled_output,
-        "aaa_filters": aaa_filters_output,
-        "aaa_mechanisms": aaa_mechanisms_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policies": aaa_policies_output,
-        "aaa_policies_components-schemas-response_collection": aaa_policies_components_schemas_response_collection_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_schemas-description": aaa_schemas_description_output,
-        "aaa_schemas-name": aaa_schemas_name_output,
-        "aaa_timestamp": aaa_timestamp_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_filters": aaa_filters,
+        "aaa_mechanisms": aaa_mechanisms,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_policies": aaa_policies,
+        "aaa_policies_components-schemas-response_collection": aaa_policies_components$$schemas$$response_collection,
       },
     },
     annotations: {
@@ -409,21 +458,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_alert_interval": aaa_alert_interval_output,
-        "aaa_alert_type": aaa_alert_type_output,
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_enabled": aaa_enabled_output,
-        "aaa_filters": aaa_filters_output,
-        "aaa_mechanisms": aaa_mechanisms_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policies": aaa_policies_output,
-        "aaa_policies_components-schemas-response_collection": aaa_policies_components_schemas_response_collection_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_schemas-description": aaa_schemas_description_output,
-        "aaa_schemas-name": aaa_schemas_name_output,
-        "aaa_timestamp": aaa_timestamp_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_filters": aaa_filters,
+        "aaa_mechanisms": aaa_mechanisms,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_policies": aaa_policies,
+        "aaa_policies_components-schemas-response_collection": aaa_policies_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
@@ -433,14 +474,10 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_policies_test",
     title: "Test a Notification policy",
-    description: "Send a test notification for a policy to verify delivery mechanisms are working as expected.",
+    description: "Send a test notification for a policy to verify delivery mechanisms are working as expected.\n\nPOST /accounts/{account_id}/alerting/v3/policies/{policy_id}/test",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
         "body": {
           "description": "Optional configuration for the test notification. When omitted, a default INFO-severity test alert is sent.",
           "properties": {
@@ -475,25 +512,35 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "policy_id": {
-          "$ref": "#/$defs/aaa_policy-id",
-          "description": "The unique identifier of a notification policy"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The unique identifier of a notification policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_policy-id": aaa_policy_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_api-response-common-2",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -521,9 +568,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
@@ -534,32 +581,99 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_policies_update",
     title: "Update a Notification policy",
-    description: "Update a Notification policy.",
+    description: "Update a Notification policy.\n\nPUT /accounts/{account_id}/alerting/v3/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
         "body": {
           "properties": {
             "alert_interval": {
-              "$ref": "#/$defs/aaa_alert_interval",
-              "description": "Optional specification of how often to re-alert from the same incident, not support on all alert types."
+              "description": "Optional specification of how often to re-alert from the same incident, not support on all alert types.",
+              "type": "string"
             },
             "alert_type": {
-              "$ref": "#/$defs/aaa_alert_type",
-              "description": "Refers to which event will trigger a Notification dispatch. You can use the endpoint to get available alert types which then will give you a list of possible values."
+              "description": "Refers to which event will trigger a Notification dispatch. You can use the endpoint to get available alert types which then will give you a list of possible values.",
+              "enum": [
+                "abuse_report_alert",
+                "access_custom_certificate_expiration_type",
+                "advanced_ddos_attack_l4_alert",
+                "advanced_ddos_attack_l7_alert",
+                "advanced_http_alert_error",
+                "bgp_hijack_notification",
+                "billing_usage_alert",
+                "block_notification_block_removed",
+                "block_notification_new_block",
+                "block_notification_review_rejected",
+                "bot_traffic_basic_alert",
+                "brand_protection_alert",
+                "brand_protection_digest",
+                "clickhouse_alert_fw_anomaly",
+                "clickhouse_alert_fw_ent_anomaly",
+                "cloudforce_one_request_notification",
+                "cni_maintenance_notification",
+                "custom_analytics",
+                "custom_bot_detection_alert",
+                "custom_ssl_certificate_event_type",
+                "dedicated_ssl_certificate_event_type",
+                "device_connectivity_anomaly_alert",
+                "dos_attack_l4",
+                "dos_attack_l7",
+                "expiring_service_token_alert",
+                "failing_logpush_job_disabled_alert",
+                "fbm_auto_advertisement",
+                "fbm_dosd_attack",
+                "fbm_volumetric_attack",
+                "health_check_status_notification",
+                "hostname_aop_custom_certificate_expiration_type",
+                "http_alert_edge_error",
+                "http_alert_origin_error",
+                "image_notification",
+                "image_resizing_notification",
+                "incident_alert",
+                "load_balancing_health_alert",
+                "load_balancing_pool_enablement_alert",
+                "logo_match_alert",
+                "magic_tunnel_health_check_event",
+                "magic_wan_tunnel_health",
+                "maintenance_event_notification",
+                "mtls_certificate_store_certificate_expiration_type",
+                "pages_event_alert",
+                "radar_notification",
+                "real_origin_monitoring",
+                "scriptmonitor_alert_new_code_change_detections",
+                "scriptmonitor_alert_new_hosts",
+                "scriptmonitor_alert_new_malicious_hosts",
+                "scriptmonitor_alert_new_malicious_scripts",
+                "scriptmonitor_alert_new_malicious_url",
+                "scriptmonitor_alert_new_max_length_resource_url",
+                "scriptmonitor_alert_new_resources",
+                "secondary_dns_all_primaries_failing",
+                "secondary_dns_primaries_failing",
+                "secondary_dns_warning",
+                "secondary_dns_zone_successfully_updated",
+                "secondary_dns_zone_validation_warning",
+                "security_insights_alert",
+                "sentinel_alert",
+                "stream_live_notifications",
+                "synthetic_test_latency_alert",
+                "synthetic_test_low_availability_alert",
+                "traffic_anomalies_alert",
+                "tunnel_health_event",
+                "tunnel_update_event",
+                "universal_ssl_event_type",
+                "web_analytics_metrics_update",
+                "zone_aop_custom_certificate_expiration_type"
+              ],
+              "type": "string"
             },
             "description": {
-              "$ref": "#/$defs/aaa_schemas-description",
-              "description": "Optional description for the Notification policy."
+              "description": "Optional description for the Notification policy.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/aaa_enabled",
               "default": true,
-              "description": "Whether or not the Notification policy is enabled."
+              "description": "Whether or not the Notification policy is enabled.",
+              "type": "boolean"
             },
             "filters": {
               "$ref": "#/$defs/aaa_filters",
@@ -570,42 +684,47 @@ export const tools: readonly Tool[] = [
               "description": "List of IDs that will be used when dispatching a notification. IDs for email type will be the email address."
             },
             "name": {
-              "$ref": "#/$defs/aaa_schemas-name",
-              "description": "Name of the policy."
+              "description": "Name of the policy.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "policy_id": {
-          "$ref": "#/$defs/aaa_policy-id",
-          "description": "The unique identifier of a notification policy"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The unique identifier of a notification policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_alert_interval": aaa_alert_interval,
-        "aaa_alert_type": aaa_alert_type,
-        "aaa_enabled": aaa_enabled,
-        "aaa_filters": aaa_filters,
-        "aaa_mechanisms": aaa_mechanisms,
-        "aaa_policy-id": aaa_policy_id,
-        "aaa_schemas-description": aaa_schemas_description,
-        "aaa_schemas-name": aaa_schemas_name,
-        "aaa_uuid": aaa_uuid,
+        "aaa_filters": aaa_filters$,
+        "aaa_mechanisms": aaa_mechanisms$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_id_response",
       $defs: {
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -640,11 +759,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_api-response-single": aaa_api_response_single_output,
-        "aaa_id_response": aaa_id_response_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_uuid": aaa_uuid_output,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_api-response-single": aaa_api$$response$$single,
+        "aaa_id_response": aaa_id_response,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/alerting/schemas.ts b/src/generated/forge-mcp/alerting/schemas.ts
deleted file mode 100644
index 21726e03d..000000000
--- a/src/generated/forge-mcp/alerting/schemas.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `aaa_account-id`.
- */
-export const aaa_account_id: JsonSchema = {
-  "description": "The account id",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_policy-id`.
- */
-export const aaa_policy_id: JsonSchema = {
-  "description": "The unique identifier of a notification policy",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_schemas-name`.
- */
-export const aaa_schemas_name: JsonSchema = {
-  "description": "Name of the policy.",
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_uuid`.
- */
-export const aaa_uuid: JsonSchema = {
-  "description": "UUID",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/alerting/silences/outputs.ts b/src/generated/forge-mcp/alerting/silences/outputs.ts
index 9070f6ae3..73f166ee5 100644
--- a/src/generated/forge-mcp/alerting/silences/outputs.ts
+++ b/src/generated/forge-mcp/alerting/silences/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `aaa_silence` in responses.
  */
-export const aaa_silence_output: JsonSchema = {
+export const aaa_silence: JsonSchema = {
   "properties": {
     "created_at": {
       "type": "string"
@@ -15,10 +15,10 @@ export const aaa_silence_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/aaa_silence-id"
+      "type": "string"
     },
     "policy_id": {
-      "$ref": "#/$defs/aaa_policy-id"
+      "type": "string"
     },
     "start_time": {
       "type": "string"
@@ -30,18 +30,11 @@ export const aaa_silence_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `aaa_silence-id` in responses.
- */
-export const aaa_silence_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_silence_components-schemas-response_collection` in
  * responses.
  */
-export const aaa_silence_components_schemas_response_collection_output: JsonSchema = {
+export const aaa_silence_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-common-2"
@@ -61,7 +54,7 @@ export const aaa_silence_components_schemas_response_collection_output: JsonSche
  * The schema of `aaa_silences_components-schemas-response_collection` in
  * responses.
  */
-export const aaa_silences_components_schemas_response_collection_output: JsonSchema = {
+export const aaa_silences_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_api-response-common-2"
diff --git a/src/generated/forge-mcp/alerting/silences/schemas.ts b/src/generated/forge-mcp/alerting/silences/schemas.ts
index 931f8f165..030cbff00 100644
--- a/src/generated/forge-mcp/alerting/silences/schemas.ts
+++ b/src/generated/forge-mcp/alerting/silences/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `aaa_silence-id`.
- */
-export const aaa_silence_id: JsonSchema = {
-  "description": "Silence ID",
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_silence_create_request`.
  */
@@ -21,8 +13,8 @@ export const aaa_silence_create_request: JsonSchema = {
       "type": "string"
     },
     "policy_id": {
-      "$ref": "#/$defs/aaa_policy-id",
-      "description": "The unique identifier of a notification policy"
+      "description": "The unique identifier of a notification policy",
+      "type": "string"
     },
     "start_time": {
       "description": "When the silence starts.",
@@ -42,8 +34,8 @@ export const aaa_silence_update_request: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/aaa_silence-id",
-      "description": "Silence ID"
+      "description": "Silence ID",
+      "type": "string"
     },
     "start_time": {
       "description": "When the silence starts.",
diff --git a/src/generated/forge-mcp/alerting/silences/tools.ts b/src/generated/forge-mcp/alerting/silences/tools.ts
index 988dfc777..8f3298e82 100644
--- a/src/generated/forge-mcp/alerting/silences/tools.ts
+++ b/src/generated/forge-mcp/alerting/silences/tools.ts
@@ -3,21 +3,17 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  aaa_api_response_common_2_output,
-  aaa_api_response_common_failure_3_output,
-  aaa_messages_3_output,
-  aaa_policy_id_output,
+  aaa_api$$response$$common$$2,
+  aaa_api$$response$$common$$failure$$3,
+  aaa_messages$$3,
 } from "../outputs.js";
-import { aaa_account_id, aaa_policy_id } from "../schemas.js";
 import {
-  aaa_silence_components_schemas_response_collection_output,
-  aaa_silence_id_output,
-  aaa_silence_output,
-  aaa_silences_components_schemas_response_collection_output,
+  aaa_silence,
+  aaa_silence_components$$schemas$$response_collection,
+  aaa_silences_components$$schemas$$response_collection,
 } from "./outputs.js";
 import {
   aaa_silence_create_request,
-  aaa_silence_id,
   aaa_silence_update_request,
 } from "./schemas.js";
 
@@ -28,36 +24,44 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_silences_create",
     title: "Create Silences",
-    description: "Creates a new silence for an account.",
+    description: "Creates a new silence for an account.\n\nPOST /accounts/{account_id}/alerting/v3/silences",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
         "body": {
           "items": {
             "$ref": "#/$defs/aaa_silence_create_request"
           },
           "type": "array"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_policy-id": aaa_policy_id,
         "aaa_silence_create_request": aaa_silence_create_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_api-response-common-2",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -92,13 +96,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_silence": aaa_silence_output,
-        "aaa_silence-id": aaa_silence_id_output,
-        "aaa_silences_components-schemas-response_collection": aaa_silences_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_silence": aaa_silence,
+        "aaa_silences_components-schemas-response_collection": aaa_silences_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
@@ -109,33 +111,39 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_silences_delete",
     title: "Delete Silence",
-    description: "Deletes an existing silence for an account.\n\nConfirm with the user before calling this tool. This operation deletes the notification silence.",
+    description: "Deletes an existing silence for an account.\n\nConfirm with the user before calling this tool. This operation deletes the notification silence.\n\nDELETE /accounts/{account_id}/alerting/v3/silences/{silence_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
-        "silence_id": {
-          "$ref": "#/$defs/aaa_silence-id",
-          "description": "Silence ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "silence_id": {
+              "description": "Silence ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "silence_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "silence_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_silence-id": aaa_silence_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_api-response-common-2",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
       },
     },
     annotations: {
@@ -170,13 +178,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_silence": aaa_silence_output,
-        "aaa_silence-id": aaa_silence_id_output,
-        "aaa_silence_components-schemas-response_collection": aaa_silence_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_silence": aaa_silence,
+        "aaa_silence_components-schemas-response_collection": aaa_silence_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
@@ -186,37 +192,41 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_silences_get",
     title: "Get Silence",
-    description: "Gets a specific silence for an account.",
+    description: "Gets a specific silence for an account.\n\nGET /accounts/{account_id}/alerting/v3/silences/{silence_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
-        "silence_id": {
-          "$ref": "#/$defs/aaa_silence-id",
-          "description": "Silence ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            },
+            "silence_id": {
+              "description": "Silence ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "silence_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "silence_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_silence-id": aaa_silence_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_silence_components-schemas-response_collection",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_silence": aaa_silence_output,
-        "aaa_silence-id": aaa_silence_id_output,
-        "aaa_silence_components-schemas-response_collection": aaa_silence_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_silence": aaa_silence,
+        "aaa_silence_components-schemas-response_collection": aaa_silence_components$$schemas$$response_collection,
       },
     },
     annotations: {
@@ -254,13 +264,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_silence": aaa_silence_output,
-        "aaa_silence-id": aaa_silence_id_output,
-        "aaa_silence_components-schemas-response_collection": aaa_silence_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_silence": aaa_silence,
+        "aaa_silence_components-schemas-response_collection": aaa_silence_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
@@ -270,31 +278,36 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_silences_list",
     title: "List Silences",
-    description: "Gets a list of silences for an account.",
+    description: "Gets a list of silences for an account.\n\nGET /accounts/{account_id}/alerting/v3/silences",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_account-id": aaa_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_silences_components-schemas-response_collection",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_silence": aaa_silence_output,
-        "aaa_silence-id": aaa_silence_id_output,
-        "aaa_silences_components-schemas-response_collection": aaa_silences_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_silence": aaa_silence,
+        "aaa_silences_components-schemas-response_collection": aaa_silences_components$$schemas$$response_collection,
       },
     },
     annotations: {
@@ -332,13 +345,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_silence": aaa_silence_output,
-        "aaa_silence-id": aaa_silence_id_output,
-        "aaa_silences_components-schemas-response_collection": aaa_silences_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_silence": aaa_silence,
+        "aaa_silences_components-schemas-response_collection": aaa_silences_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
@@ -348,40 +359,46 @@ export const tools: readonly Tool[] = [
   {
     name: "alerting_silences_update",
     title: "Update Silences",
-    description: "Updates existing silences for an account.",
+    description: "Updates existing silences for an account.\n\nPUT /accounts/{account_id}/alerting/v3/silences",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_account-id",
-          "description": "The account id"
-        },
         "body": {
           "items": {
             "$ref": "#/$defs/aaa_silence_update_request"
           },
           "type": "array"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "aaa_account-id": aaa_account_id,
-        "aaa_silence-id": aaa_silence_id,
         "aaa_silence_update_request": aaa_silence_update_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_silences_components-schemas-response_collection",
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_silence": aaa_silence_output,
-        "aaa_silence-id": aaa_silence_id_output,
-        "aaa_silences_components-schemas-response_collection": aaa_silences_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_silence": aaa_silence,
+        "aaa_silences_components-schemas-response_collection": aaa_silences_components$$schemas$$response_collection,
       },
     },
     annotations: {
@@ -416,13 +433,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-2": aaa_api_response_common_2_output,
-        "aaa_api-response-common-failure-3": aaa_api_response_common_failure_3_output,
-        "aaa_messages-3": aaa_messages_3_output,
-        "aaa_policy-id": aaa_policy_id_output,
-        "aaa_silence": aaa_silence_output,
-        "aaa_silence-id": aaa_silence_id_output,
-        "aaa_silences_components-schemas-response_collection": aaa_silences_components_schemas_response_collection_output,
+        "aaa_api-response-common-2": aaa_api$$response$$common$$2,
+        "aaa_api-response-common-failure-3": aaa_api$$response$$common$$failure$$3,
+        "aaa_messages-3": aaa_messages$$3,
+        "aaa_silence": aaa_silence,
+        "aaa_silences_components-schemas-response_collection": aaa_silences_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/analytics/latency/colos/tools.ts b/src/generated/forge-mcp/analytics/latency/colos/tools.ts
index ba227ddbc..3a0be4c29 100644
--- a/src/generated/forge-mcp/analytics/latency/colos/tools.ts
+++ b/src/generated/forge-mcp/analytics/latency/colos/tools.ts
@@ -3,13 +3,12 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  argo_analytics_api_response_common_failure_output,
-  argo_analytics_api_response_common_output,
-  argo_analytics_api_response_single_output,
-  argo_analytics_messages_output,
-  argo_analytics_response_single_output,
+  argo$$analytics_api$$response$$common,
+  argo$$analytics_api$$response$$common$$failure,
+  argo$$analytics_api$$response$$single,
+  argo$$analytics_messages,
+  argo$$analytics_response_single,
 } from "../outputs.js";
-import { argo_analytics_identifier } from "../schemas.js";
 
 /**
  * The tools of `analytics.latency.colos`.
@@ -18,29 +17,36 @@ export const tools: readonly Tool[] = [
   {
     name: "analytics_latency_colos_get",
     title: "Argo Analytics for a zone at different PoPs",
-    description: "Retrieves Argo Smart Routing analytics broken down by geographic points of presence (PoPs). Shows latency improvements and routing efficiency per location.",
+    description: "Retrieves Argo Smart Routing analytics broken down by geographic points of presence (PoPs). Shows latency improvements and routing efficiency per location.\n\nGET /zones/{zone_id}/analytics/latency/colos",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/argo-analytics_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "argo-analytics_identifier": argo_analytics_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/argo-analytics_response_single",
       $defs: {
-        "argo-analytics_api-response-common": argo_analytics_api_response_common_output,
-        "argo-analytics_api-response-single": argo_analytics_api_response_single_output,
-        "argo-analytics_messages": argo_analytics_messages_output,
-        "argo-analytics_response_single": argo_analytics_response_single_output,
+        "argo-analytics_api-response-common": argo$$analytics_api$$response$$common,
+        "argo-analytics_api-response-single": argo$$analytics_api$$response$$single,
+        "argo-analytics_messages": argo$$analytics_messages,
+        "argo-analytics_response_single": argo$$analytics_response_single,
       },
     },
     annotations: {
@@ -80,11 +86,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "argo-analytics_api-response-common": argo_analytics_api_response_common_output,
-        "argo-analytics_api-response-common-failure": argo_analytics_api_response_common_failure_output,
-        "argo-analytics_api-response-single": argo_analytics_api_response_single_output,
-        "argo-analytics_messages": argo_analytics_messages_output,
-        "argo-analytics_response_single": argo_analytics_response_single_output,
+        "argo-analytics_api-response-common": argo$$analytics_api$$response$$common,
+        "argo-analytics_api-response-common-failure": argo$$analytics_api$$response$$common$$failure,
+        "argo-analytics_api-response-single": argo$$analytics_api$$response$$single,
+        "argo-analytics_messages": argo$$analytics_messages,
+        "argo-analytics_response_single": argo$$analytics_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/analytics/latency/outputs.ts b/src/generated/forge-mcp/analytics/latency/outputs.ts
index fd6fb0439..5009b9b9a 100644
--- a/src/generated/forge-mcp/analytics/latency/outputs.ts
+++ b/src/generated/forge-mcp/analytics/latency/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `argo-analytics_api-response-common` in responses.
  */
-export const argo_analytics_api_response_common_output: JsonSchema = {
+export const argo$$analytics_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/argo-analytics_messages"
@@ -47,7 +47,7 @@ export const argo_analytics_api_response_common_output: JsonSchema = {
 /**
  * The schema of `argo-analytics_api-response-common-failure` in responses.
  */
-export const argo_analytics_api_response_common_failure_output: JsonSchema = {
+export const argo$$analytics_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/argo-analytics_messages"
@@ -77,7 +77,7 @@ export const argo_analytics_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `argo-analytics_api-response-single` in responses.
  */
-export const argo_analytics_api_response_single_output: JsonSchema = {
+export const argo$$analytics_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/argo-analytics_api-response-common"
@@ -106,7 +106,7 @@ export const argo_analytics_api_response_single_output: JsonSchema = {
 /**
  * The schema of `argo-analytics_messages` in responses.
  */
-export const argo_analytics_messages_output: JsonSchema = {
+export const argo$$analytics_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -128,7 +128,7 @@ export const argo_analytics_messages_output: JsonSchema = {
 /**
  * The schema of `argo-analytics_response_single` in responses.
  */
-export const argo_analytics_response_single_output: JsonSchema = {
+export const argo$$analytics_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/argo-analytics_api-response-single"
diff --git a/src/generated/forge-mcp/analytics/latency/schemas.ts b/src/generated/forge-mcp/analytics/latency/schemas.ts
deleted file mode 100644
index 8883586c8..000000000
--- a/src/generated/forge-mcp/analytics/latency/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `argo-analytics_identifier`.
- */
-export const argo_analytics_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/analytics/latency/tools.ts b/src/generated/forge-mcp/analytics/latency/tools.ts
index af9d50fb7..e418dcd52 100644
--- a/src/generated/forge-mcp/analytics/latency/tools.ts
+++ b/src/generated/forge-mcp/analytics/latency/tools.ts
@@ -1,15 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  argo_analytics_api_response_common_failure_output,
-  argo_analytics_api_response_common_output,
-  argo_analytics_api_response_single_output,
-  argo_analytics_messages_output,
-  argo_analytics_response_single_output,
+  argo$$analytics_api$$response$$common,
+  argo$$analytics_api$$response$$common$$failure,
+  argo$$analytics_api$$response$$single,
+  argo$$analytics_messages,
+  argo$$analytics_response_single,
 } from "./outputs.js";
-import { argo_analytics_identifier } from "./schemas.js";
 
 /**
  * The tools of `analytics.latency`.
@@ -18,32 +17,45 @@ export const tools: readonly Tool[] = [
   {
     name: "analytics_latency_get",
     title: "Argo Analytics for a zone",
-    description: "Retrieves aggregate Argo Smart Routing analytics for a zone, including latency improvements, bandwidth savings, and routing statistics.",
+    description: "Retrieves aggregate Argo Smart Routing analytics for a zone, including latency improvements, bandwidth savings, and routing statistics.\n\nGET /zones/{zone_id}/analytics/latency",
     inputSchema: {
       type: "object",
       properties: {
-        "bins": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/argo-analytics_identifier",
-          "description": "Identifier"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "bins": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "argo-analytics_identifier": argo_analytics_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/argo-analytics_response_single",
       $defs: {
-        "argo-analytics_api-response-common": argo_analytics_api_response_common_output,
-        "argo-analytics_api-response-single": argo_analytics_api_response_single_output,
-        "argo-analytics_messages": argo_analytics_messages_output,
-        "argo-analytics_response_single": argo_analytics_response_single_output,
+        "argo-analytics_api-response-common": argo$$analytics_api$$response$$common,
+        "argo-analytics_api-response-single": argo$$analytics_api$$response$$single,
+        "argo-analytics_messages": argo$$analytics_messages,
+        "argo-analytics_response_single": argo$$analytics_response_single,
       },
     },
     annotations: {
@@ -88,17 +100,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "argo-analytics_api-response-common": argo_analytics_api_response_common_output,
-        "argo-analytics_api-response-common-failure": argo_analytics_api_response_common_failure_output,
-        "argo-analytics_api-response-single": argo_analytics_api_response_single_output,
-        "argo-analytics_messages": argo_analytics_messages_output,
-        "argo-analytics_response_single": argo_analytics_response_single_output,
+        "argo-analytics_api-response-common": argo$$analytics_api$$response$$common,
+        "argo-analytics_api-response-common-failure": argo$$analytics_api$$response$$common$$failure,
+        "argo-analytics_api-response-single": argo$$analytics_api$$response$$single,
+        "argo-analytics_messages": argo$$analytics_messages,
+        "argo-analytics_response_single": argo$$analytics_response_single,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/analytics/latency`,
       query: [
-        ["bins", args["bins"], true],
+        ["bins", param(args, "query", "bins"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/analytics/query/dataSecurity/contentFindings/tools.ts b/src/generated/forge-mcp/analytics/query/dataSecurity/contentFindings/tools.ts
index 137d20262..c8ff7cc96 100644
--- a/src/generated/forge-mcp/analytics/query/dataSecurity/contentFindings/tools.ts
+++ b/src/generated/forge-mcp/analytics/query/dataSecurity/contentFindings/tools.ts
@@ -3,38 +3,48 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  art_APIError_output,
-  art_APIMessage_output,
-  art_ErrorResponse_output,
-  art_ResultValues_output,
-  art_TopNResponse_output,
+  art_APIError,
+  art_APIMessage,
+  art_ErrorResponse,
+  art_ResultValues,
+  art_TopNResponse,
 } from "../../outputs.js";
 import { art_Filter } from "../../schemas.js";
 import { art_DataSecurityContentFindingsTopNQuery } from "./schemas.js";
 
 /**
- * The tools of `analytics.query.data_security.content_findings`.
+ * The tools of `analytics.query.dataSecurity.contentFindings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "analytics_query_data_security_content_findings_top_n",
+    name: "analytics_query_dataSecurity_contentFindings_topN",
     title: "Top integrations by content findings",
-    description: "Returns the top N integrations ranked by total content findings.\n\nThis method is beta.",
+    description: "Returns the top N integrations ranked by total content findings.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/analytics/query/data-security/content-findings/top-n",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/art_DataSecurityContentFindingsTopNQuery"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "art_DataSecurityContentFindingsTopNQuery": art_DataSecurityContentFindingsTopNQuery,
         "art_Filter": art_Filter,
@@ -43,10 +53,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/art_TopNResponse",
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_TopNResponse": art_TopNResponse_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ResultValues": art_ResultValues,
+        "art_TopNResponse": art_TopNResponse,
       },
     },
     annotations: {
@@ -80,11 +90,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ErrorResponse": art_ErrorResponse_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_TopNResponse": art_TopNResponse_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ErrorResponse": art_ErrorResponse,
+        "art_ResultValues": art_ResultValues,
+        "art_TopNResponse": art_TopNResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/analytics/query/dataSecurity/findings/outputs.ts b/src/generated/forge-mcp/analytics/query/dataSecurity/findings/outputs.ts
index e2280a0b0..f7f2fb770 100644
--- a/src/generated/forge-mcp/analytics/query/dataSecurity/findings/outputs.ts
+++ b/src/generated/forge-mcp/analytics/query/dataSecurity/findings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `art_DataSecurityFindingsTimeseriesResponse` in responses.
  */
-export const art_DataSecurityFindingsTimeseriesResponse_output: JsonSchema = {
+export const art_DataSecurityFindingsTimeseriesResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -39,7 +39,7 @@ export const art_DataSecurityFindingsTimeseriesResponse_output: JsonSchema = {
 /**
  * The schema of `art_DataSecurityFindingsTimeseriesResult` in responses.
  */
-export const art_DataSecurityFindingsTimeseriesResult_output: JsonSchema = {
+export const art_DataSecurityFindingsTimeseriesResult: JsonSchema = {
   "properties": {
     "resolution": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/analytics/query/dataSecurity/findings/tools.ts b/src/generated/forge-mcp/analytics/query/dataSecurity/findings/tools.ts
index 01199d6c6..e4eaebde4 100644
--- a/src/generated/forge-mcp/analytics/query/dataSecurity/findings/tools.ts
+++ b/src/generated/forge-mcp/analytics/query/dataSecurity/findings/tools.ts
@@ -3,17 +3,17 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  art_APIError_output,
-  art_APIMessage_output,
-  art_ErrorResponse_output,
-  art_ResultValues_output,
-  art_SummaryResponse_output,
-  art_SummaryResult_output,
+  art_APIError,
+  art_APIMessage,
+  art_ErrorResponse,
+  art_ResultValues,
+  art_SummaryResponse,
+  art_SummaryResult,
 } from "../../outputs.js";
 import { art_Filter } from "../../schemas.js";
 import {
-  art_DataSecurityFindingsTimeseriesResponse_output,
-  art_DataSecurityFindingsTimeseriesResult_output,
+  art_DataSecurityFindingsTimeseriesResponse,
+  art_DataSecurityFindingsTimeseriesResult,
 } from "./outputs.js";
 import {
   art_DataSecurityFindingsSummaryQuery,
@@ -21,28 +21,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `analytics.query.data_security.findings`.
+ * The tools of `analytics.query.dataSecurity.findings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "analytics_query_data_security_findings_summary",
+    name: "analytics_query_dataSecurity_findings_summary",
     title: "Data security findings summary",
-    description: "Returns aggregate current-period and previous-period totals for CASB findings.\n\nThis method is beta.",
+    description: "Returns aggregate current-period and previous-period totals for CASB findings.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/analytics/query/data-security/findings/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/art_DataSecurityFindingsSummaryQuery"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "art_DataSecurityFindingsSummaryQuery": art_DataSecurityFindingsSummaryQuery,
         "art_Filter": art_Filter,
@@ -51,11 +61,11 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/art_SummaryResponse",
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_SummaryResponse": art_SummaryResponse_output,
-        "art_SummaryResult": art_SummaryResult_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ResultValues": art_ResultValues,
+        "art_SummaryResponse": art_SummaryResponse,
+        "art_SummaryResult": art_SummaryResult,
       },
     },
     annotations: {
@@ -89,12 +99,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ErrorResponse": art_ErrorResponse_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_SummaryResponse": art_SummaryResponse_output,
-        "art_SummaryResult": art_SummaryResult_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ErrorResponse": art_ErrorResponse,
+        "art_ResultValues": art_ResultValues,
+        "art_SummaryResponse": art_SummaryResponse,
+        "art_SummaryResult": art_SummaryResult,
       },
     },
     request: (args) => ({
@@ -103,24 +113,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "analytics_query_data_security_findings_timeseries",
+    name: "analytics_query_dataSecurity_findings_timeseries",
     title: "Data security findings timeseries",
-    description: "Returns merged time-bucketed CASB findings.\n\nThis method is beta.",
+    description: "Returns merged time-bucketed CASB findings.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/analytics/query/data-security/findings/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/art_DataSecurityFindingsTimeseriesQuery"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "art_DataSecurityFindingsTimeseriesQuery": art_DataSecurityFindingsTimeseriesQuery,
         "art_Filter": art_Filter,
@@ -129,11 +149,11 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/art_DataSecurityFindingsTimeseriesResponse",
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_DataSecurityFindingsTimeseriesResponse": art_DataSecurityFindingsTimeseriesResponse_output,
-        "art_DataSecurityFindingsTimeseriesResult": art_DataSecurityFindingsTimeseriesResult_output,
-        "art_ResultValues": art_ResultValues_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_DataSecurityFindingsTimeseriesResponse": art_DataSecurityFindingsTimeseriesResponse,
+        "art_DataSecurityFindingsTimeseriesResult": art_DataSecurityFindingsTimeseriesResult,
+        "art_ResultValues": art_ResultValues,
       },
     },
     annotations: {
@@ -167,12 +187,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_DataSecurityFindingsTimeseriesResponse": art_DataSecurityFindingsTimeseriesResponse_output,
-        "art_DataSecurityFindingsTimeseriesResult": art_DataSecurityFindingsTimeseriesResult_output,
-        "art_ErrorResponse": art_ErrorResponse_output,
-        "art_ResultValues": art_ResultValues_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_DataSecurityFindingsTimeseriesResponse": art_DataSecurityFindingsTimeseriesResponse,
+        "art_DataSecurityFindingsTimeseriesResult": art_DataSecurityFindingsTimeseriesResult,
+        "art_ErrorResponse": art_ErrorResponse,
+        "art_ResultValues": art_ResultValues,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/analytics/query/outputs.ts b/src/generated/forge-mcp/analytics/query/outputs.ts
index 6090dd1e7..02816a463 100644
--- a/src/generated/forge-mcp/analytics/query/outputs.ts
+++ b/src/generated/forge-mcp/analytics/query/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `art_APIError` in responses.
  */
-export const art_APIError_output: JsonSchema = {
+export const art_APIError: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -21,7 +21,7 @@ export const art_APIError_output: JsonSchema = {
 /**
  * The schema of `art_APIMessage` in responses.
  */
-export const art_APIMessage_output: JsonSchema = {
+export const art_APIMessage: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -36,7 +36,7 @@ export const art_APIMessage_output: JsonSchema = {
 /**
  * The schema of `art_ErrorResponse` in responses.
  */
-export const art_ErrorResponse_output: JsonSchema = {
+export const art_ErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -75,14 +75,14 @@ export const art_ErrorResponse_output: JsonSchema = {
 /**
  * The schema of `art_ResultValues` in responses.
  */
-export const art_ResultValues_output: JsonSchema = {
+export const art_ResultValues: JsonSchema = {
   "type": "object"
 };
 
 /**
  * The schema of `art_SummaryResponse` in responses.
  */
-export const art_SummaryResponse_output: JsonSchema = {
+export const art_SummaryResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -115,7 +115,7 @@ export const art_SummaryResponse_output: JsonSchema = {
 /**
  * The schema of `art_SummaryResult` in responses.
  */
-export const art_SummaryResult_output: JsonSchema = {
+export const art_SummaryResult: JsonSchema = {
   "properties": {
     "currentTotal": {
       "items": {
@@ -140,7 +140,7 @@ export const art_SummaryResult_output: JsonSchema = {
 /**
  * The schema of `art_TimeseriesResponse` in responses.
  */
-export const art_TimeseriesResponse_output: JsonSchema = {
+export const art_TimeseriesResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -173,7 +173,7 @@ export const art_TimeseriesResponse_output: JsonSchema = {
 /**
  * The schema of `art_TimeseriesResult` in responses.
  */
-export const art_TimeseriesResult_output: JsonSchema = {
+export const art_TimeseriesResult: JsonSchema = {
   "properties": {
     "resolution": {
       "type": "string"
@@ -195,7 +195,7 @@ export const art_TimeseriesResult_output: JsonSchema = {
 /**
  * The schema of `art_TopNResponse` in responses.
  */
-export const art_TopNResponse_output: JsonSchema = {
+export const art_TopNResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/analytics/query/schemas.ts b/src/generated/forge-mcp/analytics/query/schemas.ts
index b78ceb06a..d2cae1be2 100644
--- a/src/generated/forge-mcp/analytics/query/schemas.ts
+++ b/src/generated/forge-mcp/analytics/query/schemas.ts
@@ -62,7 +62,7 @@ export const art_Filter: JsonSchema = {
       "type": "string"
     },
     "op": {
-      "description": "Filter operator. Common values: `eq`, `neq`, `in`, `not_in`, `gt`, `lt`, `gte`, `lte`.\n",
+      "description": "Filter operator. Common values: `eq`, `neq`, `in`, `not_in`, `gt`, `lt`, `gte`, `lte`.",
       "type": "string"
     },
     "values": {
@@ -152,7 +152,7 @@ export const art_QueryTimeseries: JsonSchema = {
     {
       "properties": {
         "resolution": {
-          "description": "Time bucket size for grouping results. Controls the granularity of the returned time slots.\n",
+          "description": "Time bucket size for grouping results. Controls the granularity of the returned time slots.",
           "type": "string"
         }
       },
diff --git a/src/generated/forge-mcp/analytics/query/tools.ts b/src/generated/forge-mcp/analytics/query/tools.ts
index faf606e7d..b77007ad5 100644
--- a/src/generated/forge-mcp/analytics/query/tools.ts
+++ b/src/generated/forge-mcp/analytics/query/tools.ts
@@ -3,15 +3,15 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  art_APIError_output,
-  art_APIMessage_output,
-  art_ErrorResponse_output,
-  art_ResultValues_output,
-  art_SummaryResponse_output,
-  art_SummaryResult_output,
-  art_TimeseriesResponse_output,
-  art_TimeseriesResult_output,
-  art_TopNResponse_output,
+  art_APIError,
+  art_APIMessage,
+  art_ErrorResponse,
+  art_ResultValues,
+  art_SummaryResponse,
+  art_SummaryResult,
+  art_TimeseriesResponse,
+  art_TimeseriesResult,
+  art_TopNResponse,
 } from "./outputs.js";
 import {
   art_CommonQuery,
@@ -28,27 +28,37 @@ export const tools: readonly Tool[] = [
   {
     name: "analytics_query_summary",
     title: "Query analytics summary",
-    description: "Returns aggregate summary stats for a dataset. Includes current-period and previous-period totals for trend comparison.\n\nThis method is beta.",
+    description: "Returns aggregate summary stats for a dataset. Includes current-period and previous-period totals for trend comparison.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/analytics/query/{dataset}/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/art_QuerySummary"
         },
-        "dataset": {
-          "description": "Dataset name to query. Examples: `access-logins`, `gateway-http`, `gateway-dns`, `gateway-http`, `shadow-it`.\n",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "dataset": {
+              "description": "Dataset name to query. Examples: `access-logins`, `gateway-http`, `gateway-dns`, `gateway-http`, `shadow-it`.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "art_Filter": art_Filter,
         "art_QuerySummary": art_QuerySummary,
@@ -57,11 +67,11 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/art_SummaryResponse",
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_SummaryResponse": art_SummaryResponse_output,
-        "art_SummaryResult": art_SummaryResult_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ResultValues": art_ResultValues,
+        "art_SummaryResponse": art_SummaryResponse,
+        "art_SummaryResult": art_SummaryResult,
       },
     },
     annotations: {
@@ -95,12 +105,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ErrorResponse": art_ErrorResponse_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_SummaryResponse": art_SummaryResponse_output,
-        "art_SummaryResult": art_SummaryResult_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ErrorResponse": art_ErrorResponse,
+        "art_ResultValues": art_ResultValues,
+        "art_SummaryResponse": art_SummaryResponse,
+        "art_SummaryResult": art_SummaryResult,
       },
     },
     request: (args) => ({
@@ -111,27 +121,37 @@ export const tools: readonly Tool[] = [
   {
     name: "analytics_query_timeseries",
     title: "Query analytics timeseries",
-    description: "Returns time-bucketed analytics data for a dataset. Includes time slots, each containing the requested stats, group-by dimensions, and resolution-controlled bucket size (e.g. `hour`, `day`).\n\nThis method is beta.",
+    description: "Returns time-bucketed analytics data for a dataset. Includes time slots, each containing the requested stats, group-by dimensions, and resolution-controlled bucket size (e.g. `hour`, `day`).\n\nThis method is beta.\n\nPOST /accounts/{account_id}/analytics/query/{dataset}/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/art_QueryTimeseries"
         },
-        "dataset": {
-          "description": "Dataset name to query. Examples: `access-logins`, `gateway-http`, `gateway-dns`, `gateway-http`, `shadow-it`.\n",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "dataset": {
+              "description": "Dataset name to query. Examples: `access-logins`, `gateway-http`, `gateway-dns`, `gateway-http`, `shadow-it`.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "art_CommonQuery": art_CommonQuery,
         "art_Filter": art_Filter,
@@ -141,11 +161,11 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/art_TimeseriesResponse",
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_TimeseriesResponse": art_TimeseriesResponse_output,
-        "art_TimeseriesResult": art_TimeseriesResult_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ResultValues": art_ResultValues,
+        "art_TimeseriesResponse": art_TimeseriesResponse,
+        "art_TimeseriesResult": art_TimeseriesResult,
       },
     },
     annotations: {
@@ -179,12 +199,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ErrorResponse": art_ErrorResponse_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_TimeseriesResponse": art_TimeseriesResponse_output,
-        "art_TimeseriesResult": art_TimeseriesResult_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ErrorResponse": art_ErrorResponse,
+        "art_ResultValues": art_ResultValues,
+        "art_TimeseriesResponse": art_TimeseriesResponse,
+        "art_TimeseriesResult": art_TimeseriesResult,
       },
     },
     request: (args) => ({
@@ -193,29 +213,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "analytics_query_top_n",
+    name: "analytics_query_topN",
     title: "Query analytics top-N",
-    description: "Returns the top N results for a dataset by a specified stat. Includes an array of result rows, each containing the requested stats and group-by dimensions.\n\nThis method is beta.",
+    description: "Returns the top N results for a dataset by a specified stat. Includes an array of result rows, each containing the requested stats and group-by dimensions.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/analytics/query/{dataset}/top-n",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/art_QueryTopN"
         },
-        "dataset": {
-          "description": "Dataset name to query. Examples: `access-logins`, `gateway-http`, `gateway-dns`, `gateway-http`, `shadow-it`.\n",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "dataset": {
+              "description": "Dataset name to query. Examples: `access-logins`, `gateway-http`, `gateway-dns`, `gateway-http`, `shadow-it`.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "art_CommonQuery": art_CommonQuery,
         "art_Filter": art_Filter,
@@ -225,10 +255,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/art_TopNResponse",
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_TopNResponse": art_TopNResponse_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ResultValues": art_ResultValues,
+        "art_TopNResponse": art_TopNResponse,
       },
     },
     annotations: {
@@ -262,11 +292,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "art_APIError": art_APIError_output,
-        "art_APIMessage": art_APIMessage_output,
-        "art_ErrorResponse": art_ErrorResponse_output,
-        "art_ResultValues": art_ResultValues_output,
-        "art_TopNResponse": art_TopNResponse_output,
+        "art_APIError": art_APIError,
+        "art_APIMessage": art_APIMessage,
+        "art_ErrorResponse": art_ErrorResponse,
+        "art_ResultValues": art_ResultValues,
+        "art_TopNResponse": art_TopNResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/analytics/sql/accounts/introspection/tools.ts b/src/generated/forge-mcp/analytics/sql/accounts/introspection/tools.ts
index a2ef3099f..bcf7eadfb 100644
--- a/src/generated/forge-mcp/analytics/sql/accounts/introspection/tools.ts
+++ b/src/generated/forge-mcp/analytics/sql/accounts/introspection/tools.ts
@@ -1,18 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  analytics_sql_ApiErrorResponse_output,
-  analytics_sql_Attribute_output,
-  analytics_sql_CustomAttribute_output,
-  analytics_sql_DatasetAvailability_output,
-  analytics_sql_GatewayApiErrorResponse_output,
-  analytics_sql_IntrospectionColumn_output,
-  analytics_sql_IntrospectionDatasetKind_output,
-  analytics_sql_IntrospectionDataset_output,
-  analytics_sql_IntrospectionResponse_output,
-  analytics_sql_IntrospectionSampling_output,
+  analytics$$sql_ApiErrorResponse,
+  analytics$$sql_Attribute,
+  analytics$$sql_CustomAttribute,
+  analytics$$sql_DatasetAvailability,
+  analytics$$sql_GatewayApiErrorResponse,
+  analytics$$sql_IntrospectionColumn,
+  analytics$$sql_IntrospectionDataset,
+  analytics$$sql_IntrospectionDatasetKind,
+  analytics$$sql_IntrospectionResponse,
 } from "../../../../outputs.js";
 
 /**
@@ -22,59 +21,74 @@ export const tools: readonly Tool[] = [
   {
     name: "analytics_sql_accounts_introspection_get",
     title: "List available analytics datasets",
-    description: "Returns the dataset catalogue for the account in the request path. API Gateway preserves the account path, and SQL API requires it to match the signed JWT account; account_tag is not required as a query parameter. If supplied, it must match the path account. Dataset and column discovery options are identical to the legacy introspection endpoint.\n\nThis method is alpha.",
+    description: "Returns the dataset catalogue for the account in the request path. API Gateway preserves the account path, and SQL API requires it to match the signed JWT account; account_tag is not required as a query parameter. If supplied, it must match the path account. Dataset and column discovery options are identical to the legacy introspection endpoint.\n\nThis method is alpha.\n\nGET /accounts/{account_id}/analytics/sql/introspection",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account that authorizes and scopes the request.",
-          "type": "string"
-        },
-        "dataset_name": {
-          "description": "Return only the dataset with this exact name. An empty value is treated as if the parameter had been omitted, and does not filter the catalogue. A name that matches no dataset in this deployment's catalogue is rejected with `422`; a dataset that exists but is not describable here is rejected identically, so the two cases cannot be told apart.\n\nA Workers Analytics Engine dataset is named in full, as `events.analyticsEngine.<dataset_name>`; the namespace on its own returns every such dataset the account has. A `dataset_name` the account does not have is rejected with `422` like any other unknown name.\n",
-          "type": "string"
-        },
-        "include_attributes": {
-          "default": false,
-          "description": "Include a capped set of attribute names and types observed during the preceding seven days, as `attributes`. Requires a nonempty dataset_name. Replaces `include_custom_attributes`, which is deprecated.\n",
-          "type": "boolean"
-        },
-        "include_columns": {
-          "default": false,
-          "description": "Include column metadata for each returned dataset.",
-          "type": "boolean"
-        },
-        "include_custom_attributes": {
-          "default": false,
-          "description": "Include a capped set of custom attribute names and types observed during the preceding seven days, as `custom_attributes`. Requires a nonempty dataset_name. Deprecated in favor of `include_attributes`.\n",
-          "type": "boolean"
-        },
-        "include_lex": {
-          "default": true,
-          "description": "Include Log Explorer datasets, which are listed only where the account has them. Set to `false` to return only datasets described from the static catalogue, which avoids that lookup.\n",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account that authorizes and scopes the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "include_wae": {
-          "default": true,
-          "description": "Include Workers Analytics Engine datasets, which are discovered from the account's own data. Set to `false` to return only datasets described from the static catalogue, which avoids that lookup.\n",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dataset_name": {
+              "description": "Return only the dataset with this exact name. An empty value is treated as if the parameter had been omitted, and does not filter the catalogue. A name that matches no dataset in this deployment's catalogue is rejected with `422`; a dataset that exists but is not describable here is rejected identically, so the two cases cannot be told apart.\n\nA Workers Analytics Engine dataset is named in full, as `events.analyticsEngine.<dataset_name>`; the namespace on its own returns every such dataset the account has. A `dataset_name` the account does not have is rejected with `422` like any other unknown name.",
+              "type": "string"
+            },
+            "include_attributes": {
+              "default": false,
+              "description": "Include a capped set of attribute names and types observed during the preceding seven days, as `attributes`. Requires a nonempty dataset_name. Replaces `include_custom_attributes`, which is deprecated.",
+              "type": "boolean"
+            },
+            "include_columns": {
+              "default": false,
+              "description": "Include column metadata for each returned dataset.",
+              "type": "boolean"
+            },
+            "include_custom_attributes": {
+              "default": false,
+              "description": "Include a capped set of custom attribute names and types observed during the preceding seven days, as `custom_attributes`. Requires a nonempty dataset_name. Deprecated in favor of `include_attributes`.",
+              "type": "boolean"
+            },
+            "include_lex": {
+              "default": true,
+              "description": "Include Log Explorer datasets, which are listed only where the account has them. Set to `false` to return only datasets described from the static catalogue, which avoids that lookup.",
+              "type": "boolean"
+            },
+            "include_wae": {
+              "default": true,
+              "description": "Include Workers Analytics Engine datasets, which are discovered from the account's own data. Set to `false` to return only datasets described from the static catalogue, which avoids that lookup.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/analytics-sql_IntrospectionResponse",
       $defs: {
-        "analytics-sql_Attribute": analytics_sql_Attribute_output,
-        "analytics-sql_CustomAttribute": analytics_sql_CustomAttribute_output,
-        "analytics-sql_DatasetAvailability": analytics_sql_DatasetAvailability_output,
-        "analytics-sql_IntrospectionColumn": analytics_sql_IntrospectionColumn_output,
-        "analytics-sql_IntrospectionDataset": analytics_sql_IntrospectionDataset_output,
-        "analytics-sql_IntrospectionDatasetKind": analytics_sql_IntrospectionDatasetKind_output,
-        "analytics-sql_IntrospectionResponse": analytics_sql_IntrospectionResponse_output,
-        "analytics-sql_IntrospectionSampling": analytics_sql_IntrospectionSampling_output,
+        "analytics-sql_Attribute": analytics$$sql_Attribute,
+        "analytics-sql_CustomAttribute": analytics$$sql_CustomAttribute,
+        "analytics-sql_DatasetAvailability": analytics$$sql_DatasetAvailability,
+        "analytics-sql_IntrospectionColumn": analytics$$sql_IntrospectionColumn,
+        "analytics-sql_IntrospectionDataset": analytics$$sql_IntrospectionDataset,
+        "analytics-sql_IntrospectionDatasetKind": analytics$$sql_IntrospectionDatasetKind,
+        "analytics-sql_IntrospectionResponse": analytics$$sql_IntrospectionResponse,
       },
     },
     annotations: {
@@ -115,27 +129,26 @@ export const tools: readonly Tool[] = [
         "503": null
       },
       $defs: {
-        "analytics-sql_ApiErrorResponse": analytics_sql_ApiErrorResponse_output,
-        "analytics-sql_Attribute": analytics_sql_Attribute_output,
-        "analytics-sql_CustomAttribute": analytics_sql_CustomAttribute_output,
-        "analytics-sql_DatasetAvailability": analytics_sql_DatasetAvailability_output,
-        "analytics-sql_GatewayApiErrorResponse": analytics_sql_GatewayApiErrorResponse_output,
-        "analytics-sql_IntrospectionColumn": analytics_sql_IntrospectionColumn_output,
-        "analytics-sql_IntrospectionDataset": analytics_sql_IntrospectionDataset_output,
-        "analytics-sql_IntrospectionDatasetKind": analytics_sql_IntrospectionDatasetKind_output,
-        "analytics-sql_IntrospectionResponse": analytics_sql_IntrospectionResponse_output,
-        "analytics-sql_IntrospectionSampling": analytics_sql_IntrospectionSampling_output,
+        "analytics-sql_ApiErrorResponse": analytics$$sql_ApiErrorResponse,
+        "analytics-sql_Attribute": analytics$$sql_Attribute,
+        "analytics-sql_CustomAttribute": analytics$$sql_CustomAttribute,
+        "analytics-sql_DatasetAvailability": analytics$$sql_DatasetAvailability,
+        "analytics-sql_GatewayApiErrorResponse": analytics$$sql_GatewayApiErrorResponse,
+        "analytics-sql_IntrospectionColumn": analytics$$sql_IntrospectionColumn,
+        "analytics-sql_IntrospectionDataset": analytics$$sql_IntrospectionDataset,
+        "analytics-sql_IntrospectionDatasetKind": analytics$$sql_IntrospectionDatasetKind,
+        "analytics-sql_IntrospectionResponse": analytics$$sql_IntrospectionResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/analytics/sql/introspection`,
       query: [
-        ["include_columns", args["include_columns"], true],
-        ["include_custom_attributes", args["include_custom_attributes"], true],
-        ["include_attributes", args["include_attributes"], true],
-        ["include_wae", args["include_wae"], true],
-        ["include_lex", args["include_lex"], true],
-        ["dataset_name", args["dataset_name"], true],
+        ["include_columns", param(args, "query", "include_columns"), true],
+        ["include_custom_attributes", param(args, "query", "include_custom_attributes"), true],
+        ["include_attributes", param(args, "query", "include_attributes"), true],
+        ["include_wae", param(args, "query", "include_wae"), true],
+        ["include_lex", param(args, "query", "include_lex"), true],
+        ["dataset_name", param(args, "query", "dataset_name"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/analytics/sql/accounts/tools.ts b/src/generated/forge-mcp/analytics/sql/accounts/tools.ts
index 6ffa8b6da..133d04190 100644
--- a/src/generated/forge-mcp/analytics/sql/accounts/tools.ts
+++ b/src/generated/forge-mcp/analytics/sql/accounts/tools.ts
@@ -1,21 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  analytics_sql_ApiErrorResponse_output,
-  analytics_sql_ClickHouseJsonQueryResponse_output,
-  analytics_sql_GatewayApiErrorResponse_output,
-  analytics_sql_LogExplorerQueryResponse_output,
-  analytics_sql_SqlQueryResponse_output,
-  analytics_sql_SqlQueryStatistics_output,
+  analytics$$sql_ApiErrorResponse,
+  analytics$$sql_ClickHouseJsonQueryResponse,
+  analytics$$sql_GatewayApiErrorResponse,
+  analytics$$sql_LogExplorerQueryResponse,
+  analytics$$sql_SqlQueryResponse,
+  analytics$$sql_SqlQueryStatistics,
 } from "../../../outputs.js";
 import {
-  analytics_sql_SqlQueryAccountScope,
-  analytics_sql_SqlQueryRequest,
-  analytics_sql_SqlQueryScope,
-  analytics_sql_SqlQueryTimeRange,
-  analytics_sql_SqlQueryZoneScope,
+  analytics$$sql_SqlQueryAccountScope,
+  analytics$$sql_SqlQueryRequest,
+  analytics$$sql_SqlQueryScope,
+  analytics$$sql_SqlQueryTimeRange,
+  analytics$$sql_SqlQueryZoneScope,
 } from "../../../schemas.js";
 
 /**
@@ -25,23 +25,42 @@ export const tools: readonly Tool[] = [
   {
     name: "analytics_sql_accounts_get",
     title: "Query analytics datasets",
-    description: "Executes a SQL query scoped to the account in the request path. API Gateway preserves the account path, and SQL API requires it to match the signed JWT account, so an accountTag predicate or JSON scope is not required. Explicit account scope must match the path account. Any zone restrictions must belong to that account. Query parameters, time ranges, output formats, authorization, and responses follow the legacy query endpoint.\n\nThis method is alpha.",
+    description: "Executes a SQL query scoped to the account in the request path. API Gateway preserves the account path, and SQL API requires it to match the signed JWT account, so an accountTag predicate or JSON scope is not required. Explicit account scope must match the path account. Any zone restrictions must belong to that account. Query parameters, time ranges, output formats, authorization, and responses follow the legacy query endpoint.\n\nThis method is alpha.\n\nGET /accounts/{account_id}/analytics/sql",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account that authorizes and scopes the request.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account that authorizes and scopes the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
         "query": {
-          "description": "SQL query to execute. A trailing FORMAT selects JSON, JSONEachRow, TabSeparated, or TSV output on any dataset.\n",
-          "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "query": {
+              "description": "SQL query to execute. A trailing FORMAT selects JSON, JSONEachRow, TabSeparated, or TSV output on any dataset.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "query"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "oneOf": [
@@ -56,10 +75,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "analytics-sql_ClickHouseJsonQueryResponse": analytics_sql_ClickHouseJsonQueryResponse_output,
-        "analytics-sql_LogExplorerQueryResponse": analytics_sql_LogExplorerQueryResponse_output,
-        "analytics-sql_SqlQueryResponse": analytics_sql_SqlQueryResponse_output,
-        "analytics-sql_SqlQueryStatistics": analytics_sql_SqlQueryStatistics_output,
+        "analytics-sql_ClickHouseJsonQueryResponse": analytics$$sql_ClickHouseJsonQueryResponse,
+        "analytics-sql_LogExplorerQueryResponse": analytics$$sql_LogExplorerQueryResponse,
+        "analytics-sql_SqlQueryResponse": analytics$$sql_SqlQueryResponse,
+        "analytics-sql_SqlQueryStatistics": analytics$$sql_SqlQueryStatistics,
       },
     },
     annotations: {
@@ -113,46 +132,56 @@ export const tools: readonly Tool[] = [
         "507": null
       },
       $defs: {
-        "analytics-sql_ApiErrorResponse": analytics_sql_ApiErrorResponse_output,
-        "analytics-sql_ClickHouseJsonQueryResponse": analytics_sql_ClickHouseJsonQueryResponse_output,
-        "analytics-sql_GatewayApiErrorResponse": analytics_sql_GatewayApiErrorResponse_output,
-        "analytics-sql_LogExplorerQueryResponse": analytics_sql_LogExplorerQueryResponse_output,
-        "analytics-sql_SqlQueryResponse": analytics_sql_SqlQueryResponse_output,
-        "analytics-sql_SqlQueryStatistics": analytics_sql_SqlQueryStatistics_output,
+        "analytics-sql_ApiErrorResponse": analytics$$sql_ApiErrorResponse,
+        "analytics-sql_ClickHouseJsonQueryResponse": analytics$$sql_ClickHouseJsonQueryResponse,
+        "analytics-sql_GatewayApiErrorResponse": analytics$$sql_GatewayApiErrorResponse,
+        "analytics-sql_LogExplorerQueryResponse": analytics$$sql_LogExplorerQueryResponse,
+        "analytics-sql_SqlQueryResponse": analytics$$sql_SqlQueryResponse,
+        "analytics-sql_SqlQueryStatistics": analytics$$sql_SqlQueryStatistics,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/analytics/sql`,
       query: [
-        ["query", args["query"], true],
+        ["query", param(args, "query", "query"), true],
       ],
     }),
   },
   {
     name: "analytics_sql_accounts_post",
     title: "Query analytics datasets",
-    description: "Executes a SQL query scoped to the account in the request path. API Gateway preserves the account path, and SQL API requires it to match the signed JWT account, so an accountTag predicate or JSON scope is not required. Explicit account scope must match the path account. Any zone restrictions must belong to that account. Query parameters, time ranges, output formats, authorization, and responses follow the legacy query endpoint.\n\nThis method is alpha.",
+    description: "Executes a SQL query scoped to the account in the request path. API Gateway preserves the account path, and SQL API requires it to match the signed JWT account, so an accountTag predicate or JSON scope is not required. Explicit account scope must match the path account. Any zone restrictions must belong to that account. Query parameters, time ranges, output formats, authorization, and responses follow the legacy query endpoint.\n\nThis method is alpha.\n\nPOST /accounts/{account_id}/analytics/sql",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account that authorizes and scopes the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/analytics-sql_SqlQueryRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account that authorizes and scopes the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "analytics-sql_SqlQueryAccountScope": analytics_sql_SqlQueryAccountScope,
-        "analytics-sql_SqlQueryRequest": analytics_sql_SqlQueryRequest,
-        "analytics-sql_SqlQueryScope": analytics_sql_SqlQueryScope,
-        "analytics-sql_SqlQueryTimeRange": analytics_sql_SqlQueryTimeRange,
-        "analytics-sql_SqlQueryZoneScope": analytics_sql_SqlQueryZoneScope,
+        "analytics-sql_SqlQueryAccountScope": analytics$$sql_SqlQueryAccountScope,
+        "analytics-sql_SqlQueryRequest": analytics$$sql_SqlQueryRequest,
+        "analytics-sql_SqlQueryScope": analytics$$sql_SqlQueryScope,
+        "analytics-sql_SqlQueryTimeRange": analytics$$sql_SqlQueryTimeRange,
+        "analytics-sql_SqlQueryZoneScope": analytics$$sql_SqlQueryZoneScope,
       },
     },
     outputSchema: {
@@ -168,10 +197,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "analytics-sql_ClickHouseJsonQueryResponse": analytics_sql_ClickHouseJsonQueryResponse_output,
-        "analytics-sql_LogExplorerQueryResponse": analytics_sql_LogExplorerQueryResponse_output,
-        "analytics-sql_SqlQueryResponse": analytics_sql_SqlQueryResponse_output,
-        "analytics-sql_SqlQueryStatistics": analytics_sql_SqlQueryStatistics_output,
+        "analytics-sql_ClickHouseJsonQueryResponse": analytics$$sql_ClickHouseJsonQueryResponse,
+        "analytics-sql_LogExplorerQueryResponse": analytics$$sql_LogExplorerQueryResponse,
+        "analytics-sql_SqlQueryResponse": analytics$$sql_SqlQueryResponse,
+        "analytics-sql_SqlQueryStatistics": analytics$$sql_SqlQueryStatistics,
       },
     },
     annotations: {
@@ -225,12 +254,12 @@ export const tools: readonly Tool[] = [
         "507": null
       },
       $defs: {
-        "analytics-sql_ApiErrorResponse": analytics_sql_ApiErrorResponse_output,
-        "analytics-sql_ClickHouseJsonQueryResponse": analytics_sql_ClickHouseJsonQueryResponse_output,
-        "analytics-sql_GatewayApiErrorResponse": analytics_sql_GatewayApiErrorResponse_output,
-        "analytics-sql_LogExplorerQueryResponse": analytics_sql_LogExplorerQueryResponse_output,
-        "analytics-sql_SqlQueryResponse": analytics_sql_SqlQueryResponse_output,
-        "analytics-sql_SqlQueryStatistics": analytics_sql_SqlQueryStatistics_output,
+        "analytics-sql_ApiErrorResponse": analytics$$sql_ApiErrorResponse,
+        "analytics-sql_ClickHouseJsonQueryResponse": analytics$$sql_ClickHouseJsonQueryResponse,
+        "analytics-sql_GatewayApiErrorResponse": analytics$$sql_GatewayApiErrorResponse,
+        "analytics-sql_LogExplorerQueryResponse": analytics$$sql_LogExplorerQueryResponse,
+        "analytics-sql_SqlQueryResponse": analytics$$sql_SqlQueryResponse,
+        "analytics-sql_SqlQueryStatistics": analytics$$sql_SqlQueryStatistics,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/analytics/sql/tools.ts b/src/generated/forge-mcp/analytics/sql/tools.ts
index e706a0ea2..cd12b9c23 100644
--- a/src/generated/forge-mcp/analytics/sql/tools.ts
+++ b/src/generated/forge-mcp/analytics/sql/tools.ts
@@ -1,14 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../_/tool.js";
+import { type Tool, param } from "../../_/tool.js";
 import {
-  analytics_sql_ApiErrorResponse_output,
-  analytics_sql_ClickHouseJsonQueryResponse_output,
-  analytics_sql_GatewayApiErrorResponse_output,
-  analytics_sql_LogExplorerQueryResponse_output,
-  analytics_sql_SqlQueryResponse_output,
-  analytics_sql_SqlQueryStatistics_output,
+  analytics$$sql_ApiErrorResponse,
+  analytics$$sql_ClickHouseJsonQueryResponse,
+  analytics$$sql_GatewayApiErrorResponse,
+  analytics$$sql_LogExplorerQueryResponse,
+  analytics$$sql_SqlQueryResponse,
+  analytics$$sql_SqlQueryStatistics,
 } from "../../outputs.js";
 
 /**
@@ -18,18 +18,28 @@ export const tools: readonly Tool[] = [
   {
     name: "analytics_sql_get",
     title: "Query analytics datasets",
-    description: "Executes a SQL query against the analytics datasets available to the caller. SQL placeholders can be bound with query parameters named `param_<name>`, such as `param_status=404` for `$status`. A trailing `FORMAT JSON`, `FORMAT JSONEachRow`, `FORMAT TabSeparated`, or `FORMAT TSV` is supported for all datasets. Without FORMAT, each backend retains its existing default JSON response.",
+    description: "Executes a SQL query against the analytics datasets available to the caller. SQL placeholders can be bound with query parameters named `param_<name>`, such as `param_status=404` for `$status`. A trailing `FORMAT JSON`, `FORMAT JSONEachRow`, `FORMAT TabSeparated`, or `FORMAT TSV` is supported for all datasets. Without FORMAT, each backend retains its existing default JSON response.\n\nGET /analytics/sql",
     inputSchema: {
       type: "object",
       properties: {
         "query": {
-          "description": "SQL query to execute. A trailing FORMAT selects JSON, JSONEachRow, TabSeparated, or TSV output on any dataset.\n",
-          "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "query": {
+              "description": "SQL query to execute. A trailing FORMAT selects JSON, JSONEachRow, TabSeparated, or TSV output on any dataset.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "query"
+          ],
+          "type": "object"
         }
       },
       required: [
         "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "oneOf": [
@@ -44,10 +54,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "analytics-sql_ClickHouseJsonQueryResponse": analytics_sql_ClickHouseJsonQueryResponse_output,
-        "analytics-sql_LogExplorerQueryResponse": analytics_sql_LogExplorerQueryResponse_output,
-        "analytics-sql_SqlQueryResponse": analytics_sql_SqlQueryResponse_output,
-        "analytics-sql_SqlQueryStatistics": analytics_sql_SqlQueryStatistics_output,
+        "analytics-sql_ClickHouseJsonQueryResponse": analytics$$sql_ClickHouseJsonQueryResponse,
+        "analytics-sql_LogExplorerQueryResponse": analytics$$sql_LogExplorerQueryResponse,
+        "analytics-sql_SqlQueryResponse": analytics$$sql_SqlQueryResponse,
+        "analytics-sql_SqlQueryStatistics": analytics$$sql_SqlQueryStatistics,
       },
     },
     annotations: {
@@ -101,18 +111,18 @@ export const tools: readonly Tool[] = [
         "507": null
       },
       $defs: {
-        "analytics-sql_ApiErrorResponse": analytics_sql_ApiErrorResponse_output,
-        "analytics-sql_ClickHouseJsonQueryResponse": analytics_sql_ClickHouseJsonQueryResponse_output,
-        "analytics-sql_GatewayApiErrorResponse": analytics_sql_GatewayApiErrorResponse_output,
-        "analytics-sql_LogExplorerQueryResponse": analytics_sql_LogExplorerQueryResponse_output,
-        "analytics-sql_SqlQueryResponse": analytics_sql_SqlQueryResponse_output,
-        "analytics-sql_SqlQueryStatistics": analytics_sql_SqlQueryStatistics_output,
+        "analytics-sql_ApiErrorResponse": analytics$$sql_ApiErrorResponse,
+        "analytics-sql_ClickHouseJsonQueryResponse": analytics$$sql_ClickHouseJsonQueryResponse,
+        "analytics-sql_GatewayApiErrorResponse": analytics$$sql_GatewayApiErrorResponse,
+        "analytics-sql_LogExplorerQueryResponse": analytics$$sql_LogExplorerQueryResponse,
+        "analytics-sql_SqlQueryResponse": analytics$$sql_SqlQueryResponse,
+        "analytics-sql_SqlQueryStatistics": analytics$$sql_SqlQueryStatistics,
       },
     },
     request: (args) => ({
       path: `/analytics/sql`,
       query: [
-        ["query", args["query"], true],
+        ["query", param(args, "query", "query"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/apiSecurity/outputs.ts b/src/generated/forge-mcp/apiSecurity/outputs.ts
index 86173fb08..82cf107c1 100644
--- a/src/generated/forge-mcp/apiSecurity/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `api-shield_api-response-single` in responses.
  */
-export const api_shield_api_response_single_output: JsonSchema = {
+export const api$$shield_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/api-shield_messages"
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/hosts/outputs.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/hosts/outputs.ts
index e195cd89a..3f26f272c 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/hosts/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/hosts/outputs.ts
@@ -6,10 +6,18 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `api-shield_schema_hosts` in responses.
  */
-export const api_shield_schema_hosts_output: JsonSchema = {
+export const api$$shield_schema_hosts: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/api-shield_timestamp-2"
+      "allOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "hosts": {
       "items": {
@@ -23,7 +31,14 @@ export const api_shield_schema_hosts_output: JsonSchema = {
     "schema_id": {
       "allOf": [
         {
-          "$ref": "#/$defs/api-shield_uuid-2"
+          "allOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         {
           "format": "uuid",
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/hosts/tools.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/hosts/tools.ts
index cc081fb17..9b158210d 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/hosts/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/hosts/tools.ts
@@ -1,55 +1,67 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../../outputs.js";
-import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-} from "../../../../schemas.js";
-import { api_shield_schema_hosts_output } from "./outputs.js";
+import { api$$shield_schema_hosts } from "./outputs.js";
 
 /**
- * The tools of `api_security.schema_validation.schemas.hosts`.
+ * The tools of `apiSecurity.schemaValidation.schemas.hosts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_schema_validation_schemas_hosts_list",
+    name: "apiSecurity_schemaValidation_schemas_hosts_list",
     title: "List hosts covered by uploaded schemas",
-    description: "Lists all unique hosts found in uploaded OpenAPI schemas for the zone.",
+    description: "Lists all unique hosts found in uploaded OpenAPI schemas for the zone.\n\nGET /zones/{zone_id}/schema_validation/schemas/hosts",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -72,14 +84,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_schema_hosts": api_shield_schema_hosts_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_schema_hosts": api$$shield_schema_hosts,
       },
     },
     annotations: {
@@ -127,22 +135,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_schema_hosts": api_shield_schema_hosts_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_schema_hosts": api$$shield_schema_hosts,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/schema_validation/schemas/hosts`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/operations/tools.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/operations/tools.ts
index 118b8f29b..92db26332 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/operations/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/operations/tools.ts
@@ -1,132 +1,137 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_auth_id_tokens_output,
-  api_shield_basic_operation_output,
-  api_shield_confidence_intervals_bounds_output,
-  api_shield_data_points_output,
-  api_shield_endpoint_output,
-  api_shield_host_output,
-  api_shield_messages_output,
-  api_shield_method_output,
-  api_shield_operation_feature_api_routing_output,
-  api_shield_operation_feature_confidence_intervals_output,
-  api_shield_operation_feature_parameter_schemas_output,
-  api_shield_operation_feature_schema_info_output,
-  api_shield_operation_feature_thresholds_output,
-  api_shield_operation_features_output,
-  api_shield_operation_output,
-  api_shield_p50_output,
-  api_shield_p90_output,
-  api_shield_p99_output,
-  api_shield_parameter_schemas_definition_output,
-  api_shield_period_seconds_output,
-  api_shield_requests_output,
-  api_shield_standard_operation_output,
-  api_shield_suggested_threshold_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_basic_operation,
+  api$$shield_confidence_intervals_bounds,
+  api$$shield_messages,
+  api$$shield_operation,
+  api$$shield_operation_feature_api_routing,
+  api$$shield_operation_feature_confidence_intervals,
+  api$$shield_operation_feature_parameter_schemas,
+  api$$shield_operation_feature_schema_info,
+  api$$shield_operation_feature_thresholds,
+  api$$shield_operation_features,
+  api$$shield_parameter_schemas_definition,
+  api$$shield_standard_operation,
 } from "../../../../outputs.js";
-import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../../schemas.js";
 
 /**
- * The tools of `api_security.schema_validation.schemas.operations`.
+ * The tools of `apiSecurity.schemaValidation.schemas.operations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_schema_validation_schemas_operations_list",
+    name: "apiSecurity_schemaValidation_schemas_operations_list",
     title: "Retrieve all operations from the schema",
-    description: "Retrieves all operations from the schema. Operations that already exist in API Shield Endpoint Management will be returned as full operations.",
+    description: "Retrieves all operations from the schema. Operations that already exist in API Shield Endpoint Management will be returned as full operations.\n\nGET /zones/{zone_id}/schema_validation/schemas/{schema_id}/operations",
     inputSchema: {
       type: "object",
       properties: {
-        "endpoint": {
-          "description": "Filter results to only include endpoints containing this pattern.",
-          "type": "string"
-        },
-        "feature": {
-          "description": "Add feature(s) to the results. The feature name that is given here corresponds to the resulting feature object. Have a look at the top-level object description for more details on the specific meaning.",
-          "items": {
-            "enum": [
-              "thresholds",
-              "parameter_schemas",
-              "schema_info",
-              "confidence_intervals"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "host": {
-          "description": "Filter results to only include the specified hosts.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "method": {
-          "description": "Filter results to only include the specified HTTP methods.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "schema_id": {
+              "allOf": [
+                {
+                  "allOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "description": "UUID.",
+                      "type": "string"
+                    }
+                  ]
+                },
+                {
+                  "format": "uuid",
+                  "type": "string"
+                }
+              ],
+              "description": "The unique identifier of the schema"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
           },
-          "type": "array"
-        },
-        "operation_status": {
-          "description": "Filter results by whether operations exist in Web Asset Management or not. `new` will just return operations from the schema that do not exist otherwise. `existing` will just return operations from the schema that already exist.",
-          "enum": [
-            "new",
-            "existing"
+          "required": [
+            "zone_id",
+            "schema_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
+          "type": "object"
         },
-        "schema_id": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/api-shield_uuid-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "endpoint": {
+              "description": "Filter results to only include endpoints containing this pattern.",
+              "type": "string"
             },
-            {
-              "format": "uuid",
+            "feature": {
+              "description": "Add feature(s) to the results. The feature name that is given here corresponds to the resulting feature object. Have a look at the top-level object description for more details on the specific meaning.",
+              "items": {
+                "enum": [
+                  "thresholds",
+                  "parameter_schemas",
+                  "schema_info",
+                  "confidence_intervals"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "host": {
+              "description": "Filter results to only include the specified hosts.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "method": {
+              "description": "Filter results to only include the specified HTTP methods.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "operation_status": {
+              "description": "Filter results by whether operations exist in Web Asset Management or not. `new` will just return operations from the schema that do not exist otherwise. `existing` will just return operations from the schema that already exist.",
+              "enum": [
+                "new",
+                "existing"
+              ],
               "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
             }
-          ],
-          "description": "The unique identifier of the schema"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "schema_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -156,35 +161,20 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -239,48 +229,33 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/schema_validation/schemas/${pathParam(args, "schema_id")}/operations`,
       query: [
-        ["feature", args["feature"], true],
-        ["host", args["host"], true],
-        ["method", args["method"], true],
-        ["endpoint", args["endpoint"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["operation_status", args["operation_status"], true],
+        ["feature", param(args, "query", "feature"), true],
+        ["host", param(args, "query", "host"), true],
+        ["method", param(args, "query", "method"), true],
+        ["endpoint", param(args, "query", "endpoint"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["operation_status", param(args, "query", "operation_status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/outputs.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/outputs.ts
index a4bc50b4d..9c8859ead 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/outputs.ts
@@ -6,10 +6,18 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_public_schema` in responses.
  */
-export const api_shield_public_schema_output: JsonSchema = {
+export const api$$shield_public_schema: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/api-shield_timestamp-2"
+      "allOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "kind": {
       "enum": [
@@ -23,7 +31,14 @@ export const api_shield_public_schema_output: JsonSchema = {
     "schema_id": {
       "allOf": [
         {
-          "$ref": "#/$defs/api-shield_uuid-2"
+          "allOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         {
           "format": "uuid",
@@ -51,7 +66,7 @@ export const api_shield_public_schema_output: JsonSchema = {
 /**
  * The schema of `api-shield_public_schema_success_result` in responses.
  */
-export const api_shield_public_schema_success_result_output: JsonSchema = {
+export const api$$shield_public_schema_success_result: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
@@ -73,7 +88,7 @@ export const api_shield_public_schema_success_result_output: JsonSchema = {
 /**
  * The schema of `api-shield_schema_issue_notification` in responses.
  */
-export const api_shield_schema_issue_notification_output: JsonSchema = {
+export const api$$shield_schema_issue_notification: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/tools.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/tools.ts
index 21f09b9af..8fc5a7484 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/schemas/tools.ts
@@ -1,38 +1,28 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../outputs.js";
+import { api$$shield_api$$response$$single } from "../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../schemas.js";
-import { api_shield_api_response_single_output } from "../../outputs.js";
-import {
-  api_shield_public_schema_output,
-  api_shield_public_schema_success_result_output,
-  api_shield_schema_issue_notification_output,
+  api$$shield_public_schema,
+  api$$shield_public_schema_success_result,
+  api$$shield_schema_issue_notification,
 } from "./outputs.js";
 
 /**
- * The tools of `api_security.schema_validation.schemas`.
+ * The tools of `apiSecurity.schemaValidation.schemas`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_schema_validation_schemas_create",
+    name: "apiSecurity_schemaValidation_schemas_create",
     title: "Upload a schema",
-    description: "Uploads an OpenAPI schema that defines expected request formats for API operations.",
+    description: "Uploads an OpenAPI schema that defines expected request formats for API operations.\n\nPOST /zones/{zone_id}/schema_validation/schemas",
     inputSchema: {
       type: "object",
       properties: {
@@ -66,18 +56,32 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -106,15 +110,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_public_schema": api_shield_public_schema_output,
-        "api-shield_public_schema_success_result": api_shield_public_schema_success_result_output,
-        "api-shield_schema_issue_notification": api_shield_schema_issue_notification_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_public_schema": api$$shield_public_schema,
+        "api-shield_public_schema_success_result": api$$shield_public_schema_success_result,
+        "api-shield_schema_issue_notification": api$$shield_schema_issue_notification,
       },
     },
     annotations: {
@@ -190,16 +190,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_public_schema": api_shield_public_schema_output,
-        "api-shield_public_schema_success_result": api_shield_public_schema_success_result_output,
-        "api-shield_schema_issue_notification": api_shield_schema_issue_notification_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_public_schema": api$$shield_public_schema,
+        "api-shield_public_schema_success_result": api$$shield_public_schema_success_result,
+        "api-shield_schema_issue_notification": api$$shield_schema_issue_notification,
       },
     },
     request: (args) => ({
@@ -208,38 +204,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_schema_validation_schemas_delete",
+    name: "apiSecurity_schemaValidation_schemas_delete",
     title: "Delete a schema",
-    description: "Permanently removes an uploaded OpenAPI schema from API Security. Operations using this schema will lose their validation rules.\n\nConfirm with the user before calling this tool. This operation permanently deletes the uploaded schema and removes its validation coverage.",
+    description: "Permanently removes an uploaded OpenAPI schema from API Security. Operations using this schema will lose their validation rules.\n\nConfirm with the user before calling this tool. This operation permanently deletes the uploaded schema and removes its validation coverage.\n\nDELETE /zones/{zone_id}/schema_validation/schemas/{schema_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "schema_id": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/api-shield_uuid-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "schema_id": {
+              "allOf": [
+                {
+                  "allOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "description": "UUID.",
+                      "type": "string"
+                    }
+                  ]
+                },
+                {
+                  "format": "uuid",
+                  "type": "string"
+                }
+              ],
+              "description": "The unique identifier of the schema"
             },
-            {
-              "format": "uuid",
-              "type": "string"
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
             }
+          },
+          "required": [
+            "zone_id",
+            "schema_id"
           ],
-          "description": "The unique identifier of the schema"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "schema_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -266,8 +282,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -317,9 +333,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -327,55 +343,77 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_schema_validation_schemas_get",
+    name: "apiSecurity_schemaValidation_schemas_get",
     title: "Get details of a schema",
-    description: "Gets the contents and metadata of a specific OpenAPI schema uploaded to API Security.",
+    description: "Gets the contents and metadata of a specific OpenAPI schema uploaded to API Security.\n\nGET /zones/{zone_id}/schema_validation/schemas/{schema_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "omit_source": {
-          "default": false,
-          "description": "Omit the source-files of schemas and only retrieve their meta-data.",
-          "type": "boolean"
-        },
-        "schema_id": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/api-shield_uuid-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "schema_id": {
+              "allOf": [
+                {
+                  "allOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "description": "UUID.",
+                      "type": "string"
+                    }
+                  ]
+                },
+                {
+                  "format": "uuid",
+                  "type": "string"
+                }
+              ],
+              "description": "The unique identifier of the schema"
             },
-            {
-              "format": "uuid",
-              "type": "string"
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
             }
+          },
+          "required": [
+            "zone_id",
+            "schema_id"
           ],
-          "description": "The unique identifier of the schema"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "omit_source": {
+              "default": false,
+              "description": "Omit the source-files of schemas and only retrieve their meta-data.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "schema_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_public_schema_success_result",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_public_schema": api_shield_public_schema_output,
-        "api-shield_public_schema_success_result": api_shield_public_schema_success_result_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_public_schema": api$$shield_public_schema,
+        "api-shield_public_schema_success_result": api$$shield_public_schema_success_result,
       },
     },
     annotations: {
@@ -405,61 +443,77 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_public_schema": api_shield_public_schema_output,
-        "api-shield_public_schema_success_result": api_shield_public_schema_success_result_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_public_schema": api$$shield_public_schema,
+        "api-shield_public_schema_success_result": api$$shield_public_schema_success_result,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/schema_validation/schemas/${pathParam(args, "schema_id")}`,
       query: [
-        ["omit_source", args["omit_source"], true],
+        ["omit_source", param(args, "query", "omit_source"), true],
       ],
     }),
   },
   {
-    name: "api_security_schema_validation_schemas_list",
+    name: "apiSecurity_schemaValidation_schemas_list",
     title: "List all uploaded schemas",
-    description: "Lists all OpenAPI schemas uploaded to API Security.",
+    description: "Lists all OpenAPI schemas uploaded to API Security.\n\nGET /zones/{zone_id}/schema_validation/schemas",
     inputSchema: {
       type: "object",
       properties: {
-        "omit_source": {
-          "default": false,
-          "description": "Omit the source-files of schemas and only retrieve their meta-data.",
-          "type": "boolean"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
-        },
-        "validation_enabled": {
-          "description": "Filter for enabled schemas",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "omit_source": {
+              "default": false,
+              "description": "Omit the source-files of schemas and only retrieve their meta-data.",
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            },
+            "validation_enabled": {
+              "description": "Filter for enabled schemas",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -482,14 +536,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_public_schema": api_shield_public_schema_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_public_schema": api$$shield_public_schema,
       },
     },
     annotations: {
@@ -537,31 +587,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_public_schema": api_shield_public_schema_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_public_schema": api$$shield_public_schema,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/schema_validation/schemas`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["omit_source", args["omit_source"], true],
-        ["validation_enabled", args["validation_enabled"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["omit_source", param(args, "query", "omit_source"), true],
+        ["validation_enabled", param(args, "query", "validation_enabled"), true],
       ],
     }),
   },
   {
-    name: "api_security_schema_validation_schemas_set_validation",
+    name: "apiSecurity_schemaValidation_schemas_setValidation",
     title: "Set schema validation state",
-    description: "Enables or disables validation for an uploaded OpenAPI schema without changing the schema document.",
+    description: "Enables or disables validation for an uploaded OpenAPI schema without changing the schema document.\n\nPATCH /zones/{zone_id}/schema_validation/schemas/{schema_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -574,45 +620,61 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "schema_id": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/api-shield_uuid-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "schema_id": {
+              "allOf": [
+                {
+                  "allOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "description": "UUID.",
+                      "type": "string"
+                    }
+                  ]
+                },
+                {
+                  "format": "uuid",
+                  "type": "string"
+                }
+              ],
+              "description": "The unique identifier of the schema"
             },
-            {
-              "format": "uuid",
-              "type": "string"
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
             }
+          },
+          "required": [
+            "zone_id",
+            "schema_id"
           ],
-          "description": "The unique identifier of the schema"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "schema_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_public_schema_success_result",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_public_schema": api_shield_public_schema_output,
-        "api-shield_public_schema_success_result": api_shield_public_schema_success_result_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_public_schema": api$$shield_public_schema,
+        "api-shield_public_schema_success_result": api$$shield_public_schema_success_result,
       },
     },
     annotations: {
@@ -640,15 +702,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_public_schema": api_shield_public_schema_output,
-        "api-shield_public_schema_success_result": api_shield_public_schema_success_result_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_public_schema": api$$shield_public_schema,
+        "api-shield_public_schema_success_result": api$$shield_public_schema_success_result,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/operations/outputs.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/operations/outputs.ts
index 4dfe45c62..609070bbe 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/operations/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/operations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `api-shield_per_operation_setting` in responses.
  */
-export const api_shield_per_operation_setting_output: JsonSchema = {
+export const api$$shield_per_operation_setting: JsonSchema = {
   "properties": {
     "mitigation_action": {
       "enum": [
@@ -17,7 +17,14 @@ export const api_shield_per_operation_setting_output: JsonSchema = {
       "type": "string"
     },
     "operation_id": {
-      "$ref": "#/$defs/api-shield_uuid-2"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     }
   },
   "required": [
@@ -30,7 +37,7 @@ export const api_shield_per_operation_setting_output: JsonSchema = {
 /**
  * The schema of `api-shield_per_operation_setting_change_base` in responses.
  */
-export const api_shield_per_operation_setting_change_base_output: JsonSchema = {
+export const api$$shield_per_operation_setting_change_base: JsonSchema = {
   "properties": {
     "mitigation_action": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/operations/tools.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/operations/tools.ts
index 205e075f6..38bf8b862 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/operations/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/operations/tools.ts
@@ -1,33 +1,26 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-} from "../../../../schemas.js";
-import {
-  api_shield_per_operation_setting_change_base_output,
-  api_shield_per_operation_setting_output,
+  api$$shield_per_operation_setting,
+  api$$shield_per_operation_setting_change_base,
 } from "./outputs.js";
 
 /**
- * The tools of `api_security.schema_validation.settings.operations`.
+ * The tools of `apiSecurity.schemaValidation.settings.operations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_schema_validation_settings_operations_bulk_edit",
+    name: "apiSecurity_schemaValidation_settings_operations_bulkEdit",
     title: "Bulk edit per-operation schema validation settings",
-    description: "Updates schema validation settings for multiple API operations in a single request. Efficient for applying consistent validation rules across endpoints.",
+    description: "Updates schema validation settings for multiple API operations in a single request. Efficient for applying consistent validation rules across endpoints.\n\nPATCH /zones/{zone_id}/schema_validation/settings/operations",
     inputSchema: {
       type: "object",
       properties: {
@@ -35,7 +28,7 @@ export const tools: readonly Tool[] = [
           "additionalProperties": {
             "properties": {
               "mitigation_action": {
-                "description": "Mitigation actions are as follows:\n* `log` - log request when request does not conform to schema * `block` - deny access to the site when request does not conform to schema * `none` - skip running schema validation * null - clears any existing per-operation setting\n",
+                "description": "Mitigation actions are as follows:\n* `log` - log request when request does not conform to schema * `block` - deny access to the site when request does not conform to schema * `none` - skip running schema validation * null - clears any existing per-operation setting",
                 "oneOf": [
                   {
                     "enum": [
@@ -55,18 +48,32 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -89,9 +96,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_per_operation_setting_change_base": api_shield_per_operation_setting_change_base_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_per_operation_setting_change_base": api$$shield_per_operation_setting_change_base,
       },
     },
     annotations: {
@@ -137,10 +144,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_per_operation_setting_change_base": api_shield_per_operation_setting_change_base_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_per_operation_setting_change_base": api$$shield_per_operation_setting_change_base,
       },
     },
     request: (args) => ({
@@ -149,29 +156,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_schema_validation_settings_operations_delete",
+    name: "apiSecurity_schemaValidation_settings_operations_delete",
     title: "Delete per-operation schema validation setting",
-    description: "Removes custom schema validation settings for a specific API operation, reverting to zone-level defaults.\n\nConfirm with the user before calling this tool. This operation deletes the operation-specific schema validation setting and restores the zone default.",
+    description: "Removes custom schema validation settings for a specific API operation, reverting to zone-level defaults.\n\nConfirm with the user before calling this tool. This operation deletes the operation-specific schema validation setting and restores the zone default.\n\nDELETE /zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid",
-          "description": "Identifier for the operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operation_id": {
+              "description": "Identifier for the operation",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "operation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operation_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -183,7 +203,14 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "operation_id": {
-                  "$ref": "#/$defs/api-shield_uuid-2"
+                  "allOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ]
                 }
               },
               "type": "object"
@@ -196,10 +223,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -229,7 +254,14 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "operation_id": {
-                      "$ref": "#/$defs/api-shield_uuid-2"
+                      "allOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "string"
+                        }
+                      ]
                     }
                   },
                   "type": "object"
@@ -247,11 +279,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -259,29 +289,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_schema_validation_settings_operations_get",
+    name: "apiSecurity_schemaValidation_settings_operations_get",
     title: "Get per-operation schema validation setting",
-    description: "Retrieves the schema validation settings configured for a specific API operation.",
+    description: "Retrieves the schema validation settings configured for a specific API operation.\n\nGET /zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid",
-          "description": "Identifier for the operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operation_id": {
+              "description": "Identifier for the operation",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "operation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operation_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -301,11 +344,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_per_operation_setting": api_shield_per_operation_setting_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_per_operation_setting": api$$shield_per_operation_setting,
       },
     },
     annotations: {
@@ -350,12 +391,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_per_operation_setting": api_shield_per_operation_setting_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_per_operation_setting": api$$shield_per_operation_setting,
       },
     },
     request: (args) => ({
@@ -363,33 +402,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_schema_validation_settings_operations_list",
+    name: "apiSecurity_schemaValidation_settings_operations_list",
     title: "List per-operation schema validation settings",
-    description: "Lists per-operation schema validation settings configured for the zone.",
+    description: "Lists per-operation schema validation settings configured for the zone.\n\nGET /zones/{zone_id}/schema_validation/settings/operations",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -412,12 +471,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_per_operation_setting": api_shield_per_operation_setting_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_per_operation_setting": api$$shield_per_operation_setting,
       },
     },
     annotations: {
@@ -465,34 +522,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_per_operation_setting": api_shield_per_operation_setting_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_per_operation_setting": api$$shield_per_operation_setting,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/schema_validation/settings/operations`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "api_security_schema_validation_settings_operations_update",
+    name: "apiSecurity_schemaValidation_settings_operations_update",
     title: "Update per-operation schema validation setting",
-    description: "Fully updates schema validation settings for a specific API operation.",
+    description: "Fully updates schema validation settings for a specific API operation.\n\nPUT /zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "mitigation_action": {
-              "description": "When set, this applies a mitigation action to this operation\n\n  - `\"log\"` - log request when request does not conform to schema for this operation\n  - `\"block\"` - deny access to the site when request does not conform to schema for this operation\n  - `\"none\"` - will skip mitigation for this operation\n  - `null` - clears any mitigation action\n",
+              "description": "When set, this applies a mitigation action to this operation\n\n  - `\"log\"` - log request when request does not conform to schema for this operation\n  - `\"block\"` - deny access to the site when request does not conform to schema for this operation\n  - `\"none\"` - will skip mitigation for this operation\n  - `null` - clears any mitigation action",
               "oneOf": [
                 {
                   "enum": [
@@ -513,24 +568,37 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid",
-          "description": "Identifier for the operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operation_id": {
+              "description": "Identifier for the operation",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "operation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operation_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -550,11 +618,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_per_operation_setting": api_shield_per_operation_setting_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_per_operation_setting": api$$shield_per_operation_setting,
       },
     },
     annotations: {
@@ -597,12 +663,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_per_operation_setting": api_shield_per_operation_setting_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_per_operation_setting": api$$shield_per_operation_setting,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/outputs.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/outputs.ts
index eb92061c4..c6394d5de 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_global_settings` in responses.
  */
-export const api_shield_global_settings_output: JsonSchema = {
+export const api$$shield_global_settings: JsonSchema = {
   "properties": {
     "validation_default_mitigation_action": {
       "enum": [
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/schemas.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/schemas.ts
index 094ae5a09..f1fe33c09 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/schemas.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_global_setting_change_base`.
  */
-export const api_shield_global_setting_change_base: JsonSchema = {
+export const api$$shield_global_setting_change_base: JsonSchema = {
   "properties": {
     "validation_default_mitigation_action": {
-      "description": "The default mitigation action used\nMitigation actions are as follows:\n\n  - `\"log\"` - log request when request does not conform to schema\n  - `\"block\"` - deny access to the site when request does not conform to schema\n  - `\"none\"` - skip running schema validation\n",
+      "description": "The default mitigation action used\nMitigation actions are as follows:\n\n  - `\"log\"` - log request when request does not conform to schema\n  - `\"block\"` - deny access to the site when request does not conform to schema\n  - `\"none\"` - skip running schema validation",
       "enum": [
         "none",
         "log",
@@ -18,7 +18,7 @@ export const api_shield_global_setting_change_base: JsonSchema = {
       "type": "string"
     },
     "validation_override_mitigation_action": {
-      "description": "When set, this overrides both zone level and operation level mitigation actions.\n\n  - `\"none\"` - skip running schema validation entirely for the request\n  - `null` - clears any existing override\n",
+      "description": "When set, this overrides both zone level and operation level mitigation actions.\n\n  - `\"none\"` - skip running schema validation entirely for the request\n  - `null` - clears any existing override",
       "oneOf": [
         {
           "enum": [
diff --git a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/tools.ts b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/tools.ts
index 063474e93..45e449f31 100644
--- a/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/schemaValidation/settings/tools.ts
@@ -3,43 +3,55 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_messages_output,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../outputs.js";
-import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-} from "../../../schemas.js";
-import { api_shield_api_response_single_output } from "../../outputs.js";
-import { api_shield_global_settings_output } from "./outputs.js";
-import { api_shield_global_setting_change_base } from "./schemas.js";
+import { api$$shield_api$$response$$single } from "../../outputs.js";
+import { api$$shield_global_settings } from "./outputs.js";
+import { api$$shield_global_setting_change_base } from "./schemas.js";
 
 /**
- * The tools of `api_security.schema_validation.settings`.
+ * The tools of `apiSecurity.schemaValidation.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_schema_validation_settings_edit",
+    name: "apiSecurity_schemaValidation_settings_edit",
     title: "Edit global schema validation settings",
-    description: "Partially updates global schema validation settings for a zone using PATCH semantics.",
+    description: "Partially updates global schema validation settings for a zone using PATCH semantics.\n\nPATCH /zones/{zone_id}/schema_validation/settings",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_global_setting_change_base"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_global_setting_change_base": api_shield_global_setting_change_base,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
+        "api-shield_global_setting_change_base": api$$shield_global_setting_change_base,
       },
     },
     outputSchema: {
@@ -60,9 +72,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_global_settings": api_shield_global_settings_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_global_settings": api$$shield_global_settings,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -105,10 +117,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_global_settings": api_shield_global_settings_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_global_settings": api$$shield_global_settings,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -117,23 +129,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_schema_validation_settings_get",
+    name: "apiSecurity_schemaValidation_settings_get",
     title: "Get global schema validation settings",
-    description: "Retrieves the current global schema validation settings for a zone.",
+    description: "Retrieves the current global schema validation settings for a zone.\n\nGET /zones/{zone_id}/schema_validation/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -153,9 +179,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_global_settings": api_shield_global_settings_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_global_settings": api$$shield_global_settings,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -200,10 +226,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_global_settings": api_shield_global_settings_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_global_settings": api$$shield_global_settings,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -211,16 +237,16 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_schema_validation_settings_update",
+    name: "apiSecurity_schemaValidation_settings_update",
     title: "Update global schema validation settings",
-    description: "Fully updates global schema validation settings for a zone, replacing existing configuration.",
+    description: "Fully updates global schema validation settings for a zone, replacing existing configuration.\n\nPUT /zones/{zone_id}/schema_validation/settings",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "validation_default_mitigation_action": {
-              "description": "The default mitigation action used\nMitigation actions are as follows:\n\n  - `\"log\"` - log request when request does not conform to schema\n  - `\"block\"` - deny access to the site when request does not conform to schema\n  - `\"none\"` - skip running schema validation\n",
+              "description": "The default mitigation action used\nMitigation actions are as follows:\n\n  - `\"log\"` - log request when request does not conform to schema\n  - `\"block\"` - deny access to the site when request does not conform to schema\n  - `\"none\"` - skip running schema validation",
               "enum": [
                 "none",
                 "log",
@@ -229,7 +255,7 @@ export const tools: readonly Tool[] = [
               "type": "string"
             },
             "validation_override_mitigation_action": {
-              "description": "When set, this overrides both zone level and operation level mitigation actions.\n\n  - `\"none\"` - skip running schema validation entirely for the request\n  - `null` - clears any existing override\n",
+              "description": "When set, this overrides both zone level and operation level mitigation actions.\n\n  - `\"none\"` - skip running schema validation entirely for the request\n  - `null` - clears any existing override",
               "oneOf": [
                 {
                   "enum": [
@@ -248,18 +274,32 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -279,9 +319,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_global_settings": api_shield_global_settings_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_global_settings": api$$shield_global_settings,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -324,10 +364,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_global_settings": api_shield_global_settings_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_global_settings": api$$shield_global_settings,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/outputs.ts b/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/outputs.ts
index af5a91888..b2a858b88 100644
--- a/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `api-shield_auth_id_characteristic` in responses.
  */
-export const api_shield_auth_id_characteristic_output: JsonSchema = {
+export const api$$shield_auth_id_characteristic: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -29,7 +29,7 @@ export const api_shield_auth_id_characteristic_output: JsonSchema = {
 /**
  * The schema of `api-shield_auth_id_characteristic_jwt_claim` in responses.
  */
-export const api_shield_auth_id_characteristic_jwt_claim_output: JsonSchema = {
+export const api$$shield_auth_id_characteristic_jwt_claim: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -51,7 +51,7 @@ export const api_shield_auth_id_characteristic_jwt_claim_output: JsonSchema = {
 /**
  * The schema of `api-shield_auth_id_characteristics` in responses.
  */
-export const api_shield_auth_id_characteristics_output: JsonSchema = {
+export const api$$shield_auth_id_characteristics: JsonSchema = {
   "items": {
     "anyOf": [
       {
@@ -69,7 +69,7 @@ export const api_shield_auth_id_characteristics_output: JsonSchema = {
 /**
  * The schema of `api-shield_configuration` in responses.
  */
-export const api_shield_configuration_output: JsonSchema = {
+export const api$$shield_configuration: JsonSchema = {
   "properties": {
     "auth_id_characteristics": {
       "$ref": "#/$defs/api-shield_auth_id_characteristics"
@@ -84,7 +84,7 @@ export const api_shield_configuration_output: JsonSchema = {
 /**
  * The schema of `api-shield_configuration-single-response` in responses.
  */
-export const api_shield_configuration_single_response_output: JsonSchema = {
+export const api$$shield_configuration$$single$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
diff --git a/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/schemas.ts b/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/schemas.ts
index c9aceda32..2dcf99c17 100644
--- a/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `api-shield_auth_id_characteristic`.
  */
-export const api_shield_auth_id_characteristic: JsonSchema = {
+export const api$$shield_auth_id_characteristic: JsonSchema = {
   "description": "Auth ID Characteristic",
   "properties": {
     "name": {
@@ -32,11 +32,11 @@ export const api_shield_auth_id_characteristic: JsonSchema = {
 /**
  * The schema of `api-shield_auth_id_characteristic_jwt_claim`.
  */
-export const api_shield_auth_id_characteristic_jwt_claim: JsonSchema = {
+export const api$$shield_auth_id_characteristic_jwt_claim: JsonSchema = {
   "description": "Auth ID Characteristic extracted from JWT Token Claims",
   "properties": {
     "name": {
-      "description": "Claim location expressed as `$(token_config_id):$(json_path)`, where `token_config_id` \nis the ID of the token configuration used in validating the JWT, and `json_path` is a RFC 9535 \nJSONPath (https://goessner.net/articles/JsonPath/, https://www.rfc-editor.org/rfc/rfc9535.html).\nThe JSONPath expression may be in dot or bracket notation, may only specify literal keys\nor array indexes, and must return a singleton value, which will be interpreted as a string.\n",
+      "description": "Claim location expressed as `$(token_config_id):$(json_path)`, where `token_config_id` \nis the ID of the token configuration used in validating the JWT, and `json_path` is a RFC 9535 \nJSONPath (https://goessner.net/articles/JsonPath/, https://www.rfc-editor.org/rfc/rfc9535.html).\nThe JSONPath expression may be in dot or bracket notation, may only specify literal keys\nor array indexes, and must return a singleton value, which will be interpreted as a string.",
       "type": "string"
     },
     "type": {
@@ -57,7 +57,7 @@ export const api_shield_auth_id_characteristic_jwt_claim: JsonSchema = {
 /**
  * The schema of `api-shield_auth_id_characteristics`.
  */
-export const api_shield_auth_id_characteristics: JsonSchema = {
+export const api$$shield_auth_id_characteristics: JsonSchema = {
   "items": {
     "anyOf": [
       {
@@ -75,7 +75,7 @@ export const api_shield_auth_id_characteristics: JsonSchema = {
 /**
  * The schema of `api-shield_configuration`.
  */
-export const api_shield_configuration: JsonSchema = {
+export const api$$shield_configuration: JsonSchema = {
   "properties": {
     "auth_id_characteristics": {
       "$ref": "#/$defs/api-shield_auth_id_characteristics"
diff --git a/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/tools.ts b/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/tools.ts
index eb21690c5..561e42378 100644
--- a/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/sessionIdentifiers/tools.ts
@@ -1,67 +1,83 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-} from "../../schemas.js";
-import {
-  api_shield_auth_id_characteristic_jwt_claim_output,
-  api_shield_auth_id_characteristic_output,
-  api_shield_auth_id_characteristics_output,
-  api_shield_configuration_output,
-  api_shield_configuration_single_response_output,
+  api$$shield_auth_id_characteristic,
+  api$$shield_auth_id_characteristic_jwt_claim,
+  api$$shield_auth_id_characteristics,
+  api$$shield_configuration,
+  api$$shield_configuration$$single$$response,
 } from "./outputs.js";
 import {
-  api_shield_auth_id_characteristic,
-  api_shield_auth_id_characteristic_jwt_claim,
-  api_shield_auth_id_characteristics,
-  api_shield_configuration,
+  api$$shield_auth_id_characteristic as api$$shield_auth_id_characteristic$,
+  api$$shield_auth_id_characteristic_jwt_claim as api$$shield_auth_id_characteristic_jwt_claim$,
+  api$$shield_auth_id_characteristics as api$$shield_auth_id_characteristics$,
+  api$$shield_configuration as api$$shield_configuration$,
 } from "./schemas.js";
 
 /**
- * The tools of `api_security.session_identifiers`.
+ * The tools of `apiSecurity.sessionIdentifiers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_session_identifiers_get",
+    name: "apiSecurity_sessionIdentifiers_get",
     title: "Get session identifier settings",
-    description: "Returns the authentication identifier characteristics configured for the zone. Header, cookie, or JWT claim values identify distinct API sessions.",
+    description: "Returns the authentication identifier characteristics configured for the zone. Header, cookie, or JWT claim values identify distinct API sessions.\n\nGET /zones/{zone_id}/api_gateway/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "normalize": {
-          "description": "Ensures that the configuration is written or retrieved in normalized fashion",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "normalize": {
+              "description": "Ensures that the configuration is written or retrieved in normalized fashion",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_configuration-single-response",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_auth_id_characteristic": api_shield_auth_id_characteristic_output,
-        "api-shield_auth_id_characteristic_jwt_claim": api_shield_auth_id_characteristic_jwt_claim_output,
-        "api-shield_auth_id_characteristics": api_shield_auth_id_characteristics_output,
-        "api-shield_configuration": api_shield_configuration_output,
-        "api-shield_configuration-single-response": api_shield_configuration_single_response_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_auth_id_characteristic": api$$shield_auth_id_characteristic,
+        "api-shield_auth_id_characteristic_jwt_claim": api$$shield_auth_id_characteristic_jwt_claim,
+        "api-shield_auth_id_characteristics": api$$shield_auth_id_characteristics,
+        "api-shield_configuration": api$$shield_configuration,
+        "api-shield_configuration-single-response": api$$shield_configuration$$single$$response,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -91,64 +107,86 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_auth_id_characteristic": api_shield_auth_id_characteristic_output,
-        "api-shield_auth_id_characteristic_jwt_claim": api_shield_auth_id_characteristic_jwt_claim_output,
-        "api-shield_auth_id_characteristics": api_shield_auth_id_characteristics_output,
-        "api-shield_configuration": api_shield_configuration_output,
-        "api-shield_configuration-single-response": api_shield_configuration_single_response_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_auth_id_characteristic": api$$shield_auth_id_characteristic,
+        "api-shield_auth_id_characteristic_jwt_claim": api$$shield_auth_id_characteristic_jwt_claim,
+        "api-shield_auth_id_characteristics": api$$shield_auth_id_characteristics,
+        "api-shield_configuration": api$$shield_configuration,
+        "api-shield_configuration-single-response": api$$shield_configuration$$single$$response,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/configuration`,
       query: [
-        ["normalize", args["normalize"], true],
+        ["normalize", param(args, "query", "normalize"), true],
       ],
     }),
   },
   {
-    name: "api_security_session_identifiers_update",
+    name: "apiSecurity_sessionIdentifiers_update",
     title: "Update session identifier settings",
-    description: "Replaces the zone's authentication identifier characteristics used to identify distinct API sessions.",
+    description: "Replaces the zone's authentication identifier characteristics used to identify distinct API sessions.\n\nPUT /zones/{zone_id}/api_gateway/configuration",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_configuration"
         },
-        "normalize": {
-          "description": "Ensures that the configuration is written or retrieved in normalized fashion",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "normalize": {
+              "description": "Ensures that the configuration is written or retrieved in normalized fashion",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_auth_id_characteristic": api_shield_auth_id_characteristic,
-        "api-shield_auth_id_characteristic_jwt_claim": api_shield_auth_id_characteristic_jwt_claim,
-        "api-shield_auth_id_characteristics": api_shield_auth_id_characteristics,
-        "api-shield_configuration": api_shield_configuration,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
+        "api-shield_auth_id_characteristic": api$$shield_auth_id_characteristic$,
+        "api-shield_auth_id_characteristic_jwt_claim": api$$shield_auth_id_characteristic_jwt_claim$,
+        "api-shield_auth_id_characteristics": api$$shield_auth_id_characteristics$,
+        "api-shield_configuration": api$$shield_configuration$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_configuration-single-response",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_auth_id_characteristic": api_shield_auth_id_characteristic_output,
-        "api-shield_auth_id_characteristic_jwt_claim": api_shield_auth_id_characteristic_jwt_claim_output,
-        "api-shield_auth_id_characteristics": api_shield_auth_id_characteristics_output,
-        "api-shield_configuration": api_shield_configuration_output,
-        "api-shield_configuration-single-response": api_shield_configuration_single_response_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_auth_id_characteristic": api$$shield_auth_id_characteristic,
+        "api-shield_auth_id_characteristic_jwt_claim": api$$shield_auth_id_characteristic_jwt_claim,
+        "api-shield_auth_id_characteristics": api$$shield_auth_id_characteristics,
+        "api-shield_configuration": api$$shield_configuration,
+        "api-shield_configuration-single-response": api$$shield_configuration$$single$$response,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -176,20 +214,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_auth_id_characteristic": api_shield_auth_id_characteristic_output,
-        "api-shield_auth_id_characteristic_jwt_claim": api_shield_auth_id_characteristic_jwt_claim_output,
-        "api-shield_auth_id_characteristics": api_shield_auth_id_characteristics_output,
-        "api-shield_configuration": api_shield_configuration_output,
-        "api-shield_configuration-single-response": api_shield_configuration_single_response_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_auth_id_characteristic": api$$shield_auth_id_characteristic,
+        "api-shield_auth_id_characteristic_jwt_claim": api$$shield_auth_id_characteristic_jwt_claim,
+        "api-shield_auth_id_characteristics": api$$shield_auth_id_characteristics,
+        "api-shield_configuration": api$$shield_configuration,
+        "api-shield_configuration-single-response": api$$shield_configuration$$single$$response,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/configuration`,
       query: [
-        ["normalize", args["normalize"], true],
+        ["normalize", param(args, "query", "normalize"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/credentials/schemas.ts b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/credentials/schemas.ts
index f7bad4537..05c3ffcee 100644
--- a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/credentials/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/credentials/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `api-shield_credentials-JWT-Key-oct-patch-request`.
  */
-export const api_shield_credentials_JWT_Key_oct_patch_request: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$oct$$patch$$request: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -47,7 +47,7 @@ export const api_shield_credentials_JWT_Key_oct_patch_request: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-patch-request`.
  */
-export const api_shield_credentials_JWT_Key_patch_request: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$patch$$request: JsonSchema = {
   "description": "JSON representation of a JWKS key for PATCH credentials requests.",
   "oneOf": [
     {
@@ -68,7 +68,7 @@ export const api_shield_credentials_JWT_Key_patch_request: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-patch-request`.
  */
-export const api_shield_credentials_patch_request: JsonSchema = {
+export const api$$shield_credentials$$patch$$request: JsonSchema = {
   "description": "Request payload for PATCH credentials. Provided keys define the complete stored key set, and stored keys omitted from payload are removed. For each provided key identity (`{alg,kid}`), payload fields overwrite the stored key before validation and omitted fields inherit from the stored key. Key identities must be unique.",
   "properties": {
     "keys": {
diff --git a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/credentials/tools.ts b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/credentials/tools.ts
index b0b40610d..5d14a960d 100644
--- a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/credentials/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/credentials/tools.ts
@@ -3,82 +3,98 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../../schemas.js";
-import {
-  api_shield_credentials_JWT_Key_EC_ES256_output,
-  api_shield_credentials_JWT_Key_EC_ES384_output,
-  api_shield_credentials_JWT_Key_EC_common_output,
-  api_shield_credentials_JWT_Key_RSA_output,
-  api_shield_credentials_JWT_Key_common_output,
-  api_shield_credentials_JWT_Key_oct_response_output,
-  api_shield_credentials_JWT_Key_response_output,
-  api_shield_credentials_output,
+  api$$shield_credentials,
+  api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+  api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+  api$$shield_credentials$$JWT$$Key$$EC$$common,
+  api$$shield_credentials$$JWT$$Key$$RSA,
+  api$$shield_credentials$$JWT$$Key$$common,
+  api$$shield_credentials$$JWT$$Key$$oct$$response,
+  api$$shield_credentials$$JWT$$Key$$response,
 } from "../outputs.js";
 import {
-  api_shield_credentials_JWT_Key_EC_ES256,
-  api_shield_credentials_JWT_Key_EC_ES384,
-  api_shield_credentials_JWT_Key_EC_common,
-  api_shield_credentials_JWT_Key_RSA,
-  api_shield_credentials_JWT_Key_common,
-  api_shield_credentials_JWT_Key_oct_request,
-  api_shield_credentials_JWT_Key_request,
-  api_shield_credentials_request,
+  api$$shield_credentials$$JWT$$Key$$EC$$ES256 as api$$shield_credentials$$JWT$$Key$$EC$$ES256$,
+  api$$shield_credentials$$JWT$$Key$$EC$$ES384 as api$$shield_credentials$$JWT$$Key$$EC$$ES384$,
+  api$$shield_credentials$$JWT$$Key$$EC$$common as api$$shield_credentials$$JWT$$Key$$EC$$common$,
+  api$$shield_credentials$$JWT$$Key$$RSA as api$$shield_credentials$$JWT$$Key$$RSA$,
+  api$$shield_credentials$$JWT$$Key$$common as api$$shield_credentials$$JWT$$Key$$common$,
+  api$$shield_credentials$$JWT$$Key$$oct$$request,
+  api$$shield_credentials$$JWT$$Key$$request,
+  api$$shield_credentials$$request,
 } from "../schemas.js";
 import {
-  api_shield_credentials_JWT_Key_oct_patch_request,
-  api_shield_credentials_JWT_Key_patch_request,
-  api_shield_credentials_patch_request,
+  api$$shield_credentials$$JWT$$Key$$oct$$patch$$request,
+  api$$shield_credentials$$JWT$$Key$$patch$$request,
+  api$$shield_credentials$$patch$$request,
 } from "./schemas.js";
 
 /**
- * The tools of `api_security.token_validation.configurations.credentials`.
+ * The tools of `apiSecurity.tokenValidation.configurations.credentials`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_token_validation_configurations_credentials_edit",
+    name: "apiSecurity_tokenValidation_configurations_credentials_edit",
     title: "Edit token validation credentials",
-    description: "Updates the configuration's complete key set while allowing omitted fields on existing keys to retain stored values. Omitted key identities are removed.",
+    description: "Updates the configuration's complete key set while allowing omitted fields on existing keys to retain stored values. Omitted key identities are removed.\n\nPATCH /zones/{zone_id}/token_validation/config/{config_id}/credentials",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_credentials-patch-request"
         },
-        "config_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Token Configuration ID"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "config_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Token Configuration ID"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "config_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common,
-        "api-shield_credentials-JWT-Key-oct-patch-request": api_shield_credentials_JWT_Key_oct_patch_request,
-        "api-shield_credentials-JWT-Key-patch-request": api_shield_credentials_JWT_Key_patch_request,
-        "api-shield_credentials-patch-request": api_shield_credentials_patch_request,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256$,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384$,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common$,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA$,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common$,
+        "api-shield_credentials-JWT-Key-oct-patch-request": api$$shield_credentials$$JWT$$Key$$oct$$patch$$request,
+        "api-shield_credentials-JWT-Key-patch-request": api$$shield_credentials$$JWT$$Key$$patch$$request,
+        "api-shield_credentials-patch-request": api$$shield_credentials$$patch$$request,
       },
     },
     outputSchema: {
@@ -99,16 +115,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -151,17 +167,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -170,41 +186,63 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_configurations_credentials_update",
+    name: "apiSecurity_tokenValidation_configurations_credentials_update",
     title: "Replace token validation credentials",
-    description: "Replaces the configuration's complete key set. Symmetric keys must include their key material.",
+    description: "Replaces the configuration's complete key set. Symmetric keys must include their key material.\n\nPUT /zones/{zone_id}/token_validation/config/{config_id}/credentials",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_credentials-request"
         },
-        "config_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Token Configuration ID"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "config_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Token Configuration ID"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "config_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common,
-        "api-shield_credentials-JWT-Key-oct-request": api_shield_credentials_JWT_Key_oct_request,
-        "api-shield_credentials-JWT-Key-request": api_shield_credentials_JWT_Key_request,
-        "api-shield_credentials-request": api_shield_credentials_request,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256$,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384$,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common$,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA$,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common$,
+        "api-shield_credentials-JWT-Key-oct-request": api$$shield_credentials$$JWT$$Key$$oct$$request,
+        "api-shield_credentials-JWT-Key-request": api$$shield_credentials$$JWT$$Key$$request,
+        "api-shield_credentials-request": api$$shield_credentials$$request,
       },
     },
     outputSchema: {
@@ -225,16 +263,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -277,17 +315,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/outputs.ts b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/outputs.ts
index 169d80a7b..3d3030387 100644
--- a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/outputs.ts
@@ -6,31 +6,57 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_TokenConfiguration` in responses.
  */
-export const api_shield_TokenConfiguration_output: JsonSchema = {
+export const api$$shield_TokenConfiguration: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/api-shield_timestamp-2"
+      "allOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "credentials": {
       "$ref": "#/$defs/api-shield_credentials"
     },
     "description": {
-      "$ref": "#/$defs/api-shield_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/api-shield_uuid-2"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "last_updated": {
-      "$ref": "#/$defs/api-shield_timestamp-2"
+      "allOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "title": {
-      "$ref": "#/$defs/api-shield_title"
+      "type": "string"
     },
     "token_sources": {
       "$ref": "#/$defs/api-shield_token_sources"
     },
     "token_type": {
-      "$ref": "#/$defs/api-shield_token_type"
+      "enum": [
+        "JWT"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -46,17 +72,10 @@ export const api_shield_TokenConfiguration_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_cookie` in responses.
- */
-export const api_shield_cookie_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_credentials` in responses.
  */
-export const api_shield_credentials_output: JsonSchema = {
+export const api$$shield_credentials: JsonSchema = {
   "properties": {
     "keys": {
       "items": {
@@ -76,7 +95,7 @@ export const api_shield_credentials_output: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-EC-ES256` in responses.
  */
-export const api_shield_credentials_JWT_Key_EC_ES256_output: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$EC$$ES256: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -111,7 +130,7 @@ export const api_shield_credentials_JWT_Key_EC_ES256_output: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-EC-ES384` in responses.
  */
-export const api_shield_credentials_JWT_Key_EC_ES384_output: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$EC$$ES384: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -146,7 +165,7 @@ export const api_shield_credentials_JWT_Key_EC_ES384_output: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-EC-common` in responses.
  */
-export const api_shield_credentials_JWT_Key_EC_common_output: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$EC$$common: JsonSchema = {
   "properties": {
     "kty": {
       "enum": [
@@ -172,7 +191,7 @@ export const api_shield_credentials_JWT_Key_EC_common_output: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-RSA` in responses.
  */
-export const api_shield_credentials_JWT_Key_RSA_output: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$RSA: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -217,7 +236,7 @@ export const api_shield_credentials_JWT_Key_RSA_output: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-common` in responses.
  */
-export const api_shield_credentials_JWT_Key_common_output: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$common: JsonSchema = {
   "properties": {
     "kid": {
       "type": "string"
@@ -232,7 +251,7 @@ export const api_shield_credentials_JWT_Key_common_output: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-oct-response` in responses.
  */
-export const api_shield_credentials_JWT_Key_oct_response_output: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$oct$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -266,7 +285,7 @@ export const api_shield_credentials_JWT_Key_oct_response_output: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-response` in responses.
  */
-export const api_shield_credentials_JWT_Key_response_output: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$response: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-RSA"
@@ -283,38 +302,17 @@ export const api_shield_credentials_JWT_Key_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `api-shield_description` in responses.
- */
-export const api_shield_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_header` in responses.
- */
-export const api_shield_header_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_title` in responses.
- */
-export const api_shield_title_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_token_sources` in responses.
  */
-export const api_shield_token_sources_output: JsonSchema = {
+export const api$$shield_token_sources: JsonSchema = {
   "items": {
     "anyOf": [
       {
-        "$ref": "#/$defs/api-shield_header"
+        "type": "string"
       },
       {
-        "$ref": "#/$defs/api-shield_cookie"
+        "type": "string"
       }
     ]
   },
@@ -322,13 +320,3 @@ export const api_shield_token_sources_output: JsonSchema = {
   "minItems": 1,
   "type": "array"
 };
-
-/**
- * The schema of `api-shield_token_type` in responses.
- */
-export const api_shield_token_type_output: JsonSchema = {
-  "enum": [
-    "JWT"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/schemas.ts b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/schemas.ts
index 7c7123270..a9dbcefab 100644
--- a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `api-shield_cookie`.
- */
-export const api_shield_cookie: JsonSchema = {
-  "description": "HTTP request cookie",
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_credentials-JWT-Key-EC-ES256`.
  */
-export const api_shield_credentials_JWT_Key_EC_ES256: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$EC$$ES256: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -52,7 +44,7 @@ export const api_shield_credentials_JWT_Key_EC_ES256: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-EC-ES384`.
  */
-export const api_shield_credentials_JWT_Key_EC_ES384: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$EC$$ES384: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -90,7 +82,7 @@ export const api_shield_credentials_JWT_Key_EC_ES384: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-EC-common`.
  */
-export const api_shield_credentials_JWT_Key_EC_common: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$EC$$common: JsonSchema = {
   "properties": {
     "kty": {
       "description": "Key Type",
@@ -119,7 +111,7 @@ export const api_shield_credentials_JWT_Key_EC_common: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-RSA`.
  */
-export const api_shield_credentials_JWT_Key_RSA: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$RSA: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -169,7 +161,7 @@ export const api_shield_credentials_JWT_Key_RSA: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-common`.
  */
-export const api_shield_credentials_JWT_Key_common: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$common: JsonSchema = {
   "properties": {
     "kid": {
       "description": "Key ID",
@@ -185,7 +177,7 @@ export const api_shield_credentials_JWT_Key_common: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-oct-request`.
  */
-export const api_shield_credentials_JWT_Key_oct_request: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$oct$$request: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_credentials-JWT-Key-common"
@@ -227,7 +219,7 @@ export const api_shield_credentials_JWT_Key_oct_request: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-JWT-Key-request`.
  */
-export const api_shield_credentials_JWT_Key_request: JsonSchema = {
+export const api$$shield_credentials$$JWT$$Key$$request: JsonSchema = {
   "description": "JSON representation of a JWKS key for create and PUT requests.",
   "oneOf": [
     {
@@ -248,7 +240,7 @@ export const api_shield_credentials_JWT_Key_request: JsonSchema = {
 /**
  * The schema of `api-shield_credentials-request`.
  */
-export const api_shield_credentials_request: JsonSchema = {
+export const api$$shield_credentials$$request: JsonSchema = {
   "description": "Request payload for create and PUT credentials operations. Provided keys define the complete stored key set. Key identities (`{alg,kid}`) must be unique.",
   "properties": {
     "keys": {
@@ -266,39 +258,19 @@ export const api_shield_credentials_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_description`.
- */
-export const api_shield_description: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_header`.
- */
-export const api_shield_header: JsonSchema = {
-  "description": "HTTP request header (must be lowercase)",
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_title`.
- */
-export const api_shield_title: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_token_sources`.
  */
-export const api_shield_token_sources: JsonSchema = {
+export const api$$shield_token_sources: JsonSchema = {
   "items": {
     "anyOf": [
       {
-        "$ref": "#/$defs/api-shield_header"
+        "description": "HTTP request header (must be lowercase)",
+        "type": "string"
       },
       {
-        "$ref": "#/$defs/api-shield_cookie"
+        "description": "HTTP request cookie",
+        "type": "string"
       }
     ]
   },
@@ -306,13 +278,3 @@ export const api_shield_token_sources: JsonSchema = {
   "minItems": 1,
   "type": "array"
 };
-
-/**
- * The schema of `api-shield_token_type`.
- */
-export const api_shield_token_type: JsonSchema = {
-  "enum": [
-    "JWT"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/tools.ts b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/tools.ts
index 7c981b347..49f274406 100644
--- a/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/tokenValidation/configurations/tools.ts
@@ -1,65 +1,45 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../schemas.js";
-import {
-  api_shield_TokenConfiguration_output,
-  api_shield_cookie_output,
-  api_shield_credentials_JWT_Key_EC_ES256_output,
-  api_shield_credentials_JWT_Key_EC_ES384_output,
-  api_shield_credentials_JWT_Key_EC_common_output,
-  api_shield_credentials_JWT_Key_RSA_output,
-  api_shield_credentials_JWT_Key_common_output,
-  api_shield_credentials_JWT_Key_oct_response_output,
-  api_shield_credentials_JWT_Key_response_output,
-  api_shield_credentials_output,
-  api_shield_description_output,
-  api_shield_header_output,
-  api_shield_title_output,
-  api_shield_token_sources_output,
-  api_shield_token_type_output,
+  api$$shield_TokenConfiguration,
+  api$$shield_credentials,
+  api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+  api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+  api$$shield_credentials$$JWT$$Key$$EC$$common,
+  api$$shield_credentials$$JWT$$Key$$RSA,
+  api$$shield_credentials$$JWT$$Key$$common,
+  api$$shield_credentials$$JWT$$Key$$oct$$response,
+  api$$shield_credentials$$JWT$$Key$$response,
+  api$$shield_token_sources,
 } from "./outputs.js";
 import {
-  api_shield_cookie,
-  api_shield_credentials_JWT_Key_EC_ES256,
-  api_shield_credentials_JWT_Key_EC_ES384,
-  api_shield_credentials_JWT_Key_EC_common,
-  api_shield_credentials_JWT_Key_RSA,
-  api_shield_credentials_JWT_Key_common,
-  api_shield_credentials_JWT_Key_oct_request,
-  api_shield_credentials_JWT_Key_request,
-  api_shield_credentials_request,
-  api_shield_description,
-  api_shield_header,
-  api_shield_title,
-  api_shield_token_sources,
-  api_shield_token_type,
+  api$$shield_credentials$$JWT$$Key$$EC$$ES256 as api$$shield_credentials$$JWT$$Key$$EC$$ES256$,
+  api$$shield_credentials$$JWT$$Key$$EC$$ES384 as api$$shield_credentials$$JWT$$Key$$EC$$ES384$,
+  api$$shield_credentials$$JWT$$Key$$EC$$common as api$$shield_credentials$$JWT$$Key$$EC$$common$,
+  api$$shield_credentials$$JWT$$Key$$RSA as api$$shield_credentials$$JWT$$Key$$RSA$,
+  api$$shield_credentials$$JWT$$Key$$common as api$$shield_credentials$$JWT$$Key$$common$,
+  api$$shield_credentials$$JWT$$Key$$oct$$request,
+  api$$shield_credentials$$JWT$$Key$$request,
+  api$$shield_credentials$$request,
+  api$$shield_token_sources as api$$shield_token_sources$,
 } from "./schemas.js";
 
 /**
- * The tools of `api_security.token_validation.configurations`.
+ * The tools of `apiSecurity.tokenValidation.configurations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_token_validation_configurations_create",
+    name: "apiSecurity_tokenValidation_configurations_create",
     title: "Create a token validation configuration",
-    description: "Creates a JWT validation configuration for the zone.",
+    description: "Creates a JWT validation configuration for the zone.\n\nPOST /zones/{zone_id}/token_validation/config",
     inputSchema: {
       type: "object",
       properties: {
@@ -70,16 +50,19 @@ export const tools: readonly Tool[] = [
               "description": "Request payload for create and PUT credentials operations. Provided keys define the complete stored key set. Key identities (`{alg,kid}`) must be unique."
             },
             "description": {
-              "$ref": "#/$defs/api-shield_description"
+              "type": "string"
             },
             "title": {
-              "$ref": "#/$defs/api-shield_title"
+              "type": "string"
             },
             "token_sources": {
               "$ref": "#/$defs/api-shield_token_sources"
             },
             "token_type": {
-              "$ref": "#/$defs/api-shield_token_type"
+              "enum": [
+                "JWT"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -91,31 +74,42 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_cookie": api_shield_cookie,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common,
-        "api-shield_credentials-JWT-Key-oct-request": api_shield_credentials_JWT_Key_oct_request,
-        "api-shield_credentials-JWT-Key-request": api_shield_credentials_JWT_Key_request,
-        "api-shield_credentials-request": api_shield_credentials_request,
-        "api-shield_description": api_shield_description,
-        "api-shield_header": api_shield_header,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_title": api_shield_title,
-        "api-shield_token_sources": api_shield_token_sources,
-        "api-shield_token_type": api_shield_token_type,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256$,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384$,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common$,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA$,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common$,
+        "api-shield_credentials-JWT-Key-oct-request": api$$shield_credentials$$JWT$$Key$$oct$$request,
+        "api-shield_credentials-JWT-Key-request": api$$shield_credentials$$JWT$$Key$$request,
+        "api-shield_credentials-request": api$$shield_credentials$$request,
+        "api-shield_token_sources": api$$shield_token_sources$,
       },
     },
     outputSchema: {
@@ -136,27 +130,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_TokenConfiguration": api_shield_TokenConfiguration_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_cookie": api_shield_cookie_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_description": api_shield_description_output,
-        "api-shield_header": api_shield_header_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title": api_shield_title_output,
-        "api-shield_token_sources": api_shield_token_sources_output,
-        "api-shield_token_type": api_shield_token_type_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_TokenConfiguration": api$$shield_TokenConfiguration,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_token_sources": api$$shield_token_sources,
       },
     },
     annotations: {
@@ -199,28 +184,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_TokenConfiguration": api_shield_TokenConfiguration_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_cookie": api_shield_cookie_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_description": api_shield_description_output,
-        "api-shield_header": api_shield_header_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title": api_shield_title_output,
-        "api-shield_token_sources": api_shield_token_sources_output,
-        "api-shield_token_type": api_shield_token_type_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_TokenConfiguration": api$$shield_TokenConfiguration,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_token_sources": api$$shield_token_sources,
       },
     },
     request: (args) => ({
@@ -229,30 +205,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_configurations_delete",
+    name: "apiSecurity_tokenValidation_configurations_delete",
     title: "Delete a token validation configuration",
-    description: "Deletes a JWT validation configuration from the zone.\n\nConfirm with the user before calling this tool. This operation deletes the token validation configuration. The request is rejected if rules, operations, or JWT authentication identifiers still reference it.",
+    description: "Deletes a JWT validation configuration from the zone.\n\nConfirm with the user before calling this tool. This operation deletes the token validation configuration. The request is rejected if rules, operations, or JWT authentication identifiers still reference it.\n\nDELETE /zones/{zone_id}/token_validation/config/{config_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "config_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Token Configuration ID"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "config_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Token Configuration ID"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "config_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -264,7 +260,14 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/api-shield_uuid-2"
+                  "allOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ]
                 }
               },
               "type": "object"
@@ -277,10 +280,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -310,7 +311,14 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/api-shield_uuid-2"
+                      "allOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "string"
+                        }
+                      ]
                     }
                   },
                   "type": "object"
@@ -328,11 +336,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -340,19 +346,19 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_configurations_edit",
+    name: "apiSecurity_tokenValidation_configurations_edit",
     title: "Edit a token validation configuration",
-    description: "Updates only the supplied fields on a JWT validation configuration.",
+    description: "Updates only the supplied fields on a JWT validation configuration.\n\nPATCH /zones/{zone_id}/token_validation/config/{config_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/api-shield_description"
+              "type": "string"
             },
             "title": {
-              "$ref": "#/$defs/api-shield_title"
+              "type": "string"
             },
             "token_sources": {
               "$ref": "#/$defs/api-shield_token_sources"
@@ -360,29 +366,47 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "config_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Token Configuration ID"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "config_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Token Configuration ID"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "config_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_cookie": api_shield_cookie,
-        "api-shield_description": api_shield_description,
-        "api-shield_header": api_shield_header,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_title": api_shield_title,
-        "api-shield_token_sources": api_shield_token_sources,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_token_sources": api$$shield_token_sources$,
       },
     },
     outputSchema: {
@@ -395,13 +419,20 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "description": {
-                  "$ref": "#/$defs/api-shield_description"
+                  "type": "string"
                 },
                 "id": {
-                  "$ref": "#/$defs/api-shield_uuid-2"
+                  "allOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ]
                 },
                 "title": {
-                  "$ref": "#/$defs/api-shield_title"
+                  "type": "string"
                 },
                 "token_sources": {
                   "$ref": "#/$defs/api-shield_token_sources"
@@ -417,15 +448,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_cookie": api_shield_cookie_output,
-        "api-shield_description": api_shield_description_output,
-        "api-shield_header": api_shield_header_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_title": api_shield_title_output,
-        "api-shield_token_sources": api_shield_token_sources_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_token_sources": api$$shield_token_sources,
       },
     },
     annotations: {
@@ -455,13 +480,20 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "description": {
-                      "$ref": "#/$defs/api-shield_description"
+                      "type": "string"
                     },
                     "id": {
-                      "$ref": "#/$defs/api-shield_uuid-2"
+                      "allOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "string"
+                        }
+                      ]
                     },
                     "title": {
-                      "$ref": "#/$defs/api-shield_title"
+                      "type": "string"
                     },
                     "token_sources": {
                       "$ref": "#/$defs/api-shield_token_sources"
@@ -482,16 +514,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_cookie": api_shield_cookie_output,
-        "api-shield_description": api_shield_description_output,
-        "api-shield_header": api_shield_header_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_title": api_shield_title_output,
-        "api-shield_token_sources": api_shield_token_sources_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_token_sources": api$$shield_token_sources,
       },
     },
     request: (args) => ({
@@ -500,30 +526,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_configurations_get",
+    name: "apiSecurity_tokenValidation_configurations_get",
     title: "Get a token validation configuration",
-    description: "Returns a JWT validation configuration by ID.",
+    description: "Returns a JWT validation configuration by ID.\n\nGET /zones/{zone_id}/token_validation/config/{config_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "config_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Token Configuration ID"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "config_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Token Configuration ID"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "config_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -543,27 +589,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_TokenConfiguration": api_shield_TokenConfiguration_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_cookie": api_shield_cookie_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_description": api_shield_description_output,
-        "api-shield_header": api_shield_header_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title": api_shield_title_output,
-        "api-shield_token_sources": api_shield_token_sources_output,
-        "api-shield_token_type": api_shield_token_type_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_TokenConfiguration": api$$shield_TokenConfiguration,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_token_sources": api$$shield_token_sources,
       },
     },
     annotations: {
@@ -608,28 +645,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_TokenConfiguration": api_shield_TokenConfiguration_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_cookie": api_shield_cookie_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_description": api_shield_description_output,
-        "api-shield_header": api_shield_header_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title": api_shield_title_output,
-        "api-shield_token_sources": api_shield_token_sources_output,
-        "api-shield_token_type": api_shield_token_type_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_TokenConfiguration": api$$shield_TokenConfiguration,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_token_sources": api$$shield_token_sources,
       },
     },
     request: (args) => ({
@@ -637,33 +665,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_configurations_list",
+    name: "apiSecurity_tokenValidation_configurations_list",
     title: "List token validation configurations",
-    description: "Lists the JWT validation configurations defined for the zone.",
+    description: "Lists the JWT validation configurations defined for the zone.\n\nGET /zones/{zone_id}/token_validation/config",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -686,28 +734,19 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_TokenConfiguration": api_shield_TokenConfiguration_output,
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_cookie": api_shield_cookie_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_description": api_shield_description_output,
-        "api-shield_header": api_shield_header_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title": api_shield_title_output,
-        "api-shield_token_sources": api_shield_token_sources_output,
-        "api-shield_token_type": api_shield_token_type_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_TokenConfiguration": api$$shield_TokenConfiguration,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_token_sources": api$$shield_token_sources,
       },
     },
     annotations: {
@@ -755,36 +794,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_TokenConfiguration": api_shield_TokenConfiguration_output,
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_cookie": api_shield_cookie_output,
-        "api-shield_credentials": api_shield_credentials_output,
-        "api-shield_credentials-JWT-Key-EC-ES256": api_shield_credentials_JWT_Key_EC_ES256_output,
-        "api-shield_credentials-JWT-Key-EC-ES384": api_shield_credentials_JWT_Key_EC_ES384_output,
-        "api-shield_credentials-JWT-Key-EC-common": api_shield_credentials_JWT_Key_EC_common_output,
-        "api-shield_credentials-JWT-Key-RSA": api_shield_credentials_JWT_Key_RSA_output,
-        "api-shield_credentials-JWT-Key-common": api_shield_credentials_JWT_Key_common_output,
-        "api-shield_credentials-JWT-Key-oct-response": api_shield_credentials_JWT_Key_oct_response_output,
-        "api-shield_credentials-JWT-Key-response": api_shield_credentials_JWT_Key_response_output,
-        "api-shield_description": api_shield_description_output,
-        "api-shield_header": api_shield_header_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title": api_shield_title_output,
-        "api-shield_token_sources": api_shield_token_sources_output,
-        "api-shield_token_type": api_shield_token_type_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_TokenConfiguration": api$$shield_TokenConfiguration,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_credentials": api$$shield_credentials,
+        "api-shield_credentials-JWT-Key-EC-ES256": api$$shield_credentials$$JWT$$Key$$EC$$ES256,
+        "api-shield_credentials-JWT-Key-EC-ES384": api$$shield_credentials$$JWT$$Key$$EC$$ES384,
+        "api-shield_credentials-JWT-Key-EC-common": api$$shield_credentials$$JWT$$Key$$EC$$common,
+        "api-shield_credentials-JWT-Key-RSA": api$$shield_credentials$$JWT$$Key$$RSA,
+        "api-shield_credentials-JWT-Key-common": api$$shield_credentials$$JWT$$Key$$common,
+        "api-shield_credentials-JWT-Key-oct-response": api$$shield_credentials$$JWT$$Key$$oct$$response,
+        "api-shield_credentials-JWT-Key-response": api$$shield_credentials$$JWT$$Key$$response,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_token_sources": api$$shield_token_sources,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/token_validation/config`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/outputs.ts b/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/outputs.ts
index a504dac12..da4621cb4 100644
--- a/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/outputs.ts
@@ -6,34 +6,61 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_Rule` in responses.
  */
-export const api_shield_Rule_output: JsonSchema = {
+export const api$$shield_Rule: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/api-shield_action"
+      "enum": [
+        "log",
+        "block"
+      ],
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/api-shield_timestamp-2"
+      "allOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "description": {
-      "$ref": "#/$defs/api-shield_description-2"
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/api-shield_enabled"
+      "type": "boolean"
     },
     "expression": {
-      "$ref": "#/$defs/api-shield_expression"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/api-shield_uuid-2"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "last_updated": {
-      "$ref": "#/$defs/api-shield_timestamp-2"
+      "allOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "selector": {
       "$ref": "#/$defs/api-shield_selector"
     },
     "title": {
-      "$ref": "#/$defs/api-shield_title-2"
+      "type": "string"
     }
   },
   "required": [
@@ -47,21 +74,10 @@ export const api_shield_Rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_action` in responses.
- */
-export const api_shield_action_output: JsonSchema = {
-  "enum": [
-    "log",
-    "block"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_api-response-single-obj` in responses.
  */
-export const api_shield_api_response_single_obj_output: JsonSchema = {
+export const api$$shield_api$$response$$single$$obj: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
@@ -77,31 +93,10 @@ export const api_shield_api_response_single_obj_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `api-shield_description-2` in responses.
- */
-export const api_shield_description_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_enabled` in responses.
- */
-export const api_shield_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `api-shield_expression` in responses.
- */
-export const api_shield_expression_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_selector` in responses.
  */
-export const api_shield_selector_output: JsonSchema = {
+export const api$$shield_selector: JsonSchema = {
   "properties": {
     "exclude": {
       "oneOf": [
@@ -136,11 +131,18 @@ export const api_shield_selector_output: JsonSchema = {
 /**
  * The schema of `api-shield_selector-exclude` in responses.
  */
-export const api_shield_selector_exclude_output: JsonSchema = {
+export const api$$shield_selector$$exclude: JsonSchema = {
   "properties": {
     "operation_ids": {
       "items": {
-        "$ref": "#/$defs/api-shield_uuid-2"
+        "allOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string"
+          }
+        ]
       },
       "type": "array"
     }
@@ -151,21 +153,14 @@ export const api_shield_selector_exclude_output: JsonSchema = {
 /**
  * The schema of `api-shield_selector-include` in responses.
  */
-export const api_shield_selector_include_output: JsonSchema = {
+export const api$$shield_selector$$include: JsonSchema = {
   "properties": {
     "host": {
       "items": {
-        "$ref": "#/$defs/api-shield_host"
+        "type": "string"
       },
       "type": "array"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `api-shield_title-2` in responses.
- */
-export const api_shield_title_2_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/schemas.ts b/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/schemas.ts
index 865dcf86b..10e1b247c 100644
--- a/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/schemas.ts
@@ -3,22 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `api-shield_action`.
- */
-export const api_shield_action: JsonSchema = {
-  "description": "Action to take on requests that match operations included in `selector` and fail `expression`.",
-  "enum": [
-    "log",
-    "block"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_after`.
  */
-export const api_shield_after: JsonSchema = {
+export const api$$shield_after: JsonSchema = {
   "description": "Move rule to before rule with ID.",
   "properties": {
     "after": {
@@ -33,7 +21,7 @@ export const api_shield_after: JsonSchema = {
 /**
  * The schema of `api-shield_before`.
  */
-export const api_shield_before: JsonSchema = {
+export const api$$shield_before: JsonSchema = {
   "description": "Move rule to after rule with ID.",
   "properties": {
     "before": {
@@ -48,31 +36,35 @@ export const api_shield_before: JsonSchema = {
 /**
  * The schema of `api-shield_create-single-rule-request`.
  */
-export const api_shield_create_single_rule_request: JsonSchema = {
+export const api$$shield_create$$single$$rule$$request: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/api-shield_action",
-      "description": "Action to take on requests that match operations included in `selector` and fail `expression`."
+      "description": "Action to take on requests that match operations included in `selector` and fail `expression`.",
+      "enum": [
+        "log",
+        "block"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/api-shield_description-2",
-      "description": "A human-readable description that gives more details than `title`."
+      "description": "A human-readable description that gives more details than `title`.",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/api-shield_enabled",
-      "description": "Toggle rule on or off."
+      "description": "Toggle rule on or off.",
+      "type": "boolean"
     },
     "expression": {
-      "$ref": "#/$defs/api-shield_expression",
-      "description": "Rule expression. Requests that fail to match this expression will be subject to `action`.\n\nFor details on expressions, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).\n"
+      "description": "Rule expression. Requests that fail to match this expression will be subject to `action`.\n\nFor details on expressions, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).",
+      "type": "string"
     },
     "selector": {
       "$ref": "#/$defs/api-shield_selector",
-      "description": "Select operations covered by this rule.\n\nFor details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).\n"
+      "description": "Select operations covered by this rule.\n\nFor details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/)."
     },
     "title": {
-      "$ref": "#/$defs/api-shield_title-2",
-      "description": "A human-readable name for the rule."
+      "description": "A human-readable name for the rule.",
+      "type": "string"
     }
   },
   "required": [
@@ -86,18 +78,10 @@ export const api_shield_create_single_rule_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_description-2`.
- */
-export const api_shield_description_2: JsonSchema = {
-  "description": "A human-readable description that gives more details than `title`.",
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_edit-single-rule-request`.
  */
-export const api_shield_edit_single_rule_request: JsonSchema = {
+export const api$$shield_edit$$single$$rule$$request: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_rule-properties"
@@ -114,26 +98,10 @@ export const api_shield_edit_single_rule_request: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `api-shield_enabled`.
- */
-export const api_shield_enabled: JsonSchema = {
-  "description": "Toggle rule on or off.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `api-shield_expression`.
- */
-export const api_shield_expression: JsonSchema = {
-  "description": "Rule expression. Requests that fail to match this expression will be subject to `action`.\n\nFor details on expressions, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).\n",
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_index`.
  */
-export const api_shield_index: JsonSchema = {
+export const api$$shield_index: JsonSchema = {
   "properties": {
     "index": {
       "description": "Move rule to this position",
@@ -149,7 +117,7 @@ export const api_shield_index: JsonSchema = {
 /**
  * The schema of `api-shield_position`.
  */
-export const api_shield_position: JsonSchema = {
+export const api$$shield_position: JsonSchema = {
   "description": "Update rule order among zone rules.",
   "oneOf": [
     {
@@ -167,31 +135,35 @@ export const api_shield_position: JsonSchema = {
 /**
  * The schema of `api-shield_rule-properties`.
  */
-export const api_shield_rule_properties: JsonSchema = {
+export const api$$shield_rule$$properties: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/api-shield_action",
-      "description": "Action to take on requests that match operations included in `selector` and fail `expression`."
+      "description": "Action to take on requests that match operations included in `selector` and fail `expression`.",
+      "enum": [
+        "log",
+        "block"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/api-shield_description-2",
-      "description": "A human-readable description that gives more details than `title`."
+      "description": "A human-readable description that gives more details than `title`.",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/api-shield_enabled",
-      "description": "Toggle rule on or off."
+      "description": "Toggle rule on or off.",
+      "type": "boolean"
     },
     "expression": {
-      "$ref": "#/$defs/api-shield_expression",
-      "description": "Rule expression. Requests that fail to match this expression will be subject to `action`.\n\nFor details on expressions, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).\n"
+      "description": "Rule expression. Requests that fail to match this expression will be subject to `action`.\n\nFor details on expressions, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).",
+      "type": "string"
     },
     "selector": {
       "$ref": "#/$defs/api-shield_selector",
-      "description": "Select operations covered by this rule.\n\nFor details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).\n"
+      "description": "Select operations covered by this rule.\n\nFor details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/)."
     },
     "title": {
-      "$ref": "#/$defs/api-shield_title-2",
-      "description": "A human-readable name for the rule."
+      "description": "A human-readable name for the rule.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -200,8 +172,8 @@ export const api_shield_rule_properties: JsonSchema = {
 /**
  * The schema of `api-shield_selector`.
  */
-export const api_shield_selector: JsonSchema = {
-  "description": "Select operations covered by this rule.\n\nFor details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).\n",
+export const api$$shield_selector: JsonSchema = {
+  "description": "Select operations covered by this rule.\n\nFor details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).",
   "properties": {
     "exclude": {
       "description": "Ignore operations that were otherwise included by `include`.",
@@ -238,12 +210,20 @@ export const api_shield_selector: JsonSchema = {
 /**
  * The schema of `api-shield_selector-exclude`.
  */
-export const api_shield_selector_exclude: JsonSchema = {
+export const api$$shield_selector$$exclude: JsonSchema = {
   "properties": {
     "operation_ids": {
       "description": "Excluded operation IDs.",
       "items": {
-        "$ref": "#/$defs/api-shield_uuid-2"
+        "allOf": [
+          {
+            "type": "string"
+          },
+          {
+            "description": "UUID.",
+            "type": "string"
+          }
+        ]
       },
       "type": "array"
     }
@@ -254,23 +234,16 @@ export const api_shield_selector_exclude: JsonSchema = {
 /**
  * The schema of `api-shield_selector-include`.
  */
-export const api_shield_selector_include: JsonSchema = {
+export const api$$shield_selector$$include: JsonSchema = {
   "properties": {
     "host": {
       "description": "Included hostnames.",
       "items": {
-        "$ref": "#/$defs/api-shield_host"
+        "description": "RFC3986-compliant host.",
+        "type": "string"
       },
       "type": "array"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `api-shield_title-2`.
- */
-export const api_shield_title_2: JsonSchema = {
-  "description": "A human-readable name for the rule.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/tools.ts b/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/tools.ts
index f74057270..23ec2550b 100644
--- a/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/tokenValidation/rules/tools.ts
@@ -1,64 +1,42 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_host_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../outputs.js";
+import { api$$shield_api$$response$$single } from "../../outputs.js";
 import {
-  api_shield_host,
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../schemas.js";
-import { api_shield_api_response_single_output } from "../../outputs.js";
-import {
-  api_shield_Rule_output,
-  api_shield_action_output,
-  api_shield_api_response_single_obj_output,
-  api_shield_description_2_output,
-  api_shield_enabled_output,
-  api_shield_expression_output,
-  api_shield_selector_exclude_output,
-  api_shield_selector_include_output,
-  api_shield_selector_output,
-  api_shield_title_2_output,
+  api$$shield_Rule,
+  api$$shield_api$$response$$single$$obj,
+  api$$shield_selector,
+  api$$shield_selector$$exclude,
+  api$$shield_selector$$include,
 } from "./outputs.js";
 import {
-  api_shield_action,
-  api_shield_after,
-  api_shield_before,
-  api_shield_create_single_rule_request,
-  api_shield_description_2,
-  api_shield_edit_single_rule_request,
-  api_shield_enabled,
-  api_shield_expression,
-  api_shield_index,
-  api_shield_position,
-  api_shield_rule_properties,
-  api_shield_selector,
-  api_shield_selector_exclude,
-  api_shield_selector_include,
-  api_shield_title_2,
+  api$$shield_after,
+  api$$shield_before,
+  api$$shield_create$$single$$rule$$request,
+  api$$shield_edit$$single$$rule$$request,
+  api$$shield_index,
+  api$$shield_position,
+  api$$shield_rule$$properties,
+  api$$shield_selector as api$$shield_selector$,
+  api$$shield_selector$$exclude as api$$shield_selector$$exclude$,
+  api$$shield_selector$$include as api$$shield_selector$$include$,
 } from "./schemas.js";
 
 /**
- * The tools of `api_security.token_validation.rules`.
+ * The tools of `apiSecurity.tokenValidation.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_token_validation_rules_bulk_create",
+    name: "apiSecurity_tokenValidation_rules_bulkCreate",
     title: "Create token validation rules",
-    description: "Creates multiple token validation rules for the zone in one request.",
+    description: "Creates multiple token validation rules for the zone in one request.\n\nPOST /zones/{zone_id}/token_validation/rules/bulk",
     inputSchema: {
       type: "object",
       properties: {
@@ -68,29 +46,37 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_action": api_shield_action,
-        "api-shield_create-single-rule-request": api_shield_create_single_rule_request,
-        "api-shield_description-2": api_shield_description_2,
-        "api-shield_enabled": api_shield_enabled,
-        "api-shield_expression": api_shield_expression,
-        "api-shield_host": api_shield_host,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_selector": api_shield_selector,
-        "api-shield_selector-exclude": api_shield_selector_exclude,
-        "api-shield_selector-include": api_shield_selector_include,
-        "api-shield_title-2": api_shield_title_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_create-single-rule-request": api$$shield_create$$single$$rule$$request,
+        "api-shield_selector": api$$shield_selector$,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude$,
+        "api-shield_selector-include": api$$shield_selector$$include$,
       },
     },
     outputSchema: {
@@ -114,23 +100,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     annotations: {
@@ -176,24 +152,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     request: (args) => ({
@@ -202,9 +168,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_rules_bulk_edit",
+    name: "apiSecurity_tokenValidation_rules_bulkEdit",
     title: "Edit token validation rules",
-    description: "Updates and reorders multiple token validation rules in one request, then returns the updated rules.",
+    description: "Updates and reorders multiple token validation rules in one request, then returns the updated rules.\n\nPATCH /zones/{zone_id}/token_validation/rules/bulk",
     inputSchema: {
       type: "object",
       properties: {
@@ -231,34 +197,42 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_action": api_shield_action,
-        "api-shield_after": api_shield_after,
-        "api-shield_before": api_shield_before,
-        "api-shield_description-2": api_shield_description_2,
-        "api-shield_edit-single-rule-request": api_shield_edit_single_rule_request,
-        "api-shield_enabled": api_shield_enabled,
-        "api-shield_expression": api_shield_expression,
-        "api-shield_host": api_shield_host,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_index": api_shield_index,
-        "api-shield_position": api_shield_position,
-        "api-shield_rule-properties": api_shield_rule_properties,
-        "api-shield_selector": api_shield_selector,
-        "api-shield_selector-exclude": api_shield_selector_exclude,
-        "api-shield_selector-include": api_shield_selector_include,
-        "api-shield_title-2": api_shield_title_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_after": api$$shield_after,
+        "api-shield_before": api$$shield_before,
+        "api-shield_edit-single-rule-request": api$$shield_edit$$single$$rule$$request,
+        "api-shield_index": api$$shield_index,
+        "api-shield_position": api$$shield_position,
+        "api-shield_rule-properties": api$$shield_rule$$properties,
+        "api-shield_selector": api$$shield_selector$,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude$,
+        "api-shield_selector-include": api$$shield_selector$$include$,
       },
     },
     outputSchema: {
@@ -282,23 +256,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     annotations: {
@@ -344,24 +308,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     request: (args) => ({
@@ -370,38 +324,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_rules_create",
+    name: "apiSecurity_tokenValidation_rules_create",
     title: "Create a token validation rule",
-    description: "Creates a token validation rule for the zone.",
+    description: "Creates a token validation rule for the zone.\n\nPOST /zones/{zone_id}/token_validation/rules",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_create-single-rule-request"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_action": api_shield_action,
-        "api-shield_create-single-rule-request": api_shield_create_single_rule_request,
-        "api-shield_description-2": api_shield_description_2,
-        "api-shield_enabled": api_shield_enabled,
-        "api-shield_expression": api_shield_expression,
-        "api-shield_host": api_shield_host,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_selector": api_shield_selector,
-        "api-shield_selector-exclude": api_shield_selector_exclude,
-        "api-shield_selector-include": api_shield_selector_include,
-        "api-shield_title-2": api_shield_title_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_create-single-rule-request": api$$shield_create$$single$$rule$$request,
+        "api-shield_selector": api$$shield_selector$,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude$,
+        "api-shield_selector-include": api$$shield_selector$$include$,
       },
     },
     outputSchema: {
@@ -422,22 +384,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     annotations: {
@@ -480,23 +432,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     request: (args) => ({
@@ -505,37 +447,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_rules_delete",
+    name: "apiSecurity_tokenValidation_rules_delete",
     title: "Delete a token validation rule",
-    description: "Deletes a token validation rule from the zone.\n\nConfirm with the user before calling this tool. This operation deletes the token validation rule from the zone.",
+    description: "Deletes a token validation rule from the zone.\n\nConfirm with the user before calling this tool. This operation deletes the token validation rule from the zone.\n\nDELETE /zones/{zone_id}/token_validation/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Token Validation Rule ID"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Token Validation Rule ID"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_api-response-single-obj",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-single-obj": api_shield_api_response_single_obj_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-single-obj": api$$shield_api$$response$$single$$obj,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -563,10 +525,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api-response-single-obj": api_shield_api_response_single_obj_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_api-response-single-obj": api$$shield_api$$response$$single$$obj,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -574,48 +536,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_rules_edit",
+    name: "apiSecurity_tokenValidation_rules_edit",
     title: "Edit a token validation rule",
-    description: "Updates only the supplied fields on a token validation rule.",
+    description: "Updates only the supplied fields on a token validation rule.\n\nPATCH /zones/{zone_id}/token_validation/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_edit-single-rule-request"
         },
-        "rule_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Token Validation Rule ID"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Token Validation Rule ID"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_action": api_shield_action,
-        "api-shield_after": api_shield_after,
-        "api-shield_before": api_shield_before,
-        "api-shield_description-2": api_shield_description_2,
-        "api-shield_edit-single-rule-request": api_shield_edit_single_rule_request,
-        "api-shield_enabled": api_shield_enabled,
-        "api-shield_expression": api_shield_expression,
-        "api-shield_host": api_shield_host,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_index": api_shield_index,
-        "api-shield_position": api_shield_position,
-        "api-shield_rule-properties": api_shield_rule_properties,
-        "api-shield_selector": api_shield_selector,
-        "api-shield_selector-exclude": api_shield_selector_exclude,
-        "api-shield_selector-include": api_shield_selector_include,
-        "api-shield_title-2": api_shield_title_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_after": api$$shield_after,
+        "api-shield_before": api$$shield_before,
+        "api-shield_edit-single-rule-request": api$$shield_edit$$single$$rule$$request,
+        "api-shield_index": api$$shield_index,
+        "api-shield_position": api$$shield_position,
+        "api-shield_rule-properties": api$$shield_rule$$properties,
+        "api-shield_selector": api$$shield_selector$,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude$,
+        "api-shield_selector-include": api$$shield_selector$$include$,
       },
     },
     outputSchema: {
@@ -636,22 +614,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     annotations: {
@@ -694,23 +662,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api-response-single": api_shield_api_response_single_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_api-response-single": api$$shield_api$$response$$single,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     request: (args) => ({
@@ -719,30 +677,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_rules_get",
+    name: "apiSecurity_tokenValidation_rules_get",
     title: "Get a token validation rule",
-    description: "Returns a token validation rule by ID.",
+    description: "Returns a token validation rule by ID.\n\nGET /zones/{zone_id}/token_validation/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Token Validation Rule ID"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Token Validation Rule ID"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -762,22 +740,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     annotations: {
@@ -822,23 +790,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     request: (args) => ({
@@ -846,69 +804,112 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_token_validation_rules_list",
+    name: "apiSecurity_tokenValidation_rules_list",
     title: "List token validation rules",
-    description: "Lists token validation rules for the zone, with filters for configuration, action, state, ID, and host.",
+    description: "Lists token validation rules for the zone, with filters for configuration, action, state, ID, and host.\n\nGET /zones/{zone_id}/token_validation/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "action": {
-          "$ref": "#/$defs/api-shield_action",
-          "description": "Action to take on requests that match operations included in `selector` and fail `expression`."
-        },
-        "enabled": {
-          "$ref": "#/$defs/api-shield_enabled",
-          "description": "Toggle rule on or off."
-        },
-        "host": {
-          "$ref": "#/$defs/api-shield_host",
-          "description": "Select rules with this host in `include`."
-        },
-        "hostname": {
-          "$ref": "#/$defs/api-shield_host",
-          "description": "Select rules with this host in `include`."
-        },
-        "id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Select rules with these IDs."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
-        },
-        "rule_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Select rules with these IDs."
-        },
-        "token_configuration": {
-          "description": "Select rules using any of these token configurations.",
-          "items": {
-            "$ref": "#/$defs/api-shield_uuid-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
           },
-          "type": "array"
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "action": {
+              "description": "Action to take on requests that match operations included in `selector` and fail `expression`.",
+              "enum": [
+                "log",
+                "block"
+              ],
+              "type": "string"
+            },
+            "enabled": {
+              "description": "Toggle rule on or off.",
+              "type": "boolean"
+            },
+            "host": {
+              "description": "Select rules with this host in `include`.",
+              "type": "string"
+            },
+            "hostname": {
+              "description": "Select rules with this host in `include`.",
+              "type": "string"
+            },
+            "id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Select rules with these IDs."
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            },
+            "rule_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Select rules with these IDs."
+            },
+            "token_configuration": {
+              "description": "Select rules using any of these token configurations.",
+              "items": {
+                "allOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "description": "UUID.",
+                    "type": "string"
+                  }
+                ]
+              },
+              "type": "array"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_action": api_shield_action,
-        "api-shield_enabled": api_shield_enabled,
-        "api-shield_host": api_shield_host,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -931,23 +932,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     annotations: {
@@ -995,38 +986,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_Rule": api_shield_Rule_output,
-        "api-shield_action": api_shield_action_output,
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_description-2": api_shield_description_2_output,
-        "api-shield_enabled": api_shield_enabled_output,
-        "api-shield_expression": api_shield_expression_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_selector": api_shield_selector_output,
-        "api-shield_selector-exclude": api_shield_selector_exclude_output,
-        "api-shield_selector-include": api_shield_selector_include_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_title-2": api_shield_title_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_Rule": api$$shield_Rule,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_selector": api$$shield_selector,
+        "api-shield_selector-exclude": api$$shield_selector$$exclude,
+        "api-shield_selector-include": api$$shield_selector$$include,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/token_validation/rules`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
-        ["token_configuration", args["token_configuration"], true],
-        ["action", args["action"], true],
-        ["enabled", args["enabled"], true],
-        ["id", args["id"], true],
-        ["rule_id", args["rule_id"], true],
-        ["host", args["host"], true],
-        ["hostname", args["hostname"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
+        ["token_configuration", param(args, "query", "token_configuration"), true],
+        ["action", param(args, "query", "action"), true],
+        ["enabled", param(args, "query", "enabled"), true],
+        ["id", param(args, "query", "id"), true],
+        ["rule_id", param(args, "query", "rule_id"), true],
+        ["host", param(args, "query", "host"), true],
+        ["hostname", param(args, "query", "hostname"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/outputs.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/outputs.ts
index cab69944e..a1c8c191a 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `vuln_scanner_credential` in responses.
  */
-export const vuln_scanner_credential_output: JsonSchema = {
+export const vuln_scanner_credential: JsonSchema = {
   "properties": {
     "credential_set_id": {
       "format": "uuid",
@@ -17,7 +17,11 @@ export const vuln_scanner_credential_output: JsonSchema = {
       "type": "string"
     },
     "location": {
-      "$ref": "#/$defs/vuln_scanner_credential-location"
+      "enum": [
+        "header",
+        "cookie"
+      ],
+      "type": "string"
     },
     "location_name": {
       "type": "string"
@@ -35,14 +39,3 @@ export const vuln_scanner_credential_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `vuln_scanner_credential-location` in responses.
- */
-export const vuln_scanner_credential_location_output: JsonSchema = {
-  "enum": [
-    "header",
-    "cookie"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/schemas.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/schemas.ts
index a186084ae..988e4e7c3 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/schemas.ts
@@ -6,14 +6,18 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `vuln_scanner_create-credential-request`.
  */
-export const vuln_scanner_create_credential_request: JsonSchema = {
+export const vuln_scanner_create$$credential$$request: JsonSchema = {
   "properties": {
     "location": {
-      "$ref": "#/$defs/vuln_scanner_credential-location",
-      "description": "Where the credential is attached in outgoing requests."
+      "description": "Where the credential is attached in outgoing requests.",
+      "enum": [
+        "header",
+        "cookie"
+      ],
+      "type": "string"
     },
     "location_name": {
-      "description": "Name of the header or cookie where the credential is attached.\n",
+      "description": "Name of the header or cookie where the credential is attached.",
       "type": "string"
     },
     "name": {
@@ -21,7 +25,7 @@ export const vuln_scanner_create_credential_request: JsonSchema = {
       "type": "string"
     },
     "value": {
-      "description": "The credential value (e.g. API key, session token). Write-only.\nNever returned in responses.\n",
+      "description": "The credential value (e.g. API key, session token). Write-only.\nNever returned in responses.",
       "type": "string"
     }
   },
@@ -34,30 +38,22 @@ export const vuln_scanner_create_credential_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vuln_scanner_credential-location`.
- */
-export const vuln_scanner_credential_location: JsonSchema = {
-  "description": "Where the credential is attached in outgoing requests.",
-  "enum": [
-    "header",
-    "cookie"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `vuln_scanner_patch-credential-request`.
  */
-export const vuln_scanner_patch_credential_request: JsonSchema = {
+export const vuln_scanner_patch$$credential$$request: JsonSchema = {
   "description": "Applies a partial update. Only the provided fields change; omitted fields remain unchanged.",
   "properties": {
     "location": {
-      "$ref": "#/$defs/vuln_scanner_credential-location",
-      "description": "Where the credential is attached in outgoing requests."
+      "description": "Where the credential is attached in outgoing requests.",
+      "enum": [
+        "header",
+        "cookie"
+      ],
+      "type": "string"
     },
     "location_name": {
-      "description": "Name of the header or cookie where the credential is attached.\n",
+      "description": "Name of the header or cookie where the credential is attached.",
       "type": "string"
     },
     "name": {
@@ -65,7 +61,7 @@ export const vuln_scanner_patch_credential_request: JsonSchema = {
       "type": "string"
     },
     "value": {
-      "description": "The credential value. Write-only. Never returned in responses.\n",
+      "description": "The credential value. Write-only. Never returned in responses.",
       "type": "string"
     }
   },
@@ -75,15 +71,19 @@ export const vuln_scanner_patch_credential_request: JsonSchema = {
 /**
  * The schema of `vuln_scanner_update-credential-request`.
  */
-export const vuln_scanner_update_credential_request: JsonSchema = {
+export const vuln_scanner_update$$credential$$request: JsonSchema = {
   "description": "Full replacement. Provide all fields.",
   "properties": {
     "location": {
-      "$ref": "#/$defs/vuln_scanner_credential-location",
-      "description": "Where the credential is attached in outgoing requests."
+      "description": "Where the credential is attached in outgoing requests.",
+      "enum": [
+        "header",
+        "cookie"
+      ],
+      "type": "string"
     },
     "location_name": {
-      "description": "Name of the header or cookie where the credential is attached.\n",
+      "description": "Name of the header or cookie where the credential is attached.",
       "type": "string"
     },
     "name": {
@@ -91,7 +91,7 @@ export const vuln_scanner_update_credential_request: JsonSchema = {
       "type": "string"
     },
     "value": {
-      "description": "The credential value. Write-only. Never returned in responses.\n",
+      "description": "The credential value. Write-only. Never returned in responses.",
       "type": "string"
     }
   },
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/tools.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/tools.ts
index 604dcae24..3c0e4b1e3 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/credentials/tools.ts
@@ -1,60 +1,62 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  vuln_scanner_api_response_collection_output,
-  vuln_scanner_api_response_common_failure_output,
-  vuln_scanner_api_response_common_output,
-  vuln_scanner_empty_response_output,
-  vuln_scanner_messages_output,
+  vuln_scanner_api$$response$$collection,
+  vuln_scanner_api$$response$$common,
+  vuln_scanner_api$$response$$common$$failure,
+  vuln_scanner_empty$$response,
+  vuln_scanner_messages,
 } from "../../outputs.js";
-import { vuln_scanner_identifier } from "../../schemas.js";
+import { vuln_scanner_credential } from "./outputs.js";
 import {
-  vuln_scanner_credential_location_output,
-  vuln_scanner_credential_output,
-} from "./outputs.js";
-import {
-  vuln_scanner_create_credential_request,
-  vuln_scanner_credential_location,
-  vuln_scanner_patch_credential_request,
-  vuln_scanner_update_credential_request,
+  vuln_scanner_create$$credential$$request,
+  vuln_scanner_patch$$credential$$request,
+  vuln_scanner_update$$credential$$request,
 } from "./schemas.js";
 
 /**
- * The tools of
- * `api_security.vulnerability_scanner.credential_sets.credentials`.
+ * The tools of `apiSecurity.vulnerabilityScanner.credentialSets.credentials`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_vulnerability_scanner_credential_sets_credentials_create",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_credentials_create",
     title: "Create credential",
-    description: "Creates a new credential within a credential set.\n\nThis method is beta.",
+    description: "Creates a new credential within a credential set.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}/credentials",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_create-credential-request"
         },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_create-credential-request": vuln_scanner_create_credential_request,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location,
-        "vuln_scanner_identifier": vuln_scanner_identifier,
+        "vuln_scanner_create-credential-request": vuln_scanner_create$$credential$$request,
       },
     },
     outputSchema: {
@@ -82,10 +84,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -129,11 +130,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -142,42 +142,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_credentials_delete",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_credentials_delete",
     title: "Delete credential",
-    description: "Deletes a credential.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the credential from the credential set.",
+    description: "Deletes a credential.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the credential from the credential set.\n\nDELETE /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}/credentials/{credential_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "credential_id": {
-          "description": "Credential identifier.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "Credential identifier.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id",
+            "credential_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id",
-        "credential_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/vuln_scanner_empty-response",
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_empty-response": vuln_scanner_empty_response_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_empty-response": vuln_scanner_empty$$response,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -199,10 +206,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_empty-response": vuln_scanner_empty_response_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_empty-response": vuln_scanner_empty$$response,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -210,40 +217,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_credentials_edit",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_credentials_edit",
     title: "Edit credential",
-    description: "Updates a credential with only the provided fields; omitted fields remain unchanged.\n\nThis method is beta.",
+    description: "Updates a credential with only the provided fields; omitted fields remain unchanged.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}/credentials/{credential_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_patch-credential-request"
         },
-        "credential_id": {
-          "description": "Credential identifier.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "Credential identifier.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id",
+            "credential_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id",
-        "credential_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_credential-location": vuln_scanner_credential_location,
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-        "vuln_scanner_patch-credential-request": vuln_scanner_patch_credential_request,
+        "vuln_scanner_patch-credential-request": vuln_scanner_patch$$credential$$request,
       },
     },
     outputSchema: {
@@ -271,10 +286,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -318,11 +332,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -331,35 +344,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_credentials_get",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_credentials_get",
     title: "Get credential",
-    description: "Returns a single credential by ID.\n\nThis method is beta.",
+    description: "Returns a single credential by ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}/credentials/{credential_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "credential_id": {
-          "description": "Credential identifier.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "Credential identifier.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id",
+            "credential_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id",
-        "credential_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -386,10 +406,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -433,11 +452,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -445,39 +463,52 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_credentials_list",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_credentials_list",
     title: "List credentials",
-    description: "Returns all credentials within a credential set.\n\nThis method is beta.",
+    description: "Returns all credentials within a credential set.\n\nThis method is beta.\n\nGET /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}/credentials",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -497,11 +528,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-collection": vuln_scanner_api_response_collection_output,
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-collection": vuln_scanner_api$$response$$collection,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -538,57 +568,64 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-collection": vuln_scanner_api_response_collection_output,
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-collection": vuln_scanner_api$$response$$collection,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/vuln_scanner/credential_sets/${pathParam(args, "credential_set_id")}/credentials`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_credentials_update",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_credentials_update",
     title: "Update credential",
-    description: "Replaces a credential. All fields must be provided.\n\nThis method is beta.",
+    description: "Replaces a credential. All fields must be provided.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}/credentials/{credential_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_update-credential-request"
         },
-        "credential_id": {
-          "description": "Credential identifier.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "Credential identifier.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id",
+            "credential_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id",
-        "credential_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_credential-location": vuln_scanner_credential_location,
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-        "vuln_scanner_update-credential-request": vuln_scanner_update_credential_request,
+        "vuln_scanner_update-credential-request": vuln_scanner_update$$credential$$request,
       },
     },
     outputSchema: {
@@ -616,10 +653,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -663,11 +699,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential": vuln_scanner_credential_output,
-        "vuln_scanner_credential-location": vuln_scanner_credential_location_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential": vuln_scanner_credential,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/outputs.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/outputs.ts
index 966d38ca1..96c8174ef 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `vuln_scanner_credential-set` in responses.
  */
-export const vuln_scanner_credential_set_output: JsonSchema = {
+export const vuln_scanner_credential$$set: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/schemas.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/schemas.ts
index b7665fe62..b54a11526 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `vuln_scanner_create-credential-set-request`.
  */
-export const vuln_scanner_create_credential_set_request: JsonSchema = {
+export const vuln_scanner_create$$credential$$set$$request: JsonSchema = {
   "properties": {
     "name": {
       "description": "Human-readable name.",
@@ -22,7 +22,7 @@ export const vuln_scanner_create_credential_set_request: JsonSchema = {
 /**
  * The schema of `vuln_scanner_patch-credential-set-request`.
  */
-export const vuln_scanner_patch_credential_set_request: JsonSchema = {
+export const vuln_scanner_patch$$credential$$set$$request: JsonSchema = {
   "description": "Applies a partial update. Only the provided fields change; omitted fields remain unchanged.",
   "properties": {
     "name": {
@@ -36,7 +36,7 @@ export const vuln_scanner_patch_credential_set_request: JsonSchema = {
 /**
  * The schema of `vuln_scanner_update-credential-set-request`.
  */
-export const vuln_scanner_update_credential_set_request: JsonSchema = {
+export const vuln_scanner_update$$credential$$set$$request: JsonSchema = {
   "description": "Full replacement. Provide all fields.",
   "properties": {
     "name": {
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/tools.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/tools.ts
index b092b9110..574a37196 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/credentialSets/tools.ts
@@ -1,48 +1,56 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  vuln_scanner_api_response_collection_output,
-  vuln_scanner_api_response_common_failure_output,
-  vuln_scanner_api_response_common_output,
-  vuln_scanner_empty_response_output,
-  vuln_scanner_messages_output,
+  vuln_scanner_api$$response$$collection,
+  vuln_scanner_api$$response$$common,
+  vuln_scanner_api$$response$$common$$failure,
+  vuln_scanner_empty$$response,
+  vuln_scanner_messages,
 } from "../outputs.js";
-import { vuln_scanner_identifier } from "../schemas.js";
-import { vuln_scanner_credential_set_output } from "./outputs.js";
+import { vuln_scanner_credential$$set } from "./outputs.js";
 import {
-  vuln_scanner_create_credential_set_request,
-  vuln_scanner_patch_credential_set_request,
-  vuln_scanner_update_credential_set_request,
+  vuln_scanner_create$$credential$$set$$request,
+  vuln_scanner_patch$$credential$$set$$request,
+  vuln_scanner_update$$credential$$set$$request,
 } from "./schemas.js";
 
 /**
- * The tools of `api_security.vulnerability_scanner.credential_sets`.
+ * The tools of `apiSecurity.vulnerabilityScanner.credentialSets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_vulnerability_scanner_credential_sets_create",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_create",
     title: "Create credential set",
-    description: "Creates a new credential set.\n\nThis method is beta.",
+    description: "Creates a new credential set.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/vuln_scanner/credential_sets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_create-credential-set-request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_create-credential-set-request": vuln_scanner_create_credential_set_request,
-        "vuln_scanner_identifier": vuln_scanner_identifier,
+        "vuln_scanner_create-credential-set-request": vuln_scanner_create$$credential$$set$$request,
       },
     },
     outputSchema: {
@@ -70,9 +78,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -116,10 +124,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -128,36 +136,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_delete",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_delete",
     title: "Delete credential set",
-    description: "Deletes a credential set and all of its credentials.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the credential set and every credential it contains.",
+    description: "Deletes a credential set and all of its credentials.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the credential set and every credential it contains.\n\nDELETE /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/vuln_scanner_empty-response",
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_empty-response": vuln_scanner_empty_response_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_empty-response": vuln_scanner_empty$$response,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -179,10 +194,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_empty-response": vuln_scanner_empty_response_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_empty-response": vuln_scanner_empty$$response,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -190,33 +205,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_edit",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_edit",
     title: "Edit credential set",
-    description: "Updates a credential set with only the provided fields; omitted fields remain unchanged.\n\nThis method is beta.",
+    description: "Updates a credential set with only the provided fields; omitted fields remain unchanged.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_patch-credential-set-request"
         },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-        "vuln_scanner_patch-credential-set-request": vuln_scanner_patch_credential_set_request,
+        "vuln_scanner_patch-credential-set-request": vuln_scanner_patch$$credential$$set$$request,
       },
     },
     outputSchema: {
@@ -244,9 +268,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -290,10 +314,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -302,29 +326,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_get",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_get",
     title: "Get credential set",
-    description: "Returns a single credential set by ID.\n\nThis method is beta.",
+    description: "Returns a single credential set by ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -351,9 +382,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -397,10 +428,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -408,33 +439,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_list",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_list",
     title: "List credential sets",
-    description: "Returns all credential sets for the account.\n\nThis method is beta.",
+    description: "Returns all credential sets for the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/vuln_scanner/credential_sets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -454,10 +498,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-collection": vuln_scanner_api_response_collection_output,
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-collection": vuln_scanner_api$$response$$collection,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -494,49 +538,58 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-collection": vuln_scanner_api_response_collection_output,
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-collection": vuln_scanner_api$$response$$collection,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/vuln_scanner/credential_sets`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_credential_sets_update",
+    name: "apiSecurity_vulnerabilityScanner_credentialSets_update",
     title: "Update credential set",
-    description: "Replaces a credential set. All fields must be provided.\n\nThis method is beta.",
+    description: "Replaces a credential set. All fields must be provided.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/vuln_scanner/credential_sets/{credential_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_update-credential-set-request"
         },
-        "credential_set_id": {
-          "description": "Credential set identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "credential_set_id": {
+              "description": "Credential set identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_set_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-        "vuln_scanner_update-credential-set-request": vuln_scanner_update_credential_set_request,
+        "vuln_scanner_update-credential-set-request": vuln_scanner_update$$credential$$set$$request,
       },
     },
     outputSchema: {
@@ -564,9 +617,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -610,10 +663,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_credential-set": vuln_scanner_credential_set_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_credential-set": vuln_scanner_credential$$set,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/outputs.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/outputs.ts
index 6323d7a53..6a38e7dc9 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `vuln_scanner_api-response-collection` in responses.
  */
-export const vuln_scanner_api_response_collection_output: JsonSchema = {
+export const vuln_scanner_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/vuln_scanner_api-response-common"
@@ -42,7 +42,7 @@ export const vuln_scanner_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_api-response-common` in responses.
  */
-export const vuln_scanner_api_response_common_output: JsonSchema = {
+export const vuln_scanner_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/vuln_scanner_messages"
@@ -68,7 +68,7 @@ export const vuln_scanner_api_response_common_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_api-response-common-failure` in responses.
  */
-export const vuln_scanner_api_response_common_failure_output: JsonSchema = {
+export const vuln_scanner_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/vuln_scanner_messages"
@@ -98,7 +98,7 @@ export const vuln_scanner_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_empty-response` in responses.
  */
-export const vuln_scanner_empty_response_output: JsonSchema = {
+export const vuln_scanner_empty$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/vuln_scanner_api-response-common"
@@ -134,7 +134,7 @@ export const vuln_scanner_empty_response_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_messages` in responses.
  */
-export const vuln_scanner_messages_output: JsonSchema = {
+export const vuln_scanner_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/outputs.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/outputs.ts
index a80b0239d..05f9a2e40 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `vuln_scanner_bola-assertion-kind` in responses.
  */
-export const vuln_scanner_bola_assertion_kind_output: JsonSchema = {
+export const vuln_scanner_bola$$assertion$$kind: JsonSchema = {
   "properties": {
     "parameters": {
       "$ref": "#/$defs/vuln_scanner_bola-http-status-range"
@@ -28,7 +28,7 @@ export const vuln_scanner_bola_assertion_kind_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-body-response` in responses.
  */
-export const vuln_scanner_bola_body_response_output: JsonSchema = {
+export const vuln_scanner_bola$$body$$response: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/vuln_scanner_bola-body-response-not-found"
@@ -48,7 +48,7 @@ export const vuln_scanner_bola_body_response_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-body-response-bytes` in responses.
  */
-export const vuln_scanner_bola_body_response_bytes_output: JsonSchema = {
+export const vuln_scanner_bola$$body$$response$$bytes: JsonSchema = {
   "properties": {
     "contents": {
       "type": "string"
@@ -74,7 +74,7 @@ export const vuln_scanner_bola_body_response_bytes_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-body-response-json` in responses.
  */
-export const vuln_scanner_bola_body_response_json_output: JsonSchema = {
+export const vuln_scanner_bola$$body$$response$$json: JsonSchema = {
   "properties": {
     "contents": {
       "type": "string"
@@ -100,7 +100,7 @@ export const vuln_scanner_bola_body_response_json_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-body-response-not-found` in responses.
  */
-export const vuln_scanner_bola_body_response_not_found_output: JsonSchema = {
+export const vuln_scanner_bola$$body$$response$$not$$found: JsonSchema = {
   "properties": {
     "kind": {
       "enum": [
@@ -118,7 +118,7 @@ export const vuln_scanner_bola_body_response_not_found_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-body-response-text` in responses.
  */
-export const vuln_scanner_bola_body_response_text_output: JsonSchema = {
+export const vuln_scanner_bola$$body$$response$$text: JsonSchema = {
   "properties": {
     "contents": {
       "type": "string"
@@ -141,21 +141,10 @@ export const vuln_scanner_bola_body_response_text_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vuln_scanner_bola-credential-role` in responses.
- */
-export const vuln_scanner_bola_credential_role_output: JsonSchema = {
-  "enum": [
-    "owner",
-    "attacker"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `vuln_scanner_bola-http-status-range` in responses.
  */
-export const vuln_scanner_bola_http_status_range_output: JsonSchema = {
+export const vuln_scanner_bola$$http$$status$$range: JsonSchema = {
   "properties": {
     "max": {
       "type": "integer"
@@ -171,36 +160,10 @@ export const vuln_scanner_bola_http_status_range_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vuln_scanner_bola-method` in responses.
- */
-export const vuln_scanner_bola_method_output: JsonSchema = {
-  "enum": [
-    "GET",
-    "DELETE",
-    "PATCH",
-    "POST",
-    "PUT"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `vuln_scanner_bola-outcome` in responses.
- */
-export const vuln_scanner_bola_outcome_output: JsonSchema = {
-  "enum": [
-    "ok",
-    "fail",
-    "inconclusive"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `vuln_scanner_bola-report` in responses.
  */
-export const vuln_scanner_bola_report_output: JsonSchema = {
+export const vuln_scanner_bola$$report: JsonSchema = {
   "properties": {
     "report": {
       "$ref": "#/$defs/vuln_scanner_bola-report-v1"
@@ -222,10 +185,15 @@ export const vuln_scanner_bola_report_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-report-summary` in responses.
  */
-export const vuln_scanner_bola_report_summary_output: JsonSchema = {
+export const vuln_scanner_bola$$report$$summary: JsonSchema = {
   "properties": {
     "verdict": {
-      "$ref": "#/$defs/vuln_scanner_bola-verdict"
+      "enum": [
+        "ok",
+        "warning",
+        "inconclusive"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -237,7 +205,7 @@ export const vuln_scanner_bola_report_summary_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-report-v1` in responses.
  */
-export const vuln_scanner_bola_report_v1_output: JsonSchema = {
+export const vuln_scanner_bola$$report$$v1: JsonSchema = {
   "properties": {
     "summary": {
       "$ref": "#/$defs/vuln_scanner_bola-report-summary"
@@ -259,7 +227,7 @@ export const vuln_scanner_bola_report_v1_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-test` in responses.
  */
-export const vuln_scanner_bola_test_output: JsonSchema = {
+export const vuln_scanner_bola$$test: JsonSchema = {
   "properties": {
     "preflight_errors": {
       "items": {
@@ -274,7 +242,12 @@ export const vuln_scanner_bola_test_output: JsonSchema = {
       "type": "array"
     },
     "verdict": {
-      "$ref": "#/$defs/vuln_scanner_bola-verdict"
+      "enum": [
+        "ok",
+        "warning",
+        "inconclusive"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -287,7 +260,7 @@ export const vuln_scanner_bola_test_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-test-assertion` in responses.
  */
-export const vuln_scanner_bola_test_assertion_output: JsonSchema = {
+export const vuln_scanner_bola$$test$$assertion: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -306,7 +279,12 @@ export const vuln_scanner_bola_test_assertion_output: JsonSchema = {
       ]
     },
     "outcome": {
-      "$ref": "#/$defs/vuln_scanner_bola-outcome"
+      "enum": [
+        "ok",
+        "fail",
+        "inconclusive"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -321,14 +299,18 @@ export const vuln_scanner_bola_test_assertion_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-test-credential-set` in responses.
  */
-export const vuln_scanner_bola_test_credential_set_output: JsonSchema = {
+export const vuln_scanner_bola$$test$$credential$$set: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
       "type": "string"
     },
     "role": {
-      "$ref": "#/$defs/vuln_scanner_bola-credential-role"
+      "enum": [
+        "owner",
+        "attacker"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -341,7 +323,7 @@ export const vuln_scanner_bola_test_credential_set_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-test-error` in responses.
  */
-export const vuln_scanner_bola_test_error_output: JsonSchema = {
+export const vuln_scanner_bola$$test$$error: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -366,7 +348,7 @@ export const vuln_scanner_bola_test_error_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-test-request` in responses.
  */
-export const vuln_scanner_bola_test_request_output: JsonSchema = {
+export const vuln_scanner_bola$$test$$request: JsonSchema = {
   "properties": {
     "body": {
       "oneOf": [
@@ -388,7 +370,14 @@ export const vuln_scanner_bola_test_request_output: JsonSchema = {
       "type": "array"
     },
     "method": {
-      "$ref": "#/$defs/vuln_scanner_bola-method"
+      "enum": [
+        "GET",
+        "DELETE",
+        "PATCH",
+        "POST",
+        "PUT"
+      ],
+      "type": "string"
     },
     "url": {
       "type": "string"
@@ -413,7 +402,7 @@ export const vuln_scanner_bola_test_request_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-test-response` in responses.
  */
-export const vuln_scanner_bola_test_response_output: JsonSchema = {
+export const vuln_scanner_bola$$test$$response: JsonSchema = {
   "properties": {
     "body": {
       "$ref": "#/$defs/vuln_scanner_bola-body-response"
@@ -449,7 +438,7 @@ export const vuln_scanner_bola_test_response_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-test-step` in responses.
  */
-export const vuln_scanner_bola_test_step_output: JsonSchema = {
+export const vuln_scanner_bola$$test$$step: JsonSchema = {
   "properties": {
     "assertions": {
       "items": {
@@ -493,7 +482,7 @@ export const vuln_scanner_bola_test_step_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_bola-variable-capture` in responses.
  */
-export const vuln_scanner_bola_variable_capture_output: JsonSchema = {
+export const vuln_scanner_bola$$variable$$capture: JsonSchema = {
   "properties": {
     "json_path": {
       "type": "string"
@@ -509,22 +498,10 @@ export const vuln_scanner_bola_variable_capture_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vuln_scanner_bola-verdict` in responses.
- */
-export const vuln_scanner_bola_verdict_output: JsonSchema = {
-  "enum": [
-    "ok",
-    "warning",
-    "inconclusive"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `vuln_scanner_delete-scan-response` in responses.
  */
-export const vuln_scanner_delete_scan_response_output: JsonSchema = {
+export const vuln_scanner_delete$$scan$$response: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -540,7 +517,7 @@ export const vuln_scanner_delete_scan_response_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_scan` in responses.
  */
-export const vuln_scanner_scan_output: JsonSchema = {
+export const vuln_scanner_scan: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/schemas.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/schemas.ts
index 9237205c3..a2f4cf1cf 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/schemas.ts
@@ -6,8 +6,8 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `vuln_scanner_bola-credential-sets`.
  */
-export const vuln_scanner_bola_credential_sets: JsonSchema = {
-  "description": "Credential set references for a BOLA scan. The scanner uses the\n`owner` credentials for legitimate requests and the `attacker`\ncredentials to attempt unauthorized access.\n",
+export const vuln_scanner_bola$$credential$$sets: JsonSchema = {
+  "description": "Credential set references for a BOLA scan. The scanner uses the\n`owner` credentials for legitimate requests and the `attacker`\ncredentials to attempt unauthorized access.",
   "properties": {
     "attacker": {
       "description": "Credential set ID for the attacker.",
@@ -30,14 +30,14 @@ export const vuln_scanner_bola_credential_sets: JsonSchema = {
 /**
  * The schema of `vuln_scanner_create-bola-scan-request`.
  */
-export const vuln_scanner_create_bola_scan_request: JsonSchema = {
+export const vuln_scanner_create$$bola$$scan$$request: JsonSchema = {
   "properties": {
     "credential_sets": {
       "$ref": "#/$defs/vuln_scanner_bola-credential-sets",
-      "description": "Credential set references for a BOLA scan. The scanner uses the\n`owner` credentials for legitimate requests and the `attacker`\ncredentials to attempt unauthorized access.\n"
+      "description": "Credential set references for a BOLA scan. The scanner uses the\n`owner` credentials for legitimate requests and the `attacker`\ncredentials to attempt unauthorized access."
     },
     "open_api": {
-      "description": "OpenAPI schema definition for the API under test. The scanner\nuses this to discover endpoints and construct requests.\n",
+      "description": "OpenAPI schema definition for the API under test. The scanner\nuses this to discover endpoints and construct requests.",
       "type": "string"
     },
     "scan_type": {
@@ -64,7 +64,7 @@ export const vuln_scanner_create_bola_scan_request: JsonSchema = {
 /**
  * The schema of `vuln_scanner_create-scan-request`.
  */
-export const vuln_scanner_create_scan_request: JsonSchema = {
+export const vuln_scanner_create$$scan$$request: JsonSchema = {
   "$ref": "#/$defs/vuln_scanner_create-bola-scan-request",
-  "description": "Create a new vulnerability scan. The `scan_type` discriminator\nselects the scan variant and its required context fields.\n"
+  "description": "Create a new vulnerability scan. The `scan_type` discriminator\nselects the scan variant and its required context fields."
 };
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/tools.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/tools.ts
index 9a573d41f..3bbe2d344 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/scans/tools.ts
@@ -1,74 +1,78 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  vuln_scanner_api_response_collection_output,
-  vuln_scanner_api_response_common_failure_output,
-  vuln_scanner_api_response_common_output,
-  vuln_scanner_messages_output,
+  vuln_scanner_api$$response$$collection,
+  vuln_scanner_api$$response$$common,
+  vuln_scanner_api$$response$$common$$failure,
+  vuln_scanner_messages,
 } from "../outputs.js";
-import { vuln_scanner_identifier } from "../schemas.js";
 import {
-  vuln_scanner_bola_assertion_kind_output,
-  vuln_scanner_bola_body_response_bytes_output,
-  vuln_scanner_bola_body_response_json_output,
-  vuln_scanner_bola_body_response_not_found_output,
-  vuln_scanner_bola_body_response_output,
-  vuln_scanner_bola_body_response_text_output,
-  vuln_scanner_bola_credential_role_output,
-  vuln_scanner_bola_http_status_range_output,
-  vuln_scanner_bola_method_output,
-  vuln_scanner_bola_outcome_output,
-  vuln_scanner_bola_report_output,
-  vuln_scanner_bola_report_summary_output,
-  vuln_scanner_bola_report_v1_output,
-  vuln_scanner_bola_test_assertion_output,
-  vuln_scanner_bola_test_credential_set_output,
-  vuln_scanner_bola_test_error_output,
-  vuln_scanner_bola_test_output,
-  vuln_scanner_bola_test_request_output,
-  vuln_scanner_bola_test_response_output,
-  vuln_scanner_bola_test_step_output,
-  vuln_scanner_bola_variable_capture_output,
-  vuln_scanner_bola_verdict_output,
-  vuln_scanner_delete_scan_response_output,
-  vuln_scanner_scan_output,
+  vuln_scanner_bola$$assertion$$kind,
+  vuln_scanner_bola$$body$$response,
+  vuln_scanner_bola$$body$$response$$bytes,
+  vuln_scanner_bola$$body$$response$$json,
+  vuln_scanner_bola$$body$$response$$not$$found,
+  vuln_scanner_bola$$body$$response$$text,
+  vuln_scanner_bola$$http$$status$$range,
+  vuln_scanner_bola$$report,
+  vuln_scanner_bola$$report$$summary,
+  vuln_scanner_bola$$report$$v1,
+  vuln_scanner_bola$$test,
+  vuln_scanner_bola$$test$$assertion,
+  vuln_scanner_bola$$test$$credential$$set,
+  vuln_scanner_bola$$test$$error,
+  vuln_scanner_bola$$test$$request,
+  vuln_scanner_bola$$test$$response,
+  vuln_scanner_bola$$test$$step,
+  vuln_scanner_bola$$variable$$capture,
+  vuln_scanner_delete$$scan$$response,
+  vuln_scanner_scan,
 } from "./outputs.js";
 import {
-  vuln_scanner_bola_credential_sets,
-  vuln_scanner_create_bola_scan_request,
-  vuln_scanner_create_scan_request,
+  vuln_scanner_bola$$credential$$sets,
+  vuln_scanner_create$$bola$$scan$$request,
+  vuln_scanner_create$$scan$$request,
 } from "./schemas.js";
 
 /**
- * The tools of `api_security.vulnerability_scanner.scans`.
+ * The tools of `apiSecurity.vulnerabilityScanner.scans`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_vulnerability_scanner_scans_create",
+    name: "apiSecurity_vulnerabilityScanner_scans_create",
     title: "Create scan",
-    description: "Creates and starts a new vulnerability scan. The response may include non-fatal warnings in the `messages` array.\n\nThis method is beta.",
+    description: "Creates and starts a new vulnerability scan. The response may include non-fatal warnings in the `messages` array.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/vuln_scanner/scans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_create-scan-request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_bola-credential-sets": vuln_scanner_bola_credential_sets,
-        "vuln_scanner_create-bola-scan-request": vuln_scanner_create_bola_scan_request,
-        "vuln_scanner_create-scan-request": vuln_scanner_create_scan_request,
-        "vuln_scanner_identifier": vuln_scanner_identifier,
+        "vuln_scanner_bola-credential-sets": vuln_scanner_bola$$credential$$sets,
+        "vuln_scanner_create-bola-scan-request": vuln_scanner_create$$bola$$scan$$request,
+        "vuln_scanner_create-scan-request": vuln_scanner_create$$scan$$request,
       },
     },
     outputSchema: {
@@ -96,31 +100,27 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola_assertion_kind_output,
-        "vuln_scanner_bola-body-response": vuln_scanner_bola_body_response_output,
-        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola_body_response_bytes_output,
-        "vuln_scanner_bola-body-response-json": vuln_scanner_bola_body_response_json_output,
-        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola_body_response_not_found_output,
-        "vuln_scanner_bola-body-response-text": vuln_scanner_bola_body_response_text_output,
-        "vuln_scanner_bola-credential-role": vuln_scanner_bola_credential_role_output,
-        "vuln_scanner_bola-http-status-range": vuln_scanner_bola_http_status_range_output,
-        "vuln_scanner_bola-method": vuln_scanner_bola_method_output,
-        "vuln_scanner_bola-outcome": vuln_scanner_bola_outcome_output,
-        "vuln_scanner_bola-report": vuln_scanner_bola_report_output,
-        "vuln_scanner_bola-report-summary": vuln_scanner_bola_report_summary_output,
-        "vuln_scanner_bola-report-v1": vuln_scanner_bola_report_v1_output,
-        "vuln_scanner_bola-test": vuln_scanner_bola_test_output,
-        "vuln_scanner_bola-test-assertion": vuln_scanner_bola_test_assertion_output,
-        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola_test_credential_set_output,
-        "vuln_scanner_bola-test-error": vuln_scanner_bola_test_error_output,
-        "vuln_scanner_bola-test-request": vuln_scanner_bola_test_request_output,
-        "vuln_scanner_bola-test-response": vuln_scanner_bola_test_response_output,
-        "vuln_scanner_bola-test-step": vuln_scanner_bola_test_step_output,
-        "vuln_scanner_bola-variable-capture": vuln_scanner_bola_variable_capture_output,
-        "vuln_scanner_bola-verdict": vuln_scanner_bola_verdict_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_scan": vuln_scanner_scan_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola$$assertion$$kind,
+        "vuln_scanner_bola-body-response": vuln_scanner_bola$$body$$response,
+        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola$$body$$response$$bytes,
+        "vuln_scanner_bola-body-response-json": vuln_scanner_bola$$body$$response$$json,
+        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola$$body$$response$$not$$found,
+        "vuln_scanner_bola-body-response-text": vuln_scanner_bola$$body$$response$$text,
+        "vuln_scanner_bola-http-status-range": vuln_scanner_bola$$http$$status$$range,
+        "vuln_scanner_bola-report": vuln_scanner_bola$$report,
+        "vuln_scanner_bola-report-summary": vuln_scanner_bola$$report$$summary,
+        "vuln_scanner_bola-report-v1": vuln_scanner_bola$$report$$v1,
+        "vuln_scanner_bola-test": vuln_scanner_bola$$test,
+        "vuln_scanner_bola-test-assertion": vuln_scanner_bola$$test$$assertion,
+        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola$$test$$credential$$set,
+        "vuln_scanner_bola-test-error": vuln_scanner_bola$$test$$error,
+        "vuln_scanner_bola-test-request": vuln_scanner_bola$$test$$request,
+        "vuln_scanner_bola-test-response": vuln_scanner_bola$$test$$response,
+        "vuln_scanner_bola-test-step": vuln_scanner_bola$$test$$step,
+        "vuln_scanner_bola-variable-capture": vuln_scanner_bola$$variable$$capture,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_scan": vuln_scanner_scan,
       },
     },
     annotations: {
@@ -164,32 +164,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola_assertion_kind_output,
-        "vuln_scanner_bola-body-response": vuln_scanner_bola_body_response_output,
-        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola_body_response_bytes_output,
-        "vuln_scanner_bola-body-response-json": vuln_scanner_bola_body_response_json_output,
-        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola_body_response_not_found_output,
-        "vuln_scanner_bola-body-response-text": vuln_scanner_bola_body_response_text_output,
-        "vuln_scanner_bola-credential-role": vuln_scanner_bola_credential_role_output,
-        "vuln_scanner_bola-http-status-range": vuln_scanner_bola_http_status_range_output,
-        "vuln_scanner_bola-method": vuln_scanner_bola_method_output,
-        "vuln_scanner_bola-outcome": vuln_scanner_bola_outcome_output,
-        "vuln_scanner_bola-report": vuln_scanner_bola_report_output,
-        "vuln_scanner_bola-report-summary": vuln_scanner_bola_report_summary_output,
-        "vuln_scanner_bola-report-v1": vuln_scanner_bola_report_v1_output,
-        "vuln_scanner_bola-test": vuln_scanner_bola_test_output,
-        "vuln_scanner_bola-test-assertion": vuln_scanner_bola_test_assertion_output,
-        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola_test_credential_set_output,
-        "vuln_scanner_bola-test-error": vuln_scanner_bola_test_error_output,
-        "vuln_scanner_bola-test-request": vuln_scanner_bola_test_request_output,
-        "vuln_scanner_bola-test-response": vuln_scanner_bola_test_response_output,
-        "vuln_scanner_bola-test-step": vuln_scanner_bola_test_step_output,
-        "vuln_scanner_bola-variable-capture": vuln_scanner_bola_variable_capture_output,
-        "vuln_scanner_bola-verdict": vuln_scanner_bola_verdict_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_scan": vuln_scanner_scan_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola$$assertion$$kind,
+        "vuln_scanner_bola-body-response": vuln_scanner_bola$$body$$response,
+        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola$$body$$response$$bytes,
+        "vuln_scanner_bola-body-response-json": vuln_scanner_bola$$body$$response$$json,
+        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola$$body$$response$$not$$found,
+        "vuln_scanner_bola-body-response-text": vuln_scanner_bola$$body$$response$$text,
+        "vuln_scanner_bola-http-status-range": vuln_scanner_bola$$http$$status$$range,
+        "vuln_scanner_bola-report": vuln_scanner_bola$$report,
+        "vuln_scanner_bola-report-summary": vuln_scanner_bola$$report$$summary,
+        "vuln_scanner_bola-report-v1": vuln_scanner_bola$$report$$v1,
+        "vuln_scanner_bola-test": vuln_scanner_bola$$test,
+        "vuln_scanner_bola-test-assertion": vuln_scanner_bola$$test$$assertion,
+        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola$$test$$credential$$set,
+        "vuln_scanner_bola-test-error": vuln_scanner_bola$$test$$error,
+        "vuln_scanner_bola-test-request": vuln_scanner_bola$$test$$request,
+        "vuln_scanner_bola-test-response": vuln_scanner_bola$$test$$response,
+        "vuln_scanner_bola-test-step": vuln_scanner_bola$$test$$step,
+        "vuln_scanner_bola-variable-capture": vuln_scanner_bola$$variable$$capture,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_scan": vuln_scanner_scan,
       },
     },
     request: (args) => ({
@@ -198,29 +194,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_scans_delete",
+    name: "apiSecurity_vulnerabilityScanner_scans_delete",
     title: "Delete scan",
-    description: "Deletes a scan and all associated data. Only scans in a terminal state (`finished`, `failed`) may be deleted. Attempting to delete a scan that is still being created or executed (`created`, `scheduled`, `planning`, `running`) returns `400`.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the completed or failed scan and all associated scan data.",
+    description: "Deletes a scan and all associated data. Only scans in a terminal state (`finished`, `failed`) may be deleted. Attempting to delete a scan that is still being created or executed (`created`, `scheduled`, `planning`, `running`) returns `400`.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the completed or failed scan and all associated scan data.\n\nDELETE /accounts/{account_id}/vuln_scanner/scans/{scan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "scan_id": {
-          "description": "Scan identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "scan_id": {
+              "description": "Scan identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "scan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "scan_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -247,9 +250,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_delete-scan-response": vuln_scanner_delete_scan_response_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_delete-scan-response": vuln_scanner_delete$$scan$$response,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -293,10 +296,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_delete-scan-response": vuln_scanner_delete_scan_response_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_delete-scan-response": vuln_scanner_delete$$scan$$response,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -304,29 +307,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_scans_get",
+    name: "apiSecurity_vulnerabilityScanner_scans_get",
     title: "Get scan",
-    description: "Returns a single scan by ID.\n\nThis method is beta.",
+    description: "Returns a single scan by ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/vuln_scanner/scans/{scan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "scan_id": {
-          "description": "Scan identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "scan_id": {
+              "description": "Scan identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "scan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "scan_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -353,31 +363,27 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola_assertion_kind_output,
-        "vuln_scanner_bola-body-response": vuln_scanner_bola_body_response_output,
-        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola_body_response_bytes_output,
-        "vuln_scanner_bola-body-response-json": vuln_scanner_bola_body_response_json_output,
-        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola_body_response_not_found_output,
-        "vuln_scanner_bola-body-response-text": vuln_scanner_bola_body_response_text_output,
-        "vuln_scanner_bola-credential-role": vuln_scanner_bola_credential_role_output,
-        "vuln_scanner_bola-http-status-range": vuln_scanner_bola_http_status_range_output,
-        "vuln_scanner_bola-method": vuln_scanner_bola_method_output,
-        "vuln_scanner_bola-outcome": vuln_scanner_bola_outcome_output,
-        "vuln_scanner_bola-report": vuln_scanner_bola_report_output,
-        "vuln_scanner_bola-report-summary": vuln_scanner_bola_report_summary_output,
-        "vuln_scanner_bola-report-v1": vuln_scanner_bola_report_v1_output,
-        "vuln_scanner_bola-test": vuln_scanner_bola_test_output,
-        "vuln_scanner_bola-test-assertion": vuln_scanner_bola_test_assertion_output,
-        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola_test_credential_set_output,
-        "vuln_scanner_bola-test-error": vuln_scanner_bola_test_error_output,
-        "vuln_scanner_bola-test-request": vuln_scanner_bola_test_request_output,
-        "vuln_scanner_bola-test-response": vuln_scanner_bola_test_response_output,
-        "vuln_scanner_bola-test-step": vuln_scanner_bola_test_step_output,
-        "vuln_scanner_bola-variable-capture": vuln_scanner_bola_variable_capture_output,
-        "vuln_scanner_bola-verdict": vuln_scanner_bola_verdict_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_scan": vuln_scanner_scan_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola$$assertion$$kind,
+        "vuln_scanner_bola-body-response": vuln_scanner_bola$$body$$response,
+        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola$$body$$response$$bytes,
+        "vuln_scanner_bola-body-response-json": vuln_scanner_bola$$body$$response$$json,
+        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola$$body$$response$$not$$found,
+        "vuln_scanner_bola-body-response-text": vuln_scanner_bola$$body$$response$$text,
+        "vuln_scanner_bola-http-status-range": vuln_scanner_bola$$http$$status$$range,
+        "vuln_scanner_bola-report": vuln_scanner_bola$$report,
+        "vuln_scanner_bola-report-summary": vuln_scanner_bola$$report$$summary,
+        "vuln_scanner_bola-report-v1": vuln_scanner_bola$$report$$v1,
+        "vuln_scanner_bola-test": vuln_scanner_bola$$test,
+        "vuln_scanner_bola-test-assertion": vuln_scanner_bola$$test$$assertion,
+        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola$$test$$credential$$set,
+        "vuln_scanner_bola-test-error": vuln_scanner_bola$$test$$error,
+        "vuln_scanner_bola-test-request": vuln_scanner_bola$$test$$request,
+        "vuln_scanner_bola-test-response": vuln_scanner_bola$$test$$response,
+        "vuln_scanner_bola-test-step": vuln_scanner_bola$$test$$step,
+        "vuln_scanner_bola-variable-capture": vuln_scanner_bola$$variable$$capture,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_scan": vuln_scanner_scan,
       },
     },
     annotations: {
@@ -421,32 +427,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola_assertion_kind_output,
-        "vuln_scanner_bola-body-response": vuln_scanner_bola_body_response_output,
-        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola_body_response_bytes_output,
-        "vuln_scanner_bola-body-response-json": vuln_scanner_bola_body_response_json_output,
-        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola_body_response_not_found_output,
-        "vuln_scanner_bola-body-response-text": vuln_scanner_bola_body_response_text_output,
-        "vuln_scanner_bola-credential-role": vuln_scanner_bola_credential_role_output,
-        "vuln_scanner_bola-http-status-range": vuln_scanner_bola_http_status_range_output,
-        "vuln_scanner_bola-method": vuln_scanner_bola_method_output,
-        "vuln_scanner_bola-outcome": vuln_scanner_bola_outcome_output,
-        "vuln_scanner_bola-report": vuln_scanner_bola_report_output,
-        "vuln_scanner_bola-report-summary": vuln_scanner_bola_report_summary_output,
-        "vuln_scanner_bola-report-v1": vuln_scanner_bola_report_v1_output,
-        "vuln_scanner_bola-test": vuln_scanner_bola_test_output,
-        "vuln_scanner_bola-test-assertion": vuln_scanner_bola_test_assertion_output,
-        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola_test_credential_set_output,
-        "vuln_scanner_bola-test-error": vuln_scanner_bola_test_error_output,
-        "vuln_scanner_bola-test-request": vuln_scanner_bola_test_request_output,
-        "vuln_scanner_bola-test-response": vuln_scanner_bola_test_response_output,
-        "vuln_scanner_bola-test-step": vuln_scanner_bola_test_step_output,
-        "vuln_scanner_bola-variable-capture": vuln_scanner_bola_variable_capture_output,
-        "vuln_scanner_bola-verdict": vuln_scanner_bola_verdict_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_scan": vuln_scanner_scan_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola$$assertion$$kind,
+        "vuln_scanner_bola-body-response": vuln_scanner_bola$$body$$response,
+        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola$$body$$response$$bytes,
+        "vuln_scanner_bola-body-response-json": vuln_scanner_bola$$body$$response$$json,
+        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola$$body$$response$$not$$found,
+        "vuln_scanner_bola-body-response-text": vuln_scanner_bola$$body$$response$$text,
+        "vuln_scanner_bola-http-status-range": vuln_scanner_bola$$http$$status$$range,
+        "vuln_scanner_bola-report": vuln_scanner_bola$$report,
+        "vuln_scanner_bola-report-summary": vuln_scanner_bola$$report$$summary,
+        "vuln_scanner_bola-report-v1": vuln_scanner_bola$$report$$v1,
+        "vuln_scanner_bola-test": vuln_scanner_bola$$test,
+        "vuln_scanner_bola-test-assertion": vuln_scanner_bola$$test$$assertion,
+        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola$$test$$credential$$set,
+        "vuln_scanner_bola-test-error": vuln_scanner_bola$$test$$error,
+        "vuln_scanner_bola-test-request": vuln_scanner_bola$$test$$request,
+        "vuln_scanner_bola-test-response": vuln_scanner_bola$$test$$response,
+        "vuln_scanner_bola-test-step": vuln_scanner_bola$$test$$step,
+        "vuln_scanner_bola-variable-capture": vuln_scanner_bola$$variable$$capture,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_scan": vuln_scanner_scan,
       },
     },
     request: (args) => ({
@@ -454,33 +456,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_scans_list",
+    name: "apiSecurity_vulnerabilityScanner_scans_list",
     title: "List scans",
-    description: "Returns all scans for the account.\n\nThis method is beta.",
+    description: "Returns all scans for the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/vuln_scanner/scans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -500,32 +515,28 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-collection": vuln_scanner_api_response_collection_output,
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola_assertion_kind_output,
-        "vuln_scanner_bola-body-response": vuln_scanner_bola_body_response_output,
-        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola_body_response_bytes_output,
-        "vuln_scanner_bola-body-response-json": vuln_scanner_bola_body_response_json_output,
-        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola_body_response_not_found_output,
-        "vuln_scanner_bola-body-response-text": vuln_scanner_bola_body_response_text_output,
-        "vuln_scanner_bola-credential-role": vuln_scanner_bola_credential_role_output,
-        "vuln_scanner_bola-http-status-range": vuln_scanner_bola_http_status_range_output,
-        "vuln_scanner_bola-method": vuln_scanner_bola_method_output,
-        "vuln_scanner_bola-outcome": vuln_scanner_bola_outcome_output,
-        "vuln_scanner_bola-report": vuln_scanner_bola_report_output,
-        "vuln_scanner_bola-report-summary": vuln_scanner_bola_report_summary_output,
-        "vuln_scanner_bola-report-v1": vuln_scanner_bola_report_v1_output,
-        "vuln_scanner_bola-test": vuln_scanner_bola_test_output,
-        "vuln_scanner_bola-test-assertion": vuln_scanner_bola_test_assertion_output,
-        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola_test_credential_set_output,
-        "vuln_scanner_bola-test-error": vuln_scanner_bola_test_error_output,
-        "vuln_scanner_bola-test-request": vuln_scanner_bola_test_request_output,
-        "vuln_scanner_bola-test-response": vuln_scanner_bola_test_response_output,
-        "vuln_scanner_bola-test-step": vuln_scanner_bola_test_step_output,
-        "vuln_scanner_bola-variable-capture": vuln_scanner_bola_variable_capture_output,
-        "vuln_scanner_bola-verdict": vuln_scanner_bola_verdict_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_scan": vuln_scanner_scan_output,
+        "vuln_scanner_api-response-collection": vuln_scanner_api$$response$$collection,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola$$assertion$$kind,
+        "vuln_scanner_bola-body-response": vuln_scanner_bola$$body$$response,
+        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola$$body$$response$$bytes,
+        "vuln_scanner_bola-body-response-json": vuln_scanner_bola$$body$$response$$json,
+        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola$$body$$response$$not$$found,
+        "vuln_scanner_bola-body-response-text": vuln_scanner_bola$$body$$response$$text,
+        "vuln_scanner_bola-http-status-range": vuln_scanner_bola$$http$$status$$range,
+        "vuln_scanner_bola-report": vuln_scanner_bola$$report,
+        "vuln_scanner_bola-report-summary": vuln_scanner_bola$$report$$summary,
+        "vuln_scanner_bola-report-v1": vuln_scanner_bola$$report$$v1,
+        "vuln_scanner_bola-test": vuln_scanner_bola$$test,
+        "vuln_scanner_bola-test-assertion": vuln_scanner_bola$$test$$assertion,
+        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola$$test$$credential$$set,
+        "vuln_scanner_bola-test-error": vuln_scanner_bola$$test$$error,
+        "vuln_scanner_bola-test-request": vuln_scanner_bola$$test$$request,
+        "vuln_scanner_bola-test-response": vuln_scanner_bola$$test$$response,
+        "vuln_scanner_bola-test-step": vuln_scanner_bola$$test$$step,
+        "vuln_scanner_bola-variable-capture": vuln_scanner_bola$$variable$$capture,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_scan": vuln_scanner_scan,
       },
     },
     annotations: {
@@ -562,40 +573,36 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-collection": vuln_scanner_api_response_collection_output,
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola_assertion_kind_output,
-        "vuln_scanner_bola-body-response": vuln_scanner_bola_body_response_output,
-        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola_body_response_bytes_output,
-        "vuln_scanner_bola-body-response-json": vuln_scanner_bola_body_response_json_output,
-        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola_body_response_not_found_output,
-        "vuln_scanner_bola-body-response-text": vuln_scanner_bola_body_response_text_output,
-        "vuln_scanner_bola-credential-role": vuln_scanner_bola_credential_role_output,
-        "vuln_scanner_bola-http-status-range": vuln_scanner_bola_http_status_range_output,
-        "vuln_scanner_bola-method": vuln_scanner_bola_method_output,
-        "vuln_scanner_bola-outcome": vuln_scanner_bola_outcome_output,
-        "vuln_scanner_bola-report": vuln_scanner_bola_report_output,
-        "vuln_scanner_bola-report-summary": vuln_scanner_bola_report_summary_output,
-        "vuln_scanner_bola-report-v1": vuln_scanner_bola_report_v1_output,
-        "vuln_scanner_bola-test": vuln_scanner_bola_test_output,
-        "vuln_scanner_bola-test-assertion": vuln_scanner_bola_test_assertion_output,
-        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola_test_credential_set_output,
-        "vuln_scanner_bola-test-error": vuln_scanner_bola_test_error_output,
-        "vuln_scanner_bola-test-request": vuln_scanner_bola_test_request_output,
-        "vuln_scanner_bola-test-response": vuln_scanner_bola_test_response_output,
-        "vuln_scanner_bola-test-step": vuln_scanner_bola_test_step_output,
-        "vuln_scanner_bola-variable-capture": vuln_scanner_bola_variable_capture_output,
-        "vuln_scanner_bola-verdict": vuln_scanner_bola_verdict_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_scan": vuln_scanner_scan_output,
+        "vuln_scanner_api-response-collection": vuln_scanner_api$$response$$collection,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_bola-assertion-kind": vuln_scanner_bola$$assertion$$kind,
+        "vuln_scanner_bola-body-response": vuln_scanner_bola$$body$$response,
+        "vuln_scanner_bola-body-response-bytes": vuln_scanner_bola$$body$$response$$bytes,
+        "vuln_scanner_bola-body-response-json": vuln_scanner_bola$$body$$response$$json,
+        "vuln_scanner_bola-body-response-not-found": vuln_scanner_bola$$body$$response$$not$$found,
+        "vuln_scanner_bola-body-response-text": vuln_scanner_bola$$body$$response$$text,
+        "vuln_scanner_bola-http-status-range": vuln_scanner_bola$$http$$status$$range,
+        "vuln_scanner_bola-report": vuln_scanner_bola$$report,
+        "vuln_scanner_bola-report-summary": vuln_scanner_bola$$report$$summary,
+        "vuln_scanner_bola-report-v1": vuln_scanner_bola$$report$$v1,
+        "vuln_scanner_bola-test": vuln_scanner_bola$$test,
+        "vuln_scanner_bola-test-assertion": vuln_scanner_bola$$test$$assertion,
+        "vuln_scanner_bola-test-credential-set": vuln_scanner_bola$$test$$credential$$set,
+        "vuln_scanner_bola-test-error": vuln_scanner_bola$$test$$error,
+        "vuln_scanner_bola-test-request": vuln_scanner_bola$$test$$request,
+        "vuln_scanner_bola-test-response": vuln_scanner_bola$$test$$response,
+        "vuln_scanner_bola-test-step": vuln_scanner_bola$$test$$step,
+        "vuln_scanner_bola-variable-capture": vuln_scanner_bola$$variable$$capture,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_scan": vuln_scanner_scan,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/vuln_scanner/scans`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/schemas.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/schemas.ts
deleted file mode 100644
index fe63e74e2..000000000
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `vuln_scanner_identifier`.
- */
-export const vuln_scanner_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/outputs.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/outputs.ts
index 5e167b8fc..5d16c96f7 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/outputs.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `vuln_scanner_target-environment` in responses.
  */
-export const vuln_scanner_target_environment_output: JsonSchema = {
+export const vuln_scanner_target$$environment: JsonSchema = {
   "properties": {
     "description": {
       "oneOf": [
@@ -40,14 +40,14 @@ export const vuln_scanner_target_environment_output: JsonSchema = {
 /**
  * The schema of `vuln_scanner_target-type` in responses.
  */
-export const vuln_scanner_target_type_output: JsonSchema = {
+export const vuln_scanner_target$$type: JsonSchema = {
   "$ref": "#/$defs/vuln_scanner_zone-target"
 };
 
 /**
  * The schema of `vuln_scanner_zone-target` in responses.
  */
-export const vuln_scanner_zone_target_output: JsonSchema = {
+export const vuln_scanner_zone$$target: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/schemas.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/schemas.ts
index 6b9c49519..29ba41a20 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/schemas.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `vuln_scanner_create-target-environment-request`.
  */
-export const vuln_scanner_create_target_environment_request: JsonSchema = {
+export const vuln_scanner_create$$target$$environment$$request: JsonSchema = {
   "properties": {
     "description": {
       "description": "Optional description.",
@@ -25,7 +25,7 @@ export const vuln_scanner_create_target_environment_request: JsonSchema = {
     },
     "target": {
       "$ref": "#/$defs/vuln_scanner_target-type",
-      "description": "Identifies the Cloudflare asset to scan. Uses a `type` discriminator.\nCurrently the service supports only `zone` targets.\n"
+      "description": "Identifies the Cloudflare asset to scan. Uses a `type` discriminator.\nCurrently the service supports only `zone` targets."
     }
   },
   "required": [
@@ -38,11 +38,11 @@ export const vuln_scanner_create_target_environment_request: JsonSchema = {
 /**
  * The schema of `vuln_scanner_patch-target-environment-request`.
  */
-export const vuln_scanner_patch_target_environment_request: JsonSchema = {
-  "description": "Applies a partial update. Only the provided fields change; omitted fields remain unchanged.\n\nThe `description` field supports three states:\n- **omitted**: leave unchanged\n- **`null`**: clear the description\n- **`\"value\"`**: set to the given string\n",
+export const vuln_scanner_patch$$target$$environment$$request: JsonSchema = {
+  "description": "Applies a partial update. Only the provided fields change; omitted fields remain unchanged.\n\nThe `description` field supports three states:\n- **omitted**: leave unchanged\n- **`null`**: clear the description\n- **`\"value\"`**: set to the given string",
   "properties": {
     "description": {
-      "description": "Optional description. Omit to leave unchanged, set to `null`\nto clear, or provide a string to update.\n",
+      "description": "Optional description. Omit to leave unchanged, set to `null`\nto clear, or provide a string to update.",
       "oneOf": [
         {
           "type": "string"
@@ -58,7 +58,7 @@ export const vuln_scanner_patch_target_environment_request: JsonSchema = {
     },
     "target": {
       "$ref": "#/$defs/vuln_scanner_target-type",
-      "description": "Identifies the Cloudflare asset to scan. Uses a `type` discriminator.\nCurrently the service supports only `zone` targets.\n"
+      "description": "Identifies the Cloudflare asset to scan. Uses a `type` discriminator.\nCurrently the service supports only `zone` targets."
     }
   },
   "type": "object"
@@ -67,15 +67,15 @@ export const vuln_scanner_patch_target_environment_request: JsonSchema = {
 /**
  * The schema of `vuln_scanner_target-type`.
  */
-export const vuln_scanner_target_type: JsonSchema = {
+export const vuln_scanner_target$$type: JsonSchema = {
   "$ref": "#/$defs/vuln_scanner_zone-target",
-  "description": "Identifies the Cloudflare asset to scan. Uses a `type` discriminator.\nCurrently the service supports only `zone` targets.\n"
+  "description": "Identifies the Cloudflare asset to scan. Uses a `type` discriminator.\nCurrently the service supports only `zone` targets."
 };
 
 /**
  * The schema of `vuln_scanner_update-target-environment-request`.
  */
-export const vuln_scanner_update_target_environment_request: JsonSchema = {
+export const vuln_scanner_update$$target$$environment$$request: JsonSchema = {
   "description": "Full replacement.",
   "properties": {
     "description": {
@@ -95,7 +95,7 @@ export const vuln_scanner_update_target_environment_request: JsonSchema = {
     },
     "target": {
       "$ref": "#/$defs/vuln_scanner_target-type",
-      "description": "Identifies the Cloudflare asset to scan. Uses a `type` discriminator.\nCurrently the service supports only `zone` targets.\n"
+      "description": "Identifies the Cloudflare asset to scan. Uses a `type` discriminator.\nCurrently the service supports only `zone` targets."
     }
   },
   "required": [
@@ -108,7 +108,7 @@ export const vuln_scanner_update_target_environment_request: JsonSchema = {
 /**
  * The schema of `vuln_scanner_zone-target`.
  */
-export const vuln_scanner_zone_target: JsonSchema = {
+export const vuln_scanner_zone$$target: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -117,7 +117,7 @@ export const vuln_scanner_zone_target: JsonSchema = {
       "type": "string"
     },
     "zone_tag": {
-      "description": "Cloudflare zone tag. The zone must belong to the account.\n",
+      "description": "Cloudflare zone tag. The zone must belong to the account.",
       "type": "string"
     }
   },
diff --git a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/tools.ts b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/tools.ts
index 900849729..f7979761e 100644
--- a/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/tools.ts
+++ b/src/generated/forge-mcp/apiSecurity/vulnerabilityScanner/targetEnvironments/tools.ts
@@ -1,56 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  vuln_scanner_api_response_collection_output,
-  vuln_scanner_api_response_common_failure_output,
-  vuln_scanner_api_response_common_output,
-  vuln_scanner_empty_response_output,
-  vuln_scanner_messages_output,
+  vuln_scanner_api$$response$$collection,
+  vuln_scanner_api$$response$$common,
+  vuln_scanner_api$$response$$common$$failure,
+  vuln_scanner_empty$$response,
+  vuln_scanner_messages,
 } from "../outputs.js";
-import { vuln_scanner_identifier } from "../schemas.js";
 import {
-  vuln_scanner_target_environment_output,
-  vuln_scanner_target_type_output,
-  vuln_scanner_zone_target_output,
+  vuln_scanner_target$$environment,
+  vuln_scanner_target$$type,
+  vuln_scanner_zone$$target,
 } from "./outputs.js";
 import {
-  vuln_scanner_create_target_environment_request,
-  vuln_scanner_patch_target_environment_request,
-  vuln_scanner_target_type,
-  vuln_scanner_update_target_environment_request,
-  vuln_scanner_zone_target,
+  vuln_scanner_create$$target$$environment$$request,
+  vuln_scanner_patch$$target$$environment$$request,
+  vuln_scanner_target$$type as vuln_scanner_target$$type$,
+  vuln_scanner_update$$target$$environment$$request,
+  vuln_scanner_zone$$target as vuln_scanner_zone$$target$,
 } from "./schemas.js";
 
 /**
- * The tools of `api_security.vulnerability_scanner.target_environments`.
+ * The tools of `apiSecurity.vulnerabilityScanner.targetEnvironments`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "api_security_vulnerability_scanner_target_environments_create",
+    name: "apiSecurity_vulnerabilityScanner_targetEnvironments_create",
     title: "Create target environment",
-    description: "Creates a new target environment for the account.\n\nThis method is beta.",
+    description: "Creates a new target environment for the account.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/vuln_scanner/target_environments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_create-target-environment-request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_create-target-environment-request": vuln_scanner_create_target_environment_request,
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-        "vuln_scanner_target-type": vuln_scanner_target_type,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target,
+        "vuln_scanner_create-target-environment-request": vuln_scanner_create$$target$$environment$$request,
+        "vuln_scanner_target-type": vuln_scanner_target$$type$,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target$,
       },
     },
     outputSchema: {
@@ -78,11 +86,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     annotations: {
@@ -126,12 +134,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     request: (args) => ({
@@ -140,36 +148,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_target_environments_delete",
+    name: "apiSecurity_vulnerabilityScanner_targetEnvironments_delete",
     title: "Delete target environment",
-    description: "Removes a target environment.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the target environment from Vulnerability Scanner.",
+    description: "Removes a target environment.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the target environment from Vulnerability Scanner.\n\nDELETE /accounts/{account_id}/vuln_scanner/target_environments/{target_environment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "target_environment_id": {
-          "description": "Target environment identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "target_environment_id": {
+              "description": "Target environment identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "target_environment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "target_environment_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/vuln_scanner_empty-response",
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_empty-response": vuln_scanner_empty_response_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_empty-response": vuln_scanner_empty$$response,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     annotations: {
@@ -191,10 +206,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_empty-response": vuln_scanner_empty_response_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_empty-response": vuln_scanner_empty$$response,
+        "vuln_scanner_messages": vuln_scanner_messages,
       },
     },
     request: (args) => ({
@@ -202,35 +217,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_target_environments_edit",
+    name: "apiSecurity_vulnerabilityScanner_targetEnvironments_edit",
     title: "Edit target environment",
-    description: "Updates a target environment with only the provided fields; omitted fields remain unchanged.\n\nThis method is beta.",
+    description: "Updates a target environment with only the provided fields; omitted fields remain unchanged.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/vuln_scanner/target_environments/{target_environment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_patch-target-environment-request"
         },
-        "target_environment_id": {
-          "description": "Target environment identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "target_environment_id": {
+              "description": "Target environment identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "target_environment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "target_environment_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-        "vuln_scanner_patch-target-environment-request": vuln_scanner_patch_target_environment_request,
-        "vuln_scanner_target-type": vuln_scanner_target_type,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target,
+        "vuln_scanner_patch-target-environment-request": vuln_scanner_patch$$target$$environment$$request,
+        "vuln_scanner_target-type": vuln_scanner_target$$type$,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target$,
       },
     },
     outputSchema: {
@@ -258,11 +282,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     annotations: {
@@ -306,12 +330,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     request: (args) => ({
@@ -320,29 +344,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_target_environments_get",
+    name: "apiSecurity_vulnerabilityScanner_targetEnvironments_get",
     title: "Get target environment",
-    description: "Returns a single target environment by ID.\n\nThis method is beta.",
+    description: "Returns a single target environment by ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/vuln_scanner/target_environments/{target_environment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "target_environment_id": {
-          "description": "Target environment identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "target_environment_id": {
+              "description": "Target environment identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "target_environment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "target_environment_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -369,11 +400,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     annotations: {
@@ -417,12 +448,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     request: (args) => ({
@@ -430,33 +461,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_target_environments_list",
+    name: "apiSecurity_vulnerabilityScanner_targetEnvironments_list",
     title: "List target environments",
-    description: "Returns all target environments for the account.\n\nThis method is beta.",
+    description: "Returns all target environments for the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/vuln_scanner/target_environments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -476,12 +520,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-collection": vuln_scanner_api_response_collection_output,
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-collection": vuln_scanner_api$$response$$collection,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     annotations: {
@@ -518,53 +562,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-collection": vuln_scanner_api_response_collection_output,
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-collection": vuln_scanner_api$$response$$collection,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/vuln_scanner/target_environments`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "api_security_vulnerability_scanner_target_environments_update",
+    name: "apiSecurity_vulnerabilityScanner_targetEnvironments_update",
     title: "Update target environment",
-    description: "Replaces a target environment. All fields must be provided.\n\nThis method is beta.",
+    description: "Replaces a target environment. All fields must be provided.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/vuln_scanner/target_environments/{target_environment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vuln_scanner_identifier",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/vuln_scanner_update-target-environment-request"
         },
-        "target_environment_id": {
-          "description": "Target environment identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "target_environment_id": {
+              "description": "Target environment identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "target_environment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "target_environment_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vuln_scanner_identifier": vuln_scanner_identifier,
-        "vuln_scanner_target-type": vuln_scanner_target_type,
-        "vuln_scanner_update-target-environment-request": vuln_scanner_update_target_environment_request,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target,
+        "vuln_scanner_target-type": vuln_scanner_target$$type$,
+        "vuln_scanner_update-target-environment-request": vuln_scanner_update$$target$$environment$$request,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target$,
       },
     },
     outputSchema: {
@@ -592,11 +645,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     annotations: {
@@ -640,12 +693,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vuln_scanner_api-response-common": vuln_scanner_api_response_common_output,
-        "vuln_scanner_api-response-common-failure": vuln_scanner_api_response_common_failure_output,
-        "vuln_scanner_messages": vuln_scanner_messages_output,
-        "vuln_scanner_target-environment": vuln_scanner_target_environment_output,
-        "vuln_scanner_target-type": vuln_scanner_target_type_output,
-        "vuln_scanner_zone-target": vuln_scanner_zone_target_output,
+        "vuln_scanner_api-response-common": vuln_scanner_api$$response$$common,
+        "vuln_scanner_api-response-common-failure": vuln_scanner_api$$response$$common$$failure,
+        "vuln_scanner_messages": vuln_scanner_messages,
+        "vuln_scanner_target-environment": vuln_scanner_target$$environment,
+        "vuln_scanner_target-type": vuln_scanner_target$$type,
+        "vuln_scanner_zone-target": vuln_scanner_zone$$target,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/argo/smartRouting/outputs.ts b/src/generated/forge-mcp/argo/smartRouting/outputs.ts
index f3169a12a..2ccb20186 100644
--- a/src/generated/forge-mcp/argo/smartRouting/outputs.ts
+++ b/src/generated/forge-mcp/argo/smartRouting/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `argo-config_api_response_common_failure` in responses.
  */
-export const argo_config_api_response_common_failure_output: JsonSchema = {
+export const argo$$config_api_response_common_failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/argo-config_messages"
@@ -36,7 +36,7 @@ export const argo_config_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `argo-config_api_response_single` in responses.
  */
-export const argo_config_api_response_single_output: JsonSchema = {
+export const argo$$config_api_response_single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/argo-config_messages"
@@ -66,7 +66,7 @@ export const argo_config_api_response_single_output: JsonSchema = {
 /**
  * The schema of `argo-config_count_zones_response` in responses.
  */
-export const argo_config_count_zones_response_output: JsonSchema = {
+export const argo$$config_count_zones_response: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/argo-config_messages"
@@ -93,17 +93,10 @@ export const argo_config_count_zones_response_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `argo-config_editable` in responses.
- */
-export const argo_config_editable_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `argo-config_messages` in responses.
  */
-export const argo_config_messages_output: JsonSchema = {
+export const argo$$config_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -122,30 +115,27 @@ export const argo_config_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `argo-config_modified_on` in responses.
- */
-export const argo_config_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `argo-config_result_object` in responses.
  */
-export const argo_config_result_object_output: JsonSchema = {
+export const argo$$config_result_object: JsonSchema = {
   "properties": {
     "editable": {
-      "$ref": "#/$defs/argo-config_editable"
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/argo-config_setting_id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/argo-config_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/argo-config_setting_value"
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -155,21 +145,3 @@ export const argo_config_result_object_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `argo-config_setting_id` in responses.
- */
-export const argo_config_setting_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `argo-config_setting_value` in responses.
- */
-export const argo_config_setting_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/argo/smartRouting/schemas.ts b/src/generated/forge-mcp/argo/smartRouting/schemas.ts
index 31c8916c3..6b3e301e9 100644
--- a/src/generated/forge-mcp/argo/smartRouting/schemas.ts
+++ b/src/generated/forge-mcp/argo/smartRouting/schemas.ts
@@ -3,23 +3,19 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `argo-config_identifier`.
- */
-export const argo_config_identifier: JsonSchema = {
-  "description": "Specifies the zone associated with the API call.",
-  "type": "string"
-};
-
 /**
  * The schema of `argo-config_patch`.
  */
-export const argo_config_patch: JsonSchema = {
+export const argo$$config_patch: JsonSchema = {
   "description": "Configures the enablement of Argo Smart Routing.",
   "properties": {
     "value": {
-      "$ref": "#/$defs/argo-config_setting_value",
-      "description": "Specifies the enablement value of Argo Smart Routing."
+      "description": "Specifies the enablement value of Argo Smart Routing.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -27,15 +23,3 @@ export const argo_config_patch: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `argo-config_setting_value`.
- */
-export const argo_config_setting_value: JsonSchema = {
-  "description": "Specifies the enablement value of Argo Smart Routing.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/argo/smartRouting/tools.ts b/src/generated/forge-mcp/argo/smartRouting/tools.ts
index 077610b39..01623e858 100644
--- a/src/generated/forge-mcp/argo/smartRouting/tools.ts
+++ b/src/generated/forge-mcp/argo/smartRouting/tools.ts
@@ -3,50 +3,49 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  argo_config_api_response_common_failure_output,
-  argo_config_api_response_single_output,
-  argo_config_count_zones_response_output,
-  argo_config_editable_output,
-  argo_config_messages_output,
-  argo_config_modified_on_output,
-  argo_config_result_object_output,
-  argo_config_setting_id_output,
-  argo_config_setting_value_output,
+  argo$$config_api_response_common_failure,
+  argo$$config_api_response_single,
+  argo$$config_count_zones_response,
+  argo$$config_messages,
+  argo$$config_result_object,
 } from "./outputs.js";
-import {
-  argo_config_identifier,
-  argo_config_patch,
-  argo_config_setting_value,
-} from "./schemas.js";
+import { argo$$config_patch } from "./schemas.js";
 
 /**
- * The tools of `argo.smart_routing`.
+ * The tools of `argo.smartRouting`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "argo_smart_routing_count_zones_enabled_for_account",
+    name: "argo_smartRouting_countZonesEnabledForAccount",
     title: "Get count of zones with Argo Smart Routing enabled for account",
-    description: "Returns the number of zones that have Argo Smart Routing enabled for the specified account.",
+    description: "Returns the number of zones that have Argo Smart Routing enabled for the specified account.\n\nGET /accounts/{account_id}/argo/count_zones_enabled",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/argo-config_identifier",
-          "description": "Identifier of the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "argo-config_identifier": argo_config_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/argo-config_count_zones_response",
       $defs: {
-        "argo-config_count_zones_response": argo_config_count_zones_response_output,
-        "argo-config_messages": argo_config_messages_output,
+        "argo-config_count_zones_response": argo$$config_count_zones_response,
+        "argo-config_messages": argo$$config_messages,
       },
     },
     annotations: {
@@ -87,9 +86,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "argo-config_api_response_common_failure": argo_config_api_response_common_failure_output,
-        "argo-config_count_zones_response": argo_config_count_zones_response_output,
-        "argo-config_messages": argo_config_messages_output,
+        "argo-config_api_response_common_failure": argo$$config_api_response_common_failure,
+        "argo-config_count_zones_response": argo$$config_count_zones_response,
+        "argo-config_messages": argo$$config_messages,
       },
     },
     request: (args) => ({
@@ -97,18 +96,19 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "argo_smart_routing_count_zones_enabled_for_user",
+    name: "argo_smartRouting_countZonesEnabledForUser",
     title: "Get count of zones with Argo Smart Routing enabled for user",
-    description: "Returns the number of zones that have Argo Smart Routing enabled for the authenticated user.",
+    description: "Returns the number of zones that have Argo Smart Routing enabled for the authenticated user.\n\nGET /user/argo/count_zones_enabled",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/argo-config_count_zones_response",
       $defs: {
-        "argo-config_count_zones_response": argo_config_count_zones_response_output,
-        "argo-config_messages": argo_config_messages_output,
+        "argo-config_count_zones_response": argo$$config_count_zones_response,
+        "argo-config_messages": argo$$config_messages,
       },
     },
     annotations: {
@@ -149,9 +149,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "argo-config_api_response_common_failure": argo_config_api_response_common_failure_output,
-        "argo-config_count_zones_response": argo_config_count_zones_response_output,
-        "argo-config_messages": argo_config_messages_output,
+        "argo-config_api_response_common_failure": argo$$config_api_response_common_failure,
+        "argo-config_count_zones_response": argo$$config_count_zones_response,
+        "argo-config_messages": argo$$config_messages,
       },
     },
     request: (_args) => ({
@@ -159,40 +159,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "argo_smart_routing_edit",
+    name: "argo_smartRouting_edit",
     title: "Patch Argo Smart Routing setting",
-    description: "Configures the value of the Argo Smart Routing enablement setting.",
+    description: "Configures the value of the Argo Smart Routing enablement setting.\n\nPATCH /zones/{zone_id}/argo/smart_routing",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/argo-config_patch"
         },
-        "zone_id": {
-          "$ref": "#/$defs/argo-config_identifier",
-          "description": "Specifies the zone associated with the API call."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specifies the zone associated with the API call.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "argo-config_identifier": argo_config_identifier,
-        "argo-config_patch": argo_config_patch,
-        "argo-config_setting_value": argo_config_setting_value,
+        "argo-config_patch": argo$$config_patch,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/argo-config_api_response_single",
       $defs: {
-        "argo-config_api_response_single": argo_config_api_response_single_output,
-        "argo-config_editable": argo_config_editable_output,
-        "argo-config_messages": argo_config_messages_output,
-        "argo-config_modified_on": argo_config_modified_on_output,
-        "argo-config_result_object": argo_config_result_object_output,
-        "argo-config_setting_id": argo_config_setting_id_output,
-        "argo-config_setting_value": argo_config_setting_value_output,
+        "argo-config_api_response_single": argo$$config_api_response_single,
+        "argo-config_messages": argo$$config_messages,
+        "argo-config_result_object": argo$$config_result_object,
       },
     },
     annotations: {
@@ -231,14 +235,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "argo-config_api_response_common_failure": argo_config_api_response_common_failure_output,
-        "argo-config_api_response_single": argo_config_api_response_single_output,
-        "argo-config_editable": argo_config_editable_output,
-        "argo-config_messages": argo_config_messages_output,
-        "argo-config_modified_on": argo_config_modified_on_output,
-        "argo-config_result_object": argo_config_result_object_output,
-        "argo-config_setting_id": argo_config_setting_id_output,
-        "argo-config_setting_value": argo_config_setting_value_output,
+        "argo-config_api_response_common_failure": argo$$config_api_response_common_failure,
+        "argo-config_api_response_single": argo$$config_api_response_single,
+        "argo-config_messages": argo$$config_messages,
+        "argo-config_result_object": argo$$config_result_object,
       },
     },
     request: (args) => ({
@@ -247,34 +247,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "argo_smart_routing_get",
+    name: "argo_smartRouting_get",
     title: "Get Argo Smart Routing setting",
-    description: "Retrieves the value of Argo Smart Routing enablement setting.",
+    description: "Retrieves the value of Argo Smart Routing enablement setting.\n\nGET /zones/{zone_id}/argo/smart_routing",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/argo-config_identifier",
-          "description": "Specifies the zone associated with the API call."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specifies the zone associated with the API call.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "argo-config_identifier": argo_config_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/argo-config_api_response_single",
       $defs: {
-        "argo-config_api_response_single": argo_config_api_response_single_output,
-        "argo-config_editable": argo_config_editable_output,
-        "argo-config_messages": argo_config_messages_output,
-        "argo-config_modified_on": argo_config_modified_on_output,
-        "argo-config_result_object": argo_config_result_object_output,
-        "argo-config_setting_id": argo_config_setting_id_output,
-        "argo-config_setting_value": argo_config_setting_value_output,
+        "argo-config_api_response_single": argo$$config_api_response_single,
+        "argo-config_messages": argo$$config_messages,
+        "argo-config_result_object": argo$$config_result_object,
       },
     },
     annotations: {
@@ -313,14 +316,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "argo-config_api_response_common_failure": argo_config_api_response_common_failure_output,
-        "argo-config_api_response_single": argo_config_api_response_single_output,
-        "argo-config_editable": argo_config_editable_output,
-        "argo-config_messages": argo_config_messages_output,
-        "argo-config_modified_on": argo_config_modified_on_output,
-        "argo-config_result_object": argo_config_result_object_output,
-        "argo-config_setting_id": argo_config_setting_id_output,
-        "argo-config_setting_value": argo_config_setting_value_output,
+        "argo-config_api_response_common_failure": argo$$config_api_response_common_failure,
+        "argo-config_api_response_single": argo$$config_api_response_single,
+        "argo-config_messages": argo$$config_messages,
+        "argo-config_result_object": argo$$config_result_object,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/argo/tieredCaching/outputs.ts b/src/generated/forge-mcp/argo/tieredCaching/outputs.ts
index 999a3f19d..33b202f7b 100644
--- a/src/generated/forge-mcp/argo/tieredCaching/outputs.ts
+++ b/src/generated/forge-mcp/argo/tieredCaching/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_tiered_cache` in responses.
  */
-export const cache_settings_tiered_cache_output: JsonSchema = {
+export const cache$$settings_tiered_cache: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -28,7 +28,7 @@ export const cache_settings_tiered_cache_output: JsonSchema = {
 /**
  * The schema of `cache-settings_tiered_cache_response_value` in responses.
  */
-export const cache_settings_tiered_cache_response_value_output: JsonSchema = {
+export const cache$$settings_tiered_cache_response_value: JsonSchema = {
   "properties": {
     "result": {
       "allOf": [
@@ -38,7 +38,11 @@ export const cache_settings_tiered_cache_response_value_output: JsonSchema = {
         {
           "properties": {
             "value": {
-              "$ref": "#/$defs/cache-settings_tiered_cache_value"
+              "enum": [
+                "on",
+                "off"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -51,14 +55,3 @@ export const cache_settings_tiered_cache_response_value_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `cache-settings_tiered_cache_value` in responses.
- */
-export const cache_settings_tiered_cache_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/argo/tieredCaching/schemas.ts b/src/generated/forge-mcp/argo/tieredCaching/schemas.ts
index a49fe44e2..06867f272 100644
--- a/src/generated/forge-mcp/argo/tieredCaching/schemas.ts
+++ b/src/generated/forge-mcp/argo/tieredCaching/schemas.ts
@@ -6,12 +6,16 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_patch`.
  */
-export const cache_settings_patch: JsonSchema = {
+export const cache$$settings_patch: JsonSchema = {
   "description": "Update enablement of Tiered Caching.",
   "properties": {
     "value": {
-      "$ref": "#/$defs/cache-settings_value",
-      "description": "Enables Tiered Caching."
+      "description": "Enables Tiered Caching.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -19,15 +23,3 @@ export const cache_settings_patch: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `cache-settings_value`.
- */
-export const cache_settings_value: JsonSchema = {
-  "description": "Enables Tiered Caching.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/argo/tieredCaching/tools.ts b/src/generated/forge-mcp/argo/tieredCaching/tools.ts
index 1907d58fd..339ccc91d 100644
--- a/src/generated/forge-mcp/argo/tieredCaching/tools.ts
+++ b/src/generated/forge-mcp/argo/tieredCaching/tools.ts
@@ -3,52 +3,54 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_editable_output,
-  cache_settings_messages_output,
-  cache_settings_modified_on_output,
-  cache_settings_result_object_output,
-  cache_settings_setting_id_output,
-  cache_settings_setting_value_output,
-  cache_settings_zone_cache_settings_response_single_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
+  cache$$settings_result$$object,
+  cache$$settings_zone_cache_settings_response_single,
 } from "../../outputs.js";
-import { cache_settings_identifier } from "../../schemas.js";
 import {
-  cache_settings_tiered_cache_output,
-  cache_settings_tiered_cache_response_value_output,
-  cache_settings_tiered_cache_value_output,
+  cache$$settings_tiered_cache,
+  cache$$settings_tiered_cache_response_value,
 } from "./outputs.js";
-import { cache_settings_patch, cache_settings_value } from "./schemas.js";
+import { cache$$settings_patch } from "./schemas.js";
 
 /**
- * The tools of `argo.tiered_caching`.
+ * The tools of `argo.tieredCaching`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "argo_tiered_caching_edit",
+    name: "argo_tieredCaching_edit",
     title: "Patch Tiered Caching setting",
-    description: "Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of lower-tiers and upper-tiers. If content is not cached in lower-tier data centers (generally the ones closest to a visitor), the lower-tier must ask an upper-tier to see if it has the content. If the upper-tier does not have the content, only the upper-tier can ask the origin for content. This practice improves bandwidth efficiency by limiting the number of data centers that can ask the origin for content, which reduces origin load and makes websites more cost-effective to operate. Additionally, Tiered Cache concentrates connections to origin servers so they come from a small number of data centers rather than the full set of network locations. This results in fewer open connections using server resources.",
+    description: "Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of lower-tiers and upper-tiers. If content is not cached in lower-tier data centers (generally the ones closest to a visitor), the lower-tier must ask an upper-tier to see if it has the content. If the upper-tier does not have the content, only the upper-tier can ask the origin for content. This practice improves bandwidth efficiency by limiting the number of data centers that can ask the origin for content, which reduces origin load and makes websites more cost-effective to operate. Additionally, Tiered Cache concentrates connections to origin servers so they come from a small number of data centers rather than the full set of network locations. This results in fewer open connections using server resources.\n\nPATCH /zones/{zone_id}/argo/tiered_caching",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/cache-settings_patch"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_patch": cache_settings_patch,
-        "cache-settings_value": cache_settings_value,
+        "cache-settings_patch": cache$$settings_patch,
       },
     },
     outputSchema: {
@@ -61,18 +63,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_tiered_cache": cache_settings_tiered_cache_output,
-        "cache-settings_tiered_cache_response_value": cache_settings_tiered_cache_response_value_output,
-        "cache-settings_tiered_cache_value": cache_settings_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_tiered_cache": cache$$settings_tiered_cache,
+        "cache-settings_tiered_cache_response_value": cache$$settings_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -109,19 +106,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_tiered_cache": cache_settings_tiered_cache_output,
-        "cache-settings_tiered_cache_response_value": cache_settings_tiered_cache_response_value_output,
-        "cache-settings_tiered_cache_value": cache_settings_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_tiered_cache": cache$$settings_tiered_cache,
+        "cache-settings_tiered_cache_response_value": cache$$settings_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -130,23 +122,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "argo_tiered_caching_get",
+    name: "argo_tieredCaching_get",
     title: "Get Tiered Caching setting",
-    description: "Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of lower-tiers and upper-tiers. If content is not cached in lower-tier data centers (generally the ones closest to a visitor), the lower-tier must ask an upper-tier to see if it has the content. If the upper-tier does not have the content, only the upper-tier can ask the origin for content. This practice improves bandwidth efficiency by limiting the number of data centers that can ask the origin for content, which reduces origin load and makes websites more cost-effective to operate. Additionally, Tiered Cache concentrates connections to origin servers so they come from a small number of data centers rather than the full set of network locations. This results in fewer open connections using server resources.",
+    description: "Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of lower-tiers and upper-tiers. If content is not cached in lower-tier data centers (generally the ones closest to a visitor), the lower-tier must ask an upper-tier to see if it has the content. If the upper-tier does not have the content, only the upper-tier can ask the origin for content. This practice improves bandwidth efficiency by limiting the number of data centers that can ask the origin for content, which reduces origin load and makes websites more cost-effective to operate. Additionally, Tiered Cache concentrates connections to origin servers so they come from a small number of data centers rather than the full set of network locations. This results in fewer open connections using server resources.\n\nGET /zones/{zone_id}/argo/tiered_caching",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -158,18 +157,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_tiered_cache": cache_settings_tiered_cache_output,
-        "cache-settings_tiered_cache_response_value": cache_settings_tiered_cache_response_value_output,
-        "cache-settings_tiered_cache_value": cache_settings_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_tiered_cache": cache$$settings_tiered_cache,
+        "cache-settings_tiered_cache_response_value": cache$$settings_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -206,19 +200,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_tiered_cache": cache_settings_tiered_cache_output,
-        "cache-settings_tiered_cache_response_value": cache_settings_tiered_cache_response_value_output,
-        "cache-settings_tiered_cache_value": cache_settings_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_tiered_cache": cache$$settings_tiered_cache,
+        "cache-settings_tiered_cache_response_value": cache$$settings_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/artifacts/namespaces/repos/blobs/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/repos/blobs/tools.ts
index b53272dae..3a0fd12ef 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/repos/blobs/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/repos/blobs/tools.ts
@@ -10,33 +10,43 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_blobs_get",
     title: "Read a Git blob",
-    description: "Returns raw bytes for an immutable Git blob object. Blob responses are cacheable forever by hash.\n\nThis method is beta.",
+    description: "Returns raw bytes for an immutable Git blob object. Blob responses are cacheable forever by hash.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/blob/{hash}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "hash": {
-          "description": "40-character lowercase hexadecimal Git object hash.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "hash": {
+              "description": "40-character lowercase hexadecimal Git object hash.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name",
+            "hash"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name",
-        "hash"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/artifacts/namespaces/repos/commits/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/repos/commits/tools.ts
index 75a5ee1b3..bb2fbe9e7 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/repos/commits/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/repos/commits/tools.ts
@@ -10,33 +10,43 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_commits_get",
     title: "Read a Git commit",
-    description: "Returns decoded metadata for an immutable Git commit object. Commit responses are cacheable forever by hash.\n\nThis method is beta.",
+    description: "Returns decoded metadata for an immutable Git commit object. Commit responses are cacheable forever by hash.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/commit/{hash}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "hash": {
-          "description": "40-character lowercase hexadecimal Git object hash.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "hash": {
+              "description": "40-character lowercase hexadecimal Git object hash.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name",
+            "hash"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name",
-        "hash"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/artifacts/namespaces/repos/files/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/repos/files/tools.ts
index 9a8814aa6..ec3d701fd 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/repos/files/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/repos/files/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
  * The tools of `artifacts.namespaces.repos.files`.
@@ -10,38 +10,57 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_files_get",
     title: "Read a file",
-    description: "Returns raw bytes for a file resolved by ref and path.\n\nThis method is beta.",
+    description: "Returns raw bytes for a file resolved by ref and path.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/file",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
-        },
         "path": {
-          "description": "File path.",
-          "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name"
+          ],
+          "type": "object"
         },
-        "ref": {
-          "description": "Git ref, branch, tag, or commit hash.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "path": {
+              "description": "File path.",
+              "type": "string"
+            },
+            "ref": {
+              "description": "Git ref, branch, tag, or commit hash.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "ref",
+            "path"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name",
-        "ref",
-        "path"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -582,8 +601,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/artifacts/namespaces/${pathParam(args, "namespace")}/repos/${pathParam(args, "name")}/file`,
       query: [
-        ["ref", args["ref"], true],
-        ["path", args["path"], true],
+        ["ref", param(args, "query", "ref"), true],
+        ["path", param(args, "query", "path"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/artifacts/namespaces/repos/logs/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/repos/logs/tools.ts
index c99e30297..86e21f440 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/repos/logs/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/repos/logs/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
  * The tools of `artifacts.namespaces.repos.logs`.
@@ -10,38 +10,54 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_logs_get",
     title: "Read commit history",
-    description: "Returns commit metadata walking backwards from a ref, branch, tag, or HEAD.\n\nThis method is beta.",
+    description: "Returns commit metadata walking backwards from a ref, branch, tag, or HEAD.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/log",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "limit": {
-          "type": "integer"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
-        },
-        "offset": {
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name"
+          ],
+          "type": "object"
         },
-        "ref": {
-          "description": "Git ref, branch, tag, or commit hash. Defaults to HEAD.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "type": "integer"
+            },
+            "offset": {
+              "type": "integer"
+            },
+            "ref": {
+              "description": "Git ref, branch, tag, or commit hash. Defaults to HEAD.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -883,9 +899,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/artifacts/namespaces/${pathParam(args, "namespace")}/repos/${pathParam(args, "name")}/log`,
       query: [
-        ["ref", args["ref"], true],
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["ref", param(args, "query", "ref"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/artifacts/namespaces/repos/raw/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/repos/raw/tools.ts
index fa51b05b3..c618b02bf 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/repos/raw/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/repos/raw/tools.ts
@@ -10,38 +10,48 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_raw_get",
     title: "Read a raw file with content type",
-    description: "Returns file bytes resolved by ref and path, with a sniffed content type and browser-safe response headers.\n\nThis method is beta.",
+    description: "Returns file bytes resolved by ref and path, with a sniffed content type and browser-safe response headers.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/raw/{ref}/{path}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
-        },
         "path": {
-          "description": "File path. May contain slashes.",
-          "type": "string"
-        },
-        "ref": {
-          "description": "Git ref, branch, tag, or 40-character commit hash.",
-          "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            },
+            "path": {
+              "description": "File path. May contain slashes.",
+              "type": "string"
+            },
+            "ref": {
+              "description": "Git ref, branch, tag, or 40-character commit hash.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name",
+            "ref",
+            "path"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name",
-        "ref",
         "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "type": "string",
diff --git a/src/generated/forge-mcp/artifacts/namespaces/repos/tokens/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/repos/tokens/tools.ts
index 402189199..4d57a8b9c 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/repos/tokens/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/repos/tokens/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
  * The tools of `artifacts.namespaces.repos.tokens`.
@@ -10,46 +10,62 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_tokens_list",
     title: "List repository tokens",
-    description: "Lists tokens for a repository.\n\nThis method is beta.",
+    description: "Lists tokens for a repository.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 30,
-          "type": "integer"
-        },
-        "state": {
-          "default": "active",
-          "enum": [
-            "active",
-            "expired",
-            "revoked",
-            "all"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 30,
+              "type": "integer"
+            },
+            "state": {
+              "default": "active",
+              "enum": [
+                "active",
+                "expired",
+                "revoked",
+                "all"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -921,9 +937,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/artifacts/namespaces/${pathParam(args, "namespace")}/repos/${pathParam(args, "name")}/tokens`,
       query: [
-        ["state", args["state"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["state", param(args, "query", "state"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/artifacts/namespaces/repos/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/repos/tools.ts
index 1eedf74d7..5795f7f42 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/repos/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/repos/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `artifacts.namespaces.repos`.
@@ -10,14 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_create",
     title: "Create a repository",
-    description: "Creates a Git-compatible Artifacts repository in a namespace.\n\nThis method is beta.",
+    description: "Creates a Git-compatible Artifacts repository in a namespace.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/artifacts/namespaces/{namespace}/repos",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "default_branch": {
@@ -39,16 +35,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -833,28 +843,38 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_delete",
     title: "Delete a repository",
-    description: "Deletes a repository and schedules cleanup of its backing data.\n\nThis method is beta.",
+    description: "Deletes a repository and schedules cleanup of its backing data.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1584,14 +1604,10 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_fork",
     title: "Fork a repository",
-    description: "Forks a source repository into a new repository.\n\nThis method is beta.",
+    description: "Forks a source repository into a new repository.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/fork",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "default_branch_only": {
@@ -1612,21 +1628,35 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2591,28 +2621,38 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_get",
     title: "Get a repository",
-    description: "Returns repository metadata.\n\nThis method is beta.",
+    description: "Returns repository metadata.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3548,14 +3588,10 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_import",
     title: "Import a repository",
-    description: "Imports an HTTPS Git repository into an Artifacts repository.\n\nThis method is beta.",
+    description: "Imports an HTTPS Git repository into an Artifacts repository.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/import",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "branch": {
@@ -3577,21 +3613,35 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -4892,51 +4942,67 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_list",
     title: "List repositories",
-    description: "Lists repositories in a namespace.\n\nThis method is beta.",
+    description: "Lists repositories in a namespace.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "type": "string"
-        },
-        "direction": {
-          "default": "desc",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "type": "integer"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
-        },
-        "search": {
-          "type": "string"
+          "type": "object"
         },
-        "sort": {
-          "default": "created_at",
-          "enum": [
-            "created_at",
-            "updated_at",
-            "last_push_at",
-            "name"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "direction": {
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 50,
+              "type": "integer"
+            },
+            "search": {
+              "type": "string"
+            },
+            "sort": {
+              "default": "created_at",
+              "enum": [
+                "created_at",
+                "updated_at",
+                "last_push_at",
+                "name"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5702,11 +5768,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/artifacts/namespaces/${pathParam(args, "namespace")}/repos`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
-        ["search", args["search"], true],
-        ["sort", args["sort"], true],
-        ["direction", args["direction"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["search", param(args, "query", "search"), true],
+        ["sort", param(args, "query", "sort"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/artifacts/namespaces/repos/trees/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/repos/trees/tools.ts
index 571a4080f..9589134a1 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/repos/trees/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/repos/trees/tools.ts
@@ -10,33 +10,43 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_repos_trees_get",
     title: "Read a Git tree",
-    description: "Returns decoded entries for an immutable Git tree object. A commit hash returns that commit's root tree; a blob or tag hash returns 422. Tree responses are cacheable forever by hash.\n\nThis method is beta.",
+    description: "Returns decoded entries for an immutable Git tree object. A commit hash returns that commit's root tree; a blob or tag hash returns 422. Tree responses are cacheable forever by hash.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}/repos/{name}/tree/{hash}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "hash": {
-          "description": "40-character lowercase hexadecimal Git object hash.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Repository name.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "hash": {
+              "description": "40-character lowercase hexadecimal Git object hash.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Repository name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "name",
+            "hash"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "name",
-        "hash"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/artifacts/namespaces/tokens/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/tokens/tools.ts
index 8fe0c6bd0..e775f1866 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/tokens/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/tokens/tools.ts
@@ -10,14 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_tokens_create",
     title: "Create a repository token",
-    description: "Creates a scoped Git token for a repository.\n\nThis method is beta.",
+    description: "Creates a scoped Git token for a repository.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/artifacts/namespaces/{namespace}/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "repo": {
@@ -39,16 +35,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -899,28 +909,38 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_tokens_revoke",
     title: "Revoke a token",
-    description: "Revokes an Artifacts repository token. Token IDs are resolved through an eventually consistent index, so revoking a token within about a second of creating it can return 404; retry after a short delay.\n\nThis method is beta.",
+    description: "Revokes an Artifacts repository token. Token IDs are resolved through an eventually consistent index, so revoking a token within about a second of creating it can return 404; retry after a short delay.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/artifacts/namespaces/{namespace}/tokens/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Token ID. Must match /^[0-9a-z]{16}$/.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Token ID. Must match /^[0-9a-z]{16}$/.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/artifacts/namespaces/tools.ts b/src/generated/forge-mcp/artifacts/namespaces/tools.ts
index aafb2b8e4..8039da7ac 100644
--- a/src/generated/forge-mcp/artifacts/namespaces/tools.ts
+++ b/src/generated/forge-mcp/artifacts/namespaces/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `artifacts.namespaces`.
@@ -10,14 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_create",
     title: "Create a namespace",
-    description: "Creates an empty Artifacts namespace for an account.\n\nThis method is beta.",
+    description: "Creates an empty Artifacts namespace for an account.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/artifacts/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "jurisdiction": {
@@ -38,12 +34,26 @@ export const tools: readonly Tool[] = [
             "namespace"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -822,23 +832,33 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_delete",
     title: "Delete a namespace",
-    description: "Deletes an empty Artifacts namespace.\n\nThis method is beta.",
+    description: "Deletes an empty Artifacts namespace.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/artifacts/namespaces/{namespace}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -1383,23 +1403,33 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_get",
     title: "Get a namespace",
-    description: "Returns an Artifacts namespace summary.\n\nThis method is beta.",
+    description: "Returns an Artifacts namespace summary.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces/{namespace}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Artifacts namespace name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "Artifacts namespace name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2177,25 +2207,41 @@ export const tools: readonly Tool[] = [
   {
     name: "artifacts_namespaces_list",
     title: "List namespaces",
-    description: "Lists Artifacts namespaces for an account.\n\nThis method is beta.",
+    description: "Lists Artifacts namespaces for an account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/artifacts/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "default": 100,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "limit": {
+              "default": 100,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2889,8 +2935,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/artifacts/namespaces`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/auditLogs/tools.ts b/src/generated/forge-mcp/auditLogs/tools.ts
index 4acc35d07..de696427f 100644
--- a/src/generated/forge-mcp/auditLogs/tools.ts
+++ b/src/generated/forge-mcp/auditLogs/tools.ts
@@ -1,120 +1,130 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  aaa_api_response_common_failure_output,
-  aaa_api_response_common_output,
-  aaa_audit_logs_output,
-  aaa_audit_logs_response_collection_output$,
-  aaa_identifier_output,
-  aaa_messages_output,
+  aaa_api$$response$$common,
+  aaa_api$$response$$common$$failure,
+  aaa_audit$$logs,
+  aaa_audit_logs_response_collection,
+  aaa_messages,
 } from "../outputs.js";
-import { aaa_identifier } from "../schemas.js";
 
 /**
- * The tools of `audit_logs`.
+ * The tools of `auditLogs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "audit_logs_list",
+    name: "auditLogs_list",
     title: "Get account audit logs",
-    description: "Gets a list of audit logs for an account. Can be filtered by who made the change, on which zone, and the timeframe of the change.",
+    description: "Gets a list of audit logs for an account. Can be filtered by who made the change, on which zone, and the timeframe of the change.\n\nGET /accounts/{account_id}/audit_logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/aaa_identifier",
-          "description": "Identifier"
-        },
-        "action_type": {
-          "description": "Filters by the action type.",
-          "type": "string"
-        },
-        "actor_email": {
-          "description": "Filters by the email address of the actor that made the change.",
-          "type": "string"
-        },
-        "actor_ip": {
-          "description": "Filters by the IP address of the request that made the change by specific IP address or valid CIDR Range.",
-          "type": "string"
-        },
-        "before": {
-          "oneOf": [
-            {
-              "format": "date",
-              "type": "string"
-            },
-            {
-              "format": "date-time",
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
               "type": "string"
             }
-          ]
-        },
-        "direction": {
-          "default": "desc",
-          "description": "Changes the direction of the chronological sorting.",
-          "enum": [
-            "desc",
-            "asc"
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "export": {
-          "description": "Indicates that this request is an export of logs in CSV format.",
-          "type": "boolean"
-        },
-        "hide_user_logs": {
-          "default": false,
-          "description": "Indicates whether or not to hide user level audit logs.",
-          "type": "boolean"
-        },
-        "id": {
-          "description": "Finds a specific log by its ID.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Defines which page of results to return.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 100,
-          "description": "Sets the number of results to return per page.",
-          "type": "number"
-        },
-        "since": {
-          "oneOf": [
-            {
-              "format": "date",
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "action.type": {
+              "description": "Filters by the action type.",
               "type": "string"
             },
-            {
-              "format": "date-time",
+            "actor.email": {
+              "description": "Filters by the email address of the actor that made the change.",
+              "type": "string"
+            },
+            "actor.ip": {
+              "description": "Filters by the IP address of the request that made the change by specific IP address or valid CIDR Range.",
+              "type": "string"
+            },
+            "before": {
+              "oneOf": [
+                {
+                  "format": "date",
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            },
+            "direction": {
+              "default": "desc",
+              "description": "Changes the direction of the chronological sorting.",
+              "enum": [
+                "desc",
+                "asc"
+              ],
+              "type": "string"
+            },
+            "export": {
+              "description": "Indicates that this request is an export of logs in CSV format.",
+              "type": "boolean"
+            },
+            "hide_user_logs": {
+              "default": false,
+              "description": "Indicates whether or not to hide user level audit logs.",
+              "type": "boolean"
+            },
+            "id": {
+              "description": "Finds a specific log by its ID.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Defines which page of results to return.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Sets the number of results to return per page.",
+              "type": "number"
+            },
+            "since": {
+              "oneOf": [
+                {
+                  "format": "date",
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            },
+            "zone.name": {
+              "description": "Filters by the name of the zone associated to the change.",
               "type": "string"
             }
-          ]
-        },
-        "zone_name": {
-          "description": "Filters by the name of the zone associated to the change.",
-          "type": "string"
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "aaa_identifier": aaa_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_audit_logs_response_collection",
       $defs: {
-        "aaa_api-response-common": aaa_api_response_common_output,
-        "aaa_audit-logs": aaa_audit_logs_output,
-        "aaa_audit_logs_response_collection": aaa_audit_logs_response_collection_output$,
-        "aaa_identifier": aaa_identifier_output,
-        "aaa_messages": aaa_messages_output,
+        "aaa_api-response-common": aaa_api$$response$$common,
+        "aaa_audit-logs": aaa_audit$$logs,
+        "aaa_audit_logs_response_collection": aaa_audit_logs_response_collection,
+        "aaa_messages": aaa_messages,
       },
     },
     annotations: {
@@ -155,29 +165,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common": aaa_api_response_common_output,
-        "aaa_api-response-common-failure": aaa_api_response_common_failure_output,
-        "aaa_audit-logs": aaa_audit_logs_output,
-        "aaa_audit_logs_response_collection": aaa_audit_logs_response_collection_output$,
-        "aaa_identifier": aaa_identifier_output,
-        "aaa_messages": aaa_messages_output,
+        "aaa_api-response-common": aaa_api$$response$$common,
+        "aaa_api-response-common-failure": aaa_api$$response$$common$$failure,
+        "aaa_audit-logs": aaa_audit$$logs,
+        "aaa_audit_logs_response_collection": aaa_audit_logs_response_collection,
+        "aaa_messages": aaa_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/audit_logs`,
       query: [
-        ["id", args["id"], true],
-        ["export", args["export"], true],
-        ["action.type", args["action_type"], true],
-        ["actor.ip", args["actor_ip"], true],
-        ["actor.email", args["actor_email"], true],
-        ["since", args["since"], true],
-        ["before", args["before"], true],
-        ["zone.name", args["zone_name"], true],
-        ["direction", args["direction"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
-        ["hide_user_logs", args["hide_user_logs"], true],
+        ["id", param(args, "query", "id"), true],
+        ["export", param(args, "query", "export"), true],
+        ["action.type", param(args, "query", "action.type"), true],
+        ["actor.ip", param(args, "query", "actor.ip"), true],
+        ["actor.email", param(args, "query", "actor.email"), true],
+        ["since", param(args, "query", "since"), true],
+        ["before", param(args, "query", "before"), true],
+        ["zone.name", param(args, "query", "zone.name"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
+        ["hide_user_logs", param(args, "query", "hide_user_logs"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/basinCatalog/credentials/tools.ts b/src/generated/forge-mcp/basinCatalog/credentials/tools.ts
index 4fc993801..dd3df4f34 100644
--- a/src/generated/forge-mcp/basinCatalog/credentials/tools.ts
+++ b/src/generated/forge-mcp/basinCatalog/credentials/tools.ts
@@ -3,51 +3,53 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  r2_data_catalog_api_response_common_failure_output,
-  r2_data_catalog_api_response_errors_output,
-  r2_data_catalog_api_response_messages_output,
-  r2_data_catalog_api_response_single_output,
-  r2_data_catalog_api_response_success_output,
-  r2_data_catalog_credential_probe_status_output,
+  r2$$data$$catalog_api$$response$$common$$failure,
+  r2$$data$$catalog_api$$response$$errors,
+  r2$$data$$catalog_api$$response$$messages,
+  r2$$data$$catalog_api$$response$$single,
 } from "../../outputs.js";
-import {
-  r2_data_catalog_account_id,
-  r2_data_catalog_bucket_name,
-  r2_data_catalog_catalog_credential_request,
-} from "../../schemas.js";
+import { r2$$data$$catalog_catalog$$credential$$request } from "../../schemas.js";
 
 /**
- * The tools of `basin_catalog.credentials`.
+ * The tools of `basinCatalog.credentials`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "basin_catalog_credentials_create",
+    name: "basinCatalog_credentials_create",
     title: "Store catalog credentials",
-    description: "Store authentication credentials for a catalog. These credentials are used\nto authenticate with R2 storage when performing catalog operations.",
+    description: "Store authentication credentials for a catalog. These credentials are used\nto authenticate with R2 storage when performing catalog operations.\n\nPOST /accounts/{account_id}/basin-catalog/{bucket_name}/credential",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
         "body": {
           "$ref": "#/$defs/r2-data-catalog_catalog-credential-request"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-        "r2-data-catalog_catalog-credential-request": r2_data_catalog_catalog_credential_request,
+        "r2-data-catalog_catalog-credential-request": r2$$data$$catalog_catalog$$credential$$request,
       },
     },
     outputSchema: {
@@ -72,10 +74,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
       },
     },
     annotations: {
@@ -133,11 +134,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
       },
     },
     request: (args) => ({
@@ -146,29 +146,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "basin_catalog_credentials_status",
+    name: "basinCatalog_credentials_status",
     title: "Get Basin Catalog credential status",
-    description: "Check whether the configured catalog credentials are valid, invalid,\nor absent by probing authentication against the catalog.",
+    description: "Check whether the configured catalog credentials are valid, invalid,\nor absent by probing authentication against the catalog.\n\nGET /accounts/{account_id}/basin-catalog/{bucket_name}/credential/status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -180,7 +186,12 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "status": {
-                  "$ref": "#/$defs/r2-data-catalog_credential-probe-status"
+                  "enum": [
+                    "valid",
+                    "invalid",
+                    "absent"
+                  ],
+                  "type": "string"
                 }
               },
               "required": [
@@ -193,11 +204,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_credential-probe-status": r2_data_catalog_credential_probe_status_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
       },
     },
     annotations: {
@@ -227,7 +236,12 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "status": {
-                      "$ref": "#/$defs/r2-data-catalog_credential-probe-status"
+                      "enum": [
+                        "valid",
+                        "invalid",
+                        "absent"
+                      ],
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -257,12 +271,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_credential-probe-status": r2_data_catalog_credential_probe_status_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/basinCatalog/maintenanceConfigs/tools.ts b/src/generated/forge-mcp/basinCatalog/maintenanceConfigs/tools.ts
index aa0034e24..76bc8484c 100644
--- a/src/generated/forge-mcp/basinCatalog/maintenanceConfigs/tools.ts
+++ b/src/generated/forge-mcp/basinCatalog/maintenanceConfigs/tools.ts
@@ -3,58 +3,55 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  r2_data_catalog_api_response_common_failure_output,
-  r2_data_catalog_api_response_errors_output,
-  r2_data_catalog_api_response_messages_output,
-  r2_data_catalog_api_response_single_output,
-  r2_data_catalog_api_response_success_output,
-  r2_data_catalog_catalog_compaction_config_output,
-  r2_data_catalog_catalog_maintenance_config_output,
-  r2_data_catalog_catalog_maintenance_config_response_output,
-  r2_data_catalog_catalog_maintenance_state_output,
-  r2_data_catalog_catalog_target_file_size_output,
-  r2_data_catalog_credential_status_output,
-  r2_data_catalog_maintenance_interval_output,
-  r2_data_catalog_snapshot_expiration_config_output,
+  r2$$data$$catalog_api$$response$$common$$failure,
+  r2$$data$$catalog_api$$response$$errors,
+  r2$$data$$catalog_api$$response$$messages,
+  r2$$data$$catalog_api$$response$$single,
+  r2$$data$$catalog_catalog$$compaction$$config,
+  r2$$data$$catalog_catalog$$maintenance$$config,
+  r2$$data$$catalog_catalog$$maintenance$$config$$response,
+  r2$$data$$catalog_snapshot$$expiration$$config,
 } from "../../outputs.js";
 import {
-  r2_data_catalog_account_id,
-  r2_data_catalog_bucket_name,
-  r2_data_catalog_catalog_maintenance_state,
-  r2_data_catalog_catalog_maintenance_update_request,
-  r2_data_catalog_catalog_target_file_size,
-  r2_data_catalog_compaction_update_params,
-  r2_data_catalog_snapshot_expiration_update_params,
+  r2$$data$$catalog_catalog$$maintenance$$update$$request,
+  r2$$data$$catalog_compaction$$update$$params,
+  r2$$data$$catalog_snapshot$$expiration$$update$$params,
 } from "../../schemas.js";
 
 /**
- * The tools of `basin_catalog.maintenance_configs`.
+ * The tools of `basinCatalog.maintenanceConfigs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "basin_catalog_maintenance_configs_get",
+    name: "basinCatalog_maintenanceConfigs_get",
     title: "Get catalog maintenance configuration",
-    description: "Retrieve the maintenance configuration for a specific catalog,\nincluding compaction settings and credential status.",
+    description: "Retrieve the maintenance configuration for a specific catalog,\nincluding compaction settings and credential status.\n\nGET /accounts/{account_id}/basin-catalog/{bucket_name}/maintenance-configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -71,18 +68,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-compaction-config": r2_data_catalog_catalog_compaction_config_output,
-        "r2-data-catalog_catalog-maintenance-config": r2_data_catalog_catalog_maintenance_config_output,
-        "r2-data-catalog_catalog-maintenance-config-response": r2_data_catalog_catalog_maintenance_config_response_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_credential-status": r2_data_catalog_credential_status_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_snapshot-expiration-config": r2_data_catalog_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog-compaction-config": r2$$data$$catalog_catalog$$compaction$$config,
+        "r2-data-catalog_catalog-maintenance-config": r2$$data$$catalog_catalog$$maintenance$$config,
+        "r2-data-catalog_catalog-maintenance-config-response": r2$$data$$catalog_catalog$$maintenance$$config$$response,
+        "r2-data-catalog_snapshot-expiration-config": r2$$data$$catalog_snapshot$$expiration$$config,
       },
     },
     annotations: {
@@ -134,19 +126,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-compaction-config": r2_data_catalog_catalog_compaction_config_output,
-        "r2-data-catalog_catalog-maintenance-config": r2_data_catalog_catalog_maintenance_config_output,
-        "r2-data-catalog_catalog-maintenance-config-response": r2_data_catalog_catalog_maintenance_config_response_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_credential-status": r2_data_catalog_credential_status_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_snapshot-expiration-config": r2_data_catalog_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog-compaction-config": r2$$data$$catalog_catalog$$compaction$$config,
+        "r2-data-catalog_catalog-maintenance-config": r2$$data$$catalog_catalog$$maintenance$$config,
+        "r2-data-catalog_catalog-maintenance-config-response": r2$$data$$catalog_catalog$$maintenance$$config$$response,
+        "r2-data-catalog_snapshot-expiration-config": r2$$data$$catalog_snapshot$$expiration$$config,
       },
     },
     request: (args) => ({
@@ -154,37 +141,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "basin_catalog_maintenance_configs_update",
+    name: "basinCatalog_maintenanceConfigs_update",
     title: "Update catalog maintenance configuration",
-    description: "Update the maintenance configuration for a catalog. This allows you to\nenable or disable compaction and adjust target file sizes for optimization.",
+    description: "Update the maintenance configuration for a catalog. This allows you to\nenable or disable compaction and adjust target file sizes for optimization.\n\nPOST /accounts/{account_id}/basin-catalog/{bucket_name}/maintenance-configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
         "body": {
           "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-update-request"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state,
-        "r2-data-catalog_catalog-maintenance-update-request": r2_data_catalog_catalog_maintenance_update_request,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size,
-        "r2-data-catalog_compaction-update-params": r2_data_catalog_compaction_update_params,
-        "r2-data-catalog_snapshot-expiration-update-params": r2_data_catalog_snapshot_expiration_update_params,
+        "r2-data-catalog_catalog-maintenance-update-request": r2$$data$$catalog_catalog$$maintenance$$update$$request,
+        "r2-data-catalog_compaction-update-params": r2$$data$$catalog_compaction$$update$$params,
+        "r2-data-catalog_snapshot-expiration-update-params": r2$$data$$catalog_snapshot$$expiration$$update$$params,
       },
     },
     outputSchema: {
@@ -202,16 +195,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-compaction-config": r2_data_catalog_catalog_compaction_config_output,
-        "r2-data-catalog_catalog-maintenance-config": r2_data_catalog_catalog_maintenance_config_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_snapshot-expiration-config": r2_data_catalog_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog-compaction-config": r2$$data$$catalog_catalog$$compaction$$config,
+        "r2-data-catalog_catalog-maintenance-config": r2$$data$$catalog_catalog$$maintenance$$config,
+        "r2-data-catalog_snapshot-expiration-config": r2$$data$$catalog_snapshot$$expiration$$config,
       },
     },
     annotations: {
@@ -262,17 +251,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-compaction-config": r2_data_catalog_catalog_compaction_config_output,
-        "r2-data-catalog_catalog-maintenance-config": r2_data_catalog_catalog_maintenance_config_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_snapshot-expiration-config": r2_data_catalog_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog-compaction-config": r2$$data$$catalog_catalog$$compaction$$config,
+        "r2-data-catalog_catalog-maintenance-config": r2$$data$$catalog_catalog$$maintenance$$config,
+        "r2-data-catalog_snapshot-expiration-config": r2$$data$$catalog_snapshot$$expiration$$config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/basinCatalog/namespaces/tables/maintenanceConfigs/tools.ts b/src/generated/forge-mcp/basinCatalog/namespaces/tables/maintenanceConfigs/tools.ts
index 354b4e501..ffd60f04b 100644
--- a/src/generated/forge-mcp/basinCatalog/namespaces/tables/maintenanceConfigs/tools.ts
+++ b/src/generated/forge-mcp/basinCatalog/namespaces/tables/maintenanceConfigs/tools.ts
@@ -3,69 +3,67 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  r2_data_catalog_api_response_common_failure_output,
-  r2_data_catalog_api_response_errors_output,
-  r2_data_catalog_api_response_messages_output,
-  r2_data_catalog_api_response_single_output,
-  r2_data_catalog_api_response_success_output,
-  r2_data_catalog_catalog_maintenance_state_output,
-  r2_data_catalog_catalog_target_file_size_output,
-  r2_data_catalog_maintenance_interval_output,
-  r2_data_catalog_queue_maintenance_response_output,
-  r2_data_catalog_table_compaction_config_output,
-  r2_data_catalog_table_maintenance_config_output,
-  r2_data_catalog_table_maintenance_config_response_output,
-  r2_data_catalog_table_snapshot_expiration_config_output,
+  r2$$data$$catalog_api$$response$$common$$failure,
+  r2$$data$$catalog_api$$response$$errors,
+  r2$$data$$catalog_api$$response$$messages,
+  r2$$data$$catalog_api$$response$$single,
+  r2$$data$$catalog_queue$$maintenance$$response,
+  r2$$data$$catalog_table$$compaction$$config,
+  r2$$data$$catalog_table$$maintenance$$config,
+  r2$$data$$catalog_table$$maintenance$$config$$response,
+  r2$$data$$catalog_table$$snapshot$$expiration$$config,
 } from "../../../../outputs.js";
 import {
-  r2_data_catalog_account_id,
-  r2_data_catalog_bucket_name,
-  r2_data_catalog_catalog_maintenance_state,
-  r2_data_catalog_catalog_target_file_size,
-  r2_data_catalog_queue_maintenance_request,
-  r2_data_catalog_snapshot_expiration_update_params,
-  r2_data_catalog_table_compaction_update_params,
-  r2_data_catalog_table_maintenance_update_request,
+  r2$$data$$catalog_queue$$maintenance$$request,
+  r2$$data$$catalog_snapshot$$expiration$$update$$params,
+  r2$$data$$catalog_table$$compaction$$update$$params,
+  r2$$data$$catalog_table$$maintenance$$update$$request,
 } from "../../../../schemas.js";
 
 /**
- * The tools of `basin_catalog.namespaces.tables.maintenance_configs`.
+ * The tools of `basinCatalog.namespaces.tables.maintenanceConfigs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "basin_catalog_namespaces_tables_maintenance_configs_get",
+    name: "basinCatalog_namespaces_tables_maintenanceConfigs_get",
     title: "Get table maintenance configuration",
-    description: "Retrieve the maintenance configuration for a specific table,\nincluding compaction settings.",
+    description: "Retrieve the maintenance configuration for a specific table,\nincluding compaction settings.\n\nGET /accounts/{account_id}/basin-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
-        },
-        "namespace": {
-          "description": "The namespace identifier (use %1F as separator for nested namespaces).",
-          "type": "string"
-        },
-        "table_name": {
-          "description": "The table name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "The namespace identifier (use %1F as separator for nested namespaces).",
+              "type": "string"
+            },
+            "table_name": {
+              "description": "The table name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "namespace",
+            "table_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "namespace",
-        "table_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -82,17 +80,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_table-compaction-config": r2_data_catalog_table_compaction_config_output,
-        "r2-data-catalog_table-maintenance-config": r2_data_catalog_table_maintenance_config_output,
-        "r2-data-catalog_table-maintenance-config-response": r2_data_catalog_table_maintenance_config_response_output,
-        "r2-data-catalog_table-snapshot-expiration-config": r2_data_catalog_table_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_table-compaction-config": r2$$data$$catalog_table$$compaction$$config,
+        "r2-data-catalog_table-maintenance-config": r2$$data$$catalog_table$$maintenance$$config,
+        "r2-data-catalog_table-maintenance-config-response": r2$$data$$catalog_table$$maintenance$$config$$response,
+        "r2-data-catalog_table-snapshot-expiration-config": r2$$data$$catalog_table$$snapshot$$expiration$$config,
       },
     },
     annotations: {
@@ -144,18 +138,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_table-compaction-config": r2_data_catalog_table_compaction_config_output,
-        "r2-data-catalog_table-maintenance-config": r2_data_catalog_table_maintenance_config_output,
-        "r2-data-catalog_table-maintenance-config-response": r2_data_catalog_table_maintenance_config_response_output,
-        "r2-data-catalog_table-snapshot-expiration-config": r2_data_catalog_table_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_table-compaction-config": r2$$data$$catalog_table$$compaction$$config,
+        "r2-data-catalog_table-maintenance-config": r2$$data$$catalog_table$$maintenance$$config,
+        "r2-data-catalog_table-maintenance-config-response": r2$$data$$catalog_table$$maintenance$$config$$response,
+        "r2-data-catalog_table-snapshot-expiration-config": r2$$data$$catalog_table$$snapshot$$expiration$$config,
       },
     },
     request: (args) => ({
@@ -163,49 +153,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "basin_catalog_namespaces_tables_maintenance_configs_queue",
+    name: "basinCatalog_namespaces_tables_maintenanceConfigs_queue",
     title: "Queue table maintenance",
-    description: "Queue maintenance for normal polling. This request does not start a run.",
+    description: "Queue maintenance for normal polling. This request does not start a run.\n\nPOST /accounts/{account_id}/basin-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs/{configuration_type}/queue",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Use this to identify the account."
-        },
         "body": {
           "$ref": "#/$defs/r2-data-catalog_queue-maintenance-request"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
-        },
-        "configuration_type": {
-          "enum": [
-            "compaction",
-            "snapshot_expiration"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Use this to identify the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            },
+            "configuration_type": {
+              "enum": [
+                "compaction",
+                "snapshot_expiration"
+              ],
+              "type": "string"
+            },
+            "namespace": {
+              "type": "string"
+            },
+            "table_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "namespace",
+            "table_name",
+            "configuration_type"
           ],
-          "type": "string"
-        },
-        "namespace": {
-          "type": "string"
-        },
-        "table_name": {
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "namespace",
-        "table_name",
-        "configuration_type",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-        "r2-data-catalog_queue-maintenance-request": r2_data_catalog_queue_maintenance_request,
+        "r2-data-catalog_queue-maintenance-request": r2$$data$$catalog_queue$$maintenance$$request,
       },
     },
     outputSchema: {
@@ -223,11 +221,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_queue-maintenance-response": r2_data_catalog_queue_maintenance_response_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_queue-maintenance-response": r2$$data$$catalog_queue$$maintenance$$response,
       },
     },
     annotations: {
@@ -273,12 +270,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_queue-maintenance-response": r2_data_catalog_queue_maintenance_response_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_queue-maintenance-response": r2$$data$$catalog_queue$$maintenance$$response,
       },
     },
     request: (args) => ({
@@ -287,47 +283,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "basin_catalog_namespaces_tables_maintenance_configs_update",
+    name: "basinCatalog_namespaces_tables_maintenanceConfigs_update",
     title: "Update table maintenance configuration",
-    description: "Update the maintenance configuration for a specific table. This allows you to\nenable or disable compaction and adjust target file sizes for optimization.",
+    description: "Update the maintenance configuration for a specific table. This allows you to\nenable or disable compaction and adjust target file sizes for optimization.\n\nPOST /accounts/{account_id}/basin-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
         "body": {
           "$ref": "#/$defs/r2-data-catalog_table-maintenance-update-request"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
-        },
-        "namespace": {
-          "description": "The namespace identifier (use %1F as separator for nested namespaces).",
-          "type": "string"
-        },
-        "table_name": {
-          "description": "The table name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "The namespace identifier (use %1F as separator for nested namespaces).",
+              "type": "string"
+            },
+            "table_name": {
+              "description": "The table name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "namespace",
+            "table_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "namespace",
-        "table_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size,
-        "r2-data-catalog_snapshot-expiration-update-params": r2_data_catalog_snapshot_expiration_update_params,
-        "r2-data-catalog_table-compaction-update-params": r2_data_catalog_table_compaction_update_params,
-        "r2-data-catalog_table-maintenance-update-request": r2_data_catalog_table_maintenance_update_request,
+        "r2-data-catalog_snapshot-expiration-update-params": r2$$data$$catalog_snapshot$$expiration$$update$$params,
+        "r2-data-catalog_table-compaction-update-params": r2$$data$$catalog_table$$compaction$$update$$params,
+        "r2-data-catalog_table-maintenance-update-request": r2$$data$$catalog_table$$maintenance$$update$$request,
       },
     },
     outputSchema: {
@@ -345,16 +347,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_table-compaction-config": r2_data_catalog_table_compaction_config_output,
-        "r2-data-catalog_table-maintenance-config": r2_data_catalog_table_maintenance_config_output,
-        "r2-data-catalog_table-snapshot-expiration-config": r2_data_catalog_table_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_table-compaction-config": r2$$data$$catalog_table$$compaction$$config,
+        "r2-data-catalog_table-maintenance-config": r2$$data$$catalog_table$$maintenance$$config,
+        "r2-data-catalog_table-snapshot-expiration-config": r2$$data$$catalog_table$$snapshot$$expiration$$config,
       },
     },
     annotations: {
@@ -405,17 +403,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_table-compaction-config": r2_data_catalog_table_compaction_config_output,
-        "r2-data-catalog_table-maintenance-config": r2_data_catalog_table_maintenance_config_output,
-        "r2-data-catalog_table-snapshot-expiration-config": r2_data_catalog_table_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_table-compaction-config": r2$$data$$catalog_table$$compaction$$config,
+        "r2-data-catalog_table-maintenance-config": r2$$data$$catalog_table$$maintenance$$config,
+        "r2-data-catalog_table-snapshot-expiration-config": r2$$data$$catalog_table$$snapshot$$expiration$$config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/basinCatalog/namespaces/tables/maintenanceRuns/tools.ts b/src/generated/forge-mcp/basinCatalog/namespaces/tables/maintenanceRuns/tools.ts
index 8a83111a7..6497ef16c 100644
--- a/src/generated/forge-mcp/basinCatalog/namespaces/tables/maintenanceRuns/tools.ts
+++ b/src/generated/forge-mcp/basinCatalog/namespaces/tables/maintenanceRuns/tools.ts
@@ -1,64 +1,71 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  r2_data_catalog_api_response_common_failure_output,
-  r2_data_catalog_api_response_errors_output,
-  r2_data_catalog_api_response_messages_output,
-  r2_data_catalog_api_response_single_output,
-  r2_data_catalog_api_response_success_output,
-  r2_data_catalog_maintenance_run_operation_output,
-  r2_data_catalog_maintenance_run_record_output,
-  r2_data_catalog_maintenance_runs_response_output,
+  r2$$data$$catalog_api$$response$$common$$failure,
+  r2$$data$$catalog_api$$response$$errors,
+  r2$$data$$catalog_api$$response$$messages,
+  r2$$data$$catalog_api$$response$$single,
+  r2$$data$$catalog_maintenance$$run$$operation,
+  r2$$data$$catalog_maintenance$$run$$record,
+  r2$$data$$catalog_maintenance$$runs$$response,
 } from "../../../../outputs.js";
-import {
-  r2_data_catalog_account_id,
-  r2_data_catalog_bucket_name,
-} from "../../../../schemas.js";
 
 /**
- * The tools of `basin_catalog.namespaces.tables.maintenance_runs`.
+ * The tools of `basinCatalog.namespaces.tables.maintenanceRuns`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "basin_catalog_namespaces_tables_maintenance_runs_list",
+    name: "basinCatalog_namespaces_tables_maintenanceRuns_list",
     title: "List table maintenance runs",
-    description: "Retrieves recent table maintenance runs for the current table.",
+    description: "Retrieves recent table maintenance runs for the current table.\n\nGET /accounts/{account_id}/basin-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-runs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Use this to identify the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
-        },
-        "namespace": {
-          "type": "string"
-        },
-        "page_size": {
-          "type": "integer"
-        },
-        "page_token": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Use this to identify the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            },
+            "namespace": {
+              "type": "string"
+            },
+            "table_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "namespace",
+            "table_name"
+          ],
+          "type": "object"
         },
-        "table_name": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_size": {
+              "type": "integer"
+            },
+            "page_token": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "namespace",
-        "table_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -75,13 +82,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_maintenance-run-operation": r2_data_catalog_maintenance_run_operation_output,
-        "r2-data-catalog_maintenance-run-record": r2_data_catalog_maintenance_run_record_output,
-        "r2-data-catalog_maintenance-runs-response": r2_data_catalog_maintenance_runs_response_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_maintenance-run-operation": r2$$data$$catalog_maintenance$$run$$operation,
+        "r2-data-catalog_maintenance-run-record": r2$$data$$catalog_maintenance$$run$$record,
+        "r2-data-catalog_maintenance-runs-response": r2$$data$$catalog_maintenance$$runs$$response,
       },
     },
     annotations: {
@@ -124,21 +130,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_maintenance-run-operation": r2_data_catalog_maintenance_run_operation_output,
-        "r2-data-catalog_maintenance-run-record": r2_data_catalog_maintenance_run_record_output,
-        "r2-data-catalog_maintenance-runs-response": r2_data_catalog_maintenance_runs_response_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_maintenance-run-operation": r2$$data$$catalog_maintenance$$run$$operation,
+        "r2-data-catalog_maintenance-run-record": r2$$data$$catalog_maintenance$$run$$record,
+        "r2-data-catalog_maintenance-runs-response": r2$$data$$catalog_maintenance$$runs$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/basin-catalog/${pathParam(args, "bucket_name")}/namespaces/${pathParam(args, "namespace")}/tables/${pathParam(args, "table_name")}/maintenance-runs`,
       query: [
-        ["page_size", args["page_size"], true],
-        ["page_token", args["page_token"], true],
+        ["page_size", param(args, "query", "page_size"), true],
+        ["page_token", param(args, "query", "page_token"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/basinCatalog/namespaces/tables/tools.ts b/src/generated/forge-mcp/basinCatalog/namespaces/tables/tools.ts
index ba6d44dc1..37156836f 100644
--- a/src/generated/forge-mcp/basinCatalog/namespaces/tables/tools.ts
+++ b/src/generated/forge-mcp/basinCatalog/namespaces/tables/tools.ts
@@ -1,63 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  r2_data_catalog_api_response_common_failure_output,
-  r2_data_catalog_api_response_errors_output,
-  r2_data_catalog_api_response_messages_output,
-  r2_data_catalog_api_response_single_output,
-  r2_data_catalog_api_response_success_output,
-  r2_data_catalog_get_table_response_output,
-  r2_data_catalog_namespace_identifier_output,
-  r2_data_catalog_table_details_output,
-  r2_data_catalog_table_identifier_output,
-  r2_data_catalog_table_list_response_output,
-  r2_data_catalog_table_metadata_output,
+  r2$$data$$catalog_api$$response$$common$$failure,
+  r2$$data$$catalog_api$$response$$errors,
+  r2$$data$$catalog_api$$response$$messages,
+  r2$$data$$catalog_api$$response$$single,
+  r2$$data$$catalog_get$$table$$response,
+  r2$$data$$catalog_namespace$$identifier,
+  r2$$data$$catalog_table$$details,
+  r2$$data$$catalog_table$$identifier,
+  r2$$data$$catalog_table$$list$$response,
+  r2$$data$$catalog_table$$metadata,
 } from "../../../outputs.js";
-import {
-  r2_data_catalog_account_id,
-  r2_data_catalog_bucket_name,
-} from "../../../schemas.js";
 
 /**
- * The tools of `basin_catalog.namespaces.tables`.
+ * The tools of `basinCatalog.namespaces.tables`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "basin_catalog_namespaces_tables_get",
+    name: "basinCatalog_namespaces_tables_get",
     title: "Get table details",
-    description: "Returns full Apache Iceberg metadata for a single table: schema,\npartition specs, sort orders, properties, and recent snapshot history.\nDesigned for catalog introspection UIs that need per-table details\nwithout holding R2 credentials.\n\nThe `metadata.snapshots`, `metadata.snapshot-log`, and\n`metadata.metadata-log` arrays are pruned to the most recent 10\nentries by `timestamp-ms`. Use `total_snapshots` and\n`returned_snapshots` to surface the truncation to end users.",
+    description: "Returns full Apache Iceberg metadata for a single table: schema,\npartition specs, sort orders, properties, and recent snapshot history.\nDesigned for catalog introspection UIs that need per-table details\nwithout holding R2 credentials.\n\nThe `metadata.snapshots`, `metadata.snapshot-log`, and\n`metadata.metadata-log` arrays are pruned to the most recent 10\nentries by `timestamp-ms`. Use `total_snapshots` and\n`returned_snapshots` to surface the truncation to end users.\n\nGET /accounts/{account_id}/basin-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
-        },
-        "namespace": {
-          "description": "The namespace identifier.\nFor nested namespaces, use %1F as separator (e.g., \"bronze%1Fanalytics\").\n",
-          "type": "string"
-        },
-        "table_name": {
-          "description": "The table name within the given namespace.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "The namespace identifier.\nFor nested namespaces, use %1F as separator (e.g., \"bronze%1Fanalytics\").",
+              "type": "string"
+            },
+            "table_name": {
+              "description": "The table name within the given namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "namespace",
+            "table_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "namespace",
-        "table_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -74,14 +75,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_get-table-response": r2_data_catalog_get_table_response_output,
-        "r2-data-catalog_namespace-identifier": r2_data_catalog_namespace_identifier_output,
-        "r2-data-catalog_table-identifier": r2_data_catalog_table_identifier_output,
-        "r2-data-catalog_table-metadata": r2_data_catalog_table_metadata_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_get-table-response": r2$$data$$catalog_get$$table$$response,
+        "r2-data-catalog_namespace-identifier": r2$$data$$catalog_namespace$$identifier,
+        "r2-data-catalog_table-identifier": r2$$data$$catalog_table$$identifier,
+        "r2-data-catalog_table-metadata": r2$$data$$catalog_table$$metadata,
       },
     },
     annotations: {
@@ -133,15 +133,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_get-table-response": r2_data_catalog_get_table_response_output,
-        "r2-data-catalog_namespace-identifier": r2_data_catalog_namespace_identifier_output,
-        "r2-data-catalog_table-identifier": r2_data_catalog_table_identifier_output,
-        "r2-data-catalog_table-metadata": r2_data_catalog_table_metadata_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_get-table-response": r2$$data$$catalog_get$$table$$response,
+        "r2-data-catalog_namespace-identifier": r2$$data$$catalog_namespace$$identifier,
+        "r2-data-catalog_table-identifier": r2$$data$$catalog_table$$identifier,
+        "r2-data-catalog_table-metadata": r2$$data$$catalog_table$$metadata,
       },
     },
     request: (args) => ({
@@ -149,53 +148,65 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "basin_catalog_namespaces_tables_list",
+    name: "basinCatalog_namespaces_tables_list",
     title: "List tables in namespace",
-    description: "Returns a list of tables in the specified namespace within a Basin Catalog.\nSupports pagination for efficient traversal of large table collections.",
+    description: "Returns a list of tables in the specified namespace within a Basin Catalog.\nSupports pagination for efficient traversal of large table collections.\n\nGET /accounts/{account_id}/basin-catalog/{bucket_name}/namespaces/{namespace}/tables",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
-        },
-        "namespace": {
-          "description": "The namespace identifier.\nFor nested namespaces, use %1F as separator (e.g., \"bronze%1Fanalytics\").\n",
-          "type": "string"
-        },
-        "page_size": {
-          "default": 100,
-          "description": "Maximum number of tables to return per page.\nDefaults to 100, maximum 1000.\n",
-          "type": "integer"
-        },
-        "page_token": {
-          "description": "Opaque pagination token from a previous response.\nUse this to fetch the next page of results.\n",
-          "type": "string"
-        },
-        "return_details": {
-          "default": false,
-          "description": "Whether to include additional metadata (timestamps, locations).\nWhen true, response includes created_at, updated_at, metadata_locations, and locations arrays.\n",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            },
+            "namespace": {
+              "description": "The namespace identifier.\nFor nested namespaces, use %1F as separator (e.g., \"bronze%1Fanalytics\").",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "namespace"
+          ],
+          "type": "object"
         },
-        "return_uuids": {
-          "default": false,
-          "description": "Whether to include table UUIDs in the response.\nSet to true to receive the table_uuids array.\n",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_size": {
+              "default": 100,
+              "description": "Maximum number of tables to return per page.\nDefaults to 100, maximum 1000.",
+              "type": "integer"
+            },
+            "page_token": {
+              "description": "Opaque pagination token from a previous response.\nUse this to fetch the next page of results.",
+              "type": "string"
+            },
+            "return_details": {
+              "default": false,
+              "description": "Whether to include additional metadata (timestamps, locations).\nWhen true, response includes created_at, updated_at, metadata_locations, and locations arrays.",
+              "type": "boolean"
+            },
+            "return_uuids": {
+              "default": false,
+              "description": "Whether to include table UUIDs in the response.\nSet to true to receive the table_uuids array.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "namespace"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -212,14 +223,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_namespace-identifier": r2_data_catalog_namespace_identifier_output,
-        "r2-data-catalog_table-details": r2_data_catalog_table_details_output,
-        "r2-data-catalog_table-identifier": r2_data_catalog_table_identifier_output,
-        "r2-data-catalog_table-list-response": r2_data_catalog_table_list_response_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_namespace-identifier": r2$$data$$catalog_namespace$$identifier,
+        "r2-data-catalog_table-details": r2$$data$$catalog_table$$details,
+        "r2-data-catalog_table-identifier": r2$$data$$catalog_table$$identifier,
+        "r2-data-catalog_table-list-response": r2$$data$$catalog_table$$list$$response,
       },
     },
     annotations: {
@@ -271,24 +281,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_namespace-identifier": r2_data_catalog_namespace_identifier_output,
-        "r2-data-catalog_table-details": r2_data_catalog_table_details_output,
-        "r2-data-catalog_table-identifier": r2_data_catalog_table_identifier_output,
-        "r2-data-catalog_table-list-response": r2_data_catalog_table_list_response_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_namespace-identifier": r2$$data$$catalog_namespace$$identifier,
+        "r2-data-catalog_table-details": r2$$data$$catalog_table$$details,
+        "r2-data-catalog_table-identifier": r2$$data$$catalog_table$$identifier,
+        "r2-data-catalog_table-list-response": r2$$data$$catalog_table$$list$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/basin-catalog/${pathParam(args, "bucket_name")}/namespaces/${pathParam(args, "namespace")}/tables`,
       query: [
-        ["page_token", args["page_token"], true],
-        ["page_size", args["page_size"], true],
-        ["return_uuids", args["return_uuids"], true],
-        ["return_details", args["return_details"], true],
+        ["page_token", param(args, "query", "page_token"), true],
+        ["page_size", param(args, "query", "page_size"), true],
+        ["return_uuids", param(args, "query", "return_uuids"), true],
+        ["return_details", param(args, "query", "return_details"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/basinCatalog/namespaces/tools.ts b/src/generated/forge-mcp/basinCatalog/namespaces/tools.ts
index 4366cf01e..edaea6d2d 100644
--- a/src/generated/forge-mcp/basinCatalog/namespaces/tools.ts
+++ b/src/generated/forge-mcp/basinCatalog/namespaces/tools.ts
@@ -1,73 +1,80 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  r2_data_catalog_api_response_common_failure_output,
-  r2_data_catalog_api_response_errors_output,
-  r2_data_catalog_api_response_messages_output,
-  r2_data_catalog_api_response_single_output,
-  r2_data_catalog_api_response_success_output,
-  r2_data_catalog_namespace_details_output,
-  r2_data_catalog_namespace_identifier_output,
-  r2_data_catalog_namespace_list_response_output,
+  r2$$data$$catalog_api$$response$$common$$failure,
+  r2$$data$$catalog_api$$response$$errors,
+  r2$$data$$catalog_api$$response$$messages,
+  r2$$data$$catalog_api$$response$$single,
+  r2$$data$$catalog_namespace$$details,
+  r2$$data$$catalog_namespace$$identifier,
+  r2$$data$$catalog_namespace$$list$$response,
 } from "../../outputs.js";
-import {
-  r2_data_catalog_account_id,
-  r2_data_catalog_bucket_name,
-} from "../../schemas.js";
 
 /**
- * The tools of `basin_catalog.namespaces`.
+ * The tools of `basinCatalog.namespaces`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "basin_catalog_namespaces_list",
+    name: "basinCatalog_namespaces_list",
     title: "List namespaces in catalog",
-    description: "Returns a list of namespaces in the specified Basin Catalog.\nSupports hierarchical filtering and pagination for efficient traversal\nof large namespace hierarchies.",
+    description: "Returns a list of namespaces in the specified Basin Catalog.\nSupports hierarchical filtering and pagination for efficient traversal\nof large namespace hierarchies.\n\nGET /accounts/{account_id}/basin-catalog/{bucket_name}/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
-        },
-        "page_size": {
-          "default": 100,
-          "description": "Maximum number of namespaces to return per page.\nDefaults to 100, maximum 1000.\n",
-          "type": "integer"
-        },
-        "page_token": {
-          "description": "Opaque pagination token from a previous response.\nUse this to fetch the next page of results.\n",
-          "type": "string"
-        },
-        "parent": {
-          "description": "Parent namespace to filter by. Only returns direct children of this namespace.\nFor nested namespaces, use %1F as separator (e.g., \"bronze%1Fanalytics\").\nOmit this parameter to list top-level namespaces.\n",
-          "type": "string"
-        },
-        "return_details": {
-          "default": false,
-          "description": "Whether to include additional metadata (timestamps).\nWhen true, response includes created_at and updated_at arrays.\n",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         },
-        "return_uuids": {
-          "default": false,
-          "description": "Whether to include namespace UUIDs in the response.\nSet to true to receive the namespace_uuids array.\n",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_size": {
+              "default": 100,
+              "description": "Maximum number of namespaces to return per page.\nDefaults to 100, maximum 1000.",
+              "type": "integer"
+            },
+            "page_token": {
+              "description": "Opaque pagination token from a previous response.\nUse this to fetch the next page of results.",
+              "type": "string"
+            },
+            "parent": {
+              "description": "Parent namespace to filter by. Only returns direct children of this namespace.\nFor nested namespaces, use %1F as separator (e.g., \"bronze%1Fanalytics\").\nOmit this parameter to list top-level namespaces.",
+              "type": "string"
+            },
+            "return_details": {
+              "default": false,
+              "description": "Whether to include additional metadata (timestamps).\nWhen true, response includes created_at and updated_at arrays.",
+              "type": "boolean"
+            },
+            "return_uuids": {
+              "default": false,
+              "description": "Whether to include namespace UUIDs in the response.\nSet to true to receive the namespace_uuids array.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -84,13 +91,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_namespace-details": r2_data_catalog_namespace_details_output,
-        "r2-data-catalog_namespace-identifier": r2_data_catalog_namespace_identifier_output,
-        "r2-data-catalog_namespace-list-response": r2_data_catalog_namespace_list_response_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_namespace-details": r2$$data$$catalog_namespace$$details,
+        "r2-data-catalog_namespace-identifier": r2$$data$$catalog_namespace$$identifier,
+        "r2-data-catalog_namespace-list-response": r2$$data$$catalog_namespace$$list$$response,
       },
     },
     annotations: {
@@ -142,24 +148,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_namespace-details": r2_data_catalog_namespace_details_output,
-        "r2-data-catalog_namespace-identifier": r2_data_catalog_namespace_identifier_output,
-        "r2-data-catalog_namespace-list-response": r2_data_catalog_namespace_list_response_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_namespace-details": r2$$data$$catalog_namespace$$details,
+        "r2-data-catalog_namespace-identifier": r2$$data$$catalog_namespace$$identifier,
+        "r2-data-catalog_namespace-list-response": r2$$data$$catalog_namespace$$list$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/basin-catalog/${pathParam(args, "bucket_name")}/namespaces`,
       query: [
-        ["page_token", args["page_token"], true],
-        ["page_size", args["page_size"], true],
-        ["parent", args["parent"], true],
-        ["return_uuids", args["return_uuids"], true],
-        ["return_details", args["return_details"], true],
+        ["page_token", param(args, "query", "page_token"), true],
+        ["page_size", param(args, "query", "page_size"), true],
+        ["parent", param(args, "query", "parent"), true],
+        ["return_uuids", param(args, "query", "return_uuids"), true],
+        ["return_details", param(args, "query", "return_details"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/basinCatalog/tools.ts b/src/generated/forge-mcp/basinCatalog/tools.ts
index 9ac7fe8f1..6ebc6511e 100644
--- a/src/generated/forge-mcp/basinCatalog/tools.ts
+++ b/src/generated/forge-mcp/basinCatalog/tools.ts
@@ -1,65 +1,69 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  r2_data_catalog_api_response_common_failure_output,
-  r2_data_catalog_api_response_errors_output,
-  r2_data_catalog_api_response_messages_output,
-  r2_data_catalog_api_response_single_output,
-  r2_data_catalog_api_response_success_output,
-  r2_data_catalog_catalog_activation_response_output,
-  r2_data_catalog_catalog_compaction_config_output,
-  r2_data_catalog_catalog_list_output,
-  r2_data_catalog_catalog_maintenance_config_output,
-  r2_data_catalog_catalog_maintenance_state_output,
-  r2_data_catalog_catalog_output,
-  r2_data_catalog_catalog_status_output,
-  r2_data_catalog_catalog_target_file_size_output,
-  r2_data_catalog_credential_status_output,
-  r2_data_catalog_maintenance_interval_output,
-  r2_data_catalog_snapshot_expiration_config_output,
+  r2$$data$$catalog_api$$response$$common$$failure,
+  r2$$data$$catalog_api$$response$$errors,
+  r2$$data$$catalog_api$$response$$messages,
+  r2$$data$$catalog_api$$response$$single,
+  r2$$data$$catalog_catalog,
+  r2$$data$$catalog_catalog$$activation$$response,
+  r2$$data$$catalog_catalog$$compaction$$config,
+  r2$$data$$catalog_catalog$$list,
+  r2$$data$$catalog_catalog$$maintenance$$config,
+  r2$$data$$catalog_snapshot$$expiration$$config,
 } from "../outputs.js";
 import {
-  r2_data_catalog_account_id,
-  r2_data_catalog_bucket_name,
-  r2_data_catalog_catalog_activation_request,
-  r2_data_catalog_catalog_credential_request,
+  r2$$data$$catalog_catalog$$activation$$request,
+  r2$$data$$catalog_catalog$$credential$$request,
 } from "../schemas.js";
 
 /**
- * The tools of `basin_catalog`.
+ * The tools of `basinCatalog`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "basin_catalog_delete",
+    name: "basinCatalog_delete",
     title: "Delete Basin Catalog metadata",
-    description: "Removes the catalog from the control plane without deleting R2 bucket objects.\nSet force=true to remove catalog namespaces, tables, views, and maintenance\nmetadata. Force deletion is limited to a configured catalog object count.\n\nConfirm with the user before calling this tool. This removes catalog metadata. R2 bucket objects are retained.",
+    description: "Removes the catalog from the control plane without deleting R2 bucket objects.\nSet force=true to remove catalog namespaces, tables, views, and maintenance\nmetadata. Force deletion is limited to a configured catalog object count.\n\nConfirm with the user before calling this tool. This removes catalog metadata. R2 bucket objects are retained.\n\nPOST /accounts/{account_id}/basin-catalog/{bucket_name}/delete",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Use this to identify the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Use this to identify the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         },
-        "cascade": {
-          "default": false,
-          "description": "Remove child metadata before deleting the catalog.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "force": {
+              "default": false,
+              "description": "Remove child metadata before deleting the catalog.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -89,40 +93,46 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/basin-catalog/${pathParam(args, "bucket_name")}/delete`,
       query: [
-        ["force", args["cascade"], true],
+        ["force", param(args, "query", "force"), true],
       ],
     }),
   },
   {
-    name: "basin_catalog_disable",
+    name: "basinCatalog_disable",
     title: "Disable Basin Catalog",
-    description: "Disable an R2 bucket as a catalog. This operation deactivates the catalog\nbut preserves existing metadata and data files. The catalog can be\nre-enabled later.\n\nConfirm with the user before calling this tool. This operation turns off the data catalog for the bucket. Existing namespace or table state remains, but writes stop.",
+    description: "Disable an R2 bucket as a catalog. This operation deactivates the catalog\nbut preserves existing metadata and data files. The catalog can be\nre-enabled later.\n\nConfirm with the user before calling this tool. This operation turns off the data catalog for the bucket. Existing namespace or table state remains, but writes stop.\n\nPOST /accounts/{account_id}/basin-catalog/{bucket_name}/disable",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name to disable as catalog."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name to disable as catalog.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -158,7 +168,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
       },
     },
     request: (args) => ({
@@ -166,33 +176,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "basin_catalog_enable",
+    name: "basinCatalog_enable",
     title: "Enable R2 bucket as a catalog",
-    description: "Enable an R2 bucket as an Apache Iceberg catalog. This operation creates\nthe necessary catalog infrastructure and activates the bucket for storing\nIceberg metadata and data files.",
+    description: "Enable an R2 bucket as an Apache Iceberg catalog. This operation creates\nthe necessary catalog infrastructure and activates the bucket for storing\nIceberg metadata and data files.\n\nPOST /accounts/{account_id}/basin-catalog/{bucket_name}/enable",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
         "body": {
           "$ref": "#/$defs/r2-data-catalog_catalog-activation-request"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name to enable as catalog."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name to enable as catalog.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-        "r2-data-catalog_catalog-activation-request": r2_data_catalog_catalog_activation_request,
-        "r2-data-catalog_catalog-credential-request": r2_data_catalog_catalog_credential_request,
+        "r2-data-catalog_catalog-activation-request": r2$$data$$catalog_catalog$$activation$$request,
+        "r2-data-catalog_catalog-credential-request": r2$$data$$catalog_catalog$$credential$$request,
       },
     },
     outputSchema: {
@@ -210,11 +228,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-activation-response": r2_data_catalog_catalog_activation_response_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog-activation-response": r2$$data$$catalog_catalog$$activation$$response,
       },
     },
     annotations: {
@@ -268,12 +285,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog-activation-response": r2_data_catalog_catalog_activation_response_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog-activation-response": r2$$data$$catalog_catalog$$activation$$response,
       },
     },
     request: (args) => ({
@@ -282,29 +298,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "basin_catalog_get",
+    name: "basinCatalog_get",
     title: "Get Basin Catalog details",
-    description: "Retrieve detailed information about a specific Basin Catalog by bucket name.\nReturns catalog status, maintenance configuration, and credential status.",
+    description: "Retrieve detailed information about a specific Basin Catalog by bucket name.\nReturns catalog status, maintenance configuration, and credential status.\n\nGET /accounts/{account_id}/basin-catalog/{bucket_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2-data-catalog_bucket-name",
-          "description": "Specifies the R2 bucket name."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Specifies the R2 bucket name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-        "r2-data-catalog_bucket-name": r2_data_catalog_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -321,19 +343,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog": r2_data_catalog_catalog_output,
-        "r2-data-catalog_catalog-compaction-config": r2_data_catalog_catalog_compaction_config_output,
-        "r2-data-catalog_catalog-maintenance-config": r2_data_catalog_catalog_maintenance_config_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-status": r2_data_catalog_catalog_status_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_credential-status": r2_data_catalog_credential_status_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_snapshot-expiration-config": r2_data_catalog_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog": r2$$data$$catalog_catalog,
+        "r2-data-catalog_catalog-compaction-config": r2$$data$$catalog_catalog$$compaction$$config,
+        "r2-data-catalog_catalog-maintenance-config": r2$$data$$catalog_catalog$$maintenance$$config,
+        "r2-data-catalog_snapshot-expiration-config": r2$$data$$catalog_snapshot$$expiration$$config,
       },
     },
     annotations: {
@@ -385,20 +401,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog": r2_data_catalog_catalog_output,
-        "r2-data-catalog_catalog-compaction-config": r2_data_catalog_catalog_compaction_config_output,
-        "r2-data-catalog_catalog-maintenance-config": r2_data_catalog_catalog_maintenance_config_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-status": r2_data_catalog_catalog_status_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_credential-status": r2_data_catalog_credential_status_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_snapshot-expiration-config": r2_data_catalog_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog": r2$$data$$catalog_catalog,
+        "r2-data-catalog_catalog-compaction-config": r2$$data$$catalog_catalog$$compaction$$config,
+        "r2-data-catalog_catalog-maintenance-config": r2$$data$$catalog_catalog$$maintenance$$config,
+        "r2-data-catalog_snapshot-expiration-config": r2$$data$$catalog_snapshot$$expiration$$config,
       },
     },
     request: (args) => ({
@@ -406,23 +416,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "basin_catalog_list",
+    name: "basinCatalog_list",
     title: "List Basin Catalogs",
-    description: "Returns a list of R2 buckets that have been enabled as Apache Iceberg catalogs\nfor the specified account. Each catalog represents an R2 bucket configured\nto store Iceberg metadata and data files.",
+    description: "Returns a list of R2 buckets that have been enabled as Apache Iceberg catalogs\nfor the specified account. Each catalog represents an R2 bucket configured\nto store Iceberg metadata and data files.\n\nGET /accounts/{account_id}/basin-catalog",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2-data-catalog_account-id",
-          "description": "Identifies the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "r2-data-catalog_account-id": r2_data_catalog_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -439,20 +456,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog": r2_data_catalog_catalog_output,
-        "r2-data-catalog_catalog-compaction-config": r2_data_catalog_catalog_compaction_config_output,
-        "r2-data-catalog_catalog-list": r2_data_catalog_catalog_list_output,
-        "r2-data-catalog_catalog-maintenance-config": r2_data_catalog_catalog_maintenance_config_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-status": r2_data_catalog_catalog_status_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_credential-status": r2_data_catalog_credential_status_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_snapshot-expiration-config": r2_data_catalog_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog": r2$$data$$catalog_catalog,
+        "r2-data-catalog_catalog-compaction-config": r2$$data$$catalog_catalog$$compaction$$config,
+        "r2-data-catalog_catalog-list": r2$$data$$catalog_catalog$$list,
+        "r2-data-catalog_catalog-maintenance-config": r2$$data$$catalog_catalog$$maintenance$$config,
+        "r2-data-catalog_snapshot-expiration-config": r2$$data$$catalog_snapshot$$expiration$$config,
       },
     },
     annotations: {
@@ -501,21 +512,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-data-catalog_api-response-common-failure": r2_data_catalog_api_response_common_failure_output,
-        "r2-data-catalog_api-response-errors": r2_data_catalog_api_response_errors_output,
-        "r2-data-catalog_api-response-messages": r2_data_catalog_api_response_messages_output,
-        "r2-data-catalog_api-response-single": r2_data_catalog_api_response_single_output,
-        "r2-data-catalog_api-response-success": r2_data_catalog_api_response_success_output,
-        "r2-data-catalog_catalog": r2_data_catalog_catalog_output,
-        "r2-data-catalog_catalog-compaction-config": r2_data_catalog_catalog_compaction_config_output,
-        "r2-data-catalog_catalog-list": r2_data_catalog_catalog_list_output,
-        "r2-data-catalog_catalog-maintenance-config": r2_data_catalog_catalog_maintenance_config_output,
-        "r2-data-catalog_catalog-maintenance-state": r2_data_catalog_catalog_maintenance_state_output,
-        "r2-data-catalog_catalog-status": r2_data_catalog_catalog_status_output,
-        "r2-data-catalog_catalog-target-file-size": r2_data_catalog_catalog_target_file_size_output,
-        "r2-data-catalog_credential-status": r2_data_catalog_credential_status_output,
-        "r2-data-catalog_maintenance-interval": r2_data_catalog_maintenance_interval_output,
-        "r2-data-catalog_snapshot-expiration-config": r2_data_catalog_snapshot_expiration_config_output,
+        "r2-data-catalog_api-response-common-failure": r2$$data$$catalog_api$$response$$common$$failure,
+        "r2-data-catalog_api-response-errors": r2$$data$$catalog_api$$response$$errors,
+        "r2-data-catalog_api-response-messages": r2$$data$$catalog_api$$response$$messages,
+        "r2-data-catalog_api-response-single": r2$$data$$catalog_api$$response$$single,
+        "r2-data-catalog_catalog": r2$$data$$catalog_catalog,
+        "r2-data-catalog_catalog-compaction-config": r2$$data$$catalog_catalog$$compaction$$config,
+        "r2-data-catalog_catalog-list": r2$$data$$catalog_catalog$$list,
+        "r2-data-catalog_catalog-maintenance-config": r2$$data$$catalog_catalog$$maintenance$$config,
+        "r2-data-catalog_snapshot-expiration-config": r2$$data$$catalog_snapshot$$expiration$$config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/billing/addresses/outputs.ts b/src/generated/forge-mcp/billing/addresses/outputs.ts
index 04a9f39c1..0c8b7e48a 100644
--- a/src/generated/forge-mcp/billing/addresses/outputs.ts
+++ b/src/generated/forge-mcp/billing/addresses/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `bill-subs-api_address_validation_response_single` in
  * responses.
  */
-export const bill_subs_api_address_validation_response_single_output: JsonSchema = {
+export const bill$$subs$$api_address_validation_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
@@ -34,7 +34,7 @@ export const bill_subs_api_address_validation_response_single_output: JsonSchema
 /**
  * The schema of `bill-subs-api_validated_address` in responses.
  */
-export const bill_subs_api_validated_address_output: JsonSchema = {
+export const bill$$subs$$api_validated_address: JsonSchema = {
   "properties": {
     "address": {
       "type": "string"
diff --git a/src/generated/forge-mcp/billing/addresses/schemas.ts b/src/generated/forge-mcp/billing/addresses/schemas.ts
index 8ed1c5560..2692be03e 100644
--- a/src/generated/forge-mcp/billing/addresses/schemas.ts
+++ b/src/generated/forge-mcp/billing/addresses/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bill-subs-api_address_validation_request`.
  */
-export const bill_subs_api_address_validation_request: JsonSchema = {
+export const bill$$subs$$api_address_validation_request: JsonSchema = {
   "properties": {
     "address": {
       "description": "Address line 1.",
diff --git a/src/generated/forge-mcp/billing/addresses/tools.ts b/src/generated/forge-mcp/billing/addresses/tools.ts
index e74d1b7e3..e6406af40 100644
--- a/src/generated/forge-mcp/billing/addresses/tools.ts
+++ b/src/generated/forge-mcp/billing/addresses/tools.ts
@@ -3,16 +3,16 @@
 
 import type { Tool } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_messages_output,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_messages,
 } from "../../outputs.js";
 import {
-  bill_subs_api_address_validation_response_single_output,
-  bill_subs_api_validated_address_output,
+  bill$$subs$$api_address_validation_response_single,
+  bill$$subs$$api_validated_address,
 } from "./outputs.js";
-import { bill_subs_api_address_validation_request } from "./schemas.js";
+import { bill$$subs$$api_address_validation_request } from "./schemas.js";
 
 /**
  * The tools of `billing.addresses`.
@@ -21,7 +21,7 @@ export const tools: readonly Tool[] = [
   {
     name: "billing_addresses_validate",
     title: "Validate Billing Address",
-    description: "Validates a billing address and returns validated address suggestions. Authentication is not enforced to support pre-signup address validation flows, so credentials are accepted but not required.",
+    description: "Validates a billing address and returns validated address suggestions. Authentication is not enforced to support pre-signup address validation flows, so credentials are accepted but not required.\n\nPOST /billing/address-validation",
     inputSchema: {
       type: "object",
       properties: {
@@ -32,18 +32,19 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_address_validation_request": bill_subs_api_address_validation_request,
+        "bill-subs-api_address_validation_request": bill$$subs$$api_address_validation_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_address_validation_response_single",
       $defs: {
-        "bill-subs-api_address_validation_response_single": bill_subs_api_address_validation_response_single_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_validated_address": bill_subs_api_validated_address_output,
+        "bill-subs-api_address_validation_response_single": bill$$subs$$api_address_validation_response_single,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_validated_address": bill$$subs$$api_validated_address,
       },
     },
     annotations: {
@@ -73,12 +74,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_address_validation_response_single": bill_subs_api_address_validation_response_single_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_validated_address": bill_subs_api_validated_address_output,
+        "bill-subs-api_address_validation_response_single": bill$$subs$$api_address_validation_response_single,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_validated_address": bill$$subs$$api_validated_address,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/billing/profiles/outputs.ts b/src/generated/forge-mcp/billing/profiles/outputs.ts
index 5a49a3392..2be4806f5 100644
--- a/src/generated/forge-mcp/billing/profiles/outputs.ts
+++ b/src/generated/forge-mcp/billing/profiles/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bill-subs-api_payment_intent_response_single` in responses.
  */
-export const bill_subs_api_payment_intent_response_single_output: JsonSchema = {
+export const bill$$subs$$api_payment_intent_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
diff --git a/src/generated/forge-mcp/billing/profiles/schemas.ts b/src/generated/forge-mcp/billing/profiles/schemas.ts
index fe837ccbe..1b490bf6e 100644
--- a/src/generated/forge-mcp/billing/profiles/schemas.ts
+++ b/src/generated/forge-mcp/billing/profiles/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bill-subs-api_billing_profile_request`.
  */
-export const bill_subs_api_billing_profile_request: JsonSchema = {
+export const bill$$subs$$api_billing_profile_request: JsonSchema = {
   "description": "Request body for creating or updating a billing profile.",
   "properties": {
     "address": {
diff --git a/src/generated/forge-mcp/billing/profiles/tools.ts b/src/generated/forge-mcp/billing/profiles/tools.ts
index ac90b9b85..419c2abd8 100644
--- a/src/generated/forge-mcp/billing/profiles/tools.ts
+++ b/src/generated/forge-mcp/billing/profiles/tools.ts
@@ -3,16 +3,14 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_billing_response_single_output,
-  bill_subs_api_components_schemas_identifier_output,
-  bill_subs_api_messages_output,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_billing_response_single,
+  bill$$subs$$api_messages,
 } from "../../outputs.js";
-import { bill_subs_api_identifier } from "../../schemas.js";
-import { bill_subs_api_payment_intent_response_single_output } from "./outputs.js";
-import { bill_subs_api_billing_profile_request } from "./schemas.js";
+import { bill$$subs$$api_payment_intent_response_single } from "./outputs.js";
+import { bill$$subs$$api_billing_profile_request } from "./schemas.js";
 
 /**
  * The tools of `billing.profiles`.
@@ -21,35 +19,43 @@ export const tools: readonly Tool[] = [
   {
     name: "billing_profiles_create",
     title: "Create Billing Profile",
-    description: "Creates a billing profile for an account.",
+    description: "Creates a billing profile for an account.\n\nPOST /accounts/{account_id}/billing/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/bill-subs-api_billing_profile_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_billing_profile_request": bill_subs_api_billing_profile_request,
-        "bill-subs-api_identifier": bill_subs_api_identifier,
+        "bill-subs-api_billing_profile_request": bill$$subs$$api_billing_profile_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_billing_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_billing_response_single": bill_subs_api_billing_response_single_output,
-        "bill-subs-api_components-schemas-identifier": bill_subs_api_components_schemas_identifier_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_billing_response_single": bill$$subs$$api_billing_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -88,12 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_billing_response_single": bill_subs_api_billing_response_single_output,
-        "bill-subs-api_components-schemas-identifier": bill_subs_api_components_schemas_identifier_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_billing_response_single": bill$$subs$$api_billing_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -102,31 +107,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "billing_profiles_create_payment_intent",
+    name: "billing_profiles_createPaymentIntent",
     title: "Create Payment Intent for Billing Profile",
-    description: "Creates a Stripe payment intent for adding or updating a payment method on the account's billing profile. Returns a client secret for frontend payment method collection.",
+    description: "Creates a Stripe payment intent for adding or updating a payment method on the account's billing profile. Returns a client secret for frontend payment method collection.\n\nPOST /accounts/{account_id}/billing/profile/payment-method",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_payment_intent_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_intent_response_single": bill_subs_api_payment_intent_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_intent_response_single": bill$$subs$$api_payment_intent_response_single,
       },
     },
     annotations: {
@@ -159,11 +171,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_payment_intent_response_single": bill_subs_api_payment_intent_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_payment_intent_response_single": bill$$subs$$api_payment_intent_response_single,
       },
     },
     request: (args) => ({
@@ -173,21 +185,28 @@ export const tools: readonly Tool[] = [
   {
     name: "billing_profiles_delete",
     title: "Delete Billing Profile",
-    description: "Deletes the billing profile for an account.",
+    description: "Deletes the billing profile for an account.\n\nDELETE /accounts/{account_id}/billing/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -222,8 +241,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -233,30 +252,36 @@ export const tools: readonly Tool[] = [
   {
     name: "billing_profiles_get",
     title: "Get Billing Profile",
-    description: "Gets the current billing profile for the account.",
+    description: "Gets the current billing profile for the account.\n\nGET /accounts/{account_id}/billing/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_billing_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_billing_response_single": bill_subs_api_billing_response_single_output,
-        "bill-subs-api_components-schemas-identifier": bill_subs_api_components_schemas_identifier_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_billing_response_single": bill$$subs$$api_billing_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -295,12 +320,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_billing_response_single": bill_subs_api_billing_response_single_output,
-        "bill-subs-api_components-schemas-identifier": bill_subs_api_components_schemas_identifier_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_billing_response_single": bill$$subs$$api_billing_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -310,35 +334,43 @@ export const tools: readonly Tool[] = [
   {
     name: "billing_profiles_update",
     title: "Update Billing Profile",
-    description: "Updates the billing profile for an account.",
+    description: "Updates the billing profile for an account.\n\nPUT /accounts/{account_id}/billing/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/bill-subs-api_billing_profile_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_billing_profile_request": bill_subs_api_billing_profile_request,
-        "bill-subs-api_identifier": bill_subs_api_identifier,
+        "bill-subs-api_billing_profile_request": bill$$subs$$api_billing_profile_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_billing_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_billing_response_single": bill_subs_api_billing_response_single_output,
-        "bill-subs-api_components-schemas-identifier": bill_subs_api_components_schemas_identifier_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_billing_response_single": bill$$subs$$api_billing_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -377,12 +409,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_billing_response_single": bill_subs_api_billing_response_single_output,
-        "bill-subs-api_components-schemas-identifier": bill_subs_api_components_schemas_identifier_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_billing_response_single": bill$$subs$$api_billing_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -391,16 +422,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "billing_profiles_update_email",
+    name: "billing_profiles_updateEmail",
     title: "Update Billing Email",
-    description: "Updates the billing email addresses and preferred locale for an account.",
+    description: "Updates the billing email addresses and preferred locale for an account.\n\nPATCH /accounts/{account_id}/billing/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "properties": {
             "billing_email": {
@@ -414,24 +441,34 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_billing_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_billing_response_single": bill_subs_api_billing_response_single_output,
-        "bill-subs-api_components-schemas-identifier": bill_subs_api_components_schemas_identifier_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_billing_response_single": bill$$subs$$api_billing_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -470,12 +507,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_billing_response_single": bill_subs_api_billing_response_single_output,
-        "bill-subs-api_components-schemas-identifier": bill_subs_api_components_schemas_identifier_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_billing_response_single": bill$$subs$$api_billing_response_single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/billing/ratePlans/outputs.ts b/src/generated/forge-mcp/billing/ratePlans/outputs.ts
index e23ed1a59..652b16ce9 100644
--- a/src/generated/forge-mcp/billing/ratePlans/outputs.ts
+++ b/src/generated/forge-mcp/billing/ratePlans/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bill-subs-api_rate_plan_simple_response` in responses.
  */
-export const bill_subs_api_rate_plan_simple_response_output: JsonSchema = {
+export const bill$$subs$$api_rate_plan_simple_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
diff --git a/src/generated/forge-mcp/billing/ratePlans/tools.ts b/src/generated/forge-mcp/billing/ratePlans/tools.ts
index b90a68617..8d9f58c61 100644
--- a/src/generated/forge-mcp/billing/ratePlans/tools.ts
+++ b/src/generated/forge-mcp/billing/ratePlans/tools.ts
@@ -3,40 +3,50 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_messages_output,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_messages,
 } from "../../outputs.js";
-import { bill_subs_api_rate_plan_simple_response_output } from "./outputs.js";
+import { bill$$subs$$api_rate_plan_simple_response } from "./outputs.js";
 
 /**
- * The tools of `billing.rate_plans`.
+ * The tools of `billing.ratePlans`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "billing_rate_plans_get",
+    name: "billing_ratePlans_get",
     title: "Get Rate Plan by Public Key",
-    description: "Gets a rate plan's details by its public key (e.g., 'teams_free', 'cf_pro_20_20'). This is a public catalog endpoint, so authentication is not enforced and credentials are accepted but not required.",
+    description: "Gets a rate plan's details by its public key (e.g., 'teams_free', 'cf_pro_20_20'). This is a public catalog endpoint, so authentication is not enforced and credentials are accepted but not required.\n\nGET /billing/rate_plans/{public_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "public_key": {
-          "description": "The public key identifier for the rate plan.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "public_key": {
+              "description": "The public key identifier for the rate plan.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "public_key"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "public_key"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_rate_plan_simple_response",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_rate_plan_simple_response": bill_subs_api_rate_plan_simple_response_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan_simple_response": bill$$subs$$api_rate_plan_simple_response,
       },
     },
     annotations: {
@@ -66,11 +76,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_rate_plan_simple_response": bill_subs_api_rate_plan_simple_response_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan_simple_response": bill$$subs$$api_rate_plan_simple_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/billing/spendPolicies/activity/outputs.ts b/src/generated/forge-mcp/billing/spendPolicies/activity/outputs.ts
index 1b7672249..3e8b7d8a4 100644
--- a/src/generated/forge-mcp/billing/spendPolicies/activity/outputs.ts
+++ b/src/generated/forge-mcp/billing/spendPolicies/activity/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `billing-spend-policies_policy_activity_event` in responses.
  */
-export const billing_spend_policies_policy_activity_event_output: JsonSchema = {
+export const billing$$spend$$policies_policy_activity_event: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -47,7 +47,8 @@ export const billing_spend_policies_policy_activity_event_output: JsonSchema = {
       "type": "string"
     },
     "policy_id": {
-      "$ref": "#/$defs/billing-spend-policies_policy_id"
+      "format": "uuid",
+      "type": "string"
     },
     "policy_version": {
       "type": "integer"
@@ -72,7 +73,7 @@ export const billing_spend_policies_policy_activity_event_output: JsonSchema = {
 /**
  * The schema of `billing-spend-policies_policy_activity_response` in responses.
  */
-export const billing_spend_policies_policy_activity_response_output: JsonSchema = {
+export const billing$$spend$$policies_policy_activity_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/billing-spend-policies_api-response-common-success"
diff --git a/src/generated/forge-mcp/billing/spendPolicies/activity/tools.ts b/src/generated/forge-mcp/billing/spendPolicies/activity/tools.ts
index 18509ed65..71e1f7372 100644
--- a/src/generated/forge-mcp/billing/spendPolicies/activity/tools.ts
+++ b/src/generated/forge-mcp/billing/spendPolicies/activity/tools.ts
@@ -1,67 +1,73 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  billing_spend_policies_api_response_common_failure_output,
-  billing_spend_policies_api_response_common_success_output,
-  billing_spend_policies_message_output,
-  billing_spend_policies_policy_action_output,
-  billing_spend_policies_policy_current_state_output,
-  billing_spend_policies_policy_id_output,
-  billing_spend_policies_policy_output,
-  billing_spend_policies_product_id_output,
+  billing$$spend$$policies_api$$response$$common$$failure,
+  billing$$spend$$policies_api$$response$$common$$success,
+  billing$$spend$$policies_message,
+  billing$$spend$$policies_policy,
+  billing$$spend$$policies_policy_current_state,
 } from "../outputs.js";
-import { billing_spend_policies_identifier } from "../schemas.js";
 import {
-  billing_spend_policies_policy_activity_event_output,
-  billing_spend_policies_policy_activity_response_output,
+  billing$$spend$$policies_policy_activity_event,
+  billing$$spend$$policies_policy_activity_response,
 } from "./outputs.js";
 
 /**
- * The tools of `billing.spend_policies.activity`.
+ * The tools of `billing.spendPolicies.activity`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "billing_spend_policies_activity_list",
+    name: "billing_spendPolicies_activity_list",
     title: "List Spend Policy Activity",
-    description: "Returns configuration history from immutable policy revisions for the account, including deleted policies. Entries contain before/after values and verified actor attribution. Pages use descending revision IDs, not event or commit order; refresh the first page for new entries. This cursor is not an incremental consumer checkpoint.\n\nThis method is beta.",
+    description: "Returns configuration history from immutable policy revisions for the account, including deleted policies. Entries contain before/after values and verified actor attribution. Pages use descending revision IDs, not event or commit order; refresh the first page for new entries. This cursor is not an incremental consumer checkpoint.\n\nThis method is beta.\n\nGET /accounts/{account_id}/billing/spend-policies/activity",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billing-spend-policies_identifier",
-          "description": "Identifies the Cloudflare account (account tag)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account (account tag).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "description": "Opaque token from the preceding response's result_info.cursor. Pass it unchanged to retrieve older entries.",
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "description": "Maximum number of audit entries to return. Defaults to 50. Values above 100 are capped at 100 rather than rejected.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token from the preceding response's result_info.cursor. Pass it unchanged to retrieve older entries.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 50,
+              "description": "Maximum number of audit entries to return. Defaults to 50. Values above 100 are capped at 100 rather than rejected.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "billing-spend-policies_identifier": billing_spend_policies_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billing-spend-policies_policy_activity_response",
       $defs: {
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_activity_event": billing_spend_policies_policy_activity_event_output,
-        "billing-spend-policies_policy_activity_response": billing_spend_policies_policy_activity_response_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_activity_event": billing$$spend$$policies_policy_activity_event,
+        "billing-spend-policies_policy_activity_response": billing$$spend$$policies_policy_activity_response,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
       },
     },
     annotations: {
@@ -101,23 +107,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billing-spend-policies_api-response-common-failure": billing_spend_policies_api_response_common_failure_output,
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_activity_event": billing_spend_policies_policy_activity_event_output,
-        "billing-spend-policies_policy_activity_response": billing_spend_policies_policy_activity_response_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-failure": billing$$spend$$policies_api$$response$$common$$failure,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_activity_event": billing$$spend$$policies_policy_activity_event,
+        "billing-spend-policies_policy_activity_response": billing$$spend$$policies_policy_activity_response,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billing/spend-policies/activity`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/billing/spendPolicies/audit/outputs.ts b/src/generated/forge-mcp/billing/spendPolicies/audit/outputs.ts
index ff94d9e72..01a2c9e3b 100644
--- a/src/generated/forge-mcp/billing/spendPolicies/audit/outputs.ts
+++ b/src/generated/forge-mcp/billing/spendPolicies/audit/outputs.ts
@@ -6,10 +6,14 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `billing-spend-policies_policy_audit_entry` in responses.
  */
-export const billing_spend_policies_policy_audit_entry_output: JsonSchema = {
+export const billing$$spend$$policies_policy_audit_entry: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/billing-spend-policies_policy_action"
+      "enum": [
+        "notification",
+        "usage_block"
+      ],
+      "type": "string"
     },
     "balance_cents": {
       "type": "integer"
@@ -68,7 +72,7 @@ export const billing_spend_policies_policy_audit_entry_output: JsonSchema = {
 /**
  * The schema of `billing-spend-policies_policy_audit_response` in responses.
  */
-export const billing_spend_policies_policy_audit_response_output: JsonSchema = {
+export const billing$$spend$$policies_policy_audit_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/billing-spend-policies_api-response-common-success"
diff --git a/src/generated/forge-mcp/billing/spendPolicies/audit/tools.ts b/src/generated/forge-mcp/billing/spendPolicies/audit/tools.ts
index 6dc5255dc..68aa9cb1a 100644
--- a/src/generated/forge-mcp/billing/spendPolicies/audit/tools.ts
+++ b/src/generated/forge-mcp/billing/spendPolicies/audit/tools.ts
@@ -1,64 +1,71 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  billing_spend_policies_api_response_common_failure_output,
-  billing_spend_policies_api_response_common_success_output,
-  billing_spend_policies_message_output,
-  billing_spend_policies_policy_action_output,
+  billing$$spend$$policies_api$$response$$common$$failure,
+  billing$$spend$$policies_api$$response$$common$$success,
+  billing$$spend$$policies_message,
 } from "../outputs.js";
 import {
-  billing_spend_policies_identifier,
-  billing_spend_policies_policy_id,
-} from "../schemas.js";
-import {
-  billing_spend_policies_policy_audit_entry_output,
-  billing_spend_policies_policy_audit_response_output,
+  billing$$spend$$policies_policy_audit_entry,
+  billing$$spend$$policies_policy_audit_response,
 } from "./outputs.js";
 
 /**
- * The tools of `billing.spend_policies.audit`.
+ * The tools of `billing.spendPolicies.audit`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "billing_spend_policies_audit_list",
+    name: "billing_spendPolicies_audit_list",
     title: "List Spend Policy Audit Entries",
-    description: "Returns the policy's evaluation history, newest first. At most one entry is recorded per trigger (`approaching_limit` or `limit_reached`), policy version and billing period, so a policy update can record a new entry without any change in balance. Disabled policies still return their history; deleted policies return `404`. There is no pagination: use `limit` to set how many entries come back.\n\nThis method is beta.",
+    description: "Returns the policy's evaluation history, newest first. At most one entry is recorded per trigger (`approaching_limit` or `limit_reached`), policy version and billing period, so a policy update can record a new entry without any change in balance. Disabled policies still return their history; deleted policies return `404`. There is no pagination: use `limit` to set how many entries come back.\n\nThis method is beta.\n\nGET /accounts/{account_id}/billing/spend-policies/{policy_id}/audit",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billing-spend-policies_identifier",
-          "description": "Identifies the Cloudflare account (account tag)."
-        },
-        "limit": {
-          "default": 50,
-          "description": "Maximum number of audit entries to return. Defaults to 50. Values above 100 are capped at 100 rather than rejected.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account (account tag).",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Identifies the spend policy.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         },
-        "policy_id": {
-          "$ref": "#/$defs/billing-spend-policies_policy_id",
-          "description": "Identifies the spend policy."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 50,
+              "description": "Maximum number of audit entries to return. Defaults to 50. Values above 100 are capped at 100 rather than rejected.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "billing-spend-policies_identifier": billing_spend_policies_identifier,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billing-spend-policies_policy_audit_response",
       $defs: {
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_audit_entry": billing_spend_policies_policy_audit_entry_output,
-        "billing-spend-policies_policy_audit_response": billing_spend_policies_policy_audit_response_output,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy_audit_entry": billing$$spend$$policies_policy_audit_entry,
+        "billing-spend-policies_policy_audit_response": billing$$spend$$policies_policy_audit_response,
       },
     },
     annotations: {
@@ -98,18 +105,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billing-spend-policies_api-response-common-failure": billing_spend_policies_api_response_common_failure_output,
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_audit_entry": billing_spend_policies_policy_audit_entry_output,
-        "billing-spend-policies_policy_audit_response": billing_spend_policies_policy_audit_response_output,
+        "billing-spend-policies_api-response-common-failure": billing$$spend$$policies_api$$response$$common$$failure,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy_audit_entry": billing$$spend$$policies_policy_audit_entry,
+        "billing-spend-policies_policy_audit_response": billing$$spend$$policies_policy_audit_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billing/spend-policies/${pathParam(args, "policy_id")}/audit`,
       query: [
-        ["limit", args["limit"], true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/billing/spendPolicies/outputs.ts b/src/generated/forge-mcp/billing/spendPolicies/outputs.ts
index c245aad6f..7816cc525 100644
--- a/src/generated/forge-mcp/billing/spendPolicies/outputs.ts
+++ b/src/generated/forge-mcp/billing/spendPolicies/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `billing-spend-policies_api-response-common-failure` in
  * responses.
  */
-export const billing_spend_policies_api_response_common_failure_output: JsonSchema = {
+export const billing$$spend$$policies_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -52,7 +52,7 @@ export const billing_spend_policies_api_response_common_failure_output: JsonSche
  * The schema of `billing-spend-policies_api-response-common-success` in
  * responses.
  */
-export const billing_spend_policies_api_response_common_success_output: JsonSchema = {
+export const billing$$spend$$policies_api$$response$$common$$success: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -84,7 +84,7 @@ export const billing_spend_policies_api_response_common_success_output: JsonSche
 /**
  * The schema of `billing-spend-policies_message` in responses.
  */
-export const billing_spend_policies_message_output: JsonSchema = {
+export const billing$$spend$$policies_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -102,13 +102,17 @@ export const billing_spend_policies_message_output: JsonSchema = {
 /**
  * The schema of `billing-spend-policies_policy` in responses.
  */
-export const billing_spend_policies_policy_output: JsonSchema = {
+export const billing$$spend$$policies_policy: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "integer"
     },
     "action": {
-      "$ref": "#/$defs/billing-spend-policies_policy_action"
+      "enum": [
+        "notification",
+        "usage_block"
+      ],
+      "type": "string"
     },
     "current_state": {
       "$ref": "#/$defs/billing-spend-policies_policy_current_state"
@@ -117,7 +121,8 @@ export const billing_spend_policies_policy_output: JsonSchema = {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/billing-spend-policies_policy_id"
+      "format": "uuid",
+      "type": "string"
     },
     "name": {
       "type": "string"
@@ -126,7 +131,11 @@ export const billing_spend_policies_policy_output: JsonSchema = {
       "type": "string"
     },
     "product_id": {
-      "$ref": "#/$defs/billing-spend-policies_product_id"
+      "enum": [
+        "workers",
+        "durable_objects"
+      ],
+      "type": "string"
     },
     "threshold_cents": {
       "type": "integer"
@@ -149,21 +158,10 @@ export const billing_spend_policies_policy_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `billing-spend-policies_policy_action` in responses.
- */
-export const billing_spend_policies_policy_action_output: JsonSchema = {
-  "enum": [
-    "notification",
-    "usage_block"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `billing-spend-policies_policy_current_state` in responses.
  */
-export const billing_spend_policies_policy_current_state_output: JsonSchema = {
+export const billing$$spend$$policies_policy_current_state: JsonSchema = {
   "properties": {
     "balance_cents": {
       "oneOf": [
@@ -279,7 +277,7 @@ export const billing_spend_policies_policy_current_state_output: JsonSchema = {
 /**
  * The schema of `billing-spend-policies_policy_delete_response` in responses.
  */
-export const billing_spend_policies_policy_delete_response_output: JsonSchema = {
+export const billing$$spend$$policies_policy_delete_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/billing-spend-policies_api-response-common-success"
@@ -289,7 +287,8 @@ export const billing_spend_policies_policy_delete_response_output: JsonSchema =
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/billing-spend-policies_policy_id"
+              "format": "uuid",
+              "type": "string"
             }
           },
           "required": [
@@ -306,18 +305,10 @@ export const billing_spend_policies_policy_delete_response_output: JsonSchema =
   ]
 };
 
-/**
- * The schema of `billing-spend-policies_policy_id` in responses.
- */
-export const billing_spend_policies_policy_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `billing-spend-policies_policy_list_response` in responses.
  */
-export const billing_spend_policies_policy_list_response_output: JsonSchema = {
+export const billing$$spend$$policies_policy_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/billing-spend-policies_api-response-common-success"
@@ -342,7 +333,7 @@ export const billing_spend_policies_policy_list_response_output: JsonSchema = {
 /**
  * The schema of `billing-spend-policies_policy_response` in responses.
  */
-export const billing_spend_policies_policy_response_output: JsonSchema = {
+export const billing$$spend$$policies_policy_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/billing-spend-policies_api-response-common-success"
@@ -360,14 +351,3 @@ export const billing_spend_policies_policy_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `billing-spend-policies_product_id` in responses.
- */
-export const billing_spend_policies_product_id_output: JsonSchema = {
-  "enum": [
-    "workers",
-    "durable_objects"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/billing/spendPolicies/schemas.ts b/src/generated/forge-mcp/billing/spendPolicies/schemas.ts
index dd6e3d7e4..43fe839ad 100644
--- a/src/generated/forge-mcp/billing/spendPolicies/schemas.ts
+++ b/src/generated/forge-mcp/billing/spendPolicies/schemas.ts
@@ -3,44 +3,19 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `billing-spend-policies_identifier`.
- */
-export const billing_spend_policies_identifier: JsonSchema = {
-  "description": "Represents a Cloudflare resource identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `billing-spend-policies_policy_action`.
- */
-export const billing_spend_policies_policy_action: JsonSchema = {
-  "description": "The action taken when the threshold is reached. `notification` sends an email to `notification_email`. `usage_block` blocks further usage of the product until the end of the billing period. Raising the threshold above the current balance, disabling the policy, or deleting it lifts the block early.",
-  "enum": [
-    "notification",
-    "usage_block"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `billing-spend-policies_policy_id`.
- */
-export const billing_spend_policies_policy_id: JsonSchema = {
-  "description": "The unique identifier of the spend policy.",
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `billing-spend-policies_policy_input`.
  */
-export const billing_spend_policies_policy_input: JsonSchema = {
+export const billing$$spend$$policies_policy_input: JsonSchema = {
   "description": "A spend policy as sent on create and on full replacement. Unknown fields and trailing JSON are rejected. Only the first 1 MiB of the body is read.",
   "properties": {
     "action": {
-      "$ref": "#/$defs/billing-spend-policies_policy_action",
-      "description": "The action taken when the threshold is reached. `notification` sends an email to `notification_email`. `usage_block` blocks further usage of the product until the end of the billing period. Raising the threshold above the current balance, disabling the policy, or deleting it lifts the block early."
+      "description": "The action taken when the threshold is reached. `notification` sends an email to `notification_email`. `usage_block` blocks further usage of the product until the end of the billing period. Raising the threshold above the current balance, disabling the policy, or deleting it lifts the block early.",
+      "enum": [
+        "notification",
+        "usage_block"
+      ],
+      "type": "string"
     },
     "enabled": {
       "description": "Whether the policy is evaluated.",
@@ -55,8 +30,12 @@ export const billing_spend_policies_policy_input: JsonSchema = {
       "type": "string"
     },
     "product_id": {
-      "$ref": "#/$defs/billing-spend-policies_product_id",
-      "description": "The product the policy applies to: `workers` or `durable_objects`. Each product's balance and policies are separate. Both products support `notification` and `usage_block` policies on create and update."
+      "description": "The product the policy applies to: `workers` or `durable_objects`. Each product's balance and policies are separate. Both products support `notification` and `usage_block` policies on create and update.",
+      "enum": [
+        "workers",
+        "durable_objects"
+      ],
+      "type": "string"
     },
     "threshold_cents": {
       "description": "The spend threshold for the current billing period, in US cents. Must be greater than zero.",
@@ -72,15 +51,3 @@ export const billing_spend_policies_policy_input: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `billing-spend-policies_product_id`.
- */
-export const billing_spend_policies_product_id: JsonSchema = {
-  "description": "The product the policy applies to: `workers` or `durable_objects`. Each product's balance and policies are separate. Both products support `notification` and `usage_block` policies on create and update.",
-  "enum": [
-    "workers",
-    "durable_objects"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/billing/spendPolicies/tools.ts b/src/generated/forge-mcp/billing/spendPolicies/tools.ts
index daf55d530..02dd1b59a 100644
--- a/src/generated/forge-mcp/billing/spendPolicies/tools.ts
+++ b/src/generated/forge-mcp/billing/spendPolicies/tools.ts
@@ -1,69 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  billing_spend_policies_api_response_common_failure_output,
-  billing_spend_policies_api_response_common_success_output,
-  billing_spend_policies_message_output,
-  billing_spend_policies_policy_action_output,
-  billing_spend_policies_policy_current_state_output,
-  billing_spend_policies_policy_delete_response_output,
-  billing_spend_policies_policy_id_output,
-  billing_spend_policies_policy_list_response_output,
-  billing_spend_policies_policy_output,
-  billing_spend_policies_policy_response_output,
-  billing_spend_policies_product_id_output,
+  billing$$spend$$policies_api$$response$$common$$failure,
+  billing$$spend$$policies_api$$response$$common$$success,
+  billing$$spend$$policies_message,
+  billing$$spend$$policies_policy,
+  billing$$spend$$policies_policy_current_state,
+  billing$$spend$$policies_policy_delete_response,
+  billing$$spend$$policies_policy_list_response,
+  billing$$spend$$policies_policy_response,
 } from "./outputs.js";
-import {
-  billing_spend_policies_identifier,
-  billing_spend_policies_policy_action,
-  billing_spend_policies_policy_id,
-  billing_spend_policies_policy_input,
-  billing_spend_policies_product_id,
-} from "./schemas.js";
+import { billing$$spend$$policies_policy_input } from "./schemas.js";
 
 /**
- * The tools of `billing.spend_policies`.
+ * The tools of `billing.spendPolicies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "billing_spend_policies_create",
+    name: "billing_spendPolicies_create",
     title: "Create Spend Policy",
-    description: "Creates a spend policy. Each account can have only one enabled `usage_block` policy per product. A second one returns `409`. There is no limit on `notification` policies.\n\nThis method is beta.",
+    description: "Creates a spend policy. Each account can have only one enabled `usage_block` policy per product. A second one returns `409`. There is no limit on `notification` policies.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/billing/spend-policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billing-spend-policies_identifier",
-          "description": "Identifies the Cloudflare account (account tag)."
-        },
         "body": {
           "$ref": "#/$defs/billing-spend-policies_policy_input"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account (account tag).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "billing-spend-policies_identifier": billing_spend_policies_identifier,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action,
-        "billing-spend-policies_policy_input": billing_spend_policies_policy_input,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id,
+        "billing-spend-policies_policy_input": billing$$spend$$policies_policy_input,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/billing-spend-policies_policy_response",
       $defs: {
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_policy_response": billing_spend_policies_policy_response_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
+        "billing-spend-policies_policy_response": billing$$spend$$policies_policy_response,
       },
     },
     annotations: {
@@ -106,15 +101,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billing-spend-policies_api-response-common-failure": billing_spend_policies_api_response_common_failure_output,
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_policy_response": billing_spend_policies_policy_response_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-failure": billing$$spend$$policies_api$$response$$common$$failure,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
+        "billing-spend-policies_policy_response": billing$$spend$$policies_policy_response,
       },
     },
     request: (args) => ({
@@ -123,42 +115,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "billing_spend_policies_delete",
+    name: "billing_spendPolicies_delete",
     title: "Delete Spend Policy",
-    description: "Soft-deletes the spend policy. The policy is disabled and no longer appears in list, get or audit responses. The `If-Match` header must equal the policy's current `version`.\n\nThis method is beta.",
+    description: "Soft-deletes the spend policy. The policy is disabled and no longer appears in list, get or audit responses. The `If-Match` header must equal the policy's current `version`.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/billing/spend-policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billing-spend-policies_identifier",
-          "description": "Identifies the Cloudflare account (account tag)."
-        },
-        "if_match": {
-          "description": "The policy `version` the change is based on, as returned in `ETag`. Quoted (`\"3\"`) and bare (`3`) values are both accepted. Weak ETags (`W/\"3\"`) and `*` are not.",
-          "type": "string"
-        },
-        "policy_id": {
-          "$ref": "#/$defs/billing-spend-policies_policy_id",
-          "description": "Identifies the spend policy."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "If-Match": {
+              "description": "The policy `version` the change is based on, as returned in `ETag`. Quoted (`\"3\"`) and bare (`3`) values are both accepted. Weak ETags (`W/\"3\"`) and `*` are not.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "If-Match"
+          ],
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account (account tag).",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Identifies the spend policy.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
-        "if_match"
+        "path",
+        "headers"
       ],
-      $defs: {
-        "billing-spend-policies_identifier": billing_spend_policies_identifier,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billing-spend-policies_policy_delete_response",
       $defs: {
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy_delete_response": billing_spend_policies_policy_delete_response_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy_delete_response": billing$$spend$$policies_policy_delete_response,
       },
     },
     annotations: {
@@ -204,56 +211,59 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billing-spend-policies_api-response-common-failure": billing_spend_policies_api_response_common_failure_output,
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy_delete_response": billing_spend_policies_policy_delete_response_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
+        "billing-spend-policies_api-response-common-failure": billing$$spend$$policies_api$$response$$common$$failure,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy_delete_response": billing$$spend$$policies_policy_delete_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billing/spend-policies/${pathParam(args, "policy_id")}`,
       headers: [
-        ["If-Match", args["if_match"]],
+        ["If-Match", param(args, "headers", "If-Match")],
       ],
     }),
   },
   {
-    name: "billing_spend_policies_get",
+    name: "billing_spendPolicies_get",
     title: "Get Spend Policy",
-    description: "Returns one spend policy. The `ETag` response header holds the current `version`; send it as `If-Match` on a later update or delete.\n\nThis method is beta.",
+    description: "Returns one spend policy. The `ETag` response header holds the current `version`; send it as `If-Match` on a later update or delete.\n\nThis method is beta.\n\nGET /accounts/{account_id}/billing/spend-policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billing-spend-policies_identifier",
-          "description": "Identifies the Cloudflare account (account tag)."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/billing-spend-policies_policy_id",
-          "description": "Identifies the spend policy."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account (account tag).",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Identifies the spend policy.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "billing-spend-policies_identifier": billing_spend_policies_identifier,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billing-spend-policies_policy_response",
       $defs: {
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_policy_response": billing_spend_policies_policy_response_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
+        "billing-spend-policies_policy_response": billing$$spend$$policies_policy_response,
       },
     },
     annotations: {
@@ -293,15 +303,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billing-spend-policies_api-response-common-failure": billing_spend_policies_api_response_common_failure_output,
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_policy_response": billing_spend_policies_policy_response_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-failure": billing$$spend$$policies_api$$response$$common$$failure,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
+        "billing-spend-policies_policy_response": billing$$spend$$policies_policy_response,
       },
     },
     request: (args) => ({
@@ -309,35 +316,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "billing_spend_policies_list",
+    name: "billing_spendPolicies_list",
     title: "List Spend Policies",
-    description: "Returns every spend policy on the account that has not been deleted, including disabled ones. Results are sorted by `name`, then `id`. There is no pagination.\n\nThis method is beta.",
+    description: "Returns every spend policy on the account that has not been deleted, including disabled ones. Results are sorted by `name`, then `id`. There is no pagination.\n\nThis method is beta.\n\nGET /accounts/{account_id}/billing/spend-policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billing-spend-policies_identifier",
-          "description": "Identifies the Cloudflare account (account tag)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account (account tag).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "billing-spend-policies_identifier": billing_spend_policies_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billing-spend-policies_policy_list_response",
       $defs: {
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_policy_list_response": billing_spend_policies_policy_list_response_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
+        "billing-spend-policies_policy_list_response": billing$$spend$$policies_policy_list_response,
       },
     },
     annotations: {
@@ -377,15 +388,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billing-spend-policies_api-response-common-failure": billing_spend_policies_api_response_common_failure_output,
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_policy_list_response": billing_spend_policies_policy_list_response_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-failure": billing$$spend$$policies_api$$response$$common$$failure,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
+        "billing-spend-policies_policy_list_response": billing$$spend$$policies_policy_list_response,
       },
     },
     request: (args) => ({
@@ -393,53 +401,66 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "billing_spend_policies_update",
+    name: "billing_spendPolicies_update",
     title: "Update Spend Policy",
-    description: "Replaces the whole spend policy. Every field is required, as on create; there are no partial updates and `PATCH` is not supported. The `If-Match` header must equal the policy's current `version`. On success, `version` goes up by one and the new value is returned in `ETag`.\n\nThis method is beta.",
+    description: "Replaces the whole spend policy. Every field is required, as on create; there are no partial updates and `PATCH` is not supported. The `If-Match` header must equal the policy's current `version`. On success, `version` goes up by one and the new value is returned in `ETag`.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/billing/spend-policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billing-spend-policies_identifier",
-          "description": "Identifies the Cloudflare account (account tag)."
-        },
         "body": {
           "$ref": "#/$defs/billing-spend-policies_policy_input"
         },
-        "if_match": {
-          "description": "The policy `version` the change is based on, as returned in `ETag`. Quoted (`\"3\"`) and bare (`3`) values are both accepted. Weak ETags (`W/\"3\"`) and `*` are not.",
-          "type": "string"
-        },
-        "policy_id": {
-          "$ref": "#/$defs/billing-spend-policies_policy_id",
-          "description": "Identifies the spend policy."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "If-Match": {
+              "description": "The policy `version` the change is based on, as returned in `ETag`. Quoted (`\"3\"`) and bare (`3`) values are both accepted. Weak ETags (`W/\"3\"`) and `*` are not.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "If-Match"
+          ],
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account (account tag).",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Identifies the spend policy.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
-        "if_match",
+        "path",
+        "headers",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "billing-spend-policies_identifier": billing_spend_policies_identifier,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id,
-        "billing-spend-policies_policy_input": billing_spend_policies_policy_input,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id,
+        "billing-spend-policies_policy_input": billing$$spend$$policies_policy_input,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/billing-spend-policies_policy_response",
       $defs: {
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_policy_response": billing_spend_policies_policy_response_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
+        "billing-spend-policies_policy_response": billing$$spend$$policies_policy_response,
       },
     },
     annotations: {
@@ -488,21 +509,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billing-spend-policies_api-response-common-failure": billing_spend_policies_api_response_common_failure_output,
-        "billing-spend-policies_api-response-common-success": billing_spend_policies_api_response_common_success_output,
-        "billing-spend-policies_message": billing_spend_policies_message_output,
-        "billing-spend-policies_policy": billing_spend_policies_policy_output,
-        "billing-spend-policies_policy_action": billing_spend_policies_policy_action_output,
-        "billing-spend-policies_policy_current_state": billing_spend_policies_policy_current_state_output,
-        "billing-spend-policies_policy_id": billing_spend_policies_policy_id_output,
-        "billing-spend-policies_policy_response": billing_spend_policies_policy_response_output,
-        "billing-spend-policies_product_id": billing_spend_policies_product_id_output,
+        "billing-spend-policies_api-response-common-failure": billing$$spend$$policies_api$$response$$common$$failure,
+        "billing-spend-policies_api-response-common-success": billing$$spend$$policies_api$$response$$common$$success,
+        "billing-spend-policies_message": billing$$spend$$policies_message,
+        "billing-spend-policies_policy": billing$$spend$$policies_policy,
+        "billing-spend-policies_policy_current_state": billing$$spend$$policies_policy_current_state,
+        "billing-spend-policies_policy_response": billing$$spend$$policies_policy_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billing/spend-policies/${pathParam(args, "policy_id")}`,
       headers: [
-        ["If-Match", args["if_match"]],
+        ["If-Match", param(args, "headers", "If-Match")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/billing/usage/outputs.ts b/src/generated/forge-mcp/billing/usage/outputs.ts
index 65ddc0789..08925d77b 100644
--- a/src/generated/forge-mcp/billing/usage/outputs.ts
+++ b/src/generated/forge-mcp/billing/usage/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `billable-usage-api_usage_info_response` in responses.
  */
-export const billable_usage_api_usage_info_response_output: JsonSchema = {
+export const billable$$usage$$api_usage_info_response: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -93,7 +93,7 @@ export const billable_usage_api_usage_info_response_output: JsonSchema = {
 /**
  * The schema of `billable-usage-api_usage_record` in responses.
  */
-export const billable_usage_api_usage_record_output: JsonSchema = {
+export const billable$$usage$$api_usage_record: JsonSchema = {
   "properties": {
     "BilledCost": {
       "type": "number"
@@ -256,7 +256,7 @@ export const billable_usage_api_usage_record_output: JsonSchema = {
 /**
  * The schema of `billable-usage-api_usage_response` in responses.
  */
-export const billable_usage_api_usage_response_output: JsonSchema = {
+export const billable$$usage$$api_usage_response: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -309,7 +309,7 @@ export const billable_usage_api_usage_response_output: JsonSchema = {
 /**
  * The schema of `billable-usage-api_v2_account_billable_metric` in responses.
  */
-export const billable_usage_api_v2_account_billable_metric_output: JsonSchema = {
+export const billable$$usage$$api_v2_account_billable_metric: JsonSchema = {
   "properties": {
     "DimensionKeys": {
       "items": {
@@ -350,7 +350,7 @@ export const billable_usage_api_v2_account_billable_metric_output: JsonSchema =
  * The schema of `billable-usage-api_v2_account_billable_metrics_response` in
  * responses.
  */
-export const billable_usage_api_v2_account_billable_metrics_response_output: JsonSchema = {
+export const billable$$usage$$api_v2_account_billable_metrics_response: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -403,7 +403,7 @@ export const billable_usage_api_v2_account_billable_metrics_response_output: Jso
 /**
  * The schema of `billable-usage-api_v2_product_category` in responses.
  */
-export const billable_usage_api_v2_product_category_output: JsonSchema = {
+export const billable$$usage$$api_v2_product_category: JsonSchema = {
   "properties": {
     "Id": {
       "type": "string"
@@ -422,7 +422,7 @@ export const billable_usage_api_v2_product_category_output: JsonSchema = {
 /**
  * The schema of `billable-usage-api_v2_product_family` in responses.
  */
-export const billable_usage_api_v2_product_family_output: JsonSchema = {
+export const billable$$usage$$api_v2_product_family: JsonSchema = {
   "properties": {
     "Id": {
       "type": "string"
@@ -441,7 +441,7 @@ export const billable_usage_api_v2_product_family_output: JsonSchema = {
 /**
  * The schema of `usage-analytics_billing_usage_data_point` in responses.
  */
-export const usage_analytics_billing_usage_data_point_output: JsonSchema = {
+export const usage$$analytics_billing_usage_data_point: JsonSchema = {
   "properties": {
     "argoAcceleratedBytes": {
       "type": "integer"
@@ -480,7 +480,7 @@ export const usage_analytics_billing_usage_data_point_output: JsonSchema = {
 /**
  * The schema of `usage-analytics_billing_usage_response` in responses.
  */
-export const usage_analytics_billing_usage_response_output: JsonSchema = {
+export const usage$$analytics_billing_usage_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/billing/usage/schemas.ts b/src/generated/forge-mcp/billing/usage/schemas.ts
index 4b62ee6c1..7e5fff42b 100644
--- a/src/generated/forge-mcp/billing/usage/schemas.ts
+++ b/src/generated/forge-mcp/billing/usage/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `billable-usage-api_v2_filter_by`.
  */
-export const billable_usage_api_v2_filter_by: JsonSchema = {
+export const billable$$usage$$api_v2_filter_by: JsonSchema = {
   "description": "Usage filters. Filters of different kinds are combined with AND, so a record must match every filter present to be returned.",
   "properties": {
     "BillableMetricIds": {
@@ -41,7 +41,7 @@ export const billable_usage_api_v2_filter_by: JsonSchema = {
 /**
  * The schema of `billable-usage-api_v2_group_by`.
  */
-export const billable_usage_api_v2_group_by: JsonSchema = {
+export const billable$$usage$$api_v2_group_by: JsonSchema = {
   "description": "A definition used to split result rows. TAG groups by a case-sensitive resource-tag key. DIMENSION groups by a usage dimension key — account_id, zone_id and region are the documented keys, and any other dimension key carried by the usage data is accepted and returned under that same key.",
   "properties": {
     "Key": {
@@ -67,7 +67,7 @@ export const billable_usage_api_v2_group_by: JsonSchema = {
 /**
  * The schema of `billable-usage-api_v2_tag_filter`.
  */
-export const billable_usage_api_v2_tag_filter: JsonSchema = {
+export const billable$$usage$$api_v2_tag_filter: JsonSchema = {
   "description": "Values accepted for one resource-tag key.",
   "properties": {
     "Key": {
@@ -94,7 +94,7 @@ export const billable_usage_api_v2_tag_filter: JsonSchema = {
 /**
  * The schema of `billable-usage-api_v2_time_period`.
  */
-export const billable_usage_api_v2_time_period: JsonSchema = {
+export const billable$$usage$$api_v2_time_period: JsonSchema = {
   "description": "Charge period to query, i.e. when consumption happened, not when it was billed. `From` is inclusive and `To` is exclusive. `From` and `To` must be supplied together; supplying one without the other is an error. When both are omitted the range defaults to the start of the current month through today.",
   "properties": {
     "From": {
@@ -114,7 +114,7 @@ export const billable_usage_api_v2_time_period: JsonSchema = {
 /**
  * The schema of `billable-usage-api_v2_usage_query`.
  */
-export const billable_usage_api_v2_usage_query: JsonSchema = {
+export const billable$$usage$$api_v2_usage_query: JsonSchema = {
   "description": "Filter criteria for a usage query. Every field is optional; an empty object is equivalent to omitting the body entirely. Unknown fields are rejected.",
   "properties": {
     "FilterBy": {
diff --git a/src/generated/forge-mcp/billing/usage/tools.ts b/src/generated/forge-mcp/billing/usage/tools.ts
index 635d73d31..29ad1c166 100644
--- a/src/generated/forge-mcp/billing/usage/tools.ts
+++ b/src/generated/forge-mcp/billing/usage/tools.ts
@@ -1,37 +1,33 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  billable_usage_api_api_response_common_failure_output,
-  billable_usage_api_cost_and_usage_data_output,
-  billable_usage_api_message_output,
-  billable_usage_api_v2_usage_response_output,
-  usage_analytics_api_error_output,
-  usage_analytics_api_message_output,
-  usage_analytics_error_response_output,
+  billable$$usage$$api_api$$response$$common$$failure,
+  billable$$usage$$api_cost_and_usage_data,
+  billable$$usage$$api_message,
+  billable$$usage$$api_v2_usage_response,
+  usage$$analytics_api_error,
+  usage$$analytics_api_message,
+  usage$$analytics_error_response,
 } from "../../outputs.js";
 import {
-  billable_usage_api_identifier,
-  usage_analytics_identifier,
-} from "../../schemas.js";
-import {
-  billable_usage_api_usage_info_response_output,
-  billable_usage_api_usage_record_output,
-  billable_usage_api_usage_response_output,
-  billable_usage_api_v2_account_billable_metric_output,
-  billable_usage_api_v2_account_billable_metrics_response_output,
-  billable_usage_api_v2_product_category_output,
-  billable_usage_api_v2_product_family_output,
-  usage_analytics_billing_usage_data_point_output,
-  usage_analytics_billing_usage_response_output,
+  billable$$usage$$api_usage_info_response,
+  billable$$usage$$api_usage_record,
+  billable$$usage$$api_usage_response,
+  billable$$usage$$api_v2_account_billable_metric,
+  billable$$usage$$api_v2_account_billable_metrics_response,
+  billable$$usage$$api_v2_product_category,
+  billable$$usage$$api_v2_product_family,
+  usage$$analytics_billing_usage_data_point,
+  usage$$analytics_billing_usage_response,
 } from "./outputs.js";
 import {
-  billable_usage_api_v2_filter_by,
-  billable_usage_api_v2_group_by,
-  billable_usage_api_v2_tag_filter,
-  billable_usage_api_v2_time_period,
-  billable_usage_api_v2_usage_query,
+  billable$$usage$$api_v2_filter_by,
+  billable$$usage$$api_v2_group_by,
+  billable$$usage$$api_v2_tag_filter,
+  billable$$usage$$api_v2_time_period,
+  billable$$usage$$api_v2_usage_query,
 } from "./schemas.js";
 
 /**
@@ -41,65 +37,78 @@ export const tools: readonly Tool[] = [
   {
     name: "billing_usage_get",
     title: "Get account billing usage",
-    description: "Retrieve billing usage analytics for an account. Returns time-series data for all billable product metrics including Stream, Media (Images), Rate Limiting, Load Balancing, Argo, Workers, Workers KV, Image Resizing, and Spectrum.\n\nThis method is deprecated.",
+    description: "Retrieve billing usage analytics for an account. Returns time-series data for all billable product metrics including Stream, Media (Images), Rate Limiting, Load Balancing, Argo, Workers, Workers KV, Image Resizing, and Spectrum.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/billing/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/usage-analytics_identifier",
-          "description": "Standard Cloudflare hex account identifier. The API gateway translates this to an internal numeric ID before forwarding to the backend service.\n"
-        },
-        "filters": {
-          "description": "Filter expressions to apply to the query. Format: field==value. Multiple filters can be combined.\n",
-          "type": "string"
-        },
-        "limit": {
-          "default": 100,
-          "description": "Maximum number of data points to return. The actual number of results depends on the interaction between the time range (since/until) and time_delta granularity. Results are truncated to this limit without error if the time range produces more data points than the limit allows.\n",
-          "type": "integer"
-        },
-        "metrics": {
-          "description": "Comma-separated list of metrics to include in the response. Available metrics depend on the endpoint. Billing usage supports: streamMinutesViewed, rateLimitingRequestsAllowed, loadBalancingQueries, argoAcceleratedBytes, workersRequests, workersKVReads, imageResizingRequests, spectrumBytesTransferred, mediaUniqueTransformations. Stream/media usage supports: streamMinutesViewed.\n",
-          "type": "string"
-        },
-        "since": {
-          "description": "Start of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to 6 hours before the current time.\n",
-          "format": "date-time",
-          "type": "string"
-        },
-        "time_delta": {
-          "default": "hour",
-          "description": "Time unit to aggregate usage observations into. Data retention is approximately 18 months. The effective number of data points returned depends on the time range and granularity selected. For example, requesting hourly granularity over 18 months could produce up to ~13,000 data points; use the limit parameter to cap results and be aware that responses may be truncated.\n",
-          "enum": [
-            "hour",
-            "day",
-            "week",
-            "month",
-            "quarter",
-            "year"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Standard Cloudflare hex account identifier. The API gateway translates this to an internal numeric ID before forwarding to the backend service.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "until": {
-          "description": "End of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to the current time.\n",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "filters": {
+              "description": "Filter expressions to apply to the query. Format: field==value. Multiple filters can be combined.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 100,
+              "description": "Maximum number of data points to return. The actual number of results depends on the interaction between the time range (since/until) and time_delta granularity. Results are truncated to this limit without error if the time range produces more data points than the limit allows.",
+              "type": "integer"
+            },
+            "metrics": {
+              "description": "Comma-separated list of metrics to include in the response. Available metrics depend on the endpoint. Billing usage supports: streamMinutesViewed, rateLimitingRequestsAllowed, loadBalancingQueries, argoAcceleratedBytes, workersRequests, workersKVReads, imageResizingRequests, spectrumBytesTransferred, mediaUniqueTransformations. Stream/media usage supports: streamMinutesViewed.",
+              "type": "string"
+            },
+            "since": {
+              "description": "Start of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to 6 hours before the current time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "time_delta": {
+              "default": "hour",
+              "description": "Time unit to aggregate usage observations into. Data retention is approximately 18 months. The effective number of data points returned depends on the time range and granularity selected. For example, requesting hourly granularity over 18 months could produce up to ~13,000 data points; use the limit parameter to cap results and be aware that responses may be truncated.",
+              "enum": [
+                "hour",
+                "day",
+                "week",
+                "month",
+                "quarter",
+                "year"
+              ],
+              "type": "string"
+            },
+            "until": {
+              "description": "End of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to the current time.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "usage-analytics_identifier": usage_analytics_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/usage-analytics_billing_usage_response",
       $defs: {
-        "usage-analytics_api_error": usage_analytics_api_error_output,
-        "usage-analytics_api_message": usage_analytics_api_message_output,
-        "usage-analytics_billing_usage_data_point": usage_analytics_billing_usage_data_point_output,
-        "usage-analytics_billing_usage_response": usage_analytics_billing_usage_response_output,
+        "usage-analytics_api_error": usage$$analytics_api_error,
+        "usage-analytics_api_message": usage$$analytics_api_message,
+        "usage-analytics_billing_usage_data_point": usage$$analytics_billing_usage_data_point,
+        "usage-analytics_billing_usage_response": usage$$analytics_billing_usage_response,
       },
     },
     annotations: {
@@ -132,62 +141,75 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "usage-analytics_api_error": usage_analytics_api_error_output,
-        "usage-analytics_api_message": usage_analytics_api_message_output,
-        "usage-analytics_billing_usage_data_point": usage_analytics_billing_usage_data_point_output,
-        "usage-analytics_billing_usage_response": usage_analytics_billing_usage_response_output,
-        "usage-analytics_error_response": usage_analytics_error_response_output,
+        "usage-analytics_api_error": usage$$analytics_api_error,
+        "usage-analytics_api_message": usage$$analytics_api_message,
+        "usage-analytics_billing_usage_data_point": usage$$analytics_billing_usage_data_point,
+        "usage-analytics_billing_usage_response": usage$$analytics_billing_usage_response,
+        "usage-analytics_error_response": usage$$analytics_error_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billing/usage`,
       query: [
-        ["metrics", args["metrics"], true],
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["time_delta", args["time_delta"], true],
-        ["limit", args["limit"], true],
-        ["filters", args["filters"], true],
+        ["metrics", param(args, "query", "metrics"), true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["time_delta", param(args, "query", "time_delta"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["filters", param(args, "query", "filters"), true],
       ],
     }),
   },
   {
-    name: "billing_usage_get_account_billable_metrics",
+    name: "billing_usage_getAccountBillableMetrics",
     title: "List Account Billable Metrics (Version 2, Alpha, Restricted)",
-    description: "Lists billable metrics available to the account through contracts and\nsubscriptions that overlap the requested period. Results are\ndeduplicated and ordered. If no qualifying contract exists, the\nresult is an empty array.\n\nWhen `from` and `to` are omitted, the period defaults to the start of\nthe current month through today. The maximum date range is 31 days.",
+    description: "Lists billable metrics available to the account through contracts and\nsubscriptions that overlap the requested period. Results are\ndeduplicated and ordered. If no qualifying contract exists, the\nresult is an empty array.\n\nWhen `from` and `to` are omitted, the period defaults to the start of\nthe current month through today. The maximum date range is 31 days.\n\nGET /accounts/{account_id}/billable/usage/billable-metrics",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billable-usage-api_identifier",
-          "description": "Identifies the Cloudflare account."
-        },
-        "from": {
-          "description": "Start date for the usage query (ISO 8601). Required if `to` is set. When omitted along with `to`, defaults to the start of the current month. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
-          "format": "date",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "to": {
-          "description": "End date for the usage query (ISO 8601). Required if `from` is set. When omitted along with `from`, defaults to today. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
-          "format": "date",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "from": {
+              "description": "Start date for the usage query (ISO 8601). Required if `to` is set. When omitted along with `to`, defaults to the start of the current month. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
+              "format": "date",
+              "type": "string"
+            },
+            "to": {
+              "description": "End date for the usage query (ISO 8601). Required if `from` is set. When omitted along with `from`, defaults to today. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
+              "format": "date",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "billable-usage-api_identifier": billable_usage_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billable-usage-api_v2_account_billable_metrics_response",
       $defs: {
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_v2_account_billable_metric": billable_usage_api_v2_account_billable_metric_output,
-        "billable-usage-api_v2_account_billable_metrics_response": billable_usage_api_v2_account_billable_metrics_response_output,
-        "billable-usage-api_v2_product_category": billable_usage_api_v2_product_category_output,
-        "billable-usage-api_v2_product_family": billable_usage_api_v2_product_family_output,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_v2_account_billable_metric": billable$$usage$$api_v2_account_billable_metric,
+        "billable-usage-api_v2_account_billable_metrics_response": billable$$usage$$api_v2_account_billable_metrics_response,
+        "billable-usage-api_v2_product_category": billable$$usage$$api_v2_product_category,
+        "billable-usage-api_v2_product_family": billable$$usage$$api_v2_product_family,
       },
     },
     annotations: {
@@ -217,57 +239,70 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billable-usage-api_api-response-common-failure": billable_usage_api_api_response_common_failure_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_v2_account_billable_metric": billable_usage_api_v2_account_billable_metric_output,
-        "billable-usage-api_v2_account_billable_metrics_response": billable_usage_api_v2_account_billable_metrics_response_output,
-        "billable-usage-api_v2_product_category": billable_usage_api_v2_product_category_output,
-        "billable-usage-api_v2_product_family": billable_usage_api_v2_product_family_output,
+        "billable-usage-api_api-response-common-failure": billable$$usage$$api_api$$response$$common$$failure,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_v2_account_billable_metric": billable$$usage$$api_v2_account_billable_metric,
+        "billable-usage-api_v2_account_billable_metrics_response": billable$$usage$$api_v2_account_billable_metrics_response,
+        "billable-usage-api_v2_product_category": billable$$usage$$api_v2_product_category,
+        "billable-usage-api_v2_product_family": billable$$usage$$api_v2_product_family,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billable/usage/billable-metrics`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
       ],
     }),
   },
   {
-    name: "billing_usage_get_account_usage_v2",
+    name: "billing_usage_getAccountUsageV2",
     title: "Get Account Usage (Version 2, Alpha, Restricted)",
-    description: "Returns cost and usage data for a single Cloudflare account, aligned\nwith the [FinOps FOCUS v1.3](https://focus.finops.org/focus-specification/v1-3/)\nCost and Usage dataset specification.\n\nEach record represents one billable metric for one account on one day.\nThis includes all metered usage, including usage that falls within\nfree-tier allowances and may result in zero cost.\n\n**Note:** This endpoint serves `usage` records only; cost and pricing\nfields are absent from responses. To retrieve rated costs, use `POST`\non the same path with `Metric: cost`.\n\nWhen `from` and `to` are omitted, defaults to the start of the current\nmonth through today. The maximum date range is 31 days.",
+    description: "Returns cost and usage data for a single Cloudflare account, aligned\nwith the [FinOps FOCUS v1.3](https://focus.finops.org/focus-specification/v1-3/)\nCost and Usage dataset specification.\n\nEach record represents one billable metric for one account on one day.\nThis includes all metered usage, including usage that falls within\nfree-tier allowances and may result in zero cost.\n\n**Note:** This endpoint serves `usage` records only; cost and pricing\nfields are absent from responses. To retrieve rated costs, use `POST`\non the same path with `Metric: cost`.\n\nWhen `from` and `to` are omitted, defaults to the start of the current\nmonth through today. The maximum date range is 31 days.\n\nGET /accounts/{account_id}/billable/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billable-usage-api_identifier",
-          "description": "Identifies the Cloudflare account."
-        },
-        "from": {
-          "description": "Start date for the usage query (ISO 8601). Required if `to` is set. When omitted along with `to`, defaults to the start of the current month. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
-          "format": "date",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "to": {
-          "description": "End date for the usage query (ISO 8601). Required if `from` is set. When omitted along with `from`, defaults to today. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
-          "format": "date",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "from": {
+              "description": "Start date for the usage query (ISO 8601). Required if `to` is set. When omitted along with `to`, defaults to the start of the current month. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
+              "format": "date",
+              "type": "string"
+            },
+            "to": {
+              "description": "End date for the usage query (ISO 8601). Required if `from` is set. When omitted along with `from`, defaults to today. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
+              "format": "date",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "billable-usage-api_identifier": billable_usage_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billable-usage-api_v2_usage_response",
       $defs: {
-        "billable-usage-api_cost_and_usage_data": billable_usage_api_cost_and_usage_data_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_v2_usage_response": billable_usage_api_v2_usage_response_output,
+        "billable-usage-api_cost_and_usage_data": billable$$usage$$api_cost_and_usage_data,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_v2_usage_response": billable$$usage$$api_v2_usage_response,
       },
     },
     annotations: {
@@ -297,44 +332,51 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billable-usage-api_api-response-common-failure": billable_usage_api_api_response_common_failure_output,
-        "billable-usage-api_cost_and_usage_data": billable_usage_api_cost_and_usage_data_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_v2_usage_response": billable_usage_api_v2_usage_response_output,
+        "billable-usage-api_api-response-common-failure": billable$$usage$$api_api$$response$$common$$failure,
+        "billable-usage-api_cost_and_usage_data": billable$$usage$$api_cost_and_usage_data,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_v2_usage_response": billable$$usage$$api_v2_usage_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billable/usage`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
       ],
     }),
   },
   {
-    name: "billing_usage_get_info_v1",
+    name: "billing_usage_getInfoV1",
     title: "Get Account Billable Usage Info (Version 1, Alpha)",
-    description: "Returns high-level usage information for the account, including coverage,\nand subscription metadata.",
+    description: "Returns high-level usage information for the account, including coverage,\nand subscription metadata.\n\nGET /accounts/{account_id}/billable-usage/info",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billable-usage-api_identifier",
-          "description": "Identifies the Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "billable-usage-api_identifier": billable_usage_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billable-usage-api_usage_info_response",
       $defs: {
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_usage_info_response": billable_usage_api_usage_info_response_output,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_usage_info_response": billable$$usage$$api_usage_info_response,
       },
     },
     annotations: {
@@ -364,9 +406,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billable-usage-api_api-response-common-failure": billable_usage_api_api_response_common_failure_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_usage_info_response": billable_usage_api_usage_info_response_output,
+        "billable-usage-api_api-response-common-failure": billable$$usage$$api_api$$response$$common$$failure,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_usage_info_response": billable$$usage$$api_usage_info_response,
       },
     },
     request: (args) => ({
@@ -374,40 +416,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "billing_usage_get_v1",
+    name: "billing_usage_getV1",
     title: "Get Account Billable Usage (Version 1, Alpha)",
-    description: "Returns billable usage data for the account.\nWhen no query parameters are provided, returns usage for the current\nbilling period.",
+    description: "Returns billable usage data for the account.\nWhen no query parameters are provided, returns usage for the current\nbilling period.\n\nGET /accounts/{account_id}/billable-usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billable-usage-api_identifier",
-          "description": "Identifies the Cloudflare account."
-        },
-        "from": {
-          "description": "Start date for the usage query (ISO 8601). The provided time range must include the subscription billing cycle anchor day, otherwise no usage data is returned. Use the info endpoint to retrieve the subscription anchor day.",
-          "format": "date",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "to": {
-          "description": "End date for the usage query (ISO 8601).",
-          "format": "date",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "from": {
+              "description": "Start date for the usage query (ISO 8601). The provided time range must include the subscription billing cycle anchor day, otherwise no usage data is returned. Use the info endpoint to retrieve the subscription anchor day.",
+              "format": "date",
+              "type": "string"
+            },
+            "to": {
+              "description": "End date for the usage query (ISO 8601).",
+              "format": "date",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "billable-usage-api_identifier": billable_usage_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billable-usage-api_usage_response",
       $defs: {
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_usage_record": billable_usage_api_usage_record_output,
-        "billable-usage-api_usage_response": billable_usage_api_usage_response_output,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_usage_record": billable$$usage$$api_usage_record,
+        "billable-usage-api_usage_response": billable$$usage$$api_usage_response,
       },
     },
     annotations: {
@@ -437,53 +492,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billable-usage-api_api-response-common-failure": billable_usage_api_api_response_common_failure_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_usage_record": billable_usage_api_usage_record_output,
-        "billable-usage-api_usage_response": billable_usage_api_usage_response_output,
+        "billable-usage-api_api-response-common-failure": billable$$usage$$api_api$$response$$common$$failure,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_usage_record": billable$$usage$$api_usage_record,
+        "billable-usage-api_usage_response": billable$$usage$$api_usage_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/billable-usage`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
       ],
     }),
   },
   {
     name: "billing_usage_query",
     title: "Query Account Usage (Version 2, Alpha, Restricted)",
-    description: "Returns cost and usage data for a single Cloudflare account, aligned\nwith the [FinOps FOCUS v1.3](https://focus.finops.org/focus-specification/v1-3/)\nCost and Usage dataset specification.\n\nThis is the filterable counterpart to `GET` on the same path. It is a\nread-only operation and requires only the `#billing:read` permission;\n`POST` is used so that filter criteria can be supplied in a request body\nrather than in the query string.\n\nEach record represents one billable metric for one account on one day.\nThis includes all metered usage, including usage that falls within\nfree-tier allowances and may result in zero cost.\n\n**Note:** Cost and pricing fields are populated only when `Metric`\nis `cost`; otherwise they are absent from responses.\n\nThe request body is optional. When it is omitted, or when `TimePeriod`\nis omitted, the range defaults to the start of the current month through\ntoday. The maximum date range is 31 days.\n\nFilters of different kinds are combined with AND. Values within one tag\nfilter are combined with OR. Filter values that do not match usage\nproduce an empty result set.\n\nResults can be grouped by up to two groups, in any combination of\ndimension keys and resource-tag keys. Tag groups are returned in the\n`Tags` field. Usage without a requested tag remains in an untagged\ngroup, with that key omitted from `Tags`.\n\nRequests that use tag filtering or tag grouping return HTTP 400 when the\nunderlying usage data source does not support tags.\n\nRequests that use dimension grouping return HTTP 400 when the\nunderlying usage data source does not support dimensions.",
+    description: "Returns cost and usage data for a single Cloudflare account, aligned\nwith the [FinOps FOCUS v1.3](https://focus.finops.org/focus-specification/v1-3/)\nCost and Usage dataset specification.\n\nThis is the filterable counterpart to `GET` on the same path. It is a\nread-only operation and requires only the `#billing:read` permission;\n`POST` is used so that filter criteria can be supplied in a request body\nrather than in the query string.\n\nEach record represents one billable metric for one account on one day.\nThis includes all metered usage, including usage that falls within\nfree-tier allowances and may result in zero cost.\n\n**Note:** Cost and pricing fields are populated only when `Metric`\nis `cost`; otherwise they are absent from responses.\n\nThe request body is optional. When it is omitted, or when `TimePeriod`\nis omitted, the range defaults to the start of the current month through\ntoday. The maximum date range is 31 days.\n\nFilters of different kinds are combined with AND. Values within one tag\nfilter are combined with OR. Filter values that do not match usage\nproduce an empty result set.\n\nResults can be grouped by up to two groups, in any combination of\ndimension keys and resource-tag keys. Tag groups are returned in the\n`Tags` field. Usage without a requested tag remains in an untagged\ngroup, with that key omitted from `Tags`.\n\nRequests that use tag filtering or tag grouping return HTTP 400 when the\nunderlying usage data source does not support tags.\n\nRequests that use dimension grouping return HTTP 400 when the\nunderlying usage data source does not support dimensions.\n\nPOST /accounts/{account_id}/billable/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/billable-usage-api_identifier",
-          "description": "Identifies the Cloudflare account."
-        },
         "body": {
           "$ref": "#/$defs/billable-usage-api_v2_usage_query"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifies the Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "billable-usage-api_identifier": billable_usage_api_identifier,
-        "billable-usage-api_v2_filter_by": billable_usage_api_v2_filter_by,
-        "billable-usage-api_v2_group_by": billable_usage_api_v2_group_by,
-        "billable-usage-api_v2_tag_filter": billable_usage_api_v2_tag_filter,
-        "billable-usage-api_v2_time_period": billable_usage_api_v2_time_period,
-        "billable-usage-api_v2_usage_query": billable_usage_api_v2_usage_query,
+        "billable-usage-api_v2_filter_by": billable$$usage$$api_v2_filter_by,
+        "billable-usage-api_v2_group_by": billable$$usage$$api_v2_group_by,
+        "billable-usage-api_v2_tag_filter": billable$$usage$$api_v2_tag_filter,
+        "billable-usage-api_v2_time_period": billable$$usage$$api_v2_time_period,
+        "billable-usage-api_v2_usage_query": billable$$usage$$api_v2_usage_query,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/billable-usage-api_v2_usage_response",
       $defs: {
-        "billable-usage-api_cost_and_usage_data": billable_usage_api_cost_and_usage_data_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_v2_usage_response": billable_usage_api_v2_usage_response_output,
+        "billable-usage-api_cost_and_usage_data": billable$$usage$$api_cost_and_usage_data,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_v2_usage_response": billable$$usage$$api_v2_usage_response,
       },
     },
     annotations: {
@@ -513,10 +577,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billable-usage-api_api-response-common-failure": billable_usage_api_api_response_common_failure_output,
-        "billable-usage-api_cost_and_usage_data": billable_usage_api_cost_and_usage_data_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_v2_usage_response": billable_usage_api_v2_usage_response_output,
+        "billable-usage-api_api-response-common-failure": billable$$usage$$api_api$$response$$common$$failure,
+        "billable-usage-api_cost_and_usage_data": billable$$usage$$api_cost_and_usage_data,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_v2_usage_response": billable$$usage$$api_v2_usage_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/botManagement/feedback/outputs.ts b/src/generated/forge-mcp/botManagement/feedback/outputs.ts
index ebe6a0caa..bf5da049a 100644
--- a/src/generated/forge-mcp/botManagement/feedback/outputs.ts
+++ b/src/generated/forge-mcp/botManagement/feedback/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bot-management_feedback_report` in responses.
  */
-export const bot_management_feedback_report_output: JsonSchema = {
+export const bot$$management_feedback_report: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -42,7 +42,11 @@ export const bot_management_feedback_report_output: JsonSchema = {
       "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/bot-management_feedback_type"
+      "enum": [
+        "false_positive",
+        "false_negative"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -59,21 +63,10 @@ export const bot_management_feedback_report_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `bot-management_feedback_type` in responses.
- */
-export const bot_management_feedback_type_output: JsonSchema = {
-  "enum": [
-    "false_positive",
-    "false_negative"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_metric_requests` in responses.
  */
-export const bot_management_metric_requests_output: JsonSchema = {
+export const bot$$management_metric_requests: JsonSchema = {
   "properties": {
     "metric": {
       "type": "string"
@@ -92,7 +85,7 @@ export const bot_management_metric_requests_output: JsonSchema = {
 /**
  * The schema of `bot-management_requests_by_attribute` in responses.
  */
-export const bot_management_requests_by_attribute_output: JsonSchema = {
+export const bot$$management_requests_by_attribute: JsonSchema = {
   "additionalProperties": {
     "items": {
       "$ref": "#/$defs/bot-management_metric_requests"
@@ -105,7 +98,7 @@ export const bot_management_requests_by_attribute_output: JsonSchema = {
 /**
  * The schema of `bot-management_requests_by_score` in responses.
  */
-export const bot_management_requests_by_score_output: JsonSchema = {
+export const bot$$management_requests_by_score: JsonSchema = {
   "additionalProperties": {
     "type": "integer"
   },
@@ -115,7 +108,7 @@ export const bot_management_requests_by_score_output: JsonSchema = {
 /**
  * The schema of `bot-management_requests_by_score_src` in responses.
  */
-export const bot_management_requests_by_score_src_output: JsonSchema = {
+export const bot$$management_requests_by_score_src: JsonSchema = {
   "additionalProperties": {
     "type": "integer"
   },
diff --git a/src/generated/forge-mcp/botManagement/feedback/schemas.ts b/src/generated/forge-mcp/botManagement/feedback/schemas.ts
index 3851d67eb..952de1eee 100644
--- a/src/generated/forge-mcp/botManagement/feedback/schemas.ts
+++ b/src/generated/forge-mcp/botManagement/feedback/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bot-management_feedback_report`.
  */
-export const bot_management_feedback_report: JsonSchema = {
+export const bot$$management_feedback_report: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -42,8 +42,12 @@ export const bot_management_feedback_report: JsonSchema = {
       "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/bot-management_feedback_type",
-      "description": "Type of feedback report."
+      "description": "Type of feedback report.",
+      "enum": [
+        "false_positive",
+        "false_negative"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -60,22 +64,10 @@ export const bot_management_feedback_report: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `bot-management_feedback_type`.
- */
-export const bot_management_feedback_type: JsonSchema = {
-  "description": "Type of feedback report.",
-  "enum": [
-    "false_positive",
-    "false_negative"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_metric_requests`.
  */
-export const bot_management_metric_requests: JsonSchema = {
+export const bot$$management_metric_requests: JsonSchema = {
   "properties": {
     "metric": {
       "type": "string"
@@ -94,7 +86,7 @@ export const bot_management_metric_requests: JsonSchema = {
 /**
  * The schema of `bot-management_requests_by_attribute`.
  */
-export const bot_management_requests_by_attribute: JsonSchema = {
+export const bot$$management_requests_by_attribute: JsonSchema = {
   "additionalProperties": {
     "items": {
       "$ref": "#/$defs/bot-management_metric_requests"
@@ -108,7 +100,7 @@ export const bot_management_requests_by_attribute: JsonSchema = {
 /**
  * The schema of `bot-management_requests_by_score`.
  */
-export const bot_management_requests_by_score: JsonSchema = {
+export const bot$$management_requests_by_score: JsonSchema = {
   "additionalProperties": {
     "type": "integer"
   },
@@ -119,7 +111,7 @@ export const bot_management_requests_by_score: JsonSchema = {
 /**
  * The schema of `bot-management_requests_by_score_src`.
  */
-export const bot_management_requests_by_score_src: JsonSchema = {
+export const bot$$management_requests_by_score_src: JsonSchema = {
   "additionalProperties": {
     "type": "integer"
   },
diff --git a/src/generated/forge-mcp/botManagement/feedback/tools.ts b/src/generated/forge-mcp/botManagement/feedback/tools.ts
index c82bf63d9..2427b0616 100644
--- a/src/generated/forge-mcp/botManagement/feedback/tools.ts
+++ b/src/generated/forge-mcp/botManagement/feedback/tools.ts
@@ -3,58 +3,63 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  bot_management_api_response_common_failure_output,
-  bot_management_messages_output,
+  bot$$management_api$$response$$common$$failure,
+  bot$$management_messages,
 } from "../outputs.js";
-import { bot_management_identifier } from "../schemas.js";
 import {
-  bot_management_feedback_report_output,
-  bot_management_feedback_type_output,
-  bot_management_metric_requests_output,
-  bot_management_requests_by_attribute_output,
-  bot_management_requests_by_score_output,
-  bot_management_requests_by_score_src_output,
+  bot$$management_feedback_report,
+  bot$$management_metric_requests,
+  bot$$management_requests_by_attribute,
+  bot$$management_requests_by_score,
+  bot$$management_requests_by_score_src,
 } from "./outputs.js";
 import {
-  bot_management_feedback_report,
-  bot_management_feedback_type,
-  bot_management_metric_requests,
-  bot_management_requests_by_attribute,
-  bot_management_requests_by_score,
-  bot_management_requests_by_score_src,
+  bot$$management_feedback_report as bot$$management_feedback_report$,
+  bot$$management_metric_requests as bot$$management_metric_requests$,
+  bot$$management_requests_by_attribute as bot$$management_requests_by_attribute$,
+  bot$$management_requests_by_score as bot$$management_requests_by_score$,
+  bot$$management_requests_by_score_src as bot$$management_requests_by_score_src$,
 } from "./schemas.js";
 
 /**
- * The tools of `bot_management.feedback`.
+ * The tools of `botManagement.feedback`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "bot_management_feedback_create",
+    name: "botManagement_feedback_create",
     title: "Submit a feedback report",
-    description: "Submit a feedback report for the specified zone. Use `type` to indicate whether the report is a false positive (good traffic flagged as bot) or a false negative (bot traffic missed). Furthermore, you can also use `expression` as a wirefilter to identify the affected traffic sample.\n\nSee more accepted API fields and expression types at https://developers.cloudflare.com/bots/concepts/feedback-loop/#api-fields and https://developers.cloudflare.com/bots/concepts/feedback-loop/#expression-fields, respectively.",
+    description: "Submit a feedback report for the specified zone. Use `type` to indicate whether the report is a false positive (good traffic flagged as bot) or a false negative (bot traffic missed). Furthermore, you can also use `expression` as a wirefilter to identify the affected traffic sample.\n\nSee more accepted API fields and expression types at https://developers.cloudflare.com/bots/concepts/feedback-loop/#api-fields and https://developers.cloudflare.com/bots/concepts/feedback-loop/#expression-fields, respectively.\n\nPOST /zones/{zone_id}/bot_management/feedback",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/bot-management_feedback_report"
         },
-        "zone_id": {
-          "$ref": "#/$defs/bot-management_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bot-management_feedback_report": bot_management_feedback_report,
-        "bot-management_feedback_type": bot_management_feedback_type,
-        "bot-management_identifier": bot_management_identifier,
-        "bot-management_metric_requests": bot_management_metric_requests,
-        "bot-management_requests_by_attribute": bot_management_requests_by_attribute,
-        "bot-management_requests_by_score": bot_management_requests_by_score,
-        "bot-management_requests_by_score_src": bot_management_requests_by_score_src,
+        "bot-management_feedback_report": bot$$management_feedback_report$,
+        "bot-management_metric_requests": bot$$management_metric_requests$,
+        "bot-management_requests_by_attribute": bot$$management_requests_by_attribute$,
+        "bot-management_requests_by_score": bot$$management_requests_by_score$,
+        "bot-management_requests_by_score_src": bot$$management_requests_by_score_src$,
       },
     },
     annotations: {
@@ -88,8 +93,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bot-management_api-response-common-failure": bot_management_api_response_common_failure_output,
-        "bot-management_messages": bot_management_messages_output,
+        "bot-management_api-response-common-failure": bot$$management_api$$response$$common$$failure,
+        "bot-management_messages": bot$$management_messages,
       },
     },
     request: (args) => ({
@@ -98,23 +103,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "bot_management_feedback_list",
+    name: "botManagement_feedback_list",
     title: "List zone feedback reports",
-    description: "Returns all feedback reports previously submitted for the specified zone. Feedback reports help improve detection by sharing samples of traffic that were misclassified as bots or humans.",
+    description: "Returns all feedback reports previously submitted for the specified zone. Feedback reports help improve detection by sharing samples of traffic that were misclassified as bots or humans.\n\nGET /zones/{zone_id}/bot_management/feedback",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/bot-management_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "bot-management_identifier": bot_management_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -122,12 +134,11 @@ export const tools: readonly Tool[] = [
       },
       "type": "array",
       $defs: {
-        "bot-management_feedback_report": bot_management_feedback_report_output,
-        "bot-management_feedback_type": bot_management_feedback_type_output,
-        "bot-management_metric_requests": bot_management_metric_requests_output,
-        "bot-management_requests_by_attribute": bot_management_requests_by_attribute_output,
-        "bot-management_requests_by_score": bot_management_requests_by_score_output,
-        "bot-management_requests_by_score_src": bot_management_requests_by_score_src_output,
+        "bot-management_feedback_report": bot$$management_feedback_report,
+        "bot-management_metric_requests": bot$$management_metric_requests,
+        "bot-management_requests_by_attribute": bot$$management_requests_by_attribute,
+        "bot-management_requests_by_score": bot$$management_requests_by_score,
+        "bot-management_requests_by_score_src": bot$$management_requests_by_score_src,
       },
     },
     annotations: {
@@ -166,14 +177,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bot-management_api-response-common-failure": bot_management_api_response_common_failure_output,
-        "bot-management_feedback_report": bot_management_feedback_report_output,
-        "bot-management_feedback_type": bot_management_feedback_type_output,
-        "bot-management_messages": bot_management_messages_output,
-        "bot-management_metric_requests": bot_management_metric_requests_output,
-        "bot-management_requests_by_attribute": bot_management_requests_by_attribute_output,
-        "bot-management_requests_by_score": bot_management_requests_by_score_output,
-        "bot-management_requests_by_score_src": bot_management_requests_by_score_src_output,
+        "bot-management_api-response-common-failure": bot$$management_api$$response$$common$$failure,
+        "bot-management_feedback_report": bot$$management_feedback_report,
+        "bot-management_messages": bot$$management_messages,
+        "bot-management_metric_requests": bot$$management_metric_requests,
+        "bot-management_requests_by_attribute": bot$$management_requests_by_attribute,
+        "bot-management_requests_by_score": bot$$management_requests_by_score,
+        "bot-management_requests_by_score_src": bot$$management_requests_by_score_src,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/botManagement/outputs.ts b/src/generated/forge-mcp/botManagement/outputs.ts
index 3a68148e2..f1aab8384 100644
--- a/src/generated/forge-mcp/botManagement/outputs.ts
+++ b/src/generated/forge-mcp/botManagement/outputs.ts
@@ -3,102 +3,59 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `bot-management_ai_agent_action` in responses.
- */
-export const bot_management_ai_agent_action_output: JsonSchema = {
-  "enum": [
-    "disabled",
-    "block",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_ai_agents` in responses.
  */
-export const bot_management_ai_agents_output: JsonSchema = {
+export const bot$$management_ai_agents: JsonSchema = {
   "properties": {
     "anthropic_agent": {
-      "$ref": "#/$defs/bot-management_ai_agent_action"
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "google_agent": {
-      "$ref": "#/$defs/bot-management_ai_agent_action"
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "instinct": {
-      "$ref": "#/$defs/bot-management_ai_agent_action"
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "muse": {
-      "$ref": "#/$defs/bot-management_ai_agent_action"
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "openai_agent": {
-      "$ref": "#/$defs/bot-management_ai_agent_action"
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `bot-management_ai_bots_migration_opt_out` in responses.
- */
-export const bot_management_ai_bots_migration_opt_out_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_ai_bots_protection` in responses.
- */
-export const bot_management_ai_bots_protection_output: JsonSchema = {
-  "enum": [
-    "block",
-    "disabled",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_ai_search` in responses.
- */
-export const bot_management_ai_search_output: JsonSchema = {
-  "enum": [
-    "disabled",
-    "block",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_ai_training` in responses.
- */
-export const bot_management_ai_training_output: JsonSchema = {
-  "enum": [
-    "disabled",
-    "disallow",
-    "block",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_ai_user` in responses.
- */
-export const bot_management_ai_user_output: JsonSchema = {
-  "enum": [
-    "disabled",
-    "block",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_api-response-common-failure` in responses.
  */
-export const bot_management_api_response_common_failure_output: JsonSchema = {
+export const bot$$management_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/bot-management_messages"
@@ -128,7 +85,7 @@ export const bot_management_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `bot-management_api-response-single` in responses.
  */
-export const bot_management_api_response_single_output: JsonSchema = {
+export const bot$$management_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/bot-management_messages"
@@ -151,75 +108,94 @@ export const bot_management_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `bot-management_auto_update_model` in responses.
- */
-export const bot_management_auto_update_model_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `bot-management_base_config` in responses.
  */
-export const bot_management_base_config_output: JsonSchema = {
+export const bot$$management_base_config: JsonSchema = {
   "properties": {
     "ai_agents": {
       "$ref": "#/$defs/bot-management_ai_agents"
     },
     "ai_bots_migration_opt_out": {
-      "$ref": "#/$defs/bot-management_ai_bots_migration_opt_out"
+      "type": "boolean"
     },
     "ai_bots_protection": {
-      "$ref": "#/$defs/bot-management_ai_bots_protection"
+      "enum": [
+        "block",
+        "disabled",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "ai_search": {
-      "$ref": "#/$defs/bot-management_ai_search"
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "ai_training": {
-      "$ref": "#/$defs/bot-management_ai_training"
+      "enum": [
+        "disabled",
+        "disallow",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "ai_user": {
-      "$ref": "#/$defs/bot-management_ai_user"
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "bot_preference_sync_enabled": {
-      "$ref": "#/$defs/bot-management_bot_preference_sync_enabled"
+      "type": "boolean"
     },
     "cf_robots_variant": {
-      "$ref": "#/$defs/bot-management_cf_robots_variant"
+      "enum": [
+        "off",
+        "policy_only"
+      ],
+      "type": "string"
     },
     "content_bots_protection": {
-      "$ref": "#/$defs/bot-management_content_bots_protection"
+      "enum": [
+        "block",
+        "disabled"
+      ],
+      "type": "string"
     },
     "crawler_protection": {
-      "$ref": "#/$defs/bot-management_crawler_protection"
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     },
     "enable_js": {
-      "$ref": "#/$defs/bot-management_enable_js"
+      "type": "boolean"
     },
     "is_robots_txt_managed": {
-      "$ref": "#/$defs/bot-management_is_robots_txt_managed"
+      "type": "boolean"
     },
     "jsd_api_results_enabled": {
-      "$ref": "#/$defs/bot-management_jsd_api_results_enabled"
+      "type": "boolean"
     },
     "using_latest_model": {
-      "$ref": "#/$defs/bot-management_using_latest_model"
+      "type": "boolean"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `bot-management_bm_cookie_enabled` in responses.
- */
-export const bot_management_bm_cookie_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `bot-management_bm_subscription_config` in responses.
  */
-export const bot_management_bm_subscription_config_output: JsonSchema = {
+export const bot$$management_bm_subscription_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_base_config"
@@ -227,36 +203,36 @@ export const bot_management_bm_subscription_config_output: JsonSchema = {
     {
       "properties": {
         "auto_update_model": {
-          "$ref": "#/$defs/bot-management_auto_update_model"
+          "type": "boolean"
         },
         "bm_cookie_enabled": {
-          "$ref": "#/$defs/bot-management_bm_cookie_enabled"
+          "type": "boolean"
         },
         "stale_zone_configuration": {
           "properties": {
             "fight_mode": {
-              "$ref": "#/$defs/bot-management_fight_mode_turned_on"
+              "type": "boolean"
             },
             "optimize_wordpress": {
-              "$ref": "#/$defs/bot-management_optimize_wordpress_turned_on"
+              "type": "boolean"
             },
             "sbfm_definitely_automated": {
-              "$ref": "#/$defs/bot-management_sbfm_definitely_automated_turned_on"
+              "type": "string"
             },
             "sbfm_likely_automated": {
-              "$ref": "#/$defs/bot-management_sbfm_likely_automated_turned_on"
+              "type": "string"
             },
             "sbfm_static_resource_protection": {
-              "$ref": "#/$defs/bot-management_sbfm_static_resource_protection_turned_on"
+              "type": "string"
             },
             "sbfm_verified_bots": {
-              "$ref": "#/$defs/bot-management_sbfm_verified_bots_turned_on"
+              "type": "string"
             }
           },
           "type": "object"
         },
         "suppress_session_score": {
-          "$ref": "#/$defs/bot-management_suppress_session_score"
+          "type": "boolean"
         }
       },
       "type": "object"
@@ -267,7 +243,7 @@ export const bot_management_bm_subscription_config_output: JsonSchema = {
 /**
  * The schema of `bot-management_bot_fight_mode_config` in responses.
  */
-export const bot_management_bot_fight_mode_config_output: JsonSchema = {
+export const bot$$management_bot_fight_mode_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_base_config"
@@ -275,27 +251,27 @@ export const bot_management_bot_fight_mode_config_output: JsonSchema = {
     {
       "properties": {
         "fight_mode": {
-          "$ref": "#/$defs/bot-management_fight_mode"
+          "type": "boolean"
         },
         "stale_zone_configuration": {
           "properties": {
             "optimize_wordpress": {
-              "$ref": "#/$defs/bot-management_optimize_wordpress_turned_on"
+              "type": "boolean"
             },
             "sbfm_definitely_automated": {
-              "$ref": "#/$defs/bot-management_sbfm_definitely_automated_turned_on"
+              "type": "string"
             },
             "sbfm_likely_automated": {
-              "$ref": "#/$defs/bot-management_sbfm_likely_automated_turned_on"
+              "type": "string"
             },
             "sbfm_static_resource_protection": {
-              "$ref": "#/$defs/bot-management_sbfm_static_resource_protection_turned_on"
+              "type": "string"
             },
             "sbfm_verified_bots": {
-              "$ref": "#/$defs/bot-management_sbfm_verified_bots_turned_on"
+              "type": "string"
             },
             "suppress_session_score": {
-              "$ref": "#/$defs/bot-management_suppress_session_score_turned_off"
+              "type": "boolean"
             }
           },
           "type": "object"
@@ -309,7 +285,7 @@ export const bot_management_bot_fight_mode_config_output: JsonSchema = {
 /**
  * The schema of `bot-management_bot_management_response_body` in responses.
  */
-export const bot_management_bot_management_response_body_output: JsonSchema = {
+export const bot$$management_bot_management_response_body: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_api-response-single"
@@ -338,85 +314,10 @@ export const bot_management_bot_management_response_body_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `bot-management_bot_preference_sync_enabled` in responses.
- */
-export const bot_management_bot_preference_sync_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_cf_robots_variant` in responses.
- */
-export const bot_management_cf_robots_variant_output: JsonSchema = {
-  "enum": [
-    "off",
-    "policy_only"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_content_bots_protection` in responses.
- */
-export const bot_management_content_bots_protection_output: JsonSchema = {
-  "enum": [
-    "block",
-    "disabled"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_crawler_protection` in responses.
- */
-export const bot_management_crawler_protection_output: JsonSchema = {
-  "enum": [
-    "enabled",
-    "disabled"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_enable_js` in responses.
- */
-export const bot_management_enable_js_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_fight_mode` in responses.
- */
-export const bot_management_fight_mode_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_fight_mode_turned_on` in responses.
- */
-export const bot_management_fight_mode_turned_on_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_is_robots_txt_managed` in responses.
- */
-export const bot_management_is_robots_txt_managed_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_jsd_api_results_enabled` in responses.
- */
-export const bot_management_jsd_api_results_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `bot-management_messages` in responses.
  */
-export const bot_management_messages_output: JsonSchema = {
+export const bot$$management_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -446,44 +347,10 @@ export const bot_management_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `bot-management_optimize_wordpress` in responses.
- */
-export const bot_management_optimize_wordpress_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_optimize_wordpress_turned_on` in responses.
- */
-export const bot_management_optimize_wordpress_turned_on_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_sbfm_definitely_automated` in responses.
- */
-export const bot_management_sbfm_definitely_automated_output: JsonSchema = {
-  "enum": [
-    "allow",
-    "block",
-    "managed_challenge"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_sbfm_definitely_automated_turned_on` in
- * responses.
- */
-export const bot_management_sbfm_definitely_automated_turned_on_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_sbfm_definitely_config` in responses.
  */
-export const bot_management_sbfm_definitely_config_output: JsonSchema = {
+export const bot$$management_sbfm_definitely_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_base_config"
@@ -491,24 +358,33 @@ export const bot_management_sbfm_definitely_config_output: JsonSchema = {
     {
       "properties": {
         "optimize_wordpress": {
-          "$ref": "#/$defs/bot-management_optimize_wordpress"
+          "type": "boolean"
         },
         "sbfm_definitely_automated": {
-          "$ref": "#/$defs/bot-management_sbfm_definitely_automated"
+          "enum": [
+            "allow",
+            "block",
+            "managed_challenge"
+          ],
+          "type": "string"
         },
         "sbfm_static_resource_protection": {
-          "$ref": "#/$defs/bot-management_sbfm_static_resource_protection"
+          "type": "boolean"
         },
         "sbfm_verified_bots": {
-          "$ref": "#/$defs/bot-management_sbfm_verified_bots"
+          "enum": [
+            "allow",
+            "block"
+          ],
+          "type": "string"
         },
         "stale_zone_configuration": {
           "properties": {
             "fight_mode": {
-              "$ref": "#/$defs/bot-management_fight_mode_turned_on"
+              "type": "boolean"
             },
             "sbfm_likely_automated": {
-              "$ref": "#/$defs/bot-management_sbfm_likely_automated_turned_on"
+              "type": "string"
             }
           },
           "type": "object"
@@ -519,29 +395,10 @@ export const bot_management_sbfm_definitely_config_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `bot-management_sbfm_likely_automated` in responses.
- */
-export const bot_management_sbfm_likely_automated_output: JsonSchema = {
-  "enum": [
-    "allow",
-    "block",
-    "managed_challenge"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_sbfm_likely_automated_turned_on` in responses.
- */
-export const bot_management_sbfm_likely_automated_turned_on_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_sbfm_likely_config` in responses.
  */
-export const bot_management_sbfm_likely_config_output: JsonSchema = {
+export const bot$$management_sbfm_likely_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_base_config"
@@ -549,24 +406,38 @@ export const bot_management_sbfm_likely_config_output: JsonSchema = {
     {
       "properties": {
         "optimize_wordpress": {
-          "$ref": "#/$defs/bot-management_optimize_wordpress"
+          "type": "boolean"
         },
         "sbfm_definitely_automated": {
-          "$ref": "#/$defs/bot-management_sbfm_definitely_automated"
+          "enum": [
+            "allow",
+            "block",
+            "managed_challenge"
+          ],
+          "type": "string"
         },
         "sbfm_likely_automated": {
-          "$ref": "#/$defs/bot-management_sbfm_likely_automated"
+          "enum": [
+            "allow",
+            "block",
+            "managed_challenge"
+          ],
+          "type": "string"
         },
         "sbfm_static_resource_protection": {
-          "$ref": "#/$defs/bot-management_sbfm_static_resource_protection"
+          "type": "boolean"
         },
         "sbfm_verified_bots": {
-          "$ref": "#/$defs/bot-management_sbfm_verified_bots"
+          "enum": [
+            "allow",
+            "block"
+          ],
+          "type": "string"
         },
         "stale_zone_configuration": {
           "properties": {
             "fight_mode": {
-              "$ref": "#/$defs/bot-management_fight_mode_turned_on"
+              "type": "boolean"
             }
           },
           "type": "object"
@@ -576,58 +447,3 @@ export const bot_management_sbfm_likely_config_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `bot-management_sbfm_static_resource_protection` in responses.
- */
-export const bot_management_sbfm_static_resource_protection_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_sbfm_static_resource_protection_turned_on` in
- * responses.
- */
-export const bot_management_sbfm_static_resource_protection_turned_on_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_sbfm_verified_bots` in responses.
- */
-export const bot_management_sbfm_verified_bots_output: JsonSchema = {
-  "enum": [
-    "allow",
-    "block"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_sbfm_verified_bots_turned_on` in responses.
- */
-export const bot_management_sbfm_verified_bots_turned_on_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_suppress_session_score` in responses.
- */
-export const bot_management_suppress_session_score_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_suppress_session_score_turned_off` in
- * responses.
- */
-export const bot_management_suppress_session_score_turned_off_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_using_latest_model` in responses.
- */
-export const bot_management_using_latest_model_output: JsonSchema = {
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/botManagement/schemas.ts b/src/generated/forge-mcp/botManagement/schemas.ts
index f5e8338e9..33c87c0a2 100644
--- a/src/generated/forge-mcp/botManagement/schemas.ts
+++ b/src/generated/forge-mcp/botManagement/schemas.ts
@@ -3,122 +3,65 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `bot-management_ai_agent_action`.
- */
-export const bot_management_ai_agent_action: JsonSchema = {
-  "description": "Action to apply to one supported personal AI agent.",
-  "enum": [
-    "disabled",
-    "block",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_ai_agents`.
  */
-export const bot_management_ai_agents: JsonSchema = {
+export const bot$$management_ai_agents: JsonSchema = {
   "description": "Configure blocking behavior for supported personal AI agents.",
   "properties": {
     "anthropic_agent": {
-      "$ref": "#/$defs/bot-management_ai_agent_action",
-      "description": "Action to apply to one supported personal AI agent."
+      "description": "Action to apply to one supported personal AI agent.",
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "google_agent": {
-      "$ref": "#/$defs/bot-management_ai_agent_action",
-      "description": "Action to apply to one supported personal AI agent."
+      "description": "Action to apply to one supported personal AI agent.",
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "instinct": {
-      "$ref": "#/$defs/bot-management_ai_agent_action",
-      "description": "Action to apply to one supported personal AI agent."
+      "description": "Action to apply to one supported personal AI agent.",
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "muse": {
-      "$ref": "#/$defs/bot-management_ai_agent_action",
-      "description": "Action to apply to one supported personal AI agent."
+      "description": "Action to apply to one supported personal AI agent.",
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "openai_agent": {
-      "$ref": "#/$defs/bot-management_ai_agent_action",
-      "description": "Action to apply to one supported personal AI agent."
+      "description": "Action to apply to one supported personal AI agent.",
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `bot-management_ai_bots_migration_opt_out`.
- */
-export const bot_management_ai_bots_migration_opt_out: JsonSchema = {
-  "description": "Temporary migration flag tracking zones opted out of AI bots managed-rule updates.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_ai_bots_protection`.
- */
-export const bot_management_ai_bots_protection: JsonSchema = {
-  "description": "Enable rule to block AI Scrapers and Crawlers.",
-  "enum": [
-    "block",
-    "disabled",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_ai_search`.
- */
-export const bot_management_ai_search: JsonSchema = {
-  "description": "Configure robots.txt policy for AI search bots.",
-  "enum": [
-    "disabled",
-    "block",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_ai_training`.
- */
-export const bot_management_ai_training: JsonSchema = {
-  "description": "Configure robots.txt policy for AI model training bots.",
-  "enum": [
-    "disabled",
-    "disallow",
-    "block",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_ai_user`.
- */
-export const bot_management_ai_user: JsonSchema = {
-  "description": "Configure robots.txt policy for AI assistant and agent bots.",
-  "enum": [
-    "disabled",
-    "block",
-    "only_on_ad_pages"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_auto_update_model`.
- */
-export const bot_management_auto_update_model: JsonSchema = {
-  "description": "Automatically update to the newest bot detection models created by Cloudflare as they are released. [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)",
-  "type": "boolean"
-};
-
 /**
  * The schema of `bot-management_base_config`.
  */
-export const bot_management_base_config: JsonSchema = {
+export const bot$$management_base_config: JsonSchema = {
   "description": "Shared Config",
   "properties": {
     "ai_agents": {
@@ -126,72 +69,97 @@ export const bot_management_base_config: JsonSchema = {
       "description": "Configure blocking behavior for supported personal AI agents."
     },
     "ai_bots_migration_opt_out": {
-      "$ref": "#/$defs/bot-management_ai_bots_migration_opt_out",
       "default": false,
-      "description": "Temporary migration flag tracking zones opted out of AI bots managed-rule updates."
+      "description": "Temporary migration flag tracking zones opted out of AI bots managed-rule updates.",
+      "type": "boolean"
     },
     "ai_bots_protection": {
-      "$ref": "#/$defs/bot-management_ai_bots_protection",
-      "description": "Enable rule to block AI Scrapers and Crawlers."
+      "description": "Enable rule to block AI Scrapers and Crawlers.",
+      "enum": [
+        "block",
+        "disabled",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "ai_search": {
-      "$ref": "#/$defs/bot-management_ai_search",
-      "description": "Configure robots.txt policy for AI search bots."
+      "description": "Configure robots.txt policy for AI search bots.",
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "ai_training": {
-      "$ref": "#/$defs/bot-management_ai_training",
-      "description": "Configure robots.txt policy for AI model training bots."
+      "description": "Configure robots.txt policy for AI model training bots.",
+      "enum": [
+        "disabled",
+        "disallow",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "ai_user": {
-      "$ref": "#/$defs/bot-management_ai_user",
-      "description": "Configure robots.txt policy for AI assistant and agent bots."
+      "description": "Configure robots.txt policy for AI assistant and agent bots.",
+      "enum": [
+        "disabled",
+        "block",
+        "only_on_ad_pages"
+      ],
+      "type": "string"
     },
     "bot_preference_sync_enabled": {
-      "$ref": "#/$defs/bot-management_bot_preference_sync_enabled",
       "default": false,
-      "description": "Enable Bot Preference Sync for this zone. When enabled, Cloudflare can serve robots.txt content derived from the zone's AI Search, AI User, and AI Training preferences."
+      "description": "Enable Bot Preference Sync for this zone. When enabled, Cloudflare can serve robots.txt content derived from the zone's AI Search, AI User, and AI Training preferences.",
+      "type": "boolean"
     },
     "cf_robots_variant": {
-      "$ref": "#/$defs/bot-management_cf_robots_variant",
-      "description": "Specifies the Robots Access Control License variant to use."
+      "description": "Specifies the Robots Access Control License variant to use.",
+      "enum": [
+        "off",
+        "policy_only"
+      ],
+      "type": "string"
     },
     "content_bots_protection": {
-      "$ref": "#/$defs/bot-management_content_bots_protection",
-      "description": "Enable rule to block content bots. When enabled, blocks automated traffic with low bot scores, excluding safe verified bot categories. Exceptions should be managed via skip rules."
+      "description": "Enable rule to block content bots. When enabled, blocks automated traffic with low bot scores, excluding safe verified bot categories. Exceptions should be managed via skip rules.",
+      "enum": [
+        "block",
+        "disabled"
+      ],
+      "type": "string"
     },
     "crawler_protection": {
-      "$ref": "#/$defs/bot-management_crawler_protection",
-      "description": "Enable rule to punish AI Scrapers and Crawlers via a link maze."
+      "description": "Enable rule to punish AI Scrapers and Crawlers via a link maze.",
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     },
     "enable_js": {
-      "$ref": "#/$defs/bot-management_enable_js",
-      "description": "Use lightweight, invisible JavaScript detections to improve Bot Management. [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/)."
+      "description": "Use lightweight, invisible JavaScript detections to improve Bot Management. [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).",
+      "type": "boolean"
     },
     "is_robots_txt_managed": {
-      "$ref": "#/$defs/bot-management_is_robots_txt_managed",
       "default": false,
-      "description": "Enable cloudflare managed robots.txt. If an existing robots.txt is detected, then managed robots.txt will be prepended to the existing robots.txt."
+      "description": "Enable cloudflare managed robots.txt. If an existing robots.txt is detected, then managed robots.txt will be prepended to the existing robots.txt.",
+      "type": "boolean"
     },
     "jsd_api_results_enabled": {
-      "$ref": "#/$defs/bot-management_jsd_api_results_enabled",
-      "description": "Whether to use JavaScript Detection results submitted through the API for this zone."
+      "description": "Whether to use JavaScript Detection results submitted through the API for this zone.",
+      "type": "boolean"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `bot-management_bm_cookie_enabled`.
- */
-export const bot_management_bm_cookie_enabled: JsonSchema = {
-  "description": "Indicates that the bot management cookie can be placed on end user devices accessing the site. Defaults to true",
-  "type": "boolean"
-};
-
 /**
  * The schema of `bot-management_bm_subscription_config`.
  */
-export const bot_management_bm_subscription_config: JsonSchema = {
+export const bot$$management_bm_subscription_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_base_config"
@@ -199,16 +167,16 @@ export const bot_management_bm_subscription_config: JsonSchema = {
     {
       "properties": {
         "auto_update_model": {
-          "$ref": "#/$defs/bot-management_auto_update_model",
-          "description": "Automatically update to the newest bot detection models created by Cloudflare as they are released. [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)"
+          "description": "Automatically update to the newest bot detection models created by Cloudflare as they are released. [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)",
+          "type": "boolean"
         },
         "bm_cookie_enabled": {
-          "$ref": "#/$defs/bot-management_bm_cookie_enabled",
-          "description": "Indicates that the bot management cookie can be placed on end user devices accessing the site. Defaults to true"
+          "description": "Indicates that the bot management cookie can be placed on end user devices accessing the site. Defaults to true",
+          "type": "boolean"
         },
         "suppress_session_score": {
-          "$ref": "#/$defs/bot-management_suppress_session_score",
-          "description": "Whether to disable tracking the highest bot score for a session in the Bot Management cookie."
+          "description": "Whether to disable tracking the highest bot score for a session in the Bot Management cookie.",
+          "type": "boolean"
         }
       },
       "type": "object"
@@ -220,7 +188,7 @@ export const bot_management_bm_subscription_config: JsonSchema = {
 /**
  * The schema of `bot-management_bot_fight_mode_config`.
  */
-export const bot_management_bot_fight_mode_config: JsonSchema = {
+export const bot$$management_bot_fight_mode_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_base_config"
@@ -228,8 +196,8 @@ export const bot_management_bot_fight_mode_config: JsonSchema = {
     {
       "properties": {
         "fight_mode": {
-          "$ref": "#/$defs/bot-management_fight_mode",
-          "description": "Whether to enable Bot Fight Mode."
+          "description": "Whether to enable Bot Fight Mode.",
+          "type": "boolean"
         }
       },
       "type": "object"
@@ -238,30 +206,10 @@ export const bot_management_bot_fight_mode_config: JsonSchema = {
   "description": "Bot Fight Mode"
 };
 
-/**
- * The schema of `bot-management_bot_preference_sync_enabled`.
- */
-export const bot_management_bot_preference_sync_enabled: JsonSchema = {
-  "description": "Enable Bot Preference Sync for this zone. When enabled, Cloudflare can serve robots.txt content derived from the zone's AI Search, AI User, and AI Training preferences.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_cf_robots_variant`.
- */
-export const bot_management_cf_robots_variant: JsonSchema = {
-  "description": "Specifies the Robots Access Control License variant to use.",
-  "enum": [
-    "off",
-    "policy_only"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_config_single`.
  */
-export const bot_management_config_single: JsonSchema = {
+export const bot$$management_config_single: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/bot-management_bot_fight_mode_config"
@@ -278,95 +226,10 @@ export const bot_management_config_single: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `bot-management_content_bots_protection`.
- */
-export const bot_management_content_bots_protection: JsonSchema = {
-  "description": "Enable rule to block content bots. When enabled, blocks automated traffic with low bot scores, excluding safe verified bot categories. Exceptions should be managed via skip rules.",
-  "enum": [
-    "block",
-    "disabled"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_crawler_protection`.
- */
-export const bot_management_crawler_protection: JsonSchema = {
-  "description": "Enable rule to punish AI Scrapers and Crawlers via a link maze.",
-  "enum": [
-    "enabled",
-    "disabled"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_enable_js`.
- */
-export const bot_management_enable_js: JsonSchema = {
-  "description": "Use lightweight, invisible JavaScript detections to improve Bot Management. [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).",
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_fight_mode`.
- */
-export const bot_management_fight_mode: JsonSchema = {
-  "description": "Whether to enable Bot Fight Mode.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_identifier`.
- */
-export const bot_management_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_is_robots_txt_managed`.
- */
-export const bot_management_is_robots_txt_managed: JsonSchema = {
-  "description": "Enable cloudflare managed robots.txt. If an existing robots.txt is detected, then managed robots.txt will be prepended to the existing robots.txt.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_jsd_api_results_enabled`.
- */
-export const bot_management_jsd_api_results_enabled: JsonSchema = {
-  "description": "Whether to use JavaScript Detection results submitted through the API for this zone.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_optimize_wordpress`.
- */
-export const bot_management_optimize_wordpress: JsonSchema = {
-  "description": "Whether to optimize Super Bot Fight Mode protections for Wordpress.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_sbfm_definitely_automated`.
- */
-export const bot_management_sbfm_definitely_automated: JsonSchema = {
-  "description": "Super Bot Fight Mode (SBFM) action to take on definitely automated requests.",
-  "enum": [
-    "allow",
-    "block",
-    "managed_challenge"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_sbfm_definitely_config`.
  */
-export const bot_management_sbfm_definitely_config: JsonSchema = {
+export const bot$$management_sbfm_definitely_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_base_config"
@@ -374,20 +237,29 @@ export const bot_management_sbfm_definitely_config: JsonSchema = {
     {
       "properties": {
         "optimize_wordpress": {
-          "$ref": "#/$defs/bot-management_optimize_wordpress",
-          "description": "Whether to optimize Super Bot Fight Mode protections for Wordpress."
+          "description": "Whether to optimize Super Bot Fight Mode protections for Wordpress.",
+          "type": "boolean"
         },
         "sbfm_definitely_automated": {
-          "$ref": "#/$defs/bot-management_sbfm_definitely_automated",
-          "description": "Super Bot Fight Mode (SBFM) action to take on definitely automated requests."
+          "description": "Super Bot Fight Mode (SBFM) action to take on definitely automated requests.",
+          "enum": [
+            "allow",
+            "block",
+            "managed_challenge"
+          ],
+          "type": "string"
         },
         "sbfm_static_resource_protection": {
-          "$ref": "#/$defs/bot-management_sbfm_static_resource_protection",
-          "description": "Super Bot Fight Mode (SBFM) to enable static resource protection.\nEnable if static resources on your application need bot protection.\nNote: Static resource protection can also result in legitimate traffic being blocked.\n"
+          "description": "Super Bot Fight Mode (SBFM) to enable static resource protection.\nEnable if static resources on your application need bot protection.\nNote: Static resource protection can also result in legitimate traffic being blocked.",
+          "type": "boolean"
         },
         "sbfm_verified_bots": {
-          "$ref": "#/$defs/bot-management_sbfm_verified_bots",
-          "description": "Super Bot Fight Mode (SBFM) action to take on verified bots requests."
+          "description": "Super Bot Fight Mode (SBFM) action to take on verified bots requests.",
+          "enum": [
+            "allow",
+            "block"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -396,23 +268,10 @@ export const bot_management_sbfm_definitely_config: JsonSchema = {
   "description": "SBFM Pro Plan"
 };
 
-/**
- * The schema of `bot-management_sbfm_likely_automated`.
- */
-export const bot_management_sbfm_likely_automated: JsonSchema = {
-  "description": "Super Bot Fight Mode (SBFM) action to take on likely automated requests.",
-  "enum": [
-    "allow",
-    "block",
-    "managed_challenge"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bot-management_sbfm_likely_config`.
  */
-export const bot_management_sbfm_likely_config: JsonSchema = {
+export const bot$$management_sbfm_likely_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bot-management_base_config"
@@ -420,24 +279,38 @@ export const bot_management_sbfm_likely_config: JsonSchema = {
     {
       "properties": {
         "optimize_wordpress": {
-          "$ref": "#/$defs/bot-management_optimize_wordpress",
-          "description": "Whether to optimize Super Bot Fight Mode protections for Wordpress."
+          "description": "Whether to optimize Super Bot Fight Mode protections for Wordpress.",
+          "type": "boolean"
         },
         "sbfm_definitely_automated": {
-          "$ref": "#/$defs/bot-management_sbfm_definitely_automated",
-          "description": "Super Bot Fight Mode (SBFM) action to take on definitely automated requests."
+          "description": "Super Bot Fight Mode (SBFM) action to take on definitely automated requests.",
+          "enum": [
+            "allow",
+            "block",
+            "managed_challenge"
+          ],
+          "type": "string"
         },
         "sbfm_likely_automated": {
-          "$ref": "#/$defs/bot-management_sbfm_likely_automated",
-          "description": "Super Bot Fight Mode (SBFM) action to take on likely automated requests."
+          "description": "Super Bot Fight Mode (SBFM) action to take on likely automated requests.",
+          "enum": [
+            "allow",
+            "block",
+            "managed_challenge"
+          ],
+          "type": "string"
         },
         "sbfm_static_resource_protection": {
-          "$ref": "#/$defs/bot-management_sbfm_static_resource_protection",
-          "description": "Super Bot Fight Mode (SBFM) to enable static resource protection.\nEnable if static resources on your application need bot protection.\nNote: Static resource protection can also result in legitimate traffic being blocked.\n"
+          "description": "Super Bot Fight Mode (SBFM) to enable static resource protection.\nEnable if static resources on your application need bot protection.\nNote: Static resource protection can also result in legitimate traffic being blocked.",
+          "type": "boolean"
         },
         "sbfm_verified_bots": {
-          "$ref": "#/$defs/bot-management_sbfm_verified_bots",
-          "description": "Super Bot Fight Mode (SBFM) action to take on verified bots requests."
+          "description": "Super Bot Fight Mode (SBFM) action to take on verified bots requests.",
+          "enum": [
+            "allow",
+            "block"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -445,31 +318,3 @@ export const bot_management_sbfm_likely_config: JsonSchema = {
   ],
   "description": "SBFM Biz Plan"
 };
-
-/**
- * The schema of `bot-management_sbfm_static_resource_protection`.
- */
-export const bot_management_sbfm_static_resource_protection: JsonSchema = {
-  "description": "Super Bot Fight Mode (SBFM) to enable static resource protection.\nEnable if static resources on your application need bot protection.\nNote: Static resource protection can also result in legitimate traffic being blocked.\n",
-  "type": "boolean"
-};
-
-/**
- * The schema of `bot-management_sbfm_verified_bots`.
- */
-export const bot_management_sbfm_verified_bots: JsonSchema = {
-  "description": "Super Bot Fight Mode (SBFM) action to take on verified bots requests.",
-  "enum": [
-    "allow",
-    "block"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bot-management_suppress_session_score`.
- */
-export const bot_management_suppress_session_score: JsonSchema = {
-  "description": "Whether to disable tracking the highest bot score for a session in the Bot Management cookie.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/botManagement/tools.ts b/src/generated/forge-mcp/botManagement/tools.ts
index 2c84cf020..9012b2fc3 100644
--- a/src/generated/forge-mcp/botManagement/tools.ts
+++ b/src/generated/forge-mcp/botManagement/tools.ts
@@ -3,145 +3,69 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  bot_management_ai_agent_action_output,
-  bot_management_ai_agents_output,
-  bot_management_ai_bots_migration_opt_out_output,
-  bot_management_ai_bots_protection_output,
-  bot_management_ai_search_output,
-  bot_management_ai_training_output,
-  bot_management_ai_user_output,
-  bot_management_api_response_common_failure_output,
-  bot_management_api_response_single_output,
-  bot_management_auto_update_model_output,
-  bot_management_base_config_output,
-  bot_management_bm_cookie_enabled_output,
-  bot_management_bm_subscription_config_output,
-  bot_management_bot_fight_mode_config_output,
-  bot_management_bot_management_response_body_output,
-  bot_management_bot_preference_sync_enabled_output,
-  bot_management_cf_robots_variant_output,
-  bot_management_content_bots_protection_output,
-  bot_management_crawler_protection_output,
-  bot_management_enable_js_output,
-  bot_management_fight_mode_output,
-  bot_management_fight_mode_turned_on_output,
-  bot_management_is_robots_txt_managed_output,
-  bot_management_jsd_api_results_enabled_output,
-  bot_management_messages_output,
-  bot_management_optimize_wordpress_output,
-  bot_management_optimize_wordpress_turned_on_output,
-  bot_management_sbfm_definitely_automated_output,
-  bot_management_sbfm_definitely_automated_turned_on_output,
-  bot_management_sbfm_definitely_config_output,
-  bot_management_sbfm_likely_automated_output,
-  bot_management_sbfm_likely_automated_turned_on_output,
-  bot_management_sbfm_likely_config_output,
-  bot_management_sbfm_static_resource_protection_output,
-  bot_management_sbfm_static_resource_protection_turned_on_output,
-  bot_management_sbfm_verified_bots_output,
-  bot_management_sbfm_verified_bots_turned_on_output,
-  bot_management_suppress_session_score_output,
-  bot_management_suppress_session_score_turned_off_output,
-  bot_management_using_latest_model_output,
+  bot$$management_ai_agents,
+  bot$$management_api$$response$$common$$failure,
+  bot$$management_api$$response$$single,
+  bot$$management_base_config,
+  bot$$management_bm_subscription_config,
+  bot$$management_bot_fight_mode_config,
+  bot$$management_bot_management_response_body,
+  bot$$management_messages,
+  bot$$management_sbfm_definitely_config,
+  bot$$management_sbfm_likely_config,
 } from "./outputs.js";
 import {
-  bot_management_ai_agent_action,
-  bot_management_ai_agents,
-  bot_management_ai_bots_migration_opt_out,
-  bot_management_ai_bots_protection,
-  bot_management_ai_search,
-  bot_management_ai_training,
-  bot_management_ai_user,
-  bot_management_auto_update_model,
-  bot_management_base_config,
-  bot_management_bm_cookie_enabled,
-  bot_management_bm_subscription_config,
-  bot_management_bot_fight_mode_config,
-  bot_management_bot_preference_sync_enabled,
-  bot_management_cf_robots_variant,
-  bot_management_config_single,
-  bot_management_content_bots_protection,
-  bot_management_crawler_protection,
-  bot_management_enable_js,
-  bot_management_fight_mode,
-  bot_management_identifier,
-  bot_management_is_robots_txt_managed,
-  bot_management_jsd_api_results_enabled,
-  bot_management_optimize_wordpress,
-  bot_management_sbfm_definitely_automated,
-  bot_management_sbfm_definitely_config,
-  bot_management_sbfm_likely_automated,
-  bot_management_sbfm_likely_config,
-  bot_management_sbfm_static_resource_protection,
-  bot_management_sbfm_verified_bots,
-  bot_management_suppress_session_score,
+  bot$$management_ai_agents as bot$$management_ai_agents$,
+  bot$$management_base_config as bot$$management_base_config$,
+  bot$$management_bm_subscription_config as bot$$management_bm_subscription_config$,
+  bot$$management_bot_fight_mode_config as bot$$management_bot_fight_mode_config$,
+  bot$$management_config_single,
+  bot$$management_sbfm_definitely_config as bot$$management_sbfm_definitely_config$,
+  bot$$management_sbfm_likely_config as bot$$management_sbfm_likely_config$,
 } from "./schemas.js";
 
 /**
- * The tools of `bot_management`.
+ * The tools of `botManagement`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "bot_management_get",
+    name: "botManagement_get",
     title: "Get Zone Bot Management Config",
-    description: "Retrieve a zone's Bot Management Config",
+    description: "Retrieve a zone's Bot Management Config\n\nGET /zones/{zone_id}/bot_management",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/bot-management_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "bot-management_identifier": bot_management_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bot-management_bot_management_response_body",
       $defs: {
-        "bot-management_ai_agent_action": bot_management_ai_agent_action_output,
-        "bot-management_ai_agents": bot_management_ai_agents_output,
-        "bot-management_ai_bots_migration_opt_out": bot_management_ai_bots_migration_opt_out_output,
-        "bot-management_ai_bots_protection": bot_management_ai_bots_protection_output,
-        "bot-management_ai_search": bot_management_ai_search_output,
-        "bot-management_ai_training": bot_management_ai_training_output,
-        "bot-management_ai_user": bot_management_ai_user_output,
-        "bot-management_api-response-single": bot_management_api_response_single_output,
-        "bot-management_auto_update_model": bot_management_auto_update_model_output,
-        "bot-management_base_config": bot_management_base_config_output,
-        "bot-management_bm_cookie_enabled": bot_management_bm_cookie_enabled_output,
-        "bot-management_bm_subscription_config": bot_management_bm_subscription_config_output,
-        "bot-management_bot_fight_mode_config": bot_management_bot_fight_mode_config_output,
-        "bot-management_bot_management_response_body": bot_management_bot_management_response_body_output,
-        "bot-management_bot_preference_sync_enabled": bot_management_bot_preference_sync_enabled_output,
-        "bot-management_cf_robots_variant": bot_management_cf_robots_variant_output,
-        "bot-management_content_bots_protection": bot_management_content_bots_protection_output,
-        "bot-management_crawler_protection": bot_management_crawler_protection_output,
-        "bot-management_enable_js": bot_management_enable_js_output,
-        "bot-management_fight_mode": bot_management_fight_mode_output,
-        "bot-management_fight_mode_turned_on": bot_management_fight_mode_turned_on_output,
-        "bot-management_is_robots_txt_managed": bot_management_is_robots_txt_managed_output,
-        "bot-management_jsd_api_results_enabled": bot_management_jsd_api_results_enabled_output,
-        "bot-management_messages": bot_management_messages_output,
-        "bot-management_optimize_wordpress": bot_management_optimize_wordpress_output,
-        "bot-management_optimize_wordpress_turned_on": bot_management_optimize_wordpress_turned_on_output,
-        "bot-management_sbfm_definitely_automated": bot_management_sbfm_definitely_automated_output,
-        "bot-management_sbfm_definitely_automated_turned_on": bot_management_sbfm_definitely_automated_turned_on_output,
-        "bot-management_sbfm_definitely_config": bot_management_sbfm_definitely_config_output,
-        "bot-management_sbfm_likely_automated": bot_management_sbfm_likely_automated_output,
-        "bot-management_sbfm_likely_automated_turned_on": bot_management_sbfm_likely_automated_turned_on_output,
-        "bot-management_sbfm_likely_config": bot_management_sbfm_likely_config_output,
-        "bot-management_sbfm_static_resource_protection": bot_management_sbfm_static_resource_protection_output,
-        "bot-management_sbfm_static_resource_protection_turned_on": bot_management_sbfm_static_resource_protection_turned_on_output,
-        "bot-management_sbfm_verified_bots": bot_management_sbfm_verified_bots_output,
-        "bot-management_sbfm_verified_bots_turned_on": bot_management_sbfm_verified_bots_turned_on_output,
-        "bot-management_suppress_session_score": bot_management_suppress_session_score_output,
-        "bot-management_suppress_session_score_turned_off": bot_management_suppress_session_score_turned_off_output,
-        "bot-management_using_latest_model": bot_management_using_latest_model_output,
+        "bot-management_ai_agents": bot$$management_ai_agents,
+        "bot-management_api-response-single": bot$$management_api$$response$$single,
+        "bot-management_base_config": bot$$management_base_config,
+        "bot-management_bm_subscription_config": bot$$management_bm_subscription_config,
+        "bot-management_bot_fight_mode_config": bot$$management_bot_fight_mode_config,
+        "bot-management_bot_management_response_body": bot$$management_bot_management_response_body,
+        "bot-management_messages": bot$$management_messages,
+        "bot-management_sbfm_definitely_config": bot$$management_sbfm_definitely_config,
+        "bot-management_sbfm_likely_config": bot$$management_sbfm_likely_config,
       },
     },
     annotations: {
@@ -175,46 +99,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bot-management_ai_agent_action": bot_management_ai_agent_action_output,
-        "bot-management_ai_agents": bot_management_ai_agents_output,
-        "bot-management_ai_bots_migration_opt_out": bot_management_ai_bots_migration_opt_out_output,
-        "bot-management_ai_bots_protection": bot_management_ai_bots_protection_output,
-        "bot-management_ai_search": bot_management_ai_search_output,
-        "bot-management_ai_training": bot_management_ai_training_output,
-        "bot-management_ai_user": bot_management_ai_user_output,
-        "bot-management_api-response-common-failure": bot_management_api_response_common_failure_output,
-        "bot-management_api-response-single": bot_management_api_response_single_output,
-        "bot-management_auto_update_model": bot_management_auto_update_model_output,
-        "bot-management_base_config": bot_management_base_config_output,
-        "bot-management_bm_cookie_enabled": bot_management_bm_cookie_enabled_output,
-        "bot-management_bm_subscription_config": bot_management_bm_subscription_config_output,
-        "bot-management_bot_fight_mode_config": bot_management_bot_fight_mode_config_output,
-        "bot-management_bot_management_response_body": bot_management_bot_management_response_body_output,
-        "bot-management_bot_preference_sync_enabled": bot_management_bot_preference_sync_enabled_output,
-        "bot-management_cf_robots_variant": bot_management_cf_robots_variant_output,
-        "bot-management_content_bots_protection": bot_management_content_bots_protection_output,
-        "bot-management_crawler_protection": bot_management_crawler_protection_output,
-        "bot-management_enable_js": bot_management_enable_js_output,
-        "bot-management_fight_mode": bot_management_fight_mode_output,
-        "bot-management_fight_mode_turned_on": bot_management_fight_mode_turned_on_output,
-        "bot-management_is_robots_txt_managed": bot_management_is_robots_txt_managed_output,
-        "bot-management_jsd_api_results_enabled": bot_management_jsd_api_results_enabled_output,
-        "bot-management_messages": bot_management_messages_output,
-        "bot-management_optimize_wordpress": bot_management_optimize_wordpress_output,
-        "bot-management_optimize_wordpress_turned_on": bot_management_optimize_wordpress_turned_on_output,
-        "bot-management_sbfm_definitely_automated": bot_management_sbfm_definitely_automated_output,
-        "bot-management_sbfm_definitely_automated_turned_on": bot_management_sbfm_definitely_automated_turned_on_output,
-        "bot-management_sbfm_definitely_config": bot_management_sbfm_definitely_config_output,
-        "bot-management_sbfm_likely_automated": bot_management_sbfm_likely_automated_output,
-        "bot-management_sbfm_likely_automated_turned_on": bot_management_sbfm_likely_automated_turned_on_output,
-        "bot-management_sbfm_likely_config": bot_management_sbfm_likely_config_output,
-        "bot-management_sbfm_static_resource_protection": bot_management_sbfm_static_resource_protection_output,
-        "bot-management_sbfm_static_resource_protection_turned_on": bot_management_sbfm_static_resource_protection_turned_on_output,
-        "bot-management_sbfm_verified_bots": bot_management_sbfm_verified_bots_output,
-        "bot-management_sbfm_verified_bots_turned_on": bot_management_sbfm_verified_bots_turned_on_output,
-        "bot-management_suppress_session_score": bot_management_suppress_session_score_output,
-        "bot-management_suppress_session_score_turned_off": bot_management_suppress_session_score_turned_off_output,
-        "bot-management_using_latest_model": bot_management_using_latest_model_output,
+        "bot-management_ai_agents": bot$$management_ai_agents,
+        "bot-management_api-response-common-failure": bot$$management_api$$response$$common$$failure,
+        "bot-management_api-response-single": bot$$management_api$$response$$single,
+        "bot-management_base_config": bot$$management_base_config,
+        "bot-management_bm_subscription_config": bot$$management_bm_subscription_config,
+        "bot-management_bot_fight_mode_config": bot$$management_bot_fight_mode_config,
+        "bot-management_bot_management_response_body": bot$$management_bot_management_response_body,
+        "bot-management_messages": bot$$management_messages,
+        "bot-management_sbfm_definitely_config": bot$$management_sbfm_definitely_config,
+        "bot-management_sbfm_likely_config": bot$$management_sbfm_likely_config,
       },
     },
     request: (args) => ({
@@ -222,99 +116,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "bot_management_update",
+    name: "botManagement_update",
     title: "Update Zone Bot Management Config",
-    description: "Updates the Bot Management configuration for a zone.\n\nThis API is used to update:\n- **Bot Fight Mode**\n- **Super Bot Fight Mode**\n- **Bot Management for Enterprise**\n\nSee [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more information on the different plans\n\\\nIf you recently upgraded or downgraded your plan, refer to the following examples to clean up old configurations.\nCopy and paste the example body to remove old zone configurations based on your current plan.\n#### Clean up configuration for Bot Fight Mode plan\n```json\n{\n  \"sbfm_likely_automated\": \"allow\",\n  \"sbfm_definitely_automated\": \"allow\",\n  \"sbfm_verified_bots\": \"allow\",\n  \"sbfm_static_resource_protection\": false,\n  \"optimize_wordpress\": false,\n  \"suppress_session_score\": false\n}\n```\n#### Clean up configuration for SBFM Pro plan\n```json\n{\n  \"sbfm_likely_automated\": \"allow\",\n  \"fight_mode\": false\n}\n```\n#### Clean up configuration for SBFM Biz plan\n```json\n{\n  \"fight_mode\": false\n}\n```\n#### Clean up configuration for BM Enterprise Subscription plan\nIt is strongly recommended that you ensure you have [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to protect your zone before disabling the SBFM rules. Without these protections, your zone is vulnerable to attacks.\n```json\n{\n  \"sbfm_likely_automated\": \"allow\",\n  \"sbfm_definitely_automated\": \"allow\",\n  \"sbfm_verified_bots\": \"allow\",\n  \"sbfm_static_resource_protection\": false,\n  \"optimize_wordpress\": false,\n  \"fight_mode\": false\n}\n```",
+    description: "Updates the Bot Management configuration for a zone.\n\nThis API is used to update:\n- **Bot Fight Mode**\n- **Super Bot Fight Mode**\n- **Bot Management for Enterprise**\n\nSee [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more information on the different plans\n\\\nIf you recently upgraded or downgraded your plan, refer to the following examples to clean up old configurations.\nCopy and paste the example body to remove old zone configurations based on your current plan.\n#### Clean up configuration for Bot Fight Mode plan\n```json\n{\n  \"sbfm_likely_automated\": \"allow\",\n  \"sbfm_definitely_automated\": \"allow\",\n  \"sbfm_verified_bots\": \"allow\",\n  \"sbfm_static_resource_protection\": false,\n  \"optimize_wordpress\": false,\n  \"suppress_session_score\": false\n}\n```\n#### Clean up configuration for SBFM Pro plan\n```json\n{\n  \"sbfm_likely_automated\": \"allow\",\n  \"fight_mode\": false\n}\n```\n#### Clean up configuration for SBFM Biz plan\n```json\n{\n  \"fight_mode\": false\n}\n```\n#### Clean up configuration for BM Enterprise Subscription plan\nIt is strongly recommended that you ensure you have [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to protect your zone before disabling the SBFM rules. Without these protections, your zone is vulnerable to attacks.\n```json\n{\n  \"sbfm_likely_automated\": \"allow\",\n  \"sbfm_definitely_automated\": \"allow\",\n  \"sbfm_verified_bots\": \"allow\",\n  \"sbfm_static_resource_protection\": false,\n  \"optimize_wordpress\": false,\n  \"fight_mode\": false\n}\n```\n\nPUT /zones/{zone_id}/bot_management",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/bot-management_config_single"
         },
-        "zone_id": {
-          "$ref": "#/$defs/bot-management_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bot-management_ai_agent_action": bot_management_ai_agent_action,
-        "bot-management_ai_agents": bot_management_ai_agents,
-        "bot-management_ai_bots_migration_opt_out": bot_management_ai_bots_migration_opt_out,
-        "bot-management_ai_bots_protection": bot_management_ai_bots_protection,
-        "bot-management_ai_search": bot_management_ai_search,
-        "bot-management_ai_training": bot_management_ai_training,
-        "bot-management_ai_user": bot_management_ai_user,
-        "bot-management_auto_update_model": bot_management_auto_update_model,
-        "bot-management_base_config": bot_management_base_config,
-        "bot-management_bm_cookie_enabled": bot_management_bm_cookie_enabled,
-        "bot-management_bm_subscription_config": bot_management_bm_subscription_config,
-        "bot-management_bot_fight_mode_config": bot_management_bot_fight_mode_config,
-        "bot-management_bot_preference_sync_enabled": bot_management_bot_preference_sync_enabled,
-        "bot-management_cf_robots_variant": bot_management_cf_robots_variant,
-        "bot-management_config_single": bot_management_config_single,
-        "bot-management_content_bots_protection": bot_management_content_bots_protection,
-        "bot-management_crawler_protection": bot_management_crawler_protection,
-        "bot-management_enable_js": bot_management_enable_js,
-        "bot-management_fight_mode": bot_management_fight_mode,
-        "bot-management_identifier": bot_management_identifier,
-        "bot-management_is_robots_txt_managed": bot_management_is_robots_txt_managed,
-        "bot-management_jsd_api_results_enabled": bot_management_jsd_api_results_enabled,
-        "bot-management_optimize_wordpress": bot_management_optimize_wordpress,
-        "bot-management_sbfm_definitely_automated": bot_management_sbfm_definitely_automated,
-        "bot-management_sbfm_definitely_config": bot_management_sbfm_definitely_config,
-        "bot-management_sbfm_likely_automated": bot_management_sbfm_likely_automated,
-        "bot-management_sbfm_likely_config": bot_management_sbfm_likely_config,
-        "bot-management_sbfm_static_resource_protection": bot_management_sbfm_static_resource_protection,
-        "bot-management_sbfm_verified_bots": bot_management_sbfm_verified_bots,
-        "bot-management_suppress_session_score": bot_management_suppress_session_score,
+        "bot-management_ai_agents": bot$$management_ai_agents$,
+        "bot-management_base_config": bot$$management_base_config$,
+        "bot-management_bm_subscription_config": bot$$management_bm_subscription_config$,
+        "bot-management_bot_fight_mode_config": bot$$management_bot_fight_mode_config$,
+        "bot-management_config_single": bot$$management_config_single,
+        "bot-management_sbfm_definitely_config": bot$$management_sbfm_definitely_config$,
+        "bot-management_sbfm_likely_config": bot$$management_sbfm_likely_config$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bot-management_bot_management_response_body",
       $defs: {
-        "bot-management_ai_agent_action": bot_management_ai_agent_action_output,
-        "bot-management_ai_agents": bot_management_ai_agents_output,
-        "bot-management_ai_bots_migration_opt_out": bot_management_ai_bots_migration_opt_out_output,
-        "bot-management_ai_bots_protection": bot_management_ai_bots_protection_output,
-        "bot-management_ai_search": bot_management_ai_search_output,
-        "bot-management_ai_training": bot_management_ai_training_output,
-        "bot-management_ai_user": bot_management_ai_user_output,
-        "bot-management_api-response-single": bot_management_api_response_single_output,
-        "bot-management_auto_update_model": bot_management_auto_update_model_output,
-        "bot-management_base_config": bot_management_base_config_output,
-        "bot-management_bm_cookie_enabled": bot_management_bm_cookie_enabled_output,
-        "bot-management_bm_subscription_config": bot_management_bm_subscription_config_output,
-        "bot-management_bot_fight_mode_config": bot_management_bot_fight_mode_config_output,
-        "bot-management_bot_management_response_body": bot_management_bot_management_response_body_output,
-        "bot-management_bot_preference_sync_enabled": bot_management_bot_preference_sync_enabled_output,
-        "bot-management_cf_robots_variant": bot_management_cf_robots_variant_output,
-        "bot-management_content_bots_protection": bot_management_content_bots_protection_output,
-        "bot-management_crawler_protection": bot_management_crawler_protection_output,
-        "bot-management_enable_js": bot_management_enable_js_output,
-        "bot-management_fight_mode": bot_management_fight_mode_output,
-        "bot-management_fight_mode_turned_on": bot_management_fight_mode_turned_on_output,
-        "bot-management_is_robots_txt_managed": bot_management_is_robots_txt_managed_output,
-        "bot-management_jsd_api_results_enabled": bot_management_jsd_api_results_enabled_output,
-        "bot-management_messages": bot_management_messages_output,
-        "bot-management_optimize_wordpress": bot_management_optimize_wordpress_output,
-        "bot-management_optimize_wordpress_turned_on": bot_management_optimize_wordpress_turned_on_output,
-        "bot-management_sbfm_definitely_automated": bot_management_sbfm_definitely_automated_output,
-        "bot-management_sbfm_definitely_automated_turned_on": bot_management_sbfm_definitely_automated_turned_on_output,
-        "bot-management_sbfm_definitely_config": bot_management_sbfm_definitely_config_output,
-        "bot-management_sbfm_likely_automated": bot_management_sbfm_likely_automated_output,
-        "bot-management_sbfm_likely_automated_turned_on": bot_management_sbfm_likely_automated_turned_on_output,
-        "bot-management_sbfm_likely_config": bot_management_sbfm_likely_config_output,
-        "bot-management_sbfm_static_resource_protection": bot_management_sbfm_static_resource_protection_output,
-        "bot-management_sbfm_static_resource_protection_turned_on": bot_management_sbfm_static_resource_protection_turned_on_output,
-        "bot-management_sbfm_verified_bots": bot_management_sbfm_verified_bots_output,
-        "bot-management_sbfm_verified_bots_turned_on": bot_management_sbfm_verified_bots_turned_on_output,
-        "bot-management_suppress_session_score": bot_management_suppress_session_score_output,
-        "bot-management_suppress_session_score_turned_off": bot_management_suppress_session_score_turned_off_output,
-        "bot-management_using_latest_model": bot_management_using_latest_model_output,
+        "bot-management_ai_agents": bot$$management_ai_agents,
+        "bot-management_api-response-single": bot$$management_api$$response$$single,
+        "bot-management_base_config": bot$$management_base_config,
+        "bot-management_bm_subscription_config": bot$$management_bm_subscription_config,
+        "bot-management_bot_fight_mode_config": bot$$management_bot_fight_mode_config,
+        "bot-management_bot_management_response_body": bot$$management_bot_management_response_body,
+        "bot-management_messages": bot$$management_messages,
+        "bot-management_sbfm_definitely_config": bot$$management_sbfm_definitely_config,
+        "bot-management_sbfm_likely_config": bot$$management_sbfm_likely_config,
       },
     },
     annotations: {
@@ -347,46 +198,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bot-management_ai_agent_action": bot_management_ai_agent_action_output,
-        "bot-management_ai_agents": bot_management_ai_agents_output,
-        "bot-management_ai_bots_migration_opt_out": bot_management_ai_bots_migration_opt_out_output,
-        "bot-management_ai_bots_protection": bot_management_ai_bots_protection_output,
-        "bot-management_ai_search": bot_management_ai_search_output,
-        "bot-management_ai_training": bot_management_ai_training_output,
-        "bot-management_ai_user": bot_management_ai_user_output,
-        "bot-management_api-response-common-failure": bot_management_api_response_common_failure_output,
-        "bot-management_api-response-single": bot_management_api_response_single_output,
-        "bot-management_auto_update_model": bot_management_auto_update_model_output,
-        "bot-management_base_config": bot_management_base_config_output,
-        "bot-management_bm_cookie_enabled": bot_management_bm_cookie_enabled_output,
-        "bot-management_bm_subscription_config": bot_management_bm_subscription_config_output,
-        "bot-management_bot_fight_mode_config": bot_management_bot_fight_mode_config_output,
-        "bot-management_bot_management_response_body": bot_management_bot_management_response_body_output,
-        "bot-management_bot_preference_sync_enabled": bot_management_bot_preference_sync_enabled_output,
-        "bot-management_cf_robots_variant": bot_management_cf_robots_variant_output,
-        "bot-management_content_bots_protection": bot_management_content_bots_protection_output,
-        "bot-management_crawler_protection": bot_management_crawler_protection_output,
-        "bot-management_enable_js": bot_management_enable_js_output,
-        "bot-management_fight_mode": bot_management_fight_mode_output,
-        "bot-management_fight_mode_turned_on": bot_management_fight_mode_turned_on_output,
-        "bot-management_is_robots_txt_managed": bot_management_is_robots_txt_managed_output,
-        "bot-management_jsd_api_results_enabled": bot_management_jsd_api_results_enabled_output,
-        "bot-management_messages": bot_management_messages_output,
-        "bot-management_optimize_wordpress": bot_management_optimize_wordpress_output,
-        "bot-management_optimize_wordpress_turned_on": bot_management_optimize_wordpress_turned_on_output,
-        "bot-management_sbfm_definitely_automated": bot_management_sbfm_definitely_automated_output,
-        "bot-management_sbfm_definitely_automated_turned_on": bot_management_sbfm_definitely_automated_turned_on_output,
-        "bot-management_sbfm_definitely_config": bot_management_sbfm_definitely_config_output,
-        "bot-management_sbfm_likely_automated": bot_management_sbfm_likely_automated_output,
-        "bot-management_sbfm_likely_automated_turned_on": bot_management_sbfm_likely_automated_turned_on_output,
-        "bot-management_sbfm_likely_config": bot_management_sbfm_likely_config_output,
-        "bot-management_sbfm_static_resource_protection": bot_management_sbfm_static_resource_protection_output,
-        "bot-management_sbfm_static_resource_protection_turned_on": bot_management_sbfm_static_resource_protection_turned_on_output,
-        "bot-management_sbfm_verified_bots": bot_management_sbfm_verified_bots_output,
-        "bot-management_sbfm_verified_bots_turned_on": bot_management_sbfm_verified_bots_turned_on_output,
-        "bot-management_suppress_session_score": bot_management_suppress_session_score_output,
-        "bot-management_suppress_session_score_turned_off": bot_management_suppress_session_score_turned_off_output,
-        "bot-management_using_latest_model": bot_management_using_latest_model_output,
+        "bot-management_ai_agents": bot$$management_ai_agents,
+        "bot-management_api-response-common-failure": bot$$management_api$$response$$common$$failure,
+        "bot-management_api-response-single": bot$$management_api$$response$$single,
+        "bot-management_base_config": bot$$management_base_config,
+        "bot-management_bm_subscription_config": bot$$management_bm_subscription_config,
+        "bot-management_bot_fight_mode_config": bot$$management_bot_fight_mode_config,
+        "bot-management_bot_management_response_body": bot$$management_bot_management_response_body,
+        "bot-management_messages": bot$$management_messages,
+        "bot-management_sbfm_definitely_config": bot$$management_sbfm_definitely_config,
+        "bot-management_sbfm_likely_config": bot$$management_sbfm_likely_config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/botnetFeed/asn/schemas.ts b/src/generated/forge-mcp/botnetFeed/asn/schemas.ts
deleted file mode 100644
index a629d7d20..000000000
--- a/src/generated/forge-mcp/botnetFeed/asn/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `botnet-feed-api_timestamp`.
- */
-export const botnet_feed_api_timestamp: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/botnetFeed/asn/tools.ts b/src/generated/forge-mcp/botnetFeed/asn/tools.ts
index 52adebccf..cec0feef5 100644
--- a/src/generated/forge-mcp/botnetFeed/asn/tools.ts
+++ b/src/generated/forge-mcp/botnetFeed/asn/tools.ts
@@ -1,46 +1,56 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  botnet_feed_api_api_response_common_failure_output,
-  botnet_feed_api_api_response_common_output,
-  botnet_feed_api_messages_output,
+  botnet$$feed$$api_api$$response$$common,
+  botnet$$feed$$api_api$$response$$common$$failure,
+  botnet$$feed$$api_messages,
 } from "../outputs.js";
-import { botnet_feed_api_asn, botnet_feed_api_identifier } from "../schemas.js";
-import { botnet_feed_api_timestamp } from "./schemas.js";
 
 /**
- * The tools of `botnet_feed.asn`.
+ * The tools of `botnetFeed.asn`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "botnet_feed_asn_day_report",
+    name: "botnetFeed_asn_dayReport",
     title: "Get daily report",
-    description: "Gets all the data the botnet tracking database has for a given ASN registered to user account for given date. If no date is given, it will return results for the previous day.",
+    description: "Gets all the data the botnet tracking database has for a given ASN registered to user account for given date. If no date is given, it will return results for the previous day.\n\nGET /accounts/{account_id}/botnet_feed/asn/{asn_id}/day_report",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/botnet-feed-api_identifier",
-          "description": "Identifier."
-        },
-        "asn_id": {
-          "$ref": "#/$defs/botnet-feed-api_asn"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "asn_id": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "asn_id"
+          ],
+          "type": "object"
         },
-        "date": {
-          "$ref": "#/$defs/botnet-feed-api_timestamp"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "date": {
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "asn_id"
+        "path"
       ],
-      $defs: {
-        "botnet-feed-api_asn": botnet_feed_api_asn,
-        "botnet-feed-api_identifier": botnet_feed_api_identifier,
-        "botnet-feed-api_timestamp": botnet_feed_api_timestamp,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -69,8 +79,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "botnet-feed-api_api-response-common": botnet_feed_api_api_response_common_output,
-        "botnet-feed-api_messages": botnet_feed_api_messages_output,
+        "botnet-feed-api_api-response-common": botnet$$feed$$api_api$$response$$common,
+        "botnet-feed-api_messages": botnet$$feed$$api_messages,
       },
     },
     annotations: {
@@ -122,41 +132,47 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "botnet-feed-api_api-response-common": botnet_feed_api_api_response_common_output,
-        "botnet-feed-api_api-response-common-failure": botnet_feed_api_api_response_common_failure_output,
-        "botnet-feed-api_messages": botnet_feed_api_messages_output,
+        "botnet-feed-api_api-response-common": botnet$$feed$$api_api$$response$$common,
+        "botnet-feed-api_api-response-common-failure": botnet$$feed$$api_api$$response$$common$$failure,
+        "botnet-feed-api_messages": botnet$$feed$$api_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/botnet_feed/asn/${pathParam(args, "asn_id")}/day_report`,
       query: [
-        ["date", args["date"], true],
+        ["date", param(args, "query", "date"), true],
       ],
     }),
   },
   {
-    name: "botnet_feed_asn_full_report",
+    name: "botnetFeed_asn_fullReport",
     title: "Get full report",
-    description: "Gets all the data the botnet threat feed tracking database has for a given ASN registered to user account.",
+    description: "Gets all the data the botnet threat feed tracking database has for a given ASN registered to user account.\n\nGET /accounts/{account_id}/botnet_feed/asn/{asn_id}/full_report",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/botnet-feed-api_identifier",
-          "description": "Identifier."
-        },
-        "asn_id": {
-          "$ref": "#/$defs/botnet-feed-api_asn"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "asn_id": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "asn_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "asn_id"
+        "path"
       ],
-      $defs: {
-        "botnet-feed-api_asn": botnet_feed_api_asn,
-        "botnet-feed-api_identifier": botnet_feed_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -185,8 +201,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "botnet-feed-api_api-response-common": botnet_feed_api_api_response_common_output,
-        "botnet-feed-api_messages": botnet_feed_api_messages_output,
+        "botnet-feed-api_api-response-common": botnet$$feed$$api_api$$response$$common,
+        "botnet-feed-api_messages": botnet$$feed$$api_messages,
       },
     },
     annotations: {
@@ -238,9 +254,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "botnet-feed-api_api-response-common": botnet_feed_api_api_response_common_output,
-        "botnet-feed-api_api-response-common-failure": botnet_feed_api_api_response_common_failure_output,
-        "botnet-feed-api_messages": botnet_feed_api_messages_output,
+        "botnet-feed-api_api-response-common": botnet$$feed$$api_api$$response$$common,
+        "botnet-feed-api_api-response-common-failure": botnet$$feed$$api_api$$response$$common$$failure,
+        "botnet-feed-api_messages": botnet$$feed$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/botnetFeed/configs/asn/tools.ts b/src/generated/forge-mcp/botnetFeed/configs/asn/tools.ts
index 5b301f74b..cab3c4f93 100644
--- a/src/generated/forge-mcp/botnetFeed/configs/asn/tools.ts
+++ b/src/generated/forge-mcp/botnetFeed/configs/asn/tools.ts
@@ -3,42 +3,44 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  botnet_feed_api_api_response_common_failure_output,
-  botnet_feed_api_api_response_common_output,
-  botnet_feed_api_messages_output,
+  botnet$$feed$$api_api$$response$$common,
+  botnet$$feed$$api_api$$response$$common$$failure,
+  botnet$$feed$$api_messages,
 } from "../../outputs.js";
-import {
-  botnet_feed_api_asn,
-  botnet_feed_api_identifier,
-} from "../../schemas.js";
 
 /**
- * The tools of `botnet_feed.configs.asn`.
+ * The tools of `botnetFeed.configs.asn`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "botnet_feed_configs_asn_delete",
+    name: "botnetFeed_configs_asn_delete",
     title: "Delete an ASN",
-    description: "Delete an ASN from botnet threat feed for a given user.",
+    description: "Delete an ASN from botnet threat feed for a given user.\n\nDELETE /accounts/{account_id}/botnet_feed/configs/asn/{asn_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/botnet-feed-api_identifier",
-          "description": "Identifier."
-        },
-        "asn_id": {
-          "$ref": "#/$defs/botnet-feed-api_asn"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "asn_id": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "asn_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "asn_id"
+        "path"
       ],
-      $defs: {
-        "botnet-feed-api_asn": botnet_feed_api_asn,
-        "botnet-feed-api_identifier": botnet_feed_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -60,8 +62,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "botnet-feed-api_api-response-common": botnet_feed_api_api_response_common_output,
-        "botnet-feed-api_messages": botnet_feed_api_messages_output,
+        "botnet-feed-api_api-response-common": botnet$$feed$$api_api$$response$$common,
+        "botnet-feed-api_messages": botnet$$feed$$api_messages,
       },
     },
     annotations: {
@@ -105,9 +107,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "botnet-feed-api_api-response-common": botnet_feed_api_api_response_common_output,
-        "botnet-feed-api_api-response-common-failure": botnet_feed_api_api_response_common_failure_output,
-        "botnet-feed-api_messages": botnet_feed_api_messages_output,
+        "botnet-feed-api_api-response-common": botnet$$feed$$api_api$$response$$common,
+        "botnet-feed-api_api-response-common-failure": botnet$$feed$$api_api$$response$$common$$failure,
+        "botnet-feed-api_messages": botnet$$feed$$api_messages,
       },
     },
     request: (args) => ({
@@ -115,23 +117,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "botnet_feed_configs_asn_get",
+    name: "botnetFeed_configs_asn_get",
     title: "Get list of ASNs",
-    description: "Gets a list of all ASNs registered for a user for the DDoS Botnet Feed API.",
+    description: "Gets a list of all ASNs registered for a user for the DDoS Botnet Feed API.\n\nGET /accounts/{account_id}/botnet_feed/configs/asn",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/botnet-feed-api_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "botnet-feed-api_identifier": botnet_feed_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -153,8 +162,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "botnet-feed-api_api-response-common": botnet_feed_api_api_response_common_output,
-        "botnet-feed-api_messages": botnet_feed_api_messages_output,
+        "botnet-feed-api_api-response-common": botnet$$feed$$api_api$$response$$common,
+        "botnet-feed-api_messages": botnet$$feed$$api_messages,
       },
     },
     annotations: {
@@ -199,9 +208,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "botnet-feed-api_api-response-common": botnet_feed_api_api_response_common_output,
-        "botnet-feed-api_api-response-common-failure": botnet_feed_api_api_response_common_failure_output,
-        "botnet-feed-api_messages": botnet_feed_api_messages_output,
+        "botnet-feed-api_api-response-common": botnet$$feed$$api_api$$response$$common,
+        "botnet-feed-api_api-response-common-failure": botnet$$feed$$api_api$$response$$common$$failure,
+        "botnet-feed-api_messages": botnet$$feed$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/botnetFeed/outputs.ts b/src/generated/forge-mcp/botnetFeed/outputs.ts
index 5aabdccf9..dd5e7429d 100644
--- a/src/generated/forge-mcp/botnetFeed/outputs.ts
+++ b/src/generated/forge-mcp/botnetFeed/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `botnet-feed-api_api-response-common` in responses.
  */
-export const botnet_feed_api_api_response_common_output: JsonSchema = {
+export const botnet$$feed$$api_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/botnet-feed-api_messages"
@@ -32,7 +32,7 @@ export const botnet_feed_api_api_response_common_output: JsonSchema = {
 /**
  * The schema of `botnet-feed-api_api-response-common-failure` in responses.
  */
-export const botnet_feed_api_api_response_common_failure_output: JsonSchema = {
+export const botnet$$feed$$api_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/botnet-feed-api_messages"
@@ -62,7 +62,7 @@ export const botnet_feed_api_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `botnet-feed-api_messages` in responses.
  */
-export const botnet_feed_api_messages_output: JsonSchema = {
+export const botnet$$feed$$api_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/botnetFeed/schemas.ts b/src/generated/forge-mcp/botnetFeed/schemas.ts
deleted file mode 100644
index bd215b7a5..000000000
--- a/src/generated/forge-mcp/botnetFeed/schemas.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `botnet-feed-api_asn`.
- */
-export const botnet_feed_api_asn: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `botnet-feed-api_identifier`.
- */
-export const botnet_feed_api_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/brandProtection/logoMatches/tools.ts b/src/generated/forge-mcp/brandProtection/logoMatches/tools.ts
index 15d7e9907..a0175baee 100644
--- a/src/generated/forge-mcp/brandProtection/logoMatches/tools.ts
+++ b/src/generated/forge-mcp/brandProtection/logoMatches/tools.ts
@@ -1,59 +1,78 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `brand_protection.logo_matches`.
+ * The tools of `brandProtection.logoMatches`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "brand_protection_logo_matches_get",
+    name: "brandProtection_logoMatches_get",
     title: "List logo matches",
-    description: "Get paginated list of logo matches for a specific brand protection logo query",
+    description: "Get paginated list of logo matches for a specific brand protection logo query\n\nGET /accounts/{account_id}/cloudforce-one/v2/brand-protection/logo/matches",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "download": {
-          "type": "string"
-        },
-        "limit": {
-          "default": "50",
-          "type": "string"
-        },
-        "offset": {
-          "default": "0",
-          "type": "string"
-        },
-        "order": {
-          "description": "Sort order. Options: 'asc' (ascending) or 'desc' (descending)",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "order_by": {
-          "description": "Column to sort by. Options: 'matchedAt', 'domain', 'similarityScore', or 'registrar'",
-          "enum": [
-            "matchedAt",
-            "domain",
-            "similarityScore",
-            "registrar"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "download": {
+              "type": "string"
+            },
+            "limit": {
+              "default": "50",
+              "type": "string"
+            },
+            "offset": {
+              "default": "0",
+              "type": "string"
+            },
+            "order": {
+              "description": "Sort order. Options: 'asc' (ascending) or 'desc' (descending)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "orderBy": {
+              "description": "Column to sort by. Options: 'matchedAt', 'domain', 'similarityScore', or 'registrar'",
+              "enum": [
+                "matchedAt",
+                "domain",
+                "similarityScore",
+                "registrar"
+              ],
+              "type": "string"
+            },
+            "query_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "query_id"
           ],
-          "type": "string"
-        },
-        "query_id": {
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -246,12 +265,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/brand-protection/logo/matches`,
       query: [
-        ["offset", args["offset"], true],
-        ["limit", args["limit"], true],
-        ["query_id", args["query_id"], true],
-        ["download", args["download"], true],
-        ["orderBy", args["order_by"], true],
-        ["order", args["order"], true],
+        ["offset", param(args, "query", "offset"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["query_id", param(args, "query", "query_id"), true],
+        ["download", param(args, "query", "download"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/brandProtection/logos/tools.ts b/src/generated/forge-mcp/brandProtection/logos/tools.ts
index 57e07dbaf..daecb2973 100644
--- a/src/generated/forge-mcp/brandProtection/logos/tools.ts
+++ b/src/generated/forge-mcp/brandProtection/logos/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `brand_protection.logos`.
+ * The tools of `brandProtection.logos`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "brand_protection_logos_create",
+    name: "brandProtection_logos_create",
     title: "Insert logo query",
-    description: "Create a new saved brand protection logo query for visual similarity matching",
+    description: "Create a new saved brand protection logo query for visual similarity matching\n\nPOST /accounts/{account_id}/cloudforce-one/v2/brand-protection/logo/queries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "image_data": {
@@ -43,11 +40,24 @@ export const tools: readonly Tool[] = [
             "tag"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -110,23 +120,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "brand_protection_logos_delete",
+    name: "brandProtection_logos_delete",
     title: "Delete logo query",
-    description: "Delete a saved brand protection logo query. Returns 404 if the query ID doesn't exist.",
+    description: "Delete a saved brand protection logo query. Returns 404 if the query ID doesn't exist.\n\nDELETE /accounts/{account_id}/cloudforce-one/v2/brand-protection/logo/queries/{query_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "query_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "query_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "query_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -182,27 +202,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "brand_protection_logos_get",
+    name: "brandProtection_logos_get",
     title: "Get logo queries",
-    description: "Get all saved brand protection logo queries for an account. Optionally specify id to get a single query. Set download=true to include base64-encoded image data.",
+    description: "Get all saved brand protection logo queries for an account. Optionally specify id to get a single query. Set download=true to include base64-encoded image data.\n\nGET /accounts/{account_id}/cloudforce-one/v2/brand-protection/logo/queries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "download": {
-          "description": "If true, include base64-encoded image data in the response",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "id": {
-          "description": "Optional query ID to retrieve a specific logo query",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "download": {
+              "description": "If true, include base64-encoded image data in the response",
+              "type": "string"
+            },
+            "id": {
+              "description": "Optional query ID to retrieve a specific logo query",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -313,8 +349,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/brand-protection/logo/queries`,
       query: [
-        ["id", args["id"], true],
-        ["download", args["download"], true],
+        ["id", param(args, "query", "id"), true],
+        ["download", param(args, "query", "download"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/brandProtection/matches/tools.ts b/src/generated/forge-mcp/brandProtection/matches/tools.ts
index 874d47fff..0a466855a 100644
--- a/src/generated/forge-mcp/brandProtection/matches/tools.ts
+++ b/src/generated/forge-mcp/brandProtection/matches/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `brand_protection.matches`.
+ * The tools of `brandProtection.matches`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "brand_protection_matches_bulk_dismiss",
+    name: "brandProtection_matches_bulkDismiss",
     title: "Bulk dismiss or undismiss matches",
-    description: "Dismiss or undismiss multiple matches in a single request. Accepts either the new format (matches: [{query_id, domain_id}]) for per-query control, or the legacy format (match_ids: [number]) which dismisses for all queries sharing each match's hash. Returns per-item success/error results.",
+    description: "Dismiss or undismiss multiple matches in a single request. Accepts either the new format (matches: [{query_id, domain_id}]) for per-query control, or the legacy format (match_ids: [number]) which dismisses for all queries sharing each match's hash. Returns per-item success/error results.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/brand-protection/domain/matches/bulk-dismiss",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "action": {
@@ -59,11 +56,24 @@ export const tools: readonly Tool[] = [
             "action"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "anyOf": [
@@ -270,63 +280,82 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "brand_protection_matches_get",
+    name: "brandProtection_matches_get",
     title: "List saved query matches",
-    description: "Get paginated list of domain matches for one or more brand protection queries. When multiple query_ids are provided (comma-separated), matches are deduplicated across queries and each match includes a match_details array with per-match query metadata and individual dismissed state.",
+    description: "Get paginated list of domain matches for one or more brand protection queries. When multiple query_ids are provided (comma-separated), matches are deduplicated across queries and each match includes a match_details array with per-match query metadata and individual dismissed state.\n\nGET /accounts/{account_id}/cloudforce-one/v2/brand-protection/domain/matches",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "domain_search": {
-          "description": "Filter matches by domain name (substring match)",
-          "type": "string"
-        },
-        "include_dismissed": {
-          "type": "string"
-        },
-        "include_domain_id": {
-          "default": "false",
-          "type": "string"
-        },
-        "limit": {
-          "default": "50",
-          "type": "string"
-        },
-        "offset": {
-          "default": "0",
-          "type": "string"
-        },
-        "order": {
-          "description": "Sort order. Options: 'asc' (ascending) or 'desc' (descending)",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order_by": {
-          "description": "Column to sort by. Options: 'domain', 'first_seen', or 'registrar'",
-          "enum": [
-            "domain",
-            "first_seen",
-            "registrar"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "query_id": {
-          "description": "Query ID or comma-separated list of Query IDs. When multiple IDs are provided, matches are deduplicated across queries and each match includes a match_details array with per-match query metadata and dismissed state.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "domain_search": {
+              "description": "Filter matches by domain name (substring match)",
+              "type": "string"
+            },
+            "include_dismissed": {
+              "type": "string"
+            },
+            "include_domain_id": {
+              "default": "false",
+              "type": "string"
+            },
+            "limit": {
+              "default": "50",
+              "type": "string"
+            },
+            "offset": {
+              "default": "0",
+              "type": "string"
+            },
+            "order": {
+              "description": "Sort order. Options: 'asc' (ascending) or 'desc' (descending)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "orderBy": {
+              "description": "Column to sort by. Options: 'domain', 'first_seen', or 'registrar'",
+              "enum": [
+                "domain",
+                "first_seen",
+                "registrar"
+              ],
+              "type": "string"
+            },
+            "query_id": {
+              "description": "Query ID or comma-separated list of Query IDs. When multiple IDs are provided, matches are deduplicated across queries and each match includes a match_details array with per-match query metadata and dismissed state.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "required": [
+            "query_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -595,14 +624,14 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/brand-protection/domain/matches`,
       query: [
-        ["offset", args["offset"], true],
-        ["limit", args["limit"], true],
-        ["query_id", args["query_id"], true],
-        ["include_domain_id", args["include_domain_id"], true],
-        ["include_dismissed", args["include_dismissed"], true],
-        ["domain_search", args["domain_search"], true],
-        ["orderBy", args["order_by"], true],
-        ["order", args["order"], true],
+        ["offset", param(args, "query", "offset"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["query_id", param(args, "query", "query_id"), true],
+        ["include_domain_id", param(args, "query", "include_domain_id"), true],
+        ["include_dismissed", param(args, "query", "include_dismissed"), true],
+        ["domain_search", param(args, "query", "domain_search"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/brandProtection/queries/tools.ts b/src/generated/forge-mcp/brandProtection/queries/tools.ts
index a0d434788..2155609c0 100644
--- a/src/generated/forge-mcp/brandProtection/queries/tools.ts
+++ b/src/generated/forge-mcp/brandProtection/queries/tools.ts
@@ -1,34 +1,44 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `brand_protection.queries`.
+ * The tools of `brandProtection.queries`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "brand_protection_queries_dismiss",
+    name: "brandProtection_queries_dismiss",
     title: "Dismiss a match",
-    description: "Mark a specific domain as dismissed for a given query. Dismissals are per-query — dismissing a domain in one query does not affect other queries.",
+    description: "Mark a specific domain as dismissed for a given query. Dismissals are per-query — dismissing a domain in one query does not affect other queries.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/brand-protection/queries/{query_id}/matches/{domain_id}/dismiss",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "domain_id": {
-          "type": "integer"
-        },
-        "query_id": {
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "domain_id": {
+              "type": "integer"
+            },
+            "query_id": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "query_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id",
-        "domain_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -116,30 +126,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "brand_protection_queries_get",
+    name: "brandProtection_queries_get",
     title: "Get queries",
-    description: "Get all saved brand protection queries for an account",
+    description: "Get all saved brand protection queries for an account\n\nGET /accounts/{account_id}/cloudforce-one/v2/brand-protection/domain/queries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "page": {
-          "description": "Optional page number for paginated list requests. Defaults to 1 when only per_page is supplied. Omit page and per_page to preserve the legacy full-list response.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "description": "Optional number of queries per page for paginated list requests. Defaults to 100 when only page is supplied. Maximum 100. Omit page and per_page to preserve the legacy full-list response.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "type": "string"
+            },
+            "page": {
+              "description": "Optional page number for paginated list requests. Defaults to 1 when only per_page is supplied. Omit page and per_page to preserve the legacy full-list response.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Optional number of queries per page for paginated list requests. Defaults to 100 when only page is supplied. Maximum 100. Omit page and per_page to preserve the legacy full-list response.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -600,34 +626,44 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/brand-protection/domain/queries`,
       query: [
-        ["id", args["id"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["id", param(args, "query", "id"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "brand_protection_queries_undismiss",
+    name: "brandProtection_queries_undismiss",
     title: "Undismiss a match",
-    description: "Remove the dismissed status from a specific domain for a given query. Undismissals are per-query — undismissing a domain in one query does not affect other queries.",
+    description: "Remove the dismissed status from a specific domain for a given query. Undismissals are per-query — undismissing a domain in one query does not affect other queries.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/brand-protection/queries/{query_id}/matches/{domain_id}/undismiss",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "domain_id": {
-          "type": "integer"
-        },
-        "query_id": {
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "domain_id": {
+              "type": "integer"
+            },
+            "query_id": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "query_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id",
-        "domain_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/brandProtection/tools.ts b/src/generated/forge-mcp/brandProtection/tools.ts
index 56650e563..7d42c1b87 100644
--- a/src/generated/forge-mcp/brandProtection/tools.ts
+++ b/src/generated/forge-mcp/brandProtection/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 
 /**
- * The tools of `brand_protection`.
+ * The tools of `brandProtection`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "brand_protection_submit",
+    name: "brandProtection_submit",
     title: "Search scanned images",
-    description: "Submit an image and find the n closest matches from the scanned images index without creating any match records. Returns similarity scores and metadata for each match.",
+    description: "Submit an image and find the n closest matches from the scanned images index without creating any match records. Returns similarity scores and metadata for each match.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/brand-protection/logo/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "image_data": {
@@ -39,19 +36,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "download": {
-          "description": "If true, include base64-encoded image data in the response",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "show_historic": {
-          "default": "false",
-          "description": "Include scanned images without domain metadata (historic data). Default: false (only show images with domain)",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "download": {
+              "description": "If true, include base64-encoded image data in the response",
+              "type": "string"
+            },
+            "showHistoric": {
+              "default": "false",
+              "description": "Include scanned images without domain metadata (historic data). Default: false (only show images with domain)",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -185,26 +201,36 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/brand-protection/logo/search`,
       query: [
-        ["showHistoric", args["show_historic"], true],
-        ["download", args["download"], true],
+        ["showHistoric", param(args, "query", "showHistoric"), true],
+        ["download", param(args, "query", "download"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "brand_protection_url_info",
+    name: "brandProtection_urlInfo",
     title: "Get total queries",
-    description: "Get the total number of saved brand protection queries (domain + logo) for an account",
+    description: "Get the total number of saved brand protection queries (domain + logo) for an account\n\nGET /accounts/{account_id}/cloudforce-one/v2/brand-protection/total-queries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
diff --git a/src/generated/forge-mcp/brandProtection/trial/tools.ts b/src/generated/forge-mcp/brandProtection/trial/tools.ts
index a99040f07..0de35db4a 100644
--- a/src/generated/forge-mcp/brandProtection/trial/tools.ts
+++ b/src/generated/forge-mcp/brandProtection/trial/tools.ts
@@ -4,19 +4,16 @@
 import { type Tool, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `brand_protection.trial`.
+ * The tools of `brandProtection.trial`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "brand_protection_trial_create",
+    name: "brandProtection_trial_create",
     title: "Analyze domains for brand impersonation",
-    description: "Uses AI to scan all domains in the lookback table and identify potential phishing or impersonation attempts against the given brand string.",
+    description: "Uses AI to scan all domains in the lookback table and identify potential phishing or impersonation attempts against the given brand string.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/brand-protection/domain/trial",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "brand": {
@@ -27,11 +24,24 @@ export const tools: readonly Tool[] = [
             "brand"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/browserRun/crawl/tools.ts b/src/generated/forge-mcp/browserRun/crawl/tools.ts
index e389e32e9..c7f374e28 100644
--- a/src/generated/forge-mcp/browserRun/crawl/tools.ts
+++ b/src/generated/forge-mcp/browserRun/crawl/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `browser_run.crawl`.
+ * The tools of `browserRun.crawl`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_crawl_create",
+    name: "browserRun_crawl_create",
     title: "Crawl websites.",
-    description: "Starts a crawl job for the provided URL and its children. Check available options like `gotoOptions` and `waitFor*` to control page load behaviour.",
+    description: "Starts a crawl job for the provided URL and its children. Check available options like `gotoOptions` and `waitFor*` to control page load behaviour.\n\nPOST /accounts/{account_id}/browser-rendering/crawl",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "anyOf": [
             {
@@ -704,16 +700,36 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -901,31 +917,41 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/crawl`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_crawl_delete",
+    name: "browserRun_crawl_delete",
     title: "Cancel a crawl job.",
-    description: "Cancels an ongoing crawl job by setting its status to cancelled and stopping all queued URLs.",
+    description: "Cancels an ongoing crawl job by setting its status to cancelled and stopping all queued URLs.\n\nDELETE /accounts/{account_id}/browser-rendering/crawl/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "job_id": {
-          "description": "The ID of the crawl job to cancel.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "The ID of the crawl job to cancel.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1136,52 +1162,68 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "browser_run_crawl_get",
+    name: "browserRun_crawl_get",
     title: "Get crawl result.",
-    description: "Returns the result of a crawl job.",
+    description: "Returns the result of a crawl job.\n\nGET /accounts/{account_id}/browser-rendering/crawl/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
-        },
-        "cursor": {
-          "default": 0,
-          "description": "Cursor for pagination.",
-          "type": "number"
-        },
-        "job_id": {
-          "description": "Crawl job ID.",
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "description": "Limit for pagination.",
-          "type": "number"
-        },
-        "status": {
-          "description": "Filter by URL status.",
-          "enum": [
-            "queued",
-            "errored",
-            "completed",
-            "disallowed",
-            "skipped",
-            "cancelled"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Crawl job ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            },
+            "cursor": {
+              "default": 0,
+              "description": "Cursor for pagination.",
+              "type": "number"
+            },
+            "limit": {
+              "default": 50,
+              "description": "Limit for pagination.",
+              "type": "number"
+            },
+            "status": {
+              "description": "Filter by URL status.",
+              "enum": [
+                "queued",
+                "errored",
+                "completed",
+                "disallowed",
+                "skipped",
+                "cancelled"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1657,10 +1699,10 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/crawl/${pathParam(args, "job_id")}`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["status", args["status"], true],
-        ["cursor", args["cursor"], true],
-        ["limit", args["limit"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["status", param(args, "query", "status"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/browserRun/devtools/browser/liveView/tools.ts b/src/generated/forge-mcp/browserRun/devtools/browser/liveView/tools.ts
index 49dc9bd8e..5349aaf4a 100644
--- a/src/generated/forge-mcp/browserRun/devtools/browser/liveView/tools.ts
+++ b/src/generated/forge-mcp/browserRun/devtools/browser/liveView/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `browser_run.devtools.browser.live_view`.
+ * The tools of `browserRun.devtools.browser.liveView`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_devtools_browser_live_view_create",
+    name: "browserRun_devtools_browser_liveView_create",
     title: "Mint live view URLs for a browser session",
-    description: "Generates time-limited URLs to view a remote browser session. Set `guardrails: { mode: 'readonly' }` to create a view-only link.",
+    description: "Generates time-limited URLs to view a remote browser session. Set `guardrails: { mode: 'readonly' }` to create a view-only link.\n\nPOST /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/live_view",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "expiresInMs": {
@@ -57,16 +53,30 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "session_id": {
-          "description": "Browser session ID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/browserRun/devtools/browser/targets/tools.ts b/src/generated/forge-mcp/browserRun/devtools/browser/targets/tools.ts
index 2e2371dde..725433c8c 100644
--- a/src/generated/forge-mcp/browserRun/devtools/browser/targets/tools.ts
+++ b/src/generated/forge-mcp/browserRun/devtools/browser/targets/tools.ts
@@ -1,38 +1,48 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `browser_run.devtools.browser.targets`.
+ * The tools of `browserRun.devtools.browser.targets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_devtools_browser_targets_activate",
+    name: "browserRun_devtools_browser_targets_activate",
     title: "Activate a browser target.",
-    description: "Activates (brings to front) a specific browser target by its ID.",
+    description: "Activates (brings to front) a specific browser target by its ID.\n\nGET /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/json/activate/{target_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Browser session ID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "target_id": {
-          "description": "Target ID to activate.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "target_id": {
+              "description": "Target ID to activate.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id",
+            "target_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id",
-        "target_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -179,31 +189,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "browser_run_devtools_browser_targets_close",
+    name: "browserRun_devtools_browser_targets_close",
     title: "Close a browser target.",
-    description: "Closes a specific browser target (tab, page, etc.) by its ID. Returns 'Target is closing' on success or an error if the target is not found.",
+    description: "Closes a specific browser target (tab, page, etc.) by its ID. Returns 'Target is closing' on success or an error if the target is not found.\n\nGET /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/json/close/{target_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Browser session ID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "target_id": {
-          "description": "Target ID to close.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "target_id": {
+              "description": "Target ID to close.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id",
+            "target_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id",
-        "target_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -350,34 +370,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "browser_run_devtools_browser_targets_create",
+    name: "browserRun_devtools_browser_targets_create",
     title: "Open a new browser tab.",
-    description: "Opens a new tab in the browser. Optionally specify a URL to navigate to.",
+    description: "Opens a new tab in the browser. Optionally specify a URL to navigate to.\n\nPUT /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/json/new",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "live_view_url_expires_in_ms": {
-          "default": 300000,
-          "description": "How long the live view URL remains valid, in milliseconds (max 60 minutes)",
-          "type": "number"
-        },
-        "session_id": {
-          "description": "Browser session ID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         },
-        "url": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "liveViewUrlExpiresInMs": {
+              "default": 300000,
+              "description": "How long the live view URL remains valid, in milliseconds (max 60 minutes)",
+              "type": "number"
+            },
+            "url": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -529,37 +565,47 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/devtools/browser/${pathParam(args, "session_id")}/json/new`,
       query: [
-        ["url", args["url"], true],
-        ["liveViewUrlExpiresInMs", args["live_view_url_expires_in_ms"], true],
+        ["url", param(args, "query", "url"), true],
+        ["liveViewUrlExpiresInMs", param(args, "query", "liveViewUrlExpiresInMs"), true],
       ],
     }),
   },
   {
-    name: "browser_run_devtools_browser_targets_get",
+    name: "browserRun_devtools_browser_targets_get",
     title: "Get a target by ID.",
-    description: "Returns the debuggable target with the given ID.",
+    description: "Returns the debuggable target with the given ID.\n\nGET /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/json/list/{target_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Browser session ID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "target_id": {
-          "description": "Target ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "target_id": {
+              "description": "Target ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id",
+            "target_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id",
-        "target_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -746,31 +792,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "browser_run_devtools_browser_targets_list",
+    name: "browserRun_devtools_browser_targets_list",
     title: "List targets.",
-    description: "Returns a list of all debuggable targets including tabs, pages, service workers, and other browser contexts.",
+    description: "Returns a list of all debuggable targets including tabs, pages, service workers, and other browser contexts.\n\nGET /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/json/list",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "live_view_url_expires_in_ms": {
-          "default": 300000,
-          "description": "How long the live view URLs remain valid, in milliseconds (max 60 minutes)",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         },
-        "session_id": {
-          "description": "Browser session ID.",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "liveViewUrlExpiresInMs": {
+              "default": 300000,
+              "description": "How long the live view URLs remain valid, in milliseconds (max 60 minutes)",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -932,7 +994,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/devtools/browser/${pathParam(args, "session_id")}/json/list`,
       query: [
-        ["liveViewUrlExpiresInMs", args["live_view_url_expires_in_ms"], true],
+        ["liveViewUrlExpiresInMs", param(args, "query", "liveViewUrlExpiresInMs"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/browserRun/devtools/browser/tools.ts b/src/generated/forge-mcp/browserRun/devtools/browser/tools.ts
index d63351c66..ada0afa1f 100644
--- a/src/generated/forge-mcp/browserRun/devtools/browser/tools.ts
+++ b/src/generated/forge-mcp/browserRun/devtools/browser/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `browser_run.devtools.browser`.
+ * The tools of `browserRun.devtools.browser`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_devtools_browser_create",
+    name: "browserRun_devtools_browser_create",
     title: "Get a browser session ID.",
-    description: "Acquires a browser and returns its session ID and websocket URL. Optionally accepts a JSON body with session guardrails to restrict outbound HTTP/S traffic.",
+    description: "Acquires a browser and returns its session ID and websocket URL. Optionally accepts a JSON body with session guardrails to restrict outbound HTTP/S traffic.\n\nPOST /accounts/{account_id}/browser-rendering/devtools/browser",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "guardrails": {
@@ -44,34 +40,54 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "keep_alive": {
-          "default": 60000,
-          "description": "Keep-alive time in milliseconds.",
-          "type": "number"
-        },
-        "lab": {
-          "default": false,
-          "description": "Use experimental browser.",
-          "type": "boolean"
-        },
-        "live_view_url_expires_in_ms": {
-          "default": 300000,
-          "description": "How long the live view URL remains valid, in milliseconds (max 60 minutes). Only used when targets is true.",
-          "type": "number"
-        },
-        "recording": {
-          "default": false,
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "targets": {
-          "default": false,
-          "description": "Include browser targets in response.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "keep_alive": {
+              "default": 60000,
+              "description": "Keep-alive time in milliseconds.",
+              "type": "number"
+            },
+            "lab": {
+              "default": false,
+              "description": "Use experimental browser.",
+              "type": "boolean"
+            },
+            "liveViewUrlExpiresInMs": {
+              "default": 300000,
+              "description": "How long the live view URL remains valid, in milliseconds (max 60 minutes). Only used when targets is true.",
+              "type": "number"
+            },
+            "recording": {
+              "default": false,
+              "type": "boolean"
+            },
+            "targets": {
+              "default": false,
+              "description": "Include browser targets in response.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -163,36 +179,46 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/devtools/browser`,
       query: [
-        ["keep_alive", args["keep_alive"], true],
-        ["lab", args["lab"], true],
-        ["targets", args["targets"], true],
-        ["liveViewUrlExpiresInMs", args["live_view_url_expires_in_ms"], true],
-        ["recording", args["recording"], true],
+        ["keep_alive", param(args, "query", "keep_alive"), true],
+        ["lab", param(args, "query", "lab"), true],
+        ["targets", param(args, "query", "targets"), true],
+        ["liveViewUrlExpiresInMs", param(args, "query", "liveViewUrlExpiresInMs"), true],
+        ["recording", param(args, "query", "recording"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_devtools_browser_delete",
+    name: "browserRun_devtools_browser_delete",
     title: "Close browser session.",
-    description: "Closes an existing browser session.",
+    description: "Closes an existing browser session.\n\nDELETE /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Browser session ID to close.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID to close.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -257,26 +283,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "browser_run_devtools_browser_protocol",
+    name: "browserRun_devtools_browser_protocol",
     title: "Get Chrome DevTools Protocol schema.",
-    description: "Returns the complete Chrome DevTools Protocol schema including all domains, commands, events, and types. This schema describes the entire CDP API surface.",
+    description: "Returns the complete Chrome DevTools Protocol schema including all domains, commands, events, and types. This schema describes the entire CDP API surface.\n\nGET /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/json/protocol",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Browser session ID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -560,26 +596,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "browser_run_devtools_browser_version",
+    name: "browserRun_devtools_browser_version",
     title: "Get browser version metadata.",
-    description: "Get browser version metadata.",
+    description: "Get browser version metadata.\n\nGET /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/json/version",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Browser session ID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/browserRun/devtools/json/tools.ts b/src/generated/forge-mcp/browserRun/devtools/json/tools.ts
index 07d1f1fcb..b885367bc 100644
--- a/src/generated/forge-mcp/browserRun/devtools/json/tools.ts
+++ b/src/generated/forge-mcp/browserRun/devtools/json/tools.ts
@@ -1,38 +1,54 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `browser_run.devtools.json`.
+ * The tools of `browserRun.devtools.json`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_devtools_json_get",
+    name: "browserRun_devtools_json_get",
     title: "List targets.",
-    description: "Returns a list of all debuggable targets including tabs, pages, service workers, and other browser contexts.",
+    description: "Returns a list of all debuggable targets including tabs, pages, service workers, and other browser contexts.\n\nGET /accounts/{account_id}/browser-rendering/devtools/browser/{session_id}/json",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "live_view_url_expires_in_ms": {
-          "default": 300000,
-          "description": "How long the live view URLs remain valid, in milliseconds (max 60 minutes)",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Browser session ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         },
-        "session_id": {
-          "description": "Browser session ID.",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "liveViewUrlExpiresInMs": {
+              "default": 300000,
+              "description": "How long the live view URLs remain valid, in milliseconds (max 60 minutes)",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -194,7 +210,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/devtools/browser/${pathParam(args, "session_id")}/json`,
       query: [
-        ["liveViewUrlExpiresInMs", args["live_view_url_expires_in_ms"], true],
+        ["liveViewUrlExpiresInMs", param(args, "query", "liveViewUrlExpiresInMs"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/browserRun/devtools/session/tools.ts b/src/generated/forge-mcp/browserRun/devtools/session/tools.ts
index c08014d4d..ebb7ba4b9 100644
--- a/src/generated/forge-mcp/browserRun/devtools/session/tools.ts
+++ b/src/generated/forge-mcp/browserRun/devtools/session/tools.ts
@@ -1,33 +1,43 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `browser_run.devtools.session`.
+ * The tools of `browserRun.devtools.session`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_devtools_session_get",
+    name: "browserRun_devtools_session_get",
     title: "Get session details.",
-    description: "Get details for a specific browser session.",
+    description: "Get details for a specific browser session.\n\nGET /accounts/{account_id}/browser-rendering/devtools/session/{session_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Session ID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Session ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "oneOf": [
@@ -164,28 +174,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "browser_run_devtools_session_list",
+    name: "browserRun_devtools_session_list",
     title: "List sessions.",
-    description: "List active browser sessions.",
+    description: "List active browser sessions.\n\nGET /accounts/{account_id}/browser-rendering/devtools/session",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "limit": {
-          "default": 200,
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 200,
+              "type": "number"
+            },
+            "offset": {
+              "default": 0,
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -313,8 +339,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/devtools/session`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/browserRun/quickAction/outputs.ts b/src/generated/forge-mcp/browserRun/quickAction/outputs.ts
index fcf334831..8244f2e2f 100644
--- a/src/generated/forge-mcp/browserRun/quickAction/outputs.ts
+++ b/src/generated/forge-mcp/browserRun/quickAction/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `brapi_SerializedAXNode` in responses.
  */
-export const brapi_SerializedAXNode_output: JsonSchema = {
+export const brapi_SerializedAXNode: JsonSchema = {
   "properties": {
     "autocomplete": {
       "type": "string"
diff --git a/src/generated/forge-mcp/browserRun/quickAction/tools.ts b/src/generated/forge-mcp/browserRun/quickAction/tools.ts
index ee205a673..b0f91d0ef 100644
--- a/src/generated/forge-mcp/browserRun/quickAction/tools.ts
+++ b/src/generated/forge-mcp/browserRun/quickAction/tools.ts
@@ -1,24 +1,20 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import { brapi_SerializedAXNode_output } from "./outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
+import { brapi_SerializedAXNode } from "./outputs.js";
 
 /**
- * The tools of `browser_run.quick_action`.
+ * The tools of `browserRun.quickAction`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_quick_action_accessibility_tree",
+    name: "browserRun_quickAction_accessibilityTree",
     title: "Get accessibility tree page",
-    description: "Returns the page's accessibility tree. Use `interestingOnly` to only return semantically meaningful nodes; use `root` to scope the tree to a CSS-selector-anchored subtree. Control page loading with `gotoOptions` and `waitFor*` options.",
+    description: "Returns the page's accessibility tree. Use `interestingOnly` to only return semantically meaningful nodes; use `root` to scope the tree to a CSS-selector-anchored subtree. Control page loading with `gotoOptions` and `waitFor*` options.\n\nPOST /accounts/{account_id}/browser-rendering/accessibilityTree",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -395,23 +391,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -500,7 +516,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "brapi_SerializedAXNode": brapi_SerializedAXNode_output,
+        "brapi_SerializedAXNode": brapi_SerializedAXNode,
       },
     },
     annotations: {
@@ -736,29 +752,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "brapi_SerializedAXNode": brapi_SerializedAXNode_output,
+        "brapi_SerializedAXNode": brapi_SerializedAXNode,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/accessibilityTree`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_quick_action_content",
+    name: "browserRun_quickAction_content",
     title: "Get HTML content.",
-    description: "Fetches rendered HTML content from provided URL or HTML. Check available options like `gotoOptions` and `waitFor*` to control page load behaviour.",
+    description: "Fetches rendered HTML content from provided URL or HTML. Check available options like `gotoOptions` and `waitFor*` to control page load behaviour.\n\nPOST /accounts/{account_id}/browser-rendering/content",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -1129,23 +1141,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1452,23 +1484,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/content`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_quick_action_json",
+    name: "browserRun_quickAction_json",
     title: "Get json.",
-    description: "Gets json from a webpage from a provided URL or HTML. Pass `prompt` or `schema` in the body. Control page loading with `gotoOptions` and `waitFor*` options.",
+    description: "Gets json from a webpage from a provided URL or HTML. Pass `prompt` or `schema` in the body. Control page loading with `gotoOptions` and `waitFor*` options.\n\nPOST /accounts/{account_id}/browser-rendering/json",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -1884,23 +1912,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2232,23 +2280,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/json`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_quick_action_links",
+    name: "browserRun_quickAction_links",
     title: "Get Links.",
-    description: "Get links from a web page.",
+    description: "Get links from a web page.\n\nPOST /accounts/{account_id}/browser-rendering/links",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -2627,23 +2671,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2958,23 +3022,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/links`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_quick_action_markdown",
+    name: "browserRun_quickAction_markdown",
     title: "Get markdown.",
-    description: "Gets markdown of a webpage from provided URL or HTML. Control page loading with `gotoOptions` and `waitFor*` options.",
+    description: "Gets markdown of a webpage from provided URL or HTML. Control page loading with `gotoOptions` and `waitFor*` options.\n\nPOST /accounts/{account_id}/browser-rendering/markdown",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -3345,23 +3405,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3668,23 +3748,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/markdown`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_quick_action_pdf",
+    name: "browserRun_quickAction_pdf",
     title: "Get PDF.",
-    description: "Fetches rendered PDF from provided URL or HTML. Check available options like `gotoOptions` and `waitFor*` to control page load behaviour.",
+    description: "Fetches rendered PDF from provided URL or HTML. Check available options like `gotoOptions` and `waitFor*` to control page load behaviour.\n\nPOST /accounts/{account_id}/browser-rendering/pdf",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -4205,23 +4281,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -4373,23 +4469,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/pdf`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_quick_action_scrape",
+    name: "browserRun_quickAction_scrape",
     title: "Scrape elements.",
-    description: "Get meta attributes like height, width, text and others of selected elements.",
+    description: "Get meta attributes like height, width, text and others of selected elements.\n\nPOST /accounts/{account_id}/browser-rendering/scrape",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -4778,23 +4870,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5227,23 +5339,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/scrape`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_quick_action_screenshot",
+    name: "browserRun_quickAction_screenshot",
     title: "Get screenshot.",
-    description: "Takes a screenshot of a webpage from provided URL or HTML. Control page loading with `gotoOptions` and `waitFor*` options. Customize screenshots with `viewport`, `fullPage`, `clip` and others.",
+    description: "Takes a screenshot of a webpage from provided URL or HTML. Control page loading with `gotoOptions` and `waitFor*` options. Customize screenshots with `viewport`, `fullPage`, `clip` and others.\n\nPOST /accounts/{account_id}/browser-rendering/screenshot",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -5688,23 +5796,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5913,23 +6041,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/screenshot`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "browser_run_quick_action_snapshot",
+    name: "browserRun_quickAction_snapshot",
     title: "Get HTML content and screenshot.",
-    description: "Returns the page's HTML content and screenshot. Control page loading with `gotoOptions` and `waitFor*` options. Customize screenshots with `viewport`, `fullPage`, `clip` and others.",
+    description: "Returns the page's HTML content and screenshot. Control page loading with `gotoOptions` and `waitFor*` options. Customize screenshots with `viewport`, `fullPage`, `clip` and others.\n\nPOST /accounts/{account_id}/browser-rendering/snapshot",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "allOf": [
             {
@@ -6375,23 +6499,43 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "browser": {
-          "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
-          "enum": [
-            "kitesurf"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cache_ttl": {
-          "default": 5,
-          "description": "Cache TTL default is 5s. Set to 0 to disable.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "browser": {
+              "description": "Rendering backend. Set to `kitesurf` to use Kitesurf (beta).",
+              "enum": [
+                "kitesurf"
+              ],
+              "type": "string"
+            },
+            "cacheTTL": {
+              "default": 5,
+              "description": "Cache TTL default is 5s. Set to 0 to disable.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -6485,7 +6629,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "brapi_SerializedAXNode": brapi_SerializedAXNode_output,
+        "brapi_SerializedAXNode": brapi_SerializedAXNode,
       },
     },
     annotations: {
@@ -6726,14 +6870,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "brapi_SerializedAXNode": brapi_SerializedAXNode_output,
+        "brapi_SerializedAXNode": brapi_SerializedAXNode,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/snapshot`,
       query: [
-        ["cacheTTL", args["cache_ttl"], true],
-        ["browser", args["browser"], true],
+        ["cacheTTL", param(args, "query", "cacheTTL"), true],
+        ["browser", param(args, "query", "browser"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/browserRun/recording/network/tools.ts b/src/generated/forge-mcp/browserRun/recording/network/tools.ts
index 5b622b619..1e9865458 100644
--- a/src/generated/forge-mcp/browserRun/recording/network/tools.ts
+++ b/src/generated/forge-mcp/browserRun/recording/network/tools.ts
@@ -1,41 +1,60 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `browser_run.recording.network`.
+ * The tools of `browserRun.recording.network`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_recording_network_get",
+    name: "browserRun_recording_network_get",
     title: "Get network recording data.",
-    description: "Returns network recording events for the requested target ID. Use ?format=har for a HAR JSON document.",
+    description: "Returns network recording events for the requested target ID. Use ?format=har for a HAR JSON document.\n\nGET /accounts/{account_id}/browser-rendering/recording/{session_id}/network",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "format": {
-          "description": "Set to `har` to return a HAR JSON document.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Session ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Session ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         },
-        "target": {
-          "description": "Target ID to include in the response.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Set to `har` to return a HAR JSON document.",
+              "type": "string"
+            },
+            "target": {
+              "description": "Target ID to include in the response.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "target"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id",
-        "target"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "additionalProperties": {
@@ -155,8 +174,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/browser-rendering/recording/${pathParam(args, "session_id")}/network`,
       query: [
-        ["format", args["format"], true],
-        ["target", args["target"], true],
+        ["format", param(args, "query", "format"), true],
+        ["target", param(args, "query", "target"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/browserRun/recording/tools.ts b/src/generated/forge-mcp/browserRun/recording/tools.ts
index 83269f6f0..46e8f4aab 100644
--- a/src/generated/forge-mcp/browserRun/recording/tools.ts
+++ b/src/generated/forge-mcp/browserRun/recording/tools.ts
@@ -4,29 +4,39 @@
 import { type Tool, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `browser_run.recording`.
+ * The tools of `browserRun.recording`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "browser_run_recording_get",
+    name: "browserRun_recording_get",
     title: "Get recording data.",
-    description: "Returns the recording data for a given session as a dictionary of events per targetId.",
+    description: "Returns the recording data for a given session as a dictionary of events per targetId.\n\nGET /accounts/{account_id}/browser-rendering/recording/{session_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "Session ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "Session ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "session_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/builds/deployHooks/outputs.ts b/src/generated/forge-mcp/builds/deployHooks/outputs.ts
index c0a518e3d..ac93d5835 100644
--- a/src/generated/forge-mcp/builds/deployHooks/outputs.ts
+++ b/src/generated/forge-mcp/builds/deployHooks/outputs.ts
@@ -6,25 +6,28 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `builds_DeployHookResponse` in responses.
  */
-export const builds_DeployHookResponse_output: JsonSchema = {
+export const builds_DeployHookResponse: JsonSchema = {
   "properties": {
     "branch": {
-      "$ref": "#/$defs/builds_branch"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/builds_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "deploy_hook_name": {
-      "$ref": "#/$defs/builds_deploy_hook_name"
+      "type": "string"
     },
     "deploy_hook_uuid": {
-      "$ref": "#/$defs/builds_deploy_hook_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "external_script_id": {
-      "$ref": "#/$defs/builds_external_script_id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/builds_modified_on"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -33,29 +36,32 @@ export const builds_DeployHookResponse_output: JsonSchema = {
 /**
  * The schema of `builds_DetailedDeployHookResponse` in responses.
  */
-export const builds_DetailedDeployHookResponse_output: JsonSchema = {
+export const builds_DetailedDeployHookResponse: JsonSchema = {
   "properties": {
     "branch": {
-      "$ref": "#/$defs/builds_branch"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/builds_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "deploy_hook_name": {
-      "$ref": "#/$defs/builds_deploy_hook_name"
+      "type": "string"
     },
     "deploy_hook_uuid": {
-      "$ref": "#/$defs/builds_deploy_hook_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "external_script_id": {
-      "$ref": "#/$defs/builds_external_script_id"
+      "type": "string"
     },
     "latest_build": {
       "oneOf": [
         {
           "properties": {
             "created_on": {
-              "$ref": "#/$defs/builds_created_on"
+              "format": "date-time",
+              "type": "string"
             }
           },
           "type": "object"
@@ -66,7 +72,8 @@ export const builds_DetailedDeployHookResponse_output: JsonSchema = {
       ]
     },
     "modified_on": {
-      "$ref": "#/$defs/builds_modified_on"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -75,28 +82,28 @@ export const builds_DetailedDeployHookResponse_output: JsonSchema = {
 /**
  * The schema of `builds_TriggerDeployHookResponse` in responses.
  */
-export const builds_TriggerDeployHookResponse_output: JsonSchema = {
+export const builds_TriggerDeployHookResponse: JsonSchema = {
   "properties": {
     "already_exists": {
       "type": "boolean"
     },
     "build_uuid": {
-      "$ref": "#/$defs/builds_build_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/builds_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/builds_BuildStatus"
+      "enum": [
+        "queued",
+        "initializing",
+        "running",
+        "stopped"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `builds_deploy_hook_uuid` in responses.
- */
-export const builds_deploy_hook_uuid_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/deployHooks/schemas.ts b/src/generated/forge-mcp/builds/deployHooks/schemas.ts
index 6697d0b43..dd214b1bd 100644
--- a/src/generated/forge-mcp/builds/deployHooks/schemas.ts
+++ b/src/generated/forge-mcp/builds/deployHooks/schemas.ts
@@ -9,12 +9,12 @@ import type { JsonSchema } from "../../_/tool.js";
 export const builds_CreateDeployHookRequest: JsonSchema = {
   "properties": {
     "branch": {
-      "$ref": "#/$defs/builds_branch",
-      "description": "Git branch name."
+      "description": "Git branch name.",
+      "type": "string"
     },
     "deploy_hook_name": {
-      "$ref": "#/$defs/builds_deploy_hook_name",
-      "description": "Deploy hook name (1-58 characters)."
+      "description": "Deploy hook name (1-58 characters).",
+      "type": "string"
     }
   },
   "required": [
@@ -23,20 +23,3 @@ export const builds_CreateDeployHookRequest: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `builds_deploy_hook_uuid`.
- */
-export const builds_deploy_hook_uuid: JsonSchema = {
-  "description": "Deploy hook UUID.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_script_name`.
- */
-export const builds_script_name: JsonSchema = {
-  "description": "Human-readable name of the Worker.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/deployHooks/tools.ts b/src/generated/forge-mcp/builds/deployHooks/tools.ts
index 71dae72f3..86f433706 100644
--- a/src/generated/forge-mcp/builds/deployHooks/tools.ts
+++ b/src/generated/forge-mcp/builds/deployHooks/tools.ts
@@ -3,69 +3,58 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_BuildStatus_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_branch_output,
-  builds_build_uuid_output,
-  builds_created_on_output,
-  builds_deploy_hook_name_output,
-  builds_external_script_id_output,
-  builds_modified_on_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
 } from "../../outputs.js";
 import {
-  builds_account_id,
-  builds_branch,
-  builds_deploy_hook_name,
-} from "../../schemas.js";
-import {
-  builds_DeployHookResponse_output,
-  builds_DetailedDeployHookResponse_output,
-  builds_TriggerDeployHookResponse_output,
-  builds_deploy_hook_uuid_output,
+  builds_DeployHookResponse,
+  builds_DetailedDeployHookResponse,
+  builds_TriggerDeployHookResponse,
 } from "./outputs.js";
-import {
-  builds_CreateDeployHookRequest,
-  builds_deploy_hook_uuid,
-  builds_script_name,
-} from "./schemas.js";
+import { builds_CreateDeployHookRequest } from "./schemas.js";
 
 /**
- * The tools of `builds.deploy_hooks`.
+ * The tools of `builds.deployHooks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "builds_deploy_hooks_create",
+    name: "builds_deployHooks_create",
     title: "Create a deploy hook",
-    description: "Create an HTTP hook that starts a build for a selected Worker branch.",
+    description: "Create an HTTP hook that starts a build for a selected Worker branch.\n\nPOST /accounts/{account_id}/builds/workers/{script_name}/deploy_hooks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_CreateDeployHookRequest"
         },
-        "script_name": {
-          "$ref": "#/$defs/builds_script_name",
-          "description": "Human-readable name of the worker."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Human-readable name of the worker.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_CreateDeployHookRequest": builds_CreateDeployHookRequest,
-        "builds_account_id": builds_account_id,
-        "builds_branch": builds_branch,
-        "builds_deploy_hook_name": builds_deploy_hook_name,
-        "builds_script_name": builds_script_name,
       },
     },
     outputSchema: {
@@ -83,16 +72,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DeployHookResponse": builds_DeployHookResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DeployHookResponse": builds_DeployHookResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -140,17 +123,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DeployHookResponse": builds_DeployHookResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DeployHookResponse": builds_DeployHookResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -159,35 +136,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "builds_deploy_hooks_delete",
+    name: "builds_deployHooks_delete",
     title: "Delete a deploy hook",
-    description: "Delete a deploy hook so its UUID can no longer start builds.",
+    description: "Delete a deploy hook so its UUID can no longer start builds.\n\nDELETE /accounts/{account_id}/builds/workers/{script_name}/deploy_hooks/{deploy_hook_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "deploy_hook_uuid": {
-          "$ref": "#/$defs/builds_deploy_hook_uuid",
-          "description": "Deploy hook UUID"
-        },
-        "script_name": {
-          "$ref": "#/$defs/builds_script_name",
-          "description": "Human-readable name of the worker."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "deploy_hook_uuid": {
+              "description": "Deploy hook UUID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Human-readable name of the worker.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "deploy_hook_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "deploy_hook_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid,
-        "builds_script_name": builds_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -204,16 +187,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DeployHookResponse": builds_DeployHookResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DeployHookResponse": builds_DeployHookResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -255,17 +232,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DeployHookResponse": builds_DeployHookResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DeployHookResponse": builds_DeployHookResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -273,35 +244,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "builds_deploy_hooks_get",
+    name: "builds_deployHooks_get",
     title: "Get a deploy hook",
-    description: "Retrieve the name, branch, Worker identifier, and timestamps for a deploy hook.",
+    description: "Retrieve the name, branch, Worker identifier, and timestamps for a deploy hook.\n\nGET /accounts/{account_id}/builds/workers/{script_name}/deploy_hooks/{deploy_hook_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "deploy_hook_uuid": {
-          "$ref": "#/$defs/builds_deploy_hook_uuid",
-          "description": "Deploy hook UUID"
-        },
-        "script_name": {
-          "$ref": "#/$defs/builds_script_name",
-          "description": "Human-readable name of the worker."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "deploy_hook_uuid": {
+              "description": "Deploy hook UUID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Human-readable name of the worker.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "deploy_hook_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "deploy_hook_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid,
-        "builds_script_name": builds_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -318,16 +295,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DeployHookResponse": builds_DeployHookResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DeployHookResponse": builds_DeployHookResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -370,17 +341,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DeployHookResponse": builds_DeployHookResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DeployHookResponse": builds_DeployHookResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -388,29 +353,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "builds_deploy_hooks_list",
+    name: "builds_deployHooks_list",
     title: "List deploy hooks",
-    description: "List the branch-specific deploy hooks configured for a Worker.",
+    description: "List the branch-specific deploy hooks configured for a Worker.\n\nGET /accounts/{account_id}/builds/workers/{script_name}/deploy_hooks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/builds_script_name",
-          "description": "Human-readable name of the worker."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Human-readable name of the worker.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_script_name": builds_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -430,16 +401,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DetailedDeployHookResponse": builds_DetailedDeployHookResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DetailedDeployHookResponse": builds_DetailedDeployHookResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -482,17 +447,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DetailedDeployHookResponse": builds_DetailedDeployHookResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DetailedDeployHookResponse": builds_DetailedDeployHookResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -500,23 +459,31 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "builds_deploy_hooks_trigger",
+    name: "builds_deployHooks_trigger",
     title: "Trigger deploy hook",
-    description: "Trigger a build using a deploy hook. This endpoint does not require authentication - the deploy_hook_uuid acts as a secret token.",
+    description: "Trigger a build using a deploy hook. This endpoint does not require authentication - the deploy_hook_uuid acts as a secret token.\n\nPOST /workers/builds/deploy_hooks/{deploy_hook_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "deploy_hook_uuid": {
-          "$ref": "#/$defs/builds_deploy_hook_uuid",
-          "description": "Deploy hook UUID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "deploy_hook_uuid": {
+              "description": "Deploy hook UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "deploy_hook_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "deploy_hook_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -533,13 +500,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_TriggerDeployHookResponse": builds_TriggerDeployHookResponse_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_created_on": builds_created_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_TriggerDeployHookResponse": builds_TriggerDeployHookResponse,
       },
     },
     annotations: {
@@ -576,14 +540,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_TriggerDeployHookResponse": builds_TriggerDeployHookResponse_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_created_on": builds_created_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_TriggerDeployHookResponse": builds_TriggerDeployHookResponse,
       },
     },
     request: (args) => ({
@@ -591,41 +552,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "builds_deploy_hooks_update",
+    name: "builds_deployHooks_update",
     title: "Update a deploy hook",
-    description: "Replace the name and target branch for a deploy hook.",
+    description: "Replace the name and target branch for a deploy hook.\n\nPUT /accounts/{account_id}/builds/workers/{script_name}/deploy_hooks/{deploy_hook_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_CreateDeployHookRequest"
         },
-        "deploy_hook_uuid": {
-          "$ref": "#/$defs/builds_deploy_hook_uuid",
-          "description": "Deploy hook UUID"
-        },
-        "script_name": {
-          "$ref": "#/$defs/builds_script_name",
-          "description": "Human-readable name of the worker."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "deploy_hook_uuid": {
+              "description": "Deploy hook UUID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Human-readable name of the worker.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "deploy_hook_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "deploy_hook_uuid",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_CreateDeployHookRequest": builds_CreateDeployHookRequest,
-        "builds_account_id": builds_account_id,
-        "builds_branch": builds_branch,
-        "builds_deploy_hook_name": builds_deploy_hook_name,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid,
-        "builds_script_name": builds_script_name,
       },
     },
     outputSchema: {
@@ -643,16 +610,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DeployHookResponse": builds_DeployHookResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DeployHookResponse": builds_DeployHookResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -700,17 +661,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_DeployHookResponse": builds_DeployHookResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_branch": builds_branch_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_deploy_hook_uuid": builds_deploy_hook_uuid_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_DeployHookResponse": builds_DeployHookResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/builds/limits/outputs.ts b/src/generated/forge-mcp/builds/limits/outputs.ts
index 531b8a4f2..fd35fbfd6 100644
--- a/src/generated/forge-mcp/builds/limits/outputs.ts
+++ b/src/generated/forge-mcp/builds/limits/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `builds_GetAccountLimitResponse` in responses.
  */
-export const builds_GetAccountLimitResponse_output: JsonSchema = {
+export const builds_GetAccountLimitResponse: JsonSchema = {
   "properties": {
     "build_minutes_refresh_on": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/builds/limits/tools.ts b/src/generated/forge-mcp/builds/limits/tools.ts
index 527153931..23f8b27ed 100644
--- a/src/generated/forge-mcp/builds/limits/tools.ts
+++ b/src/generated/forge-mcp/builds/limits/tools.ts
@@ -3,13 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
 } from "../../outputs.js";
-import { builds_account_id } from "../../schemas.js";
-import { builds_GetAccountLimitResponse_output } from "./outputs.js";
+import { builds_GetAccountLimitResponse } from "./outputs.js";
 
 /**
  * The tools of `builds.limits`.
@@ -18,21 +17,28 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_limits_get",
     title: "Get build-minute availability",
-    description: "Return whether the account's build-minute allowance is exhausted and when it refreshes.",
+    description: "Return whether the account's build-minute allowance is exhausted and when it refreshes.\n\nGET /accounts/{account_id}/builds/account/limits",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -49,10 +55,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_GetAccountLimitResponse": builds_GetAccountLimitResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_GetAccountLimitResponse": builds_GetAccountLimitResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -92,11 +98,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_GetAccountLimitResponse": builds_GetAccountLimitResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_GetAccountLimitResponse": builds_GetAccountLimitResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/builds/logs/outputs.ts b/src/generated/forge-mcp/builds/logs/outputs.ts
index 4a9264449..ba8aa741a 100644
--- a/src/generated/forge-mcp/builds/logs/outputs.ts
+++ b/src/generated/forge-mcp/builds/logs/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `builds_BuildLogsResponse` in responses.
  */
-export const builds_BuildLogsResponse_output: JsonSchema = {
+export const builds_BuildLogsResponse: JsonSchema = {
   "properties": {
     "cursor": {
-      "$ref": "#/$defs/builds_cursor"
+      "type": "string"
     },
     "lines": {
       "items": {
@@ -35,10 +35,3 @@ export const builds_BuildLogsResponse_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `builds_cursor` in responses.
- */
-export const builds_cursor_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/logs/schemas.ts b/src/generated/forge-mcp/builds/logs/schemas.ts
deleted file mode 100644
index c47e247c0..000000000
--- a/src/generated/forge-mcp/builds/logs/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `builds_cursor`.
- */
-export const builds_cursor: JsonSchema = {
-  "description": "Pagination cursor for log retrieval.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/logs/tools.ts b/src/generated/forge-mcp/builds/logs/tools.ts
index 5fc4ae87c..a2385a18b 100644
--- a/src/generated/forge-mcp/builds/logs/tools.ts
+++ b/src/generated/forge-mcp/builds/logs/tools.ts
@@ -1,19 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
 } from "../../outputs.js";
-import { builds_account_id, builds_build_uuid } from "../../schemas.js";
-import {
-  builds_BuildLogsResponse_output,
-  builds_cursor_output,
-} from "./outputs.js";
-import { builds_cursor } from "./schemas.js";
+import { builds_BuildLogsResponse } from "./outputs.js";
 
 /**
  * The tools of `builds.logs`.
@@ -22,32 +17,44 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_logs_get",
     title: "Get Workers build logs",
-    description: "Retrieve cursor-paginated log lines for a build UUID.",
+    description: "Retrieve cursor-paginated log lines for a build UUID.\n\nGET /accounts/{account_id}/builds/builds/{build_uuid}/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "build_uuid": {
-          "$ref": "#/$defs/builds_build_uuid",
-          "description": "Build UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "build_uuid": {
+              "description": "Build UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "build_uuid"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "$ref": "#/$defs/builds_cursor",
-          "description": "Pagination cursor for log retrieval."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor for log retrieval.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "build_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_build_uuid": builds_build_uuid,
-        "builds_cursor": builds_cursor,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -64,11 +71,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildLogsResponse": builds_BuildLogsResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_cursor": builds_cursor_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildLogsResponse": builds_BuildLogsResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -111,18 +117,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildLogsResponse": builds_BuildLogsResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_cursor": builds_cursor_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildLogsResponse": builds_BuildLogsResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/builds/builds/${pathParam(args, "build_uuid")}/logs`,
       query: [
-        ["cursor", args["cursor"], true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/builds/outputs.ts b/src/generated/forge-mcp/builds/outputs.ts
index 4b52f0071..70e1aac35 100644
--- a/src/generated/forge-mcp/builds/outputs.ts
+++ b/src/generated/forge-mcp/builds/outputs.ts
@@ -6,16 +6,32 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `builds_CanceledBuildResponse` in responses.
  */
-export const builds_CanceledBuildResponse_output: JsonSchema = {
+export const builds_CanceledBuildResponse: JsonSchema = {
   "properties": {
     "build_outcome": {
-      "$ref": "#/$defs/builds_BuildOutcome"
+      "enum": [
+        "success",
+        "fail",
+        "skipped",
+        "cancelled",
+        "terminated"
+      ],
+      "type": "string"
     },
     "build_uuid": {
-      "$ref": "#/$defs/builds_build_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "stopped_on": {
-      "$ref": "#/$defs/builds_stopped_on"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/builds/repos/configAutofill/outputs.ts b/src/generated/forge-mcp/builds/repos/configAutofill/outputs.ts
index 7cf3a1f12..82b6c5864 100644
--- a/src/generated/forge-mcp/builds/repos/configAutofill/outputs.ts
+++ b/src/generated/forge-mcp/builds/repos/configAutofill/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `builds_ConfigAutofillResponse` in responses.
  */
-export const builds_ConfigAutofillResponse_output: JsonSchema = {
+export const builds_ConfigAutofillResponse: JsonSchema = {
   "properties": {
     "config_file": {
       "oneOf": [
@@ -42,7 +42,14 @@ export const builds_ConfigAutofillResponse_output: JsonSchema = {
       ]
     },
     "package_manager": {
-      "$ref": "#/$defs/builds_PackageManager"
+      "enum": [
+        "npm",
+        "yarn",
+        "pnpm",
+        "bun",
+        "uv"
+      ],
+      "type": "string"
     },
     "scripts": {
       "oneOf": [
@@ -60,17 +67,3 @@ export const builds_ConfigAutofillResponse_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `builds_PackageManager` in responses.
- */
-export const builds_PackageManager_output: JsonSchema = {
-  "enum": [
-    "npm",
-    "yarn",
-    "pnpm",
-    "bun",
-    "uv"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/repos/configAutofill/tools.ts b/src/generated/forge-mcp/builds/repos/configAutofill/tools.ts
index 6908f613d..edb2cab54 100644
--- a/src/generated/forge-mcp/builds/repos/configAutofill/tools.ts
+++ b/src/generated/forge-mcp/builds/repos/configAutofill/tools.ts
@@ -1,77 +1,83 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
 } from "../../../outputs.js";
-import {
-  builds_SCMProviderType,
-  builds_account_id,
-  builds_branch,
-  builds_provider_account_id,
-  builds_repo_id,
-  builds_root_directory,
-} from "../../../schemas.js";
-import {
-  builds_ConfigAutofillResponse_output,
-  builds_PackageManager_output,
-} from "./outputs.js";
+import { builds_ConfigAutofillResponse } from "./outputs.js";
 
 /**
- * The tools of `builds.repos.config_autofill`.
+ * The tools of `builds.repos.configAutofill`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "builds_repos_config_autofill_get",
+    name: "builds_repos_configAutofill_get",
     title: "Get repository configuration autofill",
-    description: "Analyze repository for automatic configuration detection",
+    description: "Analyze repository for automatic configuration detection\n\nGET /accounts/{account_id}/builds/repos/{provider_type}/{provider_account_id}/{repo_id}/config_autofill",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "branch": {
-          "$ref": "#/$defs/builds_branch",
-          "description": "Git branch name."
-        },
-        "provider_account_id": {
-          "$ref": "#/$defs/builds_provider_account_id",
-          "description": "Provider-specific identifier of the account or namespace that owns the repository."
-        },
-        "provider_type": {
-          "$ref": "#/$defs/builds_SCMProviderType",
-          "description": "SCM provider type"
-        },
-        "repo_id": {
-          "$ref": "#/$defs/builds_repo_id",
-          "description": "Provider-specific repository identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "provider_account_id": {
+              "description": "Provider-specific identifier of the account or namespace that owns the repository.",
+              "type": "string"
+            },
+            "provider_type": {
+              "description": "SCM provider type",
+              "enum": [
+                "github",
+                "gitlab",
+                "gitlab_internal",
+                "origin"
+              ],
+              "type": "string"
+            },
+            "repo_id": {
+              "description": "Provider-specific repository identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "provider_type",
+            "provider_account_id",
+            "repo_id"
+          ],
+          "type": "object"
         },
-        "root_directory": {
-          "$ref": "#/$defs/builds_root_directory",
-          "description": "Repository directory in which build and deploy commands run."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "branch": {
+              "description": "Git branch name.",
+              "type": "string"
+            },
+            "root_directory": {
+              "description": "Repository directory in which build and deploy commands run.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "branch"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "provider_type",
-        "provider_account_id",
-        "repo_id",
-        "branch"
+        "path",
+        "query"
       ],
-      $defs: {
-        "builds_SCMProviderType": builds_SCMProviderType,
-        "builds_account_id": builds_account_id,
-        "builds_branch": builds_branch,
-        "builds_provider_account_id": builds_provider_account_id,
-        "builds_repo_id": builds_repo_id,
-        "builds_root_directory": builds_root_directory,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -88,11 +94,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ConfigAutofillResponse": builds_ConfigAutofillResponse_output,
-        "builds_PackageManager": builds_PackageManager_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ConfigAutofillResponse": builds_ConfigAutofillResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -132,19 +137,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ConfigAutofillResponse": builds_ConfigAutofillResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PackageManager": builds_PackageManager_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ConfigAutofillResponse": builds_ConfigAutofillResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/builds/repos/${pathParam(args, "provider_type")}/${pathParam(args, "provider_account_id")}/${pathParam(args, "repo_id")}/config_autofill`,
       query: [
-        ["branch", args["branch"], true],
-        ["root_directory", args["root_directory"], true],
+        ["branch", param(args, "query", "branch"), true],
+        ["root_directory", param(args, "query", "root_directory"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/builds/repos/connections/schemas.ts b/src/generated/forge-mcp/builds/repos/connections/schemas.ts
index fbcdedd9d..8c1c21a50 100644
--- a/src/generated/forge-mcp/builds/repos/connections/schemas.ts
+++ b/src/generated/forge-mcp/builds/repos/connections/schemas.ts
@@ -9,24 +9,30 @@ import type { JsonSchema } from "../../../_/tool.js";
 export const builds_UpsertRepoConnectionRequest: JsonSchema = {
   "properties": {
     "provider_account_id": {
-      "$ref": "#/$defs/builds_provider_account_id",
-      "description": "Provider-specific identifier of the account or namespace that owns the repository."
+      "description": "Provider-specific identifier of the account or namespace that owns the repository.",
+      "type": "string"
     },
     "provider_account_name": {
-      "$ref": "#/$defs/builds_provider_account_name",
-      "description": "Human-readable name of the account or namespace that owns the repository."
+      "description": "Human-readable name of the account or namespace that owns the repository.",
+      "type": "string"
     },
     "provider_type": {
-      "$ref": "#/$defs/builds_SCMProviderType",
-      "description": "Source control provider."
+      "description": "Source control provider.",
+      "enum": [
+        "github",
+        "gitlab",
+        "gitlab_internal",
+        "origin"
+      ],
+      "type": "string"
     },
     "repo_id": {
-      "$ref": "#/$defs/builds_repo_id",
-      "description": "Provider-specific repository identifier."
+      "description": "Provider-specific repository identifier.",
+      "type": "string"
     },
     "repo_name": {
-      "$ref": "#/$defs/builds_repo_name",
-      "description": "Human-readable repository name."
+      "description": "Human-readable repository name.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/builds/repos/connections/tools.ts b/src/generated/forge-mcp/builds/repos/connections/tools.ts
index 9835c20e2..8004a7a58 100644
--- a/src/generated/forge-mcp/builds/repos/connections/tools.ts
+++ b/src/generated/forge-mcp/builds/repos/connections/tools.ts
@@ -3,30 +3,12 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_SCMProviderType_output,
-  builds_UpsertRepoConnectionResponse_output,
-  builds_created_on_output,
-  builds_deleted_on_output,
-  builds_modified_on_output,
-  builds_provider_account_id_output,
-  builds_provider_account_name_output,
-  builds_repo_connection_uuid_output,
-  builds_repo_id_output,
-  builds_repo_name_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
+  builds_UpsertRepoConnectionResponse,
 } from "../../../outputs.js";
-import {
-  builds_SCMProviderType,
-  builds_account_id,
-  builds_provider_account_id,
-  builds_provider_account_name,
-  builds_repo_connection_uuid,
-  builds_repo_id,
-  builds_repo_name,
-} from "../../../schemas.js";
 import { builds_UpsertRepoConnectionRequest } from "./schemas.js";
 
 /**
@@ -36,34 +18,41 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_repos_connections_delete",
     title: "Delete a repository connection",
-    description: "Delete a saved repository connection.",
+    description: "Delete a saved repository connection.\n\nDELETE /accounts/{account_id}/builds/repos/connections/{repo_connection_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "repo_connection_uuid": {
-          "$ref": "#/$defs/builds_repo_connection_uuid",
-          "description": "Repository connection UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "repo_connection_uuid": {
+              "description": "Repository connection UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "repo_connection_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "repo_connection_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/builds_APIResponse",
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -93,10 +82,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -106,30 +95,34 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_repos_connections_upsert",
     title: "Create or update a repository connection",
-    description: "Save the repository connection required by build triggers.",
+    description: "Save the repository connection required by build triggers.\n\nPUT /accounts/{account_id}/builds/repos/connections",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_UpsertRepoConnectionRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "builds_SCMProviderType": builds_SCMProviderType,
         "builds_UpsertRepoConnectionRequest": builds_UpsertRepoConnectionRequest,
-        "builds_account_id": builds_account_id,
-        "builds_provider_account_id": builds_provider_account_id,
-        "builds_provider_account_name": builds_provider_account_name,
-        "builds_repo_id": builds_repo_id,
-        "builds_repo_name": builds_repo_name,
       },
     },
     outputSchema: {
@@ -147,19 +140,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
       },
     },
     annotations: {
@@ -198,20 +182,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/builds/schemas.ts b/src/generated/forge-mcp/builds/schemas.ts
index 8cc4802d8..8c7627c52 100644
--- a/src/generated/forge-mcp/builds/schemas.ts
+++ b/src/generated/forge-mcp/builds/schemas.ts
@@ -10,8 +10,8 @@ export const builds_EnvironmentVariablesRequest: JsonSchema = {
   "additionalProperties": {
     "properties": {
       "is_secret": {
-        "$ref": "#/$defs/builds_is_secret",
-        "description": "Whether to hide the value after it is saved. Secret values remain available to builds but appear as `null` when you list variables; non-secret values remain visible."
+        "description": "Whether to hide the value after it is saved. Secret values remain available to builds but appear as `null` when you list variables; non-secret values remain visible.",
+        "type": "boolean"
       },
       "value": {
         "description": "Value made available to the build. Maximum length is 5000 characters.",
diff --git a/src/generated/forge-mcp/builds/tokens/outputs.ts b/src/generated/forge-mcp/builds/tokens/outputs.ts
index 225887198..47703f73d 100644
--- a/src/generated/forge-mcp/builds/tokens/outputs.ts
+++ b/src/generated/forge-mcp/builds/tokens/outputs.ts
@@ -6,19 +6,20 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `builds_CreateBuildTokenResponse` in responses.
  */
-export const builds_CreateBuildTokenResponse_output: JsonSchema = {
+export const builds_CreateBuildTokenResponse: JsonSchema = {
   "properties": {
     "build_token_name": {
-      "$ref": "#/$defs/builds_build_token_name"
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "cloudflare_token_id": {
-      "$ref": "#/$defs/builds_cloudflare_token_id"
+      "type": "string"
     },
     "owner_type": {
-      "$ref": "#/$defs/builds_owner_type"
+      "type": "string"
     }
   },
   "type": "object"
@@ -27,34 +28,21 @@ export const builds_CreateBuildTokenResponse_output: JsonSchema = {
 /**
  * The schema of `builds_ListTokensResponse` in responses.
  */
-export const builds_ListTokensResponse_output: JsonSchema = {
+export const builds_ListTokensResponse: JsonSchema = {
   "properties": {
     "build_token_name": {
-      "$ref": "#/$defs/builds_build_token_name"
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "cloudflare_token_id": {
-      "$ref": "#/$defs/builds_cloudflare_token_id"
+      "type": "string"
     },
     "owner_type": {
-      "$ref": "#/$defs/builds_owner_type"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `builds_cloudflare_token_id` in responses.
- */
-export const builds_cloudflare_token_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_owner_type` in responses.
- */
-export const builds_owner_type_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/tokens/schemas.ts b/src/generated/forge-mcp/builds/tokens/schemas.ts
index e9083b252..17e77023e 100644
--- a/src/generated/forge-mcp/builds/tokens/schemas.ts
+++ b/src/generated/forge-mcp/builds/tokens/schemas.ts
@@ -9,13 +9,13 @@ import type { JsonSchema } from "../../_/tool.js";
 export const builds_CreateBuildTokenRequest: JsonSchema = {
   "properties": {
     "build_token_name": {
-      "$ref": "#/$defs/builds_build_token_name"
+      "type": "string"
     },
     "build_token_secret": {
       "type": "string"
     },
     "cloudflare_token_id": {
-      "$ref": "#/$defs/builds_cloudflare_token_id"
+      "type": "string"
     }
   },
   "required": [
@@ -25,10 +25,3 @@ export const builds_CreateBuildTokenRequest: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `builds_cloudflare_token_id`.
- */
-export const builds_cloudflare_token_id: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/tokens/tools.ts b/src/generated/forge-mcp/builds/tokens/tools.ts
index 21c90d649..5cd365136 100644
--- a/src/generated/forge-mcp/builds/tokens/tools.ts
+++ b/src/generated/forge-mcp/builds/tokens/tools.ts
@@ -1,30 +1,18 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_build_token_name_output,
-  builds_build_token_uuid_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
 } from "../../outputs.js";
 import {
-  builds_account_id,
-  builds_build_token_name,
-  builds_build_token_uuid,
-} from "../../schemas.js";
-import {
-  builds_CreateBuildTokenResponse_output,
-  builds_ListTokensResponse_output,
-  builds_cloudflare_token_id_output,
-  builds_owner_type_output,
+  builds_CreateBuildTokenResponse,
+  builds_ListTokensResponse,
 } from "./outputs.js";
-import {
-  builds_CreateBuildTokenRequest,
-  builds_cloudflare_token_id,
-} from "./schemas.js";
+import { builds_CreateBuildTokenRequest } from "./schemas.js";
 
 /**
  * The tools of `builds.tokens`.
@@ -33,27 +21,34 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_tokens_create",
     title: "Create build token",
-    description: "Create a new build authentication token",
+    description: "Create a new build authentication token\n\nPOST /accounts/{account_id}/builds/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_CreateBuildTokenRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_CreateBuildTokenRequest": builds_CreateBuildTokenRequest,
-        "builds_account_id": builds_account_id,
-        "builds_build_token_name": builds_build_token_name,
-        "builds_cloudflare_token_id": builds_cloudflare_token_id,
       },
     },
     outputSchema: {
@@ -71,14 +66,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_CreateBuildTokenResponse": builds_CreateBuildTokenResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_cloudflare_token_id": builds_cloudflare_token_id_output,
-        "builds_owner_type": builds_owner_type_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_CreateBuildTokenResponse": builds_CreateBuildTokenResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -117,15 +108,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_CreateBuildTokenResponse": builds_CreateBuildTokenResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_cloudflare_token_id": builds_cloudflare_token_id_output,
-        "builds_owner_type": builds_owner_type_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_CreateBuildTokenResponse": builds_CreateBuildTokenResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -136,34 +123,41 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_tokens_delete",
     title: "Delete a build token",
-    description: "Delete a stored build token owned by the current user.",
+    description: "Delete a stored build token owned by the current user.\n\nDELETE /accounts/{account_id}/builds/tokens/{build_token_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "build_token_uuid": {
-          "$ref": "#/$defs/builds_build_token_uuid",
-          "description": "UUID of the build token used when deploying the Worker."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "build_token_uuid": {
+              "description": "UUID of the build token used when deploying the Worker.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "build_token_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "build_token_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_build_token_uuid": builds_build_token_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/builds_APIResponse",
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -193,10 +187,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -206,31 +200,44 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_tokens_list",
     title: "List build tokens",
-    description: "List metadata for build tokens available to the current user without returning their secrets.",
+    description: "List metadata for build tokens available to the current user without returning their secrets.\n\nGET /accounts/{account_id}/builds/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number for pagination",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "Number of items per page",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number for pagination",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of items per page",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -253,14 +260,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ListTokensResponse": builds_ListTokensResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_cloudflare_token_id": builds_cloudflare_token_id_output,
-        "builds_owner_type": builds_owner_type_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ListTokensResponse": builds_ListTokensResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -306,22 +309,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_ListTokensResponse": builds_ListTokensResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_cloudflare_token_id": builds_cloudflare_token_id_output,
-        "builds_owner_type": builds_owner_type_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_ListTokensResponse": builds_ListTokensResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/builds/tokens`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/builds/tools.ts b/src/generated/forge-mcp/builds/tools.ts
index 8bad9daa4..a0fb91116 100644
--- a/src/generated/forge-mcp/builds/tools.ts
+++ b/src/generated/forge-mcp/builds/tools.ts
@@ -1,58 +1,26 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_BuildOutcome_output,
-  builds_BuildResponse_output,
-  builds_BuildStatus_output,
-  builds_BuildTriggerMetadataResponse_output,
-  builds_BuildTriggerSource_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_SCMProviderType_output,
-  builds_UpsertRepoConnectionResponse_output,
-  builds_branch_excludes_output,
-  builds_branch_includes_output,
-  builds_branch_output,
-  builds_build_caching_enabled_output,
-  builds_build_command_output,
-  builds_build_token_name_output,
-  builds_build_token_uuid_output,
-  builds_build_uuid_output,
-  builds_commit_hash_output,
-  builds_created_on_output,
-  builds_deleted_on_output,
-  builds_deploy_command_output,
-  builds_deploy_hook_name_output,
-  builds_external_script_id_output,
-  builds_modified_on_output,
-  builds_path_excludes_output,
-  builds_path_includes_output,
-  builds_provider_account_id_output,
-  builds_provider_account_name_output,
-  builds_repo_connection_uuid_output,
-  builds_repo_id_output,
-  builds_repo_name_output,
-  builds_root_directory_output,
-  builds_stopped_on_output,
-  builds_trigger_name_output,
-  builds_trigger_uuid_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_BuildResponse,
+  builds_BuildTriggerMetadataResponse,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
+  builds_UpsertRepoConnectionResponse,
+  builds_branch_excludes,
+  builds_branch_includes,
+  builds_path_excludes,
+  builds_path_includes,
 } from "../outputs.js";
 import {
   builds_BuildSeedRepoInput,
   builds_BuildSeedRepoInputFile,
   builds_CreateBuildRequest,
-  builds_account_id,
-  builds_branch,
-  builds_build_uuid,
-  builds_commit_hash,
-  builds_external_script_id,
-  builds_trigger_uuid,
 } from "../schemas.js";
-import { builds_CanceledBuildResponse_output } from "./outputs.js";
+import { builds_CanceledBuildResponse } from "./outputs.js";
 
 /**
  * The tools of `builds`.
@@ -61,27 +29,34 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_cancel",
     title: "Cancel a Workers build",
-    description: "Cancel a queued or running build.",
+    description: "Cancel a queued or running build.\n\nPUT /accounts/{account_id}/builds/builds/{build_uuid}/cancel",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "build_uuid": {
-          "$ref": "#/$defs/builds_build_uuid",
-          "description": "Build UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "build_uuid": {
+              "description": "Build UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "build_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "build_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_build_uuid": builds_build_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -98,13 +73,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_CanceledBuildResponse": builds_CanceledBuildResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_stopped_on": builds_stopped_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_CanceledBuildResponse": builds_CanceledBuildResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -146,14 +118,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_CanceledBuildResponse": builds_CanceledBuildResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_stopped_on": builds_stopped_on_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_CanceledBuildResponse": builds_CanceledBuildResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -163,35 +132,42 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_create",
     title: "Start a Workers build",
-    description: "Start a build for a branch or commit using the selected trigger.",
+    description: "Start a build for a branch or commit using the selected trigger.\n\nPOST /accounts/{account_id}/builds/triggers/{trigger_uuid}/builds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_CreateBuildRequest"
         },
-        "trigger_uuid": {
-          "$ref": "#/$defs/builds_trigger_uuid",
-          "description": "Trigger UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "trigger_uuid": {
+              "description": "Trigger UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trigger_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trigger_uuid",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_BuildSeedRepoInput": builds_BuildSeedRepoInput,
         "builds_BuildSeedRepoInputFile": builds_BuildSeedRepoInputFile,
         "builds_CreateBuildRequest": builds_CreateBuildRequest,
-        "builds_account_id": builds_account_id,
-        "builds_branch": builds_branch,
-        "builds_commit_hash": builds_commit_hash,
-        "builds_trigger_uuid": builds_trigger_uuid,
       },
     },
     outputSchema: {
@@ -209,42 +185,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -283,43 +233,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -330,27 +254,34 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_get",
     title: "Get a Workers build",
-    description: "Retrieve status, outcome, timestamps, trigger settings, and source metadata for a build UUID.",
+    description: "Retrieve status, outcome, timestamps, trigger settings, and source metadata for a build UUID.\n\nGET /accounts/{account_id}/builds/builds/{build_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "build_uuid": {
-          "$ref": "#/$defs/builds_build_uuid",
-          "description": "Build UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "build_uuid": {
+              "description": "Build UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "build_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "build_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_build_uuid": builds_build_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -367,42 +298,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -445,43 +350,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -491,37 +370,49 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_list",
     title: "List builds for a Worker",
-    description: "List paginated build records associated with a Worker tag.",
+    description: "List paginated build records associated with a Worker tag.\n\nGET /accounts/{account_id}/builds/workers/{external_script_id}/builds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "external_script_id": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "System-generated tag of the Worker. This is not the Worker name."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number for pagination",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "external_script_id": {
+              "description": "System-generated tag of the Worker. This is not the Worker name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "external_script_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "Number of items per page",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number for pagination",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of items per page",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "external_script_id"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_external_script_id": builds_external_script_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -544,42 +435,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -625,50 +490,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/builds/workers/${pathParam(args, "external_script_id")}/builds`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/builds/triggers/cache/tools.ts b/src/generated/forge-mcp/builds/triggers/cache/tools.ts
index ef0973a79..f9594c36f 100644
--- a/src/generated/forge-mcp/builds/triggers/cache/tools.ts
+++ b/src/generated/forge-mcp/builds/triggers/cache/tools.ts
@@ -3,12 +3,11 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
 } from "../../../outputs.js";
-import { builds_account_id, builds_trigger_uuid } from "../../../schemas.js";
 
 /**
  * The tools of `builds.triggers.cache`.
@@ -17,34 +16,41 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_triggers_cache_purge",
     title: "Purge a trigger's build cache",
-    description: "Delete cached dependencies and build artifacts associated with a trigger.\n\nConfirm with the user before calling this tool. This operation purges the build cache for a Workers Builds trigger.",
+    description: "Delete cached dependencies and build artifacts associated with a trigger.\n\nConfirm with the user before calling this tool. This operation purges the build cache for a Workers Builds trigger.\n\nPOST /accounts/{account_id}/builds/triggers/{trigger_uuid}/purge_build_cache",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "trigger_uuid": {
-          "$ref": "#/$defs/builds_trigger_uuid",
-          "description": "Trigger UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "trigger_uuid": {
+              "description": "Trigger UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trigger_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trigger_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_trigger_uuid": builds_trigger_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/builds_APIResponse",
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -74,10 +80,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/builds/triggers/environmentVariables/schemas.ts b/src/generated/forge-mcp/builds/triggers/environmentVariables/schemas.ts
deleted file mode 100644
index 8104dc658..000000000
--- a/src/generated/forge-mcp/builds/triggers/environmentVariables/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `builds_environment_variable_key`.
- */
-export const builds_environment_variable_key: JsonSchema = {
-  "description": "Environment variable key.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/triggers/environmentVariables/tools.ts b/src/generated/forge-mcp/builds/triggers/environmentVariables/tools.ts
index 0180c87f4..248bfb13c 100644
--- a/src/generated/forge-mcp/builds/triggers/environmentVariables/tools.ts
+++ b/src/generated/forge-mcp/builds/triggers/environmentVariables/tools.ts
@@ -3,63 +3,61 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_EnvironmentVariablesResponse_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_created_on_output,
-  builds_is_secret_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_EnvironmentVariablesResponse,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
 } from "../../../outputs.js";
-import {
-  builds_account_id,
-  builds_is_secret,
-  builds_trigger_uuid,
-} from "../../../schemas.js";
 import { builds_EnvironmentVariablesRequest } from "../../schemas.js";
-import { builds_environment_variable_key } from "./schemas.js";
 
 /**
- * The tools of `builds.triggers.environment_variables`.
+ * The tools of `builds.triggers.environmentVariables`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "builds_triggers_environment_variables_delete",
+    name: "builds_triggers_environmentVariables_delete",
     title: "Delete a build variable",
-    description: "Delete one build-time variable or secret by key.",
+    description: "Delete one build-time variable or secret by key.\n\nDELETE /accounts/{account_id}/builds/triggers/{trigger_uuid}/environment_variables/{environment_variable_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "environment_variable_key": {
-          "$ref": "#/$defs/builds_environment_variable_key",
-          "description": "Environment variable key."
-        },
-        "trigger_uuid": {
-          "$ref": "#/$defs/builds_trigger_uuid",
-          "description": "Trigger UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "environment_variable_key": {
+              "description": "Environment variable key.",
+              "type": "string"
+            },
+            "trigger_uuid": {
+              "description": "Trigger UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trigger_uuid",
+            "environment_variable_key"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trigger_uuid",
-        "environment_variable_key"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_environment_variable_key": builds_environment_variable_key,
-        "builds_trigger_uuid": builds_trigger_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/builds_APIResponse",
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -89,10 +87,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -100,29 +98,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "builds_triggers_environment_variables_list",
+    name: "builds_triggers_environmentVariables_list",
     title: "List build variables",
-    description: "List build-time variables configured for a trigger. Secret values are not returned.",
+    description: "List build-time variables configured for a trigger. Secret values are not returned.\n\nGET /accounts/{account_id}/builds/triggers/{trigger_uuid}/environment_variables",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "trigger_uuid": {
-          "$ref": "#/$defs/builds_trigger_uuid",
-          "description": "Trigger UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "trigger_uuid": {
+              "description": "Trigger UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trigger_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trigger_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_trigger_uuid": builds_trigger_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -139,12 +144,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_is_secret": builds_is_secret_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -184,13 +187,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_is_secret": builds_is_secret_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -198,34 +199,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "builds_triggers_environment_variables_upsert",
+    name: "builds_triggers_environmentVariables_upsert",
     title: "Set build variables",
-    description: "Add or replace build-time variables and secrets without changing unspecified keys.",
+    description: "Add or replace build-time variables and secrets without changing unspecified keys.\n\nPATCH /accounts/{account_id}/builds/triggers/{trigger_uuid}/environment_variables",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_EnvironmentVariablesRequest"
         },
-        "trigger_uuid": {
-          "$ref": "#/$defs/builds_trigger_uuid",
-          "description": "Trigger UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "trigger_uuid": {
+              "description": "Trigger UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trigger_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trigger_uuid",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_EnvironmentVariablesRequest": builds_EnvironmentVariablesRequest,
-        "builds_account_id": builds_account_id,
-        "builds_is_secret": builds_is_secret,
-        "builds_trigger_uuid": builds_trigger_uuid,
       },
     },
     outputSchema: {
@@ -243,12 +252,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_is_secret": builds_is_secret_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -290,13 +297,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_is_secret": builds_is_secret_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/builds/triggers/outputs.ts b/src/generated/forge-mcp/builds/triggers/outputs.ts
index 04bc747ff..cd12979ed 100644
--- a/src/generated/forge-mcp/builds/triggers/outputs.ts
+++ b/src/generated/forge-mcp/builds/triggers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `builds_TriggerResponse` in responses.
  */
-export const builds_TriggerResponse_output: JsonSchema = {
+export const builds_TriggerResponse: JsonSchema = {
   "properties": {
     "branch_excludes": {
       "$ref": "#/$defs/builds_branch_excludes"
@@ -15,31 +15,42 @@ export const builds_TriggerResponse_output: JsonSchema = {
       "$ref": "#/$defs/builds_branch_includes"
     },
     "build_caching_enabled": {
-      "$ref": "#/$defs/builds_build_caching_enabled"
+      "type": "boolean"
     },
     "build_command": {
-      "$ref": "#/$defs/builds_build_command"
+      "type": "string"
     },
     "build_token_name": {
-      "$ref": "#/$defs/builds_build_token_name"
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/builds_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_on": {
-      "$ref": "#/$defs/builds_deleted_on"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "deploy_command": {
-      "$ref": "#/$defs/builds_deploy_command"
+      "type": "string"
     },
     "external_script_id": {
-      "$ref": "#/$defs/builds_external_script_id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/builds_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "path_excludes": {
       "$ref": "#/$defs/builds_path_excludes"
@@ -51,13 +62,14 @@ export const builds_TriggerResponse_output: JsonSchema = {
       "$ref": "#/$defs/builds_UpsertRepoConnectionResponse"
     },
     "root_directory": {
-      "$ref": "#/$defs/builds_root_directory"
+      "type": "string"
     },
     "trigger_name": {
-      "$ref": "#/$defs/builds_trigger_name"
+      "type": "string"
     },
     "trigger_uuid": {
-      "$ref": "#/$defs/builds_trigger_uuid"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/builds/triggers/schemas.ts b/src/generated/forge-mcp/builds/triggers/schemas.ts
index 01281ac7a..10a5fce1f 100644
--- a/src/generated/forge-mcp/builds/triggers/schemas.ts
+++ b/src/generated/forge-mcp/builds/triggers/schemas.ts
@@ -17,25 +17,26 @@ export const builds_CreateTriggerRequest: JsonSchema = {
       "description": "Branch patterns that can start builds."
     },
     "build_caching_enabled": {
-      "$ref": "#/$defs/builds_build_caching_enabled",
       "default": false,
-      "description": "Whether builds reuse cached dependencies and build artifacts."
+      "description": "Whether builds reuse cached dependencies and build artifacts.",
+      "type": "boolean"
     },
     "build_command": {
-      "$ref": "#/$defs/builds_build_command",
-      "description": "Command to build the Worker."
+      "description": "Command to build the Worker.",
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid",
-      "description": "UUID of the build token used when deploying the Worker."
+      "description": "UUID of the build token used when deploying the Worker.",
+      "format": "uuid",
+      "type": "string"
     },
     "deploy_command": {
-      "$ref": "#/$defs/builds_deploy_command",
-      "description": "Command to deploy the Worker."
+      "description": "Command to deploy the Worker.",
+      "type": "string"
     },
     "external_script_id": {
-      "$ref": "#/$defs/builds_external_script_id",
-      "description": "System-generated tag of the Worker. This is not the Worker name."
+      "description": "System-generated tag of the Worker. This is not the Worker name.",
+      "type": "string"
     },
     "path_excludes": {
       "$ref": "#/$defs/builds_path_excludes",
@@ -49,16 +50,17 @@ export const builds_CreateTriggerRequest: JsonSchema = {
       "description": "Path patterns that can start builds."
     },
     "repo_connection_uuid": {
-      "$ref": "#/$defs/builds_repo_connection_uuid",
-      "description": "Repository connection UUID."
+      "description": "Repository connection UUID.",
+      "format": "uuid",
+      "type": "string"
     },
     "root_directory": {
-      "$ref": "#/$defs/builds_root_directory",
-      "description": "Repository directory in which build and deploy commands run."
+      "description": "Repository directory in which build and deploy commands run.",
+      "type": "string"
     },
     "trigger_name": {
-      "$ref": "#/$defs/builds_trigger_name",
-      "description": "Human-readable name of the build trigger."
+      "description": "Human-readable name of the build trigger.",
+      "type": "string"
     }
   },
   "required": [
@@ -91,21 +93,22 @@ export const builds_UpdateTriggerRequest: JsonSchema = {
       "description": "Branch patterns that can start builds."
     },
     "build_caching_enabled": {
-      "$ref": "#/$defs/builds_build_caching_enabled",
       "default": false,
-      "description": "Whether builds reuse cached dependencies and build artifacts."
+      "description": "Whether builds reuse cached dependencies and build artifacts.",
+      "type": "boolean"
     },
     "build_command": {
-      "$ref": "#/$defs/builds_build_command",
-      "description": "Command to build the Worker."
+      "description": "Command to build the Worker.",
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid",
-      "description": "UUID of the build token used when deploying the Worker."
+      "description": "UUID of the build token used when deploying the Worker.",
+      "format": "uuid",
+      "type": "string"
     },
     "deploy_command": {
-      "$ref": "#/$defs/builds_deploy_command",
-      "description": "Command to deploy the Worker."
+      "description": "Command to deploy the Worker.",
+      "type": "string"
     },
     "path_excludes": {
       "$ref": "#/$defs/builds_path_excludes",
@@ -119,12 +122,12 @@ export const builds_UpdateTriggerRequest: JsonSchema = {
       "description": "Path patterns that can start builds."
     },
     "root_directory": {
-      "$ref": "#/$defs/builds_root_directory",
-      "description": "Repository directory in which build and deploy commands run."
+      "description": "Repository directory in which build and deploy commands run.",
+      "type": "string"
     },
     "trigger_name": {
-      "$ref": "#/$defs/builds_trigger_name",
-      "description": "Human-readable name of the build trigger."
+      "description": "Human-readable name of the build trigger.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/builds/triggers/tools.ts b/src/generated/forge-mcp/builds/triggers/tools.ts
index 13852722d..c294da05e 100644
--- a/src/generated/forge-mcp/builds/triggers/tools.ts
+++ b/src/generated/forge-mcp/builds/triggers/tools.ts
@@ -3,51 +3,23 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_SCMProviderType_output,
-  builds_UpsertRepoConnectionResponse_output,
-  builds_branch_excludes_output,
-  builds_branch_includes_output,
-  builds_build_caching_enabled_output,
-  builds_build_command_output,
-  builds_build_token_name_output,
-  builds_build_token_uuid_output,
-  builds_created_on_output,
-  builds_deleted_on_output,
-  builds_deploy_command_output,
-  builds_external_script_id_output,
-  builds_modified_on_output,
-  builds_path_excludes_output,
-  builds_path_includes_output,
-  builds_provider_account_id_output,
-  builds_provider_account_name_output,
-  builds_repo_connection_uuid_output,
-  builds_repo_id_output,
-  builds_repo_name_output,
-  builds_root_directory_output,
-  builds_trigger_name_output,
-  builds_trigger_uuid_output,
-} from "../../outputs.js";
-import {
-  builds_account_id,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
+  builds_UpsertRepoConnectionResponse,
   builds_branch_excludes,
   builds_branch_includes,
-  builds_build_caching_enabled,
-  builds_build_command,
-  builds_build_token_uuid,
-  builds_deploy_command,
-  builds_external_script_id,
   builds_path_excludes,
   builds_path_includes,
-  builds_repo_connection_uuid,
-  builds_root_directory,
-  builds_trigger_name,
-  builds_trigger_uuid,
+} from "../../outputs.js";
+import {
+  builds_branch_excludes as builds_branch_excludes$,
+  builds_branch_includes as builds_branch_includes$,
+  builds_path_excludes as builds_path_excludes$,
+  builds_path_includes as builds_path_includes$,
 } from "../../schemas.js";
-import { builds_TriggerResponse_output } from "./outputs.js";
+import { builds_TriggerResponse } from "./outputs.js";
 import {
   builds_CreateTriggerRequest,
   builds_UpdateTriggerRequest,
@@ -60,37 +32,38 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_triggers_create",
     title: "Create a build trigger",
-    description: "Create a trigger defining the repository connection, Worker tag, commands, filters, cache setting, and build token.",
+    description: "Create a trigger defining the repository connection, Worker tag, commands, filters, cache setting, and build token.\n\nPOST /accounts/{account_id}/builds/triggers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_CreateTriggerRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_CreateTriggerRequest": builds_CreateTriggerRequest,
-        "builds_account_id": builds_account_id,
-        "builds_branch_excludes": builds_branch_excludes,
-        "builds_branch_includes": builds_branch_includes,
-        "builds_build_caching_enabled": builds_build_caching_enabled,
-        "builds_build_command": builds_build_command,
-        "builds_build_token_uuid": builds_build_token_uuid,
-        "builds_deploy_command": builds_deploy_command,
-        "builds_external_script_id": builds_external_script_id,
-        "builds_path_excludes": builds_path_excludes,
-        "builds_path_includes": builds_path_includes,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid,
-        "builds_root_directory": builds_root_directory,
-        "builds_trigger_name": builds_trigger_name,
+        "builds_branch_excludes": builds_branch_excludes$,
+        "builds_branch_includes": builds_branch_includes$,
+        "builds_path_excludes": builds_path_excludes$,
+        "builds_path_includes": builds_path_includes$,
       },
     },
     outputSchema: {
@@ -108,33 +81,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_TriggerResponse": builds_TriggerResponse_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_TriggerResponse": builds_TriggerResponse,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -173,34 +128,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_TriggerResponse": builds_TriggerResponse_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_TriggerResponse": builds_TriggerResponse,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -211,34 +148,41 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_triggers_delete",
     title: "Delete a build trigger",
-    description: "Delete a trigger and cancel its unfinished builds.\n\nConfirm with the user before calling this tool. This operation deletes the build trigger and cancels its unfinished builds.",
+    description: "Delete a trigger and cancel its unfinished builds.\n\nConfirm with the user before calling this tool. This operation deletes the build trigger and cancels its unfinished builds.\n\nDELETE /accounts/{account_id}/builds/triggers/{trigger_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "trigger_uuid": {
-          "$ref": "#/$defs/builds_trigger_uuid",
-          "description": "Trigger UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "trigger_uuid": {
+              "description": "Trigger UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trigger_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trigger_uuid"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_trigger_uuid": builds_trigger_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/builds_APIResponse",
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -268,10 +212,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -281,27 +225,33 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_triggers_list",
     title: "List triggers for a Worker",
-    description: "List trigger UUIDs and build settings associated with a Worker tag.",
+    description: "List trigger UUIDs and build settings associated with a Worker tag.\n\nGET /accounts/{account_id}/builds/workers/{external_script_id}/triggers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "external_script_id": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "System-generated tag of the Worker. This is not the Worker name."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "external_script_id": {
+              "description": "System-generated tag of the Worker. This is not the Worker name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "external_script_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "external_script_id"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_external_script_id": builds_external_script_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -321,33 +271,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_TriggerResponse": builds_TriggerResponse_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_TriggerResponse": builds_TriggerResponse,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -390,34 +322,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_TriggerResponse": builds_TriggerResponse_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_TriggerResponse": builds_TriggerResponse,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -427,41 +341,44 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_triggers_update",
     title: "Update a build trigger",
-    description: "Update commands, cache settings, or branch and path filters for a trigger.",
+    description: "Update commands, cache settings, or branch and path filters for a trigger.\n\nPATCH /accounts/{account_id}/builds/triggers/{trigger_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_UpdateTriggerRequest"
         },
-        "trigger_uuid": {
-          "$ref": "#/$defs/builds_trigger_uuid",
-          "description": "Trigger UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "trigger_uuid": {
+              "description": "Trigger UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trigger_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trigger_uuid",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_UpdateTriggerRequest": builds_UpdateTriggerRequest,
-        "builds_account_id": builds_account_id,
-        "builds_branch_excludes": builds_branch_excludes,
-        "builds_branch_includes": builds_branch_includes,
-        "builds_build_caching_enabled": builds_build_caching_enabled,
-        "builds_build_command": builds_build_command,
-        "builds_build_token_uuid": builds_build_token_uuid,
-        "builds_deploy_command": builds_deploy_command,
-        "builds_path_excludes": builds_path_excludes,
-        "builds_path_includes": builds_path_includes,
-        "builds_root_directory": builds_root_directory,
-        "builds_trigger_name": builds_trigger_name,
-        "builds_trigger_uuid": builds_trigger_uuid,
+        "builds_branch_excludes": builds_branch_excludes$,
+        "builds_branch_includes": builds_branch_includes$,
+        "builds_path_excludes": builds_path_excludes$,
+        "builds_path_includes": builds_path_includes$,
       },
     },
     outputSchema: {
@@ -479,33 +396,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_TriggerResponse": builds_TriggerResponse_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_TriggerResponse": builds_TriggerResponse,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -547,34 +446,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_TriggerResponse": builds_TriggerResponse_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_TriggerResponse": builds_TriggerResponse,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/builds/versions/outputs.ts b/src/generated/forge-mcp/builds/versions/outputs.ts
index 247bd9e7a..1ad6cf86d 100644
--- a/src/generated/forge-mcp/builds/versions/outputs.ts
+++ b/src/generated/forge-mcp/builds/versions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `builds_BuildsByVersionResponse` in responses.
  */
-export const builds_BuildsByVersionResponse_output: JsonSchema = {
+export const builds_BuildsByVersionResponse: JsonSchema = {
   "properties": {
     "builds": {
       "additionalProperties": {
diff --git a/src/generated/forge-mcp/builds/versions/schemas.ts b/src/generated/forge-mcp/builds/versions/schemas.ts
deleted file mode 100644
index 0efcfa34a..000000000
--- a/src/generated/forge-mcp/builds/versions/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `builds_version_ids`.
- */
-export const builds_version_ids: JsonSchema = {
-  "description": "Comma-separated list of version UUIDs (max 20).",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/builds/versions/tools.ts b/src/generated/forge-mcp/builds/versions/tools.ts
index 2de640dbd..017f2a262 100644
--- a/src/generated/forge-mcp/builds/versions/tools.ts
+++ b/src/generated/forge-mcp/builds/versions/tools.ts
@@ -1,49 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_BuildOutcome_output,
-  builds_BuildResponse_output,
-  builds_BuildStatus_output,
-  builds_BuildTriggerMetadataResponse_output,
-  builds_BuildTriggerSource_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_SCMProviderType_output,
-  builds_UpsertRepoConnectionResponse_output,
-  builds_branch_excludes_output,
-  builds_branch_includes_output,
-  builds_branch_output,
-  builds_build_caching_enabled_output,
-  builds_build_command_output,
-  builds_build_token_name_output,
-  builds_build_token_uuid_output,
-  builds_build_uuid_output,
-  builds_commit_hash_output,
-  builds_created_on_output,
-  builds_deleted_on_output,
-  builds_deploy_command_output,
-  builds_deploy_hook_name_output,
-  builds_external_script_id_output,
-  builds_modified_on_output,
-  builds_path_excludes_output,
-  builds_path_includes_output,
-  builds_provider_account_id_output,
-  builds_provider_account_name_output,
-  builds_repo_connection_uuid_output,
-  builds_repo_id_output,
-  builds_repo_name_output,
-  builds_root_directory_output,
-  builds_stopped_on_output,
-  builds_trigger_name_output,
-  builds_trigger_uuid_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_BuildResponse,
+  builds_BuildTriggerMetadataResponse,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
+  builds_UpsertRepoConnectionResponse,
+  builds_branch_excludes,
+  builds_branch_includes,
+  builds_path_excludes,
+  builds_path_includes,
 } from "../../outputs.js";
-import { builds_account_id } from "../../schemas.js";
-import { builds_BuildsByVersionResponse_output } from "./outputs.js";
-import { builds_version_ids } from "./schemas.js";
+import { builds_BuildsByVersionResponse } from "./outputs.js";
 
 /**
  * The tools of `builds.versions`.
@@ -52,27 +24,42 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_versions_get",
     title: "Get builds by Worker version",
-    description: "Retrieve builds associated with one or more Worker version IDs.",
+    description: "Retrieve builds associated with one or more Worker version IDs.\n\nGET /accounts/{account_id}/builds/builds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "version_ids": {
-          "$ref": "#/$defs/builds_version_ids",
-          "description": "Comma-separated list of version UUIDs (max 20)."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "version_ids": {
+              "description": "Comma-separated list of version UUIDs (max 20).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "version_ids"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "version_ids"
+        "path",
+        "query"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_version_ids": builds_version_ids,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -89,43 +76,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_BuildsByVersionResponse": builds_BuildsByVersionResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_BuildsByVersionResponse": builds_BuildsByVersionResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -165,50 +126,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_BuildsByVersionResponse": builds_BuildsByVersionResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_BuildsByVersionResponse": builds_BuildsByVersionResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/builds/builds`,
       query: [
-        ["version_ids", args["version_ids"], true],
+        ["version_ids", param(args, "query", "version_ids"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/builds/workers/schemas.ts b/src/generated/forge-mcp/builds/workers/schemas.ts
index e9935d9d0..f19f138d1 100644
--- a/src/generated/forge-mcp/builds/workers/schemas.ts
+++ b/src/generated/forge-mcp/builds/workers/schemas.ts
@@ -15,16 +15,17 @@ export const builds_CreateWorkerBuildSettingsInput: JsonSchema = {
       "type": "boolean"
     },
     "build_command": {
-      "$ref": "#/$defs/builds_build_command",
-      "description": "Command to build the Worker."
+      "description": "Command to build the Worker.",
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid",
-      "description": "UUID of the build token used when deploying the Worker."
+      "description": "UUID of the build token used when deploying the Worker.",
+      "format": "uuid",
+      "type": "string"
     },
     "deploy_command": {
-      "$ref": "#/$defs/builds_deploy_command",
-      "description": "Command to deploy the Worker."
+      "description": "Command to deploy the Worker.",
+      "type": "string"
     },
     "environment_variables": {
       "$ref": "#/$defs/builds_EnvironmentVariablesRequest",
@@ -42,8 +43,9 @@ export const builds_CreateWorkerBuildSettingsInput: JsonSchema = {
       "description": "Path patterns that can start builds."
     },
     "root_directory": {
-      "$ref": "#/$defs/builds_root_directory",
-      "default": "/"
+      "default": "/",
+      "description": "Repository directory in which build and deploy commands run.",
+      "type": "string"
     }
   },
   "required": [
@@ -65,12 +67,12 @@ export const builds_CreateWorkerGitRepositoryFunfettiInput: JsonSchema = {
       "type": "string"
     },
     "provider_account_id": {
-      "$ref": "#/$defs/builds_provider_account_id",
-      "description": "Provider-specific identifier of the account or namespace that owns the repository."
+      "description": "Provider-specific identifier of the account or namespace that owns the repository.",
+      "type": "string"
     },
     "provider_account_name": {
-      "$ref": "#/$defs/builds_provider_account_name",
-      "description": "Human-readable name of the account or namespace that owns the repository."
+      "description": "Human-readable name of the account or namespace that owns the repository.",
+      "type": "string"
     },
     "provider_type": {
       "enum": [
@@ -80,12 +82,12 @@ export const builds_CreateWorkerGitRepositoryFunfettiInput: JsonSchema = {
       "type": "string"
     },
     "repo_id": {
-      "$ref": "#/$defs/builds_repo_id",
-      "description": "Provider-specific repository identifier."
+      "description": "Provider-specific repository identifier.",
+      "type": "string"
     },
     "repo_name": {
-      "$ref": "#/$defs/builds_repo_name",
-      "description": "Human-readable repository name."
+      "description": "Human-readable repository name.",
+      "type": "string"
     }
   },
   "required": [
@@ -114,12 +116,12 @@ export const builds_CreateWorkerGitRepositoryGrantInput: JsonSchema = {
       "type": "string"
     },
     "provider_account_id": {
-      "$ref": "#/$defs/builds_provider_account_id",
-      "description": "Provider-specific identifier of the account or namespace that owns the repository."
+      "description": "Provider-specific identifier of the account or namespace that owns the repository.",
+      "type": "string"
     },
     "provider_account_name": {
-      "$ref": "#/$defs/builds_provider_account_name",
-      "description": "Human-readable name of the account or namespace that owns the repository."
+      "description": "Human-readable name of the account or namespace that owns the repository.",
+      "type": "string"
     },
     "provider_type": {
       "enum": [
@@ -129,12 +131,12 @@ export const builds_CreateWorkerGitRepositoryGrantInput: JsonSchema = {
       "type": "string"
     },
     "repo_id": {
-      "$ref": "#/$defs/builds_repo_id",
-      "description": "Provider-specific repository identifier."
+      "description": "Provider-specific repository identifier.",
+      "type": "string"
     },
     "repo_name": {
-      "$ref": "#/$defs/builds_repo_name",
-      "description": "Human-readable repository name."
+      "description": "Human-readable repository name.",
+      "type": "string"
     }
   },
   "required": [
@@ -185,8 +187,8 @@ export const builds_CreateWorkerRequest: JsonSchema = {
       "description": "Build and deploy settings when creating a Worker build configuration"
     },
     "script_tag": {
-      "$ref": "#/$defs/builds_external_script_id",
-      "description": "System-generated tag of the Worker. This is not the Worker name."
+      "description": "System-generated tag of the Worker. This is not the Worker name.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/builds/workers/tools.ts b/src/generated/forge-mcp/builds/workers/tools.ts
index fcce2368d..11b652e7e 100644
--- a/src/generated/forge-mcp/builds/workers/tools.ts
+++ b/src/generated/forge-mcp/builds/workers/tools.ts
@@ -1,48 +1,23 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_EnvironmentVariablesResponse_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_SCMProviderType_output,
-  builds_WorkerBuildSettings_output,
-  builds_WorkerGitRepository_output,
-  builds_WorkerResponse_output,
-  builds_build_caching_enabled_output,
-  builds_build_command_output,
-  builds_build_token_uuid_output,
-  builds_created_on_output,
-  builds_deploy_command_output,
-  builds_external_script_id_output,
-  builds_is_secret_output,
-  builds_path_excludes_output,
-  builds_path_includes_output,
-  builds_provider_account_id_output,
-  builds_provider_account_name_output,
-  builds_repo_id_output,
-  builds_repo_name_output,
-  builds_root_directory_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_EnvironmentVariablesResponse,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
+  builds_WorkerBuildSettings,
+  builds_WorkerGitRepository,
+  builds_WorkerResponse,
+  builds_path_excludes,
+  builds_path_includes,
 } from "../../outputs.js";
 import {
   builds_UpdateWorkerBuildSettingsInput,
-  builds_account_id,
-  builds_build_caching_enabled,
-  builds_build_command,
-  builds_build_token_uuid,
-  builds_deploy_command,
-  builds_external_script_id,
-  builds_is_secret,
-  builds_path_excludes,
-  builds_path_includes,
-  builds_provider_account_id,
-  builds_provider_account_name,
-  builds_repo_id,
-  builds_repo_name,
-  builds_root_directory,
+  builds_path_excludes as builds_path_excludes$,
+  builds_path_includes as builds_path_includes$,
 } from "../../schemas.js";
 import { builds_EnvironmentVariablesRequest } from "../schemas.js";
 import {
@@ -61,22 +36,32 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_workers_create",
     title: "Create Worker build configuration",
-    description: "Connect a Worker tag to a repository and production build settings.",
+    description: "Connect a Worker tag to a repository and production build settings.\n\nPOST /accounts/{account_id}/builds/workers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_CreateWorkerRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_CreateWorkerBuildSettingsInput": builds_CreateWorkerBuildSettingsInput,
         "builds_CreateWorkerGitRepositoryFunfettiInput": builds_CreateWorkerGitRepositoryFunfettiInput,
@@ -84,19 +69,8 @@ export const tools: readonly Tool[] = [
         "builds_CreateWorkerGitRepositoryInput": builds_CreateWorkerGitRepositoryInput,
         "builds_CreateWorkerRequest": builds_CreateWorkerRequest,
         "builds_EnvironmentVariablesRequest": builds_EnvironmentVariablesRequest,
-        "builds_account_id": builds_account_id,
-        "builds_build_command": builds_build_command,
-        "builds_build_token_uuid": builds_build_token_uuid,
-        "builds_deploy_command": builds_deploy_command,
-        "builds_external_script_id": builds_external_script_id,
-        "builds_is_secret": builds_is_secret,
-        "builds_path_excludes": builds_path_excludes,
-        "builds_path_includes": builds_path_includes,
-        "builds_provider_account_id": builds_provider_account_id,
-        "builds_provider_account_name": builds_provider_account_name,
-        "builds_repo_id": builds_repo_id,
-        "builds_repo_name": builds_repo_name,
-        "builds_root_directory": builds_root_directory,
+        "builds_path_excludes": builds_path_excludes$,
+        "builds_path_includes": builds_path_includes$,
       },
     },
     outputSchema: {
@@ -114,28 +88,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_WorkerGitRepository": builds_WorkerGitRepository_output,
-        "builds_WorkerResponse": builds_WorkerResponse_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_WorkerGitRepository": builds_WorkerGitRepository,
+        "builds_WorkerResponse": builds_WorkerResponse,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -183,29 +144,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_WorkerGitRepository": builds_WorkerGitRepository_output,
-        "builds_WorkerResponse": builds_WorkerResponse_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_WorkerGitRepository": builds_WorkerGitRepository,
+        "builds_WorkerResponse": builds_WorkerResponse,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -216,27 +164,33 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_workers_delete",
     title: "Delete Worker build configuration",
-    description: "Delete build settings and triggers for a Worker tag and cancel unfinished builds. The Worker is not deleted.\n\nConfirm with the user before calling this tool. This operation deletes the Worker build configuration and its triggers, and cancels unfinished builds. The Worker is not deleted.",
+    description: "Delete build settings and triggers for a Worker tag and cancel unfinished builds. The Worker is not deleted.\n\nConfirm with the user before calling this tool. This operation deletes the Worker build configuration and its triggers, and cancels unfinished builds. The Worker is not deleted.\n\nDELETE /accounts/{account_id}/builds/workers/{script_tag}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_external_script_id": builds_external_script_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -253,9 +207,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     annotations: {
@@ -297,10 +251,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
       },
     },
     request: (args) => ({
@@ -310,27 +264,33 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_workers_get",
     title: "Get Worker build configuration",
-    description: "Retrieve the repository and production build settings associated with a Worker tag.",
+    description: "Retrieve the repository and production build settings associated with a Worker tag.\n\nGET /accounts/{account_id}/builds/workers/{script_tag}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_external_script_id": builds_external_script_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -347,28 +307,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_WorkerGitRepository": builds_WorkerGitRepository_output,
-        "builds_WorkerResponse": builds_WorkerResponse_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_WorkerGitRepository": builds_WorkerGitRepository,
+        "builds_WorkerResponse": builds_WorkerResponse,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -411,29 +358,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_WorkerGitRepository": builds_WorkerGitRepository_output,
-        "builds_WorkerResponse": builds_WorkerResponse_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_WorkerGitRepository": builds_WorkerGitRepository,
+        "builds_WorkerResponse": builds_WorkerResponse,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -443,49 +377,57 @@ export const tools: readonly Tool[] = [
   {
     name: "builds_workers_update",
     title: "Update Worker build configuration",
-    description: "Update the build configuration for a Worker script. Supports partial updates to git repository settings, production build settings, and Preview settings.",
+    description: "Update the build configuration for a Worker script. Supports partial updates to git repository settings, production build settings, and Preview settings.\n\nPATCH /accounts/{account_id}/builds/workers/{script_tag}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_UpdateWorkerRequest"
         },
-        "patch_existing_previews": {
-          "default": "false",
-          "description": "Apply a previews_base_config patch to every existing Preview of the Worker as well as to the base config.",
-          "enum": [
-            "true",
-            "false"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "patch_existing_previews": {
+              "default": "false",
+              "description": "Apply a previews_base_config patch to every existing Preview of the Worker as well as to the base config.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_UpdateWorkerBuildSettingsInput": builds_UpdateWorkerBuildSettingsInput,
         "builds_UpdateWorkerRequest": builds_UpdateWorkerRequest,
-        "builds_account_id": builds_account_id,
-        "builds_build_caching_enabled": builds_build_caching_enabled,
-        "builds_build_command": builds_build_command,
-        "builds_build_token_uuid": builds_build_token_uuid,
-        "builds_deploy_command": builds_deploy_command,
-        "builds_external_script_id": builds_external_script_id,
-        "builds_is_secret": builds_is_secret,
-        "builds_path_excludes": builds_path_excludes,
-        "builds_path_includes": builds_path_includes,
-        "builds_root_directory": builds_root_directory,
+        "builds_path_excludes": builds_path_excludes$,
+        "builds_path_includes": builds_path_includes$,
       },
     },
     outputSchema: {
@@ -503,28 +445,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_WorkerGitRepository": builds_WorkerGitRepository_output,
-        "builds_WorkerResponse": builds_WorkerResponse_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_WorkerGitRepository": builds_WorkerGitRepository,
+        "builds_WorkerResponse": builds_WorkerResponse,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -569,35 +498,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_WorkerGitRepository": builds_WorkerGitRepository_output,
-        "builds_WorkerResponse": builds_WorkerResponse_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_WorkerGitRepository": builds_WorkerGitRepository,
+        "builds_WorkerResponse": builds_WorkerResponse,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/builds/workers/${pathParam(args, "script_tag")}`,
       query: [
-        ["patch_existing_previews", args["patch_existing_previews"], true],
+        ["patch_existing_previews", param(args, "query", "patch_existing_previews"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/cache/originCloudRegions/bulk/outputs.ts b/src/generated/forge-mcp/cache/originCloudRegions/bulk/outputs.ts
index f8f94e479..2f68a7fbc 100644
--- a/src/generated/forge-mcp/cache/originCloudRegions/bulk/outputs.ts
+++ b/src/generated/forge-mcp/cache/originCloudRegions/bulk/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `cache-settings_origin_cloud_region_v2_batch_item_result` in
  * responses.
  */
-export const cache_settings_origin_cloud_region_v2_batch_item_result_output: JsonSchema = {
+export const cache$$settings_origin_cloud_region_v2_batch_item_result: JsonSchema = {
   "properties": {
     "error": {
       "type": "string"
@@ -32,7 +32,7 @@ export const cache_settings_origin_cloud_region_v2_batch_item_result_output: Jso
  * The schema of `cache-settings_origin_cloud_region_v2_batch_result` in
  * responses.
  */
-export const cache_settings_origin_cloud_region_v2_batch_result_output: JsonSchema = {
+export const cache$$settings_origin_cloud_region_v2_batch_result: JsonSchema = {
   "properties": {
     "failed": {
       "items": {
diff --git a/src/generated/forge-mcp/cache/originCloudRegions/bulk/tools.ts b/src/generated/forge-mcp/cache/originCloudRegions/bulk/tools.ts
index 5904e36f9..c34575972 100644
--- a/src/generated/forge-mcp/cache/originCloudRegions/bulk/tools.ts
+++ b/src/generated/forge-mcp/cache/originCloudRegions/bulk/tools.ts
@@ -3,25 +3,24 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_messages_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_messages,
 } from "../../../outputs.js";
-import { cache_settings_identifier } from "../../../schemas.js";
-import { cache_settings_origin_cloud_region_v2_request } from "../schemas.js";
+import { cache$$settings_origin_cloud_region_v2_request } from "../schemas.js";
 import {
-  cache_settings_origin_cloud_region_v2_batch_item_result_output,
-  cache_settings_origin_cloud_region_v2_batch_result_output,
+  cache$$settings_origin_cloud_region_v2_batch_item_result,
+  cache$$settings_origin_cloud_region_v2_batch_result,
 } from "./outputs.js";
 
 /**
- * The tools of `cache.origin_cloud_regions.bulk`.
+ * The tools of `cache.originCloudRegions.bulk`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cache_origin_cloud_regions_bulk_delete",
+    name: "cache_originCloudRegions_bulk_delete",
     title: "Batch delete origin cloud region mappings",
-    description: "Removes up to 100 IP-to-cloud-region mappings in a single request. Each IP is validated independently — successfully deleted items are returned in the `succeeded` array and IPs that could not be found or are invalid are returned in the `failed` array.\n\nConfirm with the user before calling this tool. Are you sure you want to delete these Origin Cloud Region configurations?",
+    description: "Removes up to 100 IP-to-cloud-region mappings in a single request. Each IP is validated independently — successfully deleted items are returned in the `succeeded` array and IPs that could not be found or are invalid are returned in the `failed` array.\n\nConfirm with the user before calling this tool. Are you sure you want to delete these Origin Cloud Region configurations?\n\nDELETE /zones/{zone_id}/origin/cloud_regions/batch",
     inputSchema: {
       type: "object",
       properties: {
@@ -32,18 +31,25 @@ export const tools: readonly Tool[] = [
           "maxItems": 100,
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -60,10 +66,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_batch_item_result": cache_settings_origin_cloud_region_v2_batch_item_result_output,
-        "cache-settings_origin_cloud_region_v2_batch_result": cache_settings_origin_cloud_region_v2_batch_result_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_batch_item_result": cache$$settings_origin_cloud_region_v2_batch_item_result,
+        "cache-settings_origin_cloud_region_v2_batch_result": cache$$settings_origin_cloud_region_v2_batch_result,
       },
     },
     annotations: {
@@ -105,11 +111,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_batch_item_result": cache_settings_origin_cloud_region_v2_batch_item_result_output,
-        "cache-settings_origin_cloud_region_v2_batch_result": cache_settings_origin_cloud_region_v2_batch_result_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_batch_item_result": cache$$settings_origin_cloud_region_v2_batch_item_result,
+        "cache-settings_origin_cloud_region_v2_batch_result": cache$$settings_origin_cloud_region_v2_batch_result,
       },
     },
     request: (args) => ({
@@ -118,9 +124,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_origin_cloud_regions_bulk_update",
+    name: "cache_originCloudRegions_bulk_update",
     title: "Batch create or replace origin cloud region mappings",
-    description: "Upserts up to 100 IP-to-cloud-region mappings in a single request. Items in the request body are created or replaced; mappings not included in the request body are preserved unchanged (this is a merge operation, not a full collection replacement). Each item is validated independently — valid items are applied and invalid items are returned in the `failed` array. The vendor and region for every item are validated against the list from `GET /zones/{zone_id}/origin/cloud_regions/supported_regions`.",
+    description: "Upserts up to 100 IP-to-cloud-region mappings in a single request. Items in the request body are created or replaced; mappings not included in the request body are preserved unchanged (this is a merge operation, not a full collection replacement). Each item is validated independently — valid items are applied and invalid items are returned in the `failed` array. The vendor and region for every item are validated against the list from `GET /zones/{zone_id}/origin/cloud_regions/supported_regions`.\n\nPUT /zones/{zone_id}/origin/cloud_regions/batch",
     inputSchema: {
       type: "object",
       properties: {
@@ -131,18 +137,27 @@ export const tools: readonly Tool[] = [
           "maxItems": 100,
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_origin_cloud_region_v2_request": cache_settings_origin_cloud_region_v2_request,
+        "cache-settings_origin_cloud_region_v2_request": cache$$settings_origin_cloud_region_v2_request,
       },
     },
     outputSchema: {
@@ -160,10 +175,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_batch_item_result": cache_settings_origin_cloud_region_v2_batch_item_result_output,
-        "cache-settings_origin_cloud_region_v2_batch_result": cache_settings_origin_cloud_region_v2_batch_result_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_batch_item_result": cache$$settings_origin_cloud_region_v2_batch_item_result,
+        "cache-settings_origin_cloud_region_v2_batch_result": cache$$settings_origin_cloud_region_v2_batch_result,
       },
     },
     annotations: {
@@ -205,11 +220,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_batch_item_result": cache_settings_origin_cloud_region_v2_batch_item_result_output,
-        "cache-settings_origin_cloud_region_v2_batch_result": cache_settings_origin_cloud_region_v2_batch_result_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_batch_item_result": cache$$settings_origin_cloud_region_v2_batch_item_result,
+        "cache-settings_origin_cloud_region_v2_batch_result": cache$$settings_origin_cloud_region_v2_batch_result,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cache/originCloudRegions/outputs.ts b/src/generated/forge-mcp/cache/originCloudRegions/outputs.ts
index b0a20d2a3..1bba1cac5 100644
--- a/src/generated/forge-mcp/cache/originCloudRegions/outputs.ts
+++ b/src/generated/forge-mcp/cache/originCloudRegions/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `cache-settings_origin_cloud_region_v2_delete_result` in
  * responses.
  */
-export const cache_settings_origin_cloud_region_v2_delete_result_output: JsonSchema = {
+export const cache$$settings_origin_cloud_region_v2_delete_result: JsonSchema = {
   "properties": {
     "origin_ip": {
       "type": "string"
@@ -22,7 +22,7 @@ export const cache_settings_origin_cloud_region_v2_delete_result_output: JsonSch
 /**
  * The schema of `cache-settings_origin_cloud_region_v2_entry` in responses.
  */
-export const cache_settings_origin_cloud_region_v2_entry_output: JsonSchema = {
+export const cache$$settings_origin_cloud_region_v2_entry: JsonSchema = {
   "properties": {
     "modified_on": {
       "format": "date-time",
@@ -56,7 +56,7 @@ export const cache_settings_origin_cloud_region_v2_entry_output: JsonSchema = {
  * The schema of `cache-settings_origin_cloud_region_v2_result_info` in
  * responses.
  */
-export const cache_settings_origin_cloud_region_v2_result_info_output: JsonSchema = {
+export const cache$$settings_origin_cloud_region_v2_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/cache/originCloudRegions/regions/outputs.ts b/src/generated/forge-mcp/cache/originCloudRegions/regions/outputs.ts
index 1932e6a9d..775c7cdd6 100644
--- a/src/generated/forge-mcp/cache/originCloudRegions/regions/outputs.ts
+++ b/src/generated/forge-mcp/cache/originCloudRegions/regions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cache-settings_supported_cloud_region` in responses.
  */
-export const cache_settings_supported_cloud_region_output: JsonSchema = {
+export const cache$$settings_supported_cloud_region: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -28,7 +28,7 @@ export const cache_settings_supported_cloud_region_output: JsonSchema = {
 /**
  * The schema of `cache-settings_supported_cloud_regions_result` in responses.
  */
-export const cache_settings_supported_cloud_regions_result_output: JsonSchema = {
+export const cache$$settings_supported_cloud_regions_result: JsonSchema = {
   "properties": {
     "obtained_codes": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/cache/originCloudRegions/regions/tools.ts b/src/generated/forge-mcp/cache/originCloudRegions/regions/tools.ts
index 27dcbe066..ec6fa898e 100644
--- a/src/generated/forge-mcp/cache/originCloudRegions/regions/tools.ts
+++ b/src/generated/forge-mcp/cache/originCloudRegions/regions/tools.ts
@@ -3,38 +3,44 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_messages_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_messages,
 } from "../../../outputs.js";
-import { cache_settings_identifier } from "../../../schemas.js";
 import {
-  cache_settings_supported_cloud_region_output,
-  cache_settings_supported_cloud_regions_result_output,
+  cache$$settings_supported_cloud_region,
+  cache$$settings_supported_cloud_regions_result,
 } from "./outputs.js";
 
 /**
- * The tools of `cache.origin_cloud_regions.regions`.
+ * The tools of `cache.originCloudRegions.regions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cache_origin_cloud_regions_regions_list_supported",
+    name: "cache_originCloudRegions_regions_listSupported",
     title: "List supported cloud vendors and regions",
-    description: "Returns the cloud vendors and regions that are valid values for origin cloud region mappings. Each region includes the Tiered Cache upper-tier colocation codes that will be used for cache routing when a mapping targeting that region is active. Requires the zone to have Tiered Cache enabled.",
+    description: "Returns the cloud vendors and regions that are valid values for origin cloud region mappings. Each region includes the Tiered Cache upper-tier colocation codes that will be used for cache routing when a mapping targeting that region is active. Requires the zone to have Tiered Cache enabled.\n\nGET /zones/{zone_id}/origin/cloud_regions/supported_regions",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -51,10 +57,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_supported_cloud_region": cache_settings_supported_cloud_region_output,
-        "cache-settings_supported_cloud_regions_result": cache_settings_supported_cloud_regions_result_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_supported_cloud_region": cache$$settings_supported_cloud_region,
+        "cache-settings_supported_cloud_regions_result": cache$$settings_supported_cloud_regions_result,
       },
     },
     annotations: {
@@ -96,11 +102,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_supported_cloud_region": cache_settings_supported_cloud_region_output,
-        "cache-settings_supported_cloud_regions_result": cache_settings_supported_cloud_regions_result_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_supported_cloud_region": cache$$settings_supported_cloud_region,
+        "cache-settings_supported_cloud_regions_result": cache$$settings_supported_cloud_regions_result,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cache/originCloudRegions/schemas.ts b/src/generated/forge-mcp/cache/originCloudRegions/schemas.ts
index 8e5823339..4cbf9c75d 100644
--- a/src/generated/forge-mcp/cache/originCloudRegions/schemas.ts
+++ b/src/generated/forge-mcp/cache/originCloudRegions/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_origin_cloud_region_v2_request`.
  */
-export const cache_settings_origin_cloud_region_v2_request: JsonSchema = {
+export const cache$$settings_origin_cloud_region_v2_request: JsonSchema = {
   "description": "Request body for creating or replacing an origin cloud region mapping.",
   "properties": {
     "origin_ip": {
diff --git a/src/generated/forge-mcp/cache/originCloudRegions/tools.ts b/src/generated/forge-mcp/cache/originCloudRegions/tools.ts
index 74f65b8b4..71ea6a381 100644
--- a/src/generated/forge-mcp/cache/originCloudRegions/tools.ts
+++ b/src/generated/forge-mcp/cache/originCloudRegions/tools.ts
@@ -1,47 +1,53 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_messages_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_messages,
 } from "../../outputs.js";
-import { cache_settings_identifier } from "../../schemas.js";
 import {
-  cache_settings_origin_cloud_region_v2_delete_result_output,
-  cache_settings_origin_cloud_region_v2_entry_output,
-  cache_settings_origin_cloud_region_v2_result_info_output,
+  cache$$settings_origin_cloud_region_v2_delete_result,
+  cache$$settings_origin_cloud_region_v2_entry,
+  cache$$settings_origin_cloud_region_v2_result_info,
 } from "./outputs.js";
-import { cache_settings_origin_cloud_region_v2_request } from "./schemas.js";
+import { cache$$settings_origin_cloud_region_v2_request } from "./schemas.js";
 
 /**
- * The tools of `cache.origin_cloud_regions`.
+ * The tools of `cache.originCloudRegions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cache_origin_cloud_regions_delete",
+    name: "cache_originCloudRegions_delete",
     title: "Delete an origin cloud region mapping",
-    description: "Removes the cloud region mapping for a single origin IP address. The IP path parameter is normalized before lookup. Returns the deleted IP on success. Returns 404 if no mapping exists for the specified IP. When the last mapping for the zone is removed the underlying rule record is also deleted.\n\nConfirm with the user before calling this tool. Are you sure you want to delete this Origin Cloud Region configuration?",
+    description: "Removes the cloud region mapping for a single origin IP address. The IP path parameter is normalized before lookup. Returns the deleted IP on success. Returns 404 if no mapping exists for the specified IP. When the last mapping for the zone is removed the underlying rule record is also deleted.\n\nConfirm with the user before calling this tool. Are you sure you want to delete this Origin Cloud Region configuration?\n\nDELETE /zones/{zone_id}/origin/cloud_regions/{origin_ip}",
     inputSchema: {
       type: "object",
       properties: {
-        "origin_ip": {
-          "description": "Origin IP address whose mapping should be deleted.",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "origin_ip": {
+              "description": "Origin IP address whose mapping should be deleted.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "origin_ip"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "origin_ip"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -58,9 +64,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_delete_result": cache_settings_origin_cloud_region_v2_delete_result_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_delete_result": cache$$settings_origin_cloud_region_v2_delete_result,
       },
     },
     annotations: {
@@ -102,10 +108,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_delete_result": cache_settings_origin_cloud_region_v2_delete_result_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_delete_result": cache$$settings_origin_cloud_region_v2_delete_result,
       },
     },
     request: (args) => ({
@@ -113,28 +119,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_origin_cloud_regions_get",
+    name: "cache_originCloudRegions_get",
     title: "Get an origin cloud region mapping",
-    description: "Returns the cloud region mapping for a single origin IP address. The IP path parameter is normalized before lookup (RFC 5952 for IPv6). Returns 404 if the zone has no mappings or if the specified IP has no mapping.",
+    description: "Returns the cloud region mapping for a single origin IP address. The IP path parameter is normalized before lookup (RFC 5952 for IPv6). Returns 404 if the zone has no mappings or if the specified IP has no mapping.\n\nGET /zones/{zone_id}/origin/cloud_regions/{origin_ip}",
     inputSchema: {
       type: "object",
       properties: {
-        "origin_ip": {
-          "description": "Origin IP address to look up. IPv4 and IPv6 are supported.",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "origin_ip": {
+              "description": "Origin IP address to look up. IPv4 and IPv6 are supported.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "origin_ip"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "origin_ip"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -151,9 +164,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_entry": cache_settings_origin_cloud_region_v2_entry_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_entry": cache$$settings_origin_cloud_region_v2_entry,
       },
     },
     annotations: {
@@ -195,10 +208,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_entry": cache_settings_origin_cloud_region_v2_entry_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_entry": cache$$settings_origin_cloud_region_v2_entry,
       },
     },
     request: (args) => ({
@@ -206,33 +219,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_origin_cloud_regions_list",
+    name: "cache_originCloudRegions_list",
     title: "List origin cloud region mappings",
-    description: "Returns all IP-to-cloud-region mappings configured for the zone with pagination support. Each mapping tells Cloudflare which cloud vendor and region hosts the origin at that IP, enabling the edge to route via the nearest Tiered Cache upper-tier co-located with that cloud provider. Returns an empty array when no mappings exist.",
+    description: "Returns all IP-to-cloud-region mappings configured for the zone with pagination support. Each mapping tells Cloudflare which cloud vendor and region hosts the origin at that IP, enabling the edge to route via the nearest Tiered Cache upper-tier co-located with that cloud provider. Returns an empty array when no mappings exist.\n\nGET /zones/{zone_id}/origin/cloud_regions",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -259,10 +285,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_entry": cache_settings_origin_cloud_region_v2_entry_output,
-        "cache-settings_origin_cloud_region_v2_result_info": cache_settings_origin_cloud_region_v2_result_info_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_entry": cache$$settings_origin_cloud_region_v2_entry,
+        "cache-settings_origin_cloud_region_v2_result_info": cache$$settings_origin_cloud_region_v2_result_info,
       },
     },
     annotations: {
@@ -314,48 +340,57 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_entry": cache_settings_origin_cloud_region_v2_entry_output,
-        "cache-settings_origin_cloud_region_v2_result_info": cache_settings_origin_cloud_region_v2_result_info_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_entry": cache$$settings_origin_cloud_region_v2_entry,
+        "cache-settings_origin_cloud_region_v2_result_info": cache$$settings_origin_cloud_region_v2_result_info,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/origin/cloud_regions`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "cache_origin_cloud_regions_update",
+    name: "cache_originCloudRegions_update",
     title: "Create or replace an origin cloud region mapping",
-    description: "Creates a new IP-to-cloud-region mapping or replaces the existing mapping for the specified IP. PUT is idempotent — calling it repeatedly with the same body produces the same result. The IP path parameter is normalized to canonical form (RFC 5952 for IPv6) before storage. The vendor and region are validated against the list from `GET /zones/{zone_id}/origin/cloud_regions/supported_regions`. Returns 400 if the `origin_ip` in the body does not match the URL path parameter. Returns 403 (code 1164) when the zone has reached the limit of 3,500 IP mappings.",
+    description: "Creates a new IP-to-cloud-region mapping or replaces the existing mapping for the specified IP. PUT is idempotent — calling it repeatedly with the same body produces the same result. The IP path parameter is normalized to canonical form (RFC 5952 for IPv6) before storage. The vendor and region are validated against the list from `GET /zones/{zone_id}/origin/cloud_regions/supported_regions`. Returns 400 if the `origin_ip` in the body does not match the URL path parameter. Returns 403 (code 1164) when the zone has reached the limit of 3,500 IP mappings.\n\nPUT /zones/{zone_id}/origin/cloud_regions/{origin_ip}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/cache-settings_origin_cloud_region_v2_request"
         },
-        "origin_ip": {
-          "description": "Origin IP address to create or replace.",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "origin_ip": {
+              "description": "Origin IP address to create or replace.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "origin_ip"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "origin_ip",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_origin_cloud_region_v2_request": cache_settings_origin_cloud_region_v2_request,
+        "cache-settings_origin_cloud_region_v2_request": cache$$settings_origin_cloud_region_v2_request,
       },
     },
     outputSchema: {
@@ -373,9 +408,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_entry": cache_settings_origin_cloud_region_v2_entry_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_entry": cache$$settings_origin_cloud_region_v2_entry,
       },
     },
     annotations: {
@@ -417,10 +452,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_cloud_region_v2_entry": cache_settings_origin_cloud_region_v2_entry_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_cloud_region_v2_entry": cache$$settings_origin_cloud_region_v2_entry,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cache/outputs.ts b/src/generated/forge-mcp/cache/outputs.ts
index d4e90b155..2884569c7 100644
--- a/src/generated/forge-mcp/cache/outputs.ts
+++ b/src/generated/forge-mcp/cache/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `cache-purge_api-response-common-failure` in responses.
  */
-export const cache_purge_api_response_common_failure_output: JsonSchema = {
+export const cache$$purge_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cache-purge_messages"
@@ -40,7 +40,7 @@ export const cache_purge_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `cache-purge_api-response-single-id` in responses.
  */
-export const cache_purge_api_response_single_id_output: JsonSchema = {
+export const cache$$purge_api$$response$$single$$id: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cache-purge_messages"
@@ -53,7 +53,7 @@ export const cache_purge_api_response_single_id_output: JsonSchema = {
         {
           "properties": {
             "id": {
-              "$ref": "#/$defs/cache-purge_identifier"
+              "type": "string"
             }
           },
           "required": [
@@ -78,17 +78,10 @@ export const cache_purge_api_response_single_id_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cache-purge_identifier` in responses.
- */
-export const cache_purge_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `cache-purge_messages` in responses.
  */
-export const cache_purge_messages_output: JsonSchema = {
+export const cache$$purge_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/cache/schemas.ts b/src/generated/forge-mcp/cache/schemas.ts
index 2998f78ae..f1743e585 100644
--- a/src/generated/forge-mcp/cache/schemas.ts
+++ b/src/generated/forge-mcp/cache/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `cache-purge_Everything`.
  */
-export const cache_purge_Everything: JsonSchema = {
+export const cache$$purge_Everything: JsonSchema = {
   "description": "Purge everything",
   "properties": {
     "purge_everything": {
@@ -20,7 +20,7 @@ export const cache_purge_Everything: JsonSchema = {
 /**
  * The schema of `cache-purge_FlexPurgeByHostnames`.
  */
-export const cache_purge_FlexPurgeByHostnames: JsonSchema = {
+export const cache$$purge_FlexPurgeByHostnames: JsonSchema = {
   "description": "Purge by hostnames",
   "properties": {
     "hosts": {
@@ -37,7 +37,7 @@ export const cache_purge_FlexPurgeByHostnames: JsonSchema = {
 /**
  * The schema of `cache-purge_FlexPurgeByPrefixes`.
  */
-export const cache_purge_FlexPurgeByPrefixes: JsonSchema = {
+export const cache$$purge_FlexPurgeByPrefixes: JsonSchema = {
   "description": "Purge by prefixes",
   "properties": {
     "prefixes": {
@@ -54,7 +54,7 @@ export const cache_purge_FlexPurgeByPrefixes: JsonSchema = {
 /**
  * The schema of `cache-purge_FlexPurgeByTags`.
  */
-export const cache_purge_FlexPurgeByTags: JsonSchema = {
+export const cache$$purge_FlexPurgeByTags: JsonSchema = {
   "description": "Purge by tags",
   "properties": {
     "tags": {
@@ -71,7 +71,7 @@ export const cache_purge_FlexPurgeByTags: JsonSchema = {
 /**
  * The schema of `cache-purge_SingleFile`.
  */
-export const cache_purge_SingleFile: JsonSchema = {
+export const cache$$purge_SingleFile: JsonSchema = {
   "description": "Purge files",
   "properties": {
     "files": {
@@ -88,11 +88,11 @@ export const cache_purge_SingleFile: JsonSchema = {
 /**
  * The schema of `cache-purge_SingleFileWithUrlAndHeaders`.
  */
-export const cache_purge_SingleFileWithUrlAndHeaders: JsonSchema = {
+export const cache$$purge_SingleFileWithUrlAndHeaders: JsonSchema = {
   "description": "Purge files with URL and headers",
   "properties": {
     "files": {
-      "description": "URLs with the request headers your cache key uses. Use this form when your cache key includes request headers, or the visitor's device type, country, or language: send the header values each URL was cached with, such as `CF-Device-Type`, `CF-IPCountry`, or `Accept-Language`.\n\nWhen you send the `Origin` header, include the scheme and hostname. Include the port unless it is the default for the scheme: 80 for `http`, 443 for `https`.\n\nSee [Purge by single-file](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-single-file/).\n",
+      "description": "URLs with the request headers your cache key uses. Use this form when your cache key includes request headers, or the visitor's device type, country, or language: send the header values each URL was cached with, such as `CF-Device-Type`, `CF-IPCountry`, or `Accept-Language`.\n\nWhen you send the `Origin` header, include the scheme and hostname. Include the port unless it is the default for the scheme: 80 for `http`, 443 for `https`.\n\nSee [Purge by single-file](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-single-file/).",
       "items": {
         "properties": {
           "headers": {
@@ -114,10 +114,3 @@ export const cache_purge_SingleFileWithUrlAndHeaders: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `cache-purge_identifier`.
- */
-export const cache_purge_identifier: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/cache/settings/regionalTieredCache/outputs.ts b/src/generated/forge-mcp/cache/settings/regionalTieredCache/outputs.ts
index fa81ad726..e0d8a5711 100644
--- a/src/generated/forge-mcp/cache/settings/regionalTieredCache/outputs.ts
+++ b/src/generated/forge-mcp/cache/settings/regionalTieredCache/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cache-settings_regional_tiered_cache` in responses.
  */
-export const cache_settings_regional_tiered_cache_output: JsonSchema = {
+export const cache$$settings_regional_tiered_cache: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -29,7 +29,7 @@ export const cache_settings_regional_tiered_cache_output: JsonSchema = {
  * The schema of `cache-settings_regional_tiered_cache_response_value` in
  * responses.
  */
-export const cache_settings_regional_tiered_cache_response_value_output: JsonSchema = {
+export const cache$$settings_regional_tiered_cache_response_value: JsonSchema = {
   "properties": {
     "result": {
       "allOf": [
@@ -39,7 +39,11 @@ export const cache_settings_regional_tiered_cache_response_value_output: JsonSch
         {
           "properties": {
             "value": {
-              "$ref": "#/$defs/cache-settings_regional_tiered_cache_value"
+              "enum": [
+                "on",
+                "off"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -52,14 +56,3 @@ export const cache_settings_regional_tiered_cache_response_value_output: JsonSch
   },
   "type": "object"
 };
-
-/**
- * The schema of `cache-settings_regional_tiered_cache_value` in responses.
- */
-export const cache_settings_regional_tiered_cache_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/cache/settings/regionalTieredCache/schemas.ts b/src/generated/forge-mcp/cache/settings/regionalTieredCache/schemas.ts
deleted file mode 100644
index 6e4cb71c2..000000000
--- a/src/generated/forge-mcp/cache/settings/regionalTieredCache/schemas.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `cache-settings_regional_tiered_cache_value`.
- */
-export const cache_settings_regional_tiered_cache_value: JsonSchema = {
-  "description": "Value of the Regional Tiered Cache zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/cache/settings/regionalTieredCache/tools.ts b/src/generated/forge-mcp/cache/settings/regionalTieredCache/tools.ts
index 09b515e4a..734b25c13 100644
--- a/src/generated/forge-mcp/cache/settings/regionalTieredCache/tools.ts
+++ b/src/generated/forge-mcp/cache/settings/regionalTieredCache/tools.ts
@@ -3,42 +3,39 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_editable_output,
-  cache_settings_messages_output,
-  cache_settings_modified_on_output,
-  cache_settings_result_object_output,
-  cache_settings_setting_id_output,
-  cache_settings_setting_value_output,
-  cache_settings_zone_cache_settings_response_single_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
+  cache$$settings_result$$object,
+  cache$$settings_zone_cache_settings_response_single,
 } from "../../../outputs.js";
-import { cache_settings_identifier } from "../../../schemas.js";
 import {
-  cache_settings_regional_tiered_cache_output,
-  cache_settings_regional_tiered_cache_response_value_output,
-  cache_settings_regional_tiered_cache_value_output,
+  cache$$settings_regional_tiered_cache,
+  cache$$settings_regional_tiered_cache_response_value,
 } from "./outputs.js";
-import { cache_settings_regional_tiered_cache_value } from "./schemas.js";
 
 /**
- * The tools of `cache.settings.regional_tiered_cache`.
+ * The tools of `cache.settings.regionalTieredCache`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cache_settings_regional_tiered_cache_edit",
+    name: "cache_settings_regionalTieredCache_edit",
     title: "Change Regional Tiered Cache setting",
-    description: "Instructs Cloudflare to check a regional hub data center on the way to your upper tier. This can help improve performance for smart and custom tiered cache topologies.",
+    description: "Instructs Cloudflare to check a regional hub data center on the way to your upper tier. This can help improve performance for smart and custom tiered cache topologies.\n\nPATCH /zones/{zone_id}/cache/regional_tiered_cache",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/cache-settings_regional_tiered_cache_value",
               "default": "off",
-              "description": "Value of the Regional Tiered Cache zone setting."
+              "description": "Value of the Regional Tiered Cache zone setting.",
+              "enum": [
+                "on",
+                "off"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -46,19 +43,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_regional_tiered_cache_value": cache_settings_regional_tiered_cache_value,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -70,18 +73,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_regional_tiered_cache": cache_settings_regional_tiered_cache_output,
-        "cache-settings_regional_tiered_cache_response_value": cache_settings_regional_tiered_cache_response_value_output,
-        "cache-settings_regional_tiered_cache_value": cache_settings_regional_tiered_cache_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_regional_tiered_cache": cache$$settings_regional_tiered_cache,
+        "cache-settings_regional_tiered_cache_response_value": cache$$settings_regional_tiered_cache_response_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -127,19 +125,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_regional_tiered_cache": cache_settings_regional_tiered_cache_output,
-        "cache-settings_regional_tiered_cache_response_value": cache_settings_regional_tiered_cache_response_value_output,
-        "cache-settings_regional_tiered_cache_value": cache_settings_regional_tiered_cache_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_regional_tiered_cache": cache$$settings_regional_tiered_cache,
+        "cache-settings_regional_tiered_cache_response_value": cache$$settings_regional_tiered_cache_response_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -148,23 +141,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_settings_regional_tiered_cache_get",
+    name: "cache_settings_regionalTieredCache_get",
     title: "Get Regional Tiered Cache setting",
-    description: "Instructs Cloudflare to check a regional hub data center on the way to your upper tier. This can help improve performance for smart and custom tiered cache topologies.",
+    description: "Instructs Cloudflare to check a regional hub data center on the way to your upper tier. This can help improve performance for smart and custom tiered cache topologies.\n\nGET /zones/{zone_id}/cache/regional_tiered_cache",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -176,18 +176,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_regional_tiered_cache": cache_settings_regional_tiered_cache_output,
-        "cache-settings_regional_tiered_cache_response_value": cache_settings_regional_tiered_cache_response_value_output,
-        "cache-settings_regional_tiered_cache_value": cache_settings_regional_tiered_cache_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_regional_tiered_cache": cache$$settings_regional_tiered_cache,
+        "cache-settings_regional_tiered_cache_response_value": cache$$settings_regional_tiered_cache_response_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -235,19 +230,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_regional_tiered_cache": cache_settings_regional_tiered_cache_output,
-        "cache-settings_regional_tiered_cache_response_value": cache_settings_regional_tiered_cache_response_value_output,
-        "cache-settings_regional_tiered_cache_value": cache_settings_regional_tiered_cache_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_regional_tiered_cache": cache$$settings_regional_tiered_cache,
+        "cache-settings_regional_tiered_cache_response_value": cache$$settings_regional_tiered_cache_response_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cache/settings/reserve/outputs.ts b/src/generated/forge-mcp/cache/settings/reserve/outputs.ts
index 6dece1841..fe7f85bf1 100644
--- a/src/generated/forge-mcp/cache/settings/reserve/outputs.ts
+++ b/src/generated/forge-mcp/cache/settings/reserve/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cache-settings_cache_reserve` in responses.
  */
-export const cache_settings_cache_reserve_output: JsonSchema = {
+export const cache$$settings_cache_reserve: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -28,7 +28,7 @@ export const cache_settings_cache_reserve_output: JsonSchema = {
 /**
  * The schema of `cache-settings_cache_reserve_clear` in responses.
  */
-export const cache_settings_cache_reserve_clear_output: JsonSchema = {
+export const cache$$settings_cache_reserve_clear: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -47,19 +47,11 @@ export const cache_settings_cache_reserve_clear_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `cache-settings_cache_reserve_clear_end_ts` in responses.
- */
-export const cache_settings_cache_reserve_clear_end_ts_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `cache-settings_cache_reserve_clear_response_value` in
  * responses.
  */
-export const cache_settings_cache_reserve_clear_response_value_output: JsonSchema = {
+export const cache$$settings_cache_reserve_clear_response_value: JsonSchema = {
   "properties": {
     "result": {
       "allOf": [
@@ -69,13 +61,19 @@ export const cache_settings_cache_reserve_clear_response_value_output: JsonSchem
         {
           "properties": {
             "end_ts": {
-              "$ref": "#/$defs/cache-settings_cache_reserve_clear_end_ts"
+              "format": "date-time",
+              "type": "string"
             },
             "start_ts": {
-              "$ref": "#/$defs/cache-settings_cache_reserve_clear_start_ts"
+              "format": "date-time",
+              "type": "string"
             },
             "state": {
-              "$ref": "#/$defs/cache-settings_cache_reserve_clear_state"
+              "enum": [
+                "In-progress",
+                "Completed"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -90,29 +88,10 @@ export const cache_settings_cache_reserve_clear_response_value_output: JsonSchem
   "type": "object"
 };
 
-/**
- * The schema of `cache-settings_cache_reserve_clear_start_ts` in responses.
- */
-export const cache_settings_cache_reserve_clear_start_ts_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `cache-settings_cache_reserve_clear_state` in responses.
- */
-export const cache_settings_cache_reserve_clear_state_output: JsonSchema = {
-  "enum": [
-    "In-progress",
-    "Completed"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cache-settings_cache_reserve_response_value` in responses.
  */
-export const cache_settings_cache_reserve_response_value_output: JsonSchema = {
+export const cache$$settings_cache_reserve_response_value: JsonSchema = {
   "properties": {
     "result": {
       "allOf": [
@@ -122,7 +101,11 @@ export const cache_settings_cache_reserve_response_value_output: JsonSchema = {
         {
           "properties": {
             "value": {
-              "$ref": "#/$defs/cache-settings_cache_reserve_value"
+              "enum": [
+                "on",
+                "off"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -135,14 +118,3 @@ export const cache_settings_cache_reserve_response_value_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `cache-settings_cache_reserve_value` in responses.
- */
-export const cache_settings_cache_reserve_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/cache/settings/reserve/schemas.ts b/src/generated/forge-mcp/cache/settings/reserve/schemas.ts
deleted file mode 100644
index a8de76650..000000000
--- a/src/generated/forge-mcp/cache/settings/reserve/schemas.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `cache-settings_cache_reserve_value`.
- */
-export const cache_settings_cache_reserve_value: JsonSchema = {
-  "description": "Value of the Cache Reserve zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/cache/settings/reserve/tools.ts b/src/generated/forge-mcp/cache/settings/reserve/tools.ts
index 1d6d1a4ae..c92466e67 100644
--- a/src/generated/forge-mcp/cache/settings/reserve/tools.ts
+++ b/src/generated/forge-mcp/cache/settings/reserve/tools.ts
@@ -3,29 +3,19 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_editable_output,
-  cache_settings_messages_output,
-  cache_settings_modified_on_output,
-  cache_settings_result_object_output,
-  cache_settings_setting_id_output,
-  cache_settings_setting_value_output,
-  cache_settings_zone_cache_settings_response_single_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
+  cache$$settings_result$$object,
+  cache$$settings_zone_cache_settings_response_single,
 } from "../../../outputs.js";
-import { cache_settings_identifier } from "../../../schemas.js";
 import {
-  cache_settings_cache_reserve_clear_end_ts_output,
-  cache_settings_cache_reserve_clear_output,
-  cache_settings_cache_reserve_clear_response_value_output,
-  cache_settings_cache_reserve_clear_start_ts_output,
-  cache_settings_cache_reserve_clear_state_output,
-  cache_settings_cache_reserve_output,
-  cache_settings_cache_reserve_response_value_output,
-  cache_settings_cache_reserve_value_output,
+  cache$$settings_cache_reserve,
+  cache$$settings_cache_reserve_clear,
+  cache$$settings_cache_reserve_clear_response_value,
+  cache$$settings_cache_reserve_response_value,
 } from "./outputs.js";
-import { cache_settings_cache_reserve_value } from "./schemas.js";
 
 /**
  * The tools of `cache.settings.reserve`.
@@ -34,21 +24,28 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_settings_reserve_clear",
     title: "Start Cache Reserve Clear",
-    description: "You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.\n\nConfirm with the user before calling this tool. This operation permanently clears Cache Reserve for this zone and cannot be undone.",
+    description: "You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.\n\nConfirm with the user before calling this tool. This operation permanently clears Cache Reserve for this zone and cannot be undone.\n\nPOST /zones/{zone_id}/cache/cache_reserve_clear",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -60,14 +57,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_cache_reserve_clear": cache_settings_cache_reserve_clear_output,
-        "cache-settings_cache_reserve_clear_end_ts": cache_settings_cache_reserve_clear_end_ts_output,
-        "cache-settings_cache_reserve_clear_response_value": cache_settings_cache_reserve_clear_response_value_output,
-        "cache-settings_cache_reserve_clear_start_ts": cache_settings_cache_reserve_clear_start_ts_output,
-        "cache-settings_cache_reserve_clear_state": cache_settings_cache_reserve_clear_state_output,
-        "cache-settings_messages": cache_settings_messages_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_cache_reserve_clear": cache$$settings_cache_reserve_clear,
+        "cache-settings_cache_reserve_clear_response_value": cache$$settings_cache_reserve_clear_response_value,
+        "cache-settings_messages": cache$$settings_messages,
       },
     },
     annotations: {
@@ -113,15 +107,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_cache_reserve_clear": cache_settings_cache_reserve_clear_output,
-        "cache-settings_cache_reserve_clear_end_ts": cache_settings_cache_reserve_clear_end_ts_output,
-        "cache-settings_cache_reserve_clear_response_value": cache_settings_cache_reserve_clear_response_value_output,
-        "cache-settings_cache_reserve_clear_start_ts": cache_settings_cache_reserve_clear_start_ts_output,
-        "cache-settings_cache_reserve_clear_state": cache_settings_cache_reserve_clear_state_output,
-        "cache-settings_messages": cache_settings_messages_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_cache_reserve_clear": cache$$settings_cache_reserve_clear,
+        "cache-settings_cache_reserve_clear_response_value": cache$$settings_cache_reserve_clear_response_value,
+        "cache-settings_messages": cache$$settings_messages,
       },
     },
     request: (args) => ({
@@ -131,16 +122,20 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_settings_reserve_edit",
     title: "Change Cache Reserve setting",
-    description: "Increase cache lifetimes by automatically storing all cacheable files into Cloudflare's persistent object storage buckets. Requires Cache Reserve subscription. Note: using Tiered Cache with Cache Reserve is highly recommended to reduce Reserve operations costs. See the [developer docs](https://developers.cloudflare.com/cache/about/cache-reserve) for more information.",
+    description: "Increase cache lifetimes by automatically storing all cacheable files into Cloudflare's persistent object storage buckets. Requires Cache Reserve subscription. Note: using Tiered Cache with Cache Reserve is highly recommended to reduce Reserve operations costs. See the [developer docs](https://developers.cloudflare.com/cache/about/cache-reserve) for more information.\n\nPATCH /zones/{zone_id}/cache/cache_reserve",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/cache-settings_cache_reserve_value",
               "default": "off",
-              "description": "Value of the Cache Reserve zone setting."
+              "description": "Value of the Cache Reserve zone setting.",
+              "enum": [
+                "on",
+                "off"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -148,19 +143,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "cache-settings_cache_reserve_value": cache_settings_cache_reserve_value,
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -172,18 +173,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_cache_reserve": cache_settings_cache_reserve_output,
-        "cache-settings_cache_reserve_response_value": cache_settings_cache_reserve_response_value_output,
-        "cache-settings_cache_reserve_value": cache_settings_cache_reserve_value_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_cache_reserve": cache$$settings_cache_reserve,
+        "cache-settings_cache_reserve_response_value": cache$$settings_cache_reserve_response_value,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -229,19 +225,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_cache_reserve": cache_settings_cache_reserve_output,
-        "cache-settings_cache_reserve_response_value": cache_settings_cache_reserve_response_value_output,
-        "cache-settings_cache_reserve_value": cache_settings_cache_reserve_value_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_cache_reserve": cache$$settings_cache_reserve,
+        "cache-settings_cache_reserve_response_value": cache$$settings_cache_reserve_response_value,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -252,21 +243,28 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_settings_reserve_get",
     title: "Get Cache Reserve setting",
-    description: "Increase cache lifetimes by automatically storing all cacheable files into Cloudflare's persistent object storage buckets. Requires Cache Reserve subscription. Note: using Tiered Cache with Cache Reserve is highly recommended to reduce Reserve operations costs. See the [developer docs](https://developers.cloudflare.com/cache/about/cache-reserve) for more information.",
+    description: "Increase cache lifetimes by automatically storing all cacheable files into Cloudflare's persistent object storage buckets. Requires Cache Reserve subscription. Note: using Tiered Cache with Cache Reserve is highly recommended to reduce Reserve operations costs. See the [developer docs](https://developers.cloudflare.com/cache/about/cache-reserve) for more information.\n\nGET /zones/{zone_id}/cache/cache_reserve",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -278,18 +276,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_cache_reserve": cache_settings_cache_reserve_output,
-        "cache-settings_cache_reserve_response_value": cache_settings_cache_reserve_response_value_output,
-        "cache-settings_cache_reserve_value": cache_settings_cache_reserve_value_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_cache_reserve": cache$$settings_cache_reserve,
+        "cache-settings_cache_reserve_response_value": cache$$settings_cache_reserve_response_value,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -337,19 +330,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_cache_reserve": cache_settings_cache_reserve_output,
-        "cache-settings_cache_reserve_response_value": cache_settings_cache_reserve_response_value_output,
-        "cache-settings_cache_reserve_value": cache_settings_cache_reserve_value_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_cache_reserve": cache$$settings_cache_reserve,
+        "cache-settings_cache_reserve_response_value": cache$$settings_cache_reserve_response_value,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -359,21 +347,28 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_settings_reserve_status",
     title: "Get Cache Reserve Clear",
-    description: "You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.",
+    description: "You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.\n\nGET /zones/{zone_id}/cache/cache_reserve_clear",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -385,14 +380,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_cache_reserve_clear": cache_settings_cache_reserve_clear_output,
-        "cache-settings_cache_reserve_clear_end_ts": cache_settings_cache_reserve_clear_end_ts_output,
-        "cache-settings_cache_reserve_clear_response_value": cache_settings_cache_reserve_clear_response_value_output,
-        "cache-settings_cache_reserve_clear_start_ts": cache_settings_cache_reserve_clear_start_ts_output,
-        "cache-settings_cache_reserve_clear_state": cache_settings_cache_reserve_clear_state_output,
-        "cache-settings_messages": cache_settings_messages_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_cache_reserve_clear": cache$$settings_cache_reserve_clear,
+        "cache-settings_cache_reserve_clear_response_value": cache$$settings_cache_reserve_clear_response_value,
+        "cache-settings_messages": cache$$settings_messages,
       },
     },
     annotations: {
@@ -440,15 +432,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_cache_reserve_clear": cache_settings_cache_reserve_clear_output,
-        "cache-settings_cache_reserve_clear_end_ts": cache_settings_cache_reserve_clear_end_ts_output,
-        "cache-settings_cache_reserve_clear_response_value": cache_settings_cache_reserve_clear_response_value_output,
-        "cache-settings_cache_reserve_clear_start_ts": cache_settings_cache_reserve_clear_start_ts_output,
-        "cache-settings_cache_reserve_clear_state": cache_settings_cache_reserve_clear_state_output,
-        "cache-settings_messages": cache_settings_messages_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_cache_reserve_clear": cache$$settings_cache_reserve_clear,
+        "cache-settings_cache_reserve_clear_response_value": cache$$settings_cache_reserve_clear_response_value,
+        "cache-settings_messages": cache$$settings_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cache/settings/smartTieredCache/outputs.ts b/src/generated/forge-mcp/cache/settings/smartTieredCache/outputs.ts
index eeb09bf1e..9aeed6252 100644
--- a/src/generated/forge-mcp/cache/settings/smartTieredCache/outputs.ts
+++ b/src/generated/forge-mcp/cache/settings/smartTieredCache/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cache-settings_smart_tiered_cache` in responses.
  */
-export const cache_settings_smart_tiered_cache_output: JsonSchema = {
+export const cache$$settings_smart_tiered_cache: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -29,7 +29,7 @@ export const cache_settings_smart_tiered_cache_output: JsonSchema = {
  * The schema of `cache-settings_smart_tiered_cache_response_value` in
  * responses.
  */
-export const cache_settings_smart_tiered_cache_response_value_output: JsonSchema = {
+export const cache$$settings_smart_tiered_cache_response_value: JsonSchema = {
   "properties": {
     "result": {
       "allOf": [
@@ -39,7 +39,11 @@ export const cache_settings_smart_tiered_cache_response_value_output: JsonSchema
         {
           "properties": {
             "value": {
-              "$ref": "#/$defs/cache-settings_smart_tiered_cache_value"
+              "enum": [
+                "on",
+                "off"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -52,14 +56,3 @@ export const cache_settings_smart_tiered_cache_response_value_output: JsonSchema
   },
   "type": "object"
 };
-
-/**
- * The schema of `cache-settings_smart_tiered_cache_value` in responses.
- */
-export const cache_settings_smart_tiered_cache_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/cache/settings/smartTieredCache/schemas.ts b/src/generated/forge-mcp/cache/settings/smartTieredCache/schemas.ts
index 38bd710f6..6a9a08deb 100644
--- a/src/generated/forge-mcp/cache/settings/smartTieredCache/schemas.ts
+++ b/src/generated/forge-mcp/cache/settings/smartTieredCache/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cache-settings_smart_tiered_cache_patch`.
  */
-export const cache_settings_smart_tiered_cache_patch: JsonSchema = {
+export const cache$$settings_smart_tiered_cache_patch: JsonSchema = {
   "description": "Update enablement of Smart Tiered Cache.",
   "properties": {
     "value": {
diff --git a/src/generated/forge-mcp/cache/settings/smartTieredCache/tools.ts b/src/generated/forge-mcp/cache/settings/smartTieredCache/tools.ts
index 5fc8baa2d..15687211c 100644
--- a/src/generated/forge-mcp/cache/settings/smartTieredCache/tools.ts
+++ b/src/generated/forge-mcp/cache/settings/smartTieredCache/tools.ts
@@ -3,53 +3,56 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_editable_output,
-  cache_settings_messages_output,
-  cache_settings_modified_on_output,
-  cache_settings_result_object_delete_output,
-  cache_settings_result_object_output,
-  cache_settings_setting_id_output,
-  cache_settings_setting_value_output,
-  cache_settings_zone_cache_settings_delete_response_single_output,
-  cache_settings_zone_cache_settings_response_single_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
+  cache$$settings_result$$object,
+  cache$$settings_result$$object$$delete,
+  cache$$settings_zone_cache_settings_delete_response_single,
+  cache$$settings_zone_cache_settings_response_single,
 } from "../../../outputs.js";
-import { cache_settings_identifier } from "../../../schemas.js";
 import {
-  cache_settings_smart_tiered_cache_output,
-  cache_settings_smart_tiered_cache_response_value_output,
-  cache_settings_smart_tiered_cache_value_output,
+  cache$$settings_smart_tiered_cache,
+  cache$$settings_smart_tiered_cache_response_value,
 } from "./outputs.js";
-import { cache_settings_smart_tiered_cache_patch } from "./schemas.js";
+import { cache$$settings_smart_tiered_cache_patch } from "./schemas.js";
 
 /**
- * The tools of `cache.settings.smart_tiered_cache`.
+ * The tools of `cache.settings.smartTieredCache`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cache_settings_smart_tiered_cache_create",
+    name: "cache_settings_smartTieredCache_create",
     title: "Create Smart Tiered Cache setting",
-    description: "Smart Tiered Cache dynamically selects the single closest upper tier for each of your website's origins with no configuration required, using our in-house performance and routing data. Cloudflare collects latency data for each request to an origin, and uses the latency data to determine how well any upper-tier data center is connected with an origin. As a result, Cloudflare can select the data center with the lowest latency to be the upper-tier for an origin.",
+    description: "Smart Tiered Cache dynamically selects the single closest upper tier for each of your website's origins with no configuration required, using our in-house performance and routing data. Cloudflare collects latency data for each request to an origin, and uses the latency data to determine how well any upper-tier data center is connected with an origin. As a result, Cloudflare can select the data center with the lowest latency to be the upper-tier for an origin.\n\nPOST /zones/{zone_id}/cache/tiered_cache_smart_topology_enable",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/cache-settings_smart_tiered_cache_patch"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_smart_tiered_cache_patch": cache_settings_smart_tiered_cache_patch,
+        "cache-settings_smart_tiered_cache_patch": cache$$settings_smart_tiered_cache_patch,
       },
     },
     outputSchema: {
@@ -62,18 +65,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_smart_tiered_cache": cache_settings_smart_tiered_cache_output,
-        "cache-settings_smart_tiered_cache_response_value": cache_settings_smart_tiered_cache_response_value_output,
-        "cache-settings_smart_tiered_cache_value": cache_settings_smart_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_smart_tiered_cache": cache$$settings_smart_tiered_cache,
+        "cache-settings_smart_tiered_cache_response_value": cache$$settings_smart_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -120,19 +118,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_smart_tiered_cache": cache_settings_smart_tiered_cache_output,
-        "cache-settings_smart_tiered_cache_response_value": cache_settings_smart_tiered_cache_response_value_output,
-        "cache-settings_smart_tiered_cache_value": cache_settings_smart_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_smart_tiered_cache": cache$$settings_smart_tiered_cache,
+        "cache-settings_smart_tiered_cache_response_value": cache$$settings_smart_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -141,23 +134,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_settings_smart_tiered_cache_delete",
+    name: "cache_settings_smartTieredCache_delete",
     title: "Delete Smart Tiered Cache setting",
-    description: "Smart Tiered Cache dynamically selects the single closest upper tier for each of your website’s origins with no configuration required, using our in-house performance and routing data. Cloudflare collects latency data for each request to an origin, and uses the latency data to determine how well any upper-tier data center is connected with an origin. As a result, Cloudflare can select the data center with the lowest latency to be the upper-tier for an origin.",
+    description: "Smart Tiered Cache dynamically selects the single closest upper tier for each of your website’s origins with no configuration required, using our in-house performance and routing data. Cloudflare collects latency data for each request to an origin, and uses the latency data to determine how well any upper-tier data center is connected with an origin. As a result, Cloudflare can select the data center with the lowest latency to be the upper-tier for an origin.\n\nDELETE /zones/{zone_id}/cache/tiered_cache_smart_topology_enable",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -174,15 +174,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object-delete": cache_settings_result_object_delete_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_smart_tiered_cache": cache_settings_smart_tiered_cache_output,
-        "cache-settings_zone_cache_settings_delete_response_single": cache_settings_zone_cache_settings_delete_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object-delete": cache$$settings_result$$object$$delete,
+        "cache-settings_smart_tiered_cache": cache$$settings_smart_tiered_cache,
+        "cache-settings_zone_cache_settings_delete_response_single": cache$$settings_zone_cache_settings_delete_response_single,
       },
     },
     annotations: {
@@ -233,16 +230,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object-delete": cache_settings_result_object_delete_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_smart_tiered_cache": cache_settings_smart_tiered_cache_output,
-        "cache-settings_zone_cache_settings_delete_response_single": cache_settings_zone_cache_settings_delete_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object-delete": cache$$settings_result$$object$$delete,
+        "cache-settings_smart_tiered_cache": cache$$settings_smart_tiered_cache,
+        "cache-settings_zone_cache_settings_delete_response_single": cache$$settings_zone_cache_settings_delete_response_single,
       },
     },
     request: (args) => ({
@@ -250,27 +244,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_settings_smart_tiered_cache_edit",
+    name: "cache_settings_smartTieredCache_edit",
     title: "Patch Smart Tiered Cache setting",
-    description: "Smart Tiered Cache dynamically selects the single closest upper tier for each of your website’s origins with no configuration required, using our in-house performance and routing data. Cloudflare collects latency data for each request to an origin, and uses the latency data to determine how well any upper-tier data center is connected with an origin. As a result, Cloudflare can select the data center with the lowest latency to be the upper-tier for an origin.",
+    description: "Smart Tiered Cache dynamically selects the single closest upper tier for each of your website’s origins with no configuration required, using our in-house performance and routing data. Cloudflare collects latency data for each request to an origin, and uses the latency data to determine how well any upper-tier data center is connected with an origin. As a result, Cloudflare can select the data center with the lowest latency to be the upper-tier for an origin.\n\nPATCH /zones/{zone_id}/cache/tiered_cache_smart_topology_enable",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/cache-settings_smart_tiered_cache_patch"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_smart_tiered_cache_patch": cache_settings_smart_tiered_cache_patch,
+        "cache-settings_smart_tiered_cache_patch": cache$$settings_smart_tiered_cache_patch,
       },
     },
     outputSchema: {
@@ -283,18 +286,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_smart_tiered_cache": cache_settings_smart_tiered_cache_output,
-        "cache-settings_smart_tiered_cache_response_value": cache_settings_smart_tiered_cache_response_value_output,
-        "cache-settings_smart_tiered_cache_value": cache_settings_smart_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_smart_tiered_cache": cache$$settings_smart_tiered_cache,
+        "cache-settings_smart_tiered_cache_response_value": cache$$settings_smart_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -341,19 +339,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_smart_tiered_cache": cache_settings_smart_tiered_cache_output,
-        "cache-settings_smart_tiered_cache_response_value": cache_settings_smart_tiered_cache_response_value_output,
-        "cache-settings_smart_tiered_cache_value": cache_settings_smart_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_smart_tiered_cache": cache$$settings_smart_tiered_cache,
+        "cache-settings_smart_tiered_cache_response_value": cache$$settings_smart_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -362,23 +355,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_settings_smart_tiered_cache_get",
+    name: "cache_settings_smartTieredCache_get",
     title: "Get Smart Tiered Cache setting",
-    description: "Smart Tiered Cache dynamically selects the single closest upper tier for each of your website’s origins with no configuration required, using our in-house performance and routing data. Cloudflare collects latency data for each request to an origin, and uses the latency data to determine how well any upper-tier data center is connected with an origin. As a result, Cloudflare can select the data center with the lowest latency to be the upper-tier for an origin.",
+    description: "Smart Tiered Cache dynamically selects the single closest upper tier for each of your website’s origins with no configuration required, using our in-house performance and routing data. Cloudflare collects latency data for each request to an origin, and uses the latency data to determine how well any upper-tier data center is connected with an origin. As a result, Cloudflare can select the data center with the lowest latency to be the upper-tier for an origin.\n\nGET /zones/{zone_id}/cache/tiered_cache_smart_topology_enable",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -390,18 +390,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_smart_tiered_cache": cache_settings_smart_tiered_cache_output,
-        "cache-settings_smart_tiered_cache_response_value": cache_settings_smart_tiered_cache_response_value_output,
-        "cache-settings_smart_tiered_cache_value": cache_settings_smart_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_smart_tiered_cache": cache$$settings_smart_tiered_cache,
+        "cache-settings_smart_tiered_cache_response_value": cache$$settings_smart_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -449,19 +444,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_smart_tiered_cache": cache_settings_smart_tiered_cache_output,
-        "cache-settings_smart_tiered_cache_response_value": cache_settings_smart_tiered_cache_response_value_output,
-        "cache-settings_smart_tiered_cache_value": cache_settings_smart_tiered_cache_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_smart_tiered_cache": cache$$settings_smart_tiered_cache,
+        "cache-settings_smart_tiered_cache_response_value": cache$$settings_smart_tiered_cache_response_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cache/settings/variants/outputs.ts b/src/generated/forge-mcp/cache/settings/variants/outputs.ts
index 0df5251b2..d1e5de559 100644
--- a/src/generated/forge-mcp/cache/settings/variants/outputs.ts
+++ b/src/generated/forge-mcp/cache/settings/variants/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cache-settings_variants` in responses.
  */
-export const cache_settings_variants_output: JsonSchema = {
+export const cache$$settings_variants: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -28,7 +28,7 @@ export const cache_settings_variants_output: JsonSchema = {
 /**
  * The schema of `cache-settings_variants_response_value` in responses.
  */
-export const cache_settings_variants_response_value_output: JsonSchema = {
+export const cache$$settings_variants_response_value: JsonSchema = {
   "properties": {
     "result": {
       "allOf": [
@@ -55,7 +55,7 @@ export const cache_settings_variants_response_value_output: JsonSchema = {
 /**
  * The schema of `cache-settings_variants_value` in responses.
  */
-export const cache_settings_variants_value_output: JsonSchema = {
+export const cache$$settings_variants_value: JsonSchema = {
   "properties": {
     "avif": {
       "items": {
diff --git a/src/generated/forge-mcp/cache/settings/variants/schemas.ts b/src/generated/forge-mcp/cache/settings/variants/schemas.ts
index 7662da933..483be5f24 100644
--- a/src/generated/forge-mcp/cache/settings/variants/schemas.ts
+++ b/src/generated/forge-mcp/cache/settings/variants/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cache-settings_variants_value`.
  */
-export const cache_settings_variants_value: JsonSchema = {
+export const cache$$settings_variants_value: JsonSchema = {
   "description": "Value of the zone setting.",
   "properties": {
     "avif": {
diff --git a/src/generated/forge-mcp/cache/settings/variants/tools.ts b/src/generated/forge-mcp/cache/settings/variants/tools.ts
index 7ad59bc1c..459a7de88 100644
--- a/src/generated/forge-mcp/cache/settings/variants/tools.ts
+++ b/src/generated/forge-mcp/cache/settings/variants/tools.ts
@@ -3,26 +3,21 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_editable_output,
-  cache_settings_messages_output,
-  cache_settings_modified_on_output,
-  cache_settings_result_object_delete_output,
-  cache_settings_result_object_output,
-  cache_settings_setting_id_output,
-  cache_settings_setting_value_output,
-  cache_settings_zone_cache_settings_delete_response_single_output,
-  cache_settings_zone_cache_settings_response_single_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
+  cache$$settings_result$$object,
+  cache$$settings_result$$object$$delete,
+  cache$$settings_zone_cache_settings_delete_response_single,
+  cache$$settings_zone_cache_settings_response_single,
 } from "../../../outputs.js";
-import { cache_settings_identifier } from "../../../schemas.js";
 import {
-  cache_settings_variants_output,
-  cache_settings_variants_response_value_output,
-  cache_settings_variants_value_output,
+  cache$$settings_variants,
+  cache$$settings_variants_response_value,
+  cache$$settings_variants_value,
 } from "./outputs.js";
-import { cache_settings_variants_value } from "./schemas.js";
+import { cache$$settings_variants_value as cache$$settings_variants_value$ } from "./schemas.js";
 
 /**
  * The tools of `cache.settings.variants`.
@@ -31,21 +26,28 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_settings_variants_delete",
     title: "Delete variants setting",
-    description: "Variant support enables caching variants of images with certain file extensions in addition to the original. This only applies when the origin server sends the 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but does not serve the variant requested, the response will not be cached. This will be indicated with BYPASS cache status in the response headers.",
+    description: "Variant support enables caching variants of images with certain file extensions in addition to the original. This only applies when the origin server sends the 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but does not serve the variant requested, the response will not be cached. This will be indicated with BYPASS cache status in the response headers.\n\nDELETE /zones/{zone_id}/cache/variants",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -62,15 +64,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object-delete": cache_settings_result_object_delete_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_variants": cache_settings_variants_output,
-        "cache-settings_zone_cache_settings_delete_response_single": cache_settings_zone_cache_settings_delete_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object-delete": cache$$settings_result$$object$$delete,
+        "cache-settings_variants": cache$$settings_variants,
+        "cache-settings_zone_cache_settings_delete_response_single": cache$$settings_zone_cache_settings_delete_response_single,
       },
     },
     annotations: {
@@ -121,16 +120,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object-delete": cache_settings_result_object_delete_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_variants": cache_settings_variants_output,
-        "cache-settings_zone_cache_settings_delete_response_single": cache_settings_zone_cache_settings_delete_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object-delete": cache$$settings_result$$object$$delete,
+        "cache-settings_variants": cache$$settings_variants,
+        "cache-settings_zone_cache_settings_delete_response_single": cache$$settings_zone_cache_settings_delete_response_single,
       },
     },
     request: (args) => ({
@@ -140,7 +136,7 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_settings_variants_edit",
     title: "Change variants setting",
-    description: "Variant support enables caching variants of images with certain file extensions in addition to the original. This only applies when the origin server sends the 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but does not serve the variant requested, the response will not be cached. This will be indicated with BYPASS cache status in the response headers.",
+    description: "Variant support enables caching variants of images with certain file extensions in addition to the original. This only applies when the origin server sends the 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but does not serve the variant requested, the response will not be cached. This will be indicated with BYPASS cache status in the response headers.\n\nPATCH /zones/{zone_id}/cache/variants",
     inputSchema: {
       type: "object",
       properties: {
@@ -156,18 +152,27 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_variants_value": cache_settings_variants_value,
+        "cache-settings_variants_value": cache$$settings_variants_value$,
       },
     },
     outputSchema: {
@@ -180,18 +185,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_variants": cache_settings_variants_output,
-        "cache-settings_variants_response_value": cache_settings_variants_response_value_output,
-        "cache-settings_variants_value": cache_settings_variants_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_variants": cache$$settings_variants,
+        "cache-settings_variants_response_value": cache$$settings_variants_response_value,
+        "cache-settings_variants_value": cache$$settings_variants_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -237,19 +238,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_variants": cache_settings_variants_output,
-        "cache-settings_variants_response_value": cache_settings_variants_response_value_output,
-        "cache-settings_variants_value": cache_settings_variants_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_variants": cache$$settings_variants,
+        "cache-settings_variants_response_value": cache$$settings_variants_response_value,
+        "cache-settings_variants_value": cache$$settings_variants_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -260,21 +257,28 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_settings_variants_get",
     title: "Get variants setting",
-    description: "Variant support enables caching variants of images with certain file extensions in addition to the original. This only applies when the origin server sends the 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but does not serve the variant requested, the response will not be cached. This will be indicated with BYPASS cache status in the response headers.",
+    description: "Variant support enables caching variants of images with certain file extensions in addition to the original. This only applies when the origin server sends the 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but does not serve the variant requested, the response will not be cached. This will be indicated with BYPASS cache status in the response headers.\n\nGET /zones/{zone_id}/cache/variants",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -286,18 +290,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_variants": cache_settings_variants_output,
-        "cache-settings_variants_response_value": cache_settings_variants_response_value_output,
-        "cache-settings_variants_value": cache_settings_variants_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_variants": cache$$settings_variants,
+        "cache-settings_variants_response_value": cache$$settings_variants_response_value,
+        "cache-settings_variants_value": cache$$settings_variants_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -345,19 +345,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_variants": cache_settings_variants_output,
-        "cache-settings_variants_response_value": cache_settings_variants_response_value_output,
-        "cache-settings_variants_value": cache_settings_variants_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_variants": cache$$settings_variants,
+        "cache-settings_variants_response_value": cache$$settings_variants_response_value,
+        "cache-settings_variants_value": cache$$settings_variants_value,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cache/tools.ts b/src/generated/forge-mcp/cache/tools.ts
index 828ac115a..10a29a412 100644
--- a/src/generated/forge-mcp/cache/tools.ts
+++ b/src/generated/forge-mcp/cache/tools.ts
@@ -3,19 +3,17 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  cache_purge_api_response_common_failure_output,
-  cache_purge_api_response_single_id_output,
-  cache_purge_identifier_output,
-  cache_purge_messages_output,
+  cache$$purge_api$$response$$common$$failure,
+  cache$$purge_api$$response$$single$$id,
+  cache$$purge_messages,
 } from "./outputs.js";
 import {
-  cache_purge_Everything,
-  cache_purge_FlexPurgeByHostnames,
-  cache_purge_FlexPurgeByPrefixes,
-  cache_purge_FlexPurgeByTags,
-  cache_purge_SingleFile,
-  cache_purge_SingleFileWithUrlAndHeaders,
-  cache_purge_identifier,
+  cache$$purge_Everything,
+  cache$$purge_FlexPurgeByHostnames,
+  cache$$purge_FlexPurgeByPrefixes,
+  cache$$purge_FlexPurgeByTags,
+  cache$$purge_SingleFile,
+  cache$$purge_SingleFileWithUrlAndHeaders,
 } from "./schemas.js";
 
 /**
@@ -25,7 +23,7 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_invalidate",
     title: "Invalidate Cached Content",
-    description: "Marks cached content as stale in every Cloudflare data center and cache tier, including Cache Reserve. The content stays in cache. The next request for it makes Cloudflare revalidate it with your origin, using the `ETag` and `Last-Modified` values it was cached with:\n\n- If your origin answers `304 Not Modified`, Cloudflare serves the cached copy without downloading it again, and `CF-Cache-Status` is `REVALIDATED`.\n- If your origin sends a full response, Cloudflare serves and caches the new content, and `CF-Cache-Status` is `EXPIRED`.\n\nWith Tiered Cache, each tier revalidates with the tier above it, so a visitor can see `EXPIRED` even when your origin answered `304`.\n\nUntil content is revalidated, your `stale-while-revalidate` and `stale-if-error` directives still apply, counted from the time you invalidated it. For example, if your origin fails during revalidation, Cloudflare can keep serving the stale copy for the `stale-if-error` window.\n\n### Invalidate or purge?\n\n- **Invalidate** when content may not have changed, for example after a deploy. Unchanged content costs your origin a `304` instead of a full response. That saving needs an origin that sends `ETag` or `Last-Modified` and answers conditional requests. Otherwise, every revalidation downloads the full response.\n- **Purge**, with `POST /zones/{zone_id}/purge_cache`, when content must not be served again, for example content you removed for legal or security reasons.\n\nInvalidating takes the same request bodies as purging, needs the same permission, and counts against the same rate limits. After a broad invalidation, such as `purge_everything`, expect more conditional requests to your origin while visitors request the invalidated content again.\n\n### Choose what to invalidate\n\nSend one of these fields in the request body:\n\n- `files`: specific URLs. If your cache key includes request headers, send each URL with the header values it was cached with.\n- `tags`: all content whose `Cache-Tag` response header contains one of the tags.\n- `hosts`: all content cached for the hostnames.\n- `prefixes`: all content whose URL starts with one of the prefixes.\n- `purge_everything`: all cached content in the zone.\n\n### Check the result\n\nA `200` response with `success: true` means Cloudflare accepted the request. To check, request an invalidated URL and confirm that the `CF-Cache-Status` response header is `REVALIDATED` or `EXPIRED`.\n\n### Availability and limits\n\nRate limits and the number of items you can send in one request depend on your plan. See [Purge cache: availability and limits](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).\n\nConfirm with the user before calling this tool. This operation marks the selected content in the zone's cache as stale.",
+    description: "Marks cached content as stale in every Cloudflare data center and cache tier, including Cache Reserve. The content stays in cache. The next request for it makes Cloudflare revalidate it with your origin, using the `ETag` and `Last-Modified` values it was cached with:\n\n- If your origin answers `304 Not Modified`, Cloudflare serves the cached copy without downloading it again, and `CF-Cache-Status` is `REVALIDATED`.\n- If your origin sends a full response, Cloudflare serves and caches the new content, and `CF-Cache-Status` is `EXPIRED`.\n\nWith Tiered Cache, each tier revalidates with the tier above it, so a visitor can see `EXPIRED` even when your origin answered `304`.\n\nUntil content is revalidated, your `stale-while-revalidate` and `stale-if-error` directives still apply, counted from the time you invalidated it. For example, if your origin fails during revalidation, Cloudflare can keep serving the stale copy for the `stale-if-error` window.\n\n### Invalidate or purge?\n\n- **Invalidate** when content may not have changed, for example after a deploy. Unchanged content costs your origin a `304` instead of a full response. That saving needs an origin that sends `ETag` or `Last-Modified` and answers conditional requests. Otherwise, every revalidation downloads the full response.\n- **Purge**, with `POST /zones/{zone_id}/purge_cache`, when content must not be served again, for example content you removed for legal or security reasons.\n\nInvalidating takes the same request bodies as purging, needs the same permission, and counts against the same rate limits. After a broad invalidation, such as `purge_everything`, expect more conditional requests to your origin while visitors request the invalidated content again.\n\n### Choose what to invalidate\n\nSend one of these fields in the request body:\n\n- `files`: specific URLs. If your cache key includes request headers, send each URL with the header values it was cached with.\n- `tags`: all content whose `Cache-Tag` response header contains one of the tags.\n- `hosts`: all content cached for the hostnames.\n- `prefixes`: all content whose URL starts with one of the prefixes.\n- `purge_everything`: all cached content in the zone.\n\n### Check the result\n\nA `200` response with `success: true` means Cloudflare accepted the request. To check, request an invalidated URL and confirm that the `CF-Cache-Status` response header is `REVALIDATED` or `EXPIRED`.\n\n### Availability and limits\n\nRate limits and the number of items you can send in one request depend on your plan. See [Purge cache: availability and limits](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).\n\nConfirm with the user before calling this tool. This operation marks the selected content in the zone's cache as stale.\n\nPOST /zones/{zone_id}/invalidate_cache",
     inputSchema: {
       type: "object",
       properties: {
@@ -51,31 +49,39 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-purge_identifier",
-          "description": "The zone ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-purge_Everything": cache_purge_Everything,
-        "cache-purge_FlexPurgeByHostnames": cache_purge_FlexPurgeByHostnames,
-        "cache-purge_FlexPurgeByPrefixes": cache_purge_FlexPurgeByPrefixes,
-        "cache-purge_FlexPurgeByTags": cache_purge_FlexPurgeByTags,
-        "cache-purge_SingleFile": cache_purge_SingleFile,
-        "cache-purge_SingleFileWithUrlAndHeaders": cache_purge_SingleFileWithUrlAndHeaders,
-        "cache-purge_identifier": cache_purge_identifier,
+        "cache-purge_Everything": cache$$purge_Everything,
+        "cache-purge_FlexPurgeByHostnames": cache$$purge_FlexPurgeByHostnames,
+        "cache-purge_FlexPurgeByPrefixes": cache$$purge_FlexPurgeByPrefixes,
+        "cache-purge_FlexPurgeByTags": cache$$purge_FlexPurgeByTags,
+        "cache-purge_SingleFile": cache$$purge_SingleFile,
+        "cache-purge_SingleFileWithUrlAndHeaders": cache$$purge_SingleFileWithUrlAndHeaders,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cache-purge_api-response-single-id",
       $defs: {
-        "cache-purge_api-response-single-id": cache_purge_api_response_single_id_output,
-        "cache-purge_identifier": cache_purge_identifier_output,
-        "cache-purge_messages": cache_purge_messages_output,
+        "cache-purge_api-response-single-id": cache$$purge_api$$response$$single$$id,
+        "cache-purge_messages": cache$$purge_messages,
       },
     },
     annotations: {
@@ -104,10 +110,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-purge_api-response-common-failure": cache_purge_api_response_common_failure_output,
-        "cache-purge_api-response-single-id": cache_purge_api_response_single_id_output,
-        "cache-purge_identifier": cache_purge_identifier_output,
-        "cache-purge_messages": cache_purge_messages_output,
+        "cache-purge_api-response-common-failure": cache$$purge_api$$response$$common$$failure,
+        "cache-purge_api-response-single-id": cache$$purge_api$$response$$single$$id,
+        "cache-purge_messages": cache$$purge_messages,
       },
     },
     request: (args) => ({
@@ -116,9 +121,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_invalidate_environment",
+    name: "cache_invalidateEnvironment",
     title: "Invalidate Cached Content by Environment",
-    description: "Marks cached content as stale for one environment of the zone. Content cached for the zone's other environments, including production, is not affected. Otherwise this works like `POST /zones/{zone_id}/invalidate_cache`: the next request for invalidated content makes Cloudflare revalidate it with your origin, and the request body takes the same fields.\n\nEnvironments are part of [Version Management](https://developers.cloudflare.com/version-management/). To delete the content instead, use `POST /zones/{zone_id}/environments/{environment_id}/purge_cache`.\n\nInvalidating by URL (`files`) does not work for environments that select requests by IP address, country, ASN, or threat score, and fails with error `1136`. Use `tags`, `hosts`, `prefixes`, or `purge_everything` for those environments.\n\n### Availability and limits\n\nRate limits and the number of items you can send in one request depend on your plan. See [Purge cache: availability and limits](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).\n\nConfirm with the user before calling this tool. This operation marks the selected content in the environment's cache as stale.",
+    description: "Marks cached content as stale for one environment of the zone. Content cached for the zone's other environments, including production, is not affected. Otherwise this works like `POST /zones/{zone_id}/invalidate_cache`: the next request for invalidated content makes Cloudflare revalidate it with your origin, and the request body takes the same fields.\n\nEnvironments are part of [Version Management](https://developers.cloudflare.com/version-management/). To delete the content instead, use `POST /zones/{zone_id}/environments/{environment_id}/purge_cache`.\n\nInvalidating by URL (`files`) does not work for environments that select requests by IP address, country, ASN, or threat score, and fails with error `1136`. Use `tags`, `hosts`, `prefixes`, or `purge_everything` for those environments.\n\n### Availability and limits\n\nRate limits and the number of items you can send in one request depend on your plan. See [Purge cache: availability and limits](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).\n\nConfirm with the user before calling this tool. This operation marks the selected content in the environment's cache as stale.\n\nPOST /zones/{zone_id}/environments/{environment_id}/invalidate_cache",
     inputSchema: {
       type: "object",
       properties: {
@@ -144,36 +149,44 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "environment_id": {
-          "$ref": "#/$defs/cache-purge_identifier",
-          "description": "The environment ID, from Version Management."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/cache-purge_identifier",
-          "description": "The zone ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "environment_id": {
+              "description": "The environment ID, from Version Management.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "environment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "environment_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-purge_Everything": cache_purge_Everything,
-        "cache-purge_FlexPurgeByHostnames": cache_purge_FlexPurgeByHostnames,
-        "cache-purge_FlexPurgeByPrefixes": cache_purge_FlexPurgeByPrefixes,
-        "cache-purge_FlexPurgeByTags": cache_purge_FlexPurgeByTags,
-        "cache-purge_SingleFile": cache_purge_SingleFile,
-        "cache-purge_SingleFileWithUrlAndHeaders": cache_purge_SingleFileWithUrlAndHeaders,
-        "cache-purge_identifier": cache_purge_identifier,
+        "cache-purge_Everything": cache$$purge_Everything,
+        "cache-purge_FlexPurgeByHostnames": cache$$purge_FlexPurgeByHostnames,
+        "cache-purge_FlexPurgeByPrefixes": cache$$purge_FlexPurgeByPrefixes,
+        "cache-purge_FlexPurgeByTags": cache$$purge_FlexPurgeByTags,
+        "cache-purge_SingleFile": cache$$purge_SingleFile,
+        "cache-purge_SingleFileWithUrlAndHeaders": cache$$purge_SingleFileWithUrlAndHeaders,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cache-purge_api-response-single-id",
       $defs: {
-        "cache-purge_api-response-single-id": cache_purge_api_response_single_id_output,
-        "cache-purge_identifier": cache_purge_identifier_output,
-        "cache-purge_messages": cache_purge_messages_output,
+        "cache-purge_api-response-single-id": cache$$purge_api$$response$$single$$id,
+        "cache-purge_messages": cache$$purge_messages,
       },
     },
     annotations: {
@@ -207,10 +220,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-purge_api-response-common-failure": cache_purge_api_response_common_failure_output,
-        "cache-purge_api-response-single-id": cache_purge_api_response_single_id_output,
-        "cache-purge_identifier": cache_purge_identifier_output,
-        "cache-purge_messages": cache_purge_messages_output,
+        "cache-purge_api-response-common-failure": cache$$purge_api$$response$$common$$failure,
+        "cache-purge_api-response-single-id": cache$$purge_api$$response$$single$$id,
+        "cache-purge_messages": cache$$purge_messages,
       },
     },
     request: (args) => ({
@@ -221,7 +233,7 @@ export const tools: readonly Tool[] = [
   {
     name: "cache_purge",
     title: "Purge Cached Content",
-    description: "Deletes cached content in every Cloudflare data center and cache tier, including Cache Reserve. The next request for purged content is a cache `MISS`: Cloudflare fetches the full response from your origin and caches it again. Cloudflare does not serve purged content from cache again, even if your origin is unavailable.\n\nTo keep content cached and have Cloudflare revalidate it with your origin instead, use `POST /zones/{zone_id}/invalidate_cache`.\n\n### Choose what to purge\n\nSend one of these fields in the request body:\n\n- `files`: specific URLs. If your cache key includes request headers, send each URL with the header values it was cached with.\n- `tags`: all content whose `Cache-Tag` response header contains one of the tags.\n- `hosts`: all content cached for the hostnames.\n- `prefixes`: all content whose URL starts with one of the prefixes.\n- `purge_everything`: all cached content in the zone.\n\n### Check the result\n\nA `200` response with `success: true` means Cloudflare accepted the request. It does not confirm that any content was cached or removed. To check, request a purged URL and confirm that the `CF-Cache-Status` response header is `MISS`.\n\n### Availability and limits\n\nRate limits and the number of items you can send in one request depend on your plan. See [Purge cache: availability and limits](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).\n\nConfirm with the user before calling this tool. This operation deletes the selected content from the zone's cache.",
+    description: "Deletes cached content in every Cloudflare data center and cache tier, including Cache Reserve. The next request for purged content is a cache `MISS`: Cloudflare fetches the full response from your origin and caches it again. Cloudflare does not serve purged content from cache again, even if your origin is unavailable.\n\nTo keep content cached and have Cloudflare revalidate it with your origin instead, use `POST /zones/{zone_id}/invalidate_cache`.\n\n### Choose what to purge\n\nSend one of these fields in the request body:\n\n- `files`: specific URLs. If your cache key includes request headers, send each URL with the header values it was cached with.\n- `tags`: all content whose `Cache-Tag` response header contains one of the tags.\n- `hosts`: all content cached for the hostnames.\n- `prefixes`: all content whose URL starts with one of the prefixes.\n- `purge_everything`: all cached content in the zone.\n\n### Check the result\n\nA `200` response with `success: true` means Cloudflare accepted the request. It does not confirm that any content was cached or removed. To check, request a purged URL and confirm that the `CF-Cache-Status` response header is `MISS`.\n\n### Availability and limits\n\nRate limits and the number of items you can send in one request depend on your plan. See [Purge cache: availability and limits](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).\n\nConfirm with the user before calling this tool. This operation deletes the selected content from the zone's cache.\n\nPOST /zones/{zone_id}/purge_cache",
     inputSchema: {
       type: "object",
       properties: {
@@ -247,31 +259,39 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-purge_identifier",
-          "description": "The zone ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-purge_Everything": cache_purge_Everything,
-        "cache-purge_FlexPurgeByHostnames": cache_purge_FlexPurgeByHostnames,
-        "cache-purge_FlexPurgeByPrefixes": cache_purge_FlexPurgeByPrefixes,
-        "cache-purge_FlexPurgeByTags": cache_purge_FlexPurgeByTags,
-        "cache-purge_SingleFile": cache_purge_SingleFile,
-        "cache-purge_SingleFileWithUrlAndHeaders": cache_purge_SingleFileWithUrlAndHeaders,
-        "cache-purge_identifier": cache_purge_identifier,
+        "cache-purge_Everything": cache$$purge_Everything,
+        "cache-purge_FlexPurgeByHostnames": cache$$purge_FlexPurgeByHostnames,
+        "cache-purge_FlexPurgeByPrefixes": cache$$purge_FlexPurgeByPrefixes,
+        "cache-purge_FlexPurgeByTags": cache$$purge_FlexPurgeByTags,
+        "cache-purge_SingleFile": cache$$purge_SingleFile,
+        "cache-purge_SingleFileWithUrlAndHeaders": cache$$purge_SingleFileWithUrlAndHeaders,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cache-purge_api-response-single-id",
       $defs: {
-        "cache-purge_api-response-single-id": cache_purge_api_response_single_id_output,
-        "cache-purge_identifier": cache_purge_identifier_output,
-        "cache-purge_messages": cache_purge_messages_output,
+        "cache-purge_api-response-single-id": cache$$purge_api$$response$$single$$id,
+        "cache-purge_messages": cache$$purge_messages,
       },
     },
     annotations: {
@@ -310,10 +330,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-purge_api-response-common-failure": cache_purge_api_response_common_failure_output,
-        "cache-purge_api-response-single-id": cache_purge_api_response_single_id_output,
-        "cache-purge_identifier": cache_purge_identifier_output,
-        "cache-purge_messages": cache_purge_messages_output,
+        "cache-purge_api-response-common-failure": cache$$purge_api$$response$$common$$failure,
+        "cache-purge_api-response-single-id": cache$$purge_api$$response$$single$$id,
+        "cache-purge_messages": cache$$purge_messages,
       },
     },
     request: (args) => ({
@@ -322,9 +341,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cache_purge_environment",
+    name: "cache_purgeEnvironment",
     title: "Purge Cached Content by Environment",
-    description: "Deletes cached content for one environment of the zone. Content cached for the zone's other environments, including production, is not affected. Otherwise this works like `POST /zones/{zone_id}/purge_cache`: the next request for purged content is a cache `MISS`, and the request body takes the same fields.\n\nEnvironments are part of [Version Management](https://developers.cloudflare.com/version-management/). To keep content cached and have Cloudflare revalidate it instead, use `POST /zones/{zone_id}/environments/{environment_id}/invalidate_cache`.\n\nPurging by URL (`files`) does not work for environments that select requests by IP address, country, ASN, or threat score, and fails with error `1136`. Use `tags`, `hosts`, `prefixes`, or `purge_everything` for those environments.\n\n### Availability and limits\n\nRate limits and the number of items you can send in one request depend on your plan. See [Purge cache: availability and limits](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).\n\nConfirm with the user before calling this tool. This operation deletes the selected content from the environment's cache.",
+    description: "Deletes cached content for one environment of the zone. Content cached for the zone's other environments, including production, is not affected. Otherwise this works like `POST /zones/{zone_id}/purge_cache`: the next request for purged content is a cache `MISS`, and the request body takes the same fields.\n\nEnvironments are part of [Version Management](https://developers.cloudflare.com/version-management/). To keep content cached and have Cloudflare revalidate it instead, use `POST /zones/{zone_id}/environments/{environment_id}/invalidate_cache`.\n\nPurging by URL (`files`) does not work for environments that select requests by IP address, country, ASN, or threat score, and fails with error `1136`. Use `tags`, `hosts`, `prefixes`, or `purge_everything` for those environments.\n\n### Availability and limits\n\nRate limits and the number of items you can send in one request depend on your plan. See [Purge cache: availability and limits](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).\n\nConfirm with the user before calling this tool. This operation deletes the selected content from the environment's cache.\n\nPOST /zones/{zone_id}/environments/{environment_id}/purge_cache",
     inputSchema: {
       type: "object",
       properties: {
@@ -350,36 +369,44 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "environment_id": {
-          "$ref": "#/$defs/cache-purge_identifier",
-          "description": "The environment ID, from Version Management."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/cache-purge_identifier",
-          "description": "The zone ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "environment_id": {
+              "description": "The environment ID, from Version Management.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "environment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "environment_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-purge_Everything": cache_purge_Everything,
-        "cache-purge_FlexPurgeByHostnames": cache_purge_FlexPurgeByHostnames,
-        "cache-purge_FlexPurgeByPrefixes": cache_purge_FlexPurgeByPrefixes,
-        "cache-purge_FlexPurgeByTags": cache_purge_FlexPurgeByTags,
-        "cache-purge_SingleFile": cache_purge_SingleFile,
-        "cache-purge_SingleFileWithUrlAndHeaders": cache_purge_SingleFileWithUrlAndHeaders,
-        "cache-purge_identifier": cache_purge_identifier,
+        "cache-purge_Everything": cache$$purge_Everything,
+        "cache-purge_FlexPurgeByHostnames": cache$$purge_FlexPurgeByHostnames,
+        "cache-purge_FlexPurgeByPrefixes": cache$$purge_FlexPurgeByPrefixes,
+        "cache-purge_FlexPurgeByTags": cache$$purge_FlexPurgeByTags,
+        "cache-purge_SingleFile": cache$$purge_SingleFile,
+        "cache-purge_SingleFileWithUrlAndHeaders": cache$$purge_SingleFileWithUrlAndHeaders,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cache-purge_api-response-single-id",
       $defs: {
-        "cache-purge_api-response-single-id": cache_purge_api_response_single_id_output,
-        "cache-purge_identifier": cache_purge_identifier_output,
-        "cache-purge_messages": cache_purge_messages_output,
+        "cache-purge_api-response-single-id": cache$$purge_api$$response$$single$$id,
+        "cache-purge_messages": cache$$purge_messages,
       },
     },
     annotations: {
@@ -418,10 +445,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-purge_api-response-common-failure": cache_purge_api_response_common_failure_output,
-        "cache-purge_api-response-single-id": cache_purge_api_response_single_id_output,
-        "cache-purge_identifier": cache_purge_identifier_output,
-        "cache-purge_messages": cache_purge_messages_output,
+        "cache-purge_api-response-common-failure": cache$$purge_api$$response$$common$$failure,
+        "cache-purge_api-response-single-id": cache$$purge_api$$response$$single$$id,
+        "cache-purge_messages": cache$$purge_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/clientSideSecurity/connections/outputs.ts b/src/generated/forge-mcp/clientSideSecurity/connections/outputs.ts
index d88782ef8..ab4ba2216 100644
--- a/src/generated/forge-mcp/clientSideSecurity/connections/outputs.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/connections/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `client-side-security_connection` in responses.
  */
-export const client_side_security_connection_output: JsonSchema = {
+export const client$$side$$security_connection: JsonSchema = {
   "properties": {
     "added_at": {
       "format": "date-time",
@@ -26,7 +26,7 @@ export const client_side_security_connection_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/client-side-security_id"
+      "type": "string"
     },
     "last_seen_at": {
       "format": "date-time",
@@ -76,7 +76,7 @@ export const client_side_security_connection_output: JsonSchema = {
  * The schema of `client-side-security_get-zone-connection-response` in
  * responses.
  */
-export const client_side_security_get_zone_connection_response_output: JsonSchema = {
+export const client$$side$$security_get$$zone$$connection$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-get-response-collection"
@@ -99,7 +99,7 @@ export const client_side_security_get_zone_connection_response_output: JsonSchem
  * The schema of `client-side-security_list-zone-connections-response` in
  * responses.
  */
-export const client_side_security_list_zone_connections_response_output: JsonSchema = {
+export const client$$side$$security_list$$zone$$connections$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-list-response-collection"
diff --git a/src/generated/forge-mcp/clientSideSecurity/connections/tools.ts b/src/generated/forge-mcp/clientSideSecurity/connections/tools.ts
index 565e282ab..d7350ba3a 100644
--- a/src/generated/forge-mcp/clientSideSecurity/connections/tools.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/connections/tools.ts
@@ -1,60 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  client_side_security_api_get_response_collection_output,
-  client_side_security_api_list_response_collection_output,
-  client_side_security_api_response_common_failure_output,
-  client_side_security_api_response_common_output,
-  client_side_security_id_output,
-  client_side_security_messages_output,
-  client_side_security_result_info_output,
+  client$$side$$security_api$$get$$response$$collection,
+  client$$side$$security_api$$list$$response$$collection,
+  client$$side$$security_api$$response$$common,
+  client$$side$$security_api$$response$$common$$failure,
+  client$$side$$security_messages,
+  client$$side$$security_result_info,
 } from "../outputs.js";
-import { client_side_security_id } from "../schemas.js";
 import {
-  client_side_security_connection_output,
-  client_side_security_get_zone_connection_response_output,
-  client_side_security_list_zone_connections_response_output,
+  client$$side$$security_connection,
+  client$$side$$security_get$$zone$$connection$$response,
+  client$$side$$security_list$$zone$$connections$$response,
 } from "./outputs.js";
 
 /**
- * The tools of `client_side_security.connections`.
+ * The tools of `clientSideSecurity.connections`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "client_side_security_connections_get",
+    name: "clientSideSecurity_connections_get",
     title: "Get a detected connection",
-    description: "Returns a webpage connection detected on the zone by connection ID.",
+    description: "Returns a webpage connection detected on the zone by connection ID.\n\nGET /zones/{zone_id}/page_shield/connections/{connection_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "connection_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "connection_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "connection_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "connection_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_get-zone-connection-response",
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_connection": client_side_security_connection_output,
-        "client-side-security_get-zone-connection-response": client_side_security_get_zone_connection_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_connection": client$$side$$security_connection,
+        "client-side-security_get-zone-connection-response": client$$side$$security_get$$zone$$connection$$response,
+        "client-side-security_messages": client$$side$$security_messages,
       },
     },
     annotations: {
@@ -92,13 +96,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_connection": client_side_security_connection_output,
-        "client-side-security_get-zone-connection-response": client_side_security_get_zone_connection_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_connection": client$$side$$security_connection,
+        "client-side-security_get-zone-connection-response": client$$side$$security_get$$zone$$connection$$response,
+        "client-side-security_messages": client$$side$$security_messages,
       },
     },
     request: (args) => ({
@@ -106,93 +109,105 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "client_side_security_connections_list",
+    name: "clientSideSecurity_connections_list",
     title: "List detected connections",
-    description: "Lists outbound connections made by webpages in the zone.",
+    description: "Lists outbound connections made by webpages in the zone.\n\nGET /zones/{zone_id}/page_shield/connections",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "description": "The direction used to sort returned connections.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "exclude_cdn_cgi": {
-          "description": "When true, excludes connections seen in a `/cdn-cgi` path from the returned connections. The default value is true.",
-          "type": "boolean"
-        },
-        "exclude_urls": {
-          "description": "Excludes connections whose URL contains one of the URL-encoded URLs separated by commas.\n",
-          "type": "string"
-        },
-        "export": {
-          "description": "Export the list of connections as a file, limited to 50000 entries.",
-          "enum": [
-            "csv"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "hosts": {
-          "description": "Includes connections that match one or more URL-encoded hostnames separated by commas.\n\nWildcards are supported at the start and end of each hostname to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match\n",
-          "type": "string"
-        },
-        "order_by": {
-          "description": "The field used to sort returned connections.",
-          "enum": [
-            "first_seen_at",
-            "last_seen_at"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "description": "The current page number of the paginated results.\n\nWe additionally support a special value \"all\". When \"all\" is used, the API will return all the connections\nwith the applied filters in a single page. This feature is best-effort and it may only work for zones with\na low number of connections\n",
-          "type": "string"
-        },
-        "page_url": {
-          "description": "Includes connections that match one or more page URLs (separated by commas) where they were last seen\n\nWildcards are supported at the start and end of each page URL to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match\n",
-          "type": "string"
-        },
-        "per_page": {
-          "description": "The number of results per page.",
-          "type": "number"
-        },
-        "prioritize_malicious": {
-          "description": "When true, malicious connections appear first in the returned connections.",
-          "type": "boolean"
-        },
-        "status": {
-          "description": "Filters the returned connections using a comma-separated list of connection statuses. Accepted values: `active`, `infrequent`, and `inactive`. The default value is `active`.",
-          "type": "string"
-        },
-        "urls": {
-          "description": "Includes connections whose URL contain one or more URL-encoded URLs separated by commas.\n",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction used to sort returned connections.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "exclude_cdn_cgi": {
+              "description": "When true, excludes connections seen in a `/cdn-cgi` path from the returned connections. The default value is true.",
+              "type": "boolean"
+            },
+            "exclude_urls": {
+              "description": "Excludes connections whose URL contains one of the URL-encoded URLs separated by commas.",
+              "type": "string"
+            },
+            "export": {
+              "description": "Export the list of connections as a file, limited to 50000 entries.",
+              "enum": [
+                "csv"
+              ],
+              "type": "string"
+            },
+            "hosts": {
+              "description": "Includes connections that match one or more URL-encoded hostnames separated by commas.\n\nWildcards are supported at the start and end of each hostname to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match",
+              "type": "string"
+            },
+            "order_by": {
+              "description": "The field used to sort returned connections.",
+              "enum": [
+                "first_seen_at",
+                "last_seen_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "The current page number of the paginated results.\n\nWe additionally support a special value \"all\". When \"all\" is used, the API will return all the connections\nwith the applied filters in a single page. This feature is best-effort and it may only work for zones with\na low number of connections",
+              "type": "string"
+            },
+            "page_url": {
+              "description": "Includes connections that match one or more page URLs (separated by commas) where they were last seen\n\nWildcards are supported at the start and end of each page URL to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "The number of results per page.",
+              "type": "number"
+            },
+            "prioritize_malicious": {
+              "description": "When true, malicious connections appear first in the returned connections.",
+              "type": "boolean"
+            },
+            "status": {
+              "description": "Filters the returned connections using a comma-separated list of connection statuses. Accepted values: `active`, `infrequent`, and `inactive`. The default value is `active`.",
+              "type": "string"
+            },
+            "urls": {
+              "description": "Includes connections whose URL contain one or more URL-encoded URLs separated by commas.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_list-zone-connections-response",
       $defs: {
-        "client-side-security_api-list-response-collection": client_side_security_api_list_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_connection": client_side_security_connection_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_list-zone-connections-response": client_side_security_list_zone_connections_response_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_result_info": client_side_security_result_info_output,
+        "client-side-security_api-list-response-collection": client$$side$$security_api$$list$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_connection": client$$side$$security_connection,
+        "client-side-security_list-zone-connections-response": client$$side$$security_list$$zone$$connections$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_result_info": client$$side$$security_result_info,
       },
     },
     annotations: {
@@ -230,31 +245,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-list-response-collection": client_side_security_api_list_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_connection": client_side_security_connection_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_list-zone-connections-response": client_side_security_list_zone_connections_response_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_result_info": client_side_security_result_info_output,
+        "client-side-security_api-list-response-collection": client$$side$$security_api$$list$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_connection": client$$side$$security_connection,
+        "client-side-security_list-zone-connections-response": client$$side$$security_list$$zone$$connections$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_result_info": client$$side$$security_result_info,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/page_shield/connections`,
       query: [
-        ["exclude_urls", args["exclude_urls"], true],
-        ["urls", args["urls"], true],
-        ["hosts", args["hosts"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
-        ["prioritize_malicious", args["prioritize_malicious"], true],
-        ["exclude_cdn_cgi", args["exclude_cdn_cgi"], true],
-        ["status", args["status"], true],
-        ["page_url", args["page_url"], true],
-        ["export", args["export"], true],
+        ["exclude_urls", param(args, "query", "exclude_urls"), true],
+        ["urls", param(args, "query", "urls"), true],
+        ["hosts", param(args, "query", "hosts"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["prioritize_malicious", param(args, "query", "prioritize_malicious"), true],
+        ["exclude_cdn_cgi", param(args, "query", "exclude_cdn_cgi"), true],
+        ["status", param(args, "query", "status"), true],
+        ["page_url", param(args, "query", "page_url"), true],
+        ["export", param(args, "query", "export"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/clientSideSecurity/cookies/outputs.ts b/src/generated/forge-mcp/clientSideSecurity/cookies/outputs.ts
index 877aa93c8..40c2cb442 100644
--- a/src/generated/forge-mcp/clientSideSecurity/cookies/outputs.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/cookies/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `client-side-security_cookie` in responses.
  */
-export const client_side_security_cookie_output: JsonSchema = {
+export const client$$side$$security_cookie: JsonSchema = {
   "properties": {
     "domain_attribute": {
       "type": "string"
@@ -26,7 +26,7 @@ export const client_side_security_cookie_output: JsonSchema = {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/client-side-security_id"
+      "type": "string"
     },
     "last_seen_at": {
       "format": "date-time",
@@ -80,7 +80,7 @@ export const client_side_security_cookie_output: JsonSchema = {
 /**
  * The schema of `client-side-security_get-zone-cookie-response` in responses.
  */
-export const client_side_security_get_zone_cookie_response_output: JsonSchema = {
+export const client$$side$$security_get$$zone$$cookie$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-get-response-collection"
@@ -102,7 +102,7 @@ export const client_side_security_get_zone_cookie_response_output: JsonSchema =
 /**
  * The schema of `client-side-security_list-zone-cookies-response` in responses.
  */
-export const client_side_security_list_zone_cookies_response_output: JsonSchema = {
+export const client$$side$$security_list$$zone$$cookies$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-list-response-collection"
diff --git a/src/generated/forge-mcp/clientSideSecurity/cookies/tools.ts b/src/generated/forge-mcp/clientSideSecurity/cookies/tools.ts
index 236eea15c..c2af64fab 100644
--- a/src/generated/forge-mcp/clientSideSecurity/cookies/tools.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/cookies/tools.ts
@@ -1,60 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  client_side_security_api_get_response_collection_output,
-  client_side_security_api_list_response_collection_output,
-  client_side_security_api_response_common_failure_output,
-  client_side_security_api_response_common_output,
-  client_side_security_id_output,
-  client_side_security_messages_output,
-  client_side_security_result_info_output,
+  client$$side$$security_api$$get$$response$$collection,
+  client$$side$$security_api$$list$$response$$collection,
+  client$$side$$security_api$$response$$common,
+  client$$side$$security_api$$response$$common$$failure,
+  client$$side$$security_messages,
+  client$$side$$security_result_info,
 } from "../outputs.js";
-import { client_side_security_id } from "../schemas.js";
 import {
-  client_side_security_cookie_output,
-  client_side_security_get_zone_cookie_response_output,
-  client_side_security_list_zone_cookies_response_output,
+  client$$side$$security_cookie,
+  client$$side$$security_get$$zone$$cookie$$response,
+  client$$side$$security_list$$zone$$cookies$$response,
 } from "./outputs.js";
 
 /**
- * The tools of `client_side_security.cookies`.
+ * The tools of `clientSideSecurity.cookies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "client_side_security_cookies_get",
+    name: "clientSideSecurity_cookies_get",
     title: "Get a detected cookie",
-    description: "Returns a cookie detected on the zone by cookie ID.",
+    description: "Returns a cookie detected on the zone by cookie ID.\n\nGET /zones/{zone_id}/page_shield/cookies/{cookie_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "cookie_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "cookie_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "cookie_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "cookie_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_get-zone-cookie-response",
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_cookie": client_side_security_cookie_output,
-        "client-side-security_get-zone-cookie-response": client_side_security_get_zone_cookie_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_cookie": client$$side$$security_cookie,
+        "client-side-security_get-zone-cookie-response": client$$side$$security_get$$zone$$cookie$$response,
+        "client-side-security_messages": client$$side$$security_messages,
       },
     },
     annotations: {
@@ -92,13 +96,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_cookie": client_side_security_cookie_output,
-        "client-side-security_get-zone-cookie-response": client_side_security_get_zone_cookie_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_cookie": client$$side$$security_cookie,
+        "client-side-security_get-zone-cookie-response": client$$side$$security_get$$zone$$cookie$$response,
+        "client-side-security_messages": client$$side$$security_messages,
       },
     },
     request: (args) => ({
@@ -106,110 +109,122 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "client_side_security_cookies_list",
+    name: "clientSideSecurity_cookies_list",
     title: "List detected cookies",
-    description: "Lists cookies detected on the zone.",
+    description: "Lists cookies detected on the zone.\n\nGET /zones/{zone_id}/page_shield/cookies",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "description": "The direction used to sort returned cookies.'",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "domain": {
-          "description": "Filters the returned cookies that match the specified domain attribute",
-          "type": "string"
-        },
-        "export": {
-          "description": "Export the list of cookies as a file, limited to 50000 entries.",
-          "enum": [
-            "csv"
-          ],
-          "type": "string"
-        },
-        "hosts": {
-          "description": "Includes cookies that match one or more URL-encoded hostnames separated by commas.\n\nWildcards are supported at the start and end of each hostname to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match\n",
-          "type": "string"
-        },
-        "http_only": {
-          "description": "Filters the returned cookies that are set with HttpOnly",
-          "type": "boolean"
-        },
-        "name": {
-          "description": "Filters the returned cookies that match the specified name.\nWildcards are supported at the start and end to support starts with, ends with\nand contains. e.g. session*\n",
-          "type": "string"
-        },
-        "order_by": {
-          "description": "The field used to sort returned cookies.",
-          "enum": [
-            "first_seen_at",
-            "last_seen_at"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "description": "The current page number of the paginated results.\n\nWe additionally support a special value \"all\". When \"all\" is used, the API will return all the cookies\nwith the applied filters in a single page. This feature is best-effort and it may only work for zones with\na low number of cookies\n",
-          "type": "string"
-        },
-        "page_url": {
-          "description": "Includes connections that match one or more page URLs (separated by commas) where they were last seen\n\nWildcards are supported at the start and end of each page URL to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match\n",
-          "type": "string"
-        },
         "path": {
-          "description": "Filters the returned cookies that match the specified path attribute",
-          "type": "string"
-        },
-        "per_page": {
-          "description": "The number of results per page.",
-          "type": "number"
-        },
-        "same_site": {
-          "description": "Filters the returned cookies that match the specified same_site attribute",
-          "enum": [
-            "lax",
-            "strict",
-            "none"
-          ],
-          "type": "string"
-        },
-        "secure": {
-          "description": "Filters the returned cookies that are set with Secure",
-          "type": "boolean"
-        },
-        "type": {
-          "description": "Filters the returned cookies that match the specified type attribute",
-          "enum": [
-            "first_party",
-            "unknown"
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction used to sort returned cookies.'",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "domain": {
+              "description": "Filters the returned cookies that match the specified domain attribute",
+              "type": "string"
+            },
+            "export": {
+              "description": "Export the list of cookies as a file, limited to 50000 entries.",
+              "enum": [
+                "csv"
+              ],
+              "type": "string"
+            },
+            "hosts": {
+              "description": "Includes cookies that match one or more URL-encoded hostnames separated by commas.\n\nWildcards are supported at the start and end of each hostname to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match",
+              "type": "string"
+            },
+            "http_only": {
+              "description": "Filters the returned cookies that are set with HttpOnly",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "Filters the returned cookies that match the specified name.\nWildcards are supported at the start and end to support starts with, ends with\nand contains. e.g. session*",
+              "type": "string"
+            },
+            "order_by": {
+              "description": "The field used to sort returned cookies.",
+              "enum": [
+                "first_seen_at",
+                "last_seen_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "The current page number of the paginated results.\n\nWe additionally support a special value \"all\". When \"all\" is used, the API will return all the cookies\nwith the applied filters in a single page. This feature is best-effort and it may only work for zones with\na low number of cookies",
+              "type": "string"
+            },
+            "page_url": {
+              "description": "Includes connections that match one or more page URLs (separated by commas) where they were last seen\n\nWildcards are supported at the start and end of each page URL to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match",
+              "type": "string"
+            },
+            "path": {
+              "description": "Filters the returned cookies that match the specified path attribute",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "The number of results per page.",
+              "type": "number"
+            },
+            "same_site": {
+              "description": "Filters the returned cookies that match the specified same_site attribute",
+              "enum": [
+                "lax",
+                "strict",
+                "none"
+              ],
+              "type": "string"
+            },
+            "secure": {
+              "description": "Filters the returned cookies that are set with Secure",
+              "type": "boolean"
+            },
+            "type": {
+              "description": "Filters the returned cookies that match the specified type attribute",
+              "enum": [
+                "first_party",
+                "unknown"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_list-zone-cookies-response",
       $defs: {
-        "client-side-security_api-list-response-collection": client_side_security_api_list_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_cookie": client_side_security_cookie_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_list-zone-cookies-response": client_side_security_list_zone_cookies_response_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_result_info": client_side_security_result_info_output,
+        "client-side-security_api-list-response-collection": client$$side$$security_api$$list$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_cookie": client$$side$$security_cookie,
+        "client-side-security_list-zone-cookies-response": client$$side$$security_list$$zone$$cookies$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_result_info": client$$side$$security_result_info,
       },
     },
     annotations: {
@@ -247,33 +262,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-list-response-collection": client_side_security_api_list_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_cookie": client_side_security_cookie_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_list-zone-cookies-response": client_side_security_list_zone_cookies_response_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_result_info": client_side_security_result_info_output,
+        "client-side-security_api-list-response-collection": client$$side$$security_api$$list$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_cookie": client$$side$$security_cookie,
+        "client-side-security_list-zone-cookies-response": client$$side$$security_list$$zone$$cookies$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_result_info": client$$side$$security_result_info,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/page_shield/cookies`,
       query: [
-        ["hosts", args["hosts"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
-        ["page_url", args["page_url"], true],
-        ["export", args["export"], true],
-        ["name", args["name"], true],
-        ["secure", args["secure"], true],
-        ["http_only", args["http_only"], true],
-        ["same_site", args["same_site"], true],
-        ["type", args["type"], true],
-        ["path", args["path"], true],
-        ["domain", args["domain"], true],
+        ["hosts", param(args, "query", "hosts"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["page_url", param(args, "query", "page_url"), true],
+        ["export", param(args, "query", "export"), true],
+        ["name", param(args, "query", "name"), true],
+        ["secure", param(args, "query", "secure"), true],
+        ["http_only", param(args, "query", "http_only"), true],
+        ["same_site", param(args, "query", "same_site"), true],
+        ["type", param(args, "query", "type"), true],
+        ["path", param(args, "query", "path"), true],
+        ["domain", param(args, "query", "domain"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/clientSideSecurity/outputs.ts b/src/generated/forge-mcp/clientSideSecurity/outputs.ts
index 493900b8b..640b31672 100644
--- a/src/generated/forge-mcp/clientSideSecurity/outputs.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../_/tool.js";
  * The schema of `client-side-security_api-get-response-collection` in
  * responses.
  */
-export const client_side_security_api_get_response_collection_output: JsonSchema = {
+export const client$$side$$security_api$$get$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-response-common"
@@ -34,7 +34,7 @@ export const client_side_security_api_get_response_collection_output: JsonSchema
  * The schema of `client-side-security_api-list-response-collection` in
  * responses.
  */
-export const client_side_security_api_list_response_collection_output: JsonSchema = {
+export const client$$side$$security_api$$list$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-response-common"
@@ -56,7 +56,7 @@ export const client_side_security_api_list_response_collection_output: JsonSchem
 /**
  * The schema of `client-side-security_api-response-common` in responses.
  */
-export const client_side_security_api_response_common_output: JsonSchema = {
+export const client$$side$$security_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/client-side-security_messages"
@@ -81,7 +81,7 @@ export const client_side_security_api_response_common_output: JsonSchema = {
  * The schema of `client-side-security_api-response-common-failure` in
  * responses.
  */
-export const client_side_security_api_response_common_failure_output: JsonSchema = {
+export const client$$side$$security_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/client-side-security_messages"
@@ -106,17 +106,10 @@ export const client_side_security_api_response_common_failure_output: JsonSchema
   "type": "object"
 };
 
-/**
- * The schema of `client-side-security_id` in responses.
- */
-export const client_side_security_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `client-side-security_messages` in responses.
  */
-export const client_side_security_messages_output: JsonSchema = {
+export const client$$side$$security_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -138,7 +131,7 @@ export const client_side_security_messages_output: JsonSchema = {
 /**
  * The schema of `client-side-security_result_info` in responses.
  */
-export const client_side_security_result_info_output: JsonSchema = {
+export const client$$side$$security_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
diff --git a/src/generated/forge-mcp/clientSideSecurity/policies/outputs.ts b/src/generated/forge-mcp/clientSideSecurity/policies/outputs.ts
index fc61e8ab9..078da8698 100644
--- a/src/generated/forge-mcp/clientSideSecurity/policies/outputs.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/policies/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `client-side-security_get-zone-policy-response` in responses.
  */
-export const client_side_security_get_zone_policy_response_output: JsonSchema = {
+export const client$$side$$security_get$$zone$$policy$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-get-response-collection"
@@ -29,7 +29,7 @@ export const client_side_security_get_zone_policy_response_output: JsonSchema =
  * The schema of `client-side-security_list-zone-policies-response` in
  * responses.
  */
-export const client_side_security_list_zone_policies_response_output: JsonSchema = {
+export const client$$side$$security_list$$zone$$policies$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-list-response-collection"
@@ -54,22 +54,27 @@ export const client_side_security_list_zone_policies_response_output: JsonSchema
 /**
  * The schema of `client-side-security_policy` in responses.
  */
-export const client_side_security_policy_output: JsonSchema = {
+export const client$$side$$security_policy: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/client-side-security_policy-action"
+      "enum": [
+        "allow",
+        "log",
+        "add_reporting_directives"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/client-side-security_policy-description"
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/client-side-security_policy-enabled"
+      "type": "boolean"
     },
     "expression": {
-      "$ref": "#/$defs/client-side-security_policy-expression"
+      "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/client-side-security_policy-value"
+      "type": "string"
     }
   },
   "required": [
@@ -82,50 +87,10 @@ export const client_side_security_policy_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `client-side-security_policy-action` in responses.
- */
-export const client_side_security_policy_action_output: JsonSchema = {
-  "enum": [
-    "allow",
-    "log",
-    "add_reporting_directives"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `client-side-security_policy-description` in responses.
- */
-export const client_side_security_policy_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `client-side-security_policy-enabled` in responses.
- */
-export const client_side_security_policy_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `client-side-security_policy-expression` in responses.
- */
-export const client_side_security_policy_expression_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `client-side-security_policy-value` in responses.
- */
-export const client_side_security_policy_value_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `client-side-security_policy-with-id` in responses.
  */
-export const client_side_security_policy_with_id_output: JsonSchema = {
+export const client$$side$$security_policy$$with$$id: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_policy"
@@ -133,7 +98,7 @@ export const client_side_security_policy_with_id_output: JsonSchema = {
     {
       "properties": {
         "id": {
-          "$ref": "#/$defs/client-side-security_id"
+          "type": "string"
         }
       },
       "required": [
diff --git a/src/generated/forge-mcp/clientSideSecurity/policies/schemas.ts b/src/generated/forge-mcp/clientSideSecurity/policies/schemas.ts
index b9136b6fb..510d954c8 100644
--- a/src/generated/forge-mcp/clientSideSecurity/policies/schemas.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/policies/schemas.ts
@@ -6,27 +6,32 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `client-side-security_policy`.
  */
-export const client_side_security_policy: JsonSchema = {
+export const client$$side$$security_policy: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/client-side-security_policy-action",
-      "description": "The action to take if the expression matches"
+      "description": "The action to take if the expression matches",
+      "enum": [
+        "allow",
+        "log",
+        "add_reporting_directives"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/client-side-security_policy-description",
-      "description": "A description for the policy"
+      "description": "A description for the policy",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/client-side-security_policy-enabled",
-      "description": "Whether the policy is enabled"
+      "description": "Whether the policy is enabled",
+      "type": "boolean"
     },
     "expression": {
-      "$ref": "#/$defs/client-side-security_policy-expression",
-      "description": "The expression which must match for the policy to be applied, using the Cloudflare Firewall rule expression syntax"
+      "description": "The expression which must match for the policy to be applied, using the Cloudflare Firewall rule expression syntax",
+      "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/client-side-security_policy-value",
-      "description": "The policy which will be applied"
+      "description": "The policy which will be applied",
+      "type": "string"
     }
   },
   "required": [
@@ -38,48 +43,3 @@ export const client_side_security_policy: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `client-side-security_policy-action`.
- */
-export const client_side_security_policy_action: JsonSchema = {
-  "description": "The action to take if the expression matches",
-  "enum": [
-    "allow",
-    "log",
-    "add_reporting_directives"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `client-side-security_policy-description`.
- */
-export const client_side_security_policy_description: JsonSchema = {
-  "description": "A description for the policy",
-  "type": "string"
-};
-
-/**
- * The schema of `client-side-security_policy-enabled`.
- */
-export const client_side_security_policy_enabled: JsonSchema = {
-  "description": "Whether the policy is enabled",
-  "type": "boolean"
-};
-
-/**
- * The schema of `client-side-security_policy-expression`.
- */
-export const client_side_security_policy_expression: JsonSchema = {
-  "description": "The expression which must match for the policy to be applied, using the Cloudflare Firewall rule expression syntax",
-  "type": "string"
-};
-
-/**
- * The schema of `client-side-security_policy-value`.
- */
-export const client_side_security_policy_value: JsonSchema = {
-  "description": "The policy which will be applied",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/clientSideSecurity/policies/tools.ts b/src/generated/forge-mcp/clientSideSecurity/policies/tools.ts
index 7464830f6..250cdf84f 100644
--- a/src/generated/forge-mcp/clientSideSecurity/policies/tools.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/policies/tools.ts
@@ -3,83 +3,67 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  client_side_security_api_get_response_collection_output,
-  client_side_security_api_list_response_collection_output,
-  client_side_security_api_response_common_failure_output,
-  client_side_security_api_response_common_output,
-  client_side_security_id_output,
-  client_side_security_messages_output,
-  client_side_security_result_info_output,
+  client$$side$$security_api$$get$$response$$collection,
+  client$$side$$security_api$$list$$response$$collection,
+  client$$side$$security_api$$response$$common,
+  client$$side$$security_api$$response$$common$$failure,
+  client$$side$$security_messages,
+  client$$side$$security_result_info,
 } from "../outputs.js";
-import { client_side_security_id } from "../schemas.js";
 import {
-  client_side_security_get_zone_policy_response_output,
-  client_side_security_list_zone_policies_response_output,
-  client_side_security_policy_action_output,
-  client_side_security_policy_description_output,
-  client_side_security_policy_enabled_output,
-  client_side_security_policy_expression_output,
-  client_side_security_policy_output,
-  client_side_security_policy_value_output,
-  client_side_security_policy_with_id_output,
+  client$$side$$security_get$$zone$$policy$$response,
+  client$$side$$security_list$$zone$$policies$$response,
+  client$$side$$security_policy,
+  client$$side$$security_policy$$with$$id,
 } from "./outputs.js";
-import {
-  client_side_security_policy,
-  client_side_security_policy_action,
-  client_side_security_policy_description,
-  client_side_security_policy_enabled,
-  client_side_security_policy_expression,
-  client_side_security_policy_value,
-} from "./schemas.js";
+import { client$$side$$security_policy as client$$side$$security_policy$ } from "./schemas.js";
 
 /**
- * The tools of `client_side_security.policies`.
+ * The tools of `clientSideSecurity.policies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "client_side_security_policies_create",
+    name: "clientSideSecurity_policies_create",
     title: "Create a content security rule",
-    description: "Creates a rule that applies a client-side security action when its filter expression matches.",
+    description: "Creates a rule that applies a client-side security action when its filter expression matches.\n\nPOST /zones/{zone_id}/page_shield/policies",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/client-side-security_policy"
         },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "client-side-security_id": client_side_security_id,
-        "client-side-security_policy": client_side_security_policy,
-        "client-side-security_policy-action": client_side_security_policy_action,
-        "client-side-security_policy-description": client_side_security_policy_description,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled,
-        "client-side-security_policy-expression": client_side_security_policy_expression,
-        "client-side-security_policy-value": client_side_security_policy_value,
+        "client-side-security_policy": client$$side$$security_policy$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_get-zone-policy-response",
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_get-zone-policy-response": client_side_security_get_zone_policy_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_policy": client_side_security_policy_output,
-        "client-side-security_policy-action": client_side_security_policy_action_output,
-        "client-side-security_policy-description": client_side_security_policy_description_output,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled_output,
-        "client-side-security_policy-expression": client_side_security_policy_expression_output,
-        "client-side-security_policy-value": client_side_security_policy_value_output,
-        "client-side-security_policy-with-id": client_side_security_policy_with_id_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_get-zone-policy-response": client$$side$$security_get$$zone$$policy$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_policy": client$$side$$security_policy,
+        "client-side-security_policy-with-id": client$$side$$security_policy$$with$$id,
       },
     },
     annotations: {
@@ -114,19 +98,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_get-zone-policy-response": client_side_security_get_zone_policy_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_policy": client_side_security_policy_output,
-        "client-side-security_policy-action": client_side_security_policy_action_output,
-        "client-side-security_policy-description": client_side_security_policy_description_output,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled_output,
-        "client-side-security_policy-expression": client_side_security_policy_expression_output,
-        "client-side-security_policy-value": client_side_security_policy_value_output,
-        "client-side-security_policy-with-id": client_side_security_policy_with_id_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_get-zone-policy-response": client$$side$$security_get$$zone$$policy$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_policy": client$$side$$security_policy,
+        "client-side-security_policy-with-id": client$$side$$security_policy$$with$$id,
       },
     },
     request: (args) => ({
@@ -135,28 +113,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "client_side_security_policies_delete",
+    name: "clientSideSecurity_policies_delete",
     title: "Delete a content security rule",
-    description: "Permanently deletes a content security rule by ID.\n\nConfirm with the user before calling this tool. This operation permanently deletes the content security rule from the zone.",
+    description: "Permanently deletes a content security rule by ID.\n\nConfirm with the user before calling this tool. This operation permanently deletes the content security rule from the zone.\n\nDELETE /zones/{zone_id}/page_shield/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "policy_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "policy_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -188,8 +173,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_messages": client_side_security_messages_output,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_messages": client$$side$$security_messages,
       },
     },
     request: (args) => ({
@@ -197,44 +182,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "client_side_security_policies_get",
+    name: "clientSideSecurity_policies_get",
     title: "Get a content security rule",
-    description: "Returns a content security rule by ID.",
+    description: "Returns a content security rule by ID.\n\nGET /zones/{zone_id}/page_shield/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "policy_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "policy_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_get-zone-policy-response",
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_get-zone-policy-response": client_side_security_get_zone_policy_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_policy": client_side_security_policy_output,
-        "client-side-security_policy-action": client_side_security_policy_action_output,
-        "client-side-security_policy-description": client_side_security_policy_description_output,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled_output,
-        "client-side-security_policy-expression": client_side_security_policy_expression_output,
-        "client-side-security_policy-value": client_side_security_policy_value_output,
-        "client-side-security_policy-with-id": client_side_security_policy_with_id_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_get-zone-policy-response": client$$side$$security_get$$zone$$policy$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_policy": client$$side$$security_policy,
+        "client-side-security_policy-with-id": client$$side$$security_policy$$with$$id,
       },
     },
     annotations: {
@@ -272,19 +258,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_get-zone-policy-response": client_side_security_get_zone_policy_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_policy": client_side_security_policy_output,
-        "client-side-security_policy-action": client_side_security_policy_action_output,
-        "client-side-security_policy-description": client_side_security_policy_description_output,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled_output,
-        "client-side-security_policy-expression": client_side_security_policy_expression_output,
-        "client-side-security_policy-value": client_side_security_policy_value_output,
-        "client-side-security_policy-with-id": client_side_security_policy_with_id_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_get-zone-policy-response": client$$side$$security_get$$zone$$policy$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_policy": client$$side$$security_policy,
+        "client-side-security_policy-with-id": client$$side$$security_policy$$with$$id,
       },
     },
     request: (args) => ({
@@ -292,40 +272,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "client_side_security_policies_list",
+    name: "clientSideSecurity_policies_list",
     title: "List content security rules",
-    description: "Lists content security rules configured for the zone.",
+    description: "Lists content security rules configured for the zone.\n\nGET /zones/{zone_id}/page_shield/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_list-zone-policies-response",
       $defs: {
-        "client-side-security_api-list-response-collection": client_side_security_api_list_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_list-zone-policies-response": client_side_security_list_zone_policies_response_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_policy": client_side_security_policy_output,
-        "client-side-security_policy-action": client_side_security_policy_action_output,
-        "client-side-security_policy-description": client_side_security_policy_description_output,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled_output,
-        "client-side-security_policy-expression": client_side_security_policy_expression_output,
-        "client-side-security_policy-value": client_side_security_policy_value_output,
-        "client-side-security_policy-with-id": client_side_security_policy_with_id_output,
-        "client-side-security_result_info": client_side_security_result_info_output,
+        "client-side-security_api-list-response-collection": client$$side$$security_api$$list$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_list-zone-policies-response": client$$side$$security_list$$zone$$policies$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_policy": client$$side$$security_policy,
+        "client-side-security_policy-with-id": client$$side$$security_policy$$with$$id,
+        "client-side-security_result_info": client$$side$$security_result_info,
       },
     },
     annotations: {
@@ -363,20 +344,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-list-response-collection": client_side_security_api_list_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_list-zone-policies-response": client_side_security_list_zone_policies_response_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_policy": client_side_security_policy_output,
-        "client-side-security_policy-action": client_side_security_policy_action_output,
-        "client-side-security_policy-description": client_side_security_policy_description_output,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled_output,
-        "client-side-security_policy-expression": client_side_security_policy_expression_output,
-        "client-side-security_policy-value": client_side_security_policy_value_output,
-        "client-side-security_policy-with-id": client_side_security_policy_with_id_output,
-        "client-side-security_result_info": client_side_security_result_info_output,
+        "client-side-security_api-list-response-collection": client$$side$$security_api$$list$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_list-zone-policies-response": client$$side$$security_list$$zone$$policies$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_policy": client$$side$$security_policy,
+        "client-side-security_policy-with-id": client$$side$$security_policy$$with$$id,
+        "client-side-security_result_info": client$$side$$security_result_info,
       },
     },
     request: (args) => ({
@@ -384,75 +359,76 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "client_side_security_policies_update",
+    name: "clientSideSecurity_policies_update",
     title: "Update a content security rule",
-    description: "Updates the description, action, expression, enabled state, and policy value for a content security rule.",
+    description: "Updates the description, action, expression, enabled state, and policy value for a content security rule.\n\nPUT /zones/{zone_id}/page_shield/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "action": {
-              "$ref": "#/$defs/client-side-security_policy-action",
-              "description": "The action to take if the expression matches"
+              "description": "The action to take if the expression matches",
+              "enum": [
+                "allow",
+                "log",
+                "add_reporting_directives"
+              ],
+              "type": "string"
             },
             "description": {
-              "$ref": "#/$defs/client-side-security_policy-description",
-              "description": "A description for the policy"
+              "description": "A description for the policy",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/client-side-security_policy-enabled",
-              "description": "Whether the policy is enabled"
+              "description": "Whether the policy is enabled",
+              "type": "boolean"
             },
             "expression": {
-              "$ref": "#/$defs/client-side-security_policy-expression",
-              "description": "The expression which must match for the policy to be applied, using the Cloudflare Firewall rule expression syntax"
+              "description": "The expression which must match for the policy to be applied, using the Cloudflare Firewall rule expression syntax",
+              "type": "string"
             },
             "value": {
-              "$ref": "#/$defs/client-side-security_policy-value",
-              "description": "The policy which will be applied"
+              "description": "The policy which will be applied",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "policy_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "policy_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "policy_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-        "client-side-security_policy-action": client_side_security_policy_action,
-        "client-side-security_policy-description": client_side_security_policy_description,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled,
-        "client-side-security_policy-expression": client_side_security_policy_expression,
-        "client-side-security_policy-value": client_side_security_policy_value,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_get-zone-policy-response",
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_get-zone-policy-response": client_side_security_get_zone_policy_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_policy": client_side_security_policy_output,
-        "client-side-security_policy-action": client_side_security_policy_action_output,
-        "client-side-security_policy-description": client_side_security_policy_description_output,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled_output,
-        "client-side-security_policy-expression": client_side_security_policy_expression_output,
-        "client-side-security_policy-value": client_side_security_policy_value_output,
-        "client-side-security_policy-with-id": client_side_security_policy_with_id_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_get-zone-policy-response": client$$side$$security_get$$zone$$policy$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_policy": client$$side$$security_policy,
+        "client-side-security_policy-with-id": client$$side$$security_policy$$with$$id,
       },
     },
     annotations: {
@@ -487,19 +463,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_get-zone-policy-response": client_side_security_get_zone_policy_response_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_policy": client_side_security_policy_output,
-        "client-side-security_policy-action": client_side_security_policy_action_output,
-        "client-side-security_policy-description": client_side_security_policy_description_output,
-        "client-side-security_policy-enabled": client_side_security_policy_enabled_output,
-        "client-side-security_policy-expression": client_side_security_policy_expression_output,
-        "client-side-security_policy-value": client_side_security_policy_value_output,
-        "client-side-security_policy-with-id": client_side_security_policy_with_id_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_get-zone-policy-response": client$$side$$security_get$$zone$$policy$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_policy": client$$side$$security_policy,
+        "client-side-security_policy-with-id": client$$side$$security_policy$$with$$id,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/clientSideSecurity/schemas.ts b/src/generated/forge-mcp/clientSideSecurity/schemas.ts
deleted file mode 100644
index b9302883a..000000000
--- a/src/generated/forge-mcp/clientSideSecurity/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `client-side-security_id`.
- */
-export const client_side_security_id: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/clientSideSecurity/scripts/outputs.ts b/src/generated/forge-mcp/clientSideSecurity/scripts/outputs.ts
index 6b15d66a8..3c0d1ba3d 100644
--- a/src/generated/forge-mcp/clientSideSecurity/scripts/outputs.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/scripts/outputs.ts
@@ -3,52 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `client-side-security_cryptomining_score` in responses.
- */
-export const client_side_security_cryptomining_score_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `client-side-security_dataflow_score` in responses.
- */
-export const client_side_security_dataflow_score_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `client-side-security_fetched_at` in responses.
- */
-export const client_side_security_fetched_at_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `client-side-security_get-zone-script-response` in responses.
  */
-export const client_side_security_get_zone_script_response_output: JsonSchema = {
+export const client$$side$$security_get$$zone$$script$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-get-response-collection"
@@ -89,38 +47,10 @@ export const client_side_security_get_zone_script_response_output: JsonSchema =
   ]
 };
 
-/**
- * The schema of `client-side-security_hash` in responses.
- */
-export const client_side_security_hash_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `client-side-security_js_integrity_score` in responses.
- */
-export const client_side_security_js_integrity_score_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `client-side-security_list-zone-scripts-response` in responses.
  */
-export const client_side_security_list_zone_scripts_response_output: JsonSchema = {
+export const client$$side$$security_list$$zone$$scripts$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-list-response-collection"
@@ -142,68 +72,47 @@ export const client_side_security_list_zone_scripts_response_output: JsonSchema
   ]
 };
 
-/**
- * The schema of `client-side-security_magecart_score` in responses.
- */
-export const client_side_security_magecart_score_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `client-side-security_malware_score` in responses.
- */
-export const client_side_security_malware_score_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `client-side-security_obfuscation_score` in responses.
- */
-export const client_side_security_obfuscation_score_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `client-side-security_script` in responses.
  */
-export const client_side_security_script_output: JsonSchema = {
+export const client$$side$$security_script: JsonSchema = {
   "properties": {
     "added_at": {
       "format": "date-time",
       "type": "string"
     },
     "cryptomining_score": {
-      "$ref": "#/$defs/client-side-security_cryptomining_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "dataflow_score": {
-      "$ref": "#/$defs/client-side-security_dataflow_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "domain_reported_malicious": {
       "type": "boolean"
     },
     "fetched_at": {
-      "$ref": "#/$defs/client-side-security_fetched_at"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "first_page_url": {
       "type": "string"
@@ -213,23 +122,44 @@ export const client_side_security_script_output: JsonSchema = {
       "type": "string"
     },
     "hash": {
-      "$ref": "#/$defs/client-side-security_hash"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "host": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/client-side-security_id"
+      "type": "string"
     },
     "js_integrity_score": {
-      "$ref": "#/$defs/client-side-security_js_integrity_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "last_seen_at": {
       "format": "date-time",
       "type": "string"
     },
     "magecart_score": {
-      "$ref": "#/$defs/client-side-security_magecart_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "malicious_domain_categories": {
       "items": {
@@ -244,10 +174,24 @@ export const client_side_security_script_output: JsonSchema = {
       "type": "array"
     },
     "malware_score": {
-      "$ref": "#/$defs/client-side-security_malware_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "obfuscation_score": {
-      "$ref": "#/$defs/client-side-security_obfuscation_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "page_urls": {
       "items": {
@@ -280,31 +224,87 @@ export const client_side_security_script_output: JsonSchema = {
 /**
  * The schema of `client-side-security_version` in responses.
  */
-export const client_side_security_version_output: JsonSchema = {
+export const client$$side$$security_version: JsonSchema = {
   "properties": {
     "cryptomining_score": {
-      "$ref": "#/$defs/client-side-security_cryptomining_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "dataflow_score": {
-      "$ref": "#/$defs/client-side-security_dataflow_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "fetched_at": {
-      "$ref": "#/$defs/client-side-security_fetched_at"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "hash": {
-      "$ref": "#/$defs/client-side-security_hash"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "js_integrity_score": {
-      "$ref": "#/$defs/client-side-security_js_integrity_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "magecart_score": {
-      "$ref": "#/$defs/client-side-security_magecart_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "malware_score": {
-      "$ref": "#/$defs/client-side-security_malware_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "obfuscation_score": {
-      "$ref": "#/$defs/client-side-security_obfuscation_score"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/clientSideSecurity/scripts/tools.ts b/src/generated/forge-mcp/clientSideSecurity/scripts/tools.ts
index 09a4acc0e..28937e18e 100644
--- a/src/generated/forge-mcp/clientSideSecurity/scripts/tools.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/scripts/tools.ts
@@ -1,78 +1,66 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  client_side_security_api_get_response_collection_output,
-  client_side_security_api_list_response_collection_output,
-  client_side_security_api_response_common_failure_output,
-  client_side_security_api_response_common_output,
-  client_side_security_id_output,
-  client_side_security_messages_output,
-  client_side_security_result_info_output,
+  client$$side$$security_api$$get$$response$$collection,
+  client$$side$$security_api$$list$$response$$collection,
+  client$$side$$security_api$$response$$common,
+  client$$side$$security_api$$response$$common$$failure,
+  client$$side$$security_messages,
+  client$$side$$security_result_info,
 } from "../outputs.js";
-import { client_side_security_id } from "../schemas.js";
 import {
-  client_side_security_cryptomining_score_output,
-  client_side_security_dataflow_score_output,
-  client_side_security_fetched_at_output,
-  client_side_security_get_zone_script_response_output,
-  client_side_security_hash_output,
-  client_side_security_js_integrity_score_output,
-  client_side_security_list_zone_scripts_response_output,
-  client_side_security_magecart_score_output,
-  client_side_security_malware_score_output,
-  client_side_security_obfuscation_score_output,
-  client_side_security_script_output,
-  client_side_security_version_output,
+  client$$side$$security_get$$zone$$script$$response,
+  client$$side$$security_list$$zone$$scripts$$response,
+  client$$side$$security_script,
+  client$$side$$security_version,
 } from "./outputs.js";
 
 /**
- * The tools of `client_side_security.scripts`.
+ * The tools of `clientSideSecurity.scripts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "client_side_security_scripts_get",
+    name: "clientSideSecurity_scripts_get",
     title: "Get a detected script",
-    description: "Returns a script detected on the zone by script ID.",
+    description: "Returns a script detected on the zone by script ID.\n\nGET /zones/{zone_id}/page_shield/scripts/{script_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "script_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "script_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "script_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "script_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_get-zone-script-response",
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_cryptomining_score": client_side_security_cryptomining_score_output,
-        "client-side-security_dataflow_score": client_side_security_dataflow_score_output,
-        "client-side-security_fetched_at": client_side_security_fetched_at_output,
-        "client-side-security_get-zone-script-response": client_side_security_get_zone_script_response_output,
-        "client-side-security_hash": client_side_security_hash_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_js_integrity_score": client_side_security_js_integrity_score_output,
-        "client-side-security_magecart_score": client_side_security_magecart_score_output,
-        "client-side-security_malware_score": client_side_security_malware_score_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_obfuscation_score": client_side_security_obfuscation_score_output,
-        "client-side-security_script": client_side_security_script_output,
-        "client-side-security_version": client_side_security_version_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_get-zone-script-response": client$$side$$security_get$$zone$$script$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_script": client$$side$$security_script,
+        "client-side-security_version": client$$side$$security_version,
       },
     },
     annotations: {
@@ -110,22 +98,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_cryptomining_score": client_side_security_cryptomining_score_output,
-        "client-side-security_dataflow_score": client_side_security_dataflow_score_output,
-        "client-side-security_fetched_at": client_side_security_fetched_at_output,
-        "client-side-security_get-zone-script-response": client_side_security_get_zone_script_response_output,
-        "client-side-security_hash": client_side_security_hash_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_js_integrity_score": client_side_security_js_integrity_score_output,
-        "client-side-security_magecart_score": client_side_security_magecart_score_output,
-        "client-side-security_malware_score": client_side_security_malware_score_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_obfuscation_score": client_side_security_obfuscation_score_output,
-        "client-side-security_script": client_side_security_script_output,
-        "client-side-security_version": client_side_security_version_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_get-zone-script-response": client$$side$$security_get$$zone$$script$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_script": client$$side$$security_script,
+        "client-side-security_version": client$$side$$security_version,
       },
     },
     request: (args) => ({
@@ -133,107 +112,111 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "client_side_security_scripts_list",
+    name: "clientSideSecurity_scripts_list",
     title: "List detected scripts",
-    description: "Lists scripts detected on webpages in the zone, with filtering and pagination.",
+    description: "Lists scripts detected on webpages in the zone, with filtering and pagination.\n\nGET /zones/{zone_id}/page_shield/scripts",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "description": "The direction used to sort returned scripts.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "exclude_cdn_cgi": {
-          "default": true,
-          "description": "When true, excludes scripts seen in a `/cdn-cgi` path from the returned scripts. The default value is true.",
-          "type": "boolean"
-        },
-        "exclude_duplicates": {
-          "default": true,
-          "description": "When true, excludes duplicate scripts. We consider a script duplicate of another if their javascript\ncontent matches and they share the same url host and zone hostname. In such case, we return the most\nrecent script for the URL host and zone hostname combination.\n",
-          "type": "boolean"
-        },
-        "exclude_urls": {
-          "description": "Excludes scripts whose URL contains one of the URL-encoded URLs separated by commas.\n",
-          "type": "string"
-        },
-        "export": {
-          "description": "Export the list of scripts as a file, limited to 50000 entries.",
-          "enum": [
-            "csv"
-          ],
-          "type": "string"
-        },
-        "hosts": {
-          "description": "Includes scripts that match one or more URL-encoded hostnames separated by commas.\n\nWildcards are supported at the start and end of each hostname to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match\n",
-          "type": "string"
-        },
-        "order_by": {
-          "description": "The field used to sort returned scripts.",
-          "enum": [
-            "first_seen_at",
-            "last_seen_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "The current page number of the paginated results.\n\nWe additionally support a special value \"all\". When \"all\" is used, the API will return all the scripts\nwith the applied filters in a single page. This feature is best-effort and it may only work for zones with\na low number of scripts\n",
-          "type": "string"
-        },
-        "page_url": {
-          "description": "Includes scripts that match one or more page URLs (separated by commas) where they were last seen\n\nWildcards are supported at the start and end of each page URL to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match\n",
-          "type": "string"
-        },
-        "per_page": {
-          "description": "The number of results per page.",
-          "type": "number"
+          "type": "object"
         },
-        "prioritize_malicious": {
-          "description": "When true, malicious scripts appear first in the returned scripts.",
-          "type": "boolean"
-        },
-        "status": {
-          "description": "Filters the returned scripts using a comma-separated list of scripts statuses. Accepted values: `active`, `infrequent`, and `inactive`. The default value is `active`.",
-          "type": "string"
-        },
-        "urls": {
-          "description": "Includes scripts whose URL contain one or more URL-encoded URLs separated by commas.\n",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction used to sort returned scripts.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "exclude_cdn_cgi": {
+              "default": true,
+              "description": "When true, excludes scripts seen in a `/cdn-cgi` path from the returned scripts. The default value is true.",
+              "type": "boolean"
+            },
+            "exclude_duplicates": {
+              "default": true,
+              "description": "When true, excludes duplicate scripts. We consider a script duplicate of another if their javascript\ncontent matches and they share the same url host and zone hostname. In such case, we return the most\nrecent script for the URL host and zone hostname combination.",
+              "type": "boolean"
+            },
+            "exclude_urls": {
+              "description": "Excludes scripts whose URL contains one of the URL-encoded URLs separated by commas.",
+              "type": "string"
+            },
+            "export": {
+              "description": "Export the list of scripts as a file, limited to 50000 entries.",
+              "enum": [
+                "csv"
+              ],
+              "type": "string"
+            },
+            "hosts": {
+              "description": "Includes scripts that match one or more URL-encoded hostnames separated by commas.\n\nWildcards are supported at the start and end of each hostname to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match",
+              "type": "string"
+            },
+            "order_by": {
+              "description": "The field used to sort returned scripts.",
+              "enum": [
+                "first_seen_at",
+                "last_seen_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "The current page number of the paginated results.\n\nWe additionally support a special value \"all\". When \"all\" is used, the API will return all the scripts\nwith the applied filters in a single page. This feature is best-effort and it may only work for zones with\na low number of scripts",
+              "type": "string"
+            },
+            "page_url": {
+              "description": "Includes scripts that match one or more page URLs (separated by commas) where they were last seen\n\nWildcards are supported at the start and end of each page URL to support starts with, ends with\nand contains. If no wildcards are used, results will be filtered by exact match",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "The number of results per page.",
+              "type": "number"
+            },
+            "prioritize_malicious": {
+              "description": "When true, malicious scripts appear first in the returned scripts.",
+              "type": "boolean"
+            },
+            "status": {
+              "description": "Filters the returned scripts using a comma-separated list of scripts statuses. Accepted values: `active`, `infrequent`, and `inactive`. The default value is `active`.",
+              "type": "string"
+            },
+            "urls": {
+              "description": "Includes scripts whose URL contain one or more URL-encoded URLs separated by commas.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/client-side-security_list-zone-scripts-response",
       $defs: {
-        "client-side-security_api-list-response-collection": client_side_security_api_list_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_cryptomining_score": client_side_security_cryptomining_score_output,
-        "client-side-security_dataflow_score": client_side_security_dataflow_score_output,
-        "client-side-security_fetched_at": client_side_security_fetched_at_output,
-        "client-side-security_hash": client_side_security_hash_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_js_integrity_score": client_side_security_js_integrity_score_output,
-        "client-side-security_list-zone-scripts-response": client_side_security_list_zone_scripts_response_output,
-        "client-side-security_magecart_score": client_side_security_magecart_score_output,
-        "client-side-security_malware_score": client_side_security_malware_score_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_obfuscation_score": client_side_security_obfuscation_score_output,
-        "client-side-security_result_info": client_side_security_result_info_output,
-        "client-side-security_script": client_side_security_script_output,
+        "client-side-security_api-list-response-collection": client$$side$$security_api$$list$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_list-zone-scripts-response": client$$side$$security_list$$zone$$scripts$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_result_info": client$$side$$security_result_info,
+        "client-side-security_script": client$$side$$security_script,
       },
     },
     annotations: {
@@ -271,40 +254,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-list-response-collection": client_side_security_api_list_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_cryptomining_score": client_side_security_cryptomining_score_output,
-        "client-side-security_dataflow_score": client_side_security_dataflow_score_output,
-        "client-side-security_fetched_at": client_side_security_fetched_at_output,
-        "client-side-security_hash": client_side_security_hash_output,
-        "client-side-security_id": client_side_security_id_output,
-        "client-side-security_js_integrity_score": client_side_security_js_integrity_score_output,
-        "client-side-security_list-zone-scripts-response": client_side_security_list_zone_scripts_response_output,
-        "client-side-security_magecart_score": client_side_security_magecart_score_output,
-        "client-side-security_malware_score": client_side_security_malware_score_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_obfuscation_score": client_side_security_obfuscation_score_output,
-        "client-side-security_result_info": client_side_security_result_info_output,
-        "client-side-security_script": client_side_security_script_output,
+        "client-side-security_api-list-response-collection": client$$side$$security_api$$list$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_list-zone-scripts-response": client$$side$$security_list$$zone$$scripts$$response,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_result_info": client$$side$$security_result_info,
+        "client-side-security_script": client$$side$$security_script,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/page_shield/scripts`,
       query: [
-        ["exclude_urls", args["exclude_urls"], true],
-        ["urls", args["urls"], true],
-        ["hosts", args["hosts"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
-        ["prioritize_malicious", args["prioritize_malicious"], true],
-        ["exclude_cdn_cgi", args["exclude_cdn_cgi"], true],
-        ["exclude_duplicates", args["exclude_duplicates"], true],
-        ["status", args["status"], true],
-        ["page_url", args["page_url"], true],
-        ["export", args["export"], true],
+        ["exclude_urls", param(args, "query", "exclude_urls"), true],
+        ["urls", param(args, "query", "urls"), true],
+        ["hosts", param(args, "query", "hosts"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["prioritize_malicious", param(args, "query", "prioritize_malicious"), true],
+        ["exclude_cdn_cgi", param(args, "query", "exclude_cdn_cgi"), true],
+        ["exclude_duplicates", param(args, "query", "exclude_duplicates"), true],
+        ["status", param(args, "query", "status"), true],
+        ["page_url", param(args, "query", "page_url"), true],
+        ["export", param(args, "query", "export"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/clientSideSecurity/settings/outputs.ts b/src/generated/forge-mcp/clientSideSecurity/settings/outputs.ts
index eebcf031f..e15a01819 100644
--- a/src/generated/forge-mcp/clientSideSecurity/settings/outputs.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/settings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `client-side-security_api-response-single` in responses.
  */
-export const client_side_security_api_response_single_output: JsonSchema = {
+export const client$$side$$security_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-response-common"
@@ -22,29 +22,22 @@ export const client_side_security_api_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `client-side-security_enabled` in responses.
- */
-export const client_side_security_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `client-side-security_get-zone-settings-response` in responses.
  */
-export const client_side_security_get_zone_settings_response_output: JsonSchema = {
+export const client$$side$$security_get$$zone$$settings$$response: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/client-side-security_enabled"
+      "type": "boolean"
     },
     "updated_at": {
-      "$ref": "#/$defs/client-side-security_updated_at"
+      "type": "string"
     },
     "use_cloudflare_reporting_endpoint": {
-      "$ref": "#/$defs/client-side-security_use_cloudflare_reporting_endpoint"
+      "type": "boolean"
     },
     "use_connection_url_path": {
-      "$ref": "#/$defs/client-side-security_use_connection_url_path"
+      "type": "boolean"
     }
   },
   "required": [
@@ -60,19 +53,19 @@ export const client_side_security_get_zone_settings_response_output: JsonSchema
  * The schema of `client-side-security_update-zone-settings-response` in
  * responses.
  */
-export const client_side_security_update_zone_settings_response_output: JsonSchema = {
+export const client$$side$$security_update$$zone$$settings$$response: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/client-side-security_enabled"
+      "type": "boolean"
     },
     "updated_at": {
-      "$ref": "#/$defs/client-side-security_updated_at"
+      "type": "string"
     },
     "use_cloudflare_reporting_endpoint": {
-      "$ref": "#/$defs/client-side-security_use_cloudflare_reporting_endpoint"
+      "type": "boolean"
     },
     "use_connection_url_path": {
-      "$ref": "#/$defs/client-side-security_use_connection_url_path"
+      "type": "boolean"
     }
   },
   "required": [
@@ -84,33 +77,11 @@ export const client_side_security_update_zone_settings_response_output: JsonSche
   "type": "object"
 };
 
-/**
- * The schema of `client-side-security_updated_at` in responses.
- */
-export const client_side_security_updated_at_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `client-side-security_use_cloudflare_reporting_endpoint` in
- * responses.
- */
-export const client_side_security_use_cloudflare_reporting_endpoint_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `client-side-security_use_connection_url_path` in responses.
- */
-export const client_side_security_use_connection_url_path_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `client-side-security_zone_settings_response_single` in
  * responses.
  */
-export const client_side_security_zone_settings_response_single_output: JsonSchema = {
+export const client$$side$$security_zone_settings_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/client-side-security_api-response-single"
diff --git a/src/generated/forge-mcp/clientSideSecurity/settings/schemas.ts b/src/generated/forge-mcp/clientSideSecurity/settings/schemas.ts
deleted file mode 100644
index 272d0d3ad..000000000
--- a/src/generated/forge-mcp/clientSideSecurity/settings/schemas.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `client-side-security_enabled`.
- */
-export const client_side_security_enabled: JsonSchema = {
-  "description": "When true, indicates that Client-Side Security is enabled.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `client-side-security_use_cloudflare_reporting_endpoint`.
- */
-export const client_side_security_use_cloudflare_reporting_endpoint: JsonSchema = {
-  "description": "When true, CSP reports will be sent to https://csp-reporting.cloudflare.com/cdn-cgi/script_monitor/report",
-  "type": "boolean"
-};
-
-/**
- * The schema of `client-side-security_use_connection_url_path`.
- */
-export const client_side_security_use_connection_url_path: JsonSchema = {
-  "description": "When true, the paths associated with connections URLs will also be analyzed.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/clientSideSecurity/settings/tools.ts b/src/generated/forge-mcp/clientSideSecurity/settings/tools.ts
index e08a2066c..198b303c8 100644
--- a/src/generated/forge-mcp/clientSideSecurity/settings/tools.ts
+++ b/src/generated/forge-mcp/clientSideSecurity/settings/tools.ts
@@ -3,50 +3,47 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  client_side_security_api_get_response_collection_output,
-  client_side_security_api_response_common_failure_output,
-  client_side_security_api_response_common_output,
-  client_side_security_messages_output,
+  client$$side$$security_api$$get$$response$$collection,
+  client$$side$$security_api$$response$$common,
+  client$$side$$security_api$$response$$common$$failure,
+  client$$side$$security_messages,
 } from "../outputs.js";
-import { client_side_security_id } from "../schemas.js";
 import {
-  client_side_security_api_response_single_output,
-  client_side_security_enabled_output,
-  client_side_security_get_zone_settings_response_output,
-  client_side_security_update_zone_settings_response_output,
-  client_side_security_updated_at_output,
-  client_side_security_use_cloudflare_reporting_endpoint_output,
-  client_side_security_use_connection_url_path_output,
-  client_side_security_zone_settings_response_single_output,
+  client$$side$$security_api$$response$$single,
+  client$$side$$security_get$$zone$$settings$$response,
+  client$$side$$security_update$$zone$$settings$$response,
+  client$$side$$security_zone_settings_response_single,
 } from "./outputs.js";
-import {
-  client_side_security_enabled,
-  client_side_security_use_cloudflare_reporting_endpoint,
-  client_side_security_use_connection_url_path,
-} from "./schemas.js";
 
 /**
- * The tools of `client_side_security.settings`.
+ * The tools of `clientSideSecurity.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "client_side_security_settings_get",
+    name: "clientSideSecurity_settings_get",
     title: "Get client-side security settings",
-    description: "Returns the client-side security product enablement status and reporting behaviors.",
+    description: "Returns the client-side security product enablement status and reporting behaviors.\n\nGET /zones/{zone_id}/page_shield",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "client-side-security_id": client_side_security_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -63,14 +60,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_enabled": client_side_security_enabled_output,
-        "client-side-security_get-zone-settings-response": client_side_security_get_zone_settings_response_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_updated_at": client_side_security_updated_at_output,
-        "client-side-security_use_cloudflare_reporting_endpoint": client_side_security_use_cloudflare_reporting_endpoint_output,
-        "client-side-security_use_connection_url_path": client_side_security_use_connection_url_path_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_get-zone-settings-response": client$$side$$security_get$$zone$$settings$$response,
+        "client-side-security_messages": client$$side$$security_messages,
       },
     },
     annotations: {
@@ -120,15 +113,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-get-response-collection": client_side_security_api_get_response_collection_output,
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_enabled": client_side_security_enabled_output,
-        "client-side-security_get-zone-settings-response": client_side_security_get_zone_settings_response_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_updated_at": client_side_security_updated_at_output,
-        "client-side-security_use_cloudflare_reporting_endpoint": client_side_security_use_cloudflare_reporting_endpoint_output,
-        "client-side-security_use_connection_url_path": client_side_security_use_connection_url_path_output,
+        "client-side-security_api-get-response-collection": client$$side$$security_api$$get$$response$$collection,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_get-zone-settings-response": client$$side$$security_get$$zone$$settings$$response,
+        "client-side-security_messages": client$$side$$security_messages,
       },
     },
     request: (args) => ({
@@ -136,44 +125,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "client_side_security_settings_update",
+    name: "clientSideSecurity_settings_update",
     title: "Update client-side security settings",
-    description: "Updates client-side security enablement and reporting behaviors for the zone.",
+    description: "Updates client-side security enablement and reporting behaviors for the zone.\n\nPUT /zones/{zone_id}/page_shield",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "enabled": {
-              "$ref": "#/$defs/client-side-security_enabled",
-              "description": "When true, indicates that Client-Side Security is enabled."
+              "description": "When true, indicates that Client-Side Security is enabled.",
+              "type": "boolean"
             },
             "use_cloudflare_reporting_endpoint": {
-              "$ref": "#/$defs/client-side-security_use_cloudflare_reporting_endpoint",
-              "description": "When true, CSP reports will be sent to https://csp-reporting.cloudflare.com/cdn-cgi/script_monitor/report"
+              "description": "When true, CSP reports will be sent to https://csp-reporting.cloudflare.com/cdn-cgi/script_monitor/report",
+              "type": "boolean"
             },
             "use_connection_url_path": {
-              "$ref": "#/$defs/client-side-security_use_connection_url_path",
-              "description": "When true, the paths associated with connections URLs will also be analyzed."
+              "description": "When true, the paths associated with connections URLs will also be analyzed.",
+              "type": "boolean"
             }
           },
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/client-side-security_id",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "client-side-security_enabled": client_side_security_enabled,
-        "client-side-security_id": client_side_security_id,
-        "client-side-security_use_cloudflare_reporting_endpoint": client_side_security_use_cloudflare_reporting_endpoint,
-        "client-side-security_use_connection_url_path": client_side_security_use_connection_url_path,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -190,15 +183,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-single": client_side_security_api_response_single_output,
-        "client-side-security_enabled": client_side_security_enabled_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_update-zone-settings-response": client_side_security_update_zone_settings_response_output,
-        "client-side-security_updated_at": client_side_security_updated_at_output,
-        "client-side-security_use_cloudflare_reporting_endpoint": client_side_security_use_cloudflare_reporting_endpoint_output,
-        "client-side-security_use_connection_url_path": client_side_security_use_connection_url_path_output,
-        "client-side-security_zone_settings_response_single": client_side_security_zone_settings_response_single_output,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-single": client$$side$$security_api$$response$$single,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_update-zone-settings-response": client$$side$$security_update$$zone$$settings$$response,
+        "client-side-security_zone_settings_response_single": client$$side$$security_zone_settings_response_single,
       },
     },
     annotations: {
@@ -245,16 +234,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "client-side-security_api-response-common": client_side_security_api_response_common_output,
-        "client-side-security_api-response-common-failure": client_side_security_api_response_common_failure_output,
-        "client-side-security_api-response-single": client_side_security_api_response_single_output,
-        "client-side-security_enabled": client_side_security_enabled_output,
-        "client-side-security_messages": client_side_security_messages_output,
-        "client-side-security_update-zone-settings-response": client_side_security_update_zone_settings_response_output,
-        "client-side-security_updated_at": client_side_security_updated_at_output,
-        "client-side-security_use_cloudflare_reporting_endpoint": client_side_security_use_cloudflare_reporting_endpoint_output,
-        "client-side-security_use_connection_url_path": client_side_security_use_connection_url_path_output,
-        "client-side-security_zone_settings_response_single": client_side_security_zone_settings_response_single_output,
+        "client-side-security_api-response-common": client$$side$$security_api$$response$$common,
+        "client-side-security_api-response-common-failure": client$$side$$security_api$$response$$common$$failure,
+        "client-side-security_api-response-single": client$$side$$security_api$$response$$single,
+        "client-side-security_messages": client$$side$$security_messages,
+        "client-side-security_update-zone-settings-response": client$$side$$security_update$$zone$$settings$$response,
+        "client-side-security_zone_settings_response_single": client$$side$$security_zone_settings_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudConnector/rules/outputs.ts b/src/generated/forge-mcp/cloudConnector/rules/outputs.ts
index 76e79bc1e..c056f73b3 100644
--- a/src/generated/forge-mcp/cloudConnector/rules/outputs.ts
+++ b/src/generated/forge-mcp/cloudConnector/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cloud-connector_api-response-common` in responses.
  */
-export const cloud_connector_api_response_common_output: JsonSchema = {
+export const cloud$$connector_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cloud-connector_messages"
@@ -32,7 +32,7 @@ export const cloud_connector_api_response_common_output: JsonSchema = {
 /**
  * The schema of `cloud-connector_api-response-common-failure` in responses.
  */
-export const cloud_connector_api_response_common_failure_output: JsonSchema = {
+export const cloud$$connector_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cloud-connector_messages"
@@ -62,7 +62,7 @@ export const cloud_connector_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `cloud-connector_messages` in responses.
  */
-export const cloud_connector_messages_output: JsonSchema = {
+export const cloud$$connector_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -92,24 +92,10 @@ export const cloud_connector_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `cloud-connector_provider` in responses.
- */
-export const cloud_connector_provider_output: JsonSchema = {
-  "enum": [
-    "aws_s3",
-    "cloudflare_r2",
-    "gcp_storage",
-    "azure_storage",
-    "oci_storage"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cloud-connector_rule` in responses.
  */
-export const cloud_connector_rule_output: JsonSchema = {
+export const cloud$$connector_rule: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -132,7 +118,14 @@ export const cloud_connector_rule_output: JsonSchema = {
       "type": "object"
     },
     "provider": {
-      "$ref": "#/$defs/cloud-connector_provider"
+      "enum": [
+        "aws_s3",
+        "cloudflare_r2",
+        "gcp_storage",
+        "azure_storage",
+        "oci_storage"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -141,7 +134,7 @@ export const cloud_connector_rule_output: JsonSchema = {
 /**
  * The schema of `cloud-connector_rules` in responses.
  */
-export const cloud_connector_rules_output: JsonSchema = {
+export const cloud$$connector_rules: JsonSchema = {
   "items": {
     "$ref": "#/$defs/cloud-connector_rule"
   },
diff --git a/src/generated/forge-mcp/cloudConnector/rules/schemas.ts b/src/generated/forge-mcp/cloudConnector/rules/schemas.ts
index 8c43b61fa..91e199aa5 100644
--- a/src/generated/forge-mcp/cloudConnector/rules/schemas.ts
+++ b/src/generated/forge-mcp/cloudConnector/rules/schemas.ts
@@ -3,33 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `cloud-connector_identifier`.
- */
-export const cloud_connector_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `cloud-connector_provider`.
- */
-export const cloud_connector_provider: JsonSchema = {
-  "description": "Cloud Provider type",
-  "enum": [
-    "aws_s3",
-    "cloudflare_r2",
-    "gcp_storage",
-    "azure_storage",
-    "oci_storage"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cloud-connector_rule`.
  */
-export const cloud_connector_rule: JsonSchema = {
+export const cloud$$connector_rule: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -54,8 +31,15 @@ export const cloud_connector_rule: JsonSchema = {
       "type": "object"
     },
     "provider": {
-      "$ref": "#/$defs/cloud-connector_provider",
-      "description": "Cloud Provider type"
+      "description": "Cloud Provider type",
+      "enum": [
+        "aws_s3",
+        "cloudflare_r2",
+        "gcp_storage",
+        "azure_storage",
+        "oci_storage"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/cloudConnector/rules/tools.ts b/src/generated/forge-mcp/cloudConnector/rules/tools.ts
index 79a9ac9e5..546d2c1b9 100644
--- a/src/generated/forge-mcp/cloudConnector/rules/tools.ts
+++ b/src/generated/forge-mcp/cloudConnector/rules/tools.ts
@@ -3,41 +3,43 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cloud_connector_api_response_common_failure_output,
-  cloud_connector_api_response_common_output,
-  cloud_connector_messages_output,
-  cloud_connector_provider_output,
-  cloud_connector_rule_output,
-  cloud_connector_rules_output,
+  cloud$$connector_api$$response$$common,
+  cloud$$connector_api$$response$$common$$failure,
+  cloud$$connector_messages,
+  cloud$$connector_rule,
+  cloud$$connector_rules,
 } from "./outputs.js";
-import {
-  cloud_connector_identifier,
-  cloud_connector_provider,
-  cloud_connector_rule,
-} from "./schemas.js";
+import { cloud$$connector_rule as cloud$$connector_rule$ } from "./schemas.js";
 
 /**
- * The tools of `cloud_connector.rules`.
+ * The tools of `cloudConnector.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloud_connector_rules_list",
+    name: "cloudConnector_rules_list",
     title: "Rules",
-    description: "Retrieves the Cloud Connector rules configured for a zone. Rules define how traffic is routed to cloud services.",
+    description: "Retrieves the Cloud Connector rules configured for a zone. Rules define how traffic is routed to cloud services.\n\nGET /zones/{zone_id}/cloud_connector/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cloud-connector_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cloud-connector_identifier": cloud_connector_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -54,11 +56,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloud-connector_api-response-common": cloud_connector_api_response_common_output,
-        "cloud-connector_messages": cloud_connector_messages_output,
-        "cloud-connector_provider": cloud_connector_provider_output,
-        "cloud-connector_rule": cloud_connector_rule_output,
-        "cloud-connector_rules": cloud_connector_rules_output,
+        "cloud-connector_api-response-common": cloud$$connector_api$$response$$common,
+        "cloud-connector_messages": cloud$$connector_messages,
+        "cloud-connector_rule": cloud$$connector_rule,
+        "cloud-connector_rules": cloud$$connector_rules,
       },
     },
     annotations: {
@@ -107,12 +108,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloud-connector_api-response-common": cloud_connector_api_response_common_output,
-        "cloud-connector_api-response-common-failure": cloud_connector_api_response_common_failure_output,
-        "cloud-connector_messages": cloud_connector_messages_output,
-        "cloud-connector_provider": cloud_connector_provider_output,
-        "cloud-connector_rule": cloud_connector_rule_output,
-        "cloud-connector_rules": cloud_connector_rules_output,
+        "cloud-connector_api-response-common": cloud$$connector_api$$response$$common,
+        "cloud-connector_api-response-common-failure": cloud$$connector_api$$response$$common$$failure,
+        "cloud-connector_messages": cloud$$connector_messages,
+        "cloud-connector_rule": cloud$$connector_rule,
+        "cloud-connector_rules": cloud$$connector_rules,
       },
     },
     request: (args) => ({
@@ -120,9 +120,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloud_connector_rules_update",
+    name: "cloudConnector_rules_update",
     title: "Put Rules",
-    description: "Updates Cloud Connector rules for a zone, replacing the existing rule configuration.",
+    description: "Updates Cloud Connector rules for a zone, replacing the existing rule configuration.\n\nPUT /zones/{zone_id}/cloud_connector/rules",
     inputSchema: {
       type: "object",
       properties: {
@@ -132,19 +132,27 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cloud-connector_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloud-connector_identifier": cloud_connector_identifier,
-        "cloud-connector_provider": cloud_connector_provider,
-        "cloud-connector_rule": cloud_connector_rule,
+        "cloud-connector_rule": cloud$$connector_rule$,
       },
     },
     outputSchema: {
@@ -162,11 +170,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloud-connector_api-response-common": cloud_connector_api_response_common_output,
-        "cloud-connector_messages": cloud_connector_messages_output,
-        "cloud-connector_provider": cloud_connector_provider_output,
-        "cloud-connector_rule": cloud_connector_rule_output,
-        "cloud-connector_rules": cloud_connector_rules_output,
+        "cloud-connector_api-response-common": cloud$$connector_api$$response$$common,
+        "cloud-connector_messages": cloud$$connector_messages,
+        "cloud-connector_rule": cloud$$connector_rule,
+        "cloud-connector_rules": cloud$$connector_rules,
       },
     },
     annotations: {
@@ -214,12 +221,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloud-connector_api-response-common": cloud_connector_api_response_common_output,
-        "cloud-connector_api-response-common-failure": cloud_connector_api_response_common_failure_output,
-        "cloud-connector_messages": cloud_connector_messages_output,
-        "cloud-connector_provider": cloud_connector_provider_output,
-        "cloud-connector_rule": cloud_connector_rule_output,
-        "cloud-connector_rules": cloud_connector_rules_output,
+        "cloud-connector_api-response-common": cloud$$connector_api$$response$$common,
+        "cloud-connector_api-response-common-failure": cloud$$connector_api$$response$$common$$failure,
+        "cloud-connector_messages": cloud$$connector_messages,
+        "cloud-connector_rule": cloud$$connector_rule,
+        "cloud-connector_rules": cloud$$connector_rules,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/binaryStorage/tools.ts b/src/generated/forge-mcp/cloudforceOne/binaryStorage/tools.ts
index b74f05d15..7e20c2246 100644
--- a/src/generated/forge-mcp/cloudforceOne/binaryStorage/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/binaryStorage/tools.ts
@@ -4,29 +4,39 @@
 import { type Tool, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.binary_storage`.
+ * The tools of `cloudforceOne.binaryStorage`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_binary_storage_get",
+    name: "cloudforceOne_binaryStorage_get",
     title: "Retrieves a file from Binary Storage",
-    description: "Retrieves a binary file from the Cloudforce One binary storage for analysis.",
+    description: "Retrieves a binary file from the Cloudforce One binary storage for analysis.\n\nGET /accounts/{account_id}/cloudforce-one/binary/{hash}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "hash": {
-          "description": "hash of the binary",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "hash": {
+              "description": "hash of the binary",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hash"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hash"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/cloudforceOne/credentialMonitor/domains/tools.ts b/src/generated/forge-mcp/cloudforceOne/credentialMonitor/domains/tools.ts
index 9489c38b3..ab7c9fba9 100644
--- a/src/generated/forge-mcp/cloudforceOne/credentialMonitor/domains/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/credentialMonitor/domains/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.credential_monitor.domains`.
+ * The tools of `cloudforceOne.credentialMonitor.domains`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_credential_monitor_domains_create",
+    name: "cloudforceOne_credentialMonitor_domains_create",
     title: "Create monitored domain",
-    description: "Register a domain for credential monitoring.",
+    description: "Register a domain for credential monitoring.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/credential-monitor/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "domain": {
@@ -29,11 +25,25 @@ export const tools: readonly Tool[] = [
             "domain"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -173,25 +183,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_credential_monitor_domains_delete",
+    name: "cloudforceOne_credentialMonitor_domains_delete",
     title: "Delete monitored domain",
-    description: "Remove a domain from credential monitoring.",
+    description: "Remove a domain from credential monitoring.\n\nDELETE /accounts/{account_id}/cloudforce-one/v2/credential-monitor/domains/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "id": {
-          "description": "Domain ID",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            },
+            "id": {
+              "description": "Domain ID",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -314,30 +334,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_credential_monitor_domains_list",
+    name: "cloudforceOne_credentialMonitor_domains_list",
     title: "List monitored domains",
-    description: "List all domains registered for credential monitoring.",
+    description: "List all domains registered for credential monitoring.\n\nGET /accounts/{account_id}/cloudforce-one/v2/credential-monitor/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 100,
-          "description": "Items per page",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Items per page",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -507,8 +543,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/credential-monitor/domains`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/credentialMonitor/matches/tools.ts b/src/generated/forge-mcp/cloudforceOne/credentialMonitor/matches/tools.ts
index 3557b8188..029c57a2a 100644
--- a/src/generated/forge-mcp/cloudforceOne/credentialMonitor/matches/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/credentialMonitor/matches/tools.ts
@@ -1,45 +1,61 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.credential_monitor.matches`.
+ * The tools of `cloudforceOne.credentialMonitor.matches`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_credential_monitor_matches_list",
+    name: "cloudforceOne_credentialMonitor_matches_list",
     title: "List credential matches",
-    description: "Get credential matches for the account's monitored domains.",
+    description: "Get credential matches for the account's monitored domains.\n\nGET /accounts/{account_id}/cloudforce-one/v2/credential-monitor/matches",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "domain": {
-          "description": "Filter by domain (exact match)",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Items per page",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "username": {
-          "description": "Filter by username (partial match)",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "domain": {
+              "description": "Filter by domain (exact match)",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Items per page",
+              "type": "integer"
+            },
+            "username": {
+              "description": "Filter by username (partial match)",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -217,10 +233,10 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/credential-monitor/matches`,
       query: [
-        ["domain", args["domain"], true],
-        ["username", args["username"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["domain", param(args, "query", "domain"), true],
+        ["username", param(args, "query", "username"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/constants/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/constants/tools.ts
index 8cb23b33e..a9ce09645 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/constants/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/constants/tools.ts
@@ -4,23 +4,33 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence.constants`.
+ * The tools of `cloudforceOne.priorityIntelligence.constants`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_constants_get",
+    name: "cloudforceOne_priorityIntelligence_constants_get",
     title: "Get PIR constants (methods, dimensions, and TLP values)",
-    description: "Requirements is the existing free-form PIR method. Interests is the experimental structured-interest method, evaluated independently from requirements.",
+    description: "Requirements is the existing free-form PIR method. Interests is the experimental structured-interest method, evaluated independently from requirements.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/constants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/filters/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/filters/tools.ts
index 84f72bdd8..099c1bd8d 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/filters/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/filters/tools.ts
@@ -4,19 +4,16 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence.filters`.
+ * The tools of `cloudforceOne.priorityIntelligence.filters`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_filters_generate",
+    name: "cloudforceOne_priorityIntelligence_filters_generate",
     title: "Generate event filters from a PIR",
-    description: "Translates a natural-language Priority Intelligence Requirement into Threat Events `searchBranches` with Workers AI. Terms that cannot be expressed as event filters are returned in `unresolved_terms`. Nothing is stored or executed.",
+    description: "Translates a natural-language Priority Intelligence Requirement into Threat Events `searchBranches` with Workers AI. Terms that cannot be expressed as event filters are returned in `unresolved_terms`. Nothing is stored or executed.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/filters/generate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "requirement": {
@@ -28,11 +25,24 @@ export const tools: readonly Tool[] = [
             "requirement"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/backtests/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/backtests/tools.ts
index 6ea8d5f65..11eb92a93 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/backtests/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/backtests/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence.interests.backtests`.
+ * The tools of `cloudforceOne.priorityIntelligence.interests.backtests`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_interests_backtests_create",
+    name: "cloudforceOne_priorityIntelligence_interests_backtests_create",
     title: "Backtest account-interest change detection",
-    description: "Uses bounded full-span top-N candidates and daily event-date buckets. Results are conservative rather than an exact historical replay.",
+    description: "Uses bounded full-span top-N candidates and daily event-date buckets. Results are conservative rather than an exact historical replay.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/interests/backtests",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "as_of": {
@@ -64,11 +60,25 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -96,26 +106,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_interests_backtests_get",
+    name: "cloudforceOne_priorityIntelligence_interests_backtests_get",
     title: "Get a persisted account-interest backtest",
-    description: "Returns a previously completed account-interest backtest by ID. The backtest must belong to this account.",
+    description: "Returns a previously completed account-interest backtest by ID. The backtest must belong to this account.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/interests/backtests/{backtest_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "backtest_id": {
-          "description": "Backtest UUID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            },
+            "backtest_id": {
+              "description": "Backtest UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "backtest_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "backtest_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/evaluations/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/evaluations/tools.ts
index fd9c7dc2f..5dde7fcef 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/evaluations/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/evaluations/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence.interests.evaluations`.
+ * The tools of `cloudforceOne.priorityIntelligence.interests.evaluations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_interests_evaluations_create",
+    name: "cloudforceOne_priorityIntelligence_interests_evaluations_create",
     title: "Evaluate recent event-dated changes for account interests",
-    description: "Compares the trailing event-date window with the preceding window. Results are precision-gated to enabled account interests. Late ingestion can cause an older event to appear in a later evaluation, so results describe changes in event-dated intelligence rather than exact adversary-activity timing.",
+    description: "Compares the trailing event-date window with the preceding window. Results are precision-gated to enabled account interests. Late ingestion can cause an older event to appear in a later evaluation, so results describe changes in event-dated intelligence rather than exact adversary-activity timing.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/interests/evaluations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "as_of": {
@@ -60,11 +56,25 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -92,26 +102,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_interests_evaluations_get",
+    name: "cloudforceOne_priorityIntelligence_interests_evaluations_get",
     title: "Get a persisted account-interest evaluation",
-    description: "Returns a previously completed live account-interest evaluation by ID. The evaluation must belong to this account.",
+    description: "Returns a previously completed live account-interest evaluation by ID. The evaluation must belong to this account.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/interests/evaluations/{evaluation_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "evaluation_id": {
-          "description": "Evaluation UUID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            },
+            "evaluation_id": {
+              "description": "Evaluation UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "evaluation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "evaluation_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/tools.ts
index a8d882770..1c03f4b30 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/interests/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence.interests`.
+ * The tools of `cloudforceOne.priorityIntelligence.interests`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_interests_create",
+    name: "cloudforceOne_priorityIntelligence_interests_create",
     title: "Create an account interest for PIR Option 2",
-    description: "Creates a structured account interest used by Priority Intelligence Option 2 evaluations. Interests are evaluated independently from free-form PIR requirements.",
+    description: "Creates a structured account interest used by Priority Intelligence Option 2 evaluations. Interests are evaluated independently from free-form PIR requirements.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/interests",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "dimension": {
@@ -47,11 +43,25 @@ export const tools: readonly Tool[] = [
             "value"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -80,26 +90,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_interests_delete",
+    name: "cloudforceOne_priorityIntelligence_interests_delete",
     title: "Delete an account interest for PIR Option 2",
-    description: "Deletes a structured account interest so later Priority Intelligence Option 2 evaluations no longer include it.",
+    description: "Deletes a structured account interest so later Priority Intelligence Option 2 evaluations no longer include it.\n\nDELETE /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/interests/{interest_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "interest_id": {
-          "description": "Interest UUID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            },
+            "interest_id": {
+              "description": "Interest UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "interest_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "interest_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -126,35 +146,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_interests_list",
+    name: "cloudforceOne_priorityIntelligence_interests_list",
     title: "List account interests for PIR Option 2",
-    description: "Lists structured account interests for Priority Intelligence Option 2. Filter by enabled state and paginate results.",
+    description: "Lists structured account interests for Priority Intelligence Option 2. Filter by enabled state and paginate results.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/interests",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "enabled": {
-          "enum": [
-            "true",
-            "false"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -180,23 +216,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/priority-intelligence/interests`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["enabled", args["enabled"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["enabled", param(args, "query", "enabled"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_interests_update",
+    name: "cloudforceOne_priorityIntelligence_interests_update",
     title: "Update an account interest for PIR Option 2",
-    description: "Updates a structured account interest used by Priority Intelligence Option 2 evaluations. Changing the value re-resolves the interest against the current catalog.",
+    description: "Updates a structured account interest used by Priority Intelligence Option 2 evaluations. Changing the value re-resolves the interest against the current catalog.\n\nPATCH /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/interests/{interest_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "enabled": {
@@ -208,16 +240,30 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "interest_id": {
-          "description": "Interest UUID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            },
+            "interest_id": {
+              "description": "Interest UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "interest_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "interest_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/matches/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/matches/tools.ts
index bfca5b117..3b0a371f0 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/matches/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/matches/tools.ts
@@ -1,64 +1,83 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence.matches`.
+ * The tools of `cloudforceOne.priorityIntelligence.matches`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_matches_aggregate",
+    name: "cloudforceOne_priorityIntelligence_matches_aggregate",
     title: "Count a priority intelligence requirement's matched events",
-    description: "Counts the PIR's matches by tag, attacker, attacker country, target industry, primary indicator, or indicator type: the top values, the number of distinct values, and the matches without a value. Covers the same matches as the matches list, in datasets the account can read now. Tags are grouped case-insensitively and shown with their most common spelling; an event counts once for each of its tags. `indicator` is the first indicator each event was created with. Field values are copied when an event matches; matches still being copied are reported in `matches.pending` and not counted, and matches whose event was already gone when its fields were copied in `matches.missing`. Counts keep the copied values, so an event deleted later stays counted. Requires the Threat Events entitlement.",
+    description: "Counts the PIR's matches by tag, attacker, attacker country, target industry, primary indicator, or indicator type: the top values, the number of distinct values, and the matches without a value. Covers the same matches as the matches list, in datasets the account can read now. Tags are grouped case-insensitively and shown with their most common spelling; an event counts once for each of its tags. `indicator` is the first indicator each event was created with. Field values are copied when an event matches; matches still being copied are reported in `matches.pending` and not counted, and matches whose event was already gone when its fields were copied in `matches.missing`. Counts keep the copied values, so an event deleted later stays counted. Requires the Threat Events entitlement.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/{priority_id}/matches/aggregate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "aggregate_by": {
-          "description": "Comma-separated fields to count: tags, attacker, attacker_country, target_industry, indicator, indicator_type. `indicator` is each event's primary indicator, the first one it was created with.",
-          "type": "string"
-        },
-        "include_backfill": {
-          "default": "true",
-          "description": "Include matches from the 30 days before activation. Defaults to true.",
-          "enum": [
-            "true",
-            "false"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "priority_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "priority_id"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 10,
-          "description": "Top values returned per field.",
-          "type": "integer"
-        },
-        "priority_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "since": {
-          "description": "Only matches first matched at or after this ISO 8601 time.",
-          "format": "date-time",
-          "type": "string"
+          "type": "object"
         },
-        "triage_state": {
-          "description": "Only matches in this triage state.",
-          "enum": [
-            "new",
-            "relevant",
-            "not_relevant"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggregate_by": {
+              "description": "Comma-separated fields to count: tags, attacker, attacker_country, target_industry, indicator, indicator_type. `indicator` is each event's primary indicator, the first one it was created with.",
+              "type": "string"
+            },
+            "include_backfill": {
+              "default": "true",
+              "description": "Include matches from the 30 days before activation. Defaults to true.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 10,
+              "description": "Top values returned per field.",
+              "type": "integer"
+            },
+            "since": {
+              "description": "Only matches first matched at or after this ISO 8601 time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "triage_state": {
+              "description": "Only matches in this triage state.",
+              "enum": [
+                "new",
+                "relevant",
+                "not_relevant"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "aggregate_by"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "priority_id",
-        "aggregate_by"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -567,61 +586,80 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/priority-intelligence/${pathParam(args, "priority_id")}/matches/aggregate`,
       query: [
-        ["aggregate_by", args["aggregate_by"], true],
-        ["limit", args["limit"], true],
-        ["since", args["since"], true],
-        ["triage_state", args["triage_state"], true],
-        ["include_backfill", args["include_backfill"], true],
+        ["aggregate_by", param(args, "query", "aggregate_by"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["since", param(args, "query", "since"), true],
+        ["triage_state", param(args, "query", "triage_state"), true],
+        ["include_backfill", param(args, "query", "include_backfill"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_matches_aggregate_all",
+    name: "cloudforceOne_priorityIntelligence_matches_aggregateAll",
     title: "Count matched events across the account's priority intelligence requirements",
-    description: "Returns each active PIR's match counts, with the same fields and filters as a single PIR's aggregate, and the number of distinct values of each field across all of them, each value counted once. Counts are not summed across PIRs: an event can match several PIRs. Drafts are left out; PIRs the matcher paused are included. A PIR whose matches cannot be counted is returned with `error` and left out of `combined`. Requires the Threat Events entitlement.",
+    description: "Returns each active PIR's match counts, with the same fields and filters as a single PIR's aggregate, and the number of distinct values of each field across all of them, each value counted once. Counts are not summed across PIRs: an event can match several PIRs. Drafts are left out; PIRs the matcher paused are included. A PIR whose matches cannot be counted is returned with `error` and left out of `combined`. Requires the Threat Events entitlement.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/matches/aggregate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "aggregate_by": {
-          "description": "Comma-separated fields to count: tags, attacker, attacker_country, target_industry, indicator, indicator_type. `indicator` is each event's primary indicator, the first one it was created with.",
-          "type": "string"
-        },
-        "include_backfill": {
-          "default": "true",
-          "description": "Include matches from the 30 days before activation. Defaults to true.",
-          "enum": [
-            "true",
-            "false"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 10,
-          "description": "Top values returned per field.",
-          "type": "integer"
-        },
-        "since": {
-          "description": "Only matches first matched at or after this ISO 8601 time.",
-          "format": "date-time",
-          "type": "string"
+          "type": "object"
         },
-        "triage_state": {
-          "description": "Only matches in this triage state.",
-          "enum": [
-            "new",
-            "relevant",
-            "not_relevant"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggregate_by": {
+              "description": "Comma-separated fields to count: tags, attacker, attacker_country, target_industry, indicator, indicator_type. `indicator` is each event's primary indicator, the first one it was created with.",
+              "type": "string"
+            },
+            "include_backfill": {
+              "default": "true",
+              "description": "Include matches from the 30 days before activation. Defaults to true.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 10,
+              "description": "Top values returned per field.",
+              "type": "integer"
+            },
+            "since": {
+              "description": "Only matches first matched at or after this ISO 8601 time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "triage_state": {
+              "description": "Only matches in this triage state.",
+              "enum": [
+                "new",
+                "relevant",
+                "not_relevant"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "aggregate_by"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "aggregate_by"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1513,51 +1551,67 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/priority-intelligence/matches/aggregate`,
       query: [
-        ["aggregate_by", args["aggregate_by"], true],
-        ["limit", args["limit"], true],
-        ["since", args["since"], true],
-        ["triage_state", args["triage_state"], true],
-        ["include_backfill", args["include_backfill"], true],
+        ["aggregate_by", param(args, "query", "aggregate_by"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["since", param(args, "query", "since"), true],
+        ["triage_state", param(args, "query", "triage_state"), true],
+        ["include_backfill", param(args, "query", "include_backfill"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_matches_list",
+    name: "cloudforceOne_priorityIntelligence_matches_list",
     title: "List a priority intelligence requirement's matched events",
-    description: "Returns the events matched by the PIR's query, newest match first. Each item has the Event List event fields plus the match fields. Only datasets the account can read now are included, and deleted events are left out, so a page can hold fewer items than `per_page` while `result_info.cursor` is still set. `backfill` matches came from the 30 days before the PIR was activated or its query changed and are never notified. `delivered` matches were included in a digest that the notification service accepted; who receives it depends on the account's notification policies for the PIR. Requires the Threat Events entitlement.",
+    description: "Returns the events matched by the PIR's query, newest match first. Each item has the Event List event fields plus the match fields. Only datasets the account can read now are included, and deleted events are left out, so a page can hold fewer items than `per_page` while `result_info.cursor` is still set. `backfill` matches came from the 30 days before the PIR was activated or its query changed and are never notified. `delivered` matches were included in a digest that the notification service accepted; who receives it depends on the account's notification policies for the PIR. Requires the Threat Events entitlement.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/{priority_id}/matches",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "cursor": {
-          "description": "`result_info.cursor` from the previous page. Omit for the newest matches.",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 50,
-          "description": "Matches per page.",
-          "type": "integer"
-        },
-        "priority_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "triage_state": {
-          "description": "Only matches in this triage state.",
-          "enum": [
-            "new",
-            "relevant",
-            "not_relevant"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "priority_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "priority_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "`result_info.cursor` from the previous page. Omit for the newest matches.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Matches per page.",
+              "type": "integer"
+            },
+            "triage_state": {
+              "description": "Only matches in this triage state.",
+              "enum": [
+                "new",
+                "relevant",
+                "not_relevant"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "priority_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -1585,59 +1639,75 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/priority-intelligence/${pathParam(args, "priority_id")}/matches`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["triage_state", args["triage_state"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["triage_state", param(args, "query", "triage_state"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_matches_series",
+    name: "cloudforceOne_priorityIntelligence_matches_series",
     title: "Count a priority intelligence requirement's matched events per day",
-    description: "Returns the PIR's matches per UTC day of when each matched event was added to its dataset, over the same matches as the matches list, in datasets the account can read now. Every day in the range is listed, including days with no matches. The range defaults to the last 30 days and is at most 90 days, because matches are kept for 90 days. Days before the PIR was activated hold only the most recent backfill matches. Requires the Threat Events entitlement.",
+    description: "Returns the PIR's matches per UTC day of when each matched event was added to its dataset, over the same matches as the matches list, in datasets the account can read now. Every day in the range is listed, including days with no matches. The range defaults to the last 30 days and is at most 90 days, because matches are kept for 90 days. Days before the PIR was activated hold only the most recent backfill matches. Requires the Threat Events entitlement.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/{priority_id}/matches/series",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "include_backfill": {
-          "default": "true",
-          "description": "Include matches from the 30 days before activation. Defaults to true.",
-          "enum": [
-            "true",
-            "false"
-          ],
-          "type": "string"
-        },
-        "priority_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "since": {
-          "description": "Start of the range, inclusive, on when each matched event was added to its dataset. ISO 8601; defaults to 30 days before `until`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "triage_state": {
-          "description": "Only matches in this triage state.",
-          "enum": [
-            "new",
-            "relevant",
-            "not_relevant"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "priority_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "priority_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "until": {
-          "description": "End of the range, exclusive. ISO 8601; defaults to now. The range is at most 90 days.",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_backfill": {
+              "default": "true",
+              "description": "Include matches from the 30 days before activation. Defaults to true.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "since": {
+              "description": "Start of the range, inclusive, on when each matched event was added to its dataset. ISO 8601; defaults to 30 days before `until`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "triage_state": {
+              "description": "Only matches in this triage state.",
+              "enum": [
+                "new",
+                "relevant",
+                "not_relevant"
+              ],
+              "type": "string"
+            },
+            "until": {
+              "description": "End of the range, exclusive. ISO 8601; defaults to now. The range is at most 90 days.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "priority_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1766,23 +1836,20 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/priority-intelligence/${pathParam(args, "priority_id")}/matches/series`,
       query: [
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["triage_state", args["triage_state"], true],
-        ["include_backfill", args["include_backfill"], true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["triage_state", param(args, "query", "triage_state"), true],
+        ["include_backfill", param(args, "query", "include_backfill"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_matches_update",
+    name: "cloudforceOne_priorityIntelligence_matches_update",
     title: "Triage a priority intelligence requirement's matched events",
-    description: "Sets `triage_state` (`new`, `relevant`, or `not_relevant`) on up to 100 matches. Matches that do not exist, or are in datasets the account can no longer read, are returned in `not_found`. Setting `new` clears `triaged_at` and `triaged_by`. Requires the Threat Events entitlement.",
+    description: "Sets `triage_state` (`new`, `relevant`, or `not_relevant`) on up to 100 matches. Matches that do not exist, or are in datasets the account can no longer read, are returned in `not_found`. Setting `new` clears `triaged_at` and `triaged_by`. Requires the Threat Events entitlement.\n\nPATCH /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/{priority_id}/matches",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "matches": {
@@ -1825,15 +1892,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "priority_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "priority_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "priority_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "priority_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/profile/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/profile/tools.ts
index be1ddc654..cb0de5fb4 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/profile/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/profile/tools.ts
@@ -4,23 +4,33 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence.profile`.
+ * The tools of `cloudforceOne.priorityIntelligence.profile`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_profile_delete",
+    name: "cloudforceOne_priorityIntelligence_profile_delete",
     title: "Delete the organization profile",
-    description: "Deletes the account's organization profile. Succeeds when the account has no profile.",
+    description: "Deletes the account's organization profile. Succeeds when the account has no profile.\n\nDELETE /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -48,19 +58,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_profile_get",
+    name: "cloudforceOne_priorityIntelligence_profile_get",
     title: "Get the organization profile",
-    description: "Returns the account's organization profile, which all of its Priority Intelligence Requirements share to judge how relevant intelligence is to the organization. `result` is null when the account has no profile.",
+    description: "Returns the account's organization profile, which all of its Priority Intelligence Requirements share to judge how relevant intelligence is to the organization. `result` is null when the account has no profile.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -89,15 +109,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_profile_update",
+    name: "cloudforceOne_priorityIntelligence_profile_update",
     title: "Create or replace the organization profile",
-    description: "Creates or replaces the account's organization profile: who the organization is, such as its name, brands, domains, sector, regions, key systems and suppliers. All of the account's Priority Intelligence Requirements share it. An account has at most one profile, and it does not count against the PIR quota.",
+    description: "Creates or replaces the account's organization profile: who the organization is, such as its name, brands, domains, sector, regions, key systems and suppliers. All of the account's Priority Intelligence Requirements share it. An account has at most one profile, and it does not count against the PIR quota.\n\nPUT /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "profile": {
@@ -109,11 +126,24 @@ export const tools: readonly Tool[] = [
             "profile"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/quota/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/quota/tools.ts
index b7b3e98c3..619cf72b5 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/quota/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/quota/tools.ts
@@ -4,23 +4,33 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence.quota`.
+ * The tools of `cloudforceOne.priorityIntelligence.quota`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_quota_create",
+    name: "cloudforceOne_priorityIntelligence_quota_create",
     title: "Get PIR quota for an account",
-    description: "Returns the account's PIR quota. `quota` and `remaining` count active PIRs against the entitlement limit; moving a PIR to draft or deleting it frees its slot. `total_quota` and `total_remaining` count every PIR, drafts included, against five times the limit. Anniversary dates are informational.",
+    description: "Returns the account's PIR quota. `quota` and `remaining` count active PIRs against the entitlement limit; moving a PIR to draft or deleting it frees its slot. `total_quota` and `total_remaining` count every PIR, drafts included, against five times the limit. Anniversary dates are informational.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/quota",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/tools.ts b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/tools.ts
index abf409e57..b58c412d9 100644
--- a/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/priorityIntelligence/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.priority_intelligence`.
+ * The tools of `cloudforceOne.priorityIntelligence`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_priority_intelligence_create",
+    name: "cloudforceOne_priorityIntelligence_create",
     title: "Create a priority intelligence requirement",
-    description: "Creates a new PIR for the account. The cfone.priority_intelligence_requirement_limit entitlement sets how many PIRs can be active; drafts do not count, but the account can hold at most five times that many PIRs in total. An active PIR requires a query.",
+    description: "Creates a new PIR for the account. The cfone.priority_intelligence_requirement_limit entitlement sets how many PIRs can be active; drafts do not count, but the account can hold at most five times that many PIRs in total. An active PIR requires a query.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/priority-intelligence",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "dataset_scope": {
@@ -510,11 +507,24 @@ export const tools: readonly Tool[] = [
             "requirement"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -545,24 +555,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_delete",
+    name: "cloudforceOne_priorityIntelligence_delete",
     title: "Delete a priority intelligence requirement",
-    description: "Soft-deletes a PIR. The PIR will no longer count against quota.",
+    description: "Soft-deletes a PIR. The PIR will no longer count against quota.\n\nDELETE /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/{priority_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "priority_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "priority_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "priority_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "priority_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -590,24 +610,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_get",
+    name: "cloudforceOne_priorityIntelligence_get",
     title: "Get a priority intelligence requirement by ID",
-    description: "Returns a single free-form Priority Intelligence Requirement for the authenticated account.",
+    description: "Returns a single free-form Priority Intelligence Requirement for the authenticated account.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/{priority_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "priority_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "priority_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "priority_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "priority_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -636,27 +666,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_list",
+    name: "cloudforceOne_priorityIntelligence_list",
     title: "List priority intelligence requirements for an account",
-    description: "Lists free-form Priority Intelligence Requirements for the account. Results are scoped to the authenticated account.",
+    description: "Lists free-form Priority Intelligence Requirements for the account. Results are scoped to the authenticated account.\n\nGET /accounts/{account_id}/cloudforce-one/v2/priority-intelligence",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -683,21 +729,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/priority-intelligence`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_priority_intelligence_update",
+    name: "cloudforceOne_priorityIntelligence_update",
     title: "Update a priority intelligence requirement",
-    description: "Updates a Priority Intelligence Requirement for the authenticated account. Changing the query increments its version; editing the requirement without saving a query marks the query stale. Activating a draft needs a free slot in the active PIR quota; setting `active` on a PIR the matcher paused resumes it without one.",
+    description: "Updates a Priority Intelligence Requirement for the authenticated account. Changing the query increments its version; editing the requirement without saving a query marks the query stale. Activating a draft needs a free slot in the active PIR quota; setting `active` on a PIR the matcher paused resumes it without one.\n\nPUT /accounts/{account_id}/cloudforce-one/v2/priority-intelligence/{priority_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "confirm_query": {
@@ -1222,15 +1265,28 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "priority_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "priority_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "priority_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "priority_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/assets/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/assets/tools.ts
index 79ba2408a..3b0b2578c 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/assets/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/assets/tools.ts
@@ -4,53 +4,63 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests.assets`.
+ * The tools of `cloudforceOne.requests.assets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_assets_download",
+    name: "cloudforceOne_requests_assets_download",
     title: "Download asset (Customer)",
-    description: "Download a file asset from R2 storage. Customer can only download from their own account.",
+    description: "Download a file asset from R2 storage. Customer can only download from their own account.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}/assets/{asset_id}/download",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "asset_id": {
-          "description": "Asset UUID",
-          "type": "string"
-        },
-        "project_type": {
-          "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "asset_id": {
+              "description": "Asset UUID",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            },
+            "request_id": {
+              "description": "RFI UUID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id",
+            "asset_id"
           ],
-          "type": "string"
-        },
-        "request_id": {
-          "description": "RFI UUID",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id",
-        "asset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -79,44 +89,54 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_requests_assets_list",
+    name: "cloudforceOne_requests_assets_list",
     title: "List assets in request (Customer)",
-    description: "List all file assets for a request. Customer can only list assets from their own account.",
+    description: "List all file assets for a request. Customer can only list assets from their own account.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}/assets/list",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "project_type": {
-          "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            },
+            "request_id": {
+              "description": "RFI UUID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id"
           ],
-          "type": "string"
-        },
-        "request_id": {
-          "description": "RFI UUID",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -683,44 +703,54 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_requests_assets_upload",
+    name: "cloudforceOne_requests_assets_upload",
     title: "Upload asset to request (Customer)",
-    description: "Upload a file asset to R2 storage and associate it with a request. Customer can only upload to their own account.",
+    description: "Upload a file asset to R2 storage and associate it with a request. Customer can only upload to their own account.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}/assets/upload",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "project_type": {
-          "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            },
+            "request_id": {
+              "description": "RFI UUID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id"
           ],
-          "type": "string"
-        },
-        "request_id": {
-          "description": "RFI UUID",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/constants/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/constants/tools.ts
index c6cdaa4d2..c433fe80a 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/constants/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/constants/tools.ts
@@ -4,43 +4,53 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests.constants`.
+ * The tools of `cloudforceOne.requests.constants`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_constants_get",
+    name: "cloudforceOne_requests_constants_get",
     title: "Get request constants",
-    description: "Returns available priorities, statuses, and TLP levels for request workflows",
+    description: "Returns available priorities, statuses, and TLP levels for request workflows\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/constants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "project_type": {
-          "description": "Project type",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "Project type",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/legalResponse/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/legalResponse/tools.ts
index 73187b7ab..e9ff3cd90 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/legalResponse/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/legalResponse/tools.ts
@@ -4,24 +4,34 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests.legal_response`.
+ * The tools of `cloudforceOne.requests.legalResponse`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_legal_response_access_check",
+    name: "cloudforceOne_requests_legalResponse_accessCheck",
     title: "Check if current user is allowlisted for Legal Response",
-    description: "Returns whether the JWT-authenticated user's email is on the legal-response allowlist. This endpoint is purely informational for UI gating; actual access enforcement is performed by `legalResponseMiddleware` on real legal-response endpoints. Read-only — no Durable Object writes are performed.",
+    description: "Returns whether the JWT-authenticated user's email is on the legal-response allowlist. This endpoint is purely informational for UI gating; actual access enforcement is performed by `legalResponseMiddleware` on real legal-response endpoints. Read-only — no Durable Object writes are performed.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/legal-response/access-check",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID (used for JWT validation only)",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID (used for JWT validation only)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/messages/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/messages/tools.ts
index 0f1942726..ab81d4a26 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/messages/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/messages/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests.messages`.
+ * The tools of `cloudforceOne.requests.messages`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_messages_create",
+    name: "cloudforceOne_requests_messages_create",
     title: "Create a customer follow-on message on an RFI request",
-    description: "Creates a customer dashboard message on an RFI request. Messages are always published on send. Workflow-enabled projects require Idempotency-Key and atomically record message activity and any policy transition. For token-billed project types, substantive follow-on messages consume message tokens and are subject to quarterly quota enforcement.",
+    description: "Creates a customer dashboard message on an RFI request. Messages are always published on send. Workflow-enabled projects require Idempotency-Key and atomically record message activity and any policy transition. For token-billed project types, substantive follow-on messages consume message tokens and are subject to quarterly quota enforcement.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}/messages/new",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "attachment_asset_ids": {
@@ -56,29 +53,48 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "idempotency_key": {
-          "description": "Client command key. Required when publishing a message for a workflow-enabled project; trimmed and limited to 255 characters.",
-          "oneOf": [
-            {
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Idempotency-Key": {
+              "description": "Client command key. Required when publishing a message for a workflow-enabled project; trimmed and limited to 255 characters.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
               "type": "string"
             },
-            {
-              "type": "null"
+            "project_type": {
+              "type": "string"
+            },
+            "request_id": {
+              "type": "string"
             }
-          ]
-        },
-        "project_type": {
-          "type": "string"
-        },
-        "request_id": {
-          "type": "string"
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -315,37 +331,47 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/requests/${pathParam(args, "project_type")}/${pathParam(args, "request_id")}/messages/new`,
       headers: [
-        ["Idempotency-Key", args["idempotency_key"]],
+        ["Idempotency-Key", param(args, "headers", "Idempotency-Key")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "cloudforce_one_requests_messages_get",
+    name: "cloudforceOne_requests_messages_get",
     title: "Read a single message for an RFI request",
-    description: "Returns the details for a specific message belonging to an RFI request.",
+    description: "Returns the details for a specific message belonging to an RFI request.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}/messages/{message_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "message_id": {
-          "type": "string"
-        },
-        "project_type": {
-          "type": "string"
-        },
-        "request_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "message_id": {
+              "type": "string"
+            },
+            "project_type": {
+              "type": "string"
+            },
+            "request_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id",
+            "message_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id",
-        "message_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -583,35 +609,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_requests_messages_list",
+    name: "cloudforceOne_requests_messages_list",
     title: "List messages for an RFI request",
-    description: "Retrieves the published, non-deleted messages visible to the agent for an RFI request, with pagination.",
+    description: "Retrieves the published, non-deleted messages visible to the agent for an RFI request, with pagination.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}/messages",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": "1",
-          "type": "string"
-        },
-        "per_page": {
-          "default": "10",
-          "type": "string"
-        },
-        "project_type": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "project_type": {
+              "type": "string"
+            },
+            "request_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id"
+          ],
+          "type": "object"
         },
-        "request_id": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": "1",
+              "type": "string"
+            },
+            "per_page": {
+              "default": "10",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -917,21 +959,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/requests/${pathParam(args, "project_type")}/${pathParam(args, "request_id")}/messages`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_requests_messages_update",
+    name: "cloudforceOne_requests_messages_update",
     title: "Update/publish a message for an RFI request",
-    description: "Updates an existing message, typically to publish a draft by setting publish=true. Workflow-enabled publication requires Idempotency-Key and atomically records message activity and any policy transition.",
+    description: "Updates an existing message, typically to publish a draft by setting publish=true. Workflow-enabled publication requires Idempotency-Key and atomically records message activity and any policy transition.\n\nPUT /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}/messages/{message_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "attachment_asset_ids": {
@@ -965,33 +1004,52 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "idempotency_key": {
-          "description": "Client command key. Required when publishing a message for a workflow-enabled project; trimmed and limited to 255 characters.",
-          "oneOf": [
-            {
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Idempotency-Key": {
+              "description": "Client command key. Required when publishing a message for a workflow-enabled project; trimmed and limited to 255 characters.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
               "type": "string"
             },
-            {
-              "type": "null"
+            "message_id": {
+              "type": "string"
+            },
+            "project_type": {
+              "type": "string"
+            },
+            "request_id": {
+              "type": "string"
             }
-          ]
-        },
-        "message_id": {
-          "type": "string"
-        },
-        "project_type": {
-          "type": "string"
-        },
-        "request_id": {
-          "type": "string"
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id",
+            "message_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id",
-        "message_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1244,7 +1302,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/requests/${pathParam(args, "project_type")}/${pathParam(args, "request_id")}/messages/${pathParam(args, "message_id")}`,
       headers: [
-        ["Idempotency-Key", args["idempotency_key"]],
+        ["Idempotency-Key", param(args, "headers", "Idempotency-Key")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/metadata/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/metadata/tools.ts
index bb47c1a1f..f4dabf773 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/metadata/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/metadata/tools.ts
@@ -1,54 +1,70 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests.metadata`.
+ * The tools of `cloudforceOne.requests.metadata`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_metadata_list",
+    name: "cloudforceOne_requests_metadata_list",
     title: "List metadata fields for an RFI type",
-    description: "Get custom metadata fields available for the specified project type",
+    description: "Get custom metadata fields available for the specified project type\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/metadata",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "country": {
-          "description": "Exclude fields restricted for this alpha-2 country code",
-          "type": "string"
-        },
-        "project_type": {
-          "description": "Project type",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "Project type",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "request_type": {
-          "description": "Filter fields to those applicable to this request type. Fields without request type restrictions are always included.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "country": {
+              "description": "Exclude fields restricted for this alpha-2 country code",
+              "type": "string"
+            },
+            "request_type": {
+              "description": "Filter fields to those applicable to this request type. Fields without request type restrictions are always included.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -455,8 +471,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/requests/${pathParam(args, "project_type")}/metadata`,
       query: [
-        ["request_type", args["request_type"], true],
-        ["country", args["country"], true],
+        ["request_type", param(args, "query", "request_type"), true],
+        ["country", param(args, "query", "country"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/quota/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/quota/tools.ts
index 96a30d78a..3c8b19f93 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/quota/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/quota/tools.ts
@@ -4,43 +4,53 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests.quota`.
+ * The tools of `cloudforceOne.requests.quota`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_quota_get",
+    name: "cloudforceOne_requests_quota_get",
     title: "Get request token quota",
-    description: "Returns the account's token quota for the current anniversary quarter: total granted, used, remaining, and the quarter/anniversary boundaries.",
+    description: "Returns the account's token quota for the current anniversary quarter: total granted, used, remaining, and the quarter/anniversary boundaries.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/quota",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "project_type": {
-          "description": "RFI project type",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/tools.ts
index 2ada6c457..44f45a289 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/tools.ts
@@ -1,98 +1,114 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests`.
+ * The tools of `cloudforceOne.requests`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_get_request_list",
+    name: "cloudforceOne_requests_getRequestList",
     title: "List RFIs",
-    description: "Retrieves a paginated list of RFIs with filtering and sorting options.",
+    description: "Retrieves a paginated list of RFIs with filtering and sorting options.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "assignee": {
-          "type": "string"
-        },
-        "created_by": {
-          "description": "Filter by creator email. NOTE: For the `legal-response` project type this query parameter is **rejected with HTTP 400** — the server derives the filter from the authenticated user's JWT automatically and does not accept a client-supplied value. Requests to `legal-response` with no valid JWT identity are rejected with HTTP 401.",
-          "type": "string"
-        },
-        "filter_account_id": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "metadata": {
-          "description": "JSON string object of metadata filters. Supports two formats: 1) Simple values for exact match (backward compatible): {\"status\": \"open\"} 2) Operator objects for advanced filtering: {\"identifiers\": {\"operator\": \"contains_line\", \"value\": \"blah.com\"}}. Available operators: 'eq' (exact match, default), 'contains' (substring match), 'contains_line' (match complete line in newline-separated text). Date fields are automatically normalized to YYYY-MM-DD format.",
-          "type": "string"
-        },
-        "order": {
-          "type": "string"
-        },
-        "order_by": {
-          "description": "Sort field. SOC Communications support customer-safe latest_activity ordering.",
-          "type": "string"
-        },
-        "page": {
-          "type": "number"
-        },
-        "page_size": {
-          "type": "number"
-        },
-        "priority": {
-          "type": "string"
-        },
-        "project_type": {
-          "description": "RFI project type",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type"
           ],
-          "type": "string"
-        },
-        "readable_id": {
-          "type": "string"
-        },
-        "request_type": {
-          "type": "string"
-        },
-        "search": {
-          "type": "string"
-        },
-        "status": {
-          "description": "Status filter. Projects with a narrowed dashboard vocabulary accept only their customer-facing values.",
-          "type": "string"
-        },
-        "summary": {
-          "type": "string"
+          "type": "object"
         },
-        "tlp": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "accountId": {
+              "type": "string"
+            },
+            "assignee": {
+              "type": "string"
+            },
+            "createdBy": {
+              "description": "Filter by creator email. NOTE: For the `legal-response` project type this query parameter is **rejected with HTTP 400** — the server derives the filter from the authenticated user's JWT automatically and does not accept a client-supplied value. Requests to `legal-response` with no valid JWT identity are rejected with HTTP 401.",
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "metadata": {
+              "description": "JSON string object of metadata filters. Supports two formats: 1) Simple values for exact match (backward compatible): {\"status\": \"open\"} 2) Operator objects for advanced filtering: {\"identifiers\": {\"operator\": \"contains_line\", \"value\": \"blah.com\"}}. Available operators: 'eq' (exact match, default), 'contains' (substring match), 'contains_line' (match complete line in newline-separated text). Date fields are automatically normalized to YYYY-MM-DD format.",
+              "type": "string"
+            },
+            "order": {
+              "type": "string"
+            },
+            "orderBy": {
+              "description": "Sort field. SOC Communications support customer-safe latest_activity ordering.",
+              "type": "string"
+            },
+            "page": {
+              "type": "number"
+            },
+            "pageSize": {
+              "type": "number"
+            },
+            "priority": {
+              "type": "string"
+            },
+            "readableId": {
+              "type": "string"
+            },
+            "requestType": {
+              "type": "string"
+            },
+            "search": {
+              "type": "string"
+            },
+            "status": {
+              "description": "Status filter. Projects with a narrowed dashboard vocabulary accept only their customer-facing values.",
+              "type": "string"
+            },
+            "summary": {
+              "type": "string"
+            },
+            "tlp": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -301,64 +317,74 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/requests/${pathParam(args, "project_type")}`,
       query: [
-        ["page", args["page"], true],
-        ["pageSize", args["page_size"], true],
-        ["status", args["status"], true],
-        ["search", args["search"], true],
-        ["createdBy", args["created_by"], true],
-        ["assignee", args["assignee"], true],
-        ["requestType", args["request_type"], true],
-        ["priority", args["priority"], true],
-        ["tlp", args["tlp"], true],
-        ["id", args["id"], true],
-        ["readableId", args["readable_id"], true],
-        ["summary", args["summary"], true],
-        ["accountId", args["filter_account_id"], true],
-        ["metadata", args["metadata"], true],
-        ["orderBy", args["order_by"], true],
-        ["order", args["order"], true],
+        ["page", param(args, "query", "page"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
+        ["status", param(args, "query", "status"), true],
+        ["search", param(args, "query", "search"), true],
+        ["createdBy", param(args, "query", "createdBy"), true],
+        ["assignee", param(args, "query", "assignee"), true],
+        ["requestType", param(args, "query", "requestType"), true],
+        ["priority", param(args, "query", "priority"), true],
+        ["tlp", param(args, "query", "tlp"), true],
+        ["id", param(args, "query", "id"), true],
+        ["readableId", param(args, "query", "readableId"), true],
+        ["summary", param(args, "query", "summary"), true],
+        ["accountId", param(args, "query", "accountId"), true],
+        ["metadata", param(args, "query", "metadata"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_requests_get_request_read",
+    name: "cloudforceOne_requests_getRequestRead",
     title: "Get an RFI by ID",
-    description: "Retrieves a specific RFI by its UUID with related data.",
+    description: "Retrieves a specific RFI by its UUID with related data.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "project_type": {
-          "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            },
+            "request_id": {
+              "description": "RFI UUID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id"
           ],
-          "type": "string"
-        },
-        "request_id": {
-          "description": "RFI UUID",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -834,16 +860,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_requests_post_request_create",
+    name: "cloudforceOne_requests_postRequestCreate",
     title: "Creates a new RFI",
-    description: "Creates a new Request for Information with the specified project type and details.",
+    description: "Creates a new Request for Information with the specified project type and details.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -921,29 +943,43 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "project_type": {
-          "description": "RFI project type",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1419,16 +1455,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_requests_put_request_update",
+    name: "cloudforceOne_requests_putRequestUpdate",
     title: "Update an RFI",
-    description: "Updates an existing RFI with the provided fields. Only provided fields will be updated.",
+    description: "Updates an existing RFI with the provided fields. Only provided fields will be updated.\n\nPUT /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/{request_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -1485,34 +1517,48 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "project_type": {
-          "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
-          "enum": [
-            "threat-intelligence",
-            "incident-response",
-            "ir-emergency-response",
-            "table-top",
-            "pentest",
-            "irp",
-            "threat-hunting",
-            "cybersecurity-assessment",
-            "react-general",
-            "legal-response",
-            "soc-alerts",
-            "demo"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type. Valid values: threat-intelligence, incident-response, ir-emergency-response, table-top, pentest, irp, threat-hunting, cybersecurity-assessment, react-general, legal-response, soc-alerts, demo",
+              "enum": [
+                "threat-intelligence",
+                "incident-response",
+                "ir-emergency-response",
+                "table-top",
+                "pentest",
+                "irp",
+                "threat-hunting",
+                "cybersecurity-assessment",
+                "react-general",
+                "legal-response",
+                "soc-alerts",
+                "demo"
+              ],
+              "type": "string"
+            },
+            "request_id": {
+              "description": "RFI UUID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type",
+            "request_id"
           ],
-          "type": "string"
-        },
-        "request_id": {
-          "description": "RFI UUID",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type",
-        "request_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/types/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/types/tools.ts
index fd2b8cc3c..3b2ab9625 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/types/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/types/tools.ts
@@ -4,27 +4,37 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests.types`.
+ * The tools of `cloudforceOne.requests.types`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_types_list",
+    name: "cloudforceOne_requests_types_list",
     title: "List visible request types for a project (dashboard)",
-    description: "Returns request types available to dashboard (external) callers. For restricted project types (e.g. legal-response), only the allowlisted subset is returned.",
+    description: "Returns request types available to dashboard (external) callers. For restricted project types (e.g. legal-response), only the allowlisted subset is returned.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/types",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "project_type": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "project_type": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/requests/user/tools.ts b/src/generated/forge-mcp/cloudforceOne/requests/user/tools.ts
index 7754dbb87..996cd20b0 100644
--- a/src/generated/forge-mcp/cloudforceOne/requests/user/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/requests/user/tools.ts
@@ -4,29 +4,39 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.requests.user`.
+ * The tools of `cloudforceOne.requests.user`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_requests_user_get",
+    name: "cloudforceOne_requests_user_get",
     title: "Get current user profile",
-    description: "Get the current user's profile in a specific RFI project.",
+    description: "Get the current user's profile in a specific RFI project.\n\nGET /accounts/{account_id}/cloudforce-one/v2/requests/{project_type}/user/me",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID",
-          "type": "string"
-        },
-        "project_type": {
-          "description": "RFI project type",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID",
+              "type": "string"
+            },
+            "project_type": {
+              "description": "RFI project type",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_type"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/approvals/outputs.ts b/src/generated/forge-mcp/cloudforceOne/rules/approvals/outputs.ts
index 4f9b72305..69ede2be7 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/approvals/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/approvals/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one_CompilerWarning` in responses.
  */
-export const cloudforce_one_CompilerWarning_output: JsonSchema = {
+export const cloudforce$$one_CompilerWarning: JsonSchema = {
   "properties": {
     "code": {
       "type": "string"
@@ -106,7 +106,7 @@ export const cloudforce_one_CompilerWarning_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_RuleApprovalDetailResponse` in responses.
  */
-export const cloudforce_one_RuleApprovalDetailResponse_output: JsonSchema = {
+export const cloudforce$$one_RuleApprovalDetailResponse: JsonSchema = {
   "properties": {
     "approval": {
       "properties": {
@@ -289,7 +289,7 @@ export const cloudforce_one_RuleApprovalDetailResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_RuleApprovalsListResponse` in responses.
  */
-export const cloudforce_one_RuleApprovalsListResponse_output: JsonSchema = {
+export const cloudforce$$one_RuleApprovalsListResponse: JsonSchema = {
   "properties": {
     "approvals": {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/approvals/schemas.ts b/src/generated/forge-mcp/cloudforceOne/rules/approvals/schemas.ts
index f696bb1d8..f2149c51f 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/approvals/schemas.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/approvals/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one_ResubmitApprovalRequest`.
  */
-export const cloudforce_one_ResubmitApprovalRequest: JsonSchema = {
+export const cloudforce$$one_ResubmitApprovalRequest: JsonSchema = {
   "properties": {
     "commit_message": {
       "type": "string"
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/approvals/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/approvals/tools.ts
index d657e12d8..5327b8f2e 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/approvals/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/approvals/tools.ts
@@ -1,52 +1,62 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cloudforce_one_ApprovalProposedChanges_output,
-  cloudforce_one_ErrorResponse_output,
-  cloudforce_one_PendingRuleChange_output,
-  cloudforce_one_ResubmitApprovalResponse_output,
-  cloudforce_one_RuleMetaEntry_output,
-  cloudforce_one_RulePreview_output,
-  cloudforce_one_SuccessResponse_output,
+  cloudforce$$one_ApprovalProposedChanges,
+  cloudforce$$one_ErrorResponse,
+  cloudforce$$one_PendingRuleChange,
+  cloudforce$$one_ResubmitApprovalResponse,
+  cloudforce$$one_RuleMetaEntry,
+  cloudforce$$one_RulePreview,
+  cloudforce$$one_SuccessResponse,
 } from "../outputs.js";
 import {
-  cloudforce_one_CompilerWarning_output,
-  cloudforce_one_RuleApprovalDetailResponse_output,
-  cloudforce_one_RuleApprovalsListResponse_output,
+  cloudforce$$one_CompilerWarning,
+  cloudforce$$one_RuleApprovalDetailResponse,
+  cloudforce$$one_RuleApprovalsListResponse,
 } from "./outputs.js";
-import { cloudforce_one_ResubmitApprovalRequest } from "./schemas.js";
+import { cloudforce$$one_ResubmitApprovalRequest } from "./schemas.js";
 
 /**
- * The tools of `cloudforce_one.rules.approvals`.
+ * The tools of `cloudforceOne.rules.approvals`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_approvals_cancel",
+    name: "cloudforceOne_rules_approvals_cancel",
     title: "Cancel a pending approval",
-    description: "Cancel a pending rule approval. Only its original requester may cancel it.",
+    description: "Cancel a pending rule approval. Only its original requester may cancel it.\n\nPOST /accounts/{account_id}/cloudforce-one/rules/approvals/{id}/cancel",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "id": {
-          "description": "The unique identifier for the approval.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the approval.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_SuccessResponse",
       $defs: {
-        "cloudforce-one_SuccessResponse": cloudforce_one_SuccessResponse_output,
+        "cloudforce-one_SuccessResponse": cloudforce$$one_SuccessResponse,
       },
     },
     annotations: {
@@ -74,8 +84,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_SuccessResponse": cloudforce_one_SuccessResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_SuccessResponse": cloudforce$$one_SuccessResponse,
       },
     },
     request: (args) => ({
@@ -83,35 +93,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_approvals_get",
+    name: "cloudforceOne_rules_approvals_get",
     title: "Get rule approval details",
-    description: "Get a single rule approval with current rule data.",
+    description: "Get a single rule approval with current rule data.\n\nGET /accounts/{account_id}/cloudforce-one/rules/approvals/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "id": {
-          "description": "The unique identifier for the approval.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the approval.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_RuleApprovalDetailResponse",
       $defs: {
-        "cloudforce-one_ApprovalProposedChanges": cloudforce_one_ApprovalProposedChanges_output,
-        "cloudforce-one_CompilerWarning": cloudforce_one_CompilerWarning_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleApprovalDetailResponse": cloudforce_one_RuleApprovalDetailResponse_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalProposedChanges": cloudforce$$one_ApprovalProposedChanges,
+        "cloudforce-one_CompilerWarning": cloudforce$$one_CompilerWarning,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleApprovalDetailResponse": cloudforce$$one_RuleApprovalDetailResponse,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     annotations: {
@@ -139,13 +159,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalProposedChanges": cloudforce_one_ApprovalProposedChanges_output,
-        "cloudforce-one_CompilerWarning": cloudforce_one_CompilerWarning_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleApprovalDetailResponse": cloudforce_one_RuleApprovalDetailResponse_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalProposedChanges": cloudforce$$one_ApprovalProposedChanges,
+        "cloudforce-one_CompilerWarning": cloudforce$$one_CompilerWarning,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleApprovalDetailResponse": cloudforce$$one_RuleApprovalDetailResponse,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     request: (args) => ({
@@ -153,104 +173,120 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_approvals_list",
+    name: "cloudforceOne_rules_approvals_list",
     title: "List rule approvals",
-    description: "Returns rule approvals with optional status, revision, reviewer-scope, and mutation-type filtering.",
+    description: "Returns rule approvals with optional status, revision, reviewer-scope, and mutation-type filtering.\n\nGET /accounts/{account_id}/cloudforce-one/rules/approvals",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "change_type": {
-          "description": "Limits approvals to the specified mutation type.",
-          "enum": [
-            "create",
-            "update",
-            "delete"
-          ],
-          "type": "string"
-        },
-        "latest_only": {
-          "default": "false",
-          "description": "When true, returns the newest revision in each approval chain.",
-          "enum": [
-            "true",
-            "false"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "type": "number"
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "oneOf": [
-            {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "change_type": {
+              "description": "Limits approvals to the specified mutation type.",
+              "enum": [
+                "create",
+                "update",
+                "delete"
+              ],
+              "type": "string"
+            },
+            "latest_only": {
+              "default": "false",
+              "description": "When true, returns the newest revision in each approval chain.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 50,
               "type": "number"
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "reviewer_scope": {
-          "description": "Limits approvals to the specified reviewer scope.",
-          "enum": [
-            "default",
-            "email",
-            "unresolved"
-          ],
-          "type": "string"
-        },
-        "rule_id": {
-          "description": "Filter approvals by rule ID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "status": {
-          "anyOf": [
-            {
-              "items": {
-                "enum": [
-                  "pending",
-                  "approved",
-                  "rejected",
-                  "cancelled",
-                  "all"
-                ],
-                "type": "string"
-              },
-              "maxItems": 4,
-              "minItems": 1,
-              "type": "array"
+            "offset": {
+              "default": 0,
+              "oneOf": [
+                {
+                  "type": "number"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
+            "reviewer_scope": {
+              "description": "Limits approvals to the specified reviewer scope.",
               "enum": [
-                "pending",
-                "approved",
-                "rejected",
-                "cancelled",
-                "all"
+                "default",
+                "email",
+                "unresolved"
               ],
               "type": "string"
+            },
+            "rule_id": {
+              "description": "Filter approvals by rule ID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "status": {
+              "anyOf": [
+                {
+                  "items": {
+                    "enum": [
+                      "pending",
+                      "approved",
+                      "rejected",
+                      "cancelled",
+                      "all"
+                    ],
+                    "type": "string"
+                  },
+                  "maxItems": 4,
+                  "minItems": 1,
+                  "type": "array"
+                },
+                {
+                  "enum": [
+                    "pending",
+                    "approved",
+                    "rejected",
+                    "cancelled",
+                    "all"
+                  ],
+                  "type": "string"
+                }
+              ],
+              "default": "pending",
+              "description": "Selects approval statuses. Repeat the parameter to OR-match statuses (for example, status=pending&status=rejected). Use status=all alone to disable status filtering."
             }
-          ],
-          "default": "pending",
-          "description": "Selects approval statuses. Repeat the parameter to OR-match statuses (for example, status=pending&status=rejected). Use status=all alone to disable status filtering."
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_RuleApprovalsListResponse",
       $defs: {
-        "cloudforce-one_ApprovalProposedChanges": cloudforce_one_ApprovalProposedChanges_output,
-        "cloudforce-one_RuleApprovalsListResponse": cloudforce_one_RuleApprovalsListResponse_output,
+        "cloudforce-one_ApprovalProposedChanges": cloudforce$$one_ApprovalProposedChanges,
+        "cloudforce-one_RuleApprovalsListResponse": cloudforce$$one_RuleApprovalsListResponse,
       },
     },
     annotations: {
@@ -275,55 +311,65 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalProposedChanges": cloudforce_one_ApprovalProposedChanges_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_RuleApprovalsListResponse": cloudforce_one_RuleApprovalsListResponse_output,
+        "cloudforce-one_ApprovalProposedChanges": cloudforce$$one_ApprovalProposedChanges,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_RuleApprovalsListResponse": cloudforce$$one_RuleApprovalsListResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/rules/approvals`,
       query: [
-        ["status", args["status"], true],
-        ["latest_only", args["latest_only"], true],
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["reviewer_scope", args["reviewer_scope"], true],
-        ["change_type", args["change_type"], true],
-        ["rule_id", args["rule_id"], true],
+        ["status", param(args, "query", "status"), true],
+        ["latest_only", param(args, "query", "latest_only"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["reviewer_scope", param(args, "query", "reviewer_scope"), true],
+        ["change_type", param(args, "query", "change_type"), true],
+        ["rule_id", param(args, "query", "rule_id"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_rules_approvals_resubmit",
+    name: "cloudforceOne_rules_approvals_resubmit",
     title: "Revise and resubmit a rejected approval",
-    description: "Create a new pending revision from a rejected rule approval. Only the original requester may resubmit the latest revision.",
+    description: "Create a new pending revision from a rejected rule approval. Only the original requester may resubmit the latest revision.\n\nPOST /accounts/{account_id}/cloudforce-one/rules/approvals/{id}/resubmit",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cloudforce-one_ResubmitApprovalRequest"
         },
-        "id": {
-          "description": "The unique identifier for the approval.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the approval.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_ResubmitApprovalRequest": cloudforce_one_ResubmitApprovalRequest,
+        "cloudforce-one_ResubmitApprovalRequest": cloudforce$$one_ResubmitApprovalRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_ResubmitApprovalResponse",
       $defs: {
-        "cloudforce-one_ResubmitApprovalResponse": cloudforce_one_ResubmitApprovalResponse_output,
+        "cloudforce-one_ResubmitApprovalResponse": cloudforce$$one_ResubmitApprovalResponse,
       },
     },
     annotations: {
@@ -354,8 +400,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_ResubmitApprovalResponse": cloudforce_one_ResubmitApprovalResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_ResubmitApprovalResponse": cloudforce$$one_ResubmitApprovalResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/email/approvals/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/email/approvals/tools.ts
index 0cd2a0a9c..93d43b320 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/email/approvals/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/email/approvals/tools.ts
@@ -1,35 +1,31 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  cloudforce_one_ErrorResponse_output,
-  cloudforce_one_ResubmitApprovalResponse_output,
+  cloudforce$$one_ErrorResponse,
+  cloudforce$$one_ResubmitApprovalResponse,
 } from "../../outputs.js";
-import { cloudforce_one_MetaInputEntry } from "../../schemas.js";
+import { cloudforce$$one_MetaInputEntry } from "../../schemas.js";
 import {
-  cloudforce_one_EmailRuleArrayCondition,
-  cloudforce_one_EmailRuleCondition,
-  cloudforce_one_EmailRuleConditionGroup,
-  cloudforce_one_EmailRuleHeaderCondition,
-  cloudforce_one_EmailRuleScalarCondition,
+  cloudforce$$one_EmailRuleArrayCondition,
+  cloudforce$$one_EmailRuleCondition,
+  cloudforce$$one_EmailRuleConditionGroup,
+  cloudforce$$one_EmailRuleHeaderCondition,
+  cloudforce$$one_EmailRuleScalarCondition,
 } from "../schemas.js";
 
 /**
- * The tools of `cloudforce_one.rules.email.approvals`.
+ * The tools of `cloudforceOne.rules.email.approvals`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_email_approvals_resubmit",
+    name: "cloudforceOne_rules_email_approvals_resubmit",
     title: "Revise and resubmit a rejected structured email rule approval",
-    description: "Validates and compiles a complete structured email rule, then creates an immutable pending revision of its rejected approval.",
+    description: "Validates and compiles a complete structured email rule, then creates an immutable pending revision of its rejected approval.\n\nPOST /accounts/{account_id}/cloudforce-one/rules/structured/approvals/{id}/resubmit",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "condition": {
@@ -118,36 +114,56 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "id": {
-          "description": "The unique identifier for the approval.",
-          "type": "string"
-        },
-        "module": {
-          "default": "eml",
-          "description": "Structured rule module.",
-          "enum": [
-            "eml"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the approval.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "module": {
+              "default": "eml",
+              "description": "Structured rule module.",
+              "enum": [
+                "eml"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_EmailRuleArrayCondition": cloudforce_one_EmailRuleArrayCondition,
-        "cloudforce-one_EmailRuleCondition": cloudforce_one_EmailRuleCondition,
-        "cloudforce-one_EmailRuleConditionGroup": cloudforce_one_EmailRuleConditionGroup,
-        "cloudforce-one_EmailRuleHeaderCondition": cloudforce_one_EmailRuleHeaderCondition,
-        "cloudforce-one_EmailRuleScalarCondition": cloudforce_one_EmailRuleScalarCondition,
-        "cloudforce-one_MetaInputEntry": cloudforce_one_MetaInputEntry,
+        "cloudforce-one_EmailRuleArrayCondition": cloudforce$$one_EmailRuleArrayCondition,
+        "cloudforce-one_EmailRuleCondition": cloudforce$$one_EmailRuleCondition,
+        "cloudforce-one_EmailRuleConditionGroup": cloudforce$$one_EmailRuleConditionGroup,
+        "cloudforce-one_EmailRuleHeaderCondition": cloudforce$$one_EmailRuleHeaderCondition,
+        "cloudforce-one_EmailRuleScalarCondition": cloudforce$$one_EmailRuleScalarCondition,
+        "cloudforce-one_MetaInputEntry": cloudforce$$one_MetaInputEntry,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_ResubmitApprovalResponse",
       $defs: {
-        "cloudforce-one_ResubmitApprovalResponse": cloudforce_one_ResubmitApprovalResponse_output,
+        "cloudforce-one_ResubmitApprovalResponse": cloudforce$$one_ResubmitApprovalResponse,
       },
     },
     annotations: {
@@ -178,14 +194,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_ResubmitApprovalResponse": cloudforce_one_ResubmitApprovalResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_ResubmitApprovalResponse": cloudforce$$one_ResubmitApprovalResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/rules/structured/approvals/${pathParam(args, "id")}/resubmit`,
       query: [
-        ["module", args["module"], true],
+        ["module", param(args, "query", "module"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/email/outputs.ts b/src/generated/forge-mcp/cloudforceOne/rules/email/outputs.ts
index 41defe6fa..eae6f6af3 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/email/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/email/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one_EditApprovalResponse` in responses.
  */
-export const cloudforce_one_EditApprovalResponse_output: JsonSchema = {
+export const cloudforce$$one_EditApprovalResponse: JsonSchema = {
   "properties": {
     "approval": {
       "allOf": [
@@ -40,7 +40,7 @@ export const cloudforce_one_EditApprovalResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_EmailRuleValidationResponse` in responses.
  */
-export const cloudforce_one_EmailRuleValidationResponse_output: JsonSchema = {
+export const cloudforce$$one_EmailRuleValidationResponse: JsonSchema = {
   "properties": {
     "compiled_yara": {
       "type": "string"
@@ -61,7 +61,7 @@ export const cloudforce_one_EmailRuleValidationResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_EmailRulesListResponse` in responses.
  */
-export const cloudforce_one_EmailRulesListResponse_output: JsonSchema = {
+export const cloudforce$$one_EmailRulesListResponse: JsonSchema = {
   "properties": {
     "rules": {
       "items": {
@@ -83,7 +83,7 @@ export const cloudforce_one_EmailRulesListResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_PendingApproval` in responses.
  */
-export const cloudforce_one_PendingApproval_output: JsonSchema = {
+export const cloudforce$$one_PendingApproval: JsonSchema = {
   "properties": {
     "audit_log_id": {
       "type": "number"
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/email/schema/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/email/schema/tools.ts
index 1e6086366..bd61a72e0 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/email/schema/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/email/schema/tools.ts
@@ -2,27 +2,37 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
-import { cloudforce_one_ErrorResponse_output } from "../../outputs.js";
+import { cloudforce$$one_ErrorResponse } from "../../outputs.js";
 
 /**
- * The tools of `cloudforce_one.rules.email.schema`.
+ * The tools of `cloudforceOne.rules.email.schema`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_email_schema_get",
+    name: "cloudforceOne_rules_email_schema_get",
     title: "Get email rule schema",
-    description: "Get the field catalog for structured email rules.",
+    description: "Get the field catalog for structured email rules.\n\nGET /accounts/{account_id}/cloudforce-one/rules/structured/schema",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -456,7 +466,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/email/schemas.ts b/src/generated/forge-mcp/cloudforceOne/rules/email/schemas.ts
index c907b6d1f..c9c6f31cc 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/email/schemas.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/email/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one_EmailRuleArrayCondition`.
  */
-export const cloudforce_one_EmailRuleArrayCondition: JsonSchema = {
+export const cloudforce$$one_EmailRuleArrayCondition: JsonSchema = {
   "properties": {
     "conditions": {
       "items": {
@@ -81,7 +81,7 @@ export const cloudforce_one_EmailRuleArrayCondition: JsonSchema = {
 /**
  * The schema of `cloudforce-one_EmailRuleCondition`.
  */
-export const cloudforce_one_EmailRuleCondition: JsonSchema = {
+export const cloudforce$$one_EmailRuleCondition: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/cloudforce-one_EmailRuleScalarCondition"
@@ -101,7 +101,7 @@ export const cloudforce_one_EmailRuleCondition: JsonSchema = {
 /**
  * The schema of `cloudforce-one_EmailRuleConditionGroup`.
  */
-export const cloudforce_one_EmailRuleConditionGroup: JsonSchema = {
+export const cloudforce$$one_EmailRuleConditionGroup: JsonSchema = {
   "description": "Nested condition groups support up to 10 levels of depth.",
   "properties": {
     "conditions": {
@@ -137,7 +137,7 @@ export const cloudforce_one_EmailRuleConditionGroup: JsonSchema = {
 /**
  * The schema of `cloudforce-one_EmailRuleHeaderCondition`.
  */
-export const cloudforce_one_EmailRuleHeaderCondition: JsonSchema = {
+export const cloudforce$$one_EmailRuleHeaderCondition: JsonSchema = {
   "properties": {
     "header_name": {
       "type": "string"
@@ -195,7 +195,7 @@ export const cloudforce_one_EmailRuleHeaderCondition: JsonSchema = {
 /**
  * The schema of `cloudforce-one_EmailRuleScalarCondition`.
  */
-export const cloudforce_one_EmailRuleScalarCondition: JsonSchema = {
+export const cloudforce$$one_EmailRuleScalarCondition: JsonSchema = {
   "properties": {
     "field": {
       "type": "string"
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/email/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/email/tools.ts
index 2a6f65f68..a752c6375 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/email/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/email/tools.ts
@@ -1,47 +1,43 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cloudforce_one_ApprovalConflictResponse_output,
-  cloudforce_one_ApprovalPendingResponse_output,
-  cloudforce_one_ApprovalProposedChanges_output,
-  cloudforce_one_ErrorResponse_output,
-  cloudforce_one_PendingRuleChange_output,
-  cloudforce_one_RuleMetaEntry_output,
-  cloudforce_one_RulePreview_output,
-  cloudforce_one_SuccessResponse_output,
+  cloudforce$$one_ApprovalConflictResponse,
+  cloudforce$$one_ApprovalPendingResponse,
+  cloudforce$$one_ApprovalProposedChanges,
+  cloudforce$$one_ErrorResponse,
+  cloudforce$$one_PendingRuleChange,
+  cloudforce$$one_RuleMetaEntry,
+  cloudforce$$one_RulePreview,
+  cloudforce$$one_SuccessResponse,
 } from "../outputs.js";
-import { cloudforce_one_MetaInputEntry } from "../schemas.js";
+import { cloudforce$$one_MetaInputEntry } from "../schemas.js";
 import {
-  cloudforce_one_EditApprovalResponse_output,
-  cloudforce_one_EmailRuleValidationResponse_output,
-  cloudforce_one_EmailRulesListResponse_output,
-  cloudforce_one_PendingApproval_output,
+  cloudforce$$one_EditApprovalResponse,
+  cloudforce$$one_EmailRuleValidationResponse,
+  cloudforce$$one_EmailRulesListResponse,
+  cloudforce$$one_PendingApproval,
 } from "./outputs.js";
 import {
-  cloudforce_one_EmailRuleArrayCondition,
-  cloudforce_one_EmailRuleCondition,
-  cloudforce_one_EmailRuleConditionGroup,
-  cloudforce_one_EmailRuleHeaderCondition,
-  cloudforce_one_EmailRuleScalarCondition,
+  cloudforce$$one_EmailRuleArrayCondition,
+  cloudforce$$one_EmailRuleCondition,
+  cloudforce$$one_EmailRuleConditionGroup,
+  cloudforce$$one_EmailRuleHeaderCondition,
+  cloudforce$$one_EmailRuleScalarCondition,
 } from "./schemas.js";
 
 /**
- * The tools of `cloudforce_one.rules.email`.
+ * The tools of `cloudforceOne.rules.email`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_email_create",
+    name: "cloudforceOne_rules_email_create",
     title: "Create an email rule",
-    description: "Create a structured email rule.",
+    description: "Create a structured email rule.\n\nPOST /accounts/{account_id}/cloudforce-one/rules/structured",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "condition": {
@@ -129,18 +125,32 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_EmailRuleArrayCondition": cloudforce_one_EmailRuleArrayCondition,
-        "cloudforce-one_EmailRuleCondition": cloudforce_one_EmailRuleCondition,
-        "cloudforce-one_EmailRuleConditionGroup": cloudforce_one_EmailRuleConditionGroup,
-        "cloudforce-one_EmailRuleHeaderCondition": cloudforce_one_EmailRuleHeaderCondition,
-        "cloudforce-one_EmailRuleScalarCondition": cloudforce_one_EmailRuleScalarCondition,
-        "cloudforce-one_MetaInputEntry": cloudforce_one_MetaInputEntry,
+        "cloudforce-one_EmailRuleArrayCondition": cloudforce$$one_EmailRuleArrayCondition,
+        "cloudforce-one_EmailRuleCondition": cloudforce$$one_EmailRuleCondition,
+        "cloudforce-one_EmailRuleConditionGroup": cloudforce$$one_EmailRuleConditionGroup,
+        "cloudforce-one_EmailRuleHeaderCondition": cloudforce$$one_EmailRuleHeaderCondition,
+        "cloudforce-one_EmailRuleScalarCondition": cloudforce$$one_EmailRuleScalarCondition,
+        "cloudforce-one_MetaInputEntry": cloudforce$$one_MetaInputEntry,
       },
     },
     outputSchema: {
@@ -153,10 +163,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     annotations: {
@@ -184,11 +194,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     request: (args) => ({
@@ -197,26 +207,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_email_delete",
+    name: "cloudforceOne_rules_email_delete",
     title: "Delete an email rule",
-    description: "Delete an existing structured email rule.",
+    description: "Delete an existing structured email rule.\n\nDELETE /accounts/{account_id}/cloudforce-one/rules/structured/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "id": {
-          "description": "The unique identifier for the rule.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the rule.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "anyOf": [
@@ -228,8 +248,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_SuccessResponse": cloudforce_one_SuccessResponse_output,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_SuccessResponse": cloudforce$$one_SuccessResponse,
       },
     },
     annotations: {
@@ -263,10 +283,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalConflictResponse": cloudforce_one_ApprovalConflictResponse_output,
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_SuccessResponse": cloudforce_one_SuccessResponse_output,
+        "cloudforce-one_ApprovalConflictResponse": cloudforce$$one_ApprovalConflictResponse,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_SuccessResponse": cloudforce$$one_SuccessResponse,
       },
     },
     request: (args) => ({
@@ -274,33 +294,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_email_get",
+    name: "cloudforceOne_rules_email_get",
     title: "Get an email rule",
-    description: "Get a structured email rule by ID.",
+    description: "Get a structured email rule by ID.\n\nGET /accounts/{account_id}/cloudforce-one/rules/structured/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "id": {
-          "description": "The unique identifier for the rule.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the rule.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_RulePreview",
       $defs: {
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     annotations: {
@@ -325,10 +355,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     request: (args) => ({
@@ -336,46 +366,62 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_email_list",
+    name: "cloudforceOne_rules_email_list",
     title: "List email rules",
-    description: "Returns structured email rules.",
+    description: "Returns structured email rules.\n\nGET /accounts/{account_id}/cloudforce-one/rules/structured",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "oneOf": [
-            {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 50,
               "type": "number"
             },
-            {
-              "type": "null"
+            "offset": {
+              "default": 0,
+              "oneOf": [
+                {
+                  "type": "number"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "search": {
+              "type": "string"
             }
-          ]
-        },
-        "search": {
-          "type": "string"
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_EmailRulesListResponse",
       $defs: {
-        "cloudforce-one_EmailRulesListResponse": cloudforce_one_EmailRulesListResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_EmailRulesListResponse": cloudforce$$one_EmailRulesListResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     annotations: {
@@ -397,33 +443,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_EmailRulesListResponse": cloudforce_one_EmailRulesListResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_EmailRulesListResponse": cloudforce$$one_EmailRulesListResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/rules/structured`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["search", args["search"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_rules_email_test",
+    name: "cloudforceOne_rules_email_test",
     title: "Test an email rule",
-    description: "Test a structured email rule against sample email JSON.",
+    description: "Test a structured email rule against sample email JSON.\n\nPOST /accounts/{account_id}/cloudforce-one/rules/structured/{id}/test",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "sample_json": {
@@ -435,16 +477,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "id": {
-          "description": "The unique identifier for the rule.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the rule.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -507,7 +563,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
@@ -516,16 +572,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_email_update",
+    name: "cloudforceOne_rules_email_update",
     title: "Update an email rule",
-    description: "Updates an existing structured email rule.",
+    description: "Updates an existing structured email rule.\n\nPUT /accounts/{account_id}/cloudforce-one/rules/structured/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "condition": {
@@ -607,23 +659,37 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "id": {
-          "description": "The unique identifier for the rule.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the rule.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_EmailRuleArrayCondition": cloudforce_one_EmailRuleArrayCondition,
-        "cloudforce-one_EmailRuleCondition": cloudforce_one_EmailRuleCondition,
-        "cloudforce-one_EmailRuleConditionGroup": cloudforce_one_EmailRuleConditionGroup,
-        "cloudforce-one_EmailRuleHeaderCondition": cloudforce_one_EmailRuleHeaderCondition,
-        "cloudforce-one_EmailRuleScalarCondition": cloudforce_one_EmailRuleScalarCondition,
-        "cloudforce-one_MetaInputEntry": cloudforce_one_MetaInputEntry,
+        "cloudforce-one_EmailRuleArrayCondition": cloudforce$$one_EmailRuleArrayCondition,
+        "cloudforce-one_EmailRuleCondition": cloudforce$$one_EmailRuleCondition,
+        "cloudforce-one_EmailRuleConditionGroup": cloudforce$$one_EmailRuleConditionGroup,
+        "cloudforce-one_EmailRuleHeaderCondition": cloudforce$$one_EmailRuleHeaderCondition,
+        "cloudforce-one_EmailRuleScalarCondition": cloudforce$$one_EmailRuleScalarCondition,
+        "cloudforce-one_MetaInputEntry": cloudforce$$one_MetaInputEntry,
       },
     },
     outputSchema: {
@@ -636,10 +702,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     annotations: {
@@ -673,12 +739,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalConflictResponse": cloudforce_one_ApprovalConflictResponse_output,
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalConflictResponse": cloudforce$$one_ApprovalConflictResponse,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     request: (args) => ({
@@ -687,16 +753,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_email_update_pending_approval",
+    name: "cloudforceOne_rules_email_updatePendingApproval",
     title: "Update a pending structured email rule approval",
-    description: "Validate, compile, and replace the proposed structured email rule on a pending approval. Only the original requester may update it.",
+    description: "Validate, compile, and replace the proposed structured email rule on a pending approval. Only the original requester may update it.\n\nPUT /accounts/{account_id}/cloudforce-one/rules/structured/approvals/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "condition": {
@@ -785,41 +847,61 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "id": {
-          "description": "The unique identifier for the approval.",
-          "type": "string"
-        },
-        "module": {
-          "default": "eml",
-          "description": "Structured rule module.",
-          "enum": [
-            "eml"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the approval.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "module": {
+              "default": "eml",
+              "description": "Structured rule module.",
+              "enum": [
+                "eml"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_EmailRuleArrayCondition": cloudforce_one_EmailRuleArrayCondition,
-        "cloudforce-one_EmailRuleCondition": cloudforce_one_EmailRuleCondition,
-        "cloudforce-one_EmailRuleConditionGroup": cloudforce_one_EmailRuleConditionGroup,
-        "cloudforce-one_EmailRuleHeaderCondition": cloudforce_one_EmailRuleHeaderCondition,
-        "cloudforce-one_EmailRuleScalarCondition": cloudforce_one_EmailRuleScalarCondition,
-        "cloudforce-one_MetaInputEntry": cloudforce_one_MetaInputEntry,
+        "cloudforce-one_EmailRuleArrayCondition": cloudforce$$one_EmailRuleArrayCondition,
+        "cloudforce-one_EmailRuleCondition": cloudforce$$one_EmailRuleCondition,
+        "cloudforce-one_EmailRuleConditionGroup": cloudforce$$one_EmailRuleConditionGroup,
+        "cloudforce-one_EmailRuleHeaderCondition": cloudforce$$one_EmailRuleHeaderCondition,
+        "cloudforce-one_EmailRuleScalarCondition": cloudforce$$one_EmailRuleScalarCondition,
+        "cloudforce-one_MetaInputEntry": cloudforce$$one_MetaInputEntry,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_EditApprovalResponse",
       $defs: {
-        "cloudforce-one_ApprovalProposedChanges": cloudforce_one_ApprovalProposedChanges_output,
-        "cloudforce-one_EditApprovalResponse": cloudforce_one_EditApprovalResponse_output,
-        "cloudforce-one_PendingApproval": cloudforce_one_PendingApproval_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalProposedChanges": cloudforce$$one_ApprovalProposedChanges,
+        "cloudforce-one_EditApprovalResponse": cloudforce$$one_EditApprovalResponse,
+        "cloudforce-one_PendingApproval": cloudforce$$one_PendingApproval,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     annotations: {
@@ -850,34 +932,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalProposedChanges": cloudforce_one_ApprovalProposedChanges_output,
-        "cloudforce-one_EditApprovalResponse": cloudforce_one_EditApprovalResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingApproval": cloudforce_one_PendingApproval_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalProposedChanges": cloudforce$$one_ApprovalProposedChanges,
+        "cloudforce-one_EditApprovalResponse": cloudforce$$one_EditApprovalResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingApproval": cloudforce$$one_PendingApproval,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/rules/structured/approvals/${pathParam(args, "id")}`,
       query: [
-        ["module", args["module"], true],
+        ["module", param(args, "query", "module"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "cloudforce_one_rules_email_validate",
+    name: "cloudforceOne_rules_email_validate",
     title: "Validate an email rule",
-    description: "Validates structured email rule syntax and metadata.",
+    description: "Validates structured email rule syntax and metadata.\n\nPOST /accounts/{account_id}/cloudforce-one/rules/structured/validate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "condition": {
@@ -970,24 +1048,38 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_EmailRuleArrayCondition": cloudforce_one_EmailRuleArrayCondition,
-        "cloudforce-one_EmailRuleCondition": cloudforce_one_EmailRuleCondition,
-        "cloudforce-one_EmailRuleConditionGroup": cloudforce_one_EmailRuleConditionGroup,
-        "cloudforce-one_EmailRuleHeaderCondition": cloudforce_one_EmailRuleHeaderCondition,
-        "cloudforce-one_EmailRuleScalarCondition": cloudforce_one_EmailRuleScalarCondition,
-        "cloudforce-one_MetaInputEntry": cloudforce_one_MetaInputEntry,
+        "cloudforce-one_EmailRuleArrayCondition": cloudforce$$one_EmailRuleArrayCondition,
+        "cloudforce-one_EmailRuleCondition": cloudforce$$one_EmailRuleCondition,
+        "cloudforce-one_EmailRuleConditionGroup": cloudforce$$one_EmailRuleConditionGroup,
+        "cloudforce-one_EmailRuleHeaderCondition": cloudforce$$one_EmailRuleHeaderCondition,
+        "cloudforce-one_EmailRuleScalarCondition": cloudforce$$one_EmailRuleScalarCondition,
+        "cloudforce-one_MetaInputEntry": cloudforce$$one_MetaInputEntry,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_EmailRuleValidationResponse",
       $defs: {
-        "cloudforce-one_EmailRuleValidationResponse": cloudforce_one_EmailRuleValidationResponse_output,
+        "cloudforce-one_EmailRuleValidationResponse": cloudforce$$one_EmailRuleValidationResponse,
       },
     },
     annotations: {
@@ -1009,8 +1101,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_EmailRuleValidationResponse": cloudforce_one_EmailRuleValidationResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_EmailRuleValidationResponse": cloudforce$$one_EmailRuleValidationResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/exemptions/outputs.ts b/src/generated/forge-mcp/cloudforceOne/rules/exemptions/outputs.ts
index d230b7803..177644c3d 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/exemptions/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/exemptions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one_AccountExemptions` in responses.
  */
-export const cloudforce_one_AccountExemptions_output: JsonSchema = {
+export const cloudforce$$one_AccountExemptions: JsonSchema = {
   "properties": {
     "namespace": {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/exemptions/schemas.ts b/src/generated/forge-mcp/cloudforceOne/rules/exemptions/schemas.ts
index ef1507c7f..209ac521c 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/exemptions/schemas.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/exemptions/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one_ExemptionUpdateEntry`.
  */
-export const cloudforce_one_ExemptionUpdateEntry: JsonSchema = {
+export const cloudforce$$one_ExemptionUpdateEntry: JsonSchema = {
   "properties": {
     "new_pattern": {
       "type": "string"
@@ -25,7 +25,7 @@ export const cloudforce_one_ExemptionUpdateEntry: JsonSchema = {
 /**
  * The schema of `cloudforce-one_PartialAccountExemptions`.
  */
-export const cloudforce_one_PartialAccountExemptions: JsonSchema = {
+export const cloudforce$$one_PartialAccountExemptions: JsonSchema = {
   "properties": {
     "namespace": {
       "items": {
@@ -52,7 +52,7 @@ export const cloudforce_one_PartialAccountExemptions: JsonSchema = {
 /**
  * The schema of `cloudforce-one_UpdateAccountExemptionsBody`.
  */
-export const cloudforce_one_UpdateAccountExemptionsBody: JsonSchema = {
+export const cloudforce$$one_UpdateAccountExemptionsBody: JsonSchema = {
   "properties": {
     "namespace": {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/exemptions/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/exemptions/tools.ts
index 2582f9856..1b18e0831 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/exemptions/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/exemptions/tools.ts
@@ -2,44 +2,54 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../../_/tool.js";
-import { cloudforce_one_ErrorResponse_output } from "../outputs.js";
-import { cloudforce_one_AccountExemptions_output } from "./outputs.js";
+import { cloudforce$$one_ErrorResponse } from "../outputs.js";
+import { cloudforce$$one_AccountExemptions } from "./outputs.js";
 import {
-  cloudforce_one_ExemptionUpdateEntry,
-  cloudforce_one_PartialAccountExemptions,
-  cloudforce_one_UpdateAccountExemptionsBody,
+  cloudforce$$one_ExemptionUpdateEntry,
+  cloudforce$$one_PartialAccountExemptions,
+  cloudforce$$one_UpdateAccountExemptionsBody,
 } from "./schemas.js";
 
 /**
- * The tools of `cloudforce_one.rules.exemptions`.
+ * The tools of `cloudforceOne.rules.exemptions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_exemptions_create",
+    name: "cloudforceOne_rules_exemptions_create",
     title: "Add patterns to exemption rules",
-    description: "Add regex patterns to per-account exemption rules (union semantics). Missing keys leave that type untouched; duplicates are silently deduped.",
+    description: "Add regex patterns to per-account exemption rules (union semantics). Missing keys leave that type untouched; duplicates are silently deduped.\n\nPOST /accounts/{account_id}/cloudforce-one/rules/exemptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cloudforce-one_PartialAccountExemptions"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_PartialAccountExemptions": cloudforce_one_PartialAccountExemptions,
+        "cloudforce-one_PartialAccountExemptions": cloudforce$$one_PartialAccountExemptions,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_AccountExemptions",
       $defs: {
-        "cloudforce-one_AccountExemptions": cloudforce_one_AccountExemptions_output,
+        "cloudforce-one_AccountExemptions": cloudforce$$one_AccountExemptions,
       },
     },
     annotations: {
@@ -67,8 +77,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_AccountExemptions": cloudforce_one_AccountExemptions_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_AccountExemptions": cloudforce$$one_AccountExemptions,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
@@ -77,31 +87,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_exemptions_delete",
+    name: "cloudforceOne_rules_exemptions_delete",
     title: "Remove patterns from exemption rules",
-    description: "Remove regex patterns from per-account exemption rules. Missing keys leave that type untouched; non-existent patterns are silently skipped.",
+    description: "Remove regex patterns from per-account exemption rules. Missing keys leave that type untouched; non-existent patterns are silently skipped.\n\nDELETE /accounts/{account_id}/cloudforce-one/rules/exemptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cloudforce-one_PartialAccountExemptions"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_PartialAccountExemptions": cloudforce_one_PartialAccountExemptions,
+        "cloudforce-one_PartialAccountExemptions": cloudforce$$one_PartialAccountExemptions,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_AccountExemptions",
       $defs: {
-        "cloudforce-one_AccountExemptions": cloudforce_one_AccountExemptions_output,
+        "cloudforce-one_AccountExemptions": cloudforce$$one_AccountExemptions,
       },
     },
     annotations: {
@@ -129,8 +149,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_AccountExemptions": cloudforce_one_AccountExemptions_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_AccountExemptions": cloudforce$$one_AccountExemptions,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
@@ -139,25 +159,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_exemptions_get",
+    name: "cloudforceOne_rules_exemptions_get",
     title: "Get exemption rules for an account",
-    description: "Get all exemption rule patterns for the account, grouped by type.",
+    description: "Get all exemption rule patterns for the account, grouped by type.\n\nGET /accounts/{account_id}/cloudforce-one/rules/exemptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_AccountExemptions",
       $defs: {
-        "cloudforce-one_AccountExemptions": cloudforce_one_AccountExemptions_output,
+        "cloudforce-one_AccountExemptions": cloudforce$$one_AccountExemptions,
       },
     },
     annotations: {
@@ -185,8 +215,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_AccountExemptions": cloudforce_one_AccountExemptions_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_AccountExemptions": cloudforce$$one_AccountExemptions,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
@@ -194,32 +224,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_exemptions_update",
+    name: "cloudforceOne_rules_exemptions_update",
     title: "Update exemption rule patterns",
-    description: "Replace existing exemption patterns with new values. Each key maps to an array of {old_pattern, new_pattern} entries. Missing keys leave that type untouched. Fails if any old pattern is not found or any new pattern already exists.",
+    description: "Replace existing exemption patterns with new values. Each key maps to an array of {old_pattern, new_pattern} entries. Missing keys leave that type untouched. Fails if any old pattern is not found or any new pattern already exists.\n\nPUT /accounts/{account_id}/cloudforce-one/rules/exemptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cloudforce-one_UpdateAccountExemptionsBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_ExemptionUpdateEntry": cloudforce_one_ExemptionUpdateEntry,
-        "cloudforce-one_UpdateAccountExemptionsBody": cloudforce_one_UpdateAccountExemptionsBody,
+        "cloudforce-one_ExemptionUpdateEntry": cloudforce$$one_ExemptionUpdateEntry,
+        "cloudforce-one_UpdateAccountExemptionsBody": cloudforce$$one_UpdateAccountExemptionsBody,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_AccountExemptions",
       $defs: {
-        "cloudforce-one_AccountExemptions": cloudforce_one_AccountExemptions_output,
+        "cloudforce-one_AccountExemptions": cloudforce$$one_AccountExemptions,
       },
     },
     annotations: {
@@ -253,8 +293,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_AccountExemptions": cloudforce_one_AccountExemptions_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_AccountExemptions": cloudforce$$one_AccountExemptions,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/managed/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/managed/tools.ts
index 8b27210e8..75a8df5c4 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/managed/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/managed/tools.ts
@@ -2,27 +2,37 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../../_/tool.js";
-import { cloudforce_one_ErrorResponse_output } from "../outputs.js";
+import { cloudforce$$one_ErrorResponse } from "../outputs.js";
 
 /**
- * The tools of `cloudforce_one.rules.managed`.
+ * The tools of `cloudforceOne.rules.managed`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_managed_get",
+    name: "cloudforceOne_rules_managed_get",
     title: "Get managed rules",
-    description: "Get DFP managed rule metadata (name and description) from YARA rules.",
+    description: "Get DFP managed rule metadata (name and description) from YARA rules.\n\nGET /accounts/{account_id}/cloudforce-one/rules/managed",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -124,7 +134,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/outputs.ts b/src/generated/forge-mcp/cloudforceOne/rules/outputs.ts
index a5f1487c6..5c8f724c9 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cloudforce-one_ApprovalConflictResponse` in responses.
  */
-export const cloudforce_one_ApprovalConflictResponse_output: JsonSchema = {
+export const cloudforce$$one_ApprovalConflictResponse: JsonSchema = {
   "properties": {
     "approval_id": {
       "type": "number"
@@ -32,7 +32,7 @@ export const cloudforce_one_ApprovalConflictResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_ApprovalPendingResponse` in responses.
  */
-export const cloudforce_one_ApprovalPendingResponse_output: JsonSchema = {
+export const cloudforce$$one_ApprovalPendingResponse: JsonSchema = {
   "properties": {
     "approval_id": {
       "type": "number"
@@ -51,7 +51,7 @@ export const cloudforce_one_ApprovalPendingResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_ApprovalProposedChanges` in responses.
  */
-export const cloudforce_one_ApprovalProposedChanges_output: JsonSchema = {
+export const cloudforce$$one_ApprovalProposedChanges: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -216,7 +216,7 @@ export const cloudforce_one_ApprovalProposedChanges_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_DeleteAllResponse` in responses.
  */
-export const cloudforce_one_DeleteAllResponse_output: JsonSchema = {
+export const cloudforce$$one_DeleteAllResponse: JsonSchema = {
   "properties": {
     "deleted": {
       "type": "number"
@@ -231,7 +231,7 @@ export const cloudforce_one_DeleteAllResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_ErrorResponse` in responses.
  */
-export const cloudforce_one_ErrorResponse_output: JsonSchema = {
+export const cloudforce$$one_ErrorResponse: JsonSchema = {
   "properties": {
     "error": {
       "type": "string"
@@ -246,7 +246,7 @@ export const cloudforce_one_ErrorResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_PendingRuleChange` in responses.
  */
-export const cloudforce_one_PendingRuleChange_output: JsonSchema = {
+export const cloudforce$$one_PendingRuleChange: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -284,7 +284,7 @@ export const cloudforce_one_PendingRuleChange_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_ResubmitApprovalResponse` in responses.
  */
-export const cloudforce_one_ResubmitApprovalResponse_output: JsonSchema = {
+export const cloudforce$$one_ResubmitApprovalResponse: JsonSchema = {
   "properties": {
     "approval_id": {
       "type": "number"
@@ -318,7 +318,7 @@ export const cloudforce_one_ResubmitApprovalResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_Rule` in responses.
  */
-export const cloudforce_one_Rule_output: JsonSchema = {
+export const cloudforce$$one_Rule: JsonSchema = {
   "properties": {
     "content": {
       "type": "string"
@@ -412,7 +412,7 @@ export const cloudforce_one_Rule_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_RuleMetaEntry` in responses.
  */
-export const cloudforce_one_RuleMetaEntry_output: JsonSchema = {
+export const cloudforce$$one_RuleMetaEntry: JsonSchema = {
   "properties": {
     "key": {
       "type": "string"
@@ -450,7 +450,7 @@ export const cloudforce_one_RuleMetaEntry_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_RulePreview` in responses.
  */
-export const cloudforce_one_RulePreview_output: JsonSchema = {
+export const cloudforce$$one_RulePreview: JsonSchema = {
   "properties": {
     "content": {
       "type": "string"
@@ -543,7 +543,7 @@ export const cloudforce_one_RulePreview_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_RuleSearchResult` in responses.
  */
-export const cloudforce_one_RuleSearchResult_output: JsonSchema = {
+export const cloudforce$$one_RuleSearchResult: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudforce-one_RulePreview"
@@ -585,7 +585,7 @@ export const cloudforce_one_RuleSearchResult_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_RulesPreviewListResponse` in responses.
  */
-export const cloudforce_one_RulesPreviewListResponse_output: JsonSchema = {
+export const cloudforce$$one_RulesPreviewListResponse: JsonSchema = {
   "properties": {
     "rules": {
       "items": {
@@ -607,7 +607,7 @@ export const cloudforce_one_RulesPreviewListResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_RulesSearchResponse` in responses.
  */
-export const cloudforce_one_RulesSearchResponse_output: JsonSchema = {
+export const cloudforce$$one_RulesSearchResponse: JsonSchema = {
   "properties": {
     "fallback": {
       "type": "boolean"
@@ -660,7 +660,7 @@ export const cloudforce_one_RulesSearchResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_SuccessResponse` in responses.
  */
-export const cloudforce_one_SuccessResponse_output: JsonSchema = {
+export const cloudforce$$one_SuccessResponse: JsonSchema = {
   "properties": {
     "success": {
       "type": "boolean"
@@ -675,7 +675,7 @@ export const cloudforce_one_SuccessResponse_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_ValidationResponse` in responses.
  */
-export const cloudforce_one_ValidationResponse_output: JsonSchema = {
+export const cloudforce$$one_ValidationResponse: JsonSchema = {
   "properties": {
     "error": {
       "type": "string"
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/schemas.ts b/src/generated/forge-mcp/cloudforceOne/rules/schemas.ts
index 331723910..91eed6c27 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/schemas.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cloudforce-one_CreateRule`.
  */
-export const cloudforce_one_CreateRule: JsonSchema = {
+export const cloudforce$$one_CreateRule: JsonSchema = {
   "properties": {
     "actions": {
       "items": {
@@ -69,7 +69,7 @@ export const cloudforce_one_CreateRule: JsonSchema = {
 /**
  * The schema of `cloudforce-one_DeleteRuleBody`.
  */
-export const cloudforce_one_DeleteRuleBody: JsonSchema = {
+export const cloudforce$$one_DeleteRuleBody: JsonSchema = {
   "properties": {
     "commit_message": {
       "description": "Human-readable justification for the deletion. Required for internal-account submissions; optional for customer accounts and automated sync.",
@@ -82,7 +82,7 @@ export const cloudforce_one_DeleteRuleBody: JsonSchema = {
 /**
  * The schema of `cloudforce-one_MetaInputEntry`.
  */
-export const cloudforce_one_MetaInputEntry: JsonSchema = {
+export const cloudforce$$one_MetaInputEntry: JsonSchema = {
   "description": "A YARA meta entry. The server resolves its value type. The 'detection' key accepts MALICIOUS, SUSPICIOUS, SPAM, or SPOOF.",
   "properties": {
     "key": {
@@ -112,7 +112,7 @@ export const cloudforce_one_MetaInputEntry: JsonSchema = {
 /**
  * The schema of `cloudforce-one_RuleAction`.
  */
-export const cloudforce_one_RuleAction: JsonSchema = {
+export const cloudforce$$one_RuleAction: JsonSchema = {
   "properties": {
     "action_config": {
       "additionalProperties": {
@@ -171,7 +171,7 @@ export const cloudforce_one_RuleAction: JsonSchema = {
 /**
  * The schema of `cloudforce-one_UpdateRule`.
  */
-export const cloudforce_one_UpdateRule: JsonSchema = {
+export const cloudforce$$one_UpdateRule: JsonSchema = {
   "properties": {
     "commit_message": {
       "description": "Human-readable justification for this change. Required for internal-account submissions; optional for customer accounts and automated sync.",
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/stats/outputs.ts b/src/generated/forge-mcp/cloudforceOne/rules/stats/outputs.ts
index 8f848dea5..d6034c260 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/stats/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/stats/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one_StatsResponse` in responses.
  */
-export const cloudforce_one_StatsResponse_output: JsonSchema = {
+export const cloudforce$$one_StatsResponse: JsonSchema = {
   "properties": {
     "pending_approvals": {
       "type": "number"
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/stats/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/stats/tools.ts
index 96d9fb66e..b595a197d 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/stats/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/stats/tools.ts
@@ -2,33 +2,43 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../../_/tool.js";
-import { cloudforce_one_ErrorResponse_output } from "../outputs.js";
-import { cloudforce_one_StatsResponse_output } from "./outputs.js";
+import { cloudforce$$one_ErrorResponse } from "../outputs.js";
+import { cloudforce$$one_StatsResponse } from "./outputs.js";
 
 /**
- * The tools of `cloudforce_one.rules.stats`.
+ * The tools of `cloudforceOne.rules.stats`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_stats_get",
+    name: "cloudforceOne_rules_stats_get",
     title: "Get dashboard stats",
-    description: "Get statistics about rules for the dashboard.",
+    description: "Get statistics about rules for the dashboard.\n\nGET /accounts/{account_id}/cloudforce-one/rules/stats",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_StatsResponse",
       $defs: {
-        "cloudforce-one_StatsResponse": cloudforce_one_StatsResponse_output,
+        "cloudforce-one_StatsResponse": cloudforce$$one_StatsResponse,
       },
     },
     annotations: {
@@ -50,8 +60,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_StatsResponse": cloudforce_one_StatsResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_StatsResponse": cloudforce$$one_StatsResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/tools.ts
index e679ea1e6..3f6c6bd44 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/tools.ts
@@ -1,56 +1,66 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  cloudforce_one_ApprovalConflictResponse_output,
-  cloudforce_one_ApprovalPendingResponse_output,
-  cloudforce_one_DeleteAllResponse_output,
-  cloudforce_one_ErrorResponse_output,
-  cloudforce_one_PendingRuleChange_output,
-  cloudforce_one_RuleMetaEntry_output,
-  cloudforce_one_RulePreview_output,
-  cloudforce_one_RuleSearchResult_output,
-  cloudforce_one_Rule_output,
-  cloudforce_one_RulesPreviewListResponse_output,
-  cloudforce_one_RulesSearchResponse_output,
-  cloudforce_one_SuccessResponse_output,
-  cloudforce_one_ValidationResponse_output,
+  cloudforce$$one_ApprovalConflictResponse,
+  cloudforce$$one_ApprovalPendingResponse,
+  cloudforce$$one_DeleteAllResponse,
+  cloudforce$$one_ErrorResponse,
+  cloudforce$$one_PendingRuleChange,
+  cloudforce$$one_Rule,
+  cloudforce$$one_RuleMetaEntry,
+  cloudforce$$one_RulePreview,
+  cloudforce$$one_RuleSearchResult,
+  cloudforce$$one_RulesPreviewListResponse,
+  cloudforce$$one_RulesSearchResponse,
+  cloudforce$$one_SuccessResponse,
+  cloudforce$$one_ValidationResponse,
 } from "./outputs.js";
 import {
-  cloudforce_one_CreateRule,
-  cloudforce_one_DeleteRuleBody,
-  cloudforce_one_MetaInputEntry,
-  cloudforce_one_RuleAction,
-  cloudforce_one_UpdateRule,
+  cloudforce$$one_CreateRule,
+  cloudforce$$one_DeleteRuleBody,
+  cloudforce$$one_MetaInputEntry,
+  cloudforce$$one_RuleAction,
+  cloudforce$$one_UpdateRule,
 } from "./schemas.js";
 
 /**
- * The tools of `cloudforce_one.rules`.
+ * The tools of `cloudforceOne.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_create",
+    name: "cloudforceOne_rules_create",
     title: "Create a rule",
-    description: "Create a new detection rule.",
+    description: "Create a new detection rule.\n\nPOST /accounts/{account_id}/cloudforce-one/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cloudforce-one_CreateRule"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_CreateRule": cloudforce_one_CreateRule,
-        "cloudforce-one_MetaInputEntry": cloudforce_one_MetaInputEntry,
-        "cloudforce-one_RuleAction": cloudforce_one_RuleAction,
+        "cloudforce-one_CreateRule": cloudforce$$one_CreateRule,
+        "cloudforce-one_MetaInputEntry": cloudforce$$one_MetaInputEntry,
+        "cloudforce-one_RuleAction": cloudforce$$one_RuleAction,
       },
     },
     outputSchema: {
@@ -63,10 +73,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_Rule": cloudforce_one_Rule_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_Rule": cloudforce$$one_Rule,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
       },
     },
     annotations: {
@@ -94,11 +104,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_Rule": cloudforce_one_Rule_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_Rule": cloudforce$$one_Rule,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
       },
     },
     request: (args) => ({
@@ -107,31 +117,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_delete",
+    name: "cloudforceOne_rules_delete",
     title: "Delete a rule",
-    description: "Delete an existing rule.",
+    description: "Delete an existing rule.\n\nDELETE /accounts/{account_id}/cloudforce-one/rules/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cloudforce-one_DeleteRuleBody"
         },
-        "id": {
-          "description": "The unique identifier for the rule.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the rule.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_DeleteRuleBody": cloudforce_one_DeleteRuleBody,
+        "cloudforce-one_DeleteRuleBody": cloudforce$$one_DeleteRuleBody,
       },
     },
     outputSchema: {
@@ -144,8 +164,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_SuccessResponse": cloudforce_one_SuccessResponse_output,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_SuccessResponse": cloudforce$$one_SuccessResponse,
       },
     },
     annotations: {
@@ -179,10 +199,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalConflictResponse": cloudforce_one_ApprovalConflictResponse_output,
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_SuccessResponse": cloudforce_one_SuccessResponse_output,
+        "cloudforce-one_ApprovalConflictResponse": cloudforce$$one_ApprovalConflictResponse,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_SuccessResponse": cloudforce$$one_SuccessResponse,
       },
     },
     request: (args) => ({
@@ -191,25 +211,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_delete_all",
+    name: "cloudforceOne_rules_deleteAll",
     title: "Delete all rules",
-    description: "Delete all rules in an account.",
+    description: "Delete all rules in an account.\n\nDELETE /accounts/{account_id}/cloudforce-one/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_DeleteAllResponse",
       $defs: {
-        "cloudforce-one_DeleteAllResponse": cloudforce_one_DeleteAllResponse_output,
+        "cloudforce-one_DeleteAllResponse": cloudforce$$one_DeleteAllResponse,
       },
     },
     annotations: {
@@ -234,8 +264,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_DeleteAllResponse": cloudforce_one_DeleteAllResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
+        "cloudforce-one_DeleteAllResponse": cloudforce$$one_DeleteAllResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
       },
     },
     request: (args) => ({
@@ -243,33 +273,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_get",
+    name: "cloudforceOne_rules_get",
     title: "Get a rule",
-    description: "Get a single rule by ID.",
+    description: "Get a single rule by ID.\n\nGET /accounts/{account_id}/cloudforce-one/rules/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "id": {
-          "description": "The unique identifier for the rule.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the rule.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_RulePreview",
       $defs: {
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     annotations: {
@@ -294,10 +334,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     request: (args) => ({
@@ -305,92 +345,108 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_list",
+    name: "cloudforceOne_rules_list",
     title: "List rules",
-    description: "Returns all rules for an account with optional filtering.",
+    description: "Returns all rules for an account with optional filtering.\n\nGET /accounts/{account_id}/cloudforce-one/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "is_public": {
-          "description": "Limits rules to the specified public visibility.",
-          "enum": [
-            "true",
-            "false"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "type": "number"
-        },
-        "namespace": {
-          "anyOf": [
-            {
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
               "type": "string"
-            },
-            {
-              "items": {
-                "type": "string"
-              },
-              "maxItems": 50,
-              "type": "array"
             }
+          },
+          "required": [
+            "account_id"
           ],
-          "description": "Selects namespaces. Repeat the parameter to select multiple namespaces (for example, namespace=foo&namespace=bar)."
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "oneOf": [
-            {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "is_public": {
+              "description": "Limits rules to the specified public visibility.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 50,
               "type": "number"
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "path": {
-          "anyOf": [
-            {
+            "namespace": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "items": {
+                    "type": "string"
+                  },
+                  "maxItems": 50,
+                  "type": "array"
+                }
+              ],
+              "description": "Selects namespaces. Repeat the parameter to select multiple namespaces (for example, namespace=foo&namespace=bar)."
+            },
+            "offset": {
+              "default": 0,
+              "oneOf": [
+                {
+                  "type": "number"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "path": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "items": {
+                    "type": "string"
+                  },
+                  "maxItems": 50,
+                  "type": "array"
+                }
+              ],
+              "description": "Selects paths with exact-match semantics. Omit the parameter to return rules from all paths. Pass an empty string (path=) to return only rules with an empty or uncategorized path. Pass a value (for example, path=yara) to match that exact path. Repeat the parameter (for example, path=yara&path=expr) to OR-match multiple paths with SQL `IN (...)` semantics. The `recursive` flag affects only customer-account namespace selection."
+            },
+            "recursive": {
+              "description": "For customer accounts, true enables descendant matching for namespaces. Paths always use exact matching.",
+              "enum": [
+                "true",
+                "false"
+              ],
               "type": "string"
             },
-            {
-              "items": {
-                "type": "string"
-              },
-              "maxItems": 50,
-              "type": "array"
+            "search": {
+              "type": "string"
             }
-          ],
-          "description": "Selects paths with exact-match semantics. Omit the parameter to return rules from all paths. Pass an empty string (path=) to return only rules with an empty or uncategorized path. Pass a value (for example, path=yara) to match that exact path. Repeat the parameter (for example, path=yara&path=expr) to OR-match multiple paths with SQL `IN (...)` semantics. The `recursive` flag affects only customer-account namespace selection."
-        },
-        "recursive": {
-          "description": "For customer accounts, true enables descendant matching for namespaces. Paths always use exact matching.",
-          "enum": [
-            "true",
-            "false"
-          ],
-          "type": "string"
-        },
-        "search": {
-          "type": "string"
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_RulesPreviewListResponse",
       $defs: {
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
-        "cloudforce-one_RulesPreviewListResponse": cloudforce_one_RulesPreviewListResponse_output,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
+        "cloudforce-one_RulesPreviewListResponse": cloudforce$$one_RulesPreviewListResponse,
       },
     },
     annotations: {
@@ -412,138 +468,157 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
-        "cloudforce-one_RulesPreviewListResponse": cloudforce_one_RulesPreviewListResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
+        "cloudforce-one_RulesPreviewListResponse": cloudforce$$one_RulesPreviewListResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/rules`,
       query: [
-        ["namespace", args["namespace"], true],
-        ["path", args["path"], true],
-        ["recursive", args["recursive"], true],
-        ["search", args["search"], true],
-        ["is_public", args["is_public"], true],
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["namespace", param(args, "query", "namespace"), true],
+        ["path", param(args, "query", "path"), true],
+        ["recursive", param(args, "query", "recursive"), true],
+        ["search", param(args, "query", "search"), true],
+        ["is_public", param(args, "query", "is_public"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_rules_search",
+    name: "cloudforceOne_rules_search",
     title: "Search rules",
-    description: "Search rules using hybrid, vector, keyword, or exact retrieval, backed by AI Search with a SQL fallback.",
+    description: "Search rules using hybrid, vector, keyword, or exact retrieval, backed by AI Search with a SQL fallback.\n\nGET /accounts/{account_id}/cloudforce-one/rules/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "is_public": {
-          "description": "Limits rules to the specified public visibility.",
-          "enum": [
-            "true",
-            "false"
-          ],
-          "type": "string"
-        },
-        "language": {
-          "description": "Limits results to the specified rule language.",
-          "enum": [
-            "yara",
-            "js"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "type": "number"
-        },
-        "namespace": {
-          "anyOf": [
-            {
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
               "type": "string"
-            },
-            {
-              "items": {
-                "type": "string"
-              },
-              "maxItems": 50,
-              "type": "array"
             }
+          },
+          "required": [
+            "account_id"
           ],
-          "description": "Selects namespaces. Repeat the parameter to select multiple namespaces (for example, namespace=foo&namespace=bar)."
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "oneOf": [
-            {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "is_public": {
+              "description": "Limits rules to the specified public visibility.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "language": {
+              "description": "Limits results to the specified rule language.",
+              "enum": [
+                "yara",
+                "js"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 50,
               "type": "number"
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "path": {
-          "anyOf": [
-            {
+            "mode": {
+              "default": "hybrid",
+              "description": "Retrieval strategy used for the query.",
+              "enum": [
+                "exact",
+                "hybrid",
+                "vector",
+                "keyword"
+              ],
               "type": "string"
             },
-            {
-              "items": {
-                "type": "string"
-              },
-              "maxItems": 50,
-              "type": "array"
+            "namespace": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "items": {
+                    "type": "string"
+                  },
+                  "maxItems": 50,
+                  "type": "array"
+                }
+              ],
+              "description": "Selects namespaces. Repeat the parameter to select multiple namespaces (for example, namespace=foo&namespace=bar)."
+            },
+            "offset": {
+              "default": 0,
+              "oneOf": [
+                {
+                  "type": "number"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "path": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "items": {
+                    "type": "string"
+                  },
+                  "maxItems": 50,
+                  "type": "array"
+                }
+              ],
+              "description": "Selects paths with exact-match semantics. Omit the parameter to return rules from all paths. Pass an empty string (path=) to return only rules with an empty or uncategorized path. Pass a value (for example, path=yara) to match that exact path. Repeat the parameter (for example, path=yara&path=expr) to OR-match multiple paths with SQL `IN (...)` semantics. The `recursive` flag affects only customer-account namespace selection."
+            },
+            "query": {
+              "description": "Natural-language or keyword search query.",
+              "type": "string"
+            },
+            "recursive": {
+              "description": "For customer accounts, true enables descendant matching for namespaces. Paths always use exact matching.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "search": {
+              "type": "string"
             }
+          },
+          "required": [
+            "query"
           ],
-          "description": "Selects paths with exact-match semantics. Omit the parameter to return rules from all paths. Pass an empty string (path=) to return only rules with an empty or uncategorized path. Pass a value (for example, path=yara) to match that exact path. Repeat the parameter (for example, path=yara&path=expr) to OR-match multiple paths with SQL `IN (...)` semantics. The `recursive` flag affects only customer-account namespace selection."
-        },
-        "query": {
-          "description": "Natural-language or keyword search query.",
-          "type": "string"
-        },
-        "recursive": {
-          "description": "For customer accounts, true enables descendant matching for namespaces. Paths always use exact matching.",
-          "enum": [
-            "true",
-            "false"
-          ],
-          "type": "string"
-        },
-        "search": {
-          "type": "string"
-        },
-        "search_mode": {
-          "default": "hybrid",
-          "description": "Retrieval strategy used for the query.",
-          "enum": [
-            "exact",
-            "hybrid",
-            "vector",
-            "keyword"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_RulesSearchResponse",
       $defs: {
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
-        "cloudforce-one_RuleSearchResult": cloudforce_one_RuleSearchResult_output,
-        "cloudforce-one_RulesSearchResponse": cloudforce_one_RulesSearchResponse_output,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
+        "cloudforce-one_RuleSearchResult": cloudforce$$one_RuleSearchResult,
+        "cloudforce-one_RulesSearchResponse": cloudforce$$one_RulesSearchResponse,
       },
     },
     annotations: {
@@ -568,57 +643,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
-        "cloudforce-one_RuleSearchResult": cloudforce_one_RuleSearchResult_output,
-        "cloudforce-one_RulesSearchResponse": cloudforce_one_RulesSearchResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
+        "cloudforce-one_RuleSearchResult": cloudforce$$one_RuleSearchResult,
+        "cloudforce-one_RulesSearchResponse": cloudforce$$one_RulesSearchResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/rules/search`,
       query: [
-        ["namespace", args["namespace"], true],
-        ["path", args["path"], true],
-        ["recursive", args["recursive"], true],
-        ["search", args["search"], true],
-        ["is_public", args["is_public"], true],
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["query", args["query"], true],
-        ["mode", args["search_mode"], true],
-        ["language", args["language"], true],
+        ["namespace", param(args, "query", "namespace"), true],
+        ["path", param(args, "query", "path"), true],
+        ["recursive", param(args, "query", "recursive"), true],
+        ["search", param(args, "query", "search"), true],
+        ["is_public", param(args, "query", "is_public"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["query", param(args, "query", "query"), true],
+        ["mode", param(args, "query", "mode"), true],
+        ["language", param(args, "query", "language"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_rules_update",
+    name: "cloudforceOne_rules_update",
     title: "Update a rule",
-    description: "Updates an existing rule.",
+    description: "Updates an existing rule.\n\nPUT /accounts/{account_id}/cloudforce-one/rules/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cloudforce-one_UpdateRule"
         },
-        "id": {
-          "description": "The unique identifier for the rule.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The unique identifier for the rule.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one_MetaInputEntry": cloudforce_one_MetaInputEntry,
-        "cloudforce-one_UpdateRule": cloudforce_one_UpdateRule,
+        "cloudforce-one_MetaInputEntry": cloudforce$$one_MetaInputEntry,
+        "cloudforce-one_UpdateRule": cloudforce$$one_UpdateRule,
       },
     },
     outputSchema: {
@@ -631,10 +716,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     annotations: {
@@ -665,12 +750,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ApprovalConflictResponse": cloudforce_one_ApprovalConflictResponse_output,
-        "cloudforce-one_ApprovalPendingResponse": cloudforce_one_ApprovalPendingResponse_output,
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_PendingRuleChange": cloudforce_one_PendingRuleChange_output,
-        "cloudforce-one_RuleMetaEntry": cloudforce_one_RuleMetaEntry_output,
-        "cloudforce-one_RulePreview": cloudforce_one_RulePreview_output,
+        "cloudforce-one_ApprovalConflictResponse": cloudforce$$one_ApprovalConflictResponse,
+        "cloudforce-one_ApprovalPendingResponse": cloudforce$$one_ApprovalPendingResponse,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_PendingRuleChange": cloudforce$$one_PendingRuleChange,
+        "cloudforce-one_RuleMetaEntry": cloudforce$$one_RuleMetaEntry,
+        "cloudforce-one_RulePreview": cloudforce$$one_RulePreview,
       },
     },
     request: (args) => ({
@@ -679,16 +764,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_rules_validate",
+    name: "cloudforceOne_rules_validate",
     title: "Validate rule with context",
-    description: "Validates rule syntax, name uniqueness, namespace, and metadata.",
+    description: "Validates rule syntax, name uniqueness, namespace, and metadata.\n\nPOST /accounts/{account_id}/cloudforce-one/rules/validate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "content": {
@@ -717,16 +798,30 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_ValidationResponse",
       $defs: {
-        "cloudforce-one_ValidationResponse": cloudforce_one_ValidationResponse_output,
+        "cloudforce-one_ValidationResponse": cloudforce$$one_ValidationResponse,
       },
     },
     annotations: {
@@ -748,8 +843,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_ValidationResponse": cloudforce_one_ValidationResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_ValidationResponse": cloudforce$$one_ValidationResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/tree/outputs.ts b/src/generated/forge-mcp/cloudforceOne/rules/tree/outputs.ts
index 0ef437fa5..846f14ac0 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/tree/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/tree/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one_TreeNode` in responses.
  */
-export const cloudforce_one_TreeNode_output: JsonSchema = {
+export const cloudforce$$one_TreeNode: JsonSchema = {
   "properties": {
     "children": {
       "items": {
@@ -36,7 +36,7 @@ export const cloudforce_one_TreeNode_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one_TreeResponse` in responses.
  */
-export const cloudforce_one_TreeResponse_output: JsonSchema = {
+export const cloudforce$$one_TreeResponse: JsonSchema = {
   "properties": {
     "tree": {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/rules/tree/tools.ts b/src/generated/forge-mcp/cloudforceOne/rules/tree/tools.ts
index b1ab87498..70cd8077e 100644
--- a/src/generated/forge-mcp/cloudforceOne/rules/tree/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/rules/tree/tools.ts
@@ -2,37 +2,47 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../../_/tool.js";
-import { cloudforce_one_ErrorResponse_output } from "../outputs.js";
+import { cloudforce$$one_ErrorResponse } from "../outputs.js";
 import {
-  cloudforce_one_TreeNode_output,
-  cloudforce_one_TreeResponse_output,
+  cloudforce$$one_TreeNode,
+  cloudforce$$one_TreeResponse,
 } from "./outputs.js";
 
 /**
- * The tools of `cloudforce_one.rules.tree`.
+ * The tools of `cloudforceOne.rules.tree`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_rules_tree_get",
+    name: "cloudforceOne_rules_tree_get",
     title: "Get folder tree structure",
-    description: "Get the folder tree structure for rules navigation.",
+    description: "Get the folder tree structure for rules navigation.\n\nGET /accounts/{account_id}/cloudforce-one/rules/tree",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one_TreeResponse",
       $defs: {
-        "cloudforce-one_TreeNode": cloudforce_one_TreeNode_output,
-        "cloudforce-one_TreeResponse": cloudforce_one_TreeResponse_output,
+        "cloudforce-one_TreeNode": cloudforce$$one_TreeNode,
+        "cloudforce-one_TreeResponse": cloudforce$$one_TreeResponse,
       },
     },
     annotations: {
@@ -54,9 +64,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one_ErrorResponse": cloudforce_one_ErrorResponse_output,
-        "cloudforce-one_TreeNode": cloudforce_one_TreeNode_output,
-        "cloudforce-one_TreeResponse": cloudforce_one_TreeResponse_output,
+        "cloudforce-one_ErrorResponse": cloudforce$$one_ErrorResponse,
+        "cloudforce-one_TreeNode": cloudforce$$one_TreeNode,
+        "cloudforce-one_TreeResponse": cloudforce$$one_TreeResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/scans/config/outputs.ts b/src/generated/forge-mcp/cloudforceOne/scans/config/outputs.ts
index de8c66293..c7777fd70 100644
--- a/src/generated/forge-mcp/cloudforceOne/scans/config/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/scans/config/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `cloudforce-one-port-scan-api_frequency` in responses.
- */
-export const cloudforce_one_port_scan_api_frequency_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `cloudforce-one-port-scan-api_ips` in responses.
  */
-export const cloudforce_one_port_scan_api_ips_output: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_ips: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -23,7 +16,7 @@ export const cloudforce_one_port_scan_api_ips_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one-port-scan-api_ports` in responses.
  */
-export const cloudforce_one_port_scan_api_ports_output: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_ports: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -33,13 +26,13 @@ export const cloudforce_one_port_scan_api_ports_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one-port-scan-api_scan-config` in responses.
  */
-export const cloudforce_one_port_scan_api_scan_config_output: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_scan$$config: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
     },
     "frequency": {
-      "$ref": "#/$defs/cloudforce-one-port-scan-api_frequency"
+      "type": "number"
     },
     "id": {
       "type": "string"
diff --git a/src/generated/forge-mcp/cloudforceOne/scans/config/schemas.ts b/src/generated/forge-mcp/cloudforceOne/scans/config/schemas.ts
index eaa797ac8..1d78a8e7a 100644
--- a/src/generated/forge-mcp/cloudforceOne/scans/config/schemas.ts
+++ b/src/generated/forge-mcp/cloudforceOne/scans/config/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `cloudforce-one-port-scan-api_frequency`.
- */
-export const cloudforce_one_port_scan_api_frequency: JsonSchema = {
-  "description": "Defines the number of days between each scan (0 = One-off scan).",
-  "type": "number"
-};
-
 /**
  * The schema of `cloudforce-one-port-scan-api_ips`.
  */
-export const cloudforce_one_port_scan_api_ips: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_ips: JsonSchema = {
   "description": "Defines a list of IP addresses or CIDR blocks to scan. The maximum number of total IP addresses allowed is 5000.",
   "items": {
     "type": "string"
@@ -25,7 +17,7 @@ export const cloudforce_one_port_scan_api_ips: JsonSchema = {
 /**
  * The schema of `cloudforce-one-port-scan-api_ports`.
  */
-export const cloudforce_one_port_scan_api_ports: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_ports: JsonSchema = {
   "description": "Defines a list of ports to scan. Valid values are:\"default\", \"all\", or a comma-separated list of ports or range of ports (e.g. [\"1-80\", \"443\"]). \"default\" scans the 100 most commonly open ports.",
   "items": {
     "type": "string"
diff --git a/src/generated/forge-mcp/cloudforceOne/scans/config/tools.ts b/src/generated/forge-mcp/cloudforceOne/scans/config/tools.ts
index 01192be97..7faa1179c 100644
--- a/src/generated/forge-mcp/cloudforceOne/scans/config/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/scans/config/tools.ts
@@ -3,42 +3,36 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cloudforce_one_port_scan_api_api_response_common_failure_output,
-  cloudforce_one_port_scan_api_api_response_common_output,
-  cloudforce_one_port_scan_api_messages_output,
+  cloudforce$$one$$port$$scan$$api_api$$response$$common,
+  cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure,
+  cloudforce$$one$$port$$scan$$api_messages,
 } from "../outputs.js";
 import {
-  cloudforce_one_port_scan_api_frequency_output,
-  cloudforce_one_port_scan_api_ips_output,
-  cloudforce_one_port_scan_api_ports_output,
-  cloudforce_one_port_scan_api_scan_config_output,
+  cloudforce$$one$$port$$scan$$api_ips,
+  cloudforce$$one$$port$$scan$$api_ports,
+  cloudforce$$one$$port$$scan$$api_scan$$config,
 } from "./outputs.js";
 import {
-  cloudforce_one_port_scan_api_frequency,
-  cloudforce_one_port_scan_api_ips,
-  cloudforce_one_port_scan_api_ports,
+  cloudforce$$one$$port$$scan$$api_ips as cloudforce$$one$$port$$scan$$api_ips$,
+  cloudforce$$one$$port$$scan$$api_ports as cloudforce$$one$$port$$scan$$api_ports$,
 } from "./schemas.js";
 
 /**
- * The tools of `cloudforce_one.scans.config`.
+ * The tools of `cloudforceOne.scans.config`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_scans_config_create",
+    name: "cloudforceOne_scans_config_create",
     title: "Create a new Scan Config",
-    description: "Creates a new scan configuration for Cloudforce One's network scanning service.",
+    description: "Creates a new scan configuration for Cloudforce One's network scanning service.\n\nPOST /accounts/{account_id}/cloudforce-one/scans/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Defines the Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "frequency": {
-              "$ref": "#/$defs/cloudforce-one-port-scan-api_frequency",
-              "description": "Defines the number of days between each scan (0 = One-off scan)."
+              "description": "Defines the number of days between each scan (0 = One-off scan).",
+              "type": "number"
             },
             "ips": {
               "$ref": "#/$defs/cloudforce-one-port-scan-api_ips",
@@ -53,15 +47,28 @@ export const tools: readonly Tool[] = [
             "ips"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Defines the Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one-port-scan-api_frequency": cloudforce_one_port_scan_api_frequency,
-        "cloudforce-one-port-scan-api_ips": cloudforce_one_port_scan_api_ips,
-        "cloudforce-one-port-scan-api_ports": cloudforce_one_port_scan_api_ports,
+        "cloudforce-one-port-scan-api_ips": cloudforce$$one$$port$$scan$$api_ips$,
+        "cloudforce-one-port-scan-api_ports": cloudforce$$one$$port$$scan$$api_ports$,
       },
     },
     outputSchema: {
@@ -79,12 +86,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_frequency": cloudforce_one_port_scan_api_frequency_output,
-        "cloudforce-one-port-scan-api_ips": cloudforce_one_port_scan_api_ips_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
-        "cloudforce-one-port-scan-api_ports": cloudforce_one_port_scan_api_ports_output,
-        "cloudforce-one-port-scan-api_scan-config": cloudforce_one_port_scan_api_scan_config_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_ips": cloudforce$$one$$port$$scan$$api_ips,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
+        "cloudforce-one-port-scan-api_ports": cloudforce$$one$$port$$scan$$api_ports,
+        "cloudforce-one-port-scan-api_scan-config": cloudforce$$one$$port$$scan$$api_scan$$config,
       },
     },
     annotations: {
@@ -123,13 +129,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce_one_port_scan_api_api_response_common_failure_output,
-        "cloudforce-one-port-scan-api_frequency": cloudforce_one_port_scan_api_frequency_output,
-        "cloudforce-one-port-scan-api_ips": cloudforce_one_port_scan_api_ips_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
-        "cloudforce-one-port-scan-api_ports": cloudforce_one_port_scan_api_ports_output,
-        "cloudforce-one-port-scan-api_scan-config": cloudforce_one_port_scan_api_scan_config_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure,
+        "cloudforce-one-port-scan-api_ips": cloudforce$$one$$port$$scan$$api_ips,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
+        "cloudforce-one-port-scan-api_ports": cloudforce$$one$$port$$scan$$api_ports,
+        "cloudforce-one-port-scan-api_scan-config": cloudforce$$one$$port$$scan$$api_scan$$config,
       },
     },
     request: (args) => ({
@@ -138,25 +143,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_scans_config_delete",
+    name: "cloudforceOne_scans_config_delete",
     title: "Delete a Scan Config",
-    description: "Deletes a scan configuration from Cloudforce One's network scanning service.",
+    description: "Deletes a scan configuration from Cloudforce One's network scanning service.\n\nDELETE /accounts/{account_id}/cloudforce-one/scans/config/{config_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Defines the Account ID.",
-          "type": "string"
-        },
-        "config_id": {
-          "description": "Defines the Config ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Defines the Account ID.",
+              "type": "string"
+            },
+            "config_id": {
+              "description": "Defines the Config ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "config_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -237,9 +252,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce_one_port_scan_api_api_response_common_failure_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
       },
     },
     request: (args) => ({
@@ -247,21 +262,17 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_scans_config_edit",
+    name: "cloudforceOne_scans_config_edit",
     title: "Update an existing Scan Config",
-    description: "Updates an existing scan configuration in Cloudforce One's network scanning service.",
+    description: "Updates an existing scan configuration in Cloudforce One's network scanning service.\n\nPATCH /accounts/{account_id}/cloudforce-one/scans/config/{config_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Defines the Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "frequency": {
-              "$ref": "#/$defs/cloudforce-one-port-scan-api_frequency",
-              "description": "Defines the number of days between each scan (0 = One-off scan)."
+              "description": "Defines the number of days between each scan (0 = One-off scan).",
+              "type": "number"
             },
             "ips": {
               "$ref": "#/$defs/cloudforce-one-port-scan-api_ips",
@@ -274,19 +285,32 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "config_id": {
-          "description": "Defines the Config ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Defines the Account ID.",
+              "type": "string"
+            },
+            "config_id": {
+              "description": "Defines the Config ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "config_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one-port-scan-api_frequency": cloudforce_one_port_scan_api_frequency,
-        "cloudforce-one-port-scan-api_ips": cloudforce_one_port_scan_api_ips,
-        "cloudforce-one-port-scan-api_ports": cloudforce_one_port_scan_api_ports,
+        "cloudforce-one-port-scan-api_ips": cloudforce$$one$$port$$scan$$api_ips$,
+        "cloudforce-one-port-scan-api_ports": cloudforce$$one$$port$$scan$$api_ports$,
       },
     },
     outputSchema: {
@@ -304,12 +328,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_frequency": cloudforce_one_port_scan_api_frequency_output,
-        "cloudforce-one-port-scan-api_ips": cloudforce_one_port_scan_api_ips_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
-        "cloudforce-one-port-scan-api_ports": cloudforce_one_port_scan_api_ports_output,
-        "cloudforce-one-port-scan-api_scan-config": cloudforce_one_port_scan_api_scan_config_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_ips": cloudforce$$one$$port$$scan$$api_ips,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
+        "cloudforce-one-port-scan-api_ports": cloudforce$$one$$port$$scan$$api_ports,
+        "cloudforce-one-port-scan-api_scan-config": cloudforce$$one$$port$$scan$$api_scan$$config,
       },
     },
     annotations: {
@@ -348,13 +371,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce_one_port_scan_api_api_response_common_failure_output,
-        "cloudforce-one-port-scan-api_frequency": cloudforce_one_port_scan_api_frequency_output,
-        "cloudforce-one-port-scan-api_ips": cloudforce_one_port_scan_api_ips_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
-        "cloudforce-one-port-scan-api_ports": cloudforce_one_port_scan_api_ports_output,
-        "cloudforce-one-port-scan-api_scan-config": cloudforce_one_port_scan_api_scan_config_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure,
+        "cloudforce-one-port-scan-api_ips": cloudforce$$one$$port$$scan$$api_ips,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
+        "cloudforce-one-port-scan-api_ports": cloudforce$$one$$port$$scan$$api_ports,
+        "cloudforce-one-port-scan-api_scan-config": cloudforce$$one$$port$$scan$$api_scan$$config,
       },
     },
     request: (args) => ({
@@ -363,20 +385,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_scans_config_list",
+    name: "cloudforceOne_scans_config_list",
     title: "List Scan Configs",
-    description: "Lists scan configurations for Cloudforce One's network scanning service.",
+    description: "Lists scan configurations for Cloudforce One's network scanning service.\n\nGET /accounts/{account_id}/cloudforce-one/scans/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Defines the Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Defines the Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -396,12 +428,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_frequency": cloudforce_one_port_scan_api_frequency_output,
-        "cloudforce-one-port-scan-api_ips": cloudforce_one_port_scan_api_ips_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
-        "cloudforce-one-port-scan-api_ports": cloudforce_one_port_scan_api_ports_output,
-        "cloudforce-one-port-scan-api_scan-config": cloudforce_one_port_scan_api_scan_config_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_ips": cloudforce$$one$$port$$scan$$api_ips,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
+        "cloudforce-one-port-scan-api_ports": cloudforce$$one$$port$$scan$$api_ports,
+        "cloudforce-one-port-scan-api_scan-config": cloudforce$$one$$port$$scan$$api_scan$$config,
       },
     },
     annotations: {
@@ -444,13 +475,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce_one_port_scan_api_api_response_common_failure_output,
-        "cloudforce-one-port-scan-api_frequency": cloudforce_one_port_scan_api_frequency_output,
-        "cloudforce-one-port-scan-api_ips": cloudforce_one_port_scan_api_ips_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
-        "cloudforce-one-port-scan-api_ports": cloudforce_one_port_scan_api_ports_output,
-        "cloudforce-one-port-scan-api_scan-config": cloudforce_one_port_scan_api_scan_config_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure,
+        "cloudforce-one-port-scan-api_ips": cloudforce$$one$$port$$scan$$api_ips,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
+        "cloudforce-one-port-scan-api_ports": cloudforce$$one$$port$$scan$$api_ports,
+        "cloudforce-one-port-scan-api_scan-config": cloudforce$$one$$port$$scan$$api_scan$$config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/scans/outputs.ts b/src/generated/forge-mcp/cloudforceOne/scans/outputs.ts
index 9bce41f2e..7864ef628 100644
--- a/src/generated/forge-mcp/cloudforceOne/scans/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/scans/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `cloudforce-one-port-scan-api_api-response-common` in
  * responses.
  */
-export const cloudforce_one_port_scan_api_api_response_common_output: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cloudforce-one-port-scan-api_messages"
@@ -34,7 +34,7 @@ export const cloudforce_one_port_scan_api_api_response_common_output: JsonSchema
  * The schema of `cloudforce-one-port-scan-api_api-response-common-failure` in
  * responses.
  */
-export const cloudforce_one_port_scan_api_api_response_common_failure_output: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudforce-one-port-scan-api_api-response-common"
@@ -56,7 +56,7 @@ export const cloudforce_one_port_scan_api_api_response_common_failure_output: Js
 /**
  * The schema of `cloudforce-one-port-scan-api_messages` in responses.
  */
-export const cloudforce_one_port_scan_api_messages_output: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/cloudforceOne/scans/results/outputs.ts b/src/generated/forge-mcp/cloudforceOne/scans/results/outputs.ts
index 15a4fb3fd..17543eed0 100644
--- a/src/generated/forge-mcp/cloudforceOne/scans/results/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/scans/results/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudforce-one-port-scan-api_port` in responses.
  */
-export const cloudforce_one_port_scan_api_port_output: JsonSchema = {
+export const cloudforce$$one$$port$$scan$$api_port: JsonSchema = {
   "properties": {
     "number": {
       "type": "number"
diff --git a/src/generated/forge-mcp/cloudforceOne/scans/results/tools.ts b/src/generated/forge-mcp/cloudforceOne/scans/results/tools.ts
index c21e23d68..652e37acd 100644
--- a/src/generated/forge-mcp/cloudforceOne/scans/results/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/scans/results/tools.ts
@@ -3,36 +3,46 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cloudforce_one_port_scan_api_api_response_common_failure_output,
-  cloudforce_one_port_scan_api_api_response_common_output,
-  cloudforce_one_port_scan_api_messages_output,
+  cloudforce$$one$$port$$scan$$api_api$$response$$common,
+  cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure,
+  cloudforce$$one$$port$$scan$$api_messages,
 } from "../outputs.js";
-import { cloudforce_one_port_scan_api_port_output } from "./outputs.js";
+import { cloudforce$$one$$port$$scan$$api_port } from "./outputs.js";
 
 /**
- * The tools of `cloudforce_one.scans.results`.
+ * The tools of `cloudforceOne.scans.results`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_scans_results_get",
+    name: "cloudforceOne_scans_results_get",
     title: "Get the Latest Scan Result",
-    description: "Retrieves the latest scan results for a Cloudforce One scan configuration, including discovered open ports.",
+    description: "Retrieves the latest scan results for a Cloudforce One scan configuration, including discovered open ports.\n\nGET /accounts/{account_id}/cloudforce-one/scans/results/{config_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Defines the Account ID.",
-          "type": "string"
-        },
-        "config_id": {
-          "description": "Defines the Config ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Defines the Account ID.",
+              "type": "string"
+            },
+            "config_id": {
+              "description": "Defines the Config ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "config_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -74,7 +84,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudforce-one-port-scan-api_port": cloudforce_one_port_scan_api_port_output,
+        "cloudforce-one-port-scan-api_port": cloudforce$$one$$port$$scan$$api_port,
       },
     },
     annotations: {
@@ -139,10 +149,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce_one_port_scan_api_api_response_common_failure_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
-        "cloudforce-one-port-scan-api_port": cloudforce_one_port_scan_api_port_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
+        "cloudforce-one-port-scan-api_port": cloudforce$$one$$port$$scan$$api_port,
       },
     },
     request: (args) => ({
@@ -150,25 +160,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_scans_results_get_banners",
+    name: "cloudforceOne_scans_results_getBanners",
     title: "Get the Latest Banner Grab Result",
-    description: "Retrieves the latest banner grab results for a Cloudforce One scan configuration, including service banners from open ports.",
+    description: "Retrieves the latest banner grab results for a Cloudforce One scan configuration, including service banners from open ports.\n\nGET /accounts/{account_id}/cloudforce-one/banner/{config_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Defines the Account ID.",
-          "type": "string"
-        },
-        "config_id": {
-          "description": "Defines the Config ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Defines the Account ID.",
+              "type": "string"
+            },
+            "config_id": {
+              "description": "Defines the Config ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "config_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -210,7 +230,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudforce-one-port-scan-api_port": cloudforce_one_port_scan_api_port_output,
+        "cloudforce-one-port-scan-api_port": cloudforce$$one$$port$$scan$$api_port,
       },
     },
     annotations: {
@@ -269,10 +289,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-port-scan-api_api-response-common": cloudforce_one_port_scan_api_api_response_common_output,
-        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce_one_port_scan_api_api_response_common_failure_output,
-        "cloudforce-one-port-scan-api_messages": cloudforce_one_port_scan_api_messages_output,
-        "cloudforce-one-port-scan-api_port": cloudforce_one_port_scan_api_port_output,
+        "cloudforce-one-port-scan-api_api-response-common": cloudforce$$one$$port$$scan$$api_api$$response$$common,
+        "cloudforce-one-port-scan-api_api-response-common-failure": cloudforce$$one$$port$$scan$$api_api$$response$$common$$failure,
+        "cloudforce-one-port-scan-api_messages": cloudforce$$one$$port$$scan$$api_messages,
+        "cloudforce-one-port-scan-api_port": cloudforce$$one$$port$$scan$$api_port,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/groups/members/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/groups/members/tools.ts
index 459f03278..8595b1ee2 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/groups/members/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/groups/members/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.datasets.access.groups.members`.
+ * The tools of `cloudforceOne.threatIntel.datasets.access.groups.members`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_datasets_access_groups_members_create",
+    name: "cloudforceOne_threatIntel_datasets_access_groups_members_create",
     title: "Add an account to a group",
-    description: "Adds an account to an account group. Identify the account by `accountId` or `accountTag`.",
+    description: "Adds an account to an account group. Identify the account by `accountId` or `accountTag`.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/-/groups/{group_id}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "accountId": {
@@ -29,14 +25,28 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -145,28 +155,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_groups_members_delete",
+    name: "cloudforceOne_threatIntel_datasets_access_groups_members_delete",
     title: "Remove an account from a group",
-    description: "Removes an account from an account group.",
+    description: "Removes an account from an account group.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/dataset/-/groups/{group_id}/members/{member_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "group_id": {
-          "type": "string"
-        },
-        "member_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            },
+            "member_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id",
+            "member_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id",
-        "member_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -243,24 +263,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_groups_members_list",
+    name: "cloudforceOne_threatIntel_datasets_access_groups_members_list",
     title: "List group members",
-    description: "Lists the accounts in an account group.",
+    description: "Lists the accounts in an account group.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/-/groups/{group_id}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/groups/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/groups/tools.ts
index 78a479b01..30a1906db 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/groups/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/groups/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.datasets.access.groups`.
+ * The tools of `cloudforceOne.threatIntel.datasets.access.groups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_datasets_access_groups_create",
+    name: "cloudforceOne_threatIntel_datasets_access_groups_create",
     title: "Create an account group",
-    description: "Creates a named group of accounts. To give the group access to a dataset, use `threat-intel datasets access permissions create`.",
+    description: "Creates a named group of accounts. To give the group access to a dataset, use `threat-intel datasets access permissions create`.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/-/groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -32,11 +28,25 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -151,24 +161,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_groups_delete",
+    name: "cloudforceOne_threatIntel_datasets_access_groups_delete",
     title: "Delete an account group",
-    description: "Deletes an account group by its ID.",
+    description: "Deletes an account group by its ID.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/dataset/-/groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -245,24 +265,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_groups_get",
+    name: "cloudforceOne_threatIntel_datasets_access_groups_get",
     title: "Get an account group",
-    description: "Returns an account group by its ID.",
+    description: "Returns an account group by its ID.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/-/groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -436,20 +466,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_groups_list",
+    name: "cloudforceOne_threatIntel_datasets_access_groups_list",
     title: "List account groups",
-    description: "Lists the account groups. A group is a set of accounts that can be given access to a dataset with `threat-intel datasets access permissions create`.",
+    description: "Lists the account groups. A group is a set of accounts that can be given access to a dataset with `threat-intel datasets access permissions create`.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/-/groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -569,16 +609,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_groups_update",
+    name: "cloudforceOne_threatIntel_datasets_access_groups_update",
     title: "Update an account group",
-    description: "Replaces an account group's `name` and `description`.",
+    description: "Replaces an account group's `name` and `description`.\n\nPUT /accounts/{account_id}/cloudforce-one/events/dataset/-/groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -594,14 +630,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/permissions/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/permissions/tools.ts
index 33fdaec3c..81145936e 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/permissions/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/access/permissions/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.datasets.access.permissions`.
+ * The tools of `cloudforceOne.threatIntel.datasets.access.permissions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_datasets_access_permissions_create",
+    name: "cloudforceOne_threatIntel_datasets_access_permissions_create",
     title: "Grant access to a dataset",
-    description: "Gives an account or account group (`subjectType` and `subjectId`) `read` or `write` access to a dataset.",
+    description: "Gives an account or account group (`subjectType` and `subjectId`) `read` or `write` access to a dataset.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/permissions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "role": {
@@ -45,16 +41,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -213,30 +223,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_permissions_delete",
+    name: "cloudforceOne_threatIntel_datasets_access_permissions_delete",
     title: "Revoke access to a dataset",
-    description: "Removes an access grant from a dataset.",
+    description: "Removes an access grant from a dataset.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/permissions/{grant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "grant_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "grant_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "grant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "grant_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -343,26 +363,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_permissions_list",
+    name: "cloudforceOne_threatIntel_datasets_access_permissions_list",
     title: "List dataset permissions",
-    description: "Lists the access grants on a dataset.",
+    description: "Lists the access grants on a dataset.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/permissions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -556,16 +586,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_access_permissions_update",
+    name: "cloudforceOne_threatIntel_datasets_access_permissions_update",
     title: "Change a dataset permission",
-    description: "Changes the `role` of an access grant to `read` or `write`.",
+    description: "Changes the `role` of an access grant to `read` or `write`.\n\nPUT /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/permissions/{grant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "role": {
@@ -581,20 +607,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "grant_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "grant_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "grant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "grant_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/tools.ts
index c510f6eaf..8a9811dc2 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/datasets/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.datasets`.
+ * The tools of `cloudforceOne.threatIntel.datasets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_datasets_create",
+    name: "cloudforceOne_threatIntel_datasets_create",
     title: "Create a dataset",
-    description: "Creates a dataset for grouping events. Set `isPublic` to true to let anyone search it; otherwise only the account can.",
+    description: "Creates a dataset for grouping events. Set `isPublic` to true to let anyone search it; otherwise only the account can.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "isPublic": {
@@ -34,11 +30,25 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -141,25 +151,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_delete",
+    name: "cloudforceOne_threatIntel_datasets_delete",
     title: "Delete a dataset",
-    description: "Deletes a dataset. To see deleted datasets, use `threat-intel datasets list` with `includeDeleted`.",
+    description: "Deletes a dataset. To see deleted datasets, use `threat-intel datasets list` with `includeDeleted`.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset ID to delete",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID to delete",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -274,26 +294,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_get",
+    name: "cloudforceOne_threatIntel_datasets_get",
     title: "Get a dataset",
-    description: "Returns a dataset by its ID.",
+    description: "Returns a dataset by its ID.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -425,24 +455,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_list",
+    name: "cloudforceOne_threatIntel_datasets_list",
     title: "List datasets",
-    description: "Lists the account's datasets. Set `includeDeleted` to include deleted datasets.",
+    description: "Lists the account's datasets. Set `includeDeleted` to include deleted datasets.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "include_deleted": {
-          "description": "When true, include soft-deleted datasets in the response. Each item includes a `deletedAt` field (ISO 8601 or null). Default: false.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "includeDeleted": {
+              "description": "When true, include soft-deleted datasets in the response. Each item includes a `deletedAt` field (ISO 8601 or null). Default: false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -572,25 +618,35 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/dataset`,
       query: [
-        ["includeDeleted", args["include_deleted"], true],
+        ["includeDeleted", param(args, "query", "includeDeleted"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_populate",
+    name: "cloudforceOne_threatIntel_datasets_populate",
     title: "Rebuild dataset lookup lists",
-    description: "Rebuilds the lists of attackers, categories, indicator types, and target industries for the account's datasets from their existing events. Datasets are processed in batches.",
+    description: "Rebuilds the lists of attackers, categories, indicator types, and target industries for the account's datasets from their existing events. Datasets are processed in batches.\n\nPOST /accounts/{account_id}/cloudforce-one/events/datasets/populate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1692,16 +1748,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_datasets_update",
+    name: "cloudforceOne_threatIntel_datasets_update",
     title: "Update a dataset",
-    description: "Updates a dataset's `name` and `isPublic` setting. Both fields are required.",
+    description: "Updates a dataset's `name` and `isPublic` setting. Both fields are required.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "isPublic": {
@@ -1719,16 +1771,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/attackers/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/attackers/tools.ts
index 6498caf27..dc4361ecc 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/attackers/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/attackers/tools.ts
@@ -1,34 +1,50 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.attackers`.
+ * The tools of `cloudforceOne.threatIntel.events.attackers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_attackers_list",
+    name: "cloudforceOne_threatIntel_events_attackers_list",
     title: "List attackers",
-    description: "Lists the attackers referenced by events in the datasets given by `datasetIds`, or in the default dataset when `datasetIds` is omitted.",
+    description: "Lists the attackers referenced by events in the datasets given by `datasetIds`, or in the default dataset when `datasetIds` is omitted.\n\nGET /accounts/{account_id}/cloudforce-one/events/attackers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "dataset_ids": {
-          "description": "Array of dataset IDs to query attackers from. If not provided, uses the default dataset.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetIds": {
+              "description": "Array of dataset IDs to query attackers from. If not provided, uses the default dataset.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -128,7 +144,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/attackers`,
       query: [
-        ["datasetIds", args["dataset_ids"], true],
+        ["datasetIds", param(args, "query", "datasetIds"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/categories/catalog/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/categories/catalog/tools.ts
index 99d8116c2..e91aebbad 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/categories/catalog/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/categories/catalog/tools.ts
@@ -4,24 +4,34 @@
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.categories.catalog`.
+ * The tools of `cloudforceOne.threatIntel.events.categories.catalog`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_categories_catalog_list",
+    name: "cloudforceOne_threatIntel_events_categories_catalog_list",
     title: "List all event categories",
-    description: "Lists every event category in the catalog, whether or not an event uses it. To list only the categories used in specific datasets, use `threat-intel events categories list`.",
+    description: "Lists every event category in the catalog, whether or not an event uses it. To list only the categories used in specific datasets, use `threat-intel events categories list`.\n\nGET /accounts/{account_id}/cloudforce-one/events/categories/catalog",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/categories/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/categories/tools.ts
index c2cdad8bc..bcbf7f2bf 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/categories/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/categories/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.categories`.
+ * The tools of `cloudforceOne.threatIntel.events.categories`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_categories_create",
+    name: "cloudforceOne_threatIntel_events_categories_create",
     title: "Create an event category",
-    description: "Creates an event category for classifying events. `name` and `killChain` are required.",
+    description: "Creates an event category for classifying events. `name` and `killChain` are required.\n\nPOST /accounts/{account_id}/cloudforce-one/events/categories/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "killChain": {
@@ -47,11 +43,25 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -176,26 +186,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_categories_delete",
+    name: "cloudforceOne_threatIntel_events_categories_delete",
     title: "Delete an event category",
-    description: "Deletes an event category by its ID.",
+    description: "Deletes an event category by its ID.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/event-categories/by-id/{category_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "category_id": {
-          "description": "Category UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "category_id": {
+              "description": "Category UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -272,26 +292,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_categories_get",
+    name: "cloudforceOne_threatIntel_events_categories_get",
     title: "Get an event category",
-    description: "Returns an event category by its ID.",
+    description: "Returns an event category by its ID.\n\nGET /accounts/{account_id}/cloudforce-one/events/event-categories/by-id/{category_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "category_id": {
-          "description": "Category UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "category_id": {
+              "description": "Category UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -415,27 +445,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_categories_list",
+    name: "cloudforceOne_threatIntel_events_categories_list",
     title: "List event categories used in datasets",
-    description: "Lists the event categories used by events in the datasets given by `datasetIds`, or in the default dataset when `datasetIds` is omitted. Dataset scope values are not supported. To list every category, use `threat-intel events categories catalog list`.",
+    description: "Lists the event categories used by events in the datasets given by `datasetIds`, or in the default dataset when `datasetIds` is omitted. Dataset scope values are not supported. To list every category, use `threat-intel events categories catalog list`.\n\nGET /accounts/{account_id}/cloudforce-one/events/categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "dataset_ids": {
-          "description": "Array of dataset IDs to query categories from. If not provided, uses the default dataset.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetIds": {
+              "description": "Array of dataset IDs to query categories from. If not provided, uses the default dataset.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -563,21 +609,17 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/categories`,
       query: [
-        ["datasetIds", args["dataset_ids"], true],
+        ["datasetIds", param(args, "query", "datasetIds"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_categories_update",
+    name: "cloudforceOne_threatIntel_events_categories_update",
     title: "Update an event category",
-    description: "Updates the given fields of an event category and leaves the other fields unchanged.",
+    description: "Updates the given fields of an event category and leaves the other fields unchanged.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/event-categories/by-id/{category_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "killChain": {
@@ -604,16 +646,30 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "category_id": {
-          "description": "Category UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "category_id": {
+              "description": "Category UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/countries/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/countries/tools.ts
index 8136ba039..971732a1a 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/countries/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/countries/tools.ts
@@ -4,24 +4,34 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.countries`.
+ * The tools of `cloudforceOne.threatIntel.events.countries`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_countries_list",
+    name: "cloudforceOne_threatIntel_events_countries_list",
     title: "List countries",
-    description: "Lists the countries used in threat intelligence data, such as attacker and target countries.",
+    description: "Lists the countries used in threat intelligence data, such as attacker and target countries.\n\nGET /accounts/{account_id}/cloudforce-one/events/countries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/raw/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/raw/tools.ts
index 27b1a070d..addadbc26 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/raw/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/raw/tools.ts
@@ -4,34 +4,44 @@
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.legacy.raw`.
+ * The tools of `cloudforceOne.threatIntel.events.legacy.raw`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_legacy_raw_get",
+    name: "cloudforceOne_threatIntel_events_legacy_raw_get",
     title: "Get raw event data by raw ID (legacy)",
-    description: "Legacy. Returns raw data stored under a `raw_id`, which new events don't use. Use `threat-intel events raw get` (`GET /events/datasets/{dataset_id}/events/{event_id}/raw`) instead.",
+    description: "Legacy. Returns raw data stored under a `raw_id`, which new events don't use. Use `threat-intel events raw get` (`GET /events/datasets/{dataset_id}/events/{event_id}/raw`) instead.\n\nGET /accounts/{account_id}/cloudforce-one/events/{event_id}/raw/{raw_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
-        },
-        "raw_id": {
-          "description": "Raw Event UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            },
+            "raw_id": {
+              "description": "Raw Event UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "event_id",
+            "raw_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_id",
-        "raw_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -149,16 +159,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_legacy_raw_update",
+    name: "cloudforceOne_threatIntel_events_legacy_raw_update",
     title: "Update raw event data by raw ID (legacy)",
-    description: "Legacy. Updates raw data stored under a `raw_id`, which new events don't use. There is no direct replacement.",
+    description: "Legacy. Updates raw data stored under a `raw_id`, which new events don't use. There is no direct replacement.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/{event_id}/raw/{raw_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "data": {
@@ -173,20 +179,34 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
-        },
-        "raw_id": {
-          "description": "Raw Event UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            },
+            "raw_id": {
+              "description": "Raw Event UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "event_id",
+            "raw_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_id",
-        "raw_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/references/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/references/tools.ts
index 7c8aa01d6..b4837b2cf 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/references/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/references/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.legacy.references`.
+ * The tools of `cloudforceOne.threatIntel.events.legacy.references`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_legacy_references_create",
+    name: "cloudforceOne_threatIntel_events_legacy_references_create",
     title: "Add event references (legacy)",
-    description: "Legacy. Use `threat-intel events relationships create` (`POST /events/relationships/create`) instead.",
+    description: "Legacy. Use `threat-intel events relationships create` (`POST /events/relationships/create`) instead.\n\nPOST /accounts/{account_id}/cloudforce-one/events/relate/{event_id}/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "events": {
@@ -32,15 +28,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -143,16 +153,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_legacy_references_delete",
+    name: "cloudforceOne_threatIntel_events_legacy_references_delete",
     title: "Remove event references (legacy)",
-    description: "Legacy. Removes references created with `threat-intel events legacy references create`. Use `threat-intel events relationships` for new event links.",
+    description: "Legacy. Removes references created with `threat-intel events legacy references create`. Use `threat-intel events relationships` for new event links.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/relate/{event_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "events": {
@@ -167,15 +173,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/tags/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/tags/tools.ts
index 22c9aa77f..c00bda7b8 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/tags/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/tags/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.legacy.tags`.
+ * The tools of `cloudforceOne.threatIntel.events.legacy.tags`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_legacy_tags_create",
+    name: "cloudforceOne_threatIntel_events_legacy_tags_create",
     title: "Add tags to an event (legacy)",
-    description: "Legacy. Use `threat-intel tags relationships create` (`POST /events/tags/{tag_uuid}/relationships`) instead.",
+    description: "Legacy. Use `threat-intel tags relationships create` (`POST /events/tags/{tag_uuid}/relationships`) instead.\n\nPOST /accounts/{account_id}/cloudforce-one/events/event_tag/{event_id}/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "tags": {
@@ -32,15 +28,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -143,16 +153,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_legacy_tags_delete",
+    name: "cloudforceOne_threatIntel_events_legacy_tags_delete",
     title: "Remove tags from an event (legacy)",
-    description: "Legacy. Use `threat-intel tags relationships delete` (`DELETE /events/tags/{tag_uuid}/relationships/{rel_uuid}`) instead.",
+    description: "Legacy. Use `threat-intel tags relationships delete` (`DELETE /events/tags/{tag_uuid}/relationships/{rel_uuid}`) instead.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/event_tag/{event_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "tags": {
@@ -167,15 +173,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/tools.ts
index aeaf6a1e4..b39fc8e05 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/legacy/tools.ts
@@ -4,24 +4,34 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.legacy`.
+ * The tools of `cloudforceOne.threatIntel.events.legacy`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_legacy_graphql",
+    name: "cloudforceOne_threatIntel_events_legacy_graphql",
     title: "Run a GraphQL aggregation over events (legacy)",
-    description: "Legacy. Use `threat-intel events graphql` (`POST /events/graphql`) instead. Both commands run the same query.",
+    description: "Legacy. Use `threat-intel events graphql` (`POST /events/graphql`) instead. Both commands run the same query.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/events/graphql",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/queries/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/queries/tools.ts
index c35257981..65cb3e86c 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/queries/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/queries/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.queries`.
+ * The tools of `cloudforceOne.threatIntel.events.queries`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_queries_create",
+    name: "cloudforceOne_threatIntel_events_queries_create",
     title: "Create a saved event query",
-    description: "Saves an event query under a unique `name`. `query_json` holds the query parameters as a JSON string.",
+    description: "Saves an event query under a unique `name`. `query_json` holds the query parameters as a JSON string.\n\nPOST /accounts/{account_id}/cloudforce-one/events/queries/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "alert_enabled": {
@@ -57,11 +53,25 @@ export const tools: readonly Tool[] = [
             "query_json"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -244,25 +254,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_queries_delete",
+    name: "cloudforceOne_threatIntel_events_queries_delete",
     title: "Delete a saved event query",
-    description: "Deletes a saved event query by its ID.",
+    description: "Deletes a saved event query by its ID.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/queries/{query_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "query_id": {
-          "description": "Event query ID",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "query_id": {
+              "description": "Event query ID",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "query_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -318,25 +338,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_queries_get",
+    name: "cloudforceOne_threatIntel_events_queries_get",
     title: "Get a saved event query",
-    description: "Returns a saved event query by its ID.",
+    description: "Returns a saved event query by its ID.\n\nGET /accounts/{account_id}/cloudforce-one/events/queries/{query_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "query_id": {
-          "description": "Event query ID",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "query_id": {
+              "description": "Event query ID",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "query_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -518,20 +548,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_queries_list",
+    name: "cloudforceOne_threatIntel_events_queries_list",
     title: "List saved event queries",
-    description: "Lists the account's saved event queries.",
+    description: "Lists the account's saved event queries.\n\nGET /accounts/{account_id}/cloudforce-one/events/queries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -720,16 +760,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_queries_update",
+    name: "cloudforceOne_threatIntel_events_queries_update",
     title: "Update a saved event query",
-    description: "Updates the given fields of a saved event query.",
+    description: "Updates the given fields of a saved event query.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/queries/{query_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "alert_enabled": {
@@ -763,15 +799,29 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "query_id": {
-          "description": "Event query ID",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "query_id": {
+              "description": "Event query ID",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "query_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/raw/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/raw/tools.ts
index 0b90e8f5d..3328b14fc 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/raw/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/raw/tools.ts
@@ -4,34 +4,44 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.raw`.
+ * The tools of `cloudforceOne.threatIntel.events.raw`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_raw_get",
+    name: "cloudforceOne_threatIntel_events_raw_get",
     title: "Get raw data for an event",
-    description: "Returns the raw source data stored with an event.",
+    description: "Returns the raw source data stored with an event.\n\nGET /accounts/{account_id}/cloudforce-one/events/datasets/{dataset_id}/events/{event_id}/raw",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "type": "string"
-        },
-        "event_id": {
-          "description": "Event ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "event_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/relationships/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/relationships/tools.ts
index e97b42d49..266890255 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/relationships/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/relationships/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.relationships`.
+ * The tools of `cloudforceOne.threatIntel.events.relationships`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_relationships_create",
+    name: "cloudforceOne_threatIntel_events_relationships_create",
     title: "Create event relationships",
-    description: "Creates directed relationships of type `relationshipType` from a parent event to one or more child events in the same dataset.",
+    description: "Creates directed relationships of type `relationshipType` from a parent event to one or more child events in the same dataset.\n\nPOST /accounts/{account_id}/cloudforce-one/events/relationships/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "childIds": {
@@ -55,11 +51,25 @@ export const tools: readonly Tool[] = [
             "relationshipType"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -286,76 +296,95 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_relationships_list",
+    name: "cloudforceOne_threatIntel_events_relationships_list",
     title: "List related events",
-    description: "Lists events related to an event by following its relationships. `datasetId` is required. Use `direction`, `maxDepth`, and `relationshipTypes` to control which relationships are followed.",
+    description: "Lists events related to an event by following its relationships. `datasetId` is required. Use `direction`, `maxDepth`, and `relationshipTypes` to control which relationships are followed.\n\nGET /accounts/{account_id}/cloudforce-one/events/by-id/{event_id}/relationships",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "The dataset ID to search within.",
-          "type": "string"
-        },
-        "direction": {
-          "default": "both",
-          "description": "The direction to traverse the graph. Defaults to 'both' to search all.",
-          "enum": [
-            "ancestors",
-            "descendants",
-            "both"
-          ],
-          "type": "string"
-        },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
-        },
-        "include_parent": {
-          "default": true,
-          "description": "Whether to include the starting event in the results. Defaults to true.",
-          "type": "boolean"
-        },
-        "indicator_type_ids": {
-          "description": "An optional array of indicator type IDs to filter the results by.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "max_depth": {
-          "description": "The maximum depth to traverse. Defaults to 5.",
-          "type": "number"
-        },
-        "page": {
-          "type": "number"
-        },
-        "page_size": {
-          "type": "number"
+          "required": [
+            "account_id",
+            "event_id"
+          ],
+          "type": "object"
         },
-        "relationship_types": {
-          "anyOf": [
-            {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetId": {
+              "description": "The dataset ID to search within.",
               "type": "string"
             },
-            {
+            "direction": {
+              "default": "both",
+              "description": "The direction to traverse the graph. Defaults to 'both' to search all.",
+              "enum": [
+                "ancestors",
+                "descendants",
+                "both"
+              ],
+              "type": "string"
+            },
+            "includeParent": {
+              "default": true,
+              "description": "Whether to include the starting event in the results. Defaults to true.",
+              "type": "boolean"
+            },
+            "indicatorTypeIds": {
+              "description": "An optional array of indicator type IDs to filter the results by.",
               "items": {
                 "type": "string"
               },
               "type": "array"
+            },
+            "maxDepth": {
+              "description": "The maximum depth to traverse. Defaults to 5.",
+              "type": "number"
+            },
+            "page": {
+              "type": "number"
+            },
+            "pageSize": {
+              "type": "number"
+            },
+            "relationshipTypes": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "items": {
+                    "type": "string"
+                  },
+                  "type": "array"
+                }
+              ],
+              "description": "An optional array of relationship types to filter by."
             }
+          },
+          "required": [
+            "datasetId"
           ],
-          "description": "An optional array of relationship types to filter by."
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_id",
-        "dataset_id"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -699,14 +728,14 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/by-id/${pathParam(args, "event_id")}/relationships`,
       query: [
-        ["direction", args["direction"], true],
-        ["maxDepth", args["max_depth"], true],
-        ["relationshipTypes", args["relationship_types"], true],
-        ["indicatorTypeIds", args["indicator_type_ids"], true],
-        ["datasetId", args["dataset_id"], true],
-        ["includeParent", args["include_parent"], true],
-        ["page", args["page"], true],
-        ["pageSize", args["page_size"], true],
+        ["direction", param(args, "query", "direction"), true],
+        ["maxDepth", param(args, "query", "maxDepth"), true],
+        ["relationshipTypes", param(args, "query", "relationshipTypes"), true],
+        ["indicatorTypeIds", param(args, "query", "indicatorTypeIds"), true],
+        ["datasetId", param(args, "query", "datasetId"), true],
+        ["includeParent", param(args, "query", "includeParent"), true],
+        ["page", param(args, "query", "page"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/catalog/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/catalog/tools.ts
index 94ed7f89b..fff5baef2 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/catalog/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/catalog/tools.ts
@@ -4,24 +4,34 @@
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.target_industries.catalog`.
+ * The tools of `cloudforceOne.threatIntel.events.targetIndustries.catalog`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_target_industries_catalog_list",
+    name: "cloudforceOne_threatIntel_events_targetIndustries_catalog_list",
     title: "List all target industries",
-    description: "Lists every predefined target industry, whether or not an event uses it. To list only the industries used in specific datasets, use `threat-intel events target-industries list`.",
+    description: "Lists every predefined target industry, whether or not an event uses it. To list only the industries used in specific datasets, use `threat-intel events target-industries list`.\n\nGET /accounts/{account_id}/cloudforce-one/events/targetIndustries/catalog",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/legacy/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/legacy/tools.ts
index 989e98a8f..b4a868cca 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/legacy/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/legacy/tools.ts
@@ -4,30 +4,40 @@
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.target_industries.legacy`.
+ * The tools of `cloudforceOne.threatIntel.events.targetIndustries.legacy`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_target_industries_legacy_list",
+    name: "cloudforceOne_threatIntel_events_targetIndustries_legacy_list",
     title: "List target industries in a dataset (legacy)",
-    description: "Legacy. Use `threat-intel events target-industries list` (`GET /events/targetIndustries`) instead.\n\nThis method is deprecated.",
+    description: "Legacy. Use `threat-intel events target-industries list` (`GET /events/targetIndustries`) instead.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/targetIndustries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/tools.ts
index 8a9b9f364..b99656ea9 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/targetIndustries/tools.ts
@@ -1,34 +1,50 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events.target_industries`.
+ * The tools of `cloudforceOne.threatIntel.events.targetIndustries`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_target_industries_list",
+    name: "cloudforceOne_threatIntel_events_targetIndustries_list",
     title: "List target industries used in datasets",
-    description: "Lists the target industries referenced by events in the datasets given by `datasetIds`, or in the default dataset when `datasetIds` is omitted. To list every target industry, use `threat-intel events target-industries catalog list`.",
+    description: "Lists the target industries referenced by events in the datasets given by `datasetIds`, or in the default dataset when `datasetIds` is omitted. To list every target industry, use `threat-intel events target-industries catalog list`.\n\nGET /accounts/{account_id}/cloudforce-one/events/targetIndustries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "dataset_ids": {
-          "description": "Array of dataset IDs to query target industries from. If not provided, uses the default dataset.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetIds": {
+              "description": "Array of dataset IDs to query target industries from. If not provided, uses the default dataset.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -128,7 +144,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/targetIndustries`,
       query: [
-        ["datasetIds", args["dataset_ids"], true],
+        ["datasetIds", param(args, "query", "datasetIds"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/tools.ts
index c75a91b73..83990956a 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/events/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/events/tools.ts
@@ -1,56 +1,75 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.events`.
+ * The tools of `cloudforceOne.threatIntel.events`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_events_aggregate",
+    name: "cloudforceOne_threatIntel_events_aggregate",
     title: "Aggregate events",
-    description: "Counts events grouped by one or more columns, such as `attacker` or `targetIndustry`. Optionally filter by date range and group the counts by day.",
+    description: "Counts events grouped by one or more columns, such as `attacker` or `targetIndustry`. Optionally filter by date range and group the counts by day.\n\nGET /accounts/{account_id}/cloudforce-one/events/aggregate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "aggregate_by": {
-          "description": "Column(s) to aggregate by - single column or comma-separated list (e.g., 'attacker', 'targetIndustry', 'attacker,targetIndustry'). With `tags`, an event counts once for each of its tags, in the bucket counts and in `total`, and events without tags count as `Unknown`; `tags` is not supported for analytics datasets.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUIDs to filter by, or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). Scope values query at most 50 datasets. If not provided, uses the default dataset.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "end_date": {
-          "description": "End date for filtering (ISO 8601 format, e.g., '2024-12-31')",
-          "type": "string"
-        },
-        "group_by_date": {
-          "description": "Whether to group results by date (daily aggregation)",
-          "type": "boolean"
-        },
-        "limit": {
-          "default": 100,
-          "description": "Maximum number of results to return",
-          "type": "number"
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "start_date": {
-          "description": "Start date for filtering (ISO 8601 format, e.g., '2024-01-01')",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggregateBy": {
+              "description": "Column(s) to aggregate by - single column or comma-separated list (e.g., 'attacker', 'targetIndustry', 'attacker,targetIndustry'). With `tags`, an event counts once for each of its tags, in the bucket counts and in `total`, and events without tags count as `Unknown`; `tags` is not supported for analytics datasets.",
+              "type": "string"
+            },
+            "datasetId": {
+              "description": "Dataset UUIDs to filter by, or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). Scope values query at most 50 datasets. If not provided, uses the default dataset.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "endDate": {
+              "description": "End date for filtering (ISO 8601 format, e.g., '2024-12-31')",
+              "type": "string"
+            },
+            "groupByDate": {
+              "description": "Whether to group results by date (daily aggregation)",
+              "type": "boolean"
+            },
+            "limit": {
+              "default": 100,
+              "description": "Maximum number of results to return",
+              "type": "number"
+            },
+            "startDate": {
+              "description": "Start date for filtering (ISO 8601 format, e.g., '2024-01-01')",
+              "type": "string"
+            }
+          },
+          "required": [
+            "aggregateBy"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "aggregate_by"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -226,26 +245,22 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/aggregate`,
       query: [
-        ["aggregateBy", args["aggregate_by"], true],
-        ["datasetId", args["dataset_id"], true],
-        ["startDate", args["start_date"], true],
-        ["endDate", args["end_date"], true],
-        ["groupByDate", args["group_by_date"], true],
-        ["limit", args["limit"], true],
+        ["aggregateBy", param(args, "query", "aggregateBy"), true],
+        ["datasetId", param(args, "query", "datasetId"), true],
+        ["startDate", param(args, "query", "startDate"), true],
+        ["endDate", param(args, "query", "endDate"), true],
+        ["groupByDate", param(args, "query", "groupByDate"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_bulk_create",
+    name: "cloudforceOne_threatIntel_events_bulkCreate",
     title: "Create events in bulk",
-    description: "Creates multiple events in one dataset. `datasetId` is required; to find dataset IDs, use `threat-intel datasets list`. Set `includeCreatedEvents` to return the UUIDs of the created events.",
+    description: "Creates multiple events in one dataset. `datasetId` is required; to find dataset IDs, use `threat-intel datasets list`. Set `includeCreatedEvents` to return the UUIDs of the created events.\n\nPOST /accounts/{account_id}/cloudforce-one/events/create/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "data": {
@@ -374,11 +389,25 @@ export const tools: readonly Tool[] = [
             "datasetId"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -571,16 +600,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_bulk_update",
+    name: "cloudforceOne_threatIntel_events_bulkUpdate",
     title: "Update events in bulk",
-    description: "Applies the same field values to up to 100 events in one dataset. The `date` field can't be changed in bulk.",
+    description: "Applies the same field values to up to 100 events in one dataset. The `date` field can't be changed in bulk.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/update/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "datasetId": {
@@ -671,11 +696,25 @@ export const tools: readonly Tool[] = [
             "updates"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -797,16 +836,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_copy",
+    name: "cloudforceOne_threatIntel_events_copy",
     title: "Copy events to another dataset",
-    description: "Copies events to the dataset given by `destDatasetId` and leaves the originals in place. Raw event data is copied only when `keepRawData` is true.",
+    description: "Copies events to the dataset given by `destDatasetId` and leaves the originals in place. Raw event data is copied only when `keepRawData` is true.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/copy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "destDatasetId": {
@@ -825,20 +860,40 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         },
-        "keep_raw_data": {
-          "description": "If true, copies raw data to the destination dataset. Default is false (raw data is stripped/not copied).",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "keepRawData": {
+              "description": "If true, copies raw data to the destination dataset. Default is false (raw data is stripped/not copied).",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -966,22 +1021,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/dataset/${pathParam(args, "dataset_id")}/copy`,
       query: [
-        ["keepRawData", args["keep_raw_data"], true],
+        ["keepRawData", param(args, "query", "keepRawData"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_create",
+    name: "cloudforceOne_threatIntel_events_create",
     title: "Create an event",
-    description: "Creates an event. Without `datasetId`, the event is created in the default Cloudforce One Threat Events dataset. To create a dataset, use `threat-intel datasets create`.",
+    description: "Creates an event. Without `datasetId`, the event is created in the default Cloudforce One Threat Events dataset. To create a dataset, use `threat-intel datasets create`.\n\nPOST /accounts/{account_id}/cloudforce-one/events/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "accountId": {
@@ -1129,11 +1180,25 @@ export const tools: readonly Tool[] = [
             "tlp"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1474,34 +1539,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_delete",
+    name: "cloudforceOne_threatIntel_events_delete",
     title: "Delete events",
-    description: "Deletes one or more events from a dataset. Pass the event UUIDs in `eventIds`.",
+    description: "Deletes one or more events from a dataset. Pass the event UUIDs in `eventIds`.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/datasets/{dataset_id}/events",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         },
-        "event_ids": {
-          "description": "Array of Event IDs to delete.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "eventIds": {
+              "description": "Array of Event IDs to delete.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "required": [
+            "eventIds"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "event_ids"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "type": "number",
@@ -1560,35 +1644,45 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/datasets/${pathParam(args, "dataset_id")}/events`,
       query: [
-        ["eventIds", args["event_ids"], true],
+        ["eventIds", param(args, "query", "eventIds"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_get",
+    name: "cloudforceOne_threatIntel_events_get",
     title: "Get an event",
-    description: "Returns an event from a dataset by its UUID.",
+    description: "Returns an event from a dataset by its UUID.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/events/{event_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "type": "string"
-        },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "event_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1928,20 +2022,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_graphql",
+    name: "cloudforceOne_threatIntel_events_graphql",
     title: "Run a GraphQL aggregation over events",
-    description: "Runs a GraphQL aggregation query over events. Supports grouping by multiple fields, date range filters, and aggregation across datasets.",
+    description: "Runs a GraphQL aggregation query over events. Supports grouping by multiple fields, date range filters, and aggregation across datasets.\n\nPOST /accounts/{account_id}/cloudforce-one/events/graphql",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2053,601 +2157,617 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_list",
+    name: "cloudforceOne_threatIntel_events_list",
     title: "List events",
-    description: "Lists events, with filters passed as query parameters. `datasetId` accepts dataset UUIDs or one scope value used alone: `all` (or `*`) and `operational` select the intelligence datasets you can read, and `analytics` selects the analytics datasets you can read. A scope value covers at most 50 datasets. Without `datasetId`, the default Cloudforce One Threat Events dataset is used. To send filters in a JSON body instead, use `threat-intel events search`.",
+    description: "Lists events, with filters passed as query parameters. `datasetId` accepts dataset UUIDs or one scope value used alone: `all` (or `*`) and `operational` select the intelligence datasets you can read, and `analytics` selects the analytics datasets you can read. A scope value covers at most 50 datasets. Without `datasetId`, the default Cloudforce One Threat Events dataset is used. To send filters in a JSON body instead, use `threat-intel events search`.\n\nGET /accounts/{account_id}/cloudforce-one/events",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "cache": {
-          "description": "Cache strategy. 'from-graph' serves results from the graph-node KV cache when all requested UUIDs are cached; falls back to normal path on partial/zero hit.",
-          "enum": [
-            "from-graph"
-          ],
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Cursor for pagination. When provided, filters are embedded in the cursor so you only need to pass cursor and pageSize. Returned in the previous response's result_info.cursor field. Use cursor-based pagination for deep pagination (beyond 100,000 records) or for optimal performance.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUIDs to query, or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). Scope values query at most 50 datasets. If not provided, uses the default dataset.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "force_refresh": {
-          "type": "boolean"
-        },
-        "format": {
-          "enum": [
-            "json",
-            "stix2",
-            "taxii"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "enum": [
-            "asc",
-            "desc"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "order_by": {
-          "type": "string"
-        },
-        "page": {
-          "description": "Page number (1-indexed) for offset-based pagination. Limited to offset of 100,000 records. For deep pagination, use cursor-based pagination instead.",
-          "type": "number"
-        },
-        "page_size": {
-          "description": "Number of results per page. Maximum 25,000.",
-          "type": "number"
+          "type": "object"
         },
-        "search": {
-          "default": [],
-          "items": {
-            "anyOf": [
-              {
-                "properties": {
-                  "field": {
-                    "enum": [
-                      "attacker",
-                      "attackerCountry",
-                      "category",
-                      "createdAt",
-                      "date",
-                      "event",
-                      "indicator",
-                      "indicatorType",
-                      "mitreAttack",
-                      "mitreCapec",
-                      "tags",
-                      "targetCountry",
-                      "targetIndustry",
-                      "tlp",
-                      "uuid"
-                    ],
-                    "type": "string"
-                  },
-                  "op": {
-                    "enum": [
-                      "equals",
-                      "not",
-                      "gt",
-                      "gte",
-                      "lt",
-                      "lte",
-                      "like",
-                      "contains",
-                      "startsWith",
-                      "endsWith",
-                      "find"
-                    ],
-                    "type": "string"
-                  },
-                  "value": {
-                    "type": "string"
-                  }
-                },
-                "required": [
-                  "field",
-                  "op",
-                  "value"
-                ],
-                "type": "object"
-              },
-              {
-                "properties": {
-                  "field": {
-                    "enum": [
-                      "attacker",
-                      "attackerCountry",
-                      "category",
-                      "createdAt",
-                      "date",
-                      "event",
-                      "indicator",
-                      "indicatorType",
-                      "mitreAttack",
-                      "mitreCapec",
-                      "tags",
-                      "targetCountry",
-                      "targetIndustry",
-                      "tlp",
-                      "uuid"
-                    ],
-                    "type": "string"
-                  },
-                  "op": {
-                    "enum": [
-                      "in"
-                    ],
-                    "type": "string"
-                  },
-                  "value": {
-                    "items": {
-                      "type": "string"
-                    },
-                    "maxItems": 100,
-                    "minItems": 1,
-                    "type": "array"
-                  }
-                },
-                "required": [
-                  "field",
-                  "op",
-                  "value"
-                ],
-                "type": "object"
-              },
-              {
-                "properties": {
-                  "field": {
-                    "enum": [
-                      "killChain"
-                    ],
-                    "type": "string"
-                  },
-                  "op": {
-                    "enum": [
-                      "equals",
-                      "not",
-                      "gt",
-                      "gte",
-                      "lt",
-                      "lte"
-                    ],
-                    "type": "string"
-                  },
-                  "value": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string"
-                      }
-                    ]
-                  }
-                },
-                "required": [
-                  "field",
-                  "op",
-                  "value"
-                ],
-                "type": "object"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cache": {
+              "description": "Cache strategy. 'from-graph' serves results from the graph-node KV cache when all requested UUIDs are cached; falls back to normal path on partial/zero hit.",
+              "enum": [
+                "from-graph"
+              ],
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Cursor for pagination. When provided, filters are embedded in the cursor so you only need to pass cursor and pageSize. Returned in the previous response's result_info.cursor field. Use cursor-based pagination for deep pagination (beyond 100,000 records) or for optimal performance.",
+              "type": "string"
+            },
+            "datasetId": {
+              "description": "Dataset UUIDs to query, or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). Scope values query at most 50 datasets. If not provided, uses the default dataset.",
+              "items": {
+                "type": "string"
               },
-              {
-                "properties": {
-                  "field": {
-                    "enum": [
-                      "killChain"
-                    ],
-                    "type": "string"
-                  },
-                  "op": {
-                    "enum": [
-                      "in"
-                    ],
-                    "type": "string"
-                  },
-                  "value": {
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string"
-                        }
-                      ]
+              "type": "array"
+            },
+            "forceRefresh": {
+              "type": "boolean"
+            },
+            "format": {
+              "enum": [
+                "json",
+                "stix2",
+                "taxii"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "orderBy": {
+              "type": "string"
+            },
+            "page": {
+              "description": "Page number (1-indexed) for offset-based pagination. Limited to offset of 100,000 records. For deep pagination, use cursor-based pagination instead.",
+              "type": "number"
+            },
+            "pageSize": {
+              "description": "Number of results per page. Maximum 25,000.",
+              "type": "number"
+            },
+            "search": {
+              "default": [],
+              "items": {
+                "anyOf": [
+                  {
+                    "properties": {
+                      "field": {
+                        "enum": [
+                          "attacker",
+                          "attackerCountry",
+                          "category",
+                          "createdAt",
+                          "date",
+                          "event",
+                          "indicator",
+                          "indicatorType",
+                          "mitreAttack",
+                          "mitreCapec",
+                          "tags",
+                          "targetCountry",
+                          "targetIndustry",
+                          "tlp",
+                          "uuid"
+                        ],
+                        "type": "string"
+                      },
+                      "op": {
+                        "enum": [
+                          "equals",
+                          "not",
+                          "gt",
+                          "gte",
+                          "lt",
+                          "lte",
+                          "like",
+                          "contains",
+                          "startsWith",
+                          "endsWith",
+                          "find"
+                        ],
+                        "type": "string"
+                      },
+                      "value": {
+                        "type": "string"
+                      }
                     },
-                    "maxItems": 100,
-                    "minItems": 1,
-                    "type": "array"
-                  }
-                },
-                "required": [
-                  "field",
-                  "op",
-                  "value"
-                ],
-                "type": "object"
-              },
-              {
-                "properties": {
-                  "field": {
-                    "enum": [
-                      "hasChildren"
+                    "required": [
+                      "field",
+                      "op",
+                      "value"
                     ],
-                    "type": "string"
+                    "type": "object"
                   },
-                  "op": {
-                    "enum": [
-                      "equals",
-                      "not",
-                      "gt",
-                      "gte",
-                      "lt",
-                      "lte"
+                  {
+                    "properties": {
+                      "field": {
+                        "enum": [
+                          "attacker",
+                          "attackerCountry",
+                          "category",
+                          "createdAt",
+                          "date",
+                          "event",
+                          "indicator",
+                          "indicatorType",
+                          "mitreAttack",
+                          "mitreCapec",
+                          "tags",
+                          "targetCountry",
+                          "targetIndustry",
+                          "tlp",
+                          "uuid"
+                        ],
+                        "type": "string"
+                      },
+                      "op": {
+                        "enum": [
+                          "in"
+                        ],
+                        "type": "string"
+                      },
+                      "value": {
+                        "items": {
+                          "type": "string"
+                        },
+                        "maxItems": 100,
+                        "minItems": 1,
+                        "type": "array"
+                      }
+                    },
+                    "required": [
+                      "field",
+                      "op",
+                      "value"
                     ],
-                    "type": "string"
+                    "type": "object"
                   },
-                  "value": {
-                    "anyOf": [
-                      {
-                        "type": "boolean"
+                  {
+                    "properties": {
+                      "field": {
+                        "enum": [
+                          "killChain"
+                        ],
+                        "type": "string"
                       },
-                      {
+                      "op": {
                         "enum": [
-                          "true",
-                          "false",
-                          1,
-                          0,
-                          "1",
-                          "0"
+                          "equals",
+                          "not",
+                          "gt",
+                          "gte",
+                          "lt",
+                          "lte"
+                        ],
+                        "type": "string"
+                      },
+                      "value": {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string"
+                          }
                         ]
                       }
-                    ]
-                  }
-                },
-                "required": [
-                  "field",
-                  "op",
-                  "value"
-                ],
-                "type": "object"
-              },
-              {
-                "properties": {
-                  "field": {
-                    "enum": [
-                      "hasChildren"
-                    ],
-                    "type": "string"
-                  },
-                  "op": {
-                    "enum": [
-                      "in"
+                    },
+                    "required": [
+                      "field",
+                      "op",
+                      "value"
                     ],
-                    "type": "string"
+                    "type": "object"
                   },
-                  "value": {
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "boolean"
-                        },
-                        {
-                          "enum": [
-                            "true",
-                            "false",
-                            1,
-                            0,
-                            "1",
-                            "0"
+                  {
+                    "properties": {
+                      "field": {
+                        "enum": [
+                          "killChain"
+                        ],
+                        "type": "string"
+                      },
+                      "op": {
+                        "enum": [
+                          "in"
+                        ],
+                        "type": "string"
+                      },
+                      "value": {
+                        "items": {
+                          "anyOf": [
+                            {
+                              "type": "number"
+                            },
+                            {
+                              "type": "string"
+                            }
                           ]
-                        }
-                      ]
-                    },
-                    "maxItems": 100,
-                    "minItems": 1,
-                    "type": "array"
-                  }
-                },
-                "required": [
-                  "field",
-                  "op",
-                  "value"
-                ],
-                "type": "object"
-              }
-            ]
-          },
-          "maxItems": 10,
-          "type": "array"
-        },
-        "search_branches": {
-          "description": "JSON-encoded. OR branches of structured search filters. Filters within a branch are AND'd, branches are OR'd, and the result is AND'd with `search`: `AND(search) AND OR(AND(branch 1), ...)`. Max 8 branches of 1-10 conditions each. Not supported for analytics datasets, and `indicator` filters are not yet supported inside branches. Cursor pages carry the original branches, so do not resend them with `cursor`.",
-          "items": {
-            "items": {
-              "anyOf": [
-                {
-                  "properties": {
-                    "field": {
-                      "enum": [
-                        "attacker",
-                        "attackerCountry",
-                        "category",
-                        "createdAt",
-                        "date",
-                        "event",
-                        "indicator",
-                        "indicatorType",
-                        "mitreAttack",
-                        "mitreCapec",
-                        "tags",
-                        "targetCountry",
-                        "targetIndustry",
-                        "tlp",
-                        "uuid"
-                      ],
-                      "type": "string"
+                        },
+                        "maxItems": 100,
+                        "minItems": 1,
+                        "type": "array"
+                      }
                     },
-                    "op": {
-                      "enum": [
-                        "equals",
-                        "not",
-                        "gt",
-                        "gte",
-                        "lt",
-                        "lte",
-                        "like",
-                        "contains",
-                        "startsWith",
-                        "endsWith",
-                        "find"
-                      ],
-                      "type": "string"
+                    "required": [
+                      "field",
+                      "op",
+                      "value"
+                    ],
+                    "type": "object"
+                  },
+                  {
+                    "properties": {
+                      "field": {
+                        "enum": [
+                          "hasChildren"
+                        ],
+                        "type": "string"
+                      },
+                      "op": {
+                        "enum": [
+                          "equals",
+                          "not",
+                          "gt",
+                          "gte",
+                          "lt",
+                          "lte"
+                        ],
+                        "type": "string"
+                      },
+                      "value": {
+                        "anyOf": [
+                          {
+                            "type": "boolean"
+                          },
+                          {
+                            "enum": [
+                              "true",
+                              "false",
+                              1,
+                              0,
+                              "1",
+                              "0"
+                            ]
+                          }
+                        ]
+                      }
                     },
-                    "value": {
-                      "type": "string"
-                    }
+                    "required": [
+                      "field",
+                      "op",
+                      "value"
+                    ],
+                    "type": "object"
                   },
-                  "required": [
-                    "field",
-                    "op",
-                    "value"
-                  ],
-                  "type": "object"
-                },
-                {
-                  "properties": {
-                    "field": {
-                      "enum": [
-                        "attacker",
-                        "attackerCountry",
-                        "category",
-                        "createdAt",
-                        "date",
-                        "event",
-                        "indicator",
-                        "indicatorType",
-                        "mitreAttack",
-                        "mitreCapec",
-                        "tags",
-                        "targetCountry",
-                        "targetIndustry",
-                        "tlp",
-                        "uuid"
-                      ],
-                      "type": "string"
+                  {
+                    "properties": {
+                      "field": {
+                        "enum": [
+                          "hasChildren"
+                        ],
+                        "type": "string"
+                      },
+                      "op": {
+                        "enum": [
+                          "in"
+                        ],
+                        "type": "string"
+                      },
+                      "value": {
+                        "items": {
+                          "anyOf": [
+                            {
+                              "type": "boolean"
+                            },
+                            {
+                              "enum": [
+                                "true",
+                                "false",
+                                1,
+                                0,
+                                "1",
+                                "0"
+                              ]
+                            }
+                          ]
+                        },
+                        "maxItems": 100,
+                        "minItems": 1,
+                        "type": "array"
+                      }
                     },
-                    "op": {
-                      "enum": [
-                        "in"
+                    "required": [
+                      "field",
+                      "op",
+                      "value"
+                    ],
+                    "type": "object"
+                  }
+                ]
+              },
+              "maxItems": 10,
+              "type": "array"
+            },
+            "searchBranches": {
+              "description": "JSON-encoded. OR branches of structured search filters. Filters within a branch are AND'd, branches are OR'd, and the result is AND'd with `search`: `AND(search) AND OR(AND(branch 1), ...)`. Max 8 branches of 1-10 conditions each. Not supported for analytics datasets, and `indicator` filters are not yet supported inside branches. Cursor pages carry the original branches, so do not resend them with `cursor`.",
+              "items": {
+                "items": {
+                  "anyOf": [
+                    {
+                      "properties": {
+                        "field": {
+                          "enum": [
+                            "attacker",
+                            "attackerCountry",
+                            "category",
+                            "createdAt",
+                            "date",
+                            "event",
+                            "indicator",
+                            "indicatorType",
+                            "mitreAttack",
+                            "mitreCapec",
+                            "tags",
+                            "targetCountry",
+                            "targetIndustry",
+                            "tlp",
+                            "uuid"
+                          ],
+                          "type": "string"
+                        },
+                        "op": {
+                          "enum": [
+                            "equals",
+                            "not",
+                            "gt",
+                            "gte",
+                            "lt",
+                            "lte",
+                            "like",
+                            "contains",
+                            "startsWith",
+                            "endsWith",
+                            "find"
+                          ],
+                          "type": "string"
+                        },
+                        "value": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "field",
+                        "op",
+                        "value"
                       ],
-                      "type": "string"
+                      "type": "object"
                     },
-                    "value": {
-                      "items": {
-                        "type": "string"
+                    {
+                      "properties": {
+                        "field": {
+                          "enum": [
+                            "attacker",
+                            "attackerCountry",
+                            "category",
+                            "createdAt",
+                            "date",
+                            "event",
+                            "indicator",
+                            "indicatorType",
+                            "mitreAttack",
+                            "mitreCapec",
+                            "tags",
+                            "targetCountry",
+                            "targetIndustry",
+                            "tlp",
+                            "uuid"
+                          ],
+                          "type": "string"
+                        },
+                        "op": {
+                          "enum": [
+                            "in"
+                          ],
+                          "type": "string"
+                        },
+                        "value": {
+                          "items": {
+                            "type": "string"
+                          },
+                          "maxItems": 100,
+                          "minItems": 1,
+                          "type": "array"
+                        }
                       },
-                      "maxItems": 100,
-                      "minItems": 1,
-                      "type": "array"
-                    }
-                  },
-                  "required": [
-                    "field",
-                    "op",
-                    "value"
-                  ],
-                  "type": "object"
-                },
-                {
-                  "properties": {
-                    "field": {
-                      "enum": [
-                        "killChain"
+                      "required": [
+                        "field",
+                        "op",
+                        "value"
                       ],
-                      "type": "string"
+                      "type": "object"
                     },
-                    "op": {
-                      "enum": [
-                        "equals",
-                        "not",
-                        "gt",
-                        "gte",
-                        "lt",
-                        "lte"
+                    {
+                      "properties": {
+                        "field": {
+                          "enum": [
+                            "killChain"
+                          ],
+                          "type": "string"
+                        },
+                        "op": {
+                          "enum": [
+                            "equals",
+                            "not",
+                            "gt",
+                            "gte",
+                            "lt",
+                            "lte"
+                          ],
+                          "type": "string"
+                        },
+                        "value": {
+                          "anyOf": [
+                            {
+                              "type": "number"
+                            },
+                            {
+                              "type": "string"
+                            }
+                          ]
+                        }
+                      },
+                      "required": [
+                        "field",
+                        "op",
+                        "value"
                       ],
-                      "type": "string"
+                      "type": "object"
                     },
-                    "value": {
-                      "anyOf": [
-                        {
-                          "type": "number"
+                    {
+                      "properties": {
+                        "field": {
+                          "enum": [
+                            "killChain"
+                          ],
+                          "type": "string"
                         },
-                        {
+                        "op": {
+                          "enum": [
+                            "in"
+                          ],
                           "type": "string"
-                        }
-                      ]
-                    }
-                  },
-                  "required": [
-                    "field",
-                    "op",
-                    "value"
-                  ],
-                  "type": "object"
-                },
-                {
-                  "properties": {
-                    "field": {
-                      "enum": [
-                        "killChain"
-                      ],
-                      "type": "string"
-                    },
-                    "op": {
-                      "enum": [
-                        "in"
-                      ],
-                      "type": "string"
-                    },
-                    "value": {
-                      "items": {
-                        "anyOf": [
-                          {
-                            "type": "number"
+                        },
+                        "value": {
+                          "items": {
+                            "anyOf": [
+                              {
+                                "type": "number"
+                              },
+                              {
+                                "type": "string"
+                              }
+                            ]
                           },
-                          {
-                            "type": "string"
-                          }
-                        ]
+                          "maxItems": 100,
+                          "minItems": 1,
+                          "type": "array"
+                        }
                       },
-                      "maxItems": 100,
-                      "minItems": 1,
-                      "type": "array"
-                    }
-                  },
-                  "required": [
-                    "field",
-                    "op",
-                    "value"
-                  ],
-                  "type": "object"
-                },
-                {
-                  "properties": {
-                    "field": {
-                      "enum": [
-                        "hasChildren"
-                      ],
-                      "type": "string"
-                    },
-                    "op": {
-                      "enum": [
-                        "equals",
-                        "not",
-                        "gt",
-                        "gte",
-                        "lt",
-                        "lte"
+                      "required": [
+                        "field",
+                        "op",
+                        "value"
                       ],
-                      "type": "string"
+                      "type": "object"
                     },
-                    "value": {
-                      "anyOf": [
-                        {
-                          "type": "boolean"
+                    {
+                      "properties": {
+                        "field": {
+                          "enum": [
+                            "hasChildren"
+                          ],
+                          "type": "string"
                         },
-                        {
+                        "op": {
                           "enum": [
-                            "true",
-                            "false",
-                            1,
-                            0,
-                            "1",
-                            "0"
+                            "equals",
+                            "not",
+                            "gt",
+                            "gte",
+                            "lt",
+                            "lte"
+                          ],
+                          "type": "string"
+                        },
+                        "value": {
+                          "anyOf": [
+                            {
+                              "type": "boolean"
+                            },
+                            {
+                              "enum": [
+                                "true",
+                                "false",
+                                1,
+                                0,
+                                "1",
+                                "0"
+                              ]
+                            }
                           ]
                         }
-                      ]
-                    }
-                  },
-                  "required": [
-                    "field",
-                    "op",
-                    "value"
-                  ],
-                  "type": "object"
-                },
-                {
-                  "properties": {
-                    "field": {
-                      "enum": [
-                        "hasChildren"
-                      ],
-                      "type": "string"
-                    },
-                    "op": {
-                      "enum": [
-                        "in"
+                      },
+                      "required": [
+                        "field",
+                        "op",
+                        "value"
                       ],
-                      "type": "string"
+                      "type": "object"
                     },
-                    "value": {
-                      "items": {
-                        "anyOf": [
-                          {
-                            "type": "boolean"
-                          },
-                          {
-                            "enum": [
-                              "true",
-                              "false",
-                              1,
-                              0,
-                              "1",
-                              "0"
+                    {
+                      "properties": {
+                        "field": {
+                          "enum": [
+                            "hasChildren"
+                          ],
+                          "type": "string"
+                        },
+                        "op": {
+                          "enum": [
+                            "in"
+                          ],
+                          "type": "string"
+                        },
+                        "value": {
+                          "items": {
+                            "anyOf": [
+                              {
+                                "type": "boolean"
+                              },
+                              {
+                                "enum": [
+                                  "true",
+                                  "false",
+                                  1,
+                                  0,
+                                  "1",
+                                  "0"
+                                ]
+                              }
                             ]
-                          }
-                        ]
+                          },
+                          "maxItems": 100,
+                          "minItems": 1,
+                          "type": "array"
+                        }
                       },
-                      "maxItems": 100,
-                      "minItems": 1,
-                      "type": "array"
+                      "required": [
+                        "field",
+                        "op",
+                        "value"
+                      ],
+                      "type": "object"
                     }
-                  },
-                  "required": [
-                    "field",
-                    "op",
-                    "value"
-                  ],
-                  "type": "object"
-                }
-              ]
-            },
-            "maxItems": 10,
-            "minItems": 1,
-            "type": "array"
+                  ]
+                },
+                "maxItems": 10,
+                "minItems": 1,
+                "type": "array"
+              },
+              "maxItems": 8,
+              "minItems": 1,
+              "type": "array"
+            }
           },
-          "maxItems": 8,
-          "minItems": 1,
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -2991,31 +3111,27 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["search", args["search"], true],
-        ["searchBranches", args["search_branches"], true],
-        ["page", args["page"], true],
-        ["pageSize", args["page_size"], true],
-        ["orderBy", args["order_by"], true],
-        ["order", args["order"], true],
-        ["datasetId", args["dataset_id"], true],
-        ["forceRefresh", args["force_refresh"], true],
-        ["format", args["format"], true],
-        ["cache", args["cache"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["search", param(args, "query", "search"), true],
+        ["searchBranches", param(args, "query", "searchBranches"), true],
+        ["page", param(args, "query", "page"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
+        ["order", param(args, "query", "order"), true],
+        ["datasetId", param(args, "query", "datasetId"), true],
+        ["forceRefresh", param(args, "query", "forceRefresh"), true],
+        ["format", param(args, "query", "format"), true],
+        ["cache", param(args, "query", "cache"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_move",
+    name: "cloudforceOne_threatIntel_events_move",
     title: "Move events to another dataset",
-    description: "Moves events to the dataset given by `destDatasetId` and removes them from the source dataset. Raw event data is always removed from the source and is kept only when `keepRawData` is true.",
+    description: "Moves events to the dataset given by `destDatasetId` and removes them from the source dataset. Raw event data is always removed from the source and is kept only when `keepRawData` is true.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/move",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "destDatasetId": {
@@ -3034,20 +3150,40 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         },
-        "keep_raw_data": {
-          "description": "If true, copies raw data to the destination dataset. Default is false (raw data is stripped/not copied). Raw data is always deleted from the source.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "keepRawData": {
+              "description": "If true, copies raw data to the destination dataset. Default is false (raw data is stripped/not copied). Raw data is always deleted from the source.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3211,22 +3347,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/dataset/${pathParam(args, "dataset_id")}/move`,
       query: [
-        ["keepRawData", args["keep_raw_data"], true],
+        ["keepRawData", param(args, "query", "keepRawData"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_search",
+    name: "cloudforceOne_threatIntel_events_search",
     title: "Search events",
-    description: "Lists events, with filters sent in a JSON request body. Accepts the same filters as `threat-intel events list` and suits long or complex `search` filters. `datasetId` accepts dataset UUIDs or one scope value used alone: `all` (or `*`) and `operational` select the intelligence datasets you can read, and `analytics` selects the analytics datasets you can read. A scope value covers at most 50 datasets. Without `datasetId`, the default Cloudforce One Threat Events dataset is used.",
+    description: "Lists events, with filters sent in a JSON request body. Accepts the same filters as `threat-intel events list` and suits long or complex `search` filters. `datasetId` accepts dataset UUIDs or one scope value used alone: `all` (or `*`) and `operational` select the intelligence datasets you can read, and `analytics` selects the analytics datasets you can read. A scope value covers at most 50 datasets. Without `datasetId`, the default Cloudforce One Threat Events dataset is used.\n\nPOST /accounts/{account_id}/cloudforce-one/events",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "cursor": {
@@ -3794,29 +3926,49 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "cache": {
-          "description": "Cache strategy. 'from-graph' serves results from the graph-node KV cache when all requested UUIDs are cached; falls back to normal path on partial/zero hit.",
-          "enum": [
-            "from-graph"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "force_refresh": {
-          "type": "boolean"
+          "type": "object"
         },
-        "format": {
-          "description": "Output format for event data. 'json' returns the default format, 'stix2' returns STIX 2.1 Sighting SROs with linked Indicator SDOs, Observed Data SDOs, and SCOs, 'taxii' returns a TAXII 2.1 Envelope with Content-Type application/taxii+json;version=2.1.",
-          "enum": [
-            "json",
-            "stix2",
-            "taxii"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cache": {
+              "description": "Cache strategy. 'from-graph' serves results from the graph-node KV cache when all requested UUIDs are cached; falls back to normal path on partial/zero hit.",
+              "enum": [
+                "from-graph"
+              ],
+              "type": "string"
+            },
+            "forceRefresh": {
+              "type": "boolean"
+            },
+            "format": {
+              "description": "Output format for event data. 'json' returns the default format, 'stix2' returns STIX 2.1 Sighting SROs with linked Indicator SDOs, Observed Data SDOs, and SCOs, 'taxii' returns a TAXII 2.1 Envelope with Content-Type application/taxii+json;version=2.1.",
+              "enum": [
+                "json",
+                "stix2",
+                "taxii"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -4160,24 +4312,20 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events`,
       query: [
-        ["forceRefresh", args["force_refresh"], true],
-        ["format", args["format"], true],
-        ["cache", args["cache"], true],
+        ["forceRefresh", param(args, "query", "forceRefresh"), true],
+        ["format", param(args, "query", "format"), true],
+        ["cache", param(args, "query", "cache"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_events_update",
+    name: "cloudforceOne_threatIntel_events_update",
     title: "Update an event",
-    description: "Updates the given fields of an event and leaves the other fields unchanged. `datasetId` is required.",
+    description: "Updates the given fields of an event and leaves the other fields unchanged. `datasetId` is required.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/{event_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "attacker": {
@@ -4256,15 +4404,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "event_id": {
-          "description": "Event UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "event_id": {
+              "description": "Event UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/relationships/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/relationships/tools.ts
index 1f8bd506e..55f5118e5 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/relationships/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/relationships/tools.ts
@@ -1,27 +1,23 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  cloudforce_one_events_HydratedEntity_output,
-  cloudforce_one_events_RelationshipEdge_output,
+  cloudforce$$one$$events_HydratedEntity,
+  cloudforce$$one$$events_RelationshipEdge,
 } from "../../outputs.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.indicators.relationships`.
+ * The tools of `cloudforceOne.threatIntel.indicators.relationships`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_indicators_relationships_create",
+    name: "cloudforceOne_threatIntel_indicators_relationships_create",
     title: "Create an indicator relationship",
-    description: "Creates a relationship from an indicator to an event or tag (`targetType`). Relationships between two indicators are not supported.",
+    description: "Creates a relationship from an indicator to an event or tag (`targetType`). Relationships between two indicators are not supported.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/{indicator_id}/relationships",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "confidence": {
@@ -56,21 +52,35 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "indicator_id": {
-          "description": "Indicator UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "indicator_id": {
+              "description": "Indicator UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "indicator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "indicator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -183,37 +193,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_relationships_delete",
+    name: "cloudforceOne_threatIntel_indicators_relationships_delete",
     title: "Delete an indicator relationship",
-    description: "Deletes an indicator relationship by its UUID. Returns `deleted: false` if the relationship doesn't exist.",
+    description: "Deletes an indicator relationship by its UUID. Returns `deleted: false` if the relationship doesn't exist.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/{indicator_id}/relationships/{rel_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "indicator_id": {
-          "description": "Indicator UUID.",
-          "type": "string"
-        },
-        "rel_uuid": {
-          "description": "Relationship UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "indicator_id": {
+              "description": "Indicator UUID.",
+              "type": "string"
+            },
+            "rel_uuid": {
+              "description": "Relationship UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "indicator_id",
+            "rel_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "indicator_id",
-        "rel_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -300,110 +320,126 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_relationships_list",
+    name: "cloudforceOne_threatIntel_indicators_relationships_list",
     title: "List indicator relationships",
-    description: "Lists the relationships that start at an indicator. Use `search` to filter them and `expand` to include the related entities in the response.",
+    description: "Lists the relationships that start at an indicator. Use `search` to filter them and `expand` to include the related entities in the response.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/{indicator_id}/relationships",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Keyset cursor from a previous page.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "expand": {
-          "description": "Comma-separated entity types to hydrate (event, indicator, tag).",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "indicator_id": {
+              "description": "Indicator UUID.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "indicator_id": {
-          "description": "Indicator UUID.",
-          "type": "string"
-        },
-        "page_size": {
-          "default": 25,
-          "description": "Page size (1–100, default 25).",
-          "type": "integer"
+          "required": [
+            "account_id",
+            "dataset_id",
+            "indicator_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "JSON array of {field, op, value} filters, AND-combined. Fields: entityType (other-end type), type (relationship type), confidence (0–100), metadata.<key>. Example: [{\"field\":\"type\",\"op\":\"equals\",\"value\":\"appears_in\"},{\"field\":\"confidence\",\"op\":\"gte\",\"value\":50}]",
-          "items": {
-            "properties": {
-              "field": {
-                "description": "entityType | type | confidence | metadata.<key>",
-                "type": "string"
-              },
-              "op": {
-                "description": "Search operator. 'exists' only valid for metadata.<key> fields.",
-                "enum": [
-                  "equals",
-                  "not",
-                  "gt",
-                  "gte",
-                  "lt",
-                  "lte",
-                  "like",
-                  "contains",
-                  "startsWith",
-                  "endsWith",
-                  "in",
-                  "find",
-                  "exists"
-                ],
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Keyset cursor from a previous page.",
+              "type": "string"
+            },
+            "expand": {
+              "description": "Comma-separated entity types to hydrate (event, indicator, tag).",
+              "items": {
                 "type": "string"
               },
-              "value": {
-                "anyOf": [
-                  {
+              "type": "array"
+            },
+            "pageSize": {
+              "default": 25,
+              "description": "Page size (1–100, default 25).",
+              "type": "integer"
+            },
+            "search": {
+              "description": "JSON array of {field, op, value} filters, AND-combined. Fields: entityType (other-end type), type (relationship type), confidence (0–100), metadata.<key>. Example: [{\"field\":\"type\",\"op\":\"equals\",\"value\":\"appears_in\"},{\"field\":\"confidence\",\"op\":\"gte\",\"value\":50}]",
+              "items": {
+                "properties": {
+                  "field": {
+                    "description": "entityType | type | confidence | metadata.<key>",
                     "type": "string"
                   },
-                  {
-                    "type": "number"
-                  },
-                  {
-                    "type": "boolean"
+                  "op": {
+                    "description": "Search operator. 'exists' only valid for metadata.<key> fields.",
+                    "enum": [
+                      "equals",
+                      "not",
+                      "gt",
+                      "gte",
+                      "lt",
+                      "lte",
+                      "like",
+                      "contains",
+                      "startsWith",
+                      "endsWith",
+                      "in",
+                      "find",
+                      "exists"
+                    ],
+                    "type": "string"
                   },
-                  {
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
+                  "value": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "items": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "number"
+                            }
+                          ]
                         },
-                        {
-                          "type": "number"
-                        }
-                      ]
-                    },
-                    "type": "array"
+                        "type": "array"
+                      }
+                    ],
+                    "description": "Value to compare against. Omit for 'exists' op."
                   }
+                },
+                "required": [
+                  "field",
+                  "op"
                 ],
-                "description": "Value to compare against. Omit for 'exists' op."
-              }
-            },
-            "required": [
-              "field",
-              "op"
-            ],
-            "type": "object"
+                "type": "object"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "indicator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -449,8 +485,8 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "cloudforce-one-events_HydratedEntity": cloudforce_one_events_HydratedEntity_output,
-        "cloudforce-one-events_RelationshipEdge": cloudforce_one_events_RelationshipEdge_output,
+        "cloudforce-one-events_HydratedEntity": cloudforce$$one$$events_HydratedEntity,
+        "cloudforce-one-events_RelationshipEdge": cloudforce$$one$$events_RelationshipEdge,
       },
     },
     annotations: {
@@ -546,31 +582,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-events_HydratedEntity": cloudforce_one_events_HydratedEntity_output,
-        "cloudforce-one-events_RelationshipEdge": cloudforce_one_events_RelationshipEdge_output,
+        "cloudforce-one-events_HydratedEntity": cloudforce$$one$$events_HydratedEntity,
+        "cloudforce-one-events_RelationshipEdge": cloudforce$$one$$events_RelationshipEdge,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/dataset/${pathParam(args, "dataset_id")}/indicators/${pathParam(args, "indicator_id")}/relationships`,
       query: [
-        ["search", args["search"], true],
-        ["expand", args["expand"], true],
-        ["cursor", args["cursor"], true],
-        ["pageSize", args["page_size"], true],
+        ["search", param(args, "query", "search"), true],
+        ["expand", param(args, "query", "expand"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_relationships_update",
+    name: "cloudforceOne_threatIntel_indicators_relationships_update",
     title: "Update an indicator relationship",
-    description: "Updates the given fields of an indicator relationship and leaves the other fields unchanged.",
+    description: "Updates the given fields of an indicator relationship and leaves the other fields unchanged.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/{indicator_id}/relationships/{rel_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "confidence": {
@@ -602,27 +634,41 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "indicator_id": {
-          "description": "Indicator UUID.",
-          "type": "string"
-        },
-        "rel_uuid": {
-          "description": "Relationship UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "indicator_id": {
+              "description": "Indicator UUID.",
+              "type": "string"
+            },
+            "rel_uuid": {
+              "description": "Relationship UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "indicator_id",
+            "rel_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "indicator_id",
-        "rel_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/tags/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/tags/tools.ts
index bec9d70ad..162d5dabe 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/tags/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/tags/tools.ts
@@ -4,29 +4,39 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.indicators.tags`.
+ * The tools of `cloudforceOne.threatIntel.indicators.tags`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_indicators_tags_list",
+    name: "cloudforceOne_threatIntel_indicators_tags_list",
     title: "List tags on a dataset's indicators",
-    description: "Lists the tags applied to indicators in a dataset. Results are not paginated.",
+    description: "Lists the tags applied to indicators in a dataset. Results are not paginated.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/tools.ts
index b7aba8d18..cdd7d7223 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.indicators`.
+ * The tools of `cloudforceOne.threatIntel.indicators`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_indicators_bulk_create",
+    name: "cloudforceOne_threatIntel_indicators_bulkCreate",
     title: "Create indicators in bulk",
-    description: "Creates multiple indicators in a dataset in one request. Set `autoCreateType` to create any indicator types that don't exist.",
+    description: "Creates multiple indicators in a dataset in one request. Set `autoCreateType` to create any indicator types that don't exist.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "autoCreateType": {
@@ -98,16 +94,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "type": "number",
@@ -170,36 +180,55 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_bulk_delete",
+    name: "cloudforceOne_threatIntel_indicators_bulkDelete",
     title: "Delete indicators in bulk",
-    description: "Deletes up to 200 indicators from a dataset. Pass the indicator UUIDs in `indicatorIds`; UUIDs that are not found are returned in `missingUUIDs`.",
+    description: "Deletes up to 200 indicators from a dataset. Pass the indicator UUIDs in `indicatorIds`; UUIDs that are not found are returned in `missingUUIDs`.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         },
-        "indicator_ids": {
-          "description": "Indicator UUIDs to delete, 1-200 per request.",
-          "items": {
-            "format": "uuid",
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "indicatorIds": {
+              "description": "Indicator UUIDs to delete, 1-200 per request.",
+              "items": {
+                "format": "uuid",
+                "type": "string"
+              },
+              "maxItems": 200,
+              "minItems": 1,
+              "type": "array"
+            }
           },
-          "maxItems": 200,
-          "minItems": 1,
-          "type": "array"
+          "required": [
+            "indicatorIds"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "indicator_ids"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -316,21 +345,17 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/dataset/${pathParam(args, "dataset_id")}/indicators`,
       query: [
-        ["indicatorIds", args["indicator_ids"], true],
+        ["indicatorIds", param(args, "query", "indicatorIds"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_create",
+    name: "cloudforceOne_threatIntel_indicators_create",
     title: "Create an indicator",
-    description: "Creates an indicator in a dataset. Set `autoCreateType` to create the indicator type if it doesn't exist.",
+    description: "Creates an indicator in a dataset. Set `autoCreateType` to create the indicator type if it doesn't exist.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "autoCreateType": {
@@ -396,16 +421,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -662,30 +701,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_delete",
+    name: "cloudforceOne_threatIntel_indicators_delete",
     title: "Delete an indicator",
-    description: "Deletes an indicator by its UUID.",
+    description: "Deletes an indicator by its UUID.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/{indicator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "type": "string"
-        },
-        "indicator_id": {
-          "description": "Indicator UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "type": "string"
+            },
+            "indicator_id": {
+              "description": "Indicator UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "indicator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "indicator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -762,30 +811,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_get",
+    name: "cloudforceOne_threatIntel_indicators_get",
     title: "Get an indicator",
-    description: "Returns an indicator by its UUID.",
+    description: "Returns an indicator by its UUID.\n\nGET /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/{indicator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "type": "string"
-        },
-        "indicator_id": {
-          "description": "Indicator UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "type": "string"
+            },
+            "indicator_id": {
+              "description": "Indicator UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "indicator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "indicator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1041,224 +1100,240 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_list",
+    name: "cloudforceOne_threatIntel_indicators_list",
     title: "List indicators",
-    description: "Lists indicators across datasets, newest first. `datasetIds` accepts dataset UUIDs or one scope value used alone: `all` (or `*`) and `operational` select the intelligence datasets you can read, and `analytics` selects the analytics datasets you can read. Without `datasetIds`, the default dataset is used.",
+    description: "Lists indicators across datasets, newest first. `datasetIds` accepts dataset UUIDs or one scope value used alone: `all` (or `*`) and `operational` select the intelligence datasets you can read, and `analytics` selects the analytics datasets you can read. Without `datasetIds`, the default dataset is used.\n\nGET /accounts/{account_id}/cloudforce-one/events/indicators",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "cache": {
-          "description": "Cache strategy. 'from-graph' serves results from the graph-node KV cache when all requested UUIDs are cached; falls back to normal path on partial/zero hit. Cannot be combined with `cursor`.",
-          "enum": [
-            "from-graph"
-          ],
-          "type": "string"
-        },
-        "created_after": {
-          "description": "Filter indicators created on or after this date. Must use ISO 8601 format (e.g., '2024-01-15T00:00:00Z').",
-          "format": "date-time",
-          "type": "string"
-        },
-        "created_before": {
-          "description": "Filter indicators created on or before this date. Must use ISO 8601 format (e.g., '2024-12-31T23:59:59Z').",
-          "format": "date-time",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque cursor from a previous response's `pagination.cursor`. When provided, all filters, datasetIds, page, `pageSize`, `includeTags` and `relatedEventsLimit` come from the cursor — do not resend them. Sending any filter, `page`, `pageSize`, `includeTags`, `relatedEventsLimit`, `includeTotalCount=true`, or `cache=from-graph` alongside a cursor yields a 400 `CursorFilterConflictError`. A cursor issued for a different entity, an unsupported version, or a dataset that has since been reconfigured as analytics-only yields a 400 `InvalidCursorError`.",
-          "type": "string"
-        },
-        "dataset_ids": {
-          "description": "Dataset UUIDs to query, or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). If not provided, uses the default dataset.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Output format for indicator data. 'json' returns the default format, 'stix2' returns STIX 2.1 Indicator SDOs, 'taxii' returns a TAXII 2.1 Envelope with Content-Type application/taxii+json;version=2.1.",
-          "enum": [
-            "json",
-            "stix2",
-            "taxii"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "include_tags": {
-          "description": "Whether to include full tag details for each indicator. Defaults to true.",
-          "type": "boolean"
-        },
-        "include_total_count": {
-          "description": "Whether to compute total count via COUNT(*). Defaults to false for performance. total_count is null unless this is true and the complete fan-out succeeds.",
-          "type": "boolean"
-        },
-        "indicator_type": {
-          "type": "string"
-        },
-        "name": {
-          "description": "Filter indicators by value using substring match (LIKE). Legacy alternative to structured search.",
-          "type": "string"
-        },
-        "page": {
-          "type": "number"
-        },
-        "page_size": {
-          "type": "number"
-        },
-        "related_events": {
-          "description": "Filter by related event IDs",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "related_events_limit": {
-          "description": "Limit the number of related events returned per indicator. Default: 2. Set to 0 for none, -1 for all events. For JSON responses, when the limit hides events, the indicator carries `relatedEventsHasMore: true` and the response includes an advisory message — the cap is never applied silently. STIX and TAXII representations do not include related-event data.",
-          "type": "number"
+          "type": "object"
         },
-        "search": {
-          "description": "Structured search as a JSON array of {field, op, value} objects. Searchable fields: value, indicatorType, uuid. Supports operators: equals, not, contains, startsWith, endsWith, gt, lt, gte, lte, like, in, find. Use the 'in' operator with an array value to bulk-check up to 100 indicators in a single request, e.g. search=[{\"field\":\"value\",\"op\":\"in\",\"value\":[\"evil.com\",\"bad.org\"]}]. Multiple conditions are AND'd together. Max 10 conditions per request.",
-          "items": {
-            "properties": {
-              "field": {
-                "description": "The indicator field to search on. Allowed: value, indicatorType, uuid.",
-                "enum": [
-                  "value",
-                  "indicatorType",
-                  "uuid"
-                ],
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cache": {
+              "description": "Cache strategy. 'from-graph' serves results from the graph-node KV cache when all requested UUIDs are cached; falls back to normal path on partial/zero hit. Cannot be combined with `cursor`.",
+              "enum": [
+                "from-graph"
+              ],
+              "type": "string"
+            },
+            "createdAfter": {
+              "description": "Filter indicators created on or after this date. Must use ISO 8601 format (e.g., '2024-01-15T00:00:00Z').",
+              "format": "date-time",
+              "type": "string"
+            },
+            "createdBefore": {
+              "description": "Filter indicators created on or before this date. Must use ISO 8601 format (e.g., '2024-12-31T23:59:59Z').",
+              "format": "date-time",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Opaque cursor from a previous response's `pagination.cursor`. When provided, all filters, datasetIds, page, `pageSize`, `includeTags` and `relatedEventsLimit` come from the cursor — do not resend them. Sending any filter, `page`, `pageSize`, `includeTags`, `relatedEventsLimit`, `includeTotalCount=true`, or `cache=from-graph` alongside a cursor yields a 400 `CursorFilterConflictError`. A cursor issued for a different entity, an unsupported version, or a dataset that has since been reconfigured as analytics-only yields a 400 `InvalidCursorError`.",
+              "type": "string"
+            },
+            "datasetIds": {
+              "description": "Dataset UUIDs to query, or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). If not provided, uses the default dataset.",
+              "items": {
                 "type": "string"
               },
-              "op": {
-                "description": "Search operator. Use 'in' for bulk lookup of up to 100 values at once, e.g. {field:'value', op:'in', value:['evil.com','bad.org']}.",
-                "enum": [
-                  "equals",
-                  "not",
-                  "gt",
-                  "gte",
-                  "lt",
-                  "lte",
-                  "like",
-                  "contains",
-                  "startsWith",
-                  "endsWith",
-                  "in",
-                  "find"
-                ],
+              "type": "array"
+            },
+            "format": {
+              "description": "Output format for indicator data. 'json' returns the default format, 'stix2' returns STIX 2.1 Indicator SDOs, 'taxii' returns a TAXII 2.1 Envelope with Content-Type application/taxii+json;version=2.1.",
+              "enum": [
+                "json",
+                "stix2",
+                "taxii"
+              ],
+              "type": "string"
+            },
+            "includeTags": {
+              "description": "Whether to include full tag details for each indicator. Defaults to true.",
+              "type": "boolean"
+            },
+            "includeTotalCount": {
+              "description": "Whether to compute total count via COUNT(*). Defaults to false for performance. total_count is null unless this is true and the complete fan-out succeeds.",
+              "type": "boolean"
+            },
+            "indicatorType": {
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter indicators by value using substring match (LIKE). Legacy alternative to structured search.",
+              "type": "string"
+            },
+            "page": {
+              "type": "number"
+            },
+            "pageSize": {
+              "type": "number"
+            },
+            "relatedEvents": {
+              "description": "Filter by related event IDs",
+              "items": {
                 "type": "string"
               },
-              "value": {
-                "anyOf": [
-                  {
+              "type": "array"
+            },
+            "relatedEventsLimit": {
+              "description": "Limit the number of related events returned per indicator. Default: 2. Set to 0 for none, -1 for all events. For JSON responses, when the limit hides events, the indicator carries `relatedEventsHasMore: true` and the response includes an advisory message — the cap is never applied silently. STIX and TAXII representations do not include related-event data.",
+              "type": "number"
+            },
+            "search": {
+              "description": "Structured search as a JSON array of {field, op, value} objects. Searchable fields: value, indicatorType, uuid. Supports operators: equals, not, contains, startsWith, endsWith, gt, lt, gte, lte, like, in, find. Use the 'in' operator with an array value to bulk-check up to 100 indicators in a single request, e.g. search=[{\"field\":\"value\",\"op\":\"in\",\"value\":[\"evil.com\",\"bad.org\"]}]. Multiple conditions are AND'd together. Max 10 conditions per request.",
+              "items": {
+                "properties": {
+                  "field": {
+                    "description": "The indicator field to search on. Allowed: value, indicatorType, uuid.",
+                    "enum": [
+                      "value",
+                      "indicatorType",
+                      "uuid"
+                    ],
                     "type": "string"
                   },
-                  {
-                    "items": {
-                      "type": "string"
-                    },
-                    "type": "array"
+                  "op": {
+                    "description": "Search operator. Use 'in' for bulk lookup of up to 100 values at once, e.g. {field:'value', op:'in', value:['evil.com','bad.org']}.",
+                    "enum": [
+                      "equals",
+                      "not",
+                      "gt",
+                      "gte",
+                      "lt",
+                      "lte",
+                      "like",
+                      "contains",
+                      "startsWith",
+                      "endsWith",
+                      "in",
+                      "find"
+                    ],
+                    "type": "string"
+                  },
+                  "value": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "items": {
+                          "type": "string"
+                        },
+                        "type": "array"
+                      }
+                    ],
+                    "description": "Search value. String for most operators. Array of strings for 'in' operator (max 100 items)."
                   }
+                },
+                "required": [
+                  "field",
+                  "op",
+                  "value"
                 ],
-                "description": "Search value. String for most operators. Array of strings for 'in' operator (max 100 items)."
-              }
-            },
-            "required": [
-              "field",
-              "op",
-              "value"
-            ],
-            "type": "object"
-          },
-          "type": "array"
-        },
-        "tag_search": {
-          "description": "Structured tag-metadata filter as a JSON array of {field, op, value} objects. Operates against the per-dataset IndicatorTag mirror so you can find indicators by tag attributes (origin country, motive, sophistication, priority, etc.) without a separate Tags lookup. Common dashboard usage: drill from a country into indicators, e.g. tagSearch=[{\"field\":\"originCountryISO\",\"op\":\"in\",\"value\":[\"IR\",\"CN\"]}]. Country values may be passed as alpha-2, alpha-3, name, or alias (e.g. \"iran\"). Operators: equals, not, gt/gte/lt/lte (numeric only), contains/like/find/startsWith/endsWith (string only), in. AND-joined across entries; combined with `tags`, a matching tag must satisfy both. Max 10 entries per request, max 100 values per 'in'. Performance notes: `originCountryISO` uses its B-tree index for equals/not/in. `priority` uses its B-tree index for numeric comparisons. Other string columns (`actorCategory`, `motive`, etc.) are case-insensitive and unindexed; current catalog size makes this a non-issue. `endsWith` and `aliasGroupNames` contains/like are leading-wildcard scans and slow on large result sets. `aliasGroupNames` matches on the JSON-encoded text, so substrings can cross alias boundaries (\"apt28\" also matches \"apt280\" when both appear in the same tag's alias list).",
-          "items": {
-            "properties": {
-              "field": {
-                "description": "Tag mirror field to filter on. Allowed: value, categoryId, actorCategory, aliasGroupNames, attributionConfidence, attributionOrganization, motive, opsecLevel, originCountryISO, sophisticationLevel, priority, analyticPriority. Filters operate against the per-dataset IndicatorTag mirror (which is kept in sync with the Tags SoT by the tag-propagation workflow).",
-                "enum": [
-                  "value",
-                  "categoryId",
-                  "actorCategory",
-                  "aliasGroupNames",
-                  "attributionConfidence",
-                  "attributionOrganization",
-                  "motive",
-                  "opsecLevel",
-                  "originCountryISO",
-                  "sophisticationLevel",
-                  "priority",
-                  "analyticPriority"
-                ],
-                "type": "string"
-              },
-              "op": {
-                "description": "Search operator. Use 'in' for bulk OR within a single field, e.g. {field:\"originCountryISO\", op:\"in\", value:[\"IR\",\"CN\"]}.",
-                "enum": [
-                  "equals",
-                  "not",
-                  "gt",
-                  "gte",
-                  "lt",
-                  "lte",
-                  "like",
-                  "contains",
-                  "startsWith",
-                  "endsWith",
-                  "in",
-                  "find"
-                ],
-                "type": "string"
+                "type": "object"
               },
-              "value": {
-                "anyOf": [
-                  {
+              "type": "array"
+            },
+            "tagSearch": {
+              "description": "Structured tag-metadata filter as a JSON array of {field, op, value} objects. Operates against the per-dataset IndicatorTag mirror so you can find indicators by tag attributes (origin country, motive, sophistication, priority, etc.) without a separate Tags lookup. Common dashboard usage: drill from a country into indicators, e.g. tagSearch=[{\"field\":\"originCountryISO\",\"op\":\"in\",\"value\":[\"IR\",\"CN\"]}]. Country values may be passed as alpha-2, alpha-3, name, or alias (e.g. \"iran\"). Operators: equals, not, gt/gte/lt/lte (numeric only), contains/like/find/startsWith/endsWith (string only), in. AND-joined across entries; combined with `tags`, a matching tag must satisfy both. Max 10 entries per request, max 100 values per 'in'. Performance notes: `originCountryISO` uses its B-tree index for equals/not/in. `priority` uses its B-tree index for numeric comparisons. Other string columns (`actorCategory`, `motive`, etc.) are case-insensitive and unindexed; current catalog size makes this a non-issue. `endsWith` and `aliasGroupNames` contains/like are leading-wildcard scans and slow on large result sets. `aliasGroupNames` matches on the JSON-encoded text, so substrings can cross alias boundaries (\"apt28\" also matches \"apt280\" when both appear in the same tag's alias list).",
+              "items": {
+                "properties": {
+                  "field": {
+                    "description": "Tag mirror field to filter on. Allowed: value, categoryId, actorCategory, aliasGroupNames, attributionConfidence, attributionOrganization, motive, opsecLevel, originCountryISO, sophisticationLevel, priority, analyticPriority. Filters operate against the per-dataset IndicatorTag mirror (which is kept in sync with the Tags SoT by the tag-propagation workflow).",
+                    "enum": [
+                      "value",
+                      "categoryId",
+                      "actorCategory",
+                      "aliasGroupNames",
+                      "attributionConfidence",
+                      "attributionOrganization",
+                      "motive",
+                      "opsecLevel",
+                      "originCountryISO",
+                      "sophisticationLevel",
+                      "priority",
+                      "analyticPriority"
+                    ],
                     "type": "string"
                   },
-                  {
-                    "type": "number"
+                  "op": {
+                    "description": "Search operator. Use 'in' for bulk OR within a single field, e.g. {field:\"originCountryISO\", op:\"in\", value:[\"IR\",\"CN\"]}.",
+                    "enum": [
+                      "equals",
+                      "not",
+                      "gt",
+                      "gte",
+                      "lt",
+                      "lte",
+                      "like",
+                      "contains",
+                      "startsWith",
+                      "endsWith",
+                      "in",
+                      "find"
+                    ],
+                    "type": "string"
                   },
-                  {
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
+                  "value": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "items": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "number"
+                            }
+                          ]
                         },
-                        {
-                          "type": "number"
-                        }
-                      ]
-                    },
-                    "type": "array"
+                        "type": "array"
+                      }
+                    ],
+                    "description": "Search value. String or number for most operators. Array for 'in' (max 100 items). Country values may be passed as alpha-2, alpha-3, name, or common alias (e.g. \"iran\", \"IR\", \"IRN\") and are normalized to alpha-2 server-side."
                   }
+                },
+                "required": [
+                  "field",
+                  "op"
                 ],
-                "description": "Search value. String or number for most operators. Array for 'in' (max 100 items). Country values may be passed as alpha-2, alpha-3, name, or common alias (e.g. \"iran\", \"IR\", \"IRN\") and are normalized to alpha-2 server-side."
-              }
+                "type": "object"
+              },
+              "type": "array"
             },
-            "required": [
-              "field",
-              "op"
-            ],
-            "type": "object"
-          },
-          "type": "array"
-        },
-        "tags": {
-          "description": "Filter by tag values or UUIDs. Indicators must have at least one of the specified tags (OR logic). Supports both tag UUID and tag value.",
-          "items": {
-            "type": "string"
+            "tags": {
+              "description": "Filter by tag values or UUIDs. Indicators must have at least one of the specified tags (OR logic). Supports both tag UUID and tag value.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2186,37 +2261,33 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/indicators`,
       query: [
-        ["datasetIds", args["dataset_ids"], true],
-        ["page", args["page"], true],
-        ["pageSize", args["page_size"], true],
-        ["search", args["search"], true],
-        ["name", args["name"], true],
-        ["indicatorType", args["indicator_type"], true],
-        ["relatedEvents", args["related_events"], true],
-        ["tags", args["tags"], true],
-        ["tagSearch", args["tag_search"], true],
-        ["createdAfter", args["created_after"], true],
-        ["createdBefore", args["created_before"], true],
-        ["relatedEventsLimit", args["related_events_limit"], true],
-        ["includeTags", args["include_tags"], true],
-        ["includeTotalCount", args["include_total_count"], true],
-        ["format", args["format"], true],
-        ["cache", args["cache"], true],
-        ["cursor", args["cursor"], true],
+        ["datasetIds", param(args, "query", "datasetIds"), true],
+        ["page", param(args, "query", "page"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
+        ["search", param(args, "query", "search"), true],
+        ["name", param(args, "query", "name"), true],
+        ["indicatorType", param(args, "query", "indicatorType"), true],
+        ["relatedEvents", param(args, "query", "relatedEvents"), true],
+        ["tags", param(args, "query", "tags"), true],
+        ["tagSearch", param(args, "query", "tagSearch"), true],
+        ["createdAfter", param(args, "query", "createdAfter"), true],
+        ["createdBefore", param(args, "query", "createdBefore"), true],
+        ["relatedEventsLimit", param(args, "query", "relatedEventsLimit"), true],
+        ["includeTags", param(args, "query", "includeTags"), true],
+        ["includeTotalCount", param(args, "query", "includeTotalCount"), true],
+        ["format", param(args, "query", "format"), true],
+        ["cache", param(args, "query", "cache"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_update",
+    name: "cloudforceOne_threatIntel_indicators_update",
     title: "Update an indicator",
-    description: "Updates the given fields of an indicator and leaves the other fields unchanged.",
+    description: "Updates the given fields of an indicator and leaves the other fields unchanged.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicators/{indicator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "indicatorType": {
@@ -2274,20 +2345,34 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "type": "string"
-        },
-        "indicator_id": {
-          "description": "Indicator UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "type": "string"
+            },
+            "indicator_id": {
+              "description": "Indicator UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id",
+            "indicator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
-        "indicator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/types/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/types/tools.ts
index a2ab658ad..af22b8649 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/types/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/indicators/types/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.indicators.types`.
+ * The tools of `cloudforceOne.threatIntel.indicators.types`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_indicators_types_create",
+    name: "cloudforceOne_threatIntel_indicators_types_create",
     title: "Create an indicator type",
-    description: "Creates an indicator type in a dataset.",
+    description: "Creates an indicator type in a dataset.\n\nPOST /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}/indicatorTypes/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -34,15 +30,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Dataset ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -223,27 +233,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_indicators_types_list",
+    name: "cloudforceOne_threatIntel_indicators_types_list",
     title: "List indicator types",
-    description: "Lists the indicator types used in the datasets given by `datasetIds`, which accepts dataset UUIDs or one scope value used alone. Without `datasetIds`, every dataset you can read is included, analytics datasets too.",
+    description: "Lists the indicator types used in the datasets given by `datasetIds`, which accepts dataset UUIDs or one scope value used alone. Without `datasetIds`, every dataset you can read is included, analytics datasets too.\n\nGET /accounts/{account_id}/cloudforce-one/events/indicator-types",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "dataset_ids": {
-          "description": "Dataset UUIDs to query, or one standalone scope value: 'operational' for readable intelligence datasets (isAnalytics=false), 'analytics' for readable analytics datasets (isAnalytics=true), or 'all'/'*' for every readable dataset including analytics datasets. If not provided, queries all accessible datasets, including analytics datasets.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetIds": {
+              "description": "Dataset UUIDs to query, or one standalone scope value: 'operational' for readable intelligence datasets (isAnalytics=false), 'analytics' for readable analytics datasets (isAnalytics=true), or 'all'/'*' for every readable dataset including analytics datasets. If not provided, queries all accessible datasets, including analytics datasets.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -343,7 +369,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/indicator-types`,
       query: [
-        ["datasetIds", args["dataset_ids"], true],
+        ["datasetIds", param(args, "query", "datasetIds"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/outputs.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/outputs.ts
index 1a97ef485..732e86f00 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/outputs.ts
@@ -6,14 +6,14 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cloudforce-one-events_HydratedEntity` in responses.
  */
-export const cloudforce_one_events_HydratedEntity_output: JsonSchema = {
+export const cloudforce$$one$$events_HydratedEntity: JsonSchema = {
   "type": "object"
 };
 
 /**
  * The schema of `cloudforce-one-events_RelationshipEdge` in responses.
  */
-export const cloudforce_one_events_RelationshipEdge_output: JsonSchema = {
+export const cloudforce$$one$$events_RelationshipEdge: JsonSchema = {
   "properties": {
     "confidence": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/actors/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/actors/tools.ts
index a6de64889..162697e99 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/actors/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/actors/tools.ts
@@ -1,96 +1,112 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.tags.actors`.
+ * The tools of `cloudforceOne.threatIntel.tags.actors`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_tags_actors_list",
+    name: "cloudforceOne_threatIntel_tags_actors_list",
     title: "List threat actors",
-    description: "Lists threat actors from the Cloudforce One actor catalog. Use `value` to match actor names and `filters` to filter by fields such as origin country. Accounts outside Cloudforce One receive only public fields: identity, description, discovery date, TLP, confidence, custom properties, origin country, public aliases, and external references. Fields such as internal aliases, attribution, motive, and OPSEC level are omitted.",
+    description: "Lists threat actors from the Cloudforce One actor catalog. Use `value` to match actor names and `filters` to filter by fields such as origin country. Accounts outside Cloudforce One receive only public fields: identity, description, discovery date, TLP, confidence, custom properties, origin country, public aliases, and external references. Fields such as internal aliases, attribution, motive, and OPSEC level are omitted.\n\nGET /accounts/{account_id}/cloudforce-one/events/tags/categories/actors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "filters": {
-          "description": "Structured filters as a JSON array of {field, op, value} objects. Same shape as the events search API. Common use: filter actors by country with filters=[{\"field\":\"originCountryISO\",\"op\":\"in\",\"value\":[\"IR\",\"CN\"]}]. Country values may be passed as alpha-2, alpha-3, name, or alias (e.g. \"iran\"). Max 10 entries per request, max 100 values per 'in'. Accounts other than the catalog owner may only filter on fields that are also public-readable (`uuid`, `value`, `categoryName`, `aliasGroupNames`, `originCountryISO`); filtering on a redacted field returns 400. `uuid` filters accept only the `equals` and `in` operators. Performance notes: `originCountryISO` uses its B-tree index for equals/in. `endsWith` and `aliasGroupNames` contains/like are leading-wildcard scans and slow on large result sets. `aliasGroupNames` matches on JSON-encoded text, so substrings can cross alias boundaries (\"apt28\" also matches \"apt280\" when both appear in the same tag's alias list).",
-          "items": {
-            "properties": {
-              "field": {
-                "description": "Tag field to search on. Allowed first-class fields: uuid, value, categoryName, description, dateOfDiscovery, tlp, confidence, actorCategory, motive, attributionOrganization, originCountryISO, aliases, externalReferences, opsecLevel, sophisticationLevel, activeDuration, priority, lastSeen, aliasGroupNames. Also supports properties.<key> to filter on custom field values (matches both raw values and annotated {value,confidence,tlp} shapes via COALESCE), and properties.<key>.tlp / properties.<key>.confidence to filter directly on annotation sub-fields.",
-                "type": "string"
-              },
-              "op": {
-                "description": "Search operator. Use 'in' for bulk OR within a single field.",
-                "enum": [
-                  "equals",
-                  "not",
-                  "gt",
-                  "gte",
-                  "lt",
-                  "lte",
-                  "like",
-                  "contains",
-                  "startsWith",
-                  "endsWith",
-                  "in",
-                  "find"
-                ],
-                "type": "string"
-              },
-              "value": {
-                "anyOf": [
-                  {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "filters": {
+              "description": "Structured filters as a JSON array of {field, op, value} objects. Same shape as the events search API. Common use: filter actors by country with filters=[{\"field\":\"originCountryISO\",\"op\":\"in\",\"value\":[\"IR\",\"CN\"]}]. Country values may be passed as alpha-2, alpha-3, name, or alias (e.g. \"iran\"). Max 10 entries per request, max 100 values per 'in'. Accounts other than the catalog owner may only filter on fields that are also public-readable (`uuid`, `value`, `categoryName`, `aliasGroupNames`, `originCountryISO`); filtering on a redacted field returns 400. `uuid` filters accept only the `equals` and `in` operators. Performance notes: `originCountryISO` uses its B-tree index for equals/in. `endsWith` and `aliasGroupNames` contains/like are leading-wildcard scans and slow on large result sets. `aliasGroupNames` matches on JSON-encoded text, so substrings can cross alias boundaries (\"apt28\" also matches \"apt280\" when both appear in the same tag's alias list).",
+              "items": {
+                "properties": {
+                  "field": {
+                    "description": "Tag field to search on. Allowed first-class fields: uuid, value, categoryName, description, dateOfDiscovery, tlp, confidence, actorCategory, motive, attributionOrganization, originCountryISO, aliases, externalReferences, opsecLevel, sophisticationLevel, activeDuration, priority, lastSeen, aliasGroupNames. Also supports properties.<key> to filter on custom field values (matches both raw values and annotated {value,confidence,tlp} shapes via COALESCE), and properties.<key>.tlp / properties.<key>.confidence to filter directly on annotation sub-fields.",
                     "type": "string"
                   },
-                  {
-                    "type": "number"
+                  "op": {
+                    "description": "Search operator. Use 'in' for bulk OR within a single field.",
+                    "enum": [
+                      "equals",
+                      "not",
+                      "gt",
+                      "gte",
+                      "lt",
+                      "lte",
+                      "like",
+                      "contains",
+                      "startsWith",
+                      "endsWith",
+                      "in",
+                      "find"
+                    ],
+                    "type": "string"
                   },
-                  {
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
+                  "value": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "items": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "number"
+                            }
+                          ]
                         },
-                        {
-                          "type": "number"
-                        }
-                      ]
-                    },
-                    "type": "array"
+                        "type": "array"
+                      }
+                    ],
+                    "description": "Search value. String or number for most operators. Array for 'in' (max 100 items)."
                   }
+                },
+                "required": [
+                  "field",
+                  "op"
                 ],
-                "description": "Search value. String or number for most operators. Array for 'in' (max 100 items)."
-              }
+                "type": "object"
+              },
+              "type": "array"
             },
-            "required": [
-              "field",
-              "op"
-            ],
-            "type": "object"
+            "page": {
+              "type": "number"
+            },
+            "pageSize": {
+              "type": "number"
+            },
+            "value": {
+              "description": "Free-text substring match on actor name (Tag.value).",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "page": {
-          "type": "number"
-        },
-        "page_size": {
-          "type": "number"
-        },
-        "value": {
-          "description": "Free-text substring match on actor name (Tag.value).",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1290,10 +1306,10 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/tags/categories/actors`,
       query: [
-        ["page", args["page"], true],
-        ["pageSize", args["page_size"], true],
-        ["value", args["value"], true],
-        ["filters", args["filters"], true],
+        ["page", param(args, "query", "page"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
+        ["value", param(args, "query", "value"), true],
+        ["filters", param(args, "query", "filters"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/outputs.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/outputs.ts
index 4319bf126..c8b3ef480 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/outputs.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `cloudforce-one-events_FieldDefinition` in responses.
  */
-export const cloudforce_one_events_FieldDefinition_output: JsonSchema = {
+export const cloudforce$$one$$events_FieldDefinition: JsonSchema = {
   "properties": {
     "allowedValues": {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/schemas.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/schemas.ts
index 90c25ef37..1695cf452 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/schemas.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `cloudforce-one-events_FieldDefinition`.
  */
-export const cloudforce_one_events_FieldDefinition: JsonSchema = {
+export const cloudforce$$one$$events_FieldDefinition: JsonSchema = {
   "properties": {
     "allowedValues": {
       "items": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/tools.ts
index 767d24122..5932a3f9c 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/categories/tools.ts
@@ -1,25 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
-import { cloudforce_one_events_FieldDefinition_output } from "./outputs.js";
-import { cloudforce_one_events_FieldDefinition } from "./schemas.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
+import { cloudforce$$one$$events_FieldDefinition } from "./outputs.js";
+import { cloudforce$$one$$events_FieldDefinition as cloudforce$$one$$events_FieldDefinition$ } from "./schemas.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.tags.categories`.
+ * The tools of `cloudforceOne.threatIntel.tags.categories`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_tags_categories_create",
+    name: "cloudforceOne_threatIntel_tags_categories_create",
     title: "Create a tag category",
-    description: "Creates a tag category. Use `schema` to define the custom fields its tags can have.",
+    description: "Creates a tag category. Use `schema` to define the custom fields its tags can have.\n\nPOST /accounts/{account_id}/cloudforce-one/events/tags/categories/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -40,13 +36,27 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition$,
       },
     },
     outputSchema: {
@@ -86,7 +96,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition_output,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition,
       },
     },
     annotations: {
@@ -205,7 +215,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition_output,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition,
       },
     },
     request: (args) => ({
@@ -214,25 +224,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_categories_delete",
+    name: "cloudforceOne_threatIntel_tags_categories_delete",
     title: "Delete a tag category",
-    description: "Deletes a tag category by its UUID.",
+    description: "Deletes a tag category by its UUID.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/tag-categories/{category_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "category_uuid": {
-          "description": "Tag Category UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "category_uuid": {
+              "description": "Tag Category UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -339,25 +359,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_categories_get",
+    name: "cloudforceOne_threatIntel_tags_categories_get",
     title: "Get a tag category",
-    description: "Returns a tag category by its UUID, including the custom fields defined in its `schema`.",
+    description: "Returns a tag category by its UUID, including the custom fields defined in its `schema`.\n\nGET /accounts/{account_id}/cloudforce-one/events/tag-categories/{category_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "category_uuid": {
-          "description": "Tag Category UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "category_uuid": {
+              "description": "Tag Category UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -396,7 +426,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition_output,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition,
       },
     },
     annotations: {
@@ -485,7 +515,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition_output,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition,
       },
     },
     request: (args) => ({
@@ -493,23 +523,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_categories_list",
+    name: "cloudforceOne_threatIntel_tags_categories_list",
     title: "List tag categories",
-    description: "Lists the account's tag categories. Use `search` to filter them.",
+    description: "Lists the account's tag categories. Use `search` to filter them.\n\nGET /accounts/{account_id}/cloudforce-one/events/tags/categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "search": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -559,7 +605,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition_output,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition,
       },
     },
     annotations: {
@@ -659,27 +705,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition_output,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/tags/categories`,
       query: [
-        ["search", args["search"], true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_categories_update",
+    name: "cloudforceOne_threatIntel_tags_categories_update",
     title: "Update a tag category",
-    description: "Updates the given fields of a tag category and leaves the other fields unchanged.",
+    description: "Updates the given fields of a tag category and leaves the other fields unchanged.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/tag-categories/{category_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "description": {
@@ -698,17 +740,31 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "category_uuid": {
-          "description": "Tag Category UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "category_uuid": {
+              "description": "Tag Category UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_uuid"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition$,
       },
     },
     outputSchema: {
@@ -748,7 +804,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition_output,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition,
       },
     },
     annotations: {
@@ -896,7 +952,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-events_FieldDefinition": cloudforce_one_events_FieldDefinition_output,
+        "cloudforce-one-events_FieldDefinition": cloudforce$$one$$events_FieldDefinition,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/indicators/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/indicators/tools.ts
index 757fa08e9..528c2e684 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/indicators/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/indicators/tools.ts
@@ -1,110 +1,126 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.tags.indicators`.
+ * The tools of `cloudforceOne.threatIntel.tags.indicators`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_tags_indicators_list",
+    name: "cloudforceOne_threatIntel_tags_indicators_list",
     title: "List a tag's indicators",
-    description: "Lists the indicators that carry a tag, with pagination. By default, every intelligence dataset you can read is searched; use `datasetIds` to limit the search to specific datasets or a scope value. Analytics datasets don't store tag associations, so the `analytics` scope returns no results.",
+    description: "Lists the indicators that carry a tag, with pagination. By default, every intelligence dataset you can read is searched; use `datasetIds` to limit the search to specific datasets or a scope value. Analytics datasets don't store tag associations, so the `analytics` scope returns no results.\n\nGET /accounts/{account_id}/cloudforce-one/events/tags/{tag_uuid}/indicators",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_ids": {
-          "description": "Dataset UUIDs to scope to (repeat the param for multiple), or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). Analytics datasets do not expose tag associations, so 'analytics' returns an empty result. Omit for 'all'.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "indicator_type": {
-          "type": "string"
-        },
-        "page": {
-          "type": "number"
-        },
-        "page_size": {
-          "type": "number"
-        },
-        "related_event": {
-          "description": "Filter indicators by related event UUID(s). Multiple UUIDs can be provided by repeating the parameter.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "tag_uuid": {
+              "description": "Tag UUID.",
+              "type": "string"
+            }
           },
-          "type": "array"
+          "required": [
+            "account_id",
+            "tag_uuid"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Structured search as a JSON array of {field, op, value} objects. Searchable fields: value, indicatorType. Multiple conditions are AND'd together. Max 10 conditions per request.",
-          "items": {
-            "properties": {
-              "field": {
-                "description": "The indicator field to search on. Allowed: value, indicatorType, uuid.",
-                "enum": [
-                  "value",
-                  "indicatorType",
-                  "uuid"
-                ],
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetIds": {
+              "description": "Dataset UUIDs to scope to (repeat the param for multiple), or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). Analytics datasets do not expose tag associations, so 'analytics' returns an empty result. Omit for 'all'.",
+              "items": {
                 "type": "string"
               },
-              "op": {
-                "description": "Search operator. Use 'in' for bulk lookup of up to 100 values at once, e.g. {field:'value', op:'in', value:['evil.com','bad.org']}.",
-                "enum": [
-                  "equals",
-                  "not",
-                  "gt",
-                  "gte",
-                  "lt",
-                  "lte",
-                  "like",
-                  "contains",
-                  "startsWith",
-                  "endsWith",
-                  "in",
-                  "find"
-                ],
+              "type": "array"
+            },
+            "indicatorType": {
+              "type": "string"
+            },
+            "page": {
+              "type": "number"
+            },
+            "pageSize": {
+              "type": "number"
+            },
+            "relatedEvent": {
+              "description": "Filter indicators by related event UUID(s). Multiple UUIDs can be provided by repeating the parameter.",
+              "items": {
                 "type": "string"
               },
-              "value": {
-                "anyOf": [
-                  {
+              "type": "array"
+            },
+            "search": {
+              "description": "Structured search as a JSON array of {field, op, value} objects. Searchable fields: value, indicatorType. Multiple conditions are AND'd together. Max 10 conditions per request.",
+              "items": {
+                "properties": {
+                  "field": {
+                    "description": "The indicator field to search on. Allowed: value, indicatorType, uuid.",
+                    "enum": [
+                      "value",
+                      "indicatorType",
+                      "uuid"
+                    ],
                     "type": "string"
                   },
-                  {
-                    "items": {
-                      "type": "string"
-                    },
-                    "type": "array"
+                  "op": {
+                    "description": "Search operator. Use 'in' for bulk lookup of up to 100 values at once, e.g. {field:'value', op:'in', value:['evil.com','bad.org']}.",
+                    "enum": [
+                      "equals",
+                      "not",
+                      "gt",
+                      "gte",
+                      "lt",
+                      "lte",
+                      "like",
+                      "contains",
+                      "startsWith",
+                      "endsWith",
+                      "in",
+                      "find"
+                    ],
+                    "type": "string"
+                  },
+                  "value": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "items": {
+                          "type": "string"
+                        },
+                        "type": "array"
+                      }
+                    ],
+                    "description": "Search value. String for most operators. Array of strings for 'in' operator (max 100 items)."
                   }
+                },
+                "required": [
+                  "field",
+                  "op",
+                  "value"
                 ],
-                "description": "Search value. String for most operators. Array of strings for 'in' operator (max 100 items)."
-              }
-            },
-            "required": [
-              "field",
-              "op",
-              "value"
-            ],
-            "type": "object"
+                "type": "object"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "tag_uuid": {
-          "description": "Tag UUID.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -488,12 +504,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/tags/${pathParam(args, "tag_uuid")}/indicators`,
       query: [
-        ["datasetIds", args["dataset_ids"], true],
-        ["page", args["page"], true],
-        ["pageSize", args["page_size"], true],
-        ["indicatorType", args["indicator_type"], true],
-        ["relatedEvent", args["related_event"], true],
-        ["search", args["search"], true],
+        ["datasetIds", param(args, "query", "datasetIds"), true],
+        ["page", param(args, "query", "page"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
+        ["indicatorType", param(args, "query", "indicatorType"), true],
+        ["relatedEvent", param(args, "query", "relatedEvent"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/relationships/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/relationships/tools.ts
index 526430edb..8a770e67a 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/relationships/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/relationships/tools.ts
@@ -1,27 +1,23 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  cloudforce_one_events_HydratedEntity_output,
-  cloudforce_one_events_RelationshipEdge_output,
+  cloudforce$$one$$events_HydratedEntity,
+  cloudforce$$one$$events_RelationshipEdge,
 } from "../../outputs.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.tags.relationships`.
+ * The tools of `cloudforceOne.threatIntel.tags.relationships`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_tags_relationships_create",
+    name: "cloudforceOne_threatIntel_tags_relationships_create",
     title: "Create a tag relationship",
-    description: "Creates a relationship from a tag to an event or indicator (`targetType`) in the dataset given by `datasetId`. Relationships between two tags are not supported.",
+    description: "Creates a relationship from a tag to an event or indicator (`targetType`) in the dataset given by `datasetId`. Relationships between two tags are not supported.\n\nPOST /accounts/{account_id}/cloudforce-one/events/tags/{tag_uuid}/relationships",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "confidence": {
@@ -61,15 +57,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "tag_uuid": {
-          "description": "Tag UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "tag_uuid": {
+              "description": "Tag UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -156,36 +166,55 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_relationships_delete",
+    name: "cloudforceOne_threatIntel_tags_relationships_delete",
     title: "Delete a tag relationship",
-    description: "Deletes a tag relationship by its UUID. `datasetId` is required. Returns `deleted: false` if the relationship doesn't exist.",
+    description: "Deletes a tag relationship by its UUID. `datasetId` is required. Returns `deleted: false` if the relationship doesn't exist.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/tags/{tag_uuid}/relationships/{rel_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Dataset UUID containing the relationship.",
-          "type": "string"
-        },
-        "rel_uuid": {
-          "description": "Relationship UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "rel_uuid": {
+              "description": "Relationship UUID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "tag_uuid": {
+              "description": "Tag UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_uuid",
+            "rel_uuid"
+          ],
+          "type": "object"
         },
-        "tag_uuid": {
-          "description": "Tag UUID.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetId": {
+              "description": "Dataset UUID containing the relationship.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "datasetId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_uuid",
-        "rel_uuid",
-        "dataset_id"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -270,116 +299,132 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/tags/${pathParam(args, "tag_uuid")}/relationships/${pathParam(args, "rel_uuid")}`,
       query: [
-        ["datasetId", args["dataset_id"], true],
+        ["datasetId", param(args, "query", "datasetId"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_relationships_list",
+    name: "cloudforceOne_threatIntel_tags_relationships_list",
     title: "List tag relationships",
-    description: "Lists the relationships that start at a tag, across the intelligence datasets you can read. Use `datasets` to limit the datasets (`all` and `operational` are equivalent here) and `expand` to include the related entities. Analytics datasets don't store tag associations, so the `analytics` scope returns no results.",
+    description: "Lists the relationships that start at a tag, across the intelligence datasets you can read. Use `datasets` to limit the datasets (`all` and `operational` are equivalent here) and `expand` to include the related entities. Analytics datasets don't store tag associations, so the `analytics` scope returns no results.\n\nGET /accounts/{account_id}/cloudforce-one/events/tags/{tag_uuid}/relationships",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Offset cursor from a previous page.",
-          "type": "string"
-        },
-        "datasets": {
-          "description": "Comma-separated dataset UUIDs to scope to, or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). Analytics datasets do not expose tag associations, so 'analytics' returns an empty result. Omit for 'all'.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "expand": {
-          "description": "Comma-separated entity types to hydrate (event, indicator, tag).",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "tag_uuid": {
+              "description": "Tag UUID.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "page_size": {
-          "default": 25,
-          "description": "Page size (1–100, default 25).",
-          "type": "integer"
+          "required": [
+            "account_id",
+            "tag_uuid"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "JSON array of {field, op, value} filters (same as indicator list search).",
-          "items": {
-            "properties": {
-              "field": {
-                "description": "entityType | type | confidence | metadata.<key>",
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Offset cursor from a previous page.",
+              "type": "string"
+            },
+            "datasets": {
+              "description": "Comma-separated dataset UUIDs to scope to, or one standalone scope value: 'all'/'*' or 'operational' for readable intelligence datasets (isAnalytics=false), or 'analytics' for readable analytics datasets (isAnalytics=true). Analytics datasets do not expose tag associations, so 'analytics' returns an empty result. Omit for 'all'.",
+              "items": {
                 "type": "string"
               },
-              "op": {
-                "description": "Search operator. 'exists' only valid for metadata.<key> fields.",
-                "enum": [
-                  "equals",
-                  "not",
-                  "gt",
-                  "gte",
-                  "lt",
-                  "lte",
-                  "like",
-                  "contains",
-                  "startsWith",
-                  "endsWith",
-                  "in",
-                  "find",
-                  "exists"
-                ],
+              "type": "array"
+            },
+            "expand": {
+              "description": "Comma-separated entity types to hydrate (event, indicator, tag).",
+              "items": {
                 "type": "string"
               },
-              "value": {
-                "anyOf": [
-                  {
+              "type": "array"
+            },
+            "pageSize": {
+              "default": 25,
+              "description": "Page size (1–100, default 25).",
+              "type": "integer"
+            },
+            "search": {
+              "description": "JSON array of {field, op, value} filters (same as indicator list search).",
+              "items": {
+                "properties": {
+                  "field": {
+                    "description": "entityType | type | confidence | metadata.<key>",
                     "type": "string"
                   },
-                  {
-                    "type": "number"
-                  },
-                  {
-                    "type": "boolean"
+                  "op": {
+                    "description": "Search operator. 'exists' only valid for metadata.<key> fields.",
+                    "enum": [
+                      "equals",
+                      "not",
+                      "gt",
+                      "gte",
+                      "lt",
+                      "lte",
+                      "like",
+                      "contains",
+                      "startsWith",
+                      "endsWith",
+                      "in",
+                      "find",
+                      "exists"
+                    ],
+                    "type": "string"
                   },
-                  {
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
+                  "value": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "items": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "number"
+                            }
+                          ]
                         },
-                        {
-                          "type": "number"
-                        }
-                      ]
-                    },
-                    "type": "array"
+                        "type": "array"
+                      }
+                    ],
+                    "description": "Value to compare against. Omit for 'exists' op."
                   }
+                },
+                "required": [
+                  "field",
+                  "op"
                 ],
-                "description": "Value to compare against. Omit for 'exists' op."
-              }
-            },
-            "required": [
-              "field",
-              "op"
-            ],
-            "type": "object"
+                "type": "object"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "tag_uuid": {
-          "description": "Tag UUID.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -431,8 +476,8 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "cloudforce-one-events_HydratedEntity": cloudforce_one_events_HydratedEntity_output,
-        "cloudforce-one-events_RelationshipEdge": cloudforce_one_events_RelationshipEdge_output,
+        "cloudforce-one-events_HydratedEntity": cloudforce$$one$$events_HydratedEntity,
+        "cloudforce-one-events_RelationshipEdge": cloudforce$$one$$events_RelationshipEdge,
       },
     },
     annotations: {
@@ -534,32 +579,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-events_HydratedEntity": cloudforce_one_events_HydratedEntity_output,
-        "cloudforce-one-events_RelationshipEdge": cloudforce_one_events_RelationshipEdge_output,
+        "cloudforce-one-events_HydratedEntity": cloudforce$$one$$events_HydratedEntity,
+        "cloudforce-one-events_RelationshipEdge": cloudforce$$one$$events_RelationshipEdge,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/tags/${pathParam(args, "tag_uuid")}/relationships`,
       query: [
-        ["datasets", args["datasets"], true],
-        ["search", args["search"], true],
-        ["expand", args["expand"], true],
-        ["cursor", args["cursor"], true],
-        ["pageSize", args["page_size"], true],
+        ["datasets", param(args, "query", "datasets"), true],
+        ["search", param(args, "query", "search"), true],
+        ["expand", param(args, "query", "expand"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_relationships_update",
+    name: "cloudforceOne_threatIntel_tags_relationships_update",
     title: "Update a tag relationship",
-    description: "Updates the given fields of a tag relationship and leaves the other fields unchanged. `datasetId` is required.",
+    description: "Updates the given fields of a tag relationship and leaves the other fields unchanged. `datasetId` is required.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/tags/{tag_uuid}/relationships/{rel_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "confidence": {
@@ -591,26 +632,49 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "dataset_id": {
-          "description": "Dataset UUID containing the relationship.",
-          "type": "string"
-        },
-        "rel_uuid": {
-          "description": "Relationship UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "rel_uuid": {
+              "description": "Relationship UUID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "tag_uuid": {
+              "description": "Tag UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_uuid",
+            "rel_uuid"
+          ],
+          "type": "object"
         },
-        "tag_uuid": {
-          "description": "Tag UUID.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetId": {
+              "description": "Dataset UUID containing the relationship.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "datasetId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_uuid",
-        "rel_uuid",
-        "dataset_id"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -723,7 +787,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/tags/${pathParam(args, "tag_uuid")}/relationships/${pathParam(args, "rel_uuid")}`,
       query: [
-        ["datasetId", args["dataset_id"], true],
+        ["datasetId", param(args, "query", "datasetId"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/tools.ts
index 05241c9b5..2b269ab32 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/tags/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel.tags`.
+ * The tools of `cloudforceOne.threatIntel.tags`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_tags_create",
+    name: "cloudforceOne_threatIntel_tags_create",
     title: "Create a tag",
-    description: "Creates a tag in the account and returns the complete tag.",
+    description: "Creates a tag in the account and returns the complete tag.\n\nPOST /accounts/{account_id}/cloudforce-one/events/tags/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "activeDuration": {
@@ -461,11 +457,25 @@ export const tools: readonly Tool[] = [
             "value"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1628,25 +1638,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_delete",
+    name: "cloudforceOne_threatIntel_tags_delete",
     title: "Delete a tag",
-    description: "Deletes a tag by its UUID.",
+    description: "Deletes a tag by its UUID.\n\nDELETE /accounts/{account_id}/cloudforce-one/events/tags/{tag_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "tag_uuid": {
-          "description": "Tag UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "tag_uuid": {
+              "description": "Tag UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1753,25 +1773,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_get",
+    name: "cloudforceOne_threatIntel_tags_get",
     title: "Get a tag",
-    description: "Returns a tag by its UUID, including its custom fields (`properties`). Tags marked TLP:PURPLE are visible only to Cloudforce One.",
+    description: "Returns a tag by its UUID, including its custom fields (`properties`). Tags marked TLP:PURPLE are visible only to Cloudforce One.\n\nGET /accounts/{account_id}/cloudforce-one/events/tags/{tag_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "tag_uuid": {
-          "description": "Tag UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "tag_uuid": {
+              "description": "Tag UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2903,99 +2933,115 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_list",
+    name: "cloudforceOne_threatIntel_tags_list",
     title: "List tags",
-    description: "Lists the account's tags. Use `search` to match tag values, `categoryUuid` to limit results to one category, and `filters` (a JSON array) to filter by fields such as `originCountryISO`, `actorCategory`, `motive`, or `priority`. Country filters accept alpha-2 or alpha-3 codes, names, or common aliases. Tags marked TLP:PURPLE are visible only to Cloudforce One.",
+    description: "Lists the account's tags. Use `search` to match tag values, `categoryUuid` to limit results to one category, and `filters` (a JSON array) to filter by fields such as `originCountryISO`, `actorCategory`, `motive`, or `priority`. Country filters accept alpha-2 or alpha-3 codes, names, or common aliases. Tags marked TLP:PURPLE are visible only to Cloudforce One.\n\nGET /accounts/{account_id}/cloudforce-one/events/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "cache": {
-          "description": "Cache strategy. 'from-graph' serves results from the graph-node KV cache when all requested UUIDs are cached; falls back to normal path on partial/zero hit.",
-          "enum": [
-            "from-graph"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "category_uuid": {
-          "type": "string"
+          "type": "object"
         },
-        "filters": {
-          "description": "Structured filters as a JSON array of {field, op, value} objects. Searchable fields: uuid, value, categoryName, description, dateOfDiscovery, tlp, confidence, actorCategory, motive, attributionOrganization, originCountryISO, aliases, externalReferences, opsecLevel, sophisticationLevel, activeDuration, priority, lastSeen, aliasGroupNames. Operators: equals, not, contains, startsWith, endsWith, gt, lt, gte, lte, like, in, find. Use 'in' for bulk OR within a single field, e.g. filters=[{\"field\":\"originCountryISO\",\"op\":\"in\",\"value\":[\"IR\",\"CN\"]}]. Multiple entries are AND-joined. Max 10 entries per request, max 100 values per 'in'. Per-field notes: `uuid` accepts only 'equals' and 'in' (other operators throw ValidationError) — matched against the canonical lowercase storage but callers may pass either case (the server lowercases before comparison); index-backed by the column's UNIQUE constraint and intended for batched UUID → tag resolution. `originCountryISO` uses its B-tree index for equals/not/in. `priority` uses its B-tree index for numeric comparisons. Other string columns (`actorCategory`, `motive`, etc.) are case-insensitive and unindexed; current catalog size makes this a non-issue. `endsWith` and `aliasGroupNames` contains/like are leading-wildcard scans and slow on large result sets. `aliasGroupNames` matches on the JSON-encoded text, so substrings can cross alias boundaries (a search for \"apt28\" will also match \"apt280\" if both appear in the same tag's alias list).",
-          "items": {
-            "properties": {
-              "field": {
-                "description": "Tag field to search on. Allowed first-class fields: uuid, value, categoryName, description, dateOfDiscovery, tlp, confidence, actorCategory, motive, attributionOrganization, originCountryISO, aliases, externalReferences, opsecLevel, sophisticationLevel, activeDuration, priority, lastSeen, aliasGroupNames. Also supports properties.<key> to filter on custom field values (matches both raw values and annotated {value,confidence,tlp} shapes via COALESCE), and properties.<key>.tlp / properties.<key>.confidence to filter directly on annotation sub-fields.",
-                "type": "string"
-              },
-              "op": {
-                "description": "Search operator. Use 'in' for bulk OR within a single field.",
-                "enum": [
-                  "equals",
-                  "not",
-                  "gt",
-                  "gte",
-                  "lt",
-                  "lte",
-                  "like",
-                  "contains",
-                  "startsWith",
-                  "endsWith",
-                  "in",
-                  "find"
-                ],
-                "type": "string"
-              },
-              "value": {
-                "anyOf": [
-                  {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cache": {
+              "description": "Cache strategy. 'from-graph' serves results from the graph-node KV cache when all requested UUIDs are cached; falls back to normal path on partial/zero hit.",
+              "enum": [
+                "from-graph"
+              ],
+              "type": "string"
+            },
+            "categoryUuid": {
+              "type": "string"
+            },
+            "filters": {
+              "description": "Structured filters as a JSON array of {field, op, value} objects. Searchable fields: uuid, value, categoryName, description, dateOfDiscovery, tlp, confidence, actorCategory, motive, attributionOrganization, originCountryISO, aliases, externalReferences, opsecLevel, sophisticationLevel, activeDuration, priority, lastSeen, aliasGroupNames. Operators: equals, not, contains, startsWith, endsWith, gt, lt, gte, lte, like, in, find. Use 'in' for bulk OR within a single field, e.g. filters=[{\"field\":\"originCountryISO\",\"op\":\"in\",\"value\":[\"IR\",\"CN\"]}]. Multiple entries are AND-joined. Max 10 entries per request, max 100 values per 'in'. Per-field notes: `uuid` accepts only 'equals' and 'in' (other operators throw ValidationError) — matched against the canonical lowercase storage but callers may pass either case (the server lowercases before comparison); index-backed by the column's UNIQUE constraint and intended for batched UUID → tag resolution. `originCountryISO` uses its B-tree index for equals/not/in. `priority` uses its B-tree index for numeric comparisons. Other string columns (`actorCategory`, `motive`, etc.) are case-insensitive and unindexed; current catalog size makes this a non-issue. `endsWith` and `aliasGroupNames` contains/like are leading-wildcard scans and slow on large result sets. `aliasGroupNames` matches on the JSON-encoded text, so substrings can cross alias boundaries (a search for \"apt28\" will also match \"apt280\" if both appear in the same tag's alias list).",
+              "items": {
+                "properties": {
+                  "field": {
+                    "description": "Tag field to search on. Allowed first-class fields: uuid, value, categoryName, description, dateOfDiscovery, tlp, confidence, actorCategory, motive, attributionOrganization, originCountryISO, aliases, externalReferences, opsecLevel, sophisticationLevel, activeDuration, priority, lastSeen, aliasGroupNames. Also supports properties.<key> to filter on custom field values (matches both raw values and annotated {value,confidence,tlp} shapes via COALESCE), and properties.<key>.tlp / properties.<key>.confidence to filter directly on annotation sub-fields.",
                     "type": "string"
                   },
-                  {
-                    "type": "number"
+                  "op": {
+                    "description": "Search operator. Use 'in' for bulk OR within a single field.",
+                    "enum": [
+                      "equals",
+                      "not",
+                      "gt",
+                      "gte",
+                      "lt",
+                      "lte",
+                      "like",
+                      "contains",
+                      "startsWith",
+                      "endsWith",
+                      "in",
+                      "find"
+                    ],
+                    "type": "string"
                   },
-                  {
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
+                  "value": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "items": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "number"
+                            }
+                          ]
                         },
-                        {
-                          "type": "number"
-                        }
-                      ]
-                    },
-                    "type": "array"
+                        "type": "array"
+                      }
+                    ],
+                    "description": "Search value. String or number for most operators. Array for 'in' (max 100 items)."
                   }
+                },
+                "required": [
+                  "field",
+                  "op"
                 ],
-                "description": "Search value. String or number for most operators. Array for 'in' (max 100 items)."
-              }
+                "type": "object"
+              },
+              "type": "array"
             },
-            "required": [
-              "field",
-              "op"
-            ],
-            "type": "object"
+            "page": {
+              "type": "number"
+            },
+            "pageSize": {
+              "type": "number"
+            },
+            "search": {
+              "description": "Free-text substring match on tag value AND custom-field properties. Searches case-insensitively inside both `Tag.value` and the serialized `Tag.properties` JSON blob (keys, values, and annotation metadata like confidence/tlp are all searchable). Same serialized-text tradeoff as `aliasGroupNames` — substrings can cross JSON boundaries.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "page": {
-          "type": "number"
-        },
-        "page_size": {
-          "type": "number"
-        },
-        "search": {
-          "description": "Free-text substring match on tag value AND custom-field properties. Searches case-insensitively inside both `Tag.value` and the serialized `Tag.properties` JSON blob (keys, values, and annotation metadata like confidence/tlp are all searchable). Same serialized-text tradeoff as `aliasGroupNames` — substrings can cross JSON boundaries.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -4195,26 +4241,22 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/events/tags`,
       query: [
-        ["page", args["page"], true],
-        ["pageSize", args["page_size"], true],
-        ["search", args["search"], true],
-        ["categoryUuid", args["category_uuid"], true],
-        ["filters", args["filters"], true],
-        ["cache", args["cache"], true],
+        ["page", param(args, "query", "page"), true],
+        ["pageSize", param(args, "query", "pageSize"), true],
+        ["search", param(args, "query", "search"), true],
+        ["categoryUuid", param(args, "query", "categoryUuid"), true],
+        ["filters", param(args, "query", "filters"), true],
+        ["cache", param(args, "query", "cache"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_intel_tags_update",
+    name: "cloudforceOne_threatIntel_tags_update",
     title: "Update a tag",
-    description: "Updates the given fields of a tag and returns the complete tag.",
+    description: "Updates the given fields of a tag and returns the complete tag.\n\nPATCH /accounts/{account_id}/cloudforce-one/events/tags/{tag_uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "activeDuration": {
@@ -4656,15 +4698,29 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "tag_uuid": {
-          "description": "Tag UUID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "tag_uuid": {
+              "description": "Tag UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_uuid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatIntel/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatIntel/tools.ts
index 8e19d98eb..6d4d5b421 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatIntel/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatIntel/tools.ts
@@ -4,20 +4,16 @@
 import { type Tool, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_intel`.
+ * The tools of `cloudforceOne.threatIntel`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_intel_search",
+    name: "cloudforceOne_threatIntel_search",
     title: "Search threat intelligence",
-    description: "Searches the articles, actors, tags, events, and indicators you can read and returns one list of typed results, most relevant first. Use `entity_types` to limit the types searched.",
+    description: "Searches the articles, actors, tags, events, and indicators you can read and returns one list of typed results, most relevant first. Use `entity_types` to limit the types searched.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "entity_types": {
@@ -62,11 +58,25 @@ export const tools: readonly Tool[] = [
             "query"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/skills/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/skills/tools.ts
index 1c5759ab7..8bde28386 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/skills/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/skills/tools.ts
@@ -4,34 +4,44 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.articles.skills`.
+ * The tools of `cloudforceOne.threatSignals.articles.skills`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_articles_skills_get_output",
+    name: "cloudforceOne_threatSignals_articles_skills_getOutput",
     title: "Get Threat Signals article skill output",
-    description: "Retrieves the stored output of a skill for a Threat Signals article. The custom_output field is parsed JSON when the stored output is valid JSON, otherwise the raw string.",
+    description: "Retrieves the stored output of a skill for a Threat Signals article. The custom_output field is parsed JSON when the stored output is valid JSON, otherwise the raw string.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}/skills/{skill_id}/output",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
-        },
-        "skill_id": {
-          "description": "Custom Skill UUID or a Managed Default Skill ID (IOC-context: default-ioc-context-skill)",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "skill_id": {
+              "description": "Custom Skill UUID or a Managed Default Skill ID (IOC-context: default-ioc-context-skill)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id",
+            "skill_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id",
-        "skill_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -404,25 +414,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_skills_list",
+    name: "cloudforceOne_threatSignals_articles_skills_list",
     title: "List Threat Signals article custom skills",
-    description: "Lists active custom skills currently assigned to the article's feed and whether each has a stored output. Output content and skill configuration are retrieved separately. Free Threat Signals accounts cannot read Custom Skills.",
+    description: "Lists active custom skills currently assigned to the article's feed and whether each has a stored output. Output content and skill configuration are retrieved separately. Free Threat Signals accounts cannot read Custom Skills.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}/skills",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -737,46 +757,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_skills_run",
+    name: "cloudforceOne_threatSignals_articles_skills_run",
     title: "Run and persist skill output for a Threat Signals article",
-    description: "Run an active Custom Skill assigned to the article's feed, or run a managed default skill. Requires a paid Threat Signals subscription and the Cloudforce One Write permission. Always persists output; rerunning overwrites the previous result. Does not expose diagnostic model data or accept server-preview inputs.",
+    description: "Run an active Custom Skill assigned to the article's feed, or run a managed default skill. Requires a paid Threat Signals subscription and the Cloudforce One Write permission. Always persists output; rerunning overwrites the previous result. Does not expose diagnostic model data or accept server-preview inputs.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}/skills/{skill_id}/run",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
-        },
         "body": {
           "type": "object"
         },
-        "skill_id": {
-          "anyOf": [
-            {
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
               "format": "uuid",
               "type": "string"
             },
-            {
-              "enum": [
-                "default-tagging-skill",
-                "default-ioc-context-skill",
-                "default-summary-skill"
+            "skill_id": {
+              "anyOf": [
+                {
+                  "format": "uuid",
+                  "type": "string"
+                },
+                {
+                  "enum": [
+                    "default-tagging-skill",
+                    "default-ioc-context-skill",
+                    "default-summary-skill"
+                  ],
+                  "type": "string"
+                }
               ],
-              "type": "string"
+              "description": "UUID of an active Custom Skill that is assigned to the article's feed, or a managed default skill ID. Requires a paid Threat Signals subscription and the Cloudforce One Write permission. Always persists output; rerunning overwrites the previous result. No diagnostic or server-preview inputs."
             }
+          },
+          "required": [
+            "account_id",
+            "article_id",
+            "skill_id"
           ],
-          "description": "UUID of an active Custom Skill that is assigned to the article's feed, or a managed default skill ID. Requires a paid Threat Signals subscription and the Cloudforce One Write permission. Always persists output; rerunning overwrites the previous result. No diagnostic or server-preview inputs."
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id",
-        "skill_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/tags/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/tags/tools.ts
index 82c5d3b4b..131ff5c90 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/tags/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/tags/tools.ts
@@ -4,24 +4,16 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.articles.tags`.
+ * The tools of `cloudforceOne.threatSignals.articles.tags`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_articles_tags_add",
+    name: "cloudforceOne_threatSignals_articles_tags_add",
     title: "Add tag to Threat Signals article",
-    description: "Applies a tag from the account's tag catalog to a Threat Signals article.",
+    description: "Applies a tag from the account's tag catalog to a Threat Signals article.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "tag_id": {
@@ -34,12 +26,30 @@ export const tools: readonly Tool[] = [
             "tag_id"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -290,25 +300,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_tags_generate",
+    name: "cloudforceOne_threatSignals_articles_tags_generate",
     title: "Generate Threat Signals article AI tags",
-    description: "Runs the default AI tagging skill on an article and replaces its AI-applied tags.",
+    description: "Runs the default AI tagging skill on an article and replaces its AI-applied tags.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}/tag",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -588,31 +608,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_tags_remove",
+    name: "cloudforceOne_threatSignals_articles_tags_remove",
     title: "Remove tag from Threat Signals article",
-    description: "Removes a tag from a Threat Signals article.",
+    description: "Removes a tag from a Threat Signals article.\n\nDELETE /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}/tags/{tag_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
-        },
-        "tag_id": {
-          "description": "UUID of a tag from the account's catalog",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "tag_id": {
+              "description": "UUID of a tag from the account's catalog",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id",
+            "tag_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id",
-        "tag_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/tools.ts
index 2ba721389..7cb326728 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/articles/tools.ts
@@ -1,40 +1,56 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.articles`.
+ * The tools of `cloudforceOne.threatSignals.articles`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_articles_aggregate_relevance",
+    name: "cloudforceOne_threatSignals_articles_aggregateRelevance",
     title: "Count Threat Signals articles by relevance band",
-    description: "Beta. Counts the account's Threat Signals articles in each relevance band, for each active Priority Intelligence Requirement and across all of them. Uses the same PIRs as article relevance: active PIRs, including those the matcher paused; drafts and deleted PIRs are excluded. Articles not scored against a PIR are not counted for it. The combined counts place each article once, in the band of its best score, so they are not the sum of the per-PIR counts. read counts only read or only unread articles. All counts are read together and are exact.",
+    description: "Beta. Counts the account's Threat Signals articles in each relevance band, for each active Priority Intelligence Requirement and across all of them. Uses the same PIRs as article relevance: active PIRs, including those the matcher paused; drafts and deleted PIRs are excluded. Articles not scored against a PIR are not counted for it. The combined counts place each article once, in the band of its best score, so they are not the sum of the per-PIR counts. read counts only read or only unread articles. All counts are read together and are exact.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/relevance/aggregate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "published_after": {
-          "description": "Include articles published at or after this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "published_before": {
-          "description": "Include articles published at or before this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
-          "format": "date-time",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "read": {
-          "description": "Filter by read state. Accepts true, false, 1, or 0; omit to include read and unread articles.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "published_after": {
+              "description": "Include articles published at or after this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "published_before": {
+              "description": "Include articles published at or before this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "read": {
+              "description": "Filter by read state. Accepts true, false, 1, or 0; omit to include read and unread articles.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -262,54 +278,70 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/articles/relevance/aggregate`,
       query: [
-        ["published_after", args["published_after"], true],
-        ["published_before", args["published_before"], true],
-        ["read", args["read"], true],
+        ["published_after", param(args, "query", "published_after"), true],
+        ["published_before", param(args, "query", "published_before"), true],
+        ["read", param(args, "query", "read"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_aggregate_severity",
+    name: "cloudforceOne_threatSignals_articles_aggregateSeverity",
     title: "Count Threat Signals articles by severity band",
-    description: "Beta. Counts the account's Threat Signals articles in each intrinsic severity band. An article's band is the one reported as its severity, from informational to critical. Articles without a severity are not counted. Also counts, for each active Priority Intelligence Requirement, the articles scored against it. min_relevance counts only articles at or above a relevance band: overall, for any active PIR; per PIR, for that PIR, the same rule as the per-PIR relevance counts. pir_id counts for one active PIR only. read counts only read or only unread articles, in both articles and priorities. Like the article severity field, severity is reported only while the account has an active Priority Intelligence Requirement, including one the matcher paused; otherwise every count is zero and priorities is empty. All counts are read together and are exact.",
+    description: "Beta. Counts the account's Threat Signals articles in each intrinsic severity band. An article's band is the one reported as its severity, from informational to critical. Articles without a severity are not counted. Also counts, for each active Priority Intelligence Requirement, the articles scored against it. min_relevance counts only articles at or above a relevance band: overall, for any active PIR; per PIR, for that PIR, the same rule as the per-PIR relevance counts. pir_id counts for one active PIR only. read counts only read or only unread articles, in both articles and priorities. Like the article severity field, severity is reported only while the account has an active Priority Intelligence Requirement, including one the matcher paused; otherwise every count is zero and priorities is empty. All counts are read together and are exact.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/severity/aggregate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "min_relevance": {
-          "description": "Beta. Count only articles at or above this relevance band: in articles, for any active Priority Intelligence Requirement, as the article list's min_relevance does without pir_id; in each priority, for that PIR. Excludes articles that have not been scored against an active PIR.",
-          "enum": [
-            "low",
-            "medium",
-            "high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "pir_id": {
-          "description": "Beta. Active Priority Intelligence Requirement to count for. articles then counts only articles scored against it, min_relevance applies to its score, and priorities lists only it. Returns a 400 error unless the PIR is active.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "published_after": {
-          "description": "Include articles published at or after this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "published_before": {
-          "description": "Include articles published at or before this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
-          "format": "date-time",
-          "type": "string"
+          "type": "object"
         },
-        "read": {
-          "description": "Filter by read state. Accepts true, false, 1, or 0; omit to include read and unread articles.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "min_relevance": {
+              "description": "Beta. Count only articles at or above this relevance band: in articles, for any active Priority Intelligence Requirement, as the article list's min_relevance does without pir_id; in each priority, for that PIR. Excludes articles that have not been scored against an active PIR.",
+              "enum": [
+                "low",
+                "medium",
+                "high"
+              ],
+              "type": "string"
+            },
+            "pir_id": {
+              "description": "Beta. Active Priority Intelligence Requirement to count for. articles then counts only articles scored against it, min_relevance applies to its score, and priorities lists only it. Returns a 400 error unless the PIR is active.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "published_after": {
+              "description": "Include articles published at or after this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "published_before": {
+              "description": "Include articles published at or before this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "read": {
+              "description": "Filter by read state. Accepts true, false, 1, or 0; omit to include read and unread articles.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -553,24 +585,21 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/articles/severity/aggregate`,
       query: [
-        ["published_after", args["published_after"], true],
-        ["published_before", args["published_before"], true],
-        ["read", args["read"], true],
-        ["pir_id", args["pir_id"], true],
-        ["min_relevance", args["min_relevance"], true],
+        ["published_after", param(args, "query", "published_after"), true],
+        ["published_before", param(args, "query", "published_before"), true],
+        ["read", param(args, "query", "read"), true],
+        ["pir_id", param(args, "query", "pir_id"), true],
+        ["min_relevance", param(args, "query", "min_relevance"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_bulk_mark_read",
+    name: "cloudforceOne_threatSignals_articles_bulkMarkRead",
     title: "Bulk update Threat Signals article read status",
-    description: "Marks up to 50 Threat Signals articles as read or unread.",
+    description: "Marks up to 50 Threat Signals articles as read or unread.\n\nPATCH /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "article_ids": {
@@ -593,11 +622,24 @@ export const tools: readonly Tool[] = [
             "read"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -796,25 +838,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_get",
+    name: "cloudforceOne_threatSignals_articles_get",
     title: "Get Threat Signals article",
-    description: "Retrieves a Threat Signals article with its summary, tags, indicator status and relevance to the account's Priority Intelligence Requirements.",
+    description: "Retrieves a Threat Signals article with its summary, tags, indicator status and relevance to the account's Priority Intelligence Requirements.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1497,33 +1549,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_get_content",
+    name: "cloudforceOne_threatSignals_articles_getContent",
     title: "Get Threat Signals article content",
-    description: "Retrieves the stored content of a Threat Signals article, unchanged. Depending on how the article was captured from its source, the content is HTML, Markdown, or plain text. The format parameter sets only the response Content-Type; it does not convert the content.",
+    description: "Retrieves the stored content of a Threat Signals article, unchanged. Depending on how the article was captured from its source, the content is HTML, Markdown, or plain text. The format parameter sets only the response Content-Type; it does not convert the content.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}/content",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
-        },
-        "format": {
-          "description": "Response Content-Type: text (the default) for text/plain or html for text/html. Neither value converts the content. html is deprecated; use text.",
-          "enum": [
-            "text",
-            "html"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Response Content-Type: text (the default) for text/plain or html for text/html. Neither value converts the content. html is deprecated; use text.",
+              "enum": [
+                "text",
+                "html"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -1549,163 +1617,179 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/articles/${pathParam(args, "article_id")}/content`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_list",
+    name: "cloudforceOne_threatSignals_articles_list",
     title: "List Threat Signals articles",
-    description: "Lists articles from the account's Threat Signals feeds.",
+    description: "Lists articles from the account's Threat Signals feeds.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Repeatable article UUID filter. Returns the union of matching account-owned articles; use this to list every Threat Signals article referenced by an indicator's sources.",
-          "items": {
-            "format": "uuid",
-            "type": "string"
-          },
-          "maxItems": 90,
-          "minItems": 1,
-          "type": "array"
-        },
-        "cursor": {
-          "description": "Opaque cursor from a previous response's `next_cursor`. When provided, pagination, ordering, totals, and article filters come from the cursor. Sending `per_page`, `sort`, `include_total`, or any article filter alongside it returns a 400 `CursorFilterConflictError`.",
-          "type": "string"
-        },
-        "feed_category": {
-          "description": "Exact feed-category filter after trimming. Omit to include every category.",
-          "type": "string"
-        },
-        "feed_id": {
-          "description": "Feed UUID filter. Omit to include articles from every account feed.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "fetched_after": {
-          "description": "Include articles fetched at or after this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "fetched_before": {
-          "description": "Include articles fetched at or before this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "include_total": {
-          "default": false,
-          "description": "When true on the first page, count matching articles and return an exact total. Defaults to false; cursor pages do not recalculate totals.",
-          "type": "boolean"
-        },
-        "min_relevance": {
-          "description": "Beta. Return only articles at or above this relevance band for pir_id, or for any active PIR when pir_id is omitted. Excludes articles that have not been scored.",
-          "enum": [
-            "low",
-            "medium",
-            "high"
-          ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of articles per cursor page, from 1 to 100. Defaults to 20.",
-          "type": "integer"
-        },
-        "pir_id": {
-          "description": "Beta. Active Priority Intelligence Requirement to report, filter, and sort relevance by. Omit to use each article's most relevant active PIR. Returns a 400 error unless the PIR is active.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "published_after": {
-          "description": "Include articles published at or after this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "published_before": {
-          "description": "Include articles published at or before this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "read": {
-          "description": "Filter by read state. Accepts true, false, 1, or 0; omit to include read and unread articles.",
-          "type": "boolean"
-        },
-        "search": {
-          "description": "NFC-normalized, trimmed literal substring filter on article titles; ASCII case-insensitive, from 1 to 500 characters.",
-          "type": "string"
-        },
-        "severity": {
-          "description": "Beta. Repeatable intrinsic severity band filter. An article matches any selected band, the band reported as its severity. Excludes articles without a severity. Like the severity field, severity is reported only while the account has an active Priority Intelligence Requirement; otherwise no articles match.",
-          "items": {
-            "enum": [
-              "informational",
-              "low",
-              "medium",
-              "high",
-              "critical"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
           },
-          "maxItems": 5,
-          "minItems": 1,
-          "type": "array"
-        },
-        "sort": {
-          "default": "-fetched_at",
-          "description": "Sort by fetched_at, published_at, title, or relevance (beta). Prefix the field with - for descending order; defaults to -fetched_at. -relevance lists the most relevant articles first, by pir_id or by each article's most relevant active PIR, with unscored articles last.",
-          "type": "string"
-        },
-        "source_type": {
-          "description": "Filter by curated or custom feed source. Omit to include both source types.",
-          "enum": [
-            "curated",
-            "custom"
-          ],
-          "type": "string"
-        },
-        "tag": {
-          "description": "Legacy human-readable tag-value filter. Ignored when tag_id is supplied; prefer tag_id.",
-          "type": "string"
-        },
-        "tag_applied_by": {
-          "description": "Assignment provenance filter. When combined with tag_id or tag_category_id, the matching assignment must have this provenance.",
-          "enum": [
-            "ai",
-            "analyst",
-            "system"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "tag_category": {
-          "description": "Legacy category-name disambiguator for tag. It has no effect without tag; prefer tag_category_id.",
-          "type": "string"
-        },
-        "tag_category_id": {
-          "description": "Repeatable tag-category UUID filter. An article matches any selected category; when tag_id is also present, the tag and category groups are ANDed.",
-          "items": {
-            "format": "uuid",
-            "type": "string"
-          },
-          "maxItems": 90,
-          "minItems": 1,
-          "type": "array"
+          "type": "object"
         },
-        "tag_id": {
-          "description": "Repeatable tag UUID filter. An article matches any selected tag.",
-          "items": {
-            "format": "uuid",
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "article_id": {
+              "description": "Repeatable article UUID filter. Returns the union of matching account-owned articles; use this to list every Threat Signals article referenced by an indicator's sources.",
+              "items": {
+                "format": "uuid",
+                "type": "string"
+              },
+              "maxItems": 90,
+              "minItems": 1,
+              "type": "array"
+            },
+            "cursor": {
+              "description": "Opaque cursor from a previous response's `next_cursor`. When provided, pagination, ordering, totals, and article filters come from the cursor. Sending `per_page`, `sort`, `include_total`, or any article filter alongside it returns a 400 `CursorFilterConflictError`.",
+              "type": "string"
+            },
+            "feed_category": {
+              "description": "Exact feed-category filter after trimming. Omit to include every category.",
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "Feed UUID filter. Omit to include articles from every account feed.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "fetched_after": {
+              "description": "Include articles fetched at or after this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "fetched_before": {
+              "description": "Include articles fetched at or before this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "include_total": {
+              "default": false,
+              "description": "When true on the first page, count matching articles and return an exact total. Defaults to false; cursor pages do not recalculate totals.",
+              "type": "boolean"
+            },
+            "min_relevance": {
+              "description": "Beta. Return only articles at or above this relevance band for pir_id, or for any active PIR when pir_id is omitted. Excludes articles that have not been scored.",
+              "enum": [
+                "low",
+                "medium",
+                "high"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of articles per cursor page, from 1 to 100. Defaults to 20.",
+              "type": "integer"
+            },
+            "pir_id": {
+              "description": "Beta. Active Priority Intelligence Requirement to report, filter, and sort relevance by. Omit to use each article's most relevant active PIR. Returns a 400 error unless the PIR is active.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "published_after": {
+              "description": "Include articles published at or after this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "published_before": {
+              "description": "Include articles published at or before this ISO 8601 date-time with Z or a numeric UTC offset; normalized to UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "read": {
+              "description": "Filter by read state. Accepts true, false, 1, or 0; omit to include read and unread articles.",
+              "type": "boolean"
+            },
+            "search": {
+              "description": "NFC-normalized, trimmed literal substring filter on article titles; ASCII case-insensitive, from 1 to 500 characters.",
+              "type": "string"
+            },
+            "severity": {
+              "description": "Beta. Repeatable intrinsic severity band filter. An article matches any selected band, the band reported as its severity. Excludes articles without a severity. Like the severity field, severity is reported only while the account has an active Priority Intelligence Requirement; otherwise no articles match.",
+              "items": {
+                "enum": [
+                  "informational",
+                  "low",
+                  "medium",
+                  "high",
+                  "critical"
+                ],
+                "type": "string"
+              },
+              "maxItems": 5,
+              "minItems": 1,
+              "type": "array"
+            },
+            "sort": {
+              "default": "-fetched_at",
+              "description": "Sort by fetched_at, published_at, title, or relevance (beta). Prefix the field with - for descending order; defaults to -fetched_at. -relevance lists the most relevant articles first, by pir_id or by each article's most relevant active PIR, with unscored articles last.",
+              "type": "string"
+            },
+            "source_type": {
+              "description": "Filter by curated or custom feed source. Omit to include both source types.",
+              "enum": [
+                "curated",
+                "custom"
+              ],
+              "type": "string"
+            },
+            "tag": {
+              "description": "Legacy human-readable tag-value filter. Ignored when tag_id is supplied; prefer tag_id.",
+              "type": "string"
+            },
+            "tag_applied_by": {
+              "description": "Assignment provenance filter. When combined with tag_id or tag_category_id, the matching assignment must have this provenance.",
+              "enum": [
+                "ai",
+                "analyst",
+                "system"
+              ],
+              "type": "string"
+            },
+            "tag_category": {
+              "description": "Legacy category-name disambiguator for tag. It has no effect without tag; prefer tag_category_id.",
+              "type": "string"
+            },
+            "tag_category_id": {
+              "description": "Repeatable tag-category UUID filter. An article matches any selected category; when tag_id is also present, the tag and category groups are ANDed.",
+              "items": {
+                "format": "uuid",
+                "type": "string"
+              },
+              "maxItems": 90,
+              "minItems": 1,
+              "type": "array"
+            },
+            "tag_id": {
+              "description": "Repeatable tag UUID filter. An article matches any selected tag.",
+              "items": {
+                "format": "uuid",
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2324,46 +2408,38 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/articles`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["feed_id", args["feed_id"], true],
-        ["article_id", args["article_id"], true],
-        ["read", args["read"], true],
-        ["tag_id", args["tag_id"], true],
-        ["tag_category_id", args["tag_category_id"], true],
-        ["tag", args["tag"], true],
-        ["tag_category", args["tag_category"], true],
-        ["include_total", args["include_total"], true],
-        ["search", args["search"], true],
-        ["published_after", args["published_after"], true],
-        ["published_before", args["published_before"], true],
-        ["fetched_after", args["fetched_after"], true],
-        ["fetched_before", args["fetched_before"], true],
-        ["feed_category", args["feed_category"], true],
-        ["source_type", args["source_type"], true],
-        ["tag_applied_by", args["tag_applied_by"], true],
-        ["pir_id", args["pir_id"], true],
-        ["min_relevance", args["min_relevance"], true],
-        ["severity", args["severity"], true],
-        ["sort", args["sort"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["feed_id", param(args, "query", "feed_id"), true],
+        ["article_id", param(args, "query", "article_id"), true],
+        ["read", param(args, "query", "read"), true],
+        ["tag_id", param(args, "query", "tag_id"), true],
+        ["tag_category_id", param(args, "query", "tag_category_id"), true],
+        ["tag", param(args, "query", "tag"), true],
+        ["tag_category", param(args, "query", "tag_category"), true],
+        ["include_total", param(args, "query", "include_total"), true],
+        ["search", param(args, "query", "search"), true],
+        ["published_after", param(args, "query", "published_after"), true],
+        ["published_before", param(args, "query", "published_before"), true],
+        ["fetched_after", param(args, "query", "fetched_after"), true],
+        ["fetched_before", param(args, "query", "fetched_before"), true],
+        ["feed_category", param(args, "query", "feed_category"), true],
+        ["source_type", param(args, "query", "source_type"), true],
+        ["tag_applied_by", param(args, "query", "tag_applied_by"), true],
+        ["pir_id", param(args, "query", "pir_id"), true],
+        ["min_relevance", param(args, "query", "min_relevance"), true],
+        ["severity", param(args, "query", "severity"), true],
+        ["sort", param(args, "query", "sort"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_mark_read",
+    name: "cloudforceOne_threatSignals_articles_markRead",
     title: "Update Threat Signals article read status",
-    description: "Marks a Threat Signals article as read or unread.",
+    description: "Marks a Threat Signals article as read or unread.\n\nPATCH /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "read": {
@@ -2375,12 +2451,30 @@ export const tools: readonly Tool[] = [
             "read"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2955,28 +3049,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_articles_reprocess",
+    name: "cloudforceOne_threatSignals_articles_reprocess",
     title: "Reprocess a Threat Signals article",
-    description: "Synchronously re-runs every processing step for a Threat Signals article: pull content, clean content, extract IOCs, filter IOCs, summary, CVE tags, IOC context, article tags, and Event publication. Replaces the article's summary, AI tags, and indicators; indicators no longer found are removed. Creates a Threat Event only when the article has none; an existing Event is never updated. Takes over the article from any queued processing. Requires a paid Threat Signals subscription and the Cloudforce One Write permission.",
+    description: "Synchronously re-runs every processing step for a Threat Signals article: pull content, clean content, extract IOCs, filter IOCs, summary, CVE tags, IOC context, article tags, and Event publication. Replaces the article's summary, AI tags, and indicators; indicators no longer found are removed. Creates a Threat Event only when the article has none; an existing Event is never updated. Takes over the article from any queued processing. Requires a paid Threat Signals subscription and the Cloudforce One Write permission.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/threat-signals/articles/{article_id}/reprocess",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Threat Signals article UUID",
-          "format": "uuid",
-          "type": "string"
-        },
         "body": {
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "article_id": {
+              "description": "Threat Signals article UUID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "article_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "article_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/categories/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/categories/tools.ts
index fac94eb9a..1716401b7 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/categories/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/categories/tools.ts
@@ -4,23 +4,33 @@
 import { type Tool, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.categories`.
+ * The tools of `cloudforceOne.threatSignals.categories`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_categories_list",
+    name: "cloudforceOne_threatSignals_categories_list",
     title: "List Threat Signals feed categories",
-    description: "Lists the predefined categories that can be assigned to feeds.",
+    description: "Lists the predefined categories that can be assigned to feeds.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/feeds/skills/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/feeds/skills/tools.ts
index ee017b311..a6549d3cb 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/feeds/skills/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/feeds/skills/tools.ts
@@ -4,29 +4,39 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.feeds.skills`.
+ * The tools of `cloudforceOne.threatSignals.feeds.skills`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_feeds_skills_get",
+    name: "cloudforceOne_threatSignals_feeds_skills_get",
     title: "Get Threat Signals feed skills",
-    description: "Retrieves active non-IOC-context Managed Default Skills followed by active Custom Skills assigned to the feed, with each entry's source. Free Threat Signals accounts receive only those Managed Default Skills.",
+    description: "Retrieves active non-IOC-context Managed Default Skills followed by active Custom Skills assigned to the feed, with each entry's source. Free Threat Signals accounts receive only those Managed Default Skills.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/feeds/{feed_id}/skills",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "feed_id": {
-          "description": "UUID of the Threat Signals feed",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "UUID of the Threat Signals feed",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -365,15 +375,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_feeds_skills_update",
+    name: "cloudforceOne_threatSignals_feeds_skills_update",
     title: "Set Threat Signals feed skills",
-    description: "Replaces the ordered custom skills assigned to a Threat Signals feed. Requires a paid Threat Signals subscription.",
+    description: "Replaces the ordered custom skills assigned to a Threat Signals feed. Requires a paid Threat Signals subscription.\n\nPUT /accounts/{account_id}/cloudforce-one/v2/threat-signals/feeds/{feed_id}/skills",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "skill_ids": {
@@ -391,16 +398,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "feed_id": {
-          "description": "UUID of the Threat Signals feed",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "UUID of the Threat Signals feed",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/feeds/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/feeds/tools.ts
index 18b9b888c..e8c31fb9b 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/feeds/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/feeds/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.feeds`.
+ * The tools of `cloudforceOne.threatSignals.feeds`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_feeds_create",
+    name: "cloudforceOne_threatSignals_feeds_create",
     title: "Create Threat Signals feed",
-    description: "Subscribes the account to a custom or curated Threat Signals feed. Adding a custom feed when the account is at its custom-feed limit returns 403 with `errors[0].reason` `threat_signals_feed_limit`, and `errors[0].custom_feed_limit` and `errors[0].custom_feed_count` give the limit and current count. Curated feeds are not subject to this limit.",
+    description: "Subscribes the account to a custom or curated Threat Signals feed. Adding a custom feed when the account is at its custom-feed limit returns 403 with `errors[0].reason` `threat_signals_feed_limit`, and `errors[0].custom_feed_limit` and `errors[0].custom_feed_count` give the limit and current count. Curated feeds are not subject to this limit.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/threat-signals/feeds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "category_id": {
@@ -83,11 +80,24 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -821,25 +831,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_feeds_delete",
+    name: "cloudforceOne_threatSignals_feeds_delete",
     title: "Delete Threat Signals feed",
-    description: "Unsubscribes the account from a Threat Signals feed and deletes its articles.\n\nConfirm with the user before calling this tool. This unsubscribes the account from the feed and permanently deletes its stored articles, including their extracted indicators, tags, and skill outputs.",
+    description: "Unsubscribes the account from a Threat Signals feed and deletes its articles.\n\nConfirm with the user before calling this tool. This unsubscribes the account from the feed and permanently deletes its stored articles, including their extracted indicators, tags, and skill outputs.\n\nDELETE /accounts/{account_id}/cloudforce-one/v2/threat-signals/feeds/{feed_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "feed_id": {
-          "description": "UUID of the Threat Signals feed",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "UUID of the Threat Signals feed",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1249,32 +1269,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_feeds_get_raw",
+    name: "cloudforceOne_threatSignals_feeds_getRaw",
     title: "Get Threat Signals feed XML",
-    description: "Retrieves the feed document fetched by the most recent poll as text/plain by default or application/xml when format is xml.",
+    description: "Retrieves the feed document fetched by the most recent poll as text/plain by default or application/xml when format is xml.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/feeds/{feed_id}/raw",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "feed_id": {
-          "description": "UUID of the Threat Signals feed",
-          "format": "uuid",
-          "type": "string"
-        },
-        "format": {
-          "description": "Response format. Use xml for application/xml; omit it for the default text/plain response.",
-          "enum": [
-            "xml"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "UUID of the Threat Signals feed",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Response format. Use xml for application/xml; omit it for the default text/plain response.",
+              "enum": [
+                "xml"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -1300,63 +1336,79 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/feeds/${pathParam(args, "feed_id")}/raw`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_feeds_list",
+    name: "cloudforceOne_threatSignals_feeds_list",
     title: "List Threat Signals feeds",
-    description: "Lists the account's Threat Signals feed subscriptions.",
+    description: "Lists the account's Threat Signals feed subscriptions.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/feeds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "category": {
-          "description": "Exact feed-category filter, up to 100 characters. Omit to include all categories.",
-          "type": "string"
-        },
-        "enabled": {
-          "description": "Filter by enabled state. Accepts true, false, 1, or 0; omit to include enabled and disabled feeds.",
-          "type": "boolean"
-        },
-        "limit": {
-          "description": "Optional 1–100 alias for per_page. When provided, limit takes precedence.",
-          "type": "integer"
-        },
-        "page": {
-          "default": 1,
-          "description": "1-based page number. Minimum 1; defaults to 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of feeds per page, from 1 to 100. Defaults to 20.",
-          "type": "integer"
-        },
-        "sort": {
-          "default": "-created_at",
-          "description": "Sort by created_at, title, category, or url. Prefix the field with - for descending order; defaults to -created_at.",
-          "type": "string"
-        },
-        "source_type": {
-          "description": "Filter by curated or custom feed source. Omit to include both source types.",
-          "enum": [
-            "curated",
-            "custom"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "status": {
-          "description": "Exact stored polling-status filter, such as active or error. Omit to include every status.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "category": {
+              "description": "Exact feed-category filter, up to 100 characters. Omit to include all categories.",
+              "type": "string"
+            },
+            "enabled": {
+              "description": "Filter by enabled state. Accepts true, false, 1, or 0; omit to include enabled and disabled feeds.",
+              "type": "boolean"
+            },
+            "limit": {
+              "description": "Optional 1–100 alias for per_page. When provided, limit takes precedence.",
+              "type": "integer"
+            },
+            "page": {
+              "default": 1,
+              "description": "1-based page number. Minimum 1; defaults to 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of feeds per page, from 1 to 100. Defaults to 20.",
+              "type": "integer"
+            },
+            "sort": {
+              "default": "-created_at",
+              "description": "Sort by created_at, title, category, or url. Prefix the field with - for descending order; defaults to -created_at.",
+              "type": "string"
+            },
+            "source_type": {
+              "description": "Filter by curated or custom feed source. Omit to include both source types.",
+              "enum": [
+                "curated",
+                "custom"
+              ],
+              "type": "string"
+            },
+            "status": {
+              "description": "Exact stored polling-status filter, such as active or error. Omit to include every status.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1943,46 +1995,62 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/feeds`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["limit", args["limit"], true],
-        ["sort", args["sort"], true],
-        ["category", args["category"], true],
-        ["source_type", args["source_type"], true],
-        ["enabled", args["enabled"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["sort", param(args, "query", "sort"), true],
+        ["category", param(args, "query", "category"), true],
+        ["source_type", param(args, "query", "source_type"), true],
+        ["enabled", param(args, "query", "enabled"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_feeds_poll",
+    name: "cloudforceOne_threatSignals_feeds_poll",
     title: "Trigger Threat Signals feed poll",
-    description: "Starts an immediate poll of one or all Threat Signals feeds.",
+    description: "Starts an immediate poll of one or all Threat Signals feeds.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/threat-signals/feeds/poll",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "feed_id": {
-          "anyOf": [
-            {
-              "format": "uuid",
-              "type": "string"
-            },
-            {
-              "enum": [
-                "all"
-              ],
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
               "type": "string"
             }
+          },
+          "required": [
+            "account_id"
           ],
-          "description": "UUID of a specific feed to poll, or \"all\" to poll all feeds. Omit or pass \"all\" for all feeds."
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "feed_id": {
+              "anyOf": [
+                {
+                  "format": "uuid",
+                  "type": "string"
+                },
+                {
+                  "enum": [
+                    "all"
+                  ],
+                  "type": "string"
+                }
+              ],
+              "description": "UUID of a specific feed to poll, or \"all\" to poll all feeds. Omit or pass \"all\" for all feeds."
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2158,20 +2226,17 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/feeds/poll`,
       query: [
-        ["feed_id", args["feed_id"], true],
+        ["feed_id", param(args, "query", "feed_id"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_feeds_update",
+    name: "cloudforceOne_threatSignals_feeds_update",
     title: "Update Threat Signals feed",
-    description: "Updates a Threat Signals feed subscription.",
+    description: "Updates a Threat Signals feed subscription.\n\nPATCH /accounts/{account_id}/cloudforce-one/v2/threat-signals/feeds/{feed_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "category_id": {
@@ -2228,16 +2293,29 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "feed_id": {
-          "description": "UUID of the Threat Signals feed",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "UUID of the Threat Signals feed",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/indicators/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/indicators/tools.ts
index 8b4d5f674..aac67f6de 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/indicators/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/indicators/tools.ts
@@ -1,59 +1,75 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.indicators`.
+ * The tools of `cloudforceOne.threatSignals.indicators`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_indicators_list",
+    name: "cloudforceOne_threatSignals_indicators_list",
     title: "List Threat Signals article indicators",
-    description: "Lists indicators of compromise extracted from the account's Threat Signals articles.",
+    description: "Lists indicators of compromise extracted from the account's Threat Signals articles.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/indicators",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "article_id": {
-          "description": "Article UUID filter. Omit to include indicators from every article.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque cursor from the previous response's `pagination.cursor`. When provided, page size, ordering, and filters come from the cursor. Sending `per_page`, `sort`, `include_total`, `feed_id`, `article_id`, or `search` alongside it returns a 400 `CursorFilterConflictError`.",
-          "type": "string"
-        },
-        "feed_id": {
-          "description": "Feed UUID filter. Omit to include indicators from every account feed.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "include_total": {
-          "default": false,
-          "description": "When true on the first page, count matching indicators and return an exact total. Defaults to false; cursor pages do not recalculate totals.",
-          "type": "boolean"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of indicators per cursor page, from 1 to 100. Defaults to 20.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "NFC-normalized and trimmed, case-insensitive literal substring search of indicator values. Requires 3–500 Unicode code points; the upper code-point bound is described here because OpenAPI string length cannot precisely express it without imposing UTF-16 semantics.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "sort": {
-          "default": "id",
-          "description": "Sort by id. Use id for ascending or -id for descending order; defaults to id.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "article_id": {
+              "description": "Article UUID filter. Omit to include indicators from every article.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Opaque cursor from the previous response's `pagination.cursor`. When provided, page size, ordering, and filters come from the cursor. Sending `per_page`, `sort`, `include_total`, `feed_id`, `article_id`, or `search` alongside it returns a 400 `CursorFilterConflictError`.",
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "Feed UUID filter. Omit to include indicators from every account feed.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "include_total": {
+              "default": false,
+              "description": "When true on the first page, count matching indicators and return an exact total. Defaults to false; cursor pages do not recalculate totals.",
+              "type": "boolean"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of indicators per cursor page, from 1 to 100. Defaults to 20.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "NFC-normalized and trimmed, case-insensitive literal substring search of indicator values. Requires 3–500 Unicode code points; the upper code-point bound is described here because OpenAPI string length cannot precisely express it without imposing UTF-16 semantics.",
+              "type": "string"
+            },
+            "sort": {
+              "default": "id",
+              "description": "Sort by id. Use id for ascending or -id for descending order; defaults to id.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -386,13 +402,13 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/indicators`,
       query: [
-        ["feed_id", args["feed_id"], true],
-        ["article_id", args["article_id"], true],
-        ["search", args["search"], true],
-        ["per_page", args["per_page"], true],
-        ["sort", args["sort"], true],
-        ["include_total", args["include_total"], true],
-        ["cursor", args["cursor"], true],
+        ["feed_id", param(args, "query", "feed_id"), true],
+        ["article_id", param(args, "query", "article_id"), true],
+        ["search", param(args, "query", "search"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort", param(args, "query", "sort"), true],
+        ["include_total", param(args, "query", "include_total"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/skills/tagCategories/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/skills/tagCategories/tools.ts
index 236a10fd1..dc75a0220 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/skills/tagCategories/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/skills/tagCategories/tools.ts
@@ -4,31 +4,41 @@
 import { type Tool, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.skills.tag_categories`.
+ * The tools of `cloudforceOne.threatSignals.skills.tagCategories`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_skills_tag_categories_get",
+    name: "cloudforceOne_threatSignals_skills_tagCategories_get",
     title: "Get Threat Signals skill tag categories",
-    description: "Retrieves the Tag Categories the managed default tagging skill may select tags from. This configures the managed default tagging skill, not Custom Skills.",
+    description: "Retrieves the Tag Categories the managed default tagging skill may select tags from. This configures the managed default tagging skill, not Custom Skills.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/skills/{skill_id}/tag-categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "skill_id": {
-          "description": "Must be default-tagging-skill; configures the managed default tagging skill",
-          "enum": [
-            "default-tagging-skill"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "skill_id": {
+              "description": "Must be default-tagging-skill; configures the managed default tagging skill",
+              "enum": [
+                "default-tagging-skill"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "skill_id"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "skill_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -159,15 +169,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_skills_tag_categories_update",
+    name: "cloudforceOne_threatSignals_skills_tagCategories_update",
     title: "Replace Threat Signals skill tag categories",
-    description: "Replaces the Tag Categories the managed default tagging skill may select tags from. This configures the managed default tagging skill, not Custom Skills.",
+    description: "Replaces the Tag Categories the managed default tagging skill may select tags from. This configures the managed default tagging skill, not Custom Skills.\n\nPUT /accounts/{account_id}/cloudforce-one/v2/threat-signals/skills/{skill_id}/tag-categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "category_uuids": {
@@ -185,18 +192,31 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "skill_id": {
-          "description": "Must be default-tagging-skill; configures the managed default tagging skill",
-          "enum": [
-            "default-tagging-skill"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "skill_id": {
+              "description": "Must be default-tagging-skill; configures the managed default tagging skill",
+              "enum": [
+                "default-tagging-skill"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "skill_id"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "skill_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/skills/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/skills/tools.ts
index 90445cc21..f21188a11 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/skills/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/skills/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals.skills`.
+ * The tools of `cloudforceOne.threatSignals.skills`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_skills_create",
+    name: "cloudforceOne_threatSignals_skills_create",
     title: "Create Threat Signals skill",
-    description: "Creates a Custom Skill for the account. Free Threat Signals accounts cannot create Custom Skills.",
+    description: "Creates a Custom Skill for the account. Free Threat Signals accounts cannot create Custom Skills.\n\nPOST /accounts/{account_id}/cloudforce-one/v2/threat-signals/skills",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "name": {
@@ -47,11 +44,24 @@ export const tools: readonly Tool[] = [
             "prompt"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -358,24 +368,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_skills_delete",
+    name: "cloudforceOne_threatSignals_skills_delete",
     title: "Delete Threat Signals skill",
-    description: "Deletes a Custom Skill. The skill's stored outputs on articles are deleted with it. Managed Default Skills cannot be deleted. Free Threat Signals accounts cannot delete Custom Skills.\n\nConfirm with the user before calling this tool. This permanently deletes the custom skill, removes it from every feed it is assigned to, and deletes the outputs it stored on articles.",
+    description: "Deletes a Custom Skill. The skill's stored outputs on articles are deleted with it. Managed Default Skills cannot be deleted. Free Threat Signals accounts cannot delete Custom Skills.\n\nConfirm with the user before calling this tool. This permanently deletes the custom skill, removes it from every feed it is assigned to, and deletes the outputs it stored on articles.\n\nDELETE /accounts/{account_id}/cloudforce-one/v2/threat-signals/skills/{skill_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "skill_id": {
-          "description": "Custom Skill UUID or a Managed Default Skill ID",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "skill_id": {
+              "description": "Custom Skill UUID or a Managed Default Skill ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "skill_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "skill_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -681,24 +701,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_skills_get",
+    name: "cloudforceOne_threatSignals_skills_get",
     title: "Get Threat Signals skill",
-    description: "Retrieves a Managed Default Skill or Custom Skill. Managed catalog definitions are readable. Free Threat Signals accounts cannot read Custom Skills.",
+    description: "Retrieves a Managed Default Skill or Custom Skill. Managed catalog definitions are readable. Free Threat Signals accounts cannot read Custom Skills.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/skills/{skill_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "skill_id": {
-          "description": "Custom Skill UUID or a Managed Default Skill ID",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "skill_id": {
+              "description": "Custom Skill UUID or a Managed Default Skill ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "skill_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "skill_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1005,29 +1035,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_skills_list",
+    name: "cloudforceOne_threatSignals_skills_list",
     title: "List Threat Signals skills",
-    description: "Lists active Managed Default Skills and Custom Skills. Free Threat Signals accounts see active managed defaults only, with custom_skills_available: false.",
+    description: "Lists active Managed Default Skills and Custom Skills. Free Threat Signals accounts see active managed defaults only, with custom_skills_available: false.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/skills",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number (≥ 1, default 1).",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Results per page (1–100, default 20).",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number (≥ 1, default 1).",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Results per page (1–100, default 20).",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1394,21 +1440,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/skills`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "cloudforce_one_threat_signals_skills_update",
+    name: "cloudforceOne_threatSignals_skills_update",
     title: "Update Threat Signals skill",
-    description: "Updates a Custom Skill. Managed Default Skills cannot be updated. Free Threat Signals accounts cannot update Custom Skills.",
+    description: "Updates a Custom Skill. Managed Default Skills cannot be updated. Free Threat Signals accounts cannot update Custom Skills.\n\nPATCH /accounts/{account_id}/cloudforce-one/v2/threat-signals/skills/{skill_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "config": {
@@ -1434,15 +1477,28 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "skill_id": {
-          "description": "Custom Skill UUID or a Managed Default Skill ID",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "skill_id": {
+              "description": "Custom Skill UUID or a Managed Default Skill ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "skill_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "skill_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/cloudforceOne/threatSignals/tools.ts b/src/generated/forge-mcp/cloudforceOne/threatSignals/tools.ts
index 3e385a550..6778fa0ab 100644
--- a/src/generated/forge-mcp/cloudforceOne/threatSignals/tools.ts
+++ b/src/generated/forge-mcp/cloudforceOne/threatSignals/tools.ts
@@ -1,40 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `cloudforce_one.threat_signals`.
+ * The tools of `cloudforceOne.threatSignals`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "cloudforce_one_threat_signals_search",
+    name: "cloudforceOne_threatSignals_search",
     title: "Search Threat Signals articles using AI Search",
-    description: "Searches the account's Threat Signals articles using keyword and semantic retrieval.",
+    description: "Searches the account's Threat Signals articles using keyword and semantic retrieval.\n\nGET /accounts/{account_id}/cloudforce-one/v2/threat-signals/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "feed_id": {
-          "description": "Optional feed UUID that restricts results to articles from that feed.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "max_results": {
-          "description": "Maximum search matches to request, an integer from 1 to 50. Defaults to 20 when omitted or empty; multiple matches from one article can produce fewer returned articles.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
         "query": {
-          "description": "Keyword and semantic article-search text, from 1 to 1000 characters.",
-          "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "feed_id": {
+              "description": "Optional feed UUID that restricts results to articles from that feed.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "max_results": {
+              "description": "Maximum search matches to request, an integer from 1 to 50. Defaults to 20 when omitted or empty; multiple matches from one article can produce fewer returned articles.",
+              "type": "string"
+            },
+            "query": {
+              "description": "Keyword and semantic article-search text, from 1 to 1000 characters.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "query"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -247,9 +266,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cloudforce-one/v2/threat-signals/search`,
       query: [
-        ["query", args["query"], true],
-        ["max_results", args["max_results"], true],
-        ["feed_id", args["feed_id"], true],
+        ["query", param(args, "query", "query"), true],
+        ["max_results", param(args, "query", "max_results"), true],
+        ["feed_id", param(args, "query", "feed_id"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/connectorInterrupts/outputs.ts b/src/generated/forge-mcp/connectorInterrupts/outputs.ts
index fa32a3da7..d7876a735 100644
--- a/src/generated/forge-mcp/connectorInterrupts/outputs.ts
+++ b/src/generated/forge-mcp/connectorInterrupts/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `mconn_connector_interrupts_create_response` in responses.
  */
-export const mconn_connector_interrupts_create_response_output: JsonSchema = {
+export const mconn_connector_interrupts_create_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_good_response"
@@ -25,7 +25,7 @@ export const mconn_connector_interrupts_create_response_output: JsonSchema = {
 /**
  * The schema of `mconn_connector_interrupts_list_response` in responses.
  */
-export const mconn_connector_interrupts_list_response_output: JsonSchema = {
+export const mconn_connector_interrupts_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_good_response"
@@ -47,7 +47,7 @@ export const mconn_connector_interrupts_list_response_output: JsonSchema = {
 /**
  * The schema of `mconn_connector_interrupts_result` in responses.
  */
-export const mconn_connector_interrupts_result_output: JsonSchema = {
+export const mconn_connector_interrupts_result: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_interrupt"
@@ -72,7 +72,7 @@ export const mconn_connector_interrupts_result_output: JsonSchema = {
 /**
  * The schema of `mconn_interrupt` in responses.
  */
-export const mconn_interrupt_output: JsonSchema = {
+export const mconn_interrupt: JsonSchema = {
   "properties": {
     "reboot": {
       "properties": {
diff --git a/src/generated/forge-mcp/connectorInterrupts/tools.ts b/src/generated/forge-mcp/connectorInterrupts/tools.ts
index a3d930cd1..37c1fb0b8 100644
--- a/src/generated/forge-mcp/connectorInterrupts/tools.ts
+++ b/src/generated/forge-mcp/connectorInterrupts/tools.ts
@@ -3,62 +3,69 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  mconn_bad_response_output,
-  mconn_coded_message_output,
-  mconn_good_response_output,
-  mconn_none_output,
-  mconn_response_output,
+  mconn_bad_response,
+  mconn_coded_message,
+  mconn_good_response,
+  mconn_none,
+  mconn_response,
 } from "../outputs.js";
-import { mconn_account_id, mconn_uuid } from "../schemas.js";
 import {
-  mconn_connector_interrupts_create_response_output,
-  mconn_connector_interrupts_list_response_output,
-  mconn_connector_interrupts_result_output,
-  mconn_interrupt_output,
+  mconn_connector_interrupts_create_response,
+  mconn_connector_interrupts_list_response,
+  mconn_connector_interrupts_result,
+  mconn_interrupt,
 } from "./outputs.js";
-import { mconn_interrupt } from "./schemas.js";
+import { mconn_interrupt as mconn_interrupt$ } from "./schemas.js";
 
 /**
- * The tools of `connector_interrupts`.
+ * The tools of `connectorInterrupts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "connector_interrupts_create",
+    name: "connectorInterrupts_create",
     title: "Create Interrupt",
-    description: "Creates an interrupt for a Magic WAN Connector.",
+    description: "Creates an interrupt for a Magic WAN Connector.\n\nPOST /accounts/{account_id}/magic/connectors/{connector_id}/interrupts",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn_account_id"
-        },
         "body": {
           "$ref": "#/$defs/mconn_interrupt"
         },
-        "connector_id": {
-          "$ref": "#/$defs/mconn_uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "mconn_account_id": mconn_account_id,
-        "mconn_interrupt": mconn_interrupt,
-        "mconn_uuid": mconn_uuid,
+        "mconn_interrupt": mconn_interrupt$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/mconn_connector_interrupts_create_response",
       $defs: {
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_connector_interrupts_create_response": mconn_connector_interrupts_create_response_output,
-        "mconn_connector_interrupts_result": mconn_connector_interrupts_result_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_interrupt": mconn_interrupt_output,
-        "mconn_response": mconn_response_output,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_connector_interrupts_create_response": mconn_connector_interrupts_create_response,
+        "mconn_connector_interrupts_result": mconn_connector_interrupts_result,
+        "mconn_good_response": mconn_good_response,
+        "mconn_interrupt": mconn_interrupt,
+        "mconn_response": mconn_response,
       },
     },
     annotations: {
@@ -103,14 +110,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn_bad_response": mconn_bad_response_output,
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_connector_interrupts_create_response": mconn_connector_interrupts_create_response_output,
-        "mconn_connector_interrupts_result": mconn_connector_interrupts_result_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_interrupt": mconn_interrupt_output,
-        "mconn_none": mconn_none_output,
-        "mconn_response": mconn_response_output,
+        "mconn_bad_response": mconn_bad_response,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_connector_interrupts_create_response": mconn_connector_interrupts_create_response,
+        "mconn_connector_interrupts_result": mconn_connector_interrupts_result,
+        "mconn_good_response": mconn_good_response,
+        "mconn_interrupt": mconn_interrupt,
+        "mconn_none": mconn_none,
+        "mconn_response": mconn_response,
       },
     },
     request: (args) => ({
@@ -119,37 +126,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "connector_interrupts_list",
+    name: "connectorInterrupts_list",
     title: "List Interrupts",
-    description: "Lists interrupts for a Magic WAN Connector.",
+    description: "Lists interrupts for a Magic WAN Connector.\n\nGET /accounts/{account_id}/magic/connectors/{connector_id}/interrupts",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn_account_id"
-        },
-        "connector_id": {
-          "$ref": "#/$defs/mconn_uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id"
+        "path"
       ],
-      $defs: {
-        "mconn_account_id": mconn_account_id,
-        "mconn_uuid": mconn_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mconn_connector_interrupts_list_response",
       $defs: {
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_connector_interrupts_list_response": mconn_connector_interrupts_list_response_output,
-        "mconn_connector_interrupts_result": mconn_connector_interrupts_result_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_interrupt": mconn_interrupt_output,
-        "mconn_response": mconn_response_output,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_connector_interrupts_list_response": mconn_connector_interrupts_list_response,
+        "mconn_connector_interrupts_result": mconn_connector_interrupts_result,
+        "mconn_good_response": mconn_good_response,
+        "mconn_interrupt": mconn_interrupt,
+        "mconn_response": mconn_response,
       },
     },
     annotations: {
@@ -195,14 +208,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn_bad_response": mconn_bad_response_output,
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_connector_interrupts_list_response": mconn_connector_interrupts_list_response_output,
-        "mconn_connector_interrupts_result": mconn_connector_interrupts_result_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_interrupt": mconn_interrupt_output,
-        "mconn_none": mconn_none_output,
-        "mconn_response": mconn_response_output,
+        "mconn_bad_response": mconn_bad_response,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_connector_interrupts_list_response": mconn_connector_interrupts_list_response,
+        "mconn_connector_interrupts_result": mconn_connector_interrupts_result,
+        "mconn_good_response": mconn_good_response,
+        "mconn_interrupt": mconn_interrupt,
+        "mconn_none": mconn_none,
+        "mconn_response": mconn_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/connectorTelemetryEvents/outputs.ts b/src/generated/forge-mcp/connectorTelemetryEvents/outputs.ts
index 42dbf75f7..f8965616b 100644
--- a/src/generated/forge-mcp/connectorTelemetryEvents/outputs.ts
+++ b/src/generated/forge-mcp/connectorTelemetryEvents/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `mconn-telemetry_customer_events_get_success` in responses.
  */
-export const mconn_telemetry_customer_events_get_success_output: JsonSchema = {
+export const mconn$$telemetry_customer_events_get_success: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn-telemetry_envelope"
@@ -28,7 +28,7 @@ export const mconn_telemetry_customer_events_get_success_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_customer_events_list_result` in responses.
  */
-export const mconn_telemetry_customer_events_list_result_output: JsonSchema = {
+export const mconn$$telemetry_customer_events_list_result: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -53,7 +53,7 @@ export const mconn_telemetry_customer_events_list_result_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_customer_events_list_success` in responses.
  */
-export const mconn_telemetry_customer_events_list_success_output: JsonSchema = {
+export const mconn$$telemetry_customer_events_list_success: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn-telemetry_envelope"
@@ -75,7 +75,7 @@ export const mconn_telemetry_customer_events_list_success_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_event` in responses.
  */
-export const mconn_telemetry_event_output: JsonSchema = {
+export const mconn$$telemetry_event: JsonSchema = {
   "properties": {
     "k": {
       "enum": [
@@ -121,7 +121,7 @@ export const mconn_telemetry_event_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_event_metadata` in responses.
  */
-export const mconn_telemetry_event_metadata_output: JsonSchema = {
+export const mconn$$telemetry_event_metadata: JsonSchema = {
   "properties": {
     "a": {
       "type": "number"
@@ -148,7 +148,7 @@ export const mconn_telemetry_event_metadata_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_recorded_event` in responses.
  */
-export const mconn_telemetry_recorded_event_output: JsonSchema = {
+export const mconn$$telemetry_recorded_event: JsonSchema = {
   "properties": {
     "e": {
       "$ref": "#/$defs/mconn-telemetry_event"
diff --git a/src/generated/forge-mcp/connectorTelemetryEvents/tools.ts b/src/generated/forge-mcp/connectorTelemetryEvents/tools.ts
index 606f6b3fb..38553e71d 100644
--- a/src/generated/forge-mcp/connectorTelemetryEvents/tools.ts
+++ b/src/generated/forge-mcp/connectorTelemetryEvents/tools.ts
@@ -1,64 +1,70 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  mconn_telemetry_coded_message_output,
-  mconn_telemetry_envelope_output,
+  mconn$$telemetry_coded_message,
+  mconn$$telemetry_envelope,
 } from "../outputs.js";
-import { mconn_telemetry_account_id } from "../schemas.js";
 import {
-  mconn_telemetry_customer_events_get_success_output,
-  mconn_telemetry_customer_events_list_result_output,
-  mconn_telemetry_customer_events_list_success_output,
-  mconn_telemetry_event_metadata_output,
-  mconn_telemetry_event_output,
-  mconn_telemetry_recorded_event_output,
+  mconn$$telemetry_customer_events_get_success,
+  mconn$$telemetry_customer_events_list_result,
+  mconn$$telemetry_customer_events_list_success,
+  mconn$$telemetry_event,
+  mconn$$telemetry_event_metadata,
+  mconn$$telemetry_recorded_event,
 } from "./outputs.js";
 
 /**
- * The tools of `connector_telemetry_events`.
+ * The tools of `connectorTelemetryEvents`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "connector_telemetry_events_get",
+    name: "connectorTelemetryEvents_get",
     title: "Get Event",
-    description: "Gets Magic WAN Connector Telemetry Event",
+    description: "Gets Magic WAN Connector Telemetry Event\n\nGET /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events/{event_t}.{event_n}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn-telemetry_account_id",
-          "description": "Account identifier"
-        },
-        "connector_id": {
-          "type": "string"
-        },
-        "event_n": {
-          "type": "number"
-        },
-        "event_t": {
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            },
+            "event_n": {
+              "type": "number"
+            },
+            "event_t": {
+              "type": "number"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id",
+            "event_t",
+            "event_n"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id",
-        "event_t",
-        "event_n"
+        "path"
       ],
-      $defs: {
-        "mconn-telemetry_account_id": mconn_telemetry_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mconn-telemetry_customer_events_get_success",
       $defs: {
-        "mconn-telemetry_coded_message": mconn_telemetry_coded_message_output,
-        "mconn-telemetry_customer_events_get_success": mconn_telemetry_customer_events_get_success_output,
-        "mconn-telemetry_envelope": mconn_telemetry_envelope_output,
-        "mconn-telemetry_event": mconn_telemetry_event_output,
-        "mconn-telemetry_recorded_event": mconn_telemetry_recorded_event_output,
+        "mconn-telemetry_coded_message": mconn$$telemetry_coded_message,
+        "mconn-telemetry_customer_events_get_success": mconn$$telemetry_customer_events_get_success,
+        "mconn-telemetry_envelope": mconn$$telemetry_envelope,
+        "mconn-telemetry_event": mconn$$telemetry_event,
+        "mconn-telemetry_recorded_event": mconn$$telemetry_recorded_event,
       },
     },
     annotations: {
@@ -107,11 +113,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn-telemetry_coded_message": mconn_telemetry_coded_message_output,
-        "mconn-telemetry_customer_events_get_success": mconn_telemetry_customer_events_get_success_output,
-        "mconn-telemetry_envelope": mconn_telemetry_envelope_output,
-        "mconn-telemetry_event": mconn_telemetry_event_output,
-        "mconn-telemetry_recorded_event": mconn_telemetry_recorded_event_output,
+        "mconn-telemetry_coded_message": mconn$$telemetry_coded_message,
+        "mconn-telemetry_customer_events_get_success": mconn$$telemetry_customer_events_get_success,
+        "mconn-telemetry_envelope": mconn$$telemetry_envelope,
+        "mconn-telemetry_event": mconn$$telemetry_event,
+        "mconn-telemetry_recorded_event": mconn$$telemetry_recorded_event,
       },
     },
     request: (args) => ({
@@ -119,54 +125,70 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "connector_telemetry_events_list",
+    name: "connectorTelemetryEvents_list",
     title: "List Events",
-    description: "Lists Magic WAN Connector Telemetry Events",
+    description: "Lists Magic WAN Connector Telemetry Events\n\nGET /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn-telemetry_account_id",
-          "description": "Account identifier"
-        },
-        "connector_id": {
-          "type": "string"
-        },
-        "cursor": {
-          "type": "string"
-        },
-        "from": {
-          "type": "number"
-        },
-        "kind": {
-          "description": "Filter by event kind",
-          "type": "string"
-        },
-        "limit": {
-          "type": "number"
-        },
-        "to": {
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "from": {
+              "type": "number"
+            },
+            "k": {
+              "description": "Filter by event kind",
+              "type": "string"
+            },
+            "limit": {
+              "type": "number"
+            },
+            "to": {
+              "type": "number"
+            }
+          },
+          "required": [
+            "from",
+            "to"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
-      $defs: {
-        "mconn-telemetry_account_id": mconn_telemetry_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mconn-telemetry_customer_events_list_success",
       $defs: {
-        "mconn-telemetry_coded_message": mconn_telemetry_coded_message_output,
-        "mconn-telemetry_customer_events_list_result": mconn_telemetry_customer_events_list_result_output,
-        "mconn-telemetry_customer_events_list_success": mconn_telemetry_customer_events_list_success_output,
-        "mconn-telemetry_envelope": mconn_telemetry_envelope_output,
-        "mconn-telemetry_event_metadata": mconn_telemetry_event_metadata_output,
+        "mconn-telemetry_coded_message": mconn$$telemetry_coded_message,
+        "mconn-telemetry_customer_events_list_result": mconn$$telemetry_customer_events_list_result,
+        "mconn-telemetry_customer_events_list_success": mconn$$telemetry_customer_events_list_success,
+        "mconn-telemetry_envelope": mconn$$telemetry_envelope,
+        "mconn-telemetry_event_metadata": mconn$$telemetry_event_metadata,
       },
     },
     annotations: {
@@ -212,21 +234,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn-telemetry_coded_message": mconn_telemetry_coded_message_output,
-        "mconn-telemetry_customer_events_list_result": mconn_telemetry_customer_events_list_result_output,
-        "mconn-telemetry_customer_events_list_success": mconn_telemetry_customer_events_list_success_output,
-        "mconn-telemetry_envelope": mconn_telemetry_envelope_output,
-        "mconn-telemetry_event_metadata": mconn_telemetry_event_metadata_output,
+        "mconn-telemetry_coded_message": mconn$$telemetry_coded_message,
+        "mconn-telemetry_customer_events_list_result": mconn$$telemetry_customer_events_list_result,
+        "mconn-telemetry_customer_events_list_success": mconn$$telemetry_customer_events_list_success,
+        "mconn-telemetry_envelope": mconn$$telemetry_envelope,
+        "mconn-telemetry_event_metadata": mconn$$telemetry_event_metadata,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/connectors/${pathParam(args, "connector_id")}/telemetry/events`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
-        ["k", args["kind"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["k", param(args, "query", "k"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/connectorTelemetrySnapshots/outputs.ts b/src/generated/forge-mcp/connectorTelemetrySnapshots/outputs.ts
index 0f24e3c7a..37e65c10a 100644
--- a/src/generated/forge-mcp/connectorTelemetrySnapshots/outputs.ts
+++ b/src/generated/forge-mcp/connectorTelemetrySnapshots/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `mconn-telemetry_customer_snapshots_get_success` in responses.
  */
-export const mconn_telemetry_customer_snapshots_get_success_output: JsonSchema = {
+export const mconn$$telemetry_customer_snapshots_get_success: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn-telemetry_envelope"
@@ -28,7 +28,7 @@ export const mconn_telemetry_customer_snapshots_get_success_output: JsonSchema =
 /**
  * The schema of `mconn-telemetry_customer_snapshots_list_result` in responses.
  */
-export const mconn_telemetry_customer_snapshots_list_result_output: JsonSchema = {
+export const mconn$$telemetry_customer_snapshots_list_result: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -53,7 +53,7 @@ export const mconn_telemetry_customer_snapshots_list_result_output: JsonSchema =
 /**
  * The schema of `mconn-telemetry_customer_snapshots_list_success` in responses.
  */
-export const mconn_telemetry_customer_snapshots_list_success_output: JsonSchema = {
+export const mconn$$telemetry_customer_snapshots_list_success: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn-telemetry_envelope"
@@ -75,7 +75,7 @@ export const mconn_telemetry_customer_snapshots_list_success_output: JsonSchema
 /**
  * The schema of `mconn-telemetry_snapshot` in responses.
  */
-export const mconn_telemetry_snapshot_output: JsonSchema = {
+export const mconn$$telemetry_snapshot: JsonSchema = {
   "properties": {
     "bonds": {
       "items": {
@@ -644,7 +644,7 @@ export const mconn_telemetry_snapshot_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_bond` in responses.
  */
-export const mconn_telemetry_snapshot_bond_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_bond: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -663,7 +663,7 @@ export const mconn_telemetry_snapshot_bond_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_dhcp_lease` in responses.
  */
-export const mconn_telemetry_snapshot_dhcp_lease_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_dhcp_lease: JsonSchema = {
   "properties": {
     "client_id": {
       "type": "string"
@@ -698,7 +698,7 @@ export const mconn_telemetry_snapshot_dhcp_lease_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_disk` in responses.
  */
-export const mconn_telemetry_snapshot_disk_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_disk: JsonSchema = {
   "properties": {
     "discards": {
       "type": "number"
@@ -783,7 +783,7 @@ export const mconn_telemetry_snapshot_disk_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_interface` in responses.
  */
-export const mconn_telemetry_snapshot_interface_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_interface: JsonSchema = {
   "properties": {
     "health_reason": {
       "type": "string"
@@ -817,7 +817,7 @@ export const mconn_telemetry_snapshot_interface_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_interface_address` in responses.
  */
-export const mconn_telemetry_snapshot_interface_address_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_interface_address: JsonSchema = {
   "properties": {
     "interface_name": {
       "type": "string"
@@ -836,7 +836,7 @@ export const mconn_telemetry_snapshot_interface_address_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_metadata` in responses.
  */
-export const mconn_telemetry_snapshot_metadata_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_metadata: JsonSchema = {
   "properties": {
     "a": {
       "type": "number"
@@ -855,7 +855,7 @@ export const mconn_telemetry_snapshot_metadata_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_mount` in responses.
  */
-export const mconn_telemetry_snapshot_mount_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_mount: JsonSchema = {
   "properties": {
     "available_bytes": {
       "type": "number"
@@ -900,7 +900,7 @@ export const mconn_telemetry_snapshot_mount_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_netdev` in responses.
  */
-export const mconn_telemetry_snapshot_netdev_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_netdev: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -979,7 +979,7 @@ export const mconn_telemetry_snapshot_netdev_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_route` in responses.
  */
-export const mconn_telemetry_snapshot_route_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_route: JsonSchema = {
   "properties": {
     "destination": {
       "type": "string"
@@ -1012,7 +1012,7 @@ export const mconn_telemetry_snapshot_route_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_thermal` in responses.
  */
-export const mconn_telemetry_snapshot_thermal_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_thermal: JsonSchema = {
   "properties": {
     "critical_celcius": {
       "type": "number"
@@ -1036,7 +1036,7 @@ export const mconn_telemetry_snapshot_thermal_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_snapshot_tunnel` in responses.
  */
-export const mconn_telemetry_snapshot_tunnel_output: JsonSchema = {
+export const mconn$$telemetry_snapshot_tunnel: JsonSchema = {
   "properties": {
     "health_state": {
       "type": "string"
diff --git a/src/generated/forge-mcp/connectorTelemetrySnapshots/tools.ts b/src/generated/forge-mcp/connectorTelemetrySnapshots/tools.ts
index afcd1d210..6d790569e 100644
--- a/src/generated/forge-mcp/connectorTelemetrySnapshots/tools.ts
+++ b/src/generated/forge-mcp/connectorTelemetrySnapshots/tools.ts
@@ -1,78 +1,84 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  mconn_telemetry_coded_message_output,
-  mconn_telemetry_envelope_output,
+  mconn$$telemetry_coded_message,
+  mconn$$telemetry_envelope,
 } from "../outputs.js";
-import { mconn_telemetry_account_id } from "../schemas.js";
 import {
-  mconn_telemetry_customer_snapshots_get_success_output,
-  mconn_telemetry_customer_snapshots_list_result_output,
-  mconn_telemetry_customer_snapshots_list_success_output,
-  mconn_telemetry_snapshot_bond_output,
-  mconn_telemetry_snapshot_dhcp_lease_output,
-  mconn_telemetry_snapshot_disk_output,
-  mconn_telemetry_snapshot_interface_address_output,
-  mconn_telemetry_snapshot_interface_output,
-  mconn_telemetry_snapshot_metadata_output,
-  mconn_telemetry_snapshot_mount_output,
-  mconn_telemetry_snapshot_netdev_output,
-  mconn_telemetry_snapshot_output,
-  mconn_telemetry_snapshot_route_output,
-  mconn_telemetry_snapshot_thermal_output,
-  mconn_telemetry_snapshot_tunnel_output,
+  mconn$$telemetry_customer_snapshots_get_success,
+  mconn$$telemetry_customer_snapshots_list_result,
+  mconn$$telemetry_customer_snapshots_list_success,
+  mconn$$telemetry_snapshot,
+  mconn$$telemetry_snapshot_bond,
+  mconn$$telemetry_snapshot_dhcp_lease,
+  mconn$$telemetry_snapshot_disk,
+  mconn$$telemetry_snapshot_interface,
+  mconn$$telemetry_snapshot_interface_address,
+  mconn$$telemetry_snapshot_metadata,
+  mconn$$telemetry_snapshot_mount,
+  mconn$$telemetry_snapshot_netdev,
+  mconn$$telemetry_snapshot_route,
+  mconn$$telemetry_snapshot_thermal,
+  mconn$$telemetry_snapshot_tunnel,
 } from "./outputs.js";
 
 /**
- * The tools of `connector_telemetry_snapshots`.
+ * The tools of `connectorTelemetrySnapshots`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "connector_telemetry_snapshots_get",
+    name: "connectorTelemetrySnapshots_get",
     title: "Get Snapshot",
-    description: "Gets Magic WAN Connector Telemetry Snapshot",
+    description: "Gets Magic WAN Connector Telemetry Snapshot\n\nGET /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots/{snapshot_t}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn-telemetry_account_id",
-          "description": "Account identifier"
-        },
-        "connector_id": {
-          "type": "string"
-        },
-        "snapshot_t": {
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            },
+            "snapshot_t": {
+              "type": "number"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id",
+            "snapshot_t"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id",
-        "snapshot_t"
+        "path"
       ],
-      $defs: {
-        "mconn-telemetry_account_id": mconn_telemetry_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mconn-telemetry_customer_snapshots_get_success",
       $defs: {
-        "mconn-telemetry_coded_message": mconn_telemetry_coded_message_output,
-        "mconn-telemetry_customer_snapshots_get_success": mconn_telemetry_customer_snapshots_get_success_output,
-        "mconn-telemetry_envelope": mconn_telemetry_envelope_output,
-        "mconn-telemetry_snapshot": mconn_telemetry_snapshot_output,
-        "mconn-telemetry_snapshot_bond": mconn_telemetry_snapshot_bond_output,
-        "mconn-telemetry_snapshot_dhcp_lease": mconn_telemetry_snapshot_dhcp_lease_output,
-        "mconn-telemetry_snapshot_disk": mconn_telemetry_snapshot_disk_output,
-        "mconn-telemetry_snapshot_interface": mconn_telemetry_snapshot_interface_output,
-        "mconn-telemetry_snapshot_interface_address": mconn_telemetry_snapshot_interface_address_output,
-        "mconn-telemetry_snapshot_mount": mconn_telemetry_snapshot_mount_output,
-        "mconn-telemetry_snapshot_netdev": mconn_telemetry_snapshot_netdev_output,
-        "mconn-telemetry_snapshot_route": mconn_telemetry_snapshot_route_output,
-        "mconn-telemetry_snapshot_thermal": mconn_telemetry_snapshot_thermal_output,
-        "mconn-telemetry_snapshot_tunnel": mconn_telemetry_snapshot_tunnel_output,
+        "mconn-telemetry_coded_message": mconn$$telemetry_coded_message,
+        "mconn-telemetry_customer_snapshots_get_success": mconn$$telemetry_customer_snapshots_get_success,
+        "mconn-telemetry_envelope": mconn$$telemetry_envelope,
+        "mconn-telemetry_snapshot": mconn$$telemetry_snapshot,
+        "mconn-telemetry_snapshot_bond": mconn$$telemetry_snapshot_bond,
+        "mconn-telemetry_snapshot_dhcp_lease": mconn$$telemetry_snapshot_dhcp_lease,
+        "mconn-telemetry_snapshot_disk": mconn$$telemetry_snapshot_disk,
+        "mconn-telemetry_snapshot_interface": mconn$$telemetry_snapshot_interface,
+        "mconn-telemetry_snapshot_interface_address": mconn$$telemetry_snapshot_interface_address,
+        "mconn-telemetry_snapshot_mount": mconn$$telemetry_snapshot_mount,
+        "mconn-telemetry_snapshot_netdev": mconn$$telemetry_snapshot_netdev,
+        "mconn-telemetry_snapshot_route": mconn$$telemetry_snapshot_route,
+        "mconn-telemetry_snapshot_thermal": mconn$$telemetry_snapshot_thermal,
+        "mconn-telemetry_snapshot_tunnel": mconn$$telemetry_snapshot_tunnel,
       },
     },
     annotations: {
@@ -121,20 +127,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn-telemetry_coded_message": mconn_telemetry_coded_message_output,
-        "mconn-telemetry_customer_snapshots_get_success": mconn_telemetry_customer_snapshots_get_success_output,
-        "mconn-telemetry_envelope": mconn_telemetry_envelope_output,
-        "mconn-telemetry_snapshot": mconn_telemetry_snapshot_output,
-        "mconn-telemetry_snapshot_bond": mconn_telemetry_snapshot_bond_output,
-        "mconn-telemetry_snapshot_dhcp_lease": mconn_telemetry_snapshot_dhcp_lease_output,
-        "mconn-telemetry_snapshot_disk": mconn_telemetry_snapshot_disk_output,
-        "mconn-telemetry_snapshot_interface": mconn_telemetry_snapshot_interface_output,
-        "mconn-telemetry_snapshot_interface_address": mconn_telemetry_snapshot_interface_address_output,
-        "mconn-telemetry_snapshot_mount": mconn_telemetry_snapshot_mount_output,
-        "mconn-telemetry_snapshot_netdev": mconn_telemetry_snapshot_netdev_output,
-        "mconn-telemetry_snapshot_route": mconn_telemetry_snapshot_route_output,
-        "mconn-telemetry_snapshot_thermal": mconn_telemetry_snapshot_thermal_output,
-        "mconn-telemetry_snapshot_tunnel": mconn_telemetry_snapshot_tunnel_output,
+        "mconn-telemetry_coded_message": mconn$$telemetry_coded_message,
+        "mconn-telemetry_customer_snapshots_get_success": mconn$$telemetry_customer_snapshots_get_success,
+        "mconn-telemetry_envelope": mconn$$telemetry_envelope,
+        "mconn-telemetry_snapshot": mconn$$telemetry_snapshot,
+        "mconn-telemetry_snapshot_bond": mconn$$telemetry_snapshot_bond,
+        "mconn-telemetry_snapshot_dhcp_lease": mconn$$telemetry_snapshot_dhcp_lease,
+        "mconn-telemetry_snapshot_disk": mconn$$telemetry_snapshot_disk,
+        "mconn-telemetry_snapshot_interface": mconn$$telemetry_snapshot_interface,
+        "mconn-telemetry_snapshot_interface_address": mconn$$telemetry_snapshot_interface_address,
+        "mconn-telemetry_snapshot_mount": mconn$$telemetry_snapshot_mount,
+        "mconn-telemetry_snapshot_netdev": mconn$$telemetry_snapshot_netdev,
+        "mconn-telemetry_snapshot_route": mconn$$telemetry_snapshot_route,
+        "mconn-telemetry_snapshot_thermal": mconn$$telemetry_snapshot_thermal,
+        "mconn-telemetry_snapshot_tunnel": mconn$$telemetry_snapshot_tunnel,
       },
     },
     request: (args) => ({
@@ -142,50 +148,66 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "connector_telemetry_snapshots_list",
+    name: "connectorTelemetrySnapshots_list",
     title: "List Snapshots",
-    description: "Lists Magic WAN Connector Telemetry Snapshots",
+    description: "Lists Magic WAN Connector Telemetry Snapshots\n\nGET /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn-telemetry_account_id",
-          "description": "Account identifier"
-        },
-        "connector_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "type": "string"
-        },
-        "from": {
-          "type": "number"
-        },
-        "limit": {
-          "type": "number"
-        },
-        "to": {
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "from": {
+              "type": "number"
+            },
+            "limit": {
+              "type": "number"
+            },
+            "to": {
+              "type": "number"
+            }
+          },
+          "required": [
+            "from",
+            "to"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
-      $defs: {
-        "mconn-telemetry_account_id": mconn_telemetry_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mconn-telemetry_customer_snapshots_list_success",
       $defs: {
-        "mconn-telemetry_coded_message": mconn_telemetry_coded_message_output,
-        "mconn-telemetry_customer_snapshots_list_result": mconn_telemetry_customer_snapshots_list_result_output,
-        "mconn-telemetry_customer_snapshots_list_success": mconn_telemetry_customer_snapshots_list_success_output,
-        "mconn-telemetry_envelope": mconn_telemetry_envelope_output,
-        "mconn-telemetry_snapshot_metadata": mconn_telemetry_snapshot_metadata_output,
+        "mconn-telemetry_coded_message": mconn$$telemetry_coded_message,
+        "mconn-telemetry_customer_snapshots_list_result": mconn$$telemetry_customer_snapshots_list_result,
+        "mconn-telemetry_customer_snapshots_list_success": mconn$$telemetry_customer_snapshots_list_success,
+        "mconn-telemetry_envelope": mconn$$telemetry_envelope,
+        "mconn-telemetry_snapshot_metadata": mconn$$telemetry_snapshot_metadata,
       },
     },
     annotations: {
@@ -231,20 +253,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn-telemetry_coded_message": mconn_telemetry_coded_message_output,
-        "mconn-telemetry_customer_snapshots_list_result": mconn_telemetry_customer_snapshots_list_result_output,
-        "mconn-telemetry_customer_snapshots_list_success": mconn_telemetry_customer_snapshots_list_success_output,
-        "mconn-telemetry_envelope": mconn_telemetry_envelope_output,
-        "mconn-telemetry_snapshot_metadata": mconn_telemetry_snapshot_metadata_output,
+        "mconn-telemetry_coded_message": mconn$$telemetry_coded_message,
+        "mconn-telemetry_customer_snapshots_list_result": mconn$$telemetry_customer_snapshots_list_result,
+        "mconn-telemetry_customer_snapshots_list_success": mconn$$telemetry_customer_snapshots_list_success,
+        "mconn-telemetry_envelope": mconn$$telemetry_envelope,
+        "mconn-telemetry_snapshot_metadata": mconn$$telemetry_snapshot_metadata,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/connectors/${pathParam(args, "connector_id")}/telemetry/snapshots`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/connectors/outputs.ts b/src/generated/forge-mcp/connectors/outputs.ts
index 5da975b76..bec7a705a 100644
--- a/src/generated/forge-mcp/connectors/outputs.ts
+++ b/src/generated/forge-mcp/connectors/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `mconn_customer_connector` in responses.
  */
-export const mconn_customer_connector_output: JsonSchema = {
+export const mconn_customer_connector: JsonSchema = {
   "properties": {
     "activated": {
       "type": "boolean"
@@ -15,11 +15,20 @@ export const mconn_customer_connector_output: JsonSchema = {
       "$ref": "#/$defs/mconn_customer_device"
     },
     "id": {
-      "$ref": "#/$defs/mconn_uuid"
+      "type": "string"
     },
     "interrupt_window_days_of_week": {
       "items": {
-        "$ref": "#/$defs/mconn_day_of_week"
+        "enum": [
+          "Sunday",
+          "Monday",
+          "Tuesday",
+          "Wednesday",
+          "Thursday",
+          "Friday",
+          "Saturday"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
@@ -28,7 +37,7 @@ export const mconn_customer_connector_output: JsonSchema = {
     },
     "interrupt_window_embargo_dates": {
       "items": {
-        "$ref": "#/$defs/mconn_embargo_date"
+        "type": "string"
       },
       "maxItems": 100,
       "type": "array"
@@ -72,7 +81,7 @@ export const mconn_customer_connector_output: JsonSchema = {
 /**
  * The schema of `mconn_customer_connectors_create_response` in responses.
  */
-export const mconn_customer_connectors_create_response_output: JsonSchema = {
+export const mconn_customer_connectors_create_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_good_response"
@@ -91,7 +100,7 @@ export const mconn_customer_connectors_create_response_output: JsonSchema = {
 /**
  * The schema of `mconn_customer_connectors_delete_response` in responses.
  */
-export const mconn_customer_connectors_delete_response_output: JsonSchema = {
+export const mconn_customer_connectors_delete_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_good_response"
@@ -110,7 +119,7 @@ export const mconn_customer_connectors_delete_response_output: JsonSchema = {
 /**
  * The schema of `mconn_customer_connectors_edit_response` in responses.
  */
-export const mconn_customer_connectors_edit_response_output: JsonSchema = {
+export const mconn_customer_connectors_edit_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_good_response"
@@ -129,7 +138,7 @@ export const mconn_customer_connectors_edit_response_output: JsonSchema = {
 /**
  * The schema of `mconn_customer_connectors_get_response` in responses.
  */
-export const mconn_customer_connectors_get_response_output: JsonSchema = {
+export const mconn_customer_connectors_get_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_good_response"
@@ -148,7 +157,7 @@ export const mconn_customer_connectors_get_response_output: JsonSchema = {
 /**
  * The schema of `mconn_customer_connectors_list_response` in responses.
  */
-export const mconn_customer_connectors_list_response_output: JsonSchema = {
+export const mconn_customer_connectors_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_good_response"
@@ -170,7 +179,7 @@ export const mconn_customer_connectors_list_response_output: JsonSchema = {
 /**
  * The schema of `mconn_customer_connectors_update_response` in responses.
  */
-export const mconn_customer_connectors_update_response_output: JsonSchema = {
+export const mconn_customer_connectors_update_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_good_response"
@@ -189,10 +198,10 @@ export const mconn_customer_connectors_update_response_output: JsonSchema = {
 /**
  * The schema of `mconn_customer_device` in responses.
  */
-export const mconn_customer_device_output: JsonSchema = {
+export const mconn_customer_device: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/mconn_uuid"
+      "type": "string"
     },
     "serial_number": {
       "type": "string"
@@ -210,26 +219,3 @@ export const mconn_customer_device_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `mconn_day_of_week` in responses.
- */
-export const mconn_day_of_week_output: JsonSchema = {
-  "enum": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `mconn_embargo_date` in responses.
- */
-export const mconn_embargo_date_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/connectors/schemas.ts b/src/generated/forge-mcp/connectors/schemas.ts
index 1f746c42f..3907d92d2 100644
--- a/src/generated/forge-mcp/connectors/schemas.ts
+++ b/src/generated/forge-mcp/connectors/schemas.ts
@@ -14,7 +14,16 @@ export const mconn_customer_connector_fields: JsonSchema = {
     "interrupt_window_days_of_week": {
       "description": "Allowed days of the week for upgrades. Default is all days.",
       "items": {
-        "$ref": "#/$defs/mconn_day_of_week"
+        "enum": [
+          "Sunday",
+          "Monday",
+          "Tuesday",
+          "Wednesday",
+          "Thursday",
+          "Friday",
+          "Saturday"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
@@ -24,7 +33,7 @@ export const mconn_customer_connector_fields: JsonSchema = {
     "interrupt_window_embargo_dates": {
       "description": "List of dates (YYYY-MM-DD) when upgrades are blocked.",
       "items": {
-        "$ref": "#/$defs/mconn_embargo_date"
+        "type": "string"
       },
       "maxItems": 100,
       "type": "array"
@@ -124,26 +133,3 @@ export const mconn_customer_device_options: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `mconn_day_of_week`.
- */
-export const mconn_day_of_week: JsonSchema = {
-  "enum": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `mconn_embargo_date`.
- */
-export const mconn_embargo_date: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/connectors/tools.ts b/src/generated/forge-mcp/connectors/tools.ts
index 5132070b1..05f531234 100644
--- a/src/generated/forge-mcp/connectors/tools.ts
+++ b/src/generated/forge-mcp/connectors/tools.ts
@@ -1,27 +1,23 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  mconn_bad_response_output,
-  mconn_coded_message_output,
-  mconn_good_response_output,
-  mconn_none_output,
-  mconn_response_output,
-  mconn_uuid_output,
+  mconn_bad_response,
+  mconn_coded_message,
+  mconn_good_response,
+  mconn_none,
+  mconn_response,
 } from "../outputs.js";
-import { mconn_account_id, mconn_uuid } from "../schemas.js";
 import {
-  mconn_customer_connector_output,
-  mconn_customer_connectors_create_response_output,
-  mconn_customer_connectors_delete_response_output,
-  mconn_customer_connectors_edit_response_output,
-  mconn_customer_connectors_get_response_output,
-  mconn_customer_connectors_list_response_output,
-  mconn_customer_connectors_update_response_output,
-  mconn_customer_device_output,
-  mconn_day_of_week_output,
-  mconn_embargo_date_output,
+  mconn_customer_connector,
+  mconn_customer_connectors_create_response,
+  mconn_customer_connectors_delete_response,
+  mconn_customer_connectors_edit_response,
+  mconn_customer_connectors_get_response,
+  mconn_customer_connectors_list_response,
+  mconn_customer_connectors_update_response,
+  mconn_customer_device,
 } from "./outputs.js";
 import {
   mconn_customer_connector_fields,
@@ -29,8 +25,6 @@ import {
   mconn_customer_connectors_edit_request,
   mconn_customer_connectors_update_request,
   mconn_customer_device_options,
-  mconn_day_of_week,
-  mconn_embargo_date,
 } from "./schemas.js";
 
 /**
@@ -40,42 +34,46 @@ export const tools: readonly Tool[] = [
   {
     name: "connectors_create",
     title: "Create Connector",
-    description: "Creates a Magic WAN Connector.",
+    description: "Creates a Magic WAN Connector.\n\nPOST /accounts/{account_id}/magic/connectors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn_account_id"
-        },
         "body": {
           "$ref": "#/$defs/mconn_customer_connectors_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "mconn_account_id": mconn_account_id,
         "mconn_customer_connector_fields": mconn_customer_connector_fields,
         "mconn_customer_connectors_create_request": mconn_customer_connectors_create_request,
         "mconn_customer_device_options": mconn_customer_device_options,
-        "mconn_day_of_week": mconn_day_of_week,
-        "mconn_embargo_date": mconn_embargo_date,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/mconn_customer_connectors_create_response",
       $defs: {
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_create_response": mconn_customer_connectors_create_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_create_response": mconn_customer_connectors_create_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_response": mconn_response,
       },
     },
     annotations: {
@@ -123,17 +121,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn_bad_response": mconn_bad_response_output,
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_create_response": mconn_customer_connectors_create_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_none": mconn_none_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_bad_response": mconn_bad_response,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_create_response": mconn_customer_connectors_create_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_none": mconn_none,
+        "mconn_response": mconn_response,
       },
     },
     request: (args) => ({
@@ -144,38 +139,41 @@ export const tools: readonly Tool[] = [
   {
     name: "connectors_delete",
     title: "Delete Connector",
-    description: "Deletes a Magic WAN Connector.",
+    description: "Deletes a Magic WAN Connector.\n\nDELETE /accounts/{account_id}/magic/connectors/{connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn_account_id"
-        },
-        "connector_id": {
-          "$ref": "#/$defs/mconn_uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id"
+        "path"
       ],
-      $defs: {
-        "mconn_account_id": mconn_account_id,
-        "mconn_uuid": mconn_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mconn_customer_connectors_delete_response",
       $defs: {
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_delete_response": mconn_customer_connectors_delete_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_delete_response": mconn_customer_connectors_delete_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_response": mconn_response,
       },
     },
     annotations: {
@@ -220,17 +218,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn_bad_response": mconn_bad_response_output,
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_delete_response": mconn_customer_connectors_delete_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_none": mconn_none_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_bad_response": mconn_bad_response,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_delete_response": mconn_customer_connectors_delete_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_none": mconn_none,
+        "mconn_response": mconn_response,
       },
     },
     request: (args) => ({
@@ -240,46 +235,49 @@ export const tools: readonly Tool[] = [
   {
     name: "connectors_edit",
     title: "Edit Connector",
-    description: "Edits properties of a Magic WAN Connector. May be used to re-provision a license key.",
+    description: "Edits properties of a Magic WAN Connector. May be used to re-provision a license key.\n\nPATCH /accounts/{account_id}/magic/connectors/{connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn_account_id"
-        },
         "body": {
           "$ref": "#/$defs/mconn_customer_connectors_edit_request"
         },
-        "connector_id": {
-          "$ref": "#/$defs/mconn_uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "mconn_account_id": mconn_account_id,
         "mconn_customer_connector_fields": mconn_customer_connector_fields,
         "mconn_customer_connectors_edit_request": mconn_customer_connectors_edit_request,
-        "mconn_day_of_week": mconn_day_of_week,
-        "mconn_embargo_date": mconn_embargo_date,
-        "mconn_uuid": mconn_uuid,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/mconn_customer_connectors_edit_response",
       $defs: {
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_edit_response": mconn_customer_connectors_edit_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_edit_response": mconn_customer_connectors_edit_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_response": mconn_response,
       },
     },
     annotations: {
@@ -324,17 +322,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn_bad_response": mconn_bad_response_output,
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_edit_response": mconn_customer_connectors_edit_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_none": mconn_none_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_bad_response": mconn_bad_response,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_edit_response": mconn_customer_connectors_edit_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_none": mconn_none,
+        "mconn_response": mconn_response,
       },
     },
     request: (args) => ({
@@ -345,38 +340,41 @@ export const tools: readonly Tool[] = [
   {
     name: "connectors_get",
     title: "Get Connector",
-    description: "Gets a Magic WAN Connector.",
+    description: "Gets a Magic WAN Connector.\n\nGET /accounts/{account_id}/magic/connectors/{connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn_account_id"
-        },
-        "connector_id": {
-          "$ref": "#/$defs/mconn_uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id"
+        "path"
       ],
-      $defs: {
-        "mconn_account_id": mconn_account_id,
-        "mconn_uuid": mconn_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mconn_customer_connectors_get_response",
       $defs: {
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_get_response": mconn_customer_connectors_get_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_get_response": mconn_customer_connectors_get_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_response": mconn_response,
       },
     },
     annotations: {
@@ -422,17 +420,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn_bad_response": mconn_bad_response_output,
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_get_response": mconn_customer_connectors_get_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_none": mconn_none_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_bad_response": mconn_bad_response,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_get_response": mconn_customer_connectors_get_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_none": mconn_none,
+        "mconn_response": mconn_response,
       },
     },
     request: (args) => ({
@@ -442,41 +437,51 @@ export const tools: readonly Tool[] = [
   {
     name: "connectors_list",
     title: "List Connectors",
-    description: "Lists Magic WAN Connectors.",
+    description: "Lists Magic WAN Connectors.\n\nGET /accounts/{account_id}/magic/connectors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn_account_id"
-        },
-        "device_type": {
-          "description": "Filter connectors by device type.",
-          "enum": [
-            "MANAGED",
-            "LICENSED"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "device_type": {
+              "description": "Filter connectors by device type.",
+              "enum": [
+                "MANAGED",
+                "LICENSED"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "mconn_account_id": mconn_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mconn_customer_connectors_list_response",
       $defs: {
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_list_response": mconn_customer_connectors_list_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_list_response": mconn_customer_connectors_list_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_response": mconn_response,
       },
     },
     annotations: {
@@ -519,69 +524,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn_bad_response": mconn_bad_response_output,
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_list_response": mconn_customer_connectors_list_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_none": mconn_none_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_bad_response": mconn_bad_response,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_list_response": mconn_customer_connectors_list_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_none": mconn_none,
+        "mconn_response": mconn_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/connectors`,
       query: [
-        ["device_type", args["device_type"], true],
+        ["device_type", param(args, "query", "device_type"), true],
       ],
     }),
   },
   {
     name: "connectors_update",
     title: "Update Connector",
-    description: "Updates properties of a Magic WAN Connector. May be used to re-provision a license key.",
+    description: "Updates properties of a Magic WAN Connector. May be used to re-provision a license key.\n\nPUT /accounts/{account_id}/magic/connectors/{connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mconn_account_id"
-        },
         "body": {
           "$ref": "#/$defs/mconn_customer_connectors_update_request"
         },
-        "connector_id": {
-          "$ref": "#/$defs/mconn_uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "connector_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "connector_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "mconn_account_id": mconn_account_id,
         "mconn_customer_connector_fields": mconn_customer_connector_fields,
         "mconn_customer_connectors_update_request": mconn_customer_connectors_update_request,
-        "mconn_day_of_week": mconn_day_of_week,
-        "mconn_embargo_date": mconn_embargo_date,
-        "mconn_uuid": mconn_uuid,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/mconn_customer_connectors_update_response",
       $defs: {
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_update_response": mconn_customer_connectors_update_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_update_response": mconn_customer_connectors_update_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_response": mconn_response,
       },
     },
     annotations: {
@@ -626,17 +631,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mconn_bad_response": mconn_bad_response_output,
-        "mconn_coded_message": mconn_coded_message_output,
-        "mconn_customer_connector": mconn_customer_connector_output,
-        "mconn_customer_connectors_update_response": mconn_customer_connectors_update_response_output,
-        "mconn_customer_device": mconn_customer_device_output,
-        "mconn_day_of_week": mconn_day_of_week_output,
-        "mconn_embargo_date": mconn_embargo_date_output,
-        "mconn_good_response": mconn_good_response_output,
-        "mconn_none": mconn_none_output,
-        "mconn_response": mconn_response_output,
-        "mconn_uuid": mconn_uuid_output,
+        "mconn_bad_response": mconn_bad_response,
+        "mconn_coded_message": mconn_coded_message,
+        "mconn_customer_connector": mconn_customer_connector,
+        "mconn_customer_connectors_update_response": mconn_customer_connectors_update_response,
+        "mconn_customer_device": mconn_customer_device,
+        "mconn_good_response": mconn_good_response,
+        "mconn_none": mconn_none,
+        "mconn_response": mconn_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/containers/applications/instances/outputs.ts b/src/generated/forge-mcp/containers/applications/instances/outputs.ts
index d0c462ab7..866e73e88 100644
--- a/src/generated/forge-mcp/containers/applications/instances/outputs.ts
+++ b/src/generated/forge-mcp/containers/applications/instances/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cc_ContainerInstance` in responses.
  */
-export const cc_ContainerInstance_output: JsonSchema = {
+export const cc_ContainerInstance: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cc_ContainerInstanceBase"
@@ -14,10 +14,10 @@ export const cc_ContainerInstance_output: JsonSchema = {
     {
       "properties": {
         "application_id": {
-          "$ref": "#/$defs/cc_ApplicationID"
+          "type": "string"
         },
         "image": {
-          "$ref": "#/$defs/cc_Image"
+          "type": "string"
         }
       },
       "required": [
@@ -32,19 +32,19 @@ export const cc_ContainerInstance_output: JsonSchema = {
 /**
  * The schema of `cc_ContainerInstanceBase` in responses.
  */
-export const cc_ContainerInstanceBase_output: JsonSchema = {
+export const cc_ContainerInstanceBase: JsonSchema = {
   "properties": {
     "application_id": {
-      "$ref": "#/$defs/cc_ApplicationID"
+      "type": "string"
     },
     "configuration": {
       "$ref": "#/$defs/cc_ContainerInstanceConfiguration"
     },
     "id": {
-      "$ref": "#/$defs/cc_ContainerInstanceID"
+      "type": "string"
     },
     "image": {
-      "$ref": "#/$defs/cc_Image"
+      "type": "string"
     },
     "location": {
       "$ref": "#/$defs/cc_ContainerInstanceLocation"
@@ -53,7 +53,7 @@ export const cc_ContainerInstanceBase_output: JsonSchema = {
       "type": "string"
     },
     "started_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "status": {
       "$ref": "#/$defs/cc_ContainerInstanceStatus"
@@ -69,7 +69,7 @@ export const cc_ContainerInstanceBase_output: JsonSchema = {
 /**
  * The schema of `cc_ContainerInstanceConfiguration` in responses.
  */
-export const cc_ContainerInstanceConfiguration_output: JsonSchema = {
+export const cc_ContainerInstanceConfiguration: JsonSchema = {
   "properties": {
     "disk": {
       "type": "integer"
@@ -89,23 +89,16 @@ export const cc_ContainerInstanceConfiguration_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_ContainerInstanceID` in responses.
- */
-export const cc_ContainerInstanceID_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `cc_ContainerInstanceLocation` in responses.
  */
-export const cc_ContainerInstanceLocation_output: JsonSchema = {
+export const cc_ContainerInstanceLocation: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/cc_LocationID"
+      "type": "string"
     },
     "region": {
-      "$ref": "#/$defs/cc_Region"
+      "type": "string"
     }
   },
   "required": [
@@ -118,16 +111,26 @@ export const cc_ContainerInstanceLocation_output: JsonSchema = {
 /**
  * The schema of `cc_ContainerInstanceStatus` in responses.
  */
-export const cc_ContainerInstanceStatus_output: JsonSchema = {
+export const cc_ContainerInstanceStatus: JsonSchema = {
   "properties": {
     "exit_code": {
       "type": "integer"
     },
     "state": {
-      "$ref": "#/$defs/cc_ContainerInstanceStatusState"
+      "enum": [
+        "provisioning",
+        "running",
+        "failed",
+        "stopping",
+        "stopped",
+        "unhealthy",
+        "inactive",
+        "unknown"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     }
   },
   "required": [
@@ -137,36 +140,12 @@ export const cc_ContainerInstanceStatus_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_ContainerInstanceStatusState` in responses.
- */
-export const cc_ContainerInstanceStatusState_output: JsonSchema = {
-  "enum": [
-    "provisioning",
-    "running",
-    "failed",
-    "stopping",
-    "stopped",
-    "unhealthy",
-    "inactive",
-    "unknown"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cc_ContainersListContainerInstancesV2` in responses.
  */
-export const cc_ContainersListContainerInstancesV2_output: JsonSchema = {
+export const cc_ContainersListContainerInstancesV2: JsonSchema = {
   "items": {
     "$ref": "#/$defs/cc_ContainerInstance"
   },
   "type": "array"
 };
-
-/**
- * The schema of `cc_LocationID` in responses.
- */
-export const cc_LocationID_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/containers/applications/instances/schemas.ts b/src/generated/forge-mcp/containers/applications/instances/schemas.ts
deleted file mode 100644
index ccb50fd0d..000000000
--- a/src/generated/forge-mcp/containers/applications/instances/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `cc_ContainerInstanceID`.
- */
-export const cc_ContainerInstanceID: JsonSchema = {
-  "description": "A container instance ID (64-character hex Durable Object actor ID).",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/containers/applications/instances/tools.ts b/src/generated/forge-mcp/containers/applications/instances/tools.ts
index bb0618046..f5b5c5dd2 100644
--- a/src/generated/forge-mcp/containers/applications/instances/tools.ts
+++ b/src/generated/forge-mcp/containers/applications/instances/tools.ts
@@ -1,32 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cc_ISO8601Timestamp_output,
-  cc_Image_output,
-  cc_Messages_output,
-  cc_V4BaseErrorResponse_output,
-  cc_V4BaseResponse_output,
+  cc_Messages,
+  cc_V4BaseErrorResponse,
+  cc_V4BaseResponse,
 } from "../../outputs.js";
+import { cc_V4PaginatedResultInfo } from "../outputs.js";
 import {
-  cc_ApplicationID_output,
-  cc_Region_output,
-  cc_V4PaginatedResultInfo_output,
-} from "../outputs.js";
-import { cc_ApplicationID } from "../schemas.js";
-import {
-  cc_ContainerInstanceBase_output,
-  cc_ContainerInstanceConfiguration_output,
-  cc_ContainerInstanceID_output,
-  cc_ContainerInstanceLocation_output,
-  cc_ContainerInstanceStatusState_output,
-  cc_ContainerInstanceStatus_output,
-  cc_ContainerInstance_output,
-  cc_ContainersListContainerInstancesV2_output,
-  cc_LocationID_output,
+  cc_ContainerInstance,
+  cc_ContainerInstanceBase,
+  cc_ContainerInstanceConfiguration,
+  cc_ContainerInstanceLocation,
+  cc_ContainerInstanceStatus,
+  cc_ContainersListContainerInstancesV2,
 } from "./outputs.js";
-import { cc_ContainerInstanceID } from "./schemas.js";
 
 /**
  * The tools of `containers.applications.instances`.
@@ -35,32 +24,38 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_instances_get",
     title: "Get a container instance",
-    description: "Returns a container instance belonging to an application.",
+    description: "Returns a container instance belonging to an application.\n\nGET /accounts/{account_id}/containers/applications/{application_id}/instances/{instance_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "$ref": "#/$defs/cc_ApplicationID",
-          "description": "An Application ID represents an identifier of an application."
-        },
-        "instance_id": {
-          "$ref": "#/$defs/cc_ContainerInstanceID",
-          "description": "A container instance ID (64-character hex Durable Object actor ID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "An Application ID represents an identifier of an application.",
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "A container instance ID (64-character hex Durable Object actor ID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id",
+            "instance_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id",
-        "instance_id"
+        "path"
       ],
-      $defs: {
-        "cc_ApplicationID": cc_ApplicationID,
-        "cc_ContainerInstanceID": cc_ContainerInstanceID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -80,20 +75,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ContainerInstance": cc_ContainerInstance_output,
-        "cc_ContainerInstanceBase": cc_ContainerInstanceBase_output,
-        "cc_ContainerInstanceConfiguration": cc_ContainerInstanceConfiguration_output,
-        "cc_ContainerInstanceID": cc_ContainerInstanceID_output,
-        "cc_ContainerInstanceLocation": cc_ContainerInstanceLocation_output,
-        "cc_ContainerInstanceStatus": cc_ContainerInstanceStatus_output,
-        "cc_ContainerInstanceStatusState": cc_ContainerInstanceStatusState_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_LocationID": cc_LocationID_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_Region": cc_Region_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainerInstance": cc_ContainerInstance,
+        "cc_ContainerInstanceBase": cc_ContainerInstanceBase,
+        "cc_ContainerInstanceConfiguration": cc_ContainerInstanceConfiguration,
+        "cc_ContainerInstanceLocation": cc_ContainerInstanceLocation,
+        "cc_ContainerInstanceStatus": cc_ContainerInstanceStatus,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -145,21 +133,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ContainerInstance": cc_ContainerInstance_output,
-        "cc_ContainerInstanceBase": cc_ContainerInstanceBase_output,
-        "cc_ContainerInstanceConfiguration": cc_ContainerInstanceConfiguration_output,
-        "cc_ContainerInstanceID": cc_ContainerInstanceID_output,
-        "cc_ContainerInstanceLocation": cc_ContainerInstanceLocation_output,
-        "cc_ContainerInstanceStatus": cc_ContainerInstanceStatus_output,
-        "cc_ContainerInstanceStatusState": cc_ContainerInstanceStatusState_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_LocationID": cc_LocationID_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_Region": cc_Region_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainerInstance": cc_ContainerInstance,
+        "cc_ContainerInstanceBase": cc_ContainerInstanceBase,
+        "cc_ContainerInstanceConfiguration": cc_ContainerInstanceConfiguration,
+        "cc_ContainerInstanceLocation": cc_ContainerInstanceLocation,
+        "cc_ContainerInstanceStatus": cc_ContainerInstanceStatus,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
@@ -169,46 +150,59 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_instances_list",
     title: "List container instances",
-    description: "Lists container instances belonging to an application.",
+    description: "Lists container instances belonging to an application.\n\nGET /accounts/{account_id}/containers/applications/{application_id}/instances-v2",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "$ref": "#/$defs/cc_ApplicationID",
-          "description": "An Application ID represents an identifier of an application."
-        },
-        "name_prefix": {
-          "description": "Filter instances by a case-sensitive name prefix, falling back to the actor ID when no name is known. Keep the same prefix when using a page token.\n",
-          "type": "string"
-        },
-        "page_token": {
-          "description": "Opaque token from a previous response to retrieve the next page.",
-          "type": "string"
-        },
-        "per_page": {
-          "description": "Maximum number of instances to return per page. Defaults to 100.",
-          "type": "integer"
-        },
-        "state": {
-          "description": "Filters instances by lifecycle state. `active` includes provisioning, running, and stopping instances; `not-active` includes stopped and failed instances. When omitted, all instances are returned.\n",
-          "enum": [
-            "active",
-            "not-active"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "An Application ID represents an identifier of an application.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name_prefix": {
+              "description": "Filter instances by a case-sensitive name prefix, falling back to the actor ID when no name is known. Keep the same prefix when using a page token.",
+              "type": "string"
+            },
+            "page_token": {
+              "description": "Opaque token from a previous response to retrieve the next page.",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "Maximum number of instances to return per page. Defaults to 100.",
+              "type": "integer"
+            },
+            "state": {
+              "description": "Filters instances by lifecycle state. `active` includes provisioning, running, and stopping instances; `not-active` includes stopped and failed instances. When omitted, all instances are returned.",
+              "enum": [
+                "active",
+                "not-active"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id"
+        "path"
       ],
-      $defs: {
-        "cc_ApplicationID": cc_ApplicationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -232,22 +226,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ContainerInstance": cc_ContainerInstance_output,
-        "cc_ContainerInstanceBase": cc_ContainerInstanceBase_output,
-        "cc_ContainerInstanceConfiguration": cc_ContainerInstanceConfiguration_output,
-        "cc_ContainerInstanceID": cc_ContainerInstanceID_output,
-        "cc_ContainerInstanceLocation": cc_ContainerInstanceLocation_output,
-        "cc_ContainerInstanceStatus": cc_ContainerInstanceStatus_output,
-        "cc_ContainerInstanceStatusState": cc_ContainerInstanceStatusState_output,
-        "cc_ContainersListContainerInstancesV2": cc_ContainersListContainerInstancesV2_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_LocationID": cc_LocationID_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_Region": cc_Region_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_V4PaginatedResultInfo": cc_V4PaginatedResultInfo_output,
+        "cc_ContainerInstance": cc_ContainerInstance,
+        "cc_ContainerInstanceBase": cc_ContainerInstanceBase,
+        "cc_ContainerInstanceConfiguration": cc_ContainerInstanceConfiguration,
+        "cc_ContainerInstanceLocation": cc_ContainerInstanceLocation,
+        "cc_ContainerInstanceStatus": cc_ContainerInstanceStatus,
+        "cc_ContainersListContainerInstancesV2": cc_ContainersListContainerInstancesV2,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_V4PaginatedResultInfo": cc_V4PaginatedResultInfo,
       },
     },
     annotations: {
@@ -308,32 +295,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ContainerInstance": cc_ContainerInstance_output,
-        "cc_ContainerInstanceBase": cc_ContainerInstanceBase_output,
-        "cc_ContainerInstanceConfiguration": cc_ContainerInstanceConfiguration_output,
-        "cc_ContainerInstanceID": cc_ContainerInstanceID_output,
-        "cc_ContainerInstanceLocation": cc_ContainerInstanceLocation_output,
-        "cc_ContainerInstanceStatus": cc_ContainerInstanceStatus_output,
-        "cc_ContainerInstanceStatusState": cc_ContainerInstanceStatusState_output,
-        "cc_ContainersListContainerInstancesV2": cc_ContainersListContainerInstancesV2_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_LocationID": cc_LocationID_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_Region": cc_Region_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_V4PaginatedResultInfo": cc_V4PaginatedResultInfo_output,
+        "cc_ContainerInstance": cc_ContainerInstance,
+        "cc_ContainerInstanceBase": cc_ContainerInstanceBase,
+        "cc_ContainerInstanceConfiguration": cc_ContainerInstanceConfiguration,
+        "cc_ContainerInstanceLocation": cc_ContainerInstanceLocation,
+        "cc_ContainerInstanceStatus": cc_ContainerInstanceStatus,
+        "cc_ContainersListContainerInstancesV2": cc_ContainersListContainerInstancesV2,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_V4PaginatedResultInfo": cc_V4PaginatedResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/containers/applications/${pathParam(args, "application_id")}/instances-v2`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page_token", args["page_token"], true],
-        ["state", args["state"], true],
-        ["name_prefix", args["name_prefix"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page_token", param(args, "query", "page_token"), true],
+        ["state", param(args, "query", "state"), true],
+        ["name_prefix", param(args, "query", "name_prefix"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/containers/applications/outputs.ts b/src/generated/forge-mcp/containers/applications/outputs.ts
index 459b140d3..b68b86c09 100644
--- a/src/generated/forge-mcp/containers/applications/outputs.ts
+++ b/src/generated/forge-mcp/containers/applications/outputs.ts
@@ -6,13 +6,13 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cc_Application` in responses.
  */
-export const cc_Application_output: JsonSchema = {
+export const cc_Application: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/cc_AccountID"
+      "type": "string"
     },
     "active_rollout_id": {
-      "$ref": "#/$defs/cc_RolloutID"
+      "type": "string"
     },
     "configuration": {
       "$ref": "#/$defs/cc_UserDeploymentConfiguration"
@@ -21,7 +21,7 @@ export const cc_Application_output: JsonSchema = {
       "$ref": "#/$defs/cc_ApplicationConstraints"
     },
     "created_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "durable_objects": {
       "$ref": "#/$defs/cc_ApplicationDurableObjectsConfiguration"
@@ -30,7 +30,7 @@ export const cc_Application_output: JsonSchema = {
       "$ref": "#/$defs/cc_ApplicationHealth"
     },
     "id": {
-      "$ref": "#/$defs/cc_ApplicationID"
+      "type": "string"
     },
     "instances": {
       "type": "integer"
@@ -39,19 +39,23 @@ export const cc_Application_output: JsonSchema = {
       "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/cc_ApplicationName"
+      "type": "string"
     },
     "observability": {
       "$ref": "#/$defs/cc_ApplicationObservability"
     },
     "rollout_active_grace_period": {
-      "$ref": "#/$defs/cc_ApplicationRolloutActiveGracePeriod"
+      "type": "integer"
     },
     "scheduling_policy": {
-      "$ref": "#/$defs/cc_SchedulingPolicy"
+      "enum": [
+        "default",
+        "durable_object"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "version": {
       "type": "integer"
@@ -74,14 +78,14 @@ export const cc_Application_output: JsonSchema = {
 /**
  * The schema of `cc_ApplicationConstraints` in responses.
  */
-export const cc_ApplicationConstraints_output: JsonSchema = {
+export const cc_ApplicationConstraints: JsonSchema = {
   "properties": {
     "jurisdiction": {
-      "$ref": "#/$defs/cc_ApplicationJurisdiction"
+      "type": "string"
     },
     "regions": {
       "items": {
-        "$ref": "#/$defs/cc_Region"
+        "type": "string"
       },
       "type": "array"
     }
@@ -92,14 +96,14 @@ export const cc_ApplicationConstraints_output: JsonSchema = {
 /**
  * The schema of `cc_ApplicationDurableObjectsConfiguration` in responses.
  */
-export const cc_ApplicationDurableObjectsConfiguration_output: JsonSchema = {
+export const cc_ApplicationDurableObjectsConfiguration: JsonSchema = {
   "$ref": "#/$defs/cc_DurableObjectsConfigurationNamespaceId"
 };
 
 /**
  * The schema of `cc_ApplicationHealth` in responses.
  */
-export const cc_ApplicationHealth_output: JsonSchema = {
+export const cc_ApplicationHealth: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cc_ApplicationHealthErrors"
@@ -127,13 +131,13 @@ export const cc_ApplicationHealth_output: JsonSchema = {
 /**
  * The schema of `cc_ApplicationHealthError` in responses.
  */
-export const cc_ApplicationHealthError_output: JsonSchema = {
+export const cc_ApplicationHealthError: JsonSchema = {
   "properties": {
     "event": {
       "$ref": "#/$defs/cc_PlacementEvent"
     },
     "instance_id": {
-      "$ref": "#/$defs/cc_InstanceID"
+      "type": "string"
     }
   },
   "required": [
@@ -146,7 +150,7 @@ export const cc_ApplicationHealthError_output: JsonSchema = {
 /**
  * The schema of `cc_ApplicationHealthErrors` in responses.
  */
-export const cc_ApplicationHealthErrors_output: JsonSchema = {
+export const cc_ApplicationHealthErrors: JsonSchema = {
   "items": {
     "$ref": "#/$defs/cc_ApplicationHealthError"
   },
@@ -156,7 +160,7 @@ export const cc_ApplicationHealthErrors_output: JsonSchema = {
 /**
  * The schema of `cc_ApplicationHealthInstances` in responses.
  */
-export const cc_ApplicationHealthInstances_output: JsonSchema = {
+export const cc_ApplicationHealthInstances: JsonSchema = {
   "properties": {
     "active": {
       "type": "integer"
@@ -172,31 +176,10 @@ export const cc_ApplicationHealthInstances_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_ApplicationID` in responses.
- */
-export const cc_ApplicationID_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ApplicationJurisdiction` in responses.
- */
-export const cc_ApplicationJurisdiction_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ApplicationName` in responses.
- */
-export const cc_ApplicationName_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `cc_ApplicationObservability` in responses.
  */
-export const cc_ApplicationObservability_output: JsonSchema = {
+export const cc_ApplicationObservability: JsonSchema = {
   "properties": {
     "logs": {
       "$ref": "#/$defs/cc_ObservabilityLogs"
@@ -205,19 +188,12 @@ export const cc_ApplicationObservability_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_ApplicationRolloutActiveGracePeriod` in responses.
- */
-export const cc_ApplicationRolloutActiveGracePeriod_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `cc_Command` in responses.
  */
-export const cc_Command_output: JsonSchema = {
+export const cc_Command: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/cc_ExecFormParam"
+    "type": "string"
   },
   "type": "array"
 };
@@ -225,7 +201,7 @@ export const cc_Command_output: JsonSchema = {
 /**
  * The schema of `cc_ContainersApplicationResponse` in responses.
  */
-export const cc_ContainersApplicationResponse_output: JsonSchema = {
+export const cc_ContainersApplicationResponse: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/cc_ScheduledApplication"
@@ -239,7 +215,7 @@ export const cc_ContainersApplicationResponse_output: JsonSchema = {
 /**
  * The schema of `cc_ContainersDeleteApplicationResponseBody` in responses.
  */
-export const cc_ContainersDeleteApplicationResponseBody_output: JsonSchema = {
+export const cc_ContainersDeleteApplicationResponseBody: JsonSchema = {
   "properties": {
     "message": {
       "type": "string"
@@ -254,7 +230,7 @@ export const cc_ContainersDeleteApplicationResponseBody_output: JsonSchema = {
 /**
  * The schema of `cc_ContainersListApplications` in responses.
  */
-export const cc_ContainersListApplications_output: JsonSchema = {
+export const cc_ContainersListApplications: JsonSchema = {
   "items": {
     "$ref": "#/$defs/cc_ContainersApplicationResponse"
   },
@@ -264,7 +240,7 @@ export const cc_ContainersListApplications_output: JsonSchema = {
 /**
  * The schema of `cc_DeploymentObservability` in responses.
  */
-export const cc_DeploymentObservability_output: JsonSchema = {
+export const cc_DeploymentObservability: JsonSchema = {
   "properties": {
     "logs": {
       "$ref": "#/$defs/cc_ObservabilityLogs"
@@ -276,10 +252,10 @@ export const cc_DeploymentObservability_output: JsonSchema = {
 /**
  * The schema of `cc_DurableObjectApplication` in responses.
  */
-export const cc_DurableObjectApplication_output: JsonSchema = {
+export const cc_DurableObjectApplication: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/cc_AccountID"
+      "type": "string"
     },
     "configuration": {
       "$ref": "#/$defs/cc_DurableObjectApplicationConfiguration"
@@ -288,7 +264,7 @@ export const cc_DurableObjectApplication_output: JsonSchema = {
       "$ref": "#/$defs/cc_DurableObjectApplicationConstraints"
     },
     "created_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "durable_objects": {
       "$ref": "#/$defs/cc_DurableObjectsConfigurationNamespaceId"
@@ -297,19 +273,22 @@ export const cc_DurableObjectApplication_output: JsonSchema = {
       "$ref": "#/$defs/cc_DurableObjectApplicationHealth"
     },
     "id": {
-      "$ref": "#/$defs/cc_ApplicationID"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/cc_ApplicationName"
+      "type": "string"
     },
     "observability": {
       "$ref": "#/$defs/cc_DurableObjectApplicationObservability"
     },
     "scheduling_policy": {
-      "$ref": "#/$defs/cc_DurableObjectApplicationSchedulingPolicy"
+      "enum": [
+        "durable_object"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     }
   },
   "required": [
@@ -327,7 +306,7 @@ export const cc_DurableObjectApplication_output: JsonSchema = {
 /**
  * The schema of `cc_DurableObjectApplicationConfiguration` in responses.
  */
-export const cc_DurableObjectApplicationConfiguration_output: JsonSchema = {
+export const cc_DurableObjectApplicationConfiguration: JsonSchema = {
   "properties": {
     "authorized_keys": {
       "items": {
@@ -345,7 +324,7 @@ export const cc_DurableObjectApplicationConfiguration_output: JsonSchema = {
 /**
  * The schema of `cc_DurableObjectApplicationConstraints` in responses.
  */
-export const cc_DurableObjectApplicationConstraints_output: JsonSchema = {
+export const cc_DurableObjectApplicationConstraints: JsonSchema = {
   "properties": {
     "jurisdiction": {
       "enum": [
@@ -365,7 +344,7 @@ export const cc_DurableObjectApplicationConstraints_output: JsonSchema = {
 /**
  * The schema of `cc_DurableObjectApplicationHealth` in responses.
  */
-export const cc_DurableObjectApplicationHealth_output: JsonSchema = {
+export const cc_DurableObjectApplicationHealth: JsonSchema = {
   "properties": {
     "instances": {
       "properties": {
@@ -398,7 +377,7 @@ export const cc_DurableObjectApplicationHealth_output: JsonSchema = {
 /**
  * The schema of `cc_DurableObjectApplicationObservability` in responses.
  */
-export const cc_DurableObjectApplicationObservability_output: JsonSchema = {
+export const cc_DurableObjectApplicationObservability: JsonSchema = {
   "properties": {
     "logs": {
       "properties": {
@@ -412,20 +391,10 @@ export const cc_DurableObjectApplicationObservability_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_DurableObjectApplicationSchedulingPolicy` in responses.
- */
-export const cc_DurableObjectApplicationSchedulingPolicy_output: JsonSchema = {
-  "enum": [
-    "durable_object"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cc_DurableObjectsConfigurationNamespaceId` in responses.
  */
-export const cc_DurableObjectsConfigurationNamespaceId_output: JsonSchema = {
+export const cc_DurableObjectsConfigurationNamespaceId: JsonSchema = {
   "properties": {
     "namespace_id": {
       "type": "string"
@@ -440,9 +409,9 @@ export const cc_DurableObjectsConfigurationNamespaceId_output: JsonSchema = {
 /**
  * The schema of `cc_Entrypoint` in responses.
  */
-export const cc_Entrypoint_output: JsonSchema = {
+export const cc_Entrypoint: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/cc_ExecFormParam"
+    "type": "string"
   },
   "type": "array"
 };
@@ -450,13 +419,13 @@ export const cc_Entrypoint_output: JsonSchema = {
 /**
  * The schema of `cc_EnvironmentVariable` in responses.
  */
-export const cc_EnvironmentVariable_output: JsonSchema = {
+export const cc_EnvironmentVariable: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/cc_EnvironmentVariableName"
+      "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/cc_EnvironmentVariableValue"
+      "type": "string"
     }
   },
   "required": [
@@ -466,93 +435,10 @@ export const cc_EnvironmentVariable_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_EnvironmentVariableName` in responses.
- */
-export const cc_EnvironmentVariableName_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_EnvironmentVariableValue` in responses.
- */
-export const cc_EnvironmentVariableValue_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_EventName` in responses.
- */
-export const cc_EventName_output: JsonSchema = {
-  "enum": [
-    "SchedulerPlaced",
-    "NetworkingIPAssigned",
-    "VMStarted",
-    "ImagePulled",
-    "ImagePullError",
-    "VMFailedToStart",
-    "NetworkingIPAssignmentFailed",
-    "VMRunning",
-    "VMStopping",
-    "VMStopped",
-    "VMFailed",
-    "RuntimeStartFailed",
-    "SSHStarted",
-    "ServiceHealthUpdates",
-    "CheckUpdate",
-    "DurableObjectConnected",
-    "ContainerStarted"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `cc_EventType` in responses.
- */
-export const cc_EventType_output: JsonSchema = {
-  "enum": [
-    "Info",
-    "Error",
-    "Warn",
-    "UserError",
-    "SystemError"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ExecFormParam` in responses.
- */
-export const cc_ExecFormParam_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_InstanceID` in responses.
- */
-export const cc_InstanceID_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_InstanceType` in responses.
- */
-export const cc_InstanceType_output: JsonSchema = {
-  "enum": [
-    "lite",
-    "basic",
-    "standard-1",
-    "standard-2",
-    "standard-3",
-    "standard-4"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cc_ModifyUserDeploymentConfiguration` in responses.
  */
-export const cc_ModifyUserDeploymentConfiguration_output: JsonSchema = {
+export const cc_ModifyUserDeploymentConfiguration: JsonSchema = {
   "properties": {
     "authorized_keys": {
       "items": {
@@ -573,10 +459,18 @@ export const cc_ModifyUserDeploymentConfiguration_output: JsonSchema = {
       "type": "array"
     },
     "image": {
-      "$ref": "#/$defs/cc_Image"
+      "type": "string"
     },
     "instance_type": {
-      "$ref": "#/$defs/cc_InstanceType"
+      "enum": [
+        "lite",
+        "basic",
+        "standard-1",
+        "standard-2",
+        "standard-3",
+        "standard-4"
+      ],
+      "type": "string"
     },
     "observability": {
       "$ref": "#/$defs/cc_DeploymentObservability"
@@ -588,7 +482,7 @@ export const cc_ModifyUserDeploymentConfiguration_output: JsonSchema = {
 /**
  * The schema of `cc_ObservabilityLogs` in responses.
  */
-export const cc_ObservabilityLogs_output: JsonSchema = {
+export const cc_ObservabilityLogs: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -600,7 +494,7 @@ export const cc_ObservabilityLogs_output: JsonSchema = {
 /**
  * The schema of `cc_PlacementEvent` in responses.
  */
-export const cc_PlacementEvent_output: JsonSchema = {
+export const cc_PlacementEvent: JsonSchema = {
   "properties": {
     "details": {
       "type": "object"
@@ -612,16 +506,42 @@ export const cc_PlacementEvent_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/cc_EventName"
+      "enum": [
+        "SchedulerPlaced",
+        "NetworkingIPAssigned",
+        "VMStarted",
+        "ImagePulled",
+        "ImagePullError",
+        "VMFailedToStart",
+        "NetworkingIPAssignmentFailed",
+        "VMRunning",
+        "VMStopping",
+        "VMStopped",
+        "VMFailed",
+        "RuntimeStartFailed",
+        "SSHStarted",
+        "ServiceHealthUpdates",
+        "CheckUpdate",
+        "DurableObjectConnected",
+        "ContainerStarted"
+      ],
+      "type": "string"
     },
     "statusChange": {
       "type": "object"
     },
     "time": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/cc_EventType"
+      "enum": [
+        "Info",
+        "Error",
+        "Warn",
+        "UserError",
+        "SystemError"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -636,31 +556,10 @@ export const cc_PlacementEvent_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_Region` in responses.
- */
-export const cc_Region_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_RolloutID` in responses.
- */
-export const cc_RolloutID_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_SSHPublicKey` in responses.
- */
-export const cc_SSHPublicKey_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `cc_ScheduledApplication` in responses.
  */
-export const cc_ScheduledApplication_output: JsonSchema = {
+export const cc_ScheduledApplication: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cc_Application"
@@ -668,7 +567,10 @@ export const cc_ScheduledApplication_output: JsonSchema = {
     {
       "properties": {
         "scheduling_policy": {
-          "$ref": "#/$defs/cc_ScheduledApplicationSchedulingPolicy"
+          "enum": [
+            "default"
+          ],
+          "type": "string"
         }
       },
       "required": [
@@ -679,31 +581,10 @@ export const cc_ScheduledApplication_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `cc_ScheduledApplicationSchedulingPolicy` in responses.
- */
-export const cc_ScheduledApplicationSchedulingPolicy_output: JsonSchema = {
-  "enum": [
-    "default"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `cc_SchedulingPolicy` in responses.
- */
-export const cc_SchedulingPolicy_output: JsonSchema = {
-  "enum": [
-    "default",
-    "durable_object"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cc_UserDeploymentConfiguration` in responses.
  */
-export const cc_UserDeploymentConfiguration_output: JsonSchema = {
+export const cc_UserDeploymentConfiguration: JsonSchema = {
   "properties": {
     "authorized_keys": {
       "items": {
@@ -724,10 +605,18 @@ export const cc_UserDeploymentConfiguration_output: JsonSchema = {
       "type": "array"
     },
     "image": {
-      "$ref": "#/$defs/cc_Image"
+      "type": "string"
     },
     "instance_type": {
-      "$ref": "#/$defs/cc_InstanceType"
+      "enum": [
+        "lite",
+        "basic",
+        "standard-1",
+        "standard-2",
+        "standard-3",
+        "standard-4"
+      ],
+      "type": "string"
     },
     "observability": {
       "$ref": "#/$defs/cc_DeploymentObservability"
@@ -742,13 +631,13 @@ export const cc_UserDeploymentConfiguration_output: JsonSchema = {
 /**
  * The schema of `cc_UserSSHPublicKey` in responses.
  */
-export const cc_UserSSHPublicKey_output: JsonSchema = {
+export const cc_UserSSHPublicKey: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
     },
     "public_key": {
-      "$ref": "#/$defs/cc_SSHPublicKey"
+      "type": "string"
     }
   },
   "required": [
@@ -760,7 +649,7 @@ export const cc_UserSSHPublicKey_output: JsonSchema = {
 /**
  * The schema of `cc_V4PaginatedResultInfo` in responses.
  */
-export const cc_V4PaginatedResultInfo_output: JsonSchema = {
+export const cc_V4PaginatedResultInfo: JsonSchema = {
   "properties": {
     "next_page_token": {
       "type": "string"
@@ -778,7 +667,7 @@ export const cc_V4PaginatedResultInfo_output: JsonSchema = {
 /**
  * The schema of `cc_WranglerSSHConfig` in responses.
  */
-export const cc_WranglerSSHConfig_output: JsonSchema = {
+export const cc_WranglerSSHConfig: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/containers/applications/rollouts/outputs.ts b/src/generated/forge-mcp/containers/applications/rollouts/outputs.ts
index 401eb6309..442bcaedb 100644
--- a/src/generated/forge-mcp/containers/applications/rollouts/outputs.ts
+++ b/src/generated/forge-mcp/containers/applications/rollouts/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cc_ApplicationRollout` in responses.
  */
-export const cc_ApplicationRollout_output: JsonSchema = {
+export const cc_ApplicationRollout: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "current_configuration": {
       "$ref": "#/$defs/cc_ModifyUserDeploymentConfiguration"
@@ -24,7 +24,7 @@ export const cc_ApplicationRollout_output: JsonSchema = {
       "$ref": "#/$defs/cc_ApplicationHealth"
     },
     "id": {
-      "$ref": "#/$defs/cc_RolloutID"
+      "type": "string"
     },
     "kind": {
       "enum": [
@@ -35,7 +35,7 @@ export const cc_ApplicationRollout_output: JsonSchema = {
       "type": "string"
     },
     "last_updated_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "percentage": {
       "type": "integer"
@@ -112,7 +112,7 @@ export const cc_ApplicationRollout_output: JsonSchema = {
 /**
  * The schema of `cc_ApplicationRolloutProgress` in responses.
  */
-export const cc_ApplicationRolloutProgress_output: JsonSchema = {
+export const cc_ApplicationRolloutProgress: JsonSchema = {
   "properties": {
     "current_step": {
       "type": "integer"
@@ -156,10 +156,10 @@ export const cc_ApplicationRolloutProgress_output: JsonSchema = {
 /**
  * The schema of `cc_RolloutStep` in responses.
  */
-export const cc_RolloutStep_output: JsonSchema = {
+export const cc_RolloutStep: JsonSchema = {
   "properties": {
     "completed_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "description": {
       "type": "string"
@@ -171,7 +171,7 @@ export const cc_RolloutStep_output: JsonSchema = {
       "type": "string"
     },
     "started_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "status": {
       "enum": [
diff --git a/src/generated/forge-mcp/containers/applications/rollouts/schemas.ts b/src/generated/forge-mcp/containers/applications/rollouts/schemas.ts
index d1eb3cd94..ff82ee21d 100644
--- a/src/generated/forge-mcp/containers/applications/rollouts/schemas.ts
+++ b/src/generated/forge-mcp/containers/applications/rollouts/schemas.ts
@@ -15,7 +15,7 @@ export const cc_ContainersCreateApplicationRolloutRequest: JsonSchema = {
     },
     "kind": {
       "default": "full_auto",
-      "description": "Kind of the rollout process. Defaults to \"full_auto\".\n - \"full_auto\": For rolling rollouts, starts progressing steps upon rollout creation. For new_instances rollouts, advances percentage targets automatically after target-version health is observed.\n - \"full_manual\": Requires manually progressing each step in the rollout using the UpdateRollout's action parameter.\n",
+      "description": "Kind of the rollout process. Defaults to \"full_auto\".\n - \"full_auto\": For rolling rollouts, starts progressing steps upon rollout creation. For new_instances rollouts, advances percentage targets automatically after target-version health is observed.\n - \"full_manual\": Requires manually progressing each step in the rollout using the UpdateRollout's action parameter.",
       "enum": [
         "full_auto",
         "full_manual"
@@ -23,11 +23,11 @@ export const cc_ContainersCreateApplicationRolloutRequest: JsonSchema = {
       "type": "string"
     },
     "percentage": {
-      "description": "Initial target version percentage (0-100). Version sync actively replaces instances to match.\nRequired when strategy is \"new_instances\" and kind is \"full_manual\". When strategy is \"new_instances\" and kind is \"full_auto\", omitted percentage starts at 10% or the smallest percentage that targets at least one instance. Unused for \"rolling\".\n",
+      "description": "Initial target version percentage (0-100). Version sync actively replaces instances to match.\nRequired when strategy is \"new_instances\" and kind is \"full_manual\". When strategy is \"new_instances\" and kind is \"full_auto\", omitted percentage starts at 10% or the smallest percentage that targets at least one instance. Unused for \"rolling\".",
       "type": "integer"
     },
     "step_percentage": {
-      "description": "Percentage of rollout to increase in each step when \"steps\" is absent. Applicable values: 5, 10, 20, 25, 50, 100.\nThese create rollouts with 20, 10, 5, 4, 2, 1 steps respectively.\nOnly valid for \"rolling\" strategy.\n",
+      "description": "Percentage of rollout to increase in each step when \"steps\" is absent. Applicable values: 5, 10, 20, 25, 50, 100.\nThese create rollouts with 20, 10, 5, 4, 2, 1 steps respectively.\nOnly valid for \"rolling\" strategy.",
       "enum": [
         5,
         10,
@@ -39,14 +39,14 @@ export const cc_ContainersCreateApplicationRolloutRequest: JsonSchema = {
       "type": "integer"
     },
     "steps": {
-      "description": "Steps defining the rollout process, used when \"step_percentage\" is absent.\nSpecify only one of \"step_percentage\" or \"steps\" when creating a rollout.\n\"steps\" allow granular control over each step.\nOnly valid for \"rolling\" strategy.\n",
+      "description": "Steps defining the rollout process, used when \"step_percentage\" is absent.\nSpecify only one of \"step_percentage\" or \"steps\" when creating a rollout.\n\"steps\" allow granular control over each step.\nOnly valid for \"rolling\" strategy.",
       "items": {
         "$ref": "#/$defs/cc_RolloutStepRequest"
       },
       "type": "array"
     },
     "strategy": {
-      "description": "Strategy used for the rollout.\n- \"rolling\": Step-based rollout with health gates. Actively replaces instances to reach each step's target percentage.\n- \"new_instances\": Percentage control over version distribution. Version sync actively replaces instances to match the configured percentage. The \"full_auto\" kind advances through fixed percentage targets after target-version health is observed.\n",
+      "description": "Strategy used for the rollout.\n- \"rolling\": Step-based rollout with health gates. Actively replaces instances to reach each step's target percentage.\n- \"new_instances\": Percentage control over version distribution. Version sync actively replaces instances to match the configured percentage. The \"full_auto\" kind advances through fixed percentage targets after target-version health is observed.",
       "enum": [
         "rolling",
         "new_instances"
diff --git a/src/generated/forge-mcp/containers/applications/rollouts/tools.ts b/src/generated/forge-mcp/containers/applications/rollouts/tools.ts
index 571b6fca7..5cf96442b 100644
--- a/src/generated/forge-mcp/containers/applications/rollouts/tools.ts
+++ b/src/generated/forge-mcp/containers/applications/rollouts/tools.ts
@@ -3,55 +3,37 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cc_ISO8601Timestamp_output,
-  cc_Image_output,
-  cc_Messages_output,
-  cc_V4BaseErrorResponse_output,
-  cc_V4BaseResponse_output,
+  cc_Messages,
+  cc_V4BaseErrorResponse,
+  cc_V4BaseResponse,
 } from "../../outputs.js";
-import { cc_Image } from "../../schemas.js";
 import {
-  cc_ApplicationHealthError_output,
-  cc_ApplicationHealthErrors_output,
-  cc_ApplicationHealthInstances_output,
-  cc_ApplicationHealth_output,
-  cc_Command_output,
-  cc_DeploymentObservability_output,
-  cc_Entrypoint_output,
-  cc_EnvironmentVariableName_output,
-  cc_EnvironmentVariableValue_output,
-  cc_EnvironmentVariable_output,
-  cc_EventName_output,
-  cc_EventType_output,
-  cc_ExecFormParam_output,
-  cc_InstanceID_output,
-  cc_InstanceType_output,
-  cc_ModifyUserDeploymentConfiguration_output,
-  cc_ObservabilityLogs_output,
-  cc_PlacementEvent_output,
-  cc_RolloutID_output,
-  cc_SSHPublicKey_output,
-  cc_UserSSHPublicKey_output,
-} from "../outputs.js";
-import {
-  cc_ApplicationID,
+  cc_ApplicationHealth,
+  cc_ApplicationHealthError,
+  cc_ApplicationHealthErrors,
+  cc_ApplicationHealthInstances,
   cc_Command,
   cc_DeploymentObservability,
   cc_Entrypoint,
   cc_EnvironmentVariable,
-  cc_EnvironmentVariableName,
-  cc_EnvironmentVariableValue,
-  cc_ExecFormParam,
-  cc_InstanceType,
   cc_ModifyUserDeploymentConfiguration,
   cc_ObservabilityLogs,
-  cc_SSHPublicKey,
+  cc_PlacementEvent,
   cc_UserSSHPublicKey,
+} from "../outputs.js";
+import {
+  cc_Command as cc_Command$,
+  cc_DeploymentObservability as cc_DeploymentObservability$,
+  cc_Entrypoint as cc_Entrypoint$,
+  cc_EnvironmentVariable as cc_EnvironmentVariable$,
+  cc_ModifyUserDeploymentConfiguration as cc_ModifyUserDeploymentConfiguration$,
+  cc_ObservabilityLogs as cc_ObservabilityLogs$,
+  cc_UserSSHPublicKey as cc_UserSSHPublicKey$,
 } from "../schemas.js";
 import {
-  cc_ApplicationRolloutProgress_output,
-  cc_ApplicationRollout_output,
-  cc_RolloutStep_output,
+  cc_ApplicationRollout,
+  cc_ApplicationRolloutProgress,
+  cc_RolloutStep,
 } from "./outputs.js";
 import {
   cc_ContainersCreateApplicationRolloutRequest,
@@ -65,44 +47,47 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_rollouts_create",
     title: "Create a new rollout for an application",
-    description: "Creates a rollout to update the application's configuration across instances\nwith minimal downtime. Rollouts apply only to scheduler-backed applications\nwith `scheduling_policy: \"default\"`. Versions and rollouts do not apply to\napplications with `scheduling_policy: \"durable_object\"`.",
+    description: "Creates a rollout to update the application's configuration across instances\nwith minimal downtime. Rollouts apply only to scheduler-backed applications\nwith `scheduling_policy: \"default\"`. Versions and rollouts do not apply to\napplications with `scheduling_policy: \"durable_object\"`.\n\nPOST /accounts/{account_id}/containers/applications/{application_id}/rollouts",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "$ref": "#/$defs/cc_ApplicationID",
-          "description": "An Application ID represents an identifier of an application."
-        },
         "body": {
           "$ref": "#/$defs/cc_ContainersCreateApplicationRolloutRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "An Application ID represents an identifier of an application.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cc_ApplicationID": cc_ApplicationID,
-        "cc_Command": cc_Command,
+        "cc_Command": cc_Command$,
         "cc_ContainersCreateApplicationRolloutRequest": cc_ContainersCreateApplicationRolloutRequest,
-        "cc_DeploymentObservability": cc_DeploymentObservability,
-        "cc_Entrypoint": cc_Entrypoint,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue,
-        "cc_ExecFormParam": cc_ExecFormParam,
-        "cc_Image": cc_Image,
-        "cc_InstanceType": cc_InstanceType,
-        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_DeploymentObservability": cc_DeploymentObservability$,
+        "cc_Entrypoint": cc_Entrypoint$,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable$,
+        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration$,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs$,
         "cc_RolloutStepRequest": cc_RolloutStepRequest,
-        "cc_SSHPublicKey": cc_SSHPublicKey,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey$,
       },
     },
     outputSchema: {
@@ -123,34 +108,23 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationRollout": cc_ApplicationRollout_output,
-        "cc_ApplicationRolloutProgress": cc_ApplicationRolloutProgress_output,
-        "cc_Command": cc_Command_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_RolloutStep": cc_RolloutStep_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationRollout": cc_ApplicationRollout,
+        "cc_ApplicationRolloutProgress": cc_ApplicationRolloutProgress,
+        "cc_Command": cc_Command,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_RolloutStep": cc_RolloutStep,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -199,35 +173,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationRollout": cc_ApplicationRollout_output,
-        "cc_ApplicationRolloutProgress": cc_ApplicationRolloutProgress_output,
-        "cc_Command": cc_Command_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_RolloutStep": cc_RolloutStep_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationRollout": cc_ApplicationRollout,
+        "cc_ApplicationRolloutProgress": cc_ApplicationRolloutProgress,
+        "cc_Command": cc_Command,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_RolloutStep": cc_RolloutStep,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/containers/applications/schemas.ts b/src/generated/forge-mcp/containers/applications/schemas.ts
index e2a4e9c35..79a991f72 100644
--- a/src/generated/forge-mcp/containers/applications/schemas.ts
+++ b/src/generated/forge-mcp/containers/applications/schemas.ts
@@ -9,12 +9,13 @@ import type { JsonSchema } from "../../_/tool.js";
 export const cc_ApplicationConstraints: JsonSchema = {
   "properties": {
     "jurisdiction": {
-      "$ref": "#/$defs/cc_ApplicationJurisdiction",
-      "description": "Restricts placement to datacenters in the selected jurisdiction. Choose \"eu\", \"fedramp\", or \"us\". When combined with regions, EU supports EEUR and WEUR while FedRAMP and US support ENAM and WNAM."
+      "description": "Restricts placement to datacenters in the selected jurisdiction. Choose \"eu\", \"fedramp\", or \"us\". When combined with regions, EU supports EEUR and WEUR while FedRAMP and US support ENAM and WNAM.",
+      "type": "string"
     },
     "regions": {
       "items": {
-        "$ref": "#/$defs/cc_Region"
+        "description": "Represents a group of datacenters. Choose one of \"AFR\", \"APAC\", \"EEUR\", \"ENAM\", \"WNAM\", \"ME\", \"OC\", \"SAM\", or \"WEUR\".",
+        "type": "string"
       },
       "type": "array"
     }
@@ -22,35 +23,11 @@ export const cc_ApplicationConstraints: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_ApplicationID`.
- */
-export const cc_ApplicationID: JsonSchema = {
-  "description": "An Application ID represents an identifier of an application.",
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ApplicationJurisdiction`.
- */
-export const cc_ApplicationJurisdiction: JsonSchema = {
-  "description": "Restricts placement to datacenters in the selected jurisdiction. Choose \"eu\", \"fedramp\", or \"us\". When combined with regions, EU supports EEUR and WEUR while FedRAMP and US support ENAM and WNAM.",
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ApplicationName`.
- */
-export const cc_ApplicationName: JsonSchema = {
-  "description": "The application name.",
-  "type": "string"
-};
-
 /**
  * The schema of `cc_ApplicationObservability`.
  */
 export const cc_ApplicationObservability: JsonSchema = {
-  "description": "Settings for application observability such as logging. Supported fields depend\non the application's scheduling policy. Durable Object-managed applications\naccept only `logs.enabled`.\n",
+  "description": "Settings for application observability such as logging. Supported fields depend\non the application's scheduling policy. Durable Object-managed applications\naccept only `logs.enabled`.",
   "properties": {
     "logs": {
       "$ref": "#/$defs/cc_ObservabilityLogs",
@@ -60,21 +37,13 @@ export const cc_ApplicationObservability: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_ApplicationRolloutActiveGracePeriod`.
- */
-export const cc_ApplicationRolloutActiveGracePeriod: JsonSchema = {
-  "description": "Grace period for active instances to stay alive before becoming eligible for shutdown signal due to a rollout, in seconds.\nDefaults to 0.\n",
-  "type": "integer"
-};
-
 /**
  * The schema of `cc_Command`.
  */
 export const cc_Command: JsonSchema = {
-  "description": "The command that runs when the container starts, passed to the entrypoint.\nYou can override this at run-time. If you override only the command,\nit gets passed to the default entrypoint specified in the image.\n",
+  "description": "The command that runs when the container starts, passed to the entrypoint.\nYou can override this at run-time. If you override only the command,\nit gets passed to the default entrypoint specified in the image.",
   "items": {
-    "$ref": "#/$defs/cc_ExecFormParam"
+    "type": "string"
   },
   "type": "array"
 };
@@ -83,7 +52,7 @@ export const cc_Command: JsonSchema = {
  * The schema of `cc_ContainersCreateApplicationRequest`.
  */
 export const cc_ContainersCreateApplicationRequest: JsonSchema = {
-  "description": "Create a Containers application.\nSet `scheduling_policy` to `default` for a\nscheduler-backed application with deployment configuration, instance counts,\nconstraints, versions, and rollouts. Set it to `durable_object` for a\nDurable Object-managed application where each Durable Object creates and manages\nthe lifecycle of its container instance. For `durable_object` requests, supply\n`name`, `scheduling_policy`, and `durable_objects`, with optional `configuration`\nand top-level `observability` settings.\n",
+  "description": "Create a Containers application.\nSet `scheduling_policy` to `default` for a\nscheduler-backed application with deployment configuration, instance counts,\nconstraints, versions, and rollouts. Set it to `durable_object` for a\nDurable Object-managed application where each Durable Object creates and manages\nthe lifecycle of its container instance. For `durable_object` requests, supply\n`name`, `scheduling_policy`, and `durable_objects`, with optional `configuration`\nand top-level `observability` settings.",
   "oneOf": [
     {
       "$ref": "#/$defs/cc_ContainersCreateScheduledApplicationRequest"
@@ -98,7 +67,7 @@ export const cc_ContainersCreateApplicationRequest: JsonSchema = {
  * The schema of `cc_ContainersCreateDurableObjectApplicationRequest`.
  */
 export const cc_ContainersCreateDurableObjectApplicationRequest: JsonSchema = {
-  "description": "Create a Durable Object-managed Containers application. Each Durable Object\ncreates and manages the lifecycle of its container instance. Supply `name`,\n`scheduling_policy`, and `durable_objects`, with optional `configuration` and\ntop-level `observability` settings. `constraints.jurisdiction` selects the\njurisdiction of the application's primary control-plane object at creation time.\nDeployment configuration, instance counts, scaling, other placement constraints,\nversions, and rollouts do not apply.\n",
+  "description": "Create a Durable Object-managed Containers application. Each Durable Object\ncreates and manages the lifecycle of its container instance. Supply `name`,\n`scheduling_policy`, and `durable_objects`, with optional `configuration` and\ntop-level `observability` settings. `constraints.jurisdiction` selects the\njurisdiction of the application's primary control-plane object at creation time.\nDeployment configuration, instance counts, scaling, other placement constraints,\nversions, and rollouts do not apply.",
   "properties": {
     "configuration": {
       "$ref": "#/$defs/cc_DurableObjectApplicationConfiguration",
@@ -106,7 +75,7 @@ export const cc_ContainersCreateDurableObjectApplicationRequest: JsonSchema = {
     },
     "constraints": {
       "$ref": "#/$defs/cc_DurableObjectApplicationConstraints",
-      "description": "The jurisdiction of a Durable Object-managed application's primary control-plane object.\nSet this when creating the application; it cannot be changed afterwards.\nOther placement constraints are not supported by this scheduling policy.\n"
+      "description": "The jurisdiction of a Durable Object-managed application's primary control-plane object.\nSet this when creating the application; it cannot be changed afterwards.\nOther placement constraints are not supported by this scheduling policy."
     },
     "durable_objects": {
       "$ref": "#/$defs/cc_DurableObjectsConfiguration",
@@ -118,10 +87,14 @@ export const cc_ContainersCreateDurableObjectApplicationRequest: JsonSchema = {
     },
     "observability": {
       "$ref": "#/$defs/cc_DurableObjectApplicationObservability",
-      "description": "Application-wide logging settings for a Durable Object-managed application.\nThe application publishes these settings to its runtime metadata. Updating\nthem does not create a deployment or rollout.\n"
+      "description": "Application-wide logging settings for a Durable Object-managed application.\nThe application publishes these settings to its runtime metadata. Updating\nthem does not create a deployment or rollout."
     },
     "scheduling_policy": {
-      "$ref": "#/$defs/cc_DurableObjectApplicationSchedulingPolicy"
+      "description": "Selects a Durable Object-managed application. Each Durable Object creates and\nmanages the lifecycle of its container instance. Configure application-wide\nobservability settings here. Deployment configuration, scaling, placement\nconstraints, versions, and rollouts do not apply.",
+      "enum": [
+        "durable_object"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -136,11 +109,11 @@ export const cc_ContainersCreateDurableObjectApplicationRequest: JsonSchema = {
  * The schema of `cc_ContainersCreateScheduledApplicationRequest`.
  */
 export const cc_ContainersCreateScheduledApplicationRequest: JsonSchema = {
-  "description": "Create a scheduler-backed Containers application. The Containers scheduler\nmaintains the requested instance count and applies deployment configuration,\nplacement, scaling, versions, and rollouts.\n",
+  "description": "Create a scheduler-backed Containers application. The Containers scheduler\nmaintains the requested instance count and applies deployment configuration,\nplacement, scaling, versions, and rollouts.",
   "properties": {
     "configuration": {
       "$ref": "#/$defs/cc_UserDeploymentConfiguration",
-      "description": "Defines the deployment configuration for every deployment in this application.\n"
+      "description": "Defines the deployment configuration for every deployment in this application."
     },
     "constraints": {
       "$ref": "#/$defs/cc_ApplicationConstraints"
@@ -163,15 +136,19 @@ export const cc_ContainersCreateScheduledApplicationRequest: JsonSchema = {
     },
     "observability": {
       "$ref": "#/$defs/cc_ApplicationObservability",
-      "description": "Top-level observability settings for the application.\nThis field is mutually exclusive with configuration.observability.\n"
+      "description": "Top-level observability settings for the application.\nThis field is mutually exclusive with configuration.observability."
     },
     "rollout_active_grace_period": {
-      "$ref": "#/$defs/cc_ApplicationRolloutActiveGracePeriod",
       "default": 0,
-      "description": "Grace period for active instances to stay alive before becoming eligible for shutdown signal due to a rollout, in seconds.\nDefaults to 0.\n"
+      "description": "Grace period for active instances to stay alive before becoming eligible for shutdown signal due to a rollout, in seconds.\nDefaults to 0.",
+      "type": "integer"
     },
     "scheduling_policy": {
-      "$ref": "#/$defs/cc_ScheduledApplicationSchedulingPolicy"
+      "description": "Selects a scheduler-backed application. Use `default` when the Containers\nscheduler should maintain the requested number of instances and manage deployment\nconfiguration, placement, scaling, versions, and rollouts.",
+      "enum": [
+        "default"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -208,7 +185,7 @@ export const cc_ContainersModifyApplicationConfiguration: JsonSchema = {
  * The schema of `cc_ContainersModifyApplicationRequestBody`.
  */
 export const cc_ContainersModifyApplicationRequestBody: JsonSchema = {
-  "description": "Request body for modifying a Containers application without replacing its instances.\nDurable Object-managed applications support only top-level observability.logs.enabled.\nThe other fields apply to scheduler-backed applications, where deployment configuration\nchanges such as image, resource allocation, command, and environment variables require\nan application rollout.\n",
+  "description": "Request body for modifying a Containers application without replacing its instances.\nDurable Object-managed applications support only top-level observability.logs.enabled.\nThe other fields apply to scheduler-backed applications, where deployment configuration\nchanges such as image, resource allocation, command, and environment variables require\nan application rollout.",
   "properties": {
     "configuration": {
       "$ref": "#/$defs/cc_ContainersModifyApplicationConfiguration",
@@ -223,12 +200,12 @@ export const cc_ContainersModifyApplicationRequestBody: JsonSchema = {
     },
     "observability": {
       "$ref": "#/$defs/cc_ApplicationObservability",
-      "description": "Top-level application observability settings. Scheduler-backed applications\nhot-reload these settings across existing instances. An existing Durable\nObject-managed application accepts only `logs.enabled` and publishes these settings\nto runtime metadata without creating deployments or rollouts.\n"
+      "description": "Top-level application observability settings. Scheduler-backed applications\nhot-reload these settings across existing instances. An existing Durable\nObject-managed application accepts only `logs.enabled` and publishes these settings\nto runtime metadata without creating deployments or rollouts."
     },
     "rollout_active_grace_period": {
-      "$ref": "#/$defs/cc_ApplicationRolloutActiveGracePeriod",
       "default": 0,
-      "description": "Grace period for active instances to stay alive before becoming eligible for shutdown signal due to a rollout, in seconds.\nDefaults to 0.\n"
+      "description": "Grace period for active instances to stay alive before becoming eligible for shutdown signal due to a rollout, in seconds.\nDefaults to 0.",
+      "type": "integer"
     }
   },
   "type": "object"
@@ -272,7 +249,7 @@ export const cc_DurableObjectApplicationConfiguration: JsonSchema = {
  * The schema of `cc_DurableObjectApplicationConstraints`.
  */
 export const cc_DurableObjectApplicationConstraints: JsonSchema = {
-  "description": "The jurisdiction of a Durable Object-managed application's primary control-plane object.\nSet this when creating the application; it cannot be changed afterwards.\nOther placement constraints are not supported by this scheduling policy.\n",
+  "description": "The jurisdiction of a Durable Object-managed application's primary control-plane object.\nSet this when creating the application; it cannot be changed afterwards.\nOther placement constraints are not supported by this scheduling policy.",
   "properties": {
     "jurisdiction": {
       "enum": [
@@ -293,7 +270,7 @@ export const cc_DurableObjectApplicationConstraints: JsonSchema = {
  * The schema of `cc_DurableObjectApplicationObservability`.
  */
 export const cc_DurableObjectApplicationObservability: JsonSchema = {
-  "description": "Application-wide logging settings for a Durable Object-managed application.\nThe application publishes these settings to its runtime metadata. Updating\nthem does not create a deployment or rollout.\n",
+  "description": "Application-wide logging settings for a Durable Object-managed application.\nThe application publishes these settings to its runtime metadata. Updating\nthem does not create a deployment or rollout.",
   "properties": {
     "logs": {
       "description": "Application-wide logging settings.",
@@ -309,17 +286,6 @@ export const cc_DurableObjectApplicationObservability: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_DurableObjectApplicationSchedulingPolicy`.
- */
-export const cc_DurableObjectApplicationSchedulingPolicy: JsonSchema = {
-  "description": "Selects a Durable Object-managed application. Each Durable Object creates and\nmanages the lifecycle of its container instance. Configure application-wide\nobservability settings here. Deployment configuration, scaling, placement\nconstraints, versions, and rollouts do not apply.\n",
-  "enum": [
-    "durable_object"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cc_DurableObjectsConfiguration`.
  */
@@ -378,9 +344,9 @@ export const cc_DurableObjectsConfigurationScriptAndClass: JsonSchema = {
  * The schema of `cc_Entrypoint`.
  */
 export const cc_Entrypoint: JsonSchema = {
-  "description": "The entry point for the container, specifying the executable to run when the container starts.\nYou can override this at run-time. If you do, the default command from the image is ignored.\nSpecify both entrypoint and command at run-time to completely replace the image defaults.\n",
+  "description": "The entry point for the container, specifying the executable to run when the container starts.\nYou can override this at run-time. If you do, the default command from the image is ignored.\nSpecify both entrypoint and command at run-time to completely replace the image defaults.",
   "items": {
-    "$ref": "#/$defs/cc_ExecFormParam"
+    "type": "string"
   },
   "type": "array"
 };
@@ -392,12 +358,12 @@ export const cc_EnvironmentVariable: JsonSchema = {
   "description": "An environment variable with a value set.",
   "properties": {
     "name": {
-      "$ref": "#/$defs/cc_EnvironmentVariableName",
-      "description": "An environment variable name."
+      "description": "An environment variable name.",
+      "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/cc_EnvironmentVariableValue",
-      "description": "An environment variable value."
+      "description": "An environment variable value.",
+      "type": "string"
     }
   },
   "required": [
@@ -407,45 +373,6 @@ export const cc_EnvironmentVariable: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_EnvironmentVariableName`.
- */
-export const cc_EnvironmentVariableName: JsonSchema = {
-  "description": "An environment variable name.",
-  "type": "string"
-};
-
-/**
- * The schema of `cc_EnvironmentVariableValue`.
- */
-export const cc_EnvironmentVariableValue: JsonSchema = {
-  "description": "An environment variable value.",
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ExecFormParam`.
- */
-export const cc_ExecFormParam: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_InstanceType`.
- */
-export const cc_InstanceType: JsonSchema = {
-  "description": "The instance type configures vCPU, memory, and disk.\n\n- \"lite\": 1/16 vCPU, 256 MiB memory, 2 GB disk\n- \"basic\": 1/4 vCPU, 1 GiB memory, 4 GB disk\n- \"standard-1\": 1/2 vCPU, 4 GiB memory, 8 GB disk\n- \"standard-2\": 1 vCPU, 6 GiB memory, 12 GB disk\n- \"standard-3\": 2 vCPU, 8 GiB memory, 16 GB disk\n- \"standard-4\": 4 vCPU, 12 GiB memory, 20 GB disk\n",
-  "enum": [
-    "lite",
-    "basic",
-    "standard-1",
-    "standard-2",
-    "standard-3",
-    "standard-4"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cc_ModifyUserDeploymentConfiguration`.
  */
@@ -460,11 +387,11 @@ export const cc_ModifyUserDeploymentConfiguration: JsonSchema = {
     },
     "command": {
       "$ref": "#/$defs/cc_Command",
-      "description": "The command that runs when the container starts, passed to the entrypoint.\nYou can override this at run-time. If you override only the command,\nit gets passed to the default entrypoint specified in the image.\n"
+      "description": "The command that runs when the container starts, passed to the entrypoint.\nYou can override this at run-time. If you override only the command,\nit gets passed to the default entrypoint specified in the image."
     },
     "entrypoint": {
       "$ref": "#/$defs/cc_Entrypoint",
-      "description": "The entry point for the container, specifying the executable to run when the container starts.\nYou can override this at run-time. If you do, the default command from the image is ignored.\nSpecify both entrypoint and command at run-time to completely replace the image defaults.\n"
+      "description": "The entry point for the container, specifying the executable to run when the container starts.\nYou can override this at run-time. If you do, the default command from the image is ignored.\nSpecify both entrypoint and command at run-time to completely replace the image defaults."
     },
     "environment_variables": {
       "description": "Container environment variables.",
@@ -474,13 +401,21 @@ export const cc_ModifyUserDeploymentConfiguration: JsonSchema = {
       "type": "array"
     },
     "image": {
-      "$ref": "#/$defs/cc_Image",
-      "description": "Image url."
+      "description": "Image url.",
+      "type": "string"
     },
     "instance_type": {
-      "$ref": "#/$defs/cc_InstanceType",
       "default": "lite",
-      "description": "The instance type configures vCPU, memory, and disk.\n\n- \"lite\": 1/16 vCPU, 256 MiB memory, 2 GB disk\n- \"basic\": 1/4 vCPU, 1 GiB memory, 4 GB disk\n- \"standard-1\": 1/2 vCPU, 4 GiB memory, 8 GB disk\n- \"standard-2\": 1 vCPU, 6 GiB memory, 12 GB disk\n- \"standard-3\": 2 vCPU, 8 GiB memory, 16 GB disk\n- \"standard-4\": 4 vCPU, 12 GiB memory, 20 GB disk\n"
+      "description": "The instance type configures vCPU, memory, and disk.\n\n- \"lite\": 1/16 vCPU, 256 MiB memory, 2 GB disk\n- \"basic\": 1/4 vCPU, 1 GiB memory, 4 GB disk\n- \"standard-1\": 1/2 vCPU, 4 GiB memory, 8 GB disk\n- \"standard-2\": 1 vCPU, 6 GiB memory, 12 GB disk\n- \"standard-3\": 2 vCPU, 8 GiB memory, 16 GB disk\n- \"standard-4\": 4 vCPU, 12 GiB memory, 20 GB disk",
+      "enum": [
+        "lite",
+        "basic",
+        "standard-1",
+        "standard-2",
+        "standard-3",
+        "standard-4"
+      ],
+      "type": "string"
     },
     "observability": {
       "$ref": "#/$defs/cc_DeploymentObservability",
@@ -504,33 +439,6 @@ export const cc_ObservabilityLogs: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_Region`.
- */
-export const cc_Region: JsonSchema = {
-  "description": "Represents a group of datacenters. Choose one of \"AFR\", \"APAC\", \"EEUR\", \"ENAM\", \"WNAM\", \"ME\", \"OC\", \"SAM\", or \"WEUR\".\n",
-  "type": "string"
-};
-
-/**
- * The schema of `cc_SSHPublicKey`.
- */
-export const cc_SSHPublicKey: JsonSchema = {
-  "description": "An SSH public key.",
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ScheduledApplicationSchedulingPolicy`.
- */
-export const cc_ScheduledApplicationSchedulingPolicy: JsonSchema = {
-  "description": "Selects a scheduler-backed application. Use `default` when the Containers\nscheduler should maintain the requested number of instances and manage deployment\nconfiguration, placement, scaling, versions, and rollouts.\n",
-  "enum": [
-    "default"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cc_UserDeploymentConfiguration`.
  */
@@ -545,11 +453,11 @@ export const cc_UserDeploymentConfiguration: JsonSchema = {
     },
     "command": {
       "$ref": "#/$defs/cc_Command",
-      "description": "The command that runs when the container starts, passed to the entrypoint.\nYou can override this at run-time. If you override only the command,\nit gets passed to the default entrypoint specified in the image.\n"
+      "description": "The command that runs when the container starts, passed to the entrypoint.\nYou can override this at run-time. If you override only the command,\nit gets passed to the default entrypoint specified in the image."
     },
     "entrypoint": {
       "$ref": "#/$defs/cc_Entrypoint",
-      "description": "The entry point for the container, specifying the executable to run when the container starts.\nYou can override this at run-time. If you do, the default command from the image is ignored.\nSpecify both entrypoint and command at run-time to completely replace the image defaults.\n"
+      "description": "The entry point for the container, specifying the executable to run when the container starts.\nYou can override this at run-time. If you do, the default command from the image is ignored.\nSpecify both entrypoint and command at run-time to completely replace the image defaults."
     },
     "environment_variables": {
       "description": "Container environment variables.",
@@ -559,13 +467,21 @@ export const cc_UserDeploymentConfiguration: JsonSchema = {
       "type": "array"
     },
     "image": {
-      "$ref": "#/$defs/cc_Image",
-      "description": "Image url."
+      "description": "Image url.",
+      "type": "string"
     },
     "instance_type": {
-      "$ref": "#/$defs/cc_InstanceType",
       "default": "lite",
-      "description": "The instance type configures vCPU, memory, and disk.\n\n- \"lite\": 1/16 vCPU, 256 MiB memory, 2 GB disk\n- \"basic\": 1/4 vCPU, 1 GiB memory, 4 GB disk\n- \"standard-1\": 1/2 vCPU, 4 GiB memory, 8 GB disk\n- \"standard-2\": 1 vCPU, 6 GiB memory, 12 GB disk\n- \"standard-3\": 2 vCPU, 8 GiB memory, 16 GB disk\n- \"standard-4\": 4 vCPU, 12 GiB memory, 20 GB disk\n"
+      "description": "The instance type configures vCPU, memory, and disk.\n\n- \"lite\": 1/16 vCPU, 256 MiB memory, 2 GB disk\n- \"basic\": 1/4 vCPU, 1 GiB memory, 4 GB disk\n- \"standard-1\": 1/2 vCPU, 4 GiB memory, 8 GB disk\n- \"standard-2\": 1 vCPU, 6 GiB memory, 12 GB disk\n- \"standard-3\": 2 vCPU, 8 GiB memory, 16 GB disk\n- \"standard-4\": 4 vCPU, 12 GiB memory, 20 GB disk",
+      "enum": [
+        "lite",
+        "basic",
+        "standard-1",
+        "standard-2",
+        "standard-3",
+        "standard-4"
+      ],
+      "type": "string"
     },
     "observability": {
       "$ref": "#/$defs/cc_DeploymentObservability",
@@ -589,8 +505,8 @@ export const cc_UserSSHPublicKey: JsonSchema = {
       "type": "string"
     },
     "public_key": {
-      "$ref": "#/$defs/cc_SSHPublicKey",
-      "description": "An SSH public key."
+      "description": "An SSH public key.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/containers/applications/tools.ts b/src/generated/forge-mcp/containers/applications/tools.ts
index 4a53c8d92..92930bcc6 100644
--- a/src/generated/forge-mcp/containers/applications/tools.ts
+++ b/src/generated/forge-mcp/containers/applications/tools.ts
@@ -1,97 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  cc_AccountID_output,
-  cc_ISO8601Timestamp_output,
-  cc_Image_output,
-  cc_Messages_output,
-  cc_V4BaseErrorResponse_output,
-  cc_V4BaseResponse_output,
+  cc_Messages,
+  cc_V4BaseErrorResponse,
+  cc_V4BaseResponse,
 } from "../outputs.js";
-import { cc_Image } from "../schemas.js";
-import {
-  cc_ApplicationConstraints_output,
-  cc_ApplicationDurableObjectsConfiguration_output,
-  cc_ApplicationHealthError_output,
-  cc_ApplicationHealthErrors_output,
-  cc_ApplicationHealthInstances_output,
-  cc_ApplicationHealth_output,
-  cc_ApplicationID_output,
-  cc_ApplicationJurisdiction_output,
-  cc_ApplicationName_output,
-  cc_ApplicationObservability_output,
-  cc_ApplicationRolloutActiveGracePeriod_output,
-  cc_Application_output,
-  cc_Command_output,
-  cc_ContainersApplicationResponse_output,
-  cc_ContainersDeleteApplicationResponseBody_output,
-  cc_ContainersListApplications_output,
-  cc_DeploymentObservability_output,
-  cc_DurableObjectApplicationConfiguration_output,
-  cc_DurableObjectApplicationConstraints_output,
-  cc_DurableObjectApplicationHealth_output,
-  cc_DurableObjectApplicationObservability_output,
-  cc_DurableObjectApplicationSchedulingPolicy_output,
-  cc_DurableObjectApplication_output,
-  cc_DurableObjectsConfigurationNamespaceId_output,
-  cc_Entrypoint_output,
-  cc_EnvironmentVariableName_output,
-  cc_EnvironmentVariableValue_output,
-  cc_EnvironmentVariable_output,
-  cc_EventName_output,
-  cc_EventType_output,
-  cc_ExecFormParam_output,
-  cc_InstanceID_output,
-  cc_InstanceType_output,
-  cc_ObservabilityLogs_output,
-  cc_PlacementEvent_output,
-  cc_Region_output,
-  cc_RolloutID_output,
-  cc_SSHPublicKey_output,
-  cc_ScheduledApplicationSchedulingPolicy_output,
-  cc_ScheduledApplication_output,
-  cc_SchedulingPolicy_output,
-  cc_UserDeploymentConfiguration_output,
-  cc_UserSSHPublicKey_output,
-  cc_V4PaginatedResultInfo_output,
-  cc_WranglerSSHConfig_output,
-} from "./outputs.js";
 import {
+  cc_Application,
   cc_ApplicationConstraints,
-  cc_ApplicationID,
-  cc_ApplicationJurisdiction,
-  cc_ApplicationName,
+  cc_ApplicationDurableObjectsConfiguration,
+  cc_ApplicationHealth,
+  cc_ApplicationHealthError,
+  cc_ApplicationHealthErrors,
+  cc_ApplicationHealthInstances,
   cc_ApplicationObservability,
-  cc_ApplicationRolloutActiveGracePeriod,
   cc_Command,
-  cc_ContainersCreateApplicationRequest,
-  cc_ContainersCreateDurableObjectApplicationRequest,
-  cc_ContainersCreateScheduledApplicationRequest,
-  cc_ContainersModifyApplicationConfiguration,
-  cc_ContainersModifyApplicationRequestBody,
+  cc_ContainersApplicationResponse,
+  cc_ContainersDeleteApplicationResponseBody,
+  cc_ContainersListApplications,
   cc_DeploymentObservability,
+  cc_DurableObjectApplication,
   cc_DurableObjectApplicationConfiguration,
   cc_DurableObjectApplicationConstraints,
+  cc_DurableObjectApplicationHealth,
   cc_DurableObjectApplicationObservability,
-  cc_DurableObjectApplicationSchedulingPolicy,
-  cc_DurableObjectsConfiguration,
   cc_DurableObjectsConfigurationNamespaceId,
-  cc_DurableObjectsConfigurationScriptAndClass,
   cc_Entrypoint,
   cc_EnvironmentVariable,
-  cc_EnvironmentVariableName,
-  cc_EnvironmentVariableValue,
-  cc_ExecFormParam,
-  cc_InstanceType,
   cc_ObservabilityLogs,
-  cc_Region,
-  cc_SSHPublicKey,
-  cc_ScheduledApplicationSchedulingPolicy,
+  cc_PlacementEvent,
+  cc_ScheduledApplication,
   cc_UserDeploymentConfiguration,
   cc_UserSSHPublicKey,
+  cc_V4PaginatedResultInfo,
   cc_WranglerSSHConfig,
+} from "./outputs.js";
+import {
+  cc_ApplicationConstraints as cc_ApplicationConstraints$,
+  cc_ApplicationObservability as cc_ApplicationObservability$,
+  cc_Command as cc_Command$,
+  cc_ContainersCreateApplicationRequest,
+  cc_ContainersCreateDurableObjectApplicationRequest,
+  cc_ContainersCreateScheduledApplicationRequest,
+  cc_ContainersModifyApplicationConfiguration,
+  cc_ContainersModifyApplicationRequestBody,
+  cc_DeploymentObservability as cc_DeploymentObservability$,
+  cc_DurableObjectApplicationConfiguration as cc_DurableObjectApplicationConfiguration$,
+  cc_DurableObjectApplicationConstraints as cc_DurableObjectApplicationConstraints$,
+  cc_DurableObjectApplicationObservability as cc_DurableObjectApplicationObservability$,
+  cc_DurableObjectsConfiguration,
+  cc_DurableObjectsConfigurationNamespaceId as cc_DurableObjectsConfigurationNamespaceId$,
+  cc_DurableObjectsConfigurationScriptAndClass,
+  cc_Entrypoint as cc_Entrypoint$,
+  cc_EnvironmentVariable as cc_EnvironmentVariable$,
+  cc_ObservabilityLogs as cc_ObservabilityLogs$,
+  cc_UserDeploymentConfiguration as cc_UserDeploymentConfiguration$,
+  cc_UserSSHPublicKey as cc_UserSSHPublicKey$,
+  cc_WranglerSSHConfig as cc_WranglerSSHConfig$,
 } from "./schemas.js";
 
 /**
@@ -101,53 +68,52 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_create",
     title: "Create a new application",
-    description: "Create a Containers application.\n\nUse `scheduling_policy: \"default\"` for a scheduler-backed application. The\nContainers scheduler maintains the requested instance count and manages\ndeployment configuration, placement, scaling, versions, and rollouts.\n\nUse `scheduling_policy: \"durable_object\"` for a Durable Object-managed\napplication. Each Durable Object creates and manages the lifecycle of its\ncontainer instance. Supply `name`, `scheduling_policy`, and `durable_objects`,\nwith optional `configuration` and optional top-level `observability` settings.\nDeployment configuration, scaling, constraints, versions, and rollouts do not apply.",
+    description: "Create a Containers application.\n\nUse `scheduling_policy: \"default\"` for a scheduler-backed application. The\nContainers scheduler maintains the requested instance count and manages\ndeployment configuration, placement, scaling, versions, and rollouts.\n\nUse `scheduling_policy: \"durable_object\"` for a Durable Object-managed\napplication. Each Durable Object creates and manages the lifecycle of its\ncontainer instance. Supply `name`, `scheduling_policy`, and `durable_objects`,\nwith optional `configuration` and optional top-level `observability` settings.\nDeployment configuration, scaling, constraints, versions, and rollouts do not apply.\n\nPOST /accounts/{account_id}/containers/applications",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cc_ContainersCreateApplicationRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cc_ApplicationConstraints": cc_ApplicationConstraints,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction,
-        "cc_ApplicationObservability": cc_ApplicationObservability,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod,
-        "cc_Command": cc_Command,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints$,
+        "cc_ApplicationObservability": cc_ApplicationObservability$,
+        "cc_Command": cc_Command$,
         "cc_ContainersCreateApplicationRequest": cc_ContainersCreateApplicationRequest,
         "cc_ContainersCreateDurableObjectApplicationRequest": cc_ContainersCreateDurableObjectApplicationRequest,
         "cc_ContainersCreateScheduledApplicationRequest": cc_ContainersCreateScheduledApplicationRequest,
-        "cc_DeploymentObservability": cc_DeploymentObservability,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy,
+        "cc_DeploymentObservability": cc_DeploymentObservability$,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration$,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints$,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability$,
         "cc_DurableObjectsConfiguration": cc_DurableObjectsConfiguration,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId$,
         "cc_DurableObjectsConfigurationScriptAndClass": cc_DurableObjectsConfigurationScriptAndClass,
-        "cc_Entrypoint": cc_Entrypoint,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue,
-        "cc_ExecFormParam": cc_ExecFormParam,
-        "cc_Image": cc_Image,
-        "cc_InstanceType": cc_InstanceType,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs,
-        "cc_Region": cc_Region,
-        "cc_SSHPublicKey": cc_SSHPublicKey,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
+        "cc_Entrypoint": cc_Entrypoint$,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable$,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs$,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration$,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey$,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig$,
       },
     },
     outputSchema: {
@@ -168,53 +134,33 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_Application": cc_Application_output,
-        "cc_ApplicationConstraints": cc_ApplicationConstraints_output,
-        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration_output,
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction_output,
-        "cc_ApplicationName": cc_ApplicationName_output,
-        "cc_ApplicationObservability": cc_ApplicationObservability_output,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod_output,
-        "cc_Command": cc_Command_output,
-        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_DurableObjectApplication": cc_DurableObjectApplication_output,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration_output,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints_output,
-        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth_output,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability_output,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy_output,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_Region": cc_Region_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_ScheduledApplication": cc_ScheduledApplication_output,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy_output,
-        "cc_SchedulingPolicy": cc_SchedulingPolicy_output,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig_output,
+        "cc_Application": cc_Application,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints,
+        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationObservability": cc_ApplicationObservability,
+        "cc_Command": cc_Command,
+        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_DurableObjectApplication": cc_DurableObjectApplication,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
+        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_ScheduledApplication": cc_ScheduledApplication,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
       },
     },
     annotations: {
@@ -260,54 +206,34 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_Application": cc_Application_output,
-        "cc_ApplicationConstraints": cc_ApplicationConstraints_output,
-        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration_output,
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction_output,
-        "cc_ApplicationName": cc_ApplicationName_output,
-        "cc_ApplicationObservability": cc_ApplicationObservability_output,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod_output,
-        "cc_Command": cc_Command_output,
-        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_DurableObjectApplication": cc_DurableObjectApplication_output,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration_output,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints_output,
-        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth_output,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability_output,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy_output,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_Region": cc_Region_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_ScheduledApplication": cc_ScheduledApplication_output,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy_output,
-        "cc_SchedulingPolicy": cc_SchedulingPolicy_output,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig_output,
+        "cc_Application": cc_Application,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints,
+        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationObservability": cc_ApplicationObservability,
+        "cc_Command": cc_Command,
+        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_DurableObjectApplication": cc_DurableObjectApplication,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
+        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_ScheduledApplication": cc_ScheduledApplication,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
       },
     },
     request: (args) => ({
@@ -318,26 +244,33 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_delete",
     title: "Delete a single application by id",
-    description: "Deletes a single application by id.\n\nConfirm with the user before calling this tool. This operation permanently deletes the application and stops its containers.",
+    description: "Deletes a single application by id.\n\nConfirm with the user before calling this tool. This operation permanently deletes the application and stops its containers.\n\nDELETE /accounts/{account_id}/containers/applications/{application_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "$ref": "#/$defs/cc_ApplicationID",
-          "description": "An Application ID represents an identifier of an application."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "An Application ID represents an identifier of an application.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id"
+        "path"
       ],
-      $defs: {
-        "cc_ApplicationID": cc_ApplicationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -357,9 +290,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_ContainersDeleteApplicationResponseBody": cc_ContainersDeleteApplicationResponseBody_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainersDeleteApplicationResponseBody": cc_ContainersDeleteApplicationResponseBody,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -407,10 +340,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_ContainersDeleteApplicationResponseBody": cc_ContainersDeleteApplicationResponseBody_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainersDeleteApplicationResponseBody": cc_ContainersDeleteApplicationResponseBody,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
@@ -420,40 +353,45 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_edit",
     title: "Modify an application",
-    description: "Modifies a single application by id. Durable Object-managed application settings are\npublished to runtime metadata without creating deployments or rollouts. Top-level\n`observability` for these applications supports only `logs.enabled`.\nThe supported fields depend on the existing\napplication's scheduling policy. For scheduler-backed applications, changes that\nreplace instance deployment configuration, including the image, require a rollout.",
+    description: "Modifies a single application by id. Durable Object-managed application settings are\npublished to runtime metadata without creating deployments or rollouts. Top-level\n`observability` for these applications supports only `logs.enabled`.\nThe supported fields depend on the existing\napplication's scheduling policy. For scheduler-backed applications, changes that\nreplace instance deployment configuration, including the image, require a rollout.\n\nPATCH /accounts/{account_id}/containers/applications/{application_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "$ref": "#/$defs/cc_ApplicationID",
-          "description": "An Application ID represents an identifier of an application."
-        },
         "body": {
           "$ref": "#/$defs/cc_ContainersModifyApplicationRequestBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "An Application ID represents an identifier of an application.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cc_ApplicationConstraints": cc_ApplicationConstraints,
-        "cc_ApplicationID": cc_ApplicationID,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction,
-        "cc_ApplicationObservability": cc_ApplicationObservability,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints$,
+        "cc_ApplicationObservability": cc_ApplicationObservability$,
         "cc_ContainersModifyApplicationConfiguration": cc_ContainersModifyApplicationConfiguration,
         "cc_ContainersModifyApplicationRequestBody": cc_ContainersModifyApplicationRequestBody,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs,
-        "cc_Region": cc_Region,
-        "cc_SSHPublicKey": cc_SSHPublicKey,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs$,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey$,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig$,
       },
     },
     outputSchema: {
@@ -474,53 +412,33 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_Application": cc_Application_output,
-        "cc_ApplicationConstraints": cc_ApplicationConstraints_output,
-        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration_output,
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction_output,
-        "cc_ApplicationName": cc_ApplicationName_output,
-        "cc_ApplicationObservability": cc_ApplicationObservability_output,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod_output,
-        "cc_Command": cc_Command_output,
-        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_DurableObjectApplication": cc_DurableObjectApplication_output,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration_output,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints_output,
-        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth_output,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability_output,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy_output,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_Region": cc_Region_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_ScheduledApplication": cc_ScheduledApplication_output,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy_output,
-        "cc_SchedulingPolicy": cc_SchedulingPolicy_output,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig_output,
+        "cc_Application": cc_Application,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints,
+        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationObservability": cc_ApplicationObservability,
+        "cc_Command": cc_Command,
+        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_DurableObjectApplication": cc_DurableObjectApplication,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
+        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_ScheduledApplication": cc_ScheduledApplication,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
       },
     },
     annotations: {
@@ -574,54 +492,34 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_Application": cc_Application_output,
-        "cc_ApplicationConstraints": cc_ApplicationConstraints_output,
-        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration_output,
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction_output,
-        "cc_ApplicationName": cc_ApplicationName_output,
-        "cc_ApplicationObservability": cc_ApplicationObservability_output,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod_output,
-        "cc_Command": cc_Command_output,
-        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_DurableObjectApplication": cc_DurableObjectApplication_output,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration_output,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints_output,
-        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth_output,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability_output,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy_output,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_Region": cc_Region_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_ScheduledApplication": cc_ScheduledApplication_output,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy_output,
-        "cc_SchedulingPolicy": cc_SchedulingPolicy_output,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig_output,
+        "cc_Application": cc_Application,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints,
+        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationObservability": cc_ApplicationObservability,
+        "cc_Command": cc_Command,
+        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_DurableObjectApplication": cc_DurableObjectApplication,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
+        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_ScheduledApplication": cc_ScheduledApplication,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
       },
     },
     request: (args) => ({
@@ -632,26 +530,33 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_get",
     title: "Get a single application by id",
-    description: "Returns a single application by id.",
+    description: "Returns a single application by id.\n\nGET /accounts/{account_id}/containers/applications/{application_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "$ref": "#/$defs/cc_ApplicationID",
-          "description": "An Application ID represents an identifier of an application."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "An Application ID represents an identifier of an application.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id"
+        "path"
       ],
-      $defs: {
-        "cc_ApplicationID": cc_ApplicationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -671,53 +576,33 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_Application": cc_Application_output,
-        "cc_ApplicationConstraints": cc_ApplicationConstraints_output,
-        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration_output,
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction_output,
-        "cc_ApplicationName": cc_ApplicationName_output,
-        "cc_ApplicationObservability": cc_ApplicationObservability_output,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod_output,
-        "cc_Command": cc_Command_output,
-        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_DurableObjectApplication": cc_DurableObjectApplication_output,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration_output,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints_output,
-        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth_output,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability_output,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy_output,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_Region": cc_Region_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_ScheduledApplication": cc_ScheduledApplication_output,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy_output,
-        "cc_SchedulingPolicy": cc_SchedulingPolicy_output,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig_output,
+        "cc_Application": cc_Application,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints,
+        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationObservability": cc_ApplicationObservability,
+        "cc_Command": cc_Command,
+        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_DurableObjectApplication": cc_DurableObjectApplication,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
+        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_ScheduledApplication": cc_ScheduledApplication,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
       },
     },
     annotations: {
@@ -766,54 +651,34 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_Application": cc_Application_output,
-        "cc_ApplicationConstraints": cc_ApplicationConstraints_output,
-        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration_output,
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction_output,
-        "cc_ApplicationName": cc_ApplicationName_output,
-        "cc_ApplicationObservability": cc_ApplicationObservability_output,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod_output,
-        "cc_Command": cc_Command_output,
-        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_DurableObjectApplication": cc_DurableObjectApplication_output,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration_output,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints_output,
-        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth_output,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability_output,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy_output,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_Region": cc_Region_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_ScheduledApplication": cc_ScheduledApplication_output,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy_output,
-        "cc_SchedulingPolicy": cc_SchedulingPolicy_output,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig_output,
+        "cc_Application": cc_Application,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints,
+        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationObservability": cc_ApplicationObservability,
+        "cc_Command": cc_Command,
+        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_DurableObjectApplication": cc_DurableObjectApplication,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
+        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_ScheduledApplication": cc_ScheduledApplication,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
       },
     },
     request: (args) => ({
@@ -823,38 +688,50 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_list",
     title: "List Applications associated with your account",
-    description: "Lists all the applications that are associated with your account.",
+    description: "Lists all the applications that are associated with your account.\n\nGET /accounts/{account_id}/containers/applications",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "image": {
-          "$ref": "#/$defs/cc_Image",
-          "description": "Filter applications by image."
-        },
-        "name": {
-          "$ref": "#/$defs/cc_ApplicationName",
-          "description": "Filter applications by name."
-        },
-        "page_token": {
-          "description": "Opaque token from a previous response to retrieve the next page.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "description": "Maximum number of applications to return per page. Defaults to all, or 100 when `page_token` is set.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "image": {
+              "description": "Filter applications by image.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter applications by name.",
+              "type": "string"
+            },
+            "page_token": {
+              "description": "Opaque token from a previous response to retrieve the next page.",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "Maximum number of applications to return per page. Defaults to all, or 100 when `page_token` is set.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "cc_ApplicationName": cc_ApplicationName,
-        "cc_Image": cc_Image,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -878,55 +755,35 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_Application": cc_Application_output,
-        "cc_ApplicationConstraints": cc_ApplicationConstraints_output,
-        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration_output,
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction_output,
-        "cc_ApplicationName": cc_ApplicationName_output,
-        "cc_ApplicationObservability": cc_ApplicationObservability_output,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod_output,
-        "cc_Command": cc_Command_output,
-        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse_output,
-        "cc_ContainersListApplications": cc_ContainersListApplications_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_DurableObjectApplication": cc_DurableObjectApplication_output,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration_output,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints_output,
-        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth_output,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability_output,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy_output,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_Region": cc_Region_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_ScheduledApplication": cc_ScheduledApplication_output,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy_output,
-        "cc_SchedulingPolicy": cc_SchedulingPolicy_output,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_V4PaginatedResultInfo": cc_V4PaginatedResultInfo_output,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig_output,
+        "cc_Application": cc_Application,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints,
+        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationObservability": cc_ApplicationObservability,
+        "cc_Command": cc_Command,
+        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse,
+        "cc_ContainersListApplications": cc_ContainersListApplications,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_DurableObjectApplication": cc_DurableObjectApplication,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
+        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_ScheduledApplication": cc_ScheduledApplication,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_V4PaginatedResultInfo": cc_V4PaginatedResultInfo,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
       },
     },
     annotations: {
@@ -980,65 +837,45 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_Application": cc_Application_output,
-        "cc_ApplicationConstraints": cc_ApplicationConstraints_output,
-        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration_output,
-        "cc_ApplicationHealth": cc_ApplicationHealth_output,
-        "cc_ApplicationHealthError": cc_ApplicationHealthError_output,
-        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors_output,
-        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances_output,
-        "cc_ApplicationID": cc_ApplicationID_output,
-        "cc_ApplicationJurisdiction": cc_ApplicationJurisdiction_output,
-        "cc_ApplicationName": cc_ApplicationName_output,
-        "cc_ApplicationObservability": cc_ApplicationObservability_output,
-        "cc_ApplicationRolloutActiveGracePeriod": cc_ApplicationRolloutActiveGracePeriod_output,
-        "cc_Command": cc_Command_output,
-        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse_output,
-        "cc_ContainersListApplications": cc_ContainersListApplications_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_DurableObjectApplication": cc_DurableObjectApplication_output,
-        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration_output,
-        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints_output,
-        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth_output,
-        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability_output,
-        "cc_DurableObjectApplicationSchedulingPolicy": cc_DurableObjectApplicationSchedulingPolicy_output,
-        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_EventName": cc_EventName_output,
-        "cc_EventType": cc_EventType_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceID": cc_InstanceID_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_PlacementEvent": cc_PlacementEvent_output,
-        "cc_Region": cc_Region_output,
-        "cc_RolloutID": cc_RolloutID_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_ScheduledApplication": cc_ScheduledApplication_output,
-        "cc_ScheduledApplicationSchedulingPolicy": cc_ScheduledApplicationSchedulingPolicy_output,
-        "cc_SchedulingPolicy": cc_SchedulingPolicy_output,
-        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
-        "cc_V4PaginatedResultInfo": cc_V4PaginatedResultInfo_output,
-        "cc_WranglerSSHConfig": cc_WranglerSSHConfig_output,
+        "cc_Application": cc_Application,
+        "cc_ApplicationConstraints": cc_ApplicationConstraints,
+        "cc_ApplicationDurableObjectsConfiguration": cc_ApplicationDurableObjectsConfiguration,
+        "cc_ApplicationHealth": cc_ApplicationHealth,
+        "cc_ApplicationHealthError": cc_ApplicationHealthError,
+        "cc_ApplicationHealthErrors": cc_ApplicationHealthErrors,
+        "cc_ApplicationHealthInstances": cc_ApplicationHealthInstances,
+        "cc_ApplicationObservability": cc_ApplicationObservability,
+        "cc_Command": cc_Command,
+        "cc_ContainersApplicationResponse": cc_ContainersApplicationResponse,
+        "cc_ContainersListApplications": cc_ContainersListApplications,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_DurableObjectApplication": cc_DurableObjectApplication,
+        "cc_DurableObjectApplicationConfiguration": cc_DurableObjectApplicationConfiguration,
+        "cc_DurableObjectApplicationConstraints": cc_DurableObjectApplicationConstraints,
+        "cc_DurableObjectApplicationHealth": cc_DurableObjectApplicationHealth,
+        "cc_DurableObjectApplicationObservability": cc_DurableObjectApplicationObservability,
+        "cc_DurableObjectsConfigurationNamespaceId": cc_DurableObjectsConfigurationNamespaceId,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_PlacementEvent": cc_PlacementEvent,
+        "cc_ScheduledApplication": cc_ScheduledApplication,
+        "cc_UserDeploymentConfiguration": cc_UserDeploymentConfiguration,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
+        "cc_V4PaginatedResultInfo": cc_V4PaginatedResultInfo,
+        "cc_WranglerSSHConfig": cc_WranglerSSHConfig,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/containers/applications`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page_token", args["page_token"], true],
-        ["name", args["name"], true],
-        ["image", args["image"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page_token", param(args, "query", "page_token"), true],
+        ["name", param(args, "query", "name"), true],
+        ["image", param(args, "query", "image"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/containers/applications/versions/outputs.ts b/src/generated/forge-mcp/containers/applications/versions/outputs.ts
index 8b1887014..0c43fa458 100644
--- a/src/generated/forge-mcp/containers/applications/versions/outputs.ts
+++ b/src/generated/forge-mcp/containers/applications/versions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cc_ApplicationVersion` in responses.
  */
-export const cc_ApplicationVersion_output: JsonSchema = {
+export const cc_ApplicationVersion: JsonSchema = {
   "properties": {
     "configuration": {
       "$ref": "#/$defs/cc_ModifyUserDeploymentConfiguration"
diff --git a/src/generated/forge-mcp/containers/applications/versions/tools.ts b/src/generated/forge-mcp/containers/applications/versions/tools.ts
index ef696a35e..569bfad3d 100644
--- a/src/generated/forge-mcp/containers/applications/versions/tools.ts
+++ b/src/generated/forge-mcp/containers/applications/versions/tools.ts
@@ -3,27 +3,20 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cc_Image_output,
-  cc_Messages_output,
-  cc_V4BaseErrorResponse_output,
-  cc_V4BaseResponse_output,
+  cc_Messages,
+  cc_V4BaseErrorResponse,
+  cc_V4BaseResponse,
 } from "../../outputs.js";
 import {
-  cc_Command_output,
-  cc_DeploymentObservability_output,
-  cc_Entrypoint_output,
-  cc_EnvironmentVariableName_output,
-  cc_EnvironmentVariableValue_output,
-  cc_EnvironmentVariable_output,
-  cc_ExecFormParam_output,
-  cc_InstanceType_output,
-  cc_ModifyUserDeploymentConfiguration_output,
-  cc_ObservabilityLogs_output,
-  cc_SSHPublicKey_output,
-  cc_UserSSHPublicKey_output,
+  cc_Command,
+  cc_DeploymentObservability,
+  cc_Entrypoint,
+  cc_EnvironmentVariable,
+  cc_ModifyUserDeploymentConfiguration,
+  cc_ObservabilityLogs,
+  cc_UserSSHPublicKey,
 } from "../outputs.js";
-import { cc_ApplicationID } from "../schemas.js";
-import { cc_ApplicationVersion_output } from "./outputs.js";
+import { cc_ApplicationVersion } from "./outputs.js";
 
 /**
  * The tools of `containers.applications.versions`.
@@ -32,26 +25,33 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_applications_versions_list",
     title: "List all application versions",
-    description: "Returns all versions for a scheduler-backed application with\n`scheduling_policy: \"default\"`. Versions and rollouts do not apply to\napplications with `scheduling_policy: \"durable_object\"`.",
+    description: "Returns all versions for a scheduler-backed application with\n`scheduling_policy: \"default\"`. Versions and rollouts do not apply to\napplications with `scheduling_policy: \"durable_object\"`.\n\nGET /accounts/{account_id}/containers/applications/{application_id}/versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "$ref": "#/$defs/cc_ApplicationID",
-          "description": "An Application ID represents an identifier of an application."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "An Application ID represents an identifier of an application.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id"
+        "path"
       ],
-      $defs: {
-        "cc_ApplicationID": cc_ApplicationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -74,22 +74,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_ApplicationVersion": cc_ApplicationVersion_output,
-        "cc_Command": cc_Command_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ApplicationVersion": cc_ApplicationVersion,
+        "cc_Command": cc_Command,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -141,23 +135,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_ApplicationVersion": cc_ApplicationVersion_output,
-        "cc_Command": cc_Command_output,
-        "cc_DeploymentObservability": cc_DeploymentObservability_output,
-        "cc_Entrypoint": cc_Entrypoint_output,
-        "cc_EnvironmentVariable": cc_EnvironmentVariable_output,
-        "cc_EnvironmentVariableName": cc_EnvironmentVariableName_output,
-        "cc_EnvironmentVariableValue": cc_EnvironmentVariableValue_output,
-        "cc_ExecFormParam": cc_ExecFormParam_output,
-        "cc_Image": cc_Image_output,
-        "cc_InstanceType": cc_InstanceType_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration_output,
-        "cc_ObservabilityLogs": cc_ObservabilityLogs_output,
-        "cc_SSHPublicKey": cc_SSHPublicKey_output,
-        "cc_UserSSHPublicKey": cc_UserSSHPublicKey_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ApplicationVersion": cc_ApplicationVersion,
+        "cc_Command": cc_Command,
+        "cc_DeploymentObservability": cc_DeploymentObservability,
+        "cc_Entrypoint": cc_Entrypoint,
+        "cc_EnvironmentVariable": cc_EnvironmentVariable,
+        "cc_Messages": cc_Messages,
+        "cc_ModifyUserDeploymentConfiguration": cc_ModifyUserDeploymentConfiguration,
+        "cc_ObservabilityLogs": cc_ObservabilityLogs,
+        "cc_UserSSHPublicKey": cc_UserSSHPublicKey,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/containers/images/outputs.ts b/src/generated/forge-mcp/containers/images/outputs.ts
index 84aee58e9..88b9edef8 100644
--- a/src/generated/forge-mcp/containers/images/outputs.ts
+++ b/src/generated/forge-mcp/containers/images/outputs.ts
@@ -6,19 +6,24 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cc_ContainerImagePreparation` in responses.
  */
-export const cc_ContainerImagePreparation_output: JsonSchema = {
+export const cc_ContainerImagePreparation: JsonSchema = {
   "properties": {
     "artifact_digest": {
       "type": "string"
     },
     "image": {
-      "$ref": "#/$defs/cc_Image"
+      "type": "string"
     },
     "reason": {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/cc_ContainerImagePreparationStatus"
+      "enum": [
+        "pending",
+        "ready",
+        "error"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -27,15 +32,3 @@ export const cc_ContainerImagePreparation_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `cc_ContainerImagePreparationStatus` in responses.
- */
-export const cc_ContainerImagePreparationStatus_output: JsonSchema = {
-  "enum": [
-    "pending",
-    "ready",
-    "error"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/containers/images/schemas.ts b/src/generated/forge-mcp/containers/images/schemas.ts
index 9fce58a8d..d7c0668af 100644
--- a/src/generated/forge-mcp/containers/images/schemas.ts
+++ b/src/generated/forge-mcp/containers/images/schemas.ts
@@ -10,8 +10,8 @@ export const cc_PrepareContainerImageRequestBody: JsonSchema = {
   "description": "A digest-pinned managed container image to prepare for the new runtime.",
   "properties": {
     "image": {
-      "$ref": "#/$defs/cc_Image",
-      "description": "Image url."
+      "description": "Image url.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/containers/images/tools.ts b/src/generated/forge-mcp/containers/images/tools.ts
index d5b216924..64daa8388 100644
--- a/src/generated/forge-mcp/containers/images/tools.ts
+++ b/src/generated/forge-mcp/containers/images/tools.ts
@@ -3,16 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cc_Image_output,
-  cc_Messages_output,
-  cc_V4BaseErrorResponse_output,
-  cc_V4BaseResponse_output,
+  cc_Messages,
+  cc_V4BaseErrorResponse,
+  cc_V4BaseResponse,
 } from "../outputs.js";
-import { cc_Image } from "../schemas.js";
-import {
-  cc_ContainerImagePreparationStatus_output,
-  cc_ContainerImagePreparation_output,
-} from "./outputs.js";
+import { cc_ContainerImagePreparation } from "./outputs.js";
 import { cc_PrepareContainerImageRequestBody } from "./schemas.js";
 
 /**
@@ -22,24 +17,33 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_images_prepare",
     title: "Prepare a container image",
-    description: "Idempotently starts or observes preparation of the runtime artifacts required to run one digest-pinned managed container image on Cloudflare's network. Returns 202 while durable preparation continues and 200 when the image is ready or preparation has reached a terminal error.",
+    description: "Idempotently starts or observes preparation of the runtime artifacts required to run one digest-pinned managed container image on Cloudflare's network. Returns 202 while durable preparation continues and 200 when the image is ready or preparation has reached a terminal error.\n\nPOST /accounts/{account_id}/containers/image-preparations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cc_PrepareContainerImageRequestBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cc_Image": cc_Image,
         "cc_PrepareContainerImageRequestBody": cc_PrepareContainerImageRequestBody,
       },
     },
@@ -61,11 +65,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_ContainerImagePreparation": cc_ContainerImagePreparation_output,
-        "cc_ContainerImagePreparationStatus": cc_ContainerImagePreparationStatus_output,
-        "cc_Image": cc_Image_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainerImagePreparation": cc_ContainerImagePreparation,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -129,12 +131,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_ContainerImagePreparation": cc_ContainerImagePreparation_output,
-        "cc_ContainerImagePreparationStatus": cc_ContainerImagePreparationStatus_output,
-        "cc_Image": cc_Image_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainerImagePreparation": cc_ContainerImagePreparation,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/containers/outputs.ts b/src/generated/forge-mcp/containers/outputs.ts
index a6b524c17..1f2c24ab1 100644
--- a/src/generated/forge-mcp/containers/outputs.ts
+++ b/src/generated/forge-mcp/containers/outputs.ts
@@ -3,31 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `cc_AccountID` in responses.
- */
-export const cc_AccountID_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ISO8601Timestamp` in responses.
- */
-export const cc_ISO8601Timestamp_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_Image` in responses.
- */
-export const cc_Image_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `cc_Messages` in responses.
  */
-export const cc_Messages_output: JsonSchema = {
+export const cc_Messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -60,7 +39,7 @@ export const cc_Messages_output: JsonSchema = {
 /**
  * The schema of `cc_V4BaseErrorResponse` in responses.
  */
-export const cc_V4BaseErrorResponse_output: JsonSchema = {
+export const cc_V4BaseErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cc_Messages"
@@ -87,7 +66,7 @@ export const cc_V4BaseErrorResponse_output: JsonSchema = {
 /**
  * The schema of `cc_V4BaseResponse` in responses.
  */
-export const cc_V4BaseResponse_output: JsonSchema = {
+export const cc_V4BaseResponse: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cc_Messages"
diff --git a/src/generated/forge-mcp/containers/registries/credentials/outputs.ts b/src/generated/forge-mcp/containers/registries/credentials/outputs.ts
index a7b9c1178..95d0dc557 100644
--- a/src/generated/forge-mcp/containers/registries/credentials/outputs.ts
+++ b/src/generated/forge-mcp/containers/registries/credentials/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cc_ContainersAccountRegistryToken` in responses.
  */
-export const cc_ContainersAccountRegistryToken_output: JsonSchema = {
+export const cc_ContainersAccountRegistryToken: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/cc_AccountID"
+      "type": "string"
     },
     "password": {
       "type": "string"
diff --git a/src/generated/forge-mcp/containers/registries/credentials/schemas.ts b/src/generated/forge-mcp/containers/registries/credentials/schemas.ts
index 9818a422e..d81c95573 100644
--- a/src/generated/forge-mcp/containers/registries/credentials/schemas.ts
+++ b/src/generated/forge-mcp/containers/registries/credentials/schemas.ts
@@ -16,23 +16,16 @@ export const cc_ImageRegistryCredentialsConfiguration: JsonSchema = {
     "permissions": {
       "description": "The permissions for Cloudflare managed registry credentials. Required for managed registries. Cloudflare ignores this value for external registries.",
       "items": {
-        "$ref": "#/$defs/cc_ImageRegistryPermissions"
+        "description": "Specifies what permissions the credentials carry.",
+        "enum": [
+          "pull",
+          "push",
+          "list"
+        ],
+        "type": "string"
       },
       "type": "array"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `cc_ImageRegistryPermissions`.
- */
-export const cc_ImageRegistryPermissions: JsonSchema = {
-  "description": "Specifies what permissions the credentials carry.",
-  "enum": [
-    "pull",
-    "push",
-    "list"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/containers/registries/credentials/tools.ts b/src/generated/forge-mcp/containers/registries/credentials/tools.ts
index df4194383..0f651cc02 100644
--- a/src/generated/forge-mcp/containers/registries/credentials/tools.ts
+++ b/src/generated/forge-mcp/containers/registries/credentials/tools.ts
@@ -3,16 +3,12 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  cc_AccountID_output,
-  cc_Messages_output,
-  cc_V4BaseErrorResponse_output,
-  cc_V4BaseResponse_output,
+  cc_Messages,
+  cc_V4BaseErrorResponse,
+  cc_V4BaseResponse,
 } from "../../outputs.js";
-import { cc_ContainersAccountRegistryToken_output } from "./outputs.js";
-import {
-  cc_ImageRegistryCredentialsConfiguration,
-  cc_ImageRegistryPermissions,
-} from "./schemas.js";
+import { cc_ContainersAccountRegistryToken } from "./outputs.js";
+import { cc_ImageRegistryCredentialsConfiguration } from "./schemas.js";
 
 /**
  * The tools of `containers.registries.credentials`.
@@ -21,30 +17,39 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_registries_credentials_generate",
     title: "Generate a JWT to interact with the specified image registry.",
-    description: "Generates credentials for accessing a configured container image registry.",
+    description: "Generates credentials for accessing a configured container image registry.\n\nPOST /accounts/{account_id}/containers/registries/{domain}/credentials",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cc_ImageRegistryCredentialsConfiguration"
         },
-        "domain": {
-          "description": "The domain to get credentials for.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "domain": {
+              "description": "The domain to get credentials for.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cc_ImageRegistryCredentialsConfiguration": cc_ImageRegistryCredentialsConfiguration,
-        "cc_ImageRegistryPermissions": cc_ImageRegistryPermissions,
       },
     },
     outputSchema: {
@@ -65,10 +70,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_ContainersAccountRegistryToken": cc_ContainersAccountRegistryToken_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainersAccountRegistryToken": cc_ContainersAccountRegistryToken,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -117,11 +121,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_AccountID": cc_AccountID_output,
-        "cc_ContainersAccountRegistryToken": cc_ContainersAccountRegistryToken_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainersAccountRegistryToken": cc_ContainersAccountRegistryToken,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/containers/registries/outputs.ts b/src/generated/forge-mcp/containers/registries/outputs.ts
index 529a3d60d..b47ad5252 100644
--- a/src/generated/forge-mcp/containers/registries/outputs.ts
+++ b/src/generated/forge-mcp/containers/registries/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cc_ContainersDeleteImageRegistryResponseBody` in responses.
  */
-export const cc_ContainersDeleteImageRegistryResponseBody_output: JsonSchema = {
+export const cc_ContainersDeleteImageRegistryResponseBody: JsonSchema = {
   "properties": {
     "domain": {
-      "$ref": "#/$defs/cc_Domain"
+      "type": "string"
     }
   },
   "required": [
@@ -21,21 +21,29 @@ export const cc_ContainersDeleteImageRegistryResponseBody_output: JsonSchema = {
 /**
  * The schema of `cc_CustomerImageRegistry` in responses.
  */
-export const cc_CustomerImageRegistry_output: JsonSchema = {
+export const cc_CustomerImageRegistry: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/cc_ISO8601Timestamp"
+      "type": "string"
     },
     "domain": {
-      "$ref": "#/$defs/cc_Domain"
+      "type": "string"
     },
     "kind": {
       "oneOf": [
         {
-          "$ref": "#/$defs/cc_ExternalRegistryKind"
+          "enum": [
+            "ECR",
+            "DockerHub",
+            "GAR"
+          ],
+          "type": "string"
         },
         {
-          "$ref": "#/$defs/cc_DefaultImageRegistryKind"
+          "enum": [
+            "default"
+          ],
+          "type": "string"
         }
       ]
     },
@@ -49,32 +57,3 @@ export const cc_CustomerImageRegistry_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `cc_DefaultImageRegistryKind` in responses.
- */
-export const cc_DefaultImageRegistryKind_output: JsonSchema = {
-  "enum": [
-    "default"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `cc_Domain` in responses.
- */
-export const cc_Domain_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cc_ExternalRegistryKind` in responses.
- */
-export const cc_ExternalRegistryKind_output: JsonSchema = {
-  "enum": [
-    "ECR",
-    "DockerHub",
-    "GAR"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/containers/registries/schemas.ts b/src/generated/forge-mcp/containers/registries/schemas.ts
index a9db4a794..1bb591494 100644
--- a/src/generated/forge-mcp/containers/registries/schemas.ts
+++ b/src/generated/forge-mcp/containers/registries/schemas.ts
@@ -7,26 +7,31 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `cc_ContainersCreateImageRegistryRequestBody`.
  */
 export const cc_ContainersCreateImageRegistryRequestBody: JsonSchema = {
-  "description": "Configuration for connecting Containers to a supported private external image\nregistry. See [Image management](https://developers.cloudflare.com/containers/platform-details/image-management/)\nfor supported providers and credential setup instructions.\n",
+  "description": "Configuration for connecting Containers to a supported private external image\nregistry. See [Image management](https://developers.cloudflare.com/containers/platform-details/image-management/)\nfor supported providers and credential setup instructions.",
   "properties": {
     "auth": {
       "$ref": "#/$defs/cc_ContainersImageRegistryAuth",
-      "description": "Credentials for authenticating to a private external image registry. Store the\nprivate credential in [Secrets Store](https://developers.cloudflare.com/secrets-store/)\nbefore calling the API. Refer to [Image management](https://developers.cloudflare.com/containers/platform-details/image-management/)\nfor the credential required by each supported registry provider.\n"
+      "description": "Credentials for authenticating to a private external image registry. Store the\nprivate credential in [Secrets Store](https://developers.cloudflare.com/secrets-store/)\nbefore calling the API. Refer to [Image management](https://developers.cloudflare.com/containers/platform-details/image-management/)\nfor the credential required by each supported registry provider."
     },
     "domain": {
-      "description": "Hostname of the private registry, without a scheme or image path. Supported\nhostnames are `docker.io`, AWS ECR hostnames, and Google Artifact Registry\n`*-docker.pkg.dev` hostnames.\n",
+      "description": "Hostname of the private registry, without a scheme or image path. Supported\nhostnames are `docker.io`, AWS ECR hostnames, and Google Artifact Registry\n`*-docker.pkg.dev` hostnames.",
       "type": "string"
     },
     "is_public": {
-      "description": "Omit this field or set it to `false`. Public Docker Hub images do not require\nregistry configuration and cannot be added with this endpoint.\n",
+      "description": "Omit this field or set it to `false`. Public Docker Hub images do not require\nregistry configuration and cannot be added with this endpoint.",
       "enum": [
         false
       ],
       "type": "boolean"
     },
     "kind": {
-      "$ref": "#/$defs/cc_ExternalRegistryKind",
-      "description": "Registry provider. This must match `domain`: `DockerHub` for `docker.io`,\n`ECR` for AWS ECR, or `GAR` for Google Artifact Registry.\n"
+      "description": "Registry provider. This must match `domain`: `DockerHub` for `docker.io`,\n`ECR` for AWS ECR, or `GAR` for Google Artifact Registry.",
+      "enum": [
+        "ECR",
+        "DockerHub",
+        "GAR"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -41,14 +46,14 @@ export const cc_ContainersCreateImageRegistryRequestBody: JsonSchema = {
  * The schema of `cc_ContainersImageRegistryAuth`.
  */
 export const cc_ContainersImageRegistryAuth: JsonSchema = {
-  "description": "Credentials for authenticating to a private external image registry. Store the\nprivate credential in [Secrets Store](https://developers.cloudflare.com/secrets-store/)\nbefore calling the API. Refer to [Image management](https://developers.cloudflare.com/containers/platform-details/image-management/)\nfor the credential required by each supported registry provider.\n",
+  "description": "Credentials for authenticating to a private external image registry. Store the\nprivate credential in [Secrets Store](https://developers.cloudflare.com/secrets-store/)\nbefore calling the API. Refer to [Image management](https://developers.cloudflare.com/containers/platform-details/image-management/)\nfor the credential required by each supported registry provider.",
   "properties": {
     "private_credential": {
       "$ref": "#/$defs/cc_SecretsStoreRef",
-      "description": "A reference to the private registry credential in Secrets Store. The referenced\nsecret must have the `containers` scope. Raw secret values are not accepted.\n"
+      "description": "A reference to the private registry credential in Secrets Store. The referenced\nsecret must have the `containers` scope. Raw secret values are not accepted."
     },
     "public_credential": {
-      "description": "The non-secret part of the registry credential: an AWS access key ID for ECR,\na username for Docker Hub, or a service account email for Google Artifact Registry.\n",
+      "description": "The non-secret part of the registry credential: an AWS access key ID for ECR,\na username for Docker Hub, or a service account email for Google Artifact Registry.",
       "type": "string"
     }
   },
@@ -59,24 +64,11 @@ export const cc_ContainersImageRegistryAuth: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cc_ExternalRegistryKind`.
- */
-export const cc_ExternalRegistryKind: JsonSchema = {
-  "description": "The type of external registry that is being configured.",
-  "enum": [
-    "ECR",
-    "DockerHub",
-    "GAR"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cc_SecretsStoreRef`.
  */
 export const cc_SecretsStoreRef: JsonSchema = {
-  "description": "Identifies an existing secret in [Secrets Store](https://developers.cloudflare.com/secrets-store/).\nThis reference does not contain or upload the secret value.\n",
+  "description": "Identifies an existing secret in [Secrets Store](https://developers.cloudflare.com/secrets-store/).\nThis reference does not contain or upload the secret value.",
   "properties": {
     "secret_name": {
       "description": "Name of the secret within the store.",
diff --git a/src/generated/forge-mcp/containers/registries/tools.ts b/src/generated/forge-mcp/containers/registries/tools.ts
index 579240c64..8a75338b2 100644
--- a/src/generated/forge-mcp/containers/registries/tools.ts
+++ b/src/generated/forge-mcp/containers/registries/tools.ts
@@ -3,22 +3,17 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cc_ISO8601Timestamp_output,
-  cc_Messages_output,
-  cc_V4BaseErrorResponse_output,
-  cc_V4BaseResponse_output,
+  cc_Messages,
+  cc_V4BaseErrorResponse,
+  cc_V4BaseResponse,
 } from "../outputs.js";
 import {
-  cc_ContainersDeleteImageRegistryResponseBody_output,
-  cc_CustomerImageRegistry_output,
-  cc_DefaultImageRegistryKind_output,
-  cc_Domain_output,
-  cc_ExternalRegistryKind_output,
+  cc_ContainersDeleteImageRegistryResponseBody,
+  cc_CustomerImageRegistry,
 } from "./outputs.js";
 import {
   cc_ContainersCreateImageRegistryRequestBody,
   cc_ContainersImageRegistryAuth,
-  cc_ExternalRegistryKind,
   cc_SecretsStoreRef,
 } from "./schemas.js";
 
@@ -29,26 +24,35 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_registries_create",
     title: "Configure a private external image registry",
-    description: "Registers credentials for a supported private external image registry so\nContainers can pull images from it. This endpoint does not create a registry\nor upload an image. Public Docker Hub images and images in the Cloudflare\nmanaged registry do not require this configuration.\n\nRefer to [Image management](https://developers.cloudflare.com/containers/platform-details/image-management/)\nfor supported registries and instructions for storing registry credentials.",
+    description: "Registers credentials for a supported private external image registry so\nContainers can pull images from it. This endpoint does not create a registry\nor upload an image. Public Docker Hub images and images in the Cloudflare\nmanaged registry do not require this configuration.\n\nRefer to [Image management](https://developers.cloudflare.com/containers/platform-details/image-management/)\nfor supported registries and instructions for storing registry credentials.\n\nPOST /accounts/{account_id}/containers/registries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cc_ContainersCreateImageRegistryRequestBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cc_ContainersCreateImageRegistryRequestBody": cc_ContainersCreateImageRegistryRequestBody,
         "cc_ContainersImageRegistryAuth": cc_ContainersImageRegistryAuth,
-        "cc_ExternalRegistryKind": cc_ExternalRegistryKind,
         "cc_SecretsStoreRef": cc_SecretsStoreRef,
       },
     },
@@ -70,13 +74,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_CustomerImageRegistry": cc_CustomerImageRegistry_output,
-        "cc_DefaultImageRegistryKind": cc_DefaultImageRegistryKind_output,
-        "cc_Domain": cc_Domain_output,
-        "cc_ExternalRegistryKind": cc_ExternalRegistryKind_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_CustomerImageRegistry": cc_CustomerImageRegistry,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -127,14 +127,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_CustomerImageRegistry": cc_CustomerImageRegistry_output,
-        "cc_DefaultImageRegistryKind": cc_DefaultImageRegistryKind_output,
-        "cc_Domain": cc_Domain_output,
-        "cc_ExternalRegistryKind": cc_ExternalRegistryKind_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_CustomerImageRegistry": cc_CustomerImageRegistry,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
@@ -145,23 +141,33 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_registries_delete",
     title: "Delete a registry from the account",
-    description: "Delete a registry from the account, this will prevent Containers from pulling images from the registry.\n\nConfirm with the user before calling this tool. This operation deletes the registry configuration. Containers will no longer be able to pull images from it.",
+    description: "Delete a registry from the account, this will prevent Containers from pulling images from the registry.\n\nConfirm with the user before calling this tool. This operation deletes the registry configuration. Containers will no longer be able to pull images from it.\n\nDELETE /accounts/{account_id}/containers/registries/{domain}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "domain": {
-          "description": "The domain to delete.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "domain": {
+              "description": "The domain to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -181,10 +187,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_ContainersDeleteImageRegistryResponseBody": cc_ContainersDeleteImageRegistryResponseBody_output,
-        "cc_Domain": cc_Domain_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainersDeleteImageRegistryResponseBody": cc_ContainersDeleteImageRegistryResponseBody,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -235,11 +240,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_ContainersDeleteImageRegistryResponseBody": cc_ContainersDeleteImageRegistryResponseBody_output,
-        "cc_Domain": cc_Domain_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_ContainersDeleteImageRegistryResponseBody": cc_ContainersDeleteImageRegistryResponseBody,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
@@ -249,18 +253,28 @@ export const tools: readonly Tool[] = [
   {
     name: "containers_registries_list",
     title: "Get the list of configured registries in the account",
-    description: "Get the list of configured registries in the account.",
+    description: "Get the list of configured registries in the account.\n\nGET /accounts/{account_id}/containers/registries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -283,13 +297,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cc_CustomerImageRegistry": cc_CustomerImageRegistry_output,
-        "cc_DefaultImageRegistryKind": cc_DefaultImageRegistryKind_output,
-        "cc_Domain": cc_Domain_output,
-        "cc_ExternalRegistryKind": cc_ExternalRegistryKind_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_CustomerImageRegistry": cc_CustomerImageRegistry,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     annotations: {
@@ -338,14 +348,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cc_CustomerImageRegistry": cc_CustomerImageRegistry_output,
-        "cc_DefaultImageRegistryKind": cc_DefaultImageRegistryKind_output,
-        "cc_Domain": cc_Domain_output,
-        "cc_ExternalRegistryKind": cc_ExternalRegistryKind_output,
-        "cc_ISO8601Timestamp": cc_ISO8601Timestamp_output,
-        "cc_Messages": cc_Messages_output,
-        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse_output,
-        "cc_V4BaseResponse": cc_V4BaseResponse_output,
+        "cc_CustomerImageRegistry": cc_CustomerImageRegistry,
+        "cc_Messages": cc_Messages,
+        "cc_V4BaseErrorResponse": cc_V4BaseErrorResponse,
+        "cc_V4BaseResponse": cc_V4BaseResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/containers/schemas.ts b/src/generated/forge-mcp/containers/schemas.ts
deleted file mode 100644
index 07d6b7849..000000000
--- a/src/generated/forge-mcp/containers/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `cc_Image`.
- */
-export const cc_Image: JsonSchema = {
-  "description": "Image url.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/contentScan/expressions/outputs.ts b/src/generated/forge-mcp/contentScan/expressions/outputs.ts
index 4bfe9441a..9d26a73d1 100644
--- a/src/generated/forge-mcp/contentScan/expressions/outputs.ts
+++ b/src/generated/forge-mcp/contentScan/expressions/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `waf-product-api-bundle_api-response-collection-2` in
  * responses.
  */
-export const waf_product_api_bundle_api_response_collection_2_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$collection$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-common-2"
@@ -36,37 +36,23 @@ export const waf_product_api_bundle_api_response_collection_2_output: JsonSchema
 /**
  * The schema of `waf-product-api-bundle_custom-scan` in responses.
  */
-export const waf_product_api_bundle_custom_scan_output: JsonSchema = {
+export const waf$$product$$api$$bundle_custom$$scan: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/waf-product-api-bundle_custom-scan-id"
+      "type": "string"
     },
     "payload": {
-      "$ref": "#/$defs/waf-product-api-bundle_custom-scan-payload"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `waf-product-api-bundle_custom-scan-id` in responses.
- */
-export const waf_product_api_bundle_custom_scan_id_output: JsonSchema = {
-  "$ref": "#/$defs/waf-product-api-bundle_identifier"
-};
-
-/**
- * The schema of `waf-product-api-bundle_custom-scan-payload` in responses.
- */
-export const waf_product_api_bundle_custom_scan_payload_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `waf-product-api-bundle_response-custom-scan-collection` in
  * responses.
  */
-export const waf_product_api_bundle_response_custom_scan_collection_output: JsonSchema = {
+export const waf$$product$$api$$bundle_response$$custom$$scan$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-collection-2"
diff --git a/src/generated/forge-mcp/contentScan/expressions/schemas.ts b/src/generated/forge-mcp/contentScan/expressions/schemas.ts
deleted file mode 100644
index f6f1afe85..000000000
--- a/src/generated/forge-mcp/contentScan/expressions/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `waf-product-api-bundle_custom-scan-id`.
- */
-export const waf_product_api_bundle_custom_scan_id: JsonSchema = {
-  "$ref": "#/$defs/waf-product-api-bundle_identifier",
-  "description": "Defines the unique ID for this Content Scanning custom expression."
-};
-
-/**
- * The schema of `waf-product-api-bundle_custom-scan-payload`.
- */
-export const waf_product_api_bundle_custom_scan_payload: JsonSchema = {
-  "description": "Defines the custom content extraction expression used to reach content objects in the request.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/contentScan/expressions/tools.ts b/src/generated/forge-mcp/contentScan/expressions/tools.ts
index 11644d88e..faa4074cd 100644
--- a/src/generated/forge-mcp/contentScan/expressions/tools.ts
+++ b/src/generated/forge-mcp/contentScan/expressions/tools.ts
@@ -2,35 +2,25 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
+import { waf$$product$$api$$bundle_messages } from "../../outputs.js";
 import {
-  waf_product_api_bundle_identifier_output,
-  waf_product_api_bundle_messages_output,
-} from "../../outputs.js";
-import { waf_product_api_bundle_identifier } from "../../schemas.js";
-import {
-  waf_product_api_bundle_api_response_common_2_output,
-  waf_product_api_bundle_api_response_common_failure_2_output,
+  waf$$product$$api$$bundle_api$$response$$common$$2,
+  waf$$product$$api$$bundle_api$$response$$common$$failure$$2,
 } from "../outputs.js";
 import {
-  waf_product_api_bundle_api_response_collection_2_output,
-  waf_product_api_bundle_custom_scan_id_output,
-  waf_product_api_bundle_custom_scan_output,
-  waf_product_api_bundle_custom_scan_payload_output,
-  waf_product_api_bundle_response_custom_scan_collection_output,
+  waf$$product$$api$$bundle_api$$response$$collection$$2,
+  waf$$product$$api$$bundle_custom$$scan,
+  waf$$product$$api$$bundle_response$$custom$$scan$$collection,
 } from "./outputs.js";
-import {
-  waf_product_api_bundle_custom_scan_id,
-  waf_product_api_bundle_custom_scan_payload,
-} from "./schemas.js";
 
 /**
- * The tools of `content_scan.expressions`.
+ * The tools of `contentScan.expressions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "content_scan_expressions_create",
+    name: "contentScan_expressions_create",
     title: "Create Content Scanning custom expressions for a zone.",
-    description: "Create one or more Content Scanning custom expressions, appending them to the existing list of the zone, and return the updated list. Each expression reaches content objects the scanner cannot find automatically, for example `lookup_json_string(http.request.body.raw, \"file\")`.",
+    description: "Create one or more Content Scanning custom expressions, appending them to the existing list of the zone, and return the updated list. Each expression reaches content objects the scanner cannot find automatically, for example `lookup_json_string(http.request.body.raw, \"file\")`.\n\nPOST /zones/{zone_id}/content-upload-scan/payloads",
     inputSchema: {
       type: "object",
       properties: {
@@ -39,8 +29,8 @@ export const tools: readonly Tool[] = [
           "items": {
             "properties": {
               "payload": {
-                "$ref": "#/$defs/waf-product-api-bundle_custom-scan-payload",
-                "description": "Defines the custom content extraction expression used to reach content objects in the request."
+                "description": "Defines the custom content extraction expression used to reach content objects in the request.",
+                "type": "string"
               }
             },
             "required": [
@@ -50,31 +40,34 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-scan-collection",
       $defs: {
-        "waf-product-api-bundle_api-response-collection-2": waf_product_api_bundle_api_response_collection_2_output,
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_custom-scan": waf_product_api_bundle_custom_scan_output,
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id_output,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-scan-collection": waf_product_api_bundle_response_custom_scan_collection_output,
+        "waf-product-api-bundle_api-response-collection-2": waf$$product$$api$$bundle_api$$response$$collection$$2,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_custom-scan": waf$$product$$api$$bundle_custom$$scan,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-scan-collection": waf$$product$$api$$bundle_response$$custom$$scan$$collection,
       },
     },
     annotations: {
@@ -109,15 +102,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-collection-2": waf_product_api_bundle_api_response_collection_2_output,
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_api-response-common-failure-2": waf_product_api_bundle_api_response_common_failure_2_output,
-        "waf-product-api-bundle_custom-scan": waf_product_api_bundle_custom_scan_output,
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id_output,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-scan-collection": waf_product_api_bundle_response_custom_scan_collection_output,
+        "waf-product-api-bundle_api-response-collection-2": waf$$product$$api$$bundle_api$$response$$collection$$2,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_api-response-common-failure-2": waf$$product$$api$$bundle_api$$response$$common$$failure$$2,
+        "waf-product-api-bundle_custom-scan": waf$$product$$api$$bundle_custom$$scan,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-scan-collection": waf$$product$$api$$bundle_response$$custom$$scan$$collection,
       },
     },
     request: (args) => ({
@@ -126,41 +116,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "content_scan_expressions_delete",
+    name: "contentScan_expressions_delete",
     title: "Delete a Content Scanning custom expression from a zone.",
-    description: "Delete the Content Scanning custom expression with the given identifier and return the expressions that remain. Content objects reached only by the deleted expression are no longer scanned.\n\nConfirm with the user before calling this tool. This operation deletes a Content Scanning custom expression.",
+    description: "Delete the Content Scanning custom expression with the given identifier and return the expressions that remain. Content objects reached only by the deleted expression are no longer scanned.\n\nConfirm with the user before calling this tool. This operation deletes a Content Scanning custom expression.\n\nDELETE /zones/{zone_id}/content-upload-scan/payloads/{expression_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "expression_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_custom-scan-id",
-          "description": "Defines the unique ID for this Content Scanning custom expression."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "expression_id": {
+              "description": "Defines the unique ID for this Content Scanning custom expression.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "expression_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "expression_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-scan-collection",
       $defs: {
-        "waf-product-api-bundle_api-response-collection-2": waf_product_api_bundle_api_response_collection_2_output,
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_custom-scan": waf_product_api_bundle_custom_scan_output,
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id_output,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-scan-collection": waf_product_api_bundle_response_custom_scan_collection_output,
+        "waf-product-api-bundle_api-response-collection-2": waf$$product$$api$$bundle_api$$response$$collection$$2,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_custom-scan": waf$$product$$api$$bundle_custom$$scan,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-scan-collection": waf$$product$$api$$bundle_response$$custom$$scan$$collection,
       },
     },
     annotations: {
@@ -195,15 +188,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-collection-2": waf_product_api_bundle_api_response_collection_2_output,
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_api-response-common-failure-2": waf_product_api_bundle_api_response_common_failure_2_output,
-        "waf-product-api-bundle_custom-scan": waf_product_api_bundle_custom_scan_output,
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id_output,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-scan-collection": waf_product_api_bundle_response_custom_scan_collection_output,
+        "waf-product-api-bundle_api-response-collection-2": waf$$product$$api$$bundle_api$$response$$collection$$2,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_api-response-common-failure-2": waf$$product$$api$$bundle_api$$response$$common$$failure$$2,
+        "waf-product-api-bundle_custom-scan": waf$$product$$api$$bundle_custom$$scan,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-scan-collection": waf$$product$$api$$bundle_response$$custom$$scan$$collection,
       },
     },
     request: (args) => ({
@@ -211,35 +201,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "content_scan_expressions_list",
+    name: "contentScan_expressions_list",
     title: "List the Content Scanning custom expressions of a zone.",
-    description: "List the Content Scanning custom expressions configured for the zone, each with its own identifier. A custom expression tells the scanner how to reach content objects in a request it cannot parse on its own, such as files Base64-encoded inside a JSON body.",
+    description: "List the Content Scanning custom expressions configured for the zone, each with its own identifier. A custom expression tells the scanner how to reach content objects in a request it cannot parse on its own, such as files Base64-encoded inside a JSON body.\n\nGET /zones/{zone_id}/content-upload-scan/payloads",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-scan-collection",
       $defs: {
-        "waf-product-api-bundle_api-response-collection-2": waf_product_api_bundle_api_response_collection_2_output,
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_custom-scan": waf_product_api_bundle_custom_scan_output,
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id_output,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-scan-collection": waf_product_api_bundle_response_custom_scan_collection_output,
+        "waf-product-api-bundle_api-response-collection-2": waf$$product$$api$$bundle_api$$response$$collection$$2,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_custom-scan": waf$$product$$api$$bundle_custom$$scan,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-scan-collection": waf$$product$$api$$bundle_response$$custom$$scan$$collection,
       },
     },
     annotations: {
@@ -276,15 +270,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-collection-2": waf_product_api_bundle_api_response_collection_2_output,
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_api-response-common-failure-2": waf_product_api_bundle_api_response_common_failure_2_output,
-        "waf-product-api-bundle_custom-scan": waf_product_api_bundle_custom_scan_output,
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id_output,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-scan-collection": waf_product_api_bundle_response_custom_scan_collection_output,
+        "waf-product-api-bundle_api-response-collection-2": waf$$product$$api$$bundle_api$$response$$collection$$2,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_api-response-common-failure-2": waf$$product$$api$$bundle_api$$response$$common$$failure$$2,
+        "waf-product-api-bundle_custom-scan": waf$$product$$api$$bundle_custom$$scan,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-scan-collection": waf$$product$$api$$bundle_response$$custom$$scan$$collection,
       },
     },
     request: (args) => ({
@@ -292,9 +283,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "content_scan_expressions_update",
+    name: "contentScan_expressions_update",
     title: "Update a Content Scanning custom expression for a zone.",
-    description: "Update the Content Scanning custom expression with the given identifier and return the updated list of expressions.",
+    description: "Update the Content Scanning custom expression with the given identifier and return the updated list of expressions.\n\nPATCH /zones/{zone_id}/content-upload-scan/payloads/{expression_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -302,8 +293,8 @@ export const tools: readonly Tool[] = [
           "description": "Content Scanning custom expression to update.",
           "properties": {
             "payload": {
-              "$ref": "#/$defs/waf-product-api-bundle_custom-scan-payload",
-              "description": "Defines the custom content extraction expression used to reach content objects in the request."
+              "description": "Defines the custom content extraction expression used to reach content objects in the request.",
+              "type": "string"
             }
           },
           "required": [
@@ -311,37 +302,39 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "expression_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_custom-scan-id",
-          "description": "Defines the unique ID for this Content Scanning custom expression."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "expression_id": {
+              "description": "Defines the unique ID for this Content Scanning custom expression.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "expression_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "expression_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-scan-collection",
       $defs: {
-        "waf-product-api-bundle_api-response-collection-2": waf_product_api_bundle_api_response_collection_2_output,
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_custom-scan": waf_product_api_bundle_custom_scan_output,
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id_output,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-scan-collection": waf_product_api_bundle_response_custom_scan_collection_output,
+        "waf-product-api-bundle_api-response-collection-2": waf$$product$$api$$bundle_api$$response$$collection$$2,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_custom-scan": waf$$product$$api$$bundle_custom$$scan,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-scan-collection": waf$$product$$api$$bundle_response$$custom$$scan$$collection,
       },
     },
     annotations: {
@@ -376,15 +369,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-collection-2": waf_product_api_bundle_api_response_collection_2_output,
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_api-response-common-failure-2": waf_product_api_bundle_api_response_common_failure_2_output,
-        "waf-product-api-bundle_custom-scan": waf_product_api_bundle_custom_scan_output,
-        "waf-product-api-bundle_custom-scan-id": waf_product_api_bundle_custom_scan_id_output,
-        "waf-product-api-bundle_custom-scan-payload": waf_product_api_bundle_custom_scan_payload_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-scan-collection": waf_product_api_bundle_response_custom_scan_collection_output,
+        "waf-product-api-bundle_api-response-collection-2": waf$$product$$api$$bundle_api$$response$$collection$$2,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_api-response-common-failure-2": waf$$product$$api$$bundle_api$$response$$common$$failure$$2,
+        "waf-product-api-bundle_custom-scan": waf$$product$$api$$bundle_custom$$scan,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-scan-collection": waf$$product$$api$$bundle_response$$custom$$scan$$collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/contentScan/outputs.ts b/src/generated/forge-mcp/contentScan/outputs.ts
index 8f0a6561d..425bb7b29 100644
--- a/src/generated/forge-mcp/contentScan/outputs.ts
+++ b/src/generated/forge-mcp/contentScan/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `waf-product-api-bundle_api-response-common-2` in responses.
  */
-export const waf_product_api_bundle_api_response_common_2_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$common$$2: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/waf-product-api-bundle_messages"
@@ -53,7 +53,7 @@ export const waf_product_api_bundle_api_response_common_2_output: JsonSchema = {
  * The schema of `waf-product-api-bundle_api-response-common-failure-2` in
  * responses.
  */
-export const waf_product_api_bundle_api_response_common_failure_2_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$common$$failure$$2: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/waf-product-api-bundle_messages"
@@ -83,7 +83,7 @@ export const waf_product_api_bundle_api_response_common_failure_2_output: JsonSc
 /**
  * The schema of `waf-product-api-bundle_api-response-single-2` in responses.
  */
-export const waf_product_api_bundle_api_response_single_2_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$single$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-common-2"
@@ -112,7 +112,7 @@ export const waf_product_api_bundle_api_response_single_2_output: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_response-status-2` in responses.
  */
-export const waf_product_api_bundle_response_status_2_output: JsonSchema = {
+export const waf$$product$$api$$bundle_response$$status$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-single-2"
@@ -131,7 +131,7 @@ export const waf_product_api_bundle_response_status_2_output: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_status-2` in responses.
  */
-export const waf_product_api_bundle_status_2_output: JsonSchema = {
+export const waf$$product$$api$$bundle_status$$2: JsonSchema = {
   "properties": {
     "modified": {
       "type": "string"
diff --git a/src/generated/forge-mcp/contentScan/tools.ts b/src/generated/forge-mcp/contentScan/tools.ts
index c7dd2295e..77e72c19c 100644
--- a/src/generated/forge-mcp/contentScan/tools.ts
+++ b/src/generated/forge-mcp/contentScan/tools.ts
@@ -2,47 +2,53 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../_/tool.js";
-import { waf_product_api_bundle_messages_output } from "../outputs.js";
-import { waf_product_api_bundle_identifier } from "../schemas.js";
+import { waf$$product$$api$$bundle_messages } from "../outputs.js";
 import {
-  waf_product_api_bundle_api_response_common_2_output,
-  waf_product_api_bundle_api_response_common_failure_2_output,
-  waf_product_api_bundle_api_response_single_2_output,
-  waf_product_api_bundle_response_status_2_output,
-  waf_product_api_bundle_status_2_output,
+  waf$$product$$api$$bundle_api$$response$$common$$2,
+  waf$$product$$api$$bundle_api$$response$$common$$failure$$2,
+  waf$$product$$api$$bundle_api$$response$$single$$2,
+  waf$$product$$api$$bundle_response$$status$$2,
+  waf$$product$$api$$bundle_status$$2,
 } from "./outputs.js";
 
 /**
- * The tools of `content_scan`.
+ * The tools of `contentScan`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "content_scan_get",
+    name: "contentScan_get",
     title: "Get the Content Scanning status for a zone.",
-    description: "Get the current Content Scanning status for the zone, together with the date the status was last modified.",
+    description: "Get the current Content Scanning status for the zone, together with the date the status was last modified.\n\nGET /zones/{zone_id}/content-upload-scan/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-status-2",
       $defs: {
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_api-response-single-2": waf_product_api_bundle_api_response_single_2_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-status-2": waf_product_api_bundle_response_status_2_output,
-        "waf-product-api-bundle_status-2": waf_product_api_bundle_status_2_output,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_api-response-single-2": waf$$product$$api$$bundle_api$$response$$single$$2,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-status-2": waf$$product$$api$$bundle_response$$status$$2,
+        "waf-product-api-bundle_status-2": waf$$product$$api$$bundle_status$$2,
       },
     },
     annotations: {
@@ -72,12 +78,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_api-response-common-failure-2": waf_product_api_bundle_api_response_common_failure_2_output,
-        "waf-product-api-bundle_api-response-single-2": waf_product_api_bundle_api_response_single_2_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-status-2": waf_product_api_bundle_response_status_2_output,
-        "waf-product-api-bundle_status-2": waf_product_api_bundle_status_2_output,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_api-response-common-failure-2": waf$$product$$api$$bundle_api$$response$$common$$failure$$2,
+        "waf-product-api-bundle_api-response-single-2": waf$$product$$api$$bundle_api$$response$$single$$2,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-status-2": waf$$product$$api$$bundle_response$$status$$2,
+        "waf-product-api-bundle_status-2": waf$$product$$api$$bundle_status$$2,
       },
     },
     request: (args) => ({
@@ -85,9 +91,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "content_scan_update",
+    name: "contentScan_update",
     title: "Update the Content Scanning status for a zone.",
-    description: "Update the Content Scanning status by setting the status value to `enabled` or `disabled`. This is equivalent to calling the dedicated enable and disable endpoints.\n\nConfirm with the user before calling this tool. This operation toggles Content Scanning for a zone.",
+    description: "Update the Content Scanning status by setting the status value to `enabled` or `disabled`. This is equivalent to calling the dedicated enable and disable endpoints.\n\nConfirm with the user before calling this tool. This operation toggles Content Scanning for a zone.\n\nPUT /zones/{zone_id}/content-upload-scan/settings",
     inputSchema: {
       type: "object",
       properties: {
@@ -108,27 +114,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-status-2",
       $defs: {
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_api-response-single-2": waf_product_api_bundle_api_response_single_2_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-status-2": waf_product_api_bundle_response_status_2_output,
-        "waf-product-api-bundle_status-2": waf_product_api_bundle_status_2_output,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_api-response-single-2": waf$$product$$api$$bundle_api$$response$$single$$2,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-status-2": waf$$product$$api$$bundle_response$$status$$2,
+        "waf-product-api-bundle_status-2": waf$$product$$api$$bundle_status$$2,
       },
     },
     annotations: {
@@ -156,12 +169,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common-2": waf_product_api_bundle_api_response_common_2_output,
-        "waf-product-api-bundle_api-response-common-failure-2": waf_product_api_bundle_api_response_common_failure_2_output,
-        "waf-product-api-bundle_api-response-single-2": waf_product_api_bundle_api_response_single_2_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-status-2": waf_product_api_bundle_response_status_2_output,
-        "waf-product-api-bundle_status-2": waf_product_api_bundle_status_2_output,
+        "waf-product-api-bundle_api-response-common-2": waf$$product$$api$$bundle_api$$response$$common$$2,
+        "waf-product-api-bundle_api-response-common-failure-2": waf$$product$$api$$bundle_api$$response$$common$$failure$$2,
+        "waf-product-api-bundle_api-response-single-2": waf$$product$$api$$bundle_api$$response$$single$$2,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-status-2": waf$$product$$api$$bundle_response$$status$$2,
+        "waf-product-api-bundle_status-2": waf$$product$$api$$bundle_status$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/cps/outputs.ts b/src/generated/forge-mcp/cps/outputs.ts
index fbe4cc2ad..b72011da2 100644
--- a/src/generated/forge-mcp/cps/outputs.ts
+++ b/src/generated/forge-mcp/cps/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `cps_api_response_common_failure` in responses.
  */
-export const cps_api_response_common_failure_output: JsonSchema = {
+export const cps_api_response_common_failure: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -43,7 +43,7 @@ export const cps_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `cps_api_response_message` in responses.
  */
-export const cps_api_response_message_output: JsonSchema = {
+export const cps_api_response_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -62,7 +62,7 @@ export const cps_api_response_message_output: JsonSchema = {
 /**
  * The schema of `cps_communication_preferences` in responses.
  */
-export const cps_communication_preferences_output: JsonSchema = {
+export const cps_communication_preferences: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -118,7 +118,7 @@ export const cps_communication_preferences_output: JsonSchema = {
 /**
  * The schema of `cps_communication_preferences_response` in responses.
  */
-export const cps_communication_preferences_response_output: JsonSchema = {
+export const cps_communication_preferences_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -151,7 +151,7 @@ export const cps_communication_preferences_response_output: JsonSchema = {
 /**
  * The schema of `cps_customer_preference` in responses.
  */
-export const cps_customer_preference_output: JsonSchema = {
+export const cps_customer_preference: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/cps/tools.ts b/src/generated/forge-mcp/cps/tools.ts
index 33a7d9a45..213c90373 100644
--- a/src/generated/forge-mcp/cps/tools.ts
+++ b/src/generated/forge-mcp/cps/tools.ts
@@ -3,11 +3,11 @@
 
 import type { Tool } from "../_/tool.js";
 import {
-  cps_api_response_common_failure_output,
-  cps_api_response_message_output,
-  cps_communication_preferences_output,
-  cps_communication_preferences_response_output,
-  cps_customer_preference_output,
+  cps_api_response_common_failure,
+  cps_api_response_message,
+  cps_communication_preferences,
+  cps_communication_preferences_response,
+  cps_customer_preference,
 } from "./outputs.js";
 import { cps_update_communication_preferences_request } from "./schemas.js";
 
@@ -18,18 +18,19 @@ export const tools: readonly Tool[] = [
   {
     name: "cps_get",
     title: "Get communication preferences",
-    description: "Retrieve the communication preferences for the authenticated user, including email verification status, marketing subscription opt-in/opt-out state, and language locale. Callers authenticate with standard Cloudflare API tokens or keys.",
+    description: "Retrieve the communication preferences for the authenticated user, including email verification status, marketing subscription opt-in/opt-out state, and language locale. Callers authenticate with standard Cloudflare API tokens or keys.\n\nGET /user/communication_preferences",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cps_communication_preferences_response",
       $defs: {
-        "cps_api_response_message": cps_api_response_message_output,
-        "cps_communication_preferences": cps_communication_preferences_output,
-        "cps_communication_preferences_response": cps_communication_preferences_response_output,
-        "cps_customer_preference": cps_customer_preference_output,
+        "cps_api_response_message": cps_api_response_message,
+        "cps_communication_preferences": cps_communication_preferences,
+        "cps_communication_preferences_response": cps_communication_preferences_response,
+        "cps_customer_preference": cps_customer_preference,
       },
     },
     annotations: {
@@ -68,11 +69,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cps_api_response_common_failure": cps_api_response_common_failure_output,
-        "cps_api_response_message": cps_api_response_message_output,
-        "cps_communication_preferences": cps_communication_preferences_output,
-        "cps_communication_preferences_response": cps_communication_preferences_response_output,
-        "cps_customer_preference": cps_customer_preference_output,
+        "cps_api_response_common_failure": cps_api_response_common_failure,
+        "cps_api_response_message": cps_api_response_message,
+        "cps_communication_preferences": cps_communication_preferences,
+        "cps_communication_preferences_response": cps_communication_preferences_response,
+        "cps_customer_preference": cps_customer_preference,
       },
     },
     request: (_args) => ({
@@ -82,7 +83,7 @@ export const tools: readonly Tool[] = [
   {
     name: "cps_update",
     title: "Update communication preferences",
-    description: "Set one or more communication preferences for the authenticated user. Supply a map of preference keys to subscription states, and an optional language locale. This endpoint does not modify email verification settings. Callers authenticate with standard Cloudflare API tokens or keys.",
+    description: "Set one or more communication preferences for the authenticated user. Supply a map of preference keys to subscription states, and an optional language locale. This endpoint does not modify email verification settings. Callers authenticate with standard Cloudflare API tokens or keys.\n\nPUT /user/communication_preferences",
     inputSchema: {
       type: "object",
       properties: {
@@ -93,6 +94,7 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cps_update_communication_preferences_request": cps_update_communication_preferences_request,
       },
@@ -100,10 +102,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cps_communication_preferences_response",
       $defs: {
-        "cps_api_response_message": cps_api_response_message_output,
-        "cps_communication_preferences": cps_communication_preferences_output,
-        "cps_communication_preferences_response": cps_communication_preferences_response_output,
-        "cps_customer_preference": cps_customer_preference_output,
+        "cps_api_response_message": cps_api_response_message,
+        "cps_communication_preferences": cps_communication_preferences,
+        "cps_communication_preferences_response": cps_communication_preferences_response,
+        "cps_customer_preference": cps_customer_preference,
       },
     },
     annotations: {
@@ -142,11 +144,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cps_api_response_common_failure": cps_api_response_common_failure_output,
-        "cps_api_response_message": cps_api_response_message_output,
-        "cps_communication_preferences": cps_communication_preferences_output,
-        "cps_communication_preferences_response": cps_communication_preferences_response_output,
-        "cps_customer_preference": cps_customer_preference_output,
+        "cps_api_response_common_failure": cps_api_response_common_failure,
+        "cps_api_response_message": cps_api_response_message,
+        "cps_communication_preferences": cps_communication_preferences,
+        "cps_communication_preferences_response": cps_communication_preferences_response,
+        "cps_customer_preference": cps_customer_preference,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/csamScanner/outputs.ts b/src/generated/forge-mcp/csamScanner/outputs.ts
index 8bb1b3ff0..213806d5f 100644
--- a/src/generated/forge-mcp/csamScanner/outputs.ts
+++ b/src/generated/forge-mcp/csamScanner/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `csam-config-service_api_response_common_failure` in responses.
  */
-export const csam_config_service_api_response_common_failure_output: JsonSchema = {
+export const csam$$config$$service_api_response_common_failure: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -45,7 +45,7 @@ export const csam_config_service_api_response_common_failure_output: JsonSchema
 /**
  * The schema of `csam-config-service_api_response_message` in responses.
  */
-export const csam_config_service_api_response_message_output: JsonSchema = {
+export const csam$$config$$service_api_response_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -64,7 +64,7 @@ export const csam_config_service_api_response_message_output: JsonSchema = {
 /**
  * The schema of `csam-config-service_api_response_single` in responses.
  */
-export const csam_config_service_api_response_single_output: JsonSchema = {
+export const csam$$config$$service_api_response_single: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -96,7 +96,7 @@ export const csam_config_service_api_response_single_output: JsonSchema = {
 /**
  * The schema of `csam-config-service_csam_scanner_setting` in responses.
  */
-export const csam_config_service_csam_scanner_setting_output: JsonSchema = {
+export const csam$$config$$service_csam_scanner_setting: JsonSchema = {
   "properties": {
     "editable": {
       "type": "boolean"
@@ -129,7 +129,7 @@ export const csam_config_service_csam_scanner_setting_output: JsonSchema = {
  * The schema of `csam-config-service_csam_scanner_single_response` in
  * responses.
  */
-export const csam_config_service_csam_scanner_single_response_output: JsonSchema = {
+export const csam$$config$$service_csam_scanner_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/csam-config-service_api_response_single"
@@ -148,7 +148,7 @@ export const csam_config_service_csam_scanner_single_response_output: JsonSchema
 /**
  * The schema of `csam-config-service_csam_scanner_value` in responses.
  */
-export const csam_config_service_csam_scanner_value_output: JsonSchema = {
+export const csam$$config$$service_csam_scanner_value: JsonSchema = {
   "properties": {
     "email": {
       "type": "string"
diff --git a/src/generated/forge-mcp/csamScanner/schemas.ts b/src/generated/forge-mcp/csamScanner/schemas.ts
index d19fbd670..9fd5b37b9 100644
--- a/src/generated/forge-mcp/csamScanner/schemas.ts
+++ b/src/generated/forge-mcp/csamScanner/schemas.ts
@@ -6,8 +6,8 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `csam-config-service_csam_scanner_third_party_update_request`.
  */
-export const csam_config_service_csam_scanner_third_party_update_request: JsonSchema = {
-  "description": "Request body for updating CSAM Scanner configuration.\n",
+export const csam$$config$$service_csam_scanner_third_party_update_request: JsonSchema = {
+  "description": "Request body for updating CSAM Scanner configuration.",
   "properties": {
     "id": {
       "description": "The feature identifier.",
@@ -18,7 +18,7 @@ export const csam_config_service_csam_scanner_third_party_update_request: JsonSc
     },
     "value": {
       "$ref": "#/$defs/csam-config-service_csam_scanner_third_party_update_value",
-      "description": "Writable CSAM Scanner feature configuration values.\n"
+      "description": "Writable CSAM Scanner feature configuration values."
     }
   },
   "type": "object"
@@ -27,11 +27,11 @@ export const csam_config_service_csam_scanner_third_party_update_request: JsonSc
 /**
  * The schema of `csam-config-service_csam_scanner_third_party_update_value`.
  */
-export const csam_config_service_csam_scanner_third_party_update_value: JsonSchema = {
-  "description": "Writable CSAM Scanner feature configuration values.\n",
+export const csam$$config$$service_csam_scanner_third_party_update_value: JsonSchema = {
+  "description": "Writable CSAM Scanner feature configuration values.",
   "properties": {
     "email": {
-      "description": "Notification email address for CSAM scan results. When changed,\nemail verification is triggered automatically.\n",
+      "description": "Notification email address for CSAM scan results. When changed,\nemail verification is triggered automatically.",
       "type": "string"
     },
     "enabled": {
@@ -39,7 +39,7 @@ export const csam_config_service_csam_scanner_third_party_update_value: JsonSche
       "type": "boolean"
     },
     "resend_email": {
-      "description": "Set to true to trigger re-sending the email verification.\nWrite-only; never appears in responses (omitted when false).\n",
+      "description": "Set to true to trigger re-sending the email verification.\nWrite-only; never appears in responses (omitted when false).",
       "type": "boolean"
     },
     "sources": {
@@ -52,11 +52,3 @@ export const csam_config_service_csam_scanner_third_party_update_value: JsonSche
   },
   "type": "object"
 };
-
-/**
- * The schema of `csam-config-service_zone_identifier`.
- */
-export const csam_config_service_zone_identifier: JsonSchema = {
-  "description": "Identifier for the zone.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/csamScanner/tools.ts b/src/generated/forge-mcp/csamScanner/tools.ts
index 8ffb83993..b06294d1c 100644
--- a/src/generated/forge-mcp/csamScanner/tools.ts
+++ b/src/generated/forge-mcp/csamScanner/tools.ts
@@ -3,56 +3,64 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  csam_config_service_api_response_common_failure_output,
-  csam_config_service_api_response_message_output,
-  csam_config_service_api_response_single_output,
-  csam_config_service_csam_scanner_setting_output,
-  csam_config_service_csam_scanner_single_response_output,
-  csam_config_service_csam_scanner_value_output,
+  csam$$config$$service_api_response_common_failure,
+  csam$$config$$service_api_response_message,
+  csam$$config$$service_api_response_single,
+  csam$$config$$service_csam_scanner_setting,
+  csam$$config$$service_csam_scanner_single_response,
+  csam$$config$$service_csam_scanner_value,
 } from "./outputs.js";
 import {
-  csam_config_service_csam_scanner_third_party_update_request,
-  csam_config_service_csam_scanner_third_party_update_value,
-  csam_config_service_zone_identifier,
+  csam$$config$$service_csam_scanner_third_party_update_request,
+  csam$$config$$service_csam_scanner_third_party_update_value,
 } from "./schemas.js";
 
 /**
- * The tools of `csam_scanner`.
+ * The tools of `csamScanner`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "csam_scanner_edit",
+    name: "csamScanner_edit",
     title: "Update CSAM Scanner setting",
-    description: "Update the CSAM Scanner configuration for a zone. Allows enabling or\ndisabling CSAM scanning, updating the notification email, and\nconfiguring scanning sources.\n\nThis is a partial update: fields omitted from `value` keep their\ncurrent setting, and `sources` is merged per source (`null` clears\nall sources). Send an empty `email` to clear the notification\naddress.\n\nWhen a new email is provided, email verification is triggered\nautomatically. The `enabled` field is a toggle; the server may\nadjust it based on whether the notification email is verified.\n\nReturns 403 if the zone or account is locked by Trust & Safety.",
+    description: "Update the CSAM Scanner configuration for a zone. Allows enabling or\ndisabling CSAM scanning, updating the notification email, and\nconfiguring scanning sources.\n\nThis is a partial update: fields omitted from `value` keep their\ncurrent setting, and `sources` is merged per source (`null` clears\nall sources). Send an empty `email` to clear the notification\naddress.\n\nWhen a new email is provided, email verification is triggered\nautomatically. The `enabled` field is a toggle; the server may\nadjust it based on whether the notification email is verified.\n\nReturns 403 if the zone or account is locked by Trust & Safety.\n\nPATCH /zones/{zone_id}/settings/csam_scanner_third_party",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/csam-config-service_csam_scanner_third_party_update_request"
         },
-        "zone_id": {
-          "$ref": "#/$defs/csam-config-service_zone_identifier",
-          "description": "Identifier for the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier for the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "csam-config-service_csam_scanner_third_party_update_request": csam_config_service_csam_scanner_third_party_update_request,
-        "csam-config-service_csam_scanner_third_party_update_value": csam_config_service_csam_scanner_third_party_update_value,
-        "csam-config-service_zone_identifier": csam_config_service_zone_identifier,
+        "csam-config-service_csam_scanner_third_party_update_request": csam$$config$$service_csam_scanner_third_party_update_request,
+        "csam-config-service_csam_scanner_third_party_update_value": csam$$config$$service_csam_scanner_third_party_update_value,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/csam-config-service_csam_scanner_single_response",
       $defs: {
-        "csam-config-service_api_response_message": csam_config_service_api_response_message_output,
-        "csam-config-service_api_response_single": csam_config_service_api_response_single_output,
-        "csam-config-service_csam_scanner_setting": csam_config_service_csam_scanner_setting_output,
-        "csam-config-service_csam_scanner_single_response": csam_config_service_csam_scanner_single_response_output,
-        "csam-config-service_csam_scanner_value": csam_config_service_csam_scanner_value_output,
+        "csam-config-service_api_response_message": csam$$config$$service_api_response_message,
+        "csam-config-service_api_response_single": csam$$config$$service_api_response_single,
+        "csam-config-service_csam_scanner_setting": csam$$config$$service_csam_scanner_setting,
+        "csam-config-service_csam_scanner_single_response": csam$$config$$service_csam_scanner_single_response,
+        "csam-config-service_csam_scanner_value": csam$$config$$service_csam_scanner_value,
       },
     },
     annotations: {
@@ -91,12 +99,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "csam-config-service_api_response_common_failure": csam_config_service_api_response_common_failure_output,
-        "csam-config-service_api_response_message": csam_config_service_api_response_message_output,
-        "csam-config-service_api_response_single": csam_config_service_api_response_single_output,
-        "csam-config-service_csam_scanner_setting": csam_config_service_csam_scanner_setting_output,
-        "csam-config-service_csam_scanner_single_response": csam_config_service_csam_scanner_single_response_output,
-        "csam-config-service_csam_scanner_value": csam_config_service_csam_scanner_value_output,
+        "csam-config-service_api_response_common_failure": csam$$config$$service_api_response_common_failure,
+        "csam-config-service_api_response_message": csam$$config$$service_api_response_message,
+        "csam-config-service_api_response_single": csam$$config$$service_api_response_single,
+        "csam-config-service_csam_scanner_setting": csam$$config$$service_csam_scanner_setting,
+        "csam-config-service_csam_scanner_single_response": csam$$config$$service_csam_scanner_single_response,
+        "csam-config-service_csam_scanner_value": csam$$config$$service_csam_scanner_value,
       },
     },
     request: (args) => ({
@@ -105,32 +113,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "csam_scanner_get",
+    name: "csamScanner_get",
     title: "Get CSAM Scanner setting",
-    description: "Retrieve the current CSAM Scanner configuration for a zone.\n\nThe notification email is masked by default in responses.",
+    description: "Retrieve the current CSAM Scanner configuration for a zone.\n\nThe notification email is masked by default in responses.\n\nGET /zones/{zone_id}/settings/csam_scanner_third_party",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/csam-config-service_zone_identifier",
-          "description": "Identifier for the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier for the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "csam-config-service_zone_identifier": csam_config_service_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/csam-config-service_csam_scanner_single_response",
       $defs: {
-        "csam-config-service_api_response_message": csam_config_service_api_response_message_output,
-        "csam-config-service_api_response_single": csam_config_service_api_response_single_output,
-        "csam-config-service_csam_scanner_setting": csam_config_service_csam_scanner_setting_output,
-        "csam-config-service_csam_scanner_single_response": csam_config_service_csam_scanner_single_response_output,
-        "csam-config-service_csam_scanner_value": csam_config_service_csam_scanner_value_output,
+        "csam-config-service_api_response_message": csam$$config$$service_api_response_message,
+        "csam-config-service_api_response_single": csam$$config$$service_api_response_single,
+        "csam-config-service_csam_scanner_setting": csam$$config$$service_csam_scanner_setting,
+        "csam-config-service_csam_scanner_single_response": csam$$config$$service_csam_scanner_single_response,
+        "csam-config-service_csam_scanner_value": csam$$config$$service_csam_scanner_value,
       },
     },
     annotations: {
@@ -169,12 +184,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "csam-config-service_api_response_common_failure": csam_config_service_api_response_common_failure_output,
-        "csam-config-service_api_response_message": csam_config_service_api_response_message_output,
-        "csam-config-service_api_response_single": csam_config_service_api_response_single_output,
-        "csam-config-service_csam_scanner_setting": csam_config_service_csam_scanner_setting_output,
-        "csam-config-service_csam_scanner_single_response": csam_config_service_csam_scanner_single_response_output,
-        "csam-config-service_csam_scanner_value": csam_config_service_csam_scanner_value_output,
+        "csam-config-service_api_response_common_failure": csam$$config$$service_api_response_common_failure,
+        "csam-config-service_api_response_message": csam$$config$$service_api_response_message,
+        "csam-config-service_api_response_single": csam$$config$$service_api_response_single,
+        "csam-config-service_csam_scanner_setting": csam$$config$$service_csam_scanner_setting,
+        "csam-config-service_csam_scanner_single_response": csam$$config$$service_csam_scanner_single_response,
+        "csam-config-service_csam_scanner_value": csam$$config$$service_csam_scanner_value,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/customCsrs/outputs.ts b/src/generated/forge-mcp/customCsrs/outputs.ts
index c9e410b20..f6b8d81ca 100644
--- a/src/generated/forge-mcp/customCsrs/outputs.ts
+++ b/src/generated/forge-mcp/customCsrs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `tls-certificates-and-hostnames_custom_csr-2` in responses.
  */
-export const tls_certificates_and_hostnames_custom_csr_2_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_csr$$2: JsonSchema = {
   "properties": {
     "account_tag": {
       "type": "string"
@@ -28,7 +28,7 @@ export const tls_certificates_and_hostnames_custom_csr_2_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_identifier"
+      "type": "string"
     },
     "key_type": {
       "enum": [
@@ -67,20 +67,12 @@ export const tls_certificates_and_hostnames_custom_csr_2_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_custom_csr_identifier` in
- * responses.
- */
-export const tls_certificates_and_hostnames_custom_csr_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_custom_csr_response_collection-2` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_csr_response_collection_2_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_csr_response_collection$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -103,7 +95,7 @@ export const tls_certificates_and_hostnames_custom_csr_response_collection_2_out
  * The schema of `tls-certificates-and-hostnames_custom_csr_response_id_only` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_csr_response_id_only_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_csr_response_id_only: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -113,7 +105,7 @@ export const tls_certificates_and_hostnames_custom_csr_response_id_only_output:
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -128,7 +120,7 @@ export const tls_certificates_and_hostnames_custom_csr_response_id_only_output:
  * The schema of `tls-certificates-and-hostnames_custom_csr_response_single-2`
  * in responses.
  */
-export const tls_certificates_and_hostnames_custom_csr_response_single_2_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_csr_response_single$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
diff --git a/src/generated/forge-mcp/customCsrs/schemas.ts b/src/generated/forge-mcp/customCsrs/schemas.ts
index fb3a19112..3a9aadf90 100644
--- a/src/generated/forge-mcp/customCsrs/schemas.ts
+++ b/src/generated/forge-mcp/customCsrs/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `tls-certificates-and-hostnames_custom_csr_create_request-2`.
  */
-export const tls_certificates_and_hostnames_custom_csr_create_request_2: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_csr_create_request$$2: JsonSchema = {
   "description": "Request body for creating a custom CSR.",
   "properties": {
     "common_name": {
@@ -70,11 +70,3 @@ export const tls_certificates_and_hostnames_custom_csr_create_request_2: JsonSch
   ],
   "type": "object"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_custom_csr_identifier`.
- */
-export const tls_certificates_and_hostnames_custom_csr_identifier: JsonSchema = {
-  "description": "Custom CSR identifier tag.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/customCsrs/tools.ts b/src/generated/forge-mcp/customCsrs/tools.ts
index 67ac484df..08f19c676 100644
--- a/src/generated/forge-mcp/customCsrs/tools.ts
+++ b/src/generated/forge-mcp/customCsrs/tools.ts
@@ -1,72 +1,75 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../schemas.js";
 import {
-  tls_certificates_and_hostnames_custom_csr_2_output,
-  tls_certificates_and_hostnames_custom_csr_identifier_output,
-  tls_certificates_and_hostnames_custom_csr_response_collection_2_output,
-  tls_certificates_and_hostnames_custom_csr_response_id_only_output,
-  tls_certificates_and_hostnames_custom_csr_response_single_2_output,
+  tls$$certificates$$and$$hostnames_custom_csr$$2,
+  tls$$certificates$$and$$hostnames_custom_csr_response_collection$$2,
+  tls$$certificates$$and$$hostnames_custom_csr_response_id_only,
+  tls$$certificates$$and$$hostnames_custom_csr_response_single$$2,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_custom_csr_create_request_2,
-  tls_certificates_and_hostnames_custom_csr_identifier,
-} from "./schemas.js";
+import { tls$$certificates$$and$$hostnames_custom_csr_create_request$$2 } from "./schemas.js";
 
 /**
- * The tools of `custom_csrs`.
+ * The tools of `customCsrs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_csrs_create",
+    name: "customCsrs_create",
     title: "Create Custom CSR",
-    description: "Generate a new custom Certificate Signing Request (CSR) for an account or zone. Cloudflare generates and securely stores the private key associated with the CSR.",
+    description: "Generate a new custom Certificate Signing Request (CSR) for an account or zone. Cloudflare generates and securely stores the private key associated with the CSR.\n\nPOST /{account_or_zone}/{account_or_zone_id}/custom_csrs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_create_request-2"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_custom_csr_create_request-2": tls_certificates_and_hostnames_custom_csr_create_request_2,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
+        "tls-certificates-and-hostnames_custom_csr_create_request-2": tls$$certificates$$and$$hostnames_custom_csr_create_request$$2,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_response_single-2",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_custom_csr-2": tls_certificates_and_hostnames_custom_csr_2_output,
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_response_single-2": tls_certificates_and_hostnames_custom_csr_response_single_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom_csr-2": tls$$certificates$$and$$hostnames_custom_csr$$2,
+        "tls-certificates-and-hostnames_custom_csr_response_single-2": tls$$certificates$$and$$hostnames_custom_csr_response_single$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -111,12 +114,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_custom_csr-2": tls_certificates_and_hostnames_custom_csr_2_output,
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_response_single-2": tls_certificates_and_hostnames_custom_csr_response_single_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom_csr-2": tls$$certificates$$and$$hostnames_custom_csr$$2,
+        "tls-certificates-and-hostnames_custom_csr_response_single-2": tls$$certificates$$and$$hostnames_custom_csr_response_single$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -125,46 +127,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_csrs_delete",
+    name: "customCsrs_delete",
     title: "Delete Custom CSR",
-    description: "Delete a custom Certificate Signing Request (CSR) and its associated private key.",
+    description: "Delete a custom Certificate Signing Request (CSR) and its associated private key.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/custom_csrs/{custom_csr_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "custom_csr_id": {
+              "description": "Custom CSR identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "custom_csr_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "custom_csr_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_identifier",
-          "description": "Custom CSR identifier tag."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "custom_csr_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_response_id_only",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_response_id_only": tls_certificates_and_hostnames_custom_csr_response_id_only_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom_csr_response_id_only": tls$$certificates$$and$$hostnames_custom_csr_response_id_only,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -209,11 +216,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_response_id_only": tls_certificates_and_hostnames_custom_csr_response_id_only_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom_csr_response_id_only": tls$$certificates$$and$$hostnames_custom_csr_response_id_only,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -221,47 +227,52 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_csrs_get",
+    name: "customCsrs_get",
     title: "Custom CSR Details",
-    description: "Retrieve details for a specific custom Certificate Signing Request (CSR).",
+    description: "Retrieve details for a specific custom Certificate Signing Request (CSR).\n\nGET /{account_or_zone}/{account_or_zone_id}/custom_csrs/{custom_csr_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "custom_csr_id": {
+              "description": "Custom CSR identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "custom_csr_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "custom_csr_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_identifier",
-          "description": "Custom CSR identifier tag."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "custom_csr_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_response_single-2",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_custom_csr-2": tls_certificates_and_hostnames_custom_csr_2_output,
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_response_single-2": tls_certificates_and_hostnames_custom_csr_response_single_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom_csr-2": tls$$certificates$$and$$hostnames_custom_csr$$2,
+        "tls-certificates-and-hostnames_custom_csr_response_single-2": tls$$certificates$$and$$hostnames_custom_csr_response_single$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -307,12 +318,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_custom_csr-2": tls_certificates_and_hostnames_custom_csr_2_output,
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_response_single-2": tls_certificates_and_hostnames_custom_csr_response_single_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_custom_csr-2": tls$$certificates$$and$$hostnames_custom_csr$$2,
+        "tls-certificates-and-hostnames_custom_csr_response_single-2": tls$$certificates$$and$$hostnames_custom_csr_response_single$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -320,71 +330,83 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_csrs_list",
+    name: "customCsrs_list",
     title: "List Custom CSRs",
-    description: "List all custom Certificate Signing Requests (CSRs) for an account or zone.",
+    description: "List all custom Certificate Signing Requests (CSRs) for an account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/custom_csrs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "direction": {
-          "default": "asc",
-          "description": "The direction to sort by.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "The field to sort the returned custom CSRs by.",
-          "enum": [
-            "name",
-            "account_tag",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "Number of custom CSRs per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "The direction to sort by.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "The field to sort the returned custom CSRs by.",
+              "enum": [
+                "name",
+                "account_tag",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of custom CSRs per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_response_collection-2",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_csr-2": tls_certificates_and_hostnames_custom_csr_2_output,
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_response_collection-2": tls_certificates_and_hostnames_custom_csr_response_collection_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_custom_csr-2": tls$$certificates$$and$$hostnames_custom_csr$$2,
+        "tls-certificates-and-hostnames_custom_csr_response_collection-2": tls$$certificates$$and$$hostnames_custom_csr_response_collection$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -430,22 +452,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_custom_csr-2": tls_certificates_and_hostnames_custom_csr_2_output,
-        "tls-certificates-and-hostnames_custom_csr_identifier": tls_certificates_and_hostnames_custom_csr_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_response_collection-2": tls_certificates_and_hostnames_custom_csr_response_collection_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_custom_csr-2": tls$$certificates$$and$$hostnames_custom_csr$$2,
+        "tls-certificates-and-hostnames_custom_csr_response_collection-2": tls$$certificates$$and$$hostnames_custom_csr_response_collection$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/custom_csrs`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/customHostnames/certificatePack/certificates/tools.ts b/src/generated/forge-mcp/customHostnames/certificatePack/certificates/tools.ts
index 9e4d02d44..5901862f1 100644
--- a/src/generated/forge-mcp/customHostnames/certificatePack/certificates/tools.ts
+++ b/src/generated/forge-mcp/customHostnames/certificatePack/certificates/tools.ts
@@ -3,85 +3,77 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_validation_record_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_messages,
+  tls$$certificates$$and$$hostnames_validation_record,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_certificate_authority_output,
-  tls_certificates_and_hostnames_created_at_output,
-  tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-  tls_certificates_and_hostnames_custom_hostname_identifier_output,
-  tls_certificates_and_hostnames_custom_hostname_output,
-  tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-  tls_certificates_and_hostnames_custom_hostname_response_single_output,
-  tls_certificates_and_hostnames_custom_metadata_output,
-  tls_certificates_and_hostnames_custom_origin_server_output,
-  tls_certificates_and_hostnames_custom_origin_sni_output,
-  tls_certificates_and_hostnames_customhostname_output,
-  tls_certificates_and_hostnames_hostname_output,
-  tls_certificates_and_hostnames_ownership_verification_http_output,
-  tls_certificates_and_hostnames_ownership_verification_output,
-  tls_certificates_and_hostnames_ssl_output,
-  tls_certificates_and_hostnames_sslsettings_output,
-  tls_certificates_and_hostnames_status_3_output,
-  tls_certificates_and_hostnames_verification_errors_output,
+  tls$$certificates$$and$$hostnames_custom$$hostname,
+  tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+  tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+  tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+  tls$$certificates$$and$$hostnames_custom_metadata,
+  tls$$certificates$$and$$hostnames_customhostname,
+  tls$$certificates$$and$$hostnames_ownership_verification,
+  tls$$certificates$$and$$hostnames_ownership_verification_http,
+  tls$$certificates$$and$$hostnames_ssl,
+  tls$$certificates$$and$$hostnames_sslsettings,
+  tls$$certificates$$and$$hostnames_verification_errors,
 } from "../../outputs.js";
-import {
-  tls_certificates_and_hostnames_custom_cert_and_key,
-  tls_certificates_and_hostnames_custom_hostname_identifier,
-} from "../../schemas.js";
+import { tls$$certificates$$and$$hostnames_custom_cert_and_key } from "../../schemas.js";
 
 /**
- * The tools of `custom_hostnames.certificate_pack.certificates`.
+ * The tools of `customHostnames.certificatePack.certificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_hostnames_certificate_pack_certificates_delete",
+    name: "customHostnames_certificatePack_certificates_delete",
     title: "Delete Single Certificate And Key For Custom Hostname",
-    description: "Delete a single custom certificate from a certificate pack that contains two bundled certificates. Deletion is subject to the following constraints. You cannot delete a certificate if it is the only remaining certificate in the pack. At least one certificate must remain in the pack.",
+    description: "Delete a single custom certificate from a certificate pack that contains two bundled certificates. Deletion is subject to the following constraints. You cannot delete a certificate if it is the only remaining certificate in the pack. At least one certificate must remain in the pack.\n\nDELETE /zones/{zone_id}/custom_hostnames/{custom_hostname_id}/certificate_pack/{certificate_pack_id}/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "certificate_pack_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "custom_hostname_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "certificate_pack_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "custom_hostname_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_hostname_id",
+            "certificate_pack_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_hostname_id",
-        "certificate_pack_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
         "id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier"
+          "type": "string"
         }
       },
       "type": "object",
-      $defs: {
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -108,7 +100,7 @@ export const tools: readonly Tool[] = [
         "202": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -118,7 +110,7 @@ export const tools: readonly Tool[] = [
             {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -130,9 +122,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -140,68 +131,69 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_hostnames_certificate_pack_certificates_update",
+    name: "customHostnames_certificatePack_certificates_update",
     title: "Replace Custom Certificate and Custom Key In Custom Hostname",
-    description: "Replace a single custom certificate within a certificate pack that contains two bundled certificates. The replacement must adhere to the following constraints. You can only replace an RSA certificate with another RSA certificate or an ECDSA certificate with another ECDSA certificate.",
+    description: "Replace a single custom certificate within a certificate pack that contains two bundled certificates. The replacement must adhere to the following constraints. You can only replace an RSA certificate with another RSA certificate or an ECDSA certificate with another ECDSA certificate.\n\nPUT /zones/{zone_id}/custom_hostnames/{custom_hostname_id}/certificate_pack/{certificate_pack_id}/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/tls-certificates-and-hostnames_custom_cert_and_key"
         },
-        "certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "certificate_pack_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "custom_hostname_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "certificate_pack_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "custom_hostname_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_hostname_id",
+            "certificate_pack_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_hostname_id",
-        "certificate_pack_id",
-        "certificate_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_custom_cert_and_key": tls_certificates_and_hostnames_custom_cert_and_key,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
+        "tls-certificates-and-hostnames_custom_cert_and_key": tls$$certificates$$and$$hostnames_custom_cert_and_key,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_single": tls_certificates_and_hostnames_custom_hostname_response_single_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_hostname_response_single": tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     annotations: {
@@ -241,27 +233,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_single": tls_certificates_and_hostnames_custom_hostname_response_single_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_hostname_response_single": tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/customHostnames/fallbackOrigin/outputs.ts b/src/generated/forge-mcp/customHostnames/fallbackOrigin/outputs.ts
index b88c1df4c..8d178ce67 100644
--- a/src/generated/forge-mcp/customHostnames/fallbackOrigin/outputs.ts
+++ b/src/generated/forge-mcp/customHostnames/fallbackOrigin/outputs.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_created_at-2` in responses.
- */
-export const tls_certificates_and_hostnames_created_at_2_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_errors` in responses.
  */
-export const tls_certificates_and_hostnames_errors_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_errors: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -25,7 +17,7 @@ export const tls_certificates_and_hostnames_errors_output: JsonSchema = {
  * The schema of `tls-certificates-and-hostnames_fallback_origin_response` in
  * responses.
  */
-export const tls_certificates_and_hostnames_fallback_origin_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_fallback_origin_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -44,53 +36,33 @@ export const tls_certificates_and_hostnames_fallback_origin_response_output: Jso
 /**
  * The schema of `tls-certificates-and-hostnames_fallbackorigin` in responses.
  */
-export const tls_certificates_and_hostnames_fallbackorigin_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_fallbackorigin: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_created_at-2"
+      "format": "date-time",
+      "type": "string"
     },
     "errors": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_errors"
     },
     "origin": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_origin"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-4"
+      "enum": [
+        "initializing",
+        "pending_deployment",
+        "pending_deletion",
+        "active",
+        "deployment_timed_out",
+        "deletion_timed_out"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_origin` in responses.
- */
-export const tls_certificates_and_hostnames_origin_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_status-4` in responses.
- */
-export const tls_certificates_and_hostnames_status_4_output: JsonSchema = {
-  "enum": [
-    "initializing",
-    "pending_deployment",
-    "pending_deletion",
-    "active",
-    "deployment_timed_out",
-    "deletion_timed_out"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_updated_at` in responses.
- */
-export const tls_certificates_and_hostnames_updated_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/customHostnames/fallbackOrigin/schemas.ts b/src/generated/forge-mcp/customHostnames/fallbackOrigin/schemas.ts
deleted file mode 100644
index ca4ffedce..000000000
--- a/src/generated/forge-mcp/customHostnames/fallbackOrigin/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_origin`.
- */
-export const tls_certificates_and_hostnames_origin: JsonSchema = {
-  "description": "Your origin hostname that requests to your custom hostnames will be sent to.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/customHostnames/fallbackOrigin/tools.ts b/src/generated/forge-mcp/customHostnames/fallbackOrigin/tools.ts
index 98cf0f08a..1de34ca83 100644
--- a/src/generated/forge-mcp/customHostnames/fallbackOrigin/tools.ts
+++ b/src/generated/forge-mcp/customHostnames/fallbackOrigin/tools.ts
@@ -3,57 +3,54 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_created_at_2_output,
-  tls_certificates_and_hostnames_errors_output,
-  tls_certificates_and_hostnames_fallback_origin_response_output,
-  tls_certificates_and_hostnames_fallbackorigin_output,
-  tls_certificates_and_hostnames_origin_output,
-  tls_certificates_and_hostnames_status_4_output,
-  tls_certificates_and_hostnames_updated_at_output,
+  tls$$certificates$$and$$hostnames_errors,
+  tls$$certificates$$and$$hostnames_fallback_origin_response,
+  tls$$certificates$$and$$hostnames_fallbackorigin,
 } from "./outputs.js";
-import { tls_certificates_and_hostnames_origin } from "./schemas.js";
 
 /**
- * The tools of `custom_hostnames.fallback_origin`.
+ * The tools of `customHostnames.fallbackOrigin`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_hostnames_fallback_origin_delete",
+    name: "customHostnames_fallbackOrigin_delete",
     title: "Delete Fallback Origin for Custom Hostnames",
-    description: "Removes the fallback origin configuration for custom hostnames on a zone. Custom hostnames without specific origins will no longer have a fallback.",
+    description: "Removes the fallback origin configuration for custom hostnames on a zone. Custom hostnames without specific origins will no longer have a fallback.\n\nDELETE /zones/{zone_id}/custom_hostnames/fallback_origin",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_fallback_origin_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-2": tls_certificates_and_hostnames_created_at_2_output,
-        "tls-certificates-and-hostnames_errors": tls_certificates_and_hostnames_errors_output,
-        "tls-certificates-and-hostnames_fallback_origin_response": tls_certificates_and_hostnames_fallback_origin_response_output,
-        "tls-certificates-and-hostnames_fallbackorigin": tls_certificates_and_hostnames_fallbackorigin_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin": tls_certificates_and_hostnames_origin_output,
-        "tls-certificates-and-hostnames_status-4": tls_certificates_and_hostnames_status_4_output,
-        "tls-certificates-and-hostnames_updated_at": tls_certificates_and_hostnames_updated_at_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_errors": tls$$certificates$$and$$hostnames_errors,
+        "tls-certificates-and-hostnames_fallback_origin_response": tls$$certificates$$and$$hostnames_fallback_origin_response,
+        "tls-certificates-and-hostnames_fallbackorigin": tls$$certificates$$and$$hostnames_fallbackorigin,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -98,16 +95,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-2": tls_certificates_and_hostnames_created_at_2_output,
-        "tls-certificates-and-hostnames_errors": tls_certificates_and_hostnames_errors_output,
-        "tls-certificates-and-hostnames_fallback_origin_response": tls_certificates_and_hostnames_fallback_origin_response_output,
-        "tls-certificates-and-hostnames_fallbackorigin": tls_certificates_and_hostnames_fallbackorigin_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin": tls_certificates_and_hostnames_origin_output,
-        "tls-certificates-and-hostnames_status-4": tls_certificates_and_hostnames_status_4_output,
-        "tls-certificates-and-hostnames_updated_at": tls_certificates_and_hostnames_updated_at_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_errors": tls$$certificates$$and$$hostnames_errors,
+        "tls-certificates-and-hostnames_fallback_origin_response": tls$$certificates$$and$$hostnames_fallback_origin_response,
+        "tls-certificates-and-hostnames_fallbackorigin": tls$$certificates$$and$$hostnames_fallbackorigin,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -115,36 +108,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_hostnames_fallback_origin_get",
+    name: "customHostnames_fallbackOrigin_get",
     title: "Get Fallback Origin for Custom Hostnames",
-    description: "Retrieves the current fallback origin configuration for custom hostnames on a zone. The fallback origin handles traffic when specific custom hostname origins are unavailable.",
+    description: "Retrieves the current fallback origin configuration for custom hostnames on a zone. The fallback origin handles traffic when specific custom hostname origins are unavailable.\n\nGET /zones/{zone_id}/custom_hostnames/fallback_origin",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_fallback_origin_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-2": tls_certificates_and_hostnames_created_at_2_output,
-        "tls-certificates-and-hostnames_errors": tls_certificates_and_hostnames_errors_output,
-        "tls-certificates-and-hostnames_fallback_origin_response": tls_certificates_and_hostnames_fallback_origin_response_output,
-        "tls-certificates-and-hostnames_fallbackorigin": tls_certificates_and_hostnames_fallbackorigin_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin": tls_certificates_and_hostnames_origin_output,
-        "tls-certificates-and-hostnames_status-4": tls_certificates_and_hostnames_status_4_output,
-        "tls-certificates-and-hostnames_updated_at": tls_certificates_and_hostnames_updated_at_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_errors": tls$$certificates$$and$$hostnames_errors,
+        "tls-certificates-and-hostnames_fallback_origin_response": tls$$certificates$$and$$hostnames_fallback_origin_response,
+        "tls-certificates-and-hostnames_fallbackorigin": tls$$certificates$$and$$hostnames_fallbackorigin,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -190,16 +186,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-2": tls_certificates_and_hostnames_created_at_2_output,
-        "tls-certificates-and-hostnames_errors": tls_certificates_and_hostnames_errors_output,
-        "tls-certificates-and-hostnames_fallback_origin_response": tls_certificates_and_hostnames_fallback_origin_response_output,
-        "tls-certificates-and-hostnames_fallbackorigin": tls_certificates_and_hostnames_fallbackorigin_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin": tls_certificates_and_hostnames_origin_output,
-        "tls-certificates-and-hostnames_status-4": tls_certificates_and_hostnames_status_4_output,
-        "tls-certificates-and-hostnames_updated_at": tls_certificates_and_hostnames_updated_at_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_errors": tls$$certificates$$and$$hostnames_errors,
+        "tls-certificates-and-hostnames_fallback_origin_response": tls$$certificates$$and$$hostnames_fallback_origin_response,
+        "tls-certificates-and-hostnames_fallbackorigin": tls$$certificates$$and$$hostnames_fallbackorigin,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -207,17 +199,17 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_hostnames_fallback_origin_update",
+    name: "customHostnames_fallbackOrigin_update",
     title: "Update Fallback Origin for Custom Hostnames",
-    description: "Updates the fallback origin configuration for custom hostnames on a zone. Sets the default origin server for custom hostname traffic.",
+    description: "Updates the fallback origin configuration for custom hostnames on a zone. Sets the default origin server for custom hostname traffic.\n\nPUT /zones/{zone_id}/custom_hostnames/fallback_origin",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "origin": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_origin",
-              "description": "Your origin hostname that requests to your custom hostnames will be sent to."
+              "description": "Your origin hostname that requests to your custom hostnames will be sent to.",
+              "type": "string"
             }
           },
           "required": [
@@ -225,32 +217,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_origin": tls_certificates_and_hostnames_origin,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_fallback_origin_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-2": tls_certificates_and_hostnames_created_at_2_output,
-        "tls-certificates-and-hostnames_errors": tls_certificates_and_hostnames_errors_output,
-        "tls-certificates-and-hostnames_fallback_origin_response": tls_certificates_and_hostnames_fallback_origin_response_output,
-        "tls-certificates-and-hostnames_fallbackorigin": tls_certificates_and_hostnames_fallbackorigin_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin": tls_certificates_and_hostnames_origin_output,
-        "tls-certificates-and-hostnames_status-4": tls_certificates_and_hostnames_status_4_output,
-        "tls-certificates-and-hostnames_updated_at": tls_certificates_and_hostnames_updated_at_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_errors": tls$$certificates$$and$$hostnames_errors,
+        "tls-certificates-and-hostnames_fallback_origin_response": tls$$certificates$$and$$hostnames_fallback_origin_response,
+        "tls-certificates-and-hostnames_fallbackorigin": tls$$certificates$$and$$hostnames_fallbackorigin,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -295,16 +289,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-2": tls_certificates_and_hostnames_created_at_2_output,
-        "tls-certificates-and-hostnames_errors": tls_certificates_and_hostnames_errors_output,
-        "tls-certificates-and-hostnames_fallback_origin_response": tls_certificates_and_hostnames_fallback_origin_response_output,
-        "tls-certificates-and-hostnames_fallbackorigin": tls_certificates_and_hostnames_fallbackorigin_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin": tls_certificates_and_hostnames_origin_output,
-        "tls-certificates-and-hostnames_status-4": tls_certificates_and_hostnames_status_4_output,
-        "tls-certificates-and-hostnames_updated_at": tls_certificates_and_hostnames_updated_at_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_errors": tls$$certificates$$and$$hostnames_errors,
+        "tls-certificates-and-hostnames_fallback_origin_response": tls$$certificates$$and$$hostnames_fallback_origin_response,
+        "tls-certificates-and-hostnames_fallbackorigin": tls$$certificates$$and$$hostnames_fallbackorigin,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/customHostnames/outputs.ts b/src/generated/forge-mcp/customHostnames/outputs.ts
index 1a80cb85f..16265dfc6 100644
--- a/src/generated/forge-mcp/customHostnames/outputs.ts
+++ b/src/generated/forge-mcp/customHostnames/outputs.ts
@@ -3,40 +3,18 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_authority` in
- * responses.
- */
-export const tls_certificates_and_hostnames_certificate_authority_output: JsonSchema = {
-  "enum": [
-    "digicert",
-    "google",
-    "lets_encrypt",
-    "ssl_com"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_created_at` in responses.
- */
-export const tls_certificates_and_hostnames_created_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_custom-hostname` in responses.
  */
-export const tls_certificates_and_hostnames_custom_hostname_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom$$hostname: JsonSchema = {
   "allOf": [
     {
       "properties": {
         "hostname": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname"
+          "type": "string"
         },
         "id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier"
+          "type": "string"
         },
         "ssl": {
           "$ref": "#/$defs/tls-certificates-and-hostnames_ssl"
@@ -59,7 +37,7 @@ export const tls_certificates_and_hostnames_custom_hostname_output: JsonSchema =
  * `tls-certificates-and-hostnames_custom_hostname_api_response_common` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_hostname_api_response_common_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_hostname_api_response_common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_messages"
@@ -82,20 +60,12 @@ export const tls_certificates_and_hostnames_custom_hostname_api_response_common_
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_custom_hostname_identifier` in
- * responses.
- */
-export const tls_certificates_and_hostnames_custom_hostname_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_custom_hostname_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_hostname_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_hostname_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_api_response_common"
@@ -122,7 +92,7 @@ export const tls_certificates_and_hostnames_custom_hostname_response_collection_
  * `tls-certificates-and-hostnames_custom_hostname_response_messages` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_hostname_response_messages_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_hostname_response_messages: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -134,7 +104,7 @@ export const tls_certificates_and_hostnames_custom_hostname_response_messages_ou
  * `tls-certificates-and-hostnames_custom_hostname_response_single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_hostname_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_hostname_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_api_response_common"
@@ -153,51 +123,36 @@ export const tls_certificates_and_hostnames_custom_hostname_response_single_outp
 /**
  * The schema of `tls-certificates-and-hostnames_custom_metadata` in responses.
  */
-export const tls_certificates_and_hostnames_custom_metadata_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_metadata: JsonSchema = {
   "additionalProperties": {
     "type": "string"
   },
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_custom_origin_server` in
- * responses.
- */
-export const tls_certificates_and_hostnames_custom_origin_server_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_custom_origin_sni` in
- * responses.
- */
-export const tls_certificates_and_hostnames_custom_origin_sni_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_customhostname` in responses.
  */
-export const tls_certificates_and_hostnames_customhostname_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_customhostname: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "custom_metadata": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_metadata"
     },
     "custom_origin_server": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_custom_origin_server"
+      "type": "string"
     },
     "custom_origin_sni": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_custom_origin_sni"
+      "type": "string"
     },
     "hostname": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_hostname"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier"
+      "type": "string"
     },
     "ownership_verification": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ownership_verification"
@@ -209,7 +164,25 @@ export const tls_certificates_and_hostnames_customhostname_output: JsonSchema =
       "$ref": "#/$defs/tls-certificates-and-hostnames_ssl"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-3"
+      "enum": [
+        "active",
+        "pending",
+        "active_redeploying",
+        "moved",
+        "pending_deletion",
+        "deleted",
+        "pending_blocked",
+        "pending_migration",
+        "pending_provisioned",
+        "test_pending",
+        "test_active",
+        "test_active_apex",
+        "test_blocked",
+        "test_failed",
+        "provisioned",
+        "blocked"
+      ],
+      "type": "string"
     },
     "verification_errors": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_verification_errors"
@@ -218,18 +191,11 @@ export const tls_certificates_and_hostnames_customhostname_output: JsonSchema =
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_hostname` in responses.
- */
-export const tls_certificates_and_hostnames_hostname_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_ownership_verification` in
  * responses.
  */
-export const tls_certificates_and_hostnames_ownership_verification_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ownership_verification: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -251,7 +217,7 @@ export const tls_certificates_and_hostnames_ownership_verification_output: JsonS
  * The schema of `tls-certificates-and-hostnames_ownership_verification_http` in
  * responses.
  */
-export const tls_certificates_and_hostnames_ownership_verification_http_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ownership_verification_http: JsonSchema = {
   "properties": {
     "http_body": {
       "type": "string"
@@ -266,7 +232,7 @@ export const tls_certificates_and_hostnames_ownership_verification_http_output:
 /**
  * The schema of `tls-certificates-and-hostnames_result_info` in responses.
  */
-export const tls_certificates_and_hostnames_result_info_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -290,7 +256,7 @@ export const tls_certificates_and_hostnames_result_info_output: JsonSchema = {
 /**
  * The schema of `tls-certificates-and-hostnames_ssl` in responses.
  */
-export const tls_certificates_and_hostnames_ssl_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ssl: JsonSchema = {
   "properties": {
     "bundle_method": {
       "enum": [
@@ -301,7 +267,13 @@ export const tls_certificates_and_hostnames_ssl_output: JsonSchema = {
       "type": "string"
     },
     "certificate_authority": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_authority"
+      "enum": [
+        "digicert",
+        "google",
+        "lets_encrypt",
+        "ssl_com"
+      ],
+      "type": "string"
     },
     "custom_certificate": {
       "type": "string"
@@ -414,7 +386,7 @@ export const tls_certificates_and_hostnames_ssl_output: JsonSchema = {
 /**
  * The schema of `tls-certificates-and-hostnames_sslsettings` in responses.
  */
-export const tls_certificates_and_hostnames_sslsettings_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_sslsettings: JsonSchema = {
   "properties": {
     "ciphers": {
       "items": {
@@ -456,36 +428,11 @@ export const tls_certificates_and_hostnames_sslsettings_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_status-3` in responses.
- */
-export const tls_certificates_and_hostnames_status_3_output: JsonSchema = {
-  "enum": [
-    "active",
-    "pending",
-    "active_redeploying",
-    "moved",
-    "pending_deletion",
-    "deleted",
-    "pending_blocked",
-    "pending_migration",
-    "pending_provisioned",
-    "test_pending",
-    "test_active",
-    "test_active_apex",
-    "test_blocked",
-    "test_failed",
-    "provisioned",
-    "blocked"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_verification_errors` in
  * responses.
  */
-export const tls_certificates_and_hostnames_verification_errors_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_verification_errors: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/customHostnames/quota/outputs.ts b/src/generated/forge-mcp/customHostnames/quota/outputs.ts
index 93b1f8a0f..e960cd1a9 100644
--- a/src/generated/forge-mcp/customHostnames/quota/outputs.ts
+++ b/src/generated/forge-mcp/customHostnames/quota/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * `tls-certificates-and-hostnames_custom_hostname_api_response_failure` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_hostname_api_response_failure_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_hostname_api_response_failure: JsonSchema = {
   "properties": {
     "errors": {
       "allOf": [
@@ -50,7 +50,7 @@ export const tls_certificates_and_hostnames_custom_hostname_api_response_failure
  * The schema of `tls-certificates-and-hostnames_custom_hostname_quota` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_hostname_quota_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_hostname_quota: JsonSchema = {
   "properties": {
     "allocated": {
       "type": "integer"
@@ -78,7 +78,7 @@ export const tls_certificates_and_hostnames_custom_hostname_quota_output: JsonSc
  * The schema of `tls-certificates-and-hostnames_custom_hostname_quota_response`
  * in responses.
  */
-export const tls_certificates_and_hostnames_custom_hostname_quota_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_hostname_quota_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_api_response_common"
diff --git a/src/generated/forge-mcp/customHostnames/quota/tools.ts b/src/generated/forge-mcp/customHostnames/quota/tools.ts
index 34d7339c2..685e0aa26 100644
--- a/src/generated/forge-mcp/customHostnames/quota/tools.ts
+++ b/src/generated/forge-mcp/customHostnames/quota/tools.ts
@@ -2,49 +2,55 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
-import { tls_certificates_and_hostnames_messages_output } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
+import { tls$$certificates$$and$$hostnames_messages } from "../../outputs.js";
 import {
-  tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-  tls_certificates_and_hostnames_custom_hostname_response_messages_output,
+  tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+  tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
 } from "../outputs.js";
 import {
-  tls_certificates_and_hostnames_custom_hostname_api_response_failure_output,
-  tls_certificates_and_hostnames_custom_hostname_quota_output,
-  tls_certificates_and_hostnames_custom_hostname_quota_response_output,
+  tls$$certificates$$and$$hostnames_custom_hostname_api_response_failure,
+  tls$$certificates$$and$$hostnames_custom_hostname_quota,
+  tls$$certificates$$and$$hostnames_custom_hostname_quota_response,
 } from "./outputs.js";
 
 /**
- * The tools of `custom_hostnames.quota`.
+ * The tools of `customHostnames.quota`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_hostnames_quota_get",
+    name: "customHostnames_quota_get",
     title: "Get Custom Hostname Quota",
-    description: "Returns custom hostname quota usage for a zone. The allocated quota is a soft limit; creating custom hostnames after usage exceeds this limit can still succeed until the hard cap is reached. Use the exceeded and hard_cap fields to track when usage is above the soft limit and when new custom hostname creation will be rejected.",
+    description: "Returns custom hostname quota usage for a zone. The allocated quota is a soft limit; creating custom hostnames after usage exceeds this limit can still succeed until the hard cap is reached. Use the exceeded and hard_cap fields to track when usage is above the soft limit and when new custom hostname creation will be rejected.\n\nGET /zones/{zone_id}/custom_hostnames/quota",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_quota_response",
       $defs: {
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_quota": tls_certificates_and_hostnames_custom_hostname_quota_output,
-        "tls-certificates-and-hostnames_custom_hostname_quota_response": tls_certificates_and_hostnames_custom_hostname_quota_response_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_quota": tls$$certificates$$and$$hostnames_custom_hostname_quota,
+        "tls-certificates-and-hostnames_custom_hostname_quota_response": tls$$certificates$$and$$hostnames_custom_hostname_quota_response,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -78,12 +84,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_failure": tls_certificates_and_hostnames_custom_hostname_api_response_failure_output,
-        "tls-certificates-and-hostnames_custom_hostname_quota": tls_certificates_and_hostnames_custom_hostname_quota_output,
-        "tls-certificates-and-hostnames_custom_hostname_quota_response": tls_certificates_and_hostnames_custom_hostname_quota_response_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_failure": tls$$certificates$$and$$hostnames_custom_hostname_api_response_failure,
+        "tls-certificates-and-hostnames_custom_hostname_quota": tls$$certificates$$and$$hostnames_custom_hostname_quota,
+        "tls-certificates-and-hostnames_custom_hostname_quota_response": tls$$certificates$$and$$hostnames_custom_hostname_quota_response,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/customHostnames/schemas.ts b/src/generated/forge-mcp/customHostnames/schemas.ts
index b460e0527..e585450f6 100644
--- a/src/generated/forge-mcp/customHostnames/schemas.ts
+++ b/src/generated/forge-mcp/customHostnames/schemas.ts
@@ -3,24 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_authority`.
- */
-export const tls_certificates_and_hostnames_certificate_authority: JsonSchema = {
-  "description": "The Certificate Authority that will issue the certificate.",
-  "enum": [
-    "digicert",
-    "google",
-    "lets_encrypt",
-    "ssl_com"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_custom_cert_and_key`.
  */
-export const tls_certificates_and_hostnames_custom_cert_and_key: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_cert_and_key: JsonSchema = {
   "properties": {
     "custom_certificate": {
       "description": "If a custom uploaded certificate is used.",
@@ -41,7 +27,7 @@ export const tls_certificates_and_hostnames_custom_cert_and_key: JsonSchema = {
 /**
  * The schema of `tls-certificates-and-hostnames_custom_cert_bundle`.
  */
-export const tls_certificates_and_hostnames_custom_cert_bundle: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_cert_bundle: JsonSchema = {
   "description": "Array of custom certificate and key pairs (1 or 2 pairs allowed).",
   "items": {
     "$ref": "#/$defs/tls-certificates-and-hostnames_custom_cert_and_key"
@@ -51,18 +37,10 @@ export const tls_certificates_and_hostnames_custom_cert_bundle: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_custom_hostname_identifier`.
- */
-export const tls_certificates_and_hostnames_custom_hostname_identifier: JsonSchema = {
-  "description": "Custom hostname identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_custom_metadata`.
  */
-export const tls_certificates_and_hostnames_custom_metadata: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom_metadata: JsonSchema = {
   "additionalProperties": {
     "type": "string"
   },
@@ -70,34 +48,10 @@ export const tls_certificates_and_hostnames_custom_metadata: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_custom_origin_server`.
- */
-export const tls_certificates_and_hostnames_custom_origin_server: JsonSchema = {
-  "description": "a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME record.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_custom_origin_sni`.
- */
-export const tls_certificates_and_hostnames_custom_origin_sni: JsonSchema = {
-  "description": "A hostname that will be sent to your custom origin server as SNI for TLS handshake. This can be a valid subdomain of the zone or custom origin server name or the string ':request_host_header:' which will cause the host header in the request to be used as SNI. Not configurable with default/fallback origin server.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_hostname_post`.
- */
-export const tls_certificates_and_hostnames_hostname_post: JsonSchema = {
-  "description": "The custom hostname that will point to your hostname via CNAME.",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_sslpost`.
  */
-export const tls_certificates_and_hostnames_sslpost: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_sslpost: JsonSchema = {
   "description": "SSL properties used when creating the custom hostname.",
   "properties": {
     "bundle_method": {
@@ -111,8 +65,14 @@ export const tls_certificates_and_hostnames_sslpost: JsonSchema = {
       "type": "string"
     },
     "certificate_authority": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_authority",
-      "description": "The Certificate Authority that will issue the certificate."
+      "description": "The Certificate Authority that will issue the certificate.",
+      "enum": [
+        "digicert",
+        "google",
+        "lets_encrypt",
+        "ssl_com"
+      ],
+      "type": "string"
     },
     "cloudflare_branding": {
       "description": "Whether or not to add Cloudflare Branding for the order.  This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to true.",
@@ -165,7 +125,7 @@ export const tls_certificates_and_hostnames_sslpost: JsonSchema = {
 /**
  * The schema of `tls-certificates-and-hostnames_sslsettings`.
  */
-export const tls_certificates_and_hostnames_sslsettings: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_sslsettings: JsonSchema = {
   "description": "SSL specific settings.",
   "properties": {
     "ciphers": {
diff --git a/src/generated/forge-mcp/customHostnames/tools.ts b/src/generated/forge-mcp/customHostnames/tools.ts
index c7d929a51..58bc3f0c1 100644
--- a/src/generated/forge-mcp/customHostnames/tools.ts
+++ b/src/generated/forge-mcp/customHostnames/tools.ts
@@ -1,56 +1,43 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_validation_record_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_messages,
+  tls$$certificates$$and$$hostnames_validation_record,
 } from "../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../schemas.js";
 import {
-  tls_certificates_and_hostnames_certificate_authority_output,
-  tls_certificates_and_hostnames_created_at_output,
-  tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-  tls_certificates_and_hostnames_custom_hostname_identifier_output,
-  tls_certificates_and_hostnames_custom_hostname_output,
-  tls_certificates_and_hostnames_custom_hostname_response_collection_output,
-  tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-  tls_certificates_and_hostnames_custom_hostname_response_single_output,
-  tls_certificates_and_hostnames_custom_metadata_output,
-  tls_certificates_and_hostnames_custom_origin_server_output,
-  tls_certificates_and_hostnames_custom_origin_sni_output,
-  tls_certificates_and_hostnames_customhostname_output,
-  tls_certificates_and_hostnames_hostname_output,
-  tls_certificates_and_hostnames_ownership_verification_http_output,
-  tls_certificates_and_hostnames_ownership_verification_output,
-  tls_certificates_and_hostnames_result_info_output,
-  tls_certificates_and_hostnames_ssl_output,
-  tls_certificates_and_hostnames_sslsettings_output,
-  tls_certificates_and_hostnames_status_3_output,
-  tls_certificates_and_hostnames_verification_errors_output,
+  tls$$certificates$$and$$hostnames_custom$$hostname,
+  tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+  tls$$certificates$$and$$hostnames_custom_hostname_response_collection,
+  tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+  tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+  tls$$certificates$$and$$hostnames_custom_metadata,
+  tls$$certificates$$and$$hostnames_customhostname,
+  tls$$certificates$$and$$hostnames_ownership_verification,
+  tls$$certificates$$and$$hostnames_ownership_verification_http,
+  tls$$certificates$$and$$hostnames_result_info,
+  tls$$certificates$$and$$hostnames_ssl,
+  tls$$certificates$$and$$hostnames_sslsettings,
+  tls$$certificates$$and$$hostnames_verification_errors,
 } from "./outputs.js";
 import {
-  tls_certificates_and_hostnames_certificate_authority,
-  tls_certificates_and_hostnames_custom_cert_and_key,
-  tls_certificates_and_hostnames_custom_cert_bundle,
-  tls_certificates_and_hostnames_custom_hostname_identifier,
-  tls_certificates_and_hostnames_custom_metadata,
-  tls_certificates_and_hostnames_custom_origin_server,
-  tls_certificates_and_hostnames_custom_origin_sni,
-  tls_certificates_and_hostnames_hostname_post,
-  tls_certificates_and_hostnames_sslpost,
-  tls_certificates_and_hostnames_sslsettings,
+  tls$$certificates$$and$$hostnames_custom_cert_and_key,
+  tls$$certificates$$and$$hostnames_custom_cert_bundle,
+  tls$$certificates$$and$$hostnames_custom_metadata as tls$$certificates$$and$$hostnames_custom_metadata$,
+  tls$$certificates$$and$$hostnames_sslpost,
+  tls$$certificates$$and$$hostnames_sslsettings as tls$$certificates$$and$$hostnames_sslsettings$,
 } from "./schemas.js";
 
 /**
- * The tools of `custom_hostnames`.
+ * The tools of `customHostnames`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_hostnames_create",
+    name: "customHostnames_create",
     title: "Create Custom Hostname",
-    description: "Add a new custom hostname and request that an SSL certificate be issued for it. One of three validation methods—http, txt, email—should be used, with 'http' recommended if the CNAME is already in place (or will be soon). Specifying 'email' will send an email to the WHOIS contacts on file for the base domain plus hostmaster, postmaster, webmaster, admin, administrator. If http is used and the domain is not already pointing to the Managed CNAME host, the PATCH method must be used once it is (to complete validation).  Enable bundling of certificates using the custom_cert_bundle field. The bundling process requires the following condition One certificate in the bundle must use an RSA, and the other must use an ECDSA.",
+    description: "Add a new custom hostname and request that an SSL certificate be issued for it. One of three validation methods—http, txt, email—should be used, with 'http' recommended if the CNAME is already in place (or will be soon). Specifying 'email' will send an email to the WHOIS contacts on file for the base domain plus hostmaster, postmaster, webmaster, admin, administrator. If http is used and the domain is not already pointing to the Managed CNAME host, the PATCH method must be used once it is (to complete validation).  Enable bundling of certificates using the custom_cert_bundle field. The bundling process requires the following condition One certificate in the bundle must use an RSA, and the other must use an ECDSA.\n\nPOST /zones/{zone_id}/custom_hostnames",
     inputSchema: {
       type: "object",
       properties: {
@@ -61,16 +48,16 @@ export const tools: readonly Tool[] = [
               "description": "Unique key/value metadata for this hostname. These are per-hostname (customer) settings."
             },
             "custom_origin_server": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_origin_server",
-              "description": "a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME record."
+              "description": "a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME record.",
+              "type": "string"
             },
             "custom_origin_sni": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_origin_sni",
-              "description": "A hostname that will be sent to your custom origin server as SNI for TLS handshake. This can be a valid subdomain of the zone or custom origin server name or the string ':request_host_header:' which will cause the host header in the request to be used as SNI. Not configurable with default/fallback origin server."
+              "description": "A hostname that will be sent to your custom origin server as SNI for TLS handshake. This can be a valid subdomain of the zone or custom origin server name or the string ':request_host_header:' which will cause the host header in the request to be used as SNI. Not configurable with default/fallback origin server.",
+              "type": "string"
             },
             "hostname": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_post",
-              "description": "The custom hostname that will point to your hostname via CNAME."
+              "description": "The custom hostname that will point to your hostname via CNAME.",
+              "type": "string"
             },
             "ssl": {
               "$ref": "#/$defs/tls-certificates-and-hostnames_sslpost",
@@ -82,51 +69,49 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority,
-        "tls-certificates-and-hostnames_custom_cert_and_key": tls_certificates_and_hostnames_custom_cert_and_key,
-        "tls-certificates-and-hostnames_custom_cert_bundle": tls_certificates_and_hostnames_custom_cert_bundle,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni,
-        "tls-certificates-and-hostnames_hostname_post": tls_certificates_and_hostnames_hostname_post,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_sslpost": tls_certificates_and_hostnames_sslpost,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings,
+        "tls-certificates-and-hostnames_custom_cert_and_key": tls$$certificates$$and$$hostnames_custom_cert_and_key,
+        "tls-certificates-and-hostnames_custom_cert_bundle": tls$$certificates$$and$$hostnames_custom_cert_bundle,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata$,
+        "tls-certificates-and-hostnames_sslpost": tls$$certificates$$and$$hostnames_sslpost,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_single": tls_certificates_and_hostnames_custom_hostname_response_single_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_hostname_response_single": tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     annotations: {
@@ -171,27 +156,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_single": tls_certificates_and_hostnames_custom_hostname_response_single_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_hostname_response_single": tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     request: (args) => ({
@@ -200,40 +178,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_hostnames_delete",
+    name: "customHostnames_delete",
     title: "Delete Custom Hostname (and any issued SSL certificates)",
-    description: "Permanently deletes a custom hostname and revokes any SSL certificates that were issued for it. This action cannot be undone.",
+    description: "Permanently deletes a custom hostname and revokes any SSL certificates that were issued for it. This action cannot be undone.\n\nDELETE /zones/{zone_id}/custom_hostnames/{custom_hostname_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "custom_hostname_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_hostname_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_hostname_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_hostname_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
         "id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier"
+          "type": "string"
         }
       },
       "type": "object",
-      $defs: {
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -265,7 +246,7 @@ export const tools: readonly Tool[] = [
         "200": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -275,7 +256,7 @@ export const tools: readonly Tool[] = [
             {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -287,9 +268,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -297,9 +277,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_hostnames_edit",
+    name: "customHostnames_edit",
     title: "Edit Custom Hostname",
-    description: "Modify SSL configuration for a custom hostname. When sent with SSL config that matches existing config, used to indicate that hostname should pass domain control validation (DCV). Can also be used to change validation type, e.g., from 'http' to 'email'. Bundle an existing certificate with another certificate by using the \"custom_cert_bundle\" field. The bundling process supports combining certificates as long as the following condition is met. One certificate must use the RSA algorithm, and the other must use the ECDSA algorithm.",
+    description: "Modify SSL configuration for a custom hostname. When sent with SSL config that matches existing config, used to indicate that hostname should pass domain control validation (DCV). Can also be used to change validation type, e.g., from 'http' to 'email'. Bundle an existing certificate with another certificate by using the \"custom_cert_bundle\" field. The bundling process supports combining certificates as long as the following condition is met. One certificate must use the RSA algorithm, and the other must use the ECDSA algorithm.\n\nPATCH /zones/{zone_id}/custom_hostnames/{custom_hostname_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -310,12 +290,12 @@ export const tools: readonly Tool[] = [
               "description": "Unique key/value metadata for this hostname. These are per-hostname (customer) settings."
             },
             "custom_origin_server": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_origin_server",
-              "description": "a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME record."
+              "description": "a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME record.",
+              "type": "string"
             },
             "custom_origin_sni": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_origin_sni",
-              "description": "A hostname that will be sent to your custom origin server as SNI for TLS handshake. This can be a valid subdomain of the zone or custom origin server name or the string ':request_host_header:' which will cause the host header in the request to be used as SNI. Not configurable with default/fallback origin server."
+              "description": "A hostname that will be sent to your custom origin server as SNI for TLS handshake. This can be a valid subdomain of the zone or custom origin server name or the string ':request_host_header:' which will cause the host header in the request to be used as SNI. Not configurable with default/fallback origin server.",
+              "type": "string"
             },
             "ssl": {
               "$ref": "#/$defs/tls-certificates-and-hostnames_sslpost",
@@ -324,56 +304,54 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "custom_hostname_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_hostname_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_hostname_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_hostname_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority,
-        "tls-certificates-and-hostnames_custom_cert_and_key": tls_certificates_and_hostnames_custom_cert_and_key,
-        "tls-certificates-and-hostnames_custom_cert_bundle": tls_certificates_and_hostnames_custom_cert_bundle,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_sslpost": tls_certificates_and_hostnames_sslpost,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings,
+        "tls-certificates-and-hostnames_custom_cert_and_key": tls$$certificates$$and$$hostnames_custom_cert_and_key,
+        "tls-certificates-and-hostnames_custom_cert_bundle": tls$$certificates$$and$$hostnames_custom_cert_bundle,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata$,
+        "tls-certificates-and-hostnames_sslpost": tls$$certificates$$and$$hostnames_sslpost,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_single": tls_certificates_and_hostnames_custom_hostname_response_single_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_hostname_response_single": tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     annotations: {
@@ -418,27 +396,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_single": tls_certificates_and_hostnames_custom_hostname_response_single_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_hostname_response_single": tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     request: (args) => ({
@@ -447,53 +418,52 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_hostnames_get",
+    name: "customHostnames_get",
     title: "Custom Hostname Details",
-    description: "Retrieves detailed information about a specific custom hostname, including SSL certificate status, ownership verification, and origin configuration.",
+    description: "Retrieves detailed information about a specific custom hostname, including SSL certificate status, ownership verification, and origin configuration.\n\nGET /zones/{zone_id}/custom_hostnames/{custom_hostname_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "custom_hostname_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_identifier",
-          "description": "Custom hostname identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_hostname_id": {
+              "description": "Custom hostname identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_hostname_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_hostname_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_single": tls_certificates_and_hostnames_custom_hostname_response_single_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_hostname_response_single": tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     annotations: {
@@ -539,27 +509,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_single": tls_certificates_and_hostnames_custom_hostname_response_single_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_hostname_response_single": tls$$certificates$$and$$hostnames_custom_hostname_response_single,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     request: (args) => ({
@@ -567,170 +530,176 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_hostnames_list",
+    name: "customHostnames_list",
     title: "List Custom Hostnames",
-    description: "List, search, sort, and filter all of your custom hostnames.",
+    description: "List, search, sort, and filter all of your custom hostnames.\n\nGET /zones/{zone_id}/custom_hostnames",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_authority": {
-          "description": "Filter by the certificate authority that issued the SSL certificate.",
-          "enum": [
-            "google",
-            "lets_encrypt",
-            "ssl_com"
-          ],
-          "type": "string"
-        },
-        "custom_origin_server": {
-          "description": "Filter by custom origin server name.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to order hostnames.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "hostname": {
-          "description": "Fully qualified domain name to match against. This parameter cannot be used with the 'id', 'hostname.exact', 'hostname.contain', or 'hostname.startsWith' parameters.",
-          "type": "string"
-        },
-        "hostname_contain": {
-          "description": "Filters hostnames by a substring match on the hostname value. This parameter cannot be used with the 'id', 'hostname', 'hostname.exact', or 'hostname.startsWith' parameters.",
-          "type": "string"
-        },
-        "hostname_exact": {
-          "description": "Fully qualified domain name to match against. This parameter cannot be used with the 'id', 'hostname', 'hostname.contain', or 'hostname.startsWith' parameters.",
-          "type": "string"
-        },
-        "hostname_starts_with": {
-          "description": "Filters hostnames by a prefix match on the hostname value. This parameter cannot be used with the 'id', 'hostname', 'hostname.exact', or 'hostname.contain' parameters.",
-          "type": "string"
-        },
-        "hostname_status": {
-          "description": "Filter by the hostname's activation status.",
-          "enum": [
-            "active",
-            "pending",
-            "active_redeploying",
-            "moved",
-            "pending_deletion",
-            "deleted",
-            "pending_blocked",
-            "pending_migration",
-            "pending_provisioned",
-            "test_pending",
-            "test_active",
-            "test_active_apex",
-            "test_blocked",
-            "test_failed",
-            "provisioned",
-            "blocked"
-          ],
-          "type": "string"
-        },
-        "id": {
-          "description": "Hostname ID to match against. This ID was generated and returned during the initial custom_hostname creation. This parameter cannot be used with the 'hostname', 'hostname.exact', 'hostname.contain', or 'hostname.startsWith' parameters.",
-          "type": "string"
-        },
-        "order": {
-          "default": "ssl",
-          "description": "Field to order hostnames by.",
-          "enum": [
-            "ssl",
-            "ssl_status"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of hostnames per page.",
-          "type": "number"
-        },
-        "ssl": {
-          "default": 0,
-          "description": "Whether to filter hostnames based on if they have SSL enabled.",
-          "enum": [
-            0,
-            1
-          ],
-          "type": "integer"
-        },
-        "ssl_status": {
-          "description": "Filter by SSL certificate status.",
-          "enum": [
-            "initializing",
-            "pending_validation",
-            "deleted",
-            "pending_issuance",
-            "pending_deployment",
-            "pending_deletion",
-            "pending_expiration",
-            "expired",
-            "active",
-            "initializing_timed_out",
-            "validation_timed_out",
-            "issuance_timed_out",
-            "deployment_timed_out",
-            "deletion_timed_out",
-            "pending_cleanup",
-            "staging_deployment",
-            "staging_active",
-            "deactivating",
-            "inactive",
-            "backup_issued",
-            "holding_deployment"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
-        },
-        "wildcard": {
-          "description": "Filter by whether the custom hostname is a wildcard hostname.",
-          "type": "boolean"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_authority": {
+              "description": "Filter by the certificate authority that issued the SSL certificate.",
+              "enum": [
+                "google",
+                "lets_encrypt",
+                "ssl_com"
+              ],
+              "type": "string"
+            },
+            "custom_origin_server": {
+              "description": "Filter by custom origin server name.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to order hostnames.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "hostname": {
+              "description": "Fully qualified domain name to match against. This parameter cannot be used with the 'id', 'hostname.exact', 'hostname.contain', or 'hostname.startsWith' parameters.",
+              "type": "string"
+            },
+            "hostname.contain": {
+              "description": "Filters hostnames by a substring match on the hostname value. This parameter cannot be used with the 'id', 'hostname', 'hostname.exact', or 'hostname.startsWith' parameters.",
+              "type": "string"
+            },
+            "hostname.exact": {
+              "description": "Fully qualified domain name to match against. This parameter cannot be used with the 'id', 'hostname', 'hostname.contain', or 'hostname.startsWith' parameters.",
+              "type": "string"
+            },
+            "hostname.startsWith": {
+              "description": "Filters hostnames by a prefix match on the hostname value. This parameter cannot be used with the 'id', 'hostname', 'hostname.exact', or 'hostname.contain' parameters.",
+              "type": "string"
+            },
+            "hostname_status": {
+              "description": "Filter by the hostname's activation status.",
+              "enum": [
+                "active",
+                "pending",
+                "active_redeploying",
+                "moved",
+                "pending_deletion",
+                "deleted",
+                "pending_blocked",
+                "pending_migration",
+                "pending_provisioned",
+                "test_pending",
+                "test_active",
+                "test_active_apex",
+                "test_blocked",
+                "test_failed",
+                "provisioned",
+                "blocked"
+              ],
+              "type": "string"
+            },
+            "id": {
+              "description": "Hostname ID to match against. This ID was generated and returned during the initial custom_hostname creation. This parameter cannot be used with the 'hostname', 'hostname.exact', 'hostname.contain', or 'hostname.startsWith' parameters.",
+              "type": "string"
+            },
+            "order": {
+              "default": "ssl",
+              "description": "Field to order hostnames by.",
+              "enum": [
+                "ssl",
+                "ssl_status"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of hostnames per page.",
+              "type": "number"
+            },
+            "ssl": {
+              "default": 0,
+              "description": "Whether to filter hostnames based on if they have SSL enabled.",
+              "enum": [
+                0,
+                1
+              ],
+              "type": "integer"
+            },
+            "ssl_status": {
+              "description": "Filter by SSL certificate status.",
+              "enum": [
+                "initializing",
+                "pending_validation",
+                "deleted",
+                "pending_issuance",
+                "pending_deployment",
+                "pending_deletion",
+                "pending_expiration",
+                "expired",
+                "active",
+                "initializing_timed_out",
+                "validation_timed_out",
+                "issuance_timed_out",
+                "deployment_timed_out",
+                "deletion_timed_out",
+                "pending_cleanup",
+                "staging_deployment",
+                "staging_active",
+                "deactivating",
+                "inactive",
+                "backup_issued",
+                "holding_deployment"
+              ],
+              "type": "string"
+            },
+            "wildcard": {
+              "description": "Filter by whether the custom hostname is a wildcard hostname.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_custom_hostname_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_collection": tls_certificates_and_hostnames_custom_hostname_response_collection_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_result_info": tls_certificates_and_hostnames_result_info_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_collection": tls$$certificates$$and$$hostnames_custom_hostname_response_collection,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_result_info": tls$$certificates$$and$$hostnames_result_info,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     annotations: {
@@ -776,48 +745,41 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate_authority": tls_certificates_and_hostnames_certificate_authority_output,
-        "tls-certificates-and-hostnames_created_at": tls_certificates_and_hostnames_created_at_output,
-        "tls-certificates-and-hostnames_custom-hostname": tls_certificates_and_hostnames_custom_hostname_output,
-        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls_certificates_and_hostnames_custom_hostname_api_response_common_output,
-        "tls-certificates-and-hostnames_custom_hostname_identifier": tls_certificates_and_hostnames_custom_hostname_identifier_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_collection": tls_certificates_and_hostnames_custom_hostname_response_collection_output,
-        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls_certificates_and_hostnames_custom_hostname_response_messages_output,
-        "tls-certificates-and-hostnames_custom_metadata": tls_certificates_and_hostnames_custom_metadata_output,
-        "tls-certificates-and-hostnames_custom_origin_server": tls_certificates_and_hostnames_custom_origin_server_output,
-        "tls-certificates-and-hostnames_custom_origin_sni": tls_certificates_and_hostnames_custom_origin_sni_output,
-        "tls-certificates-and-hostnames_customhostname": tls_certificates_and_hostnames_customhostname_output,
-        "tls-certificates-and-hostnames_hostname": tls_certificates_and_hostnames_hostname_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ownership_verification": tls_certificates_and_hostnames_ownership_verification_output,
-        "tls-certificates-and-hostnames_ownership_verification_http": tls_certificates_and_hostnames_ownership_verification_http_output,
-        "tls-certificates-and-hostnames_result_info": tls_certificates_and_hostnames_result_info_output,
-        "tls-certificates-and-hostnames_ssl": tls_certificates_and_hostnames_ssl_output,
-        "tls-certificates-and-hostnames_sslsettings": tls_certificates_and_hostnames_sslsettings_output,
-        "tls-certificates-and-hostnames_status-3": tls_certificates_and_hostnames_status_3_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_verification_errors": tls_certificates_and_hostnames_verification_errors_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_custom-hostname": tls$$certificates$$and$$hostnames_custom$$hostname,
+        "tls-certificates-and-hostnames_custom_hostname_api_response_common": tls$$certificates$$and$$hostnames_custom_hostname_api_response_common,
+        "tls-certificates-and-hostnames_custom_hostname_response_collection": tls$$certificates$$and$$hostnames_custom_hostname_response_collection,
+        "tls-certificates-and-hostnames_custom_hostname_response_messages": tls$$certificates$$and$$hostnames_custom_hostname_response_messages,
+        "tls-certificates-and-hostnames_custom_metadata": tls$$certificates$$and$$hostnames_custom_metadata,
+        "tls-certificates-and-hostnames_customhostname": tls$$certificates$$and$$hostnames_customhostname,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ownership_verification": tls$$certificates$$and$$hostnames_ownership_verification,
+        "tls-certificates-and-hostnames_ownership_verification_http": tls$$certificates$$and$$hostnames_ownership_verification_http,
+        "tls-certificates-and-hostnames_result_info": tls$$certificates$$and$$hostnames_result_info,
+        "tls-certificates-and-hostnames_ssl": tls$$certificates$$and$$hostnames_ssl,
+        "tls-certificates-and-hostnames_sslsettings": tls$$certificates$$and$$hostnames_sslsettings,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
+        "tls-certificates-and-hostnames_verification_errors": tls$$certificates$$and$$hostnames_verification_errors,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/custom_hostnames`,
       query: [
-        ["hostname", args["hostname"], true],
-        ["hostname.exact", args["hostname_exact"], true],
-        ["hostname.startsWith", args["hostname_starts_with"], true],
-        ["hostname.contain", args["hostname_contain"], true],
-        ["id", args["id"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["ssl_status", args["ssl_status"], true],
-        ["hostname_status", args["hostname_status"], true],
-        ["certificate_authority", args["certificate_authority"], true],
-        ["wildcard", args["wildcard"], true],
-        ["custom_origin_server", args["custom_origin_server"], true],
-        ["ssl", args["ssl"], true],
+        ["hostname", param(args, "query", "hostname"), true],
+        ["hostname.exact", param(args, "query", "hostname.exact"), true],
+        ["hostname.startsWith", param(args, "query", "hostname.startsWith"), true],
+        ["hostname.contain", param(args, "query", "hostname.contain"), true],
+        ["id", param(args, "query", "id"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["ssl_status", param(args, "query", "ssl_status"), true],
+        ["hostname_status", param(args, "query", "hostname_status"), true],
+        ["certificate_authority", param(args, "query", "certificate_authority"), true],
+        ["wildcard", param(args, "query", "wildcard"), true],
+        ["custom_origin_server", param(args, "query", "custom_origin_server"), true],
+        ["ssl", param(args, "query", "ssl"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/customNameservers/outputs.ts b/src/generated/forge-mcp/customNameservers/outputs.ts
index f525c44fc..179ddc84a 100644
--- a/src/generated/forge-mcp/customNameservers/outputs.ts
+++ b/src/generated/forge-mcp/customNameservers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `dns-custom-nameservers_CustomNS` in responses.
  */
-export const dns_custom_nameservers_CustomNS_output: JsonSchema = {
+export const dns$$custom$$nameservers_CustomNS: JsonSchema = {
   "properties": {
     "dns_records": {
       "items": {
@@ -27,10 +27,10 @@ export const dns_custom_nameservers_CustomNS_output: JsonSchema = {
       "type": "array"
     },
     "ns_name": {
-      "$ref": "#/$defs/dns-custom-nameservers_ns_name"
+      "type": "string"
     },
     "ns_set": {
-      "$ref": "#/$defs/dns-custom-nameservers_ns_set"
+      "type": "number"
     },
     "status": {
       "enum": [
@@ -41,7 +41,7 @@ export const dns_custom_nameservers_CustomNS_output: JsonSchema = {
       "type": "string"
     },
     "zone_tag": {
-      "$ref": "#/$defs/dns-custom-nameservers_identifier-2"
+      "type": "string"
     }
   },
   "required": [
@@ -56,7 +56,7 @@ export const dns_custom_nameservers_CustomNS_output: JsonSchema = {
 /**
  * The schema of `dns-custom-nameservers_acns_response_collection` in responses.
  */
-export const dns_custom_nameservers_acns_response_collection_output: JsonSchema = {
+export const dns$$custom$$nameservers_acns_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-custom-nameservers_api-response-collection"
@@ -78,7 +78,7 @@ export const dns_custom_nameservers_acns_response_collection_output: JsonSchema
 /**
  * The schema of `dns-custom-nameservers_acns_response_single` in responses.
  */
-export const dns_custom_nameservers_acns_response_single_output: JsonSchema = {
+export const dns$$custom$$nameservers_acns_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-custom-nameservers_api-response-single"
@@ -97,7 +97,7 @@ export const dns_custom_nameservers_acns_response_single_output: JsonSchema = {
 /**
  * The schema of `dns-custom-nameservers_empty_response` in responses.
  */
-export const dns_custom_nameservers_empty_response_output: JsonSchema = {
+export const dns$$custom$$nameservers_empty_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-custom-nameservers_api-response-collection"
diff --git a/src/generated/forge-mcp/customNameservers/schemas.ts b/src/generated/forge-mcp/customNameservers/schemas.ts
deleted file mode 100644
index 363c7ad5f..000000000
--- a/src/generated/forge-mcp/customNameservers/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `dns-custom-nameservers_identifier`.
- */
-export const dns_custom_nameservers_identifier: JsonSchema = {
-  "description": "Account identifier tag.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/customNameservers/tools.ts b/src/generated/forge-mcp/customNameservers/tools.ts
index f36a2c0aa..e73fd8925 100644
--- a/src/generated/forge-mcp/customNameservers/tools.ts
+++ b/src/generated/forge-mcp/customNameservers/tools.ts
@@ -3,77 +3,73 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  dns_custom_nameservers_api_response_collection_output,
-  dns_custom_nameservers_api_response_common_failure_output,
-  dns_custom_nameservers_api_response_common_output,
-  dns_custom_nameservers_api_response_single_output,
-  dns_custom_nameservers_identifier_2_output,
-  dns_custom_nameservers_messages_output,
-  dns_custom_nameservers_ns_name_output,
-  dns_custom_nameservers_ns_set_output,
+  dns$$custom$$nameservers_api$$response$$collection,
+  dns$$custom$$nameservers_api$$response$$common,
+  dns$$custom$$nameservers_api$$response$$common$$failure,
+  dns$$custom$$nameservers_api$$response$$single,
+  dns$$custom$$nameservers_messages,
 } from "../outputs.js";
+import { dns$$custom$$nameservers_CustomNSInput } from "../schemas.js";
 import {
-  dns_custom_nameservers_CustomNSInput,
-  dns_custom_nameservers_ns_name,
-  dns_custom_nameservers_ns_set,
-} from "../schemas.js";
-import {
-  dns_custom_nameservers_CustomNS_output,
-  dns_custom_nameservers_acns_response_collection_output,
-  dns_custom_nameservers_acns_response_single_output,
-  dns_custom_nameservers_empty_response_output,
+  dns$$custom$$nameservers_CustomNS,
+  dns$$custom$$nameservers_acns_response_collection,
+  dns$$custom$$nameservers_acns_response_single,
+  dns$$custom$$nameservers_empty_response,
 } from "./outputs.js";
-import { dns_custom_nameservers_identifier } from "./schemas.js";
 
 /**
- * The tools of `custom_nameservers`.
+ * The tools of `customNameservers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_nameservers_create",
+    name: "customNameservers_create",
     title: "Add account or zone Custom Nameserver",
-    description: "Adds a custom nameserver to the account or zone for use as a vanity nameserver on zones.",
+    description: "Adds a custom nameserver to the account or zone for use as a vanity nameserver on zones.\n\nPOST /{account_or_zone}/{account_or_zone_id}/custom_ns",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/dns-custom-nameservers_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/dns-custom-nameservers_CustomNSInput"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-custom-nameservers_CustomNSInput": dns_custom_nameservers_CustomNSInput,
-        "dns-custom-nameservers_identifier": dns_custom_nameservers_identifier,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set,
+        "dns-custom-nameservers_CustomNSInput": dns$$custom$$nameservers_CustomNSInput,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-custom-nameservers_acns_response_single",
       $defs: {
-        "dns-custom-nameservers_CustomNS": dns_custom_nameservers_CustomNS_output,
-        "dns-custom-nameservers_acns_response_single": dns_custom_nameservers_acns_response_single_output,
-        "dns-custom-nameservers_api-response-single": dns_custom_nameservers_api_response_single_output,
-        "dns-custom-nameservers_identifier-2": dns_custom_nameservers_identifier_2_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name_output,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set_output,
+        "dns-custom-nameservers_CustomNS": dns$$custom$$nameservers_CustomNS,
+        "dns-custom-nameservers_acns_response_single": dns$$custom$$nameservers_acns_response_single,
+        "dns-custom-nameservers_api-response-single": dns$$custom$$nameservers_api$$response$$single,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
       },
     },
     annotations: {
@@ -118,14 +114,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-custom-nameservers_CustomNS": dns_custom_nameservers_CustomNS_output,
-        "dns-custom-nameservers_acns_response_single": dns_custom_nameservers_acns_response_single_output,
-        "dns-custom-nameservers_api-response-common-failure": dns_custom_nameservers_api_response_common_failure_output,
-        "dns-custom-nameservers_api-response-single": dns_custom_nameservers_api_response_single_output,
-        "dns-custom-nameservers_identifier-2": dns_custom_nameservers_identifier_2_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name_output,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set_output,
+        "dns-custom-nameservers_CustomNS": dns$$custom$$nameservers_CustomNS,
+        "dns-custom-nameservers_acns_response_single": dns$$custom$$nameservers_acns_response_single,
+        "dns-custom-nameservers_api-response-common-failure": dns$$custom$$nameservers_api$$response$$common$$failure,
+        "dns-custom-nameservers_api-response-single": dns$$custom$$nameservers_api$$response$$single,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
       },
     },
     request: (args) => ({
@@ -134,37 +127,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_nameservers_delete",
+    name: "customNameservers_delete",
     title: "Delete Account Custom Nameserver",
-    description: "Removes a custom nameserver from the account.",
+    description: "Removes a custom nameserver from the account.\n\nDELETE /accounts/{account_id}/custom_ns/{custom_ns_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-custom-nameservers_identifier",
-          "description": "Account identifier tag."
-        },
-        "custom_ns_id": {
-          "$ref": "#/$defs/dns-custom-nameservers_ns_name",
-          "description": "The FQDN of the name server."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "custom_ns_id": {
+              "description": "The FQDN of the name server.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "custom_ns_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "custom_ns_id"
+        "path"
       ],
-      $defs: {
-        "dns-custom-nameservers_identifier": dns_custom_nameservers_identifier,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-custom-nameservers_empty_response",
       $defs: {
-        "dns-custom-nameservers_api-response-collection": dns_custom_nameservers_api_response_collection_output,
-        "dns-custom-nameservers_api-response-common": dns_custom_nameservers_api_response_common_output,
-        "dns-custom-nameservers_empty_response": dns_custom_nameservers_empty_response_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
+        "dns-custom-nameservers_api-response-collection": dns$$custom$$nameservers_api$$response$$collection,
+        "dns-custom-nameservers_api-response-common": dns$$custom$$nameservers_api$$response$$common,
+        "dns-custom-nameservers_empty_response": dns$$custom$$nameservers_empty_response,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
       },
     },
     annotations: {
@@ -201,11 +200,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-custom-nameservers_api-response-collection": dns_custom_nameservers_api_response_collection_output,
-        "dns-custom-nameservers_api-response-common": dns_custom_nameservers_api_response_common_output,
-        "dns-custom-nameservers_api-response-common-failure": dns_custom_nameservers_api_response_common_failure_output,
-        "dns-custom-nameservers_empty_response": dns_custom_nameservers_empty_response_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
+        "dns-custom-nameservers_api-response-collection": dns$$custom$$nameservers_api$$response$$collection,
+        "dns-custom-nameservers_api-response-common": dns$$custom$$nameservers_api$$response$$common,
+        "dns-custom-nameservers_api-response-common-failure": dns$$custom$$nameservers_api$$response$$common$$failure,
+        "dns-custom-nameservers_empty_response": dns$$custom$$nameservers_empty_response,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
       },
     },
     request: (args) => ({
@@ -213,44 +212,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_nameservers_get",
+    name: "customNameservers_get",
     title: "List account or zone Custom Nameservers",
-    description: "List an account or zone's custom nameservers.",
+    description: "List an account or zone's custom nameservers.\n\nGET /{account_or_zone}/{account_or_zone_id}/custom_ns",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/dns-custom-nameservers_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "dns-custom-nameservers_identifier": dns_custom_nameservers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-custom-nameservers_acns_response_collection",
       $defs: {
-        "dns-custom-nameservers_CustomNS": dns_custom_nameservers_CustomNS_output,
-        "dns-custom-nameservers_acns_response_collection": dns_custom_nameservers_acns_response_collection_output,
-        "dns-custom-nameservers_api-response-collection": dns_custom_nameservers_api_response_collection_output,
-        "dns-custom-nameservers_api-response-common": dns_custom_nameservers_api_response_common_output,
-        "dns-custom-nameservers_identifier-2": dns_custom_nameservers_identifier_2_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name_output,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set_output,
+        "dns-custom-nameservers_CustomNS": dns$$custom$$nameservers_CustomNS,
+        "dns-custom-nameservers_acns_response_collection": dns$$custom$$nameservers_acns_response_collection,
+        "dns-custom-nameservers_api-response-collection": dns$$custom$$nameservers_api$$response$$collection,
+        "dns-custom-nameservers_api-response-common": dns$$custom$$nameservers_api$$response$$common,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
       },
     },
     annotations: {
@@ -296,15 +299,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-custom-nameservers_CustomNS": dns_custom_nameservers_CustomNS_output,
-        "dns-custom-nameservers_acns_response_collection": dns_custom_nameservers_acns_response_collection_output,
-        "dns-custom-nameservers_api-response-collection": dns_custom_nameservers_api_response_collection_output,
-        "dns-custom-nameservers_api-response-common": dns_custom_nameservers_api_response_common_output,
-        "dns-custom-nameservers_api-response-common-failure": dns_custom_nameservers_api_response_common_failure_output,
-        "dns-custom-nameservers_identifier-2": dns_custom_nameservers_identifier_2_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name_output,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set_output,
+        "dns-custom-nameservers_CustomNS": dns$$custom$$nameservers_CustomNS,
+        "dns-custom-nameservers_acns_response_collection": dns$$custom$$nameservers_acns_response_collection,
+        "dns-custom-nameservers_api-response-collection": dns$$custom$$nameservers_api$$response$$collection,
+        "dns-custom-nameservers_api-response-common": dns$$custom$$nameservers_api$$response$$common,
+        "dns-custom-nameservers_api-response-common-failure": dns$$custom$$nameservers_api$$response$$common$$failure,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/customPages/accountAssets/outputs.ts b/src/generated/forge-mcp/customPages/accountAssets/outputs.ts
index 245b990ce..04287a493 100644
--- a/src/generated/forge-mcp/customPages/accountAssets/outputs.ts
+++ b/src/generated/forge-mcp/customPages/accountAssets/outputs.ts
@@ -3,46 +3,26 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `custom-pages_asset_description` in responses.
- */
-export const custom_pages_asset_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `custom-pages_asset_name` in responses.
- */
-export const custom_pages_asset_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `custom-pages_asset_url` in responses.
- */
-export const custom_pages_asset_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `custom-pages_custom_asset` in responses.
  */
-export const custom_pages_custom_asset_output: JsonSchema = {
+export const custom$$pages_custom_asset: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/custom-pages_asset_description"
+      "type": "string"
     },
     "last_updated": {
-      "$ref": "#/$defs/custom-pages_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/custom-pages_asset_name"
+      "type": "string"
     },
     "size_bytes": {
       "type": "integer"
     },
     "url": {
-      "$ref": "#/$defs/custom-pages_asset_url"
+      "type": "string"
     }
   },
   "type": "object"
@@ -51,7 +31,7 @@ export const custom_pages_custom_asset_output: JsonSchema = {
 /**
  * The schema of `custom-pages_custom_asset_result` in responses.
  */
-export const custom_pages_custom_asset_result_output: JsonSchema = {
+export const custom$$pages_custom_asset_result: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-pages_api-response-single"
@@ -70,7 +50,7 @@ export const custom_pages_custom_asset_result_output: JsonSchema = {
 /**
  * The schema of `custom-pages_custom_asset_result_list` in responses.
  */
-export const custom_pages_custom_asset_result_list_output: JsonSchema = {
+export const custom$$pages_custom_asset_result_list: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-pages_api-response-collection"
diff --git a/src/generated/forge-mcp/customPages/accountAssets/schemas.ts b/src/generated/forge-mcp/customPages/accountAssets/schemas.ts
deleted file mode 100644
index bd13816f6..000000000
--- a/src/generated/forge-mcp/customPages/accountAssets/schemas.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `custom-pages_asset_description`.
- */
-export const custom_pages_asset_description: JsonSchema = {
-  "description": "A short description of the custom asset.",
-  "type": "string"
-};
-
-/**
- * The schema of `custom-pages_asset_name`.
- */
-export const custom_pages_asset_name: JsonSchema = {
-  "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_).",
-  "type": "string"
-};
-
-/**
- * The schema of `custom-pages_asset_url`.
- */
-export const custom_pages_asset_url: JsonSchema = {
-  "description": "The URL where the asset content is fetched from.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/customPages/accountAssets/tools.ts b/src/generated/forge-mcp/customPages/accountAssets/tools.ts
index 3e976aeca..189ee16d6 100644
--- a/src/generated/forge-mcp/customPages/accountAssets/tools.ts
+++ b/src/generated/forge-mcp/customPages/accountAssets/tools.ts
@@ -1,66 +1,44 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  custom_pages_api_response_collection_output,
-  custom_pages_api_response_common_failure_output,
-  custom_pages_api_response_common_output,
-  custom_pages_api_response_single_output,
-  custom_pages_messages_output,
-  custom_pages_timestamp_output,
+  custom$$pages_api$$response$$collection,
+  custom$$pages_api$$response$$common,
+  custom$$pages_api$$response$$common$$failure,
+  custom$$pages_api$$response$$single,
+  custom$$pages_messages,
 } from "../outputs.js";
-import { custom_pages_identifier } from "../schemas.js";
 import {
-  custom_pages_asset_description_output,
-  custom_pages_asset_name_output,
-  custom_pages_asset_url_output,
-  custom_pages_custom_asset_output,
-  custom_pages_custom_asset_result_list_output,
-  custom_pages_custom_asset_result_output,
+  custom$$pages_custom_asset,
+  custom$$pages_custom_asset_result,
+  custom$$pages_custom_asset_result_list,
 } from "./outputs.js";
-import {
-  custom_pages_asset_description,
-  custom_pages_asset_name,
-  custom_pages_asset_url,
-} from "./schemas.js";
 
 /**
- * The tools of `custom_pages.account_assets`.
+ * The tools of `customPages.accountAssets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_pages_account_assets_create",
+    name: "customPages_accountAssets_create",
     title: "Create a custom asset",
-    description: "Creates a custom asset for an account or zone.",
+    description: "Creates a custom asset for an account or zone.\n\nPOST /{account_or_zone}/{account_or_zone_id}/custom_pages/assets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/custom-pages_asset_description",
-              "description": "A short description of the custom asset."
+              "description": "A short description of the custom asset.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/custom-pages_asset_name",
-              "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_)."
+              "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_).",
+              "type": "string"
             },
             "url": {
-              "$ref": "#/$defs/custom-pages_asset_url",
-              "description": "The URL where the asset content is fetched from."
+              "description": "The URL where the asset content is fetched from.",
+              "type": "string"
             }
           },
           "required": [
@@ -69,31 +47,43 @@ export const tools: readonly Tool[] = [
             "url"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "custom-pages_asset_description": custom_pages_asset_description,
-        "custom-pages_asset_name": custom_pages_asset_name,
-        "custom-pages_asset_url": custom_pages_asset_url,
-        "custom-pages_identifier": custom_pages_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-pages_custom_asset_result",
       $defs: {
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_asset_description": custom_pages_asset_description_output,
-        "custom-pages_asset_name": custom_pages_asset_name_output,
-        "custom-pages_asset_url": custom_pages_asset_url_output,
-        "custom-pages_custom_asset": custom_pages_custom_asset_output,
-        "custom-pages_custom_asset_result": custom_pages_custom_asset_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_asset": custom$$pages_custom_asset,
+        "custom-pages_custom_asset_result": custom$$pages_custom_asset_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     annotations: {
@@ -124,15 +114,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_asset_description": custom_pages_asset_description_output,
-        "custom-pages_asset_name": custom_pages_asset_name_output,
-        "custom-pages_asset_url": custom_pages_asset_url_output,
-        "custom-pages_custom_asset": custom_pages_custom_asset_output,
-        "custom-pages_custom_asset_result": custom_pages_custom_asset_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_asset": custom$$pages_custom_asset,
+        "custom-pages_custom_asset_result": custom$$pages_custom_asset_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     request: (args) => ({
@@ -141,38 +127,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_pages_account_assets_delete",
+    name: "customPages_accountAssets_delete",
     title: "Delete a custom asset",
-    description: "Deletes a custom asset from an account or zone.",
+    description: "Deletes a custom asset from an account or zone.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/custom_pages/assets/{asset_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "asset_name": {
+              "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "asset_name"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "asset_name": {
-          "$ref": "#/$defs/custom-pages_asset_name",
-          "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_)."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "asset_name"
+        "path"
       ],
-      $defs: {
-        "custom-pages_asset_name": custom_pages_asset_name,
-        "custom-pages_identifier": custom_pages_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -200,8 +192,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_messages": custom_pages_messages_output,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     request: (args) => ({
@@ -209,50 +201,52 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_pages_account_assets_get",
+    name: "customPages_accountAssets_get",
     title: "Get a custom asset",
-    description: "Returns a custom asset for an account or zone.",
+    description: "Returns a custom asset for an account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/custom_pages/assets/{asset_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "asset_name": {
+              "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "asset_name"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "asset_name": {
-          "$ref": "#/$defs/custom-pages_asset_name",
-          "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_)."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "asset_name"
+        "path"
       ],
-      $defs: {
-        "custom-pages_asset_name": custom_pages_asset_name,
-        "custom-pages_identifier": custom_pages_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-pages_custom_asset_result",
       $defs: {
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_asset_description": custom_pages_asset_description_output,
-        "custom-pages_asset_name": custom_pages_asset_name_output,
-        "custom-pages_asset_url": custom_pages_asset_url_output,
-        "custom-pages_custom_asset": custom_pages_custom_asset_output,
-        "custom-pages_custom_asset_result": custom_pages_custom_asset_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_asset": custom$$pages_custom_asset,
+        "custom-pages_custom_asset_result": custom$$pages_custom_asset_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     annotations: {
@@ -283,15 +277,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_asset_description": custom_pages_asset_description_output,
-        "custom-pages_asset_name": custom_pages_asset_name_output,
-        "custom-pages_asset_url": custom_pages_asset_url_output,
-        "custom-pages_custom_asset": custom_pages_custom_asset_output,
-        "custom-pages_custom_asset_result": custom_pages_custom_asset_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_asset": custom$$pages_custom_asset,
+        "custom-pages_custom_asset_result": custom$$pages_custom_asset_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     request: (args) => ({
@@ -299,55 +289,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_pages_account_assets_list",
+    name: "customPages_accountAssets_list",
     title: "List custom assets",
-    description: "Lists custom assets for an account or zone.",
+    description: "Lists custom assets for an account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/custom_pages/assets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of custom assets per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of custom assets per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "custom-pages_identifier": custom_pages_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-pages_custom_asset_result_list",
       $defs: {
-        "custom-pages_api-response-collection": custom_pages_api_response_collection_output,
-        "custom-pages_api-response-common": custom_pages_api_response_common_output,
-        "custom-pages_asset_description": custom_pages_asset_description_output,
-        "custom-pages_asset_name": custom_pages_asset_name_output,
-        "custom-pages_asset_url": custom_pages_asset_url_output,
-        "custom-pages_custom_asset": custom_pages_custom_asset_output,
-        "custom-pages_custom_asset_result_list": custom_pages_custom_asset_result_list_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
+        "custom-pages_api-response-collection": custom$$pages_api$$response$$collection,
+        "custom-pages_api-response-common": custom$$pages_api$$response$$common,
+        "custom-pages_custom_asset": custom$$pages_custom_asset,
+        "custom-pages_custom_asset_result_list": custom$$pages_custom_asset_result_list,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     annotations: {
@@ -378,58 +377,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-collection": custom_pages_api_response_collection_output,
-        "custom-pages_api-response-common": custom_pages_api_response_common_output,
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_asset_description": custom_pages_asset_description_output,
-        "custom-pages_asset_name": custom_pages_asset_name_output,
-        "custom-pages_asset_url": custom_pages_asset_url_output,
-        "custom-pages_custom_asset": custom_pages_custom_asset_output,
-        "custom-pages_custom_asset_result_list": custom_pages_custom_asset_result_list_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
+        "custom-pages_api-response-collection": custom$$pages_api$$response$$collection,
+        "custom-pages_api-response-common": custom$$pages_api$$response$$common,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_custom_asset": custom$$pages_custom_asset,
+        "custom-pages_custom_asset_result_list": custom$$pages_custom_asset_result_list,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/custom_pages/assets`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "custom_pages_account_assets_update",
+    name: "customPages_accountAssets_update",
     title: "Update a custom asset",
-    description: "Updates a custom asset for an account or zone.",
+    description: "Updates a custom asset for an account or zone.\n\nPUT /{account_or_zone}/{account_or_zone_id}/custom_pages/assets/{asset_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "asset_name": {
-          "$ref": "#/$defs/custom-pages_asset_name",
-          "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_)."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/custom-pages_asset_description",
-              "description": "A short description of the custom asset."
+              "description": "A short description of the custom asset.",
+              "type": "string"
             },
             "url": {
-              "$ref": "#/$defs/custom-pages_asset_url",
-              "description": "The URL where the asset content is fetched from."
+              "description": "The URL where the asset content is fetched from.",
+              "type": "string"
             }
           },
           "required": [
@@ -437,32 +416,48 @@ export const tools: readonly Tool[] = [
             "url"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "asset_name": {
+              "description": "The unique name of the custom asset. Can only contain letters (A-Z, a-z), numbers (0-9), and underscores (_).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "asset_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "asset_name",
+        "path",
         "body"
       ],
-      $defs: {
-        "custom-pages_asset_description": custom_pages_asset_description,
-        "custom-pages_asset_name": custom_pages_asset_name,
-        "custom-pages_asset_url": custom_pages_asset_url,
-        "custom-pages_identifier": custom_pages_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-pages_custom_asset_result",
       $defs: {
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_asset_description": custom_pages_asset_description_output,
-        "custom-pages_asset_name": custom_pages_asset_name_output,
-        "custom-pages_asset_url": custom_pages_asset_url_output,
-        "custom-pages_custom_asset": custom_pages_custom_asset_output,
-        "custom-pages_custom_asset_result": custom_pages_custom_asset_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_asset": custom$$pages_custom_asset,
+        "custom-pages_custom_asset_result": custom$$pages_custom_asset_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     annotations: {
@@ -493,15 +488,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_asset_description": custom_pages_asset_description_output,
-        "custom-pages_asset_name": custom_pages_asset_name_output,
-        "custom-pages_asset_url": custom_pages_asset_url_output,
-        "custom-pages_custom_asset": custom_pages_custom_asset_output,
-        "custom-pages_custom_asset_result": custom_pages_custom_asset_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_asset": custom$$pages_custom_asset,
+        "custom-pages_custom_asset_result": custom$$pages_custom_asset_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/customPages/accountCustomPages/outputs.ts b/src/generated/forge-mcp/customPages/accountCustomPages/outputs.ts
index 5143c4538..25cb2537a 100644
--- a/src/generated/forge-mcp/customPages/accountCustomPages/outputs.ts
+++ b/src/generated/forge-mcp/customPages/accountCustomPages/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `custom-pages_custom_page` in responses.
  */
-export const custom_pages_custom_page_output: JsonSchema = {
+export const custom$$pages_custom_page: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/custom-pages_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
       "type": "string"
@@ -18,7 +19,8 @@ export const custom_pages_custom_page_output: JsonSchema = {
       "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/custom-pages_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "preview_target": {
       "type": "string"
@@ -30,10 +32,14 @@ export const custom_pages_custom_page_output: JsonSchema = {
       "type": "array"
     },
     "state": {
-      "$ref": "#/$defs/custom-pages_state"
+      "enum": [
+        "default",
+        "customized"
+      ],
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/custom-pages_url"
+      "type": "string"
     }
   },
   "type": "object"
@@ -42,7 +48,7 @@ export const custom_pages_custom_page_output: JsonSchema = {
 /**
  * The schema of `custom-pages_custom_page_result` in responses.
  */
-export const custom_pages_custom_page_result_output: JsonSchema = {
+export const custom$$pages_custom_page_result: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-pages_api-response-single"
@@ -61,7 +67,7 @@ export const custom_pages_custom_page_result_output: JsonSchema = {
 /**
  * The schema of `custom-pages_custom_page_result_list` in responses.
  */
-export const custom_pages_custom_page_result_list_output: JsonSchema = {
+export const custom$$pages_custom_page_result_list: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-pages_api-response-collection"
@@ -79,21 +85,3 @@ export const custom_pages_custom_page_result_list_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `custom-pages_state` in responses.
- */
-export const custom_pages_state_output: JsonSchema = {
-  "enum": [
-    "default",
-    "customized"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `custom-pages_url` in responses.
- */
-export const custom_pages_url_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/outputs.ts b/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/outputs.ts
index a83693b37..0914de76b 100644
--- a/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/outputs.ts
+++ b/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `custom-pages_preview_token` in responses.
  */
-export const custom_pages_preview_token_output: JsonSchema = {
+export const custom$$pages_preview_token: JsonSchema = {
   "properties": {
     "cep_jwt": {
       "type": "string"
@@ -21,7 +21,7 @@ export const custom_pages_preview_token_output: JsonSchema = {
 /**
  * The schema of `custom-pages_preview_token_result` in responses.
  */
-export const custom_pages_preview_token_result_output: JsonSchema = {
+export const custom$$pages_preview_token_result: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-pages_api-response-single"
diff --git a/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/schemas.ts b/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/schemas.ts
index ab91af6c5..1667a9f1f 100644
--- a/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/schemas.ts
+++ b/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `custom-pages_preview_request`.
  */
-export const custom_pages_preview_request: JsonSchema = {
+export const custom$$pages_preview_request: JsonSchema = {
   "properties": {
     "act": {
       "description": "The preview action type. Required for request parsing but not used in token generation. Typically set to \"preview\".",
diff --git a/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/tools.ts b/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/tools.ts
index aca5dccc9..41bfed397 100644
--- a/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/tools.ts
+++ b/src/generated/forge-mcp/customPages/accountCustomPages/previewTokens/tools.ts
@@ -3,61 +3,69 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  custom_pages_api_response_common_failure_output,
-  custom_pages_api_response_single_output,
-  custom_pages_messages_output,
+  custom$$pages_api$$response$$common$$failure,
+  custom$$pages_api$$response$$single,
+  custom$$pages_messages,
 } from "../../outputs.js";
-import { custom_pages_identifier } from "../../schemas.js";
 import {
-  custom_pages_preview_token_output,
-  custom_pages_preview_token_result_output,
+  custom$$pages_preview_token,
+  custom$$pages_preview_token_result,
 } from "./outputs.js";
-import { custom_pages_preview_request } from "./schemas.js";
+import { custom$$pages_preview_request } from "./schemas.js";
 
 /**
- * The tools of `custom_pages.account_custom_pages.preview_tokens`.
+ * The tools of `customPages.accountCustomPages.previewTokens`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_pages_account_custom_pages_preview_tokens_create",
+    name: "customPages_accountCustomPages_previewTokens_create",
     title: "Create a preview token",
-    description: "Creates a signed JWT for previewing an account or zone-level custom page before it is published.",
+    description: "Creates a signed JWT for previewing an account or zone-level custom page before it is published.\n\nPOST /{account_or_zone}/{account_or_zone_id}/custom_pages/preview_tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/custom-pages_preview_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "custom-pages_identifier": custom_pages_identifier,
-        "custom-pages_preview_request": custom_pages_preview_request,
+        "custom-pages_preview_request": custom$$pages_preview_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/custom-pages_preview_token_result",
       $defs: {
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_preview_token": custom_pages_preview_token_output,
-        "custom-pages_preview_token_result": custom_pages_preview_token_result_output,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_messages": custom$$pages_messages,
+        "custom-pages_preview_token": custom$$pages_preview_token,
+        "custom-pages_preview_token_result": custom$$pages_preview_token_result,
       },
     },
     annotations: {
@@ -99,11 +107,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_preview_token": custom_pages_preview_token_output,
-        "custom-pages_preview_token_result": custom_pages_preview_token_result_output,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_messages": custom$$pages_messages,
+        "custom-pages_preview_token": custom$$pages_preview_token,
+        "custom-pages_preview_token_result": custom$$pages_preview_token_result,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/customPages/accountCustomPages/schemas.ts b/src/generated/forge-mcp/customPages/accountCustomPages/schemas.ts
deleted file mode 100644
index 257cf7de8..000000000
--- a/src/generated/forge-mcp/customPages/accountCustomPages/schemas.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `custom-pages_error_page_type`.
- */
-export const custom_pages_error_page_type: JsonSchema = {
-  "description": "Custom page type.",
-  "enum": [
-    "1000_errors",
-    "500_errors",
-    "basic_challenge",
-    "country_challenge",
-    "ip_block",
-    "managed_challenge",
-    "ratelimit_block",
-    "under_attack",
-    "waf_block",
-    "waf_challenge"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `custom-pages_state`.
- */
-export const custom_pages_state: JsonSchema = {
-  "description": "The custom page state.",
-  "enum": [
-    "default",
-    "customized"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `custom-pages_url`.
- */
-export const custom_pages_url: JsonSchema = {
-  "description": "The URL associated with the custom page.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/customPages/accountCustomPages/tools.ts b/src/generated/forge-mcp/customPages/accountCustomPages/tools.ts
index 9bf14888e..b6cea25a0 100644
--- a/src/generated/forge-mcp/customPages/accountCustomPages/tools.ts
+++ b/src/generated/forge-mcp/customPages/accountCustomPages/tools.ts
@@ -3,75 +3,81 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  custom_pages_api_response_collection_output,
-  custom_pages_api_response_common_failure_output,
-  custom_pages_api_response_common_output,
-  custom_pages_api_response_single_output,
-  custom_pages_messages_output,
-  custom_pages_timestamp_output,
+  custom$$pages_api$$response$$collection,
+  custom$$pages_api$$response$$common,
+  custom$$pages_api$$response$$common$$failure,
+  custom$$pages_api$$response$$single,
+  custom$$pages_messages,
 } from "../outputs.js";
-import { custom_pages_identifier } from "../schemas.js";
 import {
-  custom_pages_custom_page_output,
-  custom_pages_custom_page_result_list_output,
-  custom_pages_custom_page_result_output,
-  custom_pages_state_output,
-  custom_pages_url_output,
+  custom$$pages_custom_page,
+  custom$$pages_custom_page_result,
+  custom$$pages_custom_page_result_list,
 } from "./outputs.js";
-import {
-  custom_pages_error_page_type,
-  custom_pages_state,
-  custom_pages_url,
-} from "./schemas.js";
 
 /**
- * The tools of `custom_pages.account_custom_pages`.
+ * The tools of `customPages.accountCustomPages`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "custom_pages_account_custom_pages_get",
+    name: "customPages_accountCustomPages_get",
     title: "Get a custom page",
-    description: "Returns the configuration for a custom page type.",
+    description: "Returns the configuration for a custom page type.\n\nGET /{account_or_zone}/{account_or_zone_id}/custom_pages/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "Custom page type.",
+              "enum": [
+                "1000_errors",
+                "500_errors",
+                "basic_challenge",
+                "country_challenge",
+                "ip_block",
+                "managed_challenge",
+                "ratelimit_block",
+                "under_attack",
+                "waf_block",
+                "waf_challenge"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "identifier"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "identifier": {
-          "$ref": "#/$defs/custom-pages_error_page_type",
-          "description": "Custom page type."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "custom-pages_error_page_type": custom_pages_error_page_type,
-        "custom-pages_identifier": custom_pages_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-pages_custom_page_result",
       $defs: {
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_custom_page": custom_pages_custom_page_output,
-        "custom-pages_custom_page_result": custom_pages_custom_page_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_state": custom_pages_state_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
-        "custom-pages_url": custom_pages_url_output,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_page": custom$$pages_custom_page,
+        "custom-pages_custom_page_result": custom$$pages_custom_page_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     annotations: {
@@ -108,14 +114,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_custom_page": custom_pages_custom_page_output,
-        "custom-pages_custom_page_result": custom_pages_custom_page_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_state": custom_pages_state_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
-        "custom-pages_url": custom_pages_url_output,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_page": custom$$pages_custom_page,
+        "custom-pages_custom_page_result": custom$$pages_custom_page_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     request: (args) => ({
@@ -123,44 +126,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_pages_account_custom_pages_list",
+    name: "customPages_accountCustomPages_list",
     title: "List custom pages",
-    description: "Lists all custom page configurations for an account or zone.",
+    description: "Lists all custom page configurations for an account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/custom_pages",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "custom-pages_identifier": custom_pages_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-pages_custom_page_result_list",
       $defs: {
-        "custom-pages_api-response-collection": custom_pages_api_response_collection_output,
-        "custom-pages_api-response-common": custom_pages_api_response_common_output,
-        "custom-pages_custom_page": custom_pages_custom_page_output,
-        "custom-pages_custom_page_result_list": custom_pages_custom_page_result_list_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_state": custom_pages_state_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
-        "custom-pages_url": custom_pages_url_output,
+        "custom-pages_api-response-collection": custom$$pages_api$$response$$collection,
+        "custom-pages_api-response-common": custom$$pages_api$$response$$common,
+        "custom-pages_custom_page": custom$$pages_custom_page,
+        "custom-pages_custom_page_result_list": custom$$pages_custom_page_result_list,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     annotations: {
@@ -202,15 +209,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-collection": custom_pages_api_response_collection_output,
-        "custom-pages_api-response-common": custom_pages_api_response_common_output,
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_custom_page": custom_pages_custom_page_output,
-        "custom-pages_custom_page_result_list": custom_pages_custom_page_result_list_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_state": custom_pages_state_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
-        "custom-pages_url": custom_pages_url_output,
+        "custom-pages_api-response-collection": custom$$pages_api$$response$$collection,
+        "custom-pages_api-response-common": custom$$pages_api$$response$$common,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_custom_page": custom$$pages_custom_page,
+        "custom-pages_custom_page_result_list": custom$$pages_custom_page_result_list,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     request: (args) => ({
@@ -218,34 +222,26 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "custom_pages_account_custom_pages_update",
+    name: "customPages_accountCustomPages_update",
     title: "Update a custom page",
-    description: "Updates the configuration for a custom page type.",
+    description: "Updates the configuration for a custom page type.\n\nPUT /{account_or_zone}/{account_or_zone_id}/custom_pages/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/custom-pages_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "state": {
-              "$ref": "#/$defs/custom-pages_state",
-              "description": "The custom page state."
+              "description": "The custom page state.",
+              "enum": [
+                "default",
+                "customized"
+              ],
+              "type": "string"
             },
             "url": {
-              "$ref": "#/$defs/custom-pages_url",
               "default": "",
-              "description": "The URL associated with the custom page."
+              "description": "The URL associated with the custom page.",
+              "type": "string"
             }
           },
           "required": [
@@ -254,34 +250,59 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "identifier": {
-          "$ref": "#/$defs/custom-pages_error_page_type",
-          "description": "Custom page type."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "Custom page type.",
+              "enum": [
+                "1000_errors",
+                "500_errors",
+                "basic_challenge",
+                "country_challenge",
+                "ip_block",
+                "managed_challenge",
+                "ratelimit_block",
+                "under_attack",
+                "waf_block",
+                "waf_challenge"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "identifier",
+        "path",
         "body"
       ],
-      $defs: {
-        "custom-pages_error_page_type": custom_pages_error_page_type,
-        "custom-pages_identifier": custom_pages_identifier,
-        "custom-pages_state": custom_pages_state,
-        "custom-pages_url": custom_pages_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-pages_custom_page_result",
       $defs: {
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_custom_page": custom_pages_custom_page_output,
-        "custom-pages_custom_page_result": custom_pages_custom_page_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_state": custom_pages_state_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
-        "custom-pages_url": custom_pages_url_output,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_page": custom$$pages_custom_page,
+        "custom-pages_custom_page_result": custom$$pages_custom_page_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     annotations: {
@@ -315,14 +336,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-pages_api-response-common-failure": custom_pages_api_response_common_failure_output,
-        "custom-pages_api-response-single": custom_pages_api_response_single_output,
-        "custom-pages_custom_page": custom_pages_custom_page_output,
-        "custom-pages_custom_page_result": custom_pages_custom_page_result_output,
-        "custom-pages_messages": custom_pages_messages_output,
-        "custom-pages_state": custom_pages_state_output,
-        "custom-pages_timestamp": custom_pages_timestamp_output,
-        "custom-pages_url": custom_pages_url_output,
+        "custom-pages_api-response-common-failure": custom$$pages_api$$response$$common$$failure,
+        "custom-pages_api-response-single": custom$$pages_api$$response$$single,
+        "custom-pages_custom_page": custom$$pages_custom_page,
+        "custom-pages_custom_page_result": custom$$pages_custom_page_result,
+        "custom-pages_messages": custom$$pages_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/customPages/outputs.ts b/src/generated/forge-mcp/customPages/outputs.ts
index cb401f775..7374150f8 100644
--- a/src/generated/forge-mcp/customPages/outputs.ts
+++ b/src/generated/forge-mcp/customPages/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `custom-pages_api-response-collection` in responses.
  */
-export const custom_pages_api_response_collection_output: JsonSchema = {
+export const custom$$pages_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-pages_api-response-common"
@@ -42,7 +42,7 @@ export const custom_pages_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `custom-pages_api-response-common` in responses.
  */
-export const custom_pages_api_response_common_output: JsonSchema = {
+export const custom$$pages_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/custom-pages_messages"
@@ -68,7 +68,7 @@ export const custom_pages_api_response_common_output: JsonSchema = {
 /**
  * The schema of `custom-pages_api-response-common-failure` in responses.
  */
-export const custom_pages_api_response_common_failure_output: JsonSchema = {
+export const custom$$pages_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/custom-pages_messages"
@@ -98,7 +98,7 @@ export const custom_pages_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `custom-pages_api-response-single` in responses.
  */
-export const custom_pages_api_response_single_output: JsonSchema = {
+export const custom$$pages_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/custom-pages_messages"
@@ -124,7 +124,7 @@ export const custom_pages_api_response_single_output: JsonSchema = {
 /**
  * The schema of `custom-pages_messages` in responses.
  */
-export const custom_pages_messages_output: JsonSchema = {
+export const custom$$pages_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -153,11 +153,3 @@ export const custom_pages_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `custom-pages_timestamp` in responses.
- */
-export const custom_pages_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/customPages/schemas.ts b/src/generated/forge-mcp/customPages/schemas.ts
deleted file mode 100644
index f17b6e47a..000000000
--- a/src/generated/forge-mcp/customPages/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `custom-pages_identifier`.
- */
-export const custom_pages_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/d1/outputs.ts b/src/generated/forge-mcp/d1/outputs.ts
index dfea0a4d5..c01d96911 100644
--- a/src/generated/forge-mcp/d1/outputs.ts
+++ b/src/generated/forge-mcp/d1/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `d1_api-response-common` in responses.
  */
-export const d1_api_response_common_output: JsonSchema = {
+export const d1_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/d1_messages"
@@ -32,7 +32,7 @@ export const d1_api_response_common_output: JsonSchema = {
 /**
  * The schema of `d1_api-response-common-failure` in responses.
  */
-export const d1_api_response_common_failure_output: JsonSchema = {
+export const d1_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/d1_messages"
@@ -59,122 +59,93 @@ export const d1_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `d1_created-at` in responses.
- */
-export const d1_created_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `d1_database-details-response` in responses.
  */
-export const d1_database_details_response_output: JsonSchema = {
+export const d1_database$$details$$response: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/d1_created-at"
+      "format": "date-time",
+      "type": "string"
     },
     "file_size": {
-      "$ref": "#/$defs/d1_file-size"
+      "type": "number"
     },
     "jurisdiction": {
-      "$ref": "#/$defs/d1_jurisdiction-nullable"
+      "oneOf": [
+        {
+          "enum": [
+            "eu",
+            "fedramp",
+            "us"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "name": {
-      "$ref": "#/$defs/d1_database-name"
+      "type": "string"
     },
     "num_tables": {
-      "$ref": "#/$defs/d1_table-count"
+      "type": "number"
     },
     "read_replication": {
       "$ref": "#/$defs/d1_read-replication-details-for-response"
     },
     "uuid": {
-      "$ref": "#/$defs/d1_database-identifier"
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/d1_database-version"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `d1_database-identifier` in responses.
- */
-export const d1_database_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `d1_database-name` in responses.
- */
-export const d1_database_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `d1_database-response` in responses.
  */
-export const d1_database_response_output: JsonSchema = {
+export const d1_database$$response: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/d1_created-at"
+      "format": "date-time",
+      "type": "string"
     },
     "jurisdiction": {
-      "$ref": "#/$defs/d1_jurisdiction-nullable"
+      "oneOf": [
+        {
+          "enum": [
+            "eu",
+            "fedramp",
+            "us"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "name": {
-      "$ref": "#/$defs/d1_database-name"
+      "type": "string"
     },
     "uuid": {
-      "$ref": "#/$defs/d1_database-identifier"
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/d1_database-version"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `d1_database-version` in responses.
- */
-export const d1_database_version_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `d1_file-size` in responses.
- */
-export const d1_file_size_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `d1_jurisdiction-nullable` in responses.
- */
-export const d1_jurisdiction_nullable_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "eu",
-        "fedramp",
-        "us"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `d1_messages` in responses.
  */
-export const d1_messages_output: JsonSchema = {
+export const d1_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -196,7 +167,7 @@ export const d1_messages_output: JsonSchema = {
 /**
  * The schema of `d1_query-meta` in responses.
  */
-export const d1_query_meta_output: JsonSchema = {
+export const d1_query$$meta: JsonSchema = {
   "properties": {
     "changed_db": {
       "type": "boolean"
@@ -217,13 +188,21 @@ export const d1_query_meta_output: JsonSchema = {
       "type": "number"
     },
     "served_by_colo": {
-      "$ref": "#/$defs/d1_served-by-colo"
+      "type": "string"
     },
     "served_by_primary": {
       "type": "boolean"
     },
     "served_by_region": {
-      "$ref": "#/$defs/d1_served-by-region"
+      "enum": [
+        "WNAM",
+        "ENAM",
+        "WEUR",
+        "EEUR",
+        "APAC",
+        "OC"
+      ],
+      "type": "string"
     },
     "size_after": {
       "type": "number"
@@ -243,7 +222,7 @@ export const d1_query_meta_output: JsonSchema = {
 /**
  * The schema of `d1_query-result-response` in responses.
  */
-export const d1_query_result_response_output: JsonSchema = {
+export const d1_query$$result$$response: JsonSchema = {
   "properties": {
     "meta": {
       "$ref": "#/$defs/d1_query-meta"
@@ -264,7 +243,7 @@ export const d1_query_result_response_output: JsonSchema = {
 /**
  * The schema of `d1_raw-result-response` in responses.
  */
-export const d1_raw_result_response_output: JsonSchema = {
+export const d1_raw$$result$$response: JsonSchema = {
   "properties": {
     "meta": {
       "$ref": "#/$defs/d1_query-meta"
@@ -309,7 +288,7 @@ export const d1_raw_result_response_output: JsonSchema = {
 /**
  * The schema of `d1_read-replication-details-for-response` in responses.
  */
-export const d1_read_replication_details_for_response_output: JsonSchema = {
+export const d1_read$$replication$$details$$for$$response: JsonSchema = {
   "properties": {
     "mode": {
       "enum": [
@@ -324,32 +303,3 @@ export const d1_read_replication_details_for_response_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `d1_served-by-colo` in responses.
- */
-export const d1_served_by_colo_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `d1_served-by-region` in responses.
- */
-export const d1_served_by_region_output: JsonSchema = {
-  "enum": [
-    "WNAM",
-    "ENAM",
-    "WEUR",
-    "EEUR",
-    "APAC",
-    "OC"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `d1_table-count` in responses.
- */
-export const d1_table_count_output: JsonSchema = {
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/d1/schemas.ts b/src/generated/forge-mcp/d1/schemas.ts
index 371ac6f44..1db8ed361 100644
--- a/src/generated/forge-mcp/d1/schemas.ts
+++ b/src/generated/forge-mcp/d1/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `d1_account-identifier`.
- */
-export const d1_account_identifier: JsonSchema = {
-  "description": "Account identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `d1_batch-query`.
  */
-export const d1_batch_query: JsonSchema = {
+export const d1_batch$$query: JsonSchema = {
   "description": "A single query object or a batch query object",
   "oneOf": [
     {
@@ -37,26 +29,10 @@ export const d1_batch_query: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `d1_database-identifier`.
- */
-export const d1_database_identifier: JsonSchema = {
-  "description": "D1 database identifier (UUID).",
-  "type": "string"
-};
-
-/**
- * The schema of `d1_database-name`.
- */
-export const d1_database_name: JsonSchema = {
-  "description": "D1 database name.",
-  "type": "string"
-};
-
 /**
  * The schema of `d1_database-update-partial-request-body`.
  */
-export const d1_database_update_partial_request_body: JsonSchema = {
+export const d1_database$$update$$partial$$request$$body: JsonSchema = {
   "properties": {
     "read_replication": {
       "$ref": "#/$defs/d1_read-replication-details-for-request",
@@ -69,7 +45,7 @@ export const d1_database_update_partial_request_body: JsonSchema = {
 /**
  * The schema of `d1_database-update-request-body`.
  */
-export const d1_database_update_request_body: JsonSchema = {
+export const d1_database$$update$$request$$body: JsonSchema = {
   "properties": {
     "read_replication": {
       "$ref": "#/$defs/d1_read-replication-details-for-request",
@@ -82,19 +58,6 @@ export const d1_database_update_request_body: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `d1_jurisdiction`.
- */
-export const d1_jurisdiction: JsonSchema = {
-  "description": "Specify the location to restrict the D1 database to run and store data. If this option is present, the location hint is ignored.",
-  "enum": [
-    "eu",
-    "fedramp",
-    "us"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `d1_params`.
  */
@@ -105,26 +68,10 @@ export const d1_params: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `d1_primary-location-hint`.
- */
-export const d1_primary_location_hint: JsonSchema = {
-  "description": "Specify the region to create the D1 primary, if available. If this option is omitted, the D1 will be created as close as possible to the current user.",
-  "enum": [
-    "wnam",
-    "enam",
-    "weur",
-    "eeur",
-    "apac",
-    "oc"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `d1_read-replication-details-for-request`.
  */
-export const d1_read_replication_details_for_request: JsonSchema = {
+export const d1_read$$replication$$details$$for$$request: JsonSchema = {
   "description": "Configuration for D1 read replication.",
   "properties": {
     "mode": {
@@ -145,15 +92,15 @@ export const d1_read_replication_details_for_request: JsonSchema = {
 /**
  * The schema of `d1_single-query`.
  */
-export const d1_single_query: JsonSchema = {
+export const d1_single$$query: JsonSchema = {
   "description": "A single query with or without parameters",
   "properties": {
     "params": {
       "$ref": "#/$defs/d1_params"
     },
     "sql": {
-      "$ref": "#/$defs/d1_sql",
-      "description": "Your SQL query. Supports multiple statements, joined by semicolons, which will be executed as a batch."
+      "description": "Your SQL query. Supports multiple statements, joined by semicolons, which will be executed as a batch.",
+      "type": "string"
     }
   },
   "required": [
@@ -161,11 +108,3 @@ export const d1_single_query: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `d1_sql`.
- */
-export const d1_sql: JsonSchema = {
-  "description": "Your SQL query. Supports multiple statements, joined by semicolons, which will be executed as a batch.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/d1/timeTravel/outputs.ts b/src/generated/forge-mcp/d1/timeTravel/outputs.ts
index 5d36d3130..0bc19ffd6 100644
--- a/src/generated/forge-mcp/d1/timeTravel/outputs.ts
+++ b/src/generated/forge-mcp/d1/timeTravel/outputs.ts
@@ -3,22 +3,15 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `d1_time-travel-bookmark` in responses.
- */
-export const d1_time_travel_bookmark_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `d1_time-travel-restore-response` in responses.
  */
-export const d1_time_travel_restore_response_output: JsonSchema = {
+export const d1_time$$travel$$restore$$response: JsonSchema = {
   "properties": {
     "bookmark": {
       "allOf": [
         {
-          "$ref": "#/$defs/d1_time-travel-bookmark"
+          "type": "string"
         },
         {
           "type": "string"
@@ -31,7 +24,7 @@ export const d1_time_travel_restore_response_output: JsonSchema = {
     "previous_bookmark": {
       "allOf": [
         {
-          "$ref": "#/$defs/d1_time-travel-bookmark"
+          "type": "string"
         },
         {
           "type": "string"
diff --git a/src/generated/forge-mcp/d1/timeTravel/schemas.ts b/src/generated/forge-mcp/d1/timeTravel/schemas.ts
deleted file mode 100644
index 3d0b13a97..000000000
--- a/src/generated/forge-mcp/d1/timeTravel/schemas.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `d1_time-travel-bookmark`.
- */
-export const d1_time_travel_bookmark: JsonSchema = {
-  "description": "A bookmark representing a specific state of the database at a specific point in time.",
-  "type": "string"
-};
-
-/**
- * The schema of `d1_time-travel-timestamp`.
- */
-export const d1_time_travel_timestamp: JsonSchema = {
-  "description": "An ISO 8601 timestamp used for time travel operations. The database will be restored to the nearest available bookmark at or before this timestamp.",
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/d1/timeTravel/tools.ts b/src/generated/forge-mcp/d1/timeTravel/tools.ts
index a4ebb6223..2f798797e 100644
--- a/src/generated/forge-mcp/d1/timeTravel/tools.ts
+++ b/src/generated/forge-mcp/d1/timeTravel/tools.ts
@@ -1,55 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  d1_api_response_common_failure_output,
-  d1_api_response_common_output,
-  d1_messages_output,
+  d1_api$$response$$common,
+  d1_api$$response$$common$$failure,
+  d1_messages,
 } from "../outputs.js";
-import { d1_account_identifier, d1_database_identifier } from "../schemas.js";
-import {
-  d1_time_travel_bookmark_output,
-  d1_time_travel_restore_response_output,
-} from "./outputs.js";
-import {
-  d1_time_travel_bookmark,
-  d1_time_travel_timestamp,
-} from "./schemas.js";
+import { d1_time$$travel$$restore$$response } from "./outputs.js";
 
 /**
- * The tools of `d1.time_travel`.
+ * The tools of `d1.timeTravel`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "d1_time_travel_get_bookmark",
+    name: "d1_timeTravel_getBookmark",
     title: "Get D1 database bookmark",
-    description: "Retrieve the current bookmark, or the nearest bookmark at or before a provided timestamp.\nBookmarks can be used with the restore endpoint to revert the database to a previous point in time.",
+    description: "Retrieve the current bookmark, or the nearest bookmark at or before a provided timestamp.\nBookmarks can be used with the restore endpoint to revert the database to a previous point in time.\n\nGET /accounts/{account_id}/d1/database/{database_id}/time_travel/bookmark",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
-        "database_id": {
-          "$ref": "#/$defs/d1_database-identifier",
-          "description": "D1 database identifier (UUID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "database_id": {
+              "description": "D1 database identifier (UUID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         },
-        "timestamp": {
-          "$ref": "#/$defs/d1_time-travel-timestamp",
-          "description": "An optional ISO 8601 timestamp. If provided, returns the nearest available bookmark at or before this timestamp. If omitted, returns the current bookmark."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "timestamp": {
+              "description": "An optional ISO 8601 timestamp. If provided, returns the nearest available bookmark at or before this timestamp. If omitted, returns the current bookmark.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id"
+        "path"
       ],
-      $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_database-identifier": d1_database_identifier,
-        "d1_time-travel-timestamp": d1_time_travel_timestamp,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -61,7 +65,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "bookmark": {
-                  "$ref": "#/$defs/d1_time-travel-bookmark"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -71,9 +75,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_messages": d1_messages_output,
-        "d1_time-travel-bookmark": d1_time_travel_bookmark_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_messages": d1_messages,
       },
     },
     annotations: {
@@ -104,7 +107,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "bookmark": {
-                      "$ref": "#/$defs/d1_time-travel-bookmark"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -119,53 +122,63 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_messages": d1_messages_output,
-        "d1_time-travel-bookmark": d1_time_travel_bookmark_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_messages": d1_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/d1/database/${pathParam(args, "database_id")}/time_travel/bookmark`,
       query: [
-        ["timestamp", args["timestamp"], true],
+        ["timestamp", param(args, "query", "timestamp"), true],
       ],
     }),
   },
   {
-    name: "d1_time_travel_restore",
+    name: "d1_timeTravel_restore",
     title: "Restore D1 Database to a bookmark or point in time",
-    description: "Restore a D1 database to a previous point in time either via a bookmark or a timestamp.\n\nConfirm with the user before calling this tool. This reverts the D1 database to a previous point in time. Data written after the bookmark will be lost.",
+    description: "Restore a D1 database to a previous point in time either via a bookmark or a timestamp.\n\nConfirm with the user before calling this tool. This reverts the D1 database to a previous point in time. Data written after the bookmark will be lost.\n\nPOST /accounts/{account_id}/d1/database/{database_id}/time_travel/restore",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
-        "bookmark": {
-          "$ref": "#/$defs/d1_time-travel-bookmark",
-          "description": "A bookmark to restore the database to. Required if `timestamp` is not provided."
-        },
-        "database_id": {
-          "$ref": "#/$defs/d1_database-identifier",
-          "description": "D1 database identifier (UUID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "database_id": {
+              "description": "D1 database identifier (UUID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         },
-        "timestamp": {
-          "$ref": "#/$defs/d1_time-travel-timestamp",
-          "description": "An ISO 8601 timestamp to restore the database to. Required if `bookmark` is not provided."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "bookmark": {
+              "description": "A bookmark to restore the database to. Required if `timestamp` is not provided.",
+              "type": "string"
+            },
+            "timestamp": {
+              "description": "An ISO 8601 timestamp to restore the database to. Required if `bookmark` is not provided.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id"
+        "path"
       ],
-      $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_database-identifier": d1_database_identifier,
-        "d1_time-travel-bookmark": d1_time_travel_bookmark,
-        "d1_time-travel-timestamp": d1_time_travel_timestamp,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -182,10 +195,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_messages": d1_messages_output,
-        "d1_time-travel-bookmark": d1_time_travel_bookmark_output,
-        "d1_time-travel-restore-response": d1_time_travel_restore_response_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_messages": d1_messages,
+        "d1_time-travel-restore-response": d1_time$$travel$$restore$$response,
       },
     },
     annotations: {
@@ -222,18 +234,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_messages": d1_messages_output,
-        "d1_time-travel-bookmark": d1_time_travel_bookmark_output,
-        "d1_time-travel-restore-response": d1_time_travel_restore_response_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_messages": d1_messages,
+        "d1_time-travel-restore-response": d1_time$$travel$$restore$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/d1/database/${pathParam(args, "database_id")}/time_travel/restore`,
       query: [
-        ["bookmark", args["bookmark"], true],
-        ["timestamp", args["timestamp"], true],
+        ["bookmark", param(args, "query", "bookmark"), true],
+        ["timestamp", param(args, "query", "timestamp"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/d1/tools.ts b/src/generated/forge-mcp/d1/tools.ts
index 1f208ce12..ca107b56c 100644
--- a/src/generated/forge-mcp/d1/tools.ts
+++ b/src/generated/forge-mcp/d1/tools.ts
@@ -1,40 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  d1_api_response_common_failure_output,
-  d1_api_response_common_output,
-  d1_created_at_output,
-  d1_database_details_response_output,
-  d1_database_identifier_output,
-  d1_database_name_output,
-  d1_database_response_output,
-  d1_database_version_output,
-  d1_file_size_output,
-  d1_jurisdiction_nullable_output,
-  d1_messages_output,
-  d1_query_meta_output,
-  d1_query_result_response_output,
-  d1_raw_result_response_output,
-  d1_read_replication_details_for_response_output,
-  d1_served_by_colo_output,
-  d1_served_by_region_output,
-  d1_table_count_output,
+  d1_api$$response$$common,
+  d1_api$$response$$common$$failure,
+  d1_database$$details$$response,
+  d1_database$$response,
+  d1_messages,
+  d1_query$$meta,
+  d1_query$$result$$response,
+  d1_raw$$result$$response,
+  d1_read$$replication$$details$$for$$response,
 } from "./outputs.js";
 import {
-  d1_account_identifier,
-  d1_batch_query,
-  d1_database_identifier,
-  d1_database_name,
-  d1_database_update_partial_request_body,
-  d1_database_update_request_body,
-  d1_jurisdiction,
+  d1_batch$$query,
+  d1_database$$update$$partial$$request$$body,
+  d1_database$$update$$request$$body,
   d1_params,
-  d1_primary_location_hint,
-  d1_read_replication_details_for_request,
-  d1_single_query,
-  d1_sql,
+  d1_read$$replication$$details$$for$$request,
+  d1_single$$query,
 } from "./schemas.js";
 
 /**
@@ -44,27 +29,36 @@ export const tools: readonly Tool[] = [
   {
     name: "d1_create",
     title: "Create D1 Database",
-    description: "Create a new D1 database in your account.",
+    description: "Create a new D1 database in your account.\n\nPOST /accounts/{account_id}/d1/database",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "jurisdiction": {
-              "$ref": "#/$defs/d1_jurisdiction",
-              "description": "Specify the location to restrict the D1 database to run and store data. If this option is present, the location hint is ignored."
+              "description": "Specify the location to restrict the D1 database to run and store data. If this option is present, the location hint is ignored.",
+              "enum": [
+                "eu",
+                "fedramp",
+                "us"
+              ],
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/d1_database-name",
-              "description": "D1 database name."
+              "description": "D1 database name.",
+              "type": "string"
             },
             "primary_location_hint": {
-              "$ref": "#/$defs/d1_primary-location-hint",
-              "description": "Specify the region to create the D1 primary, if available. If this option is omitted, the D1 will be created as close as possible to the current user."
+              "description": "Specify the region to create the D1 primary, if available. If this option is omitted, the D1 will be created as close as possible to the current user.",
+              "enum": [
+                "wnam",
+                "enam",
+                "weur",
+                "eeur",
+                "apac",
+                "oc"
+              ],
+              "type": "string"
             },
             "read_replication": {
               "$ref": "#/$defs/d1_read-replication-details-for-request",
@@ -75,18 +69,28 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_database-name": d1_database_name,
-        "d1_jurisdiction": d1_jurisdiction,
-        "d1_primary-location-hint": d1_primary_location_hint,
-        "d1_read-replication-details-for-request": d1_read_replication_details_for_request,
+        "d1_read-replication-details-for-request": d1_read$$replication$$details$$for$$request,
       },
     },
     outputSchema: {
@@ -104,17 +108,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     annotations: {
@@ -154,18 +151,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     request: (args) => ({
@@ -176,27 +166,33 @@ export const tools: readonly Tool[] = [
   {
     name: "d1_delete",
     title: "Delete D1 Database",
-    description: "Delete a D1 database.\n\nConfirm with the user before calling this tool. This permanently deletes the D1 database and all of its data.",
+    description: "Delete a D1 database.\n\nConfirm with the user before calling this tool. This permanently deletes the D1 database and all of its data.\n\nDELETE /accounts/{account_id}/d1/database/{database_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
-        "database_id": {
-          "$ref": "#/$defs/d1_database-identifier",
-          "description": "D1 database identifier (UUID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "database_id": {
+              "description": "D1 database identifier (UUID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id"
+        "path"
       ],
-      $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_database-identifier": d1_database_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -213,8 +209,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_messages": d1_messages_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_messages": d1_messages,
       },
     },
     annotations: {
@@ -254,9 +250,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_messages": d1_messages_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_messages": d1_messages,
       },
     },
     request: (args) => ({
@@ -266,32 +262,40 @@ export const tools: readonly Tool[] = [
   {
     name: "d1_edit",
     title: "Update D1 Database partially",
-    description: "Partially update a D1 database's configuration.",
+    description: "Partially update a D1 database's configuration.\n\nPATCH /accounts/{account_id}/d1/database/{database_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/d1_database-update-partial-request-body"
         },
-        "database_id": {
-          "$ref": "#/$defs/d1_database-identifier",
-          "description": "D1 database identifier (UUID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "database_id": {
+              "description": "D1 database identifier (UUID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_database-identifier": d1_database_identifier,
-        "d1_database-update-partial-request-body": d1_database_update_partial_request_body,
-        "d1_read-replication-details-for-request": d1_read_replication_details_for_request,
+        "d1_database-update-partial-request-body": d1_database$$update$$partial$$request$$body,
+        "d1_read-replication-details-for-request": d1_read$$replication$$details$$for$$request,
       },
     },
     outputSchema: {
@@ -309,17 +313,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     annotations: {
@@ -358,18 +355,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     request: (args) => ({
@@ -380,52 +370,65 @@ export const tools: readonly Tool[] = [
   {
     name: "d1_get",
     title: "Get D1 Database",
-    description: "Get details for a specific D1 database.",
+    description: "Get details for a specific D1 database.\n\nGET /accounts/{account_id}/d1/database/{database_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
-        "database_id": {
-          "oneOf": [
-            {
-              "$ref": "#/$defs/d1_database-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
             },
-            {
-              "$ref": "#/$defs/d1_database-name"
+            "database_id": {
+              "oneOf": [
+                {
+                  "description": "D1 database identifier (UUID).",
+                  "type": "string"
+                },
+                {
+                  "description": "D1 database name.",
+                  "type": "string"
+                }
+              ]
             }
-          ]
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         },
-        "fields": {
-          "description": "Comma-separated list of fields to include in the response. When omitted,\nall fields are returned.\n",
-          "items": {
-            "enum": [
-              "uuid",
-              "name",
-              "created_at",
-              "version",
-              "jurisdiction",
-              "num_tables",
-              "file_size",
-              "running_in_region",
-              "read_replication"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "fields": {
+              "description": "Comma-separated list of fields to include in the response. When omitted,\nall fields are returned.",
+              "items": {
+                "enum": [
+                  "uuid",
+                  "name",
+                  "created_at",
+                  "version",
+                  "jurisdiction",
+                  "num_tables",
+                  "file_size",
+                  "running_in_region",
+                  "read_replication"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id"
+        "path"
       ],
-      $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_database-identifier": d1_database_identifier,
-        "d1_database-name": d1_database_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -442,17 +445,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     annotations: {
@@ -493,59 +489,65 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/d1/database/${pathParam(args, "database_id")}`,
       query: [
-        ["fields", args["fields"], false],
+        ["fields", param(args, "query", "fields"), false],
       ],
     }),
   },
   {
     name: "d1_list",
     title: "List D1 Databases",
-    description: "List D1 databases in your account.",
+    description: "List D1 databases in your account.\n\nGET /accounts/{account_id}/d1/database",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
-        "name": {
-          "description": "a database name to search for.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 1000,
-          "description": "Number of items per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "a database name to search for.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 1000,
+              "description": "Number of items per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "d1_account-identifier": d1_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -582,14 +584,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-response": d1_database_response_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_database-response": d1_database$$response,
+        "d1_messages": d1_messages,
       },
     },
     annotations: {
@@ -650,57 +647,59 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-response": d1_database_response_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_database-response": d1_database$$response,
+        "d1_messages": d1_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/d1/database`,
       query: [
-        ["name", args["name"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "d1_query",
     title: "Query D1 Database",
-    description: "Execute a SQL query against a D1 database and return results as objects.",
+    description: "Execute a SQL query against a D1 database and return results as objects.\n\nPOST /accounts/{account_id}/d1/database/{database_id}/query",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/d1_batch-query"
         },
-        "database_id": {
-          "$ref": "#/$defs/d1_database-identifier",
-          "description": "D1 database identifier (UUID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "database_id": {
+              "description": "D1 database identifier (UUID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_batch-query": d1_batch_query,
-        "d1_database-identifier": d1_database_identifier,
+        "d1_batch-query": d1_batch$$query,
         "d1_params": d1_params,
-        "d1_single-query": d1_single_query,
-        "d1_sql": d1_sql,
+        "d1_single-query": d1_single$$query,
       },
     },
     outputSchema: {
@@ -721,12 +720,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_messages": d1_messages_output,
-        "d1_query-meta": d1_query_meta_output,
-        "d1_query-result-response": d1_query_result_response_output,
-        "d1_served-by-colo": d1_served_by_colo_output,
-        "d1_served-by-region": d1_served_by_region_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_messages": d1_messages,
+        "d1_query-meta": d1_query$$meta,
+        "d1_query-result-response": d1_query$$result$$response,
       },
     },
     annotations: {
@@ -770,13 +767,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_messages": d1_messages_output,
-        "d1_query-meta": d1_query_meta_output,
-        "d1_query-result-response": d1_query_result_response_output,
-        "d1_served-by-colo": d1_served_by_colo_output,
-        "d1_served-by-region": d1_served_by_region_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_messages": d1_messages,
+        "d1_query-meta": d1_query$$meta,
+        "d1_query-result-response": d1_query$$result$$response,
       },
     },
     request: (args) => ({
@@ -787,34 +782,41 @@ export const tools: readonly Tool[] = [
   {
     name: "d1_raw",
     title: "Raw D1 Database query",
-    description: "Execute a SQL query against a D1 database and return result rows as arrays rather than objects. This is a performance-optimized version of the /query endpoint.",
+    description: "Execute a SQL query against a D1 database and return result rows as arrays rather than objects. This is a performance-optimized version of the /query endpoint.\n\nPOST /accounts/{account_id}/d1/database/{database_id}/raw",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/d1_batch-query"
         },
-        "database_id": {
-          "$ref": "#/$defs/d1_database-identifier",
-          "description": "D1 database identifier (UUID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "database_id": {
+              "description": "D1 database identifier (UUID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_batch-query": d1_batch_query,
-        "d1_database-identifier": d1_database_identifier,
+        "d1_batch-query": d1_batch$$query,
         "d1_params": d1_params,
-        "d1_single-query": d1_single_query,
-        "d1_sql": d1_sql,
+        "d1_single-query": d1_single$$query,
       },
     },
     outputSchema: {
@@ -835,12 +837,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_messages": d1_messages_output,
-        "d1_query-meta": d1_query_meta_output,
-        "d1_raw-result-response": d1_raw_result_response_output,
-        "d1_served-by-colo": d1_served_by_colo_output,
-        "d1_served-by-region": d1_served_by_region_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_messages": d1_messages,
+        "d1_query-meta": d1_query$$meta,
+        "d1_raw-result-response": d1_raw$$result$$response,
       },
     },
     annotations: {
@@ -884,13 +884,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_messages": d1_messages_output,
-        "d1_query-meta": d1_query_meta_output,
-        "d1_raw-result-response": d1_raw_result_response_output,
-        "d1_served-by-colo": d1_served_by_colo_output,
-        "d1_served-by-region": d1_served_by_region_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_messages": d1_messages,
+        "d1_query-meta": d1_query$$meta,
+        "d1_raw-result-response": d1_raw$$result$$response,
       },
     },
     request: (args) => ({
@@ -901,37 +899,42 @@ export const tools: readonly Tool[] = [
   {
     name: "d1_undelete",
     title: "Undelete D1 Database",
-    description: "Restore a deleted D1 database. The database is restored with the name it had when it was deleted,\nunless `new_name` is provided. The restored database counts against the account's limits.\nUndeleting a database that is not deleted succeeds without changes, unless `new_name` differs from its current name which errors.\nA database can only be undeleted within 7 days (7 * 24 hours) of its deletion.\n\nOnce a database is undeleted, Time Travel (point-in-time recovery) cannot restore it to a bookmark or\ntimestamp at or before the undeletion. Only states after the undeletion can be restored.\n\nConfirm with the user before calling this tool. After undeleting, Time Travel cannot restore the D1 database to a point in time at or before the undeletion.",
+    description: "Restore a deleted D1 database. The database is restored with the name it had when it was deleted,\nunless `new_name` is provided. The restored database counts against the account's limits.\nUndeleting a database that is not deleted succeeds without changes, unless `new_name` differs from its current name which errors.\nA database can only be undeleted within 7 days (7 * 24 hours) of its deletion.\n\nOnce a database is undeleted, Time Travel (point-in-time recovery) cannot restore it to a bookmark or\ntimestamp at or before the undeletion. Only states after the undeletion can be restored.\n\nConfirm with the user before calling this tool. After undeleting, Time Travel cannot restore the D1 database to a point in time at or before the undeletion.\n\nPOST /accounts/{account_id}/d1/database/{database_id}/undelete",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "new_name": {
-              "$ref": "#/$defs/d1_database-name",
-              "description": "Restore the database with this name instead of the name it had when it was deleted. Required if another database in the account already uses that name."
+              "description": "Restore the database with this name instead of the name it had when it was deleted. Required if another database in the account already uses that name.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "database_id": {
-          "$ref": "#/$defs/d1_database-identifier",
-          "description": "D1 database identifier (UUID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "database_id": {
+              "description": "D1 database identifier (UUID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id"
+        "path"
       ],
-      $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_database-identifier": d1_database_identifier,
-        "d1_database-name": d1_database_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -948,17 +951,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     annotations: {
@@ -995,18 +991,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     request: (args) => ({
@@ -1017,32 +1006,40 @@ export const tools: readonly Tool[] = [
   {
     name: "d1_update",
     title: "Update D1 Database",
-    description: "Update a D1 database's configuration.",
+    description: "Update a D1 database's configuration.\n\nPUT /accounts/{account_id}/d1/database/{database_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/d1_account-identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/d1_database-update-request-body"
         },
-        "database_id": {
-          "$ref": "#/$defs/d1_database-identifier",
-          "description": "D1 database identifier (UUID)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "database_id": {
+              "description": "D1 database identifier (UUID).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "database_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "database_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "d1_account-identifier": d1_account_identifier,
-        "d1_database-identifier": d1_database_identifier,
-        "d1_database-update-request-body": d1_database_update_request_body,
-        "d1_read-replication-details-for-request": d1_read_replication_details_for_request,
+        "d1_database-update-request-body": d1_database$$update$$request$$body,
+        "d1_read-replication-details-for-request": d1_read$$replication$$details$$for$$request,
       },
     },
     outputSchema: {
@@ -1060,17 +1057,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     annotations: {
@@ -1110,18 +1100,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "d1_api-response-common": d1_api_response_common_output,
-        "d1_api-response-common-failure": d1_api_response_common_failure_output,
-        "d1_created-at": d1_created_at_output,
-        "d1_database-details-response": d1_database_details_response_output,
-        "d1_database-identifier": d1_database_identifier_output,
-        "d1_database-name": d1_database_name_output,
-        "d1_database-version": d1_database_version_output,
-        "d1_file-size": d1_file_size_output,
-        "d1_jurisdiction-nullable": d1_jurisdiction_nullable_output,
-        "d1_messages": d1_messages_output,
-        "d1_read-replication-details-for-response": d1_read_replication_details_for_response_output,
-        "d1_table-count": d1_table_count_output,
+        "d1_api-response-common": d1_api$$response$$common,
+        "d1_api-response-common-failure": d1_api$$response$$common$$failure,
+        "d1_database-details-response": d1_database$$details$$response,
+        "d1_messages": d1_messages,
+        "d1_read-replication-details-for-response": d1_read$$replication$$details$$for$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/diagnostics/endpointHealthchecks/outputs.ts b/src/generated/forge-mcp/diagnostics/endpointHealthchecks/outputs.ts
index 94a24e680..6e276fed5 100644
--- a/src/generated/forge-mcp/diagnostics/endpointHealthchecks/outputs.ts
+++ b/src/generated/forge-mcp/diagnostics/endpointHealthchecks/outputs.ts
@@ -3,23 +3,16 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic-transit_check_type` in responses.
- */
-export const magic_transit_check_type_output: JsonSchema = {
-  "enum": [
-    "icmp"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `magic-transit_endpoint_health_check` in responses.
  */
-export const magic_transit_endpoint_health_check_output: JsonSchema = {
+export const magic$$transit_endpoint_health_check: JsonSchema = {
   "properties": {
     "check_type": {
-      "$ref": "#/$defs/magic-transit_check_type"
+      "enum": [
+        "icmp"
+      ],
+      "type": "string"
     },
     "endpoint": {
       "type": "string"
@@ -38,7 +31,7 @@ export const magic_transit_endpoint_health_check_output: JsonSchema = {
 /**
  * The schema of `magic-transit_endpoint_health_check_response` in responses.
  */
-export const magic_transit_endpoint_health_check_response_output: JsonSchema = {
+export const magic$$transit_endpoint_health_check_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-transit_endpoint_health_check"
@@ -46,7 +39,7 @@ export const magic_transit_endpoint_health_check_response_output: JsonSchema = {
     {
       "properties": {
         "id": {
-          "$ref": "#/$defs/magic-transit_uuid"
+          "type": "string"
         }
       },
       "type": "object"
@@ -58,7 +51,7 @@ export const magic_transit_endpoint_health_check_response_output: JsonSchema = {
  * The schema of `magic-transit_endpoint_health_check_response_collection` in
  * responses.
  */
-export const magic_transit_endpoint_health_check_response_collection_output: JsonSchema = {
+export const magic$$transit_endpoint_health_check_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-transit_api-response-common"
@@ -81,7 +74,7 @@ export const magic_transit_endpoint_health_check_response_collection_output: Jso
  * The schema of `magic-transit_endpoint_health_check_response_single` in
  * responses.
  */
-export const magic_transit_endpoint_health_check_response_single_output: JsonSchema = {
+export const magic$$transit_endpoint_health_check_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-transit_api-response-common"
@@ -96,10 +89,3 @@ export const magic_transit_endpoint_health_check_response_single_output: JsonSch
     }
   ]
 };
-
-/**
- * The schema of `magic-transit_uuid` in responses.
- */
-export const magic_transit_uuid_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/diagnostics/endpointHealthchecks/schemas.ts b/src/generated/forge-mcp/diagnostics/endpointHealthchecks/schemas.ts
index d13962acc..7a85f2a31 100644
--- a/src/generated/forge-mcp/diagnostics/endpointHealthchecks/schemas.ts
+++ b/src/generated/forge-mcp/diagnostics/endpointHealthchecks/schemas.ts
@@ -3,26 +3,18 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic-transit_check_type`.
- */
-export const magic_transit_check_type: JsonSchema = {
-  "description": "type of check to perform",
-  "enum": [
-    "icmp"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `magic-transit_endpoint_health_check`.
  */
-export const magic_transit_endpoint_health_check: JsonSchema = {
+export const magic$$transit_endpoint_health_check: JsonSchema = {
   "properties": {
     "check_type": {
-      "$ref": "#/$defs/magic-transit_check_type",
       "default": "icmp",
-      "description": "type of check to perform"
+      "description": "type of check to perform",
+      "enum": [
+        "icmp"
+      ],
+      "type": "string"
     },
     "endpoint": {
       "description": "the IP address of the host to perform checks against",
@@ -39,11 +31,3 @@ export const magic_transit_endpoint_health_check: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `magic-transit_uuid`.
- */
-export const magic_transit_uuid: JsonSchema = {
-  "description": "UUID.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/diagnostics/endpointHealthchecks/tools.ts b/src/generated/forge-mcp/diagnostics/endpointHealthchecks/tools.ts
index 6584f4658..37defba1b 100644
--- a/src/generated/forge-mcp/diagnostics/endpointHealthchecks/tools.ts
+++ b/src/generated/forge-mcp/diagnostics/endpointHealthchecks/tools.ts
@@ -3,64 +3,63 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_transit_api_response_common_failure_output,
-  magic_transit_api_response_common_output,
-  magic_transit_messages_output,
+  magic$$transit_api$$response$$common,
+  magic$$transit_api$$response$$common$$failure,
+  magic$$transit_messages,
 } from "../outputs.js";
-import { magic_transit_identifier } from "../schemas.js";
 import {
-  magic_transit_check_type_output,
-  magic_transit_endpoint_health_check_output,
-  magic_transit_endpoint_health_check_response_collection_output,
-  magic_transit_endpoint_health_check_response_output,
-  magic_transit_endpoint_health_check_response_single_output,
-  magic_transit_uuid_output,
+  magic$$transit_endpoint_health_check,
+  magic$$transit_endpoint_health_check_response,
+  magic$$transit_endpoint_health_check_response_collection,
+  magic$$transit_endpoint_health_check_response_single,
 } from "./outputs.js";
-import {
-  magic_transit_check_type,
-  magic_transit_endpoint_health_check,
-  magic_transit_uuid,
-} from "./schemas.js";
+import { magic$$transit_endpoint_health_check as magic$$transit_endpoint_health_check$ } from "./schemas.js";
 
 /**
- * The tools of `diagnostics.endpoint_healthchecks`.
+ * The tools of `diagnostics.endpointHealthchecks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "diagnostics_endpoint_healthchecks_create",
+    name: "diagnostics_endpointHealthchecks_create",
     title: "Endpoint Health Check",
-    description: "Create Endpoint Health Check.",
+    description: "Create Endpoint Health Check.\n\nPOST /accounts/{account_id}/diagnostics/endpoint-healthchecks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-transit_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic-transit_endpoint_health_check"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-transit_check_type": magic_transit_check_type,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check,
-        "magic-transit_identifier": magic_transit_identifier,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-transit_endpoint_health_check_response_single",
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_check_type": magic_transit_check_type_output,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check_output,
-        "magic-transit_endpoint_health_check_response": magic_transit_endpoint_health_check_response_output,
-        "magic-transit_endpoint_health_check_response_single": magic_transit_endpoint_health_check_response_single_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_uuid": magic_transit_uuid_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check,
+        "magic-transit_endpoint_health_check_response": magic$$transit_endpoint_health_check_response,
+        "magic-transit_endpoint_health_check_response_single": magic$$transit_endpoint_health_check_response_single,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     annotations: {
@@ -93,14 +92,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_api-response-common-failure": magic_transit_api_response_common_failure_output,
-        "magic-transit_check_type": magic_transit_check_type_output,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check_output,
-        "magic-transit_endpoint_health_check_response": magic_transit_endpoint_health_check_response_output,
-        "magic-transit_endpoint_health_check_response_single": magic_transit_endpoint_health_check_response_single_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_uuid": magic_transit_uuid_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_api-response-common-failure": magic$$transit_api$$response$$common$$failure,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check,
+        "magic-transit_endpoint_health_check_response": magic$$transit_endpoint_health_check_response,
+        "magic-transit_endpoint_health_check_response_single": magic$$transit_endpoint_health_check_response_single,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     request: (args) => ({
@@ -109,35 +106,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "diagnostics_endpoint_healthchecks_delete",
+    name: "diagnostics_endpointHealthchecks_delete",
     title: "Delete Endpoint Health Check",
-    description: "Delete Endpoint Health Check.",
+    description: "Delete Endpoint Health Check.\n\nDELETE /accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-transit_identifier",
-          "description": "Identifier"
-        },
-        "id": {
-          "$ref": "#/$defs/magic-transit_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
-      $defs: {
-        "magic-transit_identifier": magic_transit_identifier,
-        "magic-transit_uuid": magic_transit_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-transit_api-response-common",
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_messages": magic_transit_messages_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     annotations: {
@@ -167,9 +170,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_api-response-common-failure": magic_transit_api_response_common_failure_output,
-        "magic-transit_messages": magic_transit_messages_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_api-response-common-failure": magic$$transit_api$$response$$common$$failure,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     request: (args) => ({
@@ -177,40 +180,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "diagnostics_endpoint_healthchecks_get",
+    name: "diagnostics_endpointHealthchecks_get",
     title: "Get Endpoint Health Check",
-    description: "Get a single Endpoint Health Check.",
+    description: "Get a single Endpoint Health Check.\n\nGET /accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-transit_identifier",
-          "description": "Identifier"
-        },
-        "id": {
-          "$ref": "#/$defs/magic-transit_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
-      $defs: {
-        "magic-transit_identifier": magic_transit_identifier,
-        "magic-transit_uuid": magic_transit_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-transit_endpoint_health_check_response_single",
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_check_type": magic_transit_check_type_output,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check_output,
-        "magic-transit_endpoint_health_check_response": magic_transit_endpoint_health_check_response_output,
-        "magic-transit_endpoint_health_check_response_single": magic_transit_endpoint_health_check_response_single_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_uuid": magic_transit_uuid_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check,
+        "magic-transit_endpoint_health_check_response": magic$$transit_endpoint_health_check_response,
+        "magic-transit_endpoint_health_check_response_single": magic$$transit_endpoint_health_check_response_single,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     annotations: {
@@ -243,14 +250,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_api-response-common-failure": magic_transit_api_response_common_failure_output,
-        "magic-transit_check_type": magic_transit_check_type_output,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check_output,
-        "magic-transit_endpoint_health_check_response": magic_transit_endpoint_health_check_response_output,
-        "magic-transit_endpoint_health_check_response_single": magic_transit_endpoint_health_check_response_single_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_uuid": magic_transit_uuid_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_api-response-common-failure": magic$$transit_api$$response$$common$$failure,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check,
+        "magic-transit_endpoint_health_check_response": magic$$transit_endpoint_health_check_response,
+        "magic-transit_endpoint_health_check_response_single": magic$$transit_endpoint_health_check_response_single,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     request: (args) => ({
@@ -258,34 +263,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "diagnostics_endpoint_healthchecks_list",
+    name: "diagnostics_endpointHealthchecks_list",
     title: "List Endpoint Health Checks",
-    description: "List Endpoint Health Checks.",
+    description: "List Endpoint Health Checks.\n\nGET /accounts/{account_id}/diagnostics/endpoint-healthchecks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-transit_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic-transit_identifier": magic_transit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-transit_endpoint_health_check_response_collection",
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_check_type": magic_transit_check_type_output,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check_output,
-        "magic-transit_endpoint_health_check_response": magic_transit_endpoint_health_check_response_output,
-        "magic-transit_endpoint_health_check_response_collection": magic_transit_endpoint_health_check_response_collection_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_uuid": magic_transit_uuid_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check,
+        "magic-transit_endpoint_health_check_response": magic$$transit_endpoint_health_check_response,
+        "magic-transit_endpoint_health_check_response_collection": magic$$transit_endpoint_health_check_response_collection,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     annotations: {
@@ -318,14 +328,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_api-response-common-failure": magic_transit_api_response_common_failure_output,
-        "magic-transit_check_type": magic_transit_check_type_output,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check_output,
-        "magic-transit_endpoint_health_check_response": magic_transit_endpoint_health_check_response_output,
-        "magic-transit_endpoint_health_check_response_collection": magic_transit_endpoint_health_check_response_collection_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_uuid": magic_transit_uuid_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_api-response-common-failure": magic$$transit_api$$response$$common$$failure,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check,
+        "magic-transit_endpoint_health_check_response": magic$$transit_endpoint_health_check_response,
+        "magic-transit_endpoint_health_check_response_collection": magic$$transit_endpoint_health_check_response_collection,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     request: (args) => ({
@@ -333,46 +341,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "diagnostics_endpoint_healthchecks_update",
+    name: "diagnostics_endpointHealthchecks_update",
     title: "Update Endpoint Health Check",
-    description: "Update an Endpoint Health Check.",
+    description: "Update an Endpoint Health Check.\n\nPUT /accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-transit_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic-transit_endpoint_health_check"
         },
-        "id": {
-          "$ref": "#/$defs/magic-transit_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-transit_check_type": magic_transit_check_type,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check,
-        "magic-transit_identifier": magic_transit_identifier,
-        "magic-transit_uuid": magic_transit_uuid,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-transit_endpoint_health_check_response_single",
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_check_type": magic_transit_check_type_output,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check_output,
-        "magic-transit_endpoint_health_check_response": magic_transit_endpoint_health_check_response_output,
-        "magic-transit_endpoint_health_check_response_single": magic_transit_endpoint_health_check_response_single_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_uuid": magic_transit_uuid_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check,
+        "magic-transit_endpoint_health_check_response": magic$$transit_endpoint_health_check_response,
+        "magic-transit_endpoint_health_check_response_single": magic$$transit_endpoint_health_check_response_single,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     annotations: {
@@ -402,14 +415,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_api-response-common-failure": magic_transit_api_response_common_failure_output,
-        "magic-transit_check_type": magic_transit_check_type_output,
-        "magic-transit_endpoint_health_check": magic_transit_endpoint_health_check_output,
-        "magic-transit_endpoint_health_check_response": magic_transit_endpoint_health_check_response_output,
-        "magic-transit_endpoint_health_check_response_single": magic_transit_endpoint_health_check_response_single_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_uuid": magic_transit_uuid_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_api-response-common-failure": magic$$transit_api$$response$$common$$failure,
+        "magic-transit_endpoint_health_check": magic$$transit_endpoint_health_check,
+        "magic-transit_endpoint_health_check_response": magic$$transit_endpoint_health_check_response,
+        "magic-transit_endpoint_health_check_response_single": magic$$transit_endpoint_health_check_response_single,
+        "magic-transit_messages": magic$$transit_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/diagnostics/outputs.ts b/src/generated/forge-mcp/diagnostics/outputs.ts
index 5fda82486..4682fdc13 100644
--- a/src/generated/forge-mcp/diagnostics/outputs.ts
+++ b/src/generated/forge-mcp/diagnostics/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `magic-transit_api-response-common` in responses.
  */
-export const magic_transit_api_response_common_output: JsonSchema = {
+export const magic$$transit_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic-transit_messages"
@@ -32,7 +32,7 @@ export const magic_transit_api_response_common_output: JsonSchema = {
 /**
  * The schema of `magic-transit_api-response-common-failure` in responses.
  */
-export const magic_transit_api_response_common_failure_output: JsonSchema = {
+export const magic$$transit_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic-transit_messages"
@@ -69,7 +69,7 @@ export const magic_transit_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `magic-transit_messages` in responses.
  */
-export const magic_transit_messages_output: JsonSchema = {
+export const magic$$transit_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/diagnostics/schemas.ts b/src/generated/forge-mcp/diagnostics/schemas.ts
deleted file mode 100644
index d307d3feb..000000000
--- a/src/generated/forge-mcp/diagnostics/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `magic-transit_identifier`.
- */
-export const magic_transit_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/diagnostics/traceroutes/outputs.ts b/src/generated/forge-mcp/diagnostics/traceroutes/outputs.ts
index 4ec5f8be7..8a24f9af4 100644
--- a/src/generated/forge-mcp/diagnostics/traceroutes/outputs.ts
+++ b/src/generated/forge-mcp/diagnostics/traceroutes/outputs.ts
@@ -3,52 +3,38 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic-transit_asn` in responses.
- */
-export const magic_transit_asn_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-transit_colo` in responses.
  */
-export const magic_transit_colo_output: JsonSchema = {
+export const magic$$transit_colo: JsonSchema = {
   "properties": {
     "city": {
-      "$ref": "#/$defs/magic-transit_colo_city"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/magic-transit_colo_name"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `magic-transit_colo_city` in responses.
- */
-export const magic_transit_colo_city_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic-transit_colo_name` in responses.
- */
-export const magic_transit_colo_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-transit_colo_result` in responses.
  */
-export const magic_transit_colo_result_output: JsonSchema = {
+export const magic$$transit_colo_result: JsonSchema = {
   "properties": {
     "colo": {
       "$ref": "#/$defs/magic-transit_colo"
     },
     "error": {
-      "$ref": "#/$defs/magic-transit_error"
+      "enum": [
+        "",
+        "Could not gather traceroute data: Code 1",
+        "Could not gather traceroute data: Code 2",
+        "Could not gather traceroute data: Code 3",
+        "Could not gather traceroute data: Code 4"
+      ],
+      "type": "string"
     },
     "hops": {
       "items": {
@@ -60,30 +46,16 @@ export const magic_transit_colo_result_output: JsonSchema = {
       "$ref": "#/$defs/magic-transit_target_summary"
     },
     "traceroute_time_ms": {
-      "$ref": "#/$defs/magic-transit_traceroute_time_ms"
+      "type": "integer"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `magic-transit_error` in responses.
- */
-export const magic_transit_error_output: JsonSchema = {
-  "enum": [
-    "",
-    "Could not gather traceroute data: Code 1",
-    "Could not gather traceroute data: Code 2",
-    "Could not gather traceroute data: Code 3",
-    "Could not gather traceroute data: Code 4"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `magic-transit_hop_result` in responses.
  */
-export const magic_transit_hop_result_output: JsonSchema = {
+export const magic$$transit_hop_result: JsonSchema = {
   "properties": {
     "nodes": {
       "items": {
@@ -92,145 +64,68 @@ export const magic_transit_hop_result_output: JsonSchema = {
       "type": "array"
     },
     "packets_lost": {
-      "$ref": "#/$defs/magic-transit_packets_lost"
+      "type": "integer"
     },
     "packets_sent": {
-      "$ref": "#/$defs/magic-transit_packets_sent"
+      "type": "integer"
     },
     "packets_ttl": {
-      "$ref": "#/$defs/magic-transit_packets_ttl"
+      "type": "integer"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `magic-transit_ip` in responses.
- */
-export const magic_transit_ip_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-transit_labels` in responses.
  */
-export const magic_transit_labels_output: JsonSchema = {
+export const magic$$transit_labels: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `magic-transit_max_rtt_ms` in responses.
- */
-export const magic_transit_max_rtt_ms_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-transit_mean_rtt_ms` in responses.
- */
-export const magic_transit_mean_rtt_ms_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-transit_min_rtt_ms` in responses.
- */
-export const magic_transit_min_rtt_ms_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-transit_name` in responses.
- */
-export const magic_transit_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-transit_node_result` in responses.
  */
-export const magic_transit_node_result_output: JsonSchema = {
+export const magic$$transit_node_result: JsonSchema = {
   "properties": {
     "asn": {
-      "$ref": "#/$defs/magic-transit_asn"
+      "type": "string"
     },
     "ip": {
-      "$ref": "#/$defs/magic-transit_ip"
+      "type": "string"
     },
     "labels": {
       "$ref": "#/$defs/magic-transit_labels"
     },
     "max_rtt_ms": {
-      "$ref": "#/$defs/magic-transit_max_rtt_ms"
+      "type": "number"
     },
     "mean_rtt_ms": {
-      "$ref": "#/$defs/magic-transit_mean_rtt_ms"
+      "type": "number"
     },
     "min_rtt_ms": {
-      "$ref": "#/$defs/magic-transit_min_rtt_ms"
+      "type": "number"
     },
     "name": {
-      "$ref": "#/$defs/magic-transit_name"
+      "type": "string"
     },
     "packet_count": {
-      "$ref": "#/$defs/magic-transit_packet_count"
+      "type": "integer"
     },
     "std_dev_rtt_ms": {
-      "$ref": "#/$defs/magic-transit_std_dev_rtt_ms"
+      "type": "number"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `magic-transit_packet_count` in responses.
- */
-export const magic_transit_packet_count_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `magic-transit_packets_lost` in responses.
- */
-export const magic_transit_packets_lost_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `magic-transit_packets_sent` in responses.
- */
-export const magic_transit_packets_sent_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `magic-transit_packets_ttl` in responses.
- */
-export const magic_transit_packets_ttl_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `magic-transit_std_dev_rtt_ms` in responses.
- */
-export const magic_transit_std_dev_rtt_ms_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-transit_target` in responses.
- */
-export const magic_transit_target_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-transit_target_result` in responses.
  */
-export const magic_transit_target_result_output: JsonSchema = {
+export const magic$$transit_target_result: JsonSchema = {
   "properties": {
     "colos": {
       "items": {
@@ -239,7 +134,7 @@ export const magic_transit_target_result_output: JsonSchema = {
       "type": "array"
     },
     "target": {
-      "$ref": "#/$defs/magic-transit_target"
+      "type": "string"
     }
   },
   "type": "object"
@@ -248,14 +143,14 @@ export const magic_transit_target_result_output: JsonSchema = {
 /**
  * The schema of `magic-transit_target_summary` in responses.
  */
-export const magic_transit_target_summary_output: JsonSchema = {
+export const magic$$transit_target_summary: JsonSchema = {
   "type": "object"
 };
 
 /**
  * The schema of `magic-transit_traceroute_response_collection` in responses.
  */
-export const magic_transit_traceroute_response_collection_output: JsonSchema = {
+export const magic$$transit_traceroute_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-transit_api-response-common"
@@ -273,10 +168,3 @@ export const magic_transit_traceroute_response_collection_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `magic-transit_traceroute_time_ms` in responses.
- */
-export const magic_transit_traceroute_time_ms_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/diagnostics/traceroutes/schemas.ts b/src/generated/forge-mcp/diagnostics/traceroutes/schemas.ts
index fcaf00642..badc304ce 100644
--- a/src/generated/forge-mcp/diagnostics/traceroutes/schemas.ts
+++ b/src/generated/forge-mcp/diagnostics/traceroutes/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `magic-transit_colos`.
  */
-export const magic_transit_colos: JsonSchema = {
+export const magic$$transit_colos: JsonSchema = {
   "description": "If no source colo names specified, all colos will be used. China colos are unavailable for traceroutes.",
   "items": {
     "type": "string"
@@ -14,94 +14,54 @@ export const magic_transit_colos: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `magic-transit_max_ttl`.
- */
-export const magic_transit_max_ttl: JsonSchema = {
-  "description": "Max TTL.",
-  "type": "integer"
-};
-
 /**
  * The schema of `magic-transit_options`.
  */
-export const magic_transit_options: JsonSchema = {
+export const magic$$transit_options: JsonSchema = {
   "properties": {
     "max_ttl": {
-      "$ref": "#/$defs/magic-transit_max_ttl",
       "default": 15,
-      "description": "Max TTL."
+      "description": "Max TTL.",
+      "type": "integer"
     },
     "packet_type": {
-      "$ref": "#/$defs/magic-transit_packet_type",
       "default": "icmp",
-      "description": "Type of packet sent."
+      "description": "Type of packet sent.",
+      "enum": [
+        "icmp",
+        "tcp",
+        "udp",
+        "gre",
+        "gre+icmp"
+      ],
+      "type": "string"
     },
     "packets_per_ttl": {
-      "$ref": "#/$defs/magic-transit_packets_per_ttl",
       "default": 3,
-      "description": "Number of packets sent at each TTL."
+      "description": "Number of packets sent at each TTL.",
+      "type": "integer"
     },
     "port": {
-      "$ref": "#/$defs/magic-transit_port",
       "default": 0,
-      "description": "For UDP and TCP, specifies the destination port. For ICMP, specifies the initial ICMP sequence value. Default value 0 will choose the best value to use for each protocol."
+      "description": "For UDP and TCP, specifies the destination port. For ICMP, specifies the initial ICMP sequence value. Default value 0 will choose the best value to use for each protocol.",
+      "type": "integer"
     },
     "wait_time": {
-      "$ref": "#/$defs/magic-transit_wait_time",
       "default": 1,
-      "description": "Set the time (in seconds) to wait for a response to a probe."
+      "description": "Set the time (in seconds) to wait for a response to a probe.",
+      "type": "integer"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `magic-transit_packet_type`.
- */
-export const magic_transit_packet_type: JsonSchema = {
-  "description": "Type of packet sent.",
-  "enum": [
-    "icmp",
-    "tcp",
-    "udp",
-    "gre",
-    "gre+icmp"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `magic-transit_packets_per_ttl`.
- */
-export const magic_transit_packets_per_ttl: JsonSchema = {
-  "description": "Number of packets sent at each TTL.",
-  "type": "integer"
-};
-
-/**
- * The schema of `magic-transit_port`.
- */
-export const magic_transit_port: JsonSchema = {
-  "description": "For UDP and TCP, specifies the destination port. For ICMP, specifies the initial ICMP sequence value. Default value 0 will choose the best value to use for each protocol.",
-  "type": "integer"
-};
-
 /**
  * The schema of `magic-transit_targets`.
  */
-export const magic_transit_targets: JsonSchema = {
+export const magic$$transit_targets: JsonSchema = {
   "items": {
     "type": "string"
   },
   "maxItems": 10,
   "type": "array"
 };
-
-/**
- * The schema of `magic-transit_wait_time`.
- */
-export const magic_transit_wait_time: JsonSchema = {
-  "description": "Set the time (in seconds) to wait for a response to a probe.",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/diagnostics/traceroutes/tools.ts b/src/generated/forge-mcp/diagnostics/traceroutes/tools.ts
index 55cf53837..502966abb 100644
--- a/src/generated/forge-mcp/diagnostics/traceroutes/tools.ts
+++ b/src/generated/forge-mcp/diagnostics/traceroutes/tools.ts
@@ -3,46 +3,24 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_transit_api_response_common_failure_output,
-  magic_transit_api_response_common_output,
-  magic_transit_messages_output,
+  magic$$transit_api$$response$$common,
+  magic$$transit_api$$response$$common$$failure,
+  magic$$transit_messages,
 } from "../outputs.js";
-import { magic_transit_identifier } from "../schemas.js";
 import {
-  magic_transit_asn_output,
-  magic_transit_colo_city_output,
-  magic_transit_colo_name_output,
-  magic_transit_colo_output,
-  magic_transit_colo_result_output,
-  magic_transit_error_output,
-  magic_transit_hop_result_output,
-  magic_transit_ip_output,
-  magic_transit_labels_output,
-  magic_transit_max_rtt_ms_output,
-  magic_transit_mean_rtt_ms_output,
-  magic_transit_min_rtt_ms_output,
-  magic_transit_name_output,
-  magic_transit_node_result_output,
-  magic_transit_packet_count_output,
-  magic_transit_packets_lost_output,
-  magic_transit_packets_sent_output,
-  magic_transit_packets_ttl_output,
-  magic_transit_std_dev_rtt_ms_output,
-  magic_transit_target_output,
-  magic_transit_target_result_output,
-  magic_transit_target_summary_output,
-  magic_transit_traceroute_response_collection_output,
-  magic_transit_traceroute_time_ms_output,
+  magic$$transit_colo,
+  magic$$transit_colo_result,
+  magic$$transit_hop_result,
+  magic$$transit_labels,
+  magic$$transit_node_result,
+  magic$$transit_target_result,
+  magic$$transit_target_summary,
+  magic$$transit_traceroute_response_collection,
 } from "./outputs.js";
 import {
-  magic_transit_colos,
-  magic_transit_max_ttl,
-  magic_transit_options,
-  magic_transit_packet_type,
-  magic_transit_packets_per_ttl,
-  magic_transit_port,
-  magic_transit_targets,
-  magic_transit_wait_time,
+  magic$$transit_colos,
+  magic$$transit_options,
+  magic$$transit_targets,
 } from "./schemas.js";
 
 /**
@@ -52,14 +30,10 @@ export const tools: readonly Tool[] = [
   {
     name: "diagnostics_traceroutes_create",
     title: "Traceroute",
-    description: "Run traceroutes from Cloudflare colos.",
+    description: "Run traceroutes from Cloudflare colos.\n\nPOST /accounts/{account_id}/diagnostics/traceroute",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-transit_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "properties": {
             "colos": {
@@ -77,53 +51,45 @@ export const tools: readonly Tool[] = [
             "targets"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-transit_colos": magic_transit_colos,
-        "magic-transit_identifier": magic_transit_identifier,
-        "magic-transit_max_ttl": magic_transit_max_ttl,
-        "magic-transit_options": magic_transit_options,
-        "magic-transit_packet_type": magic_transit_packet_type,
-        "magic-transit_packets_per_ttl": magic_transit_packets_per_ttl,
-        "magic-transit_port": magic_transit_port,
-        "magic-transit_targets": magic_transit_targets,
-        "magic-transit_wait_time": magic_transit_wait_time,
+        "magic-transit_colos": magic$$transit_colos,
+        "magic-transit_options": magic$$transit_options,
+        "magic-transit_targets": magic$$transit_targets,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-transit_traceroute_response_collection",
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_asn": magic_transit_asn_output,
-        "magic-transit_colo": magic_transit_colo_output,
-        "magic-transit_colo_city": magic_transit_colo_city_output,
-        "magic-transit_colo_name": magic_transit_colo_name_output,
-        "magic-transit_colo_result": magic_transit_colo_result_output,
-        "magic-transit_error": magic_transit_error_output,
-        "magic-transit_hop_result": magic_transit_hop_result_output,
-        "magic-transit_ip": magic_transit_ip_output,
-        "magic-transit_labels": magic_transit_labels_output,
-        "magic-transit_max_rtt_ms": magic_transit_max_rtt_ms_output,
-        "magic-transit_mean_rtt_ms": magic_transit_mean_rtt_ms_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_min_rtt_ms": magic_transit_min_rtt_ms_output,
-        "magic-transit_name": magic_transit_name_output,
-        "magic-transit_node_result": magic_transit_node_result_output,
-        "magic-transit_packet_count": magic_transit_packet_count_output,
-        "magic-transit_packets_lost": magic_transit_packets_lost_output,
-        "magic-transit_packets_sent": magic_transit_packets_sent_output,
-        "magic-transit_packets_ttl": magic_transit_packets_ttl_output,
-        "magic-transit_std_dev_rtt_ms": magic_transit_std_dev_rtt_ms_output,
-        "magic-transit_target": magic_transit_target_output,
-        "magic-transit_target_result": magic_transit_target_result_output,
-        "magic-transit_target_summary": magic_transit_target_summary_output,
-        "magic-transit_traceroute_response_collection": magic_transit_traceroute_response_collection_output,
-        "magic-transit_traceroute_time_ms": magic_transit_traceroute_time_ms_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_colo": magic$$transit_colo,
+        "magic-transit_colo_result": magic$$transit_colo_result,
+        "magic-transit_hop_result": magic$$transit_hop_result,
+        "magic-transit_labels": magic$$transit_labels,
+        "magic-transit_messages": magic$$transit_messages,
+        "magic-transit_node_result": magic$$transit_node_result,
+        "magic-transit_target_result": magic$$transit_target_result,
+        "magic-transit_target_summary": magic$$transit_target_summary,
+        "magic-transit_traceroute_response_collection": magic$$transit_traceroute_response_collection,
       },
     },
     annotations: {
@@ -156,33 +122,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-transit_api-response-common": magic_transit_api_response_common_output,
-        "magic-transit_api-response-common-failure": magic_transit_api_response_common_failure_output,
-        "magic-transit_asn": magic_transit_asn_output,
-        "magic-transit_colo": magic_transit_colo_output,
-        "magic-transit_colo_city": magic_transit_colo_city_output,
-        "magic-transit_colo_name": magic_transit_colo_name_output,
-        "magic-transit_colo_result": magic_transit_colo_result_output,
-        "magic-transit_error": magic_transit_error_output,
-        "magic-transit_hop_result": magic_transit_hop_result_output,
-        "magic-transit_ip": magic_transit_ip_output,
-        "magic-transit_labels": magic_transit_labels_output,
-        "magic-transit_max_rtt_ms": magic_transit_max_rtt_ms_output,
-        "magic-transit_mean_rtt_ms": magic_transit_mean_rtt_ms_output,
-        "magic-transit_messages": magic_transit_messages_output,
-        "magic-transit_min_rtt_ms": magic_transit_min_rtt_ms_output,
-        "magic-transit_name": magic_transit_name_output,
-        "magic-transit_node_result": magic_transit_node_result_output,
-        "magic-transit_packet_count": magic_transit_packet_count_output,
-        "magic-transit_packets_lost": magic_transit_packets_lost_output,
-        "magic-transit_packets_sent": magic_transit_packets_sent_output,
-        "magic-transit_packets_ttl": magic_transit_packets_ttl_output,
-        "magic-transit_std_dev_rtt_ms": magic_transit_std_dev_rtt_ms_output,
-        "magic-transit_target": magic_transit_target_output,
-        "magic-transit_target_result": magic_transit_target_result_output,
-        "magic-transit_target_summary": magic_transit_target_summary_output,
-        "magic-transit_traceroute_response_collection": magic_transit_traceroute_response_collection_output,
-        "magic-transit_traceroute_time_ms": magic_transit_traceroute_time_ms_output,
+        "magic-transit_api-response-common": magic$$transit_api$$response$$common,
+        "magic-transit_api-response-common-failure": magic$$transit_api$$response$$common$$failure,
+        "magic-transit_colo": magic$$transit_colo,
+        "magic-transit_colo_result": magic$$transit_colo_result,
+        "magic-transit_hop_result": magic$$transit_hop_result,
+        "magic-transit_labels": magic$$transit_labels,
+        "magic-transit_messages": magic$$transit_messages,
+        "magic-transit_node_result": magic$$transit_node_result,
+        "magic-transit_target_result": magic$$transit_target_result,
+        "magic-transit_target_summary": magic$$transit_target_summary,
+        "magic-transit_traceroute_response_collection": magic$$transit_traceroute_response_collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dls/outputs.ts b/src/generated/forge-mcp/dls/outputs.ts
index 338ba7c75..0859ad053 100644
--- a/src/generated/forge-mcp/dls/outputs.ts
+++ b/src/generated/forge-mcp/dls/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `dls_bad_response` in responses.
  */
-export const dls_bad_response_output: JsonSchema = {
+export const dls_bad_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dls_response"
@@ -34,7 +34,7 @@ export const dls_bad_response_output: JsonSchema = {
 /**
  * The schema of `dls_coded_message` in responses.
  */
-export const dls_coded_message_output: JsonSchema = {
+export const dls_coded_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -59,7 +59,7 @@ export const dls_coded_message_output: JsonSchema = {
 /**
  * The schema of `dls_good_response` in responses.
  */
-export const dls_good_response_output: JsonSchema = {
+export const dls_good_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dls_response"
@@ -81,7 +81,7 @@ export const dls_good_response_output: JsonSchema = {
 /**
  * The schema of `dls_none` in responses.
  */
-export const dls_none_output: JsonSchema = {
+export const dls_none: JsonSchema = {
   "oneOf": [
     {
       "type": "object"
@@ -95,7 +95,7 @@ export const dls_none_output: JsonSchema = {
 /**
  * The schema of `dls_response` in responses.
  */
-export const dls_response_output: JsonSchema = {
+export const dls_response: JsonSchema = {
   "properties": {
     "messages": {
       "items": {
diff --git a/src/generated/forge-mcp/dls/regionalServices/prefixBindings/outputs.ts b/src/generated/forge-mcp/dls/regionalServices/prefixBindings/outputs.ts
index 2bee1bfdc..84db830bf 100644
--- a/src/generated/forge-mcp/dls/regionalServices/prefixBindings/outputs.ts
+++ b/src/generated/forge-mcp/dls/regionalServices/prefixBindings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dls_PrefixBinding` in responses.
  */
-export const dls_PrefixBinding_output: JsonSchema = {
+export const dls_PrefixBinding: JsonSchema = {
   "properties": {
     "cidr": {
       "type": "string"
@@ -33,7 +33,7 @@ export const dls_PrefixBinding_output: JsonSchema = {
 /**
  * The schema of `dls_PrefixBindingPaginatedListResponse` in responses.
  */
-export const dls_PrefixBindingPaginatedListResponse_output: JsonSchema = {
+export const dls_PrefixBindingPaginatedListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -89,7 +89,7 @@ export const dls_PrefixBindingPaginatedListResponse_output: JsonSchema = {
 /**
  * The schema of `dls_PrefixBindingResponse` in responses.
  */
-export const dls_PrefixBindingResponse_output: JsonSchema = {
+export const dls_PrefixBindingResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dls_good_response"
diff --git a/src/generated/forge-mcp/dls/regionalServices/prefixBindings/tools.ts b/src/generated/forge-mcp/dls/regionalServices/prefixBindings/tools.ts
index 9c560bd3e..46fe874c8 100644
--- a/src/generated/forge-mcp/dls/regionalServices/prefixBindings/tools.ts
+++ b/src/generated/forge-mcp/dls/regionalServices/prefixBindings/tools.ts
@@ -1,19 +1,18 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  dls_bad_response_output,
-  dls_coded_message_output,
-  dls_good_response_output,
-  dls_none_output,
-  dls_response_output,
+  dls_bad_response,
+  dls_coded_message,
+  dls_good_response,
+  dls_none,
+  dls_response,
 } from "../../outputs.js";
-import { dls_account_identifier } from "../../schemas.js";
 import {
-  dls_PrefixBindingPaginatedListResponse_output,
-  dls_PrefixBindingResponse_output,
-  dls_PrefixBinding_output,
+  dls_PrefixBinding,
+  dls_PrefixBindingPaginatedListResponse,
+  dls_PrefixBindingResponse,
 } from "./outputs.js";
 import {
   dls_CreatePrefixBindingInput,
@@ -21,41 +20,50 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `dls.regional_services.prefix_bindings`.
+ * The tools of `dls.regionalServices.prefixBindings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dls_regional_services_prefix_bindings_create",
+    name: "dls_regionalServices_prefixBindings_create",
     title: "Create a DLS prefix binding",
-    description: "Bind a CIDR from a BYOIP prefix to a region.\n\nThis requires the **IP Prefixes Write** permission in addition to **DLS Write**, because the binding is created against a BYOIP prefix in Addressing.",
+    description: "Bind a CIDR from a BYOIP prefix to a region.\n\nThis requires the **IP Prefixes Write** permission in addition to **DLS Write**, because the binding is created against a BYOIP prefix in Addressing.\n\nPOST /accounts/{account_id}/dls/regional_services/prefix_bindings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dls_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
         "body": {
           "$ref": "#/$defs/dls_CreatePrefixBindingInput"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dls_CreatePrefixBindingInput": dls_CreatePrefixBindingInput,
-        "dls_account_identifier": dls_account_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dls_PrefixBindingResponse",
       $defs: {
-        "dls_PrefixBinding": dls_PrefixBinding_output,
-        "dls_PrefixBindingResponse": dls_PrefixBindingResponse_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_response": dls_response_output,
+        "dls_PrefixBinding": dls_PrefixBinding,
+        "dls_PrefixBindingResponse": dls_PrefixBindingResponse,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_response": dls_response,
       },
     },
     annotations: {
@@ -95,13 +103,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_PrefixBinding": dls_PrefixBinding_output,
-        "dls_PrefixBindingResponse": dls_PrefixBindingResponse_output,
-        "dls_bad_response": dls_bad_response_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_none": dls_none_output,
-        "dls_response": dls_response_output,
+        "dls_PrefixBinding": dls_PrefixBinding,
+        "dls_PrefixBindingResponse": dls_PrefixBindingResponse,
+        "dls_bad_response": dls_bad_response,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_none": dls_none,
+        "dls_response": dls_response,
       },
     },
     request: (args) => ({
@@ -110,35 +118,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dls_regional_services_prefix_bindings_delete",
+    name: "dls_regionalServices_prefixBindings_delete",
     title: "Delete a DLS prefix binding",
-    description: "Delete a BYOIP prefix binding.\n\nLike creating a binding, this requires **IP Prefixes Write** in addition to **DLS Write**.",
+    description: "Delete a BYOIP prefix binding.\n\nLike creating a binding, this requires **IP Prefixes Write** in addition to **DLS Write**.\n\nDELETE /accounts/{account_id}/dls/regional_services/prefix_bindings/{binding_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dls_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "binding_id": {
-          "description": "Unique identifier for the prefix binding.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "binding_id": {
+              "description": "Unique identifier for the prefix binding.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "binding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "binding_id"
+        "path"
       ],
-      $defs: {
-        "dls_account_identifier": dls_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dls_good_response",
       $defs: {
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_response": dls_response_output,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_response": dls_response,
       },
     },
     annotations: {
@@ -175,11 +190,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_bad_response": dls_bad_response_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_none": dls_none_output,
-        "dls_response": dls_response_output,
+        "dls_bad_response": dls_bad_response,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_none": dls_none,
+        "dls_response": dls_response,
       },
     },
     request: (args) => ({
@@ -187,42 +202,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dls_regional_services_prefix_bindings_edit",
+    name: "dls_regionalServices_prefixBindings_edit",
     title: "Update a DLS prefix binding",
-    description: "Update the region of an existing BYOIP prefix binding.\n\nLike creating a binding, this requires **IP Prefixes Write** in addition to **DLS Write**.",
+    description: "Update the region of an existing BYOIP prefix binding.\n\nLike creating a binding, this requires **IP Prefixes Write** in addition to **DLS Write**.\n\nPATCH /accounts/{account_id}/dls/regional_services/prefix_bindings/{binding_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dls_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "binding_id": {
-          "description": "Unique identifier for the prefix binding.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dls_UpdatePrefixBindingInput"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "binding_id": {
+              "description": "Unique identifier for the prefix binding.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "binding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "binding_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dls_UpdatePrefixBindingInput": dls_UpdatePrefixBindingInput,
-        "dls_account_identifier": dls_account_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dls_PrefixBindingResponse",
       $defs: {
-        "dls_PrefixBinding": dls_PrefixBinding_output,
-        "dls_PrefixBindingResponse": dls_PrefixBindingResponse_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_response": dls_response_output,
+        "dls_PrefixBinding": dls_PrefixBinding,
+        "dls_PrefixBindingResponse": dls_PrefixBindingResponse,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_response": dls_response,
       },
     },
     annotations: {
@@ -262,13 +286,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_PrefixBinding": dls_PrefixBinding_output,
-        "dls_PrefixBindingResponse": dls_PrefixBindingResponse_output,
-        "dls_bad_response": dls_bad_response_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_none": dls_none_output,
-        "dls_response": dls_response_output,
+        "dls_PrefixBinding": dls_PrefixBinding,
+        "dls_PrefixBindingResponse": dls_PrefixBindingResponse,
+        "dls_bad_response": dls_bad_response,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_none": dls_none,
+        "dls_response": dls_response,
       },
     },
     request: (args) => ({
@@ -277,37 +301,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dls_regional_services_prefix_bindings_get",
+    name: "dls_regionalServices_prefixBindings_get",
     title: "Get a DLS prefix binding",
-    description: "Retrieve a single BYOIP prefix binding by ID.",
+    description: "Retrieve a single BYOIP prefix binding by ID.\n\nGET /accounts/{account_id}/dls/regional_services/prefix_bindings/{binding_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dls_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "binding_id": {
-          "description": "Unique identifier for the prefix binding.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "binding_id": {
+              "description": "Unique identifier for the prefix binding.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "binding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "binding_id"
+        "path"
       ],
-      $defs: {
-        "dls_account_identifier": dls_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dls_PrefixBindingResponse",
       $defs: {
-        "dls_PrefixBinding": dls_PrefixBinding_output,
-        "dls_PrefixBindingResponse": dls_PrefixBindingResponse_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_response": dls_response_output,
+        "dls_PrefixBinding": dls_PrefixBinding,
+        "dls_PrefixBindingResponse": dls_PrefixBindingResponse,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_response": dls_response,
       },
     },
     annotations: {
@@ -344,13 +375,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_PrefixBinding": dls_PrefixBinding_output,
-        "dls_PrefixBindingResponse": dls_PrefixBindingResponse_output,
-        "dls_bad_response": dls_bad_response_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_none": dls_none_output,
-        "dls_response": dls_response_output,
+        "dls_PrefixBinding": dls_PrefixBinding,
+        "dls_PrefixBindingResponse": dls_PrefixBindingResponse,
+        "dls_bad_response": dls_bad_response,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_none": dls_none,
+        "dls_response": dls_response,
       },
     },
     request: (args) => ({
@@ -358,38 +389,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dls_regional_services_prefix_bindings_list",
+    name: "dls_regionalServices_prefixBindings_list",
     title: "List DLS prefix bindings for an account",
-    description: "List the BYOIP prefix bindings configured for an account.",
+    description: "List the BYOIP prefix bindings configured for an account.\n\nGET /accounts/{account_id}/dls/regional_services/prefix_bindings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dls_account_identifier",
-          "description": "Identifier of a Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "description": "Opaque token for cursor-based pagination. Omit for the first page. Pass the value from a previous response to fetch the next page.",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 25,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token for cursor-based pagination. Omit for the first page. Pass the value from a previous response to fetch the next page.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 25,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "dls_account_identifier": dls_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dls_PrefixBindingPaginatedListResponse",
       $defs: {
-        "dls_PrefixBinding": dls_PrefixBinding_output,
-        "dls_PrefixBindingPaginatedListResponse": dls_PrefixBindingPaginatedListResponse_output,
-        "dls_coded_message": dls_coded_message_output,
+        "dls_PrefixBinding": dls_PrefixBinding,
+        "dls_PrefixBindingPaginatedListResponse": dls_PrefixBindingPaginatedListResponse,
+        "dls_coded_message": dls_coded_message,
       },
     },
     annotations: {
@@ -426,19 +470,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_PrefixBinding": dls_PrefixBinding_output,
-        "dls_PrefixBindingPaginatedListResponse": dls_PrefixBindingPaginatedListResponse_output,
-        "dls_bad_response": dls_bad_response_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_none": dls_none_output,
-        "dls_response": dls_response_output,
+        "dls_PrefixBinding": dls_PrefixBinding,
+        "dls_PrefixBindingPaginatedListResponse": dls_PrefixBindingPaginatedListResponse,
+        "dls_bad_response": dls_bad_response,
+        "dls_coded_message": dls_coded_message,
+        "dls_none": dls_none,
+        "dls_response": dls_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dls/regional_services/prefix_bindings`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/dls/regions/outputs.ts b/src/generated/forge-mcp/dls/regions/outputs.ts
index c20e52841..1d2a36ab0 100644
--- a/src/generated/forge-mcp/dls/regions/outputs.ts
+++ b/src/generated/forge-mcp/dls/regions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `dls_FetchPublicRegionResponse` in responses.
  */
-export const dls_FetchPublicRegionResponse_output: JsonSchema = {
+export const dls_FetchPublicRegionResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dls_good_response"
@@ -28,7 +28,7 @@ export const dls_FetchPublicRegionResponse_output: JsonSchema = {
 /**
  * The schema of `dls_RegionPublic` in responses.
  */
-export const dls_RegionPublic_output: JsonSchema = {
+export const dls_RegionPublic: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -70,7 +70,7 @@ export const dls_RegionPublic_output: JsonSchema = {
 /**
  * The schema of `dls_RegionPublicPaginatedListResponse` in responses.
  */
-export const dls_RegionPublicPaginatedListResponse_output: JsonSchema = {
+export const dls_RegionPublicPaginatedListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/dls/regions/tools.ts b/src/generated/forge-mcp/dls/regions/tools.ts
index 2afa9413b..38fda9121 100644
--- a/src/generated/forge-mcp/dls/regions/tools.ts
+++ b/src/generated/forge-mcp/dls/regions/tools.ts
@@ -1,19 +1,18 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  dls_bad_response_output,
-  dls_coded_message_output,
-  dls_good_response_output,
-  dls_none_output,
-  dls_response_output,
+  dls_bad_response,
+  dls_coded_message,
+  dls_good_response,
+  dls_none,
+  dls_response,
 } from "../outputs.js";
-import { dls_account_identifier } from "../schemas.js";
 import {
-  dls_FetchPublicRegionResponse_output,
-  dls_RegionPublicPaginatedListResponse_output,
-  dls_RegionPublic_output,
+  dls_FetchPublicRegionResponse,
+  dls_RegionPublic,
+  dls_RegionPublicPaginatedListResponse,
 } from "./outputs.js";
 
 /**
@@ -23,35 +22,42 @@ export const tools: readonly Tool[] = [
   {
     name: "dls_regions_get",
     title: "Get a DLS region",
-    description: "Retrieve a single DLS region (managed or custom) by ID or region key.",
+    description: "Retrieve a single DLS region (managed or custom) by ID or region key.\n\nGET /accounts/{account_id}/dls/regions/{region_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dls_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "region_id": {
-          "description": "UUID of the region (custom or managed) or region_key of a managed region.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            },
+            "region_id": {
+              "description": "UUID of the region (custom or managed) or region_key of a managed region.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "region_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "region_id"
+        "path"
       ],
-      $defs: {
-        "dls_account_identifier": dls_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dls_FetchPublicRegionResponse",
       $defs: {
-        "dls_FetchPublicRegionResponse": dls_FetchPublicRegionResponse_output,
-        "dls_RegionPublic": dls_RegionPublic_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_response": dls_response_output,
+        "dls_FetchPublicRegionResponse": dls_FetchPublicRegionResponse,
+        "dls_RegionPublic": dls_RegionPublic,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_response": dls_response,
       },
     },
     annotations: {
@@ -88,13 +94,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_FetchPublicRegionResponse": dls_FetchPublicRegionResponse_output,
-        "dls_RegionPublic": dls_RegionPublic_output,
-        "dls_bad_response": dls_bad_response_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_good_response": dls_good_response_output,
-        "dls_none": dls_none_output,
-        "dls_response": dls_response_output,
+        "dls_FetchPublicRegionResponse": dls_FetchPublicRegionResponse,
+        "dls_RegionPublic": dls_RegionPublic,
+        "dls_bad_response": dls_bad_response,
+        "dls_coded_message": dls_coded_message,
+        "dls_good_response": dls_good_response,
+        "dls_none": dls_none,
+        "dls_response": dls_response,
       },
     },
     request: (args) => ({
@@ -104,44 +110,57 @@ export const tools: readonly Tool[] = [
   {
     name: "dls_regions_list",
     title: "List DLS regions for an account",
-    description: "List the DLS regions (managed and custom) available to an account.",
+    description: "List the DLS regions (managed and custom) available to an account.\n\nGET /accounts/{account_id}/dls/regions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dls_account_identifier",
-          "description": "Identifier of a Cloudflare account."
-        },
-        "cursor": {
-          "description": "Opaque token for cursor-based pagination. Omit for the first page. Pass the value from a previous response to fetch the next page.",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 25,
-          "type": "integer"
-        },
-        "type": {
-          "description": "Filter regions by type. Omit to return all regions.",
-          "enum": [
-            "managed",
-            "custom"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of a Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token for cursor-based pagination. Omit for the first page. Pass the value from a previous response to fetch the next page.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 25,
+              "type": "integer"
+            },
+            "type": {
+              "description": "Filter regions by type. Omit to return all regions.",
+              "enum": [
+                "managed",
+                "custom"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "dls_account_identifier": dls_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dls_RegionPublicPaginatedListResponse",
       $defs: {
-        "dls_RegionPublic": dls_RegionPublic_output,
-        "dls_RegionPublicPaginatedListResponse": dls_RegionPublicPaginatedListResponse_output,
-        "dls_coded_message": dls_coded_message_output,
+        "dls_RegionPublic": dls_RegionPublic,
+        "dls_RegionPublicPaginatedListResponse": dls_RegionPublicPaginatedListResponse,
+        "dls_coded_message": dls_coded_message,
       },
     },
     annotations: {
@@ -178,20 +197,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dls_RegionPublic": dls_RegionPublic_output,
-        "dls_RegionPublicPaginatedListResponse": dls_RegionPublicPaginatedListResponse_output,
-        "dls_bad_response": dls_bad_response_output,
-        "dls_coded_message": dls_coded_message_output,
-        "dls_none": dls_none_output,
-        "dls_response": dls_response_output,
+        "dls_RegionPublic": dls_RegionPublic,
+        "dls_RegionPublicPaginatedListResponse": dls_RegionPublicPaginatedListResponse,
+        "dls_bad_response": dls_bad_response,
+        "dls_coded_message": dls_coded_message,
+        "dls_none": dls_none,
+        "dls_response": dls_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dls/regions`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["type", args["type"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["type", param(args, "query", "type"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/dls/schemas.ts b/src/generated/forge-mcp/dls/schemas.ts
deleted file mode 100644
index 4d79c949a..000000000
--- a/src/generated/forge-mcp/dls/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `dls_account_identifier`.
- */
-export const dls_account_identifier: JsonSchema = {
-  "description": "Identifier of a Cloudflare account.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/dnssec/list/outputs.ts b/src/generated/forge-mcp/dns/dnssec/list/outputs.ts
index 57b89e676..373116738 100644
--- a/src/generated/forge-mcp/dns/dnssec/list/outputs.ts
+++ b/src/generated/forge-mcp/dns/dnssec/list/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dnssec_dnskey_record` in responses.
  */
-export const dnssec_dnskey_record_output: JsonSchema = {
+export const dnssec_dnskey_record: JsonSchema = {
   "properties": {
     "Algorithm": {
       "oneOf": [
@@ -58,7 +58,7 @@ export const dnssec_dnskey_record_output: JsonSchema = {
 /**
  * The schema of `dnssec_dnskey_record_header` in responses.
  */
-export const dnssec_dnskey_record_header_output: JsonSchema = {
+export const dnssec_dnskey_record_header: JsonSchema = {
   "properties": {
     "Class": {
       "oneOf": [
@@ -117,7 +117,7 @@ export const dnssec_dnskey_record_header_output: JsonSchema = {
 /**
  * The schema of `dnssec_dnskey_signing_key` in responses.
  */
-export const dnssec_dnskey_signing_key_output: JsonSchema = {
+export const dnssec_dnskey_signing_key: JsonSchema = {
   "properties": {
     "kek": {
       "oneOf": [
@@ -154,31 +154,20 @@ export const dnssec_dnskey_signing_key_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dnssec_dnssec_key_state` in responses.
- */
-export const dnssec_dnssec_key_state_output: JsonSchema = {
-  "enum": [
-    "active",
-    "publish",
-    "external",
-    "retired",
-    "revoked",
-    "removed"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dnssec_dnssec_zsk` in responses.
  */
-export const dnssec_dnssec_zsk_output: JsonSchema = {
+export const dnssec_dnssec_zsk: JsonSchema = {
   "properties": {
     "DNSKEY": {
       "$ref": "#/$defs/dnssec_dnskey_record"
     },
     "Location": {
-      "$ref": "#/$defs/dnssec_key_storage_location"
+      "enum": [
+        "database",
+        "vault"
+      ],
+      "type": "string"
     },
     "Name": {
       "type": "string"
@@ -187,7 +176,15 @@ export const dnssec_dnssec_zsk_output: JsonSchema = {
       "$ref": "#/$defs/dnssec_dnskey_signing_key"
     },
     "Tag": {
-      "$ref": "#/$defs/dnssec_dnssec_key_state"
+      "enum": [
+        "active",
+        "publish",
+        "external",
+        "retired",
+        "revoked",
+        "removed"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -196,7 +193,7 @@ export const dnssec_dnssec_zsk_output: JsonSchema = {
 /**
  * The schema of `dnssec_dnssec_zsk_response_collection` in responses.
  */
-export const dnssec_dnssec_zsk_response_collection_output: JsonSchema = {
+export const dnssec_dnssec_zsk_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dnssec_api-response-single"
@@ -214,14 +211,3 @@ export const dnssec_dnssec_zsk_response_collection_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `dnssec_key_storage_location` in responses.
- */
-export const dnssec_key_storage_location_output: JsonSchema = {
-  "enum": [
-    "database",
-    "vault"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/dnssec/list/tools.ts b/src/generated/forge-mcp/dns/dnssec/list/tools.ts
index 65aa55431..9d902825a 100644
--- a/src/generated/forge-mcp/dns/dnssec/list/tools.ts
+++ b/src/generated/forge-mcp/dns/dnssec/list/tools.ts
@@ -3,19 +3,16 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dnssec_api_response_common_failure_output,
-  dnssec_api_response_single_output,
-  dnssec_messages_output,
+  dnssec_api$$response$$common$$failure,
+  dnssec_api$$response$$single,
+  dnssec_messages,
 } from "../outputs.js";
-import { dnssec_identifier } from "../schemas.js";
 import {
-  dnssec_dnskey_record_header_output,
-  dnssec_dnskey_record_output,
-  dnssec_dnskey_signing_key_output,
-  dnssec_dnssec_key_state_output,
-  dnssec_dnssec_zsk_output,
-  dnssec_dnssec_zsk_response_collection_output,
-  dnssec_key_storage_location_output,
+  dnssec_dnskey_record,
+  dnssec_dnskey_record_header,
+  dnssec_dnskey_signing_key,
+  dnssec_dnssec_zsk,
+  dnssec_dnssec_zsk_response_collection,
 } from "./outputs.js";
 
 /**
@@ -25,34 +22,39 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_dnssec_list_zsks",
     title: "List DNSSEC ZSKs",
-    description: "List the Zone Signing Keys (ZSKs) that DNSSEC uses for the zone.",
+    description: "List the Zone Signing Keys (ZSKs) that DNSSEC uses for the zone.\n\nGET /zones/{zone_id}/dnssec/zsk",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/dnssec_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dnssec_identifier": dnssec_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dnssec_dnssec_zsk_response_collection",
       $defs: {
-        "dnssec_api-response-single": dnssec_api_response_single_output,
-        "dnssec_dnskey_record": dnssec_dnskey_record_output,
-        "dnssec_dnskey_record_header": dnssec_dnskey_record_header_output,
-        "dnssec_dnskey_signing_key": dnssec_dnskey_signing_key_output,
-        "dnssec_dnssec_key_state": dnssec_dnssec_key_state_output,
-        "dnssec_dnssec_zsk": dnssec_dnssec_zsk_output,
-        "dnssec_dnssec_zsk_response_collection": dnssec_dnssec_zsk_response_collection_output,
-        "dnssec_key_storage_location": dnssec_key_storage_location_output,
-        "dnssec_messages": dnssec_messages_output,
+        "dnssec_api-response-single": dnssec_api$$response$$single,
+        "dnssec_dnskey_record": dnssec_dnskey_record,
+        "dnssec_dnskey_record_header": dnssec_dnskey_record_header,
+        "dnssec_dnskey_signing_key": dnssec_dnskey_signing_key,
+        "dnssec_dnssec_zsk": dnssec_dnssec_zsk,
+        "dnssec_dnssec_zsk_response_collection": dnssec_dnssec_zsk_response_collection,
+        "dnssec_messages": dnssec_messages,
       },
     },
     annotations: {
@@ -86,16 +88,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dnssec_api-response-common-failure": dnssec_api_response_common_failure_output,
-        "dnssec_api-response-single": dnssec_api_response_single_output,
-        "dnssec_dnskey_record": dnssec_dnskey_record_output,
-        "dnssec_dnskey_record_header": dnssec_dnskey_record_header_output,
-        "dnssec_dnskey_signing_key": dnssec_dnskey_signing_key_output,
-        "dnssec_dnssec_key_state": dnssec_dnssec_key_state_output,
-        "dnssec_dnssec_zsk": dnssec_dnssec_zsk_output,
-        "dnssec_dnssec_zsk_response_collection": dnssec_dnssec_zsk_response_collection_output,
-        "dnssec_key_storage_location": dnssec_key_storage_location_output,
-        "dnssec_messages": dnssec_messages_output,
+        "dnssec_api-response-common-failure": dnssec_api$$response$$common$$failure,
+        "dnssec_api-response-single": dnssec_api$$response$$single,
+        "dnssec_dnskey_record": dnssec_dnskey_record,
+        "dnssec_dnskey_record_header": dnssec_dnskey_record_header,
+        "dnssec_dnskey_signing_key": dnssec_dnskey_signing_key,
+        "dnssec_dnssec_zsk": dnssec_dnssec_zsk,
+        "dnssec_dnssec_zsk_response_collection": dnssec_dnssec_zsk_response_collection,
+        "dnssec_messages": dnssec_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/dnssec/outputs.ts b/src/generated/forge-mcp/dns/dnssec/outputs.ts
index 37782cd9e..5d5156368 100644
--- a/src/generated/forge-mcp/dns/dnssec/outputs.ts
+++ b/src/generated/forge-mcp/dns/dnssec/outputs.ts
@@ -3,24 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `dnssec_algorithm` in responses.
- */
-export const dnssec_algorithm_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `dnssec_api-response-common-failure` in responses.
  */
-export const dnssec_api_response_common_failure_output: JsonSchema = {
+export const dnssec_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dnssec_messages"
@@ -50,7 +36,7 @@ export const dnssec_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `dnssec_api-response-single` in responses.
  */
-export const dnssec_api_response_single_output: JsonSchema = {
+export const dnssec_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dnssec_messages"
@@ -76,7 +62,7 @@ export const dnssec_api_response_single_output: JsonSchema = {
 /**
  * The schema of `dnssec_delete_dnssec_response_single` in responses.
  */
-export const dnssec_delete_dnssec_response_single_output: JsonSchema = {
+export const dnssec_delete_dnssec_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dnssec_api-response-single"
@@ -92,117 +78,139 @@ export const dnssec_delete_dnssec_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dnssec_digest` in responses.
- */
-export const dnssec_digest_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dnssec_digest_algorithm` in responses.
- */
-export const dnssec_digest_algorithm_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dnssec_digest_type` in responses.
- */
-export const dnssec_digest_type_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `dnssec_dnssec` in responses.
  */
-export const dnssec_dnssec_output: JsonSchema = {
+export const dnssec_dnssec: JsonSchema = {
   "properties": {
     "algorithm": {
-      "$ref": "#/$defs/dnssec_algorithm"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "digest": {
-      "$ref": "#/$defs/dnssec_digest"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "digest_algorithm": {
-      "$ref": "#/$defs/dnssec_digest_algorithm"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "digest_type": {
-      "$ref": "#/$defs/dnssec_digest_type"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "dnssec_multi_signer": {
-      "$ref": "#/$defs/dnssec_dnssec_multi_signer"
+      "type": "boolean"
     },
     "dnssec_presigned": {
-      "$ref": "#/$defs/dnssec_dnssec_presigned"
+      "type": "boolean"
     },
     "dnssec_use_nsec3": {
-      "$ref": "#/$defs/dnssec_dnssec_use_nsec3"
+      "type": "boolean"
     },
     "ds": {
-      "$ref": "#/$defs/dnssec_ds"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "flags": {
-      "$ref": "#/$defs/dnssec_flags"
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "key_tag": {
-      "$ref": "#/$defs/dnssec_key_tag"
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "key_type": {
-      "$ref": "#/$defs/dnssec_key_type"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "modified_on": {
-      "$ref": "#/$defs/dnssec_modified_on"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "public_key": {
-      "$ref": "#/$defs/dnssec_public_key"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "status": {
-      "$ref": "#/$defs/dnssec_status"
+      "enum": [
+        "active",
+        "pending",
+        "disabled",
+        "pending-disabled",
+        "error"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `dnssec_dnssec_multi_signer` in responses.
- */
-export const dnssec_dnssec_multi_signer_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `dnssec_dnssec_presigned` in responses.
- */
-export const dnssec_dnssec_presigned_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `dnssec_dnssec_response_single` in responses.
  */
-export const dnssec_dnssec_response_single_output: JsonSchema = {
+export const dnssec_dnssec_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dnssec_api-response-single"
@@ -218,73 +226,10 @@ export const dnssec_dnssec_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dnssec_dnssec_use_nsec3` in responses.
- */
-export const dnssec_dnssec_use_nsec3_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `dnssec_ds` in responses.
- */
-export const dnssec_ds_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dnssec_flags` in responses.
- */
-export const dnssec_flags_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "number"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dnssec_key_tag` in responses.
- */
-export const dnssec_key_tag_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "number"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dnssec_key_type` in responses.
- */
-export const dnssec_key_type_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `dnssec_messages` in responses.
  */
-export const dnssec_messages_output: JsonSchema = {
+export const dnssec_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -313,46 +258,3 @@ export const dnssec_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `dnssec_modified_on` in responses.
- */
-export const dnssec_modified_on_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dnssec_public_key` in responses.
- */
-export const dnssec_public_key_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dnssec_status` in responses.
- */
-export const dnssec_status_output: JsonSchema = {
-  "enum": [
-    "active",
-    "pending",
-    "disabled",
-    "pending-disabled",
-    "error"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/dnssec/schemas.ts b/src/generated/forge-mcp/dns/dnssec/schemas.ts
deleted file mode 100644
index 9753edc3c..000000000
--- a/src/generated/forge-mcp/dns/dnssec/schemas.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `dnssec_dnssec_multi_signer`.
- */
-export const dnssec_dnssec_multi_signer: JsonSchema = {
-  "description": "If true, multi-signer DNSSEC is enabled on the zone, allowing multiple\nproviders to serve a DNSSEC-signed zone at the same time.\nThis is required for DNSKEY records (except those automatically\ngenerated by Cloudflare) to be added to the zone.\n\nSee [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/) for details.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dnssec_dnssec_presigned`.
- */
-export const dnssec_dnssec_presigned: JsonSchema = {
-  "description": "If true, allows Cloudflare to transfer in a DNSSEC-signed zone\nincluding signatures from an external provider, without requiring\nCloudflare to sign any records on the fly.\n\nNote that this feature has some limitations.\nSee [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec) for details.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dnssec_dnssec_use_nsec3`.
- */
-export const dnssec_dnssec_use_nsec3: JsonSchema = {
-  "description": "If true, enables the use of NSEC3 together with DNSSEC on the zone.\nCombined with setting dnssec_presigned to true, this enables the use of\nNSEC3 records when transferring in from an external provider.\nIf dnssec_presigned is instead set to false (default), NSEC3 records will be\ngenerated and signed at request time.\n\nSee [DNSSEC with NSEC3](https://developers.cloudflare.com/dns/dnssec/enable-nsec3/) for details.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dnssec_identifier`.
- */
-export const dnssec_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/dnssec/tools.ts b/src/generated/forge-mcp/dns/dnssec/tools.ts
index f18bd8e26..0440bbd6d 100644
--- a/src/generated/forge-mcp/dns/dnssec/tools.ts
+++ b/src/generated/forge-mcp/dns/dnssec/tools.ts
@@ -3,33 +3,13 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  dnssec_algorithm_output,
-  dnssec_api_response_common_failure_output,
-  dnssec_api_response_single_output,
-  dnssec_delete_dnssec_response_single_output,
-  dnssec_digest_algorithm_output,
-  dnssec_digest_output,
-  dnssec_digest_type_output,
-  dnssec_dnssec_multi_signer_output,
-  dnssec_dnssec_output,
-  dnssec_dnssec_presigned_output,
-  dnssec_dnssec_response_single_output,
-  dnssec_dnssec_use_nsec3_output,
-  dnssec_ds_output,
-  dnssec_flags_output,
-  dnssec_key_tag_output,
-  dnssec_key_type_output,
-  dnssec_messages_output,
-  dnssec_modified_on_output,
-  dnssec_public_key_output,
-  dnssec_status_output,
+  dnssec_api$$response$$common$$failure,
+  dnssec_api$$response$$single,
+  dnssec_delete_dnssec_response_single,
+  dnssec_dnssec,
+  dnssec_dnssec_response_single,
+  dnssec_messages,
 } from "./outputs.js";
-import {
-  dnssec_dnssec_multi_signer,
-  dnssec_dnssec_presigned,
-  dnssec_dnssec_use_nsec3,
-  dnssec_identifier,
-} from "./schemas.js";
 
 /**
  * The tools of `dns.dnssec`.
@@ -38,28 +18,35 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_dnssec_delete",
     title: "Delete DNSSEC records",
-    description: "Delete DNSSEC.",
+    description: "Delete DNSSEC.\n\nDELETE /zones/{zone_id}/dnssec",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/dnssec_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dnssec_identifier": dnssec_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dnssec_delete_dnssec_response_single",
       $defs: {
-        "dnssec_api-response-single": dnssec_api_response_single_output,
-        "dnssec_delete_dnssec_response_single": dnssec_delete_dnssec_response_single_output,
-        "dnssec_messages": dnssec_messages_output,
+        "dnssec_api-response-single": dnssec_api$$response$$single,
+        "dnssec_delete_dnssec_response_single": dnssec_delete_dnssec_response_single,
+        "dnssec_messages": dnssec_messages,
       },
     },
     annotations: {
@@ -97,10 +84,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dnssec_api-response-common-failure": dnssec_api_response_common_failure_output,
-        "dnssec_api-response-single": dnssec_api_response_single_output,
-        "dnssec_delete_dnssec_response_single": dnssec_delete_dnssec_response_single_output,
-        "dnssec_messages": dnssec_messages_output,
+        "dnssec_api-response-common-failure": dnssec_api$$response$$common$$failure,
+        "dnssec_api-response-single": dnssec_api$$response$$single,
+        "dnssec_delete_dnssec_response_single": dnssec_delete_dnssec_response_single,
+        "dnssec_messages": dnssec_messages,
       },
     },
     request: (args) => ({
@@ -110,23 +97,23 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_dnssec_edit",
     title: "Edit DNSSEC Status",
-    description: "Enable or disable DNSSEC.",
+    description: "Enable or disable DNSSEC.\n\nPATCH /zones/{zone_id}/dnssec",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "dnssec_multi_signer": {
-              "$ref": "#/$defs/dnssec_dnssec_multi_signer",
-              "description": "If true, multi-signer DNSSEC is enabled on the zone, allowing multiple\nproviders to serve a DNSSEC-signed zone at the same time.\nThis is required for DNSKEY records (except those automatically\ngenerated by Cloudflare) to be added to the zone.\n\nSee [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/) for details."
+              "description": "If true, multi-signer DNSSEC is enabled on the zone, allowing multiple\nproviders to serve a DNSSEC-signed zone at the same time.\nThis is required for DNSKEY records (except those automatically\ngenerated by Cloudflare) to be added to the zone.\n\nSee [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/) for details.",
+              "type": "boolean"
             },
             "dnssec_presigned": {
-              "$ref": "#/$defs/dnssec_dnssec_presigned",
-              "description": "If true, allows Cloudflare to transfer in a DNSSEC-signed zone\nincluding signatures from an external provider, without requiring\nCloudflare to sign any records on the fly.\n\nNote that this feature has some limitations.\nSee [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec) for details."
+              "description": "If true, allows Cloudflare to transfer in a DNSSEC-signed zone\nincluding signatures from an external provider, without requiring\nCloudflare to sign any records on the fly.\n\nNote that this feature has some limitations.\nSee [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec) for details.",
+              "type": "boolean"
             },
             "dnssec_use_nsec3": {
-              "$ref": "#/$defs/dnssec_dnssec_use_nsec3",
-              "description": "If true, enables the use of NSEC3 together with DNSSEC on the zone.\nCombined with setting dnssec_presigned to true, this enables the use of\nNSEC3 records when transferring in from an external provider.\nIf dnssec_presigned is instead set to false (default), NSEC3 records will be\ngenerated and signed at request time.\n\nSee [DNSSEC with NSEC3](https://developers.cloudflare.com/dns/dnssec/enable-nsec3/) for details."
+              "description": "If true, enables the use of NSEC3 together with DNSSEC on the zone.\nCombined with setting dnssec_presigned to true, this enables the use of\nNSEC3 records when transferring in from an external provider.\nIf dnssec_presigned is instead set to false (default), NSEC3 records will be\ngenerated and signed at request time.\n\nSee [DNSSEC with NSEC3](https://developers.cloudflare.com/dns/dnssec/enable-nsec3/) for details.",
+              "type": "boolean"
             },
             "status": {
               "description": "Status of DNSSEC, based on user-desired state and presence of necessary records.",
@@ -139,43 +126,33 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dnssec_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "dnssec_dnssec_multi_signer": dnssec_dnssec_multi_signer,
-        "dnssec_dnssec_presigned": dnssec_dnssec_presigned,
-        "dnssec_dnssec_use_nsec3": dnssec_dnssec_use_nsec3,
-        "dnssec_identifier": dnssec_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dnssec_dnssec_response_single",
       $defs: {
-        "dnssec_algorithm": dnssec_algorithm_output,
-        "dnssec_api-response-single": dnssec_api_response_single_output,
-        "dnssec_digest": dnssec_digest_output,
-        "dnssec_digest_algorithm": dnssec_digest_algorithm_output,
-        "dnssec_digest_type": dnssec_digest_type_output,
-        "dnssec_dnssec": dnssec_dnssec_output,
-        "dnssec_dnssec_multi_signer": dnssec_dnssec_multi_signer_output,
-        "dnssec_dnssec_presigned": dnssec_dnssec_presigned_output,
-        "dnssec_dnssec_response_single": dnssec_dnssec_response_single_output,
-        "dnssec_dnssec_use_nsec3": dnssec_dnssec_use_nsec3_output,
-        "dnssec_ds": dnssec_ds_output,
-        "dnssec_flags": dnssec_flags_output,
-        "dnssec_key_tag": dnssec_key_tag_output,
-        "dnssec_key_type": dnssec_key_type_output,
-        "dnssec_messages": dnssec_messages_output,
-        "dnssec_modified_on": dnssec_modified_on_output,
-        "dnssec_public_key": dnssec_public_key_output,
-        "dnssec_status": dnssec_status_output,
+        "dnssec_api-response-single": dnssec_api$$response$$single,
+        "dnssec_dnssec": dnssec_dnssec,
+        "dnssec_dnssec_response_single": dnssec_dnssec_response_single,
+        "dnssec_messages": dnssec_messages,
       },
     },
     annotations: {
@@ -213,25 +190,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dnssec_algorithm": dnssec_algorithm_output,
-        "dnssec_api-response-common-failure": dnssec_api_response_common_failure_output,
-        "dnssec_api-response-single": dnssec_api_response_single_output,
-        "dnssec_digest": dnssec_digest_output,
-        "dnssec_digest_algorithm": dnssec_digest_algorithm_output,
-        "dnssec_digest_type": dnssec_digest_type_output,
-        "dnssec_dnssec": dnssec_dnssec_output,
-        "dnssec_dnssec_multi_signer": dnssec_dnssec_multi_signer_output,
-        "dnssec_dnssec_presigned": dnssec_dnssec_presigned_output,
-        "dnssec_dnssec_response_single": dnssec_dnssec_response_single_output,
-        "dnssec_dnssec_use_nsec3": dnssec_dnssec_use_nsec3_output,
-        "dnssec_ds": dnssec_ds_output,
-        "dnssec_flags": dnssec_flags_output,
-        "dnssec_key_tag": dnssec_key_tag_output,
-        "dnssec_key_type": dnssec_key_type_output,
-        "dnssec_messages": dnssec_messages_output,
-        "dnssec_modified_on": dnssec_modified_on_output,
-        "dnssec_public_key": dnssec_public_key_output,
-        "dnssec_status": dnssec_status_output,
+        "dnssec_api-response-common-failure": dnssec_api$$response$$common$$failure,
+        "dnssec_api-response-single": dnssec_api$$response$$single,
+        "dnssec_dnssec": dnssec_dnssec,
+        "dnssec_dnssec_response_single": dnssec_dnssec_response_single,
+        "dnssec_messages": dnssec_messages,
       },
     },
     request: (args) => ({
@@ -242,43 +205,36 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_dnssec_get",
     title: "DNSSEC Details",
-    description: "Details about DNSSEC status and configuration.",
+    description: "Details about DNSSEC status and configuration.\n\nGET /zones/{zone_id}/dnssec",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/dnssec_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dnssec_identifier": dnssec_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dnssec_dnssec_response_single",
       $defs: {
-        "dnssec_algorithm": dnssec_algorithm_output,
-        "dnssec_api-response-single": dnssec_api_response_single_output,
-        "dnssec_digest": dnssec_digest_output,
-        "dnssec_digest_algorithm": dnssec_digest_algorithm_output,
-        "dnssec_digest_type": dnssec_digest_type_output,
-        "dnssec_dnssec": dnssec_dnssec_output,
-        "dnssec_dnssec_multi_signer": dnssec_dnssec_multi_signer_output,
-        "dnssec_dnssec_presigned": dnssec_dnssec_presigned_output,
-        "dnssec_dnssec_response_single": dnssec_dnssec_response_single_output,
-        "dnssec_dnssec_use_nsec3": dnssec_dnssec_use_nsec3_output,
-        "dnssec_ds": dnssec_ds_output,
-        "dnssec_flags": dnssec_flags_output,
-        "dnssec_key_tag": dnssec_key_tag_output,
-        "dnssec_key_type": dnssec_key_type_output,
-        "dnssec_messages": dnssec_messages_output,
-        "dnssec_modified_on": dnssec_modified_on_output,
-        "dnssec_public_key": dnssec_public_key_output,
-        "dnssec_status": dnssec_status_output,
+        "dnssec_api-response-single": dnssec_api$$response$$single,
+        "dnssec_dnssec": dnssec_dnssec,
+        "dnssec_dnssec_response_single": dnssec_dnssec_response_single,
+        "dnssec_messages": dnssec_messages,
       },
     },
     annotations: {
@@ -317,25 +273,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dnssec_algorithm": dnssec_algorithm_output,
-        "dnssec_api-response-common-failure": dnssec_api_response_common_failure_output,
-        "dnssec_api-response-single": dnssec_api_response_single_output,
-        "dnssec_digest": dnssec_digest_output,
-        "dnssec_digest_algorithm": dnssec_digest_algorithm_output,
-        "dnssec_digest_type": dnssec_digest_type_output,
-        "dnssec_dnssec": dnssec_dnssec_output,
-        "dnssec_dnssec_multi_signer": dnssec_dnssec_multi_signer_output,
-        "dnssec_dnssec_presigned": dnssec_dnssec_presigned_output,
-        "dnssec_dnssec_response_single": dnssec_dnssec_response_single_output,
-        "dnssec_dnssec_use_nsec3": dnssec_dnssec_use_nsec3_output,
-        "dnssec_ds": dnssec_ds_output,
-        "dnssec_flags": dnssec_flags_output,
-        "dnssec_key_tag": dnssec_key_tag_output,
-        "dnssec_key_type": dnssec_key_type_output,
-        "dnssec_messages": dnssec_messages_output,
-        "dnssec_modified_on": dnssec_modified_on_output,
-        "dnssec_public_key": dnssec_public_key_output,
-        "dnssec_status": dnssec_status_output,
+        "dnssec_api-response-common-failure": dnssec_api$$response$$common$$failure,
+        "dnssec_api-response-single": dnssec_api$$response$$single,
+        "dnssec_dnssec": dnssec_dnssec,
+        "dnssec_dnssec_response_single": dnssec_dnssec_response_single,
+        "dnssec_messages": dnssec_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/domainconnect/outputs.ts b/src/generated/forge-mcp/dns/domainconnect/outputs.ts
index 7ff4f58bd..ef8b0cc10 100644
--- a/src/generated/forge-mcp/dns/domainconnect/outputs.ts
+++ b/src/generated/forge-mcp/dns/domainconnect/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `domain-connect_httpError` in responses.
  */
-export const domain_connect_httpError_output: JsonSchema = {
+export const domain$$connect_httpError: JsonSchema = {
   "properties": {
     "error": {
       "type": "string"
@@ -18,7 +18,7 @@ export const domain_connect_httpError_output: JsonSchema = {
 /**
  * The schema of `domain-connect_neededByStratus` in responses.
  */
-export const domain_connect_neededByStratus_output: JsonSchema = {
+export const domain$$connect_neededByStratus: JsonSchema = {
   "properties": {
     "logo": {
       "type": "string"
@@ -36,7 +36,7 @@ export const domain_connect_neededByStratus_output: JsonSchema = {
 /**
  * The schema of `domain-connect_templateSpec` in responses.
  */
-export const domain_connect_templateSpec_output: JsonSchema = {
+export const domain$$connect_templateSpec: JsonSchema = {
   "properties": {
     "accountTags": {
       "items": {
diff --git a/src/generated/forge-mcp/dns/domainconnect/schemas.ts b/src/generated/forge-mcp/dns/domainconnect/schemas.ts
index 29652ecd0..1890bc203 100644
--- a/src/generated/forge-mcp/dns/domainconnect/schemas.ts
+++ b/src/generated/forge-mcp/dns/domainconnect/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `domain-connect_PostData`.
  */
-export const domain_connect_PostData: JsonSchema = {
+export const domain$$connect_PostData: JsonSchema = {
   "properties": {
     "domain": {
       "type": "string"
diff --git a/src/generated/forge-mcp/dns/domainconnect/tools.ts b/src/generated/forge-mcp/dns/domainconnect/tools.ts
index b71376651..b83d0b69b 100644
--- a/src/generated/forge-mcp/dns/domainconnect/tools.ts
+++ b/src/generated/forge-mcp/dns/domainconnect/tools.ts
@@ -1,33 +1,43 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  domain_connect_httpError_output,
-  domain_connect_neededByStratus_output,
-  domain_connect_templateSpec_output,
+  domain$$connect_httpError,
+  domain$$connect_neededByStratus,
+  domain$$connect_templateSpec,
 } from "./outputs.js";
-import { domain_connect_PostData } from "./schemas.js";
+import { domain$$connect_PostData } from "./schemas.js";
 
 /**
  * The tools of `dns.domainconnect`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_domainconnect_get_domain_settings",
+    name: "dns_domainconnect_getDomainSettings",
     title: "Provide settings if domain is served by Cloudflare",
-    description: "Checks whether a domain is in Quicksilver and returns its settings.",
+    description: "Checks whether a domain is in Quicksilver and returns its settings.\n\nGET /v2/{domain}/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "domain": {
-          "description": "Domain name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "domain": {
+              "description": "Domain name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "domain"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "domain"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "type": "object",
@@ -57,7 +67,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "domain-connect_httpError": domain_connect_httpError_output,
+        "domain-connect_httpError": domain$$connect_httpError,
       },
     },
     request: (args) => ({
@@ -65,12 +75,13 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_domainconnect_get_heartbeat",
+    name: "dns_domainconnect_getHeartbeat",
     title: "Heartbeat response",
-    description: "Used by Kubernetes readiness and liveness probes, and CI builder by executing test/staging.sh.",
+    description: "Used by Kubernetes readiness and liveness probes, and CI builder by executing test/staging.sh.\n\nGET /_heartbeat",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -92,36 +103,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_domainconnect_get_provider_configuration",
+    name: "dns_domainconnect_getProviderConfiguration",
     title: "Serve a provider configuration",
-    description: "Provides Stratus with extra information about domain connect provider(s).",
+    description: "Provides Stratus with extra information about domain connect provider(s).\n\nGET /v2/provconf/{provider}/{service}/{account}",
     inputSchema: {
       type: "object",
       properties: {
-        "account": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "provider": {
-          "description": "Provider ID.",
-          "type": "string"
-        },
-        "service": {
-          "description": "Service ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "provider": {
+              "description": "Provider ID.",
+              "type": "string"
+            },
+            "service": {
+              "description": "Service ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "provider",
+            "service",
+            "account"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "provider",
-        "service",
-        "account"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/domain-connect_neededByStratus",
       $defs: {
-        "domain-connect_neededByStratus": domain_connect_neededByStratus_output,
-        "domain-connect_templateSpec": domain_connect_templateSpec_output,
+        "domain-connect_neededByStratus": domain$$connect_neededByStratus,
+        "domain-connect_templateSpec": domain$$connect_templateSpec,
       },
     },
     annotations: {
@@ -152,9 +173,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "domain-connect_httpError": domain_connect_httpError_output,
-        "domain-connect_neededByStratus": domain_connect_neededByStratus_output,
-        "domain-connect_templateSpec": domain_connect_templateSpec_output,
+        "domain-connect_httpError": domain$$connect_httpError,
+        "domain-connect_neededByStratus": domain$$connect_neededByStratus,
+        "domain-connect_templateSpec": domain$$connect_templateSpec,
       },
     },
     request: (args) => ({
@@ -162,29 +183,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_domainconnect_get_provider_template",
+    name: "dns_domainconnect_getProviderTemplate",
     title: "Serve a provider template",
-    description: "Providers are the external parties that are configured to interact with Cloudflare.",
+    description: "Providers are the external parties that are configured to interact with Cloudflare.\n\nGET /v2/domainTemplates/providers/{provider}/services/{service}",
     inputSchema: {
       type: "object",
       properties: {
-        "dump": {
-          "description": "Dump raw template.",
-          "type": "string"
-        },
-        "provider": {
-          "description": "Provider name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "provider": {
+              "description": "Provider name.",
+              "type": "string"
+            },
+            "service": {
+              "description": "Service name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "provider",
+            "service"
+          ],
+          "type": "object"
         },
-        "service": {
-          "description": "Service name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dump": {
+              "description": "Dump raw template.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "provider",
-        "service"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "type": "object",
@@ -211,20 +248,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "domain-connect_httpError": domain_connect_httpError_output,
+        "domain-connect_httpError": domain$$connect_httpError,
       },
     },
     request: (args) => ({
       path: `/v2/domainTemplates/providers/${pathParam(args, "provider")}/services/${pathParam(args, "service")}`,
       query: [
-        ["dump", args["dump"], true],
+        ["dump", param(args, "query", "dump"), true],
       ],
     }),
   },
   {
-    name: "dns_domainconnect_post_verify",
+    name: "dns_domainconnect_postVerify",
     title: "Request domain connect validation",
-    description: "Validates a Domain Connect signed request using DNS TXT public keys.",
+    description: "Validates a Domain Connect signed request using DNS TXT public keys.\n\nPOST /v1/verify",
     inputSchema: {
       type: "object",
       properties: {
@@ -235,8 +272,9 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "domain-connect_PostData": domain_connect_PostData,
+        "domain-connect_PostData": domain$$connect_PostData,
       },
     },
     annotations: {
diff --git a/src/generated/forge-mcp/dns/outputs.ts b/src/generated/forge-mcp/dns/outputs.ts
index 53f4a9569..39575a9fd 100644
--- a/src/generated/forge-mcp/dns/outputs.ts
+++ b/src/generated/forge-mcp/dns/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `dns-records_api-response-common-failure` in responses.
  */
-export const dns_records_api_response_common_failure_output: JsonSchema = {
+export const dns$$records_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-records_messages"
@@ -36,7 +36,7 @@ export const dns_records_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `dns-records_api-response-single` in responses.
  */
-export const dns_records_api_response_single_output: JsonSchema = {
+export const dns$$records_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-records_messages"
@@ -59,17 +59,10 @@ export const dns_records_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-records_identifier` in responses.
- */
-export const dns_records_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dns-records_messages` in responses.
  */
-export const dns_records_messages_output: JsonSchema = {
+export const dns$$records_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/dns/records/outputs.ts b/src/generated/forge-mcp/dns/records/outputs.ts
index ab787efb0..6bf35c455 100644
--- a/src/generated/forge-mcp/dns/records/outputs.ts
+++ b/src/generated/forge-mcp/dns/records/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `dns-records_AAAARecord` in responses.
  */
-export const dns_records_AAAARecord_output: JsonSchema = {
+export const dns$$records_AAAARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -34,7 +34,7 @@ export const dns_records_AAAARecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_ARecord` in responses.
  */
-export const dns_records_ARecord_output: JsonSchema = {
+export const dns$$records_ARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -62,7 +62,7 @@ export const dns_records_ARecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_CAARecord` in responses.
  */
-export const dns_records_CAARecord_output: JsonSchema = {
+export const dns$$records_CAARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -101,7 +101,7 @@ export const dns_records_CAARecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_CERTRecord` in responses.
  */
-export const dns_records_CERTRecord_output: JsonSchema = {
+export const dns$$records_CERTRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -143,7 +143,7 @@ export const dns_records_CERTRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_CNAMERecord` in responses.
  */
-export const dns_records_CNAMERecord_output: JsonSchema = {
+export const dns$$records_CNAMERecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -176,7 +176,7 @@ export const dns_records_CNAMERecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_DNSKEYRecord` in responses.
  */
-export const dns_records_DNSKEYRecord_output: JsonSchema = {
+export const dns$$records_DNSKEYRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -218,7 +218,7 @@ export const dns_records_DNSKEYRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_DSRecord` in responses.
  */
-export const dns_records_DSRecord_output: JsonSchema = {
+export const dns$$records_DSRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -260,7 +260,7 @@ export const dns_records_DSRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_HTTPSRecord` in responses.
  */
-export const dns_records_HTTPSRecord_output: JsonSchema = {
+export const dns$$records_HTTPSRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -299,7 +299,7 @@ export const dns_records_HTTPSRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_LOCRecord` in responses.
  */
-export const dns_records_LOCRecord_output: JsonSchema = {
+export const dns$$records_LOCRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -373,7 +373,7 @@ export const dns_records_LOCRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_MXRecord` in responses.
  */
-export const dns_records_MXRecord_output: JsonSchema = {
+export const dns$$records_MXRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -384,7 +384,7 @@ export const dns_records_MXRecord_output: JsonSchema = {
           "type": "string"
         },
         "priority": {
-          "$ref": "#/$defs/dns-records_priority"
+          "type": "number"
         },
         "type": {
           "enum": [
@@ -401,7 +401,7 @@ export const dns_records_MXRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_NAPTRRecord` in responses.
  */
-export const dns_records_NAPTRRecord_output: JsonSchema = {
+export const dns$$records_NAPTRRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -449,7 +449,7 @@ export const dns_records_NAPTRRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_NSRecord` in responses.
  */
-export const dns_records_NSRecord_output: JsonSchema = {
+export const dns$$records_NSRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -474,7 +474,7 @@ export const dns_records_NSRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_OPENPGPKEYRecord` in responses.
  */
-export const dns_records_OPENPGPKEYRecord_output: JsonSchema = {
+export const dns$$records_OPENPGPKEYRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -499,7 +499,7 @@ export const dns_records_OPENPGPKEYRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_PTRRecord` in responses.
  */
-export const dns_records_PTRRecord_output: JsonSchema = {
+export const dns$$records_PTRRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -524,7 +524,7 @@ export const dns_records_PTRRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_SMIMEARecord` in responses.
  */
-export const dns_records_SMIMEARecord_output: JsonSchema = {
+export const dns$$records_SMIMEARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -566,7 +566,7 @@ export const dns_records_SMIMEARecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_SRVRecord` in responses.
  */
-export const dns_records_SRVRecord_output: JsonSchema = {
+export const dns$$records_SRVRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -582,7 +582,7 @@ export const dns_records_SRVRecord_output: JsonSchema = {
               "type": "number"
             },
             "priority": {
-              "$ref": "#/$defs/dns-records_priority"
+              "type": "number"
             },
             "target": {
               "type": "string"
@@ -608,7 +608,7 @@ export const dns_records_SRVRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_SSHFPRecord` in responses.
  */
-export const dns_records_SSHFPRecord_output: JsonSchema = {
+export const dns$$records_SSHFPRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -647,7 +647,7 @@ export const dns_records_SSHFPRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_SVCBRecord` in responses.
  */
-export const dns_records_SVCBRecord_output: JsonSchema = {
+export const dns$$records_SVCBRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -686,7 +686,7 @@ export const dns_records_SVCBRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_TLSARecord` in responses.
  */
-export const dns_records_TLSARecord_output: JsonSchema = {
+export const dns$$records_TLSARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -728,7 +728,7 @@ export const dns_records_TLSARecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_TXTRecord` in responses.
  */
-export const dns_records_TXTRecord_output: JsonSchema = {
+export const dns$$records_TXTRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -753,7 +753,7 @@ export const dns_records_TXTRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_URIRecord` in responses.
  */
-export const dns_records_URIRecord_output: JsonSchema = {
+export const dns$$records_URIRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -775,7 +775,7 @@ export const dns_records_URIRecord_output: JsonSchema = {
           "type": "object"
         },
         "priority": {
-          "$ref": "#/$defs/dns-records_priority"
+          "type": "number"
         },
         "type": {
           "enum": [
@@ -792,7 +792,7 @@ export const dns_records_URIRecord_output: JsonSchema = {
 /**
  * The schema of `dns-records_api-response-collection` in responses.
  */
-export const dns_records_api_response_collection_output: JsonSchema = {
+export const dns$$records_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_api-response-common"
@@ -828,7 +828,7 @@ export const dns_records_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `dns-records_api-response-common` in responses.
  */
-export const dns_records_api_response_common_output: JsonSchema = {
+export const dns$$records_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-records_messages"
@@ -851,17 +851,10 @@ export const dns_records_api_response_common_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-records_comment` in responses.
- */
-export const dns_records_comment_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dns-records_dns-record-response` in responses.
  */
-export const dns_records_dns_record_response_output: JsonSchema = {
+export const dns$$records_dns$$record$$response: JsonSchema = {
   "allOf": [
     {
       "anyOf": [
@@ -884,7 +877,7 @@ export const dns_records_dns_record_response_output: JsonSchema = {
           "type": "string"
         },
         "id": {
-          "$ref": "#/$defs/dns-records_identifier"
+          "type": "string"
         },
         "meta": {
           "properties": {
@@ -933,16 +926,16 @@ export const dns_records_dns_record_response_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-shared-fields` in responses.
  */
-export const dns_records_dns_record_shared_fields_output: JsonSchema = {
+export const dns$$records_dns$$record$$shared$$fields: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/dns-records_comment"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/dns-records_name"
+      "type": "string"
     },
     "proxied": {
-      "$ref": "#/$defs/dns-records_proxied"
+      "type": "boolean"
     },
     "settings": {
       "$ref": "#/$defs/dns-records_settings"
@@ -951,7 +944,17 @@ export const dns_records_dns_record_shared_fields_output: JsonSchema = {
       "$ref": "#/$defs/dns-records_tags"
     },
     "ttl": {
-      "$ref": "#/$defs/dns-records_ttl"
+      "anyOf": [
+        {
+          "type": "number"
+        },
+        {
+          "enum": [
+            1
+          ],
+          "type": "integer"
+        }
+      ]
     }
   },
   "type": "object"
@@ -960,7 +963,7 @@ export const dns_records_dns_record_shared_fields_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-with-data` in responses.
  */
-export const dns_records_dns_record_with_data_output: JsonSchema = {
+export const dns$$records_dns$$record$$with$$data: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/dns-records_CAARecord"
@@ -1007,7 +1010,7 @@ export const dns_records_dns_record_with_data_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-without-data` in responses.
  */
-export const dns_records_dns_record_without_data_output: JsonSchema = {
+export const dns$$records_dns$$record$$without$$data: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/dns-records_ARecord"
@@ -1039,7 +1042,7 @@ export const dns_records_dns_record_without_data_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns-response-batch-object` in responses.
  */
-export const dns_records_dns_response_batch_object_output: JsonSchema = {
+export const dns$$records_dns$$response$$batch$$object: JsonSchema = {
   "properties": {
     "deletes": {
       "items": {
@@ -1072,7 +1075,7 @@ export const dns_records_dns_response_batch_object_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns-response-review-scan-object` in responses.
  */
-export const dns_records_dns_response_review_scan_object_output: JsonSchema = {
+export const dns$$records_dns$$response$$review$$scan$$object: JsonSchema = {
   "properties": {
     "accepts": {
       "items": {
@@ -1082,7 +1085,7 @@ export const dns_records_dns_response_review_scan_object_output: JsonSchema = {
     },
     "rejects": {
       "items": {
-        "$ref": "#/$defs/dns-records_identifier"
+        "type": "string"
       },
       "type": "array"
     }
@@ -1093,7 +1096,7 @@ export const dns_records_dns_response_review_scan_object_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns_response_batch` in responses.
  */
-export const dns_records_dns_response_batch_output: JsonSchema = {
+export const dns$$records_dns_response_batch: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_api-response-single"
@@ -1112,7 +1115,7 @@ export const dns_records_dns_response_batch_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns_response_collection` in responses.
  */
-export const dns_records_dns_response_collection_output: JsonSchema = {
+export const dns$$records_dns_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_api-response-collection"
@@ -1134,7 +1137,7 @@ export const dns_records_dns_response_collection_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns_response_review_scan` in responses.
  */
-export const dns_records_dns_response_review_scan_output: JsonSchema = {
+export const dns$$records_dns_response_review_scan: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_api-response-single"
@@ -1153,7 +1156,7 @@ export const dns_records_dns_response_review_scan_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns_response_single` in responses.
  */
-export const dns_records_dns_response_single_output: JsonSchema = {
+export const dns$$records_dns_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_api-response-single"
@@ -1172,7 +1175,7 @@ export const dns_records_dns_response_single_output: JsonSchema = {
 /**
  * The schema of `dns-records_dns_response_trigger_scan` in responses.
  */
-export const dns_records_dns_response_trigger_scan_output: JsonSchema = {
+export const dns$$records_dns_response_trigger_scan: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-records_messages"
@@ -1195,31 +1198,10 @@ export const dns_records_dns_response_trigger_scan_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-records_name` in responses.
- */
-export const dns_records_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `dns-records_priority` in responses.
- */
-export const dns_records_priority_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `dns-records_proxied` in responses.
- */
-export const dns_records_proxied_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `dns-records_settings` in responses.
  */
-export const dns_records_settings_output: JsonSchema = {
+export const dns$$records_settings: JsonSchema = {
   "properties": {
     "ipv4_only": {
       "type": "boolean"
@@ -1234,26 +1216,9 @@ export const dns_records_settings_output: JsonSchema = {
 /**
  * The schema of `dns-records_tags` in responses.
  */
-export const dns_records_tags_output: JsonSchema = {
+export const dns$$records_tags: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
-
-/**
- * The schema of `dns-records_ttl` in responses.
- */
-export const dns_records_ttl_output: JsonSchema = {
-  "anyOf": [
-    {
-      "type": "number"
-    },
-    {
-      "enum": [
-        1
-      ],
-      "type": "integer"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/dns/records/schemas.ts b/src/generated/forge-mcp/dns/records/schemas.ts
index f9bf0ea1b..e37633ad2 100644
--- a/src/generated/forge-mcp/dns/records/schemas.ts
+++ b/src/generated/forge-mcp/dns/records/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `dns-records_AAAARecord`.
  */
-export const dns_records_AAAARecord: JsonSchema = {
+export const dns$$records_AAAARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -39,7 +39,7 @@ export const dns_records_AAAARecord: JsonSchema = {
 /**
  * The schema of `dns-records_ARecord`.
  */
-export const dns_records_ARecord: JsonSchema = {
+export const dns$$records_ARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -72,7 +72,7 @@ export const dns_records_ARecord: JsonSchema = {
 /**
  * The schema of `dns-records_CAARecord`.
  */
-export const dns_records_CAARecord: JsonSchema = {
+export const dns$$records_CAARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -114,7 +114,7 @@ export const dns_records_CAARecord: JsonSchema = {
 /**
  * The schema of `dns-records_CERTRecord`.
  */
-export const dns_records_CERTRecord: JsonSchema = {
+export const dns$$records_CERTRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -160,7 +160,7 @@ export const dns_records_CERTRecord: JsonSchema = {
 /**
  * The schema of `dns-records_CNAMERecord`.
  */
-export const dns_records_CNAMERecord: JsonSchema = {
+export const dns$$records_CNAMERecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -198,7 +198,7 @@ export const dns_records_CNAMERecord: JsonSchema = {
 /**
  * The schema of `dns-records_DNSKEYRecord`.
  */
-export const dns_records_DNSKEYRecord: JsonSchema = {
+export const dns$$records_DNSKEYRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -244,7 +244,7 @@ export const dns_records_DNSKEYRecord: JsonSchema = {
 /**
  * The schema of `dns-records_DSRecord`.
  */
-export const dns_records_DSRecord: JsonSchema = {
+export const dns$$records_DSRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -290,7 +290,7 @@ export const dns_records_DSRecord: JsonSchema = {
 /**
  * The schema of `dns-records_HTTPSRecord`.
  */
-export const dns_records_HTTPSRecord: JsonSchema = {
+export const dns$$records_HTTPSRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -332,7 +332,7 @@ export const dns_records_HTTPSRecord: JsonSchema = {
 /**
  * The schema of `dns-records_LOCRecord`.
  */
-export const dns_records_LOCRecord: JsonSchema = {
+export const dns$$records_LOCRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -418,7 +418,7 @@ export const dns_records_LOCRecord: JsonSchema = {
 /**
  * The schema of `dns-records_MXRecord`.
  */
-export const dns_records_MXRecord: JsonSchema = {
+export const dns$$records_MXRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -430,7 +430,8 @@ export const dns_records_MXRecord: JsonSchema = {
           "type": "string"
         },
         "priority": {
-          "$ref": "#/$defs/dns-records_priority"
+          "description": "Required for MX and URI records; ignored for other record types (but may still be returned by the API). Records with lower priorities are preferred. This field is to be deprecated in favor of the priority field within the data map.",
+          "type": "number"
         },
         "type": {
           "description": "Record type.",
@@ -449,7 +450,7 @@ export const dns_records_MXRecord: JsonSchema = {
 /**
  * The schema of `dns-records_NAPTRRecord`.
  */
-export const dns_records_NAPTRRecord: JsonSchema = {
+export const dns$$records_NAPTRRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -503,7 +504,7 @@ export const dns_records_NAPTRRecord: JsonSchema = {
 /**
  * The schema of `dns-records_NSRecord`.
  */
-export const dns_records_NSRecord: JsonSchema = {
+export const dns$$records_NSRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -531,7 +532,7 @@ export const dns_records_NSRecord: JsonSchema = {
 /**
  * The schema of `dns-records_OPENPGPKEYRecord`.
  */
-export const dns_records_OPENPGPKEYRecord: JsonSchema = {
+export const dns$$records_OPENPGPKEYRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -559,7 +560,7 @@ export const dns_records_OPENPGPKEYRecord: JsonSchema = {
 /**
  * The schema of `dns-records_PTRRecord`.
  */
-export const dns_records_PTRRecord: JsonSchema = {
+export const dns$$records_PTRRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -587,7 +588,7 @@ export const dns_records_PTRRecord: JsonSchema = {
 /**
  * The schema of `dns-records_SMIMEARecord`.
  */
-export const dns_records_SMIMEARecord: JsonSchema = {
+export const dns$$records_SMIMEARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -633,7 +634,7 @@ export const dns_records_SMIMEARecord: JsonSchema = {
 /**
  * The schema of `dns-records_SRVRecord`.
  */
-export const dns_records_SRVRecord: JsonSchema = {
+export const dns$$records_SRVRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -648,7 +649,8 @@ export const dns_records_SRVRecord: JsonSchema = {
               "type": "number"
             },
             "priority": {
-              "$ref": "#/$defs/dns-records_priority"
+              "description": "Required for MX and URI records; ignored for other record types (but may still be returned by the API). Records with lower priorities are preferred. This field is to be deprecated in favor of the priority field within the data map.",
+              "type": "number"
             },
             "target": {
               "description": "A valid hostname.",
@@ -678,7 +680,7 @@ export const dns_records_SRVRecord: JsonSchema = {
 /**
  * The schema of `dns-records_SSHFPRecord`.
  */
-export const dns_records_SSHFPRecord: JsonSchema = {
+export const dns$$records_SSHFPRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -720,7 +722,7 @@ export const dns_records_SSHFPRecord: JsonSchema = {
 /**
  * The schema of `dns-records_SVCBRecord`.
  */
-export const dns_records_SVCBRecord: JsonSchema = {
+export const dns$$records_SVCBRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -762,7 +764,7 @@ export const dns_records_SVCBRecord: JsonSchema = {
 /**
  * The schema of `dns-records_TLSARecord`.
  */
-export const dns_records_TLSARecord: JsonSchema = {
+export const dns$$records_TLSARecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -808,7 +810,7 @@ export const dns_records_TLSARecord: JsonSchema = {
 /**
  * The schema of `dns-records_TXTRecord`.
  */
-export const dns_records_TXTRecord: JsonSchema = {
+export const dns$$records_TXTRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -836,7 +838,7 @@ export const dns_records_TXTRecord: JsonSchema = {
 /**
  * The schema of `dns-records_URIRecord`.
  */
-export const dns_records_URIRecord: JsonSchema = {
+export const dns$$records_URIRecord: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-shared-fields"
@@ -858,7 +860,8 @@ export const dns_records_URIRecord: JsonSchema = {
           "type": "object"
         },
         "priority": {
-          "$ref": "#/$defs/dns-records_priority"
+          "description": "Required for MX and URI records; ignored for other record types (but may still be returned by the API). Records with lower priorities are preferred. This field is to be deprecated in favor of the priority field within the data map.",
+          "type": "number"
         },
         "type": {
           "description": "Record type.",
@@ -874,34 +877,14 @@ export const dns_records_URIRecord: JsonSchema = {
   "description": "URI Record"
 };
 
-/**
- * The schema of `dns-records_comment`.
- */
-export const dns_records_comment: JsonSchema = {
-  "description": "Comments or notes about the DNS record. This field has no effect on DNS responses.",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-records_direction`.
- */
-export const dns_records_direction: JsonSchema = {
-  "description": "Direction to order DNS records in.",
-  "enum": [
-    "asc",
-    "desc"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dns-records_dns-record-batch-delete`.
  */
-export const dns_records_dns_record_batch_delete: JsonSchema = {
+export const dns$$records_dns$$record$$batch$$delete: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/dns-records_identifier",
-      "description": "Identifier."
+      "description": "Identifier.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -910,13 +893,13 @@ export const dns_records_dns_record_batch_delete: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-batch-patch`.
  */
-export const dns_records_dns_record_batch_patch: JsonSchema = {
+export const dns$$records_dns$$record$$batch$$patch: JsonSchema = {
   "allOf": [
     {
       "properties": {
         "id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+          "description": "Identifier.",
+          "type": "string"
         }
       },
       "required": [
@@ -933,20 +916,20 @@ export const dns_records_dns_record_batch_patch: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-batch-post`.
  */
-export const dns_records_dns_record_batch_post: JsonSchema = {
+export const dns$$records_dns$$record$$batch$$post: JsonSchema = {
   "$ref": "#/$defs/dns-records_dns-record-post"
 };
 
 /**
  * The schema of `dns-records_dns-record-batch-put`.
  */
-export const dns_records_dns_record_batch_put: JsonSchema = {
+export const dns$$records_dns$$record$$batch$$put: JsonSchema = {
   "allOf": [
     {
       "properties": {
         "id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+          "description": "Identifier.",
+          "type": "string"
         }
       },
       "required": [
@@ -963,7 +946,7 @@ export const dns_records_dns_record_batch_put: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-patch`.
  */
-export const dns_records_dns_record_patch: JsonSchema = {
+export const dns$$records_dns$$record$$patch: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-without-data"
@@ -977,7 +960,7 @@ export const dns_records_dns_record_patch: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-post`.
  */
-export const dns_records_dns_record_post: JsonSchema = {
+export const dns$$records_dns$$record$$post: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/dns-records_dns-record-without-data"
@@ -991,18 +974,18 @@ export const dns_records_dns_record_post: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-scan-batch-accept`.
  */
-export const dns_records_dns_record_scan_batch_accept: JsonSchema = {
+export const dns$$records_dns$$record$$scan$$batch$$accept: JsonSchema = {
   "$ref": "#/$defs/dns-records_dns-record-patch"
 };
 
 /**
  * The schema of `dns-records_dns-record-scan-batch-reject`.
  */
-export const dns_records_dns_record_scan_batch_reject: JsonSchema = {
+export const dns$$records_dns$$record$$scan$$batch$$reject: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/dns-records_identifier",
-      "description": "Identifier."
+      "description": "Identifier.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -1011,20 +994,20 @@ export const dns_records_dns_record_scan_batch_reject: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-shared-fields`.
  */
-export const dns_records_dns_record_shared_fields: JsonSchema = {
+export const dns$$records_dns$$record$$shared$$fields: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/dns-records_comment",
-      "description": "Comments or notes about the DNS record. This field has no effect on DNS responses."
+      "description": "Comments or notes about the DNS record. This field has no effect on DNS responses.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/dns-records_name",
-      "description": "Complete DNS record name, including the zone name, in Punycode."
+      "description": "Complete DNS record name, including the zone name, in Punycode.",
+      "type": "string"
     },
     "proxied": {
-      "$ref": "#/$defs/dns-records_proxied",
       "default": false,
-      "description": "Whether the record is receiving the performance and security benefits of Cloudflare."
+      "description": "Whether the record is receiving the performance and security benefits of Cloudflare.",
+      "type": "boolean"
     },
     "settings": {
       "$ref": "#/$defs/dns-records_settings",
@@ -1036,7 +1019,17 @@ export const dns_records_dns_record_shared_fields: JsonSchema = {
       "description": "Custom tags for the DNS record. This field has no effect on DNS responses."
     },
     "ttl": {
-      "$ref": "#/$defs/dns-records_ttl",
+      "anyOf": [
+        {
+          "type": "number"
+        },
+        {
+          "enum": [
+            1
+          ],
+          "type": "integer"
+        }
+      ],
       "default": 1,
       "description": "Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the minimum reduced to 30 for Enterprise zones."
     }
@@ -1047,7 +1040,7 @@ export const dns_records_dns_record_shared_fields: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-with-data`.
  */
-export const dns_records_dns_record_with_data: JsonSchema = {
+export const dns$$records_dns$$record$$with$$data: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/dns-records_CAARecord"
@@ -1094,7 +1087,7 @@ export const dns_records_dns_record_with_data: JsonSchema = {
 /**
  * The schema of `dns-records_dns-record-without-data`.
  */
-export const dns_records_dns_record_without_data: JsonSchema = {
+export const dns$$records_dns$$record$$without$$data: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/dns-records_ARecord"
@@ -1126,7 +1119,7 @@ export const dns_records_dns_record_without_data: JsonSchema = {
 /**
  * The schema of `dns-records_dns-request-batch-object`.
  */
-export const dns_records_dns_request_batch_object: JsonSchema = {
+export const dns$$records_dns$$request$$batch$$object: JsonSchema = {
   "properties": {
     "deletes": {
       "items": {
@@ -1159,7 +1152,7 @@ export const dns_records_dns_request_batch_object: JsonSchema = {
 /**
  * The schema of `dns-records_dns-request-review-scan-object`.
  */
-export const dns_records_dns_request_review_scan_object: JsonSchema = {
+export const dns$$records_dns$$request$$review$$scan$$object: JsonSchema = {
   "properties": {
     "accepts": {
       "items": {
@@ -1177,85 +1170,10 @@ export const dns_records_dns_request_review_scan_object: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-records_match`.
- */
-export const dns_records_match: JsonSchema = {
-  "description": "Whether to match all search requirements or at least one (any). If set to `all`, acts like a logical AND between filters. If set to `any`, acts like a logical OR instead. Note that the interaction between tag filters is controlled by the `tag-match` parameter instead.\n",
-  "enum": [
-    "any",
-    "all"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `dns-records_name`.
- */
-export const dns_records_name: JsonSchema = {
-  "description": "Complete DNS record name, including the zone name, in Punycode.",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-records_order`.
- */
-export const dns_records_order: JsonSchema = {
-  "description": "Field to order DNS records by.",
-  "enum": [
-    "type",
-    "name",
-    "content",
-    "ttl",
-    "proxied"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `dns-records_page`.
- */
-export const dns_records_page: JsonSchema = {
-  "description": "Page number of paginated results.",
-  "type": "number"
-};
-
-/**
- * The schema of `dns-records_per_page`.
- */
-export const dns_records_per_page: JsonSchema = {
-  "description": "Number of DNS records per page.",
-  "type": "number"
-};
-
-/**
- * The schema of `dns-records_priority`.
- */
-export const dns_records_priority: JsonSchema = {
-  "description": "Required for MX and URI records; ignored for other record types (but may still be returned by the API). Records with lower priorities are preferred. This field is to be deprecated in favor of the priority field within the data map.",
-  "type": "number"
-};
-
-/**
- * The schema of `dns-records_proxied`.
- */
-export const dns_records_proxied: JsonSchema = {
-  "description": "Whether the record is receiving the performance and security benefits of Cloudflare.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-records_search`.
- */
-export const dns_records_search: JsonSchema = {
-  "description": "Allows searching in multiple properties of a DNS record simultaneously. This parameter is intended for human users, not automation. Its exact behavior is intentionally left unspecified and is subject to change in the future. This parameter works independently of the `match` setting. For automated searches, please use the other available parameters.\n",
-  "type": "string"
-};
-
 /**
  * The schema of `dns-records_settings`.
  */
-export const dns_records_settings: JsonSchema = {
+export const dns$$records_settings: JsonSchema = {
   "description": "Settings for the DNS record.",
   "properties": {
     "ipv4_only": {
@@ -1272,74 +1190,13 @@ export const dns_records_settings: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-records_tag_match`.
- */
-export const dns_records_tag_match: JsonSchema = {
-  "description": "Whether to match all tag search requirements or at least one (any). If set to `all`, acts like a logical AND between tag filters. If set to `any`, acts like a logical OR instead. Note that the regular `match` parameter is still used to combine the resulting condition with other filters that aren't related to tags.\n",
-  "enum": [
-    "any",
-    "all"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dns-records_tags`.
  */
-export const dns_records_tags: JsonSchema = {
+export const dns$$records_tags: JsonSchema = {
   "description": "Custom tags for the DNS record. This field has no effect on DNS responses.",
   "items": {
     "type": "string"
   },
   "type": "array"
 };
-
-/**
- * The schema of `dns-records_ttl`.
- */
-export const dns_records_ttl: JsonSchema = {
-  "anyOf": [
-    {
-      "type": "number"
-    },
-    {
-      "enum": [
-        1
-      ],
-      "type": "integer"
-    }
-  ],
-  "description": "Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the minimum reduced to 30 for Enterprise zones."
-};
-
-/**
- * The schema of `dns-records_type`.
- */
-export const dns_records_type: JsonSchema = {
-  "description": "Record type.",
-  "enum": [
-    "A",
-    "AAAA",
-    "CAA",
-    "CERT",
-    "CNAME",
-    "DNSKEY",
-    "DS",
-    "HTTPS",
-    "LOC",
-    "MX",
-    "NAPTR",
-    "NS",
-    "OPENPGPKEY",
-    "PTR",
-    "SMIMEA",
-    "SRV",
-    "SSHFP",
-    "SVCB",
-    "TLSA",
-    "TXT",
-    "URI"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/records/tools.ts b/src/generated/forge-mcp/dns/records/tools.ts
index 104fd95bc..4224dd594 100644
--- a/src/generated/forge-mcp/dns/records/tools.ts
+++ b/src/generated/forge-mcp/dns/records/tools.ts
@@ -1,107 +1,87 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  dns_records_api_response_common_failure_output,
-  dns_records_api_response_single_output,
-  dns_records_identifier_output,
-  dns_records_messages_output,
+  dns$$records_api$$response$$common$$failure,
+  dns$$records_api$$response$$single,
+  dns$$records_messages,
 } from "../outputs.js";
-import { dns_records_identifier } from "../schemas.js";
 import {
-  dns_records_AAAARecord_output,
-  dns_records_ARecord_output,
-  dns_records_CAARecord_output,
-  dns_records_CERTRecord_output,
-  dns_records_CNAMERecord_output,
-  dns_records_DNSKEYRecord_output,
-  dns_records_DSRecord_output,
-  dns_records_HTTPSRecord_output,
-  dns_records_LOCRecord_output,
-  dns_records_MXRecord_output,
-  dns_records_NAPTRRecord_output,
-  dns_records_NSRecord_output,
-  dns_records_OPENPGPKEYRecord_output,
-  dns_records_PTRRecord_output,
-  dns_records_SMIMEARecord_output,
-  dns_records_SRVRecord_output,
-  dns_records_SSHFPRecord_output,
-  dns_records_SVCBRecord_output,
-  dns_records_TLSARecord_output,
-  dns_records_TXTRecord_output,
-  dns_records_URIRecord_output,
-  dns_records_api_response_collection_output,
-  dns_records_api_response_common_output,
-  dns_records_comment_output,
-  dns_records_dns_record_response_output,
-  dns_records_dns_record_shared_fields_output,
-  dns_records_dns_record_with_data_output,
-  dns_records_dns_record_without_data_output,
-  dns_records_dns_response_batch_object_output,
-  dns_records_dns_response_batch_output,
-  dns_records_dns_response_collection_output,
-  dns_records_dns_response_review_scan_object_output,
-  dns_records_dns_response_review_scan_output,
-  dns_records_dns_response_single_output,
-  dns_records_dns_response_trigger_scan_output,
-  dns_records_name_output,
-  dns_records_priority_output,
-  dns_records_proxied_output,
-  dns_records_settings_output,
-  dns_records_tags_output,
-  dns_records_ttl_output,
+  dns$$records_AAAARecord,
+  dns$$records_ARecord,
+  dns$$records_CAARecord,
+  dns$$records_CERTRecord,
+  dns$$records_CNAMERecord,
+  dns$$records_DNSKEYRecord,
+  dns$$records_DSRecord,
+  dns$$records_HTTPSRecord,
+  dns$$records_LOCRecord,
+  dns$$records_MXRecord,
+  dns$$records_NAPTRRecord,
+  dns$$records_NSRecord,
+  dns$$records_OPENPGPKEYRecord,
+  dns$$records_PTRRecord,
+  dns$$records_SMIMEARecord,
+  dns$$records_SRVRecord,
+  dns$$records_SSHFPRecord,
+  dns$$records_SVCBRecord,
+  dns$$records_TLSARecord,
+  dns$$records_TXTRecord,
+  dns$$records_URIRecord,
+  dns$$records_api$$response$$collection,
+  dns$$records_api$$response$$common,
+  dns$$records_dns$$record$$response,
+  dns$$records_dns$$record$$shared$$fields,
+  dns$$records_dns$$record$$with$$data,
+  dns$$records_dns$$record$$without$$data,
+  dns$$records_dns$$response$$batch$$object,
+  dns$$records_dns$$response$$review$$scan$$object,
+  dns$$records_dns_response_batch,
+  dns$$records_dns_response_collection,
+  dns$$records_dns_response_review_scan,
+  dns$$records_dns_response_single,
+  dns$$records_dns_response_trigger_scan,
+  dns$$records_settings,
+  dns$$records_tags,
 } from "./outputs.js";
 import {
-  dns_records_AAAARecord,
-  dns_records_ARecord,
-  dns_records_CAARecord,
-  dns_records_CERTRecord,
-  dns_records_CNAMERecord,
-  dns_records_DNSKEYRecord,
-  dns_records_DSRecord,
-  dns_records_HTTPSRecord,
-  dns_records_LOCRecord,
-  dns_records_MXRecord,
-  dns_records_NAPTRRecord,
-  dns_records_NSRecord,
-  dns_records_OPENPGPKEYRecord,
-  dns_records_PTRRecord,
-  dns_records_SMIMEARecord,
-  dns_records_SRVRecord,
-  dns_records_SSHFPRecord,
-  dns_records_SVCBRecord,
-  dns_records_TLSARecord,
-  dns_records_TXTRecord,
-  dns_records_URIRecord,
-  dns_records_comment,
-  dns_records_direction,
-  dns_records_dns_record_batch_delete,
-  dns_records_dns_record_batch_patch,
-  dns_records_dns_record_batch_post,
-  dns_records_dns_record_batch_put,
-  dns_records_dns_record_patch,
-  dns_records_dns_record_post,
-  dns_records_dns_record_scan_batch_accept,
-  dns_records_dns_record_scan_batch_reject,
-  dns_records_dns_record_shared_fields,
-  dns_records_dns_record_with_data,
-  dns_records_dns_record_without_data,
-  dns_records_dns_request_batch_object,
-  dns_records_dns_request_review_scan_object,
-  dns_records_match,
-  dns_records_name,
-  dns_records_order,
-  dns_records_page,
-  dns_records_per_page,
-  dns_records_priority,
-  dns_records_proxied,
-  dns_records_search,
-  dns_records_settings,
-  dns_records_tag_match,
-  dns_records_tags,
-  dns_records_ttl,
-  dns_records_type,
+  dns$$records_AAAARecord as dns$$records_AAAARecord$,
+  dns$$records_ARecord as dns$$records_ARecord$,
+  dns$$records_CAARecord as dns$$records_CAARecord$,
+  dns$$records_CERTRecord as dns$$records_CERTRecord$,
+  dns$$records_CNAMERecord as dns$$records_CNAMERecord$,
+  dns$$records_DNSKEYRecord as dns$$records_DNSKEYRecord$,
+  dns$$records_DSRecord as dns$$records_DSRecord$,
+  dns$$records_HTTPSRecord as dns$$records_HTTPSRecord$,
+  dns$$records_LOCRecord as dns$$records_LOCRecord$,
+  dns$$records_MXRecord as dns$$records_MXRecord$,
+  dns$$records_NAPTRRecord as dns$$records_NAPTRRecord$,
+  dns$$records_NSRecord as dns$$records_NSRecord$,
+  dns$$records_OPENPGPKEYRecord as dns$$records_OPENPGPKEYRecord$,
+  dns$$records_PTRRecord as dns$$records_PTRRecord$,
+  dns$$records_SMIMEARecord as dns$$records_SMIMEARecord$,
+  dns$$records_SRVRecord as dns$$records_SRVRecord$,
+  dns$$records_SSHFPRecord as dns$$records_SSHFPRecord$,
+  dns$$records_SVCBRecord as dns$$records_SVCBRecord$,
+  dns$$records_TLSARecord as dns$$records_TLSARecord$,
+  dns$$records_TXTRecord as dns$$records_TXTRecord$,
+  dns$$records_URIRecord as dns$$records_URIRecord$,
+  dns$$records_dns$$record$$batch$$delete,
+  dns$$records_dns$$record$$batch$$patch,
+  dns$$records_dns$$record$$batch$$post,
+  dns$$records_dns$$record$$batch$$put,
+  dns$$records_dns$$record$$patch,
+  dns$$records_dns$$record$$post,
+  dns$$records_dns$$record$$scan$$batch$$accept,
+  dns$$records_dns$$record$$scan$$batch$$reject,
+  dns$$records_dns$$record$$shared$$fields as dns$$records_dns$$record$$shared$$fields$,
+  dns$$records_dns$$record$$with$$data as dns$$records_dns$$record$$with$$data$,
+  dns$$records_dns$$record$$without$$data as dns$$records_dns$$record$$without$$data$,
+  dns$$records_dns$$request$$batch$$object,
+  dns$$records_dns$$request$$review$$scan$$object,
+  dns$$records_settings as dns$$records_settings$,
+  dns$$records_tags as dns$$records_tags$,
 } from "./schemas.js";
 
 /**
@@ -111,109 +91,113 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_records_batch",
     title: "Batch DNS Records",
-    description: "Send a Batch of DNS Record API calls to be executed together.\n\nNotes:\n- Although Cloudflare will execute the batched operations in a single database transaction, Cloudflare's distributed KV store must treat each record change as a single key-value pair. This means that the propagation of changes is not atomic. See [the documentation](https://developers.cloudflare.com/dns/manage-dns-records/how-to/batch-record-changes/ \"Batch DNS records\") for more information.\n- The operations you specify within the /batch request body are always executed in the following order:\n\n    - Deletes\n    - Patches\n    - Puts\n    - Posts",
+    description: "Send a Batch of DNS Record API calls to be executed together.\n\nNotes:\n- Although Cloudflare will execute the batched operations in a single database transaction, Cloudflare's distributed KV store must treat each record change as a single key-value pair. This means that the propagation of changes is not atomic. See [the documentation](https://developers.cloudflare.com/dns/manage-dns-records/how-to/batch-record-changes/ \"Batch DNS records\") for more information.\n- The operations you specify within the /batch request body are always executed in the following order:\n\n    - Deletes\n    - Patches\n    - Puts\n    - Posts\n\nPOST /zones/{zone_id}/dns_records/batch",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/dns-records_dns-request-batch-object"
         },
-        "include_shadow_metadata": {
-          "default": false,
-          "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).\n",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_shadow_metadata": {
+              "default": false,
+              "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord,
-        "dns-records_ARecord": dns_records_ARecord,
-        "dns-records_CAARecord": dns_records_CAARecord,
-        "dns-records_CERTRecord": dns_records_CERTRecord,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord,
-        "dns-records_DSRecord": dns_records_DSRecord,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord,
-        "dns-records_LOCRecord": dns_records_LOCRecord,
-        "dns-records_MXRecord": dns_records_MXRecord,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord,
-        "dns-records_NSRecord": dns_records_NSRecord,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord,
-        "dns-records_PTRRecord": dns_records_PTRRecord,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord,
-        "dns-records_SRVRecord": dns_records_SRVRecord,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord,
-        "dns-records_TLSARecord": dns_records_TLSARecord,
-        "dns-records_TXTRecord": dns_records_TXTRecord,
-        "dns-records_URIRecord": dns_records_URIRecord,
-        "dns-records_comment": dns_records_comment,
-        "dns-records_dns-record-batch-delete": dns_records_dns_record_batch_delete,
-        "dns-records_dns-record-batch-patch": dns_records_dns_record_batch_patch,
-        "dns-records_dns-record-batch-post": dns_records_dns_record_batch_post,
-        "dns-records_dns-record-batch-put": dns_records_dns_record_batch_put,
-        "dns-records_dns-record-patch": dns_records_dns_record_patch,
-        "dns-records_dns-record-post": dns_records_dns_record_post,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data,
-        "dns-records_dns-request-batch-object": dns_records_dns_request_batch_object,
-        "dns-records_identifier": dns_records_identifier,
-        "dns-records_name": dns_records_name,
-        "dns-records_priority": dns_records_priority,
-        "dns-records_proxied": dns_records_proxied,
-        "dns-records_settings": dns_records_settings,
-        "dns-records_tags": dns_records_tags,
-        "dns-records_ttl": dns_records_ttl,
+        "dns-records_AAAARecord": dns$$records_AAAARecord$,
+        "dns-records_ARecord": dns$$records_ARecord$,
+        "dns-records_CAARecord": dns$$records_CAARecord$,
+        "dns-records_CERTRecord": dns$$records_CERTRecord$,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord$,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord$,
+        "dns-records_DSRecord": dns$$records_DSRecord$,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord$,
+        "dns-records_LOCRecord": dns$$records_LOCRecord$,
+        "dns-records_MXRecord": dns$$records_MXRecord$,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord$,
+        "dns-records_NSRecord": dns$$records_NSRecord$,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord$,
+        "dns-records_PTRRecord": dns$$records_PTRRecord$,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord$,
+        "dns-records_SRVRecord": dns$$records_SRVRecord$,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord$,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord$,
+        "dns-records_TLSARecord": dns$$records_TLSARecord$,
+        "dns-records_TXTRecord": dns$$records_TXTRecord$,
+        "dns-records_URIRecord": dns$$records_URIRecord$,
+        "dns-records_dns-record-batch-delete": dns$$records_dns$$record$$batch$$delete,
+        "dns-records_dns-record-batch-patch": dns$$records_dns$$record$$batch$$patch,
+        "dns-records_dns-record-batch-post": dns$$records_dns$$record$$batch$$post,
+        "dns-records_dns-record-batch-put": dns$$records_dns$$record$$batch$$put,
+        "dns-records_dns-record-patch": dns$$records_dns$$record$$patch,
+        "dns-records_dns-record-post": dns$$records_dns$$record$$post,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields$,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data$,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data$,
+        "dns-records_dns-request-batch-object": dns$$records_dns$$request$$batch$$object,
+        "dns-records_settings": dns$$records_settings$,
+        "dns-records_tags": dns$$records_tags$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_batch",
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns-response-batch-object": dns_records_dns_response_batch_object_output,
-        "dns-records_dns_response_batch": dns_records_dns_response_batch_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns-response-batch-object": dns$$records_dns$$response$$batch$$object,
+        "dns-records_dns_response_batch": dns$$records_dns_response_batch,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     annotations: {
@@ -251,50 +235,44 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns-response-batch-object": dns_records_dns_response_batch_object_output,
-        "dns-records_dns_response_batch": dns_records_dns_response_batch_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns-response-batch-object": dns$$records_dns$$response$$batch$$object,
+        "dns-records_dns_response_batch": dns$$records_dns_response_batch,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/dns_records/batch`,
       query: [
-        ["include_shadow_metadata", args["include_shadow_metadata"], true],
+        ["include_shadow_metadata", param(args, "query", "include_shadow_metadata"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -302,102 +280,106 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_records_create",
     title: "Create DNS Record",
-    description: "Create a new DNS record for a zone.\n\nNotes:\n- A/AAAA records cannot exist on the same name as CNAME records.\n- NS records cannot exist on the same name as any other record type.\n- Domain names are always represented in Punycode, even if Unicode\n  characters were used when creating the record.",
+    description: "Create a new DNS record for a zone.\n\nNotes:\n- A/AAAA records cannot exist on the same name as CNAME records.\n- NS records cannot exist on the same name as any other record type.\n- Domain names are always represented in Punycode, even if Unicode\n  characters were used when creating the record.\n\nPOST /zones/{zone_id}/dns_records",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/dns-records_dns-record-post"
         },
-        "include_shadow_metadata": {
-          "default": false,
-          "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).\n",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_shadow_metadata": {
+              "default": false,
+              "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord,
-        "dns-records_ARecord": dns_records_ARecord,
-        "dns-records_CAARecord": dns_records_CAARecord,
-        "dns-records_CERTRecord": dns_records_CERTRecord,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord,
-        "dns-records_DSRecord": dns_records_DSRecord,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord,
-        "dns-records_LOCRecord": dns_records_LOCRecord,
-        "dns-records_MXRecord": dns_records_MXRecord,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord,
-        "dns-records_NSRecord": dns_records_NSRecord,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord,
-        "dns-records_PTRRecord": dns_records_PTRRecord,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord,
-        "dns-records_SRVRecord": dns_records_SRVRecord,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord,
-        "dns-records_TLSARecord": dns_records_TLSARecord,
-        "dns-records_TXTRecord": dns_records_TXTRecord,
-        "dns-records_URIRecord": dns_records_URIRecord,
-        "dns-records_comment": dns_records_comment,
-        "dns-records_dns-record-post": dns_records_dns_record_post,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data,
-        "dns-records_identifier": dns_records_identifier,
-        "dns-records_name": dns_records_name,
-        "dns-records_priority": dns_records_priority,
-        "dns-records_proxied": dns_records_proxied,
-        "dns-records_settings": dns_records_settings,
-        "dns-records_tags": dns_records_tags,
-        "dns-records_ttl": dns_records_ttl,
+        "dns-records_AAAARecord": dns$$records_AAAARecord$,
+        "dns-records_ARecord": dns$$records_ARecord$,
+        "dns-records_CAARecord": dns$$records_CAARecord$,
+        "dns-records_CERTRecord": dns$$records_CERTRecord$,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord$,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord$,
+        "dns-records_DSRecord": dns$$records_DSRecord$,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord$,
+        "dns-records_LOCRecord": dns$$records_LOCRecord$,
+        "dns-records_MXRecord": dns$$records_MXRecord$,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord$,
+        "dns-records_NSRecord": dns$$records_NSRecord$,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord$,
+        "dns-records_PTRRecord": dns$$records_PTRRecord$,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord$,
+        "dns-records_SRVRecord": dns$$records_SRVRecord$,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord$,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord$,
+        "dns-records_TLSARecord": dns$$records_TLSARecord$,
+        "dns-records_TXTRecord": dns$$records_TXTRecord$,
+        "dns-records_URIRecord": dns$$records_URIRecord$,
+        "dns-records_dns-record-post": dns$$records_dns$$record$$post,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields$,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data$,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data$,
+        "dns-records_settings": dns$$records_settings$,
+        "dns-records_tags": dns$$records_tags$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_single",
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_single": dns_records_dns_response_single_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_single": dns$$records_dns_response_single,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     annotations: {
@@ -435,49 +417,43 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_single": dns_records_dns_response_single_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_single": dns$$records_dns_response_single,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/dns_records`,
       query: [
-        ["include_shadow_metadata", args["include_shadow_metadata"], true],
+        ["include_shadow_metadata", param(args, "query", "include_shadow_metadata"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -485,42 +461,46 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_records_delete",
     title: "Delete DNS Record",
-    description: "Permanently removes a DNS record from the zone.",
+    description: "Permanently removes a DNS record from the zone.\n\nDELETE /zones/{zone_id}/dns_records/{dns_record_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "dns_record_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dns_record_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "dns_record_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "dns_record_id"
+        "path"
       ],
-      $defs: {
-        "dns-records_identifier": dns_records_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/dns-records_identifier"
+              "type": "string"
             }
           },
           "type": "object"
         }
       },
       "type": "object",
-      $defs: {
-        "dns-records_identifier": dns_records_identifier_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -554,7 +534,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/dns-records_identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -569,7 +549,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/dns-records_identifier"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -584,9 +564,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_messages": dns$$records_messages,
       },
     },
     request: (args) => ({
@@ -596,107 +575,111 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_records_edit",
     title: "Update DNS Record",
-    description: "Update an existing DNS record.\n\nNotes:\n- A/AAAA records cannot exist on the same name as CNAME records.\n- NS records cannot exist on the same name as any other record type.\n- Domain names are always represented in Punycode, even if Unicode\n  characters were used when creating the record.",
+    description: "Update an existing DNS record.\n\nNotes:\n- A/AAAA records cannot exist on the same name as CNAME records.\n- NS records cannot exist on the same name as any other record type.\n- Domain names are always represented in Punycode, even if Unicode\n  characters were used when creating the record.\n\nPATCH /zones/{zone_id}/dns_records/{dns_record_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/dns-records_dns-record-patch"
         },
-        "dns_record_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
-        },
-        "include_shadow_metadata": {
-          "default": false,
-          "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).\n",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dns_record_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "dns_record_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_shadow_metadata": {
+              "default": false,
+              "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "dns_record_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord,
-        "dns-records_ARecord": dns_records_ARecord,
-        "dns-records_CAARecord": dns_records_CAARecord,
-        "dns-records_CERTRecord": dns_records_CERTRecord,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord,
-        "dns-records_DSRecord": dns_records_DSRecord,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord,
-        "dns-records_LOCRecord": dns_records_LOCRecord,
-        "dns-records_MXRecord": dns_records_MXRecord,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord,
-        "dns-records_NSRecord": dns_records_NSRecord,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord,
-        "dns-records_PTRRecord": dns_records_PTRRecord,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord,
-        "dns-records_SRVRecord": dns_records_SRVRecord,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord,
-        "dns-records_TLSARecord": dns_records_TLSARecord,
-        "dns-records_TXTRecord": dns_records_TXTRecord,
-        "dns-records_URIRecord": dns_records_URIRecord,
-        "dns-records_comment": dns_records_comment,
-        "dns-records_dns-record-patch": dns_records_dns_record_patch,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data,
-        "dns-records_identifier": dns_records_identifier,
-        "dns-records_name": dns_records_name,
-        "dns-records_priority": dns_records_priority,
-        "dns-records_proxied": dns_records_proxied,
-        "dns-records_settings": dns_records_settings,
-        "dns-records_tags": dns_records_tags,
-        "dns-records_ttl": dns_records_ttl,
+        "dns-records_AAAARecord": dns$$records_AAAARecord$,
+        "dns-records_ARecord": dns$$records_ARecord$,
+        "dns-records_CAARecord": dns$$records_CAARecord$,
+        "dns-records_CERTRecord": dns$$records_CERTRecord$,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord$,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord$,
+        "dns-records_DSRecord": dns$$records_DSRecord$,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord$,
+        "dns-records_LOCRecord": dns$$records_LOCRecord$,
+        "dns-records_MXRecord": dns$$records_MXRecord$,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord$,
+        "dns-records_NSRecord": dns$$records_NSRecord$,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord$,
+        "dns-records_PTRRecord": dns$$records_PTRRecord$,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord$,
+        "dns-records_SRVRecord": dns$$records_SRVRecord$,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord$,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord$,
+        "dns-records_TLSARecord": dns$$records_TLSARecord$,
+        "dns-records_TXTRecord": dns$$records_TXTRecord$,
+        "dns-records_URIRecord": dns$$records_URIRecord$,
+        "dns-records_dns-record-patch": dns$$records_dns$$record$$patch,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields$,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data$,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data$,
+        "dns-records_settings": dns$$records_settings$,
+        "dns-records_tags": dns$$records_tags$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_single",
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_single": dns_records_dns_response_single_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_single": dns$$records_dns_response_single,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     annotations: {
@@ -734,49 +717,43 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_single": dns_records_dns_response_single_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_single": dns$$records_dns_response_single,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/dns_records/${pathParam(args, "dns_record_id")}`,
       query: [
-        ["include_shadow_metadata", args["include_shadow_metadata"], true],
+        ["include_shadow_metadata", param(args, "query", "include_shadow_metadata"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -784,21 +761,28 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_records_export",
     title: "Export DNS Records",
-    description: "You can export your [BIND config](https://en.wikipedia.org/wiki/Zone_file \"Zone file\") through this endpoint.\n\nSee [the documentation](https://developers.cloudflare.com/dns/manage-dns-records/how-to/import-and-export/ \"Import and export records\") for more information.",
+    description: "You can export your [BIND config](https://en.wikipedia.org/wiki/Zone_file \"Zone file\") through this endpoint.\n\nSee [the documentation](https://developers.cloudflare.com/dns/manage-dns-records/how-to/import-and-export/ \"Import and export records\") for more information.\n\nGET /zones/{zone_id}/dns_records/export",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dns-records_identifier": dns_records_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -834,8 +818,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_messages": dns_records_messages_output,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_messages": dns$$records_messages,
       },
     },
     request: (args) => ({
@@ -845,71 +829,78 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_records_get",
     title: "DNS Record Details",
-    description: "Retrieves details for a specific DNS record in the zone.",
+    description: "Retrieves details for a specific DNS record in the zone.\n\nGET /zones/{zone_id}/dns_records/{dns_record_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "dns_record_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
-        },
-        "include_shadow_metadata": {
-          "default": false,
-          "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).\n",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dns_record_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "dns_record_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_shadow_metadata": {
+              "default": false,
+              "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "dns_record_id"
+        "path"
       ],
-      $defs: {
-        "dns-records_identifier": dns_records_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_single",
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_single": dns_records_dns_response_single_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_single": dns$$records_dns_response_single,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     annotations: {
@@ -948,272 +939,306 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_single": dns_records_dns_response_single_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_single": dns$$records_dns_response_single,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/dns_records/${pathParam(args, "dns_record_id")}`,
       query: [
-        ["include_shadow_metadata", args["include_shadow_metadata"], true],
+        ["include_shadow_metadata", param(args, "query", "include_shadow_metadata"), true],
       ],
     }),
   },
   {
     name: "dns_records_list",
     title: "List DNS Records",
-    description: "List, search, sort, and filter a zones' DNS records.",
+    description: "List, search, sort, and filter a zones' DNS records.\n\nGET /zones/{zone_id}/dns_records",
     inputSchema: {
       type: "object",
       properties: {
-        "comment": {
-          "description": "Exact value of the DNS record comment. This is a convenience alias for `comment.exact`.\n",
-          "type": "string"
-        },
-        "comment_absent": {
-          "description": "If this parameter is present, only records *without* a comment are returned.\n",
-          "type": "string"
-        },
-        "comment_contains": {
-          "description": "Substring of the DNS record comment. Comment filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "comment_endswith": {
-          "description": "Suffix of the DNS record comment. Comment filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "comment_exact": {
-          "description": "Exact value of the DNS record comment. Comment filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "comment_present": {
-          "description": "If this parameter is present, only records *with* a comment are returned.\n",
-          "type": "string"
-        },
-        "comment_startswith": {
-          "description": "Prefix of the DNS record comment. Comment filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "content": {
-          "description": "Exact value of the DNS record content. This is a convenience alias for `content.exact`.\n",
-          "type": "string"
-        },
-        "content_contains": {
-          "description": "Substring of the DNS record content. Content filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "content_endswith": {
-          "description": "Suffix of the DNS record content. Content filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "content_exact": {
-          "description": "Exact value of the DNS record content. Content filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "content_startswith": {
-          "description": "Prefix of the DNS record content. Content filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "direction": {
-          "$ref": "#/$defs/dns-records_direction",
-          "default": "asc",
-          "description": "Direction to order DNS records in."
-        },
-        "include_shadow_metadata": {
-          "default": false,
-          "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).\n",
-          "type": "boolean"
-        },
-        "match": {
-          "$ref": "#/$defs/dns-records_match",
-          "default": "all",
-          "description": "Whether to match all search requirements or at least one (any). If set to `all`, acts like a logical AND between filters. If set to `any`, acts like a logical OR instead. Note that the interaction between tag filters is controlled by the `tag-match` parameter instead.\n"
-        },
-        "name": {
-          "description": "Exact value of the DNS record name. This is a convenience alias for `name.exact`.\n",
-          "type": "string"
-        },
-        "name_contains": {
-          "description": "Substring of the DNS record name. Name filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "name_endswith": {
-          "description": "Suffix of the DNS record name. Name filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "name_exact": {
-          "description": "Exact value of the DNS record name. Name filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "name_startswith": {
-          "description": "Prefix of the DNS record name. Name filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "order": {
-          "$ref": "#/$defs/dns-records_order",
-          "default": "type",
-          "description": "Field to order DNS records by."
-        },
-        "page": {
-          "$ref": "#/$defs/dns-records_page",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/dns-records_per_page",
-          "default": 100,
-          "description": "Number of DNS records per page."
-        },
-        "proxied": {
-          "$ref": "#/$defs/dns-records_proxied",
-          "default": false,
-          "description": "Whether the record is receiving the performance and security benefits of Cloudflare."
-        },
-        "search": {
-          "$ref": "#/$defs/dns-records_search",
-          "description": "Allows searching in multiple properties of a DNS record simultaneously. This parameter is intended for human users, not automation. Its exact behavior is intentionally left unspecified and is subject to change in the future. This parameter works independently of the `match` setting. For automated searches, please use the other available parameters.\n"
-        },
-        "shadowed_by_name": {
-          "description": "Filters the response to records at or below the specified NS delegation name. NS, DS, and NSEC records at the delegation name are excluded because they are not shadowed by that delegation. Those record types are included only when they exist below the delegation. The value must be a non-apex subdomain of the zone. Requires `include_shadow_metadata=true`. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).\n",
-          "type": "string"
-        },
-        "shadowing_name": {
-          "description": "Returns NS records that shadow the given name, searching at the name itself and each of its ancestor names within the zone, excluding the zone apex. The value must be a subdomain of the zone; the zone apex is not accepted. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).\n",
-          "type": "string"
-        },
-        "tag": {
-          "description": "Condition on the DNS record tag.\n\nParameter values can be of the form `<tag-name>:<tag-value>` to search for an exact `name:value` pair, or just `<tag-name>` to search for records with a specific tag name regardless of its value.\n\nThis is a convenience shorthand for the more powerful `tag.<predicate>` parameters.\nExamples:\n- `tag=important` is equivalent to `tag.present=important`\n- `tag=team:DNS` is equivalent to `tag.exact=team:DNS`\n",
-          "type": "string"
-        },
-        "tag_absent": {
-          "description": "Name of a tag which must *not* be present on the DNS record. Tag filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "tag_contains": {
-          "description": "A tag and value, of the form `<tag-name>:<tag-value>`. The API will only return DNS records that have a tag named `<tag-name>` whose value contains `<tag-value>`. Tag filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "tag_endswith": {
-          "description": "A tag and value, of the form `<tag-name>:<tag-value>`. The API will only return DNS records that have a tag named `<tag-name>` whose value ends with `<tag-value>`. Tag filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "tag_exact": {
-          "description": "A tag and value, of the form `<tag-name>:<tag-value>`. The API will only return DNS records that have a tag named `<tag-name>` whose value is `<tag-value>`. Tag filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "tag_match": {
-          "$ref": "#/$defs/dns-records_tag_match",
-          "default": "all",
-          "description": "Whether to match all tag search requirements or at least one (any). If set to `all`, acts like a logical AND between tag filters. If set to `any`, acts like a logical OR instead. Note that the regular `match` parameter is still used to combine the resulting condition with other filters that aren't related to tags.\n"
-        },
-        "tag_present": {
-          "description": "Name of a tag which must be present on the DNS record. Tag filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "tag_startswith": {
-          "description": "A tag and value, of the form `<tag-name>:<tag-value>`. The API will only return DNS records that have a tag named `<tag-name>` whose value starts with `<tag-value>`. Tag filters are case-insensitive.\n",
-          "type": "string"
-        },
-        "type": {
-          "$ref": "#/$defs/dns-records_type",
-          "description": "Record type."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "comment": {
+              "description": "Exact value of the DNS record comment. This is a convenience alias for `comment.exact`.",
+              "type": "string"
+            },
+            "comment.absent": {
+              "description": "If this parameter is present, only records *without* a comment are returned.",
+              "type": "string"
+            },
+            "comment.contains": {
+              "description": "Substring of the DNS record comment. Comment filters are case-insensitive.",
+              "type": "string"
+            },
+            "comment.endswith": {
+              "description": "Suffix of the DNS record comment. Comment filters are case-insensitive.",
+              "type": "string"
+            },
+            "comment.exact": {
+              "description": "Exact value of the DNS record comment. Comment filters are case-insensitive.",
+              "type": "string"
+            },
+            "comment.present": {
+              "description": "If this parameter is present, only records *with* a comment are returned.",
+              "type": "string"
+            },
+            "comment.startswith": {
+              "description": "Prefix of the DNS record comment. Comment filters are case-insensitive.",
+              "type": "string"
+            },
+            "content": {
+              "description": "Exact value of the DNS record content. This is a convenience alias for `content.exact`.",
+              "type": "string"
+            },
+            "content.contains": {
+              "description": "Substring of the DNS record content. Content filters are case-insensitive.",
+              "type": "string"
+            },
+            "content.endswith": {
+              "description": "Suffix of the DNS record content. Content filters are case-insensitive.",
+              "type": "string"
+            },
+            "content.exact": {
+              "description": "Exact value of the DNS record content. Content filters are case-insensitive.",
+              "type": "string"
+            },
+            "content.startswith": {
+              "description": "Prefix of the DNS record content. Content filters are case-insensitive.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Direction to order DNS records in.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "include_shadow_metadata": {
+              "default": false,
+              "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).",
+              "type": "boolean"
+            },
+            "match": {
+              "default": "all",
+              "description": "Whether to match all search requirements or at least one (any). If set to `all`, acts like a logical AND between filters. If set to `any`, acts like a logical OR instead. Note that the interaction between tag filters is controlled by the `tag-match` parameter instead.",
+              "enum": [
+                "any",
+                "all"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Exact value of the DNS record name. This is a convenience alias for `name.exact`.",
+              "type": "string"
+            },
+            "name.contains": {
+              "description": "Substring of the DNS record name. Name filters are case-insensitive.",
+              "type": "string"
+            },
+            "name.endswith": {
+              "description": "Suffix of the DNS record name. Name filters are case-insensitive.",
+              "type": "string"
+            },
+            "name.exact": {
+              "description": "Exact value of the DNS record name. Name filters are case-insensitive.",
+              "type": "string"
+            },
+            "name.startswith": {
+              "description": "Prefix of the DNS record name. Name filters are case-insensitive.",
+              "type": "string"
+            },
+            "order": {
+              "default": "type",
+              "description": "Field to order DNS records by.",
+              "enum": [
+                "type",
+                "name",
+                "content",
+                "ttl",
+                "proxied"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of DNS records per page.",
+              "type": "number"
+            },
+            "proxied": {
+              "default": false,
+              "description": "Whether the record is receiving the performance and security benefits of Cloudflare.",
+              "type": "boolean"
+            },
+            "search": {
+              "description": "Allows searching in multiple properties of a DNS record simultaneously. This parameter is intended for human users, not automation. Its exact behavior is intentionally left unspecified and is subject to change in the future. This parameter works independently of the `match` setting. For automated searches, please use the other available parameters.",
+              "type": "string"
+            },
+            "shadowed_by_name": {
+              "description": "Filters the response to records at or below the specified NS delegation name. NS, DS, and NSEC records at the delegation name are excluded because they are not shadowed by that delegation. Those record types are included only when they exist below the delegation. The value must be a non-apex subdomain of the zone. Requires `include_shadow_metadata=true`. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).",
+              "type": "string"
+            },
+            "shadowing_name": {
+              "description": "Returns NS records that shadow the given name, searching at the name itself and each of its ancestor names within the zone, excluding the zone apex. The value must be a subdomain of the zone; the zone apex is not accepted. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).",
+              "type": "string"
+            },
+            "tag": {
+              "description": "Condition on the DNS record tag.\n\nParameter values can be of the form `<tag-name>:<tag-value>` to search for an exact `name:value` pair, or just `<tag-name>` to search for records with a specific tag name regardless of its value.\n\nThis is a convenience shorthand for the more powerful `tag.<predicate>` parameters.\nExamples:\n- `tag=important` is equivalent to `tag.present=important`\n- `tag=team:DNS` is equivalent to `tag.exact=team:DNS`",
+              "type": "string"
+            },
+            "tag.absent": {
+              "description": "Name of a tag which must *not* be present on the DNS record. Tag filters are case-insensitive.",
+              "type": "string"
+            },
+            "tag.contains": {
+              "description": "A tag and value, of the form `<tag-name>:<tag-value>`. The API will only return DNS records that have a tag named `<tag-name>` whose value contains `<tag-value>`. Tag filters are case-insensitive.",
+              "type": "string"
+            },
+            "tag.endswith": {
+              "description": "A tag and value, of the form `<tag-name>:<tag-value>`. The API will only return DNS records that have a tag named `<tag-name>` whose value ends with `<tag-value>`. Tag filters are case-insensitive.",
+              "type": "string"
+            },
+            "tag.exact": {
+              "description": "A tag and value, of the form `<tag-name>:<tag-value>`. The API will only return DNS records that have a tag named `<tag-name>` whose value is `<tag-value>`. Tag filters are case-insensitive.",
+              "type": "string"
+            },
+            "tag.present": {
+              "description": "Name of a tag which must be present on the DNS record. Tag filters are case-insensitive.",
+              "type": "string"
+            },
+            "tag.startswith": {
+              "description": "A tag and value, of the form `<tag-name>:<tag-value>`. The API will only return DNS records that have a tag named `<tag-name>` whose value starts with `<tag-value>`. Tag filters are case-insensitive.",
+              "type": "string"
+            },
+            "tag_match": {
+              "default": "all",
+              "description": "Whether to match all tag search requirements or at least one (any). If set to `all`, acts like a logical AND between tag filters. If set to `any`, acts like a logical OR instead. Note that the regular `match` parameter is still used to combine the resulting condition with other filters that aren't related to tags.",
+              "enum": [
+                "any",
+                "all"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "description": "Record type.",
+              "enum": [
+                "A",
+                "AAAA",
+                "CAA",
+                "CERT",
+                "CNAME",
+                "DNSKEY",
+                "DS",
+                "HTTPS",
+                "LOC",
+                "MX",
+                "NAPTR",
+                "NS",
+                "OPENPGPKEY",
+                "PTR",
+                "SMIMEA",
+                "SRV",
+                "SSHFP",
+                "SVCB",
+                "TLSA",
+                "TXT",
+                "URI"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dns-records_direction": dns_records_direction,
-        "dns-records_identifier": dns_records_identifier,
-        "dns-records_match": dns_records_match,
-        "dns-records_order": dns_records_order,
-        "dns-records_page": dns_records_page,
-        "dns-records_per_page": dns_records_per_page,
-        "dns-records_proxied": dns_records_proxied,
-        "dns-records_search": dns_records_search,
-        "dns-records_tag_match": dns_records_tag_match,
-        "dns-records_type": dns_records_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_collection",
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-collection": dns_records_api_response_collection_output,
-        "dns-records_api-response-common": dns_records_api_response_common_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_collection": dns_records_dns_response_collection_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-collection": dns$$records_api$$response$$collection,
+        "dns-records_api-response-common": dns$$records_api$$response$$common,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_collection": dns$$records_dns_response_collection,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     annotations: {
@@ -1257,147 +1282,142 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-collection": dns_records_api_response_collection_output,
-        "dns-records_api-response-common": dns_records_api_response_common_output,
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_collection": dns_records_dns_response_collection_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-collection": dns$$records_api$$response$$collection,
+        "dns-records_api-response-common": dns$$records_api$$response$$common,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_collection": dns$$records_dns_response_collection,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/dns_records`,
       query: [
-        ["name", args["name"], true],
-        ["name.exact", args["name_exact"], true],
-        ["name.contains", args["name_contains"], true],
-        ["name.startswith", args["name_startswith"], true],
-        ["name.endswith", args["name_endswith"], true],
-        ["type", args["type"], true],
-        ["content", args["content"], true],
-        ["content.exact", args["content_exact"], true],
-        ["content.contains", args["content_contains"], true],
-        ["content.startswith", args["content_startswith"], true],
-        ["content.endswith", args["content_endswith"], true],
-        ["proxied", args["proxied"], true],
-        ["match", args["match"], true],
-        ["comment", args["comment"], true],
-        ["comment.present", args["comment_present"], true],
-        ["comment.absent", args["comment_absent"], true],
-        ["comment.exact", args["comment_exact"], true],
-        ["comment.contains", args["comment_contains"], true],
-        ["comment.startswith", args["comment_startswith"], true],
-        ["comment.endswith", args["comment_endswith"], true],
-        ["tag", args["tag"], true],
-        ["tag.present", args["tag_present"], true],
-        ["tag.absent", args["tag_absent"], true],
-        ["tag.exact", args["tag_exact"], true],
-        ["tag.contains", args["tag_contains"], true],
-        ["tag.startswith", args["tag_startswith"], true],
-        ["tag.endswith", args["tag_endswith"], true],
-        ["search", args["search"], true],
-        ["tag_match", args["tag_match"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["include_shadow_metadata", args["include_shadow_metadata"], true],
-        ["shadowed_by_name", args["shadowed_by_name"], true],
-        ["shadowing_name", args["shadowing_name"], true],
+        ["name", param(args, "query", "name"), true],
+        ["name.exact", param(args, "query", "name.exact"), true],
+        ["name.contains", param(args, "query", "name.contains"), true],
+        ["name.startswith", param(args, "query", "name.startswith"), true],
+        ["name.endswith", param(args, "query", "name.endswith"), true],
+        ["type", param(args, "query", "type"), true],
+        ["content", param(args, "query", "content"), true],
+        ["content.exact", param(args, "query", "content.exact"), true],
+        ["content.contains", param(args, "query", "content.contains"), true],
+        ["content.startswith", param(args, "query", "content.startswith"), true],
+        ["content.endswith", param(args, "query", "content.endswith"), true],
+        ["proxied", param(args, "query", "proxied"), true],
+        ["match", param(args, "query", "match"), true],
+        ["comment", param(args, "query", "comment"), true],
+        ["comment.present", param(args, "query", "comment.present"), true],
+        ["comment.absent", param(args, "query", "comment.absent"), true],
+        ["comment.exact", param(args, "query", "comment.exact"), true],
+        ["comment.contains", param(args, "query", "comment.contains"), true],
+        ["comment.startswith", param(args, "query", "comment.startswith"), true],
+        ["comment.endswith", param(args, "query", "comment.endswith"), true],
+        ["tag", param(args, "query", "tag"), true],
+        ["tag.present", param(args, "query", "tag.present"), true],
+        ["tag.absent", param(args, "query", "tag.absent"), true],
+        ["tag.exact", param(args, "query", "tag.exact"), true],
+        ["tag.contains", param(args, "query", "tag.contains"), true],
+        ["tag.startswith", param(args, "query", "tag.startswith"), true],
+        ["tag.endswith", param(args, "query", "tag.endswith"), true],
+        ["search", param(args, "query", "search"), true],
+        ["tag_match", param(args, "query", "tag_match"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["include_shadow_metadata", param(args, "query", "include_shadow_metadata"), true],
+        ["shadowed_by_name", param(args, "query", "shadowed_by_name"), true],
+        ["shadowing_name", param(args, "query", "shadowing_name"), true],
       ],
     }),
   },
   {
-    name: "dns_records_scan_list",
+    name: "dns_records_scanList",
     title: "List Scanned DNS Records",
-    description: "Retrieves the list of DNS records discovered up to this point by the asynchronous scan. These records are temporary until explicitly accepted or rejected via `POST /scan/review`. Additional records may be discovered by the scan later.",
+    description: "Retrieves the list of DNS records discovered up to this point by the asynchronous scan. These records are temporary until explicitly accepted or rejected via `POST /scan/review`. Additional records may be discovered by the scan later.\n\nGET /zones/{zone_id}/dns_records/scan/review",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dns-records_identifier": dns_records_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_collection",
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-collection": dns_records_api_response_collection_output,
-        "dns-records_api-response-common": dns_records_api_response_common_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_collection": dns_records_dns_response_collection_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-collection": dns$$records_api$$response$$collection,
+        "dns-records_api-response-common": dns$$records_api$$response$$common,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_collection": dns$$records_dns_response_collection,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     annotations: {
@@ -1436,44 +1456,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-collection": dns_records_api_response_collection_output,
-        "dns-records_api-response-common": dns_records_api_response_common_output,
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_collection": dns_records_dns_response_collection_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-collection": dns$$records_api$$response$$collection,
+        "dns-records_api-response-common": dns$$records_api$$response$$common,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_collection": dns$$records_dns_response_collection,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     request: (args) => ({
@@ -1481,103 +1495,101 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_records_scan_review",
+    name: "dns_records_scanReview",
     title: "Review Scanned DNS Records",
-    description: "Accept or reject DNS records found by the DNS records scan. Accepted records will be permanently added to the zone, while rejected records will be permanently deleted.",
+    description: "Accept or reject DNS records found by the DNS records scan. Accepted records will be permanently added to the zone, while rejected records will be permanently deleted.\n\nPOST /zones/{zone_id}/dns_records/scan/review",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/dns-records_dns-request-review-scan-object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord,
-        "dns-records_ARecord": dns_records_ARecord,
-        "dns-records_CAARecord": dns_records_CAARecord,
-        "dns-records_CERTRecord": dns_records_CERTRecord,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord,
-        "dns-records_DSRecord": dns_records_DSRecord,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord,
-        "dns-records_LOCRecord": dns_records_LOCRecord,
-        "dns-records_MXRecord": dns_records_MXRecord,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord,
-        "dns-records_NSRecord": dns_records_NSRecord,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord,
-        "dns-records_PTRRecord": dns_records_PTRRecord,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord,
-        "dns-records_SRVRecord": dns_records_SRVRecord,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord,
-        "dns-records_TLSARecord": dns_records_TLSARecord,
-        "dns-records_TXTRecord": dns_records_TXTRecord,
-        "dns-records_URIRecord": dns_records_URIRecord,
-        "dns-records_comment": dns_records_comment,
-        "dns-records_dns-record-patch": dns_records_dns_record_patch,
-        "dns-records_dns-record-scan-batch-accept": dns_records_dns_record_scan_batch_accept,
-        "dns-records_dns-record-scan-batch-reject": dns_records_dns_record_scan_batch_reject,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data,
-        "dns-records_dns-request-review-scan-object": dns_records_dns_request_review_scan_object,
-        "dns-records_identifier": dns_records_identifier,
-        "dns-records_name": dns_records_name,
-        "dns-records_priority": dns_records_priority,
-        "dns-records_proxied": dns_records_proxied,
-        "dns-records_settings": dns_records_settings,
-        "dns-records_tags": dns_records_tags,
-        "dns-records_ttl": dns_records_ttl,
+        "dns-records_AAAARecord": dns$$records_AAAARecord$,
+        "dns-records_ARecord": dns$$records_ARecord$,
+        "dns-records_CAARecord": dns$$records_CAARecord$,
+        "dns-records_CERTRecord": dns$$records_CERTRecord$,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord$,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord$,
+        "dns-records_DSRecord": dns$$records_DSRecord$,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord$,
+        "dns-records_LOCRecord": dns$$records_LOCRecord$,
+        "dns-records_MXRecord": dns$$records_MXRecord$,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord$,
+        "dns-records_NSRecord": dns$$records_NSRecord$,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord$,
+        "dns-records_PTRRecord": dns$$records_PTRRecord$,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord$,
+        "dns-records_SRVRecord": dns$$records_SRVRecord$,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord$,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord$,
+        "dns-records_TLSARecord": dns$$records_TLSARecord$,
+        "dns-records_TXTRecord": dns$$records_TXTRecord$,
+        "dns-records_URIRecord": dns$$records_URIRecord$,
+        "dns-records_dns-record-patch": dns$$records_dns$$record$$patch,
+        "dns-records_dns-record-scan-batch-accept": dns$$records_dns$$record$$scan$$batch$$accept,
+        "dns-records_dns-record-scan-batch-reject": dns$$records_dns$$record$$scan$$batch$$reject,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields$,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data$,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data$,
+        "dns-records_dns-request-review-scan-object": dns$$records_dns$$request$$review$$scan$$object,
+        "dns-records_settings": dns$$records_settings$,
+        "dns-records_tags": dns$$records_tags$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_review_scan",
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns-response-review-scan-object": dns_records_dns_response_review_scan_object_output,
-        "dns-records_dns_response_review_scan": dns_records_dns_response_review_scan_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns-response-review-scan-object": dns$$records_dns$$response$$review$$scan$$object,
+        "dns-records_dns_response_review_scan": dns$$records_dns_response_review_scan,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     annotations: {
@@ -1615,44 +1627,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns-response-review-scan-object": dns_records_dns_response_review_scan_object_output,
-        "dns-records_dns_response_review_scan": dns_records_dns_response_review_scan_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns-response-review-scan-object": dns$$records_dns$$response$$review$$scan$$object,
+        "dns-records_dns_response_review_scan": dns$$records_dns_response_review_scan,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     request: (args) => ({
@@ -1661,29 +1667,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_records_scan_trigger",
+    name: "dns_records_scanTrigger",
     title: "Trigger DNS Record Scan",
-    description: "Initiates an asynchronous scan for common DNS records on your domain. Note that this **does not** automatically add records to your zone. The scan runs in the background, and results can be reviewed later using the `/scan/review` endpoints. Useful if you haven't updated your nameservers yet.",
+    description: "Initiates an asynchronous scan for common DNS records on your domain. Note that this **does not** automatically add records to your zone. The scan runs in the background, and results can be reviewed later using the `/scan/review` endpoints. Useful if you haven't updated your nameservers yet.\n\nPOST /zones/{zone_id}/dns_records/scan/trigger",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "dns-records_identifier": dns_records_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_trigger_scan",
       $defs: {
-        "dns-records_dns_response_trigger_scan": dns_records_dns_response_trigger_scan_output,
-        "dns-records_messages": dns_records_messages_output,
+        "dns-records_dns_response_trigger_scan": dns$$records_dns_response_trigger_scan,
+        "dns-records_messages": dns$$records_messages,
       },
     },
     annotations: {
@@ -1721,9 +1734,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_dns_response_trigger_scan": dns_records_dns_response_trigger_scan_output,
-        "dns-records_messages": dns_records_messages_output,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_dns_response_trigger_scan": dns$$records_dns_response_trigger_scan,
+        "dns-records_messages": dns$$records_messages,
       },
     },
     request: (args) => ({
@@ -1733,107 +1746,111 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_records_update",
     title: "Overwrite DNS Record",
-    description: "Overwrite an existing DNS record.\n\nNotes:\n- A/AAAA records cannot exist on the same name as CNAME records.\n- NS records cannot exist on the same name as any other record type.\n- Domain names are always represented in Punycode, even if Unicode\n  characters were used when creating the record.",
+    description: "Overwrite an existing DNS record.\n\nNotes:\n- A/AAAA records cannot exist on the same name as CNAME records.\n- NS records cannot exist on the same name as any other record type.\n- Domain names are always represented in Punycode, even if Unicode\n  characters were used when creating the record.\n\nPUT /zones/{zone_id}/dns_records/{dns_record_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/dns-records_dns-record-post"
         },
-        "dns_record_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
-        },
-        "include_shadow_metadata": {
-          "default": false,
-          "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).\n",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dns_record_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "dns_record_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_shadow_metadata": {
+              "default": false,
+              "description": "Whether to include shadow metadata in the `meta` field of each record in the response. See [Shadowed records](https://developers.cloudflare.com/dns/manage-dns-records/reference/shadowed-records).",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "dns_record_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord,
-        "dns-records_ARecord": dns_records_ARecord,
-        "dns-records_CAARecord": dns_records_CAARecord,
-        "dns-records_CERTRecord": dns_records_CERTRecord,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord,
-        "dns-records_DSRecord": dns_records_DSRecord,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord,
-        "dns-records_LOCRecord": dns_records_LOCRecord,
-        "dns-records_MXRecord": dns_records_MXRecord,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord,
-        "dns-records_NSRecord": dns_records_NSRecord,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord,
-        "dns-records_PTRRecord": dns_records_PTRRecord,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord,
-        "dns-records_SRVRecord": dns_records_SRVRecord,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord,
-        "dns-records_TLSARecord": dns_records_TLSARecord,
-        "dns-records_TXTRecord": dns_records_TXTRecord,
-        "dns-records_URIRecord": dns_records_URIRecord,
-        "dns-records_comment": dns_records_comment,
-        "dns-records_dns-record-post": dns_records_dns_record_post,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data,
-        "dns-records_identifier": dns_records_identifier,
-        "dns-records_name": dns_records_name,
-        "dns-records_priority": dns_records_priority,
-        "dns-records_proxied": dns_records_proxied,
-        "dns-records_settings": dns_records_settings,
-        "dns-records_tags": dns_records_tags,
-        "dns-records_ttl": dns_records_ttl,
+        "dns-records_AAAARecord": dns$$records_AAAARecord$,
+        "dns-records_ARecord": dns$$records_ARecord$,
+        "dns-records_CAARecord": dns$$records_CAARecord$,
+        "dns-records_CERTRecord": dns$$records_CERTRecord$,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord$,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord$,
+        "dns-records_DSRecord": dns$$records_DSRecord$,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord$,
+        "dns-records_LOCRecord": dns$$records_LOCRecord$,
+        "dns-records_MXRecord": dns$$records_MXRecord$,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord$,
+        "dns-records_NSRecord": dns$$records_NSRecord$,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord$,
+        "dns-records_PTRRecord": dns$$records_PTRRecord$,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord$,
+        "dns-records_SRVRecord": dns$$records_SRVRecord$,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord$,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord$,
+        "dns-records_TLSARecord": dns$$records_TLSARecord$,
+        "dns-records_TXTRecord": dns$$records_TXTRecord$,
+        "dns-records_URIRecord": dns$$records_URIRecord$,
+        "dns-records_dns-record-post": dns$$records_dns$$record$$post,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields$,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data$,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data$,
+        "dns-records_settings": dns$$records_settings$,
+        "dns-records_tags": dns$$records_tags$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_single",
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_single": dns_records_dns_response_single_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_single": dns$$records_dns_response_single,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     annotations: {
@@ -1871,49 +1888,43 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_AAAARecord": dns_records_AAAARecord_output,
-        "dns-records_ARecord": dns_records_ARecord_output,
-        "dns-records_CAARecord": dns_records_CAARecord_output,
-        "dns-records_CERTRecord": dns_records_CERTRecord_output,
-        "dns-records_CNAMERecord": dns_records_CNAMERecord_output,
-        "dns-records_DNSKEYRecord": dns_records_DNSKEYRecord_output,
-        "dns-records_DSRecord": dns_records_DSRecord_output,
-        "dns-records_HTTPSRecord": dns_records_HTTPSRecord_output,
-        "dns-records_LOCRecord": dns_records_LOCRecord_output,
-        "dns-records_MXRecord": dns_records_MXRecord_output,
-        "dns-records_NAPTRRecord": dns_records_NAPTRRecord_output,
-        "dns-records_NSRecord": dns_records_NSRecord_output,
-        "dns-records_OPENPGPKEYRecord": dns_records_OPENPGPKEYRecord_output,
-        "dns-records_PTRRecord": dns_records_PTRRecord_output,
-        "dns-records_SMIMEARecord": dns_records_SMIMEARecord_output,
-        "dns-records_SRVRecord": dns_records_SRVRecord_output,
-        "dns-records_SSHFPRecord": dns_records_SSHFPRecord_output,
-        "dns-records_SVCBRecord": dns_records_SVCBRecord_output,
-        "dns-records_TLSARecord": dns_records_TLSARecord_output,
-        "dns-records_TXTRecord": dns_records_TXTRecord_output,
-        "dns-records_URIRecord": dns_records_URIRecord_output,
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_comment": dns_records_comment_output,
-        "dns-records_dns-record-response": dns_records_dns_record_response_output,
-        "dns-records_dns-record-shared-fields": dns_records_dns_record_shared_fields_output,
-        "dns-records_dns-record-with-data": dns_records_dns_record_with_data_output,
-        "dns-records_dns-record-without-data": dns_records_dns_record_without_data_output,
-        "dns-records_dns_response_single": dns_records_dns_response_single_output,
-        "dns-records_identifier": dns_records_identifier_output,
-        "dns-records_messages": dns_records_messages_output,
-        "dns-records_name": dns_records_name_output,
-        "dns-records_priority": dns_records_priority_output,
-        "dns-records_proxied": dns_records_proxied_output,
-        "dns-records_settings": dns_records_settings_output,
-        "dns-records_tags": dns_records_tags_output,
-        "dns-records_ttl": dns_records_ttl_output,
+        "dns-records_AAAARecord": dns$$records_AAAARecord,
+        "dns-records_ARecord": dns$$records_ARecord,
+        "dns-records_CAARecord": dns$$records_CAARecord,
+        "dns-records_CERTRecord": dns$$records_CERTRecord,
+        "dns-records_CNAMERecord": dns$$records_CNAMERecord,
+        "dns-records_DNSKEYRecord": dns$$records_DNSKEYRecord,
+        "dns-records_DSRecord": dns$$records_DSRecord,
+        "dns-records_HTTPSRecord": dns$$records_HTTPSRecord,
+        "dns-records_LOCRecord": dns$$records_LOCRecord,
+        "dns-records_MXRecord": dns$$records_MXRecord,
+        "dns-records_NAPTRRecord": dns$$records_NAPTRRecord,
+        "dns-records_NSRecord": dns$$records_NSRecord,
+        "dns-records_OPENPGPKEYRecord": dns$$records_OPENPGPKEYRecord,
+        "dns-records_PTRRecord": dns$$records_PTRRecord,
+        "dns-records_SMIMEARecord": dns$$records_SMIMEARecord,
+        "dns-records_SRVRecord": dns$$records_SRVRecord,
+        "dns-records_SSHFPRecord": dns$$records_SSHFPRecord,
+        "dns-records_SVCBRecord": dns$$records_SVCBRecord,
+        "dns-records_TLSARecord": dns$$records_TLSARecord,
+        "dns-records_TXTRecord": dns$$records_TXTRecord,
+        "dns-records_URIRecord": dns$$records_URIRecord,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns-record-response": dns$$records_dns$$record$$response,
+        "dns-records_dns-record-shared-fields": dns$$records_dns$$record$$shared$$fields,
+        "dns-records_dns-record-with-data": dns$$records_dns$$record$$with$$data,
+        "dns-records_dns-record-without-data": dns$$records_dns$$record$$without$$data,
+        "dns-records_dns_response_single": dns$$records_dns_response_single,
+        "dns-records_messages": dns$$records_messages,
+        "dns-records_settings": dns$$records_settings,
+        "dns-records_tags": dns$$records_tags,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/dns_records/${pathParam(args, "dns_record_id")}`,
       query: [
-        ["include_shadow_metadata", args["include_shadow_metadata"], true],
+        ["include_shadow_metadata", param(args, "query", "include_shadow_metadata"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/dns/schemas.ts b/src/generated/forge-mcp/dns/schemas.ts
deleted file mode 100644
index 102680812..000000000
--- a/src/generated/forge-mcp/dns/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `dns-records_identifier`.
- */
-export const dns_records_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/settings/account/nameserverSets/outputs.ts b/src/generated/forge-mcp/dns/settings/account/nameserverSets/outputs.ts
index 386e9c3cf..2c7fd7c5f 100644
--- a/src/generated/forge-mcp/dns/settings/account/nameserverSets/outputs.ts
+++ b/src/generated/forge-mcp/dns/settings/account/nameserverSets/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `dns-settings_nameserver-name` in responses.
- */
-export const dns_settings_nameserver_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_nameserver-set-address-groups` in responses.
  */
-export const dns_settings_nameserver_set_address_groups_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$address$$groups: JsonSchema = {
   "items": {
     "enum": [
       "a",
@@ -29,7 +22,7 @@ export const dns_settings_nameserver_set_address_groups_output: JsonSchema = {
 /**
  * The schema of `dns-settings_nameserver-set-advanced-response` in responses.
  */
-export const dns_settings_nameserver_set_advanced_response_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$advanced$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_nameserver-set-response-base"
@@ -64,7 +57,7 @@ export const dns_settings_nameserver_set_advanced_response_output: JsonSchema =
  * The schema of `dns-settings_nameserver-set-advanced-response-member` in
  * responses.
  */
-export const dns_settings_nameserver_set_advanced_response_member_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$advanced$$response$$member: JsonSchema = {
   "properties": {
     "ipv4": {
       "$ref": "#/$defs/dns-settings_nameserver-set-ipv4-addresses"
@@ -79,7 +72,7 @@ export const dns_settings_nameserver_set_advanced_response_member_output: JsonSc
       "$ref": "#/$defs/dns-settings_nameserver-set-address-groups"
     },
     "name": {
-      "$ref": "#/$defs/dns-settings_nameserver-name"
+      "type": "string"
     }
   },
   "required": [
@@ -92,24 +85,10 @@ export const dns_settings_nameserver_set_advanced_response_member_output: JsonSc
   "type": "object"
 };
 
-/**
- * The schema of `dns-settings_nameserver-set-id` in responses.
- */
-export const dns_settings_nameserver_set_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `dns-settings_nameserver-set-ip-set` in responses.
- */
-export const dns_settings_nameserver_set_ip_set_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `dns-settings_nameserver-set-ipv4-addresses` in responses.
  */
-export const dns_settings_nameserver_set_ipv4_addresses_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$ipv4$$addresses: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -120,7 +99,7 @@ export const dns_settings_nameserver_set_ipv4_addresses_output: JsonSchema = {
 /**
  * The schema of `dns-settings_nameserver-set-ipv6-addresses` in responses.
  */
-export const dns_settings_nameserver_set_ipv6_addresses_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$ipv6$$addresses: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -128,17 +107,10 @@ export const dns_settings_nameserver_set_ipv6_addresses_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `dns-settings_nameserver-set-name` in responses.
- */
-export const dns_settings_nameserver_set_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_nameserver-set-response` in responses.
  */
-export const dns_settings_nameserver_set_response_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$response: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/dns-settings_nameserver-set-standard-response"
@@ -152,20 +124,20 @@ export const dns_settings_nameserver_set_response_output: JsonSchema = {
 /**
  * The schema of `dns-settings_nameserver-set-response-base` in responses.
  */
-export const dns_settings_nameserver_set_response_base_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$response$$base: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/dns-settings_nameserver-set-id"
+      "type": "string"
     },
     "ip_set": {
-      "$ref": "#/$defs/dns-settings_nameserver-set-ip-set"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/dns-settings_nameserver-set-name"
+      "type": "string"
     }
   },
   "required": [
@@ -180,7 +152,7 @@ export const dns_settings_nameserver_set_response_base_output: JsonSchema = {
 /**
  * The schema of `dns-settings_nameserver-set-response-member` in responses.
  */
-export const dns_settings_nameserver_set_response_member_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$response$$member: JsonSchema = {
   "properties": {
     "ipv4": {
       "$ref": "#/$defs/dns-settings_nameserver-set-ipv4-addresses"
@@ -189,7 +161,7 @@ export const dns_settings_nameserver_set_response_member_output: JsonSchema = {
       "$ref": "#/$defs/dns-settings_nameserver-set-ipv6-addresses"
     },
     "name": {
-      "$ref": "#/$defs/dns-settings_nameserver-name"
+      "type": "string"
     }
   },
   "required": [
@@ -203,7 +175,7 @@ export const dns_settings_nameserver_set_response_member_output: JsonSchema = {
 /**
  * The schema of `dns-settings_nameserver-set-standard-response` in responses.
  */
-export const dns_settings_nameserver_set_standard_response_output: JsonSchema = {
+export const dns$$settings_nameserver$$set$$standard$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_nameserver-set-response-base"
@@ -237,7 +209,7 @@ export const dns_settings_nameserver_set_standard_response_output: JsonSchema =
 /**
  * The schema of `dns-settings_nameserver_set_delete_response` in responses.
  */
-export const dns_settings_nameserver_set_delete_response_output: JsonSchema = {
+export const dns$$settings_nameserver_set_delete_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_api-response-single"
@@ -247,7 +219,7 @@ export const dns_settings_nameserver_set_delete_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/dns-settings_nameserver-set-id"
+              "type": "string"
             }
           },
           "required": [
@@ -267,7 +239,7 @@ export const dns_settings_nameserver_set_delete_response_output: JsonSchema = {
 /**
  * The schema of `dns-settings_nameserver_set_response_collection` in responses.
  */
-export const dns_settings_nameserver_set_response_collection_output: JsonSchema = {
+export const dns$$settings_nameserver_set_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_api-response-collection"
@@ -292,7 +264,7 @@ export const dns_settings_nameserver_set_response_collection_output: JsonSchema
 /**
  * The schema of `dns-settings_nameserver_set_response_single` in responses.
  */
-export const dns_settings_nameserver_set_response_single_output: JsonSchema = {
+export const dns$$settings_nameserver_set_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_api-response-single"
diff --git a/src/generated/forge-mcp/dns/settings/account/nameserverSets/schemas.ts b/src/generated/forge-mcp/dns/settings/account/nameserverSets/schemas.ts
index d46ce88e1..f4a25f739 100644
--- a/src/generated/forge-mcp/dns/settings/account/nameserverSets/schemas.ts
+++ b/src/generated/forge-mcp/dns/settings/account/nameserverSets/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `dns-settings_nameserver-name`.
- */
-export const dns_settings_nameserver_name: JsonSchema = {
-  "description": "A unique lowercase Punycode nameserver name within the set.",
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_nameserver-set-create`.
  */
-export const dns_settings_nameserver_set_create: JsonSchema = {
+export const dns$$settings_nameserver$$set$$create: JsonSchema = {
   "properties": {
     "advanced": {
       "default": false,
@@ -22,13 +14,13 @@ export const dns_settings_nameserver_set_create: JsonSchema = {
       "type": "boolean"
     },
     "ip_set": {
-      "$ref": "#/$defs/dns-settings_nameserver-set-ip-set",
       "default": 1,
-      "description": "Selects the account-specific IP set that supplies the nameserver addresses. Nameserver sets with the same `ip_set` and `advanced` value may reuse addresses; otherwise, they use disjoint address groups."
+      "description": "Selects the account-specific IP set that supplies the nameserver addresses. Nameserver sets with the same `ip_set` and `advanced` value may reuse addresses; otherwise, they use disjoint address groups.",
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/dns-settings_nameserver-set-name",
-      "description": "Customer-defined name, unique within the account by exact string equality (case-sensitive, with no Unicode normalization). Must be valid UTF-8 and at most 255 UTF-8 bytes, not 255 characters. Only graphical Unicode characters are allowed; leading or trailing whitespace is rejected. The name can be changed without changing the set's nameservers or addresses."
+      "description": "Customer-defined name, unique within the account by exact string equality (case-sensitive, with no Unicode normalization). Must be valid UTF-8 and at most 255 UTF-8 bytes, not 255 characters. Only graphical Unicode characters are allowed; leading or trailing whitespace is rejected. The name can be changed without changing the set's nameservers or addresses.",
+      "type": "string"
     },
     "nameservers": {
       "description": "Lists each nameserver and the number of addresses to allocate to it. Requires a unique name for each entry in the set.",
@@ -50,16 +42,16 @@ export const dns_settings_nameserver_set_create: JsonSchema = {
 /**
  * The schema of `dns-settings_nameserver-set-create-member`.
  */
-export const dns_settings_nameserver_set_create_member: JsonSchema = {
+export const dns$$settings_nameserver$$set$$create$$member: JsonSchema = {
   "properties": {
     "ip_count": {
-      "$ref": "#/$defs/dns-settings_nameserver-set-ip-count",
       "default": 1,
-      "description": "Number of IPv4 addresses and number of IPv6 addresses to allocate to this nameserver. All nameservers in an Advanced nameserver set must use the same value."
+      "description": "Number of IPv4 addresses and number of IPv6 addresses to allocate to this nameserver. All nameservers in an Advanced nameserver set must use the same value.",
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/dns-settings_nameserver-name",
-      "description": "A unique lowercase Punycode nameserver name within the set."
+      "description": "A unique lowercase Punycode nameserver name within the set.",
+      "type": "string"
     }
   },
   "required": [
@@ -68,47 +60,15 @@ export const dns_settings_nameserver_set_create_member: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-settings_nameserver-set-id`.
- */
-export const dns_settings_nameserver_set_id: JsonSchema = {
-  "description": "Identifier for a nameserver set.",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-settings_nameserver-set-ip-count`.
- */
-export const dns_settings_nameserver_set_ip_count: JsonSchema = {
-  "description": "Number of IPv4 addresses and number of IPv6 addresses to allocate to this nameserver. All nameservers in an Advanced nameserver set must use the same value.",
-  "type": "integer"
-};
-
-/**
- * The schema of `dns-settings_nameserver-set-ip-set`.
- */
-export const dns_settings_nameserver_set_ip_set: JsonSchema = {
-  "description": "Selects the account-specific IP set that supplies the nameserver addresses. Nameserver sets with the same `ip_set` and `advanced` value may reuse addresses; otherwise, they use disjoint address groups.",
-  "type": "integer"
-};
-
-/**
- * The schema of `dns-settings_nameserver-set-name`.
- */
-export const dns_settings_nameserver_set_name: JsonSchema = {
-  "description": "Customer-defined name, unique within the account by exact string equality (case-sensitive, with no Unicode normalization). Must be valid UTF-8 and at most 255 UTF-8 bytes, not 255 characters. Only graphical Unicode characters are allowed; leading or trailing whitespace is rejected. The name can be changed without changing the set's nameservers or addresses.",
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_nameserver-set-patch`.
  */
-export const dns_settings_nameserver_set_patch: JsonSchema = {
+export const dns$$settings_nameserver$$set$$patch: JsonSchema = {
   "description": "Updates only the customer-defined name. All other fields are rejected, even if unchanged. An empty object or the current name succeeds without changing the set. A null name is invalid. Requires the account-scoped creation entitlements, including eligibility for the set's current IP set and the Advanced entitlement for an Advanced set.",
   "properties": {
     "name": {
-      "$ref": "#/$defs/dns-settings_nameserver-set-name",
-      "description": "Customer-defined name, unique within the account by exact string equality (case-sensitive, with no Unicode normalization). Must be valid UTF-8 and at most 255 UTF-8 bytes, not 255 characters. Only graphical Unicode characters are allowed; leading or trailing whitespace is rejected. The name can be changed without changing the set's nameservers or addresses."
+      "description": "Customer-defined name, unique within the account by exact string equality (case-sensitive, with no Unicode normalization). Must be valid UTF-8 and at most 255 UTF-8 bytes, not 255 characters. Only graphical Unicode characters are allowed; leading or trailing whitespace is rejected. The name can be changed without changing the set's nameservers or addresses.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/dns/settings/account/nameserverSets/tools.ts b/src/generated/forge-mcp/dns/settings/account/nameserverSets/tools.ts
index e54f741a6..b0e378187 100644
--- a/src/generated/forge-mcp/dns/settings/account/nameserverSets/tools.ts
+++ b/src/generated/forge-mcp/dns/settings/account/nameserverSets/tools.ts
@@ -1,96 +1,87 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  dns_settings_api_response_collection_output,
-  dns_settings_api_response_common_failure_output,
-  dns_settings_api_response_common_output,
-  dns_settings_api_response_single_output,
-  dns_settings_messages_output,
+  dns$$settings_api$$response$$collection,
+  dns$$settings_api$$response$$common,
+  dns$$settings_api$$response$$common$$failure,
+  dns$$settings_api$$response$$single,
+  dns$$settings_messages,
 } from "../outputs.js";
-import { dns_settings_identifier, dns_settings_page } from "../schemas.js";
 import {
-  dns_settings_nameserver_name_output,
-  dns_settings_nameserver_set_address_groups_output,
-  dns_settings_nameserver_set_advanced_response_member_output,
-  dns_settings_nameserver_set_advanced_response_output,
-  dns_settings_nameserver_set_delete_response_output,
-  dns_settings_nameserver_set_id_output,
-  dns_settings_nameserver_set_ip_set_output,
-  dns_settings_nameserver_set_ipv4_addresses_output,
-  dns_settings_nameserver_set_ipv6_addresses_output,
-  dns_settings_nameserver_set_name_output,
-  dns_settings_nameserver_set_response_base_output,
-  dns_settings_nameserver_set_response_collection_output,
-  dns_settings_nameserver_set_response_member_output,
-  dns_settings_nameserver_set_response_output,
-  dns_settings_nameserver_set_response_single_output,
-  dns_settings_nameserver_set_standard_response_output,
+  dns$$settings_nameserver$$set$$address$$groups,
+  dns$$settings_nameserver$$set$$advanced$$response,
+  dns$$settings_nameserver$$set$$advanced$$response$$member,
+  dns$$settings_nameserver$$set$$ipv4$$addresses,
+  dns$$settings_nameserver$$set$$ipv6$$addresses,
+  dns$$settings_nameserver$$set$$response,
+  dns$$settings_nameserver$$set$$response$$base,
+  dns$$settings_nameserver$$set$$response$$member,
+  dns$$settings_nameserver$$set$$standard$$response,
+  dns$$settings_nameserver_set_delete_response,
+  dns$$settings_nameserver_set_response_collection,
+  dns$$settings_nameserver_set_response_single,
 } from "./outputs.js";
 import {
-  dns_settings_nameserver_name,
-  dns_settings_nameserver_set_create,
-  dns_settings_nameserver_set_create_member,
-  dns_settings_nameserver_set_id,
-  dns_settings_nameserver_set_ip_count,
-  dns_settings_nameserver_set_ip_set,
-  dns_settings_nameserver_set_name,
-  dns_settings_nameserver_set_patch,
+  dns$$settings_nameserver$$set$$create,
+  dns$$settings_nameserver$$set$$create$$member,
+  dns$$settings_nameserver$$set$$patch,
 } from "./schemas.js";
 
 /**
- * The tools of `dns.settings.account.nameserver_sets`.
+ * The tools of `dns.settings.account.nameserverSets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_settings_account_nameserver_sets_create",
+    name: "dns_settings_account_nameserverSets_create",
     title: "Create Custom Nameserver Set",
-    description: "Creates a named Custom Nameserver Set. Only the customer-defined name can be changed later. To change nameservers or addresses, create a new set, move any zone assignments, and delete the old set. For details, refer to [Nameserver sets](https://developers.cloudflare.com/dns/nameservers/custom-nameservers/nameserver-sets/).\n\nThis method is beta.",
+    description: "Creates a named Custom Nameserver Set. Only the customer-defined name can be changed later. To change nameservers or addresses, create a new set, move any zone assignments, and delete the old set. For details, refer to [Nameserver sets](https://developers.cloudflare.com/dns/nameservers/custom-nameservers/nameserver-sets/).\n\nThis method is beta.\n\nPOST /accounts/{account_id}/dns_settings/nameserver_sets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/dns-settings_nameserver-set-create"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name,
-        "dns-settings_nameserver-set-create": dns_settings_nameserver_set_create,
-        "dns-settings_nameserver-set-create-member": dns_settings_nameserver_set_create_member,
-        "dns-settings_nameserver-set-ip-count": dns_settings_nameserver_set_ip_count,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name,
+        "dns-settings_nameserver-set-create": dns$$settings_nameserver$$set$$create,
+        "dns-settings_nameserver-set-create-member": dns$$settings_nameserver$$set$$create$$member,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_nameserver_set_response_single",
       $defs: {
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name_output,
-        "dns-settings_nameserver-set-address-groups": dns_settings_nameserver_set_address_groups_output,
-        "dns-settings_nameserver-set-advanced-response": dns_settings_nameserver_set_advanced_response_output,
-        "dns-settings_nameserver-set-advanced-response-member": dns_settings_nameserver_set_advanced_response_member_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set_output,
-        "dns-settings_nameserver-set-ipv4-addresses": dns_settings_nameserver_set_ipv4_addresses_output,
-        "dns-settings_nameserver-set-ipv6-addresses": dns_settings_nameserver_set_ipv6_addresses_output,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name_output,
-        "dns-settings_nameserver-set-response": dns_settings_nameserver_set_response_output,
-        "dns-settings_nameserver-set-response-base": dns_settings_nameserver_set_response_base_output,
-        "dns-settings_nameserver-set-response-member": dns_settings_nameserver_set_response_member_output,
-        "dns-settings_nameserver-set-standard-response": dns_settings_nameserver_set_standard_response_output,
-        "dns-settings_nameserver_set_response_single": dns_settings_nameserver_set_response_single_output,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver-set-address-groups": dns$$settings_nameserver$$set$$address$$groups,
+        "dns-settings_nameserver-set-advanced-response": dns$$settings_nameserver$$set$$advanced$$response,
+        "dns-settings_nameserver-set-advanced-response-member": dns$$settings_nameserver$$set$$advanced$$response$$member,
+        "dns-settings_nameserver-set-ipv4-addresses": dns$$settings_nameserver$$set$$ipv4$$addresses,
+        "dns-settings_nameserver-set-ipv6-addresses": dns$$settings_nameserver$$set$$ipv6$$addresses,
+        "dns-settings_nameserver-set-response": dns$$settings_nameserver$$set$$response,
+        "dns-settings_nameserver-set-response-base": dns$$settings_nameserver$$set$$response$$base,
+        "dns-settings_nameserver-set-response-member": dns$$settings_nameserver$$set$$response$$member,
+        "dns-settings_nameserver-set-standard-response": dns$$settings_nameserver$$set$$standard$$response,
+        "dns-settings_nameserver_set_response_single": dns$$settings_nameserver_set_response_single,
       },
     },
     annotations: {
@@ -120,23 +111,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name_output,
-        "dns-settings_nameserver-set-address-groups": dns_settings_nameserver_set_address_groups_output,
-        "dns-settings_nameserver-set-advanced-response": dns_settings_nameserver_set_advanced_response_output,
-        "dns-settings_nameserver-set-advanced-response-member": dns_settings_nameserver_set_advanced_response_member_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set_output,
-        "dns-settings_nameserver-set-ipv4-addresses": dns_settings_nameserver_set_ipv4_addresses_output,
-        "dns-settings_nameserver-set-ipv6-addresses": dns_settings_nameserver_set_ipv6_addresses_output,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name_output,
-        "dns-settings_nameserver-set-response": dns_settings_nameserver_set_response_output,
-        "dns-settings_nameserver-set-response-base": dns_settings_nameserver_set_response_base_output,
-        "dns-settings_nameserver-set-response-member": dns_settings_nameserver_set_response_member_output,
-        "dns-settings_nameserver-set-standard-response": dns_settings_nameserver_set_standard_response_output,
-        "dns-settings_nameserver_set_response_single": dns_settings_nameserver_set_response_single_output,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver-set-address-groups": dns$$settings_nameserver$$set$$address$$groups,
+        "dns-settings_nameserver-set-advanced-response": dns$$settings_nameserver$$set$$advanced$$response,
+        "dns-settings_nameserver-set-advanced-response-member": dns$$settings_nameserver$$set$$advanced$$response$$member,
+        "dns-settings_nameserver-set-ipv4-addresses": dns$$settings_nameserver$$set$$ipv4$$addresses,
+        "dns-settings_nameserver-set-ipv6-addresses": dns$$settings_nameserver$$set$$ipv6$$addresses,
+        "dns-settings_nameserver-set-response": dns$$settings_nameserver$$set$$response,
+        "dns-settings_nameserver-set-response-base": dns$$settings_nameserver$$set$$response$$base,
+        "dns-settings_nameserver-set-response-member": dns$$settings_nameserver$$set$$response$$member,
+        "dns-settings_nameserver-set-standard-response": dns$$settings_nameserver$$set$$standard$$response,
+        "dns-settings_nameserver_set_response_single": dns$$settings_nameserver_set_response_single,
       },
     },
     request: (args) => ({
@@ -145,37 +132,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_settings_account_nameserver_sets_delete",
+    name: "dns_settings_account_nameserverSets_delete",
     title: "Delete Custom Nameserver Set",
-    description: "Deletes an unassigned Custom Nameserver Set. For details, refer to [Nameserver sets](https://developers.cloudflare.com/dns/nameservers/custom-nameservers/nameserver-sets/).\n\nThis method is beta.",
+    description: "Deletes an unassigned Custom Nameserver Set. For details, refer to [Nameserver sets](https://developers.cloudflare.com/dns/nameservers/custom-nameservers/nameserver-sets/).\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/dns_settings/nameserver_sets/{nameserver_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
-        "nameserver_set_id": {
-          "$ref": "#/$defs/dns-settings_nameserver-set-id",
-          "description": "Identifier for a nameserver set."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "nameserver_set_id": {
+              "description": "Identifier for a nameserver set.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "nameserver_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "nameserver_set_id"
+        "path"
       ],
-      $defs: {
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_nameserver_set_delete_response",
       $defs: {
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver_set_delete_response": dns_settings_nameserver_set_delete_response_output,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver_set_delete_response": dns$$settings_nameserver_set_delete_response,
       },
     },
     annotations: {
@@ -205,11 +197,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver_set_delete_response": dns_settings_nameserver_set_delete_response_output,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver_set_delete_response": dns$$settings_nameserver_set_delete_response,
       },
     },
     request: (args) => ({
@@ -217,55 +208,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_settings_account_nameserver_sets_edit",
+    name: "dns_settings_account_nameserverSets_edit",
     title: "Update Custom Nameserver Set",
-    description: "Renames a Custom Nameserver Set owned by the account. Only name may be supplied; immutable and unknown fields are rejected even if unchanged. An empty object or the existing name is a successful no-op. Requires the account-scoped creation entitlements for the existing set.\n\nThis method is beta.",
+    description: "Renames a Custom Nameserver Set owned by the account. Only name may be supplied; immutable and unknown fields are rejected even if unchanged. An empty object or the existing name is a successful no-op. Requires the account-scoped creation entitlements for the existing set.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/dns_settings/nameserver_sets/{nameserver_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/dns-settings_nameserver-set-patch"
         },
-        "nameserver_set_id": {
-          "$ref": "#/$defs/dns-settings_nameserver-set-id",
-          "description": "Identifier for a nameserver set."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "nameserver_set_id": {
+              "description": "Identifier for a nameserver set.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "nameserver_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "nameserver_set_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name,
-        "dns-settings_nameserver-set-patch": dns_settings_nameserver_set_patch,
+        "dns-settings_nameserver-set-patch": dns$$settings_nameserver$$set$$patch,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_nameserver_set_response_single",
       $defs: {
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name_output,
-        "dns-settings_nameserver-set-address-groups": dns_settings_nameserver_set_address_groups_output,
-        "dns-settings_nameserver-set-advanced-response": dns_settings_nameserver_set_advanced_response_output,
-        "dns-settings_nameserver-set-advanced-response-member": dns_settings_nameserver_set_advanced_response_member_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set_output,
-        "dns-settings_nameserver-set-ipv4-addresses": dns_settings_nameserver_set_ipv4_addresses_output,
-        "dns-settings_nameserver-set-ipv6-addresses": dns_settings_nameserver_set_ipv6_addresses_output,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name_output,
-        "dns-settings_nameserver-set-response": dns_settings_nameserver_set_response_output,
-        "dns-settings_nameserver-set-response-base": dns_settings_nameserver_set_response_base_output,
-        "dns-settings_nameserver-set-response-member": dns_settings_nameserver_set_response_member_output,
-        "dns-settings_nameserver-set-standard-response": dns_settings_nameserver_set_standard_response_output,
-        "dns-settings_nameserver_set_response_single": dns_settings_nameserver_set_response_single_output,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver-set-address-groups": dns$$settings_nameserver$$set$$address$$groups,
+        "dns-settings_nameserver-set-advanced-response": dns$$settings_nameserver$$set$$advanced$$response,
+        "dns-settings_nameserver-set-advanced-response-member": dns$$settings_nameserver$$set$$advanced$$response$$member,
+        "dns-settings_nameserver-set-ipv4-addresses": dns$$settings_nameserver$$set$$ipv4$$addresses,
+        "dns-settings_nameserver-set-ipv6-addresses": dns$$settings_nameserver$$set$$ipv6$$addresses,
+        "dns-settings_nameserver-set-response": dns$$settings_nameserver$$set$$response,
+        "dns-settings_nameserver-set-response-base": dns$$settings_nameserver$$set$$response$$base,
+        "dns-settings_nameserver-set-response-member": dns$$settings_nameserver$$set$$response$$member,
+        "dns-settings_nameserver-set-standard-response": dns$$settings_nameserver$$set$$standard$$response,
+        "dns-settings_nameserver_set_response_single": dns$$settings_nameserver_set_response_single,
       },
     },
     annotations: {
@@ -298,23 +292,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name_output,
-        "dns-settings_nameserver-set-address-groups": dns_settings_nameserver_set_address_groups_output,
-        "dns-settings_nameserver-set-advanced-response": dns_settings_nameserver_set_advanced_response_output,
-        "dns-settings_nameserver-set-advanced-response-member": dns_settings_nameserver_set_advanced_response_member_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set_output,
-        "dns-settings_nameserver-set-ipv4-addresses": dns_settings_nameserver_set_ipv4_addresses_output,
-        "dns-settings_nameserver-set-ipv6-addresses": dns_settings_nameserver_set_ipv6_addresses_output,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name_output,
-        "dns-settings_nameserver-set-response": dns_settings_nameserver_set_response_output,
-        "dns-settings_nameserver-set-response-base": dns_settings_nameserver_set_response_base_output,
-        "dns-settings_nameserver-set-response-member": dns_settings_nameserver_set_response_member_output,
-        "dns-settings_nameserver-set-standard-response": dns_settings_nameserver_set_standard_response_output,
-        "dns-settings_nameserver_set_response_single": dns_settings_nameserver_set_response_single_output,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver-set-address-groups": dns$$settings_nameserver$$set$$address$$groups,
+        "dns-settings_nameserver-set-advanced-response": dns$$settings_nameserver$$set$$advanced$$response,
+        "dns-settings_nameserver-set-advanced-response-member": dns$$settings_nameserver$$set$$advanced$$response$$member,
+        "dns-settings_nameserver-set-ipv4-addresses": dns$$settings_nameserver$$set$$ipv4$$addresses,
+        "dns-settings_nameserver-set-ipv6-addresses": dns$$settings_nameserver$$set$$ipv6$$addresses,
+        "dns-settings_nameserver-set-response": dns$$settings_nameserver$$set$$response,
+        "dns-settings_nameserver-set-response-base": dns$$settings_nameserver$$set$$response$$base,
+        "dns-settings_nameserver-set-response-member": dns$$settings_nameserver$$set$$response$$member,
+        "dns-settings_nameserver-set-standard-response": dns$$settings_nameserver$$set$$standard$$response,
+        "dns-settings_nameserver_set_response_single": dns$$settings_nameserver_set_response_single,
       },
     },
     request: (args) => ({
@@ -323,49 +313,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_settings_account_nameserver_sets_get",
+    name: "dns_settings_account_nameserverSets_get",
     title: "Get Custom Nameserver Set",
-    description: "Gets a Custom Nameserver Set owned by an account. For details, refer to [Nameserver sets](https://developers.cloudflare.com/dns/nameservers/custom-nameservers/nameserver-sets/).\n\nThis method is beta.",
+    description: "Gets a Custom Nameserver Set owned by an account. For details, refer to [Nameserver sets](https://developers.cloudflare.com/dns/nameservers/custom-nameservers/nameserver-sets/).\n\nThis method is beta.\n\nGET /accounts/{account_id}/dns_settings/nameserver_sets/{nameserver_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
-        "nameserver_set_id": {
-          "$ref": "#/$defs/dns-settings_nameserver-set-id",
-          "description": "Identifier for a nameserver set."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "nameserver_set_id": {
+              "description": "Identifier for a nameserver set.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "nameserver_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "nameserver_set_id"
+        "path"
       ],
-      $defs: {
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_nameserver_set_response_single",
       $defs: {
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name_output,
-        "dns-settings_nameserver-set-address-groups": dns_settings_nameserver_set_address_groups_output,
-        "dns-settings_nameserver-set-advanced-response": dns_settings_nameserver_set_advanced_response_output,
-        "dns-settings_nameserver-set-advanced-response-member": dns_settings_nameserver_set_advanced_response_member_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set_output,
-        "dns-settings_nameserver-set-ipv4-addresses": dns_settings_nameserver_set_ipv4_addresses_output,
-        "dns-settings_nameserver-set-ipv6-addresses": dns_settings_nameserver_set_ipv6_addresses_output,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name_output,
-        "dns-settings_nameserver-set-response": dns_settings_nameserver_set_response_output,
-        "dns-settings_nameserver-set-response-base": dns_settings_nameserver_set_response_base_output,
-        "dns-settings_nameserver-set-response-member": dns_settings_nameserver_set_response_member_output,
-        "dns-settings_nameserver-set-standard-response": dns_settings_nameserver_set_standard_response_output,
-        "dns-settings_nameserver_set_response_single": dns_settings_nameserver_set_response_single_output,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver-set-address-groups": dns$$settings_nameserver$$set$$address$$groups,
+        "dns-settings_nameserver-set-advanced-response": dns$$settings_nameserver$$set$$advanced$$response,
+        "dns-settings_nameserver-set-advanced-response-member": dns$$settings_nameserver$$set$$advanced$$response$$member,
+        "dns-settings_nameserver-set-ipv4-addresses": dns$$settings_nameserver$$set$$ipv4$$addresses,
+        "dns-settings_nameserver-set-ipv6-addresses": dns$$settings_nameserver$$set$$ipv6$$addresses,
+        "dns-settings_nameserver-set-response": dns$$settings_nameserver$$set$$response,
+        "dns-settings_nameserver-set-response-base": dns$$settings_nameserver$$set$$response$$base,
+        "dns-settings_nameserver-set-response-member": dns$$settings_nameserver$$set$$response$$member,
+        "dns-settings_nameserver-set-standard-response": dns$$settings_nameserver$$set$$standard$$response,
+        "dns-settings_nameserver_set_response_single": dns$$settings_nameserver_set_response_single,
       },
     },
     annotations: {
@@ -399,23 +391,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name_output,
-        "dns-settings_nameserver-set-address-groups": dns_settings_nameserver_set_address_groups_output,
-        "dns-settings_nameserver-set-advanced-response": dns_settings_nameserver_set_advanced_response_output,
-        "dns-settings_nameserver-set-advanced-response-member": dns_settings_nameserver_set_advanced_response_member_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set_output,
-        "dns-settings_nameserver-set-ipv4-addresses": dns_settings_nameserver_set_ipv4_addresses_output,
-        "dns-settings_nameserver-set-ipv6-addresses": dns_settings_nameserver_set_ipv6_addresses_output,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name_output,
-        "dns-settings_nameserver-set-response": dns_settings_nameserver_set_response_output,
-        "dns-settings_nameserver-set-response-base": dns_settings_nameserver_set_response_base_output,
-        "dns-settings_nameserver-set-response-member": dns_settings_nameserver_set_response_member_output,
-        "dns-settings_nameserver-set-standard-response": dns_settings_nameserver_set_standard_response_output,
-        "dns-settings_nameserver_set_response_single": dns_settings_nameserver_set_response_single_output,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver-set-address-groups": dns$$settings_nameserver$$set$$address$$groups,
+        "dns-settings_nameserver-set-advanced-response": dns$$settings_nameserver$$set$$advanced$$response,
+        "dns-settings_nameserver-set-advanced-response-member": dns$$settings_nameserver$$set$$advanced$$response$$member,
+        "dns-settings_nameserver-set-ipv4-addresses": dns$$settings_nameserver$$set$$ipv4$$addresses,
+        "dns-settings_nameserver-set-ipv6-addresses": dns$$settings_nameserver$$set$$ipv6$$addresses,
+        "dns-settings_nameserver-set-response": dns$$settings_nameserver$$set$$response,
+        "dns-settings_nameserver-set-response-base": dns$$settings_nameserver$$set$$response$$base,
+        "dns-settings_nameserver-set-response-member": dns$$settings_nameserver$$set$$response$$member,
+        "dns-settings_nameserver-set-standard-response": dns$$settings_nameserver$$set$$standard$$response,
+        "dns-settings_nameserver_set_response_single": dns$$settings_nameserver_set_response_single,
       },
     },
     request: (args) => ({
@@ -423,55 +411,63 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_settings_account_nameserver_sets_list",
+    name: "dns_settings_account_nameserverSets_list",
     title: "List Custom Nameserver Sets",
-    description: "Lists an account's Custom Nameserver Sets. For details, refer to [Nameserver sets](https://developers.cloudflare.com/dns/nameservers/custom-nameservers/nameserver-sets/).\n\nThis method is beta.",
+    description: "Lists an account's Custom Nameserver Sets. For details, refer to [Nameserver sets](https://developers.cloudflare.com/dns/nameservers/custom-nameservers/nameserver-sets/).\n\nThis method is beta.\n\nGET /accounts/{account_id}/dns_settings/nameserver_sets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "$ref": "#/$defs/dns-settings_page",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_page": dns_settings_page,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_nameserver_set_response_collection",
       $defs: {
-        "dns-settings_api-response-collection": dns_settings_api_response_collection_output,
-        "dns-settings_api-response-common": dns_settings_api_response_common_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name_output,
-        "dns-settings_nameserver-set-address-groups": dns_settings_nameserver_set_address_groups_output,
-        "dns-settings_nameserver-set-advanced-response": dns_settings_nameserver_set_advanced_response_output,
-        "dns-settings_nameserver-set-advanced-response-member": dns_settings_nameserver_set_advanced_response_member_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set_output,
-        "dns-settings_nameserver-set-ipv4-addresses": dns_settings_nameserver_set_ipv4_addresses_output,
-        "dns-settings_nameserver-set-ipv6-addresses": dns_settings_nameserver_set_ipv6_addresses_output,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name_output,
-        "dns-settings_nameserver-set-response": dns_settings_nameserver_set_response_output,
-        "dns-settings_nameserver-set-response-base": dns_settings_nameserver_set_response_base_output,
-        "dns-settings_nameserver-set-response-member": dns_settings_nameserver_set_response_member_output,
-        "dns-settings_nameserver-set-standard-response": dns_settings_nameserver_set_standard_response_output,
-        "dns-settings_nameserver_set_response_collection": dns_settings_nameserver_set_response_collection_output,
+        "dns-settings_api-response-collection": dns$$settings_api$$response$$collection,
+        "dns-settings_api-response-common": dns$$settings_api$$response$$common,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver-set-address-groups": dns$$settings_nameserver$$set$$address$$groups,
+        "dns-settings_nameserver-set-advanced-response": dns$$settings_nameserver$$set$$advanced$$response,
+        "dns-settings_nameserver-set-advanced-response-member": dns$$settings_nameserver$$set$$advanced$$response$$member,
+        "dns-settings_nameserver-set-ipv4-addresses": dns$$settings_nameserver$$set$$ipv4$$addresses,
+        "dns-settings_nameserver-set-ipv6-addresses": dns$$settings_nameserver$$set$$ipv6$$addresses,
+        "dns-settings_nameserver-set-response": dns$$settings_nameserver$$set$$response,
+        "dns-settings_nameserver-set-response-base": dns$$settings_nameserver$$set$$response$$base,
+        "dns-settings_nameserver-set-response-member": dns$$settings_nameserver$$set$$response$$member,
+        "dns-settings_nameserver-set-standard-response": dns$$settings_nameserver$$set$$standard$$response,
+        "dns-settings_nameserver_set_response_collection": dns$$settings_nameserver_set_response_collection,
       },
     },
     annotations: {
@@ -505,31 +501,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-collection": dns_settings_api_response_collection_output,
-        "dns-settings_api-response-common": dns_settings_api_response_common_output,
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_nameserver-name": dns_settings_nameserver_name_output,
-        "dns-settings_nameserver-set-address-groups": dns_settings_nameserver_set_address_groups_output,
-        "dns-settings_nameserver-set-advanced-response": dns_settings_nameserver_set_advanced_response_output,
-        "dns-settings_nameserver-set-advanced-response-member": dns_settings_nameserver_set_advanced_response_member_output,
-        "dns-settings_nameserver-set-id": dns_settings_nameserver_set_id_output,
-        "dns-settings_nameserver-set-ip-set": dns_settings_nameserver_set_ip_set_output,
-        "dns-settings_nameserver-set-ipv4-addresses": dns_settings_nameserver_set_ipv4_addresses_output,
-        "dns-settings_nameserver-set-ipv6-addresses": dns_settings_nameserver_set_ipv6_addresses_output,
-        "dns-settings_nameserver-set-name": dns_settings_nameserver_set_name_output,
-        "dns-settings_nameserver-set-response": dns_settings_nameserver_set_response_output,
-        "dns-settings_nameserver-set-response-base": dns_settings_nameserver_set_response_base_output,
-        "dns-settings_nameserver-set-response-member": dns_settings_nameserver_set_response_member_output,
-        "dns-settings_nameserver-set-standard-response": dns_settings_nameserver_set_standard_response_output,
-        "dns-settings_nameserver_set_response_collection": dns_settings_nameserver_set_response_collection_output,
+        "dns-settings_api-response-collection": dns$$settings_api$$response$$collection,
+        "dns-settings_api-response-common": dns$$settings_api$$response$$common,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_nameserver-set-address-groups": dns$$settings_nameserver$$set$$address$$groups,
+        "dns-settings_nameserver-set-advanced-response": dns$$settings_nameserver$$set$$advanced$$response,
+        "dns-settings_nameserver-set-advanced-response-member": dns$$settings_nameserver$$set$$advanced$$response$$member,
+        "dns-settings_nameserver-set-ipv4-addresses": dns$$settings_nameserver$$set$$ipv4$$addresses,
+        "dns-settings_nameserver-set-ipv6-addresses": dns$$settings_nameserver$$set$$ipv6$$addresses,
+        "dns-settings_nameserver-set-response": dns$$settings_nameserver$$set$$response,
+        "dns-settings_nameserver-set-response-base": dns$$settings_nameserver$$set$$response$$base,
+        "dns-settings_nameserver-set-response-member": dns$$settings_nameserver$$set$$response$$member,
+        "dns-settings_nameserver-set-standard-response": dns$$settings_nameserver$$set$$standard$$response,
+        "dns-settings_nameserver_set_response_collection": dns$$settings_nameserver_set_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dns_settings/nameserver_sets`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/dns/settings/account/outputs.ts b/src/generated/forge-mcp/dns/settings/account/outputs.ts
index 0a09ce00a..62f4b9941 100644
--- a/src/generated/forge-mcp/dns/settings/account/outputs.ts
+++ b/src/generated/forge-mcp/dns/settings/account/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dns-settings_account_settings` in responses.
  */
-export const dns_settings_account_settings_output: JsonSchema = {
+export const dns$$settings_account_settings: JsonSchema = {
   "properties": {
     "enforce_dns_only": {
-      "$ref": "#/$defs/dns-settings_enforce_dns_only"
+      "type": "boolean"
     },
     "zone_defaults": {
       "$ref": "#/$defs/dns-settings_dns-settings-account-response"
@@ -24,7 +24,7 @@ export const dns_settings_account_settings_output: JsonSchema = {
 /**
  * The schema of `dns-settings_api-response-collection` in responses.
  */
-export const dns_settings_api_response_collection_output: JsonSchema = {
+export const dns$$settings_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_api-response-common"
@@ -60,7 +60,7 @@ export const dns_settings_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `dns-settings_api-response-common` in responses.
  */
-export const dns_settings_api_response_common_output: JsonSchema = {
+export const dns$$settings_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-settings_messages"
@@ -86,7 +86,7 @@ export const dns_settings_api_response_common_output: JsonSchema = {
 /**
  * The schema of `dns-settings_api-response-common-failure` in responses.
  */
-export const dns_settings_api_response_common_failure_output: JsonSchema = {
+export const dns$$settings_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-settings_messages"
@@ -116,7 +116,7 @@ export const dns_settings_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `dns-settings_api-response-single` in responses.
  */
-export const dns_settings_api_response_single_output: JsonSchema = {
+export const dns$$settings_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-settings_messages"
@@ -142,7 +142,7 @@ export const dns_settings_api_response_single_output: JsonSchema = {
 /**
  * The schema of `dns-settings_dns-settings-account-response` in responses.
  */
-export const dns_settings_dns_settings_account_response_output: JsonSchema = {
+export const dns$$settings_dns$$settings$$account$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_dns-settings-response"
@@ -179,31 +179,36 @@ export const dns_settings_dns_settings_account_response_output: JsonSchema = {
 /**
  * The schema of `dns-settings_dns-settings-base` in responses.
  */
-export const dns_settings_dns_settings_base_output: JsonSchema = {
+export const dns$$settings_dns$$settings$$base: JsonSchema = {
   "properties": {
     "flatten_all_cnames": {
-      "$ref": "#/$defs/dns-settings_flatten_all_cnames"
+      "type": "boolean"
     },
     "foundation_dns": {
-      "$ref": "#/$defs/dns-settings_foundation_dns"
+      "type": "boolean"
     },
     "internal_dns": {
       "$ref": "#/$defs/dns-settings_internal_dns_base"
     },
     "multi_provider": {
-      "$ref": "#/$defs/dns-settings_multi_provider"
+      "type": "boolean"
     },
     "ns_ttl": {
-      "$ref": "#/$defs/dns-settings_ns_ttl"
+      "type": "number"
     },
     "secondary_overrides": {
-      "$ref": "#/$defs/dns-settings_secondary_overrides"
+      "type": "boolean"
     },
     "soa": {
       "$ref": "#/$defs/dns-settings_soa-base"
     },
     "zone_mode": {
-      "$ref": "#/$defs/dns-settings_zone_mode"
+      "enum": [
+        "standard",
+        "cdn_only",
+        "dns_only"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -212,7 +217,7 @@ export const dns_settings_dns_settings_base_output: JsonSchema = {
 /**
  * The schema of `dns-settings_dns-settings-response` in responses.
  */
-export const dns_settings_dns_settings_response_output: JsonSchema = {
+export const dns$$settings_dns$$settings$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_dns-settings-base"
@@ -238,7 +243,7 @@ export const dns_settings_dns_settings_response_output: JsonSchema = {
 /**
  * The schema of `dns-settings_dns_response_single` in responses.
  */
-export const dns_settings_dns_response_single_output: JsonSchema = {
+export const dns$$settings_dns_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_api-response-single"
@@ -254,38 +259,10 @@ export const dns_settings_dns_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dns-settings_enforce_dns_only` in responses.
- */
-export const dns_settings_enforce_dns_only_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-settings_flatten_all_cnames` in responses.
- */
-export const dns_settings_flatten_all_cnames_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-settings_foundation_dns` in responses.
- */
-export const dns_settings_foundation_dns_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-settings_identifier` in responses.
- */
-export const dns_settings_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_internal_dns_base` in responses.
  */
-export const dns_settings_internal_dns_base_output: JsonSchema = {
+export const dns$$settings_internal_dns_base: JsonSchema = {
   "properties": {
     "reference_zone_id": {
       "type": "string"
@@ -297,7 +274,7 @@ export const dns_settings_internal_dns_base_output: JsonSchema = {
 /**
  * The schema of `dns-settings_internal_dns_response` in responses.
  */
-export const dns_settings_internal_dns_response_output: JsonSchema = {
+export const dns$$settings_internal_dns_response: JsonSchema = {
   "properties": {
     "reference_zone_id": {
       "type": "string"
@@ -312,7 +289,7 @@ export const dns_settings_internal_dns_response_output: JsonSchema = {
 /**
  * The schema of `dns-settings_messages` in responses.
  */
-export const dns_settings_messages_output: JsonSchema = {
+export const dns$$settings_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -342,31 +319,10 @@ export const dns_settings_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `dns-settings_multi_provider` in responses.
- */
-export const dns_settings_multi_provider_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-settings_ns_ttl` in responses.
- */
-export const dns_settings_ns_ttl_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `dns-settings_secondary_overrides` in responses.
- */
-export const dns_settings_secondary_overrides_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `dns-settings_soa-base` in responses.
  */
-export const dns_settings_soa_base_output: JsonSchema = {
+export const dns$$settings_soa$$base: JsonSchema = {
   "properties": {
     "expire": {
       "type": "number"
@@ -403,7 +359,7 @@ export const dns_settings_soa_base_output: JsonSchema = {
 /**
  * The schema of `dns-settings_soa-response` in responses.
  */
-export const dns_settings_soa_response_output: JsonSchema = {
+export const dns$$settings_soa$$response: JsonSchema = {
   "properties": {
     "expire": {
       "type": "number"
@@ -445,15 +401,3 @@ export const dns_settings_soa_response_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `dns-settings_zone_mode` in responses.
- */
-export const dns_settings_zone_mode_output: JsonSchema = {
-  "enum": [
-    "standard",
-    "cdn_only",
-    "dns_only"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/settings/account/schemas.ts b/src/generated/forge-mcp/dns/settings/account/schemas.ts
index cdb8328ff..c4ea3438b 100644
--- a/src/generated/forge-mcp/dns/settings/account/schemas.ts
+++ b/src/generated/forge-mcp/dns/settings/account/schemas.ts
@@ -6,11 +6,11 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dns-settings_account_settings_patch`.
  */
-export const dns_settings_account_settings_patch: JsonSchema = {
+export const dns$$settings_account_settings_patch: JsonSchema = {
   "properties": {
     "enforce_dns_only": {
-      "$ref": "#/$defs/dns-settings_enforce_dns_only",
-      "description": "When enabled, forces all proxied DNS records in the account to behave as DNS-only at the edge, regardless of each record's individual proxy setting. Note that this account-level override does not modify the records themselves; it only affects how they are served at the edge. See more on [Enforce DNS-only](https://developers.cloudflare.com/dns/proxy-status/enforce-dns-only)."
+      "description": "When enabled, forces all proxied DNS records in the account to behave as DNS-only at the edge, regardless of each record's individual proxy setting. Note that this account-level override does not modify the records themselves; it only affects how they are served at the edge. See more on [Enforce DNS-only](https://developers.cloudflare.com/dns/proxy-status/enforce-dns-only).",
+      "type": "boolean"
     },
     "zone_defaults": {
       "$ref": "#/$defs/dns-settings_dns-settings-account-patch",
@@ -23,7 +23,7 @@ export const dns_settings_account_settings_patch: JsonSchema = {
 /**
  * The schema of `dns-settings_dns-settings-account-patch`.
  */
-export const dns_settings_dns_settings_account_patch: JsonSchema = {
+export const dns$$settings_dns$$settings$$account$$patch: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_dns-settings-patch"
@@ -57,81 +57,54 @@ export const dns_settings_dns_settings_account_patch: JsonSchema = {
 /**
  * The schema of `dns-settings_dns-settings-patch`.
  */
-export const dns_settings_dns_settings_patch: JsonSchema = {
+export const dns$$settings_dns$$settings$$patch: JsonSchema = {
   "properties": {
     "flatten_all_cnames": {
-      "$ref": "#/$defs/dns-settings_flatten_all_cnames",
-      "description": "Whether to flatten all CNAME records in the zone. Note that, due to DNS limitations, a CNAME record at the zone apex will always be flattened."
+      "description": "Whether to flatten all CNAME records in the zone. Note that, due to DNS limitations, a CNAME record at the zone apex will always be flattened.",
+      "type": "boolean"
     },
     "foundation_dns": {
-      "$ref": "#/$defs/dns-settings_foundation_dns",
-      "description": "Deprecated. Use nameservers.type to configure Advanced Nameservers."
+      "deprecated": true,
+      "description": "Deprecated. Use nameservers.type to configure Advanced Nameservers.",
+      "type": "boolean"
     },
     "internal_dns": {
       "$ref": "#/$defs/dns-settings_internal_dns_base",
       "description": "Settings for this internal zone."
     },
     "multi_provider": {
-      "$ref": "#/$defs/dns-settings_multi_provider",
-      "description": "Whether to enable multi-provider DNS, which causes Cloudflare to activate the zone even when non-Cloudflare NS records exist, and to respect NS records at the zone apex during outbound zone transfers."
+      "description": "Whether to enable multi-provider DNS, which causes Cloudflare to activate the zone even when non-Cloudflare NS records exist, and to respect NS records at the zone apex during outbound zone transfers.",
+      "type": "boolean"
     },
     "ns_ttl": {
-      "$ref": "#/$defs/dns-settings_ns_ttl",
-      "description": "The time to live (TTL) of the zone's nameserver (NS) records."
+      "description": "The time to live (TTL) of the zone's nameserver (NS) records.",
+      "type": "number"
     },
     "secondary_overrides": {
-      "$ref": "#/$defs/dns-settings_secondary_overrides",
-      "description": "Allows a Secondary DNS zone to use (proxied) override records and CNAME flattening at the zone apex."
+      "description": "Allows a Secondary DNS zone to use (proxied) override records and CNAME flattening at the zone apex.",
+      "type": "boolean"
     },
     "soa": {
       "$ref": "#/$defs/dns-settings_soa-base",
       "description": "Components of the zone's SOA record."
     },
     "zone_mode": {
-      "$ref": "#/$defs/dns-settings_zone_mode",
-      "description": "Whether the zone mode is a regular or CDN/DNS only zone."
+      "description": "Whether the zone mode is a regular or CDN/DNS only zone.",
+      "enum": [
+        "standard",
+        "cdn_only",
+        "dns_only"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `dns-settings_enforce_dns_only`.
- */
-export const dns_settings_enforce_dns_only: JsonSchema = {
-  "description": "When enabled, forces all proxied DNS records in the account to behave as DNS-only at the edge, regardless of each record's individual proxy setting. Note that this account-level override does not modify the records themselves; it only affects how they are served at the edge. See more on [Enforce DNS-only](https://developers.cloudflare.com/dns/proxy-status/enforce-dns-only).",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-settings_flatten_all_cnames`.
- */
-export const dns_settings_flatten_all_cnames: JsonSchema = {
-  "description": "Whether to flatten all CNAME records in the zone. Note that, due to DNS limitations, a CNAME record at the zone apex will always be flattened.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-settings_foundation_dns`.
- */
-export const dns_settings_foundation_dns: JsonSchema = {
-  "deprecated": true,
-  "description": "Deprecated. Use nameservers.type to configure Advanced Nameservers.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-settings_identifier`.
- */
-export const dns_settings_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_internal_dns_base`.
  */
-export const dns_settings_internal_dns_base: JsonSchema = {
+export const dns$$settings_internal_dns_base: JsonSchema = {
   "description": "Settings for this internal zone.",
   "properties": {
     "reference_zone_id": {
@@ -142,42 +115,10 @@ export const dns_settings_internal_dns_base: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-settings_multi_provider`.
- */
-export const dns_settings_multi_provider: JsonSchema = {
-  "description": "Whether to enable multi-provider DNS, which causes Cloudflare to activate the zone even when non-Cloudflare NS records exist, and to respect NS records at the zone apex during outbound zone transfers.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-settings_ns_ttl`.
- */
-export const dns_settings_ns_ttl: JsonSchema = {
-  "description": "The time to live (TTL) of the zone's nameserver (NS) records.",
-  "type": "number"
-};
-
-/**
- * The schema of `dns-settings_page`.
- */
-export const dns_settings_page: JsonSchema = {
-  "description": "Page number of paginated results.",
-  "type": "integer"
-};
-
-/**
- * The schema of `dns-settings_secondary_overrides`.
- */
-export const dns_settings_secondary_overrides: JsonSchema = {
-  "description": "Allows a Secondary DNS zone to use (proxied) override records and CNAME flattening at the zone apex.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `dns-settings_soa-base`.
  */
-export const dns_settings_soa_base: JsonSchema = {
+export const dns$$settings_soa$$base: JsonSchema = {
   "description": "Components of the zone's SOA record.",
   "properties": {
     "expire": {
@@ -218,16 +159,3 @@ export const dns_settings_soa_base: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `dns-settings_zone_mode`.
- */
-export const dns_settings_zone_mode: JsonSchema = {
-  "description": "Whether the zone mode is a regular or CDN/DNS only zone.",
-  "enum": [
-    "standard",
-    "cdn_only",
-    "dns_only"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/settings/account/tools.ts b/src/generated/forge-mcp/dns/settings/account/tools.ts
index 3390ca291..430046650 100644
--- a/src/generated/forge-mcp/dns/settings/account/tools.ts
+++ b/src/generated/forge-mcp/dns/settings/account/tools.ts
@@ -3,40 +3,25 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dns_settings_account_settings_output,
-  dns_settings_api_response_common_failure_output,
-  dns_settings_api_response_single_output,
-  dns_settings_dns_response_single_output,
-  dns_settings_dns_settings_account_response_output,
-  dns_settings_dns_settings_base_output,
-  dns_settings_dns_settings_response_output,
-  dns_settings_enforce_dns_only_output,
-  dns_settings_flatten_all_cnames_output,
-  dns_settings_foundation_dns_output,
-  dns_settings_internal_dns_base_output,
-  dns_settings_internal_dns_response_output,
-  dns_settings_messages_output,
-  dns_settings_multi_provider_output,
-  dns_settings_ns_ttl_output,
-  dns_settings_secondary_overrides_output,
-  dns_settings_soa_base_output,
-  dns_settings_soa_response_output,
-  dns_settings_zone_mode_output,
+  dns$$settings_account_settings,
+  dns$$settings_api$$response$$common$$failure,
+  dns$$settings_api$$response$$single,
+  dns$$settings_dns$$settings$$account$$response,
+  dns$$settings_dns$$settings$$base,
+  dns$$settings_dns$$settings$$response,
+  dns$$settings_dns_response_single,
+  dns$$settings_internal_dns_base,
+  dns$$settings_internal_dns_response,
+  dns$$settings_messages,
+  dns$$settings_soa$$base,
+  dns$$settings_soa$$response,
 } from "./outputs.js";
 import {
-  dns_settings_account_settings_patch,
-  dns_settings_dns_settings_account_patch,
-  dns_settings_dns_settings_patch,
-  dns_settings_enforce_dns_only,
-  dns_settings_flatten_all_cnames,
-  dns_settings_foundation_dns,
-  dns_settings_identifier,
-  dns_settings_internal_dns_base,
-  dns_settings_multi_provider,
-  dns_settings_ns_ttl,
-  dns_settings_secondary_overrides,
-  dns_settings_soa_base,
-  dns_settings_zone_mode,
+  dns$$settings_account_settings_patch,
+  dns$$settings_dns$$settings$$account$$patch,
+  dns$$settings_dns$$settings$$patch,
+  dns$$settings_internal_dns_base as dns$$settings_internal_dns_base$,
+  dns$$settings_soa$$base as dns$$settings_soa$$base$,
 } from "./schemas.js";
 
 /**
@@ -46,68 +31,63 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_settings_account_edit",
     title: "Update DNS Settings",
-    description: "Update DNS settings for an account or zone",
+    description: "Update DNS settings for an account or zone\n\nPATCH /{account_or_zone}/{account_or_zone_id}/dns_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/dns-settings_account_settings_patch"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-settings_account_settings_patch": dns_settings_account_settings_patch,
-        "dns-settings_dns-settings-account-patch": dns_settings_dns_settings_account_patch,
-        "dns-settings_dns-settings-patch": dns_settings_dns_settings_patch,
-        "dns-settings_enforce_dns_only": dns_settings_enforce_dns_only,
-        "dns-settings_flatten_all_cnames": dns_settings_flatten_all_cnames,
-        "dns-settings_foundation_dns": dns_settings_foundation_dns,
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_internal_dns_base": dns_settings_internal_dns_base,
-        "dns-settings_multi_provider": dns_settings_multi_provider,
-        "dns-settings_ns_ttl": dns_settings_ns_ttl,
-        "dns-settings_secondary_overrides": dns_settings_secondary_overrides,
-        "dns-settings_soa-base": dns_settings_soa_base,
-        "dns-settings_zone_mode": dns_settings_zone_mode,
+        "dns-settings_account_settings_patch": dns$$settings_account_settings_patch,
+        "dns-settings_dns-settings-account-patch": dns$$settings_dns$$settings$$account$$patch,
+        "dns-settings_dns-settings-patch": dns$$settings_dns$$settings$$patch,
+        "dns-settings_internal_dns_base": dns$$settings_internal_dns_base$,
+        "dns-settings_soa-base": dns$$settings_soa$$base$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_dns_response_single",
       $defs: {
-        "dns-settings_account_settings": dns_settings_account_settings_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_dns-settings-account-response": dns_settings_dns_settings_account_response_output,
-        "dns-settings_dns-settings-base": dns_settings_dns_settings_base_output,
-        "dns-settings_dns-settings-response": dns_settings_dns_settings_response_output,
-        "dns-settings_dns_response_single": dns_settings_dns_response_single_output,
-        "dns-settings_enforce_dns_only": dns_settings_enforce_dns_only_output,
-        "dns-settings_flatten_all_cnames": dns_settings_flatten_all_cnames_output,
-        "dns-settings_foundation_dns": dns_settings_foundation_dns_output,
-        "dns-settings_internal_dns_base": dns_settings_internal_dns_base_output,
-        "dns-settings_internal_dns_response": dns_settings_internal_dns_response_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_multi_provider": dns_settings_multi_provider_output,
-        "dns-settings_ns_ttl": dns_settings_ns_ttl_output,
-        "dns-settings_secondary_overrides": dns_settings_secondary_overrides_output,
-        "dns-settings_soa-base": dns_settings_soa_base_output,
-        "dns-settings_soa-response": dns_settings_soa_response_output,
-        "dns-settings_zone_mode": dns_settings_zone_mode_output,
+        "dns-settings_account_settings": dns$$settings_account_settings,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-settings-account-response": dns$$settings_dns$$settings$$account$$response,
+        "dns-settings_dns-settings-base": dns$$settings_dns$$settings$$base,
+        "dns-settings_dns-settings-response": dns$$settings_dns$$settings$$response,
+        "dns-settings_dns_response_single": dns$$settings_dns_response_single,
+        "dns-settings_internal_dns_base": dns$$settings_internal_dns_base,
+        "dns-settings_internal_dns_response": dns$$settings_internal_dns_response,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_soa-base": dns$$settings_soa$$base,
+        "dns-settings_soa-response": dns$$settings_soa$$response,
       },
     },
     annotations: {
@@ -152,25 +132,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_account_settings": dns_settings_account_settings_output,
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_dns-settings-account-response": dns_settings_dns_settings_account_response_output,
-        "dns-settings_dns-settings-base": dns_settings_dns_settings_base_output,
-        "dns-settings_dns-settings-response": dns_settings_dns_settings_response_output,
-        "dns-settings_dns_response_single": dns_settings_dns_response_single_output,
-        "dns-settings_enforce_dns_only": dns_settings_enforce_dns_only_output,
-        "dns-settings_flatten_all_cnames": dns_settings_flatten_all_cnames_output,
-        "dns-settings_foundation_dns": dns_settings_foundation_dns_output,
-        "dns-settings_internal_dns_base": dns_settings_internal_dns_base_output,
-        "dns-settings_internal_dns_response": dns_settings_internal_dns_response_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_multi_provider": dns_settings_multi_provider_output,
-        "dns-settings_ns_ttl": dns_settings_ns_ttl_output,
-        "dns-settings_secondary_overrides": dns_settings_secondary_overrides_output,
-        "dns-settings_soa-base": dns_settings_soa_base_output,
-        "dns-settings_soa-response": dns_settings_soa_response_output,
-        "dns-settings_zone_mode": dns_settings_zone_mode_output,
+        "dns-settings_account_settings": dns$$settings_account_settings,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-settings-account-response": dns$$settings_dns$$settings$$account$$response,
+        "dns-settings_dns-settings-base": dns$$settings_dns$$settings$$base,
+        "dns-settings_dns-settings-response": dns$$settings_dns$$settings$$response,
+        "dns-settings_dns_response_single": dns$$settings_dns_response_single,
+        "dns-settings_internal_dns_base": dns$$settings_internal_dns_base,
+        "dns-settings_internal_dns_response": dns$$settings_internal_dns_response,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_soa-base": dns$$settings_soa$$base,
+        "dns-settings_soa-response": dns$$settings_soa$$response,
       },
     },
     request: (args) => ({
@@ -181,52 +154,52 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_settings_account_get",
     title: "Show DNS Settings",
-    description: "Show DNS settings for an account or zone",
+    description: "Show DNS settings for an account or zone\n\nGET /{account_or_zone}/{account_or_zone_id}/dns_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "dns-settings_identifier": dns_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_dns_response_single",
       $defs: {
-        "dns-settings_account_settings": dns_settings_account_settings_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_dns-settings-account-response": dns_settings_dns_settings_account_response_output,
-        "dns-settings_dns-settings-base": dns_settings_dns_settings_base_output,
-        "dns-settings_dns-settings-response": dns_settings_dns_settings_response_output,
-        "dns-settings_dns_response_single": dns_settings_dns_response_single_output,
-        "dns-settings_enforce_dns_only": dns_settings_enforce_dns_only_output,
-        "dns-settings_flatten_all_cnames": dns_settings_flatten_all_cnames_output,
-        "dns-settings_foundation_dns": dns_settings_foundation_dns_output,
-        "dns-settings_internal_dns_base": dns_settings_internal_dns_base_output,
-        "dns-settings_internal_dns_response": dns_settings_internal_dns_response_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_multi_provider": dns_settings_multi_provider_output,
-        "dns-settings_ns_ttl": dns_settings_ns_ttl_output,
-        "dns-settings_secondary_overrides": dns_settings_secondary_overrides_output,
-        "dns-settings_soa-base": dns_settings_soa_base_output,
-        "dns-settings_soa-response": dns_settings_soa_response_output,
-        "dns-settings_zone_mode": dns_settings_zone_mode_output,
+        "dns-settings_account_settings": dns$$settings_account_settings,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-settings-account-response": dns$$settings_dns$$settings$$account$$response,
+        "dns-settings_dns-settings-base": dns$$settings_dns$$settings$$base,
+        "dns-settings_dns-settings-response": dns$$settings_dns$$settings$$response,
+        "dns-settings_dns_response_single": dns$$settings_dns_response_single,
+        "dns-settings_internal_dns_base": dns$$settings_internal_dns_base,
+        "dns-settings_internal_dns_response": dns$$settings_internal_dns_response,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_soa-base": dns$$settings_soa$$base,
+        "dns-settings_soa-response": dns$$settings_soa$$response,
       },
     },
     annotations: {
@@ -272,25 +245,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_account_settings": dns_settings_account_settings_output,
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_dns-settings-account-response": dns_settings_dns_settings_account_response_output,
-        "dns-settings_dns-settings-base": dns_settings_dns_settings_base_output,
-        "dns-settings_dns-settings-response": dns_settings_dns_settings_response_output,
-        "dns-settings_dns_response_single": dns_settings_dns_response_single_output,
-        "dns-settings_enforce_dns_only": dns_settings_enforce_dns_only_output,
-        "dns-settings_flatten_all_cnames": dns_settings_flatten_all_cnames_output,
-        "dns-settings_foundation_dns": dns_settings_foundation_dns_output,
-        "dns-settings_internal_dns_base": dns_settings_internal_dns_base_output,
-        "dns-settings_internal_dns_response": dns_settings_internal_dns_response_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_multi_provider": dns_settings_multi_provider_output,
-        "dns-settings_ns_ttl": dns_settings_ns_ttl_output,
-        "dns-settings_secondary_overrides": dns_settings_secondary_overrides_output,
-        "dns-settings_soa-base": dns_settings_soa_base_output,
-        "dns-settings_soa-response": dns_settings_soa_response_output,
-        "dns-settings_zone_mode": dns_settings_zone_mode_output,
+        "dns-settings_account_settings": dns$$settings_account_settings,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-settings-account-response": dns$$settings_dns$$settings$$account$$response,
+        "dns-settings_dns-settings-base": dns$$settings_dns$$settings$$base,
+        "dns-settings_dns-settings-response": dns$$settings_dns$$settings$$response,
+        "dns-settings_dns_response_single": dns$$settings_dns_response_single,
+        "dns-settings_internal_dns_base": dns$$settings_internal_dns_base,
+        "dns-settings_internal_dns_response": dns$$settings_internal_dns_response,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_soa-base": dns$$settings_soa$$base,
+        "dns-settings_soa-response": dns$$settings_soa$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/settings/account/views/outputs.ts b/src/generated/forge-mcp/dns/settings/account/views/outputs.ts
index d03a4356f..170bbed63 100644
--- a/src/generated/forge-mcp/dns/settings/account/views/outputs.ts
+++ b/src/generated/forge-mcp/dns/settings/account/views/outputs.ts
@@ -3,27 +3,21 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `dns-settings_created_time` in responses.
- */
-export const dns_settings_created_time_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_dns-view` in responses.
  */
-export const dns_settings_dns_view_output: JsonSchema = {
+export const dns$$settings_dns$$view: JsonSchema = {
   "properties": {
     "created_time": {
-      "$ref": "#/$defs/dns-settings_created_time"
+      "format": "date-time",
+      "type": "string"
     },
     "modified_time": {
-      "$ref": "#/$defs/dns-settings_modified_time"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/dns-settings_name"
+      "type": "string"
     },
     "zones": {
       "$ref": "#/$defs/dns-settings_zones"
@@ -35,7 +29,7 @@ export const dns_settings_dns_view_output: JsonSchema = {
 /**
  * The schema of `dns-settings_dns-view-response` in responses.
  */
-export const dns_settings_dns_view_response_output: JsonSchema = {
+export const dns$$settings_dns$$view$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_dns-view"
@@ -43,7 +37,7 @@ export const dns_settings_dns_view_response_output: JsonSchema = {
     {
       "properties": {
         "id": {
-          "$ref": "#/$defs/dns-settings_identifier"
+          "type": "string"
         }
       },
       "required": [
@@ -57,7 +51,7 @@ export const dns_settings_dns_view_response_output: JsonSchema = {
 /**
  * The schema of `dns-settings_dns_view_response_collection` in responses.
  */
-export const dns_settings_dns_view_response_collection_output: JsonSchema = {
+export const dns$$settings_dns_view_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_api-response-collection"
@@ -79,7 +73,7 @@ export const dns_settings_dns_view_response_collection_output: JsonSchema = {
 /**
  * The schema of `dns-settings_dns_view_response_single` in responses.
  */
-export const dns_settings_dns_view_response_single_output: JsonSchema = {
+export const dns$$settings_dns_view_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-settings_api-response-single"
@@ -95,25 +89,10 @@ export const dns_settings_dns_view_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dns-settings_modified_time` in responses.
- */
-export const dns_settings_modified_time_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-settings_name` in responses.
- */
-export const dns_settings_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_zones` in responses.
  */
-export const dns_settings_zones_output: JsonSchema = {
+export const dns$$settings_zones: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/dns/settings/account/views/schemas.ts b/src/generated/forge-mcp/dns/settings/account/views/schemas.ts
index 81645520b..5a1c75ea1 100644
--- a/src/generated/forge-mcp/dns/settings/account/views/schemas.ts
+++ b/src/generated/forge-mcp/dns/settings/account/views/schemas.ts
@@ -3,26 +3,14 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `dns-settings_direction`.
- */
-export const dns_settings_direction: JsonSchema = {
-  "description": "Direction to order DNS views in.",
-  "enum": [
-    "asc",
-    "desc"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dns-settings_dns-view-patch`.
  */
-export const dns_settings_dns_view_patch: JsonSchema = {
+export const dns$$settings_dns$$view$$patch: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/dns-settings_name",
-      "description": "The name of the view."
+      "description": "The name of the view.",
+      "type": "string"
     },
     "zones": {
       "$ref": "#/$defs/dns-settings_zones",
@@ -35,11 +23,11 @@ export const dns_settings_dns_view_patch: JsonSchema = {
 /**
  * The schema of `dns-settings_dns-view-post`.
  */
-export const dns_settings_dns_view_post: JsonSchema = {
+export const dns$$settings_dns$$view$$post: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/dns-settings_name",
-      "description": "The name of the view."
+      "description": "The name of the view.",
+      "type": "string"
     },
     "zones": {
       "$ref": "#/$defs/dns-settings_zones",
@@ -53,51 +41,10 @@ export const dns_settings_dns_view_post: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-settings_match`.
- */
-export const dns_settings_match: JsonSchema = {
-  "description": "Whether to match all search requirements or at least one (any). If set to `all`, acts like a logical AND between filters. If set to `any`, acts like a logical OR instead.\n",
-  "enum": [
-    "any",
-    "all"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `dns-settings_name`.
- */
-export const dns_settings_name: JsonSchema = {
-  "description": "The name of the view.",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-settings_order`.
- */
-export const dns_settings_order: JsonSchema = {
-  "description": "Field to order DNS views by.",
-  "enum": [
-    "name",
-    "created_on",
-    "modified_on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `dns-settings_per_page`.
- */
-export const dns_settings_per_page: JsonSchema = {
-  "description": "Number of results per page.",
-  "type": "integer"
-};
-
 /**
  * The schema of `dns-settings_zones`.
  */
-export const dns_settings_zones: JsonSchema = {
+export const dns$$settings_zones: JsonSchema = {
   "description": "The list of zones linked to this view.",
   "items": {
     "type": "string"
diff --git a/src/generated/forge-mcp/dns/settings/account/views/tools.ts b/src/generated/forge-mcp/dns/settings/account/views/tools.ts
index b5416ac2e..cc7e1e094 100644
--- a/src/generated/forge-mcp/dns/settings/account/views/tools.ts
+++ b/src/generated/forge-mcp/dns/settings/account/views/tools.ts
@@ -1,35 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  dns_settings_api_response_collection_output,
-  dns_settings_api_response_common_failure_output,
-  dns_settings_api_response_common_output,
-  dns_settings_api_response_single_output,
-  dns_settings_identifier_output,
-  dns_settings_messages_output,
+  dns$$settings_api$$response$$collection,
+  dns$$settings_api$$response$$common,
+  dns$$settings_api$$response$$common$$failure,
+  dns$$settings_api$$response$$single,
+  dns$$settings_messages,
 } from "../outputs.js";
-import { dns_settings_identifier, dns_settings_page } from "../schemas.js";
 import {
-  dns_settings_created_time_output,
-  dns_settings_dns_view_output,
-  dns_settings_dns_view_response_collection_output,
-  dns_settings_dns_view_response_output,
-  dns_settings_dns_view_response_single_output,
-  dns_settings_modified_time_output,
-  dns_settings_name_output,
-  dns_settings_zones_output,
+  dns$$settings_dns$$view,
+  dns$$settings_dns$$view$$response,
+  dns$$settings_dns_view_response_collection,
+  dns$$settings_dns_view_response_single,
+  dns$$settings_zones,
 } from "./outputs.js";
 import {
-  dns_settings_direction,
-  dns_settings_dns_view_patch,
-  dns_settings_dns_view_post,
-  dns_settings_match,
-  dns_settings_name,
-  dns_settings_order,
-  dns_settings_per_page,
-  dns_settings_zones,
+  dns$$settings_dns$$view$$patch,
+  dns$$settings_dns$$view$$post,
+  dns$$settings_zones as dns$$settings_zones$,
 } from "./schemas.js";
 
 /**
@@ -39,42 +29,46 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_settings_account_views_create",
     title: "Create Internal DNS View",
-    description: "Create Internal DNS View for an account",
+    description: "Create Internal DNS View for an account\n\nPOST /accounts/{account_id}/dns_settings/views",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/dns-settings_dns-view-post"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-settings_dns-view-post": dns_settings_dns_view_post,
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_name": dns_settings_name,
-        "dns-settings_zones": dns_settings_zones,
+        "dns-settings_dns-view-post": dns$$settings_dns$$view$$post,
+        "dns-settings_zones": dns$$settings_zones$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_dns_view_response_single",
       $defs: {
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_created_time": dns_settings_created_time_output,
-        "dns-settings_dns-view": dns_settings_dns_view_output,
-        "dns-settings_dns-view-response": dns_settings_dns_view_response_output,
-        "dns-settings_dns_view_response_single": dns_settings_dns_view_response_single_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_modified_time": dns_settings_modified_time_output,
-        "dns-settings_name": dns_settings_name_output,
-        "dns-settings_zones": dns_settings_zones_output,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-view": dns$$settings_dns$$view,
+        "dns-settings_dns-view-response": dns$$settings_dns$$view$$response,
+        "dns-settings_dns_view_response_single": dns$$settings_dns_view_response_single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_zones": dns$$settings_zones,
       },
     },
     annotations: {
@@ -119,17 +113,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_created_time": dns_settings_created_time_output,
-        "dns-settings_dns-view": dns_settings_dns_view_output,
-        "dns-settings_dns-view-response": dns_settings_dns_view_response_output,
-        "dns-settings_dns_view_response_single": dns_settings_dns_view_response_single_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_modified_time": dns_settings_modified_time_output,
-        "dns-settings_name": dns_settings_name_output,
-        "dns-settings_zones": dns_settings_zones_output,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-view": dns$$settings_dns$$view,
+        "dns-settings_dns-view-response": dns$$settings_dns$$view$$response,
+        "dns-settings_dns_view_response_single": dns$$settings_dns_view_response_single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_zones": dns$$settings_zones,
       },
     },
     request: (args) => ({
@@ -140,42 +130,46 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_settings_account_views_delete",
     title: "Delete Internal DNS View",
-    description: "Delete an existing Internal DNS View",
+    description: "Delete an existing Internal DNS View\n\nDELETE /accounts/{account_id}/dns_settings/views/{view_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
-        "view_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "view_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "view_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "view_id"
+        "path"
       ],
-      $defs: {
-        "dns-settings_identifier": dns_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/dns-settings_identifier"
+              "type": "string"
             }
           },
           "type": "object"
         }
       },
       "type": "object",
-      $defs: {
-        "dns-settings_identifier": dns_settings_identifier_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -209,7 +203,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/dns-settings_identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -224,7 +218,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/dns-settings_identifier"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -239,9 +233,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_messages": dns$$settings_messages,
       },
     },
     request: (args) => ({
@@ -251,47 +244,51 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_settings_account_views_edit",
     title: "Update Internal DNS View",
-    description: "Update an existing Internal DNS View",
+    description: "Update an existing Internal DNS View\n\nPATCH /accounts/{account_id}/dns_settings/views/{view_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/dns-settings_dns-view-patch"
         },
-        "view_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "view_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "view_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "view_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-settings_dns-view-patch": dns_settings_dns_view_patch,
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_name": dns_settings_name,
-        "dns-settings_zones": dns_settings_zones,
+        "dns-settings_dns-view-patch": dns$$settings_dns$$view$$patch,
+        "dns-settings_zones": dns$$settings_zones$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_dns_view_response_single",
       $defs: {
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_created_time": dns_settings_created_time_output,
-        "dns-settings_dns-view": dns_settings_dns_view_output,
-        "dns-settings_dns-view-response": dns_settings_dns_view_response_output,
-        "dns-settings_dns_view_response_single": dns_settings_dns_view_response_single_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_modified_time": dns_settings_modified_time_output,
-        "dns-settings_name": dns_settings_name_output,
-        "dns-settings_zones": dns_settings_zones_output,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-view": dns$$settings_dns$$view,
+        "dns-settings_dns-view-response": dns$$settings_dns$$view$$response,
+        "dns-settings_dns_view_response_single": dns$$settings_dns_view_response_single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_zones": dns$$settings_zones,
       },
     },
     annotations: {
@@ -336,17 +333,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_created_time": dns_settings_created_time_output,
-        "dns-settings_dns-view": dns_settings_dns_view_output,
-        "dns-settings_dns-view-response": dns_settings_dns_view_response_output,
-        "dns-settings_dns_view_response_single": dns_settings_dns_view_response_single_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_modified_time": dns_settings_modified_time_output,
-        "dns-settings_name": dns_settings_name_output,
-        "dns-settings_zones": dns_settings_zones_output,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-view": dns$$settings_dns$$view,
+        "dns-settings_dns-view-response": dns$$settings_dns$$view$$response,
+        "dns-settings_dns_view_response_single": dns$$settings_dns_view_response_single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_zones": dns$$settings_zones,
       },
     },
     request: (args) => ({
@@ -357,40 +350,43 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_settings_account_views_get",
     title: "DNS Internal View Details",
-    description: "Get DNS Internal View",
+    description: "Get DNS Internal View\n\nGET /accounts/{account_id}/dns_settings/views/{view_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
-        "view_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "view_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "view_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "view_id"
+        "path"
       ],
-      $defs: {
-        "dns-settings_identifier": dns_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_dns_view_response_single",
       $defs: {
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_created_time": dns_settings_created_time_output,
-        "dns-settings_dns-view": dns_settings_dns_view_output,
-        "dns-settings_dns-view-response": dns_settings_dns_view_response_output,
-        "dns-settings_dns_view_response_single": dns_settings_dns_view_response_single_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_modified_time": dns_settings_modified_time_output,
-        "dns-settings_name": dns_settings_name_output,
-        "dns-settings_zones": dns_settings_zones_output,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-view": dns$$settings_dns$$view,
+        "dns-settings_dns-view-response": dns$$settings_dns$$view$$response,
+        "dns-settings_dns_view_response_single": dns$$settings_dns_view_response_single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_zones": dns$$settings_zones,
       },
     },
     annotations: {
@@ -436,17 +432,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_api-response-single": dns_settings_api_response_single_output,
-        "dns-settings_created_time": dns_settings_created_time_output,
-        "dns-settings_dns-view": dns_settings_dns_view_output,
-        "dns-settings_dns-view-response": dns_settings_dns_view_response_output,
-        "dns-settings_dns_view_response_single": dns_settings_dns_view_response_single_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_modified_time": dns_settings_modified_time_output,
-        "dns-settings_name": dns_settings_name_output,
-        "dns-settings_zones": dns_settings_zones_output,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_api-response-single": dns$$settings_api$$response$$single,
+        "dns-settings_dns-view": dns$$settings_dns$$view,
+        "dns-settings_dns-view-response": dns$$settings_dns$$view$$response,
+        "dns-settings_dns_view_response_single": dns$$settings_dns_view_response_single,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_zones": dns$$settings_zones,
       },
     },
     request: (args) => ({
@@ -456,94 +448,111 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_settings_account_views_list",
     title: "List Internal DNS Views",
-    description: "List DNS Internal Views for an Account",
+    description: "List DNS Internal Views for an Account\n\nGET /accounts/{account_id}/dns_settings/views",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-settings_identifier",
-          "description": "Identifier."
-        },
-        "direction": {
-          "$ref": "#/$defs/dns-settings_direction",
-          "default": "asc",
-          "description": "Direction to order DNS views in."
-        },
-        "match": {
-          "$ref": "#/$defs/dns-settings_match",
-          "default": "all",
-          "description": "Whether to match all search requirements or at least one (any). If set to `all`, acts like a logical AND between filters. If set to `any`, acts like a logical OR instead.\n"
-        },
-        "name": {
-          "description": "Exact value of the DNS view name. This is a convenience alias for `name.exact`.\n",
-          "type": "string"
-        },
-        "name_contains": {
-          "description": "Substring of the DNS view name.\n",
-          "type": "string"
-        },
-        "name_endswith": {
-          "description": "Suffix of the DNS view name.\n",
-          "type": "string"
-        },
-        "name_exact": {
-          "description": "Exact value of the DNS view name.\n",
-          "type": "string"
-        },
-        "name_startswith": {
-          "description": "Prefix of the DNS view name.\n",
-          "type": "string"
-        },
-        "order": {
-          "$ref": "#/$defs/dns-settings_order",
-          "default": "type",
-          "description": "Field to order DNS views by."
-        },
-        "page": {
-          "$ref": "#/$defs/dns-settings_page",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/dns-settings_per_page",
-          "default": 100,
-          "description": "Number of results per page."
-        },
-        "zone_id": {
-          "description": "A zone ID that exists in the zones list for the view.\n",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "zone_name": {
-          "description": "A zone name that exists in the zones list for the view.\n",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "Direction to order DNS views in.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "match": {
+              "default": "all",
+              "description": "Whether to match all search requirements or at least one (any). If set to `all`, acts like a logical AND between filters. If set to `any`, acts like a logical OR instead.",
+              "enum": [
+                "any",
+                "all"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Exact value of the DNS view name. This is a convenience alias for `name.exact`.",
+              "type": "string"
+            },
+            "name.contains": {
+              "description": "Substring of the DNS view name.",
+              "type": "string"
+            },
+            "name.endswith": {
+              "description": "Suffix of the DNS view name.",
+              "type": "string"
+            },
+            "name.exact": {
+              "description": "Exact value of the DNS view name.",
+              "type": "string"
+            },
+            "name.startswith": {
+              "description": "Prefix of the DNS view name.",
+              "type": "string"
+            },
+            "order": {
+              "default": "type",
+              "description": "Field to order DNS views by.",
+              "enum": [
+                "name",
+                "created_on",
+                "modified_on"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "zone_id": {
+              "description": "A zone ID that exists in the zones list for the view.",
+              "type": "string"
+            },
+            "zone_name": {
+              "description": "A zone name that exists in the zones list for the view.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "dns-settings_direction": dns_settings_direction,
-        "dns-settings_identifier": dns_settings_identifier,
-        "dns-settings_match": dns_settings_match,
-        "dns-settings_order": dns_settings_order,
-        "dns-settings_page": dns_settings_page,
-        "dns-settings_per_page": dns_settings_per_page,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-settings_dns_view_response_collection",
       $defs: {
-        "dns-settings_api-response-collection": dns_settings_api_response_collection_output,
-        "dns-settings_api-response-common": dns_settings_api_response_common_output,
-        "dns-settings_created_time": dns_settings_created_time_output,
-        "dns-settings_dns-view": dns_settings_dns_view_output,
-        "dns-settings_dns-view-response": dns_settings_dns_view_response_output,
-        "dns-settings_dns_view_response_collection": dns_settings_dns_view_response_collection_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_modified_time": dns_settings_modified_time_output,
-        "dns-settings_name": dns_settings_name_output,
-        "dns-settings_zones": dns_settings_zones_output,
+        "dns-settings_api-response-collection": dns$$settings_api$$response$$collection,
+        "dns-settings_api-response-common": dns$$settings_api$$response$$common,
+        "dns-settings_dns-view": dns$$settings_dns$$view,
+        "dns-settings_dns-view-response": dns$$settings_dns$$view$$response,
+        "dns-settings_dns_view_response_collection": dns$$settings_dns_view_response_collection,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_zones": dns$$settings_zones,
       },
     },
     annotations: {
@@ -589,35 +598,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-settings_api-response-collection": dns_settings_api_response_collection_output,
-        "dns-settings_api-response-common": dns_settings_api_response_common_output,
-        "dns-settings_api-response-common-failure": dns_settings_api_response_common_failure_output,
-        "dns-settings_created_time": dns_settings_created_time_output,
-        "dns-settings_dns-view": dns_settings_dns_view_output,
-        "dns-settings_dns-view-response": dns_settings_dns_view_response_output,
-        "dns-settings_dns_view_response_collection": dns_settings_dns_view_response_collection_output,
-        "dns-settings_identifier": dns_settings_identifier_output,
-        "dns-settings_messages": dns_settings_messages_output,
-        "dns-settings_modified_time": dns_settings_modified_time_output,
-        "dns-settings_name": dns_settings_name_output,
-        "dns-settings_zones": dns_settings_zones_output,
+        "dns-settings_api-response-collection": dns$$settings_api$$response$$collection,
+        "dns-settings_api-response-common": dns$$settings_api$$response$$common,
+        "dns-settings_api-response-common-failure": dns$$settings_api$$response$$common$$failure,
+        "dns-settings_dns-view": dns$$settings_dns$$view,
+        "dns-settings_dns-view-response": dns$$settings_dns$$view$$response,
+        "dns-settings_dns_view_response_collection": dns$$settings_dns_view_response_collection,
+        "dns-settings_messages": dns$$settings_messages,
+        "dns-settings_zones": dns$$settings_zones,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dns_settings/views`,
       query: [
-        ["name", args["name"], true],
-        ["name.exact", args["name_exact"], true],
-        ["name.contains", args["name_contains"], true],
-        ["name.startswith", args["name_startswith"], true],
-        ["name.endswith", args["name_endswith"], true],
-        ["zone_id", args["zone_id"], true],
-        ["zone_name", args["zone_name"], true],
-        ["match", args["match"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["name", param(args, "query", "name"), true],
+        ["name.exact", param(args, "query", "name.exact"), true],
+        ["name.contains", param(args, "query", "name.contains"), true],
+        ["name.startswith", param(args, "query", "name.startswith"), true],
+        ["name.endswith", param(args, "query", "name.endswith"), true],
+        ["zone_id", param(args, "query", "zone_id"), true],
+        ["zone_name", param(args, "query", "zone_name"), true],
+        ["match", param(args, "query", "match"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/dns/usage/account/outputs.ts b/src/generated/forge-mcp/dns/usage/account/outputs.ts
index 0d465ae47..38258e3e6 100644
--- a/src/generated/forge-mcp/dns/usage/account/outputs.ts
+++ b/src/generated/forge-mcp/dns/usage/account/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dns-records_dns_response_account_usage` in responses.
  */
-export const dns_records_dns_response_account_usage_output: JsonSchema = {
+export const dns$$records_dns_response_account_usage: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-records_api-response-single"
diff --git a/src/generated/forge-mcp/dns/usage/account/tools.ts b/src/generated/forge-mcp/dns/usage/account/tools.ts
index d6d815cd5..e91b6ce00 100644
--- a/src/generated/forge-mcp/dns/usage/account/tools.ts
+++ b/src/generated/forge-mcp/dns/usage/account/tools.ts
@@ -3,12 +3,11 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dns_records_api_response_common_failure_output,
-  dns_records_api_response_single_output,
-  dns_records_messages_output,
+  dns$$records_api$$response$$common$$failure,
+  dns$$records_api$$response$$single,
+  dns$$records_messages,
 } from "../../outputs.js";
-import { dns_records_identifier } from "../../schemas.js";
-import { dns_records_dns_response_account_usage_output } from "./outputs.js";
+import { dns$$records_dns_response_account_usage } from "./outputs.js";
 
 /**
  * The tools of `dns.usage.account`.
@@ -17,37 +16,44 @@ export const tools: readonly Tool[] = [
   {
     name: "dns_usage_account_get",
     title: "Get DNS Record Usage for account or zone",
-    description: "Get the current DNS record usage and quota for an account or zone. May include internal DNS usage and quota.",
+    description: "Get the current DNS record usage and quota for an account or zone. May include internal DNS usage and quota.\n\nGET /{account_or_zone}/{account_or_zone_id}/dns_records/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/dns-records_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "dns-records_identifier": dns_records_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-records_dns_response_account_usage",
       $defs: {
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_dns_response_account_usage": dns_records_dns_response_account_usage_output,
-        "dns-records_messages": dns_records_messages_output,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns_response_account_usage": dns$$records_dns_response_account_usage,
+        "dns-records_messages": dns$$records_messages,
       },
     },
     annotations: {
@@ -86,10 +92,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-records_api-response-common-failure": dns_records_api_response_common_failure_output,
-        "dns-records_api-response-single": dns_records_api_response_single_output,
-        "dns-records_dns_response_account_usage": dns_records_dns_response_account_usage_output,
-        "dns-records_messages": dns_records_messages_output,
+        "dns-records_api-response-common-failure": dns$$records_api$$response$$common$$failure,
+        "dns-records_api-response-single": dns$$records_api$$response$$single,
+        "dns-records_dns_response_account_usage": dns$$records_dns_response_account_usage,
+        "dns-records_messages": dns$$records_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/acls/outputs.ts b/src/generated/forge-mcp/dns/zoneTransfers/acls/outputs.ts
index b123b29ba..d173bd6d2 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/acls/outputs.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/acls/outputs.ts
@@ -6,16 +6,16 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `secondary-dns_acl` in responses.
  */
-export const secondary_dns_acl_output: JsonSchema = {
+export const secondary$$dns_acl: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/secondary-dns_identifier-3"
+      "type": "string"
     },
     "ip_range": {
-      "$ref": "#/$defs/secondary-dns_ip_range"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/secondary-dns_name-4"
+      "type": "string"
     }
   },
   "required": [
@@ -26,24 +26,10 @@ export const secondary_dns_acl_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `secondary-dns_ip_range` in responses.
- */
-export const secondary_dns_ip_range_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_name-4` in responses.
- */
-export const secondary_dns_name_4_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_response_collection-3` in responses.
  */
-export const secondary_dns_response_collection_3_output: JsonSchema = {
+export const secondary$$dns_response_collection$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-collection"
@@ -65,7 +51,7 @@ export const secondary_dns_response_collection_3_output: JsonSchema = {
 /**
  * The schema of `secondary-dns_single_response-3` in responses.
  */
-export const secondary_dns_single_response_3_output: JsonSchema = {
+export const secondary$$dns_single_response$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/acls/schemas.ts b/src/generated/forge-mcp/dns/zoneTransfers/acls/schemas.ts
index 336e826af..2232a55b4 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/acls/schemas.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/acls/schemas.ts
@@ -6,15 +6,15 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `secondary-dns_acl`.
  */
-export const secondary_dns_acl: JsonSchema = {
+export const secondary$$dns_acl: JsonSchema = {
   "properties": {
     "ip_range": {
-      "$ref": "#/$defs/secondary-dns_ip_range",
-      "description": "Allowed IPv4/IPv6 address range of primary or secondary nameservers. This will be applied for the entire account. The IP range is used to allow additional NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR requests from for primary zones. CIDRs are limited to a maximum of /24 for IPv4 and /64 for IPv6 respectively."
+      "description": "Allowed IPv4/IPv6 address range of primary or secondary nameservers. This will be applied for the entire account. The IP range is used to allow additional NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR requests from for primary zones. CIDRs are limited to a maximum of /24 for IPv4 and /64 for IPv6 respectively.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/secondary-dns_name-4",
-      "description": "The name of the acl."
+      "description": "The name of the acl.",
+      "type": "string"
     }
   },
   "required": [
@@ -23,19 +23,3 @@ export const secondary_dns_acl: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `secondary-dns_ip_range`.
- */
-export const secondary_dns_ip_range: JsonSchema = {
-  "description": "Allowed IPv4/IPv6 address range of primary or secondary nameservers. This will be applied for the entire account. The IP range is used to allow additional NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR requests from for primary zones. CIDRs are limited to a maximum of /24 for IPv4 and /64 for IPv6 respectively.",
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_name-4`.
- */
-export const secondary_dns_name_4: JsonSchema = {
-  "description": "The name of the acl.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/acls/tools.ts b/src/generated/forge-mcp/dns/zoneTransfers/acls/tools.ts
index 31a63470b..39064a4f1 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/acls/tools.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/acls/tools.ts
@@ -3,54 +3,40 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  secondary_dns_api_response_collection_output,
-  secondary_dns_api_response_common_failure_output,
-  secondary_dns_api_response_common_output,
-  secondary_dns_api_response_single_output,
-  secondary_dns_id_response_3_output,
-  secondary_dns_identifier_3_output,
-  secondary_dns_messages_output,
+  secondary$$dns_api$$response$$collection,
+  secondary$$dns_api$$response$$common,
+  secondary$$dns_api$$response$$common$$failure,
+  secondary$$dns_api$$response$$single,
+  secondary$$dns_id_response$$3,
+  secondary$$dns_messages,
 } from "../outputs.js";
 import {
-  secondary_dns_account_identifier,
-  secondary_dns_identifier_3,
-} from "../schemas.js";
-import {
-  secondary_dns_acl_output,
-  secondary_dns_ip_range_output,
-  secondary_dns_name_4_output,
-  secondary_dns_response_collection_3_output,
-  secondary_dns_single_response_3_output,
+  secondary$$dns_acl,
+  secondary$$dns_response_collection$$3,
+  secondary$$dns_single_response$$3,
 } from "./outputs.js";
-import {
-  secondary_dns_acl,
-  secondary_dns_ip_range,
-  secondary_dns_name_4,
-} from "./schemas.js";
+import { secondary$$dns_acl as secondary$$dns_acl$ } from "./schemas.js";
 
 /**
- * The tools of `dns.zone_transfers.acls`.
+ * The tools of `dns.zoneTransfers.acls`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_zone_transfers_acls_create",
+    name: "dns_zoneTransfers_acls_create",
     title: "Create ACL",
-    description: "Create ACL.",
+    description: "Create ACL.\n\nPOST /accounts/{account_id}/secondary_dns/acls",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
         "body": {
           "properties": {
             "ip_range": {
-              "$ref": "#/$defs/secondary-dns_ip_range",
-              "description": "Allowed IPv4/IPv6 address range of primary or secondary nameservers. This will be applied for the entire account. The IP range is used to allow additional NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR requests from for primary zones. CIDRs are limited to a maximum of /24 for IPv4 and /64 for IPv6 respectively."
+              "description": "Allowed IPv4/IPv6 address range of primary or secondary nameservers. This will be applied for the entire account. The IP range is used to allow additional NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR requests from for primary zones. CIDRs are limited to a maximum of /24 for IPv4 and /64 for IPv6 respectively.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/secondary-dns_name-4",
-              "description": "The name of the acl."
+              "description": "The name of the acl.",
+              "type": "string"
             }
           },
           "required": [
@@ -58,28 +44,33 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_ip_range": secondary_dns_ip_range,
-        "secondary-dns_name-4": secondary_dns_name_4,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response-3",
       $defs: {
-        "secondary-dns_acl": secondary_dns_acl_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip_range": secondary_dns_ip_range_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-4": secondary_dns_name_4_output,
-        "secondary-dns_single_response-3": secondary_dns_single_response_3_output,
+        "secondary-dns_acl": secondary$$dns_acl,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response-3": secondary$$dns_single_response$$3,
       },
     },
     annotations: {
@@ -119,14 +110,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_acl": secondary_dns_acl_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip_range": secondary_dns_ip_range_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-4": secondary_dns_name_4_output,
-        "secondary-dns_single_response-3": secondary_dns_single_response_3_output,
+        "secondary-dns_acl": secondary$$dns_acl,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response-3": secondary$$dns_single_response$$3,
       },
     },
     request: (args) => ({
@@ -135,35 +123,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_acls_delete",
+    name: "dns_zoneTransfers_acls_delete",
     title: "Delete ACL",
-    description: "Delete ACL.",
+    description: "Delete ACL.\n\nDELETE /accounts/{account_id}/secondary_dns/acls/{acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
-        "acl_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "acl_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "acl_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_id_response-3",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response-3": secondary_dns_id_response_3_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response-3": secondary$$dns_id_response$$3,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -203,11 +196,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response-3": secondary_dns_id_response_3_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response-3": secondary$$dns_id_response$$3,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
@@ -215,38 +207,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_acls_get",
+    name: "dns_zoneTransfers_acls_get",
     title: "ACL Details",
-    description: "Get ACL.",
+    description: "Get ACL.\n\nGET /accounts/{account_id}/secondary_dns/acls/{acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
-        "acl_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "acl_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "acl_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response-3",
       $defs: {
-        "secondary-dns_acl": secondary_dns_acl_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip_range": secondary_dns_ip_range_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-4": secondary_dns_name_4_output,
-        "secondary-dns_single_response-3": secondary_dns_single_response_3_output,
+        "secondary-dns_acl": secondary$$dns_acl,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response-3": secondary$$dns_single_response$$3,
       },
     },
     annotations: {
@@ -287,14 +282,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_acl": secondary_dns_acl_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip_range": secondary_dns_ip_range_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-4": secondary_dns_name_4_output,
-        "secondary-dns_single_response-3": secondary_dns_single_response_3_output,
+        "secondary-dns_acl": secondary$$dns_acl,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response-3": secondary$$dns_single_response$$3,
       },
     },
     request: (args) => ({
@@ -302,34 +294,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_acls_list",
+    name: "dns_zoneTransfers_acls_list",
     title: "List ACLs",
-    description: "List ACLs.",
+    description: "List ACLs.\n\nGET /accounts/{account_id}/secondary_dns/acls",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_response_collection-3",
       $defs: {
-        "secondary-dns_acl": secondary_dns_acl_output,
-        "secondary-dns_api-response-collection": secondary_dns_api_response_collection_output,
-        "secondary-dns_api-response-common": secondary_dns_api_response_common_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip_range": secondary_dns_ip_range_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-4": secondary_dns_name_4_output,
-        "secondary-dns_response_collection-3": secondary_dns_response_collection_3_output,
+        "secondary-dns_acl": secondary$$dns_acl,
+        "secondary-dns_api-response-collection": secondary$$dns_api$$response$$collection,
+        "secondary-dns_api-response-common": secondary$$dns_api$$response$$common,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_response_collection-3": secondary$$dns_response_collection$$3,
       },
     },
     annotations: {
@@ -370,15 +366,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_acl": secondary_dns_acl_output,
-        "secondary-dns_api-response-collection": secondary_dns_api_response_collection_output,
-        "secondary-dns_api-response-common": secondary_dns_api_response_common_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip_range": secondary_dns_ip_range_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-4": secondary_dns_name_4_output,
-        "secondary-dns_response_collection-3": secondary_dns_response_collection_3_output,
+        "secondary-dns_acl": secondary$$dns_acl,
+        "secondary-dns_api-response-collection": secondary$$dns_api$$response$$collection,
+        "secondary-dns_api-response-common": secondary$$dns_api$$response$$common,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_response_collection-3": secondary$$dns_response_collection$$3,
       },
     },
     request: (args) => ({
@@ -386,45 +379,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_acls_update",
+    name: "dns_zoneTransfers_acls_update",
     title: "Update ACL",
-    description: "Modify ACL.",
+    description: "Modify ACL.\n\nPUT /accounts/{account_id}/secondary_dns/acls/{acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
-        "acl_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-3"
-        },
         "body": {
           "$ref": "#/$defs/secondary-dns_acl"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "acl_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "acl_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_acl": secondary_dns_acl,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3,
-        "secondary-dns_ip_range": secondary_dns_ip_range,
-        "secondary-dns_name-4": secondary_dns_name_4,
+        "secondary-dns_acl": secondary$$dns_acl$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response-3",
       $defs: {
-        "secondary-dns_acl": secondary_dns_acl_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip_range": secondary_dns_ip_range_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-4": secondary_dns_name_4_output,
-        "secondary-dns_single_response-3": secondary_dns_single_response_3_output,
+        "secondary-dns_acl": secondary$$dns_acl,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response-3": secondary$$dns_single_response$$3,
       },
     },
     annotations: {
@@ -464,14 +460,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_acl": secondary_dns_acl_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip_range": secondary_dns_ip_range_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-4": secondary_dns_name_4_output,
-        "secondary-dns_single_response-3": secondary_dns_single_response_3_output,
+        "secondary-dns_acl": secondary$$dns_acl,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response-3": secondary$$dns_single_response$$3,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/forceAxfr/outputs.ts b/src/generated/forge-mcp/dns/zoneTransfers/forceAxfr/outputs.ts
index d34955d6a..71e8bc704 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/forceAxfr/outputs.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/forceAxfr/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `secondary-dns_force_response` in responses.
  */
-export const secondary_dns_force_response_output: JsonSchema = {
+export const secondary$$dns_force_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -14,17 +14,10 @@ export const secondary_dns_force_response_output: JsonSchema = {
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/secondary-dns_force_result"
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `secondary-dns_force_result` in responses.
- */
-export const secondary_dns_force_result_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/forceAxfr/tools.ts b/src/generated/forge-mcp/dns/zoneTransfers/forceAxfr/tools.ts
index 956932421..daf688e7f 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/forceAxfr/tools.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/forceAxfr/tools.ts
@@ -3,45 +3,47 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  secondary_dns_api_response_common_failure_output,
-  secondary_dns_api_response_single_output,
-  secondary_dns_messages_output,
+  secondary$$dns_api$$response$$common$$failure,
+  secondary$$dns_api$$response$$single,
+  secondary$$dns_messages,
 } from "../outputs.js";
-import { secondary_dns_identifier } from "../schemas.js";
-import {
-  secondary_dns_force_response_output,
-  secondary_dns_force_result_output,
-} from "./outputs.js";
+import { secondary$$dns_force_response } from "./outputs.js";
 
 /**
- * The tools of `dns.zone_transfers.force_axfr`.
+ * The tools of `dns.zoneTransfers.forceAxfr`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_zone_transfers_force_axfr_create",
+    name: "dns_zoneTransfers_forceAxfr_create",
     title: "Force AXFR",
-    description: "Sends AXFR zone transfer request to primary nameserver(s).",
+    description: "Sends AXFR zone transfer request to primary nameserver(s).\n\nPOST /zones/{zone_id}/secondary_dns/force_axfr",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_force_response",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_force_response": secondary_dns_force_response_output,
-        "secondary-dns_force_result": secondary_dns_force_result_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_force_response": secondary$$dns_force_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -83,11 +85,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_force_response": secondary_dns_force_response_output,
-        "secondary-dns_force_result": secondary_dns_force_result_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_force_response": secondary$$dns_force_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/incoming/outputs.ts b/src/generated/forge-mcp/dns/zoneTransfers/incoming/outputs.ts
index f3f9cf117..4aa36ede5 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/incoming/outputs.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/incoming/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `secondary-dns_auto_refresh_seconds` in responses.
- */
-export const secondary_dns_auto_refresh_seconds_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `secondary-dns_single_response_incoming` in responses.
  */
-export const secondary_dns_single_response_incoming_output: JsonSchema = {
+export const secondary$$dns_single_response_incoming: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -23,28 +16,28 @@ export const secondary_dns_single_response_incoming_output: JsonSchema = {
         "result": {
           "properties": {
             "auto_refresh_seconds": {
-              "$ref": "#/$defs/secondary-dns_auto_refresh_seconds"
+              "type": "number"
             },
             "checked_time": {
-              "$ref": "#/$defs/secondary-dns_time"
+              "type": "string"
             },
             "created_time": {
-              "$ref": "#/$defs/secondary-dns_time"
+              "type": "string"
             },
             "id": {
-              "$ref": "#/$defs/secondary-dns_identifier"
+              "type": "string"
             },
             "modified_time": {
-              "$ref": "#/$defs/secondary-dns_time"
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/secondary-dns_name"
+              "type": "string"
             },
             "peers": {
               "$ref": "#/$defs/secondary-dns_peers"
             },
             "soa_serial": {
-              "$ref": "#/$defs/secondary-dns_soa_serial"
+              "type": "number"
             }
           },
           "type": "object"
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/incoming/schemas.ts b/src/generated/forge-mcp/dns/zoneTransfers/incoming/schemas.ts
index be2513729..24ced0eb0 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/incoming/schemas.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/incoming/schemas.ts
@@ -3,27 +3,19 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `secondary-dns_auto_refresh_seconds`.
- */
-export const secondary_dns_auto_refresh_seconds: JsonSchema = {
-  "description": "How often should a secondary zone auto refresh regardless of DNS NOTIFY.\nNot applicable for primary zones.",
-  "type": "number"
-};
-
 /**
  * The schema of `secondary-dns_dns-secondary-secondary-zone`.
  */
-export const secondary_dns_dns_secondary_secondary_zone: JsonSchema = {
+export const secondary$$dns_dns$$secondary$$secondary$$zone: JsonSchema = {
   "properties": {
     "auto_refresh_seconds": {
-      "$ref": "#/$defs/secondary-dns_auto_refresh_seconds",
       "default": 86400,
-      "description": "How often should a secondary zone auto refresh regardless of DNS NOTIFY.\nNot applicable for primary zones."
+      "description": "How often should a secondary zone auto refresh regardless of DNS NOTIFY.\nNot applicable for primary zones.",
+      "type": "number"
     },
     "name": {
-      "$ref": "#/$defs/secondary-dns_name",
-      "description": "Zone name."
+      "description": "Zone name.",
+      "type": "string"
     },
     "peers": {
       "$ref": "#/$defs/secondary-dns_peers",
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/incoming/tools.ts b/src/generated/forge-mcp/dns/zoneTransfers/incoming/tools.ts
index 063a7dad1..bf57998fc 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/incoming/tools.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/incoming/tools.ts
@@ -3,72 +3,60 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  secondary_dns_api_response_common_failure_output,
-  secondary_dns_api_response_single_output,
-  secondary_dns_id_response_output,
-  secondary_dns_identifier_output,
-  secondary_dns_messages_output,
-  secondary_dns_name_output,
-  secondary_dns_peers_output,
-  secondary_dns_soa_serial_output,
-  secondary_dns_time_output,
+  secondary$$dns_api$$response$$common$$failure,
+  secondary$$dns_api$$response$$single,
+  secondary$$dns_id_response,
+  secondary$$dns_messages,
+  secondary$$dns_peers,
 } from "../outputs.js";
-import {
-  secondary_dns_identifier,
-  secondary_dns_name,
-  secondary_dns_peers,
-} from "../schemas.js";
-import {
-  secondary_dns_auto_refresh_seconds_output,
-  secondary_dns_single_response_incoming_output,
-} from "./outputs.js";
-import {
-  secondary_dns_auto_refresh_seconds,
-  secondary_dns_dns_secondary_secondary_zone,
-} from "./schemas.js";
+import { secondary$$dns_peers as secondary$$dns_peers$ } from "../schemas.js";
+import { secondary$$dns_single_response_incoming } from "./outputs.js";
+import { secondary$$dns_dns$$secondary$$secondary$$zone } from "./schemas.js";
 
 /**
- * The tools of `dns.zone_transfers.incoming`.
+ * The tools of `dns.zoneTransfers.incoming`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_zone_transfers_incoming_create",
+    name: "dns_zoneTransfers_incoming_create",
     title: "Create Secondary Zone Configuration",
-    description: "Create secondary zone configuration for incoming zone transfers.",
+    description: "Create secondary zone configuration for incoming zone transfers.\n\nPOST /zones/{zone_id}/secondary_dns/incoming",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/secondary-dns_dns-secondary-secondary-zone"
         },
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secondary-dns_auto_refresh_seconds": secondary_dns_auto_refresh_seconds,
-        "secondary-dns_dns-secondary-secondary-zone": secondary_dns_dns_secondary_secondary_zone,
-        "secondary-dns_identifier": secondary_dns_identifier,
-        "secondary-dns_name": secondary_dns_name,
-        "secondary-dns_peers": secondary_dns_peers,
+        "secondary-dns_dns-secondary-secondary-zone": secondary$$dns_dns$$secondary$$secondary$$zone,
+        "secondary-dns_peers": secondary$$dns_peers$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response_incoming",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_auto_refresh_seconds": secondary_dns_auto_refresh_seconds_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_incoming": secondary_dns_single_response_incoming_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_incoming": secondary$$dns_single_response_incoming,
       },
     },
     annotations: {
@@ -110,16 +98,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_auto_refresh_seconds": secondary_dns_auto_refresh_seconds_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_incoming": secondary_dns_single_response_incoming_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_incoming": secondary$$dns_single_response_incoming,
       },
     },
     request: (args) => ({
@@ -128,30 +111,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_incoming_delete",
+    name: "dns_zoneTransfers_incoming_delete",
     title: "Delete Secondary Zone Configuration",
-    description: "Delete secondary zone configuration for incoming zone transfers.",
+    description: "Delete secondary zone configuration for incoming zone transfers.\n\nDELETE /zones/{zone_id}/secondary_dns/incoming",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_id_response",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response": secondary_dns_id_response_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response": secondary$$dns_id_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -193,11 +182,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response": secondary_dns_id_response_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response": secondary$$dns_id_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
@@ -205,35 +193,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_incoming_get",
+    name: "dns_zoneTransfers_incoming_get",
     title: "Secondary Zone Configuration Details",
-    description: "Get secondary zone configuration for incoming zone transfers.",
+    description: "Get secondary zone configuration for incoming zone transfers.\n\nGET /zones/{zone_id}/secondary_dns/incoming",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response_incoming",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_auto_refresh_seconds": secondary_dns_auto_refresh_seconds_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_incoming": secondary_dns_single_response_incoming_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_incoming": secondary$$dns_single_response_incoming,
       },
     },
     annotations: {
@@ -277,16 +267,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_auto_refresh_seconds": secondary_dns_auto_refresh_seconds_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_incoming": secondary_dns_single_response_incoming_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_incoming": secondary$$dns_single_response_incoming,
       },
     },
     request: (args) => ({
@@ -294,43 +279,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_incoming_update",
+    name: "dns_zoneTransfers_incoming_update",
     title: "Update Secondary Zone Configuration",
-    description: "Update secondary zone configuration for incoming zone transfers.",
+    description: "Update secondary zone configuration for incoming zone transfers.\n\nPUT /zones/{zone_id}/secondary_dns/incoming",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/secondary-dns_dns-secondary-secondary-zone"
         },
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secondary-dns_auto_refresh_seconds": secondary_dns_auto_refresh_seconds,
-        "secondary-dns_dns-secondary-secondary-zone": secondary_dns_dns_secondary_secondary_zone,
-        "secondary-dns_identifier": secondary_dns_identifier,
-        "secondary-dns_name": secondary_dns_name,
-        "secondary-dns_peers": secondary_dns_peers,
+        "secondary-dns_dns-secondary-secondary-zone": secondary$$dns_dns$$secondary$$secondary$$zone,
+        "secondary-dns_peers": secondary$$dns_peers$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response_incoming",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_auto_refresh_seconds": secondary_dns_auto_refresh_seconds_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_incoming": secondary_dns_single_response_incoming_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_incoming": secondary$$dns_single_response_incoming,
       },
     },
     annotations: {
@@ -372,16 +359,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_auto_refresh_seconds": secondary_dns_auto_refresh_seconds_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_incoming": secondary_dns_single_response_incoming_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_incoming": secondary$$dns_single_response_incoming,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/outgoing/outputs.ts b/src/generated/forge-mcp/dns/zoneTransfers/outgoing/outputs.ts
index a6e78743e..3fadb15e6 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/outgoing/outputs.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/outgoing/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `secondary-dns_disable_transfer_response` in responses.
  */
-export const secondary_dns_disable_transfer_response_output: JsonSchema = {
+export const secondary$$dns_disable_transfer_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -14,7 +14,7 @@ export const secondary_dns_disable_transfer_response_output: JsonSchema = {
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/secondary-dns_disable_transfer_result"
+          "type": "string"
         }
       },
       "type": "object"
@@ -22,17 +22,10 @@ export const secondary_dns_disable_transfer_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `secondary-dns_disable_transfer_result` in responses.
- */
-export const secondary_dns_disable_transfer_result_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_enable_transfer_response` in responses.
  */
-export const secondary_dns_enable_transfer_response_output: JsonSchema = {
+export const secondary$$dns_enable_transfer_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -40,7 +33,7 @@ export const secondary_dns_enable_transfer_response_output: JsonSchema = {
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/secondary-dns_enable_transfer_result"
+          "type": "string"
         }
       },
       "type": "object"
@@ -48,17 +41,10 @@ export const secondary_dns_enable_transfer_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `secondary-dns_enable_transfer_result` in responses.
- */
-export const secondary_dns_enable_transfer_result_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_force_response-2` in responses.
  */
-export const secondary_dns_force_response_2_output: JsonSchema = {
+export const secondary$$dns_force_response$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -66,7 +52,7 @@ export const secondary_dns_force_response_2_output: JsonSchema = {
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/secondary-dns_force_result-2"
+          "type": "string"
         }
       },
       "type": "object"
@@ -74,17 +60,10 @@ export const secondary_dns_force_response_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `secondary-dns_force_result-2` in responses.
- */
-export const secondary_dns_force_result_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_single_response_outgoing` in responses.
  */
-export const secondary_dns_single_response_outgoing_output: JsonSchema = {
+export const secondary$$dns_single_response_outgoing: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -94,25 +73,25 @@ export const secondary_dns_single_response_outgoing_output: JsonSchema = {
         "result": {
           "properties": {
             "checked_time": {
-              "$ref": "#/$defs/secondary-dns_time"
+              "type": "string"
             },
             "created_time": {
-              "$ref": "#/$defs/secondary-dns_time"
+              "type": "string"
             },
             "id": {
-              "$ref": "#/$defs/secondary-dns_identifier"
+              "type": "string"
             },
             "last_transferred_time": {
-              "$ref": "#/$defs/secondary-dns_time"
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/secondary-dns_name"
+              "type": "string"
             },
             "peers": {
               "$ref": "#/$defs/secondary-dns_peers"
             },
             "soa_serial": {
-              "$ref": "#/$defs/secondary-dns_soa_serial"
+              "type": "number"
             }
           },
           "type": "object"
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/outgoing/schemas.ts b/src/generated/forge-mcp/dns/zoneTransfers/outgoing/schemas.ts
index a85bdd5d5..fb2bdcb57 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/outgoing/schemas.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/outgoing/schemas.ts
@@ -6,11 +6,11 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `secondary-dns_single_request_outgoing`.
  */
-export const secondary_dns_single_request_outgoing: JsonSchema = {
+export const secondary$$dns_single_request_outgoing: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/secondary-dns_name",
-      "description": "Zone name."
+      "description": "Zone name.",
+      "type": "string"
     },
     "peers": {
       "$ref": "#/$defs/secondary-dns_peers",
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/outgoing/status/tools.ts b/src/generated/forge-mcp/dns/zoneTransfers/outgoing/status/tools.ts
index 888433b2e..9e7249162 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/outgoing/status/tools.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/outgoing/status/tools.ts
@@ -3,45 +3,47 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  secondary_dns_api_response_common_failure_output,
-  secondary_dns_api_response_single_output,
-  secondary_dns_messages_output,
+  secondary$$dns_api$$response$$common$$failure,
+  secondary$$dns_api$$response$$single,
+  secondary$$dns_messages,
 } from "../../outputs.js";
-import { secondary_dns_identifier } from "../../schemas.js";
-import {
-  secondary_dns_enable_transfer_response_output,
-  secondary_dns_enable_transfer_result_output,
-} from "../outputs.js";
+import { secondary$$dns_enable_transfer_response } from "../outputs.js";
 
 /**
- * The tools of `dns.zone_transfers.outgoing.status`.
+ * The tools of `dns.zoneTransfers.outgoing.status`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_zone_transfers_outgoing_status_get",
+    name: "dns_zoneTransfers_outgoing_status_get",
     title: "Get Outgoing Zone Transfer Status",
-    description: "Get primary zone transfer status.",
+    description: "Get primary zone transfer status.\n\nGET /zones/{zone_id}/secondary_dns/outgoing/status",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_enable_transfer_response",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_enable_transfer_response": secondary_dns_enable_transfer_response_output,
-        "secondary-dns_enable_transfer_result": secondary_dns_enable_transfer_result_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_enable_transfer_response": secondary$$dns_enable_transfer_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -85,11 +87,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_enable_transfer_response": secondary_dns_enable_transfer_response_output,
-        "secondary-dns_enable_transfer_result": secondary_dns_enable_transfer_result_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_enable_transfer_response": secondary$$dns_enable_transfer_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/outgoing/tools.ts b/src/generated/forge-mcp/dns/zoneTransfers/outgoing/tools.ts
index 422e3b5f0..4e88ae14f 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/outgoing/tools.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/outgoing/tools.ts
@@ -3,72 +3,65 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  secondary_dns_api_response_common_failure_output,
-  secondary_dns_api_response_single_output,
-  secondary_dns_id_response_output,
-  secondary_dns_identifier_output,
-  secondary_dns_messages_output,
-  secondary_dns_name_output,
-  secondary_dns_peers_output,
-  secondary_dns_soa_serial_output,
-  secondary_dns_time_output,
+  secondary$$dns_api$$response$$common$$failure,
+  secondary$$dns_api$$response$$single,
+  secondary$$dns_id_response,
+  secondary$$dns_messages,
+  secondary$$dns_peers,
 } from "../outputs.js";
+import { secondary$$dns_peers as secondary$$dns_peers$ } from "../schemas.js";
 import {
-  secondary_dns_identifier,
-  secondary_dns_name,
-  secondary_dns_peers,
-} from "../schemas.js";
-import {
-  secondary_dns_disable_transfer_response_output,
-  secondary_dns_disable_transfer_result_output,
-  secondary_dns_enable_transfer_response_output,
-  secondary_dns_enable_transfer_result_output,
-  secondary_dns_force_response_2_output,
-  secondary_dns_force_result_2_output,
-  secondary_dns_single_response_outgoing_output,
+  secondary$$dns_disable_transfer_response,
+  secondary$$dns_enable_transfer_response,
+  secondary$$dns_force_response$$2,
+  secondary$$dns_single_response_outgoing,
 } from "./outputs.js";
-import { secondary_dns_single_request_outgoing } from "./schemas.js";
+import { secondary$$dns_single_request_outgoing } from "./schemas.js";
 
 /**
- * The tools of `dns.zone_transfers.outgoing`.
+ * The tools of `dns.zoneTransfers.outgoing`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_zone_transfers_outgoing_create",
+    name: "dns_zoneTransfers_outgoing_create",
     title: "Create Primary Zone Configuration",
-    description: "Create primary zone configuration for outgoing zone transfers.",
+    description: "Create primary zone configuration for outgoing zone transfers.\n\nPOST /zones/{zone_id}/secondary_dns/outgoing",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/secondary-dns_single_request_outgoing"
         },
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-        "secondary-dns_name": secondary_dns_name,
-        "secondary-dns_peers": secondary_dns_peers,
-        "secondary-dns_single_request_outgoing": secondary_dns_single_request_outgoing,
+        "secondary-dns_peers": secondary$$dns_peers$,
+        "secondary-dns_single_request_outgoing": secondary$$dns_single_request_outgoing,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response_outgoing",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_outgoing": secondary_dns_single_response_outgoing_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_outgoing": secondary$$dns_single_response_outgoing,
       },
     },
     annotations: {
@@ -110,15 +103,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_outgoing": secondary_dns_single_response_outgoing_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_outgoing": secondary$$dns_single_response_outgoing,
       },
     },
     request: (args) => ({
@@ -127,30 +116,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_outgoing_delete",
+    name: "dns_zoneTransfers_outgoing_delete",
     title: "Delete Primary Zone Configuration",
-    description: "Delete primary zone configuration for outgoing zone transfers.",
+    description: "Delete primary zone configuration for outgoing zone transfers.\n\nDELETE /zones/{zone_id}/secondary_dns/outgoing",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_id_response",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response": secondary_dns_id_response_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response": secondary$$dns_id_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -192,11 +187,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response": secondary_dns_id_response_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response": secondary$$dns_id_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
@@ -204,30 +198,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_outgoing_disable",
+    name: "dns_zoneTransfers_outgoing_disable",
     title: "Disable Outgoing Zone Transfers",
-    description: "Disable outgoing zone transfers for primary zone and clears IXFR backlog of primary zone.\n\nConfirm with the user before calling this tool. This operation turns off outgoing zone transfers for the primary zone, which means secondary zones will stop receiving updates.",
+    description: "Disable outgoing zone transfers for primary zone and clears IXFR backlog of primary zone.\n\nConfirm with the user before calling this tool. This operation turns off outgoing zone transfers for the primary zone, which means secondary zones will stop receiving updates.\n\nPOST /zones/{zone_id}/secondary_dns/outgoing/disable",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_disable_transfer_response",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_disable_transfer_response": secondary_dns_disable_transfer_response_output,
-        "secondary-dns_disable_transfer_result": secondary_dns_disable_transfer_result_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_disable_transfer_response": secondary$$dns_disable_transfer_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -269,11 +269,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_disable_transfer_response": secondary_dns_disable_transfer_response_output,
-        "secondary-dns_disable_transfer_result": secondary_dns_disable_transfer_result_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_disable_transfer_response": secondary$$dns_disable_transfer_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
@@ -281,30 +280,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_outgoing_enable",
+    name: "dns_zoneTransfers_outgoing_enable",
     title: "Enable Outgoing Zone Transfers",
-    description: "Enable outgoing zone transfers for primary zone.",
+    description: "Enable outgoing zone transfers for primary zone.\n\nPOST /zones/{zone_id}/secondary_dns/outgoing/enable",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_enable_transfer_response",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_enable_transfer_response": secondary_dns_enable_transfer_response_output,
-        "secondary-dns_enable_transfer_result": secondary_dns_enable_transfer_result_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_enable_transfer_response": secondary$$dns_enable_transfer_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -346,11 +351,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_enable_transfer_response": secondary_dns_enable_transfer_response_output,
-        "secondary-dns_enable_transfer_result": secondary_dns_enable_transfer_result_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_enable_transfer_response": secondary$$dns_enable_transfer_response,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
@@ -358,30 +362,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_outgoing_force_notify",
+    name: "dns_zoneTransfers_outgoing_forceNotify",
     title: "Force DNS NOTIFY",
-    description: "Notifies the secondary nameserver(s) and clears IXFR backlog of primary zone.",
+    description: "Notifies the secondary nameserver(s) and clears IXFR backlog of primary zone.\n\nPOST /zones/{zone_id}/secondary_dns/outgoing/force_notify",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_force_response-2",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_force_response-2": secondary_dns_force_response_2_output,
-        "secondary-dns_force_result-2": secondary_dns_force_result_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_force_response-2": secondary$$dns_force_response$$2,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -423,11 +433,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_force_response-2": secondary_dns_force_response_2_output,
-        "secondary-dns_force_result-2": secondary_dns_force_result_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_force_response-2": secondary$$dns_force_response$$2,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
@@ -435,34 +444,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_outgoing_get",
+    name: "dns_zoneTransfers_outgoing_get",
     title: "Primary Zone Configuration Details",
-    description: "Get primary zone configuration for outgoing zone transfers.",
+    description: "Get primary zone configuration for outgoing zone transfers.\n\nGET /zones/{zone_id}/secondary_dns/outgoing",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response_outgoing",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_outgoing": secondary_dns_single_response_outgoing_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_outgoing": secondary$$dns_single_response_outgoing,
       },
     },
     annotations: {
@@ -506,15 +518,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_outgoing": secondary_dns_single_response_outgoing_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_outgoing": secondary$$dns_single_response_outgoing,
       },
     },
     request: (args) => ({
@@ -522,41 +530,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_outgoing_update",
+    name: "dns_zoneTransfers_outgoing_update",
     title: "Update Primary Zone Configuration",
-    description: "Update primary zone configuration for outgoing zone transfers.",
+    description: "Update primary zone configuration for outgoing zone transfers.\n\nPUT /zones/{zone_id}/secondary_dns/outgoing",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/secondary-dns_single_request_outgoing"
         },
-        "zone_id": {
-          "$ref": "#/$defs/secondary-dns_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secondary-dns_identifier": secondary_dns_identifier,
-        "secondary-dns_name": secondary_dns_name,
-        "secondary-dns_peers": secondary_dns_peers,
-        "secondary-dns_single_request_outgoing": secondary_dns_single_request_outgoing,
+        "secondary-dns_peers": secondary$$dns_peers$,
+        "secondary-dns_single_request_outgoing": secondary$$dns_single_request_outgoing,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response_outgoing",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_outgoing": secondary_dns_single_response_outgoing_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_outgoing": secondary$$dns_single_response_outgoing,
       },
     },
     annotations: {
@@ -598,15 +610,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier": secondary_dns_identifier_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name": secondary_dns_name_output,
-        "secondary-dns_peers": secondary_dns_peers_output,
-        "secondary-dns_single_response_outgoing": secondary_dns_single_response_outgoing_output,
-        "secondary-dns_soa_serial": secondary_dns_soa_serial_output,
-        "secondary-dns_time": secondary_dns_time_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peers": secondary$$dns_peers,
+        "secondary-dns_single_response_outgoing": secondary$$dns_single_response_outgoing,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/outputs.ts b/src/generated/forge-mcp/dns/zoneTransfers/outputs.ts
index 2294563e2..1ecd98341 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/outputs.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `secondary-dns_api-response-collection` in responses.
  */
-export const secondary_dns_api_response_collection_output: JsonSchema = {
+export const secondary$$dns_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-common"
@@ -42,7 +42,7 @@ export const secondary_dns_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `secondary-dns_api-response-common` in responses.
  */
-export const secondary_dns_api_response_common_output: JsonSchema = {
+export const secondary$$dns_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/secondary-dns_messages"
@@ -68,7 +68,7 @@ export const secondary_dns_api_response_common_output: JsonSchema = {
 /**
  * The schema of `secondary-dns_api-response-common-failure` in responses.
  */
-export const secondary_dns_api_response_common_failure_output: JsonSchema = {
+export const secondary$$dns_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/secondary-dns_messages"
@@ -98,7 +98,7 @@ export const secondary_dns_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `secondary-dns_api-response-single` in responses.
  */
-export const secondary_dns_api_response_single_output: JsonSchema = {
+export const secondary$$dns_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/secondary-dns_messages"
@@ -124,7 +124,7 @@ export const secondary_dns_api_response_single_output: JsonSchema = {
 /**
  * The schema of `secondary-dns_id_response` in responses.
  */
-export const secondary_dns_id_response_output: JsonSchema = {
+export const secondary$$dns_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -134,7 +134,7 @@ export const secondary_dns_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/secondary-dns_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -148,7 +148,7 @@ export const secondary_dns_id_response_output: JsonSchema = {
 /**
  * The schema of `secondary-dns_id_response-3` in responses.
  */
-export const secondary_dns_id_response_3_output: JsonSchema = {
+export const secondary$$dns_id_response$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -158,7 +158,7 @@ export const secondary_dns_id_response_3_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/secondary-dns_identifier-3"
+              "type": "string"
             }
           },
           "type": "object"
@@ -169,24 +169,10 @@ export const secondary_dns_id_response_3_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `secondary-dns_identifier` in responses.
- */
-export const secondary_dns_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_identifier-3` in responses.
- */
-export const secondary_dns_identifier_3_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_messages` in responses.
  */
-export const secondary_dns_messages_output: JsonSchema = {
+export const secondary$$dns_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -216,33 +202,12 @@ export const secondary_dns_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `secondary-dns_name` in responses.
- */
-export const secondary_dns_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_peers` in responses.
  */
-export const secondary_dns_peers_output: JsonSchema = {
+export const secondary$$dns_peers: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/secondary-dns_identifier"
+    "type": "string"
   },
   "type": "array"
 };
-
-/**
- * The schema of `secondary-dns_soa_serial` in responses.
- */
-export const secondary_dns_soa_serial_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `secondary-dns_time` in responses.
- */
-export const secondary_dns_time_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/peers/outputs.ts b/src/generated/forge-mcp/dns/zoneTransfers/peers/outputs.ts
index d2a841450..89801a121 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/peers/outputs.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/peers/outputs.ts
@@ -3,49 +3,28 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `secondary-dns_ip` in responses.
- */
-export const secondary_dns_ip_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_ixfr_enable` in responses.
- */
-export const secondary_dns_ixfr_enable_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `secondary-dns_name-3` in responses.
- */
-export const secondary_dns_name_3_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_peer` in responses.
  */
-export const secondary_dns_peer_output: JsonSchema = {
+export const secondary$$dns_peer: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/secondary-dns_identifier-3"
+      "type": "string"
     },
     "ip": {
-      "$ref": "#/$defs/secondary-dns_ip"
+      "type": "string"
     },
     "ixfr_enable": {
-      "$ref": "#/$defs/secondary-dns_ixfr_enable"
+      "type": "boolean"
     },
     "name": {
-      "$ref": "#/$defs/secondary-dns_name-3"
+      "type": "string"
     },
     "port": {
-      "$ref": "#/$defs/secondary-dns_port"
+      "type": "number"
     },
     "tsig_id": {
-      "$ref": "#/$defs/secondary-dns_tsig_id"
+      "type": "string"
     }
   },
   "required": [
@@ -55,17 +34,10 @@ export const secondary_dns_peer_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `secondary-dns_port` in responses.
- */
-export const secondary_dns_port_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `secondary-dns_response_collection-2` in responses.
  */
-export const secondary_dns_response_collection_2_output: JsonSchema = {
+export const secondary$$dns_response_collection$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-collection"
@@ -87,7 +59,7 @@ export const secondary_dns_response_collection_2_output: JsonSchema = {
 /**
  * The schema of `secondary-dns_single_response-2` in responses.
  */
-export const secondary_dns_single_response_2_output: JsonSchema = {
+export const secondary$$dns_single_response$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -102,10 +74,3 @@ export const secondary_dns_single_response_2_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `secondary-dns_tsig_id` in responses.
- */
-export const secondary_dns_tsig_id_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/peers/schemas.ts b/src/generated/forge-mcp/dns/zoneTransfers/peers/schemas.ts
index ab3dce73f..e14256627 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/peers/schemas.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/peers/schemas.ts
@@ -3,54 +3,30 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `secondary-dns_ip`.
- */
-export const secondary_dns_ip: JsonSchema = {
-  "description": "IPv4/IPv6 address of primary or secondary nameserver, depending on what zone this peer is linked to. For primary zones this IP defines the IP of the secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary zones this IP defines the IP of the primary nameserver Cloudflare will send AXFR/IXFR requests to.",
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_ixfr_enable`.
- */
-export const secondary_dns_ixfr_enable: JsonSchema = {
-  "description": "Enable IXFR transfer protocol, default is AXFR. Only applicable to secondary zones.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `secondary-dns_name-3`.
- */
-export const secondary_dns_name_3: JsonSchema = {
-  "description": "The name of the peer.",
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_peer`.
  */
-export const secondary_dns_peer: JsonSchema = {
+export const secondary$$dns_peer: JsonSchema = {
   "properties": {
     "ip": {
-      "$ref": "#/$defs/secondary-dns_ip",
-      "description": "IPv4/IPv6 address of primary or secondary nameserver, depending on what zone this peer is linked to. For primary zones this IP defines the IP of the secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary zones this IP defines the IP of the primary nameserver Cloudflare will send AXFR/IXFR requests to."
+      "description": "IPv4/IPv6 address of primary or secondary nameserver, depending on what zone this peer is linked to. For primary zones this IP defines the IP of the secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary zones this IP defines the IP of the primary nameserver Cloudflare will send AXFR/IXFR requests to.",
+      "type": "string"
     },
     "ixfr_enable": {
-      "$ref": "#/$defs/secondary-dns_ixfr_enable",
-      "description": "Enable IXFR transfer protocol, default is AXFR. Only applicable to secondary zones."
+      "description": "Enable IXFR transfer protocol, default is AXFR. Only applicable to secondary zones.",
+      "type": "boolean"
     },
     "name": {
-      "$ref": "#/$defs/secondary-dns_name-3",
-      "description": "The name of the peer."
+      "description": "The name of the peer.",
+      "type": "string"
     },
     "port": {
-      "$ref": "#/$defs/secondary-dns_port",
-      "description": "DNS port of primary or secondary nameserver, depending on what zone this peer is linked to."
+      "description": "DNS port of primary or secondary nameserver, depending on what zone this peer is linked to.",
+      "type": "number"
     },
     "tsig_id": {
-      "$ref": "#/$defs/secondary-dns_tsig_id",
-      "description": "TSIG authentication will be used for zone transfer if configured."
+      "description": "TSIG authentication will be used for zone transfer if configured.",
+      "type": "string"
     }
   },
   "required": [
@@ -58,19 +34,3 @@ export const secondary_dns_peer: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `secondary-dns_port`.
- */
-export const secondary_dns_port: JsonSchema = {
-  "description": "DNS port of primary or secondary nameserver, depending on what zone this peer is linked to.",
-  "type": "number"
-};
-
-/**
- * The schema of `secondary-dns_tsig_id`.
- */
-export const secondary_dns_tsig_id: JsonSchema = {
-  "description": "TSIG authentication will be used for zone transfer if configured.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/peers/tools.ts b/src/generated/forge-mcp/dns/zoneTransfers/peers/tools.ts
index 1092c5638..4bed777bc 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/peers/tools.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/peers/tools.ts
@@ -3,86 +3,69 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  secondary_dns_api_response_collection_output,
-  secondary_dns_api_response_common_failure_output,
-  secondary_dns_api_response_common_output,
-  secondary_dns_api_response_single_output,
-  secondary_dns_id_response_3_output,
-  secondary_dns_identifier_3_output,
-  secondary_dns_messages_output,
+  secondary$$dns_api$$response$$collection,
+  secondary$$dns_api$$response$$common,
+  secondary$$dns_api$$response$$common$$failure,
+  secondary$$dns_api$$response$$single,
+  secondary$$dns_id_response$$3,
+  secondary$$dns_messages,
 } from "../outputs.js";
 import {
-  secondary_dns_account_identifier,
-  secondary_dns_identifier_3,
-} from "../schemas.js";
-import {
-  secondary_dns_ip_output,
-  secondary_dns_ixfr_enable_output,
-  secondary_dns_name_3_output,
-  secondary_dns_peer_output,
-  secondary_dns_port_output,
-  secondary_dns_response_collection_2_output,
-  secondary_dns_single_response_2_output,
-  secondary_dns_tsig_id_output,
+  secondary$$dns_peer,
+  secondary$$dns_response_collection$$2,
+  secondary$$dns_single_response$$2,
 } from "./outputs.js";
-import {
-  secondary_dns_ip,
-  secondary_dns_ixfr_enable,
-  secondary_dns_name_3,
-  secondary_dns_peer,
-  secondary_dns_port,
-  secondary_dns_tsig_id,
-} from "./schemas.js";
+import { secondary$$dns_peer as secondary$$dns_peer$ } from "./schemas.js";
 
 /**
- * The tools of `dns.zone_transfers.peers`.
+ * The tools of `dns.zoneTransfers.peers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_zone_transfers_peers_create",
+    name: "dns_zoneTransfers_peers_create",
     title: "Create Peer",
-    description: "Create Peer.",
+    description: "Create Peer.\n\nPOST /accounts/{account_id}/secondary_dns/peers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
         "body": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/secondary-dns_name-3",
-              "description": "The name of the peer."
+              "description": "The name of the peer.",
+              "type": "string"
             }
           },
           "required": [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_name-3": secondary_dns_name_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response-2",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip": secondary_dns_ip_output,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-3": secondary_dns_name_3_output,
-        "secondary-dns_peer": secondary_dns_peer_output,
-        "secondary-dns_port": secondary_dns_port_output,
-        "secondary-dns_single_response-2": secondary_dns_single_response_2_output,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peer": secondary$$dns_peer,
+        "secondary-dns_single_response-2": secondary$$dns_single_response$$2,
       },
     },
     annotations: {
@@ -122,17 +105,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip": secondary_dns_ip_output,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-3": secondary_dns_name_3_output,
-        "secondary-dns_peer": secondary_dns_peer_output,
-        "secondary-dns_port": secondary_dns_port_output,
-        "secondary-dns_single_response-2": secondary_dns_single_response_2_output,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peer": secondary$$dns_peer,
+        "secondary-dns_single_response-2": secondary$$dns_single_response$$2,
       },
     },
     request: (args) => ({
@@ -141,35 +118,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_peers_delete",
+    name: "dns_zoneTransfers_peers_delete",
     title: "Delete Peer",
-    description: "Delete Peer.",
+    description: "Delete Peer.\n\nDELETE /accounts/{account_id}/secondary_dns/peers/{peer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
-        "peer_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "peer_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "peer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "peer_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_id_response-3",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response-3": secondary_dns_id_response_3_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response-3": secondary$$dns_id_response$$3,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -209,11 +191,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response-3": secondary_dns_id_response_3_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response-3": secondary$$dns_id_response$$3,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
@@ -221,41 +202,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_peers_get",
+    name: "dns_zoneTransfers_peers_get",
     title: "Peer Details",
-    description: "Get Peer.",
+    description: "Get Peer.\n\nGET /accounts/{account_id}/secondary_dns/peers/{peer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
-        "peer_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "peer_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "peer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "peer_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response-2",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip": secondary_dns_ip_output,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-3": secondary_dns_name_3_output,
-        "secondary-dns_peer": secondary_dns_peer_output,
-        "secondary-dns_port": secondary_dns_port_output,
-        "secondary-dns_single_response-2": secondary_dns_single_response_2_output,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peer": secondary$$dns_peer,
+        "secondary-dns_single_response-2": secondary$$dns_single_response$$2,
       },
     },
     annotations: {
@@ -296,17 +277,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip": secondary_dns_ip_output,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-3": secondary_dns_name_3_output,
-        "secondary-dns_peer": secondary_dns_peer_output,
-        "secondary-dns_port": secondary_dns_port_output,
-        "secondary-dns_single_response-2": secondary_dns_single_response_2_output,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peer": secondary$$dns_peer,
+        "secondary-dns_single_response-2": secondary$$dns_single_response$$2,
       },
     },
     request: (args) => ({
@@ -314,37 +289,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_peers_list",
+    name: "dns_zoneTransfers_peers_list",
     title: "List Peers",
-    description: "List Peers.",
+    description: "List Peers.\n\nGET /accounts/{account_id}/secondary_dns/peers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_response_collection-2",
       $defs: {
-        "secondary-dns_api-response-collection": secondary_dns_api_response_collection_output,
-        "secondary-dns_api-response-common": secondary_dns_api_response_common_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip": secondary_dns_ip_output,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-3": secondary_dns_name_3_output,
-        "secondary-dns_peer": secondary_dns_peer_output,
-        "secondary-dns_port": secondary_dns_port_output,
-        "secondary-dns_response_collection-2": secondary_dns_response_collection_2_output,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id_output,
+        "secondary-dns_api-response-collection": secondary$$dns_api$$response$$collection,
+        "secondary-dns_api-response-common": secondary$$dns_api$$response$$common,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peer": secondary$$dns_peer,
+        "secondary-dns_response_collection-2": secondary$$dns_response_collection$$2,
       },
     },
     annotations: {
@@ -385,18 +361,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-collection": secondary_dns_api_response_collection_output,
-        "secondary-dns_api-response-common": secondary_dns_api_response_common_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip": secondary_dns_ip_output,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-3": secondary_dns_name_3_output,
-        "secondary-dns_peer": secondary_dns_peer_output,
-        "secondary-dns_port": secondary_dns_port_output,
-        "secondary-dns_response_collection-2": secondary_dns_response_collection_2_output,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id_output,
+        "secondary-dns_api-response-collection": secondary$$dns_api$$response$$collection,
+        "secondary-dns_api-response-common": secondary$$dns_api$$response$$common,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peer": secondary$$dns_peer,
+        "secondary-dns_response_collection-2": secondary$$dns_response_collection$$2,
       },
     },
     request: (args) => ({
@@ -404,51 +374,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_peers_update",
+    name: "dns_zoneTransfers_peers_update",
     title: "Update Peer",
-    description: "Modify Peer.",
+    description: "Modify Peer.\n\nPUT /accounts/{account_id}/secondary_dns/peers/{peer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
         "body": {
           "$ref": "#/$defs/secondary-dns_peer"
         },
-        "peer_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "peer_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "peer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "peer_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3,
-        "secondary-dns_ip": secondary_dns_ip,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable,
-        "secondary-dns_name-3": secondary_dns_name_3,
-        "secondary-dns_peer": secondary_dns_peer,
-        "secondary-dns_port": secondary_dns_port,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id,
+        "secondary-dns_peer": secondary$$dns_peer$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response-2",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip": secondary_dns_ip_output,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-3": secondary_dns_name_3_output,
-        "secondary-dns_peer": secondary_dns_peer_output,
-        "secondary-dns_port": secondary_dns_port_output,
-        "secondary-dns_single_response-2": secondary_dns_single_response_2_output,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peer": secondary$$dns_peer,
+        "secondary-dns_single_response-2": secondary$$dns_single_response$$2,
       },
     },
     annotations: {
@@ -488,17 +455,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-3": secondary_dns_identifier_3_output,
-        "secondary-dns_ip": secondary_dns_ip_output,
-        "secondary-dns_ixfr_enable": secondary_dns_ixfr_enable_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-3": secondary_dns_name_3_output,
-        "secondary-dns_peer": secondary_dns_peer_output,
-        "secondary-dns_port": secondary_dns_port_output,
-        "secondary-dns_single_response-2": secondary_dns_single_response_2_output,
-        "secondary-dns_tsig_id": secondary_dns_tsig_id_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_peer": secondary$$dns_peer,
+        "secondary-dns_single_response-2": secondary$$dns_single_response$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/schemas.ts b/src/generated/forge-mcp/dns/zoneTransfers/schemas.ts
index 60ca3f1e7..706ba89b0 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/schemas.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/schemas.ts
@@ -3,42 +3,13 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `secondary-dns_account_identifier`.
- */
-export const secondary_dns_account_identifier: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_identifier`.
- */
-export const secondary_dns_identifier: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_identifier-3`.
- */
-export const secondary_dns_identifier_3: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_name`.
- */
-export const secondary_dns_name: JsonSchema = {
-  "description": "Zone name.",
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_peers`.
  */
-export const secondary_dns_peers: JsonSchema = {
+export const secondary$$dns_peers: JsonSchema = {
   "description": "A list of peer tags.",
   "items": {
-    "$ref": "#/$defs/secondary-dns_identifier"
+    "type": "string"
   },
   "type": "array"
 };
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/tsigs/outputs.ts b/src/generated/forge-mcp/dns/zoneTransfers/tsigs/outputs.ts
index 45797fbd8..daadf1dbf 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/tsigs/outputs.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/tsigs/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `secondary-dns_algo` in responses.
- */
-export const secondary_dns_algo_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_id_response-2` in responses.
  */
-export const secondary_dns_id_response_2_output: JsonSchema = {
+export const secondary$$dns_id_response$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -23,7 +16,7 @@ export const secondary_dns_id_response_2_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/secondary-dns_identifier-2"
+              "type": "string"
             }
           },
           "type": "object"
@@ -34,24 +27,10 @@ export const secondary_dns_id_response_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `secondary-dns_identifier-2` in responses.
- */
-export const secondary_dns_identifier_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_name-2` in responses.
- */
-export const secondary_dns_name_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_response_collection` in responses.
  */
-export const secondary_dns_response_collection_output: JsonSchema = {
+export const secondary$$dns_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-collection"
@@ -70,17 +49,10 @@ export const secondary_dns_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `secondary-dns_secret` in responses.
- */
-export const secondary_dns_secret_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_single_response` in responses.
  */
-export const secondary_dns_single_response_output: JsonSchema = {
+export const secondary$$dns_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secondary-dns_api-response-single"
@@ -99,19 +71,19 @@ export const secondary_dns_single_response_output: JsonSchema = {
 /**
  * The schema of `secondary-dns_tsig` in responses.
  */
-export const secondary_dns_tsig_output: JsonSchema = {
+export const secondary$$dns_tsig: JsonSchema = {
   "properties": {
     "algo": {
-      "$ref": "#/$defs/secondary-dns_algo"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/secondary-dns_identifier-2"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/secondary-dns_name-2"
+      "type": "string"
     },
     "secret": {
-      "$ref": "#/$defs/secondary-dns_secret"
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/tsigs/schemas.ts b/src/generated/forge-mcp/dns/zoneTransfers/tsigs/schemas.ts
index f27913075..01e4fb0b2 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/tsigs/schemas.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/tsigs/schemas.ts
@@ -3,53 +3,22 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `secondary-dns_algo`.
- */
-export const secondary_dns_algo: JsonSchema = {
-  "description": "TSIG algorithm.",
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_identifier-2`.
- */
-export const secondary_dns_identifier_2: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_name-2`.
- */
-export const secondary_dns_name_2: JsonSchema = {
-  "description": "TSIG key name.",
-  "type": "string"
-};
-
-/**
- * The schema of `secondary-dns_secret`.
- */
-export const secondary_dns_secret: JsonSchema = {
-  "description": "TSIG secret.",
-  "type": "string"
-};
-
 /**
  * The schema of `secondary-dns_tsig`.
  */
-export const secondary_dns_tsig: JsonSchema = {
+export const secondary$$dns_tsig: JsonSchema = {
   "properties": {
     "algo": {
-      "$ref": "#/$defs/secondary-dns_algo",
-      "description": "TSIG algorithm."
+      "description": "TSIG algorithm.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/secondary-dns_name-2",
-      "description": "TSIG key name."
+      "description": "TSIG key name.",
+      "type": "string"
     },
     "secret": {
-      "$ref": "#/$defs/secondary-dns_secret",
-      "description": "TSIG secret."
+      "description": "TSIG secret.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/dns/zoneTransfers/tsigs/tools.ts b/src/generated/forge-mcp/dns/zoneTransfers/tsigs/tools.ts
index 7904313b7..95915b002 100644
--- a/src/generated/forge-mcp/dns/zoneTransfers/tsigs/tools.ts
+++ b/src/generated/forge-mcp/dns/zoneTransfers/tsigs/tools.ts
@@ -3,72 +3,63 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  secondary_dns_api_response_collection_output,
-  secondary_dns_api_response_common_failure_output,
-  secondary_dns_api_response_common_output,
-  secondary_dns_api_response_single_output,
-  secondary_dns_messages_output,
+  secondary$$dns_api$$response$$collection,
+  secondary$$dns_api$$response$$common,
+  secondary$$dns_api$$response$$common$$failure,
+  secondary$$dns_api$$response$$single,
+  secondary$$dns_messages,
 } from "../outputs.js";
-import { secondary_dns_account_identifier } from "../schemas.js";
 import {
-  secondary_dns_algo_output,
-  secondary_dns_id_response_2_output,
-  secondary_dns_identifier_2_output,
-  secondary_dns_name_2_output,
-  secondary_dns_response_collection_output,
-  secondary_dns_secret_output,
-  secondary_dns_single_response_output,
-  secondary_dns_tsig_output,
+  secondary$$dns_id_response$$2,
+  secondary$$dns_response_collection,
+  secondary$$dns_single_response,
+  secondary$$dns_tsig,
 } from "./outputs.js";
-import {
-  secondary_dns_algo,
-  secondary_dns_identifier_2,
-  secondary_dns_name_2,
-  secondary_dns_secret,
-  secondary_dns_tsig,
-} from "./schemas.js";
+import { secondary$$dns_tsig as secondary$$dns_tsig$ } from "./schemas.js";
 
 /**
- * The tools of `dns.zone_transfers.tsigs`.
+ * The tools of `dns.zoneTransfers.tsigs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_zone_transfers_tsigs_create",
+    name: "dns_zoneTransfers_tsigs_create",
     title: "Create TSIG",
-    description: "Create TSIG.",
+    description: "Create TSIG.\n\nPOST /accounts/{account_id}/secondary_dns/tsigs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
         "body": {
           "$ref": "#/$defs/secondary-dns_tsig"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_algo": secondary_dns_algo,
-        "secondary-dns_name-2": secondary_dns_name_2,
-        "secondary-dns_secret": secondary_dns_secret,
-        "secondary-dns_tsig": secondary_dns_tsig,
+        "secondary-dns_tsig": secondary$$dns_tsig$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response",
       $defs: {
-        "secondary-dns_algo": secondary_dns_algo_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-2": secondary_dns_name_2_output,
-        "secondary-dns_secret": secondary_dns_secret_output,
-        "secondary-dns_single_response": secondary_dns_single_response_output,
-        "secondary-dns_tsig": secondary_dns_tsig_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response": secondary$$dns_single_response,
+        "secondary-dns_tsig": secondary$$dns_tsig,
       },
     },
     annotations: {
@@ -108,15 +99,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_algo": secondary_dns_algo_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-2": secondary_dns_name_2_output,
-        "secondary-dns_secret": secondary_dns_secret_output,
-        "secondary-dns_single_response": secondary_dns_single_response_output,
-        "secondary-dns_tsig": secondary_dns_tsig_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response": secondary$$dns_single_response,
+        "secondary-dns_tsig": secondary$$dns_tsig,
       },
     },
     request: (args) => ({
@@ -125,35 +112,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_tsigs_delete",
+    name: "dns_zoneTransfers_tsigs_delete",
     title: "Delete TSIG",
-    description: "Delete TSIG.",
+    description: "Delete TSIG.\n\nDELETE /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
-        "tsig_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "tsig_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tsig_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tsig_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_id_response-2",
       $defs: {
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response-2": secondary_dns_id_response_2_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response-2": secondary$$dns_id_response$$2,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     annotations: {
@@ -193,11 +185,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_id_response-2": secondary_dns_id_response_2_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_id_response-2": secondary$$dns_id_response$$2,
+        "secondary-dns_messages": secondary$$dns_messages,
       },
     },
     request: (args) => ({
@@ -205,39 +196,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_tsigs_get",
+    name: "dns_zoneTransfers_tsigs_get",
     title: "TSIG Details",
-    description: "Get TSIG.",
+    description: "Get TSIG.\n\nGET /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
-        "tsig_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "tsig_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tsig_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tsig_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response",
       $defs: {
-        "secondary-dns_algo": secondary_dns_algo_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-2": secondary_dns_name_2_output,
-        "secondary-dns_secret": secondary_dns_secret_output,
-        "secondary-dns_single_response": secondary_dns_single_response_output,
-        "secondary-dns_tsig": secondary_dns_tsig_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response": secondary$$dns_single_response,
+        "secondary-dns_tsig": secondary$$dns_tsig,
       },
     },
     annotations: {
@@ -278,15 +271,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_algo": secondary_dns_algo_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-2": secondary_dns_name_2_output,
-        "secondary-dns_secret": secondary_dns_secret_output,
-        "secondary-dns_single_response": secondary_dns_single_response_output,
-        "secondary-dns_tsig": secondary_dns_tsig_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response": secondary$$dns_single_response,
+        "secondary-dns_tsig": secondary$$dns_tsig,
       },
     },
     request: (args) => ({
@@ -294,35 +283,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_tsigs_list",
+    name: "dns_zoneTransfers_tsigs_list",
     title: "List TSIGs",
-    description: "List TSIGs.",
+    description: "List TSIGs.\n\nGET /accounts/{account_id}/secondary_dns/tsigs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_response_collection",
       $defs: {
-        "secondary-dns_algo": secondary_dns_algo_output,
-        "secondary-dns_api-response-collection": secondary_dns_api_response_collection_output,
-        "secondary-dns_api-response-common": secondary_dns_api_response_common_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-2": secondary_dns_name_2_output,
-        "secondary-dns_response_collection": secondary_dns_response_collection_output,
-        "secondary-dns_secret": secondary_dns_secret_output,
-        "secondary-dns_tsig": secondary_dns_tsig_output,
+        "secondary-dns_api-response-collection": secondary$$dns_api$$response$$collection,
+        "secondary-dns_api-response-common": secondary$$dns_api$$response$$common,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_response_collection": secondary$$dns_response_collection,
+        "secondary-dns_tsig": secondary$$dns_tsig,
       },
     },
     annotations: {
@@ -363,16 +355,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_algo": secondary_dns_algo_output,
-        "secondary-dns_api-response-collection": secondary_dns_api_response_collection_output,
-        "secondary-dns_api-response-common": secondary_dns_api_response_common_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-2": secondary_dns_name_2_output,
-        "secondary-dns_response_collection": secondary_dns_response_collection_output,
-        "secondary-dns_secret": secondary_dns_secret_output,
-        "secondary-dns_tsig": secondary_dns_tsig_output,
+        "secondary-dns_api-response-collection": secondary$$dns_api$$response$$collection,
+        "secondary-dns_api-response-common": secondary$$dns_api$$response$$common,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_response_collection": secondary$$dns_response_collection,
+        "secondary-dns_tsig": secondary$$dns_tsig,
       },
     },
     request: (args) => ({
@@ -380,47 +368,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_zone_transfers_tsigs_update",
+    name: "dns_zoneTransfers_tsigs_update",
     title: "Update TSIG",
-    description: "Modify TSIG.",
+    description: "Modify TSIG.\n\nPUT /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/secondary-dns_account_identifier"
-        },
         "body": {
           "$ref": "#/$defs/secondary-dns_tsig"
         },
-        "tsig_id": {
-          "$ref": "#/$defs/secondary-dns_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "tsig_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tsig_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tsig_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secondary-dns_account_identifier": secondary_dns_account_identifier,
-        "secondary-dns_algo": secondary_dns_algo,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2,
-        "secondary-dns_name-2": secondary_dns_name_2,
-        "secondary-dns_secret": secondary_dns_secret,
-        "secondary-dns_tsig": secondary_dns_tsig,
+        "secondary-dns_tsig": secondary$$dns_tsig$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secondary-dns_single_response",
       $defs: {
-        "secondary-dns_algo": secondary_dns_algo_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-2": secondary_dns_name_2_output,
-        "secondary-dns_secret": secondary_dns_secret_output,
-        "secondary-dns_single_response": secondary_dns_single_response_output,
-        "secondary-dns_tsig": secondary_dns_tsig_output,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response": secondary$$dns_single_response,
+        "secondary-dns_tsig": secondary$$dns_tsig,
       },
     },
     annotations: {
@@ -460,15 +449,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secondary-dns_algo": secondary_dns_algo_output,
-        "secondary-dns_api-response-common-failure": secondary_dns_api_response_common_failure_output,
-        "secondary-dns_api-response-single": secondary_dns_api_response_single_output,
-        "secondary-dns_identifier-2": secondary_dns_identifier_2_output,
-        "secondary-dns_messages": secondary_dns_messages_output,
-        "secondary-dns_name-2": secondary_dns_name_2_output,
-        "secondary-dns_secret": secondary_dns_secret_output,
-        "secondary-dns_single_response": secondary_dns_single_response_output,
-        "secondary-dns_tsig": secondary_dns_tsig_output,
+        "secondary-dns_api-response-common-failure": secondary$$dns_api$$response$$common$$failure,
+        "secondary-dns_api-response-single": secondary$$dns_api$$response$$single,
+        "secondary-dns_messages": secondary$$dns_messages,
+        "secondary-dns_single_response": secondary$$dns_single_response,
+        "secondary-dns_tsig": secondary$$dns_tsig,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dnsFirewall/outputs.ts b/src/generated/forge-mcp/dnsFirewall/outputs.ts
index 4e7006d93..653ddc48b 100644
--- a/src/generated/forge-mcp/dnsFirewall/outputs.ts
+++ b/src/generated/forge-mcp/dnsFirewall/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `dns-firewall_api-response-collection` in responses.
  */
-export const dns_firewall_api_response_collection_output: JsonSchema = {
+export const dns$$firewall_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-firewall_api-response-common"
@@ -42,7 +42,7 @@ export const dns_firewall_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `dns-firewall_api-response-common` in responses.
  */
-export const dns_firewall_api_response_common_output: JsonSchema = {
+export const dns$$firewall_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-firewall_messages"
@@ -68,7 +68,7 @@ export const dns_firewall_api_response_common_output: JsonSchema = {
 /**
  * The schema of `dns-firewall_api-response-common-failure` in responses.
  */
-export const dns_firewall_api_response_common_failure_output: JsonSchema = {
+export const dns$$firewall_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-firewall_messages"
@@ -98,7 +98,7 @@ export const dns_firewall_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `dns-firewall_api-response-single` in responses.
  */
-export const dns_firewall_api_response_single_output: JsonSchema = {
+export const dns$$firewall_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-firewall_messages"
@@ -124,7 +124,7 @@ export const dns_firewall_api_response_single_output: JsonSchema = {
 /**
  * The schema of `dns-firewall_attack_mitigation` in responses.
  */
-export const dns_firewall_attack_mitigation_output: JsonSchema = {
+export const dns$$firewall_attack_mitigation: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -143,44 +143,51 @@ export const dns_firewall_attack_mitigation_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dns-firewall_deprecate_any_requests` in responses.
- */
-export const dns_firewall_deprecate_any_requests_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `dns-firewall_dns-firewall-cluster` in responses.
  */
-export const dns_firewall_dns_firewall_cluster_output: JsonSchema = {
+export const dns$$firewall_dns$$firewall$$cluster: JsonSchema = {
   "properties": {
     "attack_mitigation": {
       "$ref": "#/$defs/dns-firewall_attack_mitigation"
     },
     "deprecate_any_requests": {
-      "$ref": "#/$defs/dns-firewall_deprecate_any_requests"
+      "type": "boolean"
     },
     "ecs_fallback": {
-      "$ref": "#/$defs/dns-firewall_ecs_fallback"
+      "type": "boolean"
     },
     "maximum_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_maximum_cache_ttl"
+      "type": "number"
     },
     "minimum_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_minimum_cache_ttl"
+      "type": "number"
     },
     "name": {
-      "$ref": "#/$defs/dns-firewall_name"
+      "type": "string"
     },
     "negative_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_negative_cache_ttl"
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "ratelimit": {
-      "$ref": "#/$defs/dns-firewall_ratelimit"
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "retries": {
-      "$ref": "#/$defs/dns-firewall_retries"
+      "type": "number"
     },
     "upstream_ips": {
       "$ref": "#/$defs/dns-firewall_upstream_ips"
@@ -192,7 +199,7 @@ export const dns_firewall_dns_firewall_cluster_output: JsonSchema = {
 /**
  * The schema of `dns-firewall_dns-firewall-cluster-response` in responses.
  */
-export const dns_firewall_dns_firewall_cluster_response_output: JsonSchema = {
+export const dns$$firewall_dns$$firewall$$cluster$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-firewall_dns-firewall-cluster"
@@ -203,10 +210,11 @@ export const dns_firewall_dns_firewall_cluster_response_output: JsonSchema = {
           "$ref": "#/$defs/dns-firewall_dns_firewall_ips"
         },
         "id": {
-          "$ref": "#/$defs/dns-firewall_identifier"
+          "type": "string"
         },
         "modified_on": {
-          "$ref": "#/$defs/dns-firewall_modified_on"
+          "format": "date-time",
+          "type": "string"
         }
       },
       "required": [
@@ -222,7 +230,7 @@ export const dns_firewall_dns_firewall_cluster_response_output: JsonSchema = {
 /**
  * The schema of `dns-firewall_dns_firewall_ips` in responses.
  */
-export const dns_firewall_dns_firewall_ips_output: JsonSchema = {
+export const dns$$firewall_dns_firewall_ips: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -232,7 +240,7 @@ export const dns_firewall_dns_firewall_ips_output: JsonSchema = {
 /**
  * The schema of `dns-firewall_dns_firewall_response_collection` in responses.
  */
-export const dns_firewall_dns_firewall_response_collection_output: JsonSchema = {
+export const dns$$firewall_dns_firewall_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-firewall_api-response-collection"
@@ -254,7 +262,7 @@ export const dns_firewall_dns_firewall_response_collection_output: JsonSchema =
 /**
  * The schema of `dns-firewall_dns_firewall_single_response` in responses.
  */
-export const dns_firewall_dns_firewall_single_response_output: JsonSchema = {
+export const dns$$firewall_dns_firewall_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-firewall_api-response-single"
@@ -270,31 +278,10 @@ export const dns_firewall_dns_firewall_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dns-firewall_ecs_fallback` in responses.
- */
-export const dns_firewall_ecs_fallback_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-firewall_identifier` in responses.
- */
-export const dns_firewall_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `dns-firewall_maximum_cache_ttl` in responses.
- */
-export const dns_firewall_maximum_cache_ttl_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `dns-firewall_messages` in responses.
  */
-export const dns_firewall_messages_output: JsonSchema = {
+export const dns$$firewall_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -324,67 +311,10 @@ export const dns_firewall_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `dns-firewall_minimum_cache_ttl` in responses.
- */
-export const dns_firewall_minimum_cache_ttl_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `dns-firewall_modified_on` in responses.
- */
-export const dns_firewall_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-firewall_name` in responses.
- */
-export const dns_firewall_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `dns-firewall_negative_cache_ttl` in responses.
- */
-export const dns_firewall_negative_cache_ttl_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "number"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dns-firewall_ratelimit` in responses.
- */
-export const dns_firewall_ratelimit_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "number"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dns-firewall_retries` in responses.
- */
-export const dns_firewall_retries_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `dns-firewall_upstream_ips` in responses.
  */
-export const dns_firewall_upstream_ips_output: JsonSchema = {
+export const dns$$firewall_upstream_ips: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/dnsFirewall/reverseDns/outputs.ts b/src/generated/forge-mcp/dnsFirewall/reverseDns/outputs.ts
index e0580577d..d52d32084 100644
--- a/src/generated/forge-mcp/dnsFirewall/reverseDns/outputs.ts
+++ b/src/generated/forge-mcp/dnsFirewall/reverseDns/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `dns-firewall_dns-firewall-reverse-dns-response` in responses.
  */
-export const dns_firewall_dns_firewall_reverse_dns_response_output: JsonSchema = {
+export const dns$$firewall_dns$$firewall$$reverse$$dns$$response: JsonSchema = {
   "properties": {
     "ptr": {
       "additionalProperties": {
@@ -24,7 +24,7 @@ export const dns_firewall_dns_firewall_reverse_dns_response_output: JsonSchema =
 /**
  * The schema of `dns-firewall_dns_firewall_reverse_dns_response` in responses.
  */
-export const dns_firewall_dns_firewall_reverse_dns_response_output$: JsonSchema = {
+export const dns$$firewall_dns_firewall_reverse_dns_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-firewall_api-response-single"
diff --git a/src/generated/forge-mcp/dnsFirewall/reverseDns/schemas.ts b/src/generated/forge-mcp/dnsFirewall/reverseDns/schemas.ts
index 7ffe80106..d0c4b5692 100644
--- a/src/generated/forge-mcp/dnsFirewall/reverseDns/schemas.ts
+++ b/src/generated/forge-mcp/dnsFirewall/reverseDns/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `dns-firewall_dns-firewall-reverse-dns-patch`.
  */
-export const dns_firewall_dns_firewall_reverse_dns_patch: JsonSchema = {
+export const dns$$firewall_dns$$firewall$$reverse$$dns$$patch: JsonSchema = {
   "properties": {
     "ptr": {
       "additionalProperties": {
diff --git a/src/generated/forge-mcp/dnsFirewall/reverseDns/tools.ts b/src/generated/forge-mcp/dnsFirewall/reverseDns/tools.ts
index d4e79e9e9..15b0ffb68 100644
--- a/src/generated/forge-mcp/dnsFirewall/reverseDns/tools.ts
+++ b/src/generated/forge-mcp/dnsFirewall/reverseDns/tools.ts
@@ -3,57 +3,65 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  dns_firewall_api_response_common_failure_output,
-  dns_firewall_api_response_single_output,
-  dns_firewall_messages_output,
+  dns$$firewall_api$$response$$common$$failure,
+  dns$$firewall_api$$response$$single,
+  dns$$firewall_messages,
 } from "../outputs.js";
-import { dns_firewall_identifier } from "../schemas.js";
 import {
-  dns_firewall_dns_firewall_reverse_dns_response_output,
-  dns_firewall_dns_firewall_reverse_dns_response_output$,
+  dns$$firewall_dns$$firewall$$reverse$$dns$$response,
+  dns$$firewall_dns_firewall_reverse_dns_response,
 } from "./outputs.js";
-import { dns_firewall_dns_firewall_reverse_dns_patch } from "./schemas.js";
+import { dns$$firewall_dns$$firewall$$reverse$$dns$$patch } from "./schemas.js";
 
 /**
- * The tools of `dns_firewall.reverse_dns`.
+ * The tools of `dnsFirewall.reverseDns`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_firewall_reverse_dns_edit",
+    name: "dnsFirewall_reverseDns_edit",
     title: "Update DNS Firewall Cluster Reverse DNS",
-    description: "Update reverse DNS configuration (PTR records) for a DNS Firewall cluster",
+    description: "Update reverse DNS configuration (PTR records) for a DNS Firewall cluster\n\nPATCH /accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/dns-firewall_dns-firewall-reverse-dns-patch"
         },
-        "dns_firewall_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dns_firewall_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dns_firewall_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dns_firewall_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-firewall_dns-firewall-reverse-dns-patch": dns_firewall_dns_firewall_reverse_dns_patch,
-        "dns-firewall_identifier": dns_firewall_identifier,
+        "dns-firewall_dns-firewall-reverse-dns-patch": dns$$firewall_dns$$firewall$$reverse$$dns$$patch,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-firewall_dns_firewall_reverse_dns_response",
       $defs: {
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_dns-firewall-reverse-dns-response": dns_firewall_dns_firewall_reverse_dns_response_output,
-        "dns-firewall_dns_firewall_reverse_dns_response": dns_firewall_dns_firewall_reverse_dns_response_output$,
-        "dns-firewall_messages": dns_firewall_messages_output,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_dns-firewall-reverse-dns-response": dns$$firewall_dns$$firewall$$reverse$$dns$$response,
+        "dns-firewall_dns_firewall_reverse_dns_response": dns$$firewall_dns_firewall_reverse_dns_response,
+        "dns-firewall_messages": dns$$firewall_messages,
       },
     },
     annotations: {
@@ -91,11 +99,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-firewall_api-response-common-failure": dns_firewall_api_response_common_failure_output,
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_dns-firewall-reverse-dns-response": dns_firewall_dns_firewall_reverse_dns_response_output,
-        "dns-firewall_dns_firewall_reverse_dns_response": dns_firewall_dns_firewall_reverse_dns_response_output$,
-        "dns-firewall_messages": dns_firewall_messages_output,
+        "dns-firewall_api-response-common-failure": dns$$firewall_api$$response$$common$$failure,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_dns-firewall-reverse-dns-response": dns$$firewall_dns$$firewall$$reverse$$dns$$response,
+        "dns-firewall_dns_firewall_reverse_dns_response": dns$$firewall_dns_firewall_reverse_dns_response,
+        "dns-firewall_messages": dns$$firewall_messages,
       },
     },
     request: (args) => ({
@@ -104,36 +112,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_firewall_reverse_dns_get",
+    name: "dnsFirewall_reverseDns_get",
     title: "Show DNS Firewall Cluster Reverse DNS",
-    description: "Show reverse DNS configuration (PTR records) for a DNS Firewall cluster",
+    description: "Show reverse DNS configuration (PTR records) for a DNS Firewall cluster\n\nGET /accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
-        },
-        "dns_firewall_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dns_firewall_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dns_firewall_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dns_firewall_id"
+        "path"
       ],
-      $defs: {
-        "dns-firewall_identifier": dns_firewall_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-firewall_dns_firewall_reverse_dns_response",
       $defs: {
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_dns-firewall-reverse-dns-response": dns_firewall_dns_firewall_reverse_dns_response_output,
-        "dns-firewall_dns_firewall_reverse_dns_response": dns_firewall_dns_firewall_reverse_dns_response_output$,
-        "dns-firewall_messages": dns_firewall_messages_output,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_dns-firewall-reverse-dns-response": dns$$firewall_dns$$firewall$$reverse$$dns$$response,
+        "dns-firewall_dns_firewall_reverse_dns_response": dns$$firewall_dns_firewall_reverse_dns_response,
+        "dns-firewall_messages": dns$$firewall_messages,
       },
     },
     annotations: {
@@ -172,11 +187,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-firewall_api-response-common-failure": dns_firewall_api_response_common_failure_output,
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_dns-firewall-reverse-dns-response": dns_firewall_dns_firewall_reverse_dns_response_output,
-        "dns-firewall_dns_firewall_reverse_dns_response": dns_firewall_dns_firewall_reverse_dns_response_output$,
-        "dns-firewall_messages": dns_firewall_messages_output,
+        "dns-firewall_api-response-common-failure": dns$$firewall_api$$response$$common$$failure,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_dns-firewall-reverse-dns-response": dns$$firewall_dns$$firewall$$reverse$$dns$$response,
+        "dns-firewall_dns_firewall_reverse_dns_response": dns$$firewall_dns_firewall_reverse_dns_response,
+        "dns-firewall_messages": dns$$firewall_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/dnsFirewall/schemas.ts b/src/generated/forge-mcp/dnsFirewall/schemas.ts
index 692018d35..62a257b5b 100644
--- a/src/generated/forge-mcp/dnsFirewall/schemas.ts
+++ b/src/generated/forge-mcp/dnsFirewall/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `dns-firewall_attack_mitigation`.
  */
-export const dns_firewall_attack_mitigation: JsonSchema = {
+export const dns$$firewall_attack_mitigation: JsonSchema = {
   "description": "Attack mitigation settings",
   "oneOf": [
     {
@@ -29,57 +29,63 @@ export const dns_firewall_attack_mitigation: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dns-firewall_deprecate_any_requests`.
- */
-export const dns_firewall_deprecate_any_requests: JsonSchema = {
-  "description": "Whether to refuse to answer queries for the ANY type",
-  "type": "boolean"
-};
-
 /**
  * The schema of `dns-firewall_dns-firewall-cluster`.
  */
-export const dns_firewall_dns_firewall_cluster: JsonSchema = {
+export const dns$$firewall_dns$$firewall$$cluster: JsonSchema = {
   "properties": {
     "attack_mitigation": {
       "$ref": "#/$defs/dns-firewall_attack_mitigation",
       "description": "Attack mitigation settings"
     },
     "deprecate_any_requests": {
-      "$ref": "#/$defs/dns-firewall_deprecate_any_requests",
-      "description": "Whether to refuse to answer queries for the ANY type"
+      "description": "Whether to refuse to answer queries for the ANY type",
+      "type": "boolean"
     },
     "ecs_fallback": {
-      "$ref": "#/$defs/dns-firewall_ecs_fallback",
-      "description": "Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent"
+      "description": "Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent",
+      "type": "boolean"
     },
     "maximum_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_maximum_cache_ttl",
       "default": 900,
-      "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets an upper bound on this duration. For caching purposes, higher TTLs\nwill be decreased to the maximum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n"
+      "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets an upper bound on this duration. For caching purposes, higher TTLs\nwill be decreased to the maximum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.",
+      "type": "number"
     },
     "minimum_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_minimum_cache_ttl",
       "default": 60,
-      "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets a lower bound on this duration. For caching purposes, lower TTLs\nwill be increased to the minimum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n\nNote that, even with this setting, there is no guarantee that a\nresponse will be cached for at least the specified duration. Cached\nresponses may be removed earlier for capacity or other operational\nreasons.\n"
+      "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets a lower bound on this duration. For caching purposes, lower TTLs\nwill be increased to the minimum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n\nNote that, even with this setting, there is no guarantee that a\nresponse will be cached for at least the specified duration. Cached\nresponses may be removed earlier for capacity or other operational\nreasons.",
+      "type": "number"
     },
     "name": {
-      "$ref": "#/$defs/dns-firewall_name",
-      "description": "DNS Firewall cluster name"
+      "description": "DNS Firewall cluster name",
+      "type": "string"
     },
     "negative_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_negative_cache_ttl",
-      "description": "This setting controls how long DNS Firewall should cache negative\nresponses (e.g., NXDOMAIN) from the upstream servers.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n"
+      "description": "This setting controls how long DNS Firewall should cache negative\nresponses (e.g., NXDOMAIN) from the upstream servers.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.",
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "ratelimit": {
-      "$ref": "#/$defs/dns-firewall_ratelimit",
-      "description": "Maximum number of DNS queries per second that will be forwarded to your upstream nameservers. The limit is enforced per server, where each server receives a fraction of the configured value. The actual aggregate rate for a data center may vary depending on how many servers are present. Responses served from cache do not count toward this limit. Set to null to disable rate limiting."
+      "description": "Maximum number of DNS queries per second that will be forwarded to your upstream nameservers. The limit is enforced per server, where each server receives a fraction of the configured value. The actual aggregate rate for a data center may vary depending on how many servers are present. Responses served from cache do not count toward this limit. Set to null to disable rate limiting.",
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "retries": {
-      "$ref": "#/$defs/dns-firewall_retries",
       "default": 2,
-      "description": "Number of retries for fetching DNS responses from upstream nameservers (not counting the initial attempt)"
+      "description": "Number of retries for fetching DNS responses from upstream nameservers (not counting the initial attempt)",
+      "type": "number"
     },
     "upstream_ips": {
       "$ref": "#/$defs/dns-firewall_upstream_ips"
@@ -91,46 +97,60 @@ export const dns_firewall_dns_firewall_cluster: JsonSchema = {
 /**
  * The schema of `dns-firewall_dns-firewall-cluster-patch`.
  */
-export const dns_firewall_dns_firewall_cluster_patch: JsonSchema = {
+export const dns$$firewall_dns$$firewall$$cluster$$patch: JsonSchema = {
   "properties": {
     "attack_mitigation": {
       "$ref": "#/$defs/dns-firewall_attack_mitigation",
       "description": "Attack mitigation settings"
     },
     "deprecate_any_requests": {
-      "$ref": "#/$defs/dns-firewall_deprecate_any_requests",
-      "description": "Whether to refuse to answer queries for the ANY type"
+      "description": "Whether to refuse to answer queries for the ANY type",
+      "type": "boolean"
     },
     "ecs_fallback": {
-      "$ref": "#/$defs/dns-firewall_ecs_fallback",
-      "description": "Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent"
+      "description": "Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent",
+      "type": "boolean"
     },
     "maximum_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_maximum_cache_ttl",
       "default": 900,
-      "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets an upper bound on this duration. For caching purposes, higher TTLs\nwill be decreased to the maximum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n"
+      "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets an upper bound on this duration. For caching purposes, higher TTLs\nwill be decreased to the maximum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.",
+      "type": "number"
     },
     "minimum_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_minimum_cache_ttl",
       "default": 60,
-      "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets a lower bound on this duration. For caching purposes, lower TTLs\nwill be increased to the minimum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n\nNote that, even with this setting, there is no guarantee that a\nresponse will be cached for at least the specified duration. Cached\nresponses may be removed earlier for capacity or other operational\nreasons.\n"
+      "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets a lower bound on this duration. For caching purposes, lower TTLs\nwill be increased to the minimum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n\nNote that, even with this setting, there is no guarantee that a\nresponse will be cached for at least the specified duration. Cached\nresponses may be removed earlier for capacity or other operational\nreasons.",
+      "type": "number"
     },
     "name": {
-      "$ref": "#/$defs/dns-firewall_name",
-      "description": "DNS Firewall cluster name"
+      "description": "DNS Firewall cluster name",
+      "type": "string"
     },
     "negative_cache_ttl": {
-      "$ref": "#/$defs/dns-firewall_negative_cache_ttl",
-      "description": "This setting controls how long DNS Firewall should cache negative\nresponses (e.g., NXDOMAIN) from the upstream servers.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n"
+      "description": "This setting controls how long DNS Firewall should cache negative\nresponses (e.g., NXDOMAIN) from the upstream servers.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.",
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "ratelimit": {
-      "$ref": "#/$defs/dns-firewall_ratelimit",
-      "description": "Maximum number of DNS queries per second that will be forwarded to your upstream nameservers. The limit is enforced per server, where each server receives a fraction of the configured value. The actual aggregate rate for a data center may vary depending on how many servers are present. Responses served from cache do not count toward this limit. Set to null to disable rate limiting."
+      "description": "Maximum number of DNS queries per second that will be forwarded to your upstream nameservers. The limit is enforced per server, where each server receives a fraction of the configured value. The actual aggregate rate for a data center may vary depending on how many servers are present. Responses served from cache do not count toward this limit. Set to null to disable rate limiting.",
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "retries": {
-      "$ref": "#/$defs/dns-firewall_retries",
       "default": 2,
-      "description": "Number of retries for fetching DNS responses from upstream nameservers (not counting the initial attempt)"
+      "description": "Number of retries for fetching DNS responses from upstream nameservers (not counting the initial attempt)",
+      "type": "number"
     },
     "upstream_ips": {
       "$ref": "#/$defs/dns-firewall_upstream_ips"
@@ -142,7 +162,7 @@ export const dns_firewall_dns_firewall_cluster_patch: JsonSchema = {
 /**
  * The schema of `dns-firewall_dns-firewall-cluster-post`.
  */
-export const dns_firewall_dns_firewall_cluster_post: JsonSchema = {
+export const dns$$firewall_dns$$firewall$$cluster$$post: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-firewall_dns-firewall-cluster"
@@ -150,9 +170,9 @@ export const dns_firewall_dns_firewall_cluster_post: JsonSchema = {
     {
       "properties": {
         "dns_firewall_ip_count": {
-          "$ref": "#/$defs/dns-firewall_dns_firewall_ip_count",
           "default": 2,
-          "description": "Number of IPv4 addresses to assign to the DNS Firewall cluster. Only used during cluster creation and cannot be changed later."
+          "description": "Number of IPv4 addresses to assign to the DNS Firewall cluster. Only used during cluster creation and cannot be changed later.",
+          "type": "integer"
         }
       },
       "type": "object"
@@ -160,96 +180,10 @@ export const dns_firewall_dns_firewall_cluster_post: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dns-firewall_dns_firewall_ip_count`.
- */
-export const dns_firewall_dns_firewall_ip_count: JsonSchema = {
-  "description": "Number of IPv4 addresses to assign to the DNS Firewall cluster. Only used during cluster creation and cannot be changed later.",
-  "type": "integer"
-};
-
-/**
- * The schema of `dns-firewall_ecs_fallback`.
- */
-export const dns_firewall_ecs_fallback: JsonSchema = {
-  "description": "Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent",
-  "type": "boolean"
-};
-
-/**
- * The schema of `dns-firewall_identifier`.
- */
-export const dns_firewall_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-firewall_maximum_cache_ttl`.
- */
-export const dns_firewall_maximum_cache_ttl: JsonSchema = {
-  "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets an upper bound on this duration. For caching purposes, higher TTLs\nwill be decreased to the maximum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n",
-  "type": "number"
-};
-
-/**
- * The schema of `dns-firewall_minimum_cache_ttl`.
- */
-export const dns_firewall_minimum_cache_ttl: JsonSchema = {
-  "description": "By default, Cloudflare attempts to cache responses for as long as\nindicated by the TTL received from upstream nameservers. This setting\nsets a lower bound on this duration. For caching purposes, lower TTLs\nwill be increased to the minimum value defined by this setting.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n\nNote that, even with this setting, there is no guarantee that a\nresponse will be cached for at least the specified duration. Cached\nresponses may be removed earlier for capacity or other operational\nreasons.\n",
-  "type": "number"
-};
-
-/**
- * The schema of `dns-firewall_name`.
- */
-export const dns_firewall_name: JsonSchema = {
-  "description": "DNS Firewall cluster name",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-firewall_negative_cache_ttl`.
- */
-export const dns_firewall_negative_cache_ttl: JsonSchema = {
-  "description": "This setting controls how long DNS Firewall should cache negative\nresponses (e.g., NXDOMAIN) from the upstream servers.\n\nThis setting does not affect the TTL value in the DNS response\nCloudflare returns to clients. Cloudflare will always forward the TTL\nvalue received from upstream nameservers.\n",
-  "oneOf": [
-    {
-      "type": "number"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dns-firewall_ratelimit`.
- */
-export const dns_firewall_ratelimit: JsonSchema = {
-  "description": "Maximum number of DNS queries per second that will be forwarded to your upstream nameservers. The limit is enforced per server, where each server receives a fraction of the configured value. The actual aggregate rate for a data center may vary depending on how many servers are present. Responses served from cache do not count toward this limit. Set to null to disable rate limiting.",
-  "oneOf": [
-    {
-      "type": "number"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `dns-firewall_retries`.
- */
-export const dns_firewall_retries: JsonSchema = {
-  "description": "Number of retries for fetching DNS responses from upstream nameservers (not counting the initial attempt)",
-  "type": "number"
-};
-
 /**
  * The schema of `dns-firewall_upstream_ips`.
  */
-export const dns_firewall_upstream_ips: JsonSchema = {
+export const dns$$firewall_upstream_ips: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/dnsFirewall/tools.ts b/src/generated/forge-mcp/dnsFirewall/tools.ts
index 1a4ef8eb4..b849af98e 100644
--- a/src/generated/forge-mcp/dnsFirewall/tools.ts
+++ b/src/generated/forge-mcp/dnsFirewall/tools.ts
@@ -1,110 +1,80 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  dns_firewall_api_response_collection_output,
-  dns_firewall_api_response_common_failure_output,
-  dns_firewall_api_response_common_output,
-  dns_firewall_api_response_single_output,
-  dns_firewall_attack_mitigation_output,
-  dns_firewall_deprecate_any_requests_output,
-  dns_firewall_dns_firewall_cluster_output,
-  dns_firewall_dns_firewall_cluster_response_output,
-  dns_firewall_dns_firewall_ips_output,
-  dns_firewall_dns_firewall_response_collection_output,
-  dns_firewall_dns_firewall_single_response_output,
-  dns_firewall_ecs_fallback_output,
-  dns_firewall_identifier_output,
-  dns_firewall_maximum_cache_ttl_output,
-  dns_firewall_messages_output,
-  dns_firewall_minimum_cache_ttl_output,
-  dns_firewall_modified_on_output,
-  dns_firewall_name_output,
-  dns_firewall_negative_cache_ttl_output,
-  dns_firewall_ratelimit_output,
-  dns_firewall_retries_output,
-  dns_firewall_upstream_ips_output,
+  dns$$firewall_api$$response$$collection,
+  dns$$firewall_api$$response$$common,
+  dns$$firewall_api$$response$$common$$failure,
+  dns$$firewall_api$$response$$single,
+  dns$$firewall_attack_mitigation,
+  dns$$firewall_dns$$firewall$$cluster,
+  dns$$firewall_dns$$firewall$$cluster$$response,
+  dns$$firewall_dns_firewall_ips,
+  dns$$firewall_dns_firewall_response_collection,
+  dns$$firewall_dns_firewall_single_response,
+  dns$$firewall_messages,
+  dns$$firewall_upstream_ips,
 } from "./outputs.js";
 import {
-  dns_firewall_attack_mitigation,
-  dns_firewall_deprecate_any_requests,
-  dns_firewall_dns_firewall_cluster,
-  dns_firewall_dns_firewall_cluster_patch,
-  dns_firewall_dns_firewall_cluster_post,
-  dns_firewall_dns_firewall_ip_count,
-  dns_firewall_ecs_fallback,
-  dns_firewall_identifier,
-  dns_firewall_maximum_cache_ttl,
-  dns_firewall_minimum_cache_ttl,
-  dns_firewall_name,
-  dns_firewall_negative_cache_ttl,
-  dns_firewall_ratelimit,
-  dns_firewall_retries,
-  dns_firewall_upstream_ips,
+  dns$$firewall_attack_mitigation as dns$$firewall_attack_mitigation$,
+  dns$$firewall_dns$$firewall$$cluster as dns$$firewall_dns$$firewall$$cluster$,
+  dns$$firewall_dns$$firewall$$cluster$$patch,
+  dns$$firewall_dns$$firewall$$cluster$$post,
+  dns$$firewall_upstream_ips as dns$$firewall_upstream_ips$,
 } from "./schemas.js";
 
 /**
- * The tools of `dns_firewall`.
+ * The tools of `dnsFirewall`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "dns_firewall_create",
+    name: "dnsFirewall_create",
     title: "Create DNS Firewall Cluster",
-    description: "Create a DNS Firewall cluster",
+    description: "Create a DNS Firewall cluster\n\nPOST /accounts/{account_id}/dns_firewall",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/dns-firewall_dns-firewall-cluster-post"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster,
-        "dns-firewall_dns-firewall-cluster-post": dns_firewall_dns_firewall_cluster_post,
-        "dns-firewall_dns_firewall_ip_count": dns_firewall_dns_firewall_ip_count,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback,
-        "dns-firewall_identifier": dns_firewall_identifier,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl,
-        "dns-firewall_name": dns_firewall_name,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit,
-        "dns-firewall_retries": dns_firewall_retries,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation$,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster$,
+        "dns-firewall_dns-firewall-cluster-post": dns$$firewall_dns$$firewall$$cluster$$post,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-firewall_dns_firewall_single_response",
       $defs: {
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation_output,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests_output,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster_output,
-        "dns-firewall_dns-firewall-cluster-response": dns_firewall_dns_firewall_cluster_response_output,
-        "dns-firewall_dns_firewall_ips": dns_firewall_dns_firewall_ips_output,
-        "dns-firewall_dns_firewall_single_response": dns_firewall_dns_firewall_single_response_output,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl_output,
-        "dns-firewall_modified_on": dns_firewall_modified_on_output,
-        "dns-firewall_name": dns_firewall_name_output,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl_output,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit_output,
-        "dns-firewall_retries": dns_firewall_retries_output,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips_output,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster,
+        "dns-firewall_dns-firewall-cluster-response": dns$$firewall_dns$$firewall$$cluster$$response,
+        "dns-firewall_dns_firewall_ips": dns$$firewall_dns_firewall_ips,
+        "dns-firewall_dns_firewall_single_response": dns$$firewall_dns_firewall_single_response,
+        "dns-firewall_messages": dns$$firewall_messages,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips,
       },
     },
     annotations: {
@@ -142,25 +112,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-firewall_api-response-common-failure": dns_firewall_api_response_common_failure_output,
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation_output,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests_output,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster_output,
-        "dns-firewall_dns-firewall-cluster-response": dns_firewall_dns_firewall_cluster_response_output,
-        "dns-firewall_dns_firewall_ips": dns_firewall_dns_firewall_ips_output,
-        "dns-firewall_dns_firewall_single_response": dns_firewall_dns_firewall_single_response_output,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl_output,
-        "dns-firewall_modified_on": dns_firewall_modified_on_output,
-        "dns-firewall_name": dns_firewall_name_output,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl_output,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit_output,
-        "dns-firewall_retries": dns_firewall_retries_output,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips_output,
+        "dns-firewall_api-response-common-failure": dns$$firewall_api$$response$$common$$failure,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster,
+        "dns-firewall_dns-firewall-cluster-response": dns$$firewall_dns$$firewall$$cluster$$response,
+        "dns-firewall_dns_firewall_ips": dns$$firewall_dns_firewall_ips,
+        "dns-firewall_dns_firewall_single_response": dns$$firewall_dns_firewall_single_response,
+        "dns-firewall_messages": dns$$firewall_messages,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips,
       },
     },
     request: (args) => ({
@@ -169,28 +129,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_firewall_delete",
+    name: "dnsFirewall_delete",
     title: "Delete DNS Firewall Cluster",
-    description: "Delete a DNS Firewall cluster",
+    description: "Delete a DNS Firewall cluster\n\nDELETE /accounts/{account_id}/dns_firewall/{dns_firewall_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
-        },
-        "dns_firewall_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dns_firewall_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dns_firewall_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dns_firewall_id"
+        "path"
       ],
-      $defs: {
-        "dns-firewall_identifier": dns_firewall_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -202,7 +169,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/dns-firewall_identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -212,9 +179,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_messages": dns$$firewall_messages,
       },
     },
     annotations: {
@@ -254,7 +220,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/dns-firewall_identifier"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -269,10 +235,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-firewall_api-response-common-failure": dns_firewall_api_response_common_failure_output,
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
+        "dns-firewall_api-response-common-failure": dns$$firewall_api$$response$$common$$failure,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_messages": dns$$firewall_messages,
       },
     },
     request: (args) => ({
@@ -280,65 +245,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_firewall_edit",
+    name: "dnsFirewall_edit",
     title: "Update DNS Firewall Cluster",
-    description: "Modify the configuration of a DNS Firewall cluster",
+    description: "Modify the configuration of a DNS Firewall cluster\n\nPATCH /accounts/{account_id}/dns_firewall/{dns_firewall_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/dns-firewall_dns-firewall-cluster-patch"
         },
-        "dns_firewall_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dns_firewall_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dns_firewall_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dns_firewall_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests,
-        "dns-firewall_dns-firewall-cluster-patch": dns_firewall_dns_firewall_cluster_patch,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback,
-        "dns-firewall_identifier": dns_firewall_identifier,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl,
-        "dns-firewall_name": dns_firewall_name,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit,
-        "dns-firewall_retries": dns_firewall_retries,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation$,
+        "dns-firewall_dns-firewall-cluster-patch": dns$$firewall_dns$$firewall$$cluster$$patch,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-firewall_dns_firewall_single_response",
       $defs: {
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation_output,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests_output,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster_output,
-        "dns-firewall_dns-firewall-cluster-response": dns_firewall_dns_firewall_cluster_response_output,
-        "dns-firewall_dns_firewall_ips": dns_firewall_dns_firewall_ips_output,
-        "dns-firewall_dns_firewall_single_response": dns_firewall_dns_firewall_single_response_output,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl_output,
-        "dns-firewall_modified_on": dns_firewall_modified_on_output,
-        "dns-firewall_name": dns_firewall_name_output,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl_output,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit_output,
-        "dns-firewall_retries": dns_firewall_retries_output,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips_output,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster,
+        "dns-firewall_dns-firewall-cluster-response": dns$$firewall_dns$$firewall$$cluster$$response,
+        "dns-firewall_dns_firewall_ips": dns$$firewall_dns_firewall_ips,
+        "dns-firewall_dns_firewall_single_response": dns$$firewall_dns_firewall_single_response,
+        "dns-firewall_messages": dns$$firewall_messages,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips,
       },
     },
     annotations: {
@@ -376,25 +332,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-firewall_api-response-common-failure": dns_firewall_api_response_common_failure_output,
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation_output,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests_output,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster_output,
-        "dns-firewall_dns-firewall-cluster-response": dns_firewall_dns_firewall_cluster_response_output,
-        "dns-firewall_dns_firewall_ips": dns_firewall_dns_firewall_ips_output,
-        "dns-firewall_dns_firewall_single_response": dns_firewall_dns_firewall_single_response_output,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl_output,
-        "dns-firewall_modified_on": dns_firewall_modified_on_output,
-        "dns-firewall_name": dns_firewall_name_output,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl_output,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit_output,
-        "dns-firewall_retries": dns_firewall_retries_output,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips_output,
+        "dns-firewall_api-response-common-failure": dns$$firewall_api$$response$$common$$failure,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster,
+        "dns-firewall_dns-firewall-cluster-response": dns$$firewall_dns$$firewall$$cluster$$response,
+        "dns-firewall_dns_firewall_ips": dns$$firewall_dns_firewall_ips,
+        "dns-firewall_dns_firewall_single_response": dns$$firewall_dns_firewall_single_response,
+        "dns-firewall_messages": dns$$firewall_messages,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips,
       },
     },
     request: (args) => ({
@@ -403,50 +349,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_firewall_get",
+    name: "dnsFirewall_get",
     title: "DNS Firewall Cluster Details",
-    description: "Show a single DNS Firewall cluster for an account",
+    description: "Show a single DNS Firewall cluster for an account\n\nGET /accounts/{account_id}/dns_firewall/{dns_firewall_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
-        },
-        "dns_firewall_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dns_firewall_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dns_firewall_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dns_firewall_id"
+        "path"
       ],
-      $defs: {
-        "dns-firewall_identifier": dns_firewall_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-firewall_dns_firewall_single_response",
       $defs: {
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation_output,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests_output,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster_output,
-        "dns-firewall_dns-firewall-cluster-response": dns_firewall_dns_firewall_cluster_response_output,
-        "dns-firewall_dns_firewall_ips": dns_firewall_dns_firewall_ips_output,
-        "dns-firewall_dns_firewall_single_response": dns_firewall_dns_firewall_single_response_output,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl_output,
-        "dns-firewall_modified_on": dns_firewall_modified_on_output,
-        "dns-firewall_name": dns_firewall_name_output,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl_output,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit_output,
-        "dns-firewall_retries": dns_firewall_retries_output,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips_output,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster,
+        "dns-firewall_dns-firewall-cluster-response": dns$$firewall_dns$$firewall$$cluster$$response,
+        "dns-firewall_dns_firewall_ips": dns$$firewall_dns_firewall_ips,
+        "dns-firewall_dns_firewall_single_response": dns$$firewall_dns_firewall_single_response,
+        "dns-firewall_messages": dns$$firewall_messages,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips,
       },
     },
     annotations: {
@@ -485,25 +428,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-firewall_api-response-common-failure": dns_firewall_api_response_common_failure_output,
-        "dns-firewall_api-response-single": dns_firewall_api_response_single_output,
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation_output,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests_output,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster_output,
-        "dns-firewall_dns-firewall-cluster-response": dns_firewall_dns_firewall_cluster_response_output,
-        "dns-firewall_dns_firewall_ips": dns_firewall_dns_firewall_ips_output,
-        "dns-firewall_dns_firewall_single_response": dns_firewall_dns_firewall_single_response_output,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl_output,
-        "dns-firewall_modified_on": dns_firewall_modified_on_output,
-        "dns-firewall_name": dns_firewall_name_output,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl_output,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit_output,
-        "dns-firewall_retries": dns_firewall_retries_output,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips_output,
+        "dns-firewall_api-response-common-failure": dns$$firewall_api$$response$$common$$failure,
+        "dns-firewall_api-response-single": dns$$firewall_api$$response$$single,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster,
+        "dns-firewall_dns-firewall-cluster-response": dns$$firewall_dns$$firewall$$cluster$$response,
+        "dns-firewall_dns_firewall_ips": dns$$firewall_dns_firewall_ips,
+        "dns-firewall_dns_firewall_single_response": dns$$firewall_dns_firewall_single_response,
+        "dns-firewall_messages": dns$$firewall_messages,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips,
       },
     },
     request: (args) => ({
@@ -511,56 +444,59 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "dns_firewall_list",
+    name: "dnsFirewall_list",
     title: "List DNS Firewall Clusters",
-    description: "List DNS Firewall clusters for an account",
+    description: "List DNS Firewall clusters for an account\n\nGET /accounts/{account_id}/dns_firewall",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/dns-firewall_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of clusters per page",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of clusters per page",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "dns-firewall_identifier": dns_firewall_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-firewall_dns_firewall_response_collection",
       $defs: {
-        "dns-firewall_api-response-collection": dns_firewall_api_response_collection_output,
-        "dns-firewall_api-response-common": dns_firewall_api_response_common_output,
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation_output,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests_output,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster_output,
-        "dns-firewall_dns-firewall-cluster-response": dns_firewall_dns_firewall_cluster_response_output,
-        "dns-firewall_dns_firewall_ips": dns_firewall_dns_firewall_ips_output,
-        "dns-firewall_dns_firewall_response_collection": dns_firewall_dns_firewall_response_collection_output,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl_output,
-        "dns-firewall_modified_on": dns_firewall_modified_on_output,
-        "dns-firewall_name": dns_firewall_name_output,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl_output,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit_output,
-        "dns-firewall_retries": dns_firewall_retries_output,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips_output,
+        "dns-firewall_api-response-collection": dns$$firewall_api$$response$$collection,
+        "dns-firewall_api-response-common": dns$$firewall_api$$response$$common,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster,
+        "dns-firewall_dns-firewall-cluster-response": dns$$firewall_dns$$firewall$$cluster$$response,
+        "dns-firewall_dns_firewall_ips": dns$$firewall_dns_firewall_ips,
+        "dns-firewall_dns_firewall_response_collection": dns$$firewall_dns_firewall_response_collection,
+        "dns-firewall_messages": dns$$firewall_messages,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips,
       },
     },
     annotations: {
@@ -599,33 +535,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-firewall_api-response-collection": dns_firewall_api_response_collection_output,
-        "dns-firewall_api-response-common": dns_firewall_api_response_common_output,
-        "dns-firewall_api-response-common-failure": dns_firewall_api_response_common_failure_output,
-        "dns-firewall_attack_mitigation": dns_firewall_attack_mitigation_output,
-        "dns-firewall_deprecate_any_requests": dns_firewall_deprecate_any_requests_output,
-        "dns-firewall_dns-firewall-cluster": dns_firewall_dns_firewall_cluster_output,
-        "dns-firewall_dns-firewall-cluster-response": dns_firewall_dns_firewall_cluster_response_output,
-        "dns-firewall_dns_firewall_ips": dns_firewall_dns_firewall_ips_output,
-        "dns-firewall_dns_firewall_response_collection": dns_firewall_dns_firewall_response_collection_output,
-        "dns-firewall_ecs_fallback": dns_firewall_ecs_fallback_output,
-        "dns-firewall_identifier": dns_firewall_identifier_output,
-        "dns-firewall_maximum_cache_ttl": dns_firewall_maximum_cache_ttl_output,
-        "dns-firewall_messages": dns_firewall_messages_output,
-        "dns-firewall_minimum_cache_ttl": dns_firewall_minimum_cache_ttl_output,
-        "dns-firewall_modified_on": dns_firewall_modified_on_output,
-        "dns-firewall_name": dns_firewall_name_output,
-        "dns-firewall_negative_cache_ttl": dns_firewall_negative_cache_ttl_output,
-        "dns-firewall_ratelimit": dns_firewall_ratelimit_output,
-        "dns-firewall_retries": dns_firewall_retries_output,
-        "dns-firewall_upstream_ips": dns_firewall_upstream_ips_output,
+        "dns-firewall_api-response-collection": dns$$firewall_api$$response$$collection,
+        "dns-firewall_api-response-common": dns$$firewall_api$$response$$common,
+        "dns-firewall_api-response-common-failure": dns$$firewall_api$$response$$common$$failure,
+        "dns-firewall_attack_mitigation": dns$$firewall_attack_mitigation,
+        "dns-firewall_dns-firewall-cluster": dns$$firewall_dns$$firewall$$cluster,
+        "dns-firewall_dns-firewall-cluster-response": dns$$firewall_dns$$firewall$$cluster$$response,
+        "dns-firewall_dns_firewall_ips": dns$$firewall_dns_firewall_ips,
+        "dns-firewall_dns_firewall_response_collection": dns$$firewall_dns_firewall_response_collection,
+        "dns-firewall_messages": dns$$firewall_messages,
+        "dns-firewall_upstream_ips": dns$$firewall_upstream_ips,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dns_firewall`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/durableObjects/namespaces/objects/outputs.ts b/src/generated/forge-mcp/durableObjects/namespaces/objects/outputs.ts
index 63678ee61..e6c41fa2e 100644
--- a/src/generated/forge-mcp/durableObjects/namespaces/objects/outputs.ts
+++ b/src/generated/forge-mcp/durableObjects/namespaces/objects/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `workers_cursor` in responses.
- */
-export const workers_cursor_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_object` in responses.
  */
-export const workers_object_output: JsonSchema = {
+export const workers_object: JsonSchema = {
   "properties": {
     "hasStoredData": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/durableObjects/namespaces/objects/tools.ts b/src/generated/forge-mcp/durableObjects/namespaces/objects/tools.ts
index 71a2222f2..d92cf772d 100644
--- a/src/generated/forge-mcp/durableObjects/namespaces/objects/tools.ts
+++ b/src/generated/forge-mcp/durableObjects/namespaces/objects/tools.ts
@@ -1,54 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../../outputs.js";
-import { workers_identifier } from "../../../schemas.js";
-import { workers_schemas_id } from "../schemas.js";
-import { workers_cursor_output, workers_object_output } from "./outputs.js";
+import { workers_object } from "./outputs.js";
 
 /**
- * The tools of `durable_objects.namespaces.objects`.
+ * The tools of `durableObjects.namespaces.objects`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "durable_objects_namespaces_objects_list",
+    name: "durableObjects_namespaces_objects_list",
     title: "List Objects in a Durable Object namespace",
-    description: "Returns the Durable Objects in a given Durable Object namespace.",
+    description: "Returns the Durable Objects in a given Durable Object namespace.\n\nGET /accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "cursor": {
-          "description": "Opaque token indicating the position from which to continue when requesting the next set of records. A valid value for the cursor can be obtained from the cursors object in the result_info structure.",
-          "type": "string"
-        },
-        "id": {
-          "$ref": "#/$defs/workers_schemas-id",
-          "description": "ID of the namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "id": {
+              "description": "ID of the namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "default": 1000,
-          "description": "The number of objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token indicating the position from which to continue when requesting the next set of records. A valid value for the cursor can be obtained from the cursors object in the result_info structure.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 1000,
+              "description": "The number of objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_schemas-id": workers_schemas_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -69,7 +79,7 @@ export const tools: readonly Tool[] = [
                   "type": "number"
                 },
                 "cursor": {
-                  "$ref": "#/$defs/workers_cursor"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -79,11 +89,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cursor": workers_cursor_output,
-        "workers_messages": workers_messages_output,
-        "workers_object": workers_object_output,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_object": workers_object,
       },
     },
     annotations: {
@@ -130,7 +139,7 @@ export const tools: readonly Tool[] = [
                       "type": "number"
                     },
                     "cursor": {
-                      "$ref": "#/$defs/workers_cursor"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -159,7 +168,7 @@ export const tools: readonly Tool[] = [
                       "type": "number"
                     },
                     "cursor": {
-                      "$ref": "#/$defs/workers_cursor"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -174,19 +183,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cursor": workers_cursor_output,
-        "workers_messages": workers_messages_output,
-        "workers_object": workers_object_output,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_object": workers_object,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/durable_objects/namespaces/${pathParam(args, "id")}/objects`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/durableObjects/namespaces/outputs.ts b/src/generated/forge-mcp/durableObjects/namespaces/outputs.ts
index 1603599a3..44946aa3d 100644
--- a/src/generated/forge-mcp/durableObjects/namespaces/outputs.ts
+++ b/src/generated/forge-mcp/durableObjects/namespaces/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_namespace` in responses.
  */
-export const workers_namespace_output: JsonSchema = {
+export const workers_namespace: JsonSchema = {
   "properties": {
     "class": {
       "type": "string"
@@ -30,7 +30,7 @@ export const workers_namespace_output: JsonSchema = {
 /**
  * The schema of `workers_query-result` in responses.
  */
-export const workers_query_result_output: JsonSchema = {
+export const workers_query$$result: JsonSchema = {
   "properties": {
     "error": {
       "type": "string"
@@ -84,7 +84,7 @@ export const workers_query_result_output: JsonSchema = {
 /**
  * The schema of `workers_query-value` in responses.
  */
-export const workers_query_value_output: JsonSchema = {
+export const workers_query$$value: JsonSchema = {
   "anyOf": [
     {
       "type": "string"
diff --git a/src/generated/forge-mcp/durableObjects/namespaces/schemas.ts b/src/generated/forge-mcp/durableObjects/namespaces/schemas.ts
index 9cf12b1d1..5d35e01a2 100644
--- a/src/generated/forge-mcp/durableObjects/namespaces/schemas.ts
+++ b/src/generated/forge-mcp/durableObjects/namespaces/schemas.ts
@@ -11,7 +11,17 @@ export const workers_query: JsonSchema = {
     "params": {
       "description": "Values bound to the `?` placeholders in `sql`, in order.",
       "items": {
-        "$ref": "#/$defs/workers_query-param"
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "number"
+          },
+          {
+            "type": "null"
+          }
+        ]
       },
       "type": "array"
     },
@@ -28,7 +38,7 @@ export const workers_query: JsonSchema = {
 /**
  * The schema of `workers_query-by-id`.
  */
-export const workers_query_by_id: JsonSchema = {
+export const workers_query$$by$$id: JsonSchema = {
   "properties": {
     "durable_object_id": {
       "type": "string"
@@ -50,7 +60,7 @@ export const workers_query_by_id: JsonSchema = {
 /**
  * The schema of `workers_query-by-name`.
  */
-export const workers_query_by_name: JsonSchema = {
+export const workers_query$$by$$name: JsonSchema = {
   "properties": {
     "durable_object_name": {
       "type": "string"
@@ -77,28 +87,3 @@ export const workers_query_by_name: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `workers_query-param`.
- */
-export const workers_query_param: JsonSchema = {
-  "anyOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "number"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `workers_schemas-id`.
- */
-export const workers_schemas_id: JsonSchema = {
-  "description": "ID of the namespace.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/durableObjects/namespaces/tools.ts b/src/generated/forge-mcp/durableObjects/namespaces/tools.ts
index b3ff6f713..f508b83a0 100644
--- a/src/generated/forge-mcp/durableObjects/namespaces/tools.ts
+++ b/src/generated/forge-mcp/durableObjects/namespaces/tools.ts
@@ -1,59 +1,69 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier } from "../../schemas.js";
 import {
-  workers_namespace_output,
-  workers_query_result_output,
-  workers_query_value_output,
+  workers_namespace,
+  workers_query$$result,
+  workers_query$$value,
 } from "./outputs.js";
 import {
   workers_query,
-  workers_query_by_id,
-  workers_query_by_name,
-  workers_query_param,
-  workers_schemas_id,
+  workers_query$$by$$id,
+  workers_query$$by$$name,
 } from "./schemas.js";
 
 /**
- * The tools of `durable_objects.namespaces`.
+ * The tools of `durableObjects.namespaces`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "durable_objects_namespaces_list",
+    name: "durableObjects_namespaces_list",
     title: "List Durable Object Namespaces",
-    description: "Returns the Durable Object namespaces owned by an account.",
+    description: "Returns the Durable Object namespaces owned by an account.\n\nGET /accounts/{account_id}/workers/durable_objects/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Items per-page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Current page.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Items per-page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -73,10 +83,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_namespace": workers_namespace_output,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_namespace": workers_namespace,
       },
     },
     annotations: {
@@ -145,32 +155,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_namespace": workers_namespace_output,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_namespace": workers_namespace,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/durable_objects/namespaces`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "durable_objects_namespaces_query",
+    name: "durableObjects_namespaces_query",
     title: "Query a Durable Object",
-    description: "Executes one or more SQL queries against a Durable Object.",
+    description: "Executes one or more SQL queries against a Durable Object.\n\nPOST /accounts/{account_id}/workers/durable_objects/namespaces/{id}/query/v2",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "oneOf": [
             {
@@ -181,23 +187,34 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "id": {
-          "$ref": "#/$defs/workers_schemas-id",
-          "description": "ID of the namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "id": {
+              "description": "ID of the namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_identifier": workers_identifier,
         "workers_query": workers_query,
-        "workers_query-by-id": workers_query_by_id,
-        "workers_query-by-name": workers_query_by_name,
-        "workers_query-param": workers_query_param,
-        "workers_schemas-id": workers_schemas_id,
+        "workers_query-by-id": workers_query$$by$$id,
+        "workers_query-by-name": workers_query$$by$$name,
       },
     },
     outputSchema: {
@@ -215,10 +232,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_query-result": workers_query_result_output,
-        "workers_query-value": workers_query_value_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_query-result": workers_query$$result,
+        "workers_query-value": workers_query$$value,
       },
     },
     annotations: {
@@ -260,11 +277,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_query-result": workers_query_result_output,
-        "workers_query-value": workers_query_value_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_query-result": workers_query$$result,
+        "workers_query-value": workers_query$$value,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailAuth/dmarcReports/outputs.ts b/src/generated/forge-mcp/emailAuth/dmarcReports/outputs.ts
index 7bc5f7694..e3b55044e 100644
--- a/src/generated/forge-mcp/emailAuth/dmarcReports/outputs.ts
+++ b/src/generated/forge-mcp/emailAuth/dmarcReports/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-auth_ApprovedSourceResponse` in responses.
  */
-export const email_auth_ApprovedSourceResponse_output: JsonSchema = {
+export const email$$auth_ApprovedSourceResponse: JsonSchema = {
   "properties": {
     "created": {
       "format": "date-time",
@@ -49,7 +49,7 @@ export const email_auth_ApprovedSourceResponse_output: JsonSchema = {
 /**
  * The schema of `email-auth_DmarcReportResponse` in responses.
  */
-export const email_auth_DmarcReportResponse_output: JsonSchema = {
+export const email$$auth_DmarcReportResponse: JsonSchema = {
   "properties": {
     "approved_sources": {
       "items": {
@@ -86,7 +86,14 @@ export const email_auth_DmarcReportResponse_output: JsonSchema = {
       "type": "boolean"
     },
     "status": {
-      "$ref": "#/$defs/email-auth_DmarcStatus"
+      "enum": [
+        "missing-dmarc-report",
+        "multiple-dmarc-reports",
+        "missing-dmarc-rua",
+        "cname-on-dmarc-record",
+        "unauthorized-reporting-domain"
+      ],
+      "type": "string"
     },
     "tag": {
       "type": "string"
@@ -98,24 +105,10 @@ export const email_auth_DmarcReportResponse_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-auth_DmarcStatus` in responses.
- */
-export const email_auth_DmarcStatus_output: JsonSchema = {
-  "enum": [
-    "missing-dmarc-report",
-    "multiple-dmarc-reports",
-    "missing-dmarc-rua",
-    "cname-on-dmarc-record",
-    "unauthorized-reporting-domain"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-auth_DnsRecordInfo` in responses.
  */
-export const email_auth_DnsRecordInfo_output: JsonSchema = {
+export const email$$auth_DnsRecordInfo: JsonSchema = {
   "properties": {
     "content": {
       "type": "string"
@@ -152,7 +145,7 @@ export const email_auth_DnsRecordInfo_output: JsonSchema = {
 /**
  * The schema of `email-auth_ResolvedDmarcRecord` in responses.
  */
-export const email_auth_ResolvedDmarcRecord_output: JsonSchema = {
+export const email$$auth_ResolvedDmarcRecord: JsonSchema = {
   "properties": {
     "content": {
       "type": "string"
@@ -167,7 +160,7 @@ export const email_auth_ResolvedDmarcRecord_output: JsonSchema = {
 /**
  * The schema of `email-auth_ZoneDnsRecords` in responses.
  */
-export const email_auth_ZoneDnsRecords_output: JsonSchema = {
+export const email$$auth_ZoneDnsRecords: JsonSchema = {
   "properties": {
     "bimi_records": {
       "items": {
diff --git a/src/generated/forge-mcp/emailAuth/dmarcReports/schemas.ts b/src/generated/forge-mcp/emailAuth/dmarcReports/schemas.ts
index 4c8eb43ce..9cdf23bdd 100644
--- a/src/generated/forge-mcp/emailAuth/dmarcReports/schemas.ts
+++ b/src/generated/forge-mcp/emailAuth/dmarcReports/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-auth_ConfigureDmarcReportsRequest`.
  */
-export const email_auth_ConfigureDmarcReportsRequest: JsonSchema = {
+export const email$$auth_ConfigureDmarcReportsRequest: JsonSchema = {
   "description": "Request body for PATCH /dmarc-reports",
   "properties": {
     "enabled": {
diff --git a/src/generated/forge-mcp/emailAuth/dmarcReports/tools.ts b/src/generated/forge-mcp/emailAuth/dmarcReports/tools.ts
index 52c39c9f7..f89b7dcb2 100644
--- a/src/generated/forge-mcp/emailAuth/dmarcReports/tools.ts
+++ b/src/generated/forge-mcp/emailAuth/dmarcReports/tools.ts
@@ -3,47 +3,54 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  email_auth_api_response_common_failure_output,
-  email_auth_api_response_single_output,
-  email_auth_messages_output,
+  email$$auth_api$$response$$common$$failure,
+  email$$auth_api$$response$$single,
+  email$$auth_messages,
 } from "../outputs.js";
-import { email_auth_identifier } from "../schemas.js";
 import {
-  email_auth_ApprovedSourceResponse_output,
-  email_auth_DmarcReportResponse_output,
-  email_auth_DmarcStatus_output,
-  email_auth_DnsRecordInfo_output,
-  email_auth_ResolvedDmarcRecord_output,
-  email_auth_ZoneDnsRecords_output,
+  email$$auth_ApprovedSourceResponse,
+  email$$auth_DmarcReportResponse,
+  email$$auth_DnsRecordInfo,
+  email$$auth_ResolvedDmarcRecord,
+  email$$auth_ZoneDnsRecords,
 } from "./outputs.js";
-import { email_auth_ConfigureDmarcReportsRequest } from "./schemas.js";
+import { email$$auth_ConfigureDmarcReportsRequest } from "./schemas.js";
 
 /**
- * The tools of `email_auth.dmarc_reports`.
+ * The tools of `emailAuth.dmarcReports`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_auth_dmarc_reports_edit",
+    name: "emailAuth_dmarcReports_edit",
     title: "Configure DMARC Reports",
-    description: "Updates the DMARC report configuration for a zone.\nAt least one of `enabled` or `skip_wizard` must be provided.\nWhen enabling, the handler will ensure the DMARC RUA record exists in DNS.",
+    description: "Updates the DMARC report configuration for a zone.\nAt least one of `enabled` or `skip_wizard` must be provided.\nWhen enabling, the handler will ensure the DMARC RUA record exists in DNS.\n\nPATCH /zones/{zone_id}/email/auth/dmarc-reports",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email-auth_ConfigureDmarcReportsRequest"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email-auth_identifier",
-          "description": "Zone identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-auth_ConfigureDmarcReportsRequest": email_auth_ConfigureDmarcReportsRequest,
-        "email-auth_identifier": email_auth_identifier,
+        "email-auth_ConfigureDmarcReportsRequest": email$$auth_ConfigureDmarcReportsRequest,
       },
     },
     outputSchema: {
@@ -61,14 +68,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-auth_ApprovedSourceResponse": email_auth_ApprovedSourceResponse_output,
-        "email-auth_DmarcReportResponse": email_auth_DmarcReportResponse_output,
-        "email-auth_DmarcStatus": email_auth_DmarcStatus_output,
-        "email-auth_DnsRecordInfo": email_auth_DnsRecordInfo_output,
-        "email-auth_ResolvedDmarcRecord": email_auth_ResolvedDmarcRecord_output,
-        "email-auth_ZoneDnsRecords": email_auth_ZoneDnsRecords_output,
-        "email-auth_api-response-single": email_auth_api_response_single_output,
-        "email-auth_messages": email_auth_messages_output,
+        "email-auth_ApprovedSourceResponse": email$$auth_ApprovedSourceResponse,
+        "email-auth_DmarcReportResponse": email$$auth_DmarcReportResponse,
+        "email-auth_DnsRecordInfo": email$$auth_DnsRecordInfo,
+        "email-auth_ResolvedDmarcRecord": email$$auth_ResolvedDmarcRecord,
+        "email-auth_ZoneDnsRecords": email$$auth_ZoneDnsRecords,
+        "email-auth_api-response-single": email$$auth_api$$response$$single,
+        "email-auth_messages": email$$auth_messages,
       },
     },
     annotations: {
@@ -102,15 +108,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-auth_ApprovedSourceResponse": email_auth_ApprovedSourceResponse_output,
-        "email-auth_DmarcReportResponse": email_auth_DmarcReportResponse_output,
-        "email-auth_DmarcStatus": email_auth_DmarcStatus_output,
-        "email-auth_DnsRecordInfo": email_auth_DnsRecordInfo_output,
-        "email-auth_ResolvedDmarcRecord": email_auth_ResolvedDmarcRecord_output,
-        "email-auth_ZoneDnsRecords": email_auth_ZoneDnsRecords_output,
-        "email-auth_api-response-common-failure": email_auth_api_response_common_failure_output,
-        "email-auth_api-response-single": email_auth_api_response_single_output,
-        "email-auth_messages": email_auth_messages_output,
+        "email-auth_ApprovedSourceResponse": email$$auth_ApprovedSourceResponse,
+        "email-auth_DmarcReportResponse": email$$auth_DmarcReportResponse,
+        "email-auth_DnsRecordInfo": email$$auth_DnsRecordInfo,
+        "email-auth_ResolvedDmarcRecord": email$$auth_ResolvedDmarcRecord,
+        "email-auth_ZoneDnsRecords": email$$auth_ZoneDnsRecords,
+        "email-auth_api-response-common-failure": email$$auth_api$$response$$common$$failure,
+        "email-auth_api-response-single": email$$auth_api$$response$$single,
+        "email-auth_messages": email$$auth_messages,
       },
     },
     request: (args) => ({
@@ -119,23 +124,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_auth_dmarc_reports_get",
+    name: "emailAuth_dmarcReports_get",
     title: "Get DMARC Report Status",
-    description: "Retrieves the current DMARC report configuration and status for a zone.\nReturns the RUA prefix, enabled status, approved sources, and DNS records.",
+    description: "Retrieves the current DMARC report configuration and status for a zone.\nReturns the RUA prefix, enabled status, approved sources, and DNS records.\n\nGET /zones/{zone_id}/email/auth/dmarc-reports",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/email-auth_identifier",
-          "description": "Zone identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "email-auth_identifier": email_auth_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -152,14 +164,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-auth_ApprovedSourceResponse": email_auth_ApprovedSourceResponse_output,
-        "email-auth_DmarcReportResponse": email_auth_DmarcReportResponse_output,
-        "email-auth_DmarcStatus": email_auth_DmarcStatus_output,
-        "email-auth_DnsRecordInfo": email_auth_DnsRecordInfo_output,
-        "email-auth_ResolvedDmarcRecord": email_auth_ResolvedDmarcRecord_output,
-        "email-auth_ZoneDnsRecords": email_auth_ZoneDnsRecords_output,
-        "email-auth_api-response-single": email_auth_api_response_single_output,
-        "email-auth_messages": email_auth_messages_output,
+        "email-auth_ApprovedSourceResponse": email$$auth_ApprovedSourceResponse,
+        "email-auth_DmarcReportResponse": email$$auth_DmarcReportResponse,
+        "email-auth_DnsRecordInfo": email$$auth_DnsRecordInfo,
+        "email-auth_ResolvedDmarcRecord": email$$auth_ResolvedDmarcRecord,
+        "email-auth_ZoneDnsRecords": email$$auth_ZoneDnsRecords,
+        "email-auth_api-response-single": email$$auth_api$$response$$single,
+        "email-auth_messages": email$$auth_messages,
       },
     },
     annotations: {
@@ -193,15 +204,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-auth_ApprovedSourceResponse": email_auth_ApprovedSourceResponse_output,
-        "email-auth_DmarcReportResponse": email_auth_DmarcReportResponse_output,
-        "email-auth_DmarcStatus": email_auth_DmarcStatus_output,
-        "email-auth_DnsRecordInfo": email_auth_DnsRecordInfo_output,
-        "email-auth_ResolvedDmarcRecord": email_auth_ResolvedDmarcRecord_output,
-        "email-auth_ZoneDnsRecords": email_auth_ZoneDnsRecords_output,
-        "email-auth_api-response-common-failure": email_auth_api_response_common_failure_output,
-        "email-auth_api-response-single": email_auth_api_response_single_output,
-        "email-auth_messages": email_auth_messages_output,
+        "email-auth_ApprovedSourceResponse": email$$auth_ApprovedSourceResponse,
+        "email-auth_DmarcReportResponse": email$$auth_DmarcReportResponse,
+        "email-auth_DnsRecordInfo": email$$auth_DnsRecordInfo,
+        "email-auth_ResolvedDmarcRecord": email$$auth_ResolvedDmarcRecord,
+        "email-auth_ZoneDnsRecords": email$$auth_ZoneDnsRecords,
+        "email-auth_api-response-common-failure": email$$auth_api$$response$$common$$failure,
+        "email-auth_api-response-single": email$$auth_api$$response$$single,
+        "email-auth_messages": email$$auth_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailAuth/outputs.ts b/src/generated/forge-mcp/emailAuth/outputs.ts
index 8dae27e8c..fdc2af169 100644
--- a/src/generated/forge-mcp/emailAuth/outputs.ts
+++ b/src/generated/forge-mcp/emailAuth/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `email-auth_api-response-common-failure` in responses.
  */
-export const email_auth_api_response_common_failure_output: JsonSchema = {
+export const email$$auth_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/email-auth_messages"
@@ -36,7 +36,7 @@ export const email_auth_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `email-auth_api-response-single` in responses.
  */
-export const email_auth_api_response_single_output: JsonSchema = {
+export const email$$auth_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/email-auth_messages"
@@ -62,7 +62,7 @@ export const email_auth_api_response_single_output: JsonSchema = {
 /**
  * The schema of `email-auth_messages` in responses.
  */
-export const email_auth_messages_output: JsonSchema = {
+export const email$$auth_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/emailAuth/schemas.ts b/src/generated/forge-mcp/emailAuth/schemas.ts
deleted file mode 100644
index a2d4d4857..000000000
--- a/src/generated/forge-mcp/emailAuth/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `email-auth_identifier`.
- */
-export const email_auth_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailAuth/spf/outputs.ts b/src/generated/forge-mcp/emailAuth/spf/outputs.ts
index e1838f749..0e792b80e 100644
--- a/src/generated/forge-mcp/emailAuth/spf/outputs.ts
+++ b/src/generated/forge-mcp/emailAuth/spf/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-auth_InspectError` in responses.
  */
-export const email_auth_InspectError_output: JsonSchema = {
+export const email$$auth_InspectError: JsonSchema = {
   "properties": {
     "code": {
       "type": "string"
@@ -32,7 +32,7 @@ export const email_auth_InspectError_output: JsonSchema = {
 /**
  * The schema of `email-auth_SpfComponent` in responses.
  */
-export const email_auth_SpfComponent_output: JsonSchema = {
+export const email$$auth_SpfComponent: JsonSchema = {
   "properties": {
     "lookup_count": {
       "type": "integer"
@@ -41,7 +41,16 @@ export const email_auth_SpfComponent_output: JsonSchema = {
       "$ref": "#/$defs/email-auth_SpfTree"
     },
     "result": {
-      "$ref": "#/$defs/email-auth_SpfResult"
+      "enum": [
+        "pass",
+        "neutral",
+        "fail",
+        "soft_fail",
+        "none",
+        "temp_error",
+        "perm_error"
+      ],
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -70,26 +79,10 @@ export const email_auth_SpfComponent_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-auth_SpfResult` in responses.
- */
-export const email_auth_SpfResult_output: JsonSchema = {
-  "enum": [
-    "pass",
-    "neutral",
-    "fail",
-    "soft_fail",
-    "none",
-    "temp_error",
-    "perm_error"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-auth_SpfTree` in responses.
  */
-export const email_auth_SpfTree_output: JsonSchema = {
+export const email$$auth_SpfTree: JsonSchema = {
   "properties": {
     "components": {
       "items": {
diff --git a/src/generated/forge-mcp/emailAuth/spf/tools.ts b/src/generated/forge-mcp/emailAuth/spf/tools.ts
index 27ec499e5..c24c8b5cc 100644
--- a/src/generated/forge-mcp/emailAuth/spf/tools.ts
+++ b/src/generated/forge-mcp/emailAuth/spf/tools.ts
@@ -1,47 +1,61 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_auth_api_response_common_failure_output,
-  email_auth_api_response_single_output,
-  email_auth_messages_output,
+  email$$auth_api$$response$$common$$failure,
+  email$$auth_api$$response$$single,
+  email$$auth_messages,
 } from "../outputs.js";
-import { email_auth_identifier } from "../schemas.js";
 import {
-  email_auth_InspectError_output,
-  email_auth_SpfComponent_output,
-  email_auth_SpfResult_output,
-  email_auth_SpfTree_output,
+  email$$auth_InspectError,
+  email$$auth_SpfComponent,
+  email$$auth_SpfTree,
 } from "./outputs.js";
 
 /**
- * The tools of `email_auth.spf`.
+ * The tools of `emailAuth.spf`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_auth_spf_inspect",
+    name: "emailAuth_spf_inspect",
     title: "Inspect SPF Record",
-    description: "Inspects a specific SPF TXT record and returns a parsed tree structure\nin the spflimit-worker format.\n\nThe record ID must be provided via the `id` query parameter.\n\nReturns a recursive tree showing:\n- Parsed components with their qualifiers and types\n- Nested includes recursively resolved within components\n- Per-component and total lookup counts\n- Detailed error information with context",
+    description: "Inspects a specific SPF TXT record and returns a parsed tree structure\nin the spflimit-worker format.\n\nThe record ID must be provided via the `id` query parameter.\n\nReturns a recursive tree showing:\n- Parsed components with their qualifiers and types\n- Nested includes recursively resolved within components\n- Per-component and total lookup counts\n- Detailed error information with context\n\nGET /zones/{zone_id}/email/auth/spf/inspect",
     inputSchema: {
       type: "object",
       properties: {
-        "id": {
-          "description": "DNS record ID (rec_tag) to inspect",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email-auth_identifier",
-          "description": "Zone identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "DNS record ID (rec_tag) to inspect",
+              "type": "string"
+            }
+          },
+          "required": [
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "id"
+        "path",
+        "query"
       ],
-      $defs: {
-        "email-auth_identifier": email_auth_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -58,12 +72,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-auth_InspectError": email_auth_InspectError_output,
-        "email-auth_SpfComponent": email_auth_SpfComponent_output,
-        "email-auth_SpfResult": email_auth_SpfResult_output,
-        "email-auth_SpfTree": email_auth_SpfTree_output,
-        "email-auth_api-response-single": email_auth_api_response_single_output,
-        "email-auth_messages": email_auth_messages_output,
+        "email-auth_InspectError": email$$auth_InspectError,
+        "email-auth_SpfComponent": email$$auth_SpfComponent,
+        "email-auth_SpfTree": email$$auth_SpfTree,
+        "email-auth_api-response-single": email$$auth_api$$response$$single,
+        "email-auth_messages": email$$auth_messages,
       },
     },
     annotations: {
@@ -97,19 +110,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-auth_InspectError": email_auth_InspectError_output,
-        "email-auth_SpfComponent": email_auth_SpfComponent_output,
-        "email-auth_SpfResult": email_auth_SpfResult_output,
-        "email-auth_SpfTree": email_auth_SpfTree_output,
-        "email-auth_api-response-common-failure": email_auth_api_response_common_failure_output,
-        "email-auth_api-response-single": email_auth_api_response_single_output,
-        "email-auth_messages": email_auth_messages_output,
+        "email-auth_InspectError": email$$auth_InspectError,
+        "email-auth_SpfComponent": email$$auth_SpfComponent,
+        "email-auth_SpfTree": email$$auth_SpfTree,
+        "email-auth_api-response-common-failure": email$$auth_api$$response$$common$$failure,
+        "email-auth_api-response-single": email$$auth_api$$response$$single,
+        "email-auth_messages": email$$auth_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/email/auth/spf/inspect`,
       query: [
-        ["id", args["id"], true],
+        ["id", param(args, "query", "id"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailDomains/outputs.ts b/src/generated/forge-mcp/emailDomains/outputs.ts
index 5a9c83ac5..9945c8a75 100644
--- a/src/generated/forge-mcp/emailDomains/outputs.ts
+++ b/src/generated/forge-mcp/emailDomains/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `email_email_domain` in responses.
  */
-export const email_email_domain_output: JsonSchema = {
+export const email_email_domain: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/email_identifier"
+      "type": "string"
     },
     "claim_release_at": {
       "format": "date-time",
@@ -83,7 +83,7 @@ export const email_email_domain_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_capability` in responses.
  */
-export const email_email_domain_capability_output: JsonSchema = {
+export const email_email_domain_capability: JsonSchema = {
   "properties": {
     "reason": {
       "type": "string"
@@ -111,7 +111,7 @@ export const email_email_domain_capability_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_change` in responses.
  */
-export const email_email_domain_change_output: JsonSchema = {
+export const email_email_domain_change: JsonSchema = {
   "properties": {
     "email_domain": {
       "$ref": "#/$defs/email_email_domain"
@@ -136,7 +136,7 @@ export const email_email_domain_change_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_change_collection_response` in responses.
  */
-export const email_email_domain_change_collection_response_output: JsonSchema = {
+export const email_email_domain_change_collection_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -200,7 +200,7 @@ export const email_email_domain_change_collection_response_output: JsonSchema =
 /**
  * The schema of `email_email_domain_collection_response` in responses.
  */
-export const email_email_domain_collection_response_output: JsonSchema = {
+export const email_email_domain_collection_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -256,7 +256,7 @@ export const email_email_domain_collection_response_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_dns_record` in responses.
  */
-export const email_email_domain_dns_record_output: JsonSchema = {
+export const email_email_domain_dns_record: JsonSchema = {
   "properties": {
     "content": {
       "type": "string"
@@ -338,7 +338,7 @@ export const email_email_domain_dns_record_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_error_response` in responses.
  */
-export const email_email_domain_error_response_output: JsonSchema = {
+export const email_email_domain_error_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -405,7 +405,7 @@ export const email_email_domain_error_response_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_platform_status` in responses.
  */
-export const email_email_domain_platform_status_output: JsonSchema = {
+export const email_email_domain_platform_status: JsonSchema = {
   "properties": {
     "routing": {
       "$ref": "#/$defs/email_email_domain_capability"
@@ -424,7 +424,7 @@ export const email_email_domain_platform_status_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_response` in responses.
  */
-export const email_email_domain_response_output: JsonSchema = {
+export const email_email_domain_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -457,7 +457,7 @@ export const email_email_domain_response_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_tombstone` in responses.
  */
-export const email_email_domain_tombstone_output: JsonSchema = {
+export const email_email_domain_tombstone: JsonSchema = {
   "properties": {
     "hostname": {
       "type": "string"
@@ -492,7 +492,7 @@ export const email_email_domain_tombstone_output: JsonSchema = {
 /**
  * The schema of `email_email_domain_verification` in responses.
  */
-export const email_email_domain_verification_output: JsonSchema = {
+export const email_email_domain_verification: JsonSchema = {
   "properties": {
     "expires_at": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/emailDomains/tools.ts b/src/generated/forge-mcp/emailDomains/tools.ts
index 3a98ddf9d..ea4262620 100644
--- a/src/generated/forge-mcp/emailDomains/tools.ts
+++ b/src/generated/forge-mcp/emailDomains/tools.ts
@@ -1,73 +1,83 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
-import { email_identifier_output } from "../outputs.js";
-import { email_identifier } from "../schemas.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  email_email_domain_capability_output,
-  email_email_domain_change_collection_response_output,
-  email_email_domain_change_output,
-  email_email_domain_collection_response_output,
-  email_email_domain_dns_record_output,
-  email_email_domain_error_response_output,
-  email_email_domain_output,
-  email_email_domain_platform_status_output,
-  email_email_domain_response_output,
-  email_email_domain_tombstone_output,
-  email_email_domain_verification_output,
+  email_email_domain,
+  email_email_domain_capability,
+  email_email_domain_change,
+  email_email_domain_change_collection_response,
+  email_email_domain_collection_response,
+  email_email_domain_dns_record,
+  email_email_domain_error_response,
+  email_email_domain_platform_status,
+  email_email_domain_response,
+  email_email_domain_tombstone,
+  email_email_domain_verification,
 } from "./outputs.js";
 import { email_email_domain_create } from "./schemas.js";
 
 /**
- * The tools of `email_domains`.
+ * The tools of `emailDomains`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_domains_changes",
+    name: "emailDomains_changes",
     title: "List Email Domain changes",
-    description: "Returns retained domain-specific state changes and completed-removal tombstones in a transaction-safe opaque order. The top-level platform field is the current shared gate and must be combined with each domain's state. Store next_cursor after processing every response, and continue immediately while has_more is true. To take a checkpoint, request this operation with modified_since set to the current time, follow has_more to the end, and save the final next_cursor; it replays every change committed after the first of those requests. Initial bootstrap and error 2086 recovery take a checkpoint, list the full inventory, then replay from the saved checkpoint, so changes made during the inventory are not lost. Only a tombstone proves that a domain was removed. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.",
+    description: "Returns retained domain-specific state changes and completed-removal tombstones in a transaction-safe opaque order. The top-level platform field is the current shared gate and must be combined with each domain's state. Store next_cursor after processing every response, and continue immediately while has_more is true. To take a checkpoint, request this operation with modified_since set to the current time, follow has_more to the end, and save the final next_cursor; it replays every change committed after the first of those requests. Initial bootstrap and error 2086 recovery take a checkpoint, list the full inventory, then replay from the saved checkpoint, so changes made during the inventory are not lost. Only a tombstone proves that a domain was removed. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.\n\nGET /accounts/{account_id}/email/domain-changes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
-        "cursor": {
-          "description": "Opaque cursor returned by the previous change page. Omit it for the first page.",
-          "type": "string"
-        },
-        "modified_since": {
-          "description": "Optional RFC 3339 lower bound for the first request only. Values outside the retained history return error 2086. A value up to one minute ahead of the server clock is read as the current time; a later value returns 400.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum changes to return in one page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque cursor returned by the previous change page. Omit it for the first page.",
+              "type": "string"
+            },
+            "modified_since": {
+              "description": "Optional RFC 3339 lower bound for the first request only. Values outside the retained history return error 2086. A value up to one minute ahead of the server clock is read as the current time; a later value returns 400.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum changes to return in one page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_domain_change_collection_response",
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_change": email_email_domain_change_output,
-        "email_email_domain_change_collection_response": email_email_domain_change_collection_response_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_platform_status": email_email_domain_platform_status_output,
-        "email_email_domain_tombstone": email_email_domain_tombstone_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_change": email_email_domain_change,
+        "email_email_domain_change_collection_response": email_email_domain_change_collection_response,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_platform_status": email_email_domain_platform_status,
+        "email_email_domain_tombstone": email_email_domain_tombstone,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     annotations: {
@@ -111,60 +121,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_change": email_email_domain_change_output,
-        "email_email_domain_change_collection_response": email_email_domain_change_collection_response_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_error_response": email_email_domain_error_response_output,
-        "email_email_domain_platform_status": email_email_domain_platform_status_output,
-        "email_email_domain_tombstone": email_email_domain_tombstone_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_change": email_email_domain_change,
+        "email_email_domain_change_collection_response": email_email_domain_change_collection_response,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_error_response": email_email_domain_error_response,
+        "email_email_domain_platform_status": email_email_domain_platform_status,
+        "email_email_domain_tombstone": email_email_domain_tombstone,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email/domain-changes`,
       query: [
-        ["per_page", args["per_page"], false],
-        ["cursor", args["cursor"], false],
-        ["modified_since", args["modified_since"], false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["modified_since", param(args, "query", "modified_since"), false],
       ],
     }),
   },
   {
-    name: "email_domains_create",
+    name: "emailDomains_create",
     title: "Create an Email Domain",
-    description: "Creates a candidate and four DNS instructions. Rejects hostnames with more than 16 labels or whose assigned Return-Path exceeds 201 ASCII characters; error 2077 names the hostname rule that failed. Creation follows read-only checks of the saved provider bundle and published exclusion. Hostnames inside an active full Cloudflare DNS zone, including zones under a PSL private suffix such as workers.dev, or held by another enrollment, return the generic hostname conflict error 2083. While an earlier enrollment of this account with the same hostname or client_reference is being deleted, create returns error 2084 with Retry-After set to the expected completion time. No per-domain provider DNS writes occur. Customer DNS observations remain pending and mail remains inactive. Unverified candidates may share a hostname. Supply an account-unique client_reference to retry the same enrollment safely; reuse with a different hostname returns error 2089. A full domain quota returns error 2081 and frees only when domains are deleted or candidates expire, so it is not retryable; the create rate limit returns 429 with error 2088 and Retry-After. Requests rejected before the Cloudflare zone check do not count toward the rate limit. Final public-DNS, namespace protection and runtime readiness are separate gates. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.",
+    description: "Creates a candidate and four DNS instructions. Rejects hostnames with more than 16 labels or whose assigned Return-Path exceeds 201 ASCII characters; error 2077 names the hostname rule that failed. Creation follows read-only checks of the saved provider bundle and published exclusion. Hostnames inside an active full Cloudflare DNS zone, including zones under a PSL private suffix such as workers.dev, or held by another enrollment, return the generic hostname conflict error 2083. While an earlier enrollment of this account with the same hostname or client_reference is being deleted, create returns error 2084 with Retry-After set to the expected completion time. No per-domain provider DNS writes occur. Customer DNS observations remain pending and mail remains inactive. Unverified candidates may share a hostname. Supply an account-unique client_reference to retry the same enrollment safely; reuse with a different hostname returns error 2089. A full domain quota returns error 2081 and frees only when domains are deleted or candidates expire, so it is not retryable; the create rate limit returns 429 with error 2088 and Retry-After. Requests rejected before the Cloudflare zone check do not count toward the rate limit. Final public-DNS, namespace protection and runtime readiness are separate gates. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.\n\nPOST /accounts/{account_id}/email/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/email_email_domain_create"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "email_email_domain_create": email_email_domain_create,
-        "email_identifier": email_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_domain_response",
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_response": email_email_domain_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_response": email_email_domain_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     annotations: {
@@ -211,13 +228,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_error_response": email_email_domain_error_response_output,
-        "email_email_domain_response": email_email_domain_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_error_response": email_email_domain_error_response,
+        "email_email_domain_response": email_email_domain_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     request: (args) => ({
@@ -226,38 +242,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_domains_delete",
+    name: "emailDomains_delete",
     title: "Delete an Email Domain",
-    description: "Requires an empty body. Unclaimed, unpublished candidates are removed immediately after token retirement. Acquired or published resources retain deleting state and claims until the deletion worker acknowledges safe revocation and token retirement: deletion completes after the last authorization FWDR may still hold has expired, up to about 31 minutes after the request. Until then the hostname and client_reference cannot be enrolled again. Repeated requests while deleting are idempotent. Retry-After is the expected time until GET returns 404; follow the Location header after it. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.",
+    description: "Requires an empty body. Unclaimed, unpublished candidates are removed immediately after token retirement. Acquired or published resources retain deleting state and claims until the deletion worker acknowledges safe revocation and token retirement: deletion completes after the last authorization FWDR may still hold has expired, up to about 31 minutes after the request. Until then the hostname and client_reference cannot be enrolled again. Repeated requests while deleting are idempotent. Retry-After is the expected time until GET returns 404; follow the Location header after it. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.\n\nDELETE /accounts/{account_id}/email/domains/{email_domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
-        "email_domain_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "email_domain_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "email_domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "email_domain_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_domain_response",
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_response": email_email_domain_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_response": email_email_domain_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     annotations: {
@@ -301,13 +323,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_error_response": email_email_domain_error_response_output,
-        "email_email_domain_response": email_email_domain_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_error_response": email_email_domain_error_response,
+        "email_email_domain_response": email_email_domain_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     request: (args) => ({
@@ -315,38 +336,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_domains_get",
+    name: "emailDomains_get",
     title: "Get an Email Domain",
-    description: "Returns domain status and its four assigned DNS records. Shared provider health is reported by the capability states rather than duplicated on each DNS record. Expired unclaimed candidates and completed deletions return 404. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.",
+    description: "Returns domain status and its four assigned DNS records. Shared provider health is reported by the capability states rather than duplicated on each DNS record. Expired unclaimed candidates and completed deletions return 404. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.\n\nGET /accounts/{account_id}/email/domains/{email_domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
-        "email_domain_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "email_domain_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "email_domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "email_domain_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_domain_response",
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_response": email_email_domain_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_response": email_email_domain_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     annotations: {
@@ -387,13 +414,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_error_response": email_email_domain_error_response_output,
-        "email_email_domain_response": email_email_domain_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_error_response": email_email_domain_error_response,
+        "email_email_domain_response": email_email_domain_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     request: (args) => ({
@@ -401,52 +427,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_domains_list",
+    name: "emailDomains_list",
     title: "List Email Domains",
-    description: "Returns account-scoped domain status. DNS records are omitted unless requested; exact hostname filtering may return several candidates; retain the EmailDomain ID for each enrollment. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.",
+    description: "Returns account-scoped domain status. DNS records are omitted unless requested; exact hostname filtering may return several candidates; retain the EmailDomain ID for each enrollment. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.\n\nGET /accounts/{account_id}/email/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
-        "cursor": {
-          "description": "Opaque cursor returned by the previous page. Omit it for the first page.",
-          "type": "string"
-        },
-        "hostname": {
-          "description": "Exact hostname filter for recovering an ambiguous create response.",
-          "type": "string"
-        },
-        "include": {
-          "description": "Include DNS instructions on each list result.",
-          "enum": [
-            "dns_records"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque cursor returned by the previous page. Omit it for the first page.",
+              "type": "string"
+            },
+            "hostname": {
+              "description": "Exact hostname filter for recovering an ambiguous create response.",
+              "type": "string"
+            },
+            "include": {
+              "description": "Include DNS instructions on each list result.",
+              "enum": [
+                "dns_records"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_domain_collection_response",
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_collection_response": email_email_domain_collection_response_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_collection_response": email_email_domain_collection_response,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     annotations: {
@@ -487,58 +525,63 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_collection_response": email_email_domain_collection_response_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_error_response": email_email_domain_error_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_collection_response": email_email_domain_collection_response,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_error_response": email_email_domain_error_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email/domains`,
       query: [
-        ["per_page", args["per_page"], false],
-        ["cursor", args["cursor"], false],
-        ["hostname", args["hostname"], false],
-        ["include", args["include"], false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["hostname", param(args, "query", "hostname"), false],
+        ["include", param(args, "query", "include"), false],
       ],
     }),
   },
   {
-    name: "email_domains_verify",
+    name: "emailDomains_verify",
     title: "Verify an Email Domain",
-    description: "Requires an empty body. Schedules an expedited check and coalesces queued or leased work. It does not accept verification results, bypass activation gates, or perform customer DNS checks synchronously. Follow the Location header after Retry-After seconds until verification.observed_at appears or advances beyond the value in this 202 response; status may remain unchanged. Candidate expiry returns 404. A repeat within 30 seconds returns error 2082 with the remaining cooldown in Retry-After. Only a request that schedules a check counts toward the account rate limit, error 2088. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.",
+    description: "Requires an empty body. Schedules an expedited check and coalesces queued or leased work. It does not accept verification results, bypass activation gates, or perform customer DNS checks synchronously. Follow the Location header after Retry-After seconds until verification.observed_at appears or advances beyond the value in this 202 response; status may remain unchanged. Candidate expiry returns 404. A repeat within 30 seconds returns error 2082 with the remaining cooldown in Retry-After. Only a request that schedules a check counts toward the account rate limit, error 2088. Available only to the configured OpenAI pilot account behind a default-off gate; while the gate is off, the pilot account gets 503 with error 2090 and Retry-After, and existing domains are unaffected. Unsupported methods return 405 with error 2091. Authentication failures may use the gateway error envelope.\n\nPOST /accounts/{account_id}/email/domains/{email_domain_id}/verify",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
-        "email_domain_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "email_domain_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "email_domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "email_domain_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_domain_response",
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_response": email_email_domain_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_response": email_email_domain_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     annotations: {
@@ -585,13 +628,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email_email_domain": email_email_domain_output,
-        "email_email_domain_capability": email_email_domain_capability_output,
-        "email_email_domain_dns_record": email_email_domain_dns_record_output,
-        "email_email_domain_error_response": email_email_domain_error_response_output,
-        "email_email_domain_response": email_email_domain_response_output,
-        "email_email_domain_verification": email_email_domain_verification_output,
-        "email_identifier": email_identifier_output,
+        "email_email_domain": email_email_domain,
+        "email_email_domain_capability": email_email_domain_capability,
+        "email_email_domain_dns_record": email_email_domain_dns_record,
+        "email_email_domain_error_response": email_email_domain_error_response,
+        "email_email_domain_response": email_email_domain_response,
+        "email_email_domain_verification": email_email_domain_verification,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailRouting/addresses/outputs.ts b/src/generated/forge-mcp/emailRouting/addresses/outputs.ts
index d7802257c..897949993 100644
--- a/src/generated/forge-mcp/emailRouting/addresses/outputs.ts
+++ b/src/generated/forge-mcp/emailRouting/addresses/outputs.ts
@@ -6,41 +6,37 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email_addresses` in responses.
  */
-export const email_addresses_output: JsonSchema = {
+export const email_addresses: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/email_created"
+      "format": "date-time",
+      "type": "string"
     },
     "email": {
-      "$ref": "#/$defs/email_email"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/email_destination_address_identifier"
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/email_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "tag": {
-      "$ref": "#/$defs/email_destination_address_tag"
+      "type": "string"
     },
     "verified": {
-      "$ref": "#/$defs/email_verified"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `email_destination_address_identifier` in responses.
- */
-export const email_destination_address_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `email_destination_address_response_single` in responses.
  */
-export const email_destination_address_response_single_output: JsonSchema = {
+export const email_destination_address_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
@@ -56,17 +52,10 @@ export const email_destination_address_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `email_destination_address_tag` in responses.
- */
-export const email_destination_address_tag_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `email_destination_addresses_response_collection` in responses.
  */
-export const email_destination_addresses_response_collection_output: JsonSchema = {
+export const email_destination_addresses_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-collection"
@@ -101,18 +90,3 @@ export const email_destination_addresses_response_collection_output: JsonSchema
     }
   ]
 };
-
-/**
- * The schema of `email_email` in responses.
- */
-export const email_email_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `email_verified` in responses.
- */
-export const email_verified_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailRouting/addresses/schemas.ts b/src/generated/forge-mcp/emailRouting/addresses/schemas.ts
index 784abc936..7b4d2032a 100644
--- a/src/generated/forge-mcp/emailRouting/addresses/schemas.ts
+++ b/src/generated/forge-mcp/emailRouting/addresses/schemas.ts
@@ -9,8 +9,8 @@ import type { JsonSchema } from "../../_/tool.js";
 export const email_create_destination_address_properties: JsonSchema = {
   "properties": {
     "email": {
-      "$ref": "#/$defs/email_email",
-      "description": "The contact email address of the user."
+      "description": "The contact email address of the user.",
+      "type": "string"
     }
   },
   "required": [
@@ -19,22 +19,6 @@ export const email_create_destination_address_properties: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email_destination_address_identifier`.
- */
-export const email_destination_address_identifier: JsonSchema = {
-  "description": "Destination address identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `email_email`.
- */
-export const email_email: JsonSchema = {
-  "description": "The contact email address of the user.",
-  "type": "string"
-};
-
 /**
  * The schema of `email_update_destination_address_properties`.
  */
diff --git a/src/generated/forge-mcp/emailRouting/addresses/tools.ts b/src/generated/forge-mcp/emailRouting/addresses/tools.ts
index bd34a7d81..c96bbfe90 100644
--- a/src/generated/forge-mcp/emailRouting/addresses/tools.ts
+++ b/src/generated/forge-mcp/emailRouting/addresses/tools.ts
@@ -1,74 +1,67 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_api_response_collection_output,
-  email_api_response_common_output,
-  email_api_response_single_output,
-  email_created_output,
-  email_messages_output,
-  email_modified_output,
+  email_api$$response$$collection,
+  email_api$$response$$common,
+  email_api$$response$$single,
+  email_messages,
 } from "../../outputs.js";
-import { email_identifier } from "../../schemas.js";
 import {
-  email_addresses_output,
-  email_destination_address_identifier_output,
-  email_destination_address_response_single_output,
-  email_destination_address_tag_output,
-  email_destination_addresses_response_collection_output,
-  email_email_output,
-  email_verified_output,
+  email_addresses,
+  email_destination_address_response_single,
+  email_destination_addresses_response_collection,
 } from "./outputs.js";
 import {
   email_create_destination_address_properties,
-  email_destination_address_identifier,
-  email_email,
   email_update_destination_address_properties,
 } from "./schemas.js";
 
 /**
- * The tools of `email_routing.addresses`.
+ * The tools of `emailRouting.addresses`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_routing_addresses_create",
+    name: "emailRouting_addresses_create",
     title: "Create a destination address",
-    description: "Create a destination address to forward your emails to. Destination addresses need to be verified before they can be used.",
+    description: "Create a destination address to forward your emails to. Destination addresses need to be verified before they can be used.\n\nPOST /accounts/{account_id}/email/routing/addresses",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/email_create_destination_address_properties"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "email_create_destination_address_properties": email_create_destination_address_properties,
-        "email_email": email_email,
-        "email_identifier": email_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_destination_address_response_single",
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_response_single": email_destination_address_response_single_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-single": email_api$$response$$single,
+        "email_destination_address_response_single": email_destination_address_response_single,
+        "email_messages": email_messages,
       },
     },
     annotations: {
@@ -104,16 +97,10 @@ export const tools: readonly Tool[] = [
         "422": null
       },
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_response_single": email_destination_address_response_single_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-single": email_api$$response$$single,
+        "email_destination_address_response_single": email_destination_address_response_single,
+        "email_messages": email_messages,
       },
     },
     request: (args) => ({
@@ -122,43 +109,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_addresses_delete",
+    name: "emailRouting_addresses_delete",
     title: "Delete destination address",
-    description: "Deletes a specific destination address.\n\nConfirm with the user before calling this tool. This operation permanently deletes a destination address.",
+    description: "Deletes a specific destination address.\n\nConfirm with the user before calling this tool. This operation permanently deletes a destination address.\n\nDELETE /accounts/{account_id}/email/routing/addresses/{destination_address_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
-        "destination_address_identifier": {
-          "$ref": "#/$defs/email_destination_address_identifier",
-          "description": "Destination address identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "destination_address_identifier": {
+              "description": "Destination address identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "destination_address_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "destination_address_identifier"
+        "path"
       ],
-      $defs: {
-        "email_destination_address_identifier": email_destination_address_identifier,
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_destination_address_response_single",
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_response_single": email_destination_address_response_single_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-single": email_api$$response$$single,
+        "email_destination_address_response_single": email_destination_address_response_single,
+        "email_messages": email_messages,
       },
     },
     annotations: {
@@ -194,16 +181,10 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_response_single": email_destination_address_response_single_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-single": email_api$$response$$single,
+        "email_destination_address_response_single": email_destination_address_response_single,
+        "email_messages": email_messages,
       },
     },
     request: (args) => ({
@@ -211,43 +192,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_addresses_get",
+    name: "emailRouting_addresses_get",
     title: "Get a destination address",
-    description: "Gets information for a specific destination email already created.",
+    description: "Gets information for a specific destination email already created.\n\nGET /accounts/{account_id}/email/routing/addresses/{destination_address_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
-        "destination_address_identifier": {
-          "$ref": "#/$defs/email_destination_address_identifier",
-          "description": "Destination address identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "destination_address_identifier": {
+              "description": "Destination address identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "destination_address_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "destination_address_identifier"
+        "path"
       ],
-      $defs: {
-        "email_destination_address_identifier": email_destination_address_identifier,
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_destination_address_response_single",
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_response_single": email_destination_address_response_single_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-single": email_api$$response$$single,
+        "email_destination_address_response_single": email_destination_address_response_single,
+        "email_messages": email_messages,
       },
     },
     annotations: {
@@ -284,16 +265,10 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_response_single": email_destination_address_response_single_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-single": email_api$$response$$single,
+        "email_destination_address_response_single": email_destination_address_response_single,
+        "email_messages": email_messages,
       },
     },
     request: (args) => ({
@@ -301,66 +276,73 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_addresses_list",
+    name: "emailRouting_addresses_list",
     title: "List destination addresses",
-    description: "Lists destination addresses configured for Email Routing in an account.",
+    description: "Lists destination addresses configured for Email Routing in an account.\n\nGET /accounts/{account_id}/email/routing/addresses",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sorts results in an ascending or descending order.",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "number"
-        },
-        "verified": {
-          "default": true,
-          "description": "Filter by verified destination addresses.",
-          "enum": [
-            true,
-            false
-          ],
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "Sorts results in an ascending or descending order.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            },
+            "verified": {
+              "default": true,
+              "description": "Filter by verified destination addresses.",
+              "enum": [
+                true,
+                false
+              ],
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_destination_addresses_response_collection",
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_destination_addresses_response_collection": email_destination_addresses_response_collection_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_destination_addresses_response_collection": email_destination_addresses_response_collection,
+        "email_messages": email_messages,
       },
     },
     annotations: {
@@ -397,72 +379,68 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_destination_addresses_response_collection": email_destination_addresses_response_collection_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_destination_addresses_response_collection": email_destination_addresses_response_collection,
+        "email_messages": email_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email/routing/addresses`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
-        ["verified", args["verified"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["verified", param(args, "query", "verified"), true],
       ],
     }),
   },
   {
-    name: "email_routing_addresses_update",
+    name: "emailRouting_addresses_update",
     title: "Update destination address",
-    description: "Updates the status of a specific destination address.",
+    description: "Updates the status of a specific destination address.\n\nPATCH /accounts/{account_id}/email/routing/addresses/{destination_address_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/email_update_destination_address_properties"
         },
-        "destination_address_identifier": {
-          "$ref": "#/$defs/email_destination_address_identifier",
-          "description": "Destination address identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "destination_address_identifier": {
+              "description": "Destination address identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "destination_address_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "destination_address_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email_destination_address_identifier": email_destination_address_identifier,
-        "email_identifier": email_identifier,
         "email_update_destination_address_properties": email_update_destination_address_properties,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_destination_address_response_single",
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_response_single": email_destination_address_response_single_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-single": email_api$$response$$single,
+        "email_destination_address_response_single": email_destination_address_response_single,
+        "email_messages": email_messages,
       },
     },
     annotations: {
@@ -498,16 +476,10 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_addresses": email_addresses_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_destination_address_identifier": email_destination_address_identifier_output,
-        "email_destination_address_response_single": email_destination_address_response_single_output,
-        "email_destination_address_tag": email_destination_address_tag_output,
-        "email_email": email_email_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_verified": email_verified_output,
+        "email_addresses": email_addresses,
+        "email_api-response-single": email_api$$response$$single,
+        "email_destination_address_response_single": email_destination_address_response_single,
+        "email_messages": email_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailRouting/dns/tools.ts b/src/generated/forge-mcp/emailRouting/dns/tools.ts
index ae67f5b34..21cb8b192 100644
--- a/src/generated/forge-mcp/emailRouting/dns/tools.ts
+++ b/src/generated/forge-mcp/emailRouting/dns/tools.ts
@@ -1,71 +1,70 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_api_response_collection_output,
-  email_api_response_common_output,
-  email_api_response_single_output,
-  email_dns_record_output,
-  email_dns_settings_response_collection_output,
-  email_messages_output,
+  email_api$$response$$collection,
+  email_api$$response$$common,
+  email_api$$response$$single,
+  email_dns_record,
+  email_dns_settings_response_collection,
+  email_messages,
 } from "../../outputs.js";
-import { email_identifier } from "../../schemas.js";
 import {
-  email_email_setting_created_output,
-  email_email_setting_enabled_output,
-  email_email_setting_identifier_output,
-  email_email_setting_modified_output,
-  email_email_setting_name_output,
-  email_email_setting_skip_wizard_output,
-  email_email_setting_status_output,
-  email_email_setting_support_subaddress_output,
-  email_email_setting_tag_output,
-  email_email_settings_response_single_output,
-  email_settings_output,
+  email_email_settings_response_single,
+  email_settings,
 } from "../outputs.js";
-import {
-  email_email_setting_dns_request_body,
-  email_email_setting_name,
-} from "../schemas.js";
+import { email_email_setting_dns_request_body } from "../schemas.js";
 
 /**
- * The tools of `email_routing.dns`.
+ * The tools of `emailRouting.dns`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_routing_dns_get",
+    name: "emailRouting_dns_get",
     title: "Email Routing - DNS settings",
-    description: "Show the DNS records needed to configure your Email Routing zone.",
+    description: "Show the DNS records needed to configure your Email Routing zone.\n\nGET /zones/{zone_id}/email/routing/dns",
     inputSchema: {
       type: "object",
       properties: {
-        "subdomain": {
-          "$ref": "#/$defs/email_email_setting_name",
-          "deprecated": true,
-          "description": "Deprecated. When supplied, the response shape differs from the documented default and is not modeled in generated SDKs. Do not rely on this parameter."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain": {
+              "deprecated": true,
+              "description": "Deprecated. When supplied, the response shape differs from the documented default and is not modeled in generated SDKs. Do not rely on this parameter.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "email_email_setting_name": email_email_setting_name,
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_dns_settings_response_collection",
       $defs: {
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_dns_record": email_dns_record_output,
-        "email_dns_settings_response_collection": email_dns_settings_response_collection_output,
-        "email_messages": email_messages_output,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_dns_record": email_dns_record,
+        "email_dns_settings_response_collection": email_dns_settings_response_collection,
+        "email_messages": email_messages,
       },
     },
     annotations: {
@@ -102,60 +101,59 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_dns_record": email_dns_record_output,
-        "email_dns_settings_response_collection": email_dns_settings_response_collection_output,
-        "email_messages": email_messages_output,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_dns_record": email_dns_record,
+        "email_dns_settings_response_collection": email_dns_settings_response_collection,
+        "email_messages": email_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/email/routing/dns`,
       query: [
-        ["subdomain", args["subdomain"], true],
+        ["subdomain", param(args, "query", "subdomain"), true],
       ],
     }),
   },
   {
-    name: "email_routing_dns_unlock",
+    name: "emailRouting_dns_unlock",
     title: "Unlock Email Routing DNS records",
-    description: "Unlock MX Records previously locked by Email Routing.",
+    description: "Unlock MX Records previously locked by Email Routing.\n\nPATCH /zones/{zone_id}/email/routing/dns",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_email_setting_dns_request_body"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
         "email_email_setting_dns_request_body": email_email_setting_dns_request_body,
-        "email_email_setting_name": email_email_setting_name,
-        "email_identifier": email_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_settings_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     annotations: {
@@ -191,19 +189,10 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailRouting/outputs.ts b/src/generated/forge-mcp/emailRouting/outputs.ts
index 9fba529e5..c7d9c77fe 100644
--- a/src/generated/forge-mcp/emailRouting/outputs.ts
+++ b/src/generated/forge-mcp/emailRouting/outputs.ts
@@ -3,94 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `email_email_setting_created` in responses.
- */
-export const email_email_setting_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `email_email_setting_enabled` in responses.
- */
-export const email_email_setting_enabled_output: JsonSchema = {
-  "enum": [
-    true,
-    false
-  ],
-  "type": "boolean"
-};
-
-/**
- * The schema of `email_email_setting_identifier` in responses.
- */
-export const email_email_setting_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `email_email_setting_modified` in responses.
- */
-export const email_email_setting_modified_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `email_email_setting_name` in responses.
- */
-export const email_email_setting_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `email_email_setting_skip-wizard` in responses.
- */
-export const email_email_setting_skip_wizard_output: JsonSchema = {
-  "enum": [
-    true,
-    false
-  ],
-  "type": "boolean"
-};
-
-/**
- * The schema of `email_email_setting_status` in responses.
- */
-export const email_email_setting_status_output: JsonSchema = {
-  "enum": [
-    "ready",
-    "unconfigured",
-    "misconfigured",
-    "misconfigured/locked",
-    "unlocked"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email_email_setting_support_subaddress` in responses.
- */
-export const email_email_setting_support_subaddress_output: JsonSchema = {
-  "enum": [
-    true,
-    false
-  ],
-  "type": "boolean"
-};
-
-/**
- * The schema of `email_email_setting_tag` in responses.
- */
-export const email_email_setting_tag_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `email_email_settings_response_single` in responses.
  */
-export const email_email_settings_response_single_output: JsonSchema = {
+export const email_email_settings_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
@@ -109,34 +25,55 @@ export const email_email_settings_response_single_output: JsonSchema = {
 /**
  * The schema of `email_settings` in responses.
  */
-export const email_settings_output: JsonSchema = {
+export const email_settings: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/email_email_setting_created"
+      "format": "date-time",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/email_email_setting_enabled"
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/email_email_setting_identifier"
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/email_email_setting_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/email_email_setting_name"
+      "type": "string"
     },
     "skip_wizard": {
-      "$ref": "#/$defs/email_email_setting_skip-wizard"
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "status": {
-      "$ref": "#/$defs/email_email_setting_status"
+      "enum": [
+        "ready",
+        "unconfigured",
+        "misconfigured",
+        "misconfigured/locked",
+        "unlocked"
+      ],
+      "type": "string"
     },
     "support_subaddress": {
-      "$ref": "#/$defs/email_email_setting_support_subaddress"
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "tag": {
-      "$ref": "#/$defs/email_email_setting_tag"
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/emailRouting/rules/catchAll/outputs.ts b/src/generated/forge-mcp/emailRouting/rules/catchAll/outputs.ts
index 64187b59f..b828df31a 100644
--- a/src/generated/forge-mcp/emailRouting/rules/catchAll/outputs.ts
+++ b/src/generated/forge-mcp/emailRouting/rules/catchAll/outputs.ts
@@ -6,28 +6,36 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email_catch_all_rule` in responses.
  */
-export const email_catch_all_rule_output: JsonSchema = {
+export const email_catch_all_rule: JsonSchema = {
   "properties": {
     "actions": {
       "$ref": "#/$defs/email_rule_catchall-actions"
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled"
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/email_rule_identifier"
+      "type": "string"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_catchall-matchers"
     },
     "name": {
-      "$ref": "#/$defs/email_rule_name"
+      "type": "string"
     },
     "source": {
-      "$ref": "#/$defs/email_rule_source"
+      "enum": [
+        "api",
+        "wrangler"
+      ],
+      "type": "string"
     },
     "tag": {
-      "$ref": "#/$defs/email_rule_tag"
+      "type": "string"
     }
   },
   "type": "object"
@@ -36,7 +44,7 @@ export const email_catch_all_rule_output: JsonSchema = {
 /**
  * The schema of `email_catch_all_rule_response_single` in responses.
  */
-export const email_catch_all_rule_response_single_output: JsonSchema = {
+export const email_catch_all_rule_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
diff --git a/src/generated/forge-mcp/emailRouting/rules/catchAll/schemas.ts b/src/generated/forge-mcp/emailRouting/rules/catchAll/schemas.ts
index 2390eb5d2..51988fe48 100644
--- a/src/generated/forge-mcp/emailRouting/rules/catchAll/schemas.ts
+++ b/src/generated/forge-mcp/emailRouting/rules/catchAll/schemas.ts
@@ -13,26 +13,34 @@ export const email_update_catch_all_rule_properties: JsonSchema = {
       "description": "List actions for the catch-all routing rule."
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled",
       "default": true,
-      "description": "Routing rule status."
+      "description": "Routing rule status.",
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_catchall-matchers",
       "description": "List of matchers for the catch-all routing rule."
     },
     "name": {
-      "$ref": "#/$defs/email_rule_name",
-      "description": "Routing rule name."
+      "description": "Routing rule name.",
+      "type": "string"
     },
     "owner_worker_tag": {
-      "$ref": "#/$defs/email_rule_owner_worker_tag",
-      "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.\n"
+      "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.",
+      "type": "string"
     },
     "source": {
-      "$ref": "#/$defs/email_rule_source",
       "default": "api",
-      "description": "Who manages the rule. `api` covers dashboard, generic API, and Terraform;\n`wrangler` means the rule is managed by a Worker's wrangler.jsonc. Defaults\nto `api` when omitted on write.\n"
+      "description": "Who manages the rule. `api` covers dashboard, generic API, and Terraform;\n`wrangler` means the rule is managed by a Worker's wrangler.jsonc. Defaults\nto `api` when omitted on write.",
+      "enum": [
+        "api",
+        "wrangler"
+      ],
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/emailRouting/rules/catchAll/tools.ts b/src/generated/forge-mcp/emailRouting/rules/catchAll/tools.ts
index 610d7db42..077cc9e5f 100644
--- a/src/generated/forge-mcp/emailRouting/rules/catchAll/tools.ts
+++ b/src/generated/forge-mcp/emailRouting/rules/catchAll/tools.ts
@@ -3,76 +3,68 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  email_api_response_single_output,
-  email_messages_output,
+  email_api$$response$$single,
+  email_messages,
 } from "../../../outputs.js";
-import { email_identifier } from "../../../schemas.js";
 import {
-  email_rule_catchall_action_output,
-  email_rule_catchall_actions_output,
-  email_rule_catchall_matcher_output,
-  email_rule_catchall_matchers_output,
-  email_rule_enabled_output,
-  email_rule_identifier_output,
-  email_rule_name_output,
-  email_rule_source_output,
-  email_rule_tag_output,
+  email_rule_catchall$$action,
+  email_rule_catchall$$actions,
+  email_rule_catchall$$matcher,
+  email_rule_catchall$$matchers,
 } from "../outputs.js";
 import {
-  email_rule_catchall_action,
-  email_rule_catchall_actions,
-  email_rule_catchall_matcher,
-  email_rule_catchall_matchers,
-  email_rule_enabled,
-  email_rule_name,
-  email_rule_owner_worker_tag,
-  email_rule_source,
+  email_rule_catchall$$action as email_rule_catchall$$action$,
+  email_rule_catchall$$actions as email_rule_catchall$$actions$,
+  email_rule_catchall$$matcher as email_rule_catchall$$matcher$,
+  email_rule_catchall$$matchers as email_rule_catchall$$matchers$,
 } from "../schemas.js";
 import {
-  email_catch_all_rule_output,
-  email_catch_all_rule_response_single_output,
+  email_catch_all_rule,
+  email_catch_all_rule_response_single,
 } from "./outputs.js";
 import { email_update_catch_all_rule_properties } from "./schemas.js";
 
 /**
- * The tools of `email_routing.rules.catch_all`.
+ * The tools of `emailRouting.rules.catchAll`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_routing_rules_catch_all_get",
+    name: "emailRouting_rules_catchAll_get",
     title: "Get catch-all rule",
-    description: "Get information on the default catch-all routing rule.",
+    description: "Get information on the default catch-all routing rule.\n\nGET /zones/{zone_id}/email/routing/rules/catch_all",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_catch_all_rule_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_catch_all_rule": email_catch_all_rule_output,
-        "email_catch_all_rule_response_single": email_catch_all_rule_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_catchall-action": email_rule_catchall_action_output,
-        "email_rule_catchall-actions": email_rule_catchall_actions_output,
-        "email_rule_catchall-matcher": email_rule_catchall_matcher_output,
-        "email_rule_catchall-matchers": email_rule_catchall_matchers_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_catch_all_rule": email_catch_all_rule,
+        "email_catch_all_rule_response_single": email_catch_all_rule_response_single,
+        "email_messages": email_messages,
+        "email_rule_catchall-action": email_rule_catchall$$action,
+        "email_rule_catchall-actions": email_rule_catchall$$actions,
+        "email_rule_catchall-matcher": email_rule_catchall$$matcher,
+        "email_rule_catchall-matchers": email_rule_catchall$$matchers,
       },
     },
     annotations: {
@@ -109,19 +101,14 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_catch_all_rule": email_catch_all_rule_output,
-        "email_catch_all_rule_response_single": email_catch_all_rule_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_catchall-action": email_rule_catchall_action_output,
-        "email_rule_catchall-actions": email_rule_catchall_actions_output,
-        "email_rule_catchall-matcher": email_rule_catchall_matcher_output,
-        "email_rule_catchall-matchers": email_rule_catchall_matchers_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_catch_all_rule": email_catch_all_rule,
+        "email_catch_all_rule_response_single": email_catch_all_rule_response_single,
+        "email_messages": email_messages,
+        "email_rule_catchall-action": email_rule_catchall$$action,
+        "email_rule_catchall-actions": email_rule_catchall$$actions,
+        "email_rule_catchall-matcher": email_rule_catchall$$matcher,
+        "email_rule_catchall-matchers": email_rule_catchall$$matchers,
       },
     },
     request: (args) => ({
@@ -129,53 +116,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_rules_catch_all_update",
+    name: "emailRouting_rules_catchAll_update",
     title: "Update catch-all rule",
-    description: "Enable or disable catch-all routing rule, or change action to forward to a specific destination address. Forward actions require exactly one verified destination address.",
+    description: "Enable or disable catch-all routing rule, or change action to forward to a specific destination address. Forward actions require exactly one verified destination address.\n\nPUT /zones/{zone_id}/email/routing/rules/catch_all",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_update_catch_all_rule_properties"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email_identifier": email_identifier,
-        "email_rule_catchall-action": email_rule_catchall_action,
-        "email_rule_catchall-actions": email_rule_catchall_actions,
-        "email_rule_catchall-matcher": email_rule_catchall_matcher,
-        "email_rule_catchall-matchers": email_rule_catchall_matchers,
-        "email_rule_enabled": email_rule_enabled,
-        "email_rule_name": email_rule_name,
-        "email_rule_owner_worker_tag": email_rule_owner_worker_tag,
-        "email_rule_source": email_rule_source,
+        "email_rule_catchall-action": email_rule_catchall$$action$,
+        "email_rule_catchall-actions": email_rule_catchall$$actions$,
+        "email_rule_catchall-matcher": email_rule_catchall$$matcher$,
+        "email_rule_catchall-matchers": email_rule_catchall$$matchers$,
         "email_update_catch_all_rule_properties": email_update_catch_all_rule_properties,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_catch_all_rule_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_catch_all_rule": email_catch_all_rule_output,
-        "email_catch_all_rule_response_single": email_catch_all_rule_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_catchall-action": email_rule_catchall_action_output,
-        "email_rule_catchall-actions": email_rule_catchall_actions_output,
-        "email_rule_catchall-matcher": email_rule_catchall_matcher_output,
-        "email_rule_catchall-matchers": email_rule_catchall_matchers_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_catch_all_rule": email_catch_all_rule,
+        "email_catch_all_rule_response_single": email_catch_all_rule_response_single,
+        "email_messages": email_messages,
+        "email_rule_catchall-action": email_rule_catchall$$action,
+        "email_rule_catchall-actions": email_rule_catchall$$actions,
+        "email_rule_catchall-matcher": email_rule_catchall$$matcher,
+        "email_rule_catchall-matchers": email_rule_catchall$$matchers,
       },
     },
     annotations: {
@@ -212,19 +199,14 @@ export const tools: readonly Tool[] = [
         "422": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_catch_all_rule": email_catch_all_rule_output,
-        "email_catch_all_rule_response_single": email_catch_all_rule_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_catchall-action": email_rule_catchall_action_output,
-        "email_rule_catchall-actions": email_rule_catchall_actions_output,
-        "email_rule_catchall-matcher": email_rule_catchall_matcher_output,
-        "email_rule_catchall-matchers": email_rule_catchall_matchers_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_catch_all_rule": email_catch_all_rule,
+        "email_catch_all_rule_response_single": email_catch_all_rule_response_single,
+        "email_messages": email_messages,
+        "email_rule_catchall-action": email_rule_catchall$$action,
+        "email_rule_catchall-actions": email_rule_catchall$$actions,
+        "email_rule_catchall-matcher": email_rule_catchall$$matcher,
+        "email_rule_catchall-matchers": email_rule_catchall$$matchers,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailRouting/rules/outputs.ts b/src/generated/forge-mcp/emailRouting/rules/outputs.ts
index 28eafc7da..2e98b3297 100644
--- a/src/generated/forge-mcp/emailRouting/rules/outputs.ts
+++ b/src/generated/forge-mcp/emailRouting/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email_account_rule` in responses.
  */
-export const email_account_rule_output: JsonSchema = {
+export const email_account_rule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_rule_properties"
@@ -33,7 +33,7 @@ export const email_account_rule_output: JsonSchema = {
 /**
  * The schema of `email_account_rules_plan` in responses.
  */
-export const email_account_rules_plan_output: JsonSchema = {
+export const email_account_rules_plan: JsonSchema = {
   "properties": {
     "zones": {
       "items": {
@@ -48,7 +48,7 @@ export const email_account_rules_plan_output: JsonSchema = {
 /**
  * The schema of `email_account_rules_plan_change` in responses.
  */
-export const email_account_rules_plan_change_output: JsonSchema = {
+export const email_account_rules_plan_change: JsonSchema = {
   "properties": {
     "remote": {
       "$ref": "#/$defs/email_account_rules_plan_remote_rule"
@@ -72,16 +72,20 @@ export const email_account_rules_plan_change_output: JsonSchema = {
 /**
  * The schema of `email_account_rules_plan_remote_rule` in responses.
  */
-export const email_account_rules_plan_remote_rule_output: JsonSchema = {
+export const email_account_rules_plan_remote_rule: JsonSchema = {
   "properties": {
     "actions": {
       "$ref": "#/$defs/email_rule_actions"
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled"
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/email_rule_identifier"
+      "type": "string"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_matchers"
@@ -90,7 +94,11 @@ export const email_account_rules_plan_remote_rule_output: JsonSchema = {
       "type": "string"
     },
     "source": {
-      "$ref": "#/$defs/email_rule_source"
+      "enum": [
+        "api",
+        "wrangler"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -99,7 +107,7 @@ export const email_account_rules_plan_remote_rule_output: JsonSchema = {
 /**
  * The schema of `email_account_rules_plan_response_single` in responses.
  */
-export const email_account_rules_plan_response_single_output: JsonSchema = {
+export const email_account_rules_plan_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
@@ -118,7 +126,7 @@ export const email_account_rules_plan_response_single_output: JsonSchema = {
 /**
  * The schema of `email_account_rules_plan_zone` in responses.
  */
-export const email_account_rules_plan_zone_output: JsonSchema = {
+export const email_account_rules_plan_zone: JsonSchema = {
   "properties": {
     "changes": {
       "items": {
@@ -127,7 +135,7 @@ export const email_account_rules_plan_zone_output: JsonSchema = {
       "type": "array"
     },
     "zone_id": {
-      "$ref": "#/$defs/email_identifier"
+      "type": "string"
     },
     "zone_name": {
       "type": "string"
@@ -139,7 +147,7 @@ export const email_account_rules_plan_zone_output: JsonSchema = {
 /**
  * The schema of `email_account_rules_response_collection` in responses.
  */
-export const email_account_rules_response_collection_output: JsonSchema = {
+export const email_account_rules_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-collection"
@@ -178,7 +186,7 @@ export const email_account_rules_response_collection_output: JsonSchema = {
 /**
  * The schema of `email_rule_action` in responses.
  */
-export const email_rule_action_output: JsonSchema = {
+export const email_rule_action: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -205,7 +213,7 @@ export const email_rule_action_output: JsonSchema = {
 /**
  * The schema of `email_rule_actions` in responses.
  */
-export const email_rule_actions_output: JsonSchema = {
+export const email_rule_actions: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email_rule_action"
   },
@@ -217,7 +225,7 @@ export const email_rule_actions_output: JsonSchema = {
 /**
  * The schema of `email_rule_catchall-action` in responses.
  */
-export const email_rule_catchall_action_output: JsonSchema = {
+export const email_rule_catchall$$action: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -244,7 +252,7 @@ export const email_rule_catchall_action_output: JsonSchema = {
 /**
  * The schema of `email_rule_catchall-actions` in responses.
  */
-export const email_rule_catchall_actions_output: JsonSchema = {
+export const email_rule_catchall$$actions: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email_rule_catchall-action"
   },
@@ -256,7 +264,7 @@ export const email_rule_catchall_actions_output: JsonSchema = {
 /**
  * The schema of `email_rule_catchall-matcher` in responses.
  */
-export const email_rule_catchall_matcher_output: JsonSchema = {
+export const email_rule_catchall$$matcher: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -274,35 +282,17 @@ export const email_rule_catchall_matcher_output: JsonSchema = {
 /**
  * The schema of `email_rule_catchall-matchers` in responses.
  */
-export const email_rule_catchall_matchers_output: JsonSchema = {
+export const email_rule_catchall$$matchers: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email_rule_catchall-matcher"
   },
   "type": "array"
 };
 
-/**
- * The schema of `email_rule_enabled` in responses.
- */
-export const email_rule_enabled_output: JsonSchema = {
-  "enum": [
-    true,
-    false
-  ],
-  "type": "boolean"
-};
-
-/**
- * The schema of `email_rule_identifier` in responses.
- */
-export const email_rule_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `email_rule_matcher` in responses.
  */
-export const email_rule_matcher_output: JsonSchema = {
+export const email_rule_matcher: JsonSchema = {
   "properties": {
     "field": {
       "enum": [
@@ -330,55 +320,49 @@ export const email_rule_matcher_output: JsonSchema = {
 /**
  * The schema of `email_rule_matchers` in responses.
  */
-export const email_rule_matchers_output: JsonSchema = {
+export const email_rule_matchers: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email_rule_matcher"
   },
   "type": "array"
 };
 
-/**
- * The schema of `email_rule_name` in responses.
- */
-export const email_rule_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `email_rule_priority` in responses.
- */
-export const email_rule_priority_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `email_rule_properties` in responses.
  */
-export const email_rule_properties_output: JsonSchema = {
+export const email_rule_properties: JsonSchema = {
   "properties": {
     "actions": {
       "$ref": "#/$defs/email_rule_actions"
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled"
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/email_rule_identifier"
+      "type": "string"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_matchers"
     },
     "name": {
-      "$ref": "#/$defs/email_rule_name"
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/email_rule_priority"
+      "type": "number"
     },
     "source": {
-      "$ref": "#/$defs/email_rule_source"
+      "enum": [
+        "api",
+        "wrangler"
+      ],
+      "type": "string"
     },
     "tag": {
-      "$ref": "#/$defs/email_rule_tag"
+      "type": "string"
     }
   },
   "type": "object"
@@ -387,7 +371,7 @@ export const email_rule_properties_output: JsonSchema = {
 /**
  * The schema of `email_rule_response_single` in responses.
  */
-export const email_rule_response_single_output: JsonSchema = {
+export const email_rule_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
@@ -403,52 +387,42 @@ export const email_rule_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `email_rule_source` in responses.
- */
-export const email_rule_source_output: JsonSchema = {
-  "enum": [
-    "api",
-    "wrangler"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email_rule_tag` in responses.
- */
-export const email_rule_tag_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `email_rules` in responses.
  */
-export const email_rules_output: JsonSchema = {
+export const email_rules: JsonSchema = {
   "properties": {
     "actions": {
       "$ref": "#/$defs/email_rule_actions"
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled"
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/email_rule_identifier"
+      "type": "string"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_matchers"
     },
     "name": {
-      "$ref": "#/$defs/email_rule_name"
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/email_rule_priority"
+      "type": "number"
     },
     "source": {
-      "$ref": "#/$defs/email_rule_source"
+      "enum": [
+        "api",
+        "wrangler"
+      ],
+      "type": "string"
     },
     "tag": {
-      "$ref": "#/$defs/email_rule_tag"
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/emailRouting/rules/schemas.ts b/src/generated/forge-mcp/emailRouting/rules/schemas.ts
index 99178a3ee..51b4f170f 100644
--- a/src/generated/forge-mcp/emailRouting/rules/schemas.ts
+++ b/src/generated/forge-mcp/emailRouting/rules/schemas.ts
@@ -33,9 +33,13 @@ export const email_account_rules_plan_catch_all_rule: JsonSchema = {
       "description": "List actions for the catch-all routing rule."
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled",
       "default": true,
-      "description": "Routing rule status."
+      "description": "Routing rule status.",
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_catchall-matchers",
@@ -62,8 +66,8 @@ export const email_account_rules_plan_request: JsonSchema = {
       "type": "array"
     },
     "owner_worker_tag": {
-      "$ref": "#/$defs/email_rule_owner_worker_tag",
-      "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.\n"
+      "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.",
+      "type": "string"
     },
     "rules": {
       "description": "Desired normal Email Routing rules managed by the deploying Worker.",
@@ -89,9 +93,13 @@ export const email_account_rules_plan_rule: JsonSchema = {
       "description": "List actions patterns."
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled",
       "default": true,
-      "description": "Routing rule status."
+      "description": "Routing rule status.",
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_matchers",
@@ -115,31 +123,39 @@ export const email_create_rule_properties: JsonSchema = {
       "description": "List actions patterns."
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled",
       "default": true,
-      "description": "Routing rule status."
+      "description": "Routing rule status.",
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_matchers",
       "description": "Matching patterns to forward to your actions."
     },
     "name": {
-      "$ref": "#/$defs/email_rule_name",
-      "description": "Routing rule name."
+      "description": "Routing rule name.",
+      "type": "string"
     },
     "owner_worker_tag": {
-      "$ref": "#/$defs/email_rule_owner_worker_tag",
-      "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.\n"
+      "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.",
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/email_rule_priority",
       "default": 0,
-      "description": "Priority of the routing rule."
+      "description": "Priority of the routing rule.",
+      "type": "number"
     },
     "source": {
-      "$ref": "#/$defs/email_rule_source",
       "default": "api",
-      "description": "Who manages the rule. `api` covers dashboard, generic API, and Terraform;\n`wrangler` means the rule is managed by a Worker's wrangler.jsonc. Defaults\nto `api` when omitted on write.\n"
+      "description": "Who manages the rule. `api` covers dashboard, generic API, and Terraform;\n`wrangler` means the rule is managed by a Worker's wrangler.jsonc. Defaults\nto `api` when omitted on write.",
+      "enum": [
+        "api",
+        "wrangler"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -195,7 +211,7 @@ export const email_rule_actions: JsonSchema = {
 /**
  * The schema of `email_rule_catchall-action`.
  */
-export const email_rule_catchall_action: JsonSchema = {
+export const email_rule_catchall$$action: JsonSchema = {
   "description": "Action for the catch-all routing rule.",
   "properties": {
     "type": {
@@ -225,7 +241,7 @@ export const email_rule_catchall_action: JsonSchema = {
 /**
  * The schema of `email_rule_catchall-actions`.
  */
-export const email_rule_catchall_actions: JsonSchema = {
+export const email_rule_catchall$$actions: JsonSchema = {
   "description": "List actions for the catch-all routing rule.",
   "items": {
     "$ref": "#/$defs/email_rule_catchall-action"
@@ -238,7 +254,7 @@ export const email_rule_catchall_actions: JsonSchema = {
 /**
  * The schema of `email_rule_catchall-matcher`.
  */
-export const email_rule_catchall_matcher: JsonSchema = {
+export const email_rule_catchall$$matcher: JsonSchema = {
   "description": "Matcher for catch-all routing rule.",
   "properties": {
     "type": {
@@ -258,7 +274,7 @@ export const email_rule_catchall_matcher: JsonSchema = {
 /**
  * The schema of `email_rule_catchall-matchers`.
  */
-export const email_rule_catchall_matchers: JsonSchema = {
+export const email_rule_catchall$$matchers: JsonSchema = {
   "description": "List of matchers for the catch-all routing rule.",
   "items": {
     "$ref": "#/$defs/email_rule_catchall-matcher"
@@ -266,26 +282,6 @@ export const email_rule_catchall_matchers: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `email_rule_enabled`.
- */
-export const email_rule_enabled: JsonSchema = {
-  "description": "Routing rule status.",
-  "enum": [
-    true,
-    false
-  ],
-  "type": "boolean"
-};
-
-/**
- * The schema of `email_rule_identifier`.
- */
-export const email_rule_identifier: JsonSchema = {
-  "description": "Routing rule identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `email_rule_matcher`.
  */
@@ -329,42 +325,6 @@ export const email_rule_matchers: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `email_rule_name`.
- */
-export const email_rule_name: JsonSchema = {
-  "description": "Routing rule name.",
-  "type": "string"
-};
-
-/**
- * The schema of `email_rule_owner_worker_tag`.
- */
-export const email_rule_owner_worker_tag: JsonSchema = {
-  "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.\n",
-  "type": "string"
-};
-
-/**
- * The schema of `email_rule_priority`.
- */
-export const email_rule_priority: JsonSchema = {
-  "description": "Priority of the routing rule.",
-  "type": "number"
-};
-
-/**
- * The schema of `email_rule_source`.
- */
-export const email_rule_source: JsonSchema = {
-  "description": "Who manages the rule. `api` covers dashboard, generic API, and Terraform;\n`wrangler` means the rule is managed by a Worker's wrangler.jsonc. Defaults\nto `api` when omitted on write.\n",
-  "enum": [
-    "api",
-    "wrangler"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email_update_rule_properties`.
  */
@@ -375,31 +335,39 @@ export const email_update_rule_properties: JsonSchema = {
       "description": "List actions patterns."
     },
     "enabled": {
-      "$ref": "#/$defs/email_rule_enabled",
       "default": true,
-      "description": "Routing rule status."
+      "description": "Routing rule status.",
+      "enum": [
+        true,
+        false
+      ],
+      "type": "boolean"
     },
     "matchers": {
       "$ref": "#/$defs/email_rule_matchers",
       "description": "Matching patterns to forward to your actions."
     },
     "name": {
-      "$ref": "#/$defs/email_rule_name",
-      "description": "Routing rule name."
+      "description": "Routing rule name.",
+      "type": "string"
     },
     "owner_worker_tag": {
-      "$ref": "#/$defs/email_rule_owner_worker_tag",
-      "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.\n"
+      "description": "Public tag (script_tag) of the Worker that owns this rule. Required when\n`source` is `wrangler`.",
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/email_rule_priority",
       "default": 0,
-      "description": "Priority of the routing rule."
+      "description": "Priority of the routing rule.",
+      "type": "number"
     },
     "source": {
-      "$ref": "#/$defs/email_rule_source",
       "default": "api",
-      "description": "Who manages the rule. `api` covers dashboard, generic API, and Terraform;\n`wrangler` means the rule is managed by a Worker's wrangler.jsonc. Defaults\nto `api` when omitted on write.\n"
+      "description": "Who manages the rule. `api` covers dashboard, generic API, and Terraform;\n`wrangler` means the rule is managed by a Worker's wrangler.jsonc. Defaults\nto `api` when omitted on write.",
+      "enum": [
+        "api",
+        "wrangler"
+      ],
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/emailRouting/rules/tools.ts b/src/generated/forge-mcp/emailRouting/rules/tools.ts
index 60a78c4fd..63f9be00d 100644
--- a/src/generated/forge-mcp/emailRouting/rules/tools.ts
+++ b/src/generated/forge-mcp/emailRouting/rules/tools.ts
@@ -1,36 +1,28 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_api_response_collection_output,
-  email_api_response_common_output,
-  email_api_response_single_output,
-  email_identifier_output,
-  email_messages_output,
+  email_api$$response$$collection,
+  email_api$$response$$common,
+  email_api$$response$$single,
+  email_messages,
 } from "../../outputs.js";
-import { email_identifier } from "../../schemas.js";
 import {
-  email_account_rule_output,
-  email_account_rules_plan_change_output,
-  email_account_rules_plan_output,
-  email_account_rules_plan_remote_rule_output,
-  email_account_rules_plan_response_single_output,
-  email_account_rules_plan_zone_output,
-  email_account_rules_response_collection_output,
-  email_rule_action_output,
-  email_rule_actions_output,
-  email_rule_enabled_output,
-  email_rule_identifier_output,
-  email_rule_matcher_output,
-  email_rule_matchers_output,
-  email_rule_name_output,
-  email_rule_priority_output,
-  email_rule_properties_output,
-  email_rule_response_single_output,
-  email_rule_source_output,
-  email_rule_tag_output,
-  email_rules_output,
+  email_account_rule,
+  email_account_rules_plan,
+  email_account_rules_plan_change,
+  email_account_rules_plan_remote_rule,
+  email_account_rules_plan_response_single,
+  email_account_rules_plan_zone,
+  email_account_rules_response_collection,
+  email_rule_action,
+  email_rule_actions,
+  email_rule_matcher,
+  email_rule_matchers,
+  email_rule_properties,
+  email_rule_response_single,
+  email_rules,
 } from "./outputs.js";
 import {
   email_account_rules_plan_catch_all_entry,
@@ -38,77 +30,69 @@ import {
   email_account_rules_plan_request,
   email_account_rules_plan_rule,
   email_create_rule_properties,
-  email_rule_action,
-  email_rule_actions,
-  email_rule_catchall_action,
-  email_rule_catchall_actions,
-  email_rule_catchall_matcher,
-  email_rule_catchall_matchers,
-  email_rule_enabled,
-  email_rule_identifier,
-  email_rule_matcher,
-  email_rule_matchers,
-  email_rule_name,
-  email_rule_owner_worker_tag,
-  email_rule_priority,
-  email_rule_source,
+  email_rule_action as email_rule_action$,
+  email_rule_actions as email_rule_actions$,
+  email_rule_catchall$$action,
+  email_rule_catchall$$actions,
+  email_rule_catchall$$matcher,
+  email_rule_catchall$$matchers,
+  email_rule_matcher as email_rule_matcher$,
+  email_rule_matchers as email_rule_matchers$,
   email_update_rule_properties,
 } from "./schemas.js";
 
 /**
- * The tools of `email_routing.rules`.
+ * The tools of `emailRouting.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_routing_rules_create",
+    name: "emailRouting_rules_create",
     title: "Create routing rule",
-    description: "Rules consist of a set of criteria for matching emails (such as an email being sent to a specific custom email address) plus a set of actions to take on the email (like forwarding it to a specific destination address). Forward actions require exactly one verified destination address.",
+    description: "Rules consist of a set of criteria for matching emails (such as an email being sent to a specific custom email address) plus a set of actions to take on the email (like forwarding it to a specific destination address). Forward actions require exactly one verified destination address.\n\nPOST /zones/{zone_id}/email/routing/rules",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_create_rule_properties"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "email_create_rule_properties": email_create_rule_properties,
-        "email_identifier": email_identifier,
-        "email_rule_action": email_rule_action,
-        "email_rule_actions": email_rule_actions,
-        "email_rule_enabled": email_rule_enabled,
-        "email_rule_matcher": email_rule_matcher,
-        "email_rule_matchers": email_rule_matchers,
-        "email_rule_name": email_rule_name,
-        "email_rule_owner_worker_tag": email_rule_owner_worker_tag,
-        "email_rule_priority": email_rule_priority,
-        "email_rule_source": email_rule_source,
+        "email_rule_action": email_rule_action$,
+        "email_rule_actions": email_rule_actions$,
+        "email_rule_matcher": email_rule_matcher$,
+        "email_rule_matchers": email_rule_matchers$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_rule_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_response_single": email_rule_response_single_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
-        "email_rules": email_rules_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_response_single": email_rule_response_single,
+        "email_rules": email_rules,
       },
     },
     annotations: {
@@ -145,20 +129,14 @@ export const tools: readonly Tool[] = [
         "422": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_response_single": email_rule_response_single_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
-        "email_rules": email_rules_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_response_single": email_rule_response_single,
+        "email_rules": email_rules,
       },
     },
     request: (args) => ({
@@ -167,47 +145,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_rules_delete",
+    name: "emailRouting_rules_delete",
     title: "Delete routing rule",
-    description: "Deletes a routing rule so matching incoming messages are no longer forwarded by it.\n\nConfirm with the user before calling this tool. This operation permanently deletes an Email Routing rule.",
+    description: "Deletes a routing rule so matching incoming messages are no longer forwarded by it.\n\nConfirm with the user before calling this tool. This operation permanently deletes an Email Routing rule.\n\nDELETE /zones/{zone_id}/email/routing/rules/{rule_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_identifier": {
-          "$ref": "#/$defs/email_rule_identifier",
-          "description": "Routing rule identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_identifier": {
+              "description": "Routing rule identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_identifier"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-        "email_rule_identifier": email_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_rule_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_response_single": email_rule_response_single_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
-        "email_rules": email_rules_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_response_single": email_rule_response_single,
+        "email_rules": email_rules,
       },
     },
     annotations: {
@@ -243,20 +221,14 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_response_single": email_rule_response_single_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
-        "email_rules": email_rules_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_response_single": email_rule_response_single,
+        "email_rules": email_rules,
       },
     },
     request: (args) => ({
@@ -264,47 +236,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_rules_get",
+    name: "emailRouting_rules_get",
     title: "Get routing rule",
-    description: "Get information for a specific routing rule already created.",
+    description: "Get information for a specific routing rule already created.\n\nGET /zones/{zone_id}/email/routing/rules/{rule_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_identifier": {
-          "$ref": "#/$defs/email_rule_identifier",
-          "description": "Routing rule identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_identifier": {
+              "description": "Routing rule identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_identifier"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-        "email_rule_identifier": email_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_rule_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_response_single": email_rule_response_single_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
-        "email_rules": email_rules_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_response_single": email_rule_response_single,
+        "email_rules": email_rules,
       },
     },
     annotations: {
@@ -341,20 +313,14 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_response_single": email_rule_response_single_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
-        "email_rules": email_rules_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_response_single": email_rule_response_single,
+        "email_rules": email_rules,
       },
     },
     request: (args) => ({
@@ -362,70 +328,77 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_rules_list_account",
+    name: "emailRouting_rules_listAccount",
     title: "List account or zone routing rules",
-    description: "Lists existing routing rules across all zones in the account or zone.",
+    description: "Lists existing routing rules across all zones in the account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/email/routing/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "enabled": {
-          "description": "Filter by enabled routing rules.",
-          "enum": [
-            true,
-            false
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "boolean"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "description": "Filter by enabled routing rules.",
+              "enum": [
+                true,
+                false
+              ],
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_account_rules_response_collection",
       $defs: {
-        "email_account_rule": email_account_rule_output,
-        "email_account_rules_response_collection": email_account_rules_response_collection_output,
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_properties": email_rule_properties_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
+        "email_account_rule": email_account_rule,
+        "email_account_rules_response_collection": email_account_rules_response_collection,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_properties": email_rule_properties,
       },
     },
     annotations: {
@@ -454,88 +427,85 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_account_rule": email_account_rule_output,
-        "email_account_rules_response_collection": email_account_rules_response_collection_output,
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_properties": email_rule_properties_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
+        "email_account_rule": email_account_rule,
+        "email_account_rules_response_collection": email_account_rules_response_collection,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_properties": email_rule_properties,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/email/routing/rules`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["enabled", args["enabled"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["enabled", param(args, "query", "enabled"), true],
       ],
     }),
   },
   {
-    name: "email_routing_rules_plan",
+    name: "emailRouting_rules_plan",
     title: "Plan account routing rule changes",
-    description: "Computes the Email Routing rule changes that would be needed to reconcile a Wrangler-managed desired ruleset. This endpoint is read-only and does not create, update, or delete rules.",
+    description: "Computes the Email Routing rule changes that would be needed to reconcile a Wrangler-managed desired ruleset. This endpoint is read-only and does not create, update, or delete rules.\n\nPOST /accounts/{account_id}/email/routing/rules/plan",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/email_account_rules_plan_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "email_account_rules_plan_catch_all_entry": email_account_rules_plan_catch_all_entry,
         "email_account_rules_plan_catch_all_rule": email_account_rules_plan_catch_all_rule,
         "email_account_rules_plan_request": email_account_rules_plan_request,
         "email_account_rules_plan_rule": email_account_rules_plan_rule,
-        "email_identifier": email_identifier,
-        "email_rule_action": email_rule_action,
-        "email_rule_actions": email_rule_actions,
-        "email_rule_catchall-action": email_rule_catchall_action,
-        "email_rule_catchall-actions": email_rule_catchall_actions,
-        "email_rule_catchall-matcher": email_rule_catchall_matcher,
-        "email_rule_catchall-matchers": email_rule_catchall_matchers,
-        "email_rule_enabled": email_rule_enabled,
-        "email_rule_matcher": email_rule_matcher,
-        "email_rule_matchers": email_rule_matchers,
-        "email_rule_owner_worker_tag": email_rule_owner_worker_tag,
+        "email_rule_action": email_rule_action$,
+        "email_rule_actions": email_rule_actions$,
+        "email_rule_catchall-action": email_rule_catchall$$action,
+        "email_rule_catchall-actions": email_rule_catchall$$actions,
+        "email_rule_catchall-matcher": email_rule_catchall$$matcher,
+        "email_rule_catchall-matchers": email_rule_catchall$$matchers,
+        "email_rule_matcher": email_rule_matcher$,
+        "email_rule_matchers": email_rule_matchers$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_account_rules_plan_response_single",
       $defs: {
-        "email_account_rules_plan": email_account_rules_plan_output,
-        "email_account_rules_plan_change": email_account_rules_plan_change_output,
-        "email_account_rules_plan_remote_rule": email_account_rules_plan_remote_rule_output,
-        "email_account_rules_plan_response_single": email_account_rules_plan_response_single_output,
-        "email_account_rules_plan_zone": email_account_rules_plan_zone_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_identifier": email_identifier_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_source": email_rule_source_output,
+        "email_account_rules_plan": email_account_rules_plan,
+        "email_account_rules_plan_change": email_account_rules_plan_change,
+        "email_account_rules_plan_remote_rule": email_account_rules_plan_remote_rule,
+        "email_account_rules_plan_response_single": email_account_rules_plan_response_single,
+        "email_account_rules_plan_zone": email_account_rules_plan_zone,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
       },
     },
     annotations: {
@@ -566,21 +536,17 @@ export const tools: readonly Tool[] = [
         "422": null
       },
       $defs: {
-        "email_account_rules_plan": email_account_rules_plan_output,
-        "email_account_rules_plan_change": email_account_rules_plan_change_output,
-        "email_account_rules_plan_remote_rule": email_account_rules_plan_remote_rule_output,
-        "email_account_rules_plan_response_single": email_account_rules_plan_response_single_output,
-        "email_account_rules_plan_zone": email_account_rules_plan_zone_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_identifier": email_identifier_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_source": email_rule_source_output,
+        "email_account_rules_plan": email_account_rules_plan,
+        "email_account_rules_plan_change": email_account_rules_plan_change,
+        "email_account_rules_plan_remote_rule": email_account_rules_plan_remote_rule,
+        "email_account_rules_plan_response_single": email_account_rules_plan_response_single,
+        "email_account_rules_plan_zone": email_account_rules_plan_zone,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
       },
     },
     request: (args) => ({
@@ -589,61 +555,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_rules_update",
+    name: "emailRouting_rules_update",
     title: "Update routing rule",
-    description: "Update actions and matches, or enable/disable specific routing rules. Forward actions require exactly one verified destination address.",
+    description: "Update actions and matches, or enable/disable specific routing rules. Forward actions require exactly one verified destination address.\n\nPUT /zones/{zone_id}/email/routing/rules/{rule_identifier}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_update_rule_properties"
         },
-        "rule_identifier": {
-          "$ref": "#/$defs/email_rule_identifier",
-          "description": "Routing rule identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_identifier": {
+              "description": "Routing rule identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email_identifier": email_identifier,
-        "email_rule_action": email_rule_action,
-        "email_rule_actions": email_rule_actions,
-        "email_rule_enabled": email_rule_enabled,
-        "email_rule_identifier": email_rule_identifier,
-        "email_rule_matcher": email_rule_matcher,
-        "email_rule_matchers": email_rule_matchers,
-        "email_rule_name": email_rule_name,
-        "email_rule_owner_worker_tag": email_rule_owner_worker_tag,
-        "email_rule_priority": email_rule_priority,
-        "email_rule_source": email_rule_source,
+        "email_rule_action": email_rule_action$,
+        "email_rule_actions": email_rule_actions$,
+        "email_rule_matcher": email_rule_matcher$,
+        "email_rule_matchers": email_rule_matchers$,
         "email_update_rule_properties": email_update_rule_properties,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_rule_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_response_single": email_rule_response_single_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
-        "email_rules": email_rules_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_response_single": email_rule_response_single,
+        "email_rules": email_rules,
       },
     },
     annotations: {
@@ -680,20 +643,14 @@ export const tools: readonly Tool[] = [
         "422": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_rule_action": email_rule_action_output,
-        "email_rule_actions": email_rule_actions_output,
-        "email_rule_enabled": email_rule_enabled_output,
-        "email_rule_identifier": email_rule_identifier_output,
-        "email_rule_matcher": email_rule_matcher_output,
-        "email_rule_matchers": email_rule_matchers_output,
-        "email_rule_name": email_rule_name_output,
-        "email_rule_priority": email_rule_priority_output,
-        "email_rule_response_single": email_rule_response_single_output,
-        "email_rule_source": email_rule_source_output,
-        "email_rule_tag": email_rule_tag_output,
-        "email_rules": email_rules_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_rule_action": email_rule_action,
+        "email_rule_actions": email_rule_actions,
+        "email_rule_matcher": email_rule_matcher,
+        "email_rule_matchers": email_rule_matchers,
+        "email_rule_response_single": email_rule_response_single,
+        "email_rules": email_rules,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailRouting/schemas.ts b/src/generated/forge-mcp/emailRouting/schemas.ts
index 2d0d9ef23..aeb2bdc20 100644
--- a/src/generated/forge-mcp/emailRouting/schemas.ts
+++ b/src/generated/forge-mcp/emailRouting/schemas.ts
@@ -11,8 +11,8 @@ export const email_email_setting_dns_request_body: JsonSchema = {
     {
       "properties": {
         "name": {
-          "$ref": "#/$defs/email_email_setting_name",
-          "description": "Domain of your zone."
+          "description": "Domain of your zone.",
+          "type": "string"
         }
       },
       "type": "object"
@@ -22,11 +22,3 @@ export const email_email_setting_dns_request_body: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `email_email_setting_name`.
- */
-export const email_email_setting_name: JsonSchema = {
-  "description": "Domain of your zone.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailRouting/settings/tools.ts b/src/generated/forge-mcp/emailRouting/settings/tools.ts
index 2eff5de40..e01a72f25 100644
--- a/src/generated/forge-mcp/emailRouting/settings/tools.ts
+++ b/src/generated/forge-mcp/emailRouting/settings/tools.ts
@@ -2,70 +2,57 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
+import { email_api$$response$$single, email_messages } from "../../outputs.js";
 import {
-  email_api_response_single_output,
-  email_messages_output,
-} from "../../outputs.js";
-import { email_identifier } from "../../schemas.js";
-import {
-  email_email_setting_created_output,
-  email_email_setting_enabled_output,
-  email_email_setting_identifier_output,
-  email_email_setting_modified_output,
-  email_email_setting_name_output,
-  email_email_setting_skip_wizard_output,
-  email_email_setting_status_output,
-  email_email_setting_support_subaddress_output,
-  email_email_setting_tag_output,
-  email_email_settings_response_single_output,
-  email_settings_output,
+  email_email_settings_response_single,
+  email_settings,
 } from "../outputs.js";
 import { email_update_email_routing_settings_properties } from "./schemas.js";
 
 /**
- * The tools of `email_routing.settings`.
+ * The tools of `emailRouting.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_routing_settings_apply",
+    name: "emailRouting_settings_apply",
     title: "Apply Email Routing settings",
-    description: "Apply the provided settings to your Email Routing zone. Omitted settings retain their current values, as with PATCH.",
+    description: "Apply the provided settings to your Email Routing zone. Omitted settings retain their current values, as with PATCH.\n\nPUT /zones/{zone_id}/email/routing",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_update_email_routing_settings_properties"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email_identifier": email_identifier,
         "email_update_email_routing_settings_properties": email_update_email_routing_settings_properties,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_settings_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     annotations: {
@@ -101,19 +88,10 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     request: (args) => ({
@@ -122,40 +100,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_settings_get",
+    name: "emailRouting_settings_get",
     title: "Get Email Routing settings",
-    description: "Get information about the settings for your Email Routing zone.",
+    description: "Get information about the settings for your Email Routing zone.\n\nGET /zones/{zone_id}/email/routing",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_settings_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     annotations: {
@@ -192,19 +168,10 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     request: (args) => ({
@@ -212,45 +179,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_settings_update",
+    name: "emailRouting_settings_update",
     title: "Update Email Routing settings",
-    description: "Update the settings for your Email Routing zone.",
+    description: "Update the settings for your Email Routing zone.\n\nPATCH /zones/{zone_id}/email/routing",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_update_email_routing_settings_properties"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email_identifier": email_identifier,
         "email_update_email_routing_settings_properties": email_update_email_routing_settings_properties,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_settings_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     annotations: {
@@ -286,19 +253,10 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailRouting/tools.ts b/src/generated/forge-mcp/emailRouting/tools.ts
index 38b10266d..5d0e0e551 100644
--- a/src/generated/forge-mcp/emailRouting/tools.ts
+++ b/src/generated/forge-mcp/emailRouting/tools.ts
@@ -2,73 +2,56 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../_/tool.js";
+import { email_api$$response$$single, email_messages } from "../outputs.js";
 import {
-  email_api_response_single_output,
-  email_messages_output,
-} from "../outputs.js";
-import { email_identifier } from "../schemas.js";
-import {
-  email_email_setting_created_output,
-  email_email_setting_enabled_output,
-  email_email_setting_identifier_output,
-  email_email_setting_modified_output,
-  email_email_setting_name_output,
-  email_email_setting_skip_wizard_output,
-  email_email_setting_status_output,
-  email_email_setting_support_subaddress_output,
-  email_email_setting_tag_output,
-  email_email_settings_response_single_output,
-  email_settings_output,
+  email_email_settings_response_single,
+  email_settings,
 } from "./outputs.js";
-import {
-  email_email_setting_dns_request_body,
-  email_email_setting_name,
-} from "./schemas.js";
+import { email_email_setting_dns_request_body } from "./schemas.js";
 
 /**
- * The tools of `email_routing`.
+ * The tools of `emailRouting`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_routing_disable",
+    name: "emailRouting_disable",
     title: "Disable Email Routing",
-    description: "Disable your Email Routing zone. Also removes additional MX records previously required for Email Routing to work.\n\nConfirm with the user before calling this tool. This operation disables Email Routing and removes its DNS records.",
+    description: "Disable your Email Routing zone. Also removes additional MX records previously required for Email Routing to work.\n\nConfirm with the user before calling this tool. This operation disables Email Routing and removes its DNS records.\n\nDELETE /zones/{zone_id}/email/routing/dns",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_email_setting_dns_request_body"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
         "email_email_setting_dns_request_body": email_email_setting_dns_request_body,
-        "email_email_setting_name": email_email_setting_name,
-        "email_identifier": email_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_settings_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     annotations: {
@@ -99,19 +82,10 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     request: (args) => ({
@@ -120,45 +94,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_routing_enable",
+    name: "emailRouting_enable",
     title: "Enable Email Routing",
-    description: "Enable your Email Routing zone. Add and lock the necessary MX and SPF records.",
+    description: "Enable your Email Routing zone. Add and lock the necessary MX and SPF records.\n\nPOST /zones/{zone_id}/email/routing/dns",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_email_setting_dns_request_body"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
         "email_email_setting_dns_request_body": email_email_setting_dns_request_body,
-        "email_email_setting_name": email_email_setting_name,
-        "email_identifier": email_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_email_settings_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     annotations: {
@@ -194,19 +167,10 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_email_setting_created": email_email_setting_created_output,
-        "email_email_setting_enabled": email_email_setting_enabled_output,
-        "email_email_setting_identifier": email_email_setting_identifier_output,
-        "email_email_setting_modified": email_email_setting_modified_output,
-        "email_email_setting_name": email_email_setting_name_output,
-        "email_email_setting_skip-wizard": email_email_setting_skip_wizard_output,
-        "email_email_setting_status": email_email_setting_status_output,
-        "email_email_setting_support_subaddress": email_email_setting_support_subaddress_output,
-        "email_email_setting_tag": email_email_setting_tag_output,
-        "email_email_settings_response_single": email_email_settings_response_single_output,
-        "email_messages": email_messages_output,
-        "email_settings": email_settings_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_email_settings_response_single": email_email_settings_response_single,
+        "email_messages": email_messages,
+        "email_settings": email_settings,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/allowPolicies/outputs.ts b/src/generated/forge-mcp/emailSecurity/allowPolicies/outputs.ts
index 0f2a2533d..1e8f9c19c 100644
--- a/src/generated/forge-mcp/emailSecurity/allowPolicies/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/allowPolicies/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_AllowPolicy` in responses.
  */
-export const email_security_AllowPolicy_output: JsonSchema = {
+export const email$$security_AllowPolicy: JsonSchema = {
   "properties": {
     "comments": {
       "oneOf": [
@@ -19,7 +19,8 @@ export const email_security_AllowPolicy_output: JsonSchema = {
       ]
     },
     "created_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "expires_at": {
       "oneOf": [
@@ -33,7 +34,8 @@ export const email_security_AllowPolicy_output: JsonSchema = {
       ]
     },
     "id": {
-      "$ref": "#/$defs/email-security_AllowPolicyId"
+      "format": "uuid",
+      "type": "string"
     },
     "is_acceptable_sender": {
       "type": "boolean"
@@ -57,16 +59,24 @@ export const email_security_AllowPolicy_output: JsonSchema = {
       "type": "boolean"
     },
     "last_modified": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "pattern": {
       "type": "string"
     },
     "pattern_type": {
-      "$ref": "#/$defs/email-security_PatternType"
+      "enum": [
+        "EMAIL",
+        "DOMAIN",
+        "IP",
+        "UNKNOWN"
+      ],
+      "type": "string"
     },
     "verify_sender": {
       "type": "boolean"
@@ -80,18 +90,10 @@ export const email_security_AllowPolicy_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_AllowPolicyId` in responses.
- */
-export const email_security_AllowPolicyId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_AllowPolicyList` in responses.
  */
-export const email_security_AllowPolicyList_output: JsonSchema = {
+export const email$$security_AllowPolicyList: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email-security_AllowPolicy"
   },
@@ -101,10 +103,11 @@ export const email_security_AllowPolicyList_output: JsonSchema = {
 /**
  * The schema of `email-security_DeletedAllowPolicy` in responses.
  */
-export const email_security_DeletedAllowPolicy_output: JsonSchema = {
+export const email$$security_DeletedAllowPolicy: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/email-security_AllowPolicyId"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/emailSecurity/allowPolicies/schemas.ts b/src/generated/forge-mcp/emailSecurity/allowPolicies/schemas.ts
index f9b2822dc..39a615465 100644
--- a/src/generated/forge-mcp/emailSecurity/allowPolicies/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/allowPolicies/schemas.ts
@@ -3,19 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `email-security_AllowPolicyId`.
- */
-export const email_security_AllowPolicyId: JsonSchema = {
-  "description": "Allow policy identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_CreateAllowPolicy`.
  */
-export const email_security_CreateAllowPolicy: JsonSchema = {
+export const email$$security_CreateAllowPolicy: JsonSchema = {
   "description": "Create an allow policy.",
   "properties": {
     "comments": {
@@ -75,8 +66,14 @@ export const email_security_CreateAllowPolicy: JsonSchema = {
       "type": "string"
     },
     "pattern_type": {
-      "$ref": "#/$defs/email-security_PatternType",
-      "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.\n"
+      "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.",
+      "enum": [
+        "EMAIL",
+        "DOMAIN",
+        "IP",
+        "UNKNOWN"
+      ],
+      "type": "string"
     },
     "verify_sender": {
       "description": "Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors policies that pass authentication.",
@@ -98,7 +95,7 @@ export const email_security_CreateAllowPolicy: JsonSchema = {
 /**
  * The schema of `email-security_UpdateAllowPolicy`.
  */
-export const email_security_UpdateAllowPolicy: JsonSchema = {
+export const email$$security_UpdateAllowPolicy: JsonSchema = {
   "description": "Update an allow policy.",
   "properties": {
     "comments": {
@@ -158,8 +155,14 @@ export const email_security_UpdateAllowPolicy: JsonSchema = {
       "type": "string"
     },
     "pattern_type": {
-      "$ref": "#/$defs/email-security_PatternType",
-      "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.\n"
+      "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.",
+      "enum": [
+        "EMAIL",
+        "DOMAIN",
+        "IP",
+        "UNKNOWN"
+      ],
+      "type": "string"
     },
     "verify_sender": {
       "description": "Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors policies that pass authentication.",
diff --git a/src/generated/forge-mcp/emailSecurity/allowPolicies/tools.ts b/src/generated/forge-mcp/emailSecurity/allowPolicies/tools.ts
index cd9ad9e22..ba80635d8 100644
--- a/src/generated/forge-mcp/emailSecurity/allowPolicies/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/allowPolicies/tools.ts
@@ -1,47 +1,35 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_PatternType_output,
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
-  email_security_timestamp_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
 import {
-  email_security_PatternType,
-  email_security_identifier,
-} from "../schemas.js";
-import {
-  email_security_AllowPolicyId_output,
-  email_security_AllowPolicyList_output,
-  email_security_AllowPolicy_output,
-  email_security_DeletedAllowPolicy_output,
+  email$$security_AllowPolicy,
+  email$$security_AllowPolicyList,
+  email$$security_DeletedAllowPolicy,
 } from "./outputs.js";
 import {
-  email_security_AllowPolicyId,
-  email_security_CreateAllowPolicy,
-  email_security_UpdateAllowPolicy,
+  email$$security_CreateAllowPolicy,
+  email$$security_UpdateAllowPolicy,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.allow_policies`.
+ * The tools of `emailSecurity.allowPolicies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_allow_policies_batch",
+    name: "emailSecurity_allowPolicies_batch",
     title: "Batch allow policy operations",
-    description: "Executes multiple allow policy operations atomically: delete, partially update,\nreplace, and create allow policies in a single request. All four operation arrays\n(deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected allow policies and restore normal security scanning and disposition actions for matching emails.",
+    description: "Executes multiple allow policy operations atomically: delete, partially update,\nreplace, and create allow policies in a single request. All four operation arrays\n(deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected allow policies and restore normal security scanning and disposition actions for matching emails.\n\nPOST /accounts/{account_id}/email-security/settings/allow_policies/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "deletes": {
@@ -49,8 +37,9 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "id": {
-                    "$ref": "#/$defs/email-security_AllowPolicyId",
-                    "description": "Allow policy identifier."
+                    "description": "Allow policy identifier.",
+                    "format": "uuid",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -71,7 +60,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_AllowPolicyId"
+                        "description": "Allow policy identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -102,7 +93,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_AllowPolicyId"
+                        "description": "Allow policy identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -123,18 +116,29 @@ export const tools: readonly Tool[] = [
             "puts"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_AllowPolicyId": email_security_AllowPolicyId,
-        "email-security_CreateAllowPolicy": email_security_CreateAllowPolicy,
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_UpdateAllowPolicy": email_security_UpdateAllowPolicy,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateAllowPolicy": email$$security_CreateAllowPolicy,
+        "email-security_UpdateAllowPolicy": email$$security_UpdateAllowPolicy,
       },
     },
     outputSchema: {
@@ -169,14 +173,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_AllowPolicyList": email_security_AllowPolicyList_output,
-        "email-security_DeletedAllowPolicy": email_security_DeletedAllowPolicy_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_AllowPolicyList": email$$security_AllowPolicyList,
+        "email-security_DeletedAllowPolicy": email$$security_DeletedAllowPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -233,15 +234,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_AllowPolicyList": email_security_AllowPolicyList_output,
-        "email-security_DeletedAllowPolicy": email_security_DeletedAllowPolicy_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_AllowPolicyList": email$$security_AllowPolicyList,
+        "email-security_DeletedAllowPolicy": email$$security_DeletedAllowPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -250,28 +248,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_allow_policies_create",
+    name: "emailSecurity_allowPolicies_create",
     title: "Create email allow policy",
-    description: "Creates a new allow policy that exempts matching emails from security detections. Use with caution as this bypasses email security scanning. Policies can match on sender patterns and apply to specific detections or all detections.\n\nThis method is beta.",
+    description: "Creates a new allow policy that exempts matching emails from security detections. Use with caution as this bypasses email security scanning. Policies can match on sender patterns and apply to specific detections or all detections.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/settings/allow_policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateAllowPolicy"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateAllowPolicy": email_security_CreateAllowPolicy,
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateAllowPolicy": email$$security_CreateAllowPolicy,
       },
     },
     outputSchema: {
@@ -289,12 +295,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -334,13 +337,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -349,29 +349,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_allow_policies_delete",
+    name: "emailSecurity_allowPolicies_delete",
     title: "Delete an email allow policy",
-    description: "Removes an allow policy. After deletion, emails matching this pattern will be subject to normal security scanning and disposition actions.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the allow policy and restores normal security scanning and disposition actions for matching emails.",
+    description: "Removes an allow policy. After deletion, emails matching this pattern will be subject to normal security scanning and disposition actions.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the allow policy and restores normal security scanning and disposition actions for matching emails.\n\nDELETE /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/email-security_AllowPolicyId",
-          "description": "Allow policy identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Allow policy identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "email-security_AllowPolicyId": email_security_AllowPolicyId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -388,10 +395,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_DeletedAllowPolicy": email_security_DeletedAllowPolicy_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedAllowPolicy": email$$security_DeletedAllowPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -431,11 +437,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_DeletedAllowPolicy": email_security_DeletedAllowPolicy_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedAllowPolicy": email$$security_DeletedAllowPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -443,34 +448,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_allow_policies_edit",
+    name: "emailSecurity_allowPolicies_edit",
     title: "Update an email allow policy",
-    description: "Updates an existing allow policy. Only provided fields will be modified. Changes take effect for new emails matching the pattern.\n\nThis method is beta.",
+    description: "Updates an existing allow policy. Only provided fields will be modified. Changes take effect for new emails matching the pattern.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_UpdateAllowPolicy"
         },
-        "policy_id": {
-          "$ref": "#/$defs/email-security_AllowPolicyId",
-          "description": "Allow policy identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Allow policy identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_AllowPolicyId": email_security_AllowPolicyId,
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_UpdateAllowPolicy": email_security_UpdateAllowPolicy,
-        "email-security_identifier": email_security_identifier,
+        "email-security_UpdateAllowPolicy": email$$security_UpdateAllowPolicy,
       },
     },
     outputSchema: {
@@ -488,12 +501,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -533,13 +543,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -548,29 +555,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_allow_policies_get",
+    name: "emailSecurity_allowPolicies_get",
     title: "Get an email allow policy",
-    description: "Retrieves details for a specific allow policy including its pattern, dispositions that are exempted, and whether it applies to all detections.\n\nThis method is beta.",
+    description: "Retrieves details for a specific allow policy including its pattern, dispositions that are exempted, and whether it applies to all detections.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/email-security_AllowPolicyId",
-          "description": "Allow policy identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Allow policy identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "email-security_AllowPolicyId": email_security_AllowPolicyId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -587,12 +601,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -633,13 +644,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -647,82 +655,100 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_allow_policies_list",
+    name: "emailSecurity_allowPolicies_list",
     title: "List email allow policies",
-    description: "Returns a paginated list of email allow policies. These policies exempt matching emails from security detection, allowing them to bypass disposition actions. Supports filtering by pattern type and policy attributes.\n\nThis method is beta.",
+    description: "Returns a paginated list of email allow policies. These policies exempt matching emails from security detection, allowing them to bypass disposition actions. Supports filtering by pattern type and policy attributes.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/allow_policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "The sorting direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "expired": {
-          "description": "Filter to return only expired policies (`true`) or only policies that still apply (`false`). Omit to return both.",
-          "type": "boolean"
-        },
-        "is_acceptable_sender": {
-          "description": "Filter to show only policies where messages from the sender are exempted from Spam, Spoof, and Bulk dispositions (not Malicious or Suspicious).",
-          "type": "boolean"
-        },
-        "is_exempt_recipient": {
-          "description": "Filter to show only policies where messages to the recipient bypass all detections.",
-          "type": "boolean"
-        },
-        "is_trusted_sender": {
-          "description": "Filter to show only policies where messages from the sender bypass all detections and link following.",
-          "type": "boolean"
-        },
-        "order": {
-          "description": "Field to sort by.",
-          "enum": [
-            "pattern",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "pattern": {
-          "description": "Filter by exact pattern value.",
-          "type": "string"
-        },
-        "pattern_type": {
-          "$ref": "#/$defs/email-security_PatternType",
-          "description": "Filter by pattern type."
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "Search term for filtering records. Behavior may change.",
-          "type": "string"
+          "type": "object"
         },
-        "verify_sender": {
-          "description": "Filter to show only policies that enforce DMARC, SPF, or DKIM authentication.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "expired": {
+              "description": "Filter to return only expired policies (`true`) or only policies that still apply (`false`). Omit to return both.",
+              "type": "boolean"
+            },
+            "is_acceptable_sender": {
+              "description": "Filter to show only policies where messages from the sender are exempted from Spam, Spoof, and Bulk dispositions (not Malicious or Suspicious).",
+              "type": "boolean"
+            },
+            "is_exempt_recipient": {
+              "description": "Filter to show only policies where messages to the recipient bypass all detections.",
+              "type": "boolean"
+            },
+            "is_trusted_sender": {
+              "description": "Filter to show only policies where messages from the sender bypass all detections and link following.",
+              "type": "boolean"
+            },
+            "order": {
+              "description": "Field to sort by.",
+              "enum": [
+                "pattern",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "pattern": {
+              "description": "Filter by exact pattern value.",
+              "type": "string"
+            },
+            "pattern_type": {
+              "description": "Filter by pattern type.",
+              "enum": [
+                "EMAIL",
+                "DOMAIN",
+                "IP",
+                "UNKNOWN"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search term for filtering records. Behavior may change.",
+              "type": "string"
+            },
+            "verify_sender": {
+              "description": "Filter to show only policies that enforce DMARC, SPF, or DKIM authentication.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -739,14 +765,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_AllowPolicyList": email_security_AllowPolicyList_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_AllowPolicyList": email$$security_AllowPolicyList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -787,64 +810,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_AllowPolicyList": email_security_AllowPolicyList_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_AllowPolicyList": email$$security_AllowPolicyList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/settings/allow_policies`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["is_exempt_recipient", args["is_exempt_recipient"], true],
-        ["is_trusted_sender", args["is_trusted_sender"], true],
-        ["is_acceptable_sender", args["is_acceptable_sender"], true],
-        ["verify_sender", args["verify_sender"], true],
-        ["pattern_type", args["pattern_type"], true],
-        ["pattern", args["pattern"], true],
-        ["expired", args["expired"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["is_exempt_recipient", param(args, "query", "is_exempt_recipient"), true],
+        ["is_trusted_sender", param(args, "query", "is_trusted_sender"), true],
+        ["is_acceptable_sender", param(args, "query", "is_acceptable_sender"), true],
+        ["verify_sender", param(args, "query", "verify_sender"), true],
+        ["pattern_type", param(args, "query", "pattern_type"), true],
+        ["pattern", param(args, "query", "pattern"), true],
+        ["expired", param(args, "query", "expired"), true],
       ],
     }),
   },
   {
-    name: "email_security_allow_policies_update",
+    name: "emailSecurity_allowPolicies_update",
     title: "Replace an email allow policy",
-    description: "Replaces an existing allow policy in full. Unlike PATCH, every field is taken from the request body, so optional fields that are omitted are reset rather than left untouched. Use this when managing policies declaratively.\n\nThis method is beta.",
+    description: "Replaces an existing allow policy in full. Unlike PATCH, every field is taken from the request body, so optional fields that are omitted are reset rather than left untouched. Use this when managing policies declaratively.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateAllowPolicy"
         },
-        "policy_id": {
-          "$ref": "#/$defs/email-security_AllowPolicyId",
-          "description": "Allow policy identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Allow policy identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_AllowPolicyId": email_security_AllowPolicyId,
-        "email-security_CreateAllowPolicy": email_security_CreateAllowPolicy,
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateAllowPolicy": email$$security_CreateAllowPolicy,
       },
     },
     outputSchema: {
@@ -862,12 +890,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -904,13 +929,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_AllowPolicy": email_security_AllowPolicy_output,
-        "email-security_AllowPolicyId": email_security_AllowPolicyId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_AllowPolicy": email$$security_AllowPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/analytics/monthlyReport/tools.ts b/src/generated/forge-mcp/emailSecurity/analytics/monthlyReport/tools.ts
index a3b76abf8..43b14e32c 100644
--- a/src/generated/forge-mcp/emailSecurity/analytics/monthlyReport/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/analytics/monthlyReport/tools.ts
@@ -3,34 +3,40 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  email_security_api_response_common_failure_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../../outputs.js";
-import { email_security_identifier } from "../../schemas.js";
 
 /**
- * The tools of `email_security.analytics.monthly_report`.
+ * The tools of `emailSecurity.analytics.monthlyReport`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_analytics_monthly_report_get",
+    name: "emailSecurity_analytics_monthlyReport_get",
     title: "Get monthly report",
-    description: "Returns an aggregated monthly email security report including detections, dispositions, and policy activity for the trailing 12 months.\n\nThis method is beta.",
+    description: "Returns an aggregated monthly email security report including detections, dispositions, and policy activity for the trailing 12 months.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/analytics/monthly_report",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -66,8 +72,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -124,9 +130,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/blockSenders/outputs.ts b/src/generated/forge-mcp/emailSecurity/blockSenders/outputs.ts
index ae18592c1..b3f994c4b 100644
--- a/src/generated/forge-mcp/emailSecurity/blockSenders/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/blockSenders/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_BlockedSender` in responses.
  */
-export const email_security_BlockedSender_output: JsonSchema = {
+export const email$$security_BlockedSender: JsonSchema = {
   "properties": {
     "comments": {
       "oneOf": [
@@ -19,7 +19,8 @@ export const email_security_BlockedSender_output: JsonSchema = {
       ]
     },
     "created_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "expires_at": {
       "oneOf": [
@@ -33,39 +34,40 @@ export const email_security_BlockedSender_output: JsonSchema = {
       ]
     },
     "id": {
-      "$ref": "#/$defs/email-security_BlockedSenderId"
+      "format": "uuid",
+      "type": "string"
     },
     "is_regex": {
       "type": "boolean"
     },
     "last_modified": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "pattern": {
       "type": "string"
     },
     "pattern_type": {
-      "$ref": "#/$defs/email-security_PatternType"
+      "enum": [
+        "EMAIL",
+        "DOMAIN",
+        "IP",
+        "UNKNOWN"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `email-security_BlockedSenderId` in responses.
- */
-export const email_security_BlockedSenderId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_BlockedSenderList` in responses.
  */
-export const email_security_BlockedSenderList_output: JsonSchema = {
+export const email$$security_BlockedSenderList: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email-security_BlockedSender"
   },
@@ -75,10 +77,11 @@ export const email_security_BlockedSenderList_output: JsonSchema = {
 /**
  * The schema of `email-security_DeletedBlockedSender` in responses.
  */
-export const email_security_DeletedBlockedSender_output: JsonSchema = {
+export const email$$security_DeletedBlockedSender: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/email-security_BlockedSenderId"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/emailSecurity/blockSenders/schemas.ts b/src/generated/forge-mcp/emailSecurity/blockSenders/schemas.ts
index 8ccaacd89..99e732fbd 100644
--- a/src/generated/forge-mcp/emailSecurity/blockSenders/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/blockSenders/schemas.ts
@@ -3,19 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `email-security_BlockedSenderId`.
- */
-export const email_security_BlockedSenderId: JsonSchema = {
-  "description": "Blocked sender pattern identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_CreateBlockedSender`.
  */
-export const email_security_CreateBlockedSender: JsonSchema = {
+export const email$$security_CreateBlockedSender: JsonSchema = {
   "description": "Create a blocked sender pattern.",
   "properties": {
     "comments": {
@@ -49,8 +40,14 @@ export const email_security_CreateBlockedSender: JsonSchema = {
       "type": "string"
     },
     "pattern_type": {
-      "$ref": "#/$defs/email-security_PatternType",
-      "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.\n"
+      "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.",
+      "enum": [
+        "EMAIL",
+        "DOMAIN",
+        "IP",
+        "UNKNOWN"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -64,7 +61,7 @@ export const email_security_CreateBlockedSender: JsonSchema = {
 /**
  * The schema of `email-security_UpdateBlockedSender`.
  */
-export const email_security_UpdateBlockedSender: JsonSchema = {
+export const email$$security_UpdateBlockedSender: JsonSchema = {
   "description": "Update a blocked sender pattern.",
   "properties": {
     "comments": {
@@ -98,8 +95,14 @@ export const email_security_UpdateBlockedSender: JsonSchema = {
       "type": "string"
     },
     "pattern_type": {
-      "$ref": "#/$defs/email-security_PatternType",
-      "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.\n"
+      "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.",
+      "enum": [
+        "EMAIL",
+        "DOMAIN",
+        "IP",
+        "UNKNOWN"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/emailSecurity/blockSenders/tools.ts b/src/generated/forge-mcp/emailSecurity/blockSenders/tools.ts
index 3e7456b3d..84ce220a9 100644
--- a/src/generated/forge-mcp/emailSecurity/blockSenders/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/blockSenders/tools.ts
@@ -1,47 +1,35 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_PatternType_output,
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
-  email_security_timestamp_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
 import {
-  email_security_PatternType,
-  email_security_identifier,
-} from "../schemas.js";
-import {
-  email_security_BlockedSenderId_output,
-  email_security_BlockedSenderList_output,
-  email_security_BlockedSender_output,
-  email_security_DeletedBlockedSender_output,
+  email$$security_BlockedSender,
+  email$$security_BlockedSenderList,
+  email$$security_DeletedBlockedSender,
 } from "./outputs.js";
 import {
-  email_security_BlockedSenderId,
-  email_security_CreateBlockedSender,
-  email_security_UpdateBlockedSender,
+  email$$security_CreateBlockedSender,
+  email$$security_UpdateBlockedSender,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.block_senders`.
+ * The tools of `emailSecurity.blockSenders`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_block_senders_batch",
+    name: "emailSecurity_blockSenders_batch",
     title: "Batch blocked sender operations",
-    description: "Executes multiple blocked sender operations atomically: delete, partially update,\nreplace, and create blocked sender patterns in a single request. All four operation\narrays (deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected blocked sender patterns and stop automatically blocking matching emails based on those rules.",
+    description: "Executes multiple blocked sender operations atomically: delete, partially update,\nreplace, and create blocked sender patterns in a single request. All four operation\narrays (deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected blocked sender patterns and stop automatically blocking matching emails based on those rules.\n\nPOST /accounts/{account_id}/email-security/settings/block_senders/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "deletes": {
@@ -49,8 +37,9 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "id": {
-                    "$ref": "#/$defs/email-security_BlockedSenderId",
-                    "description": "Blocked sender pattern identifier."
+                    "description": "Blocked sender pattern identifier.",
+                    "format": "uuid",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -71,7 +60,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_BlockedSenderId"
+                        "description": "Blocked sender pattern identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -102,7 +93,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_BlockedSenderId"
+                        "description": "Blocked sender pattern identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -123,18 +116,29 @@ export const tools: readonly Tool[] = [
             "puts"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_BlockedSenderId": email_security_BlockedSenderId,
-        "email-security_CreateBlockedSender": email_security_CreateBlockedSender,
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_UpdateBlockedSender": email_security_UpdateBlockedSender,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateBlockedSender": email$$security_CreateBlockedSender,
+        "email-security_UpdateBlockedSender": email$$security_UpdateBlockedSender,
       },
     },
     outputSchema: {
@@ -169,14 +173,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_BlockedSenderList": email_security_BlockedSenderList_output,
-        "email-security_DeletedBlockedSender": email_security_DeletedBlockedSender_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_BlockedSenderList": email$$security_BlockedSenderList,
+        "email-security_DeletedBlockedSender": email$$security_DeletedBlockedSender,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -233,15 +234,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_BlockedSenderList": email_security_BlockedSenderList_output,
-        "email-security_DeletedBlockedSender": email_security_DeletedBlockedSender_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_BlockedSenderList": email$$security_BlockedSenderList,
+        "email-security_DeletedBlockedSender": email$$security_DeletedBlockedSender,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -250,28 +248,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_block_senders_create",
+    name: "emailSecurity_blockSenders_create",
     title: "Create blocked email sender",
-    description: "Creates a new blocked sender pattern. Emails matching this pattern will be blocked from delivery. Patterns can be email addresses, domains, or IP addresses, and support regular expressions.\n\nThis method is beta.",
+    description: "Creates a new blocked sender pattern. Emails matching this pattern will be blocked from delivery. Patterns can be email addresses, domains, or IP addresses, and support regular expressions.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/settings/block_senders",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateBlockedSender"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateBlockedSender": email_security_CreateBlockedSender,
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateBlockedSender": email$$security_CreateBlockedSender,
       },
     },
     outputSchema: {
@@ -289,12 +295,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -334,13 +337,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -349,29 +349,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_block_senders_delete",
+    name: "emailSecurity_blockSenders_delete",
     title: "Delete a blocked email sender",
-    description: "Removes a blocked sender pattern. After deletion, emails from this sender will no longer be automatically blocked based on this rule.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the blocked sender pattern and stops automatically blocking matching emails based on this rule.",
+    description: "Removes a blocked sender pattern. After deletion, emails from this sender will no longer be automatically blocked based on this rule.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the blocked sender pattern and stops automatically blocking matching emails based on this rule.\n\nDELETE /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "pattern_id": {
-          "$ref": "#/$defs/email-security_BlockedSenderId",
-          "description": "Blocked sender pattern identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "pattern_id": {
+              "description": "Blocked sender pattern identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pattern_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pattern_id"
+        "path"
       ],
-      $defs: {
-        "email-security_BlockedSenderId": email_security_BlockedSenderId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -388,10 +395,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_DeletedBlockedSender": email_security_DeletedBlockedSender_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedBlockedSender": email$$security_DeletedBlockedSender,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -431,11 +437,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_DeletedBlockedSender": email_security_DeletedBlockedSender_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedBlockedSender": email$$security_DeletedBlockedSender,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -443,34 +448,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_block_senders_edit",
+    name: "emailSecurity_blockSenders_edit",
     title: "Update a blocked email sender",
-    description: "Updates an existing blocked sender pattern. Only provided fields will be modified. The pattern will continue blocking emails until deleted.\n\nThis method is beta.",
+    description: "Updates an existing blocked sender pattern. Only provided fields will be modified. The pattern will continue blocking emails until deleted.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_UpdateBlockedSender"
         },
-        "pattern_id": {
-          "$ref": "#/$defs/email-security_BlockedSenderId",
-          "description": "Blocked sender pattern identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "pattern_id": {
+              "description": "Blocked sender pattern identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pattern_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pattern_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_BlockedSenderId": email_security_BlockedSenderId,
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_UpdateBlockedSender": email_security_UpdateBlockedSender,
-        "email-security_identifier": email_security_identifier,
+        "email-security_UpdateBlockedSender": email$$security_UpdateBlockedSender,
       },
     },
     outputSchema: {
@@ -488,12 +501,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -533,13 +543,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -548,29 +555,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_block_senders_get",
+    name: "emailSecurity_blockSenders_get",
     title: "Get a blocked email sender",
-    description: "Retrieves details for a specific blocked sender pattern including its pattern type, value, and metadata.\n\nThis method is beta.",
+    description: "Retrieves details for a specific blocked sender pattern including its pattern type, value, and metadata.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "pattern_id": {
-          "$ref": "#/$defs/email-security_BlockedSenderId",
-          "description": "Blocked sender pattern identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "pattern_id": {
+              "description": "Blocked sender pattern identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pattern_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pattern_id"
+        "path"
       ],
-      $defs: {
-        "email-security_BlockedSenderId": email_security_BlockedSenderId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -587,12 +601,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -633,13 +644,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -647,66 +655,84 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_block_senders_list",
+    name: "emailSecurity_blockSenders_list",
     title: "List blocked email senders",
-    description: "Returns a paginated list of blocked email sender patterns. These patterns prevent emails from matching senders from being delivered. Supports filtering by pattern type and searching across patterns.\n\nThis method is beta.",
+    description: "Returns a paginated list of blocked email sender patterns. These patterns prevent emails from matching senders from being delivered. Supports filtering by pattern type and searching across patterns.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/block_senders",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "The sorting direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "expired": {
-          "description": "Filter to return only expired patterns (`true`) or only patterns that still apply (`false`). Omit to return both.",
-          "type": "boolean"
-        },
-        "order": {
-          "description": "Field to sort by.",
-          "enum": [
-            "pattern",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "pattern": {
-          "description": "Filter by pattern value.",
-          "type": "string"
-        },
-        "pattern_type": {
-          "$ref": "#/$defs/email-security_PatternType",
-          "description": "Filter by pattern type."
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+          "type": "object"
         },
-        "search": {
-          "description": "Search term for filtering records. Behavior may change.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "expired": {
+              "description": "Filter to return only expired patterns (`true`) or only patterns that still apply (`false`). Omit to return both.",
+              "type": "boolean"
+            },
+            "order": {
+              "description": "Field to sort by.",
+              "enum": [
+                "pattern",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "pattern": {
+              "description": "Filter by pattern value.",
+              "type": "string"
+            },
+            "pattern_type": {
+              "description": "Filter by pattern type.",
+              "enum": [
+                "EMAIL",
+                "DOMAIN",
+                "IP",
+                "UNKNOWN"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search term for filtering records. Behavior may change.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -723,14 +749,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_BlockedSenderList": email_security_BlockedSenderList_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_BlockedSenderList": email$$security_BlockedSenderList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -771,60 +794,65 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_BlockedSenderList": email_security_BlockedSenderList_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_BlockedSenderList": email$$security_BlockedSenderList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/settings/block_senders`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["pattern_type", args["pattern_type"], true],
-        ["pattern", args["pattern"], true],
-        ["expired", args["expired"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["pattern_type", param(args, "query", "pattern_type"), true],
+        ["pattern", param(args, "query", "pattern"), true],
+        ["expired", param(args, "query", "expired"), true],
       ],
     }),
   },
   {
-    name: "email_security_block_senders_update",
+    name: "emailSecurity_blockSenders_update",
     title: "Replace a blocked email sender",
-    description: "Replaces an existing blocked sender pattern in full. Unlike PATCH, every field is taken from the request body, so optional fields that are omitted are reset rather than left untouched. Use this when managing blocked senders declaratively.\n\nThis method is beta.",
+    description: "Replaces an existing blocked sender pattern in full. Unlike PATCH, every field is taken from the request body, so optional fields that are omitted are reset rather than left untouched. Use this when managing blocked senders declaratively.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateBlockedSender"
         },
-        "pattern_id": {
-          "$ref": "#/$defs/email-security_BlockedSenderId",
-          "description": "Blocked sender pattern identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "pattern_id": {
+              "description": "Blocked sender pattern identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pattern_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pattern_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_BlockedSenderId": email_security_BlockedSenderId,
-        "email-security_CreateBlockedSender": email_security_CreateBlockedSender,
-        "email-security_PatternType": email_security_PatternType,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateBlockedSender": email$$security_CreateBlockedSender,
       },
     },
     outputSchema: {
@@ -842,12 +870,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -884,13 +909,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BlockedSender": email_security_BlockedSender_output,
-        "email-security_BlockedSenderId": email_security_BlockedSenderId_output,
-        "email-security_PatternType": email_security_PatternType_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_BlockedSender": email$$security_BlockedSender,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/bulkActions/messages/outputs.ts b/src/generated/forge-mcp/emailSecurity/bulkActions/messages/outputs.ts
index 2ca89f33a..11728ac4c 100644
--- a/src/generated/forge-mcp/emailSecurity/bulkActions/messages/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/bulkActions/messages/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email-security_BulkActionMessageDetail` in responses.
  */
-export const email_security_BulkActionMessageDetail_output: JsonSchema = {
+export const email$$security_BulkActionMessageDetail: JsonSchema = {
   "properties": {
     "action_params": {
       "$ref": "#/$defs/email-security_BulkMessageActionParams"
@@ -78,7 +78,15 @@ export const email_security_BulkActionMessageDetail_output: JsonSchema = {
       "type": "integer"
     },
     "status": {
-      "$ref": "#/$defs/email-security_BulkActionMessageStatus"
+      "enum": [
+        "PENDING",
+        "PROCESSING",
+        "COMPLETED",
+        "FAILED",
+        "CANCELLED",
+        "SKIPPED"
+      ],
+      "type": "string"
     },
     "status_message": {
       "oneOf": [
@@ -103,25 +111,10 @@ export const email_security_BulkActionMessageDetail_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_BulkActionMessageStatus` in responses.
- */
-export const email_security_BulkActionMessageStatus_output: JsonSchema = {
-  "enum": [
-    "PENDING",
-    "PROCESSING",
-    "COMPLETED",
-    "FAILED",
-    "CANCELLED",
-    "SKIPPED"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_BulkMessageActionParams` in responses.
  */
-export const email_security_BulkMessageActionParams_output: JsonSchema = {
+export const email$$security_BulkMessageActionParams: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -129,12 +122,31 @@ export const email_security_BulkMessageActionParams_output: JsonSchema = {
           "type": "string"
         },
         "destination": {
-          "$ref": "#/$defs/email-security_MailboxDestination"
+          "enum": [
+            "Inbox",
+            "JunkEmail",
+            "DeletedItems",
+            "RecoverableItemsDeletions",
+            "RecoverableItemsPurges"
+          ],
+          "type": "string"
         },
         "expected_disposition": {
           "oneOf": [
             {
-              "$ref": "#/$defs/email-security_DispositionLabel"
+              "enum": [
+                "MALICIOUS",
+                "MALICIOUS-BEC",
+                "SUSPICIOUS",
+                "SPOOF",
+                "SPAM",
+                "BULK",
+                "ENCRYPTED",
+                "EXTERNAL",
+                "UNKNOWN",
+                "NONE"
+              ],
+              "type": "string"
             },
             {
               "type": "null"
diff --git a/src/generated/forge-mcp/emailSecurity/bulkActions/messages/schemas.ts b/src/generated/forge-mcp/emailSecurity/bulkActions/messages/schemas.ts
deleted file mode 100644
index 4ed991480..000000000
--- a/src/generated/forge-mcp/emailSecurity/bulkActions/messages/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `email-security_BulkActionMessageStatus`.
- */
-export const email_security_BulkActionMessageStatus: JsonSchema = {
-  "description": "Status of a message within a bulk action job.",
-  "enum": [
-    "PENDING",
-    "PROCESSING",
-    "COMPLETED",
-    "FAILED",
-    "CANCELLED",
-    "SKIPPED"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailSecurity/bulkActions/messages/tools.ts b/src/generated/forge-mcp/emailSecurity/bulkActions/messages/tools.ts
index 1075cc2d8..808001164 100644
--- a/src/generated/forge-mcp/emailSecurity/bulkActions/messages/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/bulkActions/messages/tools.ts
@@ -1,75 +1,84 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  email_security_ActionLogEntry_output,
-  email_security_CursorResultInfo_output,
-  email_security_DispositionLabel_output,
-  email_security_InvestigateId_output,
-  email_security_MailboxDestination_output,
-  email_security_MessageDeliveryMode_output,
-  email_security_MessageDeliveryStatus_output,
-  email_security_MessageDetails_output,
-  email_security_PostfixId_output,
-  email_security_ValidationStatus_output,
-  email_security_Validation_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_ActionLogEntry,
+  email$$security_CursorResultInfo,
+  email$$security_MessageDetails,
+  email$$security_Validation,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../../outputs.js";
-import { email_security_identifier } from "../../schemas.js";
-import { email_security_BulkJobId } from "../schemas.js";
 import {
-  email_security_BulkActionMessageDetail_output,
-  email_security_BulkActionMessageStatus_output,
-  email_security_BulkMessageActionParams_output,
+  email$$security_BulkActionMessageDetail,
+  email$$security_BulkMessageActionParams,
 } from "./outputs.js";
-import { email_security_BulkActionMessageStatus } from "./schemas.js";
 
 /**
- * The tools of `email_security.bulk_actions.messages`.
+ * The tools of `emailSecurity.bulkActions.messages`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_bulk_actions_messages_list",
+    name: "emailSecurity_bulkActions_messages_list",
     title: "List messages for a bulk action job",
-    description: "Returns the individual messages associated with a bulk action job, including their processing status.\n\nThis method is beta.",
+    description: "Returns the individual messages associated with a bulk action job, including their processing status.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/bulk/{job_id}/messages",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "job_id": {
-          "$ref": "#/$defs/email-security_BulkJobId",
-          "description": "Identifier of the bulk action job whose messages to list."
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Identifier of the bulk action job whose messages to list.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         },
-        "status": {
-          "$ref": "#/$defs/email-security_BulkActionMessageStatus",
-          "description": "Filter the job's messages by their processing status."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "status": {
+              "description": "Filter the job's messages by their processing status.",
+              "enum": [
+                "PENDING",
+                "PROCESSING",
+                "COMPLETED",
+                "FAILED",
+                "CANCELLED",
+                "SKIPPED"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
-      $defs: {
-        "email-security_BulkActionMessageStatus": email_security_BulkActionMessageStatus,
-        "email-security_BulkJobId": email_security_BulkJobId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -96,22 +105,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ActionLogEntry": email_security_ActionLogEntry_output,
-        "email-security_BulkActionMessageDetail": email_security_BulkActionMessageDetail_output,
-        "email-security_BulkActionMessageStatus": email_security_BulkActionMessageStatus_output,
-        "email-security_BulkMessageActionParams": email_security_BulkMessageActionParams_output,
-        "email-security_CursorResultInfo": email_security_CursorResultInfo_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_InvestigateId": email_security_InvestigateId_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryMode": email_security_MessageDeliveryMode_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_MessageDetails": email_security_MessageDetails_output,
-        "email-security_PostfixId": email_security_PostfixId_output,
-        "email-security_Validation": email_security_Validation_output,
-        "email-security_ValidationStatus": email_security_ValidationStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ActionLogEntry": email$$security_ActionLogEntry,
+        "email-security_BulkActionMessageDetail": email$$security_BulkActionMessageDetail,
+        "email-security_BulkMessageActionParams": email$$security_BulkMessageActionParams,
+        "email-security_CursorResultInfo": email$$security_CursorResultInfo,
+        "email-security_MessageDetails": email$$security_MessageDetails,
+        "email-security_Validation": email$$security_Validation,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -162,31 +163,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ActionLogEntry": email_security_ActionLogEntry_output,
-        "email-security_BulkActionMessageDetail": email_security_BulkActionMessageDetail_output,
-        "email-security_BulkActionMessageStatus": email_security_BulkActionMessageStatus_output,
-        "email-security_BulkMessageActionParams": email_security_BulkMessageActionParams_output,
-        "email-security_CursorResultInfo": email_security_CursorResultInfo_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_InvestigateId": email_security_InvestigateId_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryMode": email_security_MessageDeliveryMode_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_MessageDetails": email_security_MessageDetails_output,
-        "email-security_PostfixId": email_security_PostfixId_output,
-        "email-security_Validation": email_security_Validation_output,
-        "email-security_ValidationStatus": email_security_ValidationStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ActionLogEntry": email$$security_ActionLogEntry,
+        "email-security_BulkActionMessageDetail": email$$security_BulkActionMessageDetail,
+        "email-security_BulkMessageActionParams": email$$security_BulkMessageActionParams,
+        "email-security_CursorResultInfo": email$$security_CursorResultInfo,
+        "email-security_MessageDetails": email$$security_MessageDetails,
+        "email-security_Validation": email$$security_Validation,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/investigate/bulk/${pathParam(args, "job_id")}/messages`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSecurity/bulkActions/outputs.ts b/src/generated/forge-mcp/emailSecurity/bulkActions/outputs.ts
index c8fd85f78..50913255e 100644
--- a/src/generated/forge-mcp/emailSecurity/bulkActions/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/bulkActions/outputs.ts
@@ -6,17 +6,36 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_BulkJobActionParams` in responses.
  */
-export const email_security_BulkJobActionParams_output: JsonSchema = {
+export const email$$security_BulkJobActionParams: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "destination": {
-          "$ref": "#/$defs/email-security_MailboxDestination"
+          "enum": [
+            "Inbox",
+            "JunkEmail",
+            "DeletedItems",
+            "RecoverableItemsDeletions",
+            "RecoverableItemsPurges"
+          ],
+          "type": "string"
         },
         "expected_disposition": {
           "oneOf": [
             {
-              "$ref": "#/$defs/email-security_DispositionLabel"
+              "enum": [
+                "MALICIOUS",
+                "MALICIOUS-BEC",
+                "SUSPICIOUS",
+                "SPOOF",
+                "SPAM",
+                "BULK",
+                "ENCRYPTED",
+                "EXTERNAL",
+                "UNKNOWN",
+                "NONE"
+              ],
+              "type": "string"
             },
             {
               "type": "null"
@@ -56,7 +75,7 @@ export const email_security_BulkJobActionParams_output: JsonSchema = {
 /**
  * The schema of `email-security_BulkJobDetail` in responses.
  */
-export const email_security_BulkJobDetail_output: JsonSchema = {
+export const email$$security_BulkJobDetail: JsonSchema = {
   "properties": {
     "action_params": {
       "$ref": "#/$defs/email-security_BulkJobActionParams"
@@ -127,7 +146,15 @@ export const email_security_BulkJobDetail_output: JsonSchema = {
       ]
     },
     "status": {
-      "$ref": "#/$defs/email-security_BulkJobStatus"
+      "enum": [
+        "PENDING",
+        "DISCOVERING",
+        "PROCESSING",
+        "COMPLETED",
+        "FAILED",
+        "CANCELLED"
+      ],
+      "type": "string"
     },
     "status_message": {
       "oneOf": [
@@ -160,25 +187,10 @@ export const email_security_BulkJobDetail_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_BulkJobStatus` in responses.
- */
-export const email_security_BulkJobStatus_output: JsonSchema = {
-  "enum": [
-    "PENDING",
-    "DISCOVERING",
-    "PROCESSING",
-    "COMPLETED",
-    "FAILED",
-    "CANCELLED"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_BulkSearchParams` in responses.
  */
-export const email_security_BulkSearchParams_output: JsonSchema = {
+export const email$$security_BulkSearchParams: JsonSchema = {
   "properties": {
     "action_log": {
       "type": "boolean"
@@ -196,7 +208,17 @@ export const email_security_BulkSearchParams_output: JsonSchema = {
     "delivery_status": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_MessageDeliveryStatus"
+          "enum": [
+            "delivered",
+            "moved",
+            "quarantined",
+            "rejected",
+            "deferred",
+            "bounced",
+            "queued",
+            "move_failed"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -233,7 +255,19 @@ export const email_security_BulkSearchParams_output: JsonSchema = {
     "final_disposition": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_DispositionLabel"
+          "enum": [
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
diff --git a/src/generated/forge-mcp/emailSecurity/bulkActions/schemas.ts b/src/generated/forge-mcp/emailSecurity/bulkActions/schemas.ts
index e0f914ba1..ebff9ae5d 100644
--- a/src/generated/forge-mcp/emailSecurity/bulkActions/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/bulkActions/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_BulkActionRequest`.
  */
-export const email_security_BulkActionRequest: JsonSchema = {
+export const email$$security_BulkActionRequest: JsonSchema = {
   "properties": {
     "action": {
       "description": "The action the job performs on every message matching the search parameters.",
@@ -28,15 +28,35 @@ export const email_security_BulkActionRequest: JsonSchema = {
       ]
     },
     "destination": {
-      "$ref": "#/$defs/email-security_MailboxDestination",
-      "description": "Required when action is 'MOVE'."
+      "description": "Required when action is 'MOVE'.",
+      "enum": [
+        "Inbox",
+        "JunkEmail",
+        "DeletedItems",
+        "RecoverableItemsDeletions",
+        "RecoverableItemsPurges"
+      ],
+      "type": "string"
     },
     "expected_disposition": {
       "deprecated": true,
       "description": "Nonfunctional field. End of life: December 1, 2026.",
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_DispositionLabel"
+          "description": "The verdict Email Security assigns to a message.",
+          "enum": [
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -54,35 +74,10 @@ export const email_security_BulkActionRequest: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_BulkJobId`.
- */
-export const email_security_BulkJobId: JsonSchema = {
-  "description": "Bulk action job identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_BulkJobStatus`.
- */
-export const email_security_BulkJobStatus: JsonSchema = {
-  "description": "Status of a bulk action job.",
-  "enum": [
-    "PENDING",
-    "DISCOVERING",
-    "PROCESSING",
-    "COMPLETED",
-    "FAILED",
-    "CANCELLED"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_BulkSearchParams`.
  */
-export const email_security_BulkSearchParams: JsonSchema = {
+export const email$$security_BulkSearchParams: JsonSchema = {
   "properties": {
     "action_log": {
       "default": false,
@@ -105,7 +100,18 @@ export const email_security_BulkSearchParams: JsonSchema = {
       "description": "Delivery status to filter by.",
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_MessageDeliveryStatus"
+          "description": "Delivery status of the message.",
+          "enum": [
+            "delivered",
+            "moved",
+            "quarantined",
+            "rejected",
+            "deferred",
+            "bounced",
+            "queued",
+            "move_failed"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -148,7 +154,20 @@ export const email_security_BulkSearchParams: JsonSchema = {
       "description": "Dispositions to filter by.",
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_DispositionLabel"
+          "description": "The verdict Email Security assigns to a message.",
+          "enum": [
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
diff --git a/src/generated/forge-mcp/emailSecurity/bulkActions/tools.ts b/src/generated/forge-mcp/emailSecurity/bulkActions/tools.ts
index e1b32a8f5..190b6d55a 100644
--- a/src/generated/forge-mcp/emailSecurity/bulkActions/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/bulkActions/tools.ts
@@ -1,64 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_CursorResultInfo_output,
-  email_security_DispositionLabel_output,
-  email_security_MailboxDestination_output,
-  email_security_MessageDeliveryStatus_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
+  email$$security_CursorResultInfo,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
 import {
-  email_security_DispositionLabel,
-  email_security_MailboxDestination,
-  email_security_MessageDeliveryStatus,
-  email_security_identifier,
-} from "../schemas.js";
-import {
-  email_security_BulkJobActionParams_output,
-  email_security_BulkJobDetail_output,
-  email_security_BulkJobStatus_output,
-  email_security_BulkSearchParams_output,
+  email$$security_BulkJobActionParams,
+  email$$security_BulkJobDetail,
+  email$$security_BulkSearchParams,
 } from "./outputs.js";
 import {
-  email_security_BulkActionRequest,
-  email_security_BulkJobId,
-  email_security_BulkJobStatus,
-  email_security_BulkSearchParams,
+  email$$security_BulkActionRequest,
+  email$$security_BulkSearchParams as email$$security_BulkSearchParams$,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.bulk_actions`.
+ * The tools of `emailSecurity.bulkActions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_bulk_actions_cancel",
+    name: "emailSecurity_bulkActions_cancel",
     title: "Cancel a bulk action job",
-    description: "Cancels the job, marking it as cancelled and stopping any pending message processing. The job record remains visible in list and detail endpoints.\n\nThis method is beta.",
+    description: "Cancels the job, marking it as cancelled and stopping any pending message processing. The job record remains visible in list and detail endpoints.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/investigate/bulk/{job_id}/cancel",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "job_id": {
-          "$ref": "#/$defs/email-security_BulkJobId",
-          "description": "Identifier of the bulk action job to cancel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Identifier of the bulk action job to cancel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
-      $defs: {
-        "email-security_BulkJobId": email_security_BulkJobId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -78,15 +73,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BulkJobActionParams": email_security_BulkJobActionParams_output,
-        "email-security_BulkJobDetail": email_security_BulkJobDetail_output,
-        "email-security_BulkJobStatus": email_security_BulkJobStatus_output,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_BulkJobActionParams": email$$security_BulkJobActionParams,
+        "email-security_BulkJobDetail": email$$security_BulkJobDetail,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -129,16 +120,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BulkJobActionParams": email_security_BulkJobActionParams_output,
-        "email-security_BulkJobDetail": email_security_BulkJobDetail_output,
-        "email-security_BulkJobStatus": email_security_BulkJobStatus_output,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_BulkJobActionParams": email$$security_BulkJobActionParams,
+        "email-security_BulkJobDetail": email$$security_BulkJobDetail,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -146,31 +133,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_bulk_actions_create",
+    name: "emailSecurity_bulkActions_create",
     title: "Create a bulk action job",
-    description: "Creates a new bulk action job to move or release messages that match the provided search parameters. To move or release an explicit list of known messages instead of a search, use the move or release endpoints.\n\nThis method is beta.",
+    description: "Creates a new bulk action job to move or release messages that match the provided search parameters. To move or release an explicit list of known messages instead of a search, use the move or release endpoints.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/investigate/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_BulkActionRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_BulkActionRequest": email_security_BulkActionRequest,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams,
-        "email-security_DispositionLabel": email_security_DispositionLabel,
-        "email-security_MailboxDestination": email_security_MailboxDestination,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus,
-        "email-security_identifier": email_security_identifier,
+        "email-security_BulkActionRequest": email$$security_BulkActionRequest,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams$,
       },
     },
     outputSchema: {
@@ -191,15 +184,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BulkJobActionParams": email_security_BulkJobActionParams_output,
-        "email-security_BulkJobDetail": email_security_BulkJobDetail_output,
-        "email-security_BulkJobStatus": email_security_BulkJobStatus_output,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_BulkJobActionParams": email$$security_BulkJobActionParams,
+        "email-security_BulkJobDetail": email$$security_BulkJobDetail,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -242,16 +231,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BulkJobActionParams": email_security_BulkJobActionParams_output,
-        "email-security_BulkJobDetail": email_security_BulkJobDetail_output,
-        "email-security_BulkJobStatus": email_security_BulkJobStatus_output,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_BulkJobActionParams": email$$security_BulkJobActionParams,
+        "email-security_BulkJobDetail": email$$security_BulkJobDetail,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -260,29 +245,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_bulk_actions_delete",
+    name: "emailSecurity_bulkActions_delete",
     title: "Delete a bulk action job",
-    description: "Deletes the job, removing it from all list and detail endpoints. Only jobs in a terminal state (`COMPLETED`, `CANCELLED`, or `FAILED`) can be deleted. To stop an in-progress job without removing it, use the cancel endpoint instead.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the completed, cancelled, or failed bulk action job from all list and detail endpoints.",
+    description: "Deletes the job, removing it from all list and detail endpoints. Only jobs in a terminal state (`COMPLETED`, `CANCELLED`, or `FAILED`) can be deleted. To stop an in-progress job without removing it, use the cancel endpoint instead.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the completed, cancelled, or failed bulk action job from all list and detail endpoints.\n\nDELETE /accounts/{account_id}/email-security/investigate/bulk/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "job_id": {
-          "$ref": "#/$defs/email-security_BulkJobId",
-          "description": "Identifier of the bulk action job."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Identifier of the bulk action job.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
-      $defs: {
-        "email-security_BulkJobId": email_security_BulkJobId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -311,8 +303,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -361,9 +353,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -371,29 +363,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_bulk_actions_get",
+    name: "emailSecurity_bulkActions_get",
     title: "Get bulk action job details",
-    description: "Returns the status and details of a specific bulk action job.\n\nThis method is beta.",
+    description: "Returns the status and details of a specific bulk action job.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/bulk/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "job_id": {
-          "$ref": "#/$defs/email-security_BulkJobId",
-          "description": "Identifier of the bulk action job."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Identifier of the bulk action job.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
-      $defs: {
-        "email-security_BulkJobId": email_security_BulkJobId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -413,15 +412,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BulkJobActionParams": email_security_BulkJobActionParams_output,
-        "email-security_BulkJobDetail": email_security_BulkJobDetail_output,
-        "email-security_BulkJobStatus": email_security_BulkJobStatus_output,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_BulkJobActionParams": email$$security_BulkJobActionParams,
+        "email-security_BulkJobDetail": email$$security_BulkJobDetail,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -465,16 +460,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BulkJobActionParams": email_security_BulkJobActionParams_output,
-        "email-security_BulkJobDetail": email_security_BulkJobDetail_output,
-        "email-security_BulkJobStatus": email_security_BulkJobStatus_output,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_BulkJobActionParams": email$$security_BulkJobActionParams,
+        "email-security_BulkJobDetail": email$$security_BulkJobDetail,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -482,46 +473,66 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_bulk_actions_list",
+    name: "emailSecurity_bulkActions_list",
     title: "List bulk action jobs",
-    description: "Returns a paginated list of bulk action jobs for the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of bulk action jobs for the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "action_type": {
-          "description": "Filter jobs by the action they perform.",
-          "enum": [
-            "MOVE",
-            "RELEASE"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+          "type": "object"
         },
-        "status": {
-          "$ref": "#/$defs/email-security_BulkJobStatus",
-          "description": "Filter jobs by their processing status."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "action_type": {
+              "description": "Filter jobs by the action they perform.",
+              "enum": [
+                "MOVE",
+                "RELEASE"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "status": {
+              "description": "Filter jobs by their processing status.",
+              "enum": [
+                "PENDING",
+                "DISCOVERING",
+                "PROCESSING",
+                "COMPLETED",
+                "FAILED",
+                "CANCELLED"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_BulkJobStatus": email_security_BulkJobStatus,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -548,16 +559,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_BulkJobActionParams": email_security_BulkJobActionParams_output,
-        "email-security_BulkJobDetail": email_security_BulkJobDetail_output,
-        "email-security_BulkJobStatus": email_security_BulkJobStatus_output,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams_output,
-        "email-security_CursorResultInfo": email_security_CursorResultInfo_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_BulkJobActionParams": email$$security_BulkJobActionParams,
+        "email-security_BulkJobDetail": email$$security_BulkJobDetail,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams,
+        "email-security_CursorResultInfo": email$$security_CursorResultInfo,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -608,26 +615,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_BulkJobActionParams": email_security_BulkJobActionParams_output,
-        "email-security_BulkJobDetail": email_security_BulkJobDetail_output,
-        "email-security_BulkJobStatus": email_security_BulkJobStatus_output,
-        "email-security_BulkSearchParams": email_security_BulkSearchParams_output,
-        "email-security_CursorResultInfo": email_security_CursorResultInfo_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_MailboxDestination": email_security_MailboxDestination_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_BulkJobActionParams": email$$security_BulkJobActionParams,
+        "email-security_BulkJobDetail": email$$security_BulkJobDetail,
+        "email-security_BulkSearchParams": email$$security_BulkSearchParams,
+        "email-security_CursorResultInfo": email$$security_CursorResultInfo,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/investigate/bulk`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["action_type", args["action_type"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["action_type", param(args, "query", "action_type"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSecurity/contentPolicies/outputs.ts b/src/generated/forge-mcp/emailSecurity/contentPolicies/outputs.ts
index 44b241b8f..0a14f9f1b 100644
--- a/src/generated/forge-mcp/emailSecurity/contentPolicies/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/contentPolicies/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_ContentPolicy` in responses.
  */
-export const email_security_ContentPolicy_output: JsonSchema = {
+export const email$$security_ContentPolicy: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "enabled": {
       "type": "boolean"
@@ -26,10 +27,12 @@ export const email_security_ContentPolicy_output: JsonSchema = {
       ]
     },
     "id": {
-      "$ref": "#/$defs/email-security_ContentPolicyId"
+      "format": "uuid",
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
       "type": "string"
@@ -49,7 +52,11 @@ export const email_security_ContentPolicy_output: JsonSchema = {
     },
     "targets": {
       "items": {
-        "$ref": "#/$defs/email-security_ContentPolicyTarget"
+        "enum": [
+          "SUBJECT",
+          "BODY"
+        ],
+        "type": "string"
       },
       "minItems": 1,
       "type": "array"
@@ -58,42 +65,24 @@ export const email_security_ContentPolicy_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_ContentPolicyId` in responses.
- */
-export const email_security_ContentPolicyId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_ContentPolicyList` in responses.
  */
-export const email_security_ContentPolicyList_output: JsonSchema = {
+export const email$$security_ContentPolicyList: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email-security_ContentPolicy"
   },
   "type": "array"
 };
 
-/**
- * The schema of `email-security_ContentPolicyTarget` in responses.
- */
-export const email_security_ContentPolicyTarget_output: JsonSchema = {
-  "enum": [
-    "SUBJECT",
-    "BODY"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_DeletedContentPolicy` in responses.
  */
-export const email_security_DeletedContentPolicy_output: JsonSchema = {
+export const email$$security_DeletedContentPolicy: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/email-security_ContentPolicyId"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/emailSecurity/contentPolicies/schemas.ts b/src/generated/forge-mcp/emailSecurity/contentPolicies/schemas.ts
index 4224852dc..62b91ca89 100644
--- a/src/generated/forge-mcp/emailSecurity/contentPolicies/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/contentPolicies/schemas.ts
@@ -3,31 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `email-security_ContentPolicyId`.
- */
-export const email_security_ContentPolicyId: JsonSchema = {
-  "description": "Content policy identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_ContentPolicyTarget`.
- */
-export const email_security_ContentPolicyTarget: JsonSchema = {
-  "description": "The part of the email to match the pattern against.",
-  "enum": [
-    "SUBJECT",
-    "BODY"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_CreateContentPolicy`.
  */
-export const email_security_CreateContentPolicy: JsonSchema = {
+export const email$$security_CreateContentPolicy: JsonSchema = {
   "description": "Create a content policy.",
   "properties": {
     "enabled": {
@@ -68,7 +47,12 @@ export const email_security_CreateContentPolicy: JsonSchema = {
     "targets": {
       "description": "Parts of the email the pattern is matched against.",
       "items": {
-        "$ref": "#/$defs/email-security_ContentPolicyTarget"
+        "description": "The part of the email to match the pattern against.",
+        "enum": [
+          "SUBJECT",
+          "BODY"
+        ],
+        "type": "string"
       },
       "minItems": 1,
       "type": "array"
@@ -86,7 +70,7 @@ export const email_security_CreateContentPolicy: JsonSchema = {
 /**
  * The schema of `email-security_UpdateContentPolicy`.
  */
-export const email_security_UpdateContentPolicy: JsonSchema = {
+export const email$$security_UpdateContentPolicy: JsonSchema = {
   "description": "Update a content policy.",
   "properties": {
     "enabled": {
@@ -127,7 +111,12 @@ export const email_security_UpdateContentPolicy: JsonSchema = {
     "targets": {
       "description": "Parts of the email the pattern is matched against.",
       "items": {
-        "$ref": "#/$defs/email-security_ContentPolicyTarget"
+        "description": "The part of the email to match the pattern against.",
+        "enum": [
+          "SUBJECT",
+          "BODY"
+        ],
+        "type": "string"
       },
       "minItems": 1,
       "type": "array"
diff --git a/src/generated/forge-mcp/emailSecurity/contentPolicies/tools.ts b/src/generated/forge-mcp/emailSecurity/contentPolicies/tools.ts
index 594c1f77e..4579ac4fb 100644
--- a/src/generated/forge-mcp/emailSecurity/contentPolicies/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/contentPolicies/tools.ts
@@ -1,45 +1,35 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
-  email_security_timestamp_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
-import { email_security_identifier } from "../schemas.js";
 import {
-  email_security_ContentPolicyId_output,
-  email_security_ContentPolicyList_output,
-  email_security_ContentPolicyTarget_output,
-  email_security_ContentPolicy_output,
-  email_security_DeletedContentPolicy_output,
+  email$$security_ContentPolicy,
+  email$$security_ContentPolicyList,
+  email$$security_DeletedContentPolicy,
 } from "./outputs.js";
 import {
-  email_security_ContentPolicyId,
-  email_security_ContentPolicyTarget,
-  email_security_CreateContentPolicy,
-  email_security_UpdateContentPolicy,
+  email$$security_CreateContentPolicy,
+  email$$security_UpdateContentPolicy,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.content_policies`.
+ * The tools of `emailSecurity.contentPolicies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_content_policies_batch",
+    name: "emailSecurity_contentPolicies_batch",
     title: "Batch content policy operations",
-    description: "Executes multiple content policy operations atomically: delete, partially update,\nreplace, and create content policies in a single request. All four operation arrays\n(deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected content policies and stop evaluating emails against their patterns.",
+    description: "Executes multiple content policy operations atomically: delete, partially update,\nreplace, and create content policies in a single request. All four operation arrays\n(deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected content policies and stop evaluating emails against their patterns.\n\nPOST /accounts/{account_id}/email-security/settings/content_policies/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "deletes": {
@@ -47,8 +37,9 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "id": {
-                    "$ref": "#/$defs/email-security_ContentPolicyId",
-                    "description": "Content policy identifier."
+                    "description": "Content policy identifier.",
+                    "format": "uuid",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -69,7 +60,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_ContentPolicyId"
+                        "description": "Content policy identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -100,7 +93,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_ContentPolicyId"
+                        "description": "Content policy identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -121,18 +116,29 @@ export const tools: readonly Tool[] = [
             "puts"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_ContentPolicyId": email_security_ContentPolicyId,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget,
-        "email-security_CreateContentPolicy": email_security_CreateContentPolicy,
-        "email-security_UpdateContentPolicy": email_security_UpdateContentPolicy,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateContentPolicy": email$$security_CreateContentPolicy,
+        "email-security_UpdateContentPolicy": email$$security_UpdateContentPolicy,
       },
     },
     outputSchema: {
@@ -167,14 +173,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyList": email_security_ContentPolicyList_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_DeletedContentPolicy": email_security_DeletedContentPolicy_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_ContentPolicyList": email$$security_ContentPolicyList,
+        "email-security_DeletedContentPolicy": email$$security_DeletedContentPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -231,15 +234,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyList": email_security_ContentPolicyList_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_DeletedContentPolicy": email_security_DeletedContentPolicy_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_ContentPolicyList": email$$security_ContentPolicyList,
+        "email-security_DeletedContentPolicy": email$$security_DeletedContentPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -248,28 +248,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_content_policies_create",
+    name: "emailSecurity_contentPolicies_create",
     title: "Create a content policy",
-    description: "Creates a new content policy. Emails whose subject or body matches the pattern will be subject to the configured action.\n\nThis method is beta.",
+    description: "Creates a new content policy. Emails whose subject or body matches the pattern will be subject to the configured action.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/settings/content_policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateContentPolicy"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget,
-        "email-security_CreateContentPolicy": email_security_CreateContentPolicy,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateContentPolicy": email$$security_CreateContentPolicy,
       },
     },
     outputSchema: {
@@ -287,12 +295,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -332,13 +337,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -347,29 +349,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_content_policies_delete",
+    name: "emailSecurity_contentPolicies_delete",
     title: "Delete a content policy",
-    description: "Removes a content policy. After deletion, emails will no longer be evaluated against this pattern.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the content policy and stops evaluating emails against its pattern.",
+    description: "Removes a content policy. After deletion, emails will no longer be evaluated against this pattern.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the content policy and stops evaluating emails against its pattern.\n\nDELETE /accounts/{account_id}/email-security/settings/content_policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/email-security_ContentPolicyId",
-          "description": "Content policy identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Content policy identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "email-security_ContentPolicyId": email_security_ContentPolicyId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -386,10 +395,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_DeletedContentPolicy": email_security_DeletedContentPolicy_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedContentPolicy": email$$security_DeletedContentPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -429,11 +437,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_DeletedContentPolicy": email_security_DeletedContentPolicy_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedContentPolicy": email$$security_DeletedContentPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -441,34 +448,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_content_policies_edit",
+    name: "emailSecurity_contentPolicies_edit",
     title: "Update a content policy",
-    description: "Updates an existing content policy. Only provided fields will be modified.\n\nThis method is beta.",
+    description: "Updates an existing content policy. Only provided fields will be modified.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/email-security/settings/content_policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_UpdateContentPolicy"
         },
-        "policy_id": {
-          "$ref": "#/$defs/email-security_ContentPolicyId",
-          "description": "Content policy identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Content policy identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_ContentPolicyId": email_security_ContentPolicyId,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget,
-        "email-security_UpdateContentPolicy": email_security_UpdateContentPolicy,
-        "email-security_identifier": email_security_identifier,
+        "email-security_UpdateContentPolicy": email$$security_UpdateContentPolicy,
       },
     },
     outputSchema: {
@@ -486,12 +501,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -531,13 +543,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -546,29 +555,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_content_policies_get",
+    name: "emailSecurity_contentPolicies_get",
     title: "Get a content policy",
-    description: "Retrieves details for a specific content policy including its pattern, targets, and metadata.\n\nThis method is beta.",
+    description: "Retrieves details for a specific content policy including its pattern, targets, and metadata.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/content_policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/email-security_ContentPolicyId",
-          "description": "Content policy identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Content policy identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "email-security_ContentPolicyId": email_security_ContentPolicyId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -585,12 +601,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -631,13 +644,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -645,65 +655,78 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_content_policies_list",
+    name: "emailSecurity_contentPolicies_list",
     title: "List content policies",
-    description: "Returns a paginated list of content policies. These policies match against the subject or body of emails using a pattern. Supports filtering by name or enabled status, and searching across name and pattern fields.\n\nThis method is beta.",
+    description: "Returns a paginated list of content policies. These policies match against the subject or body of emails using a pattern. Supports filtering by name or enabled status, and searching across name and pattern fields.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/content_policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "The sorting direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "enabled": {
-          "description": "Filter by enabled status.",
-          "type": "boolean"
-        },
-        "expired": {
-          "description": "Filter to return only expired policies (`true`) or only policies that still apply (`false`). Omit to return both.",
-          "type": "boolean"
-        },
-        "name": {
-          "description": "Filter by exact policy name.",
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to sort by.",
-          "enum": [
-            "name",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+          "type": "object"
         },
-        "search": {
-          "description": "Search term for filtering records. Behavior may change.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "enabled": {
+              "description": "Filter by enabled status.",
+              "type": "boolean"
+            },
+            "expired": {
+              "description": "Filter to return only expired policies (`true`) or only policies that still apply (`false`). Omit to return both.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "Filter by exact policy name.",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to sort by.",
+              "enum": [
+                "name",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search term for filtering records. Behavior may change.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -720,14 +743,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyList": email_security_ContentPolicyList_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_ContentPolicyList": email$$security_ContentPolicyList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -768,28 +788,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ContentPolicy": email_security_ContentPolicy_output,
-        "email-security_ContentPolicyId": email_security_ContentPolicyId_output,
-        "email-security_ContentPolicyList": email_security_ContentPolicyList_output,
-        "email-security_ContentPolicyTarget": email_security_ContentPolicyTarget_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ContentPolicy": email$$security_ContentPolicy,
+        "email-security_ContentPolicyList": email$$security_ContentPolicyList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/settings/content_policies`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["enabled", args["enabled"], true],
-        ["name", args["name"], true],
-        ["expired", args["expired"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["enabled", param(args, "query", "enabled"), true],
+        ["name", param(args, "query", "name"), true],
+        ["expired", param(args, "query", "expired"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSecurity/domains/outputs.ts b/src/generated/forge-mcp/emailSecurity/domains/outputs.ts
index 0e8116e83..7e065b7d4 100644
--- a/src/generated/forge-mcp/emailSecurity/domains/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/domains/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_DeletedDomain` in responses.
  */
-export const email_security_DeletedDomain_output: JsonSchema = {
+export const email$$security_DeletedDomain: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/email-security_DomainId"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
@@ -18,47 +19,21 @@ export const email_security_DeletedDomain_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_DeliveryMode` in responses.
- */
-export const email_security_DeliveryMode_output: JsonSchema = {
-  "enum": [
-    "DIRECT",
-    "BCC",
-    "JOURNAL",
-    "API",
-    "RETRO_SCAN"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_DmarcStatus` in responses.
- */
-export const email_security_DmarcStatus_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "none",
-        "good",
-        "invalid"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `email-security_Domain` in responses.
  */
-export const email_security_Domain_output: JsonSchema = {
+export const email$$security_Domain: JsonSchema = {
   "properties": {
     "allowed_delivery_modes": {
       "items": {
-        "$ref": "#/$defs/email-security_DeliveryMode"
+        "enum": [
+          "DIRECT",
+          "BCC",
+          "JOURNAL",
+          "API",
+          "RETRO_SCAN"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
@@ -73,17 +48,42 @@ export const email_security_Domain_output: JsonSchema = {
       ]
     },
     "created_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "dmarc_status": {
-      "$ref": "#/$defs/email-security_DmarcStatus"
+      "oneOf": [
+        {
+          "enum": [
+            "none",
+            "good",
+            "invalid"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "domain": {
       "type": "string"
     },
     "drop_dispositions": {
       "items": {
-        "$ref": "#/$defs/email-security_DispositionLabel"
+        "enum": [
+          "MALICIOUS",
+          "MALICIOUS-BEC",
+          "SUSPICIOUS",
+          "SPOOF",
+          "SPAM",
+          "BULK",
+          "ENCRYPTED",
+          "EXTERNAL",
+          "UNKNOWN",
+          "NONE"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
@@ -98,10 +98,22 @@ export const email_security_Domain_output: JsonSchema = {
       ]
     },
     "folder": {
-      "$ref": "#/$defs/email-security_ScannableFolder"
+      "oneOf": [
+        {
+          "enum": [
+            "AllItems",
+            "Inbox"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "id": {
-      "$ref": "#/$defs/email-security_DomainId"
+      "format": "uuid",
+      "type": "string"
     },
     "inbox_provider": {
       "oneOf": [
@@ -135,13 +147,15 @@ export const email_security_Domain_output: JsonSchema = {
       "type": "array"
     },
     "last_modified": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "lookback_hops": {
       "type": "integer"
     },
     "modified_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "o365_tenant_id": {
       "oneOf": [
@@ -155,7 +169,14 @@ export const email_security_Domain_output: JsonSchema = {
     },
     "regions": {
       "items": {
-        "$ref": "#/$defs/email-security_Region"
+        "enum": [
+          "GLOBAL",
+          "AU",
+          "DE",
+          "IN",
+          "US"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
@@ -180,10 +201,37 @@ export const email_security_Domain_output: JsonSchema = {
       ]
     },
     "spf_status": {
-      "$ref": "#/$defs/email-security_SpfStatus"
+      "oneOf": [
+        {
+          "enum": [
+            "none",
+            "good",
+            "neutral",
+            "open",
+            "invalid"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "status": {
-      "$ref": "#/$defs/email-security_DomainStatus"
+      "oneOf": [
+        {
+          "enum": [
+            "PENDING",
+            "ACTIVE",
+            "FAILED",
+            "TIMEOUT"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "transport": {
       "type": "string"
@@ -195,7 +243,7 @@ export const email_security_Domain_output: JsonSchema = {
 /**
  * The schema of `email-security_DomainAuthorization` in responses.
  */
-export const email_security_DomainAuthorization_output: JsonSchema = {
+export const email$$security_DomainAuthorization: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -229,48 +277,20 @@ export const email_security_DomainAuthorization_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `email-security_DomainId` in responses.
- */
-export const email_security_DomainId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_DomainList` in responses.
  */
-export const email_security_DomainList_output: JsonSchema = {
+export const email$$security_DomainList: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email-security_Domain"
   },
   "type": "array"
 };
 
-/**
- * The schema of `email-security_DomainStatus` in responses.
- */
-export const email_security_DomainStatus_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "PENDING",
-        "ACTIVE",
-        "FAILED",
-        "TIMEOUT"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `email-security_EmailsProcessed` in responses.
  */
-export const email_security_EmailsProcessed_output: JsonSchema = {
+export const email$$security_EmailsProcessed: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -297,56 +317,3 @@ export const email_security_EmailsProcessed_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `email-security_Region` in responses.
- */
-export const email_security_Region_output: JsonSchema = {
-  "enum": [
-    "GLOBAL",
-    "AU",
-    "DE",
-    "IN",
-    "US"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_ScannableFolder` in responses.
- */
-export const email_security_ScannableFolder_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "AllItems",
-        "Inbox"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `email-security_SpfStatus` in responses.
- */
-export const email_security_SpfStatus_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "none",
-        "good",
-        "neutral",
-        "open",
-        "invalid"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/emailSecurity/domains/schemas.ts b/src/generated/forge-mcp/emailSecurity/domains/schemas.ts
index 20150cda2..103c59bbf 100644
--- a/src/generated/forge-mcp/emailSecurity/domains/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/domains/schemas.ts
@@ -6,12 +6,19 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_CreateDomain`.
  */
-export const email_security_CreateDomain: JsonSchema = {
+export const email$$security_CreateDomain: JsonSchema = {
   "properties": {
     "allowed_delivery_modes": {
       "description": "Delivery modes to onboard the domain through.",
       "items": {
-        "$ref": "#/$defs/email-security_DeliveryMode"
+        "enum": [
+          "DIRECT",
+          "BCC",
+          "JOURNAL",
+          "API",
+          "RETRO_SCAN"
+        ],
+        "type": "string"
       },
       "maxItems": 10,
       "minItems": 1,
@@ -24,14 +31,38 @@ export const email_security_CreateDomain: JsonSchema = {
     "drop_dispositions": {
       "description": "Dispositions to drop instead of delivering, e.g. `[\"MALICIOUS\", \"SPAM\"]`.",
       "items": {
-        "$ref": "#/$defs/email-security_DispositionLabel"
+        "description": "The verdict Email Security assigns to a message.",
+        "enum": [
+          "MALICIOUS",
+          "MALICIOUS-BEC",
+          "SUSPICIOUS",
+          "SPOOF",
+          "SPAM",
+          "BULK",
+          "ENCRYPTED",
+          "EXTERNAL",
+          "UNKNOWN",
+          "NONE"
+        ],
+        "type": "string"
       },
       "maxItems": 10,
       "type": "array"
     },
     "folder": {
-      "$ref": "#/$defs/email-security_ScannableFolder",
-      "description": "The mailbox folder to scan, for API-scanning domains."
+      "description": "The mailbox folder to scan, for API-scanning domains.",
+      "oneOf": [
+        {
+          "enum": [
+            "AllItems",
+            "Inbox"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "integration_id": {
       "description": "Identifier of the CASB integration that authorizes this domain. The integration also enables API scanning, post-delivery actions, and directory sync.",
@@ -67,7 +98,15 @@ export const email_security_CreateDomain: JsonSchema = {
     "regions": {
       "description": "Regions that process messages for this domain, e.g. `[\"GLOBAL\"]` or `[\"US\"]`.",
       "items": {
-        "$ref": "#/$defs/email-security_Region"
+        "description": "The region that processes messages for this domain.",
+        "enum": [
+          "GLOBAL",
+          "AU",
+          "DE",
+          "IN",
+          "US"
+        ],
+        "type": "string"
       },
       "maxItems": 10,
       "minItems": 1,
@@ -117,74 +156,23 @@ export const email_security_CreateDomain: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_DeliveryMode`.
- */
-export const email_security_DeliveryMode: JsonSchema = {
-  "enum": [
-    "DIRECT",
-    "BCC",
-    "JOURNAL",
-    "API",
-    "RETRO_SCAN"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_DomainId`.
- */
-export const email_security_DomainId: JsonSchema = {
-  "description": "Domain identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_DomainStatus`.
- */
-export const email_security_DomainStatus: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "PENDING",
-        "ACTIVE",
-        "FAILED",
-        "TIMEOUT"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `email-security_Region`.
- */
-export const email_security_Region: JsonSchema = {
-  "description": "The region that processes messages for this domain.",
-  "enum": [
-    "GLOBAL",
-    "AU",
-    "DE",
-    "IN",
-    "US"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_ReplaceDomain`.
  */
-export const email_security_ReplaceDomain: JsonSchema = {
-  "description": "Request body for replacing an email domain. The `domain` field is intentionally\nabsent — the domain name is immutable after creation.\n",
+export const email$$security_ReplaceDomain: JsonSchema = {
+  "description": "Request body for replacing an email domain. The `domain` field is intentionally\nabsent — the domain name is immutable after creation.",
   "properties": {
     "allowed_delivery_modes": {
       "description": "Delivery modes to onboard the domain through.",
       "items": {
-        "$ref": "#/$defs/email-security_DeliveryMode"
+        "enum": [
+          "DIRECT",
+          "BCC",
+          "JOURNAL",
+          "API",
+          "RETRO_SCAN"
+        ],
+        "type": "string"
       },
       "maxItems": 10,
       "minItems": 1,
@@ -193,14 +181,38 @@ export const email_security_ReplaceDomain: JsonSchema = {
     "drop_dispositions": {
       "description": "Dispositions to drop instead of delivering, e.g. `[\"MALICIOUS\", \"SPAM\"]`.",
       "items": {
-        "$ref": "#/$defs/email-security_DispositionLabel"
+        "description": "The verdict Email Security assigns to a message.",
+        "enum": [
+          "MALICIOUS",
+          "MALICIOUS-BEC",
+          "SUSPICIOUS",
+          "SPOOF",
+          "SPAM",
+          "BULK",
+          "ENCRYPTED",
+          "EXTERNAL",
+          "UNKNOWN",
+          "NONE"
+        ],
+        "type": "string"
       },
       "maxItems": 10,
       "type": "array"
     },
     "folder": {
-      "$ref": "#/$defs/email-security_ScannableFolder",
-      "description": "The mailbox folder to scan, for API-scanning domains."
+      "description": "The mailbox folder to scan, for API-scanning domains.",
+      "oneOf": [
+        {
+          "enum": [
+            "AllItems",
+            "Inbox"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "integration_id": {
       "description": "Identifier of the CASB integration that authorizes this domain. The integration also enables API scanning, post-delivery actions, and directory sync.",
@@ -236,7 +248,15 @@ export const email_security_ReplaceDomain: JsonSchema = {
     "regions": {
       "description": "Regions that process messages for this domain, e.g. `[\"GLOBAL\"]` or `[\"US\"]`.",
       "items": {
-        "$ref": "#/$defs/email-security_Region"
+        "description": "The region that processes messages for this domain.",
+        "enum": [
+          "GLOBAL",
+          "AU",
+          "DE",
+          "IN",
+          "US"
+        ],
+        "type": "string"
       },
       "maxItems": 10,
       "minItems": 1,
@@ -285,47 +305,59 @@ export const email_security_ReplaceDomain: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_ScannableFolder`.
- */
-export const email_security_ScannableFolder: JsonSchema = {
-  "description": "The mailbox folder to scan, for API-scanning domains.",
-  "oneOf": [
-    {
-      "enum": [
-        "AllItems",
-        "Inbox"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `email-security_UpdateDomain`.
  */
-export const email_security_UpdateDomain: JsonSchema = {
+export const email$$security_UpdateDomain: JsonSchema = {
   "properties": {
     "allowed_delivery_modes": {
       "description": "Delivery modes to onboard the domain through.",
       "items": {
-        "$ref": "#/$defs/email-security_DeliveryMode"
+        "enum": [
+          "DIRECT",
+          "BCC",
+          "JOURNAL",
+          "API",
+          "RETRO_SCAN"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
     "drop_dispositions": {
       "description": "Dispositions to drop instead of delivering, e.g. `[\"MALICIOUS\", \"SPAM\"]`.",
       "items": {
-        "$ref": "#/$defs/email-security_DispositionLabel"
+        "description": "The verdict Email Security assigns to a message.",
+        "enum": [
+          "MALICIOUS",
+          "MALICIOUS-BEC",
+          "SUSPICIOUS",
+          "SPOOF",
+          "SPAM",
+          "BULK",
+          "ENCRYPTED",
+          "EXTERNAL",
+          "UNKNOWN",
+          "NONE"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
     "folder": {
-      "$ref": "#/$defs/email-security_ScannableFolder",
-      "description": "The mailbox folder to scan, for API-scanning domains."
+      "description": "The mailbox folder to scan, for API-scanning domains.",
+      "oneOf": [
+        {
+          "enum": [
+            "AllItems",
+            "Inbox"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "integration_id": {
       "description": "Identifier of the CASB integration that authorizes this domain. The integration also enables API scanning, post-delivery actions, and directory sync.",
@@ -353,7 +385,15 @@ export const email_security_UpdateDomain: JsonSchema = {
     "regions": {
       "description": "Regions that process messages for this domain, e.g. `[\"GLOBAL\"]` or `[\"US\"]`.",
       "items": {
-        "$ref": "#/$defs/email-security_Region"
+        "description": "The region that processes messages for this domain.",
+        "enum": [
+          "GLOBAL",
+          "AU",
+          "DE",
+          "IN",
+          "US"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
diff --git a/src/generated/forge-mcp/emailSecurity/domains/tools.ts b/src/generated/forge-mcp/emailSecurity/domains/tools.ts
index 3fcd0868c..4e170639c 100644
--- a/src/generated/forge-mcp/emailSecurity/domains/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/domains/tools.ts
@@ -1,60 +1,38 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_DispositionLabel_output,
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
-  email_security_timestamp_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
 import {
-  email_security_DispositionLabel,
-  email_security_identifier,
-} from "../schemas.js";
-import {
-  email_security_DeletedDomain_output,
-  email_security_DeliveryMode_output,
-  email_security_DmarcStatus_output,
-  email_security_DomainAuthorization_output,
-  email_security_DomainId_output,
-  email_security_DomainList_output,
-  email_security_DomainStatus_output,
-  email_security_Domain_output,
-  email_security_EmailsProcessed_output,
-  email_security_Region_output,
-  email_security_ScannableFolder_output,
-  email_security_SpfStatus_output,
+  email$$security_DeletedDomain,
+  email$$security_Domain,
+  email$$security_DomainAuthorization,
+  email$$security_DomainList,
+  email$$security_EmailsProcessed,
 } from "./outputs.js";
 import {
-  email_security_CreateDomain,
-  email_security_DeliveryMode,
-  email_security_DomainId,
-  email_security_DomainStatus,
-  email_security_Region,
-  email_security_ReplaceDomain,
-  email_security_ScannableFolder,
-  email_security_UpdateDomain,
+  email$$security_CreateDomain,
+  email$$security_ReplaceDomain,
+  email$$security_UpdateDomain,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.domains`.
+ * The tools of `emailSecurity.domains`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_domains_batch",
+    name: "emailSecurity_domains_batch",
     title: "Batch domain operations",
-    description: "Executes multiple domain operations in a single request. All four operation arrays\n(deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may permanently delete protection for the selected email domains. Emails for those domains will no longer be processed by Email Security.",
+    description: "Executes multiple domain operations in a single request. All four operation arrays\n(deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may permanently delete protection for the selected email domains. Emails for those domains will no longer be processed by Email Security.\n\nPOST /accounts/{account_id}/email-security/settings/domains/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "deletes": {
@@ -62,8 +40,9 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "id": {
-                    "$ref": "#/$defs/email-security_DomainId",
-                    "description": "Domain identifier."
+                    "description": "Domain identifier.",
+                    "format": "uuid",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -84,8 +63,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_DomainId",
-                        "description": "Domain identifier."
+                        "description": "Domain identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -116,8 +96,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_DomainId",
-                        "description": "Domain identifier."
+                        "description": "Domain identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -138,22 +119,30 @@ export const tools: readonly Tool[] = [
             "puts"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateDomain": email_security_CreateDomain,
-        "email-security_DeliveryMode": email_security_DeliveryMode,
-        "email-security_DispositionLabel": email_security_DispositionLabel,
-        "email-security_DomainId": email_security_DomainId,
-        "email-security_Region": email_security_Region,
-        "email-security_ReplaceDomain": email_security_ReplaceDomain,
-        "email-security_ScannableFolder": email_security_ScannableFolder,
-        "email-security_UpdateDomain": email_security_UpdateDomain,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateDomain": email$$security_CreateDomain,
+        "email-security_ReplaceDomain": email$$security_ReplaceDomain,
+        "email-security_UpdateDomain": email$$security_UpdateDomain,
       },
     },
     outputSchema: {
@@ -194,22 +183,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeletedDomain": email_security_DeletedDomain_output,
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainList": email_security_DomainList_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_DeletedDomain": email$$security_DeletedDomain,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_DomainList": email$$security_DomainList,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -272,23 +252,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeletedDomain": email_security_DeletedDomain_output,
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainList": email_security_DomainList_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_DeletedDomain": email$$security_DeletedDomain,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_DomainList": email$$security_DomainList,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -297,31 +268,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_domains_create",
+    name: "emailSecurity_domains_create",
     title: "Add a new email domain",
-    description: "Protects a new email domain by adding it to Email Security. Accepts a flat configuration object covering all delivery modes. Returns the newly created domain configuration.\n\nThis method is beta.",
+    description: "Protects a new email domain by adding it to Email Security. Accepts a flat configuration object covering all delivery modes. Returns the newly created domain configuration.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/settings/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateDomain"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateDomain": email_security_CreateDomain,
-        "email-security_DeliveryMode": email_security_DeliveryMode,
-        "email-security_DispositionLabel": email_security_DispositionLabel,
-        "email-security_Region": email_security_Region,
-        "email-security_ScannableFolder": email_security_ScannableFolder,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateDomain": email$$security_CreateDomain,
       },
     },
     outputSchema: {
@@ -339,20 +315,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -392,21 +359,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -415,29 +373,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_domains_delete",
+    name: "emailSecurity_domains_delete",
     title: "Unprotect an email domain",
-    description: "Removes email security protection from a domain. After deletion, emails for this domain will no longer be processed by Email Security. This action cannot be undone.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes protection for the email domain. Emails for this domain will no longer be processed by Email Security.",
+    description: "Removes email security protection from a domain. After deletion, emails for this domain will no longer be processed by Email Security. This action cannot be undone.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes protection for the email domain. Emails for this domain will no longer be processed by Email Security.\n\nDELETE /accounts/{account_id}/email-security/settings/domains/{domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "domain_id": {
-          "$ref": "#/$defs/email-security_DomainId",
-          "description": "Domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "domain_id": {
+              "description": "Domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_id"
+        "path"
       ],
-      $defs: {
-        "email-security_DomainId": email_security_DomainId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -454,10 +419,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeletedDomain": email_security_DeletedDomain_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedDomain": email$$security_DeletedDomain,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -497,11 +461,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeletedDomain": email_security_DeletedDomain_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedDomain": email$$security_DeletedDomain,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -509,37 +472,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_domains_edit",
+    name: "emailSecurity_domains_edit",
     title: "Update an email domain",
-    description: "Updates configuration for a protected email domain. Only provided fields will be modified. Changes affect delivery mode, security settings, and regional processing.\n\nThis method is beta.",
+    description: "Updates configuration for a protected email domain. Only provided fields will be modified. Changes affect delivery mode, security settings, and regional processing.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/email-security/settings/domains/{domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_UpdateDomain"
         },
-        "domain_id": {
-          "$ref": "#/$defs/email-security_DomainId",
-          "description": "Domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "domain_id": {
+              "description": "Domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode,
-        "email-security_DispositionLabel": email_security_DispositionLabel,
-        "email-security_DomainId": email_security_DomainId,
-        "email-security_Region": email_security_Region,
-        "email-security_ScannableFolder": email_security_ScannableFolder,
-        "email-security_UpdateDomain": email_security_UpdateDomain,
-        "email-security_identifier": email_security_identifier,
+        "email-security_UpdateDomain": email$$security_UpdateDomain,
       },
     },
     outputSchema: {
@@ -557,20 +525,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -610,21 +569,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -633,29 +583,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_domains_get",
+    name: "emailSecurity_domains_get",
     title: "Get an email domain",
-    description: "Retrieves detailed information for a specific protected email domain including its delivery configuration, SPF/DMARC status, and authorization state.\n\nThis method is beta.",
+    description: "Retrieves detailed information for a specific protected email domain including its delivery configuration, SPF/DMARC status, and authorization state.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/domains/{domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "domain_id": {
-          "$ref": "#/$defs/email-security_DomainId",
-          "description": "Domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "domain_id": {
+              "description": "Domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_id"
+        "path"
       ],
-      $defs: {
-        "email-security_DomainId": email_security_DomainId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -672,20 +629,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -726,21 +674,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -748,79 +687,117 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_domains_list",
+    name: "emailSecurity_domains_list",
     title: "List protected email domains",
-    description: "Returns a paginated list of email domains protected by Email Security. Includes domain configuration, delivery modes, and authorization status. Supports filtering by delivery mode and integration ID.\n\nThis method is beta.",
+    description: "Returns a paginated list of email domains protected by Email Security. Includes domain configuration, delivery modes, and authorization status. Supports filtering by delivery mode and integration ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "active_delivery_mode": {
-          "$ref": "#/$defs/email-security_DeliveryMode",
-          "description": "Currently active delivery mode to filter by."
-        },
-        "allowed_delivery_mode": {
-          "$ref": "#/$defs/email-security_DeliveryMode",
-          "description": "Delivery mode to filter by."
-        },
-        "direction": {
-          "description": "The sorting direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "domain": {
-          "description": "Domain names to filter by.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "integration_id": {
-          "description": "Integration ID to filter by.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to sort by.",
-          "enum": [
-            "domain",
-            "created_at"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "Search term for filtering records. Behavior may change.",
-          "type": "string"
+          "type": "object"
         },
-        "status": {
-          "$ref": "#/$defs/email-security_DomainStatus",
-          "description": "Filters response to domains with the provided status."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "active_delivery_mode": {
+              "description": "Currently active delivery mode to filter by.",
+              "enum": [
+                "DIRECT",
+                "BCC",
+                "JOURNAL",
+                "API",
+                "RETRO_SCAN"
+              ],
+              "type": "string"
+            },
+            "allowed_delivery_mode": {
+              "description": "Delivery mode to filter by.",
+              "enum": [
+                "DIRECT",
+                "BCC",
+                "JOURNAL",
+                "API",
+                "RETRO_SCAN"
+              ],
+              "type": "string"
+            },
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "domain": {
+              "description": "Domain names to filter by.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "integration_id": {
+              "description": "Integration ID to filter by.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to sort by.",
+              "enum": [
+                "domain",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search term for filtering records. Behavior may change.",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filters response to domains with the provided status.",
+              "oneOf": [
+                {
+                  "enum": [
+                    "PENDING",
+                    "ACTIVE",
+                    "FAILED",
+                    "TIMEOUT"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode,
-        "email-security_DomainStatus": email_security_DomainStatus,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -837,22 +814,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainList": email_security_DomainList_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_DomainList": email$$security_DomainList,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -893,73 +861,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainList": email_security_DomainList_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_DomainList": email$$security_DomainList,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/settings/domains`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["allowed_delivery_mode", args["allowed_delivery_mode"], true],
-        ["domain", args["domain"], true],
-        ["active_delivery_mode", args["active_delivery_mode"], true],
-        ["integration_id", args["integration_id"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["allowed_delivery_mode", param(args, "query", "allowed_delivery_mode"), true],
+        ["domain", param(args, "query", "domain"), true],
+        ["active_delivery_mode", param(args, "query", "active_delivery_mode"), true],
+        ["integration_id", param(args, "query", "integration_id"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
   {
-    name: "email_security_domains_update",
+    name: "emailSecurity_domains_update",
     title: "Replace an email domain",
-    description: "Replaces all mutable fields of a protected email domain in a single atomic operation. Unlike PATCH, all non-computed fields are required.\n\nThis method is beta.",
+    description: "Replaces all mutable fields of a protected email domain in a single atomic operation. Unlike PATCH, all non-computed fields are required.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/email-security/settings/domains/{domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_ReplaceDomain"
         },
-        "domain_id": {
-          "$ref": "#/$defs/email-security_DomainId",
-          "description": "Domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "domain_id": {
+              "description": "Domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode,
-        "email-security_DispositionLabel": email_security_DispositionLabel,
-        "email-security_DomainId": email_security_DomainId,
-        "email-security_Region": email_security_Region,
-        "email-security_ReplaceDomain": email_security_ReplaceDomain,
-        "email-security_ScannableFolder": email_security_ScannableFolder,
-        "email-security_identifier": email_security_identifier,
+        "email-security_ReplaceDomain": email$$security_ReplaceDomain,
       },
     },
     outputSchema: {
@@ -977,20 +941,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -1027,21 +982,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeliveryMode": email_security_DeliveryMode_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_DmarcStatus": email_security_DmarcStatus_output,
-        "email-security_Domain": email_security_Domain_output,
-        "email-security_DomainAuthorization": email_security_DomainAuthorization_output,
-        "email-security_DomainId": email_security_DomainId_output,
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_EmailsProcessed": email_security_EmailsProcessed_output,
-        "email-security_Region": email_security_Region_output,
-        "email-security_ScannableFolder": email_security_ScannableFolder_output,
-        "email-security_SpfStatus": email_security_SpfStatus_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_Domain": email$$security_Domain,
+        "email-security_DomainAuthorization": email$$security_DomainAuthorization,
+        "email-security_EmailsProcessed": email$$security_EmailsProcessed,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/domains/verification/outputs.ts b/src/generated/forge-mcp/emailSecurity/domains/verification/outputs.ts
index 6a0cfd67f..08cc092b6 100644
--- a/src/generated/forge-mcp/emailSecurity/domains/verification/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/domains/verification/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email-security_DomainVerificationInfo` in responses.
  */
-export const email_security_DomainVerificationInfo_output: JsonSchema = {
+export const email$$security_DomainVerificationInfo: JsonSchema = {
   "properties": {
     "last_checked_at": {
       "oneOf": [
@@ -20,7 +20,20 @@ export const email_security_DomainVerificationInfo_output: JsonSchema = {
       ]
     },
     "status": {
-      "$ref": "#/$defs/email-security_DomainStatus"
+      "oneOf": [
+        {
+          "enum": [
+            "PENDING",
+            "ACTIVE",
+            "FAILED",
+            "TIMEOUT"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "txt_record_name": {
       "type": "string"
diff --git a/src/generated/forge-mcp/emailSecurity/domains/verification/tools.ts b/src/generated/forge-mcp/emailSecurity/domains/verification/tools.ts
index d10fff1ee..d2206d56c 100644
--- a/src/generated/forge-mcp/emailSecurity/domains/verification/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/domains/verification/tools.ts
@@ -3,43 +3,47 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  email_security_api_response_common_failure_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../../outputs.js";
-import { email_security_identifier } from "../../schemas.js";
-import { email_security_DomainStatus_output } from "../outputs.js";
-import { email_security_DomainId } from "../schemas.js";
-import { email_security_DomainVerificationInfo_output } from "./outputs.js";
+import { email$$security_DomainVerificationInfo } from "./outputs.js";
 
 /**
- * The tools of `email_security.domains.verification`.
+ * The tools of `emailSecurity.domains.verification`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_domains_verification_get",
+    name: "emailSecurity_domains_verification_get",
     title: "Get domain verification details",
-    description: "Returns the DNS TXT record information when the domain ownership isn't\nverified through Cloudflare zone ownership or CASB integration.\n\nThis method is beta.",
+    description: "Returns the DNS TXT record information when the domain ownership isn't\nverified through Cloudflare zone ownership or CASB integration.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/domains/{domain_id}/verification",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "domain_id": {
-          "$ref": "#/$defs/email-security_DomainId",
-          "description": "Domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "domain_id": {
+              "description": "Domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_id"
+        "path"
       ],
-      $defs: {
-        "email-security_DomainId": email_security_DomainId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -56,10 +60,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_DomainVerificationInfo": email_security_DomainVerificationInfo_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DomainVerificationInfo": email$$security_DomainVerificationInfo,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -100,11 +103,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DomainStatus": email_security_DomainStatus_output,
-        "email-security_DomainVerificationInfo": email_security_DomainVerificationInfo_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DomainVerificationInfo": email$$security_DomainVerificationInfo,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/impersonationRegistry/outputs.ts b/src/generated/forge-mcp/emailSecurity/impersonationRegistry/outputs.ts
index 1a706a9a8..85995fd8d 100644
--- a/src/generated/forge-mcp/emailSecurity/impersonationRegistry/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/impersonationRegistry/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_DeletedImpersonationRegistry` in responses.
  */
-export const email_security_DeletedImpersonationRegistry_output: JsonSchema = {
+export const email$$security_DeletedImpersonationRegistry: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/email-security_ImpersonationRegistryId"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
@@ -21,7 +22,7 @@ export const email_security_DeletedImpersonationRegistry_output: JsonSchema = {
 /**
  * The schema of `email-security_ImpersonationRegistry` in responses.
  */
-export const email_security_ImpersonationRegistry_output: JsonSchema = {
+export const email$$security_ImpersonationRegistry: JsonSchema = {
   "properties": {
     "comments": {
       "oneOf": [
@@ -34,7 +35,8 @@ export const email_security_ImpersonationRegistry_output: JsonSchema = {
       ]
     },
     "created_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "directory_id": {
       "oneOf": [
@@ -70,16 +72,19 @@ export const email_security_ImpersonationRegistry_output: JsonSchema = {
       ]
     },
     "id": {
-      "$ref": "#/$defs/email-security_ImpersonationRegistryId"
+      "format": "uuid",
+      "type": "string"
     },
     "is_email_regex": {
       "type": "boolean"
     },
     "last_modified": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
       "type": "string"
@@ -87,7 +92,13 @@ export const email_security_ImpersonationRegistry_output: JsonSchema = {
     "provenance": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_Provenance"
+          "enum": [
+            "A1S_INTERNAL",
+            "SNOOPY-CASB_OFFICE_365",
+            "SNOOPY-OFFICE_365",
+            "SNOOPY-GOOGLE_DIRECTORY"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -98,33 +109,12 @@ export const email_security_ImpersonationRegistry_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_ImpersonationRegistryId` in responses.
- */
-export const email_security_ImpersonationRegistryId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_ImpersonationRegistryList` in responses.
  */
-export const email_security_ImpersonationRegistryList_output: JsonSchema = {
+export const email$$security_ImpersonationRegistryList: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email-security_ImpersonationRegistry"
   },
   "type": "array"
 };
-
-/**
- * The schema of `email-security_Provenance` in responses.
- */
-export const email_security_Provenance_output: JsonSchema = {
-  "enum": [
-    "A1S_INTERNAL",
-    "SNOOPY-CASB_OFFICE_365",
-    "SNOOPY-OFFICE_365",
-    "SNOOPY-GOOGLE_DIRECTORY"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailSecurity/impersonationRegistry/schemas.ts b/src/generated/forge-mcp/emailSecurity/impersonationRegistry/schemas.ts
index e7abcfc27..78b65c6af 100644
--- a/src/generated/forge-mcp/emailSecurity/impersonationRegistry/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/impersonationRegistry/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_CreateImpersonationRegistry`.
  */
-export const email_security_CreateImpersonationRegistry: JsonSchema = {
+export const email$$security_CreateImpersonationRegistry: JsonSchema = {
   "description": "Create an impersonation registry entry.",
   "properties": {
     "comments": {
@@ -70,7 +70,13 @@ export const email_security_CreateImpersonationRegistry: JsonSchema = {
       "description": "Source the entry was created from.",
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_Provenance"
+          "enum": [
+            "A1S_INTERNAL",
+            "SNOOPY-CASB_OFFICE_365",
+            "SNOOPY-OFFICE_365",
+            "SNOOPY-GOOGLE_DIRECTORY"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -86,32 +92,10 @@ export const email_security_CreateImpersonationRegistry: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_ImpersonationRegistryId`.
- */
-export const email_security_ImpersonationRegistryId: JsonSchema = {
-  "description": "Impersonation registry entry identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_Provenance`.
- */
-export const email_security_Provenance: JsonSchema = {
-  "enum": [
-    "A1S_INTERNAL",
-    "SNOOPY-CASB_OFFICE_365",
-    "SNOOPY-OFFICE_365",
-    "SNOOPY-GOOGLE_DIRECTORY"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_UpdateImpersonationRegistry`.
  */
-export const email_security_UpdateImpersonationRegistry: JsonSchema = {
+export const email$$security_UpdateImpersonationRegistry: JsonSchema = {
   "description": "Update an impersonation registry entry.",
   "properties": {
     "comments": {
@@ -175,7 +159,13 @@ export const email_security_UpdateImpersonationRegistry: JsonSchema = {
       "description": "Source the entry was created from.",
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_Provenance"
+          "enum": [
+            "A1S_INTERNAL",
+            "SNOOPY-CASB_OFFICE_365",
+            "SNOOPY-OFFICE_365",
+            "SNOOPY-GOOGLE_DIRECTORY"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
diff --git a/src/generated/forge-mcp/emailSecurity/impersonationRegistry/tools.ts b/src/generated/forge-mcp/emailSecurity/impersonationRegistry/tools.ts
index 02898d0bb..f1cc1ec1c 100644
--- a/src/generated/forge-mcp/emailSecurity/impersonationRegistry/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/impersonationRegistry/tools.ts
@@ -1,57 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
-  email_security_timestamp_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
-import { email_security_identifier } from "../schemas.js";
 import {
-  email_security_DeletedImpersonationRegistry_output,
-  email_security_ImpersonationRegistryId_output,
-  email_security_ImpersonationRegistryList_output,
-  email_security_ImpersonationRegistry_output,
-  email_security_Provenance_output,
+  email$$security_DeletedImpersonationRegistry,
+  email$$security_ImpersonationRegistry,
+  email$$security_ImpersonationRegistryList,
 } from "./outputs.js";
 import {
-  email_security_CreateImpersonationRegistry,
-  email_security_ImpersonationRegistryId,
-  email_security_Provenance,
-  email_security_UpdateImpersonationRegistry,
+  email$$security_CreateImpersonationRegistry,
+  email$$security_UpdateImpersonationRegistry,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.impersonation_registry`.
+ * The tools of `emailSecurity.impersonationRegistry`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_impersonation_registry_create",
+    name: "emailSecurity_impersonationRegistry_create",
     title: "Create impersonation registry entry",
-    description: "Creates a new entry in the impersonation registry to protect against impersonation. Emails attempting to impersonate this identity will be flagged. Supports regex patterns for flexible email matching.\n\nThis method is beta.",
+    description: "Creates a new entry in the impersonation registry to protect against impersonation. Emails attempting to impersonate this identity will be flagged. Supports regex patterns for flexible email matching.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/settings/impersonation_registry",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateImpersonationRegistry"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateImpersonationRegistry": email_security_CreateImpersonationRegistry,
-        "email-security_Provenance": email_security_Provenance,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateImpersonationRegistry": email$$security_CreateImpersonationRegistry,
       },
     },
     outputSchema: {
@@ -69,12 +71,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ImpersonationRegistry": email_security_ImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_Provenance": email_security_Provenance_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ImpersonationRegistry": email$$security_ImpersonationRegistry,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -114,13 +113,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ImpersonationRegistry": email_security_ImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_Provenance": email_security_Provenance_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ImpersonationRegistry": email$$security_ImpersonationRegistry,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -129,29 +125,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_impersonation_registry_delete",
+    name: "emailSecurity_impersonationRegistry_delete",
     title: "Delete an impersonation registry entry",
-    description: "Removes an entry from the impersonation registry. After deletion, this identity will no longer be protected from impersonation.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the impersonation registry entry and stops protecting the identity from impersonation.",
+    description: "Removes an entry from the impersonation registry. After deletion, this identity will no longer be protected from impersonation.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the impersonation registry entry and stops protecting the identity from impersonation.\n\nDELETE /accounts/{account_id}/email-security/settings/impersonation_registry/{impersonation_registry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "impersonation_registry_id": {
-          "$ref": "#/$defs/email-security_ImpersonationRegistryId",
-          "description": "Impersonation registry entry identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "impersonation_registry_id": {
+              "description": "Impersonation registry entry identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "impersonation_registry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "impersonation_registry_id"
+        "path"
       ],
-      $defs: {
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -168,10 +171,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeletedImpersonationRegistry": email_security_DeletedImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedImpersonationRegistry": email$$security_DeletedImpersonationRegistry,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -211,11 +213,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeletedImpersonationRegistry": email_security_DeletedImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedImpersonationRegistry": email$$security_DeletedImpersonationRegistry,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -223,34 +224,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_impersonation_registry_edit",
+    name: "emailSecurity_impersonationRegistry_edit",
     title: "Update an impersonation registry entry",
-    description: "Updates an existing impersonation registry entry. Only provided fields will be modified. Directory-synced entries can't be updated.\n\nThis method is beta.",
+    description: "Updates an existing impersonation registry entry. Only provided fields will be modified. Directory-synced entries can't be updated.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/email-security/settings/impersonation_registry/{impersonation_registry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_UpdateImpersonationRegistry"
         },
-        "impersonation_registry_id": {
-          "$ref": "#/$defs/email-security_ImpersonationRegistryId",
-          "description": "Impersonation registry entry identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "impersonation_registry_id": {
+              "description": "Impersonation registry entry identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "impersonation_registry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "impersonation_registry_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId,
-        "email-security_Provenance": email_security_Provenance,
-        "email-security_UpdateImpersonationRegistry": email_security_UpdateImpersonationRegistry,
-        "email-security_identifier": email_security_identifier,
+        "email-security_UpdateImpersonationRegistry": email$$security_UpdateImpersonationRegistry,
       },
     },
     outputSchema: {
@@ -268,12 +277,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ImpersonationRegistry": email_security_ImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_Provenance": email_security_Provenance_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ImpersonationRegistry": email$$security_ImpersonationRegistry,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -313,13 +319,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ImpersonationRegistry": email_security_ImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_Provenance": email_security_Provenance_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ImpersonationRegistry": email$$security_ImpersonationRegistry,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -328,29 +331,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_impersonation_registry_get",
+    name: "emailSecurity_impersonationRegistry_get",
     title: "Get an impersonation registry entry",
-    description: "Retrieves details for a specific impersonation registry entry including the protected identity, email pattern, and synchronization source if directory-synced.\n\nThis method is beta.",
+    description: "Retrieves details for a specific impersonation registry entry including the protected identity, email pattern, and synchronization source if directory-synced.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/impersonation_registry/{impersonation_registry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "impersonation_registry_id": {
-          "$ref": "#/$defs/email-security_ImpersonationRegistryId",
-          "description": "Impersonation registry entry identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "impersonation_registry_id": {
+              "description": "Impersonation registry entry identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "impersonation_registry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "impersonation_registry_id"
+        "path"
       ],
-      $defs: {
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -367,12 +377,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ImpersonationRegistry": email_security_ImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_Provenance": email_security_Provenance_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ImpersonationRegistry": email$$security_ImpersonationRegistry,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -413,13 +420,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ImpersonationRegistry": email_security_ImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_Provenance": email_security_Provenance_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ImpersonationRegistry": email$$security_ImpersonationRegistry,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -427,58 +431,76 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_impersonation_registry_list",
+    name: "emailSecurity_impersonationRegistry_list",
     title: "List impersonation registry entries",
-    description: "Returns a paginated list of protected identities in the impersonation registry. These entries define identities and email addresses to protect from impersonation attacks. Can be manually added or automatically synced from directory integrations.\n\nThis method is beta.",
+    description: "Returns a paginated list of protected identities in the impersonation registry. These entries define identities and email addresses to protect from impersonation attacks. Can be manually added or automatically synced from directory integrations.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/impersonation_registry",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "The sorting direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to sort by.",
-          "enum": [
-            "name",
-            "email",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
-        },
-        "provenance": {
-          "$ref": "#/$defs/email-security_Provenance"
+          "type": "object"
         },
-        "search": {
-          "description": "Search term for filtering records. Behavior may change.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to sort by.",
+              "enum": [
+                "name",
+                "email",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "provenance": {
+              "enum": [
+                "A1S_INTERNAL",
+                "SNOOPY-CASB_OFFICE_365",
+                "SNOOPY-OFFICE_365",
+                "SNOOPY-GOOGLE_DIRECTORY"
+              ],
+              "type": "string"
+            },
+            "search": {
+              "description": "Search term for filtering records. Behavior may change.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_Provenance": email_security_Provenance,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -495,14 +517,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ImpersonationRegistry": email_security_ImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_ImpersonationRegistryList": email_security_ImpersonationRegistryList_output,
-        "email-security_Provenance": email_security_Provenance_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ImpersonationRegistry": email$$security_ImpersonationRegistry,
+        "email-security_ImpersonationRegistryList": email$$security_ImpersonationRegistryList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -543,26 +562,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ImpersonationRegistry": email_security_ImpersonationRegistry_output,
-        "email-security_ImpersonationRegistryId": email_security_ImpersonationRegistryId_output,
-        "email-security_ImpersonationRegistryList": email_security_ImpersonationRegistryList_output,
-        "email-security_Provenance": email_security_Provenance_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_ImpersonationRegistry": email$$security_ImpersonationRegistry,
+        "email-security_ImpersonationRegistryList": email$$security_ImpersonationRegistryList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/settings/impersonation_registry`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["provenance", args["provenance"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["provenance", param(args, "query", "provenance"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/actionLog/outputs.ts b/src/generated/forge-mcp/emailSecurity/investigate/actionLog/outputs.ts
index 7cfb45b09..ca7810177 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/actionLog/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/actionLog/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email-security_ActionEntry` in responses.
  */
-export const email_security_ActionEntry_output: JsonSchema = {
+export const email$$security_ActionEntry: JsonSchema = {
   "properties": {
     "completed_at": {
       "oneOf": [
@@ -79,7 +79,7 @@ export const email_security_ActionEntry_output: JsonSchema = {
 /**
  * The schema of `email-security_ActionEntryProperties` in responses.
  */
-export const email_security_ActionEntryProperties_output: JsonSchema = {
+export const email$$security_ActionEntryProperties: JsonSchema = {
   "properties": {
     "folder": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/actionLog/tools.ts b/src/generated/forge-mcp/emailSecurity/investigate/actionLog/tools.ts
index 1b27dab9c..e6d13e3b2 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/actionLog/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/actionLog/tools.ts
@@ -1,60 +1,68 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../../outputs.js";
 import {
-  email_security_InvestigateId,
-  email_security_identifier,
-} from "../../schemas.js";
-import {
-  email_security_ActionEntryProperties_output,
-  email_security_ActionEntry_output,
+  email$$security_ActionEntry,
+  email$$security_ActionEntryProperties,
 } from "./outputs.js";
 
 /**
- * The tools of `email_security.investigate.action_log`.
+ * The tools of `emailSecurity.investigate.actionLog`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_investigate_action_log_list",
+    name: "emailSecurity_investigate_actionLog_list",
     title: "List post-delivery actions for a message",
-    description: "Returns the list of post-delivery actions (moves, quarantine releases, previews, etc.) that have been applied to a specific email message.\n\nThis method is beta.",
+    description: "Returns the list of post-delivery actions (moves, quarantine releases, previews, etc.) that have been applied to a specific email message.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/{investigate_id}/action_log",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "investigate_id": {
-          "$ref": "#/$defs/email-security_InvestigateId",
-          "description": "Unique identifier for a message retrieved from investigation."
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "investigate_id": {
+              "description": "Unique identifier for a message retrieved from investigation.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "investigate_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "investigate_id"
+        "path"
       ],
-      $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -77,11 +85,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ActionEntry": email_security_ActionEntry_output,
-        "email-security_ActionEntryProperties": email_security_ActionEntryProperties_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ActionEntry": email$$security_ActionEntry,
+        "email-security_ActionEntryProperties": email$$security_ActionEntryProperties,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -128,19 +136,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ActionEntry": email_security_ActionEntry_output,
-        "email-security_ActionEntryProperties": email_security_ActionEntryProperties_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ActionEntry": email$$security_ActionEntry,
+        "email-security_ActionEntryProperties": email$$security_ActionEntryProperties,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/investigate/${pathParam(args, "investigate_id")}/action_log`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/detections/outputs.ts b/src/generated/forge-mcp/emailSecurity/investigate/detections/outputs.ts
index 390d93a1e..fa2cdf629 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/detections/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/detections/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email-security_Attachment` in responses.
  */
-export const email_security_Attachment_output: JsonSchema = {
+export const email$$security_Attachment: JsonSchema = {
   "properties": {
     "content_type": {
       "oneOf": [
@@ -21,7 +21,19 @@ export const email_security_Attachment_output: JsonSchema = {
     "detection": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_DispositionLabel"
+          "enum": [
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -101,7 +113,7 @@ export const email_security_Attachment_output: JsonSchema = {
 /**
  * The schema of `email-security_Finding` in responses.
  */
-export const email_security_Finding_output: JsonSchema = {
+export const email$$security_Finding: JsonSchema = {
   "properties": {
     "attachment": {
       "oneOf": [
@@ -126,7 +138,19 @@ export const email_security_Finding_output: JsonSchema = {
     "detection": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_DispositionLabel"
+          "enum": [
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -200,7 +224,7 @@ export const email_security_Finding_output: JsonSchema = {
 /**
  * The schema of `email-security_Link` in responses.
  */
-export const email_security_Link_output: JsonSchema = {
+export const email$$security_Link: JsonSchema = {
   "properties": {
     "href": {
       "type": "string"
@@ -225,7 +249,7 @@ export const email_security_Link_output: JsonSchema = {
 /**
  * The schema of `email-security_MessageDetectionDetails` in responses.
  */
-export const email_security_MessageDetectionDetails_output: JsonSchema = {
+export const email$$security_MessageDetectionDetails: JsonSchema = {
   "properties": {
     "action": {
       "type": "string"
@@ -239,7 +263,19 @@ export const email_security_MessageDetectionDetails_output: JsonSchema = {
     "final_disposition": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_DispositionLabel"
+          "enum": [
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -352,7 +388,7 @@ export const email_security_MessageDetectionDetails_output: JsonSchema = {
 /**
  * The schema of `email-security_MessageHeader` in responses.
  */
-export const email_security_MessageHeader_output: JsonSchema = {
+export const email$$security_MessageHeader: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -371,7 +407,7 @@ export const email_security_MessageHeader_output: JsonSchema = {
 /**
  * The schema of `email-security_ThreatCategory` in responses.
  */
-export const email_security_ThreatCategory_output: JsonSchema = {
+export const email$$security_ThreatCategory: JsonSchema = {
   "properties": {
     "description": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/detections/tools.ts b/src/generated/forge-mcp/emailSecurity/investigate/detections/tools.ts
index af2edf10c..b31b8bc62 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/detections/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/detections/tools.ts
@@ -3,54 +3,54 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  email_security_DispositionLabel_output,
-  email_security_ValidationStatus_output,
-  email_security_Validation_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_Validation,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../../outputs.js";
 import {
-  email_security_InvestigateId,
-  email_security_identifier,
-} from "../../schemas.js";
-import {
-  email_security_Attachment_output,
-  email_security_Finding_output,
-  email_security_Link_output,
-  email_security_MessageDetectionDetails_output,
-  email_security_MessageHeader_output,
-  email_security_ThreatCategory_output,
+  email$$security_Attachment,
+  email$$security_Finding,
+  email$$security_Link,
+  email$$security_MessageDetectionDetails,
+  email$$security_MessageHeader,
+  email$$security_ThreatCategory,
 } from "./outputs.js";
 
 /**
- * The tools of `email_security.investigate.detections`.
+ * The tools of `emailSecurity.investigate.detections`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_investigate_detections_get",
+    name: "emailSecurity_investigate_detections_get",
     title: "Get message detection details",
-    description: "Returns detection details such as threat categories and sender information for messages with a detection.\n\nThis method is beta.",
+    description: "Returns detection details such as threat categories and sender information for messages with a detection.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/{investigate_id}/detections",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "investigate_id": {
-          "$ref": "#/$defs/email-security_InvestigateId",
-          "description": "Unique identifier for a message retrieved from investigation."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "investigate_id": {
+              "description": "Unique identifier for a message retrieved from investigation.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "investigate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "investigate_id"
+        "path"
       ],
-      $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -70,17 +70,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_Attachment": email_security_Attachment_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_Finding": email_security_Finding_output,
-        "email-security_Link": email_security_Link_output,
-        "email-security_MessageDetectionDetails": email_security_MessageDetectionDetails_output,
-        "email-security_MessageHeader": email_security_MessageHeader_output,
-        "email-security_ThreatCategory": email_security_ThreatCategory_output,
-        "email-security_Validation": email_security_Validation_output,
-        "email-security_ValidationStatus": email_security_ValidationStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_Attachment": email$$security_Attachment,
+        "email-security_Finding": email$$security_Finding,
+        "email-security_Link": email$$security_Link,
+        "email-security_MessageDetectionDetails": email$$security_MessageDetectionDetails,
+        "email-security_MessageHeader": email$$security_MessageHeader,
+        "email-security_ThreatCategory": email$$security_ThreatCategory,
+        "email-security_Validation": email$$security_Validation,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -124,18 +122,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_Attachment": email_security_Attachment_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_Finding": email_security_Finding_output,
-        "email-security_Link": email_security_Link_output,
-        "email-security_MessageDetectionDetails": email_security_MessageDetectionDetails_output,
-        "email-security_MessageHeader": email_security_MessageHeader_output,
-        "email-security_ThreatCategory": email_security_ThreatCategory_output,
-        "email-security_Validation": email_security_Validation_output,
-        "email-security_ValidationStatus": email_security_ValidationStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_Attachment": email$$security_Attachment,
+        "email-security_Finding": email$$security_Finding,
+        "email-security_Link": email$$security_Link,
+        "email-security_MessageDetectionDetails": email$$security_MessageDetectionDetails,
+        "email-security_MessageHeader": email$$security_MessageHeader,
+        "email-security_ThreatCategory": email$$security_ThreatCategory,
+        "email-security_Validation": email$$security_Validation,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/outputs.ts b/src/generated/forge-mcp/emailSecurity/investigate/outputs.ts
index ba397a65f..27de4d263 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_MoveResponseItem` in responses.
  */
-export const email_security_MoveResponseItem_output: JsonSchema = {
+export const email$$security_MoveResponseItem: JsonSchema = {
   "properties": {
     "completed_at": {
       "oneOf": [
@@ -89,7 +89,7 @@ export const email_security_MoveResponseItem_output: JsonSchema = {
 /**
  * The schema of `email-security_ReleaseResponse` in responses.
  */
-export const email_security_ReleaseResponse_output: JsonSchema = {
+export const email$$security_ReleaseResponse: JsonSchema = {
   "properties": {
     "delivered": {
       "oneOf": [
@@ -118,10 +118,10 @@ export const email_security_ReleaseResponse_output: JsonSchema = {
       ]
     },
     "id": {
-      "$ref": "#/$defs/email-security_InvestigateId"
+      "type": "string"
     },
     "postfix_id": {
-      "$ref": "#/$defs/email-security_PostfixId"
+      "type": "string"
     },
     "undelivered": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/preview/outputs.ts b/src/generated/forge-mcp/emailSecurity/investigate/preview/outputs.ts
index 6214e262c..39cdec1ca 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/preview/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/preview/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email-security_MessagePreview` in responses.
  */
-export const email_security_MessagePreview_output: JsonSchema = {
+export const email$$security_MessagePreview: JsonSchema = {
   "properties": {
     "screenshot": {
       "type": "string"
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/preview/tools.ts b/src/generated/forge-mcp/emailSecurity/investigate/preview/tools.ts
index a0df2676c..0079215f4 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/preview/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/preview/tools.ts
@@ -3,52 +3,54 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../../outputs.js";
-import {
-  email_security_InvestigateId,
-  email_security_identifier,
-} from "../../schemas.js";
-import { email_security_MessagePreview_output } from "./outputs.js";
+import { email$$security_MessagePreview } from "./outputs.js";
 
 /**
- * The tools of `email_security.investigate.preview`.
+ * The tools of `emailSecurity.investigate.preview`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_investigate_preview_generate",
+    name: "emailSecurity_investigate_preview_generate",
     title: "Generate preview for a non-detection message",
-    description: "Generates a preview image for a message that was not flagged as a detection. The message is rendered from the copy in the recipient's mailbox, so this requires an active integration and only works while the message is still in the recipient's inbox. Returns a base64-encoded PNG screenshot of the email body. For messages with a detection, use the detection preview endpoint instead.\n\nThis method is beta.",
+    description: "Generates a preview image for a message that was not flagged as a detection. The message is rendered from the copy in the recipient's mailbox, so this requires an active integration and only works while the message is still in the recipient's inbox. Returns a base64-encoded PNG screenshot of the email body. For messages with a detection, use the detection preview endpoint instead.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/investigate/preview",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/email-security_InvestigateId",
-              "description": "Unique identifier for a message retrieved from investigation."
+              "description": "Unique identifier for a message retrieved from investigation.",
+              "type": "string"
             }
           },
           "required": [
             "id"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -68,9 +70,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_MessagePreview": email_security_MessagePreview_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MessagePreview": email$$security_MessagePreview,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -113,10 +115,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_MessagePreview": email_security_MessagePreview_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MessagePreview": email$$security_MessagePreview,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -125,29 +127,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_investigate_preview_get",
+    name: "emailSecurity_investigate_preview_get",
     title: "Get preview for a detection",
-    description: "Returns a preview of the message body as a base64-encoded PNG image for any message with a detection. For messages without a detection, use the non-detection preview endpoint instead.\n\nThis method is beta.",
+    description: "Returns a preview of the message body as a base64-encoded PNG image for any message with a detection. For messages without a detection, use the non-detection preview endpoint instead.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/{investigate_id}/preview",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "investigate_id": {
-          "$ref": "#/$defs/email-security_InvestigateId",
-          "description": "Unique identifier for a message retrieved from investigation."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "investigate_id": {
+              "description": "Unique identifier for a message retrieved from investigation.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "investigate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "investigate_id"
+        "path"
       ],
-      $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -167,9 +175,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_MessagePreview": email_security_MessagePreview_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MessagePreview": email$$security_MessagePreview,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -213,10 +221,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_MessagePreview": email_security_MessagePreview_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MessagePreview": email$$security_MessagePreview,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/raw/outputs.ts b/src/generated/forge-mcp/emailSecurity/investigate/raw/outputs.ts
index 225359d0a..16c96da32 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/raw/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/raw/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email-security_MessageRaw` in responses.
  */
-export const email_security_MessageRaw_output: JsonSchema = {
+export const email$$security_MessageRaw: JsonSchema = {
   "properties": {
     "raw": {
       "type": "string"
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/raw/tools.ts b/src/generated/forge-mcp/emailSecurity/investigate/raw/tools.ts
index 6269903f2..913a6d0f7 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/raw/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/raw/tools.ts
@@ -3,44 +3,46 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../../outputs.js";
-import {
-  email_security_InvestigateId,
-  email_security_identifier,
-} from "../../schemas.js";
-import { email_security_MessageRaw_output } from "./outputs.js";
+import { email$$security_MessageRaw } from "./outputs.js";
 
 /**
- * The tools of `email_security.investigate.raw`.
+ * The tools of `emailSecurity.investigate.raw`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_investigate_raw_get",
+    name: "emailSecurity_investigate_raw_get",
     title: "Get raw email content",
-    description: "Returns the raw EML content of any message with a detection.\n\nThis method is beta.",
+    description: "Returns the raw EML content of any message with a detection.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/{investigate_id}/raw",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "investigate_id": {
-          "$ref": "#/$defs/email-security_InvestigateId",
-          "description": "Unique identifier for a message retrieved from investigation."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "investigate_id": {
+              "description": "Unique identifier for a message retrieved from investigation.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "investigate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "investigate_id"
+        "path"
       ],
-      $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -60,9 +62,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_MessageRaw": email_security_MessageRaw_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MessageRaw": email$$security_MessageRaw,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -106,10 +108,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_MessageRaw": email_security_MessageRaw_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MessageRaw": email$$security_MessageRaw,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/tools.ts b/src/generated/forge-mcp/emailSecurity/investigate/tools.ts
index 9ef9f1e34..63f8439ee 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/tools.ts
@@ -1,67 +1,65 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_ActionLogEntry_output,
-  email_security_CursorResultInfo_output,
-  email_security_DispositionLabel_output,
-  email_security_InvestigateId_output,
-  email_security_MessageDeliveryMode_output,
-  email_security_MessageDeliveryStatus_output,
-  email_security_MessageDetails_output,
-  email_security_PostfixId_output,
-  email_security_ValidationStatus_output,
-  email_security_Validation_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_ActionLogEntry,
+  email$$security_CursorResultInfo,
+  email$$security_MessageDetails,
+  email$$security_Validation,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../outputs.js";
 import {
-  email_security_DispositionLabel,
-  email_security_InvestigateId,
-  email_security_MailboxDestination,
-  email_security_MessageDeliveryStatus,
-  email_security_PostfixId,
-  email_security_identifier,
-} from "../schemas.js";
-import {
-  email_security_MoveResponseItem_output,
-  email_security_ReleaseResponse_output,
+  email$$security_MoveResponseItem,
+  email$$security_ReleaseResponse,
 } from "./outputs.js";
 
 /**
- * The tools of `email_security.investigate`.
+ * The tools of `emailSecurity.investigate`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_investigate_get",
+    name: "emailSecurity_investigate_get",
     title: "Get message details",
-    description: "Retrieves comprehensive details for a specific email message including headers, recipients, sender information, and current quarantine status. Use the investigate_id from search results to fetch detailed information.\n\nThis method is beta.",
+    description: "Retrieves comprehensive details for a specific email message including headers, recipients, sender information, and current quarantine status. Use the investigate_id from search results to fetch detailed information.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/{investigate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "investigate_id": {
-          "$ref": "#/$defs/email-security_InvestigateId",
-          "description": "Unique identifier for a message retrieved from investigation."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "investigate_id": {
+              "description": "Unique identifier for a message retrieved from investigation.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "investigate_id"
+          ],
+          "type": "object"
         },
-        "submission": {
-          "description": "When true, search the submissions datastore only. When false or omitted, search the\nregular datastore only.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "submission": {
+              "description": "When true, search the submissions datastore only. When false or omitted, search the\nregular datastore only.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "investigate_id"
+        "path"
       ],
-      $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -81,17 +79,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ActionLogEntry": email_security_ActionLogEntry_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_InvestigateId": email_security_InvestigateId_output,
-        "email-security_MessageDeliveryMode": email_security_MessageDeliveryMode_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_MessageDetails": email_security_MessageDetails_output,
-        "email-security_PostfixId": email_security_PostfixId_output,
-        "email-security_Validation": email_security_Validation_output,
-        "email-security_ValidationStatus": email_security_ValidationStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ActionLogEntry": email$$security_ActionLogEntry,
+        "email-security_MessageDetails": email$$security_MessageDetails,
+        "email-security_Validation": email$$security_Validation,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -135,144 +127,160 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ActionLogEntry": email_security_ActionLogEntry_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_InvestigateId": email_security_InvestigateId_output,
-        "email-security_MessageDeliveryMode": email_security_MessageDeliveryMode_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_MessageDetails": email_security_MessageDetails_output,
-        "email-security_PostfixId": email_security_PostfixId_output,
-        "email-security_Validation": email_security_Validation_output,
-        "email-security_ValidationStatus": email_security_ValidationStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ActionLogEntry": email$$security_ActionLogEntry,
+        "email-security_MessageDetails": email$$security_MessageDetails,
+        "email-security_Validation": email$$security_Validation,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/investigate/${pathParam(args, "investigate_id")}`,
       query: [
-        ["submission", args["submission"], true],
+        ["submission", param(args, "query", "submission"), true],
       ],
     }),
   },
   {
-    name: "email_security_investigate_list",
+    name: "emailSecurity_investigate_list",
     title: "Search email messages",
-    description: "Returns information for each email that matches the provided search parameters.\n\nThis method is beta.",
+    description: "Returns information for each email that matches the provided search parameters.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "alert_id": {
-          "description": "Filter by alert ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from the previous response's `result_info`.",
-          "type": "string"
-        },
-        "delivery_status": {
-          "$ref": "#/$defs/email-security_MessageDeliveryStatus",
-          "description": "Delivery status to filter by."
-        },
-        "detections_only": {
-          "default": true,
-          "description": "Whether to include only detections in search results.",
-          "type": "boolean"
-        },
-        "domain": {
-          "description": "Filter by a domain found in the email — sender domain, recipient domain, or a domain in a link.",
-          "type": "string"
-        },
-        "end": {
-          "description": "The end of the search date range. Defaults to `now`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "final_disposition": {
-          "description": "Dispositions to filter by.",
-          "enum": [
-            "MALICIOUS",
-            "SUSPICIOUS",
-            "SPOOF",
-            "SPAM",
-            "BULK",
-            "NONE"
-          ],
-          "type": "string"
-        },
-        "message_action": {
-          "description": "Message actions to filter by.",
-          "enum": [
-            "PREVIEW",
-            "QUARANTINE_RELEASED",
-            "MOVED"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "message_id": {
-          "description": "Filter by the RFC 5322 Message-ID header.",
-          "type": "string"
-        },
-        "metric": {
-          "description": "Metric to aggregate the results by.",
-          "type": "string"
+          "type": "object"
         },
-        "page": {
-          "default": 1,
-          "deprecated": true,
-          "description": "Deprecated: Use cursor pagination instead. End of life: November 1, 2026.",
-          "oneOf": [
-            {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "alert_id": {
+              "description": "Filter by alert ID.",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Pagination cursor from the previous response's `result_info`.",
+              "type": "string"
+            },
+            "delivery_status": {
+              "description": "Delivery status to filter by.",
+              "enum": [
+                "delivered",
+                "moved",
+                "quarantined",
+                "rejected",
+                "deferred",
+                "bounced",
+                "queued",
+                "move_failed"
+              ],
+              "type": "string"
+            },
+            "detections_only": {
+              "default": true,
+              "description": "Whether to include only detections in search results.",
+              "type": "boolean"
+            },
+            "domain": {
+              "description": "Filter by a domain found in the email — sender domain, recipient domain, or a domain in a link.",
+              "type": "string"
+            },
+            "end": {
+              "description": "The end of the search date range. Defaults to `now`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "final_disposition": {
+              "description": "Dispositions to filter by.",
+              "enum": [
+                "MALICIOUS",
+                "SUSPICIOUS",
+                "SPOOF",
+                "SPAM",
+                "BULK",
+                "NONE"
+              ],
+              "type": "string"
+            },
+            "message_action": {
+              "description": "Message actions to filter by.",
+              "enum": [
+                "PREVIEW",
+                "QUARANTINE_RELEASED",
+                "MOVED"
+              ],
+              "type": "string"
+            },
+            "message_id": {
+              "description": "Filter by the RFC 5322 Message-ID header.",
+              "type": "string"
+            },
+            "metric": {
+              "description": "Metric to aggregate the results by.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "deprecated": true,
+              "description": "Deprecated: Use cursor pagination instead. End of life: November 1, 2026.",
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
               "type": "integer"
             },
-            {
-              "type": "null"
+            "query": {
+              "description": "Space-delimited term matched case-insensitively against message metadata — sender, recipient, subject, attachment names and hashes, and message ID.",
+              "type": "string"
+            },
+            "recipient": {
+              "description": "Filter by recipient. Matches an email address or a domain.",
+              "type": "string"
+            },
+            "sender": {
+              "description": "Filter by sender. Matches an email address or a domain.",
+              "type": "string"
+            },
+            "smtp_helo_ip": {
+              "description": "Matches messages whose SMTP HELO server IP address equals this value.",
+              "type": "string"
+            },
+            "start": {
+              "description": "The beginning of the search date range. Defaults to `now - 30 days`. Must not be in the future.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "subject": {
+              "description": "Search for messages containing individual keywords in any order within the subject.",
+              "type": "string"
             }
-          ]
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
-        },
-        "query": {
-          "description": "Space-delimited term matched case-insensitively against message metadata — sender, recipient, subject, attachment names and hashes, and message ID.",
-          "type": "string"
-        },
-        "recipient": {
-          "description": "Filter by recipient. Matches an email address or a domain.",
-          "type": "string"
-        },
-        "sender": {
-          "description": "Filter by sender. Matches an email address or a domain.",
-          "type": "string"
-        },
-        "smtp_helo_ip": {
-          "description": "Matches messages whose SMTP HELO server IP address equals this value.",
-          "type": "string"
-        },
-        "start": {
-          "description": "The beginning of the search date range. Defaults to `now - 30 days`. Must not be in the future.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "subject": {
-          "description": "Search for messages containing individual keywords in any order within the subject.",
-          "type": "string"
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "anyOf": [
@@ -329,18 +337,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_ActionLogEntry": email_security_ActionLogEntry_output,
-        "email-security_CursorResultInfo": email_security_CursorResultInfo_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_InvestigateId": email_security_InvestigateId_output,
-        "email-security_MessageDeliveryMode": email_security_MessageDeliveryMode_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_MessageDetails": email_security_MessageDetails_output,
-        "email-security_PostfixId": email_security_PostfixId_output,
-        "email-security_Validation": email_security_Validation_output,
-        "email-security_ValidationStatus": email_security_ValidationStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ActionLogEntry": email$$security_ActionLogEntry,
+        "email-security_CursorResultInfo": email$$security_CursorResultInfo,
+        "email-security_MessageDetails": email$$security_MessageDetails,
+        "email-security_Validation": email$$security_Validation,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -417,68 +419,78 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_ActionLogEntry": email_security_ActionLogEntry_output,
-        "email-security_CursorResultInfo": email_security_CursorResultInfo_output,
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_InvestigateId": email_security_InvestigateId_output,
-        "email-security_MessageDeliveryMode": email_security_MessageDeliveryMode_output,
-        "email-security_MessageDeliveryStatus": email_security_MessageDeliveryStatus_output,
-        "email-security_MessageDetails": email_security_MessageDetails_output,
-        "email-security_PostfixId": email_security_PostfixId_output,
-        "email-security_Validation": email_security_Validation_output,
-        "email-security_ValidationStatus": email_security_ValidationStatus_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ActionLogEntry": email$$security_ActionLogEntry,
+        "email-security_CursorResultInfo": email$$security_CursorResultInfo,
+        "email-security_MessageDetails": email$$security_MessageDetails,
+        "email-security_Validation": email$$security_Validation,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/investigate`,
       query: [
-        ["start", args["start"], true],
-        ["end", args["end"], true],
-        ["query", args["query"], true],
-        ["detections_only", args["detections_only"], true],
-        ["final_disposition", args["final_disposition"], true],
-        ["metric", args["metric"], true],
-        ["message_action", args["message_action"], true],
-        ["recipient", args["recipient"], true],
-        ["sender", args["sender"], true],
-        ["smtp_helo_ip", args["smtp_helo_ip"], true],
-        ["alert_id", args["alert_id"], true],
-        ["domain", args["domain"], true],
-        ["message_id", args["message_id"], true],
-        ["subject", args["subject"], true],
-        ["delivery_status", args["delivery_status"], true],
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["start", param(args, "query", "start"), true],
+        ["end", param(args, "query", "end"), true],
+        ["query", param(args, "query", "query"), true],
+        ["detections_only", param(args, "query", "detections_only"), true],
+        ["final_disposition", param(args, "query", "final_disposition"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["message_action", param(args, "query", "message_action"), true],
+        ["recipient", param(args, "query", "recipient"), true],
+        ["sender", param(args, "query", "sender"), true],
+        ["smtp_helo_ip", param(args, "query", "smtp_helo_ip"), true],
+        ["alert_id", param(args, "query", "alert_id"), true],
+        ["domain", param(args, "query", "domain"), true],
+        ["message_id", param(args, "query", "message_id"), true],
+        ["subject", param(args, "query", "subject"), true],
+        ["delivery_status", param(args, "query", "delivery_status"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
   {
-    name: "email_security_investigate_move",
+    name: "emailSecurity_investigate_move",
     title: "Move messages",
-    description: "Moves one or more messages to a specified mailbox folder (Inbox, JunkEmail, DeletedItems, RecoverableItemsDeletions, or RecoverableItemsPurges). Requires active integration. Operates on an explicit list of messages; to move all messages matching a search, create a bulk action job instead.\n\nThis method is beta.",
+    description: "Moves one or more messages to a specified mailbox folder (Inbox, JunkEmail, DeletedItems, RecoverableItemsDeletions, or RecoverableItemsPurges). Requires active integration. Operates on an explicit list of messages; to move all messages matching a search, create a bulk action job instead.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/investigate/move",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "destination": {
-              "$ref": "#/$defs/email-security_MailboxDestination",
-              "description": "The mailbox folder to move messages to."
+              "description": "The mailbox folder to move messages to.",
+              "enum": [
+                "Inbox",
+                "JunkEmail",
+                "DeletedItems",
+                "RecoverableItemsDeletions",
+                "RecoverableItemsPurges"
+              ],
+              "type": "string"
             },
             "expected_disposition": {
               "deprecated": true,
               "description": "Nonfunctional field. End of life: December 1, 2026.",
               "oneOf": [
                 {
-                  "$ref": "#/$defs/email-security_DispositionLabel"
+                  "description": "The verdict Email Security assigns to a message.",
+                  "enum": [
+                    "MALICIOUS",
+                    "MALICIOUS-BEC",
+                    "SUSPICIOUS",
+                    "SPOOF",
+                    "SPAM",
+                    "BULK",
+                    "ENCRYPTED",
+                    "EXTERNAL",
+                    "UNKNOWN",
+                    "NONE"
+                  ],
+                  "type": "string"
                 },
                 {
                   "type": "null"
@@ -488,7 +500,8 @@ export const tools: readonly Tool[] = [
             "ids": {
               "description": "List of message IDs to move.",
               "items": {
-                "$ref": "#/$defs/email-security_InvestigateId"
+                "description": "Unique identifier for a message retrieved from investigation.",
+                "type": "string"
               },
               "maxItems": 1000,
               "minItems": 1,
@@ -498,7 +511,8 @@ export const tools: readonly Tool[] = [
               "deprecated": true,
               "description": "Deprecated, use `ids` instead. End of life: November 1, 2026.",
               "items": {
-                "$ref": "#/$defs/email-security_PostfixId"
+                "description": "The identifier of the message.",
+                "type": "string"
               },
               "type": "array"
             }
@@ -508,19 +522,26 @@ export const tools: readonly Tool[] = [
             "ids"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "email-security_DispositionLabel": email_security_DispositionLabel,
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_MailboxDestination": email_security_MailboxDestination,
-        "email-security_PostfixId": email_security_PostfixId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -543,9 +564,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_MoveResponseItem": email_security_MoveResponseItem_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MoveResponseItem": email$$security_MoveResponseItem,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -591,10 +612,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_MoveResponseItem": email_security_MoveResponseItem_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MoveResponseItem": email$$security_MoveResponseItem,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -603,23 +624,20 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_investigate_release",
+    name: "emailSecurity_investigate_release",
     title: "Release messages from quarantine",
-    description: "Delivers one or more quarantined messages to their intended recipients, for cases where a message was incorrectly quarantined. Operates on an explicit list of messages; to release all messages matching a search, create a bulk action job instead. The response includes delivery status for each recipient.\n\nThis method is beta.",
+    description: "Delivers one or more quarantined messages to their intended recipients, for cases where a message was incorrectly quarantined. Operates on an explicit list of messages; to release all messages matching a search, create a bulk action job instead. The response includes delivery status for each recipient.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/investigate/release",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "description": "The messages to release, identified by their investigate IDs.",
           "properties": {
             "ids": {
               "description": "Investigate IDs of the messages to release.",
               "items": {
-                "$ref": "#/$defs/email-security_InvestigateId"
+                "description": "Unique identifier for a message retrieved from investigation.",
+                "type": "string"
               },
               "minItems": 1,
               "type": "array"
@@ -629,16 +647,26 @@ export const tools: readonly Tool[] = [
             "ids"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -661,11 +689,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId_output,
-        "email-security_PostfixId": email_security_PostfixId_output,
-        "email-security_ReleaseResponse": email_security_ReleaseResponse_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ReleaseResponse": email$$security_ReleaseResponse,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -711,12 +737,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId_output,
-        "email-security_PostfixId": email_security_PostfixId_output,
-        "email-security_ReleaseResponse": email_security_ReleaseResponse_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_ReleaseResponse": email$$security_ReleaseResponse,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/trace/outputs.ts b/src/generated/forge-mcp/emailSecurity/investigate/trace/outputs.ts
index 19fcf0d7e..bd8c5d21b 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/trace/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/trace/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email-security_MessageTrace` in responses.
  */
-export const email_security_MessageTrace_output: JsonSchema = {
+export const email$$security_MessageTrace: JsonSchema = {
   "properties": {
     "inbound": {
       "properties": {
@@ -75,7 +75,7 @@ export const email_security_MessageTrace_output: JsonSchema = {
 /**
  * The schema of `email-security_TraceLine` in responses.
  */
-export const email_security_TraceLine_output: JsonSchema = {
+export const email$$security_TraceLine: JsonSchema = {
   "properties": {
     "lineno": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/emailSecurity/investigate/trace/tools.ts b/src/generated/forge-mcp/emailSecurity/investigate/trace/tools.ts
index aa10ee2c3..96e82aff1 100644
--- a/src/generated/forge-mcp/emailSecurity/investigate/trace/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/investigate/trace/tools.ts
@@ -3,47 +3,49 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../../outputs.js";
 import {
-  email_security_InvestigateId,
-  email_security_identifier,
-} from "../../schemas.js";
-import {
-  email_security_MessageTrace_output,
-  email_security_TraceLine_output,
+  email$$security_MessageTrace,
+  email$$security_TraceLine,
 } from "./outputs.js";
 
 /**
- * The tools of `email_security.investigate.trace`.
+ * The tools of `emailSecurity.investigate.trace`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_investigate_trace_get",
+    name: "emailSecurity_investigate_trace_get",
     title: "Get email trace",
-    description: "Retrieves delivery and processing trace information for an email message. Shows the delivery path, retraction history, and move operations performed on the message. Useful for debugging delivery issues.\n\nThis method is beta.",
+    description: "Retrieves delivery and processing trace information for an email message. Shows the delivery path, retraction history, and move operations performed on the message. Useful for debugging delivery issues.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/investigate/{investigate_id}/trace",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "investigate_id": {
-          "$ref": "#/$defs/email-security_InvestigateId",
-          "description": "Unique identifier for a message retrieved from investigation."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "investigate_id": {
+              "description": "Unique identifier for a message retrieved from investigation.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "investigate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "investigate_id"
+        "path"
       ],
-      $defs: {
-        "email-security_InvestigateId": email_security_InvestigateId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -63,10 +65,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_MessageTrace": email_security_MessageTrace_output,
-        "email-security_TraceLine": email_security_TraceLine_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MessageTrace": email$$security_MessageTrace,
+        "email-security_TraceLine": email$$security_TraceLine,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -110,11 +112,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_MessageTrace": email_security_MessageTrace_output,
-        "email-security_TraceLine": email_security_TraceLine_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_MessageTrace": email$$security_MessageTrace,
+        "email-security_TraceLine": email$$security_TraceLine,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/outputs.ts b/src/generated/forge-mcp/emailSecurity/outputs.ts
index 4425253e5..dc0935652 100644
--- a/src/generated/forge-mcp/emailSecurity/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `email-security_ActionLogEntry` in responses.
  */
-export const email_security_ActionLogEntry_output: JsonSchema = {
+export const email$$security_ActionLogEntry: JsonSchema = {
   "properties": {
     "completed_at": {
       "format": "date-time",
@@ -58,7 +58,7 @@ export const email_security_ActionLogEntry_output: JsonSchema = {
 /**
  * The schema of `email-security_CursorResultInfo` in responses.
  */
-export const email_security_CursorResultInfo_output: JsonSchema = {
+export const email$$security_CursorResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -101,94 +101,10 @@ export const email_security_CursorResultInfo_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_DispositionLabel` in responses.
- */
-export const email_security_DispositionLabel_output: JsonSchema = {
-  "enum": [
-    "MALICIOUS",
-    "MALICIOUS-BEC",
-    "SUSPICIOUS",
-    "SPOOF",
-    "SPAM",
-    "BULK",
-    "ENCRYPTED",
-    "EXTERNAL",
-    "UNKNOWN",
-    "NONE"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_InvestigateId` in responses.
- */
-export const email_security_InvestigateId_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_MailboxDestination` in responses.
- */
-export const email_security_MailboxDestination_output: JsonSchema = {
-  "enum": [
-    "Inbox",
-    "JunkEmail",
-    "DeletedItems",
-    "RecoverableItemsDeletions",
-    "RecoverableItemsPurges"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_MessageDeliveryMode` in responses.
- */
-export const email_security_MessageDeliveryMode_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "DIRECT",
-        "BCC",
-        "JOURNAL",
-        "REVIEW_SUBMISSION",
-        "DMARC_UNVERIFIED",
-        "DMARC_FAILURE_REPORT",
-        "DMARC_AGGREGATE_REPORT",
-        "THREAT_INTEL_SUBMISSION",
-        "SIMULATION_SUBMISSION",
-        "API",
-        "RETRO_SCAN"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `email-security_MessageDeliveryStatus` in responses.
- */
-export const email_security_MessageDeliveryStatus_output: JsonSchema = {
-  "enum": [
-    "delivered",
-    "moved",
-    "quarantined",
-    "rejected",
-    "deferred",
-    "bounced",
-    "queued",
-    "move_failed"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_MessageDetails` in responses.
  */
-export const email_security_MessageDetails_output: JsonSchema = {
+export const email$$security_MessageDetails: JsonSchema = {
   "properties": {
     "action_log": {
       "items": {
@@ -215,7 +131,27 @@ export const email_security_MessageDetails_output: JsonSchema = {
     "delivery_mode": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_MessageDeliveryMode"
+          "oneOf": [
+            {
+              "enum": [
+                "DIRECT",
+                "BCC",
+                "JOURNAL",
+                "REVIEW_SUBMISSION",
+                "DMARC_UNVERIFIED",
+                "DMARC_FAILURE_REPORT",
+                "DMARC_AGGREGATE_REPORT",
+                "THREAT_INTEL_SUBMISSION",
+                "SIMULATION_SUBMISSION",
+                "API",
+                "RETRO_SCAN"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         {
           "type": "null"
@@ -226,7 +162,17 @@ export const email_security_MessageDetails_output: JsonSchema = {
       "oneOf": [
         {
           "items": {
-            "$ref": "#/$defs/email-security_MessageDeliveryStatus"
+            "enum": [
+              "delivered",
+              "moved",
+              "quarantined",
+              "rejected",
+              "deferred",
+              "bounced",
+              "queued",
+              "move_failed"
+            ],
+            "type": "string"
           },
           "type": "array"
         },
@@ -277,7 +223,19 @@ export const email_security_MessageDetails_output: JsonSchema = {
     "final_disposition": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_DispositionLabel"
+          "enum": [
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -312,7 +270,19 @@ export const email_security_MessageDetails_output: JsonSchema = {
               "detection": {
                 "oneOf": [
                   {
-                    "$ref": "#/$defs/email-security_DispositionLabel"
+                    "enum": [
+                      "MALICIOUS",
+                      "MALICIOUS-BEC",
+                      "SUSPICIOUS",
+                      "SPOOF",
+                      "SPAM",
+                      "BULK",
+                      "ENCRYPTED",
+                      "EXTERNAL",
+                      "UNKNOWN",
+                      "NONE"
+                    ],
+                    "type": "string"
                   },
                   {
                     "type": "null"
@@ -420,7 +390,7 @@ export const email_security_MessageDetails_output: JsonSchema = {
       ]
     },
     "id": {
-      "$ref": "#/$defs/email-security_InvestigateId"
+      "type": "string"
     },
     "is_phish_submission": {
       "type": "boolean"
@@ -458,7 +428,7 @@ export const email_security_MessageDetails_output: JsonSchema = {
       ]
     },
     "postfix_id": {
-      "$ref": "#/$defs/email-security_PostfixId"
+      "type": "string"
     },
     "postfix_id_outbound": {
       "oneOf": [
@@ -694,30 +664,10 @@ export const email_security_MessageDetails_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_PatternType` in responses.
- */
-export const email_security_PatternType_output: JsonSchema = {
-  "enum": [
-    "EMAIL",
-    "DOMAIN",
-    "IP",
-    "UNKNOWN"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_PostfixId` in responses.
- */
-export const email_security_PostfixId_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_Validation` in responses.
  */
-export const email_security_Validation_output: JsonSchema = {
+export const email$$security_Validation: JsonSchema = {
   "properties": {
     "comment": {
       "oneOf": [
@@ -732,7 +682,21 @@ export const email_security_Validation_output: JsonSchema = {
     "dkim": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_ValidationStatus"
+          "oneOf": [
+            {
+              "enum": [
+                "pass",
+                "neutral",
+                "fail",
+                "error",
+                "none"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         {
           "type": "null"
@@ -742,7 +706,21 @@ export const email_security_Validation_output: JsonSchema = {
     "dmarc": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_ValidationStatus"
+          "oneOf": [
+            {
+              "enum": [
+                "pass",
+                "neutral",
+                "fail",
+                "error",
+                "none"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         {
           "type": "null"
@@ -752,7 +730,21 @@ export const email_security_Validation_output: JsonSchema = {
     "spf": {
       "oneOf": [
         {
-          "$ref": "#/$defs/email-security_ValidationStatus"
+          "oneOf": [
+            {
+              "enum": [
+                "pass",
+                "neutral",
+                "fail",
+                "error",
+                "none"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         {
           "type": "null"
@@ -763,31 +755,10 @@ export const email_security_Validation_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_ValidationStatus` in responses.
- */
-export const email_security_ValidationStatus_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "pass",
-        "neutral",
-        "fail",
-        "error",
-        "none"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `email-security_api-response-collection` in responses.
  */
-export const email_security_api_response_collection_output: JsonSchema = {
+export const email$$security_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email-security_api-response-common"
@@ -820,7 +791,7 @@ export const email_security_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `email-security_api-response-common` in responses.
  */
-export const email_security_api_response_common_output: JsonSchema = {
+export const email$$security_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/email-security_messages"
@@ -846,7 +817,7 @@ export const email_security_api_response_common_output: JsonSchema = {
 /**
  * The schema of `email-security_api-response-common-failure` in responses.
  */
-export const email_security_api_response_common_failure_output: JsonSchema = {
+export const email$$security_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/email-security_messages"
@@ -876,7 +847,7 @@ export const email_security_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `email-security_api-response-single` in responses.
  */
-export const email_security_api_response_single_output: JsonSchema = {
+export const email$$security_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/email-security_messages"
@@ -902,7 +873,7 @@ export const email_security_api_response_single_output: JsonSchema = {
 /**
  * The schema of `email-security_messages` in responses.
  */
-export const email_security_messages_output: JsonSchema = {
+export const email$$security_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -931,11 +902,3 @@ export const email_security_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `email-security_timestamp` in responses.
- */
-export const email_security_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailSecurity/phishguard/reports/outputs.ts b/src/generated/forge-mcp/emailSecurity/phishguard/reports/outputs.ts
index d59c6a07b..45a6c6037 100644
--- a/src/generated/forge-mcp/emailSecurity/phishguard/reports/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/phishguard/reports/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email-security_PhishGuardReport` in responses.
  */
-export const email_security_PhishGuardReport_output: JsonSchema = {
+export const email$$security_PhishGuardReport: JsonSchema = {
   "properties": {
     "content": {
       "type": "string"
@@ -23,7 +23,19 @@ export const email_security_PhishGuardReport_output: JsonSchema = {
       ]
     },
     "disposition": {
-      "$ref": "#/$defs/email-security_DispositionLabel"
+      "enum": [
+        "MALICIOUS",
+        "MALICIOUS-BEC",
+        "SUSPICIOUS",
+        "SPOOF",
+        "SPAM",
+        "BULK",
+        "ENCRYPTED",
+        "EXTERNAL",
+        "UNKNOWN",
+        "NONE"
+      ],
+      "type": "string"
     },
     "fields": {
       "properties": {
@@ -119,7 +131,7 @@ export const email_security_PhishGuardReport_output: JsonSchema = {
 /**
  * The schema of `email-security_PhishGuardReportTag` in responses.
  */
-export const email_security_PhishGuardReportTag_output: JsonSchema = {
+export const email$$security_PhishGuardReportTag: JsonSchema = {
   "properties": {
     "category": {
       "type": "string"
diff --git a/src/generated/forge-mcp/emailSecurity/phishguard/reports/tools.ts b/src/generated/forge-mcp/emailSecurity/phishguard/reports/tools.ts
index 86583bdf6..fb6a90597 100644
--- a/src/generated/forge-mcp/emailSecurity/phishguard/reports/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/phishguard/reports/tools.ts
@@ -1,74 +1,85 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  email_security_DispositionLabel_output,
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../../outputs.js";
-import { email_security_identifier } from "../../schemas.js";
 import {
-  email_security_PhishGuardReportTag_output,
-  email_security_PhishGuardReport_output,
+  email$$security_PhishGuardReport,
+  email$$security_PhishGuardReportTag,
 } from "./outputs.js";
 
 /**
- * The tools of `email_security.phishguard.reports`.
+ * The tools of `emailSecurity.phishguard.reports`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_phishguard_reports_list",
+    name: "emailSecurity_phishguard_reports_list",
     title: "List PhishGuard reports",
-    description: "Retrieves PhishGuard security alert reports for a specified date range. Reports include detected threats, dispositions, and contextual information. Use for security monitoring and threat analysis.\n\nThis method is beta.",
+    description: "Retrieves PhishGuard security alert reports for a specified date range. Reports include detected threats, dispositions, and contextual information. Use for security monitoring and threat analysis.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/phishguard/reports",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "end": {
-          "description": "End of the time range (RFC3339). Takes precedence over to_date.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "from_date": {
-          "deprecated": true,
-          "description": "Deprecated, use `start` instead. Start date in YYYY-MM-DD format.",
-          "format": "date",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
-        },
-        "start": {
-          "description": "Start of the time range (RFC3339). Takes precedence over from_date.",
-          "format": "date-time",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "to_date": {
-          "deprecated": true,
-          "description": "Deprecated, use `end` instead. End date in YYYY-MM-DD format.",
-          "format": "date",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "end": {
+              "description": "End of the time range (RFC3339). Takes precedence over to_date.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "from_date": {
+              "deprecated": true,
+              "description": "Deprecated, use `start` instead. Start date in YYYY-MM-DD format.",
+              "format": "date",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "start": {
+              "description": "Start of the time range (RFC3339). Takes precedence over from_date.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "to_date": {
+              "deprecated": true,
+              "description": "Deprecated, use `end` instead. End date in YYYY-MM-DD format.",
+              "format": "date",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -91,12 +102,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_PhishGuardReport": email_security_PhishGuardReport_output,
-        "email-security_PhishGuardReportTag": email_security_PhishGuardReportTag_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_PhishGuardReport": email$$security_PhishGuardReport,
+        "email-security_PhishGuardReportTag": email$$security_PhishGuardReportTag,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -143,24 +153,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DispositionLabel": email_security_DispositionLabel_output,
-        "email-security_PhishGuardReport": email_security_PhishGuardReport_output,
-        "email-security_PhishGuardReportTag": email_security_PhishGuardReportTag_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_PhishGuardReport": email$$security_PhishGuardReport,
+        "email-security_PhishGuardReportTag": email$$security_PhishGuardReportTag,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/phishguard/reports`,
       query: [
-        ["start", args["start"], true],
-        ["end", args["end"], true],
-        ["from_date", args["from_date"], true],
-        ["to_date", args["to_date"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["start", param(args, "query", "start"), true],
+        ["end", param(args, "query", "end"), true],
+        ["from_date", param(args, "query", "from_date"), true],
+        ["to_date", param(args, "query", "to_date"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSecurity/schemas.ts b/src/generated/forge-mcp/emailSecurity/schemas.ts
deleted file mode 100644
index eed52c5dc..000000000
--- a/src/generated/forge-mcp/emailSecurity/schemas.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `email-security_DispositionLabel`.
- */
-export const email_security_DispositionLabel: JsonSchema = {
-  "description": "The verdict Email Security assigns to a message.",
-  "enum": [
-    "MALICIOUS",
-    "MALICIOUS-BEC",
-    "SUSPICIOUS",
-    "SPOOF",
-    "SPAM",
-    "BULK",
-    "ENCRYPTED",
-    "EXTERNAL",
-    "UNKNOWN",
-    "NONE"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_InvestigateId`.
- */
-export const email_security_InvestigateId: JsonSchema = {
-  "description": "Unique identifier for a message retrieved from investigation.",
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_MailboxDestination`.
- */
-export const email_security_MailboxDestination: JsonSchema = {
-  "description": "The mailbox folder to move messages to.",
-  "enum": [
-    "Inbox",
-    "JunkEmail",
-    "DeletedItems",
-    "RecoverableItemsDeletions",
-    "RecoverableItemsPurges"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_MessageDeliveryStatus`.
- */
-export const email_security_MessageDeliveryStatus: JsonSchema = {
-  "description": "Delivery status of the message.",
-  "enum": [
-    "delivered",
-    "moved",
-    "quarantined",
-    "rejected",
-    "deferred",
-    "bounced",
-    "queued",
-    "move_failed"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_PatternType`.
- */
-export const email_security_PatternType: JsonSchema = {
-  "description": "Type of pattern matching.\n- EMAIL: matches a full email address (e.g. `user@example.com`)\n- DOMAIN: matches a domain name (e.g. `example.com`)\n- IP: matches a plain IPv4 or IPv6 address (e.g. `1.2.3.4` or `2606:4700:4700::1111`) or CIDR block (e.g. `1.2.3.0/24` or `2606:4700:4700::/48`). The API rejects private or unique-local, loopback, link-local, unspecified, and IPv4 broadcast addresses, including their IPv4-mapped IPv6 equivalents.\n- UNKNOWN: deprecated; you cannot use this when creating or updating policies, but it may appear on existing entries.\n",
-  "enum": [
-    "EMAIL",
-    "DOMAIN",
-    "IP",
-    "UNKNOWN"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_PostfixId`.
- */
-export const email_security_PostfixId: JsonSchema = {
-  "description": "The identifier of the message.",
-  "type": "string"
-};
-
-/**
- * The schema of `email-security_identifier`.
- */
-export const email_security_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/outputs.ts b/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/outputs.ts
index 57de100b1..b7460bbea 100644
--- a/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_DeletedSendingDomainRestriction` in responses.
  */
-export const email_security_DeletedSendingDomainRestriction_output: JsonSchema = {
+export const email$$security_DeletedSendingDomainRestriction: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/email-security_SendingDomainRestrictionId"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
@@ -21,7 +22,7 @@ export const email_security_DeletedSendingDomainRestriction_output: JsonSchema =
 /**
  * The schema of `email-security_SendingDomainRestriction` in responses.
  */
-export const email_security_SendingDomainRestriction_output: JsonSchema = {
+export const email$$security_SendingDomainRestriction: JsonSchema = {
   "properties": {
     "comments": {
       "oneOf": [
@@ -34,7 +35,8 @@ export const email_security_SendingDomainRestriction_output: JsonSchema = {
       ]
     },
     "created_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "domain": {
       "type": "string"
@@ -46,30 +48,25 @@ export const email_security_SendingDomainRestriction_output: JsonSchema = {
       "type": "array"
     },
     "id": {
-      "$ref": "#/$defs/email-security_SendingDomainRestrictionId"
+      "format": "uuid",
+      "type": "string"
     },
     "last_modified": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `email-security_SendingDomainRestrictionId` in responses.
- */
-export const email_security_SendingDomainRestrictionId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_SendingDomainRestrictionList` in responses.
  */
-export const email_security_SendingDomainRestrictionList_output: JsonSchema = {
+export const email$$security_SendingDomainRestrictionList: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email-security_SendingDomainRestriction"
   },
diff --git a/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/schemas.ts b/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/schemas.ts
index 740df847b..83509ae24 100644
--- a/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_CreateSendingDomainRestriction`.
  */
-export const email_security_CreateSendingDomainRestriction: JsonSchema = {
+export const email$$security_CreateSendingDomainRestriction: JsonSchema = {
   "description": "Create a sending domain restriction.",
   "properties": {
     "comments": {
@@ -38,19 +38,10 @@ export const email_security_CreateSendingDomainRestriction: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_SendingDomainRestrictionId`.
- */
-export const email_security_SendingDomainRestrictionId: JsonSchema = {
-  "description": "Sending domain restriction identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_UpdateSendingDomainRestriction`.
  */
-export const email_security_UpdateSendingDomainRestriction: JsonSchema = {
+export const email$$security_UpdateSendingDomainRestriction: JsonSchema = {
   "description": "Update a sending domain restriction.",
   "properties": {
     "comments": {
diff --git a/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/tools.ts b/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/tools.ts
index fc0b0b95f..f4185daae 100644
--- a/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/sendingDomainRestrictions/tools.ts
@@ -1,54 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
-  email_security_timestamp_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
-import { email_security_identifier } from "../schemas.js";
 import {
-  email_security_DeletedSendingDomainRestriction_output,
-  email_security_SendingDomainRestrictionId_output,
-  email_security_SendingDomainRestrictionList_output,
-  email_security_SendingDomainRestriction_output,
+  email$$security_DeletedSendingDomainRestriction,
+  email$$security_SendingDomainRestriction,
+  email$$security_SendingDomainRestrictionList,
 } from "./outputs.js";
 import {
-  email_security_CreateSendingDomainRestriction,
-  email_security_SendingDomainRestrictionId,
-  email_security_UpdateSendingDomainRestriction,
+  email$$security_CreateSendingDomainRestriction,
+  email$$security_UpdateSendingDomainRestriction,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.sending_domain_restrictions`.
+ * The tools of `emailSecurity.sendingDomainRestrictions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_sending_domain_restrictions_create",
+    name: "emailSecurity_sendingDomainRestrictions_create",
     title: "Create a sending domain restriction",
-    description: "Creates a new sending domain restriction to enforce TLS requirements for a domain. Emails without TLS from this domain will be dropped unless the subdomain is in the exclude list.\n\nThis method is beta.",
+    description: "Creates a new sending domain restriction to enforce TLS requirements for a domain. Emails without TLS from this domain will be dropped unless the subdomain is in the exclude list.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/settings/sending_domain_restrictions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateSendingDomainRestriction"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateSendingDomainRestriction": email_security_CreateSendingDomainRestriction,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateSendingDomainRestriction": email$$security_CreateSendingDomainRestriction,
       },
     },
     outputSchema: {
@@ -66,11 +71,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_SendingDomainRestriction": email_security_SendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_SendingDomainRestriction": email$$security_SendingDomainRestriction,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -110,12 +113,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_SendingDomainRestriction": email_security_SendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_SendingDomainRestriction": email$$security_SendingDomainRestriction,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -124,29 +125,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_sending_domain_restrictions_delete",
+    name: "emailSecurity_sendingDomainRestrictions_delete",
     title: "Delete a sending domain restriction",
-    description: "Removes a sending domain restriction. After deletion, TLS will no longer be enforced for emails from this domain.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the sending domain restriction and removes TLS enforcement for emails from this domain.",
+    description: "Removes a sending domain restriction. After deletion, TLS will no longer be enforced for emails from this domain.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the sending domain restriction and removes TLS enforcement for emails from this domain.\n\nDELETE /accounts/{account_id}/email-security/settings/sending_domain_restrictions/{sending_domain_restriction_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "sending_domain_restriction_id": {
-          "$ref": "#/$defs/email-security_SendingDomainRestrictionId",
-          "description": "Sending domain restriction identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "sending_domain_restriction_id": {
+              "description": "Sending domain restriction identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sending_domain_restriction_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sending_domain_restriction_id"
+        "path"
       ],
-      $defs: {
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -163,10 +171,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeletedSendingDomainRestriction": email_security_DeletedSendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedSendingDomainRestriction": email$$security_DeletedSendingDomainRestriction,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -206,11 +213,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeletedSendingDomainRestriction": email_security_DeletedSendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedSendingDomainRestriction": email$$security_DeletedSendingDomainRestriction,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -218,33 +224,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_sending_domain_restrictions_edit",
+    name: "emailSecurity_sendingDomainRestrictions_edit",
     title: "Update a sending domain restriction",
-    description: "Updates an existing sending domain restriction. Only provided fields will be modified. Changes affect which domains require TLS and which subdomains are excluded.\n\nThis method is beta.",
+    description: "Updates an existing sending domain restriction. Only provided fields will be modified. Changes affect which domains require TLS and which subdomains are excluded.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/email-security/settings/sending_domain_restrictions/{sending_domain_restriction_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_UpdateSendingDomainRestriction"
         },
-        "sending_domain_restriction_id": {
-          "$ref": "#/$defs/email-security_SendingDomainRestrictionId",
-          "description": "Sending domain restriction identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "sending_domain_restriction_id": {
+              "description": "Sending domain restriction identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sending_domain_restriction_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sending_domain_restriction_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId,
-        "email-security_UpdateSendingDomainRestriction": email_security_UpdateSendingDomainRestriction,
-        "email-security_identifier": email_security_identifier,
+        "email-security_UpdateSendingDomainRestriction": email$$security_UpdateSendingDomainRestriction,
       },
     },
     outputSchema: {
@@ -262,11 +277,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_SendingDomainRestriction": email_security_SendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_SendingDomainRestriction": email$$security_SendingDomainRestriction,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -306,12 +319,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_SendingDomainRestriction": email_security_SendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_SendingDomainRestriction": email$$security_SendingDomainRestriction,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -320,29 +331,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_sending_domain_restrictions_get",
+    name: "emailSecurity_sendingDomainRestrictions_get",
     title: "Get a sending domain restriction",
-    description: "Retrieves details for a specific sending domain restriction including the domain requiring TLS and any excluded subdomains exempt from the TLS requirement.\n\nThis method is beta.",
+    description: "Retrieves details for a specific sending domain restriction including the domain requiring TLS and any excluded subdomains exempt from the TLS requirement.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/sending_domain_restrictions/{sending_domain_restriction_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "sending_domain_restriction_id": {
-          "$ref": "#/$defs/email-security_SendingDomainRestrictionId",
-          "description": "Sending domain restriction identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "sending_domain_restriction_id": {
+              "description": "Sending domain restriction identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sending_domain_restriction_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sending_domain_restriction_id"
+        "path"
       ],
-      $defs: {
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -359,11 +377,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_SendingDomainRestriction": email_security_SendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_SendingDomainRestriction": email$$security_SendingDomainRestriction,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -404,12 +420,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_SendingDomainRestriction": email_security_SendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_SendingDomainRestriction": email$$security_SendingDomainRestriction,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -417,53 +431,66 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_sending_domain_restrictions_list",
+    name: "emailSecurity_sendingDomainRestrictions_list",
     title: "List sending domain restrictions",
-    description: "Returns a paginated list of sending domain restrictions. These restrictions enforce TLS requirements for emails from specific domains. Mail without TLS from restricted domains will be dropped unless the subdomain is in the exclude list. Supports sorting and searching.\n\nThis method is beta.",
+    description: "Returns a paginated list of sending domain restrictions. These restrictions enforce TLS requirements for emails from specific domains. Mail without TLS from restricted domains will be dropped unless the subdomain is in the exclude list. Supports sorting and searching.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/sending_domain_restrictions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "The sorting direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to sort by.",
-          "enum": [
-            "domain",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+          "type": "object"
         },
-        "search": {
-          "description": "Search term for filtering records. Behavior may change.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to sort by.",
+              "enum": [
+                "domain",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search term for filtering records. Behavior may change.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -480,13 +507,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_SendingDomainRestriction": email_security_SendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_SendingDomainRestrictionList": email_security_SendingDomainRestrictionList_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_SendingDomainRestriction": email$$security_SendingDomainRestriction,
+        "email-security_SendingDomainRestrictionList": email$$security_SendingDomainRestrictionList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -527,24 +552,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_SendingDomainRestriction": email_security_SendingDomainRestriction_output,
-        "email-security_SendingDomainRestrictionId": email_security_SendingDomainRestrictionId_output,
-        "email-security_SendingDomainRestrictionList": email_security_SendingDomainRestrictionList_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_SendingDomainRestriction": email$$security_SendingDomainRestriction,
+        "email-security_SendingDomainRestrictionList": email$$security_SendingDomainRestrictionList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/settings/sending_domain_restrictions`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSecurity/submissions/outputs.ts b/src/generated/forge-mcp/emailSecurity/submissions/outputs.ts
index 9fc758592..a4a5e6188 100644
--- a/src/generated/forge-mcp/emailSecurity/submissions/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/submissions/outputs.ts
@@ -3,49 +3,43 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `email-security_CustomerStatus` in responses.
- */
-export const email_security_CustomerStatus_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "escalated",
-        "reviewed",
-        "unreviewed"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `email-security_OptionalSubmissionDisposition` in responses.
- */
-export const email_security_OptionalSubmissionDisposition_output: JsonSchema = {
-  "oneOf": [
-    {
-      "$ref": "#/$defs/email-security_SubmissionDisposition"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `email-security_Submission` in responses.
  */
-export const email_security_Submission_output: JsonSchema = {
+export const email$$security_Submission: JsonSchema = {
   "properties": {
     "customer_status": {
-      "$ref": "#/$defs/email-security_CustomerStatus"
+      "oneOf": [
+        {
+          "enum": [
+            "escalated",
+            "reviewed",
+            "unreviewed"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "escalated_as": {
-      "$ref": "#/$defs/email-security_OptionalSubmissionDisposition"
+      "oneOf": [
+        {
+          "enum": [
+            "MALICIOUS",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "NONE"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "escalated_at": {
       "oneOf": [
@@ -79,7 +73,22 @@ export const email_security_Submission_output: JsonSchema = {
       ]
     },
     "original_disposition": {
-      "$ref": "#/$defs/email-security_OptionalSubmissionDisposition"
+      "oneOf": [
+        {
+          "enum": [
+            "MALICIOUS",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "NONE"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "original_edf_hash": {
       "oneOf": [
@@ -112,7 +121,22 @@ export const email_security_Submission_output: JsonSchema = {
       ]
     },
     "outcome_disposition": {
-      "$ref": "#/$defs/email-security_OptionalSubmissionDisposition"
+      "oneOf": [
+        {
+          "enum": [
+            "MALICIOUS",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "NONE"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "requested_at": {
       "format": "date-time",
@@ -129,7 +153,22 @@ export const email_security_Submission_output: JsonSchema = {
       ]
     },
     "requested_disposition": {
-      "$ref": "#/$defs/email-security_OptionalSubmissionDisposition"
+      "oneOf": [
+        {
+          "enum": [
+            "MALICIOUS",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "NONE"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "requested_ts": {
       "type": "string"
@@ -179,25 +218,10 @@ export const email_security_Submission_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_SubmissionDisposition` in responses.
- */
-export const email_security_SubmissionDisposition_output: JsonSchema = {
-  "enum": [
-    "MALICIOUS",
-    "SUSPICIOUS",
-    "SPOOF",
-    "SPAM",
-    "BULK",
-    "NONE"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_SubmissionResult` in responses.
  */
-export const email_security_SubmissionResult_output: JsonSchema = {
+export const email$$security_SubmissionResult: JsonSchema = {
   "properties": {
     "accepted": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/emailSecurity/submissions/schemas.ts b/src/generated/forge-mcp/emailSecurity/submissions/schemas.ts
index 3c087b366..b452ad1f7 100644
--- a/src/generated/forge-mcp/emailSecurity/submissions/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/submissions/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_MissedDetectionSubmission`.
  */
-export const email_security_MissedDetectionSubmission: JsonSchema = {
+export const email$$security_MissedDetectionSubmission: JsonSchema = {
   "properties": {
     "eml_content": {
       "description": "Base64 encoded content of the EML file.",
@@ -17,16 +17,24 @@ export const email_security_MissedDetectionSubmission: JsonSchema = {
       "type": "string"
     },
     "expected_disposition": {
-      "$ref": "#/$defs/email-security_SubmissionDisposition",
-      "description": "The disposition a message is submitted to have."
+      "description": "The disposition a message is submitted to have.",
+      "enum": [
+        "MALICIOUS",
+        "SUSPICIOUS",
+        "SPOOF",
+        "SPAM",
+        "BULK",
+        "NONE"
+      ],
+      "type": "string"
     },
     "message_id": {
       "description": "Message-ID header value of the reported message.",
       "type": "string"
     },
     "postfix_id": {
-      "$ref": "#/$defs/email-security_PostfixId",
-      "description": "The identifier of the message."
+      "description": "The identifier of the message.",
+      "type": "string"
     },
     "recipient_emails": {
       "description": "Recipient email addresses of the reported message.",
@@ -49,7 +57,7 @@ export const email_security_MissedDetectionSubmission: JsonSchema = {
 /**
  * The schema of `email-security_ReclassificationSubmission`.
  */
-export const email_security_ReclassificationSubmission: JsonSchema = {
+export const email$$security_ReclassificationSubmission: JsonSchema = {
   "properties": {
     "alert_id": {
       "description": "Alert ID of the detection to reclassify.",
@@ -60,8 +68,16 @@ export const email_security_ReclassificationSubmission: JsonSchema = {
       "type": "string"
     },
     "expected_disposition": {
-      "$ref": "#/$defs/email-security_SubmissionDisposition",
-      "description": "The disposition a message is submitted to have."
+      "description": "The disposition a message is submitted to have.",
+      "enum": [
+        "MALICIOUS",
+        "SUSPICIOUS",
+        "SPOOF",
+        "SPAM",
+        "BULK",
+        "NONE"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -70,19 +86,3 @@ export const email_security_ReclassificationSubmission: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `email-security_SubmissionDisposition`.
- */
-export const email_security_SubmissionDisposition: JsonSchema = {
-  "description": "The disposition a message is submitted to have.",
-  "enum": [
-    "MALICIOUS",
-    "SUSPICIOUS",
-    "SPOOF",
-    "SPAM",
-    "BULK",
-    "NONE"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailSecurity/submissions/tools.ts b/src/generated/forge-mcp/emailSecurity/submissions/tools.ts
index 8bfdae776..b9ba38c28 100644
--- a/src/generated/forge-mcp/emailSecurity/submissions/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/submissions/tools.ts
@@ -1,45 +1,33 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_messages_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_messages,
 } from "../outputs.js";
 import {
-  email_security_PostfixId,
-  email_security_identifier,
-} from "../schemas.js";
-import {
-  email_security_CustomerStatus_output,
-  email_security_OptionalSubmissionDisposition_output,
-  email_security_SubmissionDisposition_output,
-  email_security_SubmissionResult_output,
-  email_security_Submission_output,
+  email$$security_Submission,
+  email$$security_SubmissionResult,
 } from "./outputs.js";
 import {
-  email_security_MissedDetectionSubmission,
-  email_security_ReclassificationSubmission,
-  email_security_SubmissionDisposition,
+  email$$security_MissedDetectionSubmission,
+  email$$security_ReclassificationSubmission,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.submissions`.
+ * The tools of `emailSecurity.submissions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_submissions_create",
+    name: "emailSecurity_submissions_create",
     title: "Create new submissions",
-    description: "Submits messages for reclassification or to report missed detections.\n\nThis method is beta.",
+    description: "Submits messages for reclassification or to report missed detections.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/submissions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "oneOf": [
             {
@@ -85,18 +73,29 @@ export const tools: readonly Tool[] = [
               "type": "object"
             }
           ]
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_MissedDetectionSubmission": email_security_MissedDetectionSubmission,
-        "email-security_PostfixId": email_security_PostfixId,
-        "email-security_ReclassificationSubmission": email_security_ReclassificationSubmission,
-        "email-security_SubmissionDisposition": email_security_SubmissionDisposition,
-        "email-security_identifier": email_security_identifier,
+        "email-security_MissedDetectionSubmission": email$$security_MissedDetectionSubmission,
+        "email-security_ReclassificationSubmission": email$$security_ReclassificationSubmission,
       },
     },
     outputSchema: {
@@ -128,9 +127,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_SubmissionResult": email_security_SubmissionResult_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_SubmissionResult": email$$security_SubmissionResult,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -181,10 +180,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_SubmissionResult": email_security_SubmissionResult_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_SubmissionResult": email$$security_SubmissionResult,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -193,108 +192,144 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_submissions_list",
+    name: "emailSecurity_submissions_list",
     title: "List reclassify submissions",
-    description: "Returns information for submissions made to reclassify emails. Shows the status, outcome, and disposition changes for reclassification requests made by users or the security team. Useful for tracking false positive/negative reports.\n\nThis method is beta.",
+    description: "Returns information for submissions made to reclassify emails. Shows the status, outcome, and disposition changes for reclassification requests made by users or the security team. Useful for tracking false positive/negative reports.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/submissions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "The sorting direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "end": {
-          "description": "The end of the search date range. Defaults to `now`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "escalated_from_user": {
-          "description": "When true, return only submissions that were escalated by an end user (vs. by the security team). When false, return only submissions that were not escalated by an end user. When omitted, no filter is applied.",
-          "type": "boolean"
-        },
-        "order": {
-          "default": "requested_at",
-          "description": "Field to sort by.",
-          "enum": [
-            "submission_id",
-            "subject",
-            "original_disposition",
-            "requested_disposition",
-            "outcome_disposition",
-            "requested_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "original_disposition": {
-          "$ref": "#/$defs/email-security_SubmissionDisposition",
-          "description": "The disposition a message is submitted to have."
-        },
-        "outcome_disposition": {
-          "$ref": "#/$defs/email-security_SubmissionDisposition",
-          "description": "The disposition a message is submitted to have."
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+          "type": "object"
         },
         "query": {
-          "description": "Search term for filtering submissions.",
-          "oneOf": [
-            {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
               "type": "string"
             },
-            {
-              "type": "null"
+            "end": {
+              "description": "The end of the search date range. Defaults to `now`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "escalated_from_user": {
+              "description": "When true, return only submissions that were escalated by an end user (vs. by the security team). When false, return only submissions that were not escalated by an end user. When omitted, no filter is applied.",
+              "type": "boolean"
+            },
+            "order": {
+              "default": "requested_at",
+              "description": "Field to sort by.",
+              "enum": [
+                "submission_id",
+                "subject",
+                "original_disposition",
+                "requested_disposition",
+                "outcome_disposition",
+                "requested_at"
+              ],
+              "type": "string"
+            },
+            "original_disposition": {
+              "description": "The disposition a message is submitted to have.",
+              "enum": [
+                "MALICIOUS",
+                "SUSPICIOUS",
+                "SPOOF",
+                "SPAM",
+                "BULK",
+                "NONE"
+              ],
+              "type": "string"
+            },
+            "outcome_disposition": {
+              "description": "The disposition a message is submitted to have.",
+              "enum": [
+                "MALICIOUS",
+                "SUSPICIOUS",
+                "SPOOF",
+                "SPAM",
+                "BULK",
+                "NONE"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "query": {
+              "description": "Search term for filtering submissions.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "requested_disposition": {
+              "description": "The disposition a message is submitted to have.",
+              "enum": [
+                "MALICIOUS",
+                "SUSPICIOUS",
+                "SPOOF",
+                "SPAM",
+                "BULK",
+                "NONE"
+              ],
+              "type": "string"
+            },
+            "start": {
+              "description": "The beginning of the search date range. Defaults to `now - 30 days`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter by review status — `escalated`, `reviewed`, or `unreviewed`.",
+              "type": "string"
+            },
+            "submission_id": {
+              "description": "Filter by a specific submission ID.",
+              "type": "string"
+            },
+            "type": {
+              "description": "Filter by who created the submission — `TEAM` for security team members or `USER` for end users.",
+              "enum": [
+                "TEAM",
+                "USER"
+              ],
+              "type": "string"
             }
-          ]
-        },
-        "requested_disposition": {
-          "$ref": "#/$defs/email-security_SubmissionDisposition",
-          "description": "The disposition a message is submitted to have."
-        },
-        "start": {
-          "description": "The beginning of the search date range. Defaults to `now - 30 days`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "status": {
-          "description": "Filter by review status — `escalated`, `reviewed`, or `unreviewed`.",
-          "type": "string"
-        },
-        "submission_id": {
-          "description": "Filter by a specific submission ID.",
-          "type": "string"
-        },
-        "type": {
-          "description": "Filter by who created the submission — `TEAM` for security team members or `USER` for end users.",
-          "enum": [
-            "TEAM",
-            "USER"
-          ],
-          "type": "string"
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_SubmissionDisposition": email_security_SubmissionDisposition,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -314,13 +349,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_CustomerStatus": email_security_CustomerStatus_output,
-        "email-security_OptionalSubmissionDisposition": email_security_OptionalSubmissionDisposition_output,
-        "email-security_Submission": email_security_Submission_output,
-        "email-security_SubmissionDisposition": email_security_SubmissionDisposition_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_Submission": email$$security_Submission,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -361,33 +393,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_CustomerStatus": email_security_CustomerStatus_output,
-        "email-security_OptionalSubmissionDisposition": email_security_OptionalSubmissionDisposition_output,
-        "email-security_Submission": email_security_Submission_output,
-        "email-security_SubmissionDisposition": email_security_SubmissionDisposition_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_Submission": email$$security_Submission,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/submissions`,
       query: [
-        ["start", args["start"], true],
-        ["end", args["end"], true],
-        ["type", args["type"], true],
-        ["submission_id", args["submission_id"], true],
-        ["original_disposition", args["original_disposition"], true],
-        ["requested_disposition", args["requested_disposition"], true],
-        ["outcome_disposition", args["outcome_disposition"], true],
-        ["status", args["status"], true],
-        ["query", args["query"], true],
-        ["escalated_from_user", args["escalated_from_user"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["start", param(args, "query", "start"), true],
+        ["end", param(args, "query", "end"), true],
+        ["type", param(args, "query", "type"), true],
+        ["submission_id", param(args, "query", "submission_id"), true],
+        ["original_disposition", param(args, "query", "original_disposition"), true],
+        ["requested_disposition", param(args, "query", "requested_disposition"), true],
+        ["outcome_disposition", param(args, "query", "outcome_disposition"), true],
+        ["status", param(args, "query", "status"), true],
+        ["query", param(args, "query", "query"), true],
+        ["escalated_from_user", param(args, "query", "escalated_from_user"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSecurity/trustedDomains/outputs.ts b/src/generated/forge-mcp/emailSecurity/trustedDomains/outputs.ts
index ffa71a1f0..241150ead 100644
--- a/src/generated/forge-mcp/emailSecurity/trustedDomains/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/trustedDomains/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_DeletedTrustedDomain` in responses.
  */
-export const email_security_DeletedTrustedDomain_output: JsonSchema = {
+export const email$$security_DeletedTrustedDomain: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/email-security_TrustedDomainId"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
@@ -21,7 +22,7 @@ export const email_security_DeletedTrustedDomain_output: JsonSchema = {
 /**
  * The schema of `email-security_TrustedDomain` in responses.
  */
-export const email_security_TrustedDomain_output: JsonSchema = {
+export const email$$security_TrustedDomain: JsonSchema = {
   "properties": {
     "comments": {
       "oneOf": [
@@ -34,10 +35,12 @@ export const email_security_TrustedDomain_output: JsonSchema = {
       ]
     },
     "created_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/email-security_TrustedDomainId"
+      "format": "uuid",
+      "type": "string"
     },
     "is_recent": {
       "type": "boolean"
@@ -49,10 +52,12 @@ export const email_security_TrustedDomain_output: JsonSchema = {
       "type": "boolean"
     },
     "last_modified": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "modified_at": {
-      "$ref": "#/$defs/email-security_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "pattern": {
       "type": "string"
@@ -61,18 +66,10 @@ export const email_security_TrustedDomain_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_TrustedDomainId` in responses.
- */
-export const email_security_TrustedDomainId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_TrustedDomainList` in responses.
  */
-export const email_security_TrustedDomainList_output: JsonSchema = {
+export const email$$security_TrustedDomainList: JsonSchema = {
   "items": {
     "$ref": "#/$defs/email-security_TrustedDomain"
   },
diff --git a/src/generated/forge-mcp/emailSecurity/trustedDomains/schemas.ts b/src/generated/forge-mcp/emailSecurity/trustedDomains/schemas.ts
index e0fefcf85..d5343361d 100644
--- a/src/generated/forge-mcp/emailSecurity/trustedDomains/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/trustedDomains/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_CreateTrustedDomain`.
  */
-export const email_security_CreateTrustedDomain: JsonSchema = {
+export const email$$security_CreateTrustedDomain: JsonSchema = {
   "description": "Create a trusted domain.",
   "properties": {
     "comments": {
@@ -45,19 +45,10 @@ export const email_security_CreateTrustedDomain: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-security_TrustedDomainId`.
- */
-export const email_security_TrustedDomainId: JsonSchema = {
-  "description": "Trusted domain identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `email-security_UpdateTrustedDomain`.
  */
-export const email_security_UpdateTrustedDomain: JsonSchema = {
+export const email$$security_UpdateTrustedDomain: JsonSchema = {
   "description": "Update a trusted domain.",
   "properties": {
     "comments": {
diff --git a/src/generated/forge-mcp/emailSecurity/trustedDomains/tools.ts b/src/generated/forge-mcp/emailSecurity/trustedDomains/tools.ts
index 11b3a7ba5..edd5f956d 100644
--- a/src/generated/forge-mcp/emailSecurity/trustedDomains/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/trustedDomains/tools.ts
@@ -1,43 +1,35 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
-  email_security_timestamp_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
-import { email_security_identifier } from "../schemas.js";
 import {
-  email_security_DeletedTrustedDomain_output,
-  email_security_TrustedDomainId_output,
-  email_security_TrustedDomainList_output,
-  email_security_TrustedDomain_output,
+  email$$security_DeletedTrustedDomain,
+  email$$security_TrustedDomain,
+  email$$security_TrustedDomainList,
 } from "./outputs.js";
 import {
-  email_security_CreateTrustedDomain,
-  email_security_TrustedDomainId,
-  email_security_UpdateTrustedDomain,
+  email$$security_CreateTrustedDomain,
+  email$$security_UpdateTrustedDomain,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.trusted_domains`.
+ * The tools of `emailSecurity.trustedDomains`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_trusted_domains_batch",
+    name: "emailSecurity_trustedDomains_batch",
     title: "Batch trusted domain operations",
-    description: "Executes multiple trusted domain operations atomically: delete, partially update,\nreplace, and create trusted domain patterns in a single request. All four operation\narrays (deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected trusted domain patterns and restore normal recent domain and similarity checks for matching emails.",
+    description: "Executes multiple trusted domain operations atomically: delete, partially update,\nreplace, and create trusted domain patterns in a single request. All four operation\narrays (deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected trusted domain patterns and restore normal recent domain and similarity checks for matching emails.\n\nPOST /accounts/{account_id}/email-security/settings/trusted_domains/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "deletes": {
@@ -45,8 +37,9 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "id": {
-                    "$ref": "#/$defs/email-security_TrustedDomainId",
-                    "description": "Trusted domain identifier."
+                    "description": "Trusted domain identifier.",
+                    "format": "uuid",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -67,7 +60,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_TrustedDomainId"
+                        "description": "Trusted domain identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -98,7 +93,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_TrustedDomainId"
+                        "description": "Trusted domain identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -119,17 +116,29 @@ export const tools: readonly Tool[] = [
             "puts"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateTrustedDomain": email_security_CreateTrustedDomain,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId,
-        "email-security_UpdateTrustedDomain": email_security_UpdateTrustedDomain,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateTrustedDomain": email$$security_CreateTrustedDomain,
+        "email-security_UpdateTrustedDomain": email$$security_UpdateTrustedDomain,
       },
     },
     outputSchema: {
@@ -164,13 +173,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeletedTrustedDomain": email_security_DeletedTrustedDomain_output,
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_TrustedDomainList": email_security_TrustedDomainList_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_DeletedTrustedDomain": email$$security_DeletedTrustedDomain,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_TrustedDomainList": email$$security_TrustedDomainList,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -227,14 +234,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeletedTrustedDomain": email_security_DeletedTrustedDomain_output,
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_TrustedDomainList": email_security_TrustedDomainList_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_DeletedTrustedDomain": email$$security_DeletedTrustedDomain,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_TrustedDomainList": email$$security_TrustedDomainList,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -243,27 +248,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_trusted_domains_create",
+    name: "emailSecurity_trustedDomains_create",
     title: "Create trusted email domain",
-    description: "Creates a new trusted domain pattern. Use for partner domains or approved senders that should bypass recent domain registration and similarity checks. Configure whether it prevents recent domain or spoof dispositions.\n\nThis method is beta.",
+    description: "Creates a new trusted domain pattern. Use for partner domains or approved senders that should bypass recent domain registration and similarity checks. Configure whether it prevents recent domain or spoof dispositions.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/settings/trusted_domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateTrustedDomain"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateTrustedDomain": email_security_CreateTrustedDomain,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateTrustedDomain": email$$security_CreateTrustedDomain,
       },
     },
     outputSchema: {
@@ -281,11 +295,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -325,12 +337,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -339,29 +349,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_trusted_domains_delete",
+    name: "emailSecurity_trustedDomains_delete",
     title: "Delete a trusted email domain",
-    description: "Removes a trusted domain pattern. After deletion, emails from this domain will be subject to normal recent domain and similarity checks.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the trusted domain pattern and restores normal recent domain and similarity checks for matching emails.",
+    description: "Removes a trusted domain pattern. After deletion, emails from this domain will be subject to normal recent domain and similarity checks.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the trusted domain pattern and restores normal recent domain and similarity checks for matching emails.\n\nDELETE /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "trusted_domain_id": {
-          "$ref": "#/$defs/email-security_TrustedDomainId",
-          "description": "Trusted domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "trusted_domain_id": {
+              "description": "Trusted domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trusted_domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trusted_domain_id"
+        "path"
       ],
-      $defs: {
-        "email-security_TrustedDomainId": email_security_TrustedDomainId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -378,10 +395,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeletedTrustedDomain": email_security_DeletedTrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedTrustedDomain": email$$security_DeletedTrustedDomain,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -421,11 +437,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeletedTrustedDomain": email_security_DeletedTrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedTrustedDomain": email$$security_DeletedTrustedDomain,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -433,33 +448,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_trusted_domains_edit",
+    name: "emailSecurity_trustedDomains_edit",
     title: "Update a trusted email domain",
-    description: "Updates an existing trusted domain pattern. Only provided fields will be modified. Changes take effect for new emails matching the pattern.\n\nThis method is beta.",
+    description: "Updates an existing trusted domain pattern. Only provided fields will be modified. Changes take effect for new emails matching the pattern.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_UpdateTrustedDomain"
         },
-        "trusted_domain_id": {
-          "$ref": "#/$defs/email-security_TrustedDomainId",
-          "description": "Trusted domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "trusted_domain_id": {
+              "description": "Trusted domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trusted_domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trusted_domain_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_TrustedDomainId": email_security_TrustedDomainId,
-        "email-security_UpdateTrustedDomain": email_security_UpdateTrustedDomain,
-        "email-security_identifier": email_security_identifier,
+        "email-security_UpdateTrustedDomain": email$$security_UpdateTrustedDomain,
       },
     },
     outputSchema: {
@@ -477,11 +501,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -521,12 +543,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -535,29 +555,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_trusted_domains_get",
+    name: "emailSecurity_trustedDomains_get",
     title: "Get a trusted email domain",
-    description: "Retrieves details for a specific trusted domain pattern including its pattern value, whether it uses regex matching, and which detection types it affects.\n\nThis method is beta.",
+    description: "Retrieves details for a specific trusted domain pattern including its pattern value, whether it uses regex matching, and which detection types it affects.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "trusted_domain_id": {
-          "$ref": "#/$defs/email-security_TrustedDomainId",
-          "description": "Trusted domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "trusted_domain_id": {
+              "description": "Trusted domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trusted_domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trusted_domain_id"
+        "path"
       ],
-      $defs: {
-        "email-security_TrustedDomainId": email_security_TrustedDomainId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -574,11 +601,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -619,12 +644,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -632,64 +655,77 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_trusted_domains_list",
+    name: "emailSecurity_trustedDomains_list",
     title: "List trusted email domains",
-    description: "Returns a paginated list of trusted domain patterns. Trusted domains prevent false positives for recently registered domains and lookalike domain detections. Patterns can use regular expressions for flexible matching.\n\nThis method is beta.",
+    description: "Returns a paginated list of trusted domain patterns. Trusted domains prevent false positives for recently registered domains and lookalike domain detections. Patterns can use regular expressions for flexible matching.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/trusted_domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "description": "The sorting direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "is_recent": {
-          "description": "Filter to show only recently registered domains that are trusted to prevent triggering Suspicious or Malicious dispositions.",
-          "type": "boolean"
-        },
-        "is_similarity": {
-          "description": "Filter to show only proximity domains (partner or approved domains with similar spelling to connected domains) that prevent Spoof dispositions.",
-          "type": "boolean"
-        },
-        "order": {
-          "description": "Field to sort by.",
-          "enum": [
-            "pattern",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
-        },
-        "pattern": {
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+          "type": "object"
         },
-        "search": {
-          "description": "Search term for filtering records. Behavior may change.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "is_recent": {
+              "description": "Filter to show only recently registered domains that are trusted to prevent triggering Suspicious or Malicious dispositions.",
+              "type": "boolean"
+            },
+            "is_similarity": {
+              "description": "Filter to show only proximity domains (partner or approved domains with similar spelling to connected domains) that prevent Spoof dispositions.",
+              "type": "boolean"
+            },
+            "order": {
+              "description": "Field to sort by.",
+              "enum": [
+                "pattern",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "pattern": {
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search term for filtering records. Behavior may change.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -706,13 +742,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_TrustedDomainList": email_security_TrustedDomainList_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_TrustedDomainList": email$$security_TrustedDomainList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -753,58 +787,65 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_TrustedDomainList": email_security_TrustedDomainList_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_TrustedDomainList": email$$security_TrustedDomainList,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/settings/trusted_domains`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["is_recent", args["is_recent"], true],
-        ["is_similarity", args["is_similarity"], true],
-        ["pattern", args["pattern"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["is_recent", param(args, "query", "is_recent"), true],
+        ["is_similarity", param(args, "query", "is_similarity"), true],
+        ["pattern", param(args, "query", "pattern"), true],
       ],
     }),
   },
   {
-    name: "email_security_trusted_domains_update",
+    name: "emailSecurity_trustedDomains_update",
     title: "Replace a trusted email domain",
-    description: "Replaces an existing trusted domain in full. Unlike PATCH, every field is taken from the request body, so optional fields that are omitted are reset rather than left untouched. Use this when managing trusted domains declaratively.\n\nThis method is beta.",
+    description: "Replaces an existing trusted domain in full. Unlike PATCH, every field is taken from the request body, so optional fields that are omitted are reset rather than left untouched. Use this when managing trusted domains declaratively.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateTrustedDomain"
         },
-        "trusted_domain_id": {
-          "$ref": "#/$defs/email-security_TrustedDomainId",
-          "description": "Trusted domain identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "trusted_domain_id": {
+              "description": "Trusted domain identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "trusted_domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "trusted_domain_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateTrustedDomain": email_security_CreateTrustedDomain,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateTrustedDomain": email$$security_CreateTrustedDomain,
       },
     },
     outputSchema: {
@@ -822,11 +863,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -863,12 +902,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_TrustedDomain": email_security_TrustedDomain_output,
-        "email-security_TrustedDomainId": email_security_TrustedDomainId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
-        "email-security_timestamp": email_security_timestamp_output,
+        "email-security_TrustedDomain": email$$security_TrustedDomain,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/outputs.ts b/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/outputs.ts
index 19e38d963..d0c6587ac 100644
--- a/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/outputs.ts
+++ b/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_DeletedUrlIgnorePattern` in responses.
  */
-export const email_security_DeletedUrlIgnorePattern_output: JsonSchema = {
+export const email$$security_DeletedUrlIgnorePattern: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/email-security_UrlIgnorePatternId"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
@@ -21,7 +22,7 @@ export const email_security_DeletedUrlIgnorePattern_output: JsonSchema = {
 /**
  * The schema of `email-security_UrlIgnorePattern` in responses.
  */
-export const email_security_UrlIgnorePattern_output: JsonSchema = {
+export const email$$security_UrlIgnorePattern: JsonSchema = {
   "properties": {
     "comments": {
       "oneOf": [
@@ -38,7 +39,8 @@ export const email_security_UrlIgnorePattern_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/email-security_UrlIgnorePatternId"
+      "format": "uuid",
+      "type": "string"
     },
     "last_modified": {
       "format": "date-time",
@@ -59,11 +61,3 @@ export const email_security_UrlIgnorePattern_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `email-security_UrlIgnorePatternId` in responses.
- */
-export const email_security_UrlIgnorePatternId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/schemas.ts b/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/schemas.ts
index 0f54def9d..1ebc03fde 100644
--- a/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/schemas.ts
+++ b/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email-security_CreateUrlIgnorePattern`.
  */
-export const email_security_CreateUrlIgnorePattern: JsonSchema = {
+export const email$$security_CreateUrlIgnorePattern: JsonSchema = {
   "description": "Creates a URL ignore pattern that exempts matching URLs from rewriting.",
   "properties": {
     "comments": {
@@ -34,7 +34,7 @@ export const email_security_CreateUrlIgnorePattern: JsonSchema = {
 /**
  * The schema of `email-security_UpdateUrlIgnorePattern`.
  */
-export const email_security_UpdateUrlIgnorePattern: JsonSchema = {
+export const email$$security_UpdateUrlIgnorePattern: JsonSchema = {
   "description": "Updates a URL rewrite ignore pattern; modifies only the provided fields.",
   "properties": {
     "comments": {
@@ -55,12 +55,3 @@ export const email_security_UpdateUrlIgnorePattern: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `email-security_UrlIgnorePatternId`.
- */
-export const email_security_UrlIgnorePatternId: JsonSchema = {
-  "description": "URL ignore pattern identifier.",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/tools.ts b/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/tools.ts
index 1b2ca5b86..c65d1b939 100644
--- a/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/tools.ts
+++ b/src/generated/forge-mcp/emailSecurity/urlIgnorePatterns/tools.ts
@@ -1,41 +1,34 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  email_security_api_response_collection_output,
-  email_security_api_response_common_failure_output,
-  email_security_api_response_common_output,
-  email_security_api_response_single_output,
-  email_security_messages_output,
+  email$$security_api$$response$$collection,
+  email$$security_api$$response$$common,
+  email$$security_api$$response$$common$$failure,
+  email$$security_api$$response$$single,
+  email$$security_messages,
 } from "../outputs.js";
-import { email_security_identifier } from "../schemas.js";
 import {
-  email_security_DeletedUrlIgnorePattern_output,
-  email_security_UrlIgnorePatternId_output,
-  email_security_UrlIgnorePattern_output,
+  email$$security_DeletedUrlIgnorePattern,
+  email$$security_UrlIgnorePattern,
 } from "./outputs.js";
 import {
-  email_security_CreateUrlIgnorePattern,
-  email_security_UpdateUrlIgnorePattern,
-  email_security_UrlIgnorePatternId,
+  email$$security_CreateUrlIgnorePattern,
+  email$$security_UpdateUrlIgnorePattern,
 } from "./schemas.js";
 
 /**
- * The tools of `email_security.url_ignore_patterns`.
+ * The tools of `emailSecurity.urlIgnorePatterns`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_security_url_ignore_patterns_batch",
+    name: "emailSecurity_urlIgnorePatterns_batch",
     title: "Batch URL ignore pattern operations",
-    description: "Executes multiple operations atomically. All four operation arrays\n(deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected URL rewrite ignore patterns and cause matching URLs to be rewritten again.",
+    description: "Executes multiple operations atomically. All four operation arrays\n(deletes, patches, puts, posts) are required and executed in order.\nSend empty arrays for unused operations.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation may delete the selected URL rewrite ignore patterns and cause matching URLs to be rewritten again.\n\nPOST /accounts/{account_id}/email-security/settings/url_ignore_patterns/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "deletes": {
@@ -43,8 +36,9 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "id": {
-                    "$ref": "#/$defs/email-security_UrlIgnorePatternId",
-                    "description": "URL ignore pattern identifier."
+                    "description": "URL ignore pattern identifier.",
+                    "format": "uuid",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -65,7 +59,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_UrlIgnorePatternId"
+                        "description": "URL ignore pattern identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -96,7 +92,9 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "id": {
-                        "$ref": "#/$defs/email-security_UrlIgnorePatternId"
+                        "description": "URL ignore pattern identifier.",
+                        "format": "uuid",
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -117,17 +115,29 @@ export const tools: readonly Tool[] = [
             "puts"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateUrlIgnorePattern": email_security_CreateUrlIgnorePattern,
-        "email-security_UpdateUrlIgnorePattern": email_security_UpdateUrlIgnorePattern,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateUrlIgnorePattern": email$$security_CreateUrlIgnorePattern,
+        "email-security_UpdateUrlIgnorePattern": email$$security_UpdateUrlIgnorePattern,
       },
     },
     outputSchema: {
@@ -180,11 +190,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeletedUrlIgnorePattern": email_security_DeletedUrlIgnorePattern_output,
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedUrlIgnorePattern": email$$security_DeletedUrlIgnorePattern,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -259,12 +268,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeletedUrlIgnorePattern": email_security_DeletedUrlIgnorePattern_output,
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedUrlIgnorePattern": email$$security_DeletedUrlIgnorePattern,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -273,27 +281,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_url_ignore_patterns_create",
+    name: "emailSecurity_urlIgnorePatterns_create",
     title: "Create a URL ignore pattern",
-    description: "Creates a new URL rewrite ignore pattern. URLs matching this pattern will not be rewritten.\n\nThis method is beta.",
+    description: "Creates a new URL rewrite ignore pattern. URLs matching this pattern will not be rewritten.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/email-security/settings/url_ignore_patterns",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_CreateUrlIgnorePattern"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_CreateUrlIgnorePattern": email_security_CreateUrlIgnorePattern,
-        "email-security_identifier": email_security_identifier,
+        "email-security_CreateUrlIgnorePattern": email$$security_CreateUrlIgnorePattern,
       },
     },
     outputSchema: {
@@ -311,10 +328,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -354,11 +370,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -367,29 +382,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_url_ignore_patterns_delete",
+    name: "emailSecurity_urlIgnorePatterns_delete",
     title: "Delete a URL ignore pattern",
-    description: "Removes a URL rewrite ignore pattern. After deletion, URLs matching this pattern will be rewritten again.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the URL rewrite ignore pattern and causes matching URLs to be rewritten again.",
+    description: "Removes a URL rewrite ignore pattern. After deletion, URLs matching this pattern will be rewritten again.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the URL rewrite ignore pattern and causes matching URLs to be rewritten again.\n\nDELETE /accounts/{account_id}/email-security/settings/url_ignore_patterns/{pattern_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "pattern_id": {
-          "$ref": "#/$defs/email-security_UrlIgnorePatternId",
-          "description": "URL ignore pattern identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "pattern_id": {
+              "description": "URL ignore pattern identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pattern_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pattern_id"
+        "path"
       ],
-      $defs: {
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -406,10 +428,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_DeletedUrlIgnorePattern": email_security_DeletedUrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedUrlIgnorePattern": email$$security_DeletedUrlIgnorePattern,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -449,11 +470,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_DeletedUrlIgnorePattern": email_security_DeletedUrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_DeletedUrlIgnorePattern": email$$security_DeletedUrlIgnorePattern,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -461,33 +481,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_url_ignore_patterns_edit",
+    name: "emailSecurity_urlIgnorePatterns_edit",
     title: "Update a URL ignore pattern",
-    description: "Updates an existing URL rewrite ignore pattern. Only provided fields will be modified.\n\nThis method is beta.",
+    description: "Updates an existing URL rewrite ignore pattern. Only provided fields will be modified.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/email-security/settings/url_ignore_patterns/{pattern_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/email-security_UpdateUrlIgnorePattern"
         },
-        "pattern_id": {
-          "$ref": "#/$defs/email-security_UrlIgnorePatternId",
-          "description": "URL ignore pattern identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "pattern_id": {
+              "description": "URL ignore pattern identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pattern_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pattern_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-security_UpdateUrlIgnorePattern": email_security_UpdateUrlIgnorePattern,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId,
-        "email-security_identifier": email_security_identifier,
+        "email-security_UpdateUrlIgnorePattern": email$$security_UpdateUrlIgnorePattern,
       },
     },
     outputSchema: {
@@ -505,10 +534,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -548,11 +576,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -561,29 +588,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_url_ignore_patterns_get",
+    name: "emailSecurity_urlIgnorePatterns_get",
     title: "Get a URL ignore pattern",
-    description: "Returns a single URL rewrite ignore pattern by its identifier.\n\nThis method is beta.",
+    description: "Returns a single URL rewrite ignore pattern by its identifier.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/url_ignore_patterns/{pattern_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "pattern_id": {
-          "$ref": "#/$defs/email-security_UrlIgnorePatternId",
-          "description": "URL ignore pattern identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "pattern_id": {
+              "description": "URL ignore pattern identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pattern_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pattern_id"
+        "path"
       ],
-      $defs: {
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId,
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -600,10 +634,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -644,11 +677,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_api-response-single": email_security_api_response_single_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_api-response-single": email$$security_api$$response$$single,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
@@ -656,33 +688,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_security_url_ignore_patterns_list",
+    name: "emailSecurity_urlIgnorePatterns_list",
     title: "List URL ignore patterns",
-    description: "Returns a paginated list of URL rewrite ignore patterns for the account. URLs matching these patterns will not be rewritten.\n\nThis method is beta.",
+    description: "Returns a paginated list of URL rewrite ignore patterns for the account. URLs matching these patterns will not be rewritten.\n\nThis method is beta.\n\nGET /accounts/{account_id}/email-security/settings/url_ignore_patterns",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email-security_identifier",
-          "description": "Account identifier tag."
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page within paginated list of results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "The number of results per page. Maximum value is 1000.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The number of results per page. Maximum value is 1000.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email-security_identifier": email_security_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -702,11 +747,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_messages": email$$security_messages,
       },
     },
     annotations: {
@@ -750,19 +794,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-security_UrlIgnorePattern": email_security_UrlIgnorePattern_output,
-        "email-security_UrlIgnorePatternId": email_security_UrlIgnorePatternId_output,
-        "email-security_api-response-collection": email_security_api_response_collection_output,
-        "email-security_api-response-common": email_security_api_response_common_output,
-        "email-security_api-response-common-failure": email_security_api_response_common_failure_output,
-        "email-security_messages": email_security_messages_output,
+        "email-security_UrlIgnorePattern": email$$security_UrlIgnorePattern,
+        "email-security_api-response-collection": email$$security_api$$response$$collection,
+        "email-security_api-response-common": email$$security_api$$response$$common,
+        "email-security_api-response-common-failure": email$$security_api$$response$$common$$failure,
+        "email-security_messages": email$$security_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email-security/settings/url_ignore_patterns`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSending/limits/outputs.ts b/src/generated/forge-mcp/emailSending/limits/outputs.ts
index d6cb25e5e..83e9e0b74 100644
--- a/src/generated/forge-mcp/emailSending/limits/outputs.ts
+++ b/src/generated/forge-mcp/emailSending/limits/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email_sending_limits_properties` in responses.
  */
-export const email_sending_limits_properties_output: JsonSchema = {
+export const email_sending_limits_properties: JsonSchema = {
   "properties": {
     "quota": {
       "oneOf": [
@@ -66,7 +66,7 @@ export const email_sending_limits_properties_output: JsonSchema = {
 /**
  * The schema of `email_sending_limits_response_single` in responses.
  */
-export const email_sending_limits_response_single_output: JsonSchema = {
+export const email_sending_limits_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
diff --git a/src/generated/forge-mcp/emailSending/limits/tools.ts b/src/generated/forge-mcp/emailSending/limits/tools.ts
index 44b30bfdc..c627febed 100644
--- a/src/generated/forge-mcp/emailSending/limits/tools.ts
+++ b/src/generated/forge-mcp/emailSending/limits/tools.ts
@@ -2,46 +2,49 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
+import { email_api$$response$$single, email_messages } from "../../outputs.js";
 import {
-  email_api_response_single_output,
-  email_messages_output,
-} from "../../outputs.js";
-import { email_identifier } from "../../schemas.js";
-import {
-  email_sending_limits_properties_output,
-  email_sending_limits_response_single_output,
+  email_sending_limits_properties,
+  email_sending_limits_response_single,
 } from "./outputs.js";
 
 /**
- * The tools of `email_sending.limits`.
+ * The tools of `emailSending.limits`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_sending_limits_get",
+    name: "emailSending_limits_get",
     title: "Get sending limits",
-    description: "Returns the current daily sending quota for the account and, when a quota is resolved, the account's current usage against it. Quota is null when not yet available; usage is null when there is no resolved quota or usage is temporarily unavailable.",
+    description: "Returns the current daily sending quota for the account and, when a quota is resolved, the account's current usage against it. Quota is null when not yet available; usage is null when there is no resolved quota or usage is temporarily unavailable.\n\nGET /accounts/{account_id}/email/sending/limits",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_limits_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_sending_limits_properties": email_sending_limits_properties_output,
-        "email_sending_limits_response_single": email_sending_limits_response_single_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_limits_properties": email_sending_limits_properties,
+        "email_sending_limits_response_single": email_sending_limits_response_single,
       },
     },
     annotations: {
@@ -74,10 +77,10 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_sending_limits_properties": email_sending_limits_properties_output,
-        "email_sending_limits_response_single": email_sending_limits_response_single_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_limits_properties": email_sending_limits_properties,
+        "email_sending_limits_response_single": email_sending_limits_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSending/outputs.ts b/src/generated/forge-mcp/emailSending/outputs.ts
index 2cf8dc10d..3c41d6890 100644
--- a/src/generated/forge-mcp/emailSending/outputs.ts
+++ b/src/generated/forge-mcp/emailSending/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `email-sending_EmailApiError` in responses.
  */
-export const email_sending_EmailApiError_output: JsonSchema = {
+export const email$$sending_EmailApiError: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -67,7 +67,7 @@ export const email_sending_EmailApiError_output: JsonSchema = {
 /**
  * The schema of `email-sending_EmailSendResponse` in responses.
  */
-export const email_sending_EmailSendResponse_output: JsonSchema = {
+export const email$$sending_EmailSendResponse: JsonSchema = {
   "properties": {
     "delivered": {
       "items": {
diff --git a/src/generated/forge-mcp/emailSending/reputation/outputs.ts b/src/generated/forge-mcp/emailSending/reputation/outputs.ts
index 638af7524..a4f03b64d 100644
--- a/src/generated/forge-mcp/emailSending/reputation/outputs.ts
+++ b/src/generated/forge-mcp/emailSending/reputation/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email_ReputationPolicy` in responses.
  */
-export const email_ReputationPolicy_output: JsonSchema = {
+export const email_ReputationPolicy: JsonSchema = {
   "properties": {
     "complaint": {
       "$ref": "#/$defs/email_ReputationThreshold"
@@ -33,7 +33,7 @@ export const email_ReputationPolicy_output: JsonSchema = {
 /**
  * The schema of `email_ReputationThreshold` in responses.
  */
-export const email_ReputationThreshold_output: JsonSchema = {
+export const email_ReputationThreshold: JsonSchema = {
   "properties": {
     "at_risk_at": {
       "type": "number"
@@ -56,7 +56,7 @@ export const email_ReputationThreshold_output: JsonSchema = {
 /**
  * The schema of `email_sending_reputation_properties` in responses.
  */
-export const email_sending_reputation_properties_output: JsonSchema = {
+export const email_sending_reputation_properties: JsonSchema = {
   "properties": {
     "active_policy": {
       "$ref": "#/$defs/email_ReputationPolicy"
@@ -117,7 +117,7 @@ export const email_sending_reputation_properties_output: JsonSchema = {
 /**
  * The schema of `email_sending_reputation_response_single` in responses.
  */
-export const email_sending_reputation_response_single_output: JsonSchema = {
+export const email_sending_reputation_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
diff --git a/src/generated/forge-mcp/emailSending/reputation/tools.ts b/src/generated/forge-mcp/emailSending/reputation/tools.ts
index 640f4d26d..5270eb7d1 100644
--- a/src/generated/forge-mcp/emailSending/reputation/tools.ts
+++ b/src/generated/forge-mcp/emailSending/reputation/tools.ts
@@ -2,50 +2,53 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
+import { email_api$$response$$single, email_messages } from "../../outputs.js";
 import {
-  email_api_response_single_output,
-  email_messages_output,
-} from "../../outputs.js";
-import { email_identifier } from "../../schemas.js";
-import {
-  email_ReputationPolicy_output,
-  email_ReputationThreshold_output,
-  email_sending_reputation_properties_output,
-  email_sending_reputation_response_single_output,
+  email_ReputationPolicy,
+  email_ReputationThreshold,
+  email_sending_reputation_properties,
+  email_sending_reputation_response_single,
 } from "./outputs.js";
 
 /**
- * The tools of `email_sending.reputation`.
+ * The tools of `emailSending.reputation`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_sending_reputation_get",
+    name: "emailSending_reputation_get",
     title: "Get account reputation",
-    description: "Returns the authoritative Email Sending reputation state and active evaluation policy. Accounts without an evaluation are Healthy with null evaluation timestamps.",
+    description: "Returns the authoritative Email Sending reputation state and active evaluation policy. Accounts without an evaluation are Healthy with null evaluation timestamps.\n\nGET /accounts/{account_id}/email/sending/reputation",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_reputation_response_single",
       $defs: {
-        "email_ReputationPolicy": email_ReputationPolicy_output,
-        "email_ReputationThreshold": email_ReputationThreshold_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_sending_reputation_properties": email_sending_reputation_properties_output,
-        "email_sending_reputation_response_single": email_sending_reputation_response_single_output,
+        "email_ReputationPolicy": email_ReputationPolicy,
+        "email_ReputationThreshold": email_ReputationThreshold,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_reputation_properties": email_sending_reputation_properties,
+        "email_sending_reputation_response_single": email_sending_reputation_response_single,
       },
     },
     annotations: {
@@ -78,12 +81,12 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_ReputationPolicy": email_ReputationPolicy_output,
-        "email_ReputationThreshold": email_ReputationThreshold_output,
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_sending_reputation_properties": email_sending_reputation_properties_output,
-        "email_sending_reputation_response_single": email_sending_reputation_response_single_output,
+        "email_ReputationPolicy": email_ReputationPolicy,
+        "email_ReputationThreshold": email_ReputationThreshold,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_reputation_properties": email_sending_reputation_properties,
+        "email_sending_reputation_response_single": email_sending_reputation_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSending/schemas.ts b/src/generated/forge-mcp/emailSending/schemas.ts
index 36d4e1143..6ef00380b 100644
--- a/src/generated/forge-mcp/emailSending/schemas.ts
+++ b/src/generated/forge-mcp/emailSending/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `email-sending_EmailAddressObject`.
  */
-export const email_sending_EmailAddressObject: JsonSchema = {
+export const email$$sending_EmailAddressObject: JsonSchema = {
   "properties": {
     "address": {
       "description": "Email address (e.g., 'user@example.com').",
@@ -30,18 +30,10 @@ export const email_sending_EmailAddressObject: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email-sending_EmailAddressString`.
- */
-export const email_sending_EmailAddressString: JsonSchema = {
-  "description": "An email address as a plain string.",
-  "type": "string"
-};
-
 /**
  * The schema of `email-sending_EmailAttachment`.
  */
-export const email_sending_EmailAttachment: JsonSchema = {
+export const email$$sending_EmailAttachment: JsonSchema = {
   "properties": {
     "content": {
       "description": "Base64-encoded content of the attachment.",
@@ -75,7 +67,7 @@ export const email_sending_EmailAttachment: JsonSchema = {
 /**
  * The schema of `email-sending_EmailBuilder`.
  */
-export const email_sending_EmailBuilder: JsonSchema = {
+export const email$$sending_EmailBuilder: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -97,7 +89,8 @@ export const email_sending_EmailBuilder: JsonSchema = {
           "description": "Blind carbon copy recipient(s). Optional. A single email string, a named address object, or an array of either.",
           "oneOf": [
             {
-              "$ref": "#/$defs/email-sending_EmailAddressString"
+              "description": "An email address as a plain string.",
+              "type": "string"
             },
             {
               "$ref": "#/$defs/email-sending_EmailAddressObject"
@@ -106,7 +99,8 @@ export const email_sending_EmailBuilder: JsonSchema = {
               "items": {
                 "oneOf": [
                   {
-                    "$ref": "#/$defs/email-sending_EmailAddressString"
+                    "description": "An email address as a plain string.",
+                    "type": "string"
                   },
                   {
                     "$ref": "#/$defs/email-sending_EmailAddressObject"
@@ -121,7 +115,8 @@ export const email_sending_EmailBuilder: JsonSchema = {
           "description": "Carbon copy recipient(s). Optional. A single email string, a named address object, or an array of either.",
           "oneOf": [
             {
-              "$ref": "#/$defs/email-sending_EmailAddressString"
+              "description": "An email address as a plain string.",
+              "type": "string"
             },
             {
               "$ref": "#/$defs/email-sending_EmailAddressObject"
@@ -130,7 +125,8 @@ export const email_sending_EmailBuilder: JsonSchema = {
               "items": {
                 "oneOf": [
                   {
-                    "$ref": "#/$defs/email-sending_EmailAddressString"
+                    "description": "An email address as a plain string.",
+                    "type": "string"
                   },
                   {
                     "$ref": "#/$defs/email-sending_EmailAddressObject"
@@ -145,7 +141,8 @@ export const email_sending_EmailBuilder: JsonSchema = {
           "description": "Sender email address. Either a plain string or an object with address and name.",
           "oneOf": [
             {
-              "$ref": "#/$defs/email-sending_EmailAddressString"
+              "description": "An email address as a plain string.",
+              "type": "string"
             },
             {
               "$ref": "#/$defs/email-sending_EmailAddressObject"
@@ -167,7 +164,8 @@ export const email_sending_EmailBuilder: JsonSchema = {
           "description": "Reply-to address. Either a plain string or an object with address and name.",
           "oneOf": [
             {
-              "$ref": "#/$defs/email-sending_EmailAddressString"
+              "description": "An email address as a plain string.",
+              "type": "string"
             },
             {
               "$ref": "#/$defs/email-sending_EmailAddressObject"
@@ -186,7 +184,8 @@ export const email_sending_EmailBuilder: JsonSchema = {
           "description": "Recipient(s). Optional if cc or bcc is provided. A single email string, a named address object, or an array of either.",
           "oneOf": [
             {
-              "$ref": "#/$defs/email-sending_EmailAddressString"
+              "description": "An email address as a plain string.",
+              "type": "string"
             },
             {
               "$ref": "#/$defs/email-sending_EmailAddressObject"
@@ -195,7 +194,8 @@ export const email_sending_EmailBuilder: JsonSchema = {
               "items": {
                 "oneOf": [
                   {
-                    "$ref": "#/$defs/email-sending_EmailAddressString"
+                    "description": "An email address as a plain string.",
+                    "type": "string"
                   },
                   {
                     "$ref": "#/$defs/email-sending_EmailAddressObject"
@@ -221,7 +221,7 @@ export const email_sending_EmailBuilder: JsonSchema = {
 /**
  * The schema of `email-sending_EmailInlineAttachment`.
  */
-export const email_sending_EmailInlineAttachment: JsonSchema = {
+export const email$$sending_EmailInlineAttachment: JsonSchema = {
   "properties": {
     "content": {
       "description": "Base64-encoded content of the attachment.",
@@ -260,7 +260,7 @@ export const email_sending_EmailInlineAttachment: JsonSchema = {
 /**
  * The schema of `email-sending_SendRawRequest`.
  */
-export const email_sending_SendRawRequest: JsonSchema = {
+export const email$$sending_SendRawRequest: JsonSchema = {
   "properties": {
     "from": {
       "description": "Sender email address.",
diff --git a/src/generated/forge-mcp/emailSending/subdomains/dns/outputs.ts b/src/generated/forge-mcp/emailSending/subdomains/dns/outputs.ts
index d1b1103ea..0c43235f7 100644
--- a/src/generated/forge-mcp/emailSending/subdomains/dns/outputs.ts
+++ b/src/generated/forge-mcp/emailSending/subdomains/dns/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email_sending_subdomain_dns_status_response` in responses.
  */
-export const email_sending_subdomain_dns_status_response_output: JsonSchema = {
+export const email_sending_subdomain_dns_status_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
diff --git a/src/generated/forge-mcp/emailSending/subdomains/dns/tools.ts b/src/generated/forge-mcp/emailSending/subdomains/dns/tools.ts
index 1e495158b..704f506e8 100644
--- a/src/generated/forge-mcp/emailSending/subdomains/dns/tools.ts
+++ b/src/generated/forge-mcp/emailSending/subdomains/dns/tools.ts
@@ -3,55 +3,59 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  email_api_response_collection_output,
-  email_api_response_common_output,
-  email_api_response_single_output,
-  email_dns_record_output,
-  email_dns_settings_response_collection_output,
-  email_messages_output,
+  email_api$$response$$collection,
+  email_api$$response$$common,
+  email_api$$response$$single,
+  email_dns_record,
+  email_dns_settings_response_collection,
+  email_messages,
 } from "../../../outputs.js";
-import { email_identifier } from "../../../schemas.js";
-import { email_sending_subdomain_config_error_output } from "../outputs.js";
-import { email_sending_subdomain_identifier } from "../schemas.js";
-import { email_sending_subdomain_dns_status_response_output } from "./outputs.js";
+import { email_sending_subdomain_config_error } from "../outputs.js";
+import { email_sending_subdomain_dns_status_response } from "./outputs.js";
 
 /**
- * The tools of `email_sending.subdomains.dns`.
+ * The tools of `emailSending.subdomains.dns`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_sending_subdomains_dns_fix",
+    name: "emailSending_subdomains_dns_fix",
     title: "Fix sending subdomain DNS records",
-    description: "Idempotently re-applies the sending DNS records (creates missing records, re-applies the email_routing lock on records whose lock has been cleared). Refuses with a 409 if foreign MX, multiple SPF, multiple DMARC, or multiple DKIM records exist at the relevant DNS names — those require manual cleanup.",
+    description: "Idempotently re-applies the sending DNS records (creates missing records, re-applies the email_routing lock on records whose lock has been cleared). Refuses with a 409 if foreign MX, multiple SPF, multiple DMARC, or multiple DKIM records exist at the relevant DNS names — those require manual cleanup.\n\nPOST /zones/{zone_id}/email/sending/subdomains/{subdomain_id}/dns",
     inputSchema: {
       type: "object",
       properties: {
-        "subdomain_id": {
-          "$ref": "#/$defs/email_sending_subdomain_identifier",
-          "description": "Sending subdomain identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain_id": {
+              "description": "Sending subdomain identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "subdomain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "subdomain_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_subdomain_dns_status_response",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_dns_record": email_dns_record_output,
-        "email_messages": email_messages_output,
-        "email_sending_subdomain_config_error": email_sending_subdomain_config_error_output,
-        "email_sending_subdomain_dns_status_response": email_sending_subdomain_dns_status_response_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_dns_record": email_dns_record,
+        "email_messages": email_messages,
+        "email_sending_subdomain_config_error": email_sending_subdomain_config_error,
+        "email_sending_subdomain_dns_status_response": email_sending_subdomain_dns_status_response,
       },
     },
     annotations: {
@@ -87,11 +91,11 @@ export const tools: readonly Tool[] = [
         "409": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_dns_record": email_dns_record_output,
-        "email_messages": email_messages_output,
-        "email_sending_subdomain_config_error": email_sending_subdomain_config_error_output,
-        "email_sending_subdomain_dns_status_response": email_sending_subdomain_dns_status_response_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_dns_record": email_dns_record,
+        "email_messages": email_messages,
+        "email_sending_subdomain_config_error": email_sending_subdomain_config_error,
+        "email_sending_subdomain_dns_status_response": email_sending_subdomain_dns_status_response,
       },
     },
     request: (args) => ({
@@ -99,38 +103,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_subdomains_dns_get",
+    name: "emailSending_subdomains_dns_get",
     title: "Get sending subdomain DNS records",
-    description: "Returns the expected DNS records for a sending subdomain.",
+    description: "Returns the expected DNS records for a sending subdomain.\n\nGET /zones/{zone_id}/email/sending/subdomains/{subdomain_id}/dns",
     inputSchema: {
       type: "object",
       properties: {
-        "subdomain_id": {
-          "$ref": "#/$defs/email_sending_subdomain_identifier",
-          "description": "Sending subdomain identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain_id": {
+              "description": "Sending subdomain identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "subdomain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "subdomain_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_dns_settings_response_collection",
       $defs: {
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_dns_record": email_dns_record_output,
-        "email_dns_settings_response_collection": email_dns_settings_response_collection_output,
-        "email_messages": email_messages_output,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_dns_record": email_dns_record,
+        "email_dns_settings_response_collection": email_dns_settings_response_collection,
+        "email_messages": email_messages,
       },
     },
     annotations: {
@@ -163,11 +173,11 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_dns_record": email_dns_record_output,
-        "email_dns_settings_response_collection": email_dns_settings_response_collection_output,
-        "email_messages": email_messages_output,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_dns_record": email_dns_record,
+        "email_dns_settings_response_collection": email_dns_settings_response_collection,
+        "email_messages": email_messages,
       },
     },
     request: (args) => ({
@@ -175,38 +185,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_subdomains_dns_status",
+    name: "emailSending_subdomains_dns_status",
     title: "Get sending subdomain DNS status",
-    description: "Returns the desired DNS records for a sending subdomain along with a live diff against actual DNS state. Use this to detect missing, unlocked, foreign, or multi-record conflicts before deciding whether to call the fix endpoint. For wildcard sending rows, each call also rechecks the governing organizational-domain DMARC policy and reports policy drift that DNS Fix cannot repair.",
+    description: "Returns the desired DNS records for a sending subdomain along with a live diff against actual DNS state. Use this to detect missing, unlocked, foreign, or multi-record conflicts before deciding whether to call the fix endpoint. For wildcard sending rows, each call also rechecks the governing organizational-domain DMARC policy and reports policy drift that DNS Fix cannot repair.\n\nGET /zones/{zone_id}/email/sending/subdomains/{subdomain_id}/dns/status",
     inputSchema: {
       type: "object",
       properties: {
-        "subdomain_id": {
-          "$ref": "#/$defs/email_sending_subdomain_identifier",
-          "description": "Sending subdomain identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain_id": {
+              "description": "Sending subdomain identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "subdomain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "subdomain_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_subdomain_dns_status_response",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_dns_record": email_dns_record_output,
-        "email_messages": email_messages_output,
-        "email_sending_subdomain_config_error": email_sending_subdomain_config_error_output,
-        "email_sending_subdomain_dns_status_response": email_sending_subdomain_dns_status_response_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_dns_record": email_dns_record,
+        "email_messages": email_messages,
+        "email_sending_subdomain_config_error": email_sending_subdomain_config_error,
+        "email_sending_subdomain_dns_status_response": email_sending_subdomain_dns_status_response,
       },
     },
     annotations: {
@@ -240,11 +256,11 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_dns_record": email_dns_record_output,
-        "email_messages": email_messages_output,
-        "email_sending_subdomain_config_error": email_sending_subdomain_config_error_output,
-        "email_sending_subdomain_dns_status_response": email_sending_subdomain_dns_status_response_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_dns_record": email_dns_record,
+        "email_messages": email_messages,
+        "email_sending_subdomain_config_error": email_sending_subdomain_config_error,
+        "email_sending_subdomain_dns_status_response": email_sending_subdomain_dns_status_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSending/subdomains/outputs.ts b/src/generated/forge-mcp/emailSending/subdomains/outputs.ts
index b62ee7566..1d2917ce3 100644
--- a/src/generated/forge-mcp/emailSending/subdomains/outputs.ts
+++ b/src/generated/forge-mcp/emailSending/subdomains/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `email_sending_subdomain` in responses.
  */
-export const email_sending_subdomain_output: JsonSchema = {
+export const email_sending_subdomain: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/email_created"
+      "format": "date-time",
+      "type": "string"
     },
     "dkim_selector": {
       "type": "string"
@@ -21,7 +22,8 @@ export const email_sending_subdomain_output: JsonSchema = {
       "type": "boolean"
     },
     "modified": {
-      "$ref": "#/$defs/email_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
       "type": "string"
@@ -33,7 +35,7 @@ export const email_sending_subdomain_output: JsonSchema = {
       "type": "string"
     },
     "tag": {
-      "$ref": "#/$defs/email_sending_subdomain_identifier"
+      "type": "string"
     }
   },
   "required": [
@@ -47,7 +49,7 @@ export const email_sending_subdomain_output: JsonSchema = {
 /**
  * The schema of `email_sending_subdomain_config_error` in responses.
  */
-export const email_sending_subdomain_config_error_output: JsonSchema = {
+export const email_sending_subdomain_config_error: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -88,17 +90,10 @@ export const email_sending_subdomain_config_error_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email_sending_subdomain_identifier` in responses.
- */
-export const email_sending_subdomain_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `email_sending_subdomain_preview_response` in responses.
  */
-export const email_sending_subdomain_preview_response_output: JsonSchema = {
+export const email_sending_subdomain_preview_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
@@ -131,7 +126,7 @@ export const email_sending_subdomain_preview_response_output: JsonSchema = {
 /**
  * The schema of `email_sending_subdomain_response_single` in responses.
  */
-export const email_sending_subdomain_response_single_output: JsonSchema = {
+export const email_sending_subdomain_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
@@ -150,7 +145,7 @@ export const email_sending_subdomain_response_single_output: JsonSchema = {
 /**
  * The schema of `email_sending_subdomains_response_collection` in responses.
  */
-export const email_sending_subdomains_response_collection_output: JsonSchema = {
+export const email_sending_subdomains_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-collection"
diff --git a/src/generated/forge-mcp/emailSending/subdomains/reputation/outputs.ts b/src/generated/forge-mcp/emailSending/subdomains/reputation/outputs.ts
index afd0c6c21..e04dbd8bd 100644
--- a/src/generated/forge-mcp/emailSending/subdomains/reputation/outputs.ts
+++ b/src/generated/forge-mcp/emailSending/subdomains/reputation/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `email_sending_subdomain_reputation_complaints` in responses.
  */
-export const email_sending_subdomain_reputation_complaints_output: JsonSchema = {
+export const email_sending_subdomain_reputation_complaints: JsonSchema = {
   "properties": {
     "complaints": {
       "type": "integer"
@@ -22,7 +22,7 @@ export const email_sending_subdomain_reputation_complaints_output: JsonSchema =
  * The schema of `email_sending_subdomain_reputation_complaints_response` in
  * responses.
  */
-export const email_sending_subdomain_reputation_complaints_response_output: JsonSchema = {
+export const email_sending_subdomain_reputation_complaints_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-single"
diff --git a/src/generated/forge-mcp/emailSending/subdomains/reputation/tools.ts b/src/generated/forge-mcp/emailSending/subdomains/reputation/tools.ts
index 031219d11..2f061bbc0 100644
--- a/src/generated/forge-mcp/emailSending/subdomains/reputation/tools.ts
+++ b/src/generated/forge-mcp/emailSending/subdomains/reputation/tools.ts
@@ -1,64 +1,77 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  email_api_response_single_output,
-  email_messages_output,
+  email_api$$response$$single,
+  email_messages,
 } from "../../../outputs.js";
-import { email_identifier } from "../../../schemas.js";
-import { email_sending_subdomain_identifier } from "../schemas.js";
 import {
-  email_sending_subdomain_reputation_complaints_output,
-  email_sending_subdomain_reputation_complaints_response_output,
+  email_sending_subdomain_reputation_complaints,
+  email_sending_subdomain_reputation_complaints_response,
 } from "./outputs.js";
 
 /**
- * The tools of `email_sending.subdomains.reputation`.
+ * The tools of `emailSending.subdomains.reputation`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_sending_subdomains_reputation_get_complaints",
+    name: "emailSending_subdomains_reputation_getComplaints",
     title: "Get sending subdomain complaint count",
-    description: "Returns the matched complaint count for a sending subdomain in a half-open time window of up to seven days.",
+    description: "Returns the matched complaint count for a sending subdomain in a half-open time window of up to seven days.\n\nGET /zones/{zone_id}/email/sending/subdomains/{subdomain_id}/reputation/complaints",
     inputSchema: {
       type: "object",
       properties: {
-        "end_at": {
-          "format": "date-time",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain_id": {
+              "description": "Sending subdomain identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "subdomain_id"
+          ],
+          "type": "object"
         },
-        "start_at": {
-          "format": "date-time",
-          "type": "string"
-        },
-        "subdomain_id": {
-          "$ref": "#/$defs/email_sending_subdomain_identifier",
-          "description": "Sending subdomain identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "end_at": {
+              "format": "date-time",
+              "type": "string"
+            },
+            "start_at": {
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "required": [
+            "start_at",
+            "end_at"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "subdomain_id",
-        "start_at",
-        "end_at"
+        "path",
+        "query"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_subdomain_reputation_complaints_response",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_sending_subdomain_reputation_complaints": email_sending_subdomain_reputation_complaints_output,
-        "email_sending_subdomain_reputation_complaints_response": email_sending_subdomain_reputation_complaints_response_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_subdomain_reputation_complaints": email_sending_subdomain_reputation_complaints,
+        "email_sending_subdomain_reputation_complaints_response": email_sending_subdomain_reputation_complaints_response,
       },
     },
     annotations: {
@@ -94,17 +107,17 @@ export const tools: readonly Tool[] = [
         "502": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
-        "email_sending_subdomain_reputation_complaints": email_sending_subdomain_reputation_complaints_output,
-        "email_sending_subdomain_reputation_complaints_response": email_sending_subdomain_reputation_complaints_response_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_subdomain_reputation_complaints": email_sending_subdomain_reputation_complaints,
+        "email_sending_subdomain_reputation_complaints_response": email_sending_subdomain_reputation_complaints_response,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/email/sending/subdomains/${pathParam(args, "subdomain_id")}/reputation/complaints`,
       query: [
-        ["start_at", args["start_at"], true],
-        ["end_at", args["end_at"], true],
+        ["start_at", param(args, "query", "start_at"), true],
+        ["end_at", param(args, "query", "end_at"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSending/subdomains/schemas.ts b/src/generated/forge-mcp/emailSending/subdomains/schemas.ts
index 3403f1b17..47d47dcec 100644
--- a/src/generated/forge-mcp/emailSending/subdomains/schemas.ts
+++ b/src/generated/forge-mcp/emailSending/subdomains/schemas.ts
@@ -19,22 +19,14 @@ export const email_create_sending_subdomain_properties: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email_sending_subdomain_identifier`.
- */
-export const email_sending_subdomain_identifier: JsonSchema = {
-  "description": "Sending subdomain identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `email_update_sending_subdomain_properties`.
  */
 export const email_update_sending_subdomain_properties: JsonSchema = {
-  "description": "At least one of `preview_enabled` or `drop_suppressed_recipients` must\nbe provided. A field omitted from the request body is left unchanged.\n",
+  "description": "At least one of `preview_enabled` or `drop_suppressed_recipients` must\nbe provided. A field omitted from the request body is left unchanged.",
   "properties": {
     "drop_suppressed_recipients": {
-      "description": "Whether a send request that includes a recipient suppressed on\nthis subdomain drops that recipient and still delivers to the\nrest, instead of failing the entire request.\n",
+      "description": "Whether a send request that includes a recipient suppressed on\nthis subdomain drops that recipient and still delivers to the\nrest, instead of failing the entire request.",
       "type": "boolean"
     },
     "preview_enabled": {
diff --git a/src/generated/forge-mcp/emailSending/subdomains/tools.ts b/src/generated/forge-mcp/emailSending/subdomains/tools.ts
index 60d0f045a..1aa3b0f20 100644
--- a/src/generated/forge-mcp/emailSending/subdomains/tools.ts
+++ b/src/generated/forge-mcp/emailSending/subdomains/tools.ts
@@ -3,67 +3,68 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  email_api_response_collection_output,
-  email_api_response_common_output,
-  email_api_response_single_output,
-  email_created_output,
-  email_dns_record_output,
-  email_messages_output,
-  email_modified_output,
+  email_api$$response$$collection,
+  email_api$$response$$common,
+  email_api$$response$$single,
+  email_dns_record,
+  email_messages,
 } from "../../outputs.js";
-import { email_identifier } from "../../schemas.js";
 import {
-  email_sending_subdomain_config_error_output,
-  email_sending_subdomain_identifier_output,
-  email_sending_subdomain_output,
-  email_sending_subdomain_preview_response_output,
-  email_sending_subdomain_response_single_output,
-  email_sending_subdomains_response_collection_output,
+  email_sending_subdomain,
+  email_sending_subdomain_config_error,
+  email_sending_subdomain_preview_response,
+  email_sending_subdomain_response_single,
+  email_sending_subdomains_response_collection,
 } from "./outputs.js";
 import {
   email_create_sending_subdomain_properties,
-  email_sending_subdomain_identifier,
   email_update_sending_subdomain_properties,
 } from "./schemas.js";
 
 /**
- * The tools of `email_sending.subdomains`.
+ * The tools of `emailSending.subdomains`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_sending_subdomains_create",
+    name: "emailSending_subdomains_create",
     title: "Create a sending subdomain",
-    description: "Creates a new sending subdomain or re-enables sending on an existing subdomain that had it disabled. If zone-level Email Sending has not been enabled yet, the zone flag is automatically set when the entitlement is present. A leftmost wildcard such as `*.example.com` is accepted only for accounts with wildcard Email Sending enabled. Wildcard senders share the base domain's DKIM signing identity and `cf-bounce.<base>` return path.",
+    description: "Creates a new sending subdomain or re-enables sending on an existing subdomain that had it disabled. If zone-level Email Sending has not been enabled yet, the zone flag is automatically set when the entitlement is present. A leftmost wildcard such as `*.example.com` is accepted only for accounts with wildcard Email Sending enabled. Wildcard senders share the base domain's DKIM signing identity and `cf-bounce.<base>` return path.\n\nPOST /zones/{zone_id}/email/sending/subdomains",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_create_sending_subdomain_properties"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "email_create_sending_subdomain_properties": email_create_sending_subdomain_properties,
-        "email_identifier": email_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_subdomain_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_sending_subdomain": email_sending_subdomain_output,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier_output,
-        "email_sending_subdomain_response_single": email_sending_subdomain_response_single_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_subdomain": email_sending_subdomain,
+        "email_sending_subdomain_response_single": email_sending_subdomain_response_single,
       },
     },
     annotations: {
@@ -96,13 +97,10 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_sending_subdomain": email_sending_subdomain_output,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier_output,
-        "email_sending_subdomain_response_single": email_sending_subdomain_response_single_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_subdomain": email_sending_subdomain,
+        "email_sending_subdomain_response_single": email_sending_subdomain_response_single,
       },
     },
     request: (args) => ({
@@ -111,35 +109,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_subdomains_delete",
+    name: "emailSending_subdomains_delete",
     title: "Delete a sending subdomain",
-    description: "Disables sending on a subdomain and removes its DNS records. If routing is still active on the subdomain, only sending is disabled.\n\nConfirm with the user before calling this tool. This operation disables sending and removes the subdomain's Email Sending DNS records.",
+    description: "Disables sending on a subdomain and removes its DNS records. If routing is still active on the subdomain, only sending is disabled.\n\nConfirm with the user before calling this tool. This operation disables sending and removes the subdomain's Email Sending DNS records.\n\nDELETE /zones/{zone_id}/email/sending/subdomains/{subdomain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "subdomain_id": {
-          "$ref": "#/$defs/email_sending_subdomain_identifier",
-          "description": "Sending subdomain identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain_id": {
+              "description": "Sending subdomain identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "subdomain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "subdomain_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_api-response-single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
       },
     },
     annotations: {
@@ -172,8 +176,8 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_messages": email_messages_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
       },
     },
     request: (args) => ({
@@ -181,40 +185,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_subdomains_get",
+    name: "emailSending_subdomains_get",
     title: "Get a sending subdomain",
-    description: "Gets information for a specific sending subdomain.",
+    description: "Gets information for a specific sending subdomain.\n\nGET /zones/{zone_id}/email/sending/subdomains/{subdomain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "subdomain_id": {
-          "$ref": "#/$defs/email_sending_subdomain_identifier",
-          "description": "Sending subdomain identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain_id": {
+              "description": "Sending subdomain identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "subdomain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "subdomain_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_subdomain_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_sending_subdomain": email_sending_subdomain_output,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier_output,
-        "email_sending_subdomain_response_single": email_sending_subdomain_response_single_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_subdomain": email_sending_subdomain,
+        "email_sending_subdomain_response_single": email_sending_subdomain_response_single,
       },
     },
     annotations: {
@@ -247,13 +254,10 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_sending_subdomain": email_sending_subdomain_output,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier_output,
-        "email_sending_subdomain_response_single": email_sending_subdomain_response_single_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_subdomain": email_sending_subdomain,
+        "email_sending_subdomain_response_single": email_sending_subdomain_response_single,
       },
     },
     request: (args) => ({
@@ -261,35 +265,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_subdomains_list",
+    name: "emailSending_subdomains_list",
     title: "List sending subdomains",
-    description: "Lists all sending-enabled subdomains for the zone.",
+    description: "Lists all sending-enabled subdomains for the zone.\n\nGET /zones/{zone_id}/email/sending/subdomains",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "email_identifier": email_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_subdomains_response_collection",
       $defs: {
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_created": email_created_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_sending_subdomain": email_sending_subdomain_output,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier_output,
-        "email_sending_subdomains_response_collection": email_sending_subdomains_response_collection_output,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_messages": email_messages,
+        "email_sending_subdomain": email_sending_subdomain,
+        "email_sending_subdomains_response_collection": email_sending_subdomains_response_collection,
       },
     },
     annotations: {
@@ -322,14 +330,11 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-collection": email_api_response_collection_output,
-        "email_api-response-common": email_api_response_common_output,
-        "email_created": email_created_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_sending_subdomain": email_sending_subdomain_output,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier_output,
-        "email_sending_subdomains_response_collection": email_sending_subdomains_response_collection_output,
+        "email_api-response-collection": email_api$$response$$collection,
+        "email_api-response-common": email_api$$response$$common,
+        "email_messages": email_messages,
+        "email_sending_subdomain": email_sending_subdomain,
+        "email_sending_subdomains_response_collection": email_sending_subdomains_response_collection,
       },
     },
     request: (args) => ({
@@ -337,37 +342,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_subdomains_preview",
+    name: "emailSending_subdomains_preview",
     title: "Preview sending subdomain DNS",
-    description: "Returns the DNS records that would be created for a sending subdomain, flags which records are missing, and reports any conflicts with existing DNS records. This is a read-only dry-run — no records are created or modified. Use before or after creating a subdomain to check DNS status. A leftmost wildcard requires wildcard Email Sending to be enabled for the account and previews base-scoped DKIM and return-path records.",
+    description: "Returns the DNS records that would be created for a sending subdomain, flags which records are missing, and reports any conflicts with existing DNS records. This is a read-only dry-run — no records are created or modified. Use before or after creating a subdomain to check DNS status. A leftmost wildcard requires wildcard Email Sending to be enabled for the account and previews base-scoped DKIM and return-path records.\n\nPOST /zones/{zone_id}/email/sending/subdomains/preview",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_create_sending_subdomain_properties"
         },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "email_create_sending_subdomain_properties": email_create_sending_subdomain_properties,
-        "email_identifier": email_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_subdomain_preview_response",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_dns_record": email_dns_record_output,
-        "email_messages": email_messages_output,
-        "email_sending_subdomain_config_error": email_sending_subdomain_config_error_output,
-        "email_sending_subdomain_preview_response": email_sending_subdomain_preview_response_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_dns_record": email_dns_record,
+        "email_messages": email_messages,
+        "email_sending_subdomain_config_error": email_sending_subdomain_config_error,
+        "email_sending_subdomain_preview_response": email_sending_subdomain_preview_response,
       },
     },
     annotations: {
@@ -400,11 +414,11 @@ export const tools: readonly Tool[] = [
         "403": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_dns_record": email_dns_record_output,
-        "email_messages": email_messages_output,
-        "email_sending_subdomain_config_error": email_sending_subdomain_config_error_output,
-        "email_sending_subdomain_preview_response": email_sending_subdomain_preview_response_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_dns_record": email_dns_record,
+        "email_messages": email_messages,
+        "email_sending_subdomain_config_error": email_sending_subdomain_config_error,
+        "email_sending_subdomain_preview_response": email_sending_subdomain_preview_response,
       },
     },
     request: (args) => ({
@@ -413,45 +427,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_subdomains_update",
+    name: "emailSending_subdomains_update",
     title: "Update a sending subdomain",
-    description: "Updates the activity-log preview preference for a sending subdomain.",
+    description: "Updates the activity-log preview preference for a sending subdomain.\n\nPATCH /zones/{zone_id}/email/sending/subdomains/{subdomain_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/email_update_sending_subdomain_properties"
         },
-        "subdomain_id": {
-          "$ref": "#/$defs/email_sending_subdomain_identifier",
-          "description": "Sending subdomain identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/email_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "subdomain_id": {
+              "description": "Sending subdomain identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "subdomain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "subdomain_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email_identifier": email_identifier,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier,
         "email_update_sending_subdomain_properties": email_update_sending_subdomain_properties,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/email_sending_subdomain_response_single",
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_sending_subdomain": email_sending_subdomain_output,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier_output,
-        "email_sending_subdomain_response_single": email_sending_subdomain_response_single_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_subdomain": email_sending_subdomain,
+        "email_sending_subdomain_response_single": email_sending_subdomain_response_single,
       },
     },
     annotations: {
@@ -484,13 +503,10 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "email_api-response-single": email_api_response_single_output,
-        "email_created": email_created_output,
-        "email_messages": email_messages_output,
-        "email_modified": email_modified_output,
-        "email_sending_subdomain": email_sending_subdomain_output,
-        "email_sending_subdomain_identifier": email_sending_subdomain_identifier_output,
-        "email_sending_subdomain_response_single": email_sending_subdomain_response_single_output,
+        "email_api-response-single": email_api$$response$$single,
+        "email_messages": email_messages,
+        "email_sending_subdomain": email_sending_subdomain,
+        "email_sending_subdomain_response_single": email_sending_subdomain_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/emailSending/suppressions/tools.ts b/src/generated/forge-mcp/emailSending/suppressions/tools.ts
index de6cc95fd..7d7689fdf 100644
--- a/src/generated/forge-mcp/emailSending/suppressions/tools.ts
+++ b/src/generated/forge-mcp/emailSending/suppressions/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `email_sending.suppressions`.
+ * The tools of `emailSending.suppressions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_sending_suppressions_create",
+    name: "emailSending_suppressions_create",
     title: "Create account Email Sending suppression",
-    description: "Creates a suppression for every sending domain of the account (default) or for one sending domain (`scope.type = sending_domain`). Creating an existing active suppression returns its identifier. If a mutable legacy zone-linked account row already exists, it is promoted without changing its identifier.",
+    description: "Creates a suppression for every sending domain of the account (default) or for one sending domain (`scope.type = sending_domain`). Creating an existing active suppression returns its identifier. If a mutable legacy zone-linked account row already exists, it is promoted without changing its identifier.\n\nPOST /accounts/{account_id}/email/sending/suppressions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "email": {
@@ -85,11 +81,25 @@ export const tools: readonly Tool[] = [
             "email"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -438,26 +448,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_suppressions_delete",
+    name: "emailSending_suppressions_delete",
     title: "Delete account Email Sending suppression",
-    description: "Deletes the suppression, its note, and every legacy internal zone membership, allowing future delivery attempts to the address.\n\nConfirm with the user before calling this tool. This operation removes an Email Sending suppression and may allow email delivery to resume for the address.",
+    description: "Deletes the suppression, its note, and every legacy internal zone membership, allowing future delivery attempts to the address.\n\nConfirm with the user before calling this tool. This operation removes an Email Sending suppression and may allow email delivery to resume for the address.\n\nDELETE /accounts/{account_id}/email/sending/suppressions/{suppression_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "suppression_id": {
-          "description": "The suppression's identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "suppression_id": {
+              "description": "The suppression's identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "suppression_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "suppression_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -805,16 +825,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_suppressions_edit",
+    name: "emailSending_suppressions_edit",
     title: "Update account Email Sending suppression",
-    description: "Updates expiry or advisory note fields without changing legacy internal zone memberships. Scope cannot be changed.",
+    description: "Updates expiry or advisory note fields without changing legacy internal zone memberships. Scope cannot be changed.\n\nPATCH /accounts/{account_id}/email/sending/suppressions/{suppression_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "expires_at": {
@@ -840,16 +856,30 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "suppression_id": {
-          "description": "The suppression's identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "suppression_id": {
+              "description": "The suppression's identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "suppression_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "suppression_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1231,26 +1261,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_suppressions_get",
+    name: "emailSending_suppressions_get",
     title: "Get account Email Sending suppression",
-    description: "Gets an Email Sending suppression owned by the account.",
+    description: "Gets an Email Sending suppression owned by the account.\n\nGET /accounts/{account_id}/email/sending/suppressions/{suppression_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "suppression_id": {
-          "description": "The suppression's identifier.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "suppression_id": {
+              "description": "The suppression's identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "suppression_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "suppression_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1541,16 +1581,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_suppressions_import",
+    name: "emailSending_suppressions_import",
     title: "Bulk import account Email Sending suppressions",
-    description: "Imports up to 1,000 Email Sending suppressions in one request. Each item applies to every sending domain of the account (default) or to one sending domain.",
+    description: "Imports up to 1,000 Email Sending suppressions in one request. Each item applies to every sending domain of the account (default) or to one sending domain.\n\nPOST /accounts/{account_id}/email/sending/suppressions/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "items": {
@@ -1631,11 +1667,25 @@ export const tools: readonly Tool[] = [
             "items"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1957,60 +2007,76 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_suppressions_list",
+    name: "emailSending_suppressions_list",
     title: "List account Email Sending suppressions",
-    description: "Lists every active Email Sending suppression owned by the account: sending-domain suppressions first, then account-wide suppressions (including legacy rows with internal zone memberships). Each group is newest first.",
+    description: "Lists every active Email Sending suppression owned by the account: sending-domain suppressions first, then account-wide suppressions (including legacy rows with internal zone memberships). Each group is newest first.\n\nGET /accounts/{account_id}/email/sending/suppressions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque pagination cursor returned as `result_info.next_cursor`. It carries the filters that produced it.",
-          "type": "string"
-        },
-        "email": {
-          "description": "Exact email-address filter.",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Maximum number of suppressions to return per page.",
-          "type": "integer"
-        },
-        "reason": {
-          "description": "Filter to suppressions with this reason.",
-          "enum": [
-            "manual",
-            "complaint",
-            "hard_bounce",
-            "soft_bounce",
-            "policy"
-          ],
-          "type": "string"
-        },
-        "scope_type": {
-          "description": "Filter by scope: `account` returns only account-wide suppressions, `sending_domain` only sending-domain suppressions. Omit to list both, sending-domain suppressions first.",
-          "enum": [
-            "account",
-            "sending_domain"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "scope_value": {
-          "description": "Exact sending-domain filter. Requires `scope_type=sending_domain`.",
-          "type": "string"
+          "type": "object"
         },
-        "search": {
-          "description": "A complete address is an exact match; a value ending in `@` matches that username across every domain. Prefix searches may return short intermediate pages while the bounded account scan advances.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque pagination cursor returned as `result_info.next_cursor`. It carries the filters that produced it.",
+              "type": "string"
+            },
+            "email": {
+              "description": "Exact email-address filter.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Maximum number of suppressions to return per page.",
+              "type": "integer"
+            },
+            "reason": {
+              "description": "Filter to suppressions with this reason.",
+              "enum": [
+                "manual",
+                "complaint",
+                "hard_bounce",
+                "soft_bounce",
+                "policy"
+              ],
+              "type": "string"
+            },
+            "scope_type": {
+              "description": "Filter by scope: `account` returns only account-wide suppressions, `sending_domain` only sending-domain suppressions. Omit to list both, sending-domain suppressions first.",
+              "enum": [
+                "account",
+                "sending_domain"
+              ],
+              "type": "string"
+            },
+            "scope_value": {
+              "description": "Exact sending-domain filter. Requires `scope_type=sending_domain`.",
+              "type": "string"
+            },
+            "search": {
+              "description": "A complete address is an exact match; a value ending in `@` matches that username across every domain. Prefix searches may return short intermediate pages while the bounded account scan advances.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2359,13 +2425,13 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/email/sending/suppressions`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["cursor", args["cursor"], true],
-        ["email", args["email"], true],
-        ["search", args["search"], true],
-        ["reason", args["reason"], true],
-        ["scope_type", args["scope_type"], true],
-        ["scope_value", args["scope_value"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["email", param(args, "query", "email"), true],
+        ["search", param(args, "query", "search"), true],
+        ["reason", param(args, "query", "reason"), true],
+        ["scope_type", param(args, "query", "scope_type"), true],
+        ["scope_value", param(args, "query", "scope_value"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/emailSending/tools.ts b/src/generated/forge-mcp/emailSending/tools.ts
index d5fa6dd7b..91f3f21fe 100644
--- a/src/generated/forge-mcp/emailSending/tools.ts
+++ b/src/generated/forge-mcp/emailSending/tools.ts
@@ -3,40 +3,49 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  email_sending_EmailApiError_output,
-  email_sending_EmailSendResponse_output,
+  email$$sending_EmailApiError,
+  email$$sending_EmailSendResponse,
 } from "./outputs.js";
 import {
-  email_sending_EmailAddressObject,
-  email_sending_EmailAddressString,
-  email_sending_EmailAttachment,
-  email_sending_EmailBuilder,
-  email_sending_EmailInlineAttachment,
-  email_sending_SendRawRequest,
+  email$$sending_EmailAddressObject,
+  email$$sending_EmailAttachment,
+  email$$sending_EmailBuilder,
+  email$$sending_EmailInlineAttachment,
+  email$$sending_SendRawRequest,
 } from "./schemas.js";
 
 /**
- * The tools of `email_sending`.
+ * The tools of `emailSending`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "email_sending_get",
+    name: "emailSending_get",
     title: "Fetch an email message",
-    description: "Returns the raw RFC 5322 MIME message for the given account and message id.",
+    description: "Returns the raw RFC 5322 MIME message for the given account and message id.\n\nGET /accounts/{account_id}/email/sending/messages/{message_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "message_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "message_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "message_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "message_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -71,7 +80,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-sending_EmailApiError": email_sending_EmailApiError_output,
+        "email-sending_EmailApiError": email$$sending_EmailApiError,
       },
     },
     request: (args) => ({
@@ -79,30 +88,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_send",
+    name: "emailSending_send",
     title: "Send an email",
-    description: "Send an email for the specified account using the structured builder. Provide the sender, recipients, subject, and at least one of text or html; attachments are optional.",
+    description: "Send an email for the specified account using the structured builder. Provide the sender, recipients, subject, and at least one of text or html; attachments are optional.\n\nPOST /accounts/{account_id}/email/sending/send",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Identifier of the account.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/email-sending_EmailBuilder"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-sending_EmailAddressObject": email_sending_EmailAddressObject,
-        "email-sending_EmailAddressString": email_sending_EmailAddressString,
-        "email-sending_EmailAttachment": email_sending_EmailAttachment,
-        "email-sending_EmailBuilder": email_sending_EmailBuilder,
-        "email-sending_EmailInlineAttachment": email_sending_EmailInlineAttachment,
+        "email-sending_EmailAddressObject": email$$sending_EmailAddressObject,
+        "email-sending_EmailAttachment": email$$sending_EmailAttachment,
+        "email-sending_EmailBuilder": email$$sending_EmailBuilder,
+        "email-sending_EmailInlineAttachment": email$$sending_EmailInlineAttachment,
       },
     },
     outputSchema: {
@@ -186,7 +204,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "email-sending_EmailSendResponse": email_sending_EmailSendResponse_output,
+        "email-sending_EmailSendResponse": email$$sending_EmailSendResponse,
       },
     },
     annotations: {
@@ -572,7 +590,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-sending_EmailSendResponse": email_sending_EmailSendResponse_output,
+        "email-sending_EmailSendResponse": email$$sending_EmailSendResponse,
       },
     },
     request: (args) => ({
@@ -581,26 +599,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "email_sending_send_raw",
+    name: "emailSending_sendRaw",
     title: "Send a raw MIME email",
-    description: "Send a raw RFC 5322 (MIME) email for the specified account. Provide the full MIME message plus the SMTP envelope (from and recipients).",
+    description: "Send a raw RFC 5322 (MIME) email for the specified account. Provide the full MIME message plus the SMTP envelope (from and recipients).\n\nPOST /accounts/{account_id}/email/sending/send_raw",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Identifier of the account.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/email-sending_SendRawRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "email-sending_SendRawRequest": email_sending_SendRawRequest,
+        "email-sending_SendRawRequest": email$$sending_SendRawRequest,
       },
     },
     outputSchema: {
@@ -684,7 +712,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "email-sending_EmailSendResponse": email_sending_EmailSendResponse_output,
+        "email-sending_EmailSendResponse": email$$sending_EmailSendResponse,
       },
     },
     annotations: {
@@ -1070,7 +1098,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "email-sending_EmailSendResponse": email_sending_EmailSendResponse_output,
+        "email-sending_EmailSendResponse": email$$sending_EmailSendResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/fieldExtractors/outputs.ts b/src/generated/forge-mcp/fieldExtractors/outputs.ts
index 2d8860d1a..5aa9096c9 100644
--- a/src/generated/forge-mcp/fieldExtractors/outputs.ts
+++ b/src/generated/forge-mcp/fieldExtractors/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `field-extractors_ApiError` in responses.
  */
-export const field_extractors_ApiError_output: JsonSchema = {
+export const field$$extractors_ApiError: JsonSchema = {
   "properties": {
     "code": {
       "type": "number"
@@ -36,7 +36,7 @@ export const field_extractors_ApiError_output: JsonSchema = {
 /**
  * The schema of `field-extractors_DeleteResponse` in responses.
  */
-export const field_extractors_DeleteResponse_output: JsonSchema = {
+export const field$$extractors_DeleteResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -91,7 +91,7 @@ export const field_extractors_DeleteResponse_output: JsonSchema = {
 /**
  * The schema of `field-extractors_ErrorResponse` in responses.
  */
-export const field_extractors_ErrorResponse_output: JsonSchema = {
+export const field$$extractors_ErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -146,7 +146,7 @@ export const field_extractors_ErrorResponse_output: JsonSchema = {
 /**
  * The schema of `field-extractors_ExtractorResult` in responses.
  */
-export const field_extractors_ExtractorResult_output: JsonSchema = {
+export const field$$extractors_ExtractorResult: JsonSchema = {
   "properties": {
     "extractor": {
       "type": "string"
@@ -169,7 +169,7 @@ export const field_extractors_ExtractorResult_output: JsonSchema = {
 /**
  * The schema of `field-extractors_FieldOutput` in responses.
  */
-export const field_extractors_FieldOutput_output: JsonSchema = {
+export const field$$extractors_FieldOutput: JsonSchema = {
   "properties": {
     "expression": {
       "type": "string"
@@ -188,7 +188,7 @@ export const field_extractors_FieldOutput_output: JsonSchema = {
 /**
  * The schema of `field-extractors_RuleOutput` in responses.
  */
-export const field_extractors_RuleOutput_output: JsonSchema = {
+export const field$$extractors_RuleOutput: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -213,7 +213,7 @@ export const field_extractors_RuleOutput_output: JsonSchema = {
 /**
  * The schema of `field-extractors_SuccessResponse` in responses.
  */
-export const field_extractors_SuccessResponse_output: JsonSchema = {
+export const field$$extractors_SuccessResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/fieldExtractors/tools.ts b/src/generated/forge-mcp/fieldExtractors/tools.ts
index 703d16cc3..b8afe8424 100644
--- a/src/generated/forge-mcp/fieldExtractors/tools.ts
+++ b/src/generated/forge-mcp/fieldExtractors/tools.ts
@@ -3,45 +3,55 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  field_extractors_ApiError_output,
-  field_extractors_DeleteResponse_output,
-  field_extractors_ErrorResponse_output,
-  field_extractors_ExtractorResult_output,
-  field_extractors_FieldOutput_output,
-  field_extractors_RuleOutput_output,
-  field_extractors_SuccessResponse_output,
+  field$$extractors_ApiError,
+  field$$extractors_DeleteResponse,
+  field$$extractors_ErrorResponse,
+  field$$extractors_ExtractorResult,
+  field$$extractors_FieldOutput,
+  field$$extractors_RuleOutput,
+  field$$extractors_SuccessResponse,
 } from "./outputs.js";
 
 /**
- * The tools of `field_extractors`.
+ * The tools of `fieldExtractors`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "field_extractors_delete",
+    name: "fieldExtractors_delete",
     title: "Delete Field Extractor",
-    description: "Deletes all custom extraction rules for an extractor type.\n\nThis method is alpha.",
+    description: "Deletes all custom extraction rules for an extractor type.\n\nThis method is alpha.\n\nDELETE /accounts/{account_id}/field_extractors/{extractor}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "extractor": {
-          "description": "Extractor type.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "extractor": {
+              "description": "Extractor type.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "extractor"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "extractor"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/field-extractors_DeleteResponse",
       $defs: {
-        "field-extractors_ApiError": field_extractors_ApiError_output,
-        "field-extractors_DeleteResponse": field_extractors_DeleteResponse_output,
+        "field-extractors_ApiError": field$$extractors_ApiError,
+        "field-extractors_DeleteResponse": field$$extractors_DeleteResponse,
       },
     },
     annotations: {
@@ -63,9 +73,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "field-extractors_ApiError": field_extractors_ApiError_output,
-        "field-extractors_DeleteResponse": field_extractors_DeleteResponse_output,
-        "field-extractors_ErrorResponse": field_extractors_ErrorResponse_output,
+        "field-extractors_ApiError": field$$extractors_ApiError,
+        "field-extractors_DeleteResponse": field$$extractors_DeleteResponse,
+        "field-extractors_ErrorResponse": field$$extractors_ErrorResponse,
       },
     },
     request: (args) => ({
@@ -73,34 +83,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "field_extractors_get",
+    name: "fieldExtractors_get",
     title: "Get Field Extractor",
-    description: "Retrieves the custom extraction rules configured for a given extractor type.\n\nThis method is alpha.",
+    description: "Retrieves the custom extraction rules configured for a given extractor type.\n\nThis method is alpha.\n\nGET /accounts/{account_id}/field_extractors/{extractor}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
-        "extractor": {
-          "description": "Extractor type.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "extractor": {
+              "description": "Extractor type.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "extractor"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "extractor"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/field-extractors_SuccessResponse",
       $defs: {
-        "field-extractors_ApiError": field_extractors_ApiError_output,
-        "field-extractors_ExtractorResult": field_extractors_ExtractorResult_output,
-        "field-extractors_FieldOutput": field_extractors_FieldOutput_output,
-        "field-extractors_RuleOutput": field_extractors_RuleOutput_output,
-        "field-extractors_SuccessResponse": field_extractors_SuccessResponse_output,
+        "field-extractors_ApiError": field$$extractors_ApiError,
+        "field-extractors_ExtractorResult": field$$extractors_ExtractorResult,
+        "field-extractors_FieldOutput": field$$extractors_FieldOutput,
+        "field-extractors_RuleOutput": field$$extractors_RuleOutput,
+        "field-extractors_SuccessResponse": field$$extractors_SuccessResponse,
       },
     },
     annotations: {
@@ -122,12 +142,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "field-extractors_ApiError": field_extractors_ApiError_output,
-        "field-extractors_ErrorResponse": field_extractors_ErrorResponse_output,
-        "field-extractors_ExtractorResult": field_extractors_ExtractorResult_output,
-        "field-extractors_FieldOutput": field_extractors_FieldOutput_output,
-        "field-extractors_RuleOutput": field_extractors_RuleOutput_output,
-        "field-extractors_SuccessResponse": field_extractors_SuccessResponse_output,
+        "field-extractors_ApiError": field$$extractors_ApiError,
+        "field-extractors_ErrorResponse": field$$extractors_ErrorResponse,
+        "field-extractors_ExtractorResult": field$$extractors_ExtractorResult,
+        "field-extractors_FieldOutput": field$$extractors_FieldOutput,
+        "field-extractors_RuleOutput": field$$extractors_RuleOutput,
+        "field-extractors_SuccessResponse": field$$extractors_SuccessResponse,
       },
     },
     request: (args) => ({
@@ -135,16 +155,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "field_extractors_update",
+    name: "fieldExtractors_update",
     title: "Update Field Extractor",
-    description: "Replaces all custom extraction rules for an extractor type. Omitted rules are deleted.\n\nThis method is alpha.",
+    description: "Replaces all custom extraction rules for an extractor type. Omitted rules are deleted.\n\nThis method is alpha.\n\nPUT /accounts/{account_id}/field_extractors/{extractor}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Desired-state replacement of all rules for this extractor type.",
           "properties": {
@@ -193,24 +209,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "extractor": {
-          "description": "Extractor type.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "extractor": {
+              "description": "Extractor type.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "extractor"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "extractor"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/field-extractors_SuccessResponse",
       $defs: {
-        "field-extractors_ApiError": field_extractors_ApiError_output,
-        "field-extractors_ExtractorResult": field_extractors_ExtractorResult_output,
-        "field-extractors_FieldOutput": field_extractors_FieldOutput_output,
-        "field-extractors_RuleOutput": field_extractors_RuleOutput_output,
-        "field-extractors_SuccessResponse": field_extractors_SuccessResponse_output,
+        "field-extractors_ApiError": field$$extractors_ApiError,
+        "field-extractors_ExtractorResult": field$$extractors_ExtractorResult,
+        "field-extractors_FieldOutput": field$$extractors_FieldOutput,
+        "field-extractors_RuleOutput": field$$extractors_RuleOutput,
+        "field-extractors_SuccessResponse": field$$extractors_SuccessResponse,
       },
     },
     annotations: {
@@ -235,12 +265,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "field-extractors_ApiError": field_extractors_ApiError_output,
-        "field-extractors_ErrorResponse": field_extractors_ErrorResponse_output,
-        "field-extractors_ExtractorResult": field_extractors_ExtractorResult_output,
-        "field-extractors_FieldOutput": field_extractors_FieldOutput_output,
-        "field-extractors_RuleOutput": field_extractors_RuleOutput_output,
-        "field-extractors_SuccessResponse": field_extractors_SuccessResponse_output,
+        "field-extractors_ApiError": field$$extractors_ApiError,
+        "field-extractors_ErrorResponse": field$$extractors_ErrorResponse,
+        "field-extractors_ExtractorResult": field$$extractors_ExtractorResult,
+        "field-extractors_FieldOutput": field$$extractors_FieldOutput,
+        "field-extractors_RuleOutput": field$$extractors_RuleOutput,
+        "field-extractors_SuccessResponse": field$$extractors_SuccessResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/firewall/accessRules/outputs.ts b/src/generated/forge-mcp/firewall/accessRules/outputs.ts
index ca1584ab9..1798cfc53 100644
--- a/src/generated/forge-mcp/firewall/accessRules/outputs.ts
+++ b/src/generated/forge-mcp/firewall/accessRules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `firewall_api-response-single-id` in responses.
  */
-export const firewall_api_response_single_id_output: JsonSchema = {
+export const firewall_api$$response$$single$$id: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-common"
@@ -18,7 +18,7 @@ export const firewall_api_response_single_id_output: JsonSchema = {
             {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/firewall_identifier"
+                  "type": "string"
                 }
               },
               "required": [
@@ -37,17 +37,10 @@ export const firewall_api_response_single_id_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `firewall_email` in responses.
- */
-export const firewall_email_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_response_collection` in responses.
  */
-export const firewall_response_collection_output: JsonSchema = {
+export const firewall_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-collection"
@@ -69,7 +62,7 @@ export const firewall_response_collection_output: JsonSchema = {
 /**
  * The schema of `firewall_response_single` in responses.
  */
-export const firewall_response_single_output: JsonSchema = {
+export const firewall_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-single"
@@ -88,7 +81,7 @@ export const firewall_response_single_output: JsonSchema = {
 /**
  * The schema of `firewall_schemas-rule` in responses.
  */
-export const firewall_schemas_rule_output: JsonSchema = {
+export const firewall_schemas$$rule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_rule"
@@ -98,10 +91,10 @@ export const firewall_schemas_rule_output: JsonSchema = {
         "scope": {
           "properties": {
             "email": {
-              "$ref": "#/$defs/firewall_email"
+              "type": "string"
             },
             "id": {
-              "$ref": "#/$defs/firewall_identifier"
+              "type": "string"
             },
             "type": {
               "enum": [
diff --git a/src/generated/forge-mcp/firewall/accessRules/schemas.ts b/src/generated/forge-mcp/firewall/accessRules/schemas.ts
index a80008f0e..350dd6dd9 100644
--- a/src/generated/forge-mcp/firewall/accessRules/schemas.ts
+++ b/src/generated/forge-mcp/firewall/accessRules/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `firewall_schemas-rule`.
  */
-export const firewall_schemas_rule: JsonSchema = {
+export const firewall_schemas$$rule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_rule"
diff --git a/src/generated/forge-mcp/firewall/accessRules/tools.ts b/src/generated/forge-mcp/firewall/accessRules/tools.ts
index bdb395ddc..5680c3932 100644
--- a/src/generated/forge-mcp/firewall/accessRules/tools.ts
+++ b/src/generated/forge-mcp/firewall/accessRules/tools.ts
@@ -1,71 +1,50 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import {
-  firewall_api_response_collection_output,
-  firewall_api_response_common_failure_output,
-  firewall_api_response_common_output,
-  firewall_api_response_single_output,
-  firewall_asn_configuration_output,
-  firewall_cidr_configuration_output,
-  firewall_configuration_output,
-  firewall_country_configuration_output,
-  firewall_ip_configuration_output,
-  firewall_ipv6_configuration_output,
-  firewall_messages_output,
-  firewall_notes_output,
-  firewall_result_info_output,
-  firewall_rule_output,
-  firewall_schemas_identifier_output,
-  firewall_schemas_mode_output,
-} from "../../outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
+  firewall_api$$response$$collection,
+  firewall_api$$response$$common,
+  firewall_api$$response$$common$$failure,
+  firewall_api$$response$$single,
   firewall_asn_configuration,
   firewall_cidr_configuration,
   firewall_configuration,
   firewall_country_configuration,
   firewall_ip_configuration,
   firewall_ipv6_configuration,
-  firewall_notes,
+  firewall_messages,
+  firewall_result_info,
   firewall_rule,
-  firewall_rule_identifier,
-  firewall_schemas_mode,
+} from "../../outputs.js";
+import {
+  firewall_asn_configuration as firewall_asn_configuration$,
+  firewall_cidr_configuration as firewall_cidr_configuration$,
+  firewall_configuration as firewall_configuration$,
+  firewall_country_configuration as firewall_country_configuration$,
+  firewall_ip_configuration as firewall_ip_configuration$,
+  firewall_ipv6_configuration as firewall_ipv6_configuration$,
+  firewall_rule as firewall_rule$,
 } from "../../schemas.js";
-import { firewall_identifier_output } from "../outputs.js";
-import { firewall_account_identifier } from "../schemas.js";
 import {
-  firewall_api_response_single_id_output,
-  firewall_email_output,
-  firewall_response_collection_output,
-  firewall_response_single_output,
-  firewall_schemas_rule_output,
+  firewall_api$$response$$single$$id,
+  firewall_response_collection,
+  firewall_response_single,
+  firewall_schemas$$rule,
 } from "./outputs.js";
-import { firewall_schemas_rule } from "./schemas.js";
+import { firewall_schemas$$rule as firewall_schemas$$rule$ } from "./schemas.js";
 
 /**
- * The tools of `firewall.access_rules`.
+ * The tools of `firewall.accessRules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "firewall_access_rules_create",
+    name: "firewall_accessRules_create",
     title: "Create an IP Access rule",
-    description: "Creates a new IP Access rule for an account or zone. The rule will apply to all zones in the account or zone.\n\nNote: To create an IP Access rule that applies to a single zone, refer to the [IP Access rules for a zone](#ip-access-rules-for-a-zone) endpoints.",
+    description: "Creates a new IP Access rule for an account or zone. The rule will apply to all zones in the account or zone.\n\nNote: To create an IP Access rule that applies to a single zone, refer to the [IP Access rules for a zone](#ip-access-rules-for-a-zone) endpoints.\n\nPOST /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/firewall_account_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "configuration": {
@@ -73,11 +52,20 @@ export const tools: readonly Tool[] = [
               "description": "The rule configuration."
             },
             "mode": {
-              "$ref": "#/$defs/firewall_schemas-mode"
+              "description": "The action to apply to a matched request.",
+              "enum": [
+                "block",
+                "challenge",
+                "whitelist",
+                "js_challenge",
+                "managed_challenge"
+              ],
+              "type": "string"
             },
             "notes": {
-              "$ref": "#/$defs/firewall_notes",
-              "default": ""
+              "default": "",
+              "description": "An informative summary of the rule, typically used as a reminder or explanation.",
+              "type": "string"
             }
           },
           "required": [
@@ -85,45 +73,59 @@ export const tools: readonly Tool[] = [
             "mode"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "firewall_account_identifier": firewall_account_identifier,
+        "firewall_asn_configuration": firewall_asn_configuration$,
+        "firewall_cidr_configuration": firewall_cidr_configuration$,
+        "firewall_configuration": firewall_configuration$,
+        "firewall_country_configuration": firewall_country_configuration$,
+        "firewall_ip_configuration": firewall_ip_configuration$,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/firewall_response_single",
+      $defs: {
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
         "firewall_asn_configuration": firewall_asn_configuration,
         "firewall_cidr_configuration": firewall_cidr_configuration,
         "firewall_configuration": firewall_configuration,
         "firewall_country_configuration": firewall_country_configuration,
         "firewall_ip_configuration": firewall_ip_configuration,
         "firewall_ipv6_configuration": firewall_ipv6_configuration,
-        "firewall_notes": firewall_notes,
-        "firewall_schemas-mode": firewall_schemas_mode,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/firewall_response_single",
-      $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_email": firewall_email_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_response_single": firewall_response_single_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
-        "firewall_schemas-rule": firewall_schemas_rule_output,
+        "firewall_messages": firewall_messages,
+        "firewall_response_single": firewall_response_single,
+        "firewall_rule": firewall_rule,
+        "firewall_schemas-rule": firewall_schemas$$rule,
       },
     },
     annotations: {
@@ -161,24 +163,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_email": firewall_email_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_response_single": firewall_response_single_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
-        "firewall_schemas-rule": firewall_schemas_rule_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_response_single": firewall_response_single,
+        "firewall_rule": firewall_rule,
+        "firewall_schemas-rule": firewall_schemas$$rule,
       },
     },
     request: (args) => ({
@@ -187,46 +184,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_access_rules_delete",
+    name: "firewall_accessRules_delete",
     title: "Delete an IP Access rule",
-    description: "Deletes an existing IP Access rule defined.\n\nNote: This operation will affect all zones in the account or zone.\n\nConfirm with the user before calling this tool. This operation deletes the account-level IP Access Rule and affects every zone in the account.",
+    description: "Deletes an existing IP Access rule defined.\n\nNote: This operation will affect all zones in the account or zone.\n\nConfirm with the user before calling this tool. This operation deletes the account-level IP Access Rule and affects every zone in the account.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Unique identifier for a rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "rule_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/firewall_account_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/firewall_rule_identifier",
-          "description": "Unique identifier for a rule."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "firewall_account_identifier": firewall_account_identifier,
-        "firewall_rule_identifier": firewall_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_api-response-single-id",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single-id": firewall_api_response_single_id_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_messages": firewall_messages_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single-id": firewall_api$$response$$single$$id,
+        "firewall_messages": firewall_messages,
       },
     },
     annotations: {
@@ -264,11 +266,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single-id": firewall_api_response_single_id_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_messages": firewall_messages_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single-id": firewall_api$$response$$single$$id,
+        "firewall_messages": firewall_messages,
       },
     },
     request: (args) => ({
@@ -276,73 +277,74 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_access_rules_edit",
+    name: "firewall_accessRules_edit",
     title: "Update an IP Access rule",
-    description: "Updates an IP Access rule defined.\n\nNote: This operation will affect all zones in the account or zone.",
+    description: "Updates an IP Access rule defined.\n\nNote: This operation will affect all zones in the account or zone.\n\nPATCH /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/firewall_account_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/firewall_schemas-rule"
         },
-        "rule_id": {
-          "$ref": "#/$defs/firewall_rule_identifier",
-          "description": "Unique identifier for a rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Unique identifier for a rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "firewall_account_identifier": firewall_account_identifier,
+        "firewall_asn_configuration": firewall_asn_configuration$,
+        "firewall_cidr_configuration": firewall_cidr_configuration$,
+        "firewall_configuration": firewall_configuration$,
+        "firewall_country_configuration": firewall_country_configuration$,
+        "firewall_ip_configuration": firewall_ip_configuration$,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration$,
+        "firewall_rule": firewall_rule$,
+        "firewall_schemas-rule": firewall_schemas$$rule$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/firewall_response_single",
+      $defs: {
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
         "firewall_asn_configuration": firewall_asn_configuration,
         "firewall_cidr_configuration": firewall_cidr_configuration,
         "firewall_configuration": firewall_configuration,
         "firewall_country_configuration": firewall_country_configuration,
         "firewall_ip_configuration": firewall_ip_configuration,
         "firewall_ipv6_configuration": firewall_ipv6_configuration,
-        "firewall_notes": firewall_notes,
+        "firewall_messages": firewall_messages,
+        "firewall_response_single": firewall_response_single,
         "firewall_rule": firewall_rule,
-        "firewall_rule_identifier": firewall_rule_identifier,
-        "firewall_schemas-mode": firewall_schemas_mode,
-        "firewall_schemas-rule": firewall_schemas_rule,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/firewall_response_single",
-      $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_email": firewall_email_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_response_single": firewall_response_single_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
-        "firewall_schemas-rule": firewall_schemas_rule_output,
+        "firewall_schemas-rule": firewall_schemas$$rule,
       },
     },
     annotations: {
@@ -380,24 +382,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_email": firewall_email_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_response_single": firewall_response_single_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
-        "firewall_schemas-rule": firewall_schemas_rule_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_response_single": firewall_response_single,
+        "firewall_rule": firewall_rule,
+        "firewall_schemas-rule": firewall_schemas$$rule,
       },
     },
     request: (args) => ({
@@ -406,59 +403,60 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_access_rules_get",
+    name: "firewall_accessRules_get",
     title: "Get an IP Access rule",
-    description: "Fetches the details of an IP Access rule defined.",
+    description: "Fetches the details of an IP Access rule defined.\n\nGET /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Unique identifier for a rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "rule_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/firewall_account_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/firewall_rule_identifier",
-          "description": "Unique identifier for a rule."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "firewall_account_identifier": firewall_account_identifier,
-        "firewall_rule_identifier": firewall_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_email": firewall_email_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_response_single": firewall_response_single_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
-        "firewall_schemas-rule": firewall_schemas_rule_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_response_single": firewall_response_single,
+        "firewall_rule": firewall_rule,
+        "firewall_schemas-rule": firewall_schemas$$rule,
       },
     },
     annotations: {
@@ -497,24 +495,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_email": firewall_email_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_response_single": firewall_response_single_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
-        "firewall_schemas-rule": firewall_schemas_rule_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_response_single": firewall_response_single,
+        "firewall_rule": firewall_rule,
+        "firewall_schemas-rule": firewall_schemas$$rule,
       },
     },
     request: (args) => ({
@@ -522,111 +515,125 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_access_rules_list",
+    name: "firewall_accessRules_list",
     title: "List IP Access rules",
-    description: "Fetches IP Access rules of an account or zone. These rules apply to all the zones in the account or zone. You can filter the results using several optional parameters.",
+    description: "Fetches IP Access rules of an account or zone. These rules apply to all the zones in the account or zone. You can filter the results using several optional parameters.\n\nGET /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "access_rule_mode": {
-          "$ref": "#/$defs/firewall_schemas-mode",
-          "description": "The action to apply to a matched request."
-        },
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/firewall_account_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "configuration_target": {
-          "description": "Defines the target to search in existing rules.",
-          "enum": [
-            "ip",
-            "ip_range",
-            "asn",
-            "country"
-          ],
-          "type": "string"
-        },
-        "configuration_value": {
-          "description": "Defines the target value to search for in existing rules: an IP address, an IP address range, or a country code, depending on the provided `configuration.target`.\nNotes: You can search for a single IPv4 address, an IP address range with a subnet of '/16' or '/24', or a two-letter ISO-3166-1 alpha-2 country code.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Defines the direction used to sort returned rules.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "match": {
-          "default": "all",
-          "description": "Defines the search requirements. When set to `all`, all the search requirements must match. When set to `any`, only one of the search requirements has to match.",
-          "enum": [
-            "any",
-            "all"
-          ],
-          "type": "string"
-        },
-        "notes": {
-          "description": "Defines the string to search for in the notes of existing IP Access rules.\nNotes: For example, the string 'attack' would match IP Access rules with notes 'Attack 26/02' and 'Attack 27/02'. The search is case insensitive.",
-          "type": "string"
-        },
-        "order": {
-          "description": "Defines the field used to sort returned rules.",
-          "enum": [
-            "configuration.target",
-            "configuration.value",
-            "mode"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "Defines the requested page within paginated list of results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "description": "Defines the maximum number of results requested.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "configuration.target": {
+              "description": "Defines the target to search in existing rules.",
+              "enum": [
+                "ip",
+                "ip_range",
+                "asn",
+                "country"
+              ],
+              "type": "string"
+            },
+            "configuration.value": {
+              "description": "Defines the target value to search for in existing rules: an IP address, an IP address range, or a country code, depending on the provided `configuration.target`.\nNotes: You can search for a single IPv4 address, an IP address range with a subnet of '/16' or '/24', or a two-letter ISO-3166-1 alpha-2 country code.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Defines the direction used to sort returned rules.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "match": {
+              "default": "all",
+              "description": "Defines the search requirements. When set to `all`, all the search requirements must match. When set to `any`, only one of the search requirements has to match.",
+              "enum": [
+                "any",
+                "all"
+              ],
+              "type": "string"
+            },
+            "mode": {
+              "description": "The action to apply to a matched request.",
+              "enum": [
+                "block",
+                "challenge",
+                "whitelist",
+                "js_challenge",
+                "managed_challenge"
+              ],
+              "type": "string"
+            },
+            "notes": {
+              "description": "Defines the string to search for in the notes of existing IP Access rules.\nNotes: For example, the string 'attack' would match IP Access rules with notes 'Attack 26/02' and 'Attack 27/02'. The search is case insensitive.",
+              "type": "string"
+            },
+            "order": {
+              "description": "Defines the field used to sort returned rules.",
+              "enum": [
+                "configuration.target",
+                "configuration.value",
+                "mode"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Defines the requested page within paginated list of results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Defines the maximum number of results requested.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "firewall_account_identifier": firewall_account_identifier,
-        "firewall_schemas-mode": firewall_schemas_mode,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_response_collection",
       $defs: {
-        "firewall_api-response-collection": firewall_api_response_collection_output,
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_email": firewall_email_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_response_collection": firewall_response_collection_output,
-        "firewall_result_info": firewall_result_info_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
-        "firewall_schemas-rule": firewall_schemas_rule_output,
+        "firewall_api-response-collection": firewall_api$$response$$collection,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_response_collection": firewall_response_collection,
+        "firewall_result_info": firewall_result_info,
+        "firewall_rule": firewall_rule,
+        "firewall_schemas-rule": firewall_schemas$$rule,
       },
     },
     annotations: {
@@ -665,39 +672,34 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-collection": firewall_api_response_collection_output,
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_email": firewall_email_output,
-        "firewall_identifier": firewall_identifier_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_response_collection": firewall_response_collection_output,
-        "firewall_result_info": firewall_result_info_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
-        "firewall_schemas-rule": firewall_schemas_rule_output,
+        "firewall_api-response-collection": firewall_api$$response$$collection,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_response_collection": firewall_response_collection,
+        "firewall_result_info": firewall_result_info,
+        "firewall_rule": firewall_rule,
+        "firewall_schemas-rule": firewall_schemas$$rule,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/firewall/access_rules/rules`,
       query: [
-        ["mode", args["access_rule_mode"], true],
-        ["configuration.target", args["configuration_target"], true],
-        ["configuration.value", args["configuration_value"], true],
-        ["notes", args["notes"], true],
-        ["match", args["match"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["mode", param(args, "query", "mode"), true],
+        ["configuration.target", param(args, "query", "configuration.target"), true],
+        ["configuration.value", param(args, "query", "configuration.value"), true],
+        ["notes", param(args, "query", "notes"), true],
+        ["match", param(args, "query", "match"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/firewall/lockdowns/outputs.ts b/src/generated/forge-mcp/firewall/lockdowns/outputs.ts
index 50e297ccf..732ed7918 100644
--- a/src/generated/forge-mcp/firewall/lockdowns/outputs.ts
+++ b/src/generated/forge-mcp/firewall/lockdowns/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `firewall_configurations` in responses.
  */
-export const firewall_configurations_output: JsonSchema = {
+export const firewall_configurations: JsonSchema = {
   "items": {
     "anyOf": [
       {
@@ -20,41 +20,10 @@ export const firewall_configurations_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `firewall_created_on` in responses.
- */
-export const firewall_created_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_lockdowns_components-schemas-description` in
- * responses.
- */
-export const firewall_lockdowns_components_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_lockdowns_components-schemas-id` in responses.
- */
-export const firewall_lockdowns_components_schemas_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_modified_on` in responses.
- */
-export const firewall_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_schemas-cidr_configuration` in responses.
  */
-export const firewall_schemas_cidr_configuration_output: JsonSchema = {
+export const firewall_schemas$$cidr_configuration: JsonSchema = {
   "properties": {
     "target": {
       "enum": [
@@ -72,7 +41,7 @@ export const firewall_schemas_cidr_configuration_output: JsonSchema = {
 /**
  * The schema of `firewall_schemas-ip_configuration` in responses.
  */
-export const firewall_schemas_ip_configuration_output: JsonSchema = {
+export const firewall_schemas$$ip_configuration: JsonSchema = {
   "properties": {
     "target": {
       "enum": [
@@ -90,7 +59,7 @@ export const firewall_schemas_ip_configuration_output: JsonSchema = {
 /**
  * The schema of `firewall_schemas-urls` in responses.
  */
-export const firewall_schemas_urls_output: JsonSchema = {
+export const firewall_schemas$$urls: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -100,25 +69,27 @@ export const firewall_schemas_urls_output: JsonSchema = {
 /**
  * The schema of `firewall_zonelockdown` in responses.
  */
-export const firewall_zonelockdown_output: JsonSchema = {
+export const firewall_zonelockdown: JsonSchema = {
   "properties": {
     "configurations": {
       "$ref": "#/$defs/firewall_configurations"
     },
     "created_on": {
-      "$ref": "#/$defs/firewall_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/firewall_lockdowns_components-schemas-description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/firewall_lockdowns_components-schemas-id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/firewall_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "paused": {
-      "$ref": "#/$defs/firewall_schemas-paused"
+      "type": "boolean"
     },
     "urls": {
       "$ref": "#/$defs/firewall_schemas-urls"
@@ -139,7 +110,7 @@ export const firewall_zonelockdown_output: JsonSchema = {
 /**
  * The schema of `firewall_zonelockdown_response_collection` in responses.
  */
-export const firewall_zonelockdown_response_collection_output: JsonSchema = {
+export const firewall_zonelockdown_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-collection"
@@ -164,7 +135,7 @@ export const firewall_zonelockdown_response_collection_output: JsonSchema = {
 /**
  * The schema of `firewall_zonelockdown_response_single` in responses.
  */
-export const firewall_zonelockdown_response_single_output: JsonSchema = {
+export const firewall_zonelockdown_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-single"
diff --git a/src/generated/forge-mcp/firewall/lockdowns/schemas.ts b/src/generated/forge-mcp/firewall/lockdowns/schemas.ts
index c6d6cfa08..729400784 100644
--- a/src/generated/forge-mcp/firewall/lockdowns/schemas.ts
+++ b/src/generated/forge-mcp/firewall/lockdowns/schemas.ts
@@ -21,43 +21,10 @@ export const firewall_configurations: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `firewall_ip_range_search`.
- */
-export const firewall_ip_range_search: JsonSchema = {
-  "description": "A single IP address range to search for in existing rules.",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_ip_search`.
- */
-export const firewall_ip_search: JsonSchema = {
-  "description": "A single IP address to search for in existing rules.",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_lockdowns_components-schemas-id`.
- */
-export const firewall_lockdowns_components_schemas_id: JsonSchema = {
-  "description": "The unique identifier of the Zone Lockdown rule.",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_modified_on`.
- */
-export const firewall_modified_on: JsonSchema = {
-  "description": "The timestamp of when the rule was last modified.",
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_schemas-cidr_configuration`.
  */
-export const firewall_schemas_cidr_configuration: JsonSchema = {
+export const firewall_schemas$$cidr_configuration: JsonSchema = {
   "description": "An IP address range configuration.",
   "properties": {
     "target": {
@@ -75,18 +42,10 @@ export const firewall_schemas_cidr_configuration: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `firewall_schemas-description_search`.
- */
-export const firewall_schemas_description_search: JsonSchema = {
-  "description": "A string to search for in the description of existing rules.",
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_schemas-ip_configuration`.
  */
-export const firewall_schemas_ip_configuration: JsonSchema = {
+export const firewall_schemas$$ip_configuration: JsonSchema = {
   "description": "An IP address configuration.",
   "properties": {
     "target": {
@@ -104,22 +63,6 @@ export const firewall_schemas_ip_configuration: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `firewall_schemas-priority`.
- */
-export const firewall_schemas_priority: JsonSchema = {
-  "description": "The priority of the rule to control the processing order. A lower number indicates higher priority. If not provided, any rules with a configured priority will be processed before rules without a priority.",
-  "type": "number"
-};
-
-/**
- * The schema of `firewall_uri_search`.
- */
-export const firewall_uri_search: JsonSchema = {
-  "description": "A single URI to search for in the list of URLs of existing rules.",
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_urls`.
  */
diff --git a/src/generated/forge-mcp/firewall/lockdowns/tools.ts b/src/generated/forge-mcp/firewall/lockdowns/tools.ts
index f7854b786..ed55300cd 100644
--- a/src/generated/forge-mcp/firewall/lockdowns/tools.ts
+++ b/src/generated/forge-mcp/firewall/lockdowns/tools.ts
@@ -1,45 +1,28 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  firewall_api_response_collection_output,
-  firewall_api_response_common_failure_output,
-  firewall_api_response_common_output,
-  firewall_api_response_single_output,
-  firewall_messages_output,
-  firewall_result_info_output,
+  firewall_api$$response$$collection,
+  firewall_api$$response$$common,
+  firewall_api$$response$$common$$failure,
+  firewall_api$$response$$single,
+  firewall_messages,
+  firewall_result_info,
 } from "../../outputs.js";
-import { firewall_schemas_paused_output } from "../outputs.js";
 import {
-  firewall_description,
-  firewall_identifier,
-  firewall_schemas_paused,
-} from "../schemas.js";
-import {
-  firewall_configurations_output,
-  firewall_created_on_output,
-  firewall_lockdowns_components_schemas_description_output,
-  firewall_lockdowns_components_schemas_id_output,
-  firewall_modified_on_output,
-  firewall_schemas_cidr_configuration_output,
-  firewall_schemas_ip_configuration_output,
-  firewall_schemas_urls_output,
-  firewall_zonelockdown_output,
-  firewall_zonelockdown_response_collection_output,
-  firewall_zonelockdown_response_single_output,
+  firewall_configurations,
+  firewall_schemas$$cidr_configuration,
+  firewall_schemas$$ip_configuration,
+  firewall_schemas$$urls,
+  firewall_zonelockdown,
+  firewall_zonelockdown_response_collection,
+  firewall_zonelockdown_response_single,
 } from "./outputs.js";
 import {
-  firewall_configurations,
-  firewall_ip_range_search,
-  firewall_ip_search,
-  firewall_lockdowns_components_schemas_id,
-  firewall_modified_on,
-  firewall_schemas_cidr_configuration,
-  firewall_schemas_description_search,
-  firewall_schemas_ip_configuration,
-  firewall_schemas_priority,
-  firewall_uri_search,
+  firewall_configurations as firewall_configurations$,
+  firewall_schemas$$cidr_configuration as firewall_schemas$$cidr_configuration$,
+  firewall_schemas$$ip_configuration as firewall_schemas$$ip_configuration$,
   firewall_urls,
 } from "./schemas.js";
 
@@ -50,7 +33,7 @@ export const tools: readonly Tool[] = [
   {
     name: "firewall_lockdowns_create",
     title: "Create a Zone Lockdown rule",
-    description: "Creates a new Zone Lockdown rule.",
+    description: "Creates a new Zone Lockdown rule.\n\nPOST /zones/{zone_id}/firewall/lockdowns",
     inputSchema: {
       type: "object",
       properties: {
@@ -61,16 +44,16 @@ export const tools: readonly Tool[] = [
               "description": "A list of IP addresses or CIDR ranges that will be allowed to access the URLs specified in the Zone Lockdown rule. You can include any number of `ip` or `ip_range` configurations."
             },
             "description": {
-              "$ref": "#/$defs/firewall_description",
-              "description": "An informative summary of the rule. This value is sanitized and any tags will be removed."
+              "description": "An informative summary of the rule. This value is sanitized and any tags will be removed.",
+              "type": "string"
             },
             "paused": {
-              "$ref": "#/$defs/firewall_schemas-paused",
-              "description": "When true, indicates that the rule is currently paused."
+              "description": "When true, indicates that the rule is currently paused.",
+              "type": "boolean"
             },
             "priority": {
-              "$ref": "#/$defs/firewall_schemas-priority",
-              "description": "The priority of the rule to control the processing order. A lower number indicates higher priority. If not provided, any rules with a configured priority will be processed before rules without a priority."
+              "description": "The priority of the rule to control the processing order. A lower number indicates higher priority. If not provided, any rules with a configured priority will be processed before rules without a priority.",
+              "type": "number"
             },
             "urls": {
               "$ref": "#/$defs/firewall_urls",
@@ -83,43 +66,44 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "firewall_configurations": firewall_configurations,
-        "firewall_description": firewall_description,
-        "firewall_identifier": firewall_identifier,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration,
-        "firewall_schemas-paused": firewall_schemas_paused,
-        "firewall_schemas-priority": firewall_schemas_priority,
+        "firewall_configurations": firewall_configurations$,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration$,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration$,
         "firewall_urls": firewall_urls,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_zonelockdown_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_configurations": firewall_configurations_output,
-        "firewall_created_on": firewall_created_on_output,
-        "firewall_lockdowns_components-schemas-description": firewall_lockdowns_components_schemas_description_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_modified_on": firewall_modified_on_output,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration_output,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
-        "firewall_schemas-urls": firewall_schemas_urls_output,
-        "firewall_zonelockdown": firewall_zonelockdown_output,
-        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_configurations": firewall_configurations,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration,
+        "firewall_schemas-urls": firewall_schemas$$urls,
+        "firewall_zonelockdown": firewall_zonelockdown,
+        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single,
       },
     },
     annotations: {
@@ -152,21 +136,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_configurations": firewall_configurations_output,
-        "firewall_created_on": firewall_created_on_output,
-        "firewall_lockdowns_components-schemas-description": firewall_lockdowns_components_schemas_description_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_modified_on": firewall_modified_on_output,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration_output,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
-        "firewall_schemas-urls": firewall_schemas_urls_output,
-        "firewall_zonelockdown": firewall_zonelockdown_output,
-        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_configurations": firewall_configurations,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration,
+        "firewall_schemas-urls": firewall_schemas$$urls,
+        "firewall_zonelockdown": firewall_zonelockdown,
+        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single,
       },
     },
     request: (args) => ({
@@ -177,43 +156,46 @@ export const tools: readonly Tool[] = [
   {
     name: "firewall_lockdowns_delete",
     title: "Delete a Zone Lockdown rule",
-    description: "Deletes an existing Zone Lockdown rule.\n\nConfirm with the user before calling this tool. This operation deletes the Zone Lockdown rule from the zone.",
+    description: "Deletes an existing Zone Lockdown rule.\n\nConfirm with the user before calling this tool. This operation deletes the Zone Lockdown rule from the zone.\n\nDELETE /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "lock_downs_id": {
-          "$ref": "#/$defs/firewall_lockdowns_components-schemas-id",
-          "description": "The unique identifier of the Zone Lockdown rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "lock_downs_id": {
+              "description": "The unique identifier of the Zone Lockdown rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "lock_downs_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "lock_downs_id"
+        "path"
       ],
-      $defs: {
-        "firewall_identifier": firewall_identifier,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/firewall_lockdowns_components-schemas-id"
+              "type": "string"
             }
           },
           "type": "object"
         }
       },
       "type": "object",
-      $defs: {
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -242,7 +224,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/firewall_lockdowns_components-schemas-id"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -255,9 +237,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_messages": firewall_messages,
       },
     },
     request: (args) => ({
@@ -267,45 +248,46 @@ export const tools: readonly Tool[] = [
   {
     name: "firewall_lockdowns_get",
     title: "Get a Zone Lockdown rule",
-    description: "Fetches the details of a Zone Lockdown rule.",
+    description: "Fetches the details of a Zone Lockdown rule.\n\nGET /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "lock_downs_id": {
-          "$ref": "#/$defs/firewall_lockdowns_components-schemas-id",
-          "description": "The unique identifier of the Zone Lockdown rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "lock_downs_id": {
+              "description": "The unique identifier of the Zone Lockdown rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "lock_downs_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "lock_downs_id"
+        "path"
       ],
-      $defs: {
-        "firewall_identifier": firewall_identifier,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_zonelockdown_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_configurations": firewall_configurations_output,
-        "firewall_created_on": firewall_created_on_output,
-        "firewall_lockdowns_components-schemas-description": firewall_lockdowns_components_schemas_description_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_modified_on": firewall_modified_on_output,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration_output,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
-        "firewall_schemas-urls": firewall_schemas_urls_output,
-        "firewall_zonelockdown": firewall_zonelockdown_output,
-        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_configurations": firewall_configurations,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration,
+        "firewall_schemas-urls": firewall_schemas$$urls,
+        "firewall_zonelockdown": firewall_zonelockdown,
+        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single,
       },
     },
     annotations: {
@@ -339,21 +321,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_configurations": firewall_configurations_output,
-        "firewall_created_on": firewall_created_on_output,
-        "firewall_lockdowns_components-schemas-description": firewall_lockdowns_components_schemas_description_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_modified_on": firewall_modified_on_output,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration_output,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
-        "firewall_schemas-urls": firewall_schemas_urls_output,
-        "firewall_zonelockdown": firewall_zonelockdown_output,
-        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_configurations": firewall_configurations,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration,
+        "firewall_schemas-urls": firewall_schemas$$urls,
+        "firewall_zonelockdown": firewall_zonelockdown,
+        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single,
       },
     },
     request: (args) => ({
@@ -363,87 +340,96 @@ export const tools: readonly Tool[] = [
   {
     name: "firewall_lockdowns_list",
     title: "List Zone Lockdown rules",
-    description: "Fetches Zone Lockdown rules. You can filter the results using several optional parameters.",
+    description: "Fetches Zone Lockdown rules. You can filter the results using several optional parameters.\n\nGET /zones/{zone_id}/firewall/lockdowns",
     inputSchema: {
       type: "object",
       properties: {
-        "created_on": {
-          "description": "The timestamp of when the rule was created.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "description": {
-          "$ref": "#/$defs/firewall_schemas-description_search"
-        },
-        "description_search": {
-          "description": "A string to search for in the description of existing rules.",
-          "type": "string"
-        },
-        "ip": {
-          "$ref": "#/$defs/firewall_ip_search"
-        },
-        "ip_range_search": {
-          "$ref": "#/$defs/firewall_ip_range_search"
-        },
-        "ip_search": {
-          "description": "A single IP address to search for in existing rules.",
-          "type": "string"
-        },
-        "modified_on": {
-          "$ref": "#/$defs/firewall_modified_on"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The maximum number of results per page. You can only set the value to `1` or to a multiple of 5 such as `5`, `10`, `15`, or `20`.",
-          "type": "number"
-        },
-        "priority": {
-          "$ref": "#/$defs/firewall_schemas-priority"
-        },
-        "uri_search": {
-          "$ref": "#/$defs/firewall_uri_search"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "created_on": {
+              "description": "The timestamp of when the rule was created.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "description": {
+              "description": "A string to search for in the description of existing rules.",
+              "type": "string"
+            },
+            "description_search": {
+              "description": "A string to search for in the description of existing rules.",
+              "type": "string"
+            },
+            "ip": {
+              "description": "A single IP address to search for in existing rules.",
+              "type": "string"
+            },
+            "ip_range_search": {
+              "description": "A single IP address range to search for in existing rules.",
+              "type": "string"
+            },
+            "ip_search": {
+              "description": "A single IP address to search for in existing rules.",
+              "type": "string"
+            },
+            "modified_on": {
+              "description": "The timestamp of when the rule was last modified.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The maximum number of results per page. You can only set the value to `1` or to a multiple of 5 such as `5`, `10`, `15`, or `20`.",
+              "type": "number"
+            },
+            "priority": {
+              "description": "The priority of the rule to control the processing order. A lower number indicates higher priority. If not provided, any rules with a configured priority will be processed before rules without a priority.",
+              "type": "number"
+            },
+            "uri_search": {
+              "description": "A single URI to search for in the list of URLs of existing rules.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "firewall_identifier": firewall_identifier,
-        "firewall_ip_range_search": firewall_ip_range_search,
-        "firewall_ip_search": firewall_ip_search,
-        "firewall_modified_on": firewall_modified_on,
-        "firewall_schemas-description_search": firewall_schemas_description_search,
-        "firewall_schemas-priority": firewall_schemas_priority,
-        "firewall_uri_search": firewall_uri_search,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_zonelockdown_response_collection",
       $defs: {
-        "firewall_api-response-collection": firewall_api_response_collection_output,
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_configurations": firewall_configurations_output,
-        "firewall_created_on": firewall_created_on_output,
-        "firewall_lockdowns_components-schemas-description": firewall_lockdowns_components_schemas_description_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_modified_on": firewall_modified_on_output,
-        "firewall_result_info": firewall_result_info_output,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration_output,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
-        "firewall_schemas-urls": firewall_schemas_urls_output,
-        "firewall_zonelockdown": firewall_zonelockdown_output,
-        "firewall_zonelockdown_response_collection": firewall_zonelockdown_response_collection_output,
+        "firewall_api-response-collection": firewall_api$$response$$collection,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_configurations": firewall_configurations,
+        "firewall_messages": firewall_messages,
+        "firewall_result_info": firewall_result_info,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration,
+        "firewall_schemas-urls": firewall_schemas$$urls,
+        "firewall_zonelockdown": firewall_zonelockdown,
+        "firewall_zonelockdown_response_collection": firewall_zonelockdown_response_collection,
       },
     },
     annotations: {
@@ -477,45 +463,40 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-collection": firewall_api_response_collection_output,
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_configurations": firewall_configurations_output,
-        "firewall_created_on": firewall_created_on_output,
-        "firewall_lockdowns_components-schemas-description": firewall_lockdowns_components_schemas_description_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_modified_on": firewall_modified_on_output,
-        "firewall_result_info": firewall_result_info_output,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration_output,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
-        "firewall_schemas-urls": firewall_schemas_urls_output,
-        "firewall_zonelockdown": firewall_zonelockdown_output,
-        "firewall_zonelockdown_response_collection": firewall_zonelockdown_response_collection_output,
+        "firewall_api-response-collection": firewall_api$$response$$collection,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_configurations": firewall_configurations,
+        "firewall_messages": firewall_messages,
+        "firewall_result_info": firewall_result_info,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration,
+        "firewall_schemas-urls": firewall_schemas$$urls,
+        "firewall_zonelockdown": firewall_zonelockdown,
+        "firewall_zonelockdown_response_collection": firewall_zonelockdown_response_collection,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/firewall/lockdowns`,
       query: [
-        ["page", args["page"], true],
-        ["description", args["description"], true],
-        ["modified_on", args["modified_on"], true],
-        ["ip", args["ip"], true],
-        ["priority", args["priority"], true],
-        ["uri_search", args["uri_search"], true],
-        ["ip_range_search", args["ip_range_search"], true],
-        ["per_page", args["per_page"], true],
-        ["created_on", args["created_on"], true],
-        ["description_search", args["description_search"], true],
-        ["ip_search", args["ip_search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["description", param(args, "query", "description"), true],
+        ["modified_on", param(args, "query", "modified_on"), true],
+        ["ip", param(args, "query", "ip"), true],
+        ["priority", param(args, "query", "priority"), true],
+        ["uri_search", param(args, "query", "uri_search"), true],
+        ["ip_range_search", param(args, "query", "ip_range_search"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["created_on", param(args, "query", "created_on"), true],
+        ["description_search", param(args, "query", "description_search"), true],
+        ["ip_search", param(args, "query", "ip_search"), true],
       ],
     }),
   },
   {
     name: "firewall_lockdowns_update",
     title: "Update a Zone Lockdown rule",
-    description: "Updates an existing Zone Lockdown rule.",
+    description: "Updates an existing Zone Lockdown rule.\n\nPUT /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -536,46 +517,49 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "lock_downs_id": {
-          "$ref": "#/$defs/firewall_lockdowns_components-schemas-id",
-          "description": "The unique identifier of the Zone Lockdown rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "lock_downs_id": {
+              "description": "The unique identifier of the Zone Lockdown rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "lock_downs_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "lock_downs_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "firewall_configurations": firewall_configurations,
-        "firewall_identifier": firewall_identifier,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration,
+        "firewall_configurations": firewall_configurations$,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration$,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration$,
         "firewall_urls": firewall_urls,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_zonelockdown_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_configurations": firewall_configurations_output,
-        "firewall_created_on": firewall_created_on_output,
-        "firewall_lockdowns_components-schemas-description": firewall_lockdowns_components_schemas_description_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_modified_on": firewall_modified_on_output,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration_output,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
-        "firewall_schemas-urls": firewall_schemas_urls_output,
-        "firewall_zonelockdown": firewall_zonelockdown_output,
-        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_configurations": firewall_configurations,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration,
+        "firewall_schemas-urls": firewall_schemas$$urls,
+        "firewall_zonelockdown": firewall_zonelockdown,
+        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single,
       },
     },
     annotations: {
@@ -608,21 +592,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_configurations": firewall_configurations_output,
-        "firewall_created_on": firewall_created_on_output,
-        "firewall_lockdowns_components-schemas-description": firewall_lockdowns_components_schemas_description_output,
-        "firewall_lockdowns_components-schemas-id": firewall_lockdowns_components_schemas_id_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_modified_on": firewall_modified_on_output,
-        "firewall_schemas-cidr_configuration": firewall_schemas_cidr_configuration_output,
-        "firewall_schemas-ip_configuration": firewall_schemas_ip_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
-        "firewall_schemas-urls": firewall_schemas_urls_output,
-        "firewall_zonelockdown": firewall_zonelockdown_output,
-        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_configurations": firewall_configurations,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-cidr_configuration": firewall_schemas$$cidr_configuration,
+        "firewall_schemas-ip_configuration": firewall_schemas$$ip_configuration,
+        "firewall_schemas-urls": firewall_schemas$$urls,
+        "firewall_zonelockdown": firewall_zonelockdown,
+        "firewall_zonelockdown_response_single": firewall_zonelockdown_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/firewall/outputs.ts b/src/generated/forge-mcp/firewall/outputs.ts
deleted file mode 100644
index 88cdd0d25..000000000
--- a/src/generated/forge-mcp/firewall/outputs.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `firewall_identifier` in responses.
- */
-export const firewall_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_schemas-paused` in responses.
- */
-export const firewall_schemas_paused_output: JsonSchema = {
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/firewall/payloadLogging/outputs.ts b/src/generated/forge-mcp/firewall/payloadLogging/outputs.ts
index 308bbd0da..4f49cb593 100644
--- a/src/generated/forge-mcp/firewall/payloadLogging/outputs.ts
+++ b/src/generated/forge-mcp/firewall/payloadLogging/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `firewall_payload_logging_key` in responses.
  */
-export const firewall_payload_logging_key_output: JsonSchema = {
+export const firewall_payload_logging_key: JsonSchema = {
   "properties": {
     "public_key": {
       "type": "string"
@@ -21,7 +21,7 @@ export const firewall_payload_logging_key_output: JsonSchema = {
 /**
  * The schema of `firewall_payload_logging_key_response_single` in responses.
  */
-export const firewall_payload_logging_key_response_single_output: JsonSchema = {
+export const firewall_payload_logging_key_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-common"
diff --git a/src/generated/forge-mcp/firewall/payloadLogging/tools.ts b/src/generated/forge-mcp/firewall/payloadLogging/tools.ts
index 20aa29d82..a6e1c808d 100644
--- a/src/generated/forge-mcp/firewall/payloadLogging/tools.ts
+++ b/src/generated/forge-mcp/firewall/payloadLogging/tools.ts
@@ -3,56 +3,62 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  firewall_api_response_common_failure_output,
-  firewall_api_response_common_output,
-  firewall_messages_output,
+  firewall_api$$response$$common,
+  firewall_api$$response$$common$$failure,
+  firewall_messages,
 } from "../../outputs.js";
-import { firewall_account_identifier } from "../schemas.js";
 import {
-  firewall_payload_logging_key_output,
-  firewall_payload_logging_key_response_single_output,
+  firewall_payload_logging_key,
+  firewall_payload_logging_key_response_single,
 } from "./outputs.js";
-import { firewall_payload_logging_key } from "./schemas.js";
+import { firewall_payload_logging_key as firewall_payload_logging_key$ } from "./schemas.js";
 
 /**
- * The tools of `firewall.payload_logging`.
+ * The tools of `firewall.payloadLogging`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "firewall_payload_logging_delete",
+    name: "firewall_payloadLogging_delete",
     title: "Delete the payload logging key",
-    description: "Deletes the payload logging public key of the account or zone.\n\nThis method is beta.",
+    description: "Deletes the payload logging public key of the account or zone.\n\nThis method is beta.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/firewall/payload_logging/key",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/firewall_account_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "firewall_account_identifier": firewall_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_payload_logging_key_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_payload_logging_key": firewall_payload_logging_key_output,
-        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_messages": firewall_messages,
+        "firewall_payload_logging_key": firewall_payload_logging_key,
+        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single,
       },
     },
     annotations: {
@@ -82,11 +88,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_payload_logging_key": firewall_payload_logging_key_output,
-        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_messages": firewall_messages,
+        "firewall_payload_logging_key": firewall_payload_logging_key,
+        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single,
       },
     },
     request: (args) => ({
@@ -94,40 +100,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_payload_logging_get",
+    name: "firewall_payloadLogging_get",
     title: "Get the payload logging key",
-    description: "Fetches the public key that payload logging uses to encrypt matched payloads for the account or zone.\n\nThis method is beta.",
+    description: "Fetches the public key that payload logging uses to encrypt matched payloads for the account or zone.\n\nThis method is beta.\n\nGET /{account_or_zone}/{account_or_zone_id}/firewall/payload_logging/key",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/firewall_account_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "firewall_account_identifier": firewall_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_payload_logging_key_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_payload_logging_key": firewall_payload_logging_key_output,
-        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_messages": firewall_messages,
+        "firewall_payload_logging_key": firewall_payload_logging_key,
+        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single,
       },
     },
     annotations: {
@@ -157,11 +170,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_payload_logging_key": firewall_payload_logging_key_output,
-        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_messages": firewall_messages,
+        "firewall_payload_logging_key": firewall_payload_logging_key,
+        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single,
       },
     },
     request: (args) => ({
@@ -169,45 +182,54 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_payload_logging_update",
+    name: "firewall_payloadLogging_update",
     title: "Set the payload logging key",
-    description: "Creates or replaces the public key that payload logging uses to encrypt matched payloads for the account or zone. It applies to every zone in the account or zone that has no zone key. Requires a plan that includes payload logging (Enterprise); otherwise it returns 403.\n\nThis method is beta.",
+    description: "Creates or replaces the public key that payload logging uses to encrypt matched payloads for the account or zone. It applies to every zone in the account or zone that has no zone key. Requires a plan that includes payload logging (Enterprise); otherwise it returns 403.\n\nThis method is beta.\n\nPUT /{account_or_zone}/{account_or_zone_id}/firewall/payload_logging/key",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/firewall_account_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/firewall_payload_logging_key"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "firewall_account_identifier": firewall_account_identifier,
-        "firewall_payload_logging_key": firewall_payload_logging_key,
+        "firewall_payload_logging_key": firewall_payload_logging_key$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_payload_logging_key_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_payload_logging_key": firewall_payload_logging_key_output,
-        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_messages": firewall_messages,
+        "firewall_payload_logging_key": firewall_payload_logging_key,
+        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single,
       },
     },
     annotations: {
@@ -237,11 +259,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_payload_logging_key": firewall_payload_logging_key_output,
-        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_messages": firewall_messages,
+        "firewall_payload_logging_key": firewall_payload_logging_key,
+        "firewall_payload_logging_key_response_single": firewall_payload_logging_key_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/firewall/schemas.ts b/src/generated/forge-mcp/firewall/schemas.ts
deleted file mode 100644
index d8cc04b8f..000000000
--- a/src/generated/forge-mcp/firewall/schemas.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `firewall_account_identifier`.
- */
-export const firewall_account_identifier: JsonSchema = {
-  "description": "Defines an account identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_description`.
- */
-export const firewall_description: JsonSchema = {
-  "description": "An informative summary of the rule. This value is sanitized and any tags will be removed.",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_identifier`.
- */
-export const firewall_identifier: JsonSchema = {
-  "description": "Defines an identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_schemas-paused`.
- */
-export const firewall_schemas_paused: JsonSchema = {
-  "description": "When true, indicates that the rule is currently paused.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/firewall/uaRules/outputs.ts b/src/generated/forge-mcp/firewall/uaRules/outputs.ts
index c9fb718dc..8e70cc49d 100644
--- a/src/generated/forge-mcp/firewall/uaRules/outputs.ts
+++ b/src/generated/forge-mcp/firewall/uaRules/outputs.ts
@@ -3,62 +3,40 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `firewall_components-schemas-mode` in responses.
- */
-export const firewall_components_schemas_mode_output: JsonSchema = {
-  "enum": [
-    "block",
-    "challenge",
-    "js_challenge",
-    "managed_challenge"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_components-ua-rule-id` in responses.
- */
-export const firewall_components_ua_rule_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_firewalluablock` in responses.
  */
-export const firewall_firewalluablock_output: JsonSchema = {
+export const firewall_firewalluablock: JsonSchema = {
   "properties": {
     "configuration": {
       "$ref": "#/$defs/firewall_schemas-configuration"
     },
     "description": {
-      "$ref": "#/$defs/firewall_firewalluablock_components-schemas-description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/firewall_components-ua-rule-id"
+      "type": "string"
     },
     "mode": {
-      "$ref": "#/$defs/firewall_components-schemas-mode"
+      "enum": [
+        "block",
+        "challenge",
+        "js_challenge",
+        "managed_challenge"
+      ],
+      "type": "string"
     },
     "paused": {
-      "$ref": "#/$defs/firewall_schemas-paused"
+      "type": "boolean"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `firewall_firewalluablock_components-schemas-description` in
- * responses.
- */
-export const firewall_firewalluablock_components_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_firewalluablock_response_collection` in responses.
  */
-export const firewall_firewalluablock_response_collection_output: JsonSchema = {
+export const firewall_firewalluablock_response_collection: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -80,7 +58,7 @@ export const firewall_firewalluablock_response_collection_output: JsonSchema = {
 /**
  * The schema of `firewall_firewalluablock_response_single` in responses.
  */
-export const firewall_firewalluablock_response_single_output: JsonSchema = {
+export const firewall_firewalluablock_response_single: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -99,7 +77,7 @@ export const firewall_firewalluablock_response_single_output: JsonSchema = {
 /**
  * The schema of `firewall_schemas-configuration` in responses.
  */
-export const firewall_schemas_configuration_output: JsonSchema = {
+export const firewall_schemas$$configuration: JsonSchema = {
   "properties": {
     "target": {
       "type": "string"
diff --git a/src/generated/forge-mcp/firewall/uaRules/schemas.ts b/src/generated/forge-mcp/firewall/uaRules/schemas.ts
index d4a9b36c2..55e0d75e6 100644
--- a/src/generated/forge-mcp/firewall/uaRules/schemas.ts
+++ b/src/generated/forge-mcp/firewall/uaRules/schemas.ts
@@ -3,22 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `firewall_components-ua-rule-id`.
- */
-export const firewall_components_ua_rule_id: JsonSchema = {
-  "description": "The unique identifier of the User Agent Blocking rule.",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_description_search`.
- */
-export const firewall_description_search: JsonSchema = {
-  "description": "A string to search for in the description of existing rules.",
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_ua_configuration`.
  */
diff --git a/src/generated/forge-mcp/firewall/uaRules/tools.ts b/src/generated/forge-mcp/firewall/uaRules/tools.ts
index 5914a601c..e296926a7 100644
--- a/src/generated/forge-mcp/firewall/uaRules/tools.ts
+++ b/src/generated/forge-mcp/firewall/uaRules/tools.ts
@@ -1,14 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  firewall_api_response_collection_output,
-  firewall_api_response_common_failure_output,
-  firewall_api_response_common_output,
-  firewall_api_response_single_output,
-  firewall_messages_output,
-  firewall_result_info_output,
+  firewall_api$$response$$collection,
+  firewall_api$$response$$common,
+  firewall_api$$response$$common$$failure,
+  firewall_api$$response$$single,
+  firewall_messages,
+  firewall_result_info,
 } from "../../outputs.js";
 import {
   firewall_asn_configuration,
@@ -17,37 +17,23 @@ import {
   firewall_country_configuration,
   firewall_ip_configuration,
   firewall_ipv6_configuration,
-  firewall_schemas_mode,
 } from "../../schemas.js";
-import { firewall_schemas_paused_output } from "../outputs.js";
 import {
-  firewall_description,
-  firewall_identifier,
-  firewall_schemas_paused,
-} from "../schemas.js";
-import {
-  firewall_components_schemas_mode_output,
-  firewall_components_ua_rule_id_output,
-  firewall_firewalluablock_components_schemas_description_output,
-  firewall_firewalluablock_output,
-  firewall_firewalluablock_response_collection_output,
-  firewall_firewalluablock_response_single_output,
-  firewall_schemas_configuration_output,
+  firewall_firewalluablock,
+  firewall_firewalluablock_response_collection,
+  firewall_firewalluablock_response_single,
+  firewall_schemas$$configuration,
 } from "./outputs.js";
-import {
-  firewall_components_ua_rule_id,
-  firewall_description_search,
-  firewall_ua_configuration,
-} from "./schemas.js";
+import { firewall_ua_configuration } from "./schemas.js";
 
 /**
- * The tools of `firewall.ua_rules`.
+ * The tools of `firewall.uaRules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "firewall_ua_rules_create",
+    name: "firewall_uaRules_create",
     title: "Create a User Agent Blocking rule",
-    description: "Creates a new User Agent Blocking rule in a zone.",
+    description: "Creates a new User Agent Blocking rule in a zone.\n\nPOST /zones/{zone_id}/firewall/ua_rules",
     inputSchema: {
       type: "object",
       properties: {
@@ -57,15 +43,23 @@ export const tools: readonly Tool[] = [
               "$ref": "#/$defs/firewall_ua_configuration"
             },
             "description": {
-              "$ref": "#/$defs/firewall_description",
-              "description": "An informative summary of the rule. This value is sanitized and any tags will be removed."
+              "description": "An informative summary of the rule. This value is sanitized and any tags will be removed.",
+              "type": "string"
             },
             "mode": {
-              "$ref": "#/$defs/firewall_schemas-mode"
+              "description": "The action to apply to a matched request.",
+              "enum": [
+                "block",
+                "challenge",
+                "whitelist",
+                "js_challenge",
+                "managed_challenge"
+              ],
+              "type": "string"
             },
             "paused": {
-              "$ref": "#/$defs/firewall_schemas-paused",
-              "description": "When true, indicates that the rule is currently paused."
+              "description": "When true, indicates that the rule is currently paused.",
+              "type": "boolean"
             }
           },
           "required": [
@@ -74,36 +68,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "firewall_description": firewall_description,
-        "firewall_identifier": firewall_identifier,
-        "firewall_schemas-mode": firewall_schemas_mode,
-        "firewall_schemas-paused": firewall_schemas_paused,
         "firewall_ua_configuration": firewall_ua_configuration,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_firewalluablock_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     annotations: {
@@ -136,17 +132,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     request: (args) => ({
@@ -155,29 +147,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_ua_rules_delete",
+    name: "firewall_uaRules_delete",
     title: "Delete a User Agent Blocking rule",
-    description: "Deletes an existing User Agent Blocking rule.\n\nConfirm with the user before calling this tool. This operation deletes the User Agent Blocking rule from the zone.",
+    description: "Deletes an existing User Agent Blocking rule.\n\nConfirm with the user before calling this tool. This operation deletes the User Agent Blocking rule from the zone.\n\nDELETE /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "ua_rule_id": {
-          "$ref": "#/$defs/firewall_components-ua-rule-id",
-          "description": "The unique identifier of the User Agent Blocking rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ua_rule_id": {
+              "description": "The unique identifier of the User Agent Blocking rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "ua_rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "ua_rule_id"
+        "path"
       ],
-      $defs: {
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id,
-        "firewall_identifier": firewall_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -186,7 +184,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/firewall_components-ua-rule-id"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -199,16 +197,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     annotations: {
@@ -240,7 +234,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/firewall_components-ua-rule-id"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -258,17 +252,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     request: (args) => ({
@@ -276,43 +266,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_ua_rules_get",
+    name: "firewall_uaRules_get",
     title: "Get a User Agent Blocking rule",
-    description: "Fetches the details of a User Agent Blocking rule.",
+    description: "Fetches the details of a User Agent Blocking rule.\n\nGET /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "ua_rule_id": {
-          "$ref": "#/$defs/firewall_components-ua-rule-id",
-          "description": "The unique identifier of the User Agent Blocking rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ua_rule_id": {
+              "description": "The unique identifier of the User Agent Blocking rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "ua_rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "ua_rule_id"
+        "path"
       ],
-      $defs: {
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id,
-        "firewall_identifier": firewall_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_firewalluablock_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     annotations: {
@@ -346,17 +338,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     request: (args) => ({
@@ -364,60 +352,69 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "firewall_ua_rules_list",
+    name: "firewall_uaRules_list",
     title: "List User Agent Blocking rules",
-    description: "Fetches User Agent Blocking rules in a zone. You can filter the results using several optional parameters.",
+    description: "Fetches User Agent Blocking rules in a zone. You can filter the results using several optional parameters.\n\nGET /zones/{zone_id}/firewall/ua_rules",
     inputSchema: {
       type: "object",
       properties: {
-        "description": {
-          "$ref": "#/$defs/firewall_description_search"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "paused": {
-          "description": "When true, indicates that the rule is currently paused.",
-          "type": "boolean"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The maximum number of results per page. You can only set the value to `1` or to a multiple of 5 such as `5`, `10`, `15`, or `20`.",
-          "type": "number"
-        },
-        "user_agent": {
-          "description": "A string to search for in the user agent values of existing rules.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "description": {
+              "description": "A string to search for in the description of existing rules.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "paused": {
+              "description": "When true, indicates that the rule is currently paused.",
+              "type": "boolean"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The maximum number of results per page. You can only set the value to `1` or to a multiple of 5 such as `5`, `10`, `15`, or `20`.",
+              "type": "number"
+            },
+            "user_agent": {
+              "description": "A string to search for in the user agent values of existing rules.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "firewall_description_search": firewall_description_search,
-        "firewall_identifier": firewall_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_firewalluablock_response_collection",
       $defs: {
-        "firewall_api-response-collection": firewall_api_response_collection_output,
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_collection": firewall_firewalluablock_response_collection_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_result_info": firewall_result_info_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-collection": firewall_api$$response$$collection,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_collection": firewall_firewalluablock_response_collection,
+        "firewall_messages": firewall_messages,
+        "firewall_result_info": firewall_result_info,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     annotations: {
@@ -451,35 +448,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-collection": firewall_api_response_collection_output,
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_collection": firewall_firewalluablock_response_collection_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_result_info": firewall_result_info_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-collection": firewall_api$$response$$collection,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_collection": firewall_firewalluablock_response_collection,
+        "firewall_messages": firewall_messages,
+        "firewall_result_info": firewall_result_info,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/firewall/ua_rules`,
       query: [
-        ["page", args["page"], true],
-        ["description", args["description"], true],
-        ["per_page", args["per_page"], true],
-        ["user_agent", args["user_agent"], true],
-        ["paused", args["paused"], true],
+        ["page", param(args, "query", "page"), true],
+        ["description", param(args, "query", "description"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["user_agent", param(args, "query", "user_agent"), true],
+        ["paused", param(args, "query", "paused"), true],
       ],
     }),
   },
   {
-    name: "firewall_ua_rules_update",
+    name: "firewall_uaRules_update",
     title: "Update a User Agent Blocking rule",
-    description: "Updates an existing User Agent Blocking rule.",
+    description: "Updates an existing User Agent Blocking rule.\n\nPUT /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -490,15 +483,23 @@ export const tools: readonly Tool[] = [
               "description": "The rule configuration."
             },
             "description": {
-              "$ref": "#/$defs/firewall_description",
-              "description": "An informative summary of the rule. This value is sanitized and any tags will be removed."
+              "description": "An informative summary of the rule. This value is sanitized and any tags will be removed.",
+              "type": "string"
             },
             "mode": {
-              "$ref": "#/$defs/firewall_schemas-mode"
+              "description": "The action to apply to a matched request.",
+              "enum": [
+                "block",
+                "challenge",
+                "whitelist",
+                "js_challenge",
+                "managed_challenge"
+              ],
+              "type": "string"
             },
             "paused": {
-              "$ref": "#/$defs/firewall_schemas-paused",
-              "description": "When true, indicates that the rule is currently paused."
+              "description": "When true, indicates that the rule is currently paused.",
+              "type": "boolean"
             }
           },
           "required": [
@@ -507,47 +508,48 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "ua_rule_id": {
-          "$ref": "#/$defs/firewall_components-ua-rule-id",
-          "description": "The unique identifier of the User Agent Blocking rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/firewall_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ua_rule_id": {
+              "description": "The unique identifier of the User Agent Blocking rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "ua_rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "ua_rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "firewall_asn_configuration": firewall_asn_configuration,
         "firewall_cidr_configuration": firewall_cidr_configuration,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id,
         "firewall_configuration": firewall_configuration,
         "firewall_country_configuration": firewall_country_configuration,
-        "firewall_description": firewall_description,
-        "firewall_identifier": firewall_identifier,
         "firewall_ip_configuration": firewall_ip_configuration,
         "firewall_ipv6_configuration": firewall_ipv6_configuration,
-        "firewall_schemas-mode": firewall_schemas_mode,
-        "firewall_schemas-paused": firewall_schemas_paused,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_firewalluablock_response_single",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     annotations: {
@@ -580,17 +582,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_components-schemas-mode": firewall_components_schemas_mode_output,
-        "firewall_components-ua-rule-id": firewall_components_ua_rule_id_output,
-        "firewall_firewalluablock": firewall_firewalluablock_output,
-        "firewall_firewalluablock_components-schemas-description": firewall_firewalluablock_components_schemas_description_output,
-        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_schemas-configuration": firewall_schemas_configuration_output,
-        "firewall_schemas-paused": firewall_schemas_paused_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_firewalluablock": firewall_firewalluablock,
+        "firewall_firewalluablock_response_single": firewall_firewalluablock_response_single,
+        "firewall_messages": firewall_messages,
+        "firewall_schemas-configuration": firewall_schemas$$configuration,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/flagship/apps/definitions/outputs.ts b/src/generated/forge-mcp/flagship/apps/definitions/outputs.ts
index 21afa4f35..6884332e0 100644
--- a/src/generated/forge-mcp/flagship/apps/definitions/outputs.ts
+++ b/src/generated/forge-mcp/flagship/apps/definitions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `flagship_EvaluationRule` in responses.
  */
-export const flagship_EvaluationRule_output: JsonSchema = {
+export const flagship_EvaluationRule: JsonSchema = {
   "properties": {
     "conditions": {
       "items": {
@@ -42,7 +42,7 @@ export const flagship_EvaluationRule_output: JsonSchema = {
 /**
  * The schema of `flagship_FlagDefinitions` in responses.
  */
-export const flagship_FlagDefinitions_output: JsonSchema = {
+export const flagship_FlagDefinitions: JsonSchema = {
   "properties": {
     "flags": {
       "additionalProperties": {
diff --git a/src/generated/forge-mcp/flagship/apps/definitions/tools.ts b/src/generated/forge-mcp/flagship/apps/definitions/tools.ts
index 47088f73f..7864dfd53 100644
--- a/src/generated/forge-mcp/flagship/apps/definitions/tools.ts
+++ b/src/generated/forge-mcp/flagship/apps/definitions/tools.ts
@@ -1,24 +1,24 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  flagship_BaseCondition_output,
-  flagship_Condition1_output,
-  flagship_Condition2_output,
-  flagship_Condition3_output,
-  flagship_Condition4_output,
-  flagship_Condition_output,
-  flagship_JsonValue_output,
-  flagship_LogicalCondition1_output,
-  flagship_LogicalCondition2_output,
-  flagship_LogicalCondition3_output,
-  flagship_LogicalCondition4_output,
-  flagship_LogicalCondition_output,
+  flagship_BaseCondition,
+  flagship_Condition,
+  flagship_Condition1,
+  flagship_Condition2,
+  flagship_Condition3,
+  flagship_Condition4,
+  flagship_JsonValue,
+  flagship_LogicalCondition,
+  flagship_LogicalCondition1,
+  flagship_LogicalCondition2,
+  flagship_LogicalCondition3,
+  flagship_LogicalCondition4,
 } from "../outputs.js";
 import {
-  flagship_EvaluationRule_output,
-  flagship_FlagDefinitions_output,
+  flagship_EvaluationRule,
+  flagship_FlagDefinitions,
 } from "./outputs.js";
 
 /**
@@ -28,45 +28,61 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_definitions_get",
     title: "Get flag definitions",
-    description: "Returns an app's evaluation-only flag definitions for SDKs that evaluate locally. Send the returned `ETag` in `If-None-Match` to avoid downloading unchanged definitions.\n\nThis method is beta.",
+    description: "Returns an app's evaluation-only flag definitions for SDKs that evaluate locally. Send the returned `ETag` in `If-None-Match` to avoid downloading unchanged definitions.\n\nThis method is beta.\n\nGET /accounts/{account_id}/flagship/apps/{app_id}/definitions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "If-None-Match": {
+              "description": "Previously returned ETag, or `*`.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "if_none_match": {
-          "description": "Previously returned ETag, or `*`.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/flagship_FlagDefinitions",
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_EvaluationRule": flagship_EvaluationRule_output,
-        "flagship_FlagDefinitions": flagship_FlagDefinitions_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_EvaluationRule": flagship_EvaluationRule,
+        "flagship_FlagDefinitions": flagship_FlagDefinitions,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
       },
     },
     annotations: {
@@ -193,26 +209,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_EvaluationRule": flagship_EvaluationRule_output,
-        "flagship_FlagDefinitions": flagship_FlagDefinitions_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_EvaluationRule": flagship_EvaluationRule,
+        "flagship_FlagDefinitions": flagship_FlagDefinitions,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/flagship/apps/${pathParam(args, "app_id")}/definitions`,
       headers: [
-        ["If-None-Match", args["if_none_match"]],
+        ["If-None-Match", param(args, "headers", "If-None-Match")],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/flagship/apps/evaluate/tools.ts b/src/generated/forge-mcp/flagship/apps/evaluate/tools.ts
index 5ab8724fc..c9a6d15d3 100644
--- a/src/generated/forge-mcp/flagship/apps/evaluate/tools.ts
+++ b/src/generated/forge-mcp/flagship/apps/evaluate/tools.ts
@@ -1,13 +1,13 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  flagship_ApiMessage_output,
-  flagship_Error_output,
-  flagship_EvaluationError_output,
-  flagship_EvaluationResult_output,
-  flagship_JsonValue_output,
+  flagship_ApiMessage,
+  flagship_Error,
+  flagship_EvaluationError,
+  flagship_EvaluationResult,
+  flagship_JsonValue,
 } from "../outputs.js";
 
 /**
@@ -17,38 +17,57 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_evaluate_get",
     title: "Evaluate flag from query context",
-    description: "Evaluates a flag against the provided context. Pass context attributes as query parameters; values are coerced to numbers or booleans where unambiguous. For low-latency in-Worker evaluation, prefer the Flagship binding over this endpoint.\n\nThis method is beta.",
+    description: "Evaluates a flag against the provided context. Pass context attributes as query parameters; values are coerced to numbers or booleans where unambiguous. For low-latency in-Worker evaluation, prefer the Flagship binding over this endpoint.\n\nThis method is beta.\n\nGET /accounts/{account_id}/flagship/apps/{app_id}/evaluate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
-        "flag_key": {
-          "description": "The flag key to evaluate.",
-          "type": "string"
-        },
-        "targeting_key": {
-          "description": "Context targeting key (per OpenFeature spec); used for percentage rollout bucketing.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "flagKey": {
+              "description": "The flag key to evaluate.",
+              "type": "string"
+            },
+            "targetingKey": {
+              "description": "Context targeting key (per OpenFeature spec); used for percentage rollout bucketing.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "flagKey"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "flag_key"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/flagship_EvaluationResult",
       $defs: {
-        "flagship_EvaluationResult": flagship_EvaluationResult_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
+        "flagship_EvaluationResult": flagship_EvaluationResult,
+        "flagship_JsonValue": flagship_JsonValue,
       },
     },
     annotations: {
@@ -103,18 +122,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_Error": flagship_Error_output,
-        "flagship_EvaluationError": flagship_EvaluationError_output,
-        "flagship_EvaluationResult": flagship_EvaluationResult_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_Error": flagship_Error,
+        "flagship_EvaluationError": flagship_EvaluationError,
+        "flagship_EvaluationResult": flagship_EvaluationResult,
+        "flagship_JsonValue": flagship_JsonValue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/flagship/apps/${pathParam(args, "app_id")}/evaluate`,
       query: [
-        ["flagKey", args["flag_key"], true],
-        ["targetingKey", args["targeting_key"], true],
+        ["flagKey", param(args, "query", "flagKey"), true],
+        ["targetingKey", param(args, "query", "targetingKey"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/flagship/apps/flags/changelog/outputs.ts b/src/generated/forge-mcp/flagship/apps/flags/changelog/outputs.ts
index 62906cbe0..5a6b55bad 100644
--- a/src/generated/forge-mcp/flagship/apps/flags/changelog/outputs.ts
+++ b/src/generated/forge-mcp/flagship/apps/flags/changelog/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `flagship_ChangelogEntry` in responses.
  */
-export const flagship_ChangelogEntry_output: JsonSchema = {
+export const flagship_ChangelogEntry: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -95,7 +95,7 @@ export const flagship_ChangelogEntry_output: JsonSchema = {
 /**
  * The schema of `flagship_ChangelogPage` in responses.
  */
-export const flagship_ChangelogPage_output: JsonSchema = {
+export const flagship_ChangelogPage: JsonSchema = {
   "items": {
     "$ref": "#/$defs/flagship_ChangelogEntry"
   },
diff --git a/src/generated/forge-mcp/flagship/apps/flags/changelog/tools.ts b/src/generated/forge-mcp/flagship/apps/flags/changelog/tools.ts
index c6052b933..4bbc5ad2c 100644
--- a/src/generated/forge-mcp/flagship/apps/flags/changelog/tools.ts
+++ b/src/generated/forge-mcp/flagship/apps/flags/changelog/tools.ts
@@ -1,32 +1,29 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  flagship_ApiMessage_output,
-  flagship_BaseCondition_output,
-  flagship_Condition1_output,
-  flagship_Condition2_output,
-  flagship_Condition3_output,
-  flagship_Condition4_output,
-  flagship_Condition_output,
-  flagship_Error_output,
-  flagship_JsonValue_output,
-  flagship_LogicalCondition1_output,
-  flagship_LogicalCondition2_output,
-  flagship_LogicalCondition3_output,
-  flagship_LogicalCondition4_output,
-  flagship_LogicalCondition_output,
+  flagship_ApiMessage,
+  flagship_BaseCondition,
+  flagship_Condition,
+  flagship_Condition1,
+  flagship_Condition2,
+  flagship_Condition3,
+  flagship_Condition4,
+  flagship_Error,
+  flagship_JsonValue,
+  flagship_LogicalCondition,
+  flagship_LogicalCondition1,
+  flagship_LogicalCondition2,
+  flagship_LogicalCondition3,
+  flagship_LogicalCondition4,
 } from "../../outputs.js";
 import {
-  flagship_Flag_output,
-  flagship_ResultInfo_output,
-  flagship_Rule_output,
+  flagship_Flag,
+  flagship_ResultInfo,
+  flagship_Rule,
 } from "../outputs.js";
-import {
-  flagship_ChangelogEntry_output,
-  flagship_ChangelogPage_output,
-} from "./outputs.js";
+import { flagship_ChangelogEntry, flagship_ChangelogPage } from "./outputs.js";
 
 /**
  * The tools of `flagship.apps.flags.changelog`.
@@ -35,36 +32,52 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_flags_changelog_list",
     title: "List flag changelog entries",
-    description: "Returns the audit history for a flag, newest first. Each entry includes the event type and full flag state after the change; `update` entries include a field-level diff. Capped at 200 entries per flag.\n\nThis method is beta.",
+    description: "Returns the audit history for a flag, newest first. Each entry includes the event type and full flag state after the change; `update` entries include a field-level diff. Capped at 200 entries per flag.\n\nThis method is beta.\n\nGET /accounts/{account_id}/flagship/apps/{app_id}/flags/{flag_key}/changelog",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from a previous response.",
-          "type": "string"
-        },
-        "flag_key": {
-          "description": "Case-sensitive key identifying the flag within the app.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            },
+            "flag_key": {
+              "description": "Case-sensitive key identifying the flag within the app.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "flag_key"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "description": "Max items to return (1–200).",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from a previous response.",
+              "type": "string"
+            },
+            "limit": {
+              "description": "Max items to return (1–200).",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "flag_key"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -115,23 +128,23 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_ChangelogEntry": flagship_ChangelogEntry_output,
-        "flagship_ChangelogPage": flagship_ChangelogPage_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_ResultInfo": flagship_ResultInfo_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_ChangelogEntry": flagship_ChangelogEntry,
+        "flagship_ChangelogPage": flagship_ChangelogPage,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_ResultInfo": flagship_ResultInfo,
+        "flagship_Rule": flagship_Rule,
       },
     },
     annotations: {
@@ -231,32 +244,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_ChangelogEntry": flagship_ChangelogEntry_output,
-        "flagship_ChangelogPage": flagship_ChangelogPage_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Error": flagship_Error_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_ResultInfo": flagship_ResultInfo_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_ChangelogEntry": flagship_ChangelogEntry,
+        "flagship_ChangelogPage": flagship_ChangelogPage,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Error": flagship_Error,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_ResultInfo": flagship_ResultInfo,
+        "flagship_Rule": flagship_Rule,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/flagship/apps/${pathParam(args, "app_id")}/flags/${pathParam(args, "flag_key")}/changelog`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/flagship/apps/flags/outputs.ts b/src/generated/forge-mcp/flagship/apps/flags/outputs.ts
index e6bc57e06..eef7cd0dd 100644
--- a/src/generated/forge-mcp/flagship/apps/flags/outputs.ts
+++ b/src/generated/forge-mcp/flagship/apps/flags/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `flagship_DeleteFlagResult` in responses.
  */
-export const flagship_DeleteFlagResult_output: JsonSchema = {
+export const flagship_DeleteFlagResult: JsonSchema = {
   "properties": {
     "key": {
       "type": "string"
@@ -21,7 +21,7 @@ export const flagship_DeleteFlagResult_output: JsonSchema = {
 /**
  * The schema of `flagship_Flag` in responses.
  */
-export const flagship_Flag_output: JsonSchema = {
+export const flagship_Flag: JsonSchema = {
   "properties": {
     "default_variation": {
       "type": "string"
@@ -100,7 +100,7 @@ export const flagship_Flag_output: JsonSchema = {
 /**
  * The schema of `flagship_FlagsPage` in responses.
  */
-export const flagship_FlagsPage_output: JsonSchema = {
+export const flagship_FlagsPage: JsonSchema = {
   "items": {
     "$ref": "#/$defs/flagship_Flag"
   },
@@ -110,7 +110,7 @@ export const flagship_FlagsPage_output: JsonSchema = {
 /**
  * The schema of `flagship_ResultInfo` in responses.
  */
-export const flagship_ResultInfo_output: JsonSchema = {
+export const flagship_ResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -136,7 +136,7 @@ export const flagship_ResultInfo_output: JsonSchema = {
 /**
  * The schema of `flagship_Rule` in responses.
  */
-export const flagship_Rule_output: JsonSchema = {
+export const flagship_Rule: JsonSchema = {
   "properties": {
     "conditions": {
       "items": {
diff --git a/src/generated/forge-mcp/flagship/apps/flags/tools.ts b/src/generated/forge-mcp/flagship/apps/flags/tools.ts
index b3ef855aa..46e53adc1 100644
--- a/src/generated/forge-mcp/flagship/apps/flags/tools.ts
+++ b/src/generated/forge-mcp/flagship/apps/flags/tools.ts
@@ -1,47 +1,47 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
-import {
-  flagship_ApiMessage_output,
-  flagship_BaseCondition_output,
-  flagship_Condition1_output,
-  flagship_Condition2_output,
-  flagship_Condition3_output,
-  flagship_Condition4_output,
-  flagship_Condition_output,
-  flagship_Error_output,
-  flagship_EvaluationError_output,
-  flagship_EvaluationResult_output,
-  flagship_JsonValue_output,
-  flagship_LogicalCondition1_output,
-  flagship_LogicalCondition2_output,
-  flagship_LogicalCondition3_output,
-  flagship_LogicalCondition4_output,
-  flagship_LogicalCondition_output,
-} from "../outputs.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
+  flagship_ApiMessage,
   flagship_BaseCondition,
   flagship_Condition,
   flagship_Condition1,
   flagship_Condition2,
   flagship_Condition3,
   flagship_Condition4,
+  flagship_Error,
+  flagship_EvaluationError,
+  flagship_EvaluationResult,
   flagship_JsonValue,
   flagship_LogicalCondition,
   flagship_LogicalCondition1,
   flagship_LogicalCondition2,
   flagship_LogicalCondition3,
   flagship_LogicalCondition4,
+} from "../outputs.js";
+import {
+  flagship_BaseCondition as flagship_BaseCondition$,
+  flagship_Condition as flagship_Condition$,
+  flagship_Condition1 as flagship_Condition1$,
+  flagship_Condition2 as flagship_Condition2$,
+  flagship_Condition3 as flagship_Condition3$,
+  flagship_Condition4 as flagship_Condition4$,
+  flagship_JsonValue as flagship_JsonValue$,
+  flagship_LogicalCondition as flagship_LogicalCondition$,
+  flagship_LogicalCondition1 as flagship_LogicalCondition1$,
+  flagship_LogicalCondition2 as flagship_LogicalCondition2$,
+  flagship_LogicalCondition3 as flagship_LogicalCondition3$,
+  flagship_LogicalCondition4 as flagship_LogicalCondition4$,
 } from "../schemas.js";
 import {
-  flagship_DeleteFlagResult_output,
-  flagship_Flag_output,
-  flagship_FlagsPage_output,
-  flagship_ResultInfo_output,
-  flagship_Rule_output,
+  flagship_DeleteFlagResult,
+  flagship_Flag,
+  flagship_FlagsPage,
+  flagship_ResultInfo,
+  flagship_Rule,
 } from "./outputs.js";
-import { flagship_Rule } from "./schemas.js";
+import { flagship_Rule as flagship_Rule$ } from "./schemas.js";
 
 /**
  * The tools of `flagship.apps.flags`.
@@ -50,18 +50,10 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_flags_create",
     title: "Create flag",
-    description: "Creates a flag. Returns 409 if the key already exists. `type` is always inferred from variation values; legacy request-side values are ignored. Optional `metadata` can be attached at creation.\n\nThis method is beta.",
+    description: "Creates a flag. Returns 409 if the key already exists. `type` is always inferred from variation values; legacy request-side values are ignored. Optional `metadata` can be attached at creation.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/flagship/apps/{app_id}/flags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "default_variation": {
@@ -145,27 +137,45 @@ export const tools: readonly Tool[] = [
             "variations"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition,
-        "flagship_Condition": flagship_Condition,
-        "flagship_Condition1": flagship_Condition1,
-        "flagship_Condition2": flagship_Condition2,
-        "flagship_Condition3": flagship_Condition3,
-        "flagship_Condition4": flagship_Condition4,
-        "flagship_JsonValue": flagship_JsonValue,
-        "flagship_LogicalCondition": flagship_LogicalCondition,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4,
-        "flagship_Rule": flagship_Rule,
+        "flagship_BaseCondition": flagship_BaseCondition$,
+        "flagship_Condition": flagship_Condition$,
+        "flagship_Condition1": flagship_Condition1$,
+        "flagship_Condition2": flagship_Condition2$,
+        "flagship_Condition3": flagship_Condition3$,
+        "flagship_Condition4": flagship_Condition4$,
+        "flagship_JsonValue": flagship_JsonValue$,
+        "flagship_LogicalCondition": flagship_LogicalCondition$,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1$,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2$,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3$,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4$,
+        "flagship_Rule": flagship_Rule$,
       },
     },
     outputSchema: {
@@ -213,20 +223,20 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_Rule": flagship_Rule,
       },
     },
     annotations: {
@@ -321,22 +331,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Error": flagship_Error_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Error": flagship_Error,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_Rule": flagship_Rule,
       },
     },
     request: (args) => ({
@@ -347,28 +357,38 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_flags_delete",
     title: "Delete flag",
-    description: "Deletes a flag permanently. After deletion propagates, direct evaluations return not found; typed binding accessors may return the caller-supplied default. Cannot be undone.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this feature flag? After the deletion propagates, evaluation requests can no longer resolve it. This action cannot be undone.",
+    description: "Deletes a flag permanently. After deletion propagates, direct evaluations return not found; typed binding accessors may return the caller-supplied default. Cannot be undone.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this feature flag? After the deletion propagates, evaluation requests can no longer resolve it. This action cannot be undone.\n\nDELETE /accounts/{account_id}/flagship/apps/{app_id}/flags/{flag_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
-        "flag_key": {
-          "description": "Case-sensitive key identifying the flag within the app.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            },
+            "flag_key": {
+              "description": "Case-sensitive key identifying the flag within the app.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "flag_key"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "flag_key"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -415,7 +435,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_DeleteFlagResult": flagship_DeleteFlagResult_output,
+        "flagship_DeleteFlagResult": flagship_DeleteFlagResult,
       },
     },
     annotations: {
@@ -510,9 +530,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_DeleteFlagResult": flagship_DeleteFlagResult_output,
-        "flagship_Error": flagship_Error_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_DeleteFlagResult": flagship_DeleteFlagResult,
+        "flagship_Error": flagship_Error,
       },
     },
     request: (args) => ({
@@ -522,18 +542,10 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_flags_evaluate",
     title: "Evaluate flag with JSON context",
-    description: "Evaluates a flag against the provided context, passed as a JSON request body (OFREP-shaped) rather than query parameters. Returns the same response shape as the GET variant.\n\nThis method is beta.",
+    description: "Evaluates a flag against the provided context, passed as a JSON request body (OFREP-shaped) rather than query parameters. Returns the same response shape as the GET variant.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/flagship/apps/{app_id}/evaluate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "context": {
@@ -553,22 +565,40 @@ export const tools: readonly Tool[] = [
             "flagKey"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_JsonValue": flagship_JsonValue$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/flagship_EvaluationResult",
       $defs: {
-        "flagship_EvaluationResult": flagship_EvaluationResult_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
+        "flagship_EvaluationResult": flagship_EvaluationResult,
+        "flagship_JsonValue": flagship_JsonValue,
       },
     },
     annotations: {
@@ -623,11 +653,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_Error": flagship_Error_output,
-        "flagship_EvaluationError": flagship_EvaluationError_output,
-        "flagship_EvaluationResult": flagship_EvaluationResult_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_Error": flagship_Error,
+        "flagship_EvaluationError": flagship_EvaluationError,
+        "flagship_EvaluationResult": flagship_EvaluationResult,
+        "flagship_JsonValue": flagship_JsonValue,
       },
     },
     request: (args) => ({
@@ -638,28 +668,38 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_flags_get",
     title: "Get flag",
-    description: "Returns the full flag definition including rules, variations, metadata, and audit fields.\n\nThis method is beta.",
+    description: "Returns the full flag definition including rules, variations, metadata, and audit fields.\n\nThis method is beta.\n\nGET /accounts/{account_id}/flagship/apps/{app_id}/flags/{flag_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
-        "flag_key": {
-          "description": "Case-sensitive key identifying the flag within the app.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            },
+            "flag_key": {
+              "description": "Case-sensitive key identifying the flag within the app.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "flag_key"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "flag_key"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -706,20 +746,20 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_Rule": flagship_Rule,
       },
     },
     annotations: {
@@ -815,22 +855,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Error": flagship_Error_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Error": flagship_Error,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_Rule": flagship_Rule,
       },
     },
     request: (args) => ({
@@ -840,31 +880,47 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_flags_list",
     title: "List flags",
-    description: "Lists an app's flags ordered by key. Pass `cursor` from `result_info` to page forward; a null cursor indicates the last page.\n\nThis method is beta.",
+    description: "Lists an app's flags ordered by key. Pass `cursor` from `result_info` to page forward; a null cursor indicates the last page.\n\nThis method is beta.\n\nGET /accounts/{account_id}/flagship/apps/{app_id}/flags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from a previous response.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "description": "Max items to return (1–200).",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from a previous response.",
+              "type": "string"
+            },
+            "limit": {
+              "description": "Max items to return (1–200).",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -915,22 +971,22 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_FlagsPage": flagship_FlagsPage_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_ResultInfo": flagship_ResultInfo_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Flag": flagship_Flag,
+        "flagship_FlagsPage": flagship_FlagsPage,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_ResultInfo": flagship_ResultInfo,
+        "flagship_Rule": flagship_Rule,
       },
     },
     annotations: {
@@ -1030,49 +1086,41 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Error": flagship_Error_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_FlagsPage": flagship_FlagsPage_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_ResultInfo": flagship_ResultInfo_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Error": flagship_Error,
+        "flagship_Flag": flagship_Flag,
+        "flagship_FlagsPage": flagship_FlagsPage,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_ResultInfo": flagship_ResultInfo,
+        "flagship_Rule": flagship_Rule,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/flagship/apps/${pathParam(args, "app_id")}/flags`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
     name: "flagship_apps_flags_patch",
     title: "Partially update flag",
-    description: "Applies a partial update to lightweight flag fields: `enabled`, `description`, `metadata`, and `default_variation`. Only fields present in the request body are modified; omitted fields are preserved. `metadata: null` or an empty object clears metadata. `default_variation` must exist in the current `variations`. Structural changes to `variations` and `rules` use PUT. A changelog entry is appended when the flag content actually changes.\n\nThis method is beta.",
+    description: "Applies a partial update to lightweight flag fields: `enabled`, `description`, `metadata`, and `default_variation`. Only fields present in the request body are modified; omitted fields are preserved. `metadata: null` or an empty object clears metadata. `default_variation` must exist in the current `variations`. Structural changes to `variations` and `rules` use PUT. A changelog entry is appended when the flag content actually changes.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/flagship/apps/{app_id}/flags/{flag_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "default_variation": {
@@ -1121,17 +1169,35 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "flag_key": {
-          "description": "Case-sensitive key identifying the flag within the app.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            },
+            "flag_key": {
+              "description": "Case-sensitive key identifying the flag within the app.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "flag_key"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "flag_key",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1178,20 +1244,20 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_Rule": flagship_Rule,
       },
     },
     annotations: {
@@ -1286,22 +1352,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Error": flagship_Error_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Error": flagship_Error,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_Rule": flagship_Rule,
       },
     },
     request: (args) => ({
@@ -1312,18 +1378,10 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_flags_update",
     title: "Update flag",
-    description: "Replaces the entire flag definition. Omitted fields are cleared, not preserved — read before writing. The path key identifies the flag and cannot be renamed by changing the body `key`. A changelog entry is appended when the flag content actually changes; identical updates are no-ops.\n\nThis method is beta.",
+    description: "Replaces the entire flag definition. Omitted fields are cleared, not preserved — read before writing. The path key identifies the flag and cannot be renamed by changing the body `key`. A changelog entry is appended when the flag content actually changes; identical updates are no-ops.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/flagship/apps/{app_id}/flags/{flag_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "default_variation": {
@@ -1408,31 +1466,49 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "flag_key": {
-          "description": "Case-sensitive key identifying the flag within the app.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            },
+            "flag_key": {
+              "description": "Case-sensitive key identifying the flag within the app.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "flag_key"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "flag_key",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition,
-        "flagship_Condition": flagship_Condition,
-        "flagship_Condition1": flagship_Condition1,
-        "flagship_Condition2": flagship_Condition2,
-        "flagship_Condition3": flagship_Condition3,
-        "flagship_Condition4": flagship_Condition4,
-        "flagship_JsonValue": flagship_JsonValue,
-        "flagship_LogicalCondition": flagship_LogicalCondition,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4,
-        "flagship_Rule": flagship_Rule,
+        "flagship_BaseCondition": flagship_BaseCondition$,
+        "flagship_Condition": flagship_Condition$,
+        "flagship_Condition1": flagship_Condition1$,
+        "flagship_Condition2": flagship_Condition2$,
+        "flagship_Condition3": flagship_Condition3$,
+        "flagship_Condition4": flagship_Condition4$,
+        "flagship_JsonValue": flagship_JsonValue$,
+        "flagship_LogicalCondition": flagship_LogicalCondition$,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1$,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2$,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3$,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4$,
+        "flagship_Rule": flagship_Rule$,
       },
     },
     outputSchema: {
@@ -1480,20 +1556,20 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_Rule": flagship_Rule,
       },
     },
     annotations: {
@@ -1588,22 +1664,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_BaseCondition": flagship_BaseCondition_output,
-        "flagship_Condition": flagship_Condition_output,
-        "flagship_Condition1": flagship_Condition1_output,
-        "flagship_Condition2": flagship_Condition2_output,
-        "flagship_Condition3": flagship_Condition3_output,
-        "flagship_Condition4": flagship_Condition4_output,
-        "flagship_Error": flagship_Error_output,
-        "flagship_Flag": flagship_Flag_output,
-        "flagship_JsonValue": flagship_JsonValue_output,
-        "flagship_LogicalCondition": flagship_LogicalCondition_output,
-        "flagship_LogicalCondition1": flagship_LogicalCondition1_output,
-        "flagship_LogicalCondition2": flagship_LogicalCondition2_output,
-        "flagship_LogicalCondition3": flagship_LogicalCondition3_output,
-        "flagship_LogicalCondition4": flagship_LogicalCondition4_output,
-        "flagship_Rule": flagship_Rule_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_BaseCondition": flagship_BaseCondition,
+        "flagship_Condition": flagship_Condition,
+        "flagship_Condition1": flagship_Condition1,
+        "flagship_Condition2": flagship_Condition2,
+        "flagship_Condition3": flagship_Condition3,
+        "flagship_Condition4": flagship_Condition4,
+        "flagship_Error": flagship_Error,
+        "flagship_Flag": flagship_Flag,
+        "flagship_JsonValue": flagship_JsonValue,
+        "flagship_LogicalCondition": flagship_LogicalCondition,
+        "flagship_LogicalCondition1": flagship_LogicalCondition1,
+        "flagship_LogicalCondition2": flagship_LogicalCondition2,
+        "flagship_LogicalCondition3": flagship_LogicalCondition3,
+        "flagship_LogicalCondition4": flagship_LogicalCondition4,
+        "flagship_Rule": flagship_Rule,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/flagship/apps/outputs.ts b/src/generated/forge-mcp/flagship/apps/outputs.ts
index ee1d1edab..e6c779cd0 100644
--- a/src/generated/forge-mcp/flagship/apps/outputs.ts
+++ b/src/generated/forge-mcp/flagship/apps/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `flagship_ApiMessage` in responses.
  */
-export const flagship_ApiMessage_output: JsonSchema = {
+export const flagship_ApiMessage: JsonSchema = {
   "properties": {
     "message": {
       "type": "string"
@@ -21,7 +21,7 @@ export const flagship_ApiMessage_output: JsonSchema = {
 /**
  * The schema of `flagship_App` in responses.
  */
-export const flagship_App_output: JsonSchema = {
+export const flagship_App: JsonSchema = {
   "properties": {
     "created_at": {
       "type": "string"
@@ -52,7 +52,7 @@ export const flagship_App_output: JsonSchema = {
 /**
  * The schema of `flagship_BaseCondition` in responses.
  */
-export const flagship_BaseCondition_output: JsonSchema = {
+export const flagship_BaseCondition: JsonSchema = {
   "properties": {
     "attribute": {
       "type": "string"
@@ -90,7 +90,7 @@ export const flagship_BaseCondition_output: JsonSchema = {
 /**
  * The schema of `flagship_Condition` in responses.
  */
-export const flagship_Condition_output: JsonSchema = {
+export const flagship_Condition: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/flagship_BaseCondition"
@@ -104,7 +104,7 @@ export const flagship_Condition_output: JsonSchema = {
 /**
  * The schema of `flagship_Condition1` in responses.
  */
-export const flagship_Condition1_output: JsonSchema = {
+export const flagship_Condition1: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/flagship_BaseCondition"
@@ -118,7 +118,7 @@ export const flagship_Condition1_output: JsonSchema = {
 /**
  * The schema of `flagship_Condition2` in responses.
  */
-export const flagship_Condition2_output: JsonSchema = {
+export const flagship_Condition2: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/flagship_BaseCondition"
@@ -132,7 +132,7 @@ export const flagship_Condition2_output: JsonSchema = {
 /**
  * The schema of `flagship_Condition3` in responses.
  */
-export const flagship_Condition3_output: JsonSchema = {
+export const flagship_Condition3: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/flagship_BaseCondition"
@@ -146,7 +146,7 @@ export const flagship_Condition3_output: JsonSchema = {
 /**
  * The schema of `flagship_Condition4` in responses.
  */
-export const flagship_Condition4_output: JsonSchema = {
+export const flagship_Condition4: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/flagship_BaseCondition"
@@ -160,7 +160,7 @@ export const flagship_Condition4_output: JsonSchema = {
 /**
  * The schema of `flagship_DeleteAppResult` in responses.
  */
-export const flagship_DeleteAppResult_output: JsonSchema = {
+export const flagship_DeleteAppResult: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -175,7 +175,7 @@ export const flagship_DeleteAppResult_output: JsonSchema = {
 /**
  * The schema of `flagship_Error` in responses.
  */
-export const flagship_Error_output: JsonSchema = {
+export const flagship_Error: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -208,7 +208,7 @@ export const flagship_Error_output: JsonSchema = {
 /**
  * The schema of `flagship_EvaluationError` in responses.
  */
-export const flagship_EvaluationError_output: JsonSchema = {
+export const flagship_EvaluationError: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/flagship_Error"
@@ -239,7 +239,7 @@ export const flagship_EvaluationError_output: JsonSchema = {
 /**
  * The schema of `flagship_EvaluationResult` in responses.
  */
-export const flagship_EvaluationResult_output: JsonSchema = {
+export const flagship_EvaluationResult: JsonSchema = {
   "properties": {
     "flagKey": {
       "type": "string"
@@ -288,7 +288,7 @@ export const flagship_EvaluationResult_output: JsonSchema = {
 /**
  * The schema of `flagship_JsonValue` in responses.
  */
-export const flagship_JsonValue_output: JsonSchema = {
+export const flagship_JsonValue: JsonSchema = {
   "oneOf": [
     {
       "type": "string"
@@ -320,7 +320,7 @@ export const flagship_JsonValue_output: JsonSchema = {
 /**
  * The schema of `flagship_LogicalCondition` in responses.
  */
-export const flagship_LogicalCondition_output: JsonSchema = {
+export const flagship_LogicalCondition: JsonSchema = {
   "properties": {
     "clauses": {
       "items": {
@@ -347,7 +347,7 @@ export const flagship_LogicalCondition_output: JsonSchema = {
 /**
  * The schema of `flagship_LogicalCondition1` in responses.
  */
-export const flagship_LogicalCondition1_output: JsonSchema = {
+export const flagship_LogicalCondition1: JsonSchema = {
   "properties": {
     "clauses": {
       "items": {
@@ -374,7 +374,7 @@ export const flagship_LogicalCondition1_output: JsonSchema = {
 /**
  * The schema of `flagship_LogicalCondition2` in responses.
  */
-export const flagship_LogicalCondition2_output: JsonSchema = {
+export const flagship_LogicalCondition2: JsonSchema = {
   "properties": {
     "clauses": {
       "items": {
@@ -401,7 +401,7 @@ export const flagship_LogicalCondition2_output: JsonSchema = {
 /**
  * The schema of `flagship_LogicalCondition3` in responses.
  */
-export const flagship_LogicalCondition3_output: JsonSchema = {
+export const flagship_LogicalCondition3: JsonSchema = {
   "properties": {
     "clauses": {
       "items": {
@@ -428,7 +428,7 @@ export const flagship_LogicalCondition3_output: JsonSchema = {
 /**
  * The schema of `flagship_LogicalCondition4` in responses.
  */
-export const flagship_LogicalCondition4_output: JsonSchema = {
+export const flagship_LogicalCondition4: JsonSchema = {
   "properties": {
     "clauses": {
       "items": {
diff --git a/src/generated/forge-mcp/flagship/apps/tools.ts b/src/generated/forge-mcp/flagship/apps/tools.ts
index 631ac7cbb..b72954c8a 100644
--- a/src/generated/forge-mcp/flagship/apps/tools.ts
+++ b/src/generated/forge-mcp/flagship/apps/tools.ts
@@ -3,10 +3,10 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  flagship_ApiMessage_output,
-  flagship_App_output,
-  flagship_DeleteAppResult_output,
-  flagship_Error_output,
+  flagship_ApiMessage,
+  flagship_App,
+  flagship_DeleteAppResult,
+  flagship_Error,
 } from "./outputs.js";
 
 /**
@@ -16,14 +16,10 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_create",
     title: "Create app",
-    description: "Creates an app. The returned `id` is used in all subsequent flag, changelog, and evaluation requests.\n\nThis method is beta.",
+    description: "Creates an app. The returned `id` is used in all subsequent flag, changelog, and evaluation requests.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/flagship/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "name": {
@@ -35,12 +31,26 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -87,7 +97,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_App": flagship_App_output,
+        "flagship_App": flagship_App,
       },
     },
     annotations: {
@@ -182,9 +192,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_App": flagship_App_output,
-        "flagship_Error": flagship_Error_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_App": flagship_App,
+        "flagship_Error": flagship_Error,
       },
     },
     request: (args) => ({
@@ -195,23 +205,33 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_delete",
     title: "Delete app",
-    description: "Deletes an app and all its flags and changelog history. Returns 409 if any Worker still references this app via a Flagship binding.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this Flagship app, all of its flags, and all changelog history? This action cannot be undone.",
+    description: "Deletes an app and all its flags and changelog history. Returns 409 if any Worker still references this app via a Flagship binding.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this Flagship app, all of its flags, and all changelog history? This action cannot be undone.\n\nDELETE /accounts/{account_id}/flagship/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -258,7 +278,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_DeleteAppResult": flagship_DeleteAppResult_output,
+        "flagship_DeleteAppResult": flagship_DeleteAppResult,
       },
     },
     annotations: {
@@ -356,9 +376,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_DeleteAppResult": flagship_DeleteAppResult_output,
-        "flagship_Error": flagship_Error_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_DeleteAppResult": flagship_DeleteAppResult,
+        "flagship_Error": flagship_Error,
       },
     },
     request: (args) => ({
@@ -368,23 +388,33 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_get",
     title: "Get app",
-    description: "Returns an app's name and audit fields. Flag definitions are not included.\n\nThis method is beta.",
+    description: "Returns an app's name and audit fields. Flag definitions are not included.\n\nThis method is beta.\n\nGET /accounts/{account_id}/flagship/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -431,7 +461,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_App": flagship_App_output,
+        "flagship_App": flagship_App,
       },
     },
     annotations: {
@@ -527,9 +557,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_App": flagship_App_output,
-        "flagship_Error": flagship_Error_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_App": flagship_App,
+        "flagship_Error": flagship_Error,
       },
     },
     request: (args) => ({
@@ -539,18 +569,28 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_list",
     title: "List apps",
-    description: "Lists all Flagship apps in the account. Returns identity and audit fields only; flag definitions are not included.\n\nThis method is beta.",
+    description: "Lists all Flagship apps in the account. Returns identity and audit fields only; flag definitions are not included.\n\nThis method is beta.\n\nGET /accounts/{account_id}/flagship/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -600,7 +640,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_App": flagship_App_output,
+        "flagship_App": flagship_App,
       },
     },
     annotations: {
@@ -699,9 +739,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_App": flagship_App_output,
-        "flagship_Error": flagship_Error_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_App": flagship_App,
+        "flagship_Error": flagship_Error,
       },
     },
     request: (args) => ({
@@ -711,18 +751,10 @@ export const tools: readonly Tool[] = [
   {
     name: "flagship_apps_update",
     title: "Update app",
-    description: "Updates an app. Only `name` is mutable.\n\nThis method is beta.",
+    description: "Updates an app. Only `name` is mutable.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/flagship/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID that owns the Flagship app.",
-          "type": "string"
-        },
-        "app_id": {
-          "description": "Flagship app ID returned when the app was created.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "name": {
@@ -731,13 +763,31 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the Flagship app.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "Flagship app ID returned when the app was created.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -784,7 +834,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "flagship_App": flagship_App_output,
+        "flagship_App": flagship_App,
       },
     },
     annotations: {
@@ -879,9 +929,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "flagship_ApiMessage": flagship_ApiMessage_output,
-        "flagship_App": flagship_App_output,
-        "flagship_Error": flagship_Error_output,
+        "flagship_ApiMessage": flagship_ApiMessage,
+        "flagship_App": flagship_App,
+        "flagship_Error": flagship_Error,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/fraud/outputs.ts b/src/generated/forge-mcp/fraud/outputs.ts
index 828ecbd21..9e573cbc8 100644
--- a/src/generated/forge-mcp/fraud/outputs.ts
+++ b/src/generated/forge-mcp/fraud/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `fraud_api-response-common-failure` in responses.
  */
-export const fraud_api_response_common_failure_output: JsonSchema = {
+export const fraud_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/fraud_messages"
@@ -36,7 +36,7 @@ export const fraud_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `fraud_api-response-single` in responses.
  */
-export const fraud_api_response_single_output: JsonSchema = {
+export const fraud_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/fraud_messages"
@@ -62,7 +62,7 @@ export const fraud_api_response_single_output: JsonSchema = {
 /**
  * The schema of `fraud_auth_criteria` in responses.
  */
-export const fraud_auth_criteria_output: JsonSchema = {
+export const fraud_auth_criteria: JsonSchema = {
   "properties": {
     "kind": {
       "enum": [
@@ -87,7 +87,7 @@ export const fraud_auth_criteria_output: JsonSchema = {
 /**
  * The schema of `fraud_authentication_settings` in responses.
  */
-export const fraud_authentication_settings_output: JsonSchema = {
+export const fraud_authentication_settings: JsonSchema = {
   "properties": {
     "failure_criteria": {
       "$ref": "#/$defs/fraud_auth_criteria"
@@ -102,13 +102,17 @@ export const fraud_authentication_settings_output: JsonSchema = {
 /**
  * The schema of `fraud_fraud_settings` in responses.
  */
-export const fraud_fraud_settings_output: JsonSchema = {
+export const fraud_fraud_settings: JsonSchema = {
   "properties": {
     "authentication_settings": {
       "$ref": "#/$defs/fraud_authentication_settings"
     },
     "user_profiles": {
-      "$ref": "#/$defs/fraud_user_profiles_status"
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     },
     "username_expressions": {
       "$ref": "#/$defs/fraud_username_expressions"
@@ -120,7 +124,7 @@ export const fraud_fraud_settings_output: JsonSchema = {
 /**
  * The schema of `fraud_fraud_settings_response_body` in responses.
  */
-export const fraud_fraud_settings_response_body_output: JsonSchema = {
+export const fraud_fraud_settings_response_body: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/fraud_api-response-single"
@@ -139,7 +143,7 @@ export const fraud_fraud_settings_response_body_output: JsonSchema = {
 /**
  * The schema of `fraud_messages` in responses.
  */
-export const fraud_messages_output: JsonSchema = {
+export const fraud_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -169,21 +173,10 @@ export const fraud_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `fraud_user_profiles_status` in responses.
- */
-export const fraud_user_profiles_status_output: JsonSchema = {
-  "enum": [
-    "enabled",
-    "disabled"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `fraud_username_expressions` in responses.
  */
-export const fraud_username_expressions_output: JsonSchema = {
+export const fraud_username_expressions: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/fraud/schemas.ts b/src/generated/forge-mcp/fraud/schemas.ts
index 5d1c6356a..9ea627975 100644
--- a/src/generated/forge-mcp/fraud/schemas.ts
+++ b/src/generated/forge-mcp/fraud/schemas.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../_/tool.js";
  * The schema of `fraud_auth_criteria`.
  */
 export const fraud_auth_criteria: JsonSchema = {
-  "description": "A criterion for determining authentication outcome. The `kind` field determines which\nother fields are used for matching.\n",
+  "description": "A criterion for determining authentication outcome. The `kind` field determines which\nother fields are used for matching.",
   "properties": {
     "kind": {
       "description": "The type of criterion. Currently only `status_code` is supported.",
@@ -17,7 +17,7 @@ export const fraud_auth_criteria: JsonSchema = {
       "type": "string"
     },
     "status_codes": {
-      "description": "HTTP status codes to match against the origin response.\n- Maximum of 10 codes per criterion.\n- Each code must be a valid HTTP status code (100-599).\n- Codes are deduplicated and sorted on save.\n- Omit to leave unchanged on update.\n- Provide an empty array `[]` to clear codes on update.\n",
+      "description": "HTTP status codes to match against the origin response.\n- Maximum of 10 codes per criterion.\n- Each code must be a valid HTTP status code (100-599).\n- Codes are deduplicated and sorted on save.\n- Omit to leave unchanged on update.\n- Provide an empty array `[]` to clear codes on update.",
       "items": {
         "type": "integer"
       },
@@ -35,7 +35,7 @@ export const fraud_auth_criteria: JsonSchema = {
  * The schema of `fraud_authentication_settings`.
  */
 export const fraud_authentication_settings: JsonSchema = {
-  "description": "Configuration for classifying login authentication outcomes based on the origin response.\nRequires `user_profiles` to be enabled.\n\n- Success and failure criteria are independently updatable — sending only `success_criteria`\n  leaves failure codes untouched, and vice versa.\n- Omit `authentication_settings` entirely to leave both unchanged.\n- Status codes must not overlap between success and failure criteria.\n",
+  "description": "Configuration for classifying login authentication outcomes based on the origin response.\nRequires `user_profiles` to be enabled.\n\n- Success and failure criteria are independently updatable — sending only `success_criteria`\n  leaves failure codes untouched, and vice versa.\n- Omit `authentication_settings` entirely to leave both unchanged.\n- Status codes must not overlap between success and failure criteria.",
   "properties": {
     "failure_criteria": {
       "$ref": "#/$defs/fraud_auth_criteria",
@@ -56,45 +56,29 @@ export const fraud_fraud_settings: JsonSchema = {
   "properties": {
     "authentication_settings": {
       "$ref": "#/$defs/fraud_authentication_settings",
-      "description": "Configuration for classifying login authentication outcomes based on the origin response.\nRequires `user_profiles` to be enabled.\n\n- Success and failure criteria are independently updatable — sending only `success_criteria`\n  leaves failure codes untouched, and vice versa.\n- Omit `authentication_settings` entirely to leave both unchanged.\n- Status codes must not overlap between success and failure criteria.\n"
+      "description": "Configuration for classifying login authentication outcomes based on the origin response.\nRequires `user_profiles` to be enabled.\n\n- Success and failure criteria are independently updatable — sending only `success_criteria`\n  leaves failure codes untouched, and vice versa.\n- Omit `authentication_settings` entirely to leave both unchanged.\n- Status codes must not overlap between success and failure criteria."
     },
     "user_profiles": {
-      "$ref": "#/$defs/fraud_user_profiles_status",
-      "description": "Whether Fraud User Profiles is enabled for the zone."
+      "description": "Whether Fraud User Profiles is enabled for the zone.",
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     },
     "username_expressions": {
       "$ref": "#/$defs/fraud_username_expressions",
-      "description": "List of expressions to detect usernames in write HTTP requests.\n\n- Maximum of 10 expressions.\n- Omit or set to null to leave unchanged on update.\n- Provide an empty array `[]` to clear all expressions on update.\n- Invalid expressions will result in a 10400 Bad Request with details in the `messages` array.\n"
+      "description": "List of expressions to detect usernames in write HTTP requests.\n\n- Maximum of 10 expressions.\n- Omit or set to null to leave unchanged on update.\n- Provide an empty array `[]` to clear all expressions on update.\n- Invalid expressions will result in a 10400 Bad Request with details in the `messages` array."
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `fraud_identifier`.
- */
-export const fraud_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `fraud_user_profiles_status`.
- */
-export const fraud_user_profiles_status: JsonSchema = {
-  "description": "Whether Fraud User Profiles is enabled for the zone.",
-  "enum": [
-    "enabled",
-    "disabled"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `fraud_username_expressions`.
  */
 export const fraud_username_expressions: JsonSchema = {
-  "description": "List of expressions to detect usernames in write HTTP requests.\n\n- Maximum of 10 expressions.\n- Omit or set to null to leave unchanged on update.\n- Provide an empty array `[]` to clear all expressions on update.\n- Invalid expressions will result in a 10400 Bad Request with details in the `messages` array.\n",
+  "description": "List of expressions to detect usernames in write HTTP requests.\n\n- Maximum of 10 expressions.\n- Omit or set to null to leave unchanged on update.\n- Provide an empty array `[]` to clear all expressions on update.\n- Invalid expressions will result in a 10400 Bad Request with details in the `messages` array.",
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/fraud/tools.ts b/src/generated/forge-mcp/fraud/tools.ts
index 969b10efc..993fba04a 100644
--- a/src/generated/forge-mcp/fraud/tools.ts
+++ b/src/generated/forge-mcp/fraud/tools.ts
@@ -3,23 +3,20 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  fraud_api_response_common_failure_output,
-  fraud_api_response_single_output,
-  fraud_auth_criteria_output,
-  fraud_authentication_settings_output,
-  fraud_fraud_settings_output,
-  fraud_fraud_settings_response_body_output,
-  fraud_messages_output,
-  fraud_user_profiles_status_output,
-  fraud_username_expressions_output,
-} from "./outputs.js";
-import {
+  fraud_api$$response$$common$$failure,
+  fraud_api$$response$$single,
   fraud_auth_criteria,
   fraud_authentication_settings,
   fraud_fraud_settings,
-  fraud_identifier,
-  fraud_user_profiles_status,
+  fraud_fraud_settings_response_body,
+  fraud_messages,
   fraud_username_expressions,
+} from "./outputs.js";
+import {
+  fraud_auth_criteria as fraud_auth_criteria$,
+  fraud_authentication_settings as fraud_authentication_settings$,
+  fraud_fraud_settings as fraud_fraud_settings$,
+  fraud_username_expressions as fraud_username_expressions$,
 } from "./schemas.js";
 
 /**
@@ -29,33 +26,39 @@ export const tools: readonly Tool[] = [
   {
     name: "fraud_get",
     title: "Get Fraud Detection Settings",
-    description: "Retrieve Fraud Detection settings for a zone.",
+    description: "Retrieve Fraud Detection settings for a zone.\n\nGET /zones/{zone_id}/fraud_detection/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/fraud_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "fraud_identifier": fraud_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/fraud_fraud_settings_response_body",
       $defs: {
-        "fraud_api-response-single": fraud_api_response_single_output,
-        "fraud_auth_criteria": fraud_auth_criteria_output,
-        "fraud_authentication_settings": fraud_authentication_settings_output,
-        "fraud_fraud_settings": fraud_fraud_settings_output,
-        "fraud_fraud_settings_response_body": fraud_fraud_settings_response_body_output,
-        "fraud_messages": fraud_messages_output,
-        "fraud_user_profiles_status": fraud_user_profiles_status_output,
-        "fraud_username_expressions": fraud_username_expressions_output,
+        "fraud_api-response-single": fraud_api$$response$$single,
+        "fraud_auth_criteria": fraud_auth_criteria,
+        "fraud_authentication_settings": fraud_authentication_settings,
+        "fraud_fraud_settings": fraud_fraud_settings,
+        "fraud_fraud_settings_response_body": fraud_fraud_settings_response_body,
+        "fraud_messages": fraud_messages,
+        "fraud_username_expressions": fraud_username_expressions,
       },
     },
     annotations: {
@@ -83,15 +86,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "fraud_api-response-common-failure": fraud_api_response_common_failure_output,
-        "fraud_api-response-single": fraud_api_response_single_output,
-        "fraud_auth_criteria": fraud_auth_criteria_output,
-        "fraud_authentication_settings": fraud_authentication_settings_output,
-        "fraud_fraud_settings": fraud_fraud_settings_output,
-        "fraud_fraud_settings_response_body": fraud_fraud_settings_response_body_output,
-        "fraud_messages": fraud_messages_output,
-        "fraud_user_profiles_status": fraud_user_profiles_status_output,
-        "fraud_username_expressions": fraud_username_expressions_output,
+        "fraud_api-response-common-failure": fraud_api$$response$$common$$failure,
+        "fraud_api-response-single": fraud_api$$response$$single,
+        "fraud_auth_criteria": fraud_auth_criteria,
+        "fraud_authentication_settings": fraud_authentication_settings,
+        "fraud_fraud_settings": fraud_fraud_settings,
+        "fraud_fraud_settings_response_body": fraud_fraud_settings_response_body,
+        "fraud_messages": fraud_messages,
+        "fraud_username_expressions": fraud_username_expressions,
       },
     },
     request: (args) => ({
@@ -101,42 +103,49 @@ export const tools: readonly Tool[] = [
   {
     name: "fraud_update",
     title: "Update Fraud Detection Settings",
-    description: "Update Fraud Detection settings for a zone.\n\nNotes on `username_expressions` behavior:\n- If omitted or set to null, expressions are not modified.\n- If provided as an empty array `[]`, all expressions will be cleared.",
+    description: "Update Fraud Detection settings for a zone.\n\nNotes on `username_expressions` behavior:\n- If omitted or set to null, expressions are not modified.\n- If provided as an empty array `[]`, all expressions will be cleared.\n\nPUT /zones/{zone_id}/fraud_detection/settings",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/fraud_fraud_settings"
         },
-        "zone_id": {
-          "$ref": "#/$defs/fraud_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "fraud_auth_criteria": fraud_auth_criteria,
-        "fraud_authentication_settings": fraud_authentication_settings,
-        "fraud_fraud_settings": fraud_fraud_settings,
-        "fraud_identifier": fraud_identifier,
-        "fraud_user_profiles_status": fraud_user_profiles_status,
-        "fraud_username_expressions": fraud_username_expressions,
+        "fraud_auth_criteria": fraud_auth_criteria$,
+        "fraud_authentication_settings": fraud_authentication_settings$,
+        "fraud_fraud_settings": fraud_fraud_settings$,
+        "fraud_username_expressions": fraud_username_expressions$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/fraud_fraud_settings_response_body",
       $defs: {
-        "fraud_api-response-single": fraud_api_response_single_output,
-        "fraud_auth_criteria": fraud_auth_criteria_output,
-        "fraud_authentication_settings": fraud_authentication_settings_output,
-        "fraud_fraud_settings": fraud_fraud_settings_output,
-        "fraud_fraud_settings_response_body": fraud_fraud_settings_response_body_output,
-        "fraud_messages": fraud_messages_output,
-        "fraud_user_profiles_status": fraud_user_profiles_status_output,
-        "fraud_username_expressions": fraud_username_expressions_output,
+        "fraud_api-response-single": fraud_api$$response$$single,
+        "fraud_auth_criteria": fraud_auth_criteria,
+        "fraud_authentication_settings": fraud_authentication_settings,
+        "fraud_fraud_settings": fraud_fraud_settings,
+        "fraud_fraud_settings_response_body": fraud_fraud_settings_response_body,
+        "fraud_messages": fraud_messages,
+        "fraud_username_expressions": fraud_username_expressions,
       },
     },
     annotations: {
@@ -163,15 +172,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "fraud_api-response-common-failure": fraud_api_response_common_failure_output,
-        "fraud_api-response-single": fraud_api_response_single_output,
-        "fraud_auth_criteria": fraud_auth_criteria_output,
-        "fraud_authentication_settings": fraud_authentication_settings_output,
-        "fraud_fraud_settings": fraud_fraud_settings_output,
-        "fraud_fraud_settings_response_body": fraud_fraud_settings_response_body_output,
-        "fraud_messages": fraud_messages_output,
-        "fraud_user_profiles_status": fraud_user_profiles_status_output,
-        "fraud_username_expressions": fraud_username_expressions_output,
+        "fraud_api-response-common-failure": fraud_api$$response$$common$$failure,
+        "fraud_api-response-single": fraud_api$$response$$single,
+        "fraud_auth_criteria": fraud_auth_criteria,
+        "fraud_authentication_settings": fraud_authentication_settings,
+        "fraud_fraud_settings": fraud_fraud_settings,
+        "fraud_fraud_settings_response_body": fraud_fraud_settings_response_body,
+        "fraud_messages": fraud_messages,
+        "fraud_username_expressions": fraud_username_expressions,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/googleTagGateway/config/outputs.ts b/src/generated/forge-mcp/googleTagGateway/config/outputs.ts
index a4fda4070..7ea63cfc3 100644
--- a/src/generated/forge-mcp/googleTagGateway/config/outputs.ts
+++ b/src/generated/forge-mcp/googleTagGateway/config/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `google-tag-gateway_api-response-common` in responses.
  */
-export const google_tag_gateway_api_response_common_output: JsonSchema = {
+export const google$$tag$$gateway_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/google-tag-gateway_messages"
@@ -32,7 +32,7 @@ export const google_tag_gateway_api_response_common_output: JsonSchema = {
 /**
  * The schema of `google-tag-gateway_api-response-common-failure` in responses.
  */
-export const google_tag_gateway_api_response_common_failure_output: JsonSchema = {
+export const google$$tag$$gateway_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/google-tag-gateway_messages"
@@ -62,7 +62,7 @@ export const google_tag_gateway_api_response_common_failure_output: JsonSchema =
 /**
  * The schema of `google-tag-gateway_google-tag-gateway-config` in responses.
  */
-export const google_tag_gateway_google_tag_gateway_config_output: JsonSchema = {
+export const google$$tag$$gateway_google$$tag$$gateway$$config: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -99,7 +99,7 @@ export const google_tag_gateway_google_tag_gateway_config_output: JsonSchema = {
 /**
  * The schema of `google-tag-gateway_messages` in responses.
  */
-export const google_tag_gateway_messages_output: JsonSchema = {
+export const google$$tag$$gateway_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/googleTagGateway/config/schemas.ts b/src/generated/forge-mcp/googleTagGateway/config/schemas.ts
index 9d409667e..58b2c85b2 100644
--- a/src/generated/forge-mcp/googleTagGateway/config/schemas.ts
+++ b/src/generated/forge-mcp/googleTagGateway/config/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `google-tag-gateway_google-tag-gateway-config`.
  */
-export const google_tag_gateway_google_tag_gateway_config: JsonSchema = {
+export const google$$tag$$gateway_google$$tag$$gateway$$config: JsonSchema = {
   "description": "Google Tag Gateway configuration for a zone.",
   "properties": {
     "enabled": {
@@ -45,11 +45,3 @@ export const google_tag_gateway_google_tag_gateway_config: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `google-tag-gateway_identifier`.
- */
-export const google_tag_gateway_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/googleTagGateway/config/tools.ts b/src/generated/forge-mcp/googleTagGateway/config/tools.ts
index 1e9424abc..79aac5a48 100644
--- a/src/generated/forge-mcp/googleTagGateway/config/tools.ts
+++ b/src/generated/forge-mcp/googleTagGateway/config/tools.ts
@@ -3,38 +3,42 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  google_tag_gateway_api_response_common_failure_output,
-  google_tag_gateway_api_response_common_output,
-  google_tag_gateway_google_tag_gateway_config_output,
-  google_tag_gateway_messages_output,
+  google$$tag$$gateway_api$$response$$common,
+  google$$tag$$gateway_api$$response$$common$$failure,
+  google$$tag$$gateway_google$$tag$$gateway$$config,
+  google$$tag$$gateway_messages,
 } from "./outputs.js";
-import {
-  google_tag_gateway_google_tag_gateway_config,
-  google_tag_gateway_identifier,
-} from "./schemas.js";
+import { google$$tag$$gateway_google$$tag$$gateway$$config as google$$tag$$gateway_google$$tag$$gateway$$config$ } from "./schemas.js";
 
 /**
- * The tools of `google_tag_gateway.config`.
+ * The tools of `googleTagGateway.config`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "google_tag_gateway_config_get",
+    name: "googleTagGateway_config_get",
     title: "Get Google Tag Gateway configuration",
-    description: "Gets the Google Tag Gateway configuration for a zone.",
+    description: "Gets the Google Tag Gateway configuration for a zone.\n\nGET /zones/{zone_id}/settings/google-tag-gateway/config",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/google-tag-gateway_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "google-tag-gateway_identifier": google_tag_gateway_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -51,9 +55,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "google-tag-gateway_api-response-common": google_tag_gateway_api_response_common_output,
-        "google-tag-gateway_google-tag-gateway-config": google_tag_gateway_google_tag_gateway_config_output,
-        "google-tag-gateway_messages": google_tag_gateway_messages_output,
+        "google-tag-gateway_api-response-common": google$$tag$$gateway_api$$response$$common,
+        "google-tag-gateway_google-tag-gateway-config": google$$tag$$gateway_google$$tag$$gateway$$config,
+        "google-tag-gateway_messages": google$$tag$$gateway_messages,
       },
     },
     annotations: {
@@ -105,10 +109,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "google-tag-gateway_api-response-common": google_tag_gateway_api_response_common_output,
-        "google-tag-gateway_api-response-common-failure": google_tag_gateway_api_response_common_failure_output,
-        "google-tag-gateway_google-tag-gateway-config": google_tag_gateway_google_tag_gateway_config_output,
-        "google-tag-gateway_messages": google_tag_gateway_messages_output,
+        "google-tag-gateway_api-response-common": google$$tag$$gateway_api$$response$$common,
+        "google-tag-gateway_api-response-common-failure": google$$tag$$gateway_api$$response$$common$$failure,
+        "google-tag-gateway_google-tag-gateway-config": google$$tag$$gateway_google$$tag$$gateway$$config,
+        "google-tag-gateway_messages": google$$tag$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -116,27 +120,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "google_tag_gateway_config_update",
+    name: "googleTagGateway_config_update",
     title: "Update Google Tag Gateway configuration",
-    description: "Updates the Google Tag Gateway configuration for a zone.",
+    description: "Updates the Google Tag Gateway configuration for a zone.\n\nPUT /zones/{zone_id}/settings/google-tag-gateway/config",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/google-tag-gateway_google-tag-gateway-config"
         },
-        "zone_id": {
-          "$ref": "#/$defs/google-tag-gateway_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "google-tag-gateway_google-tag-gateway-config": google_tag_gateway_google_tag_gateway_config,
-        "google-tag-gateway_identifier": google_tag_gateway_identifier,
+        "google-tag-gateway_google-tag-gateway-config": google$$tag$$gateway_google$$tag$$gateway$$config$,
       },
     },
     outputSchema: {
@@ -154,9 +167,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "google-tag-gateway_api-response-common": google_tag_gateway_api_response_common_output,
-        "google-tag-gateway_google-tag-gateway-config": google_tag_gateway_google_tag_gateway_config_output,
-        "google-tag-gateway_messages": google_tag_gateway_messages_output,
+        "google-tag-gateway_api-response-common": google$$tag$$gateway_api$$response$$common,
+        "google-tag-gateway_google-tag-gateway-config": google$$tag$$gateway_google$$tag$$gateway$$config,
+        "google-tag-gateway_messages": google$$tag$$gateway_messages,
       },
     },
     annotations: {
@@ -207,10 +220,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "google-tag-gateway_api-response-common": google_tag_gateway_api_response_common_output,
-        "google-tag-gateway_api-response-common-failure": google_tag_gateway_api_response_common_failure_output,
-        "google-tag-gateway_google-tag-gateway-config": google_tag_gateway_google_tag_gateway_config_output,
-        "google-tag-gateway_messages": google_tag_gateway_messages_output,
+        "google-tag-gateway_api-response-common": google$$tag$$gateway_api$$response$$common,
+        "google-tag-gateway_api-response-common-failure": google$$tag$$gateway_api$$response$$common$$failure,
+        "google-tag-gateway_google-tag-gateway-config": google$$tag$$gateway_google$$tag$$gateway$$config,
+        "google-tag-gateway_messages": google$$tag$$gateway_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/healthchecks/outputs.ts b/src/generated/forge-mcp/healthchecks/outputs.ts
index 2f965c392..58eff6380 100644
--- a/src/generated/forge-mcp/healthchecks/outputs.ts
+++ b/src/generated/forge-mcp/healthchecks/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `healthchecks_address` in responses.
- */
-export const healthchecks_address_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `healthchecks_api-response-collection` in responses.
  */
-export const healthchecks_api_response_collection_output: JsonSchema = {
+export const healthchecks_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/healthchecks_api-response-common"
@@ -45,7 +38,7 @@ export const healthchecks_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `healthchecks_api-response-common` in responses.
  */
-export const healthchecks_api_response_common_output: JsonSchema = {
+export const healthchecks_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/healthchecks_messages"
@@ -88,7 +81,7 @@ export const healthchecks_api_response_common_output: JsonSchema = {
 /**
  * The schema of `healthchecks_api-response-common-failure` in responses.
  */
-export const healthchecks_api_response_common_failure_output: JsonSchema = {
+export const healthchecks_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/healthchecks_messages"
@@ -118,7 +111,7 @@ export const healthchecks_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `healthchecks_api-response-single` in responses.
  */
-export const healthchecks_api_response_single_output: JsonSchema = {
+export const healthchecks_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/healthchecks_api-response-common"
@@ -144,7 +137,7 @@ export const healthchecks_api_response_single_output: JsonSchema = {
 /**
  * The schema of `healthchecks_check_regions` in responses.
  */
-export const healthchecks_check_regions_output: JsonSchema = {
+export const healthchecks_check_regions: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -174,92 +167,72 @@ export const healthchecks_check_regions_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `healthchecks_consecutive_fails` in responses.
- */
-export const healthchecks_consecutive_fails_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `healthchecks_consecutive_successes` in responses.
- */
-export const healthchecks_consecutive_successes_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `healthchecks_description` in responses.
- */
-export const healthchecks_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `healthchecks_failure_reason` in responses.
- */
-export const healthchecks_failure_reason_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `healthchecks_healthchecks` in responses.
  */
-export const healthchecks_healthchecks_output: JsonSchema = {
+export const healthchecks_healthchecks: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/healthchecks_address"
+      "type": "string"
     },
     "check_regions": {
       "$ref": "#/$defs/healthchecks_check_regions"
     },
     "consecutive_fails": {
-      "$ref": "#/$defs/healthchecks_consecutive_fails"
+      "type": "integer"
     },
     "consecutive_successes": {
-      "$ref": "#/$defs/healthchecks_consecutive_successes"
+      "type": "integer"
     },
     "created_on": {
-      "$ref": "#/$defs/healthchecks_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/healthchecks_description"
+      "type": "string"
     },
     "failure_reason": {
-      "$ref": "#/$defs/healthchecks_failure_reason"
+      "type": "string"
     },
     "http_config": {
       "$ref": "#/$defs/healthchecks_http_config"
     },
     "id": {
-      "$ref": "#/$defs/healthchecks_identifier"
+      "type": "string"
     },
     "interval": {
-      "$ref": "#/$defs/healthchecks_interval"
+      "type": "integer"
     },
     "modified_on": {
-      "$ref": "#/$defs/healthchecks_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/healthchecks_name"
+      "type": "string"
     },
     "retries": {
-      "$ref": "#/$defs/healthchecks_retries"
+      "type": "integer"
     },
     "status": {
-      "$ref": "#/$defs/healthchecks_status"
+      "enum": [
+        "unknown",
+        "healthy",
+        "unhealthy",
+        "suspended"
+      ],
+      "type": "string"
     },
     "suspended": {
-      "$ref": "#/$defs/healthchecks_suspended"
+      "type": "boolean"
     },
     "tcp_config": {
       "$ref": "#/$defs/healthchecks_tcp_config"
     },
     "timeout": {
-      "$ref": "#/$defs/healthchecks_timeout"
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/healthchecks_type"
+      "type": "string"
     }
   },
   "type": "object"
@@ -268,7 +241,7 @@ export const healthchecks_healthchecks_output: JsonSchema = {
 /**
  * The schema of `healthchecks_http_config` in responses.
  */
-export const healthchecks_http_config_output: JsonSchema = {
+export const healthchecks_http_config: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -335,7 +308,7 @@ export const healthchecks_http_config_output: JsonSchema = {
 /**
  * The schema of `healthchecks_id_response` in responses.
  */
-export const healthchecks_id_response_output: JsonSchema = {
+export const healthchecks_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/healthchecks_api-response-single"
@@ -345,7 +318,7 @@ export const healthchecks_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/healthchecks_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -356,24 +329,10 @@ export const healthchecks_id_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `healthchecks_identifier` in responses.
- */
-export const healthchecks_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `healthchecks_interval` in responses.
- */
-export const healthchecks_interval_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `healthchecks_messages` in responses.
  */
-export const healthchecks_messages_output: JsonSchema = {
+export const healthchecks_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -392,17 +351,10 @@ export const healthchecks_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `healthchecks_name` in responses.
- */
-export const healthchecks_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `healthchecks_response_collection` in responses.
  */
-export const healthchecks_response_collection_output: JsonSchema = {
+export const healthchecks_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/healthchecks_api-response-collection"
@@ -424,7 +376,7 @@ export const healthchecks_response_collection_output: JsonSchema = {
 /**
  * The schema of `healthchecks_result_info` in responses.
  */
-export const healthchecks_result_info_output: JsonSchema = {
+export const healthchecks_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -442,17 +394,10 @@ export const healthchecks_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `healthchecks_retries` in responses.
- */
-export const healthchecks_retries_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `healthchecks_single_response` in responses.
  */
-export const healthchecks_single_response_output: JsonSchema = {
+export const healthchecks_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/healthchecks_api-response-single"
@@ -468,30 +413,10 @@ export const healthchecks_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `healthchecks_status` in responses.
- */
-export const healthchecks_status_output: JsonSchema = {
-  "enum": [
-    "unknown",
-    "healthy",
-    "unhealthy",
-    "suspended"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `healthchecks_suspended` in responses.
- */
-export const healthchecks_suspended_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `healthchecks_tcp_config` in responses.
  */
-export const healthchecks_tcp_config_output: JsonSchema = {
+export const healthchecks_tcp_config: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -512,25 +437,3 @@ export const healthchecks_tcp_config_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `healthchecks_timeout` in responses.
- */
-export const healthchecks_timeout_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `healthchecks_timestamp` in responses.
- */
-export const healthchecks_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `healthchecks_type` in responses.
- */
-export const healthchecks_type_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/healthchecks/previews/tools.ts b/src/generated/forge-mcp/healthchecks/previews/tools.ts
index d74e694e6..7c69bca07 100644
--- a/src/generated/forge-mcp/healthchecks/previews/tools.ts
+++ b/src/generated/forge-mcp/healthchecks/previews/tools.ts
@@ -3,47 +3,22 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  healthchecks_address_output,
-  healthchecks_api_response_common_failure_output,
-  healthchecks_api_response_common_output,
-  healthchecks_api_response_single_output,
-  healthchecks_check_regions_output,
-  healthchecks_consecutive_fails_output,
-  healthchecks_consecutive_successes_output,
-  healthchecks_description_output,
-  healthchecks_failure_reason_output,
-  healthchecks_healthchecks_output,
-  healthchecks_http_config_output,
-  healthchecks_id_response_output,
-  healthchecks_identifier_output,
-  healthchecks_interval_output,
-  healthchecks_messages_output,
-  healthchecks_name_output,
-  healthchecks_retries_output,
-  healthchecks_single_response_output,
-  healthchecks_status_output,
-  healthchecks_suspended_output,
-  healthchecks_tcp_config_output,
-  healthchecks_timeout_output,
-  healthchecks_timestamp_output,
-  healthchecks_type_output,
-} from "../outputs.js";
-import {
-  healthchecks_address,
+  healthchecks_api$$response$$common,
+  healthchecks_api$$response$$common$$failure,
+  healthchecks_api$$response$$single,
   healthchecks_check_regions,
-  healthchecks_consecutive_fails,
-  healthchecks_consecutive_successes,
-  healthchecks_description,
+  healthchecks_healthchecks,
   healthchecks_http_config,
-  healthchecks_identifier,
-  healthchecks_interval,
-  healthchecks_name,
-  healthchecks_query_healthcheck,
-  healthchecks_retries,
-  healthchecks_suspended,
+  healthchecks_id_response,
+  healthchecks_messages,
+  healthchecks_single_response,
   healthchecks_tcp_config,
-  healthchecks_timeout,
-  healthchecks_type,
+} from "../outputs.js";
+import {
+  healthchecks_check_regions as healthchecks_check_regions$,
+  healthchecks_http_config as healthchecks_http_config$,
+  healthchecks_query_healthcheck,
+  healthchecks_tcp_config as healthchecks_tcp_config$,
 } from "../schemas.js";
 
 /**
@@ -53,65 +28,50 @@ export const tools: readonly Tool[] = [
   {
     name: "healthchecks_previews_create",
     title: "Create Preview Health Check",
-    description: "Create a new preview health check.",
+    description: "Create a new preview health check.\n\nPOST /zones/{zone_id}/healthchecks/preview",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/healthchecks_query_healthcheck"
         },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "healthchecks_address": healthchecks_address,
-        "healthchecks_check_regions": healthchecks_check_regions,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes,
-        "healthchecks_description": healthchecks_description,
-        "healthchecks_http_config": healthchecks_http_config,
-        "healthchecks_identifier": healthchecks_identifier,
-        "healthchecks_interval": healthchecks_interval,
-        "healthchecks_name": healthchecks_name,
+        "healthchecks_check_regions": healthchecks_check_regions$,
+        "healthchecks_http_config": healthchecks_http_config$,
         "healthchecks_query_healthcheck": healthchecks_query_healthcheck,
-        "healthchecks_retries": healthchecks_retries,
-        "healthchecks_suspended": healthchecks_suspended,
-        "healthchecks_tcp_config": healthchecks_tcp_config,
-        "healthchecks_timeout": healthchecks_timeout,
-        "healthchecks_type": healthchecks_type,
+        "healthchecks_tcp_config": healthchecks_tcp_config$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_single_response",
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     annotations: {
@@ -144,29 +104,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     request: (args) => ({
@@ -177,35 +123,41 @@ export const tools: readonly Tool[] = [
   {
     name: "healthchecks_previews_delete",
     title: "Delete Preview Health Check",
-    description: "Delete a health check.",
+    description: "Delete a health check.\n\nDELETE /zones/{zone_id}/healthchecks/preview/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "healthcheck_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id"
+        "path"
       ],
-      $defs: {
-        "healthchecks_identifier": healthchecks_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_id_response",
       $defs: {
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_id_response": healthchecks_id_response_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_messages": healthchecks_messages_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_id_response": healthchecks_id_response,
+        "healthchecks_messages": healthchecks_messages,
       },
     },
     annotations: {
@@ -238,12 +190,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_id_response": healthchecks_id_response_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_messages": healthchecks_messages_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_id_response": healthchecks_id_response,
+        "healthchecks_messages": healthchecks_messages,
       },
     },
     request: (args) => ({
@@ -253,52 +204,45 @@ export const tools: readonly Tool[] = [
   {
     name: "healthchecks_previews_get",
     title: "Health Check Preview Details",
-    description: "Fetch a single configured health check preview.",
+    description: "Fetch a single configured health check preview.\n\nGET /zones/{zone_id}/healthchecks/preview/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "healthcheck_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id"
+        "path"
       ],
-      $defs: {
-        "healthchecks_identifier": healthchecks_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_single_response",
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     annotations: {
@@ -332,29 +276,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/healthchecks/schemas.ts b/src/generated/forge-mcp/healthchecks/schemas.ts
index 0296804b6..c608d2394 100644
--- a/src/generated/forge-mcp/healthchecks/schemas.ts
+++ b/src/generated/forge-mcp/healthchecks/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `healthchecks_address`.
- */
-export const healthchecks_address: JsonSchema = {
-  "description": "The hostname or IP address of the origin server to run health checks on.",
-  "type": "string"
-};
-
 /**
  * The schema of `healthchecks_check_regions`.
  */
@@ -45,30 +37,6 @@ export const healthchecks_check_regions: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `healthchecks_consecutive_fails`.
- */
-export const healthchecks_consecutive_fails: JsonSchema = {
-  "description": "The number of consecutive fails required from a health check before changing the health to unhealthy.",
-  "type": "integer"
-};
-
-/**
- * The schema of `healthchecks_consecutive_successes`.
- */
-export const healthchecks_consecutive_successes: JsonSchema = {
-  "description": "The number of consecutive successes required from a health check before changing the health to healthy.",
-  "type": "integer"
-};
-
-/**
- * The schema of `healthchecks_description`.
- */
-export const healthchecks_description: JsonSchema = {
-  "description": "A human-readable description of the health check.",
-  "type": "string"
-};
-
 /**
  * The schema of `healthchecks_http_config`.
  */
@@ -154,93 +122,69 @@ export const healthchecks_http_config: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `healthchecks_identifier`.
- */
-export const healthchecks_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
-/**
- * The schema of `healthchecks_interval`.
- */
-export const healthchecks_interval: JsonSchema = {
-  "description": "The interval between each health check. Shorter intervals may give quicker notifications if the origin status changes, but will increase load on the origin as we check from multiple locations.",
-  "type": "integer"
-};
-
-/**
- * The schema of `healthchecks_name`.
- */
-export const healthchecks_name: JsonSchema = {
-  "description": "A short name to identify the health check. Only alphanumeric characters, hyphens and underscores are allowed.",
-  "type": "string"
-};
-
 /**
  * The schema of `healthchecks_query_healthcheck`.
  */
 export const healthchecks_query_healthcheck: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/healthchecks_address",
-      "description": "The hostname or IP address of the origin server to run health checks on."
+      "description": "The hostname or IP address of the origin server to run health checks on.",
+      "type": "string"
     },
     "check_regions": {
       "$ref": "#/$defs/healthchecks_check_regions",
       "description": "A list of regions from which to run health checks. Null means Cloudflare will pick a default region."
     },
     "consecutive_fails": {
-      "$ref": "#/$defs/healthchecks_consecutive_fails",
       "default": 1,
-      "description": "The number of consecutive fails required from a health check before changing the health to unhealthy."
+      "description": "The number of consecutive fails required from a health check before changing the health to unhealthy.",
+      "type": "integer"
     },
     "consecutive_successes": {
-      "$ref": "#/$defs/healthchecks_consecutive_successes",
       "default": 1,
-      "description": "The number of consecutive successes required from a health check before changing the health to healthy."
+      "description": "The number of consecutive successes required from a health check before changing the health to healthy.",
+      "type": "integer"
     },
     "description": {
-      "$ref": "#/$defs/healthchecks_description",
-      "description": "A human-readable description of the health check."
+      "description": "A human-readable description of the health check.",
+      "type": "string"
     },
     "http_config": {
       "$ref": "#/$defs/healthchecks_http_config",
       "description": "Parameters specific to an HTTP or HTTPS health check."
     },
     "interval": {
-      "$ref": "#/$defs/healthchecks_interval",
       "default": 60,
-      "description": "The interval between each health check. Shorter intervals may give quicker notifications if the origin status changes, but will increase load on the origin as we check from multiple locations."
+      "description": "The interval between each health check. Shorter intervals may give quicker notifications if the origin status changes, but will increase load on the origin as we check from multiple locations.",
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/healthchecks_name",
-      "description": "A short name to identify the health check. Only alphanumeric characters, hyphens and underscores are allowed."
+      "description": "A short name to identify the health check. Only alphanumeric characters, hyphens and underscores are allowed.",
+      "type": "string"
     },
     "retries": {
-      "$ref": "#/$defs/healthchecks_retries",
       "default": 2,
-      "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately."
+      "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately.",
+      "type": "integer"
     },
     "suspended": {
-      "$ref": "#/$defs/healthchecks_suspended",
       "default": false,
-      "description": "If suspended, no health checks are sent to the origin."
+      "description": "If suspended, no health checks are sent to the origin.",
+      "type": "boolean"
     },
     "tcp_config": {
       "$ref": "#/$defs/healthchecks_tcp_config",
       "description": "Parameters specific to TCP health check."
     },
     "timeout": {
-      "$ref": "#/$defs/healthchecks_timeout",
       "default": 5,
-      "description": "The timeout (in seconds) before marking the health check as failed."
+      "description": "The timeout (in seconds) before marking the health check as failed.",
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/healthchecks_type",
       "default": "HTTP",
-      "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'."
+      "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'.",
+      "type": "string"
     }
   },
   "required": [
@@ -250,22 +194,6 @@ export const healthchecks_query_healthcheck: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `healthchecks_retries`.
- */
-export const healthchecks_retries: JsonSchema = {
-  "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately.",
-  "type": "integer"
-};
-
-/**
- * The schema of `healthchecks_suspended`.
- */
-export const healthchecks_suspended: JsonSchema = {
-  "description": "If suspended, no health checks are sent to the origin.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `healthchecks_tcp_config`.
  */
@@ -295,19 +223,3 @@ export const healthchecks_tcp_config: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `healthchecks_timeout`.
- */
-export const healthchecks_timeout: JsonSchema = {
-  "description": "The timeout (in seconds) before marking the health check as failed.",
-  "type": "integer"
-};
-
-/**
- * The schema of `healthchecks_type`.
- */
-export const healthchecks_type: JsonSchema = {
-  "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/healthchecks/tools.ts b/src/generated/forge-mcp/healthchecks/tools.ts
index d6322c76a..4d1fb4b80 100644
--- a/src/generated/forge-mcp/healthchecks/tools.ts
+++ b/src/generated/forge-mcp/healthchecks/tools.ts
@@ -1,52 +1,27 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  healthchecks_address_output,
-  healthchecks_api_response_collection_output,
-  healthchecks_api_response_common_failure_output,
-  healthchecks_api_response_common_output,
-  healthchecks_api_response_single_output,
-  healthchecks_check_regions_output,
-  healthchecks_consecutive_fails_output,
-  healthchecks_consecutive_successes_output,
-  healthchecks_description_output,
-  healthchecks_failure_reason_output,
-  healthchecks_healthchecks_output,
-  healthchecks_http_config_output,
-  healthchecks_id_response_output,
-  healthchecks_identifier_output,
-  healthchecks_interval_output,
-  healthchecks_messages_output,
-  healthchecks_name_output,
-  healthchecks_response_collection_output,
-  healthchecks_result_info_output,
-  healthchecks_retries_output,
-  healthchecks_single_response_output,
-  healthchecks_status_output,
-  healthchecks_suspended_output,
-  healthchecks_tcp_config_output,
-  healthchecks_timeout_output,
-  healthchecks_timestamp_output,
-  healthchecks_type_output,
-} from "./outputs.js";
-import {
-  healthchecks_address,
+  healthchecks_api$$response$$collection,
+  healthchecks_api$$response$$common,
+  healthchecks_api$$response$$common$$failure,
+  healthchecks_api$$response$$single,
   healthchecks_check_regions,
-  healthchecks_consecutive_fails,
-  healthchecks_consecutive_successes,
-  healthchecks_description,
+  healthchecks_healthchecks,
   healthchecks_http_config,
-  healthchecks_identifier,
-  healthchecks_interval,
-  healthchecks_name,
-  healthchecks_query_healthcheck,
-  healthchecks_retries,
-  healthchecks_suspended,
+  healthchecks_id_response,
+  healthchecks_messages,
+  healthchecks_response_collection,
+  healthchecks_result_info,
+  healthchecks_single_response,
   healthchecks_tcp_config,
-  healthchecks_timeout,
-  healthchecks_type,
+} from "./outputs.js";
+import {
+  healthchecks_check_regions as healthchecks_check_regions$,
+  healthchecks_http_config as healthchecks_http_config$,
+  healthchecks_query_healthcheck,
+  healthchecks_tcp_config as healthchecks_tcp_config$,
 } from "./schemas.js";
 
 /**
@@ -56,65 +31,50 @@ export const tools: readonly Tool[] = [
   {
     name: "healthchecks_create",
     title: "Create Health Check",
-    description: "Create a new health check.",
+    description: "Create a new health check.\n\nPOST /zones/{zone_id}/healthchecks",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/healthchecks_query_healthcheck"
         },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "healthchecks_address": healthchecks_address,
-        "healthchecks_check_regions": healthchecks_check_regions,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes,
-        "healthchecks_description": healthchecks_description,
-        "healthchecks_http_config": healthchecks_http_config,
-        "healthchecks_identifier": healthchecks_identifier,
-        "healthchecks_interval": healthchecks_interval,
-        "healthchecks_name": healthchecks_name,
+        "healthchecks_check_regions": healthchecks_check_regions$,
+        "healthchecks_http_config": healthchecks_http_config$,
         "healthchecks_query_healthcheck": healthchecks_query_healthcheck,
-        "healthchecks_retries": healthchecks_retries,
-        "healthchecks_suspended": healthchecks_suspended,
-        "healthchecks_tcp_config": healthchecks_tcp_config,
-        "healthchecks_timeout": healthchecks_timeout,
-        "healthchecks_type": healthchecks_type,
+        "healthchecks_tcp_config": healthchecks_tcp_config$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_single_response",
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     annotations: {
@@ -147,29 +107,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     request: (args) => ({
@@ -180,35 +126,41 @@ export const tools: readonly Tool[] = [
   {
     name: "healthchecks_delete",
     title: "Delete Health Check",
-    description: "Delete a health check.",
+    description: "Delete a health check.\n\nDELETE /zones/{zone_id}/healthchecks/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "healthcheck_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id"
+        "path"
       ],
-      $defs: {
-        "healthchecks_identifier": healthchecks_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_id_response",
       $defs: {
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_id_response": healthchecks_id_response_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_messages": healthchecks_messages_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_id_response": healthchecks_id_response,
+        "healthchecks_messages": healthchecks_messages,
       },
     },
     annotations: {
@@ -241,12 +193,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_id_response": healthchecks_id_response_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_messages": healthchecks_messages_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_id_response": healthchecks_id_response,
+        "healthchecks_messages": healthchecks_messages,
       },
     },
     request: (args) => ({
@@ -256,70 +207,55 @@ export const tools: readonly Tool[] = [
   {
     name: "healthchecks_edit",
     title: "Patch Health Check",
-    description: "Patch a configured health check.",
+    description: "Patch a configured health check.\n\nPATCH /zones/{zone_id}/healthchecks/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/healthchecks_query_healthcheck"
         },
-        "healthcheck_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "healthchecks_address": healthchecks_address,
-        "healthchecks_check_regions": healthchecks_check_regions,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes,
-        "healthchecks_description": healthchecks_description,
-        "healthchecks_http_config": healthchecks_http_config,
-        "healthchecks_identifier": healthchecks_identifier,
-        "healthchecks_interval": healthchecks_interval,
-        "healthchecks_name": healthchecks_name,
+        "healthchecks_check_regions": healthchecks_check_regions$,
+        "healthchecks_http_config": healthchecks_http_config$,
         "healthchecks_query_healthcheck": healthchecks_query_healthcheck,
-        "healthchecks_retries": healthchecks_retries,
-        "healthchecks_suspended": healthchecks_suspended,
-        "healthchecks_tcp_config": healthchecks_tcp_config,
-        "healthchecks_timeout": healthchecks_timeout,
-        "healthchecks_type": healthchecks_type,
+        "healthchecks_tcp_config": healthchecks_tcp_config$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_single_response",
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     annotations: {
@@ -352,29 +288,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     request: (args) => ({
@@ -385,52 +307,45 @@ export const tools: readonly Tool[] = [
   {
     name: "healthchecks_get",
     title: "Health Check Details",
-    description: "Fetch a single configured health check.",
+    description: "Fetch a single configured health check.\n\nGET /zones/{zone_id}/healthchecks/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "healthcheck_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id"
+        "path"
       ],
-      $defs: {
-        "healthchecks_identifier": healthchecks_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_single_response",
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     annotations: {
@@ -464,29 +379,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     request: (args) => ({
@@ -496,58 +397,57 @@ export const tools: readonly Tool[] = [
   {
     name: "healthchecks_list",
     title: "List Health Checks",
-    description: "List configured health checks.",
+    description: "List configured health checks.\n\nGET /zones/{zone_id}/healthchecks",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 25,
-          "description": "Maximum number of results per page. Must be a multiple of 5.",
-          "type": "number"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Maximum number of results per page. Must be a multiple of 5.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "healthchecks_identifier": healthchecks_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_response_collection",
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-collection": healthchecks_api_response_collection_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_response_collection": healthchecks_response_collection_output,
-        "healthchecks_result_info": healthchecks_result_info_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-collection": healthchecks_api$$response$$collection,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_response_collection": healthchecks_response_collection,
+        "healthchecks_result_info": healthchecks_result_info,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     annotations: {
@@ -581,107 +481,78 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-collection": healthchecks_api_response_collection_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_response_collection": healthchecks_response_collection_output,
-        "healthchecks_result_info": healthchecks_result_info_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-collection": healthchecks_api$$response$$collection,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_response_collection": healthchecks_response_collection,
+        "healthchecks_result_info": healthchecks_result_info,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/healthchecks`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "healthchecks_update",
     title: "Update Health Check",
-    description: "Update a configured health check.",
+    description: "Update a configured health check.\n\nPUT /zones/{zone_id}/healthchecks/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/healthchecks_query_healthcheck"
         },
-        "healthcheck_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/healthchecks_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "healthchecks_address": healthchecks_address,
-        "healthchecks_check_regions": healthchecks_check_regions,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes,
-        "healthchecks_description": healthchecks_description,
-        "healthchecks_http_config": healthchecks_http_config,
-        "healthchecks_identifier": healthchecks_identifier,
-        "healthchecks_interval": healthchecks_interval,
-        "healthchecks_name": healthchecks_name,
+        "healthchecks_check_regions": healthchecks_check_regions$,
+        "healthchecks_http_config": healthchecks_http_config$,
         "healthchecks_query_healthcheck": healthchecks_query_healthcheck,
-        "healthchecks_retries": healthchecks_retries,
-        "healthchecks_suspended": healthchecks_suspended,
-        "healthchecks_tcp_config": healthchecks_tcp_config,
-        "healthchecks_timeout": healthchecks_timeout,
-        "healthchecks_type": healthchecks_type,
+        "healthchecks_tcp_config": healthchecks_tcp_config$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/healthchecks_single_response",
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     annotations: {
@@ -714,29 +585,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "healthchecks_address": healthchecks_address_output,
-        "healthchecks_api-response-common": healthchecks_api_response_common_output,
-        "healthchecks_api-response-common-failure": healthchecks_api_response_common_failure_output,
-        "healthchecks_api-response-single": healthchecks_api_response_single_output,
-        "healthchecks_check_regions": healthchecks_check_regions_output,
-        "healthchecks_consecutive_fails": healthchecks_consecutive_fails_output,
-        "healthchecks_consecutive_successes": healthchecks_consecutive_successes_output,
-        "healthchecks_description": healthchecks_description_output,
-        "healthchecks_failure_reason": healthchecks_failure_reason_output,
-        "healthchecks_healthchecks": healthchecks_healthchecks_output,
-        "healthchecks_http_config": healthchecks_http_config_output,
-        "healthchecks_identifier": healthchecks_identifier_output,
-        "healthchecks_interval": healthchecks_interval_output,
-        "healthchecks_messages": healthchecks_messages_output,
-        "healthchecks_name": healthchecks_name_output,
-        "healthchecks_retries": healthchecks_retries_output,
-        "healthchecks_single_response": healthchecks_single_response_output,
-        "healthchecks_status": healthchecks_status_output,
-        "healthchecks_suspended": healthchecks_suspended_output,
-        "healthchecks_tcp_config": healthchecks_tcp_config_output,
-        "healthchecks_timeout": healthchecks_timeout_output,
-        "healthchecks_timestamp": healthchecks_timestamp_output,
-        "healthchecks_type": healthchecks_type_output,
+        "healthchecks_api-response-common": healthchecks_api$$response$$common,
+        "healthchecks_api-response-common-failure": healthchecks_api$$response$$common$$failure,
+        "healthchecks_api-response-single": healthchecks_api$$response$$single,
+        "healthchecks_check_regions": healthchecks_check_regions,
+        "healthchecks_healthchecks": healthchecks_healthchecks,
+        "healthchecks_http_config": healthchecks_http_config,
+        "healthchecks_messages": healthchecks_messages,
+        "healthchecks_single_response": healthchecks_single_response,
+        "healthchecks_tcp_config": healthchecks_tcp_config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/hyperdrive/integration/planetscale/outputs.ts b/src/generated/forge-mcp/hyperdrive/integration/planetscale/outputs.ts
index 7cf60231c..0f64068e0 100644
--- a/src/generated/forge-mcp/hyperdrive/integration/planetscale/outputs.ts
+++ b/src/generated/forge-mcp/hyperdrive/integration/planetscale/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `hyperdrive_hyperdrive-database-signature-response` in
  * responses.
  */
-export const hyperdrive_hyperdrive_database_signature_response_output: JsonSchema = {
+export const hyperdrive_hyperdrive$$database$$signature$$response: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
diff --git a/src/generated/forge-mcp/hyperdrive/integration/planetscale/tools.ts b/src/generated/forge-mcp/hyperdrive/integration/planetscale/tools.ts
index b66b35bab..a9126a28e 100644
--- a/src/generated/forge-mcp/hyperdrive/integration/planetscale/tools.ts
+++ b/src/generated/forge-mcp/hyperdrive/integration/planetscale/tools.ts
@@ -3,12 +3,11 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  hyperdrive_api_response_common_failure_output,
-  hyperdrive_api_response_single_output,
-  hyperdrive_messages_output,
+  hyperdrive_api$$response$$common$$failure,
+  hyperdrive_api$$response$$single,
+  hyperdrive_messages,
 } from "../../outputs.js";
-import { hyperdrive_identifier } from "../../schemas.js";
-import { hyperdrive_hyperdrive_database_signature_response_output } from "./outputs.js";
+import { hyperdrive_hyperdrive$$database$$signature$$response } from "./outputs.js";
 
 /**
  * The tools of `hyperdrive.integration.planetscale`.
@@ -17,21 +16,28 @@ export const tools: readonly Tool[] = [
   {
     name: "hyperdrive_integration_planetscale_signature",
     title: "Create Database Signature",
-    description: "Returns a short-lived signed authorization for creating a database that is billed through Cloudflare. The caller passes these values to the integration partner's own CLI, which verifies the signature before creating the database. Requires the account to be entitled to Cloudflare-billed databases for the integration.\n\nThis method is beta.",
+    description: "Returns a short-lived signed authorization for creating a database that is billed through Cloudflare. The caller passes these values to the integration partner's own CLI, which verifies the signature before creating the database. Requires the account to be entitled to Cloudflare-billed databases for the integration.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/hyperdrive/integrationsOperations/planetScale/createDatabaseSignature",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The Cloudflare account ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "hyperdrive_identifier": hyperdrive_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -48,9 +54,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-database-signature-response": hyperdrive_hyperdrive_database_signature_response_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-database-signature-response": hyperdrive_hyperdrive$$database$$signature$$response,
+        "hyperdrive_messages": hyperdrive_messages,
       },
     },
     annotations: {
@@ -84,10 +90,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "hyperdrive_api-response-common-failure": hyperdrive_api_response_common_failure_output,
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-database-signature-response": hyperdrive_hyperdrive_database_signature_response_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
+        "hyperdrive_api-response-common-failure": hyperdrive_api$$response$$common$$failure,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-database-signature-response": hyperdrive_hyperdrive$$database$$signature$$response,
+        "hyperdrive_messages": hyperdrive_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/hyperdrive/outputs.ts b/src/generated/forge-mcp/hyperdrive/outputs.ts
index d127de62e..bfcaeaa48 100644
--- a/src/generated/forge-mcp/hyperdrive/outputs.ts
+++ b/src/generated/forge-mcp/hyperdrive/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `hyperdrive_api-response-collection` in responses.
  */
-export const hyperdrive_api_response_collection_output: JsonSchema = {
+export const hyperdrive_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/hyperdrive_api-response-common"
@@ -25,7 +25,7 @@ export const hyperdrive_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_api-response-common` in responses.
  */
-export const hyperdrive_api_response_common_output: JsonSchema = {
+export const hyperdrive_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/hyperdrive_messages"
@@ -51,7 +51,7 @@ export const hyperdrive_api_response_common_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_api-response-common-failure` in responses.
  */
-export const hyperdrive_api_response_common_failure_output: JsonSchema = {
+export const hyperdrive_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/hyperdrive_messages"
@@ -81,7 +81,7 @@ export const hyperdrive_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_api-response-single` in responses.
  */
-export const hyperdrive_api_response_single_output: JsonSchema = {
+export const hyperdrive_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/hyperdrive_messages"
@@ -107,7 +107,7 @@ export const hyperdrive_api_response_single_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-caching-response` in responses.
  */
-export const hyperdrive_hyperdrive_caching_response_output: JsonSchema = {
+export const hyperdrive_hyperdrive$$caching$$response: JsonSchema = {
   "properties": {
     "disabled": {
       "type": "boolean"
@@ -128,7 +128,7 @@ export const hyperdrive_hyperdrive_caching_response_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-config-response` in responses.
  */
-export const hyperdrive_hyperdrive_config_response_output: JsonSchema = {
+export const hyperdrive_hyperdrive$$config$$response: JsonSchema = {
   "properties": {
     "caching": {
       "$ref": "#/$defs/hyperdrive_hyperdrive-caching-response"
@@ -138,7 +138,7 @@ export const hyperdrive_hyperdrive_config_response_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/hyperdrive_identifier"
+      "type": "string"
     },
     "integration": {
       "$ref": "#/$defs/hyperdrive_hyperdrive-planet-scale-integration"
@@ -151,13 +151,13 @@ export const hyperdrive_hyperdrive_config_response_output: JsonSchema = {
       "$ref": "#/$defs/hyperdrive_hyperdrive-mtls"
     },
     "name": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-name"
+      "type": "string"
     },
     "origin": {
       "$ref": "#/$defs/hyperdrive_hyperdrive-origin-full"
     },
     "origin_connection_limit": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-origin-connection-limit"
+      "type": "integer"
     },
     "restarted_on": {
       "oneOf": [
@@ -183,7 +183,7 @@ export const hyperdrive_hyperdrive_config_response_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-database-full` in responses.
  */
-export const hyperdrive_hyperdrive_database_full_output: JsonSchema = {
+export const hyperdrive_hyperdrive$$database$$full: JsonSchema = {
   "properties": {
     "database": {
       "type": "string"
@@ -192,7 +192,12 @@ export const hyperdrive_hyperdrive_database_full_output: JsonSchema = {
       "type": "string"
     },
     "scheme": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-scheme"
+      "enum": [
+        "postgres",
+        "postgresql",
+        "mysql"
+      ],
+      "type": "string"
     },
     "user": {
       "type": "string"
@@ -207,20 +212,10 @@ export const hyperdrive_hyperdrive_database_full_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `hyperdrive_hyperdrive-integration-provider` in responses.
- */
-export const hyperdrive_hyperdrive_integration_provider_output: JsonSchema = {
-  "enum": [
-    "planetscale"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `hyperdrive_hyperdrive-mtls` in responses.
  */
-export const hyperdrive_hyperdrive_mtls_output: JsonSchema = {
+export const hyperdrive_hyperdrive$$mtls: JsonSchema = {
   "properties": {
     "ca_certificate_id": {
       "type": "string"
@@ -235,24 +230,10 @@ export const hyperdrive_hyperdrive_mtls_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `hyperdrive_hyperdrive-name` in responses.
- */
-export const hyperdrive_hyperdrive_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `hyperdrive_hyperdrive-origin-connection-limit` in responses.
- */
-export const hyperdrive_hyperdrive_origin_connection_limit_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `hyperdrive_hyperdrive-origin-full` in responses.
  */
-export const hyperdrive_hyperdrive_origin_full_output: JsonSchema = {
+export const hyperdrive_hyperdrive$$origin$$full: JsonSchema = {
   "oneOf": [
     {
       "allOf": [
@@ -290,7 +271,7 @@ export const hyperdrive_hyperdrive_origin_full_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-planet-scale-integration` in responses.
  */
-export const hyperdrive_hyperdrive_planet_scale_integration_output: JsonSchema = {
+export const hyperdrive_hyperdrive$$planet$$scale$$integration: JsonSchema = {
   "properties": {
     "custom_database_name": {
       "type": "string"
@@ -305,10 +286,18 @@ export const hyperdrive_hyperdrive_planet_scale_integration_output: JsonSchema =
       "type": "string"
     },
     "provider": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-integration-provider"
+      "enum": [
+        "planetscale"
+      ],
+      "type": "string"
     },
     "scheme": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-scheme"
+      "enum": [
+        "postgres",
+        "postgresql",
+        "mysql"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -321,29 +310,10 @@ export const hyperdrive_hyperdrive_planet_scale_integration_output: JsonSchema =
   "type": "object"
 };
 
-/**
- * The schema of `hyperdrive_hyperdrive-scheme` in responses.
- */
-export const hyperdrive_hyperdrive_scheme_output: JsonSchema = {
-  "enum": [
-    "postgres",
-    "postgresql",
-    "mysql"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `hyperdrive_identifier` in responses.
- */
-export const hyperdrive_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `hyperdrive_internet-origin` in responses.
  */
-export const hyperdrive_internet_origin_output: JsonSchema = {
+export const hyperdrive_internet$$origin: JsonSchema = {
   "properties": {
     "host": {
       "type": "string"
@@ -362,7 +332,7 @@ export const hyperdrive_internet_origin_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_messages` in responses.
  */
-export const hyperdrive_messages_output: JsonSchema = {
+export const hyperdrive_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -384,7 +354,7 @@ export const hyperdrive_messages_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_over-access-origin` in responses.
  */
-export const hyperdrive_over_access_origin_output: JsonSchema = {
+export const hyperdrive_over$$access$$origin: JsonSchema = {
   "properties": {
     "access_client_id": {
       "type": "string"
@@ -407,7 +377,7 @@ export const hyperdrive_over_access_origin_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_result_info` in responses.
  */
-export const hyperdrive_result_info_output: JsonSchema = {
+export const hyperdrive_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -428,7 +398,7 @@ export const hyperdrive_result_info_output: JsonSchema = {
 /**
  * The schema of `hyperdrive_vpc-service-origin` in responses.
  */
-export const hyperdrive_vpc_service_origin_output: JsonSchema = {
+export const hyperdrive_vpc$$service$$origin: JsonSchema = {
   "properties": {
     "service_id": {
       "type": "string"
diff --git a/src/generated/forge-mcp/hyperdrive/schemas.ts b/src/generated/forge-mcp/hyperdrive/schemas.ts
index 7f9a3c28d..3783d30b8 100644
--- a/src/generated/forge-mcp/hyperdrive/schemas.ts
+++ b/src/generated/forge-mcp/hyperdrive/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `hyperdrive_hyperdrive-caching`.
  */
-export const hyperdrive_hyperdrive_caching: JsonSchema = {
+export const hyperdrive_hyperdrive$$caching: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/hyperdrive_hyperdrive-caching-disabled"
@@ -20,7 +20,7 @@ export const hyperdrive_hyperdrive_caching: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-caching-common`.
  */
-export const hyperdrive_hyperdrive_caching_common: JsonSchema = {
+export const hyperdrive_hyperdrive$$caching$$common: JsonSchema = {
   "properties": {
     "disabled": {
       "description": "Set to true to disable caching of SQL responses. Default is false.",
@@ -33,7 +33,7 @@ export const hyperdrive_hyperdrive_caching_common: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-caching-create`.
  */
-export const hyperdrive_hyperdrive_caching_create: JsonSchema = {
+export const hyperdrive_hyperdrive$$caching$$create: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/hyperdrive_hyperdrive-caching-create-disabled"
@@ -47,7 +47,7 @@ export const hyperdrive_hyperdrive_caching_create: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-caching-create-disabled`.
  */
-export const hyperdrive_hyperdrive_caching_create_disabled: JsonSchema = {
+export const hyperdrive_hyperdrive$$caching$$create$$disabled: JsonSchema = {
   "description": "Caching disabled",
   "properties": {
     "disabled": {
@@ -86,7 +86,7 @@ export const hyperdrive_hyperdrive_caching_create_disabled: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-caching-create-enabled`.
  */
-export const hyperdrive_hyperdrive_caching_create_enabled: JsonSchema = {
+export const hyperdrive_hyperdrive$$caching$$create$$enabled: JsonSchema = {
   "description": "Caching enabled",
   "properties": {
     "disabled": {
@@ -124,7 +124,7 @@ export const hyperdrive_hyperdrive_caching_create_enabled: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-caching-disabled`.
  */
-export const hyperdrive_hyperdrive_caching_disabled: JsonSchema = {
+export const hyperdrive_hyperdrive$$caching$$disabled: JsonSchema = {
   "description": "Caching disabled",
   "properties": {
     "disabled": {
@@ -138,7 +138,7 @@ export const hyperdrive_hyperdrive_caching_disabled: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-caching-enabled`.
  */
-export const hyperdrive_hyperdrive_caching_enabled: JsonSchema = {
+export const hyperdrive_hyperdrive$$caching$$enabled: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/hyperdrive_hyperdrive-caching-common"
@@ -163,7 +163,7 @@ export const hyperdrive_hyperdrive_caching_enabled: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-config`.
  */
-export const hyperdrive_hyperdrive_config: JsonSchema = {
+export const hyperdrive_hyperdrive$$config: JsonSchema = {
   "properties": {
     "caching": {
       "$ref": "#/$defs/hyperdrive_hyperdrive-caching"
@@ -173,16 +173,16 @@ export const hyperdrive_hyperdrive_config: JsonSchema = {
       "description": "mTLS configuration for the origin connection. Cannot be used with VPC Service origins; TLS must be managed on the VPC Service."
     },
     "name": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-name",
-      "description": "The name of the Hyperdrive configuration. Used to identify the configuration in the Cloudflare dashboard and API."
+      "description": "The name of the Hyperdrive configuration. Used to identify the configuration in the Cloudflare dashboard and API.",
+      "type": "string"
     },
     "origin": {
       "$ref": "#/$defs/hyperdrive_hyperdrive-origin-full",
       "description": "Combines database connection fields with exactly one supported network location."
     },
     "origin_connection_limit": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-origin-connection-limit",
-      "description": "The (soft) maximum number of connections the Hyperdrive is allowed to make to the origin database.\n\nMaximum allowed: 20 for free tier accounts, 100 for paid tier accounts.\nIf not specified, defaults to 20 for free tier and 60 for paid tier.\nCertain Cloudflare-managed origins may be permitted a higher limit.\nContact Cloudflare if you need a higher limit.\n"
+      "description": "The (soft) maximum number of connections the Hyperdrive is allowed to make to the origin database.\n\nMaximum allowed: 20 for free tier accounts, 100 for paid tier accounts.\nIf not specified, defaults to 20 for free tier and 60 for paid tier.\nCertain Cloudflare-managed origins may be permitted a higher limit.\nContact Cloudflare if you need a higher limit.",
+      "type": "integer"
     }
   },
   "required": [
@@ -195,7 +195,7 @@ export const hyperdrive_hyperdrive_config: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-config-create`.
  */
-export const hyperdrive_hyperdrive_config_create: JsonSchema = {
+export const hyperdrive_hyperdrive$$config$$create: JsonSchema = {
   "description": "A request to create a Hyperdrive configuration using exactly one of caller-supplied origin credentials or a managed integration.",
   "oneOf": [
     {
@@ -210,7 +210,7 @@ export const hyperdrive_hyperdrive_config_create: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-config-create-common`.
  */
-export const hyperdrive_hyperdrive_config_create_common: JsonSchema = {
+export const hyperdrive_hyperdrive$$config$$create$$common: JsonSchema = {
   "properties": {
     "caching": {
       "$ref": "#/$defs/hyperdrive_hyperdrive-caching-create"
@@ -220,12 +220,12 @@ export const hyperdrive_hyperdrive_config_create_common: JsonSchema = {
       "description": "mTLS configuration for the origin connection. Cannot be used with VPC Service origins; TLS must be managed on the VPC Service."
     },
     "name": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-name",
-      "description": "The name of the Hyperdrive configuration. Used to identify the configuration in the Cloudflare dashboard and API."
+      "description": "The name of the Hyperdrive configuration. Used to identify the configuration in the Cloudflare dashboard and API.",
+      "type": "string"
     },
     "origin_connection_limit": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-origin-connection-limit",
-      "description": "The (soft) maximum number of connections the Hyperdrive is allowed to make to the origin database.\n\nMaximum allowed: 20 for free tier accounts, 100 for paid tier accounts.\nIf not specified, defaults to 20 for free tier and 60 for paid tier.\nCertain Cloudflare-managed origins may be permitted a higher limit.\nContact Cloudflare if you need a higher limit.\n"
+      "description": "The (soft) maximum number of connections the Hyperdrive is allowed to make to the origin database.\n\nMaximum allowed: 20 for free tier accounts, 100 for paid tier accounts.\nIf not specified, defaults to 20 for free tier and 60 for paid tier.\nCertain Cloudflare-managed origins may be permitted a higher limit.\nContact Cloudflare if you need a higher limit.",
+      "type": "integer"
     }
   },
   "required": [
@@ -237,7 +237,7 @@ export const hyperdrive_hyperdrive_config_create_common: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-config-create-with-integration`.
  */
-export const hyperdrive_hyperdrive_config_create_with_integration: JsonSchema = {
+export const hyperdrive_hyperdrive$$config$$create$$with$$integration: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/hyperdrive_hyperdrive-config-create-common"
@@ -271,7 +271,7 @@ export const hyperdrive_hyperdrive_config_create_with_integration: JsonSchema =
 /**
  * The schema of `hyperdrive_hyperdrive-config-create-with-origin`.
  */
-export const hyperdrive_hyperdrive_config_create_with_origin: JsonSchema = {
+export const hyperdrive_hyperdrive$$config$$create$$with$$origin: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/hyperdrive_hyperdrive-config-create-common"
@@ -305,7 +305,7 @@ export const hyperdrive_hyperdrive_config_create_with_origin: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-config-patch`.
  */
-export const hyperdrive_hyperdrive_config_patch: JsonSchema = {
+export const hyperdrive_hyperdrive$$config$$patch: JsonSchema = {
   "properties": {
     "caching": {
       "$ref": "#/$defs/hyperdrive_hyperdrive-caching"
@@ -335,8 +335,8 @@ export const hyperdrive_hyperdrive_config_patch: JsonSchema = {
       ]
     },
     "origin_connection_limit": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-origin-connection-limit",
-      "description": "The (soft) maximum number of connections the Hyperdrive is allowed to make to the origin database.\n\nMaximum allowed: 20 for free tier accounts, 100 for paid tier accounts.\nIf not specified, defaults to 20 for free tier and 60 for paid tier.\nCertain Cloudflare-managed origins may be permitted a higher limit.\nContact Cloudflare if you need a higher limit.\n"
+      "description": "The (soft) maximum number of connections the Hyperdrive is allowed to make to the origin database.\n\nMaximum allowed: 20 for free tier accounts, 100 for paid tier accounts.\nIf not specified, defaults to 20 for free tier and 60 for paid tier.\nCertain Cloudflare-managed origins may be permitted a higher limit.\nContact Cloudflare if you need a higher limit.",
+      "type": "integer"
     }
   },
   "type": "object"
@@ -345,7 +345,7 @@ export const hyperdrive_hyperdrive_config_patch: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-database`.
  */
-export const hyperdrive_hyperdrive_database: JsonSchema = {
+export const hyperdrive_hyperdrive$$database: JsonSchema = {
   "description": "Connection Options",
   "properties": {
     "database": {
@@ -357,8 +357,13 @@ export const hyperdrive_hyperdrive_database: JsonSchema = {
       "type": "string"
     },
     "scheme": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-scheme",
-      "description": "Specifies the URL scheme used to connect to your origin database."
+      "description": "Specifies the URL scheme used to connect to your origin database.",
+      "enum": [
+        "postgres",
+        "postgresql",
+        "mysql"
+      ],
+      "type": "string"
     },
     "user": {
       "description": "Set the user of your origin database.",
@@ -371,7 +376,7 @@ export const hyperdrive_hyperdrive_database: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-database-full`.
  */
-export const hyperdrive_hyperdrive_database_full: JsonSchema = {
+export const hyperdrive_hyperdrive$$database$$full: JsonSchema = {
   "properties": {
     "database": {
       "description": "Set the name of your origin database.",
@@ -382,8 +387,13 @@ export const hyperdrive_hyperdrive_database_full: JsonSchema = {
       "type": "string"
     },
     "scheme": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-scheme",
-      "description": "Specifies the URL scheme used to connect to your origin database."
+      "description": "Specifies the URL scheme used to connect to your origin database.",
+      "enum": [
+        "postgres",
+        "postgresql",
+        "mysql"
+      ],
+      "type": "string"
     },
     "user": {
       "description": "Set the user of your origin database.",
@@ -399,21 +409,10 @@ export const hyperdrive_hyperdrive_database_full: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `hyperdrive_hyperdrive-integration-provider`.
- */
-export const hyperdrive_hyperdrive_integration_provider: JsonSchema = {
-  "description": "The database integration provider used by this operation.",
-  "enum": [
-    "planetscale"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `hyperdrive_hyperdrive-mtls`.
  */
-export const hyperdrive_hyperdrive_mtls: JsonSchema = {
+export const hyperdrive_hyperdrive$$mtls: JsonSchema = {
   "description": "mTLS configuration for the origin connection. Cannot be used with VPC Service origins; TLS must be managed on the VPC Service.",
   "properties": {
     "ca_certificate_id": {
@@ -432,26 +431,10 @@ export const hyperdrive_hyperdrive_mtls: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `hyperdrive_hyperdrive-name`.
- */
-export const hyperdrive_hyperdrive_name: JsonSchema = {
-  "description": "The name of the Hyperdrive configuration. Used to identify the configuration in the Cloudflare dashboard and API.",
-  "type": "string"
-};
-
-/**
- * The schema of `hyperdrive_hyperdrive-origin-connection-limit`.
- */
-export const hyperdrive_hyperdrive_origin_connection_limit: JsonSchema = {
-  "description": "The (soft) maximum number of connections the Hyperdrive is allowed to make to the origin database.\n\nMaximum allowed: 20 for free tier accounts, 100 for paid tier accounts.\nIf not specified, defaults to 20 for free tier and 60 for paid tier.\nCertain Cloudflare-managed origins may be permitted a higher limit.\nContact Cloudflare if you need a higher limit.\n",
-  "type": "integer"
-};
-
 /**
  * The schema of `hyperdrive_hyperdrive-origin-full`.
  */
-export const hyperdrive_hyperdrive_origin_full: JsonSchema = {
+export const hyperdrive_hyperdrive$$origin$$full: JsonSchema = {
   "description": "Combines database connection fields with exactly one supported network location.",
   "oneOf": [
     {
@@ -490,7 +473,7 @@ export const hyperdrive_hyperdrive_origin_full: JsonSchema = {
 /**
  * The schema of `hyperdrive_hyperdrive-planet-scale-integration`.
  */
-export const hyperdrive_hyperdrive_planet_scale_integration: JsonSchema = {
+export const hyperdrive_hyperdrive$$planet$$scale$$integration: JsonSchema = {
   "description": "Selects a PlanetScale database and provisions credentials managed by Cloudflare when creating a Hyperdrive configuration. The Cloudflare account must already be linked to PlanetScale in the Hyperdrive dashboard. The selection is returned as read-only metadata and cannot be changed with replace or update operations.",
   "properties": {
     "custom_database_name": {
@@ -510,12 +493,20 @@ export const hyperdrive_hyperdrive_planet_scale_integration: JsonSchema = {
       "type": "string"
     },
     "provider": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-integration-provider",
-      "description": "The database integration provider used by this operation."
+      "description": "The database integration provider used by this operation.",
+      "enum": [
+        "planetscale"
+      ],
+      "type": "string"
     },
     "scheme": {
-      "$ref": "#/$defs/hyperdrive_hyperdrive-scheme",
-      "description": "Specifies the URL scheme used to connect to your origin database."
+      "description": "Specifies the URL scheme used to connect to your origin database.",
+      "enum": [
+        "postgres",
+        "postgresql",
+        "mysql"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -528,31 +519,10 @@ export const hyperdrive_hyperdrive_planet_scale_integration: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `hyperdrive_hyperdrive-scheme`.
- */
-export const hyperdrive_hyperdrive_scheme: JsonSchema = {
-  "description": "Specifies the URL scheme used to connect to your origin database.",
-  "enum": [
-    "postgres",
-    "postgresql",
-    "mysql"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `hyperdrive_identifier`.
- */
-export const hyperdrive_identifier: JsonSchema = {
-  "description": "Define configurations using a unique string identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `hyperdrive_internet-origin`.
  */
-export const hyperdrive_internet_origin: JsonSchema = {
+export const hyperdrive_internet$$origin: JsonSchema = {
   "description": "Public Database",
   "properties": {
     "host": {
@@ -574,7 +544,7 @@ export const hyperdrive_internet_origin: JsonSchema = {
 /**
  * The schema of `hyperdrive_over-access-origin`.
  */
-export const hyperdrive_over_access_origin: JsonSchema = {
+export const hyperdrive_over$$access$$origin: JsonSchema = {
   "description": "Access-protected Database behind Cloudflare Tunnel",
   "properties": {
     "access_client_id": {
@@ -601,8 +571,8 @@ export const hyperdrive_over_access_origin: JsonSchema = {
 /**
  * The schema of `hyperdrive_vpc-service-origin`.
  */
-export const hyperdrive_vpc_service_origin: JsonSchema = {
-  "description": "Connect to a database through a Workers VPC Service. TLS settings (mTLS, sslmode) cannot be configured on the Hyperdrive when using a VPC Service origin; TLS must be managed on the VPC Service itself.\n",
+export const hyperdrive_vpc$$service$$origin: JsonSchema = {
+  "description": "Connect to a database through a Workers VPC Service. TLS settings (mTLS, sslmode) cannot be configured on the Hyperdrive when using a VPC Service origin; TLS must be managed on the VPC Service itself.",
   "properties": {
     "service_id": {
       "description": "The identifier of the Workers VPC Service to connect through. Hyperdrive will egress through the specified VPC Service to reach the origin database.",
diff --git a/src/generated/forge-mcp/hyperdrive/tools.ts b/src/generated/forge-mcp/hyperdrive/tools.ts
index d15a51a5a..94f637796 100644
--- a/src/generated/forge-mcp/hyperdrive/tools.ts
+++ b/src/generated/forge-mcp/hyperdrive/tools.ts
@@ -1,56 +1,46 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  hyperdrive_api_response_collection_output,
-  hyperdrive_api_response_common_failure_output,
-  hyperdrive_api_response_common_output,
-  hyperdrive_api_response_single_output,
-  hyperdrive_hyperdrive_caching_response_output,
-  hyperdrive_hyperdrive_config_response_output,
-  hyperdrive_hyperdrive_database_full_output,
-  hyperdrive_hyperdrive_integration_provider_output,
-  hyperdrive_hyperdrive_mtls_output,
-  hyperdrive_hyperdrive_name_output,
-  hyperdrive_hyperdrive_origin_connection_limit_output,
-  hyperdrive_hyperdrive_origin_full_output,
-  hyperdrive_hyperdrive_planet_scale_integration_output,
-  hyperdrive_hyperdrive_scheme_output,
-  hyperdrive_identifier_output,
-  hyperdrive_internet_origin_output,
-  hyperdrive_messages_output,
-  hyperdrive_over_access_origin_output,
-  hyperdrive_result_info_output,
-  hyperdrive_vpc_service_origin_output,
+  hyperdrive_api$$response$$collection,
+  hyperdrive_api$$response$$common,
+  hyperdrive_api$$response$$common$$failure,
+  hyperdrive_api$$response$$single,
+  hyperdrive_hyperdrive$$caching$$response,
+  hyperdrive_hyperdrive$$config$$response,
+  hyperdrive_hyperdrive$$database$$full,
+  hyperdrive_hyperdrive$$mtls,
+  hyperdrive_hyperdrive$$origin$$full,
+  hyperdrive_hyperdrive$$planet$$scale$$integration,
+  hyperdrive_internet$$origin,
+  hyperdrive_messages,
+  hyperdrive_over$$access$$origin,
+  hyperdrive_result_info,
+  hyperdrive_vpc$$service$$origin,
 } from "./outputs.js";
 import {
-  hyperdrive_hyperdrive_caching,
-  hyperdrive_hyperdrive_caching_common,
-  hyperdrive_hyperdrive_caching_create,
-  hyperdrive_hyperdrive_caching_create_disabled,
-  hyperdrive_hyperdrive_caching_create_enabled,
-  hyperdrive_hyperdrive_caching_disabled,
-  hyperdrive_hyperdrive_caching_enabled,
-  hyperdrive_hyperdrive_config,
-  hyperdrive_hyperdrive_config_create,
-  hyperdrive_hyperdrive_config_create_common,
-  hyperdrive_hyperdrive_config_create_with_integration,
-  hyperdrive_hyperdrive_config_create_with_origin,
-  hyperdrive_hyperdrive_config_patch,
-  hyperdrive_hyperdrive_database,
-  hyperdrive_hyperdrive_database_full,
-  hyperdrive_hyperdrive_integration_provider,
-  hyperdrive_hyperdrive_mtls,
-  hyperdrive_hyperdrive_name,
-  hyperdrive_hyperdrive_origin_connection_limit,
-  hyperdrive_hyperdrive_origin_full,
-  hyperdrive_hyperdrive_planet_scale_integration,
-  hyperdrive_hyperdrive_scheme,
-  hyperdrive_identifier,
-  hyperdrive_internet_origin,
-  hyperdrive_over_access_origin,
-  hyperdrive_vpc_service_origin,
+  hyperdrive_hyperdrive$$caching,
+  hyperdrive_hyperdrive$$caching$$common,
+  hyperdrive_hyperdrive$$caching$$create,
+  hyperdrive_hyperdrive$$caching$$create$$disabled,
+  hyperdrive_hyperdrive$$caching$$create$$enabled,
+  hyperdrive_hyperdrive$$caching$$disabled,
+  hyperdrive_hyperdrive$$caching$$enabled,
+  hyperdrive_hyperdrive$$config,
+  hyperdrive_hyperdrive$$config$$create,
+  hyperdrive_hyperdrive$$config$$create$$common,
+  hyperdrive_hyperdrive$$config$$create$$with$$integration,
+  hyperdrive_hyperdrive$$config$$create$$with$$origin,
+  hyperdrive_hyperdrive$$config$$patch,
+  hyperdrive_hyperdrive$$database,
+  hyperdrive_hyperdrive$$database$$full as hyperdrive_hyperdrive$$database$$full$,
+  hyperdrive_hyperdrive$$mtls as hyperdrive_hyperdrive$$mtls$,
+  hyperdrive_hyperdrive$$origin$$full as hyperdrive_hyperdrive$$origin$$full$,
+  hyperdrive_hyperdrive$$planet$$scale$$integration as hyperdrive_hyperdrive$$planet$$scale$$integration$,
+  hyperdrive_internet$$origin as hyperdrive_internet$$origin$,
+  hyperdrive_over$$access$$origin as hyperdrive_over$$access$$origin$,
+  hyperdrive_vpc$$service$$origin as hyperdrive_vpc$$service$$origin$,
 } from "./schemas.js";
 
 /**
@@ -60,42 +50,47 @@ export const tools: readonly Tool[] = [
   {
     name: "hyperdrive_create",
     title: "Create Hyperdrive",
-    description: "Creates and returns a new Hyperdrive configuration. For a PlanetScale integration, the Cloudflare account must already be linked to PlanetScale in the Hyperdrive dashboard.",
+    description: "Creates and returns a new Hyperdrive configuration. For a PlanetScale integration, the Cloudflare account must already be linked to PlanetScale in the Hyperdrive dashboard.\n\nPOST /accounts/{account_id}/hyperdrive/configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/hyperdrive_hyperdrive-config-create"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "hyperdrive_hyperdrive-caching-create": hyperdrive_hyperdrive_caching_create,
-        "hyperdrive_hyperdrive-caching-create-disabled": hyperdrive_hyperdrive_caching_create_disabled,
-        "hyperdrive_hyperdrive-caching-create-enabled": hyperdrive_hyperdrive_caching_create_enabled,
-        "hyperdrive_hyperdrive-config-create": hyperdrive_hyperdrive_config_create,
-        "hyperdrive_hyperdrive-config-create-common": hyperdrive_hyperdrive_config_create_common,
-        "hyperdrive_hyperdrive-config-create-with-integration": hyperdrive_hyperdrive_config_create_with_integration,
-        "hyperdrive_hyperdrive-config-create-with-origin": hyperdrive_hyperdrive_config_create_with_origin,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme,
-        "hyperdrive_identifier": hyperdrive_identifier,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin,
+        "hyperdrive_hyperdrive-caching-create": hyperdrive_hyperdrive$$caching$$create,
+        "hyperdrive_hyperdrive-caching-create-disabled": hyperdrive_hyperdrive$$caching$$create$$disabled,
+        "hyperdrive_hyperdrive-caching-create-enabled": hyperdrive_hyperdrive$$caching$$create$$enabled,
+        "hyperdrive_hyperdrive-config-create": hyperdrive_hyperdrive$$config$$create,
+        "hyperdrive_hyperdrive-config-create-common": hyperdrive_hyperdrive$$config$$create$$common,
+        "hyperdrive_hyperdrive-config-create-with-integration": hyperdrive_hyperdrive$$config$$create$$with$$integration,
+        "hyperdrive_hyperdrive-config-create-with-origin": hyperdrive_hyperdrive$$config$$create$$with$$origin,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full$,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls$,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full$,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration$,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin$,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin$,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin$,
       },
     },
     outputSchema: {
@@ -113,22 +108,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     annotations: {
@@ -184,23 +174,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "hyperdrive_api-response-common-failure": hyperdrive_api_response_common_failure_output,
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-common-failure": hyperdrive_api$$response$$common$$failure,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     request: (args) => ({
@@ -211,26 +196,33 @@ export const tools: readonly Tool[] = [
   {
     name: "hyperdrive_delete",
     title: "Delete Hyperdrive",
-    description: "Deletes the specified Hyperdrive.\n\nConfirm with the user before calling this tool. This operation deletes an existing Hyperdrive configuration.",
+    description: "Deletes the specified Hyperdrive.\n\nConfirm with the user before calling this tool. This operation deletes an existing Hyperdrive configuration.\n\nDELETE /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The Cloudflare account ID."
-        },
-        "hyperdrive_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The unique identifier of the Hyperdrive configuration."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Cloudflare account ID.",
+              "type": "string"
+            },
+            "hyperdrive_id": {
+              "description": "The unique identifier of the Hyperdrive configuration.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hyperdrive_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hyperdrive_id"
+        "path"
       ],
-      $defs: {
-        "hyperdrive_identifier": hyperdrive_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -254,8 +246,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_messages": hyperdrive_messages,
       },
     },
     annotations: {
@@ -306,9 +298,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "hyperdrive_api-response-common-failure": hyperdrive_api_response_common_failure_output,
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
+        "hyperdrive_api-response-common-failure": hyperdrive_api$$response$$common$$failure,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_messages": hyperdrive_messages,
       },
     },
     request: (args) => ({
@@ -318,26 +310,33 @@ export const tools: readonly Tool[] = [
   {
     name: "hyperdrive_get",
     title: "Get Hyperdrive",
-    description: "Returns the specified Hyperdrive configuration.",
+    description: "Returns the specified Hyperdrive configuration.\n\nGET /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The Cloudflare account ID."
-        },
-        "hyperdrive_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The unique identifier of the Hyperdrive configuration."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Cloudflare account ID.",
+              "type": "string"
+            },
+            "hyperdrive_id": {
+              "description": "The unique identifier of the Hyperdrive configuration.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hyperdrive_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hyperdrive_id"
+        "path"
       ],
-      $defs: {
-        "hyperdrive_identifier": hyperdrive_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -354,22 +353,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     annotations: {
@@ -414,23 +408,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "hyperdrive_api-response-common-failure": hyperdrive_api_response_common_failure_output,
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-common-failure": hyperdrive_api$$response$$common$$failure,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     request: (args) => ({
@@ -440,31 +429,44 @@ export const tools: readonly Tool[] = [
   {
     name: "hyperdrive_list",
     title: "List Hyperdrives",
-    description: "Returns a list of Hyperdrives.",
+    description: "Returns a list of Hyperdrives.\n\nGET /accounts/{account_id}/hyperdrive/configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The Cloudflare account ID."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "hyperdrive_identifier": hyperdrive_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -484,24 +486,19 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "hyperdrive_api-response-collection": hyperdrive_api_response_collection_output,
-        "hyperdrive_api-response-common": hyperdrive_api_response_common_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_result_info": hyperdrive_result_info_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-collection": hyperdrive_api$$response$$collection,
+        "hyperdrive_api-response-common": hyperdrive_api$$response$$common,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_result_info": hyperdrive_result_info,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     annotations: {
@@ -549,75 +546,76 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "hyperdrive_api-response-collection": hyperdrive_api_response_collection_output,
-        "hyperdrive_api-response-common": hyperdrive_api_response_common_output,
-        "hyperdrive_api-response-common-failure": hyperdrive_api_response_common_failure_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_result_info": hyperdrive_result_info_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-collection": hyperdrive_api$$response$$collection,
+        "hyperdrive_api-response-common": hyperdrive_api$$response$$common,
+        "hyperdrive_api-response-common-failure": hyperdrive_api$$response$$common$$failure,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_result_info": hyperdrive_result_info,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/hyperdrive/configs`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "hyperdrive_replace",
     title: "Replace Hyperdrive",
-    description: "Replaces and returns the specified Hyperdrive configuration. The request must include the name and complete origin connection details. Omitted caching settings are reset to their defaults, while omitted mTLS settings and origin connection limits are preserved. The integration association is set only during creation and cannot be changed; omit the integration field even when replacing an integration-backed configuration. Use the update operation to modify only selected fields.",
+    description: "Replaces and returns the specified Hyperdrive configuration. The request must include the name and complete origin connection details. Omitted caching settings are reset to their defaults, while omitted mTLS settings and origin connection limits are preserved. The integration association is set only during creation and cannot be changed; omit the integration field even when replacing an integration-backed configuration. Use the update operation to modify only selected fields.\n\nPUT /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/hyperdrive_hyperdrive-config"
         },
-        "hyperdrive_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The unique identifier of the Hyperdrive configuration."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Cloudflare account ID.",
+              "type": "string"
+            },
+            "hyperdrive_id": {
+              "description": "The unique identifier of the Hyperdrive configuration.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hyperdrive_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hyperdrive_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "hyperdrive_hyperdrive-caching": hyperdrive_hyperdrive_caching,
-        "hyperdrive_hyperdrive-caching-common": hyperdrive_hyperdrive_caching_common,
-        "hyperdrive_hyperdrive-caching-disabled": hyperdrive_hyperdrive_caching_disabled,
-        "hyperdrive_hyperdrive-caching-enabled": hyperdrive_hyperdrive_caching_enabled,
-        "hyperdrive_hyperdrive-config": hyperdrive_hyperdrive_config,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme,
-        "hyperdrive_identifier": hyperdrive_identifier,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin,
+        "hyperdrive_hyperdrive-caching": hyperdrive_hyperdrive$$caching,
+        "hyperdrive_hyperdrive-caching-common": hyperdrive_hyperdrive$$caching$$common,
+        "hyperdrive_hyperdrive-caching-disabled": hyperdrive_hyperdrive$$caching$$disabled,
+        "hyperdrive_hyperdrive-caching-enabled": hyperdrive_hyperdrive$$caching$$enabled,
+        "hyperdrive_hyperdrive-config": hyperdrive_hyperdrive$$config,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full$,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls$,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full$,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin$,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin$,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin$,
       },
     },
     outputSchema: {
@@ -635,22 +633,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     annotations: {
@@ -706,23 +699,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "hyperdrive_api-response-common-failure": hyperdrive_api_response_common_failure_output,
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-common-failure": hyperdrive_api$$response$$common$$failure,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     request: (args) => ({
@@ -733,26 +721,33 @@ export const tools: readonly Tool[] = [
   {
     name: "hyperdrive_restart",
     title: "Restart Hyperdrive",
-    description: "Restarts the connection pool for the specified Hyperdrive configuration without changing its configuration. Existing connections are drained and a new pool is established at the edge.",
+    description: "Restarts the connection pool for the specified Hyperdrive configuration without changing its configuration. Existing connections are drained and a new pool is established at the edge.\n\nPOST /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}/restart",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The Cloudflare account ID."
-        },
-        "hyperdrive_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The unique identifier of the Hyperdrive configuration."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Cloudflare account ID.",
+              "type": "string"
+            },
+            "hyperdrive_id": {
+              "description": "The unique identifier of the Hyperdrive configuration.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hyperdrive_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hyperdrive_id"
+        "path"
       ],
-      $defs: {
-        "hyperdrive_identifier": hyperdrive_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -769,22 +764,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     annotations: {
@@ -823,23 +813,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "hyperdrive_api-response-common-failure": hyperdrive_api_response_common_failure_output,
-        "hyperdrive_api-response-single": hyperdrive_api_response_single_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-common-failure": hyperdrive_api$$response$$common$$failure,
+        "hyperdrive_api-response-single": hyperdrive_api$$response$$single,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     request: (args) => ({
@@ -849,41 +834,48 @@ export const tools: readonly Tool[] = [
   {
     name: "hyperdrive_update",
     title: "Update Hyperdrive",
-    description: "Updates and returns the specified fields of the Hyperdrive configuration. Custom caching settings are not kept if caching is disabled. For an integration-backed configuration, the integration association is preserved but cannot be changed; omit the integration field.",
+    description: "Updates and returns the specified fields of the Hyperdrive configuration. Custom caching settings are not kept if caching is disabled. For an integration-backed configuration, the integration association is preserved but cannot be changed; omit the integration field.\n\nPATCH /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/hyperdrive_hyperdrive-config-patch"
         },
-        "hyperdrive_id": {
-          "$ref": "#/$defs/hyperdrive_identifier",
-          "description": "The unique identifier of the Hyperdrive configuration."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Cloudflare account ID.",
+              "type": "string"
+            },
+            "hyperdrive_id": {
+              "description": "The unique identifier of the Hyperdrive configuration.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hyperdrive_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hyperdrive_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "hyperdrive_hyperdrive-caching": hyperdrive_hyperdrive_caching,
-        "hyperdrive_hyperdrive-caching-common": hyperdrive_hyperdrive_caching_common,
-        "hyperdrive_hyperdrive-caching-disabled": hyperdrive_hyperdrive_caching_disabled,
-        "hyperdrive_hyperdrive-caching-enabled": hyperdrive_hyperdrive_caching_enabled,
-        "hyperdrive_hyperdrive-config-patch": hyperdrive_hyperdrive_config_patch,
-        "hyperdrive_hyperdrive-database": hyperdrive_hyperdrive_database,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme,
-        "hyperdrive_identifier": hyperdrive_identifier,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin,
+        "hyperdrive_hyperdrive-caching": hyperdrive_hyperdrive$$caching,
+        "hyperdrive_hyperdrive-caching-common": hyperdrive_hyperdrive$$caching$$common,
+        "hyperdrive_hyperdrive-caching-disabled": hyperdrive_hyperdrive$$caching$$disabled,
+        "hyperdrive_hyperdrive-caching-enabled": hyperdrive_hyperdrive$$caching$$enabled,
+        "hyperdrive_hyperdrive-config-patch": hyperdrive_hyperdrive$$config$$patch,
+        "hyperdrive_hyperdrive-database": hyperdrive_hyperdrive$$database,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls$,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin$,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin$,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin$,
       },
     },
     outputSchema: {
@@ -901,22 +893,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "hyperdrive_api-response-common": hyperdrive_api_response_common_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-common": hyperdrive_api$$response$$common,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     annotations: {
@@ -972,23 +959,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "hyperdrive_api-response-common": hyperdrive_api_response_common_output,
-        "hyperdrive_api-response-common-failure": hyperdrive_api_response_common_failure_output,
-        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive_caching_response_output,
-        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive_config_response_output,
-        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive_database_full_output,
-        "hyperdrive_hyperdrive-integration-provider": hyperdrive_hyperdrive_integration_provider_output,
-        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive_mtls_output,
-        "hyperdrive_hyperdrive-name": hyperdrive_hyperdrive_name_output,
-        "hyperdrive_hyperdrive-origin-connection-limit": hyperdrive_hyperdrive_origin_connection_limit_output,
-        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive_origin_full_output,
-        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive_planet_scale_integration_output,
-        "hyperdrive_hyperdrive-scheme": hyperdrive_hyperdrive_scheme_output,
-        "hyperdrive_identifier": hyperdrive_identifier_output,
-        "hyperdrive_internet-origin": hyperdrive_internet_origin_output,
-        "hyperdrive_messages": hyperdrive_messages_output,
-        "hyperdrive_over-access-origin": hyperdrive_over_access_origin_output,
-        "hyperdrive_vpc-service-origin": hyperdrive_vpc_service_origin_output,
+        "hyperdrive_api-response-common": hyperdrive_api$$response$$common,
+        "hyperdrive_api-response-common-failure": hyperdrive_api$$response$$common$$failure,
+        "hyperdrive_hyperdrive-caching-response": hyperdrive_hyperdrive$$caching$$response,
+        "hyperdrive_hyperdrive-config-response": hyperdrive_hyperdrive$$config$$response,
+        "hyperdrive_hyperdrive-database-full": hyperdrive_hyperdrive$$database$$full,
+        "hyperdrive_hyperdrive-mtls": hyperdrive_hyperdrive$$mtls,
+        "hyperdrive_hyperdrive-origin-full": hyperdrive_hyperdrive$$origin$$full,
+        "hyperdrive_hyperdrive-planet-scale-integration": hyperdrive_hyperdrive$$planet$$scale$$integration,
+        "hyperdrive_internet-origin": hyperdrive_internet$$origin,
+        "hyperdrive_messages": hyperdrive_messages,
+        "hyperdrive_over-access-origin": hyperdrive_over$$access$$origin,
+        "hyperdrive_vpc-service-origin": hyperdrive_vpc$$service$$origin,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/iam/oauthClients/outputs.ts b/src/generated/forge-mcp/iam/oauthClients/outputs.ts
index f3a82b158..d5c835d1f 100644
--- a/src/generated/forge-mcp/iam/oauthClients/outputs.ts
+++ b/src/generated/forge-mcp/iam/oauthClients/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_collection_oauth_client_response` in responses.
  */
-export const iam_collection_oauth_client_response_output: JsonSchema = {
+export const iam_collection_oauth_client_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -28,7 +28,7 @@ export const iam_collection_oauth_client_response_output: JsonSchema = {
 /**
  * The schema of `iam_oauth_client` in responses.
  */
-export const iam_oauth_client_output: JsonSchema = {
+export const iam_oauth_client: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_oauth_client_common"
@@ -36,7 +36,7 @@ export const iam_oauth_client_output: JsonSchema = {
     {
       "properties": {
         "client_id": {
-          "$ref": "#/$defs/iam_oauth_client_identifier"
+          "type": "string"
         },
         "client_uri_verification": {
           "$ref": "#/$defs/iam_oauth_client_uri_verification"
@@ -76,7 +76,7 @@ export const iam_oauth_client_output: JsonSchema = {
 /**
  * The schema of `iam_oauth_client_common` in responses.
  */
-export const iam_oauth_client_common_output: JsonSchema = {
+export const iam_oauth_client_common: JsonSchema = {
   "properties": {
     "allowed_cors_origins": {
       "items": {
@@ -127,7 +127,12 @@ export const iam_oauth_client_common_output: JsonSchema = {
       "type": "array"
     },
     "token_endpoint_auth_method": {
-      "$ref": "#/$defs/iam_oauth_client_token_endpoint_auth_method"
+      "enum": [
+        "none",
+        "client_secret_basic",
+        "client_secret_post"
+      ],
+      "type": "string"
     },
     "tos_uri": {
       "type": "string"
@@ -139,7 +144,7 @@ export const iam_oauth_client_common_output: JsonSchema = {
 /**
  * The schema of `iam_oauth_client_grant_types` in responses.
  */
-export const iam_oauth_client_grant_types_output: JsonSchema = {
+export const iam_oauth_client_grant_types: JsonSchema = {
   "items": {
     "enum": [
       "authorization_code",
@@ -150,17 +155,10 @@ export const iam_oauth_client_grant_types_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `iam_oauth_client_identifier` in responses.
- */
-export const iam_oauth_client_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_oauth_client_response_types` in responses.
  */
-export const iam_oauth_client_response_types_output: JsonSchema = {
+export const iam_oauth_client_response_types: JsonSchema = {
   "items": {
     "enum": [
       "token",
@@ -175,7 +173,7 @@ export const iam_oauth_client_response_types_output: JsonSchema = {
 /**
  * The schema of `iam_oauth_client_rotate_secret_response` in responses.
  */
-export const iam_oauth_client_rotate_secret_response_output: JsonSchema = {
+export const iam_oauth_client_rotate_secret_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -196,22 +194,10 @@ export const iam_oauth_client_rotate_secret_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `iam_oauth_client_token_endpoint_auth_method` in responses.
- */
-export const iam_oauth_client_token_endpoint_auth_method_output: JsonSchema = {
-  "enum": [
-    "none",
-    "client_secret_basic",
-    "client_secret_post"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `iam_oauth_client_uri_verification` in responses.
  */
-export const iam_oauth_client_uri_verification_output: JsonSchema = {
+export const iam_oauth_client_uri_verification: JsonSchema = {
   "properties": {
     "status": {
       "enum": [
@@ -232,7 +218,7 @@ export const iam_oauth_client_uri_verification_output: JsonSchema = {
 /**
  * The schema of `iam_oauth_client_with_secret` in responses.
  */
-export const iam_oauth_client_with_secret_output: JsonSchema = {
+export const iam_oauth_client_with_secret: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_oauth_client"
@@ -251,7 +237,7 @@ export const iam_oauth_client_with_secret_output: JsonSchema = {
 /**
  * The schema of `iam_single_oauth_client_create_response` in responses.
  */
-export const iam_single_oauth_client_create_response_output: JsonSchema = {
+export const iam_single_oauth_client_create_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -270,7 +256,7 @@ export const iam_single_oauth_client_create_response_output: JsonSchema = {
 /**
  * The schema of `iam_single_oauth_client_response` in responses.
  */
-export const iam_single_oauth_client_response_output: JsonSchema = {
+export const iam_single_oauth_client_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
diff --git a/src/generated/forge-mcp/iam/oauthClients/schemas.ts b/src/generated/forge-mcp/iam/oauthClients/schemas.ts
index b241744bf..89e059a68 100644
--- a/src/generated/forge-mcp/iam/oauthClients/schemas.ts
+++ b/src/generated/forge-mcp/iam/oauthClients/schemas.ts
@@ -69,8 +69,13 @@ export const iam_oauth_client_common: JsonSchema = {
       "type": "array"
     },
     "token_endpoint_auth_method": {
-      "$ref": "#/$defs/iam_oauth_client_token_endpoint_auth_method",
-      "description": "The authentication method the client uses at the token endpoint."
+      "description": "The authentication method the client uses at the token endpoint.",
+      "enum": [
+        "none",
+        "client_secret_basic",
+        "client_secret_post"
+      ],
+      "type": "string"
     },
     "tos_uri": {
       "description": "URL that points to a terms of service document.",
@@ -146,8 +151,13 @@ export const iam_oauth_client_create_request: JsonSchema = {
       "type": "array"
     },
     "token_endpoint_auth_method": {
-      "$ref": "#/$defs/iam_oauth_client_token_endpoint_auth_method",
-      "description": "The authentication method the client uses at the token endpoint."
+      "description": "The authentication method the client uses at the token endpoint.",
+      "enum": [
+        "none",
+        "client_secret_basic",
+        "client_secret_post"
+      ],
+      "type": "string"
     },
     "tos_uri": {
       "description": "URL that points to a terms of service document.",
@@ -180,14 +190,6 @@ export const iam_oauth_client_grant_types: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `iam_oauth_client_identifier`.
- */
-export const iam_oauth_client_identifier: JsonSchema = {
-  "description": "The unique identifier for an OAuth client.",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_oauth_client_response_types`.
  */
@@ -204,19 +206,6 @@ export const iam_oauth_client_response_types: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `iam_oauth_client_token_endpoint_auth_method`.
- */
-export const iam_oauth_client_token_endpoint_auth_method: JsonSchema = {
-  "description": "The authentication method the client uses at the token endpoint.",
-  "enum": [
-    "none",
-    "client_secret_basic",
-    "client_secret_post"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `iam_oauth_client_update_request`.
  */
diff --git a/src/generated/forge-mcp/iam/oauthClients/tools.ts b/src/generated/forge-mcp/iam/oauthClients/tools.ts
index 13932e26a..885d33038 100644
--- a/src/generated/forge-mcp/iam/oauthClients/tools.ts
+++ b/src/generated/forge-mcp/iam/oauthClients/tools.ts
@@ -3,89 +3,85 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_id_output,
-  iam_api_response_single_output,
-  iam_common_components_schemas_identifier_output,
-  iam_messages_2_output,
-  iam_result_info_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_api$$response$$single$$id,
+  iam_messages$$2,
+  iam_result_info,
 } from "../../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import {
-  iam_collection_oauth_client_response_output,
-  iam_oauth_client_common_output,
-  iam_oauth_client_grant_types_output,
-  iam_oauth_client_identifier_output,
-  iam_oauth_client_output,
-  iam_oauth_client_response_types_output,
-  iam_oauth_client_rotate_secret_response_output,
-  iam_oauth_client_token_endpoint_auth_method_output,
-  iam_oauth_client_uri_verification_output,
-  iam_oauth_client_with_secret_output,
-  iam_single_oauth_client_create_response_output,
-  iam_single_oauth_client_response_output,
-} from "./outputs.js";
-import {
+  iam_collection_oauth_client_response,
+  iam_oauth_client,
   iam_oauth_client_common,
-  iam_oauth_client_create_request,
   iam_oauth_client_grant_types,
-  iam_oauth_client_identifier,
   iam_oauth_client_response_types,
-  iam_oauth_client_token_endpoint_auth_method,
+  iam_oauth_client_rotate_secret_response,
+  iam_oauth_client_uri_verification,
+  iam_oauth_client_with_secret,
+  iam_single_oauth_client_create_response,
+  iam_single_oauth_client_response,
+} from "./outputs.js";
+import {
+  iam_oauth_client_common as iam_oauth_client_common$,
+  iam_oauth_client_create_request,
+  iam_oauth_client_grant_types as iam_oauth_client_grant_types$,
+  iam_oauth_client_response_types as iam_oauth_client_response_types$,
   iam_oauth_client_update_request,
 } from "./schemas.js";
 
 /**
- * The tools of `iam.oauth_clients`.
+ * The tools of `iam.oauthClients`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "iam_oauth_clients_create",
+    name: "iam_oauthClients_create",
     title: "Create OAuth Client",
-    description: "Create a new OAuth client for an account.",
+    description: "Create a new OAuth client for an account.\n\nPOST /accounts/{account_id}/oauth_clients",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_oauth_client_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
         "iam_oauth_client_create_request": iam_oauth_client_create_request,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types$,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_oauth_client_create_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client": iam_oauth_client_output,
-        "iam_oauth_client_common": iam_oauth_client_common_output,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types_output,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier_output,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types_output,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method_output,
-        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification_output,
-        "iam_oauth_client_with_secret": iam_oauth_client_with_secret_output,
-        "iam_single_oauth_client_create_response": iam_single_oauth_client_create_response_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client": iam_oauth_client,
+        "iam_oauth_client_common": iam_oauth_client_common,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types,
+        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification,
+        "iam_oauth_client_with_secret": iam_oauth_client_with_secret,
+        "iam_single_oauth_client_create_response": iam_single_oauth_client_create_response,
       },
     },
     annotations: {
@@ -123,18 +119,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client": iam_oauth_client_output,
-        "iam_oauth_client_common": iam_oauth_client_common_output,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types_output,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier_output,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types_output,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method_output,
-        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification_output,
-        "iam_oauth_client_with_secret": iam_oauth_client_with_secret_output,
-        "iam_single_oauth_client_create_response": iam_single_oauth_client_create_response_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client": iam_oauth_client,
+        "iam_oauth_client_common": iam_oauth_client_common,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types,
+        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification,
+        "iam_oauth_client_with_secret": iam_oauth_client_with_secret,
+        "iam_single_oauth_client_create_response": iam_single_oauth_client_create_response,
       },
     },
     request: (args) => ({
@@ -143,38 +137,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_oauth_clients_delete",
+    name: "iam_oauthClients_delete",
     title: "Delete OAuth Client",
-    description: "Delete an OAuth client.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Delete an OAuth client.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/oauth_clients/{oauth_client_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "oauth_client_id": {
-          "$ref": "#/$defs/iam_oauth_client_identifier",
-          "description": "The unique identifier for an OAuth client."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "oauth_client_id": {
+              "description": "The unique identifier for an OAuth client.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "oauth_client_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "oauth_client_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -212,11 +210,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -224,38 +221,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_oauth_clients_delete_rotated_secret",
+    name: "iam_oauthClients_deleteRotatedSecret",
     title: "Delete Rotated OAuth Client Secret",
-    description: "Removes the old client secret after a rotation, keeping only the new one. Use this after you have updated your client configuration to use the new secret. The `has_rotated_secret` field on the client indicates whether there is an old secret to delete.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Removes the old client secret after a rotation, keeping only the new one. Use this after you have updated your client configuration to use the new secret. The `has_rotated_secret` field on the client indicates whether there is an old secret to delete.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/oauth_clients/{oauth_client_id}/rotate_secret",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "oauth_client_id": {
-          "$ref": "#/$defs/iam_oauth_client_identifier",
-          "description": "The unique identifier for an OAuth client."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "oauth_client_id": {
+              "description": "The unique identifier for an OAuth client.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "oauth_client_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "oauth_client_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -293,11 +294,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -305,44 +305,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_oauth_clients_get",
+    name: "iam_oauthClients_get",
     title: "OAuth Client Details",
-    description: "Get details of a specific OAuth client.",
+    description: "Get details of a specific OAuth client.\n\nGET /accounts/{account_id}/oauth_clients/{oauth_client_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "oauth_client_id": {
-          "$ref": "#/$defs/iam_oauth_client_identifier",
-          "description": "The unique identifier for an OAuth client."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "oauth_client_id": {
+              "description": "The unique identifier for an OAuth client.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "oauth_client_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "oauth_client_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_oauth_client_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client": iam_oauth_client_output,
-        "iam_oauth_client_common": iam_oauth_client_common_output,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types_output,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier_output,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types_output,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method_output,
-        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification_output,
-        "iam_single_oauth_client_response": iam_single_oauth_client_response_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client": iam_oauth_client,
+        "iam_oauth_client_common": iam_oauth_client_common,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types,
+        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification,
+        "iam_single_oauth_client_response": iam_single_oauth_client_response,
       },
     },
     annotations: {
@@ -380,17 +383,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client": iam_oauth_client_output,
-        "iam_oauth_client_common": iam_oauth_client_common_output,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types_output,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier_output,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types_output,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method_output,
-        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification_output,
-        "iam_single_oauth_client_response": iam_single_oauth_client_response_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client": iam_oauth_client,
+        "iam_oauth_client_common": iam_oauth_client_common,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types,
+        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification,
+        "iam_single_oauth_client_response": iam_single_oauth_client_response,
       },
     },
     request: (args) => ({
@@ -398,40 +399,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_oauth_clients_list",
+    name: "iam_oauthClients_list",
     title: "List OAuth Clients",
-    description: "List all OAuth clients for an account.",
+    description: "List all OAuth clients for an account.\n\nGET /accounts/{account_id}/oauth_clients",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_collection_oauth_client_response",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_collection_oauth_client_response": iam_collection_oauth_client_response_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client": iam_oauth_client_output,
-        "iam_oauth_client_common": iam_oauth_client_common_output,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types_output,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier_output,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types_output,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method_output,
-        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_collection_oauth_client_response": iam_collection_oauth_client_response,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client": iam_oauth_client,
+        "iam_oauth_client_common": iam_oauth_client_common,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types,
+        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification,
+        "iam_result_info": iam_result_info,
       },
     },
     annotations: {
@@ -469,19 +474,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_collection_oauth_client_response": iam_collection_oauth_client_response_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client": iam_oauth_client_output,
-        "iam_oauth_client_common": iam_oauth_client_common_output,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types_output,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier_output,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types_output,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method_output,
-        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_collection_oauth_client_response": iam_collection_oauth_client_response,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client": iam_oauth_client,
+        "iam_oauth_client_common": iam_oauth_client_common,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types,
+        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification,
+        "iam_result_info": iam_result_info,
       },
     },
     request: (args) => ({
@@ -489,37 +492,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_oauth_clients_rotate_secret",
+    name: "iam_oauthClients_rotateSecret",
     title: "Rotate OAuth Client Secret",
-    description: "Creates a second client secret so you can update your client configuration before deleting the old one. The `has_rotated_secret` field on the client will be set to `true`.",
+    description: "Creates a second client secret so you can update your client configuration before deleting the old one. The `has_rotated_secret` field on the client will be set to `true`.\n\nPOST /accounts/{account_id}/oauth_clients/{oauth_client_id}/rotate_secret",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "oauth_client_id": {
-          "$ref": "#/$defs/iam_oauth_client_identifier",
-          "description": "The unique identifier for an OAuth client."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "oauth_client_id": {
+              "description": "The unique identifier for an OAuth client.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "oauth_client_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "oauth_client_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_oauth_client_rotate_secret_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client_rotate_secret_response": iam_oauth_client_rotate_secret_response_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client_rotate_secret_response": iam_oauth_client_rotate_secret_response,
       },
     },
     annotations: {
@@ -557,10 +565,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client_rotate_secret_response": iam_oauth_client_rotate_secret_response_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client_rotate_secret_response": iam_oauth_client_rotate_secret_response,
       },
     },
     request: (args) => ({
@@ -568,53 +576,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_oauth_clients_update",
+    name: "iam_oauthClients_update",
     title: "Update OAuth Client",
-    description: "Update an existing OAuth client. Only include fields you want to update.",
+    description: "Update an existing OAuth client. Only include fields you want to update.\n\nPATCH /accounts/{account_id}/oauth_clients/{oauth_client_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_oauth_client_update_request"
         },
-        "oauth_client_id": {
-          "$ref": "#/$defs/iam_oauth_client_identifier",
-          "description": "The unique identifier for an OAuth client."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "oauth_client_id": {
+              "description": "The unique identifier for an OAuth client.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "oauth_client_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "oauth_client_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_oauth_client_common": iam_oauth_client_common,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method,
+        "iam_oauth_client_common": iam_oauth_client_common$,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types$,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types$,
         "iam_oauth_client_update_request": iam_oauth_client_update_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_oauth_client_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client": iam_oauth_client_output,
-        "iam_oauth_client_common": iam_oauth_client_common_output,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types_output,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier_output,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types_output,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method_output,
-        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification_output,
-        "iam_single_oauth_client_response": iam_single_oauth_client_response_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client": iam_oauth_client,
+        "iam_oauth_client_common": iam_oauth_client_common,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types,
+        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification,
+        "iam_single_oauth_client_response": iam_single_oauth_client_response,
       },
     },
     annotations: {
@@ -652,17 +664,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_client": iam_oauth_client_output,
-        "iam_oauth_client_common": iam_oauth_client_common_output,
-        "iam_oauth_client_grant_types": iam_oauth_client_grant_types_output,
-        "iam_oauth_client_identifier": iam_oauth_client_identifier_output,
-        "iam_oauth_client_response_types": iam_oauth_client_response_types_output,
-        "iam_oauth_client_token_endpoint_auth_method": iam_oauth_client_token_endpoint_auth_method_output,
-        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification_output,
-        "iam_single_oauth_client_response": iam_single_oauth_client_response_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_client": iam_oauth_client,
+        "iam_oauth_client_common": iam_oauth_client_common,
+        "iam_oauth_client_grant_types": iam_oauth_client_grant_types,
+        "iam_oauth_client_response_types": iam_oauth_client_response_types,
+        "iam_oauth_client_uri_verification": iam_oauth_client_uri_verification,
+        "iam_single_oauth_client_response": iam_single_oauth_client_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/iam/oauthScopes/outputs.ts b/src/generated/forge-mcp/iam/oauthScopes/outputs.ts
index 26f377138..777b70cd2 100644
--- a/src/generated/forge-mcp/iam/oauthScopes/outputs.ts
+++ b/src/generated/forge-mcp/iam/oauthScopes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_collection_oauth_scopes_response` in responses.
  */
-export const iam_collection_oauth_scopes_response_output: JsonSchema = {
+export const iam_collection_oauth_scopes_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -28,7 +28,7 @@ export const iam_collection_oauth_scopes_response_output: JsonSchema = {
 /**
  * The schema of `iam_oauth_scope` in responses.
  */
-export const iam_oauth_scope_output: JsonSchema = {
+export const iam_oauth_scope: JsonSchema = {
   "properties": {
     "category": {
       "type": "string"
diff --git a/src/generated/forge-mcp/iam/oauthScopes/tools.ts b/src/generated/forge-mcp/iam/oauthScopes/tools.ts
index 4b9d95bb5..3099b3b91 100644
--- a/src/generated/forge-mcp/iam/oauthScopes/tools.ts
+++ b/src/generated/forge-mcp/iam/oauthScopes/tools.ts
@@ -3,38 +3,39 @@
 
 import type { Tool } from "../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_messages_2_output,
-  iam_result_info_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_messages$$2,
+  iam_result_info,
 } from "../../outputs.js";
 import {
-  iam_collection_oauth_scopes_response_output,
-  iam_oauth_scope_output,
+  iam_collection_oauth_scopes_response,
+  iam_oauth_scope,
 } from "./outputs.js";
 
 /**
- * The tools of `iam.oauth_scopes`.
+ * The tools of `iam.oauthScopes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "iam_oauth_scopes_list",
+    name: "iam_oauthScopes_list",
     title: "List OAuth Scopes",
-    description: "List all available OAuth scopes. This endpoint requires authentication but has no authorization role requirements.",
+    description: "List all available OAuth scopes. This endpoint requires authentication but has no authorization role requirements.\n\nGET /oauth/scopes",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_collection_oauth_scopes_response",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_collection_oauth_scopes_response": iam_collection_oauth_scopes_response_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_scope": iam_oauth_scope_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_collection_oauth_scopes_response": iam_collection_oauth_scopes_response,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_scope": iam_oauth_scope,
+        "iam_result_info": iam_result_info,
       },
     },
     annotations: {
@@ -64,13 +65,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_collection_oauth_scopes_response": iam_collection_oauth_scopes_response_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_oauth_scope": iam_oauth_scope_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_collection_oauth_scopes_response": iam_collection_oauth_scopes_response,
+        "iam_messages-2": iam_messages$$2,
+        "iam_oauth_scope": iam_oauth_scope,
+        "iam_result_info": iam_result_info,
       },
     },
     request: (_args) => ({
diff --git a/src/generated/forge-mcp/iam/permissionGroups/outputs.ts b/src/generated/forge-mcp/iam/permissionGroups/outputs.ts
index 1f99b1f59..0560c6988 100644
--- a/src/generated/forge-mcp/iam/permissionGroups/outputs.ts
+++ b/src/generated/forge-mcp/iam/permissionGroups/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_collection_permission_groups_response` in responses.
  */
-export const iam_collection_permission_groups_response_output: JsonSchema = {
+export const iam_collection_permission_groups_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -25,7 +25,7 @@ export const iam_collection_permission_groups_response_output: JsonSchema = {
 /**
  * The schema of `iam_single_permission_groups_response` in responses.
  */
-export const iam_single_permission_groups_response_output: JsonSchema = {
+export const iam_single_permission_groups_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
diff --git a/src/generated/forge-mcp/iam/permissionGroups/tools.ts b/src/generated/forge-mcp/iam/permissionGroups/tools.ts
index 4a654c9df..b81919c3e 100644
--- a/src/generated/forge-mcp/iam/permissionGroups/tools.ts
+++ b/src/generated/forge-mcp/iam/permissionGroups/tools.ts
@@ -1,64 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_output,
-  iam_messages_2_output,
-  iam_permission_group_output,
-  iam_permission_groups_output,
-  iam_result_info_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_messages$$2,
+  iam_permission_group,
+  iam_permission_groups,
+  iam_result_info,
 } from "../../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import { iam_permission_group_identifier } from "../schemas.js";
-import {
-  iam_collection_permission_groups_response_output,
-  iam_single_permission_groups_response_output,
+  iam_collection_permission_groups_response,
+  iam_single_permission_groups_response,
 } from "./outputs.js";
 
 /**
- * The tools of `iam.permission_groups`.
+ * The tools of `iam.permissionGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "iam_permission_groups_get",
+    name: "iam_permissionGroups_get",
     title: "Permission Group Details",
-    description: "Get information about a specific permission group in an account.",
+    description: "Get information about a specific permission group in an account.\n\nGET /accounts/{account_id}/iam/permission_groups/{permission_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "permission_group_id": {
-          "$ref": "#/$defs/iam_permission_group_identifier",
-          "description": "Permission Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "permission_group_id": {
+              "description": "Permission Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "permission_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "permission_group_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_permission_group_identifier": iam_permission_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_permission_groups_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_single_permission_groups_response": iam_single_permission_groups_response_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_single_permission_groups_response": iam_single_permission_groups_response,
       },
     },
     annotations: {
@@ -124,11 +124,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_single_permission_groups_response": iam_single_permission_groups_response_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_single_permission_groups_response": iam_single_permission_groups_response,
       },
     },
     request: (args) => ({
@@ -136,57 +136,69 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_permission_groups_list",
+    name: "iam_permissionGroups_list",
     title: "List Account Permission Groups",
-    description: "List all the permissions groups for an account.",
+    description: "List all the permissions groups for an account.\n\nGET /accounts/{account_id}/iam/permission_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "id": {
-          "description": "ID of the permission group to be fetched.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "label": {
-          "description": "Label of the permission group to be fetched.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Name of the permission group to be fetched.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "ID of the permission group to be fetched.",
+              "type": "string"
+            },
+            "label": {
+              "description": "Label of the permission group to be fetched.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Name of the permission group to be fetched.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_collection_permission_groups_response",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_collection_permission_groups_response": iam_collection_permission_groups_response_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_collection_permission_groups_response": iam_collection_permission_groups_response,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_result_info": iam_result_info,
       },
     },
     annotations: {
@@ -252,24 +264,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_collection_permission_groups_response": iam_collection_permission_groups_response_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_collection_permission_groups_response": iam_collection_permission_groups_response,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_result_info": iam_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/iam/permission_groups`,
       query: [
-        ["id", args["id"], true],
-        ["name", args["name"], true],
-        ["label", args["label"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["id", param(args, "query", "id"), true],
+        ["name", param(args, "query", "name"), true],
+        ["label", param(args, "query", "label"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/iam/resourceGroups/schemas.ts b/src/generated/forge-mcp/iam/resourceGroups/schemas.ts
index 904222783..b104b83f0 100644
--- a/src/generated/forge-mcp/iam/resourceGroups/schemas.ts
+++ b/src/generated/forge-mcp/iam/resourceGroups/schemas.ts
@@ -6,11 +6,10 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_create-scope`.
  */
-export const iam_create_scope: JsonSchema = {
+export const iam_create$$scope: JsonSchema = {
   "description": "A scope is a combination of scope objects which provides additional context.",
   "properties": {
     "key": {
-      "$ref": "#/$defs/iam_create_resource_group_scope_scope_key",
       "description": "This is a combination of pre-defined resource name and identifier (like Account ID etc.)"
     },
     "objects": {
@@ -28,13 +27,6 @@ export const iam_create_scope: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_create_resource_group_scope_scope_key`.
- */
-export const iam_create_resource_group_scope_scope_key: JsonSchema = {
-  "description": "This is a combination of pre-defined resource name and identifier (like Account ID etc.)"
-};
-
 /**
  * The schema of `iam_create_resource_group_scope_scope_object`.
  */
@@ -42,7 +34,6 @@ export const iam_create_resource_group_scope_scope_object: JsonSchema = {
   "description": "A scope object represents any resource that can have actions applied against invite.",
   "properties": {
     "key": {
-      "$ref": "#/$defs/iam_create_resource_group_scope_scope_object_key",
       "description": "This is a combination of pre-defined resource name and identifier (like Zone ID etc.)"
     }
   },
@@ -52,13 +43,6 @@ export const iam_create_resource_group_scope_scope_object: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_create_resource_group_scope_scope_object_key`.
- */
-export const iam_create_resource_group_scope_scope_object_key: JsonSchema = {
-  "description": "This is a combination of pre-defined resource name and identifier (like Zone ID etc.)"
-};
-
 /**
  * The schema of `iam_request_create_resource_group`.
  */
diff --git a/src/generated/forge-mcp/iam/resourceGroups/tools.ts b/src/generated/forge-mcp/iam/resourceGroups/tools.ts
index 0e19cff65..85e0b8f90 100644
--- a/src/generated/forge-mcp/iam/resourceGroups/tools.ts
+++ b/src/generated/forge-mcp/iam/resourceGroups/tools.ts
@@ -1,64 +1,60 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_id_output,
-  iam_api_response_single_output,
-  iam_common_components_schemas_identifier_output,
-  iam_messages_2_output,
-  iam_resource_group_output,
-  iam_scope_key_output,
-  iam_scope_object_key_output,
-  iam_scope_object_output,
-  iam_scope_output,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_api$$response$$single$$id,
+  iam_messages$$2,
+  iam_resource_group,
+  iam_scope,
+  iam_scope_object,
 } from "../../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import { iam_resource_group_identifier } from "../schemas.js";
-import {
-  iam_create_resource_group_scope_scope_key,
+  iam_create$$scope,
   iam_create_resource_group_scope_scope_object,
-  iam_create_resource_group_scope_scope_object_key,
-  iam_create_scope,
   iam_request_create_resource_group,
   iam_request_update_resource_group,
 } from "./schemas.js";
 
 /**
- * The tools of `iam.resource_groups`.
+ * The tools of `iam.resourceGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "iam_resource_groups_create",
+    name: "iam_resourceGroups_create",
     title: "Create Resource Group",
-    description: "Create a new Resource Group under the specified account.",
+    description: "Create a new Resource Group under the specified account.\n\nPOST /accounts/{account_id}/iam/resource_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_request_create_resource_group"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_create-scope": iam_create_scope,
-        "iam_create_resource_group_scope_scope_key": iam_create_resource_group_scope_scope_key,
+        "iam_create-scope": iam_create$$scope,
         "iam_create_resource_group_scope_scope_object": iam_create_resource_group_scope_scope_object,
-        "iam_create_resource_group_scope_scope_object_key": iam_create_resource_group_scope_scope_object_key,
         "iam_request_create_resource_group": iam_request_create_resource_group,
       },
     },
@@ -77,13 +73,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_resource_group": iam_resource_group,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     annotations: {
@@ -134,14 +128,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_resource_group": iam_resource_group,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     request: (args) => ({
@@ -150,38 +142,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_resource_groups_delete",
+    name: "iam_resourceGroups_delete",
     title: "Remove Resource Group",
-    description: "Remove a resource group from an account.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Remove a resource group from an account.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/iam/resource_groups/{resource_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "resource_group_id": {
-          "$ref": "#/$defs/iam_resource_group_identifier",
-          "description": "Resource Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "resource_group_id": {
+              "description": "Resource Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "resource_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "resource_group_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_resource_group_identifier": iam_resource_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -220,11 +216,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -232,30 +227,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_resource_groups_get",
+    name: "iam_resourceGroups_get",
     title: "Resource Group Details",
-    description: "Get information about a specific resource group in an account.",
+    description: "Get information about a specific resource group in an account.\n\nGET /accounts/{account_id}/iam/resource_groups/{resource_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "resource_group_id": {
-          "$ref": "#/$defs/iam_resource_group_identifier",
-          "description": "Resource Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "resource_group_id": {
+              "description": "Resource Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "resource_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "resource_group_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_resource_group_identifier": iam_resource_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -272,13 +272,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_resource_group": iam_resource_group,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     annotations: {
@@ -330,14 +328,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_resource_group": iam_resource_group,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     request: (args) => ({
@@ -345,33 +341,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_resource_groups_list",
+    name: "iam_resourceGroups_list",
     title: "List Resource Groups",
-    description: "List all the resource groups for an account.",
+    description: "List all the resource groups for an account.\n\nGET /accounts/{account_id}/iam/resource_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "id": {
-          "$ref": "#/$defs/iam_resource_group_identifier",
-          "description": "ID of the resource group to be fetched."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "name": {
-          "description": "Name of the resource group to be fetched.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "ID of the resource group to be fetched.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Name of the resource group to be fetched.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_resource_group_identifier": iam_resource_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -391,13 +398,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_messages-2": iam_messages$$2,
+        "iam_resource_group": iam_resource_group,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     annotations: {
@@ -452,57 +457,60 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_messages-2": iam_messages$$2,
+        "iam_resource_group": iam_resource_group,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/iam/resource_groups`,
       query: [
-        ["id", args["id"], true],
-        ["name", args["name"], true],
+        ["id", param(args, "query", "id"), true],
+        ["name", param(args, "query", "name"), true],
       ],
     }),
   },
   {
-    name: "iam_resource_groups_update",
+    name: "iam_resourceGroups_update",
     title: "Update Resource Group",
-    description: "Modify an existing resource group.",
+    description: "Modify an existing resource group.\n\nPUT /accounts/{account_id}/iam/resource_groups/{resource_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_request_update_resource_group"
         },
-        "resource_group_id": {
-          "$ref": "#/$defs/iam_resource_group_identifier",
-          "description": "Resource Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "resource_group_id": {
+              "description": "Resource Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "resource_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "resource_group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_create-scope": iam_create_scope,
-        "iam_create_resource_group_scope_scope_key": iam_create_resource_group_scope_scope_key,
+        "iam_create-scope": iam_create$$scope,
         "iam_create_resource_group_scope_scope_object": iam_create_resource_group_scope_scope_object,
-        "iam_create_resource_group_scope_scope_object_key": iam_create_resource_group_scope_scope_object_key,
         "iam_request_update_resource_group": iam_request_update_resource_group,
-        "iam_resource_group_identifier": iam_resource_group_identifier,
       },
     },
     outputSchema: {
@@ -520,13 +528,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_resource_group": iam_resource_group,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     annotations: {
@@ -577,14 +583,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_resource_group": iam_resource_group,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/iam/schemas.ts b/src/generated/forge-mcp/iam/schemas.ts
deleted file mode 100644
index 2ce9ebdac..000000000
--- a/src/generated/forge-mcp/iam/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `iam_permission_group_identifier`.
- */
-export const iam_permission_group_identifier: JsonSchema = {
-  "$ref": "#/$defs/iam_common_components-schemas-identifier",
-  "description": "Permission Group identifier tag."
-};
-
-/**
- * The schema of `iam_resource_group_identifier`.
- */
-export const iam_resource_group_identifier: JsonSchema = {
-  "$ref": "#/$defs/iam_common_components-schemas-identifier",
-  "description": "Resource Group identifier tag."
-};
diff --git a/src/generated/forge-mcp/iam/sso/outputs.ts b/src/generated/forge-mcp/iam/sso/outputs.ts
index 5be64e4f4..254e550b0 100644
--- a/src/generated/forge-mcp/iam/sso/outputs.ts
+++ b/src/generated/forge-mcp/iam/sso/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `iam_dns_verification_code` in responses.
- */
-export const iam_dns_verification_code_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_sso_connector` in responses.
  */
-export const iam_sso_connector_output: JsonSchema = {
+export const iam_sso_connector: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -26,14 +19,14 @@ export const iam_sso_connector_output: JsonSchema = {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/iam_sso_connector_identifier"
+      "type": "string"
     },
     "updated_on": {
       "format": "date-time",
       "type": "string"
     },
     "use_fedramp_language": {
-      "$ref": "#/$defs/iam_use_fedramp_language"
+      "type": "boolean"
     },
     "verification": {
       "$ref": "#/$defs/iam_sso_connector_verification_info"
@@ -45,7 +38,7 @@ export const iam_sso_connector_output: JsonSchema = {
 /**
  * The schema of `iam_sso_connector_collection_response` in responses.
  */
-export const iam_sso_connector_collection_response_output: JsonSchema = {
+export const iam_sso_connector_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -64,17 +57,10 @@ export const iam_sso_connector_collection_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `iam_sso_connector_identifier` in responses.
- */
-export const iam_sso_connector_identifier_output: JsonSchema = {
-  "$ref": "#/$defs/iam_common_components-schemas-identifier"
-};
-
 /**
  * The schema of `iam_sso_connector_response` in responses.
  */
-export const iam_sso_connector_response_output: JsonSchema = {
+export const iam_sso_connector_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -93,10 +79,10 @@ export const iam_sso_connector_response_output: JsonSchema = {
 /**
  * The schema of `iam_sso_connector_verification_info` in responses.
  */
-export const iam_sso_connector_verification_info_output: JsonSchema = {
+export const iam_sso_connector_verification_info: JsonSchema = {
   "properties": {
     "code": {
-      "$ref": "#/$defs/iam_dns_verification_code"
+      "type": "string"
     },
     "status": {
       "enum": [
@@ -110,10 +96,3 @@ export const iam_sso_connector_verification_info_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `iam_use_fedramp_language` in responses.
- */
-export const iam_use_fedramp_language_output: JsonSchema = {
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/iam/sso/schemas.ts b/src/generated/forge-mcp/iam/sso/schemas.ts
deleted file mode 100644
index 1171204bb..000000000
--- a/src/generated/forge-mcp/iam/sso/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `iam_sso_connector_identifier`.
- */
-export const iam_sso_connector_identifier: JsonSchema = {
-  "$ref": "#/$defs/iam_common_components-schemas-identifier",
-  "description": "SSO Connector identifier tag."
-};
-
-/**
- * The schema of `iam_use_fedramp_language`.
- */
-export const iam_use_fedramp_language: JsonSchema = {
-  "description": "Controls the display of FedRAMP language to the user during SSO login",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/iam/sso/tools.ts b/src/generated/forge-mcp/iam/sso/tools.ts
index 91de79a1e..87e636d70 100644
--- a/src/generated/forge-mcp/iam/sso/tools.ts
+++ b/src/generated/forge-mcp/iam/sso/tools.ts
@@ -3,68 +3,61 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_id_output,
-  iam_api_response_single_output,
-  iam_common_components_schemas_identifier_output,
-  iam_messages_2_output,
-  iam_result_info_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_api$$response$$single$$id,
+  iam_messages$$2,
+  iam_result_info,
 } from "../../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import {
-  iam_dns_verification_code_output,
-  iam_sso_connector_collection_response_output,
-  iam_sso_connector_identifier_output,
-  iam_sso_connector_output,
-  iam_sso_connector_response_output,
-  iam_sso_connector_verification_info_output,
-  iam_use_fedramp_language_output,
+  iam_sso_connector,
+  iam_sso_connector_collection_response,
+  iam_sso_connector_response,
+  iam_sso_connector_verification_info,
 } from "./outputs.js";
-import {
-  iam_sso_connector_identifier,
-  iam_use_fedramp_language,
-} from "./schemas.js";
 
 /**
  * The tools of `iam.sso`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "iam_sso_begin_verification",
+    name: "iam_sso_beginVerification",
     title: "Begin SSO connector verification",
-    description: "Validates the user has added the DNS TXT record required for validating ownership of the domain they are trying to set up a connector for.",
+    description: "Validates the user has added the DNS TXT record required for validating ownership of the domain they are trying to set up a connector for.\n\nPOST /accounts/{account_id}/sso_connectors/{sso_connector_id}/begin_verification",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "sso_connector_id": {
-          "$ref": "#/$defs/iam_sso_connector_identifier",
-          "description": "SSO Connector identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "sso_connector_id": {
+              "description": "SSO Connector identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sso_connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sso_connector_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -97,9 +90,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -109,14 +102,10 @@ export const tools: readonly Tool[] = [
   {
     name: "iam_sso_create",
     title: "Initialize new SSO connector",
-    description: "Creates a new SSO connector for logging into Cloudflare through an identity provider.",
+    description: "Creates a new SSO connector for logging into Cloudflare through an identity provider.\n\nPOST /accounts/{account_id}/sso_connectors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "begin_verification": {
@@ -129,38 +118,43 @@ export const tools: readonly Tool[] = [
               "type": "string"
             },
             "use_fedramp_language": {
-              "$ref": "#/$defs/iam_use_fedramp_language",
               "default": false,
-              "description": "Controls the display of FedRAMP language to the user during SSO login"
+              "description": "Controls the display of FedRAMP language to the user during SSO login",
+              "type": "boolean"
             }
           },
           "required": [
             "email_domain"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_use_fedramp_language": iam_use_fedramp_language,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_sso_connector_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_dns_verification_code": iam_dns_verification_code_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_sso_connector": iam_sso_connector_output,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier_output,
-        "iam_sso_connector_response": iam_sso_connector_response_output,
-        "iam_sso_connector_verification_info": iam_sso_connector_verification_info_output,
-        "iam_use_fedramp_language": iam_use_fedramp_language_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_sso_connector": iam_sso_connector,
+        "iam_sso_connector_response": iam_sso_connector_response,
+        "iam_sso_connector_verification_info": iam_sso_connector_verification_info,
       },
     },
     annotations: {
@@ -193,16 +187,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_dns_verification_code": iam_dns_verification_code_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_sso_connector": iam_sso_connector_output,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier_output,
-        "iam_sso_connector_response": iam_sso_connector_response_output,
-        "iam_sso_connector_verification_info": iam_sso_connector_verification_info_output,
-        "iam_use_fedramp_language": iam_use_fedramp_language_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_sso_connector": iam_sso_connector,
+        "iam_sso_connector_response": iam_sso_connector_response,
+        "iam_sso_connector_verification_info": iam_sso_connector_verification_info,
       },
     },
     request: (args) => ({
@@ -213,36 +203,40 @@ export const tools: readonly Tool[] = [
   {
     name: "iam_sso_delete",
     title: "Delete SSO connector",
-    description: "Deletes an SSO connector from the account.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Deletes an SSO connector from the account.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/sso_connectors/{sso_connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "sso_connector_id": {
-          "$ref": "#/$defs/iam_sso_connector_identifier",
-          "description": "SSO Connector identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "sso_connector_id": {
+              "description": "SSO Connector identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sso_connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sso_connector_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -275,11 +269,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -289,41 +282,42 @@ export const tools: readonly Tool[] = [
   {
     name: "iam_sso_get",
     title: "Get single SSO connector",
-    description: "Retrieves details for a specific SSO connector.",
+    description: "Retrieves details for a specific SSO connector.\n\nGET /accounts/{account_id}/sso_connectors/{sso_connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "sso_connector_id": {
-          "$ref": "#/$defs/iam_sso_connector_identifier",
-          "description": "SSO Connector identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "sso_connector_id": {
+              "description": "SSO Connector identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sso_connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sso_connector_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_sso_connector_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_dns_verification_code": iam_dns_verification_code_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_sso_connector": iam_sso_connector_output,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier_output,
-        "iam_sso_connector_response": iam_sso_connector_response_output,
-        "iam_sso_connector_verification_info": iam_sso_connector_verification_info_output,
-        "iam_use_fedramp_language": iam_use_fedramp_language_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_sso_connector": iam_sso_connector,
+        "iam_sso_connector_response": iam_sso_connector_response,
+        "iam_sso_connector_verification_info": iam_sso_connector_verification_info,
       },
     },
     annotations: {
@@ -356,16 +350,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_dns_verification_code": iam_dns_verification_code_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_sso_connector": iam_sso_connector_output,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier_output,
-        "iam_sso_connector_response": iam_sso_connector_response_output,
-        "iam_sso_connector_verification_info": iam_sso_connector_verification_info_output,
-        "iam_use_fedramp_language": iam_use_fedramp_language_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_sso_connector": iam_sso_connector,
+        "iam_sso_connector_response": iam_sso_connector_response,
+        "iam_sso_connector_verification_info": iam_sso_connector_verification_info,
       },
     },
     request: (args) => ({
@@ -375,37 +365,39 @@ export const tools: readonly Tool[] = [
   {
     name: "iam_sso_list",
     title: "Get all SSO connectors",
-    description: "Lists all SSO connectors configured for the account.",
+    description: "Lists all SSO connectors configured for the account.\n\nGET /accounts/{account_id}/sso_connectors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_sso_connector_collection_response",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_dns_verification_code": iam_dns_verification_code_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_sso_connector": iam_sso_connector_output,
-        "iam_sso_connector_collection_response": iam_sso_connector_collection_response_output,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier_output,
-        "iam_sso_connector_verification_info": iam_sso_connector_verification_info_output,
-        "iam_use_fedramp_language": iam_use_fedramp_language_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_messages-2": iam_messages$$2,
+        "iam_result_info": iam_result_info,
+        "iam_sso_connector": iam_sso_connector,
+        "iam_sso_connector_collection_response": iam_sso_connector_collection_response,
+        "iam_sso_connector_verification_info": iam_sso_connector_verification_info,
       },
     },
     annotations: {
@@ -438,18 +430,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_dns_verification_code": iam_dns_verification_code_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_sso_connector": iam_sso_connector_output,
-        "iam_sso_connector_collection_response": iam_sso_connector_collection_response_output,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier_output,
-        "iam_sso_connector_verification_info": iam_sso_connector_verification_info_output,
-        "iam_use_fedramp_language": iam_use_fedramp_language_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_messages-2": iam_messages$$2,
+        "iam_result_info": iam_result_info,
+        "iam_sso_connector": iam_sso_connector,
+        "iam_sso_connector_collection_response": iam_sso_connector_collection_response,
+        "iam_sso_connector_verification_info": iam_sso_connector_verification_info,
       },
     },
     request: (args) => ({
@@ -459,14 +447,10 @@ export const tools: readonly Tool[] = [
   {
     name: "iam_sso_update",
     title: "Update SSO connector state",
-    description: "Updates the state or configuration of an SSO connector.",
+    description: "Updates the state or configuration of an SSO connector.\n\nPATCH /accounts/{account_id}/sso_connectors/{sso_connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "properties": {
             "enabled": {
@@ -474,41 +458,45 @@ export const tools: readonly Tool[] = [
               "type": "boolean"
             },
             "use_fedramp_language": {
-              "$ref": "#/$defs/iam_use_fedramp_language",
               "default": false,
-              "description": "Controls the display of FedRAMP language to the user during SSO login"
+              "description": "Controls the display of FedRAMP language to the user during SSO login",
+              "type": "boolean"
             }
           },
           "type": "object"
         },
-        "sso_connector_id": {
-          "$ref": "#/$defs/iam_sso_connector_identifier",
-          "description": "SSO Connector identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "sso_connector_id": {
+              "description": "SSO Connector identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sso_connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sso_connector_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier,
-        "iam_use_fedramp_language": iam_use_fedramp_language,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_sso_connector_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_dns_verification_code": iam_dns_verification_code_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_sso_connector": iam_sso_connector_output,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier_output,
-        "iam_sso_connector_response": iam_sso_connector_response_output,
-        "iam_sso_connector_verification_info": iam_sso_connector_verification_info_output,
-        "iam_use_fedramp_language": iam_use_fedramp_language_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_sso_connector": iam_sso_connector,
+        "iam_sso_connector_response": iam_sso_connector_response,
+        "iam_sso_connector_verification_info": iam_sso_connector_verification_info,
       },
     },
     annotations: {
@@ -541,16 +529,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_dns_verification_code": iam_dns_verification_code_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_sso_connector": iam_sso_connector_output,
-        "iam_sso_connector_identifier": iam_sso_connector_identifier_output,
-        "iam_sso_connector_response": iam_sso_connector_response_output,
-        "iam_sso_connector_verification_info": iam_sso_connector_verification_info_output,
-        "iam_use_fedramp_language": iam_use_fedramp_language_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_sso_connector": iam_sso_connector,
+        "iam_sso_connector_response": iam_sso_connector_response,
+        "iam_sso_connector_verification_info": iam_sso_connector_verification_info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/iam/userGroups/members/outputs.ts b/src/generated/forge-mcp/iam/userGroups/members/outputs.ts
index 4e56e3826..493fa38ba 100644
--- a/src/generated/forge-mcp/iam/userGroups/members/outputs.ts
+++ b/src/generated/forge-mcp/iam/userGroups/members/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `iam_user_group_member` in responses.
  */
-export const iam_user_group_member_output: JsonSchema = {
+export const iam_user_group_member: JsonSchema = {
   "properties": {
     "email": {
-      "$ref": "#/$defs/iam_email"
+      "type": "string"
     },
     "id": {
       "type": "string"
@@ -31,14 +31,14 @@ export const iam_user_group_member_output: JsonSchema = {
 /**
  * The schema of `iam_user_group_member_detailed` in responses.
  */
-export const iam_user_group_member_detailed_output: JsonSchema = {
+export const iam_user_group_member_detailed: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
       "type": "string"
     },
     "email": {
-      "$ref": "#/$defs/iam_email"
+      "type": "string"
     },
     "id": {
       "type": "string"
@@ -53,7 +53,7 @@ export const iam_user_group_member_detailed_output: JsonSchema = {
     "user": {
       "properties": {
         "email": {
-          "$ref": "#/$defs/iam_email"
+          "type": "string"
         },
         "first_name": {
           "type": "string"
diff --git a/src/generated/forge-mcp/iam/userGroups/members/schemas.ts b/src/generated/forge-mcp/iam/userGroups/members/schemas.ts
deleted file mode 100644
index e8415b3c5..000000000
--- a/src/generated/forge-mcp/iam/userGroups/members/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `iam_user_group_member_identifier`.
- */
-export const iam_user_group_member_identifier: JsonSchema = {
-  "$ref": "#/$defs/iam_common_components-schemas-identifier",
-  "description": "The identifier of an existing account Member."
-};
diff --git a/src/generated/forge-mcp/iam/userGroups/members/tools.ts b/src/generated/forge-mcp/iam/userGroups/members/tools.ts
index 8bb1ee212..4beafc013 100644
--- a/src/generated/forge-mcp/iam/userGroups/members/tools.ts
+++ b/src/generated/forge-mcp/iam/userGroups/members/tools.ts
@@ -1,48 +1,37 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_output,
-  iam_email_output,
-  iam_messages_2_output,
-  iam_result_info_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_messages$$2,
+  iam_result_info,
 } from "../../../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../../schemas.js";
-import { iam_user_group_identifier } from "../schemas.js";
-import {
-  iam_user_group_member_detailed_output,
-  iam_user_group_member_output,
+  iam_user_group_member,
+  iam_user_group_member_detailed,
 } from "./outputs.js";
-import { iam_user_group_member_identifier } from "./schemas.js";
 
 /**
- * The tools of `iam.user_groups.members`.
+ * The tools of `iam.userGroups.members`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "iam_user_groups_members_create",
+    name: "iam_userGroups_members_create",
     title: "Add User Group Members",
-    description: "Add members to a User Group.",
+    description: "Add members to a User Group.\n\nPOST /accounts/{account_id}/iam/user_groups/{user_group_id}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "items": {
             "properties": {
               "id": {
-                "$ref": "#/$defs/iam_user_group_member_identifier",
-                "description": "The identifier of an existing account Member."
+                "description": "The identifier of an existing account Member.",
+                "type": "string"
               }
             },
             "required": [
@@ -52,22 +41,30 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "user_group_id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "User Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_group_id": {
+              "description": "User Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_group_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_user_group_identifier": iam_user_group_identifier,
-        "iam_user_group_member_identifier": iam_user_group_member_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -87,10 +84,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_user_group_member": iam_user_group_member_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_user_group_member": iam_user_group_member,
       },
     },
     annotations: {
@@ -144,11 +140,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_user_group_member": iam_user_group_member_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_user_group_member": iam_user_group_member,
       },
     },
     request: (args) => ({
@@ -157,36 +152,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_user_groups_members_delete",
+    name: "iam_userGroups_members_delete",
     title: "Remove User Group Member",
-    description: "Remove a member from User Group\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Remove a member from User Group\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/iam/user_groups/{user_group_id}/members/{member_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "member_id": {
-          "$ref": "#/$defs/iam_user_group_member_identifier",
-          "description": "The identifier of an existing account Member."
-        },
-        "user_group_id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "User Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "member_id": {
+              "description": "The identifier of an existing account Member.",
+              "type": "string"
+            },
+            "user_group_id": {
+              "description": "User Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_group_id",
+            "member_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_group_id",
-        "member_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_user_group_identifier": iam_user_group_identifier,
-        "iam_user_group_member_identifier": iam_user_group_member_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -203,10 +202,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_user_group_member": iam_user_group_member_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_user_group_member": iam_user_group_member,
       },
     },
     annotations: {
@@ -257,11 +255,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_user_group_member": iam_user_group_member_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_user_group_member": iam_user_group_member,
       },
     },
     request: (args) => ({
@@ -269,36 +266,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_user_groups_members_get",
+    name: "iam_userGroups_members_get",
     title: "Get User Group Member",
-    description: "Get details of a specific member in a user group.",
+    description: "Get details of a specific member in a user group.\n\nGET /accounts/{account_id}/iam/user_groups/{user_group_id}/members/{member_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "member_id": {
-          "$ref": "#/$defs/iam_user_group_member_identifier",
-          "description": "The identifier of an existing account Member."
-        },
-        "user_group_id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "User Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "member_id": {
+              "description": "The identifier of an existing account Member.",
+              "type": "string"
+            },
+            "user_group_id": {
+              "description": "User Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_group_id",
+            "member_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_group_id",
-        "member_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_user_group_identifier": iam_user_group_identifier,
-        "iam_user_group_member_identifier": iam_user_group_member_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -315,10 +316,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_user_group_member_detailed": iam_user_group_member_detailed_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_user_group_member_detailed": iam_user_group_member_detailed,
       },
     },
     annotations: {
@@ -370,11 +370,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_user_group_member_detailed": iam_user_group_member_detailed_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_user_group_member_detailed": iam_user_group_member_detailed,
       },
     },
     request: (args) => ({
@@ -382,53 +381,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_user_groups_members_list",
+    name: "iam_userGroups_members_list",
     title: "List User Group Members",
-    description: "List all the members attached to a user group.",
+    description: "List all the members attached to a user group.\n\nGET /accounts/{account_id}/iam/user_groups/{user_group_id}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "default": "asc",
-          "description": "The sort order of returned user group members by email.",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_group_id": {
+              "description": "User Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_group_id"
           ],
-          "type": "string"
-        },
-        "fuzzy_email": {
-          "description": "A string used for filtering members by partial email match.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Maximum number of results per page.",
-          "type": "number"
+          "type": "object"
         },
-        "user_group_id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "User Group identifier tag."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "The sort order of returned user group members by email.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "fuzzyEmail": {
+              "description": "A string used for filtering members by partial email match.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_group_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_user_group_identifier": iam_user_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -448,12 +458,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_user_group_member": iam_user_group_member_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_messages-2": iam_messages$$2,
+        "iam_result_info": iam_result_info,
+        "iam_user_group_member": iam_user_group_member,
       },
     },
     annotations: {
@@ -508,42 +517,37 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_user_group_member": iam_user_group_member_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_messages-2": iam_messages$$2,
+        "iam_result_info": iam_result_info,
+        "iam_user_group_member": iam_user_group_member,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/iam/user_groups/${pathParam(args, "user_group_id")}/members`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["fuzzyEmail", args["fuzzy_email"], true],
-        ["direction", args["direction"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["fuzzyEmail", param(args, "query", "fuzzyEmail"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
-    name: "iam_user_groups_members_update",
+    name: "iam_userGroups_members_update",
     title: "Update User Group Members",
-    description: "Replace the set of members attached to a User Group.",
+    description: "Replace the set of members attached to a User Group.\n\nPUT /accounts/{account_id}/iam/user_groups/{user_group_id}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "items": {
             "properties": {
               "id": {
-                "$ref": "#/$defs/iam_user_group_member_identifier",
-                "description": "The identifier of an existing account Member."
+                "description": "The identifier of an existing account Member.",
+                "type": "string"
               }
             },
             "required": [
@@ -553,22 +557,30 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "user_group_id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "User Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_group_id": {
+              "description": "User Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_group_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_user_group_identifier": iam_user_group_identifier,
-        "iam_user_group_member_identifier": iam_user_group_member_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -588,10 +600,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_user_group_member": iam_user_group_member_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_user_group_member": iam_user_group_member,
       },
     },
     annotations: {
@@ -640,11 +651,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_email": iam_email_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_user_group_member": iam_user_group_member_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_user_group_member": iam_user_group_member,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/iam/userGroups/outputs.ts b/src/generated/forge-mcp/iam/userGroups/outputs.ts
index f5e11eeb8..aa41204d3 100644
--- a/src/generated/forge-mcp/iam/userGroups/outputs.ts
+++ b/src/generated/forge-mcp/iam/userGroups/outputs.ts
@@ -6,14 +6,14 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_user_group` in responses.
  */
-export const iam_user_group_output: JsonSchema = {
+export const iam_user_group: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_user_group_identifier"
+      "type": "string"
     },
     "modified_on": {
       "format": "date-time",
@@ -26,10 +26,14 @@ export const iam_user_group_output: JsonSchema = {
       "items": {
         "properties": {
           "access": {
-            "$ref": "#/$defs/iam_access"
+            "enum": [
+              "allow",
+              "deny"
+            ],
+            "type": "string"
           },
           "id": {
-            "$ref": "#/$defs/iam_policy_identifier"
+            "type": "string"
           },
           "permission_groups": {
             "$ref": "#/$defs/iam_permission_groups"
@@ -52,17 +56,10 @@ export const iam_user_group_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_user_group_identifier` in responses.
- */
-export const iam_user_group_identifier_output: JsonSchema = {
-  "$ref": "#/$defs/iam_common_components-schemas-identifier"
-};
-
 /**
  * The schema of `iam_user_groups` in responses.
  */
-export const iam_user_groups_output: JsonSchema = {
+export const iam_user_groups: JsonSchema = {
   "items": {
     "$ref": "#/$defs/iam_user_group"
   },
diff --git a/src/generated/forge-mcp/iam/userGroups/schemas.ts b/src/generated/forge-mcp/iam/userGroups/schemas.ts
index a5ecb8178..37244c7fe 100644
--- a/src/generated/forge-mcp/iam/userGroups/schemas.ts
+++ b/src/generated/forge-mcp/iam/userGroups/schemas.ts
@@ -35,8 +35,8 @@ export const iam_permission_group_ids: JsonSchema = {
   "items": {
     "properties": {
       "id": {
-        "$ref": "#/$defs/iam_permission_group_identifier",
-        "description": "Permission Group identifier tag."
+        "description": "Permission Group identifier tag.",
+        "type": "string"
       }
     },
     "required": [
@@ -55,8 +55,8 @@ export const iam_resource_group_ids: JsonSchema = {
   "items": {
     "properties": {
       "id": {
-        "$ref": "#/$defs/iam_resource_group_identifier",
-        "description": "Resource Group identifier tag."
+        "description": "Resource Group identifier tag.",
+        "type": "string"
       }
     },
     "required": [
@@ -104,22 +104,18 @@ export const iam_update_user_group_body: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_user_group_identifier`.
- */
-export const iam_user_group_identifier: JsonSchema = {
-  "$ref": "#/$defs/iam_common_components-schemas-identifier",
-  "description": "User Group identifier tag."
-};
-
 /**
  * The schema of `iam_user_group_policy_write_body`.
  */
 export const iam_user_group_policy_write_body: JsonSchema = {
   "properties": {
     "access": {
-      "$ref": "#/$defs/iam_access",
-      "description": "Allow or deny operations against the resources."
+      "description": "Allow or deny operations against the resources.",
+      "enum": [
+        "allow",
+        "deny"
+      ],
+      "type": "string"
     },
     "permission_groups": {
       "$ref": "#/$defs/iam_permission_group_ids",
diff --git a/src/generated/forge-mcp/iam/userGroups/tools.ts b/src/generated/forge-mcp/iam/userGroups/tools.ts
index 8b5f28a60..4879433e0 100644
--- a/src/generated/forge-mcp/iam/userGroups/tools.ts
+++ b/src/generated/forge-mcp/iam/userGroups/tools.ts
@@ -1,81 +1,67 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  iam_access_output,
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_id_output,
-  iam_api_response_single_output,
-  iam_common_components_schemas_identifier_output,
-  iam_messages_2_output,
-  iam_permission_group_output,
-  iam_permission_groups_output,
-  iam_policy_identifier_output,
-  iam_resource_group_output,
-  iam_resource_groups_output,
-  iam_result_info_output,
-  iam_scope_key_output,
-  iam_scope_object_key_output,
-  iam_scope_object_output,
-  iam_scope_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_api$$response$$single$$id,
+  iam_messages$$2,
+  iam_permission_group,
+  iam_permission_groups,
+  iam_resource_group,
+  iam_resource_groups,
+  iam_result_info,
+  iam_scope,
+  iam_scope_object,
 } from "../../outputs.js";
-import {
-  iam_access,
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import {
-  iam_permission_group_identifier,
-  iam_resource_group_identifier,
-} from "../schemas.js";
-import {
-  iam_user_group_identifier_output,
-  iam_user_group_output,
-  iam_user_groups_output,
-} from "./outputs.js";
+import { iam_user_group, iam_user_groups } from "./outputs.js";
 import {
   iam_create_user_group_body,
   iam_permission_group_ids,
   iam_resource_group_ids,
   iam_update_user_group_body,
-  iam_user_group_identifier,
   iam_user_group_policy_write_body,
 } from "./schemas.js";
 
 /**
- * The tools of `iam.user_groups`.
+ * The tools of `iam.userGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "iam_user_groups_create",
+    name: "iam_userGroups_create",
     title: "Create User Group",
-    description: "Create a new user group under the specified account.",
+    description: "Create a new user group under the specified account.\n\nPOST /accounts/{account_id}/iam/user_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_create_user_group_body"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_access": iam_access,
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
         "iam_create_user_group_body": iam_create_user_group_body,
-        "iam_permission_group_identifier": iam_permission_group_identifier,
         "iam_permission_group_ids": iam_permission_group_ids,
-        "iam_resource_group_identifier": iam_resource_group_identifier,
         "iam_resource_group_ids": iam_resource_group_ids,
         "iam_user_group_policy_write_body": iam_user_group_policy_write_body,
       },
@@ -95,21 +81,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_user_group": iam_user_group_output,
-        "iam_user_group_identifier": iam_user_group_identifier_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_user_group": iam_user_group,
       },
     },
     annotations: {
@@ -160,22 +140,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_user_group": iam_user_group_output,
-        "iam_user_group_identifier": iam_user_group_identifier_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_user_group": iam_user_group,
       },
     },
     request: (args) => ({
@@ -184,38 +158,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_user_groups_delete",
+    name: "iam_userGroups_delete",
     title: "Remove User Group",
-    description: "Remove a user group from an account.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Remove a user group from an account.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/iam/user_groups/{user_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "user_group_id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "User Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_group_id": {
+              "description": "User Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_group_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_user_group_identifier": iam_user_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -254,11 +232,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -266,30 +243,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_user_groups_get",
+    name: "iam_userGroups_get",
     title: "User Group Details",
-    description: "Get information about a specific user group in an account.",
+    description: "Get information about a specific user group in an account.\n\nGET /accounts/{account_id}/iam/user_groups/{user_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "user_group_id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "User Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_group_id": {
+              "description": "User Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_group_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_user_group_identifier": iam_user_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -306,21 +288,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_user_group": iam_user_group_output,
-        "iam_user_group_identifier": iam_user_group_identifier_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_user_group": iam_user_group,
       },
     },
     annotations: {
@@ -372,22 +348,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_user_group": iam_user_group_output,
-        "iam_user_group_identifier": iam_user_group_identifier_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_user_group": iam_user_group,
       },
     },
     request: (args) => ({
@@ -395,56 +365,67 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "iam_user_groups_list",
+    name: "iam_userGroups_list",
     title: "List User Groups",
-    description: "List all the user groups for an account.",
+    description: "List all the user groups for an account.\n\nGET /accounts/{account_id}/iam/user_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "direction": {
-          "default": "asc",
-          "description": "The sort order of returned user groups by name (ascending or descending).",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "fuzzy_name": {
-          "description": "A string used for searching for user groups containing that substring.",
-          "type": "string"
-        },
-        "id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "ID of the user group to be fetched."
-        },
-        "name": {
-          "description": "Name of the user group to be fetched.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 100,
-          "description": "Maximum number of results per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "The sort order of returned user groups by name (ascending or descending).",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "fuzzyName": {
+              "description": "A string used for searching for user groups containing that substring.",
+              "type": "string"
+            },
+            "id": {
+              "description": "ID of the user group to be fetched.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Name of the user group to be fetched.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_user_group_identifier": iam_user_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -461,24 +442,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_user_group": iam_user_group_output,
-        "iam_user_group_identifier": iam_user_group_identifier_output,
-        "iam_user_groups": iam_user_groups_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_result_info": iam_result_info,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_user_group": iam_user_group,
+        "iam_user_groups": iam_user_groups,
       },
     },
     annotations: {
@@ -530,73 +505,71 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_user_group": iam_user_group_output,
-        "iam_user_group_identifier": iam_user_group_identifier_output,
-        "iam_user_groups": iam_user_groups_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_result_info": iam_result_info,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_user_group": iam_user_group,
+        "iam_user_groups": iam_user_groups,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/iam/user_groups`,
       query: [
-        ["id", args["id"], true],
-        ["name", args["name"], true],
-        ["fuzzyName", args["fuzzy_name"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
+        ["id", param(args, "query", "id"), true],
+        ["name", param(args, "query", "name"), true],
+        ["fuzzyName", param(args, "query", "fuzzyName"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
-    name: "iam_user_groups_update",
+    name: "iam_userGroups_update",
     title: "Update User Group",
-    description: "Modify an existing user group.",
+    description: "Modify an existing user group.\n\nPUT /accounts/{account_id}/iam/user_groups/{user_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_update_user_group_body"
         },
-        "user_group_id": {
-          "$ref": "#/$defs/iam_user_group_identifier",
-          "description": "User Group identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_group_id": {
+              "description": "User Group identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_access": iam_access,
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_permission_group_identifier": iam_permission_group_identifier,
         "iam_permission_group_ids": iam_permission_group_ids,
-        "iam_resource_group_identifier": iam_resource_group_identifier,
         "iam_resource_group_ids": iam_resource_group_ids,
         "iam_update_user_group_body": iam_update_user_group_body,
-        "iam_user_group_identifier": iam_user_group_identifier,
         "iam_user_group_policy_write_body": iam_user_group_policy_write_body,
       },
     },
@@ -615,21 +588,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_user_group": iam_user_group_output,
-        "iam_user_group_identifier": iam_user_group_identifier_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_user_group": iam_user_group,
       },
     },
     annotations: {
@@ -680,22 +647,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_user_group": iam_user_group_output,
-        "iam_user_group_identifier": iam_user_group_identifier_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_user_group": iam_user_group,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/images/flows/tools.ts b/src/generated/forge-mcp/images/flows/tools.ts
index d0a57817b..26ad37a25 100644
--- a/src/generated/forge-mcp/images/flows/tools.ts
+++ b/src/generated/forge-mcp/images/flows/tools.ts
@@ -10,18 +10,28 @@ export const tools: readonly Tool[] = [
   {
     name: "images_flows_get",
     title: "Get transformation flows",
-    description: "Get the current transformation flows configuration for a zone.",
+    description: "Get the current transformation flows configuration for a zone.\n\nGET /zones/{zone_id}/images/v1/flows",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "Zone identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -525,7 +535,7 @@ export const tools: readonly Tool[] = [
   {
     name: "images_flows_update",
     title: "Update transformation flows",
-    description: "Replace the entire transformation flows configuration for a zone.",
+    description: "Replace the entire transformation flows configuration for a zone.\n\nPUT /zones/{zone_id}/images/v1/flows",
     inputSchema: {
       type: "object",
       properties: {
@@ -749,14 +759,24 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "description": "Zone identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/images/import/outputs.ts b/src/generated/forge-mcp/images/import/outputs.ts
index fc0876abd..d5d7466f1 100644
--- a/src/generated/forge-mcp/images/import/outputs.ts
+++ b/src/generated/forge-mcp/images/import/outputs.ts
@@ -3,40 +3,17 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `images_sourcingkit_acceptable_content_type` in responses.
- */
-export const images_sourcingkit_acceptable_content_type_output: JsonSchema = {
-  "enum": [
-    "image/jpeg",
-    "image/png",
-    "image/webp",
-    "image/gif",
-    "image/avif",
-    "image/heic",
-    "image/svg+xml"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `images_sourcingkit_conflict_behaviour` in responses.
- */
-export const images_sourcingkit_conflict_behaviour_output: JsonSchema = {
-  "enum": [
-    "skip",
-    "overwrite"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `images_sourcingkit_migration` in responses.
  */
-export const images_sourcingkit_migration_output: JsonSchema = {
+export const images_sourcingkit_migration: JsonSchema = {
   "properties": {
     "conflictBehaviour": {
-      "$ref": "#/$defs/images_sourcingkit_conflict_behaviour"
+      "enum": [
+        "skip",
+        "overwrite"
+      ],
+      "type": "string"
     },
     "createdAt": {
       "format": "date-time",
@@ -57,7 +34,16 @@ export const images_sourcingkit_migration_output: JsonSchema = {
       "oneOf": [
         {
           "items": {
-            "$ref": "#/$defs/images_sourcingkit_acceptable_content_type"
+            "enum": [
+              "image/jpeg",
+              "image/png",
+              "image/webp",
+              "image/gif",
+              "image/avif",
+              "image/heic",
+              "image/svg+xml"
+            ],
+            "type": "string"
           },
           "type": "array"
         },
@@ -126,7 +112,14 @@ export const images_sourcingkit_migration_output: JsonSchema = {
       ]
     },
     "status": {
-      "$ref": "#/$defs/images_sourcingkit_migration_status"
+      "enum": [
+        "pending",
+        "processing",
+        "success",
+        "error",
+        "aborted"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -135,7 +128,7 @@ export const images_sourcingkit_migration_output: JsonSchema = {
 /**
  * The schema of `images_sourcingkit_migration_create_response` in responses.
  */
-export const images_sourcingkit_migration_create_response_output: JsonSchema = {
+export const images_sourcingkit_migration_create_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -154,7 +147,7 @@ export const images_sourcingkit_migration_create_response_output: JsonSchema = {
 /**
  * The schema of `images_sourcingkit_migration_list_response` in responses.
  */
-export const images_sourcingkit_migration_list_response_output: JsonSchema = {
+export const images_sourcingkit_migration_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-common"
@@ -181,7 +174,7 @@ export const images_sourcingkit_migration_list_response_output: JsonSchema = {
 /**
  * The schema of `images_sourcingkit_migration_log` in responses.
  */
-export const images_sourcingkit_migration_log_output: JsonSchema = {
+export const images_sourcingkit_migration_log: JsonSchema = {
   "properties": {
     "createdAt": {
       "oneOf": [
@@ -195,7 +188,21 @@ export const images_sourcingkit_migration_log_output: JsonSchema = {
       ]
     },
     "logType": {
-      "$ref": "#/$defs/images_sourcingkit_migration_log_type"
+      "enum": [
+        "default",
+        "importSkippedUnsupportedContentType",
+        "importSkippedExcludedContentType",
+        "importSkippedInvalidMedia",
+        "importErrorRetryExhaustion",
+        "importSkippedOversized",
+        "migrationErrorFailedContinuation",
+        "migrationStart",
+        "migrationAbort",
+        "migrationError",
+        "migrationComplete",
+        "importSkippedStorageClass"
+      ],
+      "type": "string"
     },
     "msg": {
       "oneOf": [
@@ -214,7 +221,7 @@ export const images_sourcingkit_migration_log_output: JsonSchema = {
 /**
  * The schema of `images_sourcingkit_migration_log_list_response` in responses.
  */
-export const images_sourcingkit_migration_log_list_response_output: JsonSchema = {
+export const images_sourcingkit_migration_log_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-common"
@@ -238,31 +245,10 @@ export const images_sourcingkit_migration_log_list_response_output: JsonSchema =
   ]
 };
 
-/**
- * The schema of `images_sourcingkit_migration_log_type` in responses.
- */
-export const images_sourcingkit_migration_log_type_output: JsonSchema = {
-  "enum": [
-    "default",
-    "importSkippedUnsupportedContentType",
-    "importSkippedExcludedContentType",
-    "importSkippedInvalidMedia",
-    "importErrorRetryExhaustion",
-    "importSkippedOversized",
-    "migrationErrorFailedContinuation",
-    "migrationStart",
-    "migrationAbort",
-    "migrationError",
-    "migrationComplete",
-    "importSkippedStorageClass"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `images_sourcingkit_migration_progress_response` in responses.
  */
-export const images_sourcingkit_migration_progress_response_output: JsonSchema = {
+export const images_sourcingkit_migration_progress_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -327,7 +313,14 @@ export const images_sourcingkit_migration_progress_response_output: JsonSchema =
               ]
             },
             "status": {
-              "$ref": "#/$defs/images_sourcingkit_migration_status"
+              "enum": [
+                "pending",
+                "processing",
+                "success",
+                "error",
+                "aborted"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
@@ -341,7 +334,7 @@ export const images_sourcingkit_migration_progress_response_output: JsonSchema =
 /**
  * The schema of `images_sourcingkit_migration_single_response` in responses.
  */
-export const images_sourcingkit_migration_single_response_output: JsonSchema = {
+export const images_sourcingkit_migration_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -356,17 +349,3 @@ export const images_sourcingkit_migration_single_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `images_sourcingkit_migration_status` in responses.
- */
-export const images_sourcingkit_migration_status_output: JsonSchema = {
-  "enum": [
-    "pending",
-    "processing",
-    "success",
-    "error",
-    "aborted"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/images/import/schemas.ts b/src/generated/forge-mcp/images/import/schemas.ts
index a75b6807e..cd953aa56 100644
--- a/src/generated/forge-mcp/images/import/schemas.ts
+++ b/src/generated/forge-mcp/images/import/schemas.ts
@@ -3,58 +3,34 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `images_sourcingkit_acceptable_content_type`.
- */
-export const images_sourcingkit_acceptable_content_type: JsonSchema = {
-  "description": "A MIME type that can be excluded from migration.",
-  "enum": [
-    "image/jpeg",
-    "image/png",
-    "image/webp",
-    "image/gif",
-    "image/avif",
-    "image/heic",
-    "image/svg+xml"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `images_sourcingkit_conflict_behaviour`.
- */
-export const images_sourcingkit_conflict_behaviour: JsonSchema = {
-  "description": "How to handle objects that already exist at the destination.",
-  "enum": [
-    "skip",
-    "overwrite"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `images_sourcingkit_identifier`.
- */
-export const images_sourcingkit_identifier: JsonSchema = {
-  "description": "Sourcing kit resource identifier.",
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `images_sourcingkit_migration_create_request`.
  */
 export const images_sourcingkit_migration_create_request: JsonSchema = {
   "properties": {
     "conflictBehaviour": {
-      "$ref": "#/$defs/images_sourcingkit_conflict_behaviour",
       "default": "skip",
-      "description": "How to handle objects that already exist at the destination."
+      "description": "How to handle objects that already exist at the destination.",
+      "enum": [
+        "skip",
+        "overwrite"
+      ],
+      "type": "string"
     },
     "excludedContentTypes": {
       "description": "Content types to skip during migration.",
       "items": {
-        "$ref": "#/$defs/images_sourcingkit_acceptable_content_type"
+        "description": "A MIME type that can be excluded from migration.",
+        "enum": [
+          "image/jpeg",
+          "image/png",
+          "image/webp",
+          "image/gif",
+          "image/avif",
+          "image/heic",
+          "image/svg+xml"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
diff --git a/src/generated/forge-mcp/images/import/sources/outputs.ts b/src/generated/forge-mcp/images/import/sources/outputs.ts
index 1128d1f74..f5ff07132 100644
--- a/src/generated/forge-mcp/images/import/sources/outputs.ts
+++ b/src/generated/forge-mcp/images/import/sources/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `images_sourcingkit_connectivity_check_response` in responses.
  */
-export const images_sourcingkit_connectivity_check_response_output: JsonSchema = {
+export const images_sourcingkit_connectivity_check_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -54,7 +54,7 @@ export const images_sourcingkit_connectivity_check_response_output: JsonSchema =
 /**
  * The schema of `images_sourcingkit_source` in responses.
  */
-export const images_sourcingkit_source_output: JsonSchema = {
+export const images_sourcingkit_source: JsonSchema = {
   "properties": {
     "bucket": {
       "type": "string"
@@ -85,7 +85,11 @@ export const images_sourcingkit_source_output: JsonSchema = {
       "type": "string"
     },
     "vendor": {
-      "$ref": "#/$defs/images_sourcingkit_vendor"
+      "enum": [
+        "s3",
+        "r2"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -94,7 +98,7 @@ export const images_sourcingkit_source_output: JsonSchema = {
 /**
  * The schema of `images_sourcingkit_source_create_response` in responses.
  */
-export const images_sourcingkit_source_create_response_output: JsonSchema = {
+export const images_sourcingkit_source_create_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -113,7 +117,7 @@ export const images_sourcingkit_source_create_response_output: JsonSchema = {
 /**
  * The schema of `images_sourcingkit_source_list_response` in responses.
  */
-export const images_sourcingkit_source_list_response_output: JsonSchema = {
+export const images_sourcingkit_source_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-common"
@@ -140,7 +144,7 @@ export const images_sourcingkit_source_list_response_output: JsonSchema = {
 /**
  * The schema of `images_sourcingkit_source_single_response` in responses.
  */
-export const images_sourcingkit_source_single_response_output: JsonSchema = {
+export const images_sourcingkit_source_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -159,7 +163,7 @@ export const images_sourcingkit_source_single_response_output: JsonSchema = {
 /**
  * The schema of `images_sourcingkit_source_update_response` in responses.
  */
-export const images_sourcingkit_source_update_response_output: JsonSchema = {
+export const images_sourcingkit_source_update_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -174,14 +178,3 @@ export const images_sourcingkit_source_update_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `images_sourcingkit_vendor` in responses.
- */
-export const images_sourcingkit_vendor_output: JsonSchema = {
-  "enum": [
-    "s3",
-    "r2"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/images/import/sources/schemas.ts b/src/generated/forge-mcp/images/import/sources/schemas.ts
index 4c833f5e5..605edd9bc 100644
--- a/src/generated/forge-mcp/images/import/sources/schemas.ts
+++ b/src/generated/forge-mcp/images/import/sources/schemas.ts
@@ -32,8 +32,12 @@ export const images_sourcingkit_connectivity_precheck_request: JsonSchema = {
       "type": "object"
     },
     "vendor": {
-      "$ref": "#/$defs/images_sourcingkit_vendor",
-      "description": "The cloud storage vendor of the source bucket."
+      "description": "The cloud storage vendor of the source bucket.",
+      "enum": [
+        "s3",
+        "r2"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -66,8 +70,12 @@ export const images_sourcingkit_source_create_request: JsonSchema = {
       "type": "object"
     },
     "vendor": {
-      "$ref": "#/$defs/images_sourcingkit_vendor",
-      "description": "The cloud storage vendor of the source bucket."
+      "description": "The cloud storage vendor of the source bucket.",
+      "enum": [
+        "s3",
+        "r2"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -94,15 +102,3 @@ export const images_sourcingkit_source_update_request: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `images_sourcingkit_vendor`.
- */
-export const images_sourcingkit_vendor: JsonSchema = {
-  "description": "The cloud storage vendor of the source bucket.",
-  "enum": [
-    "s3",
-    "r2"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/images/import/sources/tools.ts b/src/generated/forge-mcp/images/import/sources/tools.ts
index c18844f0d..c53483bb4 100644
--- a/src/generated/forge-mcp/images/import/sources/tools.ts
+++ b/src/generated/forge-mcp/images/import/sources/tools.ts
@@ -1,30 +1,26 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  images_api_response_common_failure_output,
-  images_api_response_common_output,
-  images_api_response_single_output,
-  images_deleted_response_output,
-  images_messages_output,
+  images_api$$response$$common,
+  images_api$$response$$common$$failure,
+  images_api$$response$$single,
+  images_deleted_response,
+  images_messages,
 } from "../../outputs.js";
-import { images_account_identifier } from "../../schemas.js";
-import { images_sourcingkit_identifier } from "../schemas.js";
 import {
-  images_sourcingkit_connectivity_check_response_output,
-  images_sourcingkit_source_create_response_output,
-  images_sourcingkit_source_list_response_output,
-  images_sourcingkit_source_output,
-  images_sourcingkit_source_single_response_output,
-  images_sourcingkit_source_update_response_output,
-  images_sourcingkit_vendor_output,
+  images_sourcingkit_connectivity_check_response,
+  images_sourcingkit_source,
+  images_sourcingkit_source_create_response,
+  images_sourcingkit_source_list_response,
+  images_sourcingkit_source_single_response,
+  images_sourcingkit_source_update_response,
 } from "./outputs.js";
 import {
   images_sourcingkit_connectivity_precheck_request,
   images_sourcingkit_source_create_request,
   images_sourcingkit_source_update_request,
-  images_sourcingkit_vendor,
 } from "./schemas.js";
 
 /**
@@ -34,35 +30,42 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_sources_check",
     title: "Get source connectivity status",
-    description: "Check whether a source can still access its S3 bucket.",
+    description: "Check whether a source can still access its S3 bucket.\n\nGET /accounts/{account_id}/images/v2/sourcingkit/sources/{source_id}/connectivity",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "source_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "source_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "source_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "source_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_connectivity_check_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_connectivity_check_response": images_sourcingkit_connectivity_check_response_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_connectivity_check_response": images_sourcingkit_connectivity_check_response,
       },
     },
     annotations: {
@@ -97,11 +100,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_connectivity_check_response": images_sourcingkit_connectivity_check_response_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_connectivity_check_response": images_sourcingkit_connectivity_check_response,
       },
     },
     request: (args) => ({
@@ -111,37 +114,44 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_sources_create",
     title: "Create a sourcing kit source",
-    description: "Configure an S3 source for CF Images imports.",
+    description: "Configure an S3 source for CF Images imports.\n\nPOST /accounts/{account_id}/images/v2/sourcingkit/sources",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/images_sourcingkit_source_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "images_account_identifier": images_account_identifier,
         "images_sourcingkit_source_create_request": images_sourcingkit_source_create_request,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_source_create_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_source": images_sourcingkit_source_output,
-        "images_sourcingkit_source_create_response": images_sourcingkit_source_create_response_output,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_source": images_sourcingkit_source,
+        "images_sourcingkit_source_create_response": images_sourcingkit_source_create_response,
       },
     },
     annotations: {
@@ -175,13 +185,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_source": images_sourcingkit_source_output,
-        "images_sourcingkit_source_create_response": images_sourcingkit_source_create_response_output,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_source": images_sourcingkit_source,
+        "images_sourcingkit_source_create_response": images_sourcingkit_source_create_response,
       },
     },
     request: (args) => ({
@@ -192,35 +201,42 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_sources_delete",
     title: "Delete a sourcing kit source",
-    description: "Delete a source configured for CF Images imports. Sources used by active imports cannot be deleted.\n\nConfirm with the user before calling this tool. This operation will delete this import source.",
+    description: "Delete a source configured for CF Images imports. Sources used by active imports cannot be deleted.\n\nConfirm with the user before calling this tool. This operation will delete this import source.\n\nDELETE /accounts/{account_id}/images/v2/sourcingkit/sources/{source_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "source_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "source_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "source_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "source_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_deleted_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_deleted_response": images_deleted_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_deleted_response": images_deleted_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -254,11 +270,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_deleted_response": images_deleted_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_deleted_response": images_deleted_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -268,37 +284,43 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_sources_get",
     title: "Get sourcing kit source",
-    description: "Get details of a source configured for CF Images imports.",
+    description: "Get details of a source configured for CF Images imports.\n\nGET /accounts/{account_id}/images/v2/sourcingkit/sources/{source_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "source_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "source_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "source_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "source_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_source_single_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_source": images_sourcingkit_source_output,
-        "images_sourcingkit_source_single_response": images_sourcingkit_source_single_response_output,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_source": images_sourcingkit_source,
+        "images_sourcingkit_source_single_response": images_sourcingkit_source_single_response,
       },
     },
     annotations: {
@@ -333,13 +355,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_source": images_sourcingkit_source_output,
-        "images_sourcingkit_source_single_response": images_sourcingkit_source_single_response_output,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_source": images_sourcingkit_source,
+        "images_sourcingkit_source_single_response": images_sourcingkit_source_single_response,
       },
     },
     request: (args) => ({
@@ -349,44 +370,56 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_sources_list",
     title: "List sourcing kit sources",
-    description: "List sources configured for CF Images imports.",
+    description: "List sources configured for CF Images imports.\n\nGET /accounts/{account_id}/images/v2/sourcingkit/sources",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "limit": {
-          "default": 25,
-          "description": "Maximum number of items to return.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Filter sources by name (partial match).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "description": "Number of items to skip before returning results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 25,
+              "description": "Maximum number of items to return.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Filter sources by name (partial match).",
+              "type": "string"
+            },
+            "offset": {
+              "default": 0,
+              "description": "Number of items to skip before returning results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_source_list_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_source": images_sourcingkit_source_output,
-        "images_sourcingkit_source_list_response": images_sourcingkit_source_list_response_output,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_messages": images_messages,
+        "images_sourcingkit_source": images_sourcingkit_source,
+        "images_sourcingkit_source_list_response": images_sourcingkit_source_list_response,
       },
     },
     annotations: {
@@ -421,55 +454,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_source": images_sourcingkit_source_output,
-        "images_sourcingkit_source_list_response": images_sourcingkit_source_list_response_output,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_messages": images_messages,
+        "images_sourcingkit_source": images_sourcingkit_source,
+        "images_sourcingkit_source_list_response": images_sourcingkit_source_list_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/images/v2/sourcingkit/sources`,
       query: [
-        ["offset", args["offset"], true],
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
+        ["offset", param(args, "query", "offset"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
       ],
     }),
   },
   {
-    name: "images_import_sources_pre_check",
+    name: "images_import_sources_preCheck",
     title: "Precheck source connectivity",
-    description: "Check S3 credentials without saving a source.",
+    description: "Check S3 credentials without saving a source.\n\nPOST /accounts/{account_id}/images/v2/sourcingkit/sources/connectivity-precheck",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/images_sourcingkit_connectivity_precheck_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "images_account_identifier": images_account_identifier,
         "images_sourcingkit_connectivity_precheck_request": images_sourcingkit_connectivity_precheck_request,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_connectivity_check_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_connectivity_check_response": images_sourcingkit_connectivity_check_response_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_connectivity_check_response": images_sourcingkit_connectivity_check_response,
       },
     },
     annotations: {
@@ -503,11 +543,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_connectivity_check_response": images_sourcingkit_connectivity_check_response_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_connectivity_check_response": images_sourcingkit_connectivity_check_response,
       },
     },
     request: (args) => ({
@@ -518,42 +558,50 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_sources_update",
     title: "Update a sourcing kit source",
-    description: "Rename a source configured for CF Images imports.",
+    description: "Rename a source configured for CF Images imports.\n\nPATCH /accounts/{account_id}/images/v2/sourcingkit/sources/{source_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/images_sourcingkit_source_update_request"
         },
-        "source_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "source_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "source_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "source_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
         "images_sourcingkit_source_update_request": images_sourcingkit_source_update_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_source_update_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_source": images_sourcingkit_source_output,
-        "images_sourcingkit_source_update_response": images_sourcingkit_source_update_response_output,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_source": images_sourcingkit_source,
+        "images_sourcingkit_source_update_response": images_sourcingkit_source_update_response,
       },
     },
     annotations: {
@@ -587,13 +635,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_source": images_sourcingkit_source_output,
-        "images_sourcingkit_source_update_response": images_sourcingkit_source_update_response_output,
-        "images_sourcingkit_vendor": images_sourcingkit_vendor_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_source": images_sourcingkit_source,
+        "images_sourcingkit_source_update_response": images_sourcingkit_source_update_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/images/import/tools.ts b/src/generated/forge-mcp/images/import/tools.ts
index 7d2e71788..9a75e72df 100644
--- a/src/generated/forge-mcp/images/import/tools.ts
+++ b/src/generated/forge-mcp/images/import/tools.ts
@@ -1,34 +1,24 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  images_api_response_common_failure_output,
-  images_api_response_common_output,
-  images_api_response_single_output,
-  images_deleted_response_output,
-  images_messages_output,
+  images_api$$response$$common,
+  images_api$$response$$common$$failure,
+  images_api$$response$$single,
+  images_deleted_response,
+  images_messages,
 } from "../outputs.js";
-import { images_account_identifier } from "../schemas.js";
 import {
-  images_sourcingkit_acceptable_content_type_output,
-  images_sourcingkit_conflict_behaviour_output,
-  images_sourcingkit_migration_create_response_output,
-  images_sourcingkit_migration_list_response_output,
-  images_sourcingkit_migration_log_list_response_output,
-  images_sourcingkit_migration_log_output,
-  images_sourcingkit_migration_log_type_output,
-  images_sourcingkit_migration_output,
-  images_sourcingkit_migration_progress_response_output,
-  images_sourcingkit_migration_single_response_output,
-  images_sourcingkit_migration_status_output,
+  images_sourcingkit_migration,
+  images_sourcingkit_migration_create_response,
+  images_sourcingkit_migration_list_response,
+  images_sourcingkit_migration_log,
+  images_sourcingkit_migration_log_list_response,
+  images_sourcingkit_migration_progress_response,
+  images_sourcingkit_migration_single_response,
 } from "./outputs.js";
-import {
-  images_sourcingkit_acceptable_content_type,
-  images_sourcingkit_conflict_behaviour,
-  images_sourcingkit_identifier,
-  images_sourcingkit_migration_create_request,
-} from "./schemas.js";
+import { images_sourcingkit_migration_create_request } from "./schemas.js";
 
 /**
  * The tools of `images.import`.
@@ -37,39 +27,43 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_abort",
     title: "Abort a migration",
-    description: "Abort a running CF Images import. Already imported images will remain.",
+    description: "Abort a running CF Images import. Already imported images will remain.\n\nPATCH /accounts/{account_id}/images/v2/sourcingkit/migrations/{migration_id}/lifecycle/abort",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "migration_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "migration_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "migration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "migration_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_migration_single_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response,
       },
     },
     annotations: {
@@ -96,15 +90,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response,
       },
     },
     request: (args) => ({
@@ -114,40 +105,44 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_create",
     title: "Create a sourcing kit migration",
-    description: "Create a pending CF Images import from a configured source.",
+    description: "Create a pending CF Images import from a configured source.\n\nPOST /accounts/{account_id}/images/v2/sourcingkit/migrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/images_sourcingkit_migration_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour,
         "images_sourcingkit_migration_create_request": images_sourcingkit_migration_create_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_migration_create_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_create_response": images_sourcingkit_migration_create_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_create_response": images_sourcingkit_migration_create_response,
       },
     },
     annotations: {
@@ -181,15 +176,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_create_response": images_sourcingkit_migration_create_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_create_response": images_sourcingkit_migration_create_response,
       },
     },
     request: (args) => ({
@@ -200,35 +192,42 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_delete",
     title: "Delete a sourcing kit migration",
-    description: "Delete a completed, failed, or aborted CF Images import.\n\nConfirm with the user before calling this tool. This operation will delete this import migration.",
+    description: "Delete a completed, failed, or aborted CF Images import.\n\nConfirm with the user before calling this tool. This operation will delete this import migration.\n\nDELETE /accounts/{account_id}/images/v2/sourcingkit/migrations/{migration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "migration_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "migration_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "migration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "migration_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_deleted_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_deleted_response": images_deleted_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_deleted_response": images_deleted_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -262,11 +261,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_deleted_response": images_deleted_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_deleted_response": images_deleted_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -276,39 +275,43 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_get",
     title: "Get sourcing kit migration",
-    description: "Get the configuration and status of a CF Images import.",
+    description: "Get the configuration and status of a CF Images import.\n\nGET /accounts/{account_id}/images/v2/sourcingkit/migrations/{migration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "migration_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "migration_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "migration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "migration_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_migration_single_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response,
       },
     },
     annotations: {
@@ -343,15 +346,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response,
       },
     },
     request: (args) => ({
@@ -361,42 +361,52 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_list",
     title: "List sourcing kit migrations",
-    description: "List CF Images imports.",
+    description: "List CF Images imports.\n\nGET /accounts/{account_id}/images/v2/sourcingkit/migrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "limit": {
-          "default": 25,
-          "description": "Maximum number of items to return.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "description": "Number of items to skip before returning results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 25,
+              "description": "Maximum number of items to return.",
+              "type": "integer"
+            },
+            "offset": {
+              "default": 0,
+              "description": "Number of items to skip before returning results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_migration_list_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_list_response": images_sourcingkit_migration_list_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_list_response": images_sourcingkit_migration_list_response,
       },
     },
     annotations: {
@@ -431,67 +441,76 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_list_response": images_sourcingkit_migration_list_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_list_response": images_sourcingkit_migration_list_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/images/v2/sourcingkit/migrations`,
       query: [
-        ["offset", args["offset"], true],
-        ["limit", args["limit"], true],
+        ["offset", param(args, "query", "offset"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
     name: "images_import_logs",
     title: "List migration logs",
-    description: "List log entries for a CF Images import.",
+    description: "List log entries for a CF Images import.\n\nGET /accounts/{account_id}/images/v2/sourcingkit/migrations/{migration_id}/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "limit": {
-          "default": 25,
-          "description": "Maximum number of items to return.",
-          "type": "integer"
-        },
-        "migration_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "migration_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "migration_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "default": 0,
-          "description": "Number of items to skip before returning results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 25,
+              "description": "Maximum number of items to return.",
+              "type": "integer"
+            },
+            "offset": {
+              "default": 0,
+              "description": "Number of items to skip before returning results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "migration_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_migration_log_list_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_migration_log": images_sourcingkit_migration_log_output,
-        "images_sourcingkit_migration_log_list_response": images_sourcingkit_migration_log_list_response_output,
-        "images_sourcingkit_migration_log_type": images_sourcingkit_migration_log_type_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration_log": images_sourcingkit_migration_log,
+        "images_sourcingkit_migration_log_list_response": images_sourcingkit_migration_log_list_response,
       },
     },
     annotations: {
@@ -526,55 +545,60 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_migration_log": images_sourcingkit_migration_log_output,
-        "images_sourcingkit_migration_log_list_response": images_sourcingkit_migration_log_list_response_output,
-        "images_sourcingkit_migration_log_type": images_sourcingkit_migration_log_type_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration_log": images_sourcingkit_migration_log,
+        "images_sourcingkit_migration_log_list_response": images_sourcingkit_migration_log_list_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/images/v2/sourcingkit/migrations/${pathParam(args, "migration_id")}/logs`,
       query: [
-        ["offset", args["offset"], true],
-        ["limit", args["limit"], true],
+        ["offset", param(args, "query", "offset"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
     name: "images_import_progress",
     title: "Get migration progress",
-    description: "Get progress and object counts for a CF Images import.",
+    description: "Get progress and object counts for a CF Images import.\n\nGET /accounts/{account_id}/images/v2/sourcingkit/migrations/{migration_id}/lifecycle",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "migration_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "migration_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "migration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "migration_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_migration_progress_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_migration_progress_response": images_sourcingkit_migration_progress_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration_progress_response": images_sourcingkit_migration_progress_response,
       },
     },
     annotations: {
@@ -609,12 +633,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_migration_progress_response": images_sourcingkit_migration_progress_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration_progress_response": images_sourcingkit_migration_progress_response,
       },
     },
     request: (args) => ({
@@ -624,39 +647,43 @@ export const tools: readonly Tool[] = [
   {
     name: "images_import_start",
     title: "Start a migration",
-    description: "Start a pending CF Images import.",
+    description: "Start a pending CF Images import.\n\nPATCH /accounts/{account_id}/images/v2/sourcingkit/migrations/{migration_id}/lifecycle/start",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "migration_id": {
-          "$ref": "#/$defs/images_sourcingkit_identifier",
-          "description": "Sourcing kit resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "migration_id": {
+              "description": "Sourcing kit resource identifier.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "migration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "migration_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_sourcingkit_identifier": images_sourcingkit_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_sourcingkit_migration_single_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response,
       },
     },
     annotations: {
@@ -683,15 +710,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_messages": images_messages_output,
-        "images_sourcingkit_acceptable_content_type": images_sourcingkit_acceptable_content_type_output,
-        "images_sourcingkit_conflict_behaviour": images_sourcingkit_conflict_behaviour_output,
-        "images_sourcingkit_migration": images_sourcingkit_migration_output,
-        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response_output,
-        "images_sourcingkit_migration_status": images_sourcingkit_migration_status_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_messages": images_messages,
+        "images_sourcingkit_migration": images_sourcingkit_migration,
+        "images_sourcingkit_migration_single_response": images_sourcingkit_migration_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/images/keys/outputs.ts b/src/generated/forge-mcp/images/keys/outputs.ts
index b77138d14..fab38b511 100644
--- a/src/generated/forge-mcp/images/keys/outputs.ts
+++ b/src/generated/forge-mcp/images/keys/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `images_image_key_name` in responses.
- */
-export const images_image_key_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `images_image_key_response_collection` in responses.
  */
-export const images_image_key_response_collection_output: JsonSchema = {
+export const images_image_key_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-common"
@@ -29,23 +22,16 @@ export const images_image_key_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `images_image_key_value` in responses.
- */
-export const images_image_key_value_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `images_image_keys` in responses.
  */
-export const images_image_keys_output: JsonSchema = {
+export const images_image_keys: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/images_image_key_name"
+      "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/images_image_key_value"
+      "type": "string"
     }
   },
   "type": "object"
@@ -54,7 +40,7 @@ export const images_image_keys_output: JsonSchema = {
 /**
  * The schema of `images_image_keys_response` in responses.
  */
-export const images_image_keys_response_output: JsonSchema = {
+export const images_image_keys_response: JsonSchema = {
   "properties": {
     "keys": {
       "items": {
diff --git a/src/generated/forge-mcp/images/keys/schemas.ts b/src/generated/forge-mcp/images/keys/schemas.ts
deleted file mode 100644
index 90f803511..000000000
--- a/src/generated/forge-mcp/images/keys/schemas.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `images_signing_key_identifier`.
- */
-export const images_signing_key_identifier: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/images/keys/tools.ts b/src/generated/forge-mcp/images/keys/tools.ts
index c892ab633..dcdbe9f3e 100644
--- a/src/generated/forge-mcp/images/keys/tools.ts
+++ b/src/generated/forge-mcp/images/keys/tools.ts
@@ -3,19 +3,15 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  images_api_response_common_failure_output,
-  images_api_response_common_output,
-  images_messages_output,
+  images_api$$response$$common,
+  images_api$$response$$common$$failure,
+  images_messages,
 } from "../outputs.js";
-import { images_account_identifier } from "../schemas.js";
 import {
-  images_image_key_name_output,
-  images_image_key_response_collection_output,
-  images_image_key_value_output,
-  images_image_keys_output,
-  images_image_keys_response_output,
+  images_image_key_response_collection,
+  images_image_keys,
+  images_image_keys_response,
 } from "./outputs.js";
-import { images_signing_key_identifier } from "./schemas.js";
 
 /**
  * The tools of `images.keys`.
@@ -24,37 +20,41 @@ export const tools: readonly Tool[] = [
   {
     name: "images_keys_create",
     title: "Create a new Signing Key",
-    description: "Create a new CF Images signing key with specified name. Returns all keys available.",
+    description: "Create a new CF Images signing key with specified name. Returns all keys available.\n\nPUT /accounts/{account_id}/images/v1/keys/{signing_key_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "signing_key_name": {
-          "$ref": "#/$defs/images_signing_key_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "signing_key_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "signing_key_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "signing_key_name"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_signing_key_identifier": images_signing_key_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_key_response_collection",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_image_key_name": images_image_key_name_output,
-        "images_image_key_response_collection": images_image_key_response_collection_output,
-        "images_image_key_value": images_image_key_value_output,
-        "images_image_keys": images_image_keys_output,
-        "images_image_keys_response": images_image_keys_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_image_key_response_collection": images_image_key_response_collection,
+        "images_image_keys": images_image_keys,
+        "images_image_keys_response": images_image_keys_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -83,14 +83,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_image_key_name": images_image_key_name_output,
-        "images_image_key_response_collection": images_image_key_response_collection_output,
-        "images_image_key_value": images_image_key_value_output,
-        "images_image_keys": images_image_keys_output,
-        "images_image_keys_response": images_image_keys_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_image_key_response_collection": images_image_key_response_collection,
+        "images_image_keys": images_image_keys,
+        "images_image_keys_response": images_image_keys_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -100,37 +98,41 @@ export const tools: readonly Tool[] = [
   {
     name: "images_keys_delete",
     title: "Delete Signing Key",
-    description: "Delete a CF Images signing key with specified name. Returns all keys available.\nWhen the last key is removed, a new default signing key will be generated.\n\nConfirm with the user before calling this tool. This operation will delete this signing key. This will invalidate any URLs that are signed with this key.",
+    description: "Delete a CF Images signing key with specified name. Returns all keys available.\nWhen the last key is removed, a new default signing key will be generated.\n\nConfirm with the user before calling this tool. This operation will delete this signing key. This will invalidate any URLs that are signed with this key.\n\nDELETE /accounts/{account_id}/images/v1/keys/{signing_key_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "signing_key_name": {
-          "$ref": "#/$defs/images_signing_key_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "signing_key_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "signing_key_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "signing_key_name"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_signing_key_identifier": images_signing_key_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_key_response_collection",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_image_key_name": images_image_key_name_output,
-        "images_image_key_response_collection": images_image_key_response_collection_output,
-        "images_image_key_value": images_image_key_value_output,
-        "images_image_keys": images_image_keys_output,
-        "images_image_keys_response": images_image_keys_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_image_key_response_collection": images_image_key_response_collection,
+        "images_image_keys": images_image_keys,
+        "images_image_keys_response": images_image_keys_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -159,14 +161,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_image_key_name": images_image_key_name_output,
-        "images_image_key_response_collection": images_image_key_response_collection_output,
-        "images_image_key_value": images_image_key_value_output,
-        "images_image_keys": images_image_keys_output,
-        "images_image_keys_response": images_image_keys_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_image_key_response_collection": images_image_key_response_collection,
+        "images_image_keys": images_image_keys,
+        "images_image_keys_response": images_image_keys_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -176,32 +176,37 @@ export const tools: readonly Tool[] = [
   {
     name: "images_keys_list",
     title: "List Signing Keys",
-    description: "List your CF Images signing keys.",
+    description: "List your CF Images signing keys.\n\nGET /accounts/{account_id}/images/v1/keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_key_response_collection",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_image_key_name": images_image_key_name_output,
-        "images_image_key_response_collection": images_image_key_response_collection_output,
-        "images_image_key_value": images_image_key_value_output,
-        "images_image_keys": images_image_keys_output,
-        "images_image_keys_response": images_image_keys_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_image_key_response_collection": images_image_key_response_collection,
+        "images_image_keys": images_image_keys,
+        "images_image_keys_response": images_image_keys_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -236,14 +241,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_image_key_name": images_image_key_name_output,
-        "images_image_key_response_collection": images_image_key_response_collection_output,
-        "images_image_key_value": images_image_key_value_output,
-        "images_image_keys": images_image_keys_output,
-        "images_image_keys_response": images_image_keys_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_image_key_response_collection": images_image_key_response_collection,
+        "images_image_keys": images_image_keys,
+        "images_image_keys_response": images_image_keys_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/images/outputs.ts b/src/generated/forge-mcp/images/outputs.ts
index 955d3a0ad..22ec3de5f 100644
--- a/src/generated/forge-mcp/images/outputs.ts
+++ b/src/generated/forge-mcp/images/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `images_api-response-collection-v2` in responses.
  */
-export const images_api_response_collection_v2_output: JsonSchema = {
+export const images_api$$response$$collection$$v2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-common"
@@ -16,7 +16,14 @@ export const images_api_response_collection_v2_output: JsonSchema = {
         "result": {
           "properties": {
             "continuation_token": {
-              "$ref": "#/$defs/images_images_list_continuation_token"
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
           },
           "type": "object"
@@ -30,7 +37,7 @@ export const images_api_response_collection_v2_output: JsonSchema = {
 /**
  * The schema of `images_api-response-common` in responses.
  */
-export const images_api_response_common_output: JsonSchema = {
+export const images_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/images_messages"
@@ -73,7 +80,7 @@ export const images_api_response_common_output: JsonSchema = {
 /**
  * The schema of `images_api-response-common-failure` in responses.
  */
-export const images_api_response_common_failure_output: JsonSchema = {
+export const images_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/images_messages"
@@ -103,7 +110,7 @@ export const images_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `images_api-response-single` in responses.
  */
-export const images_api_response_single_output: JsonSchema = {
+export const images_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-common"
@@ -129,7 +136,7 @@ export const images_api_response_single_output: JsonSchema = {
 /**
  * The schema of `images_deleted_response` in responses.
  */
-export const images_deleted_response_output: JsonSchema = {
+export const images_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -148,25 +155,33 @@ export const images_deleted_response_output: JsonSchema = {
 /**
  * The schema of `images_image` in responses.
  */
-export const images_image_output: JsonSchema = {
+export const images_image: JsonSchema = {
   "properties": {
     "creator": {
-      "$ref": "#/$defs/images_image_creator"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "filename": {
-      "$ref": "#/$defs/images_image_filename"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/images_image_identifier"
+      "type": "string"
     },
     "meta": {
       "$ref": "#/$defs/images_image_metadata"
     },
     "requireSignedURLs": {
-      "$ref": "#/$defs/images_image_requireSignedURLs"
+      "type": "boolean"
     },
     "uploaded": {
-      "$ref": "#/$defs/images_image_uploaded"
+      "format": "date-time",
+      "type": "string"
     },
     "variants": {
       "$ref": "#/$defs/images_image_variants"
@@ -175,66 +190,17 @@ export const images_image_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `images_image_creator` in responses.
- */
-export const images_image_creator_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `images_image_filename` in responses.
- */
-export const images_image_filename_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_hero_url` in responses.
- */
-export const images_image_hero_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_identifier` in responses.
- */
-export const images_image_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `images_image_metadata` in responses.
  */
-export const images_image_metadata_output: JsonSchema = {
+export const images_image_metadata: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `images_image_original_url` in responses.
- */
-export const images_image_original_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_requireSignedURLs` in responses.
- */
-export const images_image_requireSignedURLs_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `images_image_response_blob` in responses.
  */
-export const images_image_response_blob_output: JsonSchema = {
+export const images_image_response_blob: JsonSchema = {
   "anyOf": [
     {
       "type": "string"
@@ -248,7 +214,7 @@ export const images_image_response_blob_output: JsonSchema = {
 /**
  * The schema of `images_image_response_single` in responses.
  */
-export const images_image_response_single_output: JsonSchema = {
+export const images_image_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -264,59 +230,30 @@ export const images_image_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `images_image_thumbnail_url` in responses.
- */
-export const images_image_thumbnail_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_uploaded` in responses.
- */
-export const images_image_uploaded_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `images_image_variants` in responses.
  */
-export const images_image_variants_output: JsonSchema = {
+export const images_image_variants: JsonSchema = {
   "items": {
     "anyOf": [
       {
-        "$ref": "#/$defs/images_image_thumbnail_url"
+        "type": "string"
       },
       {
-        "$ref": "#/$defs/images_image_hero_url"
+        "type": "string"
       },
       {
-        "$ref": "#/$defs/images_image_original_url"
+        "type": "string"
       }
     ]
   },
   "type": "array"
 };
 
-/**
- * The schema of `images_images_list_continuation_token` in responses.
- */
-export const images_images_list_continuation_token_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `images_images_list_response_v2` in responses.
  */
-export const images_images_list_response_v2_output: JsonSchema = {
+export const images_images_list_response_v2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-collection-v2"
@@ -343,7 +280,7 @@ export const images_images_list_response_v2_output: JsonSchema = {
 /**
  * The schema of `images_images_stats` in responses.
  */
-export const images_images_stats_output: JsonSchema = {
+export const images_images_stats: JsonSchema = {
   "properties": {
     "count": {
       "$ref": "#/$defs/images_images_stats_count"
@@ -352,39 +289,25 @@ export const images_images_stats_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `images_images_stats_allowed` in responses.
- */
-export const images_images_stats_allowed_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `images_images_stats_count` in responses.
  */
-export const images_images_stats_count_output: JsonSchema = {
+export const images_images_stats_count: JsonSchema = {
   "properties": {
     "allowed": {
-      "$ref": "#/$defs/images_images_stats_allowed"
+      "type": "number"
     },
     "current": {
-      "$ref": "#/$defs/images_images_stats_current"
+      "type": "number"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `images_images_stats_current` in responses.
- */
-export const images_images_stats_current_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `images_images_stats_response` in responses.
  */
-export const images_images_stats_response_output: JsonSchema = {
+export const images_images_stats_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -403,7 +326,7 @@ export const images_images_stats_response_output: JsonSchema = {
 /**
  * The schema of `images_messages` in responses.
  */
-export const images_messages_output: JsonSchema = {
+export const images_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/images/schemas.ts b/src/generated/forge-mcp/images/schemas.ts
index 41afb890d..c407908d8 100644
--- a/src/generated/forge-mcp/images/schemas.ts
+++ b/src/generated/forge-mcp/images/schemas.ts
@@ -3,22 +3,6 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `images_account_identifier`.
- */
-export const images_account_identifier: JsonSchema = {
-  "description": "Account identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_identifier`.
- */
-export const images_image_identifier: JsonSchema = {
-  "description": "Image unique identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `images_image_patch_request`.
  */
@@ -39,18 +23,3 @@ export const images_image_patch_request: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `images_images_list_continuation_token`.
- */
-export const images_images_list_continuation_token: JsonSchema = {
-  "description": "Continuation token to fetch next page. Passed as a query param when requesting List V2 api endpoint.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/images/tools.ts b/src/generated/forge-mcp/images/tools.ts
index f053c0266..e1abf7f32 100644
--- a/src/generated/forge-mcp/images/tools.ts
+++ b/src/generated/forge-mcp/images/tools.ts
@@ -1,41 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  images_api_response_collection_v2_output,
-  images_api_response_common_failure_output,
-  images_api_response_common_output,
-  images_api_response_single_output,
-  images_deleted_response_output,
-  images_image_creator_output,
-  images_image_filename_output,
-  images_image_hero_url_output,
-  images_image_identifier_output,
-  images_image_metadata_output,
-  images_image_original_url_output,
-  images_image_output,
-  images_image_requireSignedURLs_output,
-  images_image_response_blob_output,
-  images_image_response_single_output,
-  images_image_thumbnail_url_output,
-  images_image_uploaded_output,
-  images_image_variants_output,
-  images_images_list_continuation_token_output,
-  images_images_list_response_v2_output,
-  images_images_stats_allowed_output,
-  images_images_stats_count_output,
-  images_images_stats_current_output,
-  images_images_stats_output,
-  images_images_stats_response_output,
-  images_messages_output,
+  images_api$$response$$collection$$v2,
+  images_api$$response$$common,
+  images_api$$response$$common$$failure,
+  images_api$$response$$single,
+  images_deleted_response,
+  images_image,
+  images_image_metadata,
+  images_image_response_blob,
+  images_image_response_single,
+  images_image_variants,
+  images_images_list_response_v2,
+  images_images_stats,
+  images_images_stats_count,
+  images_images_stats_response,
+  images_messages,
 } from "./outputs.js";
-import {
-  images_account_identifier,
-  images_image_identifier,
-  images_image_patch_request,
-  images_images_list_continuation_token,
-} from "./schemas.js";
+import { images_image_patch_request } from "./schemas.js";
 
 /**
  * The tools of `images`.
@@ -44,35 +28,41 @@ export const tools: readonly Tool[] = [
   {
     name: "images_delete",
     title: "Delete image",
-    description: "Delete an image on Cloudflare Images. On success, all copies of the image are deleted and purged from cache.\n\nConfirm with the user before calling this tool. This operation will delete this image.",
+    description: "Delete an image on Cloudflare Images. On success, all copies of the image are deleted and purged from cache.\n\nConfirm with the user before calling this tool. This operation will delete this image.\n\nDELETE /accounts/{account_id}/images/v1/{image_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "image_id": {
-          "$ref": "#/$defs/images_image_identifier",
-          "description": "Image unique identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "image_id": {
+              "description": "Image unique identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "image_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "image_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_image_identifier": images_image_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_deleted_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_deleted_response": images_deleted_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_deleted_response": images_deleted_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -106,11 +96,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_deleted_response": images_deleted_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_deleted_response": images_deleted_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -120,51 +110,51 @@ export const tools: readonly Tool[] = [
   {
     name: "images_edit",
     title: "Update image",
-    description: "Update a CF Images image's metadata, creator, or access control. On access control change, all copies of the image are purged from cache.",
+    description: "Update a CF Images image's metadata, creator, or access control. On access control change, all copies of the image are purged from cache.\n\nPATCH /accounts/{account_id}/images/v1/{image_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/images_image_patch_request"
         },
-        "image_id": {
-          "$ref": "#/$defs/images_image_identifier",
-          "description": "Image unique identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "image_id": {
+              "description": "Image unique identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "image_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "image_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_image_identifier": images_image_identifier,
         "images_image_patch_request": images_image_patch_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_response_single",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image": images_image_output,
-        "images_image_creator": images_image_creator_output,
-        "images_image_filename": images_image_filename_output,
-        "images_image_hero_url": images_image_hero_url_output,
-        "images_image_identifier": images_image_identifier_output,
-        "images_image_metadata": images_image_metadata_output,
-        "images_image_original_url": images_image_original_url_output,
-        "images_image_requireSignedURLs": images_image_requireSignedURLs_output,
-        "images_image_response_single": images_image_response_single_output,
-        "images_image_thumbnail_url": images_image_thumbnail_url_output,
-        "images_image_uploaded": images_image_uploaded_output,
-        "images_image_variants": images_image_variants_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image": images_image,
+        "images_image_metadata": images_image_metadata,
+        "images_image_response_single": images_image_response_single,
+        "images_image_variants": images_image_variants,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -198,22 +188,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image": images_image_output,
-        "images_image_creator": images_image_creator_output,
-        "images_image_filename": images_image_filename_output,
-        "images_image_hero_url": images_image_hero_url_output,
-        "images_image_identifier": images_image_identifier_output,
-        "images_image_metadata": images_image_metadata_output,
-        "images_image_original_url": images_image_original_url_output,
-        "images_image_requireSignedURLs": images_image_requireSignedURLs_output,
-        "images_image_response_single": images_image_response_single_output,
-        "images_image_thumbnail_url": images_image_thumbnail_url_output,
-        "images_image_uploaded": images_image_uploaded_output,
-        "images_image_variants": images_image_variants_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image": images_image,
+        "images_image_metadata": images_image_metadata,
+        "images_image_response_single": images_image_response_single,
+        "images_image_variants": images_image_variants,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -224,46 +206,44 @@ export const tools: readonly Tool[] = [
   {
     name: "images_get",
     title: "Image details",
-    description: "Fetch details for a CF Images image.",
+    description: "Fetch details for a CF Images image.\n\nGET /accounts/{account_id}/images/v1/{image_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "image_id": {
-          "$ref": "#/$defs/images_image_identifier",
-          "description": "Image unique identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "image_id": {
+              "description": "Image unique identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "image_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "image_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_image_identifier": images_image_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_response_single",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image": images_image_output,
-        "images_image_creator": images_image_creator_output,
-        "images_image_filename": images_image_filename_output,
-        "images_image_hero_url": images_image_hero_url_output,
-        "images_image_identifier": images_image_identifier_output,
-        "images_image_metadata": images_image_metadata_output,
-        "images_image_original_url": images_image_original_url_output,
-        "images_image_requireSignedURLs": images_image_requireSignedURLs_output,
-        "images_image_response_single": images_image_response_single_output,
-        "images_image_thumbnail_url": images_image_thumbnail_url_output,
-        "images_image_uploaded": images_image_uploaded_output,
-        "images_image_variants": images_image_variants_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image": images_image,
+        "images_image_metadata": images_image_metadata,
+        "images_image_response_single": images_image_response_single,
+        "images_image_variants": images_image_variants,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -298,22 +278,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image": images_image_output,
-        "images_image_creator": images_image_creator_output,
-        "images_image_filename": images_image_filename_output,
-        "images_image_hero_url": images_image_hero_url_output,
-        "images_image_identifier": images_image_identifier_output,
-        "images_image_metadata": images_image_metadata_output,
-        "images_image_original_url": images_image_original_url_output,
-        "images_image_requireSignedURLs": images_image_requireSignedURLs_output,
-        "images_image_response_single": images_image_response_single_output,
-        "images_image_thumbnail_url": images_image_thumbnail_url_output,
-        "images_image_uploaded": images_image_uploaded_output,
-        "images_image_variants": images_image_variants_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image": images_image,
+        "images_image_metadata": images_image_metadata,
+        "images_image_response_single": images_image_response_single,
+        "images_image_variants": images_image_variants,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -321,29 +293,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "images_get_blob",
+    name: "images_getBlob",
     title: "Download image",
-    description: "Download an image from CF Images. For most images this will be the originally uploaded file. For larger images it can be a near-lossless version of the original.",
+    description: "Download an image from CF Images. For most images this will be the originally uploaded file. For larger images it can be a near-lossless version of the original.\n\nGET /accounts/{account_id}/images/v1/{image_id}/blob",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "image_id": {
-          "$ref": "#/$defs/images_image_identifier",
-          "description": "Image unique identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "image_id": {
+              "description": "Image unique identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "image_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "image_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_image_identifier": images_image_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -375,9 +353,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_image_response_blob": images_image_response_blob_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_image_response_blob": images_image_response_blob,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -387,75 +365,85 @@ export const tools: readonly Tool[] = [
   {
     name: "images_list",
     title: "List images V2",
-    description: "List up to 10000 images from CF Images, with up to 1000 results per page. Use the optional parameters below to get a specific range of images.\nPagination is supported via continuation_token.\n\n**Metadata Filtering (Optional):**\n\nYou can optionally filter images by custom metadata fields using the `meta.<field>[<operator>]=<value>` syntax.\n\n**Supported Operators:**\n- `eq` / `eq:string` / `eq:number` / `eq:boolean` - Exact match\n- `gt` / `gt:number` - Greater than (number only)\n- `gte` / `gte:number` - Greater than or equal (number only)\n- `lt` / `lt:number` - Less than (number only)\n- `lte` / `lte:number` - Less than or equal (number only)\n- `in` / `in:string` / `in:number` - Match any value in list (pipe-separated)\n\n**Metadata Filter Constraints:**\n- Maximum 5 metadata filters per request\n- Maximum 5 levels of nesting (e.g., `meta.first.second.third.fourth.fifth`)\n- Maximum 10 elements for list operators (`in`)\n- Supports string, number, and boolean value types\n- Range operators (`gt`, `gte`, `lt`, `lte`) only accept numeric values\n\n**Filter Consistency:**\nFilters are combined with AND logic. The system does not validate whether filter combinations are logically consistent. For example, `meta.priority[eq:number]=5&meta.priority[lte:number]=3` will return zero results because no value can satisfy both conditions simultaneously. It is the caller's responsibility to ensure filter combinations make sense.\n\n**Examples:**\n```\n# List all images\n/images/v2\n\n# Filter by metadata [eq]\n/images/v2?meta.status[eq:string]=active\n\n# Filter by metadata [in]\n/images/v2?meta.status[in]=pending|deleted|flagged\n\n# Filter by metadata [in:number]\n/images/v2?meta.ratings[in:number]=4|5\n\n# Filter by metadata range [gte:number]\n/images/v2?meta.priority[gte:number]=1\n\n# Filter by bounded range\n/images/v2?meta.priority[gte:number]=1&meta.priority[lte:number]=5\n\n# Filter by nested metadata\n/images/v2?meta.region.name[eq]=eu-west\n\n# Combine metadata filters with creator\n/images/v2?meta.status[eq]=active&creator=user123\n\n# Multiple metadata filters (AND logic)\n/images/v2?meta.status[eq]=active&meta.priority[eq:number]=5\n```",
+    description: "List up to 10000 images from CF Images, with up to 1000 results per page. Use the optional parameters below to get a specific range of images.\nPagination is supported via continuation_token.\n\n**Metadata Filtering (Optional):**\n\nYou can optionally filter images by custom metadata fields using the `meta.<field>[<operator>]=<value>` syntax.\n\n**Supported Operators:**\n- `eq` / `eq:string` / `eq:number` / `eq:boolean` - Exact match\n- `gt` / `gt:number` - Greater than (number only)\n- `gte` / `gte:number` - Greater than or equal (number only)\n- `lt` / `lt:number` - Less than (number only)\n- `lte` / `lte:number` - Less than or equal (number only)\n- `in` / `in:string` / `in:number` - Match any value in list (pipe-separated)\n\n**Metadata Filter Constraints:**\n- Maximum 5 metadata filters per request\n- Maximum 5 levels of nesting (e.g., `meta.first.second.third.fourth.fifth`)\n- Maximum 10 elements for list operators (`in`)\n- Supports string, number, and boolean value types\n- Range operators (`gt`, `gte`, `lt`, `lte`) only accept numeric values\n\n**Filter Consistency:**\nFilters are combined with AND logic. The system does not validate whether filter combinations are logically consistent. For example, `meta.priority[eq:number]=5&meta.priority[lte:number]=3` will return zero results because no value can satisfy both conditions simultaneously. It is the caller's responsibility to ensure filter combinations make sense.\n\n**Examples:**\n```\n# List all images\n/images/v2\n\n# Filter by metadata [eq]\n/images/v2?meta.status[eq:string]=active\n\n# Filter by metadata [in]\n/images/v2?meta.status[in]=pending|deleted|flagged\n\n# Filter by metadata [in:number]\n/images/v2?meta.ratings[in:number]=4|5\n\n# Filter by metadata range [gte:number]\n/images/v2?meta.priority[gte:number]=1\n\n# Filter by bounded range\n/images/v2?meta.priority[gte:number]=1&meta.priority[lte:number]=5\n\n# Filter by nested metadata\n/images/v2?meta.region.name[eq]=eu-west\n\n# Combine metadata filters with creator\n/images/v2?meta.status[eq]=active&creator=user123\n\n# Multiple metadata filters (AND logic)\n/images/v2?meta.status[eq]=active&meta.priority[eq:number]=5\n```\n\nGET /accounts/{account_id}/images/v2",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "continuation_token": {
-          "$ref": "#/$defs/images_images_list_continuation_token",
-          "description": "Continuation token to fetch next page. Passed as a query param when requesting List V2 api endpoint."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "creator": {
-          "description": "Internal user ID set within the creator field. Setting to empty string \"\" will return images where creator field is not set",
-          "oneOf": [
-            {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continuation_token": {
+              "description": "Continuation token to fetch next page. Passed as a query param when requesting List V2 api endpoint.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "creator": {
+              "description": "Internal user ID set within the creator field. Setting to empty string \"\" will return images where creator field is not set",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "meta.<field>[<operator>]": {
+              "description": "Optional metadata filter(s). Multiple filters can be combined with AND logic.\n\n**Operators:**\n- `eq`, `eq:string`, `eq:number`, `eq:boolean` - Exact match\n- `gt`, `gt:number` - Greater than (number only)\n- `gte`, `gte:number` - Greater than or equal (number only)\n- `lt`, `lt:number` - Less than (number only)\n- `lte`, `lte:number` - Less than or equal (number only)\n- `in`, `in:string`, `in:number` - Match any value in pipe-separated list\n\n**Examples:**\n- `meta.status[eq]=active`\n- `meta.priority[eq:number]=5`\n- `meta.enabled[eq:boolean]=true`\n- `meta.priority[gte:number]=1`\n- `meta.score[lt:number]=100`\n- `meta.region[in]=us-east|us-west|eu-west`\n\n**Note:** Filter consistency is not validated. Contradictory filters (e.g., `meta.priority[eq:number]=5&meta.priority[lte:number]=3`) will return zero results.",
               "type": "string"
             },
-            {
-              "type": "null"
+            "per_page": {
+              "default": 1000,
+              "description": "Number of items per page",
+              "type": "number"
+            },
+            "sort_order": {
+              "default": "desc",
+              "description": "Sorting order by upload time",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
             }
-          ]
-        },
-        "meta_field_operator": {
-          "description": "Optional metadata filter(s). Multiple filters can be combined with AND logic.\n\n**Operators:**\n- `eq`, `eq:string`, `eq:number`, `eq:boolean` - Exact match\n- `gt`, `gt:number` - Greater than (number only)\n- `gte`, `gte:number` - Greater than or equal (number only)\n- `lt`, `lt:number` - Less than (number only)\n- `lte`, `lte:number` - Less than or equal (number only)\n- `in`, `in:string`, `in:number` - Match any value in pipe-separated list\n\n**Examples:**\n- `meta.status[eq]=active`\n- `meta.priority[eq:number]=5`\n- `meta.enabled[eq:boolean]=true`\n- `meta.priority[gte:number]=1`\n- `meta.score[lt:number]=100`\n- `meta.region[in]=us-east|us-west|eu-west`\n\n**Note:** Filter consistency is not validated. Contradictory filters (e.g., `meta.priority[eq:number]=5&meta.priority[lte:number]=3`) will return zero results.\n",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 1000,
-          "description": "Number of items per page",
-          "type": "number"
-        },
-        "sort_order": {
-          "default": "desc",
-          "description": "Sorting order by upload time",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_images_list_continuation_token": images_images_list_continuation_token,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_images_list_response_v2",
       $defs: {
-        "images_api-response-collection-v2": images_api_response_collection_v2_output,
-        "images_api-response-common": images_api_response_common_output,
-        "images_image": images_image_output,
-        "images_image_creator": images_image_creator_output,
-        "images_image_filename": images_image_filename_output,
-        "images_image_hero_url": images_image_hero_url_output,
-        "images_image_identifier": images_image_identifier_output,
-        "images_image_metadata": images_image_metadata_output,
-        "images_image_original_url": images_image_original_url_output,
-        "images_image_requireSignedURLs": images_image_requireSignedURLs_output,
-        "images_image_thumbnail_url": images_image_thumbnail_url_output,
-        "images_image_uploaded": images_image_uploaded_output,
-        "images_image_variants": images_image_variants_output,
-        "images_images_list_continuation_token": images_images_list_continuation_token_output,
-        "images_images_list_response_v2": images_images_list_response_v2_output,
-        "images_messages": images_messages_output,
+        "images_api-response-collection-v2": images_api$$response$$collection$$v2,
+        "images_api-response-common": images_api$$response$$common,
+        "images_image": images_image,
+        "images_image_metadata": images_image_metadata,
+        "images_image_variants": images_image_variants,
+        "images_images_list_response_v2": images_images_list_response_v2,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -486,66 +474,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-collection-v2": images_api_response_collection_v2_output,
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_image": images_image_output,
-        "images_image_creator": images_image_creator_output,
-        "images_image_filename": images_image_filename_output,
-        "images_image_hero_url": images_image_hero_url_output,
-        "images_image_identifier": images_image_identifier_output,
-        "images_image_metadata": images_image_metadata_output,
-        "images_image_original_url": images_image_original_url_output,
-        "images_image_requireSignedURLs": images_image_requireSignedURLs_output,
-        "images_image_thumbnail_url": images_image_thumbnail_url_output,
-        "images_image_uploaded": images_image_uploaded_output,
-        "images_image_variants": images_image_variants_output,
-        "images_images_list_continuation_token": images_images_list_continuation_token_output,
-        "images_images_list_response_v2": images_images_list_response_v2_output,
-        "images_messages": images_messages_output,
+        "images_api-response-collection-v2": images_api$$response$$collection$$v2,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_image": images_image,
+        "images_image_metadata": images_image_metadata,
+        "images_image_variants": images_image_variants,
+        "images_images_list_response_v2": images_images_list_response_v2,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/images/v2`,
       query: [
-        ["continuation_token", args["continuation_token"], true],
-        ["per_page", args["per_page"], true],
-        ["sort_order", args["sort_order"], true],
-        ["creator", args["creator"], true],
-        ["meta.<field>[<operator>]", args["meta_field_operator"], true],
+        ["continuation_token", param(args, "query", "continuation_token"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
+        ["creator", param(args, "query", "creator"), true],
+        ["meta.<field>[<operator>]", param(args, "query", "meta.<field>[<operator>]"), true],
       ],
     }),
   },
   {
     name: "images_stats",
     title: "Images usage statistics",
-    description: "Fetch image statistics details for Cloudflare Images. The returned statistics detail storage usage, including the current image count vs this account's allowance.",
+    description: "Fetch image statistics details for Cloudflare Images. The returned statistics detail storage usage, including the current image count vs this account's allowance.\n\nGET /accounts/{account_id}/images/v1/stats",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_images_stats_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_images_stats": images_images_stats_output,
-        "images_images_stats_allowed": images_images_stats_allowed_output,
-        "images_images_stats_count": images_images_stats_count_output,
-        "images_images_stats_current": images_images_stats_current_output,
-        "images_images_stats_response": images_images_stats_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_images_stats": images_images_stats,
+        "images_images_stats_count": images_images_stats_count,
+        "images_images_stats_response": images_images_stats_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -580,15 +564,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_images_stats": images_images_stats_output,
-        "images_images_stats_allowed": images_images_stats_allowed_output,
-        "images_images_stats_count": images_images_stats_count_output,
-        "images_images_stats_current": images_images_stats_current_output,
-        "images_images_stats_response": images_images_stats_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_images_stats": images_images_stats,
+        "images_images_stats_count": images_images_stats_count,
+        "images_images_stats_response": images_images_stats_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/images/variants/outputs.ts b/src/generated/forge-mcp/images/variants/outputs.ts
index 4efb6a0bd..7cc91f6ec 100644
--- a/src/generated/forge-mcp/images/variants/outputs.ts
+++ b/src/generated/forge-mcp/images/variants/outputs.ts
@@ -6,13 +6,13 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `images_image_variant_definition` in responses.
  */
-export const images_image_variant_definition_output: JsonSchema = {
+export const images_image_variant_definition: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/images_image_variant_identifier"
+      "type": "string"
     },
     "neverRequireSignedURLs": {
-      "$ref": "#/$defs/images_image_variant_neverRequireSignedURLs"
+      "type": "boolean"
     },
     "options": {
       "$ref": "#/$defs/images_image_variant_options"
@@ -25,38 +25,10 @@ export const images_image_variant_definition_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `images_image_variant_fit` in responses.
- */
-export const images_image_variant_fit_output: JsonSchema = {
-  "enum": [
-    "scale-down",
-    "contain",
-    "cover",
-    "crop",
-    "pad"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_variant_height` in responses.
- */
-export const images_image_variant_height_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `images_image_variant_identifier` in responses.
- */
-export const images_image_variant_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `images_image_variant_list_response` in responses.
  */
-export const images_image_variant_list_response_output: JsonSchema = {
+export const images_image_variant_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-common"
@@ -72,29 +44,34 @@ export const images_image_variant_list_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `images_image_variant_neverRequireSignedURLs` in responses.
- */
-export const images_image_variant_neverRequireSignedURLs_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `images_image_variant_options` in responses.
  */
-export const images_image_variant_options_output: JsonSchema = {
+export const images_image_variant_options: JsonSchema = {
   "properties": {
     "fit": {
-      "$ref": "#/$defs/images_image_variant_fit"
+      "enum": [
+        "scale-down",
+        "contain",
+        "cover",
+        "crop",
+        "pad"
+      ],
+      "type": "string"
     },
     "height": {
-      "$ref": "#/$defs/images_image_variant_height"
+      "type": "number"
     },
     "metadata": {
-      "$ref": "#/$defs/images_image_variant_schemas_metadata"
+      "enum": [
+        "keep",
+        "copyright",
+        "none"
+      ],
+      "type": "string"
     },
     "width": {
-      "$ref": "#/$defs/images_image_variant_width"
+      "type": "number"
     }
   },
   "required": [
@@ -109,15 +86,15 @@ export const images_image_variant_options_output: JsonSchema = {
 /**
  * The schema of `images_image_variant_public_request` in responses.
  */
-export const images_image_variant_public_request_output: JsonSchema = {
+export const images_image_variant_public_request: JsonSchema = {
   "properties": {
     "hero": {
       "properties": {
         "id": {
-          "$ref": "#/$defs/images_image_variant_identifier"
+          "type": "string"
         },
         "neverRequireSignedURLs": {
-          "$ref": "#/$defs/images_image_variant_neverRequireSignedURLs"
+          "type": "boolean"
         },
         "options": {
           "$ref": "#/$defs/images_image_variant_options"
@@ -136,7 +113,7 @@ export const images_image_variant_public_request_output: JsonSchema = {
 /**
  * The schema of `images_image_variant_response` in responses.
  */
-export const images_image_variant_response_output: JsonSchema = {
+export const images_image_variant_response: JsonSchema = {
   "properties": {
     "variant": {
       "$ref": "#/$defs/images_image_variant_definition"
@@ -145,22 +122,10 @@ export const images_image_variant_response_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `images_image_variant_schemas_metadata` in responses.
- */
-export const images_image_variant_schemas_metadata_output: JsonSchema = {
-  "enum": [
-    "keep",
-    "copyright",
-    "none"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `images_image_variant_simple_response` in responses.
  */
-export const images_image_variant_simple_response_output: JsonSchema = {
+export const images_image_variant_simple_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/images_api-response-single"
@@ -176,17 +141,10 @@ export const images_image_variant_simple_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `images_image_variant_width` in responses.
- */
-export const images_image_variant_width_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `images_image_variants_response` in responses.
  */
-export const images_image_variants_response_output: JsonSchema = {
+export const images_image_variants_response: JsonSchema = {
   "properties": {
     "variants": {
       "$ref": "#/$defs/images_image_variant_public_request"
diff --git a/src/generated/forge-mcp/images/variants/schemas.ts b/src/generated/forge-mcp/images/variants/schemas.ts
index e9a1c3319..c1ec1ebc4 100644
--- a/src/generated/forge-mcp/images/variants/schemas.ts
+++ b/src/generated/forge-mcp/images/variants/schemas.ts
@@ -9,12 +9,12 @@ import type { JsonSchema } from "../../_/tool.js";
 export const images_image_variant_definition: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/images_image_variant_identifier"
+      "type": "string"
     },
     "neverRequireSignedURLs": {
-      "$ref": "#/$defs/images_image_variant_neverRequireSignedURLs",
       "default": false,
-      "description": "Indicates whether the variant can access an image without a signature, regardless of image access control."
+      "description": "Indicates whether the variant can access an image without a signature, regardless of image access control.",
+      "type": "boolean"
     },
     "options": {
       "$ref": "#/$defs/images_image_variant_options",
@@ -28,44 +28,6 @@ export const images_image_variant_definition: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `images_image_variant_fit`.
- */
-export const images_image_variant_fit: JsonSchema = {
-  "description": "The fit property describes how the width and height dimensions should be interpreted.",
-  "enum": [
-    "scale-down",
-    "contain",
-    "cover",
-    "crop",
-    "pad"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_variant_height`.
- */
-export const images_image_variant_height: JsonSchema = {
-  "description": "Maximum height in image pixels.",
-  "type": "number"
-};
-
-/**
- * The schema of `images_image_variant_identifier`.
- */
-export const images_image_variant_identifier: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_variant_neverRequireSignedURLs`.
- */
-export const images_image_variant_neverRequireSignedURLs: JsonSchema = {
-  "description": "Indicates whether the variant can access an image without a signature, regardless of image access control.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `images_image_variant_options`.
  */
@@ -73,20 +35,32 @@ export const images_image_variant_options: JsonSchema = {
   "description": "Allows you to define image resizing sizes for different use cases.",
   "properties": {
     "fit": {
-      "$ref": "#/$defs/images_image_variant_fit",
-      "description": "The fit property describes how the width and height dimensions should be interpreted."
+      "description": "The fit property describes how the width and height dimensions should be interpreted.",
+      "enum": [
+        "scale-down",
+        "contain",
+        "cover",
+        "crop",
+        "pad"
+      ],
+      "type": "string"
     },
     "height": {
-      "$ref": "#/$defs/images_image_variant_height",
-      "description": "Maximum height in image pixels."
+      "description": "Maximum height in image pixels.",
+      "type": "number"
     },
     "metadata": {
-      "$ref": "#/$defs/images_image_variant_schemas_metadata",
-      "description": "What EXIF data should be preserved in the output image."
+      "description": "What EXIF data should be preserved in the output image.",
+      "enum": [
+        "keep",
+        "copyright",
+        "none"
+      ],
+      "type": "string"
     },
     "width": {
-      "$ref": "#/$defs/images_image_variant_width",
-      "description": "Maximum width in image pixels."
+      "description": "Maximum width in image pixels.",
+      "type": "number"
     }
   },
   "required": [
@@ -104,9 +78,9 @@ export const images_image_variant_options: JsonSchema = {
 export const images_image_variant_patch_request: JsonSchema = {
   "properties": {
     "neverRequireSignedURLs": {
-      "$ref": "#/$defs/images_image_variant_neverRequireSignedURLs",
       "default": false,
-      "description": "Indicates whether the variant can access an image without a signature, regardless of image access control."
+      "description": "Indicates whether the variant can access an image without a signature, regardless of image access control.",
+      "type": "boolean"
     },
     "options": {
       "$ref": "#/$defs/images_image_variant_options",
@@ -118,24 +92,3 @@ export const images_image_variant_patch_request: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `images_image_variant_schemas_metadata`.
- */
-export const images_image_variant_schemas_metadata: JsonSchema = {
-  "description": "What EXIF data should be preserved in the output image.",
-  "enum": [
-    "keep",
-    "copyright",
-    "none"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `images_image_variant_width`.
- */
-export const images_image_variant_width: JsonSchema = {
-  "description": "Maximum width in image pixels.",
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/images/variants/tools.ts b/src/generated/forge-mcp/images/variants/tools.ts
index f9a8e2044..e79682043 100644
--- a/src/generated/forge-mcp/images/variants/tools.ts
+++ b/src/generated/forge-mcp/images/variants/tools.ts
@@ -3,38 +3,25 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  images_api_response_common_failure_output,
-  images_api_response_common_output,
-  images_api_response_single_output,
-  images_deleted_response_output,
-  images_messages_output,
+  images_api$$response$$common,
+  images_api$$response$$common$$failure,
+  images_api$$response$$single,
+  images_deleted_response,
+  images_messages,
 } from "../outputs.js";
-import { images_account_identifier } from "../schemas.js";
-import {
-  images_image_variant_definition_output,
-  images_image_variant_fit_output,
-  images_image_variant_height_output,
-  images_image_variant_identifier_output,
-  images_image_variant_list_response_output,
-  images_image_variant_neverRequireSignedURLs_output,
-  images_image_variant_options_output,
-  images_image_variant_public_request_output,
-  images_image_variant_response_output,
-  images_image_variant_schemas_metadata_output,
-  images_image_variant_simple_response_output,
-  images_image_variant_width_output,
-  images_image_variants_response_output,
-} from "./outputs.js";
 import {
   images_image_variant_definition,
-  images_image_variant_fit,
-  images_image_variant_height,
-  images_image_variant_identifier,
-  images_image_variant_neverRequireSignedURLs,
+  images_image_variant_list_response,
   images_image_variant_options,
+  images_image_variant_public_request,
+  images_image_variant_response,
+  images_image_variant_simple_response,
+  images_image_variants_response,
+} from "./outputs.js";
+import {
+  images_image_variant_definition as images_image_variant_definition$,
+  images_image_variant_options as images_image_variant_options$,
   images_image_variant_patch_request,
-  images_image_variant_schemas_metadata,
-  images_image_variant_width,
 } from "./schemas.js";
 
 /**
@@ -44,50 +31,47 @@ export const tools: readonly Tool[] = [
   {
     name: "images_variants_create",
     title: "Create a variant",
-    description: "Create a CF Images variant that allows you to resize images for different use cases.",
+    description: "Create a CF Images variant that allows you to resize images for different use cases.\n\nPOST /accounts/{account_id}/images/v1/variants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/images_image_variant_definition"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_image_variant_definition": images_image_variant_definition,
-        "images_image_variant_fit": images_image_variant_fit,
-        "images_image_variant_height": images_image_variant_height,
-        "images_image_variant_identifier": images_image_variant_identifier,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs,
-        "images_image_variant_options": images_image_variant_options,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata,
-        "images_image_variant_width": images_image_variant_width,
+        "images_image_variant_definition": images_image_variant_definition$,
+        "images_image_variant_options": images_image_variant_options$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_variant_simple_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image_variant_definition": images_image_variant_definition_output,
-        "images_image_variant_fit": images_image_variant_fit_output,
-        "images_image_variant_height": images_image_variant_height_output,
-        "images_image_variant_identifier": images_image_variant_identifier_output,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs_output,
-        "images_image_variant_options": images_image_variant_options_output,
-        "images_image_variant_response": images_image_variant_response_output,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata_output,
-        "images_image_variant_simple_response": images_image_variant_simple_response_output,
-        "images_image_variant_width": images_image_variant_width_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image_variant_definition": images_image_variant_definition,
+        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_response": images_image_variant_response,
+        "images_image_variant_simple_response": images_image_variant_simple_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -121,20 +105,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image_variant_definition": images_image_variant_definition_output,
-        "images_image_variant_fit": images_image_variant_fit_output,
-        "images_image_variant_height": images_image_variant_height_output,
-        "images_image_variant_identifier": images_image_variant_identifier_output,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs_output,
-        "images_image_variant_options": images_image_variant_options_output,
-        "images_image_variant_response": images_image_variant_response_output,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata_output,
-        "images_image_variant_simple_response": images_image_variant_simple_response_output,
-        "images_image_variant_width": images_image_variant_width_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image_variant_definition": images_image_variant_definition,
+        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_response": images_image_variant_response,
+        "images_image_variant_simple_response": images_image_variant_simple_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -145,34 +123,40 @@ export const tools: readonly Tool[] = [
   {
     name: "images_variants_delete",
     title: "Delete a variant",
-    description: "Delete a CF Images variant. This will purge the cache for all images associated with the variant.\n\nConfirm with the user before calling this tool. This operation will delete this variant.",
+    description: "Delete a CF Images variant. This will purge the cache for all images associated with the variant.\n\nConfirm with the user before calling this tool. This operation will delete this variant.\n\nDELETE /accounts/{account_id}/images/v1/variants/{variant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "variant_id": {
-          "$ref": "#/$defs/images_image_variant_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "variant_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "variant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "variant_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_image_variant_identifier": images_image_variant_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_deleted_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_deleted_response": images_deleted_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_deleted_response": images_deleted_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -206,11 +190,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_deleted_response": images_deleted_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_deleted_response": images_deleted_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -220,54 +204,51 @@ export const tools: readonly Tool[] = [
   {
     name: "images_variants_edit",
     title: "Update a variant",
-    description: "Update a CF Images variant. This will purge the cache for all images associated with the variant.",
+    description: "Update a CF Images variant. This will purge the cache for all images associated with the variant.\n\nPATCH /accounts/{account_id}/images/v1/variants/{variant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/images_image_variant_patch_request"
         },
-        "variant_id": {
-          "$ref": "#/$defs/images_image_variant_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "variant_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "variant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "variant_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_image_variant_fit": images_image_variant_fit,
-        "images_image_variant_height": images_image_variant_height,
-        "images_image_variant_identifier": images_image_variant_identifier,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs,
-        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_options": images_image_variant_options$,
         "images_image_variant_patch_request": images_image_variant_patch_request,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata,
-        "images_image_variant_width": images_image_variant_width,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_variant_simple_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image_variant_definition": images_image_variant_definition_output,
-        "images_image_variant_fit": images_image_variant_fit_output,
-        "images_image_variant_height": images_image_variant_height_output,
-        "images_image_variant_identifier": images_image_variant_identifier_output,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs_output,
-        "images_image_variant_options": images_image_variant_options_output,
-        "images_image_variant_response": images_image_variant_response_output,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata_output,
-        "images_image_variant_simple_response": images_image_variant_simple_response_output,
-        "images_image_variant_width": images_image_variant_width_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image_variant_definition": images_image_variant_definition,
+        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_response": images_image_variant_response,
+        "images_image_variant_simple_response": images_image_variant_simple_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -301,20 +282,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image_variant_definition": images_image_variant_definition_output,
-        "images_image_variant_fit": images_image_variant_fit_output,
-        "images_image_variant_height": images_image_variant_height_output,
-        "images_image_variant_identifier": images_image_variant_identifier_output,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs_output,
-        "images_image_variant_options": images_image_variant_options_output,
-        "images_image_variant_response": images_image_variant_response_output,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata_output,
-        "images_image_variant_simple_response": images_image_variant_simple_response_output,
-        "images_image_variant_width": images_image_variant_width_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image_variant_definition": images_image_variant_definition,
+        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_response": images_image_variant_response,
+        "images_image_variant_simple_response": images_image_variant_simple_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -325,43 +300,43 @@ export const tools: readonly Tool[] = [
   {
     name: "images_variants_get",
     title: "Variant details",
-    description: "Fetch details for a CF Images variant.",
+    description: "Fetch details for a CF Images variant.\n\nGET /accounts/{account_id}/images/v1/variants/{variant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "variant_id": {
-          "$ref": "#/$defs/images_image_variant_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "variant_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "variant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "variant_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-        "images_image_variant_identifier": images_image_variant_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_variant_simple_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image_variant_definition": images_image_variant_definition_output,
-        "images_image_variant_fit": images_image_variant_fit_output,
-        "images_image_variant_height": images_image_variant_height_output,
-        "images_image_variant_identifier": images_image_variant_identifier_output,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs_output,
-        "images_image_variant_options": images_image_variant_options_output,
-        "images_image_variant_response": images_image_variant_response_output,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata_output,
-        "images_image_variant_simple_response": images_image_variant_simple_response_output,
-        "images_image_variant_width": images_image_variant_width_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image_variant_definition": images_image_variant_definition,
+        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_response": images_image_variant_response,
+        "images_image_variant_simple_response": images_image_variant_simple_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -396,20 +371,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_api-response-single": images_api_response_single_output,
-        "images_image_variant_definition": images_image_variant_definition_output,
-        "images_image_variant_fit": images_image_variant_fit_output,
-        "images_image_variant_height": images_image_variant_height_output,
-        "images_image_variant_identifier": images_image_variant_identifier_output,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs_output,
-        "images_image_variant_options": images_image_variant_options_output,
-        "images_image_variant_response": images_image_variant_response_output,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata_output,
-        "images_image_variant_simple_response": images_image_variant_simple_response_output,
-        "images_image_variant_width": images_image_variant_width_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_api-response-single": images_api$$response$$single,
+        "images_image_variant_definition": images_image_variant_definition,
+        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_response": images_image_variant_response,
+        "images_image_variant_simple_response": images_image_variant_simple_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
@@ -419,37 +388,38 @@ export const tools: readonly Tool[] = [
   {
     name: "images_variants_list",
     title: "List variants",
-    description: "List existing CF Images variants.",
+    description: "List existing CF Images variants.\n\nGET /accounts/{account_id}/images/v1/variants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/images_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "images_account_identifier": images_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/images_image_variant_list_response",
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_image_variant_fit": images_image_variant_fit_output,
-        "images_image_variant_height": images_image_variant_height_output,
-        "images_image_variant_identifier": images_image_variant_identifier_output,
-        "images_image_variant_list_response": images_image_variant_list_response_output,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs_output,
-        "images_image_variant_options": images_image_variant_options_output,
-        "images_image_variant_public_request": images_image_variant_public_request_output,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata_output,
-        "images_image_variant_width": images_image_variant_width_output,
-        "images_image_variants_response": images_image_variants_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_image_variant_list_response": images_image_variant_list_response,
+        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_public_request": images_image_variant_public_request,
+        "images_image_variants_response": images_image_variants_response,
+        "images_messages": images_messages,
       },
     },
     annotations: {
@@ -484,19 +454,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "images_api-response-common": images_api_response_common_output,
-        "images_api-response-common-failure": images_api_response_common_failure_output,
-        "images_image_variant_fit": images_image_variant_fit_output,
-        "images_image_variant_height": images_image_variant_height_output,
-        "images_image_variant_identifier": images_image_variant_identifier_output,
-        "images_image_variant_list_response": images_image_variant_list_response_output,
-        "images_image_variant_neverRequireSignedURLs": images_image_variant_neverRequireSignedURLs_output,
-        "images_image_variant_options": images_image_variant_options_output,
-        "images_image_variant_public_request": images_image_variant_public_request_output,
-        "images_image_variant_schemas_metadata": images_image_variant_schemas_metadata_output,
-        "images_image_variant_width": images_image_variant_width_output,
-        "images_image_variants_response": images_image_variants_response_output,
-        "images_messages": images_messages_output,
+        "images_api-response-common": images_api$$response$$common,
+        "images_api-response-common-failure": images_api$$response$$common$$failure,
+        "images_image_variant_list_response": images_image_variant_list_response,
+        "images_image_variant_options": images_image_variant_options,
+        "images_image_variant_public_request": images_image_variant_public_request,
+        "images_image_variants_response": images_image_variants_response,
+        "images_messages": images_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/asn/outputs.ts b/src/generated/forge-mcp/intel/asn/outputs.ts
index 257cbbea8..8ca240082 100644
--- a/src/generated/forge-mcp/intel/asn/outputs.ts
+++ b/src/generated/forge-mcp/intel/asn/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `intel_asn` in responses.
- */
-export const intel_asn_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `intel_asn_components-schemas-response` in responses.
  */
-export const intel_asn_components_schemas_response_output: JsonSchema = {
+export const intel_asn_components$$schemas$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_api-response-single"
@@ -21,7 +14,7 @@ export const intel_asn_components_schemas_response_output: JsonSchema = {
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/intel_asn"
+          "type": "integer"
         }
       },
       "type": "object"
diff --git a/src/generated/forge-mcp/intel/asn/schemas.ts b/src/generated/forge-mcp/intel/asn/schemas.ts
deleted file mode 100644
index aa9ab37c8..000000000
--- a/src/generated/forge-mcp/intel/asn/schemas.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `intel_asn`.
- */
-export const intel_asn: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/intel/asn/subnets/outputs.ts b/src/generated/forge-mcp/intel/asn/subnets/outputs.ts
deleted file mode 100644
index 816f0edbd..000000000
--- a/src/generated/forge-mcp/intel/asn/subnets/outputs.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `intel_count` in responses.
- */
-export const intel_count_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `intel_page` in responses.
- */
-export const intel_page_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `intel_per_page` in responses.
- */
-export const intel_per_page_output: JsonSchema = {
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/intel/asn/subnets/tools.ts b/src/generated/forge-mcp/intel/asn/subnets/tools.ts
index 45917a7f3..eb4b02a2d 100644
--- a/src/generated/forge-mcp/intel/asn/subnets/tools.ts
+++ b/src/generated/forge-mcp/intel/asn/subnets/tools.ts
@@ -3,17 +3,9 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  intel_api_response_common_failure_output,
-  intel_messages_output,
+  intel_api$$response$$common$$failure,
+  intel_messages,
 } from "../../outputs.js";
-import { intel_identifier } from "../../schemas.js";
-import { intel_asn_output } from "../outputs.js";
-import { intel_asn } from "../schemas.js";
-import {
-  intel_count_output,
-  intel_page_output,
-  intel_per_page_output,
-} from "./outputs.js";
 
 /**
  * The tools of `intel.asn.subnets`.
@@ -22,43 +14,49 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_asn_subnets_get",
     title: "Get ASN Subnets",
-    description: "Get ASN Subnets.",
+    description: "Get ASN Subnets.\n\nGET /accounts/{account_id}/intel/asn/{asn}/subnets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
-        },
-        "asn": {
-          "$ref": "#/$defs/intel_asn"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "asn": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "asn"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "asn"
+        "path"
       ],
-      $defs: {
-        "intel_asn": intel_asn,
-        "intel_identifier": intel_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
         "asn": {
-          "$ref": "#/$defs/intel_asn"
+          "type": "integer"
         },
         "count": {
-          "$ref": "#/$defs/intel_count"
+          "type": "number"
         },
         "ip_count_total": {
           "type": "integer"
         },
         "page": {
-          "$ref": "#/$defs/intel_page"
+          "type": "number"
         },
         "per_page": {
-          "$ref": "#/$defs/intel_per_page"
+          "type": "number"
         },
         "subnets": {
           "items": {
@@ -68,12 +66,6 @@ export const tools: readonly Tool[] = [
         }
       },
       "type": "object",
-      $defs: {
-        "intel_asn": intel_asn_output,
-        "intel_count": intel_count_output,
-        "intel_page": intel_page_output,
-        "intel_per_page": intel_per_page_output,
-      },
     },
     annotations: {
       "destructiveHint": false,
@@ -95,19 +87,19 @@ export const tools: readonly Tool[] = [
         "200": {
           "properties": {
             "asn": {
-              "$ref": "#/$defs/intel_asn"
+              "type": "integer"
             },
             "count": {
-              "$ref": "#/$defs/intel_count"
+              "type": "number"
             },
             "ip_count_total": {
               "type": "integer"
             },
             "page": {
-              "$ref": "#/$defs/intel_page"
+              "type": "number"
             },
             "per_page": {
-              "$ref": "#/$defs/intel_per_page"
+              "type": "number"
             },
             "subnets": {
               "items": {
@@ -123,19 +115,19 @@ export const tools: readonly Tool[] = [
             {
               "properties": {
                 "asn": {
-                  "$ref": "#/$defs/intel_asn"
+                  "type": "integer"
                 },
                 "count": {
-                  "$ref": "#/$defs/intel_count"
+                  "type": "number"
                 },
                 "ip_count_total": {
                   "type": "integer"
                 },
                 "page": {
-                  "$ref": "#/$defs/intel_page"
+                  "type": "number"
                 },
                 "per_page": {
-                  "$ref": "#/$defs/intel_per_page"
+                  "type": "number"
                 },
                 "subnets": {
                   "items": {
@@ -153,12 +145,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_asn": intel_asn_output,
-        "intel_count": intel_count_output,
-        "intel_messages": intel_messages_output,
-        "intel_page": intel_page_output,
-        "intel_per_page": intel_per_page_output,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_messages": intel_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/asn/tools.ts b/src/generated/forge-mcp/intel/asn/tools.ts
index 6f0206426..5d97778bc 100644
--- a/src/generated/forge-mcp/intel/asn/tools.ts
+++ b/src/generated/forge-mcp/intel/asn/tools.ts
@@ -3,17 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  intel_api_response_common_failure_output,
-  intel_api_response_single_output,
-  intel_messages_output,
-  intel_schemas_messages_output,
+  intel_api$$response$$common$$failure,
+  intel_api$$response$$single,
+  intel_messages,
+  intel_schemas$$messages,
 } from "../outputs.js";
-import { intel_identifier } from "../schemas.js";
-import {
-  intel_asn_components_schemas_response_output,
-  intel_asn_output,
-} from "./outputs.js";
-import { intel_asn } from "./schemas.js";
+import { intel_asn_components$$schemas$$response } from "./outputs.js";
 
 /**
  * The tools of `intel.asn`.
@@ -22,34 +17,39 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_asn_get",
     title: "Get ASN Overview.",
-    description: "Gets an overview of the Autonomous System Number (ASN) and a list of subnets for it.",
+    description: "Gets an overview of the Autonomous System Number (ASN) and a list of subnets for it.\n\nGET /accounts/{account_id}/intel/asn/{asn}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
-        },
-        "asn": {
-          "$ref": "#/$defs/intel_asn"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "asn": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "asn"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "asn"
+        "path"
       ],
-      $defs: {
-        "intel_asn": intel_asn,
-        "intel_identifier": intel_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel_asn_components-schemas-response",
       $defs: {
-        "intel_api-response-single": intel_api_response_single_output,
-        "intel_asn": intel_asn_output,
-        "intel_asn_components-schemas-response": intel_asn_components_schemas_response_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
+        "intel_api-response-single": intel_api$$response$$single,
+        "intel_asn_components-schemas-response": intel_asn_components$$schemas$$response,
+        "intel_schemas-messages": intel_schemas$$messages,
       },
     },
     annotations: {
@@ -84,12 +84,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_api-response-single": intel_api_response_single_output,
-        "intel_asn": intel_asn_output,
-        "intel_asn_components-schemas-response": intel_asn_components_schemas_response_output,
-        "intel_messages": intel_messages_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_api-response-single": intel_api$$response$$single,
+        "intel_asn_components-schemas-response": intel_asn_components$$schemas$$response,
+        "intel_messages": intel_messages,
+        "intel_schemas-messages": intel_schemas$$messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/attackSurfaceReport/issueTypes/tools.ts b/src/generated/forge-mcp/intel/attackSurfaceReport/issueTypes/tools.ts
index ad6f3af86..4059232e4 100644
--- a/src/generated/forge-mcp/intel/attackSurfaceReport/issueTypes/tools.ts
+++ b/src/generated/forge-mcp/intel/attackSurfaceReport/issueTypes/tools.ts
@@ -3,34 +3,40 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../../outputs.js";
-import { security_center_identifier } from "../../../schemas.js";
 
 /**
- * The tools of `intel.attack_surface_report.issue_types`.
+ * The tools of `intel.attackSurfaceReport.issueTypes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "intel_attack_surface_report_issue_types_get",
+    name: "intel_attackSurfaceReport_issueTypes_get",
     title: "Retrieves Security Center Issues Types",
-    description: "Lists all available issue types in Security Center, describing categories of security issues.",
+    description: "Lists all available issue types in Security Center, describing categories of security issues.\n\nGET /accounts/{account_id}/intel/attack-surface-report/issue-types",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -50,8 +56,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -94,9 +100,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/dns/outputs.ts b/src/generated/forge-mcp/intel/dns/outputs.ts
index 5057c89f7..367b9f23c 100644
--- a/src/generated/forge-mcp/intel/dns/outputs.ts
+++ b/src/generated/forge-mcp/intel/dns/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `intel_components-schemas-single_response` in responses.
  */
-export const intel_components_schemas_single_response_output: JsonSchema = {
+export const intel_components$$schemas$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_schemas-api-response-collection"
@@ -25,7 +25,7 @@ export const intel_components_schemas_single_response_output: JsonSchema = {
 /**
  * The schema of `intel_passive-dns-by-ip` in responses.
  */
-export const intel_passive_dns_by_ip_output: JsonSchema = {
+export const intel_passive$$dns$$by$$ip: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -62,7 +62,7 @@ export const intel_passive_dns_by_ip_output: JsonSchema = {
 /**
  * The schema of `intel_schemas-api-response-collection` in responses.
  */
-export const intel_schemas_api_response_collection_output: JsonSchema = {
+export const intel_schemas$$api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_schemas-api-response-common"
@@ -81,7 +81,7 @@ export const intel_schemas_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `intel_schemas-api-response-common` in responses.
  */
-export const intel_schemas_api_response_common_output: JsonSchema = {
+export const intel_schemas$$api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/intel_schemas-messages"
@@ -107,7 +107,7 @@ export const intel_schemas_api_response_common_output: JsonSchema = {
 /**
  * The schema of `intel_schemas-result_info` in responses.
  */
-export const intel_schemas_result_info_output: JsonSchema = {
+export const intel_schemas$$result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
diff --git a/src/generated/forge-mcp/intel/dns/tools.ts b/src/generated/forge-mcp/intel/dns/tools.ts
index cf31e404d..1ab92f5c7 100644
--- a/src/generated/forge-mcp/intel/dns/tools.ts
+++ b/src/generated/forge-mcp/intel/dns/tools.ts
@@ -1,19 +1,18 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  intel_api_response_common_failure_output,
-  intel_messages_output,
-  intel_schemas_messages_output,
+  intel_api$$response$$common$$failure,
+  intel_messages,
+  intel_schemas$$messages,
 } from "../outputs.js";
-import { intel_identifier } from "../schemas.js";
 import {
-  intel_components_schemas_single_response_output,
-  intel_passive_dns_by_ip_output,
-  intel_schemas_api_response_collection_output,
-  intel_schemas_api_response_common_output,
-  intel_schemas_result_info_output,
+  intel_components$$schemas$$single_response,
+  intel_passive$$dns$$by$$ip,
+  intel_schemas$$api$$response$$collection,
+  intel_schemas$$api$$response$$common,
+  intel_schemas$$result_info,
 } from "./outputs.js";
 import { intel_start_end_params } from "./schemas.js";
 
@@ -24,46 +23,61 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_dns_list",
     title: "Get Passive DNS by IP",
-    description: "Gets a list of all the domains that have resolved to a specific IP address.",
+    description: "Gets a list of all the domains that have resolved to a specific IP address.\n\nGET /accounts/{account_id}/intel/dns",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
-        },
-        "ipv4": {
-          "type": "string"
-        },
-        "page": {
-          "description": "Requested page within paginated list of results.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Maximum number of results requested.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "start_end_params": {
-          "$ref": "#/$defs/intel_start_end_params"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "ipv4": {
+              "type": "string"
+            },
+            "page": {
+              "description": "Requested page within paginated list of results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Maximum number of results requested.",
+              "type": "number"
+            },
+            "start_end_params": {
+              "$ref": "#/$defs/intel_start_end_params"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "intel_identifier": intel_identifier,
         "intel_start_end_params": intel_start_end_params,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/intel_components-schemas-single_response",
       $defs: {
-        "intel_components-schemas-single_response": intel_components_schemas_single_response_output,
-        "intel_passive-dns-by-ip": intel_passive_dns_by_ip_output,
-        "intel_schemas-api-response-collection": intel_schemas_api_response_collection_output,
-        "intel_schemas-api-response-common": intel_schemas_api_response_common_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
-        "intel_schemas-result_info": intel_schemas_result_info_output,
+        "intel_components-schemas-single_response": intel_components$$schemas$$single_response,
+        "intel_passive-dns-by-ip": intel_passive$$dns$$by$$ip,
+        "intel_schemas-api-response-collection": intel_schemas$$api$$response$$collection,
+        "intel_schemas-api-response-common": intel_schemas$$api$$response$$common,
+        "intel_schemas-messages": intel_schemas$$messages,
+        "intel_schemas-result_info": intel_schemas$$result_info,
       },
     },
     annotations: {
@@ -98,23 +112,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_components-schemas-single_response": intel_components_schemas_single_response_output,
-        "intel_messages": intel_messages_output,
-        "intel_passive-dns-by-ip": intel_passive_dns_by_ip_output,
-        "intel_schemas-api-response-collection": intel_schemas_api_response_collection_output,
-        "intel_schemas-api-response-common": intel_schemas_api_response_common_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
-        "intel_schemas-result_info": intel_schemas_result_info_output,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_components-schemas-single_response": intel_components$$schemas$$single_response,
+        "intel_messages": intel_messages,
+        "intel_passive-dns-by-ip": intel_passive$$dns$$by$$ip,
+        "intel_schemas-api-response-collection": intel_schemas$$api$$response$$collection,
+        "intel_schemas-api-response-common": intel_schemas$$api$$response$$common,
+        "intel_schemas-messages": intel_schemas$$messages,
+        "intel_schemas-result_info": intel_schemas$$result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/intel/dns`,
       query: [
-        ["start_end_params", args["start_end_params"], true],
-        ["ipv4", args["ipv4"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["start_end_params", param(args, "query", "start_end_params"), true],
+        ["ipv4", param(args, "query", "ipv4"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/intel/domainHistory/outputs.ts b/src/generated/forge-mcp/intel/domainHistory/outputs.ts
index f9bf12c45..1ba8c4459 100644
--- a/src/generated/forge-mcp/intel/domainHistory/outputs.ts
+++ b/src/generated/forge-mcp/intel/domainHistory/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `intel_domain-history` in responses.
  */
-export const intel_domain_history_output: JsonSchema = {
+export const intel_domain$$history: JsonSchema = {
   "properties": {
     "categorizations": {
       "items": {
@@ -39,7 +39,7 @@ export const intel_domain_history_output: JsonSchema = {
       "type": "array"
     },
     "domain": {
-      "$ref": "#/$defs/intel_domain_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -48,7 +48,7 @@ export const intel_domain_history_output: JsonSchema = {
 /**
  * The schema of `intel_response` in responses.
  */
-export const intel_response_output: JsonSchema = {
+export const intel_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_api-response-collection"
diff --git a/src/generated/forge-mcp/intel/domainHistory/tools.ts b/src/generated/forge-mcp/intel/domainHistory/tools.ts
index 6245b7ef1..2d1d50e0d 100644
--- a/src/generated/forge-mcp/intel/domainHistory/tools.ts
+++ b/src/generated/forge-mcp/intel/domainHistory/tools.ts
@@ -1,57 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  intel_api_response_collection_output,
-  intel_api_response_common_failure_output,
-  intel_api_response_common_output,
-  intel_domain_name_output,
-  intel_messages_output,
-  intel_result_info_output,
+  intel_api$$response$$collection,
+  intel_api$$response$$common,
+  intel_api$$response$$common$$failure,
+  intel_messages,
+  intel_result_info,
 } from "../outputs.js";
-import { intel_identifier } from "../schemas.js";
-import {
-  intel_domain_history_output,
-  intel_response_output,
-} from "./outputs.js";
+import { intel_domain$$history, intel_response } from "./outputs.js";
 
 /**
- * The tools of `intel.domain_history`.
+ * The tools of `intel.domainHistory`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "intel_domain_history_get",
+    name: "intel_domainHistory_get",
     title: "Get Domain History",
-    description: "Gets historical security threat and content categories currently and previously assigned to a domain.",
+    description: "Gets historical security threat and content categories currently and previously assigned to a domain.\n\nGET /accounts/{account_id}/intel/domain-history",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "domain": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "domain": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "intel_identifier": intel_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel_response",
       $defs: {
-        "intel_api-response-collection": intel_api_response_collection_output,
-        "intel_api-response-common": intel_api_response_common_output,
-        "intel_domain-history": intel_domain_history_output,
-        "intel_domain_name": intel_domain_name_output,
-        "intel_messages": intel_messages_output,
-        "intel_response": intel_response_output,
-        "intel_result_info": intel_result_info_output,
+        "intel_api-response-collection": intel_api$$response$$collection,
+        "intel_api-response-common": intel_api$$response$$common,
+        "intel_domain-history": intel_domain$$history,
+        "intel_messages": intel_messages,
+        "intel_response": intel_response,
+        "intel_result_info": intel_result_info,
       },
     },
     annotations: {
@@ -86,20 +93,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_api-response-collection": intel_api_response_collection_output,
-        "intel_api-response-common": intel_api_response_common_output,
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_domain-history": intel_domain_history_output,
-        "intel_domain_name": intel_domain_name_output,
-        "intel_messages": intel_messages_output,
-        "intel_response": intel_response_output,
-        "intel_result_info": intel_result_info_output,
+        "intel_api-response-collection": intel_api$$response$$collection,
+        "intel_api-response-common": intel_api$$response$$common,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_domain-history": intel_domain$$history,
+        "intel_messages": intel_messages,
+        "intel_response": intel_response,
+        "intel_result_info": intel_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/intel/domain-history`,
       query: [
-        ["domain", args["domain"], true],
+        ["domain", param(args, "query", "domain"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/intel/domains/bulks/outputs.ts b/src/generated/forge-mcp/intel/domains/bulks/outputs.ts
index 1e36281da..6e5518f72 100644
--- a/src/generated/forge-mcp/intel/domains/bulks/outputs.ts
+++ b/src/generated/forge-mcp/intel/domains/bulks/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `intel_collection_response` in responses.
  */
-export const intel_collection_response_output: JsonSchema = {
+export const intel_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_api-response-collection"
@@ -26,22 +26,22 @@ export const intel_collection_response_output: JsonSchema = {
                 "$ref": "#/$defs/intel_content_categories"
               },
               "domain": {
-                "$ref": "#/$defs/intel_domain_name"
+                "type": "string"
               },
               "inherited_content_categories": {
                 "$ref": "#/$defs/intel_categories_with_super_category_ids_example_empty"
               },
               "inherited_from": {
-                "$ref": "#/$defs/intel_inherited_from"
+                "type": "string"
               },
               "inherited_risk_types": {
                 "$ref": "#/$defs/intel_categories_with_super_category_ids_example_empty"
               },
               "popularity_rank": {
-                "$ref": "#/$defs/intel_popularity_rank"
+                "type": "integer"
               },
               "risk_score": {
-                "$ref": "#/$defs/intel_risk_score"
+                "type": "number"
               },
               "risk_types": {
                 "$ref": "#/$defs/intel_categories_with_super_category_ids_example_empty"
diff --git a/src/generated/forge-mcp/intel/domains/bulks/tools.ts b/src/generated/forge-mcp/intel/domains/bulks/tools.ts
index c5b670cee..f7ccdcbc4 100644
--- a/src/generated/forge-mcp/intel/domains/bulks/tools.ts
+++ b/src/generated/forge-mcp/intel/domains/bulks/tools.ts
@@ -1,27 +1,22 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  intel_api_response_collection_output,
-  intel_api_response_common_failure_output,
-  intel_api_response_common_output,
-  intel_domain_name_output,
-  intel_messages_output,
-  intel_result_info_output,
+  intel_api$$response$$collection,
+  intel_api$$response$$common,
+  intel_api$$response$$common$$failure,
+  intel_messages,
+  intel_result_info,
 } from "../../outputs.js";
-import { intel_identifier } from "../../schemas.js";
 import {
-  intel_additional_information_output,
-  intel_application_output,
-  intel_categories_with_super_category_ids_example_empty_output,
-  intel_category_with_super_category_id_output,
-  intel_content_categories_output,
-  intel_inherited_from_output,
-  intel_popularity_rank_output,
-  intel_risk_score_output,
+  intel_additional_information,
+  intel_application,
+  intel_categories_with_super_category_ids_example_empty,
+  intel_category_with_super_category_id,
+  intel_content_categories,
 } from "../outputs.js";
-import { intel_collection_response_output } from "./outputs.js";
+import { intel_collection_response } from "./outputs.js";
 
 /**
  * The tools of `intel.domains.bulks`.
@@ -30,56 +25,65 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_domains_bulks_get",
     title: "Get Multiple Domain Details",
-    description: "Returns security details and statistics about multiple domains in a\nsingle request.\n\n**Behavior change — domain ranking is becoming opt-in.** This endpoint\npreviously included domain ranking data in every response and accepted\na `skip_ranking=true` query parameter to opt out. That parameter is\nbeing deprecated and ranking will no longer be returned by default.\nCallers that want ranking data must pass `include_ranking=true`. The\n`skip_ranking` parameter will be silently ignored once the change ships.",
+    description: "Returns security details and statistics about multiple domains in a\nsingle request.\n\n**Behavior change — domain ranking is becoming opt-in.** This endpoint\npreviously included domain ranking data in every response and accepted\na `skip_ranking=true` query parameter to opt out. That parameter is\nbeing deprecated and ranking will no longer be returned by default.\nCallers that want ranking data must pass `include_ranking=true`. The\n`skip_ranking` parameter will be silently ignored once the change ships.\n\nGET /accounts/{account_id}/intel/domain/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
-        },
-        "domain": {
-          "description": "Accepts multiple values like `?domain=cloudflare.com&domain=example.com`.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "include_ranking": {
-          "default": false,
-          "description": "Whether to include domain ranking data in the response. Defaults to\n`false` — ranking lookups are expensive at bulk scale and most\ncallers do not need them. Set to `true` to opt in. This parameter\nreplaces the deprecated `skip_ranking` (see below).\n",
-          "type": "boolean"
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "skip_ranking": {
-          "deprecated": true,
-          "description": "**Deprecated.** Previously controlled whether the ranking lookup\nwas skipped (defaulted to `false`, meaning ranking ran). The\nendpoint's default behavior is being flipped — ranking is now\nopt-in via `include_ranking=true` — and this parameter will be\nsilently ignored. Remove it from your callers and use\n`include_ranking` instead.\n",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "domain": {
+              "description": "Accepts multiple values like `?domain=cloudflare.com&domain=example.com`.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "include_ranking": {
+              "default": false,
+              "description": "Whether to include domain ranking data in the response. Defaults to\n`false` — ranking lookups are expensive at bulk scale and most\ncallers do not need them. Set to `true` to opt in. This parameter\nreplaces the deprecated `skip_ranking` (see below).",
+              "type": "boolean"
+            },
+            "skip_ranking": {
+              "deprecated": true,
+              "description": "**Deprecated.** Previously controlled whether the ranking lookup\nwas skipped (defaulted to `false`, meaning ranking ran). The\nendpoint's default behavior is being flipped — ranking is now\nopt-in via `include_ranking=true` — and this parameter will be\nsilently ignored. Remove it from your callers and use\n`include_ranking` instead.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "intel_identifier": intel_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel_collection_response",
       $defs: {
-        "intel_additional_information": intel_additional_information_output,
-        "intel_api-response-collection": intel_api_response_collection_output,
-        "intel_api-response-common": intel_api_response_common_output,
-        "intel_application": intel_application_output,
-        "intel_categories_with_super_category_ids_example_empty": intel_categories_with_super_category_ids_example_empty_output,
-        "intel_category_with_super_category_id": intel_category_with_super_category_id_output,
-        "intel_collection_response": intel_collection_response_output,
-        "intel_content_categories": intel_content_categories_output,
-        "intel_domain_name": intel_domain_name_output,
-        "intel_inherited_from": intel_inherited_from_output,
-        "intel_messages": intel_messages_output,
-        "intel_popularity_rank": intel_popularity_rank_output,
-        "intel_result_info": intel_result_info_output,
-        "intel_risk_score": intel_risk_score_output,
+        "intel_additional_information": intel_additional_information,
+        "intel_api-response-collection": intel_api$$response$$collection,
+        "intel_api-response-common": intel_api$$response$$common,
+        "intel_application": intel_application,
+        "intel_categories_with_super_category_ids_example_empty": intel_categories_with_super_category_ids_example_empty,
+        "intel_category_with_super_category_id": intel_category_with_super_category_id,
+        "intel_collection_response": intel_collection_response,
+        "intel_content_categories": intel_content_categories,
+        "intel_messages": intel_messages,
+        "intel_result_info": intel_result_info,
       },
     },
     annotations: {
@@ -114,29 +118,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_additional_information": intel_additional_information_output,
-        "intel_api-response-collection": intel_api_response_collection_output,
-        "intel_api-response-common": intel_api_response_common_output,
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_application": intel_application_output,
-        "intel_categories_with_super_category_ids_example_empty": intel_categories_with_super_category_ids_example_empty_output,
-        "intel_category_with_super_category_id": intel_category_with_super_category_id_output,
-        "intel_collection_response": intel_collection_response_output,
-        "intel_content_categories": intel_content_categories_output,
-        "intel_domain_name": intel_domain_name_output,
-        "intel_inherited_from": intel_inherited_from_output,
-        "intel_messages": intel_messages_output,
-        "intel_popularity_rank": intel_popularity_rank_output,
-        "intel_result_info": intel_result_info_output,
-        "intel_risk_score": intel_risk_score_output,
+        "intel_additional_information": intel_additional_information,
+        "intel_api-response-collection": intel_api$$response$$collection,
+        "intel_api-response-common": intel_api$$response$$common,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_application": intel_application,
+        "intel_categories_with_super_category_ids_example_empty": intel_categories_with_super_category_ids_example_empty,
+        "intel_category_with_super_category_id": intel_category_with_super_category_id,
+        "intel_collection_response": intel_collection_response,
+        "intel_content_categories": intel_content_categories,
+        "intel_messages": intel_messages,
+        "intel_result_info": intel_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/intel/domain/bulk`,
       query: [
-        ["domain", args["domain"], true],
-        ["include_ranking", args["include_ranking"], true],
-        ["skip_ranking", args["skip_ranking"], true],
+        ["domain", param(args, "query", "domain"), true],
+        ["include_ranking", param(args, "query", "include_ranking"), true],
+        ["skip_ranking", param(args, "query", "skip_ranking"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/intel/domains/outputs.ts b/src/generated/forge-mcp/intel/domains/outputs.ts
index 33b3cbb94..ee44bdda6 100644
--- a/src/generated/forge-mcp/intel/domains/outputs.ts
+++ b/src/generated/forge-mcp/intel/domains/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `intel_additional_information` in responses.
  */
-export const intel_additional_information_output: JsonSchema = {
+export const intel_additional_information: JsonSchema = {
   "properties": {
     "suspected_malware_family": {
       "type": "string"
@@ -18,7 +18,7 @@ export const intel_additional_information_output: JsonSchema = {
 /**
  * The schema of `intel_application` in responses.
  */
-export const intel_application_output: JsonSchema = {
+export const intel_application: JsonSchema = {
   "properties": {
     "id": {
       "type": "integer"
@@ -34,7 +34,7 @@ export const intel_application_output: JsonSchema = {
  * The schema of `intel_categories_with_super_category_ids_example_empty` in
  * responses.
  */
-export const intel_categories_with_super_category_ids_example_empty_output: JsonSchema = {
+export const intel_categories_with_super_category_ids_example_empty: JsonSchema = {
   "items": {
     "$ref": "#/$defs/intel_category_with_super_category_id"
   },
@@ -44,7 +44,7 @@ export const intel_categories_with_super_category_ids_example_empty_output: Json
 /**
  * The schema of `intel_category_with_super_category_id` in responses.
  */
-export const intel_category_with_super_category_id_output: JsonSchema = {
+export const intel_category_with_super_category_id: JsonSchema = {
   "properties": {
     "id": {
       "type": "integer"
@@ -62,7 +62,7 @@ export const intel_category_with_super_category_id_output: JsonSchema = {
 /**
  * The schema of `intel_content_categories` in responses.
  */
-export const intel_content_categories_output: JsonSchema = {
+export const intel_content_categories: JsonSchema = {
   "items": {
     "properties": {
       "id": {
@@ -83,7 +83,7 @@ export const intel_content_categories_output: JsonSchema = {
 /**
  * The schema of `intel_domain` in responses.
  */
-export const intel_domain_output: JsonSchema = {
+export const intel_domain: JsonSchema = {
   "properties": {
     "additional_information": {
       "$ref": "#/$defs/intel_additional_information"
@@ -95,25 +95,25 @@ export const intel_domain_output: JsonSchema = {
       "$ref": "#/$defs/intel_content_categories"
     },
     "domain": {
-      "$ref": "#/$defs/intel_domain_name"
+      "type": "string"
     },
     "inherited_content_categories": {
       "$ref": "#/$defs/intel_categories_with_super_category_ids_example_empty"
     },
     "inherited_from": {
-      "$ref": "#/$defs/intel_inherited_from"
+      "type": "string"
     },
     "inherited_risk_types": {
       "$ref": "#/$defs/intel_categories_with_super_category_ids_example_empty"
     },
     "popularity_rank": {
-      "$ref": "#/$defs/intel_popularity_rank"
+      "type": "integer"
     },
     "resolves_to_refs": {
       "$ref": "#/$defs/intel_resolves_to_refs"
     },
     "risk_score": {
-      "$ref": "#/$defs/intel_risk_score"
+      "type": "number"
     },
     "risk_types": {
       "$ref": "#/$defs/intel_categories_with_super_category_ids_example_empty"
@@ -122,27 +122,13 @@ export const intel_domain_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `intel_inherited_from` in responses.
- */
-export const intel_inherited_from_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `intel_popularity_rank` in responses.
- */
-export const intel_popularity_rank_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `intel_resolves_to_ref` in responses.
  */
-export const intel_resolves_to_ref_output: JsonSchema = {
+export const intel_resolves_to_ref: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/intel_stix_identifier"
+      "type": "string"
     },
     "value": {
       "type": "string"
@@ -154,24 +140,17 @@ export const intel_resolves_to_ref_output: JsonSchema = {
 /**
  * The schema of `intel_resolves_to_refs` in responses.
  */
-export const intel_resolves_to_refs_output: JsonSchema = {
+export const intel_resolves_to_refs: JsonSchema = {
   "items": {
     "$ref": "#/$defs/intel_resolves_to_ref"
   },
   "type": "array"
 };
 
-/**
- * The schema of `intel_risk_score` in responses.
- */
-export const intel_risk_score_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `intel_single_response` in responses.
  */
-export const intel_single_response_output: JsonSchema = {
+export const intel_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_api-response-single"
@@ -186,10 +165,3 @@ export const intel_single_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `intel_stix_identifier` in responses.
- */
-export const intel_stix_identifier_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/intel/domains/tools.ts b/src/generated/forge-mcp/intel/domains/tools.ts
index c2c265263..7322376b9 100644
--- a/src/generated/forge-mcp/intel/domains/tools.ts
+++ b/src/generated/forge-mcp/intel/domains/tools.ts
@@ -1,29 +1,23 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  intel_api_response_common_failure_output,
-  intel_api_response_single_output,
-  intel_domain_name_output,
-  intel_messages_output,
-  intel_schemas_messages_output,
+  intel_api$$response$$common$$failure,
+  intel_api$$response$$single,
+  intel_messages,
+  intel_schemas$$messages,
 } from "../outputs.js";
-import { intel_identifier } from "../schemas.js";
 import {
-  intel_additional_information_output,
-  intel_application_output,
-  intel_categories_with_super_category_ids_example_empty_output,
-  intel_category_with_super_category_id_output,
-  intel_content_categories_output,
-  intel_domain_output,
-  intel_inherited_from_output,
-  intel_popularity_rank_output,
-  intel_resolves_to_ref_output,
-  intel_resolves_to_refs_output,
-  intel_risk_score_output,
-  intel_single_response_output,
-  intel_stix_identifier_output,
+  intel_additional_information,
+  intel_application,
+  intel_categories_with_super_category_ids_example_empty,
+  intel_category_with_super_category_id,
+  intel_content_categories,
+  intel_domain,
+  intel_resolves_to_ref,
+  intel_resolves_to_refs,
+  intel_single_response,
 } from "./outputs.js";
 
 /**
@@ -33,53 +27,61 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_domains_get",
     title: "Get Domain Details",
-    description: "Gets security details and statistics about a domain.",
+    description: "Gets security details and statistics about a domain.\n\nGET /accounts/{account_id}/intel/domain",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
-        },
-        "domain": {
-          "type": "string"
-        },
-        "skip_dns": {
-          "description": "Skip DNS resolution lookups for faster response.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "skip_ranking": {
-          "default": false,
-          "description": "Skip the domain ranking lookup for faster responses. Defaults to\n`false` (ranking is included). Set to `true` to opt out — primarily\nused by callers like Cloudflare Radar that need to avoid a\ncircular dependency when building the domain details page.\nNote: the bulk endpoint (`/intel/domain/bulk`) uses opposite\ndefaults — see `include_ranking` there.\n",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "domain": {
+              "type": "string"
+            },
+            "skip_dns": {
+              "description": "Skip DNS resolution lookups for faster response.",
+              "type": "boolean"
+            },
+            "skip_ranking": {
+              "default": false,
+              "description": "Skip the domain ranking lookup for faster responses. Defaults to\n`false` (ranking is included). Set to `true` to opt out — primarily\nused by callers like Cloudflare Radar that need to avoid a\ncircular dependency when building the domain details page.\nNote: the bulk endpoint (`/intel/domain/bulk`) uses opposite\ndefaults — see `include_ranking` there.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "intel_identifier": intel_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel_single_response",
       $defs: {
-        "intel_additional_information": intel_additional_information_output,
-        "intel_api-response-single": intel_api_response_single_output,
-        "intel_application": intel_application_output,
-        "intel_categories_with_super_category_ids_example_empty": intel_categories_with_super_category_ids_example_empty_output,
-        "intel_category_with_super_category_id": intel_category_with_super_category_id_output,
-        "intel_content_categories": intel_content_categories_output,
-        "intel_domain": intel_domain_output,
-        "intel_domain_name": intel_domain_name_output,
-        "intel_inherited_from": intel_inherited_from_output,
-        "intel_popularity_rank": intel_popularity_rank_output,
-        "intel_resolves_to_ref": intel_resolves_to_ref_output,
-        "intel_resolves_to_refs": intel_resolves_to_refs_output,
-        "intel_risk_score": intel_risk_score_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
-        "intel_single_response": intel_single_response_output,
-        "intel_stix_identifier": intel_stix_identifier_output,
+        "intel_additional_information": intel_additional_information,
+        "intel_api-response-single": intel_api$$response$$single,
+        "intel_application": intel_application,
+        "intel_categories_with_super_category_ids_example_empty": intel_categories_with_super_category_ids_example_empty,
+        "intel_category_with_super_category_id": intel_category_with_super_category_id,
+        "intel_content_categories": intel_content_categories,
+        "intel_domain": intel_domain,
+        "intel_resolves_to_ref": intel_resolves_to_ref,
+        "intel_resolves_to_refs": intel_resolves_to_refs,
+        "intel_schemas-messages": intel_schemas$$messages,
+        "intel_single_response": intel_single_response,
       },
     },
     annotations: {
@@ -114,32 +116,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_additional_information": intel_additional_information_output,
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_api-response-single": intel_api_response_single_output,
-        "intel_application": intel_application_output,
-        "intel_categories_with_super_category_ids_example_empty": intel_categories_with_super_category_ids_example_empty_output,
-        "intel_category_with_super_category_id": intel_category_with_super_category_id_output,
-        "intel_content_categories": intel_content_categories_output,
-        "intel_domain": intel_domain_output,
-        "intel_domain_name": intel_domain_name_output,
-        "intel_inherited_from": intel_inherited_from_output,
-        "intel_messages": intel_messages_output,
-        "intel_popularity_rank": intel_popularity_rank_output,
-        "intel_resolves_to_ref": intel_resolves_to_ref_output,
-        "intel_resolves_to_refs": intel_resolves_to_refs_output,
-        "intel_risk_score": intel_risk_score_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
-        "intel_single_response": intel_single_response_output,
-        "intel_stix_identifier": intel_stix_identifier_output,
+        "intel_additional_information": intel_additional_information,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_api-response-single": intel_api$$response$$single,
+        "intel_application": intel_application,
+        "intel_categories_with_super_category_ids_example_empty": intel_categories_with_super_category_ids_example_empty,
+        "intel_category_with_super_category_id": intel_category_with_super_category_id,
+        "intel_content_categories": intel_content_categories,
+        "intel_domain": intel_domain,
+        "intel_messages": intel_messages,
+        "intel_resolves_to_ref": intel_resolves_to_ref,
+        "intel_resolves_to_refs": intel_resolves_to_refs,
+        "intel_schemas-messages": intel_schemas$$messages,
+        "intel_single_response": intel_single_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/intel/domain`,
       query: [
-        ["domain", args["domain"], true],
-        ["skip_dns", args["skip_dns"], true],
-        ["skip_ranking", args["skip_ranking"], true],
+        ["domain", param(args, "query", "domain"), true],
+        ["skip_dns", param(args, "query", "skip_dns"), true],
+        ["skip_ranking", param(args, "query", "skip_ranking"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/downloads/tools.ts b/src/generated/forge-mcp/intel/indicatorFeeds/downloads/tools.ts
index 3b5fe8e63..bb25480c2 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/downloads/tools.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/downloads/tools.ts
@@ -3,54 +3,56 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  custom_indicator_feeds_api_response_common_failure_output,
-  custom_indicator_feeds_api_response_single_output,
-  custom_indicator_feeds_messages_2_output,
-  custom_indicator_feeds_messages_output,
-  custom_indicator_feeds_update_feed_output,
-  custom_indicator_feeds_update_feed_response_output,
+  custom$$indicator$$feeds_api$$response$$single,
+  custom$$indicator$$feeds_api_response_common_failure,
+  custom$$indicator$$feeds_messages,
+  custom$$indicator$$feeds_messages$$2,
+  custom$$indicator$$feeds_update_feed,
+  custom$$indicator$$feeds_update_feed_response,
 } from "../outputs.js";
-import {
-  custom_indicator_feeds_feed_id,
-  custom_indicator_feeds_identifier,
-} from "../schemas.js";
 
 /**
- * The tools of `intel.indicator_feeds.downloads`.
+ * The tools of `intel.indicatorFeeds.downloads`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "intel_indicator_feeds_downloads_get",
+    name: "intel_indicatorFeeds_downloads_get",
     title: "Download indicator feed data",
-    description: "Downloads the content of a custom threat indicator feed.",
+    description: "Downloads the content of a custom threat indicator feed.\n\nGET /accounts/{account_id}/intel/indicator-feeds/{feed_id}/download",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
-        "feed_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_feed_id",
-          "description": "Indicator feed ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "Indicator feed ID",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id"
+        "path"
       ],
-      $defs: {
-        "custom-indicator-feeds_feed_id": custom_indicator_feeds_feed_id,
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_update_feed_response",
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_update_feed": custom_indicator_feeds_update_feed_output,
-        "custom-indicator-feeds_update_feed_response": custom_indicator_feeds_update_feed_response_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_update_feed": custom$$indicator$$feeds_update_feed,
+        "custom-indicator-feeds_update_feed_response": custom$$indicator$$feeds_update_feed_response,
       },
     },
     annotations: {
@@ -78,12 +80,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_update_feed": custom_indicator_feeds_update_feed_output,
-        "custom-indicator-feeds_update_feed_response": custom_indicator_feeds_update_feed_response_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_update_feed": custom$$indicator$$feeds_update_feed,
+        "custom-indicator-feeds_update_feed_response": custom$$indicator$$feeds_update_feed_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/outputs.ts b/src/generated/forge-mcp/intel/indicatorFeeds/outputs.ts
index 37429da0f..94c99fd68 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/outputs.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `custom-indicator-feeds_api-response-common` in responses.
  */
-export const custom_indicator_feeds_api_response_common_output: JsonSchema = {
+export const custom$$indicator$$feeds_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/custom-indicator-feeds_messages-2"
@@ -32,7 +32,7 @@ export const custom_indicator_feeds_api_response_common_output: JsonSchema = {
 /**
  * The schema of `custom-indicator-feeds_api-response-single` in responses.
  */
-export const custom_indicator_feeds_api_response_single_output: JsonSchema = {
+export const custom$$indicator$$feeds_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/custom-indicator-feeds_messages-2"
@@ -59,7 +59,7 @@ export const custom_indicator_feeds_api_response_single_output: JsonSchema = {
  * The schema of `custom-indicator-feeds_api_response_common_failure` in
  * responses.
  */
-export const custom_indicator_feeds_api_response_common_failure_output: JsonSchema = {
+export const custom$$indicator$$feeds_api_response_common_failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/custom-indicator-feeds_messages"
@@ -89,7 +89,7 @@ export const custom_indicator_feeds_api_response_common_failure_output: JsonSche
 /**
  * The schema of `custom-indicator-feeds_create_feed_response` in responses.
  */
-export const custom_indicator_feeds_create_feed_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_create_feed_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-single"
@@ -105,57 +105,36 @@ export const custom_indicator_feeds_create_feed_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `custom-indicator-feeds_description` in responses.
- */
-export const custom_indicator_feeds_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `custom-indicator-feeds_feed_id` in responses.
- */
-export const custom_indicator_feeds_feed_id_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `custom-indicator-feeds_id` in responses.
- */
-export const custom_indicator_feeds_id_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `custom-indicator-feeds_indicator_feed_item` in responses.
  */
-export const custom_indicator_feeds_indicator_feed_item_output: JsonSchema = {
+export const custom$$indicator$$feeds_indicator_feed_item: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
       "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/custom-indicator-feeds_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/custom-indicator-feeds_id"
+      "type": "integer"
     },
     "is_attributable": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_attributable"
+      "type": "boolean"
     },
     "is_downloadable": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_downloadable"
+      "type": "boolean"
     },
     "is_public": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_public"
+      "type": "boolean"
     },
     "modified_on": {
       "format": "date-time",
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/custom-indicator-feeds_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -164,26 +143,26 @@ export const custom_indicator_feeds_indicator_feed_item_output: JsonSchema = {
 /**
  * The schema of `custom-indicator-feeds_indicator_feed_metadata` in responses.
  */
-export const custom_indicator_feeds_indicator_feed_metadata_output: JsonSchema = {
+export const custom$$indicator$$feeds_indicator_feed_metadata: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
       "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/custom-indicator-feeds_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/custom-indicator-feeds_id"
+      "type": "integer"
     },
     "is_attributable": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_attributable"
+      "type": "boolean"
     },
     "is_downloadable": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_downloadable"
+      "type": "boolean"
     },
     "is_public": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_public"
+      "type": "boolean"
     },
     "last_upload_summary": {
       "$ref": "#/$defs/custom-indicator-feeds_last_upload_summary"
@@ -207,13 +186,13 @@ export const custom_indicator_feeds_indicator_feed_metadata_output: JsonSchema =
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/custom-indicator-feeds_name"
+      "type": "string"
     },
     "provider_id": {
-      "$ref": "#/$defs/custom-indicator-feeds_provider_id"
+      "type": "integer"
     },
     "provider_name": {
-      "$ref": "#/$defs/custom-indicator-feeds_provider_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -223,7 +202,7 @@ export const custom_indicator_feeds_indicator_feed_metadata_output: JsonSchema =
  * The schema of `custom-indicator-feeds_indicator_feed_metadata_response` in
  * responses.
  */
-export const custom_indicator_feeds_indicator_feed_metadata_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_indicator_feed_metadata_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-single"
@@ -242,7 +221,7 @@ export const custom_indicator_feeds_indicator_feed_metadata_response_output: Jso
 /**
  * The schema of `custom-indicator-feeds_indicator_feed_response` in responses.
  */
-export const custom_indicator_feeds_indicator_feed_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_indicator_feed_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-common"
@@ -261,31 +240,10 @@ export const custom_indicator_feeds_indicator_feed_response_output: JsonSchema =
   ]
 };
 
-/**
- * The schema of `custom-indicator-feeds_is_attributable` in responses.
- */
-export const custom_indicator_feeds_is_attributable_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `custom-indicator-feeds_is_downloadable` in responses.
- */
-export const custom_indicator_feeds_is_downloadable_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `custom-indicator-feeds_is_public` in responses.
- */
-export const custom_indicator_feeds_is_public_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `custom-indicator-feeds_last_upload_summary` in responses.
  */
-export const custom_indicator_feeds_last_upload_summary_output: JsonSchema = {
+export const custom$$indicator$$feeds_last_upload_summary: JsonSchema = {
   "properties": {
     "persisted": {
       "properties": {
@@ -345,7 +303,7 @@ export const custom_indicator_feeds_last_upload_summary_output: JsonSchema = {
 /**
  * The schema of `custom-indicator-feeds_messages` in responses.
  */
-export const custom_indicator_feeds_messages_output: JsonSchema = {
+export const custom$$indicator$$feeds_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -367,7 +325,7 @@ export const custom_indicator_feeds_messages_output: JsonSchema = {
 /**
  * The schema of `custom-indicator-feeds_messages-2` in responses.
  */
-export const custom_indicator_feeds_messages_2_output: JsonSchema = {
+export const custom$$indicator$$feeds_messages$$2: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -397,31 +355,10 @@ export const custom_indicator_feeds_messages_2_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `custom-indicator-feeds_name` in responses.
- */
-export const custom_indicator_feeds_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `custom-indicator-feeds_provider_id` in responses.
- */
-export const custom_indicator_feeds_provider_id_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `custom-indicator-feeds_provider_name` in responses.
- */
-export const custom_indicator_feeds_provider_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `custom-indicator-feeds_update_feed` in responses.
  */
-export const custom_indicator_feeds_update_feed_output: JsonSchema = {
+export const custom$$indicator$$feeds_update_feed: JsonSchema = {
   "properties": {
     "file_id": {
       "type": "integer"
@@ -445,7 +382,7 @@ export const custom_indicator_feeds_update_feed_output: JsonSchema = {
 /**
  * The schema of `custom-indicator-feeds_update_feed_response` in responses.
  */
-export const custom_indicator_feeds_update_feed_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_update_feed_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-single"
@@ -465,7 +402,7 @@ export const custom_indicator_feeds_update_feed_response_output: JsonSchema = {
  * The schema of `custom-indicator-feeds_update_public_field_response` in
  * responses.
  */
-export const custom_indicator_feeds_update_public_field_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_update_public_field_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-single"
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/permissions/outputs.ts b/src/generated/forge-mcp/intel/indicatorFeeds/permissions/outputs.ts
index 6ed280c93..73f8f9e27 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/permissions/outputs.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/permissions/outputs.ts
@@ -6,25 +6,25 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `custom-indicator-feeds_permission_list_item` in responses.
  */
-export const custom_indicator_feeds_permission_list_item_output: JsonSchema = {
+export const custom$$indicator$$feeds_permission_list_item: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/custom-indicator-feeds_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/custom-indicator-feeds_id"
+      "type": "integer"
     },
     "is_attributable": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_attributable"
+      "type": "boolean"
     },
     "is_downloadable": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_downloadable"
+      "type": "boolean"
     },
     "is_public": {
-      "$ref": "#/$defs/custom-indicator-feeds_is_public"
+      "type": "boolean"
     },
     "name": {
-      "$ref": "#/$defs/custom-indicator-feeds_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -34,7 +34,7 @@ export const custom_indicator_feeds_permission_list_item_output: JsonSchema = {
  * The schema of `custom-indicator-feeds_permission_list_item_response` in
  * responses.
  */
-export const custom_indicator_feeds_permission_list_item_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_permission_list_item_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-common"
@@ -56,7 +56,7 @@ export const custom_indicator_feeds_permission_list_item_response_output: JsonSc
 /**
  * The schema of `custom-indicator-feeds_permissions_response` in responses.
  */
-export const custom_indicator_feeds_permissions_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_permissions_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-single"
@@ -75,7 +75,7 @@ export const custom_indicator_feeds_permissions_response_output: JsonSchema = {
 /**
  * The schema of `custom-indicator-feeds_permissions_update` in responses.
  */
-export const custom_indicator_feeds_permissions_update_output: JsonSchema = {
+export const custom$$indicator$$feeds_permissions_update: JsonSchema = {
   "properties": {
     "success": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/permissions/schemas.ts b/src/generated/forge-mcp/intel/indicatorFeeds/permissions/schemas.ts
index a488338c2..0e22e298f 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/permissions/schemas.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/permissions/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `custom-indicator-feeds_permissions_request`.
  */
-export const custom_indicator_feeds_permissions_request: JsonSchema = {
+export const custom$$indicator$$feeds_permissions_request: JsonSchema = {
   "properties": {
     "account_tag": {
       "description": "The Cloudflare account tag of the account to change permissions on",
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/permissions/tools.ts b/src/generated/forge-mcp/intel/indicatorFeeds/permissions/tools.ts
index c21a145c4..38f3e6b05 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/permissions/tools.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/permissions/tools.ts
@@ -3,62 +3,64 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  custom_indicator_feeds_api_response_common_failure_output,
-  custom_indicator_feeds_api_response_common_output,
-  custom_indicator_feeds_api_response_single_output,
-  custom_indicator_feeds_description_output,
-  custom_indicator_feeds_id_output,
-  custom_indicator_feeds_is_attributable_output,
-  custom_indicator_feeds_is_downloadable_output,
-  custom_indicator_feeds_is_public_output,
-  custom_indicator_feeds_messages_2_output,
-  custom_indicator_feeds_messages_output,
-  custom_indicator_feeds_name_output,
+  custom$$indicator$$feeds_api$$response$$common,
+  custom$$indicator$$feeds_api$$response$$single,
+  custom$$indicator$$feeds_api_response_common_failure,
+  custom$$indicator$$feeds_messages,
+  custom$$indicator$$feeds_messages$$2,
 } from "../outputs.js";
-import { custom_indicator_feeds_identifier } from "../schemas.js";
 import {
-  custom_indicator_feeds_permission_list_item_output,
-  custom_indicator_feeds_permission_list_item_response_output,
-  custom_indicator_feeds_permissions_response_output,
-  custom_indicator_feeds_permissions_update_output,
+  custom$$indicator$$feeds_permission_list_item,
+  custom$$indicator$$feeds_permission_list_item_response,
+  custom$$indicator$$feeds_permissions_response,
+  custom$$indicator$$feeds_permissions_update,
 } from "./outputs.js";
-import { custom_indicator_feeds_permissions_request } from "./schemas.js";
+import { custom$$indicator$$feeds_permissions_request } from "./schemas.js";
 
 /**
- * The tools of `intel.indicator_feeds.permissions`.
+ * The tools of `intel.indicatorFeeds.permissions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "intel_indicator_feeds_permissions_create",
+    name: "intel_indicatorFeeds_permissions_create",
     title: "Grant permission to indicator feed",
-    description: "Grants access permissions for a custom threat indicator feed to other accounts.",
+    description: "Grants access permissions for a custom threat indicator feed to other accounts.\n\nPUT /accounts/{account_id}/intel/indicator-feeds/permissions/add",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/custom-indicator-feeds_permissions_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-        "custom-indicator-feeds_permissions_request": custom_indicator_feeds_permissions_request,
+        "custom-indicator-feeds_permissions_request": custom$$indicator$$feeds_permissions_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_permissions_response",
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_permissions_response": custom_indicator_feeds_permissions_response_output,
-        "custom-indicator-feeds_permissions_update": custom_indicator_feeds_permissions_update_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_permissions_response": custom$$indicator$$feeds_permissions_response,
+        "custom-indicator-feeds_permissions_update": custom$$indicator$$feeds_permissions_update,
       },
     },
     annotations: {
@@ -87,12 +89,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_permissions_response": custom_indicator_feeds_permissions_response_output,
-        "custom-indicator-feeds_permissions_update": custom_indicator_feeds_permissions_update_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_permissions_response": custom$$indicator$$feeds_permissions_response,
+        "custom-indicator-feeds_permissions_update": custom$$indicator$$feeds_permissions_update,
       },
     },
     request: (args) => ({
@@ -101,36 +103,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "intel_indicator_feeds_permissions_delete",
+    name: "intel_indicatorFeeds_permissions_delete",
     title: "Revoke permission to indicator feed",
-    description: "Revokes access permissions for a custom threat indicator feed.\n\nConfirm with the user before calling this tool. This operation destructively removes a permission entry.",
+    description: "Revokes access permissions for a custom threat indicator feed.\n\nConfirm with the user before calling this tool. This operation destructively removes a permission entry.\n\nPUT /accounts/{account_id}/intel/indicator-feeds/permissions/remove",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/custom-indicator-feeds_permissions_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-        "custom-indicator-feeds_permissions_request": custom_indicator_feeds_permissions_request,
+        "custom-indicator-feeds_permissions_request": custom$$indicator$$feeds_permissions_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_permissions_response",
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_permissions_response": custom_indicator_feeds_permissions_response_output,
-        "custom-indicator-feeds_permissions_update": custom_indicator_feeds_permissions_update_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_permissions_response": custom$$indicator$$feeds_permissions_response,
+        "custom-indicator-feeds_permissions_update": custom$$indicator$$feeds_permissions_update,
       },
     },
     annotations: {
@@ -159,12 +170,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_permissions_response": custom_indicator_feeds_permissions_response_output,
-        "custom-indicator-feeds_permissions_update": custom_indicator_feeds_permissions_update_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_permissions_response": custom$$indicator$$feeds_permissions_response,
+        "custom-indicator-feeds_permissions_update": custom$$indicator$$feeds_permissions_update,
       },
     },
     request: (args) => ({
@@ -173,37 +184,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "intel_indicator_feeds_permissions_list",
+    name: "intel_indicatorFeeds_permissions_list",
     title: "List indicator feed permissions",
-    description: "Lists current access permissions for custom threat indicator feeds.",
+    description: "Lists current access permissions for custom threat indicator feeds.\n\nGET /accounts/{account_id}/intel/indicator-feeds/permissions/view",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_permission_list_item_response",
       $defs: {
-        "custom-indicator-feeds_api-response-common": custom_indicator_feeds_api_response_common_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
-        "custom-indicator-feeds_permission_list_item": custom_indicator_feeds_permission_list_item_output,
-        "custom-indicator-feeds_permission_list_item_response": custom_indicator_feeds_permission_list_item_response_output,
+        "custom-indicator-feeds_api-response-common": custom$$indicator$$feeds_api$$response$$common,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_permission_list_item": custom$$indicator$$feeds_permission_list_item,
+        "custom-indicator-feeds_permission_list_item_response": custom$$indicator$$feeds_permission_list_item_response,
       },
     },
     annotations: {
@@ -238,18 +250,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-common": custom_indicator_feeds_api_response_common_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
-        "custom-indicator-feeds_permission_list_item": custom_indicator_feeds_permission_list_item_output,
-        "custom-indicator-feeds_permission_list_item_response": custom_indicator_feeds_permission_list_item_response_output,
+        "custom-indicator-feeds_api-response-common": custom$$indicator$$feeds_api$$response$$common,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_permission_list_item": custom$$indicator$$feeds_permission_list_item,
+        "custom-indicator-feeds_permission_list_item_response": custom$$indicator$$feeds_permission_list_item_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/providers/outputs.ts b/src/generated/forge-mcp/intel/indicatorFeeds/providers/outputs.ts
index 137216680..20ef55e7d 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/providers/outputs.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/providers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `custom-indicator-feeds_create_provider_response` in responses.
  */
-export const custom_indicator_feeds_create_provider_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_create_provider_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-single"
@@ -25,7 +25,7 @@ export const custom_indicator_feeds_create_provider_response_output: JsonSchema
 /**
  * The schema of `custom-indicator-feeds_create_provider_result` in responses.
  */
-export const custom_indicator_feeds_create_provider_result_output: JsonSchema = {
+export const custom$$indicator$$feeds_create_provider_result: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/providers/schemas.ts b/src/generated/forge-mcp/intel/indicatorFeeds/providers/schemas.ts
index 782a0e5f1..a296e46a9 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/providers/schemas.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/providers/schemas.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `custom-indicator-feeds_create_provider_request`.
  */
-export const custom_indicator_feeds_create_provider_request: JsonSchema = {
+export const custom$$indicator$$feeds_create_provider_request: JsonSchema = {
   "properties": {
     "account_id": {
-      "description": "The numeric account ID to create the provider for. Distinct from the\npath `account_id` parameter, which carries the account identifier\nstring used for routing.\n",
+      "description": "The numeric account ID to create the provider for. Distinct from the\npath `account_id` parameter, which carries the account identifier\nstring used for routing.",
       "type": "integer"
     },
     "name": {
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/providers/tools.ts b/src/generated/forge-mcp/intel/indicatorFeeds/providers/tools.ts
index dc882e76e..51f45933f 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/providers/tools.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/providers/tools.ts
@@ -3,53 +3,61 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  custom_indicator_feeds_api_response_common_failure_output,
-  custom_indicator_feeds_api_response_single_output,
-  custom_indicator_feeds_messages_2_output,
-  custom_indicator_feeds_messages_output,
+  custom$$indicator$$feeds_api$$response$$single,
+  custom$$indicator$$feeds_api_response_common_failure,
+  custom$$indicator$$feeds_messages,
+  custom$$indicator$$feeds_messages$$2,
 } from "../outputs.js";
-import { custom_indicator_feeds_identifier } from "../schemas.js";
 import {
-  custom_indicator_feeds_create_provider_response_output,
-  custom_indicator_feeds_create_provider_result_output,
+  custom$$indicator$$feeds_create_provider_response,
+  custom$$indicator$$feeds_create_provider_result,
 } from "./outputs.js";
-import { custom_indicator_feeds_create_provider_request } from "./schemas.js";
+import { custom$$indicator$$feeds_create_provider_request } from "./schemas.js";
 
 /**
- * The tools of `intel.indicator_feeds.providers`.
+ * The tools of `intel.indicatorFeeds.providers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "intel_indicator_feeds_providers_create",
+    name: "intel_indicatorFeeds_providers_create",
     title: "Create indicator feed provider",
-    description: "Creates a new indicator feed provider for an account. Only available to Intel accounts.",
+    description: "Creates a new indicator feed provider for an account. Only available to Intel accounts.\n\nPUT /accounts/{account_id}/intel/indicator-feeds/permissions/createProvider",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/custom-indicator-feeds_create_provider_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "custom-indicator-feeds_create_provider_request": custom_indicator_feeds_create_provider_request,
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
+        "custom-indicator-feeds_create_provider_request": custom$$indicator$$feeds_create_provider_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_create_provider_response",
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_create_provider_response": custom_indicator_feeds_create_provider_response_output,
-        "custom-indicator-feeds_create_provider_result": custom_indicator_feeds_create_provider_result_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_create_provider_response": custom$$indicator$$feeds_create_provider_response,
+        "custom-indicator-feeds_create_provider_result": custom$$indicator$$feeds_create_provider_result,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
       },
     },
     annotations: {
@@ -78,12 +86,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_create_provider_response": custom_indicator_feeds_create_provider_response_output,
-        "custom-indicator-feeds_create_provider_result": custom_indicator_feeds_create_provider_result_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_create_provider_response": custom$$indicator$$feeds_create_provider_response,
+        "custom-indicator-feeds_create_provider_result": custom$$indicator$$feeds_create_provider_result,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/schemas.ts b/src/generated/forge-mcp/intel/indicatorFeeds/schemas.ts
index d060c6605..096b0ace6 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/schemas.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/schemas.ts
@@ -6,56 +6,24 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `custom-indicator-feeds_create_feed`.
  */
-export const custom_indicator_feeds_create_feed: JsonSchema = {
+export const custom$$indicator$$feeds_create_feed: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/custom-indicator-feeds_description",
-      "description": "The description of the example test"
+      "description": "The description of the example test",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/custom-indicator-feeds_name",
-      "description": "The name of the indicator feed"
+      "description": "The name of the indicator feed",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `custom-indicator-feeds_description`.
- */
-export const custom_indicator_feeds_description: JsonSchema = {
-  "description": "The description of the example test",
-  "type": "string"
-};
-
-/**
- * The schema of `custom-indicator-feeds_feed_id`.
- */
-export const custom_indicator_feeds_feed_id: JsonSchema = {
-  "description": "Indicator feed ID",
-  "type": "integer"
-};
-
-/**
- * The schema of `custom-indicator-feeds_identifier`.
- */
-export const custom_indicator_feeds_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
-/**
- * The schema of `custom-indicator-feeds_name`.
- */
-export const custom_indicator_feeds_name: JsonSchema = {
-  "description": "The name of the indicator feed",
-  "type": "string"
-};
-
 /**
  * The schema of `custom-indicator-feeds_update_public_field_request`.
  */
-export const custom_indicator_feeds_update_public_field_request: JsonSchema = {
+export const custom$$indicator$$feeds_update_public_field_request: JsonSchema = {
   "properties": {
     "description": {
       "description": "The new description of the feed",
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/tools.ts b/src/generated/forge-mcp/intel/indicatorFeeds/tools.ts
index 4c6ebe79f..8957a07e2 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/tools.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/tools.ts
@@ -3,79 +3,68 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  custom_indicator_feeds_api_response_common_failure_output,
-  custom_indicator_feeds_api_response_common_output,
-  custom_indicator_feeds_api_response_single_output,
-  custom_indicator_feeds_create_feed_response_output,
-  custom_indicator_feeds_description_output,
-  custom_indicator_feeds_id_output,
-  custom_indicator_feeds_indicator_feed_item_output,
-  custom_indicator_feeds_indicator_feed_metadata_output,
-  custom_indicator_feeds_indicator_feed_metadata_response_output,
-  custom_indicator_feeds_indicator_feed_response_output,
-  custom_indicator_feeds_is_attributable_output,
-  custom_indicator_feeds_is_downloadable_output,
-  custom_indicator_feeds_is_public_output,
-  custom_indicator_feeds_last_upload_summary_output,
-  custom_indicator_feeds_messages_2_output,
-  custom_indicator_feeds_messages_output,
-  custom_indicator_feeds_name_output,
-  custom_indicator_feeds_provider_id_output,
-  custom_indicator_feeds_provider_name_output,
-  custom_indicator_feeds_update_public_field_response_output,
+  custom$$indicator$$feeds_api$$response$$common,
+  custom$$indicator$$feeds_api$$response$$single,
+  custom$$indicator$$feeds_api_response_common_failure,
+  custom$$indicator$$feeds_create_feed_response,
+  custom$$indicator$$feeds_indicator_feed_item,
+  custom$$indicator$$feeds_indicator_feed_metadata,
+  custom$$indicator$$feeds_indicator_feed_metadata_response,
+  custom$$indicator$$feeds_indicator_feed_response,
+  custom$$indicator$$feeds_last_upload_summary,
+  custom$$indicator$$feeds_messages,
+  custom$$indicator$$feeds_messages$$2,
+  custom$$indicator$$feeds_update_public_field_response,
 } from "./outputs.js";
 import {
-  custom_indicator_feeds_create_feed,
-  custom_indicator_feeds_description,
-  custom_indicator_feeds_feed_id,
-  custom_indicator_feeds_identifier,
-  custom_indicator_feeds_name,
-  custom_indicator_feeds_update_public_field_request,
+  custom$$indicator$$feeds_create_feed,
+  custom$$indicator$$feeds_update_public_field_request,
 } from "./schemas.js";
 
 /**
- * The tools of `intel.indicator_feeds`.
+ * The tools of `intel.indicatorFeeds`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "intel_indicator_feeds_create",
+    name: "intel_indicatorFeeds_create",
     title: "Create new indicator feed",
-    description: "Creates a new custom threat indicator feed for sharing threat intelligence data.",
+    description: "Creates a new custom threat indicator feed for sharing threat intelligence data.\n\nPOST /accounts/{account_id}/intel/indicator-feeds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/custom-indicator-feeds_create_feed"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "custom-indicator-feeds_create_feed": custom_indicator_feeds_create_feed,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description,
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name,
+        "custom-indicator-feeds_create_feed": custom$$indicator$$feeds_create_feed,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_create_feed_response",
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_create_feed_response": custom_indicator_feeds_create_feed_response_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_indicator_feed_item": custom_indicator_feeds_indicator_feed_item_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_create_feed_response": custom$$indicator$$feeds_create_feed_response,
+        "custom-indicator-feeds_indicator_feed_item": custom$$indicator$$feeds_indicator_feed_item,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
       },
     },
     annotations: {
@@ -104,18 +93,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_create_feed_response": custom_indicator_feeds_create_feed_response_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_indicator_feed_item": custom_indicator_feeds_indicator_feed_item_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_create_feed_response": custom$$indicator$$feeds_create_feed_response,
+        "custom-indicator-feeds_indicator_feed_item": custom$$indicator$$feeds_indicator_feed_item,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
       },
     },
     request: (args) => ({
@@ -124,29 +107,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "intel_indicator_feeds_data",
+    name: "intel_indicatorFeeds_data",
     title: "Get indicator feed data",
-    description: "Retrieves the raw data entries in a custom threat indicator feed.",
+    description: "Retrieves the raw data entries in a custom threat indicator feed.\n\nGET /accounts/{account_id}/intel/indicator-feeds/{feed_id}/data",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
-        "feed_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_feed_id",
-          "description": "Indicator feed ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "Indicator feed ID",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id"
+        "path"
       ],
-      $defs: {
-        "custom-indicator-feeds_feed_id": custom_indicator_feeds_feed_id,
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -171,8 +160,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
       },
     },
     request: (args) => ({
@@ -180,46 +169,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "intel_indicator_feeds_get",
+    name: "intel_indicatorFeeds_get",
     title: "Get indicator feed metadata",
-    description: "Retrieves details for a specific custom threat indicator feed.",
+    description: "Retrieves details for a specific custom threat indicator feed.\n\nGET /accounts/{account_id}/intel/indicator-feeds/{feed_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
-        "feed_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_feed_id",
-          "description": "Indicator feed ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "Indicator feed ID",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id"
+        "path"
       ],
-      $defs: {
-        "custom-indicator-feeds_feed_id": custom_indicator_feeds_feed_id,
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_indicator_feed_metadata_response",
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_indicator_feed_metadata": custom_indicator_feeds_indicator_feed_metadata_output,
-        "custom-indicator-feeds_indicator_feed_metadata_response": custom_indicator_feeds_indicator_feed_metadata_response_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_last_upload_summary": custom_indicator_feeds_last_upload_summary_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
-        "custom-indicator-feeds_provider_id": custom_indicator_feeds_provider_id_output,
-        "custom-indicator-feeds_provider_name": custom_indicator_feeds_provider_name_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_indicator_feed_metadata": custom$$indicator$$feeds_indicator_feed_metadata,
+        "custom-indicator-feeds_indicator_feed_metadata_response": custom$$indicator$$feeds_indicator_feed_metadata_response,
+        "custom-indicator-feeds_last_upload_summary": custom$$indicator$$feeds_last_upload_summary,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
       },
     },
     annotations: {
@@ -254,21 +241,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_indicator_feed_metadata": custom_indicator_feeds_indicator_feed_metadata_output,
-        "custom-indicator-feeds_indicator_feed_metadata_response": custom_indicator_feeds_indicator_feed_metadata_response_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_last_upload_summary": custom_indicator_feeds_last_upload_summary_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
-        "custom-indicator-feeds_provider_id": custom_indicator_feeds_provider_id_output,
-        "custom-indicator-feeds_provider_name": custom_indicator_feeds_provider_name_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_indicator_feed_metadata": custom$$indicator$$feeds_indicator_feed_metadata,
+        "custom-indicator-feeds_indicator_feed_metadata_response": custom$$indicator$$feeds_indicator_feed_metadata_response,
+        "custom-indicator-feeds_last_upload_summary": custom$$indicator$$feeds_last_upload_summary,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
       },
     },
     request: (args) => ({
@@ -276,37 +255,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "intel_indicator_feeds_list",
+    name: "intel_indicatorFeeds_list",
     title: "Get indicator feeds owned by this account",
-    description: "Retrieves details for all accessible custom threat indicator feeds.",
+    description: "Retrieves details for all accessible custom threat indicator feeds.\n\nGET /accounts/{account_id}/intel/indicator-feeds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_indicator_feed_response",
       $defs: {
-        "custom-indicator-feeds_api-response-common": custom_indicator_feeds_api_response_common_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_indicator_feed_item": custom_indicator_feeds_indicator_feed_item_output,
-        "custom-indicator-feeds_indicator_feed_response": custom_indicator_feeds_indicator_feed_response_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
+        "custom-indicator-feeds_api-response-common": custom$$indicator$$feeds_api$$response$$common,
+        "custom-indicator-feeds_indicator_feed_item": custom$$indicator$$feeds_indicator_feed_item,
+        "custom-indicator-feeds_indicator_feed_response": custom$$indicator$$feeds_indicator_feed_response,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
       },
     },
     annotations: {
@@ -341,18 +321,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-common": custom_indicator_feeds_api_response_common_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_indicator_feed_item": custom_indicator_feeds_indicator_feed_item_output,
-        "custom-indicator-feeds_indicator_feed_response": custom_indicator_feeds_indicator_feed_response_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
+        "custom-indicator-feeds_api-response-common": custom$$indicator$$feeds_api$$response$$common,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_indicator_feed_item": custom$$indicator$$feeds_indicator_feed_item,
+        "custom-indicator-feeds_indicator_feed_response": custom$$indicator$$feeds_indicator_feed_response,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
       },
     },
     request: (args) => ({
@@ -360,48 +334,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "intel_indicator_feeds_update",
+    name: "intel_indicatorFeeds_update",
     title: "Update indicator feed metadata",
-    description: "Revises details for a specific custom threat indicator feed.",
+    description: "Revises details for a specific custom threat indicator feed.\n\nPUT /accounts/{account_id}/intel/indicator-feeds/{feed_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/custom-indicator-feeds_update_public_field_request"
         },
-        "feed_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_feed_id",
-          "description": "Indicator feed ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "Indicator feed ID",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "custom-indicator-feeds_feed_id": custom_indicator_feeds_feed_id,
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-        "custom-indicator-feeds_update_public_field_request": custom_indicator_feeds_update_public_field_request,
+        "custom-indicator-feeds_update_public_field_request": custom$$indicator$$feeds_update_public_field_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_update_public_field_response",
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_indicator_feed_item": custom_indicator_feeds_indicator_feed_item_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
-        "custom-indicator-feeds_update_public_field_response": custom_indicator_feeds_update_public_field_response_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_indicator_feed_item": custom$$indicator$$feeds_indicator_feed_item,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_update_public_field_response": custom$$indicator$$feeds_update_public_field_response,
       },
     },
     annotations: {
@@ -430,18 +406,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_description": custom_indicator_feeds_description_output,
-        "custom-indicator-feeds_id": custom_indicator_feeds_id_output,
-        "custom-indicator-feeds_indicator_feed_item": custom_indicator_feeds_indicator_feed_item_output,
-        "custom-indicator-feeds_is_attributable": custom_indicator_feeds_is_attributable_output,
-        "custom-indicator-feeds_is_downloadable": custom_indicator_feeds_is_downloadable_output,
-        "custom-indicator-feeds_is_public": custom_indicator_feeds_is_public_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_name": custom_indicator_feeds_name_output,
-        "custom-indicator-feeds_update_public_field_response": custom_indicator_feeds_update_public_field_response_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_indicator_feed_item": custom$$indicator$$feeds_indicator_feed_item,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_update_public_field_response": custom$$indicator$$feeds_update_public_field_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/uploads/outputs.ts b/src/generated/forge-mcp/intel/indicatorFeeds/uploads/outputs.ts
index a1691fb30..2471fa4c1 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/uploads/outputs.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/uploads/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `custom-indicator-feeds_upload_status` in responses.
  */
-export const custom_indicator_feeds_upload_status_output: JsonSchema = {
+export const custom$$indicator$$feeds_upload_status: JsonSchema = {
   "properties": {
     "attempts": {
       "type": "integer"
@@ -19,7 +19,7 @@ export const custom_indicator_feeds_upload_status_output: JsonSchema = {
       "type": "string"
     },
     "feed_id": {
-      "$ref": "#/$defs/custom-indicator-feeds_feed_id"
+      "type": "integer"
     },
     "filename": {
       "type": "string"
@@ -63,7 +63,7 @@ export const custom_indicator_feeds_upload_status_output: JsonSchema = {
 /**
  * The schema of `custom-indicator-feeds_upload_status_response` in responses.
  */
-export const custom_indicator_feeds_upload_status_response_output: JsonSchema = {
+export const custom$$indicator$$feeds_upload_status_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/custom-indicator-feeds_api-response-single"
diff --git a/src/generated/forge-mcp/intel/indicatorFeeds/uploads/tools.ts b/src/generated/forge-mcp/intel/indicatorFeeds/uploads/tools.ts
index 886cdc09c..731ddf958 100644
--- a/src/generated/forge-mcp/intel/indicatorFeeds/uploads/tools.ts
+++ b/src/generated/forge-mcp/intel/indicatorFeeds/uploads/tools.ts
@@ -3,62 +3,62 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  custom_indicator_feeds_api_response_common_failure_output,
-  custom_indicator_feeds_api_response_single_output,
-  custom_indicator_feeds_feed_id_output,
-  custom_indicator_feeds_messages_2_output,
-  custom_indicator_feeds_messages_output,
+  custom$$indicator$$feeds_api$$response$$single,
+  custom$$indicator$$feeds_api_response_common_failure,
+  custom$$indicator$$feeds_messages,
+  custom$$indicator$$feeds_messages$$2,
 } from "../outputs.js";
 import {
-  custom_indicator_feeds_feed_id,
-  custom_indicator_feeds_identifier,
-} from "../schemas.js";
-import {
-  custom_indicator_feeds_upload_status_output,
-  custom_indicator_feeds_upload_status_response_output,
+  custom$$indicator$$feeds_upload_status,
+  custom$$indicator$$feeds_upload_status_response,
 } from "./outputs.js";
 
 /**
- * The tools of `intel.indicator_feeds.uploads`.
+ * The tools of `intel.indicatorFeeds.uploads`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "intel_indicator_feeds_uploads_get",
+    name: "intel_indicatorFeeds_uploads_get",
     title: "Get indicator feed upload status",
-    description: "Polls an asynchronously accepted upload. Continue polling after the\nrecommended `poll_after_seconds` delay until status is `Unified` or\n`Error`. `Unified` is returned only after the durable loader finishes.",
+    description: "Polls an asynchronously accepted upload. Continue polling after the\nrecommended `poll_after_seconds` delay until status is `Unified` or\n`Error`. `Unified` is returned only after the durable loader finishes.\n\nGET /accounts/{account_id}/intel/indicator-feeds/{feed_id}/uploads/{upload_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_identifier",
-          "description": "Identifier"
-        },
-        "feed_id": {
-          "$ref": "#/$defs/custom-indicator-feeds_feed_id",
-          "description": "Indicator feed ID"
-        },
-        "upload_id": {
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "feed_id": {
+              "description": "Indicator feed ID",
+              "type": "integer"
+            },
+            "upload_id": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "feed_id",
+            "upload_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "feed_id",
-        "upload_id"
+        "path"
       ],
-      $defs: {
-        "custom-indicator-feeds_feed_id": custom_indicator_feeds_feed_id,
-        "custom-indicator-feeds_identifier": custom_indicator_feeds_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/custom-indicator-feeds_upload_status_response",
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_feed_id": custom_indicator_feeds_feed_id_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_upload_status": custom_indicator_feeds_upload_status_output,
-        "custom-indicator-feeds_upload_status_response": custom_indicator_feeds_upload_status_response_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_upload_status": custom$$indicator$$feeds_upload_status,
+        "custom-indicator-feeds_upload_status_response": custom$$indicator$$feeds_upload_status_response,
       },
     },
     annotations: {
@@ -93,13 +93,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "custom-indicator-feeds_api-response-single": custom_indicator_feeds_api_response_single_output,
-        "custom-indicator-feeds_api_response_common_failure": custom_indicator_feeds_api_response_common_failure_output,
-        "custom-indicator-feeds_feed_id": custom_indicator_feeds_feed_id_output,
-        "custom-indicator-feeds_messages": custom_indicator_feeds_messages_output,
-        "custom-indicator-feeds_messages-2": custom_indicator_feeds_messages_2_output,
-        "custom-indicator-feeds_upload_status": custom_indicator_feeds_upload_status_output,
-        "custom-indicator-feeds_upload_status_response": custom_indicator_feeds_upload_status_response_output,
+        "custom-indicator-feeds_api-response-single": custom$$indicator$$feeds_api$$response$$single,
+        "custom-indicator-feeds_api_response_common_failure": custom$$indicator$$feeds_api_response_common_failure,
+        "custom-indicator-feeds_messages": custom$$indicator$$feeds_messages,
+        "custom-indicator-feeds_messages-2": custom$$indicator$$feeds_messages$$2,
+        "custom-indicator-feeds_upload_status": custom$$indicator$$feeds_upload_status,
+        "custom-indicator-feeds_upload_status_response": custom$$indicator$$feeds_upload_status_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/ipLists/outputs.ts b/src/generated/forge-mcp/intel/ipLists/outputs.ts
index 499bbb51b..46ee62a14 100644
--- a/src/generated/forge-mcp/intel/ipLists/outputs.ts
+++ b/src/generated/forge-mcp/intel/ipLists/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `intel_components-schemas-response` in responses.
  */
-export const intel_components_schemas_response_output: JsonSchema = {
+export const intel_components$$schemas$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_api-response-collection"
@@ -28,7 +28,7 @@ export const intel_components_schemas_response_output: JsonSchema = {
 /**
  * The schema of `intel_ip-list` in responses.
  */
-export const intel_ip_list_output: JsonSchema = {
+export const intel_ip$$list: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
diff --git a/src/generated/forge-mcp/intel/ipLists/tools.ts b/src/generated/forge-mcp/intel/ipLists/tools.ts
index 48f5044b3..82eab0a71 100644
--- a/src/generated/forge-mcp/intel/ipLists/tools.ts
+++ b/src/generated/forge-mcp/intel/ipLists/tools.ts
@@ -3,50 +3,56 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  intel_api_response_collection_output,
-  intel_api_response_common_failure_output,
-  intel_api_response_common_output,
-  intel_messages_output,
-  intel_result_info_output,
+  intel_api$$response$$collection,
+  intel_api$$response$$common,
+  intel_api$$response$$common$$failure,
+  intel_messages,
+  intel_result_info,
 } from "../outputs.js";
-import { intel_identifier } from "../schemas.js";
 import {
-  intel_components_schemas_response_output,
-  intel_ip_list_output,
+  intel_components$$schemas$$response,
+  intel_ip$$list,
 } from "./outputs.js";
 
 /**
- * The tools of `intel.ip_lists`.
+ * The tools of `intel.ipLists`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "intel_ip_lists_get",
+    name: "intel_ipLists_get",
     title: "Get Available IP Lists",
-    description: "Returns a list of available IP list categories (e.g., anonymizer, botnetcc, malware, tor, vpn, open_proxies). This endpoint provides metadata about which IP lists are available in the system.",
+    description: "Returns a list of available IP list categories (e.g., anonymizer, botnetcc, malware, tor, vpn, open_proxies). This endpoint provides metadata about which IP lists are available in the system.\n\nGET /accounts/{account_id}/intel/ip-lists",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "intel_identifier": intel_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel_components-schemas-response",
       $defs: {
-        "intel_api-response-collection": intel_api_response_collection_output,
-        "intel_api-response-common": intel_api_response_common_output,
-        "intel_components-schemas-response": intel_components_schemas_response_output,
-        "intel_ip-list": intel_ip_list_output,
-        "intel_messages": intel_messages_output,
-        "intel_result_info": intel_result_info_output,
+        "intel_api-response-collection": intel_api$$response$$collection,
+        "intel_api-response-common": intel_api$$response$$common,
+        "intel_components-schemas-response": intel_components$$schemas$$response,
+        "intel_ip-list": intel_ip$$list,
+        "intel_messages": intel_messages,
+        "intel_result_info": intel_result_info,
       },
     },
     annotations: {
@@ -81,13 +87,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_api-response-collection": intel_api_response_collection_output,
-        "intel_api-response-common": intel_api_response_common_output,
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_components-schemas-response": intel_components_schemas_response_output,
-        "intel_ip-list": intel_ip_list_output,
-        "intel_messages": intel_messages_output,
-        "intel_result_info": intel_result_info_output,
+        "intel_api-response-collection": intel_api$$response$$collection,
+        "intel_api-response-common": intel_api$$response$$common,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_components-schemas-response": intel_components$$schemas$$response,
+        "intel_ip-list": intel_ip$$list,
+        "intel_messages": intel_messages,
+        "intel_result_info": intel_result_info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/ips/outputs.ts b/src/generated/forge-mcp/intel/ips/outputs.ts
index 6de160c5d..a7476e71a 100644
--- a/src/generated/forge-mcp/intel/ips/outputs.ts
+++ b/src/generated/forge-mcp/intel/ips/outputs.ts
@@ -3,38 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `intel_ip` in responses.
- */
-export const intel_ip_output: JsonSchema = {
-  "anyOf": [
-    {
-      "$ref": "#/$defs/intel_ipv4"
-    },
-    {
-      "$ref": "#/$defs/intel_ipv6"
-    }
-  ]
-};
-
-/**
- * The schema of `intel_ipv4` in responses.
- */
-export const intel_ipv4_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `intel_ipv6` in responses.
- */
-export const intel_ipv6_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `intel_schemas-ip` in responses.
  */
-export const intel_schemas_ip_output: JsonSchema = {
+export const intel_schemas$$ip: JsonSchema = {
   "properties": {
     "belongs_to_ref": {
       "properties": {
@@ -62,7 +34,14 @@ export const intel_schemas_ip_output: JsonSchema = {
       "type": "object"
     },
     "ip": {
-      "$ref": "#/$defs/intel_ip"
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "risk_types": {
       "items": {
@@ -88,7 +67,7 @@ export const intel_schemas_ip_output: JsonSchema = {
 /**
  * The schema of `intel_schemas-response` in responses.
  */
-export const intel_schemas_response_output: JsonSchema = {
+export const intel_schemas$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_api-response-collection"
diff --git a/src/generated/forge-mcp/intel/ips/tools.ts b/src/generated/forge-mcp/intel/ips/tools.ts
index 050032c3e..2a066c309 100644
--- a/src/generated/forge-mcp/intel/ips/tools.ts
+++ b/src/generated/forge-mcp/intel/ips/tools.ts
@@ -1,22 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  intel_api_response_collection_output,
-  intel_api_response_common_failure_output,
-  intel_api_response_common_output,
-  intel_messages_output,
-  intel_result_info_output,
+  intel_api$$response$$collection,
+  intel_api$$response$$common,
+  intel_api$$response$$common$$failure,
+  intel_messages,
+  intel_result_info,
 } from "../outputs.js";
-import { intel_identifier } from "../schemas.js";
-import {
-  intel_ip_output,
-  intel_ipv4_output,
-  intel_ipv6_output,
-  intel_schemas_ip_output,
-  intel_schemas_response_output,
-} from "./outputs.js";
+import { intel_schemas$$ip, intel_schemas$$response } from "./outputs.js";
 
 /**
  * The tools of `intel.ips`.
@@ -25,40 +18,50 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_ips_get",
     title: "Get IP Overview",
-    description: "Gets the geolocation, ASN, infrastructure type of the ASN, and any security threat categories of an IP address. **Must provide ip query parameters.** For example, `/intel/ip?ipv4=1.1.1.1` or `/intel/ip?ipv6=2001:db8::1`.",
+    description: "Gets the geolocation, ASN, infrastructure type of the ASN, and any security threat categories of an IP address. **Must provide ip query parameters.** For example, `/intel/ip?ipv4=1.1.1.1` or `/intel/ip?ipv6=2001:db8::1`.\n\nGET /accounts/{account_id}/intel/ip",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
-        },
-        "ipv4": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "ipv6": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "ipv4": {
+              "type": "string"
+            },
+            "ipv6": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "intel_identifier": intel_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel_schemas-response",
       $defs: {
-        "intel_api-response-collection": intel_api_response_collection_output,
-        "intel_api-response-common": intel_api_response_common_output,
-        "intel_ip": intel_ip_output,
-        "intel_ipv4": intel_ipv4_output,
-        "intel_ipv6": intel_ipv6_output,
-        "intel_messages": intel_messages_output,
-        "intel_result_info": intel_result_info_output,
-        "intel_schemas-ip": intel_schemas_ip_output,
-        "intel_schemas-response": intel_schemas_response_output,
+        "intel_api-response-collection": intel_api$$response$$collection,
+        "intel_api-response-common": intel_api$$response$$common,
+        "intel_messages": intel_messages,
+        "intel_result_info": intel_result_info,
+        "intel_schemas-ip": intel_schemas$$ip,
+        "intel_schemas-response": intel_schemas$$response,
       },
     },
     annotations: {
@@ -93,23 +96,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_api-response-collection": intel_api_response_collection_output,
-        "intel_api-response-common": intel_api_response_common_output,
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_ip": intel_ip_output,
-        "intel_ipv4": intel_ipv4_output,
-        "intel_ipv6": intel_ipv6_output,
-        "intel_messages": intel_messages_output,
-        "intel_result_info": intel_result_info_output,
-        "intel_schemas-ip": intel_schemas_ip_output,
-        "intel_schemas-response": intel_schemas_response_output,
+        "intel_api-response-collection": intel_api$$response$$collection,
+        "intel_api-response-common": intel_api$$response$$common,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_messages": intel_messages,
+        "intel_result_info": intel_result_info,
+        "intel_schemas-ip": intel_schemas$$ip,
+        "intel_schemas-response": intel_schemas$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/intel/ip`,
       query: [
-        ["ipv4", args["ipv4"], true],
-        ["ipv6", args["ipv6"], true],
+        ["ipv4", param(args, "query", "ipv4"), true],
+        ["ipv6", param(args, "query", "ipv6"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/intel/miscategorizations/tools.ts b/src/generated/forge-mcp/intel/miscategorizations/tools.ts
index 0107d1a58..7bc10630d 100644
--- a/src/generated/forge-mcp/intel/miscategorizations/tools.ts
+++ b/src/generated/forge-mcp/intel/miscategorizations/tools.ts
@@ -3,12 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  intel_api_response_common_failure_output,
-  intel_api_response_single_output,
-  intel_messages_output,
-  intel_schemas_messages_output,
+  intel_api$$response$$common$$failure,
+  intel_api$$response$$single,
+  intel_messages,
+  intel_schemas$$messages,
 } from "../outputs.js";
-import { intel_identifier } from "../schemas.js";
 import { intel_miscategorization } from "./schemas.js";
 
 /**
@@ -18,32 +17,41 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_miscategorizations_create",
     title: "Create Miscategorization",
-    description: "Allows you to submit requests to change a domain’s category.\n\nRequests that include category `169` (New Domains) or category `177` (Newly Seen)\nin any of `content_adds`, `content_removes`, `security_adds`, or `security_removes`\nwill be rejected with a `400 Bad Request`. These categories are automatically\nmanaged and fall off 30 days after they are applied.",
+    description: "Allows you to submit requests to change a domain’s category.\n\nRequests that include category `169` (New Domains) or category `177` (Newly Seen)\nin any of `content_adds`, `content_removes`, `security_adds`, or `security_removes`\nwill be rejected with a `400 Bad Request`. These categories are automatically\nmanaged and fall off 30 days after they are applied.\n\nPOST /accounts/{account_id}/intel/miscategorization",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/intel_miscategorization"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "intel_identifier": intel_identifier,
         "intel_miscategorization": intel_miscategorization,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/intel_api-response-single",
       $defs: {
-        "intel_api-response-single": intel_api_response_single_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
+        "intel_api-response-single": intel_api$$response$$single,
+        "intel_schemas-messages": intel_schemas$$messages,
       },
     },
     annotations: {
@@ -72,10 +80,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_api-response-single": intel_api_response_single_output,
-        "intel_messages": intel_messages_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_api-response-single": intel_api$$response$$single,
+        "intel_messages": intel_messages,
+        "intel_schemas-messages": intel_schemas$$messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/outputs.ts b/src/generated/forge-mcp/intel/outputs.ts
index 0e14f9820..3cfbe9abf 100644
--- a/src/generated/forge-mcp/intel/outputs.ts
+++ b/src/generated/forge-mcp/intel/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `intel_api-response-collection` in responses.
  */
-export const intel_api_response_collection_output: JsonSchema = {
+export const intel_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_api-response-common"
@@ -45,7 +45,7 @@ export const intel_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `intel_api-response-common` in responses.
  */
-export const intel_api_response_common_output: JsonSchema = {
+export const intel_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/intel_messages"
@@ -95,7 +95,7 @@ export const intel_api_response_common_output: JsonSchema = {
 /**
  * The schema of `intel_api-response-common-failure` in responses.
  */
-export const intel_api_response_common_failure_output: JsonSchema = {
+export const intel_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/intel_messages"
@@ -122,7 +122,7 @@ export const intel_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `intel_api-response-single` in responses.
  */
-export const intel_api_response_single_output: JsonSchema = {
+export const intel_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/intel_schemas-messages"
@@ -145,17 +145,10 @@ export const intel_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `intel_domain_name` in responses.
- */
-export const intel_domain_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `intel_messages` in responses.
  */
-export const intel_messages_output: JsonSchema = {
+export const intel_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -177,7 +170,7 @@ export const intel_messages_output: JsonSchema = {
 /**
  * The schema of `intel_result_info` in responses.
  */
-export const intel_result_info_output: JsonSchema = {
+export const intel_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -198,7 +191,7 @@ export const intel_result_info_output: JsonSchema = {
 /**
  * The schema of `intel_schemas-messages` in responses.
  */
-export const intel_schemas_messages_output: JsonSchema = {
+export const intel_schemas$$messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/intel/schemas.ts b/src/generated/forge-mcp/intel/schemas.ts
deleted file mode 100644
index e34127638..000000000
--- a/src/generated/forge-mcp/intel/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `intel_identifier`.
- */
-export const intel_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/intel/sinkholes/ingresses/outputs.ts b/src/generated/forge-mcp/intel/sinkholes/ingresses/outputs.ts
index b6ea90a1b..b37821616 100644
--- a/src/generated/forge-mcp/intel/sinkholes/ingresses/outputs.ts
+++ b/src/generated/forge-mcp/intel/sinkholes/ingresses/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `intel-sinkholes_ingress_collection_response` in responses.
  */
-export const intel_sinkholes_ingress_collection_response_output: JsonSchema = {
+export const intel$$sinkholes_ingress_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel-sinkholes_api-response-common"
@@ -28,7 +28,7 @@ export const intel_sinkholes_ingress_collection_response_output: JsonSchema = {
 /**
  * The schema of `intel-sinkholes_ingress_item` in responses.
  */
-export const intel_sinkholes_ingress_item_output: JsonSchema = {
+export const intel$$sinkholes_ingress_item: JsonSchema = {
   "properties": {
     "cidr": {
       "type": "string"
@@ -57,7 +57,7 @@ export const intel_sinkholes_ingress_item_output: JsonSchema = {
 /**
  * The schema of `intel-sinkholes_ingress_single_response` in responses.
  */
-export const intel_sinkholes_ingress_single_response_output: JsonSchema = {
+export const intel$$sinkholes_ingress_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel-sinkholes_api-response-common"
diff --git a/src/generated/forge-mcp/intel/sinkholes/ingresses/schemas.ts b/src/generated/forge-mcp/intel/sinkholes/ingresses/schemas.ts
index 00b24ec53..53c86378e 100644
--- a/src/generated/forge-mcp/intel/sinkholes/ingresses/schemas.ts
+++ b/src/generated/forge-mcp/intel/sinkholes/ingresses/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `intel-sinkholes_ingress_create_params`.
  */
-export const intel_sinkholes_ingress_create_params: JsonSchema = {
+export const intel$$sinkholes_ingress_create_params: JsonSchema = {
   "properties": {
     "cidr": {
       "description": "The CIDR block for the ingress rule in IPv4 or IPv6 notation (e.g., 192.0.2.0/24). Provide a Cloudflare BYOIP CIDR that your account owns.",
diff --git a/src/generated/forge-mcp/intel/sinkholes/ingresses/tools.ts b/src/generated/forge-mcp/intel/sinkholes/ingresses/tools.ts
index dbbe73ce1..dd088e19f 100644
--- a/src/generated/forge-mcp/intel/sinkholes/ingresses/tools.ts
+++ b/src/generated/forge-mcp/intel/sinkholes/ingresses/tools.ts
@@ -3,18 +3,17 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  intel_sinkholes_api_response_common_failure_output,
-  intel_sinkholes_api_response_common_output,
-  intel_sinkholes_api_response_single_empty_output,
-  intel_sinkholes_messages_output,
+  intel$$sinkholes_api$$response$$common,
+  intel$$sinkholes_api_response_common_failure,
+  intel$$sinkholes_api_response_single_empty,
+  intel$$sinkholes_messages,
 } from "../outputs.js";
-import { intel_sinkholes_identifier } from "../schemas.js";
 import {
-  intel_sinkholes_ingress_collection_response_output,
-  intel_sinkholes_ingress_item_output,
-  intel_sinkholes_ingress_single_response_output,
+  intel$$sinkholes_ingress_collection_response,
+  intel$$sinkholes_ingress_item,
+  intel$$sinkholes_ingress_single_response,
 } from "./outputs.js";
-import { intel_sinkholes_ingress_create_params } from "./schemas.js";
+import { intel$$sinkholes_ingress_create_params } from "./schemas.js";
 
 /**
  * The tools of `intel.sinkholes.ingresses`.
@@ -23,39 +22,48 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_ingresses_create",
     title: "Create an ingress rule",
-    description: "Create a new ingress rule for the specified sinkhole. The CIDR block must be a Cloudflare BYOIP associated with your account. The zone_id must be a zone with the ability to create Spectrum Apps. The sinkhole must belong to the same account as the zone.",
+    description: "Create a new ingress rule for the specified sinkhole. The CIDR block must be a Cloudflare BYOIP associated with your account. The zone_id must be a zone with the ability to create Spectrum Apps. The sinkhole must belong to the same account as the zone.\n\nPOST /zones/{zone_id}/intel/sinkholes/{sinkhole_id}/ingresses",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/intel-sinkholes_ingress_create_params"
         },
-        "sinkhole_id": {
-          "description": "The unique identifier for the sinkhole.",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "sinkhole_id": {
+              "description": "The unique identifier for the sinkhole.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The unique identifier for the Cloudflare zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "sinkhole_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "sinkhole_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-        "intel-sinkholes_ingress_create_params": intel_sinkholes_ingress_create_params,
+        "intel-sinkholes_ingress_create_params": intel$$sinkholes_ingress_create_params,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_ingress_single_response",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_ingress_item": intel_sinkholes_ingress_item_output,
-        "intel-sinkholes_ingress_single_response": intel_sinkholes_ingress_single_response_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_ingress_item": intel$$sinkholes_ingress_item,
+        "intel-sinkholes_ingress_single_response": intel$$sinkholes_ingress_single_response,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     annotations: {
@@ -82,11 +90,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_ingress_item": intel_sinkholes_ingress_item_output,
-        "intel-sinkholes_ingress_single_response": intel_sinkholes_ingress_single_response_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_ingress_item": intel$$sinkholes_ingress_item,
+        "intel-sinkholes_ingress_single_response": intel$$sinkholes_ingress_single_response,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     request: (args) => ({
@@ -97,38 +105,45 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_ingresses_delete",
     title: "Delete an ingress rule",
-    description: "Delete the specified ingress rule. The sinkhole must belong to the same account as the zone.",
+    description: "Delete the specified ingress rule. The sinkhole must belong to the same account as the zone.\n\nDELETE /zones/{zone_id}/intel/sinkholes/{sinkhole_id}/ingresses/{ingress_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "ingress_id": {
-          "description": "The unique identifier for the ingress rule.",
-          "type": "string"
-        },
-        "sinkhole_id": {
-          "description": "The unique identifier for the sinkhole.",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ingress_id": {
+              "description": "The unique identifier for the ingress rule.",
+              "type": "string"
+            },
+            "sinkhole_id": {
+              "description": "The unique identifier for the sinkhole.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The unique identifier for the Cloudflare zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "sinkhole_id",
+            "ingress_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "sinkhole_id",
-        "ingress_id"
+        "path"
       ],
-      $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_api_response_single_empty",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_single_empty": intel_sinkholes_api_response_single_empty_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_single_empty": intel$$sinkholes_api_response_single_empty,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     annotations: {
@@ -155,10 +170,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_api_response_single_empty": intel_sinkholes_api_response_single_empty_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_api_response_single_empty": intel$$sinkholes_api_response_single_empty,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     request: (args) => ({
@@ -168,39 +183,46 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_ingresses_get",
     title: "Get an ingress rule",
-    description: "Get the specified ingress rule associated with a sinkhole. The sinkhole must belong to the same account as the zone.",
+    description: "Get the specified ingress rule associated with a sinkhole. The sinkhole must belong to the same account as the zone.\n\nGET /zones/{zone_id}/intel/sinkholes/{sinkhole_id}/ingresses/{ingress_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "ingress_id": {
-          "description": "The unique identifier for the ingress rule.",
-          "type": "string"
-        },
-        "sinkhole_id": {
-          "description": "The unique identifier for the sinkhole.",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ingress_id": {
+              "description": "The unique identifier for the ingress rule.",
+              "type": "string"
+            },
+            "sinkhole_id": {
+              "description": "The unique identifier for the sinkhole.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The unique identifier for the Cloudflare zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "sinkhole_id",
+            "ingress_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "sinkhole_id",
-        "ingress_id"
+        "path"
       ],
-      $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_ingress_single_response",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_ingress_item": intel_sinkholes_ingress_item_output,
-        "intel-sinkholes_ingress_single_response": intel_sinkholes_ingress_single_response_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_ingress_item": intel$$sinkholes_ingress_item,
+        "intel-sinkholes_ingress_single_response": intel$$sinkholes_ingress_single_response,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     annotations: {
@@ -228,11 +250,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_ingress_item": intel_sinkholes_ingress_item_output,
-        "intel-sinkholes_ingress_single_response": intel_sinkholes_ingress_single_response_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_ingress_item": intel$$sinkholes_ingress_item,
+        "intel-sinkholes_ingress_single_response": intel$$sinkholes_ingress_single_response,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     request: (args) => ({
@@ -242,43 +264,50 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_ingresses_list",
     title: "List ingresses for a sinkhole",
-    description: "Returns all ingress rules associated with the specified sinkhole.",
+    description: "Returns all ingress rules associated with the specified sinkhole.\n\nGET /{account_or_zone}/{account_or_zone_id}/intel/sinkholes/{sinkhole_id}/ingresses",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "sinkhole_id": {
+              "description": "The unique identifier for the sinkhole.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "sinkhole_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "sinkhole_id": {
-          "description": "The unique identifier for the sinkhole.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "sinkhole_id"
+        "path"
       ],
-      $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_ingress_collection_response",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_ingress_collection_response": intel_sinkholes_ingress_collection_response_output,
-        "intel-sinkholes_ingress_item": intel_sinkholes_ingress_item_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_ingress_collection_response": intel$$sinkholes_ingress_collection_response,
+        "intel-sinkholes_ingress_item": intel$$sinkholes_ingress_item,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     annotations: {
@@ -306,11 +335,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_ingress_collection_response": intel_sinkholes_ingress_collection_response_output,
-        "intel-sinkholes_ingress_item": intel_sinkholes_ingress_item_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_ingress_collection_response": intel$$sinkholes_ingress_collection_response,
+        "intel-sinkholes_ingress_item": intel$$sinkholes_ingress_item,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     request: (args) => ({
@@ -320,43 +349,52 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_ingresses_update",
     title: "Update an ingress rule",
-    description: "Replaces the specified ingress rule. The sinkhole must belong to the same account as the zone.",
+    description: "Replaces the specified ingress rule. The sinkhole must belong to the same account as the zone.\n\nPUT /zones/{zone_id}/intel/sinkholes/{sinkhole_id}/ingresses/{ingress_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/intel-sinkholes_ingress_create_params"
         },
-        "ingress_id": {
-          "description": "The unique identifier for the ingress rule.",
-          "type": "string"
-        },
-        "sinkhole_id": {
-          "description": "The unique identifier for the sinkhole.",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ingress_id": {
+              "description": "The unique identifier for the ingress rule.",
+              "type": "string"
+            },
+            "sinkhole_id": {
+              "description": "The unique identifier for the sinkhole.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The unique identifier for the Cloudflare zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "sinkhole_id",
+            "ingress_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "sinkhole_id",
-        "ingress_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-        "intel-sinkholes_ingress_create_params": intel_sinkholes_ingress_create_params,
+        "intel-sinkholes_ingress_create_params": intel$$sinkholes_ingress_create_params,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_api_response_single_empty",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_single_empty": intel_sinkholes_api_response_single_empty_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_single_empty": intel$$sinkholes_api_response_single_empty,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     annotations: {
@@ -383,10 +421,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_api_response_single_empty": intel_sinkholes_api_response_single_empty_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_api_response_single_empty": intel$$sinkholes_api_response_single_empty,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/sinkholes/outputs.ts b/src/generated/forge-mcp/intel/sinkholes/outputs.ts
index d8b8974a4..43239c013 100644
--- a/src/generated/forge-mcp/intel/sinkholes/outputs.ts
+++ b/src/generated/forge-mcp/intel/sinkholes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `intel-sinkholes_api-response-common` in responses.
  */
-export const intel_sinkholes_api_response_common_output: JsonSchema = {
+export const intel$$sinkholes_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/intel-sinkholes_messages"
@@ -32,7 +32,7 @@ export const intel_sinkholes_api_response_common_output: JsonSchema = {
 /**
  * The schema of `intel-sinkholes_api_response_common_failure` in responses.
  */
-export const intel_sinkholes_api_response_common_failure_output: JsonSchema = {
+export const intel$$sinkholes_api_response_common_failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/intel-sinkholes_messages"
@@ -62,7 +62,7 @@ export const intel_sinkholes_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `intel-sinkholes_api_response_single_empty` in responses.
  */
-export const intel_sinkholes_api_response_single_empty_output: JsonSchema = {
+export const intel$$sinkholes_api_response_single_empty: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel-sinkholes_api-response-common"
@@ -81,7 +81,7 @@ export const intel_sinkholes_api_response_single_empty_output: JsonSchema = {
 /**
  * The schema of `intel-sinkholes_messages` in responses.
  */
-export const intel_sinkholes_messages_output: JsonSchema = {
+export const intel$$sinkholes_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -114,7 +114,7 @@ export const intel_sinkholes_messages_output: JsonSchema = {
 /**
  * The schema of `intel-sinkholes_sinkhole_collection_response` in responses.
  */
-export const intel_sinkholes_sinkhole_collection_response_output: JsonSchema = {
+export const intel$$sinkholes_sinkhole_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel-sinkholes_api-response-common"
@@ -136,7 +136,7 @@ export const intel_sinkholes_sinkhole_collection_response_output: JsonSchema = {
 /**
  * The schema of `intel-sinkholes_sinkhole_item` in responses.
  */
-export const intel_sinkholes_sinkhole_item_output: JsonSchema = {
+export const intel$$sinkholes_sinkhole_item: JsonSchema = {
   "properties": {
     "account_tag": {
       "type": "string"
@@ -168,7 +168,7 @@ export const intel_sinkholes_sinkhole_item_output: JsonSchema = {
 /**
  * The schema of `intel-sinkholes_sinkhole_single_response` in responses.
  */
-export const intel_sinkholes_sinkhole_single_response_output: JsonSchema = {
+export const intel$$sinkholes_sinkhole_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel-sinkholes_api-response-common"
diff --git a/src/generated/forge-mcp/intel/sinkholes/schemas.ts b/src/generated/forge-mcp/intel/sinkholes/schemas.ts
index 4b7fc5fac..4fabcbfcd 100644
--- a/src/generated/forge-mcp/intel/sinkholes/schemas.ts
+++ b/src/generated/forge-mcp/intel/sinkholes/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `intel-sinkholes_identifier`.
- */
-export const intel_sinkholes_identifier: JsonSchema = {
-  "description": "An identifier for the resource.",
-  "type": "string"
-};
-
 /**
  * The schema of `intel-sinkholes_sinkhole_create_params`.
  */
-export const intel_sinkholes_sinkhole_create_params: JsonSchema = {
+export const intel$$sinkholes_sinkhole_create_params: JsonSchema = {
   "properties": {
     "name": {
       "description": "The name of the sinkhole.",
diff --git a/src/generated/forge-mcp/intel/sinkholes/tools.ts b/src/generated/forge-mcp/intel/sinkholes/tools.ts
index d42181270..92756baca 100644
--- a/src/generated/forge-mcp/intel/sinkholes/tools.ts
+++ b/src/generated/forge-mcp/intel/sinkholes/tools.ts
@@ -3,18 +3,15 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  intel_sinkholes_api_response_common_failure_output,
-  intel_sinkholes_api_response_common_output,
-  intel_sinkholes_api_response_single_empty_output,
-  intel_sinkholes_messages_output,
-  intel_sinkholes_sinkhole_collection_response_output,
-  intel_sinkholes_sinkhole_item_output,
-  intel_sinkholes_sinkhole_single_response_output,
+  intel$$sinkholes_api$$response$$common,
+  intel$$sinkholes_api_response_common_failure,
+  intel$$sinkholes_api_response_single_empty,
+  intel$$sinkholes_messages,
+  intel$$sinkholes_sinkhole_collection_response,
+  intel$$sinkholes_sinkhole_item,
+  intel$$sinkholes_sinkhole_single_response,
 } from "./outputs.js";
-import {
-  intel_sinkholes_identifier,
-  intel_sinkholes_sinkhole_create_params,
-} from "./schemas.js";
+import { intel$$sinkholes_sinkhole_create_params } from "./schemas.js";
 
 /**
  * The tools of `intel.sinkholes`.
@@ -23,34 +20,43 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_create",
     title: "Create a new sinkhole for your account",
-    description: "Create a new sinkhole. Logs of large request bodies will be truncated, but the full request body can be recorded in R2. If you wish to record large request bodies in R2, include the R2 key ID, key secret, and bucket name in the request body.",
+    description: "Create a new sinkhole. Logs of large request bodies will be truncated, but the full request body can be recorded in R2. If you wish to record large request bodies in R2, include the R2 key ID, key secret, and bucket name in the request body.\n\nPOST /accounts/{account_id}/intel/sinkholes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare account."
-        },
         "body": {
           "$ref": "#/$defs/intel-sinkholes_sinkhole_create_params"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The unique identifier for the Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-        "intel-sinkholes_sinkhole_create_params": intel_sinkholes_sinkhole_create_params,
+        "intel-sinkholes_sinkhole_create_params": intel$$sinkholes_sinkhole_create_params,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_sinkhole_single_response",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
-        "intel-sinkholes_sinkhole_item": intel_sinkholes_sinkhole_item_output,
-        "intel-sinkholes_sinkhole_single_response": intel_sinkholes_sinkhole_single_response_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
+        "intel-sinkholes_sinkhole_item": intel$$sinkholes_sinkhole_item,
+        "intel-sinkholes_sinkhole_single_response": intel$$sinkholes_sinkhole_single_response,
       },
     },
     annotations: {
@@ -77,11 +83,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
-        "intel-sinkholes_sinkhole_item": intel_sinkholes_sinkhole_item_output,
-        "intel-sinkholes_sinkhole_single_response": intel_sinkholes_sinkhole_single_response_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
+        "intel-sinkholes_sinkhole_item": intel$$sinkholes_sinkhole_item,
+        "intel-sinkholes_sinkhole_single_response": intel$$sinkholes_sinkhole_single_response,
       },
     },
     request: (args) => ({
@@ -92,33 +98,40 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_delete",
     title: "Delete a sinkhole",
-    description: "Delete the specified sinkhole. The sinkhole must not have any active ingress rules defined. A 409 response code indicates that this condition is not met.",
+    description: "Delete the specified sinkhole. The sinkhole must not have any active ingress rules defined. A 409 response code indicates that this condition is not met.\n\nDELETE /accounts/{account_id}/intel/sinkholes/{sinkhole_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare account."
-        },
-        "sinkhole_id": {
-          "description": "The unique identifier for the sinkhole.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The unique identifier for the Cloudflare account.",
+              "type": "string"
+            },
+            "sinkhole_id": {
+              "description": "The unique identifier for the sinkhole.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sinkhole_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sinkhole_id"
+        "path"
       ],
-      $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_api_response_single_empty",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_single_empty": intel_sinkholes_api_response_single_empty_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_single_empty": intel$$sinkholes_api_response_single_empty,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     annotations: {
@@ -148,10 +161,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_api_response_single_empty": intel_sinkholes_api_response_single_empty_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_api_response_single_empty": intel$$sinkholes_api_response_single_empty,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     request: (args) => ({
@@ -161,34 +174,41 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_get",
     title: "Get a sinkhole",
-    description: "Get the specified sinkhole by its unique identifier.",
+    description: "Get the specified sinkhole by its unique identifier.\n\nGET /accounts/{account_id}/intel/sinkholes/{sinkhole_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare account."
-        },
-        "sinkhole_id": {
-          "description": "The unique identifier for the sinkhole.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The unique identifier for the Cloudflare account.",
+              "type": "string"
+            },
+            "sinkhole_id": {
+              "description": "The unique identifier for the sinkhole.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sinkhole_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sinkhole_id"
+        "path"
       ],
-      $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_sinkhole_single_response",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
-        "intel-sinkholes_sinkhole_item": intel_sinkholes_sinkhole_item_output,
-        "intel-sinkholes_sinkhole_single_response": intel_sinkholes_sinkhole_single_response_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
+        "intel-sinkholes_sinkhole_item": intel$$sinkholes_sinkhole_item,
+        "intel-sinkholes_sinkhole_single_response": intel$$sinkholes_sinkhole_single_response,
       },
     },
     annotations: {
@@ -216,11 +236,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
-        "intel-sinkholes_sinkhole_item": intel_sinkholes_sinkhole_item_output,
-        "intel-sinkholes_sinkhole_single_response": intel_sinkholes_sinkhole_single_response_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
+        "intel-sinkholes_sinkhole_item": intel$$sinkholes_sinkhole_item,
+        "intel-sinkholes_sinkhole_single_response": intel$$sinkholes_sinkhole_single_response,
       },
     },
     request: (args) => ({
@@ -230,29 +250,36 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_list",
     title: "List sinkholes owned by this account",
-    description: "Lists sinkholes owned by the account for redirecting malicious traffic.",
+    description: "Lists sinkholes owned by the account for redirecting malicious traffic.\n\nGET /accounts/{account_id}/intel/sinkholes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The unique identifier for the Cloudflare account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_sinkhole_collection_response",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
-        "intel-sinkholes_sinkhole_collection_response": intel_sinkholes_sinkhole_collection_response_output,
-        "intel-sinkholes_sinkhole_item": intel_sinkholes_sinkhole_item_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
+        "intel-sinkholes_sinkhole_collection_response": intel$$sinkholes_sinkhole_collection_response,
+        "intel-sinkholes_sinkhole_item": intel$$sinkholes_sinkhole_item,
       },
     },
     annotations: {
@@ -280,11 +307,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
-        "intel-sinkholes_sinkhole_collection_response": intel_sinkholes_sinkhole_collection_response_output,
-        "intel-sinkholes_sinkhole_item": intel_sinkholes_sinkhole_item_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
+        "intel-sinkholes_sinkhole_collection_response": intel$$sinkholes_sinkhole_collection_response,
+        "intel-sinkholes_sinkhole_item": intel$$sinkholes_sinkhole_item,
       },
     },
     request: (args) => ({
@@ -294,38 +321,47 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_sinkholes_update",
     title: "Update a sinkhole",
-    description: "Replaces the name or R2 configuration of the specified sinkhole. This is a full replacement. All fields, including r2_secret, must be re-supplied. Omitting r2_secret overwrites the stored value with an empty string.",
+    description: "Replaces the name or R2 configuration of the specified sinkhole. This is a full replacement. All fields, including r2_secret, must be re-supplied. Omitting r2_secret overwrites the stored value with an empty string.\n\nPUT /accounts/{account_id}/intel/sinkholes/{sinkhole_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel-sinkholes_identifier",
-          "description": "The unique identifier for the Cloudflare account."
-        },
         "body": {
           "$ref": "#/$defs/intel-sinkholes_sinkhole_create_params"
         },
-        "sinkhole_id": {
-          "description": "The unique identifier for the sinkhole.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The unique identifier for the Cloudflare account.",
+              "type": "string"
+            },
+            "sinkhole_id": {
+              "description": "The unique identifier for the sinkhole.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sinkhole_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sinkhole_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "intel-sinkholes_identifier": intel_sinkholes_identifier,
-        "intel-sinkholes_sinkhole_create_params": intel_sinkholes_sinkhole_create_params,
+        "intel-sinkholes_sinkhole_create_params": intel$$sinkholes_sinkhole_create_params,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/intel-sinkholes_api_response_single_empty",
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_single_empty": intel_sinkholes_api_response_single_empty_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_single_empty": intel$$sinkholes_api_response_single_empty,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     annotations: {
@@ -352,10 +388,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel-sinkholes_api-response-common": intel_sinkholes_api_response_common_output,
-        "intel-sinkholes_api_response_common_failure": intel_sinkholes_api_response_common_failure_output,
-        "intel-sinkholes_api_response_single_empty": intel_sinkholes_api_response_single_empty_output,
-        "intel-sinkholes_messages": intel_sinkholes_messages_output,
+        "intel-sinkholes_api-response-common": intel$$sinkholes_api$$response$$common,
+        "intel-sinkholes_api_response_common_failure": intel$$sinkholes_api_response_common_failure,
+        "intel-sinkholes_api_response_single_empty": intel$$sinkholes_api_response_single_empty,
+        "intel-sinkholes_messages": intel$$sinkholes_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/intel/urls/outputs.ts b/src/generated/forge-mcp/intel/urls/outputs.ts
index 1d5ca5231..56fe72550 100644
--- a/src/generated/forge-mcp/intel/urls/outputs.ts
+++ b/src/generated/forge-mcp/intel/urls/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `intel_url_intelligence` in responses.
  */
-export const intel_url_intelligence_output: JsonSchema = {
+export const intel_url_intelligence: JsonSchema = {
   "properties": {
     "content_categories": {
       "items": {
@@ -43,7 +43,7 @@ export const intel_url_intelligence_output: JsonSchema = {
 /**
  * The schema of `intel_url_intelligence_category_with_source` in responses.
  */
-export const intel_url_intelligence_category_with_source_output: JsonSchema = {
+export const intel_url_intelligence_category_with_source: JsonSchema = {
   "properties": {
     "id": {
       "type": "integer"
@@ -64,7 +64,7 @@ export const intel_url_intelligence_category_with_source_output: JsonSchema = {
 /**
  * The schema of `intel_url_intelligence_single_response` in responses.
  */
-export const intel_url_intelligence_single_response_output: JsonSchema = {
+export const intel_url_intelligence_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/intel_api-response-single"
diff --git a/src/generated/forge-mcp/intel/urls/tools.ts b/src/generated/forge-mcp/intel/urls/tools.ts
index ddc82108a..1b3a560fb 100644
--- a/src/generated/forge-mcp/intel/urls/tools.ts
+++ b/src/generated/forge-mcp/intel/urls/tools.ts
@@ -1,18 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  intel_api_response_common_failure_output,
-  intel_api_response_single_output,
-  intel_messages_output,
-  intel_schemas_messages_output,
+  intel_api$$response$$common$$failure,
+  intel_api$$response$$single,
+  intel_messages,
+  intel_schemas$$messages,
 } from "../outputs.js";
-import { intel_identifier } from "../schemas.js";
 import {
-  intel_url_intelligence_category_with_source_output,
-  intel_url_intelligence_output,
-  intel_url_intelligence_single_response_output,
+  intel_url_intelligence,
+  intel_url_intelligence_category_with_source,
+  intel_url_intelligence_single_response,
 } from "./outputs.js";
 
 /**
@@ -22,35 +21,51 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_urls_get",
     title: "Get URL Intelligence",
-    description: "Gets security information about a URL, including content categories and risk types. The URL must be provided as a query parameter.",
+    description: "Gets security information about a URL, including content categories and risk types. The URL must be provided as a query parameter.\n\nGET /accounts/{account_id}/intel/url",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/intel_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "url": {
-          "description": "The URL to look up.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "url": {
+              "description": "The URL to look up.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "url"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "url"
+        "path",
+        "query"
       ],
-      $defs: {
-        "intel_identifier": intel_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/intel_url_intelligence_single_response",
       $defs: {
-        "intel_api-response-single": intel_api_response_single_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
-        "intel_url_intelligence": intel_url_intelligence_output,
-        "intel_url_intelligence_category_with_source": intel_url_intelligence_category_with_source_output,
-        "intel_url_intelligence_single_response": intel_url_intelligence_single_response_output,
+        "intel_api-response-single": intel_api$$response$$single,
+        "intel_schemas-messages": intel_schemas$$messages,
+        "intel_url_intelligence": intel_url_intelligence,
+        "intel_url_intelligence_category_with_source": intel_url_intelligence_category_with_source,
+        "intel_url_intelligence_single_response": intel_url_intelligence_single_response,
       },
     },
     annotations: {
@@ -85,19 +100,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "intel_api-response-common-failure": intel_api_response_common_failure_output,
-        "intel_api-response-single": intel_api_response_single_output,
-        "intel_messages": intel_messages_output,
-        "intel_schemas-messages": intel_schemas_messages_output,
-        "intel_url_intelligence": intel_url_intelligence_output,
-        "intel_url_intelligence_category_with_source": intel_url_intelligence_category_with_source_output,
-        "intel_url_intelligence_single_response": intel_url_intelligence_single_response_output,
+        "intel_api-response-common-failure": intel_api$$response$$common$$failure,
+        "intel_api-response-single": intel_api$$response$$single,
+        "intel_messages": intel_messages,
+        "intel_schemas-messages": intel_schemas$$messages,
+        "intel_url_intelligence": intel_url_intelligence,
+        "intel_url_intelligence_category_with_source": intel_url_intelligence_category_with_source,
+        "intel_url_intelligence_single_response": intel_url_intelligence_single_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/intel/url`,
       query: [
-        ["url", args["url"], true],
+        ["url", param(args, "query", "url"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/intel/whois/outputs.ts b/src/generated/forge-mcp/intel/whois/outputs.ts
index a6f71f8fe..7225bb1fa 100644
--- a/src/generated/forge-mcp/intel/whois/outputs.ts
+++ b/src/generated/forge-mcp/intel/whois/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `cloudforce-one-whois_api-response-common-failure` in
  * responses.
  */
-export const cloudforce_one_whois_api_response_common_failure_output: JsonSchema = {
+export const cloudforce$$one$$whois_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cloudforce-one-whois_messages"
@@ -37,7 +37,7 @@ export const cloudforce_one_whois_api_response_common_failure_output: JsonSchema
 /**
  * The schema of `cloudforce-one-whois_api-response-single` in responses.
  */
-export const cloudforce_one_whois_api_response_single_output: JsonSchema = {
+export const cloudforce$$one$$whois_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cloudforce-one-whois_schemas-messages"
@@ -60,17 +60,10 @@ export const cloudforce_one_whois_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cloudforce-one-whois_domain_name` in responses.
- */
-export const cloudforce_one_whois_domain_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `cloudforce-one-whois_messages` in responses.
  */
-export const cloudforce_one_whois_messages_output: JsonSchema = {
+export const cloudforce$$one$$whois_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -92,7 +85,7 @@ export const cloudforce_one_whois_messages_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one-whois_schemas-messages` in responses.
  */
-export const cloudforce_one_whois_schemas_messages_output: JsonSchema = {
+export const cloudforce$$one$$whois_schemas$$messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -125,7 +118,7 @@ export const cloudforce_one_whois_schemas_messages_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one-whois_schemas-single_response` in responses.
  */
-export const cloudforce_one_whois_schemas_single_response_output: JsonSchema = {
+export const cloudforce$$one$$whois_schemas$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudforce-one-whois_api-response-single"
@@ -144,7 +137,7 @@ export const cloudforce_one_whois_schemas_single_response_output: JsonSchema = {
 /**
  * The schema of `cloudforce-one-whois_whois` in responses.
  */
-export const cloudforce_one_whois_whois_output: JsonSchema = {
+export const cloudforce$$one$$whois_whois: JsonSchema = {
   "properties": {
     "administrative_city": {
       "type": "string"
@@ -241,7 +234,7 @@ export const cloudforce_one_whois_whois_output: JsonSchema = {
       "type": "boolean"
     },
     "domain": {
-      "$ref": "#/$defs/cloudforce-one-whois_domain_name"
+      "type": "string"
     },
     "expiration_date": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/intel/whois/schemas.ts b/src/generated/forge-mcp/intel/whois/schemas.ts
deleted file mode 100644
index 98a1d2f4b..000000000
--- a/src/generated/forge-mcp/intel/whois/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `cloudforce-one-whois_identifier`.
- */
-export const cloudforce_one_whois_identifier: JsonSchema = {
-  "description": "Use to uniquely identify or reference the resource.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/intel/whois/tools.ts b/src/generated/forge-mcp/intel/whois/tools.ts
index bb8fd8d95..418df472c 100644
--- a/src/generated/forge-mcp/intel/whois/tools.ts
+++ b/src/generated/forge-mcp/intel/whois/tools.ts
@@ -1,17 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  cloudforce_one_whois_api_response_common_failure_output,
-  cloudforce_one_whois_api_response_single_output,
-  cloudforce_one_whois_domain_name_output,
-  cloudforce_one_whois_messages_output,
-  cloudforce_one_whois_schemas_messages_output,
-  cloudforce_one_whois_schemas_single_response_output,
-  cloudforce_one_whois_whois_output,
+  cloudforce$$one$$whois_api$$response$$common$$failure,
+  cloudforce$$one$$whois_api$$response$$single,
+  cloudforce$$one$$whois_messages,
+  cloudforce$$one$$whois_schemas$$messages,
+  cloudforce$$one$$whois_schemas$$single_response,
+  cloudforce$$one$$whois_whois,
 } from "./outputs.js";
-import { cloudforce_one_whois_identifier } from "./schemas.js";
 
 /**
  * The tools of `intel.whois`.
@@ -20,33 +18,45 @@ export const tools: readonly Tool[] = [
   {
     name: "intel_whois_get",
     title: "Get WHOIS Record",
-    description: "Retrieves WHOIS registration data for a domain, including registrant and nameserver information.",
+    description: "Retrieves WHOIS registration data for a domain, including registrant and nameserver information.\n\nGET /accounts/{account_id}/intel/whois",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudforce-one-whois_identifier",
-          "description": "Use to uniquely identify or reference the resource."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Use to uniquely identify or reference the resource.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "domain": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "domain": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "cloudforce-one-whois_identifier": cloudforce_one_whois_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudforce-one-whois_schemas-single_response",
       $defs: {
-        "cloudforce-one-whois_api-response-single": cloudforce_one_whois_api_response_single_output,
-        "cloudforce-one-whois_domain_name": cloudforce_one_whois_domain_name_output,
-        "cloudforce-one-whois_schemas-messages": cloudforce_one_whois_schemas_messages_output,
-        "cloudforce-one-whois_schemas-single_response": cloudforce_one_whois_schemas_single_response_output,
-        "cloudforce-one-whois_whois": cloudforce_one_whois_whois_output,
+        "cloudforce-one-whois_api-response-single": cloudforce$$one$$whois_api$$response$$single,
+        "cloudforce-one-whois_schemas-messages": cloudforce$$one$$whois_schemas$$messages,
+        "cloudforce-one-whois_schemas-single_response": cloudforce$$one$$whois_schemas$$single_response,
+        "cloudforce-one-whois_whois": cloudforce$$one$$whois_whois,
       },
     },
     annotations: {
@@ -74,19 +84,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cloudforce-one-whois_api-response-common-failure": cloudforce_one_whois_api_response_common_failure_output,
-        "cloudforce-one-whois_api-response-single": cloudforce_one_whois_api_response_single_output,
-        "cloudforce-one-whois_domain_name": cloudforce_one_whois_domain_name_output,
-        "cloudforce-one-whois_messages": cloudforce_one_whois_messages_output,
-        "cloudforce-one-whois_schemas-messages": cloudforce_one_whois_schemas_messages_output,
-        "cloudforce-one-whois_schemas-single_response": cloudforce_one_whois_schemas_single_response_output,
-        "cloudforce-one-whois_whois": cloudforce_one_whois_whois_output,
+        "cloudforce-one-whois_api-response-common-failure": cloudforce$$one$$whois_api$$response$$common$$failure,
+        "cloudforce-one-whois_api-response-single": cloudforce$$one$$whois_api$$response$$single,
+        "cloudforce-one-whois_messages": cloudforce$$one$$whois_messages,
+        "cloudforce-one-whois_schemas-messages": cloudforce$$one$$whois_schemas$$messages,
+        "cloudforce-one-whois_schemas-single_response": cloudforce$$one$$whois_schemas$$single_response,
+        "cloudforce-one-whois_whois": cloudforce$$one$$whois_whois,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/intel/whois`,
       query: [
-        ["domain", args["domain"], true],
+        ["domain", param(args, "query", "domain"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/internal/submit/tools.ts b/src/generated/forge-mcp/internal/submit/tools.ts
index 2594c2e96..bff795631 100644
--- a/src/generated/forge-mcp/internal/submit/tools.ts
+++ b/src/generated/forge-mcp/internal/submit/tools.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 
 import type { Tool } from "../../_/tool.js";
-import { brand_protection_api_Error_output } from "../../outputs.js";
+import { brand$$protection$$api_Error } from "../../outputs.js";
 
 /**
  * The tools of `internal.submit`.
@@ -11,10 +11,11 @@ export const tools: readonly Tool[] = [
   {
     name: "internal_submit_create",
     title: "Internal route for testing URL submissions",
-    description: "Internal route for testing URL submissions.",
+    description: "Internal route for testing URL submissions.\n\nPOST /internal/submit",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -45,7 +46,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "brand-protection-api_Error": brand_protection_api_Error_output,
+        "brand-protection-api_Error": brand$$protection$$api_Error,
       },
     },
     request: (_args) => ({
diff --git a/src/generated/forge-mcp/ips/outputs.ts b/src/generated/forge-mcp/ips/outputs.ts
index 60f0cb6a4..c2ed77507 100644
--- a/src/generated/forge-mcp/ips/outputs.ts
+++ b/src/generated/forge-mcp/ips/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `public-ip_api-response-common-failure` in responses.
  */
-export const public_ip_api_response_common_failure_output: JsonSchema = {
+export const public$$ip_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/public-ip_messages"
@@ -36,7 +36,7 @@ export const public_ip_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `public-ip_api-response-single` in responses.
  */
-export const public_ip_api_response_single_output: JsonSchema = {
+export const public$$ip_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/public-ip_messages"
@@ -59,20 +59,13 @@ export const public_ip_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `public-ip_etag` in responses.
- */
-export const public_ip_etag_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `public-ip_ips` in responses.
  */
-export const public_ip_ips_output: JsonSchema = {
+export const public$$ip_ips: JsonSchema = {
   "properties": {
     "etag": {
-      "$ref": "#/$defs/public-ip_etag"
+      "type": "string"
     },
     "ipv4_cidrs": {
       "$ref": "#/$defs/public-ip_ipv4_cidrs"
@@ -87,10 +80,10 @@ export const public_ip_ips_output: JsonSchema = {
 /**
  * The schema of `public-ip_ips_jdcloud` in responses.
  */
-export const public_ip_ips_jdcloud_output: JsonSchema = {
+export const public$$ip_ips_jdcloud: JsonSchema = {
   "properties": {
     "etag": {
-      "$ref": "#/$defs/public-ip_etag"
+      "type": "string"
     },
     "ipv4_cidrs": {
       "$ref": "#/$defs/public-ip_ipv4_cidrs"
@@ -108,7 +101,7 @@ export const public_ip_ips_jdcloud_output: JsonSchema = {
 /**
  * The schema of `public-ip_ipv4_cidrs` in responses.
  */
-export const public_ip_ipv4_cidrs_output: JsonSchema = {
+export const public$$ip_ipv4_cidrs: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -118,7 +111,7 @@ export const public_ip_ipv4_cidrs_output: JsonSchema = {
 /**
  * The schema of `public-ip_ipv6_cidrs` in responses.
  */
-export const public_ip_ipv6_cidrs_output: JsonSchema = {
+export const public$$ip_ipv6_cidrs: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -128,7 +121,7 @@ export const public_ip_ipv6_cidrs_output: JsonSchema = {
 /**
  * The schema of `public-ip_jdcloud_cidrs` in responses.
  */
-export const public_ip_jdcloud_cidrs_output: JsonSchema = {
+export const public$$ip_jdcloud_cidrs: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -138,7 +131,7 @@ export const public_ip_jdcloud_cidrs_output: JsonSchema = {
 /**
  * The schema of `public-ip_messages` in responses.
  */
-export const public_ip_messages_output: JsonSchema = {
+export const public$$ip_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/ips/tools.ts b/src/generated/forge-mcp/ips/tools.ts
index d93688bfa..ac44d8fa1 100644
--- a/src/generated/forge-mcp/ips/tools.ts
+++ b/src/generated/forge-mcp/ips/tools.ts
@@ -1,17 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../_/tool.js";
+import { type Tool, param } from "../_/tool.js";
 import {
-  public_ip_api_response_common_failure_output,
-  public_ip_api_response_single_output,
-  public_ip_etag_output,
-  public_ip_ips_jdcloud_output,
-  public_ip_ips_output,
-  public_ip_ipv4_cidrs_output,
-  public_ip_ipv6_cidrs_output,
-  public_ip_jdcloud_cidrs_output,
-  public_ip_messages_output,
+  public$$ip_api$$response$$common$$failure,
+  public$$ip_api$$response$$single,
+  public$$ip_ips,
+  public$$ip_ips_jdcloud,
+  public$$ip_ipv4_cidrs,
+  public$$ip_ipv6_cidrs,
+  public$$ip_jdcloud_cidrs,
+  public$$ip_messages,
 } from "./outputs.js";
 
 /**
@@ -21,15 +20,22 @@ export const tools: readonly Tool[] = [
   {
     name: "ips_list",
     title: "Cloudflare/JD Cloud IP Details",
-    description: "Get IPs used on the Cloudflare/JD Cloud network, see https://www.cloudflare.com/ips for Cloudflare IPs or https://developers.cloudflare.com/china-network/reference/infrastructure/ for JD Cloud IPs.",
+    description: "Get IPs used on the Cloudflare/JD Cloud network, see https://www.cloudflare.com/ips for Cloudflare IPs or https://developers.cloudflare.com/china-network/reference/infrastructure/ for JD Cloud IPs.\n\nGET /ips",
     inputSchema: {
       type: "object",
       properties: {
-        "networks": {
-          "description": "Specified as `jdcloud` to list IPs used by JD Cloud data centers.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "networks": {
+              "description": "Specified as `jdcloud` to list IPs used by JD Cloud data centers.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -53,14 +59,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "public-ip_api-response-single": public_ip_api_response_single_output,
-        "public-ip_etag": public_ip_etag_output,
-        "public-ip_ips": public_ip_ips_output,
-        "public-ip_ips_jdcloud": public_ip_ips_jdcloud_output,
-        "public-ip_ipv4_cidrs": public_ip_ipv4_cidrs_output,
-        "public-ip_ipv6_cidrs": public_ip_ipv6_cidrs_output,
-        "public-ip_jdcloud_cidrs": public_ip_jdcloud_cidrs_output,
-        "public-ip_messages": public_ip_messages_output,
+        "public-ip_api-response-single": public$$ip_api$$response$$single,
+        "public-ip_ips": public$$ip_ips,
+        "public-ip_ips_jdcloud": public$$ip_ips_jdcloud,
+        "public-ip_ipv4_cidrs": public$$ip_ipv4_cidrs,
+        "public-ip_ipv6_cidrs": public$$ip_ipv6_cidrs,
+        "public-ip_jdcloud_cidrs": public$$ip_jdcloud_cidrs,
+        "public-ip_messages": public$$ip_messages,
       },
     },
     annotations: {
@@ -123,21 +128,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "public-ip_api-response-common-failure": public_ip_api_response_common_failure_output,
-        "public-ip_api-response-single": public_ip_api_response_single_output,
-        "public-ip_etag": public_ip_etag_output,
-        "public-ip_ips": public_ip_ips_output,
-        "public-ip_ips_jdcloud": public_ip_ips_jdcloud_output,
-        "public-ip_ipv4_cidrs": public_ip_ipv4_cidrs_output,
-        "public-ip_ipv6_cidrs": public_ip_ipv6_cidrs_output,
-        "public-ip_jdcloud_cidrs": public_ip_jdcloud_cidrs_output,
-        "public-ip_messages": public_ip_messages_output,
+        "public-ip_api-response-common-failure": public$$ip_api$$response$$common$$failure,
+        "public-ip_api-response-single": public$$ip_api$$response$$single,
+        "public-ip_ips": public$$ip_ips,
+        "public-ip_ips_jdcloud": public$$ip_ips_jdcloud,
+        "public-ip_ipv4_cidrs": public$$ip_ipv4_cidrs,
+        "public-ip_ipv6_cidrs": public$$ip_ipv6_cidrs,
+        "public-ip_jdcloud_cidrs": public$$ip_jdcloud_cidrs,
+        "public-ip_messages": public$$ip_messages,
       },
     },
     request: (args) => ({
       path: `/ips`,
       query: [
-        ["networks", args["networks"], true],
+        ["networks", param(args, "query", "networks"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/k2/streams/outputs.ts b/src/generated/forge-mcp/k2/streams/outputs.ts
index 18e812f75..a2393ea20 100644
--- a/src/generated/forge-mcp/k2/streams/outputs.ts
+++ b/src/generated/forge-mcp/k2/streams/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cloudflare-k2_K2Stream` in responses.
  */
-export const cloudflare_k2_K2Stream_output: JsonSchema = {
+export const cloudflare$$k2_K2Stream: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -19,7 +19,7 @@ export const cloudflare_k2_K2Stream_output: JsonSchema = {
       "$ref": "#/$defs/cloudflare-k2_K2StreamHttpInput"
     },
     "id": {
-      "$ref": "#/$defs/cloudflare-k2_workers-k2-stream-id"
+      "type": "string"
     },
     "modified_at": {
       "format": "date-time",
@@ -51,7 +51,7 @@ export const cloudflare_k2_K2Stream_output: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2StreamCorsOptions` in responses.
  */
-export const cloudflare_k2_K2StreamCorsOptions_output: JsonSchema = {
+export const cloudflare$$k2_K2StreamCorsOptions: JsonSchema = {
   "properties": {
     "origins": {
       "items": {
@@ -67,7 +67,7 @@ export const cloudflare_k2_K2StreamCorsOptions_output: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2StreamHttpInput` in responses.
  */
-export const cloudflare_k2_K2StreamHttpInput_output: JsonSchema = {
+export const cloudflare$$k2_K2StreamHttpInput: JsonSchema = {
   "properties": {
     "authentication": {
       "type": "boolean"
@@ -88,7 +88,7 @@ export const cloudflare_k2_K2StreamHttpInput_output: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2StreamListResponse` in responses.
  */
-export const cloudflare_k2_K2StreamListResponse_output: JsonSchema = {
+export const cloudflare$$k2_K2StreamListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cloudflare-k2_workers-k2-messages"
@@ -126,7 +126,7 @@ export const cloudflare_k2_K2StreamListResponse_output: JsonSchema = {
       "type": "object"
     },
     "success": {
-      "$ref": "#/$defs/cloudflare-k2_workers-k2-common-success"
+      "type": "boolean"
     }
   },
   "required": [
@@ -142,7 +142,7 @@ export const cloudflare_k2_K2StreamListResponse_output: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2StreamResponse` in responses.
  */
-export const cloudflare_k2_K2StreamResponse_output: JsonSchema = {
+export const cloudflare$$k2_K2StreamResponse: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cloudflare-k2_workers-k2-messages"
@@ -154,7 +154,7 @@ export const cloudflare_k2_K2StreamResponse_output: JsonSchema = {
       "$ref": "#/$defs/cloudflare-k2_K2Stream"
     },
     "success": {
-      "$ref": "#/$defs/cloudflare-k2_workers-k2-common-success"
+      "type": "boolean"
     }
   },
   "required": [
@@ -169,7 +169,7 @@ export const cloudflare_k2_K2StreamResponse_output: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2StreamWorkerBindingInput` in responses.
  */
-export const cloudflare_k2_K2StreamWorkerBindingInput_output: JsonSchema = {
+export const cloudflare$$k2_K2StreamWorkerBindingInput: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -202,17 +202,10 @@ export const cloudflare_k2_K2StreamWorkerBindingInput_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `cloudflare-k2_workers-k2-common-success` in responses.
- */
-export const cloudflare_k2_workers_k2_common_success_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `cloudflare-k2_workers-k2-messages` in responses.
  */
-export const cloudflare_k2_workers_k2_messages_output: JsonSchema = {
+export const cloudflare$$k2_workers$$k2$$messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -229,10 +222,3 @@ export const cloudflare_k2_workers_k2_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `cloudflare-k2_workers-k2-stream-id` in responses.
- */
-export const cloudflare_k2_workers_k2_stream_id_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/k2/streams/schemas.ts b/src/generated/forge-mcp/k2/streams/schemas.ts
index 2d11c4cfd..54d2bf03e 100644
--- a/src/generated/forge-mcp/k2/streams/schemas.ts
+++ b/src/generated/forge-mcp/k2/streams/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cloudflare-k2_CreateK2StreamRequest`.
  */
-export const cloudflare_k2_CreateK2StreamRequest: JsonSchema = {
+export const cloudflare$$k2_CreateK2StreamRequest: JsonSchema = {
   "properties": {
     "http": {
       "$ref": "#/$defs/cloudflare-k2_K2StreamHttpInput",
@@ -39,7 +39,7 @@ export const cloudflare_k2_CreateK2StreamRequest: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2StreamCorsOptions`.
  */
-export const cloudflare_k2_K2StreamCorsOptions: JsonSchema = {
+export const cloudflare$$k2_K2StreamCorsOptions: JsonSchema = {
   "properties": {
     "origins": {
       "description": "Allows browser requests from these HTTP or HTTPS origins. Use a wildcard only as the sole origin. An empty list blocks cross-origin browser requests. Defaults to `['*']` when HTTP is enabled without stored origins.",
@@ -56,7 +56,7 @@ export const cloudflare_k2_K2StreamCorsOptions: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2StreamHttpInput`.
  */
-export const cloudflare_k2_K2StreamHttpInput: JsonSchema = {
+export const cloudflare$$k2_K2StreamHttpInput: JsonSchema = {
   "description": "Configures the HTTP endpoint. Disabling HTTP keeps `authentication` and `cors`, so enabling it again restores them.",
   "properties": {
     "authentication": {
@@ -80,7 +80,7 @@ export const cloudflare_k2_K2StreamHttpInput: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2StreamWorkerBindingInput`.
  */
-export const cloudflare_k2_K2StreamWorkerBindingInput: JsonSchema = {
+export const cloudflare$$k2_K2StreamWorkerBindingInput: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -118,7 +118,7 @@ export const cloudflare_k2_K2StreamWorkerBindingInput: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_UpdateK2StreamRequest`.
  */
-export const cloudflare_k2_UpdateK2StreamRequest: JsonSchema = {
+export const cloudflare$$k2_UpdateK2StreamRequest: JsonSchema = {
   "properties": {
     "http": {
       "$ref": "#/$defs/cloudflare-k2_K2StreamHttpInput",
@@ -134,19 +134,3 @@ export const cloudflare_k2_UpdateK2StreamRequest: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `cloudflare-k2_workers-k2-account-id`.
- */
-export const cloudflare_k2_workers_k2_account_id: JsonSchema = {
-  "description": "Specifies the public ID of the account.",
-  "type": "string"
-};
-
-/**
- * The schema of `cloudflare-k2_workers-k2-stream-id`.
- */
-export const cloudflare_k2_workers_k2_stream_id: JsonSchema = {
-  "description": "Specifies the public ID of the K2 stream.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/k2/streams/subscriptions/outputs.ts b/src/generated/forge-mcp/k2/streams/subscriptions/outputs.ts
index fbb429e06..553f57948 100644
--- a/src/generated/forge-mcp/k2/streams/subscriptions/outputs.ts
+++ b/src/generated/forge-mcp/k2/streams/subscriptions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cloudflare-k2_K2ConsumerLag` in responses.
  */
-export const cloudflare_k2_K2ConsumerLag_output: JsonSchema = {
+export const cloudflare$$k2_K2ConsumerLag: JsonSchema = {
   "properties": {
     "records": {
       "oneOf": [
@@ -37,7 +37,7 @@ export const cloudflare_k2_K2ConsumerLag_output: JsonSchema = {
 /**
  * The schema of `cloudflare-k2_K2MonitoredSubscription` in responses.
  */
-export const cloudflare_k2_K2MonitoredSubscription_output: JsonSchema = {
+export const cloudflare$$k2_K2MonitoredSubscription: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -87,7 +87,7 @@ export const cloudflare_k2_K2MonitoredSubscription_output: JsonSchema = {
  * The schema of `cloudflare-k2_K2MonitoredSubscriptionListResponse` in
  * responses.
  */
-export const cloudflare_k2_K2MonitoredSubscriptionListResponse_output: JsonSchema = {
+export const cloudflare$$k2_K2MonitoredSubscriptionListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cloudflare-k2_workers-k2-messages"
@@ -102,7 +102,7 @@ export const cloudflare_k2_K2MonitoredSubscriptionListResponse_output: JsonSchem
       "type": "array"
     },
     "success": {
-      "$ref": "#/$defs/cloudflare-k2_workers-k2-common-success"
+      "type": "boolean"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/k2/streams/subscriptions/tools.ts b/src/generated/forge-mcp/k2/streams/subscriptions/tools.ts
index 23a637e46..88f682a77 100644
--- a/src/generated/forge-mcp/k2/streams/subscriptions/tools.ts
+++ b/src/generated/forge-mcp/k2/streams/subscriptions/tools.ts
@@ -2,18 +2,11 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../../_/tool.js";
+import { cloudflare$$k2_workers$$k2$$messages } from "../outputs.js";
 import {
-  cloudflare_k2_workers_k2_common_success_output,
-  cloudflare_k2_workers_k2_messages_output,
-} from "../outputs.js";
-import {
-  cloudflare_k2_workers_k2_account_id,
-  cloudflare_k2_workers_k2_stream_id,
-} from "../schemas.js";
-import {
-  cloudflare_k2_K2ConsumerLag_output,
-  cloudflare_k2_K2MonitoredSubscriptionListResponse_output,
-  cloudflare_k2_K2MonitoredSubscription_output,
+  cloudflare$$k2_K2ConsumerLag,
+  cloudflare$$k2_K2MonitoredSubscription,
+  cloudflare$$k2_K2MonitoredSubscriptionListResponse,
 } from "./outputs.js";
 
 /**
@@ -23,36 +16,41 @@ export const tools: readonly Tool[] = [
   {
     name: "k2_streams_subscriptions_list",
     title: "List subscriptions with consumer lag",
-    description: "Lists every subscription on one stream, oldest first. Lag uses committed positions, not reserved read positions. A failed tail observation preserves subscription metadata and returns unavailable lag.\n\nThis method is beta.",
+    description: "Lists every subscription on one stream, oldest first. Lag uses committed positions, not reserved read positions. A failed tail observation preserves subscription metadata and returns unavailable lag.\n\nThis method is beta.\n\nGET /accounts/{account_id}/k2/streams/{stream_id}/subscriptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "stream_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-stream-id",
-          "description": "Specifies the public ID of the K2 stream."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "stream_id": {
+              "description": "Specifies the public ID of the K2 stream.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "stream_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "stream_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-k2_workers-k2-account-id": cloudflare_k2_workers_k2_account_id,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudflare-k2_K2MonitoredSubscriptionListResponse",
       $defs: {
-        "cloudflare-k2_K2ConsumerLag": cloudflare_k2_K2ConsumerLag_output,
-        "cloudflare-k2_K2MonitoredSubscription": cloudflare_k2_K2MonitoredSubscription_output,
-        "cloudflare-k2_K2MonitoredSubscriptionListResponse": cloudflare_k2_K2MonitoredSubscriptionListResponse_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
+        "cloudflare-k2_K2ConsumerLag": cloudflare$$k2_K2ConsumerLag,
+        "cloudflare-k2_K2MonitoredSubscription": cloudflare$$k2_K2MonitoredSubscription,
+        "cloudflare-k2_K2MonitoredSubscriptionListResponse": cloudflare$$k2_K2MonitoredSubscriptionListResponse,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     annotations: {
@@ -81,11 +79,10 @@ export const tools: readonly Tool[] = [
         "5XX": null
       },
       $defs: {
-        "cloudflare-k2_K2ConsumerLag": cloudflare_k2_K2ConsumerLag_output,
-        "cloudflare-k2_K2MonitoredSubscription": cloudflare_k2_K2MonitoredSubscription_output,
-        "cloudflare-k2_K2MonitoredSubscriptionListResponse": cloudflare_k2_K2MonitoredSubscriptionListResponse_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
+        "cloudflare-k2_K2ConsumerLag": cloudflare$$k2_K2ConsumerLag,
+        "cloudflare-k2_K2MonitoredSubscription": cloudflare$$k2_K2MonitoredSubscription,
+        "cloudflare-k2_K2MonitoredSubscriptionListResponse": cloudflare$$k2_K2MonitoredSubscriptionListResponse,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/k2/streams/tools.ts b/src/generated/forge-mcp/k2/streams/tools.ts
index b0b9c0a83..5bf2cd81e 100644
--- a/src/generated/forge-mcp/k2/streams/tools.ts
+++ b/src/generated/forge-mcp/k2/streams/tools.ts
@@ -1,26 +1,22 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  cloudflare_k2_K2StreamCorsOptions_output,
-  cloudflare_k2_K2StreamHttpInput_output,
-  cloudflare_k2_K2StreamListResponse_output,
-  cloudflare_k2_K2StreamResponse_output,
-  cloudflare_k2_K2StreamWorkerBindingInput_output,
-  cloudflare_k2_K2Stream_output,
-  cloudflare_k2_workers_k2_common_success_output,
-  cloudflare_k2_workers_k2_messages_output,
-  cloudflare_k2_workers_k2_stream_id_output,
+  cloudflare$$k2_K2Stream,
+  cloudflare$$k2_K2StreamCorsOptions,
+  cloudflare$$k2_K2StreamHttpInput,
+  cloudflare$$k2_K2StreamListResponse,
+  cloudflare$$k2_K2StreamResponse,
+  cloudflare$$k2_K2StreamWorkerBindingInput,
+  cloudflare$$k2_workers$$k2$$messages,
 } from "./outputs.js";
 import {
-  cloudflare_k2_CreateK2StreamRequest,
-  cloudflare_k2_K2StreamCorsOptions,
-  cloudflare_k2_K2StreamHttpInput,
-  cloudflare_k2_K2StreamWorkerBindingInput,
-  cloudflare_k2_UpdateK2StreamRequest,
-  cloudflare_k2_workers_k2_account_id,
-  cloudflare_k2_workers_k2_stream_id,
+  cloudflare$$k2_CreateK2StreamRequest,
+  cloudflare$$k2_K2StreamCorsOptions as cloudflare$$k2_K2StreamCorsOptions$,
+  cloudflare$$k2_K2StreamHttpInput as cloudflare$$k2_K2StreamHttpInput$,
+  cloudflare$$k2_K2StreamWorkerBindingInput as cloudflare$$k2_K2StreamWorkerBindingInput$,
+  cloudflare$$k2_UpdateK2StreamRequest,
 } from "./schemas.js";
 
 /**
@@ -30,41 +26,48 @@ export const tools: readonly Tool[] = [
   {
     name: "k2_streams_create",
     title: "Create K2 stream",
-    description: "Create a new K2 stream. HTTP is disabled when `http` is omitted. Enabled HTTP requires authentication and allows all origins unless `authentication` or `cors` say otherwise. At least one input must be enabled.\n\nThis method is beta.",
+    description: "Create a new K2 stream. HTTP is disabled when `http` is omitted. Enabled HTTP requires authentication and allows all origins unless `authentication` or `cors` say otherwise. At least one input must be enabled.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/k2/streams",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-account-id",
-          "description": "Specifies the public ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/cloudflare-k2_CreateK2StreamRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudflare-k2_CreateK2StreamRequest": cloudflare_k2_CreateK2StreamRequest,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput,
-        "cloudflare-k2_workers-k2-account-id": cloudflare_k2_workers_k2_account_id,
+        "cloudflare-k2_CreateK2StreamRequest": cloudflare$$k2_CreateK2StreamRequest,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions$,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput$,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudflare-k2_K2StreamResponse",
       $defs: {
-        "cloudflare-k2_K2Stream": cloudflare_k2_K2Stream_output,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions_output,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput_output,
-        "cloudflare-k2_K2StreamResponse": cloudflare_k2_K2StreamResponse_output,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id_output,
+        "cloudflare-k2_K2Stream": cloudflare$$k2_K2Stream,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput,
+        "cloudflare-k2_K2StreamResponse": cloudflare$$k2_K2StreamResponse,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     annotations: {
@@ -93,14 +96,12 @@ export const tools: readonly Tool[] = [
         "5XX": null
       },
       $defs: {
-        "cloudflare-k2_K2Stream": cloudflare_k2_K2Stream_output,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions_output,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput_output,
-        "cloudflare-k2_K2StreamResponse": cloudflare_k2_K2StreamResponse_output,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id_output,
+        "cloudflare-k2_K2Stream": cloudflare$$k2_K2Stream,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput,
+        "cloudflare-k2_K2StreamResponse": cloudflare$$k2_K2StreamResponse,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     request: (args) => ({
@@ -111,27 +112,33 @@ export const tools: readonly Tool[] = [
   {
     name: "k2_streams_delete",
     title: "Delete K2 stream",
-    description: "Delete a K2 stream in an account. Deleting a stream that does not exist also succeeds.\n\nThis method is beta.",
+    description: "Delete a K2 stream in an account. Deleting a stream that does not exist also succeeds.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/k2/streams/{stream_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "stream_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-stream-id",
-          "description": "Specifies the public ID of the K2 stream."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "stream_id": {
+              "description": "Specifies the public ID of the K2 stream.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "stream_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "stream_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-k2_workers-k2-account-id": cloudflare_k2_workers_k2_account_id,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -145,7 +152,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -156,8 +163,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     annotations: {
@@ -191,7 +197,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-k2_workers-k2-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -206,8 +212,7 @@ export const tools: readonly Tool[] = [
         "5XX": null
       },
       $defs: {
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     request: (args) => ({
@@ -217,39 +222,43 @@ export const tools: readonly Tool[] = [
   {
     name: "k2_streams_get",
     title: "Get K2 stream",
-    description: "Get K2 stream details.\n\nThis method is beta.",
+    description: "Get K2 stream details.\n\nThis method is beta.\n\nGET /accounts/{account_id}/k2/streams/{stream_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "stream_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-stream-id",
-          "description": "Specifies the public ID of the K2 stream."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "stream_id": {
+              "description": "Specifies the public ID of the K2 stream.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "stream_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "stream_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-k2_workers-k2-account-id": cloudflare_k2_workers_k2_account_id,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudflare-k2_K2StreamResponse",
       $defs: {
-        "cloudflare-k2_K2Stream": cloudflare_k2_K2Stream_output,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions_output,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput_output,
-        "cloudflare-k2_K2StreamResponse": cloudflare_k2_K2StreamResponse_output,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id_output,
+        "cloudflare-k2_K2Stream": cloudflare$$k2_K2Stream,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput,
+        "cloudflare-k2_K2StreamResponse": cloudflare$$k2_K2StreamResponse,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     annotations: {
@@ -278,14 +287,12 @@ export const tools: readonly Tool[] = [
         "5XX": null
       },
       $defs: {
-        "cloudflare-k2_K2Stream": cloudflare_k2_K2Stream_output,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions_output,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput_output,
-        "cloudflare-k2_K2StreamResponse": cloudflare_k2_K2StreamResponse_output,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id_output,
+        "cloudflare-k2_K2Stream": cloudflare$$k2_K2Stream,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput,
+        "cloudflare-k2_K2StreamResponse": cloudflare$$k2_K2StreamResponse,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     request: (args) => ({
@@ -295,45 +302,56 @@ export const tools: readonly Tool[] = [
   {
     name: "k2_streams_list",
     title: "List K2 streams",
-    description: "List or filter K2 streams in an account.\n\nThis method is beta.",
+    description: "List or filter K2 streams in an account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/k2/streams",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "name": {
-          "description": "Filters K2 streams by name using a case-insensitive substring.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 25,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "Filters K2 streams by name using a case-insensitive substring.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 25,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-k2_workers-k2-account-id": cloudflare_k2_workers_k2_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cloudflare-k2_K2StreamListResponse",
       $defs: {
-        "cloudflare-k2_K2Stream": cloudflare_k2_K2Stream_output,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions_output,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput_output,
-        "cloudflare-k2_K2StreamListResponse": cloudflare_k2_K2StreamListResponse_output,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id_output,
+        "cloudflare-k2_K2Stream": cloudflare$$k2_K2Stream,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput,
+        "cloudflare-k2_K2StreamListResponse": cloudflare$$k2_K2StreamListResponse,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     annotations: {
@@ -362,69 +380,73 @@ export const tools: readonly Tool[] = [
         "5XX": null
       },
       $defs: {
-        "cloudflare-k2_K2Stream": cloudflare_k2_K2Stream_output,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions_output,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput_output,
-        "cloudflare-k2_K2StreamListResponse": cloudflare_k2_K2StreamListResponse_output,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id_output,
+        "cloudflare-k2_K2Stream": cloudflare$$k2_K2Stream,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput,
+        "cloudflare-k2_K2StreamListResponse": cloudflare$$k2_K2StreamListResponse,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/k2/streams`,
       query: [
-        ["name", args["name"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "k2_streams_update",
     title: "Update K2 stream",
-    description: "Update a K2 stream. Omitted `http` settings, such as `authentication` and `cors`, keep their current values. Disabling HTTP keeps them, so enabling HTTP again restores them. At least one input must remain enabled.\n\nThis method is beta.",
+    description: "Update a K2 stream. Omitted `http` settings, such as `authentication` and `cors`, keep their current values. Disabling HTTP keeps them, so enabling HTTP again restores them. At least one input must remain enabled.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/k2/streams/{stream_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-account-id",
-          "description": "Specifies the public ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/cloudflare-k2_UpdateK2StreamRequest"
         },
-        "stream_id": {
-          "$ref": "#/$defs/cloudflare-k2_workers-k2-stream-id",
-          "description": "Specifies the public ID of the K2 stream."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "stream_id": {
+              "description": "Specifies the public ID of the K2 stream.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "stream_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "stream_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput,
-        "cloudflare-k2_UpdateK2StreamRequest": cloudflare_k2_UpdateK2StreamRequest,
-        "cloudflare-k2_workers-k2-account-id": cloudflare_k2_workers_k2_account_id,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions$,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput$,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput$,
+        "cloudflare-k2_UpdateK2StreamRequest": cloudflare$$k2_UpdateK2StreamRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cloudflare-k2_K2StreamResponse",
       $defs: {
-        "cloudflare-k2_K2Stream": cloudflare_k2_K2Stream_output,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions_output,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput_output,
-        "cloudflare-k2_K2StreamResponse": cloudflare_k2_K2StreamResponse_output,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id_output,
+        "cloudflare-k2_K2Stream": cloudflare$$k2_K2Stream,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput,
+        "cloudflare-k2_K2StreamResponse": cloudflare$$k2_K2StreamResponse,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     annotations: {
@@ -453,14 +475,12 @@ export const tools: readonly Tool[] = [
         "5XX": null
       },
       $defs: {
-        "cloudflare-k2_K2Stream": cloudflare_k2_K2Stream_output,
-        "cloudflare-k2_K2StreamCorsOptions": cloudflare_k2_K2StreamCorsOptions_output,
-        "cloudflare-k2_K2StreamHttpInput": cloudflare_k2_K2StreamHttpInput_output,
-        "cloudflare-k2_K2StreamResponse": cloudflare_k2_K2StreamResponse_output,
-        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare_k2_K2StreamWorkerBindingInput_output,
-        "cloudflare-k2_workers-k2-common-success": cloudflare_k2_workers_k2_common_success_output,
-        "cloudflare-k2_workers-k2-messages": cloudflare_k2_workers_k2_messages_output,
-        "cloudflare-k2_workers-k2-stream-id": cloudflare_k2_workers_k2_stream_id_output,
+        "cloudflare-k2_K2Stream": cloudflare$$k2_K2Stream,
+        "cloudflare-k2_K2StreamCorsOptions": cloudflare$$k2_K2StreamCorsOptions,
+        "cloudflare-k2_K2StreamHttpInput": cloudflare$$k2_K2StreamHttpInput,
+        "cloudflare-k2_K2StreamResponse": cloudflare$$k2_K2StreamResponse,
+        "cloudflare-k2_K2StreamWorkerBindingInput": cloudflare$$k2_K2StreamWorkerBindingInput,
+        "cloudflare-k2_workers-k2-messages": cloudflare$$k2_workers$$k2$$messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/kv/bulk/outputs.ts b/src/generated/forge-mcp/kv/bulk/outputs.ts
index 1b08d6b6c..881241cfb 100644
--- a/src/generated/forge-mcp/kv/bulk/outputs.ts
+++ b/src/generated/forge-mcp/kv/bulk/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers-kv_bulk-get-result` in responses.
  */
-export const workers_kv_bulk_get_result_output: JsonSchema = {
+export const workers$$kv_bulk$$get$$result: JsonSchema = {
   "properties": {
     "values": {
       "additionalProperties": {
@@ -34,7 +34,7 @@ export const workers_kv_bulk_get_result_output: JsonSchema = {
 /**
  * The schema of `workers-kv_bulk-get-result-with-metadata` in responses.
  */
-export const workers_kv_bulk_get_result_with_metadata_output: JsonSchema = {
+export const workers$$kv_bulk$$get$$result$$with$$metadata: JsonSchema = {
   "properties": {
     "values": {
       "additionalProperties": {
@@ -42,7 +42,7 @@ export const workers_kv_bulk_get_result_with_metadata_output: JsonSchema = {
           {
             "properties": {
               "expiration": {
-                "$ref": "#/$defs/workers-kv_expiration"
+                "type": "number"
               },
               "metadata": {
                 "$ref": "#/$defs/workers-kv_any"
@@ -71,7 +71,7 @@ export const workers_kv_bulk_get_result_with_metadata_output: JsonSchema = {
 /**
  * The schema of `workers-kv_bulk-result` in responses.
  */
-export const workers_kv_bulk_result_output: JsonSchema = {
+export const workers$$kv_bulk$$result: JsonSchema = {
   "properties": {
     "successful_key_count": {
       "type": "number"
diff --git a/src/generated/forge-mcp/kv/bulk/schemas.ts b/src/generated/forge-mcp/kv/bulk/schemas.ts
index 8e2eac5f7..9b90e3530 100644
--- a/src/generated/forge-mcp/kv/bulk/schemas.ts
+++ b/src/generated/forge-mcp/kv/bulk/schemas.ts
@@ -6,9 +6,10 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers-kv_bulk_delete`.
  */
-export const workers_kv_bulk_delete: JsonSchema = {
+export const workers$$kv_bulk_delete: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/workers-kv_key_name_bulk"
+    "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid.",
+    "type": "string"
   },
   "maxItems": 10000,
   "type": "array"
@@ -17,7 +18,7 @@ export const workers_kv_bulk_delete: JsonSchema = {
 /**
  * The schema of `workers-kv_bulk_write`.
  */
-export const workers_kv_bulk_write: JsonSchema = {
+export const workers$$kv_bulk_write: JsonSchema = {
   "items": {
     "properties": {
       "base64": {
@@ -26,16 +27,16 @@ export const workers_kv_bulk_write: JsonSchema = {
         "type": "boolean"
       },
       "expiration": {
-        "$ref": "#/$defs/workers-kv_expiration",
-        "description": "Expires the key at a certain time, measured in number of seconds since the UNIX epoch."
+        "description": "Expires the key at a certain time, measured in number of seconds since the UNIX epoch.",
+        "type": "number"
       },
       "expiration_ttl": {
-        "$ref": "#/$defs/workers-kv_expiration_ttl",
-        "description": "Number of seconds until the key expires. Must be at least 60. Takes precedence over `expiration` when both are specified."
+        "description": "Number of seconds until the key expires. Must be at least 60. Takes precedence over `expiration` when both are specified.",
+        "type": "number"
       },
       "key": {
-        "$ref": "#/$defs/workers-kv_key_name_bulk",
-        "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid."
+        "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid.",
+        "type": "string"
       },
       "metadata": {
         "$ref": "#/$defs/workers-kv_list_metadata",
@@ -55,11 +56,3 @@ export const workers_kv_bulk_write: JsonSchema = {
   "maxItems": 10000,
   "type": "array"
 };
-
-/**
- * The schema of `workers-kv_key_name_bulk`.
- */
-export const workers_kv_key_name_bulk: JsonSchema = {
-  "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/kv/bulk/tools.ts b/src/generated/forge-mcp/kv/bulk/tools.ts
index 8b5cd7c5b..b4214c7fa 100644
--- a/src/generated/forge-mcp/kv/bulk/tools.ts
+++ b/src/generated/forge-mcp/kv/bulk/tools.ts
@@ -3,31 +3,22 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  workers_kv_any_output,
-  workers_kv_api_response_common_failure_output,
-  workers_kv_api_response_common_no_result_output,
-  workers_kv_api_response_common_output,
-  workers_kv_expiration_output,
-  workers_kv_messages_output,
+  workers$$kv_any,
+  workers$$kv_api$$response$$common,
+  workers$$kv_api$$response$$common$$failure,
+  workers$$kv_api$$response$$common$$no$$result,
+  workers$$kv_messages,
 } from "../outputs.js";
 import {
-  workers_kv_any,
-  workers_kv_expiration,
-  workers_kv_expiration_ttl,
-  workers_kv_identifier,
-  workers_kv_list_metadata,
-  workers_kv_namespace_identifier,
+  workers$$kv_any as workers$$kv_any$,
+  workers$$kv_list_metadata,
 } from "../schemas.js";
 import {
-  workers_kv_bulk_get_result_output,
-  workers_kv_bulk_get_result_with_metadata_output,
-  workers_kv_bulk_result_output,
+  workers$$kv_bulk$$get$$result,
+  workers$$kv_bulk$$get$$result$$with$$metadata,
+  workers$$kv_bulk$$result,
 } from "./outputs.js";
-import {
-  workers_kv_bulk_delete,
-  workers_kv_bulk_write,
-  workers_kv_key_name_bulk,
-} from "./schemas.js";
+import { workers$$kv_bulk_delete, workers$$kv_bulk_write } from "./schemas.js";
 
 /**
  * The tools of `kv.bulk`.
@@ -36,32 +27,39 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_bulk_delete",
     title: "Delete multiple key-value pairs",
-    description: "Deletes up to 10,000 key-value pairs from the specified Workers KV namespace. Send a JSON array of the key names to delete. The result reports the number of successful deletions and any keys that failed and should be retried.\n\nConfirm with the user before calling this tool. This operation deletes the specified keys and their values from the Workers KV namespace.",
+    description: "Deletes up to 10,000 key-value pairs from the specified Workers KV namespace. Send a JSON array of the key names to delete. The result reports the number of successful deletions and any keys that failed and should be retried.\n\nConfirm with the user before calling this tool. This operation deletes the specified keys and their values from the Workers KV namespace.\n\nPOST /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/delete",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
         "body": {
           "$ref": "#/$defs/workers-kv_bulk_delete"
         },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-kv_bulk_delete": workers_kv_bulk_delete,
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_key_name_bulk": workers_kv_key_name_bulk,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
+        "workers-kv_bulk_delete": workers$$kv_bulk_delete,
       },
     },
     outputSchema: {
@@ -79,10 +77,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_bulk-result": workers_kv_bulk_result_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_bulk-result": workers$$kv_bulk$$result,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     annotations: {
@@ -133,10 +131,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_bulk-result": workers_kv_bulk_result_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_bulk-result": workers$$kv_bulk$$result,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     request: (args) => ({
@@ -147,20 +145,17 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_bulk_get",
     title: "Get multiple key-value pairs",
-    description: "Retrieves the text-based values of up to 100 keys from the specified Workers KV namespace. The result maps each requested key to its value. Set `type` to `json` to parse JSON values instead of returning strings, and set `withMetadata` to `true` to include metadata with each value. Binary values are not supported by this operation.",
+    description: "Retrieves the text-based values of up to 100 keys from the specified Workers KV namespace. The result maps each requested key to its value. Set `type` to `json` to parse JSON values instead of returning strings, and set `withMetadata` to `true` to include metadata with each value. Binary values are not supported by this operation.\n\nPOST /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/get",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
         "body": {
           "properties": {
             "keys": {
               "description": "Array of keys to retrieve (maximum of 100).",
               "items": {
-                "$ref": "#/$defs/workers-kv_key_name_bulk"
+                "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid.",
+                "type": "string"
               },
               "maxItems": 100,
               "type": "array"
@@ -185,21 +180,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_key_name_bulk": workers_kv_key_name_bulk,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -223,13 +227,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_any": workers_kv_any_output,
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_bulk-get-result": workers_kv_bulk_get_result_output,
-        "workers-kv_bulk-get-result-with-metadata": workers_kv_bulk_get_result_with_metadata_output,
-        "workers-kv_expiration": workers_kv_expiration_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_any": workers$$kv_any,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_bulk-get-result": workers$$kv_bulk$$get$$result,
+        "workers-kv_bulk-get-result-with-metadata": workers$$kv_bulk$$get$$result$$with$$metadata,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     annotations: {
@@ -276,14 +279,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_any": workers_kv_any_output,
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_bulk-get-result": workers_kv_bulk_get_result_output,
-        "workers-kv_bulk-get-result-with-metadata": workers_kv_bulk_get_result_with_metadata_output,
-        "workers-kv_expiration": workers_kv_expiration_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_any": workers$$kv_any,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_bulk-get-result": workers$$kv_bulk$$get$$result,
+        "workers-kv_bulk-get-result-with-metadata": workers$$kv_bulk$$get$$result$$with$$metadata,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     request: (args) => ({
@@ -294,36 +296,41 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_bulk_put",
     title: "Write multiple key-value pairs",
-    description: "Writes up to 10,000 key-value pairs to the specified Workers KV namespace from a JSON array, with optional metadata and expiration settings for each pair. Existing values and expirations are overwritten. If neither `expiration` nor `expiration_ttl` is specified, the key-value pair will not expire. If both are set, `expiration_ttl` takes precedence. The entire request must be 100 megabytes or less. The result reports the number of successful writes and any keys that failed and should be retried.",
+    description: "Writes up to 10,000 key-value pairs to the specified Workers KV namespace from a JSON array, with optional metadata and expiration settings for each pair. Existing values and expirations are overwritten. If neither `expiration` nor `expiration_ttl` is specified, the key-value pair will not expire. If both are set, `expiration_ttl` takes precedence. The entire request must be 100 megabytes or less. The result reports the number of successful writes and any keys that failed and should be retried.\n\nPUT /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
         "body": {
           "$ref": "#/$defs/workers-kv_bulk_write"
         },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-kv_any": workers_kv_any,
-        "workers-kv_bulk_write": workers_kv_bulk_write,
-        "workers-kv_expiration": workers_kv_expiration,
-        "workers-kv_expiration_ttl": workers_kv_expiration_ttl,
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_key_name_bulk": workers_kv_key_name_bulk,
-        "workers-kv_list_metadata": workers_kv_list_metadata,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
+        "workers-kv_any": workers$$kv_any$,
+        "workers-kv_bulk_write": workers$$kv_bulk_write,
+        "workers-kv_list_metadata": workers$$kv_list_metadata,
       },
     },
     outputSchema: {
@@ -341,10 +348,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_bulk-result": workers_kv_bulk_result_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_bulk-result": workers$$kv_bulk$$result,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     annotations: {
@@ -395,10 +402,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_bulk-result": workers_kv_bulk_result_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_bulk-result": workers$$kv_bulk$$result,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/kv/keys/outputs.ts b/src/generated/forge-mcp/kv/keys/outputs.ts
index 4e0948da6..087537892 100644
--- a/src/generated/forge-mcp/kv/keys/outputs.ts
+++ b/src/generated/forge-mcp/kv/keys/outputs.ts
@@ -3,23 +3,16 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `workers-kv_cursor` in responses.
- */
-export const workers_kv_cursor_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers-kv_cursor_result_info` in responses.
  */
-export const workers_kv_cursor_result_info_output: JsonSchema = {
+export const workers$$kv_cursor_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
     },
     "cursor": {
-      "$ref": "#/$defs/workers-kv_cursor"
+      "type": "string"
     }
   },
   "type": "object"
@@ -28,7 +21,7 @@ export const workers_kv_cursor_result_info_output: JsonSchema = {
 /**
  * The schema of `workers-kv_key` in responses.
  */
-export const workers_kv_key_output: JsonSchema = {
+export const workers$$kv_key: JsonSchema = {
   "properties": {
     "expiration": {
       "type": "number"
@@ -37,7 +30,7 @@ export const workers_kv_key_output: JsonSchema = {
       "$ref": "#/$defs/workers-kv_list_metadata"
     },
     "name": {
-      "$ref": "#/$defs/workers-kv_key_name"
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/kv/keys/tools.ts b/src/generated/forge-mcp/kv/keys/tools.ts
index e8fb3c455..3cc7b89ca 100644
--- a/src/generated/forge-mcp/kv/keys/tools.ts
+++ b/src/generated/forge-mcp/kv/keys/tools.ts
@@ -1,26 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  workers_kv_any_output,
-  workers_kv_api_response_common_failure_output,
-  workers_kv_api_response_common_no_result_output,
-  workers_kv_api_response_common_output,
-  workers_kv_key_name_output,
-  workers_kv_list_metadata_output,
-  workers_kv_messages_output,
+  workers$$kv_any,
+  workers$$kv_api$$response$$common,
+  workers$$kv_api$$response$$common$$failure,
+  workers$$kv_api$$response$$common$$no$$result,
+  workers$$kv_list_metadata,
+  workers$$kv_messages,
 } from "../outputs.js";
-import {
-  workers_kv_identifier,
-  workers_kv_key_name,
-  workers_kv_namespace_identifier,
-} from "../schemas.js";
-import {
-  workers_kv_cursor_output,
-  workers_kv_cursor_result_info_output,
-  workers_kv_key_output,
-} from "./outputs.js";
+import { workers$$kv_cursor_result_info, workers$$kv_key } from "./outputs.js";
 
 /**
  * The tools of `kv.keys`.
@@ -29,40 +19,45 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_keys_delete",
     title: "Delete a key-value pair",
-    description: "Deletes the specified key and its value from the Workers KV namespace. Use URL-encoding for special characters (for example, `:`, `!`, `%`) in the key name when constructing the request URL.\n\nConfirm with the user before calling this tool. This operation deletes the selected key-value pair from the Workers KV namespace.",
+    description: "Deletes the specified key and its value from the Workers KV namespace. Use URL-encoding for special characters (for example, `:`, `!`, `%`) in the key name when constructing the request URL.\n\nConfirm with the user before calling this tool. This operation deletes the selected key-value pair from the Workers KV namespace.\n\nDELETE /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
-        "key_name": {
-          "$ref": "#/$defs/workers-kv_key_name",
-          "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid. Use percent-encoding to define key names as part of a URL."
-        },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "key_name": {
+              "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid. Use percent-encoding to define key names as part of a URL.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id",
+            "key_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id",
-        "key_name"
+        "path"
       ],
-      $defs: {
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_key_name": workers_kv_key_name,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers-kv_api-response-common-no-result",
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     annotations: {
@@ -89,10 +84,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     request: (args) => ({
@@ -102,33 +97,38 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_keys_get",
     title: "Get a key's value",
-    description: "Returns the value stored under the specified key in the Workers KV namespace as raw bytes. Use URL-encoding for special characters (for example, `:`, `!`, `%`) in the key name when constructing the request URL. If the key-value pair expires, the `expiration` response header contains its expiration time in seconds since the UNIX epoch.",
+    description: "Returns the value stored under the specified key in the Workers KV namespace as raw bytes. Use URL-encoding for special characters (for example, `:`, `!`, `%`) in the key name when constructing the request URL. If the key-value pair expires, the `expiration` response header contains its expiration time in seconds since the UNIX epoch.\n\nGET /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
-        "key_name": {
-          "$ref": "#/$defs/workers-kv_key_name",
-          "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid. Use percent-encoding to define key names as part of a URL."
-        },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "key_name": {
+              "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid. Use percent-encoding to define key names as part of a URL.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id",
+            "key_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id",
-        "key_name"
+        "path"
       ],
-      $defs: {
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_key_name": workers_kv_key_name,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -153,8 +153,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     request: (args) => ({
@@ -164,40 +164,52 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_keys_list",
     title: "List keys in a namespace",
-    description: "Lists key names in the specified Workers KV namespace, with expiration times and metadata when present. Use `prefix` to filter names and `cursor` to request the next page. Values are not included.",
+    description: "Lists key names in the specified Workers KV namespace, with expiration times and metadata when present. Use `prefix` to filter names and `cursor` to request the next page. Values are not included.\n\nGET /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
-        "cursor": {
-          "description": "Opaque pagination token from `result_info.cursor` in the previous response. Pass it unchanged to request the next page of keys.",
-          "type": "string"
-        },
-        "limit": {
-          "default": 1000,
-          "description": "Maximum number of keys to return in one response. Pass `result_info.cursor` from the response as `cursor` to request the next page.",
-          "type": "number"
-        },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id"
+          ],
+          "type": "object"
         },
-        "prefix": {
-          "description": "Filters returned keys by a name prefix. Exact matches and any key names that begin with the prefix will be returned.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque pagination token from `result_info.cursor` in the previous response. Pass it unchanged to request the next page of keys.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 1000,
+              "description": "Maximum number of keys to return in one response. Pass `result_info.cursor` from the response as `cursor` to request the next page.",
+              "type": "number"
+            },
+            "prefix": {
+              "description": "Filters returned keys by a name prefix. Exact matches and any key names that begin with the prefix will be returned.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id"
+        "path"
       ],
-      $defs: {
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -220,14 +232,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_any": workers_kv_any_output,
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_cursor": workers_kv_cursor_output,
-        "workers-kv_cursor_result_info": workers_kv_cursor_result_info_output,
-        "workers-kv_key": workers_kv_key_output,
-        "workers-kv_key_name": workers_kv_key_name_output,
-        "workers-kv_list_metadata": workers_kv_list_metadata_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_any": workers$$kv_any,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_cursor_result_info": workers$$kv_cursor_result_info,
+        "workers-kv_key": workers$$kv_key,
+        "workers-kv_list_metadata": workers$$kv_list_metadata,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     annotations: {
@@ -273,23 +283,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_any": workers_kv_any_output,
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_cursor": workers_kv_cursor_output,
-        "workers-kv_cursor_result_info": workers_kv_cursor_result_info_output,
-        "workers-kv_key": workers_kv_key_output,
-        "workers-kv_key_name": workers_kv_key_name_output,
-        "workers-kv_list_metadata": workers_kv_list_metadata_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_any": workers$$kv_any,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_cursor_result_info": workers$$kv_cursor_result_info,
+        "workers-kv_key": workers$$kv_key,
+        "workers-kv_list_metadata": workers$$kv_list_metadata,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/storage/kv/namespaces/${pathParam(args, "namespace_id")}/keys`,
       query: [
-        ["limit", args["limit"], true],
-        ["prefix", args["prefix"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/kv/metadata/tools.ts b/src/generated/forge-mcp/kv/metadata/tools.ts
index 6bf2937b1..127500f66 100644
--- a/src/generated/forge-mcp/kv/metadata/tools.ts
+++ b/src/generated/forge-mcp/kv/metadata/tools.ts
@@ -3,17 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  workers_kv_any_output,
-  workers_kv_api_response_common_failure_output,
-  workers_kv_api_response_common_output,
-  workers_kv_list_metadata_output,
-  workers_kv_messages_output,
+  workers$$kv_any,
+  workers$$kv_api$$response$$common,
+  workers$$kv_api$$response$$common$$failure,
+  workers$$kv_list_metadata,
+  workers$$kv_messages,
 } from "../outputs.js";
-import {
-  workers_kv_identifier,
-  workers_kv_key_name,
-  workers_kv_namespace_identifier,
-} from "../schemas.js";
 
 /**
  * The tools of `kv.metadata`.
@@ -22,33 +17,38 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_metadata_get",
     title: "Get a key's metadata",
-    description: "Returns the JSON metadata associated with the specified key in the Workers KV namespace, without retrieving its value. Use URL-encoding for special characters (for example, `:`, `!`, `%`) in the key name when constructing the request URL.",
+    description: "Returns the JSON metadata associated with the specified key in the Workers KV namespace, without retrieving its value. Use URL-encoding for special characters (for example, `:`, `!`, `%`) in the key name when constructing the request URL.\n\nGET /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/metadata/{key_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
-        "key_name": {
-          "$ref": "#/$defs/workers-kv_key_name",
-          "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid. Use percent-encoding to define key names as part of a URL."
-        },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "key_name": {
+              "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid. Use percent-encoding to define key names as part of a URL.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id",
+            "key_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id",
-        "key_name"
+        "path"
       ],
-      $defs: {
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_key_name": workers_kv_key_name,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -65,10 +65,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_any": workers_kv_any_output,
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_list_metadata": workers_kv_list_metadata_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_any": workers$$kv_any,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_list_metadata": workers$$kv_list_metadata,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     annotations: {
@@ -108,11 +108,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_any": workers_kv_any_output,
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_list_metadata": workers_kv_list_metadata_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_any": workers$$kv_any,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_list_metadata": workers$$kv_list_metadata,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/kv/namespaces/outputs.ts b/src/generated/forge-mcp/kv/namespaces/outputs.ts
index 4287cd257..861482fae 100644
--- a/src/generated/forge-mcp/kv/namespaces/outputs.ts
+++ b/src/generated/forge-mcp/kv/namespaces/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers-kv_api-response-collection` in responses.
  */
-export const workers_kv_api_response_collection_output: JsonSchema = {
+export const workers$$kv_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers-kv_api-response-common"
@@ -22,37 +22,33 @@ export const workers_kv_api_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers-kv_jurisdiction` in responses.
- */
-export const workers_kv_jurisdiction_output: JsonSchema = {
-  "enum": [
-    "eu",
-    "fedramp",
-    "us"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `workers-kv_namespace` in responses.
  */
-export const workers_kv_namespace_output: JsonSchema = {
+export const workers$$kv_namespace: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/workers-kv_namespace_identifier"
+      "type": "string"
     },
     "jurisdiction": {
-      "$ref": "#/$defs/workers-kv_jurisdiction"
+      "enum": [
+        "eu",
+        "fedramp",
+        "us"
+      ],
+      "type": "string"
     },
     "mode": {
-      "$ref": "#/$defs/workers-kv_namespace_mode"
+      "enum": [
+        "instant"
+      ],
+      "type": "string"
     },
     "supports_url_encoding": {
       "type": "boolean"
     },
     "title": {
-      "$ref": "#/$defs/workers-kv_namespace_title"
+      "type": "string"
     }
   },
   "required": [
@@ -62,27 +58,10 @@ export const workers_kv_namespace_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers-kv_namespace_mode` in responses.
- */
-export const workers_kv_namespace_mode_output: JsonSchema = {
-  "enum": [
-    "instant"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `workers-kv_namespace_title` in responses.
- */
-export const workers_kv_namespace_title_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers-kv_result_info` in responses.
  */
-export const workers_kv_result_info_output: JsonSchema = {
+export const workers$$kv_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
diff --git a/src/generated/forge-mcp/kv/namespaces/schemas.ts b/src/generated/forge-mcp/kv/namespaces/schemas.ts
index e7cc07fe5..2cf992eab 100644
--- a/src/generated/forge-mcp/kv/namespaces/schemas.ts
+++ b/src/generated/forge-mcp/kv/namespaces/schemas.ts
@@ -6,11 +6,16 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers-kv_create_namespace_body`.
  */
-export const workers_kv_create_namespace_body: JsonSchema = {
+export const workers$$kv_create_namespace_body: JsonSchema = {
   "properties": {
     "jurisdiction": {
-      "$ref": "#/$defs/workers-kv_jurisdiction",
-      "description": "Specify the jurisdiction to restrict the KV namespace to durably store data within. Can only be set at namespace creation time."
+      "description": "Specify the jurisdiction to restrict the KV namespace to durably store data within. Can only be set at namespace creation time.",
+      "enum": [
+        "eu",
+        "fedramp",
+        "us"
+      ],
+      "type": "string"
     },
     "mode": {
       "description": "The mode of the Workers KV namespace. Specify `instant` when creating a namespace to create a KV Instant namespace. Omit this field when creating a namespace to create a classic namespace. Currently, `instant` is the only supported explicit value.",
@@ -20,8 +25,8 @@ export const workers_kv_create_namespace_body: JsonSchema = {
       "type": "string"
     },
     "title": {
-      "$ref": "#/$defs/workers-kv_namespace_title",
-      "description": "Human-readable string name for a Workers KV namespace."
+      "description": "Human-readable string name for a Workers KV namespace.",
+      "type": "string"
     }
   },
   "required": [
@@ -33,11 +38,11 @@ export const workers_kv_create_namespace_body: JsonSchema = {
 /**
  * The schema of `workers-kv_create_rename_namespace_body`.
  */
-export const workers_kv_create_rename_namespace_body: JsonSchema = {
+export const workers$$kv_create_rename_namespace_body: JsonSchema = {
   "properties": {
     "title": {
-      "$ref": "#/$defs/workers-kv_namespace_title",
-      "description": "Human-readable string name for a Workers KV namespace."
+      "description": "Human-readable string name for a Workers KV namespace.",
+      "type": "string"
     }
   },
   "required": [
@@ -45,24 +50,3 @@ export const workers_kv_create_rename_namespace_body: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `workers-kv_jurisdiction`.
- */
-export const workers_kv_jurisdiction: JsonSchema = {
-  "description": "Specify the jurisdiction to restrict the KV namespace to durably store data within. Can only be set at namespace creation time.",
-  "enum": [
-    "eu",
-    "fedramp",
-    "us"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `workers-kv_namespace_title`.
- */
-export const workers_kv_namespace_title: JsonSchema = {
-  "description": "Human-readable string name for a Workers KV namespace.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/kv/namespaces/tools.ts b/src/generated/forge-mcp/kv/namespaces/tools.ts
index 713b0d5ba..eeb04ae2e 100644
--- a/src/generated/forge-mcp/kv/namespaces/tools.ts
+++ b/src/generated/forge-mcp/kv/namespaces/tools.ts
@@ -1,31 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  workers_kv_api_response_common_failure_output,
-  workers_kv_api_response_common_no_result_output,
-  workers_kv_api_response_common_output,
-  workers_kv_messages_output,
-  workers_kv_namespace_identifier_output,
+  workers$$kv_api$$response$$common,
+  workers$$kv_api$$response$$common$$failure,
+  workers$$kv_api$$response$$common$$no$$result,
+  workers$$kv_messages,
 } from "../outputs.js";
 import {
-  workers_kv_identifier,
-  workers_kv_namespace_identifier,
-} from "../schemas.js";
-import {
-  workers_kv_api_response_collection_output,
-  workers_kv_jurisdiction_output,
-  workers_kv_namespace_mode_output,
-  workers_kv_namespace_output,
-  workers_kv_namespace_title_output,
-  workers_kv_result_info_output,
+  workers$$kv_api$$response$$collection,
+  workers$$kv_namespace,
+  workers$$kv_result_info,
 } from "./outputs.js";
 import {
-  workers_kv_create_namespace_body,
-  workers_kv_create_rename_namespace_body,
-  workers_kv_jurisdiction,
-  workers_kv_namespace_title,
+  workers$$kv_create_namespace_body,
+  workers$$kv_create_rename_namespace_body,
 } from "./schemas.js";
 
 /**
@@ -35,27 +25,34 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_namespaces_create",
     title: "Create a namespace",
-    description: "Creates a Workers KV namespace in the specified account with the given title. Returns `400` if the account already owns a namespace with that title; an existing namespace must be explicitly deleted before it can be replaced. An optional jurisdiction restricts where data is durably stored and can only be set at creation time.",
+    description: "Creates a Workers KV namespace in the specified account with the given title. Returns `400` if the account already owns a namespace with that title; an existing namespace must be explicitly deleted before it can be replaced. An optional jurisdiction restricts where data is durably stored and can only be set at creation time.\n\nPOST /accounts/{account_id}/storage/kv/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
         "body": {
           "$ref": "#/$defs/workers-kv_create_namespace_body"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-kv_create_namespace_body": workers_kv_create_namespace_body,
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction,
-        "workers-kv_namespace_title": workers_kv_namespace_title,
+        "workers-kv_create_namespace_body": workers$$kv_create_namespace_body,
       },
     },
     outputSchema: {
@@ -73,13 +70,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction_output,
-        "workers-kv_messages": workers_kv_messages_output,
-        "workers-kv_namespace": workers_kv_namespace_output,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier_output,
-        "workers-kv_namespace_mode": workers_kv_namespace_mode_output,
-        "workers-kv_namespace_title": workers_kv_namespace_title_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_messages": workers$$kv_messages,
+        "workers-kv_namespace": workers$$kv_namespace,
       },
     },
     annotations: {
@@ -118,14 +111,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction_output,
-        "workers-kv_messages": workers_kv_messages_output,
-        "workers-kv_namespace": workers_kv_namespace_output,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier_output,
-        "workers-kv_namespace_mode": workers_kv_namespace_mode_output,
-        "workers-kv_namespace_title": workers_kv_namespace_title_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_messages": workers$$kv_messages,
+        "workers-kv_namespace": workers$$kv_namespace,
       },
     },
     request: (args) => ({
@@ -136,34 +125,40 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_namespaces_delete",
     title: "Delete a namespace",
-    description: "Deletes the specified Workers KV namespace and its stored key-value pairs from the account.\n\nConfirm with the user before calling this tool. This operation deletes the selected Workers KV namespace and all of its key-value pairs.",
+    description: "Deletes the specified Workers KV namespace and its stored key-value pairs from the account.\n\nConfirm with the user before calling this tool. This operation deletes the selected Workers KV namespace and all of its key-value pairs.\n\nDELETE /accounts/{account_id}/storage/kv/namespaces/{namespace_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id"
+        "path"
       ],
-      $defs: {
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers-kv_api-response-common-no-result",
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     annotations: {
@@ -190,10 +185,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_api-response-common-no-result": workers_kv_api_response_common_no_result_output,
-        "workers-kv_messages": workers_kv_messages_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_api-response-common-no-result": workers$$kv_api$$response$$common$$no$$result,
+        "workers-kv_messages": workers$$kv_messages,
       },
     },
     request: (args) => ({
@@ -203,27 +198,33 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_namespaces_get",
     title: "Get a namespace",
-    description: "Returns the Workers KV namespace for the specified account and namespace ID.",
+    description: "Returns the Workers KV namespace for the specified account and namespace ID.\n\nGET /accounts/{account_id}/storage/kv/namespaces/{namespace_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id"
+        "path"
       ],
-      $defs: {
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -240,13 +241,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction_output,
-        "workers-kv_messages": workers_kv_messages_output,
-        "workers-kv_namespace": workers_kv_namespace_output,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier_output,
-        "workers-kv_namespace_mode": workers_kv_namespace_mode_output,
-        "workers-kv_namespace_title": workers_kv_namespace_title_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_messages": workers$$kv_messages,
+        "workers-kv_namespace": workers$$kv_namespace,
       },
     },
     annotations: {
@@ -286,14 +283,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction_output,
-        "workers-kv_messages": workers_kv_messages_output,
-        "workers-kv_namespace": workers_kv_namespace_output,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier_output,
-        "workers-kv_namespace_mode": workers_kv_namespace_mode_output,
-        "workers-kv_namespace_title": workers_kv_namespace_title_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_messages": workers$$kv_messages,
+        "workers-kv_namespace": workers$$kv_namespace,
       },
     },
     request: (args) => ({
@@ -303,47 +296,60 @@ export const tools: readonly Tool[] = [
   {
     name: "kv_namespaces_list",
     title: "List namespaces",
-    description: "Lists Workers KV namespaces owned by the specified account. Use `page` and `per_page` to select a page of results, and `order` and `direction` to control sorting.",
+    description: "Lists Workers KV namespaces owned by the specified account. Use `page` and `per_page` to select a page of results, and `order` and `direction` to control sorting.\n\nGET /accounts/{account_id}/storage/kv/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
-        "direction": {
-          "description": "Sort namespaces in ascending (`asc`) or descending (`desc`) order.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "description": "Namespace field to sort by (`id` or `title`).",
-          "enum": [
-            "id",
-            "title"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Sort namespaces in ascending (`asc`) or descending (`desc`) order.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "description": "Namespace field to sort by (`id` or `title`).",
+              "enum": [
+                "id",
+                "title"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers-kv_identifier": workers_kv_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -363,15 +369,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_api-response-collection": workers_kv_api_response_collection_output,
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction_output,
-        "workers-kv_messages": workers_kv_messages_output,
-        "workers-kv_namespace": workers_kv_namespace_output,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier_output,
-        "workers-kv_namespace_mode": workers_kv_namespace_mode_output,
-        "workers-kv_namespace_title": workers_kv_namespace_title_output,
-        "workers-kv_result_info": workers_kv_result_info_output,
+        "workers-kv_api-response-collection": workers$$kv_api$$response$$collection,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_messages": workers$$kv_messages,
+        "workers-kv_namespace": workers$$kv_namespace,
+        "workers-kv_result_info": workers$$kv_result_info,
       },
     },
     annotations: {
@@ -414,57 +416,60 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-collection": workers_kv_api_response_collection_output,
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction_output,
-        "workers-kv_messages": workers_kv_messages_output,
-        "workers-kv_namespace": workers_kv_namespace_output,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier_output,
-        "workers-kv_namespace_mode": workers_kv_namespace_mode_output,
-        "workers-kv_namespace_title": workers_kv_namespace_title_output,
-        "workers-kv_result_info": workers_kv_result_info_output,
+        "workers-kv_api-response-collection": workers$$kv_api$$response$$collection,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_messages": workers$$kv_messages,
+        "workers-kv_namespace": workers$$kv_namespace,
+        "workers-kv_result_info": workers$$kv_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/storage/kv/namespaces`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
     name: "kv_namespaces_update",
     title: "Rename a namespace",
-    description: "Changes the title of the specified Workers KV namespace and returns the updated namespace. The namespace ID and stored key-value pairs are unchanged.",
+    description: "Changes the title of the specified Workers KV namespace and returns the updated namespace. The namespace ID and stored key-value pairs are unchanged.\n\nPUT /accounts/{account_id}/storage/kv/namespaces/{namespace_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers-kv_identifier",
-          "description": "ID of the Cloudflare account that owns the Workers KV namespaces."
-        },
         "body": {
           "$ref": "#/$defs/workers-kv_create_rename_namespace_body"
         },
-        "namespace_id": {
-          "$ref": "#/$defs/workers-kv_namespace_identifier",
-          "description": "ID of the Workers KV namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
+              "type": "string"
+            },
+            "namespace_id": {
+              "description": "ID of the Workers KV namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "namespace_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "namespace_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-kv_create_rename_namespace_body": workers_kv_create_rename_namespace_body,
-        "workers-kv_identifier": workers_kv_identifier,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier,
-        "workers-kv_namespace_title": workers_kv_namespace_title,
+        "workers-kv_create_rename_namespace_body": workers$$kv_create_rename_namespace_body,
       },
     },
     outputSchema: {
@@ -485,13 +490,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction_output,
-        "workers-kv_messages": workers_kv_messages_output,
-        "workers-kv_namespace": workers_kv_namespace_output,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier_output,
-        "workers-kv_namespace_mode": workers_kv_namespace_mode_output,
-        "workers-kv_namespace_title": workers_kv_namespace_title_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_messages": workers$$kv_messages,
+        "workers-kv_namespace": workers$$kv_namespace,
       },
     },
     annotations: {
@@ -533,14 +534,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-kv_api-response-common": workers_kv_api_response_common_output,
-        "workers-kv_api-response-common-failure": workers_kv_api_response_common_failure_output,
-        "workers-kv_jurisdiction": workers_kv_jurisdiction_output,
-        "workers-kv_messages": workers_kv_messages_output,
-        "workers-kv_namespace": workers_kv_namespace_output,
-        "workers-kv_namespace_identifier": workers_kv_namespace_identifier_output,
-        "workers-kv_namespace_mode": workers_kv_namespace_mode_output,
-        "workers-kv_namespace_title": workers_kv_namespace_title_output,
+        "workers-kv_api-response-common": workers$$kv_api$$response$$common,
+        "workers-kv_api-response-common-failure": workers$$kv_api$$response$$common$$failure,
+        "workers-kv_messages": workers$$kv_messages,
+        "workers-kv_namespace": workers$$kv_namespace,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/kv/outputs.ts b/src/generated/forge-mcp/kv/outputs.ts
index 7182c2ffb..d6d257af7 100644
--- a/src/generated/forge-mcp/kv/outputs.ts
+++ b/src/generated/forge-mcp/kv/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `workers-kv_any` in responses.
  */
-export const workers_kv_any_output: JsonSchema = {
+export const workers$$kv_any: JsonSchema = {
   "anyOf": [
     {
       "type": "string"
@@ -38,7 +38,7 @@ export const workers_kv_any_output: JsonSchema = {
 /**
  * The schema of `workers-kv_api-response-common` in responses.
  */
-export const workers_kv_api_response_common_output: JsonSchema = {
+export const workers$$kv_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/workers-kv_messages"
@@ -64,7 +64,7 @@ export const workers_kv_api_response_common_output: JsonSchema = {
 /**
  * The schema of `workers-kv_api-response-common-failure` in responses.
  */
-export const workers_kv_api_response_common_failure_output: JsonSchema = {
+export const workers$$kv_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/workers-kv_messages"
@@ -101,7 +101,7 @@ export const workers_kv_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `workers-kv_api-response-common-no-result` in responses.
  */
-export const workers_kv_api_response_common_no_result_output: JsonSchema = {
+export const workers$$kv_api$$response$$common$$no$$result: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers-kv_api-response-common"
@@ -124,31 +124,17 @@ export const workers_kv_api_response_common_no_result_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers-kv_expiration` in responses.
- */
-export const workers_kv_expiration_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `workers-kv_key_name` in responses.
- */
-export const workers_kv_key_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers-kv_list_metadata` in responses.
  */
-export const workers_kv_list_metadata_output: JsonSchema = {
+export const workers$$kv_list_metadata: JsonSchema = {
   "$ref": "#/$defs/workers-kv_any"
 };
 
 /**
  * The schema of `workers-kv_messages` in responses.
  */
-export const workers_kv_messages_output: JsonSchema = {
+export const workers$$kv_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -166,10 +152,3 @@ export const workers_kv_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `workers-kv_namespace_identifier` in responses.
- */
-export const workers_kv_namespace_identifier_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/kv/schemas.ts b/src/generated/forge-mcp/kv/schemas.ts
index 069df2461..b24e89887 100644
--- a/src/generated/forge-mcp/kv/schemas.ts
+++ b/src/generated/forge-mcp/kv/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `workers-kv_any`.
  */
-export const workers_kv_any: JsonSchema = {
+export const workers$$kv_any: JsonSchema = {
   "anyOf": [
     {
       "type": "string"
@@ -35,50 +35,10 @@ export const workers_kv_any: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers-kv_expiration`.
- */
-export const workers_kv_expiration: JsonSchema = {
-  "description": "Expires the key at a certain time, measured in number of seconds since the UNIX epoch.",
-  "type": "number"
-};
-
-/**
- * The schema of `workers-kv_expiration_ttl`.
- */
-export const workers_kv_expiration_ttl: JsonSchema = {
-  "description": "Number of seconds until the key expires. Must be at least 60. Takes precedence over `expiration` when both are specified.",
-  "type": "number"
-};
-
-/**
- * The schema of `workers-kv_identifier`.
- */
-export const workers_kv_identifier: JsonSchema = {
-  "description": "ID of the Cloudflare account that owns the Workers KV namespaces.",
-  "type": "string"
-};
-
-/**
- * The schema of `workers-kv_key_name`.
- */
-export const workers_kv_key_name: JsonSchema = {
-  "description": "A key's name. The name may be at most 512 bytes. All printable, non-whitespace characters are valid. Use percent-encoding to define key names as part of a URL.",
-  "type": "string"
-};
-
 /**
  * The schema of `workers-kv_list_metadata`.
  */
-export const workers_kv_list_metadata: JsonSchema = {
+export const workers$$kv_list_metadata: JsonSchema = {
   "$ref": "#/$defs/workers-kv_any",
   "description": "Arbitrary JSON that is associated with a key."
 };
-
-/**
- * The schema of `workers-kv_namespace_identifier`.
- */
-export const workers_kv_namespace_identifier: JsonSchema = {
-  "description": "ID of the Workers KV namespace.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/leakedCredentialChecks/detections/outputs.ts b/src/generated/forge-mcp/leakedCredentialChecks/detections/outputs.ts
index 601d714cf..393ee756c 100644
--- a/src/generated/forge-mcp/leakedCredentialChecks/detections/outputs.ts
+++ b/src/generated/forge-mcp/leakedCredentialChecks/detections/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `waf-product-api-bundle_api-response-collection` in responses.
  */
-export const waf_product_api_bundle_api_response_collection_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-common"
@@ -35,10 +35,10 @@ export const waf_product_api_bundle_api_response_collection_output: JsonSchema =
 /**
  * The schema of `waf-product-api-bundle_custom-detection` in responses.
  */
-export const waf_product_api_bundle_custom_detection_output: JsonSchema = {
+export const waf$$product$$api$$bundle_custom$$detection: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/waf-product-api-bundle_detection-id"
+      "type": "string"
     },
     "password": {
       "type": "string"
@@ -50,18 +50,11 @@ export const waf_product_api_bundle_custom_detection_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `waf-product-api-bundle_detection-id` in responses.
- */
-export const waf_product_api_bundle_detection_id_output: JsonSchema = {
-  "$ref": "#/$defs/waf-product-api-bundle_identifier"
-};
-
 /**
  * The schema of `waf-product-api-bundle_response-custom-detection` in
  * responses.
  */
-export const waf_product_api_bundle_response_custom_detection_output: JsonSchema = {
+export const waf$$product$$api$$bundle_response$$custom$$detection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-single"
@@ -81,7 +74,7 @@ export const waf_product_api_bundle_response_custom_detection_output: JsonSchema
  * The schema of `waf-product-api-bundle_response-custom-detection-collection`
  * in responses.
  */
-export const waf_product_api_bundle_response_custom_detection_collection_output: JsonSchema = {
+export const waf$$product$$api$$bundle_response$$custom$$detection$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-collection"
diff --git a/src/generated/forge-mcp/leakedCredentialChecks/detections/schemas.ts b/src/generated/forge-mcp/leakedCredentialChecks/detections/schemas.ts
index aee75d923..c22c6dd59 100644
--- a/src/generated/forge-mcp/leakedCredentialChecks/detections/schemas.ts
+++ b/src/generated/forge-mcp/leakedCredentialChecks/detections/schemas.ts
@@ -6,12 +6,12 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `waf-product-api-bundle_custom-detection`.
  */
-export const waf_product_api_bundle_custom_detection: JsonSchema = {
+export const waf$$product$$api$$bundle_custom$$detection: JsonSchema = {
   "description": "Defines a custom set of username/password expressions to match Leaked Credential Checks on.",
   "properties": {
     "id": {
-      "$ref": "#/$defs/waf-product-api-bundle_detection-id",
-      "description": "Defines the unique ID for this custom detection."
+      "description": "Defines the unique ID for this custom detection.",
+      "type": "string"
     },
     "password": {
       "description": "Defines ehe ruleset expression to use in matching the password in a request.",
@@ -24,11 +24,3 @@ export const waf_product_api_bundle_custom_detection: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `waf-product-api-bundle_detection-id`.
- */
-export const waf_product_api_bundle_detection_id: JsonSchema = {
-  "$ref": "#/$defs/waf-product-api-bundle_identifier",
-  "description": "Defines the unique ID for this custom detection."
-};
diff --git a/src/generated/forge-mcp/leakedCredentialChecks/detections/tools.ts b/src/generated/forge-mcp/leakedCredentialChecks/detections/tools.ts
index 9e6eab62d..5789d254b 100644
--- a/src/generated/forge-mcp/leakedCredentialChecks/detections/tools.ts
+++ b/src/generated/forge-mcp/leakedCredentialChecks/detections/tools.ts
@@ -3,64 +3,64 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  waf_product_api_bundle_api_response_common_output,
-  waf_product_api_bundle_api_response_single_output,
-  waf_product_api_bundle_identifier_output,
-  waf_product_api_bundle_messages_output,
+  waf$$product$$api$$bundle_api$$response$$common,
+  waf$$product$$api$$bundle_api$$response$$single,
+  waf$$product$$api$$bundle_messages,
 } from "../../outputs.js";
-import { waf_product_api_bundle_identifier } from "../../schemas.js";
-import { waf_product_api_bundle_api_response_common_failure_output } from "../outputs.js";
+import { waf$$product$$api$$bundle_api$$response$$common$$failure } from "../outputs.js";
 import {
-  waf_product_api_bundle_api_response_collection_output,
-  waf_product_api_bundle_custom_detection_output,
-  waf_product_api_bundle_detection_id_output,
-  waf_product_api_bundle_response_custom_detection_collection_output,
-  waf_product_api_bundle_response_custom_detection_output,
+  waf$$product$$api$$bundle_api$$response$$collection,
+  waf$$product$$api$$bundle_custom$$detection,
+  waf$$product$$api$$bundle_response$$custom$$detection,
+  waf$$product$$api$$bundle_response$$custom$$detection$$collection,
 } from "./outputs.js";
-import {
-  waf_product_api_bundle_custom_detection,
-  waf_product_api_bundle_detection_id,
-} from "./schemas.js";
+import { waf$$product$$api$$bundle_custom$$detection as waf$$product$$api$$bundle_custom$$detection$ } from "./schemas.js";
 
 /**
- * The tools of `leaked_credential_checks.detections`.
+ * The tools of `leakedCredentialChecks.detections`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "leaked_credential_checks_detections_create",
+    name: "leakedCredentialChecks_detections_create",
     title: "Create a custom detection location for a zone.",
-    description: "Create a detection location for credentials that the default scan locations do not cover, using Rules language expressions such as `lookup_json_string(http.request.body.raw, \"user\")`. Only the username expression is required, and Leaked Credential Checks must be enabled on the zone.",
+    description: "Create a detection location for credentials that the default scan locations do not cover, using Rules language expressions such as `lookup_json_string(http.request.body.raw, \"user\")`. Only the username expression is required, and Leaked Credential Checks must be enabled on the zone.\n\nPOST /zones/{zone_id}/leaked-credential-checks/detections",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waf-product-api-bundle_custom-detection"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-detection",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection_output,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-detection": waf_product_api_bundle_response_custom_detection_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-detection": waf$$product$$api$$bundle_response$$custom$$detection,
       },
     },
     annotations: {
@@ -95,14 +95,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure": waf_product_api_bundle_api_response_common_failure_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection_output,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-detection": waf_product_api_bundle_response_custom_detection_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure": waf$$product$$api$$bundle_api$$response$$common$$failure,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-detection": waf$$product$$api$$bundle_response$$custom$$detection,
       },
     },
     request: (args) => ({
@@ -111,35 +109,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "leaked_credential_checks_detections_delete",
+    name: "leakedCredentialChecks_detections_delete",
     title: "Delete a custom detection location from a zone.",
-    description: "Delete a user-defined detection location, identified by its detection ID. Incoming requests are then scanned using only the default scan locations and the detection locations that remain.\n\nConfirm with the user before calling this tool. This operation deletes a Leaked Credential Checks custom detection location.",
+    description: "Delete a user-defined detection location, identified by its detection ID. Incoming requests are then scanned using only the default scan locations and the detection locations that remain.\n\nConfirm with the user before calling this tool. This operation deletes a Leaked Credential Checks custom detection location.\n\nDELETE /zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "detection_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_detection-id",
-          "description": "Defines the unique ID for this custom detection."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "detection_id": {
+              "description": "Defines the unique ID for this custom detection.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "detection_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "detection_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-common",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
       },
     },
     annotations: {
@@ -167,9 +171,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure": waf_product_api_bundle_api_response_common_failure_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure": waf$$product$$api$$bundle_api$$response$$common$$failure,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
       },
     },
     request: (args) => ({
@@ -177,40 +181,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "leaked_credential_checks_detections_get",
+    name: "leakedCredentialChecks_detections_get",
     title: "Get a custom detection location of a zone.",
-    description: "Get the username and password expressions of a single user-defined detection location, identified by its detection ID.",
+    description: "Get the username and password expressions of a single user-defined detection location, identified by its detection ID.\n\nGET /zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "detection_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_detection-id",
-          "description": "Defines the unique ID for this custom detection."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "detection_id": {
+              "description": "Defines the unique ID for this custom detection.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "detection_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "detection_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-detection",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection_output,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-detection": waf_product_api_bundle_response_custom_detection_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-detection": waf$$product$$api$$bundle_response$$custom$$detection,
       },
     },
     annotations: {
@@ -247,14 +255,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure": waf_product_api_bundle_api_response_common_failure_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection_output,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-detection": waf_product_api_bundle_response_custom_detection_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure": waf$$product$$api$$bundle_api$$response$$common$$failure,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-detection": waf$$product$$api$$bundle_response$$custom$$detection,
       },
     },
     request: (args) => ({
@@ -262,34 +268,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "leaked_credential_checks_detections_list",
+    name: "leakedCredentialChecks_detections_list",
     title: "List the custom detection locations of a zone.",
-    description: "List the user-defined detection locations configured for Leaked Credential Checks, each with its own identifier. A custom detection location tells the WAF where to find the username and password in requests to your application.",
+    description: "List the user-defined detection locations configured for Leaked Credential Checks, each with its own identifier. A custom detection location tells the WAF where to find the username and password in requests to your application.\n\nGET /zones/{zone_id}/leaked-credential-checks/detections",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-detection-collection",
       $defs: {
-        "waf-product-api-bundle_api-response-collection": waf_product_api_bundle_api_response_collection_output,
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection_output,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-detection-collection": waf_product_api_bundle_response_custom_detection_collection_output,
+        "waf-product-api-bundle_api-response-collection": waf$$product$$api$$bundle_api$$response$$collection,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-detection-collection": waf$$product$$api$$bundle_response$$custom$$detection$$collection,
       },
     },
     annotations: {
@@ -326,14 +337,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-collection": waf_product_api_bundle_api_response_collection_output,
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure": waf_product_api_bundle_api_response_common_failure_output,
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection_output,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-detection-collection": waf_product_api_bundle_response_custom_detection_collection_output,
+        "waf-product-api-bundle_api-response-collection": waf$$product$$api$$bundle_api$$response$$collection,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure": waf$$product$$api$$bundle_api$$response$$common$$failure,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-detection-collection": waf$$product$$api$$bundle_response$$custom$$detection$$collection,
       },
     },
     request: (args) => ({
@@ -341,45 +350,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "leaked_credential_checks_detections_update",
+    name: "leakedCredentialChecks_detections_update",
     title: "Update a custom detection location of a zone.",
-    description: "Update the username and password expressions of an existing detection location, identified by its detection ID. Both expressions are overwritten, so omitting the password expression clears it.",
+    description: "Update the username and password expressions of an existing detection location, identified by its detection ID. Both expressions are overwritten, so omitting the password expression clears it.\n\nPUT /zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waf-product-api-bundle_custom-detection"
         },
-        "detection_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_detection-id",
-          "description": "Defines the unique ID for this custom detection."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "detection_id": {
+              "description": "Defines the unique ID for this custom detection.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "detection_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "detection_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-custom-detection",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection_output,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-detection": waf_product_api_bundle_response_custom_detection_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-detection": waf$$product$$api$$bundle_response$$custom$$detection,
       },
     },
     annotations: {
@@ -414,14 +429,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure": waf_product_api_bundle_api_response_common_failure_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_custom-detection": waf_product_api_bundle_custom_detection_output,
-        "waf-product-api-bundle_detection-id": waf_product_api_bundle_detection_id_output,
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-custom-detection": waf_product_api_bundle_response_custom_detection_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure": waf$$product$$api$$bundle_api$$response$$common$$failure,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_custom-detection": waf$$product$$api$$bundle_custom$$detection,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-custom-detection": waf$$product$$api$$bundle_response$$custom$$detection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/leakedCredentialChecks/outputs.ts b/src/generated/forge-mcp/leakedCredentialChecks/outputs.ts
index bf6ce45f4..5cdf7d552 100644
--- a/src/generated/forge-mcp/leakedCredentialChecks/outputs.ts
+++ b/src/generated/forge-mcp/leakedCredentialChecks/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../_/tool.js";
  * The schema of `waf-product-api-bundle_api-response-common-failure` in
  * responses.
  */
-export const waf_product_api_bundle_api_response_common_failure_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/waf-product-api-bundle_messages"
@@ -37,7 +37,7 @@ export const waf_product_api_bundle_api_response_common_failure_output: JsonSche
 /**
  * The schema of `waf-product-api-bundle_response-status` in responses.
  */
-export const waf_product_api_bundle_response_status_output: JsonSchema = {
+export const waf$$product$$api$$bundle_response$$status: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-single"
@@ -56,7 +56,7 @@ export const waf_product_api_bundle_response_status_output: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_status` in responses.
  */
-export const waf_product_api_bundle_status_output: JsonSchema = {
+export const waf$$product$$api$$bundle_status: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/leakedCredentialChecks/schemas.ts b/src/generated/forge-mcp/leakedCredentialChecks/schemas.ts
index 6f486e0fd..cd235699f 100644
--- a/src/generated/forge-mcp/leakedCredentialChecks/schemas.ts
+++ b/src/generated/forge-mcp/leakedCredentialChecks/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `waf-product-api-bundle_status`.
  */
-export const waf_product_api_bundle_status: JsonSchema = {
+export const waf$$product$$api$$bundle_status: JsonSchema = {
   "description": "Defines the overall status for Leaked Credential Checks.",
   "properties": {
     "enabled": {
diff --git a/src/generated/forge-mcp/leakedCredentialChecks/tools.ts b/src/generated/forge-mcp/leakedCredentialChecks/tools.ts
index 7414bbaee..ee51b1a0b 100644
--- a/src/generated/forge-mcp/leakedCredentialChecks/tools.ts
+++ b/src/generated/forge-mcp/leakedCredentialChecks/tools.ts
@@ -3,49 +3,55 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  waf_product_api_bundle_api_response_common_output,
-  waf_product_api_bundle_api_response_single_output,
-  waf_product_api_bundle_messages_output,
+  waf$$product$$api$$bundle_api$$response$$common,
+  waf$$product$$api$$bundle_api$$response$$single,
+  waf$$product$$api$$bundle_messages,
 } from "../outputs.js";
-import { waf_product_api_bundle_identifier } from "../schemas.js";
 import {
-  waf_product_api_bundle_api_response_common_failure_output,
-  waf_product_api_bundle_response_status_output,
-  waf_product_api_bundle_status_output,
+  waf$$product$$api$$bundle_api$$response$$common$$failure,
+  waf$$product$$api$$bundle_response$$status,
+  waf$$product$$api$$bundle_status,
 } from "./outputs.js";
-import { waf_product_api_bundle_status } from "./schemas.js";
+import { waf$$product$$api$$bundle_status as waf$$product$$api$$bundle_status$ } from "./schemas.js";
 
 /**
- * The tools of `leaked_credential_checks`.
+ * The tools of `leakedCredentialChecks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "leaked_credential_checks_get",
+    name: "leakedCredentialChecks_get",
     title: "Get the Leaked Credential Checks status for a zone.",
-    description: "Get the current Leaked Credential Checks status for the zone. While enabled, Cloudflare scans incoming requests for usernames and passwords that were exposed in known data breaches.",
+    description: "Get the current Leaked Credential Checks status for the zone. While enabled, Cloudflare scans incoming requests for usernames and passwords that were exposed in known data breaches.\n\nGET /zones/{zone_id}/leaked-credential-checks",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-status",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-status": waf_product_api_bundle_response_status_output,
-        "waf-product-api-bundle_status": waf_product_api_bundle_status_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-status": waf$$product$$api$$bundle_response$$status,
+        "waf-product-api-bundle_status": waf$$product$$api$$bundle_status,
       },
     },
     annotations: {
@@ -82,12 +88,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure": waf_product_api_bundle_api_response_common_failure_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-status": waf_product_api_bundle_response_status_output,
-        "waf-product-api-bundle_status": waf_product_api_bundle_status_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure": waf$$product$$api$$bundle_api$$response$$common$$failure,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-status": waf$$product$$api$$bundle_response$$status,
+        "waf-product-api-bundle_status": waf$$product$$api$$bundle_status,
       },
     },
     request: (args) => ({
@@ -95,37 +101,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "leaked_credential_checks_update",
+    name: "leakedCredentialChecks_update",
     title: "Update the Leaked Credential Checks status for a zone.",
-    description: "Update the Leaked Credential Checks status for the zone, enabling or disabling the detection. While enabled, the detection populates the `cf.waf.credential_check.*` fields, which you can reference in custom rules and rate limiting rules to challenge or block requests carrying compromised credentials.\n\nConfirm with the user before calling this tool. This operation toggles Leaked Credential Checks for a zone.",
+    description: "Update the Leaked Credential Checks status for the zone, enabling or disabling the detection. While enabled, the detection populates the `cf.waf.credential_check.*` fields, which you can reference in custom rules and rate limiting rules to challenge or block requests carrying compromised credentials.\n\nConfirm with the user before calling this tool. This operation toggles Leaked Credential Checks for a zone.\n\nPOST /zones/{zone_id}/leaked-credential-checks",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waf-product-api-bundle_status"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waf-product-api-bundle_identifier",
-          "description": "Defines an identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Defines an identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waf-product-api-bundle_identifier": waf_product_api_bundle_identifier,
-        "waf-product-api-bundle_status": waf_product_api_bundle_status,
+        "waf-product-api-bundle_status": waf$$product$$api$$bundle_status$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waf-product-api-bundle_response-status",
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-status": waf_product_api_bundle_response_status_output,
-        "waf-product-api-bundle_status": waf_product_api_bundle_status_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-status": waf$$product$$api$$bundle_response$$status,
+        "waf-product-api-bundle_status": waf$$product$$api$$bundle_status,
       },
     },
     annotations: {
@@ -160,12 +175,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waf-product-api-bundle_api-response-common": waf_product_api_bundle_api_response_common_output,
-        "waf-product-api-bundle_api-response-common-failure": waf_product_api_bundle_api_response_common_failure_output,
-        "waf-product-api-bundle_api-response-single": waf_product_api_bundle_api_response_single_output,
-        "waf-product-api-bundle_messages": waf_product_api_bundle_messages_output,
-        "waf-product-api-bundle_response-status": waf_product_api_bundle_response_status_output,
-        "waf-product-api-bundle_status": waf_product_api_bundle_status_output,
+        "waf-product-api-bundle_api-response-common": waf$$product$$api$$bundle_api$$response$$common,
+        "waf-product-api-bundle_api-response-common-failure": waf$$product$$api$$bundle_api$$response$$common$$failure,
+        "waf-product-api-bundle_api-response-single": waf$$product$$api$$bundle_api$$response$$single,
+        "waf-product-api-bundle_messages": waf$$product$$api$$bundle_messages,
+        "waf-product-api-bundle_response-status": waf$$product$$api$$bundle_response$$status,
+        "waf-product-api-bundle_status": waf$$product$$api$$bundle_status,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/live/tools.ts b/src/generated/forge-mcp/live/tools.ts
index 6b105749b..13cc5d8d2 100644
--- a/src/generated/forge-mcp/live/tools.ts
+++ b/src/generated/forge-mcp/live/tools.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 
 import type { Tool } from "../_/tool.js";
-import { brand_protection_api_Error_output } from "../outputs.js";
+import { brand$$protection$$api_Error } from "../outputs.js";
 
 /**
  * The tools of `live`.
@@ -11,10 +11,11 @@ export const tools: readonly Tool[] = [
   {
     name: "live_get",
     title: "Run liveness checks",
-    description: "Return a success message after running liveness checks.",
+    description: "Return a success message after running liveness checks.\n\nGET /live",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -45,7 +46,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "brand-protection-api_Error": brand_protection_api_Error_output,
+        "brand-protection-api_Error": brand$$protection$$api_Error,
       },
     },
     request: (_args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/account/outputs.ts b/src/generated/forge-mcp/loadBalancers/account/outputs.ts
index 34fe86655..3c016ac35 100644
--- a/src/generated/forge-mcp/loadBalancers/account/outputs.ts
+++ b/src/generated/forge-mcp/loadBalancers/account/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `load-balancing_adaptive_routing` in responses.
  */
-export const load_balancing_adaptive_routing_output: JsonSchema = {
+export const load$$balancing_adaptive_routing: JsonSchema = {
   "properties": {
     "failover_across_pools": {
       "type": "boolean"
@@ -15,24 +15,10 @@ export const load_balancing_adaptive_routing_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_components-schemas-description` in responses.
- */
-export const load_balancing_components_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_components-schemas-enabled` in responses.
- */
-export const load_balancing_components_schemas_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_components-schemas-id_response` in responses.
  */
-export const load_balancing_components_schemas_id_response_output: JsonSchema = {
+export const load$$balancing_components$$schemas$$id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -42,7 +28,7 @@ export const load_balancing_components_schemas_id_response_output: JsonSchema =
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -53,24 +39,10 @@ export const load_balancing_components_schemas_id_response_output: JsonSchema =
   ]
 };
 
-/**
- * The schema of `load-balancing_components-schemas-name` in responses.
- */
-export const load_balancing_components_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_components-schemas-zone-name` in responses.
- */
-export const load_balancing_components_schemas_zone_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_country_pools` in responses.
  */
-export const load_balancing_country_pools_output: JsonSchema = {
+export const load$$balancing_country_pools: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -83,24 +55,17 @@ export const load_balancing_country_pools_output: JsonSchema = {
 /**
  * The schema of `load-balancing_default_pools` in responses.
  */
-export const load_balancing_default_pools_output: JsonSchema = {
+export const load$$balancing_default_pools: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_fallback_pool` in responses.
- */
-export const load_balancing_fallback_pool_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_fixed_response` in responses.
  */
-export const load_balancing_fixed_response_output: JsonSchema = {
+export const load$$balancing_fixed_response: JsonSchema = {
   "properties": {
     "content_type": {
       "type": "string"
@@ -121,7 +86,7 @@ export const load_balancing_fixed_response_output: JsonSchema = {
 /**
  * The schema of `load-balancing_load-balancer` in responses.
  */
-export const load_balancing_load_balancer_output: JsonSchema = {
+export const load$$balancing_load$$balancer: JsonSchema = {
   "properties": {
     "adaptive_routing": {
       "$ref": "#/$defs/load-balancing_adaptive_routing"
@@ -130,31 +95,33 @@ export const load_balancing_load_balancer_output: JsonSchema = {
       "$ref": "#/$defs/load-balancing_country_pools"
     },
     "created_on": {
-      "$ref": "#/$defs/load-balancing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "default_pools": {
       "$ref": "#/$defs/load-balancing_default_pools"
     },
     "description": {
-      "$ref": "#/$defs/load-balancing_components-schemas-description"
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/load-balancing_components-schemas-enabled"
+      "type": "boolean"
     },
     "fallback_pool": {
-      "$ref": "#/$defs/load-balancing_fallback_pool"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-identifier"
+      "type": "string"
     },
     "location_strategy": {
       "$ref": "#/$defs/load-balancing_location_strategy"
     },
     "modified_on": {
-      "$ref": "#/$defs/load-balancing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/load-balancing_components-schemas-name"
+      "type": "string"
     },
     "networks": {
       "$ref": "#/$defs/load-balancing_networks"
@@ -166,7 +133,7 @@ export const load_balancing_load_balancer_output: JsonSchema = {
       "$ref": "#/$defs/load-balancing_pop_pools"
     },
     "proxied": {
-      "$ref": "#/$defs/load-balancing_proxied"
+      "type": "boolean"
     },
     "random_steering": {
       "$ref": "#/$defs/load-balancing_random_steering"
@@ -178,41 +145,49 @@ export const load_balancing_load_balancer_output: JsonSchema = {
       "$ref": "#/$defs/load-balancing_rules"
     },
     "session_affinity": {
-      "$ref": "#/$defs/load-balancing_session_affinity"
+      "enum": [
+        "none",
+        "cookie",
+        "ip_cookie",
+        "header"
+      ],
+      "type": "string"
     },
     "session_affinity_attributes": {
       "$ref": "#/$defs/load-balancing_session_affinity_attributes"
     },
     "session_affinity_ttl": {
-      "$ref": "#/$defs/load-balancing_session_affinity_ttl"
+      "type": "number"
     },
     "steering_policy": {
-      "$ref": "#/$defs/load-balancing_steering_policy"
+      "enum": [
+        "off",
+        "geo",
+        "random",
+        "dynamic_latency",
+        "proximity",
+        "least_outstanding_requests",
+        "least_connections",
+        ""
+      ],
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/load-balancing_ttl"
+      "type": "number"
     },
     "zone_name": {
-      "$ref": "#/$defs/load-balancing_components-schemas-zone-name"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_load-balancer_components-schemas-identifier` in
- * responses.
- */
-export const load_balancing_load_balancer_components_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of
  * `load-balancing_load-balancer_components-schemas-response_collection` in
  * responses.
  */
-export const load_balancing_load_balancer_components_schemas_response_collection_output: JsonSchema = {
+export const load$$balancing_load$$balancer_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-paginated-response-collection"
@@ -236,7 +211,7 @@ export const load_balancing_load_balancer_components_schemas_response_collection
  * `load-balancing_load-balancer_components-schemas-single_response` in
  * responses.
  */
-export const load_balancing_load_balancer_components_schemas_single_response_output: JsonSchema = {
+export const load$$balancing_load$$balancer_components$$schemas$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -255,7 +230,7 @@ export const load_balancing_load_balancer_components_schemas_single_response_out
 /**
  * The schema of `load-balancing_location_strategy` in responses.
  */
-export const load_balancing_location_strategy_output: JsonSchema = {
+export const load$$balancing_location_strategy: JsonSchema = {
   "properties": {
     "mode": {
       "enum": [
@@ -280,7 +255,7 @@ export const load_balancing_location_strategy_output: JsonSchema = {
 /**
  * The schema of `load-balancing_match` in responses.
  */
-export const load_balancing_match_output: JsonSchema = {
+export const load$$balancing_match: JsonSchema = {
   "properties": {
     "default": {
       "type": "boolean"
@@ -292,17 +267,10 @@ export const load_balancing_match_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_pool_default_weight` in responses.
- */
-export const load_balancing_pool_default_weight_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `load-balancing_pool_set` in responses.
  */
-export const load_balancing_pool_set_output: JsonSchema = {
+export const load$$balancing_pool_set: JsonSchema = {
   "properties": {
     "disabled": {
       "type": "boolean"
@@ -326,13 +294,13 @@ export const load_balancing_pool_set_output: JsonSchema = {
 /**
  * The schema of `load-balancing_pool_set_overrides` in responses.
  */
-export const load_balancing_pool_set_overrides_output: JsonSchema = {
+export const load$$balancing_pool_set_overrides: JsonSchema = {
   "properties": {
     "fallback_pool": {
-      "$ref": "#/$defs/load-balancing_fallback_pool"
+      "type": "string"
     },
     "pool_default_weight": {
-      "$ref": "#/$defs/load-balancing_pool_default_weight"
+      "type": "number"
     },
     "pool_weights": {
       "$ref": "#/$defs/load-balancing_pool_weights"
@@ -341,7 +309,17 @@ export const load_balancing_pool_set_overrides_output: JsonSchema = {
       "$ref": "#/$defs/load-balancing_pools"
     },
     "steering_policy": {
-      "$ref": "#/$defs/load-balancing_steering_policy"
+      "enum": [
+        "off",
+        "geo",
+        "random",
+        "dynamic_latency",
+        "proximity",
+        "least_outstanding_requests",
+        "least_connections",
+        ""
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -350,7 +328,7 @@ export const load_balancing_pool_set_overrides_output: JsonSchema = {
 /**
  * The schema of `load-balancing_pool_sets` in responses.
  */
-export const load_balancing_pool_sets_output: JsonSchema = {
+export const load$$balancing_pool_sets: JsonSchema = {
   "items": {
     "$ref": "#/$defs/load-balancing_pool_set"
   },
@@ -360,7 +338,7 @@ export const load_balancing_pool_sets_output: JsonSchema = {
 /**
  * The schema of `load-balancing_pool_weights` in responses.
  */
-export const load_balancing_pool_weights_output: JsonSchema = {
+export const load$$balancing_pool_weights: JsonSchema = {
   "additionalProperties": {
     "type": "number"
   },
@@ -370,7 +348,7 @@ export const load_balancing_pool_weights_output: JsonSchema = {
 /**
  * The schema of `load-balancing_pools` in responses.
  */
-export const load_balancing_pools_output: JsonSchema = {
+export const load$$balancing_pools: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -380,7 +358,7 @@ export const load_balancing_pools_output: JsonSchema = {
 /**
  * The schema of `load-balancing_pop_pools` in responses.
  */
-export const load_balancing_pop_pools_output: JsonSchema = {
+export const load$$balancing_pop_pools: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -390,17 +368,10 @@ export const load_balancing_pop_pools_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_proxied` in responses.
- */
-export const load_balancing_proxied_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_random_steering` in responses.
  */
-export const load_balancing_random_steering_output: JsonSchema = {
+export const load$$balancing_random_steering: JsonSchema = {
   "properties": {
     "default_weight": {
       "type": "number"
@@ -418,7 +389,7 @@ export const load_balancing_random_steering_output: JsonSchema = {
 /**
  * The schema of `load-balancing_region_pools` in responses.
  */
-export const load_balancing_region_pools_output: JsonSchema = {
+export const load$$balancing_region_pools: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -431,7 +402,7 @@ export const load_balancing_region_pools_output: JsonSchema = {
 /**
  * The schema of `load-balancing_rule_overrides` in responses.
  */
-export const load_balancing_rule_overrides_output: JsonSchema = {
+export const load$$balancing_rule_overrides: JsonSchema = {
   "properties": {
     "adaptive_routing": {
       "$ref": "#/$defs/load-balancing_adaptive_routing"
@@ -443,13 +414,13 @@ export const load_balancing_rule_overrides_output: JsonSchema = {
       "$ref": "#/$defs/load-balancing_default_pools"
     },
     "fallback_pool": {
-      "$ref": "#/$defs/load-balancing_fallback_pool"
+      "type": "string"
     },
     "location_strategy": {
       "$ref": "#/$defs/load-balancing_location_strategy"
     },
     "pool_default_weight": {
-      "$ref": "#/$defs/load-balancing_pool_default_weight"
+      "type": "number"
     },
     "pool_weights": {
       "$ref": "#/$defs/load-balancing_pool_weights"
@@ -467,19 +438,35 @@ export const load_balancing_rule_overrides_output: JsonSchema = {
       "$ref": "#/$defs/load-balancing_region_pools"
     },
     "session_affinity": {
-      "$ref": "#/$defs/load-balancing_session_affinity"
+      "enum": [
+        "none",
+        "cookie",
+        "ip_cookie",
+        "header"
+      ],
+      "type": "string"
     },
     "session_affinity_attributes": {
       "$ref": "#/$defs/load-balancing_session_affinity_attributes"
     },
     "session_affinity_ttl": {
-      "$ref": "#/$defs/load-balancing_session_affinity_ttl"
+      "type": "number"
     },
     "steering_policy": {
-      "$ref": "#/$defs/load-balancing_steering_policy"
+      "enum": [
+        "off",
+        "geo",
+        "random",
+        "dynamic_latency",
+        "proximity",
+        "least_outstanding_requests",
+        "least_connections",
+        ""
+      ],
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/load-balancing_ttl"
+      "type": "number"
     }
   },
   "type": "object"
@@ -488,7 +475,7 @@ export const load_balancing_rule_overrides_output: JsonSchema = {
 /**
  * The schema of `load-balancing_rules` in responses.
  */
-export const load_balancing_rules_output: JsonSchema = {
+export const load$$balancing_rules: JsonSchema = {
   "items": {
     "properties": {
       "condition": {
@@ -518,23 +505,10 @@ export const load_balancing_rules_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_session_affinity` in responses.
- */
-export const load_balancing_session_affinity_output: JsonSchema = {
-  "enum": [
-    "none",
-    "cookie",
-    "ip_cookie",
-    "header"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_session_affinity_attributes` in responses.
  */
-export const load_balancing_session_affinity_attributes_output: JsonSchema = {
+export const load$$balancing_session_affinity_attributes: JsonSchema = {
   "properties": {
     "drain_duration": {
       "type": "number"
@@ -577,34 +551,10 @@ export const load_balancing_session_affinity_attributes_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_session_affinity_ttl` in responses.
- */
-export const load_balancing_session_affinity_ttl_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `load-balancing_steering_policy` in responses.
- */
-export const load_balancing_steering_policy_output: JsonSchema = {
-  "enum": [
-    "off",
-    "geo",
-    "random",
-    "dynamic_latency",
-    "proximity",
-    "least_outstanding_requests",
-    "least_connections",
-    ""
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_topology_match` in responses.
  */
-export const load_balancing_topology_match_output: JsonSchema = {
+export const load$$balancing_topology_match: JsonSchema = {
   "properties": {
     "countries": {
       "items": {
@@ -630,10 +580,3 @@ export const load_balancing_topology_match_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `load-balancing_ttl` in responses.
- */
-export const load_balancing_ttl_output: JsonSchema = {
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/loadBalancers/account/schemas.ts b/src/generated/forge-mcp/loadBalancers/account/schemas.ts
index 1ba16c1ef..4502d03a8 100644
--- a/src/generated/forge-mcp/loadBalancers/account/schemas.ts
+++ b/src/generated/forge-mcp/loadBalancers/account/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `load-balancing_adaptive_routing`.
  */
-export const load_balancing_adaptive_routing: JsonSchema = {
+export const load$$balancing_adaptive_routing: JsonSchema = {
   "description": "Controls features that modify the routing of requests to pools and origins in response to dynamic conditions, such as during the interval between active health monitoring requests. For example, zero-downtime failover occurs immediately when an origin becomes unavailable due to HTTP 521, 522, or 523 response codes. If there is another healthy origin in the same pool, the request is retried once against this alternate origin.",
   "properties": {
     "failover_across_pools": {
@@ -18,34 +18,10 @@ export const load_balancing_adaptive_routing: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_components-schemas-description`.
- */
-export const load_balancing_components_schemas_description: JsonSchema = {
-  "description": "Object description.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_components-schemas-enabled`.
- */
-export const load_balancing_components_schemas_enabled: JsonSchema = {
-  "description": "Whether to enable (the default) this load balancer.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `load-balancing_components-schemas-name`.
- */
-export const load_balancing_components_schemas_name: JsonSchema = {
-  "description": "The DNS hostname to associate with your Load Balancer. If this hostname already exists as a DNS record in Cloudflare's DNS, the Load Balancer will take precedence and the DNS record will not be used.",
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_country_pools`.
  */
-export const load_balancing_country_pools: JsonSchema = {
+export const load$$balancing_country_pools: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -59,7 +35,7 @@ export const load_balancing_country_pools: JsonSchema = {
 /**
  * The schema of `load-balancing_default_pools`.
  */
-export const load_balancing_default_pools: JsonSchema = {
+export const load$$balancing_default_pools: JsonSchema = {
   "description": "A list of pool IDs ordered by their failover priority. Pools defined here are used by default, or when region_pools are not configured for a given region.",
   "items": {
     "type": "string"
@@ -67,18 +43,10 @@ export const load_balancing_default_pools: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_fallback_pool`.
- */
-export const load_balancing_fallback_pool: JsonSchema = {
-  "description": "The pool ID to use when all other pools are detected as unhealthy.",
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_fixed_response`.
  */
-export const load_balancing_fixed_response: JsonSchema = {
+export const load$$balancing_fixed_response: JsonSchema = {
   "description": "A collection of fields used to directly respond to the client instead of routing to a pool. When supplied on a rule, that rule stops further rule evaluation.",
   "properties": {
     "content_type": {
@@ -104,7 +72,7 @@ export const load_balancing_fixed_response: JsonSchema = {
 /**
  * The schema of `load-balancing_load-balancer-editable`.
  */
-export const load_balancing_load_balancer_editable: JsonSchema = {
+export const load$$balancing_load$$balancer$$editable: JsonSchema = {
   "description": "The editable properties shared by load balancer create, update, and patch requests. Operations layer their own `required` constraints on top via `allOf`.",
   "properties": {
     "adaptive_routing": {
@@ -120,25 +88,25 @@ export const load_balancing_load_balancer_editable: JsonSchema = {
       "description": "A list of pool IDs ordered by their failover priority. Pools defined here are used by default, or when region_pools are not configured for a given region."
     },
     "description": {
-      "$ref": "#/$defs/load-balancing_components-schemas-description",
-      "description": "Object description."
+      "description": "Object description.",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/load-balancing_components-schemas-enabled",
       "default": true,
-      "description": "Whether to enable (the default) this load balancer."
+      "description": "Whether to enable (the default) this load balancer.",
+      "type": "boolean"
     },
     "fallback_pool": {
-      "$ref": "#/$defs/load-balancing_fallback_pool",
-      "description": "The pool ID to use when all other pools are detected as unhealthy."
+      "description": "The pool ID to use when all other pools are detected as unhealthy.",
+      "type": "string"
     },
     "location_strategy": {
       "$ref": "#/$defs/load-balancing_location_strategy",
       "description": "Controls location-based steering for non-proxied requests. See `steering_policy` to learn how steering is affected."
     },
     "name": {
-      "$ref": "#/$defs/load-balancing_components-schemas-name",
-      "description": "The DNS hostname to associate with your Load Balancer. If this hostname already exists as a DNS record in Cloudflare's DNS, the Load Balancer will take precedence and the DNS record will not be used."
+      "description": "The DNS hostname to associate with your Load Balancer. If this hostname already exists as a DNS record in Cloudflare's DNS, the Load Balancer will take precedence and the DNS record will not be used.",
+      "type": "string"
     },
     "networks": {
       "$ref": "#/$defs/load-balancing_networks",
@@ -149,9 +117,9 @@ export const load_balancing_load_balancer_editable: JsonSchema = {
       "description": "Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs (ordered by their failover priority) for the PoP (datacenter). Any PoPs not explicitly defined will fall back to using the corresponding country_pool, then region_pool mapping if it exists else to default_pools."
     },
     "proxied": {
-      "$ref": "#/$defs/load-balancing_proxied",
       "default": false,
-      "description": "Whether the hostname should be gray clouded (false) or orange clouded (true)."
+      "description": "Whether the hostname should be gray clouded (false) or orange clouded (true).",
+      "type": "boolean"
     },
     "random_steering": {
       "$ref": "#/$defs/load-balancing_random_steering",
@@ -166,42 +134,51 @@ export const load_balancing_load_balancer_editable: JsonSchema = {
       "description": "BETA Field Not General Access: A list of rules for this load balancer to execute."
     },
     "session_affinity": {
-      "$ref": "#/$defs/load-balancing_session_affinity",
       "default": "none",
-      "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration."
+      "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration.",
+      "enum": [
+        "none",
+        "cookie",
+        "ip_cookie",
+        "header"
+      ],
+      "type": "string"
     },
     "session_affinity_attributes": {
       "$ref": "#/$defs/load-balancing_session_affinity_attributes",
       "description": "Configures attributes for session affinity."
     },
     "session_affinity_ttl": {
-      "$ref": "#/$defs/load-balancing_session_affinity_ttl",
-      "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified."
+      "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified.",
+      "type": "number"
     },
     "steering_policy": {
-      "$ref": "#/$defs/load-balancing_steering_policy",
       "default": "",
-      "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`."
+      "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`.",
+      "enum": [
+        "off",
+        "geo",
+        "random",
+        "dynamic_latency",
+        "proximity",
+        "least_outstanding_requests",
+        "least_connections",
+        ""
+      ],
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/load-balancing_ttl",
-      "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers."
+      "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers.",
+      "type": "number"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_load-balancer_components-schemas-identifier`.
- */
-export const load_balancing_load_balancer_components_schemas_identifier: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_location_strategy`.
  */
-export const load_balancing_location_strategy: JsonSchema = {
+export const load$$balancing_location_strategy: JsonSchema = {
   "description": "Controls location-based steering for non-proxied requests. See `steering_policy` to learn how steering is affected.",
   "properties": {
     "mode": {
@@ -228,18 +205,10 @@ export const load_balancing_location_strategy: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_pool_default_weight`.
- */
-export const load_balancing_pool_default_weight: JsonSchema = {
-  "description": "The default weight for pools not listed in `pool_weights`. The declarative alternative to `random_steering.default_weight`; mutually exclusive with `random_steering`.",
-  "type": "number"
-};
-
 /**
  * The schema of `load-balancing_pool_weights`.
  */
-export const load_balancing_pool_weights: JsonSchema = {
+export const load$$balancing_pool_weights: JsonSchema = {
   "additionalProperties": {
     "type": "number"
   },
@@ -250,7 +219,7 @@ export const load_balancing_pool_weights: JsonSchema = {
 /**
  * The schema of `load-balancing_pools`.
  */
-export const load_balancing_pools: JsonSchema = {
+export const load$$balancing_pools: JsonSchema = {
   "description": "A flat, ordered list of pool IDs to route the matched audience to. Replaces the resolved topology with exactly these pools. Mutually exclusive with `fixed_response`.",
   "items": {
     "type": "string"
@@ -261,7 +230,7 @@ export const load_balancing_pools: JsonSchema = {
 /**
  * The schema of `load-balancing_pop_pools`.
  */
-export const load_balancing_pop_pools: JsonSchema = {
+export const load$$balancing_pop_pools: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -272,18 +241,10 @@ export const load_balancing_pop_pools: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_proxied`.
- */
-export const load_balancing_proxied: JsonSchema = {
-  "description": "Whether the hostname should be gray clouded (false) or orange clouded (true).",
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_random_steering`.
  */
-export const load_balancing_random_steering: JsonSchema = {
+export const load$$balancing_random_steering: JsonSchema = {
   "description": "Configures pool weights.\n- `steering_policy=\"random\"`: A random pool is selected with probability proportional to pool weights.\n- `steering_policy=\"least_outstanding_requests\"`: Use pool weights to scale each pool's outstanding requests.\n- `steering_policy=\"least_connections\"`: Use pool weights to scale each pool's open connections.",
   "properties": {
     "default_weight": {
@@ -305,7 +266,7 @@ export const load_balancing_random_steering: JsonSchema = {
 /**
  * The schema of `load-balancing_region_pools`.
  */
-export const load_balancing_region_pools: JsonSchema = {
+export const load$$balancing_region_pools: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -319,7 +280,7 @@ export const load_balancing_region_pools: JsonSchema = {
 /**
  * The schema of `load-balancing_rule_overrides`.
  */
-export const load_balancing_rule_overrides: JsonSchema = {
+export const load$$balancing_rule_overrides: JsonSchema = {
   "description": "A collection of overrides to apply when this rule's condition (or a pool set's `match`) is true. All fields are optional.",
   "properties": {
     "adaptive_routing": {
@@ -335,16 +296,16 @@ export const load_balancing_rule_overrides: JsonSchema = {
       "description": "A list of pool IDs ordered by their failover priority. Pools defined here are used by default, or when region_pools are not configured for a given region."
     },
     "fallback_pool": {
-      "$ref": "#/$defs/load-balancing_fallback_pool",
-      "description": "The pool ID to use when all other pools are detected as unhealthy."
+      "description": "The pool ID to use when all other pools are detected as unhealthy.",
+      "type": "string"
     },
     "location_strategy": {
       "$ref": "#/$defs/load-balancing_location_strategy",
       "description": "Controls location-based steering for non-proxied requests. See `steering_policy` to learn how steering is affected."
     },
     "pool_default_weight": {
-      "$ref": "#/$defs/load-balancing_pool_default_weight",
-      "description": "The default weight for pools not listed in `pool_weights`. The declarative alternative to `random_steering.default_weight`; mutually exclusive with `random_steering`."
+      "description": "The default weight for pools not listed in `pool_weights`. The declarative alternative to `random_steering.default_weight`; mutually exclusive with `random_steering`.",
+      "type": "number"
     },
     "pool_weights": {
       "$ref": "#/$defs/load-balancing_pool_weights",
@@ -367,26 +328,42 @@ export const load_balancing_rule_overrides: JsonSchema = {
       "description": "A mapping of region codes to a list of pool IDs (ordered by their failover priority) for the given region. Any regions not explicitly defined will fall back to using default_pools."
     },
     "session_affinity": {
-      "$ref": "#/$defs/load-balancing_session_affinity",
       "default": "none",
-      "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration."
+      "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration.",
+      "enum": [
+        "none",
+        "cookie",
+        "ip_cookie",
+        "header"
+      ],
+      "type": "string"
     },
     "session_affinity_attributes": {
       "$ref": "#/$defs/load-balancing_session_affinity_attributes",
       "description": "Configures attributes for session affinity."
     },
     "session_affinity_ttl": {
-      "$ref": "#/$defs/load-balancing_session_affinity_ttl",
-      "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified."
+      "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified.",
+      "type": "number"
     },
     "steering_policy": {
-      "$ref": "#/$defs/load-balancing_steering_policy",
       "default": "",
-      "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`."
+      "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`.",
+      "enum": [
+        "off",
+        "geo",
+        "random",
+        "dynamic_latency",
+        "proximity",
+        "least_outstanding_requests",
+        "least_connections",
+        ""
+      ],
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/load-balancing_ttl",
-      "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers."
+      "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers.",
+      "type": "number"
     }
   },
   "type": "object"
@@ -395,7 +372,7 @@ export const load_balancing_rule_overrides: JsonSchema = {
 /**
  * The schema of `load-balancing_rules`.
  */
-export const load_balancing_rules: JsonSchema = {
+export const load$$balancing_rules: JsonSchema = {
   "description": "BETA Field Not General Access: A list of rules for this load balancer to execute.",
   "items": {
     "properties": {
@@ -435,24 +412,10 @@ export const load_balancing_rules: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_session_affinity`.
- */
-export const load_balancing_session_affinity: JsonSchema = {
-  "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration.",
-  "enum": [
-    "none",
-    "cookie",
-    "ip_cookie",
-    "header"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_session_affinity_attributes`.
  */
-export const load_balancing_session_affinity_attributes: JsonSchema = {
+export const load$$balancing_session_affinity_attributes: JsonSchema = {
   "description": "Configures attributes for session affinity.",
   "properties": {
     "drain_duration": {
@@ -506,37 +469,3 @@ export const load_balancing_session_affinity_attributes: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `load-balancing_session_affinity_ttl`.
- */
-export const load_balancing_session_affinity_ttl: JsonSchema = {
-  "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified.",
-  "type": "number"
-};
-
-/**
- * The schema of `load-balancing_steering_policy`.
- */
-export const load_balancing_steering_policy: JsonSchema = {
-  "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`.",
-  "enum": [
-    "off",
-    "geo",
-    "random",
-    "dynamic_latency",
-    "proximity",
-    "least_outstanding_requests",
-    "least_connections",
-    ""
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_ttl`.
- */
-export const load_balancing_ttl: JsonSchema = {
-  "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers.",
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/loadBalancers/account/tools.ts b/src/generated/forge-mcp/loadBalancers/account/tools.ts
index 0187a6762..596330dbe 100644
--- a/src/generated/forge-mcp/loadBalancers/account/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/account/tools.ts
@@ -3,104 +3,67 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  load_balancing_api_paginated_response_collection_output,
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_messages_output,
-  load_balancing_networks_output,
-  load_balancing_result_info_output,
-  load_balancing_timestamp_output,
+  load$$balancing_api$$paginated$$response$$collection,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
+  load$$balancing_networks,
+  load$$balancing_result_info,
 } from "../../outputs.js";
-import { load_balancing_networks } from "../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../schemas.js";
+import { load$$balancing_networks as load$$balancing_networks$ } from "../../schemas.js";
 import {
-  load_balancing_adaptive_routing_output,
-  load_balancing_components_schemas_description_output,
-  load_balancing_components_schemas_enabled_output,
-  load_balancing_components_schemas_id_response_output,
-  load_balancing_components_schemas_name_output,
-  load_balancing_components_schemas_zone_name_output,
-  load_balancing_country_pools_output,
-  load_balancing_default_pools_output,
-  load_balancing_fallback_pool_output,
-  load_balancing_fixed_response_output,
-  load_balancing_load_balancer_components_schemas_identifier_output,
-  load_balancing_load_balancer_components_schemas_response_collection_output,
-  load_balancing_load_balancer_components_schemas_single_response_output,
-  load_balancing_load_balancer_output,
-  load_balancing_location_strategy_output,
-  load_balancing_match_output,
-  load_balancing_pool_default_weight_output,
-  load_balancing_pool_set_output,
-  load_balancing_pool_set_overrides_output,
-  load_balancing_pool_sets_output,
-  load_balancing_pool_weights_output,
-  load_balancing_pools_output,
-  load_balancing_pop_pools_output,
-  load_balancing_proxied_output,
-  load_balancing_random_steering_output,
-  load_balancing_region_pools_output,
-  load_balancing_rule_overrides_output,
-  load_balancing_rules_output,
-  load_balancing_session_affinity_attributes_output,
-  load_balancing_session_affinity_output,
-  load_balancing_session_affinity_ttl_output,
-  load_balancing_steering_policy_output,
-  load_balancing_topology_match_output,
-  load_balancing_ttl_output,
+  load$$balancing_adaptive_routing,
+  load$$balancing_components$$schemas$$id_response,
+  load$$balancing_country_pools,
+  load$$balancing_default_pools,
+  load$$balancing_fixed_response,
+  load$$balancing_load$$balancer,
+  load$$balancing_load$$balancer_components$$schemas$$response_collection,
+  load$$balancing_load$$balancer_components$$schemas$$single_response,
+  load$$balancing_location_strategy,
+  load$$balancing_match,
+  load$$balancing_pool_set,
+  load$$balancing_pool_set_overrides,
+  load$$balancing_pool_sets,
+  load$$balancing_pool_weights,
+  load$$balancing_pools,
+  load$$balancing_pop_pools,
+  load$$balancing_random_steering,
+  load$$balancing_region_pools,
+  load$$balancing_rule_overrides,
+  load$$balancing_rules,
+  load$$balancing_session_affinity_attributes,
+  load$$balancing_topology_match,
 } from "./outputs.js";
 import {
-  load_balancing_adaptive_routing,
-  load_balancing_components_schemas_description,
-  load_balancing_components_schemas_enabled,
-  load_balancing_components_schemas_name,
-  load_balancing_country_pools,
-  load_balancing_default_pools,
-  load_balancing_fallback_pool,
-  load_balancing_fixed_response,
-  load_balancing_load_balancer_components_schemas_identifier,
-  load_balancing_load_balancer_editable,
-  load_balancing_location_strategy,
-  load_balancing_pool_default_weight,
-  load_balancing_pool_weights,
-  load_balancing_pools,
-  load_balancing_pop_pools,
-  load_balancing_proxied,
-  load_balancing_random_steering,
-  load_balancing_region_pools,
-  load_balancing_rule_overrides,
-  load_balancing_rules,
-  load_balancing_session_affinity,
-  load_balancing_session_affinity_attributes,
-  load_balancing_session_affinity_ttl,
-  load_balancing_steering_policy,
-  load_balancing_ttl,
+  load$$balancing_adaptive_routing as load$$balancing_adaptive_routing$,
+  load$$balancing_country_pools as load$$balancing_country_pools$,
+  load$$balancing_default_pools as load$$balancing_default_pools$,
+  load$$balancing_fixed_response as load$$balancing_fixed_response$,
+  load$$balancing_load$$balancer$$editable,
+  load$$balancing_location_strategy as load$$balancing_location_strategy$,
+  load$$balancing_pool_weights as load$$balancing_pool_weights$,
+  load$$balancing_pools as load$$balancing_pools$,
+  load$$balancing_pop_pools as load$$balancing_pop_pools$,
+  load$$balancing_random_steering as load$$balancing_random_steering$,
+  load$$balancing_region_pools as load$$balancing_region_pools$,
+  load$$balancing_rule_overrides as load$$balancing_rule_overrides$,
+  load$$balancing_rules as load$$balancing_rules$,
+  load$$balancing_session_affinity_attributes as load$$balancing_session_affinity_attributes$,
 } from "./schemas.js";
 
 /**
- * The tools of `load_balancers.account`.
+ * The tools of `loadBalancers.account`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_account_create",
+    name: "loadBalancers_account_create",
     title: "Create account or zone Load Balancer",
-    description: "Create a new account or zone-scoped load balancer.",
+    description: "Create a new account or zone-scoped load balancer.\n\nPOST /{account_or_zone}/{account_or_zone_id}/load_balancers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "adaptive_routing": {
@@ -116,25 +79,25 @@ export const tools: readonly Tool[] = [
               "description": "A list of pool IDs ordered by their failover priority. Pools defined here are used by default, or when region_pools are not configured for a given region."
             },
             "description": {
-              "$ref": "#/$defs/load-balancing_components-schemas-description",
-              "description": "Object description."
+              "description": "Object description.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/load-balancing_components-schemas-enabled",
               "default": true,
-              "description": "Whether to enable (the default) this load balancer."
+              "description": "Whether to enable (the default) this load balancer.",
+              "type": "boolean"
             },
             "fallback_pool": {
-              "$ref": "#/$defs/load-balancing_fallback_pool",
-              "description": "The pool ID to use when all other pools are detected as unhealthy."
+              "description": "The pool ID to use when all other pools are detected as unhealthy.",
+              "type": "string"
             },
             "location_strategy": {
               "$ref": "#/$defs/load-balancing_location_strategy",
               "description": "Controls location-based steering for non-proxied requests. See `steering_policy` to learn how steering is affected."
             },
             "name": {
-              "$ref": "#/$defs/load-balancing_components-schemas-name",
-              "description": "The DNS hostname to associate with your Load Balancer. If this hostname already exists as a DNS record in Cloudflare's DNS, the Load Balancer will take precedence and the DNS record will not be used."
+              "description": "The DNS hostname to associate with your Load Balancer. If this hostname already exists as a DNS record in Cloudflare's DNS, the Load Balancer will take precedence and the DNS record will not be used.",
+              "type": "string"
             },
             "networks": {
               "$ref": "#/$defs/load-balancing_networks",
@@ -145,9 +108,9 @@ export const tools: readonly Tool[] = [
               "description": "Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs (ordered by their failover priority) for the PoP (datacenter). Any PoPs not explicitly defined will fall back to using the corresponding country_pool, then region_pool mapping if it exists else to default_pools."
             },
             "proxied": {
-              "$ref": "#/$defs/load-balancing_proxied",
               "default": false,
-              "description": "Whether the hostname should be gray clouded (false) or orange clouded (true)."
+              "description": "Whether the hostname should be gray clouded (false) or orange clouded (true).",
+              "type": "boolean"
             },
             "random_steering": {
               "$ref": "#/$defs/load-balancing_random_steering",
@@ -162,26 +125,42 @@ export const tools: readonly Tool[] = [
               "description": "BETA Field Not General Access: A list of rules for this load balancer to execute."
             },
             "session_affinity": {
-              "$ref": "#/$defs/load-balancing_session_affinity",
               "default": "none",
-              "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration."
+              "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration.",
+              "enum": [
+                "none",
+                "cookie",
+                "ip_cookie",
+                "header"
+              ],
+              "type": "string"
             },
             "session_affinity_attributes": {
               "$ref": "#/$defs/load-balancing_session_affinity_attributes",
               "description": "Configures attributes for session affinity."
             },
             "session_affinity_ttl": {
-              "$ref": "#/$defs/load-balancing_session_affinity_ttl",
-              "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified."
+              "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified.",
+              "type": "number"
             },
             "steering_policy": {
-              "$ref": "#/$defs/load-balancing_steering_policy",
               "default": "",
-              "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`."
+              "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`.",
+              "enum": [
+                "off",
+                "geo",
+                "random",
+                "dynamic_latency",
+                "proximity",
+                "least_outstanding_requests",
+                "least_connections",
+                ""
+              ],
+              "type": "string"
             },
             "ttl": {
-              "$ref": "#/$defs/load-balancing_ttl",
-              "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers."
+              "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers.",
+              "type": "number"
             }
           },
           "required": [
@@ -190,81 +169,79 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name,
-        "load-balancing_country_pools": load_balancing_country_pools,
-        "load-balancing_default_pools": load_balancing_default_pools,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool,
-        "load-balancing_fixed_response": load_balancing_fixed_response,
-        "load-balancing_location_strategy": load_balancing_location_strategy,
-        "load-balancing_networks": load_balancing_networks,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight,
-        "load-balancing_pool_weights": load_balancing_pool_weights,
-        "load-balancing_pools": load_balancing_pools,
-        "load-balancing_pop_pools": load_balancing_pop_pools,
-        "load-balancing_proxied": load_balancing_proxied,
-        "load-balancing_random_steering": load_balancing_random_steering,
-        "load-balancing_region_pools": load_balancing_region_pools,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides,
-        "load-balancing_rules": load_balancing_rules,
-        "load-balancing_session_affinity": load_balancing_session_affinity,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl,
-        "load-balancing_steering_policy": load_balancing_steering_policy,
-        "load-balancing_ttl": load_balancing_ttl,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing$,
+        "load-balancing_country_pools": load$$balancing_country_pools$,
+        "load-balancing_default_pools": load$$balancing_default_pools$,
+        "load-balancing_fixed_response": load$$balancing_fixed_response$,
+        "load-balancing_location_strategy": load$$balancing_location_strategy$,
+        "load-balancing_networks": load$$balancing_networks$,
+        "load-balancing_pool_weights": load$$balancing_pool_weights$,
+        "load-balancing_pools": load$$balancing_pools$,
+        "load-balancing_pop_pools": load$$balancing_pop_pools$,
+        "load-balancing_random_steering": load$$balancing_random_steering$,
+        "load-balancing_region_pools": load$$balancing_region_pools$,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides$,
+        "load-balancing_rules": load$$balancing_rules$,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-single_response",
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-single_response": load_balancing_load_balancer_components_schemas_single_response_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-single_response": load$$balancing_load$$balancer_components$$schemas$$single_response,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     annotations: {
@@ -291,44 +268,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-single_response": load_balancing_load_balancer_components_schemas_single_response_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-single_response": load$$balancing_load$$balancer_components$$schemas$$single_response,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     request: (args) => ({
@@ -337,46 +301,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_account_delete",
+    name: "loadBalancers_account_delete",
     title: "Delete account or zone Load Balancer",
-    description: "Delete a configured account or zone-scoped load balancer.",
+    description: "Delete a configured account or zone-scoped load balancer.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/load_balancers/{load_balancer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "load_balancer_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "load_balancer_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "load_balancer_id": {
-          "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-identifier"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "load_balancer_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_components-schemas-id_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-id_response": load_balancing_components_schemas_id_response_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_components-schemas-id_response": load$$balancing_components$$schemas$$id_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     annotations: {
@@ -403,12 +372,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-id_response": load_balancing_components_schemas_id_response_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_components-schemas-id_response": load$$balancing_components$$schemas$$id_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     request: (args) => ({
@@ -416,107 +384,92 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_account_edit",
+    name: "loadBalancers_account_edit",
     title: "Patch account or zone Load Balancer",
-    description: "Apply changes to an existing account or zone-scoped load balancer, overwriting the supplied properties.",
+    description: "Apply changes to an existing account or zone-scoped load balancer, overwriting the supplied properties.\n\nPATCH /{account_or_zone}/{account_or_zone_id}/load_balancers/{load_balancer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_load-balancer-editable"
         },
-        "load_balancer_id": {
-          "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "load_balancer_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "load_balancer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "load_balancer_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name,
-        "load-balancing_country_pools": load_balancing_country_pools,
-        "load-balancing_default_pools": load_balancing_default_pools,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool,
-        "load-balancing_fixed_response": load_balancing_fixed_response,
-        "load-balancing_load-balancer-editable": load_balancing_load_balancer_editable,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier,
-        "load-balancing_location_strategy": load_balancing_location_strategy,
-        "load-balancing_networks": load_balancing_networks,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight,
-        "load-balancing_pool_weights": load_balancing_pool_weights,
-        "load-balancing_pools": load_balancing_pools,
-        "load-balancing_pop_pools": load_balancing_pop_pools,
-        "load-balancing_proxied": load_balancing_proxied,
-        "load-balancing_random_steering": load_balancing_random_steering,
-        "load-balancing_region_pools": load_balancing_region_pools,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides,
-        "load-balancing_rules": load_balancing_rules,
-        "load-balancing_session_affinity": load_balancing_session_affinity,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl,
-        "load-balancing_steering_policy": load_balancing_steering_policy,
-        "load-balancing_ttl": load_balancing_ttl,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing$,
+        "load-balancing_country_pools": load$$balancing_country_pools$,
+        "load-balancing_default_pools": load$$balancing_default_pools$,
+        "load-balancing_fixed_response": load$$balancing_fixed_response$,
+        "load-balancing_load-balancer-editable": load$$balancing_load$$balancer$$editable,
+        "load-balancing_location_strategy": load$$balancing_location_strategy$,
+        "load-balancing_networks": load$$balancing_networks$,
+        "load-balancing_pool_weights": load$$balancing_pool_weights$,
+        "load-balancing_pools": load$$balancing_pools$,
+        "load-balancing_pop_pools": load$$balancing_pop_pools$,
+        "load-balancing_random_steering": load$$balancing_random_steering$,
+        "load-balancing_region_pools": load$$balancing_region_pools$,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides$,
+        "load-balancing_rules": load$$balancing_rules$,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-single_response",
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-single_response": load_balancing_load_balancer_components_schemas_single_response_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-single_response": load$$balancing_load$$balancer_components$$schemas$$single_response,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     annotations: {
@@ -543,44 +496,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-single_response": load_balancing_load_balancer_components_schemas_single_response_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-single_response": load$$balancing_load$$balancer_components$$schemas$$single_response,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     request: (args) => ({
@@ -589,78 +529,71 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_account_get",
+    name: "loadBalancers_account_get",
     title: "account or zone Load Balancer Details",
-    description: "Fetch a single configured account or zone-scoped load balancer.",
+    description: "Fetch a single configured account or zone-scoped load balancer.\n\nGET /{account_or_zone}/{account_or_zone_id}/load_balancers/{load_balancer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "load_balancer_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "load_balancer_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "load_balancer_id": {
-          "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-identifier"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "load_balancer_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-single_response",
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-single_response": load_balancing_load_balancer_components_schemas_single_response_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-single_response": load$$balancing_load$$balancer_components$$schemas$$single_response,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     annotations: {
@@ -688,44 +621,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-single_response": load_balancing_load_balancer_components_schemas_single_response_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-single_response": load$$balancing_load$$balancer_components$$schemas$$single_response,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     request: (args) => ({
@@ -733,74 +653,68 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_account_list",
+    name: "loadBalancers_account_list",
     title: "List account or zone Load Balancers",
-    description: "List configured account or zone-scoped load balancers.",
+    description: "List configured account or zone-scoped load balancers.\n\nGET /{account_or_zone}/{account_or_zone_id}/load_balancers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-response_collection",
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-response_collection": load_balancing_load_balancer_components_schemas_response_collection_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-response_collection": load$$balancing_load$$balancer_components$$schemas$$response_collection,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     annotations: {
@@ -828,45 +742,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-response_collection": load_balancing_load_balancer_components_schemas_response_collection_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-response_collection": load$$balancing_load$$balancer_components$$schemas$$response_collection,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     request: (args) => ({
@@ -874,24 +775,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_account_update",
+    name: "loadBalancers_account_update",
     title: "Update account or zone Load Balancer",
-    description: "Update a configured account or zone-scoped load balancer.",
+    description: "Update a configured account or zone-scoped load balancer.\n\nPUT /{account_or_zone}/{account_or_zone_id}/load_balancers/{load_balancer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "adaptive_routing": {
@@ -907,25 +796,25 @@ export const tools: readonly Tool[] = [
               "description": "A list of pool IDs ordered by their failover priority. Pools defined here are used by default, or when region_pools are not configured for a given region."
             },
             "description": {
-              "$ref": "#/$defs/load-balancing_components-schemas-description",
-              "description": "Object description."
+              "description": "Object description.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/load-balancing_components-schemas-enabled",
               "default": true,
-              "description": "Whether to enable (the default) this load balancer."
+              "description": "Whether to enable (the default) this load balancer.",
+              "type": "boolean"
             },
             "fallback_pool": {
-              "$ref": "#/$defs/load-balancing_fallback_pool",
-              "description": "The pool ID to use when all other pools are detected as unhealthy."
+              "description": "The pool ID to use when all other pools are detected as unhealthy.",
+              "type": "string"
             },
             "location_strategy": {
               "$ref": "#/$defs/load-balancing_location_strategy",
               "description": "Controls location-based steering for non-proxied requests. See `steering_policy` to learn how steering is affected."
             },
             "name": {
-              "$ref": "#/$defs/load-balancing_components-schemas-name",
-              "description": "The DNS hostname to associate with your Load Balancer. If this hostname already exists as a DNS record in Cloudflare's DNS, the Load Balancer will take precedence and the DNS record will not be used."
+              "description": "The DNS hostname to associate with your Load Balancer. If this hostname already exists as a DNS record in Cloudflare's DNS, the Load Balancer will take precedence and the DNS record will not be used.",
+              "type": "string"
             },
             "networks": {
               "$ref": "#/$defs/load-balancing_networks",
@@ -936,9 +825,9 @@ export const tools: readonly Tool[] = [
               "description": "Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs (ordered by their failover priority) for the PoP (datacenter). Any PoPs not explicitly defined will fall back to using the corresponding country_pool, then region_pool mapping if it exists else to default_pools."
             },
             "proxied": {
-              "$ref": "#/$defs/load-balancing_proxied",
               "default": false,
-              "description": "Whether the hostname should be gray clouded (false) or orange clouded (true)."
+              "description": "Whether the hostname should be gray clouded (false) or orange clouded (true).",
+              "type": "boolean"
             },
             "random_steering": {
               "$ref": "#/$defs/load-balancing_random_steering",
@@ -953,26 +842,42 @@ export const tools: readonly Tool[] = [
               "description": "BETA Field Not General Access: A list of rules for this load balancer to execute."
             },
             "session_affinity": {
-              "$ref": "#/$defs/load-balancing_session_affinity",
               "default": "none",
-              "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration."
+              "description": "Specifies the type of session affinity the load balancer should use unless specified as `\"none\"`. The supported types are: - `\"cookie\"`: On the first request to a proxied load balancer, a cookie is generated, encoding information of which origin the request will be forwarded to. Subsequent requests, by the same client to the same load balancer, will be sent to the origin server the cookie encodes, for the duration of the cookie and as long as the origin server remains healthy. If the cookie has expired or the origin server is unhealthy, then a new origin server is calculated and used. - `\"ip_cookie\"`: Behaves the same as `\"cookie\"` except the initial origin selection is stable and based on the client's ip address. - `\"header\"`: On the first request to a proxied load balancer, a session key based on the configured HTTP headers (see `session_affinity_attributes.headers`) is generated, encoding the request headers used for storing in the load balancer session state which origin the request will be forwarded to. Subsequent requests to the load balancer with the same headers will be sent to the same origin server, for the duration of the session and as long as the origin server remains healthy. If the session has been idle for the duration of `session_affinity_ttl` seconds or the origin server is unhealthy, then a new origin server is calculated and used. See `headers` in `session_affinity_attributes` for additional required configuration.",
+              "enum": [
+                "none",
+                "cookie",
+                "ip_cookie",
+                "header"
+              ],
+              "type": "string"
             },
             "session_affinity_attributes": {
               "$ref": "#/$defs/load-balancing_session_affinity_attributes",
               "description": "Configures attributes for session affinity."
             },
             "session_affinity_ttl": {
-              "$ref": "#/$defs/load-balancing_session_affinity_ttl",
-              "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified."
+              "description": "Time, in seconds, until a client's session expires after being created. Once the expiry time has been reached, subsequent requests may get sent to a different origin server. The accepted ranges per `session_affinity` policy are: - `\"cookie\"` / `\"ip_cookie\"`: The current default of 23 hours will be used unless explicitly set. The accepted range of values is between [1800, 604800]. - `\"header\"`: The current default of 1800 seconds will be used unless explicitly set. The accepted range of values is between [30, 3600]. Note: With session affinity by header, sessions only expire after they haven't been used for the number of seconds specified.",
+              "type": "number"
             },
             "steering_policy": {
-              "$ref": "#/$defs/load-balancing_steering_policy",
               "default": "",
-              "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`."
+              "description": "Steering Policy for this load balancer.\n- `\"off\"`: Use `default_pools`.\n- `\"geo\"`: Use `region_pools`/`country_pools`/`pop_pools`. For non-proxied requests, the country for `country_pools` is determined by `location_strategy`.\n- `\"random\"`: Select a pool randomly.\n- `\"dynamic_latency\"`: Use round trip time to select the closest pool in default_pools (requires pool health checks).\n- `\"proximity\"`: Use the pools' latitude and longitude to select the closest pool using the Cloudflare PoP location for proxied requests or the location determined by `location_strategy` for non-proxied requests.\n- `\"least_outstanding_requests\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of outstanding requests. Pools with more pending requests are weighted proportionately less relative to others.\n- `\"least_connections\"`: Select a pool by taking into consideration `random_steering` weights, as well as each pool's number of open connections. Pools with more open connections are weighted proportionately less relative to others. Supported for HTTP/1 and HTTP/2 connections.\n- `\"\"`: Will map to `\"geo\"` if you use `region_pools`/`country_pools`/`pop_pools` otherwise `\"off\"`.",
+              "enum": [
+                "off",
+                "geo",
+                "random",
+                "dynamic_latency",
+                "proximity",
+                "least_outstanding_requests",
+                "least_connections",
+                ""
+              ],
+              "type": "string"
             },
             "ttl": {
-              "$ref": "#/$defs/load-balancing_ttl",
-              "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers."
+              "description": "Time to live (TTL) of the DNS entry for the IP address returned by this load balancer. This only applies to gray-clouded (unproxied) load balancers.",
+              "type": "number"
             }
           },
           "required": [
@@ -982,85 +887,82 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "load_balancer_id": {
-          "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "load_balancer_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "load_balancer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "load_balancer_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name,
-        "load-balancing_country_pools": load_balancing_country_pools,
-        "load-balancing_default_pools": load_balancing_default_pools,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool,
-        "load-balancing_fixed_response": load_balancing_fixed_response,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier,
-        "load-balancing_location_strategy": load_balancing_location_strategy,
-        "load-balancing_networks": load_balancing_networks,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight,
-        "load-balancing_pool_weights": load_balancing_pool_weights,
-        "load-balancing_pools": load_balancing_pools,
-        "load-balancing_pop_pools": load_balancing_pop_pools,
-        "load-balancing_proxied": load_balancing_proxied,
-        "load-balancing_random_steering": load_balancing_random_steering,
-        "load-balancing_region_pools": load_balancing_region_pools,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides,
-        "load-balancing_rules": load_balancing_rules,
-        "load-balancing_session_affinity": load_balancing_session_affinity,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl,
-        "load-balancing_steering_policy": load_balancing_steering_policy,
-        "load-balancing_ttl": load_balancing_ttl,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing$,
+        "load-balancing_country_pools": load$$balancing_country_pools$,
+        "load-balancing_default_pools": load$$balancing_default_pools$,
+        "load-balancing_fixed_response": load$$balancing_fixed_response$,
+        "load-balancing_location_strategy": load$$balancing_location_strategy$,
+        "load-balancing_networks": load$$balancing_networks$,
+        "load-balancing_pool_weights": load$$balancing_pool_weights$,
+        "load-balancing_pools": load$$balancing_pools$,
+        "load-balancing_pop_pools": load$$balancing_pop_pools$,
+        "load-balancing_random_steering": load$$balancing_random_steering$,
+        "load-balancing_region_pools": load$$balancing_region_pools$,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides$,
+        "load-balancing_rules": load$$balancing_rules$,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-single_response",
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-single_response": load_balancing_load_balancer_components_schemas_single_response_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-single_response": load$$balancing_load$$balancer_components$$schemas$$single_response,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     annotations: {
@@ -1087,44 +989,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_adaptive_routing": load_balancing_adaptive_routing_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-description": load_balancing_components_schemas_description_output,
-        "load-balancing_components-schemas-enabled": load_balancing_components_schemas_enabled_output,
-        "load-balancing_components-schemas-name": load_balancing_components_schemas_name_output,
-        "load-balancing_components-schemas-zone-name": load_balancing_components_schemas_zone_name_output,
-        "load-balancing_country_pools": load_balancing_country_pools_output,
-        "load-balancing_default_pools": load_balancing_default_pools_output,
-        "load-balancing_fallback_pool": load_balancing_fallback_pool_output,
-        "load-balancing_fixed_response": load_balancing_fixed_response_output,
-        "load-balancing_load-balancer": load_balancing_load_balancer_output,
-        "load-balancing_load-balancer_components-schemas-identifier": load_balancing_load_balancer_components_schemas_identifier_output,
-        "load-balancing_load-balancer_components-schemas-single_response": load_balancing_load_balancer_components_schemas_single_response_output,
-        "load-balancing_location_strategy": load_balancing_location_strategy_output,
-        "load-balancing_match": load_balancing_match_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_pool_default_weight": load_balancing_pool_default_weight_output,
-        "load-balancing_pool_set": load_balancing_pool_set_output,
-        "load-balancing_pool_set_overrides": load_balancing_pool_set_overrides_output,
-        "load-balancing_pool_sets": load_balancing_pool_sets_output,
-        "load-balancing_pool_weights": load_balancing_pool_weights_output,
-        "load-balancing_pools": load_balancing_pools_output,
-        "load-balancing_pop_pools": load_balancing_pop_pools_output,
-        "load-balancing_proxied": load_balancing_proxied_output,
-        "load-balancing_random_steering": load_balancing_random_steering_output,
-        "load-balancing_region_pools": load_balancing_region_pools_output,
-        "load-balancing_rule_overrides": load_balancing_rule_overrides_output,
-        "load-balancing_rules": load_balancing_rules_output,
-        "load-balancing_session_affinity": load_balancing_session_affinity_output,
-        "load-balancing_session_affinity_attributes": load_balancing_session_affinity_attributes_output,
-        "load-balancing_session_affinity_ttl": load_balancing_session_affinity_ttl_output,
-        "load-balancing_steering_policy": load_balancing_steering_policy_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_topology_match": load_balancing_topology_match_output,
-        "load-balancing_ttl": load_balancing_ttl_output,
+        "load-balancing_adaptive_routing": load$$balancing_adaptive_routing,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_country_pools": load$$balancing_country_pools,
+        "load-balancing_default_pools": load$$balancing_default_pools,
+        "load-balancing_fixed_response": load$$balancing_fixed_response,
+        "load-balancing_load-balancer": load$$balancing_load$$balancer,
+        "load-balancing_load-balancer_components-schemas-single_response": load$$balancing_load$$balancer_components$$schemas$$single_response,
+        "load-balancing_location_strategy": load$$balancing_location_strategy,
+        "load-balancing_match": load$$balancing_match,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_pool_set": load$$balancing_pool_set,
+        "load-balancing_pool_set_overrides": load$$balancing_pool_set_overrides,
+        "load-balancing_pool_sets": load$$balancing_pool_sets,
+        "load-balancing_pool_weights": load$$balancing_pool_weights,
+        "load-balancing_pools": load$$balancing_pools,
+        "load-balancing_pop_pools": load$$balancing_pop_pools,
+        "load-balancing_random_steering": load$$balancing_random_steering,
+        "load-balancing_region_pools": load$$balancing_region_pools,
+        "load-balancing_rule_overrides": load$$balancing_rule_overrides,
+        "load-balancing_rules": load$$balancing_rules,
+        "load-balancing_session_affinity_attributes": load$$balancing_session_affinity_attributes,
+        "load-balancing_topology_match": load$$balancing_topology_match,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/account/usage/outputs.ts b/src/generated/forge-mcp/loadBalancers/account/usage/outputs.ts
index b16350b18..0d547a122 100644
--- a/src/generated/forge-mcp/loadBalancers/account/usage/outputs.ts
+++ b/src/generated/forge-mcp/loadBalancers/account/usage/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * `load-balancing_load-balancer_components-schemas-usage_response` in
  * responses.
  */
-export const load_balancing_load_balancer_components_schemas_usage_response_output: JsonSchema = {
+export const load$$balancing_load$$balancer_components$$schemas$$usage_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
diff --git a/src/generated/forge-mcp/loadBalancers/account/usage/tools.ts b/src/generated/forge-mcp/loadBalancers/account/usage/tools.ts
index be11cbe09..a2f033dfe 100644
--- a/src/generated/forge-mcp/loadBalancers/account/usage/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/account/usage/tools.ts
@@ -3,44 +3,50 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_messages_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
 } from "../../../outputs.js";
-import { load_balancing_components_schemas_identifier } from "../../schemas.js";
-import { load_balancing_load_balancer_components_schemas_usage_response_output } from "./outputs.js";
+import { load$$balancing_load$$balancer_components$$schemas$$usage_response } from "./outputs.js";
 
 /**
- * The tools of `load_balancers.account.usage`.
+ * The tools of `loadBalancers.account.usage`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_account_usage_list",
+    name: "loadBalancers_account_usage_list",
     title: "List Load Balancer Usage",
-    description: "Get current load balancer resource usage counts for an account.",
+    description: "Get current load balancer resource usage counts for an account.\n\nGET /accounts/{account_id}/load_balancers/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_load-balancer_components-schemas-usage_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_load-balancer_components-schemas-usage_response": load_balancing_load_balancer_components_schemas_usage_response_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_load-balancer_components-schemas-usage_response": load$$balancing_load$$balancer_components$$schemas$$usage_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     annotations: {
@@ -68,11 +74,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_load-balancer_components-schemas-usage_response": load_balancing_load_balancer_components_schemas_usage_response_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_load-balancer_components-schemas-usage_response": load$$balancing_load$$balancer_components$$schemas$$usage_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/monitorGroups/outputs.ts b/src/generated/forge-mcp/loadBalancers/monitorGroups/outputs.ts
index 933845f01..0986faa2f 100644
--- a/src/generated/forge-mcp/loadBalancers/monitorGroups/outputs.ts
+++ b/src/generated/forge-mcp/loadBalancers/monitorGroups/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `load-balancing_monitor-group` in responses.
  */
-export const load_balancing_monitor_group_output: JsonSchema = {
+export const load$$balancing_monitor$$group: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -16,7 +16,7 @@ export const load_balancing_monitor_group_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/load-balancing_monitor_group_id"
+      "type": "string"
     },
     "members": {
       "items": {
@@ -40,7 +40,7 @@ export const load_balancing_monitor_group_output: JsonSchema = {
 /**
  * The schema of `load-balancing_monitor-group-member` in responses.
  */
-export const load_balancing_monitor_group_member_output: JsonSchema = {
+export const load$$balancing_monitor$$group$$member: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -50,7 +50,7 @@ export const load_balancing_monitor_group_member_output: JsonSchema = {
       "type": "boolean"
     },
     "monitor_id": {
-      "$ref": "#/$defs/load-balancing_monitor_id"
+      "type": "string"
     },
     "monitoring_only": {
       "type": "boolean"
@@ -76,7 +76,7 @@ export const load_balancing_monitor_group_member_output: JsonSchema = {
  * The schema of `load-balancing_monitor-group-response-collection` in
  * responses.
  */
-export const load_balancing_monitor_group_response_collection_output: JsonSchema = {
+export const load$$balancing_monitor$$group$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-common"
@@ -101,7 +101,7 @@ export const load_balancing_monitor_group_response_collection_output: JsonSchema
 /**
  * The schema of `load-balancing_monitor-group-single-response` in responses.
  */
-export const load_balancing_monitor_group_single_response_output: JsonSchema = {
+export const load$$balancing_monitor$$group$$single$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-common"
diff --git a/src/generated/forge-mcp/loadBalancers/monitorGroups/references/outputs.ts b/src/generated/forge-mcp/loadBalancers/monitorGroups/references/outputs.ts
index 405a6bf35..c232b409a 100644
--- a/src/generated/forge-mcp/loadBalancers/monitorGroups/references/outputs.ts
+++ b/src/generated/forge-mcp/loadBalancers/monitorGroups/references/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `load-balancing_monitor-group-references-response` in
  * responses.
  */
-export const load_balancing_monitor_group_references_response_output: JsonSchema = {
+export const load$$balancing_monitor$$group$$references$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-common"
diff --git a/src/generated/forge-mcp/loadBalancers/monitorGroups/references/tools.ts b/src/generated/forge-mcp/loadBalancers/monitorGroups/references/tools.ts
index c5c9a9eb9..ef9a65dd8 100644
--- a/src/generated/forge-mcp/loadBalancers/monitorGroups/references/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/monitorGroups/references/tools.ts
@@ -3,48 +3,52 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_messages_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_messages,
 } from "../../../outputs.js";
-import { load_balancing_identifier } from "../../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../../schemas.js";
-import { load_balancing_monitor_group_references_response_output } from "./outputs.js";
+import { load$$balancing_monitor$$group$$references$$response } from "./outputs.js";
 
 /**
- * The tools of `load_balancers.monitor_groups.references`.
+ * The tools of `loadBalancers.monitorGroups.references`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_monitor_groups_references_list",
+    name: "loadBalancers_monitorGroups_references_list",
     title: "List Monitor Group References",
-    description: "Get the list of resources that reference the provided monitor group.",
+    description: "Get the list of resources that reference the provided monitor group.\n\nGET /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}/references",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "monitor_group_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_group_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_identifier": load_balancing_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-group-references-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group-references-response": load_balancing_monitor_group_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group-references-response": load$$balancing_monitor$$group$$references$$response,
       },
     },
     annotations: {
@@ -66,10 +70,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group-references-response": load_balancing_monitor_group_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group-references-response": load$$balancing_monitor$$group$$references$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/monitorGroups/schemas.ts b/src/generated/forge-mcp/loadBalancers/monitorGroups/schemas.ts
index 437cdb0cb..90d2573ea 100644
--- a/src/generated/forge-mcp/loadBalancers/monitorGroups/schemas.ts
+++ b/src/generated/forge-mcp/loadBalancers/monitorGroups/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `load-balancing_monitor-group`.
  */
-export const load_balancing_monitor_group: JsonSchema = {
+export const load$$balancing_monitor$$group: JsonSchema = {
   "properties": {
     "description": {
       "description": "A short description of the monitor group",
@@ -30,15 +30,15 @@ export const load_balancing_monitor_group: JsonSchema = {
 /**
  * The schema of `load-balancing_monitor-group-member`.
  */
-export const load_balancing_monitor_group_member: JsonSchema = {
+export const load$$balancing_monitor$$group$$member: JsonSchema = {
   "properties": {
     "enabled": {
       "description": "Whether this monitor is enabled in the group",
       "type": "boolean"
     },
     "monitor_id": {
-      "$ref": "#/$defs/load-balancing_monitor_id",
-      "description": "The ID of the Monitor to use for checking the health of origins within this pool."
+      "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+      "type": "string"
     },
     "monitoring_only": {
       "description": "Whether this monitor is used for monitoring only (does not affect pool health)",
diff --git a/src/generated/forge-mcp/loadBalancers/monitorGroups/tools.ts b/src/generated/forge-mcp/loadBalancers/monitorGroups/tools.ts
index f0d5dbc5f..2dcb953d0 100644
--- a/src/generated/forge-mcp/loadBalancers/monitorGroups/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/monitorGroups/tools.ts
@@ -3,69 +3,68 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_messages_output,
-  load_balancing_monitor_group_id_output,
-  load_balancing_monitor_id_output,
-  load_balancing_result_info_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_messages,
+  load$$balancing_result_info,
 } from "../../outputs.js";
 import {
-  load_balancing_monitor_id,
-  load_balancing_schemas_identifier,
-} from "../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../schemas.js";
-import {
-  load_balancing_monitor_group_member_output,
-  load_balancing_monitor_group_output,
-  load_balancing_monitor_group_response_collection_output,
-  load_balancing_monitor_group_single_response_output,
+  load$$balancing_monitor$$group,
+  load$$balancing_monitor$$group$$member,
+  load$$balancing_monitor$$group$$response$$collection,
+  load$$balancing_monitor$$group$$single$$response,
 } from "./outputs.js";
 import {
-  load_balancing_monitor_group,
-  load_balancing_monitor_group_member,
+  load$$balancing_monitor$$group as load$$balancing_monitor$$group$,
+  load$$balancing_monitor$$group$$member as load$$balancing_monitor$$group$$member$,
 } from "./schemas.js";
 
 /**
- * The tools of `load_balancers.monitor_groups`.
+ * The tools of `loadBalancers.monitorGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_monitor_groups_create",
+    name: "loadBalancers_monitorGroups_create",
     title: "Create Monitor Group",
-    description: "Create a new monitor group.",
+    description: "Create a new monitor group.\n\nPOST /accounts/{account_id}/load_balancers/monitor_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-group"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_monitor-group": load_balancing_monitor_group,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group$,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-group-single-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     annotations: {
@@ -90,14 +89,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     request: (args) => ({
@@ -106,39 +103,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitor_groups_delete",
+    name: "loadBalancers_monitorGroups_delete",
     title: "Delete Monitor Group",
-    description: "Delete a configured monitor group.",
+    description: "Delete a configured monitor group.\n\nDELETE /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "monitor_group_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_group_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-group-single-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     annotations: {
@@ -163,14 +164,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     request: (args) => ({
@@ -178,46 +177,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitor_groups_edit",
+    name: "loadBalancers_monitorGroups_edit",
     title: "Patch Monitor Group",
-    description: "Apply changes to an existing monitor group, overwriting the supplied properties.",
+    description: "Apply changes to an existing monitor group, overwriting the supplied properties.\n\nPATCH /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-group"
         },
-        "monitor_group_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_monitor-group": load_balancing_monitor_group,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group$,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-group-single-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     annotations: {
@@ -242,14 +246,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     request: (args) => ({
@@ -258,39 +260,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitor_groups_get",
+    name: "loadBalancers_monitorGroups_get",
     title: "Monitor Group Details",
-    description: "Fetch a single configured monitor group.",
+    description: "Fetch a single configured monitor group.\n\nGET /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "monitor_group_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_group_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-group-single-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     annotations: {
@@ -312,14 +318,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     request: (args) => ({
@@ -327,35 +331,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitor_groups_list",
+    name: "loadBalancers_monitorGroups_list",
     title: "List Monitor Groups",
-    description: "List configured monitor groups.",
+    description: "List configured monitor groups.\n\nGET /accounts/{account_id}/load_balancers/monitor_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-group-response-collection",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-response-collection": load_balancing_monitor_group_response_collection_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-response-collection": load$$balancing_monitor$$group$$response$$collection,
+        "load-balancing_result_info": load$$balancing_result_info,
       },
     },
     annotations: {
@@ -377,15 +386,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-response-collection": load_balancing_monitor_group_response_collection_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-response-collection": load$$balancing_monitor$$group$$response$$collection,
+        "load-balancing_result_info": load$$balancing_result_info,
       },
     },
     request: (args) => ({
@@ -393,46 +400,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitor_groups_update",
+    name: "loadBalancers_monitorGroups_update",
     title: "Update Monitor Group",
-    description: "Modify a configured monitor group.",
+    description: "Modify a configured monitor group.\n\nPUT /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-group"
         },
-        "monitor_group_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_monitor-group": load_balancing_monitor_group,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group$,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-group-single-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     annotations: {
@@ -457,14 +469,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-group": load_balancing_monitor_group_output,
-        "load-balancing_monitor-group-member": load_balancing_monitor_group_member_output,
-        "load-balancing_monitor-group-single-response": load_balancing_monitor_group_single_response_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-group": load$$balancing_monitor$$group,
+        "load-balancing_monitor-group-member": load$$balancing_monitor$$group$$member,
+        "load-balancing_monitor-group-single-response": load$$balancing_monitor$$group$$single$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/monitors/previews/tools.ts b/src/generated/forge-mcp/loadBalancers/monitors/previews/tools.ts
index 7bf733fe8..b7a050c2f 100644
--- a/src/generated/forge-mcp/loadBalancers/monitors/previews/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/monitors/previews/tools.ts
@@ -3,92 +3,66 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_identifier_output,
-  load_balancing_messages_output,
-  load_balancing_preview_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
+  load$$balancing_preview_response,
 } from "../../../outputs.js";
 import {
-  load_balancing_allow_insecure,
-  load_balancing_consecutive_down,
-  load_balancing_consecutive_up,
-  load_balancing_description,
-  load_balancing_expected_body,
-  load_balancing_expected_codes,
-  load_balancing_follow_redirects,
-  load_balancing_header,
-  load_balancing_identifier,
-  load_balancing_interval,
-  load_balancing_method,
-  load_balancing_monitor_editable,
-  load_balancing_path,
-  load_balancing_port,
-  load_balancing_probe_zone,
-  load_balancing_retries,
-  load_balancing_timeout,
-  load_balancing_type,
+  load$$balancing_header,
+  load$$balancing_monitor$$editable,
 } from "../../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../../schemas.js";
 
 /**
- * The tools of `load_balancers.monitors.previews`.
+ * The tools of `loadBalancers.monitors.previews`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_monitors_previews_create",
+    name: "loadBalancers_monitors_previews_create",
     title: "Preview Monitor",
-    description: "Preview pools using the specified monitor with provided monitor details. The returned preview_id can be used in the preview endpoint to retrieve the results.",
+    description: "Preview pools using the specified monitor with provided monitor details. The returned preview_id can be used in the preview endpoint to retrieve the results.\n\nPOST /accounts/{account_id}/load_balancers/monitors/{monitor_id}/preview",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
         },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_identifier": load_balancing_identifier,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_preview_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_preview_response": load_balancing_preview_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_preview_response": load$$balancing_preview_response,
       },
     },
     annotations: {
@@ -110,12 +84,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_preview_response": load_balancing_preview_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_preview_response": load$$balancing_preview_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/monitors/references/tools.ts b/src/generated/forge-mcp/loadBalancers/monitors/references/tools.ts
index 42ba9cf73..46a155948 100644
--- a/src/generated/forge-mcp/loadBalancers/monitors/references/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/monitors/references/tools.ts
@@ -3,48 +3,52 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_messages_output,
-  load_balancing_monitor_references_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_messages,
+  load$$balancing_monitor$$references$$response,
 } from "../../../outputs.js";
-import { load_balancing_identifier } from "../../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../../schemas.js";
 
 /**
- * The tools of `load_balancers.monitors.references`.
+ * The tools of `loadBalancers.monitors.references`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_monitors_references_get",
+    name: "loadBalancers_monitors_references_get",
     title: "List Monitor References",
-    description: "Get the list of resources that reference the provided monitor.",
+    description: "Get the list of resources that reference the provided monitor.\n\nGET /accounts/{account_id}/load_balancers/monitors/{monitor_id}/references",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_identifier": load_balancing_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-references-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-references-response": load_balancing_monitor_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-references-response": load$$balancing_monitor$$references$$response,
       },
     },
     annotations: {
@@ -72,10 +76,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-references-response": load_balancing_monitor_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-references-response": load$$balancing_monitor$$references$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/monitors/tools.ts b/src/generated/forge-mcp/loadBalancers/monitors/tools.ts
index dd4cb0a4f..a9d9c6a67 100644
--- a/src/generated/forge-mcp/loadBalancers/monitors/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/monitors/tools.ts
@@ -3,129 +3,72 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  load_balancing_allow_insecure_output,
-  load_balancing_api_paginated_response_collection_output,
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_consecutive_down_output,
-  load_balancing_consecutive_up_output,
-  load_balancing_description_output,
-  load_balancing_expected_body_output,
-  load_balancing_expected_codes_output,
-  load_balancing_follow_redirects_output,
-  load_balancing_header_output,
-  load_balancing_id_response_output,
-  load_balancing_identifier_output,
-  load_balancing_interval_output,
-  load_balancing_messages_output,
-  load_balancing_method_output,
-  load_balancing_monitor_editable_output,
-  load_balancing_monitor_output,
-  load_balancing_monitor_response_collection_output,
-  load_balancing_monitor_response_single_output,
-  load_balancing_path_output,
-  load_balancing_port_output,
-  load_balancing_probe_zone_output,
-  load_balancing_result_info_output,
-  load_balancing_retries_output,
-  load_balancing_timeout_output,
-  load_balancing_timestamp_output,
-  load_balancing_type_output,
+  load$$balancing_api$$paginated$$response$$collection,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_header,
+  load$$balancing_id_response,
+  load$$balancing_messages,
+  load$$balancing_monitor,
+  load$$balancing_monitor$$editable,
+  load$$balancing_monitor$$response$$collection,
+  load$$balancing_monitor$$response$$single,
+  load$$balancing_result_info,
 } from "../../outputs.js";
 import {
-  load_balancing_allow_insecure,
-  load_balancing_consecutive_down,
-  load_balancing_consecutive_up,
-  load_balancing_description,
-  load_balancing_expected_body,
-  load_balancing_expected_codes,
-  load_balancing_follow_redirects,
-  load_balancing_header,
-  load_balancing_identifier,
-  load_balancing_interval,
-  load_balancing_method,
-  load_balancing_monitor_editable,
-  load_balancing_path,
-  load_balancing_port,
-  load_balancing_probe_zone,
-  load_balancing_retries,
-  load_balancing_timeout,
-  load_balancing_type,
+  load$$balancing_header as load$$balancing_header$,
+  load$$balancing_monitor$$editable as load$$balancing_monitor$$editable$,
 } from "../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../schemas.js";
 
 /**
- * The tools of `load_balancers.monitors`.
+ * The tools of `loadBalancers.monitors`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_monitors_create",
+    name: "loadBalancers_monitors_create",
     title: "Create Monitor",
-    description: "Create a configured monitor.",
+    description: "Create a configured monitor.\n\nPOST /accounts/{account_id}/load_balancers/monitors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header$,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-single",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     annotations: {
@@ -152,31 +95,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     request: (args) => ({
@@ -185,37 +111,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitors_delete",
+    name: "loadBalancers_monitors_delete",
     title: "Delete Monitor",
-    description: "Delete a configured monitor.",
+    description: "Delete a configured monitor.\n\nDELETE /accounts/{account_id}/load_balancers/monitors/{monitor_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_identifier": load_balancing_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_id_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_id_response": load_balancing_id_response_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_id_response": load$$balancing_id_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     annotations: {
@@ -242,12 +173,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_id_response": load_balancing_id_response_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_id_response": load$$balancing_id_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     request: (args) => ({
@@ -255,77 +185,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitors_edit",
+    name: "loadBalancers_monitors_edit",
     title: "Patch Monitor",
-    description: "Apply changes to an existing monitor, overwriting the supplied properties.",
+    description: "Apply changes to an existing monitor, overwriting the supplied properties.\n\nPATCH /accounts/{account_id}/load_balancers/monitors/{monitor_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
         },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_identifier": load_balancing_identifier,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header$,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-single",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     annotations: {
@@ -352,31 +258,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     request: (args) => ({
@@ -385,56 +274,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitors_get",
+    name: "loadBalancers_monitors_get",
     title: "Monitor Details",
-    description: "Fetch a single configured monitor for an account.",
+    description: "Fetch a single configured monitor for an account.\n\nGET /accounts/{account_id}/load_balancers/monitors/{monitor_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_identifier": load_balancing_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-single",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     annotations: {
@@ -462,31 +340,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     request: (args) => ({
@@ -494,52 +355,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitors_list",
+    name: "loadBalancers_monitors_list",
     title: "List Monitors",
-    description: "List configured monitors for an account.",
+    description: "List configured monitors for an account.\n\nGET /accounts/{account_id}/load_balancers/monitors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-collection",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-collection": load_balancing_monitor_response_collection_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-collection": load$$balancing_monitor$$response$$collection,
+        "load-balancing_result_info": load$$balancing_result_info,
       },
     },
     annotations: {
@@ -567,32 +418,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-collection": load_balancing_monitor_response_collection_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-collection": load$$balancing_monitor$$response$$collection,
+        "load-balancing_result_info": load$$balancing_result_info,
       },
     },
     request: (args) => ({
@@ -600,77 +434,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_monitors_update",
+    name: "loadBalancers_monitors_update",
     title: "Update Monitor",
-    description: "Modify a configured monitor.",
+    description: "Modify a configured monitor.\n\nPUT /accounts/{account_id}/load_balancers/monitors/{monitor_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
         },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "monitor_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_identifier": load_balancing_identifier,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header$,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-single",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     annotations: {
@@ -697,31 +507,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/pools/health/tools.ts b/src/generated/forge-mcp/loadBalancers/pools/health/tools.ts
index 30837374a..20a5c3d5b 100644
--- a/src/generated/forge-mcp/loadBalancers/pools/health/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/pools/health/tools.ts
@@ -3,94 +3,68 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_health_details_output,
-  load_balancing_identifier_output,
-  load_balancing_messages_output,
-  load_balancing_origin_health_output,
-  load_balancing_preview_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_health_details,
+  load$$balancing_messages,
+  load$$balancing_origin$$health,
+  load$$balancing_preview_response,
 } from "../../../outputs.js";
 import {
-  load_balancing_allow_insecure,
-  load_balancing_consecutive_down,
-  load_balancing_consecutive_up,
-  load_balancing_description,
-  load_balancing_expected_body,
-  load_balancing_expected_codes,
-  load_balancing_follow_redirects,
-  load_balancing_header,
-  load_balancing_interval,
-  load_balancing_method,
-  load_balancing_monitor_editable,
-  load_balancing_path,
-  load_balancing_port,
-  load_balancing_probe_zone,
-  load_balancing_retries,
-  load_balancing_schemas_identifier,
-  load_balancing_timeout,
-  load_balancing_type,
+  load$$balancing_header,
+  load$$balancing_monitor$$editable,
 } from "../../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../../schemas.js";
 
 /**
- * The tools of `load_balancers.pools.health`.
+ * The tools of `loadBalancers.pools.health`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_pools_health_create",
+    name: "loadBalancers_pools_health_create",
     title: "Preview Pool",
-    description: "Preview pool health using provided monitor details. The returned preview_id can be used in the preview endpoint to retrieve the results.",
+    description: "Preview pool health using provided monitor details. The returned preview_id can be used in the preview endpoint to retrieve the results.\n\nPOST /accounts/{account_id}/load_balancers/pools/{pool_id}/preview",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
         },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pool_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_preview_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_preview_response": load_balancing_preview_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_preview_response": load$$balancing_preview_response,
       },
     },
     annotations: {
@@ -112,12 +86,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_preview_response": load_balancing_preview_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_preview_response": load$$balancing_preview_response,
       },
     },
     request: (args) => ({
@@ -126,37 +99,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_pools_health_get",
+    name: "loadBalancers_pools_health_get",
     title: "Pool Health Details",
-    description: "Fetch the latest pool health status for a single pool.",
+    description: "Fetch the latest pool health status for a single pool.\n\nGET /accounts/{account_id}/load_balancers/pools/{pool_id}/health",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pool_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_health_details",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_health_details": load_balancing_health_details_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin-health": load_balancing_origin_health_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_health_details": load$$balancing_health_details,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin-health": load$$balancing_origin$$health,
       },
     },
     annotations: {
@@ -184,12 +163,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_health_details": load_balancing_health_details_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin-health": load_balancing_origin_health_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_health_details": load$$balancing_health_details,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin-health": load$$balancing_origin$$health,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/pools/references/tools.ts b/src/generated/forge-mcp/loadBalancers/pools/references/tools.ts
index dd7896dfa..11d16d6cf 100644
--- a/src/generated/forge-mcp/loadBalancers/pools/references/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/pools/references/tools.ts
@@ -3,48 +3,52 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_messages_output,
-  load_balancing_pools_references_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_messages,
+  load$$balancing_pools$$references$$response,
 } from "../../../outputs.js";
-import { load_balancing_schemas_identifier } from "../../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../../schemas.js";
 
 /**
- * The tools of `load_balancers.pools.references`.
+ * The tools of `loadBalancers.pools.references`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_pools_references_get",
+    name: "loadBalancers_pools_references_get",
     title: "List Pool References",
-    description: "Get the list of resources that reference the provided pool.",
+    description: "Get the list of resources that reference the provided pool.\n\nGET /accounts/{account_id}/load_balancers/pools/{pool_id}/references",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pool_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_pools-references-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_pools-references-response": load_balancing_pools_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_pools-references-response": load$$balancing_pools$$references$$response,
       },
     },
     annotations: {
@@ -72,10 +76,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_pools-references-response": load_balancing_pools_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_pools-references-response": load$$balancing_pools$$references$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/pools/tools.ts b/src/generated/forge-mcp/loadBalancers/pools/tools.ts
index a1cd213c7..da72a9cab 100644
--- a/src/generated/forge-mcp/loadBalancers/pools/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/pools/tools.ts
@@ -1,156 +1,103 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  load_balancing_Host_output,
-  load_balancing_address_output,
-  load_balancing_api_paginated_response_collection_output,
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_check_regions_output,
-  load_balancing_disabled_at_output,
-  load_balancing_enabled_output,
-  load_balancing_filter_options_output,
-  load_balancing_health_sources_output,
-  load_balancing_latitude_output,
-  load_balancing_load_shedding_output,
-  load_balancing_longitude_output,
-  load_balancing_messages_output,
-  load_balancing_minimum_origins_output,
-  load_balancing_monitor_group_id_output,
-  load_balancing_monitor_id_output,
-  load_balancing_name_output,
-  load_balancing_networks_output,
-  load_balancing_notification_email_output,
-  load_balancing_notification_filter_output,
-  load_balancing_origin_flatten_cname_output,
-  load_balancing_origin_output,
-  load_balancing_origin_port_output,
-  load_balancing_origin_steering_output,
-  load_balancing_origins_output,
-  load_balancing_pool_output,
-  load_balancing_result_info_output,
-  load_balancing_schemas_description_output,
-  load_balancing_schemas_disabled_at_output,
-  load_balancing_schemas_enabled_output,
-  load_balancing_schemas_header_output,
-  load_balancing_schemas_id_response_output,
-  load_balancing_schemas_identifier_output,
-  load_balancing_schemas_name_output,
-  load_balancing_schemas_response_collection_output,
-  load_balancing_schemas_single_response_output,
-  load_balancing_timestamp_output,
-  load_balancing_virtual_network_id_output,
-  load_balancing_weight_output,
+  load$$balancing_Host,
+  load$$balancing_api$$paginated$$response$$collection,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_check_regions,
+  load$$balancing_filter_options,
+  load$$balancing_health_sources,
+  load$$balancing_load_shedding,
+  load$$balancing_messages,
+  load$$balancing_networks,
+  load$$balancing_notification_filter,
+  load$$balancing_origin,
+  load$$balancing_origin_steering,
+  load$$balancing_origins,
+  load$$balancing_pool,
+  load$$balancing_result_info,
+  load$$balancing_schemas$$header,
+  load$$balancing_schemas$$id_response,
+  load$$balancing_schemas$$response_collection,
+  load$$balancing_schemas$$single_response,
 } from "../../outputs.js";
 import {
-  load_balancing_Host,
-  load_balancing_address,
-  load_balancing_check_regions,
-  load_balancing_enabled,
-  load_balancing_filter_options,
-  load_balancing_health_sources,
-  load_balancing_latitude,
-  load_balancing_load_shedding,
-  load_balancing_longitude,
-  load_balancing_minimum_origins,
-  load_balancing_monitor_group_id,
-  load_balancing_monitor_id,
-  load_balancing_name,
-  load_balancing_notification_email,
-  load_balancing_notification_filter,
-  load_balancing_origin,
-  load_balancing_origin_flatten_cname,
-  load_balancing_origin_port,
-  load_balancing_origin_steering,
-  load_balancing_origins,
-  load_balancing_patch_pools_notification_email,
-  load_balancing_schemas_description,
-  load_balancing_schemas_enabled,
-  load_balancing_schemas_header,
-  load_balancing_schemas_identifier,
-  load_balancing_schemas_name,
-  load_balancing_virtual_network_id,
-  load_balancing_weight,
+  load$$balancing_Host as load$$balancing_Host$,
+  load$$balancing_check_regions as load$$balancing_check_regions$,
+  load$$balancing_filter_options as load$$balancing_filter_options$,
+  load$$balancing_health_sources as load$$balancing_health_sources$,
+  load$$balancing_load_shedding as load$$balancing_load_shedding$,
+  load$$balancing_notification_filter as load$$balancing_notification_filter$,
+  load$$balancing_origin as load$$balancing_origin$,
+  load$$balancing_origin_steering as load$$balancing_origin_steering$,
+  load$$balancing_origins as load$$balancing_origins$,
+  load$$balancing_schemas$$header as load$$balancing_schemas$$header$,
 } from "../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../schemas.js";
 
 /**
- * The tools of `load_balancers.pools`.
+ * The tools of `loadBalancers.pools`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_pools_bulk_edit",
+    name: "loadBalancers_pools_bulkEdit",
     title: "Patch Pools",
-    description: "Apply changes to a number of existing pools, overwriting the supplied properties. Pools are ordered by ascending `name`. Returns the list of affected pools. Supports the standard pagination query parameters, either `limit`/`offset` or `per_page`/`page`.",
+    description: "Apply changes to a number of existing pools, overwriting the supplied properties. Pools are ordered by ascending `name`. Returns the list of affected pools. Supports the standard pagination query parameters, either `limit`/`offset` or `per_page`/`page`.\n\nPATCH /accounts/{account_id}/load_balancers/pools",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "notification_email": {
-              "$ref": "#/$defs/load-balancing_patch_pools_notification_email",
-              "description": "The email address to send health status notifications to. This field is now deprecated in favor of Cloudflare Notifications for Load Balancing, so only resetting this field with an empty string `\"\"` is accepted."
+              "description": "The email address to send health status notifications to. This field is now deprecated in favor of Cloudflare Notifications for Load Balancing, so only resetting this field with an empty string `\"\"` is accepted.",
+              "type": "string"
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_patch_pools_notification_email": load_balancing_patch_pools_notification_email,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-response_collection",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-response_collection": load_balancing_schemas_response_collection_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-response_collection": load$$balancing_schemas$$response_collection,
       },
     },
     annotations: {
@@ -177,44 +124,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-response_collection": load_balancing_schemas_response_collection_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-response_collection": load$$balancing_schemas$$response_collection,
       },
     },
     request: (args) => ({
@@ -223,61 +150,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_pools_create",
+    name: "loadBalancers_pools_create",
     title: "Create Pool",
-    description: "Create a new pool.",
+    description: "Create a new pool.\n\nPOST /accounts/{account_id}/load_balancers/pools",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/load-balancing_schemas-description",
               "default": "",
-              "description": "A human-readable description of the pool."
+              "description": "A human-readable description of the pool.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/load-balancing_enabled",
               "default": true,
-              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any)."
+              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any).",
+              "type": "boolean"
             },
             "latitude": {
-              "$ref": "#/$defs/load-balancing_latitude",
-              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set."
+              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set.",
+              "type": "number"
             },
             "load_shedding": {
               "$ref": "#/$defs/load-balancing_load_shedding",
               "description": "Configures load shedding policies and percentages for the pool."
             },
             "longitude": {
-              "$ref": "#/$defs/load-balancing_longitude",
-              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set."
+              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set.",
+              "type": "number"
             },
             "minimum_origins": {
-              "$ref": "#/$defs/load-balancing_minimum_origins",
               "default": 1,
-              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool."
+              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool.",
+              "type": "integer"
             },
             "monitor": {
-              "$ref": "#/$defs/load-balancing_monitor_id",
-              "description": "The ID of the Monitor to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "monitor_group": {
-              "$ref": "#/$defs/load-balancing_monitor_group_id",
-              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/load-balancing_name",
-              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed."
+              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed.",
+              "type": "string"
             },
             "notification_email": {
-              "$ref": "#/$defs/load-balancing_notification_email",
               "default": "",
-              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list."
+              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list.",
+              "type": "string"
             },
             "notification_filter": {
               "$ref": "#/$defs/load-balancing_notification_filter",
@@ -297,79 +220,56 @@ export const tools: readonly Tool[] = [
             "origins"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_Host": load_balancing_Host,
-        "load-balancing_address": load_balancing_address,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_enabled": load_balancing_enabled,
-        "load-balancing_filter_options": load_balancing_filter_options,
-        "load-balancing_latitude": load_balancing_latitude,
-        "load-balancing_load_shedding": load_balancing_load_shedding,
-        "load-balancing_longitude": load_balancing_longitude,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
-        "load-balancing_name": load_balancing_name,
-        "load-balancing_notification_email": load_balancing_notification_email,
-        "load-balancing_notification_filter": load_balancing_notification_filter,
-        "load-balancing_origin": load_balancing_origin,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname,
-        "load-balancing_origin_port": load_balancing_origin_port,
-        "load-balancing_origin_steering": load_balancing_origin_steering,
-        "load-balancing_origins": load_balancing_origins,
-        "load-balancing_schemas-description": load_balancing_schemas_description,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled,
-        "load-balancing_schemas-header": load_balancing_schemas_header,
-        "load-balancing_schemas-name": load_balancing_schemas_name,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id,
-        "load-balancing_weight": load_balancing_weight,
+        "load-balancing_Host": load$$balancing_Host$,
+        "load-balancing_filter_options": load$$balancing_filter_options$,
+        "load-balancing_load_shedding": load$$balancing_load_shedding$,
+        "load-balancing_notification_filter": load$$balancing_notification_filter$,
+        "load-balancing_origin": load$$balancing_origin$,
+        "load-balancing_origin_steering": load$$balancing_origin_steering$,
+        "load-balancing_origins": load$$balancing_origins$,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-single_response",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     annotations: {
@@ -396,43 +296,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     request: (args) => ({
@@ -441,37 +321,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_pools_delete",
+    name: "loadBalancers_pools_delete",
     title: "Delete Pool",
-    description: "Delete a configured pool.",
+    description: "Delete a configured pool.\n\nDELETE /accounts/{account_id}/load_balancers/pools/{pool_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pool_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-id_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_schemas-id_response": load_balancing_schemas_id_response_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_schemas-id_response": load$$balancing_schemas$$id_response,
       },
     },
     annotations: {
@@ -498,12 +383,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_schemas-id_response": load_balancing_schemas_id_response_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_schemas-id_response": load$$balancing_schemas$$id_response,
       },
     },
     request: (args) => ({
@@ -511,16 +395,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_pools_edit",
+    name: "loadBalancers_pools_edit",
     title: "Patch Pool",
-    description: "Apply changes to an existing pool, overwriting the supplied properties.",
+    description: "Apply changes to an existing pool, overwriting the supplied properties.\n\nPATCH /accounts/{account_id}/load_balancers/pools/{pool_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "check_regions": {
@@ -528,52 +408,52 @@ export const tools: readonly Tool[] = [
               "description": "A list of regions from which to run health checks. Null means every Cloudflare data center."
             },
             "description": {
-              "$ref": "#/$defs/load-balancing_schemas-description",
               "default": "",
-              "description": "A human-readable description of the pool."
+              "description": "A human-readable description of the pool.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/load-balancing_enabled",
               "default": true,
-              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any)."
+              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any).",
+              "type": "boolean"
             },
             "health_sources": {
               "$ref": "#/$defs/load-balancing_health_sources",
               "description": "A list of health sources, ordered from highest to lowest priority, used to evaluate individual origin health and overall pool health. The load balancer uses the first source that has data and falls back to the next. Currently accepted values are null or the exact array [\"regional\", \"global\"]; any other combination is rejected. Null (the default) behaves like [\"local\", \"global\"]. [\"regional\", \"global\"] makes each region steer on its own health, falling back to the global decision when a region has no fresh data. Setting regional requires at least one region in check_regions."
             },
             "latitude": {
-              "$ref": "#/$defs/load-balancing_latitude",
-              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set."
+              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set.",
+              "type": "number"
             },
             "load_shedding": {
               "$ref": "#/$defs/load-balancing_load_shedding",
               "description": "Configures load shedding policies and percentages for the pool."
             },
             "longitude": {
-              "$ref": "#/$defs/load-balancing_longitude",
-              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set."
+              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set.",
+              "type": "number"
             },
             "minimum_origins": {
-              "$ref": "#/$defs/load-balancing_minimum_origins",
               "default": 1,
-              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool."
+              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool.",
+              "type": "integer"
             },
             "monitor": {
-              "$ref": "#/$defs/load-balancing_monitor_id",
-              "description": "The ID of the Monitor to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "monitor_group": {
-              "$ref": "#/$defs/load-balancing_monitor_group_id",
-              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/load-balancing_name",
-              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed."
+              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed.",
+              "type": "string"
             },
             "notification_email": {
-              "$ref": "#/$defs/load-balancing_notification_email",
               "default": "",
-              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list."
+              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list.",
+              "type": "string"
             },
             "notification_filter": {
               "$ref": "#/$defs/load-balancing_notification_filter",
@@ -590,85 +470,61 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pool_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_Host": load_balancing_Host,
-        "load-balancing_address": load_balancing_address,
-        "load-balancing_check_regions": load_balancing_check_regions,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_enabled": load_balancing_enabled,
-        "load-balancing_filter_options": load_balancing_filter_options,
-        "load-balancing_health_sources": load_balancing_health_sources,
-        "load-balancing_latitude": load_balancing_latitude,
-        "load-balancing_load_shedding": load_balancing_load_shedding,
-        "load-balancing_longitude": load_balancing_longitude,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
-        "load-balancing_name": load_balancing_name,
-        "load-balancing_notification_email": load_balancing_notification_email,
-        "load-balancing_notification_filter": load_balancing_notification_filter,
-        "load-balancing_origin": load_balancing_origin,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname,
-        "load-balancing_origin_port": load_balancing_origin_port,
-        "load-balancing_origin_steering": load_balancing_origin_steering,
-        "load-balancing_origins": load_balancing_origins,
-        "load-balancing_schemas-description": load_balancing_schemas_description,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled,
-        "load-balancing_schemas-header": load_balancing_schemas_header,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-        "load-balancing_schemas-name": load_balancing_schemas_name,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id,
-        "load-balancing_weight": load_balancing_weight,
+        "load-balancing_Host": load$$balancing_Host$,
+        "load-balancing_check_regions": load$$balancing_check_regions$,
+        "load-balancing_filter_options": load$$balancing_filter_options$,
+        "load-balancing_health_sources": load$$balancing_health_sources$,
+        "load-balancing_load_shedding": load$$balancing_load_shedding$,
+        "load-balancing_notification_filter": load$$balancing_notification_filter$,
+        "load-balancing_origin": load$$balancing_origin$,
+        "load-balancing_origin_steering": load$$balancing_origin_steering$,
+        "load-balancing_origins": load$$balancing_origins$,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-single_response",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     annotations: {
@@ -695,43 +551,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     request: (args) => ({
@@ -740,68 +576,54 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_pools_get",
+    name: "loadBalancers_pools_get",
     title: "Pool Details",
-    description: "Fetch a single configured pool.",
+    description: "Fetch a single configured pool.\n\nGET /accounts/{account_id}/load_balancers/pools/{pool_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pool_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-single_response",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     annotations: {
@@ -829,43 +651,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     request: (args) => ({
@@ -873,68 +675,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_pools_list",
+    name: "loadBalancers_pools_list",
     title: "List Pools",
-    description: "List configured pools.",
+    description: "List configured pools.\n\nGET /accounts/{account_id}/load_balancers/pools",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "monitor": {
-          "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "monitor": {
+              "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-response_collection",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-response_collection": load_balancing_schemas_response_collection_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-response_collection": load$$balancing_schemas$$response_collection,
       },
     },
     annotations: {
@@ -962,64 +757,40 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-response_collection": load_balancing_schemas_response_collection_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-response_collection": load$$balancing_schemas$$response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/load_balancers/pools`,
       query: [
-        ["monitor", args["monitor"], true],
+        ["monitor", param(args, "query", "monitor"), true],
       ],
     }),
   },
   {
-    name: "load_balancers_pools_update",
+    name: "loadBalancers_pools_update",
     title: "Update Pool",
-    description: "Modify a configured pool.",
+    description: "Modify a configured pool.\n\nPUT /accounts/{account_id}/load_balancers/pools/{pool_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "check_regions": {
@@ -1027,52 +798,52 @@ export const tools: readonly Tool[] = [
               "description": "A list of regions from which to run health checks. Null means every Cloudflare data center."
             },
             "description": {
-              "$ref": "#/$defs/load-balancing_schemas-description",
               "default": "",
-              "description": "A human-readable description of the pool."
+              "description": "A human-readable description of the pool.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/load-balancing_enabled",
               "default": true,
-              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any)."
+              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any).",
+              "type": "boolean"
             },
             "health_sources": {
               "$ref": "#/$defs/load-balancing_health_sources",
               "description": "A list of health sources, ordered from highest to lowest priority, used to evaluate individual origin health and overall pool health. The load balancer uses the first source that has data and falls back to the next. Currently accepted values are null or the exact array [\"regional\", \"global\"]; any other combination is rejected. Null (the default) behaves like [\"local\", \"global\"]. [\"regional\", \"global\"] makes each region steer on its own health, falling back to the global decision when a region has no fresh data. Setting regional requires at least one region in check_regions."
             },
             "latitude": {
-              "$ref": "#/$defs/load-balancing_latitude",
-              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set."
+              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set.",
+              "type": "number"
             },
             "load_shedding": {
               "$ref": "#/$defs/load-balancing_load_shedding",
               "description": "Configures load shedding policies and percentages for the pool."
             },
             "longitude": {
-              "$ref": "#/$defs/load-balancing_longitude",
-              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set."
+              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set.",
+              "type": "number"
             },
             "minimum_origins": {
-              "$ref": "#/$defs/load-balancing_minimum_origins",
               "default": 1,
-              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool."
+              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool.",
+              "type": "integer"
             },
             "monitor": {
-              "$ref": "#/$defs/load-balancing_monitor_id",
-              "description": "The ID of the Monitor to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "monitor_group": {
-              "$ref": "#/$defs/load-balancing_monitor_group_id",
-              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/load-balancing_name",
-              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed."
+              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed.",
+              "type": "string"
             },
             "notification_email": {
-              "$ref": "#/$defs/load-balancing_notification_email",
               "default": "",
-              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list."
+              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list.",
+              "type": "string"
             },
             "notification_filter": {
               "$ref": "#/$defs/load-balancing_notification_filter",
@@ -1093,85 +864,61 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pool_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_Host": load_balancing_Host,
-        "load-balancing_address": load_balancing_address,
-        "load-balancing_check_regions": load_balancing_check_regions,
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_enabled": load_balancing_enabled,
-        "load-balancing_filter_options": load_balancing_filter_options,
-        "load-balancing_health_sources": load_balancing_health_sources,
-        "load-balancing_latitude": load_balancing_latitude,
-        "load-balancing_load_shedding": load_balancing_load_shedding,
-        "load-balancing_longitude": load_balancing_longitude,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
-        "load-balancing_name": load_balancing_name,
-        "load-balancing_notification_email": load_balancing_notification_email,
-        "load-balancing_notification_filter": load_balancing_notification_filter,
-        "load-balancing_origin": load_balancing_origin,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname,
-        "load-balancing_origin_port": load_balancing_origin_port,
-        "load-balancing_origin_steering": load_balancing_origin_steering,
-        "load-balancing_origins": load_balancing_origins,
-        "load-balancing_schemas-description": load_balancing_schemas_description,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled,
-        "load-balancing_schemas-header": load_balancing_schemas_header,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-        "load-balancing_schemas-name": load_balancing_schemas_name,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id,
-        "load-balancing_weight": load_balancing_weight,
+        "load-balancing_Host": load$$balancing_Host$,
+        "load-balancing_check_regions": load$$balancing_check_regions$,
+        "load-balancing_filter_options": load$$balancing_filter_options$,
+        "load-balancing_health_sources": load$$balancing_health_sources$,
+        "load-balancing_load_shedding": load$$balancing_load_shedding$,
+        "load-balancing_notification_filter": load$$balancing_notification_filter$,
+        "load-balancing_origin": load$$balancing_origin$,
+        "load-balancing_origin_steering": load$$balancing_origin_steering$,
+        "load-balancing_origins": load$$balancing_origins$,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-single_response",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     annotations: {
@@ -1198,43 +945,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/previews/schemas.ts b/src/generated/forge-mcp/loadBalancers/previews/schemas.ts
deleted file mode 100644
index dc7a733ec..000000000
--- a/src/generated/forge-mcp/loadBalancers/previews/schemas.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `load-balancing_schemas-preview_id`.
- */
-export const load_balancing_schemas_preview_id: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/loadBalancers/previews/tools.ts b/src/generated/forge-mcp/loadBalancers/previews/tools.ts
index 92bbd9eac..800495265 100644
--- a/src/generated/forge-mcp/loadBalancers/previews/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/previews/tools.ts
@@ -3,54 +3,58 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_messages_output,
-  load_balancing_origin_health_data_output,
-  load_balancing_preview_result_output,
-  load_balancing_preview_result_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
+  load$$balancing_origin_health_data,
+  load$$balancing_preview_result,
+  load$$balancing_preview_result_response,
 } from "../../outputs.js";
-import { load_balancing_components_schemas_identifier } from "../schemas.js";
-import { load_balancing_schemas_preview_id } from "./schemas.js";
 
 /**
- * The tools of `load_balancers.previews`.
+ * The tools of `loadBalancers.previews`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_previews_get",
+    name: "loadBalancers_previews_get",
     title: "Preview Result",
-    description: "Get the result of a previous preview operation using the provided preview_id.",
+    description: "Get the result of a previous preview operation using the provided preview_id.\n\nGET /accounts/{account_id}/load_balancers/preview/{preview_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "preview_id": {
-          "$ref": "#/$defs/load-balancing_schemas-preview_id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "preview_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "preview_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_schemas-preview_id": load_balancing_schemas_preview_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_preview_result_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin_health_data": load_balancing_origin_health_data_output,
-        "load-balancing_preview_result": load_balancing_preview_result_output,
-        "load-balancing_preview_result_response": load_balancing_preview_result_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin_health_data": load$$balancing_origin_health_data,
+        "load-balancing_preview_result": load$$balancing_preview_result,
+        "load-balancing_preview_result_response": load$$balancing_preview_result_response,
       },
     },
     annotations: {
@@ -78,13 +82,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin_health_data": load_balancing_origin_health_data_output,
-        "load-balancing_preview_result": load_balancing_preview_result_output,
-        "load-balancing_preview_result_response": load_balancing_preview_result_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin_health_data": load$$balancing_origin_health_data,
+        "load-balancing_preview_result": load$$balancing_preview_result,
+        "load-balancing_preview_result_response": load$$balancing_preview_result_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/loadBalancers/regions/outputs.ts b/src/generated/forge-mcp/loadBalancers/regions/outputs.ts
index 069d5dbea..37ea38153 100644
--- a/src/generated/forge-mcp/loadBalancers/regions/outputs.ts
+++ b/src/generated/forge-mcp/loadBalancers/regions/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `load-balancing_components-schemas-single_response` in
  * responses.
  */
-export const load_balancing_components_schemas_single_response_output: JsonSchema = {
+export const load$$balancing_components$$schemas$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
diff --git a/src/generated/forge-mcp/loadBalancers/regions/schemas.ts b/src/generated/forge-mcp/loadBalancers/regions/schemas.ts
deleted file mode 100644
index 1a9995427..000000000
--- a/src/generated/forge-mcp/loadBalancers/regions/schemas.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `load-balancing_region_code`.
- */
-export const load_balancing_region_code: JsonSchema = {
-  "description": "A list of Cloudflare regions. WNAM: Western North America, ENAM: Eastern North America, WEU: Western Europe, EEU: Eastern Europe, NSAM: Northern South America, SSAM: Southern South America, OC: Oceania, ME: Middle East, NAF: North Africa, SAF: South Africa, SAS: Southern Asia, SEAS: South East Asia, NEAS: North East Asia).",
-  "enum": [
-    "WNAM",
-    "ENAM",
-    "WEU",
-    "EEU",
-    "NSAM",
-    "SSAM",
-    "OC",
-    "ME",
-    "NAF",
-    "SAF",
-    "SAS",
-    "SEAS",
-    "NEAS"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/loadBalancers/regions/tools.ts b/src/generated/forge-mcp/loadBalancers/regions/tools.ts
index 4bda3a307..7e58be697 100644
--- a/src/generated/forge-mcp/loadBalancers/regions/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/regions/tools.ts
@@ -1,55 +1,73 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_messages_output,
-  load_balancing_region_components_schemas_response_collection_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
+  load$$balancing_region_components$$schemas$$response_collection,
 } from "../../outputs.js";
-import { load_balancing_subdivision_code_a2 } from "../../schemas.js";
-import { load_balancing_components_schemas_identifier } from "../schemas.js";
-import { load_balancing_components_schemas_single_response_output } from "./outputs.js";
-import { load_balancing_region_code } from "./schemas.js";
+import { load$$balancing_components$$schemas$$single_response } from "./outputs.js";
 
 /**
- * The tools of `load_balancers.regions`.
+ * The tools of `loadBalancers.regions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_regions_get",
+    name: "loadBalancers_regions_get",
     title: "Get Region",
-    description: "Get a single region mapping.",
+    description: "Get a single region mapping.\n\nGET /accounts/{account_id}/load_balancers/regions/{region_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "region_id": {
-          "$ref": "#/$defs/load-balancing_region_code",
-          "description": "A list of Cloudflare regions. WNAM: Western North America, ENAM: Eastern North America, WEU: Western Europe, EEU: Eastern Europe, NSAM: Northern South America, SSAM: Southern South America, OC: Oceania, ME: Middle East, NAF: North Africa, SAF: South Africa, SAS: Southern Asia, SEAS: South East Asia, NEAS: North East Asia)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "region_id": {
+              "description": "A list of Cloudflare regions. WNAM: Western North America, ENAM: Eastern North America, WEU: Western Europe, EEU: Eastern Europe, NSAM: Northern South America, SSAM: Southern South America, OC: Oceania, ME: Middle East, NAF: North Africa, SAF: South Africa, SAS: Southern Asia, SEAS: South East Asia, NEAS: North East Asia).",
+              "enum": [
+                "WNAM",
+                "ENAM",
+                "WEU",
+                "EEU",
+                "NSAM",
+                "SSAM",
+                "OC",
+                "ME",
+                "NAF",
+                "SAF",
+                "SAS",
+                "SEAS",
+                "NEAS"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "region_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "region_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_region_code": load_balancing_region_code,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_components-schemas-single_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-single_response": load_balancing_components_schemas_single_response_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_components-schemas-single_response": load$$balancing_components$$schemas$$single_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     annotations: {
@@ -77,11 +95,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_components-schemas-single_response": load_balancing_components_schemas_single_response_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_components-schemas-single_response": load$$balancing_components$$schemas$$single_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     request: (args) => ({
@@ -89,44 +107,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "load_balancers_regions_list",
+    name: "loadBalancers_regions_list",
     title: "List Regions",
-    description: "List all region mappings.",
+    description: "List all region mappings.\n\nGET /accounts/{account_id}/load_balancers/regions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "country_code_a2": {
-          "description": "Two-letter alpha-2 country code followed in ISO 3166-1.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "subdivision_code": {
-          "$ref": "#/$defs/load-balancing_subdivision_code_a2",
-          "description": "Two-letter subdivision code followed in ISO 3166-2."
-        },
-        "subdivision_code_a2": {
-          "$ref": "#/$defs/load-balancing_subdivision_code_a2",
-          "description": "Two-letter subdivision code followed in ISO 3166-2."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "country_code_a2": {
+              "description": "Two-letter alpha-2 country code followed in ISO 3166-1.",
+              "type": "string"
+            },
+            "subdivision_code": {
+              "description": "Two-letter subdivision code followed in ISO 3166-2.",
+              "type": "string"
+            },
+            "subdivision_code_a2": {
+              "description": "Two-letter subdivision code followed in ISO 3166-2.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-        "load-balancing_subdivision_code_a2": load_balancing_subdivision_code_a2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_region_components-schemas-response_collection",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_region_components-schemas-response_collection": load_balancing_region_components_schemas_response_collection_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_region_components-schemas-response_collection": load$$balancing_region_components$$schemas$$response_collection,
       },
     },
     annotations: {
@@ -154,19 +184,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_region_components-schemas-response_collection": load_balancing_region_components_schemas_response_collection_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_region_components-schemas-response_collection": load$$balancing_region_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/load_balancers/regions`,
       query: [
-        ["subdivision_code", args["subdivision_code"], true],
-        ["subdivision_code_a2", args["subdivision_code_a2"], true],
-        ["country_code_a2", args["country_code_a2"], true],
+        ["subdivision_code", param(args, "query", "subdivision_code"), true],
+        ["subdivision_code_a2", param(args, "query", "subdivision_code_a2"), true],
+        ["country_code_a2", param(args, "query", "country_code_a2"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/loadBalancers/schemas.ts b/src/generated/forge-mcp/loadBalancers/schemas.ts
deleted file mode 100644
index 8013e833b..000000000
--- a/src/generated/forge-mcp/loadBalancers/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `load-balancing_components-schemas-identifier`.
- */
-export const load_balancing_components_schemas_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/loadBalancers/searches/outputs.ts b/src/generated/forge-mcp/loadBalancers/searches/outputs.ts
index 89b749ed6..d84628280 100644
--- a/src/generated/forge-mcp/loadBalancers/searches/outputs.ts
+++ b/src/generated/forge-mcp/loadBalancers/searches/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `load-balancing_resource_reference` in responses.
  */
-export const load_balancing_resource_reference_output: JsonSchema = {
+export const load$$balancing_resource_reference: JsonSchema = {
   "properties": {
     "reference_type": {
       "enum": [
@@ -42,7 +42,7 @@ export const load_balancing_resource_reference_output: JsonSchema = {
 /**
  * The schema of `load-balancing_search` in responses.
  */
-export const load_balancing_search_output: JsonSchema = {
+export const load$$balancing_search: JsonSchema = {
   "properties": {
     "resources": {
       "items": {
@@ -57,7 +57,7 @@ export const load_balancing_search_output: JsonSchema = {
 /**
  * The schema of `load-balancing_search_result` in responses.
  */
-export const load_balancing_search_result_output: JsonSchema = {
+export const load$$balancing_search_result: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/load-balancing_search"
diff --git a/src/generated/forge-mcp/loadBalancers/searches/tools.ts b/src/generated/forge-mcp/loadBalancers/searches/tools.ts
index a0f0242bc..2910530d5 100644
--- a/src/generated/forge-mcp/loadBalancers/searches/tools.ts
+++ b/src/generated/forge-mcp/loadBalancers/searches/tools.ts
@@ -1,66 +1,78 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  load_balancing_api_paginated_response_collection_output,
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_messages_output,
-  load_balancing_result_info_output,
+  load$$balancing_api$$paginated$$response$$collection,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_messages,
+  load$$balancing_result_info,
 } from "../../outputs.js";
-import { load_balancing_components_schemas_identifier } from "../schemas.js";
 import {
-  load_balancing_resource_reference_output,
-  load_balancing_search_output,
-  load_balancing_search_result_output,
+  load$$balancing_resource_reference,
+  load$$balancing_search,
+  load$$balancing_search_result,
 } from "./outputs.js";
 
 /**
- * The tools of `load_balancers.searches`.
+ * The tools of `loadBalancers.searches`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "load_balancers_searches_list",
+    name: "loadBalancers_searches_list",
     title: "Search Resources",
-    description: "Search for Load Balancing resources.",
+    description: "Search for Load Balancing resources.\n\nGET /accounts/{account_id}/load_balancers/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/load-balancing_components-schemas-identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "type": "number"
-        },
-        "per_page": {
-          "default": 25,
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
         "query": {
-          "default": "",
-          "description": "Search query term.",
-          "type": "string"
-        },
-        "references": {
-          "default": "",
-          "description": "The type of references to include. \"*\" to include both referral and referrer references. \"\" to not include any reference information.",
-          "enum": [
-            "",
-            "*",
-            "referral",
-            "referrer"
-          ],
-          "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "type": "number"
+            },
+            "query": {
+              "default": "",
+              "description": "Search query term.",
+              "type": "string"
+            },
+            "references": {
+              "default": "",
+              "description": "The type of references to include. \"*\" to include both referral and referrer references. \"\" to not include any reference information.",
+              "enum": [
+                "",
+                "*",
+                "referral",
+                "referrer"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_components-schemas-identifier": load_balancing_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -72,13 +84,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_resource_reference": load_balancing_resource_reference_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_search": load_balancing_search_output,
-        "load-balancing_search_result": load_balancing_search_result_output,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_resource_reference": load$$balancing_resource_reference,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_search": load$$balancing_search,
+        "load-balancing_search_result": load$$balancing_search_result,
       },
     },
     annotations: {
@@ -113,23 +125,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_resource_reference": load_balancing_resource_reference_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_search": load_balancing_search_output,
-        "load-balancing_search_result": load_balancing_search_result_output,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_resource_reference": load$$balancing_resource_reference,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_search": load$$balancing_search,
+        "load-balancing_search_result": load$$balancing_search_result,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/load_balancers/search`,
       query: [
-        ["query", args["query"], true],
-        ["references", args["references"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["query", param(args, "query", "query"), true],
+        ["references", param(args, "query", "references"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/logpush/accountDatasets/fields/outputs.ts b/src/generated/forge-mcp/logpush/accountDatasets/fields/outputs.ts
index 85d61c9a8..3f489a208 100644
--- a/src/generated/forge-mcp/logpush/accountDatasets/fields/outputs.ts
+++ b/src/generated/forge-mcp/logpush/accountDatasets/fields/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `logpush_logpush_field_response_collection` in responses.
  */
-export const logpush_logpush_field_response_collection_output: JsonSchema = {
+export const logpush_logpush_field_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
diff --git a/src/generated/forge-mcp/logpush/accountDatasets/fields/tools.ts b/src/generated/forge-mcp/logpush/accountDatasets/fields/tools.ts
index 7e83501cf..07966e2a0 100644
--- a/src/generated/forge-mcp/logpush/accountDatasets/fields/tools.ts
+++ b/src/generated/forge-mcp/logpush/accountDatasets/fields/tools.ts
@@ -3,58 +3,110 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_messages,
 } from "../../outputs.js";
-import { logpush_dataset, logpush_identifier } from "../../schemas.js";
-import { logpush_logpush_field_response_collection_output } from "./outputs.js";
+import { logpush_logpush_field_response_collection } from "./outputs.js";
 
 /**
- * The tools of `logpush.account_datasets.fields`.
+ * The tools of `logpush.accountDatasets.fields`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "logpush_account_datasets_fields_get",
+    name: "logpush_accountDatasets_fields_get",
     title: "List fields",
-    description: "Lists all fields available for a dataset. The response result is. an object with key-value pairs, where keys are field names, and values are descriptions.",
+    description: "Lists all fields available for a dataset. The response result is. an object with key-value pairs, where keys are field names, and values are descriptions.\n\nGET /{account_or_zone}/{account_or_zone_id}/logpush/datasets/{dataset_id}/fields",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "default": "http_requests",
+              "description": "Name of the dataset. A list of supported datasets can be found on the [Developer Docs](https://developers.cloudflare.com/logs/reference/log-fields/).",
+              "oneOf": [
+                {
+                  "enum": [
+                    "access_requests",
+                    "account_abuse_protection_events",
+                    "ai_gateway_events",
+                    "audit_logs",
+                    "audit_logs_v2",
+                    "biso_user_actions",
+                    "casb_findings",
+                    "device_posture_results",
+                    "dex_application_tests",
+                    "dex_device_state_events",
+                    "dlp_forensic_copies",
+                    "dns_firewall_logs",
+                    "dns_logs",
+                    "email_security_alerts",
+                    "email_security_post_delivery_events",
+                    "firewall_events",
+                    "gateway_dns",
+                    "gateway_http",
+                    "gateway_network",
+                    "http_requests",
+                    "ipsec_logs",
+                    "magic_bgp_logs",
+                    "magic_ids_detections",
+                    "mcp_portal_logs",
+                    "mnm_flow_logs",
+                    "nel_reports",
+                    "network_analytics_logs",
+                    "page_shield_events",
+                    "sinkhole_http_logs",
+                    "spectrum_events",
+                    "ssh_logs",
+                    "turnstile_events",
+                    "warp_config_changes",
+                    "warp_toggle_changes",
+                    "websocket_analytics",
+                    "workers_trace_events",
+                    "zaraz_events",
+                    "zero_trust_network_sessions"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "dataset_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "dataset_id": {
-          "$ref": "#/$defs/logpush_dataset",
-          "default": "http_requests",
-          "description": "Name of the dataset. A list of supported datasets can be found on the [Developer Docs](https://developers.cloudflare.com/logs/reference/log-fields/)."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "dataset_id"
+        "path"
       ],
-      $defs: {
-        "logpush_dataset": logpush_dataset,
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_logpush_field_response_collection",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_logpush_field_response_collection": logpush_logpush_field_response_collection_output,
-        "logpush_messages": logpush_messages_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_logpush_field_response_collection": logpush_logpush_field_response_collection,
+        "logpush_messages": logpush_messages,
       },
     },
     annotations: {
@@ -92,10 +144,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_logpush_field_response_collection": logpush_logpush_field_response_collection_output,
-        "logpush_messages": logpush_messages_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_logpush_field_response_collection": logpush_logpush_field_response_collection,
+        "logpush_messages": logpush_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/accountDatasets/jobs/tools.ts b/src/generated/forge-mcp/logpush/accountDatasets/jobs/tools.ts
index 441ddf5e6..5b27b3eab 100644
--- a/src/generated/forge-mcp/logpush/accountDatasets/jobs/tools.ts
+++ b/src/generated/forge-mcp/logpush/accountDatasets/jobs/tools.ts
@@ -3,92 +3,114 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_dataset_output,
-  logpush_destination_conf_output,
-  logpush_enabled_output,
-  logpush_error_message_output,
-  logpush_filter_attack_traffic_output,
-  logpush_frequency_output,
-  logpush_id_output,
-  logpush_kind_output,
-  logpush_last_complete_output,
-  logpush_last_error_output,
-  logpush_logpull_options_output,
-  logpush_logpush_job_output,
-  logpush_logpush_job_response_collection_output,
-  logpush_max_upload_bytes_output,
-  logpush_max_upload_interval_seconds_output,
-  logpush_max_upload_records_output,
-  logpush_messages_output,
-  logpush_name_output,
-  logpush_output_options_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_logpush_job,
+  logpush_logpush_job_response_collection,
+  logpush_messages,
+  logpush_output_options,
 } from "../../outputs.js";
-import { logpush_dataset, logpush_identifier } from "../../schemas.js";
 
 /**
- * The tools of `logpush.account_datasets.jobs`.
+ * The tools of `logpush.accountDatasets.jobs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "logpush_account_datasets_jobs_get",
+    name: "logpush_accountDatasets_jobs_get",
     title: "List Logpush jobs for a dataset",
-    description: "Lists Logpush jobs for an account or zone for a dataset.",
+    description: "Lists Logpush jobs for an account or zone for a dataset.\n\nGET /{account_or_zone}/{account_or_zone_id}/logpush/datasets/{dataset_id}/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "default": "http_requests",
+              "description": "Name of the dataset. A list of supported datasets can be found on the [Developer Docs](https://developers.cloudflare.com/logs/reference/log-fields/).",
+              "oneOf": [
+                {
+                  "enum": [
+                    "access_requests",
+                    "account_abuse_protection_events",
+                    "ai_gateway_events",
+                    "audit_logs",
+                    "audit_logs_v2",
+                    "biso_user_actions",
+                    "casb_findings",
+                    "device_posture_results",
+                    "dex_application_tests",
+                    "dex_device_state_events",
+                    "dlp_forensic_copies",
+                    "dns_firewall_logs",
+                    "dns_logs",
+                    "email_security_alerts",
+                    "email_security_post_delivery_events",
+                    "firewall_events",
+                    "gateway_dns",
+                    "gateway_http",
+                    "gateway_network",
+                    "http_requests",
+                    "ipsec_logs",
+                    "magic_bgp_logs",
+                    "magic_ids_detections",
+                    "mcp_portal_logs",
+                    "mnm_flow_logs",
+                    "nel_reports",
+                    "network_analytics_logs",
+                    "page_shield_events",
+                    "sinkhole_http_logs",
+                    "spectrum_events",
+                    "ssh_logs",
+                    "turnstile_events",
+                    "warp_config_changes",
+                    "warp_toggle_changes",
+                    "websocket_analytics",
+                    "workers_trace_events",
+                    "zaraz_events",
+                    "zero_trust_network_sessions"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "dataset_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "dataset_id": {
-          "$ref": "#/$defs/logpush_dataset",
-          "default": "http_requests",
-          "description": "Name of the dataset. A list of supported datasets can be found on the [Developer Docs](https://developers.cloudflare.com/logs/reference/log-fields/)."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "dataset_id"
+        "path"
       ],
-      $defs: {
-        "logpush_dataset": logpush_dataset,
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_logpush_job_response_collection",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_collection": logpush_logpush_job_response_collection_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_collection": logpush_logpush_job_response_collection,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     annotations: {
@@ -126,27 +148,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_collection": logpush_logpush_job_response_collection_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_collection": logpush_logpush_job_response_collection,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/accountJobs/outputs.ts b/src/generated/forge-mcp/logpush/accountJobs/outputs.ts
index 1d9b852bb..30c256750 100644
--- a/src/generated/forge-mcp/logpush/accountJobs/outputs.ts
+++ b/src/generated/forge-mcp/logpush/accountJobs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `logpush_logpush_job_response_single` in responses.
  */
-export const logpush_logpush_job_response_single_output: JsonSchema = {
+export const logpush_logpush_job_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-single"
diff --git a/src/generated/forge-mcp/logpush/accountJobs/schemas.ts b/src/generated/forge-mcp/logpush/accountJobs/schemas.ts
deleted file mode 100644
index ec0842efd..000000000
--- a/src/generated/forge-mcp/logpush/accountJobs/schemas.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `logpush_filter`.
- */
-export const logpush_filter: JsonSchema = {
-  "description": "The filters to select the events to include and/or remove from your logs. For more information, refer to [Filters](https://developers.cloudflare.com/logs/reference/filters/).",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/logpush/accountJobs/tools.ts b/src/generated/forge-mcp/logpush/accountJobs/tools.ts
index a6d5faa87..343fa90a8 100644
--- a/src/generated/forge-mcp/logpush/accountJobs/tools.ts
+++ b/src/generated/forge-mcp/logpush/accountJobs/tools.ts
@@ -3,188 +3,261 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_api_response_single_output,
-  logpush_dataset_output,
-  logpush_destination_conf_output,
-  logpush_enabled_output,
-  logpush_error_message_output,
-  logpush_filter_attack_traffic_output,
-  logpush_frequency_output,
-  logpush_id_output,
-  logpush_kind_output,
-  logpush_last_complete_output,
-  logpush_last_error_output,
-  logpush_logpull_options_output,
-  logpush_logpush_job_output,
-  logpush_logpush_job_response_collection_output,
-  logpush_max_upload_bytes_output,
-  logpush_max_upload_interval_seconds_output,
-  logpush_max_upload_records_output,
-  logpush_messages_output,
-  logpush_name_output,
-  logpush_output_options_output,
-} from "../outputs.js";
-import {
-  logpush_dataset,
-  logpush_destination_conf,
-  logpush_enabled,
-  logpush_filter_attack_traffic,
-  logpush_frequency,
-  logpush_id,
-  logpush_identifier,
-  logpush_kind,
-  logpush_logpull_options,
-  logpush_max_upload_bytes,
-  logpush_max_upload_interval_seconds,
-  logpush_max_upload_records,
-  logpush_name,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_api$$response$$single,
+  logpush_logpush_job,
+  logpush_logpush_job_response_collection,
+  logpush_messages,
   logpush_output_options,
-  logpush_ownership_challenge,
-} from "../schemas.js";
-import { logpush_logpush_job_response_single_output } from "./outputs.js";
-import { logpush_filter } from "./schemas.js";
+} from "../outputs.js";
+import { logpush_output_options as logpush_output_options$ } from "../schemas.js";
+import { logpush_logpush_job_response_single } from "./outputs.js";
 
 /**
- * The tools of `logpush.account_jobs`.
+ * The tools of `logpush.accountJobs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "logpush_account_jobs_create",
+    name: "logpush_accountJobs_create",
     title: "Create Logpush job",
-    description: "Creates a new Logpush job for an account or zone.",
+    description: "Creates a new Logpush job for an account or zone.\n\nPOST /{account_or_zone}/{account_or_zone_id}/logpush/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "dataset": {
-              "$ref": "#/$defs/logpush_dataset",
               "default": "http_requests",
-              "description": "Name of the dataset. A list of supported datasets can be found on the [Developer Docs](https://developers.cloudflare.com/logs/reference/log-fields/)."
+              "description": "Name of the dataset. A list of supported datasets can be found on the [Developer Docs](https://developers.cloudflare.com/logs/reference/log-fields/).",
+              "oneOf": [
+                {
+                  "enum": [
+                    "access_requests",
+                    "account_abuse_protection_events",
+                    "ai_gateway_events",
+                    "audit_logs",
+                    "audit_logs_v2",
+                    "biso_user_actions",
+                    "casb_findings",
+                    "device_posture_results",
+                    "dex_application_tests",
+                    "dex_device_state_events",
+                    "dlp_forensic_copies",
+                    "dns_firewall_logs",
+                    "dns_logs",
+                    "email_security_alerts",
+                    "email_security_post_delivery_events",
+                    "firewall_events",
+                    "gateway_dns",
+                    "gateway_http",
+                    "gateway_network",
+                    "http_requests",
+                    "ipsec_logs",
+                    "magic_bgp_logs",
+                    "magic_ids_detections",
+                    "mcp_portal_logs",
+                    "mnm_flow_logs",
+                    "nel_reports",
+                    "network_analytics_logs",
+                    "page_shield_events",
+                    "sinkhole_http_logs",
+                    "spectrum_events",
+                    "ssh_logs",
+                    "turnstile_events",
+                    "warp_config_changes",
+                    "warp_toggle_changes",
+                    "websocket_analytics",
+                    "workers_trace_events",
+                    "zaraz_events",
+                    "zero_trust_network_sessions"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "destination_conf": {
-              "$ref": "#/$defs/logpush_destination_conf",
-              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included."
+              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/logpush_enabled",
               "default": false,
-              "description": "Flag that indicates if the job is enabled."
+              "description": "Flag that indicates if the job is enabled.",
+              "type": "boolean"
             },
             "filter": {
-              "$ref": "#/$defs/logpush_filter",
-              "description": "The filters to select the events to include and/or remove from your logs. For more information, refer to [Filters](https://developers.cloudflare.com/logs/reference/filters/)."
+              "description": "The filters to select the events to include and/or remove from your logs. For more information, refer to [Filters](https://developers.cloudflare.com/logs/reference/filters/).",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "filter_attack_traffic": {
-              "$ref": "#/$defs/logpush_filter_attack_traffic",
               "default": false,
-              "description": "When true, excludes DDoS attack traffic from logs. This option is supported for the `http_requests`, `firewall_events`, and `network_analytics_logs` datasets."
+              "description": "When true, excludes DDoS attack traffic from logs. This option is supported for the `http_requests`, `firewall_events`, and `network_analytics_logs` datasets.",
+              "type": "boolean"
             },
             "frequency": {
-              "$ref": "#/$defs/logpush_frequency",
               "default": "high",
-              "description": "This field is deprecated. Please use `max_upload_*` parameters instead. . The frequency at which Cloudflare sends batches of logs to your destination. Setting frequency to high sends your logs in larger quantities of smaller files. Setting frequency to low sends logs in smaller quantities of larger files."
+              "deprecated": true,
+              "description": "This field is deprecated. Please use `max_upload_*` parameters instead. . The frequency at which Cloudflare sends batches of logs to your destination. Setting frequency to high sends your logs in larger quantities of smaller files. Setting frequency to low sends logs in smaller quantities of larger files.",
+              "oneOf": [
+                {
+                  "enum": [
+                    "high",
+                    "low"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "kind": {
-              "$ref": "#/$defs/logpush_kind",
               "default": "",
-              "description": "The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs (when supported by the dataset)."
+              "description": "The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs (when supported by the dataset).",
+              "enum": [
+                "",
+                "edge"
+              ],
+              "type": "string"
             },
             "logpull_options": {
-              "$ref": "#/$defs/logpush_logpull_options",
-              "description": "This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately."
+              "deprecated": true,
+              "description": "This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "max_upload_bytes": {
-              "$ref": "#/$defs/logpush_max_upload_bytes",
-              "description": "The maximum uncompressed file size of a batch of logs. This setting value must be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a minimum file size; this means that log files may be much smaller than this batch size."
+              "description": "The maximum uncompressed file size of a batch of logs. This setting value must be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a minimum file size; this means that log files may be much smaller than this batch size.",
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "enum": [
+                    0
+                  ],
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "max_upload_interval_seconds": {
-              "$ref": "#/$defs/logpush_max_upload_interval_seconds",
-              "description": "The maximum interval in seconds for log batches. This setting must be between 30 and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify a minimum interval for log batches; this means that log files may be sent in shorter intervals than this."
+              "description": "The maximum interval in seconds for log batches. This setting must be between 30 and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify a minimum interval for log batches; this means that log files may be sent in shorter intervals than this.",
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "enum": [
+                    0
+                  ],
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "max_upload_records": {
-              "$ref": "#/$defs/logpush_max_upload_records",
-              "description": "The maximum number of log lines per batch. This setting must be between 1000 and 1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum number of log lines per batch; this means that log files may contain many fewer lines than this."
+              "description": "The maximum number of log lines per batch. This setting must be between 1000 and 1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum number of log lines per batch; this means that log files may contain many fewer lines than this.",
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "enum": [
+                    0
+                  ],
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "name": {
-              "$ref": "#/$defs/logpush_name",
-              "description": "Optional human readable job name. Not unique. Cloudflare suggests. that you set this to a meaningful string, like the domain name, to make it easier to identify your job."
+              "description": "Optional human readable job name. Not unique. Cloudflare suggests. that you set this to a meaningful string, like the domain name, to make it easier to identify your job.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "output_options": {
               "$ref": "#/$defs/logpush_output_options",
               "description": "The structured replacement for `logpull_options`. When including this field, the `logpull_option` field will be ignored."
             },
             "ownership_challenge": {
-              "$ref": "#/$defs/logpush_ownership_challenge",
-              "description": "Ownership challenge token to prove destination ownership."
+              "description": "Ownership challenge token to prove destination ownership.",
+              "type": "string"
             }
           },
           "required": [
             "destination_conf"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "logpush_dataset": logpush_dataset,
-        "logpush_destination_conf": logpush_destination_conf,
-        "logpush_enabled": logpush_enabled,
-        "logpush_filter": logpush_filter,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic,
-        "logpush_frequency": logpush_frequency,
-        "logpush_identifier": logpush_identifier,
-        "logpush_kind": logpush_kind,
-        "logpush_logpull_options": logpush_logpull_options,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds,
-        "logpush_max_upload_records": logpush_max_upload_records,
-        "logpush_name": logpush_name,
-        "logpush_output_options": logpush_output_options,
-        "logpush_ownership_challenge": logpush_ownership_challenge,
+        "logpush_output_options": logpush_output_options$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_logpush_job_response_single",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_single": logpush_logpush_job_response_single_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_single": logpush_logpush_job_response_single,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     annotations: {
@@ -222,27 +295,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_single": logpush_logpush_job_response_single_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_single": logpush_logpush_job_response_single,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     request: (args) => ({
@@ -251,38 +309,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "logpush_account_jobs_delete",
+    name: "logpush_accountJobs_delete",
     title: "Delete Logpush job",
-    description: "Deletes a Logpush job.\n\nConfirm with the user before calling this tool. This operation deletes the Logpush job.",
+    description: "Deletes a Logpush job.\n\nConfirm with the user before calling this tool. This operation deletes the Logpush job.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Unique id of the job.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "job_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "job_id": {
-          "$ref": "#/$defs/logpush_id",
-          "description": "Unique id of the job."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "job_id"
+        "path"
       ],
-      $defs: {
-        "logpush_id": logpush_id,
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -294,7 +358,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/logpush_id"
+                  "type": "integer"
                 }
               },
               "type": "object"
@@ -304,9 +368,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_id": logpush_id_output,
-        "logpush_messages": logpush_messages_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_messages": logpush_messages,
       },
     },
     annotations: {
@@ -346,7 +409,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/logpush_id"
+                      "type": "integer"
                     }
                   },
                   "type": "object"
@@ -361,10 +424,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_id": logpush_id_output,
-        "logpush_messages": logpush_messages_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_messages": logpush_messages,
       },
     },
     request: (args) => ({
@@ -372,62 +434,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "logpush_account_jobs_get",
+    name: "logpush_accountJobs_get",
     title: "Get Logpush job details",
-    description: "Gets the details of a Logpush job.",
+    description: "Gets the details of a Logpush job.\n\nGET /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Unique id of the job.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "job_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "job_id": {
-          "$ref": "#/$defs/logpush_id",
-          "description": "Unique id of the job."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "job_id"
+        "path"
       ],
-      $defs: {
-        "logpush_id": logpush_id,
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_logpush_job_response_single",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_single": logpush_logpush_job_response_single_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_single": logpush_logpush_job_response_single,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     annotations: {
@@ -465,27 +518,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_single": logpush_logpush_job_response_single_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_single": logpush_logpush_job_response_single,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     request: (args) => ({
@@ -493,56 +531,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "logpush_account_jobs_list",
+    name: "logpush_accountJobs_list",
     title: "List Logpush jobs",
-    description: "Lists Logpush jobs for an account or zone.",
+    description: "Lists Logpush jobs for an account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/logpush/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_logpush_job_response_collection",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_collection": logpush_logpush_job_response_collection_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_collection": logpush_logpush_job_response_collection,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     annotations: {
@@ -580,27 +610,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_collection": logpush_logpush_job_response_collection_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_collection": logpush_logpush_job_response_collection,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     request: (args) => ({
@@ -608,137 +623,195 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "logpush_account_jobs_update",
+    name: "logpush_accountJobs_update",
     title: "Update Logpush job",
-    description: "Updates a Logpush job.",
+    description: "Updates a Logpush job.\n\nPUT /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "destination_conf": {
-              "$ref": "#/$defs/logpush_destination_conf",
-              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included."
+              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/logpush_enabled",
               "default": false,
-              "description": "Flag that indicates if the job is enabled."
+              "description": "Flag that indicates if the job is enabled.",
+              "type": "boolean"
             },
             "filter": {
-              "$ref": "#/$defs/logpush_filter",
-              "description": "The filters to select the events to include and/or remove from your logs. For more information, refer to [Filters](https://developers.cloudflare.com/logs/reference/filters/)."
+              "description": "The filters to select the events to include and/or remove from your logs. For more information, refer to [Filters](https://developers.cloudflare.com/logs/reference/filters/).",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "filter_attack_traffic": {
-              "$ref": "#/$defs/logpush_filter_attack_traffic",
               "default": false,
-              "description": "When true, excludes DDoS attack traffic from logs. This option is supported for the `http_requests`, `firewall_events`, and `network_analytics_logs` datasets."
+              "description": "When true, excludes DDoS attack traffic from logs. This option is supported for the `http_requests`, `firewall_events`, and `network_analytics_logs` datasets.",
+              "type": "boolean"
             },
             "frequency": {
-              "$ref": "#/$defs/logpush_frequency",
               "default": "high",
-              "description": "This field is deprecated. Please use `max_upload_*` parameters instead. . The frequency at which Cloudflare sends batches of logs to your destination. Setting frequency to high sends your logs in larger quantities of smaller files. Setting frequency to low sends logs in smaller quantities of larger files."
+              "deprecated": true,
+              "description": "This field is deprecated. Please use `max_upload_*` parameters instead. . The frequency at which Cloudflare sends batches of logs to your destination. Setting frequency to high sends your logs in larger quantities of smaller files. Setting frequency to low sends logs in smaller quantities of larger files.",
+              "oneOf": [
+                {
+                  "enum": [
+                    "high",
+                    "low"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "kind": {
-              "$ref": "#/$defs/logpush_kind",
               "default": "",
-              "description": "The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs (when supported by the dataset)."
+              "description": "The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs (when supported by the dataset).",
+              "enum": [
+                "",
+                "edge"
+              ],
+              "type": "string"
             },
             "logpull_options": {
-              "$ref": "#/$defs/logpush_logpull_options",
-              "description": "This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately."
+              "deprecated": true,
+              "description": "This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "max_upload_bytes": {
-              "$ref": "#/$defs/logpush_max_upload_bytes",
-              "description": "The maximum uncompressed file size of a batch of logs. This setting value must be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a minimum file size; this means that log files may be much smaller than this batch size."
+              "description": "The maximum uncompressed file size of a batch of logs. This setting value must be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a minimum file size; this means that log files may be much smaller than this batch size.",
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "enum": [
+                    0
+                  ],
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "max_upload_interval_seconds": {
-              "$ref": "#/$defs/logpush_max_upload_interval_seconds",
-              "description": "The maximum interval in seconds for log batches. This setting must be between 30 and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify a minimum interval for log batches; this means that log files may be sent in shorter intervals than this."
+              "description": "The maximum interval in seconds for log batches. This setting must be between 30 and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify a minimum interval for log batches; this means that log files may be sent in shorter intervals than this.",
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "enum": [
+                    0
+                  ],
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "max_upload_records": {
-              "$ref": "#/$defs/logpush_max_upload_records",
-              "description": "The maximum number of log lines per batch. This setting must be between 1000 and 1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum number of log lines per batch; this means that log files may contain many fewer lines than this."
+              "description": "The maximum number of log lines per batch. This setting must be between 1000 and 1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum number of log lines per batch; this means that log files may contain many fewer lines than this.",
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "enum": [
+                    0
+                  ],
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "name": {
-              "$ref": "#/$defs/logpush_name",
-              "description": "Optional human readable job name. Not unique. Cloudflare suggests. that you set this to a meaningful string, like the domain name, to make it easier to identify your job."
+              "description": "Optional human readable job name. Not unique. Cloudflare suggests. that you set this to a meaningful string, like the domain name, to make it easier to identify your job.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "output_options": {
               "$ref": "#/$defs/logpush_output_options",
               "description": "The structured replacement for `logpull_options`. When including this field, the `logpull_option` field will be ignored."
             },
             "ownership_challenge": {
-              "$ref": "#/$defs/logpush_ownership_challenge",
-              "description": "Ownership challenge token to prove destination ownership."
+              "description": "Ownership challenge token to prove destination ownership.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "job_id": {
-          "$ref": "#/$defs/logpush_id",
-          "description": "Unique id of the job."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Unique id of the job.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "job_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "logpush_destination_conf": logpush_destination_conf,
-        "logpush_enabled": logpush_enabled,
-        "logpush_filter": logpush_filter,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic,
-        "logpush_frequency": logpush_frequency,
-        "logpush_id": logpush_id,
-        "logpush_identifier": logpush_identifier,
-        "logpush_kind": logpush_kind,
-        "logpush_logpull_options": logpush_logpull_options,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds,
-        "logpush_max_upload_records": logpush_max_upload_records,
-        "logpush_name": logpush_name,
-        "logpush_output_options": logpush_output_options,
-        "logpush_ownership_challenge": logpush_ownership_challenge,
+        "logpush_output_options": logpush_output_options$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_logpush_job_response_single",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_single": logpush_logpush_job_response_single_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_single": logpush_logpush_job_response_single,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     annotations: {
@@ -776,27 +849,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_dataset": logpush_dataset_output,
-        "logpush_destination_conf": logpush_destination_conf_output,
-        "logpush_enabled": logpush_enabled_output,
-        "logpush_error_message": logpush_error_message_output,
-        "logpush_filter_attack_traffic": logpush_filter_attack_traffic_output,
-        "logpush_frequency": logpush_frequency_output,
-        "logpush_id": logpush_id_output,
-        "logpush_kind": logpush_kind_output,
-        "logpush_last_complete": logpush_last_complete_output,
-        "logpush_last_error": logpush_last_error_output,
-        "logpush_logpull_options": logpush_logpull_options_output,
-        "logpush_logpush_job": logpush_logpush_job_output,
-        "logpush_logpush_job_response_single": logpush_logpush_job_response_single_output,
-        "logpush_max_upload_bytes": logpush_max_upload_bytes_output,
-        "logpush_max_upload_interval_seconds": logpush_max_upload_interval_seconds_output,
-        "logpush_max_upload_records": logpush_max_upload_records_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_name": logpush_name_output,
-        "logpush_output_options": logpush_output_options_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_logpush_job": logpush_logpush_job,
+        "logpush_logpush_job_response_single": logpush_logpush_job_response_single,
+        "logpush_messages": logpush_messages,
+        "logpush_output_options": logpush_output_options,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/accountOwnership/outputs.ts b/src/generated/forge-mcp/logpush/accountOwnership/outputs.ts
index 1208b6d66..c8960360c 100644
--- a/src/generated/forge-mcp/logpush/accountOwnership/outputs.ts
+++ b/src/generated/forge-mcp/logpush/accountOwnership/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `logpush_get_ownership_response` in responses.
  */
-export const logpush_get_ownership_response_output: JsonSchema = {
+export const logpush_get_ownership_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
diff --git a/src/generated/forge-mcp/logpush/accountOwnership/tools.ts b/src/generated/forge-mcp/logpush/accountOwnership/tools.ts
index 1efb53647..31d285496 100644
--- a/src/generated/forge-mcp/logpush/accountOwnership/tools.ts
+++ b/src/generated/forge-mcp/logpush/accountOwnership/tools.ts
@@ -3,65 +3,70 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_messages,
 } from "../outputs.js";
-import { logpush_destination_conf, logpush_identifier } from "../schemas.js";
-import { logpush_get_ownership_response_output } from "./outputs.js";
+import { logpush_get_ownership_response } from "./outputs.js";
 
 /**
- * The tools of `logpush.account_ownership`.
+ * The tools of `logpush.accountOwnership`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "logpush_account_ownership_create",
+    name: "logpush_accountOwnership_create",
     title: "Get ownership challenge",
-    description: "Gets a new ownership challenge sent to your destination.",
+    description: "Gets a new ownership challenge sent to your destination.\n\nPOST /{account_or_zone}/{account_or_zone_id}/logpush/ownership",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "destination_conf": {
-              "$ref": "#/$defs/logpush_destination_conf",
-              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included."
+              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included.",
+              "type": "string"
             }
           },
           "required": [
             "destination_conf"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "logpush_destination_conf": logpush_destination_conf,
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_get_ownership_response",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_get_ownership_response": logpush_get_ownership_response_output,
-        "logpush_messages": logpush_messages_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_get_ownership_response": logpush_get_ownership_response,
+        "logpush_messages": logpush_messages,
       },
     },
     annotations: {
@@ -99,10 +104,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_get_ownership_response": logpush_get_ownership_response_output,
-        "logpush_messages": logpush_messages_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_get_ownership_response": logpush_get_ownership_response,
+        "logpush_messages": logpush_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/accountOwnership/validate/outputs.ts b/src/generated/forge-mcp/logpush/accountOwnership/validate/outputs.ts
index 88d0ee487..18859d9a9 100644
--- a/src/generated/forge-mcp/logpush/accountOwnership/validate/outputs.ts
+++ b/src/generated/forge-mcp/logpush/accountOwnership/validate/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `logpush_validate_ownership_response` in responses.
  */
-export const logpush_validate_ownership_response_output: JsonSchema = {
+export const logpush_validate_ownership_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
diff --git a/src/generated/forge-mcp/logpush/accountOwnership/validate/tools.ts b/src/generated/forge-mcp/logpush/accountOwnership/validate/tools.ts
index 6e095be0b..2595daf2d 100644
--- a/src/generated/forge-mcp/logpush/accountOwnership/validate/tools.ts
+++ b/src/generated/forge-mcp/logpush/accountOwnership/validate/tools.ts
@@ -3,49 +3,32 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_messages,
 } from "../../outputs.js";
-import {
-  logpush_destination_conf,
-  logpush_identifier,
-  logpush_ownership_challenge,
-} from "../../schemas.js";
-import { logpush_validate_ownership_response_output } from "./outputs.js";
+import { logpush_validate_ownership_response } from "./outputs.js";
 
 /**
- * The tools of `logpush.account_ownership.validate`.
+ * The tools of `logpush.accountOwnership.validate`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "logpush_account_ownership_validate_create",
+    name: "logpush_accountOwnership_validate_create",
     title: "Validate ownership challenge",
-    description: "Validates ownership challenge of the destination.",
+    description: "Validates ownership challenge of the destination.\n\nPOST /{account_or_zone}/{account_or_zone_id}/logpush/ownership/validate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "destination_conf": {
-              "$ref": "#/$defs/logpush_destination_conf",
-              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included."
+              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included.",
+              "type": "string"
             },
             "ownership_challenge": {
-              "$ref": "#/$defs/logpush_ownership_challenge",
-              "description": "Ownership challenge token to prove destination ownership."
+              "description": "Ownership challenge token to prove destination ownership.",
+              "type": "string"
             }
           },
           "required": [
@@ -53,25 +36,42 @@ export const tools: readonly Tool[] = [
             "ownership_challenge"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "logpush_destination_conf": logpush_destination_conf,
-        "logpush_identifier": logpush_identifier,
-        "logpush_ownership_challenge": logpush_ownership_challenge,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_validate_ownership_response",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_validate_ownership_response": logpush_validate_ownership_response_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_messages": logpush_messages,
+        "logpush_validate_ownership_response": logpush_validate_ownership_response,
       },
     },
     annotations: {
@@ -109,10 +109,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_validate_ownership_response": logpush_validate_ownership_response_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_messages": logpush_messages,
+        "logpush_validate_ownership_response": logpush_validate_ownership_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/accountValidate/destination/tools.ts b/src/generated/forge-mcp/logpush/accountValidate/destination/tools.ts
index b89fdc1e4..ce8896414 100644
--- a/src/generated/forge-mcp/logpush/accountValidate/destination/tools.ts
+++ b/src/generated/forge-mcp/logpush/accountValidate/destination/tools.ts
@@ -3,65 +3,70 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_messages,
 } from "../../outputs.js";
-import { logpush_destination_conf, logpush_identifier } from "../../schemas.js";
-import { logpush_validate_response_output } from "../outputs.js";
+import { logpush_validate_response } from "../outputs.js";
 
 /**
- * The tools of `logpush.account_validate.destination`.
+ * The tools of `logpush.accountValidate.destination`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "logpush_account_validate_destination_delete",
+    name: "logpush_accountValidate_destination_delete",
     title: "Validate destination",
-    description: "Validates destination.",
+    description: "Validates destination.\n\nPOST /{account_or_zone}/{account_or_zone_id}/logpush/validate/destination",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "destination_conf": {
-              "$ref": "#/$defs/logpush_destination_conf",
-              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included."
+              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included.",
+              "type": "string"
             }
           },
           "required": [
             "destination_conf"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "logpush_destination_conf": logpush_destination_conf,
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_validate_response",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_validate_response": logpush_validate_response_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_messages": logpush_messages,
+        "logpush_validate_response": logpush_validate_response,
       },
     },
     annotations: {
@@ -99,10 +104,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_validate_response": logpush_validate_response_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_messages": logpush_messages,
+        "logpush_validate_response": logpush_validate_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/accountValidate/origin/tools.ts b/src/generated/forge-mcp/logpush/accountValidate/origin/tools.ts
index 629896447..1afd92546 100644
--- a/src/generated/forge-mcp/logpush/accountValidate/origin/tools.ts
+++ b/src/generated/forge-mcp/logpush/accountValidate/origin/tools.ts
@@ -3,65 +3,78 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_messages,
 } from "../../outputs.js";
-import { logpush_identifier, logpush_logpull_options } from "../../schemas.js";
-import { logpush_validate_response_output } from "../outputs.js";
+import { logpush_validate_response } from "../outputs.js";
 
 /**
- * The tools of `logpush.account_validate.origin`.
+ * The tools of `logpush.accountValidate.origin`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "logpush_account_validate_origin_create",
+    name: "logpush_accountValidate_origin_create",
     title: "Validate origin",
-    description: "Validates logpull origin with logpull_options.",
+    description: "Validates logpull origin with logpull_options.\n\nPOST /{account_or_zone}/{account_or_zone_id}/logpush/validate/origin",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "logpull_options": {
-              "$ref": "#/$defs/logpush_logpull_options",
-              "description": "This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately."
+              "deprecated": true,
+              "description": "This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
           },
           "required": [
             "logpull_options"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "logpush_identifier": logpush_identifier,
-        "logpush_logpull_options": logpush_logpull_options,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_validate_response",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_validate_response": logpush_validate_response_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_messages": logpush_messages,
+        "logpush_validate_response": logpush_validate_response,
       },
     },
     annotations: {
@@ -99,10 +112,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_validate_response": logpush_validate_response_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_messages": logpush_messages,
+        "logpush_validate_response": logpush_validate_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/accountValidate/outputs.ts b/src/generated/forge-mcp/logpush/accountValidate/outputs.ts
index 0b8c738d3..fc90c182b 100644
--- a/src/generated/forge-mcp/logpush/accountValidate/outputs.ts
+++ b/src/generated/forge-mcp/logpush/accountValidate/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `logpush_destination_exists_response` in responses.
  */
-export const logpush_destination_exists_response_output: JsonSchema = {
+export const logpush_destination_exists_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
@@ -37,7 +37,7 @@ export const logpush_destination_exists_response_output: JsonSchema = {
 /**
  * The schema of `logpush_validate_response` in responses.
  */
-export const logpush_validate_response_output: JsonSchema = {
+export const logpush_validate_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
diff --git a/src/generated/forge-mcp/logpush/accountValidate/tools.ts b/src/generated/forge-mcp/logpush/accountValidate/tools.ts
index 43bc23ca4..9d8c3f29f 100644
--- a/src/generated/forge-mcp/logpush/accountValidate/tools.ts
+++ b/src/generated/forge-mcp/logpush/accountValidate/tools.ts
@@ -3,65 +3,70 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_messages,
 } from "../outputs.js";
-import { logpush_destination_conf, logpush_identifier } from "../schemas.js";
-import { logpush_destination_exists_response_output } from "./outputs.js";
+import { logpush_destination_exists_response } from "./outputs.js";
 
 /**
- * The tools of `logpush.account_validate`.
+ * The tools of `logpush.accountValidate`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "logpush_account_validate_destination_exists_delete",
+    name: "logpush_accountValidate_destinationExistsDelete",
     title: "Check destination exists",
-    description: "Checks if there is an existing job with a destination.",
+    description: "Checks if there is an existing job with a destination.\n\nPOST /{account_or_zone}/{account_or_zone_id}/logpush/validate/destination/exists",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "destination_conf": {
-              "$ref": "#/$defs/logpush_destination_conf",
-              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included."
+              "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included.",
+              "type": "string"
             }
           },
           "required": [
             "destination_conf"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "logpush_destination_conf": logpush_destination_conf,
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_destination_exists_response",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_destination_exists_response": logpush_destination_exists_response_output,
-        "logpush_messages": logpush_messages_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_destination_exists_response": logpush_destination_exists_response,
+        "logpush_messages": logpush_messages,
       },
     },
     annotations: {
@@ -99,10 +104,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_destination_exists_response": logpush_destination_exists_response_output,
-        "logpush_messages": logpush_messages_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_destination_exists_response": logpush_destination_exists_response,
+        "logpush_messages": logpush_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/edge/outputs.ts b/src/generated/forge-mcp/logpush/edge/outputs.ts
index 40c0ebb11..d4609b194 100644
--- a/src/generated/forge-mcp/logpush/edge/outputs.ts
+++ b/src/generated/forge-mcp/logpush/edge/outputs.ts
@@ -3,48 +3,27 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `logpush_destination_conf-2` in responses.
- */
-export const logpush_destination_conf_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_fields` in responses.
- */
-export const logpush_fields_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_filter-2` in responses.
- */
-export const logpush_filter_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `logpush_instant_logs_job` in responses.
  */
-export const logpush_instant_logs_job_output: JsonSchema = {
+export const logpush_instant_logs_job: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "destination_conf": {
-          "$ref": "#/$defs/logpush_destination_conf-2"
+          "type": "string"
         },
         "fields": {
-          "$ref": "#/$defs/logpush_fields"
+          "type": "string"
         },
         "filter": {
-          "$ref": "#/$defs/logpush_filter-2"
+          "type": "string"
         },
         "sample": {
-          "$ref": "#/$defs/logpush_sample"
+          "type": "integer"
         },
         "session_id": {
-          "$ref": "#/$defs/logpush_session_id"
+          "type": "string"
         }
       },
       "type": "object"
@@ -58,7 +37,7 @@ export const logpush_instant_logs_job_output: JsonSchema = {
 /**
  * The schema of `logpush_instant_logs_job_response_collection` in responses.
  */
-export const logpush_instant_logs_job_response_collection_output: JsonSchema = {
+export const logpush_instant_logs_job_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
@@ -87,7 +66,7 @@ export const logpush_instant_logs_job_response_collection_output: JsonSchema = {
 /**
  * The schema of `logpush_instant_logs_job_response_single` in responses.
  */
-export const logpush_instant_logs_job_response_single_output: JsonSchema = {
+export const logpush_instant_logs_job_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-single"
@@ -109,17 +88,3 @@ export const logpush_instant_logs_job_response_single_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `logpush_sample` in responses.
- */
-export const logpush_sample_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `logpush_session_id` in responses.
- */
-export const logpush_session_id_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/logpush/edge/schemas.ts b/src/generated/forge-mcp/logpush/edge/schemas.ts
deleted file mode 100644
index da6da5e87..000000000
--- a/src/generated/forge-mcp/logpush/edge/schemas.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `logpush_fields`.
- */
-export const logpush_fields: JsonSchema = {
-  "description": "Comma-separated list of fields.",
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_filter-2`.
- */
-export const logpush_filter_2: JsonSchema = {
-  "description": "Filters to drill down into specific events.",
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_sample`.
- */
-export const logpush_sample: JsonSchema = {
-  "description": "The sample parameter is the sample rate of the records set by the client: \"sample\": 1 is 100% of records \"sample\": 10 is 10% and so on.",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/logpush/edge/tools.ts b/src/generated/forge-mcp/logpush/edge/tools.ts
index 641e37d1c..366fd9c56 100644
--- a/src/generated/forge-mcp/logpush/edge/tools.ts
+++ b/src/generated/forge-mcp/logpush/edge/tools.ts
@@ -3,23 +3,16 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_api_response_single_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_api$$response$$single,
+  logpush_messages,
 } from "../outputs.js";
-import { logpush_identifier } from "../schemas.js";
 import {
-  logpush_destination_conf_2_output,
-  logpush_fields_output,
-  logpush_filter_2_output,
-  logpush_instant_logs_job_output,
-  logpush_instant_logs_job_response_collection_output,
-  logpush_instant_logs_job_response_single_output,
-  logpush_sample_output,
-  logpush_session_id_output,
+  logpush_instant_logs_job,
+  logpush_instant_logs_job_response_collection,
+  logpush_instant_logs_job_response_single,
 } from "./outputs.js";
-import { logpush_fields, logpush_filter_2, logpush_sample } from "./schemas.js";
 
 /**
  * The tools of `logpush.edge`.
@@ -28,55 +21,54 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_edge_create",
     title: "Create Instant Logs job",
-    description: "Creates a new Instant Logs job for a zone.",
+    description: "Creates a new Instant Logs job for a zone.\n\nPOST /zones/{zone_id}/logpush/edge/jobs",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "fields": {
-              "$ref": "#/$defs/logpush_fields",
-              "description": "Comma-separated list of fields."
+              "description": "Comma-separated list of fields.",
+              "type": "string"
             },
             "filter": {
-              "$ref": "#/$defs/logpush_filter-2",
-              "description": "Filters to drill down into specific events."
+              "description": "Filters to drill down into specific events.",
+              "type": "string"
             },
             "sample": {
-              "$ref": "#/$defs/logpush_sample",
-              "description": "The sample parameter is the sample rate of the records set by the client: \"sample\": 1 is 100% of records \"sample\": 10 is 10% and so on."
+              "description": "The sample parameter is the sample rate of the records set by the client: \"sample\": 1 is 100% of records \"sample\": 10 is 10% and so on.",
+              "type": "integer"
             }
           },
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "logpush_fields": logpush_fields,
-        "logpush_filter-2": logpush_filter_2,
-        "logpush_identifier": logpush_identifier,
-        "logpush_sample": logpush_sample,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_instant_logs_job_response_single",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_destination_conf-2": logpush_destination_conf_2_output,
-        "logpush_fields": logpush_fields_output,
-        "logpush_filter-2": logpush_filter_2_output,
-        "logpush_instant_logs_job": logpush_instant_logs_job_output,
-        "logpush_instant_logs_job_response_single": logpush_instant_logs_job_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_sample": logpush_sample_output,
-        "logpush_session_id": logpush_session_id_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_instant_logs_job": logpush_instant_logs_job,
+        "logpush_instant_logs_job_response_single": logpush_instant_logs_job_response_single,
+        "logpush_messages": logpush_messages,
       },
     },
     annotations: {
@@ -121,16 +113,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_destination_conf-2": logpush_destination_conf_2_output,
-        "logpush_fields": logpush_fields_output,
-        "logpush_filter-2": logpush_filter_2_output,
-        "logpush_instant_logs_job": logpush_instant_logs_job_output,
-        "logpush_instant_logs_job_response_single": logpush_instant_logs_job_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_sample": logpush_sample_output,
-        "logpush_session_id": logpush_session_id_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_instant_logs_job": logpush_instant_logs_job,
+        "logpush_instant_logs_job_response_single": logpush_instant_logs_job_response_single,
+        "logpush_messages": logpush_messages,
       },
     },
     request: (args) => ({
@@ -141,34 +128,36 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_edge_get",
     title: "List Instant Logs jobs",
-    description: "Lists Instant Logs jobs for a zone.",
+    description: "Lists Instant Logs jobs for a zone.\n\nGET /zones/{zone_id}/logpush/edge/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_instant_logs_job_response_collection",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_destination_conf-2": logpush_destination_conf_2_output,
-        "logpush_fields": logpush_fields_output,
-        "logpush_filter-2": logpush_filter_2_output,
-        "logpush_instant_logs_job": logpush_instant_logs_job_output,
-        "logpush_instant_logs_job_response_collection": logpush_instant_logs_job_response_collection_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_sample": logpush_sample_output,
-        "logpush_session_id": logpush_session_id_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_instant_logs_job": logpush_instant_logs_job,
+        "logpush_instant_logs_job_response_collection": logpush_instant_logs_job_response_collection,
+        "logpush_messages": logpush_messages,
       },
     },
     annotations: {
@@ -213,16 +202,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_destination_conf-2": logpush_destination_conf_2_output,
-        "logpush_fields": logpush_fields_output,
-        "logpush_filter-2": logpush_filter_2_output,
-        "logpush_instant_logs_job": logpush_instant_logs_job_output,
-        "logpush_instant_logs_job_response_collection": logpush_instant_logs_job_response_collection_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_sample": logpush_sample_output,
-        "logpush_session_id": logpush_session_id_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_instant_logs_job": logpush_instant_logs_job,
+        "logpush_instant_logs_job_response_collection": logpush_instant_logs_job_response_collection,
+        "logpush_messages": logpush_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/outputs.ts b/src/generated/forge-mcp/logpush/outputs.ts
index 75a1c8a41..a520465dc 100644
--- a/src/generated/forge-mcp/logpush/outputs.ts
+++ b/src/generated/forge-mcp/logpush/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `logpush_api-response-common` in responses.
  */
-export const logpush_api_response_common_output: JsonSchema = {
+export const logpush_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/logpush_messages"
@@ -32,7 +32,7 @@ export const logpush_api_response_common_output: JsonSchema = {
 /**
  * The schema of `logpush_api-response-common-failure` in responses.
  */
-export const logpush_api_response_common_failure_output: JsonSchema = {
+export const logpush_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/logpush_messages"
@@ -62,7 +62,7 @@ export const logpush_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `logpush_api-response-single` in responses.
  */
-export const logpush_api_response_single_output: JsonSchema = {
+export const logpush_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/logpush_messages"
@@ -85,226 +85,195 @@ export const logpush_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `logpush_dataset` in responses.
- */
-export const logpush_dataset_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "access_requests",
-        "account_abuse_protection_events",
-        "ai_gateway_events",
-        "audit_logs",
-        "audit_logs_v2",
-        "biso_user_actions",
-        "casb_findings",
-        "device_posture_results",
-        "dex_application_tests",
-        "dex_device_state_events",
-        "dlp_forensic_copies",
-        "dns_firewall_logs",
-        "dns_logs",
-        "email_security_alerts",
-        "email_security_post_delivery_events",
-        "firewall_events",
-        "gateway_dns",
-        "gateway_http",
-        "gateway_network",
-        "http_requests",
-        "ipsec_logs",
-        "magic_bgp_logs",
-        "magic_ids_detections",
-        "mcp_portal_logs",
-        "mnm_flow_logs",
-        "nel_reports",
-        "network_analytics_logs",
-        "page_shield_events",
-        "sinkhole_http_logs",
-        "spectrum_events",
-        "ssh_logs",
-        "turnstile_events",
-        "warp_config_changes",
-        "warp_toggle_changes",
-        "websocket_analytics",
-        "workers_trace_events",
-        "zaraz_events",
-        "zero_trust_network_sessions"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_destination_conf` in responses.
- */
-export const logpush_destination_conf_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_enabled` in responses.
- */
-export const logpush_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `logpush_error_message` in responses.
- */
-export const logpush_error_message_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_filter_attack_traffic` in responses.
- */
-export const logpush_filter_attack_traffic_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `logpush_frequency` in responses.
- */
-export const logpush_frequency_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "high",
-        "low"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_id` in responses.
- */
-export const logpush_id_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `logpush_kind` in responses.
- */
-export const logpush_kind_output: JsonSchema = {
-  "enum": [
-    "",
-    "edge"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_last_complete` in responses.
- */
-export const logpush_last_complete_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_last_error` in responses.
- */
-export const logpush_last_error_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_logpull_options` in responses.
- */
-export const logpush_logpull_options_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `logpush_logpush_job` in responses.
  */
-export const logpush_logpush_job_output: JsonSchema = {
+export const logpush_logpush_job: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "dataset": {
-          "$ref": "#/$defs/logpush_dataset"
+          "oneOf": [
+            {
+              "enum": [
+                "access_requests",
+                "account_abuse_protection_events",
+                "ai_gateway_events",
+                "audit_logs",
+                "audit_logs_v2",
+                "biso_user_actions",
+                "casb_findings",
+                "device_posture_results",
+                "dex_application_tests",
+                "dex_device_state_events",
+                "dlp_forensic_copies",
+                "dns_firewall_logs",
+                "dns_logs",
+                "email_security_alerts",
+                "email_security_post_delivery_events",
+                "firewall_events",
+                "gateway_dns",
+                "gateway_http",
+                "gateway_network",
+                "http_requests",
+                "ipsec_logs",
+                "magic_bgp_logs",
+                "magic_ids_detections",
+                "mcp_portal_logs",
+                "mnm_flow_logs",
+                "nel_reports",
+                "network_analytics_logs",
+                "page_shield_events",
+                "sinkhole_http_logs",
+                "spectrum_events",
+                "ssh_logs",
+                "turnstile_events",
+                "warp_config_changes",
+                "warp_toggle_changes",
+                "websocket_analytics",
+                "workers_trace_events",
+                "zaraz_events",
+                "zero_trust_network_sessions"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "destination_conf": {
-          "$ref": "#/$defs/logpush_destination_conf"
+          "type": "string"
         },
         "enabled": {
-          "$ref": "#/$defs/logpush_enabled"
+          "type": "boolean"
         },
         "error_message": {
-          "$ref": "#/$defs/logpush_error_message"
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "filter_attack_traffic": {
-          "$ref": "#/$defs/logpush_filter_attack_traffic"
+          "type": "boolean"
         },
         "frequency": {
-          "$ref": "#/$defs/logpush_frequency"
+          "oneOf": [
+            {
+              "enum": [
+                "high",
+                "low"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "id": {
-          "$ref": "#/$defs/logpush_id"
+          "type": "integer"
         },
         "kind": {
-          "$ref": "#/$defs/logpush_kind"
+          "enum": [
+            "",
+            "edge"
+          ],
+          "type": "string"
         },
         "last_complete": {
-          "$ref": "#/$defs/logpush_last_complete"
+          "oneOf": [
+            {
+              "format": "date-time",
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "last_error": {
-          "$ref": "#/$defs/logpush_last_error"
+          "oneOf": [
+            {
+              "format": "date-time",
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "logpull_options": {
-          "$ref": "#/$defs/logpush_logpull_options"
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "max_upload_bytes": {
-          "$ref": "#/$defs/logpush_max_upload_bytes"
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "enum": [
+                0
+              ],
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "max_upload_interval_seconds": {
-          "$ref": "#/$defs/logpush_max_upload_interval_seconds"
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "enum": [
+                0
+              ],
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "max_upload_records": {
-          "$ref": "#/$defs/logpush_max_upload_records"
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "enum": [
+                0
+              ],
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "name": {
-          "$ref": "#/$defs/logpush_name"
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "output_options": {
           "$ref": "#/$defs/logpush_output_options"
@@ -321,7 +290,7 @@ export const logpush_logpush_job_output: JsonSchema = {
 /**
  * The schema of `logpush_logpush_job_response_collection` in responses.
  */
-export const logpush_logpush_job_response_collection_output: JsonSchema = {
+export const logpush_logpush_job_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
@@ -347,70 +316,10 @@ export const logpush_logpush_job_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `logpush_max_upload_bytes` in responses.
- */
-export const logpush_max_upload_bytes_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "enum": [
-        0
-      ],
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_max_upload_interval_seconds` in responses.
- */
-export const logpush_max_upload_interval_seconds_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "enum": [
-        0
-      ],
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_max_upload_records` in responses.
- */
-export const logpush_max_upload_records_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "enum": [
-        0
-      ],
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `logpush_messages` in responses.
  */
-export const logpush_messages_output: JsonSchema = {
+export const logpush_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -440,24 +349,10 @@ export const logpush_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `logpush_name` in responses.
- */
-export const logpush_name_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `logpush_output_options` in responses.
  */
-export const logpush_output_options_output: JsonSchema = {
+export const logpush_output_options: JsonSchema = {
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/logpush/schemas.ts b/src/generated/forge-mcp/logpush/schemas.ts
index b5dc58b0a..e76dffb21 100644
--- a/src/generated/forge-mcp/logpush/schemas.ts
+++ b/src/generated/forge-mcp/logpush/schemas.ts
@@ -3,227 +3,6 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `logpush_dataset`.
- */
-export const logpush_dataset: JsonSchema = {
-  "description": "Name of the dataset. A list of supported datasets can be found on the [Developer Docs](https://developers.cloudflare.com/logs/reference/log-fields/).",
-  "oneOf": [
-    {
-      "enum": [
-        "access_requests",
-        "account_abuse_protection_events",
-        "ai_gateway_events",
-        "audit_logs",
-        "audit_logs_v2",
-        "biso_user_actions",
-        "casb_findings",
-        "device_posture_results",
-        "dex_application_tests",
-        "dex_device_state_events",
-        "dlp_forensic_copies",
-        "dns_firewall_logs",
-        "dns_logs",
-        "email_security_alerts",
-        "email_security_post_delivery_events",
-        "firewall_events",
-        "gateway_dns",
-        "gateway_http",
-        "gateway_network",
-        "http_requests",
-        "ipsec_logs",
-        "magic_bgp_logs",
-        "magic_ids_detections",
-        "mcp_portal_logs",
-        "mnm_flow_logs",
-        "nel_reports",
-        "network_analytics_logs",
-        "page_shield_events",
-        "sinkhole_http_logs",
-        "spectrum_events",
-        "ssh_logs",
-        "turnstile_events",
-        "warp_config_changes",
-        "warp_toggle_changes",
-        "websocket_analytics",
-        "workers_trace_events",
-        "zaraz_events",
-        "zero_trust_network_sessions"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_destination_conf`.
- */
-export const logpush_destination_conf: JsonSchema = {
-  "description": "Uniquely identifies a resource (such as an s3 bucket) where data. will be pushed. Additional configuration parameters supported by the destination may be included.",
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_enabled`.
- */
-export const logpush_enabled: JsonSchema = {
-  "description": "Flag that indicates if the job is enabled.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `logpush_filter_attack_traffic`.
- */
-export const logpush_filter_attack_traffic: JsonSchema = {
-  "description": "When true, excludes DDoS attack traffic from logs. This option is supported for the `http_requests`, `firewall_events`, and `network_analytics_logs` datasets.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `logpush_frequency`.
- */
-export const logpush_frequency: JsonSchema = {
-  "deprecated": true,
-  "description": "This field is deprecated. Please use `max_upload_*` parameters instead. . The frequency at which Cloudflare sends batches of logs to your destination. Setting frequency to high sends your logs in larger quantities of smaller files. Setting frequency to low sends logs in smaller quantities of larger files.",
-  "oneOf": [
-    {
-      "enum": [
-        "high",
-        "low"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_id`.
- */
-export const logpush_id: JsonSchema = {
-  "description": "Unique id of the job.",
-  "type": "integer"
-};
-
-/**
- * The schema of `logpush_identifier`.
- */
-export const logpush_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_kind`.
- */
-export const logpush_kind: JsonSchema = {
-  "description": "The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs (when supported by the dataset).",
-  "enum": [
-    "",
-    "edge"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_logpull_options`.
- */
-export const logpush_logpull_options: JsonSchema = {
-  "deprecated": true,
-  "description": "This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_max_upload_bytes`.
- */
-export const logpush_max_upload_bytes: JsonSchema = {
-  "description": "The maximum uncompressed file size of a batch of logs. This setting value must be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a minimum file size; this means that log files may be much smaller than this batch size.",
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "enum": [
-        0
-      ],
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_max_upload_interval_seconds`.
- */
-export const logpush_max_upload_interval_seconds: JsonSchema = {
-  "description": "The maximum interval in seconds for log batches. This setting must be between 30 and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify a minimum interval for log batches; this means that log files may be sent in shorter intervals than this.",
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "enum": [
-        0
-      ],
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_max_upload_records`.
- */
-export const logpush_max_upload_records: JsonSchema = {
-  "description": "The maximum number of log lines per batch. This setting must be between 1000 and 1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum number of log lines per batch; this means that log files may contain many fewer lines than this.",
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "enum": [
-        0
-      ],
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `logpush_name`.
- */
-export const logpush_name: JsonSchema = {
-  "description": "Optional human readable job name. Not unique. Cloudflare suggests. that you set this to a meaningful string, like the domain name, to make it easier to identify your job.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `logpush_output_options`.
  */
@@ -376,11 +155,3 @@ export const logpush_output_options: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `logpush_ownership_challenge`.
- */
-export const logpush_ownership_challenge: JsonSchema = {
-  "description": "Ownership challenge token to prove destination ownership.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/logpush/transformers/content/outputs.ts b/src/generated/forge-mcp/logpush/transformers/content/outputs.ts
index acd2a7d73..bd632c63f 100644
--- a/src/generated/forge-mcp/logpush/transformers/content/outputs.ts
+++ b/src/generated/forge-mcp/logpush/transformers/content/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `logpush_transformer_content_response` in responses.
  */
-export const logpush_transformer_content_response_output: JsonSchema = {
+export const logpush_transformer_content_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-single"
diff --git a/src/generated/forge-mcp/logpush/transformers/content/tools.ts b/src/generated/forge-mcp/logpush/transformers/content/tools.ts
index c3a92dd19..c06a65475 100644
--- a/src/generated/forge-mcp/logpush/transformers/content/tools.ts
+++ b/src/generated/forge-mcp/logpush/transformers/content/tools.ts
@@ -1,15 +1,13 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_single_output,
-  logpush_messages_output,
+  logpush_api$$response$$common$$failure,
+  logpush_api$$response$$single,
+  logpush_messages,
 } from "../../outputs.js";
-import { logpush_identifier } from "../../schemas.js";
-import { logpush_transformer_identifier } from "../schemas.js";
-import { logpush_transformer_content_response_output } from "./outputs.js";
+import { logpush_transformer_content_response } from "./outputs.js";
 
 /**
  * The tools of `logpush.transformers.content`.
@@ -18,38 +16,50 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_transformers_content_get",
     title: "Get transformer content",
-    description: "Returns the SQL query content for a transformer. Without query params, returns the latest version. With `version_id`, returns the specified version.",
+    description: "Returns the SQL query content for a transformer. Without query params, returns the latest version. With `version_id`, returns the specified version.\n\nGET /accounts/{account_id}/logpush/transformers/{transformer_id}/content",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "transformer_id": {
+              "description": "The transformer ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "transformer_id"
+          ],
+          "type": "object"
         },
-        "transformer_id": {
-          "$ref": "#/$defs/logpush_transformer_identifier",
-          "description": "The transformer ID."
-        },
-        "version_id": {
-          "description": "Specific version ID to retrieve. When omitted, the latest version is returned.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "version_id": {
+              "description": "Specific version ID to retrieve. When omitted, the latest version is returned.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "transformer_id"
+        "path"
       ],
-      $defs: {
-        "logpush_identifier": logpush_identifier,
-        "logpush_transformer_identifier": logpush_transformer_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_transformer_content_response",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer_content_response": logpush_transformer_content_response_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer_content_response": logpush_transformer_content_response,
       },
     },
     annotations: {
@@ -87,16 +97,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer_content_response": logpush_transformer_content_response_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer_content_response": logpush_transformer_content_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/logpush/transformers/${pathParam(args, "transformer_id")}/content`,
       query: [
-        ["version_id", args["version_id"], true],
+        ["version_id", param(args, "query", "version_id"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/logpush/transformers/outputs.ts b/src/generated/forge-mcp/logpush/transformers/outputs.ts
index 00e7e8fae..a5b2183a9 100644
--- a/src/generated/forge-mcp/logpush/transformers/outputs.ts
+++ b/src/generated/forge-mcp/logpush/transformers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `logpush_transformer` in responses.
  */
-export const logpush_transformer_output: JsonSchema = {
+export const logpush_transformer: JsonSchema = {
   "properties": {
     "associated_jobs": {
       "items": {
@@ -19,16 +19,23 @@ export const logpush_transformer_output: JsonSchema = {
       "type": "string"
     },
     "dataset": {
-      "$ref": "#/$defs/logpush_transformer_dataset"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "description": {
-      "$ref": "#/$defs/logpush_transformer_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/logpush_transformer_identifier"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/logpush_transformer_name"
+      "type": "string"
     },
     "updated_at": {
       "format": "date-time",
@@ -38,24 +45,10 @@ export const logpush_transformer_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `logpush_transformer_dataset` in responses.
- */
-export const logpush_transformer_dataset_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `logpush_transformer_delete_response` in responses.
  */
-export const logpush_transformer_delete_response_output: JsonSchema = {
+export const logpush_transformer_delete_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-single"
@@ -76,24 +69,10 @@ export const logpush_transformer_delete_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `logpush_transformer_description` in responses.
- */
-export const logpush_transformer_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_transformer_identifier` in responses.
- */
-export const logpush_transformer_identifier_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `logpush_transformer_job_ref` in responses.
  */
-export const logpush_transformer_job_ref_output: JsonSchema = {
+export const logpush_transformer_job_ref: JsonSchema = {
   "properties": {
     "id": {
       "type": "integer"
@@ -115,17 +94,10 @@ export const logpush_transformer_job_ref_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `logpush_transformer_name` in responses.
- */
-export const logpush_transformer_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `logpush_transformer_preview_response` in responses.
  */
-export const logpush_transformer_preview_response_output: JsonSchema = {
+export const logpush_transformer_preview_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-single"
@@ -154,7 +126,7 @@ export const logpush_transformer_preview_response_output: JsonSchema = {
 /**
  * The schema of `logpush_transformer_response_collection` in responses.
  */
-export const logpush_transformer_response_collection_output: JsonSchema = {
+export const logpush_transformer_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
@@ -176,7 +148,7 @@ export const logpush_transformer_response_collection_output: JsonSchema = {
 /**
  * The schema of `logpush_transformer_response_single` in responses.
  */
-export const logpush_transformer_response_single_output: JsonSchema = {
+export const logpush_transformer_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-single"
diff --git a/src/generated/forge-mcp/logpush/transformers/schemas.ts b/src/generated/forge-mcp/logpush/transformers/schemas.ts
index c0ce16b93..6dacf844b 100644
--- a/src/generated/forge-mcp/logpush/transformers/schemas.ts
+++ b/src/generated/forge-mcp/logpush/transformers/schemas.ts
@@ -3,30 +3,22 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `logpush_transformer_code`.
- */
-export const logpush_transformer_code: JsonSchema = {
-  "description": "The SQL transformer query. Maximum 32 KB. The query must contain a FROM clause referencing a valid logpush dataset.",
-  "type": "string"
-};
-
 /**
  * The schema of `logpush_transformer_create_request`.
  */
 export const logpush_transformer_create_request: JsonSchema = {
   "properties": {
     "code": {
-      "$ref": "#/$defs/logpush_transformer_code",
-      "description": "The SQL transformer query. Maximum 32 KB. The query must contain a FROM clause referencing a valid logpush dataset."
+      "description": "The SQL transformer query. Maximum 32 KB. The query must contain a FROM clause referencing a valid logpush dataset.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/logpush_transformer_description",
-      "description": "Optional customer-provided description."
+      "description": "Optional customer-provided description.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/logpush_transformer_name",
-      "description": "Customer-provided name for identification."
+      "description": "Customer-provided name for identification.",
+      "type": "string"
     }
   },
   "required": [
@@ -36,30 +28,6 @@ export const logpush_transformer_create_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `logpush_transformer_description`.
- */
-export const logpush_transformer_description: JsonSchema = {
-  "description": "Optional customer-provided description.",
-  "type": "string"
-};
-
-/**
- * The schema of `logpush_transformer_identifier`.
- */
-export const logpush_transformer_identifier: JsonSchema = {
-  "description": "The transformer ID.",
-  "type": "integer"
-};
-
-/**
- * The schema of `logpush_transformer_name`.
- */
-export const logpush_transformer_name: JsonSchema = {
-  "description": "Customer-provided name for identification.",
-  "type": "string"
-};
-
 /**
  * The schema of `logpush_transformer_preview_request`.
  */
@@ -70,8 +38,8 @@ export const logpush_transformer_preview_request: JsonSchema = {
       "type": "object"
     },
     "sql": {
-      "$ref": "#/$defs/logpush_transformer_code",
-      "description": "The SQL transformer query. Maximum 32 KB. The query must contain a FROM clause referencing a valid logpush dataset."
+      "description": "The SQL transformer query. Maximum 32 KB. The query must contain a FROM clause referencing a valid logpush dataset.",
+      "type": "string"
     }
   },
   "required": [
@@ -87,16 +55,16 @@ export const logpush_transformer_preview_request: JsonSchema = {
 export const logpush_transformer_update_request: JsonSchema = {
   "properties": {
     "code": {
-      "$ref": "#/$defs/logpush_transformer_code",
-      "description": "The SQL transformer query. Maximum 32 KB. The query must contain a FROM clause referencing a valid logpush dataset."
+      "description": "The SQL transformer query. Maximum 32 KB. The query must contain a FROM clause referencing a valid logpush dataset.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/logpush_transformer_description",
-      "description": "Optional customer-provided description."
+      "description": "Optional customer-provided description.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/logpush_transformer_name",
-      "description": "Customer-provided name for identification."
+      "description": "Customer-provided name for identification.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/logpush/transformers/tools.ts b/src/generated/forge-mcp/logpush/transformers/tools.ts
index fe124d1a7..d2e1a97c7 100644
--- a/src/generated/forge-mcp/logpush/transformers/tools.ts
+++ b/src/generated/forge-mcp/logpush/transformers/tools.ts
@@ -3,30 +3,21 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_api_response_single_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_api$$response$$single,
+  logpush_messages,
 } from "../outputs.js";
-import { logpush_identifier } from "../schemas.js";
 import {
-  logpush_transformer_dataset_output,
-  logpush_transformer_delete_response_output,
-  logpush_transformer_description_output,
-  logpush_transformer_identifier_output,
-  logpush_transformer_job_ref_output,
-  logpush_transformer_name_output,
-  logpush_transformer_output,
-  logpush_transformer_preview_response_output,
-  logpush_transformer_response_collection_output,
-  logpush_transformer_response_single_output,
+  logpush_transformer,
+  logpush_transformer_delete_response,
+  logpush_transformer_job_ref,
+  logpush_transformer_preview_response,
+  logpush_transformer_response_collection,
+  logpush_transformer_response_single,
 } from "./outputs.js";
 import {
-  logpush_transformer_code,
   logpush_transformer_create_request,
-  logpush_transformer_description,
-  logpush_transformer_identifier,
-  logpush_transformer_name,
   logpush_transformer_preview_request,
   logpush_transformer_update_request,
 } from "./schemas.js";
@@ -38,42 +29,44 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_transformers_create",
     title: "Create transformer",
-    description: "Creates a new custom log transformer for an account.",
+    description: "Creates a new custom log transformer for an account.\n\nPOST /accounts/{account_id}/logpush/transformers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/logpush_transformer_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "logpush_identifier": logpush_identifier,
-        "logpush_transformer_code": logpush_transformer_code,
         "logpush_transformer_create_request": logpush_transformer_create_request,
-        "logpush_transformer_description": logpush_transformer_description,
-        "logpush_transformer_name": logpush_transformer_name,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_transformer_response_single",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer": logpush_transformer_output,
-        "logpush_transformer_dataset": logpush_transformer_dataset_output,
-        "logpush_transformer_description": logpush_transformer_description_output,
-        "logpush_transformer_identifier": logpush_transformer_identifier_output,
-        "logpush_transformer_job_ref": logpush_transformer_job_ref_output,
-        "logpush_transformer_name": logpush_transformer_name_output,
-        "logpush_transformer_response_single": logpush_transformer_response_single_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer": logpush_transformer,
+        "logpush_transformer_job_ref": logpush_transformer_job_ref,
+        "logpush_transformer_response_single": logpush_transformer_response_single,
       },
     },
     annotations: {
@@ -111,16 +104,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer": logpush_transformer_output,
-        "logpush_transformer_dataset": logpush_transformer_dataset_output,
-        "logpush_transformer_description": logpush_transformer_description_output,
-        "logpush_transformer_identifier": logpush_transformer_identifier_output,
-        "logpush_transformer_job_ref": logpush_transformer_job_ref_output,
-        "logpush_transformer_name": logpush_transformer_name_output,
-        "logpush_transformer_response_single": logpush_transformer_response_single_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer": logpush_transformer,
+        "logpush_transformer_job_ref": logpush_transformer_job_ref,
+        "logpush_transformer_response_single": logpush_transformer_response_single,
       },
     },
     request: (args) => ({
@@ -131,34 +120,40 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_transformers_delete",
     title: "Delete transformer",
-    description: "Deletes a custom log transformer. Returns 409 Conflict if any active logpush jobs reference the transformer.",
+    description: "Deletes a custom log transformer. Returns 409 Conflict if any active logpush jobs reference the transformer.\n\nDELETE /accounts/{account_id}/logpush/transformers/{transformer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
-        },
-        "transformer_id": {
-          "$ref": "#/$defs/logpush_transformer_identifier",
-          "description": "The transformer ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "transformer_id": {
+              "description": "The transformer ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "transformer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "transformer_id"
+        "path"
       ],
-      $defs: {
-        "logpush_identifier": logpush_identifier,
-        "logpush_transformer_identifier": logpush_transformer_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_transformer_delete_response",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer_delete_response": logpush_transformer_delete_response_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer_delete_response": logpush_transformer_delete_response,
       },
     },
     annotations: {
@@ -199,10 +194,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer_delete_response": logpush_transformer_delete_response_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer_delete_response": logpush_transformer_delete_response,
       },
     },
     request: (args) => ({
@@ -212,40 +207,42 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_transformers_get",
     title: "Get transformer",
-    description: "Gets a single custom log transformer by ID.",
+    description: "Gets a single custom log transformer by ID.\n\nGET /accounts/{account_id}/logpush/transformers/{transformer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
-        },
-        "transformer_id": {
-          "$ref": "#/$defs/logpush_transformer_identifier",
-          "description": "The transformer ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "transformer_id": {
+              "description": "The transformer ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "transformer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "transformer_id"
+        "path"
       ],
-      $defs: {
-        "logpush_identifier": logpush_identifier,
-        "logpush_transformer_identifier": logpush_transformer_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_transformer_response_single",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer": logpush_transformer_output,
-        "logpush_transformer_dataset": logpush_transformer_dataset_output,
-        "logpush_transformer_description": logpush_transformer_description_output,
-        "logpush_transformer_identifier": logpush_transformer_identifier_output,
-        "logpush_transformer_job_ref": logpush_transformer_job_ref_output,
-        "logpush_transformer_name": logpush_transformer_name_output,
-        "logpush_transformer_response_single": logpush_transformer_response_single_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer": logpush_transformer,
+        "logpush_transformer_job_ref": logpush_transformer_job_ref,
+        "logpush_transformer_response_single": logpush_transformer_response_single,
       },
     },
     annotations: {
@@ -283,16 +280,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer": logpush_transformer_output,
-        "logpush_transformer_dataset": logpush_transformer_dataset_output,
-        "logpush_transformer_description": logpush_transformer_description_output,
-        "logpush_transformer_identifier": logpush_transformer_identifier_output,
-        "logpush_transformer_job_ref": logpush_transformer_job_ref_output,
-        "logpush_transformer_name": logpush_transformer_name_output,
-        "logpush_transformer_response_single": logpush_transformer_response_single_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer": logpush_transformer,
+        "logpush_transformer_job_ref": logpush_transformer_job_ref,
+        "logpush_transformer_response_single": logpush_transformer_response_single,
       },
     },
     request: (args) => ({
@@ -302,34 +295,37 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_transformers_list",
     title: "List transformers",
-    description: "Lists all custom log transformers for an account.",
+    description: "Lists all custom log transformers for an account.\n\nGET /accounts/{account_id}/logpush/transformers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "logpush_identifier": logpush_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_transformer_response_collection",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer": logpush_transformer_output,
-        "logpush_transformer_dataset": logpush_transformer_dataset_output,
-        "logpush_transformer_description": logpush_transformer_description_output,
-        "logpush_transformer_identifier": logpush_transformer_identifier_output,
-        "logpush_transformer_job_ref": logpush_transformer_job_ref_output,
-        "logpush_transformer_name": logpush_transformer_name_output,
-        "logpush_transformer_response_collection": logpush_transformer_response_collection_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer": logpush_transformer,
+        "logpush_transformer_job_ref": logpush_transformer_job_ref,
+        "logpush_transformer_response_collection": logpush_transformer_response_collection,
       },
     },
     annotations: {
@@ -367,16 +363,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer": logpush_transformer_output,
-        "logpush_transformer_dataset": logpush_transformer_dataset_output,
-        "logpush_transformer_description": logpush_transformer_description_output,
-        "logpush_transformer_identifier": logpush_transformer_identifier_output,
-        "logpush_transformer_job_ref": logpush_transformer_job_ref_output,
-        "logpush_transformer_name": logpush_transformer_name_output,
-        "logpush_transformer_response_collection": logpush_transformer_response_collection_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer": logpush_transformer,
+        "logpush_transformer_job_ref": logpush_transformer_job_ref,
+        "logpush_transformer_response_collection": logpush_transformer_response_collection,
       },
     },
     request: (args) => ({
@@ -386,34 +378,42 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_transformers_preview",
     title: "Preview transformer",
-    description: "Executes a SQL transformer against a single input record and returns the transformed output. This is a stateless endpoint — nothing is persisted.",
+    description: "Executes a SQL transformer against a single input record and returns the transformed output. This is a stateless endpoint — nothing is persisted.\n\nPOST /accounts/{account_id}/logpush/transformers/preview",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/logpush_transformer_preview_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "logpush_identifier": logpush_identifier,
-        "logpush_transformer_code": logpush_transformer_code,
         "logpush_transformer_preview_request": logpush_transformer_preview_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_transformer_preview_response",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer_preview_response": logpush_transformer_preview_response_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer_preview_response": logpush_transformer_preview_response,
       },
     },
     annotations: {
@@ -451,10 +451,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer_preview_response": logpush_transformer_preview_response_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer_preview_response": logpush_transformer_preview_response,
       },
     },
     request: (args) => ({
@@ -465,48 +465,49 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_transformers_update",
     title: "Update transformer",
-    description: "Updates an existing custom log transformer. When `code` is provided, the SQL query is validated and a new version is created. When `code` is omitted, only the name and description are updated. Omitting `description` clears the existing description.",
+    description: "Updates an existing custom log transformer. When `code` is provided, the SQL query is validated and a new version is created. When `code` is omitted, only the name and description are updated. Omitting `description` clears the existing description.\n\nPUT /accounts/{account_id}/logpush/transformers/{transformer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/logpush_transformer_update_request"
         },
-        "transformer_id": {
-          "$ref": "#/$defs/logpush_transformer_identifier",
-          "description": "The transformer ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "transformer_id": {
+              "description": "The transformer ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "transformer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "transformer_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "logpush_identifier": logpush_identifier,
-        "logpush_transformer_code": logpush_transformer_code,
-        "logpush_transformer_description": logpush_transformer_description,
-        "logpush_transformer_identifier": logpush_transformer_identifier,
-        "logpush_transformer_name": logpush_transformer_name,
         "logpush_transformer_update_request": logpush_transformer_update_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_transformer_response_single",
       $defs: {
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer": logpush_transformer_output,
-        "logpush_transformer_dataset": logpush_transformer_dataset_output,
-        "logpush_transformer_description": logpush_transformer_description_output,
-        "logpush_transformer_identifier": logpush_transformer_identifier_output,
-        "logpush_transformer_job_ref": logpush_transformer_job_ref_output,
-        "logpush_transformer_name": logpush_transformer_name_output,
-        "logpush_transformer_response_single": logpush_transformer_response_single_output,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer": logpush_transformer,
+        "logpush_transformer_job_ref": logpush_transformer_job_ref,
+        "logpush_transformer_response_single": logpush_transformer_response_single,
       },
     },
     annotations: {
@@ -544,16 +545,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_api-response-single": logpush_api_response_single_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer": logpush_transformer_output,
-        "logpush_transformer_dataset": logpush_transformer_dataset_output,
-        "logpush_transformer_description": logpush_transformer_description_output,
-        "logpush_transformer_identifier": logpush_transformer_identifier_output,
-        "logpush_transformer_job_ref": logpush_transformer_job_ref_output,
-        "logpush_transformer_name": logpush_transformer_name_output,
-        "logpush_transformer_response_single": logpush_transformer_response_single_output,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_api-response-single": logpush_api$$response$$single,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer": logpush_transformer,
+        "logpush_transformer_job_ref": logpush_transformer_job_ref,
+        "logpush_transformer_response_single": logpush_transformer_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logpush/transformers/versions/outputs.ts b/src/generated/forge-mcp/logpush/transformers/versions/outputs.ts
index fca398843..20ff84942 100644
--- a/src/generated/forge-mcp/logpush/transformers/versions/outputs.ts
+++ b/src/generated/forge-mcp/logpush/transformers/versions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `logpush_transformer_version` in responses.
  */
-export const logpush_transformer_version_output: JsonSchema = {
+export const logpush_transformer_version: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -25,7 +25,7 @@ export const logpush_transformer_version_output: JsonSchema = {
 /**
  * The schema of `logpush_transformer_version_response_collection` in responses.
  */
-export const logpush_transformer_version_response_collection_output: JsonSchema = {
+export const logpush_transformer_version_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logpush_api-response-common"
diff --git a/src/generated/forge-mcp/logpush/transformers/versions/tools.ts b/src/generated/forge-mcp/logpush/transformers/versions/tools.ts
index 0e9b79ed8..8bbeee08b 100644
--- a/src/generated/forge-mcp/logpush/transformers/versions/tools.ts
+++ b/src/generated/forge-mcp/logpush/transformers/versions/tools.ts
@@ -1,17 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  logpush_api_response_common_failure_output,
-  logpush_api_response_common_output,
-  logpush_messages_output,
+  logpush_api$$response$$common,
+  logpush_api$$response$$common$$failure,
+  logpush_messages,
 } from "../../outputs.js";
-import { logpush_identifier } from "../../schemas.js";
-import { logpush_transformer_identifier } from "../schemas.js";
 import {
-  logpush_transformer_version_output,
-  logpush_transformer_version_response_collection_output,
+  logpush_transformer_version,
+  logpush_transformer_version_response_collection,
 } from "./outputs.js";
 
 /**
@@ -21,40 +19,52 @@ export const tools: readonly Tool[] = [
   {
     name: "logpush_transformers_versions_list",
     title: "List transformer versions",
-    description: "Returns version metadata for a transformer, newest first. Each version corresponds to a SQL query update.",
+    description: "Returns version metadata for a transformer, newest first. Each version corresponds to a SQL query update.\n\nGET /accounts/{account_id}/logpush/transformers/{transformer_id}/versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpush_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "transformer_id": {
+              "description": "The transformer ID.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "account_id",
+            "transformer_id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "default": 10,
-          "description": "Maximum number of versions to return.",
-          "type": "integer"
-        },
-        "transformer_id": {
-          "$ref": "#/$defs/logpush_transformer_identifier",
-          "description": "The transformer ID."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "default": 10,
+              "description": "Maximum number of versions to return.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "transformer_id"
+        "path"
       ],
-      $defs: {
-        "logpush_identifier": logpush_identifier,
-        "logpush_transformer_identifier": logpush_transformer_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logpush_transformer_version_response_collection",
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer_version": logpush_transformer_version_output,
-        "logpush_transformer_version_response_collection": logpush_transformer_version_response_collection_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer_version": logpush_transformer_version,
+        "logpush_transformer_version_response_collection": logpush_transformer_version_response_collection,
       },
     },
     annotations: {
@@ -92,17 +102,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logpush_api-response-common": logpush_api_response_common_output,
-        "logpush_api-response-common-failure": logpush_api_response_common_failure_output,
-        "logpush_messages": logpush_messages_output,
-        "logpush_transformer_version": logpush_transformer_version_output,
-        "logpush_transformer_version_response_collection": logpush_transformer_version_response_collection_output,
+        "logpush_api-response-common": logpush_api$$response$$common,
+        "logpush_api-response-common-failure": logpush_api$$response$$common$$failure,
+        "logpush_messages": logpush_messages,
+        "logpush_transformer_version": logpush_transformer_version,
+        "logpush_transformer_version_response_collection": logpush_transformer_version_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/logpush/transformers/${pathParam(args, "transformer_id")}/versions`,
       query: [
-        ["limit", args["limit"], true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/logs/control/cmb/config/outputs.ts b/src/generated/forge-mcp/logs/control/cmb/config/outputs.ts
index 1743dbc98..9dfa387cf 100644
--- a/src/generated/forge-mcp/logs/control/cmb/config/outputs.ts
+++ b/src/generated/forge-mcp/logs/control/cmb/config/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `logcontrol_allow_out_of_region_access` in responses.
- */
-export const logcontrol_allow_out_of_region_access_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `logcontrol_api-response-common` in responses.
  */
-export const logcontrol_api_response_common_output: JsonSchema = {
+export const logcontrol_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/logcontrol_messages"
@@ -39,15 +32,15 @@ export const logcontrol_api_response_common_output: JsonSchema = {
 /**
  * The schema of `logcontrol_cmb_config` in responses.
  */
-export const logcontrol_cmb_config_output: JsonSchema = {
+export const logcontrol_cmb_config: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "allow_out_of_region_access": {
-          "$ref": "#/$defs/logcontrol_allow_out_of_region_access"
+          "type": "boolean"
         },
         "regions": {
-          "$ref": "#/$defs/logcontrol_regions"
+          "type": "string"
         }
       },
       "type": "object"
@@ -61,7 +54,7 @@ export const logcontrol_cmb_config_output: JsonSchema = {
 /**
  * The schema of `logcontrol_cmb_config_response_single` in responses.
  */
-export const logcontrol_cmb_config_response_single_output: JsonSchema = {
+export const logcontrol_cmb_config_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logcontrol_api-response-single"
@@ -83,10 +76,3 @@ export const logcontrol_cmb_config_response_single_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `logcontrol_regions` in responses.
- */
-export const logcontrol_regions_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/logs/control/cmb/config/schemas.ts b/src/generated/forge-mcp/logs/control/cmb/config/schemas.ts
index 6d69433f0..cac02645f 100644
--- a/src/generated/forge-mcp/logs/control/cmb/config/schemas.ts
+++ b/src/generated/forge-mcp/logs/control/cmb/config/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `logcontrol_allow_out_of_region_access`.
- */
-export const logcontrol_allow_out_of_region_access: JsonSchema = {
-  "description": "Allow out of region access",
-  "type": "boolean"
-};
-
 /**
  * The schema of `logcontrol_cmb_config`.
  */
@@ -19,12 +11,12 @@ export const logcontrol_cmb_config: JsonSchema = {
     {
       "properties": {
         "allow_out_of_region_access": {
-          "$ref": "#/$defs/logcontrol_allow_out_of_region_access",
-          "description": "Allow out of region access"
+          "description": "Allow out of region access",
+          "type": "boolean"
         },
         "regions": {
-          "$ref": "#/$defs/logcontrol_regions",
-          "description": "Name of the region."
+          "description": "Name of the region.",
+          "type": "string"
         }
       },
       "type": "object"
@@ -34,11 +26,3 @@ export const logcontrol_cmb_config: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `logcontrol_regions`.
- */
-export const logcontrol_regions: JsonSchema = {
-  "description": "Name of the region.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/logs/control/cmb/config/tools.ts b/src/generated/forge-mcp/logs/control/cmb/config/tools.ts
index 4fb2fc1f4..fe159941e 100644
--- a/src/generated/forge-mcp/logs/control/cmb/config/tools.ts
+++ b/src/generated/forge-mcp/logs/control/cmb/config/tools.ts
@@ -3,23 +3,16 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  logcontrol_api_response_common_failure_output,
-  logcontrol_api_response_single_output,
-  logcontrol_messages_output,
+  logcontrol_api$$response$$common$$failure,
+  logcontrol_api$$response$$single,
+  logcontrol_messages,
 } from "../../outputs.js";
-import { logcontrol_identifier } from "../../schemas.js";
 import {
-  logcontrol_allow_out_of_region_access_output,
-  logcontrol_api_response_common_output,
-  logcontrol_cmb_config_output,
-  logcontrol_cmb_config_response_single_output,
-  logcontrol_regions_output,
-} from "./outputs.js";
-import {
-  logcontrol_allow_out_of_region_access,
+  logcontrol_api$$response$$common,
   logcontrol_cmb_config,
-  logcontrol_regions,
-} from "./schemas.js";
+  logcontrol_cmb_config_response_single,
+} from "./outputs.js";
+import { logcontrol_cmb_config as logcontrol_cmb_config$ } from "./schemas.js";
 
 /**
  * The tools of `logs.control.cmb.config`.
@@ -28,38 +21,43 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_control_cmb_config_create",
     title: "Update CMB config",
-    description: "Updates CMB config.\n\nThis method is deprecated.",
+    description: "Updates CMB config.\n\nThis method is deprecated.\n\nPOST /accounts/{account_id}/logs/control/cmb/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logcontrol_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/logcontrol_cmb_config"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "logcontrol_allow_out_of_region_access": logcontrol_allow_out_of_region_access,
-        "logcontrol_cmb_config": logcontrol_cmb_config,
-        "logcontrol_identifier": logcontrol_identifier,
-        "logcontrol_regions": logcontrol_regions,
+        "logcontrol_cmb_config": logcontrol_cmb_config$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/logcontrol_cmb_config_response_single",
       $defs: {
-        "logcontrol_allow_out_of_region_access": logcontrol_allow_out_of_region_access_output,
-        "logcontrol_api-response-single": logcontrol_api_response_single_output,
-        "logcontrol_cmb_config": logcontrol_cmb_config_output,
-        "logcontrol_cmb_config_response_single": logcontrol_cmb_config_response_single_output,
-        "logcontrol_messages": logcontrol_messages_output,
-        "logcontrol_regions": logcontrol_regions_output,
+        "logcontrol_api-response-single": logcontrol_api$$response$$single,
+        "logcontrol_cmb_config": logcontrol_cmb_config,
+        "logcontrol_cmb_config_response_single": logcontrol_cmb_config_response_single,
+        "logcontrol_messages": logcontrol_messages,
       },
     },
     annotations: {
@@ -91,13 +89,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logcontrol_allow_out_of_region_access": logcontrol_allow_out_of_region_access_output,
-        "logcontrol_api-response-common-failure": logcontrol_api_response_common_failure_output,
-        "logcontrol_api-response-single": logcontrol_api_response_single_output,
-        "logcontrol_cmb_config": logcontrol_cmb_config_output,
-        "logcontrol_cmb_config_response_single": logcontrol_cmb_config_response_single_output,
-        "logcontrol_messages": logcontrol_messages_output,
-        "logcontrol_regions": logcontrol_regions_output,
+        "logcontrol_api-response-common-failure": logcontrol_api$$response$$common$$failure,
+        "logcontrol_api-response-single": logcontrol_api$$response$$single,
+        "logcontrol_cmb_config": logcontrol_cmb_config,
+        "logcontrol_cmb_config_response_single": logcontrol_cmb_config_response_single,
+        "logcontrol_messages": logcontrol_messages,
       },
     },
     request: (args) => ({
@@ -108,21 +104,28 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_control_cmb_config_delete",
     title: "Delete CMB config",
-    description: "Deletes CMB config.\n\nThis method is deprecated.\n\nConfirm with the user before calling this tool. This operation deletes the CMB config.",
+    description: "Deletes CMB config.\n\nThis method is deprecated.\n\nConfirm with the user before calling this tool. This operation deletes the CMB config.\n\nDELETE /accounts/{account_id}/logs/control/cmb/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logcontrol_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "logcontrol_identifier": logcontrol_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -139,8 +142,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "logcontrol_api-response-common": logcontrol_api_response_common_output,
-        "logcontrol_messages": logcontrol_messages_output,
+        "logcontrol_api-response-common": logcontrol_api$$response$$common,
+        "logcontrol_messages": logcontrol_messages,
       },
     },
     annotations: {
@@ -184,9 +187,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logcontrol_api-response-common": logcontrol_api_response_common_output,
-        "logcontrol_api-response-common-failure": logcontrol_api_response_common_failure_output,
-        "logcontrol_messages": logcontrol_messages_output,
+        "logcontrol_api-response-common": logcontrol_api$$response$$common,
+        "logcontrol_api-response-common-failure": logcontrol_api$$response$$common$$failure,
+        "logcontrol_messages": logcontrol_messages,
       },
     },
     request: (args) => ({
@@ -196,31 +199,36 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_control_cmb_config_get",
     title: "Get CMB config",
-    description: "Gets CMB config.\n\nThis method is deprecated.",
+    description: "Gets CMB config.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/logs/control/cmb/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logcontrol_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "logcontrol_identifier": logcontrol_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logcontrol_cmb_config_response_single",
       $defs: {
-        "logcontrol_allow_out_of_region_access": logcontrol_allow_out_of_region_access_output,
-        "logcontrol_api-response-single": logcontrol_api_response_single_output,
-        "logcontrol_cmb_config": logcontrol_cmb_config_output,
-        "logcontrol_cmb_config_response_single": logcontrol_cmb_config_response_single_output,
-        "logcontrol_messages": logcontrol_messages_output,
-        "logcontrol_regions": logcontrol_regions_output,
+        "logcontrol_api-response-single": logcontrol_api$$response$$single,
+        "logcontrol_cmb_config": logcontrol_cmb_config,
+        "logcontrol_cmb_config_response_single": logcontrol_cmb_config_response_single,
+        "logcontrol_messages": logcontrol_messages,
       },
     },
     annotations: {
@@ -254,13 +262,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logcontrol_allow_out_of_region_access": logcontrol_allow_out_of_region_access_output,
-        "logcontrol_api-response-common-failure": logcontrol_api_response_common_failure_output,
-        "logcontrol_api-response-single": logcontrol_api_response_single_output,
-        "logcontrol_cmb_config": logcontrol_cmb_config_output,
-        "logcontrol_cmb_config_response_single": logcontrol_cmb_config_response_single_output,
-        "logcontrol_messages": logcontrol_messages_output,
-        "logcontrol_regions": logcontrol_regions_output,
+        "logcontrol_api-response-common-failure": logcontrol_api$$response$$common$$failure,
+        "logcontrol_api-response-single": logcontrol_api$$response$$single,
+        "logcontrol_cmb_config": logcontrol_cmb_config,
+        "logcontrol_cmb_config_response_single": logcontrol_cmb_config_response_single,
+        "logcontrol_messages": logcontrol_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logs/control/outputs.ts b/src/generated/forge-mcp/logs/control/outputs.ts
index bb48781c4..fb4e06cb3 100644
--- a/src/generated/forge-mcp/logs/control/outputs.ts
+++ b/src/generated/forge-mcp/logs/control/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `logcontrol_api-response-common-failure` in responses.
  */
-export const logcontrol_api_response_common_failure_output: JsonSchema = {
+export const logcontrol_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/logcontrol_messages"
@@ -36,7 +36,7 @@ export const logcontrol_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `logcontrol_api-response-single` in responses.
  */
-export const logcontrol_api_response_single_output: JsonSchema = {
+export const logcontrol_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/logcontrol_messages"
@@ -62,7 +62,7 @@ export const logcontrol_api_response_single_output: JsonSchema = {
 /**
  * The schema of `logcontrol_messages` in responses.
  */
-export const logcontrol_messages_output: JsonSchema = {
+export const logcontrol_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/logs/control/retention/outputs.ts b/src/generated/forge-mcp/logs/control/retention/outputs.ts
index f956f4685..2b465fed1 100644
--- a/src/generated/forge-mcp/logs/control/retention/outputs.ts
+++ b/src/generated/forge-mcp/logs/control/retention/outputs.ts
@@ -3,22 +3,15 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `logcontrol_flag` in responses.
- */
-export const logcontrol_flag_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `logcontrol_retention_flag` in responses.
  */
-export const logcontrol_retention_flag_output: JsonSchema = {
+export const logcontrol_retention_flag: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "flag": {
-          "$ref": "#/$defs/logcontrol_flag"
+          "type": "boolean"
         }
       },
       "type": "object"
@@ -32,7 +25,7 @@ export const logcontrol_retention_flag_output: JsonSchema = {
 /**
  * The schema of `logcontrol_retention_flag_response_single` in responses.
  */
-export const logcontrol_retention_flag_response_single_output: JsonSchema = {
+export const logcontrol_retention_flag_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/logcontrol_api-response-single"
diff --git a/src/generated/forge-mcp/logs/control/retention/schemas.ts b/src/generated/forge-mcp/logs/control/retention/schemas.ts
index f69d77fd8..59858b7b1 100644
--- a/src/generated/forge-mcp/logs/control/retention/schemas.ts
+++ b/src/generated/forge-mcp/logs/control/retention/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `logcontrol_flag`.
- */
-export const logcontrol_flag: JsonSchema = {
-  "description": "The log retention flag for Logpull API.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `logcontrol_retention_flag`.
  */
@@ -19,8 +11,8 @@ export const logcontrol_retention_flag: JsonSchema = {
     {
       "properties": {
         "flag": {
-          "$ref": "#/$defs/logcontrol_flag",
-          "description": "The log retention flag for Logpull API."
+          "description": "The log retention flag for Logpull API.",
+          "type": "boolean"
         }
       },
       "type": "object"
diff --git a/src/generated/forge-mcp/logs/control/retention/tools.ts b/src/generated/forge-mcp/logs/control/retention/tools.ts
index 3f96c1bbc..15a047b13 100644
--- a/src/generated/forge-mcp/logs/control/retention/tools.ts
+++ b/src/generated/forge-mcp/logs/control/retention/tools.ts
@@ -3,17 +3,15 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  logcontrol_api_response_common_failure_output,
-  logcontrol_api_response_single_output,
-  logcontrol_messages_output,
+  logcontrol_api$$response$$common$$failure,
+  logcontrol_api$$response$$single,
+  logcontrol_messages,
 } from "../outputs.js";
-import { logcontrol_identifier } from "../schemas.js";
 import {
-  logcontrol_flag_output,
-  logcontrol_retention_flag_output,
-  logcontrol_retention_flag_response_single_output,
+  logcontrol_retention_flag,
+  logcontrol_retention_flag_response_single,
 } from "./outputs.js";
-import { logcontrol_flag, logcontrol_retention_flag } from "./schemas.js";
+import { logcontrol_retention_flag as logcontrol_retention_flag$ } from "./schemas.js";
 
 /**
  * The tools of `logs.control.retention`.
@@ -22,36 +20,43 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_control_retention_create",
     title: "Update log retention flag",
-    description: "Updates log retention flag for Logpull API.\n\nThis method is deprecated.",
+    description: "Updates log retention flag for Logpull API.\n\nThis method is deprecated.\n\nPOST /zones/{zone_id}/logs/control/retention/flag",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/logcontrol_retention_flag"
         },
-        "zone_id": {
-          "$ref": "#/$defs/logcontrol_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "logcontrol_flag": logcontrol_flag,
-        "logcontrol_identifier": logcontrol_identifier,
-        "logcontrol_retention_flag": logcontrol_retention_flag,
+        "logcontrol_retention_flag": logcontrol_retention_flag$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/logcontrol_retention_flag_response_single",
       $defs: {
-        "logcontrol_api-response-single": logcontrol_api_response_single_output,
-        "logcontrol_flag": logcontrol_flag_output,
-        "logcontrol_messages": logcontrol_messages_output,
-        "logcontrol_retention_flag": logcontrol_retention_flag_output,
-        "logcontrol_retention_flag_response_single": logcontrol_retention_flag_response_single_output,
+        "logcontrol_api-response-single": logcontrol_api$$response$$single,
+        "logcontrol_messages": logcontrol_messages,
+        "logcontrol_retention_flag": logcontrol_retention_flag,
+        "logcontrol_retention_flag_response_single": logcontrol_retention_flag_response_single,
       },
     },
     annotations: {
@@ -89,12 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logcontrol_api-response-common-failure": logcontrol_api_response_common_failure_output,
-        "logcontrol_api-response-single": logcontrol_api_response_single_output,
-        "logcontrol_flag": logcontrol_flag_output,
-        "logcontrol_messages": logcontrol_messages_output,
-        "logcontrol_retention_flag": logcontrol_retention_flag_output,
-        "logcontrol_retention_flag_response_single": logcontrol_retention_flag_response_single_output,
+        "logcontrol_api-response-common-failure": logcontrol_api$$response$$common$$failure,
+        "logcontrol_api-response-single": logcontrol_api$$response$$single,
+        "logcontrol_messages": logcontrol_messages,
+        "logcontrol_retention_flag": logcontrol_retention_flag,
+        "logcontrol_retention_flag_response_single": logcontrol_retention_flag_response_single,
       },
     },
     request: (args) => ({
@@ -105,30 +109,36 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_control_retention_get",
     title: "Get log retention flag",
-    description: "Gets log retention flag for Logpull API.\n\nThis method is deprecated.",
+    description: "Gets log retention flag for Logpull API.\n\nThis method is deprecated.\n\nGET /zones/{zone_id}/logs/control/retention/flag",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/logcontrol_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "logcontrol_identifier": logcontrol_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logcontrol_retention_flag_response_single",
       $defs: {
-        "logcontrol_api-response-single": logcontrol_api_response_single_output,
-        "logcontrol_flag": logcontrol_flag_output,
-        "logcontrol_messages": logcontrol_messages_output,
-        "logcontrol_retention_flag": logcontrol_retention_flag_output,
-        "logcontrol_retention_flag_response_single": logcontrol_retention_flag_response_single_output,
+        "logcontrol_api-response-single": logcontrol_api$$response$$single,
+        "logcontrol_messages": logcontrol_messages,
+        "logcontrol_retention_flag": logcontrol_retention_flag,
+        "logcontrol_retention_flag_response_single": logcontrol_retention_flag_response_single,
       },
     },
     annotations: {
@@ -168,12 +178,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logcontrol_api-response-common-failure": logcontrol_api_response_common_failure_output,
-        "logcontrol_api-response-single": logcontrol_api_response_single_output,
-        "logcontrol_flag": logcontrol_flag_output,
-        "logcontrol_messages": logcontrol_messages_output,
-        "logcontrol_retention_flag": logcontrol_retention_flag_output,
-        "logcontrol_retention_flag_response_single": logcontrol_retention_flag_response_single_output,
+        "logcontrol_api-response-common-failure": logcontrol_api$$response$$common$$failure,
+        "logcontrol_api-response-single": logcontrol_api$$response$$single,
+        "logcontrol_messages": logcontrol_messages,
+        "logcontrol_retention_flag": logcontrol_retention_flag,
+        "logcontrol_retention_flag_response_single": logcontrol_retention_flag_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logs/control/schemas.ts b/src/generated/forge-mcp/logs/control/schemas.ts
deleted file mode 100644
index 2931d8941..000000000
--- a/src/generated/forge-mcp/logs/control/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `logcontrol_identifier`.
- */
-export const logcontrol_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/logs/datasets/outputs.ts b/src/generated/forge-mcp/logs/datasets/outputs.ts
index 599370969..9c974ee49 100644
--- a/src/generated/forge-mcp/logs/datasets/outputs.ts
+++ b/src/generated/forge-mcp/logs/datasets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `lex_AvailableDestination` in responses.
  */
-export const lex_AvailableDestination_output: JsonSchema = {
+export const lex_AvailableDestination: JsonSchema = {
   "properties": {
     "dataset": {
       "type": "string"
@@ -54,7 +54,7 @@ export const lex_AvailableDestination_output: JsonSchema = {
 /**
  * The schema of `lex_AvailableDestinationListResponse` in responses.
  */
-export const lex_AvailableDestinationListResponse_output: JsonSchema = {
+export const lex_AvailableDestinationListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -96,7 +96,7 @@ export const lex_AvailableDestinationListResponse_output: JsonSchema = {
 /**
  * The schema of `lex_DatasetDetailResponse` in responses.
  */
-export const lex_DatasetDetailResponse_output: JsonSchema = {
+export const lex_DatasetDetailResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -128,7 +128,7 @@ export const lex_DatasetDetailResponse_output: JsonSchema = {
 /**
  * The schema of `lex_DatasetResponse` in responses.
  */
-export const lex_DatasetResponse_output: JsonSchema = {
+export const lex_DatasetResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/lex_DatasetSummary"
@@ -159,7 +159,7 @@ export const lex_DatasetResponse_output: JsonSchema = {
 /**
  * The schema of `lex_DatasetSummary` in responses.
  */
-export const lex_DatasetSummary_output: JsonSchema = {
+export const lex_DatasetSummary: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -208,7 +208,7 @@ export const lex_DatasetSummary_output: JsonSchema = {
 /**
  * The schema of `lex_DatasetSummaryListResponse` in responses.
  */
-export const lex_DatasetSummaryListResponse_output: JsonSchema = {
+export const lex_DatasetSummaryListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -250,7 +250,7 @@ export const lex_DatasetSummaryListResponse_output: JsonSchema = {
 /**
  * The schema of `lex_ErrorResponse-2` in responses.
  */
-export const lex_ErrorResponse_2_output: JsonSchema = {
+export const lex_ErrorResponse$$2: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -293,7 +293,7 @@ export const lex_ErrorResponse_2_output: JsonSchema = {
 /**
  * The schema of `lex_LogField` in responses.
  */
-export const lex_LogField_output: JsonSchema = {
+export const lex_LogField: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -312,7 +312,7 @@ export const lex_LogField_output: JsonSchema = {
 /**
  * The schema of `lex_V4Error-2` in responses.
  */
-export const lex_V4Error_2_output: JsonSchema = {
+export const lex_V4Error$$2: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/logs/datasets/schemas.ts b/src/generated/forge-mcp/logs/datasets/schemas.ts
index baab4599e..e2760e8bc 100644
--- a/src/generated/forge-mcp/logs/datasets/schemas.ts
+++ b/src/generated/forge-mcp/logs/datasets/schemas.ts
@@ -13,18 +13,18 @@ export const lex_CreateDatasetRequest: JsonSchema = {
       "type": "string"
     },
     "fields": {
-      "description": "Controls which fields the API ingests. Defaults to all available\nfields when absent.\n",
+      "description": "Controls which fields the API ingests. Defaults to all available\nfields when absent.",
       "items": {
         "$ref": "#/$defs/lex_LogField"
       },
       "type": "array"
     },
     "filter": {
-      "description": "Optional Logpush filter predicate to restrict which events are ingested.\nSee [Logpush filters](https://developers.cloudflare.com/logs/reference/filters/)\nfor syntax and examples.\n",
+      "description": "Optional Logpush filter predicate to restrict which events are ingested.\nSee [Logpush filters](https://developers.cloudflare.com/logs/reference/filters/)\nfor syntax and examples.",
       "type": "string"
     },
     "filter_attack_traffic": {
-      "description": "Whether to filter attack traffic from the Logpush job. Defaults to\n`true` for supported datasets when omitted. Supported datasets are\n`http_requests`, `firewall_events`, and `network_analytics_logs`.\n",
+      "description": "Whether to filter attack traffic from the Logpush job. Defaults to\n`true` for supported datasets when omitted. Supported datasets are\n`http_requests`, `firewall_events`, and `network_analytics_logs`.",
       "type": "boolean"
     }
   },
@@ -69,14 +69,14 @@ export const lex_UpdateDatasetRequest: JsonSchema = {
       "type": "boolean"
     },
     "fields": {
-      "description": "Controls which fields the API ingests after the update. Defaults\nto all available fields when absent.\n",
+      "description": "Controls which fields the API ingests after the update. Defaults\nto all available fields when absent.",
       "items": {
         "$ref": "#/$defs/lex_LogField"
       },
       "type": "array"
     },
     "filter": {
-      "description": "Optional Logpush filter predicate to restrict which events are\ningested. If omitted, the existing filter is left unchanged. Set\nto an empty string (`\"\"`) to clear the filter. Otherwise,\nreplaces the dataset's filter entirely.\nSee [Logpush filters](https://developers.cloudflare.com/logs/reference/filters/)\nfor syntax and examples.\n",
+      "description": "Optional Logpush filter predicate to restrict which events are\ningested. If omitted, the existing filter is left unchanged. Set\nto an empty string (`\"\"`) to clear the filter. Otherwise,\nreplaces the dataset's filter entirely.\nSee [Logpush filters](https://developers.cloudflare.com/logs/reference/filters/)\nfor syntax and examples.",
       "oneOf": [
         {
           "type": "string"
@@ -87,7 +87,7 @@ export const lex_UpdateDatasetRequest: JsonSchema = {
       ]
     },
     "filter_attack_traffic": {
-      "description": "Whether to filter attack traffic from the Logpush job. If omitted,\nthe existing setting is left unchanged. Supported datasets are\n`http_requests`, `firewall_events`, and `network_analytics_logs`.\n",
+      "description": "Whether to filter attack traffic from the Logpush job. If omitted,\nthe existing setting is left unchanged. Supported datasets are\n`http_requests`, `firewall_events`, and `network_analytics_logs`.",
       "type": "boolean"
     }
   },
diff --git a/src/generated/forge-mcp/logs/datasets/tools.ts b/src/generated/forge-mcp/logs/datasets/tools.ts
index dbaa07de1..c874d5746 100644
--- a/src/generated/forge-mcp/logs/datasets/tools.ts
+++ b/src/generated/forge-mcp/logs/datasets/tools.ts
@@ -1,21 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  lex_AvailableDestinationListResponse_output,
-  lex_AvailableDestination_output,
-  lex_DatasetDetailResponse_output,
-  lex_DatasetResponse_output,
-  lex_DatasetSummaryListResponse_output,
-  lex_DatasetSummary_output,
-  lex_ErrorResponse_2_output,
-  lex_LogField_output,
-  lex_V4Error_2_output,
+  lex_AvailableDestination,
+  lex_AvailableDestinationListResponse,
+  lex_DatasetDetailResponse,
+  lex_DatasetResponse,
+  lex_DatasetSummary,
+  lex_DatasetSummaryListResponse,
+  lex_ErrorResponse$$2,
+  lex_LogField,
+  lex_V4Error$$2,
 } from "./outputs.js";
 import {
   lex_CreateDatasetRequest,
-  lex_LogField,
+  lex_LogField as lex_LogField$,
   lex_UpdateDatasetRequest,
 } from "./schemas.js";
 
@@ -26,34 +26,44 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_datasets_available",
     title: "List available account or zone datasets",
-    description: "Returns all dataset types that this account or zone can create. Each entry\nincludes the dataset schema and timestamp field.\n\nThe schema shows all possible fields for a dataset. However, not all\nfields may be available for your account or zone. When creating or updating a\ndataset, only fields available to your account or zone can be enabled. If you\nrequest a field that is not available, you will receive an error.",
+    description: "Returns all dataset types that this account or zone can create. Each entry\nincludes the dataset schema and timestamp field.\n\nThe schema shows all possible fields for a dataset. However, not all\nfields may be available for your account or zone. When creating or updating a\ndataset, only fields available to your account or zone can be enabled. If you\nrequest a field that is not available, you will receive an error.\n\nGET /{account_or_zone}/{account_or_zone_id}/logs/explorer/datasets/available",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "description": "The account ID or zone ID, as selected by account_or_zone.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lex_AvailableDestinationListResponse",
       $defs: {
-        "lex_AvailableDestination": lex_AvailableDestination_output,
-        "lex_AvailableDestinationListResponse": lex_AvailableDestinationListResponse_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_AvailableDestination": lex_AvailableDestination,
+        "lex_AvailableDestinationListResponse": lex_AvailableDestinationListResponse,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     annotations: {
@@ -87,10 +97,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lex_AvailableDestination": lex_AvailableDestination_output,
-        "lex_AvailableDestinationListResponse": lex_AvailableDestinationListResponse_output,
-        "lex_ErrorResponse-2": lex_ErrorResponse_2_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_AvailableDestination": lex_AvailableDestination,
+        "lex_AvailableDestinationListResponse": lex_AvailableDestinationListResponse,
+        "lex_ErrorResponse-2": lex_ErrorResponse$$2,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     request: (args) => ({
@@ -100,44 +110,54 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_datasets_create",
     title: "Create an account or zone dataset",
-    description: "Create a new Log Explorer dataset for the account or zone.\n\nList available account or zone datasets to see the dataset types and fields you\ncan use.\n\nThe `fields` property is optional. If not specified, all available fields\nwill be enabled.\n\nFor dataset field definitions, see: https://developers.cloudflare.com/logs/logpush/logpush-job/datasets/",
+    description: "Create a new Log Explorer dataset for the account or zone.\n\nList available account or zone datasets to see the dataset types and fields you\ncan use.\n\nThe `fields` property is optional. If not specified, all available fields\nwill be enabled.\n\nFor dataset field definitions, see: https://developers.cloudflare.com/logs/logpush/logpush-job/datasets/\n\nPOST /{account_or_zone}/{account_or_zone_id}/logs/explorer/datasets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "description": "The account ID or zone ID, as selected by account_or_zone.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/lex_CreateDatasetRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "lex_CreateDatasetRequest": lex_CreateDatasetRequest,
-        "lex_LogField": lex_LogField,
+        "lex_LogField": lex_LogField$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/lex_DatasetDetailResponse",
       $defs: {
-        "lex_DatasetDetailResponse": lex_DatasetDetailResponse_output,
-        "lex_DatasetResponse": lex_DatasetResponse_output,
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_LogField": lex_LogField_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetDetailResponse": lex_DatasetDetailResponse,
+        "lex_DatasetResponse": lex_DatasetResponse,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_LogField": lex_LogField,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     annotations: {
@@ -173,12 +193,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lex_DatasetDetailResponse": lex_DatasetDetailResponse_output,
-        "lex_DatasetResponse": lex_DatasetResponse_output,
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_ErrorResponse-2": lex_ErrorResponse_2_output,
-        "lex_LogField": lex_LogField_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetDetailResponse": lex_DatasetDetailResponse,
+        "lex_DatasetResponse": lex_DatasetResponse,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_ErrorResponse-2": lex_ErrorResponse$$2,
+        "lex_LogField": lex_LogField,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     request: (args) => ({
@@ -189,41 +209,51 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_datasets_delete",
     title: "Delete an account or zone dataset",
-    description: "Deletes a Log Explorer dataset for the account or zone. Dataset deletion must not\nbe protected.\n\nConfirm with the user before calling this tool. This operation deletes a Log Explorer dataset for the account.",
+    description: "Deletes a Log Explorer dataset for the account or zone. Dataset deletion must not\nbe protected.\n\nConfirm with the user before calling this tool. This operation deletes a Log Explorer dataset for the account.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/logs/explorer/datasets/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Log Explorer dataset ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "dataset_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "description": "The account ID or zone ID, as selected by account_or_zone.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Log Explorer dataset ID.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lex_DatasetDetailResponse",
       $defs: {
-        "lex_DatasetDetailResponse": lex_DatasetDetailResponse_output,
-        "lex_DatasetResponse": lex_DatasetResponse_output,
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_LogField": lex_LogField_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetDetailResponse": lex_DatasetDetailResponse,
+        "lex_DatasetResponse": lex_DatasetResponse,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_LogField": lex_LogField,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     annotations: {
@@ -254,12 +284,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lex_DatasetDetailResponse": lex_DatasetDetailResponse_output,
-        "lex_DatasetResponse": lex_DatasetResponse_output,
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_ErrorResponse-2": lex_ErrorResponse_2_output,
-        "lex_LogField": lex_LogField_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetDetailResponse": lex_DatasetDetailResponse,
+        "lex_DatasetResponse": lex_DatasetResponse,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_ErrorResponse-2": lex_ErrorResponse$$2,
+        "lex_LogField": lex_LogField,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     request: (args) => ({
@@ -269,41 +299,51 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_datasets_get",
     title: "Get an account or zone dataset",
-    description: "Retrieve a single Log Explorer dataset by ID for the account or zone.",
+    description: "Retrieve a single Log Explorer dataset by ID for the account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/logs/explorer/datasets/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Log Explorer dataset ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "dataset_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "description": "The account ID or zone ID, as selected by account_or_zone.",
-          "type": "string"
-        },
-        "dataset_id": {
-          "description": "Log Explorer dataset ID.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lex_DatasetDetailResponse",
       $defs: {
-        "lex_DatasetDetailResponse": lex_DatasetDetailResponse_output,
-        "lex_DatasetResponse": lex_DatasetResponse_output,
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_LogField": lex_LogField_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetDetailResponse": lex_DatasetDetailResponse,
+        "lex_DatasetResponse": lex_DatasetResponse,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_LogField": lex_LogField,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     annotations: {
@@ -336,12 +376,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lex_DatasetDetailResponse": lex_DatasetDetailResponse_output,
-        "lex_DatasetResponse": lex_DatasetResponse_output,
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_ErrorResponse-2": lex_ErrorResponse_2_output,
-        "lex_LogField": lex_LogField_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetDetailResponse": lex_DatasetDetailResponse,
+        "lex_DatasetResponse": lex_DatasetResponse,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_ErrorResponse-2": lex_ErrorResponse$$2,
+        "lex_LogField": lex_LogField,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     request: (args) => ({
@@ -351,38 +391,54 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_datasets_list",
     title: "List account or zone datasets",
-    description: "Returns all Log Explorer datasets configured for the account or zone.\n\nPass `include_zones=true` to also include zone-level datasets that\nbelong to this account or zone. List responses omit the `fields` property;\nuse the single-dataset endpoint to retrieve field configuration.",
+    description: "Returns all Log Explorer datasets configured for the account or zone.\n\nPass `include_zones=true` to also include zone-level datasets that\nbelong to this account or zone. List responses omit the `fields` property;\nuse the single-dataset endpoint to retrieve field configuration.\n\nGET /{account_or_zone}/{account_or_zone_id}/logs/explorer/datasets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "description": "The account ID or zone ID, as selected by account_or_zone.",
-          "type": "string"
-        },
-        "include_zones": {
-          "description": "Set to true to include zone-scoped datasets belonging to this account.",
-          "type": "boolean"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_zones": {
+              "description": "Set to true to include zone-scoped datasets belonging to this account.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lex_DatasetSummaryListResponse",
       $defs: {
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_DatasetSummaryListResponse": lex_DatasetSummaryListResponse_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_DatasetSummaryListResponse": lex_DatasetSummaryListResponse,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     annotations: {
@@ -416,65 +472,75 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_DatasetSummaryListResponse": lex_DatasetSummaryListResponse_output,
-        "lex_ErrorResponse-2": lex_ErrorResponse_2_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_DatasetSummaryListResponse": lex_DatasetSummaryListResponse,
+        "lex_ErrorResponse-2": lex_ErrorResponse$$2,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/logs/explorer/datasets`,
       query: [
-        ["include_zones", args["include_zones"], true],
+        ["include_zones", param(args, "query", "include_zones"), true],
       ],
     }),
   },
   {
     name: "logs_datasets_update",
     title: "Update an account or zone dataset",
-    description: "Updates the enabled state and/or field configuration of an account or zone dataset.",
+    description: "Updates the enabled state and/or field configuration of an account or zone dataset.\n\nPUT /{account_or_zone}/{account_or_zone_id}/logs/explorer/datasets/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "description": "The account ID or zone ID, as selected by account_or_zone.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/lex_UpdateDatasetRequest"
         },
-        "dataset_id": {
-          "description": "Log Explorer dataset ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "dataset_id": {
+              "description": "Log Explorer dataset ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "dataset_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "lex_LogField": lex_LogField,
+        "lex_LogField": lex_LogField$,
         "lex_UpdateDatasetRequest": lex_UpdateDatasetRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/lex_DatasetDetailResponse",
       $defs: {
-        "lex_DatasetDetailResponse": lex_DatasetDetailResponse_output,
-        "lex_DatasetResponse": lex_DatasetResponse_output,
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_LogField": lex_LogField_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetDetailResponse": lex_DatasetDetailResponse,
+        "lex_DatasetResponse": lex_DatasetResponse,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_LogField": lex_LogField,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     annotations: {
@@ -507,12 +573,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lex_DatasetDetailResponse": lex_DatasetDetailResponse_output,
-        "lex_DatasetResponse": lex_DatasetResponse_output,
-        "lex_DatasetSummary": lex_DatasetSummary_output,
-        "lex_ErrorResponse-2": lex_ErrorResponse_2_output,
-        "lex_LogField": lex_LogField_output,
-        "lex_V4Error-2": lex_V4Error_2_output,
+        "lex_DatasetDetailResponse": lex_DatasetDetailResponse,
+        "lex_DatasetResponse": lex_DatasetResponse,
+        "lex_DatasetSummary": lex_DatasetSummary,
+        "lex_ErrorResponse-2": lex_ErrorResponse$$2,
+        "lex_LogField": lex_LogField,
+        "lex_V4Error-2": lex_V4Error$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logs/list/schemas.ts b/src/generated/forge-mcp/logs/list/schemas.ts
deleted file mode 100644
index 1cae211fd..000000000
--- a/src/generated/forge-mcp/logs/list/schemas.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `logpull_Limit`.
- */
-export const logpull_Limit: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/logs/list/tools.ts b/src/generated/forge-mcp/logs/list/tools.ts
index 1c808feb5..35ce2cd43 100644
--- a/src/generated/forge-mcp/logs/list/tools.ts
+++ b/src/generated/forge-mcp/logs/list/tools.ts
@@ -1,16 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import {
-  logpull_AccessKeyId,
-  logpull_AccountId,
-  logpull_Bucket,
-  logpull_Prefix,
-  logpull_SecretAccessKey,
-  logpull_TimestampRFC3339,
-} from "../schemas.js";
-import { logpull_Limit } from "./schemas.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `logs.list`.
@@ -19,58 +10,79 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_list_get",
     title: "List log files",
-    description: "Lists R2 objects containing logs matching the provided query parameters.",
+    description: "Lists R2 objects containing logs matching the provided query parameters.\n\nGET /accounts/{account_id}/logs/list",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpull_AccountId",
-          "description": "Cloudflare account ID (32-character hex string)."
-        },
-        "bucket": {
-          "$ref": "#/$defs/logpull_Bucket",
-          "description": "R2 bucket name."
-        },
-        "end": {
-          "$ref": "#/$defs/logpull_TimestampRFC3339",
-          "description": "End time in RFC3339 format."
-        },
-        "limit": {
-          "$ref": "#/$defs/logpull_Limit",
-          "description": "Maximum number of results to return."
-        },
-        "prefix": {
-          "$ref": "#/$defs/logpull_Prefix",
-          "description": "R2 bucket prefix logs are stored under."
-        },
-        "r2_access_key_id": {
-          "$ref": "#/$defs/logpull_AccessKeyId"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "R2-Access-Key-Id": {
+              "type": "string"
+            },
+            "R2-Secret-Access-Key": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "R2-Access-Key-Id",
+            "R2-Secret-Access-Key"
+          ],
+          "type": "object"
         },
-        "r2_secret_access_key": {
-          "$ref": "#/$defs/logpull_SecretAccessKey"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hex string).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "start": {
-          "$ref": "#/$defs/logpull_TimestampRFC3339",
-          "description": "Start time in RFC3339 format."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "bucket": {
+              "description": "R2 bucket name.",
+              "type": "string"
+            },
+            "end": {
+              "description": "End time in RFC3339 format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "limit": {
+              "description": "Maximum number of results to return.",
+              "type": "integer"
+            },
+            "prefix": {
+              "description": "R2 bucket prefix logs are stored under.",
+              "type": "string"
+            },
+            "start": {
+              "description": "Start time in RFC3339 format.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "required": [
+            "start",
+            "end",
+            "bucket"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "start",
-        "end",
-        "bucket",
-        "r2_access_key_id",
-        "r2_secret_access_key"
+        "path",
+        "query",
+        "headers"
       ],
-      $defs: {
-        "logpull_AccessKeyId": logpull_AccessKeyId,
-        "logpull_AccountId": logpull_AccountId,
-        "logpull_Bucket": logpull_Bucket,
-        "logpull_Limit": logpull_Limit,
-        "logpull_Prefix": logpull_Prefix,
-        "logpull_SecretAccessKey": logpull_SecretAccessKey,
-        "logpull_TimestampRFC3339": logpull_TimestampRFC3339,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -232,15 +244,15 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/logs/list`,
       query: [
-        ["start", args["start"], true],
-        ["end", args["end"], true],
-        ["bucket", args["bucket"], true],
-        ["prefix", args["prefix"], true],
-        ["limit", args["limit"], true],
+        ["start", param(args, "query", "start"), true],
+        ["end", param(args, "query", "end"), true],
+        ["bucket", param(args, "query", "bucket"), true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
       headers: [
-        ["R2-Access-Key-Id", args["r2_access_key_id"]],
-        ["R2-Secret-Access-Key", args["r2_secret_access_key"]],
+        ["R2-Access-Key-Id", param(args, "headers", "R2-Access-Key-Id")],
+        ["R2-Secret-Access-Key", param(args, "headers", "R2-Secret-Access-Key")],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/logs/outputs.ts b/src/generated/forge-mcp/logs/outputs.ts
index 95c7bd143..f3b147ad9 100644
--- a/src/generated/forge-mcp/logs/outputs.ts
+++ b/src/generated/forge-mcp/logs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `logshare_api-response-common-failure` in responses.
  */
-export const logshare_api_response_common_failure_output: JsonSchema = {
+export const logshare_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/logshare_messages"
@@ -36,7 +36,7 @@ export const logshare_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `logshare_logs_response_json_lines` in responses.
  */
-export const logshare_logs_response_json_lines_output: JsonSchema = {
+export const logshare_logs_response_json_lines: JsonSchema = {
   "anyOf": [
     {
       "type": "string"
@@ -50,7 +50,7 @@ export const logshare_logs_response_json_lines_output: JsonSchema = {
 /**
  * The schema of `logshare_messages` in responses.
  */
-export const logshare_messages_output: JsonSchema = {
+export const logshare_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/logs/rayid/schemas.ts b/src/generated/forge-mcp/logs/rayid/schemas.ts
deleted file mode 100644
index 3a5f92c98..000000000
--- a/src/generated/forge-mcp/logs/rayid/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `logshare_ray_identifier`.
- */
-export const logshare_ray_identifier: JsonSchema = {
-  "description": "Ray identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/logs/rayid/tools.ts b/src/generated/forge-mcp/logs/rayid/tools.ts
index d95e49066..8b8e2be92 100644
--- a/src/generated/forge-mcp/logs/rayid/tools.ts
+++ b/src/generated/forge-mcp/logs/rayid/tools.ts
@@ -1,18 +1,12 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  logshare_api_response_common_failure_output,
-  logshare_logs_response_json_lines_output,
-  logshare_messages_output,
+  logshare_api$$response$$common$$failure,
+  logshare_logs_response_json_lines,
+  logshare_messages,
 } from "../outputs.js";
-import {
-  logshare_fields,
-  logshare_timestamps,
-  logshare_zone_identifier,
-} from "../schemas.js";
-import { logshare_ray_identifier } from "./schemas.js";
 
 /**
  * The tools of `logs.rayid`.
@@ -21,43 +15,58 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_rayid_get",
     title: "Get logs RayIDs",
-    description: "The `/rayids` api route allows lookups by specific rayid. The rayids route will return zero, one, or more records (ray ids are not unique).",
+    description: "The `/rayids` api route allows lookups by specific rayid. The rayids route will return zero, one, or more records (ray ids are not unique).\n\nGET /zones/{zone_id}/logs/rayids/{ray_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "fields": {
-          "$ref": "#/$defs/logshare_fields",
-          "description": "The `/received` route by default returns a limited set of fields, and allows customers to override the default field set by specifying individual fields. The reasons for this are: 1. Most customers require only a small subset of fields, but that subset varies from customer to customer; 2. Flat schema is much easier to work with downstream (importing into BigTable etc); 3. Performance (time to process, file size). If `?fields=` is not specified, default field set is returned. This default field set may change at any time. When `?fields=` is provided, each record is returned with the specified fields. `fields` must be specified as a comma separated list without any whitespaces, and all fields must exist. The order in which fields are specified does not matter, and the order of fields in the response is not specified."
-        },
-        "ray_id": {
-          "$ref": "#/$defs/logshare_ray_identifier",
-          "description": "Ray identifier."
-        },
-        "timestamps": {
-          "$ref": "#/$defs/logshare_timestamps",
-          "default": "unixnano",
-          "description": "By default, timestamps in responses are returned as Unix nanosecond integers. The `?timestamps=` argument can be set to change the format in which response timestamps are returned. Possible values are: `unix`, `unixnano`, `rfc3339`. Note that `unix` and `unixnano` return timestamps as integers; `rfc3339` returns timestamps as strings."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ray_id": {
+              "description": "Ray identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "ray_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/logshare_zone_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "fields": {
+              "description": "The `/received` route by default returns a limited set of fields, and allows customers to override the default field set by specifying individual fields. The reasons for this are: 1. Most customers require only a small subset of fields, but that subset varies from customer to customer; 2. Flat schema is much easier to work with downstream (importing into BigTable etc); 3. Performance (time to process, file size). If `?fields=` is not specified, default field set is returned. This default field set may change at any time. When `?fields=` is provided, each record is returned with the specified fields. `fields` must be specified as a comma separated list without any whitespaces, and all fields must exist. The order in which fields are specified does not matter, and the order of fields in the response is not specified.",
+              "type": "string"
+            },
+            "timestamps": {
+              "default": "unixnano",
+              "description": "By default, timestamps in responses are returned as Unix nanosecond integers. The `?timestamps=` argument can be set to change the format in which response timestamps are returned. Possible values are: `unix`, `unixnano`, `rfc3339`. Note that `unix` and `unixnano` return timestamps as integers; `rfc3339` returns timestamps as strings.",
+              "enum": [
+                "unix",
+                "unixnano",
+                "rfc3339"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "ray_id"
+        "path"
       ],
-      $defs: {
-        "logshare_fields": logshare_fields,
-        "logshare_ray_identifier": logshare_ray_identifier,
-        "logshare_timestamps": logshare_timestamps,
-        "logshare_zone_identifier": logshare_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logshare_logs_response_json_lines",
       $defs: {
-        "logshare_logs_response_json_lines": logshare_logs_response_json_lines_output,
+        "logshare_logs_response_json_lines": logshare_logs_response_json_lines,
       },
     },
     annotations: {
@@ -91,16 +100,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logshare_api-response-common-failure": logshare_api_response_common_failure_output,
-        "logshare_logs_response_json_lines": logshare_logs_response_json_lines_output,
-        "logshare_messages": logshare_messages_output,
+        "logshare_api-response-common-failure": logshare_api$$response$$common$$failure,
+        "logshare_logs_response_json_lines": logshare_logs_response_json_lines,
+        "logshare_messages": logshare_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/logs/rayids/${pathParam(args, "ray_id")}`,
       query: [
-        ["fields", args["fields"], true],
-        ["timestamps", args["timestamps"], true],
+        ["fields", param(args, "query", "fields"), true],
+        ["timestamps", param(args, "query", "timestamps"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/logs/received/fields/outputs.ts b/src/generated/forge-mcp/logs/received/fields/outputs.ts
index 7fdac31f3..55567e6ed 100644
--- a/src/generated/forge-mcp/logs/received/fields/outputs.ts
+++ b/src/generated/forge-mcp/logs/received/fields/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `logshare_fields_response` in responses.
  */
-export const logshare_fields_response_output: JsonSchema = {
+export const logshare_fields_response: JsonSchema = {
   "properties": {
     "key": {
       "type": "string"
diff --git a/src/generated/forge-mcp/logs/received/fields/tools.ts b/src/generated/forge-mcp/logs/received/fields/tools.ts
index de92783b0..900c9a4bb 100644
--- a/src/generated/forge-mcp/logs/received/fields/tools.ts
+++ b/src/generated/forge-mcp/logs/received/fields/tools.ts
@@ -3,11 +3,10 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  logshare_api_response_common_failure_output,
-  logshare_messages_output,
+  logshare_api$$response$$common$$failure,
+  logshare_messages,
 } from "../../outputs.js";
-import { logshare_zone_identifier } from "../../schemas.js";
-import { logshare_fields_response_output } from "./outputs.js";
+import { logshare_fields_response } from "./outputs.js";
 
 /**
  * The tools of `logs.received.fields`.
@@ -16,26 +15,33 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_received_fields_get",
     title: "List fields",
-    description: "Lists all fields available. The response is json object with key-value pairs, where keys are field names, and values are descriptions.",
+    description: "Lists all fields available. The response is json object with key-value pairs, where keys are field names, and values are descriptions.\n\nGET /zones/{zone_id}/logs/received/fields",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/logshare_zone_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "logshare_zone_identifier": logshare_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logshare_fields_response",
       $defs: {
-        "logshare_fields_response": logshare_fields_response_output,
+        "logshare_fields_response": logshare_fields_response,
       },
     },
     annotations: {
@@ -69,9 +75,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logshare_api-response-common-failure": logshare_api_response_common_failure_output,
-        "logshare_fields_response": logshare_fields_response_output,
-        "logshare_messages": logshare_messages_output,
+        "logshare_api-response-common-failure": logshare_api$$response$$common$$failure,
+        "logshare_fields_response": logshare_fields_response,
+        "logshare_messages": logshare_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/logs/received/schemas.ts b/src/generated/forge-mcp/logs/received/schemas.ts
deleted file mode 100644
index 87e1c0cd7..000000000
--- a/src/generated/forge-mcp/logs/received/schemas.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `logshare_count`.
- */
-export const logshare_count: JsonSchema = {
-  "description": "When `?count=` is provided, the response will contain up to `count` results. Since results are not sorted, you are likely to get different data for repeated requests. `count` must be an integer > 0.",
-  "type": "integer"
-};
-
-/**
- * The schema of `logshare_end`.
- */
-export const logshare_end: JsonSchema = {
-  "anyOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "integer"
-    }
-  ],
-  "description": "Sets the (exclusive) end of the requested time frame. This can be a unix timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to RFC 3339. `end` must be at least five minutes earlier than now and must be later than `start`. Difference between `start` and `end` must be not greater than one hour."
-};
-
-/**
- * The schema of `logshare_sample`.
- */
-export const logshare_sample: JsonSchema = {
-  "description": "When `?sample=` is provided, a sample of matching records is returned. If `sample=0.1` then 10% of records will be returned. Sampling is random: repeated calls will not only return different records, but likely will also vary slightly in number of returned records. When `?count=` is also specified, `count` is applied to the number of returned records, not the sampled records. So, with `sample=0.05` and `count=7`, when there is a total of 100 records available, approximately five will be returned. When there are 1000 records, seven will be returned. When there are 10,000 records, seven will be returned.",
-  "type": "number"
-};
-
-/**
- * The schema of `logshare_start`.
- */
-export const logshare_start: JsonSchema = {
-  "anyOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "integer"
-    }
-  ],
-  "description": "Sets the (inclusive) beginning of the requested time frame. This can be a unix timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to RFC 3339. At this point in time, it cannot exceed a time in the past greater than seven days."
-};
diff --git a/src/generated/forge-mcp/logs/received/tools.ts b/src/generated/forge-mcp/logs/received/tools.ts
index 6033be0c3..88ddb2b98 100644
--- a/src/generated/forge-mcp/logs/received/tools.ts
+++ b/src/generated/forge-mcp/logs/received/tools.ts
@@ -1,23 +1,12 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  logshare_api_response_common_failure_output,
-  logshare_logs_response_json_lines_output,
-  logshare_messages_output,
+  logshare_api$$response$$common$$failure,
+  logshare_logs_response_json_lines,
+  logshare_messages,
 } from "../outputs.js";
-import {
-  logshare_fields,
-  logshare_timestamps,
-  logshare_zone_identifier,
-} from "../schemas.js";
-import {
-  logshare_count,
-  logshare_end,
-  logshare_sample,
-  logshare_start,
-} from "./schemas.js";
 
 /**
  * The tools of `logs.received`.
@@ -26,58 +15,87 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_received_get",
     title: "Get logs received",
-    description: "The `/received` api route allows customers to retrieve their edge HTTP logs. The basic access pattern is \"give me all the logs for zone Z for minute M\", where the minute M refers to the time records were received at Cloudflare's central data center. `start` is inclusive, and `end` is exclusive. Because of that, to get all data, at minutely cadence, starting at 10AM, the proper values are: `start=2018-05-20T10:00:00Z&end=2018-05-20T10:01:00Z`, then `start=2018-05-20T10:01:00Z&end=2018-05-20T10:02:00Z` and so on; the overlap will be handled properly.",
+    description: "The `/received` api route allows customers to retrieve their edge HTTP logs. The basic access pattern is \"give me all the logs for zone Z for minute M\", where the minute M refers to the time records were received at Cloudflare's central data center. `start` is inclusive, and `end` is exclusive. Because of that, to get all data, at minutely cadence, starting at 10AM, the proper values are: `start=2018-05-20T10:00:00Z&end=2018-05-20T10:01:00Z`, then `start=2018-05-20T10:01:00Z&end=2018-05-20T10:02:00Z` and so on; the overlap will be handled properly.\n\nGET /zones/{zone_id}/logs/received",
     inputSchema: {
       type: "object",
       properties: {
-        "count": {
-          "$ref": "#/$defs/logshare_count",
-          "description": "When `?count=` is provided, the response will contain up to `count` results. Since results are not sorted, you are likely to get different data for repeated requests. `count` must be an integer > 0."
-        },
-        "end": {
-          "$ref": "#/$defs/logshare_end",
-          "description": "Sets the (exclusive) end of the requested time frame. This can be a unix timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to RFC 3339. `end` must be at least five minutes earlier than now and must be later than `start`. Difference between `start` and `end` must be not greater than one hour."
-        },
-        "fields": {
-          "$ref": "#/$defs/logshare_fields",
-          "description": "The `/received` route by default returns a limited set of fields, and allows customers to override the default field set by specifying individual fields. The reasons for this are: 1. Most customers require only a small subset of fields, but that subset varies from customer to customer; 2. Flat schema is much easier to work with downstream (importing into BigTable etc); 3. Performance (time to process, file size). If `?fields=` is not specified, default field set is returned. This default field set may change at any time. When `?fields=` is provided, each record is returned with the specified fields. `fields` must be specified as a comma separated list without any whitespaces, and all fields must exist. The order in which fields are specified does not matter, and the order of fields in the response is not specified."
-        },
-        "sample": {
-          "$ref": "#/$defs/logshare_sample",
-          "description": "When `?sample=` is provided, a sample of matching records is returned. If `sample=0.1` then 10% of records will be returned. Sampling is random: repeated calls will not only return different records, but likely will also vary slightly in number of returned records. When `?count=` is also specified, `count` is applied to the number of returned records, not the sampled records. So, with `sample=0.05` and `count=7`, when there is a total of 100 records available, approximately five will be returned. When there are 1000 records, seven will be returned. When there are 10,000 records, seven will be returned."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "start": {
-          "$ref": "#/$defs/logshare_start",
-          "description": "Sets the (inclusive) beginning of the requested time frame. This can be a unix timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to RFC 3339. At this point in time, it cannot exceed a time in the past greater than seven days."
-        },
-        "timestamps": {
-          "$ref": "#/$defs/logshare_timestamps",
-          "default": "unixnano",
-          "description": "By default, timestamps in responses are returned as Unix nanosecond integers. The `?timestamps=` argument can be set to change the format in which response timestamps are returned. Possible values are: `unix`, `unixnano`, `rfc3339`. Note that `unix` and `unixnano` return timestamps as integers; `rfc3339` returns timestamps as strings."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/logshare_zone_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "count": {
+              "description": "When `?count=` is provided, the response will contain up to `count` results. Since results are not sorted, you are likely to get different data for repeated requests. `count` must be an integer > 0.",
+              "type": "integer"
+            },
+            "end": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "integer"
+                }
+              ],
+              "description": "Sets the (exclusive) end of the requested time frame. This can be a unix timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to RFC 3339. `end` must be at least five minutes earlier than now and must be later than `start`. Difference between `start` and `end` must be not greater than one hour."
+            },
+            "fields": {
+              "description": "The `/received` route by default returns a limited set of fields, and allows customers to override the default field set by specifying individual fields. The reasons for this are: 1. Most customers require only a small subset of fields, but that subset varies from customer to customer; 2. Flat schema is much easier to work with downstream (importing into BigTable etc); 3. Performance (time to process, file size). If `?fields=` is not specified, default field set is returned. This default field set may change at any time. When `?fields=` is provided, each record is returned with the specified fields. `fields` must be specified as a comma separated list without any whitespaces, and all fields must exist. The order in which fields are specified does not matter, and the order of fields in the response is not specified.",
+              "type": "string"
+            },
+            "sample": {
+              "description": "When `?sample=` is provided, a sample of matching records is returned. If `sample=0.1` then 10% of records will be returned. Sampling is random: repeated calls will not only return different records, but likely will also vary slightly in number of returned records. When `?count=` is also specified, `count` is applied to the number of returned records, not the sampled records. So, with `sample=0.05` and `count=7`, when there is a total of 100 records available, approximately five will be returned. When there are 1000 records, seven will be returned. When there are 10,000 records, seven will be returned.",
+              "type": "number"
+            },
+            "start": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "integer"
+                }
+              ],
+              "description": "Sets the (inclusive) beginning of the requested time frame. This can be a unix timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to RFC 3339. At this point in time, it cannot exceed a time in the past greater than seven days."
+            },
+            "timestamps": {
+              "default": "unixnano",
+              "description": "By default, timestamps in responses are returned as Unix nanosecond integers. The `?timestamps=` argument can be set to change the format in which response timestamps are returned. Possible values are: `unix`, `unixnano`, `rfc3339`. Note that `unix` and `unixnano` return timestamps as integers; `rfc3339` returns timestamps as strings.",
+              "enum": [
+                "unix",
+                "unixnano",
+                "rfc3339"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "end"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "end"
+        "path",
+        "query"
       ],
-      $defs: {
-        "logshare_count": logshare_count,
-        "logshare_end": logshare_end,
-        "logshare_fields": logshare_fields,
-        "logshare_sample": logshare_sample,
-        "logshare_start": logshare_start,
-        "logshare_timestamps": logshare_timestamps,
-        "logshare_zone_identifier": logshare_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/logshare_logs_response_json_lines",
       $defs: {
-        "logshare_logs_response_json_lines": logshare_logs_response_json_lines_output,
+        "logshare_logs_response_json_lines": logshare_logs_response_json_lines,
       },
     },
     annotations: {
@@ -116,20 +134,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "logshare_api-response-common-failure": logshare_api_response_common_failure_output,
-        "logshare_logs_response_json_lines": logshare_logs_response_json_lines_output,
-        "logshare_messages": logshare_messages_output,
+        "logshare_api-response-common-failure": logshare_api$$response$$common$$failure,
+        "logshare_logs_response_json_lines": logshare_logs_response_json_lines,
+        "logshare_messages": logshare_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/logs/received`,
       query: [
-        ["start", args["start"], true],
-        ["end", args["end"], true],
-        ["fields", args["fields"], true],
-        ["sample", args["sample"], true],
-        ["count", args["count"], true],
-        ["timestamps", args["timestamps"], true],
+        ["start", param(args, "query", "start"), true],
+        ["end", param(args, "query", "end"), true],
+        ["fields", param(args, "query", "fields"), true],
+        ["sample", param(args, "query", "sample"), true],
+        ["count", param(args, "query", "count"), true],
+        ["timestamps", param(args, "query", "timestamps"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/logs/retrieve/tools.ts b/src/generated/forge-mcp/logs/retrieve/tools.ts
index d3791896d..2d2d1fe0e 100644
--- a/src/generated/forge-mcp/logs/retrieve/tools.ts
+++ b/src/generated/forge-mcp/logs/retrieve/tools.ts
@@ -1,15 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import {
-  logpull_AccessKeyId,
-  logpull_AccountId,
-  logpull_Bucket,
-  logpull_Prefix,
-  logpull_SecretAccessKey,
-  logpull_TimestampRFC3339,
-} from "../schemas.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `logs.retrieve`.
@@ -18,53 +10,75 @@ export const tools: readonly Tool[] = [
   {
     name: "logs_retrieve_get",
     title: "Retrieve logs",
-    description: "Returns logs stored in R2 that match the provided query parameters.",
+    description: "Returns logs stored in R2 that match the provided query parameters.\n\nGET /accounts/{account_id}/logs/retrieve",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/logpull_AccountId",
-          "description": "Cloudflare account ID (32-character hex string)."
-        },
-        "bucket": {
-          "$ref": "#/$defs/logpull_Bucket",
-          "description": "R2 bucket name."
-        },
-        "end": {
-          "$ref": "#/$defs/logpull_TimestampRFC3339",
-          "description": "End time in RFC3339 format."
-        },
-        "prefix": {
-          "$ref": "#/$defs/logpull_Prefix",
-          "description": "R2 bucket prefix logs are stored under."
-        },
-        "r2_access_key_id": {
-          "$ref": "#/$defs/logpull_AccessKeyId"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "R2-Access-Key-Id": {
+              "type": "string"
+            },
+            "R2-Secret-Access-Key": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "R2-Access-Key-Id",
+            "R2-Secret-Access-Key"
+          ],
+          "type": "object"
         },
-        "r2_secret_access_key": {
-          "$ref": "#/$defs/logpull_SecretAccessKey"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hex string).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "start": {
-          "$ref": "#/$defs/logpull_TimestampRFC3339",
-          "description": "Start time in RFC3339 format."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "bucket": {
+              "description": "R2 bucket name.",
+              "type": "string"
+            },
+            "end": {
+              "description": "End time in RFC3339 format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "prefix": {
+              "description": "R2 bucket prefix logs are stored under.",
+              "type": "string"
+            },
+            "start": {
+              "description": "Start time in RFC3339 format.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "required": [
+            "start",
+            "end",
+            "bucket"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "start",
-        "end",
-        "bucket",
-        "r2_access_key_id",
-        "r2_secret_access_key"
+        "path",
+        "query",
+        "headers"
       ],
-      $defs: {
-        "logpull_AccessKeyId": logpull_AccessKeyId,
-        "logpull_AccountId": logpull_AccountId,
-        "logpull_Bucket": logpull_Bucket,
-        "logpull_Prefix": logpull_Prefix,
-        "logpull_SecretAccessKey": logpull_SecretAccessKey,
-        "logpull_TimestampRFC3339": logpull_TimestampRFC3339,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
     },
@@ -167,14 +181,14 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/logs/retrieve`,
       query: [
-        ["start", args["start"], true],
-        ["end", args["end"], true],
-        ["bucket", args["bucket"], true],
-        ["prefix", args["prefix"], true],
+        ["start", param(args, "query", "start"), true],
+        ["end", param(args, "query", "end"), true],
+        ["bucket", param(args, "query", "bucket"), true],
+        ["prefix", param(args, "query", "prefix"), true],
       ],
       headers: [
-        ["R2-Access-Key-Id", args["r2_access_key_id"]],
-        ["R2-Secret-Access-Key", args["r2_secret_access_key"]],
+        ["R2-Access-Key-Id", param(args, "headers", "R2-Access-Key-Id")],
+        ["R2-Secret-Access-Key", param(args, "headers", "R2-Secret-Access-Key")],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/logs/schemas.ts b/src/generated/forge-mcp/logs/schemas.ts
deleted file mode 100644
index 4134e1327..000000000
--- a/src/generated/forge-mcp/logs/schemas.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `logpull_AccessKeyId`.
- */
-export const logpull_AccessKeyId: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpull_AccountId`.
- */
-export const logpull_AccountId: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpull_Bucket`.
- */
-export const logpull_Bucket: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpull_Prefix`.
- */
-export const logpull_Prefix: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpull_SecretAccessKey`.
- */
-export const logpull_SecretAccessKey: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `logpull_TimestampRFC3339`.
- */
-export const logpull_TimestampRFC3339: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `logshare_fields`.
- */
-export const logshare_fields: JsonSchema = {
-  "description": "The `/received` route by default returns a limited set of fields, and allows customers to override the default field set by specifying individual fields. The reasons for this are: 1. Most customers require only a small subset of fields, but that subset varies from customer to customer; 2. Flat schema is much easier to work with downstream (importing into BigTable etc); 3. Performance (time to process, file size). If `?fields=` is not specified, default field set is returned. This default field set may change at any time. When `?fields=` is provided, each record is returned with the specified fields. `fields` must be specified as a comma separated list without any whitespaces, and all fields must exist. The order in which fields are specified does not matter, and the order of fields in the response is not specified.",
-  "type": "string"
-};
-
-/**
- * The schema of `logshare_timestamps`.
- */
-export const logshare_timestamps: JsonSchema = {
-  "description": "By default, timestamps in responses are returned as Unix nanosecond integers. The `?timestamps=` argument can be set to change the format in which response timestamps are returned. Possible values are: `unix`, `unixnano`, `rfc3339`. Note that `unix` and `unixnano` return timestamps as integers; `rfc3339` returns timestamps as strings.",
-  "enum": [
-    "unix",
-    "unixnano",
-    "rfc3339"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `logshare_zone_identifier`.
- */
-export const logshare_zone_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/configs/full/tools.ts b/src/generated/forge-mcp/magicNetworkMonitoring/configs/full/tools.ts
index 7aae2cdd2..d670f68fb 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/configs/full/tools.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/configs/full/tools.ts
@@ -3,59 +3,59 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_visibility_mnm_api_response_common_failure_output,
-  magic_visibility_mnm_api_response_common_output,
-  magic_visibility_mnm_api_response_single_output,
-  magic_visibility_mnm_messages_output,
+  magic$$visibility$$mnm_api$$response$$common,
+  magic$$visibility$$mnm_api$$response$$common$$failure,
+  magic$$visibility$$mnm_api$$response$$single,
+  magic$$visibility$$mnm_messages,
 } from "../../outputs.js";
-import { magic_visibility_mnm_account_identifier } from "../../schemas.js";
 import {
-  magic_visibility_mnm_mnm_config_default_sampling_output,
-  magic_visibility_mnm_mnm_config_name_output,
-  magic_visibility_mnm_mnm_config_output,
-  magic_visibility_mnm_mnm_config_router_ip_output,
-  magic_visibility_mnm_mnm_config_router_ips_output,
-  magic_visibility_mnm_mnm_config_single_response_output,
-  magic_visibility_mnm_mnm_config_warp_device_output,
-  magic_visibility_mnm_mnm_config_warp_devices_output,
+  magic$$visibility$$mnm_mnm_config,
+  magic$$visibility$$mnm_mnm_config_router_ips,
+  magic$$visibility$$mnm_mnm_config_single_response,
+  magic$$visibility$$mnm_mnm_config_warp_device,
+  magic$$visibility$$mnm_mnm_config_warp_devices,
 } from "../outputs.js";
 
 /**
- * The tools of `magic_network_monitoring.configs.full`.
+ * The tools of `magicNetworkMonitoring.configs.full`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_network_monitoring_configs_full_get",
+    name: "magicNetworkMonitoring_configs_full_get",
     title: "List rules and account configuration",
-    description: "Lists default sampling, router IPs, warp devices, and rules for account.",
+    description: "Lists default sampling, router IPs, warp devices, and rules for account.\n\nGET /accounts/{account_id}/mnm/config/full",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_config_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     annotations: {
@@ -91,18 +91,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/configs/outputs.ts b/src/generated/forge-mcp/magicNetworkMonitoring/configs/outputs.ts
index b884b50cb..f38a23260 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/configs/outputs.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/configs/outputs.ts
@@ -6,13 +6,13 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `magic-visibility-mnm_mnm_config` in responses.
  */
-export const magic_visibility_mnm_mnm_config_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_config: JsonSchema = {
   "properties": {
     "default_sampling": {
-      "$ref": "#/$defs/magic-visibility-mnm_mnm_config_default_sampling"
+      "type": "number"
     },
     "name": {
-      "$ref": "#/$defs/magic-visibility-mnm_mnm_config_name"
+      "type": "string"
     },
     "router_ips": {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_config_router_ips"
@@ -30,34 +30,12 @@ export const magic_visibility_mnm_mnm_config_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic-visibility-mnm_mnm_config_default_sampling` in
- * responses.
- */
-export const magic_visibility_mnm_mnm_config_default_sampling_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_config_name` in responses.
- */
-export const magic_visibility_mnm_mnm_config_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_config_router_ip` in responses.
- */
-export const magic_visibility_mnm_mnm_config_router_ip_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-mnm_mnm_config_router_ips` in responses.
  */
-export const magic_visibility_mnm_mnm_config_router_ips_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_config_router_ips: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/magic-visibility-mnm_mnm_config_router_ip"
+    "type": "string"
   },
   "type": "array"
 };
@@ -65,7 +43,7 @@ export const magic_visibility_mnm_mnm_config_router_ips_output: JsonSchema = {
 /**
  * The schema of `magic-visibility-mnm_mnm_config_single_response` in responses.
  */
-export const magic_visibility_mnm_mnm_config_single_response_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_config_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-mnm_api-response-single"
@@ -84,7 +62,7 @@ export const magic_visibility_mnm_mnm_config_single_response_output: JsonSchema
 /**
  * The schema of `magic-visibility-mnm_mnm_config_warp_device` in responses.
  */
-export const magic_visibility_mnm_mnm_config_warp_device_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_config_warp_device: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -107,7 +85,7 @@ export const magic_visibility_mnm_mnm_config_warp_device_output: JsonSchema = {
 /**
  * The schema of `magic-visibility-mnm_mnm_config_warp_devices` in responses.
  */
-export const magic_visibility_mnm_mnm_config_warp_devices_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_config_warp_devices: JsonSchema = {
   "items": {
     "$ref": "#/$defs/magic-visibility-mnm_mnm_config_warp_device"
   },
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/configs/schemas.ts b/src/generated/forge-mcp/magicNetworkMonitoring/configs/schemas.ts
index b2076f895..eb8ff164c 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/configs/schemas.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/configs/schemas.ts
@@ -3,36 +3,13 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic-visibility-mnm_mnm_config_default_sampling`.
- */
-export const magic_visibility_mnm_mnm_config_default_sampling: JsonSchema = {
-  "description": "Fallback sampling rate of flow messages being sent in packets per second. This should match the packet sampling rate configured on the router.",
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_config_name`.
- */
-export const magic_visibility_mnm_mnm_config_name: JsonSchema = {
-  "description": "The account name.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_config_router_ip`.
- */
-export const magic_visibility_mnm_mnm_config_router_ip: JsonSchema = {
-  "description": "IPv4 CIDR of the router sourcing flow data. Only /32 addresses are currently supported.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-mnm_mnm_config_router_ips`.
  */
-export const magic_visibility_mnm_mnm_config_router_ips: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_config_router_ips: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/magic-visibility-mnm_mnm_config_router_ip"
+    "description": "IPv4 CIDR of the router sourcing flow data. Only /32 addresses are currently supported.",
+    "type": "string"
   },
   "type": "array"
 };
@@ -40,7 +17,7 @@ export const magic_visibility_mnm_mnm_config_router_ips: JsonSchema = {
 /**
  * The schema of `magic-visibility-mnm_mnm_config_warp_device`.
  */
-export const magic_visibility_mnm_mnm_config_warp_device: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_config_warp_device: JsonSchema = {
   "description": "Object representing a warp device with an ID and name.",
   "properties": {
     "id": {
@@ -67,7 +44,7 @@ export const magic_visibility_mnm_mnm_config_warp_device: JsonSchema = {
 /**
  * The schema of `magic-visibility-mnm_mnm_config_warp_devices`.
  */
-export const magic_visibility_mnm_mnm_config_warp_devices: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_config_warp_devices: JsonSchema = {
   "items": {
     "$ref": "#/$defs/magic-visibility-mnm_mnm_config_warp_device"
   },
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/configs/tools.ts b/src/generated/forge-mcp/magicNetworkMonitoring/configs/tools.ts
index bdae0eb05..0d3f07084 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/configs/tools.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/configs/tools.ts
@@ -3,55 +3,45 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_visibility_mnm_api_response_common_failure_output,
-  magic_visibility_mnm_api_response_common_output,
-  magic_visibility_mnm_api_response_single_output,
-  magic_visibility_mnm_messages_output,
+  magic$$visibility$$mnm_api$$response$$common,
+  magic$$visibility$$mnm_api$$response$$common$$failure,
+  magic$$visibility$$mnm_api$$response$$single,
+  magic$$visibility$$mnm_messages,
 } from "../outputs.js";
-import { magic_visibility_mnm_account_identifier } from "../schemas.js";
 import {
-  magic_visibility_mnm_mnm_config_default_sampling_output,
-  magic_visibility_mnm_mnm_config_name_output,
-  magic_visibility_mnm_mnm_config_output,
-  magic_visibility_mnm_mnm_config_router_ip_output,
-  magic_visibility_mnm_mnm_config_router_ips_output,
-  magic_visibility_mnm_mnm_config_single_response_output,
-  magic_visibility_mnm_mnm_config_warp_device_output,
-  magic_visibility_mnm_mnm_config_warp_devices_output,
+  magic$$visibility$$mnm_mnm_config,
+  magic$$visibility$$mnm_mnm_config_router_ips,
+  magic$$visibility$$mnm_mnm_config_single_response,
+  magic$$visibility$$mnm_mnm_config_warp_device,
+  magic$$visibility$$mnm_mnm_config_warp_devices,
 } from "./outputs.js";
 import {
-  magic_visibility_mnm_mnm_config_default_sampling,
-  magic_visibility_mnm_mnm_config_name,
-  magic_visibility_mnm_mnm_config_router_ip,
-  magic_visibility_mnm_mnm_config_router_ips,
-  magic_visibility_mnm_mnm_config_warp_device,
-  magic_visibility_mnm_mnm_config_warp_devices,
+  magic$$visibility$$mnm_mnm_config_router_ips as magic$$visibility$$mnm_mnm_config_router_ips$,
+  magic$$visibility$$mnm_mnm_config_warp_device as magic$$visibility$$mnm_mnm_config_warp_device$,
+  magic$$visibility$$mnm_mnm_config_warp_devices as magic$$visibility$$mnm_mnm_config_warp_devices$,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_network_monitoring.configs`.
+ * The tools of `magicNetworkMonitoring.configs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_network_monitoring_configs_create",
+    name: "magicNetworkMonitoring_configs_create",
     title: "Create account configuration",
-    description: "Create a new network monitoring configuration.",
+    description: "Create a new network monitoring configuration.\n\nPOST /accounts/{account_id}/mnm/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
         "body": {
           "properties": {
             "default_sampling": {
-              "$ref": "#/$defs/magic-visibility-mnm_mnm_config_default_sampling",
               "default": 1,
-              "description": "Fallback sampling rate of flow messages being sent in packets per second. This should match the packet sampling rate configured on the router."
+              "description": "Fallback sampling rate of flow messages being sent in packets per second. This should match the packet sampling rate configured on the router.",
+              "type": "number"
             },
             "name": {
-              "$ref": "#/$defs/magic-visibility-mnm_mnm_config_name",
-              "description": "The account name."
+              "description": "The account name.",
+              "type": "string"
             },
             "router_ips": {
               "$ref": "#/$defs/magic-visibility-mnm_mnm_config_router_ips"
@@ -65,36 +55,42 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips$,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device$,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_config_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     annotations: {
@@ -128,18 +124,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     request: (args) => ({
@@ -148,37 +141,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_configs_delete",
+    name: "magicNetworkMonitoring_configs_delete",
     title: "Delete account configuration",
-    description: "Delete an existing network monitoring configuration.",
+    description: "Delete an existing network monitoring configuration.\n\nDELETE /accounts/{account_id}/mnm/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_config_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     annotations: {
@@ -212,18 +209,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     request: (args) => ({
@@ -231,25 +225,22 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_configs_edit",
+    name: "magicNetworkMonitoring_configs_edit",
     title: "Update account configuration fields",
-    description: "Update fields in an existing network monitoring configuration.",
+    description: "Update fields in an existing network monitoring configuration.\n\nPATCH /accounts/{account_id}/mnm/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
         "body": {
           "properties": {
             "default_sampling": {
-              "$ref": "#/$defs/magic-visibility-mnm_mnm_config_default_sampling",
               "default": 1,
-              "description": "Fallback sampling rate of flow messages being sent in packets per second. This should match the packet sampling rate configured on the router."
+              "description": "Fallback sampling rate of flow messages being sent in packets per second. This should match the packet sampling rate configured on the router.",
+              "type": "number"
             },
             "name": {
-              "$ref": "#/$defs/magic-visibility-mnm_mnm_config_name",
-              "description": "The account name."
+              "description": "The account name.",
+              "type": "string"
             },
             "router_ips": {
               "$ref": "#/$defs/magic-visibility-mnm_mnm_config_router_ips"
@@ -259,36 +250,42 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips$,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device$,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_config_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     annotations: {
@@ -323,18 +320,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     request: (args) => ({
@@ -343,37 +337,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_configs_get",
+    name: "magicNetworkMonitoring_configs_get",
     title: "List account configuration",
-    description: "Lists default sampling, router IPs and warp devices for account.",
+    description: "Lists default sampling, router IPs and warp devices for account.\n\nGET /accounts/{account_id}/mnm/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_config_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     annotations: {
@@ -409,18 +407,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     request: (args) => ({
@@ -428,25 +423,22 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_configs_update",
+    name: "magicNetworkMonitoring_configs_update",
     title: "Update an entire account configuration",
-    description: "Update an existing network monitoring configuration, requires the entire configuration to be updated at once.",
+    description: "Update an existing network monitoring configuration, requires the entire configuration to be updated at once.\n\nPUT /accounts/{account_id}/mnm/config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
         "body": {
           "properties": {
             "default_sampling": {
-              "$ref": "#/$defs/magic-visibility-mnm_mnm_config_default_sampling",
               "default": 1,
-              "description": "Fallback sampling rate of flow messages being sent in packets per second. This should match the packet sampling rate configured on the router."
+              "description": "Fallback sampling rate of flow messages being sent in packets per second. This should match the packet sampling rate configured on the router.",
+              "type": "number"
             },
             "name": {
-              "$ref": "#/$defs/magic-visibility-mnm_mnm_config_name",
-              "description": "The account name."
+              "description": "The account name.",
+              "type": "string"
             },
             "router_ips": {
               "$ref": "#/$defs/magic-visibility-mnm_mnm_config_router_ips"
@@ -460,36 +452,42 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips$,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device$,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_config_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     annotations: {
@@ -524,18 +522,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_config": magic_visibility_mnm_mnm_config_output,
-        "magic-visibility-mnm_mnm_config_default_sampling": magic_visibility_mnm_mnm_config_default_sampling_output,
-        "magic-visibility-mnm_mnm_config_name": magic_visibility_mnm_mnm_config_name_output,
-        "magic-visibility-mnm_mnm_config_router_ip": magic_visibility_mnm_mnm_config_router_ip_output,
-        "magic-visibility-mnm_mnm_config_router_ips": magic_visibility_mnm_mnm_config_router_ips_output,
-        "magic-visibility-mnm_mnm_config_single_response": magic_visibility_mnm_mnm_config_single_response_output,
-        "magic-visibility-mnm_mnm_config_warp_device": magic_visibility_mnm_mnm_config_warp_device_output,
-        "magic-visibility-mnm_mnm_config_warp_devices": magic_visibility_mnm_mnm_config_warp_devices_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_config": magic$$visibility$$mnm_mnm_config,
+        "magic-visibility-mnm_mnm_config_router_ips": magic$$visibility$$mnm_mnm_config_router_ips,
+        "magic-visibility-mnm_mnm_config_single_response": magic$$visibility$$mnm_mnm_config_single_response,
+        "magic-visibility-mnm_mnm_config_warp_device": magic$$visibility$$mnm_mnm_config_warp_device,
+        "magic-visibility-mnm_mnm_config_warp_devices": magic$$visibility$$mnm_mnm_config_warp_devices,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/outputs.ts b/src/generated/forge-mcp/magicNetworkMonitoring/outputs.ts
index 0d195e0fc..2506c8be9 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/outputs.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `magic-visibility-mnm_api-response-common` in responses.
  */
-export const magic_visibility_mnm_api_response_common_output: JsonSchema = {
+export const magic$$visibility$$mnm_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic-visibility-mnm_messages"
@@ -48,7 +48,7 @@ export const magic_visibility_mnm_api_response_common_output: JsonSchema = {
  * The schema of `magic-visibility-mnm_api-response-common-failure` in
  * responses.
  */
-export const magic_visibility_mnm_api_response_common_failure_output: JsonSchema = {
+export const magic$$visibility$$mnm_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic-visibility-mnm_messages"
@@ -78,7 +78,7 @@ export const magic_visibility_mnm_api_response_common_failure_output: JsonSchema
 /**
  * The schema of `magic-visibility-mnm_api-response-single` in responses.
  */
-export const magic_visibility_mnm_api_response_single_output: JsonSchema = {
+export const magic$$visibility$$mnm_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-mnm_api-response-common"
@@ -107,7 +107,7 @@ export const magic_visibility_mnm_api_response_single_output: JsonSchema = {
 /**
  * The schema of `magic-visibility-mnm_messages` in responses.
  */
-export const magic_visibility_mnm_messages_output: JsonSchema = {
+export const magic$$visibility$$mnm_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/rules/advertisements/outputs.ts b/src/generated/forge-mcp/magicNetworkMonitoring/rules/advertisements/outputs.ts
index bbdb289c7..50071515c 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/rules/advertisements/outputs.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/rules/advertisements/outputs.ts
@@ -7,12 +7,19 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `magic-visibility-mnm_mnm_rule_advertisable_response` in
  * responses.
  */
-export const magic_visibility_mnm_mnm_rule_advertisable_response_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_rule_advertisable_response: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "automatic_advertisement": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_automatic_advertisement"
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
       "required": [
@@ -30,7 +37,7 @@ export const magic_visibility_mnm_mnm_rule_advertisable_response_output: JsonSch
  * The schema of `magic-visibility-mnm_mnm_rule_advertisement_single_response`
  * in responses.
  */
-export const magic_visibility_mnm_mnm_rule_advertisement_single_response_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_rule_advertisement_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-mnm_api-response-single"
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/rules/advertisements/tools.ts b/src/generated/forge-mcp/magicNetworkMonitoring/rules/advertisements/tools.ts
index 5c76a50dd..46070c7ce 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/rules/advertisements/tools.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/rules/advertisements/tools.ts
@@ -3,56 +3,58 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_visibility_mnm_api_response_common_failure_output,
-  magic_visibility_mnm_api_response_common_output,
-  magic_visibility_mnm_api_response_single_output,
-  magic_visibility_mnm_messages_output,
+  magic$$visibility$$mnm_api$$response$$common,
+  magic$$visibility$$mnm_api$$response$$common$$failure,
+  magic$$visibility$$mnm_api$$response$$single,
+  magic$$visibility$$mnm_messages,
 } from "../../outputs.js";
-import { magic_visibility_mnm_account_identifier } from "../../schemas.js";
-import { magic_visibility_mnm_mnm_rule_automatic_advertisement_output } from "../outputs.js";
-import { magic_visibility_mnm_rule_identifier } from "../schemas.js";
 import {
-  magic_visibility_mnm_mnm_rule_advertisable_response_output,
-  magic_visibility_mnm_mnm_rule_advertisement_single_response_output,
+  magic$$visibility$$mnm_mnm_rule_advertisable_response,
+  magic$$visibility$$mnm_mnm_rule_advertisement_single_response,
 } from "./outputs.js";
 
 /**
- * The tools of `magic_network_monitoring.rules.advertisements`.
+ * The tools of `magicNetworkMonitoring.rules.advertisements`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_network_monitoring_rules_advertisements_edit",
+    name: "magicNetworkMonitoring_rules_advertisements_edit",
     title: "Update advertisement for rule",
-    description: "Update advertisement for rule.",
+    description: "Update advertisement for rule.\n\nPATCH /accounts/{account_id}/mnm/rules/{rule_id}/advertisement",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
-        "rule_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_rule_identifier",
-          "description": "The id of the rule. Must be unique."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The id of the rule. Must be unique.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_advertisement_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule_advertisable_response": magic_visibility_mnm_mnm_rule_advertisable_response_output,
-        "magic-visibility-mnm_mnm_rule_advertisement_single_response": magic_visibility_mnm_mnm_rule_advertisement_single_response_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule_advertisable_response": magic$$visibility$$mnm_mnm_rule_advertisable_response,
+        "magic-visibility-mnm_mnm_rule_advertisement_single_response": magic$$visibility$$mnm_mnm_rule_advertisement_single_response,
       },
     },
     annotations: {
@@ -87,13 +89,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule_advertisable_response": magic_visibility_mnm_mnm_rule_advertisable_response_output,
-        "magic-visibility-mnm_mnm_rule_advertisement_single_response": magic_visibility_mnm_mnm_rule_advertisement_single_response_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule_advertisable_response": magic$$visibility$$mnm_mnm_rule_advertisable_response,
+        "magic-visibility-mnm_mnm_rule_advertisement_single_response": magic$$visibility$$mnm_mnm_rule_advertisement_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/rules/bulk/tools.ts b/src/generated/forge-mcp/magicNetworkMonitoring/rules/bulk/tools.ts
index 916a73b4c..78a33be36 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/rules/bulk/tools.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/rules/bulk/tools.ts
@@ -3,58 +3,33 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_visibility_mnm_api_response_common_failure_output,
-  magic_visibility_mnm_api_response_common_output,
-  magic_visibility_mnm_messages_output,
+  magic$$visibility$$mnm_api$$response$$common,
+  magic$$visibility$$mnm_api$$response$$common$$failure,
+  magic$$visibility$$mnm_messages,
 } from "../../outputs.js";
-import { magic_visibility_mnm_account_identifier } from "../../schemas.js";
 import {
-  magic_visibility_mnm_api_response_collection_output,
-  magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-  magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-  magic_visibility_mnm_mnm_rule_duration_output,
-  magic_visibility_mnm_mnm_rule_ip_prefix_output,
-  magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-  magic_visibility_mnm_mnm_rule_name_output,
-  magic_visibility_mnm_mnm_rule_output,
-  magic_visibility_mnm_mnm_rule_packet_threshold_output,
-  magic_visibility_mnm_mnm_rule_prefix_match_output,
-  magic_visibility_mnm_mnm_rule_type_output,
-  magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-  magic_visibility_mnm_mnm_rule_zscore_target_output,
-  magic_visibility_mnm_mnm_rules_collection_response_output,
-  magic_visibility_mnm_result_info_output,
-  magic_visibility_mnm_rule_identifier_output,
+  magic$$visibility$$mnm_api$$response$$collection,
+  magic$$visibility$$mnm_mnm_rule,
+  magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+  magic$$visibility$$mnm_mnm_rules_collection_response,
+  magic$$visibility$$mnm_result_info,
 } from "../outputs.js";
 import {
-  magic_visibility_mnm_mnm_rule_automatic_advertisement,
-  magic_visibility_mnm_mnm_rule_bandwidth_threshold,
-  magic_visibility_mnm_mnm_rule_create,
-  magic_visibility_mnm_mnm_rule_duration,
-  magic_visibility_mnm_mnm_rule_ip_prefix,
-  magic_visibility_mnm_mnm_rule_ip_prefixes,
-  magic_visibility_mnm_mnm_rule_name,
-  magic_visibility_mnm_mnm_rule_packet_threshold,
-  magic_visibility_mnm_mnm_rule_prefix_match,
-  magic_visibility_mnm_mnm_rule_type,
-  magic_visibility_mnm_mnm_rule_zscore_sensitivity,
-  magic_visibility_mnm_mnm_rule_zscore_target,
+  magic$$visibility$$mnm_mnm_rule_create,
+  magic$$visibility$$mnm_mnm_rule_ip_prefixes as magic$$visibility$$mnm_mnm_rule_ip_prefixes$,
 } from "../schemas.js";
 
 /**
- * The tools of `magic_network_monitoring.rules.bulk`.
+ * The tools of `magicNetworkMonitoring.rules.bulk`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_network_monitoring_rules_bulk_create",
+    name: "magicNetworkMonitoring_rules_bulk_create",
     title: "Create rules in bulk",
-    description: "Create multiple network monitoring rules for account in a single request. Supports up to 100 rules per request. All rules in a single request must be of the same type.",
+    description: "Create multiple network monitoring rules for account in a single request. Supports up to 100 rules per request. All rules in a single request must be of the same type.\n\nPOST /accounts/{account_id}/mnm/rules/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
         "body": {
           "items": {
             "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_create"
@@ -62,49 +37,40 @@ export const tools: readonly Tool[] = [
           "maxItems": 100,
           "minItems": 1,
           "type": "array"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold,
-        "magic-visibility-mnm_mnm_rule_create": magic_visibility_mnm_mnm_rule_create,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target,
+        "magic-visibility-mnm_mnm_rule_create": magic$$visibility$$mnm_mnm_rule_create,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rules_collection_response",
       $defs: {
-        "magic-visibility-mnm_api-response-collection": magic_visibility_mnm_api_response_collection_output,
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_collection_response": magic_visibility_mnm_mnm_rules_collection_response_output,
-        "magic-visibility-mnm_result_info": magic_visibility_mnm_result_info_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-collection": magic$$visibility$$mnm_api$$response$$collection,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_collection_response": magic$$visibility$$mnm_mnm_rules_collection_response,
+        "magic-visibility-mnm_result_info": magic$$visibility$$mnm_result_info,
       },
     },
     annotations: {
@@ -138,25 +104,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-collection": magic_visibility_mnm_api_response_collection_output,
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_collection_response": magic_visibility_mnm_mnm_rules_collection_response_output,
-        "magic-visibility-mnm_result_info": magic_visibility_mnm_result_info_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-collection": magic$$visibility$$mnm_api$$response$$collection,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_collection_response": magic$$visibility$$mnm_mnm_rules_collection_response,
+        "magic-visibility-mnm_result_info": magic$$visibility$$mnm_result_info,
       },
     },
     request: (args) => ({
@@ -165,15 +120,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_rules_bulk_update",
+    name: "magicNetworkMonitoring_rules_bulk_update",
     title: "Update rules in bulk",
-    description: "Update multiple network monitoring rules for account in a single request. Supports up to 100 rules per request. All rules in a single request must be of the same type.",
+    description: "Update multiple network monitoring rules for account in a single request. Supports up to 100 rules per request. All rules in a single request must be of the same type.\n\nPUT /accounts/{account_id}/mnm/rules/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
         "body": {
           "items": {
             "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_create"
@@ -181,49 +133,40 @@ export const tools: readonly Tool[] = [
           "maxItems": 100,
           "minItems": 1,
           "type": "array"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold,
-        "magic-visibility-mnm_mnm_rule_create": magic_visibility_mnm_mnm_rule_create,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target,
+        "magic-visibility-mnm_mnm_rule_create": magic$$visibility$$mnm_mnm_rule_create,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rules_collection_response",
       $defs: {
-        "magic-visibility-mnm_api-response-collection": magic_visibility_mnm_api_response_collection_output,
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_collection_response": magic_visibility_mnm_mnm_rules_collection_response_output,
-        "magic-visibility-mnm_result_info": magic_visibility_mnm_result_info_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-collection": magic$$visibility$$mnm_api$$response$$collection,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_collection_response": magic$$visibility$$mnm_mnm_rules_collection_response,
+        "magic-visibility-mnm_result_info": magic$$visibility$$mnm_result_info,
       },
     },
     annotations: {
@@ -258,25 +201,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-collection": magic_visibility_mnm_api_response_collection_output,
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_collection_response": magic_visibility_mnm_mnm_rules_collection_response_output,
-        "magic-visibility-mnm_result_info": magic_visibility_mnm_result_info_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-collection": magic$$visibility$$mnm_api$$response$$collection,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_collection_response": magic$$visibility$$mnm_mnm_rules_collection_response,
+        "magic-visibility-mnm_result_info": magic$$visibility$$mnm_result_info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/rules/outputs.ts b/src/generated/forge-mcp/magicNetworkMonitoring/rules/outputs.ts
index 919c24f94..759dc0261 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/rules/outputs.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `magic-visibility-mnm_api-response-collection` in responses.
  */
-export const magic_visibility_mnm_api_response_collection_output: JsonSchema = {
+export const magic$$visibility$$mnm_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-mnm_api-response-common"
@@ -36,42 +36,99 @@ export const magic_visibility_mnm_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `magic-visibility-mnm_mnm_rule` in responses.
  */
-export const magic_visibility_mnm_mnm_rule_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_rule: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "automatic_advertisement": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_automatic_advertisement"
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "bandwidth_threshold": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_bandwidth_threshold"
+          "type": "number"
         },
         "duration": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_duration"
+          "enum": [
+            "1m",
+            "5m",
+            "10m",
+            "15m",
+            "20m",
+            "30m",
+            "45m",
+            "60m"
+          ],
+          "type": "string"
         },
         "id": {
-          "$ref": "#/$defs/magic-visibility-mnm_rule_identifier"
+          "type": "string"
         },
         "name": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_name"
+          "type": "string"
         },
         "packet_threshold": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_packet_threshold"
+          "type": "number"
         },
         "prefix_match": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_prefix_match"
+          "oneOf": [
+            {
+              "enum": [
+                "exact",
+                "subnet",
+                "supernet"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "prefixes": {
           "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_ip_prefixes"
         },
         "type": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_type"
+          "enum": [
+            "threshold",
+            "zscore",
+            "advanced_ddos"
+          ],
+          "type": "string"
         },
         "zscore_sensitivity": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_zscore_sensitivity"
+          "oneOf": [
+            {
+              "enum": [
+                "low",
+                "medium",
+                "high"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "zscore_target": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_zscore_target"
+          "oneOf": [
+            {
+              "enum": [
+                "bits",
+                "packets"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
       "required": [
@@ -89,151 +146,21 @@ export const magic_visibility_mnm_mnm_rule_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_automatic_advertisement` in
- * responses.
- */
-export const magic_visibility_mnm_mnm_rule_automatic_advertisement_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_bandwidth_threshold` in
- * responses.
- */
-export const magic_visibility_mnm_mnm_rule_bandwidth_threshold_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_duration` in responses.
- */
-export const magic_visibility_mnm_mnm_rule_duration_output: JsonSchema = {
-  "enum": [
-    "1m",
-    "5m",
-    "10m",
-    "15m",
-    "20m",
-    "30m",
-    "45m",
-    "60m"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_ip_prefix` in responses.
- */
-export const magic_visibility_mnm_mnm_rule_ip_prefix_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-mnm_mnm_rule_ip_prefixes` in responses.
  */
-export const magic_visibility_mnm_mnm_rule_ip_prefixes_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_rule_ip_prefixes: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_ip_prefix"
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_name` in responses.
- */
-export const magic_visibility_mnm_mnm_rule_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_packet_threshold` in responses.
- */
-export const magic_visibility_mnm_mnm_rule_packet_threshold_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_prefix_match` in responses.
- */
-export const magic_visibility_mnm_mnm_rule_prefix_match_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "exact",
-        "subnet",
-        "supernet"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_type` in responses.
- */
-export const magic_visibility_mnm_mnm_rule_type_output: JsonSchema = {
-  "enum": [
-    "threshold",
-    "zscore",
-    "advanced_ddos"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_zscore_sensitivity` in
- * responses.
- */
-export const magic_visibility_mnm_mnm_rule_zscore_sensitivity_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "low",
-        "medium",
-        "high"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_zscore_target` in responses.
- */
-export const magic_visibility_mnm_mnm_rule_zscore_target_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "bits",
-        "packets"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `magic-visibility-mnm_mnm_rules_collection_response` in
  * responses.
  */
-export const magic_visibility_mnm_mnm_rules_collection_response_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_rules_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-mnm_api-response-collection"
@@ -262,7 +189,7 @@ export const magic_visibility_mnm_mnm_rules_collection_response_output: JsonSche
 /**
  * The schema of `magic-visibility-mnm_mnm_rules_single_response` in responses.
  */
-export const magic_visibility_mnm_mnm_rules_single_response_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_rules_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-mnm_api-response-single"
@@ -281,7 +208,7 @@ export const magic_visibility_mnm_mnm_rules_single_response_output: JsonSchema =
 /**
  * The schema of `magic-visibility-mnm_result_info` in responses.
  */
-export const magic_visibility_mnm_result_info_output: JsonSchema = {
+export const magic$$visibility$$mnm_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -298,10 +225,3 @@ export const magic_visibility_mnm_result_info_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `magic-visibility-mnm_rule_identifier` in responses.
- */
-export const magic_visibility_mnm_rule_identifier_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/rules/schemas.ts b/src/generated/forge-mcp/magicNetworkMonitoring/rules/schemas.ts
index 4fb7b186d..5829664d0 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/rules/schemas.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/rules/schemas.ts
@@ -3,75 +3,109 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_automatic_advertisement`.
- */
-export const magic_visibility_mnm_mnm_rule_automatic_advertisement: JsonSchema = {
-  "description": "Toggle on if you would like Cloudflare to automatically advertise the IP Prefixes within the rule via Magic Transit when the rule is triggered. Only available for users of Magic Transit.",
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_bandwidth_threshold`.
- */
-export const magic_visibility_mnm_mnm_rule_bandwidth_threshold: JsonSchema = {
-  "description": "The number of bits per second for the rule. When this value is exceeded for the set duration, an alert notification is sent. Minimum of 1 and no maximum.",
-  "type": "number"
-};
-
 /**
  * The schema of `magic-visibility-mnm_mnm_rule_create`.
  */
-export const magic_visibility_mnm_mnm_rule_create: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_rule_create: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "automatic_advertisement": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_automatic_advertisement",
-          "description": "Toggle on if you would like Cloudflare to automatically advertise the IP Prefixes within the rule via Magic Transit when the rule is triggered. Only available for users of Magic Transit."
+          "description": "Toggle on if you would like Cloudflare to automatically advertise the IP Prefixes within the rule via Magic Transit when the rule is triggered. Only available for users of Magic Transit.",
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "bandwidth_threshold": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_bandwidth_threshold",
-          "description": "The number of bits per second for the rule. When this value is exceeded for the set duration, an alert notification is sent. Minimum of 1 and no maximum."
+          "description": "The number of bits per second for the rule. When this value is exceeded for the set duration, an alert notification is sent. Minimum of 1 and no maximum.",
+          "type": "number"
         },
         "duration": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_duration",
           "default": "1m",
-          "description": "The amount of time that the rule threshold must be exceeded to send an alert notification. The final value must be equivalent to one of the following 8 values [\"1m\",\"5m\",\"10m\",\"15m\",\"20m\",\"30m\",\"45m\",\"60m\"]."
+          "description": "The amount of time that the rule threshold must be exceeded to send an alert notification. The final value must be equivalent to one of the following 8 values [\"1m\",\"5m\",\"10m\",\"15m\",\"20m\",\"30m\",\"45m\",\"60m\"].",
+          "enum": [
+            "1m",
+            "5m",
+            "10m",
+            "15m",
+            "20m",
+            "30m",
+            "45m",
+            "60m"
+          ],
+          "type": "string"
         },
         "name": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_name",
-          "description": "The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9, underscore (_), dash (-), period (.), and tilde (~). You can’t have a space in the rule name. Max 256 characters."
+          "description": "The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9, underscore (_), dash (-), period (.), and tilde (~). You can’t have a space in the rule name. Max 256 characters.",
+          "type": "string"
         },
         "packet_threshold": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_packet_threshold",
-          "description": "The number of packets per second for the rule. When this value is exceeded for the set duration, an alert notification is sent. Minimum of 1 and no maximum."
+          "description": "The number of packets per second for the rule. When this value is exceeded for the set duration, an alert notification is sent. Minimum of 1 and no maximum.",
+          "type": "number"
         },
         "prefix_match": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_prefix_match",
-          "description": "Prefix match type to be applied for a prefix auto advertisement when using an advanced_ddos rule."
+          "description": "Prefix match type to be applied for a prefix auto advertisement when using an advanced_ddos rule.",
+          "oneOf": [
+            {
+              "enum": [
+                "exact",
+                "subnet",
+                "supernet"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "prefixes": {
           "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_ip_prefixes"
         },
         "type": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_type",
-          "description": "MNM rule type."
+          "description": "MNM rule type.",
+          "enum": [
+            "threshold",
+            "zscore",
+            "advanced_ddos"
+          ],
+          "type": "string"
         },
         "zscore_sensitivity": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_zscore_sensitivity",
-          "description": "Level of sensitivity set for zscore rules."
+          "description": "Level of sensitivity set for zscore rules.",
+          "oneOf": [
+            {
+              "enum": [
+                "low",
+                "medium",
+                "high"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "zscore_target": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_zscore_target",
-          "description": "Target of the zscore rule analysis."
+          "description": "Target of the zscore rule analysis.",
+          "oneOf": [
+            {
+              "enum": [
+                "bits",
+                "packets"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
       "required": [
@@ -88,134 +122,13 @@ export const magic_visibility_mnm_mnm_rule_create: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_duration`.
- */
-export const magic_visibility_mnm_mnm_rule_duration: JsonSchema = {
-  "description": "The amount of time that the rule threshold must be exceeded to send an alert notification. The final value must be equivalent to one of the following 8 values [\"1m\",\"5m\",\"10m\",\"15m\",\"20m\",\"30m\",\"45m\",\"60m\"].",
-  "enum": [
-    "1m",
-    "5m",
-    "10m",
-    "15m",
-    "20m",
-    "30m",
-    "45m",
-    "60m"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_ip_prefix`.
- */
-export const magic_visibility_mnm_mnm_rule_ip_prefix: JsonSchema = {
-  "description": "The IP prefixes that are monitored for this rule. Must be a CIDR range like 203.0.113.0/24. Max 5000 different CIDR ranges.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-mnm_mnm_rule_ip_prefixes`.
  */
-export const magic_visibility_mnm_mnm_rule_ip_prefixes: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_rule_ip_prefixes: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_ip_prefix"
+    "description": "The IP prefixes that are monitored for this rule. Must be a CIDR range like 203.0.113.0/24. Max 5000 different CIDR ranges.",
+    "type": "string"
   },
   "type": "array"
 };
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_name`.
- */
-export const magic_visibility_mnm_mnm_rule_name: JsonSchema = {
-  "description": "The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9, underscore (_), dash (-), period (.), and tilde (~). You can’t have a space in the rule name. Max 256 characters.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_packet_threshold`.
- */
-export const magic_visibility_mnm_mnm_rule_packet_threshold: JsonSchema = {
-  "description": "The number of packets per second for the rule. When this value is exceeded for the set duration, an alert notification is sent. Minimum of 1 and no maximum.",
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_prefix_match`.
- */
-export const magic_visibility_mnm_mnm_rule_prefix_match: JsonSchema = {
-  "description": "Prefix match type to be applied for a prefix auto advertisement when using an advanced_ddos rule.",
-  "oneOf": [
-    {
-      "enum": [
-        "exact",
-        "subnet",
-        "supernet"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_type`.
- */
-export const magic_visibility_mnm_mnm_rule_type: JsonSchema = {
-  "description": "MNM rule type.",
-  "enum": [
-    "threshold",
-    "zscore",
-    "advanced_ddos"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_zscore_sensitivity`.
- */
-export const magic_visibility_mnm_mnm_rule_zscore_sensitivity: JsonSchema = {
-  "description": "Level of sensitivity set for zscore rules.",
-  "oneOf": [
-    {
-      "enum": [
-        "low",
-        "medium",
-        "high"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `magic-visibility-mnm_mnm_rule_zscore_target`.
- */
-export const magic_visibility_mnm_mnm_rule_zscore_target: JsonSchema = {
-  "description": "Target of the zscore rule analysis.",
-  "oneOf": [
-    {
-      "enum": [
-        "bits",
-        "packets"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `magic-visibility-mnm_rule_identifier`.
- */
-export const magic_visibility_mnm_rule_identifier: JsonSchema = {
-  "description": "The id of the rule. Must be unique.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/rules/tools.ts b/src/generated/forge-mcp/magicNetworkMonitoring/rules/tools.ts
index d213efbe3..a8ef20140 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/rules/tools.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/rules/tools.ts
@@ -3,105 +3,70 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_visibility_mnm_api_response_common_failure_output,
-  magic_visibility_mnm_api_response_common_output,
-  magic_visibility_mnm_api_response_single_output,
-  magic_visibility_mnm_messages_output,
+  magic$$visibility$$mnm_api$$response$$common,
+  magic$$visibility$$mnm_api$$response$$common$$failure,
+  magic$$visibility$$mnm_api$$response$$single,
+  magic$$visibility$$mnm_messages,
 } from "../outputs.js";
-import { magic_visibility_mnm_account_identifier } from "../schemas.js";
 import {
-  magic_visibility_mnm_api_response_collection_output,
-  magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-  magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-  magic_visibility_mnm_mnm_rule_duration_output,
-  magic_visibility_mnm_mnm_rule_ip_prefix_output,
-  magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-  magic_visibility_mnm_mnm_rule_name_output,
-  magic_visibility_mnm_mnm_rule_output,
-  magic_visibility_mnm_mnm_rule_packet_threshold_output,
-  magic_visibility_mnm_mnm_rule_prefix_match_output,
-  magic_visibility_mnm_mnm_rule_type_output,
-  magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-  magic_visibility_mnm_mnm_rule_zscore_target_output,
-  magic_visibility_mnm_mnm_rules_collection_response_output,
-  magic_visibility_mnm_mnm_rules_single_response_output,
-  magic_visibility_mnm_result_info_output,
-  magic_visibility_mnm_rule_identifier_output,
+  magic$$visibility$$mnm_api$$response$$collection,
+  magic$$visibility$$mnm_mnm_rule,
+  magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+  magic$$visibility$$mnm_mnm_rules_collection_response,
+  magic$$visibility$$mnm_mnm_rules_single_response,
+  magic$$visibility$$mnm_result_info,
 } from "./outputs.js";
 import {
-  magic_visibility_mnm_mnm_rule_automatic_advertisement,
-  magic_visibility_mnm_mnm_rule_bandwidth_threshold,
-  magic_visibility_mnm_mnm_rule_create,
-  magic_visibility_mnm_mnm_rule_duration,
-  magic_visibility_mnm_mnm_rule_ip_prefix,
-  magic_visibility_mnm_mnm_rule_ip_prefixes,
-  magic_visibility_mnm_mnm_rule_name,
-  magic_visibility_mnm_mnm_rule_packet_threshold,
-  magic_visibility_mnm_mnm_rule_prefix_match,
-  magic_visibility_mnm_mnm_rule_type,
-  magic_visibility_mnm_mnm_rule_zscore_sensitivity,
-  magic_visibility_mnm_mnm_rule_zscore_target,
-  magic_visibility_mnm_rule_identifier,
+  magic$$visibility$$mnm_mnm_rule_create,
+  magic$$visibility$$mnm_mnm_rule_ip_prefixes as magic$$visibility$$mnm_mnm_rule_ip_prefixes$,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_network_monitoring.rules`.
+ * The tools of `magicNetworkMonitoring.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_network_monitoring_rules_create",
+    name: "magicNetworkMonitoring_rules_create",
     title: "Create rules",
-    description: "Create network monitoring rules for account. Currently only supports creating a single rule per API request.",
+    description: "Create network monitoring rules for account. Currently only supports creating a single rule per API request.\n\nPOST /accounts/{account_id}/mnm/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_create"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold,
-        "magic-visibility-mnm_mnm_rule_create": magic_visibility_mnm_mnm_rule_create,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target,
+        "magic-visibility-mnm_mnm_rule_create": magic$$visibility$$mnm_mnm_rule_create,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rules_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     annotations: {
@@ -135,24 +100,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     request: (args) => ({
@@ -161,49 +115,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_rules_delete",
+    name: "magicNetworkMonitoring_rules_delete",
     title: "Delete rule",
-    description: "Delete a network monitoring rule for account.",
+    description: "Delete a network monitoring rule for account.\n\nDELETE /accounts/{account_id}/mnm/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
-        "rule_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_rule_identifier",
-          "description": "The id of the rule. Must be unique."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The id of the rule. Must be unique.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rules_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     annotations: {
@@ -237,24 +186,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     request: (args) => ({
@@ -262,65 +200,52 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_rules_edit",
+    name: "magicNetworkMonitoring_rules_edit",
     title: "Update rule",
-    description: "Update a network monitoring rule for account.",
+    description: "Update a network monitoring rule for account.\n\nPATCH /accounts/{account_id}/mnm/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_create"
         },
-        "rule_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_rule_identifier",
-          "description": "The id of the rule. Must be unique."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The id of the rule. Must be unique.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold,
-        "magic-visibility-mnm_mnm_rule_create": magic_visibility_mnm_mnm_rule_create,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier,
+        "magic-visibility-mnm_mnm_rule_create": magic$$visibility$$mnm_mnm_rule_create,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rules_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     annotations: {
@@ -355,24 +280,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     request: (args) => ({
@@ -381,49 +295,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_rules_get",
+    name: "magicNetworkMonitoring_rules_get",
     title: "Get rule",
-    description: "List a single network monitoring rule for account.",
+    description: "List a single network monitoring rule for account.\n\nGET /accounts/{account_id}/mnm/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
-        "rule_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_rule_identifier",
-          "description": "The id of the rule. Must be unique."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The id of the rule. Must be unique.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rules_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     annotations: {
@@ -459,24 +368,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     request: (args) => ({
@@ -484,44 +382,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_rules_list",
+    name: "magicNetworkMonitoring_rules_list",
     title: "List rules",
-    description: "Lists network monitoring rules for account.",
+    description: "Lists network monitoring rules for account.\n\nGET /accounts/{account_id}/mnm/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rules_collection_response",
       $defs: {
-        "magic-visibility-mnm_api-response-collection": magic_visibility_mnm_api_response_collection_output,
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_collection_response": magic_visibility_mnm_mnm_rules_collection_response_output,
-        "magic-visibility-mnm_result_info": magic_visibility_mnm_result_info_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-collection": magic$$visibility$$mnm_api$$response$$collection,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_collection_response": magic$$visibility$$mnm_mnm_rules_collection_response,
+        "magic-visibility-mnm_result_info": magic$$visibility$$mnm_result_info,
       },
     },
     annotations: {
@@ -557,25 +451,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-collection": magic_visibility_mnm_api_response_collection_output,
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_collection_response": magic_visibility_mnm_mnm_rules_collection_response_output,
-        "magic-visibility-mnm_result_info": magic_visibility_mnm_result_info_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-collection": magic$$visibility$$mnm_api$$response$$collection,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_collection_response": magic$$visibility$$mnm_mnm_rules_collection_response,
+        "magic-visibility-mnm_result_info": magic$$visibility$$mnm_result_info,
       },
     },
     request: (args) => ({
@@ -583,59 +466,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_network_monitoring_rules_update",
+    name: "magicNetworkMonitoring_rules_update",
     title: "Update rules",
-    description: "Update network monitoring rules for account.",
+    description: "Update network monitoring rules for account.\n\nPUT /accounts/{account_id}/mnm/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic-visibility-mnm_mnm_rule_create"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold,
-        "magic-visibility-mnm_mnm_rule_create": magic_visibility_mnm_mnm_rule_create,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target,
+        "magic-visibility-mnm_mnm_rule_create": magic$$visibility$$mnm_mnm_rule_create,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_rules_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     annotations: {
@@ -670,24 +541,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_rule": magic_visibility_mnm_mnm_rule_output,
-        "magic-visibility-mnm_mnm_rule_automatic_advertisement": magic_visibility_mnm_mnm_rule_automatic_advertisement_output,
-        "magic-visibility-mnm_mnm_rule_bandwidth_threshold": magic_visibility_mnm_mnm_rule_bandwidth_threshold_output,
-        "magic-visibility-mnm_mnm_rule_duration": magic_visibility_mnm_mnm_rule_duration_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefix": magic_visibility_mnm_mnm_rule_ip_prefix_output,
-        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic_visibility_mnm_mnm_rule_ip_prefixes_output,
-        "magic-visibility-mnm_mnm_rule_name": magic_visibility_mnm_mnm_rule_name_output,
-        "magic-visibility-mnm_mnm_rule_packet_threshold": magic_visibility_mnm_mnm_rule_packet_threshold_output,
-        "magic-visibility-mnm_mnm_rule_prefix_match": magic_visibility_mnm_mnm_rule_prefix_match_output,
-        "magic-visibility-mnm_mnm_rule_type": magic_visibility_mnm_mnm_rule_type_output,
-        "magic-visibility-mnm_mnm_rule_zscore_sensitivity": magic_visibility_mnm_mnm_rule_zscore_sensitivity_output,
-        "magic-visibility-mnm_mnm_rule_zscore_target": magic_visibility_mnm_mnm_rule_zscore_target_output,
-        "magic-visibility-mnm_mnm_rules_single_response": magic_visibility_mnm_mnm_rules_single_response_output,
-        "magic-visibility-mnm_rule_identifier": magic_visibility_mnm_rule_identifier_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_rule": magic$$visibility$$mnm_mnm_rule,
+        "magic-visibility-mnm_mnm_rule_ip_prefixes": magic$$visibility$$mnm_mnm_rule_ip_prefixes,
+        "magic-visibility-mnm_mnm_rules_single_response": magic$$visibility$$mnm_mnm_rules_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/schemas.ts b/src/generated/forge-mcp/magicNetworkMonitoring/schemas.ts
deleted file mode 100644
index 93ac1b044..000000000
--- a/src/generated/forge-mcp/magicNetworkMonitoring/schemas.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `magic-visibility-mnm_account_identifier`.
- */
-export const magic_visibility_mnm_account_identifier: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/vpcFlows/tokens/outputs.ts b/src/generated/forge-mcp/magicNetworkMonitoring/vpcFlows/tokens/outputs.ts
index 2d40db3db..32a292207 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/vpcFlows/tokens/outputs.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/vpcFlows/tokens/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `magic-visibility-mnm_mnm_vpc_flows_single_response` in
  * responses.
  */
-export const magic_visibility_mnm_mnm_vpc_flows_single_response_output: JsonSchema = {
+export const magic$$visibility$$mnm_mnm_vpc_flows_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-mnm_api-response-single"
@@ -15,17 +15,10 @@ export const magic_visibility_mnm_mnm_vpc_flows_single_response_output: JsonSche
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/magic-visibility-mnm_mnm_vpc_flows_token"
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `magic-visibility-mnm_mnm_vpc_flows_token` in responses.
- */
-export const magic_visibility_mnm_mnm_vpc_flows_token_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/magicNetworkMonitoring/vpcFlows/tokens/tools.ts b/src/generated/forge-mcp/magicNetworkMonitoring/vpcFlows/tokens/tools.ts
index 88b96b1f8..3150b1faf 100644
--- a/src/generated/forge-mcp/magicNetworkMonitoring/vpcFlows/tokens/tools.ts
+++ b/src/generated/forge-mcp/magicNetworkMonitoring/vpcFlows/tokens/tools.ts
@@ -3,47 +3,49 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_visibility_mnm_api_response_common_failure_output,
-  magic_visibility_mnm_api_response_common_output,
-  magic_visibility_mnm_api_response_single_output,
-  magic_visibility_mnm_messages_output,
+  magic$$visibility$$mnm_api$$response$$common,
+  magic$$visibility$$mnm_api$$response$$common$$failure,
+  magic$$visibility$$mnm_api$$response$$single,
+  magic$$visibility$$mnm_messages,
 } from "../../outputs.js";
-import { magic_visibility_mnm_account_identifier } from "../../schemas.js";
-import {
-  magic_visibility_mnm_mnm_vpc_flows_single_response_output,
-  magic_visibility_mnm_mnm_vpc_flows_token_output,
-} from "./outputs.js";
+import { magic$$visibility$$mnm_mnm_vpc_flows_single_response } from "./outputs.js";
 
 /**
- * The tools of `magic_network_monitoring.vpc_flows.tokens`.
+ * The tools of `magicNetworkMonitoring.vpcFlows.tokens`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_network_monitoring_vpc_flows_tokens_create",
+    name: "magicNetworkMonitoring_vpcFlows_tokens_create",
     title: "Generate authentication token for VPC flow logs export.",
-    description: "Generate authentication token for VPC flow logs export.",
+    description: "Generate authentication token for VPC flow logs export.\n\nPOST /accounts/{account_id}/mnm/vpc-flows/token",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-mnm_account_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-mnm_account_identifier": magic_visibility_mnm_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-mnm_mnm_vpc_flows_single_response",
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_vpc_flows_single_response": magic_visibility_mnm_mnm_vpc_flows_single_response_output,
-        "magic-visibility-mnm_mnm_vpc_flows_token": magic_visibility_mnm_mnm_vpc_flows_token_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_vpc_flows_single_response": magic$$visibility$$mnm_mnm_vpc_flows_single_response,
       },
     },
     annotations: {
@@ -77,12 +79,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-mnm_api-response-common": magic_visibility_mnm_api_response_common_output,
-        "magic-visibility-mnm_api-response-common-failure": magic_visibility_mnm_api_response_common_failure_output,
-        "magic-visibility-mnm_api-response-single": magic_visibility_mnm_api_response_single_output,
-        "magic-visibility-mnm_messages": magic_visibility_mnm_messages_output,
-        "magic-visibility-mnm_mnm_vpc_flows_single_response": magic_visibility_mnm_mnm_vpc_flows_single_response_output,
-        "magic-visibility-mnm_mnm_vpc_flows_token": magic_visibility_mnm_mnm_vpc_flows_token_output,
+        "magic-visibility-mnm_api-response-common": magic$$visibility$$mnm_api$$response$$common,
+        "magic-visibility-mnm_api-response-common-failure": magic$$visibility$$mnm_api$$response$$common$$failure,
+        "magic-visibility-mnm_api-response-single": magic$$visibility$$mnm_api$$response$$single,
+        "magic-visibility-mnm_messages": magic$$visibility$$mnm_messages,
+        "magic-visibility-mnm_mnm_vpc_flows_single_response": magic$$visibility$$mnm_mnm_vpc_flows_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/outputs.ts b/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/outputs.ts
index 8a80098c1..603f319b0 100644
--- a/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_DnsProtectionRule` in responses.
  */
-export const advanced_ddos_protection_DnsProtectionRule_output: JsonSchema = {
+export const advanced$$ddos$$protection_DnsProtectionRule: JsonSchema = {
   "properties": {
     "block_any_queries": {
       "type": "boolean"
@@ -60,7 +60,7 @@ export const advanced_ddos_protection_DnsProtectionRule_output: JsonSchema = {
  * The schema of `advanced-ddos-protection_dns-protection-rule-list-response` in
  * responses.
  */
-export const advanced_ddos_protection_dns_protection_rule_list_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_dns$$protection$$rule$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-collection"
@@ -83,7 +83,7 @@ export const advanced_ddos_protection_dns_protection_rule_list_response_output:
  * The schema of `advanced-ddos-protection_dns-protection-rule-response` in
  * responses.
  */
-export const advanced_ddos_protection_dns_protection_rule_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_dns$$protection$$rule$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/schemas.ts b/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/schemas.ts
index ac2ffdeed..e7b74975f 100644
--- a/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_DnsProtectionRuleUpdate`.
  */
-export const advanced_ddos_protection_DnsProtectionRuleUpdate: JsonSchema = {
+export const advanced$$ddos$$protection_DnsProtectionRuleUpdate: JsonSchema = {
   "properties": {
     "block_any_queries": {
       "description": "The new value for whether to block DNS ANY queries. Optional.",
@@ -35,7 +35,7 @@ export const advanced_ddos_protection_DnsProtectionRuleUpdate: JsonSchema = {
 /**
  * The schema of `advanced-ddos-protection_NewDnsProtectionRule`.
  */
-export const advanced_ddos_protection_NewDnsProtectionRule: JsonSchema = {
+export const advanced$$ddos$$protection_NewDnsProtectionRule: JsonSchema = {
   "properties": {
     "block_any_queries": {
       "description": "Whether to block DNS ANY queries. Optional. Defaults to true.",
diff --git a/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/tools.ts b/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/tools.ts
index 0756e93d0..462b966fc 100644
--- a/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedDnsProtection/configs/dns/protection/rules/tools.ts
@@ -1,56 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_collection_output,
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$collection,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../../../outputs.js";
 import {
-  advanced_ddos_protection_identifier,
-  advanced_ddos_protection_uuid,
-} from "../../../../../schemas.js";
-import {
-  advanced_ddos_protection_DnsProtectionRule_output,
-  advanced_ddos_protection_dns_protection_rule_list_response_output,
-  advanced_ddos_protection_dns_protection_rule_response_output,
+  advanced$$ddos$$protection_DnsProtectionRule,
+  advanced$$ddos$$protection_dns$$protection$$rule$$list$$response,
+  advanced$$ddos$$protection_dns$$protection$$rule$$response,
 } from "./outputs.js";
 import {
-  advanced_ddos_protection_DnsProtectionRuleUpdate,
-  advanced_ddos_protection_NewDnsProtectionRule,
+  advanced$$ddos$$protection_DnsProtectionRuleUpdate,
+  advanced$$ddos$$protection_NewDnsProtectionRule,
 } from "./schemas.js";
 
 /**
  * The tools of
- * `magic_transit.advanced_dns_protection.configs.dns.protection.rules`.
+ * `magicTransit.advancedDnsProtection.configs.dns.protection.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_dns_protection_configs_dns_protection_rules_bulk_delete",
+    name: "magicTransit_advancedDnsProtection_configs_dns_protection_rules_bulkDelete",
     title: "Delete all DNS Protection rules.",
-    description: "Delete all DNS Protection rules for an account.",
+    description: "Delete all DNS Protection rules for an account.\n\nDELETE /accounts/{account_id}/magic/advanced_dns_protection/configs/dns_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -77,9 +80,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -87,37 +90,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_dns_protection_configs_dns_protection_rules_create",
+    name: "magicTransit_advancedDnsProtection_configs_dns_protection_rules_create",
     title: "Create DNS Protection rule.",
-    description: "Create a DNS Protection rule for an account.",
+    description: "Create a DNS Protection rule for an account.\n\nPOST /accounts/{account_id}/magic/advanced_dns_protection/configs/dns_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_NewDnsProtectionRule",
           "description": "The new DNS Protection rule to add."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_NewDnsProtectionRule": advanced_ddos_protection_NewDnsProtectionRule,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_NewDnsProtectionRule": advanced$$ddos$$protection_NewDnsProtectionRule,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_dns-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRule": advanced_ddos_protection_DnsProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_dns-protection-rule-response": advanced_ddos_protection_dns_protection_rule_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_DnsProtectionRule": advanced$$ddos$$protection_DnsProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_dns-protection-rule-response": advanced$$ddos$$protection_dns$$protection$$rule$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -144,11 +156,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRule": advanced_ddos_protection_DnsProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_dns-protection-rule-response": advanced_ddos_protection_dns_protection_rule_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_DnsProtectionRule": advanced$$ddos$$protection_DnsProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_dns-protection-rule-response": advanced$$ddos$$protection_dns$$protection$$rule$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -157,35 +169,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_dns_protection_configs_dns_protection_rules_delete",
+    name: "magicTransit_advancedDnsProtection_configs_dns_protection_rules_delete",
     title: "Delete DNS Protection rule.",
-    description: "Delete a DNS Protection rule specified by the given UUID.",
+    description: "Delete a DNS Protection rule specified by the given UUID.\n\nDELETE /accounts/{account_id}/magic/advanced_dns_protection/configs/dns_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the DNS Protection rule to delete."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the DNS Protection rule to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -212,9 +230,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -222,37 +240,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_dns_protection_configs_dns_protection_rules_get",
+    name: "magicTransit_advancedDnsProtection_configs_dns_protection_rules_get",
     title: "Get DNS Protection rule.",
-    description: "Get a DNS Protection rule specified by the given UUID.",
+    description: "Get a DNS Protection rule specified by the given UUID.\n\nGET /accounts/{account_id}/magic/advanced_dns_protection/configs/dns_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the DNS Protection rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the DNS Protection rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_dns-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRule": advanced_ddos_protection_DnsProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_dns-protection-rule-response": advanced_ddos_protection_dns_protection_rule_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_DnsProtectionRule": advanced$$ddos$$protection_DnsProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_dns-protection-rule-response": advanced$$ddos$$protection_dns$$protection$$rule$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -280,11 +304,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRule": advanced_ddos_protection_DnsProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_dns-protection-rule-response": advanced_ddos_protection_dns_protection_rule_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_DnsProtectionRule": advanced$$ddos$$protection_DnsProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_dns-protection-rule-response": advanced$$ddos$$protection_dns$$protection$$rule$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -292,48 +316,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_dns_protection_configs_dns_protection_rules_list",
+    name: "magicTransit_advancedDnsProtection_configs_dns_protection_rules_list",
     title: "List all DNS Protection rules.",
-    description: "List all DNS Protection rules for an account.",
+    description: "List all DNS Protection rules for an account.\n\nGET /accounts/{account_id}/magic/advanced_dns_protection/configs/dns_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "direction": {
-          "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
-          "type": "string"
-        },
-        "order": {
-          "description": "The field to order by. Defaults to 'prefix'.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "description": "The page number for pagination. Defaults to 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
+              "type": "string"
+            },
+            "order": {
+              "description": "The field to order by. Defaults to 'prefix'.",
+              "type": "string"
+            },
+            "page": {
+              "description": "The page number for pagination. Defaults to 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_dns-protection-rule-list-response",
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRule": advanced_ddos_protection_DnsProtectionRule_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_dns-protection-rule-list-response": advanced_ddos_protection_dns_protection_rule_list_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_DnsProtectionRule": advanced$$ddos$$protection_DnsProtectionRule,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_dns-protection-rule-list-response": advanced$$ddos$$protection_dns$$protection$$rule$$list$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -361,62 +398,70 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRule": advanced_ddos_protection_DnsProtectionRule_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_dns-protection-rule-list-response": advanced_ddos_protection_dns_protection_rule_list_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_DnsProtectionRule": advanced$$ddos$$protection_DnsProtectionRule,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_dns-protection-rule-list-response": advanced$$ddos$$protection_dns$$protection$$rule$$list$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/advanced_dns_protection/configs/dns_protection/rules`,
       query: [
-        ["page", args["page"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
+        ["page", param(args, "query", "page"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
       ],
     }),
   },
   {
-    name: "magic_transit_advanced_dns_protection_configs_dns_protection_rules_update",
+    name: "magicTransit_advancedDnsProtection_configs_dns_protection_rules_update",
     title: "Update DNS Protection rule.",
-    description: "Update a DNS Protection rule specified by the given UUID.",
+    description: "Update a DNS Protection rule specified by the given UUID.\n\nPATCH /accounts/{account_id}/magic/advanced_dns_protection/configs/dns_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_DnsProtectionRuleUpdate",
           "description": "The updates to apply to the DNS Protection rule."
         },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the DNS Protection rule to update."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the DNS Protection rule to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRuleUpdate": advanced_ddos_protection_DnsProtectionRuleUpdate,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
+        "advanced-ddos-protection_DnsProtectionRuleUpdate": advanced$$ddos$$protection_DnsProtectionRuleUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_dns-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRule": advanced_ddos_protection_DnsProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_dns-protection-rule-response": advanced_ddos_protection_dns_protection_rule_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_DnsProtectionRule": advanced$$ddos$$protection_DnsProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_dns-protection-rule-response": advanced$$ddos$$protection_dns$$protection$$rule$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -443,11 +488,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_DnsProtectionRule": advanced_ddos_protection_DnsProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_dns-protection-rule-response": advanced_ddos_protection_dns_protection_rule_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_DnsProtectionRule": advanced$$ddos$$protection_DnsProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_dns-protection-rule-response": advanced$$ddos$$protection_dns$$protection$$rule$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/outputs.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/outputs.ts
index 011da9bc2..8f500bf7e 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_InfraPrefix` in responses.
  */
-export const advanced_ddos_protection_InfraPrefix_output: JsonSchema = {
+export const advanced$$ddos$$protection_InfraPrefix: JsonSchema = {
   "properties": {
     "comment": {
       "type": "string"
@@ -44,7 +44,7 @@ export const advanced_ddos_protection_InfraPrefix_output: JsonSchema = {
  * The schema of `advanced-ddos-protection_infra-prefix-list-response` in
  * responses.
  */
-export const advanced_ddos_protection_infra_prefix_list_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_infra$$prefix$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-collection"
@@ -66,7 +66,7 @@ export const advanced_ddos_protection_infra_prefix_list_response_output: JsonSch
 /**
  * The schema of `advanced-ddos-protection_infra-prefix-response` in responses.
  */
-export const advanced_ddos_protection_infra_prefix_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_infra$$prefix$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/prefix/schemas.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/prefix/schemas.ts
index ed28472f6..8df1635d1 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/prefix/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/prefix/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_InfraPrefixUpdate`.
  */
-export const advanced_ddos_protection_InfraPrefixUpdate: JsonSchema = {
+export const advanced$$ddos$$protection_InfraPrefixUpdate: JsonSchema = {
   "properties": {
     "comment": {
       "description": "A comment describing the allowlist prefix. Optional.",
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/prefix/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/prefix/tools.ts
index e8ab0d7b3..501be61b4 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/prefix/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/prefix/tools.ts
@@ -3,55 +3,56 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../../outputs.js";
 import {
-  advanced_ddos_protection_identifier,
-  advanced_ddos_protection_uuid,
-} from "../../../../schemas.js";
-import {
-  advanced_ddos_protection_InfraPrefix_output,
-  advanced_ddos_protection_infra_prefix_response_output,
+  advanced$$ddos$$protection_InfraPrefix,
+  advanced$$ddos$$protection_infra$$prefix$$response,
 } from "../outputs.js";
-import { advanced_ddos_protection_InfraPrefixUpdate } from "./schemas.js";
+import { advanced$$ddos$$protection_InfraPrefixUpdate } from "./schemas.js";
 
 /**
- * The tools of
- * `magic_transit.advanced_tcp_protection.configs.allowlist.prefix`.
+ * The tools of `magicTransit.advancedTcpProtection.configs.allowlist.prefix`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_allowlist_prefix_delete",
+    name: "magicTransit_advancedTcpProtection_configs_allowlist_prefix_delete",
     title: "Delete allowlist prefix.",
-    description: "Delete the allowlist prefix for an account given a UUID.",
+    description: "Delete the allowlist prefix for an account given a UUID.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/allowlist/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the allowlist prefix to delete."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "The UUID of the allowlist prefix to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -78,9 +79,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -88,37 +89,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_allowlist_prefix_get",
+    name: "magicTransit_advancedTcpProtection_configs_allowlist_prefix_get",
     title: "Get allowlist prefix.",
-    description: "Get an allowlist prefix specified by the given UUID.",
+    description: "Get an allowlist prefix specified by the given UUID.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/allowlist/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the allowlist prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "The UUID of the allowlist prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_infra-prefix-response",
       $defs: {
-        "advanced-ddos-protection_InfraPrefix": advanced_ddos_protection_InfraPrefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_infra-prefix-response": advanced_ddos_protection_infra_prefix_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_InfraPrefix": advanced$$ddos$$protection_InfraPrefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_infra-prefix-response": advanced$$ddos$$protection_infra$$prefix$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -146,11 +153,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_InfraPrefix": advanced_ddos_protection_InfraPrefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_infra-prefix-response": advanced_ddos_protection_infra_prefix_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_InfraPrefix": advanced$$ddos$$protection_InfraPrefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_infra-prefix-response": advanced$$ddos$$protection_infra$$prefix$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -158,43 +165,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_allowlist_prefix_update",
+    name: "magicTransit_advancedTcpProtection_configs_allowlist_prefix_update",
     title: "Update allowlist prefix.",
-    description: "Update an allowlist prefix specified by the given UUID.",
+    description: "Update an allowlist prefix specified by the given UUID.\n\nPATCH /accounts/{account_id}/magic/advanced_tcp_protection/configs/allowlist/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_InfraPrefixUpdate",
           "description": "The updates to apply to the allowlist prefix."
         },
-        "prefix_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the allowlist prefix to update."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "The UUID of the allowlist prefix to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_InfraPrefixUpdate": advanced_ddos_protection_InfraPrefixUpdate,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
+        "advanced-ddos-protection_InfraPrefixUpdate": advanced$$ddos$$protection_InfraPrefixUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_infra-prefix-response",
       $defs: {
-        "advanced-ddos-protection_InfraPrefix": advanced_ddos_protection_InfraPrefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_infra-prefix-response": advanced_ddos_protection_infra_prefix_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_InfraPrefix": advanced$$ddos$$protection_InfraPrefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_infra-prefix-response": advanced$$ddos$$protection_infra$$prefix$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -221,11 +236,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_InfraPrefix": advanced_ddos_protection_InfraPrefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_infra-prefix-response": advanced_ddos_protection_infra_prefix_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_InfraPrefix": advanced$$ddos$$protection_InfraPrefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_infra-prefix-response": advanced$$ddos$$protection_infra$$prefix$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/schemas.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/schemas.ts
index 22cc2f3e4..7689ff25e 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_NewInfraPrefix`.
  */
-export const advanced_ddos_protection_NewInfraPrefix: JsonSchema = {
+export const advanced$$ddos$$protection_NewInfraPrefix: JsonSchema = {
   "properties": {
     "comment": {
       "description": "An comment describing the allowlist prefix.",
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/tools.ts
index 24b5ae3ae..ff3e21f24 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/allowlist/tools.ts
@@ -1,49 +1,55 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_collection_output,
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$collection,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../outputs.js";
-import { advanced_ddos_protection_identifier } from "../../../schemas.js";
 import {
-  advanced_ddos_protection_InfraPrefix_output,
-  advanced_ddos_protection_infra_prefix_list_response_output,
-  advanced_ddos_protection_infra_prefix_response_output,
+  advanced$$ddos$$protection_InfraPrefix,
+  advanced$$ddos$$protection_infra$$prefix$$list$$response,
+  advanced$$ddos$$protection_infra$$prefix$$response,
 } from "./outputs.js";
-import { advanced_ddos_protection_NewInfraPrefix } from "./schemas.js";
+import { advanced$$ddos$$protection_NewInfraPrefix } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.advanced_tcp_protection.configs.allowlist`.
+ * The tools of `magicTransit.advancedTcpProtection.configs.allowlist`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_allowlist_bulk_delete",
+    name: "magicTransit_advancedTcpProtection_configs_allowlist_bulkDelete",
     title: "Delete all allowlist prefixes.",
-    description: "Delete all allowlist prefixes for an account.",
+    description: "Delete all allowlist prefixes for an account.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/allowlist",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -70,9 +76,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -80,37 +86,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_allowlist_create",
+    name: "magicTransit_advancedTcpProtection_configs_allowlist_create",
     title: "Create allowlist prefix.",
-    description: "Create an allowlist prefix for an account.",
+    description: "Create an allowlist prefix for an account.\n\nPOST /accounts/{account_id}/magic/advanced_tcp_protection/configs/allowlist",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_NewInfraPrefix",
           "description": "The new allowlist prefix to create."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_NewInfraPrefix": advanced_ddos_protection_NewInfraPrefix,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_NewInfraPrefix": advanced$$ddos$$protection_NewInfraPrefix,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_infra-prefix-response",
       $defs: {
-        "advanced-ddos-protection_InfraPrefix": advanced_ddos_protection_InfraPrefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_infra-prefix-response": advanced_ddos_protection_infra_prefix_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_InfraPrefix": advanced$$ddos$$protection_InfraPrefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_infra-prefix-response": advanced$$ddos$$protection_infra$$prefix$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -137,11 +152,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_InfraPrefix": advanced_ddos_protection_InfraPrefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_infra-prefix-response": advanced_ddos_protection_infra_prefix_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_InfraPrefix": advanced$$ddos$$protection_InfraPrefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_infra-prefix-response": advanced$$ddos$$protection_infra$$prefix$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -150,48 +165,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_allowlist_list",
+    name: "magicTransit_advancedTcpProtection_configs_allowlist_list",
     title: "List all allowlist prefixes.",
-    description: "List all allowlist prefixes for an account.",
+    description: "List all allowlist prefixes for an account.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/allowlist",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "direction": {
-          "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "order": {
-          "description": "The field to order by. Defaults to 'prefix'.",
-          "type": "string"
-        },
-        "page": {
-          "description": "The page number for pagination. Defaults to 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
+              "type": "string"
+            },
+            "order": {
+              "description": "The field to order by. Defaults to 'prefix'.",
+              "type": "string"
+            },
+            "page": {
+              "description": "The page number for pagination. Defaults to 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_infra-prefix-list-response",
       $defs: {
-        "advanced-ddos-protection_InfraPrefix": advanced_ddos_protection_InfraPrefix_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_infra-prefix-list-response": advanced_ddos_protection_infra_prefix_list_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_InfraPrefix": advanced$$ddos$$protection_InfraPrefix,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_infra-prefix-list-response": advanced$$ddos$$protection_infra$$prefix$$list$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -219,21 +247,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_InfraPrefix": advanced_ddos_protection_InfraPrefix_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_infra-prefix-list-response": advanced_ddos_protection_infra_prefix_list_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_InfraPrefix": advanced$$ddos$$protection_InfraPrefix,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_infra-prefix-list-response": advanced$$ddos$$protection_infra$$prefix$$list$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/advanced_tcp_protection/configs/allowlist`,
       query: [
-        ["page", args["page"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
+        ["page", param(args, "query", "page"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/outputs.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/outputs.ts
index 1ea714fe3..1abf9b674 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_ExpressionFilter` in responses.
  */
-export const advanced_ddos_protection_ExpressionFilter_output: JsonSchema = {
+export const advanced$$ddos$$protection_ExpressionFilter: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -40,7 +40,7 @@ export const advanced_ddos_protection_ExpressionFilter_output: JsonSchema = {
  * The schema of `advanced-ddos-protection_expression-filter-list-response` in
  * responses.
  */
-export const advanced_ddos_protection_expression_filter_list_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_expression$$filter$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-collection"
@@ -63,7 +63,7 @@ export const advanced_ddos_protection_expression_filter_list_response_output: Js
  * The schema of `advanced-ddos-protection_expression-filter-response` in
  * responses.
  */
-export const advanced_ddos_protection_expression_filter_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_expression$$filter$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/bulk/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/bulk/tools.ts
index 90bb63a22..986746406 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/bulk/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/bulk/tools.ts
@@ -3,58 +3,66 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_collection_output,
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$collection,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../../outputs.js";
-import { advanced_ddos_protection_identifier } from "../../../../schemas.js";
 import {
-  advanced_ddos_protection_Prefix_output,
-  advanced_ddos_protection_prefix_list_response_output,
+  advanced$$ddos$$protection_Prefix,
+  advanced$$ddos$$protection_prefix$$list$$response,
 } from "../outputs.js";
-import { advanced_ddos_protection_NewPrefix } from "../schemas.js";
+import { advanced$$ddos$$protection_NewPrefix } from "../schemas.js";
 
 /**
- * The tools of `magic_transit.advanced_tcp_protection.configs.prefixes.bulk`.
+ * The tools of `magicTransit.advancedTcpProtection.configs.prefixes.bulk`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_prefixes_bulk_create",
+    name: "magicTransit_advancedTcpProtection_configs_prefixes_bulk_create",
     title: "Create multiple prefixes.",
-    description: "Create multiple prefixes for an account.",
+    description: "Create multiple prefixes for an account.\n\nPOST /accounts/{account_id}/magic/advanced_tcp_protection/configs/prefixes/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "description": "The list of new prefixes to create.",
           "items": {
             "$ref": "#/$defs/advanced-ddos-protection_NewPrefix"
           },
           "type": "array"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_NewPrefix": advanced_ddos_protection_NewPrefix,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_NewPrefix": advanced$$ddos$$protection_NewPrefix,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_prefix-list-response",
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-list-response": advanced_ddos_protection_prefix_list_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-list-response": advanced$$ddos$$protection_prefix$$list$$response,
       },
     },
     annotations: {
@@ -81,12 +89,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-list-response": advanced_ddos_protection_prefix_list_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-list-response": advanced$$ddos$$protection_prefix$$list$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/outputs.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/outputs.ts
index a31eb7d3d..7535d973a 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_Prefix` in responses.
  */
-export const advanced_ddos_protection_Prefix_output: JsonSchema = {
+export const advanced$$ddos$$protection_Prefix: JsonSchema = {
   "properties": {
     "comment": {
       "type": "string"
@@ -43,7 +43,7 @@ export const advanced_ddos_protection_Prefix_output: JsonSchema = {
 /**
  * The schema of `advanced-ddos-protection_prefix-list-response` in responses.
  */
-export const advanced_ddos_protection_prefix_list_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_prefix$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-collection"
@@ -65,7 +65,7 @@ export const advanced_ddos_protection_prefix_list_response_output: JsonSchema =
 /**
  * The schema of `advanced-ddos-protection_prefix-response` in responses.
  */
-export const advanced_ddos_protection_prefix_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_prefix$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/schemas.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/schemas.ts
index 89c1072f8..50b10612f 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_NewPrefix`.
  */
-export const advanced_ddos_protection_NewPrefix: JsonSchema = {
+export const advanced$$ddos$$protection_NewPrefix: JsonSchema = {
   "properties": {
     "comment": {
       "description": "A comment describing the prefix.",
@@ -32,7 +32,7 @@ export const advanced_ddos_protection_NewPrefix: JsonSchema = {
 /**
  * The schema of `advanced-ddos-protection_PrefixUpdate`.
  */
-export const advanced_ddos_protection_PrefixUpdate: JsonSchema = {
+export const advanced$$ddos$$protection_PrefixUpdate: JsonSchema = {
   "properties": {
     "comment": {
       "description": "A new comment for the prefix. Optional.",
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/tools.ts
index 457389af8..7624fd2db 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/prefixes/tools.ts
@@ -1,55 +1,58 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_collection_output,
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$collection,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../outputs.js";
 import {
-  advanced_ddos_protection_identifier,
-  advanced_ddos_protection_uuid,
-} from "../../../schemas.js";
-import {
-  advanced_ddos_protection_Prefix_output,
-  advanced_ddos_protection_prefix_list_response_output,
-  advanced_ddos_protection_prefix_response_output,
+  advanced$$ddos$$protection_Prefix,
+  advanced$$ddos$$protection_prefix$$list$$response,
+  advanced$$ddos$$protection_prefix$$response,
 } from "./outputs.js";
 import {
-  advanced_ddos_protection_NewPrefix,
-  advanced_ddos_protection_PrefixUpdate,
+  advanced$$ddos$$protection_NewPrefix,
+  advanced$$ddos$$protection_PrefixUpdate,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.advanced_tcp_protection.configs.prefixes`.
+ * The tools of `magicTransit.advancedTcpProtection.configs.prefixes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_prefixes_bulk_delete",
+    name: "magicTransit_advancedTcpProtection_configs_prefixes_bulkDelete",
     title: "Delete all prefixes.",
-    description: "Delete all prefixes for an account.",
+    description: "Delete all prefixes for an account.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -76,9 +79,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -86,37 +89,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_prefixes_create",
+    name: "magicTransit_advancedTcpProtection_configs_prefixes_create",
     title: "Create prefix.",
-    description: "Create a prefix for an account.",
+    description: "Create a prefix for an account.\n\nPOST /accounts/{account_id}/magic/advanced_tcp_protection/configs/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_NewPrefix",
           "description": "The new prefix to create."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_NewPrefix": advanced_ddos_protection_NewPrefix,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_NewPrefix": advanced$$ddos$$protection_NewPrefix,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_prefix-response",
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-response": advanced_ddos_protection_prefix_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-response": advanced$$ddos$$protection_prefix$$response,
       },
     },
     annotations: {
@@ -143,11 +155,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-response": advanced_ddos_protection_prefix_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-response": advanced$$ddos$$protection_prefix$$response,
       },
     },
     request: (args) => ({
@@ -156,35 +168,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_prefixes_delete",
+    name: "magicTransit_advancedTcpProtection_configs_prefixes_delete",
     title: "Delete prefix.",
-    description: "Delete the prefix for an account given a UUID.",
+    description: "Delete the prefix for an account given a UUID.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/prefixes/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the prefix to delete."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "The UUID of the prefix to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -211,9 +229,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -221,37 +239,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_prefixes_get",
+    name: "magicTransit_advancedTcpProtection_configs_prefixes_get",
     title: "Get prefix.",
-    description: "Get a prefix specified by the given UUID.",
+    description: "Get a prefix specified by the given UUID.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/prefixes/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "prefix_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the prefix."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "The UUID of the prefix.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_prefix-response",
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-response": advanced_ddos_protection_prefix_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-response": advanced$$ddos$$protection_prefix$$response,
       },
     },
     annotations: {
@@ -279,11 +303,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-response": advanced_ddos_protection_prefix_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-response": advanced$$ddos$$protection_prefix$$response,
       },
     },
     request: (args) => ({
@@ -291,48 +315,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_prefixes_list",
+    name: "magicTransit_advancedTcpProtection_configs_prefixes_list",
     title: "List all prefixes.",
-    description: "List all prefixes for an account.",
+    description: "List all prefixes for an account.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "direction": {
-          "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
-          "type": "string"
-        },
-        "order": {
-          "description": "The field to order by. Defaults to 'prefix'.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "description": "The page number for pagination. Defaults to 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
+              "type": "string"
+            },
+            "order": {
+              "description": "The field to order by. Defaults to 'prefix'.",
+              "type": "string"
+            },
+            "page": {
+              "description": "The page number for pagination. Defaults to 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_prefix-list-response",
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-list-response": advanced_ddos_protection_prefix_list_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-list-response": advanced$$ddos$$protection_prefix$$list$$response,
       },
     },
     annotations: {
@@ -360,62 +397,70 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-list-response": advanced_ddos_protection_prefix_list_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-list-response": advanced$$ddos$$protection_prefix$$list$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/advanced_tcp_protection/configs/prefixes`,
       query: [
-        ["page", args["page"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
+        ["page", param(args, "query", "page"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
       ],
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_prefixes_update",
+    name: "magicTransit_advancedTcpProtection_configs_prefixes_update",
     title: "Update prefix.",
-    description: "Update a prefix specified by the given UUID.",
+    description: "Update a prefix specified by the given UUID.\n\nPATCH /accounts/{account_id}/magic/advanced_tcp_protection/configs/prefixes/{prefix_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_PrefixUpdate",
           "description": "The updates to apply to the prefix."
         },
-        "prefix_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the prefix to update."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "prefix_id": {
+              "description": "The UUID of the prefix to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "prefix_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "prefix_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_PrefixUpdate": advanced_ddos_protection_PrefixUpdate,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
+        "advanced-ddos-protection_PrefixUpdate": advanced$$ddos$$protection_PrefixUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_prefix-response",
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-response": advanced_ddos_protection_prefix_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-response": advanced$$ddos$$protection_prefix$$response,
       },
     },
     annotations: {
@@ -442,11 +487,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_Prefix": advanced_ddos_protection_Prefix_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_prefix-response": advanced_ddos_protection_prefix_response_output,
+        "advanced-ddos-protection_Prefix": advanced$$ddos$$protection_Prefix,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_prefix-response": advanced$$ddos$$protection_prefix$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/schemas.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/schemas.ts
index 18f0d0ecb..5bb065a32 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_ExpressionFilterUpdate`.
  */
-export const advanced_ddos_protection_ExpressionFilterUpdate: JsonSchema = {
+export const advanced$$ddos$$protection_ExpressionFilterUpdate: JsonSchema = {
   "properties": {
     "expression": {
       "description": "The new filter expression. Optional.",
@@ -23,7 +23,7 @@ export const advanced_ddos_protection_ExpressionFilterUpdate: JsonSchema = {
 /**
  * The schema of `advanced-ddos-protection_NewExpressionFilter`.
  */
-export const advanced_ddos_protection_NewExpressionFilter: JsonSchema = {
+export const advanced$$ddos$$protection_NewExpressionFilter: JsonSchema = {
   "properties": {
     "expression": {
       "description": "The filter expression.",
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/filters/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/filters/tools.ts
index 5ee7cc777..69404060e 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/filters/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/filters/tools.ts
@@ -1,56 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_collection_output,
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$collection,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../../../outputs.js";
 import {
-  advanced_ddos_protection_identifier,
-  advanced_ddos_protection_uuid,
-} from "../../../../../schemas.js";
-import {
-  advanced_ddos_protection_ExpressionFilter_output,
-  advanced_ddos_protection_expression_filter_list_response_output,
-  advanced_ddos_protection_expression_filter_response_output,
+  advanced$$ddos$$protection_ExpressionFilter,
+  advanced$$ddos$$protection_expression$$filter$$list$$response,
+  advanced$$ddos$$protection_expression$$filter$$response,
 } from "../../../outputs.js";
 import {
-  advanced_ddos_protection_ExpressionFilterUpdate,
-  advanced_ddos_protection_NewExpressionFilter,
+  advanced$$ddos$$protection_ExpressionFilterUpdate,
+  advanced$$ddos$$protection_NewExpressionFilter,
 } from "../../../schemas.js";
 
 /**
  * The tools of
- * `magic_transit.advanced_tcp_protection.configs.syn.protection.filters`.
+ * `magicTransit.advancedTcpProtection.configs.syn.protection.filters`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_filters_bulk_delete",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_filters_bulkDelete",
     title: "Delete all SYN Protection filters.",
-    description: "Delete all SYN Protection filters for an account.",
+    description: "Delete all SYN Protection filters for an account.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/filters",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -77,9 +80,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -87,37 +90,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_filters_create",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_filters_create",
     title: "Create a SYN Protection filter.",
-    description: "Create a SYN Protection filter for an account.",
+    description: "Create a SYN Protection filter for an account.\n\nPOST /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/filters",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_NewExpressionFilter",
           "description": "The new filter to create."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_NewExpressionFilter": advanced_ddos_protection_NewExpressionFilter,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_NewExpressionFilter": advanced$$ddos$$protection_NewExpressionFilter,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_expression-filter-response",
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -144,11 +156,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -157,35 +169,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_filters_delete",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_filters_delete",
     title: "Delete SYN Protection filter.",
-    description: "Delete a SYN Protection filter specified by the given UUID.",
+    description: "Delete a SYN Protection filter specified by the given UUID.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/filters/{filter_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "filter_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the filter to delete."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "filter_id": {
+              "description": "The UUID of the filter to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "filter_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "filter_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -212,9 +230,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -222,37 +240,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_filters_get",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_filters_get",
     title: "Get SYN Protection filter.",
-    description: "Get a SYN Protection filter specified by the given UUID.",
+    description: "Get a SYN Protection filter specified by the given UUID.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/filters/{filter_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "filter_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the filter to retrieve."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "filter_id": {
+              "description": "The UUID of the filter to retrieve.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "filter_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "filter_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_expression-filter-response",
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -280,11 +304,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -292,52 +316,65 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_filters_list",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_filters_list",
     title: "List all SYN Protection filters.",
-    description: "List all SYN Protection filters for an account.",
+    description: "List all SYN Protection filters for an account.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/filters",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "direction": {
-          "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
-          "type": "string"
-        },
-        "filter_mode": {
-          "description": "The mode of the filters to get. Optional. Valid values: 'enabled', 'disabled', 'monitoring'.",
-          "type": "string"
-        },
-        "order": {
-          "description": "The field to order by. Defaults to 'prefix'.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "description": "The page number for pagination. Defaults to 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
+              "type": "string"
+            },
+            "mode": {
+              "description": "The mode of the filters to get. Optional. Valid values: 'enabled', 'disabled', 'monitoring'.",
+              "type": "string"
+            },
+            "order": {
+              "description": "The field to order by. Defaults to 'prefix'.",
+              "type": "string"
+            },
+            "page": {
+              "description": "The page number for pagination. Defaults to 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_expression-filter-list-response",
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_expression-filter-list-response": advanced_ddos_protection_expression_filter_list_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_expression-filter-list-response": advanced$$ddos$$protection_expression$$filter$$list$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -365,63 +402,71 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_expression-filter-list-response": advanced_ddos_protection_expression_filter_list_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_expression-filter-list-response": advanced$$ddos$$protection_expression$$filter$$list$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/advanced_tcp_protection/configs/syn_protection/filters`,
       query: [
-        ["mode", args["filter_mode"], false],
-        ["page", args["page"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
+        ["mode", param(args, "query", "mode"), false],
+        ["page", param(args, "query", "page"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
       ],
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_filters_update",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_filters_update",
     title: "Update SYN Protection filter.",
-    description: "Update a SYN Protection filter specified by the given UUID.",
+    description: "Update a SYN Protection filter specified by the given UUID.\n\nPATCH /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/filters/{filter_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_ExpressionFilterUpdate",
           "description": "The updates to apply to the filter."
         },
-        "filter_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the filter to update."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "filter_id": {
+              "description": "The UUID of the filter to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "filter_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "filter_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_ExpressionFilterUpdate": advanced_ddos_protection_ExpressionFilterUpdate,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
+        "advanced-ddos-protection_ExpressionFilterUpdate": advanced$$ddos$$protection_ExpressionFilterUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_expression-filter-response",
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -448,11 +493,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/outputs.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/outputs.ts
index 76d5eec7a..e5e8f9480 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_SynProtectionRule` in responses.
  */
-export const advanced_ddos_protection_SynProtectionRule_output: JsonSchema = {
+export const advanced$$ddos$$protection_SynProtectionRule: JsonSchema = {
   "properties": {
     "burst_sensitivity": {
       "type": "string"
@@ -56,7 +56,7 @@ export const advanced_ddos_protection_SynProtectionRule_output: JsonSchema = {
  * The schema of `advanced-ddos-protection_syn-protection-rule-list-response` in
  * responses.
  */
-export const advanced_ddos_protection_syn_protection_rule_list_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_syn$$protection$$rule$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-collection"
@@ -79,7 +79,7 @@ export const advanced_ddos_protection_syn_protection_rule_list_response_output:
  * The schema of `advanced-ddos-protection_syn-protection-rule-response` in
  * responses.
  */
-export const advanced_ddos_protection_syn_protection_rule_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_syn$$protection$$rule$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/schemas.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/schemas.ts
index bab2cc96f..a88925ca0 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_NewSynProtectionRule`.
  */
-export const advanced_ddos_protection_NewSynProtectionRule: JsonSchema = {
+export const advanced$$ddos$$protection_NewSynProtectionRule: JsonSchema = {
   "properties": {
     "burst_sensitivity": {
       "description": "The burst sensitivity. Must be one of 'low', 'medium', 'high'.",
@@ -46,7 +46,7 @@ export const advanced_ddos_protection_NewSynProtectionRule: JsonSchema = {
 /**
  * The schema of `advanced-ddos-protection_SynProtectionRuleUpdate`.
  */
-export const advanced_ddos_protection_SynProtectionRuleUpdate: JsonSchema = {
+export const advanced$$ddos$$protection_SynProtectionRuleUpdate: JsonSchema = {
   "properties": {
     "burst_sensitivity": {
       "description": "The new burst sensitivity. Optional. Must be one of 'low', 'medium', 'high'.",
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/tools.ts
index 1579171bc..0f9e7f9c1 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/syn/protection/rules/tools.ts
@@ -1,56 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_collection_output,
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$collection,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../../../outputs.js";
 import {
-  advanced_ddos_protection_identifier,
-  advanced_ddos_protection_uuid,
-} from "../../../../../schemas.js";
-import {
-  advanced_ddos_protection_SynProtectionRule_output,
-  advanced_ddos_protection_syn_protection_rule_list_response_output,
-  advanced_ddos_protection_syn_protection_rule_response_output,
+  advanced$$ddos$$protection_SynProtectionRule,
+  advanced$$ddos$$protection_syn$$protection$$rule$$list$$response,
+  advanced$$ddos$$protection_syn$$protection$$rule$$response,
 } from "./outputs.js";
 import {
-  advanced_ddos_protection_NewSynProtectionRule,
-  advanced_ddos_protection_SynProtectionRuleUpdate,
+  advanced$$ddos$$protection_NewSynProtectionRule,
+  advanced$$ddos$$protection_SynProtectionRuleUpdate,
 } from "./schemas.js";
 
 /**
  * The tools of
- * `magic_transit.advanced_tcp_protection.configs.syn.protection.rules`.
+ * `magicTransit.advancedTcpProtection.configs.syn.protection.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_rules_bulk_delete",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_rules_bulkDelete",
     title: "Delete all SYN Protection rules.",
-    description: "Delete all SYN Protection rules for an account.",
+    description: "Delete all SYN Protection rules for an account.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -77,9 +80,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -87,37 +90,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_rules_create",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_rules_create",
     title: "Create SYN Protection rule.",
-    description: "Create a SYN Protection rule for an account.",
+    description: "Create a SYN Protection rule for an account.\n\nPOST /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_NewSynProtectionRule",
           "description": "The new SYN Protection rule to add."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_NewSynProtectionRule": advanced_ddos_protection_NewSynProtectionRule,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_NewSynProtectionRule": advanced$$ddos$$protection_NewSynProtectionRule,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_syn-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_SynProtectionRule": advanced_ddos_protection_SynProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_syn-protection-rule-response": advanced_ddos_protection_syn_protection_rule_response_output,
+        "advanced-ddos-protection_SynProtectionRule": advanced$$ddos$$protection_SynProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_syn-protection-rule-response": advanced$$ddos$$protection_syn$$protection$$rule$$response,
       },
     },
     annotations: {
@@ -144,11 +156,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_SynProtectionRule": advanced_ddos_protection_SynProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_syn-protection-rule-response": advanced_ddos_protection_syn_protection_rule_response_output,
+        "advanced-ddos-protection_SynProtectionRule": advanced$$ddos$$protection_SynProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_syn-protection-rule-response": advanced$$ddos$$protection_syn$$protection$$rule$$response,
       },
     },
     request: (args) => ({
@@ -157,35 +169,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_rules_delete",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_rules_delete",
     title: "Delete SYN Protection rule.",
-    description: "Delete a SYN Protection rule specified by the given UUID.",
+    description: "Delete a SYN Protection rule specified by the given UUID.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the SYN Protection rule to delete."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the SYN Protection rule to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -212,9 +230,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -222,37 +240,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_rules_get",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_rules_get",
     title: "Get SYN Protection rule.",
-    description: "Get a SYN Protection rule specified by the given UUID.",
+    description: "Get a SYN Protection rule specified by the given UUID.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the SYN Protection rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the SYN Protection rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_syn-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_SynProtectionRule": advanced_ddos_protection_SynProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_syn-protection-rule-response": advanced_ddos_protection_syn_protection_rule_response_output,
+        "advanced-ddos-protection_SynProtectionRule": advanced$$ddos$$protection_SynProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_syn-protection-rule-response": advanced$$ddos$$protection_syn$$protection$$rule$$response,
       },
     },
     annotations: {
@@ -280,11 +304,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_SynProtectionRule": advanced_ddos_protection_SynProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_syn-protection-rule-response": advanced_ddos_protection_syn_protection_rule_response_output,
+        "advanced-ddos-protection_SynProtectionRule": advanced$$ddos$$protection_SynProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_syn-protection-rule-response": advanced$$ddos$$protection_syn$$protection$$rule$$response,
       },
     },
     request: (args) => ({
@@ -292,48 +316,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_rules_list",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_rules_list",
     title: "List all SYN Protection rules.",
-    description: "List all SYN Protection rules for an account.",
+    description: "List all SYN Protection rules for an account.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "direction": {
-          "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
-          "type": "string"
-        },
-        "order": {
-          "description": "The field to order by. Defaults to 'prefix'.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "description": "The page number for pagination. Defaults to 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
+              "type": "string"
+            },
+            "order": {
+              "description": "The field to order by. Defaults to 'prefix'.",
+              "type": "string"
+            },
+            "page": {
+              "description": "The page number for pagination. Defaults to 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_syn-protection-rule-list-response",
       $defs: {
-        "advanced-ddos-protection_SynProtectionRule": advanced_ddos_protection_SynProtectionRule_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_syn-protection-rule-list-response": advanced_ddos_protection_syn_protection_rule_list_response_output,
+        "advanced-ddos-protection_SynProtectionRule": advanced$$ddos$$protection_SynProtectionRule,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_syn-protection-rule-list-response": advanced$$ddos$$protection_syn$$protection$$rule$$list$$response,
       },
     },
     annotations: {
@@ -361,62 +398,70 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_SynProtectionRule": advanced_ddos_protection_SynProtectionRule_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_syn-protection-rule-list-response": advanced_ddos_protection_syn_protection_rule_list_response_output,
+        "advanced-ddos-protection_SynProtectionRule": advanced$$ddos$$protection_SynProtectionRule,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_syn-protection-rule-list-response": advanced$$ddos$$protection_syn$$protection$$rule$$list$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/advanced_tcp_protection/configs/syn_protection/rules`,
       query: [
-        ["page", args["page"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
+        ["page", param(args, "query", "page"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
       ],
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_syn_protection_rules_update",
+    name: "magicTransit_advancedTcpProtection_configs_syn_protection_rules_update",
     title: "Update SYN Protection rule.",
-    description: "Update a SYN Protection rule specified by the given UUID.",
+    description: "Update a SYN Protection rule specified by the given UUID.\n\nPATCH /accounts/{account_id}/magic/advanced_tcp_protection/configs/syn_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_SynProtectionRuleUpdate",
           "description": "The fields to update on the SYN Protection rule."
         },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the SYN Protection rule to update."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the SYN Protection rule to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_SynProtectionRuleUpdate": advanced_ddos_protection_SynProtectionRuleUpdate,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
+        "advanced-ddos-protection_SynProtectionRuleUpdate": advanced$$ddos$$protection_SynProtectionRuleUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_syn-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_SynProtectionRule": advanced_ddos_protection_SynProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_syn-protection-rule-response": advanced_ddos_protection_syn_protection_rule_response_output,
+        "advanced-ddos-protection_SynProtectionRule": advanced$$ddos$$protection_SynProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_syn-protection-rule-response": advanced$$ddos$$protection_syn$$protection$$rule$$response,
       },
     },
     annotations: {
@@ -443,11 +488,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_SynProtectionRule": advanced_ddos_protection_SynProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_syn-protection-rule-response": advanced_ddos_protection_syn_protection_rule_response_output,
+        "advanced-ddos-protection_SynProtectionRule": advanced$$ddos$$protection_SynProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_syn-protection-rule-response": advanced$$ddos$$protection_syn$$protection$$rule$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/filters/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/filters/tools.ts
index b8a9e2a53..d9d1a6a30 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/filters/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/filters/tools.ts
@@ -1,56 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_collection_output,
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$collection,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../../../../outputs.js";
 import {
-  advanced_ddos_protection_identifier,
-  advanced_ddos_protection_uuid,
-} from "../../../../../../schemas.js";
-import {
-  advanced_ddos_protection_ExpressionFilter_output,
-  advanced_ddos_protection_expression_filter_list_response_output,
-  advanced_ddos_protection_expression_filter_response_output,
+  advanced$$ddos$$protection_ExpressionFilter,
+  advanced$$ddos$$protection_expression$$filter$$list$$response,
+  advanced$$ddos$$protection_expression$$filter$$response,
 } from "../../../../outputs.js";
 import {
-  advanced_ddos_protection_ExpressionFilterUpdate,
-  advanced_ddos_protection_NewExpressionFilter,
+  advanced$$ddos$$protection_ExpressionFilterUpdate,
+  advanced$$ddos$$protection_NewExpressionFilter,
 } from "../../../../schemas.js";
 
 /**
  * The tools of
- * `magic_transit.advanced_tcp_protection.configs.tcp.flow.protection.filters`.
+ * `magicTransit.advancedTcpProtection.configs.tcp.flow.protection.filters`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_filters_bulk_delete",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_filters_bulkDelete",
     title: "Delete all TCP Flow Protection filters.",
-    description: "Delete all TCP Flow Protection filters for an account.",
+    description: "Delete all TCP Flow Protection filters for an account.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/filters",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -77,9 +80,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -87,37 +90,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_filters_create",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_filters_create",
     title: "Create a TCP Flow Protection filter.",
-    description: "Create a TCP Flow Protection filter for an account.",
+    description: "Create a TCP Flow Protection filter for an account.\n\nPOST /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/filters",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_NewExpressionFilter",
           "description": "The new filter to create."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_NewExpressionFilter": advanced_ddos_protection_NewExpressionFilter,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_NewExpressionFilter": advanced$$ddos$$protection_NewExpressionFilter,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_expression-filter-response",
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -144,11 +156,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -157,35 +169,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_filters_delete",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_filters_delete",
     title: "Delete TCP Flow Protection filter.",
-    description: "Delete a TCP Flow Protection filter specified by the given UUID.",
+    description: "Delete a TCP Flow Protection filter specified by the given UUID.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/filters/{filter_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "filter_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the filter to delete."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "filter_id": {
+              "description": "The UUID of the filter to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "filter_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "filter_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -212,9 +230,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -222,37 +240,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_filters_get",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_filters_get",
     title: "Get TCP Flow Protection filter.",
-    description: "Get a TCP Flow Protection filter specified by the given UUID.",
+    description: "Get a TCP Flow Protection filter specified by the given UUID.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/filters/{filter_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "filter_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the filter to retrieve."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "filter_id": {
+              "description": "The UUID of the filter to retrieve.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "filter_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "filter_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_expression-filter-response",
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -280,11 +304,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -292,52 +316,65 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_filters_list",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_filters_list",
     title: "List all TCP Flow Protection filters.",
-    description: "List all TCP Flow Protection filters for an account.",
+    description: "List all TCP Flow Protection filters for an account.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/filters",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "direction": {
-          "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
-          "type": "string"
-        },
-        "filter_mode": {
-          "description": "The mode of the filters to get. Optional. Valid values: 'enabled', 'disabled', 'monitoring'.",
-          "type": "string"
-        },
-        "order": {
-          "description": "The field to order by. Defaults to 'prefix'.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "description": "The page number for pagination. Defaults to 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
+              "type": "string"
+            },
+            "mode": {
+              "description": "The mode of the filters to get. Optional. Valid values: 'enabled', 'disabled', 'monitoring'.",
+              "type": "string"
+            },
+            "order": {
+              "description": "The field to order by. Defaults to 'prefix'.",
+              "type": "string"
+            },
+            "page": {
+              "description": "The page number for pagination. Defaults to 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_expression-filter-list-response",
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_expression-filter-list-response": advanced_ddos_protection_expression_filter_list_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_expression-filter-list-response": advanced$$ddos$$protection_expression$$filter$$list$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -365,63 +402,71 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_expression-filter-list-response": advanced_ddos_protection_expression_filter_list_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_expression-filter-list-response": advanced$$ddos$$protection_expression$$filter$$list$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/advanced_tcp_protection/configs/tcp_flow_protection/filters`,
       query: [
-        ["mode", args["filter_mode"], false],
-        ["page", args["page"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
+        ["mode", param(args, "query", "mode"), false],
+        ["page", param(args, "query", "page"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
       ],
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_filters_update",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_filters_update",
     title: "Update TCP Flow Protection filter.",
-    description: "Update a TCP Flow Protection filter specified by the given UUID.",
+    description: "Update a TCP Flow Protection filter specified by the given UUID.\n\nPATCH /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/filters/{filter_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_ExpressionFilterUpdate",
           "description": "The updates to apply to the filter."
         },
-        "filter_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the filter to update."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "filter_id": {
+              "description": "The UUID of the filter to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "filter_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "filter_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_ExpressionFilterUpdate": advanced_ddos_protection_ExpressionFilterUpdate,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
+        "advanced-ddos-protection_ExpressionFilterUpdate": advanced$$ddos$$protection_ExpressionFilterUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_expression-filter-response",
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -448,11 +493,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ExpressionFilter": advanced_ddos_protection_ExpressionFilter_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_expression-filter-response": advanced_ddos_protection_expression_filter_response_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_ExpressionFilter": advanced$$ddos$$protection_ExpressionFilter,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_expression-filter-response": advanced$$ddos$$protection_expression$$filter$$response,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/outputs.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/outputs.ts
index afd2cf4ae..0018fd5ab 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_TcpFlowProtectionRule` in responses.
  */
-export const advanced_ddos_protection_TcpFlowProtectionRule_output: JsonSchema = {
+export const advanced$$ddos$$protection_TcpFlowProtectionRule: JsonSchema = {
   "properties": {
     "burst_sensitivity": {
       "type": "string"
@@ -53,7 +53,7 @@ export const advanced_ddos_protection_TcpFlowProtectionRule_output: JsonSchema =
  * `advanced-ddos-protection_tcp-flow-protection-rule-list-response` in
  * responses.
  */
-export const advanced_ddos_protection_tcp_flow_protection_rule_list_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-collection"
@@ -76,7 +76,7 @@ export const advanced_ddos_protection_tcp_flow_protection_rule_list_response_out
  * The schema of `advanced-ddos-protection_tcp-flow-protection-rule-response` in
  * responses.
  */
-export const advanced_ddos_protection_tcp_flow_protection_rule_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/schemas.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/schemas.ts
index 82a9796d4..921c00ad7 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_NewTcpFlowProtectionRule`.
  */
-export const advanced_ddos_protection_NewTcpFlowProtectionRule: JsonSchema = {
+export const advanced$$ddos$$protection_NewTcpFlowProtectionRule: JsonSchema = {
   "properties": {
     "burst_sensitivity": {
       "description": "The burst sensitivity. Must be one of 'low', 'medium', 'high'.",
@@ -42,7 +42,7 @@ export const advanced_ddos_protection_NewTcpFlowProtectionRule: JsonSchema = {
 /**
  * The schema of `advanced-ddos-protection_TcpFlowProtectionRuleUpdate`.
  */
-export const advanced_ddos_protection_TcpFlowProtectionRuleUpdate: JsonSchema = {
+export const advanced$$ddos$$protection_TcpFlowProtectionRuleUpdate: JsonSchema = {
   "properties": {
     "burst_sensitivity": {
       "description": "The new burst sensitivity. Optional. Must be one of 'low', 'medium', 'high'.",
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/tools.ts
index 6520eaf13..ad584e00a 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/flow/protection/rules/tools.ts
@@ -1,56 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_collection_output,
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$collection,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../../../../outputs.js";
 import {
-  advanced_ddos_protection_identifier,
-  advanced_ddos_protection_uuid,
-} from "../../../../../../schemas.js";
-import {
-  advanced_ddos_protection_TcpFlowProtectionRule_output,
-  advanced_ddos_protection_tcp_flow_protection_rule_list_response_output,
-  advanced_ddos_protection_tcp_flow_protection_rule_response_output,
+  advanced$$ddos$$protection_TcpFlowProtectionRule,
+  advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$list$$response,
+  advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$response,
 } from "./outputs.js";
 import {
-  advanced_ddos_protection_NewTcpFlowProtectionRule,
-  advanced_ddos_protection_TcpFlowProtectionRuleUpdate,
+  advanced$$ddos$$protection_NewTcpFlowProtectionRule,
+  advanced$$ddos$$protection_TcpFlowProtectionRuleUpdate,
 } from "./schemas.js";
 
 /**
  * The tools of
- * `magic_transit.advanced_tcp_protection.configs.tcp.flow.protection.rules`.
+ * `magicTransit.advancedTcpProtection.configs.tcp.flow.protection.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_rules_bulk_delete",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_rules_bulkDelete",
     title: "Delete all TCP Flow Protection rules.",
-    description: "Delete all TCP Flow Protection rules for an account.",
+    description: "Delete all TCP Flow Protection rules for an account.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -77,9 +80,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -87,37 +90,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_rules_create",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_rules_create",
     title: "Create TCP Flow Protection rule.",
-    description: "Create a TCP Flow Protection rule for an account.",
+    description: "Create a TCP Flow Protection rule for an account.\n\nPOST /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_NewTcpFlowProtectionRule",
           "description": "The new TCP Flow Protection rule."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_NewTcpFlowProtectionRule": advanced_ddos_protection_NewTcpFlowProtectionRule,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_NewTcpFlowProtectionRule": advanced$$ddos$$protection_NewTcpFlowProtectionRule,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_tcp-flow-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRule": advanced_ddos_protection_TcpFlowProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced_ddos_protection_tcp_flow_protection_rule_response_output,
+        "advanced-ddos-protection_TcpFlowProtectionRule": advanced$$ddos$$protection_TcpFlowProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$response,
       },
     },
     annotations: {
@@ -144,11 +156,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRule": advanced_ddos_protection_TcpFlowProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced_ddos_protection_tcp_flow_protection_rule_response_output,
+        "advanced-ddos-protection_TcpFlowProtectionRule": advanced$$ddos$$protection_TcpFlowProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$response,
       },
     },
     request: (args) => ({
@@ -157,35 +169,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_rules_delete",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_rules_delete",
     title: "Delete TCP Flow Protection rule.",
-    description: "Delete a TCP Flow Protection rule specified by the given UUID.",
+    description: "Delete a TCP Flow Protection rule specified by the given UUID.\n\nDELETE /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the TCP Flow Protection rule to delete."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the TCP Flow Protection rule to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common",
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     annotations: {
@@ -212,9 +230,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
       },
     },
     request: (args) => ({
@@ -222,37 +240,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_rules_get",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_rules_get",
     title: "Get TCP Flow Protection rule.",
-    description: "Get a TCP Flow Protection rule specified by the given UUID.",
+    description: "Get a TCP Flow Protection rule specified by the given UUID.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the TCP Flow Protection rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the TCP Flow Protection rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_tcp-flow-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRule": advanced_ddos_protection_TcpFlowProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced_ddos_protection_tcp_flow_protection_rule_response_output,
+        "advanced-ddos-protection_TcpFlowProtectionRule": advanced$$ddos$$protection_TcpFlowProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$response,
       },
     },
     annotations: {
@@ -280,11 +304,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRule": advanced_ddos_protection_TcpFlowProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced_ddos_protection_tcp_flow_protection_rule_response_output,
+        "advanced-ddos-protection_TcpFlowProtectionRule": advanced$$ddos$$protection_TcpFlowProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$response,
       },
     },
     request: (args) => ({
@@ -292,48 +316,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_rules_list",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_rules_list",
     title: "List all TCP Flow Protection rules.",
-    description: "List all TCP Flow Protection rules for an account.",
+    description: "List all TCP Flow Protection rules for an account.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
-        "direction": {
-          "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
-          "type": "string"
-        },
-        "order": {
-          "description": "The field to order by. Defaults to 'prefix'.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "description": "The page number for pagination. Defaults to 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "The direction of ordering (ASC or DESC). Defaults to 'ASC'.",
+              "type": "string"
+            },
+            "order": {
+              "description": "The field to order by. Defaults to 'prefix'.",
+              "type": "string"
+            },
+            "page": {
+              "description": "The page number for pagination. Defaults to 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "The number of items per page. Must be between 10 and 1000. Defaults to 25.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_tcp-flow-protection-rule-list-response",
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRule": advanced_ddos_protection_TcpFlowProtectionRule_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_tcp-flow-protection-rule-list-response": advanced_ddos_protection_tcp_flow_protection_rule_list_response_output,
+        "advanced-ddos-protection_TcpFlowProtectionRule": advanced$$ddos$$protection_TcpFlowProtectionRule,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_tcp-flow-protection-rule-list-response": advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$list$$response,
       },
     },
     annotations: {
@@ -361,62 +398,70 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRule": advanced_ddos_protection_TcpFlowProtectionRule_output,
-        "advanced-ddos-protection_api-response-collection": advanced_ddos_protection_api_response_collection_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_tcp-flow-protection-rule-list-response": advanced_ddos_protection_tcp_flow_protection_rule_list_response_output,
+        "advanced-ddos-protection_TcpFlowProtectionRule": advanced$$ddos$$protection_TcpFlowProtectionRule,
+        "advanced-ddos-protection_api-response-collection": advanced$$ddos$$protection_api$$response$$collection,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_tcp-flow-protection-rule-list-response": advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$list$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/advanced_tcp_protection/configs/tcp_flow_protection/rules`,
       query: [
-        ["page", args["page"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
+        ["page", param(args, "query", "page"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
       ],
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_flow_protection_rules_update",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_flow_protection_rules_update",
     title: "Update TCP Flow Protection rule.",
-    description: "Update a TCP Flow Protection rule specified by the given UUID.",
+    description: "Update a TCP Flow Protection rule specified by the given UUID.\n\nPATCH /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_flow_protection/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The ID of the account."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_TcpFlowProtectionRuleUpdate",
           "description": "The updates to apply to the TCP Flow Protection rule."
         },
-        "rule_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_uuid",
-          "description": "The UUID of the TCP Flow Protection rule to update."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The ID of the account.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The UUID of the TCP Flow Protection rule to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRuleUpdate": advanced_ddos_protection_TcpFlowProtectionRuleUpdate,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-        "advanced-ddos-protection_uuid": advanced_ddos_protection_uuid,
+        "advanced-ddos-protection_TcpFlowProtectionRuleUpdate": advanced$$ddos$$protection_TcpFlowProtectionRuleUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_tcp-flow-protection-rule-response",
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRule": advanced_ddos_protection_TcpFlowProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced_ddos_protection_tcp_flow_protection_rule_response_output,
+        "advanced-ddos-protection_TcpFlowProtectionRule": advanced$$ddos$$protection_TcpFlowProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$response,
       },
     },
     annotations: {
@@ -443,11 +488,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_TcpFlowProtectionRule": advanced_ddos_protection_TcpFlowProtectionRule_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced_ddos_protection_tcp_flow_protection_rule_response_output,
+        "advanced-ddos-protection_TcpFlowProtectionRule": advanced$$ddos$$protection_TcpFlowProtectionRule,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_tcp-flow-protection-rule-response": advanced$$ddos$$protection_tcp$$flow$$protection$$rule$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/outputs.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/outputs.ts
index ba54b0cc3..e0c0a4aa4 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_ProtectionStatus` in responses.
  */
-export const advanced_ddos_protection_ProtectionStatus_output: JsonSchema = {
+export const advanced$$ddos$$protection_ProtectionStatus: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -22,7 +22,7 @@ export const advanced_ddos_protection_ProtectionStatus_output: JsonSchema = {
  * The schema of `advanced-ddos-protection_protection-status-response` in
  * responses.
  */
-export const advanced_ddos_protection_protection_status_response_output: JsonSchema = {
+export const advanced$$ddos$$protection_protection$$status$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/schemas.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/schemas.ts
index 7e5df9aed..96b07044c 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../../_/tool.js";
 /**
  * The schema of `advanced-ddos-protection_UpdateProtectionStatus`.
  */
-export const advanced_ddos_protection_UpdateProtectionStatus: JsonSchema = {
+export const advanced$$ddos$$protection_UpdateProtectionStatus: JsonSchema = {
   "properties": {
     "enabled": {
       "description": "Enables or disables protection.",
diff --git a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/tools.ts b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/tools.ts
index 0263c253f..46c107581 100644
--- a/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/advancedTcpProtection/configs/tcp/protection/status/tools.ts
@@ -3,48 +3,54 @@
 
 import { type Tool, pathParam } from "../../../../../../_/tool.js";
 import {
-  advanced_ddos_protection_api_response_common_failure_output,
-  advanced_ddos_protection_api_response_common_output,
-  advanced_ddos_protection_messages_output,
+  advanced$$ddos$$protection_api$$response$$common,
+  advanced$$ddos$$protection_api$$response$$common$$failure,
+  advanced$$ddos$$protection_messages,
 } from "../../../../../outputs.js";
-import { advanced_ddos_protection_identifier } from "../../../../../schemas.js";
 import {
-  advanced_ddos_protection_ProtectionStatus_output,
-  advanced_ddos_protection_protection_status_response_output,
+  advanced$$ddos$$protection_ProtectionStatus,
+  advanced$$ddos$$protection_protection$$status$$response,
 } from "./outputs.js";
-import { advanced_ddos_protection_UpdateProtectionStatus } from "./schemas.js";
+import { advanced$$ddos$$protection_UpdateProtectionStatus } from "./schemas.js";
 
 /**
  * The tools of
- * `magic_transit.advanced_tcp_protection.configs.tcp.protection.status`.
+ * `magicTransit.advancedTcpProtection.configs.tcp.protection.status`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_protection_status_get",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_protection_status_get",
     title: "Get protection status.",
-    description: "Get the protection status of the account.",
+    description: "Get the protection status of the account.\n\nGET /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_protection_status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The account ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_protection-status-response",
       $defs: {
-        "advanced-ddos-protection_ProtectionStatus": advanced_ddos_protection_ProtectionStatus_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_protection-status-response": advanced_ddos_protection_protection_status_response_output,
+        "advanced-ddos-protection_ProtectionStatus": advanced$$ddos$$protection_ProtectionStatus,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_protection-status-response": advanced$$ddos$$protection_protection$$status$$response,
       },
     },
     annotations: {
@@ -72,11 +78,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ProtectionStatus": advanced_ddos_protection_ProtectionStatus_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_protection-status-response": advanced_ddos_protection_protection_status_response_output,
+        "advanced-ddos-protection_ProtectionStatus": advanced$$ddos$$protection_ProtectionStatus,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_protection-status-response": advanced$$ddos$$protection_protection$$status$$response,
       },
     },
     request: (args) => ({
@@ -84,37 +90,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_advanced_tcp_protection_configs_tcp_protection_status_update",
+    name: "magicTransit_advancedTcpProtection_configs_tcp_protection_status_update",
     title: "Update protection status.",
-    description: "Update the protection status of the account.",
+    description: "Update the protection status of the account.\n\nPATCH /accounts/{account_id}/magic/advanced_tcp_protection/configs/tcp_protection_status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/advanced-ddos-protection_identifier",
-          "description": "The account ID."
-        },
         "body": {
           "$ref": "#/$defs/advanced-ddos-protection_UpdateProtectionStatus",
           "description": "The update to apply to the protection status."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "advanced-ddos-protection_UpdateProtectionStatus": advanced_ddos_protection_UpdateProtectionStatus,
-        "advanced-ddos-protection_identifier": advanced_ddos_protection_identifier,
+        "advanced-ddos-protection_UpdateProtectionStatus": advanced$$ddos$$protection_UpdateProtectionStatus,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/advanced-ddos-protection_protection-status-response",
       $defs: {
-        "advanced-ddos-protection_ProtectionStatus": advanced_ddos_protection_ProtectionStatus_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_protection-status-response": advanced_ddos_protection_protection_status_response_output,
+        "advanced-ddos-protection_ProtectionStatus": advanced$$ddos$$protection_ProtectionStatus,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_protection-status-response": advanced$$ddos$$protection_protection$$status$$response,
       },
     },
     annotations: {
@@ -141,11 +156,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "advanced-ddos-protection_ProtectionStatus": advanced_ddos_protection_ProtectionStatus_output,
-        "advanced-ddos-protection_api-response-common": advanced_ddos_protection_api_response_common_output,
-        "advanced-ddos-protection_api-response-common-failure": advanced_ddos_protection_api_response_common_failure_output,
-        "advanced-ddos-protection_messages": advanced_ddos_protection_messages_output,
-        "advanced-ddos-protection_protection-status-response": advanced_ddos_protection_protection_status_response_output,
+        "advanced-ddos-protection_ProtectionStatus": advanced$$ddos$$protection_ProtectionStatus,
+        "advanced-ddos-protection_api-response-common": advanced$$ddos$$protection_api$$response$$common,
+        "advanced-ddos-protection_api-response-common-failure": advanced$$ddos$$protection_api$$response$$common$$failure,
+        "advanced-ddos-protection_messages": advanced$$ddos$$protection_messages,
+        "advanced-ddos-protection_protection-status-response": advanced$$ddos$$protection_protection$$status$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/apps/outputs.ts b/src/generated/forge-mcp/magicTransit/apps/outputs.ts
index 4d2d0ef4c..437bfb3b9 100644
--- a/src/generated/forge-mcp/magicTransit/apps/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/apps/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `magic_account_app` in responses.
  */
-export const magic_account_app_output: JsonSchema = {
+export const magic_account_app: JsonSchema = {
   "properties": {
     "account_app_id": {
-      "$ref": "#/$defs/magic_account_app_id"
+      "type": "string"
     },
     "hostnames": {
       "$ref": "#/$defs/magic_app_hostnames"
@@ -18,13 +18,13 @@ export const magic_account_app_output: JsonSchema = {
       "$ref": "#/$defs/magic_app_subnets"
     },
     "name": {
-      "$ref": "#/$defs/magic_app_name"
+      "type": "string"
     },
     "source_subnets": {
       "$ref": "#/$defs/magic_app_source_subnets"
     },
     "type": {
-      "$ref": "#/$defs/magic_app_type"
+      "type": "string"
     }
   },
   "required": [
@@ -36,7 +36,7 @@ export const magic_account_app_output: JsonSchema = {
 /**
  * The schema of `magic_app` in responses.
  */
-export const magic_app_output: JsonSchema = {
+export const magic_app: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/magic_account_app"
@@ -50,24 +50,17 @@ export const magic_app_output: JsonSchema = {
 /**
  * The schema of `magic_app_hostnames` in responses.
  */
-export const magic_app_hostnames_output: JsonSchema = {
+export const magic_app_hostnames: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `magic_app_name` in responses.
- */
-export const magic_app_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_app_single_response` in responses.
  */
-export const magic_app_single_response_output: JsonSchema = {
+export const magic_app_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_apps-response-object"
@@ -86,11 +79,11 @@ export const magic_app_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_app_source_subnets` in responses.
  */
-export const magic_app_source_subnets_output: JsonSchema = {
+export const magic_app_source_subnets: JsonSchema = {
   "items": {
     "allOf": [
       {
-        "$ref": "#/$defs/magic_cidr"
+        "type": "string"
       },
       {
         "type": "string"
@@ -103,11 +96,11 @@ export const magic_app_source_subnets_output: JsonSchema = {
 /**
  * The schema of `magic_app_subnets` in responses.
  */
-export const magic_app_subnets_output: JsonSchema = {
+export const magic_app_subnets: JsonSchema = {
   "items": {
     "allOf": [
       {
-        "$ref": "#/$defs/magic_cidr"
+        "type": "string"
       },
       {
         "type": "string"
@@ -117,17 +110,10 @@ export const magic_app_subnets_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `magic_app_type` in responses.
- */
-export const magic_app_type_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_apps_collection_response` in responses.
  */
-export const magic_apps_collection_response_output: JsonSchema = {
+export const magic_apps_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_apps-response-array"
@@ -149,7 +135,7 @@ export const magic_apps_collection_response_output: JsonSchema = {
 /**
  * The schema of `magic_managed_app` in responses.
  */
-export const magic_managed_app_output: JsonSchema = {
+export const magic_managed_app: JsonSchema = {
   "properties": {
     "hostnames": {
       "$ref": "#/$defs/magic_app_hostnames"
@@ -158,16 +144,16 @@ export const magic_managed_app_output: JsonSchema = {
       "$ref": "#/$defs/magic_app_subnets"
     },
     "managed_app_id": {
-      "$ref": "#/$defs/magic_managed_app_id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/magic_app_name"
+      "type": "string"
     },
     "source_subnets": {
       "$ref": "#/$defs/magic_app_source_subnets"
     },
     "type": {
-      "$ref": "#/$defs/magic_app_type"
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/magicTransit/apps/schemas.ts b/src/generated/forge-mcp/magicTransit/apps/schemas.ts
index 9419d5dd2..4cb33748b 100644
--- a/src/generated/forge-mcp/magicTransit/apps/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/apps/schemas.ts
@@ -17,16 +17,16 @@ export const magic_app_add_single_request: JsonSchema = {
       "description": "IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently unsupported)"
     },
     "name": {
-      "$ref": "#/$defs/magic_app_name",
-      "description": "Display name for the app."
+      "description": "Display name for the app.",
+      "type": "string"
     },
     "source_subnets": {
       "$ref": "#/$defs/magic_app_source_subnets",
       "description": "IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently unsupported)"
     },
     "type": {
-      "$ref": "#/$defs/magic_app_type",
-      "description": "Category of the app."
+      "description": "Category of the app.",
+      "type": "string"
     }
   },
   "required": [
@@ -47,14 +47,6 @@ export const magic_app_hostnames: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `magic_app_name`.
- */
-export const magic_app_name: JsonSchema = {
-  "description": "Display name for the app.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_app_source_subnets`.
  */
@@ -63,7 +55,8 @@ export const magic_app_source_subnets: JsonSchema = {
   "items": {
     "allOf": [
       {
-        "$ref": "#/$defs/magic_cidr"
+        "description": "A valid CIDR notation representing an IP range.",
+        "type": "string"
       },
       {
         "type": "string"
@@ -81,7 +74,8 @@ export const magic_app_subnets: JsonSchema = {
   "items": {
     "allOf": [
       {
-        "$ref": "#/$defs/magic_cidr"
+        "description": "A valid CIDR notation representing an IP range.",
+        "type": "string"
       },
       {
         "type": "string"
@@ -91,14 +85,6 @@ export const magic_app_subnets: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `magic_app_type`.
- */
-export const magic_app_type: JsonSchema = {
-  "description": "Category of the app.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_app_update_request`.
  */
@@ -113,16 +99,16 @@ export const magic_app_update_request: JsonSchema = {
       "description": "IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently unsupported)"
     },
     "name": {
-      "$ref": "#/$defs/magic_app_name",
-      "description": "Display name for the app."
+      "description": "Display name for the app.",
+      "type": "string"
     },
     "source_subnets": {
       "$ref": "#/$defs/magic_app_source_subnets",
       "description": "IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently unsupported)"
     },
     "type": {
-      "$ref": "#/$defs/magic_app_type",
-      "description": "Category of the app."
+      "description": "Category of the app.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/magicTransit/apps/tools.ts b/src/generated/forge-mcp/magicTransit/apps/tools.ts
index 99bd19d93..adffed465 100644
--- a/src/generated/forge-mcp/magicTransit/apps/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/apps/tools.ts
@@ -3,85 +3,79 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_account_app_id_output,
-  magic_api_response_common_failure_output,
-  magic_apps_response_array_output,
-  magic_apps_response_object_output,
-  magic_cidr_output,
-  magic_managed_app_id_output,
-  magic_messages_output,
+  magic_api$$response$$common$$failure,
+  magic_apps$$response$$array,
+  magic_apps$$response$$object,
+  magic_messages,
 } from "../outputs.js";
-import { magic_cidr, magic_identifier } from "../schemas.js";
 import {
-  magic_account_app_output,
-  magic_app_hostnames_output,
-  magic_app_name_output,
-  magic_app_output,
-  magic_app_single_response_output,
-  magic_app_source_subnets_output,
-  magic_app_subnets_output,
-  magic_app_type_output,
-  magic_apps_collection_response_output,
-  magic_managed_app_output,
-} from "./outputs.js";
-import {
-  magic_app_add_single_request,
+  magic_account_app,
+  magic_app,
   magic_app_hostnames,
-  magic_app_name,
+  magic_app_single_response,
   magic_app_source_subnets,
   magic_app_subnets,
-  magic_app_type,
+  magic_apps_collection_response,
+  magic_managed_app,
+} from "./outputs.js";
+import {
+  magic_app_add_single_request,
+  magic_app_hostnames as magic_app_hostnames$,
+  magic_app_source_subnets as magic_app_source_subnets$,
+  magic_app_subnets as magic_app_subnets$,
   magic_app_update_request,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.apps`.
+ * The tools of `magicTransit.apps`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_apps_create",
+    name: "magicTransit_apps_create",
     title: "Create a new App",
-    description: "Creates a new App for an account",
+    description: "Creates a new App for an account\n\nPOST /accounts/{account_id}/magic/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_app_add_single_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "magic_app_add_single_request": magic_app_add_single_request,
-        "magic_app_hostnames": magic_app_hostnames,
-        "magic_app_name": magic_app_name,
-        "magic_app_source_subnets": magic_app_source_subnets,
-        "magic_app_subnets": magic_app_subnets,
-        "magic_app_type": magic_app_type,
-        "magic_cidr": magic_cidr,
-        "magic_identifier": magic_identifier,
+        "magic_app_hostnames": magic_app_hostnames$,
+        "magic_app_source_subnets": magic_app_source_subnets$,
+        "magic_app_subnets": magic_app_subnets$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_app_single_response",
       $defs: {
-        "magic_account_app": magic_account_app_output,
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_app_hostnames": magic_app_hostnames_output,
-        "magic_app_name": magic_app_name_output,
-        "magic_app_single_response": magic_app_single_response_output,
-        "magic_app_source_subnets": magic_app_source_subnets_output,
-        "magic_app_subnets": magic_app_subnets_output,
-        "magic_app_type": magic_app_type_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_messages": magic_messages_output,
+        "magic_account_app": magic_account_app,
+        "magic_app_hostnames": magic_app_hostnames,
+        "magic_app_single_response": magic_app_single_response,
+        "magic_app_source_subnets": magic_app_source_subnets,
+        "magic_app_subnets": magic_app_subnets,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -115,18 +109,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_account_app": magic_account_app_output,
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_app_hostnames": magic_app_hostnames_output,
-        "magic_app_name": magic_app_name_output,
-        "magic_app_single_response": magic_app_single_response_output,
-        "magic_app_source_subnets": magic_app_source_subnets_output,
-        "magic_app_subnets": magic_app_subnets_output,
-        "magic_app_type": magic_app_type_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_messages": magic_messages_output,
+        "magic_account_app": magic_account_app,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_app_hostnames": magic_app_hostnames,
+        "magic_app_single_response": magic_app_single_response,
+        "magic_app_source_subnets": magic_app_source_subnets,
+        "magic_app_subnets": magic_app_subnets,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -135,43 +125,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_apps_delete",
+    name: "magicTransit_apps_delete",
     title: "Delete Account App",
-    description: "Deletes specific Account App.",
+    description: "Deletes specific Account App.\n\nDELETE /accounts/{account_id}/magic/apps/{account_app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_app_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_app_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "account_app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "account_app_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_app_single_response",
       $defs: {
-        "magic_account_app": magic_account_app_output,
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_app_hostnames": magic_app_hostnames_output,
-        "magic_app_name": magic_app_name_output,
-        "magic_app_single_response": magic_app_single_response_output,
-        "magic_app_source_subnets": magic_app_source_subnets_output,
-        "magic_app_subnets": magic_app_subnets_output,
-        "magic_app_type": magic_app_type_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_messages": magic_messages_output,
+        "magic_account_app": magic_account_app,
+        "magic_app_hostnames": magic_app_hostnames,
+        "magic_app_single_response": magic_app_single_response,
+        "magic_app_source_subnets": magic_app_source_subnets,
+        "magic_app_subnets": magic_app_subnets,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -205,18 +198,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_account_app": magic_account_app_output,
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_app_hostnames": magic_app_hostnames_output,
-        "magic_app_name": magic_app_name_output,
-        "magic_app_single_response": magic_app_single_response_output,
-        "magic_app_source_subnets": magic_app_source_subnets_output,
-        "magic_app_subnets": magic_app_subnets_output,
-        "magic_app_type": magic_app_type_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_messages": magic_messages_output,
+        "magic_account_app": magic_account_app,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_app_hostnames": magic_app_hostnames,
+        "magic_app_single_response": magic_app_single_response,
+        "magic_app_source_subnets": magic_app_source_subnets,
+        "magic_app_subnets": magic_app_subnets,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -224,41 +213,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_apps_list",
+    name: "magicTransit_apps_list",
     title: "List Apps",
-    description: "Lists Apps associated with an account.",
+    description: "Lists Apps associated with an account.\n\nGET /accounts/{account_id}/magic/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_apps_collection_response",
       $defs: {
-        "magic_account_app": magic_account_app_output,
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_app": magic_app_output,
-        "magic_app_hostnames": magic_app_hostnames_output,
-        "magic_app_name": magic_app_name_output,
-        "magic_app_source_subnets": magic_app_source_subnets_output,
-        "magic_app_subnets": magic_app_subnets_output,
-        "magic_app_type": magic_app_type_output,
-        "magic_apps-response-array": magic_apps_response_array_output,
-        "magic_apps_collection_response": magic_apps_collection_response_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_managed_app": magic_managed_app_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_account_app": magic_account_app,
+        "magic_app": magic_app,
+        "magic_app_hostnames": magic_app_hostnames,
+        "magic_app_source_subnets": magic_app_source_subnets,
+        "magic_app_subnets": magic_app_subnets,
+        "magic_apps-response-array": magic_apps$$response$$array,
+        "magic_apps_collection_response": magic_apps_collection_response,
+        "magic_managed_app": magic_managed_app,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -294,21 +285,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_account_app": magic_account_app_output,
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_app": magic_app_output,
-        "magic_app_hostnames": magic_app_hostnames_output,
-        "magic_app_name": magic_app_name_output,
-        "magic_app_source_subnets": magic_app_source_subnets_output,
-        "magic_app_subnets": magic_app_subnets_output,
-        "magic_app_type": magic_app_type_output,
-        "magic_apps-response-array": magic_apps_response_array_output,
-        "magic_apps_collection_response": magic_apps_collection_response_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_managed_app": magic_managed_app_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_account_app": magic_account_app,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_app": magic_app,
+        "magic_app_hostnames": magic_app_hostnames,
+        "magic_app_source_subnets": magic_app_source_subnets,
+        "magic_app_subnets": magic_app_subnets,
+        "magic_apps-response-array": magic_apps$$response$$array,
+        "magic_apps_collection_response": magic_apps_collection_response,
+        "magic_managed_app": magic_managed_app,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -316,54 +302,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_apps_update",
+    name: "magicTransit_apps_update",
     title: "Update an App",
-    description: "Updates an Account App",
+    description: "Updates an Account App\n\nPUT /accounts/{account_id}/magic/apps/{account_app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_app_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_app_update_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_app_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "account_app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "account_app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_app_hostnames": magic_app_hostnames,
-        "magic_app_name": magic_app_name,
-        "magic_app_source_subnets": magic_app_source_subnets,
-        "magic_app_subnets": magic_app_subnets,
-        "magic_app_type": magic_app_type,
+        "magic_app_hostnames": magic_app_hostnames$,
+        "magic_app_source_subnets": magic_app_source_subnets$,
+        "magic_app_subnets": magic_app_subnets$,
         "magic_app_update_request": magic_app_update_request,
-        "magic_cidr": magic_cidr,
-        "magic_identifier": magic_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_app_single_response",
       $defs: {
-        "magic_account_app": magic_account_app_output,
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_app_hostnames": magic_app_hostnames_output,
-        "magic_app_name": magic_app_name_output,
-        "magic_app_single_response": magic_app_single_response_output,
-        "magic_app_source_subnets": magic_app_source_subnets_output,
-        "magic_app_subnets": magic_app_subnets_output,
-        "magic_app_type": magic_app_type_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_messages": magic_messages_output,
+        "magic_account_app": magic_account_app,
+        "magic_app_hostnames": magic_app_hostnames,
+        "magic_app_single_response": magic_app_single_response,
+        "magic_app_source_subnets": magic_app_source_subnets,
+        "magic_app_subnets": magic_app_subnets,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -397,18 +385,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_account_app": magic_account_app_output,
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_app_hostnames": magic_app_hostnames_output,
-        "magic_app_name": magic_app_name_output,
-        "magic_app_single_response": magic_app_single_response_output,
-        "magic_app_source_subnets": magic_app_source_subnets_output,
-        "magic_app_subnets": magic_app_subnets_output,
-        "magic_app_type": magic_app_type_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_messages": magic_messages_output,
+        "magic_account_app": magic_account_app,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_app_hostnames": magic_app_hostnames,
+        "magic_app_single_response": magic_app_single_response,
+        "magic_app_source_subnets": magic_app_source_subnets,
+        "magic_app_subnets": magic_app_subnets,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/outputs.ts b/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/outputs.ts
index dacad1d40..fe7bb7a72 100644
--- a/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/outputs.ts
@@ -3,21 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_bgp_filter_match_action` in responses.
- */
-export const magic_bgp_filter_match_action_output: JsonSchema = {
-  "enum": [
-    "allow",
-    "deny"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `magic_bgp_filter_profile` in responses.
  */
-export const magic_bgp_filter_profile_output: JsonSchema = {
+export const magic_bgp_filter_profile: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -27,10 +16,14 @@ export const magic_bgp_filter_profile_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/magic_schemas-identifier"
+      "type": "string"
     },
     "match_action": {
-      "$ref": "#/$defs/magic_bgp_filter_match_action"
+      "enum": [
+        "allow",
+        "deny"
+      ],
+      "type": "string"
     },
     "modified_on": {
       "format": "date-time",
@@ -60,7 +53,7 @@ export const magic_bgp_filter_profile_output: JsonSchema = {
 /**
  * The schema of `magic_magic_bgp_filter_profile_response` in responses.
  */
-export const magic_magic_bgp_filter_profile_response_output: JsonSchema = {
+export const magic_magic_bgp_filter_profile_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -79,7 +72,7 @@ export const magic_magic_bgp_filter_profile_response_output: JsonSchema = {
 /**
  * The schema of `magic_magic_bgp_filter_profiles_list_response` in responses.
  */
-export const magic_magic_bgp_filter_profiles_list_response_output: JsonSchema = {
+export const magic_magic_bgp_filter_profiles_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/schemas.ts b/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/schemas.ts
index 4aeef7460..7d4e2a8d0 100644
--- a/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/schemas.ts
@@ -3,18 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_bgp_filter_match_action`.
- */
-export const magic_bgp_filter_match_action: JsonSchema = {
-  "description": "Action to take when a route matches one of the targets in this profile",
-  "enum": [
-    "allow",
-    "deny"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `magic_create_bgp_filter_profile_request`.
  */
@@ -26,8 +14,12 @@ export const magic_create_bgp_filter_profile_request: JsonSchema = {
       "type": "string"
     },
     "match_action": {
-      "$ref": "#/$defs/magic_bgp_filter_match_action",
-      "description": "Action to take when a route matches one of the targets in this profile"
+      "description": "Action to take when a route matches one of the targets in this profile",
+      "enum": [
+        "allow",
+        "deny"
+      ],
+      "type": "string"
     },
     "name": {
       "description": "Friendly name for the filter profile",
@@ -61,8 +53,12 @@ export const magic_update_bgp_filter_profile_request: JsonSchema = {
       "type": "string"
     },
     "match_action": {
-      "$ref": "#/$defs/magic_bgp_filter_match_action",
-      "description": "Action to take when a route matches one of the targets in this profile"
+      "description": "Action to take when a route matches one of the targets in this profile",
+      "enum": [
+        "allow",
+        "deny"
+      ],
+      "type": "string"
     },
     "name": {
       "description": "Friendly name for the filter profile",
diff --git a/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/tools.ts b/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/tools.ts
index 7be7911d0..54b11af10 100644
--- a/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/bgpFilterProfiles/tools.ts
@@ -3,64 +3,66 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_messages_output,
-  magic_schemas_identifier_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../outputs.js";
-import { magic_identifier } from "../schemas.js";
 import {
-  magic_bgp_filter_match_action_output,
-  magic_bgp_filter_profile_output,
-  magic_magic_bgp_filter_profile_response_output,
-  magic_magic_bgp_filter_profiles_list_response_output,
+  magic_bgp_filter_profile,
+  magic_magic_bgp_filter_profile_response,
+  magic_magic_bgp_filter_profiles_list_response,
 } from "./outputs.js";
 import {
-  magic_bgp_filter_match_action,
   magic_create_bgp_filter_profile_request,
   magic_update_bgp_filter_profile_request,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.bgp_filter_profiles`.
+ * The tools of `magicTransit.bgpFilterProfiles`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_bgp_filter_profiles_create",
+    name: "magicTransit_bgpFilterProfiles_create",
     title: "Create BGP Filter Profile",
-    description: "Creates a new BGP filter profile for an account.",
+    description: "Creates a new BGP filter profile for an account.\n\nPOST /accounts/{account_id}/magic/bgp/filter_profiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_create_bgp_filter_profile_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action,
         "magic_create_bgp_filter_profile_request": magic_create_bgp_filter_profile_request,
-        "magic_identifier": magic_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_magic_bgp_filter_profile_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -91,14 +93,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -107,39 +107,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_bgp_filter_profiles_delete",
+    name: "magicTransit_bgpFilterProfiles_delete",
     title: "Delete BGP Filter Profile",
-    description: "Deletes a BGP filter profile.",
+    description: "Deletes a BGP filter profile.\n\nDELETE /accounts/{account_id}/magic/bgp/filter_profiles/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "profile_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "profile_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_magic_bgp_filter_profile_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -170,14 +175,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -185,39 +188,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_bgp_filter_profiles_get",
+    name: "magicTransit_bgpFilterProfiles_get",
     title: "Get BGP Filter Profile",
-    description: "Gets a specific BGP filter profile for an account.",
+    description: "Gets a specific BGP filter profile for an account.\n\nGET /accounts/{account_id}/magic/bgp/filter_profiles/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "profile_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "profile_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_magic_bgp_filter_profile_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -248,14 +256,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -263,33 +269,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_bgp_filter_profiles_list",
+    name: "magicTransit_bgpFilterProfiles_list",
     title: "List BGP Filter Profiles",
-    description: "Lists all BGP filter profiles for an account.",
+    description: "Lists all BGP filter profiles for an account.\n\nGET /accounts/{account_id}/magic/bgp/filter_profiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_magic_bgp_filter_profiles_list_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profiles_list_response": magic_magic_bgp_filter_profiles_list_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profiles_list_response": magic_magic_bgp_filter_profiles_list_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -320,13 +331,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profiles_list_response": magic_magic_bgp_filter_profiles_list_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profiles_list_response": magic_magic_bgp_filter_profiles_list_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -334,45 +343,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_bgp_filter_profiles_update",
+    name: "magicTransit_bgpFilterProfiles_update",
     title: "Update BGP Filter Profile",
-    description: "Updates a BGP filter profile. Omitted properties are left unchanged. To clear an existing description send `description: \"\"`.",
+    description: "Updates a BGP filter profile. Omitted properties are left unchanged. To clear an existing description send `description: \"\"`.\n\nPUT /accounts/{account_id}/magic/bgp/filter_profiles/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_update_bgp_filter_profile_request"
         },
-        "profile_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "profile_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action,
-        "magic_identifier": magic_identifier,
         "magic_update_bgp_filter_profile_request": magic_update_bgp_filter_profile_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_magic_bgp_filter_profile_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -403,14 +418,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_filter_match_action": magic_bgp_filter_match_action_output,
-        "magic_bgp_filter_profile": magic_bgp_filter_profile_output,
-        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_filter_profile": magic_bgp_filter_profile,
+        "magic_magic_bgp_filter_profile_response": magic_magic_bgp_filter_profile_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/bgpSettings/outputs.ts b/src/generated/forge-mcp/magicTransit/bgpSettings/outputs.ts
index b0b98e4ad..9734e67b7 100644
--- a/src/generated/forge-mcp/magicTransit/bgpSettings/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/bgpSettings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `magic_bgp_redistribute_sources` in responses.
  */
-export const magic_bgp_redistribute_sources_output: JsonSchema = {
+export const magic_bgp_redistribute_sources: JsonSchema = {
   "properties": {
     "static:wan": {
       "type": "boolean"
@@ -21,7 +21,7 @@ export const magic_bgp_redistribute_sources_output: JsonSchema = {
 /**
  * The schema of `magic_bgp_settings` in responses.
  */
-export const magic_bgp_settings_output: JsonSchema = {
+export const magic_bgp_settings: JsonSchema = {
   "properties": {
     "cloudflare_asn": {
       "type": "integer"
@@ -44,7 +44,7 @@ export const magic_bgp_settings_output: JsonSchema = {
 /**
  * The schema of `magic_magic_bgp_settings_response` in responses.
  */
-export const magic_magic_bgp_settings_response_output: JsonSchema = {
+export const magic_magic_bgp_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
diff --git a/src/generated/forge-mcp/magicTransit/bgpSettings/tools.ts b/src/generated/forge-mcp/magicTransit/bgpSettings/tools.ts
index 8a51deb75..85838a260 100644
--- a/src/generated/forge-mcp/magicTransit/bgpSettings/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/bgpSettings/tools.ts
@@ -3,16 +3,15 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../outputs.js";
-import { magic_identifier } from "../schemas.js";
 import {
-  magic_bgp_redistribute_sources_output,
-  magic_bgp_settings_output,
-  magic_magic_bgp_settings_response_output,
+  magic_bgp_redistribute_sources,
+  magic_bgp_settings,
+  magic_magic_bgp_settings_response,
 } from "./outputs.js";
 import {
   magic_update_bgp_settings_redistribute_sources,
@@ -20,37 +19,44 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.bgp_settings`.
+ * The tools of `magicTransit.bgpSettings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_bgp_settings_get",
+    name: "magicTransit_bgpSettings_get",
     title: "Get BGP Settings",
-    description: "Gets the BGP settings for an account, including the default ASN and redistribution configuration.",
+    description: "Gets the BGP settings for an account, including the default ASN and redistribution configuration.\n\nGET /accounts/{account_id}/magic/bgp/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_magic_bgp_settings_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_redistribute_sources": magic_bgp_redistribute_sources_output,
-        "magic_bgp_settings": magic_bgp_settings_output,
-        "magic_magic_bgp_settings_response": magic_magic_bgp_settings_response_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_redistribute_sources": magic_bgp_redistribute_sources,
+        "magic_bgp_settings": magic_bgp_settings,
+        "magic_magic_bgp_settings_response": magic_magic_bgp_settings_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -81,13 +87,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_redistribute_sources": magic_bgp_redistribute_sources_output,
-        "magic_bgp_settings": magic_bgp_settings_output,
-        "magic_magic_bgp_settings_response": magic_magic_bgp_settings_response_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_redistribute_sources": magic_bgp_redistribute_sources,
+        "magic_bgp_settings": magic_bgp_settings,
+        "magic_magic_bgp_settings_response": magic_magic_bgp_settings_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -95,26 +101,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_bgp_settings_update",
+    name: "magicTransit_bgpSettings_update",
     title: "Update BGP Settings",
-    description: "Modifies the BGP settings for an account, including the default ASN and redistribution configuration.",
+    description: "Modifies the BGP settings for an account, including the default ASN and redistribution configuration.\n\nPUT /accounts/{account_id}/magic/bgp/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_update_bgp_settings_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_identifier": magic_identifier,
         "magic_update_bgp_settings_redistribute_sources": magic_update_bgp_settings_redistribute_sources,
         "magic_update_bgp_settings_request": magic_update_bgp_settings_request,
       },
@@ -122,12 +137,12 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/magic_magic_bgp_settings_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_redistribute_sources": magic_bgp_redistribute_sources_output,
-        "magic_bgp_settings": magic_bgp_settings_output,
-        "magic_magic_bgp_settings_response": magic_magic_bgp_settings_response_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_redistribute_sources": magic_bgp_redistribute_sources,
+        "magic_bgp_settings": magic_bgp_settings,
+        "magic_magic_bgp_settings_response": magic_magic_bgp_settings_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -158,13 +173,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bgp_redistribute_sources": magic_bgp_redistribute_sources_output,
-        "magic_bgp_settings": magic_bgp_settings_output,
-        "magic_magic_bgp_settings_response": magic_magic_bgp_settings_response_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_redistribute_sources": magic_bgp_redistribute_sources,
+        "magic_bgp_settings": magic_bgp_settings,
+        "magic_magic_bgp_settings_response": magic_magic_bgp_settings_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/cf1Sites/outputs.ts b/src/generated/forge-mcp/magicTransit/cf1Sites/outputs.ts
index 8105ecd74..b5635d570 100644
--- a/src/generated/forge-mcp/magicTransit/cf1Sites/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/cf1Sites/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `magic_cf1_site` in responses.
  */
-export const magic_cf1_site_output: JsonSchema = {
+export const magic_cf1_site: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -16,7 +16,7 @@ export const magic_cf1_site_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "location": {
       "$ref": "#/$defs/magic_cf1_site_location"
@@ -38,7 +38,7 @@ export const magic_cf1_site_output: JsonSchema = {
 /**
  * The schema of `magic_cf1_site_location` in responses.
  */
-export const magic_cf1_site_location_output: JsonSchema = {
+export const magic_cf1_site_location: JsonSchema = {
   "properties": {
     "lat": {
       "type": "number"
@@ -56,7 +56,7 @@ export const magic_cf1_site_location_output: JsonSchema = {
 /**
  * The schema of `magic_cf1_site_single_response` in responses.
  */
-export const magic_cf1_site_single_response_output: JsonSchema = {
+export const magic_cf1_site_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -75,7 +75,7 @@ export const magic_cf1_site_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_cf1_sites_collection_response` in responses.
  */
-export const magic_cf1_sites_collection_response_output: JsonSchema = {
+export const magic_cf1_sites_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
diff --git a/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/outputs.ts b/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/outputs.ts
index 39c0b5b03..9a45e3d1e 100644
--- a/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `magic_cf1_site_managed_ramp` in responses.
  */
-export const magic_cf1_site_managed_ramp_output: JsonSchema = {
+export const magic_cf1_site_managed_ramp: JsonSchema = {
   "properties": {
     "managed_by": {
       "type": "string"
@@ -18,7 +18,7 @@ export const magic_cf1_site_managed_ramp_output: JsonSchema = {
 /**
  * The schema of `magic_cf1_site_ramp` in responses.
  */
-export const magic_cf1_site_ramp_output: JsonSchema = {
+export const magic_cf1_site_ramp: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -34,7 +34,7 @@ export const magic_cf1_site_ramp_output: JsonSchema = {
       "$ref": "#/$defs/magic_cf1_site_managed_ramp"
     },
     "id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "ipsec": {
       "$ref": "#/$defs/magic_cf1_site_managed_ramp"
@@ -53,7 +53,14 @@ export const magic_cf1_site_ramp_output: JsonSchema = {
       "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/magic_cf1_site_ramp_type"
+      "enum": [
+        "gre",
+        "gre_interconnect",
+        "mpls_interconnect",
+        "mconn",
+        "ipsec"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -69,7 +76,7 @@ export const magic_cf1_site_ramp_output: JsonSchema = {
 /**
  * The schema of `magic_cf1_site_ramp_single_response` in responses.
  */
-export const magic_cf1_site_ramp_single_response_output: JsonSchema = {
+export const magic_cf1_site_ramp_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -85,24 +92,10 @@ export const magic_cf1_site_ramp_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic_cf1_site_ramp_type` in responses.
- */
-export const magic_cf1_site_ramp_type_output: JsonSchema = {
-  "enum": [
-    "gre",
-    "gre_interconnect",
-    "mpls_interconnect",
-    "mconn",
-    "ipsec"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `magic_cf1_site_ramps_collection_response` in responses.
  */
-export const magic_cf1_site_ramps_collection_response_output: JsonSchema = {
+export const magic_cf1_site_ramps_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
diff --git a/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/schemas.ts b/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/schemas.ts
index 4e6dfee81..8f82fc634 100644
--- a/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/schemas.ts
@@ -9,12 +9,19 @@ import type { JsonSchema } from "../../../_/tool.js";
 export const magic_cf1_site_ramp_body: JsonSchema = {
   "properties": {
     "source_ramp_id": {
-      "$ref": "#/$defs/magic_identifier",
-      "description": "Identifier of the source network resource to associate as a ramp."
+      "description": "Identifier of the source network resource to associate as a ramp.",
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/magic_cf1_site_ramp_type",
-      "description": "The type of network connection (ramp) linking a CF1 Site to Cloudflare's network."
+      "description": "The type of network connection (ramp) linking a CF1 Site to Cloudflare's network.",
+      "enum": [
+        "gre",
+        "gre_interconnect",
+        "mpls_interconnect",
+        "mconn",
+        "ipsec"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -23,18 +30,3 @@ export const magic_cf1_site_ramp_body: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `magic_cf1_site_ramp_type`.
- */
-export const magic_cf1_site_ramp_type: JsonSchema = {
-  "description": "The type of network connection (ramp) linking a CF1 Site to Cloudflare's network.",
-  "enum": [
-    "gre",
-    "gre_interconnect",
-    "mpls_interconnect",
-    "mconn",
-    "ipsec"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/tools.ts b/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/tools.ts
index d29480681..47f36f4df 100644
--- a/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/cf1Sites/ramps/tools.ts
@@ -3,40 +3,30 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_identifier_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../../outputs.js";
-import { magic_identifier } from "../../schemas.js";
 import {
-  magic_cf1_site_managed_ramp_output,
-  magic_cf1_site_ramp_output,
-  magic_cf1_site_ramp_single_response_output,
-  magic_cf1_site_ramp_type_output,
-  magic_cf1_site_ramps_collection_response_output,
+  magic_cf1_site_managed_ramp,
+  magic_cf1_site_ramp,
+  magic_cf1_site_ramp_single_response,
+  magic_cf1_site_ramps_collection_response,
 } from "./outputs.js";
-import {
-  magic_cf1_site_ramp_body,
-  magic_cf1_site_ramp_type,
-} from "./schemas.js";
+import { magic_cf1_site_ramp_body } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.cf1_sites.ramps`.
+ * The tools of `magicTransit.cf1Sites.ramps`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_cf1_sites_ramps_create",
+    name: "magicTransit_cf1Sites_ramps_create",
     title: "Create CF1 Site Ramps",
-    description: "Creates ramps (network connections) for a CF1 Site.",
+    description: "Creates ramps (network connections) for a CF1 Site.\n\nPOST /accounts/{account_id}/magic/cf1_sites/{cf1_site_id}/ramps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "items": {
             "$ref": "#/$defs/magic_cf1_site_ramp_body"
@@ -44,33 +34,43 @@ export const tools: readonly Tool[] = [
           "minItems": 1,
           "type": "array"
         },
-        "cf1_site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf1_site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf1_site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf1_site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "magic_cf1_site_ramp_body": magic_cf1_site_ramp_body,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type,
-        "magic_identifier": magic_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_site_ramps_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp_output,
-        "magic_cf1_site_ramp": magic_cf1_site_ramp_output,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type_output,
-        "magic_cf1_site_ramps_collection_response": magic_cf1_site_ramps_collection_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp,
+        "magic_cf1_site_ramp": magic_cf1_site_ramp,
+        "magic_cf1_site_ramps_collection_response": magic_cf1_site_ramps_collection_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -100,15 +100,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp_output,
-        "magic_cf1_site_ramp": magic_cf1_site_ramp_output,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type_output,
-        "magic_cf1_site_ramps_collection_response": magic_cf1_site_ramps_collection_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp,
+        "magic_cf1_site_ramp": magic_cf1_site_ramp,
+        "magic_cf1_site_ramps_collection_response": magic_cf1_site_ramps_collection_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -117,45 +115,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_cf1_sites_ramps_delete",
+    name: "magicTransit_cf1Sites_ramps_delete",
     title: "Delete CF1 Site Ramp",
-    description: "Deletes a specific ramp from a CF1 Site.",
+    description: "Deletes a specific ramp from a CF1 Site.\n\nDELETE /accounts/{account_id}/magic/cf1_sites/{cf1_site_id}/ramps/{ramp_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "cf1_site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "ramp_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf1_site_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "ramp_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf1_site_id",
+            "ramp_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf1_site_id",
-        "ramp_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_site_ramp_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp_output,
-        "magic_cf1_site_ramp": magic_cf1_site_ramp_output,
-        "magic_cf1_site_ramp_single_response": magic_cf1_site_ramp_single_response_output,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp,
+        "magic_cf1_site_ramp": magic_cf1_site_ramp,
+        "magic_cf1_site_ramp_single_response": magic_cf1_site_ramp_single_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -189,15 +192,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp_output,
-        "magic_cf1_site_ramp": magic_cf1_site_ramp_output,
-        "magic_cf1_site_ramp_single_response": magic_cf1_site_ramp_single_response_output,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp,
+        "magic_cf1_site_ramp": magic_cf1_site_ramp,
+        "magic_cf1_site_ramp_single_response": magic_cf1_site_ramp_single_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -205,45 +206,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_cf1_sites_ramps_get",
+    name: "magicTransit_cf1Sites_ramps_get",
     title: "Get CF1 Site Ramp",
-    description: "Gets a specific ramp for a CF1 Site.",
+    description: "Gets a specific ramp for a CF1 Site.\n\nGET /accounts/{account_id}/magic/cf1_sites/{cf1_site_id}/ramps/{ramp_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "cf1_site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "ramp_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf1_site_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "ramp_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf1_site_id",
+            "ramp_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf1_site_id",
-        "ramp_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_site_ramp_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp_output,
-        "magic_cf1_site_ramp": magic_cf1_site_ramp_output,
-        "magic_cf1_site_ramp_single_response": magic_cf1_site_ramp_single_response_output,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp,
+        "magic_cf1_site_ramp": magic_cf1_site_ramp,
+        "magic_cf1_site_ramp_single_response": magic_cf1_site_ramp_single_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -279,15 +285,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp_output,
-        "magic_cf1_site_ramp": magic_cf1_site_ramp_output,
-        "magic_cf1_site_ramp_single_response": magic_cf1_site_ramp_single_response_output,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp,
+        "magic_cf1_site_ramp": magic_cf1_site_ramp,
+        "magic_cf1_site_ramp_single_response": magic_cf1_site_ramp_single_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -295,40 +299,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_cf1_sites_ramps_list",
+    name: "magicTransit_cf1Sites_ramps_list",
     title: "List CF1 Site Ramps",
-    description: "Lists ramps (network connections) associated with a CF1 Site. Ramps represent GRE tunnels, IPsec tunnels, interconnects, or MCONN links.",
+    description: "Lists ramps (network connections) associated with a CF1 Site. Ramps represent GRE tunnels, IPsec tunnels, interconnects, or MCONN links.\n\nGET /accounts/{account_id}/magic/cf1_sites/{cf1_site_id}/ramps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "cf1_site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf1_site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf1_site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf1_site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_site_ramps_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp_output,
-        "magic_cf1_site_ramp": magic_cf1_site_ramp_output,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type_output,
-        "magic_cf1_site_ramps_collection_response": magic_cf1_site_ramps_collection_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp,
+        "magic_cf1_site_ramp": magic_cf1_site_ramp,
+        "magic_cf1_site_ramps_collection_response": magic_cf1_site_ramps_collection_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -364,15 +373,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp_output,
-        "magic_cf1_site_ramp": magic_cf1_site_ramp_output,
-        "magic_cf1_site_ramp_type": magic_cf1_site_ramp_type_output,
-        "magic_cf1_site_ramps_collection_response": magic_cf1_site_ramps_collection_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site_managed_ramp": magic_cf1_site_managed_ramp,
+        "magic_cf1_site_ramp": magic_cf1_site_ramp,
+        "magic_cf1_site_ramps_collection_response": magic_cf1_site_ramps_collection_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/cf1Sites/tools.ts b/src/generated/forge-mcp/magicTransit/cf1Sites/tools.ts
index 753a2bf7c..863f51718 100644
--- a/src/generated/forge-mcp/magicTransit/cf1Sites/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/cf1Sites/tools.ts
@@ -3,68 +3,74 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_identifier_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../outputs.js";
-import { magic_identifier } from "../schemas.js";
-import {
-  magic_cf1_site_location_output,
-  magic_cf1_site_output,
-  magic_cf1_site_single_response_output,
-  magic_cf1_sites_collection_response_output,
-} from "./outputs.js";
 import {
   magic_cf1_site,
   magic_cf1_site_location,
+  magic_cf1_site_single_response,
+  magic_cf1_sites_collection_response,
+} from "./outputs.js";
+import {
+  magic_cf1_site as magic_cf1_site$,
+  magic_cf1_site_location as magic_cf1_site_location$,
   magic_cf1_site_update,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.cf1_sites`.
+ * The tools of `magicTransit.cf1Sites`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_cf1_sites_create",
+    name: "magicTransit_cf1Sites_create",
     title: "Create CF1 Sites",
-    description: "Creates new CF1 Sites for an account. Each site must have a unique name within the account.",
+    description: "Creates new CF1 Sites for an account. Each site must have a unique name within the account.\n\nPOST /accounts/{account_id}/magic/cf1_sites",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "items": {
             "$ref": "#/$defs/magic_cf1_site"
           },
           "minItems": 1,
           "type": "array"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_cf1_site": magic_cf1_site,
-        "magic_cf1_site_location": magic_cf1_site_location,
-        "magic_identifier": magic_identifier,
+        "magic_cf1_site": magic_cf1_site$,
+        "magic_cf1_site_location": magic_cf1_site_location$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_sites_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_sites_collection_response": magic_cf1_sites_collection_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_sites_collection_response": magic_cf1_sites_collection_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -103,14 +109,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_sites_collection_response": magic_cf1_sites_collection_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_sites_collection_response": magic_cf1_sites_collection_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -119,39 +124,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_cf1_sites_delete",
+    name: "magicTransit_cf1Sites_delete",
     title: "Delete CF1 Site",
-    description: "Deletes a specific CF1 Site for an account.",
+    description: "Deletes a specific CF1 Site for an account.\n\nDELETE /accounts/{account_id}/magic/cf1_sites/{cf1_site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "cf1_site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf1_site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf1_site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf1_site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_site_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_site_single_response": magic_cf1_site_single_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_site_single_response": magic_cf1_site_single_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -190,14 +201,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_site_single_response": magic_cf1_site_single_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_site_single_response": magic_cf1_site_single_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -205,39 +215,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_cf1_sites_get",
+    name: "magicTransit_cf1Sites_get",
     title: "Get CF1 Site",
-    description: "Gets a specific CF1 Site for an account.",
+    description: "Gets a specific CF1 Site for an account.\n\nGET /accounts/{account_id}/magic/cf1_sites/{cf1_site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "cf1_site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf1_site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf1_site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf1_site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_site_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_site_single_response": magic_cf1_site_single_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_site_single_response": magic_cf1_site_single_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -278,14 +294,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_site_single_response": magic_cf1_site_single_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_site_single_response": magic_cf1_site_single_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -293,34 +308,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_cf1_sites_list",
+    name: "magicTransit_cf1Sites_list",
     title: "List CF1 Sites",
-    description: "Lists CF1 Sites associated with an account. A CF1 Site represents a physical customer network location with optional geographic coordinates.",
+    description: "Lists CF1 Sites associated with an account. A CF1 Site represents a physical customer network location with optional geographic coordinates.\n\nGET /accounts/{account_id}/magic/cf1_sites",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_sites_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_sites_collection_response": magic_cf1_sites_collection_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_sites_collection_response": magic_cf1_sites_collection_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -361,14 +382,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_sites_collection_response": magic_cf1_sites_collection_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_sites_collection_response": magic_cf1_sites_collection_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -376,45 +396,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_cf1_sites_update",
+    name: "magicTransit_cf1Sites_update",
     title: "Update CF1 Site",
-    description: "Partially updates a specific CF1 Site for an account. Only the fields included in the request body are modified; omitted fields retain their existing values.",
+    description: "Partially updates a specific CF1 Site for an account. Only the fields included in the request body are modified; omitted fields retain their existing values.\n\nPATCH /accounts/{account_id}/magic/cf1_sites/{cf1_site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_cf1_site_update"
         },
-        "cf1_site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf1_site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf1_site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf1_site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_site_location": magic_cf1_site_location$,
         "magic_cf1_site_update": magic_cf1_site_update,
-        "magic_identifier": magic_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_cf1_site_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_site_single_response": magic_cf1_site_single_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_site_single_response": magic_cf1_site_single_response,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -453,14 +481,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cf1_site": magic_cf1_site_output,
-        "magic_cf1_site_location": magic_cf1_site_location_output,
-        "magic_cf1_site_single_response": magic_cf1_site_single_response_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_cf1_site": magic_cf1_site,
+        "magic_cf1_site_location": magic_cf1_site_location,
+        "magic_cf1_site_single_response": magic_cf1_site_single_response,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/cfInterconnects/outputs.ts b/src/generated/forge-mcp/magicTransit/cfInterconnects/outputs.ts
index 4a4ac5e53..e966f8716 100644
--- a/src/generated/forge-mcp/magicTransit/cfInterconnects/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/cfInterconnects/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `magic_components-schemas-modified_tunnels_collection_response`
  * in responses.
  */
-export const magic_components_schemas_modified_tunnels_collection_response_output: JsonSchema = {
+export const magic_components$$schemas$$modified_tunnels_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -34,18 +34,11 @@ export const magic_components_schemas_modified_tunnels_collection_response_outpu
   ]
 };
 
-/**
- * The schema of `magic_components-schemas-name` in responses.
- */
-export const magic_components_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_components-schemas-tunnel_modified_response` in
  * responses.
  */
-export const magic_components_schemas_tunnel_modified_response_output: JsonSchema = {
+export const magic_components$$schemas$$tunnel_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -72,7 +65,7 @@ export const magic_components_schemas_tunnel_modified_response_output: JsonSchem
 /**
  * The schema of `magic_components-schemas-tunnel_single_response` in responses.
  */
-export const magic_components_schemas_tunnel_single_response_output: JsonSchema = {
+export const magic_components$$schemas$$tunnel_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -97,7 +90,7 @@ export const magic_components_schemas_tunnel_single_response_output: JsonSchema
  * The schema of `magic_components-schemas-tunnels_collection_response` in
  * responses.
  */
-export const magic_components_schemas_tunnels_collection_response_output: JsonSchema = {
+export const magic_components$$schemas$$tunnels_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -124,7 +117,7 @@ export const magic_components_schemas_tunnels_collection_response_output: JsonSc
 /**
  * The schema of `magic_gre` in responses.
  */
-export const magic_gre_output: JsonSchema = {
+export const magic_gre: JsonSchema = {
   "properties": {
     "cloudflare_endpoint": {
       "type": "string"
@@ -136,22 +129,23 @@ export const magic_gre_output: JsonSchema = {
 /**
  * The schema of `magic_interconnect` in responses.
  */
-export const magic_interconnect_output: JsonSchema = {
+export const magic_interconnect: JsonSchema = {
   "properties": {
     "automatic_return_routing": {
-      "$ref": "#/$defs/magic_automatic_return_routing"
+      "type": "boolean"
     },
     "bgp": {
       "$ref": "#/$defs/magic_interconnect_bgp_config"
     },
     "colo_name": {
-      "$ref": "#/$defs/magic_components-schemas-name"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/magic_schemas-created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/magic_interconnect_components-schemas-description"
+      "type": "string"
     },
     "gre": {
       "$ref": "#/$defs/magic_gre"
@@ -160,22 +154,23 @@ export const magic_interconnect_output: JsonSchema = {
       "$ref": "#/$defs/magic_interconnect_health_check"
     },
     "id": {
-      "$ref": "#/$defs/magic_schemas-identifier"
+      "type": "string"
     },
     "interface_address": {
-      "$ref": "#/$defs/magic_interface_address_interconnect"
+      "type": "string"
     },
     "interface_address6": {
-      "$ref": "#/$defs/magic_interface_address6"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/magic_schemas-modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "mtu": {
-      "$ref": "#/$defs/magic_schemas-mtu"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/magic_components-schemas-name"
+      "type": "string"
     },
     "version": {
       "type": "string"
@@ -183,7 +178,7 @@ export const magic_interconnect_output: JsonSchema = {
     "virtual_port_reservation_id": {
       "allOf": [
         {
-          "$ref": "#/$defs/magic_schemas-identifier"
+          "type": "string"
         },
         {
           "type": "string"
@@ -197,7 +192,7 @@ export const magic_interconnect_output: JsonSchema = {
 /**
  * The schema of `magic_interconnect_bgp_config` in responses.
  */
-export const magic_interconnect_bgp_config_output: JsonSchema = {
+export const magic_interconnect_bgp_config: JsonSchema = {
   "properties": {
     "as_no": {
       "type": "integer"
@@ -230,18 +225,10 @@ export const magic_interconnect_bgp_config_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_interconnect_components-schemas-description` in
- * responses.
- */
-export const magic_interconnect_components_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_interconnect_health_check` in responses.
  */
-export const magic_interconnect_health_check_output: JsonSchema = {
+export const magic_interconnect_health_check: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_health_check_base"
@@ -263,17 +250,3 @@ export const magic_interconnect_health_check_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `magic_interface_address_interconnect` in responses.
- */
-export const magic_interface_address_interconnect_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_schemas-mtu` in responses.
- */
-export const magic_schemas_mtu_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/cfInterconnects/schemas.ts b/src/generated/forge-mcp/magicTransit/cfInterconnects/schemas.ts
index 8d32da9b1..ad17e0597 100644
--- a/src/generated/forge-mcp/magicTransit/cfInterconnects/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/cfInterconnects/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_components-schemas-name`.
- */
-export const magic_components_schemas_name: JsonSchema = {
-  "description": "The name of the interconnect. The name cannot share a name with other tunnels.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_gre`.
  */
@@ -54,7 +46,7 @@ export const magic_interconnect_bgp_config: JsonSchema = {
       "type": "string"
     },
     "extra_prefixes": {
-      "description": "IPv4 prefixes in this list will be advertised to the customer device, in addition to the routes in the Magic\nrouting table. Each entry must be a network address in CIDR notation with no host bits set (for example\n`192.0.2.0/24`, not `192.0.2.1/24`) and must not repeat another entry.\n",
+      "description": "IPv4 prefixes in this list will be advertised to the customer device, in addition to the routes in the Magic\nrouting table. Each entry must be a network address in CIDR notation with no host bits set (for example\n`192.0.2.0/24`, not `192.0.2.1/24`) and must not repeat another entry.",
       "items": {
         "type": "string"
       },
@@ -72,14 +64,6 @@ export const magic_interconnect_bgp_config: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_interconnect_components-schemas-description`.
- */
-export const magic_interconnect_components_schemas_description: JsonSchema = {
-  "description": "An optional description of the interconnect.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_interconnect_health_check`.
  */
@@ -115,16 +99,16 @@ export const magic_interconnect_health_check: JsonSchema = {
 export const magic_interconnect_tunnel_update_request: JsonSchema = {
   "properties": {
     "automatic_return_routing": {
-      "$ref": "#/$defs/magic_automatic_return_routing",
       "default": false,
-      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected."
+      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected.",
+      "type": "boolean"
     },
     "bgp": {
       "$ref": "#/$defs/magic_interconnect_bgp_config"
     },
     "description": {
-      "$ref": "#/$defs/magic_interconnect_components-schemas-description",
-      "description": "An optional description of the interconnect."
+      "description": "An optional description of the interconnect.",
+      "type": "string"
     },
     "gre": {
       "$ref": "#/$defs/magic_gre"
@@ -133,38 +117,22 @@ export const magic_interconnect_tunnel_update_request: JsonSchema = {
       "$ref": "#/$defs/magic_interconnect_health_check"
     },
     "interface_address": {
-      "$ref": "#/$defs/magic_interface_address_interconnect",
-      "description": "The IPv4 interface address for the interconnect. For MPLS Interconnects,\nuse a /30 or /31 prefix. For GRE Interconnects, a /30 or /31 prefix\nmay be used. Version 1.5 interconnects require a /31 prefix and may\nalso use a prefix from the account's authorized prefixes; otherwise,\nselect the subnet from RFC 1918 or the approved link-local ranges.\n"
+      "description": "The IPv4 interface address for the interconnect. For MPLS Interconnects,\nuse a /30 or /31 prefix. For GRE Interconnects, a /30 or /31 prefix\nmay be used. Version 1.5 interconnects require a /31 prefix and may\nalso use a prefix from the account's authorized prefixes; otherwise,\nselect the subnet from RFC 1918 or the approved link-local ranges.",
+      "type": "string"
     },
     "interface_address6": {
-      "$ref": "#/$defs/magic_interface_address6",
-      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127"
+      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127",
+      "type": "string"
     },
     "mtu": {
-      "$ref": "#/$defs/magic_schemas-mtu",
       "default": 1476,
-      "description": "The Maximum Transmission Unit (MTU) in bytes for the interconnect. The minimum value is 576."
+      "description": "The Maximum Transmission Unit (MTU) in bytes for the interconnect. The minimum value is 576.",
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/magic_components-schemas-name",
-      "description": "The name of the interconnect. The name cannot share a name with other tunnels."
+      "description": "The name of the interconnect. The name cannot share a name with other tunnels.",
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `magic_interface_address_interconnect`.
- */
-export const magic_interface_address_interconnect: JsonSchema = {
-  "description": "The IPv4 interface address for the interconnect. For MPLS Interconnects,\nuse a /30 or /31 prefix. For GRE Interconnects, a /30 or /31 prefix\nmay be used. Version 1.5 interconnects require a /31 prefix and may\nalso use a prefix from the account's authorized prefixes; otherwise,\nselect the subnet from RFC 1918 or the approved link-local ranges.\n",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_schemas-mtu`.
- */
-export const magic_schemas_mtu: JsonSchema = {
-  "description": "The Maximum Transmission Unit (MTU) in bytes for the interconnect. The minimum value is 576.",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/cfInterconnects/tools.ts b/src/generated/forge-mcp/magicTransit/cfInterconnects/tools.ts
index f40f7cd62..f90e6b7bf 100644
--- a/src/generated/forge-mcp/magicTransit/cfInterconnects/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/cfInterconnects/tools.ts
@@ -1,105 +1,93 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_automatic_return_routing_output,
-  magic_health_check_base_output,
-  magic_health_check_target_output,
-  magic_interface_address6_output,
-  magic_messages_output,
-  magic_schemas_created_on_output,
-  magic_schemas_identifier_output,
-  magic_schemas_modified_on_output,
-} from "../outputs.js";
-import {
-  magic_automatic_return_routing,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
   magic_health_check_base,
   magic_health_check_target,
-  magic_identifier,
-  magic_interface_address6,
-} from "../schemas.js";
+  magic_messages,
+} from "../outputs.js";
 import {
-  magic_components_schemas_modified_tunnels_collection_response_output,
-  magic_components_schemas_name_output,
-  magic_components_schemas_tunnel_modified_response_output,
-  magic_components_schemas_tunnel_single_response_output,
-  magic_components_schemas_tunnels_collection_response_output,
-  magic_gre_output,
-  magic_interconnect_bgp_config_output,
-  magic_interconnect_components_schemas_description_output,
-  magic_interconnect_health_check_output,
-  magic_interconnect_output,
-  magic_interface_address_interconnect_output,
-  magic_schemas_mtu_output,
-} from "./outputs.js";
+  magic_health_check_base as magic_health_check_base$,
+  magic_health_check_target as magic_health_check_target$,
+} from "../schemas.js";
 import {
-  magic_components_schemas_name,
+  magic_components$$schemas$$modified_tunnels_collection_response,
+  magic_components$$schemas$$tunnel_modified_response,
+  magic_components$$schemas$$tunnel_single_response,
+  magic_components$$schemas$$tunnels_collection_response,
   magic_gre,
+  magic_interconnect,
   magic_interconnect_bgp_config,
-  magic_interconnect_components_schemas_description,
   magic_interconnect_health_check,
+} from "./outputs.js";
+import {
+  magic_gre as magic_gre$,
+  magic_interconnect_bgp_config as magic_interconnect_bgp_config$,
+  magic_interconnect_health_check as magic_interconnect_health_check$,
   magic_interconnect_tunnel_update_request,
-  magic_interface_address_interconnect,
-  magic_schemas_mtu,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.cf_interconnects`.
+ * The tools of `magicTransit.cfInterconnects`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_cf_interconnects_bulk_update",
+    name: "magicTransit_cfInterconnects_bulkUpdate",
     title: "Update multiple interconnects",
-    description: "Updates multiple interconnects associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Updates multiple interconnects associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nPUT /accounts/{account_id}/magic/cf_interconnects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_components-schemas-modified_tunnels_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_components-schemas-modified_tunnels_collection_response": magic_components_schemas_modified_tunnels_collection_response_output,
-        "magic_components-schemas-name": magic_components_schemas_name_output,
-        "magic_gre": magic_gre_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interconnect": magic_interconnect_output,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config_output,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description_output,
-        "magic_interconnect_health_check": magic_interconnect_health_check_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-mtu": magic_schemas_mtu_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_components-schemas-modified_tunnels_collection_response": magic_components$$schemas$$modified_tunnels_collection_response,
+        "magic_gre": magic_gre,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_interconnect": magic_interconnect,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
+        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -133,86 +121,81 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_components-schemas-modified_tunnels_collection_response": magic_components_schemas_modified_tunnels_collection_response_output,
-        "magic_components-schemas-name": magic_components_schemas_name_output,
-        "magic_gre": magic_gre_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interconnect": magic_interconnect_output,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config_output,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description_output,
-        "magic_interconnect_health_check": magic_interconnect_health_check_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-mtu": magic_schemas_mtu_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_components-schemas-modified_tunnels_collection_response": magic_components$$schemas$$modified_tunnels_collection_response,
+        "magic_gre": magic_gre,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_interconnect": magic_interconnect,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
+        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/cf_interconnects`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "magic_transit_cf_interconnects_get",
+    name: "magicTransit_cfInterconnects_get",
     title: "List interconnect Details",
-    description: "Lists details for a specific interconnect.",
+    description: "Lists details for a specific interconnect.\n\nGET /accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "cf_interconnect_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf_interconnect_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf_interconnect_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf_interconnect_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_components-schemas-tunnel_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_components-schemas-name": magic_components_schemas_name_output,
-        "magic_components-schemas-tunnel_single_response": magic_components_schemas_tunnel_single_response_output,
-        "magic_gre": magic_gre_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interconnect": magic_interconnect_output,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config_output,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description_output,
-        "magic_interconnect_health_check": magic_interconnect_health_check_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-mtu": magic_schemas_mtu_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_components-schemas-tunnel_single_response": magic_components$$schemas$$tunnel_single_response,
+        "magic_gre": magic_gre,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_interconnect": magic_interconnect,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
+        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -248,80 +231,75 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_components-schemas-name": magic_components_schemas_name_output,
-        "magic_components-schemas-tunnel_single_response": magic_components_schemas_tunnel_single_response_output,
-        "magic_gre": magic_gre_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interconnect": magic_interconnect_output,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config_output,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description_output,
-        "magic_interconnect_health_check": magic_interconnect_health_check_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-mtu": magic_schemas_mtu_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_components-schemas-tunnel_single_response": magic_components$$schemas$$tunnel_single_response,
+        "magic_gre": magic_gre,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_interconnect": magic_interconnect,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
+        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/cf_interconnects/${pathParam(args, "cf_interconnect_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_cf_interconnects_list",
+    name: "magicTransit_cfInterconnects_list",
     title: "List interconnects",
-    description: "Lists interconnects associated with an account.",
+    description: "Lists interconnects associated with an account.\n\nGET /accounts/{account_id}/magic/cf_interconnects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_components-schemas-tunnels_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_components-schemas-name": magic_components_schemas_name_output,
-        "magic_components-schemas-tunnels_collection_response": magic_components_schemas_tunnels_collection_response_output,
-        "magic_gre": magic_gre_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interconnect": magic_interconnect_output,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config_output,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description_output,
-        "magic_interconnect_health_check": magic_interconnect_health_check_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-mtu": magic_schemas_mtu_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_components-schemas-tunnels_collection_response": magic_components$$schemas$$tunnels_collection_response,
+        "magic_gre": magic_gre,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_interconnect": magic_interconnect,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
+        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -357,101 +335,92 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_components-schemas-name": magic_components_schemas_name_output,
-        "magic_components-schemas-tunnels_collection_response": magic_components_schemas_tunnels_collection_response_output,
-        "magic_gre": magic_gre_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interconnect": magic_interconnect_output,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config_output,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description_output,
-        "magic_interconnect_health_check": magic_interconnect_health_check_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-mtu": magic_schemas_mtu_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_components-schemas-tunnels_collection_response": magic_components$$schemas$$tunnels_collection_response,
+        "magic_gre": magic_gre,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_interconnect": magic_interconnect,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
+        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/cf_interconnects`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_cf_interconnects_update",
+    name: "magicTransit_cfInterconnects_update",
     title: "Update interconnect",
-    description: "Updates a specific interconnect associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Updates a specific interconnect associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nPUT /accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_interconnect_tunnel_update_request"
         },
-        "cf_interconnect_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "cf_interconnect_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cf_interconnect_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cf_interconnect_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_automatic_return_routing": magic_automatic_return_routing,
-        "magic_components-schemas-name": magic_components_schemas_name,
-        "magic_gre": magic_gre,
-        "magic_health_check_base": magic_health_check_base,
-        "magic_health_check_target": magic_health_check_target,
-        "magic_identifier": magic_identifier,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description,
-        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_gre": magic_gre$,
+        "magic_health_check_base": magic_health_check_base$,
+        "magic_health_check_target": magic_health_check_target$,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config$,
+        "magic_interconnect_health_check": magic_interconnect_health_check$,
         "magic_interconnect_tunnel_update_request": magic_interconnect_tunnel_update_request,
-        "magic_interface_address6": magic_interface_address6,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect,
-        "magic_schemas-mtu": magic_schemas_mtu,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_components-schemas-tunnel_modified_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_components-schemas-name": magic_components_schemas_name_output,
-        "magic_components-schemas-tunnel_modified_response": magic_components_schemas_tunnel_modified_response_output,
-        "magic_gre": magic_gre_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interconnect": magic_interconnect_output,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config_output,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description_output,
-        "magic_interconnect_health_check": magic_interconnect_health_check_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-mtu": magic_schemas_mtu_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_components-schemas-tunnel_modified_response": magic_components$$schemas$$tunnel_modified_response,
+        "magic_gre": magic_gre,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_interconnect": magic_interconnect,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
+        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -485,32 +454,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_components-schemas-name": magic_components_schemas_name_output,
-        "magic_components-schemas-tunnel_modified_response": magic_components_schemas_tunnel_modified_response_output,
-        "magic_gre": magic_gre_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interconnect": magic_interconnect_output,
-        "magic_interconnect_bgp_config": magic_interconnect_bgp_config_output,
-        "magic_interconnect_components-schemas-description": magic_interconnect_components_schemas_description_output,
-        "magic_interconnect_health_check": magic_interconnect_health_check_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_interface_address_interconnect": magic_interface_address_interconnect_output,
-        "magic_messages": magic_messages_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-mtu": magic_schemas_mtu_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_components-schemas-tunnel_modified_response": magic_components$$schemas$$tunnel_modified_response,
+        "magic_gre": magic_gre,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_interconnect": magic_interconnect,
+        "magic_interconnect_bgp_config": magic_interconnect_bgp_config,
+        "magic_interconnect_health_check": magic_interconnect_health_check,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/cf_interconnects/${pathParam(args, "cf_interconnect_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/magicTransit/greTunnels/outputs.ts b/src/generated/forge-mcp/magicTransit/greTunnels/outputs.ts
index bfb08f4aa..8c8b86fb9 100644
--- a/src/generated/forge-mcp/magicTransit/greTunnels/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/greTunnels/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_cloudflare_gre_endpoint` in responses.
- */
-export const magic_cloudflare_gre_endpoint_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_create_gre_tunnel_response` in responses.
  */
-export const magic_create_gre_tunnel_response_output: JsonSchema = {
+export const magic_create_gre_tunnel_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -29,20 +22,13 @@ export const magic_create_gre_tunnel_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic_customer_gre_endpoint` in responses.
- */
-export const magic_customer_gre_endpoint_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_gre-tunnel` in responses.
  */
-export const magic_gre_tunnel_output: JsonSchema = {
+export const magic_gre$$tunnel: JsonSchema = {
   "properties": {
     "automatic_return_routing": {
-      "$ref": "#/$defs/magic_automatic_return_routing"
+      "type": "boolean"
     },
     "bgp": {
       "$ref": "#/$defs/magic_bgp_config"
@@ -51,40 +37,42 @@ export const magic_gre_tunnel_output: JsonSchema = {
       "$ref": "#/$defs/magic_bgp_status_with_state"
     },
     "cloudflare_gre_endpoint": {
-      "$ref": "#/$defs/magic_cloudflare_gre_endpoint"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/magic_schemas-created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "customer_gre_endpoint": {
-      "$ref": "#/$defs/magic_customer_gre_endpoint"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/magic_schemas-description"
+      "type": "string"
     },
     "health_check": {
       "$ref": "#/$defs/magic_tunnel_health_check"
     },
     "id": {
-      "$ref": "#/$defs/magic_schemas-identifier"
+      "type": "string"
     },
     "interface_address": {
-      "$ref": "#/$defs/magic_interface_address"
+      "type": "string"
     },
     "interface_address6": {
-      "$ref": "#/$defs/magic_interface_address6"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/magic_schemas-modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "mtu": {
-      "$ref": "#/$defs/magic_mtu"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/magic_gre_tunnel_name"
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/magic_ttl"
+      "type": "integer"
     }
   },
   "required": [
@@ -97,17 +85,10 @@ export const magic_gre_tunnel_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_gre_tunnel_name` in responses.
- */
-export const magic_gre_tunnel_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_modified_tunnels_collection_response` in responses.
  */
-export const magic_modified_tunnels_collection_response_output: JsonSchema = {
+export const magic_modified_tunnels_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -134,31 +115,10 @@ export const magic_modified_tunnels_collection_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic_mtu` in responses.
- */
-export const magic_mtu_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `magic_schemas-description` in responses.
- */
-export const magic_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_ttl` in responses.
- */
-export const magic_ttl_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `magic_tunnel_deleted_response` in responses.
  */
-export const magic_tunnel_deleted_response_output: JsonSchema = {
+export const magic_tunnel_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -185,7 +145,7 @@ export const magic_tunnel_deleted_response_output: JsonSchema = {
 /**
  * The schema of `magic_tunnel_modified_response` in responses.
  */
-export const magic_tunnel_modified_response_output: JsonSchema = {
+export const magic_tunnel_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -212,7 +172,7 @@ export const magic_tunnel_modified_response_output: JsonSchema = {
 /**
  * The schema of `magic_tunnel_single_response` in responses.
  */
-export const magic_tunnel_single_response_output: JsonSchema = {
+export const magic_tunnel_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -236,7 +196,7 @@ export const magic_tunnel_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_tunnels_collection_response` in responses.
  */
-export const magic_tunnels_collection_response_output: JsonSchema = {
+export const magic_tunnels_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
diff --git a/src/generated/forge-mcp/magicTransit/greTunnels/schemas.ts b/src/generated/forge-mcp/magicTransit/greTunnels/schemas.ts
index a45e40aa2..40005ab11 100644
--- a/src/generated/forge-mcp/magicTransit/greTunnels/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/greTunnels/schemas.ts
@@ -3,63 +3,55 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_cloudflare_gre_endpoint`.
- */
-export const magic_cloudflare_gre_endpoint: JsonSchema = {
-  "description": "The IP address assigned to the Cloudflare side of the GRE tunnel.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_create_gre_tunnel_request`.
  */
 export const magic_create_gre_tunnel_request: JsonSchema = {
   "properties": {
     "automatic_return_routing": {
-      "$ref": "#/$defs/magic_automatic_return_routing",
       "default": false,
-      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected."
+      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected.",
+      "type": "boolean"
     },
     "bgp": {
       "$ref": "#/$defs/magic_bgp_config"
     },
     "cloudflare_gre_endpoint": {
-      "$ref": "#/$defs/magic_cloudflare_gre_endpoint",
-      "description": "The IP address assigned to the Cloudflare side of the GRE tunnel."
+      "description": "The IP address assigned to the Cloudflare side of the GRE tunnel.",
+      "type": "string"
     },
     "customer_gre_endpoint": {
-      "$ref": "#/$defs/magic_customer_gre_endpoint",
-      "description": "The IP address assigned to the customer side of the GRE tunnel."
+      "description": "The IP address assigned to the customer side of the GRE tunnel.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/magic_schemas-description",
-      "description": "An optional description of the GRE tunnel."
+      "description": "An optional description of the GRE tunnel.",
+      "type": "string"
     },
     "health_check": {
       "$ref": "#/$defs/magic_tunnel_health_check"
     },
     "interface_address": {
-      "$ref": "#/$defs/magic_interface_address",
-      "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255."
+      "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.",
+      "type": "string"
     },
     "interface_address6": {
-      "$ref": "#/$defs/magic_interface_address6",
-      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127"
+      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127",
+      "type": "string"
     },
     "mtu": {
-      "$ref": "#/$defs/magic_mtu",
       "default": 1476,
-      "description": "Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value is 576."
+      "description": "Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value is 576.",
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/magic_gre_tunnel_name",
-      "description": "The name of the tunnel. The name cannot contain spaces or special characters, must be 15 characters or less, and cannot share a name with another GRE tunnel."
+      "description": "The name of the tunnel. The name cannot contain spaces or special characters, must be 15 characters or less, and cannot share a name with another GRE tunnel.",
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/magic_ttl",
       "default": 64,
-      "description": "Time To Live (TTL) in number of hops of the GRE tunnel."
+      "description": "Time To Live (TTL) in number of hops of the GRE tunnel.",
+      "type": "integer"
     }
   },
   "required": [
@@ -71,68 +63,52 @@ export const magic_create_gre_tunnel_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_customer_gre_endpoint`.
- */
-export const magic_customer_gre_endpoint: JsonSchema = {
-  "description": "The IP address assigned to the customer side of the GRE tunnel.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_gre_tunnel_name`.
- */
-export const magic_gre_tunnel_name: JsonSchema = {
-  "description": "The name of the tunnel. The name cannot contain spaces or special characters, must be 15 characters or less, and cannot share a name with another GRE tunnel.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_gre_tunnel_update_request`.
  */
 export const magic_gre_tunnel_update_request: JsonSchema = {
   "properties": {
     "automatic_return_routing": {
-      "$ref": "#/$defs/magic_automatic_return_routing",
       "default": false,
-      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected."
+      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected.",
+      "type": "boolean"
     },
     "cloudflare_gre_endpoint": {
-      "$ref": "#/$defs/magic_cloudflare_gre_endpoint",
-      "description": "The IP address assigned to the Cloudflare side of the GRE tunnel."
+      "description": "The IP address assigned to the Cloudflare side of the GRE tunnel.",
+      "type": "string"
     },
     "customer_gre_endpoint": {
-      "$ref": "#/$defs/magic_customer_gre_endpoint",
-      "description": "The IP address assigned to the customer side of the GRE tunnel."
+      "description": "The IP address assigned to the customer side of the GRE tunnel.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/magic_schemas-description",
-      "description": "An optional description of the GRE tunnel."
+      "description": "An optional description of the GRE tunnel.",
+      "type": "string"
     },
     "health_check": {
       "$ref": "#/$defs/magic_tunnel_health_check"
     },
     "interface_address": {
-      "$ref": "#/$defs/magic_interface_address",
-      "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255."
+      "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.",
+      "type": "string"
     },
     "interface_address6": {
-      "$ref": "#/$defs/magic_interface_address6",
-      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127"
+      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127",
+      "type": "string"
     },
     "mtu": {
-      "$ref": "#/$defs/magic_mtu",
       "default": 1476,
-      "description": "Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value is 576."
+      "description": "Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value is 576.",
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/magic_gre_tunnel_name",
-      "description": "The name of the tunnel. The name cannot contain spaces or special characters, must be 15 characters or less, and cannot share a name with another GRE tunnel."
+      "description": "The name of the tunnel. The name cannot contain spaces or special characters, must be 15 characters or less, and cannot share a name with another GRE tunnel.",
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/magic_ttl",
       "default": 64,
-      "description": "Time To Live (TTL) in number of hops of the GRE tunnel."
+      "description": "Time To Live (TTL) in number of hops of the GRE tunnel.",
+      "type": "integer"
     }
   },
   "required": [
@@ -143,27 +119,3 @@ export const magic_gre_tunnel_update_request: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `magic_mtu`.
- */
-export const magic_mtu: JsonSchema = {
-  "description": "Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value is 576.",
-  "type": "integer"
-};
-
-/**
- * The schema of `magic_schemas-description`.
- */
-export const magic_schemas_description: JsonSchema = {
-  "description": "An optional description of the GRE tunnel.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_ttl`.
- */
-export const magic_ttl: JsonSchema = {
-  "description": "Time To Live (TTL) in number of hops of the GRE tunnel.",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/greTunnels/tools.ts b/src/generated/forge-mcp/magicTransit/greTunnels/tools.ts
index d51e31333..08a125ab1 100644
--- a/src/generated/forge-mcp/magicTransit/greTunnels/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/greTunnels/tools.ts
@@ -1,116 +1,95 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_automatic_return_routing_output,
-  magic_bgp_config_output,
-  magic_bgp_status_with_state_output,
-  magic_health_check_base_output,
-  magic_health_check_target_output,
-  magic_interface_address6_output,
-  magic_interface_address_output,
-  magic_messages_output,
-  magic_schemas_created_on_output,
-  magic_schemas_identifier_output,
-  magic_schemas_modified_on_output,
-  magic_tunnel_health_check_output,
-} from "../outputs.js";
-import {
-  magic_automatic_return_routing,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
   magic_bgp_config,
+  magic_bgp_status_with_state,
   magic_health_check_base,
   magic_health_check_target,
-  magic_identifier,
-  magic_interface_address,
-  magic_interface_address6,
+  magic_messages,
   magic_tunnel_health_check,
+} from "../outputs.js";
+import {
+  magic_bgp_config as magic_bgp_config$,
+  magic_health_check_base as magic_health_check_base$,
+  magic_health_check_target as magic_health_check_target$,
+  magic_tunnel_health_check as magic_tunnel_health_check$,
 } from "../schemas.js";
 import {
-  magic_cloudflare_gre_endpoint_output,
-  magic_create_gre_tunnel_response_output,
-  magic_customer_gre_endpoint_output,
-  magic_gre_tunnel_name_output,
-  magic_gre_tunnel_output,
-  magic_modified_tunnels_collection_response_output,
-  magic_mtu_output,
-  magic_schemas_description_output,
-  magic_ttl_output,
-  magic_tunnel_deleted_response_output,
-  magic_tunnel_modified_response_output,
-  magic_tunnel_single_response_output,
-  magic_tunnels_collection_response_output,
+  magic_create_gre_tunnel_response,
+  magic_gre$$tunnel,
+  magic_modified_tunnels_collection_response,
+  magic_tunnel_deleted_response,
+  magic_tunnel_modified_response,
+  magic_tunnel_single_response,
+  magic_tunnels_collection_response,
 } from "./outputs.js";
 import {
-  magic_cloudflare_gre_endpoint,
   magic_create_gre_tunnel_request,
-  magic_customer_gre_endpoint,
-  magic_gre_tunnel_name,
   magic_gre_tunnel_update_request,
-  magic_mtu,
-  magic_schemas_description,
-  magic_ttl,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.gre_tunnels`.
+ * The tools of `magicTransit.greTunnels`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_gre_tunnels_bulk_update",
+    name: "magicTransit_greTunnels_bulkUpdate",
     title: "Update multiple GRE tunnels",
-    description: "Updates multiple GRE tunnels. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Updates multiple GRE tunnels. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nPUT /accounts/{account_id}/magic/gre_tunnels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_modified_tunnels_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_tunnels_collection_response": magic_modified_tunnels_collection_response_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_modified_tunnels_collection_response": magic_modified_tunnels_collection_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -144,105 +123,87 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_tunnels_collection_response": magic_modified_tunnels_collection_response_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_modified_tunnels_collection_response": magic_modified_tunnels_collection_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/gre_tunnels`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "magic_transit_gre_tunnels_create",
+    name: "magicTransit_greTunnels_create",
     title: "Create a GRE tunnel",
-    description: "Creates a new GRE tunnel. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Creates a new GRE tunnel. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nPOST /accounts/{account_id}/magic/gre_tunnels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_create_gre_tunnel_request"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_automatic_return_routing": magic_automatic_return_routing,
-        "magic_bgp_config": magic_bgp_config,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint,
+        "magic_bgp_config": magic_bgp_config$,
         "magic_create_gre_tunnel_request": magic_create_gre_tunnel_request,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name,
-        "magic_health_check_base": magic_health_check_base,
-        "magic_health_check_target": magic_health_check_target,
-        "magic_identifier": magic_identifier,
-        "magic_interface_address": magic_interface_address,
-        "magic_interface_address6": magic_interface_address6,
-        "magic_mtu": magic_mtu,
-        "magic_schemas-description": magic_schemas_description,
-        "magic_ttl": magic_ttl,
-        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_health_check_base": magic_health_check_base$,
+        "magic_health_check_target": magic_health_check_target$,
+        "magic_tunnel_health_check": magic_tunnel_health_check$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_create_gre_tunnel_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_create_gre_tunnel_response": magic_create_gre_tunnel_response_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_create_gre_tunnel_response": magic_create_gre_tunnel_response,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -276,92 +237,81 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_create_gre_tunnel_response": magic_create_gre_tunnel_response_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_create_gre_tunnel_response": magic_create_gre_tunnel_response,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/gre_tunnels`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "magic_transit_gre_tunnels_delete",
+    name: "magicTransit_greTunnels_delete",
     title: "Delete GRE Tunnel",
-    description: "Disables and removes a specific static GRE tunnel. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Disables and removes a specific static GRE tunnel. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nDELETE /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "gre_tunnel_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "gre_tunnel_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gre_tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gre_tunnel_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_tunnel_deleted_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_deleted_response": magic_tunnel_deleted_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_deleted_response": magic_tunnel_deleted_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -395,91 +345,80 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_deleted_response": magic_tunnel_deleted_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_deleted_response": magic_tunnel_deleted_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/gre_tunnels/${pathParam(args, "gre_tunnel_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_gre_tunnels_get",
+    name: "magicTransit_greTunnels_get",
     title: "List GRE Tunnel Details",
-    description: "Lists informtion for a specific GRE tunnel.",
+    description: "Lists informtion for a specific GRE tunnel.\n\nGET /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "gre_tunnel_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "gre_tunnel_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gre_tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gre_tunnel_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_tunnel_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
-        "magic_tunnel_single_response": magic_tunnel_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_tunnel_single_response": magic_tunnel_single_response,
       },
     },
     annotations: {
@@ -515,86 +454,75 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
-        "magic_tunnel_single_response": magic_tunnel_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_tunnel_single_response": magic_tunnel_single_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/gre_tunnels/${pathParam(args, "gre_tunnel_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_gre_tunnels_list",
+    name: "magicTransit_greTunnels_list",
     title: "List GRE tunnels",
-    description: "Lists GRE tunnels associated with an account.",
+    description: "Lists GRE tunnels associated with an account.\n\nGET /accounts/{account_id}/magic/gre_tunnels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_tunnels_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
-        "magic_tunnels_collection_response": magic_tunnels_collection_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_tunnels_collection_response": magic_tunnels_collection_response,
       },
     },
     annotations: {
@@ -630,108 +558,90 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
-        "magic_tunnels_collection_response": magic_tunnels_collection_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_tunnels_collection_response": magic_tunnels_collection_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/gre_tunnels`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_gre_tunnels_update",
+    name: "magicTransit_greTunnels_update",
     title: "Update GRE Tunnel",
-    description: "Updates a specific GRE tunnel. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Updates a specific GRE tunnel. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nPUT /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_gre_tunnel_update_request"
         },
-        "gre_tunnel_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "gre_tunnel_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "gre_tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "gre_tunnel_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_automatic_return_routing": magic_automatic_return_routing,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name,
         "magic_gre_tunnel_update_request": magic_gre_tunnel_update_request,
-        "magic_health_check_base": magic_health_check_base,
-        "magic_health_check_target": magic_health_check_target,
-        "magic_identifier": magic_identifier,
-        "magic_interface_address": magic_interface_address,
-        "magic_interface_address6": magic_interface_address6,
-        "magic_mtu": magic_mtu,
-        "magic_schemas-description": magic_schemas_description,
-        "magic_ttl": magic_ttl,
-        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_health_check_base": magic_health_check_base$,
+        "magic_health_check_target": magic_health_check_target$,
+        "magic_tunnel_health_check": magic_tunnel_health_check$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_tunnel_modified_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
-        "magic_tunnel_modified_response": magic_tunnel_modified_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_tunnel_modified_response": magic_tunnel_modified_response,
       },
     },
     annotations: {
@@ -765,35 +675,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_gre_endpoint": magic_cloudflare_gre_endpoint_output,
-        "magic_customer_gre_endpoint": magic_customer_gre_endpoint_output,
-        "magic_gre-tunnel": magic_gre_tunnel_output,
-        "magic_gre_tunnel_name": magic_gre_tunnel_name_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_messages": magic_messages_output,
-        "magic_mtu": magic_mtu_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-description": magic_schemas_description_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_ttl": magic_ttl_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
-        "magic_tunnel_modified_response": magic_tunnel_modified_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_gre-tunnel": magic_gre$$tunnel,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_messages": magic_messages,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_tunnel_modified_response": magic_tunnel_modified_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/gre_tunnels/${pathParam(args, "gre_tunnel_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/magicTransit/ipsecTunnels/outputs.ts b/src/generated/forge-mcp/magicTransit/ipsecTunnels/outputs.ts
index 84bc8eace..0872b50f3 100644
--- a/src/generated/forge-mcp/magicTransit/ipsecTunnels/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/ipsecTunnels/outputs.ts
@@ -3,31 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_allow_null_cipher` in responses.
- */
-export const magic_allow_null_cipher_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `magic_cloudflare_ipsec_endpoint` in responses.
- */
-export const magic_cloudflare_ipsec_endpoint_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_components-schemas-description` in responses.
- */
-export const magic_components_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_custom_remote_identities` in responses.
  */
-export const magic_custom_remote_identities_output: JsonSchema = {
+export const magic_custom_remote_identities: JsonSchema = {
   "properties": {
     "fqdn_id": {
       "type": "string"
@@ -36,23 +15,16 @@ export const magic_custom_remote_identities_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_customer_ipsec_endpoint` in responses.
- */
-export const magic_customer_ipsec_endpoint_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_ipsec-tunnel` in responses.
  */
-export const magic_ipsec_tunnel_output: JsonSchema = {
+export const magic_ipsec$$tunnel: JsonSchema = {
   "properties": {
     "allow_null_cipher": {
-      "$ref": "#/$defs/magic_allow_null_cipher"
+      "type": "boolean"
     },
     "automatic_return_routing": {
-      "$ref": "#/$defs/magic_automatic_return_routing"
+      "type": "boolean"
     },
     "bgp": {
       "$ref": "#/$defs/magic_bgp_config"
@@ -61,43 +33,45 @@ export const magic_ipsec_tunnel_output: JsonSchema = {
       "$ref": "#/$defs/magic_bgp_status_with_state"
     },
     "cloudflare_endpoint": {
-      "$ref": "#/$defs/magic_cloudflare_ipsec_endpoint"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/magic_schemas-created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "custom_remote_identities": {
       "$ref": "#/$defs/magic_custom_remote_identities"
     },
     "customer_endpoint": {
-      "$ref": "#/$defs/magic_customer_ipsec_endpoint"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/magic_components-schemas-description"
+      "type": "string"
     },
     "health_check": {
       "$ref": "#/$defs/magic_tunnel_health_check"
     },
     "id": {
-      "$ref": "#/$defs/magic_schemas-identifier"
+      "type": "string"
     },
     "interface_address": {
-      "$ref": "#/$defs/magic_interface_address"
+      "type": "string"
     },
     "interface_address6": {
-      "$ref": "#/$defs/magic_interface_address6"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/magic_schemas-modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/magic_ipsec_tunnel_name"
+      "type": "string"
     },
     "psk_metadata": {
       "$ref": "#/$defs/magic_psk_metadata"
     },
     "replay_protection": {
-      "$ref": "#/$defs/magic_replay_protection"
+      "type": "boolean"
     }
   },
   "required": [
@@ -112,16 +86,16 @@ export const magic_ipsec_tunnel_output: JsonSchema = {
 /**
  * The schema of `magic_ipsec_tunnel_applied_psk` in responses.
  */
-export const magic_ipsec_tunnel_applied_psk_output: JsonSchema = {
+export const magic_ipsec_tunnel_applied_psk: JsonSchema = {
   "properties": {
     "ipsec_id": {
       "type": "string"
     },
     "ipsec_tunnel_id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "psk": {
-      "$ref": "#/$defs/magic_psk"
+      "type": "string"
     },
     "psk_metadata": {
       "$ref": "#/$defs/magic_psk_metadata"
@@ -136,17 +110,10 @@ export const magic_ipsec_tunnel_applied_psk_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_ipsec_tunnel_name` in responses.
- */
-export const magic_ipsec_tunnel_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_ipsec_tunnels_psk_response` in responses.
  */
-export const magic_ipsec_tunnels_psk_response_output: JsonSchema = {
+export const magic_ipsec_tunnels_psk_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -176,17 +143,10 @@ export const magic_ipsec_tunnels_psk_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic_psk` in responses.
- */
-export const magic_psk_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_psk_generation_response` in responses.
  */
-export const magic_psk_generation_response_output: JsonSchema = {
+export const magic_psk_generation_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -196,10 +156,10 @@ export const magic_psk_generation_response_output: JsonSchema = {
         "result": {
           "properties": {
             "ipsec_tunnel_id": {
-              "$ref": "#/$defs/magic_identifier"
+              "type": "string"
             },
             "psk": {
-              "$ref": "#/$defs/magic_psk"
+              "type": "string"
             },
             "psk_metadata": {
               "$ref": "#/$defs/magic_psk_metadata"
@@ -216,26 +176,20 @@ export const magic_psk_generation_response_output: JsonSchema = {
 /**
  * The schema of `magic_psk_metadata` in responses.
  */
-export const magic_psk_metadata_output: JsonSchema = {
+export const magic_psk_metadata: JsonSchema = {
   "properties": {
     "last_generated_on": {
-      "$ref": "#/$defs/magic_schemas-modified_on"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `magic_replay_protection` in responses.
- */
-export const magic_replay_protection_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `magic_schemas-create_ipsec_tunnel_response` in responses.
  */
-export const magic_schemas_create_ipsec_tunnel_response_output: JsonSchema = {
+export const magic_schemas$$create_ipsec_tunnel_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -255,7 +209,7 @@ export const magic_schemas_create_ipsec_tunnel_response_output: JsonSchema = {
  * The schema of `magic_schemas-modified_tunnels_collection_response` in
  * responses.
  */
-export const magic_schemas_modified_tunnels_collection_response_output: JsonSchema = {
+export const magic_schemas$$modified_tunnels_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -285,7 +239,7 @@ export const magic_schemas_modified_tunnels_collection_response_output: JsonSche
 /**
  * The schema of `magic_schemas-tunnel_deleted_response` in responses.
  */
-export const magic_schemas_tunnel_deleted_response_output: JsonSchema = {
+export const magic_schemas$$tunnel_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -312,7 +266,7 @@ export const magic_schemas_tunnel_deleted_response_output: JsonSchema = {
 /**
  * The schema of `magic_schemas-tunnel_modified_response` in responses.
  */
-export const magic_schemas_tunnel_modified_response_output: JsonSchema = {
+export const magic_schemas$$tunnel_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -339,7 +293,7 @@ export const magic_schemas_tunnel_modified_response_output: JsonSchema = {
 /**
  * The schema of `magic_schemas-tunnel_single_response` in responses.
  */
-export const magic_schemas_tunnel_single_response_output: JsonSchema = {
+export const magic_schemas$$tunnel_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -363,7 +317,7 @@ export const magic_schemas_tunnel_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_schemas-tunnels_collection_response` in responses.
  */
-export const magic_schemas_tunnels_collection_response_output: JsonSchema = {
+export const magic_schemas$$tunnels_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
diff --git a/src/generated/forge-mcp/magicTransit/ipsecTunnels/schemas.ts b/src/generated/forge-mcp/magicTransit/ipsecTunnels/schemas.ts
index 711388d32..57b090c0c 100644
--- a/src/generated/forge-mcp/magicTransit/ipsecTunnels/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/ipsecTunnels/schemas.ts
@@ -3,22 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_cloudflare_ipsec_endpoint`.
- */
-export const magic_cloudflare_ipsec_endpoint: JsonSchema = {
-  "description": "The IP address assigned to the Cloudflare side of the IPsec tunnel.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_components-schemas-description`.
- */
-export const magic_components_schemas_description: JsonSchema = {
-  "description": "An optional description forthe IPsec tunnel.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_custom_remote_identities`.
  */
@@ -32,65 +16,57 @@ export const magic_custom_remote_identities: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_customer_ipsec_endpoint`.
- */
-export const magic_customer_ipsec_endpoint: JsonSchema = {
-  "description": "The IP address assigned to the customer side of the IPsec tunnel. Not required, but must be set for proactive traceroutes to work.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_ipsec_tunnel_add_request`.
  */
 export const magic_ipsec_tunnel_add_request: JsonSchema = {
   "properties": {
     "automatic_return_routing": {
-      "$ref": "#/$defs/magic_automatic_return_routing",
       "default": false,
-      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected."
+      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected.",
+      "type": "boolean"
     },
     "bgp": {
       "$ref": "#/$defs/magic_bgp_config"
     },
     "cloudflare_endpoint": {
-      "$ref": "#/$defs/magic_cloudflare_ipsec_endpoint",
-      "description": "The IP address assigned to the Cloudflare side of the IPsec tunnel."
+      "description": "The IP address assigned to the Cloudflare side of the IPsec tunnel.",
+      "type": "string"
     },
     "custom_remote_identities": {
       "$ref": "#/$defs/magic_custom_remote_identities"
     },
     "customer_endpoint": {
-      "$ref": "#/$defs/magic_customer_ipsec_endpoint",
-      "description": "The IP address assigned to the customer side of the IPsec tunnel. Not required, but must be set for proactive traceroutes to work."
+      "description": "The IP address assigned to the customer side of the IPsec tunnel. Not required, but must be set for proactive traceroutes to work.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/magic_components-schemas-description",
-      "description": "An optional description forthe IPsec tunnel."
+      "description": "An optional description forthe IPsec tunnel.",
+      "type": "string"
     },
     "health_check": {
       "$ref": "#/$defs/magic_tunnel_health_check"
     },
     "interface_address": {
-      "$ref": "#/$defs/magic_interface_address",
-      "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255."
+      "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.",
+      "type": "string"
     },
     "interface_address6": {
-      "$ref": "#/$defs/magic_interface_address6",
-      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127"
+      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/magic_ipsec_tunnel_name",
-      "description": "The name of the IPsec tunnel. The name cannot share a name with other tunnels."
+      "description": "The name of the IPsec tunnel. The name cannot share a name with other tunnels.",
+      "type": "string"
     },
     "psk": {
-      "$ref": "#/$defs/magic_psk",
-      "description": "A randomly generated or provided string for use in the IPsec tunnel."
+      "description": "A randomly generated or provided string for use in the IPsec tunnel.",
+      "type": "string"
     },
     "replay_protection": {
-      "$ref": "#/$defs/magic_replay_protection",
       "default": false,
-      "description": "If `true`, then IPsec replay protection will be supported in the Cloudflare-to-customer direction."
+      "description": "If `true`, then IPsec replay protection will be supported in the Cloudflare-to-customer direction.",
+      "type": "boolean"
     }
   },
   "required": [
@@ -107,51 +83,51 @@ export const magic_ipsec_tunnel_add_request: JsonSchema = {
 export const magic_ipsec_tunnel_add_single_request: JsonSchema = {
   "properties": {
     "automatic_return_routing": {
-      "$ref": "#/$defs/magic_automatic_return_routing",
       "default": false,
-      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected."
+      "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected.",
+      "type": "boolean"
     },
     "bgp": {
       "$ref": "#/$defs/magic_bgp_config"
     },
     "cloudflare_endpoint": {
-      "$ref": "#/$defs/magic_cloudflare_ipsec_endpoint",
-      "description": "The IP address assigned to the Cloudflare side of the IPsec tunnel."
+      "description": "The IP address assigned to the Cloudflare side of the IPsec tunnel.",
+      "type": "string"
     },
     "custom_remote_identities": {
       "$ref": "#/$defs/magic_custom_remote_identities"
     },
     "customer_endpoint": {
-      "$ref": "#/$defs/magic_customer_ipsec_endpoint",
-      "description": "The IP address assigned to the customer side of the IPsec tunnel. Not required, but must be set for proactive traceroutes to work."
+      "description": "The IP address assigned to the customer side of the IPsec tunnel. Not required, but must be set for proactive traceroutes to work.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/magic_components-schemas-description",
-      "description": "An optional description forthe IPsec tunnel."
+      "description": "An optional description forthe IPsec tunnel.",
+      "type": "string"
     },
     "health_check": {
       "$ref": "#/$defs/magic_tunnel_health_check"
     },
     "interface_address": {
-      "$ref": "#/$defs/magic_interface_address",
-      "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255."
+      "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.",
+      "type": "string"
     },
     "interface_address6": {
-      "$ref": "#/$defs/magic_interface_address6",
-      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127"
+      "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/magic_ipsec_tunnel_name",
-      "description": "The name of the IPsec tunnel. The name cannot share a name with other tunnels."
+      "description": "The name of the IPsec tunnel. The name cannot share a name with other tunnels.",
+      "type": "string"
     },
     "psk": {
-      "$ref": "#/$defs/magic_psk",
-      "description": "A randomly generated or provided string for use in the IPsec tunnel."
+      "description": "A randomly generated or provided string for use in the IPsec tunnel.",
+      "type": "string"
     },
     "replay_protection": {
-      "$ref": "#/$defs/magic_replay_protection",
       "default": false,
-      "description": "If `true`, then IPsec replay protection will be supported in the Cloudflare-to-customer direction."
+      "description": "If `true`, then IPsec replay protection will be supported in the Cloudflare-to-customer direction.",
+      "type": "boolean"
     }
   },
   "required": [
@@ -162,14 +138,6 @@ export const magic_ipsec_tunnel_add_single_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_ipsec_tunnel_name`.
- */
-export const magic_ipsec_tunnel_name: JsonSchema = {
-  "description": "The name of the IPsec tunnel. The name cannot share a name with other tunnels.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_ipsec_tunnel_psk_entry`.
  */
@@ -177,12 +145,12 @@ export const magic_ipsec_tunnel_psk_entry: JsonSchema = {
   "description": "A PSK entry for a specific IPsec tunnel.",
   "properties": {
     "id": {
-      "$ref": "#/$defs/magic_identifier",
-      "description": "The ID of the IPsec tunnel."
+      "description": "The ID of the IPsec tunnel.",
+      "type": "string"
     },
     "psk": {
-      "$ref": "#/$defs/magic_psk",
-      "description": "A randomly generated or provided string for use in the IPsec tunnel."
+      "description": "A randomly generated or provided string for use in the IPsec tunnel.",
+      "type": "string"
     }
   },
   "required": [
@@ -211,19 +179,3 @@ export const magic_ipsec_tunnels_psk_request: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `magic_psk`.
- */
-export const magic_psk: JsonSchema = {
-  "description": "A randomly generated or provided string for use in the IPsec tunnel.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_replay_protection`.
- */
-export const magic_replay_protection: JsonSchema = {
-  "description": "If `true`, then IPsec replay protection will be supported in the Cloudflare-to-customer direction.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/magicTransit/ipsecTunnels/tools.ts b/src/generated/forge-mcp/magicTransit/ipsecTunnels/tools.ts
index b234201c2..bb7a2e74c 100644
--- a/src/generated/forge-mcp/magicTransit/ipsecTunnels/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/ipsecTunnels/tools.ts
@@ -1,128 +1,105 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_automatic_return_routing_output,
-  magic_bgp_config_output,
-  magic_bgp_status_with_state_output,
-  magic_health_check_base_output,
-  magic_health_check_target_output,
-  magic_identifier_output,
-  magic_interface_address6_output,
-  magic_interface_address_output,
-  magic_messages_output,
-  magic_schemas_created_on_output,
-  magic_schemas_identifier_output,
-  magic_schemas_modified_on_output,
-  magic_tunnel_health_check_output,
-} from "../outputs.js";
-import {
-  magic_automatic_return_routing,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
   magic_bgp_config,
+  magic_bgp_status_with_state,
   magic_health_check_base,
   magic_health_check_target,
-  magic_identifier,
-  magic_interface_address,
-  magic_interface_address6,
+  magic_messages,
   magic_tunnel_health_check,
+} from "../outputs.js";
+import {
+  magic_bgp_config as magic_bgp_config$,
+  magic_health_check_base as magic_health_check_base$,
+  magic_health_check_target as magic_health_check_target$,
+  magic_tunnel_health_check as magic_tunnel_health_check$,
 } from "../schemas.js";
 import {
-  magic_allow_null_cipher_output,
-  magic_cloudflare_ipsec_endpoint_output,
-  magic_components_schemas_description_output,
-  magic_custom_remote_identities_output,
-  magic_customer_ipsec_endpoint_output,
-  magic_ipsec_tunnel_applied_psk_output,
-  magic_ipsec_tunnel_name_output,
-  magic_ipsec_tunnel_output,
-  magic_ipsec_tunnels_psk_response_output,
-  magic_psk_generation_response_output,
-  magic_psk_metadata_output,
-  magic_psk_output,
-  magic_replay_protection_output,
-  magic_schemas_create_ipsec_tunnel_response_output,
-  magic_schemas_modified_tunnels_collection_response_output,
-  magic_schemas_tunnel_deleted_response_output,
-  magic_schemas_tunnel_modified_response_output,
-  magic_schemas_tunnel_single_response_output,
-  magic_schemas_tunnels_collection_response_output,
+  magic_custom_remote_identities,
+  magic_ipsec$$tunnel,
+  magic_ipsec_tunnel_applied_psk,
+  magic_ipsec_tunnels_psk_response,
+  magic_psk_generation_response,
+  magic_psk_metadata,
+  magic_schemas$$create_ipsec_tunnel_response,
+  magic_schemas$$modified_tunnels_collection_response,
+  magic_schemas$$tunnel_deleted_response,
+  magic_schemas$$tunnel_modified_response,
+  magic_schemas$$tunnel_single_response,
+  magic_schemas$$tunnels_collection_response,
 } from "./outputs.js";
 import {
-  magic_cloudflare_ipsec_endpoint,
-  magic_components_schemas_description,
-  magic_custom_remote_identities,
-  magic_customer_ipsec_endpoint,
+  magic_custom_remote_identities as magic_custom_remote_identities$,
   magic_ipsec_tunnel_add_request,
   magic_ipsec_tunnel_add_single_request,
-  magic_ipsec_tunnel_name,
   magic_ipsec_tunnel_psk_entry,
   magic_ipsec_tunnels_psk_request,
-  magic_psk,
-  magic_replay_protection,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.ipsec_tunnels`.
+ * The tools of `magicTransit.ipsecTunnels`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_ipsec_tunnels_bulk_update",
+    name: "magicTransit_ipsecTunnels_bulkUpdate",
     title: "Update multiple IPsec tunnels",
-    description: "Update multiple IPsec tunnels associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Update multiple IPsec tunnels associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nPUT /accounts/{account_id}/magic/ipsec_tunnels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_schemas-modified_tunnels_collection_response",
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-modified_tunnels_collection_response": magic_schemas_modified_tunnels_collection_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-modified_tunnels_collection_response": magic_schemas$$modified_tunnels_collection_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -156,110 +133,92 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-modified_tunnels_collection_response": magic_schemas_modified_tunnels_collection_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-modified_tunnels_collection_response": magic_schemas$$modified_tunnels_collection_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/ipsec_tunnels`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "magic_transit_ipsec_tunnels_create",
+    name: "magicTransit_ipsecTunnels_create",
     title: "Create an IPsec tunnel",
-    description: "Creates a new IPsec tunnel associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Creates a new IPsec tunnel associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nPOST /accounts/{account_id}/magic/ipsec_tunnels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_ipsec_tunnel_add_request"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_automatic_return_routing": magic_automatic_return_routing,
-        "magic_bgp_config": magic_bgp_config,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint,
-        "magic_components-schemas-description": magic_components_schemas_description,
-        "magic_custom_remote_identities": magic_custom_remote_identities,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint,
-        "magic_health_check_base": magic_health_check_base,
-        "magic_health_check_target": magic_health_check_target,
-        "magic_identifier": magic_identifier,
-        "magic_interface_address": magic_interface_address,
-        "magic_interface_address6": magic_interface_address6,
+        "magic_bgp_config": magic_bgp_config$,
+        "magic_custom_remote_identities": magic_custom_remote_identities$,
+        "magic_health_check_base": magic_health_check_base$,
+        "magic_health_check_target": magic_health_check_target$,
         "magic_ipsec_tunnel_add_request": magic_ipsec_tunnel_add_request,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name,
-        "magic_psk": magic_psk,
-        "magic_replay_protection": magic_replay_protection,
-        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_tunnel_health_check": magic_tunnel_health_check$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_schemas-create_ipsec_tunnel_response",
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-create_ipsec_tunnel_response": magic_schemas_create_ipsec_tunnel_response_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-create_ipsec_tunnel_response": magic_schemas$$create_ipsec_tunnel_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -293,96 +252,85 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-create_ipsec_tunnel_response": magic_schemas_create_ipsec_tunnel_response_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-create_ipsec_tunnel_response": magic_schemas$$create_ipsec_tunnel_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/ipsec_tunnels`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "magic_transit_ipsec_tunnels_delete",
+    name: "magicTransit_ipsecTunnels_delete",
     title: "Delete IPsec Tunnel",
-    description: "Disables and removes a specific static IPsec Tunnel associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Disables and removes a specific static IPsec Tunnel associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nDELETE /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "ipsec_tunnel_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "ipsec_tunnel_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ipsec_tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ipsec_tunnel_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_schemas-tunnel_deleted_response",
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-tunnel_deleted_response": magic_schemas_tunnel_deleted_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-tunnel_deleted_response": magic_schemas$$tunnel_deleted_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -416,95 +364,84 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-tunnel_deleted_response": magic_schemas_tunnel_deleted_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-tunnel_deleted_response": magic_schemas$$tunnel_deleted_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/ipsec_tunnels/${pathParam(args, "ipsec_tunnel_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_ipsec_tunnels_get",
+    name: "magicTransit_ipsecTunnels_get",
     title: "List IPsec tunnel details",
-    description: "Lists details for a specific IPsec tunnel.",
+    description: "Lists details for a specific IPsec tunnel.\n\nGET /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "ipsec_tunnel_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "ipsec_tunnel_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ipsec_tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ipsec_tunnel_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_schemas-tunnel_single_response",
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-tunnel_single_response": magic_schemas_tunnel_single_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-tunnel_single_response": magic_schemas$$tunnel_single_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -540,90 +477,79 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-tunnel_single_response": magic_schemas_tunnel_single_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-tunnel_single_response": magic_schemas$$tunnel_single_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/ipsec_tunnels/${pathParam(args, "ipsec_tunnel_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_ipsec_tunnels_list",
+    name: "magicTransit_ipsecTunnels_list",
     title: "List IPsec tunnels",
-    description: "Lists IPsec tunnels associated with an account.",
+    description: "Lists IPsec tunnels associated with an account.\n\nGET /accounts/{account_id}/magic/ipsec_tunnels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_schemas-tunnels_collection_response",
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-tunnels_collection_response": magic_schemas_tunnels_collection_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-tunnels_collection_response": magic_schemas$$tunnels_collection_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -659,75 +585,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-tunnels_collection_response": magic_schemas_tunnels_collection_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-tunnels_collection_response": magic_schemas$$tunnels_collection_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/ipsec_tunnels`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_ipsec_tunnels_psk_generate",
+    name: "magicTransit_ipsecTunnels_pskGenerate",
     title: "Generate Pre-Shared Key (PSK) for IPsec tunnels",
-    description: "Generates a Pre-Shared Key for a specific IPsec tunnel used in the IKE session. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes. After a PSK is generated, the PSK is immediately persisted to Cloudflare's edge and cannot be retrieved later. Store the PSK in a safe place.",
+    description: "Generates a Pre-Shared Key for a specific IPsec tunnel used in the IKE session. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes. After a PSK is generated, the PSK is immediately persisted to Cloudflare's edge and cannot be retrieved later. Store the PSK in a safe place.\n\nPOST /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}/psk_generate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "ipsec_tunnel_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "ipsec_tunnel_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ipsec_tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ipsec_tunnel_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_psk_generation_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk": magic_psk_output,
-        "magic_psk_generation_response": magic_psk_generation_response_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_psk_generation_response": magic_psk_generation_response,
+        "magic_psk_metadata": magic_psk_metadata,
       },
     },
     annotations: {
@@ -761,15 +679,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk": magic_psk_output,
-        "magic_psk_generation_response": magic_psk_generation_response_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_psk_generation_response": magic_psk_generation_response,
+        "magic_psk_metadata": magic_psk_metadata,
       },
     },
     request: (args) => ({
@@ -777,47 +692,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_ipsec_tunnels_psk_set",
+    name: "magicTransit_ipsecTunnels_pskSet",
     title: "Set Pre-Shared Keys (PSK) for IPsec tunnels",
-    description: "Sets Pre-Shared Keys for multiple IPsec tunnels associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes. After PSKs are applied, they are immediately persisted to Cloudflare's edge and cannot be retrieved later. Store the PSKs in a safe place.",
+    description: "Sets Pre-Shared Keys for multiple IPsec tunnels associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes. After PSKs are applied, they are immediately persisted to Cloudflare's edge and cannot be retrieved later. Store the PSKs in a safe place.\n\nPOST /accounts/{account_id}/magic/ipsec_tunnels/psk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_ipsec_tunnels_psk_request"
         },
-        "validate_only": {
-          "description": "If `true`, only run validation without persisting changes.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "validate_only": {
+              "description": "If `true`, only run validation without persisting changes.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_identifier": magic_identifier,
         "magic_ipsec_tunnel_psk_entry": magic_ipsec_tunnel_psk_entry,
         "magic_ipsec_tunnels_psk_request": magic_ipsec_tunnels_psk_request,
-        "magic_psk": magic_psk,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_ipsec_tunnels_psk_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ipsec_tunnel_applied_psk": magic_ipsec_tunnel_applied_psk_output,
-        "magic_ipsec_tunnels_psk_response": magic_ipsec_tunnels_psk_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk": magic_psk_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_ipsec_tunnel_applied_psk": magic_ipsec_tunnel_applied_psk,
+        "magic_ipsec_tunnels_psk_response": magic_ipsec_tunnels_psk_response,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
       },
     },
     annotations: {
@@ -851,100 +777,91 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ipsec_tunnel_applied_psk": magic_ipsec_tunnel_applied_psk_output,
-        "magic_ipsec_tunnels_psk_response": magic_ipsec_tunnels_psk_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk": magic_psk_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_ipsec_tunnel_applied_psk": magic_ipsec_tunnel_applied_psk,
+        "magic_ipsec_tunnels_psk_response": magic_ipsec_tunnels_psk_response,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/ipsec_tunnels/psk`,
       query: [
-        ["validate_only", args["validate_only"], true],
+        ["validate_only", param(args, "query", "validate_only"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "magic_transit_ipsec_tunnels_update",
+    name: "magicTransit_ipsecTunnels_update",
     title: "Update IPsec Tunnel",
-    description: "Updates a specific IPsec tunnel associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.",
+    description: "Updates a specific IPsec tunnel associated with an account. Use `?validate_only=true` as an optional query parameter to only run validation without persisting changes.\n\nPUT /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_ipsec_tunnel_add_single_request"
         },
-        "ipsec_tunnel_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the request and response bodies will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "ipsec_tunnel_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ipsec_tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ipsec_tunnel_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_automatic_return_routing": magic_automatic_return_routing,
-        "magic_bgp_config": magic_bgp_config,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint,
-        "magic_components-schemas-description": magic_components_schemas_description,
-        "magic_custom_remote_identities": magic_custom_remote_identities,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint,
-        "magic_health_check_base": magic_health_check_base,
-        "magic_health_check_target": magic_health_check_target,
-        "magic_identifier": magic_identifier,
-        "magic_interface_address": magic_interface_address,
-        "magic_interface_address6": magic_interface_address6,
+        "magic_bgp_config": magic_bgp_config$,
+        "magic_custom_remote_identities": magic_custom_remote_identities$,
+        "magic_health_check_base": magic_health_check_base$,
+        "magic_health_check_target": magic_health_check_target$,
         "magic_ipsec_tunnel_add_single_request": magic_ipsec_tunnel_add_single_request,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name,
-        "magic_psk": magic_psk,
-        "magic_replay_protection": magic_replay_protection,
-        "magic_tunnel_health_check": magic_tunnel_health_check,
+        "magic_tunnel_health_check": magic_tunnel_health_check$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_schemas-tunnel_modified_response",
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-tunnel_modified_response": magic_schemas_tunnel_modified_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-tunnel_modified_response": magic_schemas$$tunnel_modified_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     annotations: {
@@ -978,37 +895,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_allow_null_cipher": magic_allow_null_cipher_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_automatic_return_routing": magic_automatic_return_routing_output,
-        "magic_bgp_config": magic_bgp_config_output,
-        "magic_bgp_status_with_state": magic_bgp_status_with_state_output,
-        "magic_cloudflare_ipsec_endpoint": magic_cloudflare_ipsec_endpoint_output,
-        "magic_components-schemas-description": magic_components_schemas_description_output,
-        "magic_custom_remote_identities": magic_custom_remote_identities_output,
-        "magic_customer_ipsec_endpoint": magic_customer_ipsec_endpoint_output,
-        "magic_health_check_base": magic_health_check_base_output,
-        "magic_health_check_target": magic_health_check_target_output,
-        "magic_interface_address": magic_interface_address_output,
-        "magic_interface_address6": magic_interface_address6_output,
-        "magic_ipsec-tunnel": magic_ipsec_tunnel_output,
-        "magic_ipsec_tunnel_name": magic_ipsec_tunnel_name_output,
-        "magic_messages": magic_messages_output,
-        "magic_psk_metadata": magic_psk_metadata_output,
-        "magic_replay_protection": magic_replay_protection_output,
-        "magic_schemas-created_on": magic_schemas_created_on_output,
-        "magic_schemas-identifier": magic_schemas_identifier_output,
-        "magic_schemas-modified_on": magic_schemas_modified_on_output,
-        "magic_schemas-tunnel_modified_response": magic_schemas_tunnel_modified_response_output,
-        "magic_tunnel_health_check": magic_tunnel_health_check_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_bgp_config": magic_bgp_config,
+        "magic_bgp_status_with_state": magic_bgp_status_with_state,
+        "magic_custom_remote_identities": magic_custom_remote_identities,
+        "magic_health_check_base": magic_health_check_base,
+        "magic_health_check_target": magic_health_check_target,
+        "magic_ipsec-tunnel": magic_ipsec$$tunnel,
+        "magic_messages": magic_messages,
+        "magic_psk_metadata": magic_psk_metadata,
+        "magic_schemas-tunnel_modified_response": magic_schemas$$tunnel_modified_response,
+        "magic_tunnel_health_check": magic_tunnel_health_check,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/ipsec_tunnels/${pathParam(args, "ipsec_tunnel_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/magicTransit/outputs.ts b/src/generated/forge-mcp/magicTransit/outputs.ts
index 60d8d4205..fa1becac7 100644
--- a/src/generated/forge-mcp/magicTransit/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../_/tool.js";
  * The schema of `advanced-ddos-protection_api-response-collection` in
  * responses.
  */
-export const advanced_ddos_protection_api_response_collection_output: JsonSchema = {
+export const advanced$$ddos$$protection_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/advanced-ddos-protection_api-response-common"
@@ -43,7 +43,7 @@ export const advanced_ddos_protection_api_response_collection_output: JsonSchema
 /**
  * The schema of `advanced-ddos-protection_api-response-common` in responses.
  */
-export const advanced_ddos_protection_api_response_common_output: JsonSchema = {
+export const advanced$$ddos$$protection_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/advanced-ddos-protection_messages"
@@ -70,7 +70,7 @@ export const advanced_ddos_protection_api_response_common_output: JsonSchema = {
  * The schema of `advanced-ddos-protection_api-response-common-failure` in
  * responses.
  */
-export const advanced_ddos_protection_api_response_common_failure_output: JsonSchema = {
+export const advanced$$ddos$$protection_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/advanced-ddos-protection_messages"
@@ -100,7 +100,7 @@ export const advanced_ddos_protection_api_response_common_failure_output: JsonSc
 /**
  * The schema of `advanced-ddos-protection_messages` in responses.
  */
-export const advanced_ddos_protection_messages_output: JsonSchema = {
+export const advanced$$ddos$$protection_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -130,17 +130,10 @@ export const advanced_ddos_protection_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `magic_account_app_id` in responses.
- */
-export const magic_account_app_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_api-response-common` in responses.
  */
-export const magic_api_response_common_output: JsonSchema = {
+export const magic_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic_messages"
@@ -183,7 +176,7 @@ export const magic_api_response_common_output: JsonSchema = {
 /**
  * The schema of `magic_api-response-common-failure` in responses.
  */
-export const magic_api_response_common_failure_output: JsonSchema = {
+export const magic_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic_messages"
@@ -213,7 +206,7 @@ export const magic_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `magic_api-response-single` in responses.
  */
-export const magic_api_response_single_output: JsonSchema = {
+export const magic_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-common"
@@ -242,7 +235,7 @@ export const magic_api_response_single_output: JsonSchema = {
 /**
  * The schema of `magic_apps-response-array` in responses.
  */
-export const magic_apps_response_array_output: JsonSchema = {
+export const magic_apps$$response$$array: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic_messages"
@@ -282,7 +275,7 @@ export const magic_apps_response_array_output: JsonSchema = {
 /**
  * The schema of `magic_apps-response-object` in responses.
  */
-export const magic_apps_response_object_output: JsonSchema = {
+export const magic_apps$$response$$object: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic_messages"
@@ -316,17 +309,10 @@ export const magic_apps_response_object_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_automatic_return_routing` in responses.
- */
-export const magic_automatic_return_routing_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `magic_bgp_config` in responses.
  */
-export const magic_bgp_config_output: JsonSchema = {
+export const magic_bgp_config: JsonSchema = {
   "properties": {
     "customer_asn": {
       "type": "integer"
@@ -356,7 +342,7 @@ export const magic_bgp_config_output: JsonSchema = {
 /**
  * The schema of `magic_bgp_status_with_state` in responses.
  */
-export const magic_bgp_status_with_state_output: JsonSchema = {
+export const magic_bgp_status_with_state: JsonSchema = {
   "properties": {
     "bgp_state": {
       "type": "string"
@@ -397,17 +383,10 @@ export const magic_bgp_status_with_state_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_cidr` in responses.
- */
-export const magic_cidr_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_health_check_base` in responses.
  */
-export const magic_health_check_base_output: JsonSchema = {
+export const magic_health_check_base: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -444,7 +423,7 @@ export const magic_health_check_base_output: JsonSchema = {
 /**
  * The schema of `magic_health_check_target` in responses.
  */
-export const magic_health_check_target_output: JsonSchema = {
+export const magic_health_check_target: JsonSchema = {
   "properties": {
     "effective": {
       "type": "string"
@@ -456,38 +435,10 @@ export const magic_health_check_target_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_identifier` in responses.
- */
-export const magic_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_interface_address` in responses.
- */
-export const magic_interface_address_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_interface_address6` in responses.
- */
-export const magic_interface_address6_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_managed_app_id` in responses.
- */
-export const magic_managed_app_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_messages` in responses.
  */
-export const magic_messages_output: JsonSchema = {
+export const magic_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -506,33 +457,10 @@ export const magic_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `magic_schemas-created_on` in responses.
- */
-export const magic_schemas_created_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_schemas-identifier` in responses.
- */
-export const magic_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_schemas-modified_on` in responses.
- */
-export const magic_schemas_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_tunnel_health_check` in responses.
  */
-export const magic_tunnel_health_check_output: JsonSchema = {
+export const magic_tunnel_health_check: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_health_check_base"
diff --git a/src/generated/forge-mcp/magicTransit/pcaps/download/tools.ts b/src/generated/forge-mcp/magicTransit/pcaps/download/tools.ts
index cb2d990a6..e32c0427e 100644
--- a/src/generated/forge-mcp/magicTransit/pcaps/download/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/pcaps/download/tools.ts
@@ -3,38 +3,44 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_visibility_pcaps_api_response_common_failure_output,
-  magic_visibility_pcaps_messages_output,
+  magic$$visibility$$pcaps_api$$response$$common$$failure,
+  magic$$visibility$$pcaps_messages,
 } from "../outputs.js";
-import { magic_visibility_pcaps_identifier } from "../schemas.js";
 
 /**
- * The tools of `magic_transit.pcaps.download`.
+ * The tools of `magicTransit.pcaps.download`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_pcaps_download_get",
+    name: "magicTransit_pcaps_download_get",
     title: "Download Simple PCAP",
-    description: "Download PCAP information into a file. Response is a binary PCAP file.",
+    description: "Download PCAP information into a file. Response is a binary PCAP file.\n\nGET /accounts/{account_id}/pcaps/{pcap_id}/download",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
-        },
-        "pcap_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pcap_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pcap_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pcap_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -68,8 +74,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/pcaps/outputs.ts b/src/generated/forge-mcp/magicTransit/pcaps/outputs.ts
index 18e8796f4..a5f1a2f83 100644
--- a/src/generated/forge-mcp/magicTransit/pcaps/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/pcaps/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `magic-visibility-pcaps_api-response-collection` in responses.
  */
-export const magic_visibility_pcaps_api_response_collection_output: JsonSchema = {
+export const magic$$visibility$$pcaps_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-pcaps_api-response-common"
@@ -38,7 +38,7 @@ export const magic_visibility_pcaps_api_response_collection_output: JsonSchema =
 /**
  * The schema of `magic-visibility-pcaps_api-response-common` in responses.
  */
-export const magic_visibility_pcaps_api_response_common_output: JsonSchema = {
+export const magic$$visibility$$pcaps_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic-visibility-pcaps_messages"
@@ -82,7 +82,7 @@ export const magic_visibility_pcaps_api_response_common_output: JsonSchema = {
  * The schema of `magic-visibility-pcaps_api-response-common-failure` in
  * responses.
  */
-export const magic_visibility_pcaps_api_response_common_failure_output: JsonSchema = {
+export const magic$$visibility$$pcaps_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/magic-visibility-pcaps_messages"
@@ -111,7 +111,7 @@ export const magic_visibility_pcaps_api_response_common_failure_output: JsonSche
 /**
  * The schema of `magic-visibility-pcaps_api-response-single` in responses.
  */
-export const magic_visibility_pcaps_api_response_single_output: JsonSchema = {
+export const magic$$visibility$$pcaps_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-pcaps_api-response-common"
@@ -137,7 +137,7 @@ export const magic_visibility_pcaps_api_response_single_output: JsonSchema = {
 /**
  * The schema of `magic-visibility-pcaps_messages` in responses.
  */
-export const magic_visibility_pcaps_messages_output: JsonSchema = {
+export const magic$$visibility$$pcaps_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -156,18 +156,11 @@ export const magic_visibility_pcaps_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `magic-visibility-pcaps_pcaps_byte_limit` in responses.
- */
-export const magic_visibility_pcaps_pcaps_byte_limit_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `magic-visibility-pcaps_pcaps_collection_response` in
  * responses.
  */
-export const magic_visibility_pcaps_pcaps_collection_response_output: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-pcaps_api-response-collection"
@@ -193,31 +186,10 @@ export const magic_visibility_pcaps_pcaps_collection_response_output: JsonSchema
   ]
 };
 
-/**
- * The schema of `magic-visibility-pcaps_pcaps_colo_name` in responses.
- */
-export const magic_visibility_pcaps_pcaps_colo_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_destination_conf` in responses.
- */
-export const magic_visibility_pcaps_pcaps_destination_conf_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_error_message` in responses.
- */
-export const magic_visibility_pcaps_pcaps_error_message_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-pcaps_pcaps_filter_v1` in responses.
  */
-export const magic_visibility_pcaps_pcaps_filter_v1_output: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_filter_v1: JsonSchema = {
   "properties": {
     "destination_address": {
       "type": "string"
@@ -238,71 +210,67 @@ export const magic_visibility_pcaps_pcaps_filter_v1_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic-visibility-pcaps_pcaps_id` in responses.
- */
-export const magic_visibility_pcaps_pcaps_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_offset_time` in responses.
- */
-export const magic_visibility_pcaps_pcaps_offset_time_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_packets_captured` in responses.
- */
-export const magic_visibility_pcaps_pcaps_packets_captured_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `magic-visibility-pcaps_pcaps_response_full` in responses.
  */
-export const magic_visibility_pcaps_pcaps_response_full_output: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_response_full: JsonSchema = {
   "properties": {
     "byte_limit": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_byte_limit"
+      "type": "number"
     },
     "colo_name": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_colo_name"
+      "type": "string"
     },
     "destination_conf": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_destination_conf"
+      "type": "string"
     },
     "error_message": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_error_message"
+      "type": "string"
     },
     "filter_v1": {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_filter_v1"
     },
     "id": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_id"
+      "type": "string"
     },
     "packets_captured": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_packets_captured"
+      "type": "integer"
     },
     "status": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_status"
+      "enum": [
+        "unknown",
+        "success",
+        "pending",
+        "running",
+        "conversion_pending",
+        "conversion_running",
+        "complete",
+        "failed"
+      ],
+      "type": "string"
     },
     "stop_requested": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_stop_requested"
+      "format": "date-time",
+      "type": "string"
     },
     "submitted": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_submitted"
+      "type": "string"
     },
     "system": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_system"
+      "enum": [
+        "magic-transit"
+      ],
+      "type": "string"
     },
     "time_limit": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_time_limit_full"
+      "type": "number"
     },
     "type": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_type"
+      "enum": [
+        "simple",
+        "full"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -311,31 +279,49 @@ export const magic_visibility_pcaps_pcaps_response_full_output: JsonSchema = {
 /**
  * The schema of `magic-visibility-pcaps_pcaps_response_simple` in responses.
  */
-export const magic_visibility_pcaps_pcaps_response_simple_output: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_response_simple: JsonSchema = {
   "properties": {
     "filter_v1": {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_filter_v1"
     },
     "id": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_id"
+      "type": "string"
     },
     "offset_time": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_offset_time"
+      "format": "date-time",
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_status"
+      "enum": [
+        "unknown",
+        "success",
+        "pending",
+        "running",
+        "conversion_pending",
+        "conversion_running",
+        "complete",
+        "failed"
+      ],
+      "type": "string"
     },
     "submitted": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_submitted"
+      "type": "string"
     },
     "system": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_system"
+      "enum": [
+        "magic-transit"
+      ],
+      "type": "string"
     },
     "time_limit": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_time_limit_sampled"
+      "type": "number"
     },
     "type": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_type"
+      "enum": [
+        "simple",
+        "full"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -344,7 +330,7 @@ export const magic_visibility_pcaps_pcaps_response_simple_output: JsonSchema = {
 /**
  * The schema of `magic-visibility-pcaps_pcaps_single_response` in responses.
  */
-export const magic_visibility_pcaps_pcaps_single_response_output: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-pcaps_api-response-single"
@@ -367,77 +353,10 @@ export const magic_visibility_pcaps_pcaps_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic-visibility-pcaps_pcaps_status` in responses.
- */
-export const magic_visibility_pcaps_pcaps_status_output: JsonSchema = {
-  "enum": [
-    "unknown",
-    "success",
-    "pending",
-    "running",
-    "conversion_pending",
-    "conversion_running",
-    "complete",
-    "failed"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_stop_requested` in responses.
- */
-export const magic_visibility_pcaps_pcaps_stop_requested_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_submitted` in responses.
- */
-export const magic_visibility_pcaps_pcaps_submitted_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_system` in responses.
- */
-export const magic_visibility_pcaps_pcaps_system_output: JsonSchema = {
-  "enum": [
-    "magic-transit"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_time_limit_full` in responses.
- */
-export const magic_visibility_pcaps_pcaps_time_limit_full_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_time_limit_sampled` in responses.
- */
-export const magic_visibility_pcaps_pcaps_time_limit_sampled_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_type` in responses.
- */
-export const magic_visibility_pcaps_pcaps_type_output: JsonSchema = {
-  "enum": [
-    "simple",
-    "full"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-pcaps_result_info` in responses.
  */
-export const magic_visibility_pcaps_result_info_output: JsonSchema = {
+export const magic$$visibility$$pcaps_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
diff --git a/src/generated/forge-mcp/magicTransit/pcaps/ownership/outputs.ts b/src/generated/forge-mcp/magicTransit/pcaps/ownership/outputs.ts
index 9ee72f4de..12c8a64ba 100644
--- a/src/generated/forge-mcp/magicTransit/pcaps/ownership/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/pcaps/ownership/outputs.ts
@@ -3,19 +3,11 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `magic-visibility-pcaps_pcaps_ownership_challenge` in
- * responses.
- */
-export const magic_visibility_pcaps_pcaps_ownership_challenge_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-pcaps_pcaps_ownership_collection` in
  * responses.
  */
-export const magic_visibility_pcaps_pcaps_ownership_collection_output: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_ownership_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-pcaps_api-response-collection"
@@ -44,13 +36,13 @@ export const magic_visibility_pcaps_pcaps_ownership_collection_output: JsonSchem
 /**
  * The schema of `magic-visibility-pcaps_pcaps_ownership_response` in responses.
  */
-export const magic_visibility_pcaps_pcaps_ownership_response_output: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_ownership_response: JsonSchema = {
   "properties": {
     "destination_conf": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_destination_conf"
+      "type": "string"
     },
     "filename": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_ownership_challenge"
+      "type": "string"
     },
     "id": {
       "type": "string"
@@ -84,7 +76,7 @@ export const magic_visibility_pcaps_pcaps_ownership_response_output: JsonSchema
  * The schema of `magic-visibility-pcaps_pcaps_ownership_single_response` in
  * responses.
  */
-export const magic_visibility_pcaps_pcaps_ownership_single_response_output: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_ownership_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic-visibility-pcaps_api-response-common"
diff --git a/src/generated/forge-mcp/magicTransit/pcaps/ownership/schemas.ts b/src/generated/forge-mcp/magicTransit/pcaps/ownership/schemas.ts
index fb4e2754f..fbf1b51eb 100644
--- a/src/generated/forge-mcp/magicTransit/pcaps/ownership/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/pcaps/ownership/schemas.ts
@@ -3,22 +3,14 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `magic-visibility-pcaps_pcaps_ownership_challenge`.
- */
-export const magic_visibility_pcaps_pcaps_ownership_challenge: JsonSchema = {
-  "description": "The ownership challenge filename stored in the bucket.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-pcaps_pcaps_ownership_request`.
  */
-export const magic_visibility_pcaps_pcaps_ownership_request: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_ownership_request: JsonSchema = {
   "properties": {
     "destination_conf": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_destination_conf",
-      "description": "The full URI for the bucket. This field only applies to `full` packet captures."
+      "description": "The full URI for the bucket. This field only applies to `full` packet captures.",
+      "type": "string"
     }
   },
   "required": [
@@ -30,15 +22,15 @@ export const magic_visibility_pcaps_pcaps_ownership_request: JsonSchema = {
 /**
  * The schema of `magic-visibility-pcaps_pcaps_ownership_validate_request`.
  */
-export const magic_visibility_pcaps_pcaps_ownership_validate_request: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_ownership_validate_request: JsonSchema = {
   "properties": {
     "destination_conf": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_destination_conf",
-      "description": "The full URI for the bucket. This field only applies to `full` packet captures."
+      "description": "The full URI for the bucket. This field only applies to `full` packet captures.",
+      "type": "string"
     },
     "ownership_challenge": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_ownership_challenge",
-      "description": "The ownership challenge filename stored in the bucket."
+      "description": "The ownership challenge filename stored in the bucket.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/magicTransit/pcaps/ownership/tools.ts b/src/generated/forge-mcp/magicTransit/pcaps/ownership/tools.ts
index 8b083f7ee..388d67380 100644
--- a/src/generated/forge-mcp/magicTransit/pcaps/ownership/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/pcaps/ownership/tools.ts
@@ -3,67 +3,66 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_visibility_pcaps_api_response_collection_output,
-  magic_visibility_pcaps_api_response_common_failure_output,
-  magic_visibility_pcaps_api_response_common_output,
-  magic_visibility_pcaps_messages_output,
-  magic_visibility_pcaps_pcaps_destination_conf_output,
-  magic_visibility_pcaps_result_info_output,
+  magic$$visibility$$pcaps_api$$response$$collection,
+  magic$$visibility$$pcaps_api$$response$$common,
+  magic$$visibility$$pcaps_api$$response$$common$$failure,
+  magic$$visibility$$pcaps_messages,
+  magic$$visibility$$pcaps_result_info,
 } from "../outputs.js";
 import {
-  magic_visibility_pcaps_identifier,
-  magic_visibility_pcaps_pcaps_destination_conf,
-} from "../schemas.js";
-import {
-  magic_visibility_pcaps_pcaps_ownership_challenge_output,
-  magic_visibility_pcaps_pcaps_ownership_collection_output,
-  magic_visibility_pcaps_pcaps_ownership_response_output,
-  magic_visibility_pcaps_pcaps_ownership_single_response_output,
+  magic$$visibility$$pcaps_pcaps_ownership_collection,
+  magic$$visibility$$pcaps_pcaps_ownership_response,
+  magic$$visibility$$pcaps_pcaps_ownership_single_response,
 } from "./outputs.js";
 import {
-  magic_visibility_pcaps_pcaps_ownership_challenge,
-  magic_visibility_pcaps_pcaps_ownership_request,
-  magic_visibility_pcaps_pcaps_ownership_validate_request,
+  magic$$visibility$$pcaps_pcaps_ownership_request,
+  magic$$visibility$$pcaps_pcaps_ownership_validate_request,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.pcaps.ownership`.
+ * The tools of `magicTransit.pcaps.ownership`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_pcaps_ownership_create",
+    name: "magicTransit_pcaps_ownership_create",
     title: "Add buckets for full packet captures",
-    description: "Adds an AWS or GCP bucket to use with full packet captures.",
+    description: "Adds an AWS or GCP bucket to use with full packet captures.\n\nPOST /accounts/{account_id}/pcaps/ownership",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/magic-visibility-pcaps_pcaps_ownership_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf,
-        "magic-visibility-pcaps_pcaps_ownership_request": magic_visibility_pcaps_pcaps_ownership_request,
+        "magic-visibility-pcaps_pcaps_ownership_request": magic$$visibility$$pcaps_pcaps_ownership_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_ownership_single_response",
       $defs: {
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_ownership_challenge": magic_visibility_pcaps_pcaps_ownership_challenge_output,
-        "magic-visibility-pcaps_pcaps_ownership_response": magic_visibility_pcaps_pcaps_ownership_response_output,
-        "magic-visibility-pcaps_pcaps_ownership_single_response": magic_visibility_pcaps_pcaps_ownership_single_response_output,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_ownership_response": magic$$visibility$$pcaps_pcaps_ownership_response,
+        "magic-visibility-pcaps_pcaps_ownership_single_response": magic$$visibility$$pcaps_pcaps_ownership_single_response,
       },
     },
     annotations: {
@@ -99,13 +98,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_ownership_challenge": magic_visibility_pcaps_pcaps_ownership_challenge_output,
-        "magic-visibility-pcaps_pcaps_ownership_response": magic_visibility_pcaps_pcaps_ownership_response_output,
-        "magic-visibility-pcaps_pcaps_ownership_single_response": magic_visibility_pcaps_pcaps_ownership_single_response_output,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_ownership_response": magic$$visibility$$pcaps_pcaps_ownership_response,
+        "magic-visibility-pcaps_pcaps_ownership_single_response": magic$$visibility$$pcaps_pcaps_ownership_single_response,
       },
     },
     request: (args) => ({
@@ -114,28 +111,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_pcaps_ownership_delete",
+    name: "magicTransit_pcaps_ownership_delete",
     title: "Delete buckets for full packet captures",
-    description: "Deletes buckets added to the packet captures API.",
+    description: "Deletes buckets added to the packet captures API.\n\nDELETE /accounts/{account_id}/pcaps/ownership/{ownership_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
-        },
-        "ownership_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "ownership_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ownership_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ownership_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -168,8 +172,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
       },
     },
     request: (args) => ({
@@ -177,35 +181,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_pcaps_ownership_get",
+    name: "magicTransit_pcaps_ownership_get",
     title: "List PCAPs Bucket Ownership",
-    description: "List all buckets configured for use with PCAPs API.",
+    description: "List all buckets configured for use with PCAPs API.\n\nGET /accounts/{account_id}/pcaps/ownership",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_ownership_collection",
       $defs: {
-        "magic-visibility-pcaps_api-response-collection": magic_visibility_pcaps_api_response_collection_output,
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_ownership_challenge": magic_visibility_pcaps_pcaps_ownership_challenge_output,
-        "magic-visibility-pcaps_pcaps_ownership_collection": magic_visibility_pcaps_pcaps_ownership_collection_output,
-        "magic-visibility-pcaps_pcaps_ownership_response": magic_visibility_pcaps_pcaps_ownership_response_output,
-        "magic-visibility-pcaps_result_info": magic_visibility_pcaps_result_info_output,
+        "magic-visibility-pcaps_api-response-collection": magic$$visibility$$pcaps_api$$response$$collection,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_ownership_collection": magic$$visibility$$pcaps_pcaps_ownership_collection,
+        "magic-visibility-pcaps_pcaps_ownership_response": magic$$visibility$$pcaps_pcaps_ownership_response,
+        "magic-visibility-pcaps_result_info": magic$$visibility$$pcaps_result_info,
       },
     },
     annotations: {
@@ -242,15 +251,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-collection": magic_visibility_pcaps_api_response_collection_output,
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_ownership_challenge": magic_visibility_pcaps_pcaps_ownership_challenge_output,
-        "magic-visibility-pcaps_pcaps_ownership_collection": magic_visibility_pcaps_pcaps_ownership_collection_output,
-        "magic-visibility-pcaps_pcaps_ownership_response": magic_visibility_pcaps_pcaps_ownership_response_output,
-        "magic-visibility-pcaps_result_info": magic_visibility_pcaps_result_info_output,
+        "magic-visibility-pcaps_api-response-collection": magic$$visibility$$pcaps_api$$response$$collection,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_ownership_collection": magic$$visibility$$pcaps_pcaps_ownership_collection,
+        "magic-visibility-pcaps_pcaps_ownership_response": magic$$visibility$$pcaps_pcaps_ownership_response,
+        "magic-visibility-pcaps_result_info": magic$$visibility$$pcaps_result_info,
       },
     },
     request: (args) => ({
@@ -258,40 +265,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_pcaps_ownership_validate",
+    name: "magicTransit_pcaps_ownership_validate",
     title: "Validate buckets for full packet captures",
-    description: "Validates buckets added to the packet captures API.",
+    description: "Validates buckets added to the packet captures API.\n\nPOST /accounts/{account_id}/pcaps/ownership/validate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/magic-visibility-pcaps_pcaps_ownership_validate_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf,
-        "magic-visibility-pcaps_pcaps_ownership_challenge": magic_visibility_pcaps_pcaps_ownership_challenge,
-        "magic-visibility-pcaps_pcaps_ownership_validate_request": magic_visibility_pcaps_pcaps_ownership_validate_request,
+        "magic-visibility-pcaps_pcaps_ownership_validate_request": magic$$visibility$$pcaps_pcaps_ownership_validate_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_ownership_single_response",
       $defs: {
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_ownership_challenge": magic_visibility_pcaps_pcaps_ownership_challenge_output,
-        "magic-visibility-pcaps_pcaps_ownership_response": magic_visibility_pcaps_pcaps_ownership_response_output,
-        "magic-visibility-pcaps_pcaps_ownership_single_response": magic_visibility_pcaps_pcaps_ownership_single_response_output,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_ownership_response": magic$$visibility$$pcaps_pcaps_ownership_response,
+        "magic-visibility-pcaps_pcaps_ownership_single_response": magic$$visibility$$pcaps_pcaps_ownership_single_response,
       },
     },
     annotations: {
@@ -327,13 +339,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_ownership_challenge": magic_visibility_pcaps_pcaps_ownership_challenge_output,
-        "magic-visibility-pcaps_pcaps_ownership_response": magic_visibility_pcaps_pcaps_ownership_response_output,
-        "magic-visibility-pcaps_pcaps_ownership_single_response": magic_visibility_pcaps_pcaps_ownership_single_response_output,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_ownership_response": magic$$visibility$$pcaps_pcaps_ownership_response,
+        "magic-visibility-pcaps_pcaps_ownership_single_response": magic$$visibility$$pcaps_pcaps_ownership_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/pcaps/schemas.ts b/src/generated/forge-mcp/magicTransit/pcaps/schemas.ts
index 70a936bee..40dc2a3ba 100644
--- a/src/generated/forge-mcp/magicTransit/pcaps/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/pcaps/schemas.ts
@@ -3,42 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic-visibility-pcaps_identifier`.
- */
-export const magic_visibility_pcaps_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_byte_limit`.
- */
-export const magic_visibility_pcaps_pcaps_byte_limit: JsonSchema = {
-  "description": "The maximum number of bytes to capture. This field only applies to `full` packet captures.",
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_colo_name`.
- */
-export const magic_visibility_pcaps_pcaps_colo_name: JsonSchema = {
-  "description": "The name of the data center used for the packet capture. This can be a specific colo (ord02) or a multi-colo name (ORD). This field only applies to `full` packet captures.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_destination_conf`.
- */
-export const magic_visibility_pcaps_pcaps_destination_conf: JsonSchema = {
-  "description": "The full URI for the bucket. This field only applies to `full` packet captures.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic-visibility-pcaps_pcaps_filter_v1`.
  */
-export const magic_visibility_pcaps_pcaps_filter_v1: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_filter_v1: JsonSchema = {
   "description": "The packet capture filter. When this field is empty, all packets are captured.",
   "properties": {
     "destination_address": {
@@ -65,59 +33,49 @@ export const magic_visibility_pcaps_pcaps_filter_v1: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic-visibility-pcaps_pcaps_offset_time`.
- */
-export const magic_visibility_pcaps_pcaps_offset_time: JsonSchema = {
-  "description": "The RFC 3339 offset timestamp from which to query backwards for packets. Must be within the last 24h. When this field is empty, defaults to time of request.",
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_packet_limit`.
- */
-export const magic_visibility_pcaps_pcaps_packet_limit: JsonSchema = {
-  "description": "The limit of packets contained in a packet capture.",
-  "type": "number"
-};
-
 /**
  * The schema of `magic-visibility-pcaps_pcaps_request_full`.
  */
-export const magic_visibility_pcaps_pcaps_request_full: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_request_full: JsonSchema = {
   "properties": {
     "byte_limit": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_byte_limit",
-      "description": "The maximum number of bytes to capture. This field only applies to `full` packet captures."
+      "description": "The maximum number of bytes to capture. This field only applies to `full` packet captures.",
+      "type": "number"
     },
     "colo_name": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_colo_name",
-      "description": "The name of the data center used for the packet capture. This can be a specific colo (ord02) or a multi-colo name (ORD). This field only applies to `full` packet captures."
+      "description": "The name of the data center used for the packet capture. This can be a specific colo (ord02) or a multi-colo name (ORD). This field only applies to `full` packet captures.",
+      "type": "string"
     },
     "destination_conf": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_destination_conf",
-      "description": "The full URI for the bucket. This field only applies to `full` packet captures."
+      "description": "The full URI for the bucket. This field only applies to `full` packet captures.",
+      "type": "string"
     },
     "filter_v1": {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_filter_v1",
       "description": "The packet capture filter. When this field is empty, all packets are captured."
     },
     "packet_limit": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_packet_limit",
-      "description": "The limit of packets contained in a packet capture."
+      "description": "The limit of packets contained in a packet capture.",
+      "type": "number"
     },
     "system": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_system",
-      "description": "The system used to collect packet captures."
+      "description": "The system used to collect packet captures.",
+      "enum": [
+        "magic-transit"
+      ],
+      "type": "string"
     },
     "time_limit": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_time_limit_full",
-      "description": "The packet capture duration in seconds."
+      "description": "The packet capture duration in seconds.",
+      "type": "number"
     },
     "type": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_type",
-      "description": "The type of packet capture. `Simple` captures sampled packets, and `full` captures entire payloads and non-sampled packets."
+      "description": "The type of packet capture. `Simple` captures sampled packets, and `full` captures entire payloads and non-sampled packets.",
+      "enum": [
+        "simple",
+        "full"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -133,7 +91,7 @@ export const magic_visibility_pcaps_pcaps_request_full: JsonSchema = {
 /**
  * The schema of `magic-visibility-pcaps_pcaps_request_pcap`.
  */
-export const magic_visibility_pcaps_pcaps_request_pcap: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_request_pcap: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_request_simple"
@@ -147,31 +105,39 @@ export const magic_visibility_pcaps_pcaps_request_pcap: JsonSchema = {
 /**
  * The schema of `magic-visibility-pcaps_pcaps_request_simple`.
  */
-export const magic_visibility_pcaps_pcaps_request_simple: JsonSchema = {
+export const magic$$visibility$$pcaps_pcaps_request_simple: JsonSchema = {
   "properties": {
     "filter_v1": {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_filter_v1",
       "description": "The packet capture filter. When this field is empty, all packets are captured."
     },
     "offset_time": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_offset_time",
-      "description": "The RFC 3339 offset timestamp from which to query backwards for packets. Must be within the last 24h. When this field is empty, defaults to time of request."
+      "description": "The RFC 3339 offset timestamp from which to query backwards for packets. Must be within the last 24h. When this field is empty, defaults to time of request.",
+      "format": "date-time",
+      "type": "string"
     },
     "packet_limit": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_packet_limit",
-      "description": "The limit of packets contained in a packet capture."
+      "description": "The limit of packets contained in a packet capture.",
+      "type": "number"
     },
     "system": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_system",
-      "description": "The system used to collect packet captures."
+      "description": "The system used to collect packet captures.",
+      "enum": [
+        "magic-transit"
+      ],
+      "type": "string"
     },
     "time_limit": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_time_limit_sampled",
-      "description": "The packet capture duration in seconds."
+      "description": "The packet capture duration in seconds.",
+      "type": "number"
     },
     "type": {
-      "$ref": "#/$defs/magic-visibility-pcaps_pcaps_type",
-      "description": "The type of packet capture. `Simple` captures sampled packets, and `full` captures entire payloads and non-sampled packets."
+      "description": "The type of packet capture. `Simple` captures sampled packets, and `full` captures entire payloads and non-sampled packets.",
+      "enum": [
+        "simple",
+        "full"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -182,42 +148,3 @@ export const magic_visibility_pcaps_pcaps_request_simple: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_system`.
- */
-export const magic_visibility_pcaps_pcaps_system: JsonSchema = {
-  "description": "The system used to collect packet captures.",
-  "enum": [
-    "magic-transit"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_time_limit_full`.
- */
-export const magic_visibility_pcaps_pcaps_time_limit_full: JsonSchema = {
-  "description": "The packet capture duration in seconds.",
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_time_limit_sampled`.
- */
-export const magic_visibility_pcaps_pcaps_time_limit_sampled: JsonSchema = {
-  "description": "The packet capture duration in seconds.",
-  "type": "number"
-};
-
-/**
- * The schema of `magic-visibility-pcaps_pcaps_type`.
- */
-export const magic_visibility_pcaps_pcaps_type: JsonSchema = {
-  "description": "The type of packet capture. `Simple` captures sampled packets, and `full` captures entire payloads and non-sampled packets.",
-  "enum": [
-    "simple",
-    "full"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/magicTransit/pcaps/tools.ts b/src/generated/forge-mcp/magicTransit/pcaps/tools.ts
index ed2350cdc..771638ea1 100644
--- a/src/generated/forge-mcp/magicTransit/pcaps/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/pcaps/tools.ts
@@ -3,113 +3,75 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_visibility_pcaps_api_response_collection_output,
-  magic_visibility_pcaps_api_response_common_failure_output,
-  magic_visibility_pcaps_api_response_common_output,
-  magic_visibility_pcaps_api_response_single_output,
-  magic_visibility_pcaps_messages_output,
-  magic_visibility_pcaps_pcaps_byte_limit_output,
-  magic_visibility_pcaps_pcaps_collection_response_output,
-  magic_visibility_pcaps_pcaps_colo_name_output,
-  magic_visibility_pcaps_pcaps_destination_conf_output,
-  magic_visibility_pcaps_pcaps_error_message_output,
-  magic_visibility_pcaps_pcaps_filter_v1_output,
-  magic_visibility_pcaps_pcaps_id_output,
-  magic_visibility_pcaps_pcaps_offset_time_output,
-  magic_visibility_pcaps_pcaps_packets_captured_output,
-  magic_visibility_pcaps_pcaps_response_full_output,
-  magic_visibility_pcaps_pcaps_response_simple_output,
-  magic_visibility_pcaps_pcaps_single_response_output,
-  magic_visibility_pcaps_pcaps_status_output,
-  magic_visibility_pcaps_pcaps_stop_requested_output,
-  magic_visibility_pcaps_pcaps_submitted_output,
-  magic_visibility_pcaps_pcaps_system_output,
-  magic_visibility_pcaps_pcaps_time_limit_full_output,
-  magic_visibility_pcaps_pcaps_time_limit_sampled_output,
-  magic_visibility_pcaps_pcaps_type_output,
-  magic_visibility_pcaps_result_info_output,
+  magic$$visibility$$pcaps_api$$response$$collection,
+  magic$$visibility$$pcaps_api$$response$$common,
+  magic$$visibility$$pcaps_api$$response$$common$$failure,
+  magic$$visibility$$pcaps_api$$response$$single,
+  magic$$visibility$$pcaps_messages,
+  magic$$visibility$$pcaps_pcaps_collection_response,
+  magic$$visibility$$pcaps_pcaps_filter_v1,
+  magic$$visibility$$pcaps_pcaps_response_full,
+  magic$$visibility$$pcaps_pcaps_response_simple,
+  magic$$visibility$$pcaps_pcaps_single_response,
+  magic$$visibility$$pcaps_result_info,
 } from "./outputs.js";
 import {
-  magic_visibility_pcaps_identifier,
-  magic_visibility_pcaps_pcaps_byte_limit,
-  magic_visibility_pcaps_pcaps_colo_name,
-  magic_visibility_pcaps_pcaps_destination_conf,
-  magic_visibility_pcaps_pcaps_filter_v1,
-  magic_visibility_pcaps_pcaps_offset_time,
-  magic_visibility_pcaps_pcaps_packet_limit,
-  magic_visibility_pcaps_pcaps_request_full,
-  magic_visibility_pcaps_pcaps_request_pcap,
-  magic_visibility_pcaps_pcaps_request_simple,
-  magic_visibility_pcaps_pcaps_system,
-  magic_visibility_pcaps_pcaps_time_limit_full,
-  magic_visibility_pcaps_pcaps_time_limit_sampled,
-  magic_visibility_pcaps_pcaps_type,
+  magic$$visibility$$pcaps_pcaps_filter_v1 as magic$$visibility$$pcaps_pcaps_filter_v1$,
+  magic$$visibility$$pcaps_pcaps_request_full,
+  magic$$visibility$$pcaps_pcaps_request_pcap,
+  magic$$visibility$$pcaps_pcaps_request_simple,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.pcaps`.
+ * The tools of `magicTransit.pcaps`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_pcaps_create",
+    name: "magicTransit_pcaps_create",
     title: "Create PCAP request",
-    description: "Create new PCAP request for account.",
+    description: "Create new PCAP request for account.\n\nPOST /accounts/{account_id}/pcaps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/magic-visibility-pcaps_pcaps_request_pcap"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-        "magic-visibility-pcaps_pcaps_byte_limit": magic_visibility_pcaps_pcaps_byte_limit,
-        "magic-visibility-pcaps_pcaps_colo_name": magic_visibility_pcaps_pcaps_colo_name,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf,
-        "magic-visibility-pcaps_pcaps_filter_v1": magic_visibility_pcaps_pcaps_filter_v1,
-        "magic-visibility-pcaps_pcaps_offset_time": magic_visibility_pcaps_pcaps_offset_time,
-        "magic-visibility-pcaps_pcaps_packet_limit": magic_visibility_pcaps_pcaps_packet_limit,
-        "magic-visibility-pcaps_pcaps_request_full": magic_visibility_pcaps_pcaps_request_full,
-        "magic-visibility-pcaps_pcaps_request_pcap": magic_visibility_pcaps_pcaps_request_pcap,
-        "magic-visibility-pcaps_pcaps_request_simple": magic_visibility_pcaps_pcaps_request_simple,
-        "magic-visibility-pcaps_pcaps_system": magic_visibility_pcaps_pcaps_system,
-        "magic-visibility-pcaps_pcaps_time_limit_full": magic_visibility_pcaps_pcaps_time_limit_full,
-        "magic-visibility-pcaps_pcaps_time_limit_sampled": magic_visibility_pcaps_pcaps_time_limit_sampled,
-        "magic-visibility-pcaps_pcaps_type": magic_visibility_pcaps_pcaps_type,
+        "magic-visibility-pcaps_pcaps_filter_v1": magic$$visibility$$pcaps_pcaps_filter_v1$,
+        "magic-visibility-pcaps_pcaps_request_full": magic$$visibility$$pcaps_pcaps_request_full,
+        "magic-visibility-pcaps_pcaps_request_pcap": magic$$visibility$$pcaps_pcaps_request_pcap,
+        "magic-visibility-pcaps_pcaps_request_simple": magic$$visibility$$pcaps_pcaps_request_simple,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_single_response",
       $defs: {
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_api-response-single": magic_visibility_pcaps_api_response_single_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_byte_limit": magic_visibility_pcaps_pcaps_byte_limit_output,
-        "magic-visibility-pcaps_pcaps_colo_name": magic_visibility_pcaps_pcaps_colo_name_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_error_message": magic_visibility_pcaps_pcaps_error_message_output,
-        "magic-visibility-pcaps_pcaps_filter_v1": magic_visibility_pcaps_pcaps_filter_v1_output,
-        "magic-visibility-pcaps_pcaps_id": magic_visibility_pcaps_pcaps_id_output,
-        "magic-visibility-pcaps_pcaps_offset_time": magic_visibility_pcaps_pcaps_offset_time_output,
-        "magic-visibility-pcaps_pcaps_packets_captured": magic_visibility_pcaps_pcaps_packets_captured_output,
-        "magic-visibility-pcaps_pcaps_response_full": magic_visibility_pcaps_pcaps_response_full_output,
-        "magic-visibility-pcaps_pcaps_response_simple": magic_visibility_pcaps_pcaps_response_simple_output,
-        "magic-visibility-pcaps_pcaps_single_response": magic_visibility_pcaps_pcaps_single_response_output,
-        "magic-visibility-pcaps_pcaps_status": magic_visibility_pcaps_pcaps_status_output,
-        "magic-visibility-pcaps_pcaps_stop_requested": magic_visibility_pcaps_pcaps_stop_requested_output,
-        "magic-visibility-pcaps_pcaps_submitted": magic_visibility_pcaps_pcaps_submitted_output,
-        "magic-visibility-pcaps_pcaps_system": magic_visibility_pcaps_pcaps_system_output,
-        "magic-visibility-pcaps_pcaps_time_limit_full": magic_visibility_pcaps_pcaps_time_limit_full_output,
-        "magic-visibility-pcaps_pcaps_time_limit_sampled": magic_visibility_pcaps_pcaps_time_limit_sampled_output,
-        "magic-visibility-pcaps_pcaps_type": magic_visibility_pcaps_pcaps_type_output,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_api-response-single": magic$$visibility$$pcaps_api$$response$$single,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_filter_v1": magic$$visibility$$pcaps_pcaps_filter_v1,
+        "magic-visibility-pcaps_pcaps_response_full": magic$$visibility$$pcaps_pcaps_response_full,
+        "magic-visibility-pcaps_pcaps_response_simple": magic$$visibility$$pcaps_pcaps_response_simple,
+        "magic-visibility-pcaps_pcaps_single_response": magic$$visibility$$pcaps_pcaps_single_response,
       },
     },
     annotations: {
@@ -145,28 +107,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_api-response-single": magic_visibility_pcaps_api_response_single_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_byte_limit": magic_visibility_pcaps_pcaps_byte_limit_output,
-        "magic-visibility-pcaps_pcaps_colo_name": magic_visibility_pcaps_pcaps_colo_name_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_error_message": magic_visibility_pcaps_pcaps_error_message_output,
-        "magic-visibility-pcaps_pcaps_filter_v1": magic_visibility_pcaps_pcaps_filter_v1_output,
-        "magic-visibility-pcaps_pcaps_id": magic_visibility_pcaps_pcaps_id_output,
-        "magic-visibility-pcaps_pcaps_offset_time": magic_visibility_pcaps_pcaps_offset_time_output,
-        "magic-visibility-pcaps_pcaps_packets_captured": magic_visibility_pcaps_pcaps_packets_captured_output,
-        "magic-visibility-pcaps_pcaps_response_full": magic_visibility_pcaps_pcaps_response_full_output,
-        "magic-visibility-pcaps_pcaps_response_simple": magic_visibility_pcaps_pcaps_response_simple_output,
-        "magic-visibility-pcaps_pcaps_single_response": magic_visibility_pcaps_pcaps_single_response_output,
-        "magic-visibility-pcaps_pcaps_status": magic_visibility_pcaps_pcaps_status_output,
-        "magic-visibility-pcaps_pcaps_stop_requested": magic_visibility_pcaps_pcaps_stop_requested_output,
-        "magic-visibility-pcaps_pcaps_submitted": magic_visibility_pcaps_pcaps_submitted_output,
-        "magic-visibility-pcaps_pcaps_system": magic_visibility_pcaps_pcaps_system_output,
-        "magic-visibility-pcaps_pcaps_time_limit_full": magic_visibility_pcaps_pcaps_time_limit_full_output,
-        "magic-visibility-pcaps_pcaps_time_limit_sampled": magic_visibility_pcaps_pcaps_time_limit_sampled_output,
-        "magic-visibility-pcaps_pcaps_type": magic_visibility_pcaps_pcaps_type_output,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_api-response-single": magic$$visibility$$pcaps_api$$response$$single,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_filter_v1": magic$$visibility$$pcaps_pcaps_filter_v1,
+        "magic-visibility-pcaps_pcaps_response_full": magic$$visibility$$pcaps_pcaps_response_full,
+        "magic-visibility-pcaps_pcaps_response_simple": magic$$visibility$$pcaps_pcaps_response_simple,
+        "magic-visibility-pcaps_pcaps_single_response": magic$$visibility$$pcaps_pcaps_single_response,
       },
     },
     request: (args) => ({
@@ -175,53 +123,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_pcaps_get",
+    name: "magicTransit_pcaps_get",
     title: "Get PCAP request",
-    description: "Get information for a PCAP request by id.",
+    description: "Get information for a PCAP request by id.\n\nGET /accounts/{account_id}/pcaps/{pcap_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
-        },
-        "pcap_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pcap_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pcap_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pcap_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_single_response",
       $defs: {
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_api-response-single": magic_visibility_pcaps_api_response_single_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_byte_limit": magic_visibility_pcaps_pcaps_byte_limit_output,
-        "magic-visibility-pcaps_pcaps_colo_name": magic_visibility_pcaps_pcaps_colo_name_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_error_message": magic_visibility_pcaps_pcaps_error_message_output,
-        "magic-visibility-pcaps_pcaps_filter_v1": magic_visibility_pcaps_pcaps_filter_v1_output,
-        "magic-visibility-pcaps_pcaps_id": magic_visibility_pcaps_pcaps_id_output,
-        "magic-visibility-pcaps_pcaps_offset_time": magic_visibility_pcaps_pcaps_offset_time_output,
-        "magic-visibility-pcaps_pcaps_packets_captured": magic_visibility_pcaps_pcaps_packets_captured_output,
-        "magic-visibility-pcaps_pcaps_response_full": magic_visibility_pcaps_pcaps_response_full_output,
-        "magic-visibility-pcaps_pcaps_response_simple": magic_visibility_pcaps_pcaps_response_simple_output,
-        "magic-visibility-pcaps_pcaps_single_response": magic_visibility_pcaps_pcaps_single_response_output,
-        "magic-visibility-pcaps_pcaps_status": magic_visibility_pcaps_pcaps_status_output,
-        "magic-visibility-pcaps_pcaps_stop_requested": magic_visibility_pcaps_pcaps_stop_requested_output,
-        "magic-visibility-pcaps_pcaps_submitted": magic_visibility_pcaps_pcaps_submitted_output,
-        "magic-visibility-pcaps_pcaps_system": magic_visibility_pcaps_pcaps_system_output,
-        "magic-visibility-pcaps_pcaps_time_limit_full": magic_visibility_pcaps_pcaps_time_limit_full_output,
-        "magic-visibility-pcaps_pcaps_time_limit_sampled": magic_visibility_pcaps_pcaps_time_limit_sampled_output,
-        "magic-visibility-pcaps_pcaps_type": magic_visibility_pcaps_pcaps_type_output,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_api-response-single": magic$$visibility$$pcaps_api$$response$$single,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_filter_v1": magic$$visibility$$pcaps_pcaps_filter_v1,
+        "magic-visibility-pcaps_pcaps_response_full": magic$$visibility$$pcaps_pcaps_response_full,
+        "magic-visibility-pcaps_pcaps_response_simple": magic$$visibility$$pcaps_pcaps_response_simple,
+        "magic-visibility-pcaps_pcaps_single_response": magic$$visibility$$pcaps_pcaps_single_response,
       },
     },
     annotations: {
@@ -258,28 +199,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_api-response-single": magic_visibility_pcaps_api_response_single_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_byte_limit": magic_visibility_pcaps_pcaps_byte_limit_output,
-        "magic-visibility-pcaps_pcaps_colo_name": magic_visibility_pcaps_pcaps_colo_name_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_error_message": magic_visibility_pcaps_pcaps_error_message_output,
-        "magic-visibility-pcaps_pcaps_filter_v1": magic_visibility_pcaps_pcaps_filter_v1_output,
-        "magic-visibility-pcaps_pcaps_id": magic_visibility_pcaps_pcaps_id_output,
-        "magic-visibility-pcaps_pcaps_offset_time": magic_visibility_pcaps_pcaps_offset_time_output,
-        "magic-visibility-pcaps_pcaps_packets_captured": magic_visibility_pcaps_pcaps_packets_captured_output,
-        "magic-visibility-pcaps_pcaps_response_full": magic_visibility_pcaps_pcaps_response_full_output,
-        "magic-visibility-pcaps_pcaps_response_simple": magic_visibility_pcaps_pcaps_response_simple_output,
-        "magic-visibility-pcaps_pcaps_single_response": magic_visibility_pcaps_pcaps_single_response_output,
-        "magic-visibility-pcaps_pcaps_status": magic_visibility_pcaps_pcaps_status_output,
-        "magic-visibility-pcaps_pcaps_stop_requested": magic_visibility_pcaps_pcaps_stop_requested_output,
-        "magic-visibility-pcaps_pcaps_submitted": magic_visibility_pcaps_pcaps_submitted_output,
-        "magic-visibility-pcaps_pcaps_system": magic_visibility_pcaps_pcaps_system_output,
-        "magic-visibility-pcaps_pcaps_time_limit_full": magic_visibility_pcaps_pcaps_time_limit_full_output,
-        "magic-visibility-pcaps_pcaps_time_limit_sampled": magic_visibility_pcaps_pcaps_time_limit_sampled_output,
-        "magic-visibility-pcaps_pcaps_type": magic_visibility_pcaps_pcaps_type_output,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_api-response-single": magic$$visibility$$pcaps_api$$response$$single,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_filter_v1": magic$$visibility$$pcaps_pcaps_filter_v1,
+        "magic-visibility-pcaps_pcaps_response_full": magic$$visibility$$pcaps_pcaps_response_full,
+        "magic-visibility-pcaps_pcaps_response_simple": magic$$visibility$$pcaps_pcaps_response_simple,
+        "magic-visibility-pcaps_pcaps_single_response": magic$$visibility$$pcaps_pcaps_single_response,
       },
     },
     request: (args) => ({
@@ -287,49 +214,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_pcaps_list",
+    name: "magicTransit_pcaps_list",
     title: "List packet capture requests",
-    description: "Lists all packet capture requests for an account.",
+    description: "Lists all packet capture requests for an account.\n\nGET /accounts/{account_id}/pcaps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic-visibility-pcaps_pcaps_collection_response",
       $defs: {
-        "magic-visibility-pcaps_api-response-collection": magic_visibility_pcaps_api_response_collection_output,
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_byte_limit": magic_visibility_pcaps_pcaps_byte_limit_output,
-        "magic-visibility-pcaps_pcaps_collection_response": magic_visibility_pcaps_pcaps_collection_response_output,
-        "magic-visibility-pcaps_pcaps_colo_name": magic_visibility_pcaps_pcaps_colo_name_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_error_message": magic_visibility_pcaps_pcaps_error_message_output,
-        "magic-visibility-pcaps_pcaps_filter_v1": magic_visibility_pcaps_pcaps_filter_v1_output,
-        "magic-visibility-pcaps_pcaps_id": magic_visibility_pcaps_pcaps_id_output,
-        "magic-visibility-pcaps_pcaps_offset_time": magic_visibility_pcaps_pcaps_offset_time_output,
-        "magic-visibility-pcaps_pcaps_packets_captured": magic_visibility_pcaps_pcaps_packets_captured_output,
-        "magic-visibility-pcaps_pcaps_response_full": magic_visibility_pcaps_pcaps_response_full_output,
-        "magic-visibility-pcaps_pcaps_response_simple": magic_visibility_pcaps_pcaps_response_simple_output,
-        "magic-visibility-pcaps_pcaps_status": magic_visibility_pcaps_pcaps_status_output,
-        "magic-visibility-pcaps_pcaps_stop_requested": magic_visibility_pcaps_pcaps_stop_requested_output,
-        "magic-visibility-pcaps_pcaps_submitted": magic_visibility_pcaps_pcaps_submitted_output,
-        "magic-visibility-pcaps_pcaps_system": magic_visibility_pcaps_pcaps_system_output,
-        "magic-visibility-pcaps_pcaps_time_limit_full": magic_visibility_pcaps_pcaps_time_limit_full_output,
-        "magic-visibility-pcaps_pcaps_time_limit_sampled": magic_visibility_pcaps_pcaps_time_limit_sampled_output,
-        "magic-visibility-pcaps_pcaps_type": magic_visibility_pcaps_pcaps_type_output,
-        "magic-visibility-pcaps_result_info": magic_visibility_pcaps_result_info_output,
+        "magic-visibility-pcaps_api-response-collection": magic$$visibility$$pcaps_api$$response$$collection,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_collection_response": magic$$visibility$$pcaps_pcaps_collection_response,
+        "magic-visibility-pcaps_pcaps_filter_v1": magic$$visibility$$pcaps_pcaps_filter_v1,
+        "magic-visibility-pcaps_pcaps_response_full": magic$$visibility$$pcaps_pcaps_response_full,
+        "magic-visibility-pcaps_pcaps_response_simple": magic$$visibility$$pcaps_pcaps_response_simple,
+        "magic-visibility-pcaps_result_info": magic$$visibility$$pcaps_result_info,
       },
     },
     annotations: {
@@ -366,29 +286,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-collection": magic_visibility_pcaps_api_response_collection_output,
-        "magic-visibility-pcaps_api-response-common": magic_visibility_pcaps_api_response_common_output,
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
-        "magic-visibility-pcaps_pcaps_byte_limit": magic_visibility_pcaps_pcaps_byte_limit_output,
-        "magic-visibility-pcaps_pcaps_collection_response": magic_visibility_pcaps_pcaps_collection_response_output,
-        "magic-visibility-pcaps_pcaps_colo_name": magic_visibility_pcaps_pcaps_colo_name_output,
-        "magic-visibility-pcaps_pcaps_destination_conf": magic_visibility_pcaps_pcaps_destination_conf_output,
-        "magic-visibility-pcaps_pcaps_error_message": magic_visibility_pcaps_pcaps_error_message_output,
-        "magic-visibility-pcaps_pcaps_filter_v1": magic_visibility_pcaps_pcaps_filter_v1_output,
-        "magic-visibility-pcaps_pcaps_id": magic_visibility_pcaps_pcaps_id_output,
-        "magic-visibility-pcaps_pcaps_offset_time": magic_visibility_pcaps_pcaps_offset_time_output,
-        "magic-visibility-pcaps_pcaps_packets_captured": magic_visibility_pcaps_pcaps_packets_captured_output,
-        "magic-visibility-pcaps_pcaps_response_full": magic_visibility_pcaps_pcaps_response_full_output,
-        "magic-visibility-pcaps_pcaps_response_simple": magic_visibility_pcaps_pcaps_response_simple_output,
-        "magic-visibility-pcaps_pcaps_status": magic_visibility_pcaps_pcaps_status_output,
-        "magic-visibility-pcaps_pcaps_stop_requested": magic_visibility_pcaps_pcaps_stop_requested_output,
-        "magic-visibility-pcaps_pcaps_submitted": magic_visibility_pcaps_pcaps_submitted_output,
-        "magic-visibility-pcaps_pcaps_system": magic_visibility_pcaps_pcaps_system_output,
-        "magic-visibility-pcaps_pcaps_time_limit_full": magic_visibility_pcaps_pcaps_time_limit_full_output,
-        "magic-visibility-pcaps_pcaps_time_limit_sampled": magic_visibility_pcaps_pcaps_time_limit_sampled_output,
-        "magic-visibility-pcaps_pcaps_type": magic_visibility_pcaps_pcaps_type_output,
-        "magic-visibility-pcaps_result_info": magic_visibility_pcaps_result_info_output,
+        "magic-visibility-pcaps_api-response-collection": magic$$visibility$$pcaps_api$$response$$collection,
+        "magic-visibility-pcaps_api-response-common": magic$$visibility$$pcaps_api$$response$$common,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
+        "magic-visibility-pcaps_pcaps_collection_response": magic$$visibility$$pcaps_pcaps_collection_response,
+        "magic-visibility-pcaps_pcaps_filter_v1": magic$$visibility$$pcaps_pcaps_filter_v1,
+        "magic-visibility-pcaps_pcaps_response_full": magic$$visibility$$pcaps_pcaps_response_full,
+        "magic-visibility-pcaps_pcaps_response_simple": magic$$visibility$$pcaps_pcaps_response_simple,
+        "magic-visibility-pcaps_result_info": magic$$visibility$$pcaps_result_info,
       },
     },
     request: (args) => ({
@@ -396,28 +302,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_pcaps_stop",
+    name: "magicTransit_pcaps_stop",
     title: "Stop full PCAP",
-    description: "Stop full PCAP.\n\nConfirm with the user before calling this tool. This operation halts an in-progress full packet capture. Any unsaved capture data will be lost.",
+    description: "Stop full PCAP.\n\nConfirm with the user before calling this tool. This operation halts an in-progress full packet capture. Any unsaved capture data will be lost.\n\nPUT /accounts/{account_id}/pcaps/{pcap_id}/stop",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
-        },
-        "pcap_id": {
-          "$ref": "#/$defs/magic-visibility-pcaps_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "pcap_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pcap_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pcap_id"
+        "path"
       ],
-      $defs: {
-        "magic-visibility-pcaps_identifier": magic_visibility_pcaps_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -450,8 +363,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic-visibility-pcaps_api-response-common-failure": magic_visibility_pcaps_api_response_common_failure_output,
-        "magic-visibility-pcaps_messages": magic_visibility_pcaps_messages_output,
+        "magic-visibility-pcaps_api-response-common-failure": magic$$visibility$$pcaps_api$$response$$common$$failure,
+        "magic-visibility-pcaps_messages": magic$$visibility$$pcaps_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/redundancyGroups/outputs.ts b/src/generated/forge-mcp/magicTransit/redundancyGroups/outputs.ts
index d184c8b62..ac6567f29 100644
--- a/src/generated/forge-mcp/magicTransit/redundancyGroups/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/redundancyGroups/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `magic_delete_redundancy_group_response` in responses.
  */
-export const magic_delete_redundancy_group_response_output: JsonSchema = {
+export const magic_delete_redundancy_group_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -37,7 +37,7 @@ export const magic_delete_redundancy_group_response_output: JsonSchema = {
 /**
  * The schema of `magic_redundancy_group` in responses.
  */
-export const magic_redundancy_group_output: JsonSchema = {
+export const magic_redundancy_group: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -63,7 +63,7 @@ export const magic_redundancy_group_output: JsonSchema = {
 /**
  * The schema of `magic_redundancy_group_single_response` in responses.
  */
-export const magic_redundancy_group_single_response_output: JsonSchema = {
+export const magic_redundancy_group_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -82,7 +82,7 @@ export const magic_redundancy_group_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_redundancy_group_with_members` in responses.
  */
-export const magic_redundancy_group_with_members_output: JsonSchema = {
+export const magic_redundancy_group_with_members: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_redundancy_group"
@@ -104,7 +104,7 @@ export const magic_redundancy_group_with_members_output: JsonSchema = {
 /**
  * The schema of `magic_redundancy_group_with_members_response` in responses.
  */
-export const magic_redundancy_group_with_members_response_output: JsonSchema = {
+export const magic_redundancy_group_with_members_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -123,7 +123,7 @@ export const magic_redundancy_group_with_members_response_output: JsonSchema = {
 /**
  * The schema of `magic_redundancy_groups_collection_response` in responses.
  */
-export const magic_redundancy_groups_collection_response_output: JsonSchema = {
+export const magic_redundancy_groups_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -150,7 +150,7 @@ export const magic_redundancy_groups_collection_response_output: JsonSchema = {
 /**
  * The schema of `magic_redundancy_member_data` in responses.
  */
-export const magic_redundancy_member_data_output: JsonSchema = {
+export const magic_redundancy_member_data: JsonSchema = {
   "properties": {
     "data": {
       "type": "object"
diff --git a/src/generated/forge-mcp/magicTransit/redundancyGroups/tools.ts b/src/generated/forge-mcp/magicTransit/redundancyGroups/tools.ts
index 376610e26..872af40b8 100644
--- a/src/generated/forge-mcp/magicTransit/redundancyGroups/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/redundancyGroups/tools.ts
@@ -3,20 +3,19 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../outputs.js";
-import { magic_identifier } from "../schemas.js";
 import {
-  magic_delete_redundancy_group_response_output,
-  magic_redundancy_group_output,
-  magic_redundancy_group_single_response_output,
-  magic_redundancy_group_with_members_output,
-  magic_redundancy_group_with_members_response_output,
-  magic_redundancy_groups_collection_response_output,
-  magic_redundancy_member_data_output,
+  magic_delete_redundancy_group_response,
+  magic_redundancy_group,
+  magic_redundancy_group_single_response,
+  magic_redundancy_group_with_members,
+  magic_redundancy_group_with_members_response,
+  magic_redundancy_groups_collection_response,
+  magic_redundancy_member_data,
 } from "./outputs.js";
 import {
   magic_create_redundancy_group_request,
@@ -24,42 +23,51 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.redundancy_groups`.
+ * The tools of `magicTransit.redundancyGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_redundancy_groups_create",
+    name: "magicTransit_redundancyGroups_create",
     title: "Create a Redundancy Group",
-    description: "Creates a new redundancy group, optionally with tunnel members.",
+    description: "Creates a new redundancy group, optionally with tunnel members.\n\nPOST /accounts/{account_id}/magic/redundancy_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_create_redundancy_group_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "magic_create_redundancy_group_request": magic_create_redundancy_group_request,
-        "magic_identifier": magic_identifier,
         "magic_redundancy_member_request": magic_redundancy_member_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_redundancy_group_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
-        "magic_redundancy_group_single_response": magic_redundancy_group_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
+        "magic_redundancy_group_single_response": magic_redundancy_group_single_response,
       },
     },
     annotations: {
@@ -89,12 +97,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
-        "magic_redundancy_group_single_response": magic_redundancy_group_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
+        "magic_redundancy_group_single_response": magic_redundancy_group_single_response,
       },
     },
     request: (args) => ({
@@ -103,37 +111,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_redundancy_groups_delete",
+    name: "magicTransit_redundancyGroups_delete",
     title: "Delete a Redundancy Group",
-    description: "Deletes a redundancy group. Member tunnels are not deleted — their redundancy_group_id is cleared.",
+    description: "Deletes a redundancy group. Member tunnels are not deleted — their redundancy_group_id is cleared.\n\nDELETE /accounts/{account_id}/magic/redundancy_groups/{redundancy_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "redundancy_group_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "redundancy_group_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "redundancy_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "redundancy_group_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_delete_redundancy_group_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_delete_redundancy_group_response": magic_delete_redundancy_group_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_delete_redundancy_group_response": magic_delete_redundancy_group_response,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
       },
     },
     annotations: {
@@ -163,12 +178,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_delete_redundancy_group_response": magic_delete_redundancy_group_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_delete_redundancy_group_response": magic_delete_redundancy_group_response,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
       },
     },
     request: (args) => ({
@@ -176,39 +191,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_redundancy_groups_get",
+    name: "magicTransit_redundancyGroups_get",
     title: "Get Redundancy Group Details",
-    description: "Gets details for a specific redundancy group, including full member tunnel data.",
+    description: "Gets details for a specific redundancy group, including full member tunnel data.\n\nGET /accounts/{account_id}/magic/redundancy_groups/{redundancy_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "redundancy_group_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "redundancy_group_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "redundancy_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "redundancy_group_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_redundancy_group_with_members_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
-        "magic_redundancy_group_with_members": magic_redundancy_group_with_members_output,
-        "magic_redundancy_group_with_members_response": magic_redundancy_group_with_members_response_output,
-        "magic_redundancy_member_data": magic_redundancy_member_data_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
+        "magic_redundancy_group_with_members": magic_redundancy_group_with_members,
+        "magic_redundancy_group_with_members_response": magic_redundancy_group_with_members_response,
+        "magic_redundancy_member_data": magic_redundancy_member_data,
       },
     },
     annotations: {
@@ -238,14 +260,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
-        "magic_redundancy_group_with_members": magic_redundancy_group_with_members_output,
-        "magic_redundancy_group_with_members_response": magic_redundancy_group_with_members_response_output,
-        "magic_redundancy_member_data": magic_redundancy_member_data_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
+        "magic_redundancy_group_with_members": magic_redundancy_group_with_members,
+        "magic_redundancy_group_with_members_response": magic_redundancy_group_with_members_response,
+        "magic_redundancy_member_data": magic_redundancy_member_data,
       },
     },
     request: (args) => ({
@@ -253,34 +275,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_redundancy_groups_list",
+    name: "magicTransit_redundancyGroups_list",
     title: "List Redundancy Groups",
-    description: "Lists redundancy groups associated with an account, including full member tunnel data.",
+    description: "Lists redundancy groups associated with an account, including full member tunnel data.\n\nGET /accounts/{account_id}/magic/redundancy_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_redundancy_groups_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
-        "magic_redundancy_group_with_members": magic_redundancy_group_with_members_output,
-        "magic_redundancy_groups_collection_response": magic_redundancy_groups_collection_response_output,
-        "magic_redundancy_member_data": magic_redundancy_member_data_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
+        "magic_redundancy_group_with_members": magic_redundancy_group_with_members,
+        "magic_redundancy_groups_collection_response": magic_redundancy_groups_collection_response,
+        "magic_redundancy_member_data": magic_redundancy_member_data,
       },
     },
     annotations: {
@@ -310,14 +339,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
-        "magic_redundancy_group_with_members": magic_redundancy_group_with_members_output,
-        "magic_redundancy_groups_collection_response": magic_redundancy_groups_collection_response_output,
-        "magic_redundancy_member_data": magic_redundancy_member_data_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
+        "magic_redundancy_group_with_members": magic_redundancy_group_with_members,
+        "magic_redundancy_groups_collection_response": magic_redundancy_groups_collection_response,
+        "magic_redundancy_member_data": magic_redundancy_member_data,
       },
     },
     request: (args) => ({
@@ -325,43 +354,52 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_redundancy_groups_update",
+    name: "magicTransit_redundancyGroups_update",
     title: "Update a Redundancy Group",
-    description: "Replaces the name, description, and full set of members for an existing redundancy group.",
+    description: "Replaces the name, description, and full set of members for an existing redundancy group.\n\nPUT /accounts/{account_id}/magic/redundancy_groups/{redundancy_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_create_redundancy_group_request"
         },
-        "redundancy_group_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "redundancy_group_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "redundancy_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "redundancy_group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "magic_create_redundancy_group_request": magic_create_redundancy_group_request,
-        "magic_identifier": magic_identifier,
         "magic_redundancy_member_request": magic_redundancy_member_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_redundancy_group_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
-        "magic_redundancy_group_single_response": magic_redundancy_group_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
+        "magic_redundancy_group_single_response": magic_redundancy_group_single_response,
       },
     },
     annotations: {
@@ -391,12 +429,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_redundancy_group": magic_redundancy_group_output,
-        "magic_redundancy_group_single_response": magic_redundancy_group_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_redundancy_group": magic_redundancy_group,
+        "magic_redundancy_group_single_response": magic_redundancy_group_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/routes/outputs.ts b/src/generated/forge-mcp/magicTransit/routes/outputs.ts
index 7117f1d5e..aed9ddf13 100644
--- a/src/generated/forge-mcp/magicTransit/routes/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/routes/outputs.ts
@@ -3,36 +3,22 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_colo_name` in responses.
- */
-export const magic_colo_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_colo_names` in responses.
  */
-export const magic_colo_names_output: JsonSchema = {
+export const magic_colo_names: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/magic_colo_name"
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `magic_colo_region` in responses.
- */
-export const magic_colo_region_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_colo_regions` in responses.
  */
-export const magic_colo_regions_output: JsonSchema = {
+export const magic_colo_regions: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/magic_colo_region"
+    "type": "string"
   },
   "type": "array"
 };
@@ -40,7 +26,7 @@ export const magic_colo_regions_output: JsonSchema = {
 /**
  * The schema of `magic_create_route_response` in responses.
  */
-export const magic_create_route_response_output: JsonSchema = {
+export const magic_create_route_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -56,33 +42,10 @@ export const magic_create_route_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic_created_on` in responses.
- */
-export const magic_created_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_description` in responses.
- */
-export const magic_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_modified_on` in responses.
- */
-export const magic_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_multiple_route_delete_response` in responses.
  */
-export const magic_multiple_route_delete_response_output: JsonSchema = {
+export const magic_multiple_route_delete_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -112,7 +75,7 @@ export const magic_multiple_route_delete_response_output: JsonSchema = {
 /**
  * The schema of `magic_multiple_route_modified_response` in responses.
  */
-export const magic_multiple_route_modified_response_output: JsonSchema = {
+export const magic_multiple_route_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -139,58 +102,39 @@ export const magic_multiple_route_modified_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic_nexthop` in responses.
- */
-export const magic_nexthop_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_prefix` in responses.
- */
-export const magic_prefix_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_priority` in responses.
- */
-export const magic_priority_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `magic_route` in responses.
  */
-export const magic_route_output: JsonSchema = {
+export const magic_route: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/magic_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/magic_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/magic_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "nexthop": {
-      "$ref": "#/$defs/magic_nexthop"
+      "type": "string"
     },
     "prefix": {
-      "$ref": "#/$defs/magic_prefix"
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/magic_priority"
+      "type": "integer"
     },
     "scope": {
       "$ref": "#/$defs/magic_scope"
     },
     "weight": {
-      "$ref": "#/$defs/magic_weight"
+      "type": "integer"
     }
   },
   "required": [
@@ -205,7 +149,7 @@ export const magic_route_output: JsonSchema = {
 /**
  * The schema of `magic_route_deleted_response` in responses.
  */
-export const magic_route_deleted_response_output: JsonSchema = {
+export const magic_route_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -232,7 +176,7 @@ export const magic_route_deleted_response_output: JsonSchema = {
 /**
  * The schema of `magic_route_modified_response` in responses.
  */
-export const magic_route_modified_response_output: JsonSchema = {
+export const magic_route_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -259,7 +203,7 @@ export const magic_route_modified_response_output: JsonSchema = {
 /**
  * The schema of `magic_route_single_response` in responses.
  */
-export const magic_route_single_response_output: JsonSchema = {
+export const magic_route_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -283,7 +227,7 @@ export const magic_route_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_routes_collection_response` in responses.
  */
-export const magic_routes_collection_response_output: JsonSchema = {
+export const magic_routes_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -310,7 +254,7 @@ export const magic_routes_collection_response_output: JsonSchema = {
 /**
  * The schema of `magic_scope` in responses.
  */
-export const magic_scope_output: JsonSchema = {
+export const magic_scope: JsonSchema = {
   "properties": {
     "colo_names": {
       "$ref": "#/$defs/magic_colo_names"
@@ -321,10 +265,3 @@ export const magic_scope_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `magic_weight` in responses.
- */
-export const magic_weight_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/routes/schemas.ts b/src/generated/forge-mcp/magicTransit/routes/schemas.ts
index 06dde8a48..eb6d9cbe4 100644
--- a/src/generated/forge-mcp/magicTransit/routes/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/routes/schemas.ts
@@ -3,40 +3,26 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_colo_name`.
- */
-export const magic_colo_name: JsonSchema = {
-  "description": "Scope colo name.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_colo_names`.
  */
 export const magic_colo_names: JsonSchema = {
   "description": "List of colo names for the ECMP scope.",
   "items": {
-    "$ref": "#/$defs/magic_colo_name"
+    "description": "Scope colo name.",
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `magic_colo_region`.
- */
-export const magic_colo_region: JsonSchema = {
-  "description": "Scope colo region.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_colo_regions`.
  */
 export const magic_colo_regions: JsonSchema = {
   "description": "List of colo regions for the ECMP scope.",
   "items": {
-    "$ref": "#/$defs/magic_colo_region"
+    "description": "Scope colo region.",
+    "type": "string"
   },
   "type": "array"
 };
@@ -47,28 +33,28 @@ export const magic_colo_regions: JsonSchema = {
 export const magic_create_route_request: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/magic_description",
-      "description": "An optional human provided description of the static route."
+      "description": "An optional human provided description of the static route.",
+      "type": "string"
     },
     "nexthop": {
-      "$ref": "#/$defs/magic_nexthop",
-      "description": "The next-hop IP Address for the static route."
+      "description": "The next-hop IP Address for the static route.",
+      "type": "string"
     },
     "prefix": {
-      "$ref": "#/$defs/magic_prefix",
-      "description": "IP Prefix in Classless Inter-Domain Routing format."
+      "description": "IP Prefix in Classless Inter-Domain Routing format.",
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/magic_priority",
-      "description": "Priority of the static route."
+      "description": "Priority of the static route.",
+      "type": "integer"
     },
     "scope": {
       "$ref": "#/$defs/magic_scope",
       "description": "Used only for ECMP routes."
     },
     "weight": {
-      "$ref": "#/$defs/magic_weight",
-      "description": "Optional weight of the ECMP scope - if provided."
+      "description": "Optional weight of the ECMP scope - if provided.",
+      "type": "integer"
     }
   },
   "required": [
@@ -79,66 +65,34 @@ export const magic_create_route_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_description`.
- */
-export const magic_description: JsonSchema = {
-  "description": "An optional human provided description of the static route.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_nexthop`.
- */
-export const magic_nexthop: JsonSchema = {
-  "description": "The next-hop IP Address for the static route.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_prefix`.
- */
-export const magic_prefix: JsonSchema = {
-  "description": "IP Prefix in Classless Inter-Domain Routing format.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_priority`.
- */
-export const magic_priority: JsonSchema = {
-  "description": "Priority of the static route.",
-  "type": "integer"
-};
-
 /**
  * The schema of `magic_route_add_single_request`.
  */
 export const magic_route_add_single_request: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/magic_description",
-      "description": "An optional human provided description of the static route."
+      "description": "An optional human provided description of the static route.",
+      "type": "string"
     },
     "nexthop": {
-      "$ref": "#/$defs/magic_nexthop",
-      "description": "The next-hop IP Address for the static route."
+      "description": "The next-hop IP Address for the static route.",
+      "type": "string"
     },
     "prefix": {
-      "$ref": "#/$defs/magic_prefix",
-      "description": "IP Prefix in Classless Inter-Domain Routing format."
+      "description": "IP Prefix in Classless Inter-Domain Routing format.",
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/magic_priority",
-      "description": "Priority of the static route."
+      "description": "Priority of the static route.",
+      "type": "integer"
     },
     "scope": {
       "$ref": "#/$defs/magic_scope",
       "description": "Used only for ECMP routes."
     },
     "weight": {
-      "$ref": "#/$defs/magic_weight",
-      "description": "Optional weight of the ECMP scope - if provided."
+      "description": "Optional weight of the ECMP scope - if provided.",
+      "type": "integer"
     }
   },
   "required": [
@@ -198,28 +152,28 @@ export const magic_route_update_many_request: JsonSchema = {
 export const magic_route_update_request: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/magic_description",
-      "description": "An optional human provided description of the static route."
+      "description": "An optional human provided description of the static route.",
+      "type": "string"
     },
     "nexthop": {
-      "$ref": "#/$defs/magic_nexthop",
-      "description": "The next-hop IP Address for the static route."
+      "description": "The next-hop IP Address for the static route.",
+      "type": "string"
     },
     "prefix": {
-      "$ref": "#/$defs/magic_prefix",
-      "description": "IP Prefix in Classless Inter-Domain Routing format."
+      "description": "IP Prefix in Classless Inter-Domain Routing format.",
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/magic_priority",
-      "description": "Priority of the static route."
+      "description": "Priority of the static route.",
+      "type": "integer"
     },
     "scope": {
       "$ref": "#/$defs/magic_scope",
       "description": "Used only for ECMP routes."
     },
     "weight": {
-      "$ref": "#/$defs/magic_weight",
-      "description": "Optional weight of the ECMP scope - if provided."
+      "description": "Optional weight of the ECMP scope - if provided.",
+      "type": "integer"
     }
   },
   "required": [
@@ -261,11 +215,3 @@ export const magic_scope: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `magic_weight`.
- */
-export const magic_weight: JsonSchema = {
-  "description": "Optional weight of the ECMP scope - if provided.",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/routes/tools.ts b/src/generated/forge-mcp/magicTransit/routes/tools.ts
index 26fabdff4..378c6d3de 100644
--- a/src/generated/forge-mcp/magicTransit/routes/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/routes/tools.ts
@@ -3,116 +3,90 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_identifier_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../outputs.js";
-import { magic_identifier } from "../schemas.js";
 import {
-  magic_colo_name_output,
-  magic_colo_names_output,
-  magic_colo_region_output,
-  magic_colo_regions_output,
-  magic_create_route_response_output,
-  magic_created_on_output,
-  magic_description_output,
-  magic_modified_on_output,
-  magic_multiple_route_delete_response_output,
-  magic_multiple_route_modified_response_output,
-  magic_nexthop_output,
-  magic_prefix_output,
-  magic_priority_output,
-  magic_route_deleted_response_output,
-  magic_route_modified_response_output,
-  magic_route_output,
-  magic_route_single_response_output,
-  magic_routes_collection_response_output,
-  magic_scope_output,
-  magic_weight_output,
-} from "./outputs.js";
-import {
-  magic_colo_name,
   magic_colo_names,
-  magic_colo_region,
   magic_colo_regions,
+  magic_create_route_response,
+  magic_multiple_route_delete_response,
+  magic_multiple_route_modified_response,
+  magic_route,
+  magic_route_deleted_response,
+  magic_route_modified_response,
+  magic_route_single_response,
+  magic_routes_collection_response,
+  magic_scope,
+} from "./outputs.js";
+import {
+  magic_colo_names as magic_colo_names$,
+  magic_colo_regions as magic_colo_regions$,
   magic_create_route_request,
-  magic_description,
-  magic_nexthop,
-  magic_prefix,
-  magic_priority,
   magic_route_add_single_request,
   magic_route_delete_id,
   magic_route_delete_many_request,
   magic_route_update_many_request,
   magic_route_update_request,
   magic_route_update_single_request,
-  magic_scope,
-  magic_weight,
+  magic_scope as magic_scope$,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.routes`.
+ * The tools of `magicTransit.routes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_routes_bulk_update",
+    name: "magicTransit_routes_bulkUpdate",
     title: "Update Many Routes",
-    description: "Update multiple Magic static routes. Use `?validate_only=true` as an optional query parameter to run validation only without persisting changes. Only fields for a route that need to be changed need be provided.",
+    description: "Update multiple Magic static routes. Use `?validate_only=true` as an optional query parameter to run validation only without persisting changes. Only fields for a route that need to be changed need be provided.\n\nPUT /accounts/{account_id}/magic/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_route_update_many_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_colo_name": magic_colo_name,
-        "magic_colo_names": magic_colo_names,
-        "magic_colo_region": magic_colo_region,
-        "magic_colo_regions": magic_colo_regions,
-        "magic_description": magic_description,
-        "magic_identifier": magic_identifier,
-        "magic_nexthop": magic_nexthop,
-        "magic_prefix": magic_prefix,
-        "magic_priority": magic_priority,
+        "magic_colo_names": magic_colo_names$,
+        "magic_colo_regions": magic_colo_regions$,
         "magic_route_add_single_request": magic_route_add_single_request,
         "magic_route_update_many_request": magic_route_update_many_request,
         "magic_route_update_single_request": magic_route_update_single_request,
-        "magic_scope": magic_scope,
-        "magic_weight": magic_weight,
+        "magic_scope": magic_scope$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_multiple_route_modified_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_multiple_route_modified_response": magic_multiple_route_modified_response_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_multiple_route_modified_response": magic_multiple_route_modified_response,
+        "magic_route": magic_route,
+        "magic_scope": magic_scope,
       },
     },
     annotations: {
@@ -151,25 +125,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_multiple_route_modified_response": magic_multiple_route_modified_response_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_multiple_route_modified_response": magic_multiple_route_modified_response,
+        "magic_route": magic_route,
+        "magic_scope": magic_scope,
       },
     },
     request: (args) => ({
@@ -178,60 +142,52 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_routes_create",
+    name: "magicTransit_routes_create",
     title: "Create a Route",
-    description: "Creates a new Magic static route. Use `?validate_only=true` as an optional query parameter to run validation only without persisting changes.",
+    description: "Creates a new Magic static route. Use `?validate_only=true` as an optional query parameter to run validation only without persisting changes.\n\nPOST /accounts/{account_id}/magic/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_create_route_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_colo_name": magic_colo_name,
-        "magic_colo_names": magic_colo_names,
-        "magic_colo_region": magic_colo_region,
-        "magic_colo_regions": magic_colo_regions,
+        "magic_colo_names": magic_colo_names$,
+        "magic_colo_regions": magic_colo_regions$,
         "magic_create_route_request": magic_create_route_request,
-        "magic_description": magic_description,
-        "magic_identifier": magic_identifier,
-        "magic_nexthop": magic_nexthop,
-        "magic_prefix": magic_prefix,
-        "magic_priority": magic_priority,
-        "magic_scope": magic_scope,
-        "magic_weight": magic_weight,
+        "magic_scope": magic_scope$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_create_route_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_create_route_response": magic_create_route_response_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_create_route_response": magic_create_route_response,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_scope": magic_scope,
       },
     },
     annotations: {
@@ -270,25 +226,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_create_route_response": magic_create_route_response_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_create_route_response": magic_create_route_response,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_scope": magic_scope,
       },
     },
     request: (args) => ({
@@ -297,50 +243,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_routes_delete",
+    name: "magicTransit_routes_delete",
     title: "Delete Route",
-    description: "Disable and remove a specific Magic static route.",
+    description: "Disable and remove a specific Magic static route.\n\nDELETE /accounts/{account_id}/magic/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "route_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "route_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "route_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_route_deleted_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_route_deleted_response": magic_route_deleted_response_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_route_deleted_response": magic_route_deleted_response,
+        "magic_scope": magic_scope,
       },
     },
     annotations: {
@@ -379,25 +322,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_route_deleted_response": magic_route_deleted_response_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_route_deleted_response": magic_route_deleted_response,
+        "magic_scope": magic_scope,
       },
     },
     request: (args) => ({
@@ -405,26 +338,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_routes_empty",
+    name: "magicTransit_routes_empty",
     title: "Delete Many Routes",
-    description: "Delete multiple Magic static routes.",
+    description: "Delete multiple Magic static routes.\n\nDELETE /accounts/{account_id}/magic/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_route_delete_many_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_identifier": magic_identifier,
         "magic_route_delete_id": magic_route_delete_id,
         "magic_route_delete_many_request": magic_route_delete_many_request,
       },
@@ -432,24 +374,14 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/magic_multiple_route_delete_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_multiple_route_delete_response": magic_multiple_route_delete_response_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_multiple_route_delete_response": magic_multiple_route_delete_response,
+        "magic_route": magic_route,
+        "magic_scope": magic_scope,
       },
     },
     annotations: {
@@ -488,25 +420,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_multiple_route_delete_response": magic_multiple_route_delete_response_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_multiple_route_delete_response": magic_multiple_route_delete_response,
+        "magic_route": magic_route,
+        "magic_scope": magic_scope,
       },
     },
     request: (args) => ({
@@ -515,50 +437,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_routes_get",
+    name: "magicTransit_routes_get",
     title: "Route Details",
-    description: "Get a specific Magic static route.",
+    description: "Get a specific Magic static route.\n\nGET /accounts/{account_id}/magic/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "route_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "route_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "route_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_route_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_route_single_response": magic_route_single_response_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_route_single_response": magic_route_single_response,
+        "magic_scope": magic_scope,
       },
     },
     annotations: {
@@ -599,25 +518,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_route_single_response": magic_route_single_response_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_route_single_response": magic_route_single_response,
+        "magic_scope": magic_scope,
       },
     },
     request: (args) => ({
@@ -625,45 +534,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_routes_list",
+    name: "magicTransit_routes_list",
     title: "List Routes",
-    description: "List all Magic static routes.",
+    description: "List all Magic static routes.\n\nGET /accounts/{account_id}/magic/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_routes_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_routes_collection_response": magic_routes_collection_response_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_routes_collection_response": magic_routes_collection_response,
+        "magic_scope": magic_scope,
       },
     },
     annotations: {
@@ -699,25 +605,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_routes_collection_response": magic_routes_collection_response_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_routes_collection_response": magic_routes_collection_response,
+        "magic_scope": magic_scope,
       },
     },
     request: (args) => ({
@@ -725,65 +621,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_routes_update",
+    name: "magicTransit_routes_update",
     title: "Update Route",
-    description: "Update a specific Magic static route. Use `?validate_only=true` as an optional query parameter to run validation only without persisting changes.",
+    description: "Update a specific Magic static route. Use `?validate_only=true` as an optional query parameter to run validation only without persisting changes.\n\nPUT /accounts/{account_id}/magic/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_route_update_request"
         },
-        "route_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "route_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "route_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_colo_name": magic_colo_name,
-        "magic_colo_names": magic_colo_names,
-        "magic_colo_region": magic_colo_region,
-        "magic_colo_regions": magic_colo_regions,
-        "magic_description": magic_description,
-        "magic_identifier": magic_identifier,
-        "magic_nexthop": magic_nexthop,
-        "magic_prefix": magic_prefix,
-        "magic_priority": magic_priority,
+        "magic_colo_names": magic_colo_names$,
+        "magic_colo_regions": magic_colo_regions$,
         "magic_route_update_request": magic_route_update_request,
-        "magic_scope": magic_scope,
-        "magic_weight": magic_weight,
+        "magic_scope": magic_scope$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_route_modified_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_route_modified_response": magic_route_modified_response_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_route_modified_response": magic_route_modified_response,
+        "magic_scope": magic_scope,
       },
     },
     annotations: {
@@ -822,25 +710,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_colo_name": magic_colo_name_output,
-        "magic_colo_names": magic_colo_names_output,
-        "magic_colo_region": magic_colo_region_output,
-        "magic_colo_regions": magic_colo_regions_output,
-        "magic_created_on": magic_created_on_output,
-        "magic_description": magic_description_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_modified_on": magic_modified_on_output,
-        "magic_nexthop": magic_nexthop_output,
-        "magic_prefix": magic_prefix_output,
-        "magic_priority": magic_priority_output,
-        "magic_route": magic_route_output,
-        "magic_route_modified_response": magic_route_modified_response_output,
-        "magic_scope": magic_scope_output,
-        "magic_weight": magic_weight_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_colo_names": magic_colo_names,
+        "magic_colo_regions": magic_colo_regions,
+        "magic_messages": magic_messages,
+        "magic_route": magic_route,
+        "magic_route_modified_response": magic_route_modified_response,
+        "magic_scope": magic_scope,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/schemas.ts b/src/generated/forge-mcp/magicTransit/schemas.ts
index 238da2ee6..c21053053 100644
--- a/src/generated/forge-mcp/magicTransit/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/schemas.ts
@@ -3,38 +3,6 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `advanced-ddos-protection_identifier`.
- */
-export const advanced_ddos_protection_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `advanced-ddos-protection_uuid`.
- */
-export const advanced_ddos_protection_uuid: JsonSchema = {
-  "description": "UUID.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_account_app_id`.
- */
-export const magic_account_app_id: JsonSchema = {
-  "description": "Magic account app ID.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_automatic_return_routing`.
- */
-export const magic_automatic_return_routing: JsonSchema = {
-  "description": "True if automatic stateful return routing should be enabled for a tunnel, false otherwise. Requires the `coupler_integration` account flag to be enabled; requests setting this to `true` without that flag will be rejected.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `magic_bgp_config`.
  */
@@ -49,7 +17,7 @@ export const magic_bgp_config: JsonSchema = {
       "type": "string"
     },
     "extra_prefixes": {
-      "description": "Prefixes in this list will be advertised to the customer device, in addition to the routes in the Magic routing table.\nEach entry must be a network address in CIDR notation with no host bits set (for example `192.0.2.0/24`, not\n`192.0.2.1/24`) and must not repeat another entry. IPv6 prefixes are accepted only when the tunnel has an\n`interface_address6`.\n",
+      "description": "Prefixes in this list will be advertised to the customer device, in addition to the routes in the Magic routing table.\nEach entry must be a network address in CIDR notation with no host bits set (for example `192.0.2.0/24`, not\n`192.0.2.1/24`) and must not repeat another entry. IPv6 prefixes are accepted only when the tunnel has an\n`interface_address6`.",
       "items": {
         "type": "string"
       },
@@ -70,14 +38,6 @@ export const magic_bgp_config: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_cidr`.
- */
-export const magic_cidr: JsonSchema = {
-  "description": "A valid CIDR notation representing an IP range.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_health_check_base`.
  */
@@ -136,38 +96,6 @@ export const magic_health_check_target: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_identifier`.
- */
-export const magic_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_interface_address`.
- */
-export const magic_interface_address: JsonSchema = {
-  "description": "A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side of the tunnel. Select the subnet from the following private IP space: 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_interface_address6`.
- */
-export const magic_interface_address6: JsonSchema = {
-  "description": "A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the address being the first IP of the subnet and not same as the address of virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 , interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_managed_app_id`.
- */
-export const magic_managed_app_id: JsonSchema = {
-  "description": "Managed app ID.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_tunnel_health_check`.
  */
diff --git a/src/generated/forge-mcp/magicTransit/sites/acls/outputs.ts b/src/generated/forge-mcp/magicTransit/sites/acls/outputs.ts
index eb589eb25..c1c18aab9 100644
--- a/src/generated/forge-mcp/magicTransit/sites/acls/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/acls/outputs.ts
@@ -6,16 +6,16 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `magic_acl` in responses.
  */
-export const magic_acl_output: JsonSchema = {
+export const magic_acl: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
     },
     "forward_locally": {
-      "$ref": "#/$defs/magic_forward_locally"
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "lan_1": {
       "$ref": "#/$defs/magic_lan-acl-configuration"
@@ -38,37 +38,16 @@ export const magic_acl_output: JsonSchema = {
       "type": "array"
     },
     "unidirectional": {
-      "$ref": "#/$defs/magic_unidirectional"
+      "type": "boolean"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `magic_acl-port-range` in responses.
- */
-export const magic_acl_port_range_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_acl-subnet` in responses.
- */
-export const magic_acl_subnet_output: JsonSchema = {
-  "oneOf": [
-    {
-      "$ref": "#/$defs/magic_ip-address"
-    },
-    {
-      "$ref": "#/$defs/magic_cidr"
-    }
-  ]
-};
-
 /**
  * The schema of `magic_acl_deleted_response` in responses.
  */
-export const magic_acl_deleted_response_output: JsonSchema = {
+export const magic_acl_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -87,7 +66,7 @@ export const magic_acl_deleted_response_output: JsonSchema = {
 /**
  * The schema of `magic_acl_modified_response` in responses.
  */
-export const magic_acl_modified_response_output: JsonSchema = {
+export const magic_acl_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -106,7 +85,7 @@ export const magic_acl_modified_response_output: JsonSchema = {
 /**
  * The schema of `magic_acl_single_response` in responses.
  */
-export const magic_acl_single_response_output: JsonSchema = {
+export const magic_acl_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -125,7 +104,7 @@ export const magic_acl_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_acls_collection_response` in responses.
  */
-export const magic_acls_collection_response_output: JsonSchema = {
+export const magic_acls_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -144,17 +123,10 @@ export const magic_acls_collection_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `magic_forward_locally` in responses.
- */
-export const magic_forward_locally_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `magic_lan-acl-configuration` in responses.
  */
-export const magic_lan_acl_configuration_output: JsonSchema = {
+export const magic_lan$$acl$$configuration: JsonSchema = {
   "properties": {
     "lan_id": {
       "type": "string"
@@ -164,19 +136,26 @@ export const magic_lan_acl_configuration_output: JsonSchema = {
     },
     "port_ranges": {
       "items": {
-        "$ref": "#/$defs/magic_acl-port-range"
+        "type": "string"
       },
       "type": "array"
     },
     "ports": {
       "items": {
-        "$ref": "#/$defs/magic_port"
+        "type": "integer"
       },
       "type": "array"
     },
     "subnets": {
       "items": {
-        "$ref": "#/$defs/magic_acl-subnet"
+        "oneOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string"
+          }
+        ]
       },
       "type": "array"
     }
@@ -186,10 +165,3 @@ export const magic_lan_acl_configuration_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `magic_unidirectional` in responses.
- */
-export const magic_unidirectional_output: JsonSchema = {
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/magicTransit/sites/acls/schemas.ts b/src/generated/forge-mcp/magicTransit/sites/acls/schemas.ts
index 476fb83d8..c3f873066 100644
--- a/src/generated/forge-mcp/magicTransit/sites/acls/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/acls/schemas.ts
@@ -3,28 +3,6 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `magic_acl-port-range`.
- */
-export const magic_acl_port_range: JsonSchema = {
-  "description": "A valid port range value.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_acl-subnet`.
- */
-export const magic_acl_subnet: JsonSchema = {
-  "oneOf": [
-    {
-      "$ref": "#/$defs/magic_ip-address"
-    },
-    {
-      "$ref": "#/$defs/magic_cidr"
-    }
-  ]
-};
-
 /**
  * The schema of `magic_acl_update_request`.
  */
@@ -35,8 +13,8 @@ export const magic_acl_update_request: JsonSchema = {
       "type": "string"
     },
     "forward_locally": {
-      "$ref": "#/$defs/magic_forward_locally",
-      "description": "The desired forwarding action for this ACL policy. If set to \"false\", the policy will forward traffic to Cloudflare. If set to \"true\", the policy will forward traffic locally on the Magic Connector. If not included in request, will default to false."
+      "description": "The desired forwarding action for this ACL policy. If set to \"false\", the policy will forward traffic to Cloudflare. If set to \"true\", the policy will forward traffic locally on the Magic Connector. If not included in request, will default to false.",
+      "type": "boolean"
     },
     "lan_1": {
       "$ref": "#/$defs/magic_lan-acl-configuration"
@@ -60,8 +38,8 @@ export const magic_acl_update_request: JsonSchema = {
       "type": "array"
     },
     "unidirectional": {
-      "$ref": "#/$defs/magic_unidirectional",
-      "description": "The desired traffic direction for this ACL policy. If set to \"false\", the policy will allow bidirectional traffic. If set to \"true\", the policy will only allow traffic in one direction. If not included in request, will default to false."
+      "description": "The desired traffic direction for this ACL policy. If set to \"false\", the policy will allow bidirectional traffic. If set to \"true\", the policy will only allow traffic in one direction. If not included in request, will default to false.",
+      "type": "boolean"
     }
   },
   "type": "object"
@@ -78,8 +56,8 @@ export const magic_acls_add_single_request: JsonSchema = {
       "type": "string"
     },
     "forward_locally": {
-      "$ref": "#/$defs/magic_forward_locally",
-      "description": "The desired forwarding action for this ACL policy. If set to \"false\", the policy will forward traffic to Cloudflare. If set to \"true\", the policy will forward traffic locally on the Magic Connector. If not included in request, will default to false."
+      "description": "The desired forwarding action for this ACL policy. If set to \"false\", the policy will forward traffic to Cloudflare. If set to \"true\", the policy will forward traffic locally on the Magic Connector. If not included in request, will default to false.",
+      "type": "boolean"
     },
     "lan_1": {
       "$ref": "#/$defs/magic_lan-acl-configuration"
@@ -103,8 +81,8 @@ export const magic_acls_add_single_request: JsonSchema = {
       "type": "array"
     },
     "unidirectional": {
-      "$ref": "#/$defs/magic_unidirectional",
-      "description": "The desired traffic direction for this ACL policy. If set to \"false\", the policy will allow bidirectional traffic. If set to \"true\", the policy will only allow traffic in one direction. If not included in request, will default to false."
+      "description": "The desired traffic direction for this ACL policy. If set to \"false\", the policy will allow bidirectional traffic. If set to \"true\", the policy will only allow traffic in one direction. If not included in request, will default to false.",
+      "type": "boolean"
     }
   },
   "required": [
@@ -115,18 +93,10 @@ export const magic_acls_add_single_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_forward_locally`.
- */
-export const magic_forward_locally: JsonSchema = {
-  "description": "The desired forwarding action for this ACL policy. If set to \"false\", the policy will forward traffic to Cloudflare. If set to \"true\", the policy will forward traffic locally on the Magic Connector. If not included in request, will default to false.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `magic_lan-acl-configuration`.
  */
-export const magic_lan_acl_configuration: JsonSchema = {
+export const magic_lan$$acl$$configuration: JsonSchema = {
   "properties": {
     "lan_id": {
       "description": "The identifier for the LAN you want to create an ACL policy with.",
@@ -139,21 +109,31 @@ export const magic_lan_acl_configuration: JsonSchema = {
     "port_ranges": {
       "description": "Array of port ranges on the provided LAN that will be included in the ACL. If no ports or port rangess are provided, communication on any port on this LAN is allowed.",
       "items": {
-        "$ref": "#/$defs/magic_acl-port-range"
+        "description": "A valid port range value.",
+        "type": "string"
       },
       "type": "array"
     },
     "ports": {
       "description": "Array of ports on the provided LAN that will be included in the ACL. If no ports or port ranges are provided, communication on any port on this LAN is allowed.",
       "items": {
-        "$ref": "#/$defs/magic_port"
+        "type": "integer"
       },
       "type": "array"
     },
     "subnets": {
       "description": "Array of subnet IPs within the LAN that will be included in the ACL. If no subnets are provided, communication on any subnets on this LAN are allowed.",
       "items": {
-        "$ref": "#/$defs/magic_acl-subnet"
+        "oneOf": [
+          {
+            "description": "A valid IPv4 address.",
+            "type": "string"
+          },
+          {
+            "description": "A valid CIDR notation representing an IP range.",
+            "type": "string"
+          }
+        ]
       },
       "type": "array"
     }
@@ -163,11 +143,3 @@ export const magic_lan_acl_configuration: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `magic_unidirectional`.
- */
-export const magic_unidirectional: JsonSchema = {
-  "description": "The desired traffic direction for this ACL policy. If set to \"false\", the policy will allow bidirectional traffic. If set to \"true\", the policy will only allow traffic in one direction. If not included in request, will default to false.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/magicTransit/sites/acls/tools.ts b/src/generated/forge-mcp/magicTransit/sites/acls/tools.ts
index 29d4d9cf6..607988e4a 100644
--- a/src/generated/forge-mcp/magicTransit/sites/acls/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/acls/tools.ts
@@ -3,96 +3,77 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_cidr_output,
-  magic_identifier_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../../outputs.js";
-import { magic_cidr, magic_identifier } from "../../schemas.js";
-import { magic_ip_address_output, magic_port_output } from "../outputs.js";
-import { magic_ip_address, magic_port } from "../schemas.js";
 import {
-  magic_acl_deleted_response_output,
-  magic_acl_modified_response_output,
-  magic_acl_output,
-  magic_acl_port_range_output,
-  magic_acl_single_response_output,
-  magic_acl_subnet_output,
-  magic_acls_collection_response_output,
-  magic_forward_locally_output,
-  magic_lan_acl_configuration_output,
-  magic_unidirectional_output,
+  magic_acl,
+  magic_acl_deleted_response,
+  magic_acl_modified_response,
+  magic_acl_single_response,
+  magic_acls_collection_response,
+  magic_lan$$acl$$configuration,
 } from "./outputs.js";
 import {
-  magic_acl_port_range,
-  magic_acl_subnet,
   magic_acl_update_request,
   magic_acls_add_single_request,
-  magic_forward_locally,
-  magic_lan_acl_configuration,
-  magic_unidirectional,
+  magic_lan$$acl$$configuration as magic_lan$$acl$$configuration$,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.sites.acls`.
+ * The tools of `magicTransit.sites.acls`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_sites_acls_create",
+    name: "magicTransit_sites_acls_create",
     title: "Create a new Site ACL",
-    description: "Creates a new Site ACL.",
+    description: "Creates a new Site ACL.\n\nPOST /accounts/{account_id}/magic/sites/{site_id}/acls",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_acls_add_single_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_acl-port-range": magic_acl_port_range,
-        "magic_acl-subnet": magic_acl_subnet,
         "magic_acls_add_single_request": magic_acls_add_single_request,
-        "magic_cidr": magic_cidr,
-        "magic_forward_locally": magic_forward_locally,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration,
-        "magic_port": magic_port,
-        "magic_unidirectional": magic_unidirectional,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_acl_single_response",
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_single_response": magic_acl_single_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_single_response": magic_acl_single_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -126,21 +107,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_single_response": magic_acl_single_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_single_response": magic_acl_single_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -149,51 +122,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_acls_delete",
+    name: "magicTransit_sites_acls_delete",
     title: "Delete Site ACL",
-    description: "Remove a specific Site ACL.",
+    description: "Remove a specific Site ACL.\n\nDELETE /accounts/{account_id}/magic/sites/{site_id}/acls/{acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "acl_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "acl_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "acl_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_acl_deleted_response",
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_deleted_response": magic_acl_deleted_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_deleted_response": magic_acl_deleted_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -232,21 +204,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_deleted_response": magic_acl_deleted_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_deleted_response": magic_acl_deleted_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -254,64 +218,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_acls_edit",
+    name: "magicTransit_sites_acls_edit",
     title: "Patch Site ACL",
-    description: "Patch a specific Site ACL.",
+    description: "Patch a specific Site ACL.\n\nPATCH /accounts/{account_id}/magic/sites/{site_id}/acls/{acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "acl_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_acl_update_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "acl_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "acl_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_acl-port-range": magic_acl_port_range,
-        "magic_acl-subnet": magic_acl_subnet,
         "magic_acl_update_request": magic_acl_update_request,
-        "magic_cidr": magic_cidr,
-        "magic_forward_locally": magic_forward_locally,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration,
-        "magic_port": magic_port,
-        "magic_unidirectional": magic_unidirectional,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_acl_modified_response",
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_modified_response": magic_acl_modified_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_modified_response": magic_acl_modified_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -350,21 +308,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_modified_response": magic_acl_modified_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_modified_response": magic_acl_modified_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -373,51 +323,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_acls_get",
+    name: "magicTransit_sites_acls_get",
     title: "Site ACL Details",
-    description: "Get a specific Site ACL.",
+    description: "Get a specific Site ACL.\n\nGET /accounts/{account_id}/magic/sites/{site_id}/acls/{acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "acl_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "acl_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "acl_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_acl_single_response",
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_single_response": magic_acl_single_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_single_response": magic_acl_single_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -458,21 +407,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_single_response": magic_acl_single_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_single_response": magic_acl_single_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -480,46 +421,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_acls_list",
+    name: "magicTransit_sites_acls_list",
     title: "List Site ACLs",
-    description: "Lists Site ACLs associated with an account.",
+    description: "Lists Site ACLs associated with an account.\n\nGET /accounts/{account_id}/magic/sites/{site_id}/acls",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_acls_collection_response",
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acls_collection_response": magic_acls_collection_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acls_collection_response": magic_acls_collection_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -555,21 +495,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acls_collection_response": magic_acls_collection_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acls_collection_response": magic_acls_collection_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -577,64 +509,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_acls_update",
+    name: "magicTransit_sites_acls_update",
     title: "Update Site ACL",
-    description: "Update a specific Site ACL.",
+    description: "Update a specific Site ACL.\n\nPUT /accounts/{account_id}/magic/sites/{site_id}/acls/{acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "acl_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_acl_update_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "acl_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "acl_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_acl-port-range": magic_acl_port_range,
-        "magic_acl-subnet": magic_acl_subnet,
         "magic_acl_update_request": magic_acl_update_request,
-        "magic_cidr": magic_cidr,
-        "magic_forward_locally": magic_forward_locally,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration,
-        "magic_port": magic_port,
-        "magic_unidirectional": magic_unidirectional,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_acl_modified_response",
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_modified_response": magic_acl_modified_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_modified_response": magic_acl_modified_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -673,21 +599,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_acl": magic_acl_output,
-        "magic_acl-port-range": magic_acl_port_range_output,
-        "magic_acl-subnet": magic_acl_subnet_output,
-        "magic_acl_modified_response": magic_acl_modified_response_output,
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_forward_locally": magic_forward_locally_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan-acl-configuration": magic_lan_acl_configuration_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_unidirectional": magic_unidirectional_output,
+        "magic_acl": magic_acl,
+        "magic_acl_modified_response": magic_acl_modified_response,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_lan-acl-configuration": magic_lan$$acl$$configuration,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/sites/appConfiguration/outputs.ts b/src/generated/forge-mcp/magicTransit/sites/appConfiguration/outputs.ts
index 0d6abc081..81479d50b 100644
--- a/src/generated/forge-mcp/magicTransit/sites/appConfiguration/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/appConfiguration/outputs.ts
@@ -3,19 +3,12 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `magic_app_breakout` in responses.
- */
-export const magic_app_breakout_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `magic_app_breakout_preferred_wans` in responses.
  */
-export const magic_app_breakout_preferred_wans_output: JsonSchema = {
+export const magic_app_breakout_preferred_wans: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/magic_identifier"
+    "type": "string"
   },
   "type": "array"
 };
@@ -23,24 +16,24 @@ export const magic_app_breakout_preferred_wans_output: JsonSchema = {
 /**
  * The schema of `magic_app_config` in responses.
  */
-export const magic_app_config_output: JsonSchema = {
+export const magic_app_config: JsonSchema = {
   "allOf": [
     {
       "properties": {
         "breakout": {
-          "$ref": "#/$defs/magic_app_breakout"
+          "type": "boolean"
         },
         "id": {
-          "$ref": "#/$defs/magic_identifier"
+          "type": "string"
         },
         "preferred_wans": {
           "$ref": "#/$defs/magic_app_breakout_preferred_wans"
         },
         "priority": {
-          "$ref": "#/$defs/magic_app_priority"
+          "type": "integer"
         },
         "site_id": {
-          "$ref": "#/$defs/magic_identifier"
+          "type": "string"
         }
       },
       "required": [
@@ -54,7 +47,7 @@ export const magic_app_config_output: JsonSchema = {
         {
           "properties": {
             "account_app_id": {
-              "$ref": "#/$defs/magic_account_app_id"
+              "type": "string"
             }
           },
           "required": [
@@ -65,7 +58,7 @@ export const magic_app_config_output: JsonSchema = {
         {
           "properties": {
             "managed_app_id": {
-              "$ref": "#/$defs/magic_managed_app_id"
+              "type": "string"
             }
           },
           "required": [
@@ -81,7 +74,7 @@ export const magic_app_config_output: JsonSchema = {
 /**
  * The schema of `magic_app_config_single_response` in responses.
  */
-export const magic_app_config_single_response_output: JsonSchema = {
+export const magic_app_config_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_apps-response-object"
@@ -100,7 +93,7 @@ export const magic_app_config_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_app_configs_collection_response` in responses.
  */
-export const magic_app_configs_collection_response_output: JsonSchema = {
+export const magic_app_configs_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_apps-response-array"
@@ -118,10 +111,3 @@ export const magic_app_configs_collection_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `magic_app_priority` in responses.
- */
-export const magic_app_priority_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/sites/appConfiguration/schemas.ts b/src/generated/forge-mcp/magicTransit/sites/appConfiguration/schemas.ts
index 15eb7fc19..784d22845 100644
--- a/src/generated/forge-mcp/magicTransit/sites/appConfiguration/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/appConfiguration/schemas.ts
@@ -3,21 +3,14 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `magic_app_breakout`.
- */
-export const magic_app_breakout: JsonSchema = {
-  "description": "Whether to breakout traffic to the app's endpoints directly. Null preserves default behavior.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `magic_app_breakout_preferred_wans`.
  */
 export const magic_app_breakout_preferred_wans: JsonSchema = {
   "description": "WAN interfaces to prefer over default WANs, highest-priority first. Can only be specified for breakout rules (breakout must be true).",
   "items": {
-    "$ref": "#/$defs/magic_identifier"
+    "description": "Identifier",
+    "type": "string"
   },
   "type": "array"
 };
@@ -32,8 +25,8 @@ export const magic_app_config_add_single_request: JsonSchema = {
         {
           "properties": {
             "account_app_id": {
-              "$ref": "#/$defs/magic_account_app_id",
-              "description": "Magic account app ID."
+              "description": "Magic account app ID.",
+              "type": "string"
             }
           },
           "required": [
@@ -44,8 +37,8 @@ export const magic_app_config_add_single_request: JsonSchema = {
         {
           "properties": {
             "managed_app_id": {
-              "$ref": "#/$defs/magic_managed_app_id",
-              "description": "Managed app ID."
+              "description": "Managed app ID.",
+              "type": "string"
             }
           },
           "required": [
@@ -59,16 +52,16 @@ export const magic_app_config_add_single_request: JsonSchema = {
     {
       "properties": {
         "breakout": {
-          "$ref": "#/$defs/magic_app_breakout",
-          "description": "Whether to breakout traffic to the app's endpoints directly. Null preserves default behavior."
+          "description": "Whether to breakout traffic to the app's endpoints directly. Null preserves default behavior.",
+          "type": "boolean"
         },
         "preferred_wans": {
           "$ref": "#/$defs/magic_app_breakout_preferred_wans",
           "description": "WAN interfaces to prefer over default WANs, highest-priority first. Can only be specified for breakout rules (breakout must be true)."
         },
         "priority": {
-          "$ref": "#/$defs/magic_app_priority",
-          "description": "Priority of traffic. 0 is default, anything greater is prioritized. (Currently only 0 and 1 are supported)"
+          "description": "Priority of traffic. 0 is default, anything greater is prioritized. (Currently only 0 and 1 are supported)",
+          "type": "integer"
         }
       },
       "type": "object"
@@ -82,33 +75,25 @@ export const magic_app_config_add_single_request: JsonSchema = {
 export const magic_app_config_update_request: JsonSchema = {
   "properties": {
     "account_app_id": {
-      "$ref": "#/$defs/magic_account_app_id",
-      "description": "Magic account app ID."
+      "description": "Magic account app ID.",
+      "type": "string"
     },
     "breakout": {
-      "$ref": "#/$defs/magic_app_breakout",
-      "description": "Whether to breakout traffic to the app's endpoints directly. Null preserves default behavior."
+      "description": "Whether to breakout traffic to the app's endpoints directly. Null preserves default behavior.",
+      "type": "boolean"
     },
     "managed_app_id": {
-      "$ref": "#/$defs/magic_managed_app_id",
-      "description": "Managed app ID."
+      "description": "Managed app ID.",
+      "type": "string"
     },
     "preferred_wans": {
       "$ref": "#/$defs/magic_app_breakout_preferred_wans",
       "description": "WAN interfaces to prefer over default WANs, highest-priority first. Can only be specified for breakout rules (breakout must be true)."
     },
     "priority": {
-      "$ref": "#/$defs/magic_app_priority",
-      "description": "Priority of traffic. 0 is default, anything greater is prioritized. (Currently only 0 and 1 are supported)"
+      "description": "Priority of traffic. 0 is default, anything greater is prioritized. (Currently only 0 and 1 are supported)",
+      "type": "integer"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `magic_app_priority`.
- */
-export const magic_app_priority: JsonSchema = {
-  "description": "Priority of traffic. 0 is default, anything greater is prioritized. (Currently only 0 and 1 are supported)",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/sites/appConfiguration/tools.ts b/src/generated/forge-mcp/magicTransit/sites/appConfiguration/tools.ts
index fdb86405d..355ff028c 100644
--- a/src/generated/forge-mcp/magicTransit/sites/appConfiguration/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/appConfiguration/tools.ts
@@ -3,86 +3,74 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_account_app_id_output,
-  magic_api_response_common_failure_output,
-  magic_apps_response_array_output,
-  magic_apps_response_object_output,
-  magic_identifier_output,
-  magic_managed_app_id_output,
-  magic_messages_output,
+  magic_api$$response$$common$$failure,
+  magic_apps$$response$$array,
+  magic_apps$$response$$object,
+  magic_messages,
 } from "../../outputs.js";
 import {
-  magic_account_app_id,
-  magic_identifier,
-  magic_managed_app_id,
-} from "../../schemas.js";
-import {
-  magic_app_breakout_output,
-  magic_app_breakout_preferred_wans_output,
-  magic_app_config_output,
-  magic_app_config_single_response_output,
-  magic_app_configs_collection_response_output,
-  magic_app_priority_output,
+  magic_app_breakout_preferred_wans,
+  magic_app_config,
+  magic_app_config_single_response,
+  magic_app_configs_collection_response,
 } from "./outputs.js";
 import {
-  magic_app_breakout,
-  magic_app_breakout_preferred_wans,
+  magic_app_breakout_preferred_wans as magic_app_breakout_preferred_wans$,
   magic_app_config_add_single_request,
   magic_app_config_update_request,
-  magic_app_priority,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.sites.app_configuration`.
+ * The tools of `magicTransit.sites.appConfiguration`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_sites_app_configuration_create",
+    name: "magicTransit_sites_appConfiguration_create",
     title: "Create a new App Config",
-    description: "Creates a new App Config for a site",
+    description: "Creates a new App Config for a site\n\nPOST /accounts/{account_id}/magic/sites/{site_id}/app_configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_app_config_add_single_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_account_app_id": magic_account_app_id,
-        "magic_app_breakout": magic_app_breakout,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans$,
         "magic_app_config_add_single_request": magic_app_config_add_single_request,
-        "magic_app_priority": magic_app_priority,
-        "magic_identifier": magic_identifier,
-        "magic_managed_app_id": magic_managed_app_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_app_config_single_response",
       $defs: {
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_app_breakout": magic_app_breakout_output,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans_output,
-        "magic_app_config": magic_app_config_output,
-        "magic_app_config_single_response": magic_app_config_single_response_output,
-        "magic_app_priority": magic_app_priority_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_config": magic_app_config,
+        "magic_app_config_single_response": magic_app_config_single_response,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -116,17 +104,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_app_breakout": magic_app_breakout_output,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans_output,
-        "magic_app_config": magic_app_config_output,
-        "magic_app_config_single_response": magic_app_config_single_response_output,
-        "magic_app_priority": magic_app_priority_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_config": magic_app_config,
+        "magic_app_config_single_response": magic_app_config_single_response,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -135,47 +118,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_app_configuration_delete",
+    name: "magicTransit_sites_appConfiguration_delete",
     title: "Delete App Config",
-    description: "Deletes specific App Config associated with a site.",
+    description: "Deletes specific App Config associated with a site.\n\nDELETE /accounts/{account_id}/magic/sites/{site_id}/app_configs/{app_config_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "app_config_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "app_config_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "app_config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "app_config_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_app_config_single_response",
       $defs: {
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_app_breakout": magic_app_breakout_output,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans_output,
-        "magic_app_config": magic_app_config_output,
-        "magic_app_config_single_response": magic_app_config_single_response_output,
-        "magic_app_priority": magic_app_priority_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_config": magic_app_config,
+        "magic_app_config_single_response": magic_app_config_single_response,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -209,17 +194,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_app_breakout": magic_app_breakout_output,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans_output,
-        "magic_app_config": magic_app_config_output,
-        "magic_app_config_single_response": magic_app_config_single_response_output,
-        "magic_app_priority": magic_app_priority_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_config": magic_app_config,
+        "magic_app_config_single_response": magic_app_config_single_response,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -227,42 +207,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_app_configuration_list",
+    name: "magicTransit_sites_appConfiguration_list",
     title: "List App Configs",
-    description: "Lists App Configs associated with a site.",
+    description: "Lists App Configs associated with a site.\n\nGET /accounts/{account_id}/magic/sites/{site_id}/app_configs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_app_configs_collection_response",
       $defs: {
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_app_breakout": magic_app_breakout_output,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans_output,
-        "magic_app_config": magic_app_config_output,
-        "magic_app_configs_collection_response": magic_app_configs_collection_response_output,
-        "magic_app_priority": magic_app_priority_output,
-        "magic_apps-response-array": magic_apps_response_array_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_config": magic_app_config,
+        "magic_app_configs_collection_response": magic_app_configs_collection_response,
+        "magic_apps-response-array": magic_apps$$response$$array,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -298,17 +280,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_app_breakout": magic_app_breakout_output,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans_output,
-        "magic_app_config": magic_app_config_output,
-        "magic_app_configs_collection_response": magic_app_configs_collection_response_output,
-        "magic_app_priority": magic_app_priority_output,
-        "magic_apps-response-array": magic_apps_response_array_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_config": magic_app_config,
+        "magic_app_configs_collection_response": magic_app_configs_collection_response,
+        "magic_apps-response-array": magic_apps$$response$$array,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
@@ -316,57 +293,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_app_configuration_update",
+    name: "magicTransit_sites_appConfiguration_update",
     title: "Update an App Config",
-    description: "Updates an App Config for a site",
+    description: "Updates an App Config for a site\n\nPUT /accounts/{account_id}/magic/sites/{site_id}/app_configs/{app_config_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "app_config_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_app_config_update_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "app_config_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "app_config_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "app_config_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_account_app_id": magic_account_app_id,
-        "magic_app_breakout": magic_app_breakout,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans$,
         "magic_app_config_update_request": magic_app_config_update_request,
-        "magic_app_priority": magic_app_priority,
-        "magic_identifier": magic_identifier,
-        "magic_managed_app_id": magic_managed_app_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_app_config_single_response",
       $defs: {
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_app_breakout": magic_app_breakout_output,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans_output,
-        "magic_app_config": magic_app_config_output,
-        "magic_app_config_single_response": magic_app_config_single_response_output,
-        "magic_app_priority": magic_app_priority_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_config": magic_app_config,
+        "magic_app_config_single_response": magic_app_config_single_response,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     annotations: {
@@ -400,17 +377,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_account_app_id": magic_account_app_id_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_app_breakout": magic_app_breakout_output,
-        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans_output,
-        "magic_app_config": magic_app_config_output,
-        "magic_app_config_single_response": magic_app_config_single_response_output,
-        "magic_app_priority": magic_app_priority_output,
-        "magic_apps-response-object": magic_apps_response_object_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_managed_app_id": magic_managed_app_id_output,
-        "magic_messages": magic_messages_output,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_app_breakout_preferred_wans": magic_app_breakout_preferred_wans,
+        "magic_app_config": magic_app_config,
+        "magic_app_config_single_response": magic_app_config_single_response,
+        "magic_apps-response-object": magic_apps$$response$$object,
+        "magic_messages": magic_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/sites/lans/outputs.ts b/src/generated/forge-mcp/magicTransit/sites/lans/outputs.ts
index 64fb8e1eb..c3a028f5b 100644
--- a/src/generated/forge-mcp/magicTransit/sites/lans/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/lans/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `magic_bond_id` in responses.
- */
-export const magic_bond_id_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `magic_dhcp_option` in responses.
  */
-export const magic_dhcp_option_output: JsonSchema = {
+export const magic_dhcp_option: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -44,16 +37,16 @@ export const magic_dhcp_option_output: JsonSchema = {
 /**
  * The schema of `magic_lan` in responses.
  */
-export const magic_lan_output: JsonSchema = {
+export const magic_lan: JsonSchema = {
   "properties": {
     "bond_id": {
-      "$ref": "#/$defs/magic_bond_id"
+      "type": "integer"
     },
     "ha_link": {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "is_breakout": {
       "type": "boolean"
@@ -68,7 +61,7 @@ export const magic_lan_output: JsonSchema = {
       "$ref": "#/$defs/magic_nat"
     },
     "physport": {
-      "$ref": "#/$defs/magic_port"
+      "type": "integer"
     },
     "remote_subnets": {
       "items": {
@@ -83,13 +76,13 @@ export const magic_lan_output: JsonSchema = {
       "type": "array"
     },
     "site_id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "static_addressing": {
       "$ref": "#/$defs/magic_lan_static_addressing"
     },
     "vlan_tag": {
-      "$ref": "#/$defs/magic_vlan_tag"
+      "type": "integer"
     }
   },
   "type": "object"
@@ -98,7 +91,7 @@ export const magic_lan_output: JsonSchema = {
 /**
  * The schema of `magic_lan_deleted_response` in responses.
  */
-export const magic_lan_deleted_response_output: JsonSchema = {
+export const magic_lan_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -117,11 +110,11 @@ export const magic_lan_deleted_response_output: JsonSchema = {
 /**
  * The schema of `magic_lan_dhcp_relay` in responses.
  */
-export const magic_lan_dhcp_relay_output: JsonSchema = {
+export const magic_lan_dhcp_relay: JsonSchema = {
   "properties": {
     "server_addresses": {
       "items": {
-        "$ref": "#/$defs/magic_ip-address"
+        "type": "string"
       },
       "type": "array"
     }
@@ -132,7 +125,7 @@ export const magic_lan_dhcp_relay_output: JsonSchema = {
 /**
  * The schema of `magic_lan_dhcp_server` in responses.
  */
-export const magic_lan_dhcp_server_output: JsonSchema = {
+export const magic_lan_dhcp_server: JsonSchema = {
   "properties": {
     "dhcp_options": {
       "items": {
@@ -141,17 +134,17 @@ export const magic_lan_dhcp_server_output: JsonSchema = {
       "type": "array"
     },
     "dhcp_pool_end": {
-      "$ref": "#/$defs/magic_ip-address"
+      "type": "string"
     },
     "dhcp_pool_start": {
-      "$ref": "#/$defs/magic_ip-address"
+      "type": "string"
     },
     "dns_server": {
-      "$ref": "#/$defs/magic_ip-address"
+      "type": "string"
     },
     "dns_servers": {
       "items": {
-        "$ref": "#/$defs/magic_ip-address"
+        "type": "string"
       },
       "type": "array"
     },
@@ -168,7 +161,7 @@ export const magic_lan_dhcp_server_output: JsonSchema = {
 /**
  * The schema of `magic_lan_modified_response` in responses.
  */
-export const magic_lan_modified_response_output: JsonSchema = {
+export const magic_lan_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -187,7 +180,7 @@ export const magic_lan_modified_response_output: JsonSchema = {
 /**
  * The schema of `magic_lan_single_response` in responses.
  */
-export const magic_lan_single_response_output: JsonSchema = {
+export const magic_lan_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -206,10 +199,10 @@ export const magic_lan_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_lan_static_addressing` in responses.
  */
-export const magic_lan_static_addressing_output: JsonSchema = {
+export const magic_lan_static_addressing: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     },
     "dhcp_relay": {
       "$ref": "#/$defs/magic_lan_dhcp_relay"
@@ -218,10 +211,10 @@ export const magic_lan_static_addressing_output: JsonSchema = {
       "$ref": "#/$defs/magic_lan_dhcp_server"
     },
     "secondary_address": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     },
     "virtual_address": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     }
   },
   "required": [
@@ -233,7 +226,7 @@ export const magic_lan_static_addressing_output: JsonSchema = {
 /**
  * The schema of `magic_lans_collection_response` in responses.
  */
-export const magic_lans_collection_response_output: JsonSchema = {
+export const magic_lans_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -255,10 +248,10 @@ export const magic_lans_collection_response_output: JsonSchema = {
 /**
  * The schema of `magic_nat` in responses.
  */
-export const magic_nat_output: JsonSchema = {
+export const magic_nat: JsonSchema = {
   "properties": {
     "static_prefix": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     }
   },
   "type": "object"
@@ -267,13 +260,13 @@ export const magic_nat_output: JsonSchema = {
 /**
  * The schema of `magic_remote_subnet` in responses.
  */
-export const magic_remote_subnet_output: JsonSchema = {
+export const magic_remote_subnet: JsonSchema = {
   "properties": {
     "local_alias_prefix": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     },
     "remote_prefix": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     }
   },
   "required": [
@@ -286,16 +279,16 @@ export const magic_remote_subnet_output: JsonSchema = {
 /**
  * The schema of `magic_routed_subnet` in responses.
  */
-export const magic_routed_subnet_output: JsonSchema = {
+export const magic_routed_subnet: JsonSchema = {
   "properties": {
     "nat": {
       "$ref": "#/$defs/magic_nat"
     },
     "next_hop": {
-      "$ref": "#/$defs/magic_ip-address"
+      "type": "string"
     },
     "prefix": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/magicTransit/sites/lans/schemas.ts b/src/generated/forge-mcp/magicTransit/sites/lans/schemas.ts
index fe63e44f0..c5597c4e4 100644
--- a/src/generated/forge-mcp/magicTransit/sites/lans/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/lans/schemas.ts
@@ -3,13 +3,6 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `magic_bond_id`.
- */
-export const magic_bond_id: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `magic_dhcp_option`.
  */
@@ -21,7 +14,7 @@ export const magic_dhcp_option: JsonSchema = {
       "type": "integer"
     },
     "type": {
-      "description": "The type of the option value. text: a string (max 255 bytes). hex: colon-separated hex bytes (e.g. \"01:04:aa:bb:cc\", max 255 bytes). ip: an IPv4 address (e.g. \"10.20.30.40\"). byte: an unsigned integer 0-255 (1 byte). short: an unsigned integer 0-65535 (2 bytes). integer: an unsigned integer 0-4294967295 (4 bytes).\n",
+      "description": "The type of the option value. text: a string (max 255 bytes). hex: colon-separated hex bytes (e.g. \"01:04:aa:bb:cc\", max 255 bytes). ip: an IPv4 address (e.g. \"10.20.30.40\"). byte: an unsigned integer 0-255 (1 byte). short: an unsigned integer 0-65535 (2 bytes). integer: an unsigned integer 0-4294967295 (4 bytes).",
       "enum": [
         "text",
         "hex",
@@ -53,7 +46,8 @@ export const magic_lan_dhcp_relay: JsonSchema = {
     "server_addresses": {
       "description": "List of DHCP server IPs.",
       "items": {
-        "$ref": "#/$defs/magic_ip-address"
+        "description": "A valid IPv4 address.",
+        "type": "string"
       },
       "type": "array"
     }
@@ -74,20 +68,22 @@ export const magic_lan_dhcp_server: JsonSchema = {
       "type": "array"
     },
     "dhcp_pool_end": {
-      "$ref": "#/$defs/magic_ip-address",
-      "description": "A valid IPv4 address."
+      "description": "A valid IPv4 address.",
+      "type": "string"
     },
     "dhcp_pool_start": {
-      "$ref": "#/$defs/magic_ip-address",
-      "description": "A valid IPv4 address."
+      "description": "A valid IPv4 address.",
+      "type": "string"
     },
     "dns_server": {
-      "$ref": "#/$defs/magic_ip-address",
-      "deprecated": true
+      "deprecated": true,
+      "description": "A valid IPv4 address.",
+      "type": "string"
     },
     "dns_servers": {
       "items": {
-        "$ref": "#/$defs/magic_ip-address"
+        "description": "A valid IPv4 address.",
+        "type": "string"
       },
       "type": "array"
     },
@@ -109,8 +105,8 @@ export const magic_lan_static_addressing: JsonSchema = {
   "description": "If the site is not configured in high availability mode, this configuration is optional (if omitted, use DHCP). However, if in high availability mode, static_address is required along with secondary and virtual address.",
   "properties": {
     "address": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     },
     "dhcp_relay": {
       "$ref": "#/$defs/magic_lan_dhcp_relay"
@@ -119,12 +115,12 @@ export const magic_lan_static_addressing: JsonSchema = {
       "$ref": "#/$defs/magic_lan_dhcp_server"
     },
     "secondary_address": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     },
     "virtual_address": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     }
   },
   "required": [
@@ -139,7 +135,7 @@ export const magic_lan_static_addressing: JsonSchema = {
 export const magic_lan_update_request: JsonSchema = {
   "properties": {
     "bond_id": {
-      "$ref": "#/$defs/magic_bond_id"
+      "type": "integer"
     },
     "ha_link": {
       "description": "mark true to use this LAN for HA probing. only works for site with HA turned on. only one LAN can be set as the ha_link.",
@@ -160,7 +156,7 @@ export const magic_lan_update_request: JsonSchema = {
       "$ref": "#/$defs/magic_nat"
     },
     "physport": {
-      "$ref": "#/$defs/magic_port"
+      "type": "integer"
     },
     "remote_subnets": {
       "items": {
@@ -179,8 +175,8 @@ export const magic_lan_update_request: JsonSchema = {
       "description": "If the site is not configured in high availability mode, this configuration is optional (if omitted, use DHCP). However, if in high availability mode, static_address is required along with secondary and virtual address."
     },
     "vlan_tag": {
-      "$ref": "#/$defs/magic_vlan_tag",
-      "description": "VLAN ID. Use zero for untagged."
+      "description": "VLAN ID. Use zero for untagged.",
+      "type": "integer"
     }
   },
   "type": "object"
@@ -192,7 +188,7 @@ export const magic_lan_update_request: JsonSchema = {
 export const magic_lans_add_single_request: JsonSchema = {
   "properties": {
     "bond_id": {
-      "$ref": "#/$defs/magic_bond_id"
+      "type": "integer"
     },
     "ha_link": {
       "description": "mark true to use this LAN for HA probing. only works for site with HA turned on. only one LAN can be set as the ha_link.",
@@ -213,7 +209,7 @@ export const magic_lans_add_single_request: JsonSchema = {
       "$ref": "#/$defs/magic_nat"
     },
     "physport": {
-      "$ref": "#/$defs/magic_port"
+      "type": "integer"
     },
     "remote_subnets": {
       "items": {
@@ -232,8 +228,8 @@ export const magic_lans_add_single_request: JsonSchema = {
       "description": "If the site is not configured in high availability mode, this configuration is optional (if omitted, use DHCP). However, if in high availability mode, static_address is required along with secondary and virtual address."
     },
     "vlan_tag": {
-      "$ref": "#/$defs/magic_vlan_tag",
-      "description": "VLAN ID. Use zero for untagged."
+      "description": "VLAN ID. Use zero for untagged.",
+      "type": "integer"
     }
   },
   "type": "object"
@@ -245,8 +241,8 @@ export const magic_lans_add_single_request: JsonSchema = {
 export const magic_nat: JsonSchema = {
   "properties": {
     "static_prefix": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -259,12 +255,12 @@ export const magic_remote_subnet: JsonSchema = {
   "description": "A remote subnet reachable through Cloudflare that is addressed from this LAN by a local alias prefix of the same size. The local alias prefix must not overlap other subnets on the LAN, and the remote prefix must not overlap other remote prefixes on the LAN.",
   "properties": {
     "local_alias_prefix": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     },
     "remote_prefix": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     }
   },
   "required": [
@@ -283,12 +279,12 @@ export const magic_routed_subnet: JsonSchema = {
       "$ref": "#/$defs/magic_nat"
     },
     "next_hop": {
-      "$ref": "#/$defs/magic_ip-address",
-      "description": "A valid IPv4 address."
+      "description": "A valid IPv4 address.",
+      "type": "string"
     },
     "prefix": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/magicTransit/sites/lans/tools.ts b/src/generated/forge-mcp/magicTransit/sites/lans/tools.ts
index 2ccef1288..53ef538da 100644
--- a/src/generated/forge-mcp/magicTransit/sites/lans/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/lans/tools.ts
@@ -3,114 +3,101 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_cidr_output,
-  magic_identifier_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../../outputs.js";
-import { magic_cidr, magic_identifier } from "../../schemas.js";
 import {
-  magic_ip_address_output,
-  magic_port_output,
-  magic_vlan_tag_output,
-} from "../outputs.js";
-import { magic_ip_address, magic_port, magic_vlan_tag } from "../schemas.js";
-import {
-  magic_bond_id_output,
-  magic_dhcp_option_output,
-  magic_lan_deleted_response_output,
-  magic_lan_dhcp_relay_output,
-  magic_lan_dhcp_server_output,
-  magic_lan_modified_response_output,
-  magic_lan_output,
-  magic_lan_single_response_output,
-  magic_lan_static_addressing_output,
-  magic_lans_collection_response_output,
-  magic_nat_output,
-  magic_remote_subnet_output,
-  magic_routed_subnet_output,
-} from "./outputs.js";
-import {
-  magic_bond_id,
   magic_dhcp_option,
+  magic_lan,
+  magic_lan_deleted_response,
   magic_lan_dhcp_relay,
   magic_lan_dhcp_server,
+  magic_lan_modified_response,
+  magic_lan_single_response,
   magic_lan_static_addressing,
-  magic_lan_update_request,
-  magic_lans_add_single_request,
+  magic_lans_collection_response,
   magic_nat,
   magic_remote_subnet,
   magic_routed_subnet,
+} from "./outputs.js";
+import {
+  magic_dhcp_option as magic_dhcp_option$,
+  magic_lan_dhcp_relay as magic_lan_dhcp_relay$,
+  magic_lan_dhcp_server as magic_lan_dhcp_server$,
+  magic_lan_static_addressing as magic_lan_static_addressing$,
+  magic_lan_update_request,
+  magic_lans_add_single_request,
+  magic_nat as magic_nat$,
+  magic_remote_subnet as magic_remote_subnet$,
+  magic_routed_subnet as magic_routed_subnet$,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.sites.lans`.
+ * The tools of `magicTransit.sites.lans`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_sites_lans_create",
+    name: "magicTransit_sites_lans_create",
     title: "Create a new Site LAN",
-    description: "Creates a new Site LAN. If the site is in high availability mode, static_addressing is required along with secondary and virtual address.",
+    description: "Creates a new Site LAN. If the site is in high availability mode, static_addressing is required along with secondary and virtual address.\n\nPOST /accounts/{account_id}/magic/sites/{site_id}/lans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_lans_add_single_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "magic_dhcp_option": magic_dhcp_option$,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay$,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server$,
+        "magic_lan_static_addressing": magic_lan_static_addressing$,
+        "magic_lans_add_single_request": magic_lans_add_single_request,
+        "magic_nat": magic_nat$,
+        "magic_remote_subnet": magic_remote_subnet$,
+        "magic_routed_subnet": magic_routed_subnet$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/magic_lans_collection_response",
       $defs: {
-        "magic_bond_id": magic_bond_id,
-        "magic_cidr": magic_cidr,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
         "magic_dhcp_option": magic_dhcp_option,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
+        "magic_lan": magic_lan,
         "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
         "magic_lan_dhcp_server": magic_lan_dhcp_server,
         "magic_lan_static_addressing": magic_lan_static_addressing,
-        "magic_lans_add_single_request": magic_lans_add_single_request,
+        "magic_lans_collection_response": magic_lans_collection_response,
+        "magic_messages": magic_messages,
         "magic_nat": magic_nat,
-        "magic_port": magic_port,
         "magic_remote_subnet": magic_remote_subnet,
         "magic_routed_subnet": magic_routed_subnet,
-        "magic_vlan_tag": magic_vlan_tag,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/magic_lans_collection_response",
-      $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_lans_collection_response": magic_lans_collection_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
       },
     },
     annotations: {
@@ -144,25 +131,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_lans_collection_response": magic_lans_collection_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_lans_collection_response": magic_lans_collection_response,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     request: (args) => ({
@@ -171,55 +152,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_lans_delete",
+    name: "magicTransit_sites_lans_delete",
     title: "Delete Site LAN",
-    description: "Remove a specific Site LAN.",
+    description: "Remove a specific Site LAN.\n\nDELETE /accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "lan_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "lan_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "lan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "lan_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_lan_deleted_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_deleted_response": magic_lan_deleted_response_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_deleted_response": magic_lan_deleted_response,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     annotations: {
@@ -258,25 +240,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_deleted_response": magic_lan_deleted_response_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_deleted_response": magic_lan_deleted_response,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     request: (args) => ({
@@ -284,72 +260,70 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_lans_edit",
+    name: "magicTransit_sites_lans_edit",
     title: "Patch Site LAN",
-    description: "Patch a specific Site LAN.",
+    description: "Patch a specific Site LAN.\n\nPATCH /accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_lan_update_request"
         },
-        "lan_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "lan_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "lan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "lan_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "magic_dhcp_option": magic_dhcp_option$,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay$,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server$,
+        "magic_lan_static_addressing": magic_lan_static_addressing$,
+        "magic_lan_update_request": magic_lan_update_request,
+        "magic_nat": magic_nat$,
+        "magic_remote_subnet": magic_remote_subnet$,
+        "magic_routed_subnet": magic_routed_subnet$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/magic_lan_modified_response",
       $defs: {
-        "magic_bond_id": magic_bond_id,
-        "magic_cidr": magic_cidr,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
         "magic_dhcp_option": magic_dhcp_option,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
+        "magic_lan": magic_lan,
         "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
         "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_modified_response": magic_lan_modified_response,
         "magic_lan_static_addressing": magic_lan_static_addressing,
-        "magic_lan_update_request": magic_lan_update_request,
+        "magic_messages": magic_messages,
         "magic_nat": magic_nat,
-        "magic_port": magic_port,
         "magic_remote_subnet": magic_remote_subnet,
         "magic_routed_subnet": magic_routed_subnet,
-        "magic_vlan_tag": magic_vlan_tag,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/magic_lan_modified_response",
-      $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_modified_response": magic_lan_modified_response_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
       },
     },
     annotations: {
@@ -388,25 +362,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_modified_response": magic_lan_modified_response_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_modified_response": magic_lan_modified_response,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     request: (args) => ({
@@ -415,55 +383,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_lans_get",
+    name: "magicTransit_sites_lans_get",
     title: "Site LAN Details",
-    description: "Get a specific Site LAN.",
+    description: "Get a specific Site LAN.\n\nGET /accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "lan_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "lan_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "lan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "lan_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_lan_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_single_response": magic_lan_single_response_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_single_response": magic_lan_single_response,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     annotations: {
@@ -504,25 +473,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_single_response": magic_lan_single_response_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_single_response": magic_lan_single_response,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     request: (args) => ({
@@ -530,50 +493,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_lans_list",
+    name: "magicTransit_sites_lans_list",
     title: "List Site LANs",
-    description: "Lists Site LANs associated with an account.",
+    description: "Lists Site LANs associated with an account.\n\nGET /accounts/{account_id}/magic/sites/{site_id}/lans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_lans_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_lans_collection_response": magic_lans_collection_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_lans_collection_response": magic_lans_collection_response,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     annotations: {
@@ -609,25 +573,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_lans_collection_response": magic_lans_collection_response_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_lans_collection_response": magic_lans_collection_response,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     request: (args) => ({
@@ -635,72 +593,70 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_lans_update",
+    name: "magicTransit_sites_lans_update",
     title: "Update Site LAN",
-    description: "Update a specific Site LAN.",
+    description: "Update a specific Site LAN.\n\nPUT /accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_lan_update_request"
         },
-        "lan_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "lan_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "lan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "lan_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_bond_id": magic_bond_id,
-        "magic_cidr": magic_cidr,
+        "magic_dhcp_option": magic_dhcp_option$,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay$,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server$,
+        "magic_lan_static_addressing": magic_lan_static_addressing$,
+        "magic_lan_update_request": magic_lan_update_request,
+        "magic_nat": magic_nat$,
+        "magic_remote_subnet": magic_remote_subnet$,
+        "magic_routed_subnet": magic_routed_subnet$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/magic_lan_modified_response",
+      $defs: {
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
         "magic_dhcp_option": magic_dhcp_option,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
+        "magic_lan": magic_lan,
         "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
         "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_modified_response": magic_lan_modified_response,
         "magic_lan_static_addressing": magic_lan_static_addressing,
-        "magic_lan_update_request": magic_lan_update_request,
+        "magic_messages": magic_messages,
         "magic_nat": magic_nat,
-        "magic_port": magic_port,
         "magic_remote_subnet": magic_remote_subnet,
         "magic_routed_subnet": magic_routed_subnet,
-        "magic_vlan_tag": magic_vlan_tag,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/magic_lan_modified_response",
-      $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_modified_response": magic_lan_modified_response_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
       },
     },
     annotations: {
@@ -739,25 +695,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_bond_id": magic_bond_id_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_dhcp_option": magic_dhcp_option_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_lan": magic_lan_output,
-        "magic_lan_dhcp_relay": magic_lan_dhcp_relay_output,
-        "magic_lan_dhcp_server": magic_lan_dhcp_server_output,
-        "magic_lan_modified_response": magic_lan_modified_response_output,
-        "magic_lan_static_addressing": magic_lan_static_addressing_output,
-        "magic_messages": magic_messages_output,
-        "magic_nat": magic_nat_output,
-        "magic_port": magic_port_output,
-        "magic_remote_subnet": magic_remote_subnet_output,
-        "magic_routed_subnet": magic_routed_subnet_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_dhcp_option": magic_dhcp_option,
+        "magic_lan": magic_lan,
+        "magic_lan_dhcp_relay": magic_lan_dhcp_relay,
+        "magic_lan_dhcp_server": magic_lan_dhcp_server,
+        "magic_lan_modified_response": magic_lan_modified_response,
+        "magic_lan_static_addressing": magic_lan_static_addressing,
+        "magic_messages": magic_messages,
+        "magic_nat": magic_nat,
+        "magic_remote_subnet": magic_remote_subnet,
+        "magic_routed_subnet": magic_routed_subnet,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/sites/netflowConfig/outputs.ts b/src/generated/forge-mcp/magicTransit/sites/netflowConfig/outputs.ts
index 07b2de33a..886655558 100644
--- a/src/generated/forge-mcp/magicTransit/sites/netflowConfig/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/netflowConfig/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `magic_netflow_config` in responses.
  */
-export const magic_netflow_config_output: JsonSchema = {
+export const magic_netflow_config: JsonSchema = {
   "properties": {
     "active_timeout": {
       "type": "integer"
@@ -33,7 +33,7 @@ export const magic_netflow_config_output: JsonSchema = {
 /**
  * The schema of `magic_netflow_config_single_response` in responses.
  */
-export const magic_netflow_config_single_response_output: JsonSchema = {
+export const magic_netflow_config_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
diff --git a/src/generated/forge-mcp/magicTransit/sites/netflowConfig/tools.ts b/src/generated/forge-mcp/magicTransit/sites/netflowConfig/tools.ts
index 56d6603b5..727df00a1 100644
--- a/src/generated/forge-mcp/magicTransit/sites/netflowConfig/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/netflowConfig/tools.ts
@@ -3,59 +3,67 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../../outputs.js";
-import { magic_identifier } from "../../schemas.js";
 import {
-  magic_netflow_config_output,
-  magic_netflow_config_single_response_output,
+  magic_netflow_config,
+  magic_netflow_config_single_response,
 } from "./outputs.js";
 import { magic_netflow_config_request } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.sites.netflow_config`.
+ * The tools of `magicTransit.sites.netflowConfig`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_sites_netflow_config_create",
+    name: "magicTransit_sites_netflowConfig_create",
     title: "Create NetFlow Configuration",
-    description: "Creates a NetFlow configuration for a site.",
+    description: "Creates a NetFlow configuration for a site.\n\nPOST /accounts/{account_id}/magic/sites/{site_id}/netflow_config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_netflow_config_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_identifier": magic_identifier,
         "magic_netflow_config_request": magic_netflow_config_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_netflow_config_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     annotations: {
@@ -85,12 +93,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     request: (args) => ({
@@ -99,37 +107,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_netflow_config_delete",
+    name: "magicTransit_sites_netflowConfig_delete",
     title: "Delete NetFlow Configuration",
-    description: "Remove NetFlow configuration for a site.",
+    description: "Remove NetFlow configuration for a site.\n\nDELETE /accounts/{account_id}/magic/sites/{site_id}/netflow_config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_netflow_config_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     annotations: {
@@ -163,12 +178,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     request: (args) => ({
@@ -176,42 +191,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_netflow_config_edit",
+    name: "magicTransit_sites_netflowConfig_edit",
     title: "Update NetFlow Configuration",
-    description: "Updates NetFlow configuration for a site.",
+    description: "Updates NetFlow configuration for a site.\n\nPATCH /accounts/{account_id}/magic/sites/{site_id}/netflow_config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_netflow_config_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_identifier": magic_identifier,
         "magic_netflow_config_request": magic_netflow_config_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_netflow_config_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     annotations: {
@@ -245,12 +269,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     request: (args) => ({
@@ -259,37 +283,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_netflow_config_get",
+    name: "magicTransit_sites_netflowConfig_get",
     title: "NetFlow Configuration Details",
-    description: "Get NetFlow configuration for a site.",
+    description: "Get NetFlow configuration for a site.\n\nGET /accounts/{account_id}/magic/sites/{site_id}/netflow_config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_netflow_config_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     annotations: {
@@ -325,12 +356,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     request: (args) => ({
@@ -338,42 +369,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_netflow_config_update",
+    name: "magicTransit_sites_netflowConfig_update",
     title: "Update NetFlow Configuration",
-    description: "Updates NetFlow configuration for a site (partial update).",
+    description: "Updates NetFlow configuration for a site (partial update).\n\nPUT /accounts/{account_id}/magic/sites/{site_id}/netflow_config",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_netflow_config_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_identifier": magic_identifier,
         "magic_netflow_config_request": magic_netflow_config_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_netflow_config_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     annotations: {
@@ -407,12 +447,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_messages": magic_messages_output,
-        "magic_netflow_config": magic_netflow_config_output,
-        "magic_netflow_config_single_response": magic_netflow_config_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_netflow_config": magic_netflow_config,
+        "magic_netflow_config_single_response": magic_netflow_config_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/sites/outputs.ts b/src/generated/forge-mcp/magicTransit/sites/outputs.ts
index 1efa32a6f..dc746523d 100644
--- a/src/generated/forge-mcp/magicTransit/sites/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/outputs.ts
@@ -3,41 +3,13 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_connector-id` in responses.
- */
-export const magic_connector_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_ip-address` in responses.
- */
-export const magic_ip_address_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `magic_port` in responses.
- */
-export const magic_port_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `magic_secondary-connector-id` in responses.
- */
-export const magic_secondary_connector_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_site` in responses.
  */
-export const magic_site_output: JsonSchema = {
+export const magic_site: JsonSchema = {
   "properties": {
     "connector_id": {
-      "$ref": "#/$defs/magic_connector-id"
+      "type": "string"
     },
     "description": {
       "type": "string"
@@ -46,16 +18,16 @@ export const magic_site_output: JsonSchema = {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "location": {
       "$ref": "#/$defs/magic_site-location"
     },
     "name": {
-      "$ref": "#/$defs/magic_site-name"
+      "type": "string"
     },
     "secondary_connector_id": {
-      "$ref": "#/$defs/magic_secondary-connector-id"
+      "type": "string"
     }
   },
   "type": "object"
@@ -64,7 +36,7 @@ export const magic_site_output: JsonSchema = {
 /**
  * The schema of `magic_site-location` in responses.
  */
-export const magic_site_location_output: JsonSchema = {
+export const magic_site$$location: JsonSchema = {
   "properties": {
     "lat": {
       "type": "string"
@@ -76,17 +48,10 @@ export const magic_site_location_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_site-name` in responses.
- */
-export const magic_site_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `magic_site_deleted_response` in responses.
  */
-export const magic_site_deleted_response_output: JsonSchema = {
+export const magic_site_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -105,7 +70,7 @@ export const magic_site_deleted_response_output: JsonSchema = {
 /**
  * The schema of `magic_site_modified_response` in responses.
  */
-export const magic_site_modified_response_output: JsonSchema = {
+export const magic_site_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -124,7 +89,7 @@ export const magic_site_modified_response_output: JsonSchema = {
 /**
  * The schema of `magic_site_single_response` in responses.
  */
-export const magic_site_single_response_output: JsonSchema = {
+export const magic_site_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -143,7 +108,7 @@ export const magic_site_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_sites_collection_response` in responses.
  */
-export const magic_sites_collection_response_output: JsonSchema = {
+export const magic_sites_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -161,10 +126,3 @@ export const magic_sites_collection_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `magic_vlan_tag` in responses.
- */
-export const magic_vlan_tag_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/sites/schemas.ts b/src/generated/forge-mcp/magicTransit/sites/schemas.ts
index 5b1209fae..9e476e96c 100644
--- a/src/generated/forge-mcp/magicTransit/sites/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/schemas.ts
@@ -3,41 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `magic_connector-id`.
- */
-export const magic_connector_id: JsonSchema = {
-  "description": "Magic Connector identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_ip-address`.
- */
-export const magic_ip_address: JsonSchema = {
-  "description": "A valid IPv4 address.",
-  "type": "string"
-};
-
-/**
- * The schema of `magic_port`.
- */
-export const magic_port: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `magic_secondary-connector-id`.
- */
-export const magic_secondary_connector_id: JsonSchema = {
-  "description": "Magic Connector identifier tag. Used when high availability mode is on.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_site-location`.
  */
-export const magic_site_location: JsonSchema = {
+export const magic_site$$location: JsonSchema = {
   "description": "Location of site in latitude and longitude.",
   "properties": {
     "lat": {
@@ -52,22 +21,14 @@ export const magic_site_location: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `magic_site-name`.
- */
-export const magic_site_name: JsonSchema = {
-  "description": "The name of the site.",
-  "type": "string"
-};
-
 /**
  * The schema of `magic_site_update_request`.
  */
 export const magic_site_update_request: JsonSchema = {
   "properties": {
     "connector_id": {
-      "$ref": "#/$defs/magic_connector-id",
-      "description": "Magic Connector identifier tag."
+      "description": "Magic Connector identifier tag.",
+      "type": "string"
     },
     "description": {
       "type": "string"
@@ -81,12 +42,12 @@ export const magic_site_update_request: JsonSchema = {
       "description": "Location of site in latitude and longitude."
     },
     "name": {
-      "$ref": "#/$defs/magic_site-name",
-      "description": "The name of the site."
+      "description": "The name of the site.",
+      "type": "string"
     },
     "secondary_connector_id": {
-      "$ref": "#/$defs/magic_secondary-connector-id",
-      "description": "Magic Connector identifier tag. Used when high availability mode is on."
+      "description": "Magic Connector identifier tag. Used when high availability mode is on.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -98,8 +59,8 @@ export const magic_site_update_request: JsonSchema = {
 export const magic_sites_add_single_request: JsonSchema = {
   "properties": {
     "connector_id": {
-      "$ref": "#/$defs/magic_connector-id",
-      "description": "Magic Connector identifier tag."
+      "description": "Magic Connector identifier tag.",
+      "type": "string"
     },
     "description": {
       "type": "string"
@@ -113,12 +74,12 @@ export const magic_sites_add_single_request: JsonSchema = {
       "description": "Location of site in latitude and longitude."
     },
     "name": {
-      "$ref": "#/$defs/magic_site-name",
-      "description": "The name of the site."
+      "description": "The name of the site.",
+      "type": "string"
     },
     "secondary_connector_id": {
-      "$ref": "#/$defs/magic_secondary-connector-id",
-      "description": "Magic Connector identifier tag. Used when high availability mode is on."
+      "description": "Magic Connector identifier tag. Used when high availability mode is on.",
+      "type": "string"
     }
   },
   "required": [
@@ -126,11 +87,3 @@ export const magic_sites_add_single_request: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `magic_vlan_tag`.
- */
-export const magic_vlan_tag: JsonSchema = {
-  "description": "VLAN ID. Use zero for untagged.",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/magicTransit/sites/tools.ts b/src/generated/forge-mcp/magicTransit/sites/tools.ts
index c97f08b96..236caaf41 100644
--- a/src/generated/forge-mcp/magicTransit/sites/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/tools.ts
@@ -1,80 +1,74 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_identifier_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../outputs.js";
-import { magic_identifier } from "../schemas.js";
 import {
-  magic_connector_id_output,
-  magic_secondary_connector_id_output,
-  magic_site_deleted_response_output,
-  magic_site_location_output,
-  magic_site_modified_response_output,
-  magic_site_name_output,
-  magic_site_output,
-  magic_site_single_response_output,
-  magic_sites_collection_response_output,
+  magic_site,
+  magic_site$$location,
+  magic_site_deleted_response,
+  magic_site_modified_response,
+  magic_site_single_response,
+  magic_sites_collection_response,
 } from "./outputs.js";
 import {
-  magic_connector_id,
-  magic_secondary_connector_id,
-  magic_site_location,
-  magic_site_name,
+  magic_site$$location as magic_site$$location$,
   magic_site_update_request,
   magic_sites_add_single_request,
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.sites`.
+ * The tools of `magicTransit.sites`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_sites_create",
+    name: "magicTransit_sites_create",
     title: "Create a new Site",
-    description: "Creates a new Site",
+    description: "Creates a new Site\n\nPOST /accounts/{account_id}/magic/sites",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_sites_add_single_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_connector-id": magic_connector_id,
-        "magic_identifier": magic_identifier,
-        "magic_secondary-connector-id": magic_secondary_connector_id,
-        "magic_site-location": magic_site_location,
-        "magic_site-name": magic_site_name,
+        "magic_site-location": magic_site$$location$,
         "magic_sites_add_single_request": magic_sites_add_single_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_site_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_single_response": magic_site_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_single_response": magic_site_single_response,
       },
     },
     annotations: {
@@ -108,17 +102,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_single_response": magic_site_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_single_response": magic_site_single_response,
       },
     },
     request: (args) => ({
@@ -127,42 +117,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_delete",
+    name: "magicTransit_sites_delete",
     title: "Delete Site",
-    description: "Remove a specific Site.",
+    description: "Remove a specific Site.\n\nDELETE /accounts/{account_id}/magic/sites/{site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_site_deleted_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_deleted_response": magic_site_deleted_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_deleted_response": magic_site_deleted_response,
       },
     },
     annotations: {
@@ -201,17 +194,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_deleted_response": magic_site_deleted_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_deleted_response": magic_site_deleted_response,
       },
     },
     request: (args) => ({
@@ -219,51 +208,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_edit",
+    name: "magicTransit_sites_edit",
     title: "Patch Site",
-    description: "Patch a specific Site.",
+    description: "Patch a specific Site.\n\nPATCH /accounts/{account_id}/magic/sites/{site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_site_update_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_connector-id": magic_connector_id,
-        "magic_identifier": magic_identifier,
-        "magic_secondary-connector-id": magic_secondary_connector_id,
-        "magic_site-location": magic_site_location,
-        "magic_site-name": magic_site_name,
+        "magic_site-location": magic_site$$location$,
         "magic_site_update_request": magic_site_update_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_site_modified_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_modified_response": magic_site_modified_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_modified_response": magic_site_modified_response,
       },
     },
     annotations: {
@@ -302,17 +293,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_modified_response": magic_site_modified_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_modified_response": magic_site_modified_response,
       },
     },
     request: (args) => ({
@@ -321,46 +308,55 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_get",
+    name: "magicTransit_sites_get",
     title: "Site Details",
-    description: "Get a specific Site.",
+    description: "Get a specific Site.\n\nGET /accounts/{account_id}/magic/sites/{site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "x-magic-new-hc-target": {
+              "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "x_magic_new_hc_target": {
-          "description": "If true, the health check target in the response body will be presented using the new object format. Defaults to false.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_site_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_single_response": magic_site_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_single_response": magic_site_single_response,
       },
     },
     annotations: {
@@ -401,62 +397,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_single_response": magic_site_single_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_single_response": magic_site_single_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/sites/${pathParam(args, "site_id")}`,
       headers: [
-        ["x-magic-new-hc-target", args["x_magic_new_hc_target"]],
+        ["x-magic-new-hc-target", param(args, "headers", "x-magic-new-hc-target")],
       ],
     }),
   },
   {
-    name: "magic_transit_sites_list",
+    name: "magicTransit_sites_list",
     title: "List Sites",
-    description: "Lists Sites associated with an account. Use connectorid query param to return sites where connectorid matches either site.ConnectorID or site.SecondaryConnectorID.",
+    description: "Lists Sites associated with an account. Use connectorid query param to return sites where connectorid matches either site.ConnectorID or site.SecondaryConnectorID.\n\nGET /accounts/{account_id}/magic/sites",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "connectorid": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "connectorid": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_sites_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_sites_collection_response": magic_sites_collection_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_sites_collection_response": magic_sites_collection_response,
       },
     },
     annotations: {
@@ -492,72 +493,70 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_sites_collection_response": magic_sites_collection_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_sites_collection_response": magic_sites_collection_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/magic/sites`,
       query: [
-        ["connectorid", args["connectorid"], true],
+        ["connectorid", param(args, "query", "connectorid"), true],
       ],
     }),
   },
   {
-    name: "magic_transit_sites_update",
+    name: "magicTransit_sites_update",
     title: "Update Site",
-    description: "Update a specific Site.",
+    description: "Update a specific Site.\n\nPUT /accounts/{account_id}/magic/sites/{site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_site_update_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_connector-id": magic_connector_id,
-        "magic_identifier": magic_identifier,
-        "magic_secondary-connector-id": magic_secondary_connector_id,
-        "magic_site-location": magic_site_location,
-        "magic_site-name": magic_site_name,
+        "magic_site-location": magic_site$$location$,
         "magic_site_update_request": magic_site_update_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/magic_site_modified_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_modified_response": magic_site_modified_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_modified_response": magic_site_modified_response,
       },
     },
     annotations: {
@@ -596,17 +595,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_connector-id": magic_connector_id_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_messages": magic_messages_output,
-        "magic_secondary-connector-id": magic_secondary_connector_id_output,
-        "magic_site": magic_site_output,
-        "magic_site-location": magic_site_location_output,
-        "magic_site-name": magic_site_name_output,
-        "magic_site_modified_response": magic_site_modified_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_site": magic_site,
+        "magic_site-location": magic_site$$location,
+        "magic_site_modified_response": magic_site_modified_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/magicTransit/sites/wans/outputs.ts b/src/generated/forge-mcp/magicTransit/sites/wans/outputs.ts
index 8ac81d1dc..ef0f5cb0d 100644
--- a/src/generated/forge-mcp/magicTransit/sites/wans/outputs.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/wans/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `magic_wan` in responses.
  */
-export const magic_wan_output: JsonSchema = {
+export const magic_wan: JsonSchema = {
   "properties": {
     "health_check_rate": {
       "enum": [
@@ -17,7 +17,7 @@ export const magic_wan_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "load_balance_inner_flows": {
       "type": "boolean"
@@ -26,7 +26,7 @@ export const magic_wan_output: JsonSchema = {
       "type": "string"
     },
     "physport": {
-      "$ref": "#/$defs/magic_port"
+      "type": "integer"
     },
     "priority": {
       "type": "integer"
@@ -38,13 +38,13 @@ export const magic_wan_output: JsonSchema = {
       "type": "integer"
     },
     "site_id": {
-      "$ref": "#/$defs/magic_identifier"
+      "type": "string"
     },
     "static_addressing": {
       "$ref": "#/$defs/magic_wan_static_addressing"
     },
     "vlan_tag": {
-      "$ref": "#/$defs/magic_vlan_tag"
+      "type": "integer"
     }
   },
   "type": "object"
@@ -53,7 +53,7 @@ export const magic_wan_output: JsonSchema = {
 /**
  * The schema of `magic_wan_deleted_response` in responses.
  */
-export const magic_wan_deleted_response_output: JsonSchema = {
+export const magic_wan_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -72,7 +72,7 @@ export const magic_wan_deleted_response_output: JsonSchema = {
 /**
  * The schema of `magic_wan_modified_response` in responses.
  */
-export const magic_wan_modified_response_output: JsonSchema = {
+export const magic_wan_modified_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -91,7 +91,7 @@ export const magic_wan_modified_response_output: JsonSchema = {
 /**
  * The schema of `magic_wan_single_response` in responses.
  */
-export const magic_wan_single_response_output: JsonSchema = {
+export const magic_wan_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
@@ -110,16 +110,16 @@ export const magic_wan_single_response_output: JsonSchema = {
 /**
  * The schema of `magic_wan_static_addressing` in responses.
  */
-export const magic_wan_static_addressing_output: JsonSchema = {
+export const magic_wan_static_addressing: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     },
     "gateway_address": {
-      "$ref": "#/$defs/magic_ip-address"
+      "type": "string"
     },
     "secondary_address": {
-      "$ref": "#/$defs/magic_cidr"
+      "type": "string"
     },
     "secondary_gateway_address": {
       "type": "string"
@@ -135,7 +135,7 @@ export const magic_wan_static_addressing_output: JsonSchema = {
 /**
  * The schema of `magic_wans_collection_response` in responses.
  */
-export const magic_wans_collection_response_output: JsonSchema = {
+export const magic_wans_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/magic_api-response-single"
diff --git a/src/generated/forge-mcp/magicTransit/sites/wans/schemas.ts b/src/generated/forge-mcp/magicTransit/sites/wans/schemas.ts
index 8cb00b5a8..ba3a97938 100644
--- a/src/generated/forge-mcp/magicTransit/sites/wans/schemas.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/wans/schemas.ts
@@ -10,16 +10,16 @@ export const magic_wan_static_addressing_create_request: JsonSchema = {
   "description": "Static addressing configuration for a WAN. Omit to use DHCP. Submit secondary_address when the site is in high availability mode.",
   "properties": {
     "address": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     },
     "gateway_address": {
-      "$ref": "#/$defs/magic_ip-address",
-      "description": "A valid IPv4 address."
+      "description": "A valid IPv4 address.",
+      "type": "string"
     },
     "secondary_address": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     },
     "secondary_gateway_address": {
       "description": "Gateway address for the secondary connector of a high availability site.",
@@ -40,16 +40,16 @@ export const magic_wan_static_addressing_update: JsonSchema = {
   "description": "Static addressing configuration. PATCH updates only the fields provided, and PUT replaces the configuration.",
   "properties": {
     "address": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     },
     "gateway_address": {
-      "$ref": "#/$defs/magic_ip-address",
-      "description": "A valid IPv4 address."
+      "description": "A valid IPv4 address.",
+      "type": "string"
     },
     "secondary_address": {
-      "$ref": "#/$defs/magic_cidr",
-      "description": "A valid CIDR notation representing an IP range."
+      "description": "A valid CIDR notation representing an IP range.",
+      "type": "string"
     },
     "secondary_gateway_address": {
       "description": "Gateway address for the secondary connector of a high availability site. Set to null to remove it.",
@@ -94,7 +94,7 @@ export const magic_wan_update_request: JsonSchema = {
       "type": "string"
     },
     "physport": {
-      "$ref": "#/$defs/magic_port"
+      "type": "integer"
     },
     "priority": {
       "type": "integer"
@@ -126,8 +126,8 @@ export const magic_wan_update_request: JsonSchema = {
       "description": "Static addressing configuration. PATCH updates only the fields provided, and PUT replaces the configuration."
     },
     "vlan_tag": {
-      "$ref": "#/$defs/magic_vlan_tag",
-      "description": "VLAN ID. Use zero for untagged."
+      "description": "VLAN ID. Use zero for untagged.",
+      "type": "integer"
     }
   },
   "type": "object"
@@ -156,7 +156,7 @@ export const magic_wans_add_single_request: JsonSchema = {
       "type": "string"
     },
     "physport": {
-      "$ref": "#/$defs/magic_port"
+      "type": "integer"
     },
     "priority": {
       "type": "integer"
@@ -174,8 +174,8 @@ export const magic_wans_add_single_request: JsonSchema = {
       "description": "Static addressing configuration for a WAN. Omit to use DHCP. Submit secondary_address when the site is in high availability mode."
     },
     "vlan_tag": {
-      "$ref": "#/$defs/magic_vlan_tag",
-      "description": "VLAN ID. Use zero for untagged."
+      "description": "VLAN ID. Use zero for untagged.",
+      "type": "integer"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/magicTransit/sites/wans/tools.ts b/src/generated/forge-mcp/magicTransit/sites/wans/tools.ts
index f9b47705e..d605b1231 100644
--- a/src/generated/forge-mcp/magicTransit/sites/wans/tools.ts
+++ b/src/generated/forge-mcp/magicTransit/sites/wans/tools.ts
@@ -3,27 +3,18 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  magic_api_response_common_failure_output,
-  magic_api_response_common_output,
-  magic_api_response_single_output,
-  magic_cidr_output,
-  magic_identifier_output,
-  magic_messages_output,
+  magic_api$$response$$common,
+  magic_api$$response$$common$$failure,
+  magic_api$$response$$single,
+  magic_messages,
 } from "../../outputs.js";
-import { magic_cidr, magic_identifier } from "../../schemas.js";
 import {
-  magic_ip_address_output,
-  magic_port_output,
-  magic_vlan_tag_output,
-} from "../outputs.js";
-import { magic_ip_address, magic_port, magic_vlan_tag } from "../schemas.js";
-import {
-  magic_wan_deleted_response_output,
-  magic_wan_modified_response_output,
-  magic_wan_output,
-  magic_wan_single_response_output,
-  magic_wan_static_addressing_output,
-  magic_wans_collection_response_output,
+  magic_wan,
+  magic_wan_deleted_response,
+  magic_wan_modified_response,
+  magic_wan_single_response,
+  magic_wan_static_addressing,
+  magic_wans_collection_response,
 } from "./outputs.js";
 import {
   magic_wan_static_addressing_create_request,
@@ -33,39 +24,44 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `magic_transit.sites.wans`.
+ * The tools of `magicTransit.sites.wans`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "magic_transit_sites_wans_create",
+    name: "magicTransit_sites_wans_create",
     title: "Create a new Site WAN",
-    description: "Creates a new Site WAN.",
+    description: "Creates a new Site WAN.\n\nPOST /accounts/{account_id}/magic/sites/{site_id}/wans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_wans_add_single_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_cidr": magic_cidr,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
-        "magic_port": magic_port,
-        "magic_vlan_tag": magic_vlan_tag,
         "magic_wan_static_addressing_create_request": magic_wan_static_addressing_create_request,
         "magic_wans_add_single_request": magic_wans_add_single_request,
       },
@@ -73,17 +69,12 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/magic_wans_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
-        "magic_wans_collection_response": magic_wans_collection_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
+        "magic_wans_collection_response": magic_wans_collection_response,
       },
     },
     annotations: {
@@ -117,18 +108,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
-        "magic_wans_collection_response": magic_wans_collection_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
+        "magic_wans_collection_response": magic_wans_collection_response,
       },
     },
     request: (args) => ({
@@ -137,48 +123,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_wans_delete",
+    name: "magicTransit_sites_wans_delete",
     title: "Delete Site WAN",
-    description: "Remove a specific Site WAN.",
+    description: "Remove a specific Site WAN.\n\nDELETE /accounts/{account_id}/magic/sites/{site_id}/wans/{wan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "wan_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "wan_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "wan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "wan_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_wan_deleted_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_deleted_response": magic_wan_deleted_response_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_deleted_response": magic_wan_deleted_response,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
       },
     },
     annotations: {
@@ -217,18 +205,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_deleted_response": magic_wan_deleted_response_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_deleted_response": magic_wan_deleted_response,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
       },
     },
     request: (args) => ({
@@ -236,40 +219,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_wans_edit",
+    name: "magicTransit_sites_wans_edit",
     title: "Patch Site WAN",
-    description: "Patch a specific Site WAN.",
+    description: "Patch a specific Site WAN.\n\nPATCH /accounts/{account_id}/magic/sites/{site_id}/wans/{wan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_wan_update_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "wan_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "wan_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "wan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "wan_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_cidr": magic_cidr,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
-        "magic_port": magic_port,
-        "magic_vlan_tag": magic_vlan_tag,
         "magic_wan_static_addressing_update": magic_wan_static_addressing_update,
         "magic_wan_update_request": magic_wan_update_request,
       },
@@ -277,17 +265,12 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/magic_wan_modified_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_modified_response": magic_wan_modified_response_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_modified_response": magic_wan_modified_response,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
       },
     },
     annotations: {
@@ -326,18 +309,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_modified_response": magic_wan_modified_response_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_modified_response": magic_wan_modified_response,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
       },
     },
     request: (args) => ({
@@ -346,48 +324,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_wans_get",
+    name: "magicTransit_sites_wans_get",
     title: "Site WAN Details",
-    description: "Get a specific Site WAN.",
+    description: "Get a specific Site WAN.\n\nGET /accounts/{account_id}/magic/sites/{site_id}/wans/{wan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "wan_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "wan_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "wan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "wan_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_wan_single_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_single_response": magic_wan_single_response_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_single_response": magic_wan_single_response,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
       },
     },
     annotations: {
@@ -428,18 +408,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_single_response": magic_wan_single_response_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_single_response": magic_wan_single_response,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
       },
     },
     request: (args) => ({
@@ -447,43 +422,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_wans_list",
+    name: "magicTransit_sites_wans_list",
     title: "List Site WANs",
-    description: "Lists Site WANs associated with an account.",
+    description: "Lists Site WANs associated with an account.\n\nGET /accounts/{account_id}/magic/sites/{site_id}/wans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "magic_identifier": magic_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/magic_wans_collection_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
-        "magic_wans_collection_response": magic_wans_collection_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
+        "magic_wans_collection_response": magic_wans_collection_response,
       },
     },
     annotations: {
@@ -519,18 +496,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
-        "magic_wans_collection_response": magic_wans_collection_response_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
+        "magic_wans_collection_response": magic_wans_collection_response,
       },
     },
     request: (args) => ({
@@ -538,40 +510,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "magic_transit_sites_wans_update",
+    name: "magicTransit_sites_wans_update",
     title: "Update Site WAN",
-    description: "Update a specific Site WAN.",
+    description: "Update a specific Site WAN.\n\nPUT /accounts/{account_id}/magic/sites/{site_id}/wans/{wan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/magic_wan_update_request"
         },
-        "site_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
-        },
-        "wan_id": {
-          "$ref": "#/$defs/magic_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "wan_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id",
+            "wan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
-        "wan_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "magic_cidr": magic_cidr,
-        "magic_identifier": magic_identifier,
-        "magic_ip-address": magic_ip_address,
-        "magic_port": magic_port,
-        "magic_vlan_tag": magic_vlan_tag,
         "magic_wan_static_addressing_update": magic_wan_static_addressing_update,
         "magic_wan_update_request": magic_wan_update_request,
       },
@@ -579,17 +556,12 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/magic_wan_modified_response",
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_modified_response": magic_wan_modified_response_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_modified_response": magic_wan_modified_response,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
       },
     },
     annotations: {
@@ -628,18 +600,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "magic_api-response-common": magic_api_response_common_output,
-        "magic_api-response-common-failure": magic_api_response_common_failure_output,
-        "magic_api-response-single": magic_api_response_single_output,
-        "magic_cidr": magic_cidr_output,
-        "magic_identifier": magic_identifier_output,
-        "magic_ip-address": magic_ip_address_output,
-        "magic_messages": magic_messages_output,
-        "magic_port": magic_port_output,
-        "magic_vlan_tag": magic_vlan_tag_output,
-        "magic_wan": magic_wan_output,
-        "magic_wan_modified_response": magic_wan_modified_response_output,
-        "magic_wan_static_addressing": magic_wan_static_addressing_output,
+        "magic_api-response-common": magic_api$$response$$common,
+        "magic_api-response-common-failure": magic_api$$response$$common$$failure,
+        "magic_api-response-single": magic_api$$response$$single,
+        "magic_messages": magic_messages,
+        "magic_wan": magic_wan,
+        "magic_wan_modified_response": magic_wan_modified_response,
+        "magic_wan_static_addressing": magic_wan_static_addressing,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/outputs.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/outputs.ts
index c83bef665..495cd56c2 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/outputs.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * `managed-defense-vulnerability-discovery_CuratedReportPublication` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_CuratedReportPublication_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_CuratedReportPublication: JsonSchema = {
   "properties": {
     "published_at": {
       "format": "date-time",
@@ -34,7 +34,7 @@ export const managed_defense_vulnerability_discovery_CuratedReportPublication_ou
  * The schema of `managed-defense-vulnerability-discovery_FailureResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_FailureResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_FailureResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -71,7 +71,7 @@ export const managed_defense_vulnerability_discovery_FailureResponse_output: Jso
 /**
  * The schema of `managed-defense-vulnerability-discovery_Message` in responses.
  */
-export const managed_defense_vulnerability_discovery_Message_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_Message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -91,7 +91,7 @@ export const managed_defense_vulnerability_discovery_Message_output: JsonSchema
  * The schema of `managed-defense-vulnerability-discovery_PaginatedResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_PaginatedResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_PaginatedResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_SuccessResponse"
@@ -114,7 +114,7 @@ export const managed_defense_vulnerability_discovery_PaginatedResponse_output: J
  * The schema of `managed-defense-vulnerability-discovery_ReportErrorPath` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportErrorPath_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportErrorPath: JsonSchema = {
   "properties": {
     "hits": {
       "type": "number"
@@ -146,7 +146,7 @@ export const managed_defense_vulnerability_discovery_ReportErrorPath_output: Jso
  * The schema of `managed-defense-vulnerability-discovery_ReportExternalLink` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportExternalLink_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportExternalLink: JsonSchema = {
   "properties": {
     "title": {
       "type": "string"
@@ -166,7 +166,7 @@ export const managed_defense_vulnerability_discovery_ReportExternalLink_output:
  * The schema of `managed-defense-vulnerability-discovery_ReportFinding` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportFinding_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportFinding: JsonSchema = {
   "properties": {
     "attacker_position": {
       "oneOf": [
@@ -398,7 +398,7 @@ export const managed_defense_vulnerability_discovery_ReportFinding_output: JsonS
  * The schema of `managed-defense-vulnerability-discovery_ReportHotPath` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportHotPath_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportHotPath: JsonSchema = {
   "properties": {
     "hits": {
       "type": "number"
@@ -430,7 +430,7 @@ export const managed_defense_vulnerability_discovery_ReportHotPath_output: JsonS
  * The schema of `managed-defense-vulnerability-discovery_ReportObservedPath` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportObservedPath_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportObservedPath: JsonSchema = {
   "properties": {
     "hit_volume": {
       "type": "number"
@@ -458,7 +458,7 @@ export const managed_defense_vulnerability_discovery_ReportObservedPath_output:
  * The schema of `managed-defense-vulnerability-discovery_ReportObservedWafRule`
  * in responses.
  */
-export const managed_defense_vulnerability_discovery_ReportObservedWafRule_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportObservedWafRule: JsonSchema = {
   "properties": {
     "hit_volume": {
       "type": "number"
@@ -500,7 +500,7 @@ export const managed_defense_vulnerability_discovery_ReportObservedWafRule_outpu
  * The schema of `managed-defense-vulnerability-discovery_ReportReachability` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportReachability_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportReachability: JsonSchema = {
   "properties": {
     "consumer": {
       "type": "string"
@@ -524,7 +524,7 @@ export const managed_defense_vulnerability_discovery_ReportReachability_output:
  * The schema of `managed-defense-vulnerability-discovery_ReportTelemetryTarget`
  * in responses.
  */
-export const managed_defense_vulnerability_discovery_ReportTelemetryTarget_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportTelemetryTarget: JsonSchema = {
   "properties": {
     "hosts": {
       "items": {
@@ -554,7 +554,7 @@ export const managed_defense_vulnerability_discovery_ReportTelemetryTarget_outpu
  * The schema of `managed-defense-vulnerability-discovery_ReportTraceStep` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportTraceStep_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportTraceStep: JsonSchema = {
   "properties": {
     "line": {
       "type": "integer"
@@ -586,7 +586,7 @@ export const managed_defense_vulnerability_discovery_ReportTraceStep_output: Jso
  * The schema of `managed-defense-vulnerability-discovery_ReportTrafficContext`
  * in responses.
  */
-export const managed_defense_vulnerability_discovery_ReportTrafficContext_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportTrafficContext: JsonSchema = {
   "properties": {
     "http": {
       "oneOf": [
@@ -727,7 +727,7 @@ export const managed_defense_vulnerability_discovery_ReportTrafficContext_output
  * The schema of `managed-defense-vulnerability-discovery_ReportWafRule` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportWafRule_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportWafRule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -778,7 +778,7 @@ export const managed_defense_vulnerability_discovery_ReportWafRule_output: JsonS
  * The schema of `managed-defense-vulnerability-discovery_ReportWafRules` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportWafRules_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportWafRules: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -820,7 +820,7 @@ export const managed_defense_vulnerability_discovery_ReportWafRules_output: Json
  * `managed-defense-vulnerability-discovery_ReportWebAssetsOperation` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportWebAssetsOperation_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportWebAssetsOperation: JsonSchema = {
   "properties": {
     "endpoint": {
       "type": "string"
@@ -858,7 +858,7 @@ export const managed_defense_vulnerability_discovery_ReportWebAssetsOperation_ou
  * The schema of `managed-defense-vulnerability-discovery_ReportWebAssetsPath`
  * in responses.
  */
-export const managed_defense_vulnerability_discovery_ReportWebAssetsPath_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportWebAssetsPath: JsonSchema = {
   "properties": {
     "avg_origin_latency_ms": {
       "oneOf": [
@@ -902,7 +902,7 @@ export const managed_defense_vulnerability_discovery_ReportWebAssetsPath_output:
  * `managed-defense-vulnerability-discovery_ReportWebAssetsPerformance` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportWebAssetsPerformance_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportWebAssetsPerformance: JsonSchema = {
   "properties": {
     "avg_origin_latency_ms": {
       "oneOf": [
@@ -933,7 +933,7 @@ export const managed_defense_vulnerability_discovery_ReportWebAssetsPerformance_
  * The schema of `managed-defense-vulnerability-discovery_ReportWebAssetsRisk`
  * in responses.
  */
-export const managed_defense_vulnerability_discovery_ReportWebAssetsRisk_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportWebAssetsRisk: JsonSchema = {
   "properties": {
     "description": {
       "oneOf": [
@@ -960,7 +960,7 @@ export const managed_defense_vulnerability_discovery_ReportWebAssetsRisk_output:
  * The schema of `managed-defense-vulnerability-discovery_RepositoryReport` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_RepositoryReport_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_RepositoryReport: JsonSchema = {
   "properties": {
     "external_links": {
       "items": {
@@ -1022,7 +1022,7 @@ export const managed_defense_vulnerability_discovery_RepositoryReport_output: Js
  * The schema of `managed-defense-vulnerability-discovery_ResultInfo` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ResultInfo_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -1045,7 +1045,7 @@ export const managed_defense_vulnerability_discovery_ResultInfo_output: JsonSche
 /**
  * The schema of `managed-defense-vulnerability-discovery_Scan` in responses.
  */
-export const managed_defense_vulnerability_discovery_Scan_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_Scan: JsonSchema = {
   "properties": {
     "completed_at": {
       "oneOf": [
@@ -1143,7 +1143,7 @@ export const managed_defense_vulnerability_discovery_Scan_output: JsonSchema = {
  * The schema of `managed-defense-vulnerability-discovery_ScanRepository` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ScanRepository_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ScanRepository: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -1205,7 +1205,7 @@ export const managed_defense_vulnerability_discovery_ScanRepository_output: Json
  * The schema of `managed-defense-vulnerability-discovery_SuccessResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_SuccessResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_SuccessResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -1238,7 +1238,7 @@ export const managed_defense_vulnerability_discovery_SuccessResponse_output: Jso
  * The schema of `managed-defense-vulnerability-discovery_TelemetryWindow` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_TelemetryWindow_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_TelemetryWindow: JsonSchema = {
   "properties": {
     "end": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/reports/outputs.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/reports/outputs.ts
index 67c488437..23f072d5b 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/reports/outputs.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/reports/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `managed-defense-vulnerability-discovery_CuratedReportResponse`
  * in responses.
  */
-export const managed_defense_vulnerability_discovery_CuratedReportResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_CuratedReportResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_SuccessResponse"
@@ -30,7 +30,7 @@ export const managed_defense_vulnerability_discovery_CuratedReportResponse_outpu
  * The schema of `managed-defense-vulnerability-discovery_CuratedReportResult`
  * in responses.
  */
-export const managed_defense_vulnerability_discovery_CuratedReportResult_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_CuratedReportResult: JsonSchema = {
   "properties": {
     "publication": {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_CuratedReportPublication"
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/reports/tools.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/reports/tools.ts
index 57b27e790..172f36927 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/reports/tools.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/reports/tools.ts
@@ -3,89 +3,99 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  managed_defense_vulnerability_discovery_CuratedReportPublication_output,
-  managed_defense_vulnerability_discovery_FailureResponse_output,
-  managed_defense_vulnerability_discovery_Message_output,
-  managed_defense_vulnerability_discovery_ReportErrorPath_output,
-  managed_defense_vulnerability_discovery_ReportExternalLink_output,
-  managed_defense_vulnerability_discovery_ReportFinding_output,
-  managed_defense_vulnerability_discovery_ReportHotPath_output,
-  managed_defense_vulnerability_discovery_ReportObservedPath_output,
-  managed_defense_vulnerability_discovery_ReportObservedWafRule_output,
-  managed_defense_vulnerability_discovery_ReportReachability_output,
-  managed_defense_vulnerability_discovery_ReportTelemetryTarget_output,
-  managed_defense_vulnerability_discovery_ReportTraceStep_output,
-  managed_defense_vulnerability_discovery_ReportTrafficContext_output,
-  managed_defense_vulnerability_discovery_ReportWafRule_output,
-  managed_defense_vulnerability_discovery_ReportWafRules_output,
-  managed_defense_vulnerability_discovery_ReportWebAssetsOperation_output,
-  managed_defense_vulnerability_discovery_ReportWebAssetsPath_output,
-  managed_defense_vulnerability_discovery_ReportWebAssetsPerformance_output,
-  managed_defense_vulnerability_discovery_ReportWebAssetsRisk_output,
-  managed_defense_vulnerability_discovery_RepositoryReport_output,
-  managed_defense_vulnerability_discovery_SuccessResponse_output,
-  managed_defense_vulnerability_discovery_TelemetryWindow_output,
+  managed$$defense$$vulnerability$$discovery_CuratedReportPublication,
+  managed$$defense$$vulnerability$$discovery_FailureResponse,
+  managed$$defense$$vulnerability$$discovery_Message,
+  managed$$defense$$vulnerability$$discovery_ReportErrorPath,
+  managed$$defense$$vulnerability$$discovery_ReportExternalLink,
+  managed$$defense$$vulnerability$$discovery_ReportFinding,
+  managed$$defense$$vulnerability$$discovery_ReportHotPath,
+  managed$$defense$$vulnerability$$discovery_ReportObservedPath,
+  managed$$defense$$vulnerability$$discovery_ReportObservedWafRule,
+  managed$$defense$$vulnerability$$discovery_ReportReachability,
+  managed$$defense$$vulnerability$$discovery_ReportTelemetryTarget,
+  managed$$defense$$vulnerability$$discovery_ReportTraceStep,
+  managed$$defense$$vulnerability$$discovery_ReportTrafficContext,
+  managed$$defense$$vulnerability$$discovery_ReportWafRule,
+  managed$$defense$$vulnerability$$discovery_ReportWafRules,
+  managed$$defense$$vulnerability$$discovery_ReportWebAssetsOperation,
+  managed$$defense$$vulnerability$$discovery_ReportWebAssetsPath,
+  managed$$defense$$vulnerability$$discovery_ReportWebAssetsPerformance,
+  managed$$defense$$vulnerability$$discovery_ReportWebAssetsRisk,
+  managed$$defense$$vulnerability$$discovery_RepositoryReport,
+  managed$$defense$$vulnerability$$discovery_SuccessResponse,
+  managed$$defense$$vulnerability$$discovery_TelemetryWindow,
 } from "../outputs.js";
 import {
-  managed_defense_vulnerability_discovery_CuratedReportResponse_output,
-  managed_defense_vulnerability_discovery_CuratedReportResult_output,
+  managed$$defense$$vulnerability$$discovery_CuratedReportResponse,
+  managed$$defense$$vulnerability$$discovery_CuratedReportResult,
 } from "./outputs.js";
 
 /**
- * The tools of `managed_defense.vulnerability_discovery.reports`.
+ * The tools of `managedDefense.vulnerabilityDiscovery.reports`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "managed_defense_vulnerability_discovery_reports_get",
+    name: "managedDefense_vulnerabilityDiscovery_reports_get",
     title: "Get reviewed vulnerability report",
-    description: "Gets the repository projection of the active operator-reviewed scan report. `scan_id` is the customer scan's stable request ID.",
+    description: "Gets the repository projection of the active operator-reviewed scan report. `scan_id` is the customer scan's stable request ID.\n\nGET /accounts/{account_id}/managed-defense/vulnerability-discovery/repos/{repo_id}/scans/{scan_id}/report",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "repo_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "scan_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "repo_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "scan_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "repo_id",
+            "scan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "repo_id",
-        "scan_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_CuratedReportResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_CuratedReportPublication": managed_defense_vulnerability_discovery_CuratedReportPublication_output,
-        "managed-defense-vulnerability-discovery_CuratedReportResponse": managed_defense_vulnerability_discovery_CuratedReportResponse_output,
-        "managed-defense-vulnerability-discovery_CuratedReportResult": managed_defense_vulnerability_discovery_CuratedReportResult_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_ReportErrorPath": managed_defense_vulnerability_discovery_ReportErrorPath_output,
-        "managed-defense-vulnerability-discovery_ReportExternalLink": managed_defense_vulnerability_discovery_ReportExternalLink_output,
-        "managed-defense-vulnerability-discovery_ReportFinding": managed_defense_vulnerability_discovery_ReportFinding_output,
-        "managed-defense-vulnerability-discovery_ReportHotPath": managed_defense_vulnerability_discovery_ReportHotPath_output,
-        "managed-defense-vulnerability-discovery_ReportObservedPath": managed_defense_vulnerability_discovery_ReportObservedPath_output,
-        "managed-defense-vulnerability-discovery_ReportObservedWafRule": managed_defense_vulnerability_discovery_ReportObservedWafRule_output,
-        "managed-defense-vulnerability-discovery_ReportReachability": managed_defense_vulnerability_discovery_ReportReachability_output,
-        "managed-defense-vulnerability-discovery_ReportTelemetryTarget": managed_defense_vulnerability_discovery_ReportTelemetryTarget_output,
-        "managed-defense-vulnerability-discovery_ReportTraceStep": managed_defense_vulnerability_discovery_ReportTraceStep_output,
-        "managed-defense-vulnerability-discovery_ReportTrafficContext": managed_defense_vulnerability_discovery_ReportTrafficContext_output,
-        "managed-defense-vulnerability-discovery_ReportWafRule": managed_defense_vulnerability_discovery_ReportWafRule_output,
-        "managed-defense-vulnerability-discovery_ReportWafRules": managed_defense_vulnerability_discovery_ReportWafRules_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsOperation": managed_defense_vulnerability_discovery_ReportWebAssetsOperation_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsPath": managed_defense_vulnerability_discovery_ReportWebAssetsPath_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsPerformance": managed_defense_vulnerability_discovery_ReportWebAssetsPerformance_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsRisk": managed_defense_vulnerability_discovery_ReportWebAssetsRisk_output,
-        "managed-defense-vulnerability-discovery_RepositoryReport": managed_defense_vulnerability_discovery_RepositoryReport_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_CuratedReportPublication": managed$$defense$$vulnerability$$discovery_CuratedReportPublication,
+        "managed-defense-vulnerability-discovery_CuratedReportResponse": managed$$defense$$vulnerability$$discovery_CuratedReportResponse,
+        "managed-defense-vulnerability-discovery_CuratedReportResult": managed$$defense$$vulnerability$$discovery_CuratedReportResult,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_ReportErrorPath": managed$$defense$$vulnerability$$discovery_ReportErrorPath,
+        "managed-defense-vulnerability-discovery_ReportExternalLink": managed$$defense$$vulnerability$$discovery_ReportExternalLink,
+        "managed-defense-vulnerability-discovery_ReportFinding": managed$$defense$$vulnerability$$discovery_ReportFinding,
+        "managed-defense-vulnerability-discovery_ReportHotPath": managed$$defense$$vulnerability$$discovery_ReportHotPath,
+        "managed-defense-vulnerability-discovery_ReportObservedPath": managed$$defense$$vulnerability$$discovery_ReportObservedPath,
+        "managed-defense-vulnerability-discovery_ReportObservedWafRule": managed$$defense$$vulnerability$$discovery_ReportObservedWafRule,
+        "managed-defense-vulnerability-discovery_ReportReachability": managed$$defense$$vulnerability$$discovery_ReportReachability,
+        "managed-defense-vulnerability-discovery_ReportTelemetryTarget": managed$$defense$$vulnerability$$discovery_ReportTelemetryTarget,
+        "managed-defense-vulnerability-discovery_ReportTraceStep": managed$$defense$$vulnerability$$discovery_ReportTraceStep,
+        "managed-defense-vulnerability-discovery_ReportTrafficContext": managed$$defense$$vulnerability$$discovery_ReportTrafficContext,
+        "managed-defense-vulnerability-discovery_ReportWafRule": managed$$defense$$vulnerability$$discovery_ReportWafRule,
+        "managed-defense-vulnerability-discovery_ReportWafRules": managed$$defense$$vulnerability$$discovery_ReportWafRules,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsOperation": managed$$defense$$vulnerability$$discovery_ReportWebAssetsOperation,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsPath": managed$$defense$$vulnerability$$discovery_ReportWebAssetsPath,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsPerformance": managed$$defense$$vulnerability$$discovery_ReportWebAssetsPerformance,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsRisk": managed$$defense$$vulnerability$$discovery_ReportWebAssetsRisk,
+        "managed-defense-vulnerability-discovery_RepositoryReport": managed$$defense$$vulnerability$$discovery_RepositoryReport,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     annotations: {
@@ -117,30 +127,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_CuratedReportPublication": managed_defense_vulnerability_discovery_CuratedReportPublication_output,
-        "managed-defense-vulnerability-discovery_CuratedReportResponse": managed_defense_vulnerability_discovery_CuratedReportResponse_output,
-        "managed-defense-vulnerability-discovery_CuratedReportResult": managed_defense_vulnerability_discovery_CuratedReportResult_output,
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_ReportErrorPath": managed_defense_vulnerability_discovery_ReportErrorPath_output,
-        "managed-defense-vulnerability-discovery_ReportExternalLink": managed_defense_vulnerability_discovery_ReportExternalLink_output,
-        "managed-defense-vulnerability-discovery_ReportFinding": managed_defense_vulnerability_discovery_ReportFinding_output,
-        "managed-defense-vulnerability-discovery_ReportHotPath": managed_defense_vulnerability_discovery_ReportHotPath_output,
-        "managed-defense-vulnerability-discovery_ReportObservedPath": managed_defense_vulnerability_discovery_ReportObservedPath_output,
-        "managed-defense-vulnerability-discovery_ReportObservedWafRule": managed_defense_vulnerability_discovery_ReportObservedWafRule_output,
-        "managed-defense-vulnerability-discovery_ReportReachability": managed_defense_vulnerability_discovery_ReportReachability_output,
-        "managed-defense-vulnerability-discovery_ReportTelemetryTarget": managed_defense_vulnerability_discovery_ReportTelemetryTarget_output,
-        "managed-defense-vulnerability-discovery_ReportTraceStep": managed_defense_vulnerability_discovery_ReportTraceStep_output,
-        "managed-defense-vulnerability-discovery_ReportTrafficContext": managed_defense_vulnerability_discovery_ReportTrafficContext_output,
-        "managed-defense-vulnerability-discovery_ReportWafRule": managed_defense_vulnerability_discovery_ReportWafRule_output,
-        "managed-defense-vulnerability-discovery_ReportWafRules": managed_defense_vulnerability_discovery_ReportWafRules_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsOperation": managed_defense_vulnerability_discovery_ReportWebAssetsOperation_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsPath": managed_defense_vulnerability_discovery_ReportWebAssetsPath_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsPerformance": managed_defense_vulnerability_discovery_ReportWebAssetsPerformance_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsRisk": managed_defense_vulnerability_discovery_ReportWebAssetsRisk_output,
-        "managed-defense-vulnerability-discovery_RepositoryReport": managed_defense_vulnerability_discovery_RepositoryReport_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_CuratedReportPublication": managed$$defense$$vulnerability$$discovery_CuratedReportPublication,
+        "managed-defense-vulnerability-discovery_CuratedReportResponse": managed$$defense$$vulnerability$$discovery_CuratedReportResponse,
+        "managed-defense-vulnerability-discovery_CuratedReportResult": managed$$defense$$vulnerability$$discovery_CuratedReportResult,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_ReportErrorPath": managed$$defense$$vulnerability$$discovery_ReportErrorPath,
+        "managed-defense-vulnerability-discovery_ReportExternalLink": managed$$defense$$vulnerability$$discovery_ReportExternalLink,
+        "managed-defense-vulnerability-discovery_ReportFinding": managed$$defense$$vulnerability$$discovery_ReportFinding,
+        "managed-defense-vulnerability-discovery_ReportHotPath": managed$$defense$$vulnerability$$discovery_ReportHotPath,
+        "managed-defense-vulnerability-discovery_ReportObservedPath": managed$$defense$$vulnerability$$discovery_ReportObservedPath,
+        "managed-defense-vulnerability-discovery_ReportObservedWafRule": managed$$defense$$vulnerability$$discovery_ReportObservedWafRule,
+        "managed-defense-vulnerability-discovery_ReportReachability": managed$$defense$$vulnerability$$discovery_ReportReachability,
+        "managed-defense-vulnerability-discovery_ReportTelemetryTarget": managed$$defense$$vulnerability$$discovery_ReportTelemetryTarget,
+        "managed-defense-vulnerability-discovery_ReportTraceStep": managed$$defense$$vulnerability$$discovery_ReportTraceStep,
+        "managed-defense-vulnerability-discovery_ReportTrafficContext": managed$$defense$$vulnerability$$discovery_ReportTrafficContext,
+        "managed-defense-vulnerability-discovery_ReportWafRule": managed$$defense$$vulnerability$$discovery_ReportWafRule,
+        "managed-defense-vulnerability-discovery_ReportWafRules": managed$$defense$$vulnerability$$discovery_ReportWafRules,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsOperation": managed$$defense$$vulnerability$$discovery_ReportWebAssetsOperation,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsPath": managed$$defense$$vulnerability$$discovery_ReportWebAssetsPath,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsPerformance": managed$$defense$$vulnerability$$discovery_ReportWebAssetsPerformance,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsRisk": managed$$defense$$vulnerability$$discovery_ReportWebAssetsRisk,
+        "managed-defense-vulnerability-discovery_RepositoryReport": managed$$defense$$vulnerability$$discovery_RepositoryReport,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/outputs.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/outputs.ts
index 5d78e493f..623f2ad65 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/outputs.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * `managed-defense-vulnerability-discovery_CreateRepositoryResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_CreateRepositoryResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_CreateRepositoryResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_SuccessResponse"
@@ -32,7 +32,7 @@ export const managed_defense_vulnerability_discovery_CreateRepositoryResponse_ou
  * `managed-defense-vulnerability-discovery_CreateRepositoryResult` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_CreateRepositoryResult_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_CreateRepositoryResult: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -67,7 +67,7 @@ export const managed_defense_vulnerability_discovery_CreateRepositoryResult_outp
  * The schema of `managed-defense-vulnerability-discovery_CreatedRepository` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_CreatedRepository_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_CreatedRepository: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -127,7 +127,7 @@ export const managed_defense_vulnerability_discovery_CreatedRepository_output: J
  * The schema of `managed-defense-vulnerability-discovery_Repository` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_Repository_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_Repository: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -192,7 +192,7 @@ export const managed_defense_vulnerability_discovery_Repository_output: JsonSche
  * The schema of `managed-defense-vulnerability-discovery_RepositoryDetail` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_RepositoryDetail_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_RepositoryDetail: JsonSchema = {
   "properties": {
     "repository": {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_Repository"
@@ -217,7 +217,7 @@ export const managed_defense_vulnerability_discovery_RepositoryDetail_output: Js
  * `managed-defense-vulnerability-discovery_RepositoryListResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_RepositoryListResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_RepositoryListResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_PaginatedResponse"
@@ -243,7 +243,7 @@ export const managed_defense_vulnerability_discovery_RepositoryListResponse_outp
  * The schema of `managed-defense-vulnerability-discovery_RepositoryResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_RepositoryResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_RepositoryResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_SuccessResponse"
@@ -278,7 +278,7 @@ export const managed_defense_vulnerability_discovery_RepositoryResponse_output:
  * `managed-defense-vulnerability-discovery_RepositoryTokenResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_RepositoryTokenResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_RepositoryTokenResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_SuccessResponse"
@@ -301,7 +301,7 @@ export const managed_defense_vulnerability_discovery_RepositoryTokenResponse_out
  * The schema of `managed-defense-vulnerability-discovery_UploadCredentials` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_UploadCredentials_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_UploadCredentials: JsonSchema = {
   "properties": {
     "expires_in": {
       "enum": [
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/schemas.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/schemas.ts
index 2c8f05336..8b3c963a5 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/schemas.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/schemas.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of
  * `managed-defense-vulnerability-discovery_CreateRepositoryRequest`.
  */
-export const managed_defense_vulnerability_discovery_CreateRepositoryRequest: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_CreateRepositoryRequest: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/tools.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/tools.ts
index 6d6f313ad..ec7689b8e 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/tools.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/repositories/tools.ts
@@ -1,69 +1,85 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  managed_defense_vulnerability_discovery_FailureResponse_output,
-  managed_defense_vulnerability_discovery_Message_output,
-  managed_defense_vulnerability_discovery_PaginatedResponse_output,
-  managed_defense_vulnerability_discovery_ResultInfo_output,
-  managed_defense_vulnerability_discovery_ScanRepository_output,
-  managed_defense_vulnerability_discovery_Scan_output,
-  managed_defense_vulnerability_discovery_SuccessResponse_output,
-  managed_defense_vulnerability_discovery_TelemetryWindow_output,
+  managed$$defense$$vulnerability$$discovery_FailureResponse,
+  managed$$defense$$vulnerability$$discovery_Message,
+  managed$$defense$$vulnerability$$discovery_PaginatedResponse,
+  managed$$defense$$vulnerability$$discovery_ResultInfo,
+  managed$$defense$$vulnerability$$discovery_Scan,
+  managed$$defense$$vulnerability$$discovery_ScanRepository,
+  managed$$defense$$vulnerability$$discovery_SuccessResponse,
+  managed$$defense$$vulnerability$$discovery_TelemetryWindow,
 } from "../outputs.js";
 import {
-  managed_defense_vulnerability_discovery_CreateRepositoryResponse_output,
-  managed_defense_vulnerability_discovery_CreateRepositoryResult_output,
-  managed_defense_vulnerability_discovery_CreatedRepository_output,
-  managed_defense_vulnerability_discovery_RepositoryDetail_output,
-  managed_defense_vulnerability_discovery_RepositoryListResponse_output,
-  managed_defense_vulnerability_discovery_RepositoryResponse_output,
-  managed_defense_vulnerability_discovery_RepositoryTokenResponse_output,
-  managed_defense_vulnerability_discovery_Repository_output,
-  managed_defense_vulnerability_discovery_UploadCredentials_output,
+  managed$$defense$$vulnerability$$discovery_CreateRepositoryResponse,
+  managed$$defense$$vulnerability$$discovery_CreateRepositoryResult,
+  managed$$defense$$vulnerability$$discovery_CreatedRepository,
+  managed$$defense$$vulnerability$$discovery_Repository,
+  managed$$defense$$vulnerability$$discovery_RepositoryDetail,
+  managed$$defense$$vulnerability$$discovery_RepositoryListResponse,
+  managed$$defense$$vulnerability$$discovery_RepositoryResponse,
+  managed$$defense$$vulnerability$$discovery_RepositoryTokenResponse,
+  managed$$defense$$vulnerability$$discovery_UploadCredentials,
 } from "./outputs.js";
-import { managed_defense_vulnerability_discovery_CreateRepositoryRequest } from "./schemas.js";
+import { managed$$defense$$vulnerability$$discovery_CreateRepositoryRequest } from "./schemas.js";
 
 /**
- * The tools of `managed_defense.vulnerability_discovery.repositories`.
+ * The tools of `managedDefense.vulnerabilityDiscovery.repositories`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "managed_defense_vulnerability_discovery_repositories_create",
+    name: "managedDefense_vulnerabilityDiscovery_repositories_create",
     title: "Create repository",
-    description: "Creates an upload repository or reserves an asynchronous deployed Worker import by name. Worker imports require Idempotency-Key. Push upload source to `main` or specify the `branch` to scan in the scan request.",
+    description: "Creates an upload repository or reserves an asynchronous deployed Worker import by name. Worker imports require Idempotency-Key. Push upload source to `main` or specify the `branch` to scan in the scan request.\n\nPOST /accounts/{account_id}/managed-defense/vulnerability-discovery/repos",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/managed-defense-vulnerability-discovery_CreateRepositoryRequest"
         },
-        "idempotency_key": {
-          "description": "Optional. Supply this header to safely retry a request. Required when `worker_script_name` is supplied.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Idempotency-Key": {
+              "description": "Optional. Supply this header to safely retry a request. Required when `worker_script_name` is supplied.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "managed-defense-vulnerability-discovery_CreateRepositoryRequest": managed_defense_vulnerability_discovery_CreateRepositoryRequest,
+        "managed-defense-vulnerability-discovery_CreateRepositoryRequest": managed$$defense$$vulnerability$$discovery_CreateRepositoryRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_CreateRepositoryResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_CreateRepositoryResponse": managed_defense_vulnerability_discovery_CreateRepositoryResponse_output,
-        "managed-defense-vulnerability-discovery_CreateRepositoryResult": managed_defense_vulnerability_discovery_CreateRepositoryResult_output,
-        "managed-defense-vulnerability-discovery_CreatedRepository": managed_defense_vulnerability_discovery_CreatedRepository_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_UploadCredentials": managed_defense_vulnerability_discovery_UploadCredentials_output,
+        "managed-defense-vulnerability-discovery_CreateRepositoryResponse": managed$$defense$$vulnerability$$discovery_CreateRepositoryResponse,
+        "managed-defense-vulnerability-discovery_CreateRepositoryResult": managed$$defense$$vulnerability$$discovery_CreateRepositoryResult,
+        "managed-defense-vulnerability-discovery_CreatedRepository": managed$$defense$$vulnerability$$discovery_CreatedRepository,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_UploadCredentials": managed$$defense$$vulnerability$$discovery_UploadCredentials,
       },
     },
     annotations: {
@@ -92,50 +108,60 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_CreateRepositoryResponse": managed_defense_vulnerability_discovery_CreateRepositoryResponse_output,
-        "managed-defense-vulnerability-discovery_CreateRepositoryResult": managed_defense_vulnerability_discovery_CreateRepositoryResult_output,
-        "managed-defense-vulnerability-discovery_CreatedRepository": managed_defense_vulnerability_discovery_CreatedRepository_output,
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_UploadCredentials": managed_defense_vulnerability_discovery_UploadCredentials_output,
+        "managed-defense-vulnerability-discovery_CreateRepositoryResponse": managed$$defense$$vulnerability$$discovery_CreateRepositoryResponse,
+        "managed-defense-vulnerability-discovery_CreateRepositoryResult": managed$$defense$$vulnerability$$discovery_CreateRepositoryResult,
+        "managed-defense-vulnerability-discovery_CreatedRepository": managed$$defense$$vulnerability$$discovery_CreatedRepository,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_UploadCredentials": managed$$defense$$vulnerability$$discovery_UploadCredentials,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/managed-defense/vulnerability-discovery/repos`,
       headers: [
-        ["Idempotency-Key", args["idempotency_key"]],
+        ["Idempotency-Key", param(args, "headers", "Idempotency-Key")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "managed_defense_vulnerability_discovery_repositories_create_token",
+    name: "managedDefense_vulnerabilityDiscovery_repositories_createToken",
     title: "Create upload token",
-    description: "Creates a one-hour write token for an existing upload repository. Worker-imported repositories are system-managed and cannot receive upload tokens.",
+    description: "Creates a one-hour write token for an existing upload repository. Worker-imported repositories are system-managed and cannot receive upload tokens.\n\nPOST /accounts/{account_id}/managed-defense/vulnerability-discovery/repos/{repo_id}/token",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "repo_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "repo_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "repo_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "repo_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_RepositoryTokenResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_RepositoryTokenResponse": managed_defense_vulnerability_discovery_RepositoryTokenResponse_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_UploadCredentials": managed_defense_vulnerability_discovery_UploadCredentials_output,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_RepositoryTokenResponse": managed$$defense$$vulnerability$$discovery_RepositoryTokenResponse,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_UploadCredentials": managed$$defense$$vulnerability$$discovery_UploadCredentials,
       },
     },
     annotations: {
@@ -161,11 +187,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_RepositoryTokenResponse": managed_defense_vulnerability_discovery_RepositoryTokenResponse_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_UploadCredentials": managed_defense_vulnerability_discovery_UploadCredentials_output,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_RepositoryTokenResponse": managed$$defense$$vulnerability$$discovery_RepositoryTokenResponse,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_UploadCredentials": managed$$defense$$vulnerability$$discovery_UploadCredentials,
       },
     },
     request: (args) => ({
@@ -173,44 +199,60 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "managed_defense_vulnerability_discovery_repositories_get",
+    name: "managedDefense_vulnerabilityDiscovery_repositories_get",
     title: "Get repository",
-    description: "Gets repository metadata, source readiness, and customer scan history.",
+    description: "Gets repository metadata, source readiness, and customer scan history.\n\nGET /accounts/{account_id}/managed-defense/vulnerability-discovery/repos/{repo_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "repo_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "repo_id"
+          ],
+          "type": "object"
         },
-        "repo_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "scan_cursor": {
-          "type": "string"
-        },
-        "scan_limit": {
-          "default": 50,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "scan_cursor": {
+              "type": "string"
+            },
+            "scan_limit": {
+              "default": 50,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "repo_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_RepositoryResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_Repository": managed_defense_vulnerability_discovery_Repository_output,
-        "managed-defense-vulnerability-discovery_RepositoryDetail": managed_defense_vulnerability_discovery_RepositoryDetail_output,
-        "managed-defense-vulnerability-discovery_RepositoryResponse": managed_defense_vulnerability_discovery_RepositoryResponse_output,
-        "managed-defense-vulnerability-discovery_ResultInfo": managed_defense_vulnerability_discovery_ResultInfo_output,
-        "managed-defense-vulnerability-discovery_Scan": managed_defense_vulnerability_discovery_Scan_output,
-        "managed-defense-vulnerability-discovery_ScanRepository": managed_defense_vulnerability_discovery_ScanRepository_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_Repository": managed$$defense$$vulnerability$$discovery_Repository,
+        "managed-defense-vulnerability-discovery_RepositoryDetail": managed$$defense$$vulnerability$$discovery_RepositoryDetail,
+        "managed-defense-vulnerability-discovery_RepositoryResponse": managed$$defense$$vulnerability$$discovery_RepositoryResponse,
+        "managed-defense-vulnerability-discovery_ResultInfo": managed$$defense$$vulnerability$$discovery_ResultInfo,
+        "managed-defense-vulnerability-discovery_Scan": managed$$defense$$vulnerability$$discovery_Scan,
+        "managed-defense-vulnerability-discovery_ScanRepository": managed$$defense$$vulnerability$$discovery_ScanRepository,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     annotations: {
@@ -236,57 +278,73 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_Repository": managed_defense_vulnerability_discovery_Repository_output,
-        "managed-defense-vulnerability-discovery_RepositoryDetail": managed_defense_vulnerability_discovery_RepositoryDetail_output,
-        "managed-defense-vulnerability-discovery_RepositoryResponse": managed_defense_vulnerability_discovery_RepositoryResponse_output,
-        "managed-defense-vulnerability-discovery_ResultInfo": managed_defense_vulnerability_discovery_ResultInfo_output,
-        "managed-defense-vulnerability-discovery_Scan": managed_defense_vulnerability_discovery_Scan_output,
-        "managed-defense-vulnerability-discovery_ScanRepository": managed_defense_vulnerability_discovery_ScanRepository_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_Repository": managed$$defense$$vulnerability$$discovery_Repository,
+        "managed-defense-vulnerability-discovery_RepositoryDetail": managed$$defense$$vulnerability$$discovery_RepositoryDetail,
+        "managed-defense-vulnerability-discovery_RepositoryResponse": managed$$defense$$vulnerability$$discovery_RepositoryResponse,
+        "managed-defense-vulnerability-discovery_ResultInfo": managed$$defense$$vulnerability$$discovery_ResultInfo,
+        "managed-defense-vulnerability-discovery_Scan": managed$$defense$$vulnerability$$discovery_Scan,
+        "managed-defense-vulnerability-discovery_ScanRepository": managed$$defense$$vulnerability$$discovery_ScanRepository,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/managed-defense/vulnerability-discovery/repos/${pathParam(args, "repo_id")}`,
       query: [
-        ["scan_limit", args["scan_limit"], true],
-        ["scan_cursor", args["scan_cursor"], true],
+        ["scan_limit", param(args, "query", "scan_limit"), true],
+        ["scan_cursor", param(args, "query", "scan_cursor"), true],
       ],
     }),
   },
   {
-    name: "managed_defense_vulnerability_discovery_repositories_list",
+    name: "managedDefense_vulnerabilityDiscovery_repositories_list",
     title: "List repositories",
-    description: "Lists repositories available for vulnerability discovery in an account.",
+    description: "Lists repositories available for vulnerability discovery in an account.\n\nGET /accounts/{account_id}/managed-defense/vulnerability-discovery/repos",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "cursor": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "default": 50,
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "limit": {
+              "default": 50,
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_RepositoryListResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_PaginatedResponse": managed_defense_vulnerability_discovery_PaginatedResponse_output,
-        "managed-defense-vulnerability-discovery_Repository": managed_defense_vulnerability_discovery_Repository_output,
-        "managed-defense-vulnerability-discovery_RepositoryListResponse": managed_defense_vulnerability_discovery_RepositoryListResponse_output,
-        "managed-defense-vulnerability-discovery_ResultInfo": managed_defense_vulnerability_discovery_ResultInfo_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_PaginatedResponse": managed$$defense$$vulnerability$$discovery_PaginatedResponse,
+        "managed-defense-vulnerability-discovery_Repository": managed$$defense$$vulnerability$$discovery_Repository,
+        "managed-defense-vulnerability-discovery_RepositoryListResponse": managed$$defense$$vulnerability$$discovery_RepositoryListResponse,
+        "managed-defense-vulnerability-discovery_ResultInfo": managed$$defense$$vulnerability$$discovery_ResultInfo,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
       },
     },
     annotations: {
@@ -312,20 +370,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_PaginatedResponse": managed_defense_vulnerability_discovery_PaginatedResponse_output,
-        "managed-defense-vulnerability-discovery_Repository": managed_defense_vulnerability_discovery_Repository_output,
-        "managed-defense-vulnerability-discovery_RepositoryListResponse": managed_defense_vulnerability_discovery_RepositoryListResponse_output,
-        "managed-defense-vulnerability-discovery_ResultInfo": managed_defense_vulnerability_discovery_ResultInfo_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_PaginatedResponse": managed$$defense$$vulnerability$$discovery_PaginatedResponse,
+        "managed-defense-vulnerability-discovery_Repository": managed$$defense$$vulnerability$$discovery_Repository,
+        "managed-defense-vulnerability-discovery_RepositoryListResponse": managed$$defense$$vulnerability$$discovery_RepositoryListResponse,
+        "managed-defense-vulnerability-discovery_ResultInfo": managed$$defense$$vulnerability$$discovery_ResultInfo,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/managed-defense/vulnerability-discovery/repos`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/outputs.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/outputs.ts
index c71dbc889..f944ecb5f 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/outputs.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * `managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResponse`
  * in responses.
  */
-export const managed_defense_vulnerability_discovery_ConsolidatedCuratedReportResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ConsolidatedCuratedReportResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_SuccessResponse"
@@ -32,7 +32,7 @@ export const managed_defense_vulnerability_discovery_ConsolidatedCuratedReportRe
  * `managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResult` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ConsolidatedCuratedReportResult_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ConsolidatedCuratedReportResult: JsonSchema = {
   "properties": {
     "publication": {
       "oneOf": [
@@ -80,7 +80,7 @@ export const managed_defense_vulnerability_discovery_ConsolidatedCuratedReportRe
  * `managed-defense-vulnerability-discovery_ConsolidatedReportRepository` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ConsolidatedReportRepository_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ConsolidatedReportRepository: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -124,7 +124,7 @@ export const managed_defense_vulnerability_discovery_ConsolidatedReportRepositor
  * The schema of `managed-defense-vulnerability-discovery_ReportDocumentV2` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ReportDocumentV2_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ReportDocumentV2: JsonSchema = {
   "properties": {
     "executive_summary": {
       "type": "string"
@@ -175,7 +175,7 @@ export const managed_defense_vulnerability_discovery_ReportDocumentV2_output: Js
  * The schema of `managed-defense-vulnerability-discovery_ScanListResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ScanListResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ScanListResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_PaginatedResponse"
@@ -201,7 +201,7 @@ export const managed_defense_vulnerability_discovery_ScanListResponse_output: Js
  * The schema of `managed-defense-vulnerability-discovery_ScanResponse` in
  * responses.
  */
-export const managed_defense_vulnerability_discovery_ScanResponse_output: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_ScanResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_SuccessResponse"
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/schemas.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/schemas.ts
index f16fa0af9..ecf6aa356 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/schemas.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `managed-defense-vulnerability-discovery_CreateScan`.
  */
-export const managed_defense_vulnerability_discovery_CreateScan: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_CreateScan: JsonSchema = {
   "properties": {
     "repos": {
       "description": "Repository names must be unique within a request.",
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/tools.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/tools.ts
index 9e23430d0..7a839b197 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/tools.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/scans/tools.ts
@@ -1,86 +1,102 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  managed_defense_vulnerability_discovery_CuratedReportPublication_output,
-  managed_defense_vulnerability_discovery_FailureResponse_output,
-  managed_defense_vulnerability_discovery_Message_output,
-  managed_defense_vulnerability_discovery_PaginatedResponse_output,
-  managed_defense_vulnerability_discovery_ReportErrorPath_output,
-  managed_defense_vulnerability_discovery_ReportExternalLink_output,
-  managed_defense_vulnerability_discovery_ReportFinding_output,
-  managed_defense_vulnerability_discovery_ReportHotPath_output,
-  managed_defense_vulnerability_discovery_ReportObservedPath_output,
-  managed_defense_vulnerability_discovery_ReportObservedWafRule_output,
-  managed_defense_vulnerability_discovery_ReportReachability_output,
-  managed_defense_vulnerability_discovery_ReportTelemetryTarget_output,
-  managed_defense_vulnerability_discovery_ReportTraceStep_output,
-  managed_defense_vulnerability_discovery_ReportTrafficContext_output,
-  managed_defense_vulnerability_discovery_ReportWafRule_output,
-  managed_defense_vulnerability_discovery_ReportWafRules_output,
-  managed_defense_vulnerability_discovery_ReportWebAssetsOperation_output,
-  managed_defense_vulnerability_discovery_ReportWebAssetsPath_output,
-  managed_defense_vulnerability_discovery_ReportWebAssetsPerformance_output,
-  managed_defense_vulnerability_discovery_ReportWebAssetsRisk_output,
-  managed_defense_vulnerability_discovery_RepositoryReport_output,
-  managed_defense_vulnerability_discovery_ResultInfo_output,
-  managed_defense_vulnerability_discovery_ScanRepository_output,
-  managed_defense_vulnerability_discovery_Scan_output,
-  managed_defense_vulnerability_discovery_SuccessResponse_output,
-  managed_defense_vulnerability_discovery_TelemetryWindow_output,
+  managed$$defense$$vulnerability$$discovery_CuratedReportPublication,
+  managed$$defense$$vulnerability$$discovery_FailureResponse,
+  managed$$defense$$vulnerability$$discovery_Message,
+  managed$$defense$$vulnerability$$discovery_PaginatedResponse,
+  managed$$defense$$vulnerability$$discovery_ReportErrorPath,
+  managed$$defense$$vulnerability$$discovery_ReportExternalLink,
+  managed$$defense$$vulnerability$$discovery_ReportFinding,
+  managed$$defense$$vulnerability$$discovery_ReportHotPath,
+  managed$$defense$$vulnerability$$discovery_ReportObservedPath,
+  managed$$defense$$vulnerability$$discovery_ReportObservedWafRule,
+  managed$$defense$$vulnerability$$discovery_ReportReachability,
+  managed$$defense$$vulnerability$$discovery_ReportTelemetryTarget,
+  managed$$defense$$vulnerability$$discovery_ReportTraceStep,
+  managed$$defense$$vulnerability$$discovery_ReportTrafficContext,
+  managed$$defense$$vulnerability$$discovery_ReportWafRule,
+  managed$$defense$$vulnerability$$discovery_ReportWafRules,
+  managed$$defense$$vulnerability$$discovery_ReportWebAssetsOperation,
+  managed$$defense$$vulnerability$$discovery_ReportWebAssetsPath,
+  managed$$defense$$vulnerability$$discovery_ReportWebAssetsPerformance,
+  managed$$defense$$vulnerability$$discovery_ReportWebAssetsRisk,
+  managed$$defense$$vulnerability$$discovery_RepositoryReport,
+  managed$$defense$$vulnerability$$discovery_ResultInfo,
+  managed$$defense$$vulnerability$$discovery_Scan,
+  managed$$defense$$vulnerability$$discovery_ScanRepository,
+  managed$$defense$$vulnerability$$discovery_SuccessResponse,
+  managed$$defense$$vulnerability$$discovery_TelemetryWindow,
 } from "../outputs.js";
-import { managed_defense_vulnerability_discovery_TelemetryWindow } from "../schemas.js";
+import { managed$$defense$$vulnerability$$discovery_TelemetryWindow as managed$$defense$$vulnerability$$discovery_TelemetryWindow$ } from "../schemas.js";
 import {
-  managed_defense_vulnerability_discovery_ConsolidatedCuratedReportResponse_output,
-  managed_defense_vulnerability_discovery_ConsolidatedCuratedReportResult_output,
-  managed_defense_vulnerability_discovery_ConsolidatedReportRepository_output,
-  managed_defense_vulnerability_discovery_ReportDocumentV2_output,
-  managed_defense_vulnerability_discovery_ScanListResponse_output,
-  managed_defense_vulnerability_discovery_ScanResponse_output,
+  managed$$defense$$vulnerability$$discovery_ConsolidatedCuratedReportResponse,
+  managed$$defense$$vulnerability$$discovery_ConsolidatedCuratedReportResult,
+  managed$$defense$$vulnerability$$discovery_ConsolidatedReportRepository,
+  managed$$defense$$vulnerability$$discovery_ReportDocumentV2,
+  managed$$defense$$vulnerability$$discovery_ScanListResponse,
+  managed$$defense$$vulnerability$$discovery_ScanResponse,
 } from "./outputs.js";
-import { managed_defense_vulnerability_discovery_CreateScan } from "./schemas.js";
+import { managed$$defense$$vulnerability$$discovery_CreateScan } from "./schemas.js";
 
 /**
- * The tools of `managed_defense.vulnerability_discovery.scans`.
+ * The tools of `managedDefense.vulnerabilityDiscovery.scans`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "managed_defense_vulnerability_discovery_scans_create",
+    name: "managedDefense_vulnerabilityDiscovery_scans_create",
     title: "Create scan",
-    description: "Submits repository intent for operator review. This endpoint does not immediately start execution. Worker-imported repositories must be ready; explicit repository host scopes must be authorized and explicit branch selections must exist before the request is persisted.",
+    description: "Submits repository intent for operator review. This endpoint does not immediately start execution. Worker-imported repositories must be ready; explicit repository host scopes must be authorized and explicit branch selections must exist before the request is persisted.\n\nPOST /accounts/{account_id}/managed-defense/vulnerability-discovery/scans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/managed-defense-vulnerability-discovery_CreateScan"
         },
-        "idempotency_key": {
-          "description": "Optional. Supply this header to safely retry a request. Required when `worker_script_name` is supplied.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Idempotency-Key": {
+              "description": "Optional. Supply this header to safely retry a request. Required when `worker_script_name` is supplied.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "managed-defense-vulnerability-discovery_CreateScan": managed_defense_vulnerability_discovery_CreateScan,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow,
+        "managed-defense-vulnerability-discovery_CreateScan": managed$$defense$$vulnerability$$discovery_CreateScan,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_ScanResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_Scan": managed_defense_vulnerability_discovery_Scan_output,
-        "managed-defense-vulnerability-discovery_ScanRepository": managed_defense_vulnerability_discovery_ScanRepository_output,
-        "managed-defense-vulnerability-discovery_ScanResponse": managed_defense_vulnerability_discovery_ScanResponse_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_Scan": managed$$defense$$vulnerability$$discovery_Scan,
+        "managed-defense-vulnerability-discovery_ScanRepository": managed$$defense$$vulnerability$$discovery_ScanRepository,
+        "managed-defense-vulnerability-discovery_ScanResponse": managed$$defense$$vulnerability$$discovery_ScanResponse,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     annotations: {
@@ -112,52 +128,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_Scan": managed_defense_vulnerability_discovery_Scan_output,
-        "managed-defense-vulnerability-discovery_ScanRepository": managed_defense_vulnerability_discovery_ScanRepository_output,
-        "managed-defense-vulnerability-discovery_ScanResponse": managed_defense_vulnerability_discovery_ScanResponse_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_Scan": managed$$defense$$vulnerability$$discovery_Scan,
+        "managed-defense-vulnerability-discovery_ScanRepository": managed$$defense$$vulnerability$$discovery_ScanRepository,
+        "managed-defense-vulnerability-discovery_ScanResponse": managed$$defense$$vulnerability$$discovery_ScanResponse,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/managed-defense/vulnerability-discovery/scans`,
       headers: [
-        ["Idempotency-Key", args["idempotency_key"]],
+        ["Idempotency-Key", param(args, "headers", "Idempotency-Key")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "managed_defense_vulnerability_discovery_scans_get",
+    name: "managedDefense_vulnerabilityDiscovery_scans_get",
     title: "Get scan",
-    description: "Gets one customer-requested scan across its review and execution lifecycle.",
+    description: "Gets one customer-requested scan across its review and execution lifecycle.\n\nGET /accounts/{account_id}/managed-defense/vulnerability-discovery/scans/{scan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "scan_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "scan_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "scan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "scan_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_ScanResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_Scan": managed_defense_vulnerability_discovery_Scan_output,
-        "managed-defense-vulnerability-discovery_ScanRepository": managed_defense_vulnerability_discovery_ScanRepository_output,
-        "managed-defense-vulnerability-discovery_ScanResponse": managed_defense_vulnerability_discovery_ScanResponse_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_Scan": managed$$defense$$vulnerability$$discovery_Scan,
+        "managed-defense-vulnerability-discovery_ScanRepository": managed$$defense$$vulnerability$$discovery_ScanRepository,
+        "managed-defense-vulnerability-discovery_ScanResponse": managed$$defense$$vulnerability$$discovery_ScanResponse,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     annotations: {
@@ -183,13 +209,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_Scan": managed_defense_vulnerability_discovery_Scan_output,
-        "managed-defense-vulnerability-discovery_ScanRepository": managed_defense_vulnerability_discovery_ScanRepository_output,
-        "managed-defense-vulnerability-discovery_ScanResponse": managed_defense_vulnerability_discovery_ScanResponse_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_Scan": managed$$defense$$vulnerability$$discovery_Scan,
+        "managed-defense-vulnerability-discovery_ScanRepository": managed$$defense$$vulnerability$$discovery_ScanRepository,
+        "managed-defense-vulnerability-discovery_ScanResponse": managed$$defense$$vulnerability$$discovery_ScanResponse,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     request: (args) => ({
@@ -197,53 +223,63 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "managed_defense_vulnerability_discovery_scans_get_report",
+    name: "managedDefense_vulnerabilityDiscovery_scans_getReport",
     title: "Get reviewed vulnerability report",
-    description: "Gets the active operator-reviewed scan report. Repository metadata records report readiness even when no publication is available.",
+    description: "Gets the active operator-reviewed scan report. Repository metadata records report readiness even when no publication is available.\n\nGET /accounts/{account_id}/managed-defense/vulnerability-discovery/scans/{scan_id}/report",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "scan_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "scan_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "scan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "scan_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResponse": managed_defense_vulnerability_discovery_ConsolidatedCuratedReportResponse_output,
-        "managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResult": managed_defense_vulnerability_discovery_ConsolidatedCuratedReportResult_output,
-        "managed-defense-vulnerability-discovery_ConsolidatedReportRepository": managed_defense_vulnerability_discovery_ConsolidatedReportRepository_output,
-        "managed-defense-vulnerability-discovery_CuratedReportPublication": managed_defense_vulnerability_discovery_CuratedReportPublication_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_ReportDocumentV2": managed_defense_vulnerability_discovery_ReportDocumentV2_output,
-        "managed-defense-vulnerability-discovery_ReportErrorPath": managed_defense_vulnerability_discovery_ReportErrorPath_output,
-        "managed-defense-vulnerability-discovery_ReportExternalLink": managed_defense_vulnerability_discovery_ReportExternalLink_output,
-        "managed-defense-vulnerability-discovery_ReportFinding": managed_defense_vulnerability_discovery_ReportFinding_output,
-        "managed-defense-vulnerability-discovery_ReportHotPath": managed_defense_vulnerability_discovery_ReportHotPath_output,
-        "managed-defense-vulnerability-discovery_ReportObservedPath": managed_defense_vulnerability_discovery_ReportObservedPath_output,
-        "managed-defense-vulnerability-discovery_ReportObservedWafRule": managed_defense_vulnerability_discovery_ReportObservedWafRule_output,
-        "managed-defense-vulnerability-discovery_ReportReachability": managed_defense_vulnerability_discovery_ReportReachability_output,
-        "managed-defense-vulnerability-discovery_ReportTelemetryTarget": managed_defense_vulnerability_discovery_ReportTelemetryTarget_output,
-        "managed-defense-vulnerability-discovery_ReportTraceStep": managed_defense_vulnerability_discovery_ReportTraceStep_output,
-        "managed-defense-vulnerability-discovery_ReportTrafficContext": managed_defense_vulnerability_discovery_ReportTrafficContext_output,
-        "managed-defense-vulnerability-discovery_ReportWafRule": managed_defense_vulnerability_discovery_ReportWafRule_output,
-        "managed-defense-vulnerability-discovery_ReportWafRules": managed_defense_vulnerability_discovery_ReportWafRules_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsOperation": managed_defense_vulnerability_discovery_ReportWebAssetsOperation_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsPath": managed_defense_vulnerability_discovery_ReportWebAssetsPath_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsPerformance": managed_defense_vulnerability_discovery_ReportWebAssetsPerformance_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsRisk": managed_defense_vulnerability_discovery_ReportWebAssetsRisk_output,
-        "managed-defense-vulnerability-discovery_RepositoryReport": managed_defense_vulnerability_discovery_RepositoryReport_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResponse": managed$$defense$$vulnerability$$discovery_ConsolidatedCuratedReportResponse,
+        "managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResult": managed$$defense$$vulnerability$$discovery_ConsolidatedCuratedReportResult,
+        "managed-defense-vulnerability-discovery_ConsolidatedReportRepository": managed$$defense$$vulnerability$$discovery_ConsolidatedReportRepository,
+        "managed-defense-vulnerability-discovery_CuratedReportPublication": managed$$defense$$vulnerability$$discovery_CuratedReportPublication,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_ReportDocumentV2": managed$$defense$$vulnerability$$discovery_ReportDocumentV2,
+        "managed-defense-vulnerability-discovery_ReportErrorPath": managed$$defense$$vulnerability$$discovery_ReportErrorPath,
+        "managed-defense-vulnerability-discovery_ReportExternalLink": managed$$defense$$vulnerability$$discovery_ReportExternalLink,
+        "managed-defense-vulnerability-discovery_ReportFinding": managed$$defense$$vulnerability$$discovery_ReportFinding,
+        "managed-defense-vulnerability-discovery_ReportHotPath": managed$$defense$$vulnerability$$discovery_ReportHotPath,
+        "managed-defense-vulnerability-discovery_ReportObservedPath": managed$$defense$$vulnerability$$discovery_ReportObservedPath,
+        "managed-defense-vulnerability-discovery_ReportObservedWafRule": managed$$defense$$vulnerability$$discovery_ReportObservedWafRule,
+        "managed-defense-vulnerability-discovery_ReportReachability": managed$$defense$$vulnerability$$discovery_ReportReachability,
+        "managed-defense-vulnerability-discovery_ReportTelemetryTarget": managed$$defense$$vulnerability$$discovery_ReportTelemetryTarget,
+        "managed-defense-vulnerability-discovery_ReportTraceStep": managed$$defense$$vulnerability$$discovery_ReportTraceStep,
+        "managed-defense-vulnerability-discovery_ReportTrafficContext": managed$$defense$$vulnerability$$discovery_ReportTrafficContext,
+        "managed-defense-vulnerability-discovery_ReportWafRule": managed$$defense$$vulnerability$$discovery_ReportWafRule,
+        "managed-defense-vulnerability-discovery_ReportWafRules": managed$$defense$$vulnerability$$discovery_ReportWafRules,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsOperation": managed$$defense$$vulnerability$$discovery_ReportWebAssetsOperation,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsPath": managed$$defense$$vulnerability$$discovery_ReportWebAssetsPath,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsPerformance": managed$$defense$$vulnerability$$discovery_ReportWebAssetsPerformance,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsRisk": managed$$defense$$vulnerability$$discovery_ReportWebAssetsRisk,
+        "managed-defense-vulnerability-discovery_RepositoryReport": managed$$defense$$vulnerability$$discovery_RepositoryReport,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     annotations: {
@@ -275,32 +311,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResponse": managed_defense_vulnerability_discovery_ConsolidatedCuratedReportResponse_output,
-        "managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResult": managed_defense_vulnerability_discovery_ConsolidatedCuratedReportResult_output,
-        "managed-defense-vulnerability-discovery_ConsolidatedReportRepository": managed_defense_vulnerability_discovery_ConsolidatedReportRepository_output,
-        "managed-defense-vulnerability-discovery_CuratedReportPublication": managed_defense_vulnerability_discovery_CuratedReportPublication_output,
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_ReportDocumentV2": managed_defense_vulnerability_discovery_ReportDocumentV2_output,
-        "managed-defense-vulnerability-discovery_ReportErrorPath": managed_defense_vulnerability_discovery_ReportErrorPath_output,
-        "managed-defense-vulnerability-discovery_ReportExternalLink": managed_defense_vulnerability_discovery_ReportExternalLink_output,
-        "managed-defense-vulnerability-discovery_ReportFinding": managed_defense_vulnerability_discovery_ReportFinding_output,
-        "managed-defense-vulnerability-discovery_ReportHotPath": managed_defense_vulnerability_discovery_ReportHotPath_output,
-        "managed-defense-vulnerability-discovery_ReportObservedPath": managed_defense_vulnerability_discovery_ReportObservedPath_output,
-        "managed-defense-vulnerability-discovery_ReportObservedWafRule": managed_defense_vulnerability_discovery_ReportObservedWafRule_output,
-        "managed-defense-vulnerability-discovery_ReportReachability": managed_defense_vulnerability_discovery_ReportReachability_output,
-        "managed-defense-vulnerability-discovery_ReportTelemetryTarget": managed_defense_vulnerability_discovery_ReportTelemetryTarget_output,
-        "managed-defense-vulnerability-discovery_ReportTraceStep": managed_defense_vulnerability_discovery_ReportTraceStep_output,
-        "managed-defense-vulnerability-discovery_ReportTrafficContext": managed_defense_vulnerability_discovery_ReportTrafficContext_output,
-        "managed-defense-vulnerability-discovery_ReportWafRule": managed_defense_vulnerability_discovery_ReportWafRule_output,
-        "managed-defense-vulnerability-discovery_ReportWafRules": managed_defense_vulnerability_discovery_ReportWafRules_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsOperation": managed_defense_vulnerability_discovery_ReportWebAssetsOperation_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsPath": managed_defense_vulnerability_discovery_ReportWebAssetsPath_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsPerformance": managed_defense_vulnerability_discovery_ReportWebAssetsPerformance_output,
-        "managed-defense-vulnerability-discovery_ReportWebAssetsRisk": managed_defense_vulnerability_discovery_ReportWebAssetsRisk_output,
-        "managed-defense-vulnerability-discovery_RepositoryReport": managed_defense_vulnerability_discovery_RepositoryReport_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResponse": managed$$defense$$vulnerability$$discovery_ConsolidatedCuratedReportResponse,
+        "managed-defense-vulnerability-discovery_ConsolidatedCuratedReportResult": managed$$defense$$vulnerability$$discovery_ConsolidatedCuratedReportResult,
+        "managed-defense-vulnerability-discovery_ConsolidatedReportRepository": managed$$defense$$vulnerability$$discovery_ConsolidatedReportRepository,
+        "managed-defense-vulnerability-discovery_CuratedReportPublication": managed$$defense$$vulnerability$$discovery_CuratedReportPublication,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_ReportDocumentV2": managed$$defense$$vulnerability$$discovery_ReportDocumentV2,
+        "managed-defense-vulnerability-discovery_ReportErrorPath": managed$$defense$$vulnerability$$discovery_ReportErrorPath,
+        "managed-defense-vulnerability-discovery_ReportExternalLink": managed$$defense$$vulnerability$$discovery_ReportExternalLink,
+        "managed-defense-vulnerability-discovery_ReportFinding": managed$$defense$$vulnerability$$discovery_ReportFinding,
+        "managed-defense-vulnerability-discovery_ReportHotPath": managed$$defense$$vulnerability$$discovery_ReportHotPath,
+        "managed-defense-vulnerability-discovery_ReportObservedPath": managed$$defense$$vulnerability$$discovery_ReportObservedPath,
+        "managed-defense-vulnerability-discovery_ReportObservedWafRule": managed$$defense$$vulnerability$$discovery_ReportObservedWafRule,
+        "managed-defense-vulnerability-discovery_ReportReachability": managed$$defense$$vulnerability$$discovery_ReportReachability,
+        "managed-defense-vulnerability-discovery_ReportTelemetryTarget": managed$$defense$$vulnerability$$discovery_ReportTelemetryTarget,
+        "managed-defense-vulnerability-discovery_ReportTraceStep": managed$$defense$$vulnerability$$discovery_ReportTraceStep,
+        "managed-defense-vulnerability-discovery_ReportTrafficContext": managed$$defense$$vulnerability$$discovery_ReportTrafficContext,
+        "managed-defense-vulnerability-discovery_ReportWafRule": managed$$defense$$vulnerability$$discovery_ReportWafRule,
+        "managed-defense-vulnerability-discovery_ReportWafRules": managed$$defense$$vulnerability$$discovery_ReportWafRules,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsOperation": managed$$defense$$vulnerability$$discovery_ReportWebAssetsOperation,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsPath": managed$$defense$$vulnerability$$discovery_ReportWebAssetsPath,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsPerformance": managed$$defense$$vulnerability$$discovery_ReportWebAssetsPerformance,
+        "managed-defense-vulnerability-discovery_ReportWebAssetsRisk": managed$$defense$$vulnerability$$discovery_ReportWebAssetsRisk,
+        "managed-defense-vulnerability-discovery_RepositoryReport": managed$$defense$$vulnerability$$discovery_RepositoryReport,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     request: (args) => ({
@@ -308,74 +344,90 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "managed_defense_vulnerability_discovery_scans_list",
+    name: "managedDefense_vulnerabilityDiscovery_scans_list",
     title: "List scans",
-    description: "Lists customer-requested scans across review and execution lifecycle states.",
+    description: "Lists customer-requested scans across review and execution lifecycle states.\n\nGET /accounts/{account_id}/managed-defense/vulnerability-discovery/scans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "cursor": {
-          "type": "string"
-        },
-        "limit": {
-          "default": 50,
-          "type": "integer"
-        },
-        "repo": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "status": {
-          "description": "Repeat parameter or provide comma-separated values.",
-          "oneOf": [
-            {
-              "items": {
-                "enum": [
-                  "requested",
-                  "accepted",
-                  "running",
-                  "completed",
-                  "failed",
-                  "rejected",
-                  "cancelled"
-                ],
-                "type": "string"
-              },
-              "type": "array"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "limit": {
+              "default": 50,
+              "type": "integer"
             },
-            {
-              "enum": [
-                "requested",
-                "accepted",
-                "running",
-                "completed",
-                "failed",
-                "rejected",
-                "cancelled"
-              ],
+            "repo": {
+              "format": "uuid",
               "type": "string"
+            },
+            "status": {
+              "description": "Repeat parameter or provide comma-separated values.",
+              "oneOf": [
+                {
+                  "items": {
+                    "enum": [
+                      "requested",
+                      "accepted",
+                      "running",
+                      "completed",
+                      "failed",
+                      "rejected",
+                      "cancelled"
+                    ],
+                    "type": "string"
+                  },
+                  "type": "array"
+                },
+                {
+                  "enum": [
+                    "requested",
+                    "accepted",
+                    "running",
+                    "completed",
+                    "failed",
+                    "rejected",
+                    "cancelled"
+                  ],
+                  "type": "string"
+                }
+              ]
             }
-          ]
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/managed-defense-vulnerability-discovery_ScanListResponse",
       $defs: {
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_PaginatedResponse": managed_defense_vulnerability_discovery_PaginatedResponse_output,
-        "managed-defense-vulnerability-discovery_ResultInfo": managed_defense_vulnerability_discovery_ResultInfo_output,
-        "managed-defense-vulnerability-discovery_Scan": managed_defense_vulnerability_discovery_Scan_output,
-        "managed-defense-vulnerability-discovery_ScanListResponse": managed_defense_vulnerability_discovery_ScanListResponse_output,
-        "managed-defense-vulnerability-discovery_ScanRepository": managed_defense_vulnerability_discovery_ScanRepository_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_PaginatedResponse": managed$$defense$$vulnerability$$discovery_PaginatedResponse,
+        "managed-defense-vulnerability-discovery_ResultInfo": managed$$defense$$vulnerability$$discovery_ResultInfo,
+        "managed-defense-vulnerability-discovery_Scan": managed$$defense$$vulnerability$$discovery_Scan,
+        "managed-defense-vulnerability-discovery_ScanListResponse": managed$$defense$$vulnerability$$discovery_ScanListResponse,
+        "managed-defense-vulnerability-discovery_ScanRepository": managed$$defense$$vulnerability$$discovery_ScanRepository,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     annotations: {
@@ -401,24 +453,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "managed-defense-vulnerability-discovery_FailureResponse": managed_defense_vulnerability_discovery_FailureResponse_output,
-        "managed-defense-vulnerability-discovery_Message": managed_defense_vulnerability_discovery_Message_output,
-        "managed-defense-vulnerability-discovery_PaginatedResponse": managed_defense_vulnerability_discovery_PaginatedResponse_output,
-        "managed-defense-vulnerability-discovery_ResultInfo": managed_defense_vulnerability_discovery_ResultInfo_output,
-        "managed-defense-vulnerability-discovery_Scan": managed_defense_vulnerability_discovery_Scan_output,
-        "managed-defense-vulnerability-discovery_ScanListResponse": managed_defense_vulnerability_discovery_ScanListResponse_output,
-        "managed-defense-vulnerability-discovery_ScanRepository": managed_defense_vulnerability_discovery_ScanRepository_output,
-        "managed-defense-vulnerability-discovery_SuccessResponse": managed_defense_vulnerability_discovery_SuccessResponse_output,
-        "managed-defense-vulnerability-discovery_TelemetryWindow": managed_defense_vulnerability_discovery_TelemetryWindow_output,
+        "managed-defense-vulnerability-discovery_FailureResponse": managed$$defense$$vulnerability$$discovery_FailureResponse,
+        "managed-defense-vulnerability-discovery_Message": managed$$defense$$vulnerability$$discovery_Message,
+        "managed-defense-vulnerability-discovery_PaginatedResponse": managed$$defense$$vulnerability$$discovery_PaginatedResponse,
+        "managed-defense-vulnerability-discovery_ResultInfo": managed$$defense$$vulnerability$$discovery_ResultInfo,
+        "managed-defense-vulnerability-discovery_Scan": managed$$defense$$vulnerability$$discovery_Scan,
+        "managed-defense-vulnerability-discovery_ScanListResponse": managed$$defense$$vulnerability$$discovery_ScanListResponse,
+        "managed-defense-vulnerability-discovery_ScanRepository": managed$$defense$$vulnerability$$discovery_ScanRepository,
+        "managed-defense-vulnerability-discovery_SuccessResponse": managed$$defense$$vulnerability$$discovery_SuccessResponse,
+        "managed-defense-vulnerability-discovery_TelemetryWindow": managed$$defense$$vulnerability$$discovery_TelemetryWindow,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/managed-defense/vulnerability-discovery/scans`,
       query: [
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
-        ["status", args["status"], true],
-        ["repo", args["repo"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["status", param(args, "query", "status"), true],
+        ["repo", param(args, "query", "repo"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/schemas.ts b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/schemas.ts
index b7d04b50e..f49384682 100644
--- a/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/schemas.ts
+++ b/src/generated/forge-mcp/managedDefense/vulnerabilityDiscovery/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `managed-defense-vulnerability-discovery_TelemetryWindow`.
  */
-export const managed_defense_vulnerability_discovery_TelemetryWindow: JsonSchema = {
+export const managed$$defense$$vulnerability$$discovery_TelemetryWindow: JsonSchema = {
   "description": "UTC ISO-8601 interval. Start is inclusive, end is exclusive, and the interval must be positive and at most seven days.",
   "properties": {
     "end": {
diff --git a/src/generated/forge-mcp/managedTransforms/outputs.ts b/src/generated/forge-mcp/managedTransforms/outputs.ts
index 37bcb42df..72b90919a 100644
--- a/src/generated/forge-mcp/managedTransforms/outputs.ts
+++ b/src/generated/forge-mcp/managedTransforms/outputs.ts
@@ -6,13 +6,13 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `rulesets_ManagedTransform` in responses.
  */
-export const rulesets_ManagedTransform_output: JsonSchema = {
+export const rulesets_ManagedTransform: JsonSchema = {
   "properties": {
     "conflicts_with": {
       "items": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_ManagedTransformId"
+            "type": "string"
           },
           {
             "type": "string"
@@ -29,7 +29,7 @@ export const rulesets_ManagedTransform_output: JsonSchema = {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/rulesets_ManagedTransformId"
+      "type": "string"
     }
   },
   "required": [
@@ -40,17 +40,10 @@ export const rulesets_ManagedTransform_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_ManagedTransformId` in responses.
- */
-export const rulesets_ManagedTransformId_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_ManagedTransforms` in responses.
  */
-export const rulesets_ManagedTransforms_output: JsonSchema = {
+export const rulesets_ManagedTransforms: JsonSchema = {
   "properties": {
     "managed_request_headers": {
       "items": {
diff --git a/src/generated/forge-mcp/managedTransforms/schemas.ts b/src/generated/forge-mcp/managedTransforms/schemas.ts
index a94c8ef6d..6dceb8bc5 100644
--- a/src/generated/forge-mcp/managedTransforms/schemas.ts
+++ b/src/generated/forge-mcp/managedTransforms/schemas.ts
@@ -14,8 +14,8 @@ export const rulesets_ManagedTransform: JsonSchema = {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/rulesets_ManagedTransformId",
-      "description": "The human-readable identifier of the Managed Transform."
+      "description": "The human-readable identifier of the Managed Transform.",
+      "type": "string"
     }
   },
   "required": [
@@ -25,14 +25,6 @@ export const rulesets_ManagedTransform: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_ManagedTransformId`.
- */
-export const rulesets_ManagedTransformId: JsonSchema = {
-  "description": "The human-readable identifier of the Managed Transform.",
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_ManagedTransformsPatch`.
  */
diff --git a/src/generated/forge-mcp/managedTransforms/tools.ts b/src/generated/forge-mcp/managedTransforms/tools.ts
index f9da9ebfb..77a838284 100644
--- a/src/generated/forge-mcp/managedTransforms/tools.ts
+++ b/src/generated/forge-mcp/managedTransforms/tools.ts
@@ -3,45 +3,49 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  rulesets_Errors_output,
-  rulesets_Message_output,
-  rulesets_Messages_output,
-  rulesets_Response_output,
+  rulesets_Errors,
+  rulesets_Message,
+  rulesets_Messages,
+  rulesets_Response,
 } from "../outputs.js";
-import { rulesets_ZoneId } from "../schemas.js";
 import {
-  rulesets_ManagedTransformId_output,
-  rulesets_ManagedTransform_output,
-  rulesets_ManagedTransforms_output,
+  rulesets_ManagedTransform,
+  rulesets_ManagedTransforms,
 } from "./outputs.js";
 import {
-  rulesets_ManagedTransform,
-  rulesets_ManagedTransformId,
+  rulesets_ManagedTransform as rulesets_ManagedTransform$,
   rulesets_ManagedTransformsPatch,
 } from "./schemas.js";
 
 /**
- * The tools of `managed_transforms`.
+ * The tools of `managedTransforms`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "managed_transforms_delete",
+    name: "managedTransforms_delete",
     title: "Delete Managed Transforms",
-    description: "Disables all Managed Transforms.",
+    description: "Disables all Managed Transforms.\n\nDELETE /zones/{zone_id}/managed_headers",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/rulesets_ZoneId",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "rulesets_ZoneId": rulesets_ZoneId,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -109,10 +113,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
       },
     },
     request: (args) => ({
@@ -120,23 +124,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "managed_transforms_list",
+    name: "managedTransforms_list",
     title: "List Managed Transforms",
-    description: "Fetches a list of all Managed Transforms.",
+    description: "Fetches a list of all Managed Transforms.\n\nGET /zones/{zone_id}/managed_headers",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/rulesets_ZoneId",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "rulesets_ZoneId": rulesets_ZoneId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -160,13 +171,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ManagedTransform": rulesets_ManagedTransform_output,
-        "rulesets_ManagedTransformId": rulesets_ManagedTransformId_output,
-        "rulesets_ManagedTransforms": rulesets_ManagedTransforms_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ManagedTransform": rulesets_ManagedTransform,
+        "rulesets_ManagedTransforms": rulesets_ManagedTransforms,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
       },
     },
     annotations: {
@@ -277,13 +287,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ManagedTransform": rulesets_ManagedTransform_output,
-        "rulesets_ManagedTransformId": rulesets_ManagedTransformId_output,
-        "rulesets_ManagedTransforms": rulesets_ManagedTransforms_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ManagedTransform": rulesets_ManagedTransform,
+        "rulesets_ManagedTransforms": rulesets_ManagedTransforms,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
       },
     },
     request: (args) => ({
@@ -291,29 +300,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "managed_transforms_update",
+    name: "managedTransforms_update",
     title: "Update Managed Transforms",
-    description: "Updates the status of one or more Managed Transforms.",
+    description: "Updates the status of one or more Managed Transforms.\n\nPATCH /zones/{zone_id}/managed_headers",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/rulesets_ManagedTransformsPatch"
         },
-        "zone_id": {
-          "$ref": "#/$defs/rulesets_ZoneId",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "rulesets_ManagedTransform": rulesets_ManagedTransform,
-        "rulesets_ManagedTransformId": rulesets_ManagedTransformId,
+        "rulesets_ManagedTransform": rulesets_ManagedTransform$,
         "rulesets_ManagedTransformsPatch": rulesets_ManagedTransformsPatch,
-        "rulesets_ZoneId": rulesets_ZoneId,
       },
     },
     outputSchema: {
@@ -338,13 +355,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ManagedTransform": rulesets_ManagedTransform_output,
-        "rulesets_ManagedTransformId": rulesets_ManagedTransformId_output,
-        "rulesets_ManagedTransforms": rulesets_ManagedTransforms_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ManagedTransform": rulesets_ManagedTransform,
+        "rulesets_ManagedTransforms": rulesets_ManagedTransforms,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
       },
     },
     annotations: {
@@ -434,13 +450,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ManagedTransform": rulesets_ManagedTransform_output,
-        "rulesets_ManagedTransformId": rulesets_ManagedTransformId_output,
-        "rulesets_ManagedTransforms": rulesets_ManagedTransforms_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ManagedTransform": rulesets_ManagedTransform,
+        "rulesets_ManagedTransforms": rulesets_ManagedTransforms,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/mcp/portals/tools.ts b/src/generated/forge-mcp/mcp/portals/tools.ts
index eb4c0ad0b..dc6ce7e6b 100644
--- a/src/generated/forge-mcp/mcp/portals/tools.ts
+++ b/src/generated/forge-mcp/mcp/portals/tools.ts
@@ -1,61 +1,77 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `mcp.portals`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "mcp_portals_account_tool_call_analytics",
+    name: "mcp_portals_accountToolCallAnalytics",
     title: "Account-global MCP tool-call timeseries",
-    description: "Returns daily or monthly tool-call counts across the account.\n\nThis method is beta.",
+    description: "Returns daily or monthly tool-call counts across the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/access/ai-controls/mcp/analytics/tool-calls/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "aggregate": {
-          "default": "false",
-          "enum": [
-            "true",
-            "false"
-          ],
-          "type": "string"
-        },
-        "days": {
-          "description": "Daily trailing-window size; defaults to 7 and is ignored for monthly",
-          "type": "integer"
-        },
-        "granularity": {
-          "default": "daily",
-          "enum": [
-            "daily",
-            "monthly"
-          ],
-          "type": "string"
-        },
-        "response_status": {
-          "default": "success",
-          "description": "Response status to count; 'all' counts every status",
-          "enum": [
-            "success",
-            "error",
-            "cached",
-            "all"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tz": {
-          "default": "utc",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggregate": {
+              "default": "false",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "days": {
+              "description": "Daily trailing-window size; defaults to 7 and is ignored for monthly",
+              "type": "integer"
+            },
+            "granularity": {
+              "default": "daily",
+              "enum": [
+                "daily",
+                "monthly"
+              ],
+              "type": "string"
+            },
+            "response_status": {
+              "default": "success",
+              "description": "Response status to count; 'all' counts every status",
+              "enum": [
+                "success",
+                "error",
+                "cached",
+                "all"
+              ],
+              "type": "string"
+            },
+            "tz": {
+              "default": "utc",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -272,24 +288,21 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/ai-controls/mcp/analytics/tool-calls/timeseries`,
       query: [
-        ["granularity", args["granularity"], true],
-        ["aggregate", args["aggregate"], true],
-        ["tz", args["tz"], true],
-        ["days", args["days"], true],
-        ["response_status", args["response_status"], true],
+        ["granularity", param(args, "query", "granularity"), true],
+        ["aggregate", param(args, "query", "aggregate"), true],
+        ["tz", param(args, "query", "tz"), true],
+        ["days", param(args, "query", "days"), true],
+        ["response_status", param(args, "query", "response_status"), true],
       ],
     }),
   },
   {
     name: "mcp_portals_create",
     title: "Create a new MCP Portal",
-    description: "Creates a new MCP portal for managing AI tool access through Cloudflare Access.\n\nThis method is beta.",
+    description: "Creates a new MCP portal for managing AI tool access through Cloudflare Access.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/access/ai-controls/mcp/portals",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "allow_code_mode": {
@@ -416,11 +429,24 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1151,22 +1177,32 @@ export const tools: readonly Tool[] = [
   {
     name: "mcp_portals_delete",
     title: "Delete an MCP Portal",
-    description: "Deletes an MCP portal from the account.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the MCP portal.",
+    description: "Deletes an MCP portal from the account.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the MCP portal.\n\nDELETE /accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "id": {
-          "description": "Unique identifier for the MCP portal.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier for the MCP portal.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1363,29 +1399,45 @@ export const tools: readonly Tool[] = [
   {
     name: "mcp_portals_list",
     title: "List MCP Portals",
-    description: "Lists all MCP portals configured for the account.\n\nThis method is beta.",
+    description: "Lists all MCP portals configured for the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/access/ai-controls/mcp/portals",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Search by id, name, hostname",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search by id, name, hostname",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2108,31 +2160,41 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/ai-controls/mcp/portals`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
     name: "mcp_portals_read",
     title: "Read details of an MCP Portal",
-    description: "Read the details of a single MCP Portal, including its configured servers.\n\nThis method is beta.",
+    description: "Read the details of a single MCP Portal, including its configured servers.\n\nThis method is beta.\n\nGET /accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "id": {
-          "description": "Unique identifier for the MCP portal.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier for the MCP portal.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2854,58 +2916,74 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "mcp_portals_tool_call_analytics",
+    name: "mcp_portals_toolCallAnalytics",
     title: "Per-portal MCP tool-call timeseries",
-    description: "Returns daily or monthly tool-call counts for a portal.\n\nThis method is beta.",
+    description: "Returns daily or monthly tool-call counts for a portal.\n\nThis method is beta.\n\nGET /accounts/{account_id}/access/ai-controls/mcp/analytics/portals/{portal_id}/tool-calls/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "aggregate": {
-          "default": "false",
-          "enum": [
-            "true",
-            "false"
-          ],
-          "type": "string"
-        },
-        "days": {
-          "description": "Daily trailing-window size; defaults to 7 and is ignored for monthly",
-          "type": "integer"
-        },
-        "granularity": {
-          "default": "daily",
-          "enum": [
-            "daily",
-            "monthly"
-          ],
-          "type": "string"
-        },
-        "portal_id": {
-          "type": "string"
-        },
-        "response_status": {
-          "default": "success",
-          "description": "Response status to count; 'all' counts every status",
-          "enum": [
-            "success",
-            "error",
-            "cached",
-            "all"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "portal_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "portal_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tz": {
-          "default": "utc",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggregate": {
+              "default": "false",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "days": {
+              "description": "Daily trailing-window size; defaults to 7 and is ignored for monthly",
+              "type": "integer"
+            },
+            "granularity": {
+              "default": "daily",
+              "enum": [
+                "daily",
+                "monthly"
+              ],
+              "type": "string"
+            },
+            "response_status": {
+              "default": "success",
+              "description": "Response status to count; 'all' counts every status",
+              "enum": [
+                "success",
+                "error",
+                "cached",
+                "all"
+              ],
+              "type": "string"
+            },
+            "tz": {
+              "default": "utc",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "portal_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3122,24 +3200,21 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/ai-controls/mcp/analytics/portals/${pathParam(args, "portal_id")}/tool-calls/timeseries`,
       query: [
-        ["granularity", args["granularity"], true],
-        ["aggregate", args["aggregate"], true],
-        ["tz", args["tz"], true],
-        ["days", args["days"], true],
-        ["response_status", args["response_status"], true],
+        ["granularity", param(args, "query", "granularity"), true],
+        ["aggregate", param(args, "query", "aggregate"), true],
+        ["tz", param(args, "query", "tz"), true],
+        ["days", param(args, "query", "days"), true],
+        ["response_status", param(args, "query", "response_status"), true],
       ],
     }),
   },
   {
     name: "mcp_portals_update",
     title: "Update an MCP Portal",
-    description: "Updates an MCP portal configuration.\n\nThis method is beta.",
+    description: "Updates an MCP portal configuration.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "allow_code_mode": {
@@ -3258,15 +3333,28 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "id": {
-          "description": "Unique identifier for the MCP portal.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier for the MCP portal.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/mcp/servers/tools.ts b/src/generated/forge-mcp/mcp/servers/tools.ts
index b2814f0f7..463a879b5 100644
--- a/src/generated/forge-mcp/mcp/servers/tools.ts
+++ b/src/generated/forge-mcp/mcp/servers/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `mcp.servers`.
@@ -10,13 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "mcp_servers_create",
     title: "Create a new MCP Server",
-    description: "Creates a new MCP server for connecting to an upstream MCP endpoint.\n\nThis method is beta.",
+    description: "Creates a new MCP server for connecting to an upstream MCP endpoint.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/access/ai-controls/mcp/servers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "auth_credentials": {
@@ -133,11 +130,24 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -714,22 +724,32 @@ export const tools: readonly Tool[] = [
   {
     name: "mcp_servers_delete",
     title: "Delete an MCP Server",
-    description: "Deletes an MCP server from the account.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the MCP server, removes it from every portal, and deletes its stored OAuth secrets.",
+    description: "Deletes an MCP server from the account.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the MCP server, removes it from every portal, and deletes its stored OAuth secrets.\n\nDELETE /accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "id": {
-          "description": "Unique identifier for the MCP server.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier for the MCP server.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1298,29 +1318,45 @@ export const tools: readonly Tool[] = [
   {
     name: "mcp_servers_list",
     title: "List MCP Servers",
-    description: "Lists all MCP servers configured for the account.\n\nThis method is beta.",
+    description: "Lists all MCP servers configured for the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/access/ai-controls/mcp/servers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Search by id, name",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search by id, name",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1889,31 +1925,41 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/ai-controls/mcp/servers`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
     name: "mcp_servers_read",
     title: "Read the details of an MCP Server",
-    description: "Retrieves an MCP server's configuration and capability sync state.\n\nThis method is beta.",
+    description: "Retrieves an MCP server's configuration and capability sync state.\n\nThis method is beta.\n\nGET /accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "id": {
-          "description": "Unique identifier for the MCP server.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier for the MCP server.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2483,22 +2529,32 @@ export const tools: readonly Tool[] = [
   {
     name: "mcp_servers_sync",
     title: "Sync MCP Server Capabilities",
-    description: "Syncs an MCP server's capabilities and returns the updated server state, including any connection errors.\n\nThis method is beta.",
+    description: "Syncs an MCP server's capabilities and returns the updated server state, including any connection errors.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/access/ai-controls/mcp/servers/{id}/sync",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "id": {
-          "description": "Unique identifier for the MCP server.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier for the MCP server.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2665,58 +2721,74 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "mcp_servers_tool_call_analytics",
+    name: "mcp_servers_toolCallAnalytics",
     title: "Per-server MCP tool-call timeseries",
-    description: "Returns daily or monthly tool-call counts for a server.\n\nThis method is beta.",
+    description: "Returns daily or monthly tool-call counts for a server.\n\nThis method is beta.\n\nGET /accounts/{account_id}/access/ai-controls/mcp/analytics/servers/{server_id}/tool-calls/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "aggregate": {
-          "default": "false",
-          "enum": [
-            "true",
-            "false"
-          ],
-          "type": "string"
-        },
-        "days": {
-          "description": "Daily trailing-window size; defaults to 7 and is ignored for monthly",
-          "type": "integer"
-        },
-        "granularity": {
-          "default": "daily",
-          "enum": [
-            "daily",
-            "monthly"
-          ],
-          "type": "string"
-        },
-        "response_status": {
-          "default": "success",
-          "description": "Response status to count; 'all' counts every status",
-          "enum": [
-            "success",
-            "error",
-            "cached",
-            "all"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "server_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "server_id"
           ],
-          "type": "string"
-        },
-        "server_id": {
-          "type": "string"
+          "type": "object"
         },
-        "tz": {
-          "default": "utc",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggregate": {
+              "default": "false",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            },
+            "days": {
+              "description": "Daily trailing-window size; defaults to 7 and is ignored for monthly",
+              "type": "integer"
+            },
+            "granularity": {
+              "default": "daily",
+              "enum": [
+                "daily",
+                "monthly"
+              ],
+              "type": "string"
+            },
+            "response_status": {
+              "default": "success",
+              "description": "Response status to count; 'all' counts every status",
+              "enum": [
+                "success",
+                "error",
+                "cached",
+                "all"
+              ],
+              "type": "string"
+            },
+            "tz": {
+              "default": "utc",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "server_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2933,24 +3005,21 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/ai-controls/mcp/analytics/servers/${pathParam(args, "server_id")}/tool-calls/timeseries`,
       query: [
-        ["granularity", args["granularity"], true],
-        ["aggregate", args["aggregate"], true],
-        ["tz", args["tz"], true],
-        ["days", args["days"], true],
-        ["response_status", args["response_status"], true],
+        ["granularity", param(args, "query", "granularity"), true],
+        ["aggregate", param(args, "query", "aggregate"), true],
+        ["tz", param(args, "query", "tz"), true],
+        ["days", param(args, "query", "days"), true],
+        ["response_status", param(args, "query", "response_status"), true],
       ],
     }),
   },
   {
     name: "mcp_servers_update",
     title: "Update an MCP Server",
-    description: "Updates an MCP server's configuration and credentials.\n\nThis method is beta.",
+    description: "Updates an MCP server's configuration and credentials.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "auth_credentials": {
@@ -3045,15 +3114,28 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "id": {
-          "description": "Unique identifier for the MCP server.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier for the MCP server.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/media/usage/tools.ts b/src/generated/forge-mcp/media/usage/tools.ts
index 1712c34ff..ecec493a0 100644
--- a/src/generated/forge-mcp/media/usage/tools.ts
+++ b/src/generated/forge-mcp/media/usage/tools.ts
@@ -1,15 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  usage_analytics_api_error_output,
-  usage_analytics_api_message_output,
-  usage_analytics_error_response_output,
-  usage_analytics_stream_usage_data_point_output,
-  usage_analytics_stream_usage_response_output,
+  usage$$analytics_api_error,
+  usage$$analytics_api_message,
+  usage$$analytics_error_response,
+  usage$$analytics_stream_usage_data_point,
+  usage$$analytics_stream_usage_response,
 } from "../../outputs.js";
-import { usage_analytics_identifier } from "../../schemas.js";
 
 /**
  * The tools of `media.usage`.
@@ -18,74 +17,87 @@ export const tools: readonly Tool[] = [
   {
     name: "media_usage_get",
     title: "Get account or zone Media usage",
-    description: "Retrieve Media usage analytics for an account or zone. This endpoint shares the same backend handler as the Stream usage endpoint and returns identical Stream metrics (streamMinutesViewed). The gateway rewrites this path to the shared usage handler.\n\nThis method is deprecated.",
+    description: "Retrieve Media usage analytics for an account or zone. This endpoint shares the same backend handler as the Stream usage endpoint and returns identical Stream metrics (streamMinutesViewed). The gateway rewrites this path to the shared usage handler.\n\nThis method is deprecated.\n\nGET /{account_or_zone}/{account_or_zone_id}/media/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/usage-analytics_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "filters": {
-          "description": "Filter expressions to apply to the query. Format: field==value. Multiple filters can be combined.\n",
-          "type": "string"
-        },
-        "limit": {
-          "default": 100,
-          "description": "Maximum number of data points to return. The actual number of results depends on the interaction between the time range (since/until) and time_delta granularity. Results are truncated to this limit without error if the time range produces more data points than the limit allows.\n",
-          "type": "integer"
-        },
-        "metrics": {
-          "description": "Comma-separated list of metrics to include in the response. Available metrics depend on the endpoint. Billing usage supports: streamMinutesViewed, rateLimitingRequestsAllowed, loadBalancingQueries, argoAcceleratedBytes, workersRequests, workersKVReads, imageResizingRequests, spectrumBytesTransferred, mediaUniqueTransformations. Stream/media usage supports: streamMinutesViewed.\n",
-          "type": "string"
-        },
-        "since": {
-          "description": "Start of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to 6 hours before the current time.\n",
-          "format": "date-time",
-          "type": "string"
-        },
-        "time_delta": {
-          "default": "hour",
-          "description": "Time unit to aggregate usage observations into. Data retention is approximately 18 months. The effective number of data points returned depends on the time range and granularity selected. For example, requesting hourly granularity over 18 months could produce up to ~13,000 data points; use the limit parameter to cap results and be aware that responses may be truncated.\n",
-          "enum": [
-            "hour",
-            "day",
-            "week",
-            "month",
-            "quarter",
-            "year"
-          ],
-          "type": "string"
-        },
-        "until": {
-          "description": "End of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to the current time.\n",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "filters": {
+              "description": "Filter expressions to apply to the query. Format: field==value. Multiple filters can be combined.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 100,
+              "description": "Maximum number of data points to return. The actual number of results depends on the interaction between the time range (since/until) and time_delta granularity. Results are truncated to this limit without error if the time range produces more data points than the limit allows.",
+              "type": "integer"
+            },
+            "metrics": {
+              "description": "Comma-separated list of metrics to include in the response. Available metrics depend on the endpoint. Billing usage supports: streamMinutesViewed, rateLimitingRequestsAllowed, loadBalancingQueries, argoAcceleratedBytes, workersRequests, workersKVReads, imageResizingRequests, spectrumBytesTransferred, mediaUniqueTransformations. Stream/media usage supports: streamMinutesViewed.",
+              "type": "string"
+            },
+            "since": {
+              "description": "Start of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to 6 hours before the current time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "time_delta": {
+              "default": "hour",
+              "description": "Time unit to aggregate usage observations into. Data retention is approximately 18 months. The effective number of data points returned depends on the time range and granularity selected. For example, requesting hourly granularity over 18 months could produce up to ~13,000 data points; use the limit parameter to cap results and be aware that responses may be truncated.",
+              "enum": [
+                "hour",
+                "day",
+                "week",
+                "month",
+                "quarter",
+                "year"
+              ],
+              "type": "string"
+            },
+            "until": {
+              "description": "End of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to the current time.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "usage-analytics_identifier": usage_analytics_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/usage-analytics_stream_usage_response",
       $defs: {
-        "usage-analytics_api_error": usage_analytics_api_error_output,
-        "usage-analytics_api_message": usage_analytics_api_message_output,
-        "usage-analytics_stream_usage_data_point": usage_analytics_stream_usage_data_point_output,
-        "usage-analytics_stream_usage_response": usage_analytics_stream_usage_response_output,
+        "usage-analytics_api_error": usage$$analytics_api_error,
+        "usage-analytics_api_message": usage$$analytics_api_message,
+        "usage-analytics_stream_usage_data_point": usage$$analytics_stream_usage_data_point,
+        "usage-analytics_stream_usage_response": usage$$analytics_stream_usage_response,
       },
     },
     annotations: {
@@ -118,22 +130,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "usage-analytics_api_error": usage_analytics_api_error_output,
-        "usage-analytics_api_message": usage_analytics_api_message_output,
-        "usage-analytics_error_response": usage_analytics_error_response_output,
-        "usage-analytics_stream_usage_data_point": usage_analytics_stream_usage_data_point_output,
-        "usage-analytics_stream_usage_response": usage_analytics_stream_usage_response_output,
+        "usage-analytics_api_error": usage$$analytics_api_error,
+        "usage-analytics_api_message": usage$$analytics_api_message,
+        "usage-analytics_error_response": usage$$analytics_error_response,
+        "usage-analytics_stream_usage_data_point": usage$$analytics_stream_usage_data_point,
+        "usage-analytics_stream_usage_response": usage$$analytics_stream_usage_response,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/media/usage`,
       query: [
-        ["metrics", args["metrics"], true],
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["time_delta", args["time_delta"], true],
-        ["limit", args["limit"], true],
-        ["filters", args["filters"], true],
+        ["metrics", param(args, "query", "metrics"), true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["time_delta", param(args, "query", "time_delta"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["filters", param(args, "query", "filters"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/mesh/nodes/configurations/outputs.ts b/src/generated/forge-mcp/mesh/nodes/configurations/outputs.ts
index 5b60ba2ad..3a951ac5a 100644
--- a/src/generated/forge-mcp/mesh/nodes/configurations/outputs.ts
+++ b/src/generated/forge-mcp/mesh/nodes/configurations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `tunnel_mesh_aws_config` in responses.
  */
-export const tunnel_mesh_aws_config_output: JsonSchema = {
+export const tunnel_mesh_aws_config: JsonSchema = {
   "properties": {
     "fnr_id": {
       "type": "string"
@@ -21,7 +21,7 @@ export const tunnel_mesh_aws_config_output: JsonSchema = {
 /**
  * The schema of `tunnel_mesh_configuration_response` in responses.
  */
-export const tunnel_mesh_configuration_response_output: JsonSchema = {
+export const tunnel_mesh_configuration_response: JsonSchema = {
   "properties": {
     "config": {
       "oneOf": [
@@ -40,16 +40,32 @@ export const tunnel_mesh_configuration_response_output: JsonSchema = {
       "type": "integer"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "ha_mode": {
-      "$ref": "#/$defs/tunnel_mesh_ha_mode"
+      "enum": [
+        "none",
+        "disabled",
+        "aws",
+        "local"
+      ],
+      "type": "string"
     },
     "tunnel_id": {
-      "$ref": "#/$defs/tunnel_tunnel_id-2"
+      "format": "uuid",
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/tunnel_updated_at"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "required": [
@@ -64,7 +80,7 @@ export const tunnel_mesh_configuration_response_output: JsonSchema = {
 /**
  * The schema of `tunnel_mesh_configuration_response_single` in responses.
  */
-export const tunnel_mesh_configuration_response_single_output: JsonSchema = {
+export const tunnel_mesh_configuration_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-single-2"
@@ -80,23 +96,10 @@ export const tunnel_mesh_configuration_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `tunnel_mesh_ha_mode` in responses.
- */
-export const tunnel_mesh_ha_mode_output: JsonSchema = {
-  "enum": [
-    "none",
-    "disabled",
-    "aws",
-    "local"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_mesh_local_config` in responses.
  */
-export const tunnel_mesh_local_config_output: JsonSchema = {
+export const tunnel_mesh_local_config: JsonSchema = {
   "properties": {
     "vips": {
       "items": {
@@ -123,7 +126,7 @@ export const tunnel_mesh_local_config_output: JsonSchema = {
 /**
  * The schema of `tunnel_mesh_vip_entry` in responses.
  */
-export const tunnel_mesh_vip_entry_output: JsonSchema = {
+export const tunnel_mesh_vip_entry: JsonSchema = {
   "properties": {
     "address": {
       "type": "string"
@@ -134,18 +137,3 @@ export const tunnel_mesh_vip_entry_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `tunnel_updated_at` in responses.
- */
-export const tunnel_updated_at_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/mesh/nodes/configurations/schemas.ts b/src/generated/forge-mcp/mesh/nodes/configurations/schemas.ts
index a64a3cc65..6a4ba42bc 100644
--- a/src/generated/forge-mcp/mesh/nodes/configurations/schemas.ts
+++ b/src/generated/forge-mcp/mesh/nodes/configurations/schemas.ts
@@ -42,8 +42,14 @@ export const tunnel_mesh_configuration_request_body: JsonSchema = {
       ]
     },
     "ha_mode": {
-      "$ref": "#/$defs/tunnel_mesh_ha_mode",
-      "description": "High-availability mode for the Mesh node. `none` means HA is enabled but no provider is configured yet (newly created nodes default to this). `disabled` means HA is explicitly turned off. `aws` uses AWS ENI move for failover. `local` uses virtual IPs (VIPs) on the local interface."
+      "description": "High-availability mode for the Mesh node. `none` means HA is enabled but no provider is configured yet (newly created nodes default to this). `disabled` means HA is explicitly turned off. `aws` uses AWS ENI move for failover. `local` uses virtual IPs (VIPs) on the local interface.",
+      "enum": [
+        "none",
+        "disabled",
+        "aws",
+        "local"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -52,20 +58,6 @@ export const tunnel_mesh_configuration_request_body: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_mesh_ha_mode`.
- */
-export const tunnel_mesh_ha_mode: JsonSchema = {
-  "description": "High-availability mode for the Mesh node. `none` means HA is enabled but no provider is configured yet (newly created nodes default to this). `disabled` means HA is explicitly turned off. `aws` uses AWS ENI move for failover. `local` uses virtual IPs (VIPs) on the local interface.",
-  "enum": [
-    "none",
-    "disabled",
-    "aws",
-    "local"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_mesh_local_config`.
  */
diff --git a/src/generated/forge-mcp/mesh/nodes/configurations/tools.ts b/src/generated/forge-mcp/mesh/nodes/configurations/tools.ts
index bf2a3beb2..f6a5c6931 100644
--- a/src/generated/forge-mcp/mesh/nodes/configurations/tools.ts
+++ b/src/generated/forge-mcp/mesh/nodes/configurations/tools.ts
@@ -3,28 +3,22 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_2_output,
-  tunnel_api_response_single_2_output,
-  tunnel_created_at_output,
-  tunnel_messages_2_output,
-  tunnel_tunnel_id_2_output,
+  tunnel_api$$response$$common$$failure$$2,
+  tunnel_api$$response$$single$$2,
+  tunnel_messages$$2,
 } from "../../../outputs.js";
-import { tunnel_identifier, tunnel_tunnel_id_2 } from "../../../schemas.js";
-import {
-  tunnel_mesh_aws_config_output,
-  tunnel_mesh_configuration_response_output,
-  tunnel_mesh_configuration_response_single_output,
-  tunnel_mesh_ha_mode_output,
-  tunnel_mesh_local_config_output,
-  tunnel_mesh_vip_entry_output,
-  tunnel_updated_at_output,
-} from "./outputs.js";
 import {
   tunnel_mesh_aws_config,
-  tunnel_mesh_configuration_request_body,
-  tunnel_mesh_ha_mode,
+  tunnel_mesh_configuration_response,
+  tunnel_mesh_configuration_response_single,
   tunnel_mesh_local_config,
   tunnel_mesh_vip_entry,
+} from "./outputs.js";
+import {
+  tunnel_mesh_aws_config as tunnel_mesh_aws_config$,
+  tunnel_mesh_configuration_request_body,
+  tunnel_mesh_local_config as tunnel_mesh_local_config$,
+  tunnel_mesh_vip_entry as tunnel_mesh_vip_entry$,
 } from "./schemas.js";
 
 /**
@@ -34,42 +28,45 @@ export const tools: readonly Tool[] = [
   {
     name: "mesh_nodes_configurations_get",
     title: "Get Mesh node HA configuration",
-    description: "Gets the high-availability configuration for a Mesh node.",
+    description: "Gets the high-availability configuration for a Mesh node.\n\nGET /accounts/{account_id}/warp_connector/{tunnel_id}/configurations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_identifier",
-          "description": "Identifier."
-        },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id-2",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_identifier": tunnel_identifier,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_mesh_configuration_response_single",
       $defs: {
-        "tunnel_api-response-single-2": tunnel_api_response_single_2_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_mesh_aws_config": tunnel_mesh_aws_config_output,
-        "tunnel_mesh_configuration_response": tunnel_mesh_configuration_response_output,
-        "tunnel_mesh_configuration_response_single": tunnel_mesh_configuration_response_single_output,
-        "tunnel_mesh_ha_mode": tunnel_mesh_ha_mode_output,
-        "tunnel_mesh_local_config": tunnel_mesh_local_config_output,
-        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry_output,
-        "tunnel_messages-2": tunnel_messages_2_output,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2_output,
-        "tunnel_updated_at": tunnel_updated_at_output,
+        "tunnel_api-response-single-2": tunnel_api$$response$$single$$2,
+        "tunnel_mesh_aws_config": tunnel_mesh_aws_config,
+        "tunnel_mesh_configuration_response": tunnel_mesh_configuration_response,
+        "tunnel_mesh_configuration_response_single": tunnel_mesh_configuration_response_single,
+        "tunnel_mesh_local_config": tunnel_mesh_local_config,
+        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry,
+        "tunnel_messages-2": tunnel_messages$$2,
       },
     },
     annotations: {
@@ -99,18 +96,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common-failure-2": tunnel_api_response_common_failure_2_output,
-        "tunnel_api-response-single-2": tunnel_api_response_single_2_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_mesh_aws_config": tunnel_mesh_aws_config_output,
-        "tunnel_mesh_configuration_response": tunnel_mesh_configuration_response_output,
-        "tunnel_mesh_configuration_response_single": tunnel_mesh_configuration_response_single_output,
-        "tunnel_mesh_ha_mode": tunnel_mesh_ha_mode_output,
-        "tunnel_mesh_local_config": tunnel_mesh_local_config_output,
-        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry_output,
-        "tunnel_messages-2": tunnel_messages_2_output,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2_output,
-        "tunnel_updated_at": tunnel_updated_at_output,
+        "tunnel_api-response-common-failure-2": tunnel_api$$response$$common$$failure$$2,
+        "tunnel_api-response-single-2": tunnel_api$$response$$single$$2,
+        "tunnel_mesh_aws_config": tunnel_mesh_aws_config,
+        "tunnel_mesh_configuration_response": tunnel_mesh_configuration_response,
+        "tunnel_mesh_configuration_response_single": tunnel_mesh_configuration_response_single,
+        "tunnel_mesh_local_config": tunnel_mesh_local_config,
+        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry,
+        "tunnel_messages-2": tunnel_messages$$2,
       },
     },
     request: (args) => ({
@@ -120,51 +113,55 @@ export const tools: readonly Tool[] = [
   {
     name: "mesh_nodes_configurations_update",
     title: "Update Mesh node HA configuration",
-    description: "Adds or updates the high-availability configuration for a Mesh node.",
+    description: "Adds or updates the high-availability configuration for a Mesh node.\n\nPUT /accounts/{account_id}/warp_connector/{tunnel_id}/configurations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/tunnel_mesh_configuration_request_body"
         },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id-2",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tunnel_identifier": tunnel_identifier,
-        "tunnel_mesh_aws_config": tunnel_mesh_aws_config,
+        "tunnel_mesh_aws_config": tunnel_mesh_aws_config$,
         "tunnel_mesh_configuration_request_body": tunnel_mesh_configuration_request_body,
-        "tunnel_mesh_ha_mode": tunnel_mesh_ha_mode,
-        "tunnel_mesh_local_config": tunnel_mesh_local_config,
-        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2,
+        "tunnel_mesh_local_config": tunnel_mesh_local_config$,
+        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_mesh_configuration_response_single",
       $defs: {
-        "tunnel_api-response-single-2": tunnel_api_response_single_2_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_mesh_aws_config": tunnel_mesh_aws_config_output,
-        "tunnel_mesh_configuration_response": tunnel_mesh_configuration_response_output,
-        "tunnel_mesh_configuration_response_single": tunnel_mesh_configuration_response_single_output,
-        "tunnel_mesh_ha_mode": tunnel_mesh_ha_mode_output,
-        "tunnel_mesh_local_config": tunnel_mesh_local_config_output,
-        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry_output,
-        "tunnel_messages-2": tunnel_messages_2_output,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2_output,
-        "tunnel_updated_at": tunnel_updated_at_output,
+        "tunnel_api-response-single-2": tunnel_api$$response$$single$$2,
+        "tunnel_mesh_aws_config": tunnel_mesh_aws_config,
+        "tunnel_mesh_configuration_response": tunnel_mesh_configuration_response,
+        "tunnel_mesh_configuration_response_single": tunnel_mesh_configuration_response_single,
+        "tunnel_mesh_local_config": tunnel_mesh_local_config,
+        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry,
+        "tunnel_messages-2": tunnel_messages$$2,
       },
     },
     annotations: {
@@ -192,18 +189,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common-failure-2": tunnel_api_response_common_failure_2_output,
-        "tunnel_api-response-single-2": tunnel_api_response_single_2_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_mesh_aws_config": tunnel_mesh_aws_config_output,
-        "tunnel_mesh_configuration_response": tunnel_mesh_configuration_response_output,
-        "tunnel_mesh_configuration_response_single": tunnel_mesh_configuration_response_single_output,
-        "tunnel_mesh_ha_mode": tunnel_mesh_ha_mode_output,
-        "tunnel_mesh_local_config": tunnel_mesh_local_config_output,
-        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry_output,
-        "tunnel_messages-2": tunnel_messages_2_output,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2_output,
-        "tunnel_updated_at": tunnel_updated_at_output,
+        "tunnel_api-response-common-failure-2": tunnel_api$$response$$common$$failure$$2,
+        "tunnel_api-response-single-2": tunnel_api$$response$$single$$2,
+        "tunnel_mesh_aws_config": tunnel_mesh_aws_config,
+        "tunnel_mesh_configuration_response": tunnel_mesh_configuration_response,
+        "tunnel_mesh_configuration_response_single": tunnel_mesh_configuration_response_single,
+        "tunnel_mesh_local_config": tunnel_mesh_local_config,
+        "tunnel_mesh_vip_entry": tunnel_mesh_vip_entry,
+        "tunnel_messages-2": tunnel_messages$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/mesh/nodes/connections/outputs.ts b/src/generated/forge-mcp/mesh/nodes/connections/outputs.ts
index 2c169a6fc..11fb355cf 100644
--- a/src/generated/forge-mcp/mesh/nodes/connections/outputs.ts
+++ b/src/generated/forge-mcp/mesh/nodes/connections/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `tunnel_tunnel_warp_connector_connections_response` in
  * responses.
  */
-export const tunnel_tunnel_warp_connector_connections_response_output: JsonSchema = {
+export const tunnel_tunnel_warp_connector_connections_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
diff --git a/src/generated/forge-mcp/mesh/nodes/connections/tools.ts b/src/generated/forge-mcp/mesh/nodes/connections/tools.ts
index a910cdc7b..5354c265d 100644
--- a/src/generated/forge-mcp/mesh/nodes/connections/tools.ts
+++ b/src/generated/forge-mcp/mesh/nodes/connections/tools.ts
@@ -3,28 +3,19 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_arch_output,
-  tunnel_client_id_output,
-  tunnel_colo_name_output,
-  tunnel_connection_id_output,
-  tunnel_features_output,
-  tunnel_ip_output,
-  tunnel_messages_output,
-  tunnel_result_info_output,
-  tunnel_run_at_output,
-  tunnel_version_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_features,
+  tunnel_messages,
+  tunnel_result_info,
 } from "../../../outputs.js";
-import { tunnel_account_id, tunnel_tunnel_id } from "../../../schemas.js";
 import {
-  tunnel_ha_status_output,
-  tunnel_schemas_warp_connector_connection_output,
-  tunnel_tunnel_warp_connector_client_output,
-  tunnel_warp_connector_connections_output,
+  tunnel_schemas$$warp$$connector$$connection,
+  tunnel_tunnel_warp_connector_client,
+  tunnel_warp_connector_connections,
 } from "../outputs.js";
-import { tunnel_tunnel_warp_connector_connections_response_output } from "./outputs.js";
+import { tunnel_tunnel_warp_connector_connections_response } from "./outputs.js";
 
 /**
  * The tools of `mesh.nodes.connections`.
@@ -33,48 +24,47 @@ export const tools: readonly Tool[] = [
   {
     name: "mesh_nodes_connections_list",
     title: "List Mesh node connections",
-    description: "Lists connection details for a Mesh node.",
+    description: "Lists connection details for a Mesh node.\n\nGET /accounts/{account_id}/warp_connector/{tunnel_id}/connections",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "node_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "node_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_tunnel_warp_connector_connections_response",
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_arch": tunnel_arch_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_features": tunnel_features_output,
-        "tunnel_ha_status": tunnel_ha_status_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_run_at": tunnel_run_at_output,
-        "tunnel_schemas-warp-connector-connection": tunnel_schemas_warp_connector_connection_output,
-        "tunnel_tunnel_warp_connector_client": tunnel_tunnel_warp_connector_client_output,
-        "tunnel_tunnel_warp_connector_connections_response": tunnel_tunnel_warp_connector_connections_response_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp_connector_connections": tunnel_warp_connector_connections_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_features": tunnel_features,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-warp-connector-connection": tunnel_schemas$$warp$$connector$$connection,
+        "tunnel_tunnel_warp_connector_client": tunnel_tunnel_warp_connector_client,
+        "tunnel_tunnel_warp_connector_connections_response": tunnel_tunnel_warp_connector_connections_response,
+        "tunnel_warp_connector_connections": tunnel_warp_connector_connections,
       },
     },
     annotations: {
@@ -111,28 +101,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_arch": tunnel_arch_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_features": tunnel_features_output,
-        "tunnel_ha_status": tunnel_ha_status_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_run_at": tunnel_run_at_output,
-        "tunnel_schemas-warp-connector-connection": tunnel_schemas_warp_connector_connection_output,
-        "tunnel_tunnel_warp_connector_client": tunnel_tunnel_warp_connector_client_output,
-        "tunnel_tunnel_warp_connector_connections_response": tunnel_tunnel_warp_connector_connections_response_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp_connector_connections": tunnel_warp_connector_connections_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_features": tunnel_features,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-warp-connector-connection": tunnel_schemas$$warp$$connector$$connection,
+        "tunnel_tunnel_warp_connector_client": tunnel_tunnel_warp_connector_client,
+        "tunnel_tunnel_warp_connector_connections_response": tunnel_tunnel_warp_connector_connections_response,
+        "tunnel_warp_connector_connections": tunnel_warp_connector_connections,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "node_id")}/connections`,
+      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "tunnel_id")}/connections`,
     }),
   },
 ];
diff --git a/src/generated/forge-mcp/mesh/nodes/connectors/outputs.ts b/src/generated/forge-mcp/mesh/nodes/connectors/outputs.ts
index 3d13f69ca..fe7cec092 100644
--- a/src/generated/forge-mcp/mesh/nodes/connectors/outputs.ts
+++ b/src/generated/forge-mcp/mesh/nodes/connectors/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `tunnel_tunnel_warp_connector_client_response` in responses.
  */
-export const tunnel_tunnel_warp_connector_client_response_output: JsonSchema = {
+export const tunnel_tunnel_warp_connector_client_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
diff --git a/src/generated/forge-mcp/mesh/nodes/connectors/tools.ts b/src/generated/forge-mcp/mesh/nodes/connectors/tools.ts
index 246d3ae17..230425807 100644
--- a/src/generated/forge-mcp/mesh/nodes/connectors/tools.ts
+++ b/src/generated/forge-mcp/mesh/nodes/connectors/tools.ts
@@ -3,30 +3,17 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_arch_output,
-  tunnel_client_id_output,
-  tunnel_colo_name_output,
-  tunnel_connection_id_output,
-  tunnel_features_output,
-  tunnel_ip_output,
-  tunnel_messages_output,
-  tunnel_run_at_output,
-  tunnel_version_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_features,
+  tunnel_messages,
 } from "../../../outputs.js";
 import {
-  tunnel_account_id,
-  tunnel_client_id,
-  tunnel_tunnel_id,
-} from "../../../schemas.js";
-import {
-  tunnel_ha_status_output,
-  tunnel_schemas_warp_connector_connection_output,
-  tunnel_tunnel_warp_connector_client_output,
-  tunnel_warp_connector_connections_output,
+  tunnel_schemas$$warp$$connector$$connection,
+  tunnel_tunnel_warp_connector_client,
+  tunnel_warp_connector_connections,
 } from "../outputs.js";
-import { tunnel_tunnel_warp_connector_client_response_output } from "./outputs.js";
+import { tunnel_tunnel_warp_connector_client_response } from "./outputs.js";
 
 /**
  * The tools of `mesh.nodes.connectors`.
@@ -35,52 +22,51 @@ export const tools: readonly Tool[] = [
   {
     name: "mesh_nodes_connectors_get",
     title: "Get a Mesh node connector",
-    description: "Fetches connector and connection details for a Mesh node.",
+    description: "Fetches connector and connection details for a Mesh node.\n\nGET /accounts/{account_id}/warp_connector/{tunnel_id}/connectors/{connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "connector_id": {
-          "$ref": "#/$defs/tunnel_client_id",
-          "description": "UUID of the Cloudflare Tunnel connector."
-        },
-        "node_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "connector_id": {
+              "description": "UUID of the Cloudflare Tunnel connector.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id",
+            "connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "node_id",
-        "connector_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_client_id": tunnel_client_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_tunnel_warp_connector_client_response",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_arch": tunnel_arch_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_features": tunnel_features_output,
-        "tunnel_ha_status": tunnel_ha_status_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_run_at": tunnel_run_at_output,
-        "tunnel_schemas-warp-connector-connection": tunnel_schemas_warp_connector_connection_output,
-        "tunnel_tunnel_warp_connector_client": tunnel_tunnel_warp_connector_client_output,
-        "tunnel_tunnel_warp_connector_client_response": tunnel_tunnel_warp_connector_client_response_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp_connector_connections": tunnel_warp_connector_connections_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_features": tunnel_features,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_schemas-warp-connector-connection": tunnel_schemas$$warp$$connector$$connection,
+        "tunnel_tunnel_warp_connector_client": tunnel_tunnel_warp_connector_client,
+        "tunnel_tunnel_warp_connector_client_response": tunnel_tunnel_warp_connector_client_response,
+        "tunnel_warp_connector_connections": tunnel_warp_connector_connections,
       },
     },
     annotations: {
@@ -117,26 +103,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_arch": tunnel_arch_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_features": tunnel_features_output,
-        "tunnel_ha_status": tunnel_ha_status_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_run_at": tunnel_run_at_output,
-        "tunnel_schemas-warp-connector-connection": tunnel_schemas_warp_connector_connection_output,
-        "tunnel_tunnel_warp_connector_client": tunnel_tunnel_warp_connector_client_output,
-        "tunnel_tunnel_warp_connector_client_response": tunnel_tunnel_warp_connector_client_response_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp_connector_connections": tunnel_warp_connector_connections_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_features": tunnel_features,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_schemas-warp-connector-connection": tunnel_schemas$$warp$$connector$$connection,
+        "tunnel_tunnel_warp_connector_client": tunnel_tunnel_warp_connector_client,
+        "tunnel_tunnel_warp_connector_client_response": tunnel_tunnel_warp_connector_client_response,
+        "tunnel_warp_connector_connections": tunnel_warp_connector_connections,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "node_id")}/connectors/${pathParam(args, "connector_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "tunnel_id")}/connectors/${pathParam(args, "connector_id")}`,
     }),
   },
 ];
diff --git a/src/generated/forge-mcp/mesh/nodes/outputs.ts b/src/generated/forge-mcp/mesh/nodes/outputs.ts
index 339f6b802..ac6cdae9e 100644
--- a/src/generated/forge-mcp/mesh/nodes/outputs.ts
+++ b/src/generated/forge-mcp/mesh/nodes/outputs.ts
@@ -3,41 +3,31 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tunnel_ha_status` in responses.
- */
-export const tunnel_ha_status_output: JsonSchema = {
-  "enum": [
-    "offline",
-    "passive",
-    "active"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_schemas-warp-connector-connection` in responses.
  */
-export const tunnel_schemas_warp_connector_connection_output: JsonSchema = {
+export const tunnel_schemas$$warp$$connector$$connection: JsonSchema = {
   "properties": {
     "client_id": {
-      "$ref": "#/$defs/tunnel_client_id"
+      "format": "uuid",
+      "type": "string"
     },
     "client_version": {
-      "$ref": "#/$defs/tunnel_version"
+      "type": "string"
     },
     "colo_name": {
-      "$ref": "#/$defs/tunnel_colo_name"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_connection_id"
+      "format": "uuid",
+      "type": "string"
     },
     "opened_at": {
       "format": "date-time",
       "type": "string"
     },
     "origin_ip": {
-      "$ref": "#/$defs/tunnel_ip"
+      "type": "string"
     }
   },
   "type": "object"
@@ -46,10 +36,10 @@ export const tunnel_schemas_warp_connector_connection_output: JsonSchema = {
 /**
  * The schema of `tunnel_tunnel_warp_connector_client` in responses.
  */
-export const tunnel_tunnel_warp_connector_client_output: JsonSchema = {
+export const tunnel_tunnel_warp_connector_client: JsonSchema = {
   "properties": {
     "arch": {
-      "$ref": "#/$defs/tunnel_arch"
+      "type": "string"
     },
     "conns": {
       "$ref": "#/$defs/tunnel_warp_connector_connections"
@@ -58,16 +48,23 @@ export const tunnel_tunnel_warp_connector_client_output: JsonSchema = {
       "$ref": "#/$defs/tunnel_features"
     },
     "ha_status": {
-      "$ref": "#/$defs/tunnel_ha_status"
+      "enum": [
+        "offline",
+        "passive",
+        "active"
+      ],
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_client_id"
+      "format": "uuid",
+      "type": "string"
     },
     "run_at": {
-      "$ref": "#/$defs/tunnel_run_at"
+      "format": "date-time",
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/tunnel_version"
+      "type": "string"
     }
   },
   "type": "object"
@@ -76,7 +73,7 @@ export const tunnel_tunnel_warp_connector_client_output: JsonSchema = {
 /**
  * The schema of `tunnel_warp-connector-response-collection` in responses.
  */
-export const tunnel_warp_connector_response_collection_output: JsonSchema = {
+export const tunnel_warp$$connector$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
@@ -98,7 +95,7 @@ export const tunnel_warp_connector_response_collection_output: JsonSchema = {
 /**
  * The schema of `tunnel_warp-connector-response-single` in responses.
  */
-export const tunnel_warp_connector_response_single_output: JsonSchema = {
+export const tunnel_warp$$connector$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -117,7 +114,7 @@ export const tunnel_warp_connector_response_single_output: JsonSchema = {
 /**
  * The schema of `tunnel_warp_connector_connections` in responses.
  */
-export const tunnel_warp_connector_connections_output: JsonSchema = {
+export const tunnel_warp_connector_connections: JsonSchema = {
   "items": {
     "$ref": "#/$defs/tunnel_schemas-warp-connector-connection"
   },
diff --git a/src/generated/forge-mcp/mesh/nodes/schemas.ts b/src/generated/forge-mcp/mesh/nodes/schemas.ts
deleted file mode 100644
index 5b05b40d9..000000000
--- a/src/generated/forge-mcp/mesh/nodes/schemas.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tunnel_client_id_input`.
- */
-export const tunnel_client_id_input: JsonSchema = {
-  "description": "UUID of the Cloudflare Tunnel connector.",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/mesh/nodes/token/tools.ts b/src/generated/forge-mcp/mesh/nodes/token/tools.ts
index 3b3043ba8..5ec1ea725 100644
--- a/src/generated/forge-mcp/mesh/nodes/token/tools.ts
+++ b/src/generated/forge-mcp/mesh/nodes/token/tools.ts
@@ -3,13 +3,11 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_messages_output,
-  tunnel_tunnel_response_token_output,
-  tunnel_tunnel_token_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
+  tunnel_tunnel_response_token,
 } from "../../../outputs.js";
-import { tunnel_account_id, tunnel_tunnel_id } from "../../../schemas.js";
 
 /**
  * The tools of `mesh.nodes.token`.
@@ -18,35 +16,41 @@ export const tools: readonly Tool[] = [
   {
     name: "mesh_nodes_token_get",
     title: "Get a Mesh node token",
-    description: "Gets the token used to associate a WARP device with a specific Mesh node.",
+    description: "Gets the token used to associate a WARP device with a specific Mesh node.\n\nGET /accounts/{account_id}/warp_connector/{tunnel_id}/token",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "node_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "node_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_tunnel_response_token",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_response_token": tunnel_tunnel_response_token_output,
-        "tunnel_tunnel_token": tunnel_tunnel_token_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_tunnel_response_token": tunnel_tunnel_response_token,
       },
     },
     annotations: {
@@ -82,15 +86,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_response_token": tunnel_tunnel_response_token_output,
-        "tunnel_tunnel_token": tunnel_tunnel_token_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_tunnel_response_token": tunnel_tunnel_response_token,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "node_id")}/token`,
+      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "tunnel_id")}/token`,
     }),
   },
 ];
diff --git a/src/generated/forge-mcp/mesh/nodes/tools.ts b/src/generated/forge-mcp/mesh/nodes/tools.ts
index 521948ea2..c75bfd0d2 100644
--- a/src/generated/forge-mcp/mesh/nodes/tools.ts
+++ b/src/generated/forge-mcp/mesh/nodes/tools.ts
@@ -1,49 +1,23 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tunnel_account_id_output,
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_client_id_output,
-  tunnel_colo_name_output,
-  tunnel_connection_id_output,
-  tunnel_connections_deprecated_output,
-  tunnel_conns_active_at_output,
-  tunnel_conns_inactive_at_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_empty_response_output,
-  tunnel_ip_output,
-  tunnel_is_pending_reconnect_output,
-  tunnel_messages_output,
-  tunnel_metadata_output,
-  tunnel_result_info_output,
-  tunnel_schemas_connection_output,
-  tunnel_status_output,
-  tunnel_tunnel_id_output,
-  tunnel_tunnel_name_output,
-  tunnel_tunnel_type_output,
-  tunnel_version_output,
-  tunnel_warp_connector_tunnel_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_connections_deprecated,
+  tunnel_empty_response,
+  tunnel_messages,
+  tunnel_metadata,
+  tunnel_result_info,
+  tunnel_schemas$$connection,
+  tunnel_warp_connector_tunnel,
 } from "../../outputs.js";
 import {
-  tunnel_account_id,
-  tunnel_existed_at,
-  tunnel_page_number,
-  tunnel_per_page,
-  tunnel_status,
-  tunnel_tunnel_id,
-  tunnel_tunnel_name,
-  tunnel_tunnel_secret,
-} from "../../schemas.js";
-import {
-  tunnel_warp_connector_response_collection_output,
-  tunnel_warp_connector_response_single_output,
+  tunnel_warp$$connector$$response$$collection,
+  tunnel_warp$$connector$$response$$single,
 } from "./outputs.js";
-import { tunnel_client_id_input } from "./schemas.js";
 
 /**
  * The tools of `mesh.nodes`.
@@ -52,14 +26,10 @@ export const tools: readonly Tool[] = [
   {
     name: "mesh_nodes_create",
     title: "Create a Mesh node",
-    description: "Creates a new Mesh node in an account.",
+    description: "Creates a new Mesh node in an account.\n\nPOST /accounts/{account_id}/warp_connector",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "ha": {
@@ -68,50 +38,45 @@ export const tools: readonly Tool[] = [
               "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_tunnel_name",
-              "description": "A user-friendly name for a tunnel."
+              "description": "A user-friendly name for a tunnel.",
+              "type": "string"
             }
           },
           "required": [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_name": tunnel_tunnel_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_warp-connector-response-single",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-single": tunnel_warp_connector_response_single_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-single": tunnel_warp$$connector$$response$$single,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     annotations: {
@@ -146,29 +111,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-single": tunnel_warp_connector_response_single_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-single": tunnel_warp$$connector$$response$$single,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     request: (args) => ({
@@ -179,53 +129,45 @@ export const tools: readonly Tool[] = [
   {
     name: "mesh_nodes_delete",
     title: "Delete a Mesh node",
-    description: "Deletes a Mesh node from an account.\n\nConfirm with the user before calling this tool. This operation permanently deletes a Mesh node.",
+    description: "Deletes a Mesh node from an account.\n\nConfirm with the user before calling this tool. This operation permanently deletes a Mesh node.\n\nDELETE /accounts/{account_id}/warp_connector/{tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "node_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "node_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_warp-connector-response-single",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-single": tunnel_warp_connector_response_single_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-single": tunnel_warp$$connector$$response$$single,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     annotations: {
@@ -260,101 +202,76 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-single": tunnel_warp_connector_response_single_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-single": tunnel_warp$$connector$$response$$single,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "node_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "tunnel_id")}`,
     }),
   },
   {
     name: "mesh_nodes_edit",
     title: "Update a Mesh node",
-    description: "Updates an existing Mesh node.",
+    description: "Updates an existing Mesh node.\n\nPATCH /accounts/{account_id}/warp_connector/{tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/tunnel_tunnel_name",
-              "description": "A user-friendly name for a tunnel."
+              "description": "A user-friendly name for a tunnel.",
+              "type": "string"
             },
             "tunnel_secret": {
-              "$ref": "#/$defs/tunnel_tunnel_secret",
-              "description": "Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string."
+              "description": "Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "node_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "node_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-        "tunnel_tunnel_name": tunnel_tunnel_name,
-        "tunnel_tunnel_secret": tunnel_tunnel_secret,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_warp-connector-response-single",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-single": tunnel_warp_connector_response_single_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-single": tunnel_warp$$connector$$response$$single,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     annotations: {
@@ -389,51 +306,34 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-single": tunnel_warp_connector_response_single_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-single": tunnel_warp$$connector$$response$$single,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "node_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "tunnel_id")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
     name: "mesh_nodes_failover",
     title: "Trigger a manual failover for a Mesh node",
-    description: "Triggers a manual failover for a specific Mesh node, setting the specified client as the active connector. The tunnel must be configured for high availability (HA) and the client must be linked to the tunnel.\n\nConfirm with the user before calling this tool. This operation triggers a manual failover, changing the active connector for a Mesh node.",
+    description: "Triggers a manual failover for a specific Mesh node, setting the specified client as the active connector. The tunnel must be configured for high availability (HA) and the client must be linked to the tunnel.\n\nConfirm with the user before calling this tool. This operation triggers a manual failover, changing the active connector for a Mesh node.\n\nPUT /accounts/{account_id}/warp_connector/{tunnel_id}/failover",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "client_id": {
-              "$ref": "#/$defs/tunnel_client_id_input"
+              "description": "UUID of the Cloudflare Tunnel connector.",
+              "format": "uuid",
+              "type": "string"
             }
           },
           "required": [
@@ -441,28 +341,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "node_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "node_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_client_id_input": tunnel_client_id_input,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_empty_response",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_empty_response": tunnel_empty_response_output,
-        "tunnel_messages": tunnel_messages_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_empty_response": tunnel_empty_response,
+        "tunnel_messages": tunnel_messages,
       },
     },
     annotations: {
@@ -497,67 +407,59 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_empty_response": tunnel_empty_response_output,
-        "tunnel_messages": tunnel_messages_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_empty_response": tunnel_empty_response,
+        "tunnel_messages": tunnel_messages,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "node_id")}/failover`,
+      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "tunnel_id")}/failover`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
     name: "mesh_nodes_get",
     title: "Get a Mesh node",
-    description: "Fetches a single Mesh node.",
+    description: "Fetches a single Mesh node.\n\nGET /accounts/{account_id}/warp_connector/{tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "node_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "node_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_warp-connector-response-single",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-single": tunnel_warp_connector_response_single_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-single": tunnel_warp$$connector$$response$$single,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     annotations: {
@@ -594,129 +496,114 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-single": tunnel_warp_connector_response_single_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-single": tunnel_warp$$connector$$response$$single,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "node_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/warp_connector/${pathParam(args, "tunnel_id")}`,
     }),
   },
   {
     name: "mesh_nodes_list",
     title: "List Mesh nodes",
-    description: "Lists and filters Mesh nodes in an account.",
+    description: "Lists and filters Mesh nodes in an account.\n\nGET /accounts/{account_id}/warp_connector",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "exclude_prefix": {
-          "type": "string"
-        },
-        "existed_at": {
-          "$ref": "#/$defs/tunnel_existed_at",
-          "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded."
-        },
-        "include_prefix": {
-          "type": "string"
-        },
-        "is_deleted": {
-          "description": "If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If empty, all tunnels will be included.",
-          "type": "boolean"
-        },
-        "name": {
-          "description": "A user-friendly name for the tunnel.",
-          "type": "string"
-        },
-        "page": {
-          "$ref": "#/$defs/tunnel_page_number",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/tunnel_per_page",
-          "description": "Number of results to display."
-        },
-        "status": {
-          "$ref": "#/$defs/tunnel_status",
-          "description": "The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge)."
-        },
-        "uuid": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
-        },
-        "was_active_at": {
-          "format": "date-time",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "was_inactive_at": {
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "exclude_prefix": {
+              "type": "string"
+            },
+            "existed_at": {
+              "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded.",
+              "type": "string"
+            },
+            "include_prefix": {
+              "type": "string"
+            },
+            "is_deleted": {
+              "description": "If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If empty, all tunnels will be included.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "A user-friendly name for the tunnel.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results to display.",
+              "type": "number"
+            },
+            "status": {
+              "description": "The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).",
+              "enum": [
+                "inactive",
+                "degraded",
+                "healthy",
+                "down"
+              ],
+              "type": "string"
+            },
+            "uuid": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "was_active_at": {
+              "format": "date-time",
+              "type": "string"
+            },
+            "was_inactive_at": {
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_existed_at": tunnel_existed_at,
-        "tunnel_page_number": tunnel_page_number,
-        "tunnel_per_page": tunnel_per_page,
-        "tunnel_status": tunnel_status,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_warp-connector-response-collection",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-collection": tunnel_warp_connector_response_collection_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-collection": tunnel_warp$$connector$$response$$collection,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     annotations: {
@@ -753,47 +640,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp-connector-response-collection": tunnel_warp_connector_response_collection_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_warp-connector-response-collection": tunnel_warp$$connector$$response$$collection,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/warp_connector`,
       query: [
-        ["name", args["name"], true],
-        ["is_deleted", args["is_deleted"], true],
-        ["existed_at", args["existed_at"], true],
-        ["uuid", args["uuid"], true],
-        ["was_active_at", args["was_active_at"], true],
-        ["was_inactive_at", args["was_inactive_at"], true],
-        ["include_prefix", args["include_prefix"], true],
-        ["exclude_prefix", args["exclude_prefix"], true],
-        ["status", args["status"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["is_deleted", param(args, "query", "is_deleted"), true],
+        ["existed_at", param(args, "query", "existed_at"), true],
+        ["uuid", param(args, "query", "uuid"), true],
+        ["was_active_at", param(args, "query", "was_active_at"), true],
+        ["was_inactive_at", param(args, "query", "was_inactive_at"), true],
+        ["include_prefix", param(args, "query", "include_prefix"), true],
+        ["exclude_prefix", param(args, "query", "exclude_prefix"), true],
+        ["status", param(args, "query", "status"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/monetization/accountEligibility/outputs.ts b/src/generated/forge-mcp/monetization/accountEligibility/outputs.ts
index c30cddbeb..8d565f48f 100644
--- a/src/generated/forge-mcp/monetization/accountEligibility/outputs.ts
+++ b/src/generated/forge-mcp/monetization/accountEligibility/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `monetization_monetization-account-eligibility-check-response`
  * in responses.
  */
-export const monetization_monetization_account_eligibility_check_response_output: JsonSchema = {
+export const monetization_monetization$$account$$eligibility$$check$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/monetization_api-response-common"
@@ -29,7 +29,7 @@ export const monetization_monetization_account_eligibility_check_response_output
 /**
  * The schema of `monetization_monetization-eligibility-response` in responses.
  */
-export const monetization_monetization_eligibility_response_output: JsonSchema = {
+export const monetization_monetization$$eligibility$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/monetization_api-response-common"
@@ -51,7 +51,7 @@ export const monetization_monetization_eligibility_response_output: JsonSchema =
 /**
  * The schema of `monetization_monetization-eligibility-result` in responses.
  */
-export const monetization_monetization_eligibility_result_output: JsonSchema = {
+export const monetization_monetization$$eligibility$$result: JsonSchema = {
   "properties": {
     "reasons": {
       "items": {
diff --git a/src/generated/forge-mcp/monetization/accountEligibility/schemas.ts b/src/generated/forge-mcp/monetization/accountEligibility/schemas.ts
index 136d5174a..8aaa00b9a 100644
--- a/src/generated/forge-mcp/monetization/accountEligibility/schemas.ts
+++ b/src/generated/forge-mcp/monetization/accountEligibility/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `monetization_account-identifier`.
- */
-export const monetization_account_identifier: JsonSchema = {
-  "description": "The unique ID of the account.",
-  "type": "string"
-};
-
 /**
  * The schema of `monetization_monetization-account-eligibility-check-input`.
  */
-export const monetization_monetization_account_eligibility_check_input: JsonSchema = {
+export const monetization_monetization$$account$$eligibility$$check$$input: JsonSchema = {
   "properties": {
     "acceptedTermsOfService": {
       "description": "Confirms acceptance of the Monetization Gateway terms of service.",
diff --git a/src/generated/forge-mcp/monetization/accountEligibility/tools.ts b/src/generated/forge-mcp/monetization/accountEligibility/tools.ts
index 681487726..446375c6e 100644
--- a/src/generated/forge-mcp/monetization/accountEligibility/tools.ts
+++ b/src/generated/forge-mcp/monetization/accountEligibility/tools.ts
@@ -3,64 +3,70 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  monetization_api_response_common_failure_output,
-  monetization_api_response_common_output,
-  monetization_response_info_output,
+  monetization_api$$response$$common,
+  monetization_api$$response$$common$$failure,
+  monetization_response$$info,
 } from "../outputs.js";
 import {
-  monetization_monetization_account_eligibility_check_response_output,
-  monetization_monetization_eligibility_response_output,
-  monetization_monetization_eligibility_result_output,
+  monetization_monetization$$account$$eligibility$$check$$response,
+  monetization_monetization$$eligibility$$response,
+  monetization_monetization$$eligibility$$result,
 } from "./outputs.js";
-import {
-  monetization_account_identifier,
-  monetization_monetization_account_eligibility_check_input,
-} from "./schemas.js";
+import { monetization_monetization$$account$$eligibility$$check$$input } from "./schemas.js";
 
 /**
- * The tools of `monetization.account_eligibility`.
+ * The tools of `monetization.accountEligibility`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "monetization_account_eligibility_check",
+    name: "monetization_accountEligibility_check",
     title: "Check account or zone monetization eligibility",
-    description: "Checks the account or zone for Monetization Gateway eligibility and returns its pending, approved, or rejected decision.\n\nThis method is beta.",
+    description: "Checks the account or zone for Monetization Gateway eligibility and returns its pending, approved, or rejected decision.\n\nThis method is beta.\n\nPOST /{account_or_zone}/{account_or_zone_id}/monetization",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/monetization_account-identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/monetization_monetization-account-eligibility-check-input"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "monetization_account-identifier": monetization_account_identifier,
-        "monetization_monetization-account-eligibility-check-input": monetization_monetization_account_eligibility_check_input,
+        "monetization_monetization-account-eligibility-check-input": monetization_monetization$$account$$eligibility$$check$$input,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/monetization_monetization-account-eligibility-check-response",
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_monetization-account-eligibility-check-response": monetization_monetization_account_eligibility_check_response_output,
-        "monetization_monetization-eligibility-result": monetization_monetization_eligibility_result_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_monetization-account-eligibility-check-response": monetization_monetization$$account$$eligibility$$check$$response,
+        "monetization_monetization-eligibility-result": monetization_monetization$$eligibility$$result,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     annotations: {
@@ -88,11 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_api-response-common-failure": monetization_api_response_common_failure_output,
-        "monetization_monetization-account-eligibility-check-response": monetization_monetization_account_eligibility_check_response_output,
-        "monetization_monetization-eligibility-result": monetization_monetization_eligibility_result_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_api-response-common-failure": monetization_api$$response$$common$$failure,
+        "monetization_monetization-account-eligibility-check-response": monetization_monetization$$account$$eligibility$$check$$response,
+        "monetization_monetization-eligibility-result": monetization_monetization$$eligibility$$result,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     request: (args) => ({
@@ -101,40 +107,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "monetization_account_eligibility_get",
+    name: "monetization_accountEligibility_get",
     title: "Get account or zone monetization eligibility",
-    description: "Returns the account or zone's latest stored monetization eligibility result.\n\nThis method is beta.",
+    description: "Returns the account or zone's latest stored monetization eligibility result.\n\nThis method is beta.\n\nGET /{account_or_zone}/{account_or_zone_id}/monetization",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/monetization_account-identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "monetization_account-identifier": monetization_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/monetization_monetization-eligibility-response",
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_monetization-eligibility-response": monetization_monetization_eligibility_response_output,
-        "monetization_monetization-eligibility-result": monetization_monetization_eligibility_result_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_monetization-eligibility-response": monetization_monetization$$eligibility$$response,
+        "monetization_monetization-eligibility-result": monetization_monetization$$eligibility$$result,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     annotations: {
@@ -165,11 +178,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_api-response-common-failure": monetization_api_response_common_failure_output,
-        "monetization_monetization-eligibility-response": monetization_monetization_eligibility_response_output,
-        "monetization_monetization-eligibility-result": monetization_monetization_eligibility_result_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_api-response-common-failure": monetization_api$$response$$common$$failure,
+        "monetization_monetization-eligibility-response": monetization_monetization$$eligibility$$response,
+        "monetization_monetization-eligibility-result": monetization_monetization$$eligibility$$result,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/monetization/outputs.ts b/src/generated/forge-mcp/monetization/outputs.ts
index 6d3c37b3f..336261d4a 100644
--- a/src/generated/forge-mcp/monetization/outputs.ts
+++ b/src/generated/forge-mcp/monetization/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `monetization_api-response-common` in responses.
  */
-export const monetization_api_response_common_output: JsonSchema = {
+export const monetization_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -38,7 +38,7 @@ export const monetization_api_response_common_output: JsonSchema = {
 /**
  * The schema of `monetization_api-response-common-failure` in responses.
  */
-export const monetization_api_response_common_failure_output: JsonSchema = {
+export const monetization_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -75,7 +75,7 @@ export const monetization_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `monetization_response-info` in responses.
  */
-export const monetization_response_info_output: JsonSchema = {
+export const monetization_response$$info: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/monetization/rules/outputs.ts b/src/generated/forge-mcp/monetization/rules/outputs.ts
index 40a2f5be3..ccfa5d10f 100644
--- a/src/generated/forge-mcp/monetization/rules/outputs.ts
+++ b/src/generated/forge-mcp/monetization/rules/outputs.ts
@@ -3,24 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `monetization_identifier` in responses.
- */
-export const monetization_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `monetization_monetization-price` in responses.
- */
-export const monetization_monetization_price_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `monetization_monetization-rule` in responses.
  */
-export const monetization_monetization_rule_output: JsonSchema = {
+export const monetization_monetization$$rule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/monetization_monetization-rule-input"
@@ -28,7 +14,7 @@ export const monetization_monetization_rule_output: JsonSchema = {
     {
       "properties": {
         "id": {
-          "$ref": "#/$defs/monetization_identifier"
+          "type": "string"
         }
       },
       "required": [
@@ -42,7 +28,7 @@ export const monetization_monetization_rule_output: JsonSchema = {
 /**
  * The schema of `monetization_monetization-rule-collection` in responses.
  */
-export const monetization_monetization_rule_collection_output: JsonSchema = {
+export const monetization_monetization$$rule$$collection: JsonSchema = {
   "properties": {
     "rules": {
       "items": {
@@ -61,7 +47,7 @@ export const monetization_monetization_rule_collection_output: JsonSchema = {
  * The schema of `monetization_monetization-rule-collection-response` in
  * responses.
  */
-export const monetization_monetization_rule_collection_response_output: JsonSchema = {
+export const monetization_monetization$$rule$$collection$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/monetization_api-response-common"
@@ -83,7 +69,7 @@ export const monetization_monetization_rule_collection_response_output: JsonSche
 /**
  * The schema of `monetization_monetization-rule-input` in responses.
  */
-export const monetization_monetization_rule_input_output: JsonSchema = {
+export const monetization_monetization$$rule$$input: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/monetization_monetization-rule-input-fixed-price"
@@ -98,7 +84,7 @@ export const monetization_monetization_rule_input_output: JsonSchema = {
  * The schema of `monetization_monetization-rule-input-fixed-price` in
  * responses.
  */
-export const monetization_monetization_rule_input_fixed_price_output: JsonSchema = {
+export const monetization_monetization$$rule$$input$$fixed$$price: JsonSchema = {
   "properties": {
     "address": {
       "type": "string"
@@ -113,10 +99,10 @@ export const monetization_monetization_rule_input_fixed_price_output: JsonSchema
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/monetization_identifier"
+      "type": "string"
     },
     "price": {
-      "$ref": "#/$defs/monetization_monetization-price"
+      "type": "string"
     },
     "scheme": {
       "enum": [
@@ -139,7 +125,7 @@ export const monetization_monetization_rule_input_fixed_price_output: JsonSchema
  * The schema of `monetization_monetization-rule-input-origin-controlled` in
  * responses.
  */
-export const monetization_monetization_rule_input_origin_controlled_output: JsonSchema = {
+export const monetization_monetization$$rule$$input$$origin$$controlled: JsonSchema = {
   "properties": {
     "address": {
       "type": "string"
@@ -154,7 +140,7 @@ export const monetization_monetization_rule_input_origin_controlled_output: Json
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/monetization_identifier"
+      "type": "string"
     },
     "scheme": {
       "enum": [
@@ -174,7 +160,7 @@ export const monetization_monetization_rule_input_origin_controlled_output: Json
 /**
  * The schema of `monetization_monetization-rule-response` in responses.
  */
-export const monetization_monetization_rule_response_output: JsonSchema = {
+export const monetization_monetization$$rule$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/monetization_api-response-common"
diff --git a/src/generated/forge-mcp/monetization/rules/schemas.ts b/src/generated/forge-mcp/monetization/rules/schemas.ts
index b87a563d6..f1b3c776e 100644
--- a/src/generated/forge-mcp/monetization/rules/schemas.ts
+++ b/src/generated/forge-mcp/monetization/rules/schemas.ts
@@ -3,25 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `monetization_identifier`.
- */
-export const monetization_identifier: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `monetization_monetization-price`.
- */
-export const monetization_monetization_price: JsonSchema = {
-  "description": "Price in the smallest indivisible unit of the configured payment token, encoded as a decimal string. Must be a canonical decimal integer in [1000, 100000000]: no leading zeros, and a bare JSON number is rejected. The price is required for the fixed-price schemes (\"exact\" and \"upto\") and must be at least 1000, the smallest amount the payment facilitator can settle ($0.001 for a 6-decimal token such as USDC), and at most 100000000 ($100 for a 6-decimal token). When the scheme is \"origin_controlled\" the origin server sets pricing dynamically and the rule carries no price: the field must be omitted — any provided value, including \"0\", is rejected because it would not be enforced. Responses always encode this as a string and omit it for \"origin_controlled\" rules; the pattern matches exactly the set of values the server accepts.",
-  "type": "string"
-};
-
 /**
  * The schema of `monetization_monetization-rule-input`.
  */
-export const monetization_monetization_rule_input: JsonSchema = {
+export const monetization_monetization$$rule$$input: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/monetization_monetization-rule-input-fixed-price"
@@ -35,7 +20,7 @@ export const monetization_monetization_rule_input: JsonSchema = {
 /**
  * The schema of `monetization_monetization-rule-input-fixed-price`.
  */
-export const monetization_monetization_rule_input_fixed_price: JsonSchema = {
+export const monetization_monetization$$rule$$input$$fixed$$price: JsonSchema = {
   "description": "Payment rule with a fixed price set at configuration time.",
   "properties": {
     "address": {
@@ -54,12 +39,12 @@ export const monetization_monetization_rule_input_fixed_price: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/monetization_identifier",
-      "description": "Optional on input. Include the ID of an existing payment rule to update it in place, preserving its stable identity across the full-ruleset replacement; omit it to create a new rule. An ID that does not match an existing payment rule in the zone is rejected. Rules omitted from the request are deleted."
+      "description": "Optional on input. Include the ID of an existing payment rule to update it in place, preserving its stable identity across the full-ruleset replacement; omit it to create a new rule. An ID that does not match an existing payment rule in the zone is rejected. Rules omitted from the request are deleted.",
+      "type": "string"
     },
     "price": {
-      "$ref": "#/$defs/monetization_monetization-price",
-      "description": "Price in the smallest indivisible unit of the configured payment token, encoded as a decimal string. Must be a canonical decimal integer in [1000, 100000000]: no leading zeros, and a bare JSON number is rejected. The price is required for the fixed-price schemes (\"exact\" and \"upto\") and must be at least 1000, the smallest amount the payment facilitator can settle ($0.001 for a 6-decimal token such as USDC), and at most 100000000 ($100 for a 6-decimal token). When the scheme is \"origin_controlled\" the origin server sets pricing dynamically and the rule carries no price: the field must be omitted — any provided value, including \"0\", is rejected because it would not be enforced. Responses always encode this as a string and omit it for \"origin_controlled\" rules; the pattern matches exactly the set of values the server accepts."
+      "description": "Price in the smallest indivisible unit of the configured payment token, encoded as a decimal string. Must be a canonical decimal integer in [1000, 100000000]: no leading zeros, and a bare JSON number is rejected. The price is required for the fixed-price schemes (\"exact\" and \"upto\") and must be at least 1000, the smallest amount the payment facilitator can settle ($0.001 for a 6-decimal token such as USDC), and at most 100000000 ($100 for a 6-decimal token). When the scheme is \"origin_controlled\" the origin server sets pricing dynamically and the rule carries no price: the field must be omitted — any provided value, including \"0\", is rejected because it would not be enforced. Responses always encode this as a string and omit it for \"origin_controlled\" rules; the pattern matches exactly the set of values the server accepts.",
+      "type": "string"
     },
     "scheme": {
       "description": "X402 payment scheme. \"exact\" requires the specified payment amount; \"upto\" permits a payment up to the specified amount. Both fixed-price schemes require the price field.",
@@ -82,7 +67,7 @@ export const monetization_monetization_rule_input_fixed_price: JsonSchema = {
 /**
  * The schema of `monetization_monetization-rule-input-origin-controlled`.
  */
-export const monetization_monetization_rule_input_origin_controlled: JsonSchema = {
+export const monetization_monetization$$rule$$input$$origin$$controlled: JsonSchema = {
   "description": "Payment rule whose price the origin server sets dynamically. The rule carries no price and the price field must be omitted — any provided value, including \"0\", is rejected because it would not be enforced.",
   "properties": {
     "address": {
@@ -101,8 +86,8 @@ export const monetization_monetization_rule_input_origin_controlled: JsonSchema
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/monetization_identifier",
-      "description": "Optional on input. Include the ID of an existing payment rule to update it in place, preserving its stable identity across the full-ruleset replacement; omit it to create a new rule. An ID that does not match an existing payment rule in the zone is rejected. Rules omitted from the request are deleted."
+      "description": "Optional on input. Include the ID of an existing payment rule to update it in place, preserving its stable identity across the full-ruleset replacement; omit it to create a new rule. An ID that does not match an existing payment rule in the zone is rejected. Rules omitted from the request are deleted.",
+      "type": "string"
     },
     "scheme": {
       "description": "X402 payment scheme. \"origin_controlled\" lets the origin server set pricing dynamically; the rule carries no price and the price field must be omitted.",
@@ -123,7 +108,7 @@ export const monetization_monetization_rule_input_origin_controlled: JsonSchema
 /**
  * The schema of `monetization_monetization-rule-patch`.
  */
-export const monetization_monetization_rule_patch: JsonSchema = {
+export const monetization_monetization$$rule$$patch: JsonSchema = {
   "description": "Partial update to a single payment rule. Only the fields present are modified; omitted fields keep their existing values.",
   "properties": {
     "address": {
@@ -141,12 +126,17 @@ export const monetization_monetization_rule_patch: JsonSchema = {
       "type": "string"
     },
     "price": {
-      "$ref": "#/$defs/monetization_monetization-price",
-      "description": "Price in the smallest indivisible unit of the configured payment token, encoded as a decimal string. Must be a canonical decimal integer in [1000, 100000000]: no leading zeros, and a bare JSON number is rejected. The price is required for the fixed-price schemes (\"exact\" and \"upto\") and must be at least 1000, the smallest amount the payment facilitator can settle ($0.001 for a 6-decimal token such as USDC), and at most 100000000 ($100 for a 6-decimal token). When the scheme is \"origin_controlled\" the origin server sets pricing dynamically and the rule carries no price: the field must be omitted — any provided value, including \"0\", is rejected because it would not be enforced. Responses always encode this as a string and omit it for \"origin_controlled\" rules; the pattern matches exactly the set of values the server accepts."
+      "description": "Price in the smallest indivisible unit of the configured payment token, encoded as a decimal string. Must be a canonical decimal integer in [1000, 100000000]: no leading zeros, and a bare JSON number is rejected. The price is required for the fixed-price schemes (\"exact\" and \"upto\") and must be at least 1000, the smallest amount the payment facilitator can settle ($0.001 for a 6-decimal token such as USDC), and at most 100000000 ($100 for a 6-decimal token). When the scheme is \"origin_controlled\" the origin server sets pricing dynamically and the rule carries no price: the field must be omitted — any provided value, including \"0\", is rejected because it would not be enforced. Responses always encode this as a string and omit it for \"origin_controlled\" rules; the pattern matches exactly the set of values the server accepts.",
+      "type": "string"
     },
     "scheme": {
-      "$ref": "#/$defs/monetization_monetization-scheme",
-      "description": "X402 payment scheme. \"exact\" requires the specified payment amount; \"upto\" permits a payment up to the specified amount; \"origin_controlled\" lets the origin server set pricing dynamically, in which case the rule carries no price and the price field must be omitted."
+      "description": "X402 payment scheme. \"exact\" requires the specified payment amount; \"upto\" permits a payment up to the specified amount; \"origin_controlled\" lets the origin server set pricing dynamically, in which case the rule carries no price and the price field must be omitted.",
+      "enum": [
+        "exact",
+        "upto",
+        "origin_controlled"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -155,7 +145,7 @@ export const monetization_monetization_rule_patch: JsonSchema = {
 /**
  * The schema of `monetization_monetization-ruleset-input`.
  */
-export const monetization_monetization_ruleset_input: JsonSchema = {
+export const monetization_monetization$$ruleset$$input: JsonSchema = {
   "properties": {
     "rules": {
       "description": "Full desired Payment Required ruleset. An empty array clears all payment rules. The ruleset may contain at most 40 unique wallet addresses; address comparison is case-insensitive. Every address must pass wallet screening before deployment.",
@@ -170,24 +160,3 @@ export const monetization_monetization_ruleset_input: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `monetization_monetization-scheme`.
- */
-export const monetization_monetization_scheme: JsonSchema = {
-  "description": "X402 payment scheme. \"exact\" requires the specified payment amount; \"upto\" permits a payment up to the specified amount; \"origin_controlled\" lets the origin server set pricing dynamically, in which case the rule carries no price and the price field must be omitted.",
-  "enum": [
-    "exact",
-    "upto",
-    "origin_controlled"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `monetization_zone-identifier`.
- */
-export const monetization_zone_identifier: JsonSchema = {
-  "description": "The unique ID of the zone.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/monetization/rules/tools.ts b/src/generated/forge-mcp/monetization/rules/tools.ts
index 5249ed1e5..2e56185bb 100644
--- a/src/generated/forge-mcp/monetization/rules/tools.ts
+++ b/src/generated/forge-mcp/monetization/rules/tools.ts
@@ -3,31 +3,25 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  monetization_api_response_common_failure_output,
-  monetization_api_response_common_output,
-  monetization_response_info_output,
+  monetization_api$$response$$common,
+  monetization_api$$response$$common$$failure,
+  monetization_response$$info,
 } from "../outputs.js";
 import {
-  monetization_identifier_output,
-  monetization_monetization_price_output,
-  monetization_monetization_rule_collection_output,
-  monetization_monetization_rule_collection_response_output,
-  monetization_monetization_rule_input_fixed_price_output,
-  monetization_monetization_rule_input_origin_controlled_output,
-  monetization_monetization_rule_input_output,
-  monetization_monetization_rule_output,
-  monetization_monetization_rule_response_output,
+  monetization_monetization$$rule,
+  monetization_monetization$$rule$$collection,
+  monetization_monetization$$rule$$collection$$response,
+  monetization_monetization$$rule$$input,
+  monetization_monetization$$rule$$input$$fixed$$price,
+  monetization_monetization$$rule$$input$$origin$$controlled,
+  monetization_monetization$$rule$$response,
 } from "./outputs.js";
 import {
-  monetization_identifier,
-  monetization_monetization_price,
-  monetization_monetization_rule_input,
-  monetization_monetization_rule_input_fixed_price,
-  monetization_monetization_rule_input_origin_controlled,
-  monetization_monetization_rule_patch,
-  monetization_monetization_ruleset_input,
-  monetization_monetization_scheme,
-  monetization_zone_identifier,
+  monetization_monetization$$rule$$input as monetization_monetization$$rule$$input$,
+  monetization_monetization$$rule$$input$$fixed$$price as monetization_monetization$$rule$$input$$fixed$$price$,
+  monetization_monetization$$rule$$input$$origin$$controlled as monetization_monetization$$rule$$input$$origin$$controlled$,
+  monetization_monetization$$rule$$patch,
+  monetization_monetization$$ruleset$$input,
 } from "./schemas.js";
 
 /**
@@ -37,41 +31,45 @@ export const tools: readonly Tool[] = [
   {
     name: "monetization_rules_delete",
     title: "Delete a payment rule",
-    description: "Removes a single Payment Required rule identified by its ID. Every other rule is preserved. Returns the resulting rule collection.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the selected Monetization Gateway rule.",
+    description: "Removes a single Payment Required rule identified by its ID. Every other rule is preserved. Returns the resulting rule collection.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the selected Monetization Gateway rule.\n\nDELETE /zones/{zone_id}/monetization/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_id": {
-          "$ref": "#/$defs/monetization_identifier",
-          "description": "The unique ID of the payment rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/monetization_zone-identifier",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "description": "The unique ID of the payment rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "monetization_identifier": monetization_identifier,
-        "monetization_zone-identifier": monetization_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/monetization_monetization-rule-collection-response",
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     annotations: {
@@ -102,17 +100,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_api-response-common-failure": monetization_api_response_common_failure_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_api-response-common-failure": monetization_api$$response$$common$$failure,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     request: (args) => ({
@@ -120,37 +116,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "monetization_rules_delete_all",
+    name: "monetization_rules_deleteAll",
     title: "Delete all payment rules",
-    description: "Removes every Payment Required rule from the zone. Any rules the service does not own are preserved. Deleting a zone with no payment rules is a no-op. Returns the resulting (empty) rule collection.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes every Monetization Gateway rule for the zone.",
+    description: "Removes every Payment Required rule from the zone. Any rules the service does not own are preserved. Deleting a zone with no payment rules is a no-op. Returns the resulting (empty) rule collection.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes every Monetization Gateway rule for the zone.\n\nDELETE /zones/{zone_id}/monetization/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/monetization_zone-identifier",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "monetization_zone-identifier": monetization_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/monetization_monetization-rule-collection-response",
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     annotations: {
@@ -178,17 +179,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_api-response-common-failure": monetization_api_response_common_failure_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_api-response-common-failure": monetization_api$$response$$common$$failure,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     request: (args) => ({
@@ -198,48 +197,52 @@ export const tools: readonly Tool[] = [
   {
     name: "monetization_rules_edit",
     title: "Update a payment rule",
-    description: "Applies a partial update to a single Payment Required rule. Only the fields present in the request body are changed; omitted fields keep their current values. Returns the full resulting rule collection.\n\nThis method is beta.",
+    description: "Applies a partial update to a single Payment Required rule. Only the fields present in the request body are changed; omitted fields keep their current values. Returns the full resulting rule collection.\n\nThis method is beta.\n\nPATCH /zones/{zone_id}/monetization/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/monetization_monetization-rule-patch"
         },
-        "rule_id": {
-          "$ref": "#/$defs/monetization_identifier",
-          "description": "The unique ID of the payment rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/monetization_zone-identifier",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "description": "The unique ID of the payment rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "monetization_identifier": monetization_identifier,
-        "monetization_monetization-price": monetization_monetization_price,
-        "monetization_monetization-rule-patch": monetization_monetization_rule_patch,
-        "monetization_monetization-scheme": monetization_monetization_scheme,
-        "monetization_zone-identifier": monetization_zone_identifier,
+        "monetization_monetization-rule-patch": monetization_monetization$$rule$$patch,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/monetization_monetization-rule-collection-response",
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     annotations: {
@@ -273,17 +276,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_api-response-common-failure": monetization_api_response_common_failure_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_api-response-common-failure": monetization_api$$response$$common$$failure,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     request: (args) => ({
@@ -294,40 +295,44 @@ export const tools: readonly Tool[] = [
   {
     name: "monetization_rules_get",
     title: "Get a payment rule",
-    description: "Returns a single Payment Required rule identified by its ID.\n\nThis method is beta.",
+    description: "Returns a single Payment Required rule identified by its ID.\n\nThis method is beta.\n\nGET /zones/{zone_id}/monetization/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_id": {
-          "$ref": "#/$defs/monetization_identifier",
-          "description": "The unique ID of the payment rule."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/monetization_zone-identifier",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "description": "The unique ID of the payment rule.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "monetization_identifier": monetization_identifier,
-        "monetization_zone-identifier": monetization_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/monetization_monetization-rule-response",
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_monetization-rule-response": monetization_monetization_rule_response_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_monetization-rule-response": monetization_monetization$$rule$$response,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     annotations: {
@@ -358,16 +363,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_api-response-common-failure": monetization_api_response_common_failure_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_monetization-rule-response": monetization_monetization_rule_response_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_api-response-common-failure": monetization_api$$response$$common$$failure,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_monetization-rule-response": monetization_monetization$$rule$$response,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     request: (args) => ({
@@ -377,35 +380,40 @@ export const tools: readonly Tool[] = [
   {
     name: "monetization_rules_list",
     title: "List payment rules",
-    description: "Returns the currently deployed Payment Required rules for a zone. A zone with no Payment Required ruleset returns 404.\n\nThis method is beta.",
+    description: "Returns the currently deployed Payment Required rules for a zone. A zone with no Payment Required ruleset returns 404.\n\nThis method is beta.\n\nGET /zones/{zone_id}/monetization/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/monetization_zone-identifier",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "monetization_zone-identifier": monetization_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/monetization_monetization-rule-collection-response",
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     annotations: {
@@ -436,17 +444,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_api-response-common-failure": monetization_api_response_common_failure_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_api-response-common-failure": monetization_api$$response$$common$$failure,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     request: (args) => ({
@@ -456,45 +462,50 @@ export const tools: readonly Tool[] = [
   {
     name: "monetization_rules_update",
     title: "Deploy payment ruleset",
-    description: "Replaces the zone's Payment Required ruleset with the submitted desired state. Submit an empty rules array to clear all payment rules.\n\nThis method is beta.",
+    description: "Replaces the zone's Payment Required ruleset with the submitted desired state. Submit an empty rules array to clear all payment rules.\n\nThis method is beta.\n\nPUT /zones/{zone_id}/monetization/rules",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/monetization_monetization-ruleset-input"
         },
-        "zone_id": {
-          "$ref": "#/$defs/monetization_zone-identifier",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "monetization_identifier": monetization_identifier,
-        "monetization_monetization-price": monetization_monetization_price,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled,
-        "monetization_monetization-ruleset-input": monetization_monetization_ruleset_input,
-        "monetization_zone-identifier": monetization_zone_identifier,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input$,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price$,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled$,
+        "monetization_monetization-ruleset-input": monetization_monetization$$ruleset$$input,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/monetization_monetization-rule-collection-response",
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     annotations: {
@@ -525,17 +536,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "monetization_api-response-common": monetization_api_response_common_output,
-        "monetization_api-response-common-failure": monetization_api_response_common_failure_output,
-        "monetization_identifier": monetization_identifier_output,
-        "monetization_monetization-price": monetization_monetization_price_output,
-        "monetization_monetization-rule": monetization_monetization_rule_output,
-        "monetization_monetization-rule-collection": monetization_monetization_rule_collection_output,
-        "monetization_monetization-rule-collection-response": monetization_monetization_rule_collection_response_output,
-        "monetization_monetization-rule-input": monetization_monetization_rule_input_output,
-        "monetization_monetization-rule-input-fixed-price": monetization_monetization_rule_input_fixed_price_output,
-        "monetization_monetization-rule-input-origin-controlled": monetization_monetization_rule_input_origin_controlled_output,
-        "monetization_response-info": monetization_response_info_output,
+        "monetization_api-response-common": monetization_api$$response$$common,
+        "monetization_api-response-common-failure": monetization_api$$response$$common$$failure,
+        "monetization_monetization-rule": monetization_monetization$$rule,
+        "monetization_monetization-rule-collection": monetization_monetization$$rule$$collection,
+        "monetization_monetization-rule-collection-response": monetization_monetization$$rule$$collection$$response,
+        "monetization_monetization-rule-input": monetization_monetization$$rule$$input,
+        "monetization_monetization-rule-input-fixed-price": monetization_monetization$$rule$$input$$fixed$$price,
+        "monetization_monetization-rule-input-origin-controlled": monetization_monetization$$rule$$input$$origin$$controlled,
+        "monetization_response-info": monetization_response$$info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/network/outputs.ts b/src/generated/forge-mcp/network/outputs.ts
deleted file mode 100644
index a707921a5..000000000
--- a/src/generated/forge-mcp/network/outputs.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `tunnel_virtual_network_id` in responses.
- */
-export const tunnel_virtual_network_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_virtual_network_name` in responses.
- */
-export const tunnel_virtual_network_name_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/routes/cidr/outputs.ts b/src/generated/forge-mcp/network/routes/cidr/outputs.ts
index 8271bae99..887150103 100644
--- a/src/generated/forge-mcp/network/routes/cidr/outputs.ts
+++ b/src/generated/forge-mcp/network/routes/cidr/outputs.ts
@@ -6,28 +6,32 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `tunnel_route` in responses.
  */
-export const tunnel_route_output: JsonSchema = {
+export const tunnel_route: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/tunnel_route_comment"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_at": {
-      "$ref": "#/$defs/tunnel_deleted_at"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_route_id"
+      "type": "string"
     },
     "network": {
-      "$ref": "#/$defs/tunnel_ip_network"
+      "type": "string"
     },
     "tunnel_id": {
-      "$ref": "#/$defs/tunnel_tunnel_id"
+      "format": "uuid",
+      "type": "string"
     },
     "virtual_network_id": {
-      "$ref": "#/$defs/tunnel_virtual_network_id"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "type": "object"
@@ -36,7 +40,7 @@ export const tunnel_route_output: JsonSchema = {
 /**
  * The schema of `tunnel_route_response_single` in responses.
  */
-export const tunnel_route_response_single_output: JsonSchema = {
+export const tunnel_route_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -55,7 +59,7 @@ export const tunnel_route_response_single_output: JsonSchema = {
 /**
  * The schema of `tunnel_teamnet_response_collection` in responses.
  */
-export const tunnel_teamnet_response_collection_output: JsonSchema = {
+export const tunnel_teamnet_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
diff --git a/src/generated/forge-mcp/network/routes/cidr/tools.ts b/src/generated/forge-mcp/network/routes/cidr/tools.ts
index b480d701b..ff353bf10 100644
--- a/src/generated/forge-mcp/network/routes/cidr/tools.ts
+++ b/src/generated/forge-mcp/network/routes/cidr/tools.ts
@@ -1,50 +1,20 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_messages_output,
-  tunnel_result_info_output,
-  tunnel_tunnel_id_output,
-  tunnel_tunnel_name_output,
-  tunnel_tunnel_type_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
+  tunnel_result_info,
 } from "../../../outputs.js";
+import { tunnel_tunnel_types } from "../../../schemas.js";
+import { tunnel_teamnet } from "../outputs.js";
 import {
-  tunnel_account_id,
-  tunnel_existed_at,
-  tunnel_page_number,
-  tunnel_per_page,
-  tunnel_tunnel_id,
-  tunnel_tunnel_type,
-  tunnel_tunnel_types,
-} from "../../../schemas.js";
-import {
-  tunnel_virtual_network_id_output,
-  tunnel_virtual_network_name_output,
-} from "../../outputs.js";
-import { tunnel_virtual_network_id } from "../../schemas.js";
-import {
-  tunnel_ip_network_output,
-  tunnel_route_comment_output,
-  tunnel_route_id_output,
-  tunnel_teamnet_output,
-  tunnel_virtual_network_id_computed_optional_output,
-} from "../outputs.js";
-import {
-  tunnel_ip_network,
-  tunnel_route_comment,
-  tunnel_route_id,
-  tunnel_virtual_network_id_computed_optional,
-} from "../schemas.js";
-import {
-  tunnel_route_output,
-  tunnel_route_response_single_output,
-  tunnel_teamnet_response_collection_output,
+  tunnel_route,
+  tunnel_route_response_single,
+  tunnel_teamnet_response_collection,
 } from "./outputs.js";
 
 /**
@@ -54,61 +24,59 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_cidr_create",
     title: "Create a tunnel route",
-    description: "Routes a private network through a Cloudflare Tunnel.",
+    description: "Routes a private network through a Cloudflare Tunnel.\n\nPOST /accounts/{account_id}/teamnet/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_route_comment",
               "default": "",
-              "description": "Optional remark describing the route."
+              "description": "Optional remark describing the route.",
+              "type": "string"
             },
             "network": {
-              "$ref": "#/$defs/tunnel_ip_network",
-              "description": "The private IPv4 or IPv6 range connected by the route, in CIDR notation."
+              "description": "The private IPv4 or IPv6 range connected by the route, in CIDR notation.",
+              "type": "string"
             },
             "virtual_network_id": {
-              "$ref": "#/$defs/tunnel_virtual_network_id_computed_optional",
-              "description": "UUID of the virtual network."
+              "description": "UUID of the virtual network.",
+              "format": "uuid",
+              "type": "string"
             }
           },
           "required": [
             "network"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_ip_network": tunnel_ip_network,
-        "tunnel_route_comment": tunnel_route_comment,
-        "tunnel_virtual_network_id_computed_optional": tunnel_virtual_network_id_computed_optional,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_route_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route": tunnel_route_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_route_response_single": tunnel_route_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_route": tunnel_route,
+        "tunnel_route_response_single": tunnel_route_response_single,
       },
     },
     annotations: {
@@ -143,18 +111,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route": tunnel_route_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_route_response_single": tunnel_route_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_route": tunnel_route,
+        "tunnel_route_response_single": tunnel_route_response_single,
       },
     },
     request: (args) => ({
@@ -165,42 +126,41 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_cidr_delete",
     title: "Delete a tunnel route",
-    description: "Deletes a private network route from an account.\n\nConfirm with the user before calling this tool. This operation permanently deletes a private network route.",
+    description: "Deletes a private network route from an account.\n\nConfirm with the user before calling this tool. This operation permanently deletes a private network route.\n\nDELETE /accounts/{account_id}/teamnet/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "route_id": {
-          "$ref": "#/$defs/tunnel_route_id",
-          "description": "UUID of the route."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "route_id": {
+              "description": "UUID of the route.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "route_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_route_id": tunnel_route_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_route_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route": tunnel_route_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_route_response_single": tunnel_route_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_route": tunnel_route,
+        "tunnel_route_response_single": tunnel_route_response_single,
       },
     },
     annotations: {
@@ -235,18 +195,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route": tunnel_route_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_route_response_single": tunnel_route_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_route": tunnel_route,
+        "tunnel_route_response_single": tunnel_route_response_single,
       },
     },
     request: (args) => ({
@@ -256,64 +209,61 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_cidr_edit",
     title: "Update a tunnel route",
-    description: "Updates an existing private network route in an account. The fields that are meant to be updated should be provided in the body of the request.",
+    description: "Updates an existing private network route in an account. The fields that are meant to be updated should be provided in the body of the request.\n\nPATCH /accounts/{account_id}/teamnet/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_route_comment",
               "default": "",
-              "description": "Optional remark describing the route."
+              "description": "Optional remark describing the route.",
+              "type": "string"
             },
             "network": {
-              "$ref": "#/$defs/tunnel_ip_network",
-              "description": "The private IPv4 or IPv6 range connected by the route, in CIDR notation."
+              "description": "The private IPv4 or IPv6 range connected by the route, in CIDR notation.",
+              "type": "string"
             },
             "virtual_network_id": {
-              "$ref": "#/$defs/tunnel_virtual_network_id_computed_optional",
-              "description": "UUID of the virtual network."
+              "description": "UUID of the virtual network.",
+              "format": "uuid",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "route_id": {
-          "$ref": "#/$defs/tunnel_route_id",
-          "description": "UUID of the route."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "route_id": {
+              "description": "UUID of the route.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "route_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_ip_network": tunnel_ip_network,
-        "tunnel_route_comment": tunnel_route_comment,
-        "tunnel_route_id": tunnel_route_id,
-        "tunnel_virtual_network_id_computed_optional": tunnel_virtual_network_id_computed_optional,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_route_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route": tunnel_route_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_route_response_single": tunnel_route_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_route": tunnel_route,
+        "tunnel_route_response_single": tunnel_route_response_single,
       },
     },
     annotations: {
@@ -348,18 +298,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route": tunnel_route_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_route_response_single": tunnel_route_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_route": tunnel_route,
+        "tunnel_route_response_single": tunnel_route_response_single,
       },
     },
     request: (args) => ({
@@ -370,42 +313,41 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_cidr_get",
     title: "Get tunnel route",
-    description: "Get a private network route in an account.",
+    description: "Get a private network route in an account.\n\nGET /accounts/{account_id}/teamnet/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "route_id": {
-          "$ref": "#/$defs/tunnel_route_id",
-          "description": "UUID of the route."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "route_id": {
+              "description": "UUID of the route.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "route_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_route_id": tunnel_route_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_route_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route": tunnel_route_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_route_response_single": tunnel_route_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_route": tunnel_route,
+        "tunnel_route_response_single": tunnel_route_response_single,
       },
     },
     annotations: {
@@ -434,18 +376,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route": tunnel_route_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_route_response_single": tunnel_route_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_route": tunnel_route,
+        "tunnel_route_response_single": tunnel_route_response_single,
       },
     },
     request: (args) => ({
@@ -455,97 +390,95 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_cidr_list",
     title: "List tunnel routes",
-    description: "Lists and filters private network routes in an account.",
+    description: "Lists and filters private network routes in an account.\n\nGET /accounts/{account_id}/teamnet/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "comment": {
-          "$ref": "#/$defs/tunnel_route_comment",
-          "default": "",
-          "description": "Optional remark describing the route."
-        },
-        "existed_at": {
-          "$ref": "#/$defs/tunnel_existed_at",
-          "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded."
-        },
-        "is_deleted": {
-          "description": "If `true`, only include deleted routes. If `false`, exclude deleted routes. If empty, all routes will be included.",
-          "type": "boolean"
-        },
-        "network_subset": {
-          "$ref": "#/$defs/tunnel_ip_network",
-          "description": "If set, only list routes that are contained within this IP range."
-        },
-        "network_superset": {
-          "$ref": "#/$defs/tunnel_ip_network",
-          "description": "If set, only list routes that contain this IP range."
-        },
-        "page": {
-          "$ref": "#/$defs/tunnel_page_number",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/tunnel_per_page",
-          "description": "Number of results to display."
-        },
-        "route_id": {
-          "$ref": "#/$defs/tunnel_route_id",
-          "description": "UUID of the route."
-        },
-        "tun_types": {
-          "$ref": "#/$defs/tunnel_tunnel_types",
-          "description": "The types of tunnels to filter by, separated by commas."
-        },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "virtual_network_id": {
-          "$ref": "#/$defs/tunnel_virtual_network_id",
-          "description": "UUID of the virtual network."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "comment": {
+              "default": "",
+              "description": "Optional remark describing the route.",
+              "type": "string"
+            },
+            "existed_at": {
+              "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded.",
+              "type": "string"
+            },
+            "is_deleted": {
+              "description": "If `true`, only include deleted routes. If `false`, exclude deleted routes. If empty, all routes will be included.",
+              "type": "boolean"
+            },
+            "network_subset": {
+              "description": "If set, only list routes that are contained within this IP range.",
+              "type": "string"
+            },
+            "network_superset": {
+              "description": "If set, only list routes that contain this IP range.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results to display.",
+              "type": "number"
+            },
+            "route_id": {
+              "description": "UUID of the route.",
+              "type": "string"
+            },
+            "tun_types": {
+              "$ref": "#/$defs/tunnel_tunnel_types",
+              "description": "The types of tunnels to filter by, separated by commas."
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "virtual_network_id": {
+              "description": "UUID of the virtual network.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_existed_at": tunnel_existed_at,
-        "tunnel_ip_network": tunnel_ip_network,
-        "tunnel_page_number": tunnel_page_number,
-        "tunnel_per_page": tunnel_per_page,
-        "tunnel_route_comment": tunnel_route_comment,
-        "tunnel_route_id": tunnel_route_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-        "tunnel_tunnel_type": tunnel_tunnel_type,
         "tunnel_tunnel_types": tunnel_tunnel_types,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_teamnet_response_collection",
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_teamnet": tunnel_teamnet_output,
-        "tunnel_teamnet_response_collection": tunnel_teamnet_response_collection_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_virtual_network_id_computed_optional": tunnel_virtual_network_id_computed_optional_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_teamnet": tunnel_teamnet,
+        "tunnel_teamnet_response_collection": tunnel_teamnet_response_collection,
       },
     },
     annotations: {
@@ -582,39 +515,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_teamnet": tunnel_teamnet_output,
-        "tunnel_teamnet_response_collection": tunnel_teamnet_response_collection_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_virtual_network_id_computed_optional": tunnel_virtual_network_id_computed_optional_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_teamnet": tunnel_teamnet,
+        "tunnel_teamnet_response_collection": tunnel_teamnet_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/teamnet/routes`,
       query: [
-        ["comment", args["comment"], true],
-        ["is_deleted", args["is_deleted"], true],
-        ["network_subset", args["network_subset"], true],
-        ["network_superset", args["network_superset"], true],
-        ["existed_at", args["existed_at"], true],
-        ["tunnel_id", args["tunnel_id"], true],
-        ["route_id", args["route_id"], true],
-        ["tun_types", args["tun_types"], true],
-        ["virtual_network_id", args["virtual_network_id"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["comment", param(args, "query", "comment"), true],
+        ["is_deleted", param(args, "query", "is_deleted"), true],
+        ["network_subset", param(args, "query", "network_subset"), true],
+        ["network_superset", param(args, "query", "network_superset"), true],
+        ["existed_at", param(args, "query", "existed_at"), true],
+        ["tunnel_id", param(args, "query", "tunnel_id"), true],
+        ["route_id", param(args, "query", "route_id"), true],
+        ["tun_types", param(args, "query", "tun_types"), true],
+        ["virtual_network_id", param(args, "query", "virtual_network_id"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/network/routes/hostname/outputs.ts b/src/generated/forge-mcp/network/routes/hostname/outputs.ts
index 0b06ef7c8..0d0e3902b 100644
--- a/src/generated/forge-mcp/network/routes/hostname/outputs.ts
+++ b/src/generated/forge-mcp/network/routes/hostname/outputs.ts
@@ -3,44 +3,42 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `tunnel_hostname` in responses.
- */
-export const tunnel_hostname_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_hostname_comment` in responses.
- */
-export const tunnel_hostname_comment_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_hostname_route` in responses.
  */
-export const tunnel_hostname_route_output: JsonSchema = {
+export const tunnel_hostname_route: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/tunnel_hostname_comment"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_at": {
-      "$ref": "#/$defs/tunnel_deleted_at"
+      "format": "date-time",
+      "type": "string"
     },
     "hostname": {
-      "$ref": "#/$defs/tunnel_hostname"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_hostname_route_id"
+      "format": "uuid",
+      "type": "string"
     },
     "tun_type": {
       "allOf": [
         {
-          "$ref": "#/$defs/tunnel_tunnel_type"
+          "enum": [
+            "cfd_tunnel",
+            "warp_connector",
+            "warp",
+            "magic",
+            "ip_sec",
+            "gre",
+            "cni"
+          ],
+          "type": "string"
         },
         {
           "enum": [
@@ -52,27 +50,20 @@ export const tunnel_hostname_route_output: JsonSchema = {
       ]
     },
     "tunnel_id": {
-      "$ref": "#/$defs/tunnel_tunnel_id-3"
+      "format": "uuid",
+      "type": "string"
     },
     "tunnel_name": {
-      "$ref": "#/$defs/tunnel_tunnel_name-2"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_hostname_route_id` in responses.
- */
-export const tunnel_hostname_route_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_hostname_route_response_collection` in responses.
  */
-export const tunnel_hostname_route_response_collection_output: JsonSchema = {
+export const tunnel_hostname_route_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
@@ -94,7 +85,7 @@ export const tunnel_hostname_route_response_collection_output: JsonSchema = {
 /**
  * The schema of `tunnel_hostname_route_response_single` in responses.
  */
-export const tunnel_hostname_route_response_single_output: JsonSchema = {
+export const tunnel_hostname_route_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -109,18 +100,3 @@ export const tunnel_hostname_route_response_single_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `tunnel_tunnel_id-3` in responses.
- */
-export const tunnel_tunnel_id_3_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_name-2` in responses.
- */
-export const tunnel_tunnel_name_2_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/routes/hostname/schemas.ts b/src/generated/forge-mcp/network/routes/hostname/schemas.ts
deleted file mode 100644
index 5f8447614..000000000
--- a/src/generated/forge-mcp/network/routes/hostname/schemas.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `tunnel_hostname`.
- */
-export const tunnel_hostname: JsonSchema = {
-  "description": "The hostname of the route.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_hostname_comment`.
- */
-export const tunnel_hostname_comment: JsonSchema = {
-  "description": "An optional description of the hostname route.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_hostname_query_comment`.
- */
-export const tunnel_hostname_query_comment: JsonSchema = {
-  "description": "If set, only list hostname routes with the given comment.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_hostname_route_id`.
- */
-export const tunnel_hostname_route_id: JsonSchema = {
-  "description": "The hostname route ID.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_id-3`.
- */
-export const tunnel_tunnel_id_3: JsonSchema = {
-  "description": "UUID of the tunnel.",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/routes/hostname/tools.ts b/src/generated/forge-mcp/network/routes/hostname/tools.ts
index eff2c65d9..fe0ba32ee 100644
--- a/src/generated/forge-mcp/network/routes/hostname/tools.ts
+++ b/src/generated/forge-mcp/network/routes/hostname/tools.ts
@@ -1,40 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_messages_output,
-  tunnel_result_info_output,
-  tunnel_tunnel_type_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
+  tunnel_result_info,
 } from "../../../outputs.js";
 import {
-  tunnel_account_id,
-  tunnel_existed_at,
-  tunnel_page_number,
-  tunnel_per_page,
-} from "../../../schemas.js";
-import {
-  tunnel_hostname_comment_output,
-  tunnel_hostname_output,
-  tunnel_hostname_route_id_output,
-  tunnel_hostname_route_output,
-  tunnel_hostname_route_response_collection_output,
-  tunnel_hostname_route_response_single_output,
-  tunnel_tunnel_id_3_output,
-  tunnel_tunnel_name_2_output,
+  tunnel_hostname_route,
+  tunnel_hostname_route_response_collection,
+  tunnel_hostname_route_response_single,
 } from "./outputs.js";
-import {
-  tunnel_hostname,
-  tunnel_hostname_comment,
-  tunnel_hostname_query_comment,
-  tunnel_hostname_route_id,
-  tunnel_tunnel_id_3,
-} from "./schemas.js";
 
 /**
  * The tools of `network.routes.hostname`.
@@ -43,58 +22,55 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_hostname_create",
     title: "Create hostname route",
-    description: "Create a hostname route.",
+    description: "Create a hostname route.\n\nPOST /accounts/{account_id}/zerotrust/routes/hostname",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_hostname_comment",
-              "description": "An optional description of the hostname route."
+              "description": "An optional description of the hostname route.",
+              "type": "string"
             },
             "hostname": {
-              "$ref": "#/$defs/tunnel_hostname",
-              "description": "The hostname of the route."
+              "description": "The hostname of the route.",
+              "type": "string"
             },
             "tunnel_id": {
-              "$ref": "#/$defs/tunnel_tunnel_id-3",
-              "description": "UUID of the tunnel."
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
             }
           },
+          "required": [
+            "account_id"
+          ],
           "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_hostname": tunnel_hostname,
-        "tunnel_hostname_comment": tunnel_hostname_comment,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_hostname_route_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single,
+        "tunnel_messages": tunnel_messages,
       },
     },
     annotations: {
@@ -129,19 +105,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single,
+        "tunnel_messages": tunnel_messages,
       },
     },
     request: (args) => ({
@@ -152,43 +120,42 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_hostname_delete",
     title: "Delete hostname route",
-    description: "Delete a hostname route.\n\nConfirm with the user before calling this tool. This operation permanently deletes a hostname route.",
+    description: "Delete a hostname route.\n\nConfirm with the user before calling this tool. This operation permanently deletes a hostname route.\n\nDELETE /accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "hostname_route_id": {
-          "$ref": "#/$defs/tunnel_hostname_route_id",
-          "description": "The hostname route ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "hostname_route_id": {
+              "description": "The hostname route ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hostname_route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hostname_route_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_hostname_route_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single,
+        "tunnel_messages": tunnel_messages,
       },
     },
     annotations: {
@@ -223,19 +190,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single,
+        "tunnel_messages": tunnel_messages,
       },
     },
     request: (args) => ({
@@ -245,64 +204,61 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_hostname_edit",
     title: "Update hostname route",
-    description: "Updates a hostname route.",
+    description: "Updates a hostname route.\n\nPATCH /accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_hostname_comment",
-              "description": "An optional description of the hostname route."
+              "description": "An optional description of the hostname route.",
+              "type": "string"
             },
             "hostname": {
-              "$ref": "#/$defs/tunnel_hostname",
-              "description": "The hostname of the route."
+              "description": "The hostname of the route.",
+              "type": "string"
             },
             "tunnel_id": {
-              "$ref": "#/$defs/tunnel_tunnel_id-3",
-              "description": "UUID of the tunnel."
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "hostname_route_id": {
-          "$ref": "#/$defs/tunnel_hostname_route_id",
-          "description": "The hostname route ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "hostname_route_id": {
+              "description": "The hostname route ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hostname_route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hostname_route_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_hostname": tunnel_hostname,
-        "tunnel_hostname_comment": tunnel_hostname_comment,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_hostname_route_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single,
+        "tunnel_messages": tunnel_messages,
       },
     },
     annotations: {
@@ -337,19 +293,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single,
+        "tunnel_messages": tunnel_messages,
       },
     },
     request: (args) => ({
@@ -360,43 +308,42 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_hostname_get",
     title: "Get hostname route",
-    description: "Get a hostname route.",
+    description: "Get a hostname route.\n\nGET /accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "hostname_route_id": {
-          "$ref": "#/$defs/tunnel_hostname_route_id",
-          "description": "The hostname route ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "hostname_route_id": {
+              "description": "The hostname route ID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hostname_route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hostname_route_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_hostname_route_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single,
+        "tunnel_messages": tunnel_messages,
       },
     },
     annotations: {
@@ -433,19 +380,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_single": tunnel_hostname_route_response_single,
+        "tunnel_messages": tunnel_messages,
       },
     },
     request: (args) => ({
@@ -455,80 +394,80 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_hostname_list",
     title: "List hostname routes",
-    description: "Lists and filters hostname routes in an account.",
+    description: "Lists and filters hostname routes in an account.\n\nGET /accounts/{account_id}/zerotrust/routes/hostname",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "comment": {
-          "$ref": "#/$defs/tunnel_hostname_query_comment",
-          "description": "If set, only list hostname routes with the given comment."
-        },
-        "existed_at": {
-          "$ref": "#/$defs/tunnel_existed_at",
-          "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded."
-        },
-        "hostname": {
-          "$ref": "#/$defs/tunnel_hostname",
-          "description": "If set, only list hostname routes that contain a substring of the given value, the filter is case-insensitive."
-        },
-        "id": {
-          "$ref": "#/$defs/tunnel_hostname_route_id",
-          "description": "The hostname route ID."
-        },
-        "is_deleted": {
-          "default": false,
-          "description": "If `true`, only return deleted hostname routes. If `false`, exclude deleted hostname routes.",
-          "type": "boolean"
-        },
-        "page": {
-          "$ref": "#/$defs/tunnel_page_number",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/tunnel_per_page",
-          "description": "Number of results to display."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id-3",
-          "description": "If set, only list hostname routes that point to a specific tunnel."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "comment": {
+              "description": "If set, only list hostname routes with the given comment.",
+              "type": "string"
+            },
+            "existed_at": {
+              "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded.",
+              "type": "string"
+            },
+            "hostname": {
+              "description": "If set, only list hostname routes that contain a substring of the given value, the filter is case-insensitive.",
+              "type": "string"
+            },
+            "id": {
+              "description": "The hostname route ID.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "is_deleted": {
+              "default": false,
+              "description": "If `true`, only return deleted hostname routes. If `false`, exclude deleted hostname routes.",
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results to display.",
+              "type": "number"
+            },
+            "tunnel_id": {
+              "description": "If set, only list hostname routes that point to a specific tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_existed_at": tunnel_existed_at,
-        "tunnel_hostname": tunnel_hostname,
-        "tunnel_hostname_query_comment": tunnel_hostname_query_comment,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id,
-        "tunnel_page_number": tunnel_page_number,
-        "tunnel_per_page": tunnel_per_page,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_hostname_route_response_collection",
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_collection": tunnel_hostname_route_response_collection_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_collection": tunnel_hostname_route_response_collection,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
       },
     },
     annotations: {
@@ -565,34 +504,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_hostname": tunnel_hostname_output,
-        "tunnel_hostname_comment": tunnel_hostname_comment_output,
-        "tunnel_hostname_route": tunnel_hostname_route_output,
-        "tunnel_hostname_route_id": tunnel_hostname_route_id_output,
-        "tunnel_hostname_route_response_collection": tunnel_hostname_route_response_collection_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_tunnel_id-3": tunnel_tunnel_id_3_output,
-        "tunnel_tunnel_name-2": tunnel_tunnel_name_2_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_hostname_route": tunnel_hostname_route,
+        "tunnel_hostname_route_response_collection": tunnel_hostname_route_response_collection,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/zerotrust/routes/hostname`,
       query: [
-        ["id", args["id"], true],
-        ["hostname", args["hostname"], true],
-        ["tunnel_id", args["tunnel_id"], true],
-        ["comment", args["comment"], true],
-        ["existed_at", args["existed_at"], true],
-        ["is_deleted", args["is_deleted"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["id", param(args, "query", "id"), true],
+        ["hostname", param(args, "query", "hostname"), true],
+        ["tunnel_id", param(args, "query", "tunnel_id"), true],
+        ["comment", param(args, "query", "comment"), true],
+        ["existed_at", param(args, "query", "existed_at"), true],
+        ["is_deleted", param(args, "query", "is_deleted"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/network/routes/outputs.ts b/src/generated/forge-mcp/network/routes/outputs.ts
index fb9539cde..8e92a438c 100644
--- a/src/generated/forge-mcp/network/routes/outputs.ts
+++ b/src/generated/forge-mcp/network/routes/outputs.ts
@@ -3,61 +3,53 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tunnel_ip_network` in responses.
- */
-export const tunnel_ip_network_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_route_comment` in responses.
- */
-export const tunnel_route_comment_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_route_id` in responses.
- */
-export const tunnel_route_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_teamnet` in responses.
  */
-export const tunnel_teamnet_output: JsonSchema = {
+export const tunnel_teamnet: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/tunnel_route_comment"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_at": {
-      "$ref": "#/$defs/tunnel_deleted_at"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_route_id"
+      "type": "string"
     },
     "network": {
-      "$ref": "#/$defs/tunnel_ip_network"
+      "type": "string"
     },
     "tun_type": {
-      "$ref": "#/$defs/tunnel_tunnel_type"
+      "enum": [
+        "cfd_tunnel",
+        "warp_connector",
+        "warp",
+        "magic",
+        "ip_sec",
+        "gre",
+        "cni"
+      ],
+      "type": "string"
     },
     "tunnel_id": {
-      "$ref": "#/$defs/tunnel_tunnel_id"
+      "format": "uuid",
+      "type": "string"
     },
     "tunnel_name": {
-      "$ref": "#/$defs/tunnel_tunnel_name"
+      "type": "string"
     },
     "virtual_network_id": {
-      "$ref": "#/$defs/tunnel_virtual_network_id_computed_optional"
+      "format": "uuid",
+      "type": "string"
     },
     "virtual_network_name": {
-      "$ref": "#/$defs/tunnel_virtual_network_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -66,7 +58,7 @@ export const tunnel_teamnet_output: JsonSchema = {
 /**
  * The schema of `tunnel_teamnet_response_single` in responses.
  */
-export const tunnel_teamnet_response_single_output: JsonSchema = {
+export const tunnel_teamnet_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -81,11 +73,3 @@ export const tunnel_teamnet_response_single_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `tunnel_virtual_network_id_computed_optional` in responses.
- */
-export const tunnel_virtual_network_id_computed_optional_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/routes/schemas.ts b/src/generated/forge-mcp/network/routes/schemas.ts
deleted file mode 100644
index 87d9a29d3..000000000
--- a/src/generated/forge-mcp/network/routes/schemas.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tunnel_ip_network`.
- */
-export const tunnel_ip_network: JsonSchema = {
-  "description": "The private IPv4 or IPv6 range connected by the route, in CIDR notation.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_route_comment`.
- */
-export const tunnel_route_comment: JsonSchema = {
-  "description": "Optional remark describing the route.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_route_id`.
- */
-export const tunnel_route_id: JsonSchema = {
-  "description": "UUID of the route.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_virtual_network_id_computed_optional`.
- */
-export const tunnel_virtual_network_id_computed_optional: JsonSchema = {
-  "description": "UUID of the virtual network.",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/routes/tools.ts b/src/generated/forge-mcp/network/routes/tools.ts
index 65e8148ce..a6ff17533 100644
--- a/src/generated/forge-mcp/network/routes/tools.ts
+++ b/src/generated/forge-mcp/network/routes/tools.ts
@@ -1,28 +1,13 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_messages_output,
-  tunnel_tunnel_id_output,
-  tunnel_tunnel_name_output,
-  tunnel_tunnel_type_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
 } from "../../outputs.js";
-import { tunnel_account_id, tunnel_ip } from "../../schemas.js";
-import { tunnel_virtual_network_name_output } from "../outputs.js";
-import { tunnel_virtual_network_id } from "../schemas.js";
-import {
-  tunnel_ip_network_output,
-  tunnel_route_comment_output,
-  tunnel_route_id_output,
-  tunnel_teamnet_output,
-  tunnel_teamnet_response_single_output,
-  tunnel_virtual_network_id_computed_optional_output,
-} from "./outputs.js";
+import { tunnel_teamnet, tunnel_teamnet_response_single } from "./outputs.js";
 
 /**
  * The tools of `network.routes`.
@@ -31,54 +16,56 @@ export const tools: readonly Tool[] = [
   {
     name: "network_routes_resolve",
     title: "Get tunnel route by IP",
-    description: "Fetches routes that contain the given IP address.",
+    description: "Fetches routes that contain the given IP address.\n\nGET /accounts/{account_id}/teamnet/routes/ip/{ip}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "default_virtual_network_fallback": {
-          "default": true,
-          "description": "When the virtual_network_id parameter is not provided the request filter will default search routes that are in the default virtual network for the account. If this parameter is set to false, the search will include routes that do not have a virtual network.",
-          "type": "boolean"
-        },
-        "ip": {
-          "$ref": "#/$defs/tunnel_ip"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "ip": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ip"
+          ],
+          "type": "object"
         },
-        "virtual_network_id": {
-          "$ref": "#/$defs/tunnel_virtual_network_id",
-          "description": "UUID of the virtual network."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "default_virtual_network_fallback": {
+              "default": true,
+              "description": "When the virtual_network_id parameter is not provided the request filter will default search routes that are in the default virtual network for the account. If this parameter is set to false, the search will include routes that do not have a virtual network.",
+              "type": "boolean"
+            },
+            "virtual_network_id": {
+              "description": "UUID of the virtual network.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ip"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_ip": tunnel_ip,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_teamnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_teamnet": tunnel_teamnet_output,
-        "tunnel_teamnet_response_single": tunnel_teamnet_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_virtual_network_id_computed_optional": tunnel_virtual_network_id_computed_optional_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_teamnet": tunnel_teamnet,
+        "tunnel_teamnet_response_single": tunnel_teamnet_response_single,
       },
     },
     annotations: {
@@ -115,28 +102,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip_network": tunnel_ip_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_route_comment": tunnel_route_comment_output,
-        "tunnel_route_id": tunnel_route_id_output,
-        "tunnel_teamnet": tunnel_teamnet_output,
-        "tunnel_teamnet_response_single": tunnel_teamnet_response_single_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_virtual_network_id_computed_optional": tunnel_virtual_network_id_computed_optional_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_teamnet": tunnel_teamnet,
+        "tunnel_teamnet_response_single": tunnel_teamnet_response_single,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/teamnet/routes/ip/${pathParam(args, "ip")}`,
       query: [
-        ["virtual_network_id", args["virtual_network_id"], true],
-        ["default_virtual_network_fallback", args["default_virtual_network_fallback"], true],
+        ["virtual_network_id", param(args, "query", "virtual_network_id"), true],
+        ["default_virtual_network_fallback", param(args, "query", "default_virtual_network_fallback"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/network/schemas.ts b/src/generated/forge-mcp/network/schemas.ts
deleted file mode 100644
index 8d7a96bf0..000000000
--- a/src/generated/forge-mcp/network/schemas.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `tunnel_virtual_network_id`.
- */
-export const tunnel_virtual_network_id: JsonSchema = {
-  "description": "UUID of the virtual network.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_virtual_network_name`.
- */
-export const tunnel_virtual_network_name: JsonSchema = {
-  "description": "A user-friendly name for the virtual network.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/subnets/cloudflareSource/tools.ts b/src/generated/forge-mcp/network/subnets/cloudflareSource/tools.ts
index 1110ad453..b5c6caca0 100644
--- a/src/generated/forge-mcp/network/subnets/cloudflareSource/tools.ts
+++ b/src/generated/forge-mcp/network/subnets/cloudflareSource/tools.ts
@@ -3,98 +3,82 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_messages_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
 } from "../../../outputs.js";
-import { tunnel_account_id } from "../../../schemas.js";
 import {
-  tunnel_subnet_capacity_output,
-  tunnel_subnet_comment_output,
-  tunnel_subnet_id_output,
-  tunnel_subnet_ip_network_output,
-  tunnel_subnet_is_default_network_output,
-  tunnel_subnet_name_output,
-  tunnel_subnet_output,
-  tunnel_subnet_response_single_output,
-  tunnel_subnet_type_output,
+  tunnel_subnet,
+  tunnel_subnet_capacity,
+  tunnel_subnet_response_single,
 } from "../outputs.js";
-import {
-  tunnel_address_family,
-  tunnel_subnet_comment,
-  tunnel_subnet_ip_network,
-  tunnel_subnet_name,
-} from "../schemas.js";
 
 /**
- * The tools of `network.subnets.cloudflare_source`.
+ * The tools of `network.subnets.cloudflareSource`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "network_subnets_cloudflare_source_edit",
+    name: "network_subnets_cloudflareSource_edit",
     title: "Update Cloudflare Source Subnet",
-    description: "Updates the Cloudflare Source subnet of the given address family",
+    description: "Updates the Cloudflare Source subnet of the given address family\n\nPATCH /accounts/{account_id}/zerotrust/subnets/cloudflare_source/{address_family}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "address_family": {
-          "$ref": "#/$defs/tunnel_address_family",
-          "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_subnet_comment",
               "default": "",
-              "description": "An optional description of the subnet."
+              "description": "An optional description of the subnet.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_subnet_name",
-              "description": "A user-friendly name for the subnet."
+              "description": "A user-friendly name for the subnet.",
+              "type": "string"
             },
             "network": {
-              "$ref": "#/$defs/tunnel_subnet_ip_network",
-              "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation."
+              "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "address_family": {
+              "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)",
+              "enum": [
+                "v4",
+                "v6"
+              ],
+              "type": "string"
             }
           },
+          "required": [
+            "account_id",
+            "address_family"
+          ],
           "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_family",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_address_family": tunnel_address_family,
-        "tunnel_subnet_comment": tunnel_subnet_comment,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network,
-        "tunnel_subnet_name": tunnel_subnet_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     annotations: {
@@ -128,20 +112,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     request: (args) => ({
@@ -150,46 +126,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_subnets_cloudflare_source_get",
+    name: "network_subnets_cloudflareSource_get",
     title: "Get Cloudflare Source Subnet",
-    description: "Returns the account's default Cloudflare Source subnet for the given address family.",
+    description: "Returns the account's default Cloudflare Source subnet for the given address family.\n\nGET /accounts/{account_id}/zerotrust/subnets/cloudflare_source/{address_family}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "address_family": {
-          "$ref": "#/$defs/tunnel_address_family",
-          "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "address_family": {
+              "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)",
+              "enum": [
+                "v4",
+                "v6"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_family"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_family"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_address_family": tunnel_address_family,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     annotations: {
@@ -218,20 +196,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/network/subnets/initialResolvedIp/tools.ts b/src/generated/forge-mcp/network/subnets/initialResolvedIp/tools.ts
index f839a9a85..718a19d12 100644
--- a/src/generated/forge-mcp/network/subnets/initialResolvedIp/tools.ts
+++ b/src/generated/forge-mcp/network/subnets/initialResolvedIp/tools.ts
@@ -3,98 +3,82 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_messages_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
 } from "../../../outputs.js";
-import { tunnel_account_id } from "../../../schemas.js";
 import {
-  tunnel_subnet_capacity_output,
-  tunnel_subnet_comment_output,
-  tunnel_subnet_id_output,
-  tunnel_subnet_ip_network_output,
-  tunnel_subnet_is_default_network_output,
-  tunnel_subnet_name_output,
-  tunnel_subnet_output,
-  tunnel_subnet_response_single_output,
-  tunnel_subnet_type_output,
+  tunnel_subnet,
+  tunnel_subnet_capacity,
+  tunnel_subnet_response_single,
 } from "../outputs.js";
-import {
-  tunnel_address_family,
-  tunnel_subnet_comment,
-  tunnel_subnet_ip_network,
-  tunnel_subnet_name,
-} from "../schemas.js";
 
 /**
- * The tools of `network.subnets.initial_resolved_ip`.
+ * The tools of `network.subnets.initialResolvedIp`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "network_subnets_initial_resolved_ip_edit",
+    name: "network_subnets_initialResolvedIp_edit",
     title: "Update Initial Resolved IP Subnet",
-    description: "Updates the CIDR for the account's default Initial Resolved IP Subnet of the given address\nfamily. The new CIDR must not conflict with existing private routes in the account.",
+    description: "Updates the CIDR for the account's default Initial Resolved IP Subnet of the given address\nfamily. The new CIDR must not conflict with existing private routes in the account.\n\nPUT /accounts/{account_id}/zerotrust/subnets/initial_resolved_ip/{address_family}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "address_family": {
-          "$ref": "#/$defs/tunnel_address_family",
-          "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_subnet_comment",
               "default": "",
-              "description": "An optional description of the subnet."
+              "description": "An optional description of the subnet.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_subnet_name",
-              "description": "A user-friendly name for the subnet."
+              "description": "A user-friendly name for the subnet.",
+              "type": "string"
             },
             "network": {
-              "$ref": "#/$defs/tunnel_subnet_ip_network",
-              "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation."
+              "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "address_family": {
+              "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)",
+              "enum": [
+                "v4",
+                "v6"
+              ],
+              "type": "string"
             }
           },
+          "required": [
+            "account_id",
+            "address_family"
+          ],
           "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_family",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_address_family": tunnel_address_family,
-        "tunnel_subnet_comment": tunnel_subnet_comment,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network,
-        "tunnel_subnet_name": tunnel_subnet_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     annotations: {
@@ -123,20 +107,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     request: (args) => ({
@@ -145,46 +121,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_subnets_initial_resolved_ip_get",
+    name: "network_subnets_initialResolvedIp_get",
     title: "Get Initial Resolved IP Subnet",
-    description: "Returns the account's default Initial Resolved IP Subnet for the given address family.",
+    description: "Returns the account's default Initial Resolved IP Subnet for the given address family.\n\nGET /accounts/{account_id}/zerotrust/subnets/initial_resolved_ip/{address_family}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "address_family": {
-          "$ref": "#/$defs/tunnel_address_family",
-          "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "address_family": {
+              "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)",
+              "enum": [
+                "v4",
+                "v6"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "address_family"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "address_family"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_address_family": tunnel_address_family,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     annotations: {
@@ -219,20 +197,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/network/subnets/outputs.ts b/src/generated/forge-mcp/network/subnets/outputs.ts
index 961ddbeb2..b7bf87881 100644
--- a/src/generated/forge-mcp/network/subnets/outputs.ts
+++ b/src/generated/forge-mcp/network/subnets/outputs.ts
@@ -6,34 +6,42 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `tunnel_subnet` in responses.
  */
-export const tunnel_subnet_output: JsonSchema = {
+export const tunnel_subnet: JsonSchema = {
   "properties": {
     "capacity": {
       "$ref": "#/$defs/tunnel_subnet_capacity"
     },
     "comment": {
-      "$ref": "#/$defs/tunnel_subnet_comment"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_at": {
-      "$ref": "#/$defs/tunnel_deleted_at"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_subnet_id"
+      "format": "uuid",
+      "type": "string"
     },
     "is_default_network": {
-      "$ref": "#/$defs/tunnel_subnet_is_default_network"
+      "type": "boolean"
     },
     "name": {
-      "$ref": "#/$defs/tunnel_subnet_name"
+      "type": "string"
     },
     "network": {
-      "$ref": "#/$defs/tunnel_subnet_ip_network"
+      "type": "string"
     },
     "subnet_type": {
-      "$ref": "#/$defs/tunnel_subnet_type"
+      "enum": [
+        "cloudflare_source",
+        "initial_resolved_ip",
+        "warp"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -42,7 +50,7 @@ export const tunnel_subnet_output: JsonSchema = {
 /**
  * The schema of `tunnel_subnet_capacity` in responses.
  */
-export const tunnel_subnet_capacity_output: JsonSchema = {
+export const tunnel_subnet_capacity: JsonSchema = {
   "properties": {
     "total": {
       "type": "integer"
@@ -54,46 +62,10 @@ export const tunnel_subnet_capacity_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_subnet_comment` in responses.
- */
-export const tunnel_subnet_comment_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_id` in responses.
- */
-export const tunnel_subnet_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_ip_network` in responses.
- */
-export const tunnel_subnet_ip_network_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_is_default_network` in responses.
- */
-export const tunnel_subnet_is_default_network_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `tunnel_subnet_name` in responses.
- */
-export const tunnel_subnet_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_subnet_response_collection` in responses.
  */
-export const tunnel_subnet_response_collection_output: JsonSchema = {
+export const tunnel_subnet_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
@@ -115,7 +87,7 @@ export const tunnel_subnet_response_collection_output: JsonSchema = {
 /**
  * The schema of `tunnel_subnet_response_single` in responses.
  */
-export const tunnel_subnet_response_single_output: JsonSchema = {
+export const tunnel_subnet_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -130,15 +102,3 @@ export const tunnel_subnet_response_single_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `tunnel_subnet_type` in responses.
- */
-export const tunnel_subnet_type_output: JsonSchema = {
-  "enum": [
-    "cloudflare_source",
-    "initial_resolved_ip",
-    "warp"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/subnets/schemas.ts b/src/generated/forge-mcp/network/subnets/schemas.ts
deleted file mode 100644
index 18ac8ff64..000000000
--- a/src/generated/forge-mcp/network/subnets/schemas.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tunnel_address_family`.
- */
-export const tunnel_address_family: JsonSchema = {
-  "description": "IP address family, either `v4` (IPv4) or `v6` (IPv6)",
-  "enum": [
-    "v4",
-    "v6"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_ip_network_encoded`.
- */
-export const tunnel_ip_network_encoded: JsonSchema = {
-  "description": "IP/CIDR range in URL-encoded format",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_comment`.
- */
-export const tunnel_subnet_comment: JsonSchema = {
-  "description": "An optional description of the subnet.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_id`.
- */
-export const tunnel_subnet_id: JsonSchema = {
-  "description": "The UUID of the subnet.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_ip_network`.
- */
-export const tunnel_subnet_ip_network: JsonSchema = {
-  "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_is_default_network`.
- */
-export const tunnel_subnet_is_default_network: JsonSchema = {
-  "description": "If `true`, this is the default subnet for the account. There can only be one default subnet per account.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `tunnel_subnet_name`.
- */
-export const tunnel_subnet_name: JsonSchema = {
-  "description": "A user-friendly name for the subnet.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_query_comment`.
- */
-export const tunnel_subnet_query_comment: JsonSchema = {
-  "description": "If set, only list subnets with the given comment.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_subnet_query_name`.
- */
-export const tunnel_subnet_query_name: JsonSchema = {
-  "description": "If set, only list subnets with the given name",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/subnets/tools.ts b/src/generated/forge-mcp/network/subnets/tools.ts
index 15e65dfe6..604c0a18f 100644
--- a/src/generated/forge-mcp/network/subnets/tools.ts
+++ b/src/generated/forge-mcp/network/subnets/tools.ts
@@ -1,39 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_messages_output,
-  tunnel_result_info_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
+  tunnel_result_info,
 } from "../../outputs.js";
 import {
-  tunnel_account_id,
-  tunnel_existed_at,
-  tunnel_page_number,
-  tunnel_per_page,
-} from "../../schemas.js";
-import {
-  tunnel_subnet_capacity_output,
-  tunnel_subnet_comment_output,
-  tunnel_subnet_id_output,
-  tunnel_subnet_ip_network_output,
-  tunnel_subnet_is_default_network_output,
-  tunnel_subnet_name_output,
-  tunnel_subnet_output,
-  tunnel_subnet_response_collection_output,
-  tunnel_subnet_type_output,
+  tunnel_subnet,
+  tunnel_subnet_capacity,
+  tunnel_subnet_response_collection,
 } from "./outputs.js";
-import {
-  tunnel_address_family,
-  tunnel_ip_network_encoded,
-  tunnel_subnet_query_comment,
-  tunnel_subnet_query_name,
-} from "./schemas.js";
 
 /**
  * The tools of `network.subnets`.
@@ -42,101 +22,103 @@ export const tools: readonly Tool[] = [
   {
     name: "network_subnets_list",
     title: "List Subnets",
-    description: "Lists and filters subnets in an account.",
+    description: "Lists and filters subnets in an account.\n\nGET /accounts/{account_id}/zerotrust/subnets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "address_family": {
-          "$ref": "#/$defs/tunnel_address_family",
-          "description": "If set, only include subnets in the given address family - `v4` or `v6`"
-        },
-        "comment": {
-          "$ref": "#/$defs/tunnel_subnet_query_comment",
-          "description": "If set, only list subnets with the given comment."
-        },
-        "existed_at": {
-          "$ref": "#/$defs/tunnel_existed_at",
-          "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded."
-        },
-        "is_default_network": {
-          "description": "If `true`, only include default subnets. If `false`, exclude default subnets subnets. If not set, all subnets will be included.",
-          "type": "boolean"
-        },
-        "is_deleted": {
-          "description": "If `true`, only include deleted subnets. If `false`, exclude deleted subnets. If not set, all subnets will be included.",
-          "type": "boolean"
-        },
-        "name": {
-          "$ref": "#/$defs/tunnel_subnet_query_name",
-          "description": "If set, only list subnets with the given name"
-        },
-        "network": {
-          "$ref": "#/$defs/tunnel_ip_network_encoded",
-          "description": "If set, only list the subnet whose network exactly matches the given CIDR."
-        },
-        "page": {
-          "$ref": "#/$defs/tunnel_page_number",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/tunnel_per_page",
-          "description": "Number of results to display."
-        },
-        "sort_order": {
-          "description": "Sort order of the results. `asc` means oldest to newest, `desc` means newest to oldest. If not set, they will not be in any particular order.",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "subnet_types": {
-          "description": "If set, the types of subnets to include, separated by comma.",
-          "enum": [
-            "cloudflare_source",
-            "initial_resolved_ip",
-            "warp"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "address_family": {
+              "description": "If set, only include subnets in the given address family - `v4` or `v6`",
+              "enum": [
+                "v4",
+                "v6"
+              ],
+              "type": "string"
+            },
+            "comment": {
+              "description": "If set, only list subnets with the given comment.",
+              "type": "string"
+            },
+            "existed_at": {
+              "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded.",
+              "type": "string"
+            },
+            "is_default_network": {
+              "description": "If `true`, only include default subnets. If `false`, exclude default subnets subnets. If not set, all subnets will be included.",
+              "type": "boolean"
+            },
+            "is_deleted": {
+              "description": "If `true`, only include deleted subnets. If `false`, exclude deleted subnets. If not set, all subnets will be included.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "If set, only list subnets with the given name",
+              "type": "string"
+            },
+            "network": {
+              "description": "If set, only list the subnet whose network exactly matches the given CIDR.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results to display.",
+              "type": "number"
+            },
+            "sort_order": {
+              "description": "Sort order of the results. `asc` means oldest to newest, `desc` means newest to oldest. If not set, they will not be in any particular order.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "subnet_types": {
+              "description": "If set, the types of subnets to include, separated by comma.",
+              "enum": [
+                "cloudflare_source",
+                "initial_resolved_ip",
+                "warp"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_address_family": tunnel_address_family,
-        "tunnel_existed_at": tunnel_existed_at,
-        "tunnel_ip_network_encoded": tunnel_ip_network_encoded,
-        "tunnel_page_number": tunnel_page_number,
-        "tunnel_per_page": tunnel_per_page,
-        "tunnel_subnet_query_comment": tunnel_subnet_query_comment,
-        "tunnel_subnet_query_name": tunnel_subnet_query_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_collection",
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_collection": tunnel_subnet_response_collection_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_collection": tunnel_subnet_response_collection,
       },
     },
     annotations: {
@@ -171,38 +153,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_collection": tunnel_subnet_response_collection_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_collection": tunnel_subnet_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/zerotrust/subnets`,
       query: [
-        ["name", args["name"], true],
-        ["comment", args["comment"], true],
-        ["network", args["network"], true],
-        ["existed_at", args["existed_at"], true],
-        ["address_family", args["address_family"], true],
-        ["is_default_network", args["is_default_network"], true],
-        ["is_deleted", args["is_deleted"], true],
-        ["sort_order", args["sort_order"], true],
-        ["subnet_types", args["subnet_types"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["comment", param(args, "query", "comment"), true],
+        ["network", param(args, "query", "network"), true],
+        ["existed_at", param(args, "query", "existed_at"), true],
+        ["address_family", param(args, "query", "address_family"), true],
+        ["is_default_network", param(args, "query", "is_default_network"), true],
+        ["is_deleted", param(args, "query", "is_deleted"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
+        ["subnet_types", param(args, "query", "subnet_types"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/network/subnets/warp/outputs.ts b/src/generated/forge-mcp/network/subnets/warp/outputs.ts
index b18496ce3..c4aa7416b 100644
--- a/src/generated/forge-mcp/network/subnets/warp/outputs.ts
+++ b/src/generated/forge-mcp/network/subnets/warp/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `tunnel_subnet_response_single_nullable` in responses.
  */
-export const tunnel_subnet_response_single_nullable_output: JsonSchema = {
+export const tunnel_subnet_response_single_nullable: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -21,28 +21,36 @@ export const tunnel_subnet_response_single_nullable_output: JsonSchema = {
                   "$ref": "#/$defs/tunnel_subnet_capacity"
                 },
                 "comment": {
-                  "$ref": "#/$defs/tunnel_subnet_comment"
+                  "type": "string"
                 },
                 "created_at": {
-                  "$ref": "#/$defs/tunnel_created_at"
+                  "format": "date-time",
+                  "type": "string"
                 },
                 "deleted_at": {
-                  "$ref": "#/$defs/tunnel_deleted_at"
+                  "format": "date-time",
+                  "type": "string"
                 },
                 "id": {
-                  "$ref": "#/$defs/tunnel_subnet_id"
+                  "format": "uuid",
+                  "type": "string"
                 },
                 "is_default_network": {
-                  "$ref": "#/$defs/tunnel_subnet_is_default_network"
+                  "type": "boolean"
                 },
                 "name": {
-                  "$ref": "#/$defs/tunnel_subnet_name"
+                  "type": "string"
                 },
                 "network": {
-                  "$ref": "#/$defs/tunnel_subnet_ip_network"
+                  "type": "string"
                 },
                 "subnet_type": {
-                  "$ref": "#/$defs/tunnel_subnet_type"
+                  "enum": [
+                    "cloudflare_source",
+                    "initial_resolved_ip",
+                    "warp"
+                  ],
+                  "type": "string"
                 }
               },
               "type": "object"
diff --git a/src/generated/forge-mcp/network/subnets/warp/tools.ts b/src/generated/forge-mcp/network/subnets/warp/tools.ts
index cb2c79c6d..1b7841454 100644
--- a/src/generated/forge-mcp/network/subnets/warp/tools.ts
+++ b/src/generated/forge-mcp/network/subnets/warp/tools.ts
@@ -3,32 +3,16 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_messages_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
 } from "../../../outputs.js";
-import { tunnel_account_id } from "../../../schemas.js";
 import {
-  tunnel_subnet_capacity_output,
-  tunnel_subnet_comment_output,
-  tunnel_subnet_id_output,
-  tunnel_subnet_ip_network_output,
-  tunnel_subnet_is_default_network_output,
-  tunnel_subnet_name_output,
-  tunnel_subnet_output,
-  tunnel_subnet_response_single_output,
-  tunnel_subnet_type_output,
+  tunnel_subnet,
+  tunnel_subnet_capacity,
+  tunnel_subnet_response_single,
 } from "../outputs.js";
-import {
-  tunnel_subnet_comment,
-  tunnel_subnet_id,
-  tunnel_subnet_ip_network,
-  tunnel_subnet_is_default_network,
-  tunnel_subnet_name,
-} from "../schemas.js";
-import { tunnel_subnet_response_single_nullable_output } from "./outputs.js";
+import { tunnel_subnet_response_single_nullable } from "./outputs.js";
 
 /**
  * The tools of `network.subnets.warp`.
@@ -37,33 +21,29 @@ export const tools: readonly Tool[] = [
   {
     name: "network_subnets_warp_create",
     title: "Create WARP IP subnet",
-    description: "Create a WARP IP assignment subnet. Currently, only IPv4 subnets can be created.\n\n**Network constraints:**\n- The network must be within one of the following private IP ranges:\n  - `10.0.0.0/8` (RFC 1918)\n  - `172.16.0.0/12` (RFC 1918)\n  - `192.168.0.0/16` (RFC 1918)\n  - `100.64.0.0/10` (RFC 6598 - CGNAT)\n- The subnet must have a prefix length of `/24` or larger (e.g., `/16`, `/20`, `/24` are valid; `/25`, `/28` are not)",
+    description: "Create a WARP IP assignment subnet. Currently, only IPv4 subnets can be created.\n\n**Network constraints:**\n- The network must be within one of the following private IP ranges:\n  - `10.0.0.0/8` (RFC 1918)\n  - `172.16.0.0/12` (RFC 1918)\n  - `192.168.0.0/16` (RFC 1918)\n  - `100.64.0.0/10` (RFC 6598 - CGNAT)\n- The subnet must have a prefix length of `/24` or larger (e.g., `/16`, `/20`, `/24` are valid; `/25`, `/28` are not)\n\nPOST /accounts/{account_id}/zerotrust/subnets/warp",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_subnet_comment",
               "default": "",
-              "description": "An optional description of the subnet."
+              "description": "An optional description of the subnet.",
+              "type": "string"
             },
             "is_default_network": {
-              "$ref": "#/$defs/tunnel_subnet_is_default_network",
               "default": false,
-              "description": "If `true`, this is the default subnet for the account. There can only be one default subnet per account."
+              "description": "If `true`, this is the default subnet for the account. There can only be one default subnet per account.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_subnet_name",
-              "description": "A user-friendly name for the subnet."
+              "description": "A user-friendly name for the subnet.",
+              "type": "string"
             },
             "network": {
-              "$ref": "#/$defs/tunnel_subnet_ip_network",
-              "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation."
+              "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation.",
+              "type": "string"
             }
           },
           "required": [
@@ -71,36 +51,35 @@ export const tools: readonly Tool[] = [
             "network"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_subnet_comment": tunnel_subnet_comment,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network,
-        "tunnel_subnet_name": tunnel_subnet_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     annotations: {
@@ -134,20 +113,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     request: (args) => ({
@@ -158,43 +129,42 @@ export const tools: readonly Tool[] = [
   {
     name: "network_subnets_warp_delete",
     title: "Delete WARP IP subnet",
-    description: "Delete a WARP IP assignment subnet. This operation is idempotent - deleting an already-deleted or non-existent subnet will return success with a null result.\n\nConfirm with the user before calling this tool. This operation permanently deletes a WARP IP subnet.",
+    description: "Delete a WARP IP assignment subnet. This operation is idempotent - deleting an already-deleted or non-existent subnet will return success with a null result.\n\nConfirm with the user before calling this tool. This operation permanently deletes a WARP IP subnet.\n\nDELETE /accounts/{account_id}/zerotrust/subnets/warp/{subnet_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "subnet_id": {
-          "$ref": "#/$defs/tunnel_subnet_id",
-          "description": "The UUID of the subnet."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "subnet_id": {
+              "description": "The UUID of the subnet.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subnet_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subnet_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_subnet_id": tunnel_subnet_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_single_nullable",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single_nullable": tunnel_subnet_response_single_nullable_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single_nullable": tunnel_subnet_response_single_nullable,
       },
     },
     annotations: {
@@ -228,19 +198,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single_nullable": tunnel_subnet_response_single_nullable_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single_nullable": tunnel_subnet_response_single_nullable,
       },
     },
     request: (args) => ({
@@ -250,72 +212,67 @@ export const tools: readonly Tool[] = [
   {
     name: "network_subnets_warp_edit",
     title: "Update WARP IP subnet",
-    description: "Updates a WARP IP assignment subnet.\n\n**Update constraints:**\n- The `network` field cannot be modified for WARP subnets. Only `name`, `comment`, and `is_default_network` can be updated.\n- IPv6 subnets cannot be updated",
+    description: "Updates a WARP IP assignment subnet.\n\n**Update constraints:**\n- The `network` field cannot be modified for WARP subnets. Only `name`, `comment`, and `is_default_network` can be updated.\n- IPv6 subnets cannot be updated\n\nPATCH /accounts/{account_id}/zerotrust/subnets/warp/{subnet_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_subnet_comment",
               "default": "",
-              "description": "An optional description of the subnet."
+              "description": "An optional description of the subnet.",
+              "type": "string"
             },
             "is_default_network": {
-              "$ref": "#/$defs/tunnel_subnet_is_default_network",
               "default": false,
-              "description": "If `true`, this is the default subnet for the account. There can only be one default subnet per account."
+              "description": "If `true`, this is the default subnet for the account. There can only be one default subnet per account.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_subnet_name",
-              "description": "A user-friendly name for the subnet."
+              "description": "A user-friendly name for the subnet.",
+              "type": "string"
             },
             "network": {
-              "$ref": "#/$defs/tunnel_subnet_ip_network",
-              "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation."
+              "description": "The private IPv4 or IPv6 range defining the subnet, in CIDR notation.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "subnet_id": {
-          "$ref": "#/$defs/tunnel_subnet_id",
-          "description": "The UUID of the subnet."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "subnet_id": {
+              "description": "The UUID of the subnet.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subnet_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subnet_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_subnet_comment": tunnel_subnet_comment,
-        "tunnel_subnet_id": tunnel_subnet_id,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network,
-        "tunnel_subnet_name": tunnel_subnet_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     annotations: {
@@ -349,20 +306,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     request: (args) => ({
@@ -373,44 +322,43 @@ export const tools: readonly Tool[] = [
   {
     name: "network_subnets_warp_get",
     title: "Get WARP IP subnet",
-    description: "Get a WARP IP assignment subnet.",
+    description: "Get a WARP IP assignment subnet.\n\nGET /accounts/{account_id}/zerotrust/subnets/warp/{subnet_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "subnet_id": {
-          "$ref": "#/$defs/tunnel_subnet_id",
-          "description": "The UUID of the subnet."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "subnet_id": {
+              "description": "The UUID of the subnet.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subnet_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subnet_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_subnet_id": tunnel_subnet_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_subnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     annotations: {
@@ -445,20 +393,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_subnet": tunnel_subnet_output,
-        "tunnel_subnet_capacity": tunnel_subnet_capacity_output,
-        "tunnel_subnet_comment": tunnel_subnet_comment_output,
-        "tunnel_subnet_id": tunnel_subnet_id_output,
-        "tunnel_subnet_ip_network": tunnel_subnet_ip_network_output,
-        "tunnel_subnet_is_default_network": tunnel_subnet_is_default_network_output,
-        "tunnel_subnet_name": tunnel_subnet_name_output,
-        "tunnel_subnet_response_single": tunnel_subnet_response_single_output,
-        "tunnel_subnet_type": tunnel_subnet_type_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_subnet": tunnel_subnet,
+        "tunnel_subnet_capacity": tunnel_subnet_capacity,
+        "tunnel_subnet_response_single": tunnel_subnet_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/network/virtualNetworks/outputs.ts b/src/generated/forge-mcp/network/virtualNetworks/outputs.ts
index 5731a0c25..5ec8c2465 100644
--- a/src/generated/forge-mcp/network/virtualNetworks/outputs.ts
+++ b/src/generated/forge-mcp/network/virtualNetworks/outputs.ts
@@ -3,35 +3,31 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tunnel_is_default_network` in responses.
- */
-export const tunnel_is_default_network_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `tunnel_virtual-network` in responses.
  */
-export const tunnel_virtual_network_output: JsonSchema = {
+export const tunnel_virtual$$network: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/tunnel_virtual_network_comment"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_at": {
-      "$ref": "#/$defs/tunnel_deleted_at"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_virtual_network_id"
+      "format": "uuid",
+      "type": "string"
     },
     "is_default_network": {
-      "$ref": "#/$defs/tunnel_is_default_network"
+      "type": "boolean"
     },
     "name": {
-      "$ref": "#/$defs/tunnel_virtual_network_name"
+      "type": "string"
     }
   },
   "required": [
@@ -44,17 +40,10 @@ export const tunnel_virtual_network_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_virtual_network_comment` in responses.
- */
-export const tunnel_virtual_network_comment_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_vnet_response_collection` in responses.
  */
-export const tunnel_vnet_response_collection_output: JsonSchema = {
+export const tunnel_vnet_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
@@ -76,7 +65,7 @@ export const tunnel_vnet_response_collection_output: JsonSchema = {
 /**
  * The schema of `tunnel_vnet_response_single` in responses.
  */
-export const tunnel_vnet_response_single_output: JsonSchema = {
+export const tunnel_vnet_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
diff --git a/src/generated/forge-mcp/network/virtualNetworks/schemas.ts b/src/generated/forge-mcp/network/virtualNetworks/schemas.ts
deleted file mode 100644
index 97f6bb534..000000000
--- a/src/generated/forge-mcp/network/virtualNetworks/schemas.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tunnel_is_default_network`.
- */
-export const tunnel_is_default_network: JsonSchema = {
-  "description": "If `true`, this virtual network is the default for the account.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `tunnel_is_default_network_optional`.
- */
-export const tunnel_is_default_network_optional: JsonSchema = {
-  "description": "If `true`, this virtual network is the default for the account.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `tunnel_virtual_network_comment`.
- */
-export const tunnel_virtual_network_comment: JsonSchema = {
-  "description": "Optional remark describing the virtual network.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/network/virtualNetworks/tools.ts b/src/generated/forge-mcp/network/virtualNetworks/tools.ts
index 07bb64fcc..cf42a7a9d 100644
--- a/src/generated/forge-mcp/network/virtualNetworks/tools.ts
+++ b/src/generated/forge-mcp/network/virtualNetworks/tools.ts
@@ -1,59 +1,37 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_messages_output,
-  tunnel_result_info_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
+  tunnel_result_info,
 } from "../../outputs.js";
-import { tunnel_account_id } from "../../schemas.js";
 import {
-  tunnel_virtual_network_id_output,
-  tunnel_virtual_network_name_output,
-} from "../outputs.js";
-import {
-  tunnel_virtual_network_id,
-  tunnel_virtual_network_name,
-} from "../schemas.js";
-import {
-  tunnel_is_default_network_output,
-  tunnel_virtual_network_comment_output,
-  tunnel_virtual_network_output,
-  tunnel_vnet_response_collection_output,
-  tunnel_vnet_response_single_output,
+  tunnel_virtual$$network,
+  tunnel_vnet_response_collection,
+  tunnel_vnet_response_single,
 } from "./outputs.js";
-import {
-  tunnel_is_default_network,
-  tunnel_is_default_network_optional,
-  tunnel_virtual_network_comment,
-} from "./schemas.js";
 
 /**
- * The tools of `network.virtual_networks`.
+ * The tools of `network.virtualNetworks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "network_virtual_networks_create",
+    name: "network_virtualNetworks_create",
     title: "Create a virtual network",
-    description: "Adds a new virtual network to an account.",
+    description: "Adds a new virtual network to an account.\n\nPOST /accounts/{account_id}/teamnet/virtual_networks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_virtual_network_comment",
               "default": "",
-              "description": "Optional remark describing the virtual network."
+              "description": "Optional remark describing the virtual network.",
+              "type": "string"
             },
             "is_default": {
               "deprecated": true,
@@ -61,45 +39,47 @@ export const tools: readonly Tool[] = [
               "type": "boolean"
             },
             "is_default_network": {
-              "$ref": "#/$defs/tunnel_is_default_network_optional",
               "default": false,
-              "description": "If `true`, this virtual network is the default for the account."
+              "description": "If `true`, this virtual network is the default for the account.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_virtual_network_name",
-              "description": "A user-friendly name for the virtual network."
+              "description": "A user-friendly name for the virtual network.",
+              "type": "string"
             }
           },
           "required": [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_is_default_network_optional": tunnel_is_default_network_optional,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_vnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_single": tunnel_vnet_response_single_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_single": tunnel_vnet_response_single,
       },
     },
     annotations: {
@@ -134,17 +114,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_single": tunnel_vnet_response_single_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_single": tunnel_vnet_response_single,
       },
     },
     request: (args) => ({
@@ -153,43 +127,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_virtual_networks_delete",
+    name: "network_virtualNetworks_delete",
     title: "Delete a virtual network",
-    description: "Deletes an existing virtual network.\n\nConfirm with the user before calling this tool. This operation permanently deletes a virtual network.",
+    description: "Deletes an existing virtual network.\n\nConfirm with the user before calling this tool. This operation permanently deletes a virtual network.\n\nDELETE /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "virtual_network_id": {
-          "$ref": "#/$defs/tunnel_virtual_network_id",
-          "description": "UUID of the virtual network."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "virtual_network_id": {
+              "description": "UUID of the virtual network.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "virtual_network_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "virtual_network_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_vnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_single": tunnel_vnet_response_single_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_single": tunnel_vnet_response_single,
       },
     },
     annotations: {
@@ -224,17 +199,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_single": tunnel_vnet_response_single_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_single": tunnel_vnet_response_single,
       },
     },
     request: (args) => ({
@@ -242,66 +211,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_virtual_networks_edit",
+    name: "network_virtualNetworks_edit",
     title: "Update a virtual network",
-    description: "Updates an existing virtual network.",
+    description: "Updates an existing virtual network.\n\nPATCH /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_virtual_network_comment",
               "default": "",
-              "description": "Optional remark describing the virtual network."
+              "description": "Optional remark describing the virtual network.",
+              "type": "string"
             },
             "is_default_network": {
-              "$ref": "#/$defs/tunnel_is_default_network_optional",
               "default": false,
-              "description": "If `true`, this virtual network is the default for the account."
+              "description": "If `true`, this virtual network is the default for the account.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_virtual_network_name",
-              "description": "A user-friendly name for the virtual network."
+              "description": "A user-friendly name for the virtual network.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "virtual_network_id": {
-          "$ref": "#/$defs/tunnel_virtual_network_id",
-          "description": "UUID of the virtual network."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "virtual_network_id": {
+              "description": "UUID of the virtual network.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "virtual_network_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "virtual_network_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_is_default_network_optional": tunnel_is_default_network_optional,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_vnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_single": tunnel_vnet_response_single_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_single": tunnel_vnet_response_single,
       },
     },
     annotations: {
@@ -336,17 +303,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_single": tunnel_vnet_response_single_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_single": tunnel_vnet_response_single,
       },
     },
     request: (args) => ({
@@ -355,65 +316,63 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_virtual_networks_get",
+    name: "network_virtualNetworks_get",
     title: "Get a virtual network",
-    description: "Get a virtual network.",
+    description: "Get a virtual network.\n\nGET /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "comment": {
-              "$ref": "#/$defs/tunnel_virtual_network_comment",
               "default": "",
-              "description": "Optional remark describing the virtual network."
+              "description": "Optional remark describing the virtual network.",
+              "type": "string"
             },
             "is_default_network": {
-              "$ref": "#/$defs/tunnel_is_default_network",
-              "description": "If `true`, this virtual network is the default for the account."
+              "description": "If `true`, this virtual network is the default for the account.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_virtual_network_name",
-              "description": "A user-friendly name for the virtual network."
+              "description": "A user-friendly name for the virtual network.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "virtual_network_id": {
-          "$ref": "#/$defs/tunnel_virtual_network_id",
-          "description": "UUID of the virtual network."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "virtual_network_id": {
+              "description": "UUID of the virtual network.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "virtual_network_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "virtual_network_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_is_default_network": tunnel_is_default_network,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_vnet_response_single",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_single": tunnel_vnet_response_single_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_single": tunnel_vnet_response_single,
       },
     },
     annotations: {
@@ -442,17 +401,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_single": tunnel_vnet_response_single_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_single": tunnel_vnet_response_single,
       },
     },
     request: (args) => ({
@@ -461,62 +414,68 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_virtual_networks_list",
+    name: "network_virtualNetworks_list",
     title: "List virtual networks",
-    description: "Lists and filters virtual networks in an account.",
+    description: "Lists and filters virtual networks in an account.\n\nGET /accounts/{account_id}/teamnet/virtual_networks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "id": {
-          "$ref": "#/$defs/tunnel_virtual_network_id",
-          "description": "UUID of the virtual network."
-        },
-        "is_default": {
-          "deprecated": true,
-          "description": "If `true`, only include the default virtual network. If `false`, exclude the default virtual network. If empty, all virtual networks will be included.",
-          "type": "boolean"
-        },
-        "is_default_network": {
-          "description": "If `true`, only include the default virtual network. If `false`, exclude the default virtual network. If empty, all virtual networks will be included.",
-          "type": "boolean"
-        },
-        "is_deleted": {
-          "description": "If `true`, only include deleted virtual networks. If `false`, exclude deleted virtual networks. If empty, all virtual networks will be included.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "name": {
-          "$ref": "#/$defs/tunnel_virtual_network_name",
-          "description": "A user-friendly name for the virtual network."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "UUID of the virtual network.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "is_default": {
+              "deprecated": true,
+              "description": "If `true`, only include the default virtual network. If `false`, exclude the default virtual network. If empty, all virtual networks will be included.",
+              "type": "boolean"
+            },
+            "is_default_network": {
+              "description": "If `true`, only include the default virtual network. If `false`, exclude the default virtual network. If empty, all virtual networks will be included.",
+              "type": "boolean"
+            },
+            "is_deleted": {
+              "description": "If `true`, only include deleted virtual networks. If `false`, exclude deleted virtual networks. If empty, all virtual networks will be included.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "A user-friendly name for the virtual network.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_vnet_response_collection",
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_collection": tunnel_vnet_response_collection_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_collection": tunnel_vnet_response_collection,
       },
     },
     annotations: {
@@ -553,29 +512,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_is_default_network": tunnel_is_default_network_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_virtual-network": tunnel_virtual_network_output,
-        "tunnel_virtual_network_comment": tunnel_virtual_network_comment_output,
-        "tunnel_virtual_network_id": tunnel_virtual_network_id_output,
-        "tunnel_virtual_network_name": tunnel_virtual_network_name_output,
-        "tunnel_vnet_response_collection": tunnel_vnet_response_collection_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_virtual-network": tunnel_virtual$$network,
+        "tunnel_vnet_response_collection": tunnel_vnet_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/teamnet/virtual_networks`,
       query: [
-        ["id", args["id"], true],
-        ["name", args["name"], true],
-        ["is_default", args["is_default"], true],
-        ["is_default_network", args["is_default_network"], true],
-        ["is_deleted", args["is_deleted"], true],
+        ["id", param(args, "query", "id"), true],
+        ["name", param(args, "query", "name"), true],
+        ["is_default", param(args, "query", "is_default"), true],
+        ["is_default_network", param(args, "query", "is_default_network"), true],
+        ["is_deleted", param(args, "query", "is_deleted"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/networkInterconnects/cnis/outputs.ts b/src/generated/forge-mcp/networkInterconnects/cnis/outputs.ts
index 4234c2a30..ac36a4129 100644
--- a/src/generated/forge-mcp/networkInterconnects/cnis/outputs.ts
+++ b/src/generated/forge-mcp/networkInterconnects/cnis/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `nsc_BgpControl` in responses.
  */
-export const nsc_BgpControl_output: JsonSchema = {
+export const nsc_BgpControl: JsonSchema = {
   "properties": {
     "customer_asn": {
       "type": "integer"
@@ -35,30 +35,23 @@ export const nsc_BgpControl_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `nsc_BgpMode` in responses.
- */
-export const nsc_BgpMode_output: JsonSchema = {
-  "enum": [
-    "dynamic_route_exchange",
-    "advertise_only"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `nsc_Cni` in responses.
  */
-export const nsc_Cni_output: JsonSchema = {
+export const nsc_Cni: JsonSchema = {
   "properties": {
     "account": {
-      "$ref": "#/$defs/nsc_AccountTag"
+      "type": "string"
     },
     "bgp": {
       "$ref": "#/$defs/nsc_BgpControl"
     },
     "bgp_mode": {
-      "$ref": "#/$defs/nsc_BgpMode"
+      "enum": [
+        "dynamic_route_exchange",
+        "advertise_only"
+      ],
+      "type": "string"
     },
     "cust_ip": {
       "type": "string"
@@ -91,7 +84,7 @@ export const nsc_Cni_output: JsonSchema = {
 /**
  * The schema of `nsc_CniList` in responses.
  */
-export const nsc_CniList_output: JsonSchema = {
+export const nsc_CniList: JsonSchema = {
   "properties": {
     "items": {
       "items": {
@@ -119,7 +112,7 @@ export const nsc_CniList_output: JsonSchema = {
 /**
  * The schema of `nsc_MagicSettings` in responses.
  */
-export const nsc_MagicSettings_output: JsonSchema = {
+export const nsc_MagicSettings: JsonSchema = {
   "properties": {
     "conduit_name": {
       "type": "string"
diff --git a/src/generated/forge-mcp/networkInterconnects/cnis/schemas.ts b/src/generated/forge-mcp/networkInterconnects/cnis/schemas.ts
index d1f238ce5..f160e416f 100644
--- a/src/generated/forge-mcp/networkInterconnects/cnis/schemas.ts
+++ b/src/generated/forge-mcp/networkInterconnects/cnis/schemas.ts
@@ -38,33 +38,25 @@ export const nsc_BgpControl: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `nsc_BgpMode`.
- */
-export const nsc_BgpMode: JsonSchema = {
-  "description": "The BGP mode for a CNI.\nOne of the following:\n* `dynamic_route_exchange`\n* `advertise_only`",
-  "enum": [
-    "dynamic_route_exchange",
-    "advertise_only"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `nsc_Cni`.
  */
 export const nsc_Cni: JsonSchema = {
   "properties": {
     "account": {
-      "$ref": "#/$defs/nsc_AccountTag",
-      "description": "Customer account tag"
+      "description": "Customer account tag",
+      "type": "string"
     },
     "bgp": {
       "$ref": "#/$defs/nsc_BgpControl"
     },
     "bgp_mode": {
-      "$ref": "#/$defs/nsc_BgpMode",
-      "description": "The BGP mode for a CNI.\nOne of the following:\n* `dynamic_route_exchange`\n* `advertise_only`"
+      "description": "The BGP mode for a CNI.\nOne of the following:\n* `dynamic_route_exchange`\n* `advertise_only`",
+      "enum": [
+        "dynamic_route_exchange",
+        "advertise_only"
+      ],
+      "type": "string"
     },
     "cust_ip": {
       "description": "Customer end of the point-to-point link\n\nThis should always be inside the same prefix as `p2p_ip`.",
@@ -103,8 +95,8 @@ export const nsc_Cni: JsonSchema = {
 export const nsc_CniCreate: JsonSchema = {
   "properties": {
     "account": {
-      "$ref": "#/$defs/nsc_AccountTag",
-      "description": "Customer account tag"
+      "description": "Customer account tag",
+      "type": "string"
     },
     "bgp": {
       "$ref": "#/$defs/nsc_BgpControl"
diff --git a/src/generated/forge-mcp/networkInterconnects/cnis/tools.ts b/src/generated/forge-mcp/networkInterconnects/cnis/tools.ts
index d2cd39981..99ab18c37 100644
--- a/src/generated/forge-mcp/networkInterconnects/cnis/tools.ts
+++ b/src/generated/forge-mcp/networkInterconnects/cnis/tools.ts
@@ -1,62 +1,65 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import { nsc_AccountTag_output } from "../outputs.js";
-import { nsc_AccountTag } from "../schemas.js";
-import {
-  nsc_BgpControl_output,
-  nsc_BgpMode_output,
-  nsc_CniList_output,
-  nsc_Cni_output,
-  nsc_MagicSettings_output,
-} from "./outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
   nsc_BgpControl,
-  nsc_BgpMode,
   nsc_Cni,
-  nsc_CniCreate,
+  nsc_CniList,
   nsc_MagicSettings,
+} from "./outputs.js";
+import {
+  nsc_BgpControl as nsc_BgpControl$,
+  nsc_Cni as nsc_Cni$,
+  nsc_CniCreate,
+  nsc_MagicSettings as nsc_MagicSettings$,
 } from "./schemas.js";
 
 /**
- * The tools of `network_interconnects.cnis`.
+ * The tools of `networkInterconnects.cnis`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "network_interconnects_cnis_create",
+    name: "networkInterconnects_cnis_create",
     title: "Create a new CNI object",
-    description: "Creates a new Cloud Network Interconnect (CNI) for private network connectivity between\nCloudflare and your infrastructure. CNIs enable dedicated, high-performance network links.",
+    description: "Creates a new Cloud Network Interconnect (CNI) for private network connectivity between\nCloudflare and your infrastructure. CNIs enable dedicated, high-performance network links.\n\nPOST /accounts/{account_id}/cni/cnis",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
         "body": {
           "$ref": "#/$defs/nsc_CniCreate"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_BgpControl": nsc_BgpControl$,
         "nsc_CniCreate": nsc_CniCreate,
-        "nsc_MagicSettings": nsc_MagicSettings,
+        "nsc_MagicSettings": nsc_MagicSettings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_Cni",
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_BgpControl": nsc_BgpControl_output,
-        "nsc_BgpMode": nsc_BgpMode_output,
-        "nsc_Cni": nsc_Cni_output,
-        "nsc_MagicSettings": nsc_MagicSettings_output,
+        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_Cni": nsc_Cni,
+        "nsc_MagicSettings": nsc_MagicSettings,
       },
     },
     annotations: {
@@ -84,11 +87,9 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_BgpControl": nsc_BgpControl_output,
-        "nsc_BgpMode": nsc_BgpMode_output,
-        "nsc_Cni": nsc_Cni_output,
-        "nsc_MagicSettings": nsc_MagicSettings_output,
+        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_Cni": nsc_Cni,
+        "nsc_MagicSettings": nsc_MagicSettings,
       },
     },
     request: (args) => ({
@@ -97,29 +98,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_cnis_delete",
+    name: "networkInterconnects_cnis_delete",
     title: "Delete a specified CNI object",
-    description: "Permanently removes a Cloud Network Interconnect (CNI) configuration. The private network\nconnection will be terminated.",
+    description: "Permanently removes a Cloud Network Interconnect (CNI) configuration. The private network\nconnection will be terminated.\n\nDELETE /accounts/{account_id}/cni/cnis/{cni}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "cni": {
-          "description": "CNI ID to retrieve information about",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            },
+            "cni": {
+              "description": "CNI ID to retrieve information about",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cni"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cni"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -149,38 +157,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_cnis_get",
+    name: "networkInterconnects_cnis_get",
     title: "Get information about a CNI object",
-    description: "Retrieves configuration details for a specific Cloud Network Interconnect (CNI), including\nconnection status and parameters.",
+    description: "Retrieves configuration details for a specific Cloud Network Interconnect (CNI), including\nconnection status and parameters.\n\nGET /accounts/{account_id}/cni/cnis/{cni}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "cni": {
-          "description": "CNI ID to retrieve information about",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            },
+            "cni": {
+              "description": "CNI ID to retrieve information about",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cni"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cni"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_Cni",
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_BgpControl": nsc_BgpControl_output,
-        "nsc_BgpMode": nsc_BgpMode_output,
-        "nsc_Cni": nsc_Cni_output,
-        "nsc_MagicSettings": nsc_MagicSettings_output,
+        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_Cni": nsc_Cni,
+        "nsc_MagicSettings": nsc_MagicSettings,
       },
     },
     annotations: {
@@ -210,11 +223,9 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_BgpControl": nsc_BgpControl_output,
-        "nsc_BgpMode": nsc_BgpMode_output,
-        "nsc_Cni": nsc_Cni_output,
-        "nsc_MagicSettings": nsc_MagicSettings_output,
+        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_Cni": nsc_Cni,
+        "nsc_MagicSettings": nsc_MagicSettings,
       },
     },
     request: (args) => ({
@@ -222,75 +233,86 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_cnis_list",
+    name: "networkInterconnects_cnis_list",
     title: "List existing CNI objects",
-    description: "Lists all Cloud Network Interconnects (CNIs) configured for the account, showing connection\nstatus and parameters.",
+    description: "Lists all Cloud Network Interconnects (CNIs) configured for the account, showing connection\nstatus and parameters.\n\nGET /accounts/{account_id}/cni/cnis",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "cursor": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "type": "null"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
             }
-          ]
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "oneOf": [
-            {
-              "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "slot": {
-          "description": "If specified, only show CNIs associated with the specified slot",
-          "oneOf": [
-            {
-              "type": "string"
+            "limit": {
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "tunnel_id": {
-          "description": "If specified, only show cnis associated with the specified tunnel id",
-          "oneOf": [
-            {
-              "type": "string"
+            "slot": {
+              "description": "If specified, only show CNIs associated with the specified slot",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
+            "tunnel_id": {
+              "description": "If specified, only show cnis associated with the specified tunnel id",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
-          ]
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_CniList",
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_BgpControl": nsc_BgpControl_output,
-        "nsc_BgpMode": nsc_BgpMode_output,
-        "nsc_Cni": nsc_Cni_output,
-        "nsc_CniList": nsc_CniList_output,
-        "nsc_MagicSettings": nsc_MagicSettings_output,
+        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_Cni": nsc_Cni,
+        "nsc_CniList": nsc_CniList,
+        "nsc_MagicSettings": nsc_MagicSettings,
       },
     },
     annotations: {
@@ -320,65 +342,69 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_BgpControl": nsc_BgpControl_output,
-        "nsc_BgpMode": nsc_BgpMode_output,
-        "nsc_Cni": nsc_Cni_output,
-        "nsc_CniList": nsc_CniList_output,
-        "nsc_MagicSettings": nsc_MagicSettings_output,
+        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_Cni": nsc_Cni,
+        "nsc_CniList": nsc_CniList,
+        "nsc_MagicSettings": nsc_MagicSettings,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cni/cnis`,
       query: [
-        ["slot", args["slot"], true],
-        ["tunnel_id", args["tunnel_id"], true],
-        ["cursor", args["cursor"], true],
-        ["limit", args["limit"], true],
+        ["slot", param(args, "query", "slot"), true],
+        ["tunnel_id", param(args, "query", "tunnel_id"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
-    name: "network_interconnects_cnis_update",
+    name: "networkInterconnects_cnis_update",
     title: "Modify stored information about a CNI object",
-    description: "Updates the configuration of an existing Cloud Network Interconnect (CNI), including\nconnection parameters and routing settings.",
+    description: "Updates the configuration of an existing Cloud Network Interconnect (CNI), including\nconnection parameters and routing settings.\n\nPUT /accounts/{account_id}/cni/cnis/{cni}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
         "body": {
           "$ref": "#/$defs/nsc_Cni"
         },
-        "cni": {
-          "description": "CNI ID to retrieve information about",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            },
+            "cni": {
+              "description": "CNI ID to retrieve information about",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "cni"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "cni",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-        "nsc_BgpControl": nsc_BgpControl,
-        "nsc_BgpMode": nsc_BgpMode,
-        "nsc_Cni": nsc_Cni,
-        "nsc_MagicSettings": nsc_MagicSettings,
+        "nsc_BgpControl": nsc_BgpControl$,
+        "nsc_Cni": nsc_Cni$,
+        "nsc_MagicSettings": nsc_MagicSettings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_Cni",
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_BgpControl": nsc_BgpControl_output,
-        "nsc_BgpMode": nsc_BgpMode_output,
-        "nsc_Cni": nsc_Cni_output,
-        "nsc_MagicSettings": nsc_MagicSettings_output,
+        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_Cni": nsc_Cni,
+        "nsc_MagicSettings": nsc_MagicSettings,
       },
     },
     annotations: {
@@ -406,11 +432,9 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_BgpControl": nsc_BgpControl_output,
-        "nsc_BgpMode": nsc_BgpMode_output,
-        "nsc_Cni": nsc_Cni_output,
-        "nsc_MagicSettings": nsc_MagicSettings_output,
+        "nsc_BgpControl": nsc_BgpControl,
+        "nsc_Cni": nsc_Cni,
+        "nsc_MagicSettings": nsc_MagicSettings,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/networkInterconnects/interconnects/outputs.ts b/src/generated/forge-mcp/networkInterconnects/interconnects/outputs.ts
index 11190f7f2..c6b73461e 100644
--- a/src/generated/forge-mcp/networkInterconnects/interconnects/outputs.ts
+++ b/src/generated/forge-mcp/networkInterconnects/interconnects/outputs.ts
@@ -3,38 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `nsc_ApiBandwidth` in responses.
- */
-export const nsc_ApiBandwidth_output: JsonSchema = {
-  "enum": [
-    "50M",
-    "100M",
-    "200M",
-    "300M",
-    "400M",
-    "500M",
-    "1G",
-    "2G",
-    "5G",
-    "10G",
-    "20G",
-    "50G"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `nsc_CloudflareSite` in responses.
- */
-export const nsc_CloudflareSite_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `nsc_DefaultNameResponse` in responses.
  */
-export const nsc_DefaultNameResponse_output: JsonSchema = {
+export const nsc_DefaultNameResponse: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -49,7 +21,7 @@ export const nsc_DefaultNameResponse_output: JsonSchema = {
 /**
  * The schema of `nsc_Interconnect` in responses.
  */
-export const nsc_Interconnect_output: JsonSchema = {
+export const nsc_Interconnect: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/nsc_Interconnect_Physical_Body"
@@ -63,7 +35,7 @@ export const nsc_Interconnect_output: JsonSchema = {
 /**
  * The schema of `nsc_InterconnectList` in responses.
  */
-export const nsc_InterconnectList_output: JsonSchema = {
+export const nsc_InterconnectList: JsonSchema = {
   "properties": {
     "items": {
       "items": {
@@ -91,7 +63,7 @@ export const nsc_InterconnectList_output: JsonSchema = {
 /**
  * The schema of `nsc_Interconnect_GcpPartner_Body` in responses.
  */
-export const nsc_Interconnect_GcpPartner_Body_output: JsonSchema = {
+export const nsc_Interconnect_GcpPartner_Body: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -121,7 +93,21 @@ export const nsc_Interconnect_GcpPartner_Body_output: JsonSchema = {
           "type": "string"
         },
         "speed": {
-          "$ref": "#/$defs/nsc_ApiBandwidth"
+          "enum": [
+            "50M",
+            "100M",
+            "200M",
+            "300M",
+            "400M",
+            "500M",
+            "1G",
+            "2G",
+            "5G",
+            "10G",
+            "20G",
+            "50G"
+          ],
+          "type": "string"
         },
         "virtual_port_reservation_id": {
           "format": "uuid",
@@ -140,7 +126,7 @@ export const nsc_Interconnect_GcpPartner_Body_output: JsonSchema = {
 /**
  * The schema of `nsc_Interconnect_Physical_Body` in responses.
  */
-export const nsc_Interconnect_Physical_Body_output: JsonSchema = {
+export const nsc_Interconnect_Physical_Body: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -180,7 +166,7 @@ export const nsc_Interconnect_Physical_Body_output: JsonSchema = {
           "$ref": "#/$defs/nsc_FacilityInfo"
         },
         "site": {
-          "$ref": "#/$defs/nsc_CloudflareSite"
+          "type": "string"
         },
         "slot_id": {
           "format": "uuid",
@@ -209,7 +195,7 @@ export const nsc_Interconnect_Physical_Body_output: JsonSchema = {
 /**
  * The schema of `nsc_StatusInfo` in responses.
  */
-export const nsc_StatusInfo_output: JsonSchema = {
+export const nsc_StatusInfo: JsonSchema = {
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/networkInterconnects/interconnects/schemas.ts b/src/generated/forge-mcp/networkInterconnects/interconnects/schemas.ts
index e083e18dc..7c126e629 100644
--- a/src/generated/forge-mcp/networkInterconnects/interconnects/schemas.ts
+++ b/src/generated/forge-mcp/networkInterconnects/interconnects/schemas.ts
@@ -3,28 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `nsc_ApiBandwidth`.
- */
-export const nsc_ApiBandwidth: JsonSchema = {
-  "description": "Bandwidth structure as visible through the customer-facing API.",
-  "enum": [
-    "50M",
-    "100M",
-    "200M",
-    "300M",
-    "400M",
-    "500M",
-    "1G",
-    "2G",
-    "5G",
-    "10G",
-    "20G",
-    "50G"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `nsc_InterconnectCreate`.
  */
@@ -62,8 +40,22 @@ export const nsc_InterconnectCreate_GcpPartner_Body: JsonSchema = {
     {
       "properties": {
         "bandwidth": {
-          "$ref": "#/$defs/nsc_ApiBandwidth",
-          "description": "Bandwidth structure as visible through the customer-facing API."
+          "description": "Bandwidth structure as visible through the customer-facing API.",
+          "enum": [
+            "50M",
+            "100M",
+            "200M",
+            "300M",
+            "400M",
+            "500M",
+            "1G",
+            "2G",
+            "5G",
+            "10G",
+            "20G",
+            "50G"
+          ],
+          "type": "string"
         },
         "pairing_key": {
           "description": "Pairing key provided by GCP",
diff --git a/src/generated/forge-mcp/networkInterconnects/interconnects/tools.ts b/src/generated/forge-mcp/networkInterconnects/interconnects/tools.ts
index 23c3f6b56..901300641 100644
--- a/src/generated/forge-mcp/networkInterconnects/interconnects/tools.ts
+++ b/src/generated/forge-mcp/networkInterconnects/interconnects/tools.ts
@@ -1,52 +1,56 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import { nsc_FacilityInfo_output } from "../outputs.js";
-import { nsc_AccountTag } from "../schemas.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
+import { nsc_FacilityInfo } from "../outputs.js";
 import {
-  nsc_ApiBandwidth_output,
-  nsc_CloudflareSite_output,
-  nsc_DefaultNameResponse_output,
-  nsc_InterconnectList_output,
-  nsc_Interconnect_GcpPartner_Body_output,
-  nsc_Interconnect_Physical_Body_output,
-  nsc_Interconnect_output,
-  nsc_StatusInfo_output,
+  nsc_DefaultNameResponse,
+  nsc_Interconnect,
+  nsc_InterconnectList,
+  nsc_Interconnect_GcpPartner_Body,
+  nsc_Interconnect_Physical_Body,
+  nsc_StatusInfo,
 } from "./outputs.js";
 import {
-  nsc_ApiBandwidth,
   nsc_InterconnectCreate,
   nsc_InterconnectCreate_GcpPartner_Body,
   nsc_InterconnectCreate_Physical_Body,
 } from "./schemas.js";
 
 /**
- * The tools of `network_interconnects.interconnects`.
+ * The tools of `networkInterconnects.interconnects`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "network_interconnects_interconnects_create",
+    name: "networkInterconnects_interconnects_create",
     title: "Create a new interconnect",
-    description: "Creates a new network interconnect for connecting Cloudflare's network to external networks.\nInterconnects provide dedicated bandwidth and reduced latency for traffic exchange.",
+    description: "Creates a new network interconnect for connecting Cloudflare's network to external networks.\nInterconnects provide dedicated bandwidth and reduced latency for traffic exchange.\n\nPOST /accounts/{account_id}/cni/interconnects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
         "body": {
           "$ref": "#/$defs/nsc_InterconnectCreate"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-        "nsc_ApiBandwidth": nsc_ApiBandwidth,
         "nsc_InterconnectCreate": nsc_InterconnectCreate,
         "nsc_InterconnectCreate_GcpPartner_Body": nsc_InterconnectCreate_GcpPartner_Body,
         "nsc_InterconnectCreate_Physical_Body": nsc_InterconnectCreate_Physical_Body,
@@ -55,12 +59,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/nsc_Interconnect",
       $defs: {
-        "nsc_ApiBandwidth": nsc_ApiBandwidth_output,
-        "nsc_CloudflareSite": nsc_CloudflareSite_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_Interconnect": nsc_Interconnect_output,
-        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body_output,
-        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_Interconnect": nsc_Interconnect,
+        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body,
+        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body,
       },
     },
     annotations: {
@@ -87,12 +89,10 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_ApiBandwidth": nsc_ApiBandwidth_output,
-        "nsc_CloudflareSite": nsc_CloudflareSite_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_Interconnect": nsc_Interconnect_output,
-        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body_output,
-        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_Interconnect": nsc_Interconnect,
+        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body,
+        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body,
       },
     },
     request: (args) => ({
@@ -101,28 +101,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_interconnects_delete",
+    name: "networkInterconnects_interconnects_delete",
     title: "Delete an interconnect object",
-    description: "Permanently removes a network interconnect configuration. The physical or virtual connection\nwill be terminated.",
+    description: "Permanently removes a network interconnect configuration. The physical or virtual connection\nwill be terminated.\n\nDELETE /accounts/{account_id}/cni/interconnects/{icon}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "icon": {
-          "description": "Interconnect name to retrieve information about",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            },
+            "icon": {
+              "description": "Interconnect name to retrieve information about",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "icon"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "icon"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -152,38 +159,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_interconnects_get",
+    name: "networkInterconnects_interconnects_get",
     title: "Get information about an interconnect object",
-    description: "Retrieves configuration and status details for a specific network interconnect.",
+    description: "Retrieves configuration and status details for a specific network interconnect.\n\nGET /accounts/{account_id}/cni/interconnects/{icon}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "icon": {
-          "description": "Interconnect name to retrieve information about",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            },
+            "icon": {
+              "description": "Interconnect name to retrieve information about",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "icon"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "icon"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_Interconnect",
       $defs: {
-        "nsc_ApiBandwidth": nsc_ApiBandwidth_output,
-        "nsc_CloudflareSite": nsc_CloudflareSite_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_Interconnect": nsc_Interconnect_output,
-        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body_output,
-        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_Interconnect": nsc_Interconnect,
+        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body,
+        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body,
       },
     },
     annotations: {
@@ -213,12 +225,10 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_ApiBandwidth": nsc_ApiBandwidth_output,
-        "nsc_CloudflareSite": nsc_CloudflareSite_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_Interconnect": nsc_Interconnect_output,
-        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body_output,
-        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_Interconnect": nsc_Interconnect,
+        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body,
+        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body,
       },
     },
     request: (args) => ({
@@ -226,76 +236,87 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_interconnects_list",
+    name: "networkInterconnects_interconnects_list",
     title: "List existing interconnects",
-    description: "Lists all network interconnects configured for the account, including physical and virtual\nconnections.",
+    description: "Lists all network interconnects configured for the account, including physical and virtual\nconnections.\n\nGET /accounts/{account_id}/cni/interconnects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "cursor": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "type": "null"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
             }
-          ]
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "limit": {
-          "oneOf": [
-            {
-              "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "site": {
-          "description": "If specified, only show interconnects located at the given site",
-          "oneOf": [
-            {
-              "type": "string"
+            "limit": {
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "type": {
-          "description": "If specified, only show interconnects of the given type",
-          "oneOf": [
-            {
-              "type": "string"
+            "site": {
+              "description": "If specified, only show interconnects located at the given site",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
+            "type": {
+              "description": "If specified, only show interconnects of the given type",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
-          ]
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_InterconnectList",
       $defs: {
-        "nsc_ApiBandwidth": nsc_ApiBandwidth_output,
-        "nsc_CloudflareSite": nsc_CloudflareSite_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_Interconnect": nsc_Interconnect_output,
-        "nsc_InterconnectList": nsc_InterconnectList_output,
-        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body_output,
-        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_Interconnect": nsc_Interconnect,
+        "nsc_InterconnectList": nsc_InterconnectList,
+        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body,
+        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body,
       },
     },
     annotations: {
@@ -324,59 +345,70 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_ApiBandwidth": nsc_ApiBandwidth_output,
-        "nsc_CloudflareSite": nsc_CloudflareSite_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_Interconnect": nsc_Interconnect_output,
-        "nsc_InterconnectList": nsc_InterconnectList_output,
-        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body_output,
-        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_Interconnect": nsc_Interconnect,
+        "nsc_InterconnectList": nsc_InterconnectList,
+        "nsc_Interconnect_GcpPartner_Body": nsc_Interconnect_GcpPartner_Body,
+        "nsc_Interconnect_Physical_Body": nsc_Interconnect_Physical_Body,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cni/interconnects`,
       query: [
-        ["site", args["site"], true],
-        ["type", args["type"], true],
-        ["cursor", args["cursor"], true],
-        ["limit", args["limit"], true],
+        ["site", param(args, "query", "site"), true],
+        ["type", param(args, "query", "type"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
-    name: "network_interconnects_interconnects_loa",
+    name: "networkInterconnects_interconnects_loa",
     title: "Generate the Letter of Authorization (LOA) for a given interconnect",
-    description: "Downloads the Letter of Authorization (LOA) for a network interconnect, required for\nphysical cross-connect provisioning.",
+    description: "Downloads the Letter of Authorization (LOA) for a network interconnect, required for\nphysical cross-connect provisioning.\n\nGET /accounts/{account_id}/cni/interconnects/{icon}/loa",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "icon": {
-          "description": "Interconnect name to retrieve information about",
-          "type": "string"
-        },
-        "name": {
-          "description": "Custom name to use in the LOA instead of the account name (200 Character limit)",
-          "oneOf": [
-            {
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
               "type": "string"
             },
-            {
-              "type": "null"
+            "icon": {
+              "description": "Interconnect name to retrieve information about",
+              "type": "string"
             }
-          ]
+          },
+          "required": [
+            "account_id",
+            "icon"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "Custom name to use in the LOA instead of the account name (200 Character limit)",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "icon"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -406,38 +438,45 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cni/interconnects/${pathParam(args, "icon")}/loa`,
       query: [
-        ["name", args["name"], true],
+        ["name", param(args, "query", "name"), true],
       ],
     }),
   },
   {
-    name: "network_interconnects_interconnects_loa_default_name",
+    name: "networkInterconnects_interconnects_loaDefaultName",
     title: "Get the default customer name for LOA generation",
-    description: "Retrieves the default customer name that will be used in the LOA if no name is provided to the\n`/accounts/{account_id}/cni/interconnects/{icon}/loa` endpoint.",
+    description: "Retrieves the default customer name that will be used in the LOA if no name is provided to the\n`/accounts/{account_id}/cni/interconnects/{icon}/loa` endpoint.\n\nGET /accounts/{account_id}/cni/interconnects/{icon}/loa/default",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "icon": {
-          "description": "Interconnect name to retrieve information about",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            },
+            "icon": {
+              "description": "Interconnect name to retrieve information about",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "icon"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "icon"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_DefaultNameResponse",
       $defs: {
-        "nsc_DefaultNameResponse": nsc_DefaultNameResponse_output,
+        "nsc_DefaultNameResponse": nsc_DefaultNameResponse,
       },
     },
     annotations: {
@@ -467,7 +506,7 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_DefaultNameResponse": nsc_DefaultNameResponse_output,
+        "nsc_DefaultNameResponse": nsc_DefaultNameResponse,
       },
     },
     request: (args) => ({
@@ -475,33 +514,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_interconnects_status",
+    name: "networkInterconnects_interconnects_status",
     title: "Get the current status of an interconnect object",
-    description: "Gets the current operational status of a network interconnect, including link state and\ntraffic metrics.",
+    description: "Gets the current operational status of a network interconnect, including link state and\ntraffic metrics.\n\nGET /accounts/{account_id}/cni/interconnects/{icon}/status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "icon": {
-          "description": "Interconnect name to retrieve information about",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            },
+            "icon": {
+              "description": "Interconnect name to retrieve information about",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "icon"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "icon"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_StatusInfo",
       $defs: {
-        "nsc_StatusInfo": nsc_StatusInfo_output,
+        "nsc_StatusInfo": nsc_StatusInfo,
       },
     },
     annotations: {
@@ -531,7 +577,7 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_StatusInfo": nsc_StatusInfo_output,
+        "nsc_StatusInfo": nsc_StatusInfo,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/networkInterconnects/outputs.ts b/src/generated/forge-mcp/networkInterconnects/outputs.ts
index 1a96d0fd4..6589429ae 100644
--- a/src/generated/forge-mcp/networkInterconnects/outputs.ts
+++ b/src/generated/forge-mcp/networkInterconnects/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `nsc_AccountTag` in responses.
- */
-export const nsc_AccountTag_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `nsc_FacilityInfo` in responses.
  */
-export const nsc_FacilityInfo_output: JsonSchema = {
+export const nsc_FacilityInfo: JsonSchema = {
   "properties": {
     "address": {
       "items": {
diff --git a/src/generated/forge-mcp/networkInterconnects/schemas.ts b/src/generated/forge-mcp/networkInterconnects/schemas.ts
deleted file mode 100644
index 8338ed299..000000000
--- a/src/generated/forge-mcp/networkInterconnects/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `nsc_AccountTag`.
- */
-export const nsc_AccountTag: JsonSchema = {
-  "description": "Customer account tag",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/networkInterconnects/settings/outputs.ts b/src/generated/forge-mcp/networkInterconnects/settings/outputs.ts
index 512247172..db8423664 100644
--- a/src/generated/forge-mcp/networkInterconnects/settings/outputs.ts
+++ b/src/generated/forge-mcp/networkInterconnects/settings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `nsc_Settings` in responses.
  */
-export const nsc_Settings_output: JsonSchema = {
+export const nsc_Settings: JsonSchema = {
   "properties": {
     "default_asn": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/networkInterconnects/settings/tools.ts b/src/generated/forge-mcp/networkInterconnects/settings/tools.ts
index dcee7f1e1..3b0747690 100644
--- a/src/generated/forge-mcp/networkInterconnects/settings/tools.ts
+++ b/src/generated/forge-mcp/networkInterconnects/settings/tools.ts
@@ -2,33 +2,43 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
-import { nsc_Settings_output } from "./outputs.js";
+import { nsc_Settings } from "./outputs.js";
 import { nsc_SettingsRequest } from "./schemas.js";
 
 /**
- * The tools of `network_interconnects.settings`.
+ * The tools of `networkInterconnects.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "network_interconnects_settings_get",
+    name: "networkInterconnects_settings_get",
     title: "Get the current settings for the active account",
-    description: "Retrieves current settings configuration for the specified resource or service.",
+    description: "Retrieves current settings configuration for the specified resource or service.\n\nGET /accounts/{account_id}/cni/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account tag to retrieve settings for",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account tag to retrieve settings for",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_Settings",
       $defs: {
-        "nsc_Settings": nsc_Settings_output,
+        "nsc_Settings": nsc_Settings,
       },
     },
     annotations: {
@@ -58,7 +68,7 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_Settings": nsc_Settings_output,
+        "nsc_Settings": nsc_Settings,
       },
     },
     request: (args) => ({
@@ -66,24 +76,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_settings_update",
+    name: "networkInterconnects_settings_update",
     title: "Update the current settings for the active account",
-    description: "Updates configuration settings for the specified resource or service.",
+    description: "Updates configuration settings for the specified resource or service.\n\nPUT /accounts/{account_id}/cni/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account tag to update settings for",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/nsc_SettingsRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account tag to update settings for",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "nsc_SettingsRequest": nsc_SettingsRequest,
       },
@@ -91,7 +111,7 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/nsc_Settings",
       $defs: {
-        "nsc_Settings": nsc_Settings_output,
+        "nsc_Settings": nsc_Settings,
       },
     },
     annotations: {
@@ -119,7 +139,7 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_Settings": nsc_Settings_output,
+        "nsc_Settings": nsc_Settings,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/networkInterconnects/slots/outputs.ts b/src/generated/forge-mcp/networkInterconnects/slots/outputs.ts
index 3b5844721..10ece40fb 100644
--- a/src/generated/forge-mcp/networkInterconnects/slots/outputs.ts
+++ b/src/generated/forge-mcp/networkInterconnects/slots/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `nsc_SlotInfo` in responses.
  */
-export const nsc_SlotInfo_output: JsonSchema = {
+export const nsc_SlotInfo: JsonSchema = {
   "properties": {
     "account": {
-      "$ref": "#/$defs/nsc_AccountTag"
+      "type": "string"
     },
     "ccr_device_name": {
       "oneOf": [
@@ -51,7 +51,7 @@ export const nsc_SlotInfo_output: JsonSchema = {
 /**
  * The schema of `nsc_SlotList` in responses.
  */
-export const nsc_SlotList_output: JsonSchema = {
+export const nsc_SlotList: JsonSchema = {
   "properties": {
     "items": {
       "items": {
diff --git a/src/generated/forge-mcp/networkInterconnects/slots/tools.ts b/src/generated/forge-mcp/networkInterconnects/slots/tools.ts
index 28d367db5..7c458d705 100644
--- a/src/generated/forge-mcp/networkInterconnects/slots/tools.ts
+++ b/src/generated/forge-mcp/networkInterconnects/slots/tools.ts
@@ -1,45 +1,50 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import { nsc_AccountTag_output, nsc_FacilityInfo_output } from "../outputs.js";
-import { nsc_AccountTag } from "../schemas.js";
-import { nsc_SlotInfo_output, nsc_SlotList_output } from "./outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
+import { nsc_FacilityInfo } from "../outputs.js";
+import { nsc_SlotInfo, nsc_SlotList } from "./outputs.js";
 
 /**
- * The tools of `network_interconnects.slots`.
+ * The tools of `networkInterconnects.slots`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "network_interconnects_slots_get",
+    name: "networkInterconnects_slots_get",
     title: "Get information about the specified slot",
-    description: "Gets information about a specific infrastructure slot allocation.",
+    description: "Gets information about a specific infrastructure slot allocation.\n\nGET /accounts/{account_id}/cni/slots/{slot}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "slot": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
+              "type": "string"
+            },
+            "slot": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "slot"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "slot"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_SlotInfo",
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_SlotInfo": nsc_SlotInfo_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_SlotInfo": nsc_SlotInfo,
       },
     },
     annotations: {
@@ -69,9 +74,8 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_SlotInfo": nsc_SlotInfo_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_SlotInfo": nsc_SlotInfo,
       },
     },
     request: (args) => ({
@@ -79,95 +83,107 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "network_interconnects_slots_list",
+    name: "networkInterconnects_slots_list",
     title: "Retrieve a list of all slots matching the specified parameters",
-    description: "Lists all available infrastructure slots for the account, showing allocation status and\ncapacity.",
+    description: "Lists all available infrastructure slots for the account, showing allocation status and\ncapacity.\n\nGET /accounts/{account_id}/cni/slots",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/nsc_AccountTag",
-          "description": "Customer account tag"
-        },
-        "address_contains": {
-          "description": "If specified, only show slots with the given text in their address field",
-          "oneOf": [
-            {
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Customer account tag",
               "type": "string"
-            },
-            {
-              "type": "null"
             }
-          ]
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "oneOf": [
-            {
-              "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "address_contains": {
+              "description": "If specified, only show slots with the given text in their address field",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "limit": {
-          "oneOf": [
-            {
-              "type": "integer"
+            "cursor": {
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "occupied": {
-          "description": "If specified, only show slots with a specific occupied/unoccupied state",
-          "oneOf": [
-            {
-              "type": "boolean"
+            "limit": {
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "site": {
-          "description": "If specified, only show slots located at the given site",
-          "oneOf": [
-            {
-              "type": "string"
+            "occupied": {
+              "description": "If specified, only show slots with a specific occupied/unoccupied state",
+              "oneOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "speed": {
-          "description": "If specified, only show slots that support the given speed",
-          "oneOf": [
-            {
-              "type": "string"
+            "site": {
+              "description": "If specified, only show slots located at the given site",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
+            "speed": {
+              "description": "If specified, only show slots that support the given speed",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
-          ]
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "nsc_AccountTag": nsc_AccountTag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/nsc_SlotList",
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_SlotInfo": nsc_SlotInfo_output,
-        "nsc_SlotList": nsc_SlotList_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_SlotInfo": nsc_SlotInfo,
+        "nsc_SlotList": nsc_SlotList,
       },
     },
     annotations: {
@@ -196,21 +212,20 @@ export const tools: readonly Tool[] = [
         "500": null
       },
       $defs: {
-        "nsc_AccountTag": nsc_AccountTag_output,
-        "nsc_FacilityInfo": nsc_FacilityInfo_output,
-        "nsc_SlotInfo": nsc_SlotInfo_output,
-        "nsc_SlotList": nsc_SlotList_output,
+        "nsc_FacilityInfo": nsc_FacilityInfo,
+        "nsc_SlotInfo": nsc_SlotInfo,
+        "nsc_SlotList": nsc_SlotList,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cni/slots`,
       query: [
-        ["address_contains", args["address_contains"], true],
-        ["site", args["site"], true],
-        ["speed", args["speed"], true],
-        ["occupied", args["occupied"], true],
-        ["cursor", args["cursor"], true],
-        ["limit", args["limit"], true],
+        ["address_contains", param(args, "query", "address_contains"), true],
+        ["site", param(args, "query", "site"), true],
+        ["speed", param(args, "query", "speed"), true],
+        ["occupied", param(args, "query", "occupied"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/o11y/agents/sessions/outputs.ts b/src/generated/forge-mcp/o11y/agents/sessions/outputs.ts
index 1044b6e26..95a50ad6f 100644
--- a/src/generated/forge-mcp/o11y/agents/sessions/outputs.ts
+++ b/src/generated/forge-mcp/o11y/agents/sessions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `workers-observability_agent_session` in responses.
  */
-export const workers_observability_agent_session_output: JsonSchema = {
+export const workers$$observability_agent_session: JsonSchema = {
   "properties": {
     "conversationId": {
       "type": "string"
@@ -65,7 +65,7 @@ export const workers_observability_agent_session_output: JsonSchema = {
 /**
  * The schema of `workers-observability_agent_session_run` in responses.
  */
-export const workers_observability_agent_session_run_output: JsonSchema = {
+export const workers$$observability_agent_session_run: JsonSchema = {
   "properties": {
     "conversationId": {
       "type": "string"
diff --git a/src/generated/forge-mcp/o11y/agents/sessions/tools.ts b/src/generated/forge-mcp/o11y/agents/sessions/tools.ts
index 78540a794..67daa5840 100644
--- a/src/generated/forge-mcp/o11y/agents/sessions/tools.ts
+++ b/src/generated/forge-mcp/o11y/agents/sessions/tools.ts
@@ -1,10 +1,10 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  workers_observability_agent_session_output,
-  workers_observability_agent_session_run_output,
+  workers$$observability_agent_session,
+  workers$$observability_agent_session_run,
 } from "./outputs.js";
 
 /**
@@ -14,46 +14,65 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_agents_sessions_list",
     title: "List Agent sessions",
-    description: "Lists sessions in which the specified agent participated, ordered by most recent activity. A session is identified by gen_ai.conversation.id and includes authorized activity from every agent in that conversation during the requested time range. Agent invocation and chat spans without a conversation ID are attributed only when their trace is associated with exactly one observed conversation.",
+    description: "Lists sessions in which the specified agent participated, ordered by most recent activity. A session is identified by gen_ai.conversation.id and includes authorized activity from every agent in that conversation during the requested time range. Agent invocation and chat spans without a conversation ID are attributed only when their trace is associated with exactly one observed conversation.\n\nGET /accounts/{account_id}/workers/observability/agents/sessions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "agent": {
-          "description": "Agent name reported in gen_ai.agent.name. The request is limited to conversations in which this service and agent participated.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque cursor from result_info.cursors.after in the previous response.",
-          "type": "string"
-        },
-        "from": {
-          "description": "Start of the requested time range, as Unix epoch milliseconds. Values earlier than the 7-day retention boundary are clamped.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Maximum number of items to return. Defaults to 20 and cannot exceed 100.",
-          "type": "integer"
-        },
-        "service": {
-          "description": "Worker service name associated with the participating agent.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "to": {
-          "description": "End of the requested time range, as Unix epoch milliseconds. Must be later than from.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "agent": {
+              "description": "Agent name reported in gen_ai.agent.name. The request is limited to conversations in which this service and agent participated.",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Opaque cursor from result_info.cursors.after in the previous response.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start of the requested time range, as Unix epoch milliseconds. Values earlier than the 7-day retention boundary are clamped.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Maximum number of items to return. Defaults to 20 and cannot exceed 100.",
+              "type": "integer"
+            },
+            "service": {
+              "description": "Worker service name associated with the participating agent.",
+              "type": "string"
+            },
+            "to": {
+              "description": "End of the requested time range, as Unix epoch milliseconds. Must be later than from.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "service",
+            "agent",
+            "from",
+            "to"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "service",
-        "agent",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -144,7 +163,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_agent_session": workers_observability_agent_session_output,
+        "workers-observability_agent_session": workers$$observability_agent_session,
       },
     },
     annotations: {
@@ -549,69 +568,88 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_agent_session": workers_observability_agent_session_output,
+        "workers-observability_agent_session": workers$$observability_agent_session,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/observability/agents/sessions`,
       query: [
-        ["service", args["service"], true],
-        ["agent", args["agent"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["service", param(args, "query", "service"), true],
+        ["agent", param(args, "query", "agent"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "o11y_agents_sessions_runs",
     title: "List Agent session runs",
-    description: "Lists the traces associated with a session, ordered by most recent activity. The service and agent parameters must identify an agent that participated in the conversation. Results include every authorized trace containing an agent invocation in that conversation during the requested time range.",
+    description: "Lists the traces associated with a session, ordered by most recent activity. The service and agent parameters must identify an agent that participated in the conversation. Results include every authorized trace containing an agent invocation in that conversation during the requested time range.\n\nGET /accounts/{account_id}/workers/observability/agents/sessions/{conversationId}/runs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "agent": {
-          "description": "Agent name reported in gen_ai.agent.name. The request is limited to conversations in which this service and agent participated.",
-          "type": "string"
-        },
-        "conversation_id": {
-          "description": "OpenTelemetry gen_ai.conversation.id value that identifies the session.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque cursor from result_info.cursors.after in the previous response.",
-          "type": "string"
-        },
-        "from": {
-          "description": "Start of the requested time range, as Unix epoch milliseconds. Values earlier than the 7-day retention boundary are clamped.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Maximum number of items to return. Defaults to 20 and cannot exceed 100.",
-          "type": "integer"
-        },
-        "service": {
-          "description": "Worker service name associated with the participating agent.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "conversationId": {
+              "description": "OpenTelemetry gen_ai.conversation.id value that identifies the session.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "conversationId"
+          ],
+          "type": "object"
         },
-        "to": {
-          "description": "End of the requested time range, as Unix epoch milliseconds. Must be later than from.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "agent": {
+              "description": "Agent name reported in gen_ai.agent.name. The request is limited to conversations in which this service and agent participated.",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Opaque cursor from result_info.cursors.after in the previous response.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start of the requested time range, as Unix epoch milliseconds. Values earlier than the 7-day retention boundary are clamped.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Maximum number of items to return. Defaults to 20 and cannot exceed 100.",
+              "type": "integer"
+            },
+            "service": {
+              "description": "Worker service name associated with the participating agent.",
+              "type": "string"
+            },
+            "to": {
+              "description": "End of the requested time range, as Unix epoch milliseconds. Must be later than from.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "service",
+            "agent",
+            "from",
+            "to"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "conversation_id",
-        "service",
-        "agent",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -702,7 +740,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_agent_session_run": workers_observability_agent_session_run_output,
+        "workers-observability_agent_session_run": workers$$observability_agent_session_run,
       },
     },
     annotations: {
@@ -1107,18 +1145,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_agent_session_run": workers_observability_agent_session_run_output,
+        "workers-observability_agent_session_run": workers$$observability_agent_session_run,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/agents/sessions/${pathParam(args, "conversation_id")}/runs`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/agents/sessions/${pathParam(args, "conversationId")}/runs`,
       query: [
-        ["service", args["service"], true],
-        ["agent", args["agent"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["service", param(args, "query", "service"), true],
+        ["agent", param(args, "query", "agent"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/o11y/destinations/tools.ts b/src/generated/forge-mcp/o11y/destinations/tools.ts
index a6e7560cd..24487c637 100644
--- a/src/generated/forge-mcp/o11y/destinations/tools.ts
+++ b/src/generated/forge-mcp/o11y/destinations/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `o11y.destinations`.
@@ -10,14 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_destinations_create",
     title: "Create Destination",
-    description: "Create a new Workers Observability Telemetry Destination.",
+    description: "Create a new Workers Observability Telemetry Destination.\n\nPOST /accounts/{account_id}/workers/observability/destinations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "configuration": {
@@ -70,11 +66,25 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -569,22 +579,32 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_destinations_delete",
     title: "Delete Destination",
-    description: "Delete a Workers Observability Telemetry Destination.",
+    description: "Delete a Workers Observability Telemetry Destination.\n\nDELETE /accounts/{account_id}/workers/observability/destinations/{slug}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "slug": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "slug": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "slug"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "slug"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1076,42 +1096,58 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_destinations_list",
     title: "Get Destinations",
-    description: "List your Workers Observability Telemetry Destinations.",
+    description: "List your Workers Observability Telemetry Destinations.\n\nGET /accounts/{account_id}/workers/observability/destinations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "order": {
-          "default": "desc",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order_by": {
-          "default": "updated",
-          "enum": [
-            "created",
-            "updated"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "order": {
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "orderBy": {
+              "default": "updated",
+              "enum": [
+                "created",
+                "updated"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "number"
+            },
+            "perPage": {
+              "default": 20,
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1557,24 +1593,20 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/observability/destinations`,
       query: [
-        ["page", args["page"], true],
-        ["perPage", args["per_page"], true],
-        ["order", args["order"], true],
-        ["orderBy", args["order_by"], true],
+        ["page", param(args, "query", "page"), true],
+        ["perPage", param(args, "query", "perPage"), true],
+        ["order", param(args, "query", "order"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
       ],
     }),
   },
   {
     name: "o11y_destinations_update",
     title: "Update Destination",
-    description: "Update an existing Workers Observability Telemetry Destination.",
+    description: "Update an existing Workers Observability Telemetry Destination.\n\nPATCH /accounts/{account_id}/workers/observability/destinations/{slug}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "configuration": {
@@ -1621,14 +1653,28 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "slug": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "slug": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "slug"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "slug"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/o11y/issues/automations/tools.ts b/src/generated/forge-mcp/o11y/issues/automations/tools.ts
index 26b5a155b..012aee180 100644
--- a/src/generated/forge-mcp/o11y/issues/automations/tools.ts
+++ b/src/generated/forge-mcp/o11y/issues/automations/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `o11y.issues.automations`.
@@ -10,14 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_issues_automations_create",
     title: "Create an issue automation",
-    description: "Create an account or service issue automation.",
+    description: "Create an account or service issue automation.\n\nPOST /accounts/{account_id}/workers/observability/issues/automations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "afterInactivitySeconds": {
@@ -43,12 +39,26 @@ export const tools: readonly Tool[] = [
             "policyId"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -617,22 +627,32 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_issues_automations_delete",
     title: "Delete an issue automation",
-    description: "Delete an issue automation while preserving its historical runs.",
+    description: "Delete an issue automation while preserving its historical runs.\n\nDELETE /accounts/{account_id}/workers/observability/issues/automations/{automationId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "automation_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "automationId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "automationId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "automation_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1194,28 +1214,38 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/automations/${pathParam(args, "automation_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/automations/${pathParam(args, "automationId")}`,
     }),
   },
   {
     name: "o11y_issues_automations_get",
     title: "Get an issue automation",
-    description: "Retrieve an issue automation.",
+    description: "Retrieve an issue automation.\n\nGET /accounts/{account_id}/workers/observability/issues/automations/{automationId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "automation_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "automationId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "automationId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "automation_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1777,27 +1807,43 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/automations/${pathParam(args, "automation_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/automations/${pathParam(args, "automationId")}`,
     }),
   },
   {
     name: "o11y_issues_automations_list",
     title: "List issue automations",
-    description: "List account and service issue automations.",
+    description: "List account and service issue automations.\n\nGET /accounts/{account_id}/workers/observability/issues/automations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "service": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "service": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2367,24 +2413,17 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/automations`,
       query: [
-        ["service", args["service"], true],
+        ["service", param(args, "query", "service"), true],
       ],
     }),
   },
   {
     name: "o11y_issues_automations_update",
     title: "Update an issue automation",
-    description: "Replace an issue automation configuration.",
+    description: "Replace an issue automation configuration.\n\nPUT /accounts/{account_id}/workers/observability/issues/automations/{automationId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "automation_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "afterInactivitySeconds": {
@@ -2410,13 +2449,30 @@ export const tools: readonly Tool[] = [
             "policyId"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "automationId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "automationId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "automation_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2978,7 +3034,7 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/automations/${pathParam(args, "automation_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/automations/${pathParam(args, "automationId")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
diff --git a/src/generated/forge-mcp/o11y/issues/outputs.ts b/src/generated/forge-mcp/o11y/issues/outputs.ts
index 97a135507..196100f44 100644
--- a/src/generated/forge-mcp/o11y/issues/outputs.ts
+++ b/src/generated/forge-mcp/o11y/issues/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers-observability_issue_occurrence` in responses.
  */
-export const workers_observability_issue_occurrence_output: JsonSchema = {
+export const workers$$observability_issue_occurrence: JsonSchema = {
   "properties": {
     "context": {
       "properties": {
diff --git a/src/generated/forge-mcp/o11y/issues/tools.ts b/src/generated/forge-mcp/o11y/issues/tools.ts
index f5cdf1edf..d58c2d833 100644
--- a/src/generated/forge-mcp/o11y/issues/tools.ts
+++ b/src/generated/forge-mcp/o11y/issues/tools.ts
@@ -1,8 +1,8 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import { workers_observability_issue_occurrence_output } from "./outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
+import { workers$$observability_issue_occurrence } from "./outputs.js";
 
 /**
  * The tools of `o11y.issues`.
@@ -11,14 +11,10 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_issues_add",
     title: "Add issue group members",
-    description: "Add one or more ungrouped issues to an existing issue group.",
+    description: "Add one or more ungrouped issues to an existing issue group.\n\nPOST /accounts/{account_id}/workers/observability/issues/groups/{groupId}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "issueIds": {
@@ -35,15 +31,29 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "groupId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "groupId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -615,29 +625,39 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/groups/${pathParam(args, "group_id")}/members`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/groups/${pathParam(args, "groupId")}/members`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
     name: "o11y_issues_get",
     title: "Get an issue",
-    description: "Retrieve an issue.",
+    description: "Retrieve an issue.\n\nGET /accounts/{account_id}/workers/observability/issues/{issueId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "issue_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "issueId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "issueId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "issue_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1369,20 +1389,16 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/${pathParam(args, "issue_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/${pathParam(args, "issueId")}`,
     }),
   },
   {
     name: "o11y_issues_group",
     title: "Create an issue group",
-    description: "Group two or more issues under a new customer-defined identity.",
+    description: "Group two or more issues under a new customer-defined identity.\n\nPOST /accounts/{account_id}/workers/observability/issues/groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "issueIds": {
@@ -1402,12 +1418,26 @@ export const tools: readonly Tool[] = [
             "title"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1986,64 +2016,80 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_issues_list",
     title: "List detected issues",
-    description: "List detected issues.",
+    description: "List detected issues.\n\nGET /accounts/{account_id}/workers/observability/issues",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "order": {
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order_by": {
-          "enum": [
-            "id",
-            "service",
-            "title",
-            "type",
-            "status",
-            "statusUpdated",
-            "count",
-            "firstObserved",
-            "lastObserved",
-            "created",
-            "updated"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "type": "integer"
-        },
-        "per_page": {
-          "type": "integer"
-        },
-        "search": {
-          "type": "string"
-        },
-        "service": {
-          "type": "string"
-        },
-        "status": {
-          "enum": [
-            "active",
-            "resolved",
-            "ignored"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "type": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "order": {
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "orderBy": {
+              "enum": [
+                "id",
+                "service",
+                "title",
+                "type",
+                "status",
+                "statusUpdated",
+                "count",
+                "firstObserved",
+                "lastObserved",
+                "created",
+                "updated"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "type": "integer"
+            },
+            "perPage": {
+              "type": "integer"
+            },
+            "search": {
+              "type": "string"
+            },
+            "service": {
+              "type": "string"
+            },
+            "status": {
+              "enum": [
+                "active",
+                "resolved",
+                "ignored"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2823,28 +2869,24 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues`,
       query: [
-        ["page", args["page"], true],
-        ["perPage", args["per_page"], true],
-        ["order", args["order"], true],
-        ["orderBy", args["order_by"], true],
-        ["search", args["search"], true],
-        ["service", args["service"], true],
-        ["type", args["type"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["perPage", param(args, "query", "perPage"), true],
+        ["order", param(args, "query", "order"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
+        ["search", param(args, "query", "search"), true],
+        ["service", param(args, "query", "service"), true],
+        ["type", param(args, "query", "type"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
   {
     name: "o11y_issues_notify",
     title: "Notify about an issue",
-    description: "Send the issue to one ANS policy, or every matching Real-Time Issue policy when no policy ID is provided.",
+    description: "Send the issue to one ANS policy, or every matching Real-Time Issue policy when no policy ID is provided.\n\nPOST /accounts/{account_id}/workers/observability/issues/{issueId}/notification-runs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "policyId": {
@@ -2853,15 +2895,29 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "issue_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "issueId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "issueId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "issue_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3461,37 +3517,53 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/${pathParam(args, "issue_id")}/notification-runs`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/${pathParam(args, "issueId")}/notification-runs`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
     name: "o11y_issues_occurrences",
     title: "List issue occurrences",
-    description: "List the retained error occurrences grouped into an issue, newest first.",
+    description: "List the retained error occurrences grouped into an issue, newest first.\n\nGET /accounts/{account_id}/workers/observability/issues/{issueId}/occurrences",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque cursor returned in result_info.cursors.after.",
-          "type": "string"
-        },
-        "issue_id": {
-          "description": "Issue ID returned by the issues API.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "issueId": {
+              "description": "Issue ID returned by the issues API.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "issueId"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque cursor returned in result_info.cursors.after.",
+              "type": "string"
+            },
+            "per_page": {
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "issue_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3582,7 +3654,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_issue_occurrence": workers_observability_issue_occurrence_output,
+        "workers-observability_issue_occurrence": workers$$observability_issue_occurrence,
       },
     },
     annotations: {
@@ -4037,40 +4109,50 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_issue_occurrence": workers_observability_issue_occurrence_output,
+        "workers-observability_issue_occurrence": workers$$observability_issue_occurrence,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/${pathParam(args, "issue_id")}/occurrences`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/${pathParam(args, "issueId")}/occurrences`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "o11y_issues_remove",
     title: "Remove an issue group member",
-    description: "Remove an issue from a group, dissolving the group when fewer than two members remain.",
+    description: "Remove an issue from a group, dissolving the group when fewer than two members remain.\n\nDELETE /accounts/{account_id}/workers/observability/issues/groups/{groupId}/members/{issueId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "group_id": {
-          "type": "string"
-        },
-        "issue_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "groupId": {
+              "type": "string"
+            },
+            "issueId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "groupId",
+            "issueId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id",
-        "issue_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -4656,27 +4738,43 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/groups/${pathParam(args, "group_id")}/members/${pathParam(args, "issue_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/groups/${pathParam(args, "groupId")}/members/${pathParam(args, "issueId")}`,
     }),
   },
   {
     name: "o11y_issues_summary",
     title: "Summarize detected issues",
-    description: "Retrieve aggregate issue counts for the account.",
+    description: "Retrieve aggregate issue counts for the account.\n\nGET /accounts/{account_id}/workers/observability/issues/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "service": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "service": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5050,29 +5148,39 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/summary`,
       query: [
-        ["service", args["service"], true],
+        ["service", param(args, "query", "service"), true],
       ],
     }),
   },
   {
     name: "o11y_issues_ungroup",
     title: "Dissolve an issue group",
-    description: "Dissolve an issue group and restore its members as standalone issues.",
+    description: "Dissolve an issue group and restore its members as standalone issues.\n\nDELETE /accounts/{account_id}/workers/observability/issues/groups/{groupId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "groupId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "groupId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5412,20 +5520,16 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/groups/${pathParam(args, "group_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/groups/${pathParam(args, "groupId")}`,
     }),
   },
   {
     name: "o11y_issues_update",
     title: "Modify an issue",
-    description: "Modify an issue status or group title.",
+    description: "Modify an issue status or group title.\n\nPATCH /accounts/{account_id}/workers/observability/issues/{issueId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Modify an issue status or group title.",
           "properties": {
@@ -5443,15 +5547,29 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "issue_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "issueId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "issueId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "issue_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -5973,7 +6091,7 @@ export const tools: readonly Tool[] = [
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/${pathParam(args, "issue_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/issues/${pathParam(args, "issueId")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
diff --git a/src/generated/forge-mcp/o11y/metricsExport/tools.ts b/src/generated/forge-mcp/o11y/metricsExport/tools.ts
index da7bf9c3d..c49ee7db4 100644
--- a/src/generated/forge-mcp/o11y/metricsExport/tools.ts
+++ b/src/generated/forge-mcp/o11y/metricsExport/tools.ts
@@ -4,24 +4,34 @@
 import { type Tool, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `o11y.metrics_export`.
+ * The tools of `o11y.metricsExport`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "o11y_metrics_export_list",
+    name: "o11y_metricsExport_list",
     title: "List Metrics Exports",
-    description: "List resources configured for Workers Observability metrics export.",
+    description: "List resources configured for Workers Observability metrics export.\n\nGET /accounts/{account_id}/workers/observability/metricsexport",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -317,16 +327,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "o11y_metrics_export_upsert",
+    name: "o11y_metricsExport_upsert",
     title: "Upsert Metrics Exports",
-    description: "Create or replace resources configured for Workers Observability metrics export.",
+    description: "Create or replace resources configured for Workers Observability metrics export.\n\nPOST /accounts/{account_id}/workers/observability/metricsexport",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "requester": {
@@ -385,11 +391,25 @@ export const tools: readonly Tool[] = [
             "resources"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/o11y/outputs.ts b/src/generated/forge-mcp/o11y/outputs.ts
index 1533e61ec..905c0ecf9 100644
--- a/src/generated/forge-mcp/o11y/outputs.ts
+++ b/src/generated/forge-mcp/o11y/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `workers-observability_distribution_result` in responses.
  */
-export const workers_observability_distribution_result_output: JsonSchema = {
+export const workers$$observability_distribution_result: JsonSchema = {
   "properties": {
     "bins": {
       "items": {
@@ -56,7 +56,7 @@ export const workers_observability_distribution_result_output: JsonSchema = {
 /**
  * The schema of `workers-observability_filter_leaf` in responses.
  */
-export const workers_observability_filter_leaf_output: JsonSchema = {
+export const workers$$observability_filter_leaf: JsonSchema = {
   "properties": {
     "key": {
       "type": "string"
@@ -135,7 +135,7 @@ export const workers_observability_filter_leaf_output: JsonSchema = {
 /**
  * The schema of `workers-observability_filter_node` in responses.
  */
-export const workers_observability_filter_node_output: JsonSchema = {
+export const workers$$observability_filter_node: JsonSchema = {
   "anyOf": [
     {
       "properties": {
@@ -178,7 +178,7 @@ export const workers_observability_filter_node_output: JsonSchema = {
 /**
  * The schema of `workers-observability_performance_information` in responses.
  */
-export const workers_observability_performance_information_output: JsonSchema = {
+export const workers$$observability_performance_information: JsonSchema = {
   "properties": {
     "abr_level": {
       "type": "number"
@@ -204,7 +204,7 @@ export const workers_observability_performance_information_output: JsonSchema =
 /**
  * The schema of `workers-observability_query` in responses.
  */
-export const workers_observability_query_output: JsonSchema = {
+export const workers$$observability_query: JsonSchema = {
   "properties": {
     "adhoc": {
       "type": "boolean"
@@ -491,7 +491,7 @@ export const workers_observability_query_output: JsonSchema = {
 /**
  * The schema of `workers-observability_query_results` in responses.
  */
-export const workers_observability_query_results_output: JsonSchema = {
+export const workers$$observability_query_results: JsonSchema = {
   "properties": {
     "agents": {
       "items": {
@@ -1067,7 +1067,7 @@ export const workers_observability_query_results_output: JsonSchema = {
 /**
  * The schema of `workers-observability_query_run` in responses.
  */
-export const workers_observability_query_run_output: JsonSchema = {
+export const workers$$observability_query_run: JsonSchema = {
   "properties": {
     "accountId": {
       "type": "string"
@@ -1185,7 +1185,7 @@ export const workers_observability_query_run_output: JsonSchema = {
 /**
  * The schema of `workers-observability_telemetry_event` in responses.
  */
-export const workers_observability_telemetry_event_output: JsonSchema = {
+export const workers$$observability_telemetry_event: JsonSchema = {
   "properties": {
     "$containers": {
       "type": "object"
diff --git a/src/generated/forge-mcp/o11y/queries/tools.ts b/src/generated/forge-mcp/o11y/queries/tools.ts
index 06ee66738..017ad5224 100644
--- a/src/generated/forge-mcp/o11y/queries/tools.ts
+++ b/src/generated/forge-mcp/o11y/queries/tools.ts
@@ -1,15 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  workers_observability_filter_leaf_output,
-  workers_observability_filter_node_output,
-  workers_observability_query_output,
+  workers$$observability_filter_leaf,
+  workers$$observability_filter_node,
+  workers$$observability_query,
 } from "../outputs.js";
 import {
-  workers_observability_filter_leaf,
-  workers_observability_filter_node,
+  workers$$observability_filter_leaf as workers$$observability_filter_leaf$,
+  workers$$observability_filter_node as workers$$observability_filter_node$,
 } from "../schemas.js";
 
 /**
@@ -19,14 +19,10 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_queries_create",
     title: "Save query",
-    description: "Persist query for later use.",
+    description: "Persist query for later use.\n\nPOST /accounts/{account_id}/workers/observability/queries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Specify the new contents of the query.",
           "properties": {
@@ -296,15 +292,29 @@ export const tools: readonly Tool[] = [
             "parameters"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf,
-        "workers-observability_filter_node": workers_observability_filter_node,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf$,
+        "workers-observability_filter_node": workers$$observability_filter_node$,
       },
     },
     outputSchema: {
@@ -358,9 +368,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     annotations: {
@@ -577,9 +587,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     request: (args) => ({
@@ -590,22 +600,32 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_queries_delete",
     title: "Delete query",
-    description: "Delete a saved query.",
+    description: "Delete a saved query.\n\nDELETE /accounts/{account_id}/workers/observability/queries/{queryId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "query_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "queryId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queryId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -658,9 +678,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     annotations: {
@@ -877,26 +897,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/queries/${pathParam(args, "query_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/queries/${pathParam(args, "queryId")}`,
     }),
   },
   {
     name: "o11y_queries_edit",
     title: "Update query",
-    description: "Update saved query.",
+    description: "Update saved query.\n\nPATCH /accounts/{account_id}/workers/observability/queries/{queryId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Specify the new contents of the query.",
           "properties": {
@@ -1167,18 +1183,32 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "query_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "queryId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queryId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf,
-        "workers-observability_filter_node": workers_observability_filter_node,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf$,
+        "workers-observability_filter_node": workers$$observability_filter_node$,
       },
     },
     outputSchema: {
@@ -1232,9 +1262,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     annotations: {
@@ -1451,35 +1481,45 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/queries/${pathParam(args, "query_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/queries/${pathParam(args, "queryId")}`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
     name: "o11y_queries_get",
     title: "Get query",
-    description: "Retrieve a saved query.",
+    description: "Retrieve a saved query.\n\nGET /accounts/{account_id}/workers/observability/queries/{queryId}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "query_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "queryId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queryId"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "query_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1532,9 +1572,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     annotations: {
@@ -1751,54 +1791,70 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/queries/${pathParam(args, "query_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/observability/queries/${pathParam(args, "queryId")}`,
     }),
   },
   {
     name: "o11y_queries_list",
     title: "List queries",
-    description: "List saved queries.",
+    description: "List saved queries.\n\nGET /accounts/{account_id}/workers/observability/queries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "order": {
-          "default": "desc",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order_by": {
-          "default": "updated",
-          "enum": [
-            "created",
-            "updated"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "order": {
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "orderBy": {
+              "default": "updated",
+              "enum": [
+                "created",
+                "updated"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "number"
+            },
+            "perPage": {
+              "default": 20,
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1854,9 +1910,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     annotations: {
@@ -2076,18 +2132,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_query": workers_observability_query_output,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_query": workers$$observability_query,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/observability/queries`,
       query: [
-        ["page", args["page"], true],
-        ["perPage", args["per_page"], true],
-        ["order", args["order"], true],
-        ["orderBy", args["order_by"], true],
+        ["page", param(args, "query", "page"), true],
+        ["perPage", param(args, "query", "perPage"), true],
+        ["order", param(args, "query", "order"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/o11y/schemas.ts b/src/generated/forge-mcp/o11y/schemas.ts
index 3e9ef7b07..b74d954d2 100644
--- a/src/generated/forge-mcp/o11y/schemas.ts
+++ b/src/generated/forge-mcp/o11y/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `workers-observability_filter_leaf`.
  */
-export const workers_observability_filter_leaf: JsonSchema = {
+export const workers$$observability_filter_leaf: JsonSchema = {
   "description": "A filter condition applied to query results. Use the keys and values endpoints to discover available fields and their values before constructing filters.",
   "properties": {
     "key": {
@@ -91,7 +91,7 @@ export const workers_observability_filter_leaf: JsonSchema = {
 /**
  * The schema of `workers-observability_filter_node`.
  */
-export const workers_observability_filter_node: JsonSchema = {
+export const workers$$observability_filter_node: JsonSchema = {
   "anyOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/o11y/sharedQueries/tools.ts b/src/generated/forge-mcp/o11y/sharedQueries/tools.ts
index 9f85a5156..8dd935ad3 100644
--- a/src/generated/forge-mcp/o11y/sharedQueries/tools.ts
+++ b/src/generated/forge-mcp/o11y/sharedQueries/tools.ts
@@ -1,37 +1,33 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  workers_observability_distribution_result_output,
-  workers_observability_filter_leaf_output,
-  workers_observability_filter_node_output,
-  workers_observability_performance_information_output,
-  workers_observability_query_output,
-  workers_observability_query_results_output,
-  workers_observability_query_run_output,
-  workers_observability_telemetry_event_output,
+  workers$$observability_distribution_result,
+  workers$$observability_filter_leaf,
+  workers$$observability_filter_node,
+  workers$$observability_performance_information,
+  workers$$observability_query,
+  workers$$observability_query_results,
+  workers$$observability_query_run,
+  workers$$observability_telemetry_event,
 } from "../outputs.js";
 import {
-  workers_observability_filter_leaf,
-  workers_observability_filter_node,
+  workers$$observability_filter_leaf as workers$$observability_filter_leaf$,
+  workers$$observability_filter_node as workers$$observability_filter_node$,
 } from "../schemas.js";
 
 /**
- * The tools of `o11y.shared_queries`.
+ * The tools of `o11y.sharedQueries`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "o11y_shared_queries_create",
+    name: "o11y_sharedQueries_create",
     title: "Create a sharable link to a query result",
-    description: "Shared queries store the results of a previously run query, allowing you to share the results with others.",
+    description: "Shared queries store the results of a previously run query, allowing you to share the results with others.\n\nPOST /accounts/{account_id}/workers/observability/shared/query",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Create a sharable link to a query result.",
           "properties": {
@@ -441,15 +437,29 @@ export const tools: readonly Tool[] = [
             "timeframe"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf,
-        "workers-observability_filter_node": workers_observability_filter_node,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf$,
+        "workers-observability_filter_node": workers$$observability_filter_node$,
       },
     },
     outputSchema: {
@@ -789,34 +799,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "o11y_shared_queries_get",
+    name: "o11y_sharedQueries_get",
     title: "View a query that has been shared",
-    description: "Shared queries store the results of a previously run query, allowing you to share the results with others.",
+    description: "Shared queries store the results of a previously run query, allowing you to share the results with others.\n\nGET /accounts/{account_id}/workers/observability/shared/query/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Specify the ID of the shared query.",
-          "type": "string"
-        },
-        "view": {
-          "description": "Select the view of the query result to return, defaults to events.",
-          "enum": [
-            "events",
-            "invocations",
-            "calculations"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Specify the ID of the shared query.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "view": {
+              "description": "Select the view of the query result to return, defaults to events.",
+              "enum": [
+                "events",
+                "invocations",
+                "calculations"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -869,14 +895,14 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_distribution_result": workers_observability_distribution_result_output,
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_performance_information": workers_observability_performance_information_output,
-        "workers-observability_query": workers_observability_query_output,
-        "workers-observability_query_results": workers_observability_query_results_output,
-        "workers-observability_query_run": workers_observability_query_run_output,
-        "workers-observability_telemetry_event": workers_observability_telemetry_event_output,
+        "workers-observability_distribution_result": workers$$observability_distribution_result,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_performance_information": workers$$observability_performance_information,
+        "workers-observability_query": workers$$observability_query,
+        "workers-observability_query_results": workers$$observability_query_results,
+        "workers-observability_query_run": workers$$observability_query_run,
+        "workers-observability_telemetry_event": workers$$observability_telemetry_event,
       },
     },
     annotations: {
@@ -1143,20 +1169,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_distribution_result": workers_observability_distribution_result_output,
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_performance_information": workers_observability_performance_information_output,
-        "workers-observability_query": workers_observability_query_output,
-        "workers-observability_query_results": workers_observability_query_results_output,
-        "workers-observability_query_run": workers_observability_query_run_output,
-        "workers-observability_telemetry_event": workers_observability_telemetry_event_output,
+        "workers-observability_distribution_result": workers$$observability_distribution_result,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_performance_information": workers$$observability_performance_information,
+        "workers-observability_query": workers$$observability_query,
+        "workers-observability_query_results": workers$$observability_query_results,
+        "workers-observability_query_run": workers$$observability_query_run,
+        "workers-observability_telemetry_event": workers$$observability_telemetry_event,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/observability/shared/query/${pathParam(args, "id")}`,
       query: [
-        ["view", args["view"], true],
+        ["view", param(args, "query", "view"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/o11y/telemetry/tools.ts b/src/generated/forge-mcp/o11y/telemetry/tools.ts
index 9b793a7d4..8eae7b65c 100644
--- a/src/generated/forge-mcp/o11y/telemetry/tools.ts
+++ b/src/generated/forge-mcp/o11y/telemetry/tools.ts
@@ -3,18 +3,18 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  workers_observability_distribution_result_output,
-  workers_observability_filter_leaf_output,
-  workers_observability_filter_node_output,
-  workers_observability_performance_information_output,
-  workers_observability_query_output,
-  workers_observability_query_results_output,
-  workers_observability_query_run_output,
-  workers_observability_telemetry_event_output,
+  workers$$observability_distribution_result,
+  workers$$observability_filter_leaf,
+  workers$$observability_filter_node,
+  workers$$observability_performance_information,
+  workers$$observability_query,
+  workers$$observability_query_results,
+  workers$$observability_query_run,
+  workers$$observability_telemetry_event,
 } from "../outputs.js";
 import {
-  workers_observability_filter_leaf,
-  workers_observability_filter_node,
+  workers$$observability_filter_leaf as workers$$observability_filter_leaf$,
+  workers$$observability_filter_node as workers$$observability_filter_node$,
 } from "../schemas.js";
 
 /**
@@ -24,14 +24,10 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_telemetry_heartbeat",
     title: "Live tail heartbeat",
-    description: "Notify live tail that user is still eligible to receive live events.",
+    description: "Notify live tail that user is still eligible to receive live events.\n\nPOST /accounts/{account_id}/workers/observability/telemetry/live-tail/heartbeat",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Keep your live tail connection alive.",
           "properties": {
@@ -40,12 +36,26 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -270,14 +280,10 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_telemetry_keys",
     title: "List keys",
-    description: "List all the keys in your telemetry events.",
+    description: "List all the keys in your telemetry events.\n\nPOST /accounts/{account_id}/workers/observability/telemetry/keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Find keys in your telemetry events matching a specific filter or needle.",
           "properties": {
@@ -431,15 +437,29 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf,
-        "workers-observability_filter_node": workers_observability_filter_node,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf$,
+        "workers-observability_filter_node": workers$$observability_filter_node$,
       },
     },
     outputSchema: {
@@ -911,16 +931,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "o11y_telemetry_live_tail",
+    name: "o11y_telemetry_liveTail",
     title: "Prepare live tail",
-    description: "Prepare websocket server for live tail.",
+    description: "Prepare websocket server for live tail.\n\nPOST /accounts/{account_id}/workers/observability/telemetry/live-tail",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Create websocket server for live tail.",
           "properties": {
@@ -994,15 +1010,29 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf,
-        "workers-observability_filter_node": workers_observability_filter_node,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf$,
+        "workers-observability_filter_node": workers$$observability_filter_node$,
       },
     },
     outputSchema: {
@@ -1294,14 +1324,10 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_telemetry_query",
     title: "Run a query",
-    description: "Run a temporary or saved query.",
+    description: "Run a temporary or saved query.\n\nPOST /accounts/{account_id}/workers/observability/telemetry/query",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Query your observability events, requests, and traces to build visualizations and identify insights.",
           "properties": {
@@ -1711,15 +1737,29 @@ export const tools: readonly Tool[] = [
             "timeframe"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf,
-        "workers-observability_filter_node": workers_observability_filter_node,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf$,
+        "workers-observability_filter_node": workers$$observability_filter_node$,
       },
     },
     outputSchema: {
@@ -1773,14 +1813,14 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_distribution_result": workers_observability_distribution_result_output,
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_performance_information": workers_observability_performance_information_output,
-        "workers-observability_query": workers_observability_query_output,
-        "workers-observability_query_results": workers_observability_query_results_output,
-        "workers-observability_query_run": workers_observability_query_run_output,
-        "workers-observability_telemetry_event": workers_observability_telemetry_event_output,
+        "workers-observability_distribution_result": workers$$observability_distribution_result,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_performance_information": workers$$observability_performance_information,
+        "workers-observability_query": workers$$observability_query,
+        "workers-observability_query_results": workers$$observability_query_results,
+        "workers-observability_query_run": workers$$observability_query_run,
+        "workers-observability_telemetry_event": workers$$observability_telemetry_event,
       },
     },
     annotations: {
@@ -2147,14 +2187,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_distribution_result": workers_observability_distribution_result_output,
-        "workers-observability_filter_leaf": workers_observability_filter_leaf_output,
-        "workers-observability_filter_node": workers_observability_filter_node_output,
-        "workers-observability_performance_information": workers_observability_performance_information_output,
-        "workers-observability_query": workers_observability_query_output,
-        "workers-observability_query_results": workers_observability_query_results_output,
-        "workers-observability_query_run": workers_observability_query_run_output,
-        "workers-observability_telemetry_event": workers_observability_telemetry_event_output,
+        "workers-observability_distribution_result": workers$$observability_distribution_result,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf,
+        "workers-observability_filter_node": workers$$observability_filter_node,
+        "workers-observability_performance_information": workers$$observability_performance_information,
+        "workers-observability_query": workers$$observability_query,
+        "workers-observability_query_results": workers$$observability_query_results,
+        "workers-observability_query_run": workers$$observability_query_run,
+        "workers-observability_telemetry_event": workers$$observability_telemetry_event,
       },
     },
     request: (args) => ({
@@ -2165,14 +2205,10 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_telemetry_values",
     title: "List values",
-    description: "List unique values found in your events.",
+    description: "List unique values found in your events.\n\nPOST /accounts/{account_id}/workers/observability/telemetry/values",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
         "body": {
           "description": "Retrieve values from your telemetry events.",
           "properties": {
@@ -2313,15 +2349,29 @@ export const tools: readonly Tool[] = [
             "type"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers-observability_filter_leaf": workers_observability_filter_leaf,
-        "workers-observability_filter_node": workers_observability_filter_node,
+        "workers-observability_filter_leaf": workers$$observability_filter_leaf$,
+        "workers-observability_filter_node": workers$$observability_filter_node$,
       },
     },
     outputSchema: {
diff --git a/src/generated/forge-mcp/o11y/tools.ts b/src/generated/forge-mcp/o11y/tools.ts
index c7d0c4a35..1d70f19d6 100644
--- a/src/generated/forge-mcp/o11y/tools.ts
+++ b/src/generated/forge-mcp/o11y/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 
 /**
  * The tools of `o11y`.
@@ -10,32 +10,51 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_usage",
     title: "Get event count",
-    description: "Event counts and sizes broken down by dataset and service, bucketed by day, for up to 90 days. The top-level events field is the sum of all breakdown counts.",
+    description: "Event counts and sizes broken down by dataset and service, bucketed by day, for up to 90 days. The top-level events field is the sum of all breakdown counts.\n\nGET /accounts/{account_id}/workers/observability/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
-        },
-        "from": {
-          "description": "Unix timestamp in milliseconds for the start of the range.",
-          "type": "string"
-        },
-        "to": {
-          "description": "Unix timestamp in milliseconds for the end of the range.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "tz": {
-          "description": "IANA timezone used to align daily bins to local midnight (e.g. 'America/Chicago'). Defaults to UTC.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "from": {
+              "description": "Unix timestamp in milliseconds for the start of the range.",
+              "type": "string"
+            },
+            "to": {
+              "description": "Unix timestamp in milliseconds for the end of the range.",
+              "type": "string"
+            },
+            "tz": {
+              "description": "IANA timezone used to align daily bins to local midnight (e.g. 'America/Chicago'). Defaults to UTC.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "from",
+            "to"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -533,9 +552,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/observability/usage`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["tz", args["tz"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["tz", param(args, "query", "tz"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/o11y/tracing/rules/tools.ts b/src/generated/forge-mcp/o11y/tracing/rules/tools.ts
index 783e46230..5ff5dcdb2 100644
--- a/src/generated/forge-mcp/o11y/tracing/rules/tools.ts
+++ b/src/generated/forge-mcp/o11y/tracing/rules/tools.ts
@@ -10,18 +10,28 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_tracing_rules_delete",
     title: "Delete zone trace rules",
-    description: "Delete every sampling override from a zone's managed Cloudflare Traces ruleset.",
+    description: "Delete every sampling override from a zone's managed Cloudflare Traces ruleset.\n\nDELETE /zones/{zone_id}/observability/tracing/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "Specify the zone ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specify the zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -439,18 +449,28 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_tracing_rules_get",
     title: "View zone trace rules",
-    description: "Retrieve the ordered sampling overrides for a zone's managed Cloudflare Traces ruleset.",
+    description: "Retrieve the ordered sampling overrides for a zone's managed Cloudflare Traces ruleset.\n\nGET /zones/{zone_id}/observability/tracing/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "Specify the zone ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specify the zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -868,7 +888,7 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_tracing_rules_update",
     title: "Replace zone trace rules",
-    description: "Replace all sampling overrides in a zone's managed Cloudflare Traces ruleset. Rules are evaluated in the supplied order.",
+    description: "Replace all sampling overrides in a zone's managed Cloudflare Traces ruleset. Rules are evaluated in the supplied order.\n\nPUT /zones/{zone_id}/observability/tracing/rules",
     inputSchema: {
       type: "object",
       properties: {
@@ -926,15 +946,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "description": "Specify the zone ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specify the zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/o11y/tracing/settings/tools.ts b/src/generated/forge-mcp/o11y/tracing/settings/tools.ts
index 8690c77c1..3e9a7f403 100644
--- a/src/generated/forge-mcp/o11y/tracing/settings/tools.ts
+++ b/src/generated/forge-mcp/o11y/tracing/settings/tools.ts
@@ -10,18 +10,28 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_tracing_settings_delete",
     title: "Reset zone tracing settings",
-    description: "Reset the zone-level Cloudflare Traces settings to their defaults while preserving the sampling rules.",
+    description: "Reset the zone-level Cloudflare Traces settings to their defaults while preserving the sampling rules.\n\nDELETE /zones/{zone_id}/observability/tracing/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "Specify the zone ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specify the zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -419,18 +429,28 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_tracing_settings_get",
     title: "View zone tracing settings",
-    description: "Retrieve the zone-level Cloudflare Traces settings.",
+    description: "Retrieve the zone-level Cloudflare Traces settings.\n\nGET /zones/{zone_id}/observability/tracing/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "Specify the zone ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specify the zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -828,7 +848,7 @@ export const tools: readonly Tool[] = [
   {
     name: "o11y_tracing_settings_update",
     title: "Update zone tracing settings",
-    description: "Update the zone-level Cloudflare Traces settings.",
+    description: "Update the zone-level Cloudflare Traces settings.\n\nPATCH /zones/{zone_id}/observability/tracing/settings",
     inputSchema: {
       type: "object",
       properties: {
@@ -871,15 +891,25 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "zone_id": {
-          "description": "Specify the zone ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specify the zone ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/observability/usageLimit/outputs.ts b/src/generated/forge-mcp/observability/usageLimit/outputs.ts
index c363399a6..c41441676 100644
--- a/src/generated/forge-mcp/observability/usageLimit/outputs.ts
+++ b/src/generated/forge-mcp/observability/usageLimit/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers-observability_usage_limit` in responses.
  */
-export const workers_observability_usage_limit_output: JsonSchema = {
+export const workers$$observability_usage_limit: JsonSchema = {
   "properties": {
     "limit": {
       "properties": {
diff --git a/src/generated/forge-mcp/observability/usageLimit/tools.ts b/src/generated/forge-mcp/observability/usageLimit/tools.ts
index c16c88583..45288f33e 100644
--- a/src/generated/forge-mcp/observability/usageLimit/tools.ts
+++ b/src/generated/forge-mcp/observability/usageLimit/tools.ts
@@ -2,27 +2,37 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
-import { workers_observability_usage_limit_output } from "./outputs.js";
+import { workers$$observability_usage_limit } from "./outputs.js";
 
 /**
- * The tools of `observability.usage_limit`.
+ * The tools of `observability.usageLimit`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "observability_usage_limit_get",
+    name: "observability_usageLimit_get",
     title: "Get usage limit status",
-    description: "Whether Workers Observability is keeping fewer of the account's events, usually because it passed its daily limit, and what that limit is. Daily limits reset at 00:00 UTC; paid accounts are brought back in stages over the following hours.\n\nThis method is beta.",
+    description: "Whether Workers Observability is keeping fewer of the account's events, usually because it passed its daily limit, and what that limit is. Daily limits reset at 00:00 UTC; paid accounts are brought back in stages over the following hours.\n\nThis method is beta.\n\nGET /accounts/{account_id}/observability/usage/limit",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Your Cloudflare account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Your Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -75,7 +85,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "workers-observability_usage_limit": workers_observability_usage_limit_output,
+        "workers-observability_usage_limit": workers$$observability_usage_limit,
       },
     },
     annotations: {
@@ -342,7 +352,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers-observability_usage_limit": workers_observability_usage_limit_output,
+        "workers-observability_usage_limit": workers$$observability_usage_limit,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/organization/account/outputs.ts b/src/generated/forge-mcp/organization/account/outputs.ts
index 40eb8b8b4..6eac0b29e 100644
--- a/src/generated/forge-mcp/organization/account/outputs.ts
+++ b/src/generated/forge-mcp/organization/account/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `organizations-api_Account` in responses.
  */
-export const organizations_api_Account_output: JsonSchema = {
+export const organizations$$api_Account: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -126,7 +126,7 @@ export const organizations_api_Account_output: JsonSchema = {
 /**
  * The schema of `organizations-api_AccountListResultInfo` in responses.
  */
-export const organizations_api_AccountListResultInfo_output: JsonSchema = {
+export const organizations$$api_AccountListResultInfo: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/organizations-api_PageTokenResultInfo"
@@ -140,7 +140,7 @@ export const organizations_api_AccountListResultInfo_output: JsonSchema = {
 /**
  * The schema of `organizations-api_LegacyAccount` in responses.
  */
-export const organizations_api_LegacyAccount_output: JsonSchema = {
+export const organizations$$api_LegacyAccount: JsonSchema = {
   "properties": {
     "account_pubname": {
       "oneOf": [
@@ -211,7 +211,7 @@ export const organizations_api_LegacyAccount_output: JsonSchema = {
 /**
  * The schema of `organizations-api_LegacyPaginationResultInfo` in responses.
  */
-export const organizations_api_LegacyPaginationResultInfo_output: JsonSchema = {
+export const organizations$$api_LegacyPaginationResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/organization/account/tools.ts b/src/generated/forge-mcp/organization/account/tools.ts
index 20aa5a736..ba35e1dce 100644
--- a/src/generated/forge-mcp/organization/account/tools.ts
+++ b/src/generated/forge-mcp/organization/account/tools.ts
@@ -1,18 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../../outputs.js";
-import { organizations_api_OrganizationID } from "../../schemas.js";
-import { organizations_api_PageTokenResultInfo_output } from "../outputs.js";
+import { organizations$$api_PageTokenResultInfo } from "../outputs.js";
 import {
-  organizations_api_AccountListResultInfo_output,
-  organizations_api_Account_output,
-  organizations_api_LegacyAccount_output,
-  organizations_api_LegacyPaginationResultInfo_output,
+  organizations$$api_Account,
+  organizations$$api_AccountListResultInfo,
+  organizations$$api_LegacyAccount,
+  organizations$$api_LegacyPaginationResultInfo,
 } from "./outputs.js";
 
 /**
@@ -22,109 +21,128 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_account_list",
     title: "List organization accounts",
-    description: "Retrieve the accounts immediately attached to a specific organization. Accounts\nattached to sub-organizations are not included. Use `page_token` and `page_size` for cursor\npagination, or provide `page` and `per_page` together for legacy offset pagination. Cursor\npagination takes precedence when requested. The default response uses Account fields;\n`Accept: application/json; legacy=true` requests the LegacyAccount representation.",
+    description: "Retrieve the accounts immediately attached to a specific organization. Accounts\nattached to sub-organizations are not included. Use `page_token` and `page_size` for cursor\npagination, or provide `page` and `per_page` together for legacy offset pagination. Cursor\npagination takes precedence when requested. The default response uses Account fields;\n`Accept: application/json; legacy=true` requests the LegacyAccount representation.\n\nGET /organizations/{organization_id}/accounts",
     inputSchema: {
       type: "object",
       properties: {
-        "accept": {
-          "description": "Request `application/json; legacy=true` for the LegacyAccount representation.",
-          "type": "string"
-        },
-        "account_pubname": {
-          "deprecated": true,
-          "description": "(case-sensitive) Filter the list of accounts to where the account_pubname is equal to\na particular string.",
-          "type": "string"
-        },
-        "account_pubname_contains": {
-          "deprecated": true,
-          "description": "(case-insensitive) Filter the list of accounts to where the account_pubname contains\na particular string.",
-          "type": "string"
-        },
-        "account_pubname_ends_with": {
-          "deprecated": true,
-          "description": "(case-insensitive) Filter the list of accounts to where the account_pubname ends with\na particular string.",
-          "type": "string"
-        },
-        "account_pubname_starts_with": {
-          "deprecated": true,
-          "description": "(case-insensitive) Filter the list of accounts to where the account_pubname starts with\na particular string.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Sort direction for the order_by field. Valid values: `asc`, `desc`.\nDefaults to `asc` when order_by is specified.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "include_tags": {
-          "description": "Include Account tags from the resource tag mirror. Omit this parameter to preserve the existing Account response shape.",
-          "type": "boolean"
-        },
-        "include_total": {
-          "default": true,
-          "description": "Whether to calculate and return the exact result_info.total_size for cursor\npagination. Defaults to true. When false, total_size is omitted. page_size and\ninclude_total may change between pages; next_page_token remains the authoritative\ncontinuation signal.\nLegacy page/per_page requests always calculate total_count.",
-          "type": "boolean"
-        },
-        "name": {
-          "description": "(case-sensitive) Filter the list of accounts to where the name is equal to a\nparticular string.",
-          "type": "string"
-        },
-        "name_contains": {
-          "description": "(case-insensitive) Filter the list of accounts to where the name contains a particular\nstring.",
-          "type": "string"
-        },
-        "name_ends_with": {
-          "description": "(case-insensitive) Filter the list of accounts to where the name ends with a particular\nstring.",
-          "type": "string"
-        },
-        "name_starts_with": {
-          "description": "(case-insensitive) Filter the list of accounts to where the name starts with a\nparticular string.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Accept": {
+              "description": "Request `application/json; legacy=true` for the LegacyAccount representation.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "order_by": {
-          "description": "Field to order results by. Currently supported values: `account_name`.",
-          "enum": [
-            "account_name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "The ID of the organization to retrieve a list of accounts for.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
           ],
-          "type": "string"
-        },
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID",
-          "description": "The ID of the organization to retrieve a list of accounts for."
-        },
-        "page": {
-          "description": "Legacy offset page number. Must be provided with `per_page`. Values below 1 are treated as\n1. Cursor pagination takes precedence when requested.",
-          "type": "integer"
-        },
-        "page_size": {
-          "description": "The amount of items to return. Defaults to 10.",
-          "type": "integer"
-        },
-        "page_token": {
-          "description": "An opaque token returned from the last list response that when\nprovided will retrieve the next page.\n\nParameters used to filter the retrieved list must remain in subsequent\nrequests with a page token.",
-          "type": "string"
-        },
-        "per_page": {
-          "description": "Legacy offset page size. Must be provided with `page`. Values are clamped to the range\n1-100. Cursor pagination takes precedence when requested.",
-          "type": "integer"
+          "type": "object"
         },
-        "status": {
-          "description": "Filter accounts by lifecycle status. Defaults to `active`.",
-          "enum": [
-            "active",
-            "deleted"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "account_pubname": {
+              "deprecated": true,
+              "description": "(case-sensitive) Filter the list of accounts to where the account_pubname is equal to\na particular string.",
+              "type": "string"
+            },
+            "account_pubname.contains": {
+              "deprecated": true,
+              "description": "(case-insensitive) Filter the list of accounts to where the account_pubname contains\na particular string.",
+              "type": "string"
+            },
+            "account_pubname.endsWith": {
+              "deprecated": true,
+              "description": "(case-insensitive) Filter the list of accounts to where the account_pubname ends with\na particular string.",
+              "type": "string"
+            },
+            "account_pubname.startsWith": {
+              "deprecated": true,
+              "description": "(case-insensitive) Filter the list of accounts to where the account_pubname starts with\na particular string.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Sort direction for the order_by field. Valid values: `asc`, `desc`.\nDefaults to `asc` when order_by is specified.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "include_tags": {
+              "description": "Include Account tags from the resource tag mirror. Omit this parameter to preserve the existing Account response shape.",
+              "type": "boolean"
+            },
+            "include_total": {
+              "default": true,
+              "description": "Whether to calculate and return the exact result_info.total_size for cursor\npagination. Defaults to true. When false, total_size is omitted. page_size and\ninclude_total may change between pages; next_page_token remains the authoritative\ncontinuation signal.\nLegacy page/per_page requests always calculate total_count.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "(case-sensitive) Filter the list of accounts to where the name is equal to a\nparticular string.",
+              "type": "string"
+            },
+            "name.contains": {
+              "description": "(case-insensitive) Filter the list of accounts to where the name contains a particular\nstring.",
+              "type": "string"
+            },
+            "name.endsWith": {
+              "description": "(case-insensitive) Filter the list of accounts to where the name ends with a particular\nstring.",
+              "type": "string"
+            },
+            "name.startsWith": {
+              "description": "(case-insensitive) Filter the list of accounts to where the name starts with a\nparticular string.",
+              "type": "string"
+            },
+            "order_by": {
+              "description": "Field to order results by. Currently supported values: `account_name`.",
+              "enum": [
+                "account_name"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Legacy offset page number. Must be provided with `per_page`. Values below 1 are treated as\n1. Cursor pagination takes precedence when requested.",
+              "type": "integer"
+            },
+            "page_size": {
+              "description": "The amount of items to return. Defaults to 10.",
+              "type": "integer"
+            },
+            "page_token": {
+              "description": "An opaque token returned from the last list response that when\nprovided will retrieve the next page.\n\nParameters used to filter the retrieved list must remain in subsequent\nrequests with a page token.",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "Legacy offset page size. Must be provided with `page`. Values are clamped to the range\n1-100. Cursor pagination takes precedence when requested.",
+              "type": "integer"
+            },
+            "status": {
+              "description": "Filter accounts by lifecycle status. Defaults to `active`.",
+              "enum": [
+                "active",
+                "deleted"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "organization_id"
+        "path"
       ],
-      $defs: {
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -173,12 +191,12 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Account": organizations_api_Account_output,
-        "organizations-api_AccountListResultInfo": organizations_api_AccountListResultInfo_output,
-        "organizations-api_LegacyAccount": organizations_api_LegacyAccount_output,
-        "organizations-api_LegacyPaginationResultInfo": organizations_api_LegacyPaginationResultInfo_output,
-        "organizations-api_PageTokenResultInfo": organizations_api_PageTokenResultInfo_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Account": organizations$$api_Account,
+        "organizations-api_AccountListResultInfo": organizations$$api_AccountListResultInfo,
+        "organizations-api_LegacyAccount": organizations$$api_LegacyAccount,
+        "organizations-api_LegacyPaginationResultInfo": organizations$$api_LegacyPaginationResultInfo,
+        "organizations-api_PageTokenResultInfo": organizations$$api_PageTokenResultInfo,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -247,38 +265,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Account": organizations_api_Account_output,
-        "organizations-api_AccountListResultInfo": organizations_api_AccountListResultInfo_output,
-        "organizations-api_LegacyAccount": organizations_api_LegacyAccount_output,
-        "organizations-api_LegacyPaginationResultInfo": organizations_api_LegacyPaginationResultInfo_output,
-        "organizations-api_PageTokenResultInfo": organizations_api_PageTokenResultInfo_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Account": organizations$$api_Account,
+        "organizations-api_AccountListResultInfo": organizations$$api_AccountListResultInfo,
+        "organizations-api_LegacyAccount": organizations$$api_LegacyAccount,
+        "organizations-api_LegacyPaginationResultInfo": organizations$$api_LegacyPaginationResultInfo,
+        "organizations-api_PageTokenResultInfo": organizations$$api_PageTokenResultInfo,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
       path: `/organizations/${pathParam(args, "organization_id")}/accounts`,
       query: [
-        ["account_pubname", args["account_pubname"], false],
-        ["account_pubname.startsWith", args["account_pubname_starts_with"], false],
-        ["account_pubname.endsWith", args["account_pubname_ends_with"], false],
-        ["account_pubname.contains", args["account_pubname_contains"], false],
-        ["name", args["name"], false],
-        ["name.startsWith", args["name_starts_with"], false],
-        ["name.endsWith", args["name_ends_with"], false],
-        ["name.contains", args["name_contains"], false],
-        ["status", args["status"], false],
-        ["order_by", args["order_by"], false],
-        ["direction", args["direction"], false],
-        ["include_tags", args["include_tags"], false],
-        ["include_total", args["include_total"], false],
-        ["page", args["page"], false],
-        ["per_page", args["per_page"], false],
-        ["page_token", args["page_token"], false],
-        ["page_size", args["page_size"], false],
+        ["account_pubname", param(args, "query", "account_pubname"), false],
+        ["account_pubname.startsWith", param(args, "query", "account_pubname.startsWith"), false],
+        ["account_pubname.endsWith", param(args, "query", "account_pubname.endsWith"), false],
+        ["account_pubname.contains", param(args, "query", "account_pubname.contains"), false],
+        ["name", param(args, "query", "name"), false],
+        ["name.startsWith", param(args, "query", "name.startsWith"), false],
+        ["name.endsWith", param(args, "query", "name.endsWith"), false],
+        ["name.contains", param(args, "query", "name.contains"), false],
+        ["status", param(args, "query", "status"), false],
+        ["order_by", param(args, "query", "order_by"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["include_tags", param(args, "query", "include_tags"), false],
+        ["include_total", param(args, "query", "include_total"), false],
+        ["page", param(args, "query", "page"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["page_token", param(args, "query", "page_token"), false],
+        ["page_size", param(args, "query", "page_size"), false],
       ],
       headers: [
-        ["Accept", args["accept"]],
+        ["Accept", param(args, "headers", "Accept")],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/organization/invite/outputs.ts b/src/generated/forge-mcp/organization/invite/outputs.ts
index 8f34066ae..462a5e497 100644
--- a/src/generated/forge-mcp/organization/invite/outputs.ts
+++ b/src/generated/forge-mcp/organization/invite/outputs.ts
@@ -6,14 +6,14 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `organizations-api_OrganizationInviteMember` in responses.
  */
-export const organizations_api_OrganizationInviteMember_output: JsonSchema = {
+export const organizations$$api_OrganizationInviteMember: JsonSchema = {
   "properties": {
     "create_time": {
       "format": "date-time",
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/organizations-api_MemberID"
+      "type": "string"
     },
     "meta": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/organization/invite/schemas.ts b/src/generated/forge-mcp/organization/invite/schemas.ts
index 47bea2dac..3afc6a470 100644
--- a/src/generated/forge-mcp/organization/invite/schemas.ts
+++ b/src/generated/forge-mcp/organization/invite/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `organizations-api_HandleOrganizationInviteRequest`.
  */
-export const organizations_api_HandleOrganizationInviteRequest: JsonSchema = {
+export const organizations$$api_HandleOrganizationInviteRequest: JsonSchema = {
   "properties": {
     "status": {
       "enum": [
diff --git a/src/generated/forge-mcp/organization/invite/tools.ts b/src/generated/forge-mcp/organization/invite/tools.ts
index a5bc96416..e0c40c3c8 100644
--- a/src/generated/forge-mcp/organization/invite/tools.ts
+++ b/src/generated/forge-mcp/organization/invite/tools.ts
@@ -3,16 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../../outputs.js";
-import { organizations_api_OrganizationID } from "../../schemas.js";
-import {
-  organizations_api_MemberID_output,
-  organizations_api_MemberSubjectUser_output,
-} from "../outputs.js";
-import { organizations_api_OrganizationInviteMember_output } from "./outputs.js";
-import { organizations_api_HandleOrganizationInviteRequest } from "./schemas.js";
+import { organizations$$api_MemberSubjectUser } from "../outputs.js";
+import { organizations$$api_OrganizationInviteMember } from "./outputs.js";
+import { organizations$$api_HandleOrganizationInviteRequest } from "./schemas.js";
 
 /**
  * The tools of `organization.invite`.
@@ -21,7 +17,7 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_invite_update",
     title: "Handle organization invite",
-    description: "Accept or reject an invitation to a specific organization.\n\nThe credential must belong to the invited user. No additional API token permission is\nrequired.",
+    description: "Accept or reject an invitation to a specific organization.\n\nThe credential must belong to the invited user. No additional API token permission is\nrequired.\n\nPUT /organizations/{organization_id}/invites/{member_code}",
     inputSchema: {
       type: "object",
       properties: {
@@ -29,23 +25,32 @@ export const tools: readonly Tool[] = [
           "$ref": "#/$defs/organizations-api_HandleOrganizationInviteRequest",
           "description": "The invitation action. Use `accept` to join the organization or `reject` to decline the invitation."
         },
-        "member_code": {
-          "description": "The invitation code to accept or reject.",
-          "type": "string"
-        },
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID",
-          "description": "The ID of the organization associated with the invitation."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "member_code": {
+              "description": "The invitation code to accept or reject.",
+              "type": "string"
+            },
+            "organization_id": {
+              "description": "The ID of the organization associated with the invitation.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id",
+            "member_code"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
-        "member_code",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "organizations-api_HandleOrganizationInviteRequest": organizations_api_HandleOrganizationInviteRequest,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
+        "organizations-api_HandleOrganizationInviteRequest": organizations$$api_HandleOrganizationInviteRequest,
       },
     },
     outputSchema: {
@@ -81,10 +86,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_OrganizationInviteMember": organizations_api_OrganizationInviteMember_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_OrganizationInviteMember": organizations$$api_OrganizationInviteMember,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -139,11 +143,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_OrganizationInviteMember": organizations_api_OrganizationInviteMember_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_OrganizationInviteMember": organizations$$api_OrganizationInviteMember,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/organization/member/batch/schemas.ts b/src/generated/forge-mcp/organization/member/batch/schemas.ts
index 02c4892b6..9d3a37ee1 100644
--- a/src/generated/forge-mcp/organization/member/batch/schemas.ts
+++ b/src/generated/forge-mcp/organization/member/batch/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `organizations-api_BatchCreateMembersRequest`.
  */
-export const organizations_api_BatchCreateMembersRequest: JsonSchema = {
+export const organizations$$api_BatchCreateMembersRequest: JsonSchema = {
   "properties": {
     "members": {
       "description": "Omitted or null members are treated as an empty batch.",
diff --git a/src/generated/forge-mcp/organization/member/batch/tools.ts b/src/generated/forge-mcp/organization/member/batch/tools.ts
index 1691511e5..494c438ab 100644
--- a/src/generated/forge-mcp/organization/member/batch/tools.ts
+++ b/src/generated/forge-mcp/organization/member/batch/tools.ts
@@ -3,22 +3,18 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../../../outputs.js";
-import { organizations_api_OrganizationID } from "../../../schemas.js";
+import { organizations$$api_MemberSubjectUser } from "../../outputs.js";
 import {
-  organizations_api_MemberID_output,
-  organizations_api_MemberSubjectUser_output,
-} from "../../outputs.js";
-import {
-  organizations_api_MemberPolicyRole_output,
-  organizations_api_MemberPolicyScope_output,
-  organizations_api_MemberPolicy_output,
-  organizations_api_Member_output,
+  organizations$$api_Member,
+  organizations$$api_MemberPolicy,
+  organizations$$api_MemberPolicyRole,
+  organizations$$api_MemberPolicyScope,
 } from "../outputs.js";
-import { organizations_api_CreateSingleMember } from "../schemas.js";
-import { organizations_api_BatchCreateMembersRequest } from "./schemas.js";
+import { organizations$$api_CreateSingleMember } from "../schemas.js";
+import { organizations$$api_BatchCreateMembersRequest } from "./schemas.js";
 
 /**
  * The tools of `organization.member.batch`.
@@ -27,25 +23,35 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_member_batch_create",
     title: "Batch create organization members",
-    description: "Batch create multiple memberships that grant access to a specific Organization.",
+    description: "Batch create multiple memberships that grant access to a specific Organization.\n\nPOST /organizations/{organization_id}/members:batchCreate",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/organizations-api_BatchCreateMembersRequest"
         },
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "Organization ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "organizations-api_BatchCreateMembersRequest": organizations_api_BatchCreateMembersRequest,
-        "organizations-api_CreateSingleMember": organizations_api_CreateSingleMember,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
+        "organizations-api_BatchCreateMembersRequest": organizations$$api_BatchCreateMembersRequest,
+        "organizations-api_CreateSingleMember": organizations$$api_CreateSingleMember,
       },
     },
     outputSchema: {
@@ -84,13 +90,12 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Member": organizations_api_Member_output,
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberPolicy": organizations_api_MemberPolicy_output,
-        "organizations-api_MemberPolicyRole": organizations_api_MemberPolicyRole_output,
-        "organizations-api_MemberPolicyScope": organizations_api_MemberPolicyScope_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Member": organizations$$api_Member,
+        "organizations-api_MemberPolicy": organizations$$api_MemberPolicy,
+        "organizations-api_MemberPolicyRole": organizations$$api_MemberPolicyRole,
+        "organizations-api_MemberPolicyScope": organizations$$api_MemberPolicyScope,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -148,14 +153,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Member": organizations_api_Member_output,
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberPolicy": organizations_api_MemberPolicy_output,
-        "organizations-api_MemberPolicyRole": organizations_api_MemberPolicyRole_output,
-        "organizations-api_MemberPolicyScope": organizations_api_MemberPolicyScope_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Member": organizations$$api_Member,
+        "organizations-api_MemberPolicy": organizations$$api_MemberPolicy,
+        "organizations-api_MemberPolicyRole": organizations$$api_MemberPolicyRole,
+        "organizations-api_MemberPolicyScope": organizations$$api_MemberPolicyScope,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/organization/member/outputs.ts b/src/generated/forge-mcp/organization/member/outputs.ts
index 5e616fd94..b4a36bca9 100644
--- a/src/generated/forge-mcp/organization/member/outputs.ts
+++ b/src/generated/forge-mcp/organization/member/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `organizations-api_DeleteOrganizationMemberResult` in
  * responses.
  */
-export const organizations_api_DeleteOrganizationMemberResult_output: JsonSchema = {
+export const organizations$$api_DeleteOrganizationMemberResult: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -22,14 +22,14 @@ export const organizations_api_DeleteOrganizationMemberResult_output: JsonSchema
 /**
  * The schema of `organizations-api_Member` in responses.
  */
-export const organizations_api_Member_output: JsonSchema = {
+export const organizations$$api_Member: JsonSchema = {
   "properties": {
     "create_time": {
       "format": "date-time",
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/organizations-api_MemberID"
+      "type": "string"
     },
     "meta": {
       "additionalProperties": {
@@ -74,7 +74,7 @@ export const organizations_api_Member_output: JsonSchema = {
 /**
  * The schema of `organizations-api_MemberPolicy` in responses.
  */
-export const organizations_api_MemberPolicy_output: JsonSchema = {
+export const organizations$$api_MemberPolicy: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -106,7 +106,7 @@ export const organizations_api_MemberPolicy_output: JsonSchema = {
 /**
  * The schema of `organizations-api_MemberPolicyRole` in responses.
  */
-export const organizations_api_MemberPolicyRole_output: JsonSchema = {
+export const organizations$$api_MemberPolicyRole: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -121,7 +121,7 @@ export const organizations_api_MemberPolicyRole_output: JsonSchema = {
 /**
  * The schema of `organizations-api_MemberPolicyScope` in responses.
  */
-export const organizations_api_MemberPolicyScope_output: JsonSchema = {
+export const organizations$$api_MemberPolicyScope: JsonSchema = {
   "properties": {
     "key": {
       "type": "string"
diff --git a/src/generated/forge-mcp/organization/member/schemas.ts b/src/generated/forge-mcp/organization/member/schemas.ts
index a1b84dd90..f2d6c6559 100644
--- a/src/generated/forge-mcp/organization/member/schemas.ts
+++ b/src/generated/forge-mcp/organization/member/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `organizations-api_CreateMemberRequest`.
  */
-export const organizations_api_CreateMemberRequest: JsonSchema = {
+export const organizations$$api_CreateMemberRequest: JsonSchema = {
   "properties": {
     "member": {
       "$ref": "#/$defs/organizations-api_CreateSingleMember"
@@ -21,7 +21,7 @@ export const organizations_api_CreateMemberRequest: JsonSchema = {
 /**
  * The schema of `organizations-api_CreateSingleMember`.
  */
-export const organizations_api_CreateSingleMember: JsonSchema = {
+export const organizations$$api_CreateSingleMember: JsonSchema = {
   "properties": {
     "user": {
       "properties": {
diff --git a/src/generated/forge-mcp/organization/member/tools.ts b/src/generated/forge-mcp/organization/member/tools.ts
index f03cf8a8d..a805eb9d1 100644
--- a/src/generated/forge-mcp/organization/member/tools.ts
+++ b/src/generated/forge-mcp/organization/member/tools.ts
@@ -1,28 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../../outputs.js";
-import { organizations_api_OrganizationID } from "../../schemas.js";
 import {
-  organizations_api_MemberID_output,
-  organizations_api_MemberSubjectUser_output,
-  organizations_api_PageTokenResultInfo_output,
+  organizations$$api_MemberSubjectUser,
+  organizations$$api_PageTokenResultInfo,
 } from "../outputs.js";
-import { organizations_api_MemberID } from "../schemas.js";
 import {
-  organizations_api_DeleteOrganizationMemberResult_output,
-  organizations_api_MemberPolicyRole_output,
-  organizations_api_MemberPolicyScope_output,
-  organizations_api_MemberPolicy_output,
-  organizations_api_Member_output,
+  organizations$$api_DeleteOrganizationMemberResult,
+  organizations$$api_Member,
+  organizations$$api_MemberPolicy,
+  organizations$$api_MemberPolicyRole,
+  organizations$$api_MemberPolicyScope,
 } from "./outputs.js";
 import {
-  organizations_api_CreateMemberRequest,
-  organizations_api_CreateSingleMember,
+  organizations$$api_CreateMemberRequest,
+  organizations$$api_CreateSingleMember,
 } from "./schemas.js";
 
 /**
@@ -32,25 +29,35 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_member_create",
     title: "Create organization member",
-    description: "Create a membership that grants access to a specific Organization.",
+    description: "Create a membership that grants access to a specific Organization.\n\nPOST /organizations/{organization_id}/members",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/organizations-api_CreateMemberRequest"
         },
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "Organization ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "organizations-api_CreateMemberRequest": organizations_api_CreateMemberRequest,
-        "organizations-api_CreateSingleMember": organizations_api_CreateSingleMember,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
+        "organizations-api_CreateMemberRequest": organizations$$api_CreateMemberRequest,
+        "organizations-api_CreateSingleMember": organizations$$api_CreateSingleMember,
       },
     },
     outputSchema: {
@@ -86,13 +93,12 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Member": organizations_api_Member_output,
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberPolicy": organizations_api_MemberPolicy_output,
-        "organizations-api_MemberPolicyRole": organizations_api_MemberPolicyRole_output,
-        "organizations-api_MemberPolicyScope": organizations_api_MemberPolicyScope_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Member": organizations$$api_Member,
+        "organizations-api_MemberPolicy": organizations$$api_MemberPolicy,
+        "organizations-api_MemberPolicyRole": organizations$$api_MemberPolicyRole,
+        "organizations-api_MemberPolicyScope": organizations$$api_MemberPolicyScope,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -147,14 +153,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Member": organizations_api_Member_output,
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberPolicy": organizations_api_MemberPolicy_output,
-        "organizations-api_MemberPolicyRole": organizations_api_MemberPolicyRole_output,
-        "organizations-api_MemberPolicyScope": organizations_api_MemberPolicyScope_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Member": organizations$$api_Member,
+        "organizations-api_MemberPolicy": organizations$$api_MemberPolicy,
+        "organizations-api_MemberPolicyRole": organizations$$api_MemberPolicyRole,
+        "organizations-api_MemberPolicyScope": organizations$$api_MemberPolicyScope,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -165,26 +170,33 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_member_delete",
     title: "Delete organization member",
-    description: "Delete a membership to a particular Organization.\n\nConfirm with the user before calling this tool. Delete this organization membership? The member will lose access to this organization and its sub-organizations.",
+    description: "Delete a membership to a particular Organization.\n\nConfirm with the user before calling this tool. Delete this organization membership? The member will lose access to this organization and its sub-organizations.\n\nDELETE /organizations/{organization_id}/members/{member_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "member_id": {
-          "$ref": "#/$defs/organizations-api_MemberID",
-          "description": "Organization Member ID"
-        },
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "member_id": {
+              "description": "Organization Member ID",
+              "type": "string"
+            },
+            "organization_id": {
+              "description": "Organization ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id",
+            "member_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
-        "member_id"
+        "path"
       ],
-      $defs: {
-        "organizations-api_MemberID": organizations_api_MemberID,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -219,8 +231,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_DeleteOrganizationMemberResult": organizations_api_DeleteOrganizationMemberResult_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_DeleteOrganizationMemberResult": organizations$$api_DeleteOrganizationMemberResult,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -275,9 +287,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_DeleteOrganizationMemberResult": organizations_api_DeleteOrganizationMemberResult_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_DeleteOrganizationMemberResult": organizations$$api_DeleteOrganizationMemberResult,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -287,26 +299,33 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_member_get",
     title: "Get organization member",
-    description: "Retrieve a single membership from an Organization.",
+    description: "Retrieve a single membership from an Organization.\n\nGET /organizations/{organization_id}/members/{member_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "member_id": {
-          "$ref": "#/$defs/organizations-api_MemberID",
-          "description": "Organization Member ID"
-        },
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "member_id": {
+              "description": "Organization Member ID",
+              "type": "string"
+            },
+            "organization_id": {
+              "description": "Organization ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id",
+            "member_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
-        "member_id"
+        "path"
       ],
-      $defs: {
-        "organizations-api_MemberID": organizations_api_MemberID,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -341,13 +360,12 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Member": organizations_api_Member_output,
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberPolicy": organizations_api_MemberPolicy_output,
-        "organizations-api_MemberPolicyRole": organizations_api_MemberPolicyRole_output,
-        "organizations-api_MemberPolicyScope": organizations_api_MemberPolicyScope_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Member": organizations$$api_Member,
+        "organizations-api_MemberPolicy": organizations$$api_MemberPolicy,
+        "organizations-api_MemberPolicyRole": organizations$$api_MemberPolicyRole,
+        "organizations-api_MemberPolicyScope": organizations$$api_MemberPolicyScope,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -402,14 +420,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Member": organizations_api_Member_output,
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberPolicy": organizations_api_MemberPolicy_output,
-        "organizations-api_MemberPolicyRole": organizations_api_MemberPolicyRole_output,
-        "organizations-api_MemberPolicyScope": organizations_api_MemberPolicyScope_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Member": organizations$$api_Member,
+        "organizations-api_MemberPolicy": organizations$$api_MemberPolicy,
+        "organizations-api_MemberPolicyRole": organizations$$api_MemberPolicyRole,
+        "organizations-api_MemberPolicyScope": organizations$$api_MemberPolicyScope,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -419,57 +436,71 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_member_list",
     title: "List organization members",
-    description: "List memberships for an Organization.",
+    description: "List memberships for an Organization.\n\nGET /organizations/{organization_id}/members",
     inputSchema: {
       type: "object",
       properties: {
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID"
-        },
-        "page_size": {
-          "description": "The amount of items to return. Defaults to 10.",
-          "type": "integer"
-        },
-        "page_token": {
-          "description": "An opaque token returned from the last list response that when\nprovided will retrieve the next page.\n\nParameters used to filter the retrieved list must remain in subsequent\nrequests with a page token.",
-          "type": "string"
-        },
-        "status": {
-          "description": "Filter the list of memberships by membership status.",
-          "items": {
-            "enum": [
-              "active",
-              "pending",
-              "rejected",
-              "canceled"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "Organization ID",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "user_email": {
-          "description": "Filter the list of memberships for a specific email.",
-          "type": "string"
-        },
-        "user_email_contains": {
-          "description": "Filter the list of memberships for a specific email that contains a substring.",
-          "type": "string"
-        },
-        "user_email_ends_with": {
-          "description": "Filter the list of memberships for a specific email that ends with a substring.",
-          "type": "string"
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         },
-        "user_email_starts_with": {
-          "description": "Filter the list of memberships for a specific email that starts with a substring.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_size": {
+              "description": "The amount of items to return. Defaults to 10.",
+              "type": "integer"
+            },
+            "page_token": {
+              "description": "An opaque token returned from the last list response that when\nprovided will retrieve the next page.\n\nParameters used to filter the retrieved list must remain in subsequent\nrequests with a page token.",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter the list of memberships by membership status.",
+              "items": {
+                "enum": [
+                  "active",
+                  "pending",
+                  "rejected",
+                  "canceled"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "user.email": {
+              "description": "Filter the list of memberships for a specific email.",
+              "type": "string"
+            },
+            "user.email.contains": {
+              "description": "Filter the list of memberships for a specific email that contains a substring.",
+              "type": "string"
+            },
+            "user.email.endsWith": {
+              "description": "Filter the list of memberships for a specific email that ends with a substring.",
+              "type": "string"
+            },
+            "user.email.startsWith": {
+              "description": "Filter the list of memberships for a specific email that starts with a substring.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "organization_id"
+        "path"
       ],
-      $defs: {
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -511,14 +542,13 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Member": organizations_api_Member_output,
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberPolicy": organizations_api_MemberPolicy_output,
-        "organizations-api_MemberPolicyRole": organizations_api_MemberPolicyRole_output,
-        "organizations-api_MemberPolicyScope": organizations_api_MemberPolicyScope_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_PageTokenResultInfo": organizations_api_PageTokenResultInfo_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Member": organizations$$api_Member,
+        "organizations-api_MemberPolicy": organizations$$api_MemberPolicy,
+        "organizations-api_MemberPolicyRole": organizations$$api_MemberPolicyRole,
+        "organizations-api_MemberPolicyScope": organizations$$api_MemberPolicyScope,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_PageTokenResultInfo": organizations$$api_PageTokenResultInfo,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -580,27 +610,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Member": organizations_api_Member_output,
-        "organizations-api_MemberID": organizations_api_MemberID_output,
-        "organizations-api_MemberPolicy": organizations_api_MemberPolicy_output,
-        "organizations-api_MemberPolicyRole": organizations_api_MemberPolicyRole_output,
-        "organizations-api_MemberPolicyScope": organizations_api_MemberPolicyScope_output,
-        "organizations-api_MemberSubjectUser": organizations_api_MemberSubjectUser_output,
-        "organizations-api_PageTokenResultInfo": organizations_api_PageTokenResultInfo_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Member": organizations$$api_Member,
+        "organizations-api_MemberPolicy": organizations$$api_MemberPolicy,
+        "organizations-api_MemberPolicyRole": organizations$$api_MemberPolicyRole,
+        "organizations-api_MemberPolicyScope": organizations$$api_MemberPolicyScope,
+        "organizations-api_MemberSubjectUser": organizations$$api_MemberSubjectUser,
+        "organizations-api_PageTokenResultInfo": organizations$$api_PageTokenResultInfo,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
       path: `/organizations/${pathParam(args, "organization_id")}/members`,
       query: [
-        ["status", args["status"], true],
-        ["user.email", args["user_email"], false],
-        ["user.email.contains", args["user_email_contains"], false],
-        ["user.email.startsWith", args["user_email_starts_with"], false],
-        ["user.email.endsWith", args["user_email_ends_with"], false],
-        ["page_token", args["page_token"], false],
-        ["page_size", args["page_size"], false],
+        ["status", param(args, "query", "status"), true],
+        ["user.email", param(args, "query", "user.email"), false],
+        ["user.email.contains", param(args, "query", "user.email.contains"), false],
+        ["user.email.startsWith", param(args, "query", "user.email.startsWith"), false],
+        ["user.email.endsWith", param(args, "query", "user.email.endsWith"), false],
+        ["page_token", param(args, "query", "page_token"), false],
+        ["page_size", param(args, "query", "page_size"), false],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/organization/outputs.ts b/src/generated/forge-mcp/organization/outputs.ts
index b25efcd51..e74557f97 100644
--- a/src/generated/forge-mcp/organization/outputs.ts
+++ b/src/generated/forge-mcp/organization/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `organizations-api_DeleteOrganizationResult` in responses.
  */
-export const organizations_api_DeleteOrganizationResult_output: JsonSchema = {
+export const organizations$$api_DeleteOrganizationResult: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -18,17 +18,10 @@ export const organizations_api_DeleteOrganizationResult_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `organizations-api_MemberID` in responses.
- */
-export const organizations_api_MemberID_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `organizations-api_MemberSubjectUser` in responses.
  */
-export const organizations_api_MemberSubjectUser_output: JsonSchema = {
+export const organizations$$api_MemberSubjectUser: JsonSchema = {
   "properties": {
     "email": {
       "type": "string"
@@ -55,7 +48,7 @@ export const organizations_api_MemberSubjectUser_output: JsonSchema = {
 /**
  * The schema of `organizations-api_PageTokenResultInfo` in responses.
  */
-export const organizations_api_PageTokenResultInfo_output: JsonSchema = {
+export const organizations$$api_PageTokenResultInfo: JsonSchema = {
   "properties": {
     "next_page_token": {
       "type": "string"
diff --git a/src/generated/forge-mcp/organization/profile/outputs.ts b/src/generated/forge-mcp/organization/profile/outputs.ts
index d3dd890be..80f2b1275 100644
--- a/src/generated/forge-mcp/organization/profile/outputs.ts
+++ b/src/generated/forge-mcp/organization/profile/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `organizations-api_ProfileResponse` in responses.
  */
-export const organizations_api_ProfileResponse_output: JsonSchema = {
+export const organizations$$api_ProfileResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/organization/profile/tools.ts b/src/generated/forge-mcp/organization/profile/tools.ts
index 1d5ab3ece..0c778ea34 100644
--- a/src/generated/forge-mcp/organization/profile/tools.ts
+++ b/src/generated/forge-mcp/organization/profile/tools.ts
@@ -3,15 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  organizations_api_Profile_output,
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  organizations$$api_Profile,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../../outputs.js";
-import {
-  organizations_api_ModifyProfileRequest,
-  organizations_api_OrganizationID,
-} from "../../schemas.js";
-import { organizations_api_ProfileResponse_output } from "./outputs.js";
+import { organizations$$api_ModifyProfileRequest } from "../../schemas.js";
+import { organizations$$api_ProfileResponse } from "./outputs.js";
 
 /**
  * The tools of `organization.profile`.
@@ -20,28 +17,35 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_profile_get",
     title: "Get organization profile",
-    description: "Retrieves the business profile (name, email, phone, address, and external metadata)\nassociated with this organization's customer record. Profiles can be shared across\naccounts and organizations. Only available to members of the organization.",
+    description: "Retrieves the business profile (name, email, phone, address, and external metadata)\nassociated with this organization's customer record. Profiles can be shared across\naccounts and organizations. Only available to members of the organization.\n\nGET /organizations/{organization_id}/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID",
-          "description": "The ID of the organization to retrieve a profile for."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "The ID of the organization to retrieve a profile for.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id"
+        "path"
       ],
-      $defs: {
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/organizations-api_ProfileResponse",
       $defs: {
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_ProfileResponse": organizations_api_ProfileResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_ProfileResponse": organizations$$api_ProfileResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -66,10 +70,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_ProfileResponse": organizations_api_ProfileResponse_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_ProfileResponse": organizations$$api_ProfileResponse,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -79,24 +83,34 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_profile_update",
     title: "Modify organization profile.",
-    description: "Partially updates the business profile (name, email, phone, address, and external metadata)\nassociated with this organization's customer record, creating the profile if it does not\nexist. Changes apply to every account and organization sharing that profile. Omitted,\nempty, or null fields are left unchanged. Each profile field is limited to 1,000 UTF-8\nbytes. Only available to members of the organization.",
+    description: "Partially updates the business profile (name, email, phone, address, and external metadata)\nassociated with this organization's customer record, creating the profile if it does not\nexist. Changes apply to every account and organization sharing that profile. Omitted,\nempty, or null fields are left unchanged. Each profile field is limited to 1,000 UTF-8\nbytes. Only available to members of the organization.\n\nPUT /organizations/{organization_id}/profile",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/organizations-api_ModifyProfileRequest"
         },
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "Organization ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "organizations-api_ModifyProfileRequest": organizations_api_ModifyProfileRequest,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
+        "organizations-api_ModifyProfileRequest": organizations$$api_ModifyProfileRequest,
       },
     },
     annotations: {
@@ -119,8 +133,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/organization/schemas.ts b/src/generated/forge-mcp/organization/schemas.ts
index f5743564b..c4dabd73b 100644
--- a/src/generated/forge-mcp/organization/schemas.ts
+++ b/src/generated/forge-mcp/organization/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `organizations-api_CreateOrganizationProfileRequest`.
  */
-export const organizations_api_CreateOrganizationProfileRequest: JsonSchema = {
+export const organizations$$api_CreateOrganizationProfileRequest: JsonSchema = {
   "description": "Optional profile fields, each limited to 1,000 UTF-8 bytes. An empty profile is ignored.",
   "properties": {
     "business_address": {
@@ -31,7 +31,7 @@ export const organizations_api_CreateOrganizationProfileRequest: JsonSchema = {
 /**
  * The schema of `organizations-api_CreateOrganizationRequest`.
  */
-export const organizations_api_CreateOrganizationRequest: JsonSchema = {
+export const organizations$$api_CreateOrganizationRequest: JsonSchema = {
   "properties": {
     "name": {
       "description": "The Organization name, limited to 65 UTF-8 bytes.",
@@ -40,7 +40,8 @@ export const organizations_api_CreateOrganizationRequest: JsonSchema = {
     "parent": {
       "properties": {
         "id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID"
+          "description": "Organization ID",
+          "type": "string"
         }
       },
       "required": [
@@ -59,26 +60,18 @@ export const organizations_api_CreateOrganizationRequest: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `organizations-api_MemberID`.
- */
-export const organizations_api_MemberID: JsonSchema = {
-  "description": "Organization Member ID",
-  "type": "string"
-};
-
 /**
  * The schema of `organizations-api_ModifyOrganizationRequest`.
  */
-export const organizations_api_ModifyOrganizationRequest: JsonSchema = {
+export const organizations$$api_ModifyOrganizationRequest: JsonSchema = {
   "properties": {
     "name": {
       "description": "The Organization's display name, limited to 65 UTF-8 bytes. An omitted, empty, or unchanged value is a no-op.",
       "type": "string"
     },
     "parent_id": {
-      "$ref": "#/$defs/organizations-api_OrganizationID",
-      "description": "The current parent Organization ID. A different value is rejected; this endpoint cannot move an Organization."
+      "description": "The current parent Organization ID. A different value is rejected; this endpoint cannot move an Organization.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/organization/share/tools.ts b/src/generated/forge-mcp/organization/share/tools.ts
index 41a24f696..714e410a6 100644
--- a/src/generated/forge-mcp/organization/share/tools.ts
+++ b/src/generated/forge-mcp/organization/share/tools.ts
@@ -1,43 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_sharing_account_id_output,
-  resource_sharing_account_name_output,
-  resource_sharing_api_response_collection_info_output,
-  resource_sharing_api_response_collection_output,
-  resource_sharing_api_response_common_failure_output,
-  resource_sharing_api_response_common_output,
-  resource_sharing_created_output,
-  resource_sharing_modified_output,
-  resource_sharing_organization_id_output,
-  resource_sharing_resource_id_output,
-  resource_sharing_resource_meta_output,
-  resource_sharing_resource_resource_id_output,
-  resource_sharing_resource_status_output,
-  resource_sharing_resource_type_output,
-  resource_sharing_resource_version_output,
-  resource_sharing_result_info_output,
-  resource_sharing_share_id_output,
-  resource_sharing_share_kind_output,
-  resource_sharing_share_name_output,
-  resource_sharing_share_object_output,
-  resource_sharing_share_resource_object_output,
-  resource_sharing_share_response_collection_output,
-  resource_sharing_share_response_collection_result_output,
-  resource_sharing_share_status_output,
-  resource_sharing_share_target_type_output,
-  resource_sharing_v4error_output,
-  resource_sharing_v4errors_output,
+  resource$$sharing_api$$response$$collection,
+  resource$$sharing_api$$response$$collection$$info,
+  resource$$sharing_api$$response$$common,
+  resource$$sharing_api$$response$$common$$failure,
+  resource$$sharing_resource_meta,
+  resource$$sharing_result_info,
+  resource$$sharing_share_object,
+  resource$$sharing_share_resource_object,
+  resource$$sharing_share_response_collection,
+  resource$$sharing_share_response_collection_result,
+  resource$$sharing_v4error,
+  resource$$sharing_v4errors,
 } from "../../outputs.js";
-import {
-  resource_sharing_organization_id,
-  resource_sharing_resource_type,
-  resource_sharing_share_kind,
-  resource_sharing_share_status,
-  resource_sharing_share_target_type,
-} from "../../schemas.js";
 
 /**
  * The tools of `organization.share`.
@@ -46,102 +24,119 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_share_list",
     title: "List organization shares",
-    description: "Lists all organization shares.",
+    description: "Lists all organization shares.\n\nGET /organizations/{organization_id}/shares",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "default": "asc",
-          "description": "Direction to sort objects.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "kind": {
-          "$ref": "#/$defs/resource-sharing_share_kind",
-          "description": "Filter shares by kind."
-        },
-        "order": {
-          "default": "created",
-          "description": "Order shares by values in the given field.",
-          "enum": [
-            "name",
-            "created"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "Organization identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
           ],
-          "type": "string"
-        },
-        "organization_id": {
-          "$ref": "#/$defs/resource-sharing_organization_id",
-          "description": "Organization identifier."
+          "type": "object"
         },
-        "page": {
-          "default": 1,
-          "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
-          "type": "integer"
-        },
-        "resource_types": {
-          "description": "Filter share resources by resource_types.",
-          "items": {
-            "$ref": "#/$defs/resource-sharing_resource_type"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "Direction to sort objects.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "kind": {
+              "description": "Filter shares by kind.",
+              "enum": [
+                "sent",
+                "received"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "created",
+              "description": "Order shares by values in the given field.",
+              "enum": [
+                "name",
+                "created"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
+              "type": "integer"
+            },
+            "resource_types": {
+              "description": "Filter share resources by resource_types.",
+              "items": {
+                "description": "Resource Type.",
+                "enum": [
+                  "custom-ruleset",
+                  "gateway-policy",
+                  "gateway-destination-ip",
+                  "gateway-block-page-settings",
+                  "gateway-extended-email-matching",
+                  "idp-federation-grant",
+                  "trust-grant"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "status": {
+              "description": "Filter shares by status.",
+              "enum": [
+                "active",
+                "deleting",
+                "deleted"
+              ],
+              "type": "string"
+            },
+            "target_type": {
+              "description": "Filter shares by target_type.",
+              "enum": [
+                "account",
+                "organization"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "status": {
-          "$ref": "#/$defs/resource-sharing_share_status",
-          "description": "Filter shares by status."
-        },
-        "target_type": {
-          "$ref": "#/$defs/resource-sharing_share_target_type",
-          "description": "Filter shares by target_type."
+          "type": "object"
         }
       },
       required: [
-        "organization_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_organization_id": resource_sharing_organization_id,
-        "resource-sharing_resource_type": resource_sharing_resource_type,
-        "resource-sharing_share_kind": resource_sharing_share_kind,
-        "resource-sharing_share_status": resource_sharing_share_status,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_response_collection",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_collection": resource_sharing_share_response_collection_output,
-        "resource-sharing_share_response_collection_result": resource_sharing_share_response_collection_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_collection": resource$$sharing_share_response_collection,
+        "resource-sharing_share_response_collection_result": resource$$sharing_share_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -174,46 +169,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_collection": resource_sharing_share_response_collection_output,
-        "resource-sharing_share_response_collection_result": resource_sharing_share_response_collection_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_collection": resource$$sharing_share_response_collection,
+        "resource-sharing_share_response_collection_result": resource$$sharing_share_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
       path: `/organizations/${pathParam(args, "organization_id")}/shares`,
       query: [
-        ["status", args["status"], true],
-        ["kind", args["kind"], true],
-        ["target_type", args["target_type"], true],
-        ["resource_types", args["resource_types"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["status", param(args, "query", "status"), true],
+        ["kind", param(args, "query", "kind"), true],
+        ["target_type", param(args, "query", "target_type"), true],
+        ["resource_types", param(args, "query", "resource_types"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/organization/tools.ts b/src/generated/forge-mcp/organization/tools.ts
index f03335ddd..62a1bf62e 100644
--- a/src/generated/forge-mcp/organization/tools.ts
+++ b/src/generated/forge-mcp/organization/tools.ts
@@ -1,24 +1,22 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  organizations_api_OrganizationFlags_output,
-  organizations_api_OrganizationID_output,
-  organizations_api_Organization_output,
-  organizations_api_Profile_output,
-  organizations_api_V4ErrorResponse_output,
-  organizations_api_V4Message_output,
+  organizations$$api_Organization,
+  organizations$$api_OrganizationFlags,
+  organizations$$api_Profile,
+  organizations$$api_V4ErrorResponse,
+  organizations$$api_V4Message,
 } from "../outputs.js";
-import { organizations_api_OrganizationID } from "../schemas.js";
 import {
-  organizations_api_DeleteOrganizationResult_output,
-  organizations_api_PageTokenResultInfo_output,
+  organizations$$api_DeleteOrganizationResult,
+  organizations$$api_PageTokenResultInfo,
 } from "./outputs.js";
 import {
-  organizations_api_CreateOrganizationProfileRequest,
-  organizations_api_CreateOrganizationRequest,
-  organizations_api_ModifyOrganizationRequest,
+  organizations$$api_CreateOrganizationProfileRequest,
+  organizations$$api_CreateOrganizationRequest,
+  organizations$$api_ModifyOrganizationRequest,
 } from "./schemas.js";
 
 /**
@@ -28,7 +26,7 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_create",
     title: "Create organization",
-    description: "Create a new organization for a user. Sub-organization creation availability depends on\nthe organization's capabilities. The optional `profile` object accepts partial profile\ndetails; its individual fields are not required. Organization names are limited to 65\nUTF-8 bytes. Each profile field is limited to 1,000 UTF-8 bytes, and a non-empty business\nemail must be valid. At least one of business name, address, phone, or email must be\nnon-empty to persist a profile.",
+    description: "Create a new organization for a user. Sub-organization creation availability depends on\nthe organization's capabilities. The optional `profile` object accepts partial profile\ndetails; its individual fields are not required. Organization names are limited to 65\nUTF-8 bytes. Each profile field is limited to 1,000 UTF-8 bytes, and a non-empty business\nemail must be valid. At least one of business name, address, phone, or email must be\nnon-empty to persist a profile.\n\nPOST /organizations",
     inputSchema: {
       type: "object",
       properties: {
@@ -39,10 +37,10 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "organizations-api_CreateOrganizationProfileRequest": organizations_api_CreateOrganizationProfileRequest,
-        "organizations-api_CreateOrganizationRequest": organizations_api_CreateOrganizationRequest,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
+        "organizations-api_CreateOrganizationProfileRequest": organizations$$api_CreateOrganizationProfileRequest,
+        "organizations-api_CreateOrganizationRequest": organizations$$api_CreateOrganizationRequest,
       },
     },
     outputSchema: {
@@ -78,11 +76,10 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -142,12 +139,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -158,21 +154,28 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_delete",
     title: "Delete organization",
-    description: "Delete an organization. It must not contain active sub-organizations or accounts. A root\norganization must also have no active managed users. Sub-organization deletion availability\ndepends on the organization's capabilities.\n\n**Access Control:** Root deletion is restricted to enterprise organizations.\n\nConfirm with the user before calling this tool. Delete this empty organization? This action cannot be undone.",
+    description: "Delete an organization. It must not contain active sub-organizations or accounts. A root\norganization must also have no active managed users. Sub-organization deletion availability\ndepends on the organization's capabilities.\n\n**Access Control:** Root deletion is restricted to enterprise organizations.\n\nConfirm with the user before calling this tool. Delete this empty organization? This action cannot be undone.\n\nDELETE /organizations/{organization_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID",
-          "description": "The ID of the organization to delete."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "The ID of the organization to delete.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id"
+        "path"
       ],
-      $defs: {
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -207,8 +210,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_DeleteOrganizationResult": organizations_api_DeleteOrganizationResult_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_DeleteOrganizationResult": organizations$$api_DeleteOrganizationResult,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -263,9 +266,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_DeleteOrganizationResult": organizations_api_DeleteOrganizationResult_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_DeleteOrganizationResult": organizations$$api_DeleteOrganizationResult,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -275,21 +278,28 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_get",
     title: "Get organization",
-    description: "Retrieve the details of a certain organization.",
+    description: "Retrieve the details of a certain organization.\n\nGET /organizations/{organization_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID",
-          "description": "The ID of the organization to retrieve."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "The ID of the organization to retrieve.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id"
+        "path"
       ],
-      $defs: {
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -324,11 +334,10 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -383,12 +392,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
@@ -398,90 +406,96 @@ export const tools: readonly Tool[] = [
   {
     name: "organization_list",
     title: "List organizations the user has access to",
-    description: "Retrieve a list of organizations a particular user has access to. At most one of\n`containing.account`, `containing.user`, or `containing.organization` may be provided.",
+    description: "Retrieve a list of organizations a particular user has access to. At most one of\n`containing.account`, `containing.user`, or `containing.organization` may be provided.\n\nGET /organizations",
     inputSchema: {
       type: "object",
       properties: {
-        "containing_account": {
-          "description": "Filter the list of organizations to the ones that contain this particular\naccount.",
-          "type": "string"
-        },
-        "containing_organization": {
-          "description": "Filter the list of organizations to the ones that contain this particular\norganization.",
-          "type": "string"
-        },
-        "containing_user": {
-          "description": "Filter the list of organizations to the ones that contain this particular\nuser.\n\nIMPORTANT: Just because an organization \"contains\" a user is not a\nrepresentation of any authorization or privilege to manage any resources\ntherein. An organization \"containing\" a user simply means the user is managed by\nthat organization.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Sort direction for the `order_by` field. Defaults to `asc` when `order_by` is\nspecified.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "id": {
-          "description": "Only return organizations with the specified IDs (ex. id=foo&id=bar). Send multiple elements\nby repeating the query value.",
-          "items": {
-            "$ref": "#/$defs/organizations-api_OrganizationID"
-          },
-          "type": "array"
-        },
-        "member_email": {
-          "description": "Filter organizations to those where the given user, by email, is an active member of\nthat exact organization. This does not include hierarchy-derived access.",
-          "type": "string"
-        },
-        "name": {
-          "description": "(case-sensitive) Filter the list of organizations to where the name is equal to a\nparticular string.",
-          "type": "string"
-        },
-        "name_contains": {
-          "description": "(case-insensitive) Filter the list of organizations to where the name contains a particular\nstring.",
-          "type": "string"
-        },
-        "name_ends_with": {
-          "description": "(case-insensitive) Filter the list of organizations to where the name ends with a particular\nstring.",
-          "type": "string"
-        },
-        "name_starts_with": {
-          "description": "(case-insensitive) Filter the list of organizations to where the name starts with a\nparticular string.",
-          "type": "string"
-        },
-        "order_by": {
-          "description": "Field to order results by. Currently supported values: `name`.\nWhen not specified, results are ordered by hierarchy.",
-          "enum": [
-            "name"
-          ],
-          "type": "string"
-        },
-        "page_size": {
-          "description": "The amount of items to return. Defaults to 10.",
-          "type": "integer"
-        },
-        "page_token": {
-          "description": "An opaque token returned from the last list response that when\nprovided will retrieve the next page.\n\nParameters used to filter the retrieved list must remain in subsequent\nrequests with a page token.",
-          "type": "string"
-        },
-        "parent_id": {
-          "anyOf": [
-            {
-              "$ref": "#/$defs/organizations-api_OrganizationID"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "containing.account": {
+              "description": "Filter the list of organizations to the ones that contain this particular\naccount.",
+              "type": "string"
             },
-            {
+            "containing.organization": {
+              "description": "Filter the list of organizations to the ones that contain this particular\norganization.",
+              "type": "string"
+            },
+            "containing.user": {
+              "description": "Filter the list of organizations to the ones that contain this particular\nuser.\n\nIMPORTANT: Just because an organization \"contains\" a user is not a\nrepresentation of any authorization or privilege to manage any resources\ntherein. An organization \"containing\" a user simply means the user is managed by\nthat organization.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Sort direction for the `order_by` field. Defaults to `asc` when `order_by` is\nspecified.",
               "enum": [
-                "null"
+                "asc",
+                "desc"
               ],
               "type": "string"
+            },
+            "id": {
+              "description": "Only return organizations with the specified IDs (ex. id=foo&id=bar). Send multiple elements\nby repeating the query value.",
+              "items": {
+                "description": "Organization ID",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "member.email": {
+              "description": "Filter organizations to those where the given user, by email, is an active member of\nthat exact organization. This does not include hierarchy-derived access.",
+              "type": "string"
+            },
+            "name": {
+              "description": "(case-sensitive) Filter the list of organizations to where the name is equal to a\nparticular string.",
+              "type": "string"
+            },
+            "name.contains": {
+              "description": "(case-insensitive) Filter the list of organizations to where the name contains a particular\nstring.",
+              "type": "string"
+            },
+            "name.endsWith": {
+              "description": "(case-insensitive) Filter the list of organizations to where the name ends with a particular\nstring.",
+              "type": "string"
+            },
+            "name.startsWith": {
+              "description": "(case-insensitive) Filter the list of organizations to where the name starts with a\nparticular string.",
+              "type": "string"
+            },
+            "order_by": {
+              "description": "Field to order results by. Currently supported values: `name`.\nWhen not specified, results are ordered by hierarchy.",
+              "enum": [
+                "name"
+              ],
+              "type": "string"
+            },
+            "page_size": {
+              "description": "The amount of items to return. Defaults to 10.",
+              "type": "integer"
+            },
+            "page_token": {
+              "description": "An opaque token returned from the last list response that when\nprovided will retrieve the next page.\n\nParameters used to filter the retrieved list must remain in subsequent\nrequests with a page token.",
+              "type": "string"
+            },
+            "parent.id": {
+              "anyOf": [
+                {
+                  "description": "Organization ID",
+                  "type": "string"
+                },
+                {
+                  "enum": [
+                    "null"
+                  ],
+                  "type": "string"
+                }
+              ],
+              "description": "Filter the list of organizations to the ones that are a sub-organization\nof the specified organization.\n\n\"null\" is a valid value to provide for this parameter. It means \"where\nan organization has no parent (i.e. it is a 'root' organization).\""
             }
-          ],
-          "description": "Filter the list of organizations to the ones that are a sub-organization\nof the specified organization.\n\n\"null\" is a valid value to provide for this parameter. It means \"where\nan organization has no parent (i.e. it is a 'root' organization).\""
+          },
+          "type": "object"
         }
       },
-      $defs: {
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -523,12 +537,11 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_PageTokenResultInfo": organizations_api_PageTokenResultInfo_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_PageTokenResultInfo": organizations$$api_PageTokenResultInfo,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -596,39 +609,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_PageTokenResultInfo": organizations_api_PageTokenResultInfo_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_PageTokenResultInfo": organizations$$api_PageTokenResultInfo,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
       path: `/organizations`,
       query: [
-        ["id", args["id"], true],
-        ["name", args["name"], false],
-        ["name.startsWith", args["name_starts_with"], false],
-        ["name.endsWith", args["name_ends_with"], false],
-        ["name.contains", args["name_contains"], false],
-        ["containing.account", args["containing_account"], false],
-        ["containing.user", args["containing_user"], false],
-        ["containing.organization", args["containing_organization"], false],
-        ["parent.id", args["parent_id"], false],
-        ["member.email", args["member_email"], true],
-        ["order_by", args["order_by"], false],
-        ["direction", args["direction"], false],
-        ["page_token", args["page_token"], false],
-        ["page_size", args["page_size"], false],
+        ["id", param(args, "query", "id"), true],
+        ["name", param(args, "query", "name"), false],
+        ["name.startsWith", param(args, "query", "name.startsWith"), false],
+        ["name.endsWith", param(args, "query", "name.endsWith"), false],
+        ["name.contains", param(args, "query", "name.contains"), false],
+        ["containing.account", param(args, "query", "containing.account"), false],
+        ["containing.user", param(args, "query", "containing.user"), false],
+        ["containing.organization", param(args, "query", "containing.organization"), false],
+        ["parent.id", param(args, "query", "parent.id"), false],
+        ["member.email", param(args, "query", "member.email"), true],
+        ["order_by", param(args, "query", "order_by"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["page_token", param(args, "query", "page_token"), false],
+        ["page_size", param(args, "query", "page_size"), false],
       ],
     }),
   },
   {
     name: "organization_update",
     title: "Update organization",
-    description: "Update an organization's name. Supplying `parent_id` verifies the current parent; this\nendpoint cannot move an organization. Organization names are limited to 65 UTF-8 bytes.",
+    description: "Update an organization's name. Supplying `parent_id` verifies the current parent; this\nendpoint cannot move an organization. Organization names are limited to 65 UTF-8 bytes.\n\nPUT /organizations/{organization_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -636,18 +648,27 @@ export const tools: readonly Tool[] = [
           "$ref": "#/$defs/organizations-api_ModifyOrganizationRequest",
           "description": "The Organization fields to update or verify."
         },
-        "organization_id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID",
-          "description": "The ID of the organization to modify."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "The ID of the organization to modify.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "organizations-api_ModifyOrganizationRequest": organizations_api_ModifyOrganizationRequest,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID,
+        "organizations-api_ModifyOrganizationRequest": organizations$$api_ModifyOrganizationRequest,
       },
     },
     outputSchema: {
@@ -683,11 +704,10 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     annotations: {
@@ -742,12 +762,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "organizations-api_Organization": organizations_api_Organization_output,
-        "organizations-api_OrganizationFlags": organizations_api_OrganizationFlags_output,
-        "organizations-api_OrganizationID": organizations_api_OrganizationID_output,
-        "organizations-api_Profile": organizations_api_Profile_output,
-        "organizations-api_V4ErrorResponse": organizations_api_V4ErrorResponse_output,
-        "organizations-api_V4Message": organizations_api_V4Message_output,
+        "organizations-api_Organization": organizations$$api_Organization,
+        "organizations-api_OrganizationFlags": organizations$$api_OrganizationFlags,
+        "organizations-api_Profile": organizations$$api_Profile,
+        "organizations-api_V4ErrorResponse": organizations$$api_V4ErrorResponse,
+        "organizations-api_V4Message": organizations$$api_V4Message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/organizations/billing/usage/tools.ts b/src/generated/forge-mcp/organizations/billing/usage/tools.ts
index f5b664b82..03f0c7043 100644
--- a/src/generated/forge-mcp/organizations/billing/usage/tools.ts
+++ b/src/generated/forge-mcp/organizations/billing/usage/tools.ts
@@ -1,14 +1,13 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  billable_usage_api_api_response_common_failure_output,
-  billable_usage_api_cost_and_usage_data_output,
-  billable_usage_api_message_output,
-  billable_usage_api_v2_usage_response_output,
+  billable$$usage$$api_api$$response$$common$$failure,
+  billable$$usage$$api_cost_and_usage_data,
+  billable$$usage$$api_message,
+  billable$$usage$$api_v2_usage_response,
 } from "../../../outputs.js";
-import { billable_usage_api_identifier } from "../../../schemas.js";
 
 /**
  * The tools of `organizations.billing.usage`.
@@ -17,38 +16,51 @@ export const tools: readonly Tool[] = [
   {
     name: "organizations_billing_usage_get",
     title: "Get Organization Usage (Version 2, Alpha, Restricted)",
-    description: "Returns cost and usage data for all accounts within an organization,\naligned with the [FinOps FOCUS v1.3](https://focus.finops.org/focus-specification/v1-3/)\nCost and Usage dataset specification.\n\nEach record represents one billable metric for one account on one day.\nThis includes all metered usage, including usage that falls within\nfree-tier allowances and may result in zero cost. The response\nincludes usage for every account belonging to the specified\norganization.\n\n**Note:** This endpoint serves `usage` records only; cost and pricing\nfields are absent from responses. Rated costs are available per\naccount via `POST /accounts/{account_id}/billable/usage` with\n`Metric: cost`.\n\nWhen `from` and `to` are omitted, defaults to the start of the current\nmonth through today. The maximum date range is 31 days.\n\nAn organization with no accounts, or an organization ID that does not\nexist, returns a successful response with an empty result set rather\nthan an error.",
+    description: "Returns cost and usage data for all accounts within an organization,\naligned with the [FinOps FOCUS v1.3](https://focus.finops.org/focus-specification/v1-3/)\nCost and Usage dataset specification.\n\nEach record represents one billable metric for one account on one day.\nThis includes all metered usage, including usage that falls within\nfree-tier allowances and may result in zero cost. The response\nincludes usage for every account belonging to the specified\norganization.\n\n**Note:** This endpoint serves `usage` records only; cost and pricing\nfields are absent from responses. Rated costs are available per\naccount via `POST /accounts/{account_id}/billable/usage` with\n`Metric: cost`.\n\nWhen `from` and `to` are omitted, defaults to the start of the current\nmonth through today. The maximum date range is 31 days.\n\nAn organization with no accounts, or an organization ID that does not\nexist, returns a successful response with an empty result set rather\nthan an error.\n\nGET /organizations/{organization_id}/billable/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "from": {
-          "description": "Start date for the usage query (ISO 8601). Required if `to` is set. When omitted along with `to`, defaults to the start of the current month. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
-          "format": "date",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "Identifies the Cloudflare organization.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
+          ],
+          "type": "object"
         },
-        "organization_id": {
-          "$ref": "#/$defs/billable-usage-api_identifier",
-          "description": "Identifies the Cloudflare organization."
-        },
-        "to": {
-          "description": "End date for the usage query (ISO 8601). Required if `from` is set. When omitted along with `from`, defaults to today. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
-          "format": "date",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "from": {
+              "description": "Start date for the usage query (ISO 8601). Required if `to` is set. When omitted along with `to`, defaults to the start of the current month. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
+              "format": "date",
+              "type": "string"
+            },
+            "to": {
+              "description": "End date for the usage query (ISO 8601). Required if `from` is set. When omitted along with `from`, defaults to today. Filters by charge period (when consumption happened), not billing period. The maximum date range is 31 days.",
+              "format": "date",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "organization_id"
+        "path"
       ],
-      $defs: {
-        "billable-usage-api_identifier": billable_usage_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/billable-usage-api_v2_usage_response",
       $defs: {
-        "billable-usage-api_cost_and_usage_data": billable_usage_api_cost_and_usage_data_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_v2_usage_response": billable_usage_api_v2_usage_response_output,
+        "billable-usage-api_cost_and_usage_data": billable$$usage$$api_cost_and_usage_data,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_v2_usage_response": billable$$usage$$api_v2_usage_response,
       },
     },
     annotations: {
@@ -78,17 +90,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "billable-usage-api_api-response-common-failure": billable_usage_api_api_response_common_failure_output,
-        "billable-usage-api_cost_and_usage_data": billable_usage_api_cost_and_usage_data_output,
-        "billable-usage-api_message": billable_usage_api_message_output,
-        "billable-usage-api_v2_usage_response": billable_usage_api_v2_usage_response_output,
+        "billable-usage-api_api-response-common-failure": billable$$usage$$api_api$$response$$common$$failure,
+        "billable-usage-api_cost_and_usage_data": billable$$usage$$api_cost_and_usage_data,
+        "billable-usage-api_message": billable$$usage$$api_message,
+        "billable-usage-api_v2_usage_response": billable$$usage$$api_v2_usage_response,
       },
     },
     request: (args) => ({
       path: `/organizations/${pathParam(args, "organization_id")}/billable/usage`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/organizations/logs/audit/outputs.ts b/src/generated/forge-mcp/organizations/logs/audit/outputs.ts
index 17ff2c3b3..246125b9a 100644
--- a/src/generated/forge-mcp/organizations/logs/audit/outputs.ts
+++ b/src/generated/forge-mcp/organizations/logs/audit/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `aaa_audit-logs-v2-org` in responses.
  */
-export const aaa_audit_logs_v2_org_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$org: JsonSchema = {
   "properties": {
     "action": {
       "$ref": "#/$defs/aaa_audit-log-action"
@@ -32,7 +32,7 @@ export const aaa_audit_logs_v2_org_output: JsonSchema = {
       ]
     },
     "id": {
-      "$ref": "#/$defs/aaa_identifier-2"
+      "type": "string"
     },
     "organization": {
       "properties": {
@@ -76,7 +76,7 @@ export const aaa_audit_logs_v2_org_output: JsonSchema = {
  * The schema of `aaa_audit-logs-v2-org-history-response-collection` in
  * responses.
  */
-export const aaa_audit_logs_v2_org_history_response_collection_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$org$$history$$response$$collection: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages-2"
@@ -109,7 +109,7 @@ export const aaa_audit_logs_v2_org_history_response_collection_output: JsonSchem
 /**
  * The schema of `aaa_audit-logs-v2-org-response-collection` in responses.
  */
-export const aaa_audit_logs_v2_org_response_collection_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$org$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/aaa_audit-logs-response-collection"
diff --git a/src/generated/forge-mcp/organizations/logs/audit/tools.ts b/src/generated/forge-mcp/organizations/logs/audit/tools.ts
index f17562e53..5cfa00626 100644
--- a/src/generated/forge-mcp/organizations/logs/audit/tools.ts
+++ b/src/generated/forge-mcp/organizations/logs/audit/tools.ts
@@ -1,24 +1,22 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  aaa_api_response_common_failure_2_output,
-  aaa_audit_log_action_output,
-  aaa_audit_log_actor_base_output,
-  aaa_audit_log_raw_output,
-  aaa_audit_logs_response_collection_output,
-  aaa_audit_logs_v2_history_not_found_output,
-  aaa_audit_logs_v2_history_result_info_output,
-  aaa_history_status_output,
-  aaa_identifier_2_output,
-  aaa_messages_2_output,
-  aaa_result_info_output,
+  aaa_api$$response$$common$$failure$$2,
+  aaa_audit$$log$$action,
+  aaa_audit$$log$$actor$$base,
+  aaa_audit$$log$$raw,
+  aaa_audit$$logs$$response$$collection,
+  aaa_audit$$logs$$v2$$history$$not$$found,
+  aaa_audit$$logs$$v2$$history$$result$$info,
+  aaa_messages$$2,
+  aaa_result_info,
 } from "../../../outputs.js";
 import {
-  aaa_audit_logs_v2_org_history_response_collection_output,
-  aaa_audit_logs_v2_org_output,
-  aaa_audit_logs_v2_org_response_collection_output,
+  aaa_audit$$logs$$v2$$org,
+  aaa_audit$$logs$$v2$$org$$history$$response$$collection,
+  aaa_audit$$logs$$v2$$org$$response$$collection,
 } from "./outputs.js";
 
 /**
@@ -28,365 +26,383 @@ export const tools: readonly Tool[] = [
   {
     name: "organizations_logs_audit_get",
     title: "Get organization audit logs (Version 2)",
-    description: "Gets a list of audit logs for an organization.",
+    description: "Gets a list of audit logs for an organization.\n\nGET /organizations/{organization_id}/logs/audit",
     inputSchema: {
       type: "object",
       properties: {
-        "action_result": {
-          "description": "Filters by whether the action was successful or not.",
-          "items": {
-            "enum": [
-              "success",
-              "failure"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "action_result_not": {
-          "description": "Filters out audit logs by whether the action was successful or not.",
-          "items": {
-            "enum": [
-              "success",
-              "failure"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "action_type": {
-          "description": "Filters by the action type.",
-          "items": {
-            "enum": [
-              "create",
-              "delete",
-              "view",
-              "update"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "action_type_not": {
-          "description": "Filters out audit logs by the action type.",
-          "items": {
-            "enum": [
-              "create",
-              "delete",
-              "view",
-              "update"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_context": {
-          "description": "Filters by the actor context.\n- `api`: The action was performed through the API. The specific credential type was not recorded.\n- `api_key`: The action was authenticated with a Cloudflare Global API Key.\n- `api_token`: The action was authenticated with an API token.\n- `dash`: The action was performed through the Cloudflare dashboard.\n- `oauth`: The action was authenticated with an OAuth token.\n- `origin_ca_key`: The action was authenticated with an Origin CA key.\n",
-          "items": {
-            "enum": [
-              "api",
-              "api_key",
-              "api_token",
-              "dash",
-              "oauth",
-              "origin_ca_key"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_context_not": {
-          "description": "Filters out audit logs by the actor context.\n- `api`: The action was performed through the API. The specific credential type was not recorded.\n- `api_key`: The action was authenticated with a Cloudflare Global API Key.\n- `api_token`: The action was authenticated with an API token.\n- `dash`: The action was performed through the Cloudflare dashboard.\n- `oauth`: The action was authenticated with an OAuth token.\n- `origin_ca_key`: The action was authenticated with an Origin CA key.\n",
-          "items": {
-            "enum": [
-              "api",
-              "api_key",
-              "api_token",
-              "dash",
-              "oauth",
-              "origin_ca_key"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_email": {
-          "description": "Filters by the actor's email address.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_email_not": {
-          "description": "Filters out audit logs by the actor's email address.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_id": {
-          "description": "Filters by the actor's user ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_id_not": {
-          "description": "Filters out audit logs by the actor's user ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_ip_address": {
-          "description": "The IP address where the action was initiated.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_ip_address_not": {
-          "description": "Filters out audit logs IP address where the action was initiated.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_token_id": {
-          "description": "Filters by the API token ID when the actor context is an api_token or oauth.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_token_id_not": {
-          "description": "Filters out audit logs by the API token ID when the actor context is an api_token or oauth.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_token_name": {
-          "description": "Filters by the API token name when the actor context is an api_token or oauth.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_token_name_not": {
-          "description": "Filters out audit logs by the API token name when the actor context is an api_token or oauth.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_type": {
-          "description": "Filters by the actor type.",
-          "items": {
-            "enum": [
-              "cloudflare_admin",
-              "system",
-              "user"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "actor_type_not": {
-          "description": "Filters out audit logs by the actor type.",
-          "items": {
-            "enum": [
-              "cloudflare_admin",
-              "system",
-              "user"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "before": {
-          "description": "Limits the returned results to logs older than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
-          "format": "date",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "The cursor is an opaque token used to paginate through large sets of records. It indicates the position from which to continue when requesting the next set of records. A valid cursor value can be obtained from the cursor object in the result_info structure of a previous response.",
-          "type": "string"
-        },
-        "direction": {
-          "default": "desc",
-          "description": "Sets sorting order.",
-          "enum": [
-            "desc",
-            "asc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "organization_id": {
+              "description": "The unique id that identifies the organization.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id"
           ],
-          "type": "string"
-        },
-        "id": {
-          "description": "Finds a specific log by its ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "id_not": {
-          "description": "Filters out audit logs by their IDs.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 100,
-          "description": "The number limits the objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
-          "type": "number"
-        },
-        "organization_id": {
-          "description": "The unique id that identifies the organization.",
-          "type": "string"
-        },
-        "raw_cf_ray_id": {
-          "description": "Filters by the response CF Ray ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_cf_ray_id_not": {
-          "description": "Filters out audit logs by the response CF Ray ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_method": {
-          "description": "The HTTP method for the API call.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_method_not": {
-          "description": "Filters out audit logs by the HTTP method for the API call.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_status_code": {
-          "description": "The response status code that was returned.",
-          "items": {
-            "type": "integer"
-          },
-          "type": "array"
-        },
-        "raw_status_code_not": {
-          "description": "Filters out audit logs by the response status code that was returned.",
-          "items": {
-            "type": "integer"
-          },
-          "type": "array"
-        },
-        "raw_uri": {
-          "description": "Filters by the request URI.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "raw_uri_not": {
-          "description": "Filters out audit logs by the request URI.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_id": {
-          "description": "Filters by the resource ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_id_not": {
-          "description": "Filters out audit logs by the resource ID.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_product": {
-          "description": "Filters audit logs by the Cloudflare product associated with the changed resource.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_product_not": {
-          "description": "Filters out audit logs by the Cloudflare product associated with the changed resource.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_scope": {
-          "description": "Filters by the resource scope, specifying whether the resource is associated with an organization.",
-          "items": {
-            "enum": [
-              "organizations"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_scope_not": {
-          "description": "Filters out audit logs by the resource scope, specifying whether the resource is associated with an organization.",
-          "items": {
-            "enum": [
-              "organizations"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_type": {
-          "description": "Filters audit logs based on the unique type of resource changed by the action.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "resource_type_not": {
-          "description": "Filters out audit logs based on the unique type of resource changed by the action.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "since": {
-          "description": "Limits the returned results to logs newer than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
-          "format": "date",
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "action_result": {
+              "description": "Filters by whether the action was successful or not.",
+              "items": {
+                "enum": [
+                  "success",
+                  "failure"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "action_result.not": {
+              "description": "Filters out audit logs by whether the action was successful or not.",
+              "items": {
+                "enum": [
+                  "success",
+                  "failure"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "action_type": {
+              "description": "Filters by the action type.",
+              "items": {
+                "enum": [
+                  "create",
+                  "delete",
+                  "view",
+                  "update"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "action_type.not": {
+              "description": "Filters out audit logs by the action type.",
+              "items": {
+                "enum": [
+                  "create",
+                  "delete",
+                  "view",
+                  "update"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_context": {
+              "description": "Filters by the actor context.\n- `api`: The action was performed through the API. The specific credential type was not recorded.\n- `api_key`: The action was authenticated with a Cloudflare Global API Key.\n- `api_token`: The action was authenticated with an API token.\n- `dash`: The action was performed through the Cloudflare dashboard.\n- `oauth`: The action was authenticated with an OAuth token.\n- `origin_ca_key`: The action was authenticated with an Origin CA key.",
+              "items": {
+                "enum": [
+                  "api",
+                  "api_key",
+                  "api_token",
+                  "dash",
+                  "oauth",
+                  "origin_ca_key"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_context.not": {
+              "description": "Filters out audit logs by the actor context.\n- `api`: The action was performed through the API. The specific credential type was not recorded.\n- `api_key`: The action was authenticated with a Cloudflare Global API Key.\n- `api_token`: The action was authenticated with an API token.\n- `dash`: The action was performed through the Cloudflare dashboard.\n- `oauth`: The action was authenticated with an OAuth token.\n- `origin_ca_key`: The action was authenticated with an Origin CA key.",
+              "items": {
+                "enum": [
+                  "api",
+                  "api_key",
+                  "api_token",
+                  "dash",
+                  "oauth",
+                  "origin_ca_key"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_email": {
+              "description": "Filters by the actor's email address.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_email.not": {
+              "description": "Filters out audit logs by the actor's email address.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_id": {
+              "description": "Filters by the actor's user ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_id.not": {
+              "description": "Filters out audit logs by the actor's user ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_ip_address": {
+              "description": "The IP address where the action was initiated.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_ip_address.not": {
+              "description": "Filters out audit logs IP address where the action was initiated.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_token_id": {
+              "description": "Filters by the API token ID when the actor context is an api_token or oauth.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_token_id.not": {
+              "description": "Filters out audit logs by the API token ID when the actor context is an api_token or oauth.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_token_name": {
+              "description": "Filters by the API token name when the actor context is an api_token or oauth.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_token_name.not": {
+              "description": "Filters out audit logs by the API token name when the actor context is an api_token or oauth.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_type": {
+              "description": "Filters by the actor type.",
+              "items": {
+                "enum": [
+                  "cloudflare_admin",
+                  "system",
+                  "user"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "actor_type.not": {
+              "description": "Filters out audit logs by the actor type.",
+              "items": {
+                "enum": [
+                  "cloudflare_admin",
+                  "system",
+                  "user"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "before": {
+              "description": "Limits the returned results to logs older than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
+              "format": "date",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "The cursor is an opaque token used to paginate through large sets of records. It indicates the position from which to continue when requesting the next set of records. A valid cursor value can be obtained from the cursor object in the result_info structure of a previous response.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "desc",
+              "description": "Sets sorting order.",
+              "enum": [
+                "desc",
+                "asc"
+              ],
+              "type": "string"
+            },
+            "id": {
+              "description": "Finds a specific log by its ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "id.not": {
+              "description": "Filters out audit logs by their IDs.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 100,
+              "description": "The number limits the objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
+              "type": "number"
+            },
+            "raw_cf_ray_id": {
+              "description": "Filters by the response CF Ray ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_cf_ray_id.not": {
+              "description": "Filters out audit logs by the response CF Ray ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_method": {
+              "description": "The HTTP method for the API call.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_method.not": {
+              "description": "Filters out audit logs by the HTTP method for the API call.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_status_code": {
+              "description": "The response status code that was returned.",
+              "items": {
+                "type": "integer"
+              },
+              "type": "array"
+            },
+            "raw_status_code.not": {
+              "description": "Filters out audit logs by the response status code that was returned.",
+              "items": {
+                "type": "integer"
+              },
+              "type": "array"
+            },
+            "raw_uri": {
+              "description": "Filters by the request URI.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "raw_uri.not": {
+              "description": "Filters out audit logs by the request URI.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_id": {
+              "description": "Filters by the resource ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_id.not": {
+              "description": "Filters out audit logs by the resource ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_product": {
+              "description": "Filters audit logs by the Cloudflare product associated with the changed resource.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_product.not": {
+              "description": "Filters out audit logs by the Cloudflare product associated with the changed resource.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_scope": {
+              "description": "Filters by the resource scope, specifying whether the resource is associated with an organization.",
+              "items": {
+                "enum": [
+                  "organizations"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_scope.not": {
+              "description": "Filters out audit logs by the resource scope, specifying whether the resource is associated with an organization.",
+              "items": {
+                "enum": [
+                  "organizations"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_type": {
+              "description": "Filters audit logs based on the unique type of resource changed by the action.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "resource_type.not": {
+              "description": "Filters out audit logs based on the unique type of resource changed by the action.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "since": {
+              "description": "Limits the returned results to logs newer than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
+              "format": "date",
+              "type": "string"
+            }
+          },
+          "required": [
+            "since",
+            "before"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
-        "since",
-        "before"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_audit-logs-v2-org-response-collection",
       $defs: {
-        "aaa_audit-log-action": aaa_audit_log_action_output,
-        "aaa_audit-log-actor-base": aaa_audit_log_actor_base_output,
-        "aaa_audit-log-raw": aaa_audit_log_raw_output,
-        "aaa_audit-logs-response-collection": aaa_audit_logs_response_collection_output,
-        "aaa_audit-logs-v2-org": aaa_audit_logs_v2_org_output,
-        "aaa_audit-logs-v2-org-response-collection": aaa_audit_logs_v2_org_response_collection_output,
-        "aaa_identifier-2": aaa_identifier_2_output,
-        "aaa_messages-2": aaa_messages_2_output,
-        "aaa_result_info": aaa_result_info_output,
+        "aaa_audit-log-action": aaa_audit$$log$$action,
+        "aaa_audit-log-actor-base": aaa_audit$$log$$actor$$base,
+        "aaa_audit-log-raw": aaa_audit$$log$$raw,
+        "aaa_audit-logs-response-collection": aaa_audit$$logs$$response$$collection,
+        "aaa_audit-logs-v2-org": aaa_audit$$logs$$v2$$org,
+        "aaa_audit-logs-v2-org-response-collection": aaa_audit$$logs$$v2$$org$$response$$collection,
+        "aaa_messages-2": aaa_messages$$2,
+        "aaa_result_info": aaa_result_info,
       },
     },
     annotations: {
@@ -416,135 +432,151 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-2": aaa_api_response_common_failure_2_output,
-        "aaa_audit-log-action": aaa_audit_log_action_output,
-        "aaa_audit-log-actor-base": aaa_audit_log_actor_base_output,
-        "aaa_audit-log-raw": aaa_audit_log_raw_output,
-        "aaa_audit-logs-response-collection": aaa_audit_logs_response_collection_output,
-        "aaa_audit-logs-v2-org": aaa_audit_logs_v2_org_output,
-        "aaa_audit-logs-v2-org-response-collection": aaa_audit_logs_v2_org_response_collection_output,
-        "aaa_identifier-2": aaa_identifier_2_output,
-        "aaa_messages-2": aaa_messages_2_output,
-        "aaa_result_info": aaa_result_info_output,
+        "aaa_api-response-common-failure-2": aaa_api$$response$$common$$failure$$2,
+        "aaa_audit-log-action": aaa_audit$$log$$action,
+        "aaa_audit-log-actor-base": aaa_audit$$log$$actor$$base,
+        "aaa_audit-log-raw": aaa_audit$$log$$raw,
+        "aaa_audit-logs-response-collection": aaa_audit$$logs$$response$$collection,
+        "aaa_audit-logs-v2-org": aaa_audit$$logs$$v2$$org,
+        "aaa_audit-logs-v2-org-response-collection": aaa_audit$$logs$$v2$$org$$response$$collection,
+        "aaa_messages-2": aaa_messages$$2,
+        "aaa_result_info": aaa_result_info,
       },
     },
     request: (args) => ({
       path: `/organizations/${pathParam(args, "organization_id")}/logs/audit`,
       query: [
-        ["action_result", args["action_result"], true],
-        ["action_type", args["action_type"], true],
-        ["actor_context", args["actor_context"], true],
-        ["actor_email", args["actor_email"], true],
-        ["actor_id", args["actor_id"], true],
-        ["actor_ip_address", args["actor_ip_address"], true],
-        ["actor_token_id", args["actor_token_id"], true],
-        ["actor_token_name", args["actor_token_name"], true],
-        ["actor_type", args["actor_type"], true],
-        ["id", args["id"], true],
-        ["raw_cf_ray_id", args["raw_cf_ray_id"], true],
-        ["raw_method", args["raw_method"], true],
-        ["raw_status_code", args["raw_status_code"], true],
-        ["raw_uri", args["raw_uri"], true],
-        ["resource_id", args["resource_id"], true],
-        ["resource_product", args["resource_product"], true],
-        ["resource_type", args["resource_type"], true],
-        ["resource_scope", args["resource_scope"], true],
-        ["action_result.not", args["action_result_not"], true],
-        ["action_type.not", args["action_type_not"], true],
-        ["actor_context.not", args["actor_context_not"], true],
-        ["actor_email.not", args["actor_email_not"], true],
-        ["actor_id.not", args["actor_id_not"], true],
-        ["actor_ip_address.not", args["actor_ip_address_not"], true],
-        ["actor_token_id.not", args["actor_token_id_not"], true],
-        ["actor_token_name.not", args["actor_token_name_not"], true],
-        ["actor_type.not", args["actor_type_not"], true],
-        ["id.not", args["id_not"], true],
-        ["raw_cf_ray_id.not", args["raw_cf_ray_id_not"], true],
-        ["raw_method.not", args["raw_method_not"], true],
-        ["raw_status_code.not", args["raw_status_code_not"], true],
-        ["raw_uri.not", args["raw_uri_not"], true],
-        ["resource_id.not", args["resource_id_not"], true],
-        ["resource_product.not", args["resource_product_not"], true],
-        ["resource_type.not", args["resource_type_not"], true],
-        ["resource_scope.not", args["resource_scope_not"], true],
-        ["since", args["since"], true],
-        ["before", args["before"], true],
-        ["direction", args["direction"], true],
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["action_result", param(args, "query", "action_result"), true],
+        ["action_type", param(args, "query", "action_type"), true],
+        ["actor_context", param(args, "query", "actor_context"), true],
+        ["actor_email", param(args, "query", "actor_email"), true],
+        ["actor_id", param(args, "query", "actor_id"), true],
+        ["actor_ip_address", param(args, "query", "actor_ip_address"), true],
+        ["actor_token_id", param(args, "query", "actor_token_id"), true],
+        ["actor_token_name", param(args, "query", "actor_token_name"), true],
+        ["actor_type", param(args, "query", "actor_type"), true],
+        ["id", param(args, "query", "id"), true],
+        ["raw_cf_ray_id", param(args, "query", "raw_cf_ray_id"), true],
+        ["raw_method", param(args, "query", "raw_method"), true],
+        ["raw_status_code", param(args, "query", "raw_status_code"), true],
+        ["raw_uri", param(args, "query", "raw_uri"), true],
+        ["resource_id", param(args, "query", "resource_id"), true],
+        ["resource_product", param(args, "query", "resource_product"), true],
+        ["resource_type", param(args, "query", "resource_type"), true],
+        ["resource_scope", param(args, "query", "resource_scope"), true],
+        ["action_result.not", param(args, "query", "action_result.not"), true],
+        ["action_type.not", param(args, "query", "action_type.not"), true],
+        ["actor_context.not", param(args, "query", "actor_context.not"), true],
+        ["actor_email.not", param(args, "query", "actor_email.not"), true],
+        ["actor_id.not", param(args, "query", "actor_id.not"), true],
+        ["actor_ip_address.not", param(args, "query", "actor_ip_address.not"), true],
+        ["actor_token_id.not", param(args, "query", "actor_token_id.not"), true],
+        ["actor_token_name.not", param(args, "query", "actor_token_name.not"), true],
+        ["actor_type.not", param(args, "query", "actor_type.not"), true],
+        ["id.not", param(args, "query", "id.not"), true],
+        ["raw_cf_ray_id.not", param(args, "query", "raw_cf_ray_id.not"), true],
+        ["raw_method.not", param(args, "query", "raw_method.not"), true],
+        ["raw_status_code.not", param(args, "query", "raw_status_code.not"), true],
+        ["raw_uri.not", param(args, "query", "raw_uri.not"), true],
+        ["resource_id.not", param(args, "query", "resource_id.not"), true],
+        ["resource_product.not", param(args, "query", "resource_product.not"), true],
+        ["resource_type.not", param(args, "query", "resource_type.not"), true],
+        ["resource_scope.not", param(args, "query", "resource_scope.not"), true],
+        ["since", param(args, "query", "since"), true],
+        ["before", param(args, "query", "before"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
     name: "organizations_logs_audit_history",
     title: "Get resource change history from an organization audit log entry (Version 2)",
-    description: "Returns the chronological change history for the resource identified by the given organization-scoped audit log entry.\n\nThe endpoint first locates the source audit log entry by `id` (using `action_time` to narrow the lookup window), derives identifying filters from that entry, and then returns matching audit logs within the `since`/`before` window.\n\nThe `result_info.history_status` field indicates the quality of the resource identification used:\n- `exact`: Resource was identified by the resource URI.\n- `approximate`: Resource was identified without the resource URI.\n- `unavailable`: The source audit log entry did not contain enough information to identify the resource; an empty result is returned.",
+    description: "Returns the chronological change history for the resource identified by the given organization-scoped audit log entry.\n\nThe endpoint first locates the source audit log entry by `id` (using `action_time` to narrow the lookup window), derives identifying filters from that entry, and then returns matching audit logs within the `since`/`before` window.\n\nThe `result_info.history_status` field indicates the quality of the resource identification used:\n- `exact`: Resource was identified by the resource URI.\n- `approximate`: Resource was identified without the resource URI.\n- `unavailable`: The source audit log entry did not contain enough information to identify the resource; an empty result is returned.\n\nGET /organizations/{organization_id}/logs/audit/{id}/history",
     inputSchema: {
       type: "object",
       properties: {
-        "action_time": {
-          "description": "RFC3339 timestamp of the source audit log entry's action time. Used to narrow the source-entry lookup window. Provide the `action.time` value from the audit log identified by `id`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "before": {
-          "description": "Limits the returned results to logs older than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
-          "format": "date",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "The cursor is an opaque token used to paginate through large sets of records. It indicates the position from which to continue when requesting the next set of records. A valid cursor value can be obtained from the cursor object in the result_info structure of a previous response.",
-          "type": "string"
-        },
-        "direction": {
-          "default": "desc",
-          "description": "Sets sorting order.",
-          "enum": [
-            "desc",
-            "asc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "The ID of the audit log to fetch resource history for.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "organization_id": {
+              "description": "The unique ID that identifies the organization.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "organization_id",
+            "id"
           ],
-          "type": "string"
-        },
-        "id": {
-          "description": "The ID of the audit log to fetch resource history for.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "limit": {
-          "default": 100,
-          "description": "The number limits the objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
-          "type": "number"
-        },
-        "organization_id": {
-          "description": "The unique ID that identifies the organization.",
-          "type": "string"
-        },
-        "since": {
-          "description": "Limits the returned results to logs newer than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
-          "format": "date",
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "action_time": {
+              "description": "RFC3339 timestamp of the source audit log entry's action time. Used to narrow the source-entry lookup window. Provide the `action.time` value from the audit log identified by `id`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "before": {
+              "description": "Limits the returned results to logs older than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
+              "format": "date",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "The cursor is an opaque token used to paginate through large sets of records. It indicates the position from which to continue when requesting the next set of records. A valid cursor value can be obtained from the cursor object in the result_info structure of a previous response.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "desc",
+              "description": "Sets sorting order.",
+              "enum": [
+                "desc",
+                "asc"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 100,
+              "description": "The number limits the objects to return. The cursor attribute may be used to iterate over the next batch of objects if there are more than the limit.",
+              "type": "number"
+            },
+            "since": {
+              "description": "Limits the returned results to logs newer than the specified date. This can be a date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that conforms to RFC3339.",
+              "format": "date",
+              "type": "string"
+            }
+          },
+          "required": [
+            "action_time",
+            "since",
+            "before"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "organization_id",
-        "id",
-        "action_time",
-        "since",
-        "before"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_audit-logs-v2-org-history-response-collection",
       $defs: {
-        "aaa_audit-log-action": aaa_audit_log_action_output,
-        "aaa_audit-log-actor-base": aaa_audit_log_actor_base_output,
-        "aaa_audit-log-raw": aaa_audit_log_raw_output,
-        "aaa_audit-logs-v2-history-result-info": aaa_audit_logs_v2_history_result_info_output,
-        "aaa_audit-logs-v2-org": aaa_audit_logs_v2_org_output,
-        "aaa_audit-logs-v2-org-history-response-collection": aaa_audit_logs_v2_org_history_response_collection_output,
-        "aaa_history-status": aaa_history_status_output,
-        "aaa_identifier-2": aaa_identifier_2_output,
-        "aaa_messages-2": aaa_messages_2_output,
+        "aaa_audit-log-action": aaa_audit$$log$$action,
+        "aaa_audit-log-actor-base": aaa_audit$$log$$actor$$base,
+        "aaa_audit-log-raw": aaa_audit$$log$$raw,
+        "aaa_audit-logs-v2-history-result-info": aaa_audit$$logs$$v2$$history$$result$$info,
+        "aaa_audit-logs-v2-org": aaa_audit$$logs$$v2$$org,
+        "aaa_audit-logs-v2-org-history-response-collection": aaa_audit$$logs$$v2$$org$$history$$response$$collection,
+        "aaa_messages-2": aaa_messages$$2,
       },
     },
     annotations: {
@@ -577,28 +609,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common-failure-2": aaa_api_response_common_failure_2_output,
-        "aaa_audit-log-action": aaa_audit_log_action_output,
-        "aaa_audit-log-actor-base": aaa_audit_log_actor_base_output,
-        "aaa_audit-log-raw": aaa_audit_log_raw_output,
-        "aaa_audit-logs-v2-history-not-found": aaa_audit_logs_v2_history_not_found_output,
-        "aaa_audit-logs-v2-history-result-info": aaa_audit_logs_v2_history_result_info_output,
-        "aaa_audit-logs-v2-org": aaa_audit_logs_v2_org_output,
-        "aaa_audit-logs-v2-org-history-response-collection": aaa_audit_logs_v2_org_history_response_collection_output,
-        "aaa_history-status": aaa_history_status_output,
-        "aaa_identifier-2": aaa_identifier_2_output,
-        "aaa_messages-2": aaa_messages_2_output,
+        "aaa_api-response-common-failure-2": aaa_api$$response$$common$$failure$$2,
+        "aaa_audit-log-action": aaa_audit$$log$$action,
+        "aaa_audit-log-actor-base": aaa_audit$$log$$actor$$base,
+        "aaa_audit-log-raw": aaa_audit$$log$$raw,
+        "aaa_audit-logs-v2-history-not-found": aaa_audit$$logs$$v2$$history$$not$$found,
+        "aaa_audit-logs-v2-history-result-info": aaa_audit$$logs$$v2$$history$$result$$info,
+        "aaa_audit-logs-v2-org": aaa_audit$$logs$$v2$$org,
+        "aaa_audit-logs-v2-org-history-response-collection": aaa_audit$$logs$$v2$$org$$history$$response$$collection,
+        "aaa_messages-2": aaa_messages$$2,
       },
     },
     request: (args) => ({
       path: `/organizations/${pathParam(args, "organization_id")}/logs/audit/${pathParam(args, "id")}/history`,
       query: [
-        ["action_time", args["action_time"], true],
-        ["since", args["since"], true],
-        ["before", args["before"], true],
-        ["direction", args["direction"], true],
-        ["limit", args["limit"], true],
-        ["cursor", args["cursor"], true],
+        ["action_time", param(args, "query", "action_time"), true],
+        ["since", param(args, "query", "since"), true],
+        ["before", param(args, "query", "before"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/outputs.ts b/src/generated/forge-mcp/outputs.ts
index 7fa33aa8e..c0ec3bc43 100644
--- a/src/generated/forge-mcp/outputs.ts
+++ b/src/generated/forge-mcp/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "./_/tool.js";
 /**
  * The schema of `aaa_api-response-common` in responses.
  */
-export const aaa_api_response_common_output: JsonSchema = {
+export const aaa_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages"
@@ -32,7 +32,7 @@ export const aaa_api_response_common_output: JsonSchema = {
 /**
  * The schema of `aaa_api-response-common-failure` in responses.
  */
-export const aaa_api_response_common_failure_output: JsonSchema = {
+export const aaa_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages"
@@ -58,7 +58,7 @@ export const aaa_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `aaa_api-response-common-failure-2` in responses.
  */
-export const aaa_api_response_common_failure_2_output: JsonSchema = {
+export const aaa_api$$response$$common$$failure$$2: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -102,7 +102,7 @@ export const aaa_api_response_common_failure_2_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-log-action` in responses.
  */
-export const aaa_audit_log_action_output: JsonSchema = {
+export const aaa_audit$$log$$action: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -124,7 +124,7 @@ export const aaa_audit_log_action_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-log-actor-base` in responses.
  */
-export const aaa_audit_log_actor_base_output: JsonSchema = {
+export const aaa_audit$$log$$actor$$base: JsonSchema = {
   "properties": {
     "context": {
       "enum": [
@@ -159,7 +159,7 @@ export const aaa_audit_log_actor_base_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-log-raw` in responses.
  */
-export const aaa_audit_log_raw_output: JsonSchema = {
+export const aaa_audit$$log$$raw: JsonSchema = {
   "properties": {
     "cf_ray_id": {
       "type": "string"
@@ -183,7 +183,7 @@ export const aaa_audit_log_raw_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-logs` in responses.
  */
-export const aaa_audit_logs_output: JsonSchema = {
+export const aaa_audit$$logs: JsonSchema = {
   "properties": {
     "action": {
       "properties": {
@@ -236,7 +236,7 @@ export const aaa_audit_logs_output: JsonSchema = {
     "owner": {
       "properties": {
         "id": {
-          "$ref": "#/$defs/aaa_identifier"
+          "type": "string"
         }
       },
       "type": "object"
@@ -263,7 +263,7 @@ export const aaa_audit_logs_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-logs-response-collection` in responses.
  */
-export const aaa_audit_logs_response_collection_output: JsonSchema = {
+export const aaa_audit$$logs$$response$$collection: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages-2"
@@ -284,7 +284,7 @@ export const aaa_audit_logs_response_collection_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-logs-v2-history-not-found` in responses.
  */
-export const aaa_audit_logs_v2_history_not_found_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$history$$not$$found: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/aaa_messages-2"
@@ -320,7 +320,7 @@ export const aaa_audit_logs_v2_history_not_found_output: JsonSchema = {
 /**
  * The schema of `aaa_audit-logs-v2-history-result-info` in responses.
  */
-export const aaa_audit_logs_v2_history_result_info_output: JsonSchema = {
+export const aaa_audit$$logs$$v2$$history$$result$$info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -329,7 +329,12 @@ export const aaa_audit_logs_v2_history_result_info_output: JsonSchema = {
       "type": "string"
     },
     "history_status": {
-      "$ref": "#/$defs/aaa_history-status"
+      "enum": [
+        "exact",
+        "approximate",
+        "unavailable"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -342,7 +347,7 @@ export const aaa_audit_logs_v2_history_result_info_output: JsonSchema = {
 /**
  * The schema of `aaa_audit_logs_response_collection` in responses.
  */
-export const aaa_audit_logs_response_collection_output$: JsonSchema = {
+export const aaa_audit_logs_response_collection: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -370,36 +375,10 @@ export const aaa_audit_logs_response_collection_output$: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `aaa_history-status` in responses.
- */
-export const aaa_history_status_output: JsonSchema = {
-  "enum": [
-    "exact",
-    "approximate",
-    "unavailable"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_identifier` in responses.
- */
-export const aaa_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `aaa_identifier-2` in responses.
- */
-export const aaa_identifier_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `aaa_messages` in responses.
  */
-export const aaa_messages_output: JsonSchema = {
+export const aaa_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -421,7 +400,7 @@ export const aaa_messages_output: JsonSchema = {
 /**
  * The schema of `aaa_messages-2` in responses.
  */
-export const aaa_messages_2_output: JsonSchema = {
+export const aaa_messages$$2: JsonSchema = {
   "items": {
     "properties": {
       "message": {
@@ -439,7 +418,7 @@ export const aaa_messages_2_output: JsonSchema = {
 /**
  * The schema of `aaa_result_info` in responses.
  */
-export const aaa_result_info_output: JsonSchema = {
+export const aaa_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "string"
@@ -454,7 +433,7 @@ export const aaa_result_info_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_ApiErrorResponse` in responses.
  */
-export const analytics_sql_ApiErrorResponse_output: JsonSchema = {
+export const analytics$$sql_ApiErrorResponse: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -479,7 +458,7 @@ export const analytics_sql_ApiErrorResponse_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_Attribute` in responses.
  */
-export const analytics_sql_Attribute_output: JsonSchema = {
+export const analytics$$sql_Attribute: JsonSchema = {
   "properties": {
     "data_type": {
       "type": "string"
@@ -498,7 +477,7 @@ export const analytics_sql_Attribute_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_ClickHouseJsonQueryResponse` in responses.
  */
-export const analytics_sql_ClickHouseJsonQueryResponse_output: JsonSchema = {
+export const analytics$$sql_ClickHouseJsonQueryResponse: JsonSchema = {
   "properties": {
     "data": {
       "items": {
@@ -547,7 +526,7 @@ export const analytics_sql_ClickHouseJsonQueryResponse_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_CustomAttribute` in responses.
  */
-export const analytics_sql_CustomAttribute_output: JsonSchema = {
+export const analytics$$sql_CustomAttribute: JsonSchema = {
   "properties": {
     "data_type": {
       "type": "string"
@@ -566,7 +545,7 @@ export const analytics_sql_CustomAttribute_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_DatasetAvailability` in responses.
  */
-export const analytics_sql_DatasetAvailability_output: JsonSchema = {
+export const analytics$$sql_DatasetAvailability: JsonSchema = {
   "properties": {
     "scope": {
       "enum": [
@@ -588,7 +567,7 @@ export const analytics_sql_DatasetAvailability_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_GatewayApiErrorResponse` in responses.
  */
-export const analytics_sql_GatewayApiErrorResponse_output: JsonSchema = {
+export const analytics$$sql_GatewayApiErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -631,7 +610,7 @@ export const analytics_sql_GatewayApiErrorResponse_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_IntrospectionColumn` in responses.
  */
-export const analytics_sql_IntrospectionColumn_output: JsonSchema = {
+export const analytics$$sql_IntrospectionColumn: JsonSchema = {
   "properties": {
     "data_type": {
       "type": "string"
@@ -658,7 +637,7 @@ export const analytics_sql_IntrospectionColumn_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_IntrospectionDataset` in responses.
  */
-export const analytics_sql_IntrospectionDataset_output: JsonSchema = {
+export const analytics$$sql_IntrospectionDataset: JsonSchema = {
   "properties": {
     "attributes": {
       "items": {
@@ -711,7 +690,7 @@ export const analytics_sql_IntrospectionDataset_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_IntrospectionDatasetKind` in responses.
  */
-export const analytics_sql_IntrospectionDatasetKind_output: JsonSchema = {
+export const analytics$$sql_IntrospectionDatasetKind: JsonSchema = {
   "properties": {
     "availability": {
       "items": {
@@ -722,7 +701,11 @@ export const analytics_sql_IntrospectionDatasetKind_output: JsonSchema = {
     "events": {
       "properties": {
         "sampling": {
-          "$ref": "#/$defs/analytics-sql_IntrospectionSampling"
+          "enum": [
+            "unsampled",
+            "adaptive"
+          ],
+          "type": "string"
         }
       },
       "required": [
@@ -733,7 +716,11 @@ export const analytics_sql_IntrospectionDatasetKind_output: JsonSchema = {
     "logs": {
       "properties": {
         "sampling": {
-          "$ref": "#/$defs/analytics-sql_IntrospectionSampling"
+          "enum": [
+            "unsampled",
+            "adaptive"
+          ],
+          "type": "string"
         }
       },
       "required": [
@@ -744,7 +731,11 @@ export const analytics_sql_IntrospectionDatasetKind_output: JsonSchema = {
     "states": {
       "properties": {
         "sampling": {
-          "$ref": "#/$defs/analytics-sql_IntrospectionSampling"
+          "enum": [
+            "unsampled",
+            "adaptive"
+          ],
+          "type": "string"
         },
         "valid_aggregations": {
           "items": {
@@ -766,7 +757,7 @@ export const analytics_sql_IntrospectionDatasetKind_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_IntrospectionResponse` in responses.
  */
-export const analytics_sql_IntrospectionResponse_output: JsonSchema = {
+export const analytics$$sql_IntrospectionResponse: JsonSchema = {
   "properties": {
     "datasets": {
       "items": {
@@ -781,21 +772,10 @@ export const analytics_sql_IntrospectionResponse_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `analytics-sql_IntrospectionSampling` in responses.
- */
-export const analytics_sql_IntrospectionSampling_output: JsonSchema = {
-  "enum": [
-    "unsampled",
-    "adaptive"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `analytics-sql_LogExplorerQueryResponse` in responses.
  */
-export const analytics_sql_LogExplorerQueryResponse_output: JsonSchema = {
+export const analytics$$sql_LogExplorerQueryResponse: JsonSchema = {
   "properties": {
     "data": {
       "items": {
@@ -817,7 +797,7 @@ export const analytics_sql_LogExplorerQueryResponse_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_SqlQueryResponse` in responses.
  */
-export const analytics_sql_SqlQueryResponse_output: JsonSchema = {
+export const analytics$$sql_SqlQueryResponse: JsonSchema = {
   "properties": {
     "data": {
       "items": {
@@ -843,7 +823,7 @@ export const analytics_sql_SqlQueryResponse_output: JsonSchema = {
 /**
  * The schema of `analytics-sql_SqlQueryStatistics` in responses.
  */
-export const analytics_sql_SqlQueryStatistics_output: JsonSchema = {
+export const analytics$$sql_SqlQueryStatistics: JsonSchema = {
   "properties": {
     "bytes_read": {
       "type": "integer"
@@ -866,7 +846,7 @@ export const analytics_sql_SqlQueryStatistics_output: JsonSchema = {
 /**
  * The schema of `api-shield_api-response-collection` in responses.
  */
-export const api_shield_api_response_collection_output: JsonSchema = {
+export const api$$shield_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
@@ -902,7 +882,7 @@ export const api_shield_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `api-shield_api-response-common` in responses.
  */
-export const api_shield_api_response_common_output: JsonSchema = {
+export const api$$shield_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/api-shield_messages"
@@ -928,7 +908,7 @@ export const api_shield_api_response_common_output: JsonSchema = {
 /**
  * The schema of `api-shield_api-response-common-failure` in responses.
  */
-export const api_shield_api_response_common_failure_output: JsonSchema = {
+export const api$$shield_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/api-shield_messages"
@@ -955,26 +935,30 @@ export const api_shield_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_auth_id_tokens` in responses.
- */
-export const api_shield_auth_id_tokens_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `api-shield_basic_operation` in responses.
  */
-export const api_shield_basic_operation_output: JsonSchema = {
+export const api$$shield_basic_operation: JsonSchema = {
   "properties": {
     "endpoint": {
-      "$ref": "#/$defs/api-shield_endpoint"
+      "type": "string"
     },
     "host": {
-      "$ref": "#/$defs/api-shield_host"
+      "type": "string"
     },
     "method": {
-      "$ref": "#/$defs/api-shield_method"
+      "enum": [
+        "GET",
+        "POST",
+        "HEAD",
+        "OPTIONS",
+        "PUT",
+        "DELETE",
+        "CONNECT",
+        "PATCH",
+        "TRACE"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -988,7 +972,7 @@ export const api_shield_basic_operation_output: JsonSchema = {
 /**
  * The schema of `api-shield_confidence_intervals_bounds` in responses.
  */
-export const api_shield_confidence_intervals_bounds_output: JsonSchema = {
+export const api$$shield_confidence_intervals_bounds: JsonSchema = {
   "properties": {
     "lower": {
       "type": "number"
@@ -1000,31 +984,10 @@ export const api_shield_confidence_intervals_bounds_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_data_points` in responses.
- */
-export const api_shield_data_points_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `api-shield_endpoint` in responses.
- */
-export const api_shield_endpoint_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_host` in responses.
- */
-export const api_shield_host_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_messages` in responses.
  */
-export const api_shield_messages_output: JsonSchema = {
+export const api$$shield_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -1054,28 +1017,10 @@ export const api_shield_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `api-shield_method` in responses.
- */
-export const api_shield_method_output: JsonSchema = {
-  "enum": [
-    "GET",
-    "POST",
-    "HEAD",
-    "OPTIONS",
-    "PUT",
-    "DELETE",
-    "CONNECT",
-    "PATCH",
-    "TRACE"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_operation` in responses.
  */
-export const api_shield_operation_output: JsonSchema = {
+export const api$$shield_operation: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_standard_operation"
@@ -1101,12 +1046,13 @@ export const api_shield_operation_output: JsonSchema = {
 /**
  * The schema of `api-shield_operation_feature_api_routing` in responses.
  */
-export const api_shield_operation_feature_api_routing_output: JsonSchema = {
+export const api$$shield_operation_feature_api_routing: JsonSchema = {
   "properties": {
     "api_routing": {
       "properties": {
         "last_updated": {
-          "$ref": "#/$defs/api-shield_timestamp"
+          "format": "date-time",
+          "type": "string"
         },
         "route": {
           "type": "string"
@@ -1122,12 +1068,13 @@ export const api_shield_operation_feature_api_routing_output: JsonSchema = {
  * The schema of `api-shield_operation_feature_confidence_intervals` in
  * responses.
  */
-export const api_shield_operation_feature_confidence_intervals_output: JsonSchema = {
+export const api$$shield_operation_feature_confidence_intervals: JsonSchema = {
   "properties": {
     "confidence_intervals": {
       "properties": {
         "last_updated": {
-          "$ref": "#/$defs/api-shield_timestamp"
+          "format": "date-time",
+          "type": "string"
         },
         "suggested_threshold": {
           "properties": {
@@ -1161,12 +1108,13 @@ export const api_shield_operation_feature_confidence_intervals_output: JsonSchem
 /**
  * The schema of `api-shield_operation_feature_parameter_schemas` in responses.
  */
-export const api_shield_operation_feature_parameter_schemas_output: JsonSchema = {
+export const api$$shield_operation_feature_parameter_schemas: JsonSchema = {
   "properties": {
     "parameter_schemas": {
       "properties": {
         "last_updated": {
-          "$ref": "#/$defs/api-shield_timestamp"
+          "format": "date-time",
+          "type": "string"
         },
         "parameter_schemas": {
           "$ref": "#/$defs/api-shield_parameter_schemas_definition"
@@ -1184,17 +1132,25 @@ export const api_shield_operation_feature_parameter_schemas_output: JsonSchema =
 /**
  * The schema of `api-shield_operation_feature_schema_info` in responses.
  */
-export const api_shield_operation_feature_schema_info_output: JsonSchema = {
+export const api$$shield_operation_feature_schema_info: JsonSchema = {
   "properties": {
     "schema_info": {
       "properties": {
         "active_schema": {
           "properties": {
             "created_at": {
-              "$ref": "#/$defs/api-shield_timestamp"
+              "format": "date-time",
+              "type": "string"
             },
             "id": {
-              "$ref": "#/$defs/api-shield_uuid-2"
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
             },
             "name": {
               "type": "string"
@@ -1227,36 +1183,37 @@ export const api_shield_operation_feature_schema_info_output: JsonSchema = {
 /**
  * The schema of `api-shield_operation_feature_thresholds` in responses.
  */
-export const api_shield_operation_feature_thresholds_output: JsonSchema = {
+export const api$$shield_operation_feature_thresholds: JsonSchema = {
   "properties": {
     "thresholds": {
       "properties": {
         "auth_id_tokens": {
-          "$ref": "#/$defs/api-shield_auth_id_tokens"
+          "type": "integer"
         },
         "data_points": {
-          "$ref": "#/$defs/api-shield_data_points"
+          "type": "integer"
         },
         "last_updated": {
-          "$ref": "#/$defs/api-shield_timestamp"
+          "format": "date-time",
+          "type": "string"
         },
         "p50": {
-          "$ref": "#/$defs/api-shield_p50"
+          "type": "integer"
         },
         "p90": {
-          "$ref": "#/$defs/api-shield_p90"
+          "type": "integer"
         },
         "p99": {
-          "$ref": "#/$defs/api-shield_p99"
+          "type": "integer"
         },
         "period_seconds": {
-          "$ref": "#/$defs/api-shield_period_seconds"
+          "type": "integer"
         },
         "requests": {
-          "$ref": "#/$defs/api-shield_requests"
+          "type": "integer"
         },
         "suggested_threshold": {
-          "$ref": "#/$defs/api-shield_suggested_threshold"
+          "type": "integer"
         }
       },
       "type": "object"
@@ -1268,7 +1225,7 @@ export const api_shield_operation_feature_thresholds_output: JsonSchema = {
 /**
  * The schema of `api-shield_operation_features` in responses.
  */
-export const api_shield_operation_features_output: JsonSchema = {
+export const api$$shield_operation_features: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/api-shield_operation_feature_thresholds"
@@ -1288,31 +1245,10 @@ export const api_shield_operation_features_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `api-shield_p50` in responses.
- */
-export const api_shield_p50_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `api-shield_p90` in responses.
- */
-export const api_shield_p90_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `api-shield_p99` in responses.
- */
-export const api_shield_p99_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `api-shield_parameter_schemas_definition` in responses.
  */
-export const api_shield_parameter_schemas_definition_output: JsonSchema = {
+export const api$$shield_parameter_schemas_definition: JsonSchema = {
   "properties": {
     "parameters": {
       "items": {
@@ -1334,24 +1270,10 @@ export const api_shield_parameter_schemas_definition_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_period_seconds` in responses.
- */
-export const api_shield_period_seconds_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `api-shield_requests` in responses.
- */
-export const api_shield_requests_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `api-shield_standard_operation` in responses.
  */
-export const api_shield_standard_operation_output: JsonSchema = {
+export const api$$shield_standard_operation: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_basic_operation"
@@ -1359,10 +1281,25 @@ export const api_shield_standard_operation_output: JsonSchema = {
     {
       "properties": {
         "last_updated": {
-          "$ref": "#/$defs/api-shield_timestamp-2"
+          "allOf": [
+            {
+              "format": "date-time",
+              "type": "string"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid-2"
+          "allOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       },
       "required": [
@@ -1374,60 +1311,10 @@ export const api_shield_standard_operation_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `api-shield_suggested_threshold` in responses.
- */
-export const api_shield_suggested_threshold_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `api-shield_timestamp` in responses.
- */
-export const api_shield_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_timestamp-2` in responses.
- */
-export const api_shield_timestamp_2_output: JsonSchema = {
-  "allOf": [
-    {
-      "$ref": "#/$defs/api-shield_timestamp"
-    },
-    {
-      "type": "string"
-    }
-  ]
-};
-
-/**
- * The schema of `api-shield_uuid` in responses.
- */
-export const api_shield_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_uuid-2` in responses.
- */
-export const api_shield_uuid_2_output: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/api-shield_uuid"
-    }
-  ]
-};
-
 /**
  * The schema of `bill-subs-api_api-response-collection` in responses.
  */
-export const bill_subs_api_api_response_collection_output: JsonSchema = {
+export const bill$$subs$$api_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-common"
@@ -1459,7 +1346,7 @@ export const bill_subs_api_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_api-response-common` in responses.
  */
-export const bill_subs_api_api_response_common_output: JsonSchema = {
+export const bill$$subs$$api_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/bill-subs-api_messages"
@@ -1502,7 +1389,7 @@ export const bill_subs_api_api_response_common_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_api-response-common-failure` in responses.
  */
-export const bill_subs_api_api_response_common_failure_output: JsonSchema = {
+export const bill$$subs$$api_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/bill-subs-api_messages"
@@ -1532,7 +1419,7 @@ export const bill_subs_api_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_api-response-single` in responses.
  */
-export const bill_subs_api_api_response_single_output: JsonSchema = {
+export const bill$$subs$$api_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-common"
@@ -1561,7 +1448,7 @@ export const bill_subs_api_api_response_single_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_billing_response_single` in responses.
  */
-export const bill_subs_api_billing_response_single_output: JsonSchema = {
+export const bill$$subs$$api_billing_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
@@ -1621,7 +1508,7 @@ export const bill_subs_api_billing_response_single_output: JsonSchema = {
               "type": "string"
             },
             "id": {
-              "$ref": "#/$defs/bill-subs-api_components-schemas-identifier"
+              "type": "string"
             },
             "is_partner": {
               "type": "boolean"
@@ -1699,7 +1586,7 @@ export const bill_subs_api_billing_response_single_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_component_value` in responses.
  */
-export const bill_subs_api_component_value_output: JsonSchema = {
+export const bill$$subs$$api_component_value: JsonSchema = {
   "properties": {
     "default": {
       "type": "number"
@@ -1731,74 +1618,17 @@ export const bill_subs_api_component_value_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_component_values` in responses.
  */
-export const bill_subs_api_component_values_output: JsonSchema = {
+export const bill$$subs$$api_component_values: JsonSchema = {
   "items": {
     "$ref": "#/$defs/bill-subs-api_component_value"
   },
   "type": "array"
 };
 
-/**
- * The schema of `bill-subs-api_components-schemas-identifier` in responses.
- */
-export const bill_subs_api_components_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_currency` in responses.
- */
-export const bill_subs_api_currency_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_current_period_end` in responses.
- */
-export const bill_subs_api_current_period_end_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_current_period_start` in responses.
- */
-export const bill_subs_api_current_period_start_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_frequency` in responses.
- */
-export const bill_subs_api_frequency_output: JsonSchema = {
-  "enum": [
-    "weekly",
-    "monthly",
-    "quarterly",
-    "yearly"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_identifier` in responses.
- */
-export const bill_subs_api_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_install_id` in responses.
- */
-export const bill_subs_api_install_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `bill-subs-api_messages` in responses.
  */
-export const bill_subs_api_messages_output: JsonSchema = {
+export const bill$$subs$$api_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -1817,24 +1647,10 @@ export const bill_subs_api_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `bill-subs-api_name` in responses.
- */
-export const bill_subs_api_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_price` in responses.
- */
-export const bill_subs_api_price_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `bill-subs-api_rate_plan` in responses.
  */
-export const bill_subs_api_rate_plan_output: JsonSchema = {
+export const bill$$subs$$api_rate_plan: JsonSchema = {
   "properties": {
     "currency": {
       "type": "string"
@@ -1867,7 +1683,7 @@ export const bill_subs_api_rate_plan_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_result_info` in responses.
  */
-export const bill_subs_api_result_info_output: JsonSchema = {
+export const bill$$subs$$api_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -1885,38 +1701,15 @@ export const bill_subs_api_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `bill-subs-api_schemas-identifier` in responses.
- */
-export const bill_subs_api_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_state` in responses.
- */
-export const bill_subs_api_state_output: JsonSchema = {
-  "enum": [
-    "Trial",
-    "Provisioned",
-    "Paid",
-    "AwaitingPayment",
-    "Cancelled",
-    "Failed",
-    "Expired"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `bill-subs-api_subscription` in responses.
  */
-export const bill_subs_api_subscription_output: JsonSchema = {
+export const bill$$subs$$api_subscription: JsonSchema = {
   "properties": {
     "app": {
       "properties": {
         "install_id": {
-          "$ref": "#/$defs/bill-subs-api_install_id"
+          "type": "string"
         }
       },
       "type": "object"
@@ -1925,28 +1718,45 @@ export const bill_subs_api_subscription_output: JsonSchema = {
       "$ref": "#/$defs/bill-subs-api_component_values"
     },
     "currency": {
-      "$ref": "#/$defs/bill-subs-api_currency"
+      "type": "string"
     },
     "current_period_end": {
-      "$ref": "#/$defs/bill-subs-api_current_period_end"
+      "format": "date-time",
+      "type": "string"
     },
     "current_period_start": {
-      "$ref": "#/$defs/bill-subs-api_current_period_start"
+      "format": "date-time",
+      "type": "string"
     },
     "frequency": {
-      "$ref": "#/$defs/bill-subs-api_frequency"
+      "enum": [
+        "weekly",
+        "monthly",
+        "quarterly",
+        "yearly"
+      ],
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/bill-subs-api_schemas-identifier"
+      "type": "string"
     },
     "price": {
-      "$ref": "#/$defs/bill-subs-api_price"
+      "type": "number"
     },
     "rate_plan": {
       "$ref": "#/$defs/bill-subs-api_rate_plan"
     },
     "state": {
-      "$ref": "#/$defs/bill-subs-api_state"
+      "enum": [
+        "Trial",
+        "Provisioned",
+        "Paid",
+        "AwaitingPayment",
+        "Cancelled",
+        "Failed",
+        "Expired"
+      ],
+      "type": "string"
     },
     "zone": {
       "$ref": "#/$defs/bill-subs-api_zone"
@@ -1958,12 +1768,12 @@ export const bill_subs_api_subscription_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_subscription-v2` in responses.
  */
-export const bill_subs_api_subscription_v2_output: JsonSchema = {
+export const bill$$subs$$api_subscription$$v2: JsonSchema = {
   "properties": {
     "app": {
       "properties": {
         "install_id": {
-          "$ref": "#/$defs/bill-subs-api_install_id"
+          "type": "string"
         }
       },
       "type": "object"
@@ -1972,28 +1782,45 @@ export const bill_subs_api_subscription_v2_output: JsonSchema = {
       "$ref": "#/$defs/bill-subs-api_component_values"
     },
     "currency": {
-      "$ref": "#/$defs/bill-subs-api_currency"
+      "type": "string"
     },
     "current_period_end": {
-      "$ref": "#/$defs/bill-subs-api_current_period_end"
+      "format": "date-time",
+      "type": "string"
     },
     "current_period_start": {
-      "$ref": "#/$defs/bill-subs-api_current_period_start"
+      "format": "date-time",
+      "type": "string"
     },
     "frequency": {
-      "$ref": "#/$defs/bill-subs-api_frequency"
+      "enum": [
+        "weekly",
+        "monthly",
+        "quarterly",
+        "yearly"
+      ],
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/bill-subs-api_schemas-identifier"
+      "type": "string"
     },
     "price": {
-      "$ref": "#/$defs/bill-subs-api_price"
+      "type": "number"
     },
     "rate_plan": {
       "$ref": "#/$defs/bill-subs-api_rate_plan"
     },
     "state": {
-      "$ref": "#/$defs/bill-subs-api_state"
+      "enum": [
+        "Trial",
+        "Provisioned",
+        "Paid",
+        "AwaitingPayment",
+        "Cancelled",
+        "Failed",
+        "Expired"
+      ],
+      "type": "string"
     },
     "zone": {
       "$ref": "#/$defs/bill-subs-api_zone"
@@ -2005,13 +1832,13 @@ export const bill_subs_api_subscription_v2_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_zone` in responses.
  */
-export const bill_subs_api_zone_output: JsonSchema = {
+export const bill$$subs$$api_zone: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/bill-subs-api_identifier"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/bill-subs-api_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -2020,7 +1847,7 @@ export const bill_subs_api_zone_output: JsonSchema = {
 /**
  * The schema of `billable-usage-api_api-response-common-failure` in responses.
  */
-export const billable_usage_api_api_response_common_failure_output: JsonSchema = {
+export const billable$$usage$$api_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -2071,7 +1898,7 @@ export const billable_usage_api_api_response_common_failure_output: JsonSchema =
 /**
  * The schema of `billable-usage-api_cost_and_usage_data` in responses.
  */
-export const billable_usage_api_cost_and_usage_data_output: JsonSchema = {
+export const billable$$usage$$api_cost_and_usage_data: JsonSchema = {
   "properties": {
     "BilledCost": {
       "oneOf": [
@@ -2338,7 +2165,7 @@ export const billable_usage_api_cost_and_usage_data_output: JsonSchema = {
 /**
  * The schema of `billable-usage-api_message` in responses.
  */
-export const billable_usage_api_message_output: JsonSchema = {
+export const billable$$usage$$api_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -2356,7 +2183,7 @@ export const billable_usage_api_message_output: JsonSchema = {
 /**
  * The schema of `billable-usage-api_v2_usage_response` in responses.
  */
-export const billable_usage_api_v2_usage_response_output: JsonSchema = {
+export const billable$$usage$$api_v2_usage_response: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -2409,7 +2236,7 @@ export const billable_usage_api_v2_usage_response_output: JsonSchema = {
 /**
  * The schema of `brand-protection-api_Error` in responses.
  */
-export const brand_protection_api_Error_output: JsonSchema = {
+export const brand$$protection$$api_Error: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -2433,7 +2260,7 @@ export const brand_protection_api_Error_output: JsonSchema = {
 /**
  * The schema of `builds_APIResponse` in responses.
  */
-export const builds_APIResponse_output: JsonSchema = {
+export const builds_APIResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -2482,7 +2309,7 @@ export const builds_APIResponse_output: JsonSchema = {
 /**
  * The schema of `builds_ApiError` in responses.
  */
-export const builds_ApiError_output: JsonSchema = {
+export const builds_ApiError: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -2497,29 +2324,22 @@ export const builds_ApiError_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `builds_BuildOutcome` in responses.
- */
-export const builds_BuildOutcome_output: JsonSchema = {
-  "enum": [
-    "success",
-    "fail",
-    "skipped",
-    "cancelled",
-    "terminated"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `builds_BuildResponse` in responses.
  */
-export const builds_BuildResponse_output: JsonSchema = {
+export const builds_BuildResponse: JsonSchema = {
   "properties": {
     "build_outcome": {
       "oneOf": [
         {
-          "$ref": "#/$defs/builds_BuildOutcome"
+          "enum": [
+            "success",
+            "fail",
+            "skipped",
+            "cancelled",
+            "terminated"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -2530,17 +2350,19 @@ export const builds_BuildResponse_output: JsonSchema = {
       "$ref": "#/$defs/builds_BuildTriggerMetadataResponse"
     },
     "build_uuid": {
-      "$ref": "#/$defs/builds_build_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/builds_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "deploy_hook": {
       "oneOf": [
         {
           "properties": {
             "deploy_hook_name": {
-              "$ref": "#/$defs/builds_deploy_hook_name"
+              "type": "string"
             }
           },
           "type": "object"
@@ -2562,7 +2384,8 @@ export const builds_BuildResponse_output: JsonSchema = {
       ]
     },
     "modified_on": {
-      "$ref": "#/$defs/builds_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "preview_url": {
       "type": "string"
@@ -2583,7 +2406,8 @@ export const builds_BuildResponse_output: JsonSchema = {
               ]
             },
             "created_on": {
-              "$ref": "#/$defs/builds_created_on"
+              "format": "date-time",
+              "type": "string"
             },
             "pull_request_url": {
               "type": "string"
@@ -2608,39 +2432,63 @@ export const builds_BuildResponse_output: JsonSchema = {
       ]
     },
     "status": {
-      "$ref": "#/$defs/builds_BuildStatus"
+      "enum": [
+        "queued",
+        "initializing",
+        "running",
+        "stopped"
+      ],
+      "type": "string"
     },
     "stopped_on": {
-      "$ref": "#/$defs/builds_stopped_on"
-    },
-    "trigger": {
-      "properties": {
-        "branch_excludes": {
-          "$ref": "#/$defs/builds_branch_excludes"
-        },
-        "branch_includes": {
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "trigger": {
+      "properties": {
+        "branch_excludes": {
+          "$ref": "#/$defs/builds_branch_excludes"
+        },
+        "branch_includes": {
           "$ref": "#/$defs/builds_branch_includes"
         },
         "build_caching_enabled": {
-          "$ref": "#/$defs/builds_build_caching_enabled"
+          "type": "boolean"
         },
         "build_command": {
-          "$ref": "#/$defs/builds_build_command"
+          "type": "string"
         },
         "created_on": {
-          "$ref": "#/$defs/builds_created_on"
+          "format": "date-time",
+          "type": "string"
         },
         "deleted_on": {
-          "$ref": "#/$defs/builds_deleted_on"
+          "oneOf": [
+            {
+              "format": "date-time",
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "deploy_command": {
-          "$ref": "#/$defs/builds_deploy_command"
+          "type": "string"
         },
         "external_script_id": {
-          "$ref": "#/$defs/builds_external_script_id"
+          "type": "string"
         },
         "modified_on": {
-          "$ref": "#/$defs/builds_modified_on"
+          "format": "date-time",
+          "type": "string"
         },
         "path_excludes": {
           "$ref": "#/$defs/builds_path_excludes"
@@ -2652,13 +2500,14 @@ export const builds_BuildResponse_output: JsonSchema = {
           "$ref": "#/$defs/builds_UpsertRepoConnectionResponse"
         },
         "root_directory": {
-          "$ref": "#/$defs/builds_root_directory"
+          "type": "string"
         },
         "trigger_name": {
-          "$ref": "#/$defs/builds_trigger_name"
+          "type": "string"
         },
         "trigger_uuid": {
-          "$ref": "#/$defs/builds_trigger_uuid"
+          "format": "uuid",
+          "type": "string"
         }
       },
       "type": "object"
@@ -2667,50 +2516,44 @@ export const builds_BuildResponse_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `builds_BuildStatus` in responses.
- */
-export const builds_BuildStatus_output: JsonSchema = {
-  "enum": [
-    "queued",
-    "initializing",
-    "running",
-    "stopped"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `builds_BuildTriggerMetadataResponse` in responses.
  */
-export const builds_BuildTriggerMetadataResponse_output: JsonSchema = {
+export const builds_BuildTriggerMetadataResponse: JsonSchema = {
   "properties": {
     "author": {
       "type": "string"
     },
     "branch": {
-      "$ref": "#/$defs/builds_branch"
+      "type": "string"
     },
     "build_command": {
-      "$ref": "#/$defs/builds_build_command"
+      "type": "string"
     },
     "build_token_name": {
-      "$ref": "#/$defs/builds_build_token_name"
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "build_trigger_source": {
-      "$ref": "#/$defs/builds_BuildTriggerSource"
+      "enum": [
+        "push",
+        "pull_request",
+        "manual",
+        "api"
+      ],
+      "type": "string"
     },
     "commit_hash": {
-      "$ref": "#/$defs/builds_commit_hash"
+      "type": "string"
     },
     "commit_message": {
       "type": "string"
     },
     "deploy_command": {
-      "$ref": "#/$defs/builds_deploy_command"
+      "type": "string"
     },
     "environment_variables": {
       "additionalProperties": {
@@ -2719,45 +2562,39 @@ export const builds_BuildTriggerMetadataResponse_output: JsonSchema = {
       "type": "object"
     },
     "provider_account_name": {
-      "$ref": "#/$defs/builds_provider_account_name"
+      "type": "string"
     },
     "provider_type": {
-      "$ref": "#/$defs/builds_SCMProviderType"
+      "enum": [
+        "github",
+        "gitlab",
+        "gitlab_internal",
+        "origin"
+      ],
+      "type": "string"
     },
     "repo_name": {
-      "$ref": "#/$defs/builds_repo_name"
+      "type": "string"
     },
     "root_directory": {
-      "$ref": "#/$defs/builds_root_directory"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `builds_BuildTriggerSource` in responses.
- */
-export const builds_BuildTriggerSource_output: JsonSchema = {
-  "enum": [
-    "push",
-    "pull_request",
-    "manual",
-    "api"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `builds_EnvironmentVariablesResponse` in responses.
  */
-export const builds_EnvironmentVariablesResponse_output: JsonSchema = {
+export const builds_EnvironmentVariablesResponse: JsonSchema = {
   "additionalProperties": {
     "properties": {
       "created_on": {
-        "$ref": "#/$defs/builds_created_on"
+        "format": "date-time",
+        "type": "string"
       },
       "is_secret": {
-        "$ref": "#/$defs/builds_is_secret"
+        "type": "boolean"
       },
       "value": {
         "oneOf": [
@@ -2782,7 +2619,7 @@ export const builds_EnvironmentVariablesResponse_output: JsonSchema = {
 /**
  * The schema of `builds_ErrorResponse` in responses.
  */
-export const builds_ErrorResponse_output: JsonSchema = {
+export const builds_ErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -2822,7 +2659,7 @@ export const builds_ErrorResponse_output: JsonSchema = {
 /**
  * The schema of `builds_PaginationInfo` in responses.
  */
-export const builds_PaginationInfo_output: JsonSchema = {
+export const builds_PaginationInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -2843,50 +2680,54 @@ export const builds_PaginationInfo_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `builds_SCMProviderType` in responses.
- */
-export const builds_SCMProviderType_output: JsonSchema = {
-  "enum": [
-    "github",
-    "gitlab",
-    "gitlab_internal",
-    "origin"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `builds_UpsertRepoConnectionResponse` in responses.
  */
-export const builds_UpsertRepoConnectionResponse_output: JsonSchema = {
+export const builds_UpsertRepoConnectionResponse: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/builds_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_on": {
-      "$ref": "#/$defs/builds_deleted_on"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "modified_on": {
-      "$ref": "#/$defs/builds_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "provider_account_id": {
-      "$ref": "#/$defs/builds_provider_account_id"
+      "type": "string"
     },
     "provider_account_name": {
-      "$ref": "#/$defs/builds_provider_account_name"
+      "type": "string"
     },
     "provider_type": {
-      "$ref": "#/$defs/builds_SCMProviderType"
+      "enum": [
+        "github",
+        "gitlab",
+        "gitlab_internal",
+        "origin"
+      ],
+      "type": "string"
     },
     "repo_connection_uuid": {
-      "$ref": "#/$defs/builds_repo_connection_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "repo_id": {
-      "$ref": "#/$defs/builds_repo_id"
+      "type": "string"
     },
     "repo_name": {
-      "$ref": "#/$defs/builds_repo_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -2895,19 +2736,20 @@ export const builds_UpsertRepoConnectionResponse_output: JsonSchema = {
 /**
  * The schema of `builds_WorkerBuildSettings` in responses.
  */
-export const builds_WorkerBuildSettings_output: JsonSchema = {
+export const builds_WorkerBuildSettings: JsonSchema = {
   "properties": {
     "build_caching_enabled": {
-      "$ref": "#/$defs/builds_build_caching_enabled"
+      "type": "boolean"
     },
     "build_command": {
-      "$ref": "#/$defs/builds_build_command"
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid"
+      "format": "uuid",
+      "type": "string"
     },
     "deploy_command": {
-      "$ref": "#/$defs/builds_deploy_command"
+      "type": "string"
     },
     "environment_variables": {
       "$ref": "#/$defs/builds_EnvironmentVariablesResponse"
@@ -2929,7 +2771,7 @@ export const builds_WorkerBuildSettings_output: JsonSchema = {
       ]
     },
     "root_directory": {
-      "$ref": "#/$defs/builds_root_directory"
+      "type": "string"
     }
   },
   "type": "object"
@@ -2938,7 +2780,7 @@ export const builds_WorkerBuildSettings_output: JsonSchema = {
 /**
  * The schema of `builds_WorkerGitRepository` in responses.
  */
-export const builds_WorkerGitRepository_output: JsonSchema = {
+export const builds_WorkerGitRepository: JsonSchema = {
   "properties": {
     "branch": {
       "type": "string"
@@ -2954,19 +2796,25 @@ export const builds_WorkerGitRepository_output: JsonSchema = {
       ]
     },
     "provider_account_id": {
-      "$ref": "#/$defs/builds_provider_account_id"
+      "type": "string"
     },
     "provider_account_name": {
-      "$ref": "#/$defs/builds_provider_account_name"
+      "type": "string"
     },
     "provider_type": {
-      "$ref": "#/$defs/builds_SCMProviderType"
+      "enum": [
+        "github",
+        "gitlab",
+        "gitlab_internal",
+        "origin"
+      ],
+      "type": "string"
     },
     "repo_id": {
-      "$ref": "#/$defs/builds_repo_id"
+      "type": "string"
     },
     "repo_name": {
-      "$ref": "#/$defs/builds_repo_name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -2975,7 +2823,7 @@ export const builds_WorkerGitRepository_output: JsonSchema = {
 /**
  * The schema of `builds_WorkerResponse` in responses.
  */
-export const builds_WorkerResponse_output: JsonSchema = {
+export const builds_WorkerResponse: JsonSchema = {
   "properties": {
     "git_repository": {
       "$ref": "#/$defs/builds_WorkerGitRepository"
@@ -2990,23 +2838,16 @@ export const builds_WorkerResponse_output: JsonSchema = {
       "$ref": "#/$defs/builds_WorkerBuildSettings"
     },
     "script_tag": {
-      "$ref": "#/$defs/builds_external_script_id"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `builds_branch` in responses.
- */
-export const builds_branch_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `builds_branch_excludes` in responses.
  */
-export const builds_branch_excludes_output: JsonSchema = {
+export const builds_branch_excludes: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -3016,120 +2857,17 @@ export const builds_branch_excludes_output: JsonSchema = {
 /**
  * The schema of `builds_branch_includes` in responses.
  */
-export const builds_branch_includes_output: JsonSchema = {
+export const builds_branch_includes: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `builds_build_caching_enabled` in responses.
- */
-export const builds_build_caching_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `builds_build_command` in responses.
- */
-export const builds_build_command_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_build_token_name` in responses.
- */
-export const builds_build_token_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_build_token_uuid` in responses.
- */
-export const builds_build_token_uuid_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_build_uuid` in responses.
- */
-export const builds_build_uuid_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_commit_hash` in responses.
- */
-export const builds_commit_hash_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_created_on` in responses.
- */
-export const builds_created_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_deleted_on` in responses.
- */
-export const builds_deleted_on_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `builds_deploy_command` in responses.
- */
-export const builds_deploy_command_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_deploy_hook_name` in responses.
- */
-export const builds_deploy_hook_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_external_script_id` in responses.
- */
-export const builds_external_script_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_is_secret` in responses.
- */
-export const builds_is_secret_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `builds_modified_on` in responses.
- */
-export const builds_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `builds_path_excludes` in responses.
  */
-export const builds_path_excludes_output: JsonSchema = {
+export const builds_path_excludes: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -3139,90 +2877,17 @@ export const builds_path_excludes_output: JsonSchema = {
 /**
  * The schema of `builds_path_includes` in responses.
  */
-export const builds_path_includes_output: JsonSchema = {
+export const builds_path_includes: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `builds_provider_account_id` in responses.
- */
-export const builds_provider_account_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_provider_account_name` in responses.
- */
-export const builds_provider_account_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_repo_connection_uuid` in responses.
- */
-export const builds_repo_connection_uuid_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_repo_id` in responses.
- */
-export const builds_repo_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_repo_name` in responses.
- */
-export const builds_repo_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_root_directory` in responses.
- */
-export const builds_root_directory_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_stopped_on` in responses.
- */
-export const builds_stopped_on_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `builds_trigger_name` in responses.
- */
-export const builds_trigger_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_trigger_uuid` in responses.
- */
-export const builds_trigger_uuid_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `cache-settings_api-response-common` in responses.
  */
-export const cache_settings_api_response_common_output: JsonSchema = {
+export const cache$$settings_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cache-settings_messages"
@@ -3248,7 +2913,7 @@ export const cache_settings_api_response_common_output: JsonSchema = {
 /**
  * The schema of `cache-settings_api-response-common-failure` in responses.
  */
-export const cache_settings_api_response_common_failure_output: JsonSchema = {
+export const cache$$settings_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cache-settings_messages"
@@ -3278,7 +2943,7 @@ export const cache_settings_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `cache-settings_base` in responses.
  */
-export const cache_settings_base_output: JsonSchema = {
+export const cache$$settings_base: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -3301,17 +2966,10 @@ export const cache_settings_base_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cache-settings_editable` in responses.
- */
-export const cache_settings_editable_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `cache-settings_messages` in responses.
  */
-export const cache_settings_messages_output: JsonSchema = {
+export const cache$$settings_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -3330,30 +2988,23 @@ export const cache_settings_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `cache-settings_modified_on` in responses.
- */
-export const cache_settings_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `cache-settings_result-object` in responses.
  */
-export const cache_settings_result_object_output: JsonSchema = {
+export const cache$$settings_result$$object: JsonSchema = {
   "properties": {
     "editable": {
-      "$ref": "#/$defs/cache-settings_editable"
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/cache-settings_setting_id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/cache-settings_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/cache-settings_setting_value"
+      "type": "string"
     }
   },
   "required": [
@@ -3367,16 +3018,17 @@ export const cache_settings_result_object_output: JsonSchema = {
 /**
  * The schema of `cache-settings_result-object-delete` in responses.
  */
-export const cache_settings_result_object_delete_output: JsonSchema = {
+export const cache$$settings_result$$object$$delete: JsonSchema = {
   "properties": {
     "editable": {
-      "$ref": "#/$defs/cache-settings_editable"
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/cache-settings_setting_id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/cache-settings_modified_on"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "required": [
@@ -3386,25 +3038,11 @@ export const cache_settings_result_object_delete_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cache-settings_setting_id` in responses.
- */
-export const cache_settings_setting_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `cache-settings_setting_value` in responses.
- */
-export const cache_settings_setting_value_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `cache-settings_zone_cache_settings_delete_response_single` in
  * responses.
  */
-export const cache_settings_zone_cache_settings_delete_response_single_output: JsonSchema = {
+export const cache$$settings_zone_cache_settings_delete_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_api-response-common"
@@ -3424,7 +3062,7 @@ export const cache_settings_zone_cache_settings_delete_response_single_output: J
  * The schema of `cache-settings_zone_cache_settings_response_single` in
  * responses.
  */
-export const cache_settings_zone_cache_settings_response_single_output: JsonSchema = {
+export const cache$$settings_zone_cache_settings_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_api-response-common"
@@ -3443,7 +3081,7 @@ export const cache_settings_zone_cache_settings_response_single_output: JsonSche
 /**
  * The schema of `dns-custom-nameservers_api-response-collection` in responses.
  */
-export const dns_custom_nameservers_api_response_collection_output: JsonSchema = {
+export const dns$$custom$$nameservers_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-custom-nameservers_api-response-common"
@@ -3479,7 +3117,7 @@ export const dns_custom_nameservers_api_response_collection_output: JsonSchema =
 /**
  * The schema of `dns-custom-nameservers_api-response-common` in responses.
  */
-export const dns_custom_nameservers_api_response_common_output: JsonSchema = {
+export const dns$$custom$$nameservers_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-custom-nameservers_messages"
@@ -3506,7 +3144,7 @@ export const dns_custom_nameservers_api_response_common_output: JsonSchema = {
  * The schema of `dns-custom-nameservers_api-response-common-failure` in
  * responses.
  */
-export const dns_custom_nameservers_api_response_common_failure_output: JsonSchema = {
+export const dns$$custom$$nameservers_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-custom-nameservers_messages"
@@ -3536,7 +3174,7 @@ export const dns_custom_nameservers_api_response_common_failure_output: JsonSche
 /**
  * The schema of `dns-custom-nameservers_api-response-single` in responses.
  */
-export const dns_custom_nameservers_api_response_single_output: JsonSchema = {
+export const dns$$custom$$nameservers_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dns-custom-nameservers_messages"
@@ -3559,17 +3197,10 @@ export const dns_custom_nameservers_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-custom-nameservers_identifier-2` in responses.
- */
-export const dns_custom_nameservers_identifier_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dns-custom-nameservers_messages` in responses.
  */
-export const dns_custom_nameservers_messages_output: JsonSchema = {
+export const dns$$custom$$nameservers_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -3599,24 +3230,10 @@ export const dns_custom_nameservers_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `dns-custom-nameservers_ns_name` in responses.
- */
-export const dns_custom_nameservers_ns_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `dns-custom-nameservers_ns_set` in responses.
- */
-export const dns_custom_nameservers_ns_set_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `email_api-response-collection` in responses.
  */
-export const email_api_response_collection_output: JsonSchema = {
+export const email_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-common"
@@ -3652,7 +3269,7 @@ export const email_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `email_api-response-common` in responses.
  */
-export const email_api_response_common_output: JsonSchema = {
+export const email_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/email_messages"
@@ -3678,7 +3295,7 @@ export const email_api_response_common_output: JsonSchema = {
 /**
  * The schema of `email_api-response-single` in responses.
  */
-export const email_api_response_single_output: JsonSchema = {
+export const email_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/email_messages"
@@ -3701,18 +3318,10 @@ export const email_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `email_created` in responses.
- */
-export const email_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `email_dns_record` in responses.
  */
-export const email_dns_record_output: JsonSchema = {
+export const email_dns_record: JsonSchema = {
   "properties": {
     "content": {
       "type": "string"
@@ -3766,7 +3375,7 @@ export const email_dns_record_output: JsonSchema = {
 /**
  * The schema of `email_dns_settings_response_collection` in responses.
  */
-export const email_dns_settings_response_collection_output: JsonSchema = {
+export const email_dns_settings_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/email_api-response-collection"
@@ -3785,17 +3394,10 @@ export const email_dns_settings_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `email_identifier` in responses.
- */
-export const email_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `email_messages` in responses.
  */
-export const email_messages_output: JsonSchema = {
+export const email_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -3820,23 +3422,15 @@ export const email_messages_output: JsonSchema = {
       "code",
       "message"
     ],
-    "type": "object"
-  },
-  "type": "array"
-};
-
-/**
- * The schema of `email_modified` in responses.
- */
-export const email_modified_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
+    "type": "object"
+  },
+  "type": "array"
 };
 
 /**
  * The schema of `firewall_api-response-collection` in responses.
  */
-export const firewall_api_response_collection_output: JsonSchema = {
+export const firewall_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-common"
@@ -3868,7 +3462,7 @@ export const firewall_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `firewall_api-response-common` in responses.
  */
-export const firewall_api_response_common_output: JsonSchema = {
+export const firewall_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/firewall_messages"
@@ -3911,7 +3505,7 @@ export const firewall_api_response_common_output: JsonSchema = {
 /**
  * The schema of `firewall_api-response-common-failure` in responses.
  */
-export const firewall_api_response_common_failure_output: JsonSchema = {
+export const firewall_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/firewall_messages"
@@ -3941,7 +3535,7 @@ export const firewall_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `firewall_api-response-single` in responses.
  */
-export const firewall_api_response_single_output: JsonSchema = {
+export const firewall_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-common"
@@ -3970,7 +3564,7 @@ export const firewall_api_response_single_output: JsonSchema = {
 /**
  * The schema of `firewall_asn_configuration` in responses.
  */
-export const firewall_asn_configuration_output: JsonSchema = {
+export const firewall_asn_configuration: JsonSchema = {
   "properties": {
     "target": {
       "enum": [
@@ -3988,7 +3582,7 @@ export const firewall_asn_configuration_output: JsonSchema = {
 /**
  * The schema of `firewall_cidr_configuration` in responses.
  */
-export const firewall_cidr_configuration_output: JsonSchema = {
+export const firewall_cidr_configuration: JsonSchema = {
   "properties": {
     "target": {
       "enum": [
@@ -4006,7 +3600,7 @@ export const firewall_cidr_configuration_output: JsonSchema = {
 /**
  * The schema of `firewall_configuration` in responses.
  */
-export const firewall_configuration_output: JsonSchema = {
+export const firewall_configuration: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/firewall_ip_configuration"
@@ -4029,7 +3623,7 @@ export const firewall_configuration_output: JsonSchema = {
 /**
  * The schema of `firewall_country_configuration` in responses.
  */
-export const firewall_country_configuration_output: JsonSchema = {
+export const firewall_country_configuration: JsonSchema = {
   "properties": {
     "target": {
       "enum": [
@@ -4047,7 +3641,7 @@ export const firewall_country_configuration_output: JsonSchema = {
 /**
  * The schema of `firewall_ip_configuration` in responses.
  */
-export const firewall_ip_configuration_output: JsonSchema = {
+export const firewall_ip_configuration: JsonSchema = {
   "properties": {
     "target": {
       "enum": [
@@ -4065,7 +3659,7 @@ export const firewall_ip_configuration_output: JsonSchema = {
 /**
  * The schema of `firewall_ipv6_configuration` in responses.
  */
-export const firewall_ipv6_configuration_output: JsonSchema = {
+export const firewall_ipv6_configuration: JsonSchema = {
   "properties": {
     "target": {
       "enum": [
@@ -4083,7 +3677,7 @@ export const firewall_ipv6_configuration_output: JsonSchema = {
 /**
  * The schema of `firewall_messages` in responses.
  */
-export const firewall_messages_output: JsonSchema = {
+export const firewall_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -4102,17 +3696,10 @@ export const firewall_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `firewall_notes` in responses.
- */
-export const firewall_notes_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_result_info` in responses.
  */
-export const firewall_result_info_output: JsonSchema = {
+export const firewall_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -4133,11 +3720,18 @@ export const firewall_result_info_output: JsonSchema = {
 /**
  * The schema of `firewall_rule` in responses.
  */
-export const firewall_rule_output: JsonSchema = {
+export const firewall_rule: JsonSchema = {
   "properties": {
     "allowed_modes": {
       "items": {
-        "$ref": "#/$defs/firewall_schemas-mode"
+        "enum": [
+          "block",
+          "challenge",
+          "whitelist",
+          "js_challenge",
+          "managed_challenge"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
@@ -4149,17 +3743,24 @@ export const firewall_rule_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/firewall_schemas-identifier"
+      "type": "string"
     },
     "mode": {
-      "$ref": "#/$defs/firewall_schemas-mode"
+      "enum": [
+        "block",
+        "challenge",
+        "whitelist",
+        "js_challenge",
+        "managed_challenge"
+      ],
+      "type": "string"
     },
     "modified_on": {
       "format": "date-time",
       "type": "string"
     },
     "notes": {
-      "$ref": "#/$defs/firewall_notes"
+      "type": "string"
     }
   },
   "required": [
@@ -4171,53 +3772,10 @@ export const firewall_rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `firewall_schemas-identifier` in responses.
- */
-export const firewall_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_schemas-mode` in responses.
- */
-export const firewall_schemas_mode_output: JsonSchema = {
-  "enum": [
-    "block",
-    "challenge",
-    "whitelist",
-    "js_challenge",
-    "managed_challenge"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_access` in responses.
- */
-export const iam_access_output: JsonSchema = {
-  "enum": [
-    "allow",
-    "deny"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_account-type` in responses.
- */
-export const iam_account_type_output: JsonSchema = {
-  "enum": [
-    "standard",
-    "enterprise"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `iam_api-response-collection` in responses.
  */
-export const iam_api_response_collection_output: JsonSchema = {
+export const iam_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-common"
@@ -4236,7 +3794,7 @@ export const iam_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `iam_api-response-common` in responses.
  */
-export const iam_api_response_common_output: JsonSchema = {
+export const iam_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/iam_messages-2"
@@ -4262,7 +3820,7 @@ export const iam_api_response_common_output: JsonSchema = {
 /**
  * The schema of `iam_api-response-common-failure` in responses.
  */
-export const iam_api_response_common_failure_output: JsonSchema = {
+export const iam_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/iam_messages-2"
@@ -4292,7 +3850,7 @@ export const iam_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `iam_api-response-single` in responses.
  */
-export const iam_api_response_single_output: JsonSchema = {
+export const iam_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/iam_messages-2"
@@ -4318,7 +3876,7 @@ export const iam_api_response_single_output: JsonSchema = {
 /**
  * The schema of `iam_api-response-single-id` in responses.
  */
-export const iam_api_response_single_id_output: JsonSchema = {
+export const iam_api$$response$$single$$id: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-common"
@@ -4330,7 +3888,7 @@ export const iam_api_response_single_id_output: JsonSchema = {
             {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/iam_common_components-schemas-identifier"
+                  "type": "string"
                 }
               },
               "required": [
@@ -4352,7 +3910,7 @@ export const iam_api_response_single_id_output: JsonSchema = {
 /**
  * The schema of `iam_cidr_list` in responses.
  */
-export const iam_cidr_list_output: JsonSchema = {
+export const iam_cidr_list: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -4362,7 +3920,7 @@ export const iam_cidr_list_output: JsonSchema = {
 /**
  * The schema of `iam_collection_tokens_response` in responses.
  */
-export const iam_collection_tokens_response_output: JsonSchema = {
+export const iam_collection_tokens_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -4381,17 +3939,10 @@ export const iam_collection_tokens_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `iam_common_components-schemas-identifier` in responses.
- */
-export const iam_common_components_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_condition` in responses.
  */
-export const iam_condition_output: JsonSchema = {
+export const iam_condition: JsonSchema = {
   "properties": {
     "request_ip": {
       "$ref": "#/$defs/iam_request_ip"
@@ -4400,57 +3951,10 @@ export const iam_condition_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_creator_email_at_creation` in responses.
- */
-export const iam_creator_email_at_creation_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `iam_effect` in responses.
- */
-export const iam_effect_output: JsonSchema = {
-  "enum": [
-    "allow",
-    "deny"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_email` in responses.
- */
-export const iam_email_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `iam_expires_on` in responses.
- */
-export const iam_expires_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `iam_first_name` in responses.
- */
-export const iam_first_name_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `iam_grants` in responses.
  */
-export const iam_grants_output: JsonSchema = {
+export const iam_grants: JsonSchema = {
   "properties": {
     "read": {
       "type": "boolean"
@@ -4462,46 +3966,20 @@ export const iam_grants_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_issued_on` in responses.
- */
-export const iam_issued_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `iam_last_name` in responses.
- */
-export const iam_last_name_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `iam_last_used_on` in responses.
- */
-export const iam_last_used_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_list_member_policy` in responses.
  */
-export const iam_list_member_policy_output: JsonSchema = {
+export const iam_list_member_policy: JsonSchema = {
   "properties": {
     "access": {
-      "$ref": "#/$defs/iam_access"
+      "enum": [
+        "allow",
+        "deny"
+      ],
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_policy_identifier"
+      "type": "string"
     },
     "permission_groups": {
       "$ref": "#/$defs/iam_permission_groups"
@@ -4513,17 +3991,10 @@ export const iam_list_member_policy_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_membership_components-schemas-identifier` in responses.
- */
-export const iam_membership_components_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_messages-2` in responses.
  */
-export const iam_messages_2_output: JsonSchema = {
+export const iam_messages$$2: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -4553,33 +4024,10 @@ export const iam_messages_2_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `iam_modified_on` in responses.
- */
-export const iam_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `iam_name` in responses.
- */
-export const iam_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `iam_not_before` in responses.
- */
-export const iam_not_before_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_permission_group` in responses.
  */
-export const iam_permission_group_output: JsonSchema = {
+export const iam_permission_group: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -4627,7 +4075,7 @@ export const iam_permission_group_output: JsonSchema = {
 /**
  * The schema of `iam_permission_groups` in responses.
  */
-export const iam_permission_groups_output: JsonSchema = {
+export const iam_permission_groups: JsonSchema = {
   "items": {
     "$ref": "#/$defs/iam_permission_group"
   },
@@ -4637,7 +4085,7 @@ export const iam_permission_groups_output: JsonSchema = {
 /**
  * The schema of `iam_permissions` in responses.
  */
-export const iam_permissions_output: JsonSchema = {
+export const iam_permissions: JsonSchema = {
   "properties": {
     "analytics": {
       "$ref": "#/$defs/iam_grants"
@@ -4682,7 +4130,7 @@ export const iam_permissions_output: JsonSchema = {
 /**
  * The schema of `iam_permissions_group_response_collection` in responses.
  */
-export const iam_permissions_group_response_collection_output: JsonSchema = {
+export const iam_permissions_group_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -4742,23 +4190,20 @@ export const iam_permissions_group_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `iam_policy_identifier` in responses.
- */
-export const iam_policy_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_policy_with_permission_groups_and_resources` in responses.
  */
-export const iam_policy_with_permission_groups_and_resources_output: JsonSchema = {
+export const iam_policy_with_permission_groups_and_resources: JsonSchema = {
   "properties": {
     "effect": {
-      "$ref": "#/$defs/iam_effect"
+      "enum": [
+        "allow",
+        "deny"
+      ],
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_policy_identifier"
+      "type": "string"
     },
     "permission_groups": {
       "$ref": "#/$defs/iam_permission_groups"
@@ -4776,31 +4221,10 @@ export const iam_policy_with_permission_groups_and_resources_output: JsonSchema
   "type": "object"
 };
 
-/**
- * The schema of `iam_provisioner_id` in responses.
- */
-export const iam_provisioner_id_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `iam_provisioner_type` in responses.
- */
-export const iam_provisioner_type_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_request_ip` in responses.
  */
-export const iam_request_ip_output: JsonSchema = {
+export const iam_request_ip: JsonSchema = {
   "properties": {
     "in": {
       "$ref": "#/$defs/iam_cidr_list"
@@ -4815,7 +4239,7 @@ export const iam_request_ip_output: JsonSchema = {
 /**
  * The schema of `iam_resource_group` in responses.
  */
-export const iam_resource_group_output: JsonSchema = {
+export const iam_resource_group: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -4848,7 +4272,7 @@ export const iam_resource_group_output: JsonSchema = {
 /**
  * The schema of `iam_resource_groups` in responses.
  */
-export const iam_resource_groups_output: JsonSchema = {
+export const iam_resource_groups: JsonSchema = {
   "items": {
     "$ref": "#/$defs/iam_resource_group"
   },
@@ -4858,7 +4282,7 @@ export const iam_resource_groups_output: JsonSchema = {
 /**
  * The schema of `iam_resources` in responses.
  */
-export const iam_resources_output: JsonSchema = {
+export const iam_resources: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/iam_resources_type_object_string"
@@ -4872,7 +4296,7 @@ export const iam_resources_output: JsonSchema = {
 /**
  * The schema of `iam_resources_type_object_nested` in responses.
  */
-export const iam_resources_type_object_nested_output: JsonSchema = {
+export const iam_resources_type_object_nested: JsonSchema = {
   "additionalProperties": {
     "additionalProperties": {
       "type": "string"
@@ -4885,7 +4309,7 @@ export const iam_resources_type_object_nested_output: JsonSchema = {
 /**
  * The schema of `iam_resources_type_object_string` in responses.
  */
-export const iam_resources_type_object_string_output: JsonSchema = {
+export const iam_resources_type_object_string: JsonSchema = {
   "additionalProperties": {
     "type": "string"
   },
@@ -4895,7 +4319,7 @@ export const iam_resources_type_object_string_output: JsonSchema = {
 /**
  * The schema of `iam_response_single_value` in responses.
  */
-export const iam_response_single_value_output: JsonSchema = {
+export const iam_response_single_value: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -4903,7 +4327,7 @@ export const iam_response_single_value_output: JsonSchema = {
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/iam_value"
+          "type": "string"
         }
       },
       "type": "object"
@@ -4914,7 +4338,7 @@ export const iam_response_single_value_output: JsonSchema = {
 /**
  * The schema of `iam_result_info` in responses.
  */
-export const iam_result_info_output: JsonSchema = {
+export const iam_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -4935,11 +4359,9 @@ export const iam_result_info_output: JsonSchema = {
 /**
  * The schema of `iam_scope` in responses.
  */
-export const iam_scope_output: JsonSchema = {
+export const iam_scope: JsonSchema = {
   "properties": {
-    "key": {
-      "$ref": "#/$defs/iam_scope_key"
-    },
+    "key": {},
     "objects": {
       "items": {
         "$ref": "#/$defs/iam_scope_object"
@@ -4954,19 +4376,12 @@ export const iam_scope_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_scope_key` in responses.
- */
-export const iam_scope_key_output: JsonSchema = {};
-
 /**
  * The schema of `iam_scope_object` in responses.
  */
-export const iam_scope_object_output: JsonSchema = {
+export const iam_scope_object: JsonSchema = {
   "properties": {
-    "key": {
-      "$ref": "#/$defs/iam_scope_object_key"
-    }
+    "key": {}
   },
   "required": [
     "key"
@@ -4974,15 +4389,10 @@ export const iam_scope_object_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_scope_object_key` in responses.
- */
-export const iam_scope_object_key_output: JsonSchema = {};
-
 /**
  * The schema of `iam_single_token_create_response` in responses.
  */
-export const iam_single_token_create_response_output: JsonSchema = {
+export const iam_single_token_create_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -5001,7 +4411,7 @@ export const iam_single_token_create_response_output: JsonSchema = {
 /**
  * The schema of `iam_single_token_response` in responses.
  */
-export const iam_single_token_response_output: JsonSchema = {
+export const iam_single_token_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -5020,104 +4430,88 @@ export const iam_single_token_response_output: JsonSchema = {
 /**
  * The schema of `iam_token_base` in responses.
  */
-export const iam_token_base_output: JsonSchema = {
+export const iam_token_base: JsonSchema = {
   "properties": {
     "condition": {
       "$ref": "#/$defs/iam_condition"
     },
     "creator_email_at_creation": {
-      "$ref": "#/$defs/iam_creator_email_at_creation"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/iam_expires_on"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_token_identifier"
+      "type": "string"
     },
     "issued_on": {
-      "$ref": "#/$defs/iam_issued_on"
+      "format": "date-time",
+      "type": "string"
     },
     "last_used_on": {
-      "$ref": "#/$defs/iam_last_used_on"
+      "format": "date-time",
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/iam_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/iam_name"
+      "type": "string"
     },
     "not_before": {
-      "$ref": "#/$defs/iam_not_before"
+      "format": "date-time",
+      "type": "string"
     },
     "policies": {
       "$ref": "#/$defs/iam_token_policies"
     },
     "provisioner_id": {
-      "$ref": "#/$defs/iam_provisioner_id"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "provisioner_type": {
-      "$ref": "#/$defs/iam_provisioner_type"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/iam_token_status"
+      "enum": [
+        "active",
+        "disabled",
+        "expired"
+      ],
+      "type": "string"
     },
     "token_prefix": {
-      "$ref": "#/$defs/iam_token_prefix"
+      "type": "string"
     },
     "token_suffix": {
-      "$ref": "#/$defs/iam_token_suffix"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `iam_token_identifier` in responses.
- */
-export const iam_token_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_token_policies` in responses.
  */
-export const iam_token_policies_output: JsonSchema = {
+export const iam_token_policies: JsonSchema = {
   "items": {
     "$ref": "#/$defs/iam_policy_with_permission_groups_and_resources"
   },
   "type": "array"
 };
 
-/**
- * The schema of `iam_token_prefix` in responses.
- */
-export const iam_token_prefix_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `iam_token_status` in responses.
- */
-export const iam_token_status_output: JsonSchema = {
-  "enum": [
-    "active",
-    "disabled",
-    "expired"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_token_suffix` in responses.
- */
-export const iam_token_suffix_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_token_verify_response_single_segment` in responses.
  */
-export const iam_token_verify_response_single_segment_output: JsonSchema = {
+export const iam_token_verify_response_single_segment: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -5127,16 +4521,23 @@ export const iam_token_verify_response_single_segment_output: JsonSchema = {
         "result": {
           "properties": {
             "expires_on": {
-              "$ref": "#/$defs/iam_expires_on"
+              "format": "date-time",
+              "type": "string"
             },
             "id": {
-              "$ref": "#/$defs/iam_token_identifier"
+              "type": "string"
             },
             "not_before": {
-              "$ref": "#/$defs/iam_not_before"
+              "format": "date-time",
+              "type": "string"
             },
             "status": {
-              "$ref": "#/$defs/iam_token_status"
+              "enum": [
+                "active",
+                "disabled",
+                "expired"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -5154,7 +4555,7 @@ export const iam_token_verify_response_single_segment_output: JsonSchema = {
 /**
  * The schema of `iam_token_with_value` in responses.
  */
-export const iam_token_with_value_output: JsonSchema = {
+export const iam_token_with_value: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_token_base"
@@ -5162,7 +4563,7 @@ export const iam_token_with_value_output: JsonSchema = {
     {
       "properties": {
         "value": {
-          "$ref": "#/$defs/iam_value"
+          "type": "string"
         }
       },
       "type": "object"
@@ -5170,24 +4571,10 @@ export const iam_token_with_value_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `iam_two_factor_authentication_enabled` in responses.
- */
-export const iam_two_factor_authentication_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `iam_value` in responses.
- */
-export const iam_value_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `infra_api-response-collection` in responses.
  */
-export const infra_api_response_collection_output: JsonSchema = {
+export const infra_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/infra_api-response-common"
@@ -5223,7 +4610,7 @@ export const infra_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `infra_api-response-common` in responses.
  */
-export const infra_api_response_common_output: JsonSchema = {
+export const infra_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/infra_messages"
@@ -5249,7 +4636,7 @@ export const infra_api_response_common_output: JsonSchema = {
 /**
  * The schema of `infra_api-response-common-failure` in responses.
  */
-export const infra_api_response_common_failure_output: JsonSchema = {
+export const infra_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/infra_messages"
@@ -5279,7 +4666,7 @@ export const infra_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `infra_api-response-single` in responses.
  */
-export const infra_api_response_single_output: JsonSchema = {
+export const infra_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/infra_messages"
@@ -5305,7 +4692,7 @@ export const infra_api_response_single_output: JsonSchema = {
 /**
  * The schema of `infra_messages` in responses.
  */
-export const infra_messages_output: JsonSchema = {
+export const infra_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -5338,32 +4725,18 @@ export const infra_messages_output: JsonSchema = {
 /**
  * The schema of `load-balancing_Host` in responses.
  */
-export const load_balancing_Host_output: JsonSchema = {
+export const load$$balancing_Host: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_address` in responses.
- */
-export const load_balancing_address_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_allow_insecure` in responses.
- */
-export const load_balancing_allow_insecure_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_api-paginated-response-collection` in
  * responses.
  */
-export const load_balancing_api_paginated_response_collection_output: JsonSchema = {
+export const load$$balancing_api$$paginated$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-common"
@@ -5382,7 +4755,7 @@ export const load_balancing_api_paginated_response_collection_output: JsonSchema
 /**
  * The schema of `load-balancing_api-response-common` in responses.
  */
-export const load_balancing_api_response_common_output: JsonSchema = {
+export const load$$balancing_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/load-balancing_messages"
@@ -5408,7 +4781,7 @@ export const load_balancing_api_response_common_output: JsonSchema = {
 /**
  * The schema of `load-balancing_api-response-common-failure` in responses.
  */
-export const load_balancing_api_response_common_failure_output: JsonSchema = {
+export const load$$balancing_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/load-balancing_messages"
@@ -5438,7 +4811,7 @@ export const load_balancing_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `load-balancing_api-response-single` in responses.
  */
-export const load_balancing_api_response_single_output: JsonSchema = {
+export const load$$balancing_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-common"
@@ -5467,7 +4840,7 @@ export const load_balancing_api_response_single_output: JsonSchema = {
 /**
  * The schema of `load-balancing_check_regions` in responses.
  */
-export const load_balancing_check_regions_output: JsonSchema = {
+export const load$$balancing_check_regions: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -5479,79 +4852,29 @@ export const load_balancing_check_regions_output: JsonSchema = {
           "NSAM",
           "SSAM",
           "OC",
-          "ME",
-          "NAF",
-          "SAF",
-          "SAS",
-          "SEAS",
-          "NEAS",
-          "CHINA",
-          "ALL_REGIONS"
-        ],
-        "type": "string"
-      },
-      "type": "array"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `load-balancing_consecutive_down` in responses.
- */
-export const load_balancing_consecutive_down_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_consecutive_up` in responses.
- */
-export const load_balancing_consecutive_up_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_description` in responses.
- */
-export const load_balancing_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_disabled_at` in responses.
- */
-export const load_balancing_disabled_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_enabled` in responses.
- */
-export const load_balancing_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `load-balancing_expected_body` in responses.
- */
-export const load_balancing_expected_body_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_expected_codes` in responses.
- */
-export const load_balancing_expected_codes_output: JsonSchema = {
-  "type": "string"
+          "ME",
+          "NAF",
+          "SAF",
+          "SAS",
+          "SEAS",
+          "NEAS",
+          "CHINA",
+          "ALL_REGIONS"
+        ],
+        "type": "string"
+      },
+      "type": "array"
+    },
+    {
+      "type": "null"
+    }
+  ]
 };
 
 /**
  * The schema of `load-balancing_filter_options` in responses.
  */
-export const load_balancing_filter_options_output: JsonSchema = {
+export const load$$balancing_filter_options: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -5584,17 +4907,10 @@ export const load_balancing_filter_options_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_follow_redirects` in responses.
- */
-export const load_balancing_follow_redirects_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_header` in responses.
  */
-export const load_balancing_header_output: JsonSchema = {
+export const load$$balancing_header: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -5607,7 +4923,7 @@ export const load_balancing_header_output: JsonSchema = {
 /**
  * The schema of `load-balancing_health_details` in responses.
  */
-export const load_balancing_health_details_output: JsonSchema = {
+export const load$$balancing_health_details: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -5645,7 +4961,7 @@ export const load_balancing_health_details_output: JsonSchema = {
 /**
  * The schema of `load-balancing_health_sources` in responses.
  */
-export const load_balancing_health_sources_output: JsonSchema = {
+export const load$$balancing_health_sources: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -5667,7 +4983,7 @@ export const load_balancing_health_sources_output: JsonSchema = {
 /**
  * The schema of `load-balancing_id_response` in responses.
  */
-export const load_balancing_id_response_output: JsonSchema = {
+export const load$$balancing_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -5677,7 +4993,7 @@ export const load_balancing_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/load-balancing_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -5688,31 +5004,10 @@ export const load_balancing_id_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_identifier` in responses.
- */
-export const load_balancing_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_interval` in responses.
- */
-export const load_balancing_interval_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_latitude` in responses.
- */
-export const load_balancing_latitude_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `load-balancing_load_shedding` in responses.
  */
-export const load_balancing_load_shedding_output: JsonSchema = {
+export const load$$balancing_load_shedding: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -5744,17 +5039,10 @@ export const load_balancing_load_shedding_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_longitude` in responses.
- */
-export const load_balancing_longitude_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `load-balancing_messages` in responses.
  */
-export const load_balancing_messages_output: JsonSchema = {
+export const load$$balancing_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -5773,24 +5061,10 @@ export const load_balancing_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_method` in responses.
- */
-export const load_balancing_method_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_minimum_origins` in responses.
- */
-export const load_balancing_minimum_origins_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `load-balancing_monitor` in responses.
  */
-export const load_balancing_monitor_output: JsonSchema = {
+export const load$$balancing_monitor: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_monitor-editable"
@@ -5798,13 +5072,15 @@ export const load_balancing_monitor_output: JsonSchema = {
     {
       "properties": {
         "created_on": {
-          "$ref": "#/$defs/load-balancing_timestamp"
+          "format": "date-time",
+          "type": "string"
         },
         "id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+          "type": "string"
         },
         "modified_on": {
-          "$ref": "#/$defs/load-balancing_timestamp"
+          "format": "date-time",
+          "type": "string"
         }
       },
       "type": "object"
@@ -5815,55 +5091,70 @@ export const load_balancing_monitor_output: JsonSchema = {
 /**
  * The schema of `load-balancing_monitor-editable` in responses.
  */
-export const load_balancing_monitor_editable_output: JsonSchema = {
+export const load$$balancing_monitor$$editable: JsonSchema = {
   "properties": {
     "allow_insecure": {
-      "$ref": "#/$defs/load-balancing_allow_insecure"
+      "type": "boolean"
     },
     "consecutive_down": {
-      "$ref": "#/$defs/load-balancing_consecutive_down"
+      "type": "integer"
     },
     "consecutive_up": {
-      "$ref": "#/$defs/load-balancing_consecutive_up"
+      "type": "integer"
     },
     "description": {
-      "$ref": "#/$defs/load-balancing_description"
+      "type": "string"
     },
     "expected_body": {
-      "$ref": "#/$defs/load-balancing_expected_body"
+      "type": "string"
     },
     "expected_codes": {
-      "$ref": "#/$defs/load-balancing_expected_codes"
+      "type": "string"
     },
     "follow_redirects": {
-      "$ref": "#/$defs/load-balancing_follow_redirects"
+      "type": "boolean"
     },
     "header": {
       "$ref": "#/$defs/load-balancing_header"
     },
     "interval": {
-      "$ref": "#/$defs/load-balancing_interval"
+      "type": "integer"
     },
     "method": {
-      "$ref": "#/$defs/load-balancing_method"
+      "type": "string"
     },
     "path": {
-      "$ref": "#/$defs/load-balancing_path"
+      "type": "string"
     },
     "port": {
-      "$ref": "#/$defs/load-balancing_port"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "probe_zone": {
-      "$ref": "#/$defs/load-balancing_probe_zone"
+      "type": "string"
     },
     "retries": {
-      "$ref": "#/$defs/load-balancing_retries"
+      "type": "integer"
     },
     "timeout": {
-      "$ref": "#/$defs/load-balancing_timeout"
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/load-balancing_type"
+      "enum": [
+        "http",
+        "https",
+        "tcp",
+        "udp_icmp",
+        "icmp_ping",
+        "smtp"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -5872,7 +5163,7 @@ export const load_balancing_monitor_editable_output: JsonSchema = {
 /**
  * The schema of `load-balancing_monitor-references-response` in responses.
  */
-export const load_balancing_monitor_references_response_output: JsonSchema = {
+export const load$$balancing_monitor$$references$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-common"
@@ -5913,7 +5204,7 @@ export const load_balancing_monitor_references_response_output: JsonSchema = {
 /**
  * The schema of `load-balancing_monitor-response-collection` in responses.
  */
-export const load_balancing_monitor_response_collection_output: JsonSchema = {
+export const load$$balancing_monitor$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-paginated-response-collection"
@@ -5935,7 +5226,7 @@ export const load_balancing_monitor_response_collection_output: JsonSchema = {
 /**
  * The schema of `load-balancing_monitor-response-single` in responses.
  */
-export const load_balancing_monitor_response_single_output: JsonSchema = {
+export const load$$balancing_monitor$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -5951,48 +5242,20 @@ export const load_balancing_monitor_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_monitor_group_id` in responses.
- */
-export const load_balancing_monitor_group_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_monitor_id` in responses.
- */
-export const load_balancing_monitor_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_name` in responses.
- */
-export const load_balancing_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_networks` in responses.
  */
-export const load_balancing_networks_output: JsonSchema = {
+export const load$$balancing_networks: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_notification_email` in responses.
- */
-export const load_balancing_notification_email_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_notification_filter` in responses.
  */
-export const load_balancing_notification_filter_output: JsonSchema = {
+export const load$$balancing_notification_filter: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -6014,34 +5277,35 @@ export const load_balancing_notification_filter_output: JsonSchema = {
 /**
  * The schema of `load-balancing_origin` in responses.
  */
-export const load_balancing_origin_output: JsonSchema = {
+export const load$$balancing_origin: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/load-balancing_address"
+      "type": "string"
     },
     "disabled_at": {
-      "$ref": "#/$defs/load-balancing_disabled_at"
+      "format": "date-time",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/load-balancing_schemas-enabled"
+      "type": "boolean"
     },
     "flatten_cname": {
-      "$ref": "#/$defs/load-balancing_origin_flatten_cname"
+      "type": "boolean"
     },
     "header": {
       "$ref": "#/$defs/load-balancing_schemas-header"
     },
     "name": {
-      "$ref": "#/$defs/load-balancing_schemas-name"
+      "type": "string"
     },
     "port": {
-      "$ref": "#/$defs/load-balancing_origin_port"
+      "type": "integer"
     },
     "virtual_network_id": {
-      "$ref": "#/$defs/load-balancing_virtual_network_id"
+      "type": "string"
     },
     "weight": {
-      "$ref": "#/$defs/load-balancing_weight"
+      "type": "number"
     }
   },
   "type": "object"
@@ -6050,7 +5314,7 @@ export const load_balancing_origin_output: JsonSchema = {
 /**
  * The schema of `load-balancing_origin-health` in responses.
  */
-export const load_balancing_origin_health_output: JsonSchema = {
+export const load$$balancing_origin$$health: JsonSchema = {
   "properties": {
     "ip": {
       "properties": {
@@ -6073,17 +5337,10 @@ export const load_balancing_origin_health_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_origin_flatten_cname` in responses.
- */
-export const load_balancing_origin_flatten_cname_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_origin_health_data` in responses.
  */
-export const load_balancing_origin_health_data_output: JsonSchema = {
+export const load$$balancing_origin_health_data: JsonSchema = {
   "properties": {
     "failure_reason": {
       "type": "string"
@@ -6101,17 +5358,10 @@ export const load_balancing_origin_health_data_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_origin_port` in responses.
- */
-export const load_balancing_origin_port_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `load-balancing_origin_steering` in responses.
  */
-export const load_balancing_origin_steering_output: JsonSchema = {
+export const load$$balancing_origin_steering: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -6136,75 +5386,71 @@ export const load_balancing_origin_steering_output: JsonSchema = {
 /**
  * The schema of `load-balancing_origins` in responses.
  */
-export const load_balancing_origins_output: JsonSchema = {
+export const load$$balancing_origins: JsonSchema = {
   "items": {
     "$ref": "#/$defs/load-balancing_origin"
   },
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_path` in responses.
- */
-export const load_balancing_path_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_pool` in responses.
  */
-export const load_balancing_pool_output: JsonSchema = {
+export const load$$balancing_pool: JsonSchema = {
   "properties": {
     "check_regions": {
       "$ref": "#/$defs/load-balancing_check_regions"
     },
     "created_on": {
-      "$ref": "#/$defs/load-balancing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/load-balancing_schemas-description"
+      "type": "string"
     },
     "disabled_at": {
-      "$ref": "#/$defs/load-balancing_schemas-disabled_at"
+      "format": "date-time",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/load-balancing_enabled"
+      "type": "boolean"
     },
     "health_sources": {
       "$ref": "#/$defs/load-balancing_health_sources"
     },
     "id": {
-      "$ref": "#/$defs/load-balancing_schemas-identifier"
+      "type": "string"
     },
     "latitude": {
-      "$ref": "#/$defs/load-balancing_latitude"
+      "type": "number"
     },
     "load_shedding": {
       "$ref": "#/$defs/load-balancing_load_shedding"
     },
     "longitude": {
-      "$ref": "#/$defs/load-balancing_longitude"
+      "type": "number"
     },
     "minimum_origins": {
-      "$ref": "#/$defs/load-balancing_minimum_origins"
+      "type": "integer"
     },
     "modified_on": {
-      "$ref": "#/$defs/load-balancing_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "monitor": {
-      "$ref": "#/$defs/load-balancing_monitor_id"
+      "type": "string"
     },
     "monitor_group": {
-      "$ref": "#/$defs/load-balancing_monitor_group_id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/load-balancing_name"
+      "type": "string"
     },
     "networks": {
       "$ref": "#/$defs/load-balancing_networks"
     },
     "notification_email": {
-      "$ref": "#/$defs/load-balancing_notification_email"
+      "type": "string"
     },
     "notification_filter": {
       "$ref": "#/$defs/load-balancing_notification_filter"
@@ -6222,7 +5468,7 @@ export const load_balancing_pool_output: JsonSchema = {
 /**
  * The schema of `load-balancing_pools-references-response` in responses.
  */
-export const load_balancing_pools_references_response_output: JsonSchema = {
+export const load$$balancing_pools$$references$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-common"
@@ -6260,24 +5506,10 @@ export const load_balancing_pools_references_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_port` in responses.
- */
-export const load_balancing_port_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `load-balancing_preview_response` in responses.
  */
-export const load_balancing_preview_response_output: JsonSchema = {
+export const load$$balancing_preview_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -6293,7 +5525,7 @@ export const load_balancing_preview_response_output: JsonSchema = {
               "type": "object"
             },
             "preview_id": {
-              "$ref": "#/$defs/load-balancing_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -6307,7 +5539,7 @@ export const load_balancing_preview_response_output: JsonSchema = {
 /**
  * The schema of `load-balancing_preview_result` in responses.
  */
-export const load_balancing_preview_result_output: JsonSchema = {
+export const load$$balancing_preview_result: JsonSchema = {
   "additionalProperties": {
     "properties": {
       "healthy": {
@@ -6331,7 +5563,7 @@ export const load_balancing_preview_result_output: JsonSchema = {
 /**
  * The schema of `load-balancing_preview_result_response` in responses.
  */
-export const load_balancing_preview_result_response_output: JsonSchema = {
+export const load$$balancing_preview_result_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -6347,18 +5579,11 @@ export const load_balancing_preview_result_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_probe_zone` in responses.
- */
-export const load_balancing_probe_zone_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_region_components-schemas-response_collection`
  * in responses.
  */
-export const load_balancing_region_components_schemas_response_collection_output: JsonSchema = {
+export const load$$balancing_region_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -6377,7 +5602,7 @@ export const load_balancing_region_components_schemas_response_collection_output
 /**
  * The schema of `load-balancing_result_info` in responses.
  */
-export const load_balancing_result_info_output: JsonSchema = {
+export const load$$balancing_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -6398,39 +5623,10 @@ export const load_balancing_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_retries` in responses.
- */
-export const load_balancing_retries_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_schemas-description` in responses.
- */
-export const load_balancing_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_schemas-disabled_at` in responses.
- */
-export const load_balancing_schemas_disabled_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_schemas-enabled` in responses.
- */
-export const load_balancing_schemas_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_schemas-header` in responses.
  */
-export const load_balancing_schemas_header_output: JsonSchema = {
+export const load$$balancing_schemas$$header: JsonSchema = {
   "properties": {
     "Host": {
       "$ref": "#/$defs/load-balancing_Host"
@@ -6442,7 +5638,7 @@ export const load_balancing_schemas_header_output: JsonSchema = {
 /**
  * The schema of `load-balancing_schemas-id_response` in responses.
  */
-export const load_balancing_schemas_id_response_output: JsonSchema = {
+export const load$$balancing_schemas$$id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -6452,7 +5648,7 @@ export const load_balancing_schemas_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/load-balancing_schemas-identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -6463,24 +5659,10 @@ export const load_balancing_schemas_id_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_schemas-identifier` in responses.
- */
-export const load_balancing_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_schemas-name` in responses.
- */
-export const load_balancing_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_schemas-response_collection` in responses.
  */
-export const load_balancing_schemas_response_collection_output: JsonSchema = {
+export const load$$balancing_schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-paginated-response-collection"
@@ -6502,7 +5684,7 @@ export const load_balancing_schemas_response_collection_output: JsonSchema = {
 /**
  * The schema of `load-balancing_schemas-single_response` in responses.
  */
-export const load_balancing_schemas_single_response_output: JsonSchema = {
+export const load$$balancing_schemas$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-response-single"
@@ -6518,54 +5700,10 @@ export const load_balancing_schemas_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_timeout` in responses.
- */
-export const load_balancing_timeout_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_timestamp` in responses.
- */
-export const load_balancing_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_type` in responses.
- */
-export const load_balancing_type_output: JsonSchema = {
-  "enum": [
-    "http",
-    "https",
-    "tcp",
-    "udp_icmp",
-    "icmp_ping",
-    "smtp"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_virtual_network_id` in responses.
- */
-export const load_balancing_virtual_network_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_weight` in responses.
- */
-export const load_balancing_weight_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `mconn-telemetry_coded_message` in responses.
  */
-export const mconn_telemetry_coded_message_output: JsonSchema = {
+export const mconn$$telemetry_coded_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "number"
@@ -6584,7 +5722,7 @@ export const mconn_telemetry_coded_message_output: JsonSchema = {
 /**
  * The schema of `mconn-telemetry_envelope` in responses.
  */
-export const mconn_telemetry_envelope_output: JsonSchema = {
+export const mconn$$telemetry_envelope: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -6611,7 +5749,7 @@ export const mconn_telemetry_envelope_output: JsonSchema = {
 /**
  * The schema of `mconn_bad_response` in responses.
  */
-export const mconn_bad_response_output: JsonSchema = {
+export const mconn_bad_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_response"
@@ -6636,7 +5774,7 @@ export const mconn_bad_response_output: JsonSchema = {
 /**
  * The schema of `mconn_coded_message` in responses.
  */
-export const mconn_coded_message_output: JsonSchema = {
+export const mconn_coded_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -6655,7 +5793,7 @@ export const mconn_coded_message_output: JsonSchema = {
 /**
  * The schema of `mconn_good_response` in responses.
  */
-export const mconn_good_response_output: JsonSchema = {
+export const mconn_good_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/mconn_response"
@@ -6677,7 +5815,7 @@ export const mconn_good_response_output: JsonSchema = {
 /**
  * The schema of `mconn_none` in responses.
  */
-export const mconn_none_output: JsonSchema = {
+export const mconn_none: JsonSchema = {
   "oneOf": [
     {
       "type": "object"
@@ -6691,7 +5829,7 @@ export const mconn_none_output: JsonSchema = {
 /**
  * The schema of `mconn_response` in responses.
  */
-export const mconn_response_output: JsonSchema = {
+export const mconn_response: JsonSchema = {
   "properties": {
     "messages": {
       "items": {
@@ -6710,24 +5848,17 @@ export const mconn_response_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `mconn_uuid` in responses.
- */
-export const mconn_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `organizations-api_Organization` in responses.
  */
-export const organizations_api_Organization_output: JsonSchema = {
+export const organizations$$api_Organization: JsonSchema = {
   "properties": {
     "create_time": {
       "format": "date-time",
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/organizations-api_OrganizationID"
+      "type": "string"
     },
     "meta": {
       "additionalProperties": {
@@ -6761,7 +5892,7 @@ export const organizations_api_Organization_output: JsonSchema = {
     "parent": {
       "properties": {
         "id": {
-          "$ref": "#/$defs/organizations-api_OrganizationID"
+          "type": "string"
         },
         "name": {
           "type": "string"
@@ -6789,7 +5920,7 @@ export const organizations_api_Organization_output: JsonSchema = {
 /**
  * The schema of `organizations-api_OrganizationFlags` in responses.
  */
-export const organizations_api_OrganizationFlags_output: JsonSchema = {
+export const organizations$$api_OrganizationFlags: JsonSchema = {
   "properties": {
     "account_creation": {
       "type": "string"
@@ -6829,17 +5960,10 @@ export const organizations_api_OrganizationFlags_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `organizations-api_OrganizationID` in responses.
- */
-export const organizations_api_OrganizationID_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `organizations-api_Profile` in responses.
  */
-export const organizations_api_Profile_output: JsonSchema = {
+export const organizations$$api_Profile: JsonSchema = {
   "properties": {
     "business_address": {
       "type": "string"
@@ -6870,7 +5994,7 @@ export const organizations_api_Profile_output: JsonSchema = {
 /**
  * The schema of `organizations-api_V4ErrorResponse` in responses.
  */
-export const organizations_api_V4ErrorResponse_output: JsonSchema = {
+export const organizations$$api_V4ErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -6912,7 +6036,7 @@ export const organizations_api_V4ErrorResponse_output: JsonSchema = {
 /**
  * The schema of `organizations-api_V4Message` in responses.
  */
-export const organizations_api_V4Message_output: JsonSchema = {
+export const organizations$$api_V4Message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -6931,7 +6055,7 @@ export const organizations_api_V4Message_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_ErrorSource` in responses.
  */
-export const pay_per_crawl_ErrorSource_output: JsonSchema = {
+export const pay$$per$$crawl_ErrorSource: JsonSchema = {
   "properties": {
     "pointer": {
       "type": "string"
@@ -6943,7 +6067,7 @@ export const pay_per_crawl_ErrorSource_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_Msg` in responses.
  */
-export const pay_per_crawl_Msg_output: JsonSchema = {
+export const pay$$per$$crawl_Msg: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -6980,7 +6104,7 @@ export const pay_per_crawl_Msg_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_RESTError` in responses.
  */
-export const pay_per_crawl_RESTError_output: JsonSchema = {
+export const pay$$per$$crawl_RESTError: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -7001,7 +6125,7 @@ export const pay_per_crawl_RESTError_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_ResultInfo` in responses.
  */
-export const pay_per_crawl_ResultInfo_output: JsonSchema = {
+export const pay$$per$$crawl_ResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -7025,7 +6149,7 @@ export const pay_per_crawl_ResultInfo_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_Source` in responses.
  */
-export const pay_per_crawl_Source_output: JsonSchema = {
+export const pay$$per$$crawl_Source: JsonSchema = {
   "properties": {
     "parameter": {
       "type": "string"
@@ -7046,7 +6170,7 @@ export const pay_per_crawl_Source_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_apiErrorResponse` in responses.
  */
-export const pay_per_crawl_apiErrorResponse_output: JsonSchema = {
+export const pay$$per$$crawl_apiErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -7074,7 +6198,7 @@ export const pay_per_crawl_apiErrorResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_apiNoResultResponse` in responses.
  */
-export const pay_per_crawl_apiNoResultResponse_output: JsonSchema = {
+export const pay$$per$$crawl_apiNoResultResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -7101,7 +6225,7 @@ export const pay_per_crawl_apiNoResultResponse_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_api-response-common-failure` in responses.
  */
-export const r2_data_catalog_api_response_common_failure_output: JsonSchema = {
+export const r2$$data$$catalog_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -7137,7 +6261,7 @@ export const r2_data_catalog_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_api-response-errors` in responses.
  */
-export const r2_data_catalog_api_response_errors_output: JsonSchema = {
+export const r2$$data$$catalog_api$$response$$errors: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -7159,7 +6283,7 @@ export const r2_data_catalog_api_response_errors_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_api-response-messages` in responses.
  */
-export const r2_data_catalog_api_response_messages_output: JsonSchema = {
+export const r2$$data$$catalog_api$$response$$messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -7181,7 +6305,7 @@ export const r2_data_catalog_api_response_messages_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_api-response-single` in responses.
  */
-export const r2_data_catalog_api_response_single_output: JsonSchema = {
+export const r2$$data$$catalog_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/r2-data-catalog_api-response-errors"
@@ -7190,7 +6314,7 @@ export const r2_data_catalog_api_response_single_output: JsonSchema = {
       "$ref": "#/$defs/r2-data-catalog_api-response-messages"
     },
     "success": {
-      "$ref": "#/$defs/r2-data-catalog_api-response-success"
+      "type": "boolean"
     }
   },
   "required": [
@@ -7201,17 +6325,10 @@ export const r2_data_catalog_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `r2-data-catalog_api-response-success` in responses.
- */
-export const r2_data_catalog_api_response_success_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `r2-data-catalog_catalog` in responses.
  */
-export const r2_data_catalog_catalog_output: JsonSchema = {
+export const r2$$data$$catalog_catalog: JsonSchema = {
   "properties": {
     "bucket": {
       "type": "string"
@@ -7219,7 +6336,11 @@ export const r2_data_catalog_catalog_output: JsonSchema = {
     "credential_status": {
       "oneOf": [
         {
-          "$ref": "#/$defs/r2-data-catalog_credential-status"
+          "enum": [
+            "present",
+            "absent"
+          ],
+          "type": "string"
         },
         {
           "type": "null"
@@ -7247,7 +6368,11 @@ export const r2_data_catalog_catalog_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-status"
+      "enum": [
+        "active",
+        "inactive"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -7262,7 +6387,7 @@ export const r2_data_catalog_catalog_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_catalog-activation-response` in responses.
  */
-export const r2_data_catalog_catalog_activation_response_output: JsonSchema = {
+export const r2$$data$$catalog_catalog$$activation$$response: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -7282,13 +6407,23 @@ export const r2_data_catalog_catalog_activation_response_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_catalog-compaction-config` in responses.
  */
-export const r2_data_catalog_catalog_compaction_config_output: JsonSchema = {
+export const r2$$data$$catalog_catalog$$compaction$$config: JsonSchema = {
   "properties": {
     "state": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-state"
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     },
     "target_size_mb": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-target-file-size"
+      "enum": [
+        "64",
+        "128",
+        "256",
+        "512"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -7301,7 +6436,7 @@ export const r2_data_catalog_catalog_compaction_config_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_catalog-list` in responses.
  */
-export const r2_data_catalog_catalog_list_output: JsonSchema = {
+export const r2$$data$$catalog_catalog$$list: JsonSchema = {
   "properties": {
     "warehouses": {
       "items": {
@@ -7319,13 +6454,13 @@ export const r2_data_catalog_catalog_list_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_catalog-maintenance-config` in responses.
  */
-export const r2_data_catalog_catalog_maintenance_config_output: JsonSchema = {
+export const r2$$data$$catalog_catalog$$maintenance$$config: JsonSchema = {
   "properties": {
     "compaction": {
       "$ref": "#/$defs/r2-data-catalog_catalog-compaction-config"
     },
     "interval": {
-      "$ref": "#/$defs/r2-data-catalog_maintenance-interval"
+      "type": "string"
     },
     "snapshot_expiration": {
       "$ref": "#/$defs/r2-data-catalog_snapshot-expiration-config"
@@ -7338,84 +6473,30 @@ export const r2_data_catalog_catalog_maintenance_config_output: JsonSchema = {
  * The schema of `r2-data-catalog_catalog-maintenance-config-response` in
  * responses.
  */
-export const r2_data_catalog_catalog_maintenance_config_response_output: JsonSchema = {
+export const r2$$data$$catalog_catalog$$maintenance$$config$$response: JsonSchema = {
   "properties": {
     "credential_status": {
-      "$ref": "#/$defs/r2-data-catalog_credential-status"
+      "enum": [
+        "present",
+        "absent"
+      ],
+      "type": "string"
     },
-    "maintenance_config": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-config"
-    }
-  },
-  "required": [
-    "credential_status",
-    "maintenance_config"
-  ],
-  "type": "object"
-};
-
-/**
- * The schema of `r2-data-catalog_catalog-maintenance-state` in responses.
- */
-export const r2_data_catalog_catalog_maintenance_state_output: JsonSchema = {
-  "enum": [
-    "enabled",
-    "disabled"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `r2-data-catalog_catalog-status` in responses.
- */
-export const r2_data_catalog_catalog_status_output: JsonSchema = {
-  "enum": [
-    "active",
-    "inactive"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `r2-data-catalog_catalog-target-file-size` in responses.
- */
-export const r2_data_catalog_catalog_target_file_size_output: JsonSchema = {
-  "enum": [
-    "64",
-    "128",
-    "256",
-    "512"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `r2-data-catalog_credential-probe-status` in responses.
- */
-export const r2_data_catalog_credential_probe_status_output: JsonSchema = {
-  "enum": [
-    "valid",
-    "invalid",
-    "absent"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `r2-data-catalog_credential-status` in responses.
- */
-export const r2_data_catalog_credential_status_output: JsonSchema = {
-  "enum": [
-    "present",
-    "absent"
+    "maintenance_config": {
+      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-config"
+    }
+  },
+  "required": [
+    "credential_status",
+    "maintenance_config"
   ],
-  "type": "string"
+  "type": "object"
 };
 
 /**
  * The schema of `r2-data-catalog_get-table-response` in responses.
  */
-export const r2_data_catalog_get_table_response_output: JsonSchema = {
+export const r2$$data$$catalog_get$$table$$response: JsonSchema = {
   "properties": {
     "identifier": {
       "$ref": "#/$defs/r2-data-catalog_table-identifier"
@@ -7447,17 +6528,10 @@ export const r2_data_catalog_get_table_response_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `r2-data-catalog_maintenance-interval` in responses.
- */
-export const r2_data_catalog_maintenance_interval_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `r2-data-catalog_maintenance-run-operation` in responses.
  */
-export const r2_data_catalog_maintenance_run_operation_output: JsonSchema = {
+export const r2$$data$$catalog_maintenance$$run$$operation: JsonSchema = {
   "properties": {
     "duration_ms": {
       "type": "integer"
@@ -7511,7 +6585,7 @@ export const r2_data_catalog_maintenance_run_operation_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_maintenance-run-record` in responses.
  */
-export const r2_data_catalog_maintenance_run_record_output: JsonSchema = {
+export const r2$$data$$catalog_maintenance$$run$$record: JsonSchema = {
   "properties": {
     "completed_at": {
       "oneOf": [
@@ -7620,7 +6694,7 @@ export const r2_data_catalog_maintenance_run_record_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_maintenance-runs-response` in responses.
  */
-export const r2_data_catalog_maintenance_runs_response_output: JsonSchema = {
+export const r2$$data$$catalog_maintenance$$runs$$response: JsonSchema = {
   "properties": {
     "next_page_token": {
       "oneOf": [
@@ -7649,7 +6723,7 @@ export const r2_data_catalog_maintenance_runs_response_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_namespace-details` in responses.
  */
-export const r2_data_catalog_namespace_details_output: JsonSchema = {
+export const r2$$data$$catalog_namespace$$details: JsonSchema = {
   "properties": {
     "created_at": {
       "oneOf": [
@@ -7691,7 +6765,7 @@ export const r2_data_catalog_namespace_details_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_namespace-identifier` in responses.
  */
-export const r2_data_catalog_namespace_identifier_output: JsonSchema = {
+export const r2$$data$$catalog_namespace$$identifier: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -7703,7 +6777,7 @@ export const r2_data_catalog_namespace_identifier_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_namespace-list-response` in responses.
  */
-export const r2_data_catalog_namespace_list_response_output: JsonSchema = {
+export const r2$$data$$catalog_namespace$$list$$response: JsonSchema = {
   "properties": {
     "details": {
       "oneOf": [
@@ -7758,7 +6832,7 @@ export const r2_data_catalog_namespace_list_response_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_queue-maintenance-response` in responses.
  */
-export const r2_data_catalog_queue_maintenance_response_output: JsonSchema = {
+export const r2$$data$$catalog_queue$$maintenance$$response: JsonSchema = {
   "properties": {
     "message": {
       "type": "string"
@@ -7788,7 +6862,7 @@ export const r2_data_catalog_queue_maintenance_response_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_snapshot-expiration-config` in responses.
  */
-export const r2_data_catalog_snapshot_expiration_config_output: JsonSchema = {
+export const r2$$data$$catalog_snapshot$$expiration$$config: JsonSchema = {
   "properties": {
     "max_snapshot_age": {
       "type": "string"
@@ -7797,7 +6871,11 @@ export const r2_data_catalog_snapshot_expiration_config_output: JsonSchema = {
       "type": "integer"
     },
     "state": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-state"
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -7811,7 +6889,7 @@ export const r2_data_catalog_snapshot_expiration_config_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_table-compaction-config` in responses.
  */
-export const r2_data_catalog_table_compaction_config_output: JsonSchema = {
+export const r2$$data$$catalog_table$$compaction$$config: JsonSchema = {
   "properties": {
     "next_eligible_at": {
       "oneOf": [
@@ -7825,10 +6903,20 @@ export const r2_data_catalog_table_compaction_config_output: JsonSchema = {
       ]
     },
     "state": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-state"
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     },
     "target_size_mb": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-target-file-size"
+      "enum": [
+        "64",
+        "128",
+        "256",
+        "512"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -7841,7 +6929,7 @@ export const r2_data_catalog_table_compaction_config_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_table-details` in responses.
  */
-export const r2_data_catalog_table_details_output: JsonSchema = {
+export const r2$$data$$catalog_table$$details: JsonSchema = {
   "properties": {
     "created_at": {
       "oneOf": [
@@ -7903,7 +6991,7 @@ export const r2_data_catalog_table_details_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_table-identifier` in responses.
  */
-export const r2_data_catalog_table_identifier_output: JsonSchema = {
+export const r2$$data$$catalog_table$$identifier: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -7922,7 +7010,7 @@ export const r2_data_catalog_table_identifier_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_table-list-response` in responses.
  */
-export const r2_data_catalog_table_list_response_output: JsonSchema = {
+export const r2$$data$$catalog_table$$list$$response: JsonSchema = {
   "properties": {
     "details": {
       "oneOf": [
@@ -7977,13 +7065,13 @@ export const r2_data_catalog_table_list_response_output: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_table-maintenance-config` in responses.
  */
-export const r2_data_catalog_table_maintenance_config_output: JsonSchema = {
+export const r2$$data$$catalog_table$$maintenance$$config: JsonSchema = {
   "properties": {
     "compaction": {
       "$ref": "#/$defs/r2-data-catalog_table-compaction-config"
     },
     "interval": {
-      "$ref": "#/$defs/r2-data-catalog_maintenance-interval"
+      "type": "string"
     },
     "snapshot_expiration": {
       "$ref": "#/$defs/r2-data-catalog_table-snapshot-expiration-config"
@@ -7996,7 +7084,7 @@ export const r2_data_catalog_table_maintenance_config_output: JsonSchema = {
  * The schema of `r2-data-catalog_table-maintenance-config-response` in
  * responses.
  */
-export const r2_data_catalog_table_maintenance_config_response_output: JsonSchema = {
+export const r2$$data$$catalog_table$$maintenance$$config$$response: JsonSchema = {
   "properties": {
     "maintenance_config": {
       "$ref": "#/$defs/r2-data-catalog_table-maintenance-config"
@@ -8011,7 +7099,7 @@ export const r2_data_catalog_table_maintenance_config_response_output: JsonSchem
 /**
  * The schema of `r2-data-catalog_table-metadata` in responses.
  */
-export const r2_data_catalog_table_metadata_output: JsonSchema = {
+export const r2$$data$$catalog_table$$metadata: JsonSchema = {
   "type": "object"
 };
 
@@ -8019,7 +7107,7 @@ export const r2_data_catalog_table_metadata_output: JsonSchema = {
  * The schema of `r2-data-catalog_table-snapshot-expiration-config` in
  * responses.
  */
-export const r2_data_catalog_table_snapshot_expiration_config_output: JsonSchema = {
+export const r2$$data$$catalog_table$$snapshot$$expiration$$config: JsonSchema = {
   "properties": {
     "max_snapshot_age": {
       "type": "string"
@@ -8039,7 +7127,11 @@ export const r2_data_catalog_table_snapshot_expiration_config_output: JsonSchema
       ]
     },
     "state": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-state"
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -8050,24 +7142,10 @@ export const r2_data_catalog_table_snapshot_expiration_config_output: JsonSchema
   "type": "object"
 };
 
-/**
- * The schema of `resource-sharing_account_id` in responses.
- */
-export const resource_sharing_account_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_account_name` in responses.
- */
-export const resource_sharing_account_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `resource-sharing_api-response-collection` in responses.
  */
-export const resource_sharing_api_response_collection_output: JsonSchema = {
+export const resource$$sharing_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-common"
@@ -8081,7 +7159,7 @@ export const resource_sharing_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `resource-sharing_api-response-collection-info` in responses.
  */
-export const resource_sharing_api_response_collection_info_output: JsonSchema = {
+export const resource$$sharing_api$$response$$collection$$info: JsonSchema = {
   "properties": {
     "result_info": {
       "$ref": "#/$defs/resource-sharing_result_info"
@@ -8093,7 +7171,7 @@ export const resource_sharing_api_response_collection_info_output: JsonSchema =
 /**
  * The schema of `resource-sharing_api-response-common` in responses.
  */
-export const resource_sharing_api_response_common_output: JsonSchema = {
+export const resource$$sharing_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/resource-sharing_v4errors"
@@ -8112,7 +7190,7 @@ export const resource_sharing_api_response_common_output: JsonSchema = {
 /**
  * The schema of `resource-sharing_api-response-common-failure` in responses.
  */
-export const resource_sharing_api_response_common_failure_output: JsonSchema = {
+export const resource$$sharing_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/resource-sharing_v4errors"
@@ -8132,89 +7210,17 @@ export const resource_sharing_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `resource-sharing_created` in responses.
- */
-export const resource_sharing_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_modified` in responses.
- */
-export const resource_sharing_modified_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_organization_id` in responses.
- */
-export const resource_sharing_organization_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_resource_id` in responses.
- */
-export const resource_sharing_resource_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `resource-sharing_resource_meta` in responses.
  */
-export const resource_sharing_resource_meta_output: JsonSchema = {
+export const resource$$sharing_resource_meta: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `resource-sharing_resource_resource_id` in responses.
- */
-export const resource_sharing_resource_resource_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_resource_status` in responses.
- */
-export const resource_sharing_resource_status_output: JsonSchema = {
-  "enum": [
-    "active",
-    "deleting",
-    "deleted"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_resource_type` in responses.
- */
-export const resource_sharing_resource_type_output: JsonSchema = {
-  "enum": [
-    "custom-ruleset",
-    "gateway-policy",
-    "gateway-destination-ip",
-    "gateway-block-page-settings",
-    "gateway-extended-email-matching",
-    "idp-federation-grant",
-    "trust-grant"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_resource_version` in responses.
- */
-export const resource_sharing_resource_version_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `resource-sharing_result_info` in responses.
  */
-export const resource_sharing_result_info_output: JsonSchema = {
+export const resource$$sharing_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -8235,41 +7241,16 @@ export const resource_sharing_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `resource-sharing_share_id` in responses.
- */
-export const resource_sharing_share_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_share_kind` in responses.
- */
-export const resource_sharing_share_kind_output: JsonSchema = {
-  "enum": [
-    "sent",
-    "received"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_share_name` in responses.
- */
-export const resource_sharing_share_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `resource-sharing_share_object` in responses.
  */
-export const resource_sharing_share_object_output: JsonSchema = {
+export const resource$$sharing_share_object: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/resource-sharing_account_id"
+      "type": "string"
     },
     "account_name": {
-      "$ref": "#/$defs/resource-sharing_account_name"
+      "type": "string"
     },
     "associated_recipient_count": {
       "type": "integer"
@@ -8278,7 +7259,8 @@ export const resource_sharing_share_object_output: JsonSchema = {
       "type": "integer"
     },
     "created": {
-      "$ref": "#/$defs/resource-sharing_created"
+      "format": "date-time",
+      "type": "string"
     },
     "disassociated_recipient_count": {
       "type": "integer"
@@ -8287,19 +7269,24 @@ export const resource_sharing_share_object_output: JsonSchema = {
       "type": "integer"
     },
     "id": {
-      "$ref": "#/$defs/resource-sharing_share_id"
+      "type": "string"
     },
     "kind": {
-      "$ref": "#/$defs/resource-sharing_share_kind"
+      "enum": [
+        "sent",
+        "received"
+      ],
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/resource-sharing_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/resource-sharing_share_name"
+      "type": "string"
     },
     "organization_id": {
-      "$ref": "#/$defs/resource-sharing_organization_id"
+      "type": "string"
     },
     "resources": {
       "items": {
@@ -8308,10 +7295,19 @@ export const resource_sharing_share_object_output: JsonSchema = {
       "type": "array"
     },
     "status": {
-      "$ref": "#/$defs/resource-sharing_share_status"
+      "enum": [
+        "active",
+        "deleting",
+        "deleted"
+      ],
+      "type": "string"
     },
     "target_type": {
-      "$ref": "#/$defs/resource-sharing_share_target_type"
+      "enum": [
+        "account",
+        "organization"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -8331,34 +7327,50 @@ export const resource_sharing_share_object_output: JsonSchema = {
 /**
  * The schema of `resource-sharing_share_resource_object` in responses.
  */
-export const resource_sharing_share_resource_object_output: JsonSchema = {
+export const resource$$sharing_share_resource_object: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/resource-sharing_created"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/resource-sharing_resource_id"
+      "type": "string"
     },
     "meta": {
       "$ref": "#/$defs/resource-sharing_resource_meta"
     },
     "modified": {
-      "$ref": "#/$defs/resource-sharing_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "resource_account_id": {
-      "$ref": "#/$defs/resource-sharing_account_id"
+      "type": "string"
     },
     "resource_id": {
-      "$ref": "#/$defs/resource-sharing_resource_resource_id"
+      "type": "string"
     },
     "resource_type": {
-      "$ref": "#/$defs/resource-sharing_resource_type"
+      "enum": [
+        "custom-ruleset",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+        "idp-federation-grant",
+        "trust-grant"
+      ],
+      "type": "string"
     },
     "resource_version": {
-      "$ref": "#/$defs/resource-sharing_resource_version"
+      "type": "integer"
     },
     "status": {
-      "$ref": "#/$defs/resource-sharing_resource_status"
+      "enum": [
+        "active",
+        "deleting",
+        "deleted"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -8378,7 +7390,7 @@ export const resource_sharing_share_resource_object_output: JsonSchema = {
 /**
  * The schema of `resource-sharing_share_response_collection` in responses.
  */
-export const resource_sharing_share_response_collection_output: JsonSchema = {
+export const resource$$sharing_share_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-collection"
@@ -8393,7 +7405,7 @@ export const resource_sharing_share_response_collection_output: JsonSchema = {
  * The schema of `resource-sharing_share_response_collection_result` in
  * responses.
  */
-export const resource_sharing_share_response_collection_result_output: JsonSchema = {
+export const resource$$sharing_share_response_collection_result: JsonSchema = {
   "properties": {
     "result": {
       "items": {
@@ -8405,33 +7417,10 @@ export const resource_sharing_share_response_collection_result_output: JsonSchem
   "type": "object"
 };
 
-/**
- * The schema of `resource-sharing_share_status` in responses.
- */
-export const resource_sharing_share_status_output: JsonSchema = {
-  "enum": [
-    "active",
-    "deleting",
-    "deleted"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_share_target_type` in responses.
- */
-export const resource_sharing_share_target_type_output: JsonSchema = {
-  "enum": [
-    "account",
-    "organization"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `resource-sharing_v4error` in responses.
  */
-export const resource_sharing_v4error_output: JsonSchema = {
+export const resource$$sharing_v4error: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -8450,7 +7439,7 @@ export const resource_sharing_v4error_output: JsonSchema = {
 /**
  * The schema of `resource-sharing_v4errors` in responses.
  */
-export const resource_sharing_v4errors_output: JsonSchema = {
+export const resource$$sharing_v4errors: JsonSchema = {
   "items": {
     "$ref": "#/$defs/resource-sharing_v4error"
   },
@@ -8460,7 +7449,7 @@ export const resource_sharing_v4errors_output: JsonSchema = {
 /**
  * The schema of `rulesets_Errors` in responses.
  */
-export const rulesets_Errors_output: JsonSchema = {
+export const rulesets_Errors: JsonSchema = {
   "items": {
     "$ref": "#/$defs/rulesets_Message"
   },
@@ -8470,7 +7459,7 @@ export const rulesets_Errors_output: JsonSchema = {
 /**
  * The schema of `rulesets_Message` in responses.
  */
-export const rulesets_Message_output: JsonSchema = {
+export const rulesets_Message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -8499,7 +7488,7 @@ export const rulesets_Message_output: JsonSchema = {
 /**
  * The schema of `rulesets_Messages` in responses.
  */
-export const rulesets_Messages_output: JsonSchema = {
+export const rulesets_Messages: JsonSchema = {
   "items": {
     "$ref": "#/$defs/rulesets_Message"
   },
@@ -8509,7 +7498,7 @@ export const rulesets_Messages_output: JsonSchema = {
 /**
  * The schema of `rulesets_Response` in responses.
  */
-export const rulesets_Response_output: JsonSchema = {
+export const rulesets_Response: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/rulesets_Errors"
@@ -8558,7 +7547,7 @@ export const rulesets_Response_output: JsonSchema = {
 /**
  * The schema of `rum_api-response-common` in responses.
  */
-export const rum_api_response_common_output: JsonSchema = {
+export const rum_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/rum_messages"
@@ -8581,7 +7570,7 @@ export const rum_api_response_common_output: JsonSchema = {
 /**
  * The schema of `rum_api-response-common-failure` in responses.
  */
-export const rum_api_response_common_failure_output: JsonSchema = {
+export const rum_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/rum_messages-2"
@@ -8611,7 +7600,7 @@ export const rum_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `rum_messages` in responses.
  */
-export const rum_messages_output: JsonSchema = {
+export const rum_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -8633,7 +7622,7 @@ export const rum_messages_output: JsonSchema = {
 /**
  * The schema of `rum_messages-2` in responses.
  */
-export const rum_messages_2_output: JsonSchema = {
+export const rum_messages$$2: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -8666,7 +7655,7 @@ export const rum_messages_2_output: JsonSchema = {
 /**
  * The schema of `security-center_api-response-common` in responses.
  */
-export const security_center_api_response_common_output: JsonSchema = {
+export const security$$center_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/security-center_messages"
@@ -8692,7 +7681,7 @@ export const security_center_api_response_common_output: JsonSchema = {
 /**
  * The schema of `security-center_api-response-common-failure` in responses.
  */
-export const security_center_api_response_common_failure_output: JsonSchema = {
+export const security$$center_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/security-center_messages"
@@ -8722,7 +7711,7 @@ export const security_center_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `security-center_api-response-single` in responses.
  */
-export const security_center_api_response_single_output: JsonSchema = {
+export const security$$center_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/security-center_messages"
@@ -8745,17 +7734,10 @@ export const security_center_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `security-center_count` in responses.
- */
-export const security_center_count_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `security-center_issue` in responses.
  */
-export const security_center_issue_output: JsonSchema = {
+export const security$$center_issue: JsonSchema = {
   "properties": {
     "dismissed": {
       "type": "boolean"
@@ -8767,10 +7749,18 @@ export const security_center_issue_output: JsonSchema = {
       "type": "string"
     },
     "issue_class": {
-      "$ref": "#/$defs/security-center_issueClass"
+      "type": "string"
     },
     "issue_type": {
-      "$ref": "#/$defs/security-center_issueType"
+      "enum": [
+        "compliance_violation",
+        "email_security",
+        "exposed_infrastructure",
+        "insecure_configuration",
+        "weak_authentication",
+        "configuration_suggestion"
+      ],
+      "type": "string"
     },
     "payload": {
       "properties": {
@@ -8802,7 +7792,11 @@ export const security_center_issue_output: JsonSchema = {
       "type": "string"
     },
     "source": {
-      "$ref": "#/$defs/security-center_source"
+      "enum": [
+        "cloudflare",
+        "riskrecon"
+      ],
+      "type": "string"
     },
     "status": {
       "enum": [
@@ -8812,45 +7806,35 @@ export const security_center_issue_output: JsonSchema = {
       "type": "string"
     },
     "subject": {
-      "$ref": "#/$defs/security-center_subject"
+      "type": "string"
     },
     "timestamp": {
       "format": "date-time",
       "type": "string"
     },
     "user_classification": {
-      "$ref": "#/$defs/security-center_userClassification"
+      "oneOf": [
+        {
+          "enum": [
+            "false_positive",
+            "accept_risk",
+            "other"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `security-center_issueClass` in responses.
- */
-export const security_center_issueClass_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `security-center_issueType` in responses.
- */
-export const security_center_issueType_output: JsonSchema = {
-  "enum": [
-    "compliance_violation",
-    "email_security",
-    "exposed_infrastructure",
-    "insecure_configuration",
-    "weak_authentication",
-    "configuration_suggestion"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `security-center_messages` in responses.
  */
-export const security_center_messages_output: JsonSchema = {
+export const security$$center_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -8880,61 +7864,10 @@ export const security_center_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `security-center_page` in responses.
- */
-export const security_center_page_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `security-center_perPage` in responses.
- */
-export const security_center_perPage_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `security-center_source` in responses.
- */
-export const security_center_source_output: JsonSchema = {
-  "enum": [
-    "cloudflare",
-    "riskrecon"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `security-center_subject` in responses.
- */
-export const security_center_subject_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `security-center_userClassification` in responses.
- */
-export const security_center_userClassification_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "false_positive",
-        "accept_risk",
-        "other"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `security-center_valueCountsResponse` in responses.
  */
-export const security_center_valueCountsResponse_output: JsonSchema = {
+export const security$$center_valueCountsResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/security-center_api-response-common"
@@ -8964,7 +7897,7 @@ export const security_center_valueCountsResponse_output: JsonSchema = {
 /**
  * The schema of `speed_api-response-common` in responses.
  */
-export const speed_api_response_common_output: JsonSchema = {
+export const speed_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/speed_messages"
@@ -8987,7 +7920,7 @@ export const speed_api_response_common_output: JsonSchema = {
 /**
  * The schema of `speed_api-response-common-failure` in responses.
  */
-export const speed_api_response_common_failure_output: JsonSchema = {
+export const speed_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/speed_messages"
@@ -9021,7 +7954,7 @@ export const speed_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `speed_base` in responses.
  */
-export const speed_base_output: JsonSchema = {
+export const speed_base: JsonSchema = {
   "properties": {
     "editable": {
       "enum": [
@@ -9058,7 +7991,7 @@ export const speed_base_output: JsonSchema = {
 /**
  * The schema of `speed_messages` in responses.
  */
-export const speed_messages_output: JsonSchema = {
+export const speed_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -9081,7 +8014,7 @@ export const speed_messages_output: JsonSchema = {
  * The schema of `tls-certificates-and-hostnames_api-response-collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_api_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-common"
@@ -9118,7 +8051,7 @@ export const tls_certificates_and_hostnames_api_response_collection_output: Json
  * The schema of `tls-certificates-and-hostnames_api-response-common` in
  * responses.
  */
-export const tls_certificates_and_hostnames_api_response_common_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_messages"
@@ -9145,7 +8078,7 @@ export const tls_certificates_and_hostnames_api_response_common_output: JsonSche
  * The schema of `tls-certificates-and-hostnames_api-response-common-failure` in
  * responses.
  */
-export const tls_certificates_and_hostnames_api_response_common_failure_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_messages"
@@ -9176,7 +8109,7 @@ export const tls_certificates_and_hostnames_api_response_common_failure_output:
  * The schema of `tls-certificates-and-hostnames_api-response-single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_api_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_messages"
@@ -9199,32 +8132,10 @@ export const tls_certificates_and_hostnames_api_response_single_output: JsonSche
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_expires_on-2` in responses.
- */
-export const tls_certificates_and_hostnames_expires_on_2_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_identifier` in responses.
- */
-export const tls_certificates_and_hostnames_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_issuer` in responses.
- */
-export const tls_certificates_and_hostnames_issuer_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_messages` in responses.
  */
-export const tls_certificates_and_hostnames_messages_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -9254,26 +8165,11 @@ export const tls_certificates_and_hostnames_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_signature` in responses.
- */
-export const tls_certificates_and_hostnames_signature_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_uploaded_on` in responses.
- */
-export const tls_certificates_and_hostnames_uploaded_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_validation_record` in
  * responses.
  */
-export const tls_certificates_and_hostnames_validation_record_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_validation_record: JsonSchema = {
   "properties": {
     "cname": {
       "type": "string"
@@ -9306,17 +8202,10 @@ export const tls_certificates_and_hostnames_validation_record_output: JsonSchema
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_account_id` in responses.
- */
-export const tunnel_account_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_api-response-collection` in responses.
  */
-export const tunnel_api_response_collection_output: JsonSchema = {
+export const tunnel_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -9348,7 +8237,7 @@ export const tunnel_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `tunnel_api-response-common` in responses.
  */
-export const tunnel_api_response_common_output: JsonSchema = {
+export const tunnel_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/tunnel_messages"
@@ -9391,7 +8280,7 @@ export const tunnel_api_response_common_output: JsonSchema = {
 /**
  * The schema of `tunnel_api-response-common-failure` in responses.
  */
-export const tunnel_api_response_common_failure_output: JsonSchema = {
+export const tunnel_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/tunnel_messages"
@@ -9421,7 +8310,7 @@ export const tunnel_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `tunnel_api-response-common-failure-2` in responses.
  */
-export const tunnel_api_response_common_failure_2_output: JsonSchema = {
+export const tunnel_api$$response$$common$$failure$$2: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/tunnel_messages-2"
@@ -9451,7 +8340,7 @@ export const tunnel_api_response_common_failure_2_output: JsonSchema = {
 /**
  * The schema of `tunnel_api-response-single-2` in responses.
  */
-export const tunnel_api_response_single_2_output: JsonSchema = {
+export const tunnel_api$$response$$single$$2: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/tunnel_messages-2"
@@ -9474,141 +8363,92 @@ export const tunnel_api_response_single_2_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_arch` in responses.
- */
-export const tunnel_arch_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_cfd_tunnel` in responses.
  */
-export const tunnel_cfd_tunnel_output: JsonSchema = {
+export const tunnel_cfd_tunnel: JsonSchema = {
   "properties": {
     "account_tag": {
-      "$ref": "#/$defs/tunnel_account_id"
+      "type": "string"
     },
     "config_src": {
-      "$ref": "#/$defs/tunnel_config_src"
+      "enum": [
+        "local",
+        "cloudflare"
+      ],
+      "type": "string"
     },
     "connections": {
       "$ref": "#/$defs/tunnel_connections_deprecated"
     },
     "conns_active_at": {
-      "$ref": "#/$defs/tunnel_conns_active_at"
+      "format": "date-time",
+      "type": "string"
     },
     "conns_inactive_at": {
-      "$ref": "#/$defs/tunnel_conns_inactive_at"
+      "format": "date-time",
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_at": {
-      "$ref": "#/$defs/tunnel_deleted_at"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_tunnel_id"
+      "format": "uuid",
+      "type": "string"
     },
     "metadata": {
       "$ref": "#/$defs/tunnel_metadata"
     },
     "name": {
-      "$ref": "#/$defs/tunnel_tunnel_name"
+      "type": "string"
     },
     "remote_config": {
-      "$ref": "#/$defs/tunnel_remote_config"
+      "type": "boolean"
     },
     "status": {
-      "$ref": "#/$defs/tunnel_status"
+      "enum": [
+        "inactive",
+        "degraded",
+        "healthy",
+        "down"
+      ],
+      "type": "string"
     },
     "tun_type": {
-      "$ref": "#/$defs/tunnel_tunnel_type"
+      "enum": [
+        "cfd_tunnel",
+        "warp_connector",
+        "warp",
+        "magic",
+        "ip_sec",
+        "gre",
+        "cni"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_client_id` in responses.
- */
-export const tunnel_client_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_colo_name` in responses.
- */
-export const tunnel_colo_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_config_src` in responses.
- */
-export const tunnel_config_src_output: JsonSchema = {
-  "enum": [
-    "local",
-    "cloudflare"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_connection_id` in responses.
- */
-export const tunnel_connection_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_connections_deprecated` in responses.
  */
-export const tunnel_connections_deprecated_output: JsonSchema = {
+export const tunnel_connections_deprecated: JsonSchema = {
   "items": {
     "$ref": "#/$defs/tunnel_schemas-connection"
   },
   "type": "array"
 };
 
-/**
- * The schema of `tunnel_conns_active_at` in responses.
- */
-export const tunnel_conns_active_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_conns_inactive_at` in responses.
- */
-export const tunnel_conns_inactive_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_created_at` in responses.
- */
-export const tunnel_created_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_deleted_at` in responses.
- */
-export const tunnel_deleted_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_empty_response` in responses.
  */
-export const tunnel_empty_response_output: JsonSchema = {
+export const tunnel_empty_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -9627,38 +8467,17 @@ export const tunnel_empty_response_output: JsonSchema = {
 /**
  * The schema of `tunnel_features` in responses.
  */
-export const tunnel_features_output: JsonSchema = {
+export const tunnel_features: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `tunnel_identifier` in responses.
- */
-export const tunnel_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_ip` in responses.
- */
-export const tunnel_ip_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_is_pending_reconnect` in responses.
- */
-export const tunnel_is_pending_reconnect_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `tunnel_messages` in responses.
  */
-export const tunnel_messages_output: JsonSchema = {
+export const tunnel_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -9683,7 +8502,7 @@ export const tunnel_messages_output: JsonSchema = {
 /**
  * The schema of `tunnel_messages-2` in responses.
  */
-export const tunnel_messages_2_output: JsonSchema = {
+export const tunnel_messages$$2: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -9716,21 +8535,14 @@ export const tunnel_messages_2_output: JsonSchema = {
 /**
  * The schema of `tunnel_metadata` in responses.
  */
-export const tunnel_metadata_output: JsonSchema = {
+export const tunnel_metadata: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_remote_config` in responses.
- */
-export const tunnel_remote_config_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `tunnel_result_info` in responses.
  */
-export const tunnel_result_info_output: JsonSchema = {
+export const tunnel_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -9748,88 +8560,47 @@ export const tunnel_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_run_at` in responses.
- */
-export const tunnel_run_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_schemas-connection` in responses.
  */
-export const tunnel_schemas_connection_output: JsonSchema = {
+export const tunnel_schemas$$connection: JsonSchema = {
   "properties": {
     "client_id": {
-      "$ref": "#/$defs/tunnel_client_id"
+      "format": "uuid",
+      "type": "string"
     },
     "client_version": {
-      "$ref": "#/$defs/tunnel_version"
+      "type": "string"
     },
     "colo_name": {
-      "$ref": "#/$defs/tunnel_colo_name"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_connection_id"
+      "format": "uuid",
+      "type": "string"
     },
     "is_pending_reconnect": {
-      "$ref": "#/$defs/tunnel_is_pending_reconnect"
+      "type": "boolean"
     },
     "opened_at": {
       "format": "date-time",
       "type": "string"
     },
     "origin_ip": {
-      "$ref": "#/$defs/tunnel_ip"
+      "type": "string"
     },
     "uuid": {
-      "$ref": "#/$defs/tunnel_connection_id"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_status` in responses.
- */
-export const tunnel_status_output: JsonSchema = {
-  "enum": [
-    "inactive",
-    "degraded",
-    "healthy",
-    "down"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_id` in responses.
- */
-export const tunnel_tunnel_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_id-2` in responses.
- */
-export const tunnel_tunnel_id_2_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_name` in responses.
- */
-export const tunnel_tunnel_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_tunnel_response_token` in responses.
  */
-export const tunnel_tunnel_response_token_output: JsonSchema = {
+export const tunnel_tunnel_response_token: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -9837,7 +8608,7 @@ export const tunnel_tunnel_response_token_output: JsonSchema = {
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/tunnel_tunnel_token"
+          "type": "string"
         }
       },
       "type": "object"
@@ -9845,73 +8616,63 @@ export const tunnel_tunnel_response_token_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `tunnel_tunnel_token` in responses.
- */
-export const tunnel_tunnel_token_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_type` in responses.
- */
-export const tunnel_tunnel_type_output: JsonSchema = {
-  "enum": [
-    "cfd_tunnel",
-    "warp_connector",
-    "warp",
-    "magic",
-    "ip_sec",
-    "gre",
-    "cni"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_version` in responses.
- */
-export const tunnel_version_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_warp_connector_tunnel` in responses.
  */
-export const tunnel_warp_connector_tunnel_output: JsonSchema = {
+export const tunnel_warp_connector_tunnel: JsonSchema = {
   "properties": {
     "account_tag": {
-      "$ref": "#/$defs/tunnel_account_id"
+      "type": "string"
     },
     "connections": {
       "$ref": "#/$defs/tunnel_connections_deprecated"
     },
     "conns_active_at": {
-      "$ref": "#/$defs/tunnel_conns_active_at"
+      "format": "date-time",
+      "type": "string"
     },
     "conns_inactive_at": {
-      "$ref": "#/$defs/tunnel_conns_inactive_at"
+      "format": "date-time",
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_created_at"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_at": {
-      "$ref": "#/$defs/tunnel_deleted_at"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_tunnel_id"
+      "format": "uuid",
+      "type": "string"
     },
     "metadata": {
       "$ref": "#/$defs/tunnel_metadata"
     },
     "name": {
-      "$ref": "#/$defs/tunnel_tunnel_name"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tunnel_status"
+      "enum": [
+        "inactive",
+        "degraded",
+        "healthy",
+        "down"
+      ],
+      "type": "string"
     },
     "tun_type": {
-      "$ref": "#/$defs/tunnel_tunnel_type"
+      "enum": [
+        "cfd_tunnel",
+        "warp_connector",
+        "warp",
+        "magic",
+        "ip_sec",
+        "gre",
+        "cni"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -9920,7 +8681,7 @@ export const tunnel_warp_connector_tunnel_output: JsonSchema = {
 /**
  * The schema of `usage-analytics_api_error` in responses.
  */
-export const usage_analytics_api_error_output: JsonSchema = {
+export const usage$$analytics_api_error: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -9939,7 +8700,7 @@ export const usage_analytics_api_error_output: JsonSchema = {
 /**
  * The schema of `usage-analytics_api_message` in responses.
  */
-export const usage_analytics_api_message_output: JsonSchema = {
+export const usage$$analytics_api_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -9958,7 +8719,7 @@ export const usage_analytics_api_message_output: JsonSchema = {
 /**
  * The schema of `usage-analytics_error_response` in responses.
  */
-export const usage_analytics_error_response_output: JsonSchema = {
+export const usage$$analytics_error_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -9999,7 +8760,7 @@ export const usage_analytics_error_response_output: JsonSchema = {
 /**
  * The schema of `usage-analytics_stream_usage_data_point` in responses.
  */
-export const usage_analytics_stream_usage_data_point_output: JsonSchema = {
+export const usage$$analytics_stream_usage_data_point: JsonSchema = {
   "properties": {
     "streamMinutesViewed": {
       "type": "integer"
@@ -10014,7 +8775,7 @@ export const usage_analytics_stream_usage_data_point_output: JsonSchema = {
 /**
  * The schema of `usage-analytics_stream_usage_response` in responses.
  */
-export const usage_analytics_stream_usage_response_output: JsonSchema = {
+export const usage$$analytics_stream_usage_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -10049,7 +8810,7 @@ export const usage_analytics_stream_usage_response_output: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_api-response-common` in responses.
  */
-export const waf_product_api_bundle_api_response_common_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/waf-product-api-bundle_messages"
@@ -10092,7 +8853,7 @@ export const waf_product_api_bundle_api_response_common_output: JsonSchema = {
 /**
  * The schema of `waf-product-api-bundle_api-response-single` in responses.
  */
-export const waf_product_api_bundle_api_response_single_output: JsonSchema = {
+export const waf$$product$$api$$bundle_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waf-product-api-bundle_api-response-common"
@@ -10118,17 +8879,10 @@ export const waf_product_api_bundle_api_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `waf-product-api-bundle_identifier` in responses.
- */
-export const waf_product_api_bundle_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `waf-product-api-bundle_messages` in responses.
  */
-export const waf_product_api_bundle_messages_output: JsonSchema = {
+export const waf$$product$$api$$bundle_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -10150,7 +8904,7 @@ export const waf_product_api_bundle_messages_output: JsonSchema = {
 /**
  * The schema of `workers_api-response-collection` in responses.
  */
-export const workers_api_response_collection_output: JsonSchema = {
+export const workers_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
@@ -10186,7 +8940,7 @@ export const workers_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `workers_api-response-common` in responses.
  */
-export const workers_api_response_common_output: JsonSchema = {
+export const workers_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/workers_messages"
@@ -10212,7 +8966,7 @@ export const workers_api_response_common_output: JsonSchema = {
 /**
  * The schema of `workers_api-response-common-failure` in responses.
  */
-export const workers_api_response_common_failure_output: JsonSchema = {
+export const workers_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/workers_messages"
@@ -10242,7 +8996,7 @@ export const workers_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `workers_api-response-null-result` in responses.
  */
-export const workers_api_response_null_result_output: JsonSchema = {
+export const workers_api$$response$$null$$result: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
@@ -10261,7 +9015,7 @@ export const workers_api_response_null_result_output: JsonSchema = {
 /**
  * The schema of `workers_binding_item` in responses.
  */
-export const workers_binding_item_output: JsonSchema = {
+export const workers_binding_item: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/workers_binding_kind_ai"
@@ -10383,10 +9137,10 @@ export const workers_binding_item_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_ai` in responses.
  */
-export const workers_binding_kind_ai_output: JsonSchema = {
+export const workers_binding_kind_ai: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10405,13 +9159,13 @@ export const workers_binding_kind_ai_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_ai_search` in responses.
  */
-export const workers_binding_kind_ai_search_output: JsonSchema = {
+export const workers_binding_kind_ai_search: JsonSchema = {
   "properties": {
     "instance_name": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "namespace": {
       "type": "string"
@@ -10434,10 +9188,10 @@ export const workers_binding_kind_ai_search_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_ai_search_namespace` in responses.
  */
-export const workers_binding_kind_ai_search_namespace_output: JsonSchema = {
+export const workers_binding_kind_ai_search_namespace: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "namespace": {
       "type": "string"
@@ -10460,13 +9214,13 @@ export const workers_binding_kind_ai_search_namespace_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_analytics_engine` in responses.
  */
-export const workers_binding_kind_analytics_engine_output: JsonSchema = {
+export const workers_binding_kind_analytics_engine: JsonSchema = {
   "properties": {
     "dataset": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10486,10 +9240,10 @@ export const workers_binding_kind_analytics_engine_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_artifacts` in responses.
  */
-export const workers_binding_kind_artifacts_output: JsonSchema = {
+export const workers_binding_kind_artifacts: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "namespace": {
       "type": "string"
@@ -10512,10 +9266,10 @@ export const workers_binding_kind_artifacts_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_assets` in responses.
  */
-export const workers_binding_kind_assets_output: JsonSchema = {
+export const workers_binding_kind_assets: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10534,10 +9288,10 @@ export const workers_binding_kind_assets_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_browser` in responses.
  */
-export const workers_binding_kind_browser_output: JsonSchema = {
+export const workers_binding_kind_browser: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10556,7 +9310,7 @@ export const workers_binding_kind_browser_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_d1` in responses.
  */
-export const workers_binding_kind_d1_output: JsonSchema = {
+export const workers_binding_kind_d1: JsonSchema = {
   "properties": {
     "database_id": {
       "type": "string"
@@ -10565,7 +9319,7 @@ export const workers_binding_kind_d1_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10585,10 +9339,10 @@ export const workers_binding_kind_d1_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_data_blob` in responses.
  */
-export const workers_binding_kind_data_blob_output: JsonSchema = {
+export const workers_binding_kind_data_blob: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "part": {
       "type": "string"
@@ -10611,10 +9365,10 @@ export const workers_binding_kind_data_blob_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_dispatch_namespace` in responses.
  */
-export const workers_binding_kind_dispatch_namespace_output: JsonSchema = {
+export const workers_binding_kind_dispatch_namespace: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "namespace": {
       "type": "string"
@@ -10670,7 +9424,7 @@ export const workers_binding_kind_dispatch_namespace_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_durable_object_namespace` in responses.
  */
-export const workers_binding_kind_durable_object_namespace_output: JsonSchema = {
+export const workers_binding_kind_durable_object_namespace: JsonSchema = {
   "properties": {
     "class_name": {
       "type": "string"
@@ -10682,12 +9436,12 @@ export const workers_binding_kind_durable_object_namespace_output: JsonSchema =
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "namespace_id": {
       "allOf": [
         {
-          "$ref": "#/$defs/workers_namespace_identifier"
+          "type": "string"
         },
         {
           "type": "string"
@@ -10714,13 +9468,13 @@ export const workers_binding_kind_durable_object_namespace_output: JsonSchema =
 /**
  * The schema of `workers_binding_kind_flagship` in responses.
  */
-export const workers_binding_kind_flagship_output: JsonSchema = {
+export const workers_binding_kind_flagship: JsonSchema = {
   "properties": {
     "app_id": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10740,13 +9494,13 @@ export const workers_binding_kind_flagship_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_hyperdrive` in responses.
  */
-export const workers_binding_kind_hyperdrive_output: JsonSchema = {
+export const workers_binding_kind_hyperdrive: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10766,10 +9520,10 @@ export const workers_binding_kind_hyperdrive_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_images` in responses.
  */
-export const workers_binding_kind_images_output: JsonSchema = {
+export const workers_binding_kind_images: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10788,7 +9542,7 @@ export const workers_binding_kind_images_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_inherit` in responses.
  */
-export const workers_binding_kind_inherit_output: JsonSchema = {
+export const workers_binding_kind_inherit: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -10816,13 +9570,13 @@ export const workers_binding_kind_inherit_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_json` in responses.
  */
-export const workers_binding_kind_json_output: JsonSchema = {
+export const workers_binding_kind_json: JsonSchema = {
   "properties": {
     "json": {
       "type": "object"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10842,10 +9596,10 @@ export const workers_binding_kind_json_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_k2` in responses.
  */
-export const workers_binding_kind_k2_output: JsonSchema = {
+export const workers_binding_kind_k2: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "stream": {
       "type": "string"
@@ -10868,13 +9622,13 @@ export const workers_binding_kind_k2_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_kv_namespace` in responses.
  */
-export const workers_binding_kind_kv_namespace_output: JsonSchema = {
+export const workers_binding_kind_kv_namespace: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "namespace_id": {
-      "$ref": "#/$defs/workers_namespace_identifier"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10894,10 +9648,10 @@ export const workers_binding_kind_kv_namespace_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_media` in responses.
  */
-export const workers_binding_kind_media_output: JsonSchema = {
+export const workers_binding_kind_media: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10916,10 +9670,10 @@ export const workers_binding_kind_media_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_messaging` in responses.
  */
-export const workers_binding_kind_messaging_output: JsonSchema = {
+export const workers_binding_kind_messaging: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "namespace": {
       "type": "string"
@@ -10942,13 +9696,13 @@ export const workers_binding_kind_messaging_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_mtls_certificate` in responses.
  */
-export const workers_binding_kind_mtls_certificate_output: JsonSchema = {
+export const workers_binding_kind_mtls_certificate: JsonSchema = {
   "properties": {
     "certificate_id": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -10968,10 +9722,10 @@ export const workers_binding_kind_mtls_certificate_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_pipelines` in responses.
  */
-export const workers_binding_kind_pipelines_output: JsonSchema = {
+export const workers_binding_kind_pipelines: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "pipeline": {
       "type": "string"
@@ -10994,10 +9748,10 @@ export const workers_binding_kind_pipelines_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_plain_text` in responses.
  */
-export const workers_binding_kind_plain_text_output: JsonSchema = {
+export const workers_binding_kind_plain_text: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "text": {
       "type": "string"
@@ -11020,10 +9774,10 @@ export const workers_binding_kind_plain_text_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_queue` in responses.
  */
-export const workers_binding_kind_queue_output: JsonSchema = {
+export const workers_binding_kind_queue: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "queue_name": {
       "type": "string"
@@ -11046,7 +9800,7 @@ export const workers_binding_kind_queue_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_r2_bucket` in responses.
  */
-export const workers_binding_kind_r2_bucket_output: JsonSchema = {
+export const workers_binding_kind_r2_bucket: JsonSchema = {
   "properties": {
     "bucket_name": {
       "type": "string"
@@ -11061,7 +9815,7 @@ export const workers_binding_kind_r2_bucket_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -11081,10 +9835,10 @@ export const workers_binding_kind_r2_bucket_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_ratelimit` in responses.
  */
-export const workers_binding_kind_ratelimit_output: JsonSchema = {
+export const workers_binding_kind_ratelimit: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "namespace_id": {
       "type": "string"
@@ -11126,7 +9880,7 @@ export const workers_binding_kind_ratelimit_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_secret_key` in responses.
  */
-export const workers_binding_kind_secret_key_output: JsonSchema = {
+export const workers_binding_kind_secret_key: JsonSchema = {
   "properties": {
     "algorithm": {
       "type": "object"
@@ -11147,7 +9901,7 @@ export const workers_binding_kind_secret_key_output: JsonSchema = {
       "type": "object"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -11185,10 +9939,10 @@ export const workers_binding_kind_secret_key_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_secret_text` in responses.
  */
-export const workers_binding_kind_secret_text_output: JsonSchema = {
+export const workers_binding_kind_secret_text: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "text": {
       "type": "string"
@@ -11211,10 +9965,10 @@ export const workers_binding_kind_secret_text_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_secrets_store_secret` in responses.
  */
-export const workers_binding_kind_secrets_store_secret_output: JsonSchema = {
+export const workers_binding_kind_secrets_store_secret: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "secret_name": {
       "type": "string"
@@ -11241,7 +9995,7 @@ export const workers_binding_kind_secrets_store_secret_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_send_email` in responses.
  */
-export const workers_binding_kind_send_email_output: JsonSchema = {
+export const workers_binding_kind_send_email: JsonSchema = {
   "properties": {
     "allowed_destination_addresses": {
       "items": {
@@ -11259,7 +10013,7 @@ export const workers_binding_kind_send_email_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -11278,7 +10032,7 @@ export const workers_binding_kind_send_email_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_service` in responses.
  */
-export const workers_binding_kind_service_output: JsonSchema = {
+export const workers_binding_kind_service: JsonSchema = {
   "properties": {
     "entrypoint": {
       "type": "string"
@@ -11287,7 +10041,7 @@ export const workers_binding_kind_service_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "service": {
       "type": "string"
@@ -11310,10 +10064,10 @@ export const workers_binding_kind_service_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_text_blob` in responses.
  */
-export const workers_binding_kind_text_blob_output: JsonSchema = {
+export const workers_binding_kind_text_blob: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "part": {
       "type": "string"
@@ -11336,13 +10090,13 @@ export const workers_binding_kind_text_blob_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_vectorize` in responses.
  */
-export const workers_binding_kind_vectorize_output: JsonSchema = {
+export const workers_binding_kind_vectorize: JsonSchema = {
   "properties": {
     "index_name": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -11362,10 +10116,10 @@ export const workers_binding_kind_vectorize_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_version_metadata` in responses.
  */
-export const workers_binding_kind_version_metadata_output: JsonSchema = {
+export const workers_binding_kind_version_metadata: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -11384,7 +10138,7 @@ export const workers_binding_kind_version_metadata_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_vpc_network` in responses.
  */
-export const workers_binding_kind_vpc_network_output: JsonSchema = {
+export const workers_binding_kind_vpc_network: JsonSchema = {
   "properties": {
     "identity": {
       "enum": [
@@ -11393,7 +10147,7 @@ export const workers_binding_kind_vpc_network_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "network_id": {
       "type": "string"
@@ -11418,10 +10172,10 @@ export const workers_binding_kind_vpc_network_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_vpc_service` in responses.
  */
-export const workers_binding_kind_vpc_service_output: JsonSchema = {
+export const workers_binding_kind_vpc_service: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "service_id": {
       "type": "string"
@@ -11444,10 +10198,10 @@ export const workers_binding_kind_vpc_service_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_wasm_module` in responses.
  */
-export const workers_binding_kind_wasm_module_output: JsonSchema = {
+export const workers_binding_kind_wasm_module: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "part": {
       "type": "string"
@@ -11470,13 +10224,13 @@ export const workers_binding_kind_wasm_module_output: JsonSchema = {
 /**
  * The schema of `workers_binding_kind_workflow` in responses.
  */
-export const workers_binding_kind_workflow_output: JsonSchema = {
+export const workers_binding_kind_workflow: JsonSchema = {
   "properties": {
     "class_name": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name"
+      "type": "string"
     },
     "script_name": {
       "type": "string"
@@ -11499,17 +10253,10 @@ export const workers_binding_kind_workflow_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_binding_name` in responses.
- */
-export const workers_binding_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_bindings` in responses.
  */
-export const workers_bindings_output: JsonSchema = {
+export const workers_bindings: JsonSchema = {
   "items": {
     "$ref": "#/$defs/workers_binding_item"
   },
@@ -11519,7 +10266,7 @@ export const workers_bindings_output: JsonSchema = {
 /**
  * The schema of `workers_cache_options` in responses.
  */
-export const workers_cache_options_output: JsonSchema = {
+export const workers_cache_options: JsonSchema = {
   "properties": {
     "cross_version_cache": {
       "type": "boolean"
@@ -11537,7 +10284,7 @@ export const workers_cache_options_output: JsonSchema = {
 /**
  * The schema of `workers_code_update_strategy` in responses.
  */
-export const workers_code_update_strategy_output: JsonSchema = {
+export const workers_code_update_strategy: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -11580,26 +10327,12 @@ export const workers_code_update_strategy_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_compatibility_date` in responses.
- */
-export const workers_compatibility_date_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `workers_compatibility_flag` in responses.
- */
-export const workers_compatibility_flag_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_compatibility_flags` in responses.
  */
-export const workers_compatibility_flags_output: JsonSchema = {
+export const workers_compatibility_flags: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/workers_compatibility_flag"
+    "type": "string"
   },
   "type": "array"
 };
@@ -11607,7 +10340,7 @@ export const workers_compatibility_flags_output: JsonSchema = {
 /**
  * The schema of `workers_create-assets-upload-session-response` in responses.
  */
-export const workers_create_assets_upload_session_response_output: JsonSchema = {
+export const workers_create$$assets$$upload$$session$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
@@ -11637,18 +10370,10 @@ export const workers_create_assets_upload_session_response_output: JsonSchema =
   ]
 };
 
-/**
- * The schema of `workers_created_on` in responses.
- */
-export const workers_created_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `workers_durable_object_deleted_export` in responses.
  */
-export const workers_durable_object_deleted_export_output: JsonSchema = {
+export const workers_durable_object_deleted_export: JsonSchema = {
   "properties": {
     "state": {
       "enum": [
@@ -11674,7 +10399,7 @@ export const workers_durable_object_deleted_export_output: JsonSchema = {
  * The schema of `workers_durable_object_expecting_transfer_export` in
  * responses.
  */
-export const workers_durable_object_expecting_transfer_export_output: JsonSchema = {
+export const workers_durable_object_expecting_transfer_export: JsonSchema = {
   "properties": {
     "container": {
       "type": "string"
@@ -11686,7 +10411,11 @@ export const workers_durable_object_expecting_transfer_export_output: JsonSchema
       "type": "string"
     },
     "storage": {
-      "$ref": "#/$defs/workers_export_storage"
+      "enum": [
+        "sqlite",
+        "legacy-kv"
+      ],
+      "type": "string"
     },
     "transfer_from": {
       "type": "string"
@@ -11710,7 +10439,7 @@ export const workers_durable_object_expecting_transfer_export_output: JsonSchema
 /**
  * The schema of `workers_durable_object_export` in responses.
  */
-export const workers_durable_object_export_output: JsonSchema = {
+export const workers_durable_object_export: JsonSchema = {
   "properties": {
     "container": {
       "type": "string"
@@ -11722,7 +10451,11 @@ export const workers_durable_object_export_output: JsonSchema = {
       "type": "string"
     },
     "storage": {
-      "$ref": "#/$defs/workers_export_storage"
+      "enum": [
+        "sqlite",
+        "legacy-kv"
+      ],
+      "type": "string"
     },
     "type": {
       "enum": [
@@ -11741,7 +10474,7 @@ export const workers_durable_object_export_output: JsonSchema = {
 /**
  * The schema of `workers_durable_object_export_variants` in responses.
  */
-export const workers_durable_object_export_variants_output: JsonSchema = {
+export const workers_durable_object_export_variants: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/workers_durable_object_export"
@@ -11764,7 +10497,7 @@ export const workers_durable_object_export_variants_output: JsonSchema = {
 /**
  * The schema of `workers_durable_object_renamed_export` in responses.
  */
-export const workers_durable_object_renamed_export_output: JsonSchema = {
+export const workers_durable_object_renamed_export: JsonSchema = {
   "properties": {
     "renamed_to": {
       "type": "string"
@@ -11793,7 +10526,7 @@ export const workers_durable_object_renamed_export_output: JsonSchema = {
 /**
  * The schema of `workers_durable_object_transferred_export` in responses.
  */
-export const workers_durable_object_transferred_export_output: JsonSchema = {
+export const workers_durable_object_transferred_export: JsonSchema = {
   "properties": {
     "state": {
       "enum": [
@@ -11822,7 +10555,7 @@ export const workers_durable_object_transferred_export_output: JsonSchema = {
 /**
  * The schema of `workers_entrypoint_cache_options` in responses.
  */
-export const workers_entrypoint_cache_options_output: JsonSchema = {
+export const workers_entrypoint_cache_options: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -11834,17 +10567,10 @@ export const workers_entrypoint_cache_options_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_etag` in responses.
- */
-export const workers_etag_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_export_config` in responses.
  */
-export const workers_export_config_output: JsonSchema = {
+export const workers_export_config: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/workers_worker_export"
@@ -11855,21 +10581,10 @@ export const workers_export_config_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_export_storage` in responses.
- */
-export const workers_export_storage_output: JsonSchema = {
-  "enum": [
-    "sqlite",
-    "legacy-kv"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `workers_exports_config_map` in responses.
  */
-export const workers_exports_config_map_output: JsonSchema = {
+export const workers_exports_config_map: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/workers_export_config"
   },
@@ -11879,7 +10594,7 @@ export const workers_exports_config_map_output: JsonSchema = {
 /**
  * The schema of `workers_exports_reconciliation_error` in responses.
  */
-export const workers_exports_reconciliation_error_output: JsonSchema = {
+export const workers_exports_reconciliation_error: JsonSchema = {
   "properties": {
     "class": {
       "type": "string"
@@ -11898,7 +10613,42 @@ export const workers_exports_reconciliation_error_output: JsonSchema = {
       "type": "array"
     },
     "scenario": {
-      "$ref": "#/$defs/workers_exports_reconciliation_scenario"
+      "enum": [
+        "code_class_not_in_exports",
+        "provisioned_class_missing_from_config",
+        "config_export_not_in_code",
+        "config_references_nonexistent_class",
+        "orphaned_provisioned_namespace",
+        "storage_type_mismatch",
+        "free_tier_requires_sqlite",
+        "invalid_export",
+        "tombstone_delete_class_still_in_code",
+        "tombstone_delete_blocked_by_external_bindings",
+        "tombstone_renamed_to_occupied",
+        "transferred_pending_not_found",
+        "transferred_target_missing",
+        "transferred_target_mismatch",
+        "phase_one_transfer_source_missing",
+        "phase_one_transfer_source_namespace_missing",
+        "phase_one_transfer_target_class_provisioned",
+        "phase_one_transfer_after_commit_mismatch",
+        "phase_one_transfer_duplicate",
+        "phase_one_transfer_target_in_dispatch_namespace",
+        "phase_one_transfer_source_in_dispatch_namespace",
+        "transferred_source_in_dispatch_namespace",
+        "transferred_target_in_dispatch_namespace",
+        "container_undeclared_reference",
+        "container_class_not_durable_object",
+        "container_wiring_inconsistent",
+        "container_multiple_durable_objects",
+        "transfer_container_parity_mismatch",
+        "transfer_container_parity_mismatch_on_commit",
+        "tombstone_class_still_in_code",
+        "stale_tombstone",
+        "transfer_receive_already_applied",
+        "transfer_receive_cleanup_complete"
+      ],
+      "type": "string"
     },
     "suggestion": {
       "type": "string"
@@ -11915,7 +10665,7 @@ export const workers_exports_reconciliation_error_output: JsonSchema = {
 /**
  * The schema of `workers_exports_reconciliation_error_response` in responses.
  */
-export const workers_exports_reconciliation_error_response_output: JsonSchema = {
+export const workers_exports_reconciliation_error_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -11978,7 +10728,7 @@ export const workers_exports_reconciliation_error_response_output: JsonSchema =
 /**
  * The schema of `workers_exports_reconciliation_info` in responses.
  */
-export const workers_exports_reconciliation_info_output: JsonSchema = {
+export const workers_exports_reconciliation_info: JsonSchema = {
   "properties": {
     "class": {
       "type": "string"
@@ -11997,7 +10747,42 @@ export const workers_exports_reconciliation_info_output: JsonSchema = {
       "type": "array"
     },
     "scenario": {
-      "$ref": "#/$defs/workers_exports_reconciliation_scenario"
+      "enum": [
+        "code_class_not_in_exports",
+        "provisioned_class_missing_from_config",
+        "config_export_not_in_code",
+        "config_references_nonexistent_class",
+        "orphaned_provisioned_namespace",
+        "storage_type_mismatch",
+        "free_tier_requires_sqlite",
+        "invalid_export",
+        "tombstone_delete_class_still_in_code",
+        "tombstone_delete_blocked_by_external_bindings",
+        "tombstone_renamed_to_occupied",
+        "transferred_pending_not_found",
+        "transferred_target_missing",
+        "transferred_target_mismatch",
+        "phase_one_transfer_source_missing",
+        "phase_one_transfer_source_namespace_missing",
+        "phase_one_transfer_target_class_provisioned",
+        "phase_one_transfer_after_commit_mismatch",
+        "phase_one_transfer_duplicate",
+        "phase_one_transfer_target_in_dispatch_namespace",
+        "phase_one_transfer_source_in_dispatch_namespace",
+        "transferred_source_in_dispatch_namespace",
+        "transferred_target_in_dispatch_namespace",
+        "container_undeclared_reference",
+        "container_class_not_durable_object",
+        "container_wiring_inconsistent",
+        "container_multiple_durable_objects",
+        "transfer_container_parity_mismatch",
+        "transfer_container_parity_mismatch_on_commit",
+        "tombstone_class_still_in_code",
+        "stale_tombstone",
+        "transfer_receive_already_applied",
+        "transfer_receive_cleanup_complete"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -12011,7 +10796,7 @@ export const workers_exports_reconciliation_info_output: JsonSchema = {
 /**
  * The schema of `workers_exports_reconciliation_rename` in responses.
  */
-export const workers_exports_reconciliation_rename_output: JsonSchema = {
+export const workers_exports_reconciliation_rename: JsonSchema = {
   "properties": {
     "from": {
       "type": "string"
@@ -12030,7 +10815,7 @@ export const workers_exports_reconciliation_rename_output: JsonSchema = {
 /**
  * The schema of `workers_exports_reconciliation_result` in responses.
  */
-export const workers_exports_reconciliation_result_output: JsonSchema = {
+export const workers_exports_reconciliation_result: JsonSchema = {
   "properties": {
     "created": {
       "items": {
@@ -12101,52 +10886,10 @@ export const workers_exports_reconciliation_result_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_exports_reconciliation_scenario` in responses.
- */
-export const workers_exports_reconciliation_scenario_output: JsonSchema = {
-  "enum": [
-    "code_class_not_in_exports",
-    "provisioned_class_missing_from_config",
-    "config_export_not_in_code",
-    "config_references_nonexistent_class",
-    "orphaned_provisioned_namespace",
-    "storage_type_mismatch",
-    "free_tier_requires_sqlite",
-    "invalid_export",
-    "tombstone_delete_class_still_in_code",
-    "tombstone_delete_blocked_by_external_bindings",
-    "tombstone_renamed_to_occupied",
-    "transferred_pending_not_found",
-    "transferred_target_missing",
-    "transferred_target_mismatch",
-    "phase_one_transfer_source_missing",
-    "phase_one_transfer_source_namespace_missing",
-    "phase_one_transfer_target_class_provisioned",
-    "phase_one_transfer_after_commit_mismatch",
-    "phase_one_transfer_duplicate",
-    "phase_one_transfer_target_in_dispatch_namespace",
-    "phase_one_transfer_source_in_dispatch_namespace",
-    "transferred_source_in_dispatch_namespace",
-    "transferred_target_in_dispatch_namespace",
-    "container_undeclared_reference",
-    "container_class_not_durable_object",
-    "container_wiring_inconsistent",
-    "container_multiple_durable_objects",
-    "transfer_container_parity_mismatch",
-    "transfer_container_parity_mismatch_on_commit",
-    "tombstone_class_still_in_code",
-    "stale_tombstone",
-    "transfer_receive_already_applied",
-    "transfer_receive_cleanup_complete"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `workers_exports_reconciliation_transfer` in responses.
  */
-export const workers_exports_reconciliation_transfer_output: JsonSchema = {
+export const workers_exports_reconciliation_transfer: JsonSchema = {
   "properties": {
     "class": {
       "type": "string"
@@ -12172,7 +10915,7 @@ export const workers_exports_reconciliation_transfer_output: JsonSchema = {
 /**
  * The schema of `workers_exports_reconciliation_transfer_pending` in responses.
  */
-export const workers_exports_reconciliation_transfer_pending_output: JsonSchema = {
+export const workers_exports_reconciliation_transfer_pending: JsonSchema = {
   "properties": {
     "class": {
       "type": "string"
@@ -12191,7 +10934,7 @@ export const workers_exports_reconciliation_transfer_pending_output: JsonSchema
 /**
  * The schema of `workers_exports_reconciliation_warning` in responses.
  */
-export const workers_exports_reconciliation_warning_output: JsonSchema = {
+export const workers_exports_reconciliation_warning: JsonSchema = {
   "properties": {
     "class": {
       "type": "string"
@@ -12204,7 +10947,42 @@ export const workers_exports_reconciliation_warning_output: JsonSchema = {
       "type": "string"
     },
     "scenario": {
-      "$ref": "#/$defs/workers_exports_reconciliation_scenario"
+      "enum": [
+        "code_class_not_in_exports",
+        "provisioned_class_missing_from_config",
+        "config_export_not_in_code",
+        "config_references_nonexistent_class",
+        "orphaned_provisioned_namespace",
+        "storage_type_mismatch",
+        "free_tier_requires_sqlite",
+        "invalid_export",
+        "tombstone_delete_class_still_in_code",
+        "tombstone_delete_blocked_by_external_bindings",
+        "tombstone_renamed_to_occupied",
+        "transferred_pending_not_found",
+        "transferred_target_missing",
+        "transferred_target_mismatch",
+        "phase_one_transfer_source_missing",
+        "phase_one_transfer_source_namespace_missing",
+        "phase_one_transfer_target_class_provisioned",
+        "phase_one_transfer_after_commit_mismatch",
+        "phase_one_transfer_duplicate",
+        "phase_one_transfer_target_in_dispatch_namespace",
+        "phase_one_transfer_source_in_dispatch_namespace",
+        "transferred_source_in_dispatch_namespace",
+        "transferred_target_in_dispatch_namespace",
+        "container_undeclared_reference",
+        "container_class_not_durable_object",
+        "container_wiring_inconsistent",
+        "container_multiple_durable_objects",
+        "transfer_container_parity_mismatch",
+        "transfer_container_parity_mismatch_on_commit",
+        "tombstone_class_still_in_code",
+        "stale_tombstone",
+        "transfer_receive_already_applied",
+        "transfer_receive_cleanup_complete"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -12215,31 +10993,10 @@ export const workers_exports_reconciliation_warning_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_has_assets` in responses.
- */
-export const workers_has_assets_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `workers_has_modules` in responses.
- */
-export const workers_has_modules_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `workers_identifier` in responses.
- */
-export const workers_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_limits` in responses.
  */
-export const workers_limits_output: JsonSchema = {
+export const workers_limits: JsonSchema = {
   "properties": {
     "cpu_ms": {
       "type": "integer"
@@ -12251,17 +11008,10 @@ export const workers_limits_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_logpush` in responses.
- */
-export const workers_logpush_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `workers_messages` in responses.
  */
-export const workers_messages_output: JsonSchema = {
+export const workers_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -12294,7 +11044,7 @@ export const workers_messages_output: JsonSchema = {
 /**
  * The schema of `workers_migration_step` in responses.
  */
-export const workers_migration_step_output: JsonSchema = {
+export const workers_migration_step: JsonSchema = {
   "properties": {
     "deleted_classes": {
       "items": {
@@ -12352,7 +11102,7 @@ export const workers_migration_step_output: JsonSchema = {
 /**
  * The schema of `workers_migration_tag_conditions` in responses.
  */
-export const workers_migration_tag_conditions_output: JsonSchema = {
+export const workers_migration_tag_conditions: JsonSchema = {
   "properties": {
     "new_tag": {
       "type": "string"
@@ -12364,18 +11114,10 @@ export const workers_migration_tag_conditions_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_modified_on` in responses.
- */
-export const workers_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `workers_multiple_step_migrations` in responses.
  */
-export const workers_multiple_step_migrations_output: JsonSchema = {
+export const workers_multiple_step_migrations: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_migration_tag_conditions"
@@ -12394,17 +11136,10 @@ export const workers_multiple_step_migrations_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_namespace_identifier` in responses.
- */
-export const workers_namespace_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_observability-2` in responses.
  */
-export const workers_observability_2_output: JsonSchema = {
+export const workers_observability$$2: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -12536,7 +11271,7 @@ export const workers_observability_2_output: JsonSchema = {
 /**
  * The schema of `workers_placement_info` in responses.
  */
-export const workers_placement_info_output: JsonSchema = {
+export const workers_placement_info: JsonSchema = {
   "allOf": [
     {
       "oneOf": [
@@ -12673,7 +11408,12 @@ export const workers_placement_info_output: JsonSchema = {
           "type": "string"
         },
         "status": {
-          "$ref": "#/$defs/workers_placement_status"
+          "enum": [
+            "SUCCESS",
+            "UNSUPPORTED_APPLICATION",
+            "INSUFFICIENT_INVOCATIONS"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -12684,7 +11424,7 @@ export const workers_placement_info_output: JsonSchema = {
 /**
  * The schema of `workers_placement_info_no_status` in responses.
  */
-export const workers_placement_info_no_status_output: JsonSchema = {
+export const workers_placement_info_no_status: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -12813,33 +11553,10 @@ export const workers_placement_info_no_status_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_placement_mode` in responses.
- */
-export const workers_placement_mode_output: JsonSchema = {
-  "enum": [
-    "smart",
-    "targeted"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `workers_placement_status` in responses.
- */
-export const workers_placement_status_output: JsonSchema = {
-  "enum": [
-    "SUCCESS",
-    "UNSUPPORTED_APPLICATION",
-    "INSUFFICIENT_INVOCATIONS"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `workers_placement_target` in responses.
  */
-export const workers_placement_target_output: JsonSchema = {
+export const workers_placement_target: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -12880,22 +11597,23 @@ export const workers_placement_target_output: JsonSchema = {
 /**
  * The schema of `workers_script-response` in responses.
  */
-export const workers_script_response_output: JsonSchema = {
+export const workers_script$$response: JsonSchema = {
   "properties": {
     "cache_options": {
       "$ref": "#/$defs/workers_cache_options"
     },
     "compatibility_date": {
-      "$ref": "#/$defs/workers_compatibility_date"
+      "type": "string"
     },
     "compatibility_flags": {
       "$ref": "#/$defs/workers_compatibility_flags"
     },
     "created_on": {
-      "$ref": "#/$defs/workers_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "etag": {
-      "$ref": "#/$defs/workers_etag"
+      "type": "string"
     },
     "exports": {
       "$ref": "#/$defs/workers_exports_config_map"
@@ -12907,10 +11625,10 @@ export const workers_script_response_output: JsonSchema = {
       "type": "array"
     },
     "has_assets": {
-      "$ref": "#/$defs/workers_has_assets"
+      "type": "boolean"
     },
     "has_modules": {
-      "$ref": "#/$defs/workers_has_modules"
+      "type": "boolean"
     },
     "id": {
       "type": "string"
@@ -12919,13 +11637,14 @@ export const workers_script_response_output: JsonSchema = {
       "type": "string"
     },
     "logpush": {
-      "$ref": "#/$defs/workers_logpush"
+      "type": "boolean"
     },
     "migration_tag": {
       "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/workers_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "named_handlers": {
       "items": {
@@ -12953,7 +11672,11 @@ export const workers_script_response_output: JsonSchema = {
     "placement_mode": {
       "allOf": [
         {
-          "$ref": "#/$defs/workers_placement_mode"
+          "enum": [
+            "smart",
+            "targeted"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -12963,7 +11686,12 @@ export const workers_script_response_output: JsonSchema = {
     "placement_status": {
       "allOf": [
         {
-          "$ref": "#/$defs/workers_placement_status"
+          "enum": [
+            "SUCCESS",
+            "UNSUPPORTED_APPLICATION",
+            "INSUFFICIENT_INVOCATIONS"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -12980,23 +11708,21 @@ export const workers_script_response_output: JsonSchema = {
       "$ref": "#/$defs/workers_tail_consumers"
     },
     "usage_model": {
-      "$ref": "#/$defs/workers_usage_model"
+      "enum": [
+        "standard",
+        "bundled",
+        "unbound"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `workers_script_name` in responses.
- */
-export const workers_script_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_secret` in responses.
  */
-export const workers_secret_output: JsonSchema = {
+export const workers_secret: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/workers_binding_kind_secret_text"
@@ -13010,7 +11736,7 @@ export const workers_secret_output: JsonSchema = {
 /**
  * The schema of `workers_secret-patch-response` in responses.
  */
-export const workers_secret_patch_response_output: JsonSchema = {
+export const workers_secret$$patch$$response: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/workers_secret"
   },
@@ -13020,7 +11746,7 @@ export const workers_secret_patch_response_output: JsonSchema = {
 /**
  * The schema of `workers_single_step_migrations` in responses.
  */
-export const workers_single_step_migrations_output: JsonSchema = {
+export const workers_single_step_migrations: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_migration_tag_conditions"
@@ -13031,21 +11757,14 @@ export const workers_single_step_migrations_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_tag` in responses.
- */
-export const workers_tag_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_tags` in responses.
  */
-export const workers_tags_output: JsonSchema = {
+export const workers_tags: JsonSchema = {
   "oneOf": [
     {
       "items": {
-        "$ref": "#/$defs/workers_tag"
+        "type": "string"
       },
       "maxItems": 10,
       "type": "array"
@@ -13059,7 +11778,7 @@ export const workers_tags_output: JsonSchema = {
 /**
  * The schema of `workers_tail_consumers` in responses.
  */
-export const workers_tail_consumers_output: JsonSchema = {
+export const workers_tail_consumers: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -13076,7 +11795,7 @@ export const workers_tail_consumers_output: JsonSchema = {
 /**
  * The schema of `workers_tail_consumers_script` in responses.
  */
-export const workers_tail_consumers_script_output: JsonSchema = {
+export const workers_tail_consumers_script: JsonSchema = {
   "properties": {
     "environment": {
       "type": "string"
@@ -13094,22 +11813,10 @@ export const workers_tail_consumers_script_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_usage_model` in responses.
- */
-export const workers_usage_model_output: JsonSchema = {
-  "enum": [
-    "standard",
-    "bundled",
-    "unbound"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `workers_worker_export` in responses.
  */
-export const workers_worker_export_output: JsonSchema = {
+export const workers_worker_export: JsonSchema = {
   "properties": {
     "cache": {
       "$ref": "#/$defs/workers_entrypoint_cache_options"
@@ -13136,7 +11843,7 @@ export const workers_worker_export_output: JsonSchema = {
 /**
  * The schema of `zones_api-response-common-failure-2` in responses.
  */
-export const zones_api_response_common_failure_2_output: JsonSchema = {
+export const zones_api$$response$$common$$failure$$2: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zones_messages-2"
@@ -13163,17 +11870,10 @@ export const zones_api_response_common_failure_2_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_identifier-2` in responses.
- */
-export const zones_identifier_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zones_messages-2` in responses.
  */
-export const zones_messages_2_output: JsonSchema = {
+export const zones_messages$$2: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/pageRules/outputs.ts b/src/generated/forge-mcp/pageRules/outputs.ts
index 30f721288..97883141d 100644
--- a/src/generated/forge-mcp/pageRules/outputs.ts
+++ b/src/generated/forge-mcp/pageRules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `zones_actions` in responses.
  */
-export const zones_actions_output: JsonSchema = {
+export const zones_actions: JsonSchema = {
   "items": {
     "oneOf": [
       {
@@ -119,7 +119,7 @@ export const zones_actions_output: JsonSchema = {
 /**
  * The schema of `zones_always_use_https` in responses.
  */
-export const zones_always_use_https_output: JsonSchema = {
+export const zones_always_use_https: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -134,7 +134,7 @@ export const zones_always_use_https_output: JsonSchema = {
 /**
  * The schema of `zones_api-response-common-2` in responses.
  */
-export const zones_api_response_common_2_output: JsonSchema = {
+export const zones_api$$response$$common$$2: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zones_messages-2"
@@ -160,7 +160,7 @@ export const zones_api_response_common_2_output: JsonSchema = {
 /**
  * The schema of `zones_api-response-single` in responses.
  */
-export const zones_api_response_single_output: JsonSchema = {
+export const zones_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zones_messages-2"
@@ -186,7 +186,7 @@ export const zones_api_response_single_output: JsonSchema = {
 /**
  * The schema of `zones_api-response-single-id-2` in responses.
  */
-export const zones_api_response_single_id_2_output: JsonSchema = {
+export const zones_api$$response$$single$$id$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_api-response-common-2"
@@ -198,7 +198,7 @@ export const zones_api_response_single_id_2_output: JsonSchema = {
             {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/zones_identifier-2"
+                  "type": "string"
                 }
               },
               "required": [
@@ -220,7 +220,7 @@ export const zones_api_response_single_id_2_output: JsonSchema = {
 /**
  * The schema of `zones_automatic_https_rewrites` in responses.
  */
-export const zones_automatic_https_rewrites_output: JsonSchema = {
+export const zones_automatic_https_rewrites: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -242,7 +242,7 @@ export const zones_automatic_https_rewrites_output: JsonSchema = {
 /**
  * The schema of `zones_browser_cache_ttl` in responses.
  */
-export const zones_browser_cache_ttl_output: JsonSchema = {
+export const zones_browser_cache_ttl: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -260,7 +260,7 @@ export const zones_browser_cache_ttl_output: JsonSchema = {
 /**
  * The schema of `zones_browser_check` in responses.
  */
-export const zones_browser_check_output: JsonSchema = {
+export const zones_browser_check: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -282,7 +282,7 @@ export const zones_browser_check_output: JsonSchema = {
 /**
  * The schema of `zones_bypass_cache_on_cookie` in responses.
  */
-export const zones_bypass_cache_on_cookie_output: JsonSchema = {
+export const zones_bypass_cache_on_cookie: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -300,7 +300,7 @@ export const zones_bypass_cache_on_cookie_output: JsonSchema = {
 /**
  * The schema of `zones_cache_by_device_type` in responses.
  */
-export const zones_cache_by_device_type_output: JsonSchema = {
+export const zones_cache_by_device_type: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -322,7 +322,7 @@ export const zones_cache_by_device_type_output: JsonSchema = {
 /**
  * The schema of `zones_cache_deception_armor` in responses.
  */
-export const zones_cache_deception_armor_output: JsonSchema = {
+export const zones_cache_deception_armor: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -344,7 +344,7 @@ export const zones_cache_deception_armor_output: JsonSchema = {
 /**
  * The schema of `zones_cache_key_fields` in responses.
  */
-export const zones_cache_key_fields_output: JsonSchema = {
+export const zones_cache_key_fields: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -477,7 +477,7 @@ export const zones_cache_key_fields_output: JsonSchema = {
 /**
  * The schema of `zones_cache_level` in responses.
  */
-export const zones_cache_level_output: JsonSchema = {
+export const zones_cache_level: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -502,7 +502,7 @@ export const zones_cache_level_output: JsonSchema = {
 /**
  * The schema of `zones_cache_on_cookie` in responses.
  */
-export const zones_cache_on_cookie_output: JsonSchema = {
+export const zones_cache_on_cookie: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -520,7 +520,7 @@ export const zones_cache_on_cookie_output: JsonSchema = {
 /**
  * The schema of `zones_cache_ttl_by_status` in responses.
  */
-export const zones_cache_ttl_by_status_output: JsonSchema = {
+export const zones_cache_ttl_by_status: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -549,18 +549,10 @@ export const zones_cache_ttl_by_status_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_created_on` in responses.
- */
-export const zones_created_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `zones_disable_apps` in responses.
  */
-export const zones_disable_apps_output: JsonSchema = {
+export const zones_disable_apps: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -575,7 +567,7 @@ export const zones_disable_apps_output: JsonSchema = {
 /**
  * The schema of `zones_disable_performance` in responses.
  */
-export const zones_disable_performance_output: JsonSchema = {
+export const zones_disable_performance: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -590,7 +582,7 @@ export const zones_disable_performance_output: JsonSchema = {
 /**
  * The schema of `zones_disable_security` in responses.
  */
-export const zones_disable_security_output: JsonSchema = {
+export const zones_disable_security: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -605,7 +597,7 @@ export const zones_disable_security_output: JsonSchema = {
 /**
  * The schema of `zones_disable_zaraz` in responses.
  */
-export const zones_disable_zaraz_output: JsonSchema = {
+export const zones_disable_zaraz: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -620,7 +612,7 @@ export const zones_disable_zaraz_output: JsonSchema = {
 /**
  * The schema of `zones_edge_cache_ttl` in responses.
  */
-export const zones_edge_cache_ttl_output: JsonSchema = {
+export const zones_edge_cache_ttl: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -638,7 +630,7 @@ export const zones_edge_cache_ttl_output: JsonSchema = {
 /**
  * The schema of `zones_email_obfuscation` in responses.
  */
-export const zones_email_obfuscation_output: JsonSchema = {
+export const zones_email_obfuscation: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -660,7 +652,7 @@ export const zones_email_obfuscation_output: JsonSchema = {
 /**
  * The schema of `zones_explicit_cache_control` in responses.
  */
-export const zones_explicit_cache_control_output: JsonSchema = {
+export const zones_explicit_cache_control: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -682,7 +674,7 @@ export const zones_explicit_cache_control_output: JsonSchema = {
 /**
  * The schema of `zones_forwarding_url` in responses.
  */
-export const zones_forwarding_url_output: JsonSchema = {
+export const zones_forwarding_url: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -712,7 +704,7 @@ export const zones_forwarding_url_output: JsonSchema = {
 /**
  * The schema of `zones_host_header_override` in responses.
  */
-export const zones_host_header_override_output: JsonSchema = {
+export const zones_host_header_override: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -730,7 +722,7 @@ export const zones_host_header_override_output: JsonSchema = {
 /**
  * The schema of `zones_ip_geolocation` in responses.
  */
-export const zones_ip_geolocation_output: JsonSchema = {
+export const zones_ip_geolocation: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -752,7 +744,7 @@ export const zones_ip_geolocation_output: JsonSchema = {
 /**
  * The schema of `zones_mirage` in responses.
  */
-export const zones_mirage_output: JsonSchema = {
+export const zones_mirage: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -771,18 +763,10 @@ export const zones_mirage_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_modified_on` in responses.
- */
-export const zones_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `zones_opportunistic_encryption` in responses.
  */
-export const zones_opportunistic_encryption_output: JsonSchema = {
+export const zones_opportunistic_encryption: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -804,7 +788,7 @@ export const zones_opportunistic_encryption_output: JsonSchema = {
 /**
  * The schema of `zones_origin_error_page_pass_thru` in responses.
  */
-export const zones_origin_error_page_pass_thru_output: JsonSchema = {
+export const zones_origin_error_page_pass_thru: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -826,25 +810,31 @@ export const zones_origin_error_page_pass_thru_output: JsonSchema = {
 /**
  * The schema of `zones_page_rule` in responses.
  */
-export const zones_page_rule_output: JsonSchema = {
+export const zones_page_rule: JsonSchema = {
   "properties": {
     "actions": {
       "$ref": "#/$defs/zones_actions"
     },
     "created_on": {
-      "$ref": "#/$defs/zones_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zones_identifier-2"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/zones_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/zones_priority"
+      "type": "integer"
     },
     "status": {
-      "$ref": "#/$defs/zones_status"
+      "enum": [
+        "active",
+        "disabled"
+      ],
+      "type": "string"
     },
     "targets": {
       "$ref": "#/$defs/zones_targets"
@@ -865,7 +855,7 @@ export const zones_page_rule_output: JsonSchema = {
 /**
  * The schema of `zones_polish` in responses.
  */
-export const zones_polish_output: JsonSchema = {
+export const zones_polish: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -885,17 +875,10 @@ export const zones_polish_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_priority` in responses.
- */
-export const zones_priority_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `zones_resolve_override` in responses.
  */
-export const zones_resolve_override_output: JsonSchema = {
+export const zones_resolve_override: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -913,7 +896,7 @@ export const zones_resolve_override_output: JsonSchema = {
 /**
  * The schema of `zones_respect_strong_etag` in responses.
  */
-export const zones_respect_strong_etag_output: JsonSchema = {
+export const zones_respect_strong_etag: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -935,7 +918,7 @@ export const zones_respect_strong_etag_output: JsonSchema = {
 /**
  * The schema of `zones_response_buffering` in responses.
  */
-export const zones_response_buffering_output: JsonSchema = {
+export const zones_response_buffering: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -957,7 +940,7 @@ export const zones_response_buffering_output: JsonSchema = {
 /**
  * The schema of `zones_rocket_loader` in responses.
  */
-export const zones_rocket_loader_output: JsonSchema = {
+export const zones_rocket_loader: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -979,7 +962,7 @@ export const zones_rocket_loader_output: JsonSchema = {
 /**
  * The schema of `zones_security_level` in responses.
  */
-export const zones_security_level_output: JsonSchema = {
+export const zones_security_level: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -1005,7 +988,7 @@ export const zones_security_level_output: JsonSchema = {
 /**
  * The schema of `zones_sort_query_string_for_cache` in responses.
  */
-export const zones_sort_query_string_for_cache_output: JsonSchema = {
+export const zones_sort_query_string_for_cache: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -1027,7 +1010,7 @@ export const zones_sort_query_string_for_cache_output: JsonSchema = {
 /**
  * The schema of `zones_ssl` in responses.
  */
-export const zones_ssl_output: JsonSchema = {
+export const zones_ssl: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -1049,21 +1032,10 @@ export const zones_ssl_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_status` in responses.
- */
-export const zones_status_output: JsonSchema = {
-  "enum": [
-    "active",
-    "disabled"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_string_constraint` in responses.
  */
-export const zones_string_constraint_output: JsonSchema = {
+export const zones_string_constraint: JsonSchema = {
   "properties": {
     "operator": {
       "enum": [
@@ -1089,14 +1061,14 @@ export const zones_string_constraint_output: JsonSchema = {
 /**
  * The schema of `zones_target` in responses.
  */
-export const zones_target_output: JsonSchema = {
+export const zones_target: JsonSchema = {
   "$ref": "#/$defs/zones_url_target"
 };
 
 /**
  * The schema of `zones_targets` in responses.
  */
-export const zones_targets_output: JsonSchema = {
+export const zones_targets: JsonSchema = {
   "items": {
     "$ref": "#/$defs/zones_target"
   },
@@ -1106,7 +1078,7 @@ export const zones_targets_output: JsonSchema = {
 /**
  * The schema of `zones_true_client_ip_header` in responses.
  */
-export const zones_true_client_ip_header_output: JsonSchema = {
+export const zones_true_client_ip_header: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
@@ -1128,7 +1100,7 @@ export const zones_true_client_ip_header_output: JsonSchema = {
 /**
  * The schema of `zones_url_target` in responses.
  */
-export const zones_url_target_output: JsonSchema = {
+export const zones_url_target: JsonSchema = {
   "properties": {
     "constraint": {
       "allOf": [
@@ -1158,7 +1130,7 @@ export const zones_url_target_output: JsonSchema = {
 /**
  * The schema of `zones_waf` in responses.
  */
-export const zones_waf_output: JsonSchema = {
+export const zones_waf: JsonSchema = {
   "properties": {
     "id": {
       "enum": [
diff --git a/src/generated/forge-mcp/pageRules/schemas.ts b/src/generated/forge-mcp/pageRules/schemas.ts
index c8748f03c..abf525f35 100644
--- a/src/generated/forge-mcp/pageRules/schemas.ts
+++ b/src/generated/forge-mcp/pageRules/schemas.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../_/tool.js";
  * The schema of `zones_actions`.
  */
 export const zones_actions: JsonSchema = {
-  "description": "The set of actions to perform if the targets of this rule match the\nrequest. Actions can redirect to another URL or override settings, but\nnot both.\n",
+  "description": "The set of actions to perform if the targets of this rule match the\nrequest. Actions can redirect to another URL or override settings, but\nnot both.",
   "items": {
     "oneOf": [
       {
@@ -124,7 +124,7 @@ export const zones_always_use_https: JsonSchema = {
   "description": "Always Use HTTPS",
   "properties": {
     "id": {
-      "description": "If enabled, any `http://`` URL is converted to `https://` through a\n301 redirect.\n",
+      "description": "If enabled, any `http://`` URL is converted to `https://` through a\n301 redirect.",
       "enum": [
         "always_use_https"
       ],
@@ -148,7 +148,7 @@ export const zones_automatic_https_rewrites: JsonSchema = {
       "type": "string"
     },
     "value": {
-      "description": "The status of Automatic HTTPS Rewrites.\n",
+      "description": "The status of Automatic HTTPS Rewrites.",
       "enum": [
         "on",
         "off"
@@ -166,14 +166,14 @@ export const zones_browser_cache_ttl: JsonSchema = {
   "description": "Browser Cache TTL",
   "properties": {
     "id": {
-      "description": "Control how long resources cached by client browsers remain valid.\n",
+      "description": "Control how long resources cached by client browsers remain valid.",
       "enum": [
         "browser_cache_ttl"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The number of seconds to cache resources for.\nSetting this to 0 enables \"Respect Existing Headers\".\n",
+      "description": "The number of seconds to cache resources for.\nSetting this to 0 enables \"Respect Existing Headers\".",
       "type": "integer"
     }
   },
@@ -187,14 +187,14 @@ export const zones_browser_check: JsonSchema = {
   "description": "Browser Integrity Check",
   "properties": {
     "id": {
-      "description": "Inspect the visitor's browser for headers commonly associated with\nspammers and certain bots.\n",
+      "description": "Inspect the visitor's browser for headers commonly associated with\nspammers and certain bots.",
       "enum": [
         "browser_check"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Browser Integrity Check.\n",
+      "description": "The status of Browser Integrity Check.",
       "enum": [
         "on",
         "off"
@@ -212,14 +212,14 @@ export const zones_bypass_cache_on_cookie: JsonSchema = {
   "description": "Bypass Cache on Cookie",
   "properties": {
     "id": {
-      "description": "Bypass cache and fetch resources from the origin server if a regular\nexpression matches against a cookie name present in the request.\n",
+      "description": "Bypass cache and fetch resources from the origin server if a regular\nexpression matches against a cookie name present in the request.",
       "enum": [
         "bypass_cache_on_cookie"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The regular expression to use for matching cookie names in the\nrequest. Refer to [Bypass Cache on Cookie\nsetting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)\nto learn about limited regular expression support.\n",
+      "description": "The regular expression to use for matching cookie names in the\nrequest. Refer to [Bypass Cache on Cookie\nsetting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)\nto learn about limited regular expression support.",
       "type": "string"
     }
   },
@@ -233,14 +233,14 @@ export const zones_cache_by_device_type: JsonSchema = {
   "description": "Cache By Device Type",
   "properties": {
     "id": {
-      "description": "Separate cached content based on the visitor's device type.\n",
+      "description": "Separate cached content based on the visitor's device type.",
       "enum": [
         "cache_by_device_type"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Cache By Device Type.\n",
+      "description": "The status of Cache By Device Type.",
       "enum": [
         "on",
         "off"
@@ -258,14 +258,14 @@ export const zones_cache_deception_armor: JsonSchema = {
   "description": "Cache Deception Armor",
   "properties": {
     "id": {
-      "description": "Protect from web cache deception attacks while still allowing static\nassets to be cached. This setting verifies that the URL's extension\nmatches the returned `Content-Type`.\n",
+      "description": "Protect from web cache deception attacks while still allowing static\nassets to be cached. This setting verifies that the URL's extension\nmatches the returned `Content-Type`.",
       "enum": [
         "cache_deception_armor"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Cache Deception Armor.\n",
+      "description": "The status of Cache Deception Armor.",
       "enum": [
         "on",
         "off"
@@ -283,7 +283,7 @@ export const zones_cache_key_fields: JsonSchema = {
   "description": "Custom Cache Key",
   "properties": {
     "id": {
-      "description": "Control specifically what variables to include when deciding which\nresources to cache. This allows customers to determine what to cache\nbased on something other than just the URL.\n",
+      "description": "Control specifically what variables to include when deciding which\nresources to cache. This allows customers to determine what to cache\nbased on something other than just the URL.",
       "enum": [
         "cache_key_fields"
       ],
@@ -292,10 +292,10 @@ export const zones_cache_key_fields: JsonSchema = {
     "value": {
       "properties": {
         "cookie": {
-          "description": "Controls which cookies appear in the Cache Key.\n",
+          "description": "Controls which cookies appear in the Cache Key.",
           "properties": {
             "check_presence": {
-              "description": "A list of cookies to check for the presence of, without\nincluding their actual values.\n",
+              "description": "A list of cookies to check for the presence of, without\nincluding their actual values.",
               "items": {
                 "type": "string"
               },
@@ -304,7 +304,7 @@ export const zones_cache_key_fields: JsonSchema = {
               "type": "array"
             },
             "include": {
-              "description": "A list of cookies to include.\n",
+              "description": "A list of cookies to include.",
               "items": {
                 "type": "string"
               },
@@ -316,10 +316,10 @@ export const zones_cache_key_fields: JsonSchema = {
           "type": "object"
         },
         "header": {
-          "description": "Controls which headers go into the Cache Key. Exactly one of\n`include` or `exclude` is expected.\n",
+          "description": "Controls which headers go into the Cache Key. Exactly one of\n`include` or `exclude` is expected.",
           "properties": {
             "check_presence": {
-              "description": "A list of headers to check for the presence of, without\nincluding their actual values.\n",
+              "description": "A list of headers to check for the presence of, without\nincluding their actual values.",
               "items": {
                 "type": "string"
               },
@@ -328,7 +328,7 @@ export const zones_cache_key_fields: JsonSchema = {
               "type": "array"
             },
             "exclude": {
-              "description": "A list of headers to ignore.\n",
+              "description": "A list of headers to ignore.",
               "items": {
                 "type": "string"
               },
@@ -337,7 +337,7 @@ export const zones_cache_key_fields: JsonSchema = {
               "type": "array"
             },
             "include": {
-              "description": "A list of headers to include.\n",
+              "description": "A list of headers to include.",
               "items": {
                 "type": "string"
               },
@@ -349,17 +349,17 @@ export const zones_cache_key_fields: JsonSchema = {
           "type": "object"
         },
         "host": {
-          "description": "Determines which host header to include in the Cache Key.\n",
+          "description": "Determines which host header to include in the Cache Key.",
           "properties": {
             "resolved": {
-              "description": "Whether to include the Host header in the HTTP request sent\nto the origin.\n",
+              "description": "Whether to include the Host header in the HTTP request sent\nto the origin.",
               "type": "boolean"
             }
           },
           "type": "object"
         },
         "query_string": {
-          "description": "Controls which URL query string parameters go into the Cache\nKey. Exactly one of `include` or `exclude` is expected.\n",
+          "description": "Controls which URL query string parameters go into the Cache\nKey. Exactly one of `include` or `exclude` is expected.",
           "properties": {
             "exclude": {
               "oneOf": [
@@ -401,18 +401,18 @@ export const zones_cache_key_fields: JsonSchema = {
           "type": "object"
         },
         "user": {
-          "description": "Feature fields to add features about the end-user (client) into\nthe Cache Key.\n",
+          "description": "Feature fields to add features about the end-user (client) into\nthe Cache Key.",
           "properties": {
             "device_type": {
-              "description": "Classifies a request as `mobile`, `desktop`, or `tablet`\nbased on the User Agent.\n",
+              "description": "Classifies a request as `mobile`, `desktop`, or `tablet`\nbased on the User Agent.",
               "type": "boolean"
             },
             "geo": {
-              "description": "Includes the client's country, derived from the IP address.\n",
+              "description": "Includes the client's country, derived from the IP address.",
               "type": "boolean"
             },
             "lang": {
-              "description": "Includes the first language code contained in the\n`Accept-Language` header sent by the client.\n",
+              "description": "Includes the first language code contained in the\n`Accept-Language` header sent by the client.",
               "type": "boolean"
             }
           },
@@ -432,14 +432,14 @@ export const zones_cache_level: JsonSchema = {
   "description": "Cache Level",
   "properties": {
     "id": {
-      "description": "Apply custom caching based on the option selected.\n",
+      "description": "Apply custom caching based on the option selected.",
       "enum": [
         "cache_level"
       ],
       "type": "string"
     },
     "value": {
-      "description": "* `bypass`: Cloudflare does not cache.\n* `basic`: Delivers resources from cache when there is no query\n  string.\n* `simplified`: Delivers the same resource to everyone independent\n  of the query string.\n* `aggressive`: Caches all static content that has a query string.\n* `cache_everything`: Treats all content as static and caches all\n  file types beyond the [Cloudflare default cached\n  content](https://developers.cloudflare.com/cache/concepts/default-cache-behavior/#default-cached-file-extensions).\n",
+      "description": "* `bypass`: Cloudflare does not cache.\n* `basic`: Delivers resources from cache when there is no query\n  string.\n* `simplified`: Delivers the same resource to everyone independent\n  of the query string.\n* `aggressive`: Caches all static content that has a query string.\n* `cache_everything`: Treats all content as static and caches all\n  file types beyond the [Cloudflare default cached\n  content](https://developers.cloudflare.com/cache/concepts/default-cache-behavior/#default-cached-file-extensions).",
       "enum": [
         "bypass",
         "basic",
@@ -460,14 +460,14 @@ export const zones_cache_on_cookie: JsonSchema = {
   "description": "Cache on Cookie",
   "properties": {
     "id": {
-      "description": "Apply the Cache Everything option (Cache Level setting) based on a\nregular expression match against a cookie name.\n",
+      "description": "Apply the Cache Everything option (Cache Level setting) based on a\nregular expression match against a cookie name.",
       "enum": [
         "cache_on_cookie"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The regular expression to use for matching cookie names in the\nrequest.\n",
+      "description": "The regular expression to use for matching cookie names in the\nrequest.",
       "type": "string"
     }
   },
@@ -481,7 +481,7 @@ export const zones_cache_ttl_by_status: JsonSchema = {
   "description": "Cache TTL by Status Code",
   "properties": {
     "id": {
-      "description": "Enterprise customers can set cache time-to-live (TTL) based on the\nresponse status from the origin web server. Cache TTL refers to the\nduration of a resource in the Cloudflare network before being\nmarked as stale or discarded from cache. Status codes are returned\nby a resource's origin. Setting cache TTL based on response status\noverrides the default cache behavior (standard caching) for static\nfiles and overrides cache instructions sent by the origin web\nserver. To cache non-static assets, set a Cache Level of Cache\nEverything using a Page Rule. Setting no-store Cache-Control or a\nlow TTL (using `max-age`/`s-maxage`) increases requests to origin\nweb servers and decreases performance.\n",
+      "description": "Enterprise customers can set cache time-to-live (TTL) based on the\nresponse status from the origin web server. Cache TTL refers to the\nduration of a resource in the Cloudflare network before being\nmarked as stale or discarded from cache. Status codes are returned\nby a resource's origin. Setting cache TTL based on response status\noverrides the default cache behavior (standard caching) for static\nfiles and overrides cache instructions sent by the origin web\nserver. To cache non-static assets, set a Cache Level of Cache\nEverything using a Page Rule. Setting no-store Cache-Control or a\nlow TTL (using `max-age`/`s-maxage`) increases requests to origin\nweb servers and decreases performance.",
       "enum": [
         "cache_ttl_by_status"
       ],
@@ -502,7 +502,7 @@ export const zones_cache_ttl_by_status: JsonSchema = {
           }
         ]
       },
-      "description": "A JSON object containing status codes and their corresponding TTLs.\nEach key-value pair in the cache TTL by status cache rule has the\nfollowing syntax\n- `status_code`: An integer value such as 200 or 500. status_code\n  matches the exact status code from the origin web server. Valid\n  status codes are between 100-999.\n- `status_code_range`: Integer values for from and to.\n  status_code_range matches any status code from the origin web\n  server within the specified range.\n- `value`: An integer value that defines the duration an asset is\n  valid in seconds or one of the following strings: no-store\n  (equivalent to -1), no-cache (equivalent to 0).\n",
+      "description": "A JSON object containing status codes and their corresponding TTLs.\nEach key-value pair in the cache TTL by status cache rule has the\nfollowing syntax\n- `status_code`: An integer value such as 200 or 500. status_code\n  matches the exact status code from the origin web server. Valid\n  status codes are between 100-999.\n- `status_code_range`: Integer values for from and to.\n  status_code_range matches any status code from the origin web\n  server within the specified range.\n- `value`: An integer value that defines the duration an asset is\n  valid in seconds or one of the following strings: no-store\n  (equivalent to -1), no-cache (equivalent to 0).",
       "type": "object"
     }
   },
@@ -516,7 +516,7 @@ export const zones_disable_apps: JsonSchema = {
   "description": "Disable Apps",
   "properties": {
     "id": {
-      "description": "Turn off all active [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)\n(deprecated).\n",
+      "description": "Turn off all active [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)\n(deprecated).",
       "enum": [
         "disable_apps"
       ],
@@ -533,7 +533,7 @@ export const zones_disable_performance: JsonSchema = {
   "description": "Disable Performance",
   "properties": {
     "id": {
-      "description": "Turn off\n[Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/), and\n[Polish](https://developers.cloudflare.com/images/polish/).\n",
+      "description": "Turn off\n[Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/), and\n[Polish](https://developers.cloudflare.com/images/polish/).",
       "enum": [
         "disable_performance"
       ],
@@ -550,7 +550,7 @@ export const zones_disable_security: JsonSchema = {
   "description": "Disable Security",
   "properties": {
     "id": {
-      "description": "Turn off\n[Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),\n[Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),\n[Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),\n[URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/), and\n[WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).\n",
+      "description": "Turn off\n[Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),\n[Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),\n[Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),\n[URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/), and\n[WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).",
       "enum": [
         "disable_security"
       ],
@@ -567,7 +567,7 @@ export const zones_disable_zaraz: JsonSchema = {
   "description": "Disable Zaraz",
   "properties": {
     "id": {
-      "description": "Turn off [Zaraz](https://developers.cloudflare.com/zaraz/).\n",
+      "description": "Turn off [Zaraz](https://developers.cloudflare.com/zaraz/).",
       "enum": [
         "disable_zaraz"
       ],
@@ -584,7 +584,7 @@ export const zones_edge_cache_ttl: JsonSchema = {
   "description": "Edge Cache TTL",
   "properties": {
     "id": {
-      "description": "Specify how long to cache a resource in the Cloudflare global\nnetwork. *Edge Cache TTL* is not visible in response headers.\n",
+      "description": "Specify how long to cache a resource in the Cloudflare global\nnetwork. *Edge Cache TTL* is not visible in response headers.",
       "enum": [
         "edge_cache_ttl"
       ],
@@ -611,7 +611,7 @@ export const zones_email_obfuscation: JsonSchema = {
       "type": "string"
     },
     "value": {
-      "description": "The status of Email Obfuscation.\n",
+      "description": "The status of Email Obfuscation.",
       "enum": [
         "on",
         "off"
@@ -629,14 +629,14 @@ export const zones_explicit_cache_control: JsonSchema = {
   "description": "Origin Cache Control",
   "properties": {
     "id": {
-      "description": "Origin Cache Control is enabled by default for Free, Pro, and\nBusiness domains and disabled by default for Enterprise domains.\n",
+      "description": "Origin Cache Control is enabled by default for Free, Pro, and\nBusiness domains and disabled by default for Enterprise domains.",
       "enum": [
         "explicit_cache_control"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Origin Cache Control.\n",
+      "description": "The status of Origin Cache Control.",
       "enum": [
         "on",
         "off"
@@ -654,7 +654,7 @@ export const zones_forwarding_url: JsonSchema = {
   "description": "Forwarding URL",
   "properties": {
     "id": {
-      "description": "Redirects one URL to another using an `HTTP 301/302` redirect. Refer\nto [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).\n",
+      "description": "Redirects one URL to another using an `HTTP 301/302` redirect. Refer\nto [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).",
       "enum": [
         "forwarding_url"
       ],
@@ -663,7 +663,7 @@ export const zones_forwarding_url: JsonSchema = {
     "value": {
       "properties": {
         "status_code": {
-          "description": "The status code to use for the URL redirect. 301 is a permanent\nredirect. 302 is a temporary redirect.\n",
+          "description": "The status code to use for the URL redirect. 301 is a permanent\nredirect. 302 is a temporary redirect.",
           "enum": [
             301,
             302
@@ -709,14 +709,14 @@ export const zones_ip_geolocation: JsonSchema = {
   "description": "IP Geolocation Header",
   "properties": {
     "id": {
-      "description": "Cloudflare adds a CF-IPCountry HTTP header containing the country code that corresponds to the visitor.\n",
+      "description": "Cloudflare adds a CF-IPCountry HTTP header containing the country code that corresponds to the visitor.",
       "enum": [
         "ip_geolocation"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of adding the IP Geolocation Header.\n",
+      "description": "The status of adding the IP Geolocation Header.",
       "enum": [
         "on",
         "off"
@@ -735,14 +735,14 @@ export const zones_mirage: JsonSchema = {
   "description": "Mirage",
   "properties": {
     "id": {
-      "description": "Cloudflare Mirage reduces bandwidth used by images in mobile browsers.\nIt can accelerate loading of image-heavy websites on very slow mobile connections and HTTP/1.\n",
+      "description": "Cloudflare Mirage reduces bandwidth used by images in mobile browsers.\nIt can accelerate loading of image-heavy websites on very slow mobile connections and HTTP/1.",
       "enum": [
         "mirage"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Mirage.\n",
+      "description": "The status of Mirage.",
       "enum": [
         "on",
         "off"
@@ -760,14 +760,14 @@ export const zones_opportunistic_encryption: JsonSchema = {
   "description": "Opportunistic Encryption",
   "properties": {
     "id": {
-      "description": "Opportunistic Encryption allows browsers to access HTTP URIs over an encrypted TLS channel.\nIt's not a substitute for HTTPS, but provides additional security for otherwise vulnerable requests.\n",
+      "description": "Opportunistic Encryption allows browsers to access HTTP URIs over an encrypted TLS channel.\nIt's not a substitute for HTTPS, but provides additional security for otherwise vulnerable requests.",
       "enum": [
         "opportunistic_encryption"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Opportunistic Encryption.\n",
+      "description": "The status of Opportunistic Encryption.",
       "enum": [
         "on",
         "off"
@@ -785,14 +785,14 @@ export const zones_origin_error_page_pass_thru: JsonSchema = {
   "description": "Origin Error Page Passthru",
   "properties": {
     "id": {
-      "description": "Turn on or off Cloudflare error pages generated from issues sent from the origin server. If enabled, this setting triggers error pages issued by the origin.\n",
+      "description": "Turn on or off Cloudflare error pages generated from issues sent from the origin server. If enabled, this setting triggers error pages issued by the origin.",
       "enum": [
         "origin_error_page_pass_thru"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Origin Error Page Passthru.\n",
+      "description": "The status of Origin Error Page Passthru.",
       "enum": [
         "on",
         "off"
@@ -810,14 +810,14 @@ export const zones_polish: JsonSchema = {
   "description": "Polish",
   "properties": {
     "id": {
-      "description": "Apply options from the Polish feature of the Cloudflare Speed app.\n",
+      "description": "Apply options from the Polish feature of the Cloudflare Speed app.",
       "enum": [
         "polish"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The level of Polish you want applied to your origin.\n",
+      "description": "The level of Polish you want applied to your origin.",
       "enum": [
         "off",
         "lossless",
@@ -829,14 +829,6 @@ export const zones_polish: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_priority`.
- */
-export const zones_priority: JsonSchema = {
-  "description": "The priority of the rule, used to define which Page Rule is processed\nover another. A higher number indicates a higher priority. For example,\nif you have a catch-all Page Rule (rule A: `/images/*`) but want a more\nspecific Page Rule to take precedence (rule B: `/images/special/*`),\nspecify a higher priority for rule B so it overrides rule A.\n",
-  "type": "integer"
-};
-
 /**
  * The schema of `zones_resolve_override`.
  */
@@ -844,14 +836,14 @@ export const zones_resolve_override: JsonSchema = {
   "description": "Resolve Override",
   "properties": {
     "id": {
-      "description": "Change the origin address to the value specified in this setting.\n",
+      "description": "Change the origin address to the value specified in this setting.",
       "enum": [
         "resolve_override"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The origin address you want to override with.\n",
+      "description": "The origin address you want to override with.",
       "type": "string"
     }
   },
@@ -865,14 +857,14 @@ export const zones_respect_strong_etag: JsonSchema = {
   "description": "Respect Strong ETags",
   "properties": {
     "id": {
-      "description": "Turn on or off byte-for-byte equivalency checks between the\nCloudflare cache and the origin server.\n",
+      "description": "Turn on or off byte-for-byte equivalency checks between the\nCloudflare cache and the origin server.",
       "enum": [
         "respect_strong_etag"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Respect Strong ETags\n",
+      "description": "The status of Respect Strong ETags",
       "enum": [
         "on",
         "off"
@@ -891,14 +883,14 @@ export const zones_response_buffering: JsonSchema = {
   "description": "Response Buffering",
   "properties": {
     "id": {
-      "description": "Turn on or off whether Cloudflare should wait for an entire file\nfrom the origin server before forwarding it to the site visitor. By\ndefault, Cloudflare sends packets to the client as they arrive from\nthe origin server.\n",
+      "description": "Turn on or off whether Cloudflare should wait for an entire file\nfrom the origin server before forwarding it to the site visitor. By\ndefault, Cloudflare sends packets to the client as they arrive from\nthe origin server.",
       "enum": [
         "response_buffering"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Response Buffering\n",
+      "description": "The status of Response Buffering",
       "enum": [
         "on",
         "off"
@@ -916,14 +908,14 @@ export const zones_rocket_loader: JsonSchema = {
   "description": "Rocket Loader",
   "properties": {
     "id": {
-      "description": "Turn on or off Rocket Loader in the Cloudflare Speed app.\n",
+      "description": "Turn on or off Rocket Loader in the Cloudflare Speed app.",
       "enum": [
         "rocket_loader"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Rocket Loader\n",
+      "description": "The status of Rocket Loader",
       "enum": [
         "on",
         "off"
@@ -941,7 +933,7 @@ export const zones_security_level: JsonSchema = {
   "description": "Security Level",
   "properties": {
     "id": {
-      "description": "Control options for the **Security Level** feature from the **Security** app.\n",
+      "description": "Control options for the **Security Level** feature from the **Security** app.",
       "enum": [
         "security_level"
       ],
@@ -969,14 +961,14 @@ export const zones_sort_query_string_for_cache: JsonSchema = {
   "description": "Query String Sort",
   "properties": {
     "id": {
-      "description": "Turn on or off the reordering of query strings. When query strings have the same structure, caching improves.\n",
+      "description": "Turn on or off the reordering of query strings. When query strings have the same structure, caching improves.",
       "enum": [
         "sort_query_string_for_cache"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of Query String Sort\n",
+      "description": "The status of Query String Sort",
       "enum": [
         "on",
         "off"
@@ -994,14 +986,14 @@ export const zones_ssl: JsonSchema = {
   "description": "SSL",
   "properties": {
     "id": {
-      "description": "Control options for the SSL feature of the Edge Certificates tab in the Cloudflare SSL/TLS app.\n",
+      "description": "Control options for the SSL feature of the Edge Certificates tab in the Cloudflare SSL/TLS app.",
       "enum": [
         "ssl"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The encryption mode that Cloudflare uses to connect to your origin server.\n",
+      "description": "The encryption mode that Cloudflare uses to connect to your origin server.",
       "enum": [
         "off",
         "flexible",
@@ -1015,18 +1007,6 @@ export const zones_ssl: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_status`.
- */
-export const zones_status: JsonSchema = {
-  "description": "The status of the Page Rule.",
-  "enum": [
-    "active",
-    "disabled"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_string_constraint`.
  */
@@ -1083,14 +1063,14 @@ export const zones_true_client_ip_header: JsonSchema = {
   "description": "True Client IP Header",
   "properties": {
     "id": {
-      "description": "Turn on or off the True-Client-IP Header feature of the Cloudflare Network app.\n",
+      "description": "Turn on or off the True-Client-IP Header feature of the Cloudflare Network app.",
       "enum": [
         "true_client_ip_header"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of True Client IP Header.\n",
+      "description": "The status of True Client IP Header.",
       "enum": [
         "on",
         "off"
@@ -1142,14 +1122,14 @@ export const zones_waf: JsonSchema = {
   "description": "WAF",
   "properties": {
     "id": {
-      "description": "Turn on or off [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).\nYou cannot enable or disable individual WAF managed rules via Page Rules.\n",
+      "description": "Turn on or off [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).\nYou cannot enable or disable individual WAF managed rules via Page Rules.",
       "enum": [
         "waf"
       ],
       "type": "string"
     },
     "value": {
-      "description": "The status of WAF managed rules (previous version).\n",
+      "description": "The status of WAF managed rules (previous version).",
       "enum": [
         "on",
         "off"
diff --git a/src/generated/forge-mcp/pageRules/tools.ts b/src/generated/forge-mcp/pageRules/tools.ts
index 48b9c4992..5526b25e0 100644
--- a/src/generated/forge-mcp/pageRules/tools.ts
+++ b/src/generated/forge-mcp/pageRules/tools.ts
@@ -1,65 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  zones_api_response_common_failure_2_output,
-  zones_identifier_2_output,
-  zones_messages_2_output,
+  zones_api$$response$$common$$failure$$2,
+  zones_messages$$2,
 } from "../outputs.js";
-import { zones_identifier_2 } from "../schemas.js";
-import {
-  zones_actions_output,
-  zones_always_use_https_output,
-  zones_api_response_common_2_output,
-  zones_api_response_single_id_2_output,
-  zones_api_response_single_output,
-  zones_automatic_https_rewrites_output,
-  zones_browser_cache_ttl_output,
-  zones_browser_check_output,
-  zones_bypass_cache_on_cookie_output,
-  zones_cache_by_device_type_output,
-  zones_cache_deception_armor_output,
-  zones_cache_key_fields_output,
-  zones_cache_level_output,
-  zones_cache_on_cookie_output,
-  zones_cache_ttl_by_status_output,
-  zones_created_on_output,
-  zones_disable_apps_output,
-  zones_disable_performance_output,
-  zones_disable_security_output,
-  zones_disable_zaraz_output,
-  zones_edge_cache_ttl_output,
-  zones_email_obfuscation_output,
-  zones_explicit_cache_control_output,
-  zones_forwarding_url_output,
-  zones_host_header_override_output,
-  zones_ip_geolocation_output,
-  zones_mirage_output,
-  zones_modified_on_output,
-  zones_opportunistic_encryption_output,
-  zones_origin_error_page_pass_thru_output,
-  zones_page_rule_output,
-  zones_polish_output,
-  zones_priority_output,
-  zones_resolve_override_output,
-  zones_respect_strong_etag_output,
-  zones_response_buffering_output,
-  zones_rocket_loader_output,
-  zones_security_level_output,
-  zones_sort_query_string_for_cache_output,
-  zones_ssl_output,
-  zones_status_output,
-  zones_string_constraint_output,
-  zones_target_output,
-  zones_targets_output,
-  zones_true_client_ip_header_output,
-  zones_url_target_output,
-  zones_waf_output,
-} from "./outputs.js";
 import {
   zones_actions,
   zones_always_use_https,
+  zones_api$$response$$common$$2,
+  zones_api$$response$$single,
+  zones_api$$response$$single$$id$$2,
   zones_automatic_https_rewrites,
   zones_browser_cache_ttl,
   zones_browser_check,
@@ -83,8 +35,8 @@ import {
   zones_mirage,
   zones_opportunistic_encryption,
   zones_origin_error_page_pass_thru,
+  zones_page_rule,
   zones_polish,
-  zones_priority,
   zones_resolve_override,
   zones_respect_strong_etag,
   zones_response_buffering,
@@ -92,23 +44,63 @@ import {
   zones_security_level,
   zones_sort_query_string_for_cache,
   zones_ssl,
-  zones_status,
   zones_string_constraint,
   zones_target,
   zones_targets,
   zones_true_client_ip_header,
   zones_url_target,
   zones_waf,
+} from "./outputs.js";
+import {
+  zones_actions as zones_actions$,
+  zones_always_use_https as zones_always_use_https$,
+  zones_automatic_https_rewrites as zones_automatic_https_rewrites$,
+  zones_browser_cache_ttl as zones_browser_cache_ttl$,
+  zones_browser_check as zones_browser_check$,
+  zones_bypass_cache_on_cookie as zones_bypass_cache_on_cookie$,
+  zones_cache_by_device_type as zones_cache_by_device_type$,
+  zones_cache_deception_armor as zones_cache_deception_armor$,
+  zones_cache_key_fields as zones_cache_key_fields$,
+  zones_cache_level as zones_cache_level$,
+  zones_cache_on_cookie as zones_cache_on_cookie$,
+  zones_cache_ttl_by_status as zones_cache_ttl_by_status$,
+  zones_disable_apps as zones_disable_apps$,
+  zones_disable_performance as zones_disable_performance$,
+  zones_disable_security as zones_disable_security$,
+  zones_disable_zaraz as zones_disable_zaraz$,
+  zones_edge_cache_ttl as zones_edge_cache_ttl$,
+  zones_email_obfuscation as zones_email_obfuscation$,
+  zones_explicit_cache_control as zones_explicit_cache_control$,
+  zones_forwarding_url as zones_forwarding_url$,
+  zones_host_header_override as zones_host_header_override$,
+  zones_ip_geolocation as zones_ip_geolocation$,
+  zones_mirage as zones_mirage$,
+  zones_opportunistic_encryption as zones_opportunistic_encryption$,
+  zones_origin_error_page_pass_thru as zones_origin_error_page_pass_thru$,
+  zones_polish as zones_polish$,
+  zones_resolve_override as zones_resolve_override$,
+  zones_respect_strong_etag as zones_respect_strong_etag$,
+  zones_response_buffering as zones_response_buffering$,
+  zones_rocket_loader as zones_rocket_loader$,
+  zones_security_level as zones_security_level$,
+  zones_sort_query_string_for_cache as zones_sort_query_string_for_cache$,
+  zones_ssl as zones_ssl$,
+  zones_string_constraint as zones_string_constraint$,
+  zones_target as zones_target$,
+  zones_targets as zones_targets$,
+  zones_true_client_ip_header as zones_true_client_ip_header$,
+  zones_url_target as zones_url_target$,
+  zones_waf as zones_waf$,
 } from "./schemas.js";
 
 /**
- * The tools of `page_rules`.
+ * The tools of `pageRules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "page_rules_create",
+    name: "pageRules_create",
     title: "Create a Page Rule",
-    description: "Creates a new Page Rule.",
+    description: "Creates a new Page Rule.\n\nPOST /zones/{zone_id}/pagerules",
     inputSchema: {
       type: "object",
       properties: {
@@ -116,17 +108,21 @@ export const tools: readonly Tool[] = [
           "properties": {
             "actions": {
               "$ref": "#/$defs/zones_actions",
-              "description": "The set of actions to perform if the targets of this rule match the\nrequest. Actions can redirect to another URL or override settings, but\nnot both.\n"
+              "description": "The set of actions to perform if the targets of this rule match the\nrequest. Actions can redirect to another URL or override settings, but\nnot both."
             },
             "priority": {
-              "$ref": "#/$defs/zones_priority",
               "default": 1,
-              "description": "The priority of the rule, used to define which Page Rule is processed\nover another. A higher number indicates a higher priority. For example,\nif you have a catch-all Page Rule (rule A: `/images/*`) but want a more\nspecific Page Rule to take precedence (rule B: `/images/special/*`),\nspecify a higher priority for rule B so it overrides rule A.\n"
+              "description": "The priority of the rule, used to define which Page Rule is processed\nover another. A higher number indicates a higher priority. For example,\nif you have a catch-all Page Rule (rule A: `/images/*`) but want a more\nspecific Page Rule to take precedence (rule B: `/images/special/*`),\nspecify a higher priority for rule B so it overrides rule A.",
+              "type": "integer"
             },
             "status": {
-              "$ref": "#/$defs/zones_status",
               "default": "disabled",
-              "description": "The status of the Page Rule."
+              "description": "The status of the Page Rule.",
+              "enum": [
+                "active",
+                "disabled"
+              ],
+              "type": "string"
             },
             "targets": {
               "$ref": "#/$defs/zones_targets",
@@ -139,18 +135,85 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "zones_actions": zones_actions$,
+        "zones_always_use_https": zones_always_use_https$,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites$,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl$,
+        "zones_browser_check": zones_browser_check$,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie$,
+        "zones_cache_by_device_type": zones_cache_by_device_type$,
+        "zones_cache_deception_armor": zones_cache_deception_armor$,
+        "zones_cache_key_fields": zones_cache_key_fields$,
+        "zones_cache_level": zones_cache_level$,
+        "zones_cache_on_cookie": zones_cache_on_cookie$,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status$,
+        "zones_disable_apps": zones_disable_apps$,
+        "zones_disable_performance": zones_disable_performance$,
+        "zones_disable_security": zones_disable_security$,
+        "zones_disable_zaraz": zones_disable_zaraz$,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl$,
+        "zones_email_obfuscation": zones_email_obfuscation$,
+        "zones_explicit_cache_control": zones_explicit_cache_control$,
+        "zones_forwarding_url": zones_forwarding_url$,
+        "zones_host_header_override": zones_host_header_override$,
+        "zones_ip_geolocation": zones_ip_geolocation$,
+        "zones_mirage": zones_mirage$,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption$,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru$,
+        "zones_polish": zones_polish$,
+        "zones_resolve_override": zones_resolve_override$,
+        "zones_respect_strong_etag": zones_respect_strong_etag$,
+        "zones_response_buffering": zones_response_buffering$,
+        "zones_rocket_loader": zones_rocket_loader$,
+        "zones_security_level": zones_security_level$,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache$,
+        "zones_ssl": zones_ssl$,
+        "zones_string_constraint": zones_string_constraint$,
+        "zones_target": zones_target$,
+        "zones_targets": zones_targets$,
+        "zones_true_client_ip_header": zones_true_client_ip_header$,
+        "zones_url_target": zones_url_target$,
+        "zones_waf": zones_waf$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/zones_api-response-single"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/zones_page_rule"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
         "zones_actions": zones_actions,
         "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-single": zones_api$$response$$single,
         "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
         "zones_browser_cache_ttl": zones_browser_cache_ttl,
         "zones_browser_check": zones_browser_check,
@@ -170,13 +233,13 @@ export const tools: readonly Tool[] = [
         "zones_explicit_cache_control": zones_explicit_cache_control,
         "zones_forwarding_url": zones_forwarding_url,
         "zones_host_header_override": zones_host_header_override,
-        "zones_identifier-2": zones_identifier_2,
         "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
         "zones_mirage": zones_mirage,
         "zones_opportunistic_encryption": zones_opportunistic_encryption,
         "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
         "zones_polish": zones_polish,
-        "zones_priority": zones_priority,
         "zones_resolve_override": zones_resolve_override,
         "zones_respect_strong_etag": zones_respect_strong_etag,
         "zones_response_buffering": zones_response_buffering,
@@ -184,7 +247,6 @@ export const tools: readonly Tool[] = [
         "zones_security_level": zones_security_level,
         "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
         "zones_ssl": zones_ssl,
-        "zones_status": zones_status,
         "zones_string_constraint": zones_string_constraint,
         "zones_target": zones_target,
         "zones_targets": zones_targets,
@@ -193,70 +255,6 @@ export const tools: readonly Tool[] = [
         "zones_waf": zones_waf,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/zones_api-response-single"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/zones_page_rule"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-single": zones_api_response_single_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -294,54 +292,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single": zones_api_response_single_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
+        "zones_actions": zones_actions,
+        "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single": zones_api$$response$$single,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl,
+        "zones_browser_check": zones_browser_check,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie,
+        "zones_cache_by_device_type": zones_cache_by_device_type,
+        "zones_cache_deception_armor": zones_cache_deception_armor,
+        "zones_cache_key_fields": zones_cache_key_fields,
+        "zones_cache_level": zones_cache_level,
+        "zones_cache_on_cookie": zones_cache_on_cookie,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status,
+        "zones_disable_apps": zones_disable_apps,
+        "zones_disable_performance": zones_disable_performance,
+        "zones_disable_security": zones_disable_security,
+        "zones_disable_zaraz": zones_disable_zaraz,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl,
+        "zones_email_obfuscation": zones_email_obfuscation,
+        "zones_explicit_cache_control": zones_explicit_cache_control,
+        "zones_forwarding_url": zones_forwarding_url,
+        "zones_host_header_override": zones_host_header_override,
+        "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
+        "zones_mirage": zones_mirage,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
+        "zones_polish": zones_polish,
+        "zones_resolve_override": zones_resolve_override,
+        "zones_respect_strong_etag": zones_respect_strong_etag,
+        "zones_response_buffering": zones_response_buffering,
+        "zones_rocket_loader": zones_rocket_loader,
+        "zones_security_level": zones_security_level,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
+        "zones_ssl": zones_ssl,
+        "zones_string_constraint": zones_string_constraint,
+        "zones_target": zones_target,
+        "zones_targets": zones_targets,
+        "zones_true_client_ip_header": zones_true_client_ip_header,
+        "zones_url_target": zones_url_target,
+        "zones_waf": zones_waf,
       },
     },
     request: (args) => ({
@@ -350,36 +343,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "page_rules_delete",
+    name: "pageRules_delete",
     title: "Delete a Page Rule",
-    description: "Deletes an existing Page Rule.",
+    description: "Deletes an existing Page Rule.\n\nDELETE /zones/{zone_id}/pagerules/{pagerule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "pagerule_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pagerule_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "pagerule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "pagerule_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier-2": zones_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zones_api-response-single-id-2",
       $defs: {
-        "zones_api-response-common-2": zones_api_response_common_2_output,
-        "zones_api-response-single-id-2": zones_api_response_single_id_2_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_messages-2": zones_messages_2_output,
+        "zones_api-response-common-2": zones_api$$response$$common$$2,
+        "zones_api-response-single-id-2": zones_api$$response$$single$$id$$2,
+        "zones_messages-2": zones_messages$$2,
       },
     },
     annotations: {
@@ -407,11 +406,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common-2": zones_api_response_common_2_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single-id-2": zones_api_response_single_id_2_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_messages-2": zones_messages_2_output,
+        "zones_api-response-common-2": zones_api$$response$$common$$2,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single-id-2": zones_api$$response$$single$$id$$2,
+        "zones_messages-2": zones_messages$$2,
       },
     },
     request: (args) => ({
@@ -419,9 +417,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "page_rules_edit",
+    name: "pageRules_edit",
     title: "Edit a Page Rule",
-    description: "Updates one or more fields of an existing Page Rule.",
+    description: "Updates one or more fields of an existing Page Rule.\n\nPATCH /zones/{zone_id}/pagerules/{pagerule_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -429,17 +427,21 @@ export const tools: readonly Tool[] = [
           "properties": {
             "actions": {
               "$ref": "#/$defs/zones_actions",
-              "description": "The set of actions to perform if the targets of this rule match the\nrequest. Actions can redirect to another URL or override settings, but\nnot both.\n"
+              "description": "The set of actions to perform if the targets of this rule match the\nrequest. Actions can redirect to another URL or override settings, but\nnot both."
             },
             "priority": {
-              "$ref": "#/$defs/zones_priority",
               "default": 1,
-              "description": "The priority of the rule, used to define which Page Rule is processed\nover another. A higher number indicates a higher priority. For example,\nif you have a catch-all Page Rule (rule A: `/images/*`) but want a more\nspecific Page Rule to take precedence (rule B: `/images/special/*`),\nspecify a higher priority for rule B so it overrides rule A.\n"
+              "description": "The priority of the rule, used to define which Page Rule is processed\nover another. A higher number indicates a higher priority. For example,\nif you have a catch-all Page Rule (rule A: `/images/*`) but want a more\nspecific Page Rule to take precedence (rule B: `/images/special/*`),\nspecify a higher priority for rule B so it overrides rule A.",
+              "type": "integer"
             },
             "status": {
-              "$ref": "#/$defs/zones_status",
               "default": "disabled",
-              "description": "The status of the Page Rule."
+              "description": "The status of the Page Rule.",
+              "enum": [
+                "active",
+                "disabled"
+              ],
+              "type": "string"
             },
             "targets": {
               "$ref": "#/$defs/zones_targets",
@@ -448,23 +450,90 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "pagerule_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pagerule_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "pagerule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "pagerule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "zones_actions": zones_actions$,
+        "zones_always_use_https": zones_always_use_https$,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites$,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl$,
+        "zones_browser_check": zones_browser_check$,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie$,
+        "zones_cache_by_device_type": zones_cache_by_device_type$,
+        "zones_cache_deception_armor": zones_cache_deception_armor$,
+        "zones_cache_key_fields": zones_cache_key_fields$,
+        "zones_cache_level": zones_cache_level$,
+        "zones_cache_on_cookie": zones_cache_on_cookie$,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status$,
+        "zones_disable_apps": zones_disable_apps$,
+        "zones_disable_performance": zones_disable_performance$,
+        "zones_disable_security": zones_disable_security$,
+        "zones_disable_zaraz": zones_disable_zaraz$,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl$,
+        "zones_email_obfuscation": zones_email_obfuscation$,
+        "zones_explicit_cache_control": zones_explicit_cache_control$,
+        "zones_forwarding_url": zones_forwarding_url$,
+        "zones_host_header_override": zones_host_header_override$,
+        "zones_ip_geolocation": zones_ip_geolocation$,
+        "zones_mirage": zones_mirage$,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption$,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru$,
+        "zones_polish": zones_polish$,
+        "zones_resolve_override": zones_resolve_override$,
+        "zones_respect_strong_etag": zones_respect_strong_etag$,
+        "zones_response_buffering": zones_response_buffering$,
+        "zones_rocket_loader": zones_rocket_loader$,
+        "zones_security_level": zones_security_level$,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache$,
+        "zones_ssl": zones_ssl$,
+        "zones_string_constraint": zones_string_constraint$,
+        "zones_target": zones_target$,
+        "zones_targets": zones_targets$,
+        "zones_true_client_ip_header": zones_true_client_ip_header$,
+        "zones_url_target": zones_url_target$,
+        "zones_waf": zones_waf$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/zones_api-response-single"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/zones_page_rule"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
         "zones_actions": zones_actions,
         "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-single": zones_api$$response$$single,
         "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
         "zones_browser_cache_ttl": zones_browser_cache_ttl,
         "zones_browser_check": zones_browser_check,
@@ -484,13 +553,13 @@ export const tools: readonly Tool[] = [
         "zones_explicit_cache_control": zones_explicit_cache_control,
         "zones_forwarding_url": zones_forwarding_url,
         "zones_host_header_override": zones_host_header_override,
-        "zones_identifier-2": zones_identifier_2,
         "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
         "zones_mirage": zones_mirage,
         "zones_opportunistic_encryption": zones_opportunistic_encryption,
         "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
         "zones_polish": zones_polish,
-        "zones_priority": zones_priority,
         "zones_resolve_override": zones_resolve_override,
         "zones_respect_strong_etag": zones_respect_strong_etag,
         "zones_response_buffering": zones_response_buffering,
@@ -498,7 +567,6 @@ export const tools: readonly Tool[] = [
         "zones_security_level": zones_security_level,
         "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
         "zones_ssl": zones_ssl,
-        "zones_status": zones_status,
         "zones_string_constraint": zones_string_constraint,
         "zones_target": zones_target,
         "zones_targets": zones_targets,
@@ -507,70 +575,6 @@ export const tools: readonly Tool[] = [
         "zones_waf": zones_waf,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/zones_api-response-single"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/zones_page_rule"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-single": zones_api_response_single_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -608,54 +612,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single": zones_api_response_single_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
+        "zones_actions": zones_actions,
+        "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single": zones_api$$response$$single,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl,
+        "zones_browser_check": zones_browser_check,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie,
+        "zones_cache_by_device_type": zones_cache_by_device_type,
+        "zones_cache_deception_armor": zones_cache_deception_armor,
+        "zones_cache_key_fields": zones_cache_key_fields,
+        "zones_cache_level": zones_cache_level,
+        "zones_cache_on_cookie": zones_cache_on_cookie,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status,
+        "zones_disable_apps": zones_disable_apps,
+        "zones_disable_performance": zones_disable_performance,
+        "zones_disable_security": zones_disable_security,
+        "zones_disable_zaraz": zones_disable_zaraz,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl,
+        "zones_email_obfuscation": zones_email_obfuscation,
+        "zones_explicit_cache_control": zones_explicit_cache_control,
+        "zones_forwarding_url": zones_forwarding_url,
+        "zones_host_header_override": zones_host_header_override,
+        "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
+        "zones_mirage": zones_mirage,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
+        "zones_polish": zones_polish,
+        "zones_resolve_override": zones_resolve_override,
+        "zones_respect_strong_etag": zones_respect_strong_etag,
+        "zones_response_buffering": zones_response_buffering,
+        "zones_rocket_loader": zones_rocket_loader,
+        "zones_security_level": zones_security_level,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
+        "zones_ssl": zones_ssl,
+        "zones_string_constraint": zones_string_constraint,
+        "zones_target": zones_target,
+        "zones_targets": zones_targets,
+        "zones_true_client_ip_header": zones_true_client_ip_header,
+        "zones_url_target": zones_url_target,
+        "zones_waf": zones_waf,
       },
     },
     request: (args) => ({
@@ -664,28 +663,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "page_rules_get",
+    name: "pageRules_get",
     title: "Get a Page Rule",
-    description: "Fetches the details of a Page Rule.",
+    description: "Fetches the details of a Page Rule.\n\nGET /zones/{zone_id}/pagerules/{pagerule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "pagerule_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pagerule_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "pagerule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "pagerule_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier-2": zones_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -702,53 +708,48 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-single": zones_api_response_single_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
+        "zones_actions": zones_actions,
+        "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-single": zones_api$$response$$single,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl,
+        "zones_browser_check": zones_browser_check,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie,
+        "zones_cache_by_device_type": zones_cache_by_device_type,
+        "zones_cache_deception_armor": zones_cache_deception_armor,
+        "zones_cache_key_fields": zones_cache_key_fields,
+        "zones_cache_level": zones_cache_level,
+        "zones_cache_on_cookie": zones_cache_on_cookie,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status,
+        "zones_disable_apps": zones_disable_apps,
+        "zones_disable_performance": zones_disable_performance,
+        "zones_disable_security": zones_disable_security,
+        "zones_disable_zaraz": zones_disable_zaraz,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl,
+        "zones_email_obfuscation": zones_email_obfuscation,
+        "zones_explicit_cache_control": zones_explicit_cache_control,
+        "zones_forwarding_url": zones_forwarding_url,
+        "zones_host_header_override": zones_host_header_override,
+        "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
+        "zones_mirage": zones_mirage,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
+        "zones_polish": zones_polish,
+        "zones_resolve_override": zones_resolve_override,
+        "zones_respect_strong_etag": zones_respect_strong_etag,
+        "zones_response_buffering": zones_response_buffering,
+        "zones_rocket_loader": zones_rocket_loader,
+        "zones_security_level": zones_security_level,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
+        "zones_ssl": zones_ssl,
+        "zones_string_constraint": zones_string_constraint,
+        "zones_target": zones_target,
+        "zones_targets": zones_targets,
+        "zones_true_client_ip_header": zones_true_client_ip_header,
+        "zones_url_target": zones_url_target,
+        "zones_waf": zones_waf,
       },
     },
     annotations: {
@@ -825,54 +826,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single": zones_api_response_single_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
+        "zones_actions": zones_actions,
+        "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single": zones_api$$response$$single,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl,
+        "zones_browser_check": zones_browser_check,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie,
+        "zones_cache_by_device_type": zones_cache_by_device_type,
+        "zones_cache_deception_armor": zones_cache_deception_armor,
+        "zones_cache_key_fields": zones_cache_key_fields,
+        "zones_cache_level": zones_cache_level,
+        "zones_cache_on_cookie": zones_cache_on_cookie,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status,
+        "zones_disable_apps": zones_disable_apps,
+        "zones_disable_performance": zones_disable_performance,
+        "zones_disable_security": zones_disable_security,
+        "zones_disable_zaraz": zones_disable_zaraz,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl,
+        "zones_email_obfuscation": zones_email_obfuscation,
+        "zones_explicit_cache_control": zones_explicit_cache_control,
+        "zones_forwarding_url": zones_forwarding_url,
+        "zones_host_header_override": zones_host_header_override,
+        "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
+        "zones_mirage": zones_mirage,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
+        "zones_polish": zones_polish,
+        "zones_resolve_override": zones_resolve_override,
+        "zones_respect_strong_etag": zones_respect_strong_etag,
+        "zones_response_buffering": zones_response_buffering,
+        "zones_rocket_loader": zones_rocket_loader,
+        "zones_security_level": zones_security_level,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
+        "zones_ssl": zones_ssl,
+        "zones_string_constraint": zones_string_constraint,
+        "zones_target": zones_target,
+        "zones_targets": zones_targets,
+        "zones_true_client_ip_header": zones_true_client_ip_header,
+        "zones_url_target": zones_url_target,
+        "zones_waf": zones_waf,
       },
     },
     request: (args) => ({
@@ -880,59 +876,72 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "page_rules_list",
+    name: "pageRules_list",
     title: "List Page Rules",
-    description: "Fetches Page Rules in a zone.",
+    description: "Fetches Page Rules in a zone.\n\nGET /zones/{zone_id}/pagerules",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "default": "desc",
-          "description": "The direction used to sort returned Page Rules.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "match": {
-          "default": "all",
-          "description": "When set to `all`, all the search requirements must match. When set to `any`, only one of the search requirements has to match.",
-          "enum": [
-            "any",
-            "all"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "default": "priority",
-          "description": "The field used to sort returned Page Rules.",
-          "enum": [
-            "status",
-            "priority"
-          ],
-          "type": "string"
-        },
-        "status": {
-          "default": "disabled",
-          "description": "The status of the Page Rule.",
-          "enum": [
-            "active",
-            "disabled"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "desc",
+              "description": "The direction used to sort returned Page Rules.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "match": {
+              "default": "all",
+              "description": "When set to `all`, all the search requirements must match. When set to `any`, only one of the search requirements has to match.",
+              "enum": [
+                "any",
+                "all"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "priority",
+              "description": "The field used to sort returned Page Rules.",
+              "enum": [
+                "status",
+                "priority"
+              ],
+              "type": "string"
+            },
+            "status": {
+              "default": "disabled",
+              "description": "The status of the Page Rule.",
+              "enum": [
+                "active",
+                "disabled"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier-2": zones_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -952,53 +961,48 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-common-2": zones_api_response_common_2_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
+        "zones_actions": zones_actions,
+        "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-common-2": zones_api$$response$$common$$2,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl,
+        "zones_browser_check": zones_browser_check,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie,
+        "zones_cache_by_device_type": zones_cache_by_device_type,
+        "zones_cache_deception_armor": zones_cache_deception_armor,
+        "zones_cache_key_fields": zones_cache_key_fields,
+        "zones_cache_level": zones_cache_level,
+        "zones_cache_on_cookie": zones_cache_on_cookie,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status,
+        "zones_disable_apps": zones_disable_apps,
+        "zones_disable_performance": zones_disable_performance,
+        "zones_disable_security": zones_disable_security,
+        "zones_disable_zaraz": zones_disable_zaraz,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl,
+        "zones_email_obfuscation": zones_email_obfuscation,
+        "zones_explicit_cache_control": zones_explicit_cache_control,
+        "zones_forwarding_url": zones_forwarding_url,
+        "zones_host_header_override": zones_host_header_override,
+        "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
+        "zones_mirage": zones_mirage,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
+        "zones_polish": zones_polish,
+        "zones_resolve_override": zones_resolve_override,
+        "zones_respect_strong_etag": zones_respect_strong_etag,
+        "zones_response_buffering": zones_response_buffering,
+        "zones_rocket_loader": zones_rocket_loader,
+        "zones_security_level": zones_security_level,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
+        "zones_ssl": zones_ssl,
+        "zones_string_constraint": zones_string_constraint,
+        "zones_target": zones_target,
+        "zones_targets": zones_targets,
+        "zones_true_client_ip_header": zones_true_client_ip_header,
+        "zones_url_target": zones_url_target,
+        "zones_waf": zones_waf,
       },
     },
     annotations: {
@@ -1043,70 +1047,65 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-common-2": zones_api_response_common_2_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
+        "zones_actions": zones_actions,
+        "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-common-2": zones_api$$response$$common$$2,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl,
+        "zones_browser_check": zones_browser_check,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie,
+        "zones_cache_by_device_type": zones_cache_by_device_type,
+        "zones_cache_deception_armor": zones_cache_deception_armor,
+        "zones_cache_key_fields": zones_cache_key_fields,
+        "zones_cache_level": zones_cache_level,
+        "zones_cache_on_cookie": zones_cache_on_cookie,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status,
+        "zones_disable_apps": zones_disable_apps,
+        "zones_disable_performance": zones_disable_performance,
+        "zones_disable_security": zones_disable_security,
+        "zones_disable_zaraz": zones_disable_zaraz,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl,
+        "zones_email_obfuscation": zones_email_obfuscation,
+        "zones_explicit_cache_control": zones_explicit_cache_control,
+        "zones_forwarding_url": zones_forwarding_url,
+        "zones_host_header_override": zones_host_header_override,
+        "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
+        "zones_mirage": zones_mirage,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
+        "zones_polish": zones_polish,
+        "zones_resolve_override": zones_resolve_override,
+        "zones_respect_strong_etag": zones_respect_strong_etag,
+        "zones_response_buffering": zones_response_buffering,
+        "zones_rocket_loader": zones_rocket_loader,
+        "zones_security_level": zones_security_level,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
+        "zones_ssl": zones_ssl,
+        "zones_string_constraint": zones_string_constraint,
+        "zones_target": zones_target,
+        "zones_targets": zones_targets,
+        "zones_true_client_ip_header": zones_true_client_ip_header,
+        "zones_url_target": zones_url_target,
+        "zones_waf": zones_waf,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/pagerules`,
       query: [
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["match", args["match"], true],
-        ["status", args["status"], true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["match", param(args, "query", "match"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
   {
-    name: "page_rules_update",
+    name: "pageRules_update",
     title: "Update a Page Rule",
-    description: "Replaces the configuration of an existing Page Rule. The configuration of the updated Page Rule will exactly match the data passed in the API request.",
+    description: "Replaces the configuration of an existing Page Rule. The configuration of the updated Page Rule will exactly match the data passed in the API request.\n\nPUT /zones/{zone_id}/pagerules/{pagerule_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -1114,17 +1113,21 @@ export const tools: readonly Tool[] = [
           "properties": {
             "actions": {
               "$ref": "#/$defs/zones_actions",
-              "description": "The set of actions to perform if the targets of this rule match the\nrequest. Actions can redirect to another URL or override settings, but\nnot both.\n"
+              "description": "The set of actions to perform if the targets of this rule match the\nrequest. Actions can redirect to another URL or override settings, but\nnot both."
             },
             "priority": {
-              "$ref": "#/$defs/zones_priority",
               "default": 1,
-              "description": "The priority of the rule, used to define which Page Rule is processed\nover another. A higher number indicates a higher priority. For example,\nif you have a catch-all Page Rule (rule A: `/images/*`) but want a more\nspecific Page Rule to take precedence (rule B: `/images/special/*`),\nspecify a higher priority for rule B so it overrides rule A.\n"
+              "description": "The priority of the rule, used to define which Page Rule is processed\nover another. A higher number indicates a higher priority. For example,\nif you have a catch-all Page Rule (rule A: `/images/*`) but want a more\nspecific Page Rule to take precedence (rule B: `/images/special/*`),\nspecify a higher priority for rule B so it overrides rule A.",
+              "type": "integer"
             },
             "status": {
-              "$ref": "#/$defs/zones_status",
               "default": "disabled",
-              "description": "The status of the Page Rule."
+              "description": "The status of the Page Rule.",
+              "enum": [
+                "active",
+                "disabled"
+              ],
+              "type": "string"
             },
             "targets": {
               "$ref": "#/$defs/zones_targets",
@@ -1137,23 +1140,90 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "pagerule_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pagerule_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "pagerule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "pagerule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "zones_actions": zones_actions$,
+        "zones_always_use_https": zones_always_use_https$,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites$,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl$,
+        "zones_browser_check": zones_browser_check$,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie$,
+        "zones_cache_by_device_type": zones_cache_by_device_type$,
+        "zones_cache_deception_armor": zones_cache_deception_armor$,
+        "zones_cache_key_fields": zones_cache_key_fields$,
+        "zones_cache_level": zones_cache_level$,
+        "zones_cache_on_cookie": zones_cache_on_cookie$,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status$,
+        "zones_disable_apps": zones_disable_apps$,
+        "zones_disable_performance": zones_disable_performance$,
+        "zones_disable_security": zones_disable_security$,
+        "zones_disable_zaraz": zones_disable_zaraz$,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl$,
+        "zones_email_obfuscation": zones_email_obfuscation$,
+        "zones_explicit_cache_control": zones_explicit_cache_control$,
+        "zones_forwarding_url": zones_forwarding_url$,
+        "zones_host_header_override": zones_host_header_override$,
+        "zones_ip_geolocation": zones_ip_geolocation$,
+        "zones_mirage": zones_mirage$,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption$,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru$,
+        "zones_polish": zones_polish$,
+        "zones_resolve_override": zones_resolve_override$,
+        "zones_respect_strong_etag": zones_respect_strong_etag$,
+        "zones_response_buffering": zones_response_buffering$,
+        "zones_rocket_loader": zones_rocket_loader$,
+        "zones_security_level": zones_security_level$,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache$,
+        "zones_ssl": zones_ssl$,
+        "zones_string_constraint": zones_string_constraint$,
+        "zones_target": zones_target$,
+        "zones_targets": zones_targets$,
+        "zones_true_client_ip_header": zones_true_client_ip_header$,
+        "zones_url_target": zones_url_target$,
+        "zones_waf": zones_waf$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/zones_api-response-single"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/zones_page_rule"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
         "zones_actions": zones_actions,
         "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-single": zones_api$$response$$single,
         "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
         "zones_browser_cache_ttl": zones_browser_cache_ttl,
         "zones_browser_check": zones_browser_check,
@@ -1173,13 +1243,13 @@ export const tools: readonly Tool[] = [
         "zones_explicit_cache_control": zones_explicit_cache_control,
         "zones_forwarding_url": zones_forwarding_url,
         "zones_host_header_override": zones_host_header_override,
-        "zones_identifier-2": zones_identifier_2,
         "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
         "zones_mirage": zones_mirage,
         "zones_opportunistic_encryption": zones_opportunistic_encryption,
         "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
         "zones_polish": zones_polish,
-        "zones_priority": zones_priority,
         "zones_resolve_override": zones_resolve_override,
         "zones_respect_strong_etag": zones_respect_strong_etag,
         "zones_response_buffering": zones_response_buffering,
@@ -1187,7 +1257,6 @@ export const tools: readonly Tool[] = [
         "zones_security_level": zones_security_level,
         "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
         "zones_ssl": zones_ssl,
-        "zones_status": zones_status,
         "zones_string_constraint": zones_string_constraint,
         "zones_target": zones_target,
         "zones_targets": zones_targets,
@@ -1196,70 +1265,6 @@ export const tools: readonly Tool[] = [
         "zones_waf": zones_waf,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/zones_api-response-single"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/zones_page_rule"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-single": zones_api_response_single_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
-      },
-    },
     annotations: {
       "destructiveHint": true,
       "idempotentHint": true,
@@ -1297,54 +1302,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_actions": zones_actions_output,
-        "zones_always_use_https": zones_always_use_https_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single": zones_api_response_single_output,
-        "zones_automatic_https_rewrites": zones_automatic_https_rewrites_output,
-        "zones_browser_cache_ttl": zones_browser_cache_ttl_output,
-        "zones_browser_check": zones_browser_check_output,
-        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie_output,
-        "zones_cache_by_device_type": zones_cache_by_device_type_output,
-        "zones_cache_deception_armor": zones_cache_deception_armor_output,
-        "zones_cache_key_fields": zones_cache_key_fields_output,
-        "zones_cache_level": zones_cache_level_output,
-        "zones_cache_on_cookie": zones_cache_on_cookie_output,
-        "zones_cache_ttl_by_status": zones_cache_ttl_by_status_output,
-        "zones_created_on": zones_created_on_output,
-        "zones_disable_apps": zones_disable_apps_output,
-        "zones_disable_performance": zones_disable_performance_output,
-        "zones_disable_security": zones_disable_security_output,
-        "zones_disable_zaraz": zones_disable_zaraz_output,
-        "zones_edge_cache_ttl": zones_edge_cache_ttl_output,
-        "zones_email_obfuscation": zones_email_obfuscation_output,
-        "zones_explicit_cache_control": zones_explicit_cache_control_output,
-        "zones_forwarding_url": zones_forwarding_url_output,
-        "zones_host_header_override": zones_host_header_override_output,
-        "zones_identifier-2": zones_identifier_2_output,
-        "zones_ip_geolocation": zones_ip_geolocation_output,
-        "zones_messages-2": zones_messages_2_output,
-        "zones_mirage": zones_mirage_output,
-        "zones_modified_on": zones_modified_on_output,
-        "zones_opportunistic_encryption": zones_opportunistic_encryption_output,
-        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru_output,
-        "zones_page_rule": zones_page_rule_output,
-        "zones_polish": zones_polish_output,
-        "zones_priority": zones_priority_output,
-        "zones_resolve_override": zones_resolve_override_output,
-        "zones_respect_strong_etag": zones_respect_strong_etag_output,
-        "zones_response_buffering": zones_response_buffering_output,
-        "zones_rocket_loader": zones_rocket_loader_output,
-        "zones_security_level": zones_security_level_output,
-        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache_output,
-        "zones_ssl": zones_ssl_output,
-        "zones_status": zones_status_output,
-        "zones_string_constraint": zones_string_constraint_output,
-        "zones_target": zones_target_output,
-        "zones_targets": zones_targets_output,
-        "zones_true_client_ip_header": zones_true_client_ip_header_output,
-        "zones_url_target": zones_url_target_output,
-        "zones_waf": zones_waf_output,
+        "zones_actions": zones_actions,
+        "zones_always_use_https": zones_always_use_https,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single": zones_api$$response$$single,
+        "zones_automatic_https_rewrites": zones_automatic_https_rewrites,
+        "zones_browser_cache_ttl": zones_browser_cache_ttl,
+        "zones_browser_check": zones_browser_check,
+        "zones_bypass_cache_on_cookie": zones_bypass_cache_on_cookie,
+        "zones_cache_by_device_type": zones_cache_by_device_type,
+        "zones_cache_deception_armor": zones_cache_deception_armor,
+        "zones_cache_key_fields": zones_cache_key_fields,
+        "zones_cache_level": zones_cache_level,
+        "zones_cache_on_cookie": zones_cache_on_cookie,
+        "zones_cache_ttl_by_status": zones_cache_ttl_by_status,
+        "zones_disable_apps": zones_disable_apps,
+        "zones_disable_performance": zones_disable_performance,
+        "zones_disable_security": zones_disable_security,
+        "zones_disable_zaraz": zones_disable_zaraz,
+        "zones_edge_cache_ttl": zones_edge_cache_ttl,
+        "zones_email_obfuscation": zones_email_obfuscation,
+        "zones_explicit_cache_control": zones_explicit_cache_control,
+        "zones_forwarding_url": zones_forwarding_url,
+        "zones_host_header_override": zones_host_header_override,
+        "zones_ip_geolocation": zones_ip_geolocation,
+        "zones_messages-2": zones_messages$$2,
+        "zones_mirage": zones_mirage,
+        "zones_opportunistic_encryption": zones_opportunistic_encryption,
+        "zones_origin_error_page_pass_thru": zones_origin_error_page_pass_thru,
+        "zones_page_rule": zones_page_rule,
+        "zones_polish": zones_polish,
+        "zones_resolve_override": zones_resolve_override,
+        "zones_respect_strong_etag": zones_respect_strong_etag,
+        "zones_response_buffering": zones_response_buffering,
+        "zones_rocket_loader": zones_rocket_loader,
+        "zones_security_level": zones_security_level,
+        "zones_sort_query_string_for_cache": zones_sort_query_string_for_cache,
+        "zones_ssl": zones_ssl,
+        "zones_string_constraint": zones_string_constraint,
+        "zones_target": zones_target,
+        "zones_targets": zones_targets,
+        "zones_true_client_ip_header": zones_true_client_ip_header,
+        "zones_url_target": zones_url_target,
+        "zones_waf": zones_waf,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pages/buildCache/tools.ts b/src/generated/forge-mcp/pages/buildCache/tools.ts
index ddc212776..22cd9644d 100644
--- a/src/generated/forge-mcp/pages/buildCache/tools.ts
+++ b/src/generated/forge-mcp/pages/buildCache/tools.ts
@@ -3,40 +3,45 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  pages_api_response_common_failure_output,
-  pages_api_response_common_output,
-  pages_messages_output,
+  pages_api$$response$$common,
+  pages_api$$response$$common$$failure,
+  pages_messages,
 } from "../outputs.js";
-import { pages_identifier, pages_project_name } from "../schemas.js";
 
 /**
- * The tools of `pages.build_cache`.
+ * The tools of `pages.buildCache`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pages_build_cache_purge",
+    name: "pages_buildCache_purge",
     title: "Purge the Pages build cache",
-    description: "Remove cached build artifacts so subsequent builds run without the project's existing build cache.\n\nConfirm with the user before calling this tool. This operation purges the build cache for a Pages project.",
+    description: "Remove cached build artifacts so subsequent builds run without the project's existing build cache.\n\nConfirm with the user before calling this tool. This operation purges the build cache for a Pages project.\n\nPOST /accounts/{account_id}/pages/projects/{project_name}/purge_build_cache",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name"
+        "path"
       ],
-      $defs: {
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -63,8 +68,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -113,9 +118,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pages/deployments/history/logs/outputs.ts b/src/generated/forge-mcp/pages/deployments/history/logs/outputs.ts
index 1807d3933..ea502d698 100644
--- a/src/generated/forge-mcp/pages/deployments/history/logs/outputs.ts
+++ b/src/generated/forge-mcp/pages/deployments/history/logs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `pages_deployment_log` in responses.
  */
-export const pages_deployment_log_output: JsonSchema = {
+export const pages_deployment_log: JsonSchema = {
   "properties": {
     "data": {
       "items": {
diff --git a/src/generated/forge-mcp/pages/deployments/history/logs/tools.ts b/src/generated/forge-mcp/pages/deployments/history/logs/tools.ts
index 0782ba5fb..b268d2cd7 100644
--- a/src/generated/forge-mcp/pages/deployments/history/logs/tools.ts
+++ b/src/generated/forge-mcp/pages/deployments/history/logs/tools.ts
@@ -3,13 +3,11 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  pages_api_response_common_failure_output,
-  pages_api_response_common_output,
-  pages_messages_output,
+  pages_api$$response$$common,
+  pages_api$$response$$common$$failure,
+  pages_messages,
 } from "../../../outputs.js";
-import { pages_identifier, pages_project_name } from "../../../schemas.js";
-import { pages_deployment_id } from "../../schemas.js";
-import { pages_deployment_log_output } from "./outputs.js";
+import { pages_deployment_log } from "./outputs.js";
 
 /**
  * The tools of `pages.deployments.history.logs`.
@@ -18,33 +16,39 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_deployments_history_logs_get",
     title: "Get Pages deployment logs",
-    description: "Retrieve the build logs for a Cloudflare Pages deployment.",
+    description: "Retrieve the build logs for a Cloudflare Pages deployment.\n\nGET /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "deployment_id": {
-          "$ref": "#/$defs/pages_deployment_id",
-          "description": "UUID of the Pages deployment, as returned by deployment list or create operations."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "UUID of the Pages deployment, as returned by deployment list or create operations.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
-        "deployment_id"
+        "path"
       ],
-      $defs: {
-        "pages_deployment_id": pages_deployment_id,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -64,9 +68,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_deployment_log": pages_deployment_log_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_deployment_log": pages_deployment_log,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -109,10 +113,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_deployment_log": pages_deployment_log_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_deployment_log": pages_deployment_log,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pages/deployments/schemas.ts b/src/generated/forge-mcp/pages/deployments/schemas.ts
deleted file mode 100644
index a58a5cb58..000000000
--- a/src/generated/forge-mcp/pages/deployments/schemas.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `pages_deployment_id`.
- */
-export const pages_deployment_id: JsonSchema = {
-  "description": "UUID of the Pages deployment, as returned by deployment list or create operations.",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/pages/deployments/tools.ts b/src/generated/forge-mcp/pages/deployments/tools.ts
index 2d817ef44..1651b6c1b 100644
--- a/src/generated/forge-mcp/pages/deployments/tools.ts
+++ b/src/generated/forge-mcp/pages/deployments/tools.ts
@@ -1,25 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  pages_api_response_collection_output,
-  pages_api_response_common_failure_output,
-  pages_api_response_common_output,
-  pages_build_config_output,
-  pages_deployment_output,
-  pages_env_vars_output,
-  pages_messages_output,
-  pages_plain_text_env_var_output,
-  pages_project_name_output,
-  pages_secret_text_env_var_output,
-  pages_source_config_output,
-  pages_source_output,
-  pages_source_type_output,
-  pages_stage_output,
+  pages_api$$response$$collection,
+  pages_api$$response$$common,
+  pages_api$$response$$common$$failure,
+  pages_build_config,
+  pages_deployment,
+  pages_env_vars,
+  pages_messages,
+  pages_plain_text_env_var,
+  pages_secret_text_env_var,
+  pages_source,
+  pages_source_config,
+  pages_stage,
 } from "../outputs.js";
-import { pages_identifier, pages_project_name } from "../schemas.js";
-import { pages_deployment_id } from "./schemas.js";
 
 /**
  * The tools of `pages.deployments`.
@@ -28,37 +24,49 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_deployments_delete",
     title: "Delete a Pages deployment",
-    description: "Remove a deployment from a Cloudflare Pages project.",
+    description: "Remove a deployment from a Cloudflare Pages project.\n\nDELETE /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "allow_aliased": {
-          "description": "Allow deletion when a non-production deployment has an active alias.",
-          "type": "boolean"
-        },
-        "deployment_id": {
-          "$ref": "#/$defs/pages_deployment_id",
-          "description": "UUID of the Pages deployment, as returned by deployment list or create operations."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "UUID of the Pages deployment, as returned by deployment list or create operations.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name",
+            "deployment_id"
+          ],
+          "type": "object"
         },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "force": {
+              "description": "Allow deletion when a non-production deployment has an active alias.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
-        "deployment_id"
+        "path"
       ],
-      $defs: {
-        "pages_deployment_id": pages_deployment_id,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -85,8 +93,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -135,48 +143,54 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pages/projects/${pathParam(args, "project_name")}/deployments/${pathParam(args, "deployment_id")}`,
       query: [
-        ["force", args["allow_aliased"], true],
+        ["force", param(args, "query", "force"), true],
       ],
     }),
   },
   {
     name: "pages_deployments_get",
     title: "Get a Pages deployment",
-    description: "Retrieve the status and details of a Cloudflare Pages deployment.",
+    description: "Retrieve the status and details of a Cloudflare Pages deployment.\n\nGET /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "deployment_id": {
-          "$ref": "#/$defs/pages_deployment_id",
-          "description": "UUID of the Pages deployment, as returned by deployment list or create operations."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "UUID of the Pages deployment, as returned by deployment list or create operations.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
-        "deployment_id"
+        "path"
       ],
-      $defs: {
-        "pages_deployment_id": pages_deployment_id,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -196,18 +210,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -250,19 +262,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
@@ -272,43 +282,55 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_deployments_list",
     title: "List Pages deployments",
-    description: "List the production or preview deployments for a Cloudflare Pages project.",
+    description: "List the production or preview deployments for a Cloudflare Pages project.\n\nGET /accounts/{account_id}/pages/projects/{project_name}/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "env": {
-          "description": "Deployment environment to return. Valid values are `production` and `preview`.",
-          "enum": [
-            "production",
-            "preview"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "Page number of results to return.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
+          "type": "object"
         },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "env": {
+              "description": "Deployment environment to return. Valid values are `production` and `preview`.",
+              "enum": [
+                "production",
+                "preview"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Page number of results to return.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name"
+        "path"
       ],
-      $defs: {
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -331,19 +353,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-collection": pages_api_response_collection_output,
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-collection": pages_api$$response$$collection,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -389,61 +409,65 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-collection": pages_api_response_collection_output,
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-collection": pages_api$$response$$collection,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pages/projects/${pathParam(args, "project_name")}/deployments`,
       query: [
-        ["env", args["env"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["env", param(args, "query", "env"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "pages_deployments_retry",
     title: "Retry a Pages deployment",
-    description: "Retry a previous Cloudflare Pages deployment.",
+    description: "Retry a previous Cloudflare Pages deployment.\n\nPOST /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/retry",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "deployment_id": {
-          "$ref": "#/$defs/pages_deployment_id",
-          "description": "UUID of the Pages deployment, as returned by deployment list or create operations."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "UUID of the Pages deployment, as returned by deployment list or create operations.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
-        "deployment_id"
+        "path"
       ],
-      $defs: {
-        "pages_deployment_id": pages_deployment_id,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -463,18 +487,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -516,19 +538,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
@@ -538,33 +558,39 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_deployments_rollback",
     title: "Roll back a Pages deployment",
-    description: "Roll back production to a previous successful Cloudflare Pages deployment.\n\nConfirm with the user before calling this tool. This operation rolls back the production deployment to an earlier deployment.",
+    description: "Roll back production to a previous successful Cloudflare Pages deployment.\n\nConfirm with the user before calling this tool. This operation rolls back the production deployment to an earlier deployment.\n\nPOST /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/rollback",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "deployment_id": {
-          "$ref": "#/$defs/pages_deployment_id",
-          "description": "UUID of the Pages deployment, as returned by deployment list or create operations."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "UUID of the Pages deployment, as returned by deployment list or create operations.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
-        "deployment_id"
+        "path"
       ],
-      $defs: {
-        "pages_deployment_id": pages_deployment_id,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -584,18 +610,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -637,19 +661,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pages/domains/outputs.ts b/src/generated/forge-mcp/pages/domains/outputs.ts
index 1879d2e4c..f38e81a27 100644
--- a/src/generated/forge-mcp/pages/domains/outputs.ts
+++ b/src/generated/forge-mcp/pages/domains/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pages_domain` in responses.
  */
-export const pages_domain_output: JsonSchema = {
+export const pages_domain: JsonSchema = {
   "properties": {
     "certificate_authority": {
       "enum": [
@@ -25,7 +25,7 @@ export const pages_domain_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/pages_domain_name"
+      "type": "string"
     },
     "status": {
       "enum": [
@@ -111,10 +111,3 @@ export const pages_domain_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `pages_domain_name` in responses.
- */
-export const pages_domain_name_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/pages/domains/schemas.ts b/src/generated/forge-mcp/pages/domains/schemas.ts
deleted file mode 100644
index d8e8c1161..000000000
--- a/src/generated/forge-mcp/pages/domains/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `pages_domain_name`.
- */
-export const pages_domain_name: JsonSchema = {
-  "description": "Fully qualified domain name for the Pages project, such as `example.com`.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/pages/domains/tools.ts b/src/generated/forge-mcp/pages/domains/tools.ts
index 512d3da64..e9fb6d07b 100644
--- a/src/generated/forge-mcp/pages/domains/tools.ts
+++ b/src/generated/forge-mcp/pages/domains/tools.ts
@@ -3,14 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  pages_api_response_collection_output,
-  pages_api_response_common_failure_output,
-  pages_api_response_common_output,
-  pages_messages_output,
+  pages_api$$response$$collection,
+  pages_api$$response$$common,
+  pages_api$$response$$common$$failure,
+  pages_messages,
 } from "../outputs.js";
-import { pages_identifier, pages_project_name } from "../schemas.js";
-import { pages_domain_name_output, pages_domain_output } from "./outputs.js";
-import { pages_domain_name } from "./schemas.js";
+import { pages_domain } from "./outputs.js";
 
 /**
  * The tools of `pages.domains`.
@@ -19,19 +17,15 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_domains_create",
     title: "Add a Pages custom domain",
-    description: "Attach a custom domain to a Cloudflare Pages project.",
+    description: "Attach a custom domain to a Cloudflare Pages project.\n\nPOST /accounts/{account_id}/pages/projects/{project_name}/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/pages_domain_name",
-              "description": "Fully qualified domain name for the Pages project, such as `example.com`."
+              "description": "Fully qualified domain name for the Pages project, such as `example.com`.",
+              "type": "string"
             }
           },
           "required": [
@@ -39,21 +33,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
+        "path",
         "body"
       ],
-      $defs: {
-        "pages_domain_name": pages_domain_name,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -73,10 +76,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_domain": pages_domain_output,
-        "pages_domain_name": pages_domain_name_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_domain": pages_domain,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -118,11 +120,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_domain": pages_domain_output,
-        "pages_domain_name": pages_domain_name_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_domain": pages_domain,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
@@ -133,33 +134,38 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_domains_delete",
     title: "Delete a Pages custom domain",
-    description: "Remove a custom domain from a Cloudflare Pages project.",
+    description: "Remove a custom domain from a Cloudflare Pages project.\n\nDELETE /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/pages_domain_name",
-          "description": "Fully qualified domain name for the Pages project, such as `example.com`."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Fully qualified domain name for the Pages project, such as `example.com`.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "pages_domain_name": pages_domain_name,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -186,8 +192,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -236,9 +242,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
@@ -248,33 +254,38 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_domains_get",
     title: "Get a Pages custom domain",
-    description: "Retrieve the configuration and validation status of a custom domain attached to a Cloudflare Pages project.",
+    description: "Retrieve the configuration and validation status of a custom domain attached to a Cloudflare Pages project.\n\nGET /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/pages_domain_name",
-          "description": "Fully qualified domain name for the Pages project, such as `example.com`."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Fully qualified domain name for the Pages project, such as `example.com`.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "pages_domain_name": pages_domain_name,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -294,10 +305,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_domain": pages_domain_output,
-        "pages_domain_name": pages_domain_name_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_domain": pages_domain,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -340,11 +350,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_domain": pages_domain_output,
-        "pages_domain_name": pages_domain_name_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_domain": pages_domain,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
@@ -354,27 +363,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_domains_list",
     title: "List Pages custom domains",
-    description: "List the custom domains associated with a Cloudflare Pages project.",
+    description: "List the custom domains associated with a Cloudflare Pages project.\n\nGET /accounts/{account_id}/pages/projects/{project_name}/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name"
+        "path"
       ],
-      $defs: {
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -397,11 +412,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-collection": pages_api_response_collection_output,
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_domain": pages_domain_output,
-        "pages_domain_name": pages_domain_name_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-collection": pages_api$$response$$collection,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_domain": pages_domain,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -447,12 +461,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-collection": pages_api_response_collection_output,
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_domain": pages_domain_output,
-        "pages_domain_name": pages_domain_name_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-collection": pages_api$$response$$collection,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_domain": pages_domain,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pages/domains/validation/tools.ts b/src/generated/forge-mcp/pages/domains/validation/tools.ts
index 9aff5a3bd..375755568 100644
--- a/src/generated/forge-mcp/pages/domains/validation/tools.ts
+++ b/src/generated/forge-mcp/pages/domains/validation/tools.ts
@@ -3,13 +3,11 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  pages_api_response_common_failure_output,
-  pages_api_response_common_output,
-  pages_messages_output,
+  pages_api$$response$$common,
+  pages_api$$response$$common$$failure,
+  pages_messages,
 } from "../../outputs.js";
-import { pages_identifier, pages_project_name } from "../../schemas.js";
-import { pages_domain_name_output, pages_domain_output } from "../outputs.js";
-import { pages_domain_name } from "../schemas.js";
+import { pages_domain } from "../outputs.js";
 
 /**
  * The tools of `pages.domains.validation`.
@@ -18,33 +16,38 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_domains_validation_retry",
     title: "Retry custom domain validation",
-    description: "Retry validation for a custom domain attached to a Cloudflare Pages project.",
+    description: "Retry validation for a custom domain attached to a Cloudflare Pages project.\n\nPATCH /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/pages_domain_name",
-          "description": "Fully qualified domain name for the Pages project, such as `example.com`."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Fully qualified domain name for the Pages project, such as `example.com`.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "pages_domain_name": pages_domain_name,
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -64,10 +67,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_domain": pages_domain_output,
-        "pages_domain_name": pages_domain_name_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_domain": pages_domain,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -109,11 +111,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_domain": pages_domain_output,
-        "pages_domain_name": pages_domain_name_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_domain": pages_domain,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pages/outputs.ts b/src/generated/forge-mcp/pages/outputs.ts
index 47f8b8a26..22892d40d 100644
--- a/src/generated/forge-mcp/pages/outputs.ts
+++ b/src/generated/forge-mcp/pages/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `pages_api-response-collection` in responses.
  */
-export const pages_api_response_collection_output: JsonSchema = {
+export const pages_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/pages_api-response-common"
@@ -42,7 +42,7 @@ export const pages_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `pages_api-response-common` in responses.
  */
-export const pages_api_response_common_output: JsonSchema = {
+export const pages_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/pages_messages"
@@ -68,7 +68,7 @@ export const pages_api_response_common_output: JsonSchema = {
 /**
  * The schema of `pages_api-response-common-failure` in responses.
  */
-export const pages_api_response_common_failure_output: JsonSchema = {
+export const pages_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/pages_messages"
@@ -98,7 +98,7 @@ export const pages_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `pages_build_config` in responses.
  */
-export const pages_build_config_output: JsonSchema = {
+export const pages_build_config: JsonSchema = {
   "properties": {
     "build_caching": {
       "oneOf": [
@@ -171,7 +171,7 @@ export const pages_build_config_output: JsonSchema = {
 /**
  * The schema of `pages_deployment` in responses.
  */
-export const pages_deployment_output: JsonSchema = {
+export const pages_deployment: JsonSchema = {
   "properties": {
     "aliases": {
       "oneOf": [
@@ -260,7 +260,7 @@ export const pages_deployment_output: JsonSchema = {
       "type": "string"
     },
     "project_name": {
-      "$ref": "#/$defs/pages_project_name"
+      "type": "string"
     },
     "short_id": {
       "type": "string"
@@ -331,7 +331,7 @@ export const pages_deployment_output: JsonSchema = {
 /**
  * The schema of `pages_deployment_config_values` in responses.
  */
-export const pages_deployment_config_values_output: JsonSchema = {
+export const pages_deployment_config_values: JsonSchema = {
   "properties": {
     "ai_bindings": {
       "additionalProperties": {
@@ -594,7 +594,7 @@ export const pages_deployment_config_values_output: JsonSchema = {
 /**
  * The schema of `pages_env_vars` in responses.
  */
-export const pages_env_vars_output: JsonSchema = {
+export const pages_env_vars: JsonSchema = {
   "oneOf": [
     {
       "additionalProperties": {
@@ -625,7 +625,7 @@ export const pages_env_vars_output: JsonSchema = {
 /**
  * The schema of `pages_messages` in responses.
  */
-export const pages_messages_output: JsonSchema = {
+export const pages_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -658,7 +658,7 @@ export const pages_messages_output: JsonSchema = {
 /**
  * The schema of `pages_plain_text_env_var` in responses.
  */
-export const pages_plain_text_env_var_output: JsonSchema = {
+export const pages_plain_text_env_var: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -687,7 +687,7 @@ export const pages_plain_text_env_var_output: JsonSchema = {
 /**
  * The schema of `pages_project` in responses.
  */
-export const pages_project_output: JsonSchema = {
+export const pages_project: JsonSchema = {
   "properties": {
     "build_config": {
       "$ref": "#/$defs/pages_build_config"
@@ -748,7 +748,7 @@ export const pages_project_output: JsonSchema = {
       "$ref": "#/$defs/pages_deployment"
     },
     "name": {
-      "$ref": "#/$defs/pages_project_name"
+      "type": "string"
     },
     "preview_script_name": {
       "type": "string"
@@ -793,17 +793,10 @@ export const pages_project_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `pages_project_name` in responses.
- */
-export const pages_project_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `pages_secret_text_env_var` in responses.
  */
-export const pages_secret_text_env_var_output: JsonSchema = {
+export const pages_secret_text_env_var: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -832,13 +825,17 @@ export const pages_secret_text_env_var_output: JsonSchema = {
 /**
  * The schema of `pages_source` in responses.
  */
-export const pages_source_output: JsonSchema = {
+export const pages_source: JsonSchema = {
   "properties": {
     "config": {
       "$ref": "#/$defs/pages_source_config"
     },
     "type": {
-      "$ref": "#/$defs/pages_source_type"
+      "enum": [
+        "github",
+        "gitlab"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -851,7 +848,7 @@ export const pages_source_output: JsonSchema = {
 /**
  * The schema of `pages_source_config` in responses.
  */
-export const pages_source_config_output: JsonSchema = {
+export const pages_source_config: JsonSchema = {
   "properties": {
     "deployments_enabled": {
       "type": "boolean"
@@ -928,21 +925,10 @@ export const pages_source_config_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `pages_source_type` in responses.
- */
-export const pages_source_type_output: JsonSchema = {
-  "enum": [
-    "github",
-    "gitlab"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `pages_stage` in responses.
  */
-export const pages_stage_output: JsonSchema = {
+export const pages_stage: JsonSchema = {
   "properties": {
     "ended_on": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/pages/schemas.ts b/src/generated/forge-mcp/pages/schemas.ts
index 7778a69d5..b9abd5ede 100644
--- a/src/generated/forge-mcp/pages/schemas.ts
+++ b/src/generated/forge-mcp/pages/schemas.ts
@@ -389,14 +389,6 @@ export const pages_deployment_config_values_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `pages_identifier`.
- */
-export const pages_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `pages_plain_text_env_var`.
  */
@@ -428,14 +420,6 @@ export const pages_plain_text_env_var: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `pages_project_name`.
- */
-export const pages_project_name: JsonSchema = {
-  "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
-  "type": "string"
-};
-
 /**
  * The schema of `pages_secret_text_env_var`.
  */
@@ -474,7 +458,7 @@ export const pages_source_config: JsonSchema = {
   "properties": {
     "deployments_enabled": {
       "deprecated": true,
-      "description": "Whether to enable automatic deployments when pushing to the source repository.\nWhen disabled, no deployments (production or preview) will be triggered automatically.\n",
+      "description": "Whether to enable automatic deployments when pushing to the source repository.\nWhen disabled, no deployments (production or preview) will be triggered automatically.",
       "type": "boolean"
     },
     "owner": {
@@ -560,15 +544,3 @@ export const pages_source_config: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `pages_source_type`.
- */
-export const pages_source_type: JsonSchema = {
-  "description": "The source control management provider.",
-  "enum": [
-    "github",
-    "gitlab"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/pages/source/schemas.ts b/src/generated/forge-mcp/pages/source/schemas.ts
index eaefeae35..86fa88bc9 100644
--- a/src/generated/forge-mcp/pages/source/schemas.ts
+++ b/src/generated/forge-mcp/pages/source/schemas.ts
@@ -13,8 +13,12 @@ export const pages_source_connect_request: JsonSchema = {
       "$ref": "#/$defs/pages_source_config"
     },
     "type": {
-      "$ref": "#/$defs/pages_source_type",
-      "description": "The source control management provider."
+      "description": "The source control management provider.",
+      "enum": [
+        "github",
+        "gitlab"
+      ],
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/pages/source/tools.ts b/src/generated/forge-mcp/pages/source/tools.ts
index 54d5ce427..19f967307 100644
--- a/src/generated/forge-mcp/pages/source/tools.ts
+++ b/src/generated/forge-mcp/pages/source/tools.ts
@@ -3,28 +3,21 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  pages_api_response_common_failure_output,
-  pages_api_response_common_output,
-  pages_build_config_output,
-  pages_deployment_config_values_output,
-  pages_deployment_output,
-  pages_env_vars_output,
-  pages_messages_output,
-  pages_plain_text_env_var_output,
-  pages_project_name_output,
-  pages_project_output,
-  pages_secret_text_env_var_output,
-  pages_source_config_output,
-  pages_source_output,
-  pages_source_type_output,
-  pages_stage_output,
-} from "../outputs.js";
-import {
-  pages_identifier,
-  pages_project_name,
+  pages_api$$response$$common,
+  pages_api$$response$$common$$failure,
+  pages_build_config,
+  pages_deployment,
+  pages_deployment_config_values,
+  pages_env_vars,
+  pages_messages,
+  pages_plain_text_env_var,
+  pages_project,
+  pages_secret_text_env_var,
+  pages_source,
   pages_source_config,
-  pages_source_type,
-} from "../schemas.js";
+  pages_stage,
+} from "../outputs.js";
+import { pages_source_config as pages_source_config$ } from "../schemas.js";
 import { pages_source_connect_request } from "./schemas.js";
 
 /**
@@ -34,33 +27,40 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_source_connect",
     title: "Connect a Git repository",
-    description: "Connect a GitHub or GitLab repository to a Cloudflare Pages project to enable Git-based deployments.",
+    description: "Connect a GitHub or GitLab repository to a Cloudflare Pages project to enable Git-based deployments.\n\nPOST /accounts/{account_id}/pages/projects/{project_name}/source",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/pages_source_connect_request"
         },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-        "pages_source_config": pages_source_config,
+        "pages_source_config": pages_source_config$,
         "pages_source_connect_request": pages_source_connect_request,
-        "pages_source_type": pages_source_type,
       },
     },
     outputSchema: {
@@ -81,20 +81,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -136,21 +134,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
@@ -161,27 +157,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_source_disconnect",
     title: "Disconnect a Git repository",
-    description: "Disconnect the Git repository from a Cloudflare Pages project to stop Git-based deployments.",
+    description: "Disconnect the Git repository from a Cloudflare Pages project to stop Git-based deployments.\n\nDELETE /accounts/{account_id}/pages/projects/{project_name}/source",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name"
+        "path"
       ],
-      $defs: {
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -201,20 +203,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -256,21 +256,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pages/tools.ts b/src/generated/forge-mcp/pages/tools.ts
index 95ebb3f9b..563c1f36e 100644
--- a/src/generated/forge-mcp/pages/tools.ts
+++ b/src/generated/forge-mcp/pages/tools.ts
@@ -1,31 +1,27 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  pages_api_response_collection_output,
-  pages_api_response_common_failure_output,
-  pages_api_response_common_output,
-  pages_build_config_output,
-  pages_deployment_config_values_output,
-  pages_deployment_output,
-  pages_env_vars_output,
-  pages_messages_output,
-  pages_plain_text_env_var_output,
-  pages_project_name_output,
-  pages_project_output,
-  pages_secret_text_env_var_output,
-  pages_source_config_output,
-  pages_source_output,
-  pages_source_type_output,
-  pages_stage_output,
+  pages_api$$response$$collection,
+  pages_api$$response$$common,
+  pages_api$$response$$common$$failure,
+  pages_build_config,
+  pages_deployment,
+  pages_deployment_config_values,
+  pages_env_vars,
+  pages_messages,
+  pages_plain_text_env_var,
+  pages_project,
+  pages_secret_text_env_var,
+  pages_source,
+  pages_source_config,
+  pages_stage,
 } from "./outputs.js";
 import {
   pages_deployment_config_values_request,
-  pages_identifier,
-  pages_plain_text_env_var,
-  pages_project_name,
-  pages_secret_text_env_var,
+  pages_plain_text_env_var as pages_plain_text_env_var$,
+  pages_secret_text_env_var as pages_secret_text_env_var$,
 } from "./schemas.js";
 
 /**
@@ -35,14 +31,10 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_create",
     title: "Create a Cloudflare Pages project",
-    description: "Create a Cloudflare Pages project for configuring and deploying a site or application.",
+    description: "Create a Cloudflare Pages project for configuring and deploying a site or application.\n\nPOST /accounts/{account_id}/pages/projects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "build_config": {
@@ -118,7 +110,7 @@ export const tools: readonly Tool[] = [
                   "properties": {
                     "deployments_enabled": {
                       "deprecated": true,
-                      "description": "Whether to enable automatic deployments when pushing to the source repository.\nWhen disabled, no deployments (production or preview) will be triggered automatically.\n",
+                      "description": "Whether to enable automatic deployments when pushing to the source repository.\nWhen disabled, no deployments (production or preview) will be triggered automatically.",
                       "type": "boolean"
                     },
                     "owner": {
@@ -210,17 +202,30 @@ export const tools: readonly Tool[] = [
             "production_branch"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "pages_deployment_config_values_request": pages_deployment_config_values_request,
-        "pages_identifier": pages_identifier,
-        "pages_plain_text_env_var": pages_plain_text_env_var,
-        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_plain_text_env_var": pages_plain_text_env_var$,
+        "pages_secret_text_env_var": pages_secret_text_env_var$,
       },
     },
     outputSchema: {
@@ -241,20 +246,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -296,21 +299,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
@@ -321,27 +322,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_delete",
     title: "Delete a Cloudflare Pages project",
-    description: "Permanently delete a Cloudflare Pages project and its deployments.",
+    description: "Permanently delete a Cloudflare Pages project and its deployments.\n\nDELETE /accounts/{account_id}/pages/projects/{project_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name"
+        "path"
       ],
-      $defs: {
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -368,8 +375,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_messages": pages_messages,
       },
     },
     annotations: {
@@ -418,9 +425,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_messages": pages_messages_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_messages": pages_messages,
       },
     },
     request: (args) => ({
@@ -430,14 +437,10 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_edit",
     title: "Update a Cloudflare Pages project",
-    description: "Update the build, deployment, source, or environment settings for a Cloudflare Pages project. To delete an environment variable, set its key to `null`.",
+    description: "Update the build, deployment, source, or environment settings for a Cloudflare Pages project. To delete an environment variable, set its key to `null`.\n\nPATCH /accounts/{account_id}/pages/projects/{project_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "build_config": {
@@ -513,7 +516,7 @@ export const tools: readonly Tool[] = [
                   "properties": {
                     "deployments_enabled": {
                       "deprecated": true,
-                      "description": "Whether to enable automatic deployments when pushing to the source repository.\nWhen disabled, no deployments (production or preview) will be triggered automatically.\n",
+                      "description": "Whether to enable automatic deployments when pushing to the source repository.\nWhen disabled, no deployments (production or preview) will be triggered automatically.",
                       "type": "boolean"
                     },
                     "owner": {
@@ -602,22 +605,34 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "pages_deployment_config_values_request": pages_deployment_config_values_request,
-        "pages_identifier": pages_identifier,
-        "pages_plain_text_env_var": pages_plain_text_env_var,
-        "pages_project_name": pages_project_name,
-        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_plain_text_env_var": pages_plain_text_env_var$,
+        "pages_secret_text_env_var": pages_secret_text_env_var$,
       },
     },
     outputSchema: {
@@ -638,20 +653,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -693,21 +706,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
@@ -718,27 +729,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_get",
     title: "Get a Cloudflare Pages project",
-    description: "Retrieve the configuration and deployment settings for a Cloudflare Pages project.",
+    description: "Retrieve the configuration and deployment settings for a Cloudflare Pages project.\n\nGET /accounts/{account_id}/pages/projects/{project_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "project_name": {
-          "$ref": "#/$defs/pages_project_name",
-          "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "project_name": {
+              "description": "Name of the Pages project. Must begin with a lowercase letter or digit and contain only lowercase letters, digits, and hyphens.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "project_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "project_name"
+        "path"
       ],
-      $defs: {
-        "pages_identifier": pages_identifier,
-        "pages_project_name": pages_project_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -758,20 +775,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -814,21 +829,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
@@ -838,29 +851,42 @@ export const tools: readonly Tool[] = [
   {
     name: "pages_list",
     title: "List Cloudflare Pages projects",
-    description: "List the Cloudflare Pages projects in an account.",
+    description: "List the Cloudflare Pages projects in an account.\n\nGET /accounts/{account_id}/pages/projects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/pages_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "description": "Page number of results to return.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "description": "Page number of results to return.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "pages_identifier": pages_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -883,21 +909,19 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "pages_api-response-collection": pages_api_response_collection_output,
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-collection": pages_api$$response$$collection,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     annotations: {
@@ -943,29 +967,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pages_api-response-collection": pages_api_response_collection_output,
-        "pages_api-response-common": pages_api_response_common_output,
-        "pages_api-response-common-failure": pages_api_response_common_failure_output,
-        "pages_build_config": pages_build_config_output,
-        "pages_deployment": pages_deployment_output,
-        "pages_deployment_config_values": pages_deployment_config_values_output,
-        "pages_env_vars": pages_env_vars_output,
-        "pages_messages": pages_messages_output,
-        "pages_plain_text_env_var": pages_plain_text_env_var_output,
-        "pages_project": pages_project_output,
-        "pages_project_name": pages_project_name_output,
-        "pages_secret_text_env_var": pages_secret_text_env_var_output,
-        "pages_source": pages_source_output,
-        "pages_source_config": pages_source_config_output,
-        "pages_source_type": pages_source_type_output,
-        "pages_stage": pages_stage_output,
+        "pages_api-response-collection": pages_api$$response$$collection,
+        "pages_api-response-common": pages_api$$response$$common,
+        "pages_api-response-common-failure": pages_api$$response$$common$$failure,
+        "pages_build_config": pages_build_config,
+        "pages_deployment": pages_deployment,
+        "pages_deployment_config_values": pages_deployment_config_values,
+        "pages_env_vars": pages_env_vars,
+        "pages_messages": pages_messages,
+        "pages_plain_text_env_var": pages_plain_text_env_var,
+        "pages_project": pages_project,
+        "pages_secret_text_env_var": pages_secret_text_env_var,
+        "pages_source": pages_source,
+        "pages_source_config": pages_source_config,
+        "pages_stage": pages_stage,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pages/projects`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/payPerCrawl/config/outputs.ts b/src/generated/forge-mcp/payPerCrawl/config/outputs.ts
index 069dc52e0..18f9899b2 100644
--- a/src/generated/forge-mcp/payPerCrawl/config/outputs.ts
+++ b/src/generated/forge-mcp/payPerCrawl/config/outputs.ts
@@ -3,25 +3,18 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `pay-per-crawl_BotAccessMode` in responses.
- */
-export const pay_per_crawl_BotAccessMode_output: JsonSchema = {
-  "enum": [
-    "charge",
-    "bypass"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `pay-per-crawl_DaricConfig` in responses.
  */
-export const pay_per_crawl_DaricConfig_output: JsonSchema = {
+export const pay$$per$$crawl_DaricConfig: JsonSchema = {
   "properties": {
     "bot_overrides": {
       "additionalProperties": {
-        "$ref": "#/$defs/pay-per-crawl_BotAccessMode"
+        "enum": [
+          "charge",
+          "bypass"
+        ],
+        "type": "string"
       },
       "type": "object"
     },
@@ -38,7 +31,7 @@ export const pay_per_crawl_DaricConfig_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_getConfigResponse` in responses.
  */
-export const pay_per_crawl_getConfigResponse_output: JsonSchema = {
+export const pay$$per$$crawl_getConfigResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerCrawl/config/schemas.ts b/src/generated/forge-mcp/payPerCrawl/config/schemas.ts
index 9527e6571..e73ca7a17 100644
--- a/src/generated/forge-mcp/payPerCrawl/config/schemas.ts
+++ b/src/generated/forge-mcp/payPerCrawl/config/schemas.ts
@@ -3,25 +3,18 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `pay-per-crawl_BotAccessMode`.
- */
-export const pay_per_crawl_BotAccessMode: JsonSchema = {
-  "enum": [
-    "charge",
-    "bypass"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `pay-per-crawl_DaricConfig`.
  */
-export const pay_per_crawl_DaricConfig: JsonSchema = {
+export const pay$$per$$crawl_DaricConfig: JsonSchema = {
   "properties": {
     "bot_overrides": {
       "additionalProperties": {
-        "$ref": "#/$defs/pay-per-crawl_BotAccessMode"
+        "enum": [
+          "charge",
+          "bypass"
+        ],
+        "type": "string"
       },
       "type": "object"
     },
@@ -39,11 +32,15 @@ export const pay_per_crawl_DaricConfig: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_DaricConfigCreate`.
  */
-export const pay_per_crawl_DaricConfigCreate: JsonSchema = {
+export const pay$$per$$crawl_DaricConfigCreate: JsonSchema = {
   "properties": {
     "bot_overrides": {
       "additionalProperties": {
-        "$ref": "#/$defs/pay-per-crawl_BotAccessMode"
+        "enum": [
+          "charge",
+          "bypass"
+        ],
+        "type": "string"
       },
       "type": "object"
     },
diff --git a/src/generated/forge-mcp/payPerCrawl/config/tools.ts b/src/generated/forge-mcp/payPerCrawl/config/tools.ts
index 7c1b4a7a2..0cd9a5f46 100644
--- a/src/generated/forge-mcp/payPerCrawl/config/tools.ts
+++ b/src/generated/forge-mcp/payPerCrawl/config/tools.ts
@@ -3,32 +3,30 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_BotAccessMode_output,
-  pay_per_crawl_DaricConfig_output,
-  pay_per_crawl_getConfigResponse_output,
+  pay$$per$$crawl_DaricConfig,
+  pay$$per$$crawl_getConfigResponse,
 } from "./outputs.js";
 import {
-  pay_per_crawl_BotAccessMode,
-  pay_per_crawl_DaricConfig,
-  pay_per_crawl_DaricConfigCreate,
+  pay$$per$$crawl_DaricConfig as pay$$per$$crawl_DaricConfig$,
+  pay$$per$$crawl_DaricConfigCreate,
 } from "./schemas.js";
 
 /**
- * The tools of `pay_per_crawl.config`.
+ * The tools of `payPerCrawl.config`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_crawl_config_create",
+    name: "payPerCrawl_config_create",
     title: "Creates pay-per-crawl config for a zone",
-    description: "Creates the pay-per-crawl config for a zone.",
+    description: "Creates the pay-per-crawl config for a zone.\n\nPOST /zones/{zone_id}/pay-per-crawl/configuration",
     inputSchema: {
       type: "object",
       properties: {
@@ -36,29 +34,37 @@ export const tools: readonly Tool[] = [
           "$ref": "#/$defs/pay-per-crawl_DaricConfigCreate",
           "description": "Data for fully replacing a pay-per-crawl zone configuration"
         },
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_BotAccessMode": pay_per_crawl_BotAccessMode,
-        "pay-per-crawl_DaricConfigCreate": pay_per_crawl_DaricConfigCreate,
+        "pay-per-crawl_DaricConfigCreate": pay$$per$$crawl_DaricConfigCreate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getConfigResponse",
       $defs: {
-        "pay-per-crawl_BotAccessMode": pay_per_crawl_BotAccessMode_output,
-        "pay-per-crawl_DaricConfig": pay_per_crawl_DaricConfig_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_getConfigResponse": pay_per_crawl_getConfigResponse_output,
+        "pay-per-crawl_DaricConfig": pay$$per$$crawl_DaricConfig,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_getConfigResponse": pay$$per$$crawl_getConfigResponse,
       },
     },
     annotations: {
@@ -85,15 +91,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_BotAccessMode": pay_per_crawl_BotAccessMode_output,
-        "pay-per-crawl_DaricConfig": pay_per_crawl_DaricConfig_output,
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getConfigResponse": pay_per_crawl_getConfigResponse_output,
+        "pay-per-crawl_DaricConfig": pay$$per$$crawl_DaricConfig,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getConfigResponse": pay$$per$$crawl_getConfigResponse,
       },
     },
     request: (args) => ({
@@ -102,9 +107,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_config_edit",
+    name: "payPerCrawl_config_edit",
     title: "Changes pay-per-crawl config for a zone",
-    description: "Changes the pay-per-crawl config for a zone.",
+    description: "Changes the pay-per-crawl config for a zone.\n\nPATCH /zones/{zone_id}/pay-per-crawl/configuration",
     inputSchema: {
       type: "object",
       properties: {
@@ -112,29 +117,37 @@ export const tools: readonly Tool[] = [
           "$ref": "#/$defs/pay-per-crawl_DaricConfig",
           "description": "Data for setting flag on zones"
         },
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_BotAccessMode": pay_per_crawl_BotAccessMode,
-        "pay-per-crawl_DaricConfig": pay_per_crawl_DaricConfig,
+        "pay-per-crawl_DaricConfig": pay$$per$$crawl_DaricConfig$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getConfigResponse",
       $defs: {
-        "pay-per-crawl_BotAccessMode": pay_per_crawl_BotAccessMode_output,
-        "pay-per-crawl_DaricConfig": pay_per_crawl_DaricConfig_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_getConfigResponse": pay_per_crawl_getConfigResponse_output,
+        "pay-per-crawl_DaricConfig": pay$$per$$crawl_DaricConfig,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_getConfigResponse": pay$$per$$crawl_getConfigResponse,
       },
     },
     annotations: {
@@ -161,15 +174,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_BotAccessMode": pay_per_crawl_BotAccessMode_output,
-        "pay-per-crawl_DaricConfig": pay_per_crawl_DaricConfig_output,
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getConfigResponse": pay_per_crawl_getConfigResponse_output,
+        "pay-per-crawl_DaricConfig": pay$$per$$crawl_DaricConfig,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getConfigResponse": pay$$per$$crawl_getConfigResponse,
       },
     },
     request: (args) => ({
@@ -178,30 +190,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_config_get",
+    name: "payPerCrawl_config_get",
     title: "Get the pay-per-crawl config",
-    description: "Gets the pay-per-crawl config for a zone including the bot configuration.",
+    description: "Gets the pay-per-crawl config for a zone including the bot configuration.\n\nGET /zones/{zone_id}/pay-per-crawl/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getConfigResponse",
       $defs: {
-        "pay-per-crawl_BotAccessMode": pay_per_crawl_BotAccessMode_output,
-        "pay-per-crawl_DaricConfig": pay_per_crawl_DaricConfig_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_getConfigResponse": pay_per_crawl_getConfigResponse_output,
+        "pay-per-crawl_DaricConfig": pay$$per$$crawl_DaricConfig,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_getConfigResponse": pay$$per$$crawl_getConfigResponse,
       },
     },
     annotations: {
@@ -229,15 +250,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_BotAccessMode": pay_per_crawl_BotAccessMode_output,
-        "pay-per-crawl_DaricConfig": pay_per_crawl_DaricConfig_output,
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getConfigResponse": pay_per_crawl_getConfigResponse_output,
+        "pay-per-crawl_DaricConfig": pay$$per$$crawl_DaricConfig,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getConfigResponse": pay$$per$$crawl_getConfigResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/payPerCrawl/crawler/stripe/tools.ts b/src/generated/forge-mcp/payPerCrawl/crawler/stripe/tools.ts
index 586a8b6c9..fb71021b4 100644
--- a/src/generated/forge-mcp/payPerCrawl/crawler/stripe/tools.ts
+++ b/src/generated/forge-mcp/payPerCrawl/crawler/stripe/tools.ts
@@ -3,49 +3,59 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
-  pay_per_crawl_apiNoResultResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
+  pay$$per$$crawl_apiNoResultResponse,
 } from "../../../outputs.js";
 import {
-  pay_per_crawl_StripeConnectResp_output,
-  pay_per_crawl_StripeConnection_output,
-  pay_per_crawl_createStripeConfigResponse_output,
-  pay_per_crawl_getStripeConfigResponse_output,
+  pay$$per$$crawl_StripeConnectResp,
+  pay$$per$$crawl_StripeConnection,
+  pay$$per$$crawl_createStripeConfigResponse,
+  pay$$per$$crawl_getStripeConfigResponse,
 } from "../../outputs.js";
 
 /**
- * The tools of `pay_per_crawl.crawler.stripe`.
+ * The tools of `payPerCrawl.crawler.stripe`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_crawl_crawler_stripe_create",
+    name: "payPerCrawl_crawler_stripe_create",
     title: "Creates the stripe config for a crawler",
-    description: "Creates the stripe config for a crawler.",
+    description: "Creates the stripe config for a crawler.\n\nPOST /accounts/{account_id}/pay-per-crawl/crawler/stripe",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_createStripeConfigResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_StripeConnectResp": pay_per_crawl_StripeConnectResp_output,
-        "pay-per-crawl_createStripeConfigResponse": pay_per_crawl_createStripeConfigResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_StripeConnectResp": pay$$per$$crawl_StripeConnectResp,
+        "pay-per-crawl_createStripeConfigResponse": pay$$per$$crawl_createStripeConfigResponse,
       },
     },
     annotations: {
@@ -72,14 +82,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_StripeConnectResp": pay_per_crawl_StripeConnectResp_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_createStripeConfigResponse": pay_per_crawl_createStripeConfigResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_StripeConnectResp": pay$$per$$crawl_StripeConnectResp,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_createStripeConfigResponse": pay$$per$$crawl_createStripeConfigResponse,
       },
     },
     request: (args) => ({
@@ -87,28 +97,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_crawler_stripe_delete",
+    name: "payPerCrawl_crawler_stripe_delete",
     title: "Deletes the stripe config for a crawler",
-    description: "Deletes the stripe config for a crawler.",
+    description: "Deletes the stripe config for a crawler.\n\nDELETE /accounts/{account_id}/pay-per-crawl/crawler/stripe",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_apiNoResultResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     annotations: {
@@ -135,13 +155,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     request: (args) => ({
@@ -149,29 +169,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_crawler_stripe_get",
+    name: "payPerCrawl_crawler_stripe_get",
     title: "Gets the stripe config for a crawler",
-    description: "Gets the stripe config for a crawler.",
+    description: "Gets the stripe config for a crawler.\n\nGET /accounts/{account_id}/pay-per-crawl/crawler/stripe",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getStripeConfigResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_StripeConnection": pay_per_crawl_StripeConnection_output,
-        "pay-per-crawl_getStripeConfigResponse": pay_per_crawl_getStripeConfigResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_StripeConnection": pay$$per$$crawl_StripeConnection,
+        "pay-per-crawl_getStripeConfigResponse": pay$$per$$crawl_getStripeConfigResponse,
       },
     },
     annotations: {
@@ -226,14 +256,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_StripeConnection": pay_per_crawl_StripeConnection_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getStripeConfigResponse": pay_per_crawl_getStripeConfigResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_StripeConnection": pay$$per$$crawl_StripeConnection,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getStripeConfigResponse": pay$$per$$crawl_getStripeConfigResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/payPerCrawl/crawlers/outputs.ts b/src/generated/forge-mcp/payPerCrawl/crawlers/outputs.ts
index 6467cf190..180a4ab42 100644
--- a/src/generated/forge-mcp/payPerCrawl/crawlers/outputs.ts
+++ b/src/generated/forge-mcp/payPerCrawl/crawlers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_CrawlerEntry` in responses.
  */
-export const pay_per_crawl_CrawlerEntry_output: JsonSchema = {
+export const pay$$per$$crawl_CrawlerEntry: JsonSchema = {
   "properties": {
     "bot_management": {
       "type": "boolean"
@@ -102,7 +102,7 @@ export const pay_per_crawl_CrawlerEntry_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_listCrawlersResponse` in responses.
  */
-export const pay_per_crawl_listCrawlersResponse_output: JsonSchema = {
+export const pay$$per$$crawl_listCrawlersResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerCrawl/crawlers/tools.ts b/src/generated/forge-mcp/payPerCrawl/crawlers/tools.ts
index a25bdb349..b937f0468 100644
--- a/src/generated/forge-mcp/payPerCrawl/crawlers/tools.ts
+++ b/src/generated/forge-mcp/payPerCrawl/crawlers/tools.ts
@@ -3,46 +3,56 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_CrawlerEntry_output,
-  pay_per_crawl_listCrawlersResponse_output,
+  pay$$per$$crawl_CrawlerEntry,
+  pay$$per$$crawl_listCrawlersResponse,
 } from "./outputs.js";
 
 /**
- * The tools of `pay_per_crawl.crawlers`.
+ * The tools of `payPerCrawl.crawlers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_crawl_crawlers_list",
+    name: "payPerCrawl_crawlers_list",
     title: "List pay-per-crawl crawlers",
-    description: "Lists the crawlers known to pay-per-crawl.",
+    description: "Lists the crawlers known to pay-per-crawl.\n\nGET /accounts/{account_id}/pay-per-crawl/crawlers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_listCrawlersResponse",
       $defs: {
-        "pay-per-crawl_CrawlerEntry": pay_per_crawl_CrawlerEntry_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_listCrawlersResponse": pay_per_crawl_listCrawlersResponse_output,
+        "pay-per-crawl_CrawlerEntry": pay$$per$$crawl_CrawlerEntry,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_listCrawlersResponse": pay$$per$$crawl_listCrawlersResponse,
       },
     },
     annotations: {
@@ -64,14 +74,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_CrawlerEntry": pay_per_crawl_CrawlerEntry_output,
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_listCrawlersResponse": pay_per_crawl_listCrawlersResponse_output,
+        "pay-per-crawl_CrawlerEntry": pay$$per$$crawl_CrawlerEntry,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_listCrawlersResponse": pay$$per$$crawl_listCrawlersResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/payPerCrawl/outputs.ts b/src/generated/forge-mcp/payPerCrawl/outputs.ts
index e5d8f0ee5..ab58bbdac 100644
--- a/src/generated/forge-mcp/payPerCrawl/outputs.ts
+++ b/src/generated/forge-mcp/payPerCrawl/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `pay-per-crawl_StripeConnectResp` in responses.
  */
-export const pay_per_crawl_StripeConnectResp_output: JsonSchema = {
+export const pay$$per$$crawl_StripeConnectResp: JsonSchema = {
   "properties": {
     "url": {
       "type": "string"
@@ -18,7 +18,7 @@ export const pay_per_crawl_StripeConnectResp_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_StripeConnection` in responses.
  */
-export const pay_per_crawl_StripeConnection_output: JsonSchema = {
+export const pay$$per$$crawl_StripeConnection: JsonSchema = {
   "properties": {
     "connect_status": {
       "type": "string"
@@ -33,7 +33,7 @@ export const pay_per_crawl_StripeConnection_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_createStripeConfigResponse` in responses.
  */
-export const pay_per_crawl_createStripeConfigResponse_output: JsonSchema = {
+export const pay$$per$$crawl_createStripeConfigResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -63,7 +63,7 @@ export const pay_per_crawl_createStripeConfigResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_getStripeConfigResponse` in responses.
  */
-export const pay_per_crawl_getStripeConfigResponse_output: JsonSchema = {
+export const pay$$per$$crawl_getStripeConfigResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerCrawl/publisher/stripe/tools.ts b/src/generated/forge-mcp/payPerCrawl/publisher/stripe/tools.ts
index 96f6db005..1ffcf0403 100644
--- a/src/generated/forge-mcp/payPerCrawl/publisher/stripe/tools.ts
+++ b/src/generated/forge-mcp/payPerCrawl/publisher/stripe/tools.ts
@@ -3,49 +3,59 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
-  pay_per_crawl_apiNoResultResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
+  pay$$per$$crawl_apiNoResultResponse,
 } from "../../../outputs.js";
 import {
-  pay_per_crawl_StripeConnectResp_output,
-  pay_per_crawl_StripeConnection_output,
-  pay_per_crawl_createStripeConfigResponse_output,
-  pay_per_crawl_getStripeConfigResponse_output,
+  pay$$per$$crawl_StripeConnectResp,
+  pay$$per$$crawl_StripeConnection,
+  pay$$per$$crawl_createStripeConfigResponse,
+  pay$$per$$crawl_getStripeConfigResponse,
 } from "../../outputs.js";
 
 /**
- * The tools of `pay_per_crawl.publisher.stripe`.
+ * The tools of `payPerCrawl.publisher.stripe`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_crawl_publisher_stripe_create",
+    name: "payPerCrawl_publisher_stripe_create",
     title: "Creates the stripe config for a publisher",
-    description: "Creates the stripe config for a publisher.",
+    description: "Creates the stripe config for a publisher.\n\nPOST /accounts/{account_id}/pay-per-crawl/publisher/stripe",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_createStripeConfigResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_StripeConnectResp": pay_per_crawl_StripeConnectResp_output,
-        "pay-per-crawl_createStripeConfigResponse": pay_per_crawl_createStripeConfigResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_StripeConnectResp": pay$$per$$crawl_StripeConnectResp,
+        "pay-per-crawl_createStripeConfigResponse": pay$$per$$crawl_createStripeConfigResponse,
       },
     },
     annotations: {
@@ -72,14 +82,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_StripeConnectResp": pay_per_crawl_StripeConnectResp_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_createStripeConfigResponse": pay_per_crawl_createStripeConfigResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_StripeConnectResp": pay$$per$$crawl_StripeConnectResp,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_createStripeConfigResponse": pay$$per$$crawl_createStripeConfigResponse,
       },
     },
     request: (args) => ({
@@ -87,28 +97,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_publisher_stripe_delete",
+    name: "payPerCrawl_publisher_stripe_delete",
     title: "Deletes the stripe config for a publisher",
-    description: "Deletes the stripe config for a publisher.",
+    description: "Deletes the stripe config for a publisher.\n\nDELETE /accounts/{account_id}/pay-per-crawl/publisher/stripe",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_apiNoResultResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     annotations: {
@@ -135,13 +155,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     request: (args) => ({
@@ -149,29 +169,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_publisher_stripe_get",
+    name: "payPerCrawl_publisher_stripe_get",
     title: "Gets the stripe config for a publisher",
-    description: "Gets the stripe config for a publisher.",
+    description: "Gets the stripe config for a publisher.\n\nGET /accounts/{account_id}/pay-per-crawl/publisher/stripe",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getStripeConfigResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_StripeConnection": pay_per_crawl_StripeConnection_output,
-        "pay-per-crawl_getStripeConfigResponse": pay_per_crawl_getStripeConfigResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_StripeConnection": pay$$per$$crawl_StripeConnection,
+        "pay-per-crawl_getStripeConfigResponse": pay$$per$$crawl_getStripeConfigResponse,
       },
     },
     annotations: {
@@ -226,14 +256,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_StripeConnection": pay_per_crawl_StripeConnection_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getStripeConfigResponse": pay_per_crawl_getStripeConfigResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_StripeConnection": pay$$per$$crawl_StripeConnection,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getStripeConfigResponse": pay$$per$$crawl_getStripeConfigResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/payPerCrawl/terms/outputs.ts b/src/generated/forge-mcp/payPerCrawl/terms/outputs.ts
index 15ceeb7bd..ade048113 100644
--- a/src/generated/forge-mcp/payPerCrawl/terms/outputs.ts
+++ b/src/generated/forge-mcp/payPerCrawl/terms/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_IronCladContract` in responses.
  */
-export const pay_per_crawl_IronCladContract_output: JsonSchema = {
+export const pay$$per$$crawl_IronCladContract: JsonSchema = {
   "properties": {
     "body": {
       "type": "string"
@@ -21,7 +21,7 @@ export const pay_per_crawl_IronCladContract_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_SignatureLinkResponse` in responses.
  */
-export const pay_per_crawl_SignatureLinkResponse_output: JsonSchema = {
+export const pay$$per$$crawl_SignatureLinkResponse: JsonSchema = {
   "properties": {
     "link": {
       "type": "string"
@@ -33,7 +33,7 @@ export const pay_per_crawl_SignatureLinkResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_getTermsResponse` in responses.
  */
-export const pay_per_crawl_getTermsResponse_output: JsonSchema = {
+export const pay$$per$$crawl_getTermsResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -63,7 +63,7 @@ export const pay_per_crawl_getTermsResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_getTermsSignatureLinkResponse` in responses.
  */
-export const pay_per_crawl_getTermsSignatureLinkResponse_output: JsonSchema = {
+export const pay$$per$$crawl_getTermsSignatureLinkResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -93,7 +93,7 @@ export const pay_per_crawl_getTermsSignatureLinkResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_getTermsSignatureResponse` in responses.
  */
-export const pay_per_crawl_getTermsSignatureResponse_output: JsonSchema = {
+export const pay$$per$$crawl_getTermsSignatureResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerCrawl/terms/tools.ts b/src/generated/forge-mcp/payPerCrawl/terms/tools.ts
index 15c6d2d80..8d38caf67 100644
--- a/src/generated/forge-mcp/payPerCrawl/terms/tools.ts
+++ b/src/generated/forge-mcp/payPerCrawl/terms/tools.ts
@@ -1,52 +1,62 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
-  pay_per_crawl_apiNoResultResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
+  pay$$per$$crawl_apiNoResultResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_IronCladContract_output,
-  pay_per_crawl_SignatureLinkResponse_output,
-  pay_per_crawl_getTermsResponse_output,
-  pay_per_crawl_getTermsSignatureLinkResponse_output,
-  pay_per_crawl_getTermsSignatureResponse_output,
+  pay$$per$$crawl_IronCladContract,
+  pay$$per$$crawl_SignatureLinkResponse,
+  pay$$per$$crawl_getTermsResponse,
+  pay$$per$$crawl_getTermsSignatureLinkResponse,
+  pay$$per$$crawl_getTermsSignatureResponse,
 } from "./outputs.js";
 
 /**
- * The tools of `pay_per_crawl.terms`.
+ * The tools of `payPerCrawl.terms`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_crawl_terms_get",
+    name: "payPerCrawl_terms_get",
     title: "Get pay-per-crawl terms",
-    description: "Gets the pay-per-crawl terms and conditions contract.",
+    description: "Gets the pay-per-crawl terms and conditions contract.\n\nGET /accounts/{account_id}/pay-per-crawl/terms",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getTermsResponse",
       $defs: {
-        "pay-per-crawl_IronCladContract": pay_per_crawl_IronCladContract_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_getTermsResponse": pay_per_crawl_getTermsResponse_output,
+        "pay-per-crawl_IronCladContract": pay$$per$$crawl_IronCladContract,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_getTermsResponse": pay$$per$$crawl_getTermsResponse,
       },
     },
     annotations: {
@@ -101,14 +111,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_IronCladContract": pay_per_crawl_IronCladContract_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getTermsResponse": pay_per_crawl_getTermsResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_IronCladContract": pay$$per$$crawl_IronCladContract,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getTermsResponse": pay$$per$$crawl_getTermsResponse,
       },
     },
     request: (args) => ({
@@ -116,32 +126,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_terms_get_signature",
+    name: "payPerCrawl_terms_getSignature",
     title: "Get pay-per-crawl terms signature status",
-    description: "Gets the account's pay-per-crawl terms signature status.",
+    description: "Gets the account's pay-per-crawl terms signature status.\n\nGET /accounts/{account_id}/pay-per-crawl/terms/signature",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "refresh": {
-          "description": "Refresh the signature status from Ironclad.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "remote": {
+              "description": "Refresh the signature status from Ironclad.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getTermsSignatureResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_getTermsSignatureResponse": pay_per_crawl_getTermsSignatureResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_getTermsSignatureResponse": pay$$per$$crawl_getTermsSignatureResponse,
       },
     },
     annotations: {
@@ -196,46 +222,56 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getTermsSignatureResponse": pay_per_crawl_getTermsSignatureResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getTermsSignatureResponse": pay$$per$$crawl_getTermsSignatureResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pay-per-crawl/terms/signature`,
       query: [
-        ["remote", args["refresh"], true],
+        ["remote", param(args, "query", "remote"), true],
       ],
     }),
   },
   {
-    name: "pay_per_crawl_terms_get_signature_link",
+    name: "payPerCrawl_terms_getSignatureLink",
     title: "Get signed pay-per-crawl terms link",
-    description: "Gets a download link for the account's signed pay-per-crawl terms.",
+    description: "Gets a download link for the account's signed pay-per-crawl terms.\n\nGET /accounts/{account_id}/pay-per-crawl/signature_link",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getTermsSignatureLinkResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_SignatureLinkResponse": pay_per_crawl_SignatureLinkResponse_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_getTermsSignatureLinkResponse": pay_per_crawl_getTermsSignatureLinkResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_SignatureLinkResponse": pay$$per$$crawl_SignatureLinkResponse,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_getTermsSignatureLinkResponse": pay$$per$$crawl_getTermsSignatureLinkResponse,
       },
     },
     annotations: {
@@ -290,14 +326,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_SignatureLinkResponse": pay_per_crawl_SignatureLinkResponse_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getTermsSignatureLinkResponse": pay_per_crawl_getTermsSignatureLinkResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_SignatureLinkResponse": pay$$per$$crawl_SignatureLinkResponse,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getTermsSignatureLinkResponse": pay$$per$$crawl_getTermsSignatureLinkResponse,
       },
     },
     request: (args) => ({
@@ -305,42 +341,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_terms_send_signature_event",
+    name: "payPerCrawl_terms_sendSignatureEvent",
     title: "Record pay-per-crawl terms activity",
-    description: "Records that an account displayed or agreed to the pay-per-crawl terms.",
+    description: "Records that an account displayed or agreed to the pay-per-crawl terms.\n\nPOST /accounts/{account_id}/pay-per-crawl/terms/signature",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
-        },
-        "event_type": {
-          "description": "The terms activity to record.",
-          "enum": [
-            "agreed",
-            "displayed"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "vid": {
-          "description": "Ironclad contract version ID.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "event_type": {
+              "description": "The terms activity to record.",
+              "enum": [
+                "agreed",
+                "displayed"
+              ],
+              "type": "string"
+            },
+            "vid": {
+              "description": "Ironclad contract version ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "event_type",
+            "vid"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "event_type",
-        "vid"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_apiNoResultResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     annotations: {
@@ -367,20 +422,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pay-per-crawl/terms/signature`,
       query: [
-        ["event_type", args["event_type"], true],
-        ["vid", args["vid"], true],
+        ["event_type", param(args, "query", "event_type"), true],
+        ["vid", param(args, "query", "vid"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/payPerCrawl/zones/outputs.ts b/src/generated/forge-mcp/payPerCrawl/zones/outputs.ts
index e93eafa8f..e5618ecf8 100644
--- a/src/generated/forge-mcp/payPerCrawl/zones/outputs.ts
+++ b/src/generated/forge-mcp/payPerCrawl/zones/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_DaricZoneCanBeEnabled` in responses.
  */
-export const pay_per_crawl_DaricZoneCanBeEnabled_output: JsonSchema = {
+export const pay$$per$$crawl_DaricZoneCanBeEnabled: JsonSchema = {
   "properties": {
     "can_be_enabled": {
       "type": "boolean"
@@ -24,7 +24,7 @@ export const pay_per_crawl_DaricZoneCanBeEnabled_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_ZonesCanBeEnabledPayload` in responses.
  */
-export const pay_per_crawl_ZonesCanBeEnabledPayload_output: JsonSchema = {
+export const pay$$per$$crawl_ZonesCanBeEnabledPayload: JsonSchema = {
   "properties": {
     "zones": {
       "items": {
@@ -39,7 +39,7 @@ export const pay_per_crawl_ZonesCanBeEnabledPayload_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_getZoneCanBeEnabledResponse` in responses.
  */
-export const pay_per_crawl_getZoneCanBeEnabledResponse_output: JsonSchema = {
+export const pay$$per$$crawl_getZoneCanBeEnabledResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -69,7 +69,7 @@ export const pay_per_crawl_getZoneCanBeEnabledResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_queryZonesCanBeEnabledResponse` in responses.
  */
-export const pay_per_crawl_queryZonesCanBeEnabledResponse_output: JsonSchema = {
+export const pay$$per$$crawl_queryZonesCanBeEnabledResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerCrawl/zones/schemas.ts b/src/generated/forge-mcp/payPerCrawl/zones/schemas.ts
index 85f7b2e1f..50e898aae 100644
--- a/src/generated/forge-mcp/payPerCrawl/zones/schemas.ts
+++ b/src/generated/forge-mcp/payPerCrawl/zones/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_DaricZoneCanBeEnabledUpdate`.
  */
-export const pay_per_crawl_DaricZoneCanBeEnabledUpdate: JsonSchema = {
+export const pay$$per$$crawl_DaricZoneCanBeEnabledUpdate: JsonSchema = {
   "properties": {
     "can_be_enabled": {
       "type": "boolean"
@@ -24,7 +24,7 @@ export const pay_per_crawl_DaricZoneCanBeEnabledUpdate: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_ZonesCanBeEnabledQueryPayload`.
  */
-export const pay_per_crawl_ZonesCanBeEnabledQueryPayload: JsonSchema = {
+export const pay$$per$$crawl_ZonesCanBeEnabledQueryPayload: JsonSchema = {
   "properties": {
     "zones": {
       "items": {
@@ -39,7 +39,7 @@ export const pay_per_crawl_ZonesCanBeEnabledQueryPayload: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_ZonesCanBeEnabledUpdatePayload`.
  */
-export const pay_per_crawl_ZonesCanBeEnabledUpdatePayload: JsonSchema = {
+export const pay$$per$$crawl_ZonesCanBeEnabledUpdatePayload: JsonSchema = {
   "properties": {
     "zones": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerCrawl/zones/tools.ts b/src/generated/forge-mcp/payPerCrawl/zones/tools.ts
index 32d9f734c..1b9af09ae 100644
--- a/src/generated/forge-mcp/payPerCrawl/zones/tools.ts
+++ b/src/generated/forge-mcp/payPerCrawl/zones/tools.ts
@@ -3,54 +3,64 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
-  pay_per_crawl_apiNoResultResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
+  pay$$per$$crawl_apiNoResultResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_DaricZoneCanBeEnabled_output,
-  pay_per_crawl_ZonesCanBeEnabledPayload_output,
-  pay_per_crawl_getZoneCanBeEnabledResponse_output,
-  pay_per_crawl_queryZonesCanBeEnabledResponse_output,
+  pay$$per$$crawl_DaricZoneCanBeEnabled,
+  pay$$per$$crawl_ZonesCanBeEnabledPayload,
+  pay$$per$$crawl_getZoneCanBeEnabledResponse,
+  pay$$per$$crawl_queryZonesCanBeEnabledResponse,
 } from "./outputs.js";
 import {
-  pay_per_crawl_DaricZoneCanBeEnabledUpdate,
-  pay_per_crawl_ZonesCanBeEnabledQueryPayload,
-  pay_per_crawl_ZonesCanBeEnabledUpdatePayload,
+  pay$$per$$crawl_DaricZoneCanBeEnabledUpdate,
+  pay$$per$$crawl_ZonesCanBeEnabledQueryPayload,
+  pay$$per$$crawl_ZonesCanBeEnabledUpdatePayload,
 } from "./schemas.js";
 
 /**
- * The tools of `pay_per_crawl.zones`.
+ * The tools of `payPerCrawl.zones`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_crawl_zones_get_can_be_enabled",
+    name: "payPerCrawl_zones_getCanBeEnabled",
     title: "Get pay-per-crawl zone eligibility",
-    description: "Gets whether pay-per-crawl can be enabled for a zone.",
+    description: "Gets whether pay-per-crawl can be enabled for a zone.\n\nGET /zones/{zone_id}/pay-per-crawl/can_be_enabled",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_getZoneCanBeEnabledResponse",
       $defs: {
-        "pay-per-crawl_DaricZoneCanBeEnabled": pay_per_crawl_DaricZoneCanBeEnabled_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_getZoneCanBeEnabledResponse": pay_per_crawl_getZoneCanBeEnabledResponse_output,
+        "pay-per-crawl_DaricZoneCanBeEnabled": pay$$per$$crawl_DaricZoneCanBeEnabled,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_getZoneCanBeEnabledResponse": pay$$per$$crawl_getZoneCanBeEnabledResponse,
       },
     },
     annotations: {
@@ -78,14 +88,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_DaricZoneCanBeEnabled": pay_per_crawl_DaricZoneCanBeEnabled_output,
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_getZoneCanBeEnabledResponse": pay_per_crawl_getZoneCanBeEnabledResponse_output,
+        "pay-per-crawl_DaricZoneCanBeEnabled": pay$$per$$crawl_DaricZoneCanBeEnabled,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_getZoneCanBeEnabledResponse": pay$$per$$crawl_getZoneCanBeEnabledResponse,
       },
     },
     request: (args) => ({
@@ -93,38 +103,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_zones_query_can_be_enabled",
+    name: "payPerCrawl_zones_queryCanBeEnabled",
     title: "Gets the can_be_enabled zone setting",
-    description: "Provided a list of pay-per-crawl configured zones this method will return whether they can enable PPC or not.",
+    description: "Provided a list of pay-per-crawl configured zones this method will return whether they can enable PPC or not.\n\nPOST /accounts/{account_id}/pay-per-crawl/zones_can_be_enabled/query",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/pay-per-crawl_ZonesCanBeEnabledQueryPayload",
           "description": "Zone IDs to check for pay-per-crawl eligibility"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_ZonesCanBeEnabledQueryPayload": pay_per_crawl_ZonesCanBeEnabledQueryPayload,
+        "pay-per-crawl_ZonesCanBeEnabledQueryPayload": pay$$per$$crawl_ZonesCanBeEnabledQueryPayload,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_queryZonesCanBeEnabledResponse",
       $defs: {
-        "pay-per-crawl_DaricZoneCanBeEnabled": pay_per_crawl_DaricZoneCanBeEnabled_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_ZonesCanBeEnabledPayload": pay_per_crawl_ZonesCanBeEnabledPayload_output,
-        "pay-per-crawl_queryZonesCanBeEnabledResponse": pay_per_crawl_queryZonesCanBeEnabledResponse_output,
+        "pay-per-crawl_DaricZoneCanBeEnabled": pay$$per$$crawl_DaricZoneCanBeEnabled,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_ZonesCanBeEnabledPayload": pay$$per$$crawl_ZonesCanBeEnabledPayload,
+        "pay-per-crawl_queryZonesCanBeEnabledResponse": pay$$per$$crawl_queryZonesCanBeEnabledResponse,
       },
     },
     annotations: {
@@ -179,15 +199,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_DaricZoneCanBeEnabled": pay_per_crawl_DaricZoneCanBeEnabled_output,
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_ZonesCanBeEnabledPayload": pay_per_crawl_ZonesCanBeEnabledPayload_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_queryZonesCanBeEnabledResponse": pay_per_crawl_queryZonesCanBeEnabledResponse_output,
+        "pay-per-crawl_DaricZoneCanBeEnabled": pay$$per$$crawl_DaricZoneCanBeEnabled,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_ZonesCanBeEnabledPayload": pay$$per$$crawl_ZonesCanBeEnabledPayload,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_queryZonesCanBeEnabledResponse": pay$$per$$crawl_queryZonesCanBeEnabledResponse,
       },
     },
     request: (args) => ({
@@ -196,37 +216,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_crawl_zones_set_can_be_enabled",
+    name: "payPerCrawl_zones_setCanBeEnabled",
     title: "Set can_be_enabled setting on zones",
-    description: "Allows an account admin to set the can_be_enabled setting on a list of zones. An omitted can_be_enabled value leaves that zone unchanged.",
+    description: "Allows an account admin to set the can_be_enabled setting on a list of zones. An omitted can_be_enabled value leaves that zone unchanged.\n\nPATCH /accounts/{account_id}/pay-per-crawl/zones_can_be_enabled",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/pay-per-crawl_ZonesCanBeEnabledUpdatePayload",
           "description": "Data for setting flag on zones"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_DaricZoneCanBeEnabledUpdate": pay_per_crawl_DaricZoneCanBeEnabledUpdate,
-        "pay-per-crawl_ZonesCanBeEnabledUpdatePayload": pay_per_crawl_ZonesCanBeEnabledUpdatePayload,
+        "pay-per-crawl_DaricZoneCanBeEnabledUpdate": pay$$per$$crawl_DaricZoneCanBeEnabledUpdate,
+        "pay-per-crawl_ZonesCanBeEnabledUpdatePayload": pay$$per$$crawl_ZonesCanBeEnabledUpdatePayload,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_apiNoResultResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     annotations: {
@@ -253,13 +283,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/payPerUse/enabledDomains/outputs.ts b/src/generated/forge-mcp/payPerUse/enabledDomains/outputs.ts
index f4974b162..84e953144 100644
--- a/src/generated/forge-mcp/payPerUse/enabledDomains/outputs.ts
+++ b/src/generated/forge-mcp/payPerUse/enabledDomains/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_EnabledDomain` in responses.
  */
-export const pay_per_crawl_EnabledDomain_output: JsonSchema = {
+export const pay$$per$$crawl_EnabledDomain: JsonSchema = {
   "properties": {
     "domain": {
       "type": "string"
@@ -57,7 +57,7 @@ export const pay_per_crawl_EnabledDomain_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_EnabledDomainsResponse` in responses.
  */
-export const pay_per_crawl_EnabledDomainsResponse_output: JsonSchema = {
+export const pay$$per$$crawl_EnabledDomainsResponse: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/pay-per-crawl_EnabledDomainsResult"
@@ -79,7 +79,7 @@ export const pay_per_crawl_EnabledDomainsResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_EnabledDomainsResult` in responses.
  */
-export const pay_per_crawl_EnabledDomainsResult_output: JsonSchema = {
+export const pay$$per$$crawl_EnabledDomainsResult: JsonSchema = {
   "properties": {
     "cursor": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/payPerUse/enabledDomains/tools.ts b/src/generated/forge-mcp/payPerUse/enabledDomains/tools.ts
index 91b295dbf..fe617b18e 100644
--- a/src/generated/forge-mcp/payPerUse/enabledDomains/tools.ts
+++ b/src/generated/forge-mcp/payPerUse/enabledDomains/tools.ts
@@ -1,55 +1,71 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_apiErrorResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_apiErrorResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_EnabledDomain_output,
-  pay_per_crawl_EnabledDomainsResponse_output,
-  pay_per_crawl_EnabledDomainsResult_output,
+  pay$$per$$crawl_EnabledDomain,
+  pay$$per$$crawl_EnabledDomainsResponse,
+  pay$$per$$crawl_EnabledDomainsResult,
 } from "./outputs.js";
 
 /**
- * The tools of `pay_per_use.enabled_domains`.
+ * The tools of `payPerUse.enabledDomains`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_use_enabled_domains_list",
+    name: "payPerUse_enabledDomains_list",
     title: "List enabled Pay Per Use domains",
-    description: "Returns publisher domains associated with the requesting Pay Per Use operator through an accepted price agreement. License expiration is the earlier non-null boundary from the price agreement and publisher zone lifecycles. A future expiration remains active and is exposed to the operator. After expiration, the license remains listed as expired for one calendar month before it is omitted; an active agreement for the same domain takes precedence. The requesting account must be an active Pay Per Use operator.",
+    description: "Returns publisher domains associated with the requesting Pay Per Use operator through an accepted price agreement. License expiration is the earlier non-null boundary from the price agreement and publisher zone lifecycles. A future expiration remains active and is exposed to the operator. After expiration, the license remains listed as expired for one calendar month before it is omitted; an active agreement for the same domain takes precedence. The requesting account must be an active Pay Per Use operator.\n\nGET /accounts/{account_id}/pay-per-use/enabled-domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier for the participant",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier for the participant",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "description": "Opaque, account-bound cursor returned by the previous page. Cursors expire after one hour; restart pagination without a cursor after receiving a 400 response for an expired cursor.",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Maximum number of domains to return",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque, account-bound cursor returned by the previous page. Cursors expire after one hour; restart pagination without a cursor after receiving a 400 response for an expired cursor.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Maximum number of domains to return",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_EnabledDomainsResponse",
       $defs: {
-        "pay-per-crawl_EnabledDomain": pay_per_crawl_EnabledDomain_output,
-        "pay-per-crawl_EnabledDomainsResponse": pay_per_crawl_EnabledDomainsResponse_output,
-        "pay-per-crawl_EnabledDomainsResult": pay_per_crawl_EnabledDomainsResult_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
+        "pay-per-crawl_EnabledDomain": pay$$per$$crawl_EnabledDomain,
+        "pay-per-crawl_EnabledDomainsResponse": pay$$per$$crawl_EnabledDomainsResponse,
+        "pay-per-crawl_EnabledDomainsResult": pay$$per$$crawl_EnabledDomainsResult,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
       },
     },
     annotations: {
@@ -80,20 +96,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_EnabledDomain": pay_per_crawl_EnabledDomain_output,
-        "pay-per-crawl_EnabledDomainsResponse": pay_per_crawl_EnabledDomainsResponse_output,
-        "pay-per-crawl_EnabledDomainsResult": pay_per_crawl_EnabledDomainsResult_output,
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_EnabledDomain": pay$$per$$crawl_EnabledDomain,
+        "pay-per-crawl_EnabledDomainsResponse": pay$$per$$crawl_EnabledDomainsResponse,
+        "pay-per-crawl_EnabledDomainsResult": pay$$per$$crawl_EnabledDomainsResult,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pay-per-use/enabled-domains`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/payPerUse/operator/outputs.ts b/src/generated/forge-mcp/payPerUse/operator/outputs.ts
index fd98ed528..9a399a86a 100644
--- a/src/generated/forge-mcp/payPerUse/operator/outputs.ts
+++ b/src/generated/forge-mcp/payPerUse/operator/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUOperatorConfiguration` in responses.
  */
-export const pay_per_crawl_PPUOperatorConfiguration_output: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorConfiguration: JsonSchema = {
   "properties": {
     "default_price_usd_microcents": {
       "type": "integer"
@@ -29,7 +29,7 @@ export const pay_per_crawl_PPUOperatorConfiguration_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUOperatorConfigurationResponse` in responses.
  */
-export const pay_per_crawl_PPUOperatorConfigurationResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorConfigurationResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -59,7 +59,7 @@ export const pay_per_crawl_PPUOperatorConfigurationResponse_output: JsonSchema =
 /**
  * The schema of `pay-per-crawl_PPUOperatorConfigurationResult` in responses.
  */
-export const pay_per_crawl_PPUOperatorConfigurationResult_output: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorConfigurationResult: JsonSchema = {
   "properties": {
     "default_price_usd_microcents": {
       "type": "integer"
@@ -95,7 +95,7 @@ export const pay_per_crawl_PPUOperatorConfigurationResult_output: JsonSchema = {
  * The schema of `pay-per-crawl_PPUOperatorConfigurationResultResponse` in
  * responses.
  */
-export const pay_per_crawl_PPUOperatorConfigurationResultResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorConfigurationResultResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerUse/operator/schemas.ts b/src/generated/forge-mcp/payPerUse/operator/schemas.ts
index 1dd787f56..1c6361955 100644
--- a/src/generated/forge-mcp/payPerUse/operator/schemas.ts
+++ b/src/generated/forge-mcp/payPerUse/operator/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUOperatorConfiguration`.
  */
-export const pay_per_crawl_PPUOperatorConfiguration: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorConfiguration: JsonSchema = {
   "properties": {
     "default_price_usd_microcents": {
       "description": "Default price in microcents. 1 USD = 100,000,000 microcents. Must be a multiple of 100,000 ($0.001) between $0.001 and $9,999.999.",
@@ -30,7 +30,7 @@ export const pay_per_crawl_PPUOperatorConfiguration: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUOperatorConfigurationUpdate`.
  */
-export const pay_per_crawl_PPUOperatorConfigurationUpdate: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorConfigurationUpdate: JsonSchema = {
   "properties": {
     "default_price_usd_microcents": {
       "description": "Default price in microcents. 1 USD = 100,000,000 microcents. Must be a multiple of 100,000 ($0.001) between $0.001 and $9,999.999.",
diff --git a/src/generated/forge-mcp/payPerUse/operator/tools.ts b/src/generated/forge-mcp/payPerUse/operator/tools.ts
index ea2ebb9a5..f8f969736 100644
--- a/src/generated/forge-mcp/payPerUse/operator/tools.ts
+++ b/src/generated/forge-mcp/payPerUse/operator/tools.ts
@@ -3,52 +3,62 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_PPUOperatorConfigurationResponse_output,
-  pay_per_crawl_PPUOperatorConfigurationResultResponse_output,
-  pay_per_crawl_PPUOperatorConfigurationResult_output,
-  pay_per_crawl_PPUOperatorConfiguration_output,
+  pay$$per$$crawl_PPUOperatorConfiguration,
+  pay$$per$$crawl_PPUOperatorConfigurationResponse,
+  pay$$per$$crawl_PPUOperatorConfigurationResult,
+  pay$$per$$crawl_PPUOperatorConfigurationResultResponse,
 } from "./outputs.js";
 import {
-  pay_per_crawl_PPUOperatorConfiguration,
-  pay_per_crawl_PPUOperatorConfigurationUpdate,
+  pay$$per$$crawl_PPUOperatorConfiguration as pay$$per$$crawl_PPUOperatorConfiguration$,
+  pay$$per$$crawl_PPUOperatorConfigurationUpdate,
 } from "./schemas.js";
 
 /**
- * The tools of `pay_per_use.operator`.
+ * The tools of `payPerUse.operator`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_use_operator_get_configuration",
+    name: "payPerUse_operator_getConfiguration",
     title: "Get pay-per-use operator configuration",
-    description: "Gets the pay-per-use operator configuration for an account, including its read-only non-billable classification timestamp.",
+    description: "Gets the pay-per-use operator configuration for an account, including its read-only non-billable classification timestamp.\n\nGET /accounts/{account_id}/pay-per-use/operator/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUOperatorConfigurationResultResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUOperatorConfigurationResult": pay_per_crawl_PPUOperatorConfigurationResult_output,
-        "pay-per-crawl_PPUOperatorConfigurationResultResponse": pay_per_crawl_PPUOperatorConfigurationResultResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUOperatorConfigurationResult": pay$$per$$crawl_PPUOperatorConfigurationResult,
+        "pay-per-crawl_PPUOperatorConfigurationResultResponse": pay$$per$$crawl_PPUOperatorConfigurationResultResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -73,14 +83,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUOperatorConfigurationResult": pay_per_crawl_PPUOperatorConfigurationResult_output,
-        "pay-per-crawl_PPUOperatorConfigurationResultResponse": pay_per_crawl_PPUOperatorConfigurationResultResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUOperatorConfigurationResult": pay$$per$$crawl_PPUOperatorConfigurationResult,
+        "pay-per-crawl_PPUOperatorConfigurationResultResponse": pay$$per$$crawl_PPUOperatorConfigurationResultResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
@@ -88,37 +98,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_use_operator_set_configuration",
+    name: "payPerUse_operator_setConfiguration",
     title: "Set pay-per-use operator configuration",
-    description: "Creates or updates the pay-per-use operator configuration for an account. Creating an enabled configuration or re-enabling a disabled billable operator requires completed Stripe onboarding, while non-billable operators do not; an already-enabled operator is not affected by later Stripe status changes. A Cloudflare-verified operator's name and default price cannot be changed.",
+    description: "Creates or updates the pay-per-use operator configuration for an account. Creating an enabled configuration or re-enabling a disabled billable operator requires completed Stripe onboarding, while non-billable operators do not; an already-enabled operator is not affected by later Stripe status changes. A Cloudflare-verified operator's name and default price cannot be changed.\n\nPUT /accounts/{account_id}/pay-per-use/operator/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/pay-per-crawl_PPUOperatorConfiguration",
           "description": "Pay-per-use operator configuration"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_PPUOperatorConfiguration": pay_per_crawl_PPUOperatorConfiguration,
+        "pay-per-crawl_PPUOperatorConfiguration": pay$$per$$crawl_PPUOperatorConfiguration$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUOperatorConfigurationResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUOperatorConfiguration": pay_per_crawl_PPUOperatorConfiguration_output,
-        "pay-per-crawl_PPUOperatorConfigurationResponse": pay_per_crawl_PPUOperatorConfigurationResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUOperatorConfiguration": pay$$per$$crawl_PPUOperatorConfiguration,
+        "pay-per-crawl_PPUOperatorConfigurationResponse": pay$$per$$crawl_PPUOperatorConfigurationResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -146,14 +166,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUOperatorConfiguration": pay_per_crawl_PPUOperatorConfiguration_output,
-        "pay-per-crawl_PPUOperatorConfigurationResponse": pay_per_crawl_PPUOperatorConfigurationResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUOperatorConfiguration": pay$$per$$crawl_PPUOperatorConfiguration,
+        "pay-per-crawl_PPUOperatorConfigurationResponse": pay$$per$$crawl_PPUOperatorConfigurationResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
@@ -162,37 +182,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_use_operator_update_configuration",
+    name: "payPerUse_operator_updateConfiguration",
     title: "Update pay-per-use operator configuration",
-    description: "Updates one or more fields of an existing pay-per-use operator configuration. Re-enabling a disabled billable operator requires completed Stripe onboarding, while non-billable operators do not; an already-enabled operator is not affected by later Stripe status changes. A Cloudflare-verified operator's name and default price cannot be changed.",
+    description: "Updates one or more fields of an existing pay-per-use operator configuration. Re-enabling a disabled billable operator requires completed Stripe onboarding, while non-billable operators do not; an already-enabled operator is not affected by later Stripe status changes. A Cloudflare-verified operator's name and default price cannot be changed.\n\nPATCH /accounts/{account_id}/pay-per-use/operator/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/pay-per-crawl_PPUOperatorConfigurationUpdate",
           "description": "Pay-per-use operator configuration update"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_PPUOperatorConfigurationUpdate": pay_per_crawl_PPUOperatorConfigurationUpdate,
+        "pay-per-crawl_PPUOperatorConfigurationUpdate": pay$$per$$crawl_PPUOperatorConfigurationUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUOperatorConfigurationResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUOperatorConfiguration": pay_per_crawl_PPUOperatorConfiguration_output,
-        "pay-per-crawl_PPUOperatorConfigurationResponse": pay_per_crawl_PPUOperatorConfigurationResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUOperatorConfiguration": pay$$per$$crawl_PPUOperatorConfiguration,
+        "pay-per-crawl_PPUOperatorConfigurationResponse": pay$$per$$crawl_PPUOperatorConfigurationResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -223,14 +253,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUOperatorConfiguration": pay_per_crawl_PPUOperatorConfiguration_output,
-        "pay-per-crawl_PPUOperatorConfigurationResponse": pay_per_crawl_PPUOperatorConfigurationResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUOperatorConfiguration": pay$$per$$crawl_PPUOperatorConfiguration,
+        "pay-per-crawl_PPUOperatorConfigurationResponse": pay$$per$$crawl_PPUOperatorConfigurationResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/payPerUse/outputs.ts b/src/generated/forge-mcp/payPerUse/outputs.ts
index 89d1c9145..8d77d00f8 100644
--- a/src/generated/forge-mcp/payPerUse/outputs.ts
+++ b/src/generated/forge-mcp/payPerUse/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUPrice` in responses.
  */
-export const pay_per_crawl_PPUPrice_output: JsonSchema = {
+export const pay$$per$$crawl_PPUPrice: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -57,7 +57,7 @@ export const pay_per_crawl_PPUPrice_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUPriceResponse` in responses.
  */
-export const pay_per_crawl_PPUPriceResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUPriceResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerUse/pricing/outputs.ts b/src/generated/forge-mcp/payPerUse/pricing/outputs.ts
index 1ceb51393..b7ca26814 100644
--- a/src/generated/forge-mcp/payPerUse/pricing/outputs.ts
+++ b/src/generated/forge-mcp/payPerUse/pricing/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUOperatorPrice` in responses.
  */
-export const pay_per_crawl_PPUOperatorPrice_output: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorPrice: JsonSchema = {
   "properties": {
     "current_price": {
       "$ref": "#/$defs/pay-per-crawl_PPUPrice"
@@ -50,7 +50,7 @@ export const pay_per_crawl_PPUOperatorPrice_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUOperatorPrices` in responses.
  */
-export const pay_per_crawl_PPUOperatorPrices_output: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorPrices: JsonSchema = {
   "properties": {
     "operators": {
       "items": {
@@ -68,7 +68,7 @@ export const pay_per_crawl_PPUOperatorPrices_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUOperatorPricesResponse` in responses.
  */
-export const pay_per_crawl_PPUOperatorPricesResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorPricesResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerUse/pricing/schemas.ts b/src/generated/forge-mcp/payPerUse/pricing/schemas.ts
index ed468035f..6240920fe 100644
--- a/src/generated/forge-mcp/payPerUse/pricing/schemas.ts
+++ b/src/generated/forge-mcp/payPerUse/pricing/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUPublisherPriceAcceptDefaultRequest`.
  */
-export const pay_per_crawl_PPUPublisherPriceAcceptDefaultRequest: JsonSchema = {
+export const pay$$per$$crawl_PPUPublisherPriceAcceptDefaultRequest: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -24,7 +24,7 @@ export const pay_per_crawl_PPUPublisherPriceAcceptDefaultRequest: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUPublisherPriceActionRequest`.
  */
-export const pay_per_crawl_PPUPublisherPriceActionRequest: JsonSchema = {
+export const pay$$per$$crawl_PPUPublisherPriceActionRequest: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/pay-per-crawl_PPUPublisherPriceProposeRequest"
@@ -44,7 +44,7 @@ export const pay_per_crawl_PPUPublisherPriceActionRequest: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUPublisherPriceProposeRequest`.
  */
-export const pay_per_crawl_PPUPublisherPriceProposeRequest: JsonSchema = {
+export const pay$$per$$crawl_PPUPublisherPriceProposeRequest: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -67,7 +67,7 @@ export const pay_per_crawl_PPUPublisherPriceProposeRequest: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUPublisherPriceResumeRequest`.
  */
-export const pay_per_crawl_PPUPublisherPriceResumeRequest: JsonSchema = {
+export const pay$$per$$crawl_PPUPublisherPriceResumeRequest: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -85,7 +85,7 @@ export const pay_per_crawl_PPUPublisherPriceResumeRequest: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUPublisherPriceWithdrawRequest`.
  */
-export const pay_per_crawl_PPUPublisherPriceWithdrawRequest: JsonSchema = {
+export const pay$$per$$crawl_PPUPublisherPriceWithdrawRequest: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
diff --git a/src/generated/forge-mcp/payPerUse/pricing/tools.ts b/src/generated/forge-mcp/payPerUse/pricing/tools.ts
index ec92b15c6..901f2f256 100644
--- a/src/generated/forge-mcp/payPerUse/pricing/tools.ts
+++ b/src/generated/forge-mcp/payPerUse/pricing/tools.ts
@@ -1,73 +1,89 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
-  pay_per_crawl_apiNoResultResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
+  pay$$per$$crawl_apiNoResultResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_PPUPriceResponse_output,
-  pay_per_crawl_PPUPrice_output,
+  pay$$per$$crawl_PPUPrice,
+  pay$$per$$crawl_PPUPriceResponse,
 } from "../outputs.js";
 import {
-  pay_per_crawl_PPUOperatorPrice_output,
-  pay_per_crawl_PPUOperatorPricesResponse_output,
-  pay_per_crawl_PPUOperatorPrices_output,
+  pay$$per$$crawl_PPUOperatorPrice,
+  pay$$per$$crawl_PPUOperatorPrices,
+  pay$$per$$crawl_PPUOperatorPricesResponse,
 } from "./outputs.js";
 import {
-  pay_per_crawl_PPUPublisherPriceAcceptDefaultRequest,
-  pay_per_crawl_PPUPublisherPriceActionRequest,
-  pay_per_crawl_PPUPublisherPriceProposeRequest,
-  pay_per_crawl_PPUPublisherPriceResumeRequest,
-  pay_per_crawl_PPUPublisherPriceWithdrawRequest,
+  pay$$per$$crawl_PPUPublisherPriceAcceptDefaultRequest,
+  pay$$per$$crawl_PPUPublisherPriceActionRequest,
+  pay$$per$$crawl_PPUPublisherPriceProposeRequest,
+  pay$$per$$crawl_PPUPublisherPriceResumeRequest,
+  pay$$per$$crawl_PPUPublisherPriceWithdrawRequest,
 } from "./schemas.js";
 
 /**
- * The tools of `pay_per_use.pricing`.
+ * The tools of `payPerUse.pricing`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_use_pricing_list_operators",
+    name: "payPerUse_pricing_listOperators",
     title: "List pay-per-use operators",
-    description: "Lists a paginated set of enabled pay-per-use operators with verified names, matching billing classification, and their prices for a zone.",
+    description: "Lists a paginated set of enabled pay-per-use operators with verified names, matching billing classification, and their prices for a zone.\n\nGET /zones/{zone_id}/pay-per-use/operators",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 100,
-          "description": "Results per page.",
-          "type": "integer"
-        },
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUOperatorPricesResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUOperatorPrice": pay_per_crawl_PPUOperatorPrice_output,
-        "pay-per-crawl_PPUOperatorPrices": pay_per_crawl_PPUOperatorPrices_output,
-        "pay-per-crawl_PPUOperatorPricesResponse": pay_per_crawl_PPUOperatorPricesResponse_output,
-        "pay-per-crawl_PPUPrice": pay_per_crawl_PPUPrice_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUOperatorPrice": pay$$per$$crawl_PPUOperatorPrice,
+        "pay-per-crawl_PPUOperatorPrices": pay$$per$$crawl_PPUOperatorPrices,
+        "pay-per-crawl_PPUOperatorPricesResponse": pay$$per$$crawl_PPUOperatorPricesResponse,
+        "pay-per-crawl_PPUPrice": pay$$per$$crawl_PPUPrice,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -95,54 +111,64 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUOperatorPrice": pay_per_crawl_PPUOperatorPrice_output,
-        "pay-per-crawl_PPUOperatorPrices": pay_per_crawl_PPUOperatorPrices_output,
-        "pay-per-crawl_PPUOperatorPricesResponse": pay_per_crawl_PPUOperatorPricesResponse_output,
-        "pay-per-crawl_PPUPrice": pay_per_crawl_PPUPrice_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUOperatorPrice": pay$$per$$crawl_PPUOperatorPrice,
+        "pay-per-crawl_PPUOperatorPrices": pay$$per$$crawl_PPUOperatorPrices,
+        "pay-per-crawl_PPUOperatorPricesResponse": pay$$per$$crawl_PPUOperatorPricesResponse,
+        "pay-per-crawl_PPUPrice": pay$$per$$crawl_PPUPrice,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/pay-per-use/operators`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "pay_per_use_pricing_opt_out_operator_price",
+    name: "payPerUse_pricing_optOutOperatorPrice",
     title: "Opt out of a pay-per-use operator price",
-    description: "Opts a zone out by scheduling the current accepted pay-per-use operator price to expire at the start of the next UTC month. Use the withdraw action for a pending proposal.",
+    description: "Opts a zone out by scheduling the current accepted pay-per-use operator price to expire at the start of the next UTC month. Use the withdraw action for a pending proposal.\n\nDELETE /zones/{zone_id}/pay-per-use/operators/{operator_id}/price",
     inputSchema: {
       type: "object",
       properties: {
-        "operator_id": {
-          "description": "Stable pay-per-use operator identifier.",
-          "type": "string"
-        },
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operator_id": {
+              "description": "Stable pay-per-use operator identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "operator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_apiNoResultResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     annotations: {
@@ -170,13 +196,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     request: (args) => ({
@@ -184,9 +210,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_use_pricing_set_operator_price",
+    name: "payPerUse_pricing_setOperatorPrice",
     title: "Set a pay-per-use operator price",
-    description: "Proposes a required price, withdraws a pending proposal, accepts an operator's default pay-per-use price, or resumes an accepted price before its scheduled expiry. Propose, accept_default, and resume require an enabled operator with a verified name, an enabled publisher zone, and matching billing classifications.",
+    description: "Proposes a required price, withdraws a pending proposal, accepts an operator's default pay-per-use price, or resumes an accepted price before its scheduled expiry. Propose, accept_default, and resume require an enabled operator with a verified name, an enabled publisher zone, and matching billing classifications.\n\nPOST /zones/{zone_id}/pay-per-use/operators/{operator_id}/price",
     inputSchema: {
       type: "object",
       properties: {
@@ -194,36 +220,46 @@ export const tools: readonly Tool[] = [
           "$ref": "#/$defs/pay-per-crawl_PPUPublisherPriceActionRequest",
           "description": "Pay-per-use publisher price action"
         },
-        "operator_id": {
-          "description": "Stable pay-per-use operator identifier.",
-          "type": "string"
-        },
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operator_id": {
+              "description": "Stable pay-per-use operator identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "operator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operator_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_PPUPublisherPriceAcceptDefaultRequest": pay_per_crawl_PPUPublisherPriceAcceptDefaultRequest,
-        "pay-per-crawl_PPUPublisherPriceActionRequest": pay_per_crawl_PPUPublisherPriceActionRequest,
-        "pay-per-crawl_PPUPublisherPriceProposeRequest": pay_per_crawl_PPUPublisherPriceProposeRequest,
-        "pay-per-crawl_PPUPublisherPriceResumeRequest": pay_per_crawl_PPUPublisherPriceResumeRequest,
-        "pay-per-crawl_PPUPublisherPriceWithdrawRequest": pay_per_crawl_PPUPublisherPriceWithdrawRequest,
+        "pay-per-crawl_PPUPublisherPriceAcceptDefaultRequest": pay$$per$$crawl_PPUPublisherPriceAcceptDefaultRequest,
+        "pay-per-crawl_PPUPublisherPriceActionRequest": pay$$per$$crawl_PPUPublisherPriceActionRequest,
+        "pay-per-crawl_PPUPublisherPriceProposeRequest": pay$$per$$crawl_PPUPublisherPriceProposeRequest,
+        "pay-per-crawl_PPUPublisherPriceResumeRequest": pay$$per$$crawl_PPUPublisherPriceResumeRequest,
+        "pay-per-crawl_PPUPublisherPriceWithdrawRequest": pay$$per$$crawl_PPUPublisherPriceWithdrawRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUPriceResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUPrice": pay_per_crawl_PPUPrice_output,
-        "pay-per-crawl_PPUPriceResponse": pay_per_crawl_PPUPriceResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUPrice": pay$$per$$crawl_PPUPrice,
+        "pay-per-crawl_PPUPriceResponse": pay$$per$$crawl_PPUPriceResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -254,14 +290,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUPrice": pay_per_crawl_PPUPrice_output,
-        "pay-per-crawl_PPUPriceResponse": pay_per_crawl_PPUPriceResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUPrice": pay$$per$$crawl_PPUPrice,
+        "pay-per-crawl_PPUPriceResponse": pay$$per$$crawl_PPUPriceResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/payPerUse/proposals/outputs.ts b/src/generated/forge-mcp/payPerUse/proposals/outputs.ts
index 23f46067f..b63ca227c 100644
--- a/src/generated/forge-mcp/payPerUse/proposals/outputs.ts
+++ b/src/generated/forge-mcp/payPerUse/proposals/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUProposal` in responses.
  */
-export const pay_per_crawl_PPUProposal_output: JsonSchema = {
+export const pay$$per$$crawl_PPUProposal: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -52,7 +52,7 @@ export const pay_per_crawl_PPUProposal_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUProposals` in responses.
  */
-export const pay_per_crawl_PPUProposals_output: JsonSchema = {
+export const pay$$per$$crawl_PPUProposals: JsonSchema = {
   "properties": {
     "proposals": {
       "items": {
@@ -70,7 +70,7 @@ export const pay_per_crawl_PPUProposals_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUProposalsResponse` in responses.
  */
-export const pay_per_crawl_PPUProposalsResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUProposalsResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerUse/proposals/schemas.ts b/src/generated/forge-mcp/payPerUse/proposals/schemas.ts
index 95769a12e..769525697 100644
--- a/src/generated/forge-mcp/payPerUse/proposals/schemas.ts
+++ b/src/generated/forge-mcp/payPerUse/proposals/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUOperatorProposalActionRequest`.
  */
-export const pay_per_crawl_PPUOperatorProposalActionRequest: JsonSchema = {
+export const pay$$per$$crawl_PPUOperatorProposalActionRequest: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
diff --git a/src/generated/forge-mcp/payPerUse/proposals/tools.ts b/src/generated/forge-mcp/payPerUse/proposals/tools.ts
index a549fb507..0fbf98569 100644
--- a/src/generated/forge-mcp/payPerUse/proposals/tools.ts
+++ b/src/generated/forge-mcp/payPerUse/proposals/tools.ts
@@ -1,62 +1,72 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_PPUPriceResponse_output,
-  pay_per_crawl_PPUPrice_output,
+  pay$$per$$crawl_PPUPrice,
+  pay$$per$$crawl_PPUPriceResponse,
 } from "../outputs.js";
 import {
-  pay_per_crawl_PPUProposal_output,
-  pay_per_crawl_PPUProposalsResponse_output,
-  pay_per_crawl_PPUProposals_output,
+  pay$$per$$crawl_PPUProposal,
+  pay$$per$$crawl_PPUProposals,
+  pay$$per$$crawl_PPUProposalsResponse,
 } from "./outputs.js";
-import { pay_per_crawl_PPUOperatorProposalActionRequest } from "./schemas.js";
+import { pay$$per$$crawl_PPUOperatorProposalActionRequest } from "./schemas.js";
 
 /**
- * The tools of `pay_per_use.proposals`.
+ * The tools of `payPerUse.proposals`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_use_proposals_decide",
+    name: "payPerUse_proposals_decide",
     title: "Decide a pay-per-use price proposal",
-    description: "Accepts or rejects the pending pay-per-use price proposal identified by price_id in the request body. Acceptance requires an enabled operator with a verified name, an enabled publisher zone, and matching billing classifications; rejection remains available for cleanup.",
+    description: "Accepts or rejects the pending pay-per-use price proposal identified by price_id in the request body. Acceptance requires an enabled operator with a verified name, an enabled publisher zone, and matching billing classifications; rejection remains available for cleanup.\n\nPOST /accounts/{account_id}/pay-per-use/proposals",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/pay-per-crawl_PPUOperatorProposalActionRequest",
           "description": "Pay-per-use operator proposal decision"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_PPUOperatorProposalActionRequest": pay_per_crawl_PPUOperatorProposalActionRequest,
+        "pay-per-crawl_PPUOperatorProposalActionRequest": pay$$per$$crawl_PPUOperatorProposalActionRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUPriceResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUPrice": pay_per_crawl_PPUPrice_output,
-        "pay-per-crawl_PPUPriceResponse": pay_per_crawl_PPUPriceResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUPrice": pay$$per$$crawl_PPUPrice,
+        "pay-per-crawl_PPUPriceResponse": pay$$per$$crawl_PPUPriceResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -87,14 +97,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUPrice": pay_per_crawl_PPUPrice_output,
-        "pay-per-crawl_PPUPriceResponse": pay_per_crawl_PPUPriceResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUPrice": pay$$per$$crawl_PPUPrice,
+        "pay-per-crawl_PPUPriceResponse": pay$$per$$crawl_PPUPriceResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
@@ -103,40 +113,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_use_proposals_list",
+    name: "payPerUse_proposals_list",
     title: "List pay-per-use price proposals",
-    description: "Lists a paginated set of outstanding pay-per-use publisher price proposals for an operator. Listing remains available while the operator is disabled or its name is unverified so proposals can be rejected.",
+    description: "Lists a paginated set of outstanding pay-per-use publisher price proposals for an operator. Listing remains available while the operator is disabled or its name is unverified so proposals can be rejected.\n\nGET /accounts/{account_id}/pay-per-use/proposals",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 100,
-          "description": "Results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUProposalsResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUProposal": pay_per_crawl_PPUProposal_output,
-        "pay-per-crawl_PPUProposals": pay_per_crawl_PPUProposals_output,
-        "pay-per-crawl_PPUProposalsResponse": pay_per_crawl_PPUProposalsResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUProposal": pay$$per$$crawl_PPUProposal,
+        "pay-per-crawl_PPUProposals": pay$$per$$crawl_PPUProposals,
+        "pay-per-crawl_PPUProposalsResponse": pay$$per$$crawl_PPUProposalsResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -164,22 +190,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUProposal": pay_per_crawl_PPUProposal_output,
-        "pay-per-crawl_PPUProposals": pay_per_crawl_PPUProposals_output,
-        "pay-per-crawl_PPUProposalsResponse": pay_per_crawl_PPUProposalsResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUProposal": pay$$per$$crawl_PPUProposal,
+        "pay-per-crawl_PPUProposals": pay$$per$$crawl_PPUProposals,
+        "pay-per-crawl_PPUProposalsResponse": pay$$per$$crawl_PPUProposalsResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pay-per-use/proposals`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/payPerUse/usageStats/outputs.ts b/src/generated/forge-mcp/payPerUse/usageStats/outputs.ts
index 39962e3d9..c89c17d34 100644
--- a/src/generated/forge-mcp/payPerUse/usageStats/outputs.ts
+++ b/src/generated/forge-mcp/payPerUse/usageStats/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUUsageStats` in responses.
  */
-export const pay_per_crawl_PPUUsageStats_output: JsonSchema = {
+export const pay$$per$$crawl_PPUUsageStats: JsonSchema = {
   "properties": {
     "buyers": {
       "items": {
@@ -65,7 +65,7 @@ export const pay_per_crawl_PPUUsageStats_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUUsageStatsBuyer` in responses.
  */
-export const pay_per_crawl_PPUUsageStatsBuyer_output: JsonSchema = {
+export const pay$$per$$crawl_PPUUsageStatsBuyer: JsonSchema = {
   "properties": {
     "operator_id": {
       "type": "string"
@@ -92,7 +92,7 @@ export const pay_per_crawl_PPUUsageStatsBuyer_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUUsageStatsDataPoint` in responses.
  */
-export const pay_per_crawl_PPUUsageStatsDataPoint_output: JsonSchema = {
+export const pay$$per$$crawl_PPUUsageStatsDataPoint: JsonSchema = {
   "properties": {
     "operator_id": {
       "type": "string"
@@ -124,7 +124,7 @@ export const pay_per_crawl_PPUUsageStatsDataPoint_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUUsageStatsResponse` in responses.
  */
-export const pay_per_crawl_PPUUsageStatsResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUUsageStatsResponse: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/pay-per-crawl_PPUUsageStats"
@@ -146,7 +146,7 @@ export const pay_per_crawl_PPUUsageStatsResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUUsageStatsTotals` in responses.
  */
-export const pay_per_crawl_PPUUsageStatsTotals_output: JsonSchema = {
+export const pay$$per$$crawl_PPUUsageStatsTotals: JsonSchema = {
   "properties": {
     "total_price_usd_microcents": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/payPerUse/usageStats/tools.ts b/src/generated/forge-mcp/payPerUse/usageStats/tools.ts
index 7a6a962e0..965774104 100644
--- a/src/generated/forge-mcp/payPerUse/usageStats/tools.ts
+++ b/src/generated/forge-mcp/payPerUse/usageStats/tools.ts
@@ -1,81 +1,100 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_apiErrorResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_apiErrorResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_PPUUsageStatsBuyer_output,
-  pay_per_crawl_PPUUsageStatsDataPoint_output,
-  pay_per_crawl_PPUUsageStatsResponse_output,
-  pay_per_crawl_PPUUsageStatsTotals_output,
-  pay_per_crawl_PPUUsageStats_output,
+  pay$$per$$crawl_PPUUsageStats,
+  pay$$per$$crawl_PPUUsageStatsBuyer,
+  pay$$per$$crawl_PPUUsageStatsDataPoint,
+  pay$$per$$crawl_PPUUsageStatsResponse,
+  pay$$per$$crawl_PPUUsageStatsTotals,
 } from "./outputs.js";
 
 /**
- * The tools of `pay_per_use.usage_stats`.
+ * The tools of `payPerUse.usageStats`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_use_usage_stats_get_account",
+    name: "payPerUse_usageStats_getAccount",
     title: "Get pay-per-use usage statistics",
-    description: "Returns reported usage and the full gross value across all Pay Per Use zones in a publisher account or zone over an explicit UTC range of at most 31 days. Usage from every domain and snapshotted price is summed by buyer. Ranges up to and including 7 days use hourly data points; longer ranges use daily data points. Because source data is aggregated hourly, both requested bounds are rounded down to the selected UTC interval and the resolved bounds are returned in the response. The resolved range must contain at least one complete interval. Empty periods are omitted. Buyers and their data points are paginated, while totals cover every buyer in the range. Values are raw usage counts and USD microcents; total_price_usd_microcents is the full value before the publisher revenue share.",
+    description: "Returns reported usage and the full gross value across all Pay Per Use zones in a publisher account or zone over an explicit UTC range of at most 31 days. Usage from every domain and snapshotted price is summed by buyer. Ranges up to and including 7 days use hourly data points; longer ranges use daily data points. Because source data is aggregated hourly, both requested bounds are rounded down to the selected UTC interval and the resolved bounds are returned in the response. The resolved range must contain at least one complete interval. Empty periods are omitted. Buyers and their data points are paginated, while totals cover every buyer in the range. Values are raw usage counts and USD microcents; total_price_usd_microcents is the full value before the publisher revenue share.\n\nGET /{account_or_zone}/{account_or_zone_id}/pay-per-use/usage-stats",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "account_or_zone_id": {
-          "description": "The account ID or zone ID, as selected by account_or_zone.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Results per page.",
-          "type": "integer"
-        },
-        "since": {
-          "description": "Requested inclusive beginning of the statistics range as an RFC3339 timestamp. Rounded down to the selected UTC interval.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "until": {
-          "description": "Requested exclusive end of the statistics range as an RFC3339 timestamp. Rounded down to the selected UTC interval. The requested duration from since cannot exceed 31 days.",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Results per page.",
+              "type": "integer"
+            },
+            "since": {
+              "description": "Requested inclusive beginning of the statistics range as an RFC3339 timestamp. Rounded down to the selected UTC interval.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "until": {
+              "description": "Requested exclusive end of the statistics range as an RFC3339 timestamp. Rounded down to the selected UTC interval. The requested duration from since cannot exceed 31 days.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "required": [
+            "since",
+            "until"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "since",
-        "until"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUUsageStatsResponse",
       $defs: {
-        "pay-per-crawl_PPUUsageStats": pay_per_crawl_PPUUsageStats_output,
-        "pay-per-crawl_PPUUsageStatsBuyer": pay_per_crawl_PPUUsageStatsBuyer_output,
-        "pay-per-crawl_PPUUsageStatsDataPoint": pay_per_crawl_PPUUsageStatsDataPoint_output,
-        "pay-per-crawl_PPUUsageStatsResponse": pay_per_crawl_PPUUsageStatsResponse_output,
-        "pay-per-crawl_PPUUsageStatsTotals": pay_per_crawl_PPUUsageStatsTotals_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
+        "pay-per-crawl_PPUUsageStats": pay$$per$$crawl_PPUUsageStats,
+        "pay-per-crawl_PPUUsageStatsBuyer": pay$$per$$crawl_PPUUsageStatsBuyer,
+        "pay-per-crawl_PPUUsageStatsDataPoint": pay$$per$$crawl_PPUUsageStatsDataPoint,
+        "pay-per-crawl_PPUUsageStatsResponse": pay$$per$$crawl_PPUUsageStatsResponse,
+        "pay-per-crawl_PPUUsageStatsTotals": pay$$per$$crawl_PPUUsageStatsTotals,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
       },
     },
     annotations: {
@@ -103,24 +122,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_PPUUsageStats": pay_per_crawl_PPUUsageStats_output,
-        "pay-per-crawl_PPUUsageStatsBuyer": pay_per_crawl_PPUUsageStatsBuyer_output,
-        "pay-per-crawl_PPUUsageStatsDataPoint": pay_per_crawl_PPUUsageStatsDataPoint_output,
-        "pay-per-crawl_PPUUsageStatsResponse": pay_per_crawl_PPUUsageStatsResponse_output,
-        "pay-per-crawl_PPUUsageStatsTotals": pay_per_crawl_PPUUsageStatsTotals_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_PPUUsageStats": pay$$per$$crawl_PPUUsageStats,
+        "pay-per-crawl_PPUUsageStatsBuyer": pay$$per$$crawl_PPUUsageStatsBuyer,
+        "pay-per-crawl_PPUUsageStatsDataPoint": pay$$per$$crawl_PPUUsageStatsDataPoint,
+        "pay-per-crawl_PPUUsageStatsResponse": pay$$per$$crawl_PPUUsageStatsResponse,
+        "pay-per-crawl_PPUUsageStatsTotals": pay$$per$$crawl_PPUUsageStatsTotals,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/pay-per-use/usage-stats`,
       query: [
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/payPerUse/zones/outputs.ts b/src/generated/forge-mcp/payPerUse/zones/outputs.ts
index 54b5148eb..cbd950b1c 100644
--- a/src/generated/forge-mcp/payPerUse/zones/outputs.ts
+++ b/src/generated/forge-mcp/payPerUse/zones/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUZoneCanBeEnabled` in responses.
  */
-export const pay_per_crawl_PPUZoneCanBeEnabled_output: JsonSchema = {
+export const pay$$per$$crawl_PPUZoneCanBeEnabled: JsonSchema = {
   "properties": {
     "can_be_enabled": {
       "type": "boolean"
@@ -65,7 +65,7 @@ export const pay_per_crawl_PPUZoneCanBeEnabled_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUZoneCanBeEnabledResponse` in responses.
  */
-export const pay_per_crawl_PPUZoneCanBeEnabledResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUZoneCanBeEnabledResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -95,7 +95,7 @@ export const pay_per_crawl_PPUZoneCanBeEnabledResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUZoneConfiguration` in responses.
  */
-export const pay_per_crawl_PPUZoneConfiguration_output: JsonSchema = {
+export const pay$$per$$crawl_PPUZoneConfiguration: JsonSchema = {
   "properties": {
     "can_be_enabled": {
       "type": "boolean"
@@ -138,7 +138,7 @@ export const pay_per_crawl_PPUZoneConfiguration_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUZoneConfigurationResponse` in responses.
  */
-export const pay_per_crawl_PPUZoneConfigurationResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUZoneConfigurationResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -168,7 +168,7 @@ export const pay_per_crawl_PPUZoneConfigurationResponse_output: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUZoneConfigurationResult` in responses.
  */
-export const pay_per_crawl_PPUZoneConfigurationResult_output: JsonSchema = {
+export const pay$$per$$crawl_PPUZoneConfigurationResult: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/pay-per-crawl_PPUZoneConfiguration"
@@ -199,7 +199,7 @@ export const pay_per_crawl_PPUZoneConfigurationResult_output: JsonSchema = {
  * The schema of `pay-per-crawl_PPUZoneConfigurationResultResponse` in
  * responses.
  */
-export const pay_per_crawl_PPUZoneConfigurationResultResponse_output: JsonSchema = {
+export const pay$$per$$crawl_PPUZoneConfigurationResultResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerUse/zones/schemas.ts b/src/generated/forge-mcp/payPerUse/zones/schemas.ts
index 6148c5ad9..c13ea32eb 100644
--- a/src/generated/forge-mcp/payPerUse/zones/schemas.ts
+++ b/src/generated/forge-mcp/payPerUse/zones/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `pay-per-crawl_PPUZoneCanBeEnabledUpdate`.
  */
-export const pay_per_crawl_PPUZoneCanBeEnabledUpdate: JsonSchema = {
+export const pay$$per$$crawl_PPUZoneCanBeEnabledUpdate: JsonSchema = {
   "properties": {
     "can_be_enabled": {
       "type": "boolean"
@@ -24,7 +24,7 @@ export const pay_per_crawl_PPUZoneCanBeEnabledUpdate: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUZoneConfigurationUpdate`.
  */
-export const pay_per_crawl_PPUZoneConfigurationUpdate: JsonSchema = {
+export const pay$$per$$crawl_PPUZoneConfigurationUpdate: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -36,7 +36,7 @@ export const pay_per_crawl_PPUZoneConfigurationUpdate: JsonSchema = {
 /**
  * The schema of `pay-per-crawl_PPUZonesCanBeEnabledPayload`.
  */
-export const pay_per_crawl_PPUZonesCanBeEnabledPayload: JsonSchema = {
+export const pay$$per$$crawl_PPUZonesCanBeEnabledPayload: JsonSchema = {
   "properties": {
     "zones": {
       "items": {
diff --git a/src/generated/forge-mcp/payPerUse/zones/tools.ts b/src/generated/forge-mcp/payPerUse/zones/tools.ts
index 470052f14..1aaa2877d 100644
--- a/src/generated/forge-mcp/payPerUse/zones/tools.ts
+++ b/src/generated/forge-mcp/payPerUse/zones/tools.ts
@@ -3,56 +3,66 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  pay_per_crawl_ErrorSource_output,
-  pay_per_crawl_Msg_output,
-  pay_per_crawl_RESTError_output,
-  pay_per_crawl_ResultInfo_output,
-  pay_per_crawl_Source_output,
-  pay_per_crawl_apiErrorResponse_output,
-  pay_per_crawl_apiNoResultResponse_output,
+  pay$$per$$crawl_ErrorSource,
+  pay$$per$$crawl_Msg,
+  pay$$per$$crawl_RESTError,
+  pay$$per$$crawl_ResultInfo,
+  pay$$per$$crawl_Source,
+  pay$$per$$crawl_apiErrorResponse,
+  pay$$per$$crawl_apiNoResultResponse,
 } from "../../outputs.js";
 import {
-  pay_per_crawl_PPUZoneCanBeEnabledResponse_output,
-  pay_per_crawl_PPUZoneCanBeEnabled_output,
-  pay_per_crawl_PPUZoneConfigurationResponse_output,
-  pay_per_crawl_PPUZoneConfigurationResultResponse_output,
-  pay_per_crawl_PPUZoneConfigurationResult_output,
-  pay_per_crawl_PPUZoneConfiguration_output,
+  pay$$per$$crawl_PPUZoneCanBeEnabled,
+  pay$$per$$crawl_PPUZoneCanBeEnabledResponse,
+  pay$$per$$crawl_PPUZoneConfiguration,
+  pay$$per$$crawl_PPUZoneConfigurationResponse,
+  pay$$per$$crawl_PPUZoneConfigurationResult,
+  pay$$per$$crawl_PPUZoneConfigurationResultResponse,
 } from "./outputs.js";
 import {
-  pay_per_crawl_PPUZoneCanBeEnabledUpdate,
-  pay_per_crawl_PPUZoneConfigurationUpdate,
-  pay_per_crawl_PPUZonesCanBeEnabledPayload,
+  pay$$per$$crawl_PPUZoneCanBeEnabledUpdate,
+  pay$$per$$crawl_PPUZoneConfigurationUpdate,
+  pay$$per$$crawl_PPUZonesCanBeEnabledPayload,
 } from "./schemas.js";
 
 /**
- * The tools of `pay_per_use.zones`.
+ * The tools of `payPerUse.zones`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "pay_per_use_zones_get_can_be_enabled",
+    name: "payPerUse_zones_getCanBeEnabled",
     title: "Get pay-per-use zone eligibility",
-    description: "Gets whether pay-per-use can be enabled for a zone and the current zone-level grace period.",
+    description: "Gets whether pay-per-use can be enabled for a zone and the current zone-level grace period.\n\nGET /zones/{zone_id}/pay-per-use/can_be_enabled",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUZoneCanBeEnabledResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUZoneCanBeEnabled": pay_per_crawl_PPUZoneCanBeEnabled_output,
-        "pay-per-crawl_PPUZoneCanBeEnabledResponse": pay_per_crawl_PPUZoneCanBeEnabledResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUZoneCanBeEnabled": pay$$per$$crawl_PPUZoneCanBeEnabled,
+        "pay-per-crawl_PPUZoneCanBeEnabledResponse": pay$$per$$crawl_PPUZoneCanBeEnabledResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -74,14 +84,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUZoneCanBeEnabled": pay_per_crawl_PPUZoneCanBeEnabled_output,
-        "pay-per-crawl_PPUZoneCanBeEnabledResponse": pay_per_crawl_PPUZoneCanBeEnabledResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUZoneCanBeEnabled": pay$$per$$crawl_PPUZoneCanBeEnabled,
+        "pay-per-crawl_PPUZoneCanBeEnabledResponse": pay$$per$$crawl_PPUZoneCanBeEnabledResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
@@ -89,30 +99,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_use_zones_get_configuration",
+    name: "payPerUse_zones_getConfiguration",
     title: "Get pay-per-use zone configuration",
-    description: "Gets the pay-per-use configuration, zone-level grace period, and read-only non-billable classification timestamp for a zone.",
+    description: "Gets the pay-per-use configuration, zone-level grace period, and read-only non-billable classification timestamp for a zone.\n\nGET /zones/{zone_id}/pay-per-use/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUZoneConfigurationResultResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUZoneConfiguration": pay_per_crawl_PPUZoneConfiguration_output,
-        "pay-per-crawl_PPUZoneConfigurationResult": pay_per_crawl_PPUZoneConfigurationResult_output,
-        "pay-per-crawl_PPUZoneConfigurationResultResponse": pay_per_crawl_PPUZoneConfigurationResultResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUZoneConfiguration": pay$$per$$crawl_PPUZoneConfiguration,
+        "pay-per-crawl_PPUZoneConfigurationResult": pay$$per$$crawl_PPUZoneConfigurationResult,
+        "pay-per-crawl_PPUZoneConfigurationResultResponse": pay$$per$$crawl_PPUZoneConfigurationResultResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -134,15 +154,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUZoneConfiguration": pay_per_crawl_PPUZoneConfiguration_output,
-        "pay-per-crawl_PPUZoneConfigurationResult": pay_per_crawl_PPUZoneConfigurationResult_output,
-        "pay-per-crawl_PPUZoneConfigurationResultResponse": pay_per_crawl_PPUZoneConfigurationResultResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUZoneConfiguration": pay$$per$$crawl_PPUZoneConfiguration,
+        "pay-per-crawl_PPUZoneConfigurationResult": pay$$per$$crawl_PPUZoneConfigurationResult,
+        "pay-per-crawl_PPUZoneConfigurationResultResponse": pay$$per$$crawl_PPUZoneConfigurationResultResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
@@ -150,37 +170,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_use_zones_set_can_be_enabled",
+    name: "payPerUse_zones_setCanBeEnabled",
     title: "Set pay-per-use zone eligibility",
-    description: "Sets pay-per-use eligibility for a list of account zones. An omitted can_be_enabled value leaves that zone unchanged. Revoking eligibility disables the zone immediately while existing accepted licenses remain active until the start of the next UTC month.",
+    description: "Sets pay-per-use eligibility for a list of account zones. An omitted can_be_enabled value leaves that zone unchanged. Revoking eligibility disables the zone immediately while existing accepted licenses remain active until the start of the next UTC month.\n\nPATCH /accounts/{account_id}/pay-per-use/zones_can_be_enabled",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "account id",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/pay-per-crawl_PPUZonesCanBeEnabledPayload",
           "description": "Pay-per-use zone eligibility updates"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "account id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_PPUZoneCanBeEnabledUpdate": pay_per_crawl_PPUZoneCanBeEnabledUpdate,
-        "pay-per-crawl_PPUZonesCanBeEnabledPayload": pay_per_crawl_PPUZonesCanBeEnabledPayload,
+        "pay-per-crawl_PPUZoneCanBeEnabledUpdate": pay$$per$$crawl_PPUZoneCanBeEnabledUpdate,
+        "pay-per-crawl_PPUZonesCanBeEnabledPayload": pay$$per$$crawl_PPUZonesCanBeEnabledPayload,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_apiNoResultResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     annotations: {
@@ -205,13 +235,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
-        "pay-per-crawl_apiNoResultResponse": pay_per_crawl_apiNoResultResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
+        "pay-per-crawl_apiNoResultResponse": pay$$per$$crawl_apiNoResultResponse,
       },
     },
     request: (args) => ({
@@ -220,9 +250,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "pay_per_use_zones_update_configuration",
+    name: "payPerUse_zones_updateConfiguration",
     title: "Update pay-per-use zone configuration",
-    description: "Enables or disables an existing pay-per-use zone configuration. Omitting enabled leaves the zone unchanged. Enabling a disabled billable zone requires completed publisher Stripe onboarding, while non-billable zones do not; an already-enabled zone is not affected by later Stripe status changes. Disabling starts a disabled period immediately while existing accepted licenses remain active until the start of the next UTC month; re-enabling before expiry clears the schedule and restores those licenses.",
+    description: "Enables or disables an existing pay-per-use zone configuration. Omitting enabled leaves the zone unchanged. Enabling a disabled billable zone requires completed publisher Stripe onboarding, while non-billable zones do not; an already-enabled zone is not affected by later Stripe status changes. Disabling starts a disabled period immediately while existing accepted licenses remain active until the start of the next UTC month; re-enabling before expiry clears the schedule and restores those licenses.\n\nPATCH /zones/{zone_id}/pay-per-use/configuration",
     inputSchema: {
       type: "object",
       properties: {
@@ -230,27 +260,37 @@ export const tools: readonly Tool[] = [
           "$ref": "#/$defs/pay-per-crawl_PPUZoneConfigurationUpdate",
           "description": "Pay-per-use zone configuration update"
         },
-        "zone_id": {
-          "description": "zone id",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "zone id",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "pay-per-crawl_PPUZoneConfigurationUpdate": pay_per_crawl_PPUZoneConfigurationUpdate,
+        "pay-per-crawl_PPUZoneConfigurationUpdate": pay$$per$$crawl_PPUZoneConfigurationUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/pay-per-crawl_PPUZoneConfigurationResponse",
       $defs: {
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUZoneConfiguration": pay_per_crawl_PPUZoneConfiguration_output,
-        "pay-per-crawl_PPUZoneConfigurationResponse": pay_per_crawl_PPUZoneConfigurationResponse_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUZoneConfiguration": pay$$per$$crawl_PPUZoneConfiguration,
+        "pay-per-crawl_PPUZoneConfigurationResponse": pay$$per$$crawl_PPUZoneConfigurationResponse,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
       },
     },
     annotations: {
@@ -281,14 +321,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "pay-per-crawl_ErrorSource": pay_per_crawl_ErrorSource_output,
-        "pay-per-crawl_Msg": pay_per_crawl_Msg_output,
-        "pay-per-crawl_PPUZoneConfiguration": pay_per_crawl_PPUZoneConfiguration_output,
-        "pay-per-crawl_PPUZoneConfigurationResponse": pay_per_crawl_PPUZoneConfigurationResponse_output,
-        "pay-per-crawl_RESTError": pay_per_crawl_RESTError_output,
-        "pay-per-crawl_ResultInfo": pay_per_crawl_ResultInfo_output,
-        "pay-per-crawl_Source": pay_per_crawl_Source_output,
-        "pay-per-crawl_apiErrorResponse": pay_per_crawl_apiErrorResponse_output,
+        "pay-per-crawl_ErrorSource": pay$$per$$crawl_ErrorSource,
+        "pay-per-crawl_Msg": pay$$per$$crawl_Msg,
+        "pay-per-crawl_PPUZoneConfiguration": pay$$per$$crawl_PPUZoneConfiguration,
+        "pay-per-crawl_PPUZoneConfigurationResponse": pay$$per$$crawl_PPUZoneConfigurationResponse,
+        "pay-per-crawl_RESTError": pay$$per$$crawl_RESTError,
+        "pay-per-crawl_ResultInfo": pay$$per$$crawl_ResultInfo,
+        "pay-per-crawl_Source": pay$$per$$crawl_Source,
+        "pay-per-crawl_apiErrorResponse": pay$$per$$crawl_apiErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pipelines/outputs.ts b/src/generated/forge-mcp/pipelines/outputs.ts
index 1b3bbf5ee..d9d733900 100644
--- a/src/generated/forge-mcp/pipelines/outputs.ts
+++ b/src/generated/forge-mcp/pipelines/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `cloudflare-pipelines_ConnectionSchema` in responses.
  */
-export const cloudflare_pipelines_ConnectionSchema_output: JsonSchema = {
+export const cloudflare$$pipelines_ConnectionSchema: JsonSchema = {
   "properties": {
     "fields": {
       "items": {
@@ -28,22 +28,10 @@ export const cloudflare_pipelines_ConnectionSchema_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cloudflare-pipelines_DecimalEncoding` in responses.
- */
-export const cloudflare_pipelines_DecimalEncoding_output: JsonSchema = {
-  "enum": [
-    "number",
-    "string",
-    "bytes"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cloudflare-pipelines_FieldType` in responses.
  */
-export const cloudflare_pipelines_FieldType_output: JsonSchema = {
+export const cloudflare$$pipelines_FieldType: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -226,13 +214,22 @@ export const cloudflare_pipelines_FieldType_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_JsonFormat` in responses.
  */
-export const cloudflare_pipelines_JsonFormat_output: JsonSchema = {
+export const cloudflare$$pipelines_JsonFormat: JsonSchema = {
   "properties": {
     "decimal_encoding": {
-      "$ref": "#/$defs/cloudflare-pipelines_DecimalEncoding"
+      "enum": [
+        "number",
+        "string",
+        "bytes"
+      ],
+      "type": "string"
     },
     "timestamp_format": {
-      "$ref": "#/$defs/cloudflare-pipelines_TimestampFormat"
+      "enum": [
+        "rfc3339",
+        "unix_millis"
+      ],
+      "type": "string"
     },
     "unstructured": {
       "type": "boolean"
@@ -244,7 +241,7 @@ export const cloudflare_pipelines_JsonFormat_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_ListField` in responses.
  */
-export const cloudflare_pipelines_ListField_output: JsonSchema = {
+export const cloudflare$$pipelines_ListField: JsonSchema = {
   "properties": {
     "items": {
       "$ref": "#/$defs/cloudflare-pipelines_SourceField"
@@ -256,27 +253,20 @@ export const cloudflare_pipelines_ListField_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cloudflare-pipelines_ParquetCompression` in responses.
- */
-export const cloudflare_pipelines_ParquetCompression_output: JsonSchema = {
-  "enum": [
-    "uncompressed",
-    "snappy",
-    "gzip",
-    "zstd",
-    "lz4"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cloudflare-pipelines_ParquetFormat` in responses.
  */
-export const cloudflare_pipelines_ParquetFormat_output: JsonSchema = {
+export const cloudflare$$pipelines_ParquetFormat: JsonSchema = {
   "properties": {
     "compression": {
-      "$ref": "#/$defs/cloudflare-pipelines_ParquetCompression"
+      "enum": [
+        "uncompressed",
+        "snappy",
+        "gzip",
+        "zstd",
+        "lz4"
+      ],
+      "type": "string"
     },
     "row_group_bytes": {
       "oneOf": [
@@ -295,7 +285,7 @@ export const cloudflare_pipelines_ParquetFormat_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_PipelineEdge` in responses.
  */
-export const cloudflare_pipelines_PipelineEdge_output: JsonSchema = {
+export const cloudflare$$pipelines_PipelineEdge: JsonSchema = {
   "properties": {
     "dest_id": {
       "type": "integer"
@@ -326,7 +316,7 @@ export const cloudflare_pipelines_PipelineEdge_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_PipelineGraph` in responses.
  */
-export const cloudflare_pipelines_PipelineGraph_output: JsonSchema = {
+export const cloudflare$$pipelines_PipelineGraph: JsonSchema = {
   "properties": {
     "edges": {
       "items": {
@@ -351,7 +341,7 @@ export const cloudflare_pipelines_PipelineGraph_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_PipelineNode` in responses.
  */
-export const cloudflare_pipelines_PipelineNode_output: JsonSchema = {
+export const cloudflare$$pipelines_PipelineNode: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -378,7 +368,7 @@ export const cloudflare_pipelines_PipelineNode_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_SourceField` in responses.
  */
-export const cloudflare_pipelines_SourceField_output: JsonSchema = {
+export const cloudflare$$pipelines_SourceField: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudflare-pipelines_FieldType"
@@ -416,7 +406,7 @@ export const cloudflare_pipelines_SourceField_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_StructField` in responses.
  */
-export const cloudflare_pipelines_StructField_output: JsonSchema = {
+export const cloudflare$$pipelines_StructField: JsonSchema = {
   "properties": {
     "fields": {
       "items": {
@@ -444,43 +434,17 @@ export const cloudflare_pipelines_StructField_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_TimestampField` in responses.
  */
-export const cloudflare_pipelines_TimestampField_output: JsonSchema = {
+export const cloudflare$$pipelines_TimestampField: JsonSchema = {
   "properties": {
     "unit": {
-      "$ref": "#/$defs/cloudflare-pipelines_TimestampUnit"
+      "enum": [
+        "second",
+        "millisecond",
+        "microsecond",
+        "nanosecond"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `cloudflare-pipelines_TimestampFormat` in responses.
- */
-export const cloudflare_pipelines_TimestampFormat_output: JsonSchema = {
-  "enum": [
-    "rfc3339",
-    "unix_millis"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `cloudflare-pipelines_TimestampUnit` in responses.
- */
-export const cloudflare_pipelines_TimestampUnit_output: JsonSchema = {
-  "enum": [
-    "second",
-    "millisecond",
-    "microsecond",
-    "nanosecond"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `cloudflare-pipelines_worker-pipelines-common-success` in
- * responses.
- */
-export const cloudflare_pipelines_worker_pipelines_common_success_output: JsonSchema = {
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/pipelines/schemas.ts b/src/generated/forge-mcp/pipelines/schemas.ts
index 834847005..2bc206b24 100644
--- a/src/generated/forge-mcp/pipelines/schemas.ts
+++ b/src/generated/forge-mcp/pipelines/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `cloudflare-pipelines_ConnectionSchema`.
  */
-export const cloudflare_pipelines_ConnectionSchema: JsonSchema = {
+export const cloudflare$$pipelines_ConnectionSchema: JsonSchema = {
   "description": "Defines the schema of the events in the data stream.",
   "properties": {
     "fields": {
@@ -29,22 +29,10 @@ export const cloudflare_pipelines_ConnectionSchema: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cloudflare-pipelines_DecimalEncoding`.
- */
-export const cloudflare_pipelines_DecimalEncoding: JsonSchema = {
-  "enum": [
-    "number",
-    "string",
-    "bytes"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cloudflare-pipelines_FieldType`.
  */
-export const cloudflare_pipelines_FieldType: JsonSchema = {
+export const cloudflare$$pipelines_FieldType: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -227,13 +215,22 @@ export const cloudflare_pipelines_FieldType: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_JsonFormat`.
  */
-export const cloudflare_pipelines_JsonFormat: JsonSchema = {
+export const cloudflare$$pipelines_JsonFormat: JsonSchema = {
   "properties": {
     "decimal_encoding": {
-      "$ref": "#/$defs/cloudflare-pipelines_DecimalEncoding"
+      "enum": [
+        "number",
+        "string",
+        "bytes"
+      ],
+      "type": "string"
     },
     "timestamp_format": {
-      "$ref": "#/$defs/cloudflare-pipelines_TimestampFormat"
+      "enum": [
+        "rfc3339",
+        "unix_millis"
+      ],
+      "type": "string"
     },
     "unstructured": {
       "type": "boolean"
@@ -245,7 +242,7 @@ export const cloudflare_pipelines_JsonFormat: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_ListField`.
  */
-export const cloudflare_pipelines_ListField: JsonSchema = {
+export const cloudflare$$pipelines_ListField: JsonSchema = {
   "properties": {
     "items": {
       "$ref": "#/$defs/cloudflare-pipelines_SourceField"
@@ -257,27 +254,20 @@ export const cloudflare_pipelines_ListField: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `cloudflare-pipelines_ParquetCompression`.
- */
-export const cloudflare_pipelines_ParquetCompression: JsonSchema = {
-  "enum": [
-    "uncompressed",
-    "snappy",
-    "gzip",
-    "zstd",
-    "lz4"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cloudflare-pipelines_ParquetFormat`.
  */
-export const cloudflare_pipelines_ParquetFormat: JsonSchema = {
+export const cloudflare$$pipelines_ParquetFormat: JsonSchema = {
   "properties": {
     "compression": {
-      "$ref": "#/$defs/cloudflare-pipelines_ParquetCompression"
+      "enum": [
+        "uncompressed",
+        "snappy",
+        "gzip",
+        "zstd",
+        "lz4"
+      ],
+      "type": "string"
     },
     "row_group_bytes": {
       "oneOf": [
@@ -296,7 +286,7 @@ export const cloudflare_pipelines_ParquetFormat: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_SourceField`.
  */
-export const cloudflare_pipelines_SourceField: JsonSchema = {
+export const cloudflare$$pipelines_SourceField: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudflare-pipelines_FieldType"
@@ -334,7 +324,7 @@ export const cloudflare_pipelines_SourceField: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_StructField`.
  */
-export const cloudflare_pipelines_StructField: JsonSchema = {
+export const cloudflare$$pipelines_StructField: JsonSchema = {
   "properties": {
     "fields": {
       "items": {
@@ -362,51 +352,17 @@ export const cloudflare_pipelines_StructField: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_TimestampField`.
  */
-export const cloudflare_pipelines_TimestampField: JsonSchema = {
+export const cloudflare$$pipelines_TimestampField: JsonSchema = {
   "properties": {
     "unit": {
-      "$ref": "#/$defs/cloudflare-pipelines_TimestampUnit"
+      "enum": [
+        "second",
+        "millisecond",
+        "microsecond",
+        "nanosecond"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `cloudflare-pipelines_TimestampFormat`.
- */
-export const cloudflare_pipelines_TimestampFormat: JsonSchema = {
-  "enum": [
-    "rfc3339",
-    "unix_millis"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `cloudflare-pipelines_TimestampUnit`.
- */
-export const cloudflare_pipelines_TimestampUnit: JsonSchema = {
-  "enum": [
-    "second",
-    "millisecond",
-    "microsecond",
-    "nanosecond"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `cloudflare-pipelines_workers-pipelines-account-id`.
- */
-export const cloudflare_pipelines_workers_pipelines_account_id: JsonSchema = {
-  "description": "Specifies the public ID of the account.",
-  "type": "string"
-};
-
-/**
- * The schema of `cloudflare-pipelines_workers-pipelines-pipeline-id`.
- */
-export const cloudflare_pipelines_workers_pipelines_pipeline_id: JsonSchema = {
-  "description": "Specifies the public ID of the pipeline.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/pipelines/sinks/outputs.ts b/src/generated/forge-mcp/pipelines/sinks/outputs.ts
index bc0ce36f5..7e9c645bc 100644
--- a/src/generated/forge-mcp/pipelines/sinks/outputs.ts
+++ b/src/generated/forge-mcp/pipelines/sinks/outputs.ts
@@ -3,21 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `cloudflare-pipelines_JsonCompression` in responses.
- */
-export const cloudflare_pipelines_JsonCompression_output: JsonSchema = {
-  "enum": [
-    "uncompressed",
-    "gzip"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cloudflare-pipelines_SinkFormat` in responses.
  */
-export const cloudflare_pipelines_SinkFormat_output: JsonSchema = {
+export const cloudflare$$pipelines_SinkFormat: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/cloudflare-pipelines_SinkJsonFormat"
@@ -31,7 +20,7 @@ export const cloudflare_pipelines_SinkFormat_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_SinkJsonFormat` in responses.
  */
-export const cloudflare_pipelines_SinkJsonFormat_output: JsonSchema = {
+export const cloudflare$$pipelines_SinkJsonFormat: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudflare-pipelines_JsonFormat"
@@ -39,7 +28,11 @@ export const cloudflare_pipelines_SinkJsonFormat_output: JsonSchema = {
     {
       "properties": {
         "compression": {
-          "$ref": "#/$defs/cloudflare-pipelines_JsonCompression"
+          "enum": [
+            "uncompressed",
+            "gzip"
+          ],
+          "type": "string"
         },
         "type": {
           "enum": [
@@ -59,7 +52,7 @@ export const cloudflare_pipelines_SinkJsonFormat_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_SinkParquetFormat` in responses.
  */
-export const cloudflare_pipelines_SinkParquetFormat_output: JsonSchema = {
+export const cloudflare$$pipelines_SinkParquetFormat: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudflare-pipelines_ParquetFormat"
@@ -84,7 +77,7 @@ export const cloudflare_pipelines_SinkParquetFormat_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_r2Table` in responses.
  */
-export const cloudflare_pipelines_r2Table_output: JsonSchema = {
+export const cloudflare$$pipelines_r2Table: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
@@ -167,7 +160,7 @@ export const cloudflare_pipelines_r2Table_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_r2TablePublic` in responses.
  */
-export const cloudflare_pipelines_r2TablePublic_output: JsonSchema = {
+export const cloudflare$$pipelines_r2TablePublic: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
@@ -234,7 +227,7 @@ export const cloudflare_pipelines_r2TablePublic_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_r2_data_catalogTable` in responses.
  */
-export const cloudflare_pipelines_r2_data_catalogTable_output: JsonSchema = {
+export const cloudflare$$pipelines_r2_data_catalogTable: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
@@ -278,7 +271,7 @@ export const cloudflare_pipelines_r2_data_catalogTable_output: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_r2_data_catalogTablePublic` in responses.
  */
-export const cloudflare_pipelines_r2_data_catalogTablePublic_output: JsonSchema = {
+export const cloudflare$$pipelines_r2_data_catalogTablePublic: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
diff --git a/src/generated/forge-mcp/pipelines/sinks/schemas.ts b/src/generated/forge-mcp/pipelines/sinks/schemas.ts
index 9c108548f..24ecc8bf5 100644
--- a/src/generated/forge-mcp/pipelines/sinks/schemas.ts
+++ b/src/generated/forge-mcp/pipelines/sinks/schemas.ts
@@ -3,22 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `cloudflare-pipelines_JsonCompression`.
- */
-export const cloudflare_pipelines_JsonCompression: JsonSchema = {
-  "description": "Specifies the compression applied to JSON sink output.",
-  "enum": [
-    "uncompressed",
-    "gzip"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `cloudflare-pipelines_SinkFormat`.
  */
-export const cloudflare_pipelines_SinkFormat: JsonSchema = {
+export const cloudflare$$pipelines_SinkFormat: JsonSchema = {
   "description": "Defines the output data format of a sink.",
   "oneOf": [
     {
@@ -33,7 +21,7 @@ export const cloudflare_pipelines_SinkFormat: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_SinkJsonFormat`.
  */
-export const cloudflare_pipelines_SinkJsonFormat: JsonSchema = {
+export const cloudflare$$pipelines_SinkJsonFormat: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudflare-pipelines_JsonFormat"
@@ -41,9 +29,13 @@ export const cloudflare_pipelines_SinkJsonFormat: JsonSchema = {
     {
       "properties": {
         "compression": {
-          "$ref": "#/$defs/cloudflare-pipelines_JsonCompression",
           "default": "uncompressed",
-          "description": "Specifies the compression applied to JSON sink output."
+          "description": "Specifies the compression applied to JSON sink output.",
+          "enum": [
+            "uncompressed",
+            "gzip"
+          ],
+          "type": "string"
         },
         "type": {
           "enum": [
@@ -64,7 +56,7 @@ export const cloudflare_pipelines_SinkJsonFormat: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_SinkParquetFormat`.
  */
-export const cloudflare_pipelines_SinkParquetFormat: JsonSchema = {
+export const cloudflare$$pipelines_SinkParquetFormat: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cloudflare-pipelines_ParquetFormat"
@@ -90,7 +82,7 @@ export const cloudflare_pipelines_SinkParquetFormat: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_r2Table`.
  */
-export const cloudflare_pipelines_r2Table: JsonSchema = {
+export const cloudflare$$pipelines_r2Table: JsonSchema = {
   "description": "R2 Sink",
   "properties": {
     "account_id": {
@@ -190,7 +182,7 @@ export const cloudflare_pipelines_r2Table: JsonSchema = {
 /**
  * The schema of `cloudflare-pipelines_r2_data_catalogTable`.
  */
-export const cloudflare_pipelines_r2_data_catalogTable: JsonSchema = {
+export const cloudflare$$pipelines_r2_data_catalogTable: JsonSchema = {
   "description": "R2 Data Catalog Sink",
   "properties": {
     "account_id": {
@@ -240,11 +232,3 @@ export const cloudflare_pipelines_r2_data_catalogTable: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `cloudflare-pipelines_workers-pipelines-sink-id`.
- */
-export const cloudflare_pipelines_workers_pipelines_sink_id: JsonSchema = {
-  "description": "Specifies the publid ID of the sink.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/pipelines/sinks/tools.ts b/src/generated/forge-mcp/pipelines/sinks/tools.ts
index bfc3724ea..11969494f 100644
--- a/src/generated/forge-mcp/pipelines/sinks/tools.ts
+++ b/src/generated/forge-mcp/pipelines/sinks/tools.ts
@@ -1,55 +1,42 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  cloudflare_pipelines_ConnectionSchema_output,
-  cloudflare_pipelines_DecimalEncoding_output,
-  cloudflare_pipelines_FieldType_output,
-  cloudflare_pipelines_JsonFormat_output,
-  cloudflare_pipelines_ListField_output,
-  cloudflare_pipelines_ParquetCompression_output,
-  cloudflare_pipelines_ParquetFormat_output,
-  cloudflare_pipelines_SourceField_output,
-  cloudflare_pipelines_StructField_output,
-  cloudflare_pipelines_TimestampField_output,
-  cloudflare_pipelines_TimestampFormat_output,
-  cloudflare_pipelines_TimestampUnit_output,
-  cloudflare_pipelines_worker_pipelines_common_success_output,
+  cloudflare$$pipelines_ConnectionSchema,
+  cloudflare$$pipelines_FieldType,
+  cloudflare$$pipelines_JsonFormat,
+  cloudflare$$pipelines_ListField,
+  cloudflare$$pipelines_ParquetFormat,
+  cloudflare$$pipelines_SourceField,
+  cloudflare$$pipelines_StructField,
+  cloudflare$$pipelines_TimestampField,
 } from "../outputs.js";
 import {
-  cloudflare_pipelines_ConnectionSchema,
-  cloudflare_pipelines_DecimalEncoding,
-  cloudflare_pipelines_FieldType,
-  cloudflare_pipelines_JsonFormat,
-  cloudflare_pipelines_ListField,
-  cloudflare_pipelines_ParquetCompression,
-  cloudflare_pipelines_ParquetFormat,
-  cloudflare_pipelines_SourceField,
-  cloudflare_pipelines_StructField,
-  cloudflare_pipelines_TimestampField,
-  cloudflare_pipelines_TimestampFormat,
-  cloudflare_pipelines_TimestampUnit,
-  cloudflare_pipelines_workers_pipelines_account_id,
+  cloudflare$$pipelines_ConnectionSchema as cloudflare$$pipelines_ConnectionSchema$,
+  cloudflare$$pipelines_FieldType as cloudflare$$pipelines_FieldType$,
+  cloudflare$$pipelines_JsonFormat as cloudflare$$pipelines_JsonFormat$,
+  cloudflare$$pipelines_ListField as cloudflare$$pipelines_ListField$,
+  cloudflare$$pipelines_ParquetFormat as cloudflare$$pipelines_ParquetFormat$,
+  cloudflare$$pipelines_SourceField as cloudflare$$pipelines_SourceField$,
+  cloudflare$$pipelines_StructField as cloudflare$$pipelines_StructField$,
+  cloudflare$$pipelines_TimestampField as cloudflare$$pipelines_TimestampField$,
 } from "../schemas.js";
 import {
-  cloudflare_pipelines_JsonCompression_output,
-  cloudflare_pipelines_SinkFormat_output,
-  cloudflare_pipelines_SinkJsonFormat_output,
-  cloudflare_pipelines_SinkParquetFormat_output,
-  cloudflare_pipelines_r2TablePublic_output,
-  cloudflare_pipelines_r2Table_output,
-  cloudflare_pipelines_r2_data_catalogTablePublic_output,
-  cloudflare_pipelines_r2_data_catalogTable_output,
+  cloudflare$$pipelines_SinkFormat,
+  cloudflare$$pipelines_SinkJsonFormat,
+  cloudflare$$pipelines_SinkParquetFormat,
+  cloudflare$$pipelines_r2Table,
+  cloudflare$$pipelines_r2TablePublic,
+  cloudflare$$pipelines_r2_data_catalogTable,
+  cloudflare$$pipelines_r2_data_catalogTablePublic,
 } from "./outputs.js";
 import {
-  cloudflare_pipelines_JsonCompression,
-  cloudflare_pipelines_SinkFormat,
-  cloudflare_pipelines_SinkJsonFormat,
-  cloudflare_pipelines_SinkParquetFormat,
-  cloudflare_pipelines_r2Table,
-  cloudflare_pipelines_r2_data_catalogTable,
-  cloudflare_pipelines_workers_pipelines_sink_id,
+  cloudflare$$pipelines_SinkFormat as cloudflare$$pipelines_SinkFormat$,
+  cloudflare$$pipelines_SinkJsonFormat as cloudflare$$pipelines_SinkJsonFormat$,
+  cloudflare$$pipelines_SinkParquetFormat as cloudflare$$pipelines_SinkParquetFormat$,
+  cloudflare$$pipelines_r2Table as cloudflare$$pipelines_r2Table$,
+  cloudflare$$pipelines_r2_data_catalogTable as cloudflare$$pipelines_r2_data_catalogTable$,
 } from "./schemas.js";
 
 /**
@@ -59,14 +46,10 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_sinks_create",
     title: "Create Sink",
-    description: "Create a new Sink.",
+    description: "Create a new Sink.\n\nPOST /accounts/{account_id}/pipelines/v1/sinks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
         "body": {
           "properties": {
             "config": {
@@ -107,31 +90,39 @@ export const tools: readonly Tool[] = [
             "type"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType,
-        "cloudflare-pipelines_JsonCompression": cloudflare_pipelines_JsonCompression,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat,
-        "cloudflare-pipelines_SinkFormat": cloudflare_pipelines_SinkFormat,
-        "cloudflare-pipelines_SinkJsonFormat": cloudflare_pipelines_SinkJsonFormat,
-        "cloudflare-pipelines_SinkParquetFormat": cloudflare_pipelines_SinkParquetFormat,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit,
-        "cloudflare-pipelines_r2Table": cloudflare_pipelines_r2Table,
-        "cloudflare-pipelines_r2_data_catalogTable": cloudflare_pipelines_r2_data_catalogTable,
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema$,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType$,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat$,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField$,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat$,
+        "cloudflare-pipelines_SinkFormat": cloudflare$$pipelines_SinkFormat$,
+        "cloudflare-pipelines_SinkJsonFormat": cloudflare$$pipelines_SinkJsonFormat$,
+        "cloudflare-pipelines_SinkParquetFormat": cloudflare$$pipelines_SinkParquetFormat$,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField$,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField$,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField$,
+        "cloudflare-pipelines_r2Table": cloudflare$$pipelines_r2Table$,
+        "cloudflare-pipelines_r2_data_catalogTable": cloudflare$$pipelines_r2_data_catalogTable$,
       },
     },
     outputSchema: {
@@ -187,7 +178,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -196,25 +187,19 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_JsonCompression": cloudflare_pipelines_JsonCompression_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SinkFormat": cloudflare_pipelines_SinkFormat_output,
-        "cloudflare-pipelines_SinkJsonFormat": cloudflare_pipelines_SinkJsonFormat_output,
-        "cloudflare-pipelines_SinkParquetFormat": cloudflare_pipelines_SinkParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_r2Table": cloudflare_pipelines_r2Table_output,
-        "cloudflare-pipelines_r2_data_catalogTable": cloudflare_pipelines_r2_data_catalogTable_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SinkFormat": cloudflare$$pipelines_SinkFormat,
+        "cloudflare-pipelines_SinkJsonFormat": cloudflare$$pipelines_SinkJsonFormat,
+        "cloudflare-pipelines_SinkParquetFormat": cloudflare$$pipelines_SinkParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
+        "cloudflare-pipelines_r2Table": cloudflare$$pipelines_r2Table,
+        "cloudflare-pipelines_r2_data_catalogTable": cloudflare$$pipelines_r2_data_catalogTable,
       },
     },
     annotations: {
@@ -292,7 +277,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -304,25 +289,19 @@ export const tools: readonly Tool[] = [
         "4XX": null
       },
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_JsonCompression": cloudflare_pipelines_JsonCompression_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SinkFormat": cloudflare_pipelines_SinkFormat_output,
-        "cloudflare-pipelines_SinkJsonFormat": cloudflare_pipelines_SinkJsonFormat_output,
-        "cloudflare-pipelines_SinkParquetFormat": cloudflare_pipelines_SinkParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_r2Table": cloudflare_pipelines_r2Table_output,
-        "cloudflare-pipelines_r2_data_catalogTable": cloudflare_pipelines_r2_data_catalogTable_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SinkFormat": cloudflare$$pipelines_SinkFormat,
+        "cloudflare-pipelines_SinkJsonFormat": cloudflare$$pipelines_SinkJsonFormat,
+        "cloudflare-pipelines_SinkParquetFormat": cloudflare$$pipelines_SinkParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
+        "cloudflare-pipelines_r2Table": cloudflare$$pipelines_r2Table,
+        "cloudflare-pipelines_r2_data_catalogTable": cloudflare$$pipelines_r2_data_catalogTable,
       },
     },
     request: (args) => ({
@@ -333,27 +312,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_sinks_delete",
     title: "Delete Sink",
-    description: "Delete Sink in Account.",
+    description: "Delete Sink in Account.\n\nDELETE /accounts/{account_id}/pipelines/v1/sinks/{sink_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "sink_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-sink-id",
-          "description": "Specifies the publid ID of the sink."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "sink_id": {
+              "description": "Specifies the publid ID of the sink.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sink_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sink_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-        "cloudflare-pipelines_workers-pipelines-sink-id": cloudflare_pipelines_workers_pipelines_sink_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -361,7 +346,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -369,9 +354,6 @@ export const tools: readonly Tool[] = [
         "success"
       ],
       "type": "object",
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -398,7 +380,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -409,9 +391,6 @@ export const tools: readonly Tool[] = [
         },
         "4XX": null
       },
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pipelines/v1/sinks/${pathParam(args, "sink_id")}`,
@@ -420,27 +399,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_sinks_get",
     title: "Get Sink Details",
-    description: "Get Sink Details.",
+    description: "Get Sink Details.\n\nGET /accounts/{account_id}/pipelines/v1/sinks/{sink_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "sink_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-sink-id",
-          "description": "Specifies the publid ID of the sink."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "sink_id": {
+              "description": "Specifies the publid ID of the sink.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sink_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sink_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-        "cloudflare-pipelines_workers-pipelines-sink-id": cloudflare_pipelines_workers_pipelines_sink_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -495,7 +480,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -504,25 +489,19 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_JsonCompression": cloudflare_pipelines_JsonCompression_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SinkFormat": cloudflare_pipelines_SinkFormat_output,
-        "cloudflare-pipelines_SinkJsonFormat": cloudflare_pipelines_SinkJsonFormat_output,
-        "cloudflare-pipelines_SinkParquetFormat": cloudflare_pipelines_SinkParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_r2TablePublic": cloudflare_pipelines_r2TablePublic_output,
-        "cloudflare-pipelines_r2_data_catalogTablePublic": cloudflare_pipelines_r2_data_catalogTablePublic_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SinkFormat": cloudflare$$pipelines_SinkFormat,
+        "cloudflare-pipelines_SinkJsonFormat": cloudflare$$pipelines_SinkJsonFormat,
+        "cloudflare-pipelines_SinkParquetFormat": cloudflare$$pipelines_SinkParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
+        "cloudflare-pipelines_r2TablePublic": cloudflare$$pipelines_r2TablePublic,
+        "cloudflare-pipelines_r2_data_catalogTablePublic": cloudflare$$pipelines_r2_data_catalogTablePublic,
       },
     },
     annotations: {
@@ -601,7 +580,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -613,25 +592,19 @@ export const tools: readonly Tool[] = [
         "4XX": null
       },
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_JsonCompression": cloudflare_pipelines_JsonCompression_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SinkFormat": cloudflare_pipelines_SinkFormat_output,
-        "cloudflare-pipelines_SinkJsonFormat": cloudflare_pipelines_SinkJsonFormat_output,
-        "cloudflare-pipelines_SinkParquetFormat": cloudflare_pipelines_SinkParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_r2TablePublic": cloudflare_pipelines_r2TablePublic_output,
-        "cloudflare-pipelines_r2_data_catalogTablePublic": cloudflare_pipelines_r2_data_catalogTablePublic_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SinkFormat": cloudflare$$pipelines_SinkFormat,
+        "cloudflare-pipelines_SinkJsonFormat": cloudflare$$pipelines_SinkJsonFormat,
+        "cloudflare-pipelines_SinkParquetFormat": cloudflare$$pipelines_SinkParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
+        "cloudflare-pipelines_r2TablePublic": cloudflare$$pipelines_r2TablePublic,
+        "cloudflare-pipelines_r2_data_catalogTablePublic": cloudflare$$pipelines_r2_data_catalogTablePublic,
       },
     },
     request: (args) => ({
@@ -641,52 +614,65 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_sinks_list",
     title: "List Sinks",
-    description: "List/Filter Sinks in Account.",
+    description: "List/Filter Sinks in Account.\n\nGET /accounts/{account_id}/pipelines/v1/sinks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Filters sinks by name (case-insensitive substring).",
-          "type": "string"
-        },
-        "order_by": {
-          "description": "Sorts sinks by this field. Defaults to `created_at`.",
-          "enum": [
-            "name",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "number"
-        },
-        "per_page": {
-          "type": "number"
+          "type": "object"
         },
-        "pipeline_id": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filters sinks by name (case-insensitive substring).",
+              "type": "string"
+            },
+            "order_by": {
+              "description": "Sorts sinks by this field. Defaults to `created_at`.",
+              "enum": [
+                "name",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "number"
+            },
+            "per_page": {
+              "type": "number"
+            },
+            "pipeline_id": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -767,7 +753,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -777,25 +763,19 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_JsonCompression": cloudflare_pipelines_JsonCompression_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SinkFormat": cloudflare_pipelines_SinkFormat_output,
-        "cloudflare-pipelines_SinkJsonFormat": cloudflare_pipelines_SinkJsonFormat_output,
-        "cloudflare-pipelines_SinkParquetFormat": cloudflare_pipelines_SinkParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_r2TablePublic": cloudflare_pipelines_r2TablePublic_output,
-        "cloudflare-pipelines_r2_data_catalogTablePublic": cloudflare_pipelines_r2_data_catalogTablePublic_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SinkFormat": cloudflare$$pipelines_SinkFormat,
+        "cloudflare-pipelines_SinkJsonFormat": cloudflare$$pipelines_SinkJsonFormat,
+        "cloudflare-pipelines_SinkParquetFormat": cloudflare$$pipelines_SinkParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
+        "cloudflare-pipelines_r2TablePublic": cloudflare$$pipelines_r2TablePublic,
+        "cloudflare-pipelines_r2_data_catalogTablePublic": cloudflare$$pipelines_r2_data_catalogTablePublic,
       },
     },
     annotations: {
@@ -900,7 +880,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -913,36 +893,30 @@ export const tools: readonly Tool[] = [
         "4XX": null
       },
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_JsonCompression": cloudflare_pipelines_JsonCompression_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SinkFormat": cloudflare_pipelines_SinkFormat_output,
-        "cloudflare-pipelines_SinkJsonFormat": cloudflare_pipelines_SinkJsonFormat_output,
-        "cloudflare-pipelines_SinkParquetFormat": cloudflare_pipelines_SinkParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_r2TablePublic": cloudflare_pipelines_r2TablePublic_output,
-        "cloudflare-pipelines_r2_data_catalogTablePublic": cloudflare_pipelines_r2_data_catalogTablePublic_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SinkFormat": cloudflare$$pipelines_SinkFormat,
+        "cloudflare-pipelines_SinkJsonFormat": cloudflare$$pipelines_SinkJsonFormat,
+        "cloudflare-pipelines_SinkParquetFormat": cloudflare$$pipelines_SinkParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
+        "cloudflare-pipelines_r2TablePublic": cloudflare$$pipelines_r2TablePublic,
+        "cloudflare-pipelines_r2_data_catalogTablePublic": cloudflare$$pipelines_r2_data_catalogTablePublic,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pipelines/v1/sinks`,
       query: [
-        ["pipeline_id", args["pipeline_id"], true],
-        ["name", args["name"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["pipeline_id", param(args, "query", "pipeline_id"), true],
+        ["name", param(args, "query", "name"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/pipelines/streams/outputs.ts b/src/generated/forge-mcp/pipelines/streams/outputs.ts
index 545c805e3..30b9bb00c 100644
--- a/src/generated/forge-mcp/pipelines/streams/outputs.ts
+++ b/src/generated/forge-mcp/pipelines/streams/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cloudflare-pipelines_Format` in responses.
  */
-export const cloudflare_pipelines_Format_output: JsonSchema = {
+export const cloudflare$$pipelines_Format: JsonSchema = {
   "oneOf": [
     {
       "allOf": [
diff --git a/src/generated/forge-mcp/pipelines/streams/schemas.ts b/src/generated/forge-mcp/pipelines/streams/schemas.ts
index fc26fa268..a237c523e 100644
--- a/src/generated/forge-mcp/pipelines/streams/schemas.ts
+++ b/src/generated/forge-mcp/pipelines/streams/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cloudflare-pipelines_Format`.
  */
-export const cloudflare_pipelines_Format: JsonSchema = {
+export const cloudflare$$pipelines_Format: JsonSchema = {
   "description": "Defines the data format of the events.",
   "oneOf": [
     {
@@ -53,11 +53,3 @@ export const cloudflare_pipelines_Format: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `cloudflare-pipelines_workers-pipelines-stream-id`.
- */
-export const cloudflare_pipelines_workers_pipelines_stream_id: JsonSchema = {
-  "description": "Specifies the public ID of the stream.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/pipelines/streams/tools.ts b/src/generated/forge-mcp/pipelines/streams/tools.ts
index 6b216f2fd..32f6e86c2 100644
--- a/src/generated/forge-mcp/pipelines/streams/tools.ts
+++ b/src/generated/forge-mcp/pipelines/streams/tools.ts
@@ -1,43 +1,29 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  cloudflare_pipelines_ConnectionSchema_output,
-  cloudflare_pipelines_DecimalEncoding_output,
-  cloudflare_pipelines_FieldType_output,
-  cloudflare_pipelines_JsonFormat_output,
-  cloudflare_pipelines_ListField_output,
-  cloudflare_pipelines_ParquetCompression_output,
-  cloudflare_pipelines_ParquetFormat_output,
-  cloudflare_pipelines_SourceField_output,
-  cloudflare_pipelines_StructField_output,
-  cloudflare_pipelines_TimestampField_output,
-  cloudflare_pipelines_TimestampFormat_output,
-  cloudflare_pipelines_TimestampUnit_output,
-  cloudflare_pipelines_worker_pipelines_common_success_output,
+  cloudflare$$pipelines_ConnectionSchema,
+  cloudflare$$pipelines_FieldType,
+  cloudflare$$pipelines_JsonFormat,
+  cloudflare$$pipelines_ListField,
+  cloudflare$$pipelines_ParquetFormat,
+  cloudflare$$pipelines_SourceField,
+  cloudflare$$pipelines_StructField,
+  cloudflare$$pipelines_TimestampField,
 } from "../outputs.js";
 import {
-  cloudflare_pipelines_ConnectionSchema,
-  cloudflare_pipelines_DecimalEncoding,
-  cloudflare_pipelines_FieldType,
-  cloudflare_pipelines_JsonFormat,
-  cloudflare_pipelines_ListField,
-  cloudflare_pipelines_ParquetCompression,
-  cloudflare_pipelines_ParquetFormat,
-  cloudflare_pipelines_SourceField,
-  cloudflare_pipelines_StructField,
-  cloudflare_pipelines_TimestampField,
-  cloudflare_pipelines_TimestampFormat,
-  cloudflare_pipelines_TimestampUnit,
-  cloudflare_pipelines_workers_pipelines_account_id,
-  cloudflare_pipelines_workers_pipelines_pipeline_id,
+  cloudflare$$pipelines_ConnectionSchema as cloudflare$$pipelines_ConnectionSchema$,
+  cloudflare$$pipelines_FieldType as cloudflare$$pipelines_FieldType$,
+  cloudflare$$pipelines_JsonFormat as cloudflare$$pipelines_JsonFormat$,
+  cloudflare$$pipelines_ListField as cloudflare$$pipelines_ListField$,
+  cloudflare$$pipelines_ParquetFormat as cloudflare$$pipelines_ParquetFormat$,
+  cloudflare$$pipelines_SourceField as cloudflare$$pipelines_SourceField$,
+  cloudflare$$pipelines_StructField as cloudflare$$pipelines_StructField$,
+  cloudflare$$pipelines_TimestampField as cloudflare$$pipelines_TimestampField$,
 } from "../schemas.js";
-import { cloudflare_pipelines_Format_output } from "./outputs.js";
-import {
-  cloudflare_pipelines_Format,
-  cloudflare_pipelines_workers_pipelines_stream_id,
-} from "./schemas.js";
+import { cloudflare$$pipelines_Format } from "./outputs.js";
+import { cloudflare$$pipelines_Format as cloudflare$$pipelines_Format$ } from "./schemas.js";
 
 /**
  * The tools of `pipelines.streams`.
@@ -46,14 +32,10 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_streams_create",
     title: "Create Stream",
-    description: "Create a new Stream.",
+    description: "Create a new Stream.\n\nPOST /accounts/{account_id}/pipelines/v1/streams",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
         "body": {
           "properties": {
             "format": {
@@ -122,26 +104,35 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit,
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema$,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType$,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format$,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat$,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField$,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat$,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField$,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField$,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField$,
       },
     },
     outputSchema: {
@@ -225,7 +216,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -234,20 +225,15 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
       },
     },
     annotations: {
@@ -353,7 +339,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -365,20 +351,15 @@ export const tools: readonly Tool[] = [
         "4XX": null
       },
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
       },
     },
     request: (args) => ({
@@ -389,27 +370,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_streams_delete",
     title: "Delete Stream",
-    description: "Delete Stream in Account.",
+    description: "Delete Stream in Account.\n\nDELETE /accounts/{account_id}/pipelines/v1/streams/{stream_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "stream_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-stream-id",
-          "description": "Specifies the public ID of the stream."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "stream_id": {
+              "description": "Specifies the public ID of the stream.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "stream_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "stream_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-        "cloudflare-pipelines_workers-pipelines-stream-id": cloudflare_pipelines_workers_pipelines_stream_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -417,7 +404,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -425,9 +412,6 @@ export const tools: readonly Tool[] = [
         "success"
       ],
       "type": "object",
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -454,7 +438,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -465,9 +449,6 @@ export const tools: readonly Tool[] = [
         },
         "4XX": null
       },
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pipelines/v1/streams/${pathParam(args, "stream_id")}`,
@@ -476,27 +457,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_streams_get",
     title: "Get Stream Details",
-    description: "Get Stream Details.",
+    description: "Get Stream Details.\n\nGET /accounts/{account_id}/pipelines/v1/streams/{stream_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "stream_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-stream-id",
-          "description": "Specifies the public ID of the stream."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "stream_id": {
+              "description": "Specifies the public ID of the stream.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "stream_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "stream_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-        "cloudflare-pipelines_workers-pipelines-stream-id": cloudflare_pipelines_workers_pipelines_stream_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -579,7 +566,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -588,20 +575,15 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
       },
     },
     annotations: {
@@ -708,7 +690,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -720,20 +702,15 @@ export const tools: readonly Tool[] = [
         "4XX": null
       },
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
       },
     },
     request: (args) => ({
@@ -743,54 +720,66 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_streams_list",
     title: "List Streams",
-    description: "List/Filter Streams in Account.",
+    description: "List/Filter Streams in Account.\n\nGET /accounts/{account_id}/pipelines/v1/streams",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Filters streams by name (case-insensitive substring).",
-          "type": "string"
-        },
-        "order_by": {
-          "description": "Sorts streams by this field. Defaults to `created_at`.",
-          "enum": [
-            "name",
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "number"
-        },
-        "per_page": {
-          "type": "number"
+          "type": "object"
         },
-        "pipeline_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-pipeline-id",
-          "description": "Specifies the public ID of the pipeline."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filters streams by name (case-insensitive substring).",
+              "type": "string"
+            },
+            "order_by": {
+              "description": "Sorts streams by this field. Defaults to `created_at`.",
+              "enum": [
+                "name",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "number"
+            },
+            "per_page": {
+              "type": "number"
+            },
+            "pipeline_id": {
+              "description": "Specifies the public ID of the pipeline.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-        "cloudflare-pipelines_workers-pipelines-pipeline-id": cloudflare_pipelines_workers_pipelines_pipeline_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -899,7 +888,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -909,20 +898,15 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
       },
     },
     annotations: {
@@ -1055,7 +1039,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -1068,45 +1052,36 @@ export const tools: readonly Tool[] = [
         "4XX": null
       },
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pipelines/v1/streams`,
       query: [
-        ["pipeline_id", args["pipeline_id"], true],
-        ["name", args["name"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["pipeline_id", param(args, "query", "pipeline_id"), true],
+        ["name", param(args, "query", "name"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "pipelines_streams_update",
     title: "Update Stream",
-    description: "Update a Stream.",
+    description: "Update a Stream.\n\nPATCH /accounts/{account_id}/pipelines/v1/streams/{stream_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
         "body": {
           "properties": {
             "http": {
@@ -1154,19 +1129,29 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "stream_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-stream-id",
-          "description": "Specifies the public ID of the stream."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "stream_id": {
+              "description": "Specifies the public ID of the stream.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "stream_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "stream_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-        "cloudflare-pipelines_workers-pipelines-stream-id": cloudflare_pipelines_workers_pipelines_stream_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1249,7 +1234,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -1258,20 +1243,15 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
       },
     },
     annotations: {
@@ -1374,7 +1354,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -1386,20 +1366,15 @@ export const tools: readonly Tool[] = [
         "4XX": null
       },
       $defs: {
-        "cloudflare-pipelines_ConnectionSchema": cloudflare_pipelines_ConnectionSchema_output,
-        "cloudflare-pipelines_DecimalEncoding": cloudflare_pipelines_DecimalEncoding_output,
-        "cloudflare-pipelines_FieldType": cloudflare_pipelines_FieldType_output,
-        "cloudflare-pipelines_Format": cloudflare_pipelines_Format_output,
-        "cloudflare-pipelines_JsonFormat": cloudflare_pipelines_JsonFormat_output,
-        "cloudflare-pipelines_ListField": cloudflare_pipelines_ListField_output,
-        "cloudflare-pipelines_ParquetCompression": cloudflare_pipelines_ParquetCompression_output,
-        "cloudflare-pipelines_ParquetFormat": cloudflare_pipelines_ParquetFormat_output,
-        "cloudflare-pipelines_SourceField": cloudflare_pipelines_SourceField_output,
-        "cloudflare-pipelines_StructField": cloudflare_pipelines_StructField_output,
-        "cloudflare-pipelines_TimestampField": cloudflare_pipelines_TimestampField_output,
-        "cloudflare-pipelines_TimestampFormat": cloudflare_pipelines_TimestampFormat_output,
-        "cloudflare-pipelines_TimestampUnit": cloudflare_pipelines_TimestampUnit_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_ConnectionSchema": cloudflare$$pipelines_ConnectionSchema,
+        "cloudflare-pipelines_FieldType": cloudflare$$pipelines_FieldType,
+        "cloudflare-pipelines_Format": cloudflare$$pipelines_Format,
+        "cloudflare-pipelines_JsonFormat": cloudflare$$pipelines_JsonFormat,
+        "cloudflare-pipelines_ListField": cloudflare$$pipelines_ListField,
+        "cloudflare-pipelines_ParquetFormat": cloudflare$$pipelines_ParquetFormat,
+        "cloudflare-pipelines_SourceField": cloudflare$$pipelines_SourceField,
+        "cloudflare-pipelines_StructField": cloudflare$$pipelines_StructField,
+        "cloudflare-pipelines_TimestampField": cloudflare$$pipelines_TimestampField,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/pipelines/tools.ts b/src/generated/forge-mcp/pipelines/tools.ts
index 5a26dad1e..10679e20f 100644
--- a/src/generated/forge-mcp/pipelines/tools.ts
+++ b/src/generated/forge-mcp/pipelines/tools.ts
@@ -1,17 +1,12 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  cloudflare_pipelines_PipelineEdge_output,
-  cloudflare_pipelines_PipelineGraph_output,
-  cloudflare_pipelines_PipelineNode_output,
-  cloudflare_pipelines_worker_pipelines_common_success_output,
+  cloudflare$$pipelines_PipelineEdge,
+  cloudflare$$pipelines_PipelineGraph,
+  cloudflare$$pipelines_PipelineNode,
 } from "./outputs.js";
-import {
-  cloudflare_pipelines_workers_pipelines_account_id,
-  cloudflare_pipelines_workers_pipelines_pipeline_id,
-} from "./schemas.js";
 
 /**
  * The tools of `pipelines`.
@@ -20,14 +15,10 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_create",
     title: "Create Pipeline",
-    description: "Create a new Pipeline.",
+    description: "Create a new Pipeline.\n\nPOST /accounts/{account_id}/pipelines/v1/pipelines",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
         "body": {
           "properties": {
             "name": {
@@ -44,14 +35,25 @@ export const tools: readonly Tool[] = [
             "sql"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -87,7 +89,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -95,9 +97,6 @@ export const tools: readonly Tool[] = [
         "success"
       ],
       "type": "object",
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     annotations: {
       "destructiveHint": false,
@@ -155,7 +154,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -166,9 +165,6 @@ export const tools: readonly Tool[] = [
         },
         "4XX": null
       },
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pipelines/v1/pipelines`,
@@ -178,27 +174,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_delete",
     title: "Delete Pipeline",
-    description: "Delete Pipeline in Account.",
+    description: "Delete Pipeline in Account.\n\nDELETE /accounts/{account_id}/pipelines/v1/pipelines/{pipeline_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "pipeline_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-pipeline-id",
-          "description": "Specifies the public ID of the pipeline."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "pipeline_id": {
+              "description": "Specifies the public ID of the pipeline.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pipeline_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pipeline_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-        "cloudflare-pipelines_workers-pipelines-pipeline-id": cloudflare_pipelines_workers_pipelines_pipeline_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -206,7 +208,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -214,9 +216,6 @@ export const tools: readonly Tool[] = [
         "success"
       ],
       "type": "object",
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -243,7 +242,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -254,9 +253,6 @@ export const tools: readonly Tool[] = [
         },
         "4XX": null
       },
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pipelines/v1/pipelines/${pathParam(args, "pipeline_id")}`,
@@ -265,27 +261,33 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_get",
     title: "Get Pipeline Details",
-    description: "Get Pipeline details.",
+    description: "Get Pipeline details.\n\nGET /accounts/{account_id}/pipelines/v1/pipelines/{pipeline_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "pipeline_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-pipeline-id",
-          "description": "Specifies the public ID of the pipeline."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            },
+            "pipeline_id": {
+              "description": "Specifies the public ID of the pipeline.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pipeline_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pipeline_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-        "cloudflare-pipelines_workers-pipelines-pipeline-id": cloudflare_pipelines_workers_pipelines_pipeline_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -359,7 +361,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -367,9 +369,6 @@ export const tools: readonly Tool[] = [
         "success"
       ],
       "type": "object",
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     annotations: {
       "destructiveHint": false,
@@ -466,7 +465,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -477,9 +476,6 @@ export const tools: readonly Tool[] = [
         },
         "4XX": null
       },
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pipelines/v1/pipelines/${pathParam(args, "pipeline_id")}`,
@@ -488,32 +484,45 @@ export const tools: readonly Tool[] = [
   {
     name: "pipelines_list",
     title: "List Pipelines",
-    description: "List/Filter Pipelines in Account.",
+    description: "List/Filter Pipelines in Account.\n\nGET /accounts/{account_id}/pipelines/v1/pipelines",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
-        "name": {
-          "description": "Filters pipelines by name (case-insensitive substring).",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "Filters pipelines by name (case-insensitive substring).",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "type": "number"
+            },
+            "per_page": {
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -575,7 +584,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -584,9 +593,6 @@ export const tools: readonly Tool[] = [
         "success"
       ],
       "type": "object",
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     annotations: {
       "destructiveHint": false,
@@ -671,7 +677,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -683,30 +689,23 @@ export const tools: readonly Tool[] = [
         },
         "4XX": null
       },
-      $defs: {
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
-      },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/pipelines/v1/pipelines`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["name", args["name"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["name", param(args, "query", "name"), true],
       ],
     }),
   },
   {
-    name: "pipelines_validate_sql",
+    name: "pipelines_validateSql",
     title: "Validate SQL",
-    description: "Validates that the Pipelines SQL is correct.",
+    description: "Validates that the Pipelines SQL is correct.\n\nPOST /accounts/{account_id}/pipelines/v1/validate_sql",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/cloudflare-pipelines_workers-pipelines-account-id",
-          "description": "Specifies the public ID of the account."
-        },
         "body": {
           "properties": {
             "sql": {
@@ -718,14 +717,25 @@ export const tools: readonly Tool[] = [
             "sql"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specifies the public ID of the account.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "cloudflare-pipelines_workers-pipelines-account-id": cloudflare_pipelines_workers_pipelines_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -767,7 +777,7 @@ export const tools: readonly Tool[] = [
           "type": "object"
         },
         "success": {
-          "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+          "type": "boolean"
         }
       },
       "required": [
@@ -776,10 +786,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "cloudflare-pipelines_PipelineEdge": cloudflare_pipelines_PipelineEdge_output,
-        "cloudflare-pipelines_PipelineGraph": cloudflare_pipelines_PipelineGraph_output,
-        "cloudflare-pipelines_PipelineNode": cloudflare_pipelines_PipelineNode_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_PipelineEdge": cloudflare$$pipelines_PipelineEdge,
+        "cloudflare-pipelines_PipelineGraph": cloudflare$$pipelines_PipelineGraph,
+        "cloudflare-pipelines_PipelineNode": cloudflare$$pipelines_PipelineNode,
       },
     },
     annotations: {
@@ -844,7 +853,7 @@ export const tools: readonly Tool[] = [
               "type": "object"
             },
             "success": {
-              "$ref": "#/$defs/cloudflare-pipelines_worker-pipelines-common-success"
+              "type": "boolean"
             }
           },
           "required": [
@@ -961,10 +970,9 @@ export const tools: readonly Tool[] = [
         "4XX": null
       },
       $defs: {
-        "cloudflare-pipelines_PipelineEdge": cloudflare_pipelines_PipelineEdge_output,
-        "cloudflare-pipelines_PipelineGraph": cloudflare_pipelines_PipelineGraph_output,
-        "cloudflare-pipelines_PipelineNode": cloudflare_pipelines_PipelineNode_output,
-        "cloudflare-pipelines_worker-pipelines-common-success": cloudflare_pipelines_worker_pipelines_common_success_output,
+        "cloudflare-pipelines_PipelineEdge": cloudflare$$pipelines_PipelineEdge,
+        "cloudflare-pipelines_PipelineGraph": cloudflare$$pipelines_PipelineGraph,
+        "cloudflare-pipelines_PipelineNode": cloudflare$$pipelines_PipelineNode,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/precursor/outputs.ts b/src/generated/forge-mcp/precursor/outputs.ts
index c4651708b..38c35ce7d 100644
--- a/src/generated/forge-mcp/precursor/outputs.ts
+++ b/src/generated/forge-mcp/precursor/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `precursor_api-response-common-failure` in responses.
  */
-export const precursor_api_response_common_failure_output: JsonSchema = {
+export const precursor_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/precursor_messages"
@@ -36,7 +36,7 @@ export const precursor_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `precursor_api-response-single` in responses.
  */
-export const precursor_api_response_single_output: JsonSchema = {
+export const precursor_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/precursor_messages"
@@ -62,7 +62,7 @@ export const precursor_api_response_single_output: JsonSchema = {
 /**
  * The schema of `precursor_messages` in responses.
  */
-export const precursor_messages_output: JsonSchema = {
+export const precursor_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -95,16 +95,21 @@ export const precursor_messages_output: JsonSchema = {
 /**
  * The schema of `precursor_precursor_config` in responses.
  */
-export const precursor_precursor_config_output: JsonSchema = {
+export const precursor_precursor_config: JsonSchema = {
   "properties": {
     "mode": {
-      "$ref": "#/$defs/precursor_precursor_mode"
+      "enum": [
+        "off",
+        "monitor",
+        "arm"
+      ],
+      "type": "string"
     },
     "rules": {
       "$ref": "#/$defs/precursor_precursor_rules"
     },
     "show_interstitial": {
-      "$ref": "#/$defs/precursor_show_interstitial"
+      "type": "boolean"
     }
   },
   "type": "object"
@@ -113,7 +118,7 @@ export const precursor_precursor_config_output: JsonSchema = {
 /**
  * The schema of `precursor_precursor_config_response_body` in responses.
  */
-export const precursor_precursor_config_response_body_output: JsonSchema = {
+export const precursor_precursor_config_response_body: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/precursor_api-response-single"
@@ -129,22 +134,10 @@ export const precursor_precursor_config_response_body_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `precursor_precursor_mode` in responses.
- */
-export const precursor_precursor_mode_output: JsonSchema = {
-  "enum": [
-    "off",
-    "monitor",
-    "arm"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `precursor_precursor_rule` in responses.
  */
-export const precursor_precursor_rule_output: JsonSchema = {
+export const precursor_precursor_rule: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -159,7 +152,7 @@ export const precursor_precursor_rule_output: JsonSchema = {
       "type": "string"
     },
     "show_interstitial": {
-      "$ref": "#/$defs/precursor_show_interstitial"
+      "type": "boolean"
     }
   },
   "required": [
@@ -172,16 +165,9 @@ export const precursor_precursor_rule_output: JsonSchema = {
 /**
  * The schema of `precursor_precursor_rules` in responses.
  */
-export const precursor_precursor_rules_output: JsonSchema = {
+export const precursor_precursor_rules: JsonSchema = {
   "items": {
     "$ref": "#/$defs/precursor_precursor_rule"
   },
   "type": "array"
 };
-
-/**
- * The schema of `precursor_show_interstitial` in responses.
- */
-export const precursor_show_interstitial_output: JsonSchema = {
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/precursor/schemas.ts b/src/generated/forge-mcp/precursor/schemas.ts
index 485a505a7..7ff35aba2 100644
--- a/src/generated/forge-mcp/precursor/schemas.ts
+++ b/src/generated/forge-mcp/precursor/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `precursor_identifier`.
- */
-export const precursor_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `precursor_precursor_config`.
  */
@@ -18,35 +10,27 @@ export const precursor_precursor_config: JsonSchema = {
   "description": "Precursor Config",
   "properties": {
     "mode": {
-      "$ref": "#/$defs/precursor_precursor_mode",
       "default": "off",
-      "description": "Controls Precursor detection for the zone. `off` disables detection,\n`monitor` records detections without affecting bot scores, and `arm`\nallows detections to affect bot scores.\n"
+      "description": "Controls Precursor detection for the zone. `off` disables detection,\n`monitor` records detections without affecting bot scores, and `arm`\nallows detections to affect bot scores.",
+      "enum": [
+        "off",
+        "monitor",
+        "arm"
+      ],
+      "type": "string"
     },
     "rules": {
       "$ref": "#/$defs/precursor_precursor_rules",
       "description": "The ordered list of Precursor rules for the zone."
     },
     "show_interstitial": {
-      "$ref": "#/$defs/precursor_show_interstitial",
-      "description": "Whether Precursor shows an interstitial when it takes action on a\nrequest.\n"
+      "description": "Whether Precursor shows an interstitial when it takes action on a\nrequest.",
+      "type": "boolean"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `precursor_precursor_mode`.
- */
-export const precursor_precursor_mode: JsonSchema = {
-  "description": "Controls Precursor detection for the zone. `off` disables detection,\n`monitor` records detections without affecting bot scores, and `arm`\nallows detections to affect bot scores.\n",
-  "enum": [
-    "off",
-    "monitor",
-    "arm"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `precursor_precursor_rule`.
  */
@@ -68,8 +52,8 @@ export const precursor_precursor_rule: JsonSchema = {
       "type": "string"
     },
     "show_interstitial": {
-      "$ref": "#/$defs/precursor_show_interstitial",
-      "description": "Whether Precursor shows an interstitial when it takes action on a\nrequest.\n"
+      "description": "Whether Precursor shows an interstitial when it takes action on a\nrequest.",
+      "type": "boolean"
     }
   },
   "required": [
@@ -89,11 +73,3 @@ export const precursor_precursor_rules: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `precursor_show_interstitial`.
- */
-export const precursor_show_interstitial: JsonSchema = {
-  "description": "Whether Precursor shows an interstitial when it takes action on a\nrequest.\n",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/precursor/tools.ts b/src/generated/forge-mcp/precursor/tools.ts
index 74fae51a9..42c45f2a7 100644
--- a/src/generated/forge-mcp/precursor/tools.ts
+++ b/src/generated/forge-mcp/precursor/tools.ts
@@ -1,25 +1,20 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  precursor_api_response_common_failure_output,
-  precursor_api_response_single_output,
-  precursor_messages_output,
-  precursor_precursor_config_output,
-  precursor_precursor_config_response_body_output,
-  precursor_precursor_mode_output,
-  precursor_precursor_rule_output,
-  precursor_precursor_rules_output,
-  precursor_show_interstitial_output,
-} from "./outputs.js";
-import {
-  precursor_identifier,
+  precursor_api$$response$$common$$failure,
+  precursor_api$$response$$single,
+  precursor_messages,
   precursor_precursor_config,
-  precursor_precursor_mode,
+  precursor_precursor_config_response_body,
   precursor_precursor_rule,
   precursor_precursor_rules,
-  precursor_show_interstitial,
+} from "./outputs.js";
+import {
+  precursor_precursor_config as precursor_precursor_config$,
+  precursor_precursor_rule as precursor_precursor_rule$,
+  precursor_precursor_rules as precursor_precursor_rules$,
 } from "./schemas.js";
 
 /**
@@ -29,42 +24,56 @@ export const tools: readonly Tool[] = [
   {
     name: "precursor_get",
     title: "Get Zone Precursor Config",
-    description: "Retrieve a zone's Precursor configuration: the detection `mode`,\nwhether to `show_interstitial`, and the ordered list of `rules`.\n\nThis method is beta.",
+    description: "Retrieve a zone's Precursor configuration: the detection `mode`,\nwhether to `show_interstitial`, and the ordered list of `rules`.\n\nThis method is beta.\n\nGET /zones/{zone_id}/precursor",
     inputSchema: {
       type: "object",
       properties: {
-        "cloudflare_version": {
-          "default": "1.0",
-          "description": "Selects the split Precursor API schema.",
-          "enum": [
-            "1.0"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Cloudflare-Version": {
+              "default": "1.0",
+              "description": "Selects the split Precursor API schema.",
+              "enum": [
+                "1.0"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "Cloudflare-Version"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/precursor_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "cloudflare_version"
+        "path",
+        "headers"
       ],
-      $defs: {
-        "precursor_identifier": precursor_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/precursor_precursor_config_response_body",
       $defs: {
-        "precursor_api-response-single": precursor_api_response_single_output,
-        "precursor_messages": precursor_messages_output,
-        "precursor_precursor_config": precursor_precursor_config_output,
-        "precursor_precursor_config_response_body": precursor_precursor_config_response_body_output,
-        "precursor_precursor_mode": precursor_precursor_mode_output,
-        "precursor_precursor_rule": precursor_precursor_rule_output,
-        "precursor_precursor_rules": precursor_precursor_rules_output,
-        "precursor_show_interstitial": precursor_show_interstitial_output,
+        "precursor_api-response-single": precursor_api$$response$$single,
+        "precursor_messages": precursor_messages,
+        "precursor_precursor_config": precursor_precursor_config,
+        "precursor_precursor_config_response_body": precursor_precursor_config_response_body,
+        "precursor_precursor_rule": precursor_precursor_rule,
+        "precursor_precursor_rules": precursor_precursor_rules,
       },
     },
     annotations: {
@@ -107,72 +116,84 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "precursor_api-response-common-failure": precursor_api_response_common_failure_output,
-        "precursor_api-response-single": precursor_api_response_single_output,
-        "precursor_messages": precursor_messages_output,
-        "precursor_precursor_config": precursor_precursor_config_output,
-        "precursor_precursor_config_response_body": precursor_precursor_config_response_body_output,
-        "precursor_precursor_mode": precursor_precursor_mode_output,
-        "precursor_precursor_rule": precursor_precursor_rule_output,
-        "precursor_precursor_rules": precursor_precursor_rules_output,
-        "precursor_show_interstitial": precursor_show_interstitial_output,
+        "precursor_api-response-common-failure": precursor_api$$response$$common$$failure,
+        "precursor_api-response-single": precursor_api$$response$$single,
+        "precursor_messages": precursor_messages,
+        "precursor_precursor_config": precursor_precursor_config,
+        "precursor_precursor_config_response_body": precursor_precursor_config_response_body,
+        "precursor_precursor_rule": precursor_precursor_rule,
+        "precursor_precursor_rules": precursor_precursor_rules,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/precursor`,
       headers: [
-        ["Cloudflare-Version", args["cloudflare_version"]],
+        ["Cloudflare-Version", param(args, "headers", "Cloudflare-Version")],
       ],
     }),
   },
   {
     name: "precursor_update",
     title: "Update Zone Precursor Config",
-    description: "Updates the Precursor configuration for a zone.\n\n`mode` controls whether Precursor detection is off, monitoring, or\narmed. `show_interstitial` controls the zone-level response when armed.\n`rules` is the ordered list of overrides for matching requests.\n\nThis is a partial update: only the fields present in the request body\nare changed.\n\n- Sending an empty array (`[]`) clears all rules.\n- At least one of `mode`, `show_interstitial`, or `rules` must be\n  present; an empty body (`{}`) is rejected with `400`.\n- Rule `id` is read-only (assigned by Cloudflare) and ignored on input.\n- Rule `show_interstitial` is required and controls the response for\n  requests that match that rule.\n- Rule `expression` is limited to 4000 characters. The limit applies to\n  each rule individually, not to the combined size of all rules.\n\nThis method is beta.",
+    description: "Updates the Precursor configuration for a zone.\n\n`mode` controls whether Precursor detection is off, monitoring, or\narmed. `show_interstitial` controls the zone-level response when armed.\n`rules` is the ordered list of overrides for matching requests.\n\nThis is a partial update: only the fields present in the request body\nare changed.\n\n- Sending an empty array (`[]`) clears all rules.\n- At least one of `mode`, `show_interstitial`, or `rules` must be\n  present; an empty body (`{}`) is rejected with `400`.\n- Rule `id` is read-only (assigned by Cloudflare) and ignored on input.\n- Rule `show_interstitial` is required and controls the response for\n  requests that match that rule.\n- Rule `expression` is limited to 4000 characters. The limit applies to\n  each rule individually, not to the combined size of all rules.\n\nThis method is beta.\n\nPUT /zones/{zone_id}/precursor",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/precursor_precursor_config"
         },
-        "cloudflare_version": {
-          "default": "1.0",
-          "description": "Selects the split Precursor API schema.",
-          "enum": [
-            "1.0"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Cloudflare-Version": {
+              "default": "1.0",
+              "description": "Selects the split Precursor API schema.",
+              "enum": [
+                "1.0"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "Cloudflare-Version"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/precursor_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "cloudflare_version",
+        "path",
+        "headers",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "precursor_identifier": precursor_identifier,
-        "precursor_precursor_config": precursor_precursor_config,
-        "precursor_precursor_mode": precursor_precursor_mode,
-        "precursor_precursor_rule": precursor_precursor_rule,
-        "precursor_precursor_rules": precursor_precursor_rules,
-        "precursor_show_interstitial": precursor_show_interstitial,
+        "precursor_precursor_config": precursor_precursor_config$,
+        "precursor_precursor_rule": precursor_precursor_rule$,
+        "precursor_precursor_rules": precursor_precursor_rules$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/precursor_precursor_config_response_body",
       $defs: {
-        "precursor_api-response-single": precursor_api_response_single_output,
-        "precursor_messages": precursor_messages_output,
-        "precursor_precursor_config": precursor_precursor_config_output,
-        "precursor_precursor_config_response_body": precursor_precursor_config_response_body_output,
-        "precursor_precursor_mode": precursor_precursor_mode_output,
-        "precursor_precursor_rule": precursor_precursor_rule_output,
-        "precursor_precursor_rules": precursor_precursor_rules_output,
-        "precursor_show_interstitial": precursor_show_interstitial_output,
+        "precursor_api-response-single": precursor_api$$response$$single,
+        "precursor_messages": precursor_messages,
+        "precursor_precursor_config": precursor_precursor_config,
+        "precursor_precursor_config_response_body": precursor_precursor_config_response_body,
+        "precursor_precursor_rule": precursor_precursor_rule,
+        "precursor_precursor_rules": precursor_precursor_rules,
       },
     },
     annotations: {
@@ -214,21 +235,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "precursor_api-response-common-failure": precursor_api_response_common_failure_output,
-        "precursor_api-response-single": precursor_api_response_single_output,
-        "precursor_messages": precursor_messages_output,
-        "precursor_precursor_config": precursor_precursor_config_output,
-        "precursor_precursor_config_response_body": precursor_precursor_config_response_body_output,
-        "precursor_precursor_mode": precursor_precursor_mode_output,
-        "precursor_precursor_rule": precursor_precursor_rule_output,
-        "precursor_precursor_rules": precursor_precursor_rules_output,
-        "precursor_show_interstitial": precursor_show_interstitial_output,
+        "precursor_api-response-common-failure": precursor_api$$response$$common$$failure,
+        "precursor_api-response-single": precursor_api$$response$$single,
+        "precursor_messages": precursor_messages,
+        "precursor_precursor_config": precursor_precursor_config,
+        "precursor_precursor_config_response_body": precursor_precursor_config_response_body,
+        "precursor_precursor_rule": precursor_precursor_rule,
+        "precursor_precursor_rules": precursor_precursor_rules,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/precursor`,
       headers: [
-        ["Cloudflare-Version", args["cloudflare_version"]],
+        ["Cloudflare-Version", param(args, "headers", "Cloudflare-Version")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/previews/tools.ts b/src/generated/forge-mcp/previews/tools.ts
index 3b073f514..cc1bd5cb2 100644
--- a/src/generated/forge-mcp/previews/tools.ts
+++ b/src/generated/forge-mcp/previews/tools.ts
@@ -1,13 +1,12 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../outputs.js";
-import { workers_identifier } from "../schemas.js";
 
 /**
  * The tools of `previews`.
@@ -16,41 +15,54 @@ export const tools: readonly Tool[] = [
   {
     name: "previews_delete",
     title: "Delete Preview",
-    description: "Delete a Preview.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the Preview.",
+    description: "Delete a Preview.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the Preview.\n\nDELETE /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id"
+          ],
+          "type": "object"
         },
-        "delete_with_references": {
-          "description": "If true, delete the Preview even when other Workers still reference it. Service bindings in those Workers may be left broken. Durable Object namespaces implemented by the deleted Preview are deleted even if other Workers reference them.",
-          "type": "boolean"
-        },
-        "name": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
-        },
-        "worker": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "force": {
+              "description": "If true, delete the Preview even when other Workers still reference it. Service bindings in those Workers may be left broken. Durable Object namespaces implemented by the deleted Preview are deleted even if other Workers reference them.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker",
-        "name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-common",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -77,15 +89,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker")}/previews/${pathParam(args, "name")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews/${pathParam(args, "preview_id")}`,
       query: [
-        ["force", args["delete_with_references"], true],
+        ["force", param(args, "query", "force"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/queues/consumers/schemas.ts b/src/generated/forge-mcp/queues/consumers/schemas.ts
index 391a706ed..f3ba20fb4 100644
--- a/src/generated/forge-mcp/queues/consumers/schemas.ts
+++ b/src/generated/forge-mcp/queues/consumers/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `mq_consumer-request`.
  */
-export const mq_consumer_request: JsonSchema = {
+export const mq_consumer$$request: JsonSchema = {
   "description": "Request body for creating or updating a consumer",
   "oneOf": [
     {
@@ -21,28 +21,28 @@ export const mq_consumer_request: JsonSchema = {
 /**
  * The schema of `mq_http-consumer-request`.
  */
-export const mq_http_consumer_request: JsonSchema = {
+export const mq_http$$consumer$$request: JsonSchema = {
   "properties": {
     "dead_letter_queue": {
-      "$ref": "#/$defs/mq_queue-name"
+      "type": "string"
     },
     "settings": {
       "properties": {
         "batch_size": {
-          "$ref": "#/$defs/mq_batch-size",
-          "description": "The maximum number of messages to include in a batch."
+          "description": "The maximum number of messages to include in a batch.",
+          "type": "number"
         },
         "max_retries": {
-          "$ref": "#/$defs/mq_max-retries",
-          "description": "The maximum number of retries"
+          "description": "The maximum number of retries",
+          "type": "number"
         },
         "retry_delay": {
-          "$ref": "#/$defs/mq_retry-delay",
-          "description": "The number of seconds to delay before making the message available for another attempt."
+          "description": "The number of seconds to delay before making the message available for another attempt.",
+          "type": "number"
         },
         "visibility_timeout_ms": {
-          "$ref": "#/$defs/mq_visibility-timeout",
-          "description": "The number of milliseconds that a message is exclusively leased. After the timeout, the message becomes available for another attempt."
+          "description": "The number of milliseconds that a message is exclusively leased. After the timeout, the message becomes available for another attempt.",
+          "type": "number"
         }
       },
       "type": "object"
@@ -63,36 +63,36 @@ export const mq_http_consumer_request: JsonSchema = {
 /**
  * The schema of `mq_worker-consumer-request`.
  */
-export const mq_worker_consumer_request: JsonSchema = {
+export const mq_worker$$consumer$$request: JsonSchema = {
   "properties": {
     "dead_letter_queue": {
-      "$ref": "#/$defs/mq_queue-name"
+      "type": "string"
     },
     "script_name": {
-      "$ref": "#/$defs/mq_script-name",
-      "description": "Name of a Worker"
+      "description": "Name of a Worker",
+      "type": "string"
     },
     "settings": {
       "properties": {
         "batch_size": {
-          "$ref": "#/$defs/mq_batch-size",
-          "description": "The maximum number of messages to include in a batch."
+          "description": "The maximum number of messages to include in a batch.",
+          "type": "number"
         },
         "max_concurrency": {
-          "$ref": "#/$defs/mq_max-concurrency",
-          "description": "Maximum number of concurrent consumers that may consume from this Queue. Set to `null` to automatically opt in to the platform's maximum (recommended)."
+          "description": "Maximum number of concurrent consumers that may consume from this Queue. Set to `null` to automatically opt in to the platform's maximum (recommended).",
+          "type": "number"
         },
         "max_retries": {
-          "$ref": "#/$defs/mq_max-retries",
-          "description": "The maximum number of retries"
+          "description": "The maximum number of retries",
+          "type": "number"
         },
         "max_wait_time_ms": {
-          "$ref": "#/$defs/mq_max-wait-time",
-          "description": "The number of milliseconds to wait for a batch to fill up before attempting to deliver it"
+          "description": "The number of milliseconds to wait for a batch to fill up before attempting to deliver it",
+          "type": "number"
         },
         "retry_delay": {
-          "$ref": "#/$defs/mq_retry-delay",
-          "description": "The number of seconds to delay before making the message available for another attempt."
+          "description": "The number of seconds to delay before making the message available for another attempt.",
+          "type": "number"
         }
       },
       "type": "object"
diff --git a/src/generated/forge-mcp/queues/consumers/tools.ts b/src/generated/forge-mcp/queues/consumers/tools.ts
index 9bf824da1..f88b67caf 100644
--- a/src/generated/forge-mcp/queues/consumers/tools.ts
+++ b/src/generated/forge-mcp/queues/consumers/tools.ts
@@ -3,38 +3,18 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  mq_api_v4_error_output,
-  mq_api_v4_failure_output,
-  mq_api_v4_message_output,
-  mq_api_v4_success_output,
-  mq_batch_size_output,
-  mq_consumer_response_output,
-  mq_http_consumer_response_output,
-  mq_identifier_output,
-  mq_max_concurrency_output,
-  mq_max_retries_output,
-  mq_max_wait_time_output,
-  mq_queue_name_output,
-  mq_retry_delay_output,
-  mq_script_name_output,
-  mq_visibility_timeout_output,
-  mq_worker_consumer_response_output,
+  mq_api$$v4$$error,
+  mq_api$$v4$$failure,
+  mq_api$$v4$$message,
+  mq_api$$v4$$success,
+  mq_consumer$$response,
+  mq_http$$consumer$$response,
+  mq_worker$$consumer$$response,
 } from "../outputs.js";
 import {
-  mq_batch_size,
-  mq_identifier,
-  mq_max_concurrency,
-  mq_max_retries,
-  mq_max_wait_time,
-  mq_queue_name,
-  mq_retry_delay,
-  mq_script_name,
-  mq_visibility_timeout,
-} from "../schemas.js";
-import {
-  mq_consumer_request,
-  mq_http_consumer_request,
-  mq_worker_consumer_request,
+  mq_consumer$$request,
+  mq_http$$consumer$$request,
+  mq_worker$$consumer$$request,
 } from "./schemas.js";
 
 /**
@@ -44,39 +24,40 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_consumers_create",
     title: "Create a Queue Consumer",
-    description: "Creates a consumer for a Queue.",
+    description: "Creates a consumer for a Queue.\n\nPOST /accounts/{account_id}/queues/{queue_id}/consumers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "$ref": "#/$defs/mq_consumer-request"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "mq_batch-size": mq_batch_size,
-        "mq_consumer-request": mq_consumer_request,
-        "mq_http-consumer-request": mq_http_consumer_request,
-        "mq_identifier": mq_identifier,
-        "mq_max-concurrency": mq_max_concurrency,
-        "mq_max-retries": mq_max_retries,
-        "mq_max-wait-time": mq_max_wait_time,
-        "mq_queue-name": mq_queue_name,
-        "mq_retry-delay": mq_retry_delay,
-        "mq_script-name": mq_script_name,
-        "mq_visibility-timeout": mq_visibility_timeout,
-        "mq_worker-consumer-request": mq_worker_consumer_request,
+        "mq_consumer-request": mq_consumer$$request,
+        "mq_http-consumer-request": mq_http$$consumer$$request,
+        "mq_worker-consumer-request": mq_worker$$consumer$$request,
       },
     },
     outputSchema: {
@@ -94,21 +75,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
       },
     },
     annotations: {
@@ -153,22 +125,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
       },
     },
     request: (args) => ({
@@ -179,38 +142,45 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_consumers_delete",
     title: "Delete Queue Consumer",
-    description: "Deletes a consumer from a Queue.",
+    description: "Deletes a consumer from a Queue.\n\nDELETE /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "consumer_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "consumer_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id",
+            "consumer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id",
-        "consumer_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mq_api-v4-success",
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     annotations: {
@@ -243,10 +213,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -256,31 +226,38 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_consumers_get",
     title: "Get Queue Consumer",
-    description: "Returns a Queue consumer by identifier.",
+    description: "Returns a Queue consumer by identifier.\n\nGET /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "consumer_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "consumer_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id",
+            "consumer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id",
-        "consumer_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -297,21 +274,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
       },
     },
     annotations: {
@@ -358,22 +326,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
       },
     },
     request: (args) => ({
@@ -383,26 +342,33 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_consumers_list",
     title: "List Queue Consumers",
-    description: "Returns the consumers configured for a Queue.",
+    description: "Returns the consumers configured for a Queue.\n\nGET /accounts/{account_id}/queues/{queue_id}/consumers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -422,21 +388,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
       },
     },
     annotations: {
@@ -486,22 +443,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
       },
     },
     request: (args) => ({
@@ -511,45 +459,46 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_consumers_update",
     title: "Update Queue Consumer",
-    description: "Replaces a Queue consumer, or creates it if it does not exist.",
+    description: "Replaces a Queue consumer, or creates it if it does not exist.\n\nPUT /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "$ref": "#/$defs/mq_consumer-request"
         },
-        "consumer_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "consumer_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id",
+            "consumer_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id",
-        "consumer_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "mq_batch-size": mq_batch_size,
-        "mq_consumer-request": mq_consumer_request,
-        "mq_http-consumer-request": mq_http_consumer_request,
-        "mq_identifier": mq_identifier,
-        "mq_max-concurrency": mq_max_concurrency,
-        "mq_max-retries": mq_max_retries,
-        "mq_max-wait-time": mq_max_wait_time,
-        "mq_queue-name": mq_queue_name,
-        "mq_retry-delay": mq_retry_delay,
-        "mq_script-name": mq_script_name,
-        "mq_visibility-timeout": mq_visibility_timeout,
-        "mq_worker-consumer-request": mq_worker_consumer_request,
+        "mq_consumer-request": mq_consumer$$request,
+        "mq_http-consumer-request": mq_http$$consumer$$request,
+        "mq_worker-consumer-request": mq_worker$$consumer$$request,
       },
     },
     outputSchema: {
@@ -567,21 +516,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
       },
     },
     annotations: {
@@ -626,22 +566,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/queues/messages/outputs.ts b/src/generated/forge-mcp/queues/messages/outputs.ts
index dd5e36bc6..cca93c6b9 100644
--- a/src/generated/forge-mcp/queues/messages/outputs.ts
+++ b/src/generated/forge-mcp/queues/messages/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `mq_lease-id` in responses.
- */
-export const mq_lease_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `mq_queue-peek-batch` in responses.
  */
-export const mq_queue_peek_batch_output: JsonSchema = {
+export const mq_queue$$peek$$batch: JsonSchema = {
   "items": {
     "properties": {
       "attempts": {
@@ -29,7 +22,7 @@ export const mq_queue_peek_batch_output: JsonSchema = {
         "type": "object"
       },
       "ref": {
-        "$ref": "#/$defs/mq_ref"
+        "type": "string"
       },
       "timestamp_ms": {
         "type": "number"
@@ -43,7 +36,7 @@ export const mq_queue_peek_batch_output: JsonSchema = {
 /**
  * The schema of `mq_queue-pull-batch` in responses.
  */
-export const mq_queue_pull_batch_output: JsonSchema = {
+export const mq_queue$$pull$$batch: JsonSchema = {
   "items": {
     "properties": {
       "attempts": {
@@ -56,7 +49,7 @@ export const mq_queue_pull_batch_output: JsonSchema = {
         "type": "string"
       },
       "lease_id": {
-        "$ref": "#/$defs/mq_lease-id"
+        "type": "string"
       },
       "metadata": {
         "type": "object"
@@ -69,10 +62,3 @@ export const mq_queue_pull_batch_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `mq_ref` in responses.
- */
-export const mq_ref_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/queues/messages/schemas.ts b/src/generated/forge-mcp/queues/messages/schemas.ts
index d6bdb3b5d..8f63129e1 100644
--- a/src/generated/forge-mcp/queues/messages/schemas.ts
+++ b/src/generated/forge-mcp/queues/messages/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `mq_lease-id`.
- */
-export const mq_lease_id: JsonSchema = {
-  "description": "An ID that represents an \"in-flight\" message that has been pulled from a Queue. You must hold on to this ID and use it to acknowledge this message.",
-  "type": "string"
-};
-
 /**
  * The schema of `mq_queue-batch`.
  */
-export const mq_queue_batch: JsonSchema = {
+export const mq_queue$$batch: JsonSchema = {
   "properties": {
     "delay_seconds": {
       "description": "The number of seconds to wait for attempting to deliver this batch to consumers",
@@ -33,7 +25,7 @@ export const mq_queue_batch: JsonSchema = {
 /**
  * The schema of `mq_queue-message`.
  */
-export const mq_queue_message: JsonSchema = {
+export const mq_queue$$message: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -60,7 +52,7 @@ export const mq_queue_message: JsonSchema = {
 /**
  * The schema of `mq_queue-message-json`.
  */
-export const mq_queue_message_json: JsonSchema = {
+export const mq_queue$$message$$json: JsonSchema = {
   "properties": {
     "body": {
       "type": "object"
@@ -78,7 +70,7 @@ export const mq_queue_message_json: JsonSchema = {
 /**
  * The schema of `mq_queue-message-text`.
  */
-export const mq_queue_message_text: JsonSchema = {
+export const mq_queue$$message$$text: JsonSchema = {
   "properties": {
     "body": {
       "type": "string"
@@ -92,11 +84,3 @@ export const mq_queue_message_text: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `mq_ref`.
- */
-export const mq_ref: JsonSchema = {
-  "description": "An opaque reference to a peeked message. You must hold on to this value and use it to purge the message.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/queues/messages/tools.ts b/src/generated/forge-mcp/queues/messages/tools.ts
index 11648736d..26a35de32 100644
--- a/src/generated/forge-mcp/queues/messages/tools.ts
+++ b/src/generated/forge-mcp/queues/messages/tools.ts
@@ -3,31 +3,18 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  mq_api_v4_error_output,
-  mq_api_v4_failure_output,
-  mq_api_v4_message_output,
-  mq_api_v4_success_output,
-  mq_queue_metrics_output,
+  mq_api$$v4$$error,
+  mq_api$$v4$$failure,
+  mq_api$$v4$$message,
+  mq_api$$v4$$success,
+  mq_queue$$metrics,
 } from "../outputs.js";
+import { mq_queue$$peek$$batch, mq_queue$$pull$$batch } from "./outputs.js";
 import {
-  mq_batch_size,
-  mq_identifier,
-  mq_retry_delay,
-  mq_visibility_timeout,
-} from "../schemas.js";
-import {
-  mq_lease_id_output,
-  mq_queue_peek_batch_output,
-  mq_queue_pull_batch_output,
-  mq_ref_output,
-} from "./outputs.js";
-import {
-  mq_lease_id,
-  mq_queue_batch,
-  mq_queue_message,
-  mq_queue_message_json,
-  mq_queue_message_text,
-  mq_ref,
+  mq_queue$$batch,
+  mq_queue$$message,
+  mq_queue$$message$$json,
+  mq_queue$$message$$text,
 } from "./schemas.js";
 
 /**
@@ -37,22 +24,18 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_messages_ack",
     title: "Acknowledge + Retry Queue Messages",
-    description: "Acknowledges successfully processed Queue messages and retries messages that were not processed successfully.",
+    description: "Acknowledges successfully processed Queue messages and retries messages that were not processed successfully.\n\nPOST /accounts/{account_id}/queues/{queue_id}/messages/ack",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "acks": {
               "items": {
                 "properties": {
                   "lease_id": {
-                    "$ref": "#/$defs/mq_lease-id",
-                    "description": "An ID that represents an \"in-flight\" message that has been pulled from a Queue. You must hold on to this ID and use it to acknowledge this message."
+                    "description": "An ID that represents an \"in-flight\" message that has been pulled from a Queue. You must hold on to this ID and use it to acknowledge this message.",
+                    "type": "string"
                   }
                 },
                 "type": "object"
@@ -63,12 +46,12 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "delay_seconds": {
-                    "$ref": "#/$defs/mq_retry-delay",
-                    "description": "The number of seconds to delay before making the message available for another attempt."
+                    "description": "The number of seconds to delay before making the message available for another attempt.",
+                    "type": "number"
                   },
                   "lease_id": {
-                    "$ref": "#/$defs/mq_lease-id",
-                    "description": "An ID that represents an \"in-flight\" message that has been pulled from a Queue. You must hold on to this ID and use it to acknowledge this message."
+                    "description": "An ID that represents an \"in-flight\" message that has been pulled from a Queue. You must hold on to this ID and use it to acknowledge this message.",
+                    "type": "string"
                   }
                 },
                 "type": "object"
@@ -78,20 +61,29 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-        "mq_lease-id": mq_lease_id,
-        "mq_retry-delay": mq_retry_delay,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -122,9 +114,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     annotations: {
@@ -184,10 +176,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -196,34 +188,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "queues_messages_bulk_push",
+    name: "queues_messages_bulkPush",
     title: "Push Message Batch",
-    description: "Pushes a batch of messages to a Queue.",
+    description: "Pushes a batch of messages to a Queue.\n\nPOST /accounts/{account_id}/queues/{queue_id}/messages/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "$ref": "#/$defs/mq_queue-batch"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "mq_identifier": mq_identifier,
-        "mq_queue-batch": mq_queue_batch,
-        "mq_queue-message": mq_queue_message,
-        "mq_queue-message-json": mq_queue_message_json,
-        "mq_queue-message-text": mq_queue_message_text,
+        "mq_queue-batch": mq_queue$$batch,
+        "mq_queue-message": mq_queue$$message,
+        "mq_queue-message-json": mq_queue$$message$$json,
+        "mq_queue-message-text": mq_queue$$message$$text,
       },
     },
     outputSchema: {
@@ -251,10 +252,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_queue-metrics": mq_queue_metrics_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-metrics": mq_queue$$metrics,
       },
     },
     annotations: {
@@ -310,11 +311,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_queue-metrics": mq_queue_metrics_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-metrics": mq_queue$$metrics,
       },
     },
     request: (args) => ({
@@ -323,24 +324,20 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "queues_messages_extend_leases",
+    name: "queues_messages_extendLeases",
     title: "Extend Message Leases",
-    description: "Extends message leases without incrementing the messages' `attempts` counters. Each message receives a new lease identifier.",
+    description: "Extends message leases without incrementing the messages' `attempts` counters. Each message receives a new lease identifier.\n\nPOST /accounts/{account_id}/queues/{queue_id}/messages/extend",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "extend": {
               "items": {
                 "properties": {
                   "lease_id": {
-                    "$ref": "#/$defs/mq_lease-id",
-                    "description": "An ID that represents an \"in-flight\" message that has been pulled from a Queue. You must hold on to this ID and use it to acknowledge this message."
+                    "description": "An ID that represents an \"in-flight\" message that has been pulled from a Queue. You must hold on to this ID and use it to acknowledge this message.",
+                    "type": "string"
                   }
                 },
                 "type": "object"
@@ -348,26 +345,35 @@ export const tools: readonly Tool[] = [
               "type": "array"
             },
             "visibility_timeout_ms": {
-              "$ref": "#/$defs/mq_visibility-timeout",
-              "description": "The number of milliseconds that a message is exclusively leased. After the timeout, the message becomes available for another attempt."
+              "description": "The number of milliseconds that a message is exclusively leased. After the timeout, the message becomes available for another attempt.",
+              "type": "number"
             }
           },
           "type": "object"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-        "mq_lease-id": mq_lease_id,
-        "mq_visibility-timeout": mq_visibility_timeout,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -395,9 +401,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     annotations: {
@@ -454,10 +460,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -468,36 +474,42 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_messages_peek",
     title: "Peek Queue Messages",
-    description: "Peek messages from a Queue without leasing them. Each message includes a ref that can be passed to the purge endpoint, and remains available for subsequent peek or pull operations until it is purged.",
+    description: "Peek messages from a Queue without leasing them. Each message includes a ref that can be passed to the purge endpoint, and remains available for subsequent peek or pull operations until it is purged.\n\nPOST /accounts/{account_id}/queues/{queue_id}/messages/peek",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "batch_size": {
-              "$ref": "#/$defs/mq_batch-size",
-              "description": "The maximum number of messages to include in a batch."
+              "description": "The maximum number of messages to include in a batch.",
+              "type": "number"
             }
           },
           "type": "object"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_batch-size": mq_batch_size,
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -519,11 +531,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_queue-peek-batch": mq_queue_peek_batch_output,
-        "mq_ref": mq_ref_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-peek-batch": mq_queue$$peek$$batch,
       },
     },
     annotations: {
@@ -574,12 +585,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_queue-peek-batch": mq_queue_peek_batch_output,
-        "mq_ref": mq_ref_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-peek-batch": mq_queue$$peek$$batch,
       },
     },
     request: (args) => ({
@@ -590,41 +600,46 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_messages_pull",
     title: "Pull Queue Messages",
-    description: "Pulls a batch of messages from a Queue for an HTTP pull consumer.",
+    description: "Pulls a batch of messages from a Queue for an HTTP pull consumer.\n\nPOST /accounts/{account_id}/queues/{queue_id}/messages/pull",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "batch_size": {
-              "$ref": "#/$defs/mq_batch-size",
-              "description": "The maximum number of messages to include in a batch."
+              "description": "The maximum number of messages to include in a batch.",
+              "type": "number"
             },
             "visibility_timeout_ms": {
-              "$ref": "#/$defs/mq_visibility-timeout",
-              "description": "The number of milliseconds that a message is exclusively leased. After the timeout, the message becomes available for another attempt."
+              "description": "The number of milliseconds that a message is exclusively leased. After the timeout, the message becomes available for another attempt.",
+              "type": "number"
             }
           },
           "type": "object"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_batch-size": mq_batch_size,
-        "mq_identifier": mq_identifier,
-        "mq_visibility-timeout": mq_visibility_timeout,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -657,12 +672,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_lease-id": mq_lease_id_output,
-        "mq_queue-metrics": mq_queue_metrics_output,
-        "mq_queue-pull-batch": mq_queue_pull_batch_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-metrics": mq_queue$$metrics,
+        "mq_queue-pull-batch": mq_queue$$pull$$batch,
       },
     },
     annotations: {
@@ -724,13 +738,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_lease-id": mq_lease_id_output,
-        "mq_queue-metrics": mq_queue_metrics_output,
-        "mq_queue-pull-batch": mq_queue_pull_batch_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-metrics": mq_queue$$metrics,
+        "mq_queue-pull-batch": mq_queue$$pull$$batch,
       },
     },
     request: (args) => ({
@@ -741,22 +754,18 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_messages_purge",
     title: "Purge Peeked Queue Messages",
-    description: "Delete messages from a Queue by using refs returned by the peek endpoint. Purging messages does not count as delivery and does not affect metrics.\n\nConfirm with the user before calling this tool. This operation permanently deletes the selected messages from the Queue.",
+    description: "Delete messages from a Queue by using refs returned by the peek endpoint. Purging messages does not count as delivery and does not affect metrics.\n\nConfirm with the user before calling this tool. This operation permanently deletes the selected messages from the Queue.\n\nPOST /accounts/{account_id}/queues/{queue_id}/messages/purge",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "refs": {
               "items": {
                 "properties": {
                   "ref": {
-                    "$ref": "#/$defs/mq_ref",
-                    "description": "An opaque reference to a peeked message. You must hold on to this value and use it to purge the message."
+                    "description": "An opaque reference to a peeked message. You must hold on to this value and use it to purge the message.",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -772,20 +781,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-        "mq_ref": mq_ref,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -821,9 +840,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     annotations: {
@@ -888,10 +907,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -902,31 +921,40 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_messages_push",
     title: "Push Message",
-    description: "Pushes a message to a Queue.",
+    description: "Pushes a message to a Queue.\n\nPOST /accounts/{account_id}/queues/{queue_id}/messages",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "$ref": "#/$defs/mq_queue-message"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "mq_identifier": mq_identifier,
-        "mq_queue-message": mq_queue_message,
-        "mq_queue-message-json": mq_queue_message_json,
-        "mq_queue-message-text": mq_queue_message_text,
+        "mq_queue-message": mq_queue$$message,
+        "mq_queue-message-json": mq_queue$$message$$json,
+        "mq_queue-message-text": mq_queue$$message$$text,
       },
     },
     outputSchema: {
@@ -954,10 +982,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_queue-metrics": mq_queue_metrics_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-metrics": mq_queue$$metrics,
       },
     },
     annotations: {
@@ -1013,11 +1041,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_queue-metrics": mq_queue_metrics_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-metrics": mq_queue$$metrics,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/queues/metrics/tools.ts b/src/generated/forge-mcp/queues/metrics/tools.ts
index 5b2a9ea6c..1ce75a04c 100644
--- a/src/generated/forge-mcp/queues/metrics/tools.ts
+++ b/src/generated/forge-mcp/queues/metrics/tools.ts
@@ -3,13 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  mq_api_v4_error_output,
-  mq_api_v4_failure_output,
-  mq_api_v4_message_output,
-  mq_api_v4_success_output,
-  mq_queue_metrics_output,
+  mq_api$$v4$$error,
+  mq_api$$v4$$failure,
+  mq_api$$v4$$message,
+  mq_api$$v4$$success,
+  mq_queue$$metrics,
 } from "../outputs.js";
-import { mq_identifier } from "../schemas.js";
 
 /**
  * The tools of `queues.metrics`.
@@ -18,26 +17,33 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_metrics_get",
     title: "Get Queue Metrics",
-    description: "Returns best-effort metrics for a Queue. Values may be approximate due to the distributed nature of Queues.",
+    description: "Returns best-effort metrics for a Queue. Values may be approximate due to the distributed nature of Queues.\n\nGET /accounts/{account_id}/queues/{queue_id}/metrics",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -54,10 +60,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_queue-metrics": mq_queue_metrics_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-metrics": mq_queue$$metrics,
       },
     },
     annotations: {
@@ -99,11 +105,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_queue-metrics": mq_queue_metrics_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_queue-metrics": mq_queue$$metrics,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/queues/outputs.ts b/src/generated/forge-mcp/queues/outputs.ts
index ea3fc032b..c7c15801e 100644
--- a/src/generated/forge-mcp/queues/outputs.ts
+++ b/src/generated/forge-mcp/queues/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `mq_api-v4-error` in responses.
  */
-export const mq_api_v4_error_output: JsonSchema = {
+export const mq_api$$v4$$error: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -28,7 +28,7 @@ export const mq_api_v4_error_output: JsonSchema = {
 /**
  * The schema of `mq_api-v4-failure` in responses.
  */
-export const mq_api_v4_failure_output: JsonSchema = {
+export const mq_api$$v4$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/mq_api-v4-error"
@@ -49,7 +49,7 @@ export const mq_api_v4_failure_output: JsonSchema = {
 /**
  * The schema of `mq_api-v4-message` in responses.
  */
-export const mq_api_v4_message_output: JsonSchema = {
+export const mq_api$$v4$$message: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -59,7 +59,7 @@ export const mq_api_v4_message_output: JsonSchema = {
 /**
  * The schema of `mq_api-v4-success` in responses.
  */
-export const mq_api_v4_success_output: JsonSchema = {
+export const mq_api$$v4$$success: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/mq_api-v4-error"
@@ -77,17 +77,10 @@ export const mq_api_v4_success_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `mq_batch-size` in responses.
- */
-export const mq_batch_size_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `mq_consumer-response` in responses.
  */
-export const mq_consumer_response_output: JsonSchema = {
+export const mq_consumer$$response: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/mq_worker-consumer-response"
@@ -101,10 +94,10 @@ export const mq_consumer_response_output: JsonSchema = {
 /**
  * The schema of `mq_http-consumer-response` in responses.
  */
-export const mq_http_consumer_response_output: JsonSchema = {
+export const mq_http$$consumer$$response: JsonSchema = {
   "properties": {
     "consumer_id": {
-      "$ref": "#/$defs/mq_identifier"
+      "type": "string"
     },
     "created_on": {
       "format": "date-time",
@@ -114,21 +107,21 @@ export const mq_http_consumer_response_output: JsonSchema = {
       "type": "string"
     },
     "queue_name": {
-      "$ref": "#/$defs/mq_queue-name"
+      "type": "string"
     },
     "settings": {
       "properties": {
         "batch_size": {
-          "$ref": "#/$defs/mq_batch-size"
+          "type": "number"
         },
         "max_retries": {
-          "$ref": "#/$defs/mq_max-retries"
+          "type": "number"
         },
         "retry_delay": {
-          "$ref": "#/$defs/mq_retry-delay"
+          "type": "number"
         },
         "visibility_timeout_ms": {
-          "$ref": "#/$defs/mq_visibility-timeout"
+          "type": "number"
         }
       },
       "type": "object"
@@ -143,50 +136,10 @@ export const mq_http_consumer_response_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `mq_identifier` in responses.
- */
-export const mq_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `mq_jurisdiction` in responses.
- */
-export const mq_jurisdiction_output: JsonSchema = {
-  "enum": [
-    "eu",
-    "us",
-    "fedramp"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `mq_max-concurrency` in responses.
- */
-export const mq_max_concurrency_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `mq_max-retries` in responses.
- */
-export const mq_max_retries_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `mq_max-wait-time` in responses.
- */
-export const mq_max_wait_time_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `mq_producer` in responses.
  */
-export const mq_producer_output: JsonSchema = {
+export const mq_producer: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/mq_worker-producer"
@@ -200,7 +153,7 @@ export const mq_producer_output: JsonSchema = {
 /**
  * The schema of `mq_queue` in responses.
  */
-export const mq_queue_output: JsonSchema = {
+export const mq_queue: JsonSchema = {
   "properties": {
     "consumers": {
       "items": {
@@ -215,7 +168,12 @@ export const mq_queue_output: JsonSchema = {
       "type": "string"
     },
     "jurisdiction": {
-      "$ref": "#/$defs/mq_jurisdiction"
+      "enum": [
+        "eu",
+        "us",
+        "fedramp"
+      ],
+      "type": "string"
     },
     "modified_on": {
       "type": "string"
@@ -233,7 +191,7 @@ export const mq_queue_output: JsonSchema = {
       "type": "string"
     },
     "queue_name": {
-      "$ref": "#/$defs/mq_queue-name"
+      "type": "string"
     },
     "settings": {
       "$ref": "#/$defs/mq_queue-settings"
@@ -245,7 +203,7 @@ export const mq_queue_output: JsonSchema = {
 /**
  * The schema of `mq_queue-metrics` in responses.
  */
-export const mq_queue_metrics_output: JsonSchema = {
+export const mq_queue$$metrics: JsonSchema = {
   "properties": {
     "backlog_bytes": {
       "type": "number"
@@ -265,17 +223,10 @@ export const mq_queue_metrics_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `mq_queue-name` in responses.
- */
-export const mq_queue_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `mq_queue-settings` in responses.
  */
-export const mq_queue_settings_output: JsonSchema = {
+export const mq_queue$$settings: JsonSchema = {
   "properties": {
     "delivery_delay": {
       "type": "number"
@@ -293,7 +244,7 @@ export const mq_queue_settings_output: JsonSchema = {
 /**
  * The schema of `mq_r2-producer` in responses.
  */
-export const mq_r2_producer_output: JsonSchema = {
+export const mq_r2$$producer: JsonSchema = {
   "properties": {
     "bucket_name": {
       "type": "string"
@@ -308,34 +259,13 @@ export const mq_r2_producer_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `mq_retry-delay` in responses.
- */
-export const mq_retry_delay_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `mq_script-name` in responses.
- */
-export const mq_script_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `mq_visibility-timeout` in responses.
- */
-export const mq_visibility_timeout_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `mq_worker-consumer-response` in responses.
  */
-export const mq_worker_consumer_response_output: JsonSchema = {
+export const mq_worker$$consumer$$response: JsonSchema = {
   "properties": {
     "consumer_id": {
-      "$ref": "#/$defs/mq_identifier"
+      "type": "string"
     },
     "created_on": {
       "format": "date-time",
@@ -345,27 +275,27 @@ export const mq_worker_consumer_response_output: JsonSchema = {
       "type": "string"
     },
     "queue_name": {
-      "$ref": "#/$defs/mq_queue-name"
+      "type": "string"
     },
     "script_name": {
-      "$ref": "#/$defs/mq_script-name"
+      "type": "string"
     },
     "settings": {
       "properties": {
         "batch_size": {
-          "$ref": "#/$defs/mq_batch-size"
+          "type": "number"
         },
         "max_concurrency": {
-          "$ref": "#/$defs/mq_max-concurrency"
+          "type": "number"
         },
         "max_retries": {
-          "$ref": "#/$defs/mq_max-retries"
+          "type": "number"
         },
         "max_wait_time_ms": {
-          "$ref": "#/$defs/mq_max-wait-time"
+          "type": "number"
         },
         "retry_delay": {
-          "$ref": "#/$defs/mq_retry-delay"
+          "type": "number"
         }
       },
       "type": "object"
@@ -383,7 +313,7 @@ export const mq_worker_consumer_response_output: JsonSchema = {
 /**
  * The schema of `mq_worker-producer` in responses.
  */
-export const mq_worker_producer_output: JsonSchema = {
+export const mq_worker$$producer: JsonSchema = {
   "properties": {
     "script": {
       "type": "string"
diff --git a/src/generated/forge-mcp/queues/purge/tools.ts b/src/generated/forge-mcp/queues/purge/tools.ts
index 8c245b95f..52083f71e 100644
--- a/src/generated/forge-mcp/queues/purge/tools.ts
+++ b/src/generated/forge-mcp/queues/purge/tools.ts
@@ -3,30 +3,19 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  mq_api_v4_error_output,
-  mq_api_v4_failure_output,
-  mq_api_v4_message_output,
-  mq_api_v4_success_output,
-  mq_batch_size_output,
-  mq_consumer_response_output,
-  mq_http_consumer_response_output,
-  mq_identifier_output,
-  mq_jurisdiction_output,
-  mq_max_concurrency_output,
-  mq_max_retries_output,
-  mq_max_wait_time_output,
-  mq_producer_output,
-  mq_queue_name_output,
-  mq_queue_output,
-  mq_queue_settings_output,
-  mq_r2_producer_output,
-  mq_retry_delay_output,
-  mq_script_name_output,
-  mq_visibility_timeout_output,
-  mq_worker_consumer_response_output,
-  mq_worker_producer_output,
+  mq_api$$v4$$error,
+  mq_api$$v4$$failure,
+  mq_api$$v4$$message,
+  mq_api$$v4$$success,
+  mq_consumer$$response,
+  mq_http$$consumer$$response,
+  mq_producer,
+  mq_queue,
+  mq_queue$$settings,
+  mq_r2$$producer,
+  mq_worker$$consumer$$response,
+  mq_worker$$producer,
 } from "../outputs.js";
-import { mq_identifier } from "../schemas.js";
 
 /**
  * The tools of `queues.purge`.
@@ -35,14 +24,10 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_purge_start",
     title: "Purge Queue",
-    description: "Starts a purge that deletes all messages from a Queue.\n\nConfirm with the user before calling this tool. This operation drops every message in the queue.",
+    description: "Starts a purge that deletes all messages from a Queue.\n\nConfirm with the user before calling this tool. This operation drops every message in the queue.\n\nPOST /accounts/{account_id}/queues/{queue_id}/purge",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "delete_messages_permanently": {
@@ -52,18 +37,29 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -80,27 +76,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     annotations: {
@@ -145,28 +131,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     request: (args) => ({
@@ -177,26 +153,33 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_purge_status",
     title: "Get Queue Purge Status",
-    description: "Returns the status of a Queue purge operation.",
+    description: "Returns the status of a Queue purge operation.\n\nGET /accounts/{account_id}/queues/{queue_id}/purge",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -221,9 +204,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     annotations: {
@@ -278,10 +261,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/queues/schemas.ts b/src/generated/forge-mcp/queues/schemas.ts
index 2ef7d9ae7..a71d5c4b1 100644
--- a/src/generated/forge-mcp/queues/schemas.ts
+++ b/src/generated/forge-mcp/queues/schemas.ts
@@ -3,68 +3,21 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `mq_batch-size`.
- */
-export const mq_batch_size: JsonSchema = {
-  "description": "The maximum number of messages to include in a batch.",
-  "type": "number"
-};
-
-/**
- * The schema of `mq_identifier`.
- */
-export const mq_identifier: JsonSchema = {
-  "description": "A Resource identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `mq_jurisdiction`.
- */
-export const mq_jurisdiction: JsonSchema = {
-  "enum": [
-    "eu",
-    "us",
-    "fedramp"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `mq_max-concurrency`.
- */
-export const mq_max_concurrency: JsonSchema = {
-  "description": "Maximum number of concurrent consumers that may consume from this Queue. Set to `null` to automatically opt in to the platform's maximum (recommended).",
-  "type": "number"
-};
-
-/**
- * The schema of `mq_max-retries`.
- */
-export const mq_max_retries: JsonSchema = {
-  "description": "The maximum number of retries",
-  "type": "number"
-};
-
-/**
- * The schema of `mq_max-wait-time`.
- */
-export const mq_max_wait_time: JsonSchema = {
-  "description": "The number of milliseconds to wait for a batch to fill up before attempting to deliver it",
-  "type": "number"
-};
-
 /**
  * The schema of `mq_queue`.
  */
 export const mq_queue: JsonSchema = {
   "properties": {
     "jurisdiction": {
-      "$ref": "#/$defs/mq_jurisdiction"
+      "enum": [
+        "eu",
+        "us",
+        "fedramp"
+      ],
+      "type": "string"
     },
     "queue_name": {
-      "$ref": "#/$defs/mq_queue-name"
+      "type": "string"
     },
     "settings": {
       "$ref": "#/$defs/mq_queue-settings"
@@ -73,17 +26,10 @@ export const mq_queue: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `mq_queue-name`.
- */
-export const mq_queue_name: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `mq_queue-settings`.
  */
-export const mq_queue_settings: JsonSchema = {
+export const mq_queue$$settings: JsonSchema = {
   "properties": {
     "delivery_delay": {
       "description": "Number of seconds to delay delivery of all messages to consumers.",
@@ -100,27 +46,3 @@ export const mq_queue_settings: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `mq_retry-delay`.
- */
-export const mq_retry_delay: JsonSchema = {
-  "description": "The number of seconds to delay before making the message available for another attempt.",
-  "type": "number"
-};
-
-/**
- * The schema of `mq_script-name`.
- */
-export const mq_script_name: JsonSchema = {
-  "description": "Name of a Worker",
-  "type": "string"
-};
-
-/**
- * The schema of `mq_visibility-timeout`.
- */
-export const mq_visibility_timeout: JsonSchema = {
-  "description": "The number of milliseconds that a message is exclusively leased. After the timeout, the message becomes available for another attempt.",
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/queues/subscriptions/outputs.ts b/src/generated/forge-mcp/queues/subscriptions/outputs.ts
index 6a2377e98..977c588a1 100644
--- a/src/generated/forge-mcp/queues/subscriptions/outputs.ts
+++ b/src/generated/forge-mcp/queues/subscriptions/outputs.ts
@@ -6,14 +6,14 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `mq_event-destination` in responses.
  */
-export const mq_event_destination_output: JsonSchema = {
+export const mq_event$$destination: JsonSchema = {
   "$ref": "#/$defs/mq_event-destination-queue"
 };
 
 /**
  * The schema of `mq_event-destination-queue` in responses.
  */
-export const mq_event_destination_queue_output: JsonSchema = {
+export const mq_event$$destination$$queue: JsonSchema = {
   "properties": {
     "queue_id": {
       "type": "string"
@@ -35,7 +35,7 @@ export const mq_event_destination_queue_output: JsonSchema = {
 /**
  * The schema of `mq_event-source` in responses.
  */
-export const mq_event_source_output: JsonSchema = {
+export const mq_event$$source: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/mq_event-source-images"
@@ -70,7 +70,7 @@ export const mq_event_source_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-images` in responses.
  */
-export const mq_event_source_images_output: JsonSchema = {
+export const mq_event$$source$$images: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -85,7 +85,7 @@ export const mq_event_source_images_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-kv` in responses.
  */
-export const mq_event_source_kv_output: JsonSchema = {
+export const mq_event$$source$$kv: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -100,7 +100,7 @@ export const mq_event_source_kv_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-r2` in responses.
  */
-export const mq_event_source_r2_output: JsonSchema = {
+export const mq_event$$source$$r2: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -115,7 +115,7 @@ export const mq_event_source_r2_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-super-slurper` in responses.
  */
-export const mq_event_source_super_slurper_output: JsonSchema = {
+export const mq_event$$source$$super$$slurper: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -130,7 +130,7 @@ export const mq_event_source_super_slurper_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-vectorize` in responses.
  */
-export const mq_event_source_vectorize_output: JsonSchema = {
+export const mq_event$$source$$vectorize: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -145,7 +145,7 @@ export const mq_event_source_vectorize_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-workers-ai-model` in responses.
  */
-export const mq_event_source_workers_ai_model_output: JsonSchema = {
+export const mq_event$$source$$workers$$ai$$model: JsonSchema = {
   "properties": {
     "model_name": {
       "type": "string"
@@ -163,7 +163,7 @@ export const mq_event_source_workers_ai_model_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-workers-builds-worker` in responses.
  */
-export const mq_event_source_workers_builds_worker_output: JsonSchema = {
+export const mq_event$$source$$workers$$builds$$worker: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -181,7 +181,7 @@ export const mq_event_source_workers_builds_worker_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-workers-script` in responses.
  */
-export const mq_event_source_workers_script_output: JsonSchema = {
+export const mq_event$$source$$workers$$script: JsonSchema = {
   "properties": {
     "script_tag": {
       "type": "string"
@@ -199,7 +199,7 @@ export const mq_event_source_workers_script_output: JsonSchema = {
 /**
  * The schema of `mq_event-source-workflows-workflow` in responses.
  */
-export const mq_event_source_workflows_workflow_output: JsonSchema = {
+export const mq_event$$source$$workflows$$workflow: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
@@ -217,7 +217,7 @@ export const mq_event_source_workflows_workflow_output: JsonSchema = {
 /**
  * The schema of `mq_event-subscription` in responses.
  */
-export const mq_event_subscription_output: JsonSchema = {
+export const mq_event$$subscription: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/queues/subscriptions/schemas.ts b/src/generated/forge-mcp/queues/subscriptions/schemas.ts
index 1fd234eed..296da8395 100644
--- a/src/generated/forge-mcp/queues/subscriptions/schemas.ts
+++ b/src/generated/forge-mcp/queues/subscriptions/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `mq_event-destination`.
  */
-export const mq_event_destination: JsonSchema = {
+export const mq_event$$destination: JsonSchema = {
   "$ref": "#/$defs/mq_event-destination-queue",
   "description": "Destination configuration for the subscription"
 };
@@ -14,7 +14,7 @@ export const mq_event_destination: JsonSchema = {
 /**
  * The schema of `mq_event-destination-queue`.
  */
-export const mq_event_destination_queue: JsonSchema = {
+export const mq_event$$destination$$queue: JsonSchema = {
   "properties": {
     "queue_id": {
       "description": "ID of the target queue",
@@ -38,7 +38,7 @@ export const mq_event_destination_queue: JsonSchema = {
 /**
  * The schema of `mq_event-source`.
  */
-export const mq_event_source: JsonSchema = {
+export const mq_event$$source: JsonSchema = {
   "description": "Source configuration for the subscription",
   "oneOf": [
     {
@@ -74,7 +74,7 @@ export const mq_event_source: JsonSchema = {
 /**
  * The schema of `mq_event-source-images`.
  */
-export const mq_event_source_images: JsonSchema = {
+export const mq_event$$source$$images: JsonSchema = {
   "properties": {
     "type": {
       "description": "Type of source",
@@ -90,7 +90,7 @@ export const mq_event_source_images: JsonSchema = {
 /**
  * The schema of `mq_event-source-kv`.
  */
-export const mq_event_source_kv: JsonSchema = {
+export const mq_event$$source$$kv: JsonSchema = {
   "properties": {
     "type": {
       "description": "Type of source",
@@ -106,7 +106,7 @@ export const mq_event_source_kv: JsonSchema = {
 /**
  * The schema of `mq_event-source-r2`.
  */
-export const mq_event_source_r2: JsonSchema = {
+export const mq_event$$source$$r2: JsonSchema = {
   "properties": {
     "type": {
       "description": "Type of source",
@@ -122,7 +122,7 @@ export const mq_event_source_r2: JsonSchema = {
 /**
  * The schema of `mq_event-source-super-slurper`.
  */
-export const mq_event_source_super_slurper: JsonSchema = {
+export const mq_event$$source$$super$$slurper: JsonSchema = {
   "properties": {
     "type": {
       "description": "Type of source",
@@ -138,7 +138,7 @@ export const mq_event_source_super_slurper: JsonSchema = {
 /**
  * The schema of `mq_event-source-vectorize`.
  */
-export const mq_event_source_vectorize: JsonSchema = {
+export const mq_event$$source$$vectorize: JsonSchema = {
   "properties": {
     "type": {
       "description": "Type of source",
@@ -154,7 +154,7 @@ export const mq_event_source_vectorize: JsonSchema = {
 /**
  * The schema of `mq_event-source-workers-ai-model`.
  */
-export const mq_event_source_workers_ai_model: JsonSchema = {
+export const mq_event$$source$$workers$$ai$$model: JsonSchema = {
   "properties": {
     "model_name": {
       "description": "Name of the Workers AI model",
@@ -174,7 +174,7 @@ export const mq_event_source_workers_ai_model: JsonSchema = {
 /**
  * The schema of `mq_event-source-workers-builds-worker`.
  */
-export const mq_event_source_workers_builds_worker: JsonSchema = {
+export const mq_event$$source$$workers$$builds$$worker: JsonSchema = {
   "properties": {
     "type": {
       "description": "Type of source",
@@ -194,7 +194,7 @@ export const mq_event_source_workers_builds_worker: JsonSchema = {
 /**
  * The schema of `mq_event-source-workers-script`.
  */
-export const mq_event_source_workers_script: JsonSchema = {
+export const mq_event$$source$$workers$$script: JsonSchema = {
   "properties": {
     "script_tag": {
       "description": "Tag of the Worker script",
@@ -214,7 +214,7 @@ export const mq_event_source_workers_script: JsonSchema = {
 /**
  * The schema of `mq_event-source-workflows-workflow`.
  */
-export const mq_event_source_workflows_workflow: JsonSchema = {
+export const mq_event$$source$$workflows$$workflow: JsonSchema = {
   "properties": {
     "type": {
       "description": "Type of source",
diff --git a/src/generated/forge-mcp/queues/subscriptions/tools.ts b/src/generated/forge-mcp/queues/subscriptions/tools.ts
index a67d58ff6..b35951fc4 100644
--- a/src/generated/forge-mcp/queues/subscriptions/tools.ts
+++ b/src/generated/forge-mcp/queues/subscriptions/tools.ts
@@ -1,42 +1,41 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  mq_api_v4_error_output,
-  mq_api_v4_failure_output,
-  mq_api_v4_message_output,
-  mq_api_v4_success_output,
+  mq_api$$v4$$error,
+  mq_api$$v4$$failure,
+  mq_api$$v4$$message,
+  mq_api$$v4$$success,
 } from "../outputs.js";
-import { mq_identifier } from "../schemas.js";
 import {
-  mq_event_destination_output,
-  mq_event_destination_queue_output,
-  mq_event_source_images_output,
-  mq_event_source_kv_output,
-  mq_event_source_output,
-  mq_event_source_r2_output,
-  mq_event_source_super_slurper_output,
-  mq_event_source_vectorize_output,
-  mq_event_source_workers_ai_model_output,
-  mq_event_source_workers_builds_worker_output,
-  mq_event_source_workers_script_output,
-  mq_event_source_workflows_workflow_output,
-  mq_event_subscription_output,
+  mq_event$$destination,
+  mq_event$$destination$$queue,
+  mq_event$$source,
+  mq_event$$source$$images,
+  mq_event$$source$$kv,
+  mq_event$$source$$r2,
+  mq_event$$source$$super$$slurper,
+  mq_event$$source$$vectorize,
+  mq_event$$source$$workers$$ai$$model,
+  mq_event$$source$$workers$$builds$$worker,
+  mq_event$$source$$workers$$script,
+  mq_event$$source$$workflows$$workflow,
+  mq_event$$subscription,
 } from "./outputs.js";
 import {
-  mq_event_destination,
-  mq_event_destination_queue,
-  mq_event_source,
-  mq_event_source_images,
-  mq_event_source_kv,
-  mq_event_source_r2,
-  mq_event_source_super_slurper,
-  mq_event_source_vectorize,
-  mq_event_source_workers_ai_model,
-  mq_event_source_workers_builds_worker,
-  mq_event_source_workers_script,
-  mq_event_source_workflows_workflow,
+  mq_event$$destination as mq_event$$destination$,
+  mq_event$$destination$$queue as mq_event$$destination$$queue$,
+  mq_event$$source as mq_event$$source$,
+  mq_event$$source$$images as mq_event$$source$$images$,
+  mq_event$$source$$kv as mq_event$$source$$kv$,
+  mq_event$$source$$r2 as mq_event$$source$$r2$,
+  mq_event$$source$$super$$slurper as mq_event$$source$$super$$slurper$,
+  mq_event$$source$$vectorize as mq_event$$source$$vectorize$,
+  mq_event$$source$$workers$$ai$$model as mq_event$$source$$workers$$ai$$model$,
+  mq_event$$source$$workers$$builds$$worker as mq_event$$source$$workers$$builds$$worker$,
+  mq_event$$source$$workers$$script as mq_event$$source$$workers$$script$,
+  mq_event$$source$$workflows$$workflow as mq_event$$source$$workflows$$workflow$,
 } from "./schemas.js";
 
 /**
@@ -46,14 +45,10 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_subscriptions_create",
     title: "Create Event Subscription",
-    description: "Creates an event subscription for a Queue.",
+    description: "Creates an event subscription for a Queue.\n\nPOST /accounts/{account_id}/event_subscriptions/subscriptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "destination": {
@@ -82,26 +77,39 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "mq_event-destination": mq_event_destination,
-        "mq_event-destination-queue": mq_event_destination_queue,
-        "mq_event-source": mq_event_source,
-        "mq_event-source-images": mq_event_source_images,
-        "mq_event-source-kv": mq_event_source_kv,
-        "mq_event-source-r2": mq_event_source_r2,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper,
-        "mq_event-source-vectorize": mq_event_source_vectorize,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker,
-        "mq_event-source-workers-script": mq_event_source_workers_script,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow,
-        "mq_identifier": mq_identifier,
+        "mq_event-destination": mq_event$$destination$,
+        "mq_event-destination-queue": mq_event$$destination$$queue$,
+        "mq_event-source": mq_event$$source$,
+        "mq_event-source-images": mq_event$$source$$images$,
+        "mq_event-source-kv": mq_event$$source$$kv$,
+        "mq_event-source-r2": mq_event$$source$$r2$,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper$,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize$,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model$,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker$,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script$,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow$,
       },
     },
     outputSchema: {
@@ -119,22 +127,22 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     annotations: {
@@ -180,23 +188,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     request: (args) => ({
@@ -207,26 +215,33 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_subscriptions_delete",
     title: "Delete Event Subscription",
-    description: "Deletes an existing Queue event subscription.",
+    description: "Deletes an existing Queue event subscription.\n\nDELETE /accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "subscription_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "subscription_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subscription_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subscription_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -243,22 +258,22 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     annotations: {
@@ -298,23 +313,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     request: (args) => ({
@@ -324,26 +339,33 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_subscriptions_get",
     title: "Get Event Subscription",
-    description: "Returns an existing Queue event subscription.",
+    description: "Returns an existing Queue event subscription.\n\nGET /accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "subscription_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "subscription_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subscription_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subscription_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -360,22 +382,22 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     annotations: {
@@ -415,23 +437,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     request: (args) => ({
@@ -441,51 +463,64 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_subscriptions_list",
     title: "List Event Subscriptions",
-    description: "Returns a paginated list of Queue event subscriptions with optional sorting and filtering.",
+    description: "Returns a paginated list of Queue event subscriptions with optional sorting and filtering.\n\nGET /accounts/{account_id}/event_subscriptions/subscriptions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "default": "name",
-          "description": "Field to sort by",
-          "enum": [
-            "created_at",
-            "name",
-            "enabled",
-            "source"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number for pagination",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "name",
+              "description": "Field to sort by",
+              "enum": [
+                "created_at",
+                "name",
+                "enabled",
+                "source"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number for pagination",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -532,22 +567,22 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     annotations: {
@@ -619,46 +654,42 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/event_subscriptions/subscriptions`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
     name: "queues_subscriptions_update",
     title: "Update Event Subscription",
-    description: "Updates an existing Queue event subscription.",
+    description: "Updates an existing Queue event subscription.\n\nPATCH /accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "destination": {
@@ -684,20 +715,33 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "subscription_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "subscription_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "subscription_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "subscription_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "mq_event-destination": mq_event_destination,
-        "mq_event-destination-queue": mq_event_destination_queue,
-        "mq_identifier": mq_identifier,
+        "mq_event-destination": mq_event$$destination$,
+        "mq_event-destination-queue": mq_event$$destination$$queue$,
       },
     },
     outputSchema: {
@@ -715,22 +759,22 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     annotations: {
@@ -778,23 +822,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_event-destination": mq_event_destination_output,
-        "mq_event-destination-queue": mq_event_destination_queue_output,
-        "mq_event-source": mq_event_source_output,
-        "mq_event-source-images": mq_event_source_images_output,
-        "mq_event-source-kv": mq_event_source_kv_output,
-        "mq_event-source-r2": mq_event_source_r2_output,
-        "mq_event-source-super-slurper": mq_event_source_super_slurper_output,
-        "mq_event-source-vectorize": mq_event_source_vectorize_output,
-        "mq_event-source-workers-ai-model": mq_event_source_workers_ai_model_output,
-        "mq_event-source-workers-builds-worker": mq_event_source_workers_builds_worker_output,
-        "mq_event-source-workers-script": mq_event_source_workers_script_output,
-        "mq_event-source-workflows-workflow": mq_event_source_workflows_workflow_output,
-        "mq_event-subscription": mq_event_subscription_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_event-destination": mq_event$$destination,
+        "mq_event-destination-queue": mq_event$$destination$$queue,
+        "mq_event-source": mq_event$$source,
+        "mq_event-source-images": mq_event$$source$$images,
+        "mq_event-source-kv": mq_event$$source$$kv,
+        "mq_event-source-r2": mq_event$$source$$r2,
+        "mq_event-source-super-slurper": mq_event$$source$$super$$slurper,
+        "mq_event-source-vectorize": mq_event$$source$$vectorize,
+        "mq_event-source-workers-ai-model": mq_event$$source$$workers$$ai$$model,
+        "mq_event-source-workers-builds-worker": mq_event$$source$$workers$$builds$$worker,
+        "mq_event-source-workers-script": mq_event$$source$$workers$$script,
+        "mq_event-source-workflows-workflow": mq_event$$source$$workflows$$workflow,
+        "mq_event-subscription": mq_event$$subscription,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/queues/tools.ts b/src/generated/forge-mcp/queues/tools.ts
index c633ae328..1221a838a 100644
--- a/src/generated/forge-mcp/queues/tools.ts
+++ b/src/generated/forge-mcp/queues/tools.ts
@@ -3,35 +3,22 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  mq_api_v4_error_output,
-  mq_api_v4_failure_output,
-  mq_api_v4_message_output,
-  mq_api_v4_success_output,
-  mq_batch_size_output,
-  mq_consumer_response_output,
-  mq_http_consumer_response_output,
-  mq_identifier_output,
-  mq_jurisdiction_output,
-  mq_max_concurrency_output,
-  mq_max_retries_output,
-  mq_max_wait_time_output,
-  mq_producer_output,
-  mq_queue_name_output,
-  mq_queue_output,
-  mq_queue_settings_output,
-  mq_r2_producer_output,
-  mq_retry_delay_output,
-  mq_script_name_output,
-  mq_visibility_timeout_output,
-  mq_worker_consumer_response_output,
-  mq_worker_producer_output,
+  mq_api$$v4$$error,
+  mq_api$$v4$$failure,
+  mq_api$$v4$$message,
+  mq_api$$v4$$success,
+  mq_consumer$$response,
+  mq_http$$consumer$$response,
+  mq_producer,
+  mq_queue,
+  mq_queue$$settings,
+  mq_r2$$producer,
+  mq_worker$$consumer$$response,
+  mq_worker$$producer,
 } from "./outputs.js";
 import {
-  mq_identifier,
-  mq_jurisdiction,
-  mq_queue,
-  mq_queue_name,
-  mq_queue_settings,
+  mq_queue as mq_queue$,
+  mq_queue$$settings as mq_queue$$settings$,
 } from "./schemas.js";
 
 /**
@@ -41,37 +28,47 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_create",
     title: "Create Queue",
-    description: "Creates a Queue in the account.",
+    description: "Creates a Queue in the account.\n\nPOST /accounts/{account_id}/queues",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "properties": {
             "jurisdiction": {
-              "$ref": "#/$defs/mq_jurisdiction"
+              "enum": [
+                "eu",
+                "us",
+                "fedramp"
+              ],
+              "type": "string"
             },
             "queue_name": {
-              "$ref": "#/$defs/mq_queue-name"
+              "type": "string"
             }
           },
           "required": [
             "queue_name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-        "mq_jurisdiction": mq_jurisdiction,
-        "mq_queue-name": mq_queue_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -88,27 +85,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     annotations: {
@@ -153,28 +140,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     request: (args) => ({
@@ -185,33 +162,40 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_delete",
     title: "Delete Queue",
-    description: "Deletes a Queue.",
+    description: "Deletes a Queue.\n\nDELETE /accounts/{account_id}/queues/{queue_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/mq_api-v4-success",
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     annotations: {
@@ -244,10 +228,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -257,32 +241,39 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_edit",
     title: "Update Queue",
-    description: "Updates part of a Queue's configuration.",
+    description: "Updates part of a Queue's configuration.\n\nPATCH /accounts/{account_id}/queues/{queue_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
         "body": {
           "$ref": "#/$defs/mq_queue"
         },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "mq_identifier": mq_identifier,
-        "mq_jurisdiction": mq_jurisdiction,
-        "mq_queue": mq_queue,
-        "mq_queue-name": mq_queue_name,
-        "mq_queue-settings": mq_queue_settings,
+        "mq_queue": mq_queue$,
+        "mq_queue-settings": mq_queue$$settings$,
       },
     },
     outputSchema: {
@@ -300,27 +291,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     annotations: {
@@ -365,28 +346,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     request: (args) => ({
@@ -397,26 +368,33 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_get",
     title: "Get Queue",
-    description: "Returns details about a specific Queue.",
+    description: "Returns details about a specific Queue.\n\nGET /accounts/{account_id}/queues/{queue_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
-        },
-        "queue_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "queue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -433,27 +411,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     annotations: {
@@ -500,28 +468,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     request: (args) => ({
@@ -531,21 +489,28 @@ export const tools: readonly Tool[] = [
   {
     name: "queues_list",
     title: "List Queues",
-    description: "Returns the queues owned by an account.",
+    description: "Returns the queues owned by an account.\n\nGET /accounts/{account_id}/queues",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/mq_identifier",
-          "description": "A Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "A Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "mq_identifier": mq_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -585,27 +550,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     annotations: {
@@ -675,28 +630,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "mq_api-v4-error": mq_api_v4_error_output,
-        "mq_api-v4-failure": mq_api_v4_failure_output,
-        "mq_api-v4-message": mq_api_v4_message_output,
-        "mq_api-v4-success": mq_api_v4_success_output,
-        "mq_batch-size": mq_batch_size_output,
-        "mq_consumer-response": mq_consumer_response_output,
-        "mq_http-consumer-response": mq_http_consumer_response_output,
-        "mq_identifier": mq_identifier_output,
-        "mq_jurisdiction": mq_jurisdiction_output,
-        "mq_max-concurrency": mq_max_concurrency_output,
-        "mq_max-retries": mq_max_retries_output,
-        "mq_max-wait-time": mq_max_wait_time_output,
-        "mq_producer": mq_producer_output,
-        "mq_queue": mq_queue_output,
-        "mq_queue-name": mq_queue_name_output,
-        "mq_queue-settings": mq_queue_settings_output,
-        "mq_r2-producer": mq_r2_producer_output,
-        "mq_retry-delay": mq_retry_delay_output,
-        "mq_script-name": mq_script_name_output,
-        "mq_visibility-timeout": mq_visibility_timeout_output,
-        "mq_worker-consumer-response": mq_worker_consumer_response_output,
-        "mq_worker-producer": mq_worker_producer_output,
+        "mq_api-v4-error": mq_api$$v4$$error,
+        "mq_api-v4-failure": mq_api$$v4$$failure,
+        "mq_api-v4-message": mq_api$$v4$$message,
+        "mq_api-v4-success": mq_api$$v4$$success,
+        "mq_consumer-response": mq_consumer$$response,
+        "mq_http-consumer-response": mq_http$$consumer$$response,
+        "mq_producer": mq_producer,
+        "mq_queue": mq_queue,
+        "mq_queue-settings": mq_queue$$settings,
+        "mq_r2-producer": mq_r2$$producer,
+        "mq_worker-consumer-response": mq_worker$$consumer$$response,
+        "mq_worker-producer": mq_worker$$producer,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/r2/buckets/cors/outputs.ts b/src/generated/forge-mcp/r2/buckets/cors/outputs.ts
index fb5b505f4..ab6715d0f 100644
--- a/src/generated/forge-mcp/r2/buckets/cors/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/cors/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_cors-rule` in responses.
  */
-export const r2_cors_rule_output: JsonSchema = {
+export const r2_cors$$rule: JsonSchema = {
   "properties": {
     "allowed": {
       "properties": {
diff --git a/src/generated/forge-mcp/r2/buckets/cors/schemas.ts b/src/generated/forge-mcp/r2/buckets/cors/schemas.ts
index cd05afdf7..c3c3f0a52 100644
--- a/src/generated/forge-mcp/r2/buckets/cors/schemas.ts
+++ b/src/generated/forge-mcp/r2/buckets/cors/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_cors-rule`.
  */
-export const r2_cors_rule: JsonSchema = {
+export const r2_cors$$rule: JsonSchema = {
   "properties": {
     "allowed": {
       "description": "Object specifying allowed origins, methods and headers for this CORS rule.",
diff --git a/src/generated/forge-mcp/r2/buckets/cors/tools.ts b/src/generated/forge-mcp/r2/buckets/cors/tools.ts
index 89a7e78c6..c443ac003 100644
--- a/src/generated/forge-mcp/r2/buckets/cors/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/cors/tools.ts
@@ -1,16 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../../schemas.js";
-import { r2_cors_rule_output } from "./outputs.js";
-import { r2_cors_rule } from "./schemas.js";
+import { r2_cors$$rule } from "./outputs.js";
+import { r2_cors$$rule as r2_cors$$rule$ } from "./schemas.js";
 
 /**
  * The tools of `r2.buckets.cors`.
@@ -19,46 +18,58 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_cors_delete",
     title: "Delete Bucket CORS Policy",
-    description: "Delete the CORS policy for a bucket.\n\nConfirm with the user before calling this tool. This removes the R2 bucket's CORS policy. Browser requests that depend on these cross-origin permissions may fail.",
+    description: "Delete the CORS policy for a bucket.\n\nConfirm with the user before calling this tool. This removes the R2 bucket's CORS policy. Browser requests that depend on these cross-origin permissions may fail.\n\nDELETE /accounts/{account_id}/r2/buckets/{bucket_name}/cors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -80,55 +91,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/cors`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_cors_get",
     title: "Get Bucket CORS Policy",
-    description: "Get the CORS policy for a bucket.",
+    description: "Get the CORS policy for a bucket.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/cors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -153,10 +176,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_cors-rule": r2_cors_rule_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_cors-rule": r2_cors$$rule,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -198,31 +221,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_cors-rule": r2_cors_rule_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_cors-rule": r2_cors$$rule,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/cors`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_cors_update",
     title: "Set Bucket CORS Policy",
-    description: "Replaces the Cross-Origin Resource Sharing (CORS) rules for an R2 bucket. Rules specify which origins, methods, and headers are allowed for browser requests to objects in the bucket.\n\nConfirm with the user before calling this tool. This replaces the R2 bucket's CORS policy. Browser requests that relied on the previous rules may fail.",
+    description: "Replaces the Cross-Origin Resource Sharing (CORS) rules for an R2 bucket. Rules specify which origins, methods, and headers are allowed for browser requests to objects in the bucket.\n\nConfirm with the user before calling this tool. This replaces the R2 bucket's CORS policy. Browser requests that relied on the previous rules may fail.\n\nPUT /accounts/{account_id}/r2/buckets/{bucket_name}/cors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "properties": {
             "rules": {
@@ -234,40 +253,58 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_cors-rule": r2_cors_rule,
+        "r2_cors-rule": r2_cors$$rule$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -289,16 +326,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/cors`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/r2/buckets/domains/custom/outputs.ts b/src/generated/forge-mcp/r2/buckets/domains/custom/outputs.ts
index da2805b29..fff577cda 100644
--- a/src/generated/forge-mcp/r2/buckets/domains/custom/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/domains/custom/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `r2_add_custom_domain_response` in responses.
  */
-export const r2_add_custom_domain_response_output: JsonSchema = {
+export const r2_add_custom_domain_response: JsonSchema = {
   "properties": {
     "ciphers": {
       "items": {
@@ -44,7 +44,7 @@ export const r2_add_custom_domain_response_output: JsonSchema = {
 /**
  * The schema of `r2_edit_custom_domain_response` in responses.
  */
-export const r2_edit_custom_domain_response_output: JsonSchema = {
+export const r2_edit_custom_domain_response: JsonSchema = {
   "properties": {
     "ciphers": {
       "items": {
@@ -77,7 +77,7 @@ export const r2_edit_custom_domain_response_output: JsonSchema = {
 /**
  * The schema of `r2_get_custom_domain_response` in responses.
  */
-export const r2_get_custom_domain_response_output: JsonSchema = {
+export const r2_get_custom_domain_response: JsonSchema = {
   "properties": {
     "ciphers": {
       "items": {
@@ -149,7 +149,7 @@ export const r2_get_custom_domain_response_output: JsonSchema = {
 /**
  * The schema of `r2_list_custom_domains_response` in responses.
  */
-export const r2_list_custom_domains_response_output: JsonSchema = {
+export const r2_list_custom_domains_response: JsonSchema = {
   "properties": {
     "domains": {
       "items": {
@@ -232,7 +232,7 @@ export const r2_list_custom_domains_response_output: JsonSchema = {
 /**
  * The schema of `r2_remove_custom_domain_response` in responses.
  */
-export const r2_remove_custom_domain_response_output: JsonSchema = {
+export const r2_remove_custom_domain_response: JsonSchema = {
   "properties": {
     "domain": {
       "type": "string"
diff --git a/src/generated/forge-mcp/r2/buckets/domains/custom/schemas.ts b/src/generated/forge-mcp/r2/buckets/domains/custom/schemas.ts
index d54fe82d9..893f03a43 100644
--- a/src/generated/forge-mcp/r2/buckets/domains/custom/schemas.ts
+++ b/src/generated/forge-mcp/r2/buckets/domains/custom/schemas.ts
@@ -46,14 +46,6 @@ export const r2_add_custom_domain_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `r2_domain_name`.
- */
-export const r2_domain_name: JsonSchema = {
-  "description": "Name of the custom domain.",
-  "type": "string"
-};
-
 /**
  * The schema of `r2_edit_custom_domain_request`.
  */
diff --git a/src/generated/forge-mcp/r2/buckets/domains/custom/tools.ts b/src/generated/forge-mcp/r2/buckets/domains/custom/tools.ts
index 909574912..c74f1f282 100644
--- a/src/generated/forge-mcp/r2/buckets/domains/custom/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/domains/custom/tools.ts
@@ -1,24 +1,22 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../../../schemas.js";
 import {
-  r2_add_custom_domain_response_output,
-  r2_edit_custom_domain_response_output,
-  r2_get_custom_domain_response_output,
-  r2_list_custom_domains_response_output,
-  r2_remove_custom_domain_response_output,
+  r2_add_custom_domain_response,
+  r2_edit_custom_domain_response,
+  r2_get_custom_domain_response,
+  r2_list_custom_domains_response,
+  r2_remove_custom_domain_response,
 } from "./outputs.js";
 import {
   r2_add_custom_domain_request,
-  r2_domain_name,
   r2_edit_custom_domain_request,
 } from "./schemas.js";
 
@@ -29,43 +27,57 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_domains_custom_create",
     title: "Attach Custom Domain To Bucket",
-    description: "Register a new custom domain for an existing R2 bucket.",
+    description: "Register a new custom domain for an existing R2 bucket.\n\nPOST /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "$ref": "#/$defs/r2_add_custom_domain_request"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
         "r2_add_custom_domain_request": r2_add_custom_domain_request,
-        "r2_bucket_name": r2_bucket_name,
       },
     },
     outputSchema: {
@@ -83,10 +95,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_add_custom_domain_response": r2_add_custom_domain_response_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_add_custom_domain_response": r2_add_custom_domain_response,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -127,17 +139,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_add_custom_domain_response": r2_add_custom_domain_response_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_add_custom_domain_response": r2_add_custom_domain_response,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/domains/custom`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -145,45 +157,56 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_domains_custom_delete",
     title: "Remove Custom Domain From Bucket",
-    description: "Disconnects a custom domain from an R2 bucket and removes its configuration. Access through other enabled custom domains or the bucket's r2.dev domain is unaffected.\n\nConfirm with the user before calling this tool. This disconnects the custom domain from the R2 bucket. Access through other enabled domains remains available.",
+    description: "Disconnects a custom domain from an R2 bucket and removes its configuration. Access through other enabled custom domains or the bucket's r2.dev domain is unaffected.\n\nConfirm with the user before calling this tool. This disconnects the custom domain from the R2 bucket. Access through other enabled domains remains available.\n\nDELETE /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "domain": {
+              "description": "Name of the custom domain.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "domain"
           ],
-          "type": "string"
-        },
-        "domain": {
-          "$ref": "#/$defs/r2_domain_name",
-          "description": "Name of the custom domain."
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "domain"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_domain_name": r2_domain_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -200,10 +223,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_remove_custom_domain_response": r2_remove_custom_domain_response_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_remove_custom_domain_response": r2_remove_custom_domain_response,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -242,62 +265,73 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_remove_custom_domain_response": r2_remove_custom_domain_response_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_remove_custom_domain_response": r2_remove_custom_domain_response,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/domains/custom/${pathParam(args, "domain")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_domains_custom_get",
     title: "Get Custom Domain Settings",
-    description: "Get the configuration for a custom domain on an existing R2 bucket.",
+    description: "Get the configuration for a custom domain on an existing R2 bucket.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "domain": {
+              "description": "Name of the custom domain.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "domain"
           ],
-          "type": "string"
-        },
-        "domain": {
-          "$ref": "#/$defs/r2_domain_name",
-          "description": "Name of the custom domain."
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "domain"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_domain_name": r2_domain_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -314,10 +348,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_get_custom_domain_response": r2_get_custom_domain_response_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_get_custom_domain_response": r2_get_custom_domain_response,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -357,56 +391,68 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_get_custom_domain_response": r2_get_custom_domain_response_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_get_custom_domain_response": r2_get_custom_domain_response,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/domains/custom/${pathParam(args, "domain")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_domains_custom_list",
     title: "List Custom Domains of Bucket",
-    description: "Gets a list of all custom domains registered with an existing R2 bucket.",
+    description: "Gets a list of all custom domains registered with an existing R2 bucket.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -423,10 +469,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_list_custom_domains_response": r2_list_custom_domains_response_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_list_custom_domains_response": r2_list_custom_domains_response,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -467,65 +513,78 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_list_custom_domains_response": r2_list_custom_domains_response_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_list_custom_domains_response": r2_list_custom_domains_response,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/domains/custom`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_domains_custom_update",
     title: "Configure Custom Domain Settings",
-    description: "Edit the configuration for a custom domain on an existing R2 bucket.",
+    description: "Edit the configuration for a custom domain on an existing R2 bucket.\n\nPUT /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "$ref": "#/$defs/r2_edit_custom_domain_request"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "domain": {
+              "description": "Name of the custom domain.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "domain"
           ],
-          "type": "string"
-        },
-        "domain": {
-          "$ref": "#/$defs/r2_domain_name",
-          "description": "Name of the custom domain."
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "domain",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_domain_name": r2_domain_name,
         "r2_edit_custom_domain_request": r2_edit_custom_domain_request,
       },
     },
@@ -544,10 +603,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_edit_custom_domain_response": r2_edit_custom_domain_response_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_edit_custom_domain_response": r2_edit_custom_domain_response,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -588,17 +647,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_edit_custom_domain_response": r2_edit_custom_domain_response_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_edit_custom_domain_response": r2_edit_custom_domain_response,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/domains/custom/${pathParam(args, "domain")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/r2/buckets/domains/managed/outputs.ts b/src/generated/forge-mcp/r2/buckets/domains/managed/outputs.ts
index b4a875974..b3c58d7d4 100644
--- a/src/generated/forge-mcp/r2/buckets/domains/managed/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/domains/managed/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `r2_managed_domain_response` in responses.
  */
-export const r2_managed_domain_response_output: JsonSchema = {
+export const r2_managed_domain_response: JsonSchema = {
   "properties": {
     "bucketId": {
       "type": "string"
diff --git a/src/generated/forge-mcp/r2/buckets/domains/managed/tools.ts b/src/generated/forge-mcp/r2/buckets/domains/managed/tools.ts
index 01f1e3d8b..06c49c8e8 100644
--- a/src/generated/forge-mcp/r2/buckets/domains/managed/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/domains/managed/tools.ts
@@ -1,15 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../../../schemas.js";
-import { r2_managed_domain_response_output } from "./outputs.js";
+import { r2_managed_domain_response } from "./outputs.js";
 import { r2_edit_managed_domain_request } from "./schemas.js";
 
 /**
@@ -19,39 +18,51 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_domains_managed_list",
     title: "Get r2.dev Domain of Bucket",
-    description: "Gets the R2 bucket's managed r2.dev domain and whether public access is enabled. The r2.dev domain is rate-limited and intended for development use.",
+    description: "Gets the R2 bucket's managed r2.dev domain and whether public access is enabled. The r2.dev domain is rate-limited and intended for development use.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -68,10 +79,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_managed_domain_response": r2_managed_domain_response_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_managed_domain_response": r2_managed_domain_response,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -112,59 +123,73 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_managed_domain_response": r2_managed_domain_response_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_managed_domain_response": r2_managed_domain_response,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/domains/managed`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_domains_managed_update",
     title: "Update r2.dev Domain of Bucket",
-    description: "Enables or disables public access to the R2 bucket through its managed r2.dev domain. Custom domain access is unaffected. The r2.dev domain is rate-limited and intended for development use.\n\nConfirm with the user before calling this tool. This changes public access to the R2 bucket through its r2.dev domain.",
+    description: "Enables or disables public access to the R2 bucket through its managed r2.dev domain. Custom domain access is unaffected. The r2.dev domain is rate-limited and intended for development use.\n\nConfirm with the user before calling this tool. This changes public access to the R2 bucket through its r2.dev domain.\n\nPUT /accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "$ref": "#/$defs/r2_edit_managed_domain_request"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
         "r2_edit_managed_domain_request": r2_edit_managed_domain_request,
       },
     },
@@ -183,10 +208,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_managed_domain_response": r2_managed_domain_response_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_managed_domain_response": r2_managed_domain_response,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -227,17 +252,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_managed_domain_response": r2_managed_domain_response_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_managed_domain_response": r2_managed_domain_response,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/domains/managed`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/r2/buckets/eventNotifications/outputs.ts b/src/generated/forge-mcp/r2/buckets/eventNotifications/outputs.ts
index c5c839b8a..8b3230bbc 100644
--- a/src/generated/forge-mcp/r2/buckets/eventNotifications/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/eventNotifications/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_bucket-config` in responses.
  */
-export const r2_bucket_config_output: JsonSchema = {
+export const r2_bucket$$config: JsonSchema = {
   "properties": {
     "bucketName": {
       "type": "string"
@@ -24,7 +24,7 @@ export const r2_bucket_config_output: JsonSchema = {
 /**
  * The schema of `r2_queues-config` in responses.
  */
-export const r2_queues_config_output: JsonSchema = {
+export const r2_queues$$config: JsonSchema = {
   "properties": {
     "queueId": {
       "type": "string"
@@ -60,28 +60,21 @@ export const r2_queues_config_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `r2_r2-action` in responses.
- */
-export const r2_r2_action_output: JsonSchema = {
-  "enum": [
-    "PutObject",
-    "CopyObject",
-    "DeleteObject",
-    "CompleteMultipartUpload",
-    "LifecycleDeletion"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `r2_rule` in responses.
  */
-export const r2_rule_output: JsonSchema = {
+export const r2_rule: JsonSchema = {
   "properties": {
     "actions": {
       "items": {
-        "$ref": "#/$defs/r2_r2-action"
+        "enum": [
+          "PutObject",
+          "CopyObject",
+          "DeleteObject",
+          "CompleteMultipartUpload",
+          "LifecycleDeletion"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
diff --git a/src/generated/forge-mcp/r2/buckets/eventNotifications/schemas.ts b/src/generated/forge-mcp/r2/buckets/eventNotifications/schemas.ts
index 67405a990..c67aa00ba 100644
--- a/src/generated/forge-mcp/r2/buckets/eventNotifications/schemas.ts
+++ b/src/generated/forge-mcp/r2/buckets/eventNotifications/schemas.ts
@@ -3,28 +3,6 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `r2_queue_identifier`.
- */
-export const r2_queue_identifier: JsonSchema = {
-  "description": "ID of the Cloudflare Queue that receives notifications for matching R2 object events.",
-  "type": "string"
-};
-
-/**
- * The schema of `r2_r2-action`.
- */
-export const r2_r2_action: JsonSchema = {
-  "enum": [
-    "PutObject",
-    "CopyObject",
-    "DeleteObject",
-    "CompleteMultipartUpload",
-    "LifecycleDeletion"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `r2_rule`.
  */
@@ -33,7 +11,14 @@ export const r2_rule: JsonSchema = {
     "actions": {
       "description": "Array of R2 object actions that will trigger notifications.",
       "items": {
-        "$ref": "#/$defs/r2_r2-action"
+        "enum": [
+          "PutObject",
+          "CopyObject",
+          "DeleteObject",
+          "CompleteMultipartUpload",
+          "LifecycleDeletion"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
diff --git a/src/generated/forge-mcp/r2/buckets/eventNotifications/tools.ts b/src/generated/forge-mcp/r2/buckets/eventNotifications/tools.ts
index b638f38d0..3b0fb07d3 100644
--- a/src/generated/forge-mcp/r2/buckets/eventNotifications/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/eventNotifications/tools.ts
@@ -1,37 +1,27 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../../schemas.js";
-import {
-  r2_bucket_config_output,
-  r2_queues_config_output,
-  r2_r2_action_output,
-  r2_rule_output,
-} from "./outputs.js";
-import { r2_queue_identifier, r2_r2_action, r2_rule } from "./schemas.js";
+import { r2_bucket$$config, r2_queues$$config, r2_rule } from "./outputs.js";
+import { r2_rule as r2_rule$ } from "./schemas.js";
 
 /**
- * The tools of `r2.buckets.event_notifications`.
+ * The tools of `r2.buckets.eventNotifications`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "r2_buckets_event_notifications_delete",
+    name: "r2_buckets_eventNotifications_delete",
     title: "Delete Event Notification Rules",
-    description: "Deletes the specified event notification rules for an R2 bucket and Cloudflare Queue. Provide ruleIds in the request body to select rules. If no body is provided, all rules for that bucket and queue are deleted.\n\nConfirm with the user before calling this tool. This deletes event notification rules for the selected R2 bucket and queue. Without a request body, all rules for that bucket and queue are deleted.",
+    description: "Deletes the specified event notification rules for an R2 bucket and Cloudflare Queue. Provide ruleIds in the request body to select rules. If no body is provided, all rules for that bucket and queue are deleted.\n\nConfirm with the user before calling this tool. This deletes event notification rules for the selected R2 bucket and queue. Without a request body, all rules for that bucket and queue are deleted.\n\nDELETE /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "properties": {
             "ruleIds": {
@@ -44,44 +34,59 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "ID of the Cloudflare Queue that receives notifications for matching R2 object events.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "queue_id"
           ],
-          "type": "string"
-        },
-        "queue_id": {
-          "$ref": "#/$defs/r2_queue_identifier",
-          "description": "ID of the Cloudflare Queue that receives notifications for matching R2 object events."
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_queue_identifier": r2_queue_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -108,62 +113,73 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/event_notifications/r2/${pathParam(args, "bucket_name")}/configuration/queues/${pathParam(args, "queue_id")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "r2_buckets_event_notifications_get",
+    name: "r2_buckets_eventNotifications_get",
     title: "Get Event Notification Rules for a Queue",
-    description: "Gets the event notification rules for the specified R2 bucket and Cloudflare Queue. The response includes the queue's configuration and its array of rules.",
+    description: "Gets the event notification rules for the specified R2 bucket and Cloudflare Queue. The response includes the queue's configuration and its array of rules.\n\nGET /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "ID of the Cloudflare Queue that receives notifications for matching R2 object events.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "queue_id"
           ],
-          "type": "string"
-        },
-        "queue_id": {
-          "$ref": "#/$defs/r2_queue_identifier",
-          "description": "ID of the Cloudflare Queue that receives notifications for matching R2 object events."
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "queue_id"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_queue_identifier": r2_queue_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -180,12 +196,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_queues-config": r2_queues_config_output,
-        "r2_r2-action": r2_r2_action_output,
-        "r2_rule": r2_rule_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_queues-config": r2_queues$$config,
+        "r2_rule": r2_rule,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -228,58 +243,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_queues-config": r2_queues_config_output,
-        "r2_r2-action": r2_r2_action_output,
-        "r2_rule": r2_rule_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_queues-config": r2_queues$$config,
+        "r2_rule": r2_rule,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/event_notifications/r2/${pathParam(args, "bucket_name")}/configuration/queues/${pathParam(args, "queue_id")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
-    name: "r2_buckets_event_notifications_list",
+    name: "r2_buckets_eventNotifications_list",
     title: "List Event Notification Rules",
-    description: "Lists event notification rules for an R2 bucket, grouped by the Cloudflare Queue that receives matching object events.",
+    description: "Lists event notification rules for an R2 bucket, grouped by the Cloudflare Queue that receives matching object events.\n\nGET /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -296,13 +322,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_bucket-config": r2_bucket_config_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_queues-config": r2_queues_config_output,
-        "r2_r2-action": r2_r2_action_output,
-        "r2_rule": r2_rule_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_bucket-config": r2_bucket$$config,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_queues-config": r2_queues$$config,
+        "r2_rule": r2_rule,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -345,34 +370,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_bucket-config": r2_bucket_config_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_queues-config": r2_queues_config_output,
-        "r2_r2-action": r2_r2_action_output,
-        "r2_rule": r2_rule_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_bucket-config": r2_bucket$$config,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_queues-config": r2_queues$$config,
+        "r2_rule": r2_rule,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/event_notifications/r2/${pathParam(args, "bucket_name")}/configuration`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
-    name: "r2_buckets_event_notifications_update",
+    name: "r2_buckets_eventNotifications_update",
     title: "Create Event Notification Rules",
-    description: "Creates rules that send notifications for matching R2 object events to the specified Cloudflare Queue. Rules can filter objects by key prefix and suffix. New rules are added to any existing rules for the queue; a rule that overlaps an existing rule is rejected.",
+    description: "Creates rules that send notifications for matching R2 object events to the specified Cloudflare Queue. Rules can filter objects by key prefix and suffix. New rules are added to any existing rules for the queue; a rule that overlaps an existing rule is rejected.\n\nPUT /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "properties": {
             "rules": {
@@ -389,47 +409,63 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "queue_id": {
+              "description": "ID of the Cloudflare Queue that receives notifications for matching R2 object events.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "queue_id"
           ],
-          "type": "string"
-        },
-        "queue_id": {
-          "$ref": "#/$defs/r2_queue_identifier",
-          "description": "ID of the Cloudflare Queue that receives notifications for matching R2 object events."
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "queue_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_queue_identifier": r2_queue_identifier,
-        "r2_r2-action": r2_r2_action,
-        "r2_rule": r2_rule,
+        "r2_rule": r2_rule$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -456,16 +492,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/event_notifications/r2/${pathParam(args, "bucket_name")}/configuration/queues/${pathParam(args, "queue_id")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/r2/buckets/jobs/outputs.ts b/src/generated/forge-mcp/r2/buckets/jobs/outputs.ts
index 8349206bf..27eb73d90 100644
--- a/src/generated/forge-mcp/r2/buckets/jobs/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/jobs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_r2_bucket_job` in responses.
  */
-export const r2_r2_bucket_job_output: JsonSchema = {
+export const r2_r2_bucket_job: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/r2_prefix_delete_job"
@@ -20,7 +20,7 @@ export const r2_r2_bucket_job_output: JsonSchema = {
 /**
  * The schema of `r2_r2_bucket_jobs_result` in responses.
  */
-export const r2_r2_bucket_jobs_result_output: JsonSchema = {
+export const r2_r2_bucket_jobs_result: JsonSchema = {
   "properties": {
     "jobs": {
       "items": {
@@ -41,7 +41,7 @@ export const r2_r2_bucket_jobs_result_output: JsonSchema = {
 /**
  * The schema of `r2_storage_class_migration_job` in responses.
  */
-export const r2_storage_class_migration_job_output: JsonSchema = {
+export const r2_storage_class_migration_job: JsonSchema = {
   "properties": {
     "endTime": {
       "format": "date-time",
@@ -61,7 +61,14 @@ export const r2_storage_class_migration_job_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/r2_r2_bucket_job_status"
+      "enum": [
+        "ENQUEUED",
+        "RUNNING",
+        "COMPLETED",
+        "FAILED",
+        "CANCELLED"
+      ],
+      "type": "string"
     },
     "storageClassMigration": {
       "properties": {
diff --git a/src/generated/forge-mcp/r2/buckets/jobs/schemas.ts b/src/generated/forge-mcp/r2/buckets/jobs/schemas.ts
index 62d82054b..2400c6837 100644
--- a/src/generated/forge-mcp/r2/buckets/jobs/schemas.ts
+++ b/src/generated/forge-mcp/r2/buckets/jobs/schemas.ts
@@ -16,7 +16,7 @@ export const r2_create_prefix_delete_job_request: JsonSchema = {
       "type": "string"
     },
     "prefix": {
-      "description": "Prefix matched against object keys. A non-empty value must end in `/`.\nAn empty string empties the entire bucket.\n",
+      "description": "Prefix matched against object keys. A non-empty value must end in `/`.\nAn empty string empties the entire bucket.",
       "type": "string"
     }
   },
diff --git a/src/generated/forge-mcp/r2/buckets/jobs/tools.ts b/src/generated/forge-mcp/r2/buckets/jobs/tools.ts
index 6cac70c8d..99ecac734 100644
--- a/src/generated/forge-mcp/r2/buckets/jobs/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/jobs/tools.ts
@@ -1,24 +1,18 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_prefix_delete_job_output,
-  r2_r2_bucket_job_status_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_prefix_delete_job,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../outputs.js";
 import {
-  r2_account_identifier,
-  r2_bucket_name,
-  r2_r2_bucket_job_status,
-} from "../../schemas.js";
-import {
-  r2_r2_bucket_job_output,
-  r2_r2_bucket_jobs_result_output,
-  r2_storage_class_migration_job_output,
+  r2_r2_bucket_job,
+  r2_r2_bucket_jobs_result,
+  r2_storage_class_migration_job,
 } from "./outputs.js";
 import {
   r2_create_prefix_delete_job_request,
@@ -32,14 +26,10 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_jobs_create",
     title: "Create Bucket Job",
-    description: "Creates a background job for an R2 bucket. The `jobType` field selects the job:\n\n- **`prefixDelete`**: deletes every object whose key begins with `prefix`. A non-empty\n  prefix must end in `/`. An empty prefix (`\"\"`) empties the entire bucket.\n- **`storageClassMigration`**: migrates every object in the bucket between storage\n  classes. `sourceStorageClass` and `destinationStorageClass` must be provided together\n  and must differ; omitting both migrates from `InfrequentAccess` to `Standard`.\n\nPoll the returned `id` with the Get Bucket Job endpoint. Small prefix-delete jobs can\nfinish synchronously and return `COMPLETED`. Objects uploaded after a background job\nstarts are not affected by that job.\n\nFor prefix-delete jobs: abort active multipart uploads before submitting the request,\nsince a synchronously completed job does not abort them, and avoid writing objects or\nstarting multipart uploads while a bucket-emptying job is in progress. Each request\ncreates a distinct job, and the number of active prefix-delete jobs is limited per\nbucket; wait for an existing job to finish before retrying a request rejected with\nHTTP 429. A bucket cannot be emptied while event notifications are configured (HTTP 409\n/ error code 10083). To protect a bucket with R2 Data Catalog enabled, send the\n`cf-r2-data-catalog-check` header; a conflict is returned with HTTP 409 / error code\n10081.\n\nPrefix-delete jobs require permission to delete objects; storage-class migration jobs\nrequire permission to write to the bucket.\n\nConfirm with the user before calling this tool. This starts a background job that either permanently deletes every object under the given prefix (every object in the bucket for an empty prefix) or migrates every object in the bucket between storage classes.",
+    description: "Creates a background job for an R2 bucket. The `jobType` field selects the job:\n\n- **`prefixDelete`**: deletes every object whose key begins with `prefix`. A non-empty\n  prefix must end in `/`. An empty prefix (`\"\"`) empties the entire bucket.\n- **`storageClassMigration`**: migrates every object in the bucket between storage\n  classes. `sourceStorageClass` and `destinationStorageClass` must be provided together\n  and must differ; omitting both migrates from `InfrequentAccess` to `Standard`.\n\nPoll the returned `id` with the Get Bucket Job endpoint. Small prefix-delete jobs can\nfinish synchronously and return `COMPLETED`. Objects uploaded after a background job\nstarts are not affected by that job.\n\nFor prefix-delete jobs: abort active multipart uploads before submitting the request,\nsince a synchronously completed job does not abort them, and avoid writing objects or\nstarting multipart uploads while a bucket-emptying job is in progress. Each request\ncreates a distinct job, and the number of active prefix-delete jobs is limited per\nbucket; wait for an existing job to finish before retrying a request rejected with\nHTTP 429. A bucket cannot be emptied while event notifications are configured (HTTP 409\n/ error code 10083). To protect a bucket with R2 Data Catalog enabled, send the\n`cf-r2-data-catalog-check` header; a conflict is returned with HTTP 409 / error code\n10081.\n\nPrefix-delete jobs require permission to delete objects; storage-class migration jobs\nrequire permission to write to the bucket.\n\nConfirm with the user before calling this tool. This starts a background job that either permanently deletes every object under the given prefix (every object in the bucket for an empty prefix) or migrates every object in the bucket between storage classes.\n\nPOST /accounts/{account_id}/r2/buckets/{bucket_name}/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "oneOf": [
             {
@@ -50,35 +40,53 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
-        },
-        "cf_r2_data_catalog_check": {
-          "description": "For prefix-delete jobs, set this header to reject the request when R2 Data Catalog is enabled for the bucket.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-data-catalog-check": {
+              "description": "For prefix-delete jobs, set this header to reject the request when R2 Data Catalog is enabled for the bucket.",
+              "type": "string"
+            },
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
         "r2_create_prefix_delete_job_request": r2_create_prefix_delete_job_request,
         "r2_create_storage_class_migration_job_request": r2_create_storage_class_migration_job_request,
       },
@@ -98,13 +106,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_prefix_delete_job": r2_prefix_delete_job_output,
-        "r2_r2_bucket_job": r2_r2_bucket_job_output,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status_output,
-        "r2_storage_class_migration_job": r2_storage_class_migration_job_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_prefix_delete_job": r2_prefix_delete_job,
+        "r2_r2_bucket_job": r2_r2_bucket_job,
+        "r2_storage_class_migration_job": r2_storage_class_migration_job,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -149,21 +156,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_prefix_delete_job": r2_prefix_delete_job_output,
-        "r2_r2_bucket_job": r2_r2_bucket_job_output,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status_output,
-        "r2_storage_class_migration_job": r2_storage_class_migration_job_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_prefix_delete_job": r2_prefix_delete_job,
+        "r2_r2_bucket_job": r2_r2_bucket_job,
+        "r2_storage_class_migration_job": r2_storage_class_migration_job,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/jobs`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
-        ["cf-r2-data-catalog-check", args["cf_r2_data_catalog_check"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
+        ["cf-r2-data-catalog-check", param(args, "headers", "cf-r2-data-catalog-check")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -171,44 +177,56 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_jobs_get",
     title: "Get Bucket Job",
-    description: "Gets the current status of a background job of any type for an R2 bucket. Poll this\nendpoint with the job identifier returned by Create Bucket Job until the status is\n`COMPLETED`, `FAILED`, or `CANCELLED`.",
+    description: "Gets the current status of a background job of any type for an R2 bucket. Poll this\nendpoint with the job identifier returned by Create Bucket Job until the status is\n`COMPLETED`, `FAILED`, or `CANCELLED`.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/jobs/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "job_id": {
+              "description": "Identifier returned when the background job was submitted.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "job_id"
           ],
-          "type": "string"
-        },
-        "job_id": {
-          "description": "Identifier returned when the background job was submitted.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "job_id"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -225,13 +243,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_prefix_delete_job": r2_prefix_delete_job_output,
-        "r2_r2_bucket_job": r2_r2_bucket_job_output,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status_output,
-        "r2_storage_class_migration_job": r2_storage_class_migration_job_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_prefix_delete_job": r2_prefix_delete_job,
+        "r2_r2_bucket_job": r2_r2_bucket_job,
+        "r2_storage_class_migration_job": r2_storage_class_migration_job,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -272,80 +289,103 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_prefix_delete_job": r2_prefix_delete_job_output,
-        "r2_r2_bucket_job": r2_r2_bucket_job_output,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status_output,
-        "r2_storage_class_migration_job": r2_storage_class_migration_job_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_prefix_delete_job": r2_prefix_delete_job,
+        "r2_r2_bucket_job": r2_r2_bucket_job,
+        "r2_storage_class_migration_job": r2_storage_class_migration_job,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/jobs/${pathParam(args, "job_id")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_jobs_list",
     title: "List Bucket Jobs",
-    description: "Lists background jobs for an R2 bucket, including prefix-delete (and bucket-emptying)\njobs and storage-class migration jobs. Jobs of every type are returned unless `jobType`\nis provided.",
+    description: "Lists background jobs for an R2 bucket, including prefix-delete (and bucket-emptying)\njobs and storage-class migration jobs. Jobs of every type are returned unless `jobType`\nis provided.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
-        },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
-          ],
-          "type": "string"
-        },
-        "continuation_token": {
-          "description": "Pagination token received as `nextContinuationToken` in the previous response.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "job_type": {
-          "description": "Restricts results to jobs of the specified type.",
-          "enum": [
-            "prefixDelete",
-            "storageClassMigration"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
-        },
-        "max_keys": {
-          "description": "Maximum number of jobs to return.",
-          "type": "integer"
+          "type": "object"
         },
-        "status": {
-          "$ref": "#/$defs/r2_r2_bucket_job_status",
-          "description": "Restricts results to jobs with the specified status. `jobType` is required when this parameter is provided."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continuationToken": {
+              "description": "Pagination token received as `nextContinuationToken` in the previous response.",
+              "type": "string"
+            },
+            "jobType": {
+              "description": "Restricts results to jobs of the specified type.",
+              "enum": [
+                "prefixDelete",
+                "storageClassMigration"
+              ],
+              "type": "string"
+            },
+            "maxKeys": {
+              "description": "Maximum number of jobs to return.",
+              "type": "integer"
+            },
+            "status": {
+              "description": "Restricts results to jobs with the specified status. `jobType` is required when this parameter is provided.",
+              "enum": [
+                "ENQUEUED",
+                "RUNNING",
+                "COMPLETED",
+                "FAILED",
+                "CANCELLED"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -362,14 +402,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_prefix_delete_job": r2_prefix_delete_job_output,
-        "r2_r2_bucket_job": r2_r2_bucket_job_output,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status_output,
-        "r2_r2_bucket_jobs_result": r2_r2_bucket_jobs_result_output,
-        "r2_storage_class_migration_job": r2_storage_class_migration_job_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_prefix_delete_job": r2_prefix_delete_job,
+        "r2_r2_bucket_job": r2_r2_bucket_job,
+        "r2_r2_bucket_jobs_result": r2_r2_bucket_jobs_result,
+        "r2_storage_class_migration_job": r2_storage_class_migration_job,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -410,27 +449,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_prefix_delete_job": r2_prefix_delete_job_output,
-        "r2_r2_bucket_job": r2_r2_bucket_job_output,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status_output,
-        "r2_r2_bucket_jobs_result": r2_r2_bucket_jobs_result_output,
-        "r2_storage_class_migration_job": r2_storage_class_migration_job_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_prefix_delete_job": r2_prefix_delete_job,
+        "r2_r2_bucket_job": r2_r2_bucket_job,
+        "r2_r2_bucket_jobs_result": r2_r2_bucket_jobs_result,
+        "r2_storage_class_migration_job": r2_storage_class_migration_job,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/jobs`,
       query: [
-        ["jobType", args["job_type"], true],
-        ["status", args["status"], true],
-        ["maxKeys", args["max_keys"], true],
-        ["continuationToken", args["continuation_token"], true],
+        ["jobType", param(args, "query", "jobType"), true],
+        ["status", param(args, "query", "status"), true],
+        ["maxKeys", param(args, "query", "maxKeys"), true],
+        ["continuationToken", param(args, "query", "continuationToken"), true],
       ],
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/r2/buckets/lifecycle/outputs.ts b/src/generated/forge-mcp/r2/buckets/lifecycle/outputs.ts
index 7c17b2fd6..632141b2b 100644
--- a/src/generated/forge-mcp/r2/buckets/lifecycle/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/lifecycle/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_lifecycle-age-condition` in responses.
  */
-export const r2_lifecycle_age_condition_output: JsonSchema = {
+export const r2_lifecycle$$age$$condition: JsonSchema = {
   "properties": {
     "maxAge": {
       "type": "integer"
@@ -28,7 +28,7 @@ export const r2_lifecycle_age_condition_output: JsonSchema = {
 /**
  * The schema of `r2_lifecycle-config` in responses.
  */
-export const r2_lifecycle_config_output: JsonSchema = {
+export const r2_lifecycle$$config: JsonSchema = {
   "properties": {
     "rules": {
       "items": {
@@ -43,7 +43,7 @@ export const r2_lifecycle_config_output: JsonSchema = {
 /**
  * The schema of `r2_lifecycle-date-condition` in responses.
  */
-export const r2_lifecycle_date_condition_output: JsonSchema = {
+export const r2_lifecycle$$date$$condition: JsonSchema = {
   "properties": {
     "date": {
       "format": "date-time",
@@ -66,7 +66,7 @@ export const r2_lifecycle_date_condition_output: JsonSchema = {
 /**
  * The schema of `r2_lifecycle-rule` in responses.
  */
-export const r2_lifecycle_rule_output: JsonSchema = {
+export const r2_lifecycle$$rule: JsonSchema = {
   "properties": {
     "abortMultipartUploadsTransition": {
       "properties": {
@@ -126,7 +126,7 @@ export const r2_lifecycle_rule_output: JsonSchema = {
 /**
  * The schema of `r2_lifecycle-storage-transition` in responses.
  */
-export const r2_lifecycle_storage_transition_output: JsonSchema = {
+export const r2_lifecycle$$storage$$transition: JsonSchema = {
   "properties": {
     "condition": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/r2/buckets/lifecycle/schemas.ts b/src/generated/forge-mcp/r2/buckets/lifecycle/schemas.ts
index 8cb6d140a..76d930a5b 100644
--- a/src/generated/forge-mcp/r2/buckets/lifecycle/schemas.ts
+++ b/src/generated/forge-mcp/r2/buckets/lifecycle/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_lifecycle-age-condition`.
  */
-export const r2_lifecycle_age_condition: JsonSchema = {
+export const r2_lifecycle$$age$$condition: JsonSchema = {
   "description": "Condition for lifecycle transitions to apply after an object reaches an age in seconds.",
   "properties": {
     "maxAge": {
@@ -29,7 +29,7 @@ export const r2_lifecycle_age_condition: JsonSchema = {
 /**
  * The schema of `r2_lifecycle-date-condition`.
  */
-export const r2_lifecycle_date_condition: JsonSchema = {
+export const r2_lifecycle$$date$$condition: JsonSchema = {
   "description": "Condition for lifecycle transitions to apply on a specific date.",
   "properties": {
     "date": {
@@ -53,7 +53,7 @@ export const r2_lifecycle_date_condition: JsonSchema = {
 /**
  * The schema of `r2_lifecycle-rule`.
  */
-export const r2_lifecycle_rule: JsonSchema = {
+export const r2_lifecycle$$rule: JsonSchema = {
   "properties": {
     "abortMultipartUploadsTransition": {
       "description": "Transition to abort ongoing multipart uploads.",
@@ -120,7 +120,7 @@ export const r2_lifecycle_rule: JsonSchema = {
 /**
  * The schema of `r2_lifecycle-storage-transition`.
  */
-export const r2_lifecycle_storage_transition: JsonSchema = {
+export const r2_lifecycle$$storage$$transition: JsonSchema = {
   "properties": {
     "condition": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/r2/buckets/lifecycle/tools.ts b/src/generated/forge-mcp/r2/buckets/lifecycle/tools.ts
index e8215134a..0f5e4b2b2 100644
--- a/src/generated/forge-mcp/r2/buckets/lifecycle/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/lifecycle/tools.ts
@@ -1,26 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../../schemas.js";
 import {
-  r2_lifecycle_age_condition_output,
-  r2_lifecycle_config_output,
-  r2_lifecycle_date_condition_output,
-  r2_lifecycle_rule_output,
-  r2_lifecycle_storage_transition_output,
+  r2_lifecycle$$age$$condition,
+  r2_lifecycle$$config,
+  r2_lifecycle$$date$$condition,
+  r2_lifecycle$$rule,
+  r2_lifecycle$$storage$$transition,
 } from "./outputs.js";
 import {
-  r2_lifecycle_age_condition,
-  r2_lifecycle_date_condition,
-  r2_lifecycle_rule,
-  r2_lifecycle_storage_transition,
+  r2_lifecycle$$age$$condition as r2_lifecycle$$age$$condition$,
+  r2_lifecycle$$date$$condition as r2_lifecycle$$date$$condition$,
+  r2_lifecycle$$rule as r2_lifecycle$$rule$,
+  r2_lifecycle$$storage$$transition as r2_lifecycle$$storage$$transition$,
 } from "./schemas.js";
 
 /**
@@ -30,39 +29,51 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_lifecycle_get",
     title: "Get Object Lifecycle Rules",
-    description: "Get object lifecycle rules for a bucket.",
+    description: "Get object lifecycle rules for a bucket.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -79,14 +90,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_lifecycle-age-condition": r2_lifecycle_age_condition_output,
-        "r2_lifecycle-config": r2_lifecycle_config_output,
-        "r2_lifecycle-date-condition": r2_lifecycle_date_condition_output,
-        "r2_lifecycle-rule": r2_lifecycle_rule_output,
-        "r2_lifecycle-storage-transition": r2_lifecycle_storage_transition_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_lifecycle-age-condition": r2_lifecycle$$age$$condition,
+        "r2_lifecycle-config": r2_lifecycle$$config,
+        "r2_lifecycle-date-condition": r2_lifecycle$$date$$condition,
+        "r2_lifecycle-rule": r2_lifecycle$$rule,
+        "r2_lifecycle-storage-transition": r2_lifecycle$$storage$$transition,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -120,35 +131,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_lifecycle-age-condition": r2_lifecycle_age_condition_output,
-        "r2_lifecycle-config": r2_lifecycle_config_output,
-        "r2_lifecycle-date-condition": r2_lifecycle_date_condition_output,
-        "r2_lifecycle-rule": r2_lifecycle_rule_output,
-        "r2_lifecycle-storage-transition": r2_lifecycle_storage_transition_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_lifecycle-age-condition": r2_lifecycle$$age$$condition,
+        "r2_lifecycle-config": r2_lifecycle$$config,
+        "r2_lifecycle-date-condition": r2_lifecycle$$date$$condition,
+        "r2_lifecycle-rule": r2_lifecycle$$rule,
+        "r2_lifecycle-storage-transition": r2_lifecycle$$storage$$transition,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/lifecycle`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_lifecycle_update",
     title: "Set Object Lifecycle Rules",
-    description: "Replaces the object lifecycle rules for an R2 bucket. Rules match object-key prefixes and can expire objects, abort incomplete multipart uploads, or transition objects to Infrequent Access storage.\n\nConfirm with the user before calling this tool. This replaces the R2 bucket's object lifecycle rules and can schedule object deletion or abort multipart uploads.",
+    description: "Replaces the object lifecycle rules for an R2 bucket. Rules match object-key prefixes and can expire objects, abort incomplete multipart uploads, or transition objects to Infrequent Access storage.\n\nConfirm with the user before calling this tool. This replaces the R2 bucket's object lifecycle rules and can schedule object deletion or abort multipart uploads.\n\nPUT /accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "properties": {
             "rules": {
@@ -160,43 +167,61 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_lifecycle-age-condition": r2_lifecycle_age_condition,
-        "r2_lifecycle-date-condition": r2_lifecycle_date_condition,
-        "r2_lifecycle-rule": r2_lifecycle_rule,
-        "r2_lifecycle-storage-transition": r2_lifecycle_storage_transition,
+        "r2_lifecycle-age-condition": r2_lifecycle$$age$$condition$,
+        "r2_lifecycle-date-condition": r2_lifecycle$$date$$condition$,
+        "r2_lifecycle-rule": r2_lifecycle$$rule$,
+        "r2_lifecycle-storage-transition": r2_lifecycle$$storage$$transition$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -218,16 +243,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/lifecycle`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/r2/buckets/localUploads/outputs.ts b/src/generated/forge-mcp/r2/buckets/localUploads/outputs.ts
index c1a61d16f..1b0931d25 100644
--- a/src/generated/forge-mcp/r2/buckets/localUploads/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/localUploads/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_local_uploads_configuration` in responses.
  */
-export const r2_local_uploads_configuration_output: JsonSchema = {
+export const r2_local_uploads_configuration: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/r2/buckets/localUploads/tools.ts b/src/generated/forge-mcp/r2/buckets/localUploads/tools.ts
index a21f5f13a..06a20fa02 100644
--- a/src/generated/forge-mcp/r2/buckets/localUploads/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/localUploads/tools.ts
@@ -3,42 +3,47 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../../schemas.js";
-import { r2_local_uploads_configuration_output } from "./outputs.js";
+import { r2_local_uploads_configuration } from "./outputs.js";
 
 /**
- * The tools of `r2.buckets.local_uploads`.
+ * The tools of `r2.buckets.localUploads`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "r2_buckets_local_uploads_get",
+    name: "r2_buckets_localUploads_get",
     title: "Get Local Uploads Configuration",
-    description: "Gets the Local Uploads configuration for an R2 bucket. When enabled, object data is written near the client before being asynchronously copied to the bucket's primary region. Local Uploads is only supported in the default jurisdiction.\n\nThis method is beta.",
+    description: "Gets the Local Uploads configuration for an R2 bucket. When enabled, object data is written near the client before being asynchronously copied to the bucket's primary region. Local Uploads is only supported in the default jurisdiction.\n\nThis method is beta.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/local-uploads",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -55,10 +60,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_local_uploads_configuration": r2_local_uploads_configuration_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_local_uploads_configuration": r2_local_uploads_configuration,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -99,11 +104,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_local_uploads_configuration": r2_local_uploads_configuration_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_local_uploads_configuration": r2_local_uploads_configuration,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
@@ -111,16 +116,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_buckets_local_uploads_update",
+    name: "r2_buckets_localUploads_update",
     title: "Set Local Uploads Configuration",
-    description: "Enables or disables Local Uploads for an R2 bucket in the default jurisdiction. When enabled, object data is written near the client before being asynchronously copied to the bucket's primary region. Disabling Local Uploads allows existing replication to finish.\n\nThis method is beta.",
+    description: "Enables or disables Local Uploads for an R2 bucket in the default jurisdiction. When enabled, object data is written near the client before being asynchronously copied to the bucket's primary region. Disabling Local Uploads allows existing replication to finish.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/r2/buckets/{bucket_name}/local-uploads",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "properties": {
             "enabled": {
@@ -133,27 +134,37 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -182,10 +193,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/r2/buckets/locks/outputs.ts b/src/generated/forge-mcp/r2/buckets/locks/outputs.ts
index bcb28d4b2..8a6ad9e8a 100644
--- a/src/generated/forge-mcp/r2/buckets/locks/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/locks/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_bucket-lock-rule` in responses.
  */
-export const r2_bucket_lock_rule_output: JsonSchema = {
+export const r2_bucket$$lock$$rule: JsonSchema = {
   "properties": {
     "condition": {
       "oneOf": [
@@ -42,7 +42,7 @@ export const r2_bucket_lock_rule_output: JsonSchema = {
 /**
  * The schema of `r2_bucket-lock-rule-config` in responses.
  */
-export const r2_bucket_lock_rule_config_output: JsonSchema = {
+export const r2_bucket$$lock$$rule$$config: JsonSchema = {
   "properties": {
     "rules": {
       "items": {
@@ -57,7 +57,7 @@ export const r2_bucket_lock_rule_config_output: JsonSchema = {
 /**
  * The schema of `r2_lock-rule-age-condition` in responses.
  */
-export const r2_lock_rule_age_condition_output: JsonSchema = {
+export const r2_lock$$rule$$age$$condition: JsonSchema = {
   "properties": {
     "maxAgeSeconds": {
       "type": "integer"
@@ -79,7 +79,7 @@ export const r2_lock_rule_age_condition_output: JsonSchema = {
 /**
  * The schema of `r2_lock-rule-date-condition` in responses.
  */
-export const r2_lock_rule_date_condition_output: JsonSchema = {
+export const r2_lock$$rule$$date$$condition: JsonSchema = {
   "properties": {
     "date": {
       "format": "date-time",
@@ -102,7 +102,7 @@ export const r2_lock_rule_date_condition_output: JsonSchema = {
 /**
  * The schema of `r2_lock-rule-indefinite-condition` in responses.
  */
-export const r2_lock_rule_indefinite_condition_output: JsonSchema = {
+export const r2_lock$$rule$$indefinite$$condition: JsonSchema = {
   "properties": {
     "type": {
       "enum": [
diff --git a/src/generated/forge-mcp/r2/buckets/locks/schemas.ts b/src/generated/forge-mcp/r2/buckets/locks/schemas.ts
index 71dbaca27..ae38e4c42 100644
--- a/src/generated/forge-mcp/r2/buckets/locks/schemas.ts
+++ b/src/generated/forge-mcp/r2/buckets/locks/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_bucket-lock-rule`.
  */
-export const r2_bucket_lock_rule: JsonSchema = {
+export const r2_bucket$$lock$$rule: JsonSchema = {
   "properties": {
     "condition": {
       "oneOf": [
@@ -45,7 +45,7 @@ export const r2_bucket_lock_rule: JsonSchema = {
 /**
  * The schema of `r2_lock-rule-age-condition`.
  */
-export const r2_lock_rule_age_condition: JsonSchema = {
+export const r2_lock$$rule$$age$$condition: JsonSchema = {
   "description": "Condition to apply a lock rule to an object for how long in seconds.",
   "properties": {
     "maxAgeSeconds": {
@@ -68,7 +68,7 @@ export const r2_lock_rule_age_condition: JsonSchema = {
 /**
  * The schema of `r2_lock-rule-date-condition`.
  */
-export const r2_lock_rule_date_condition: JsonSchema = {
+export const r2_lock$$rule$$date$$condition: JsonSchema = {
   "description": "Condition to apply a lock rule to an object until a specific date.",
   "properties": {
     "date": {
@@ -92,7 +92,7 @@ export const r2_lock_rule_date_condition: JsonSchema = {
 /**
  * The schema of `r2_lock-rule-indefinite-condition`.
  */
-export const r2_lock_rule_indefinite_condition: JsonSchema = {
+export const r2_lock$$rule$$indefinite$$condition: JsonSchema = {
   "description": "Condition to apply a lock rule indefinitely.",
   "properties": {
     "type": {
diff --git a/src/generated/forge-mcp/r2/buckets/locks/tools.ts b/src/generated/forge-mcp/r2/buckets/locks/tools.ts
index 0f7129f4a..1d9ffaf71 100644
--- a/src/generated/forge-mcp/r2/buckets/locks/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/locks/tools.ts
@@ -1,26 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../../schemas.js";
 import {
-  r2_bucket_lock_rule_config_output,
-  r2_bucket_lock_rule_output,
-  r2_lock_rule_age_condition_output,
-  r2_lock_rule_date_condition_output,
-  r2_lock_rule_indefinite_condition_output,
+  r2_bucket$$lock$$rule,
+  r2_bucket$$lock$$rule$$config,
+  r2_lock$$rule$$age$$condition,
+  r2_lock$$rule$$date$$condition,
+  r2_lock$$rule$$indefinite$$condition,
 } from "./outputs.js";
 import {
-  r2_bucket_lock_rule,
-  r2_lock_rule_age_condition,
-  r2_lock_rule_date_condition,
-  r2_lock_rule_indefinite_condition,
+  r2_bucket$$lock$$rule as r2_bucket$$lock$$rule$,
+  r2_lock$$rule$$age$$condition as r2_lock$$rule$$age$$condition$,
+  r2_lock$$rule$$date$$condition as r2_lock$$rule$$date$$condition$,
+  r2_lock$$rule$$indefinite$$condition as r2_lock$$rule$$indefinite$$condition$,
 } from "./schemas.js";
 
 /**
@@ -30,46 +29,58 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_locks_delete",
     title: "Delete Bucket Lock Rules",
-    description: "Delete all lock rules for a bucket.\n\nConfirm with the user before calling this tool. This removes all lock rules from the R2 bucket, removing their protection against object deletion and overwriting.",
+    description: "Delete all lock rules for a bucket.\n\nConfirm with the user before calling this tool. This removes all lock rules from the R2 bucket, removing their protection against object deletion and overwriting.\n\nDELETE /accounts/{account_id}/r2/buckets/{bucket_name}/lock",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -91,55 +102,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/lock`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_locks_get",
     title: "Get Bucket Lock Rules",
-    description: "Get lock rules for a bucket.",
+    description: "Get lock rules for a bucket.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/lock",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -156,14 +179,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_bucket-lock-rule": r2_bucket_lock_rule_output,
-        "r2_bucket-lock-rule-config": r2_bucket_lock_rule_config_output,
-        "r2_errors": r2_errors_output,
-        "r2_lock-rule-age-condition": r2_lock_rule_age_condition_output,
-        "r2_lock-rule-date-condition": r2_lock_rule_date_condition_output,
-        "r2_lock-rule-indefinite-condition": r2_lock_rule_indefinite_condition_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_bucket-lock-rule": r2_bucket$$lock$$rule,
+        "r2_bucket-lock-rule-config": r2_bucket$$lock$$rule$$config,
+        "r2_errors": r2_errors,
+        "r2_lock-rule-age-condition": r2_lock$$rule$$age$$condition,
+        "r2_lock-rule-date-condition": r2_lock$$rule$$date$$condition,
+        "r2_lock-rule-indefinite-condition": r2_lock$$rule$$indefinite$$condition,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -197,35 +220,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_bucket-lock-rule": r2_bucket_lock_rule_output,
-        "r2_bucket-lock-rule-config": r2_bucket_lock_rule_config_output,
-        "r2_errors": r2_errors_output,
-        "r2_lock-rule-age-condition": r2_lock_rule_age_condition_output,
-        "r2_lock-rule-date-condition": r2_lock_rule_date_condition_output,
-        "r2_lock-rule-indefinite-condition": r2_lock_rule_indefinite_condition_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_bucket-lock-rule": r2_bucket$$lock$$rule,
+        "r2_bucket-lock-rule-config": r2_bucket$$lock$$rule$$config,
+        "r2_errors": r2_errors,
+        "r2_lock-rule-age-condition": r2_lock$$rule$$age$$condition,
+        "r2_lock-rule-date-condition": r2_lock$$rule$$date$$condition,
+        "r2_lock-rule-indefinite-condition": r2_lock$$rule$$indefinite$$condition,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/lock`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_locks_update",
     title: "Set Bucket Lock Rules",
-    description: "Replaces the lock rules for an R2 bucket. Enabled rules prevent matching objects from being overwritten or deleted for a duration, until a date, or indefinitely. Rules apply to existing and newly uploaded objects.\n\nConfirm with the user before calling this tool. This replaces the R2 bucket's lock rules. Removing or shortening retention can allow objects to be overwritten or deleted.",
+    description: "Replaces the lock rules for an R2 bucket. Enabled rules prevent matching objects from being overwritten or deleted for a duration, until a date, or indefinitely. Rules apply to existing and newly uploaded objects.\n\nConfirm with the user before calling this tool. This replaces the R2 bucket's lock rules. Removing or shortening retention can allow objects to be overwritten or deleted.\n\nPUT /accounts/{account_id}/r2/buckets/{bucket_name}/lock",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "properties": {
             "rules": {
@@ -237,43 +256,61 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket-lock-rule": r2_bucket_lock_rule,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_lock-rule-age-condition": r2_lock_rule_age_condition,
-        "r2_lock-rule-date-condition": r2_lock_rule_date_condition,
-        "r2_lock-rule-indefinite-condition": r2_lock_rule_indefinite_condition,
+        "r2_bucket-lock-rule": r2_bucket$$lock$$rule$,
+        "r2_lock-rule-age-condition": r2_lock$$rule$$age$$condition$,
+        "r2_lock-rule-date-condition": r2_lock$$rule$$date$$condition$,
+        "r2_lock-rule-indefinite-condition": r2_lock$$rule$$indefinite$$condition$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -295,16 +332,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/lock`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/r2/buckets/metrics/outputs.ts b/src/generated/forge-mcp/r2/buckets/metrics/outputs.ts
index 284cfbea9..d20fba014 100644
--- a/src/generated/forge-mcp/r2/buckets/metrics/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/metrics/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_account_level_metrics` in responses.
  */
-export const r2_account_level_metrics_output: JsonSchema = {
+export const r2_account_level_metrics: JsonSchema = {
   "properties": {
     "infrequentAccess": {
       "$ref": "#/$defs/r2_class_based_metrics"
@@ -21,7 +21,7 @@ export const r2_account_level_metrics_output: JsonSchema = {
 /**
  * The schema of `r2_class_based_metrics` in responses.
  */
-export const r2_class_based_metrics_output: JsonSchema = {
+export const r2_class_based_metrics: JsonSchema = {
   "properties": {
     "published": {
       "$ref": "#/$defs/r2_object_size_metrics"
@@ -36,7 +36,7 @@ export const r2_class_based_metrics_output: JsonSchema = {
 /**
  * The schema of `r2_object_size_metrics` in responses.
  */
-export const r2_object_size_metrics_output: JsonSchema = {
+export const r2_object_size_metrics: JsonSchema = {
   "properties": {
     "metadataSize": {
       "type": "number"
diff --git a/src/generated/forge-mcp/r2/buckets/metrics/tools.ts b/src/generated/forge-mcp/r2/buckets/metrics/tools.ts
index 1c6efaee6..4c4a2c832 100644
--- a/src/generated/forge-mcp/r2/buckets/metrics/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/metrics/tools.ts
@@ -3,16 +3,15 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../outputs.js";
-import { r2_account_identifier } from "../../schemas.js";
 import {
-  r2_account_level_metrics_output,
-  r2_class_based_metrics_output,
-  r2_object_size_metrics_output,
+  r2_account_level_metrics,
+  r2_class_based_metrics,
+  r2_object_size_metrics,
 } from "./outputs.js";
 
 /**
@@ -22,21 +21,28 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_metrics_list",
     title: "Get Account-Level Metrics",
-    description: "Get Storage/Object Count Metrics across all buckets in your account. Note that Account-Level Metrics may not immediately reflect the latest data.",
+    description: "Get Storage/Object Count Metrics across all buckets in your account. Note that Account-Level Metrics may not immediately reflect the latest data.\n\nGET /accounts/{account_id}/r2/metrics",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -53,12 +59,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_account_level_metrics": r2_account_level_metrics_output,
-        "r2_class_based_metrics": r2_class_based_metrics_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_object_size_metrics": r2_object_size_metrics_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_account_level_metrics": r2_account_level_metrics,
+        "r2_class_based_metrics": r2_class_based_metrics,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_object_size_metrics": r2_object_size_metrics,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -95,13 +101,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_account_level_metrics": r2_account_level_metrics_output,
-        "r2_class_based_metrics": r2_class_based_metrics_output,
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_object_size_metrics": r2_object_size_metrics_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_account_level_metrics": r2_account_level_metrics,
+        "r2_class_based_metrics": r2_class_based_metrics,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_object_size_metrics": r2_object_size_metrics,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/r2/buckets/outputs.ts b/src/generated/forge-mcp/r2/buckets/outputs.ts
index 8e817a0dc..9dfb253ce 100644
--- a/src/generated/forge-mcp/r2/buckets/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/outputs.ts
@@ -6,60 +6,50 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `r2_bucket` in responses.
  */
-export const r2_bucket_output: JsonSchema = {
+export const r2_bucket: JsonSchema = {
   "properties": {
     "creation_date": {
       "type": "string"
     },
     "jurisdiction": {
-      "$ref": "#/$defs/r2_jurisdiction"
+      "enum": [
+        "default",
+        "eu",
+        "us",
+        "fedramp",
+        "fedramp-high"
+      ],
+      "type": "string"
     },
     "location": {
-      "$ref": "#/$defs/r2_bucket_location"
+      "enum": [
+        "apac",
+        "eeur",
+        "enam",
+        "weur",
+        "wnam",
+        "oc"
+      ],
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/r2_bucket_name"
+      "type": "string"
     },
     "storage_class": {
-      "$ref": "#/$defs/r2_storage_class"
+      "enum": [
+        "Standard",
+        "InfrequentAccess"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `r2_bucket_location` in responses.
- */
-export const r2_bucket_location_output: JsonSchema = {
-  "enum": [
-    "apac",
-    "eeur",
-    "enam",
-    "weur",
-    "wnam",
-    "oc"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `r2_jurisdiction` in responses.
- */
-export const r2_jurisdiction_output: JsonSchema = {
-  "enum": [
-    "default",
-    "eu",
-    "us",
-    "fedramp",
-    "fedramp-high"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `r2_result_info` in responses.
  */
-export const r2_result_info_output: JsonSchema = {
+export const r2_result_info: JsonSchema = {
   "properties": {
     "cursor": {
       "type": "string"
@@ -80,7 +70,7 @@ export const r2_result_info_output: JsonSchema = {
 /**
  * The schema of `r2_v4_response_list` in responses.
  */
-export const r2_v4_response_list_output: JsonSchema = {
+export const r2_v4_response_list: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/r2_v4_response"
diff --git a/src/generated/forge-mcp/r2/buckets/schemas.ts b/src/generated/forge-mcp/r2/buckets/schemas.ts
deleted file mode 100644
index 783fffbba..000000000
--- a/src/generated/forge-mcp/r2/buckets/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `r2_bucket_location`.
- */
-export const r2_bucket_location: JsonSchema = {
-  "description": "Location of the bucket.",
-  "enum": [
-    "apac",
-    "eeur",
-    "enam",
-    "weur",
-    "wnam",
-    "oc"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/r2/buckets/sippy/outputs.ts b/src/generated/forge-mcp/r2/buckets/sippy/outputs.ts
index af8be45a2..2715ddc6c 100644
--- a/src/generated/forge-mcp/r2/buckets/sippy/outputs.ts
+++ b/src/generated/forge-mcp/r2/buckets/sippy/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2_sippy` in responses.
  */
-export const r2_sippy_output: JsonSchema = {
+export const r2_sippy: JsonSchema = {
   "properties": {
     "destination": {
       "properties": {
diff --git a/src/generated/forge-mcp/r2/buckets/sippy/schemas.ts b/src/generated/forge-mcp/r2/buckets/sippy/schemas.ts
index b9d3e0eff..56a3cd46d 100644
--- a/src/generated/forge-mcp/r2/buckets/sippy/schemas.ts
+++ b/src/generated/forge-mcp/r2/buckets/sippy/schemas.ts
@@ -12,7 +12,7 @@ export const r2_enable_sippy_aws: JsonSchema = {
       "description": "R2 bucket to copy objects to.",
       "properties": {
         "accessKeyId": {
-          "description": "ID of a Cloudflare API token.\nThis is the value labelled \"Access Key ID\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.\n",
+          "description": "ID of a Cloudflare API token.\nThis is the value labelled \"Access Key ID\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.",
           "type": "string"
         },
         "provider": {
@@ -22,7 +22,7 @@ export const r2_enable_sippy_aws: JsonSchema = {
           "type": "string"
         },
         "secretAccessKey": {
-          "description": "Value of a Cloudflare API token.\nThis is the value labelled \"Secret Access Key\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.\n",
+          "description": "Value of a Cloudflare API token.\nThis is the value labelled \"Secret Access Key\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.",
           "type": "string"
         }
       },
@@ -69,7 +69,7 @@ export const r2_enable_sippy_azure: JsonSchema = {
       "description": "R2 bucket to copy objects to.",
       "properties": {
         "accessKeyId": {
-          "description": "ID of a Cloudflare API token.\nThis is the value labelled \"Access Key ID\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.\n",
+          "description": "ID of a Cloudflare API token.\nThis is the value labelled \"Access Key ID\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.",
           "type": "string"
         },
         "provider": {
@@ -79,7 +79,7 @@ export const r2_enable_sippy_azure: JsonSchema = {
           "type": "string"
         },
         "secretAccessKey": {
-          "description": "Value of a Cloudflare API token.\nThis is the value labelled \"Secret Access Key\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.\n",
+          "description": "Value of a Cloudflare API token.\nThis is the value labelled \"Secret Access Key\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.",
           "type": "string"
         }
       },
@@ -126,7 +126,7 @@ export const r2_enable_sippy_gcs: JsonSchema = {
       "description": "R2 bucket to copy objects to.",
       "properties": {
         "accessKeyId": {
-          "description": "ID of a Cloudflare API token.\nThis is the value labelled \"Access Key ID\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.\n",
+          "description": "ID of a Cloudflare API token.\nThis is the value labelled \"Access Key ID\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.",
           "type": "string"
         },
         "provider": {
@@ -136,7 +136,7 @@ export const r2_enable_sippy_gcs: JsonSchema = {
           "type": "string"
         },
         "secretAccessKey": {
-          "description": "Value of a Cloudflare API token.\nThis is the value labelled \"Secret Access Key\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.\n",
+          "description": "Value of a Cloudflare API token.\nThis is the value labelled \"Secret Access Key\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.",
           "type": "string"
         }
       },
@@ -179,7 +179,7 @@ export const r2_enable_sippy_s3: JsonSchema = {
       "description": "R2 bucket to copy objects to.",
       "properties": {
         "accessKeyId": {
-          "description": "ID of a Cloudflare API token.\nThis is the value labelled \"Access Key ID\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.\n",
+          "description": "ID of a Cloudflare API token.\nThis is the value labelled \"Access Key ID\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.",
           "type": "string"
         },
         "provider": {
@@ -189,7 +189,7 @@ export const r2_enable_sippy_s3: JsonSchema = {
           "type": "string"
         },
         "secretAccessKey": {
-          "description": "Value of a Cloudflare API token.\nThis is the value labelled \"Secret Access Key\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.\n",
+          "description": "Value of a Cloudflare API token.\nThis is the value labelled \"Secret Access Key\" when creating an API.\ntoken from the [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).\n\nSippy will use this token when writing objects to R2, so it is\nbest to scope this token to the bucket you're enabling Sippy for.",
           "type": "string"
         }
       },
diff --git a/src/generated/forge-mcp/r2/buckets/sippy/tools.ts b/src/generated/forge-mcp/r2/buckets/sippy/tools.ts
index 62a5fdb8f..f1c71950e 100644
--- a/src/generated/forge-mcp/r2/buckets/sippy/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/sippy/tools.ts
@@ -1,15 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../../schemas.js";
-import { r2_sippy_output } from "./outputs.js";
+import { r2_sippy } from "./outputs.js";
 import {
   r2_enable_sippy_aws,
   r2_enable_sippy_azure,
@@ -24,39 +23,51 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_sippy_delete",
     title: "Disable Sippy",
-    description: "Disables Sippy on-demand migration for an R2 bucket. Requests no longer fetch missing objects from the source storage provider. Objects already copied to R2 remain in the bucket.\n\nConfirm with the user before calling this tool. This disables Sippy on-demand migration for the R2 bucket. Objects already copied to R2 remain in the bucket.",
+    description: "Disables Sippy on-demand migration for an R2 bucket. Requests no longer fetch missing objects from the source storage provider. Objects already copied to R2 remain in the bucket.\n\nConfirm with the user before calling this tool. This disables Sippy on-demand migration for the R2 bucket. Objects already copied to R2 remain in the bucket.\n\nDELETE /accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -81,9 +92,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -130,55 +141,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/sippy`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_sippy_get",
     title: "Get Sippy Configuration",
-    description: "Gets configuration for Sippy for an existing R2 bucket.",
+    description: "Gets configuration for Sippy for an existing R2 bucket.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -195,10 +218,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_sippy": r2_sippy_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_sippy": r2_sippy,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -239,31 +262,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_sippy": r2_sippy_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_sippy": r2_sippy,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/sippy`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_sippy_update",
     title: "Enable Sippy",
-    description: "Configures and enables Sippy on-demand migration for an R2 bucket. When a requested object is missing from R2, Sippy serves it from the configured source storage provider and copies it to R2.",
+    description: "Configures and enables Sippy on-demand migration for an R2 bucket. When a requested object is missing from R2, Sippy serves it from the configured source storage provider and copies it to R2.\n\nPUT /accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "oneOf": [
             {
@@ -280,31 +299,49 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
         "r2_enable_sippy_aws": r2_enable_sippy_aws,
         "r2_enable_sippy_azure": r2_enable_sippy_azure,
         "r2_enable_sippy_gcs": r2_enable_sippy_gcs,
@@ -326,10 +363,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_sippy": r2_sippy_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_sippy": r2_sippy,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -370,17 +407,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_sippy": r2_sippy_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_sippy": r2_sippy,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/sippy`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/r2/buckets/tools.ts b/src/generated/forge-mcp/r2/buckets/tools.ts
index b8e442fbb..ea6bb31e8 100644
--- a/src/generated/forge-mcp/r2/buckets/tools.ts
+++ b/src/generated/forge-mcp/r2/buckets/tools.ts
@@ -1,28 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  r2_bucket_name_output,
-  r2_errors_output,
-  r2_messages_output,
-  r2_storage_class_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../outputs.js";
-import {
-  r2_account_identifier,
-  r2_bucket_name,
-  r2_storage_class,
-} from "../schemas.js";
-import {
-  r2_bucket_location_output,
-  r2_bucket_output,
-  r2_jurisdiction_output,
-  r2_result_info_output,
-  r2_v4_response_list_output,
-} from "./outputs.js";
-import { r2_bucket_location } from "./schemas.js";
+import { r2_bucket, r2_result_info, r2_v4_response_list } from "./outputs.js";
 
 /**
  * The tools of `r2.buckets`.
@@ -31,28 +17,36 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_buckets_create",
     title: "Create Bucket",
-    description: "Creates an R2 bucket in the account and selected jurisdiction, with an optional location hint and default storage class.",
+    description: "Creates an R2 bucket in the account and selected jurisdiction, with an optional location hint and default storage class.\n\nPOST /accounts/{account_id}/r2/buckets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "properties": {
             "locationHint": {
-              "$ref": "#/$defs/r2_bucket_location",
-              "description": "Location of the bucket."
+              "description": "Location of the bucket.",
+              "enum": [
+                "apac",
+                "eeur",
+                "enam",
+                "weur",
+                "wnam",
+                "oc"
+              ],
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/r2_bucket_name",
-              "description": "Name of the bucket."
+              "description": "Name of the bucket.",
+              "type": "string"
             },
             "storageClass": {
-              "$ref": "#/$defs/r2_storage_class",
               "default": "Standard",
-              "description": "Storage class for newly uploaded objects, unless specified otherwise."
+              "description": "Storage class for newly uploaded objects, unless specified otherwise.",
+              "enum": [
+                "Standard",
+                "InfrequentAccess"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -60,29 +54,43 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_location": r2_bucket_location,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_storage_class": r2_storage_class,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -99,14 +107,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -145,65 +149,77 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "r2_buckets_create_by_name",
+    name: "r2_buckets_createByName",
     title: "Create Bucket (by name)",
-    description: "Creates a new R2 bucket using the name from the URL path. Similar to `r2-create-bucket` (POST), but the bucket name comes from the path and the optional storage class is supplied via the `cf-r2-storage-class` header. There is no request body. Unlike the POST variant, this endpoint does not accept a location hint — the bucket is placed in the R2 region for the caller's edge colo. Use the POST variant if you need to set a `locationHint`.",
+    description: "Creates a new R2 bucket using the name from the URL path. Similar to `r2-create-bucket` (POST), but the bucket name comes from the path and the optional storage class is supplied via the `cf-r2-storage-class` header. There is no request body. Unlike the POST variant, this endpoint does not accept a location hint — the bucket is placed in the R2 region for the caller's edge colo. Use the POST variant if you need to set a `locationHint`.\n\nPUT /accounts/{account_id}/r2/buckets/{bucket_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            },
+            "cf-r2-storage-class": {
+              "description": "Storage class for newly uploaded objects, unless specified otherwise.",
+              "enum": [
+                "Standard",
+                "InfrequentAccess"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
-        },
-        "cf_r2_storage_class": {
-          "$ref": "#/$defs/r2_storage_class"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_storage_class": r2_storage_class,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -220,14 +236,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -266,68 +278,76 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
-        ["cf-r2-storage-class", args["cf_r2_storage_class"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
+        ["cf-r2-storage-class", param(args, "headers", "cf-r2-storage-class")],
       ],
     }),
   },
   {
     name: "r2_buckets_delete",
     title: "Delete Bucket",
-    description: "Deletes an empty R2 bucket and its configuration. The bucket must have no objects, no in-progress multipart uploads, and no event notification rules; otherwise the request fails.\n\nConfirm with the user before calling this tool. This permanently deletes the empty R2 bucket and its configuration.",
+    description: "Deletes an empty R2 bucket and its configuration. The bucket must have no objects, no in-progress multipart uploads, and no event notification rules; otherwise the request fails.\n\nConfirm with the user before calling this tool. This permanently deletes the empty R2 bucket and its configuration.\n\nDELETE /accounts/{account_id}/r2/buckets/{bucket_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/r2_v4_response",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -354,60 +374,79 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_edit",
     title: "Patch Bucket",
-    description: "Changes the default storage class for newly uploaded objects in an existing R2 bucket. Existing objects retain their storage class, and individual uploads can override the bucket default.",
+    description: "Changes the default storage class for newly uploaded objects in an existing R2 bucket. Existing objects retain their storage class, and individual uploads can override the bucket default.\n\nPATCH /accounts/{account_id}/r2/buckets/{bucket_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
-        },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            },
+            "cf-r2-storage-class": {
+              "description": "Storage class for newly uploaded objects, unless specified otherwise.",
+              "enum": [
+                "Standard",
+                "InfrequentAccess"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "cf-r2-storage-class"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "cf_r2_storage_class": {
-          "$ref": "#/$defs/r2_storage_class"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "cf_r2_storage_class"
+        "path",
+        "headers"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-        "r2_storage_class": r2_storage_class,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -424,14 +463,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -472,61 +507,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
-        ["cf-r2-storage-class", args["cf_r2_storage_class"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
+        ["cf-r2-storage-class", param(args, "headers", "cf-r2-storage-class")],
       ],
     }),
   },
   {
     name: "r2_buckets_get",
     title: "Get Bucket",
-    description: "Gets properties of an existing R2 bucket.",
+    description: "Gets properties of an existing R2 bucket.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -543,14 +586,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -591,86 +630,101 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_buckets_list",
     title: "List Buckets",
-    description: "Lists a page of R2 buckets in the account and selected jurisdiction. Use the returned cursor to retrieve the next page.",
+    description: "Lists a page of R2 buckets in the account and selected jurisdiction. Use the returned cursor to retrieve the next page.\n\nGET /accounts/{account_id}/r2/buckets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
-          ],
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor received during the last List Buckets call. R2 buckets are paginated using cursors instead of page numbers.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to order buckets.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "name_contains": {
-          "description": "Bucket names to filter by. Only buckets with this phrase in their name will be returned.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "order": {
-          "description": "Field to order buckets by.",
-          "enum": [
-            "name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of buckets to return in a single call.",
-          "type": "number"
+          "type": "object"
         },
-        "start_after": {
-          "description": "Bucket name to start searching after. Buckets are ordered lexicographically.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor received during the last List Buckets call. R2 buckets are paginated using cursors instead of page numbers.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to order buckets.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name_contains": {
+              "description": "Bucket names to filter by. Only buckets with this phrase in their name will be returned.",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to order buckets by.",
+              "enum": [
+                "name"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of buckets to return in a single call.",
+              "type": "number"
+            },
+            "start_after": {
+              "description": "Bucket name to start searching after. Buckets are ordered lexicographically.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -698,16 +752,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_result_info": r2_result_info_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_list": r2_v4_response_list_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_result_info": r2_result_info,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_list": r2_v4_response_list,
       },
     },
     annotations: {
@@ -758,31 +808,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_bucket": r2_bucket_output,
-        "r2_bucket_location": r2_bucket_location_output,
-        "r2_bucket_name": r2_bucket_name_output,
-        "r2_errors": r2_errors_output,
-        "r2_jurisdiction": r2_jurisdiction_output,
-        "r2_messages": r2_messages_output,
-        "r2_result_info": r2_result_info_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
-        "r2_v4_response_list": r2_v4_response_list_output,
+        "r2_bucket": r2_bucket,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_result_info": r2_result_info,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
+        "r2_v4_response_list": r2_v4_response_list,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets`,
       query: [
-        ["name_contains", args["name_contains"], true],
-        ["start_after", args["start_after"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["cursor", args["cursor"], true],
+        ["name_contains", param(args, "query", "name_contains"), true],
+        ["start_after", param(args, "query", "start_after"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/r2/objects/outputs.ts b/src/generated/forge-mcp/r2/objects/outputs.ts
index f7ad42fe5..a2cf795c9 100644
--- a/src/generated/forge-mcp/r2/objects/outputs.ts
+++ b/src/generated/forge-mcp/r2/objects/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `r2_r2_delete_object_result` in responses.
  */
-export const r2_r2_delete_object_result_output: JsonSchema = {
+export const r2_r2_delete_object_result: JsonSchema = {
   "properties": {
     "key": {
       "type": "string"
@@ -18,7 +18,7 @@ export const r2_r2_delete_object_result_output: JsonSchema = {
 /**
  * The schema of `r2_r2_list_objects_result_info` in responses.
  */
-export const r2_r2_list_objects_result_info_output: JsonSchema = {
+export const r2_r2_list_objects_result_info: JsonSchema = {
   "properties": {
     "cursor": {
       "type": "string"
@@ -42,7 +42,7 @@ export const r2_r2_list_objects_result_info_output: JsonSchema = {
 /**
  * The schema of `r2_r2_object` in responses.
  */
-export const r2_r2_object_output: JsonSchema = {
+export const r2_r2_object: JsonSchema = {
   "properties": {
     "custom_metadata": {
       "additionalProperties": {
@@ -70,7 +70,11 @@ export const r2_r2_object_output: JsonSchema = {
       "type": "boolean"
     },
     "storage_class": {
-      "$ref": "#/$defs/r2_storage_class"
+      "enum": [
+        "Standard",
+        "InfrequentAccess"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -79,7 +83,7 @@ export const r2_r2_object_output: JsonSchema = {
 /**
  * The schema of `r2_r2_object_http_metadata` in responses.
  */
-export const r2_r2_object_http_metadata_output: JsonSchema = {
+export const r2_r2_object_http_metadata: JsonSchema = {
   "properties": {
     "cacheControl": {
       "type": "string"
diff --git a/src/generated/forge-mcp/r2/objects/tools.ts b/src/generated/forge-mcp/r2/objects/tools.ts
index 059305eeb..f49edb389 100644
--- a/src/generated/forge-mcp/r2/objects/tools.ts
+++ b/src/generated/forge-mcp/r2/objects/tools.ts
@@ -1,22 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_prefix_delete_job_output,
-  r2_r2_bucket_job_status_output,
-  r2_storage_class_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_prefix_delete_job,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../outputs.js";
-import { r2_account_identifier, r2_bucket_name } from "../schemas.js";
 import {
-  r2_r2_delete_object_result_output,
-  r2_r2_list_objects_result_info_output,
-  r2_r2_object_http_metadata_output,
-  r2_r2_object_output,
+  r2_r2_delete_object_result,
+  r2_r2_list_objects_result_info,
+  r2_r2_object,
+  r2_r2_object_http_metadata,
 } from "./outputs.js";
 
 /**
@@ -24,16 +21,12 @@ import {
  */
 export const tools: readonly Tool[] = [
   {
-    name: "r2_objects_bulk_delete",
+    name: "r2_objects_bulkDelete",
     title: "Delete Objects",
-    description: "Deletes the listed objects from an R2 bucket. Provide a JSON array of 1 to 1000 object\nkeys in the request body.\n\nIf any key cannot be deleted (for example, because it does not exist or is locked), the\nremaining keys are still deleted, but the response is HTTP 200 with `success: false`,\n`result: null` and one entry in `errors` per failed key. The entries in `errors` do not\nidentify which key failed.\n\nTo delete every object under a prefix, or to empty a bucket, create a `prefixDelete` job\nwith the Create Bucket Job endpoint instead. The `prefix` query parameter on this endpoint\nis deprecated; it creates the same job, but responses to it carry a `Deprecation` header\nand a message pointing to Create Bucket Job.\n\nFor most workloads, we recommend using R2's [S3-compatible API](https://developers.cloudflare.com/r2/api/s3/api/) or a [Worker with an R2 binding](https://developers.cloudflare.com/r2/api/workers/workers-api-reference/) instead.\n\nConfirm with the user before calling this tool. This permanently deletes the listed R2 objects. With the deprecated `prefix` parameter it deletes every object under that prefix, and an empty prefix empties the bucket.",
+    description: "Deletes the listed objects from an R2 bucket. Provide a JSON array of 1 to 1000 object\nkeys in the request body.\n\nIf any key cannot be deleted (for example, because it does not exist or is locked), the\nremaining keys are still deleted, but the response is HTTP 200 with `success: false`,\n`result: null` and one entry in `errors` per failed key. The entries in `errors` do not\nidentify which key failed.\n\nTo delete every object under a prefix, or to empty a bucket, create a `prefixDelete` job\nwith the Create Bucket Job endpoint instead. The `prefix` query parameter on this endpoint\nis deprecated; it creates the same job, but responses to it carry a `Deprecation` header\nand a message pointing to Create Bucket Job.\n\nFor most workloads, we recommend using R2's [S3-compatible API](https://developers.cloudflare.com/r2/api/s3/api/) or a [Worker with an R2 binding](https://developers.cloudflare.com/r2/api/workers/workers-api-reference/) instead.\n\nConfirm with the user before calling this tool. This permanently deletes the listed R2 objects. With the deprecated `prefix` parameter it deletes every object under that prefix, and an empty prefix empties the bucket.\n\nDELETE /accounts/{account_id}/r2/buckets/{bucket_name}/objects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "description": "A JSON array of 1 to 1000 object keys to delete. Required unless the deprecated `prefix` parameter is present.",
           "items": {
@@ -43,40 +36,62 @@ export const tools: readonly Tool[] = [
           "minItems": 1,
           "type": "array"
         },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
-        },
-        "cf_r2_data_catalog_check": {
-          "description": "Set this header to reject the operation when R2 Data Catalog is enabled for the bucket.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-data-catalog-check": {
+              "description": "Set this header to reject the operation when R2 Data Catalog is enabled for the bucket.",
+              "type": "string"
+            },
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "prefix": {
-          "deprecated": true,
-          "description": "Deprecated. Create a `prefixDelete` job with the Create Bucket Job endpoint instead.\nWhen present, the request body is ignored and a prefix-delete job is created for this\nprefix, exactly as Create Bucket Job does; an empty value empties the bucket. The\nresponse is the job descriptor, with a `Deprecation` header and a deprecation message\nin `messages`.\n",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "prefix": {
+              "deprecated": true,
+              "description": "Deprecated. Create a `prefixDelete` job with the Create Bucket Job endpoint instead.\nWhen present, the request body is ignored and a prefix-delete job is created for this\nprefix, exactly as Create Bucket Job does; an empty value empties the bucket. The\nresponse is the job descriptor, with a `Deprecation` header and a deprecation message\nin `messages`.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "oneOf": [
@@ -140,12 +155,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_prefix_delete_job": r2_prefix_delete_job_output,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status_output,
-        "r2_r2_delete_object_result": r2_r2_delete_object_result_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_prefix_delete_job": r2_prefix_delete_job,
+        "r2_r2_delete_object_result": r2_r2_delete_object_result,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     annotations: {
@@ -231,22 +245,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_prefix_delete_job": r2_prefix_delete_job_output,
-        "r2_r2_bucket_job_status": r2_r2_bucket_job_status_output,
-        "r2_r2_delete_object_result": r2_r2_delete_object_result_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_prefix_delete_job": r2_prefix_delete_job,
+        "r2_r2_delete_object_result": r2_r2_delete_object_result,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/objects`,
       query: [
-        ["prefix", args["prefix"], true],
+        ["prefix", param(args, "query", "prefix"), true],
       ],
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
-        ["cf-r2-data-catalog-check", args["cf_r2_data_catalog_check"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
+        ["cf-r2-data-catalog-check", param(args, "headers", "cf-r2-data-catalog-check")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -254,44 +267,56 @@ export const tools: readonly Tool[] = [
   {
     name: "r2_objects_delete",
     title: "Delete Object",
-    description: "Deletes an object from an R2 bucket.\n\nFor most workloads, we recommend using R2's [S3-compatible API](https://developers.cloudflare.com/r2/api/s3/api/) or a [Worker with an R2 binding](https://developers.cloudflare.com/r2/api/workers/workers-api-reference/) instead.\n\nConfirm with the user before calling this tool. This permanently deletes the specified object from the R2 bucket.",
+    description: "Deletes an object from an R2 bucket.\n\nFor most workloads, we recommend using R2's [S3-compatible API](https://developers.cloudflare.com/r2/api/s3/api/) or a [Worker with an R2 binding](https://developers.cloudflare.com/r2/api/workers/workers-api-reference/) instead.\n\nConfirm with the user before calling this tool. This permanently deletes the specified object from the R2 bucket.\n\nDELETE /accounts/{account_id}/r2/buckets/{bucket_name}/objects/{object_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "object_key": {
+              "description": "The key (name) of the object to delete. May contain slashes for path-like keys.\nSlashes (`/`) within the key MUST be sent literally and MUST NOT be percent-encoded\n(i.e. `%2F`); other reserved characters should be percent-encoded as usual.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "object_key"
           ],
-          "type": "string"
-        },
-        "object_key": {
-          "description": "The key (name) of the object to delete. May contain slashes for path-like keys.\nSlashes (`/`) within the key MUST be sent literally and MUST NOT be percent-encoded\n(i.e. `%2F`); other reserved characters should be percent-encoded as usual.\n",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "object_key"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -308,10 +333,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_r2_delete_object_result": r2_r2_delete_object_result_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_r2_delete_object_result": r2_r2_delete_object_result,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -350,69 +375,81 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_r2_delete_object_result": r2_r2_delete_object_result_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_r2_delete_object_result": r2_r2_delete_object_result,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/objects/${pathParam(args, "object_key")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
   {
     name: "r2_objects_get",
     title: "Get Object",
-    description: "Retrieves an object from an R2 bucket. Returns the object body along with metadata headers.\n\nFor most workloads, we recommend using R2's [S3-compatible API](https://developers.cloudflare.com/r2/api/s3/api/) or a [Worker with an R2 binding](https://developers.cloudflare.com/r2/api/workers/workers-api-reference/) instead.",
+    description: "Retrieves an object from an R2 bucket. Returns the object body along with metadata headers.\n\nFor most workloads, we recommend using R2's [S3-compatible API](https://developers.cloudflare.com/r2/api/s3/api/) or a [Worker with an R2 binding](https://developers.cloudflare.com/r2/api/workers/workers-api-reference/) instead.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/objects/{object_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "If-Modified-Since": {
+              "description": "Returns the object only if it has been modified since the specified time.\nMust be formatted as an HTTP-date (RFC 7231), e.g. `Tue, 15 Jan 2024 10:30:00 GMT`.",
+              "type": "string"
+            },
+            "If-None-Match": {
+              "description": "Returns the object only if its ETag does not match the given value.",
+              "type": "string"
+            },
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            },
+            "object_key": {
+              "description": "The key (name) of the object to retrieve. May contain slashes for path-like keys.\nSlashes (`/`) within the key MUST be sent literally and MUST NOT be percent-encoded\n(i.e. `%2F`); other reserved characters should be percent-encoded as usual.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name",
+            "object_key"
           ],
-          "type": "string"
-        },
-        "if_modified_since": {
-          "description": "Returns the object only if it has been modified since the specified time.\nMust be formatted as an HTTP-date (RFC 7231), e.g. `Tue, 15 Jan 2024 10:30:00 GMT`.\n",
-          "type": "string"
-        },
-        "if_none_match": {
-          "description": "Returns the object only if its ETag does not match the given value.",
-          "type": "string"
-        },
-        "object_key": {
-          "description": "The key (name) of the object to retrieve. May contain slashes for path-like keys.\nSlashes (`/`) within the key MUST be sent literally and MUST NOT be percent-encoded\n(i.e. `%2F`); other reserved characters should be percent-encoded as usual.\n",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name",
-        "object_key"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -439,77 +476,95 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/objects/${pathParam(args, "object_key")}`,
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
-        ["If-None-Match", args["if_none_match"]],
-        ["If-Modified-Since", args["if_modified_since"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
+        ["If-None-Match", param(args, "headers", "If-None-Match")],
+        ["If-Modified-Since", param(args, "headers", "If-Modified-Since")],
       ],
     }),
   },
   {
     name: "r2_objects_list",
     title: "List Objects",
-    description: "Lists objects in an R2 bucket. Returns object metadata including key, size, etag, last modified date, HTTP metadata, and custom metadata.\n\nFor most workloads, we recommend using R2's [S3-compatible API](https://developers.cloudflare.com/r2/api/s3/api/) or a [Worker with an R2 binding](https://developers.cloudflare.com/r2/api/workers/workers-api-reference/) instead.",
+    description: "Lists objects in an R2 bucket. Returns object metadata including key, size, etag, last modified date, HTTP metadata, and custom metadata.\n\nFor most workloads, we recommend using R2's [S3-compatible API](https://developers.cloudflare.com/r2/api/s3/api/) or a [Worker with an R2 binding](https://developers.cloudflare.com/r2/api/workers/workers-api-reference/) instead.\n\nGET /accounts/{account_id}/r2/buckets/{bucket_name}/objects",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
-        "bucket_name": {
-          "$ref": "#/$defs/r2_bucket_name",
-          "description": "Name of the bucket."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "cf-r2-jurisdiction": {
+              "default": "default",
+              "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp",
+                "fedramp-high"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "cf_r2_jurisdiction": {
-          "default": "default",
-          "description": "Jurisdiction where objects in this bucket are guaranteed to be stored.",
-          "enum": [
-            "default",
-            "eu",
-            "us",
-            "fedramp",
-            "fedramp-high"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            },
+            "bucket_name": {
+              "description": "Name of the bucket.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "bucket_name"
           ],
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor received from a previous List Objects call. Used to retrieve the next page of results.",
-          "type": "string"
-        },
-        "delimiter": {
-          "description": "A single character used to group keys. All keys that contain the delimiter between the prefix and the first occurrence of the delimiter after the prefix are grouped under a single result element.",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of objects to return per page.",
-          "type": "integer"
-        },
-        "prefix": {
-          "description": "Restricts results to only those objects whose keys begin with the specified prefix.",
-          "type": "string"
+          "type": "object"
         },
-        "start_after": {
-          "description": "Returns objects with keys that come after the specified key in lexicographic order.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor received from a previous List Objects call. Used to retrieve the next page of results.",
+              "type": "string"
+            },
+            "delimiter": {
+              "description": "A single character used to group keys. All keys that contain the delimiter between the prefix and the first occurrence of the delimiter after the prefix are grouped under a single result element.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of objects to return per page.",
+              "type": "integer"
+            },
+            "prefix": {
+              "description": "Restricts results to only those objects whose keys begin with the specified prefix.",
+              "type": "string"
+            },
+            "start_after": {
+              "description": "Returns objects with keys that come after the specified key in lexicographic order.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "bucket_name"
+        "path"
       ],
-      $defs: {
-        "r2_account_identifier": r2_account_identifier,
-        "r2_bucket_name": r2_bucket_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -543,12 +598,11 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_r2_list_objects_result_info": r2_r2_list_objects_result_info_output,
-        "r2_r2_object": r2_r2_object_output,
-        "r2_r2_object_http_metadata": r2_r2_object_http_metadata_output,
-        "r2_storage_class": r2_storage_class_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_r2_list_objects_result_info": r2_r2_list_objects_result_info,
+        "r2_r2_object": r2_r2_object,
+        "r2_r2_object_http_metadata": r2_r2_object_http_metadata,
       },
     },
     annotations: {
@@ -606,26 +660,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_r2_list_objects_result_info": r2_r2_list_objects_result_info_output,
-        "r2_r2_object": r2_r2_object_output,
-        "r2_r2_object_http_metadata": r2_r2_object_http_metadata_output,
-        "r2_storage_class": r2_storage_class_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_r2_list_objects_result_info": r2_r2_list_objects_result_info,
+        "r2_r2_object": r2_r2_object,
+        "r2_r2_object_http_metadata": r2_r2_object_http_metadata,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/r2/buckets/${pathParam(args, "bucket_name")}/objects`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["prefix", args["prefix"], true],
-        ["delimiter", args["delimiter"], true],
-        ["cursor", args["cursor"], true],
-        ["start_after", args["start_after"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["delimiter", param(args, "query", "delimiter"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["start_after", param(args, "query", "start_after"), true],
       ],
       headers: [
-        ["cf-r2-jurisdiction", args["cf_r2_jurisdiction"]],
+        ["cf-r2-jurisdiction", param(args, "headers", "cf-r2-jurisdiction")],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/r2/outputs.ts b/src/generated/forge-mcp/r2/outputs.ts
index 8750fbe13..b48bae10c 100644
--- a/src/generated/forge-mcp/r2/outputs.ts
+++ b/src/generated/forge-mcp/r2/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `r2_bucket_name` in responses.
- */
-export const r2_bucket_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `r2_errors` in responses.
  */
-export const r2_errors_output: JsonSchema = {
+export const r2_errors: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -35,7 +28,7 @@ export const r2_errors_output: JsonSchema = {
 /**
  * The schema of `r2_messages` in responses.
  */
-export const r2_messages_output: JsonSchema = {
+export const r2_messages: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -45,7 +38,7 @@ export const r2_messages_output: JsonSchema = {
 /**
  * The schema of `r2_prefix_delete_job` in responses.
  */
-export const r2_prefix_delete_job_output: JsonSchema = {
+export const r2_prefix_delete_job: JsonSchema = {
   "properties": {
     "endTime": {
       "format": "date-time",
@@ -83,7 +76,14 @@ export const r2_prefix_delete_job_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/r2_r2_bucket_job_status"
+      "enum": [
+        "ENQUEUED",
+        "RUNNING",
+        "COMPLETED",
+        "FAILED",
+        "CANCELLED"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -96,35 +96,10 @@ export const r2_prefix_delete_job_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `r2_r2_bucket_job_status` in responses.
- */
-export const r2_r2_bucket_job_status_output: JsonSchema = {
-  "enum": [
-    "ENQUEUED",
-    "RUNNING",
-    "COMPLETED",
-    "FAILED",
-    "CANCELLED"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `r2_storage_class` in responses.
- */
-export const r2_storage_class_output: JsonSchema = {
-  "enum": [
-    "Standard",
-    "InfrequentAccess"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `r2_v4_response` in responses.
  */
-export const r2_v4_response_output: JsonSchema = {
+export const r2_v4_response: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/r2_errors"
@@ -154,7 +129,7 @@ export const r2_v4_response_output: JsonSchema = {
 /**
  * The schema of `r2_v4_response_failure` in responses.
  */
-export const r2_v4_response_failure_output: JsonSchema = {
+export const r2_v4_response_failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/r2_errors"
diff --git a/src/generated/forge-mcp/r2/schemas.ts b/src/generated/forge-mcp/r2/schemas.ts
deleted file mode 100644
index 98d58344b..000000000
--- a/src/generated/forge-mcp/r2/schemas.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `r2_account_identifier`.
- */
-export const r2_account_identifier: JsonSchema = {
-  "description": "Cloudflare account ID that owns the R2 resource.",
-  "type": "string"
-};
-
-/**
- * The schema of `r2_bucket_name`.
- */
-export const r2_bucket_name: JsonSchema = {
-  "description": "Name of the bucket.",
-  "type": "string"
-};
-
-/**
- * The schema of `r2_r2_bucket_job_status`.
- */
-export const r2_r2_bucket_job_status: JsonSchema = {
-  "description": "Lifecycle status of a bucket background job.",
-  "enum": [
-    "ENQUEUED",
-    "RUNNING",
-    "COMPLETED",
-    "FAILED",
-    "CANCELLED"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `r2_storage_class`.
- */
-export const r2_storage_class: JsonSchema = {
-  "description": "Storage class for newly uploaded objects, unless specified otherwise.",
-  "enum": [
-    "Standard",
-    "InfrequentAccess"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/r2/superSlurper/connectivityPrecheck/outputs.ts b/src/generated/forge-mcp/r2/superSlurper/connectivityPrecheck/outputs.ts
index f714903e6..feceea010 100644
--- a/src/generated/forge-mcp/r2/superSlurper/connectivityPrecheck/outputs.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/connectivityPrecheck/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2-slurper_ConnectivityResponse` in responses.
  */
-export const r2_slurper_ConnectivityResponse_output: JsonSchema = {
+export const r2$$slurper_ConnectivityResponse: JsonSchema = {
   "properties": {
     "connectivityStatus": {
       "enum": [
diff --git a/src/generated/forge-mcp/r2/superSlurper/connectivityPrecheck/tools.ts b/src/generated/forge-mcp/r2/superSlurper/connectivityPrecheck/tools.ts
index 1460f0516..05c298e61 100644
--- a/src/generated/forge-mcp/r2/superSlurper/connectivityPrecheck/tools.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/connectivityPrecheck/tools.ts
@@ -3,53 +3,61 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  r2_slurper_api_v4_error_output,
-  r2_slurper_api_v4_failure_output,
-  r2_slurper_api_v4_message_output,
-  r2_slurper_api_v4_success_output,
+  r2$$slurper_api$$v4$$error,
+  r2$$slurper_api$$v4$$failure,
+  r2$$slurper_api$$v4$$message,
+  r2$$slurper_api$$v4$$success,
 } from "../outputs.js";
 import {
-  r2_slurper_GCSLikeCredsSchema,
-  r2_slurper_GCSSourceSchema,
-  r2_slurper_Jurisdiction,
-  r2_slurper_R2SourceSchema,
-  r2_slurper_R2TargetSchema,
-  r2_slurper_S3LikeCredsSchema,
-  r2_slurper_S3SourceSchema,
-  r2_slurper_SourceJobSchema,
+  r2$$slurper_GCSLikeCredsSchema,
+  r2$$slurper_GCSSourceSchema,
+  r2$$slurper_R2SourceSchema,
+  r2$$slurper_R2TargetSchema,
+  r2$$slurper_S3LikeCredsSchema,
+  r2$$slurper_S3SourceSchema,
+  r2$$slurper_SourceJobSchema,
 } from "../schemas.js";
-import { r2_slurper_ConnectivityResponse_output } from "./outputs.js";
+import { r2$$slurper_ConnectivityResponse } from "./outputs.js";
 
 /**
- * The tools of `r2.super_slurper.connectivity_precheck`.
+ * The tools of `r2.superSlurper.connectivityPrecheck`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "r2_super_slurper_connectivity_precheck_source",
+    name: "r2_superSlurper_connectivityPrecheck_source",
     title: "Check source connectivity",
-    description: "Check whether tokens are valid against the source bucket",
+    description: "Check whether tokens are valid against the source bucket\n\nPUT /accounts/{account_id}/slurper/source/connectivity-precheck",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/r2-slurper_SourceJobSchema"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2-slurper_GCSLikeCredsSchema": r2_slurper_GCSLikeCredsSchema,
-        "r2-slurper_GCSSourceSchema": r2_slurper_GCSSourceSchema,
-        "r2-slurper_Jurisdiction": r2_slurper_Jurisdiction,
-        "r2-slurper_R2SourceSchema": r2_slurper_R2SourceSchema,
-        "r2-slurper_S3LikeCredsSchema": r2_slurper_S3LikeCredsSchema,
-        "r2-slurper_S3SourceSchema": r2_slurper_S3SourceSchema,
-        "r2-slurper_SourceJobSchema": r2_slurper_SourceJobSchema,
+        "r2-slurper_GCSLikeCredsSchema": r2$$slurper_GCSLikeCredsSchema,
+        "r2-slurper_GCSSourceSchema": r2$$slurper_GCSSourceSchema,
+        "r2-slurper_R2SourceSchema": r2$$slurper_R2SourceSchema,
+        "r2-slurper_S3LikeCredsSchema": r2$$slurper_S3LikeCredsSchema,
+        "r2-slurper_S3SourceSchema": r2$$slurper_S3SourceSchema,
+        "r2-slurper_SourceJobSchema": r2$$slurper_SourceJobSchema,
       },
     },
     outputSchema: {
@@ -67,10 +75,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_ConnectivityResponse": r2_slurper_ConnectivityResponse_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_ConnectivityResponse": r2$$slurper_ConnectivityResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -104,11 +112,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_ConnectivityResponse": r2_slurper_ConnectivityResponse_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_ConnectivityResponse": r2$$slurper_ConnectivityResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -117,27 +125,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_super_slurper_connectivity_precheck_target",
+    name: "r2_superSlurper_connectivityPrecheck_target",
     title: "Check target connectivity",
-    description: "Check whether tokens are valid against the target bucket",
+    description: "Check whether tokens are valid against the target bucket\n\nPUT /accounts/{account_id}/slurper/target/connectivity-precheck",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/r2-slurper_R2TargetSchema"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2-slurper_Jurisdiction": r2_slurper_Jurisdiction,
-        "r2-slurper_R2TargetSchema": r2_slurper_R2TargetSchema,
-        "r2-slurper_S3LikeCredsSchema": r2_slurper_S3LikeCredsSchema,
+        "r2-slurper_R2TargetSchema": r2$$slurper_R2TargetSchema,
+        "r2-slurper_S3LikeCredsSchema": r2$$slurper_S3LikeCredsSchema,
       },
     },
     outputSchema: {
@@ -155,10 +172,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_ConnectivityResponse": r2_slurper_ConnectivityResponse_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_ConnectivityResponse": r2$$slurper_ConnectivityResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -192,11 +209,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_ConnectivityResponse": r2_slurper_ConnectivityResponse_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_ConnectivityResponse": r2$$slurper_ConnectivityResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/r2/superSlurper/jobs/logs/outputs.ts b/src/generated/forge-mcp/r2/superSlurper/jobs/logs/outputs.ts
index 7997a1de6..9076552b9 100644
--- a/src/generated/forge-mcp/r2/superSlurper/jobs/logs/outputs.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/jobs/logs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `r2-slurper_JobLogResponse` in responses.
  */
-export const r2_slurper_JobLogResponse_output: JsonSchema = {
+export const r2$$slurper_JobLogResponse: JsonSchema = {
   "properties": {
     "createdAt": {
       "type": "string"
diff --git a/src/generated/forge-mcp/r2/superSlurper/jobs/logs/tools.ts b/src/generated/forge-mcp/r2/superSlurper/jobs/logs/tools.ts
index 6276d7de3..1987066f3 100644
--- a/src/generated/forge-mcp/r2/superSlurper/jobs/logs/tools.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/jobs/logs/tools.ts
@@ -1,43 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  r2_slurper_api_v4_error_output,
-  r2_slurper_api_v4_failure_output,
-  r2_slurper_api_v4_message_output,
-  r2_slurper_api_v4_success_output,
+  r2$$slurper_api$$v4$$error,
+  r2$$slurper_api$$v4$$failure,
+  r2$$slurper_api$$v4$$message,
+  r2$$slurper_api$$v4$$success,
 } from "../../outputs.js";
-import { r2_slurper_JobLogResponse_output } from "./outputs.js";
+import { r2$$slurper_JobLogResponse } from "./outputs.js";
 
 /**
- * The tools of `r2.super_slurper.jobs.logs`.
+ * The tools of `r2.superSlurper.jobs.logs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "r2_super_slurper_jobs_logs_list",
+    name: "r2_superSlurper_jobs_logs_list",
     title: "Get job logs",
-    description: "Gets log entries for an R2 Super Slurper migration job, showing migration status changes, errors, etc.",
+    description: "Gets log entries for an R2 Super Slurper migration job, showing migration status changes, errors, etc.\n\nGET /accounts/{account_id}/slurper/jobs/{job_id}/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
-        },
-        "limit": {
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "type": "integer"
+            },
+            "offset": {
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -57,10 +73,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_JobLogResponse": r2_slurper_JobLogResponse_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_JobLogResponse": r2$$slurper_JobLogResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -97,18 +113,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_JobLogResponse": r2_slurper_JobLogResponse_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_JobLogResponse": r2$$slurper_JobLogResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/slurper/jobs/${pathParam(args, "job_id")}/logs`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/r2/superSlurper/jobs/outputs.ts b/src/generated/forge-mcp/r2/superSlurper/jobs/outputs.ts
index 72bb420bf..a08397e63 100644
--- a/src/generated/forge-mcp/r2/superSlurper/jobs/outputs.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/jobs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2-slurper_JobProgressResponse` in responses.
  */
-export const r2_slurper_JobProgressResponse_output: JsonSchema = {
+export const r2$$slurper_JobProgressResponse: JsonSchema = {
   "properties": {
     "createdAt": {
       "type": "string"
@@ -24,7 +24,13 @@ export const r2_slurper_JobProgressResponse_output: JsonSchema = {
       "type": "integer"
     },
     "status": {
-      "$ref": "#/$defs/r2-slurper_JobStatus"
+      "enum": [
+        "running",
+        "paused",
+        "aborted",
+        "completed"
+      ],
+      "type": "string"
     },
     "transferredObjects": {
       "type": "integer"
@@ -36,7 +42,7 @@ export const r2_slurper_JobProgressResponse_output: JsonSchema = {
 /**
  * The schema of `r2-slurper_JobResponse` in responses.
  */
-export const r2_slurper_JobResponse_output: JsonSchema = {
+export const r2$$slurper_JobResponse: JsonSchema = {
   "properties": {
     "createdAt": {
       "type": "string"
@@ -149,7 +155,13 @@ export const r2_slurper_JobResponse_output: JsonSchema = {
               "type": "string"
             },
             "jurisdiction": {
-              "$ref": "#/$defs/r2-slurper_Jurisdiction"
+              "enum": [
+                "default",
+                "eu",
+                "us",
+                "fedramp"
+              ],
+              "type": "string"
             },
             "keys": {
               "oneOf": [
@@ -186,7 +198,13 @@ export const r2_slurper_JobResponse_output: JsonSchema = {
       ]
     },
     "status": {
-      "$ref": "#/$defs/r2-slurper_JobStatus"
+      "enum": [
+        "running",
+        "paused",
+        "aborted",
+        "completed"
+      ],
+      "type": "string"
     },
     "target": {
       "properties": {
@@ -194,7 +212,13 @@ export const r2_slurper_JobResponse_output: JsonSchema = {
           "type": "string"
         },
         "jurisdiction": {
-          "$ref": "#/$defs/r2-slurper_Jurisdiction"
+          "enum": [
+            "default",
+            "eu",
+            "us",
+            "fedramp"
+          ],
+          "type": "string"
         },
         "vendor": {
           "enum": [
@@ -208,16 +232,3 @@ export const r2_slurper_JobResponse_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `r2-slurper_JobStatus` in responses.
- */
-export const r2_slurper_JobStatus_output: JsonSchema = {
-  "enum": [
-    "running",
-    "paused",
-    "aborted",
-    "completed"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/r2/superSlurper/jobs/schemas.ts b/src/generated/forge-mcp/r2/superSlurper/jobs/schemas.ts
index 3767c3cb6..a35ee0f58 100644
--- a/src/generated/forge-mcp/r2/superSlurper/jobs/schemas.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/jobs/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `r2-slurper_CreateJobRequest`.
  */
-export const r2_slurper_CreateJobRequest: JsonSchema = {
+export const r2$$slurper_CreateJobRequest: JsonSchema = {
   "properties": {
     "overwrite": {
       "default": true,
diff --git a/src/generated/forge-mcp/r2/superSlurper/jobs/tools.ts b/src/generated/forge-mcp/r2/superSlurper/jobs/tools.ts
index 23d017875..e30eab652 100644
--- a/src/generated/forge-mcp/r2/superSlurper/jobs/tools.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/jobs/tools.ts
@@ -1,53 +1,60 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  r2_slurper_Jurisdiction_output,
-  r2_slurper_api_v4_error_output,
-  r2_slurper_api_v4_failure_output,
-  r2_slurper_api_v4_message_output,
-  r2_slurper_api_v4_success_output,
+  r2$$slurper_api$$v4$$error,
+  r2$$slurper_api$$v4$$failure,
+  r2$$slurper_api$$v4$$message,
+  r2$$slurper_api$$v4$$success,
 } from "../outputs.js";
 import {
-  r2_slurper_GCSLikeCredsSchema,
-  r2_slurper_GCSSourceSchema,
-  r2_slurper_Jurisdiction,
-  r2_slurper_R2SourceSchema,
-  r2_slurper_R2TargetSchema,
-  r2_slurper_S3LikeCredsSchema,
-  r2_slurper_S3SourceSchema,
-  r2_slurper_SourceJobSchema,
+  r2$$slurper_GCSLikeCredsSchema,
+  r2$$slurper_GCSSourceSchema,
+  r2$$slurper_R2SourceSchema,
+  r2$$slurper_R2TargetSchema,
+  r2$$slurper_S3LikeCredsSchema,
+  r2$$slurper_S3SourceSchema,
+  r2$$slurper_SourceJobSchema,
 } from "../schemas.js";
 import {
-  r2_slurper_JobProgressResponse_output,
-  r2_slurper_JobResponse_output,
-  r2_slurper_JobStatus_output,
+  r2$$slurper_JobProgressResponse,
+  r2$$slurper_JobResponse,
 } from "./outputs.js";
-import { r2_slurper_CreateJobRequest } from "./schemas.js";
+import { r2$$slurper_CreateJobRequest } from "./schemas.js";
 
 /**
- * The tools of `r2.super_slurper.jobs`.
+ * The tools of `r2.superSlurper.jobs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "r2_super_slurper_jobs_abort",
+    name: "r2_superSlurper_jobs_abort",
     title: "Abort a job",
-    description: "Cancels a specific R2 Super Slurper migration job. Any objects in the middle of a transfer will finish, but no new objects will start transferring.\n\nConfirm with the user before calling this tool. This operation stops a running migration job.",
+    description: "Cancels a specific R2 Super Slurper migration job. Any objects in the middle of a transfer will finish, but no new objects will start transferring.\n\nConfirm with the user before calling this tool. This operation stops a running migration job.\n\nPUT /accounts/{account_id}/slurper/jobs/{job_id}/abort",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -64,9 +71,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -100,10 +107,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -111,19 +118,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_super_slurper_jobs_abort_all",
+    name: "r2_superSlurper_jobs_abortAll",
     title: "Abort all jobs",
-    description: "Cancels all running R2 Super Slurper migration jobs for the account. Any objects in the middle of a transfer will finish, but no new objects will start transferring.\n\nConfirm with the user before calling this tool. This operation stops every running migration job.",
+    description: "Cancels all running R2 Super Slurper migration jobs for the account. Any objects in the middle of a transfer will finish, but no new objects will start transferring.\n\nConfirm with the user before calling this tool. This operation stops every running migration job.\n\nPUT /accounts/{account_id}/slurper/jobs/abortAll",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -140,9 +157,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -176,10 +193,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -187,33 +204,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_super_slurper_jobs_create",
+    name: "r2_superSlurper_jobs_create",
     title: "Create a job",
-    description: "Creates a new R2 Super Slurper migration job to transfer objects from a source bucket (e.g. S3, GCS, R2) to R2.",
+    description: "Creates a new R2 Super Slurper migration job to transfer objects from a source bucket (e.g. S3, GCS, R2) to R2.\n\nPOST /accounts/{account_id}/slurper/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/r2-slurper_CreateJobRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2-slurper_CreateJobRequest": r2_slurper_CreateJobRequest,
-        "r2-slurper_GCSLikeCredsSchema": r2_slurper_GCSLikeCredsSchema,
-        "r2-slurper_GCSSourceSchema": r2_slurper_GCSSourceSchema,
-        "r2-slurper_Jurisdiction": r2_slurper_Jurisdiction,
-        "r2-slurper_R2SourceSchema": r2_slurper_R2SourceSchema,
-        "r2-slurper_R2TargetSchema": r2_slurper_R2TargetSchema,
-        "r2-slurper_S3LikeCredsSchema": r2_slurper_S3LikeCredsSchema,
-        "r2-slurper_S3SourceSchema": r2_slurper_S3SourceSchema,
-        "r2-slurper_SourceJobSchema": r2_slurper_SourceJobSchema,
+        "r2-slurper_CreateJobRequest": r2$$slurper_CreateJobRequest,
+        "r2-slurper_GCSLikeCredsSchema": r2$$slurper_GCSLikeCredsSchema,
+        "r2-slurper_GCSSourceSchema": r2$$slurper_GCSSourceSchema,
+        "r2-slurper_R2SourceSchema": r2$$slurper_R2SourceSchema,
+        "r2-slurper_R2TargetSchema": r2$$slurper_R2TargetSchema,
+        "r2-slurper_S3LikeCredsSchema": r2$$slurper_S3LikeCredsSchema,
+        "r2-slurper_S3SourceSchema": r2$$slurper_S3SourceSchema,
+        "r2-slurper_SourceJobSchema": r2$$slurper_SourceJobSchema,
       },
     },
     outputSchema: {
@@ -236,9 +262,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -280,10 +306,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -292,23 +318,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_super_slurper_jobs_delete",
+    name: "r2_superSlurper_jobs_delete",
     title: "Delete a job",
-    description: "Deletes a completed, aborted, or errored R2 Super Slurper migration job. Active jobs cannot be deleted.",
+    description: "Deletes a completed, aborted, or errored R2 Super Slurper migration job. Active jobs cannot be deleted.\n\nDELETE /accounts/{account_id}/slurper/jobs/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -325,9 +361,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -364,10 +400,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -375,23 +411,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_super_slurper_jobs_get",
+    name: "r2_superSlurper_jobs_get",
     title: "Get job details",
-    description: "Retrieves detailed status and configuration for a specific R2 Super Slurper migration job.",
+    description: "Retrieves detailed status and configuration for a specific R2 Super Slurper migration job.\n\nGET /accounts/{account_id}/slurper/jobs/{job_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -408,12 +454,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_JobResponse": r2_slurper_JobResponse_output,
-        "r2-slurper_JobStatus": r2_slurper_JobStatus_output,
-        "r2-slurper_Jurisdiction": r2_slurper_Jurisdiction_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_JobResponse": r2$$slurper_JobResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -447,13 +491,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_JobResponse": r2_slurper_JobResponse_output,
-        "r2-slurper_JobStatus": r2_slurper_JobStatus_output,
-        "r2-slurper_Jurisdiction": r2_slurper_Jurisdiction_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_JobResponse": r2$$slurper_JobResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -461,25 +503,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_super_slurper_jobs_list",
+    name: "r2_superSlurper_jobs_list",
     title: "List jobs",
-    description: "Lists all R2 Super Slurper migration jobs for the account with their status.",
+    description: "Lists all R2 Super Slurper migration jobs for the account with their status.\n\nGET /accounts/{account_id}/slurper/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "limit": {
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "offset": {
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "type": "integer"
+            },
+            "offset": {
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -499,12 +557,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_JobResponse": r2_slurper_JobResponse_output,
-        "r2-slurper_JobStatus": r2_slurper_JobStatus_output,
-        "r2-slurper_Jurisdiction": r2_slurper_Jurisdiction_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_JobResponse": r2$$slurper_JobResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -541,41 +597,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_JobResponse": r2_slurper_JobResponse_output,
-        "r2-slurper_JobStatus": r2_slurper_JobStatus_output,
-        "r2-slurper_Jurisdiction": r2_slurper_Jurisdiction_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_JobResponse": r2$$slurper_JobResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/slurper/jobs`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
   {
-    name: "r2_super_slurper_jobs_pause",
+    name: "r2_superSlurper_jobs_pause",
     title: "Pause a job",
-    description: "Pauses a running R2 Super Slurper migration job. The job can be resumed later to continue transferring.",
+    description: "Pauses a running R2 Super Slurper migration job. The job can be resumed later to continue transferring.\n\nPUT /accounts/{account_id}/slurper/jobs/{job_id}/pause",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -592,9 +656,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -631,10 +695,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -642,23 +706,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_super_slurper_jobs_progress",
+    name: "r2_superSlurper_jobs_progress",
     title: "Get job progress",
-    description: "Retrieves current progress metrics for an R2 Super Slurper migration job",
+    description: "Retrieves current progress metrics for an R2 Super Slurper migration job\n\nGET /accounts/{account_id}/slurper/jobs/{job_id}/progress",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -675,11 +749,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_JobProgressResponse": r2_slurper_JobProgressResponse_output,
-        "r2-slurper_JobStatus": r2_slurper_JobStatus_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_JobProgressResponse": r2$$slurper_JobProgressResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -713,12 +786,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_JobProgressResponse": r2_slurper_JobProgressResponse_output,
-        "r2-slurper_JobStatus": r2_slurper_JobStatus_output,
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_JobProgressResponse": r2$$slurper_JobProgressResponse,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
@@ -726,23 +798,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "r2_super_slurper_jobs_resume",
+    name: "r2_superSlurper_jobs_resume",
     title: "Resume a job",
-    description: "Resumes a paused R2 Super Slurper migration job, continuing the transfer from where it stopped.",
+    description: "Resumes a paused R2 Super Slurper migration job, continuing the transfer from where it stopped.\n\nPUT /accounts/{account_id}/slurper/jobs/{job_id}/resume",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "job_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "job_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "job_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "job_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -759,9 +841,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     annotations: {
@@ -795,10 +877,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2-slurper_api-v4-error": r2_slurper_api_v4_error_output,
-        "r2-slurper_api-v4-failure": r2_slurper_api_v4_failure_output,
-        "r2-slurper_api-v4-message": r2_slurper_api_v4_message_output,
-        "r2-slurper_api-v4-success": r2_slurper_api_v4_success_output,
+        "r2-slurper_api-v4-error": r2$$slurper_api$$v4$$error,
+        "r2-slurper_api-v4-failure": r2$$slurper_api$$v4$$failure,
+        "r2-slurper_api-v4-message": r2$$slurper_api$$v4$$message,
+        "r2-slurper_api-v4-success": r2$$slurper_api$$v4$$success,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/r2/superSlurper/outputs.ts b/src/generated/forge-mcp/r2/superSlurper/outputs.ts
index 326aaaa45..d13819a82 100644
--- a/src/generated/forge-mcp/r2/superSlurper/outputs.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/outputs.ts
@@ -3,23 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `r2-slurper_Jurisdiction` in responses.
- */
-export const r2_slurper_Jurisdiction_output: JsonSchema = {
-  "enum": [
-    "default",
-    "eu",
-    "us",
-    "fedramp"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `r2-slurper_api-v4-error` in responses.
  */
-export const r2_slurper_api_v4_error_output: JsonSchema = {
+export const r2$$slurper_api$$v4$$error: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -41,7 +28,7 @@ export const r2_slurper_api_v4_error_output: JsonSchema = {
 /**
  * The schema of `r2-slurper_api-v4-failure` in responses.
  */
-export const r2_slurper_api_v4_failure_output: JsonSchema = {
+export const r2$$slurper_api$$v4$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/r2-slurper_api-v4-error"
@@ -62,7 +49,7 @@ export const r2_slurper_api_v4_failure_output: JsonSchema = {
 /**
  * The schema of `r2-slurper_api-v4-message` in responses.
  */
-export const r2_slurper_api_v4_message_output: JsonSchema = {
+export const r2$$slurper_api$$v4$$message: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -72,7 +59,7 @@ export const r2_slurper_api_v4_message_output: JsonSchema = {
 /**
  * The schema of `r2-slurper_api-v4-success` in responses.
  */
-export const r2_slurper_api_v4_success_output: JsonSchema = {
+export const r2$$slurper_api$$v4$$success: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/r2-slurper_api-v4-error"
diff --git a/src/generated/forge-mcp/r2/superSlurper/schemas.ts b/src/generated/forge-mcp/r2/superSlurper/schemas.ts
index 1d77d8057..82e0c2c9f 100644
--- a/src/generated/forge-mcp/r2/superSlurper/schemas.ts
+++ b/src/generated/forge-mcp/r2/superSlurper/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `r2-slurper_GCSLikeCredsSchema`.
  */
-export const r2_slurper_GCSLikeCredsSchema: JsonSchema = {
+export const r2$$slurper_GCSLikeCredsSchema: JsonSchema = {
   "properties": {
     "clientEmail": {
       "type": "string"
@@ -25,7 +25,7 @@ export const r2_slurper_GCSLikeCredsSchema: JsonSchema = {
 /**
  * The schema of `r2-slurper_GCSSourceSchema`.
  */
-export const r2_slurper_GCSSourceSchema: JsonSchema = {
+export const r2$$slurper_GCSSourceSchema: JsonSchema = {
   "properties": {
     "bucket": {
       "type": "string"
@@ -72,29 +72,22 @@ export const r2_slurper_GCSSourceSchema: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `r2-slurper_Jurisdiction`.
- */
-export const r2_slurper_Jurisdiction: JsonSchema = {
-  "enum": [
-    "default",
-    "eu",
-    "us",
-    "fedramp"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `r2-slurper_R2SourceSchema`.
  */
-export const r2_slurper_R2SourceSchema: JsonSchema = {
+export const r2$$slurper_R2SourceSchema: JsonSchema = {
   "properties": {
     "bucket": {
       "type": "string"
     },
     "jurisdiction": {
-      "$ref": "#/$defs/r2-slurper_Jurisdiction"
+      "enum": [
+        "default",
+        "eu",
+        "us",
+        "fedramp"
+      ],
+      "type": "string"
     },
     "keys": {
       "oneOf": [
@@ -141,13 +134,19 @@ export const r2_slurper_R2SourceSchema: JsonSchema = {
 /**
  * The schema of `r2-slurper_R2TargetSchema`.
  */
-export const r2_slurper_R2TargetSchema: JsonSchema = {
+export const r2$$slurper_R2TargetSchema: JsonSchema = {
   "properties": {
     "bucket": {
       "type": "string"
     },
     "jurisdiction": {
-      "$ref": "#/$defs/r2-slurper_Jurisdiction"
+      "enum": [
+        "default",
+        "eu",
+        "us",
+        "fedramp"
+      ],
+      "type": "string"
     },
     "secret": {
       "$ref": "#/$defs/r2-slurper_S3LikeCredsSchema"
@@ -170,7 +169,7 @@ export const r2_slurper_R2TargetSchema: JsonSchema = {
 /**
  * The schema of `r2-slurper_S3LikeCredsSchema`.
  */
-export const r2_slurper_S3LikeCredsSchema: JsonSchema = {
+export const r2$$slurper_S3LikeCredsSchema: JsonSchema = {
   "properties": {
     "accessKeyId": {
       "type": "string"
@@ -189,7 +188,7 @@ export const r2_slurper_S3LikeCredsSchema: JsonSchema = {
 /**
  * The schema of `r2-slurper_S3SourceSchema`.
  */
-export const r2_slurper_S3SourceSchema: JsonSchema = {
+export const r2$$slurper_S3SourceSchema: JsonSchema = {
   "properties": {
     "bucket": {
       "type": "string"
@@ -260,7 +259,7 @@ export const r2_slurper_S3SourceSchema: JsonSchema = {
 /**
  * The schema of `r2-slurper_SourceJobSchema`.
  */
-export const r2_slurper_SourceJobSchema: JsonSchema = {
+export const r2$$slurper_SourceJobSchema: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/r2-slurper_S3SourceSchema"
diff --git a/src/generated/forge-mcp/r2/temporaryCredentials/outputs.ts b/src/generated/forge-mcp/r2/temporaryCredentials/outputs.ts
index cbc2b7212..5441c6163 100644
--- a/src/generated/forge-mcp/r2/temporaryCredentials/outputs.ts
+++ b/src/generated/forge-mcp/r2/temporaryCredentials/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `r2_temp_access_creds_response` in responses.
  */
-export const r2_temp_access_creds_response_output: JsonSchema = {
+export const r2_temp_access_creds_response: JsonSchema = {
   "properties": {
     "accessKeyId": {
       "type": "string"
diff --git a/src/generated/forge-mcp/r2/temporaryCredentials/tools.ts b/src/generated/forge-mcp/r2/temporaryCredentials/tools.ts
index 5fd229fa9..236b08552 100644
--- a/src/generated/forge-mcp/r2/temporaryCredentials/tools.ts
+++ b/src/generated/forge-mcp/r2/temporaryCredentials/tools.ts
@@ -3,40 +3,48 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  r2_errors_output,
-  r2_messages_output,
-  r2_v4_response_failure_output,
-  r2_v4_response_output,
+  r2_errors,
+  r2_messages,
+  r2_v4_response,
+  r2_v4_response_failure,
 } from "../outputs.js";
-import { r2_account_identifier } from "../schemas.js";
-import { r2_temp_access_creds_response_output } from "./outputs.js";
+import { r2_temp_access_creds_response } from "./outputs.js";
 import { r2_temp_access_creds_request } from "./schemas.js";
 
 /**
- * The tools of `r2.temporary_credentials`.
+ * The tools of `r2.temporaryCredentials`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "r2_temporary_credentials_create",
+    name: "r2_temporaryCredentials_create",
     title: "Create Temporary Access Credentials",
-    description: "Creates temporary access credentials on a bucket that can be optionally scoped to prefixes or objects.",
+    description: "Creates temporary access credentials on a bucket that can be optionally scoped to prefixes or objects.\n\nPOST /accounts/{account_id}/r2/temp-access-credentials",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/r2_account_identifier",
-          "description": "Cloudflare account ID that owns the R2 resource."
-        },
         "body": {
           "$ref": "#/$defs/r2_temp_access_creds_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID that owns the R2 resource.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "r2_account_identifier": r2_account_identifier,
         "r2_temp_access_creds_request": r2_temp_access_creds_request,
       },
     },
@@ -55,10 +63,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_temp_access_creds_response": r2_temp_access_creds_response_output,
-        "r2_v4_response": r2_v4_response_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_temp_access_creds_response": r2_temp_access_creds_response,
+        "r2_v4_response": r2_v4_response,
       },
     },
     annotations: {
@@ -92,11 +100,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "r2_errors": r2_errors_output,
-        "r2_messages": r2_messages_output,
-        "r2_temp_access_creds_response": r2_temp_access_creds_response_output,
-        "r2_v4_response": r2_v4_response_output,
-        "r2_v4_response_failure": r2_v4_response_failure_output,
+        "r2_errors": r2_errors,
+        "r2_messages": r2_messages,
+        "r2_temp_access_creds_response": r2_temp_access_creds_response,
+        "r2_v4_response": r2_v4_response,
+        "r2_v4_response_failure": r2_v4_response_failure,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/radar/agentReadiness/tools.ts b/src/generated/forge-mcp/radar/agentReadiness/tools.ts
index 139d9261e..7ef78d1e7 100644
--- a/src/generated/forge-mcp/radar/agentReadiness/tools.ts
+++ b/src/generated/forge-mcp/radar/agentReadiness/tools.ts
@@ -1,57 +1,73 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `radar.agent_readiness`.
+ * The tools of `radar.agentReadiness`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_agent_readiness_summary",
+    name: "radar_agentReadiness_summary",
     title: "Get agent readiness summary",
-    description: "Returns a summary of AI agent readiness scores across scanned domains, grouped by the specified dimension. Data is sourced from weekly bulk scans. All values are raw domain counts.",
+    description: "Returns a summary of AI agent readiness scores across scanned domains, grouped by the specified dimension. Data is sourced from weekly bulk scans. All values are raw domain counts.\n\nGET /radar/agent_readiness/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "date": {
-          "description": "Filters results by the specified date.",
-          "format": "date",
-          "type": "string"
-        },
-        "dimension": {
-          "description": "Specifies the agent readiness data dimension by which to group the results.",
-          "enum": [
-            "CHECK"
-          ],
-          "type": "string"
-        },
-        "domain_category": {
-          "description": "Filters results by domain category.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the agent readiness data dimension by which to group the results.",
+              "enum": [
+                "CHECK"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "date": {
+              "description": "Filters results by the specified date.",
+              "format": "date",
+              "type": "string"
+            },
+            "domainCategory": {
+              "description": "Filters results by domain category.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -319,10 +335,10 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/agent_readiness/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["date", args["date"], true],
-        ["domainCategory", args["domain_category"], true],
-        ["name", args["name"], true],
-        ["format", args["format"], true],
+        ["date", param(args, "query", "date"), true],
+        ["domainCategory", param(args, "query", "domainCategory"), true],
+        ["name", param(args, "query", "name"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ai/bots/tools.ts b/src/generated/forge-mcp/radar/ai/bots/tools.ts
index 35ed05910..1b22c3732 100644
--- a/src/generated/forge-mcp/radar/ai/bots/tools.ts
+++ b/src/generated/forge-mcp/radar/ai/bots/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.ai.bots`.
@@ -10,158 +10,165 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_ai_bots_timeseries",
     title: "Get AI bots HTTP requests time series",
-    description: "Retrieves AI bots HTTP request volume over time.",
+    description: "Retrieves AI bots HTTP request volume over time.\n\nGET /radar/ai/bots/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "content_type": {
-          "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "HTML",
-              "IMAGES",
-              "JSON",
-              "JAVASCRIPT",
-              "CSS",
-              "PLAIN_TEXT",
-              "FONTS",
-              "XML",
-              "YAML",
-              "VIDEO",
-              "AUDIO",
-              "MARKDOWN",
-              "DOCUMENTS",
-              "BINARY",
-              "SERIALIZATION",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "crawl_purpose": {
-          "description": "Filters results by bot crawl purpose.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "industry": {
-          "description": "Filters results by industry.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_status": {
-          "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_status_category": {
-          "description": "Filters results by HTTP response status code category.",
-          "items": {
-            "enum": [
-              "INFORMATIONAL",
-              "SUCCESS",
-              "REDIRECTION",
-              "CLIENT_ERROR",
-              "SERVER_ERROR"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "user_agent": {
-          "description": "Filters results by user agent.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "vertical": {
-          "description": "Filters results by vertical.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "contentType": {
+              "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "HTML",
+                  "IMAGES",
+                  "JSON",
+                  "JAVASCRIPT",
+                  "CSS",
+                  "PLAIN_TEXT",
+                  "FONTS",
+                  "XML",
+                  "YAML",
+                  "VIDEO",
+                  "AUDIO",
+                  "MARKDOWN",
+                  "DOCUMENTS",
+                  "BINARY",
+                  "SERIALIZATION",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "crawlPurpose": {
+              "description": "Filters results by bot crawl purpose.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "industry": {
+              "description": "Filters results by industry.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseStatus": {
+              "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseStatusCategory": {
+              "description": "Filters results by HTTP response status code category.",
+              "items": {
+                "enum": [
+                  "INFORMATIONAL",
+                  "SUCCESS",
+                  "REDIRECTION",
+                  "CLIENT_ERROR",
+                  "SERVER_ERROR"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "userAgent": {
+              "description": "Filters results by user agent.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "vertical": {
+              "description": "Filters results by vertical.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -645,207 +652,223 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ai/bots/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["crawlPurpose", args["crawl_purpose"], true],
-        ["userAgent", args["user_agent"], true],
-        ["industry", args["industry"], true],
-        ["vertical", args["vertical"], true],
-        ["contentType", args["content_type"], true],
-        ["responseStatus", args["response_status"], true],
-        ["responseStatusCategory", args["response_status_category"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["crawlPurpose", param(args, "query", "crawlPurpose"), true],
+        ["userAgent", param(args, "query", "userAgent"), true],
+        ["industry", param(args, "query", "industry"), true],
+        ["vertical", param(args, "query", "vertical"), true],
+        ["contentType", param(args, "query", "contentType"), true],
+        ["responseStatus", param(args, "query", "responseStatus"), true],
+        ["responseStatusCategory", param(args, "query", "responseStatusCategory"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_ai_bots_timeseries_groups",
+    name: "radar_ai_bots_timeseriesGroups",
     title: "Get time series distribution of AI bots HTTP requests by dimension.",
-    description: "Retrieves the distribution of HTTP requests from AI bots, grouped by the specified dimension over time.",
+    description: "Retrieves the distribution of HTTP requests from AI bots, grouped by the specified dimension over time.\n\nGET /radar/ai/bots/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "content_type": {
-          "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "HTML",
-              "IMAGES",
-              "JSON",
-              "JAVASCRIPT",
-              "CSS",
-              "PLAIN_TEXT",
-              "FONTS",
-              "XML",
-              "YAML",
-              "VIDEO",
-              "AUDIO",
-              "MARKDOWN",
-              "DOCUMENTS",
-              "BINARY",
-              "SERIALIZATION",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "crawl_purpose": {
-          "description": "Filters results by bot crawl purpose.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "USER_AGENT",
-            "CRAWL_PURPOSE",
-            "INDUSTRY",
-            "VERTICAL",
-            "CONTENT_TYPE",
-            "RESPONSE_STATUS",
-            "RESPONSE_STATUS_CATEGORY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "industry": {
-          "description": "Filters results by industry.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "USER_AGENT",
+                "CRAWL_PURPOSE",
+                "INDUSTRY",
+                "VERTICAL",
+                "CONTENT_TYPE",
+                "RESPONSE_STATUS",
+                "RESPONSE_STATUS_CATEGORY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX",
-            "PERCENTAGE_CHANGE"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "response_status": {
-          "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_status_category": {
-          "description": "Filters results by HTTP response status code category.",
-          "items": {
-            "enum": [
-              "INFORMATIONAL",
-              "SUCCESS",
-              "REDIRECTION",
-              "CLIENT_ERROR",
-              "SERVER_ERROR"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "user_agent": {
-          "description": "Filters results by user agent.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "vertical": {
-          "description": "Filters results by vertical.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "contentType": {
+              "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "HTML",
+                  "IMAGES",
+                  "JSON",
+                  "JAVASCRIPT",
+                  "CSS",
+                  "PLAIN_TEXT",
+                  "FONTS",
+                  "XML",
+                  "YAML",
+                  "VIDEO",
+                  "AUDIO",
+                  "MARKDOWN",
+                  "DOCUMENTS",
+                  "BINARY",
+                  "SERIALIZATION",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "crawlPurpose": {
+              "description": "Filters results by bot crawl purpose.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "industry": {
+              "description": "Filters results by industry.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX",
+                "PERCENTAGE_CHANGE"
+              ],
+              "type": "string"
+            },
+            "responseStatus": {
+              "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseStatusCategory": {
+              "description": "Filters results by HTTP response status code category.",
+              "items": {
+                "enum": [
+                  "INFORMATIONAL",
+                  "SUCCESS",
+                  "REDIRECTION",
+                  "CLIENT_ERROR",
+                  "SERVER_ERROR"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "userAgent": {
+              "description": "Filters results by user agent.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "vertical": {
+              "description": "Filters results by vertical.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1329,24 +1352,24 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ai/bots/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["crawlPurpose", args["crawl_purpose"], true],
-        ["userAgent", args["user_agent"], true],
-        ["industry", args["industry"], true],
-        ["vertical", args["vertical"], true],
-        ["contentType", args["content_type"], true],
-        ["responseStatus", args["response_status"], true],
-        ["responseStatusCategory", args["response_status_category"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["crawlPurpose", param(args, "query", "crawlPurpose"), true],
+        ["userAgent", param(args, "query", "userAgent"), true],
+        ["industry", param(args, "query", "industry"), true],
+        ["vertical", param(args, "query", "vertical"), true],
+        ["contentType", param(args, "query", "contentType"), true],
+        ["responseStatus", param(args, "query", "responseStatus"), true],
+        ["responseStatusCategory", param(args, "query", "responseStatusCategory"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ai/inference/tools.ts b/src/generated/forge-mcp/radar/ai/inference/tools.ts
index 308fb4cd2..1feb7cdda 100644
--- a/src/generated/forge-mcp/radar/ai/inference/tools.ts
+++ b/src/generated/forge-mcp/radar/ai/inference/tools.ts
@@ -1,94 +1,110 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.ai.inference`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_ai_inference_summary_v2",
+    name: "radar_ai_inference_summaryV2",
     title: "Get Workers AI inference distribution by dimension",
-    description: "Retrieves an aggregated summary of the number of inferences run on Workers AI, grouped by the specified dimension.",
+    description: "Retrieves an aggregated summary of the number of inferences run on Workers AI, grouped by the specified dimension.\n\nGET /radar/ai/inference/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "MODEL",
+                "TASK"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "MODEL",
-            "TASK"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -520,119 +536,135 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ai/inference/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_ai_inference_timeseries_groups_v2",
+    name: "radar_ai_inference_timeseriesGroupsV2",
     title: "Get time series distribution of Workers AI inference by dimension.",
-    description: "Retrieves the distribution of the number of inferences run on Workers AI, grouped by the specified dimension over time.",
+    description: "Retrieves the distribution of the number of inferences run on Workers AI, grouped by the specified dimension over time.\n\nGET /radar/ai/inference/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "MODEL",
+                "TASK"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "MODEL",
-            "TASK"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1116,17 +1148,17 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ai/inference/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ai/markdownForAgents/tools.ts b/src/generated/forge-mcp/radar/ai/markdownForAgents/tools.ts
index fdac563bf..c1068f14f 100644
--- a/src/generated/forge-mcp/radar/ai/markdownForAgents/tools.ts
+++ b/src/generated/forge-mcp/radar/ai/markdownForAgents/tools.ts
@@ -1,58 +1,65 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
- * The tools of `radar.ai.markdown_for_agents`.
+ * The tools of `radar.ai.markdownForAgents`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_ai_markdown_for_agents_summary",
+    name: "radar_ai_markdownForAgents_summary",
     title: "Get AI markdown for agents reduction ratio summary",
-    description: "Retrieves the overall median HTML-to-markdown reduction ratio for AI agent requests over the given date range.",
+    description: "Retrieves the overall median HTML-to-markdown reduction ratio for AI agent requests over the given date range.\n\nGET /radar/ai/markdown_for_agents/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -494,70 +501,77 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ai/markdown_for_agents/summary`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_ai_markdown_for_agents_timeseries",
+    name: "radar_ai_markdownForAgents_timeseries",
     title: "Get AI markdown for agents reduction ratio time series",
-    description: "Retrieves the median HTML-to-markdown reduction ratio over time for AI agent requests.",
+    description: "Retrieves the median HTML-to-markdown reduction ratio over time for AI agent requests.\n\nGET /radar/ai/markdown_for_agents/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1041,12 +1055,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ai/markdown_for_agents/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ai/timeseriesGroups/tools.ts b/src/generated/forge-mcp/radar/ai/timeseriesGroups/tools.ts
index 389d0afc1..1c5f46f89 100644
--- a/src/generated/forge-mcp/radar/ai/timeseriesGroups/tools.ts
+++ b/src/generated/forge-mcp/radar/ai/timeseriesGroups/tools.ts
@@ -1,173 +1,189 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `radar.ai.timeseries_groups`.
+ * The tools of `radar.ai.timeseriesGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_ai_timeseries_groups_summary",
+    name: "radar_ai_timeseriesGroups_summary",
     title: "Get AI bots HTTP requests distribution by dimension",
-    description: "Retrieves an aggregated summary of AI bots HTTP requests grouped by the specified dimension.",
+    description: "Retrieves an aggregated summary of AI bots HTTP requests grouped by the specified dimension.\n\nGET /radar/ai/bots/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "content_type": {
-          "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "HTML",
-              "IMAGES",
-              "JSON",
-              "JAVASCRIPT",
-              "CSS",
-              "PLAIN_TEXT",
-              "FONTS",
-              "XML",
-              "YAML",
-              "VIDEO",
-              "AUDIO",
-              "MARKDOWN",
-              "DOCUMENTS",
-              "BINARY",
-              "SERIALIZATION",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "crawl_purpose": {
-          "description": "Filters results by bot crawl purpose.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "USER_AGENT",
+                "CRAWL_PURPOSE",
+                "INDUSTRY",
+                "VERTICAL",
+                "CONTENT_TYPE",
+                "RESPONSE_STATUS",
+                "RESPONSE_STATUS_CATEGORY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "USER_AGENT",
-            "CRAWL_PURPOSE",
-            "INDUSTRY",
-            "VERTICAL",
-            "CONTENT_TYPE",
-            "RESPONSE_STATUS",
-            "RESPONSE_STATUS_CATEGORY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "industry": {
-          "description": "Filters results by industry.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_status": {
-          "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_status_category": {
-          "description": "Filters results by HTTP response status code category.",
-          "items": {
-            "enum": [
-              "INFORMATIONAL",
-              "SUCCESS",
-              "REDIRECTION",
-              "CLIENT_ERROR",
-              "SERVER_ERROR"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "user_agent": {
-          "description": "Filters results by user agent.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "vertical": {
-          "description": "Filters results by vertical.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "contentType": {
+              "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "HTML",
+                  "IMAGES",
+                  "JSON",
+                  "JAVASCRIPT",
+                  "CSS",
+                  "PLAIN_TEXT",
+                  "FONTS",
+                  "XML",
+                  "YAML",
+                  "VIDEO",
+                  "AUDIO",
+                  "MARKDOWN",
+                  "DOCUMENTS",
+                  "BINARY",
+                  "SERIALIZATION",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "crawlPurpose": {
+              "description": "Filters results by bot crawl purpose.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "industry": {
+              "description": "Filters results by industry.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseStatus": {
+              "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseStatusCategory": {
+              "description": "Filters results by HTTP response status code category.",
+              "items": {
+                "enum": [
+                  "INFORMATIONAL",
+                  "SUCCESS",
+                  "REDIRECTION",
+                  "CLIENT_ERROR",
+                  "SERVER_ERROR"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "userAgent": {
+              "description": "Filters results by user agent.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "vertical": {
+              "description": "Filters results by vertical.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -599,22 +615,22 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ai/bots/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["crawlPurpose", args["crawl_purpose"], true],
-        ["userAgent", args["user_agent"], true],
-        ["vertical", args["vertical"], true],
-        ["industry", args["industry"], true],
-        ["contentType", args["content_type"], true],
-        ["responseStatus", args["response_status"], true],
-        ["responseStatusCategory", args["response_status_category"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["crawlPurpose", param(args, "query", "crawlPurpose"), true],
+        ["userAgent", param(args, "query", "userAgent"), true],
+        ["vertical", param(args, "query", "vertical"), true],
+        ["industry", param(args, "query", "industry"), true],
+        ["contentType", param(args, "query", "contentType"), true],
+        ["responseStatus", param(args, "query", "responseStatus"), true],
+        ["responseStatusCategory", param(args, "query", "responseStatusCategory"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/annotations/outages/tools.ts b/src/generated/forge-mcp/radar/annotations/outages/tools.ts
index 96708b140..bc00ed59b 100644
--- a/src/generated/forge-mcp/radar/annotations/outages/tools.ts
+++ b/src/generated/forge-mcp/radar/annotations/outages/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.annotations.outages`.
@@ -10,247 +10,254 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_annotations_outages_get",
     title: "Get latest Internet outages and anomalies",
-    description: "Retrieves the latest Internet outages and anomalies.",
+    description: "Retrieves the latest Internet outages and anomalies.\n\nGET /radar/annotations/outages",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify a single Autonomous System Number (ASN) as integer.",
-          "type": "integer"
-        },
-        "bot": {
-          "description": "Filters results by bot.",
-          "type": "string"
-        },
-        "ca": {
-          "description": "Filters results by certificate authority.",
-          "type": "string"
-        },
-        "data_source": {
-          "description": "Filters results by data source.",
-          "enum": [
-            "ALL",
-            "AI_BOTS",
-            "AI_GATEWAY",
-            "BGP",
-            "BOTS",
-            "CONNECTION_ANOMALY",
-            "CT",
-            "DNS",
-            "DNS_MAGNITUDE",
-            "DNS_AS112",
-            "DOS",
-            "EMAIL_ROUTING",
-            "EMAIL_SECURITY",
-            "FW",
-            "FW_PG",
-            "HTTP",
-            "HTTP_CONTROL",
-            "HTTP_CRAWLER_REFERER",
-            "HTTP_ORIGINS",
-            "IQI",
-            "LEAKED_CREDENTIALS",
-            "NET",
-            "ROBOTS_TXT",
-            "SPEED",
-            "WORKERS_AI"
-          ],
-          "type": "string"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_range": {
-          "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by geolocation. Refer to [GeoNames](https://download.geonames.org/export/dump/readme.txt).",
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify an alpha-2 location code.",
-          "type": "string"
-        },
-        "log": {
-          "description": "Filters results by certificate log.",
-          "type": "string"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
-        },
-        "origin": {
-          "description": "Filters results by origin.",
-          "type": "string"
-        },
-        "outage_cause": {
-          "description": "Filters results by outage cause.",
-          "enum": [
-            "BLOCKING",
-            "CABLE_CUT",
-            "CYBERATTACK",
-            "DNS",
-            "FIRE",
-            "GOVERNMENT_DIRECTED",
-            "MAINTENANCE",
-            "MECHANICAL",
-            "MILITARY_ACTION",
-            "MISCONFIGURATION",
-            "NATURAL_DISASTER",
-            "NETWORK_PROBLEM",
-            "POWER_OUTAGE",
-            "SOFTWARE",
-            "TECHNICAL_PROBLEM",
-            "UNKNOWN",
-            "WEATHER"
-          ],
-          "type": "string"
-        },
-        "outage_type": {
-          "description": "Filters results by outage type.",
-          "enum": [
-            "NATIONWIDE",
-            "REGIONAL",
-            "NETWORK",
-            "PLATFORM"
-          ],
-          "type": "string"
-        },
         "query": {
-          "description": "Filters results by a free-text match on the annotation description, id, or linked entities (location, ASN, origin).",
-          "type": "string"
-        },
-        "tags": {
-          "description": "Filters results by annotation tag. Matches annotations carrying at least one of the given tags.",
-          "items": {
-            "enum": [
-              "ADM1",
-              "ADM2",
-              "API_TRAFFIC",
-              "ARC",
-              "AS",
-              "ASN",
-              "ATTACKS",
-              "AUTHOR",
-              "BANDWIDTH",
-              "BITRATE",
-              "BOT",
-              "BOT_CATEGORY",
-              "BOT_CLASS",
-              "BOT_KIND",
-              "BOT_OPERATOR",
-              "BROWSER",
-              "BROWSER_FAMILY",
-              "BYTES",
-              "CA",
-              "CACHE_HIT",
-              "CA_OWNER",
-              "CHECK_RESULT",
-              "CLIENT_TYPE",
-              "COMPROMISED",
-              "CONTENT_TYPE",
-              "CRAWL_PURPOSE",
-              "CRAWL_REFER_RATIO",
-              "DEVICE_TYPE",
-              "DKIM",
-              "DMARC",
-              "DNS",
-              "DNSSEC",
-              "DNSSEC_AWARE",
-              "DNSSEC_E2E",
-              "DOMAIN_CATEGORY",
-              "DURATION",
-              "EDNS",
-              "ENCRYPTED",
-              "ENTRY_TYPE",
-              "EXPIRATION_STATUS",
-              "HAS_IPS",
-              "HAS_MATCHING_ANSWER",
-              "HAS_WILDCARDS",
-              "HTTP_METHOD",
-              "HTTP_PROTOCOL",
-              "HTTP_VERSION",
-              "INDUSTRY",
-              "IP_VERSION",
-              "JITTER",
-              "KEY_AGREEMENT",
-              "LATENCY",
-              "LOCATION",
-              "LOCATION_LATENCY",
-              "LOG",
-              "LOG_API",
-              "LOG_OPERATOR",
-              "MALICIOUS",
-              "MANAGED_RULES",
-              "MITIGATION_PRODUCT",
-              "MODEL",
-              "NAMESERVER_LATENCY",
-              "ORIGIN",
-              "ORIGIN_AS",
-              "ORIGIN_LOCATION",
-              "ORIGIN_TARGET_LOCATION_PAIR",
-              "OS",
-              "PERCENTILE",
-              "POST_QUANTUM",
-              "PREFIX",
-              "PRODUCT",
-              "PROTOCOL",
-              "PROVIDER",
-              "PUBLIC_KEY_ALGORITHM",
-              "QUERY_TYPE",
-              "REFERER",
-              "REGION",
-              "RESPONSE_CODE",
-              "RESPONSE_STATUS",
-              "RESPONSE_STATUS_CATEGORY",
-              "RESPONSE_TTL",
-              "SIGNATURE_ALGORITHM",
-              "SPAM",
-              "SPF",
-              "SPOOF",
-              "SUCCESS_RATE",
-              "TARGET_LOCATION",
-              "TASK",
-              "THREAT_CATEGORY",
-              "TLD",
-              "TLD_DNS_MAGNITUDE",
-              "TLS_VERSION",
-              "UPDATE_TYPE",
-              "USER_AGENT",
-              "VALIDATION_LEVEL",
-              "VECTOR",
-              "VERTICAL"
-            ],
-            "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify a single Autonomous System Number (ASN) as integer.",
+              "type": "integer"
+            },
+            "bot": {
+              "description": "Filters results by bot.",
+              "type": "string"
+            },
+            "ca": {
+              "description": "Filters results by certificate authority.",
+              "type": "string"
+            },
+            "dataSource": {
+              "description": "Filters results by data source.",
+              "enum": [
+                "ALL",
+                "AI_BOTS",
+                "AI_GATEWAY",
+                "BGP",
+                "BOTS",
+                "CONNECTION_ANOMALY",
+                "CT",
+                "DNS",
+                "DNS_MAGNITUDE",
+                "DNS_AS112",
+                "DOS",
+                "EMAIL_ROUTING",
+                "EMAIL_SECURITY",
+                "FW",
+                "FW_PG",
+                "HTTP",
+                "HTTP_CONTROL",
+                "HTTP_CRAWLER_REFERER",
+                "HTTP_ORIGINS",
+                "IQI",
+                "LEAKED_CREDENTIALS",
+                "NET",
+                "ROBOTS_TXT",
+                "SPEED",
+                "WORKERS_AI"
+              ],
+              "type": "string"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateRange": {
+              "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by geolocation. Refer to [GeoNames](https://download.geonames.org/export/dump/readme.txt).",
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify an alpha-2 location code.",
+              "type": "string"
+            },
+            "log": {
+              "description": "Filters results by certificate log.",
+              "type": "string"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            },
+            "origin": {
+              "description": "Filters results by origin.",
+              "type": "string"
+            },
+            "outageCause": {
+              "description": "Filters results by outage cause.",
+              "enum": [
+                "BLOCKING",
+                "CABLE_CUT",
+                "CYBERATTACK",
+                "DNS",
+                "FIRE",
+                "GOVERNMENT_DIRECTED",
+                "MAINTENANCE",
+                "MECHANICAL",
+                "MILITARY_ACTION",
+                "MISCONFIGURATION",
+                "NATURAL_DISASTER",
+                "NETWORK_PROBLEM",
+                "POWER_OUTAGE",
+                "SOFTWARE",
+                "TECHNICAL_PROBLEM",
+                "UNKNOWN",
+                "WEATHER"
+              ],
+              "type": "string"
+            },
+            "outageType": {
+              "description": "Filters results by outage type.",
+              "enum": [
+                "NATIONWIDE",
+                "REGIONAL",
+                "NETWORK",
+                "PLATFORM"
+              ],
+              "type": "string"
+            },
+            "query": {
+              "description": "Filters results by a free-text match on the annotation description, id, or linked entities (location, ASN, origin).",
+              "type": "string"
+            },
+            "tags": {
+              "description": "Filters results by annotation tag. Matches annotations carrying at least one of the given tags.",
+              "items": {
+                "enum": [
+                  "ADM1",
+                  "ADM2",
+                  "API_TRAFFIC",
+                  "ARC",
+                  "AS",
+                  "ASN",
+                  "ATTACKS",
+                  "AUTHOR",
+                  "BANDWIDTH",
+                  "BITRATE",
+                  "BOT",
+                  "BOT_CATEGORY",
+                  "BOT_CLASS",
+                  "BOT_KIND",
+                  "BOT_OPERATOR",
+                  "BROWSER",
+                  "BROWSER_FAMILY",
+                  "BYTES",
+                  "CA",
+                  "CACHE_HIT",
+                  "CA_OWNER",
+                  "CHECK_RESULT",
+                  "CLIENT_TYPE",
+                  "COMPROMISED",
+                  "CONTENT_TYPE",
+                  "CRAWL_PURPOSE",
+                  "CRAWL_REFER_RATIO",
+                  "DEVICE_TYPE",
+                  "DKIM",
+                  "DMARC",
+                  "DNS",
+                  "DNSSEC",
+                  "DNSSEC_AWARE",
+                  "DNSSEC_E2E",
+                  "DOMAIN_CATEGORY",
+                  "DURATION",
+                  "EDNS",
+                  "ENCRYPTED",
+                  "ENTRY_TYPE",
+                  "EXPIRATION_STATUS",
+                  "HAS_IPS",
+                  "HAS_MATCHING_ANSWER",
+                  "HAS_WILDCARDS",
+                  "HTTP_METHOD",
+                  "HTTP_PROTOCOL",
+                  "HTTP_VERSION",
+                  "INDUSTRY",
+                  "IP_VERSION",
+                  "JITTER",
+                  "KEY_AGREEMENT",
+                  "LATENCY",
+                  "LOCATION",
+                  "LOCATION_LATENCY",
+                  "LOG",
+                  "LOG_API",
+                  "LOG_OPERATOR",
+                  "MALICIOUS",
+                  "MANAGED_RULES",
+                  "MITIGATION_PRODUCT",
+                  "MODEL",
+                  "NAMESERVER_LATENCY",
+                  "ORIGIN",
+                  "ORIGIN_AS",
+                  "ORIGIN_LOCATION",
+                  "ORIGIN_TARGET_LOCATION_PAIR",
+                  "OS",
+                  "PERCENTILE",
+                  "POST_QUANTUM",
+                  "PREFIX",
+                  "PRODUCT",
+                  "PROTOCOL",
+                  "PROVIDER",
+                  "PUBLIC_KEY_ALGORITHM",
+                  "QUERY_TYPE",
+                  "REFERER",
+                  "REGION",
+                  "RESPONSE_CODE",
+                  "RESPONSE_STATUS",
+                  "RESPONSE_STATUS_CATEGORY",
+                  "RESPONSE_TTL",
+                  "SIGNATURE_ALGORITHM",
+                  "SPAM",
+                  "SPF",
+                  "SPOOF",
+                  "SUCCESS_RATE",
+                  "TARGET_LOCATION",
+                  "TASK",
+                  "THREAT_CATEGORY",
+                  "TLD",
+                  "TLD_DNS_MAGNITUDE",
+                  "TLS_VERSION",
+                  "UPDATE_TYPE",
+                  "USER_AGENT",
+                  "VALIDATION_LEVEL",
+                  "VECTOR",
+                  "VERTICAL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain.",
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -880,63 +887,70 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/annotations/outages`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["dataSource", args["data_source"], true],
-        ["outageType", args["outage_type"], true],
-        ["outageCause", args["outage_cause"], true],
-        ["tags", args["tags"], true],
-        ["query", args["query"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["geoId", args["geo_id"], true],
-        ["origin", args["origin"], true],
-        ["tld", args["tld"], true],
-        ["ca", args["ca"], true],
-        ["log", args["log"], true],
-        ["bot", args["bot"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["dataSource", param(args, "query", "dataSource"), true],
+        ["outageType", param(args, "query", "outageType"), true],
+        ["outageCause", param(args, "query", "outageCause"), true],
+        ["tags", param(args, "query", "tags"), true],
+        ["query", param(args, "query", "query"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["origin", param(args, "query", "origin"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["ca", param(args, "query", "ca"), true],
+        ["log", param(args, "query", "log"), true],
+        ["bot", param(args, "query", "bot"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_annotations_outages_locations",
     title: "Get the number of outages by location",
-    description: "Retrieves the number of outages by location.",
+    description: "Retrieves the number of outages by location.\n\nGET /radar/annotations/outages/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_range": {
-          "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateRange": {
+              "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1080,11 +1094,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/annotations/outages/locations`,
       query: [
-        ["limit", args["limit"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/annotations/tools.ts b/src/generated/forge-mcp/radar/annotations/tools.ts
index 9f75b6ee8..c266f7d97 100644
--- a/src/generated/forge-mcp/radar/annotations/tools.ts
+++ b/src/generated/forge-mcp/radar/annotations/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.annotations`.
@@ -10,26 +10,42 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_annotations_get",
     title: "Get annotation by ID",
-    description: "Retrieves a single annotation by ID.",
+    description: "Retrieves a single annotation by ID.\n\nGET /radar/annotations/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "Annotation ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "id": {
-          "description": "Annotation ID.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -634,266 +650,273 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/annotations/${pathParam(args, "id")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_annotations_list",
     title: "Get latest annotations",
-    description: "Retrieves the latest annotations.",
+    description: "Retrieves the latest annotations.\n\nGET /radar/annotations",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify a single Autonomous System Number (ASN) as integer.",
-          "type": "integer"
-        },
-        "bot": {
-          "description": "Filters results by bot.",
-          "type": "string"
-        },
-        "ca": {
-          "description": "Filters results by certificate authority.",
-          "type": "string"
-        },
-        "data_source": {
-          "description": "Filters results by data source.",
-          "enum": [
-            "ALL",
-            "AI_BOTS",
-            "AI_GATEWAY",
-            "BGP",
-            "BOTS",
-            "CONNECTION_ANOMALY",
-            "CT",
-            "DNS",
-            "DNS_MAGNITUDE",
-            "DNS_AS112",
-            "DOS",
-            "EMAIL_ROUTING",
-            "EMAIL_SECURITY",
-            "FW",
-            "FW_PG",
-            "HTTP",
-            "HTTP_CONTROL",
-            "HTTP_CRAWLER_REFERER",
-            "HTTP_ORIGINS",
-            "IQI",
-            "LEAKED_CREDENTIALS",
-            "NET",
-            "ROBOTS_TXT",
-            "SPEED",
-            "WORKERS_AI"
-          ],
-          "type": "string"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_range": {
-          "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "event_type": {
-          "description": "Filters results by event type. EVENT is a legacy alias for GENERAL.",
-          "enum": [
-            "EVENT",
-            "GENERAL",
-            "OUTAGE",
-            "PARTIAL_PROJECTION",
-            "PIPELINE",
-            "TRAFFIC_ANOMALY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by geolocation. Refer to [GeoNames](https://download.geonames.org/export/dump/readme.txt).",
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify an alpha-2 location code.",
-          "type": "string"
-        },
-        "log": {
-          "description": "Filters results by certificate log.",
-          "type": "string"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
-        },
-        "origin": {
-          "description": "Filters results by origin.",
-          "type": "string"
-        },
-        "outage_cause": {
-          "description": "Filters results by outage cause.",
-          "enum": [
-            "BLOCKING",
-            "CABLE_CUT",
-            "CYBERATTACK",
-            "DNS",
-            "FIRE",
-            "GOVERNMENT_DIRECTED",
-            "MAINTENANCE",
-            "MECHANICAL",
-            "MILITARY_ACTION",
-            "MISCONFIGURATION",
-            "NATURAL_DISASTER",
-            "NETWORK_PROBLEM",
-            "POWER_OUTAGE",
-            "SOFTWARE",
-            "TECHNICAL_PROBLEM",
-            "UNKNOWN",
-            "WEATHER"
-          ],
-          "type": "string"
-        },
-        "outage_type": {
-          "description": "Filters results by outage type.",
-          "enum": [
-            "NATIONWIDE",
-            "REGIONAL",
-            "NETWORK",
-            "PLATFORM"
-          ],
-          "type": "string"
-        },
         "query": {
-          "description": "Filters results by a free-text match on the annotation description, id, or linked entities (location, ASN, origin).",
-          "type": "string"
-        },
-        "tags": {
-          "description": "Filters results by annotation tag. Matches annotations carrying at least one of the given tags.",
-          "items": {
-            "enum": [
-              "ADM1",
-              "ADM2",
-              "API_TRAFFIC",
-              "ARC",
-              "AS",
-              "ASN",
-              "ATTACKS",
-              "AUTHOR",
-              "BANDWIDTH",
-              "BITRATE",
-              "BOT",
-              "BOT_CATEGORY",
-              "BOT_CLASS",
-              "BOT_KIND",
-              "BOT_OPERATOR",
-              "BROWSER",
-              "BROWSER_FAMILY",
-              "BYTES",
-              "CA",
-              "CACHE_HIT",
-              "CA_OWNER",
-              "CHECK_RESULT",
-              "CLIENT_TYPE",
-              "COMPROMISED",
-              "CONTENT_TYPE",
-              "CRAWL_PURPOSE",
-              "CRAWL_REFER_RATIO",
-              "DEVICE_TYPE",
-              "DKIM",
-              "DMARC",
-              "DNS",
-              "DNSSEC",
-              "DNSSEC_AWARE",
-              "DNSSEC_E2E",
-              "DOMAIN_CATEGORY",
-              "DURATION",
-              "EDNS",
-              "ENCRYPTED",
-              "ENTRY_TYPE",
-              "EXPIRATION_STATUS",
-              "HAS_IPS",
-              "HAS_MATCHING_ANSWER",
-              "HAS_WILDCARDS",
-              "HTTP_METHOD",
-              "HTTP_PROTOCOL",
-              "HTTP_VERSION",
-              "INDUSTRY",
-              "IP_VERSION",
-              "JITTER",
-              "KEY_AGREEMENT",
-              "LATENCY",
-              "LOCATION",
-              "LOCATION_LATENCY",
-              "LOG",
-              "LOG_API",
-              "LOG_OPERATOR",
-              "MALICIOUS",
-              "MANAGED_RULES",
-              "MITIGATION_PRODUCT",
-              "MODEL",
-              "NAMESERVER_LATENCY",
-              "ORIGIN",
-              "ORIGIN_AS",
-              "ORIGIN_LOCATION",
-              "ORIGIN_TARGET_LOCATION_PAIR",
-              "OS",
-              "PERCENTILE",
-              "POST_QUANTUM",
-              "PREFIX",
-              "PRODUCT",
-              "PROTOCOL",
-              "PROVIDER",
-              "PUBLIC_KEY_ALGORITHM",
-              "QUERY_TYPE",
-              "REFERER",
-              "REGION",
-              "RESPONSE_CODE",
-              "RESPONSE_STATUS",
-              "RESPONSE_STATUS_CATEGORY",
-              "RESPONSE_TTL",
-              "SIGNATURE_ALGORITHM",
-              "SPAM",
-              "SPF",
-              "SPOOF",
-              "SUCCESS_RATE",
-              "TARGET_LOCATION",
-              "TASK",
-              "THREAT_CATEGORY",
-              "TLD",
-              "TLD_DNS_MAGNITUDE",
-              "TLS_VERSION",
-              "UPDATE_TYPE",
-              "USER_AGENT",
-              "VALIDATION_LEVEL",
-              "VECTOR",
-              "VERTICAL"
-            ],
-            "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify a single Autonomous System Number (ASN) as integer.",
+              "type": "integer"
+            },
+            "bot": {
+              "description": "Filters results by bot.",
+              "type": "string"
+            },
+            "ca": {
+              "description": "Filters results by certificate authority.",
+              "type": "string"
+            },
+            "dataSource": {
+              "description": "Filters results by data source.",
+              "enum": [
+                "ALL",
+                "AI_BOTS",
+                "AI_GATEWAY",
+                "BGP",
+                "BOTS",
+                "CONNECTION_ANOMALY",
+                "CT",
+                "DNS",
+                "DNS_MAGNITUDE",
+                "DNS_AS112",
+                "DOS",
+                "EMAIL_ROUTING",
+                "EMAIL_SECURITY",
+                "FW",
+                "FW_PG",
+                "HTTP",
+                "HTTP_CONTROL",
+                "HTTP_CRAWLER_REFERER",
+                "HTTP_ORIGINS",
+                "IQI",
+                "LEAKED_CREDENTIALS",
+                "NET",
+                "ROBOTS_TXT",
+                "SPEED",
+                "WORKERS_AI"
+              ],
+              "type": "string"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateRange": {
+              "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "eventType": {
+              "description": "Filters results by event type. EVENT is a legacy alias for GENERAL.",
+              "enum": [
+                "EVENT",
+                "GENERAL",
+                "OUTAGE",
+                "PARTIAL_PROJECTION",
+                "PIPELINE",
+                "TRAFFIC_ANOMALY"
+              ],
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by geolocation. Refer to [GeoNames](https://download.geonames.org/export/dump/readme.txt).",
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify an alpha-2 location code.",
+              "type": "string"
+            },
+            "log": {
+              "description": "Filters results by certificate log.",
+              "type": "string"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            },
+            "origin": {
+              "description": "Filters results by origin.",
+              "type": "string"
+            },
+            "outageCause": {
+              "description": "Filters results by outage cause.",
+              "enum": [
+                "BLOCKING",
+                "CABLE_CUT",
+                "CYBERATTACK",
+                "DNS",
+                "FIRE",
+                "GOVERNMENT_DIRECTED",
+                "MAINTENANCE",
+                "MECHANICAL",
+                "MILITARY_ACTION",
+                "MISCONFIGURATION",
+                "NATURAL_DISASTER",
+                "NETWORK_PROBLEM",
+                "POWER_OUTAGE",
+                "SOFTWARE",
+                "TECHNICAL_PROBLEM",
+                "UNKNOWN",
+                "WEATHER"
+              ],
+              "type": "string"
+            },
+            "outageType": {
+              "description": "Filters results by outage type.",
+              "enum": [
+                "NATIONWIDE",
+                "REGIONAL",
+                "NETWORK",
+                "PLATFORM"
+              ],
+              "type": "string"
+            },
+            "query": {
+              "description": "Filters results by a free-text match on the annotation description, id, or linked entities (location, ASN, origin).",
+              "type": "string"
+            },
+            "tags": {
+              "description": "Filters results by annotation tag. Matches annotations carrying at least one of the given tags.",
+              "items": {
+                "enum": [
+                  "ADM1",
+                  "ADM2",
+                  "API_TRAFFIC",
+                  "ARC",
+                  "AS",
+                  "ASN",
+                  "ATTACKS",
+                  "AUTHOR",
+                  "BANDWIDTH",
+                  "BITRATE",
+                  "BOT",
+                  "BOT_CATEGORY",
+                  "BOT_CLASS",
+                  "BOT_KIND",
+                  "BOT_OPERATOR",
+                  "BROWSER",
+                  "BROWSER_FAMILY",
+                  "BYTES",
+                  "CA",
+                  "CACHE_HIT",
+                  "CA_OWNER",
+                  "CHECK_RESULT",
+                  "CLIENT_TYPE",
+                  "COMPROMISED",
+                  "CONTENT_TYPE",
+                  "CRAWL_PURPOSE",
+                  "CRAWL_REFER_RATIO",
+                  "DEVICE_TYPE",
+                  "DKIM",
+                  "DMARC",
+                  "DNS",
+                  "DNSSEC",
+                  "DNSSEC_AWARE",
+                  "DNSSEC_E2E",
+                  "DOMAIN_CATEGORY",
+                  "DURATION",
+                  "EDNS",
+                  "ENCRYPTED",
+                  "ENTRY_TYPE",
+                  "EXPIRATION_STATUS",
+                  "HAS_IPS",
+                  "HAS_MATCHING_ANSWER",
+                  "HAS_WILDCARDS",
+                  "HTTP_METHOD",
+                  "HTTP_PROTOCOL",
+                  "HTTP_VERSION",
+                  "INDUSTRY",
+                  "IP_VERSION",
+                  "JITTER",
+                  "KEY_AGREEMENT",
+                  "LATENCY",
+                  "LOCATION",
+                  "LOCATION_LATENCY",
+                  "LOG",
+                  "LOG_API",
+                  "LOG_OPERATOR",
+                  "MALICIOUS",
+                  "MANAGED_RULES",
+                  "MITIGATION_PRODUCT",
+                  "MODEL",
+                  "NAMESERVER_LATENCY",
+                  "ORIGIN",
+                  "ORIGIN_AS",
+                  "ORIGIN_LOCATION",
+                  "ORIGIN_TARGET_LOCATION_PAIR",
+                  "OS",
+                  "PERCENTILE",
+                  "POST_QUANTUM",
+                  "PREFIX",
+                  "PRODUCT",
+                  "PROTOCOL",
+                  "PROVIDER",
+                  "PUBLIC_KEY_ALGORITHM",
+                  "QUERY_TYPE",
+                  "REFERER",
+                  "REGION",
+                  "RESPONSE_CODE",
+                  "RESPONSE_STATUS",
+                  "RESPONSE_STATUS_CATEGORY",
+                  "RESPONSE_TTL",
+                  "SIGNATURE_ALGORITHM",
+                  "SPAM",
+                  "SPF",
+                  "SPOOF",
+                  "SUCCESS_RATE",
+                  "TARGET_LOCATION",
+                  "TASK",
+                  "THREAT_CATEGORY",
+                  "TLD",
+                  "TLD_DNS_MAGNITUDE",
+                  "TLS_VERSION",
+                  "UPDATE_TYPE",
+                  "USER_AGENT",
+                  "VALIDATION_LEVEL",
+                  "VECTOR",
+                  "VERTICAL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain.",
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1519,26 +1542,26 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/annotations`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["dataSource", args["data_source"], true],
-        ["eventType", args["event_type"], true],
-        ["outageType", args["outage_type"], true],
-        ["outageCause", args["outage_cause"], true],
-        ["tags", args["tags"], true],
-        ["query", args["query"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["geoId", args["geo_id"], true],
-        ["origin", args["origin"], true],
-        ["tld", args["tld"], true],
-        ["ca", args["ca"], true],
-        ["log", args["log"], true],
-        ["bot", args["bot"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["dataSource", param(args, "query", "dataSource"), true],
+        ["eventType", param(args, "query", "eventType"), true],
+        ["outageType", param(args, "query", "outageType"), true],
+        ["outageCause", param(args, "query", "outageCause"), true],
+        ["tags", param(args, "query", "tags"), true],
+        ["query", param(args, "query", "query"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["origin", param(args, "query", "origin"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["ca", param(args, "query", "ca"), true],
+        ["log", param(args, "query", "log"), true],
+        ["bot", param(args, "query", "bot"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/as112/tools.ts b/src/generated/forge-mcp/radar/as112/tools.ts
index 7e324d4c6..a3d1597d1 100644
--- a/src/generated/forge-mcp/radar/as112/tools.ts
+++ b/src/generated/forge-mcp/radar/as112/tools.ts
@@ -1,236 +1,252 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.as112`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_as112_summary_v2",
+    name: "radar_as112_summaryV2",
     title: "Get AS112 summary by dimension",
-    description: "Retrieves the distribution of AS112 queries by the specified dimension.",
+    description: "Retrieves the distribution of AS112 queries by the specified dimension.\n\nGET /radar/as112/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "DNSSEC",
+                "EDNS",
+                "IP_VERSION",
+                "PROTOCOL",
+                "QUERY_TYPE",
+                "RESPONSE_CODE"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "DNSSEC",
-            "EDNS",
-            "IP_VERSION",
-            "PROTOCOL",
-            "QUERY_TYPE",
-            "RESPONSE_CODE"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters results by DNS transport protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "HTTPS",
-              "TLS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "query_type": {
-          "description": "Filters results by DNS query type.",
-          "items": {
-            "oneOf": [
-              {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters results by DNS transport protocol.",
+              "items": {
                 "enum": [
-                  "A",
-                  "AAAA",
-                  "A6",
-                  "AFSDB",
-                  "ANY",
-                  "APL",
-                  "ATMA",
-                  "AXFR",
-                  "CAA",
-                  "CDNSKEY",
-                  "CDS",
-                  "CERT",
-                  "CNAME",
-                  "CSYNC",
-                  "DHCID",
-                  "DLV",
-                  "DNAME",
-                  "DNSKEY",
-                  "DOA",
-                  "DS",
-                  "EID",
-                  "EUI48",
-                  "EUI64",
-                  "GPOS",
-                  "GID",
-                  "HINFO",
-                  "HIP",
+                  "UDP",
+                  "TCP",
                   "HTTPS",
-                  "IPSECKEY",
-                  "ISDN",
-                  "IXFR",
-                  "KEY",
-                  "KX",
-                  "L32",
-                  "L64",
-                  "LOC",
-                  "LP",
-                  "MAILA",
-                  "MAILB",
-                  "MB",
-                  "MD",
-                  "MF",
-                  "MG",
-                  "MINFO",
-                  "MR",
-                  "MX",
-                  "NAPTR",
-                  "NB",
-                  "NBSTAT",
-                  "NID",
-                  "NIMLOC",
-                  "NINFO",
-                  "NS",
-                  "NSAP",
-                  "NSEC",
-                  "NSEC3",
-                  "NSEC3PARAM",
-                  "NULL",
-                  "NXT",
-                  "OPENPGPKEY",
-                  "OPT",
-                  "PTR",
-                  "PX",
-                  "RKEY",
-                  "RP",
-                  "RRSIG",
-                  "RT",
-                  "SIG",
-                  "SINK",
-                  "SMIMEA",
-                  "SOA",
-                  "SPF",
-                  "SRV",
-                  "SSHFP",
-                  "SVCB",
-                  "TA",
-                  "TALINK",
-                  "TKEY",
-                  "TLSA",
-                  "TSIG",
-                  "TXT",
-                  "UINFO",
-                  "UID",
-                  "UNSPEC",
-                  "URI",
-                  "WKS",
-                  "X25",
-                  "ZONEMD"
+                  "TLS"
                 ],
                 "type": "string"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        "response_code": {
-          "description": "Filters results by DNS response code.",
-          "items": {
-            "enum": [
-              "NOERROR",
-              "FORMERR",
-              "SERVFAIL",
-              "NXDOMAIN",
-              "NOTIMP",
-              "REFUSED",
-              "YXDOMAIN",
-              "YXRRSET",
-              "NXRRSET",
-              "NOTAUTH",
-              "NOTZONE",
-              "BADSIG",
-              "BADKEY",
-              "BADTIME",
-              "BADMODE",
-              "BADNAME",
-              "BADALG",
-              "BADTRUNC",
-              "BADCOOKIE"
-            ],
-            "type": "string"
+              "type": "array"
+            },
+            "queryType": {
+              "description": "Filters results by DNS query type.",
+              "items": {
+                "oneOf": [
+                  {
+                    "enum": [
+                      "A",
+                      "AAAA",
+                      "A6",
+                      "AFSDB",
+                      "ANY",
+                      "APL",
+                      "ATMA",
+                      "AXFR",
+                      "CAA",
+                      "CDNSKEY",
+                      "CDS",
+                      "CERT",
+                      "CNAME",
+                      "CSYNC",
+                      "DHCID",
+                      "DLV",
+                      "DNAME",
+                      "DNSKEY",
+                      "DOA",
+                      "DS",
+                      "EID",
+                      "EUI48",
+                      "EUI64",
+                      "GPOS",
+                      "GID",
+                      "HINFO",
+                      "HIP",
+                      "HTTPS",
+                      "IPSECKEY",
+                      "ISDN",
+                      "IXFR",
+                      "KEY",
+                      "KX",
+                      "L32",
+                      "L64",
+                      "LOC",
+                      "LP",
+                      "MAILA",
+                      "MAILB",
+                      "MB",
+                      "MD",
+                      "MF",
+                      "MG",
+                      "MINFO",
+                      "MR",
+                      "MX",
+                      "NAPTR",
+                      "NB",
+                      "NBSTAT",
+                      "NID",
+                      "NIMLOC",
+                      "NINFO",
+                      "NS",
+                      "NSAP",
+                      "NSEC",
+                      "NSEC3",
+                      "NSEC3PARAM",
+                      "NULL",
+                      "NXT",
+                      "OPENPGPKEY",
+                      "OPT",
+                      "PTR",
+                      "PX",
+                      "RKEY",
+                      "RP",
+                      "RRSIG",
+                      "RT",
+                      "SIG",
+                      "SINK",
+                      "SMIMEA",
+                      "SOA",
+                      "SPF",
+                      "SRV",
+                      "SSHFP",
+                      "SVCB",
+                      "TA",
+                      "TALINK",
+                      "TKEY",
+                      "TLSA",
+                      "TSIG",
+                      "TXT",
+                      "UINFO",
+                      "UID",
+                      "UNSPEC",
+                      "URI",
+                      "WKS",
+                      "X25",
+                      "ZONEMD"
+                    ],
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            },
+            "responseCode": {
+              "description": "Filters results by DNS response code.",
+              "items": {
+                "enum": [
+                  "NOERROR",
+                  "FORMERR",
+                  "SERVFAIL",
+                  "NXDOMAIN",
+                  "NOTIMP",
+                  "REFUSED",
+                  "YXDOMAIN",
+                  "YXRRSET",
+                  "NXRRSET",
+                  "NOTAUTH",
+                  "NOTZONE",
+                  "BADSIG",
+                  "BADKEY",
+                  "BADTIME",
+                  "BADMODE",
+                  "BADNAME",
+                  "BADALG",
+                  "BADTRUNC",
+                  "BADCOOKIE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -662,235 +678,242 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/as112/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["queryType", args["query_type"], true],
-        ["protocol", args["protocol"], true],
-        ["responseCode", args["response_code"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["queryType", param(args, "query", "queryType"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["responseCode", param(args, "query", "responseCode"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_as112_timeseries",
     title: "Get AS112 DNS queries time series",
-    description: "Retrieves the AS112 DNS queries over time.",
+    description: "Retrieves the AS112 DNS queries over time.\n\nGET /radar/as112/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters results by DNS transport protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "HTTPS",
-              "TLS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "query_type": {
-          "description": "Filters results by DNS query type.",
-          "items": {
-            "oneOf": [
-              {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters results by DNS transport protocol.",
+              "items": {
                 "enum": [
-                  "A",
-                  "AAAA",
-                  "A6",
-                  "AFSDB",
-                  "ANY",
-                  "APL",
-                  "ATMA",
-                  "AXFR",
-                  "CAA",
-                  "CDNSKEY",
-                  "CDS",
-                  "CERT",
-                  "CNAME",
-                  "CSYNC",
-                  "DHCID",
-                  "DLV",
-                  "DNAME",
-                  "DNSKEY",
-                  "DOA",
-                  "DS",
-                  "EID",
-                  "EUI48",
-                  "EUI64",
-                  "GPOS",
-                  "GID",
-                  "HINFO",
-                  "HIP",
+                  "UDP",
+                  "TCP",
                   "HTTPS",
-                  "IPSECKEY",
-                  "ISDN",
-                  "IXFR",
-                  "KEY",
-                  "KX",
-                  "L32",
-                  "L64",
-                  "LOC",
-                  "LP",
-                  "MAILA",
-                  "MAILB",
-                  "MB",
-                  "MD",
-                  "MF",
-                  "MG",
-                  "MINFO",
-                  "MR",
-                  "MX",
-                  "NAPTR",
-                  "NB",
-                  "NBSTAT",
-                  "NID",
-                  "NIMLOC",
-                  "NINFO",
-                  "NS",
-                  "NSAP",
-                  "NSEC",
-                  "NSEC3",
-                  "NSEC3PARAM",
-                  "NULL",
-                  "NXT",
-                  "OPENPGPKEY",
-                  "OPT",
-                  "PTR",
-                  "PX",
-                  "RKEY",
-                  "RP",
-                  "RRSIG",
-                  "RT",
-                  "SIG",
-                  "SINK",
-                  "SMIMEA",
-                  "SOA",
-                  "SPF",
-                  "SRV",
-                  "SSHFP",
-                  "SVCB",
-                  "TA",
-                  "TALINK",
-                  "TKEY",
-                  "TLSA",
-                  "TSIG",
-                  "TXT",
-                  "UINFO",
-                  "UID",
-                  "UNSPEC",
-                  "URI",
-                  "WKS",
-                  "X25",
-                  "ZONEMD"
+                  "TLS"
                 ],
                 "type": "string"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        "response_code": {
-          "description": "Filters results by DNS response code.",
-          "items": {
-            "enum": [
-              "NOERROR",
-              "FORMERR",
-              "SERVFAIL",
-              "NXDOMAIN",
-              "NOTIMP",
-              "REFUSED",
-              "YXDOMAIN",
-              "YXRRSET",
-              "NXRRSET",
-              "NOTAUTH",
-              "NOTZONE",
-              "BADSIG",
-              "BADKEY",
-              "BADTIME",
-              "BADMODE",
-              "BADNAME",
-              "BADALG",
-              "BADTRUNC",
-              "BADCOOKIE"
-            ],
-            "type": "string"
+              "type": "array"
+            },
+            "queryType": {
+              "description": "Filters results by DNS query type.",
+              "items": {
+                "oneOf": [
+                  {
+                    "enum": [
+                      "A",
+                      "AAAA",
+                      "A6",
+                      "AFSDB",
+                      "ANY",
+                      "APL",
+                      "ATMA",
+                      "AXFR",
+                      "CAA",
+                      "CDNSKEY",
+                      "CDS",
+                      "CERT",
+                      "CNAME",
+                      "CSYNC",
+                      "DHCID",
+                      "DLV",
+                      "DNAME",
+                      "DNSKEY",
+                      "DOA",
+                      "DS",
+                      "EID",
+                      "EUI48",
+                      "EUI64",
+                      "GPOS",
+                      "GID",
+                      "HINFO",
+                      "HIP",
+                      "HTTPS",
+                      "IPSECKEY",
+                      "ISDN",
+                      "IXFR",
+                      "KEY",
+                      "KX",
+                      "L32",
+                      "L64",
+                      "LOC",
+                      "LP",
+                      "MAILA",
+                      "MAILB",
+                      "MB",
+                      "MD",
+                      "MF",
+                      "MG",
+                      "MINFO",
+                      "MR",
+                      "MX",
+                      "NAPTR",
+                      "NB",
+                      "NBSTAT",
+                      "NID",
+                      "NIMLOC",
+                      "NINFO",
+                      "NS",
+                      "NSAP",
+                      "NSEC",
+                      "NSEC3",
+                      "NSEC3PARAM",
+                      "NULL",
+                      "NXT",
+                      "OPENPGPKEY",
+                      "OPT",
+                      "PTR",
+                      "PX",
+                      "RKEY",
+                      "RP",
+                      "RRSIG",
+                      "RT",
+                      "SIG",
+                      "SINK",
+                      "SMIMEA",
+                      "SOA",
+                      "SPF",
+                      "SRV",
+                      "SSHFP",
+                      "SVCB",
+                      "TA",
+                      "TALINK",
+                      "TKEY",
+                      "TLSA",
+                      "TSIG",
+                      "TXT",
+                      "UINFO",
+                      "UID",
+                      "UNSPEC",
+                      "URI",
+                      "WKS",
+                      "X25",
+                      "ZONEMD"
+                    ],
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            },
+            "responseCode": {
+              "description": "Filters results by DNS response code.",
+              "items": {
+                "enum": [
+                  "NOERROR",
+                  "FORMERR",
+                  "SERVFAIL",
+                  "NXDOMAIN",
+                  "NOTIMP",
+                  "REFUSED",
+                  "YXDOMAIN",
+                  "YXRRSET",
+                  "NXRRSET",
+                  "NOTAUTH",
+                  "NOTZONE",
+                  "BADSIG",
+                  "BADKEY",
+                  "BADTIME",
+                  "BADMODE",
+                  "BADNAME",
+                  "BADALG",
+                  "BADTRUNC",
+                  "BADCOOKIE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1374,254 +1397,270 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/as112/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["queryType", args["query_type"], true],
-        ["protocol", args["protocol"], true],
-        ["responseCode", args["response_code"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["queryType", param(args, "query", "queryType"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["responseCode", param(args, "query", "responseCode"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_as112_timeseries_groups_v2",
+    name: "radar_as112_timeseriesGroupsV2",
     title: "Get AS112 time series grouped by dimension",
-    description: "Retrieves the distribution of AS112 queries grouped by dimension over time.",
+    description: "Retrieves the distribution of AS112 queries grouped by dimension over time.\n\nGET /radar/as112/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "DNSSEC",
+                "EDNS",
+                "IP_VERSION",
+                "PROTOCOL",
+                "QUERY_TYPE",
+                "RESPONSE_CODE"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "DNSSEC",
-            "EDNS",
-            "IP_VERSION",
-            "PROTOCOL",
-            "QUERY_TYPE",
-            "RESPONSE_CODE"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters results by DNS transport protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "HTTPS",
-              "TLS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "query_type": {
-          "description": "Filters results by DNS query type.",
-          "items": {
-            "oneOf": [
-              {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters results by DNS transport protocol.",
+              "items": {
                 "enum": [
-                  "A",
-                  "AAAA",
-                  "A6",
-                  "AFSDB",
-                  "ANY",
-                  "APL",
-                  "ATMA",
-                  "AXFR",
-                  "CAA",
-                  "CDNSKEY",
-                  "CDS",
-                  "CERT",
-                  "CNAME",
-                  "CSYNC",
-                  "DHCID",
-                  "DLV",
-                  "DNAME",
-                  "DNSKEY",
-                  "DOA",
-                  "DS",
-                  "EID",
-                  "EUI48",
-                  "EUI64",
-                  "GPOS",
-                  "GID",
-                  "HINFO",
-                  "HIP",
+                  "UDP",
+                  "TCP",
                   "HTTPS",
-                  "IPSECKEY",
-                  "ISDN",
-                  "IXFR",
-                  "KEY",
-                  "KX",
-                  "L32",
-                  "L64",
-                  "LOC",
-                  "LP",
-                  "MAILA",
-                  "MAILB",
-                  "MB",
-                  "MD",
-                  "MF",
-                  "MG",
-                  "MINFO",
-                  "MR",
-                  "MX",
-                  "NAPTR",
-                  "NB",
-                  "NBSTAT",
-                  "NID",
-                  "NIMLOC",
-                  "NINFO",
-                  "NS",
-                  "NSAP",
-                  "NSEC",
-                  "NSEC3",
-                  "NSEC3PARAM",
-                  "NULL",
-                  "NXT",
-                  "OPENPGPKEY",
-                  "OPT",
-                  "PTR",
-                  "PX",
-                  "RKEY",
-                  "RP",
-                  "RRSIG",
-                  "RT",
-                  "SIG",
-                  "SINK",
-                  "SMIMEA",
-                  "SOA",
-                  "SPF",
-                  "SRV",
-                  "SSHFP",
-                  "SVCB",
-                  "TA",
-                  "TALINK",
-                  "TKEY",
-                  "TLSA",
-                  "TSIG",
-                  "TXT",
-                  "UINFO",
-                  "UID",
-                  "UNSPEC",
-                  "URI",
-                  "WKS",
-                  "X25",
-                  "ZONEMD"
+                  "TLS"
                 ],
                 "type": "string"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        "response_code": {
-          "description": "Filters results by DNS response code.",
-          "items": {
-            "enum": [
-              "NOERROR",
-              "FORMERR",
-              "SERVFAIL",
-              "NXDOMAIN",
-              "NOTIMP",
-              "REFUSED",
-              "YXDOMAIN",
-              "YXRRSET",
-              "NXRRSET",
-              "NOTAUTH",
-              "NOTZONE",
-              "BADSIG",
-              "BADKEY",
-              "BADTIME",
-              "BADMODE",
-              "BADNAME",
-              "BADALG",
-              "BADTRUNC",
-              "BADCOOKIE"
-            ],
-            "type": "string"
+              "type": "array"
+            },
+            "queryType": {
+              "description": "Filters results by DNS query type.",
+              "items": {
+                "oneOf": [
+                  {
+                    "enum": [
+                      "A",
+                      "AAAA",
+                      "A6",
+                      "AFSDB",
+                      "ANY",
+                      "APL",
+                      "ATMA",
+                      "AXFR",
+                      "CAA",
+                      "CDNSKEY",
+                      "CDS",
+                      "CERT",
+                      "CNAME",
+                      "CSYNC",
+                      "DHCID",
+                      "DLV",
+                      "DNAME",
+                      "DNSKEY",
+                      "DOA",
+                      "DS",
+                      "EID",
+                      "EUI48",
+                      "EUI64",
+                      "GPOS",
+                      "GID",
+                      "HINFO",
+                      "HIP",
+                      "HTTPS",
+                      "IPSECKEY",
+                      "ISDN",
+                      "IXFR",
+                      "KEY",
+                      "KX",
+                      "L32",
+                      "L64",
+                      "LOC",
+                      "LP",
+                      "MAILA",
+                      "MAILB",
+                      "MB",
+                      "MD",
+                      "MF",
+                      "MG",
+                      "MINFO",
+                      "MR",
+                      "MX",
+                      "NAPTR",
+                      "NB",
+                      "NBSTAT",
+                      "NID",
+                      "NIMLOC",
+                      "NINFO",
+                      "NS",
+                      "NSAP",
+                      "NSEC",
+                      "NSEC3",
+                      "NSEC3PARAM",
+                      "NULL",
+                      "NXT",
+                      "OPENPGPKEY",
+                      "OPT",
+                      "PTR",
+                      "PX",
+                      "RKEY",
+                      "RP",
+                      "RRSIG",
+                      "RT",
+                      "SIG",
+                      "SINK",
+                      "SMIMEA",
+                      "SOA",
+                      "SPF",
+                      "SRV",
+                      "SSHFP",
+                      "SVCB",
+                      "TA",
+                      "TALINK",
+                      "TKEY",
+                      "TLSA",
+                      "TSIG",
+                      "TXT",
+                      "UINFO",
+                      "UID",
+                      "UNSPEC",
+                      "URI",
+                      "WKS",
+                      "X25",
+                      "ZONEMD"
+                    ],
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            },
+            "responseCode": {
+              "description": "Filters results by DNS response code.",
+              "items": {
+                "enum": [
+                  "NOERROR",
+                  "FORMERR",
+                  "SERVFAIL",
+                  "NXDOMAIN",
+                  "NOTIMP",
+                  "REFUSED",
+                  "YXDOMAIN",
+                  "YXRRSET",
+                  "NXRRSET",
+                  "NOTAUTH",
+                  "NOTZONE",
+                  "BADSIG",
+                  "BADKEY",
+                  "BADTIME",
+                  "BADMODE",
+                  "BADNAME",
+                  "BADALG",
+                  "BADTRUNC",
+                  "BADCOOKIE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2105,18 +2144,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/as112/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["queryType", args["query_type"], true],
-        ["protocol", args["protocol"], true],
-        ["responseCode", args["response_code"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["queryType", param(args, "query", "queryType"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["responseCode", param(args, "query", "responseCode"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/as112/top/tools.ts b/src/generated/forge-mcp/radar/as112/top/tools.ts
index 6d1878946..17b94f675 100644
--- a/src/generated/forge-mcp/radar/as112/top/tools.ts
+++ b/src/generated/forge-mcp/radar/as112/top/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.as112.top`.
@@ -10,79 +10,95 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_as112_top_dnssec",
     title: "Get top locations by AS112 DNS queries with DNSSEC support",
-    description: "Retrieves the top locations of DNS queries to AS112 with DNSSEC (DNS Security Extensions) support.",
+    description: "Retrieves the top locations of DNS queries to AS112 with DNSSEC (DNS Security Extensions) support.\n\nGET /radar/as112/top/locations/dnssec/{dnssec}",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dnssec": {
+              "description": "DNSSEC (DNS Security Extensions) status.",
+              "enum": [
+                "SUPPORTED",
+                "NOT_SUPPORTED"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dnssec": {
-          "description": "DNSSEC (DNS Security Extensions) status.",
-          "enum": [
-            "SUPPORTED",
-            "NOT_SUPPORTED"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dnssec"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dnssec"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -541,93 +557,109 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/as112/top/locations/dnssec/${pathParam(args, "dnssec")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_as112_top_edns",
     title: "Get top locations by AS112 DNS queries with EDNS support",
-    description: "Retrieves the top locations of DNS queries to AS112 with EDNS (Extension Mechanisms for DNS) support.",
+    description: "Retrieves the top locations of DNS queries to AS112 with EDNS (Extension Mechanisms for DNS) support.\n\nGET /radar/as112/top/locations/edns/{edns}",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "edns": {
+              "description": "EDNS (Extension Mechanisms for DNS) status.",
+              "enum": [
+                "SUPPORTED",
+                "NOT_SUPPORTED"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "edns": {
-          "description": "EDNS (Extension Mechanisms for DNS) status.",
-          "enum": [
-            "SUPPORTED",
-            "NOT_SUPPORTED"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "edns"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "edns"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1086,93 +1118,109 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/as112/top/locations/edns/${pathParam(args, "edns")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_as112_top_ip_version",
+    name: "radar_as112_top_ipVersion",
     title: "Get top locations by AS112 DNS queries for an IP version",
-    description: "Retrieves the top locations of DNS queries to AS112 for an IP version.",
+    description: "Retrieves the top locations of DNS queries to AS112 for an IP version.\n\nGET /radar/as112/top/locations/ip_version/{ip_version}",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ip_version": {
+              "description": "IP version.",
+              "enum": [
+                "IPv4",
+                "IPv6"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "IP version.",
-          "enum": [
-            "IPv4",
-            "IPv6"
+          "required": [
+            "ip_version"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "ip_version"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1631,82 +1679,89 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/as112/top/locations/ip_version/${pathParam(args, "ip_version")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_as112_top_locations",
     title: "Get top locations by AS112 DNS queries",
-    description: "Retrieves the top locations by AS112 DNS queries.",
+    description: "Retrieves the top locations by AS112 DNS queries.\n\nGET /radar/as112/top/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2165,14 +2220,14 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/as112/top/locations`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/attacks/layer3/tools.ts b/src/generated/forge-mcp/radar/attacks/layer3/tools.ts
index e9c14e3e4..f11d518b9 100644
--- a/src/generated/forge-mcp/radar/attacks/layer3/tools.ts
+++ b/src/generated/forge-mcp/radar/attacks/layer3/tools.ts
@@ -1,125 +1,141 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.attacks.layer3`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_attacks_layer3_summary_v2",
+    name: "radar_attacks_layer3_summaryV2",
     title: "Get layer 3 attacks summary by dimension",
-    description: "Retrieves the distribution of layer 3 attacks by the specified dimension.",
+    description: "Retrieves the distribution of layer 3 attacks by the specified dimension.\n\nGET /radar/attacks/layer3/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "PROTOCOL",
+                "IP_VERSION",
+                "VECTOR",
+                "DURATION",
+                "BITRATE",
+                "VERTICAL",
+                "INDUSTRY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "PROTOCOL",
-            "IP_VERSION",
-            "VECTOR",
-            "DURATION",
-            "BITRATE",
-            "VERTICAL",
-            "INDUSTRY"
-          ],
-          "type": "string"
-        },
-        "direction": {
-          "default": "ORIGIN",
-          "description": "Specifies whether the `location` filter applies to the source or target location.",
-          "enum": [
-            "ORIGIN",
-            "TARGET"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "protocol": {
-          "description": "Filters the results by layer 3/4 protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "ICMP",
-              "GRE"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "direction": {
+              "default": "ORIGIN",
+              "description": "Specifies whether the `location` filter applies to the source or target location.",
+              "enum": [
+                "ORIGIN",
+                "TARGET"
+              ],
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters the results by layer 3/4 protocol.",
+              "items": {
+                "enum": [
+                  "UDP",
+                  "TCP",
+                  "ICMP",
+                  "GRE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -551,147 +567,154 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer3/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["protocol", args["protocol"], true],
-        ["direction", args["direction"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_attacks_layer3_timeseries",
     title: "Get layer 3 attacks by bytes time series",
-    description: "Retrieves layer 3 attacks over time.",
+    description: "Retrieves layer 3 attacks over time.\n\nGET /radar/attacks/layer3/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "direction": {
-          "default": "ORIGIN",
-          "description": "Specifies whether the `location` filter applies to the source or target location.",
-          "enum": [
-            "ORIGIN",
-            "TARGET"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "metric": {
-          "default": "bytes",
-          "description": "Measurement units, eg. bytes.",
-          "enum": [
-            "BYTES",
-            "BYTES_OLD"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "normalization": {
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
-          "enum": [
-            "PERCENTAGE_CHANGE",
-            "MIN0_MAX"
-          ],
-          "type": "string"
-        },
-        "protocol": {
-          "description": "Filters the results by layer 3/4 protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "ICMP",
-              "GRE"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "direction": {
+              "default": "ORIGIN",
+              "description": "Specifies whether the `location` filter applies to the source or target location.",
+              "enum": [
+                "ORIGIN",
+                "TARGET"
+              ],
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "metric": {
+              "default": "bytes",
+              "description": "Measurement units, eg. bytes.",
+              "enum": [
+                "BYTES",
+                "BYTES_OLD"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
+              "enum": [
+                "PERCENTAGE_CHANGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            },
+            "protocol": {
+              "description": "Filters the results by layer 3/4 protocol.",
+              "items": {
+                "enum": [
+                  "UDP",
+                  "TCP",
+                  "ICMP",
+                  "GRE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1175,155 +1198,171 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer3/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["protocol", args["protocol"], true],
-        ["normalization", args["normalization"], true],
-        ["metric", args["metric"], true],
-        ["direction", args["direction"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_attacks_layer3_timeseries_groups_v2",
+    name: "radar_attacks_layer3_timeseriesGroupsV2",
     title: "Get layer 3 attacks time series grouped by dimension",
-    description: "Retrieves the distribution of layer 3 attacks grouped by dimension over time.",
+    description: "Retrieves the distribution of layer 3 attacks grouped by dimension over time.\n\nGET /radar/attacks/layer3/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "PROTOCOL",
-            "IP_VERSION",
-            "VECTOR",
-            "DURATION",
-            "BITRATE",
-            "VERTICAL",
-            "INDUSTRY"
-          ],
-          "type": "string"
-        },
-        "direction": {
-          "default": "ORIGIN",
-          "description": "Specifies whether the `location` filter applies to the source or target location.",
-          "enum": [
-            "ORIGIN",
-            "TARGET"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "PROTOCOL",
+                "IP_VERSION",
+                "VECTOR",
+                "DURATION",
+                "BITRATE",
+                "VERTICAL",
+                "INDUSTRY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "protocol": {
-          "description": "Filters the results by layer 3/4 protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "ICMP",
-              "GRE"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "direction": {
+              "default": "ORIGIN",
+              "description": "Specifies whether the `location` filter applies to the source or target location.",
+              "enum": [
+                "ORIGIN",
+                "TARGET"
+              ],
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            },
+            "protocol": {
+              "description": "Filters the results by layer 3/4 protocol.",
+              "items": {
+                "enum": [
+                  "UDP",
+                  "TCP",
+                  "ICMP",
+                  "GRE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1807,19 +1846,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer3/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["protocol", args["protocol"], true],
-        ["normalization", args["normalization"], true],
-        ["direction", args["direction"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/attacks/layer3/top/locations/tools.ts b/src/generated/forge-mcp/radar/attacks/layer3/top/locations/tools.ts
index c1ff2e29d..7fba49e07 100644
--- a/src/generated/forge-mcp/radar/attacks/layer3/top/locations/tools.ts
+++ b/src/generated/forge-mcp/radar/attacks/layer3/top/locations/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../../_/tool.js";
+import { type Tool, param } from "../../../../../_/tool.js";
 
 /**
  * The tools of `radar.attacks.layer3.top.locations`.
@@ -10,92 +10,99 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_attacks_layer3_top_locations_origin",
     title: "Get top origin locations of layer 3 attacks",
-    description: "Retrieves the origin locations of layer 3 attacks.",
+    description: "Retrieves the origin locations of layer 3 attacks.\n\nGET /radar/attacks/layer3/top/locations/origin",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters the results by layer 3/4 protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "ICMP",
-              "GRE"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters the results by layer 3/4 protocol.",
+              "items": {
+                "enum": [
+                  "UDP",
+                  "TCP",
+                  "ICMP",
+                  "GRE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -562,108 +569,115 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer3/top/locations/origin`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["protocol", args["protocol"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_attacks_layer3_top_locations_target",
     title: "Get top target locations of layer 3 attacks",
-    description: "Retrieves the target locations of layer 3 attacks.",
+    description: "Retrieves the target locations of layer 3 attacks.\n\nGET /radar/attacks/layer3/top/locations/target",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters the results by layer 3/4 protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "ICMP",
-              "GRE"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters the results by layer 3/4 protocol.",
+              "items": {
+                "enum": [
+                  "UDP",
+                  "TCP",
+                  "ICMP",
+                  "GRE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1130,16 +1144,16 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer3/top/locations/target`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["protocol", args["protocol"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/attacks/layer3/top/tools.ts b/src/generated/forge-mcp/radar/attacks/layer3/top/tools.ts
index 6a4867f53..19bd04c3d 100644
--- a/src/generated/forge-mcp/radar/attacks/layer3/top/tools.ts
+++ b/src/generated/forge-mcp/radar/attacks/layer3/top/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.attacks.layer3.top`.
@@ -10,123 +10,130 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_attacks_layer3_top_attacks",
     title: "Get top layer 3 attack pairs (origin and target locations)",
-    description: "Retrieves the top layer 3 attacks from origin to target location. Values are a percentage out of the total layer 3 attacks (with billing country). You can optionally limit the number of attacks by origin/target location (useful if all the top attacks are from or to the same location).",
+    description: "Retrieves the top layer 3 attacks from origin to target location. Values are a percentage out of the total layer 3 attacks (with billing country). You can optionally limit the number of attacks by origin/target location (useful if all the top attacks are from or to the same location).\n\nGET /radar/attacks/layer3/top/attacks",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "limit_direction": {
-          "default": "ORIGIN",
-          "description": "Specifies whether the `limitPerLocation` applies to the source or target location.",
-          "enum": [
-            "ORIGIN",
-            "TARGET"
-          ],
-          "type": "string"
-        },
-        "limit_per_location": {
-          "default": 10,
-          "description": "Limits the number of attacks per origin/target (refer to `limitDirection` parameter) location.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "magnitude": {
-          "description": "Orders results based on attack magnitude, defined by total mitigated bytes or total mitigated attacks.",
-          "enum": [
-            "MITIGATED_BYTES",
-            "MITIGATED_ATTACKS"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN_MAX"
-          ],
-          "type": "string"
-        },
-        "protocol": {
-          "description": "Filters the results by layer 3/4 protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "ICMP",
-              "GRE"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "limitDirection": {
+              "default": "ORIGIN",
+              "description": "Specifies whether the `limitPerLocation` applies to the source or target location.",
+              "enum": [
+                "ORIGIN",
+                "TARGET"
+              ],
+              "type": "string"
+            },
+            "limitPerLocation": {
+              "default": 10,
+              "description": "Limits the number of attacks per origin/target (refer to `limitDirection` parameter) location.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "magnitude": {
+              "description": "Orders results based on attack magnitude, defined by total mitigated bytes or total mitigated attacks.",
+              "enum": [
+                "MITIGATED_BYTES",
+                "MITIGATED_ATTACKS"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN_MAX"
+              ],
+              "type": "string"
+            },
+            "protocol": {
+              "description": "Filters the results by layer 3/4 protocol.",
+              "items": {
+                "enum": [
+                  "UDP",
+                  "TCP",
+                  "ICMP",
+                  "GRE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -585,20 +592,20 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer3/top/attacks`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["protocol", args["protocol"], true],
-        ["limitDirection", args["limit_direction"], true],
-        ["limitPerLocation", args["limit_per_location"], true],
-        ["magnitude", args["magnitude"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["limitDirection", param(args, "query", "limitDirection"), true],
+        ["limitPerLocation", param(args, "query", "limitPerLocation"), true],
+        ["magnitude", param(args, "query", "magnitude"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/attacks/layer7/tools.ts b/src/generated/forge-mcp/radar/attacks/layer7/tools.ts
index 7896a7a62..0784fd0bb 100644
--- a/src/generated/forge-mcp/radar/attacks/layer7/tools.ts
+++ b/src/generated/forge-mcp/radar/attacks/layer7/tools.ts
@@ -1,193 +1,209 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.attacks.layer7`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_attacks_layer7_summary_v2",
+    name: "radar_attacks_layer7_summaryV2",
     title: "Get layer 7 attacks summary by dimension",
-    description: "Retrieves the distribution of layer 7 attacks by the specified dimension.",
+    description: "Retrieves the distribution of layer 7 attacks by the specified dimension.\n\nGET /radar/attacks/layer7/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "HTTP_METHOD",
+                "HTTP_VERSION",
+                "IP_VERSION",
+                "MANAGED_RULES",
+                "MITIGATION_PRODUCT",
+                "VERTICAL",
+                "INDUSTRY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "HTTP_METHOD",
-            "HTTP_VERSION",
-            "IP_VERSION",
-            "MANAGED_RULES",
-            "MITIGATION_PRODUCT",
-            "VERTICAL",
-            "INDUSTRY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "http_method": {
-          "description": "Filters results by HTTP method.",
-          "items": {
-            "enum": [
-              "GET",
-              "POST",
-              "DELETE",
-              "PUT",
-              "HEAD",
-              "PURGE",
-              "OPTIONS",
-              "PROPFIND",
-              "MKCOL",
-              "PATCH",
-              "ACL",
-              "BCOPY",
-              "BDELETE",
-              "BMOVE",
-              "BPROPFIND",
-              "BPROPPATCH",
-              "CHECKIN",
-              "CHECKOUT",
-              "CONNECT",
-              "COPY",
-              "LABEL",
-              "LOCK",
-              "MERGE",
-              "MKACTIVITY",
-              "MKWORKSPACE",
-              "MOVE",
-              "NOTIFY",
-              "ORDERPATCH",
-              "POLL",
-              "PROPPATCH",
-              "REPORT",
-              "SEARCH",
-              "SUBSCRIBE",
-              "TRACE",
-              "UNCHECKOUT",
-              "UNLOCK",
-              "UNSUBSCRIBE",
-              "UPDATE",
-              "VERSIONCONTROL",
-              "BASELINECONTROL",
-              "XMSENUMATTS",
-              "RPC_OUT_DATA",
-              "RPC_IN_DATA",
-              "JSON",
-              "COOK",
-              "TRACK"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "mitigation_product": {
-          "description": "Filters the results by layer 7 mitigation product.",
-          "items": {
-            "enum": [
-              "DDOS",
-              "WAF",
-              "BOT_MANAGEMENT",
-              "ACCESS_RULES",
-              "IP_REPUTATION",
-              "API_SHIELD",
-              "DATA_LOSS_PREVENTION"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "httpMethod": {
+              "description": "Filters results by HTTP method.",
+              "items": {
+                "enum": [
+                  "GET",
+                  "POST",
+                  "DELETE",
+                  "PUT",
+                  "HEAD",
+                  "PURGE",
+                  "OPTIONS",
+                  "PROPFIND",
+                  "MKCOL",
+                  "PATCH",
+                  "ACL",
+                  "BCOPY",
+                  "BDELETE",
+                  "BMOVE",
+                  "BPROPFIND",
+                  "BPROPPATCH",
+                  "CHECKIN",
+                  "CHECKOUT",
+                  "CONNECT",
+                  "COPY",
+                  "LABEL",
+                  "LOCK",
+                  "MERGE",
+                  "MKACTIVITY",
+                  "MKWORKSPACE",
+                  "MOVE",
+                  "NOTIFY",
+                  "ORDERPATCH",
+                  "POLL",
+                  "PROPPATCH",
+                  "REPORT",
+                  "SEARCH",
+                  "SUBSCRIBE",
+                  "TRACE",
+                  "UNCHECKOUT",
+                  "UNLOCK",
+                  "UNSUBSCRIBE",
+                  "UPDATE",
+                  "VERSIONCONTROL",
+                  "BASELINECONTROL",
+                  "XMSENUMATTS",
+                  "RPC_OUT_DATA",
+                  "RPC_IN_DATA",
+                  "JSON",
+                  "COOK",
+                  "TRACK"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "mitigationProduct": {
+              "description": "Filters the results by layer 7 mitigation product.",
+              "items": {
+                "enum": [
+                  "DDOS",
+                  "WAF",
+                  "BOT_MANAGEMENT",
+                  "ACCESS_RULES",
+                  "IP_REPUTATION",
+                  "API_SHIELD",
+                  "DATA_LOSS_PREVENTION"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -619,201 +635,208 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer7/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["httpVersion", args["http_version"], true],
-        ["httpMethod", args["http_method"], true],
-        ["mitigationProduct", args["mitigation_product"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["httpMethod", param(args, "query", "httpMethod"), true],
+        ["mitigationProduct", param(args, "query", "mitigationProduct"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_attacks_layer7_timeseries",
     title: "Get layer 7 attacks time series",
-    description: "Retrieves layer 7 attacks over time.",
+    description: "Retrieves layer 7 attacks over time.\n\nGET /radar/attacks/layer7/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "http_method": {
-          "description": "Filters results by HTTP method.",
-          "items": {
-            "enum": [
-              "GET",
-              "POST",
-              "DELETE",
-              "PUT",
-              "HEAD",
-              "PURGE",
-              "OPTIONS",
-              "PROPFIND",
-              "MKCOL",
-              "PATCH",
-              "ACL",
-              "BCOPY",
-              "BDELETE",
-              "BMOVE",
-              "BPROPFIND",
-              "BPROPPATCH",
-              "CHECKIN",
-              "CHECKOUT",
-              "CONNECT",
-              "COPY",
-              "LABEL",
-              "LOCK",
-              "MERGE",
-              "MKACTIVITY",
-              "MKWORKSPACE",
-              "MOVE",
-              "NOTIFY",
-              "ORDERPATCH",
-              "POLL",
-              "PROPPATCH",
-              "REPORT",
-              "SEARCH",
-              "SUBSCRIBE",
-              "TRACE",
-              "UNCHECKOUT",
-              "UNLOCK",
-              "UNSUBSCRIBE",
-              "UPDATE",
-              "VERSIONCONTROL",
-              "BASELINECONTROL",
-              "XMSENUMATTS",
-              "RPC_OUT_DATA",
-              "RPC_IN_DATA",
-              "JSON",
-              "COOK",
-              "TRACK"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "mitigation_product": {
-          "description": "Filters the results by layer 7 mitigation product.",
-          "items": {
-            "enum": [
-              "DDOS",
-              "WAF",
-              "BOT_MANAGEMENT",
-              "ACCESS_RULES",
-              "IP_REPUTATION",
-              "API_SHIELD",
-              "DATA_LOSS_PREVENTION"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "httpMethod": {
+              "description": "Filters results by HTTP method.",
+              "items": {
+                "enum": [
+                  "GET",
+                  "POST",
+                  "DELETE",
+                  "PUT",
+                  "HEAD",
+                  "PURGE",
+                  "OPTIONS",
+                  "PROPFIND",
+                  "MKCOL",
+                  "PATCH",
+                  "ACL",
+                  "BCOPY",
+                  "BDELETE",
+                  "BMOVE",
+                  "BPROPFIND",
+                  "BPROPPATCH",
+                  "CHECKIN",
+                  "CHECKOUT",
+                  "CONNECT",
+                  "COPY",
+                  "LABEL",
+                  "LOCK",
+                  "MERGE",
+                  "MKACTIVITY",
+                  "MKWORKSPACE",
+                  "MOVE",
+                  "NOTIFY",
+                  "ORDERPATCH",
+                  "POLL",
+                  "PROPPATCH",
+                  "REPORT",
+                  "SEARCH",
+                  "SUBSCRIBE",
+                  "TRACE",
+                  "UNCHECKOUT",
+                  "UNLOCK",
+                  "UNSUBSCRIBE",
+                  "UPDATE",
+                  "VERSIONCONTROL",
+                  "BASELINECONTROL",
+                  "XMSENUMATTS",
+                  "RPC_OUT_DATA",
+                  "RPC_IN_DATA",
+                  "JSON",
+                  "COOK",
+                  "TRACK"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "mitigationProduct": {
+              "description": "Filters the results by layer 7 mitigation product.",
+              "items": {
+                "enum": [
+                  "DDOS",
+                  "WAF",
+                  "BOT_MANAGEMENT",
+                  "ACCESS_RULES",
+                  "IP_REPUTATION",
+                  "API_SHIELD",
+                  "DATA_LOSS_PREVENTION"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
+              "enum": [
+                "PERCENTAGE_CHANGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
-          "enum": [
-            "PERCENTAGE_CHANGE",
-            "MIN0_MAX"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1299,223 +1322,239 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer7/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["normalization", args["normalization"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["httpVersion", args["http_version"], true],
-        ["httpMethod", args["http_method"], true],
-        ["mitigationProduct", args["mitigation_product"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["httpMethod", param(args, "query", "httpMethod"), true],
+        ["mitigationProduct", param(args, "query", "mitigationProduct"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_attacks_layer7_timeseries_groups_v2",
+    name: "radar_attacks_layer7_timeseriesGroupsV2",
     title: "Get layer 7 attacks time series grouped by dimension",
-    description: "Retrieves the distribution of layer 7 attacks grouped by dimension over time.",
+    description: "Retrieves the distribution of layer 7 attacks grouped by dimension over time.\n\nGET /radar/attacks/layer7/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "HTTP_METHOD",
+                "HTTP_VERSION",
+                "IP_VERSION",
+                "MANAGED_RULES",
+                "MITIGATION_PRODUCT",
+                "VERTICAL",
+                "INDUSTRY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "HTTP_METHOD",
-            "HTTP_VERSION",
-            "IP_VERSION",
-            "MANAGED_RULES",
-            "MITIGATION_PRODUCT",
-            "VERTICAL",
-            "INDUSTRY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "http_method": {
-          "description": "Filters results by HTTP method.",
-          "items": {
-            "enum": [
-              "GET",
-              "POST",
-              "DELETE",
-              "PUT",
-              "HEAD",
-              "PURGE",
-              "OPTIONS",
-              "PROPFIND",
-              "MKCOL",
-              "PATCH",
-              "ACL",
-              "BCOPY",
-              "BDELETE",
-              "BMOVE",
-              "BPROPFIND",
-              "BPROPPATCH",
-              "CHECKIN",
-              "CHECKOUT",
-              "CONNECT",
-              "COPY",
-              "LABEL",
-              "LOCK",
-              "MERGE",
-              "MKACTIVITY",
-              "MKWORKSPACE",
-              "MOVE",
-              "NOTIFY",
-              "ORDERPATCH",
-              "POLL",
-              "PROPPATCH",
-              "REPORT",
-              "SEARCH",
-              "SUBSCRIBE",
-              "TRACE",
-              "UNCHECKOUT",
-              "UNLOCK",
-              "UNSUBSCRIBE",
-              "UPDATE",
-              "VERSIONCONTROL",
-              "BASELINECONTROL",
-              "XMSENUMATTS",
-              "RPC_OUT_DATA",
-              "RPC_IN_DATA",
-              "JSON",
-              "COOK",
-              "TRACK"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "mitigation_product": {
-          "description": "Filters the results by layer 7 mitigation product.",
-          "items": {
-            "enum": [
-              "DDOS",
-              "WAF",
-              "BOT_MANAGEMENT",
-              "ACCESS_RULES",
-              "IP_REPUTATION",
-              "API_SHIELD",
-              "DATA_LOSS_PREVENTION"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "httpMethod": {
+              "description": "Filters results by HTTP method.",
+              "items": {
+                "enum": [
+                  "GET",
+                  "POST",
+                  "DELETE",
+                  "PUT",
+                  "HEAD",
+                  "PURGE",
+                  "OPTIONS",
+                  "PROPFIND",
+                  "MKCOL",
+                  "PATCH",
+                  "ACL",
+                  "BCOPY",
+                  "BDELETE",
+                  "BMOVE",
+                  "BPROPFIND",
+                  "BPROPPATCH",
+                  "CHECKIN",
+                  "CHECKOUT",
+                  "CONNECT",
+                  "COPY",
+                  "LABEL",
+                  "LOCK",
+                  "MERGE",
+                  "MKACTIVITY",
+                  "MKWORKSPACE",
+                  "MOVE",
+                  "NOTIFY",
+                  "ORDERPATCH",
+                  "POLL",
+                  "PROPPATCH",
+                  "REPORT",
+                  "SEARCH",
+                  "SUBSCRIBE",
+                  "TRACE",
+                  "UNCHECKOUT",
+                  "UNLOCK",
+                  "UNSUBSCRIBE",
+                  "UPDATE",
+                  "VERSIONCONTROL",
+                  "BASELINECONTROL",
+                  "XMSENUMATTS",
+                  "RPC_OUT_DATA",
+                  "RPC_IN_DATA",
+                  "JSON",
+                  "COOK",
+                  "TRACK"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "mitigationProduct": {
+              "description": "Filters the results by layer 7 mitigation product.",
+              "items": {
+                "enum": [
+                  "DDOS",
+                  "WAF",
+                  "BOT_MANAGEMENT",
+                  "ACCESS_RULES",
+                  "IP_REPUTATION",
+                  "API_SHIELD",
+                  "DATA_LOSS_PREVENTION"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1999,21 +2038,21 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer7/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["httpVersion", args["http_version"], true],
-        ["httpMethod", args["http_method"], true],
-        ["mitigationProduct", args["mitigation_product"], true],
-        ["normalization", args["normalization"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["httpMethod", param(args, "query", "httpMethod"), true],
+        ["mitigationProduct", param(args, "query", "mitigationProduct"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/attacks/layer7/top/ases/tools.ts b/src/generated/forge-mcp/radar/attacks/layer7/top/ases/tools.ts
index 62b342980..8404ecae6 100644
--- a/src/generated/forge-mcp/radar/attacks/layer7/top/ases/tools.ts
+++ b/src/generated/forge-mcp/radar/attacks/layer7/top/ases/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../../_/tool.js";
+import { type Tool, param } from "../../../../../_/tool.js";
 
 /**
  * The tools of `radar.attacks.layer7.top.ases`.
@@ -10,162 +10,169 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_attacks_layer7_top_ases_origin",
     title: "Get top origin ASes of layer 7 attacks",
-    description: "Retrieves the top origin autonomous systems of layer 7 attacks. Values are percentages of the total layer 7 attacks, with the origin autonomous systems determined by the client IP address.",
+    description: "Retrieves the top origin autonomous systems of layer 7 attacks. Values are percentages of the total layer 7 attacks, with the origin autonomous systems determined by the client IP address.\n\nGET /radar/attacks/layer7/top/ases/origin",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "http_method": {
-          "description": "Filters results by HTTP method.",
-          "items": {
-            "enum": [
-              "GET",
-              "POST",
-              "DELETE",
-              "PUT",
-              "HEAD",
-              "PURGE",
-              "OPTIONS",
-              "PROPFIND",
-              "MKCOL",
-              "PATCH",
-              "ACL",
-              "BCOPY",
-              "BDELETE",
-              "BMOVE",
-              "BPROPFIND",
-              "BPROPPATCH",
-              "CHECKIN",
-              "CHECKOUT",
-              "CONNECT",
-              "COPY",
-              "LABEL",
-              "LOCK",
-              "MERGE",
-              "MKACTIVITY",
-              "MKWORKSPACE",
-              "MOVE",
-              "NOTIFY",
-              "ORDERPATCH",
-              "POLL",
-              "PROPPATCH",
-              "REPORT",
-              "SEARCH",
-              "SUBSCRIBE",
-              "TRACE",
-              "UNCHECKOUT",
-              "UNLOCK",
-              "UNSUBSCRIBE",
-              "UPDATE",
-              "VERSIONCONTROL",
-              "BASELINECONTROL",
-              "XMSENUMATTS",
-              "RPC_OUT_DATA",
-              "RPC_IN_DATA",
-              "JSON",
-              "COOK",
-              "TRACK"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "mitigation_product": {
-          "description": "Filters the results by layer 7 mitigation product.",
-          "items": {
-            "enum": [
-              "DDOS",
-              "WAF",
-              "BOT_MANAGEMENT",
-              "ACCESS_RULES",
-              "IP_REPUTATION",
-              "API_SHIELD",
-              "DATA_LOSS_PREVENTION"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "httpMethod": {
+              "description": "Filters results by HTTP method.",
+              "items": {
+                "enum": [
+                  "GET",
+                  "POST",
+                  "DELETE",
+                  "PUT",
+                  "HEAD",
+                  "PURGE",
+                  "OPTIONS",
+                  "PROPFIND",
+                  "MKCOL",
+                  "PATCH",
+                  "ACL",
+                  "BCOPY",
+                  "BDELETE",
+                  "BMOVE",
+                  "BPROPFIND",
+                  "BPROPPATCH",
+                  "CHECKIN",
+                  "CHECKOUT",
+                  "CONNECT",
+                  "COPY",
+                  "LABEL",
+                  "LOCK",
+                  "MERGE",
+                  "MKACTIVITY",
+                  "MKWORKSPACE",
+                  "MOVE",
+                  "NOTIFY",
+                  "ORDERPATCH",
+                  "POLL",
+                  "PROPPATCH",
+                  "REPORT",
+                  "SEARCH",
+                  "SUBSCRIBE",
+                  "TRACE",
+                  "UNCHECKOUT",
+                  "UNLOCK",
+                  "UNSUBSCRIBE",
+                  "UPDATE",
+                  "VERSIONCONTROL",
+                  "BASELINECONTROL",
+                  "XMSENUMATTS",
+                  "RPC_OUT_DATA",
+                  "RPC_IN_DATA",
+                  "JSON",
+                  "COOK",
+                  "TRACK"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "mitigationProduct": {
+              "description": "Filters the results by layer 7 mitigation product.",
+              "items": {
+                "enum": [
+                  "DDOS",
+                  "WAF",
+                  "BOT_MANAGEMENT",
+                  "ACCESS_RULES",
+                  "IP_REPUTATION",
+                  "API_SHIELD",
+                  "DATA_LOSS_PREVENTION"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -632,18 +639,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer7/top/ases/origin`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["httpVersion", args["http_version"], true],
-        ["httpMethod", args["http_method"], true],
-        ["mitigationProduct", args["mitigation_product"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["httpMethod", param(args, "query", "httpMethod"), true],
+        ["mitigationProduct", param(args, "query", "mitigationProduct"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/attacks/layer7/top/locations/tools.ts b/src/generated/forge-mcp/radar/attacks/layer7/top/locations/tools.ts
index 465394dc2..c26a44950 100644
--- a/src/generated/forge-mcp/radar/attacks/layer7/top/locations/tools.ts
+++ b/src/generated/forge-mcp/radar/attacks/layer7/top/locations/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../../_/tool.js";
+import { type Tool, param } from "../../../../../_/tool.js";
 
 /**
  * The tools of `radar.attacks.layer7.top.locations`.
@@ -10,162 +10,169 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_attacks_layer7_top_locations_origin",
     title: "Get top origin locations of layer 7 attacks",
-    description: "Retrieves the top origin locations of layer 7 attacks. Values are percentages of the total layer 7 attacks, with the origin location determined by the client IP address.",
+    description: "Retrieves the top origin locations of layer 7 attacks. Values are percentages of the total layer 7 attacks, with the origin location determined by the client IP address.\n\nGET /radar/attacks/layer7/top/locations/origin",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "http_method": {
-          "description": "Filters results by HTTP method.",
-          "items": {
-            "enum": [
-              "GET",
-              "POST",
-              "DELETE",
-              "PUT",
-              "HEAD",
-              "PURGE",
-              "OPTIONS",
-              "PROPFIND",
-              "MKCOL",
-              "PATCH",
-              "ACL",
-              "BCOPY",
-              "BDELETE",
-              "BMOVE",
-              "BPROPFIND",
-              "BPROPPATCH",
-              "CHECKIN",
-              "CHECKOUT",
-              "CONNECT",
-              "COPY",
-              "LABEL",
-              "LOCK",
-              "MERGE",
-              "MKACTIVITY",
-              "MKWORKSPACE",
-              "MOVE",
-              "NOTIFY",
-              "ORDERPATCH",
-              "POLL",
-              "PROPPATCH",
-              "REPORT",
-              "SEARCH",
-              "SUBSCRIBE",
-              "TRACE",
-              "UNCHECKOUT",
-              "UNLOCK",
-              "UNSUBSCRIBE",
-              "UPDATE",
-              "VERSIONCONTROL",
-              "BASELINECONTROL",
-              "XMSENUMATTS",
-              "RPC_OUT_DATA",
-              "RPC_IN_DATA",
-              "JSON",
-              "COOK",
-              "TRACK"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "mitigation_product": {
-          "description": "Filters the results by layer 7 mitigation product.",
-          "items": {
-            "enum": [
-              "DDOS",
-              "WAF",
-              "BOT_MANAGEMENT",
-              "ACCESS_RULES",
-              "IP_REPUTATION",
-              "API_SHIELD",
-              "DATA_LOSS_PREVENTION"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "httpMethod": {
+              "description": "Filters results by HTTP method.",
+              "items": {
+                "enum": [
+                  "GET",
+                  "POST",
+                  "DELETE",
+                  "PUT",
+                  "HEAD",
+                  "PURGE",
+                  "OPTIONS",
+                  "PROPFIND",
+                  "MKCOL",
+                  "PATCH",
+                  "ACL",
+                  "BCOPY",
+                  "BDELETE",
+                  "BMOVE",
+                  "BPROPFIND",
+                  "BPROPPATCH",
+                  "CHECKIN",
+                  "CHECKOUT",
+                  "CONNECT",
+                  "COPY",
+                  "LABEL",
+                  "LOCK",
+                  "MERGE",
+                  "MKACTIVITY",
+                  "MKWORKSPACE",
+                  "MOVE",
+                  "NOTIFY",
+                  "ORDERPATCH",
+                  "POLL",
+                  "PROPPATCH",
+                  "REPORT",
+                  "SEARCH",
+                  "SUBSCRIBE",
+                  "TRACE",
+                  "UNCHECKOUT",
+                  "UNLOCK",
+                  "UNSUBSCRIBE",
+                  "UPDATE",
+                  "VERSIONCONTROL",
+                  "BASELINECONTROL",
+                  "XMSENUMATTS",
+                  "RPC_OUT_DATA",
+                  "RPC_IN_DATA",
+                  "JSON",
+                  "COOK",
+                  "TRACK"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "mitigationProduct": {
+              "description": "Filters the results by layer 7 mitigation product.",
+              "items": {
+                "enum": [
+                  "DDOS",
+                  "WAF",
+                  "BOT_MANAGEMENT",
+                  "ACCESS_RULES",
+                  "IP_REPUTATION",
+                  "API_SHIELD",
+                  "DATA_LOSS_PREVENTION"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -632,95 +639,102 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer7/top/locations/origin`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["continent", args["continent"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["httpVersion", args["http_version"], true],
-        ["httpMethod", args["http_method"], true],
-        ["mitigationProduct", args["mitigation_product"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["httpMethod", param(args, "query", "httpMethod"), true],
+        ["mitigationProduct", param(args, "query", "mitigationProduct"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_attacks_layer7_top_locations_target",
     title: "Get top target locations of layer 7 attacks",
-    description: "Retrieves the top target locations of and by layer 7 attacks. Values are a percentage out of the total layer 7 attacks. The target location is determined by the attacked zone's billing country, when available.",
+    description: "Retrieves the top target locations of and by layer 7 attacks. Values are a percentage out of the total layer 7 attacks. The target location is determined by the attacked zone's billing country, when available.\n\nGET /radar/attacks/layer7/top/locations/target",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "mitigation_product": {
-          "description": "Filters the results by layer 7 mitigation product.",
-          "items": {
-            "enum": [
-              "DDOS",
-              "WAF",
-              "BOT_MANAGEMENT",
-              "ACCESS_RULES",
-              "IP_REPUTATION",
-              "API_SHIELD",
-              "DATA_LOSS_PREVENTION"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "mitigationProduct": {
+              "description": "Filters the results by layer 7 mitigation product.",
+              "items": {
+                "enum": [
+                  "DDOS",
+                  "WAF",
+                  "BOT_MANAGEMENT",
+                  "ACCESS_RULES",
+                  "IP_REPUTATION",
+                  "API_SHIELD",
+                  "DATA_LOSS_PREVENTION"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1187,14 +1201,14 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer7/top/locations/target`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["continent", args["continent"], true],
-        ["mitigationProduct", args["mitigation_product"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["mitigationProduct", param(args, "query", "mitigationProduct"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/attacks/layer7/top/tools.ts b/src/generated/forge-mcp/radar/attacks/layer7/top/tools.ts
index d1226df75..7b996ad81 100644
--- a/src/generated/forge-mcp/radar/attacks/layer7/top/tools.ts
+++ b/src/generated/forge-mcp/radar/attacks/layer7/top/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.attacks.layer7.top`.
@@ -10,114 +10,121 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_attacks_layer7_top_attacks",
     title: "Get top layer 7 attack pairs (origin and target locations)",
-    description: "Retrieves the top attacks from origin to target location. Values are percentages of the total layer 7 attacks (with billing country). The attack magnitude can be defined by the number of mitigated requests or by the number of zones affected. You can optionally limit the number of attacks by origin/target location (useful if all the top attacks are from or to the same location).",
+    description: "Retrieves the top attacks from origin to target location. Values are percentages of the total layer 7 attacks (with billing country). The attack magnitude can be defined by the number of mitigated requests or by the number of zones affected. You can optionally limit the number of attacks by origin/target location (useful if all the top attacks are from or to the same location).\n\nGET /radar/attacks/layer7/top/attacks",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "limit_direction": {
-          "default": "ORIGIN",
-          "description": "Specifies whether the `limitPerLocation` applies to the source or target location.",
-          "enum": [
-            "ORIGIN",
-            "TARGET"
-          ],
-          "type": "string"
-        },
-        "limit_per_location": {
-          "default": 10,
-          "description": "Limits the number of attacks per origin/target (refer to `limitDirection` parameter) location.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "mitigation_product": {
-          "description": "Filters the results by layer 7 mitigation product.",
-          "items": {
-            "enum": [
-              "DDOS",
-              "WAF",
-              "BOT_MANAGEMENT",
-              "ACCESS_RULES",
-              "IP_REPUTATION",
-              "API_SHIELD",
-              "DATA_LOSS_PREVENTION"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "limitDirection": {
+              "default": "ORIGIN",
+              "description": "Specifies whether the `limitPerLocation` applies to the source or target location.",
+              "enum": [
+                "ORIGIN",
+                "TARGET"
+              ],
+              "type": "string"
+            },
+            "limitPerLocation": {
+              "default": 10,
+              "description": "Limits the number of attacks per origin/target (refer to `limitDirection` parameter) location.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "mitigationProduct": {
+              "description": "Filters the results by layer 7 mitigation product.",
+              "items": {
+                "enum": [
+                  "DDOS",
+                  "WAF",
+                  "BOT_MANAGEMENT",
+                  "ACCESS_RULES",
+                  "IP_REPUTATION",
+                  "API_SHIELD",
+                  "DATA_LOSS_PREVENTION"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN_MAX"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN_MAX"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -592,19 +599,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/attacks/layer7/top/attacks`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["mitigationProduct", args["mitigation_product"], true],
-        ["limitDirection", args["limit_direction"], true],
-        ["limitPerLocation", args["limit_per_location"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["mitigationProduct", param(args, "query", "mitigationProduct"), true],
+        ["limitDirection", param(args, "query", "limitDirection"), true],
+        ["limitPerLocation", param(args, "query", "limitPerLocation"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/hijacks/events/tools.ts b/src/generated/forge-mcp/radar/bgp/hijacks/events/tools.ts
index 0ff055b2d..b9f422b58 100644
--- a/src/generated/forge-mcp/radar/bgp/hijacks/events/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/hijacks/events/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.hijacks.events`.
@@ -10,91 +10,98 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_hijacks_events_list",
     title: "Get BGP hijack events",
-    description: "Retrieves the BGP hijack events.",
+    description: "Retrieves the BGP hijack events.\n\nGET /radar/bgp/hijacks/events",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_range": {
-          "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "event_id": {
-          "description": "The unique identifier of a event.",
-          "type": "integer"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "hijacker_asn": {
-          "description": "The potential hijacker AS of a BGP hijack event.",
-          "type": "integer"
-        },
-        "involved_asn": {
-          "description": "The potential hijacker or victim AS of a BGP hijack event.",
-          "type": "integer"
-        },
-        "involved_country": {
-          "description": "The country code of the potential hijacker or victim AS of a BGP hijack event.",
-          "type": "string"
-        },
-        "max_confidence": {
-          "description": "Filters events by maximum confidence score (1-4 low, 5-7 mid, 8+ high).",
-          "type": "integer"
-        },
-        "min_confidence": {
-          "description": "Filters events by minimum confidence score (1-4 low, 5-7 mid, 8+ high).",
-          "type": "integer"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page number, starting from 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 50,
-          "description": "Number of entries per page.",
-          "type": "integer"
-        },
-        "prefix": {
-          "type": "string"
-        },
-        "sort_by": {
-          "description": "Sorts results by the specified field.",
-          "enum": [
-            "ID",
-            "TIME",
-            "CONFIDENCE"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "description": "Sort order.",
-          "enum": [
-            "ASC",
-            "DESC"
-          ],
-          "type": "string"
-        },
-        "victim_asn": {
-          "description": "The potential victim AS of a BGP hijack event.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateRange": {
+              "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "eventId": {
+              "description": "The unique identifier of a event.",
+              "type": "integer"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "hijackerAsn": {
+              "description": "The potential hijacker AS of a BGP hijack event.",
+              "type": "integer"
+            },
+            "involvedAsn": {
+              "description": "The potential hijacker or victim AS of a BGP hijack event.",
+              "type": "integer"
+            },
+            "involvedCountry": {
+              "description": "The country code of the potential hijacker or victim AS of a BGP hijack event.",
+              "type": "string"
+            },
+            "maxConfidence": {
+              "description": "Filters events by maximum confidence score (1-4 low, 5-7 mid, 8+ high).",
+              "type": "integer"
+            },
+            "minConfidence": {
+              "description": "Filters events by minimum confidence score (1-4 low, 5-7 mid, 8+ high).",
+              "type": "integer"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page number, starting from 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of entries per page.",
+              "type": "integer"
+            },
+            "prefix": {
+              "type": "string"
+            },
+            "sortBy": {
+              "description": "Sorts results by the specified field.",
+              "enum": [
+                "ID",
+                "TIME",
+                "CONFIDENCE"
+              ],
+              "type": "string"
+            },
+            "sortOrder": {
+              "description": "Sort order.",
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            },
+            "victimAsn": {
+              "description": "The potential victim AS of a BGP hijack event.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -514,22 +521,22 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/hijacks/events`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["eventId", args["event_id"], true],
-        ["hijackerAsn", args["hijacker_asn"], true],
-        ["victimAsn", args["victim_asn"], true],
-        ["involvedAsn", args["involved_asn"], true],
-        ["involvedCountry", args["involved_country"], true],
-        ["prefix", args["prefix"], true],
-        ["minConfidence", args["min_confidence"], true],
-        ["maxConfidence", args["max_confidence"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["sortBy", args["sort_by"], true],
-        ["sortOrder", args["sort_order"], true],
-        ["format", args["format"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["eventId", param(args, "query", "eventId"), true],
+        ["hijackerAsn", param(args, "query", "hijackerAsn"), true],
+        ["victimAsn", param(args, "query", "victimAsn"), true],
+        ["involvedAsn", param(args, "query", "involvedAsn"), true],
+        ["involvedCountry", param(args, "query", "involvedCountry"), true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["minConfidence", param(args, "query", "minConfidence"), true],
+        ["maxConfidence", param(args, "query", "maxConfidence"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["sortBy", param(args, "query", "sortBy"), true],
+        ["sortOrder", param(args, "query", "sortOrder"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/ips/tools.ts b/src/generated/forge-mcp/radar/bgp/ips/tools.ts
index 5ba77e6dc..ccf12b23b 100644
--- a/src/generated/forge-mcp/radar/bgp/ips/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/ips/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.ips`.
@@ -10,78 +10,85 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_ips_timeseries",
     title: "Get announced IP address space time series",
-    description: "Retrieves time series data for the announced IP space count, represented as the number of IPv4 /24s and IPv6 /48s, for a given ASN.",
+    description: "Retrieves time series data for the announced IP space count, represented as the number of IPv4 /24s and IPv6 /48s, for a given ASN.\n\nGET /radar/bgp/ips/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "include_delay": {
-          "description": "Includes data delay meta information.",
-          "type": "boolean"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "includeDelay": {
+              "description": "Includes data delay meta information.",
+              "type": "boolean"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -763,15 +770,15 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/ips/timeseries`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["includeDelay", args["include_delay"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["includeDelay", param(args, "query", "includeDelay"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/ips/top/tools.ts b/src/generated/forge-mcp/radar/bgp/ips/top/tools.ts
index 4d4664cb4..297ee50a8 100644
--- a/src/generated/forge-mcp/radar/bgp/ips/top/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/ips/top/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.ips.top`.
@@ -10,41 +10,48 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_ips_top_ases",
     title: "Get top ASes by announced IP space",
-    description: "Returns the top-N autonomous systems by announced IP space at the nearest 8-hour RIB boundary at or before the requested date. The snapped boundary is returned as `anchor_ts`.",
+    description: "Returns the top-N autonomous systems by announced IP space at the nearest 8-hour RIB boundary at or before the requested date. The snapped boundary is returned as `anchor_ts`.\n\nGET /radar/bgp/ips/top/ases",
     inputSchema: {
       type: "object",
       properties: {
-        "country": {
-          "description": "Optional ISO 3166-1 alpha-2 country filter. Omit for global top-N.",
-          "type": "string"
-        },
-        "date": {
-          "description": "Filters results by the specified datetime (ISO 8601).",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "metric": {
-          "description": "Ranking metric: IPv4 /24 count or IPv6 /48 count.",
-          "enum": [
-            "v4_24s",
-            "v6_48s"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "country": {
+              "description": "Optional ISO 3166-1 alpha-2 country filter. Omit for global top-N.",
+              "type": "string"
+            },
+            "date": {
+              "description": "Filters results by the specified datetime (ISO 8601).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "metric": {
+              "description": "Ranking metric: IPv4 /24 count or IPv6 /48 count.",
+              "enum": [
+                "v4_24s",
+                "v6_48s"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -228,11 +235,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/ips/top/ases`,
       query: [
-        ["date", args["date"], true],
-        ["limit", args["limit"], true],
-        ["metric", args["metric"], true],
-        ["country", args["country"], true],
-        ["format", args["format"], true],
+        ["date", param(args, "query", "date"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["country", param(args, "query", "country"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/leaks/events/tools.ts b/src/generated/forge-mcp/radar/bgp/leaks/events/tools.ts
index 1667bfc4d..b1e476c12 100644
--- a/src/generated/forge-mcp/radar/bgp/leaks/events/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/leaks/events/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.leaks.events`.
@@ -10,79 +10,86 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_leaks_events_list",
     title: "Get BGP route leak events",
-    description: "Retrieves the BGP route leak events.",
+    description: "Retrieves the BGP route leak events.\n\nGET /radar/bgp/leaks/events",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_range": {
-          "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "event_id": {
-          "description": "The unique identifier of a event.",
-          "type": "integer"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "involved_asn": {
-          "description": "ASN that is causing or affected by a route leak event.",
-          "type": "integer"
-        },
-        "involved_country": {
-          "description": "Country code of a involved ASN in a route leak event.",
-          "type": "string"
-        },
-        "leak_asn": {
-          "description": "The leaking AS of a route leak event.",
-          "type": "integer"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page number, starting from 1.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 50,
-          "description": "Number of entries per page.",
-          "type": "integer"
-        },
-        "sort_by": {
-          "description": "Sorts results by the specified field.",
-          "enum": [
-            "ID",
-            "LEAKS",
-            "PEERS",
-            "PREFIXES",
-            "ORIGINS",
-            "TIME"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "description": "Sort order.",
-          "enum": [
-            "ASC",
-            "DESC"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateRange": {
+              "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "eventId": {
+              "description": "The unique identifier of a event.",
+              "type": "integer"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "involvedAsn": {
+              "description": "ASN that is causing or affected by a route leak event.",
+              "type": "integer"
+            },
+            "involvedCountry": {
+              "description": "Country code of a involved ASN in a route leak event.",
+              "type": "string"
+            },
+            "leakAsn": {
+              "description": "The leaking AS of a route leak event.",
+              "type": "integer"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page number, starting from 1.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of entries per page.",
+              "type": "integer"
+            },
+            "sortBy": {
+              "description": "Sorts results by the specified field.",
+              "enum": [
+                "ID",
+                "LEAKS",
+                "PEERS",
+                "PREFIXES",
+                "ORIGINS",
+                "TIME"
+              ],
+              "type": "string"
+            },
+            "sortOrder": {
+              "description": "Sort order.",
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -412,18 +419,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/leaks/events`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["eventId", args["event_id"], true],
-        ["leakAsn", args["leak_asn"], true],
-        ["involvedAsn", args["involved_asn"], true],
-        ["involvedCountry", args["involved_country"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["sortBy", args["sort_by"], true],
-        ["sortOrder", args["sort_order"], true],
-        ["format", args["format"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["eventId", param(args, "query", "eventId"), true],
+        ["leakAsn", param(args, "query", "leakAsn"), true],
+        ["involvedAsn", param(args, "query", "involvedAsn"), true],
+        ["involvedCountry", param(args, "query", "involvedCountry"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["sortBy", param(args, "query", "sortBy"), true],
+        ["sortOrder", param(args, "query", "sortOrder"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/routes/paths/tools.ts b/src/generated/forge-mcp/radar/bgp/routes/paths/tools.ts
index a437e0cbb..a6716e771 100644
--- a/src/generated/forge-mcp/radar/bgp/routes/paths/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/routes/paths/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.routes.paths`.
@@ -10,39 +10,55 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_routes_paths_list",
     title: "Get tier-1 path segments for an AS",
-    description: "Retrieves the paths an AS uses to reach the tier-1 clique, derived from RouteViews RIB snapshots. Each entry is an ordered AS-path segment (from the queried AS toward a tier-1) with the number of observed paths and peers, and the collectors that observed it. By default segments are merged across all active collectors; pass \"collector\" to scope to one. The response also includes an \"asnInfo\" map (keyed by ASN) with the name and country for every ASN in the returned segments plus the queried ASN (best-effort; null when unavailable).",
+    description: "Retrieves the paths an AS uses to reach the tier-1 clique, derived from RouteViews RIB snapshots. Each entry is an ordered AS-path segment (from the queried AS toward a tier-1) with the number of observed paths and peers, and the collectors that observed it. By default segments are merged across all active collectors; pass \"collector\" to scope to one. The response also includes an \"asnInfo\" map (keyed by ASN) with the name and country for every ASN in the returned segments plus the queried ASN (best-effort; null when unavailable).\n\nGET /radar/bgp/routes/paths/{asn}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Single Autonomous System Number (ASN) as integer.",
-          "type": "integer"
-        },
-        "collector": {
-          "description": "Scope to a single RouteViews collector (e.g. \"route-views3\"). Omit to merge across all active collectors (identical path segments are deduplicated, observation counts summed, and every contributing collector listed).",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Single Autonomous System Number (ASN) as integer.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "asn"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "ip_version": {
-          "default": "IPv4",
-          "description": "Address family of the observed paths. Defaults to IPv4.",
-          "enum": [
-            "IPv4",
-            "IPv6"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "collector": {
+              "description": "Scope to a single RouteViews collector (e.g. \"route-views3\"). Omit to merge across all active collectors (identical path segments are deduplicated, observation counts summed, and every contributing collector listed).",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "default": "IPv4",
+              "description": "Address family of the observed paths. Defaults to IPv4.",
+              "enum": [
+                "IPv4",
+                "IPv6"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "asn"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -402,9 +418,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/routes/paths/${pathParam(args, "asn")}`,
       query: [
-        ["ipVersion", args["ip_version"], true],
-        ["collector", args["collector"], true],
-        ["format", args["format"], true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["collector", param(args, "query", "collector"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/routes/tools.ts b/src/generated/forge-mcp/radar/bgp/routes/tools.ts
index 3e9eaca52..489d637ef 100644
--- a/src/generated/forge-mcp/radar/bgp/routes/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/routes/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.routes`.
@@ -10,49 +10,56 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_routes_ases",
     title: "List ASes from global routing tables",
-    description: "Retrieves all ASes in the current global routing tables with routing statistics.",
+    description: "Retrieves all ASes in the current global routing tables with routing statistics.\n\nGET /radar/bgp/routes/ases",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify an alpha-2 location code.",
-          "type": "string"
-        },
-        "sort_by": {
-          "description": "Sorts results by the specified field.",
-          "enum": [
-            "cone",
-            "pfxs",
-            "ipv4",
-            "ipv6",
-            "rpki_valid",
-            "rpki_invalid",
-            "rpki_unknown"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "description": "Sort order.",
-          "enum": [
-            "ASC",
-            "DESC"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify an alpha-2 location code.",
+              "type": "string"
+            },
+            "sortBy": {
+              "description": "Sorts results by the specified field.",
+              "enum": [
+                "cone",
+                "pfxs",
+                "ipv4",
+                "ipv6",
+                "rpki_valid",
+                "rpki_invalid",
+                "rpki_unknown"
+              ],
+              "type": "string"
+            },
+            "sortOrder": {
+              "description": "Sort order.",
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -292,41 +299,48 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/routes/ases`,
       query: [
-        ["location", args["location"], true],
-        ["limit", args["limit"], true],
-        ["sortBy", args["sort_by"], true],
-        ["sortOrder", args["sort_order"], true],
-        ["format", args["format"], true],
+        ["location", param(args, "query", "location"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["sortBy", param(args, "query", "sortBy"), true],
+        ["sortOrder", param(args, "query", "sortOrder"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bgp_routes_moas",
     title: "Get Multi-Origin AS (MOAS) prefixes",
-    description: "Retrieves all Multi-Origin AS (MOAS) prefixes in the global routing tables.",
+    description: "Retrieves all Multi-Origin AS (MOAS) prefixes in the global routing tables.\n\nGET /radar/bgp/routes/moas",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "invalid_only": {
-          "description": "Lookup only RPKI invalid MOASes.",
-          "type": "boolean"
-        },
-        "origin": {
-          "description": "Lookup MOASes originated by the given ASN.",
-          "type": "integer"
-        },
-        "prefix": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "invalid_only": {
+              "description": "Lookup only RPKI invalid MOASes.",
+              "type": "boolean"
+            },
+            "origin": {
+              "description": "Lookup MOASes originated by the given ASN.",
+              "type": "integer"
+            },
+            "prefix": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -540,49 +554,56 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/routes/moas`,
       query: [
-        ["origin", args["origin"], true],
-        ["prefix", args["prefix"], true],
-        ["invalid_only", args["invalid_only"], true],
-        ["format", args["format"], true],
+        ["origin", param(args, "query", "origin"), true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["invalid_only", param(args, "query", "invalid_only"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bgp_routes_pfx2as",
     title: "Get prefix-to-ASN mapping",
-    description: "Retrieves the prefix-to-ASN mapping from global routing tables.",
+    description: "Retrieves the prefix-to-ASN mapping from global routing tables.\n\nGET /radar/bgp/routes/pfx2as",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "longest_prefix_match": {
-          "description": "Return only results with the longest prefix match for the given prefix. For example, specify a /32 prefix to lookup the origin ASN for an IPv4 address.",
-          "type": "boolean"
-        },
-        "origin": {
-          "description": "Lookup prefixes originated by the given ASN.",
-          "type": "integer"
-        },
-        "prefix": {
-          "type": "string"
-        },
-        "rpki_status": {
-          "description": "Return only results with matching rpki status: valid, invalid or unknown.",
-          "enum": [
-            "VALID",
-            "INVALID",
-            "UNKNOWN"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "longestPrefixMatch": {
+              "description": "Return only results with the longest prefix match for the given prefix. For example, specify a /32 prefix to lookup the origin ASN for an IPv4 address.",
+              "type": "boolean"
+            },
+            "origin": {
+              "description": "Lookup prefixes originated by the given ASN.",
+              "type": "integer"
+            },
+            "prefix": {
+              "type": "string"
+            },
+            "rpkiStatus": {
+              "description": "Return only results with matching rpki status: valid, invalid or unknown.",
+              "enum": [
+                "VALID",
+                "INVALID",
+                "UNKNOWN"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -774,33 +795,40 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/routes/pfx2as`,
       query: [
-        ["prefix", args["prefix"], true],
-        ["origin", args["origin"], true],
-        ["rpkiStatus", args["rpki_status"], true],
-        ["longestPrefixMatch", args["longest_prefix_match"], true],
-        ["format", args["format"], true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["origin", param(args, "query", "origin"), true],
+        ["rpkiStatus", param(args, "query", "rpkiStatus"), true],
+        ["longestPrefixMatch", param(args, "query", "longestPrefixMatch"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bgp_routes_realtime",
     title: "Get real-time BGP routes for a prefix",
-    description: "Retrieves real-time BGP routes for a prefix, using public real-time data collectors (RouteViews and RIPE RIS).",
+    description: "Retrieves real-time BGP routes for a prefix, using public real-time data collectors (RouteViews and RIPE RIS).\n\nGET /radar/bgp/routes/realtime",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "prefix": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "prefix": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1214,35 +1242,42 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/routes/realtime`,
       query: [
-        ["prefix", args["prefix"], true],
-        ["format", args["format"], true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bgp_routes_stats",
     title: "Get BGP routing table stats",
-    description: "Retrieves the BGP routing table stats.",
+    description: "Retrieves the BGP routing table stats.\n\nGET /radar/bgp/routes/stats",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify a single Autonomous System Number (ASN) as integer.",
-          "type": "integer"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify an alpha-2 location code.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify a single Autonomous System Number (ASN) as integer.",
+              "type": "integer"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify an alpha-2 location code.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1540,9 +1575,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/routes/stats`,
       query: [
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["format", args["format"], true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/routes/upstreams/tools.ts b/src/generated/forge-mcp/radar/bgp/routes/upstreams/tools.ts
index f5905de20..c9be5b3aa 100644
--- a/src/generated/forge-mcp/radar/bgp/routes/upstreams/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/routes/upstreams/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.routes.upstreams`.
@@ -10,49 +10,65 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_routes_upstreams_timeseries",
     title: "Get upstream composition time series for an AS",
-    description: "Retrieves the share of an AS’s observed paths carried by each direct upstream over time, derived from RouteViews RIB snapshots across all collectors (the combined product). Each upstream ASN is returned as its own series of shares (0–1); the least-significant upstreams beyond the requested limit are grouped into an \"OTHER\" series. Series share a common set of timestamps.",
+    description: "Retrieves the share of an AS’s observed paths carried by each direct upstream over time, derived from RouteViews RIB snapshots across all collectors (the combined product). Each upstream ASN is returned as its own series of shares (0–1); the least-significant upstreams beyond the requested limit are grouped into an \"OTHER\" series. Series share a common set of timestamps.\n\nGET /radar/bgp/routes/upstreams/{asn}/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Single Autonomous System Number (ASN) as integer.",
-          "type": "integer"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "default": "IPv4",
-          "description": "Address family of the observed paths. Defaults to IPv4.",
-          "enum": [
-            "IPv4",
-            "IPv6"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Single Autonomous System Number (ASN) as integer.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "asn"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "limit": {
-          "description": "Number of upstream ASNs to return as separate series, ranked by the first bucket. Remaining upstreams are grouped into an \"OTHER\" series. Defaults to 5.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "default": "IPv4",
+              "description": "Address family of the observed paths. Defaults to IPv4.",
+              "enum": [
+                "IPv4",
+                "IPv6"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "description": "Number of upstream ASNs to return as separate series, ranked by the first bucket. Remaining upstreams are grouped into an \"OTHER\" series. Defaults to 5.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "asn"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -288,11 +304,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/routes/upstreams/${pathParam(args, "asn")}/timeseries`,
       query: [
-        ["ipVersion", args["ip_version"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["limit", args["limit"], true],
-        ["format", args["format"], true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/rpki/aspa/tools.ts b/src/generated/forge-mcp/radar/bgp/rpki/aspa/tools.ts
index e739c6869..f9e773ebd 100644
--- a/src/generated/forge-mcp/radar/bgp/rpki/aspa/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/rpki/aspa/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.rpki.aspa`.
@@ -10,37 +10,44 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_rpki_aspa_changes",
     title: "Get ASPA changes over time",
-    description: "Retrieves ASPA (Autonomous System Provider Authorization) changes over time. Returns daily aggregated changes including additions, removals, and modifications of ASPA objects.",
+    description: "Retrieves ASPA (Autonomous System Provider Authorization) changes over time. Returns daily aggregated changes including additions, removals, and modifications of ASPA objects.\n\nGET /radar/bgp/rpki/aspa/changes",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filter changes involving this ASN (as customer or provider).",
-          "type": "integer"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "include_asn_info": {
-          "description": "Include ASN metadata (name, country) in response.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filter changes involving this ASN (as customer or provider).",
+              "type": "integer"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "includeAsnInfo": {
+              "description": "Include ASN metadata (name, country) in response.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -366,47 +373,54 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/rpki/aspa/changes`,
       query: [
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["includeAsnInfo", args["include_asn_info"], true],
-        ["format", args["format"], true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["includeAsnInfo", param(args, "query", "includeAsnInfo"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bgp_rpki_aspa_snapshot",
     title: "Get ASPA objects snapshot",
-    description: "Retrieves current or historical ASPA (Autonomous System Provider Authorization) objects. ASPA objects define which ASNs are authorized upstream providers for a customer ASN.",
+    description: "Retrieves current or historical ASPA (Autonomous System Provider Authorization) objects. ASPA objects define which ASNs are authorized upstream providers for a customer ASN.\n\nGET /radar/bgp/rpki/aspa/snapshot",
     inputSchema: {
       type: "object",
       properties: {
-        "customer_asn": {
-          "description": "Filter by customer ASN (the ASN publishing the ASPA object).",
-          "type": "integer"
-        },
-        "date": {
-          "description": "Filters results by the specified datetime (ISO 8601).",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "include_asn_info": {
-          "description": "Include ASN metadata (name, country) in response.",
-          "type": "boolean"
-        },
-        "provider_asn": {
-          "description": "Filter by provider ASN (an authorized upstream provider in ASPA objects).",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "customerAsn": {
+              "description": "Filter by customer ASN (the ASN publishing the ASPA object).",
+              "type": "integer"
+            },
+            "date": {
+              "description": "Filters results by the specified datetime (ISO 8601).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "includeAsnInfo": {
+              "description": "Include ASN metadata (name, country) in response.",
+              "type": "boolean"
+            },
+            "providerAsn": {
+              "description": "Filter by provider ASN (an authorized upstream provider in ASPA objects).",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -648,68 +662,75 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/rpki/aspa/snapshot`,
       query: [
-        ["customerAsn", args["customer_asn"], true],
-        ["providerAsn", args["provider_asn"], true],
-        ["date", args["date"], true],
-        ["includeAsnInfo", args["include_asn_info"], true],
-        ["format", args["format"], true],
+        ["customerAsn", param(args, "query", "customerAsn"), true],
+        ["providerAsn", param(args, "query", "providerAsn"), true],
+        ["date", param(args, "query", "date"), true],
+        ["includeAsnInfo", param(args, "query", "includeAsnInfo"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bgp_rpki_aspa_timeseries",
     title: "Get ASPA count time series",
-    description: "Retrieves ASPA (Autonomous System Provider Authorization) object count over time. Supports filtering by RIR or location (country code) to generate multiple named series. If no RIR or location filter is specified, returns total count.",
+    description: "Retrieves ASPA (Autonomous System Provider Authorization) object count over time. Supports filtering by RIR or location (country code) to generate multiple named series. If no RIR or location filter is specified, returns total count.\n\nGET /radar/bgp/rpki/aspa/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "rir": {
-          "description": "Filter by Regional Internet Registry (RIR). Multiple RIRs generate multiple series.",
-          "items": {
-            "enum": [
-              "RIPE_NCC",
-              "ARIN",
-              "APNIC",
-              "LACNIC",
-              "AFRINIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "rir": {
+              "description": "Filter by Regional Internet Registry (RIR). Multiple RIRs generate multiple series.",
+              "items": {
+                "enum": [
+                  "RIPE_NCC",
+                  "ARIN",
+                  "APNIC",
+                  "LACNIC",
+                  "AFRINIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -889,12 +910,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/rpki/aspa/timeseries`,
       query: [
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["name", args["name"], true],
-        ["rir", args["rir"], true],
-        ["location", args["location"], true],
-        ["format", args["format"], true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["name", param(args, "query", "name"), true],
+        ["rir", param(args, "query", "rir"), true],
+        ["location", param(args, "query", "location"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/rpki/roas/tools.ts b/src/generated/forge-mcp/radar/bgp/rpki/roas/tools.ts
index 8ed59ddf2..6f40c3cfd 100644
--- a/src/generated/forge-mcp/radar/bgp/rpki/roas/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/rpki/roas/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.rpki.roas`.
@@ -10,63 +10,70 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_rpki_roas_timeseries",
     title: "Get RPKI ROA deployment time series",
-    description: "Retrieves RPKI ROA (Route Origin Authorization) validation ratios over time. Returns the selected metric as a time series. Supports filtering by ASN or location (country code) — multiple values of the same filter type produce one series per value. If no ASN or location is specified, returns the global aggregate.",
+    description: "Retrieves RPKI ROA (Route Origin Authorization) validation ratios over time. Returns the selected metric as a time series. Supports filtering by ASN or location (country code) — multiple values of the same filter type produce one series per value. If no ASN or location is specified, returns the global aggregate.\n\nGET /radar/bgp/rpki/roas/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System Number. Specify one or more ASNs. Multiple values generate one series per ASN.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "metric": {
-          "default": "validPfxsRatio",
-          "description": "Which RPKI ROA validation metric to return. validPfxsRatio = ratio of RPKI-valid prefixes (IPv4+IPv6 combined). validPfxsV4Ratio / validPfxsV6Ratio = same, split by IP version. validIpsRatio = ratio of RPKI-valid address space (IPv4 /24s + IPv6 /48s). validIpsV4Ratio / validIpsV6Ratio = same, split by IP version.",
-          "enum": [
-            "validPfxsRatio",
-            "validPfxsV4Ratio",
-            "validPfxsV6Ratio",
-            "validIpsRatio",
-            "validIpsV4Ratio",
-            "validIpsV6Ratio"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System Number. Specify one or more ASNs. Multiple values generate one series per ASN.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "metric": {
+              "default": "validPfxsRatio",
+              "description": "Which RPKI ROA validation metric to return. validPfxsRatio = ratio of RPKI-valid prefixes (IPv4+IPv6 combined). validPfxsV4Ratio / validPfxsV6Ratio = same, split by IP version. validIpsRatio = ratio of RPKI-valid address space (IPv4 /24s + IPv6 /48s). validIpsV4Ratio / validIpsV6Ratio = same, split by IP version.",
+              "enum": [
+                "validPfxsRatio",
+                "validPfxsV4Ratio",
+                "validPfxsV6Ratio",
+                "validIpsRatio",
+                "validIpsV4Ratio",
+                "validIpsV6Ratio"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -246,13 +253,13 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/rpki/roas/timeseries`,
       query: [
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["metric", args["metric"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["name", args["name"], true],
-        ["format", args["format"], true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["name", param(args, "query", "name"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/tools.ts b/src/generated/forge-mcp/radar/bgp/tools.ts
index 8c2fa7992..94beb87f0 100644
--- a/src/generated/forge-mcp/radar/bgp/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../_/tool.js";
+import { type Tool, param } from "../../_/tool.js";
 
 /**
  * The tools of `radar.bgp`.
@@ -10,84 +10,91 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_timeseries",
     title: "Get BGP time series",
-    description: "Retrieves BGP updates over time. When requesting updates for an autonomous system, only BGP updates of type announcement are returned.",
+    description: "Retrieves BGP updates over time. When requesting updates for an autonomous system, only BGP updates of type announcement are returned.\n\nGET /radar/bgp/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "prefix": {
-          "description": "Filters results by BGP network prefix.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "update_type": {
-          "description": "Filters results by BGP update type.",
-          "items": {
-            "enum": [
-              "ANNOUNCEMENT",
-              "WITHDRAWAL"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "prefix": {
+              "description": "Filters results by BGP network prefix.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "updateType": {
+              "description": "Filters results by BGP update type.",
+              "items": {
+                "enum": [
+                  "ANNOUNCEMENT",
+                  "WITHDRAWAL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -505,15 +512,15 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["prefix", args["prefix"], true],
-        ["updateType", args["update_type"], true],
-        ["asn", args["asn"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["updateType", param(args, "query", "updateType"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/top/ases/tools.ts b/src/generated/forge-mcp/radar/bgp/top/ases/tools.ts
index 83e81525d..b1afe5f0b 100644
--- a/src/generated/forge-mcp/radar/bgp/top/ases/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/top/ases/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.top.ases`.
@@ -10,79 +10,86 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_top_ases_get",
     title: "Get top ASes by BGP updates",
-    description: "Retrieves the top autonomous systems by BGP updates (announcements only).",
+    description: "Retrieves the top autonomous systems by BGP updates (announcements only).\n\nGET /radar/bgp/top/ases",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "prefix": {
-          "description": "Filters results by BGP network prefix.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "update_type": {
-          "description": "Filters results by BGP update type.",
-          "items": {
-            "enum": [
-              "ANNOUNCEMENT",
-              "WITHDRAWAL"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "prefix": {
+              "description": "Filters results by BGP network prefix.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "updateType": {
+              "description": "Filters results by BGP update type.",
+              "items": {
+                "enum": [
+                  "ANNOUNCEMENT",
+                  "WITHDRAWAL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -284,42 +291,49 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/top/ases`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["prefix", args["prefix"], true],
-        ["updateType", args["update_type"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["prefix", param(args, "query", "prefix"), true],
+        ["updateType", param(args, "query", "updateType"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bgp_top_ases_prefixes",
     title: "Get top ASes by prefix count",
-    description: "Retrieves the full list of autonomous systems on the global routing table ordered by announced prefixes count. The data comes from public BGP MRT data archives and updates every 2 hours.",
+    description: "Retrieves the full list of autonomous systems on the global routing table ordered by announced prefixes count. The data comes from public BGP MRT data archives and updates every 2 hours.\n\nGET /radar/bgp/top/ases/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "country": {
-          "description": "Alpha-2 country code.",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "description": "Maximum number of ASes to return.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "country": {
+              "description": "Alpha-2 country code.",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "description": "Maximum number of ASes to return.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -492,9 +506,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/top/ases/prefixes`,
       query: [
-        ["country", args["country"], true],
-        ["limit", args["limit"], true],
-        ["format", args["format"], true],
+        ["country", param(args, "query", "country"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bgp/top/tools.ts b/src/generated/forge-mcp/radar/bgp/top/tools.ts
index e0d8a219d..56eb8061c 100644
--- a/src/generated/forge-mcp/radar/bgp/top/tools.ts
+++ b/src/generated/forge-mcp/radar/bgp/top/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.bgp.top`.
@@ -10,72 +10,79 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bgp_top_prefixes",
     title: "Get top prefixes by BGP updates",
-    description: "Retrieves the top network prefixes by BGP updates.",
+    description: "Retrieves the top network prefixes by BGP updates.\n\nGET /radar/bgp/top/prefixes",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "update_type": {
-          "description": "Filters results by BGP update type.",
-          "items": {
-            "enum": [
-              "ANNOUNCEMENT",
-              "WITHDRAWAL"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "updateType": {
+              "description": "Filters results by BGP update type.",
+              "items": {
+                "enum": [
+                  "ANNOUNCEMENT",
+                  "WITHDRAWAL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -269,14 +276,14 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bgp/top/prefixes`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["updateType", args["update_type"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["updateType", param(args, "query", "updateType"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bots/tools.ts b/src/generated/forge-mcp/radar/bots/tools.ts
index 3601fc666..b649c1596 100644
--- a/src/generated/forge-mcp/radar/bots/tools.ts
+++ b/src/generated/forge-mcp/radar/bots/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.bots`.
@@ -10,26 +10,42 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_bots_get",
     title: "Get bot details",
-    description: "Retrieves the requested bot information.",
+    description: "Retrieves the requested bot information.\n\nGET /radar/bots/{bot_slug}",
     inputSchema: {
       type: "object",
       properties: {
-        "bot_slug": {
-          "description": "Bot slug.",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "bot_slug": {
+              "description": "Bot slug.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "bot_slug"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "bot_slug"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -228,77 +244,84 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bots/${pathParam(args, "bot_slug")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bots_list",
     title: "List bots",
-    description: "Retrieves a list of bots.",
+    description: "Retrieves a list of bots.\n\nGET /radar/bots",
     inputSchema: {
       type: "object",
       properties: {
-        "bot_category": {
-          "description": "Filters results by bot category.",
-          "enum": [
-            "SEARCH_ENGINE_CRAWLER",
-            "SEARCH_ENGINE_OPTIMIZATION",
-            "MONITORING_AND_ANALYTICS",
-            "ADVERTISING_AND_MARKETING",
-            "SOCIAL_MEDIA_MARKETING",
-            "PAGE_PREVIEW",
-            "ACADEMIC_RESEARCH",
-            "SECURITY",
-            "ACCESSIBILITY",
-            "WEBHOOKS",
-            "FEED_FETCHER",
-            "AI_CRAWLER",
-            "AGGREGATOR",
-            "AI_ASSISTANT",
-            "AI_SEARCH",
-            "ARCHIVER"
-          ],
-          "type": "string"
-        },
-        "bot_operator": {
-          "description": "Filters results by bot operator.",
-          "type": "string"
-        },
-        "bot_verification_status": {
-          "description": "Filters results by bot verification status.",
-          "enum": [
-            "VERIFIED"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "kind": {
-          "deprecated": true,
-          "description": "Filters results by bot kind. Deprecated: the Verified Bot / Signed Agent distinction is being removed.",
-          "enum": [
-            "AGENT",
-            "BOT"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "botCategory": {
+              "description": "Filters results by bot category.",
+              "enum": [
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER"
+              ],
+              "type": "string"
+            },
+            "botOperator": {
+              "description": "Filters results by bot operator.",
+              "type": "string"
+            },
+            "botVerificationStatus": {
+              "description": "Filters results by bot verification status.",
+              "enum": [
+                "VERIFIED"
+              ],
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "kind": {
+              "deprecated": true,
+              "description": "Filters results by bot kind. Deprecated: the Verified Bot / Signed Agent distinction is being removed.",
+              "enum": [
+                "AGENT",
+                "BOT"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -480,161 +503,177 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bots`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["botCategory", args["bot_category"], true],
-        ["botOperator", args["bot_operator"], true],
-        ["kind", args["kind"], true],
-        ["botVerificationStatus", args["bot_verification_status"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["botCategory", param(args, "query", "botCategory"), true],
+        ["botOperator", param(args, "query", "botOperator"), true],
+        ["kind", param(args, "query", "kind"), true],
+        ["botVerificationStatus", param(args, "query", "botVerificationStatus"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bots_summary",
     title: "Get bots HTTP requests distribution by dimension",
-    description: "Retrieves an aggregated summary of bots HTTP requests grouped by the specified dimension.",
+    description: "Retrieves an aggregated summary of bots HTTP requests grouped by the specified dimension.\n\nGET /radar/bots/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot": {
-          "description": "Filters results by bot name.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_category": {
-          "description": "Filters results by bot category.",
-          "items": {
-            "enum": [
-              "SEARCH_ENGINE_CRAWLER",
-              "SEARCH_ENGINE_OPTIMIZATION",
-              "MONITORING_AND_ANALYTICS",
-              "ADVERTISING_AND_MARKETING",
-              "SOCIAL_MEDIA_MARKETING",
-              "PAGE_PREVIEW",
-              "ACADEMIC_RESEARCH",
-              "SECURITY",
-              "ACCESSIBILITY",
-              "WEBHOOKS",
-              "FEED_FETCHER",
-              "AI_CRAWLER",
-              "AGGREGATOR",
-              "AI_ASSISTANT",
-              "AI_SEARCH",
-              "ARCHIVER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_kind": {
-          "deprecated": true,
-          "description": "Filters results by bot kind. Deprecated: the Verified Bot / Signed Agent distinction is being removed.",
-          "items": {
-            "enum": [
-              "AGENT",
-              "BOT"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_operator": {
-          "description": "Filters results by bot operator.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_verification_status": {
-          "description": "Filters results by bot verification status (Verified vs. Unverified).",
-          "items": {
-            "enum": [
-              "VERIFIED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "BOT",
+                "BOT_KIND",
+                "BOT_OPERATOR",
+                "BOT_CATEGORY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "BOT",
-            "BOT_KIND",
-            "BOT_OPERATOR",
-            "BOT_CATEGORY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "bot": {
+              "description": "Filters results by bot name.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botCategory": {
+              "description": "Filters results by bot category.",
+              "items": {
+                "enum": [
+                  "SEARCH_ENGINE_CRAWLER",
+                  "SEARCH_ENGINE_OPTIMIZATION",
+                  "MONITORING_AND_ANALYTICS",
+                  "ADVERTISING_AND_MARKETING",
+                  "SOCIAL_MEDIA_MARKETING",
+                  "PAGE_PREVIEW",
+                  "ACADEMIC_RESEARCH",
+                  "SECURITY",
+                  "ACCESSIBILITY",
+                  "WEBHOOKS",
+                  "FEED_FETCHER",
+                  "AI_CRAWLER",
+                  "AGGREGATOR",
+                  "AI_ASSISTANT",
+                  "AI_SEARCH",
+                  "ARCHIVER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botKind": {
+              "deprecated": true,
+              "description": "Filters results by bot kind. Deprecated: the Verified Bot / Signed Agent distinction is being removed.",
+              "items": {
+                "enum": [
+                  "AGENT",
+                  "BOT"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botOperator": {
+              "description": "Filters results by bot operator.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botVerificationStatus": {
+              "description": "Filters results by bot verification status (Verified vs. Unverified).",
+              "items": {
+                "enum": [
+                  "VERIFIED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1066,161 +1105,168 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bots/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["bot", args["bot"], true],
-        ["botOperator", args["bot_operator"], true],
-        ["botCategory", args["bot_category"], true],
-        ["botKind", args["bot_kind"], true],
-        ["botVerificationStatus", args["bot_verification_status"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["bot", param(args, "query", "bot"), true],
+        ["botOperator", param(args, "query", "botOperator"), true],
+        ["botCategory", param(args, "query", "botCategory"), true],
+        ["botKind", param(args, "query", "botKind"), true],
+        ["botVerificationStatus", param(args, "query", "botVerificationStatus"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_bots_timeseries",
     title: "Get bots HTTP requests time series",
-    description: "Retrieves bots HTTP request volume over time.",
+    description: "Retrieves bots HTTP request volume over time.\n\nGET /radar/bots/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot": {
-          "description": "Filters results by bot name.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_category": {
-          "description": "Filters results by bot category.",
-          "items": {
-            "enum": [
-              "SEARCH_ENGINE_CRAWLER",
-              "SEARCH_ENGINE_OPTIMIZATION",
-              "MONITORING_AND_ANALYTICS",
-              "ADVERTISING_AND_MARKETING",
-              "SOCIAL_MEDIA_MARKETING",
-              "PAGE_PREVIEW",
-              "ACADEMIC_RESEARCH",
-              "SECURITY",
-              "ACCESSIBILITY",
-              "WEBHOOKS",
-              "FEED_FETCHER",
-              "AI_CRAWLER",
-              "AGGREGATOR",
-              "AI_ASSISTANT",
-              "AI_SEARCH",
-              "ARCHIVER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_kind": {
-          "deprecated": true,
-          "description": "Filters results by bot kind. Deprecated: the Verified Bot / Signed Agent distinction is being removed.",
-          "items": {
-            "enum": [
-              "AGENT",
-              "BOT"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_operator": {
-          "description": "Filters results by bot operator.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_verification_status": {
-          "description": "Filters results by bot verification status (Verified vs. Unverified).",
-          "items": {
-            "enum": [
-              "VERIFIED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "bot": {
+              "description": "Filters results by bot name.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botCategory": {
+              "description": "Filters results by bot category.",
+              "items": {
+                "enum": [
+                  "SEARCH_ENGINE_CRAWLER",
+                  "SEARCH_ENGINE_OPTIMIZATION",
+                  "MONITORING_AND_ANALYTICS",
+                  "ADVERTISING_AND_MARKETING",
+                  "SOCIAL_MEDIA_MARKETING",
+                  "PAGE_PREVIEW",
+                  "ACADEMIC_RESEARCH",
+                  "SECURITY",
+                  "ACCESSIBILITY",
+                  "WEBHOOKS",
+                  "FEED_FETCHER",
+                  "AI_CRAWLER",
+                  "AGGREGATOR",
+                  "AI_ASSISTANT",
+                  "AI_SEARCH",
+                  "ARCHIVER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botKind": {
+              "deprecated": true,
+              "description": "Filters results by bot kind. Deprecated: the Verified Bot / Signed Agent distinction is being removed.",
+              "items": {
+                "enum": [
+                  "AGENT",
+                  "BOT"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botOperator": {
+              "description": "Filters results by bot operator.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botVerificationStatus": {
+              "description": "Filters results by bot verification status (Verified vs. Unverified).",
+              "items": {
+                "enum": [
+                  "VERIFIED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1704,178 +1750,194 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bots/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["bot", args["bot"], true],
-        ["botOperator", args["bot_operator"], true],
-        ["botCategory", args["bot_category"], true],
-        ["botKind", args["bot_kind"], true],
-        ["botVerificationStatus", args["bot_verification_status"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["bot", param(args, "query", "bot"), true],
+        ["botOperator", param(args, "query", "botOperator"), true],
+        ["botCategory", param(args, "query", "botCategory"), true],
+        ["botKind", param(args, "query", "botKind"), true],
+        ["botVerificationStatus", param(args, "query", "botVerificationStatus"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_bots_timeseries_groups",
+    name: "radar_bots_timeseriesGroups",
     title: "Get time series distribution of bots HTTP requests by dimension.",
-    description: "Retrieves the distribution of HTTP requests from bots, grouped by the specified dimension over time.",
+    description: "Retrieves the distribution of HTTP requests from bots, grouped by the specified dimension over time.\n\nGET /radar/bots/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot": {
-          "description": "Filters results by bot name.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_category": {
-          "description": "Filters results by bot category.",
-          "items": {
-            "enum": [
-              "SEARCH_ENGINE_CRAWLER",
-              "SEARCH_ENGINE_OPTIMIZATION",
-              "MONITORING_AND_ANALYTICS",
-              "ADVERTISING_AND_MARKETING",
-              "SOCIAL_MEDIA_MARKETING",
-              "PAGE_PREVIEW",
-              "ACADEMIC_RESEARCH",
-              "SECURITY",
-              "ACCESSIBILITY",
-              "WEBHOOKS",
-              "FEED_FETCHER",
-              "AI_CRAWLER",
-              "AGGREGATOR",
-              "AI_ASSISTANT",
-              "AI_SEARCH",
-              "ARCHIVER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_kind": {
-          "deprecated": true,
-          "description": "Filters results by bot kind. Deprecated: the Verified Bot / Signed Agent distinction is being removed.",
-          "items": {
-            "enum": [
-              "AGENT",
-              "BOT"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_operator": {
-          "description": "Filters results by bot operator.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_verification_status": {
-          "description": "Filters results by bot verification status (Verified vs. Unverified).",
-          "items": {
-            "enum": [
-              "VERIFIED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "BOT",
+                "BOT_KIND",
+                "BOT_OPERATOR",
+                "BOT_CATEGORY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "BOT",
-            "BOT_KIND",
-            "BOT_OPERATOR",
-            "BOT_CATEGORY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "bot": {
+              "description": "Filters results by bot name.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botCategory": {
+              "description": "Filters results by bot category.",
+              "items": {
+                "enum": [
+                  "SEARCH_ENGINE_CRAWLER",
+                  "SEARCH_ENGINE_OPTIMIZATION",
+                  "MONITORING_AND_ANALYTICS",
+                  "ADVERTISING_AND_MARKETING",
+                  "SOCIAL_MEDIA_MARKETING",
+                  "PAGE_PREVIEW",
+                  "ACADEMIC_RESEARCH",
+                  "SECURITY",
+                  "ACCESSIBILITY",
+                  "WEBHOOKS",
+                  "FEED_FETCHER",
+                  "AI_CRAWLER",
+                  "AGGREGATOR",
+                  "AI_ASSISTANT",
+                  "AI_SEARCH",
+                  "ARCHIVER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botKind": {
+              "deprecated": true,
+              "description": "Filters results by bot kind. Deprecated: the Verified Bot / Signed Agent distinction is being removed.",
+              "items": {
+                "enum": [
+                  "AGENT",
+                  "BOT"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botOperator": {
+              "description": "Filters results by bot operator.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botVerificationStatus": {
+              "description": "Filters results by bot verification status (Verified vs. Unverified).",
+              "items": {
+                "enum": [
+                  "VERIFIED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2359,21 +2421,21 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bots/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["bot", args["bot"], true],
-        ["botOperator", args["bot_operator"], true],
-        ["botCategory", args["bot_category"], true],
-        ["botKind", args["bot_kind"], true],
-        ["botVerificationStatus", args["bot_verification_status"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["bot", param(args, "query", "bot"), true],
+        ["botOperator", param(args, "query", "botOperator"), true],
+        ["botCategory", param(args, "query", "botCategory"), true],
+        ["botKind", param(args, "query", "botKind"), true],
+        ["botVerificationStatus", param(args, "query", "botVerificationStatus"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/bots/webCrawlers/tools.ts b/src/generated/forge-mcp/radar/bots/webCrawlers/tools.ts
index d25fa5b9f..a4a630918 100644
--- a/src/generated/forge-mcp/radar/bots/webCrawlers/tools.ts
+++ b/src/generated/forge-mcp/radar/bots/webCrawlers/tools.ts
@@ -1,134 +1,150 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `radar.bots.web_crawlers`.
+ * The tools of `radar.bots.webCrawlers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_bots_web_crawlers_summary",
+    name: "radar_bots_webCrawlers_summary",
     title: "Get crawler HTTP request distribution by dimension",
-    description: "Retrieves an aggregated summary of HTTP requests from crawlers, grouped by the specified dimension.",
+    description: "Retrieves an aggregated summary of HTTP requests from crawlers, grouped by the specified dimension.\n\nGET /radar/bots/crawlers/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "bot_operator": {
-          "description": "Filters results by bot operator.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "client_type": {
-          "description": "Filters results by agent type.",
-          "items": {
-            "enum": [
-              "HUMAN",
-              "NON_AI_BOT",
-              "AI_BOT",
-              "MIXED_PURPOSE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "CLIENT_TYPE",
+                "USER_AGENT",
+                "REFERER",
+                "CRAWL_REFER_RATIO",
+                "VERTICAL",
+                "INDUSTRY",
+                "RESPONSE_STATUS",
+                "RESPONSE_STATUS_CATEGORY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "CLIENT_TYPE",
-            "USER_AGENT",
-            "REFERER",
-            "CRAWL_REFER_RATIO",
-            "VERTICAL",
-            "INDUSTRY",
-            "RESPONSE_STATUS",
-            "RESPONSE_STATUS_CATEGORY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "industry": {
-          "description": "Filters results by industry.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_status": {
-          "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_status_category": {
-          "description": "Filters results by HTTP response status code category.",
-          "items": {
-            "enum": [
-              "INFORMATIONAL",
-              "SUCCESS",
-              "REDIRECTION",
-              "CLIENT_ERROR",
-              "SERVER_ERROR"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "vertical": {
-          "description": "Filters results by vertical.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "botOperator": {
+              "description": "Filters results by bot operator.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "clientType": {
+              "description": "Filters results by agent type.",
+              "items": {
+                "enum": [
+                  "HUMAN",
+                  "NON_AI_BOT",
+                  "AI_BOT",
+                  "MIXED_PURPOSE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "industry": {
+              "description": "Filters results by industry.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseStatus": {
+              "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseStatusCategory": {
+              "description": "Filters results by HTTP response status code category.",
+              "items": {
+                "enum": [
+                  "INFORMATIONAL",
+                  "SUCCESS",
+                  "REDIRECTION",
+                  "CLIENT_ERROR",
+                  "SERVER_ERROR"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "vertical": {
+              "description": "Filters results by vertical.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -560,163 +576,179 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bots/crawlers/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["botOperator", args["bot_operator"], true],
-        ["vertical", args["vertical"], true],
-        ["industry", args["industry"], true],
-        ["clientType", args["client_type"], true],
-        ["responseStatus", args["response_status"], true],
-        ["responseStatusCategory", args["response_status_category"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["botOperator", param(args, "query", "botOperator"), true],
+        ["vertical", param(args, "query", "vertical"), true],
+        ["industry", param(args, "query", "industry"), true],
+        ["clientType", param(args, "query", "clientType"), true],
+        ["responseStatus", param(args, "query", "responseStatus"), true],
+        ["responseStatusCategory", param(args, "query", "responseStatusCategory"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_bots_web_crawlers_timeseries_groups",
+    name: "radar_bots_webCrawlers_timeseriesGroups",
     title: "Get time series of crawler HTTP request distribution by dimension",
-    description: "Retrieves the distribution of HTTP requests from crawlers, grouped by the specified dimension over time.",
+    description: "Retrieves the distribution of HTTP requests from crawlers, grouped by the specified dimension over time.\n\nGET /radar/bots/crawlers/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "bot_operator": {
-          "description": "Filters results by bot operator.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "client_type": {
-          "description": "Filters results by agent type.",
-          "items": {
-            "enum": [
-              "HUMAN",
-              "NON_AI_BOT",
-              "AI_BOT",
-              "MIXED_PURPOSE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "CLIENT_TYPE",
-            "USER_AGENT",
-            "REFERER",
-            "CRAWL_REFER_RATIO",
-            "VERTICAL",
-            "INDUSTRY",
-            "RESPONSE_STATUS",
-            "RESPONSE_STATUS_CATEGORY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "industry": {
-          "description": "Filters results by industry.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "CLIENT_TYPE",
+                "USER_AGENT",
+                "REFERER",
+                "CRAWL_REFER_RATIO",
+                "VERTICAL",
+                "INDUSTRY",
+                "RESPONSE_STATUS",
+                "RESPONSE_STATUS_CATEGORY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX",
-            "PERCENTAGE_CHANGE"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "response_status": {
-          "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_status_category": {
-          "description": "Filters results by HTTP response status code category.",
-          "items": {
-            "enum": [
-              "INFORMATIONAL",
-              "SUCCESS",
-              "REDIRECTION",
-              "CLIENT_ERROR",
-              "SERVER_ERROR"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "vertical": {
-          "description": "Filters results by vertical.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "botOperator": {
+              "description": "Filters results by bot operator.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "clientType": {
+              "description": "Filters results by agent type.",
+              "items": {
+                "enum": [
+                  "HUMAN",
+                  "NON_AI_BOT",
+                  "AI_BOT",
+                  "MIXED_PURPOSE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "industry": {
+              "description": "Filters results by industry.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX",
+                "PERCENTAGE_CHANGE"
+              ],
+              "type": "string"
+            },
+            "responseStatus": {
+              "description": "Filters results by HTTP response status code (e.g. 200, 403, 404). Only [IANA-registered codes](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) are accepted.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseStatusCategory": {
+              "description": "Filters results by HTTP response status code category.",
+              "items": {
+                "enum": [
+                  "INFORMATIONAL",
+                  "SUCCESS",
+                  "REDIRECTION",
+                  "CLIENT_ERROR",
+                  "SERVER_ERROR"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "vertical": {
+              "description": "Filters results by vertical.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1200,20 +1232,20 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/bots/crawlers/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["normalization", args["normalization"], true],
-        ["botOperator", args["bot_operator"], true],
-        ["vertical", args["vertical"], true],
-        ["industry", args["industry"], true],
-        ["clientType", args["client_type"], true],
-        ["responseStatus", args["response_status"], true],
-        ["responseStatusCategory", args["response_status_category"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["botOperator", param(args, "query", "botOperator"), true],
+        ["vertical", param(args, "query", "vertical"), true],
+        ["industry", param(args, "query", "industry"), true],
+        ["clientType", param(args, "query", "clientType"), true],
+        ["responseStatus", param(args, "query", "responseStatus"), true],
+        ["responseStatusCategory", param(args, "query", "responseStatusCategory"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ct/authorities/tools.ts b/src/generated/forge-mcp/radar/ct/authorities/tools.ts
index 2a6406437..cb7368b9a 100644
--- a/src/generated/forge-mcp/radar/ct/authorities/tools.ts
+++ b/src/generated/forge-mcp/radar/ct/authorities/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.ct.authorities`.
@@ -10,26 +10,42 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_ct_authorities_get",
     title: "Get certificate authority details",
-    description: "Retrieves the requested CA information.",
+    description: "Retrieves the requested CA information.\n\nGET /radar/ct/authorities/{ca_slug}",
     inputSchema: {
       type: "object",
       properties: {
-        "ca_slug": {
-          "description": "Certificate authority SHA256 fingerprint.",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ca_slug": {
+              "description": "Certificate authority SHA256 fingerprint.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "ca_slug"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "ca_slug"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -426,35 +442,42 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ct/authorities/${pathParam(args, "ca_slug")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_ct_authorities_list",
     title: "List certificate authorities",
-    description: "Retrieves a list of certificate authorities.",
+    description: "Retrieves a list of certificate authorities.\n\nGET /radar/ct/authorities",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -664,9 +687,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ct/authorities`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ct/logs/tools.ts b/src/generated/forge-mcp/radar/ct/logs/tools.ts
index c54431100..115740523 100644
--- a/src/generated/forge-mcp/radar/ct/logs/tools.ts
+++ b/src/generated/forge-mcp/radar/ct/logs/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.ct.logs`.
@@ -10,26 +10,42 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_ct_logs_get",
     title: "Get certificate log details",
-    description: "Retrieves the requested certificate log information.",
+    description: "Retrieves the requested certificate log information.\n\nGET /radar/ct/logs/{log_slug}",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "log_slug": {
+              "description": "Certificate log slug.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "log_slug"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "log_slug": {
-          "description": "Certificate log slug.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "log_slug"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -480,35 +496,42 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ct/logs/${pathParam(args, "log_slug")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_ct_logs_list",
     title: "List certificate logs",
-    description: "Retrieves a list of certificate logs.",
+    description: "Retrieves a list of certificate logs.\n\nGET /radar/ct/logs",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -730,9 +753,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ct/logs`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ct/tools.ts b/src/generated/forge-mcp/radar/ct/tools.ts
index 7bff62aa4..6adeb8b91 100644
--- a/src/generated/forge-mcp/radar/ct/tools.ts
+++ b/src/generated/forge-mcp/radar/ct/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.ct`.
@@ -10,242 +10,258 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_ct_summary",
     title: "Get certificate distribution by dimension",
-    description: "Retrieves an aggregated summary of certificates grouped by the specified dimension.",
+    description: "Retrieves an aggregated summary of certificates grouped by the specified dimension.\n\nGET /radar/ct/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "ca": {
-          "description": "Filters results by certificate authority.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ca_owner": {
-          "description": "Filters results by certificate authority owner.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the certificate attribute by which to group the results.",
-          "enum": [
-            "CA",
-            "CA_OWNER",
-            "DURATION",
-            "ENTRY_TYPE",
-            "EXPIRATION_STATUS",
-            "HAS_IPS",
-            "HAS_WILDCARDS",
-            "LOG",
-            "LOG_API",
-            "LOG_OPERATOR",
-            "PUBLIC_KEY_ALGORITHM",
-            "SIGNATURE_ALGORITHM",
-            "TLD",
-            "VALIDATION_LEVEL"
-          ],
-          "type": "string"
-        },
-        "duration": {
-          "description": "Filters results by certificate duration.",
-          "items": {
-            "enum": [
-              "LTE_3D",
-              "GT_3D_LTE_7D",
-              "GT_7D_LTE_10D",
-              "GT_10D_LTE_47D",
-              "GT_47D_LTE_100D",
-              "GT_100D_LTE_200D",
-              "GT_200D"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "entry_type": {
-          "description": "Filters results by entry type (certificate vs. pre-certificate). Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "enum": [
-              "PRECERTIFICATE",
-              "CERTIFICATE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "expiration_status": {
-          "description": "Filters results by expiration status (expired vs. valid).",
-          "items": {
-            "enum": [
-              "EXPIRED",
-              "VALID"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "has_ips": {
-          "description": "Filters results based on whether the certificates are bound to specific IP addresses.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "has_wildcards": {
-          "description": "Filters results based on whether the certificates contain wildcard domains.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "log": {
-          "description": "Filters results by certificate log. Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "log_api": {
-          "description": "Filters results by certificate log API (RFC6962 vs. static). Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "enum": [
-              "RFC6962",
-              "STATIC"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "log_operator": {
-          "description": "Filters results by certificate log operator. Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the certificate attribute by which to group the results.",
+              "enum": [
+                "CA",
+                "CA_OWNER",
+                "DURATION",
+                "ENTRY_TYPE",
+                "EXPIRATION_STATUS",
+                "HAS_IPS",
+                "HAS_WILDCARDS",
+                "LOG",
+                "LOG_API",
+                "LOG_OPERATOR",
+                "PUBLIC_KEY_ALGORITHM",
+                "SIGNATURE_ALGORITHM",
+                "TLD",
+                "VALIDATION_LEVEL"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "RAW_VALUES",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "RAW_VALUES",
-            "PERCENTAGE"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "public_key_algorithm": {
-          "description": "Filters results by public key algorithm.",
-          "items": {
-            "enum": [
-              "DSA",
-              "ECDSA",
-              "RSA"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "signature_algorithm": {
-          "description": "Filters results by signature algorithm.",
-          "items": {
-            "enum": [
-              "DSA_SHA_1",
-              "DSA_SHA_256",
-              "ECDSA_SHA_1",
-              "ECDSA_SHA_256",
-              "ECDSA_SHA_384",
-              "ECDSA_SHA_512",
-              "PSS_SHA_256",
-              "PSS_SHA_384",
-              "PSS_SHA_512",
-              "RSA_MD2",
-              "RSA_MD5",
-              "RSA_SHA_1",
-              "RSA_SHA_256",
-              "RSA_SHA_384",
-              "RSA_SHA_512"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain. Incompatible with the `log`, `logApi`, `logOperator`, and `entryType` filters/dimensions.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "unique_entries": {
-          "description": "Specifies whether to filter out duplicate certificates and pre-certificates. Set to true for unique entries only.",
-          "items": {
-            "enum": [
-              "true",
-              "false"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "validation_level": {
-          "description": "Filters results by validation level.",
-          "items": {
-            "enum": [
-              "DOMAIN",
-              "ORGANIZATION",
-              "EXTENDED"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "ca": {
+              "description": "Filters results by certificate authority.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "caOwner": {
+              "description": "Filters results by certificate authority owner.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "duration": {
+              "description": "Filters results by certificate duration.",
+              "items": {
+                "enum": [
+                  "LTE_3D",
+                  "GT_3D_LTE_7D",
+                  "GT_7D_LTE_10D",
+                  "GT_10D_LTE_47D",
+                  "GT_47D_LTE_100D",
+                  "GT_100D_LTE_200D",
+                  "GT_200D"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "entryType": {
+              "description": "Filters results by entry type (certificate vs. pre-certificate). Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "enum": [
+                  "PRECERTIFICATE",
+                  "CERTIFICATE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "expirationStatus": {
+              "description": "Filters results by expiration status (expired vs. valid).",
+              "items": {
+                "enum": [
+                  "EXPIRED",
+                  "VALID"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "hasIps": {
+              "description": "Filters results based on whether the certificates are bound to specific IP addresses.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "hasWildcards": {
+              "description": "Filters results based on whether the certificates contain wildcard domains.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "log": {
+              "description": "Filters results by certificate log. Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "logApi": {
+              "description": "Filters results by certificate log API (RFC6962 vs. static). Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "enum": [
+                  "RFC6962",
+                  "STATIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "logOperator": {
+              "description": "Filters results by certificate log operator. Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "RAW_VALUES",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "RAW_VALUES",
+                "PERCENTAGE"
+              ],
+              "type": "string"
+            },
+            "publicKeyAlgorithm": {
+              "description": "Filters results by public key algorithm.",
+              "items": {
+                "enum": [
+                  "DSA",
+                  "ECDSA",
+                  "RSA"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "signatureAlgorithm": {
+              "description": "Filters results by signature algorithm.",
+              "items": {
+                "enum": [
+                  "DSA_SHA_1",
+                  "DSA_SHA_256",
+                  "ECDSA_SHA_1",
+                  "ECDSA_SHA_256",
+                  "ECDSA_SHA_384",
+                  "ECDSA_SHA_512",
+                  "PSS_SHA_256",
+                  "PSS_SHA_384",
+                  "PSS_SHA_512",
+                  "RSA_MD2",
+                  "RSA_MD5",
+                  "RSA_SHA_1",
+                  "RSA_SHA_256",
+                  "RSA_SHA_384",
+                  "RSA_SHA_512"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain. Incompatible with the `log`, `logApi`, `logOperator`, and `entryType` filters/dimensions.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "uniqueEntries": {
+              "description": "Specifies whether to filter out duplicate certificates and pre-certificates. Set to true for unique entries only.",
+              "items": {
+                "enum": [
+                  "true",
+                  "false"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "validationLevel": {
+              "description": "Filters results by validation level.",
+              "items": {
+                "enum": [
+                  "DOMAIN",
+                  "ORGANIZATION",
+                  "EXTENDED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -951,244 +967,251 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ct/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["ca", args["ca"], true],
-        ["caOwner", args["ca_owner"], true],
-        ["duration", args["duration"], true],
-        ["entryType", args["entry_type"], true],
-        ["expirationStatus", args["expiration_status"], true],
-        ["hasIps", args["has_ips"], true],
-        ["hasWildcards", args["has_wildcards"], true],
-        ["log", args["log"], true],
-        ["logApi", args["log_api"], true],
-        ["logOperator", args["log_operator"], true],
-        ["publicKeyAlgorithm", args["public_key_algorithm"], true],
-        ["signatureAlgorithm", args["signature_algorithm"], true],
-        ["tld", args["tld"], true],
-        ["validationLevel", args["validation_level"], true],
-        ["uniqueEntries", args["unique_entries"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["ca", param(args, "query", "ca"), true],
+        ["caOwner", param(args, "query", "caOwner"), true],
+        ["duration", param(args, "query", "duration"), true],
+        ["entryType", param(args, "query", "entryType"), true],
+        ["expirationStatus", param(args, "query", "expirationStatus"), true],
+        ["hasIps", param(args, "query", "hasIps"), true],
+        ["hasWildcards", param(args, "query", "hasWildcards"), true],
+        ["log", param(args, "query", "log"), true],
+        ["logApi", param(args, "query", "logApi"), true],
+        ["logOperator", param(args, "query", "logOperator"), true],
+        ["publicKeyAlgorithm", param(args, "query", "publicKeyAlgorithm"), true],
+        ["signatureAlgorithm", param(args, "query", "signatureAlgorithm"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["validationLevel", param(args, "query", "validationLevel"), true],
+        ["uniqueEntries", param(args, "query", "uniqueEntries"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_ct_timeseries",
     title: "Get certificates time series",
-    description: "Retrieves certificate volume over time.",
+    description: "Retrieves certificate volume over time.\n\nGET /radar/ct/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "ca": {
-          "description": "Filters results by certificate authority.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ca_owner": {
-          "description": "Filters results by certificate authority owner.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "duration": {
-          "description": "Filters results by certificate duration.",
-          "items": {
-            "enum": [
-              "LTE_3D",
-              "GT_3D_LTE_7D",
-              "GT_7D_LTE_10D",
-              "GT_10D_LTE_47D",
-              "GT_47D_LTE_100D",
-              "GT_100D_LTE_200D",
-              "GT_200D"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "entry_type": {
-          "description": "Filters results by entry type (certificate vs. pre-certificate). Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "enum": [
-              "PRECERTIFICATE",
-              "CERTIFICATE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "expiration_status": {
-          "description": "Filters results by expiration status (expired vs. valid).",
-          "items": {
-            "enum": [
-              "EXPIRED",
-              "VALID"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "has_ips": {
-          "description": "Filters results based on whether the certificates are bound to specific IP addresses.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "has_wildcards": {
-          "description": "Filters results based on whether the certificates contain wildcard domains.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "log": {
-          "description": "Filters results by certificate log. Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "log_api": {
-          "description": "Filters results by certificate log API (RFC6962 vs. static). Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "enum": [
-              "RFC6962",
-              "STATIC"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "log_operator": {
-          "description": "Filters results by certificate log operator. Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "public_key_algorithm": {
-          "description": "Filters results by public key algorithm.",
-          "items": {
-            "enum": [
-              "DSA",
-              "ECDSA",
-              "RSA"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "signature_algorithm": {
-          "description": "Filters results by signature algorithm.",
-          "items": {
-            "enum": [
-              "DSA_SHA_1",
-              "DSA_SHA_256",
-              "ECDSA_SHA_1",
-              "ECDSA_SHA_256",
-              "ECDSA_SHA_384",
-              "ECDSA_SHA_512",
-              "PSS_SHA_256",
-              "PSS_SHA_384",
-              "PSS_SHA_512",
-              "RSA_MD2",
-              "RSA_MD5",
-              "RSA_SHA_1",
-              "RSA_SHA_256",
-              "RSA_SHA_384",
-              "RSA_SHA_512"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain. Incompatible with the `log`, `logApi`, `logOperator`, and `entryType` filters/dimensions.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "unique_entries": {
-          "description": "Specifies whether to filter out duplicate certificates and pre-certificates. Set to true for unique entries only.",
-          "items": {
-            "enum": [
-              "true",
-              "false"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "validation_level": {
-          "description": "Filters results by validation level.",
-          "items": {
-            "enum": [
-              "DOMAIN",
-              "ORGANIZATION",
-              "EXTENDED"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "ca": {
+              "description": "Filters results by certificate authority.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "caOwner": {
+              "description": "Filters results by certificate authority owner.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "duration": {
+              "description": "Filters results by certificate duration.",
+              "items": {
+                "enum": [
+                  "LTE_3D",
+                  "GT_3D_LTE_7D",
+                  "GT_7D_LTE_10D",
+                  "GT_10D_LTE_47D",
+                  "GT_47D_LTE_100D",
+                  "GT_100D_LTE_200D",
+                  "GT_200D"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "entryType": {
+              "description": "Filters results by entry type (certificate vs. pre-certificate). Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "enum": [
+                  "PRECERTIFICATE",
+                  "CERTIFICATE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "expirationStatus": {
+              "description": "Filters results by expiration status (expired vs. valid).",
+              "items": {
+                "enum": [
+                  "EXPIRED",
+                  "VALID"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "hasIps": {
+              "description": "Filters results based on whether the certificates are bound to specific IP addresses.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "hasWildcards": {
+              "description": "Filters results based on whether the certificates contain wildcard domains.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "log": {
+              "description": "Filters results by certificate log. Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "logApi": {
+              "description": "Filters results by certificate log API (RFC6962 vs. static). Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "enum": [
+                  "RFC6962",
+                  "STATIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "logOperator": {
+              "description": "Filters results by certificate log operator. Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "publicKeyAlgorithm": {
+              "description": "Filters results by public key algorithm.",
+              "items": {
+                "enum": [
+                  "DSA",
+                  "ECDSA",
+                  "RSA"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "signatureAlgorithm": {
+              "description": "Filters results by signature algorithm.",
+              "items": {
+                "enum": [
+                  "DSA_SHA_1",
+                  "DSA_SHA_256",
+                  "ECDSA_SHA_1",
+                  "ECDSA_SHA_256",
+                  "ECDSA_SHA_384",
+                  "ECDSA_SHA_512",
+                  "PSS_SHA_256",
+                  "PSS_SHA_384",
+                  "PSS_SHA_512",
+                  "RSA_MD2",
+                  "RSA_MD5",
+                  "RSA_SHA_1",
+                  "RSA_SHA_256",
+                  "RSA_SHA_384",
+                  "RSA_SHA_512"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain. Incompatible with the `log`, `logApi`, `logOperator`, and `entryType` filters/dimensions.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "uniqueEntries": {
+              "description": "Specifies whether to filter out duplicate certificates and pre-certificates. Set to true for unique entries only.",
+              "items": {
+                "enum": [
+                  "true",
+                  "false"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "validationLevel": {
+              "description": "Filters results by validation level.",
+              "items": {
+                "enum": [
+                  "DOMAIN",
+                  "ORGANIZATION",
+                  "EXTENDED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1672,279 +1695,295 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ct/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["ca", args["ca"], true],
-        ["caOwner", args["ca_owner"], true],
-        ["duration", args["duration"], true],
-        ["entryType", args["entry_type"], true],
-        ["expirationStatus", args["expiration_status"], true],
-        ["hasIps", args["has_ips"], true],
-        ["hasWildcards", args["has_wildcards"], true],
-        ["log", args["log"], true],
-        ["logApi", args["log_api"], true],
-        ["logOperator", args["log_operator"], true],
-        ["publicKeyAlgorithm", args["public_key_algorithm"], true],
-        ["signatureAlgorithm", args["signature_algorithm"], true],
-        ["tld", args["tld"], true],
-        ["validationLevel", args["validation_level"], true],
-        ["uniqueEntries", args["unique_entries"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["ca", param(args, "query", "ca"), true],
+        ["caOwner", param(args, "query", "caOwner"), true],
+        ["duration", param(args, "query", "duration"), true],
+        ["entryType", param(args, "query", "entryType"), true],
+        ["expirationStatus", param(args, "query", "expirationStatus"), true],
+        ["hasIps", param(args, "query", "hasIps"), true],
+        ["hasWildcards", param(args, "query", "hasWildcards"), true],
+        ["log", param(args, "query", "log"), true],
+        ["logApi", param(args, "query", "logApi"), true],
+        ["logOperator", param(args, "query", "logOperator"), true],
+        ["publicKeyAlgorithm", param(args, "query", "publicKeyAlgorithm"), true],
+        ["signatureAlgorithm", param(args, "query", "signatureAlgorithm"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["validationLevel", param(args, "query", "validationLevel"), true],
+        ["uniqueEntries", param(args, "query", "uniqueEntries"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_ct_timeseries_groups",
+    name: "radar_ct_timeseriesGroups",
     title: "Get time series of certificate distribution by dimension",
-    description: "Retrieves the distribution of certificates grouped by the specified dimension over time.",
+    description: "Retrieves the distribution of certificates grouped by the specified dimension over time.\n\nGET /radar/ct/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "ca": {
-          "description": "Filters results by certificate authority.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ca_owner": {
-          "description": "Filters results by certificate authority owner.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the certificate attribute by which to group the results.",
-          "enum": [
-            "CA",
-            "CA_OWNER",
-            "DURATION",
-            "ENTRY_TYPE",
-            "EXPIRATION_STATUS",
-            "HAS_IPS",
-            "HAS_WILDCARDS",
-            "LOG",
-            "LOG_API",
-            "LOG_OPERATOR",
-            "PUBLIC_KEY_ALGORITHM",
-            "SIGNATURE_ALGORITHM",
-            "TLD",
-            "VALIDATION_LEVEL"
-          ],
-          "type": "string"
-        },
-        "duration": {
-          "description": "Filters results by certificate duration.",
-          "items": {
-            "enum": [
-              "LTE_3D",
-              "GT_3D_LTE_7D",
-              "GT_7D_LTE_10D",
-              "GT_10D_LTE_47D",
-              "GT_47D_LTE_100D",
-              "GT_100D_LTE_200D",
-              "GT_200D"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "entry_type": {
-          "description": "Filters results by entry type (certificate vs. pre-certificate). Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "enum": [
-              "PRECERTIFICATE",
-              "CERTIFICATE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "expiration_status": {
-          "description": "Filters results by expiration status (expired vs. valid).",
-          "items": {
-            "enum": [
-              "EXPIRED",
-              "VALID"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "has_ips": {
-          "description": "Filters results based on whether the certificates are bound to specific IP addresses.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "has_wildcards": {
-          "description": "Filters results based on whether the certificates contain wildcard domains.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "log": {
-          "description": "Filters results by certificate log. Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "log_api": {
-          "description": "Filters results by certificate log API (RFC6962 vs. static). Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "enum": [
-              "RFC6962",
-              "STATIC"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "log_operator": {
-          "description": "Filters results by certificate log operator. Incompatible with the `tld` filter/dimension.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the certificate attribute by which to group the results.",
+              "enum": [
+                "CA",
+                "CA_OWNER",
+                "DURATION",
+                "ENTRY_TYPE",
+                "EXPIRATION_STATUS",
+                "HAS_IPS",
+                "HAS_WILDCARDS",
+                "LOG",
+                "LOG_API",
+                "LOG_OPERATOR",
+                "PUBLIC_KEY_ALGORITHM",
+                "SIGNATURE_ALGORITHM",
+                "TLD",
+                "VALIDATION_LEVEL"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "RAW_VALUES",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "RAW_VALUES",
-            "PERCENTAGE"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "public_key_algorithm": {
-          "description": "Filters results by public key algorithm.",
-          "items": {
-            "enum": [
-              "DSA",
-              "ECDSA",
-              "RSA"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "signature_algorithm": {
-          "description": "Filters results by signature algorithm.",
-          "items": {
-            "enum": [
-              "DSA_SHA_1",
-              "DSA_SHA_256",
-              "ECDSA_SHA_1",
-              "ECDSA_SHA_256",
-              "ECDSA_SHA_384",
-              "ECDSA_SHA_512",
-              "PSS_SHA_256",
-              "PSS_SHA_384",
-              "PSS_SHA_512",
-              "RSA_MD2",
-              "RSA_MD5",
-              "RSA_SHA_1",
-              "RSA_SHA_256",
-              "RSA_SHA_384",
-              "RSA_SHA_512"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain. Incompatible with the `log`, `logApi`, `logOperator`, and `entryType` filters/dimensions.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "unique_entries": {
-          "description": "Specifies whether to filter out duplicate certificates and pre-certificates. Set to true for unique entries only.",
-          "items": {
-            "enum": [
-              "true",
-              "false"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "validation_level": {
-          "description": "Filters results by validation level.",
-          "items": {
-            "enum": [
-              "DOMAIN",
-              "ORGANIZATION",
-              "EXTENDED"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "ca": {
+              "description": "Filters results by certificate authority.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "caOwner": {
+              "description": "Filters results by certificate authority owner.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "duration": {
+              "description": "Filters results by certificate duration.",
+              "items": {
+                "enum": [
+                  "LTE_3D",
+                  "GT_3D_LTE_7D",
+                  "GT_7D_LTE_10D",
+                  "GT_10D_LTE_47D",
+                  "GT_47D_LTE_100D",
+                  "GT_100D_LTE_200D",
+                  "GT_200D"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "entryType": {
+              "description": "Filters results by entry type (certificate vs. pre-certificate). Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "enum": [
+                  "PRECERTIFICATE",
+                  "CERTIFICATE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "expirationStatus": {
+              "description": "Filters results by expiration status (expired vs. valid).",
+              "items": {
+                "enum": [
+                  "EXPIRED",
+                  "VALID"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "hasIps": {
+              "description": "Filters results based on whether the certificates are bound to specific IP addresses.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "hasWildcards": {
+              "description": "Filters results based on whether the certificates contain wildcard domains.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "log": {
+              "description": "Filters results by certificate log. Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "logApi": {
+              "description": "Filters results by certificate log API (RFC6962 vs. static). Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "enum": [
+                  "RFC6962",
+                  "STATIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "logOperator": {
+              "description": "Filters results by certificate log operator. Incompatible with the `tld` filter/dimension.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "RAW_VALUES",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "RAW_VALUES",
+                "PERCENTAGE"
+              ],
+              "type": "string"
+            },
+            "publicKeyAlgorithm": {
+              "description": "Filters results by public key algorithm.",
+              "items": {
+                "enum": [
+                  "DSA",
+                  "ECDSA",
+                  "RSA"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "signatureAlgorithm": {
+              "description": "Filters results by signature algorithm.",
+              "items": {
+                "enum": [
+                  "DSA_SHA_1",
+                  "DSA_SHA_256",
+                  "ECDSA_SHA_1",
+                  "ECDSA_SHA_256",
+                  "ECDSA_SHA_384",
+                  "ECDSA_SHA_512",
+                  "PSS_SHA_256",
+                  "PSS_SHA_384",
+                  "PSS_SHA_512",
+                  "RSA_MD2",
+                  "RSA_MD5",
+                  "RSA_SHA_1",
+                  "RSA_SHA_256",
+                  "RSA_SHA_384",
+                  "RSA_SHA_512"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain. Incompatible with the `log`, `logApi`, `logOperator`, and `entryType` filters/dimensions.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "uniqueEntries": {
+              "description": "Specifies whether to filter out duplicate certificates and pre-certificates. Set to true for unique entries only.",
+              "items": {
+                "enum": [
+                  "true",
+                  "false"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "validationLevel": {
+              "description": "Filters results by validation level.",
+              "items": {
+                "enum": [
+                  "DOMAIN",
+                  "ORGANIZATION",
+                  "EXTENDED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2828,29 +2867,29 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ct/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["ca", args["ca"], true],
-        ["caOwner", args["ca_owner"], true],
-        ["duration", args["duration"], true],
-        ["entryType", args["entry_type"], true],
-        ["expirationStatus", args["expiration_status"], true],
-        ["hasIps", args["has_ips"], true],
-        ["hasWildcards", args["has_wildcards"], true],
-        ["log", args["log"], true],
-        ["logApi", args["log_api"], true],
-        ["logOperator", args["log_operator"], true],
-        ["publicKeyAlgorithm", args["public_key_algorithm"], true],
-        ["signatureAlgorithm", args["signature_algorithm"], true],
-        ["validationLevel", args["validation_level"], true],
-        ["tld", args["tld"], true],
-        ["normalization", args["normalization"], true],
-        ["uniqueEntries", args["unique_entries"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["ca", param(args, "query", "ca"), true],
+        ["caOwner", param(args, "query", "caOwner"), true],
+        ["duration", param(args, "query", "duration"), true],
+        ["entryType", param(args, "query", "entryType"), true],
+        ["expirationStatus", param(args, "query", "expirationStatus"), true],
+        ["hasIps", param(args, "query", "hasIps"), true],
+        ["hasWildcards", param(args, "query", "hasWildcards"), true],
+        ["log", param(args, "query", "log"), true],
+        ["logApi", param(args, "query", "logApi"), true],
+        ["logOperator", param(args, "query", "logOperator"), true],
+        ["publicKeyAlgorithm", param(args, "query", "publicKeyAlgorithm"), true],
+        ["signatureAlgorithm", param(args, "query", "signatureAlgorithm"), true],
+        ["validationLevel", param(args, "query", "validationLevel"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["uniqueEntries", param(args, "query", "uniqueEntries"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/datasets/tools.ts b/src/generated/forge-mcp/radar/datasets/tools.ts
index 7c250aa7c..895363e65 100644
--- a/src/generated/forge-mcp/radar/datasets/tools.ts
+++ b/src/generated/forge-mcp/radar/datasets/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.datasets`.
@@ -10,7 +10,7 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_datasets_download",
     title: "Get dataset download URL",
-    description: "Retrieves an URL to download a single dataset.",
+    description: "Retrieves an URL to download a single dataset.\n\nPOST /radar/datasets/download",
     inputSchema: {
       type: "object",
       properties: {
@@ -25,15 +25,22 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -147,7 +154,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/datasets/download`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -155,18 +162,28 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_datasets_get",
     title: "Get dataset CSV stream",
-    description: "Retrieves the CSV content of a given dataset by alias or ID. When getting the content by alias the latest dataset is returned, optionally filtered by the latest available at a given date.",
+    description: "Retrieves the CSV content of a given dataset by alias or ID. When getting the content by alias the latest dataset is returned, optionally filtered by the latest available at a given date.\n\nGET /radar/datasets/{alias}",
     inputSchema: {
       type: "object",
       properties: {
-        "alias": {
-          "description": "Dataset alias or ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "alias": {
+              "description": "Dataset alias or ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "alias"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "alias"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -231,42 +248,49 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_datasets_list",
     title: "List datasets",
-    description: "Retrieves a list of datasets.",
+    description: "Retrieves a list of datasets.\n\nGET /radar/datasets",
     inputSchema: {
       type: "object",
       properties: {
-        "dataset_type": {
-          "default": "RANKING_BUCKET",
-          "description": "Filters results by dataset type.",
-          "enum": [
-            "RANKING_BUCKET",
-            "REPORT"
-          ],
-          "type": "string"
-        },
-        "date": {
-          "description": "Filters results by the specified date.",
-          "format": "date",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "datasetType": {
+              "default": "RANKING_BUCKET",
+              "description": "Filters results by dataset type.",
+              "enum": [
+                "RANKING_BUCKET",
+                "REPORT"
+              ],
+              "type": "string"
+            },
+            "date": {
+              "description": "Filters results by the specified date.",
+              "format": "date",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -440,11 +464,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/datasets`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["datasetType", args["dataset_type"], true],
-        ["date", args["date"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["datasetType", param(args, "query", "datasetType"), true],
+        ["date", param(args, "query", "date"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/dns/tools.ts b/src/generated/forge-mcp/radar/dns/tools.ts
index 929f01c00..f740e513f 100644
--- a/src/generated/forge-mcp/radar/dns/tools.ts
+++ b/src/generated/forge-mcp/radar/dns/tools.ts
@@ -1,340 +1,356 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.dns`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_dns_summary_v2",
+    name: "radar_dns_summaryV2",
     title: "Get DNS summary by dimension",
-    description: "Retrieves the distribution of DNS queries by the specified dimension.",
+    description: "Retrieves the distribution of DNS queries by the specified dimension.\n\nGET /radar/dns/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "cache_hit": {
-          "description": "Filters results based on cache status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results. Grouping by `TLD_DNS_MAGNITUDE` does not support sub-daily aggregation intervals; `15m` and `1h` are raised to `1d`.",
-          "enum": [
-            "AS",
-            "CACHE_HIT",
-            "DNSSEC",
-            "DNSSEC_AWARE",
-            "DNSSEC_E2E",
-            "IP_VERSION",
-            "LOCATION",
-            "MATCHING_ANSWER",
-            "PROTOCOL",
-            "QUERY_TYPE",
-            "RESPONSE_CODE",
-            "RESPONSE_TTL",
-            "TLD",
-            "TLD_DNS_MAGNITUDE"
-          ],
-          "type": "string"
-        },
-        "dnssec": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
-          "items": {
-            "enum": [
-              "INVALID",
-              "INSECURE",
-              "SECURE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_aware": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
-          "items": {
-            "enum": [
-              "SUPPORTED",
-              "NOT_SUPPORTED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_e2e": {
-          "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "matching_answer": {
-          "description": "Filters results based on whether the queries have a matching answer.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results. Grouping by `TLD_DNS_MAGNITUDE` does not support sub-daily aggregation intervals; `15m` and `1h` are raised to `1d`.",
+              "enum": [
+                "AS",
+                "CACHE_HIT",
+                "DNSSEC",
+                "DNSSEC_AWARE",
+                "DNSSEC_E2E",
+                "IP_VERSION",
+                "LOCATION",
+                "MATCHING_ANSWER",
+                "PROTOCOL",
+                "QUERY_TYPE",
+                "RESPONSE_CODE",
+                "RESPONSE_TTL",
+                "TLD",
+                "TLD_DNS_MAGNITUDE"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "nodata": {
-          "default": [
-            "true"
+          "required": [
+            "dimension"
           ],
-          "description": "Specifies whether the response includes empty DNS responses (NODATA).",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters results by DNS transport protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "HTTPS",
-              "TLS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "query_type": {
-          "description": "Filters results by DNS query type.",
-          "items": {
-            "oneOf": [
-              {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "cacheHit": {
+              "description": "Filters results based on cache status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssec": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
+              "items": {
+                "enum": [
+                  "INVALID",
+                  "INSECURE",
+                  "SECURE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecAware": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
+              "items": {
+                "enum": [
+                  "SUPPORTED",
+                  "NOT_SUPPORTED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecE2e": {
+              "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "matchingAnswer": {
+              "description": "Filters results based on whether the queries have a matching answer.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "nodata": {
+              "default": [
+                "true"
+              ],
+              "description": "Specifies whether the response includes empty DNS responses (NODATA).",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters results by DNS transport protocol.",
+              "items": {
                 "enum": [
-                  "A",
-                  "AAAA",
-                  "A6",
-                  "AFSDB",
-                  "ANY",
-                  "APL",
-                  "ATMA",
-                  "AXFR",
-                  "CAA",
-                  "CDNSKEY",
-                  "CDS",
-                  "CERT",
-                  "CNAME",
-                  "CSYNC",
-                  "DHCID",
-                  "DLV",
-                  "DNAME",
-                  "DNSKEY",
-                  "DOA",
-                  "DS",
-                  "EID",
-                  "EUI48",
-                  "EUI64",
-                  "GPOS",
-                  "GID",
-                  "HINFO",
-                  "HIP",
+                  "UDP",
+                  "TCP",
                   "HTTPS",
-                  "IPSECKEY",
-                  "ISDN",
-                  "IXFR",
-                  "KEY",
-                  "KX",
-                  "L32",
-                  "L64",
-                  "LOC",
-                  "LP",
-                  "MAILA",
-                  "MAILB",
-                  "MB",
-                  "MD",
-                  "MF",
-                  "MG",
-                  "MINFO",
-                  "MR",
-                  "MX",
-                  "NAPTR",
-                  "NB",
-                  "NBSTAT",
-                  "NID",
-                  "NIMLOC",
-                  "NINFO",
-                  "NS",
-                  "NSAP",
-                  "NSEC",
-                  "NSEC3",
-                  "NSEC3PARAM",
-                  "NULL",
-                  "NXT",
-                  "OPENPGPKEY",
-                  "OPT",
-                  "PTR",
-                  "PX",
-                  "RKEY",
-                  "RP",
-                  "RRSIG",
-                  "RT",
-                  "SIG",
-                  "SINK",
-                  "SMIMEA",
-                  "SOA",
-                  "SPF",
-                  "SRV",
-                  "SSHFP",
-                  "SVCB",
-                  "TA",
-                  "TALINK",
-                  "TKEY",
-                  "TLSA",
-                  "TSIG",
-                  "TXT",
-                  "UINFO",
-                  "UID",
-                  "UNSPEC",
-                  "URI",
-                  "WKS",
-                  "X25",
-                  "ZONEMD"
+                  "TLS"
                 ],
                 "type": "string"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        "response_code": {
-          "description": "Filters results by DNS response code.",
-          "items": {
-            "enum": [
-              "NOERROR",
-              "FORMERR",
-              "SERVFAIL",
-              "NXDOMAIN",
-              "NOTIMP",
-              "REFUSED",
-              "YXDOMAIN",
-              "YXRRSET",
-              "NXRRSET",
-              "NOTAUTH",
-              "NOTZONE",
-              "BADSIG",
-              "BADKEY",
-              "BADTIME",
-              "BADMODE",
-              "BADNAME",
-              "BADALG",
-              "BADTRUNC",
-              "BADCOOKIE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_ttl": {
-          "description": "Filters results by DNS response TTL.",
-          "items": {
-            "enum": [
-              "LTE_1M",
-              "GT_1M_LTE_5M",
-              "GT_5M_LTE_15M",
-              "GT_15M_LTE_1H",
-              "GT_1H_LTE_1D",
-              "GT_1D_LTE_1W",
-              "GT_1W"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain. Incompatible with the `ipVersion`, `protocol`, `dnssecE2e`, `dnssecAware`, `responseTtl`, and `cacheHit` filters/dimensions; this restriction does not apply to country-code TLDs (2-letter, e.g. `uk`).",
-          "items": {
-            "type": "string"
+              "type": "array"
+            },
+            "queryType": {
+              "description": "Filters results by DNS query type.",
+              "items": {
+                "oneOf": [
+                  {
+                    "enum": [
+                      "A",
+                      "AAAA",
+                      "A6",
+                      "AFSDB",
+                      "ANY",
+                      "APL",
+                      "ATMA",
+                      "AXFR",
+                      "CAA",
+                      "CDNSKEY",
+                      "CDS",
+                      "CERT",
+                      "CNAME",
+                      "CSYNC",
+                      "DHCID",
+                      "DLV",
+                      "DNAME",
+                      "DNSKEY",
+                      "DOA",
+                      "DS",
+                      "EID",
+                      "EUI48",
+                      "EUI64",
+                      "GPOS",
+                      "GID",
+                      "HINFO",
+                      "HIP",
+                      "HTTPS",
+                      "IPSECKEY",
+                      "ISDN",
+                      "IXFR",
+                      "KEY",
+                      "KX",
+                      "L32",
+                      "L64",
+                      "LOC",
+                      "LP",
+                      "MAILA",
+                      "MAILB",
+                      "MB",
+                      "MD",
+                      "MF",
+                      "MG",
+                      "MINFO",
+                      "MR",
+                      "MX",
+                      "NAPTR",
+                      "NB",
+                      "NBSTAT",
+                      "NID",
+                      "NIMLOC",
+                      "NINFO",
+                      "NS",
+                      "NSAP",
+                      "NSEC",
+                      "NSEC3",
+                      "NSEC3PARAM",
+                      "NULL",
+                      "NXT",
+                      "OPENPGPKEY",
+                      "OPT",
+                      "PTR",
+                      "PX",
+                      "RKEY",
+                      "RP",
+                      "RRSIG",
+                      "RT",
+                      "SIG",
+                      "SINK",
+                      "SMIMEA",
+                      "SOA",
+                      "SPF",
+                      "SRV",
+                      "SSHFP",
+                      "SVCB",
+                      "TA",
+                      "TALINK",
+                      "TKEY",
+                      "TLSA",
+                      "TSIG",
+                      "TXT",
+                      "UINFO",
+                      "UID",
+                      "UNSPEC",
+                      "URI",
+                      "WKS",
+                      "X25",
+                      "ZONEMD"
+                    ],
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            },
+            "responseCode": {
+              "description": "Filters results by DNS response code.",
+              "items": {
+                "enum": [
+                  "NOERROR",
+                  "FORMERR",
+                  "SERVFAIL",
+                  "NXDOMAIN",
+                  "NOTIMP",
+                  "REFUSED",
+                  "YXDOMAIN",
+                  "YXRRSET",
+                  "NXRRSET",
+                  "NOTAUTH",
+                  "NOTZONE",
+                  "BADSIG",
+                  "BADKEY",
+                  "BADTIME",
+                  "BADMODE",
+                  "BADNAME",
+                  "BADALG",
+                  "BADTRUNC",
+                  "BADCOOKIE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseTtl": {
+              "description": "Filters results by DNS response TTL.",
+              "items": {
+                "enum": [
+                  "LTE_1M",
+                  "GT_1M_LTE_5M",
+                  "GT_5M_LTE_15M",
+                  "GT_15M_LTE_1H",
+                  "GT_1H_LTE_1D",
+                  "GT_1D_LTE_1W",
+                  "GT_1W"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain. Incompatible with the `ipVersion`, `protocol`, `dnssecE2e`, `dnssecAware`, `responseTtl`, and `cacheHit` filters/dimensions; this restriction does not apply to country-code TLDs (2-letter, e.g. `uk`).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -766,341 +782,348 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/dns/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["cacheHit", args["cache_hit"], true],
-        ["nodata", args["nodata"], true],
-        ["protocol", args["protocol"], true],
-        ["queryType", args["query_type"], true],
-        ["responseCode", args["response_code"], true],
-        ["responseTtl", args["response_ttl"], true],
-        ["dnssec", args["dnssec"], true],
-        ["dnssecAware", args["dnssec_aware"], true],
-        ["dnssecE2e", args["dnssec_e2e"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["matchingAnswer", args["matching_answer"], true],
-        ["tld", args["tld"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["cacheHit", param(args, "query", "cacheHit"), true],
+        ["nodata", param(args, "query", "nodata"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["queryType", param(args, "query", "queryType"), true],
+        ["responseCode", param(args, "query", "responseCode"), true],
+        ["responseTtl", param(args, "query", "responseTtl"), true],
+        ["dnssec", param(args, "query", "dnssec"), true],
+        ["dnssecAware", param(args, "query", "dnssecAware"), true],
+        ["dnssecE2e", param(args, "query", "dnssecE2e"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["matchingAnswer", param(args, "query", "matchingAnswer"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_dns_timeseries",
     title: "Get DNS queries time series",
-    description: "Retrieves normalized query volume to the 1.1.1.1 DNS resolver over time.",
+    description: "Retrieves normalized query volume to the 1.1.1.1 DNS resolver over time.\n\nGET /radar/dns/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "cache_hit": {
-          "description": "Filters results based on cache status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
-          "items": {
-            "enum": [
-              "INVALID",
-              "INSECURE",
-              "SECURE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_aware": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
-          "items": {
-            "enum": [
-              "SUPPORTED",
-              "NOT_SUPPORTED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_e2e": {
-          "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "matching_answer": {
-          "description": "Filters results based on whether the queries have a matching answer.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "nodata": {
-          "default": [
-            "true"
-          ],
-          "description": "Specifies whether the response includes empty DNS responses (NODATA).",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters results by DNS transport protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "HTTPS",
-              "TLS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "query_type": {
-          "description": "Filters results by DNS query type.",
-          "items": {
-            "oneOf": [
-              {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "cacheHit": {
+              "description": "Filters results based on cache status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssec": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
+              "items": {
                 "enum": [
-                  "A",
-                  "AAAA",
-                  "A6",
-                  "AFSDB",
-                  "ANY",
-                  "APL",
-                  "ATMA",
-                  "AXFR",
-                  "CAA",
-                  "CDNSKEY",
-                  "CDS",
-                  "CERT",
-                  "CNAME",
-                  "CSYNC",
-                  "DHCID",
-                  "DLV",
-                  "DNAME",
-                  "DNSKEY",
-                  "DOA",
-                  "DS",
-                  "EID",
-                  "EUI48",
-                  "EUI64",
-                  "GPOS",
-                  "GID",
-                  "HINFO",
-                  "HIP",
+                  "INVALID",
+                  "INSECURE",
+                  "SECURE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecAware": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
+              "items": {
+                "enum": [
+                  "SUPPORTED",
+                  "NOT_SUPPORTED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecE2e": {
+              "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "matchingAnswer": {
+              "description": "Filters results based on whether the queries have a matching answer.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "nodata": {
+              "default": [
+                "true"
+              ],
+              "description": "Specifies whether the response includes empty DNS responses (NODATA).",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters results by DNS transport protocol.",
+              "items": {
+                "enum": [
+                  "UDP",
+                  "TCP",
                   "HTTPS",
-                  "IPSECKEY",
-                  "ISDN",
-                  "IXFR",
-                  "KEY",
-                  "KX",
-                  "L32",
-                  "L64",
-                  "LOC",
-                  "LP",
-                  "MAILA",
-                  "MAILB",
-                  "MB",
-                  "MD",
-                  "MF",
-                  "MG",
-                  "MINFO",
-                  "MR",
-                  "MX",
-                  "NAPTR",
-                  "NB",
-                  "NBSTAT",
-                  "NID",
-                  "NIMLOC",
-                  "NINFO",
-                  "NS",
-                  "NSAP",
-                  "NSEC",
-                  "NSEC3",
-                  "NSEC3PARAM",
-                  "NULL",
-                  "NXT",
-                  "OPENPGPKEY",
-                  "OPT",
-                  "PTR",
-                  "PX",
-                  "RKEY",
-                  "RP",
-                  "RRSIG",
-                  "RT",
-                  "SIG",
-                  "SINK",
-                  "SMIMEA",
-                  "SOA",
-                  "SPF",
-                  "SRV",
-                  "SSHFP",
-                  "SVCB",
-                  "TA",
-                  "TALINK",
-                  "TKEY",
-                  "TLSA",
-                  "TSIG",
-                  "TXT",
-                  "UINFO",
-                  "UID",
-                  "UNSPEC",
-                  "URI",
-                  "WKS",
-                  "X25",
-                  "ZONEMD"
+                  "TLS"
                 ],
                 "type": "string"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        "response_code": {
-          "description": "Filters results by DNS response code.",
-          "items": {
-            "enum": [
-              "NOERROR",
-              "FORMERR",
-              "SERVFAIL",
-              "NXDOMAIN",
-              "NOTIMP",
-              "REFUSED",
-              "YXDOMAIN",
-              "YXRRSET",
-              "NXRRSET",
-              "NOTAUTH",
-              "NOTZONE",
-              "BADSIG",
-              "BADKEY",
-              "BADTIME",
-              "BADMODE",
-              "BADNAME",
-              "BADALG",
-              "BADTRUNC",
-              "BADCOOKIE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_ttl": {
-          "description": "Filters results by DNS response TTL.",
-          "items": {
-            "enum": [
-              "LTE_1M",
-              "GT_1M_LTE_5M",
-              "GT_5M_LTE_15M",
-              "GT_15M_LTE_1H",
-              "GT_1H_LTE_1D",
-              "GT_1D_LTE_1W",
-              "GT_1W"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain. Incompatible with the `ipVersion`, `protocol`, `dnssecE2e`, `dnssecAware`, `responseTtl`, and `cacheHit` filters/dimensions; this restriction does not apply to country-code TLDs (2-letter, e.g. `uk`).",
-          "items": {
-            "type": "string"
+              "type": "array"
+            },
+            "queryType": {
+              "description": "Filters results by DNS query type.",
+              "items": {
+                "oneOf": [
+                  {
+                    "enum": [
+                      "A",
+                      "AAAA",
+                      "A6",
+                      "AFSDB",
+                      "ANY",
+                      "APL",
+                      "ATMA",
+                      "AXFR",
+                      "CAA",
+                      "CDNSKEY",
+                      "CDS",
+                      "CERT",
+                      "CNAME",
+                      "CSYNC",
+                      "DHCID",
+                      "DLV",
+                      "DNAME",
+                      "DNSKEY",
+                      "DOA",
+                      "DS",
+                      "EID",
+                      "EUI48",
+                      "EUI64",
+                      "GPOS",
+                      "GID",
+                      "HINFO",
+                      "HIP",
+                      "HTTPS",
+                      "IPSECKEY",
+                      "ISDN",
+                      "IXFR",
+                      "KEY",
+                      "KX",
+                      "L32",
+                      "L64",
+                      "LOC",
+                      "LP",
+                      "MAILA",
+                      "MAILB",
+                      "MB",
+                      "MD",
+                      "MF",
+                      "MG",
+                      "MINFO",
+                      "MR",
+                      "MX",
+                      "NAPTR",
+                      "NB",
+                      "NBSTAT",
+                      "NID",
+                      "NIMLOC",
+                      "NINFO",
+                      "NS",
+                      "NSAP",
+                      "NSEC",
+                      "NSEC3",
+                      "NSEC3PARAM",
+                      "NULL",
+                      "NXT",
+                      "OPENPGPKEY",
+                      "OPT",
+                      "PTR",
+                      "PX",
+                      "RKEY",
+                      "RP",
+                      "RRSIG",
+                      "RT",
+                      "SIG",
+                      "SINK",
+                      "SMIMEA",
+                      "SOA",
+                      "SPF",
+                      "SRV",
+                      "SSHFP",
+                      "SVCB",
+                      "TA",
+                      "TALINK",
+                      "TKEY",
+                      "TLSA",
+                      "TSIG",
+                      "TXT",
+                      "UINFO",
+                      "UID",
+                      "UNSPEC",
+                      "URI",
+                      "WKS",
+                      "X25",
+                      "ZONEMD"
+                    ],
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            },
+            "responseCode": {
+              "description": "Filters results by DNS response code.",
+              "items": {
+                "enum": [
+                  "NOERROR",
+                  "FORMERR",
+                  "SERVFAIL",
+                  "NXDOMAIN",
+                  "NOTIMP",
+                  "REFUSED",
+                  "YXDOMAIN",
+                  "YXRRSET",
+                  "NXRRSET",
+                  "NOTAUTH",
+                  "NOTZONE",
+                  "BADSIG",
+                  "BADKEY",
+                  "BADTIME",
+                  "BADMODE",
+                  "BADNAME",
+                  "BADALG",
+                  "BADTRUNC",
+                  "BADCOOKIE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseTtl": {
+              "description": "Filters results by DNS response TTL.",
+              "items": {
+                "enum": [
+                  "LTE_1M",
+                  "GT_1M_LTE_5M",
+                  "GT_5M_LTE_15M",
+                  "GT_15M_LTE_1H",
+                  "GT_1H_LTE_1D",
+                  "GT_1D_LTE_1W",
+                  "GT_1W"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain. Incompatible with the `ipVersion`, `protocol`, `dnssecE2e`, `dnssecAware`, `responseTtl`, and `cacheHit` filters/dimensions; this restriction does not apply to country-code TLDs (2-letter, e.g. `uk`).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1584,378 +1607,394 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/dns/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["cacheHit", args["cache_hit"], true],
-        ["nodata", args["nodata"], true],
-        ["protocol", args["protocol"], true],
-        ["queryType", args["query_type"], true],
-        ["responseCode", args["response_code"], true],
-        ["responseTtl", args["response_ttl"], true],
-        ["dnssec", args["dnssec"], true],
-        ["dnssecAware", args["dnssec_aware"], true],
-        ["dnssecE2e", args["dnssec_e2e"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["matchingAnswer", args["matching_answer"], true],
-        ["tld", args["tld"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["cacheHit", param(args, "query", "cacheHit"), true],
+        ["nodata", param(args, "query", "nodata"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["queryType", param(args, "query", "queryType"), true],
+        ["responseCode", param(args, "query", "responseCode"), true],
+        ["responseTtl", param(args, "query", "responseTtl"), true],
+        ["dnssec", param(args, "query", "dnssec"), true],
+        ["dnssecAware", param(args, "query", "dnssecAware"), true],
+        ["dnssecE2e", param(args, "query", "dnssecE2e"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["matchingAnswer", param(args, "query", "matchingAnswer"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_dns_timeseries_groups_v2",
+    name: "radar_dns_timeseriesGroupsV2",
     title: "Get DNS time series grouped by dimension",
-    description: "Retrieves the distribution of DNS queries grouped by dimension over time.",
+    description: "Retrieves the distribution of DNS queries grouped by dimension over time.\n\nGET /radar/dns/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "cache_hit": {
-          "description": "Filters results based on cache status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results. Grouping by `TLD_DNS_MAGNITUDE` does not support sub-daily aggregation intervals; `15m` and `1h` are raised to `1d`.",
-          "enum": [
-            "AS",
-            "CACHE_HIT",
-            "DNSSEC",
-            "DNSSEC_AWARE",
-            "DNSSEC_E2E",
-            "IP_VERSION",
-            "LOCATION",
-            "MATCHING_ANSWER",
-            "PROTOCOL",
-            "QUERY_TYPE",
-            "RESPONSE_CODE",
-            "RESPONSE_TTL",
-            "TLD",
-            "TLD_DNS_MAGNITUDE"
-          ],
-          "type": "string"
-        },
-        "dnssec": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
-          "items": {
-            "enum": [
-              "INVALID",
-              "INSECURE",
-              "SECURE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_aware": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
-          "items": {
-            "enum": [
-              "SUPPORTED",
-              "NOT_SUPPORTED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_e2e": {
-          "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "matching_answer": {
-          "description": "Filters results based on whether the queries have a matching answer.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "nodata": {
-          "default": [
-            "true"
-          ],
-          "description": "Specifies whether the response includes empty DNS responses (NODATA).",
-          "items": {
-            "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results. Grouping by `TLD_DNS_MAGNITUDE` does not support sub-daily aggregation intervals; `15m` and `1h` are raised to `1d`.",
+              "enum": [
+                "AS",
+                "CACHE_HIT",
+                "DNSSEC",
+                "DNSSEC_AWARE",
+                "DNSSEC_E2E",
+                "IP_VERSION",
+                "LOCATION",
+                "MATCHING_ANSWER",
+                "PROTOCOL",
+                "QUERY_TYPE",
+                "RESPONSE_CODE",
+                "RESPONSE_TTL",
+                "TLD",
+                "TLD_DNS_MAGNITUDE"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `RANK` is only meaningful with the `TLD_DNS_MAGNITUDE` dimension, where it ranks TLDs by DNS query magnitude at each timestamp; for other dimensions it has no effect.",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX",
-            "RANK"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "protocol": {
-          "description": "Filters results by DNS transport protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "HTTPS",
-              "TLS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "query_type": {
-          "description": "Filters results by DNS query type.",
-          "items": {
-            "oneOf": [
-              {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "cacheHit": {
+              "description": "Filters results based on cache status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssec": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
+              "items": {
+                "enum": [
+                  "INVALID",
+                  "INSECURE",
+                  "SECURE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecAware": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
+              "items": {
+                "enum": [
+                  "SUPPORTED",
+                  "NOT_SUPPORTED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecE2e": {
+              "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "matchingAnswer": {
+              "description": "Filters results based on whether the queries have a matching answer.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "nodata": {
+              "default": [
+                "true"
+              ],
+              "description": "Specifies whether the response includes empty DNS responses (NODATA).",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `RANK` is only meaningful with the `TLD_DNS_MAGNITUDE` dimension, where it ranks TLDs by DNS query magnitude at each timestamp; for other dimensions it has no effect.",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX",
+                "RANK"
+              ],
+              "type": "string"
+            },
+            "protocol": {
+              "description": "Filters results by DNS transport protocol.",
+              "items": {
                 "enum": [
-                  "A",
-                  "AAAA",
-                  "A6",
-                  "AFSDB",
-                  "ANY",
-                  "APL",
-                  "ATMA",
-                  "AXFR",
-                  "CAA",
-                  "CDNSKEY",
-                  "CDS",
-                  "CERT",
-                  "CNAME",
-                  "CSYNC",
-                  "DHCID",
-                  "DLV",
-                  "DNAME",
-                  "DNSKEY",
-                  "DOA",
-                  "DS",
-                  "EID",
-                  "EUI48",
-                  "EUI64",
-                  "GPOS",
-                  "GID",
-                  "HINFO",
-                  "HIP",
+                  "UDP",
+                  "TCP",
                   "HTTPS",
-                  "IPSECKEY",
-                  "ISDN",
-                  "IXFR",
-                  "KEY",
-                  "KX",
-                  "L32",
-                  "L64",
-                  "LOC",
-                  "LP",
-                  "MAILA",
-                  "MAILB",
-                  "MB",
-                  "MD",
-                  "MF",
-                  "MG",
-                  "MINFO",
-                  "MR",
-                  "MX",
-                  "NAPTR",
-                  "NB",
-                  "NBSTAT",
-                  "NID",
-                  "NIMLOC",
-                  "NINFO",
-                  "NS",
-                  "NSAP",
-                  "NSEC",
-                  "NSEC3",
-                  "NSEC3PARAM",
-                  "NULL",
-                  "NXT",
-                  "OPENPGPKEY",
-                  "OPT",
-                  "PTR",
-                  "PX",
-                  "RKEY",
-                  "RP",
-                  "RRSIG",
-                  "RT",
-                  "SIG",
-                  "SINK",
-                  "SMIMEA",
-                  "SOA",
-                  "SPF",
-                  "SRV",
-                  "SSHFP",
-                  "SVCB",
-                  "TA",
-                  "TALINK",
-                  "TKEY",
-                  "TLSA",
-                  "TSIG",
-                  "TXT",
-                  "UINFO",
-                  "UID",
-                  "UNSPEC",
-                  "URI",
-                  "WKS",
-                  "X25",
-                  "ZONEMD"
+                  "TLS"
                 ],
                 "type": "string"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        "response_code": {
-          "description": "Filters results by DNS response code.",
-          "items": {
-            "enum": [
-              "NOERROR",
-              "FORMERR",
-              "SERVFAIL",
-              "NXDOMAIN",
-              "NOTIMP",
-              "REFUSED",
-              "YXDOMAIN",
-              "YXRRSET",
-              "NXRRSET",
-              "NOTAUTH",
-              "NOTZONE",
-              "BADSIG",
-              "BADKEY",
-              "BADTIME",
-              "BADMODE",
-              "BADNAME",
-              "BADALG",
-              "BADTRUNC",
-              "BADCOOKIE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_ttl": {
-          "description": "Filters results by DNS response TTL.",
-          "items": {
-            "enum": [
-              "LTE_1M",
-              "GT_1M_LTE_5M",
-              "GT_5M_LTE_15M",
-              "GT_15M_LTE_1H",
-              "GT_1H_LTE_1D",
-              "GT_1D_LTE_1W",
-              "GT_1W"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain. Incompatible with the `ipVersion`, `protocol`, `dnssecE2e`, `dnssecAware`, `responseTtl`, and `cacheHit` filters/dimensions; this restriction does not apply to country-code TLDs (2-letter, e.g. `uk`).",
-          "items": {
-            "type": "string"
+              "type": "array"
+            },
+            "queryType": {
+              "description": "Filters results by DNS query type.",
+              "items": {
+                "oneOf": [
+                  {
+                    "enum": [
+                      "A",
+                      "AAAA",
+                      "A6",
+                      "AFSDB",
+                      "ANY",
+                      "APL",
+                      "ATMA",
+                      "AXFR",
+                      "CAA",
+                      "CDNSKEY",
+                      "CDS",
+                      "CERT",
+                      "CNAME",
+                      "CSYNC",
+                      "DHCID",
+                      "DLV",
+                      "DNAME",
+                      "DNSKEY",
+                      "DOA",
+                      "DS",
+                      "EID",
+                      "EUI48",
+                      "EUI64",
+                      "GPOS",
+                      "GID",
+                      "HINFO",
+                      "HIP",
+                      "HTTPS",
+                      "IPSECKEY",
+                      "ISDN",
+                      "IXFR",
+                      "KEY",
+                      "KX",
+                      "L32",
+                      "L64",
+                      "LOC",
+                      "LP",
+                      "MAILA",
+                      "MAILB",
+                      "MB",
+                      "MD",
+                      "MF",
+                      "MG",
+                      "MINFO",
+                      "MR",
+                      "MX",
+                      "NAPTR",
+                      "NB",
+                      "NBSTAT",
+                      "NID",
+                      "NIMLOC",
+                      "NINFO",
+                      "NS",
+                      "NSAP",
+                      "NSEC",
+                      "NSEC3",
+                      "NSEC3PARAM",
+                      "NULL",
+                      "NXT",
+                      "OPENPGPKEY",
+                      "OPT",
+                      "PTR",
+                      "PX",
+                      "RKEY",
+                      "RP",
+                      "RRSIG",
+                      "RT",
+                      "SIG",
+                      "SINK",
+                      "SMIMEA",
+                      "SOA",
+                      "SPF",
+                      "SRV",
+                      "SSHFP",
+                      "SVCB",
+                      "TA",
+                      "TALINK",
+                      "TKEY",
+                      "TLSA",
+                      "TSIG",
+                      "TXT",
+                      "UINFO",
+                      "UID",
+                      "UNSPEC",
+                      "URI",
+                      "WKS",
+                      "X25",
+                      "ZONEMD"
+                    ],
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            },
+            "responseCode": {
+              "description": "Filters results by DNS response code.",
+              "items": {
+                "enum": [
+                  "NOERROR",
+                  "FORMERR",
+                  "SERVFAIL",
+                  "NXDOMAIN",
+                  "NOTIMP",
+                  "REFUSED",
+                  "YXDOMAIN",
+                  "YXRRSET",
+                  "NXRRSET",
+                  "NOTAUTH",
+                  "NOTZONE",
+                  "BADSIG",
+                  "BADKEY",
+                  "BADTIME",
+                  "BADMODE",
+                  "BADNAME",
+                  "BADALG",
+                  "BADTRUNC",
+                  "BADCOOKIE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseTtl": {
+              "description": "Filters results by DNS response TTL.",
+              "items": {
+                "enum": [
+                  "LTE_1M",
+                  "GT_1M_LTE_5M",
+                  "GT_5M_LTE_15M",
+                  "GT_15M_LTE_1H",
+                  "GT_1H_LTE_1D",
+                  "GT_1D_LTE_1W",
+                  "GT_1W"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain. Incompatible with the `ipVersion`, `protocol`, `dnssecE2e`, `dnssecAware`, `responseTtl`, and `cacheHit` filters/dimensions; this restriction does not apply to country-code TLDs (2-letter, e.g. `uk`).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2439,29 +2478,29 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/dns/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["cacheHit", args["cache_hit"], true],
-        ["nodata", args["nodata"], true],
-        ["protocol", args["protocol"], true],
-        ["queryType", args["query_type"], true],
-        ["responseCode", args["response_code"], true],
-        ["responseTtl", args["response_ttl"], true],
-        ["dnssec", args["dnssec"], true],
-        ["dnssecAware", args["dnssec_aware"], true],
-        ["dnssecE2e", args["dnssec_e2e"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["matchingAnswer", args["matching_answer"], true],
-        ["tld", args["tld"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["cacheHit", param(args, "query", "cacheHit"), true],
+        ["nodata", param(args, "query", "nodata"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["queryType", param(args, "query", "queryType"), true],
+        ["responseCode", param(args, "query", "responseCode"), true],
+        ["responseTtl", param(args, "query", "responseTtl"), true],
+        ["dnssec", param(args, "query", "dnssec"), true],
+        ["dnssecAware", param(args, "query", "dnssecAware"), true],
+        ["dnssecE2e", param(args, "query", "dnssecE2e"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["matchingAnswer", param(args, "query", "matchingAnswer"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/dns/top/tools.ts b/src/generated/forge-mcp/radar/dns/top/tools.ts
index 264632e96..8b3fab948 100644
--- a/src/generated/forge-mcp/radar/dns/top/tools.ts
+++ b/src/generated/forge-mcp/radar/dns/top/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.dns.top`.
@@ -10,309 +10,316 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_dns_top_ases",
     title: "Get top ASes by DNS queries",
-    description: "Retrieves the top autonomous systems by DNS queries made to 1.1.1.1 DNS resolver.",
+    description: "Retrieves the top autonomous systems by DNS queries made to 1.1.1.1 DNS resolver.\n\nGET /radar/dns/top/ases",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "cache_hit": {
-          "description": "Filters results based on cache status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
-          "items": {
-            "enum": [
-              "INVALID",
-              "INSECURE",
-              "SECURE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_aware": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
-          "items": {
-            "enum": [
-              "SUPPORTED",
-              "NOT_SUPPORTED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_e2e": {
-          "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "domain": {
-          "description": "Filters results by domain name. When set, no other DNS filter may be used — only date filtering (`dateRange`, or `dateStart`/`dateEnd`) is allowed — and the date range cannot exceed 31 days.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "matching_answer": {
-          "description": "Filters results based on whether the queries have a matching answer.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "nodata": {
-          "default": [
-            "true"
-          ],
-          "description": "Specifies whether the response includes empty DNS responses (NODATA).",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters results by DNS transport protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "HTTPS",
-              "TLS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "query_type": {
-          "description": "Filters results by DNS query type.",
-          "items": {
-            "oneOf": [
-              {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "cacheHit": {
+              "description": "Filters results based on cache status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssec": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
+              "items": {
                 "enum": [
-                  "A",
-                  "AAAA",
-                  "A6",
-                  "AFSDB",
-                  "ANY",
-                  "APL",
-                  "ATMA",
-                  "AXFR",
-                  "CAA",
-                  "CDNSKEY",
-                  "CDS",
-                  "CERT",
-                  "CNAME",
-                  "CSYNC",
-                  "DHCID",
-                  "DLV",
-                  "DNAME",
-                  "DNSKEY",
-                  "DOA",
-                  "DS",
-                  "EID",
-                  "EUI48",
-                  "EUI64",
-                  "GPOS",
-                  "GID",
-                  "HINFO",
-                  "HIP",
+                  "INVALID",
+                  "INSECURE",
+                  "SECURE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecAware": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
+              "items": {
+                "enum": [
+                  "SUPPORTED",
+                  "NOT_SUPPORTED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecE2e": {
+              "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "domain": {
+              "description": "Filters results by domain name. When set, no other DNS filter may be used — only date filtering (`dateRange`, or `dateStart`/`dateEnd`) is allowed — and the date range cannot exceed 31 days.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "matchingAnswer": {
+              "description": "Filters results based on whether the queries have a matching answer.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "nodata": {
+              "default": [
+                "true"
+              ],
+              "description": "Specifies whether the response includes empty DNS responses (NODATA).",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters results by DNS transport protocol.",
+              "items": {
+                "enum": [
+                  "UDP",
+                  "TCP",
                   "HTTPS",
-                  "IPSECKEY",
-                  "ISDN",
-                  "IXFR",
-                  "KEY",
-                  "KX",
-                  "L32",
-                  "L64",
-                  "LOC",
-                  "LP",
-                  "MAILA",
-                  "MAILB",
-                  "MB",
-                  "MD",
-                  "MF",
-                  "MG",
-                  "MINFO",
-                  "MR",
-                  "MX",
-                  "NAPTR",
-                  "NB",
-                  "NBSTAT",
-                  "NID",
-                  "NIMLOC",
-                  "NINFO",
-                  "NS",
-                  "NSAP",
-                  "NSEC",
-                  "NSEC3",
-                  "NSEC3PARAM",
-                  "NULL",
-                  "NXT",
-                  "OPENPGPKEY",
-                  "OPT",
-                  "PTR",
-                  "PX",
-                  "RKEY",
-                  "RP",
-                  "RRSIG",
-                  "RT",
-                  "SIG",
-                  "SINK",
-                  "SMIMEA",
-                  "SOA",
-                  "SPF",
-                  "SRV",
-                  "SSHFP",
-                  "SVCB",
-                  "TA",
-                  "TALINK",
-                  "TKEY",
-                  "TLSA",
-                  "TSIG",
-                  "TXT",
-                  "UINFO",
-                  "UID",
-                  "UNSPEC",
-                  "URI",
-                  "WKS",
-                  "X25",
-                  "ZONEMD"
+                  "TLS"
                 ],
                 "type": "string"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        "response_code": {
-          "description": "Filters results by DNS response code.",
-          "items": {
-            "enum": [
-              "NOERROR",
-              "FORMERR",
-              "SERVFAIL",
-              "NXDOMAIN",
-              "NOTIMP",
-              "REFUSED",
-              "YXDOMAIN",
-              "YXRRSET",
-              "NXRRSET",
-              "NOTAUTH",
-              "NOTZONE",
-              "BADSIG",
-              "BADKEY",
-              "BADTIME",
-              "BADMODE",
-              "BADNAME",
-              "BADALG",
-              "BADTRUNC",
-              "BADCOOKIE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_ttl": {
-          "description": "Filters results by DNS response TTL.",
-          "items": {
-            "enum": [
-              "LTE_1M",
-              "GT_1M_LTE_5M",
-              "GT_5M_LTE_15M",
-              "GT_15M_LTE_1H",
-              "GT_1H_LTE_1D",
-              "GT_1D_LTE_1W",
-              "GT_1W"
-            ],
-            "type": "string"
+              "type": "array"
+            },
+            "queryType": {
+              "description": "Filters results by DNS query type.",
+              "items": {
+                "oneOf": [
+                  {
+                    "enum": [
+                      "A",
+                      "AAAA",
+                      "A6",
+                      "AFSDB",
+                      "ANY",
+                      "APL",
+                      "ATMA",
+                      "AXFR",
+                      "CAA",
+                      "CDNSKEY",
+                      "CDS",
+                      "CERT",
+                      "CNAME",
+                      "CSYNC",
+                      "DHCID",
+                      "DLV",
+                      "DNAME",
+                      "DNSKEY",
+                      "DOA",
+                      "DS",
+                      "EID",
+                      "EUI48",
+                      "EUI64",
+                      "GPOS",
+                      "GID",
+                      "HINFO",
+                      "HIP",
+                      "HTTPS",
+                      "IPSECKEY",
+                      "ISDN",
+                      "IXFR",
+                      "KEY",
+                      "KX",
+                      "L32",
+                      "L64",
+                      "LOC",
+                      "LP",
+                      "MAILA",
+                      "MAILB",
+                      "MB",
+                      "MD",
+                      "MF",
+                      "MG",
+                      "MINFO",
+                      "MR",
+                      "MX",
+                      "NAPTR",
+                      "NB",
+                      "NBSTAT",
+                      "NID",
+                      "NIMLOC",
+                      "NINFO",
+                      "NS",
+                      "NSAP",
+                      "NSEC",
+                      "NSEC3",
+                      "NSEC3PARAM",
+                      "NULL",
+                      "NXT",
+                      "OPENPGPKEY",
+                      "OPT",
+                      "PTR",
+                      "PX",
+                      "RKEY",
+                      "RP",
+                      "RRSIG",
+                      "RT",
+                      "SIG",
+                      "SINK",
+                      "SMIMEA",
+                      "SOA",
+                      "SPF",
+                      "SRV",
+                      "SSHFP",
+                      "SVCB",
+                      "TA",
+                      "TALINK",
+                      "TKEY",
+                      "TLSA",
+                      "TSIG",
+                      "TXT",
+                      "UINFO",
+                      "UID",
+                      "UNSPEC",
+                      "URI",
+                      "WKS",
+                      "X25",
+                      "ZONEMD"
+                    ],
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            },
+            "responseCode": {
+              "description": "Filters results by DNS response code.",
+              "items": {
+                "enum": [
+                  "NOERROR",
+                  "FORMERR",
+                  "SERVFAIL",
+                  "NXDOMAIN",
+                  "NOTIMP",
+                  "REFUSED",
+                  "YXDOMAIN",
+                  "YXRRSET",
+                  "NXRRSET",
+                  "NOTAUTH",
+                  "NOTZONE",
+                  "BADSIG",
+                  "BADKEY",
+                  "BADTIME",
+                  "BADMODE",
+                  "BADNAME",
+                  "BADALG",
+                  "BADTRUNC",
+                  "BADCOOKIE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseTtl": {
+              "description": "Filters results by DNS response TTL.",
+              "items": {
+                "enum": [
+                  "LTE_1M",
+                  "GT_1M_LTE_5M",
+                  "GT_5M_LTE_15M",
+                  "GT_15M_LTE_1H",
+                  "GT_1H_LTE_1D",
+                  "GT_1D_LTE_1W",
+                  "GT_1W"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -771,343 +778,350 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/dns/top/ases`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["domain", args["domain"], true],
-        ["cacheHit", args["cache_hit"], true],
-        ["nodata", args["nodata"], true],
-        ["protocol", args["protocol"], true],
-        ["queryType", args["query_type"], true],
-        ["responseCode", args["response_code"], true],
-        ["responseTtl", args["response_ttl"], true],
-        ["dnssec", args["dnssec"], true],
-        ["dnssecAware", args["dnssec_aware"], true],
-        ["dnssecE2e", args["dnssec_e2e"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["matchingAnswer", args["matching_answer"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["domain", param(args, "query", "domain"), true],
+        ["cacheHit", param(args, "query", "cacheHit"), true],
+        ["nodata", param(args, "query", "nodata"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["queryType", param(args, "query", "queryType"), true],
+        ["responseCode", param(args, "query", "responseCode"), true],
+        ["responseTtl", param(args, "query", "responseTtl"), true],
+        ["dnssec", param(args, "query", "dnssec"), true],
+        ["dnssecAware", param(args, "query", "dnssecAware"), true],
+        ["dnssecE2e", param(args, "query", "dnssecE2e"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["matchingAnswer", param(args, "query", "matchingAnswer"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_dns_top_locations",
     title: "Get top locations by DNS queries",
-    description: "Retrieves the top locations by DNS queries made to 1.1.1.1 DNS resolver.",
+    description: "Retrieves the top locations by DNS queries made to 1.1.1.1 DNS resolver.\n\nGET /radar/dns/top/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "cache_hit": {
-          "description": "Filters results based on cache status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
-          "items": {
-            "enum": [
-              "INVALID",
-              "INSECURE",
-              "SECURE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_aware": {
-          "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
-          "items": {
-            "enum": [
-              "SUPPORTED",
-              "NOT_SUPPORTED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dnssec_e2e": {
-          "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "domain": {
-          "description": "Filters results by domain name. When set, no other DNS filter may be used — only date filtering (`dateRange`, or `dateStart`/`dateEnd`) is allowed — and the date range cannot exceed 31 days.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "matching_answer": {
-          "description": "Filters results based on whether the queries have a matching answer.",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "nodata": {
-          "default": [
-            "true"
-          ],
-          "description": "Specifies whether the response includes empty DNS responses (NODATA).",
-          "items": {
-            "type": "boolean"
-          },
-          "type": "array"
-        },
-        "protocol": {
-          "description": "Filters results by DNS transport protocol.",
-          "items": {
-            "enum": [
-              "UDP",
-              "TCP",
-              "HTTPS",
-              "TLS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "query_type": {
-          "description": "Filters results by DNS query type.",
-          "items": {
-            "oneOf": [
-              {
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "cacheHit": {
+              "description": "Filters results based on cache status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssec": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) support.",
+              "items": {
+                "enum": [
+                  "INVALID",
+                  "INSECURE",
+                  "SECURE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecAware": {
+              "description": "Filters results based on DNSSEC (DNS Security Extensions) client awareness.",
+              "items": {
+                "enum": [
+                  "SUPPORTED",
+                  "NOT_SUPPORTED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dnssecE2e": {
+              "description": "Filters results based on DNSSEC-validated answers by end-to-end security status.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "domain": {
+              "description": "Filters results by domain name. When set, no other DNS filter may be used — only date filtering (`dateRange`, or `dateStart`/`dateEnd`) is allowed — and the date range cannot exceed 31 days.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "matchingAnswer": {
+              "description": "Filters results based on whether the queries have a matching answer.",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "nodata": {
+              "default": [
+                "true"
+              ],
+              "description": "Specifies whether the response includes empty DNS responses (NODATA).",
+              "items": {
+                "type": "boolean"
+              },
+              "type": "array"
+            },
+            "protocol": {
+              "description": "Filters results by DNS transport protocol.",
+              "items": {
                 "enum": [
-                  "A",
-                  "AAAA",
-                  "A6",
-                  "AFSDB",
-                  "ANY",
-                  "APL",
-                  "ATMA",
-                  "AXFR",
-                  "CAA",
-                  "CDNSKEY",
-                  "CDS",
-                  "CERT",
-                  "CNAME",
-                  "CSYNC",
-                  "DHCID",
-                  "DLV",
-                  "DNAME",
-                  "DNSKEY",
-                  "DOA",
-                  "DS",
-                  "EID",
-                  "EUI48",
-                  "EUI64",
-                  "GPOS",
-                  "GID",
-                  "HINFO",
-                  "HIP",
+                  "UDP",
+                  "TCP",
                   "HTTPS",
-                  "IPSECKEY",
-                  "ISDN",
-                  "IXFR",
-                  "KEY",
-                  "KX",
-                  "L32",
-                  "L64",
-                  "LOC",
-                  "LP",
-                  "MAILA",
-                  "MAILB",
-                  "MB",
-                  "MD",
-                  "MF",
-                  "MG",
-                  "MINFO",
-                  "MR",
-                  "MX",
-                  "NAPTR",
-                  "NB",
-                  "NBSTAT",
-                  "NID",
-                  "NIMLOC",
-                  "NINFO",
-                  "NS",
-                  "NSAP",
-                  "NSEC",
-                  "NSEC3",
-                  "NSEC3PARAM",
-                  "NULL",
-                  "NXT",
-                  "OPENPGPKEY",
-                  "OPT",
-                  "PTR",
-                  "PX",
-                  "RKEY",
-                  "RP",
-                  "RRSIG",
-                  "RT",
-                  "SIG",
-                  "SINK",
-                  "SMIMEA",
-                  "SOA",
-                  "SPF",
-                  "SRV",
-                  "SSHFP",
-                  "SVCB",
-                  "TA",
-                  "TALINK",
-                  "TKEY",
-                  "TLSA",
-                  "TSIG",
-                  "TXT",
-                  "UINFO",
-                  "UID",
-                  "UNSPEC",
-                  "URI",
-                  "WKS",
-                  "X25",
-                  "ZONEMD"
+                  "TLS"
                 ],
                 "type": "string"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        "response_code": {
-          "description": "Filters results by DNS response code.",
-          "items": {
-            "enum": [
-              "NOERROR",
-              "FORMERR",
-              "SERVFAIL",
-              "NXDOMAIN",
-              "NOTIMP",
-              "REFUSED",
-              "YXDOMAIN",
-              "YXRRSET",
-              "NXRRSET",
-              "NOTAUTH",
-              "NOTZONE",
-              "BADSIG",
-              "BADKEY",
-              "BADTIME",
-              "BADMODE",
-              "BADNAME",
-              "BADALG",
-              "BADTRUNC",
-              "BADCOOKIE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "response_ttl": {
-          "description": "Filters results by DNS response TTL.",
-          "items": {
-            "enum": [
-              "LTE_1M",
-              "GT_1M_LTE_5M",
-              "GT_5M_LTE_15M",
-              "GT_15M_LTE_1H",
-              "GT_1H_LTE_1D",
-              "GT_1D_LTE_1W",
-              "GT_1W"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain. Incompatible with the `ipVersion`, `protocol`, `dnssecE2e`, `dnssecAware`, `responseTtl`, and `cacheHit` filters/dimensions; this restriction does not apply to country-code TLDs (2-letter, e.g. `uk`).",
-          "items": {
-            "type": "string"
+              "type": "array"
+            },
+            "queryType": {
+              "description": "Filters results by DNS query type.",
+              "items": {
+                "oneOf": [
+                  {
+                    "enum": [
+                      "A",
+                      "AAAA",
+                      "A6",
+                      "AFSDB",
+                      "ANY",
+                      "APL",
+                      "ATMA",
+                      "AXFR",
+                      "CAA",
+                      "CDNSKEY",
+                      "CDS",
+                      "CERT",
+                      "CNAME",
+                      "CSYNC",
+                      "DHCID",
+                      "DLV",
+                      "DNAME",
+                      "DNSKEY",
+                      "DOA",
+                      "DS",
+                      "EID",
+                      "EUI48",
+                      "EUI64",
+                      "GPOS",
+                      "GID",
+                      "HINFO",
+                      "HIP",
+                      "HTTPS",
+                      "IPSECKEY",
+                      "ISDN",
+                      "IXFR",
+                      "KEY",
+                      "KX",
+                      "L32",
+                      "L64",
+                      "LOC",
+                      "LP",
+                      "MAILA",
+                      "MAILB",
+                      "MB",
+                      "MD",
+                      "MF",
+                      "MG",
+                      "MINFO",
+                      "MR",
+                      "MX",
+                      "NAPTR",
+                      "NB",
+                      "NBSTAT",
+                      "NID",
+                      "NIMLOC",
+                      "NINFO",
+                      "NS",
+                      "NSAP",
+                      "NSEC",
+                      "NSEC3",
+                      "NSEC3PARAM",
+                      "NULL",
+                      "NXT",
+                      "OPENPGPKEY",
+                      "OPT",
+                      "PTR",
+                      "PX",
+                      "RKEY",
+                      "RP",
+                      "RRSIG",
+                      "RT",
+                      "SIG",
+                      "SINK",
+                      "SMIMEA",
+                      "SOA",
+                      "SPF",
+                      "SRV",
+                      "SSHFP",
+                      "SVCB",
+                      "TA",
+                      "TALINK",
+                      "TKEY",
+                      "TLSA",
+                      "TSIG",
+                      "TXT",
+                      "UINFO",
+                      "UID",
+                      "UNSPEC",
+                      "URI",
+                      "WKS",
+                      "X25",
+                      "ZONEMD"
+                    ],
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            },
+            "responseCode": {
+              "description": "Filters results by DNS response code.",
+              "items": {
+                "enum": [
+                  "NOERROR",
+                  "FORMERR",
+                  "SERVFAIL",
+                  "NXDOMAIN",
+                  "NOTIMP",
+                  "REFUSED",
+                  "YXDOMAIN",
+                  "YXRRSET",
+                  "NXRRSET",
+                  "NOTAUTH",
+                  "NOTZONE",
+                  "BADSIG",
+                  "BADKEY",
+                  "BADTIME",
+                  "BADMODE",
+                  "BADNAME",
+                  "BADALG",
+                  "BADTRUNC",
+                  "BADCOOKIE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "responseTtl": {
+              "description": "Filters results by DNS response TTL.",
+              "items": {
+                "enum": [
+                  "LTE_1M",
+                  "GT_1M_LTE_5M",
+                  "GT_5M_LTE_15M",
+                  "GT_15M_LTE_1H",
+                  "GT_1H_LTE_1D",
+                  "GT_1D_LTE_1W",
+                  "GT_1W"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain. Incompatible with the `ipVersion`, `protocol`, `dnssecE2e`, `dnssecAware`, `responseTtl`, and `cacheHit` filters/dimensions; this restriction does not apply to country-code TLDs (2-letter, e.g. `uk`).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1566,28 +1580,28 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/dns/top/locations`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["domain", args["domain"], true],
-        ["cacheHit", args["cache_hit"], true],
-        ["nodata", args["nodata"], true],
-        ["protocol", args["protocol"], true],
-        ["queryType", args["query_type"], true],
-        ["responseCode", args["response_code"], true],
-        ["responseTtl", args["response_ttl"], true],
-        ["dnssec", args["dnssec"], true],
-        ["dnssecAware", args["dnssec_aware"], true],
-        ["dnssecE2e", args["dnssec_e2e"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["matchingAnswer", args["matching_answer"], true],
-        ["tld", args["tld"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["domain", param(args, "query", "domain"), true],
+        ["cacheHit", param(args, "query", "cacheHit"), true],
+        ["nodata", param(args, "query", "nodata"), true],
+        ["protocol", param(args, "query", "protocol"), true],
+        ["queryType", param(args, "query", "queryType"), true],
+        ["responseCode", param(args, "query", "responseCode"), true],
+        ["responseTtl", param(args, "query", "responseTtl"), true],
+        ["dnssec", param(args, "query", "dnssec"), true],
+        ["dnssecAware", param(args, "query", "dnssecAware"), true],
+        ["dnssecE2e", param(args, "query", "dnssecE2e"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["matchingAnswer", param(args, "query", "matchingAnswer"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/email/routing/tools.ts b/src/generated/forge-mcp/radar/email/routing/tools.ts
index db1685e58..6ffbb1443 100644
--- a/src/generated/forge-mcp/radar/email/routing/tools.ts
+++ b/src/generated/forge-mcp/radar/email/routing/tools.ts
@@ -1,147 +1,163 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.email.routing`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_email_routing_summary_v2",
+    name: "radar_email_routing_summaryV2",
     title: "Get email routing summary by dimension",
-    description: "Retrieves the distribution of email routing metrics by the specified dimension.",
+    description: "Retrieves the distribution of email routing metrics by the specified dimension.\n\nGET /radar/email/routing/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "arc": {
-          "description": "Filters results by ARC (Authenticated Received Chain) validation.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "IP_VERSION",
-            "ENCRYPTED",
-            "ARC",
-            "DKIM",
-            "DMARC",
-            "SPF"
-          ],
-          "type": "string"
-        },
-        "dkim": {
-          "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dmarc": {
-          "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "encrypted": {
-          "description": "Filters results by encryption status (encrypted vs. not-encrypted).",
-          "items": {
-            "enum": [
-              "ENCRYPTED",
-              "NOT_ENCRYPTED"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "IP_VERSION",
+                "ENCRYPTED",
+                "ARC",
+                "DKIM",
+                "DMARC",
+                "SPF"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "spf": {
-          "description": "Filters results by SPF (Sender Policy Framework) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "arc": {
+              "description": "Filters results by ARC (Authenticated Received Chain) validation.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dkim": {
+              "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dmarc": {
+              "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "encrypted": {
+              "description": "Filters results by encryption status (encrypted vs. not-encrypted).",
+              "items": {
+                "enum": [
+                  "ENCRYPTED",
+                  "NOT_ENCRYPTED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "spf": {
+              "description": "Filters results by SPF (Sender Policy Framework) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -573,166 +589,182 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/email/routing/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["arc", args["arc"], true],
-        ["dkim", args["dkim"], true],
-        ["dmarc", args["dmarc"], true],
-        ["spf", args["spf"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["encrypted", args["encrypted"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["arc", param(args, "query", "arc"), true],
+        ["dkim", param(args, "query", "dkim"), true],
+        ["dmarc", param(args, "query", "dmarc"), true],
+        ["spf", param(args, "query", "spf"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["encrypted", param(args, "query", "encrypted"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_email_routing_timeseries_groups_v2",
+    name: "radar_email_routing_timeseriesGroupsV2",
     title: "Get email routing time series grouped by dimension",
-    description: "Retrieves the distribution of email routing metrics grouped by dimension over time.",
+    description: "Retrieves the distribution of email routing metrics grouped by dimension over time.\n\nGET /radar/email/routing/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "arc": {
-          "description": "Filters results by ARC (Authenticated Received Chain) validation.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "IP_VERSION",
-            "ENCRYPTED",
-            "ARC",
-            "DKIM",
-            "DMARC",
-            "SPF"
-          ],
-          "type": "string"
-        },
-        "dkim": {
-          "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dmarc": {
-          "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "encrypted": {
-          "description": "Filters results by encryption status (encrypted vs. not-encrypted).",
-          "items": {
-            "enum": [
-              "ENCRYPTED",
-              "NOT_ENCRYPTED"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "IP_VERSION",
+                "ENCRYPTED",
+                "ARC",
+                "DKIM",
+                "DMARC",
+                "SPF"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "spf": {
-          "description": "Filters results by SPF (Sender Policy Framework) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "arc": {
+              "description": "Filters results by ARC (Authenticated Received Chain) validation.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dkim": {
+              "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dmarc": {
+              "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "encrypted": {
+              "description": "Filters results by encryption status (encrypted vs. not-encrypted).",
+              "items": {
+                "enum": [
+                  "ENCRYPTED",
+                  "NOT_ENCRYPTED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "spf": {
+              "description": "Filters results by SPF (Sender Policy Framework) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1216,19 +1248,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/email/routing/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["arc", args["arc"], true],
-        ["dkim", args["dkim"], true],
-        ["dmarc", args["dmarc"], true],
-        ["spf", args["spf"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["encrypted", args["encrypted"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["arc", param(args, "query", "arc"), true],
+        ["dkim", param(args, "query", "dkim"), true],
+        ["dmarc", param(args, "query", "dmarc"), true],
+        ["spf", param(args, "query", "spf"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["encrypted", param(args, "query", "encrypted"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/email/security/tools.ts b/src/generated/forge-mcp/radar/email/security/tools.ts
index 92baecd31..d155cb558 100644
--- a/src/generated/forge-mcp/radar/email/security/tools.ts
+++ b/src/generated/forge-mcp/radar/email/security/tools.ts
@@ -1,141 +1,157 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.email.security`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_email_security_summary_v2",
+    name: "radar_email_security_summaryV2",
     title: "Get email security summary by dimension",
-    description: "Retrieves the distribution of email security metrics by the specified dimension.",
+    description: "Retrieves the distribution of email security metrics by the specified dimension.\n\nGET /radar/email/security/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "arc": {
-          "description": "Filters results by ARC (Authenticated Received Chain) validation.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "SPAM",
-            "MALICIOUS",
-            "SPOOF",
-            "THREAT_CATEGORY",
-            "ARC",
-            "DKIM",
-            "DMARC",
-            "SPF",
-            "TLS_VERSION"
-          ],
-          "type": "string"
-        },
-        "dkim": {
-          "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dmarc": {
-          "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "SPAM",
+                "MALICIOUS",
+                "SPOOF",
+                "THREAT_CATEGORY",
+                "ARC",
+                "DKIM",
+                "DMARC",
+                "SPF",
+                "TLS_VERSION"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "spf": {
-          "description": "Filters results by SPF (Sender Policy Framework) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "arc": {
+              "description": "Filters results by ARC (Authenticated Received Chain) validation.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dkim": {
+              "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dmarc": {
+              "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "spf": {
+              "description": "Filters results by SPF (Sender Policy Framework) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -567,159 +583,175 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/email/security/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["arc", args["arc"], true],
-        ["dkim", args["dkim"], true],
-        ["dmarc", args["dmarc"], true],
-        ["spf", args["spf"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["arc", param(args, "query", "arc"), true],
+        ["dkim", param(args, "query", "dkim"), true],
+        ["dmarc", param(args, "query", "dmarc"), true],
+        ["spf", param(args, "query", "spf"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_email_security_timeseries_groups_v2",
+    name: "radar_email_security_timeseriesGroupsV2",
     title: "Get email security time series grouped by dimension",
-    description: "Retrieves the distribution of email security metrics grouped by dimension over time.",
+    description: "Retrieves the distribution of email security metrics grouped by dimension over time.\n\nGET /radar/email/security/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "arc": {
-          "description": "Filters results by ARC (Authenticated Received Chain) validation.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "SPAM",
-            "MALICIOUS",
-            "SPOOF",
-            "THREAT_CATEGORY",
-            "ARC",
-            "DKIM",
-            "DMARC",
-            "SPF",
-            "TLS_VERSION"
-          ],
-          "type": "string"
-        },
-        "dkim": {
-          "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dmarc": {
-          "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "SPAM",
+                "MALICIOUS",
+                "SPOOF",
+                "THREAT_CATEGORY",
+                "ARC",
+                "DKIM",
+                "DMARC",
+                "SPF",
+                "TLS_VERSION"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "spf": {
-          "description": "Filters results by SPF (Sender Policy Framework) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "arc": {
+              "description": "Filters results by ARC (Authenticated Received Chain) validation.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dkim": {
+              "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dmarc": {
+              "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "spf": {
+              "description": "Filters results by SPF (Sender Policy Framework) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1203,18 +1235,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/email/security/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["arc", args["arc"], true],
-        ["dkim", args["dkim"], true],
-        ["dmarc", args["dmarc"], true],
-        ["spf", args["spf"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["arc", param(args, "query", "arc"), true],
+        ["dkim", param(args, "query", "dkim"), true],
+        ["dmarc", param(args, "query", "dmarc"), true],
+        ["spf", param(args, "query", "spf"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/email/security/top/tlds/malicious/tools.ts b/src/generated/forge-mcp/radar/email/security/top/tlds/malicious/tools.ts
index e298c1c04..fd64689c3 100644
--- a/src/generated/forge-mcp/radar/email/security/top/tlds/malicious/tools.ts
+++ b/src/generated/forge-mcp/radar/email/security/top/tlds/malicious/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../../_/tool.js";
 
 /**
  * The tools of `radar.email.security.top.tlds.malicious`.
@@ -10,134 +10,150 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_email_security_top_tlds_malicious_get",
     title: "Get top TLDs by email malicious classification",
-    description: "Retrieves the top TLDs by emails classified as malicious or not.",
+    description: "Retrieves the top TLDs by emails classified as malicious or not.\n\nGET /radar/email/security/top/tlds/malicious/{malicious}",
     inputSchema: {
       type: "object",
       properties: {
-        "arc": {
-          "description": "Filters results by ARC (Authenticated Received Chain) validation.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dkim": {
-          "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dmarc": {
-          "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "malicious": {
-          "description": "Malicious classification.",
-          "enum": [
-            "MALICIOUS",
-            "NOT_MALICIOUS"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "spf": {
-          "description": "Filters results by SPF (Sender Policy Framework) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "malicious": {
+              "description": "Malicious classification.",
+              "enum": [
+                "MALICIOUS",
+                "NOT_MALICIOUS"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "tld_category": {
-          "description": "Filters results by TLD category.",
-          "enum": [
-            "CLASSIC",
-            "COUNTRY"
+          "required": [
+            "malicious"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "arc": {
+              "description": "Filters results by ARC (Authenticated Received Chain) validation.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dkim": {
+              "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dmarc": {
+              "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "spf": {
+              "description": "Filters results by SPF (Sender Policy Framework) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tldCategory": {
+              "description": "Filters results by TLD category.",
+              "enum": [
+                "CLASSIC",
+                "COUNTRY"
+              ],
+              "type": "string"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "malicious"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -588,18 +604,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/email/security/top/tlds/malicious/${pathParam(args, "malicious")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["arc", args["arc"], true],
-        ["dkim", args["dkim"], true],
-        ["dmarc", args["dmarc"], true],
-        ["spf", args["spf"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["tldCategory", args["tld_category"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["arc", param(args, "query", "arc"), true],
+        ["dkim", param(args, "query", "dkim"), true],
+        ["dmarc", param(args, "query", "dmarc"), true],
+        ["spf", param(args, "query", "spf"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["tldCategory", param(args, "query", "tldCategory"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/email/security/top/tlds/spam/tools.ts b/src/generated/forge-mcp/radar/email/security/top/tlds/spam/tools.ts
index 2537cfee5..af55a44ac 100644
--- a/src/generated/forge-mcp/radar/email/security/top/tlds/spam/tools.ts
+++ b/src/generated/forge-mcp/radar/email/security/top/tlds/spam/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../../_/tool.js";
 
 /**
  * The tools of `radar.email.security.top.tlds.spam`.
@@ -10,134 +10,150 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_email_security_top_tlds_spam_get",
     title: "Get top TLDs by email spam classification",
-    description: "Retrieves the top TLDs by emails classified as spam or not.",
+    description: "Retrieves the top TLDs by emails classified as spam or not.\n\nGET /radar/email/security/top/tlds/spam/{spam}",
     inputSchema: {
       type: "object",
       properties: {
-        "arc": {
-          "description": "Filters results by ARC (Authenticated Received Chain) validation.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dkim": {
-          "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dmarc": {
-          "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "spam": {
-          "description": "Spam classification.",
-          "enum": [
-            "SPAM",
-            "NOT_SPAM"
-          ],
-          "type": "string"
-        },
-        "spf": {
-          "description": "Filters results by SPF (Sender Policy Framework) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "spam": {
+              "description": "Spam classification.",
+              "enum": [
+                "SPAM",
+                "NOT_SPAM"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "tld_category": {
-          "description": "Filters results by TLD category.",
-          "enum": [
-            "CLASSIC",
-            "COUNTRY"
+          "required": [
+            "spam"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "arc": {
+              "description": "Filters results by ARC (Authenticated Received Chain) validation.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dkim": {
+              "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dmarc": {
+              "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "spf": {
+              "description": "Filters results by SPF (Sender Policy Framework) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tldCategory": {
+              "description": "Filters results by TLD category.",
+              "enum": [
+                "CLASSIC",
+                "COUNTRY"
+              ],
+              "type": "string"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "spam"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -588,18 +604,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/email/security/top/tlds/spam/${pathParam(args, "spam")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["arc", args["arc"], true],
-        ["dkim", args["dkim"], true],
-        ["dmarc", args["dmarc"], true],
-        ["spf", args["spf"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["tldCategory", args["tld_category"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["arc", param(args, "query", "arc"), true],
+        ["dkim", param(args, "query", "dkim"), true],
+        ["dmarc", param(args, "query", "dmarc"), true],
+        ["spf", param(args, "query", "spf"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["tldCategory", param(args, "query", "tldCategory"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/email/security/top/tlds/spoof/tools.ts b/src/generated/forge-mcp/radar/email/security/top/tlds/spoof/tools.ts
index 36b4b04f7..eb62ee00a 100644
--- a/src/generated/forge-mcp/radar/email/security/top/tlds/spoof/tools.ts
+++ b/src/generated/forge-mcp/radar/email/security/top/tlds/spoof/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../../_/tool.js";
 
 /**
  * The tools of `radar.email.security.top.tlds.spoof`.
@@ -10,134 +10,150 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_email_security_top_tlds_spoof_get",
     title: "Get top TLDs by email spoof classification",
-    description: "Retrieves the top TLDs by emails classified as spoof or not.",
+    description: "Retrieves the top TLDs by emails classified as spoof or not.\n\nGET /radar/email/security/top/tlds/spoof/{spoof}",
     inputSchema: {
       type: "object",
       properties: {
-        "arc": {
-          "description": "Filters results by ARC (Authenticated Received Chain) validation.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dkim": {
-          "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dmarc": {
-          "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "spf": {
-          "description": "Filters results by SPF (Sender Policy Framework) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "spoof": {
+              "description": "Spoof classification.",
+              "enum": [
+                "SPOOF",
+                "NOT_SPOOF"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "spoof": {
-          "description": "Spoof classification.",
-          "enum": [
-            "SPOOF",
-            "NOT_SPOOF"
-          ],
-          "type": "string"
-        },
-        "tld_category": {
-          "description": "Filters results by TLD category.",
-          "enum": [
-            "CLASSIC",
-            "COUNTRY"
+          "required": [
+            "spoof"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "arc": {
+              "description": "Filters results by ARC (Authenticated Received Chain) validation.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dkim": {
+              "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dmarc": {
+              "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "spf": {
+              "description": "Filters results by SPF (Sender Policy Framework) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tldCategory": {
+              "description": "Filters results by TLD category.",
+              "enum": [
+                "CLASSIC",
+                "COUNTRY"
+              ],
+              "type": "string"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "spoof"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -588,18 +604,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/email/security/top/tlds/spoof/${pathParam(args, "spoof")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["arc", args["arc"], true],
-        ["dkim", args["dkim"], true],
-        ["dmarc", args["dmarc"], true],
-        ["spf", args["spf"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["tldCategory", args["tld_category"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["arc", param(args, "query", "arc"), true],
+        ["dkim", param(args, "query", "dkim"), true],
+        ["dmarc", param(args, "query", "dmarc"), true],
+        ["spf", param(args, "query", "spf"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["tldCategory", param(args, "query", "tldCategory"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/email/security/top/tlds/tools.ts b/src/generated/forge-mcp/radar/email/security/top/tlds/tools.ts
index f663bcc85..c4e579e53 100644
--- a/src/generated/forge-mcp/radar/email/security/top/tlds/tools.ts
+++ b/src/generated/forge-mcp/radar/email/security/top/tlds/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../../_/tool.js";
+import { type Tool, param } from "../../../../../_/tool.js";
 
 /**
  * The tools of `radar.email.security.top.tlds`.
@@ -10,123 +10,130 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_email_security_top_tlds_get",
     title: "Get top TLDs by email message volume",
-    description: "Retrieves the top TLDs by number of email messages.",
+    description: "Retrieves the top TLDs by number of email messages.\n\nGET /radar/email/security/top/tlds",
     inputSchema: {
       type: "object",
       properties: {
-        "arc": {
-          "description": "Filters results by ARC (Authenticated Received Chain) validation.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dkim": {
-          "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dmarc": {
-          "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "spf": {
-          "description": "Filters results by SPF (Sender Policy Framework) validation status.",
-          "items": {
-            "enum": [
-              "PASS",
-              "NONE",
-              "FAIL"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tld_category": {
-          "description": "Filters results by TLD category.",
-          "enum": [
-            "CLASSIC",
-            "COUNTRY"
-          ],
-          "type": "string"
-        },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "arc": {
+              "description": "Filters results by ARC (Authenticated Received Chain) validation.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dkim": {
+              "description": "Filters results by DKIM (DomainKeys Identified Mail) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dmarc": {
+              "description": "Filters results by DMARC (Domain-based Message Authentication, Reporting and Conformance) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "spf": {
+              "description": "Filters results by SPF (Sender Policy Framework) validation status.",
+              "items": {
+                "enum": [
+                  "PASS",
+                  "NONE",
+                  "FAIL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tldCategory": {
+              "description": "Filters results by TLD category.",
+              "enum": [
+                "CLASSIC",
+                "COUNTRY"
+              ],
+              "type": "string"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -577,18 +584,18 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/email/security/top/tlds`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["arc", args["arc"], true],
-        ["dkim", args["dkim"], true],
-        ["dmarc", args["dmarc"], true],
-        ["spf", args["spf"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["tldCategory", args["tld_category"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["arc", param(args, "query", "arc"), true],
+        ["dkim", param(args, "query", "dkim"), true],
+        ["dmarc", param(args, "query", "dmarc"), true],
+        ["spf", param(args, "query", "spf"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["tldCategory", param(args, "query", "tldCategory"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/entities/asns/tools.ts b/src/generated/forge-mcp/radar/entities/asns/tools.ts
index cb8b687e8..36b08ead0 100644
--- a/src/generated/forge-mcp/radar/entities/asns/tools.ts
+++ b/src/generated/forge-mcp/radar/entities/asns/tools.ts
@@ -1,35 +1,51 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.entities.asns`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_entities_asns_as_set",
+    name: "radar_entities_asns_asSet",
     title: "Get IRR AS-SETs that an AS is a member of",
-    description: "Retrieves Internet Routing Registry AS-SETs that an AS is a member of.",
+    description: "Retrieves Internet Routing Registry AS-SETs that an AS is a member of.\n\nGET /radar/entities/asns/{asn}/as_set",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Retrieves all AS-SETs that the given AS is a member of.",
-          "type": "integer"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Retrieves all AS-SETs that the given AS is a member of.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "asn"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "asn"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -241,72 +257,79 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/asns/${pathParam(args, "asn")}/as_set`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_entities_asns_botnet_threat_feed",
+    name: "radar_entities_asns_botnetThreatFeed",
     title: "Get AS rankings by botnet threat feed activity",
-    description: "Retrieves a ranked list of Autonomous Systems based on their presence in the Cloudflare Botnet Threat Feed. Rankings can be sorted by offense count or number of bad IPs. Optionally compare to a previous date to see rank changes.",
+    description: "Retrieves a ranked list of Autonomous Systems based on their presence in the Cloudflare Botnet Threat Feed. Rankings can be sorted by offense count or number of bad IPs. Optionally compare to a previous date to see rank changes.\n\nGET /radar/entities/asns/botnet_threat_feed",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "compareDateRange": {
+              "description": "Relative date range for rank change comparison (e.g., \"1d\", \"7d\", \"30d\").",
+              "type": "string"
+            },
+            "date": {
+              "description": "The date to retrieve (YYYY-MM-DD format). If not specified, returns the most recent available data. Note: This is the date the report was generated. The report is generated from information collected from the previous day (e.g., the 2026-02-23 entry contains data from 2026-02-22).",
+              "format": "date",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify an alpha-2 location code.",
+              "type": "string"
+            },
+            "metric": {
+              "default": "NUMBER_OF_OFFENDING_IPS",
+              "description": "Metric to rank ASNs by.",
+              "enum": [
+                "OFFENSE_COUNT",
+                "NUMBER_OF_OFFENDING_IPS"
+              ],
+              "type": "string"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            },
+            "sortOrder": {
+              "description": "Sort order.",
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "compare_date_range": {
-          "description": "Relative date range for rank change comparison (e.g., \"1d\", \"7d\", \"30d\").",
-          "type": "string"
-        },
-        "date": {
-          "description": "The date to retrieve (YYYY-MM-DD format). If not specified, returns the most recent available data. Note: This is the date the report was generated. The report is generated from information collected from the previous day (e.g., the 2026-02-23 entry contains data from 2026-02-22).",
-          "format": "date",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify an alpha-2 location code.",
-          "type": "string"
-        },
-        "metric": {
-          "default": "NUMBER_OF_OFFENDING_IPS",
-          "description": "Metric to rank ASNs by.",
-          "enum": [
-            "OFFENSE_COUNT",
-            "NUMBER_OF_OFFENDING_IPS"
-          ],
-          "type": "string"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
-        },
-        "sort_order": {
-          "description": "Sort order.",
-          "enum": [
-            "ASC",
-            "DESC"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -502,41 +525,57 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/asns/botnet_threat_feed`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["metric", args["metric"], true],
-        ["date", args["date"], true],
-        ["compareDateRange", args["compare_date_range"], true],
-        ["location", args["location"], true],
-        ["asn", args["asn"], true],
-        ["sortOrder", args["sort_order"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["date", param(args, "query", "date"), true],
+        ["compareDateRange", param(args, "query", "compareDateRange"), true],
+        ["location", param(args, "query", "location"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["sortOrder", param(args, "query", "sortOrder"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_entities_asns_get",
     title: "Get AS details by ASN",
-    description: "Retrieves the requested autonomous system information. (A confidence level below `5` indicates a low level of confidence in the traffic data - normally this happens because Cloudflare has a small amount of traffic from/to this AS). Population estimates come from APNIC (refer to https://labs.apnic.net/?p=526).",
+    description: "Retrieves the requested autonomous system information. (A confidence level below `5` indicates a low level of confidence in the traffic data - normally this happens because Cloudflare has a small amount of traffic from/to this AS). Population estimates come from APNIC (refer to https://labs.apnic.net/?p=526).\n\nGET /radar/entities/asns/{asn}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Single Autonomous System Number (ASN) as integer.",
-          "type": "integer"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Single Autonomous System Number (ASN) as integer.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "asn"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "asn"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -817,33 +856,43 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/asns/${pathParam(args, "asn")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_entities_asns_ip",
     title: "Get AS details by IP address",
-    description: "Retrieves the requested autonomous system information based on IP address. Population estimates come from APNIC (refer to https://labs.apnic.net/?p=526).",
+    description: "Retrieves the requested autonomous system information based on IP address. Population estimates come from APNIC (refer to https://labs.apnic.net/?p=526).\n\nGET /radar/entities/asns/ip",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ip": {
+              "description": "IP address.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "ip"
           ],
-          "type": "string"
-        },
-        "ip": {
-          "description": "IP address.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "ip"
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1116,53 +1165,60 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/asns/ip`,
       query: [
-        ["ip", args["ip"], true],
-        ["format", args["format"], true],
+        ["ip", param(args, "query", "ip"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_entities_asns_list",
     title: "List autonomous systems",
-    description: "Retrieves a list of autonomous systems.",
+    description: "Retrieves a list of autonomous systems.\n\nGET /radar/entities/asns",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify an alpha-2 location code.",
-          "type": "string"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
-        },
-        "order_by": {
-          "default": "ASN",
-          "description": "Specifies the metric to order the ASNs by.",
-          "enum": [
-            "ASN",
-            "POPULATION"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify an alpha-2 location code.",
+              "type": "string"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            },
+            "orderBy": {
+              "default": "ASN",
+              "description": "Specifies the metric to order the ASNs by.",
+              "enum": [
+                "ASN",
+                "POPULATION"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1350,42 +1406,58 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/asns`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["orderBy", args["order_by"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_entities_asns_rel",
     title: "Get AS-level relationships by ASN",
-    description: "Retrieves AS-level relationship for given networks.",
+    description: "Retrieves AS-level relationship for given networks.\n\nGET /radar/entities/asns/{asn}/rel",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Retrieves all ASNs with provider-customer or peering relationships with the given ASN.",
-          "type": "integer"
-        },
-        "asn2": {
-          "description": "Retrieves the AS relationship of ASN2 with respect to the given ASN.",
-          "type": "integer"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Retrieves all ASNs with provider-customer or peering relationships with the given ASN.",
+              "type": "integer"
+            }
+          },
+          "required": [
+            "asn"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn2": {
+              "description": "Retrieves the AS relationship of ASN2 with respect to the given ASN.",
+              "type": "integer"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "asn"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1601,8 +1673,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/asns/${pathParam(args, "asn")}/rel`,
       query: [
-        ["asn2", args["asn2"], true],
-        ["format", args["format"], true],
+        ["asn2", param(args, "query", "asn2"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/entities/locations/tools.ts b/src/generated/forge-mcp/radar/entities/locations/tools.ts
index 66cc2aed9..3db87e929 100644
--- a/src/generated/forge-mcp/radar/entities/locations/tools.ts
+++ b/src/generated/forge-mcp/radar/entities/locations/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.entities.locations`.
@@ -10,26 +10,42 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_entities_locations_get",
     title: "Get location details",
-    description: "Retrieves the requested location information. (A confidence level below `5` indicates a low level of confidence in the traffic data - normally this happens because Cloudflare has a small amount of traffic from/to this location).",
+    description: "Retrieves the requested location information. (A confidence level below `5` indicates a low level of confidence in the traffic data - normally this happens because Cloudflare has a small amount of traffic from/to this location).\n\nGET /radar/entities/locations/{location}",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "location": {
+              "description": "Location alpha-2 code.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "location"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "location": {
-          "description": "Location alpha-2 code.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "location"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -188,59 +204,66 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/locations/${pathParam(args, "location")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_entities_locations_list",
     title: "List locations",
-    description: "Retrieves a list of locations.",
+    description: "Retrieves a list of locations.\n\nGET /radar/entities/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent code.",
-          "enum": [
-            "AF",
-            "AS",
-            "EU",
-            "NA",
-            "OC",
-            "SA"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
-          "type": "string"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
-        },
-        "region": {
-          "description": "Filters results by region.",
-          "type": "string"
-        },
-        "subregion": {
-          "description": "Filters results by subregion.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent code.",
+              "enum": [
+                "AF",
+                "AS",
+                "EU",
+                "NA",
+                "OC",
+                "SA"
+              ],
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
+              "type": "string"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            },
+            "region": {
+              "description": "Filters results by region.",
+              "type": "string"
+            },
+            "subregion": {
+              "description": "Filters results by subregion.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -416,13 +439,13 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/locations`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["location", args["location"], true],
-        ["region", args["region"], true],
-        ["subregion", args["subregion"], true],
-        ["continent", args["continent"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["location", param(args, "query", "location"), true],
+        ["region", param(args, "query", "region"), true],
+        ["subregion", param(args, "query", "subregion"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/entities/tools.ts b/src/generated/forge-mcp/radar/entities/tools.ts
index d56061792..1ea6a089f 100644
--- a/src/generated/forge-mcp/radar/entities/tools.ts
+++ b/src/generated/forge-mcp/radar/entities/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../_/tool.js";
+import { type Tool, param } from "../../_/tool.js";
 
 /**
  * The tools of `radar.entities`.
@@ -10,26 +10,36 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_entities_get",
     title: "Get IP address details",
-    description: "Retrieves IP address information.",
+    description: "Retrieves IP address information.\n\nGET /radar/entities/ip",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "ip": {
+              "description": "IP address.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "ip"
           ],
-          "type": "string"
-        },
-        "ip": {
-          "description": "IP address.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "ip"
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -188,8 +198,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/entities/ip`,
       query: [
-        ["ip", args["ip"], true],
-        ["format", args["format"], true],
+        ["ip", param(args, "query", "ip"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/geolocations/tools.ts b/src/generated/forge-mcp/radar/geolocations/tools.ts
index 65c912126..0d6dbcb8b 100644
--- a/src/generated/forge-mcp/radar/geolocations/tools.ts
+++ b/src/generated/forge-mcp/radar/geolocations/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.geolocations`.
@@ -10,26 +10,42 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_geolocations_get",
     title: "Get Geolocation details",
-    description: "Retrieves the requested Geolocation information. Geolocation names can be localized by sending an `Accept-Language` HTTP header with a BCP 47 language tag (e.g., `Accept-Language: pt-PT`). The full quality-value chain is supported (e.g., `pt-PT,pt;q=0.9,en;q=0.8`).",
+    description: "Retrieves the requested Geolocation information. Geolocation names can be localized by sending an `Accept-Language` HTTP header with a BCP 47 language tag (e.g., `Accept-Language: pt-PT`). The full quality-value chain is supported (e.g., `pt-PT,pt;q=0.9,en;q=0.8`).\n\nGET /radar/geolocations/{geo_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "geo_id": {
+              "description": "Geolocation ID. Refer to [GeoNames](https://download.geonames.org/export/dump/readme.txt)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "geo_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "geo_id": {
-          "description": "Geolocation ID. Refer to [GeoNames](https://download.geonames.org/export/dump/readme.txt)",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "geo_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -342,43 +358,50 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/geolocations/${pathParam(args, "geo_id")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_geolocations_list",
     title: "List Geolocations",
-    description: "Retrieves a list of geolocations. Geolocation names can be localized by sending an `Accept-Language` HTTP header with a BCP 47 language tag (e.g., `Accept-Language: pt-PT`). The full quality-value chain is supported (e.g., `pt-PT,pt;q=0.9,en;q=0.8`).",
+    description: "Retrieves a list of geolocations. Geolocation names can be localized by sending an `Accept-Language` HTTP header with a BCP 47 language tag (e.g., `Accept-Language: pt-PT`). The full quality-value chain is supported (e.g., `pt-PT,pt;q=0.9,en;q=0.8`).\n\nGET /radar/geolocations",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by geolocation. Specify a comma-separated list of GeoNames IDs.",
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
-          "type": "string"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by geolocation. Specify a comma-separated list of GeoNames IDs.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
+              "type": "string"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -716,11 +739,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/geolocations`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["geoId", args["geo_id"], true],
-        ["location", args["location"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["location", param(args, "query", "location"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/botClass/tools.ts b/src/generated/forge-mcp/radar/http/ases/botClass/tools.ts
index 81a49fd7b..ab3408c66 100644
--- a/src/generated/forge-mcp/radar/http/ases/botClass/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/botClass/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.ases.bot_class`.
+ * The tools of `radar.http.ases.botClass`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_ases_bot_class_get",
+    name: "radar_http_ases_botClass_get",
     title: "Get top ASes by HTTP requests for a bot class",
-    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested bot class.",
+    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested bot class.\n\nGET /radar/http/top/ases/bot_class/{bot_class}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "enum": [
-            "LIKELY_AUTOMATED",
-            "LIKELY_HUMAN"
-          ],
-          "type": "string"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "bot_class": {
+              "description": "Bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "enum": [
+                "LIKELY_AUTOMATED",
+                "LIKELY_HUMAN"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "bot_class"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "bot_class"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases/bot_class/${pathParam(args, "bot_class")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/browserFamily/tools.ts b/src/generated/forge-mcp/radar/http/ases/browserFamily/tools.ts
index 81be9da0a..23a32e1ea 100644
--- a/src/generated/forge-mcp/radar/http/ases/browserFamily/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/browserFamily/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.ases.browser_family`.
+ * The tools of `radar.http.ases.browserFamily`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_ases_browser_family_get",
+    name: "radar_http_ases_browserFamily_get",
     title: "Get top ASes by HTTP requests for a browser family",
-    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested browser family.",
+    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested browser family.\n\nGET /radar/http/top/ases/browser_family/{browser_family}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Browser family.",
-          "enum": [
-            "CHROME",
-            "EDGE",
-            "FIREFOX",
-            "SAFARI"
-          ],
-          "type": "string"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "browser_family": {
+              "description": "Browser family.",
+              "enum": [
+                "CHROME",
+                "EDGE",
+                "FIREFOX",
+                "SAFARI"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "browser_family"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "browser_family"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases/browser_family/${pathParam(args, "browser_family")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/deviceType/tools.ts b/src/generated/forge-mcp/radar/http/ases/deviceType/tools.ts
index da64db751..8170a4033 100644
--- a/src/generated/forge-mcp/radar/http/ases/deviceType/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/deviceType/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.ases.device_type`.
+ * The tools of `radar.http.ases.deviceType`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_ases_device_type_get",
+    name: "radar_http_ases_deviceType_get",
     title: "Get top ASes by HTTP requests for a device type",
-    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested device type.",
+    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested device type.\n\nGET /radar/http/top/ases/device_type/{device_type}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "device_type": {
+              "description": "Device type.",
+              "enum": [
+                "DESKTOP",
+                "MOBILE",
+                "OTHER"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Device type.",
-          "enum": [
-            "DESKTOP",
-            "MOBILE",
-            "OTHER"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "device_type"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "device_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases/device_type/${pathParam(args, "device_type")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/httpMethod/tools.ts b/src/generated/forge-mcp/radar/http/ases/httpMethod/tools.ts
index 83a15ceb3..84308706e 100644
--- a/src/generated/forge-mcp/radar/http/ases/httpMethod/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/httpMethod/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.ases.http_method`.
+ * The tools of `radar.http.ases.httpMethod`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_ases_http_method_get",
+    name: "radar_http_ases_httpMethod_get",
     title: "Get top ASes by HTTP requests for an HTTP version",
-    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested HTTP version.",
+    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested HTTP version.\n\nGET /radar/http/top/ases/http_version/{http_version}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "http_version": {
+              "description": "HTTP version.",
+              "enum": [
+                "HTTPv1",
+                "HTTPv2",
+                "HTTPv3"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "HTTP version.",
-          "enum": [
-            "HTTPv1",
-            "HTTPv2",
-            "HTTPv3"
+          "required": [
+            "http_version"
           ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "http_version"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases/http_version/${pathParam(args, "http_version")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/httpProtocol/tools.ts b/src/generated/forge-mcp/radar/http/ases/httpProtocol/tools.ts
index 5763dc97b..766101638 100644
--- a/src/generated/forge-mcp/radar/http/ases/httpProtocol/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/httpProtocol/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.ases.http_protocol`.
+ * The tools of `radar.http.ases.httpProtocol`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_ases_http_protocol_get",
+    name: "radar_http_ases_httpProtocol_get",
     title: "Get top ASes by HTTP requests for an HTTP protocol",
-    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested HTTP protocol.",
+    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested HTTP protocol.\n\nGET /radar/http/top/ases/http_protocol/{http_protocol}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "http_protocol": {
+              "description": "HTTP protocol (HTTP vs. HTTPS).",
+              "enum": [
+                "HTTP",
+                "HTTPS"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "HTTP protocol (HTTP vs. HTTPS).",
-          "enum": [
-            "HTTP",
-            "HTTPS"
+          "required": [
+            "http_protocol"
           ],
-          "type": "string"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "http_protocol"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases/http_protocol/${pathParam(args, "http_protocol")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/ipVersion/tools.ts b/src/generated/forge-mcp/radar/http/ases/ipVersion/tools.ts
index 3e4069e53..62ea14fa9 100644
--- a/src/generated/forge-mcp/radar/http/ases/ipVersion/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/ipVersion/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.ases.ip_version`.
+ * The tools of `radar.http.ases.ipVersion`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_ases_ip_version_get",
+    name: "radar_http_ases_ipVersion_get",
     title: "Get top ASes by HTTP requests for an IP version",
-    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested IP version.",
+    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested IP version.\n\nGET /radar/http/top/ases/ip_version/{ip_version}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ip_version": {
+              "description": "IP version.",
+              "enum": [
+                "IPv4",
+                "IPv6"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "IP version.",
-          "enum": [
-            "IPv4",
-            "IPv6"
+          "required": [
+            "ip_version"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "ip_version"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases/ip_version/${pathParam(args, "ip_version")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/os/tools.ts b/src/generated/forge-mcp/radar/http/ases/os/tools.ts
index f455ddaa1..9508f3154 100644
--- a/src/generated/forge-mcp/radar/http/ases/os/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/os/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.http.ases.os`.
@@ -10,182 +10,198 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_http_ases_os_get",
     title: "Get top ASes by HTTP requests for an OS",
-    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested operating system.",
+    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested operating system.\n\nGET /radar/http/top/ases/os/{os}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "os": {
+              "description": "Operating system.",
+              "enum": [
+                "WINDOWS",
+                "MACOSX",
+                "IOS",
+                "ANDROID",
+                "CHROMEOS",
+                "LINUX",
+                "SMART_TV"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "os": {
-          "description": "Operating system.",
-          "enum": [
-            "WINDOWS",
-            "MACOSX",
-            "IOS",
-            "ANDROID",
-            "CHROMEOS",
-            "LINUX",
-            "SMART_TV"
+          "required": [
+            "os"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "os"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases/os/${pathParam(args, "os")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/tlsVersion/tools.ts b/src/generated/forge-mcp/radar/http/ases/tlsVersion/tools.ts
index 384760681..4fa6920d2 100644
--- a/src/generated/forge-mcp/radar/http/ases/tlsVersion/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/tlsVersion/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.ases.tls_version`.
+ * The tools of `radar.http.ases.tlsVersion`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_ases_tls_version_get",
+    name: "radar_http_ases_tlsVersion_get",
     title: "Get top ASes by HTTP requests for a TLS version",
-    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested TLS protocol version.",
+    description: "Retrieves the top autonomous systems, by HTTP requests, of the requested TLS protocol version.\n\nGET /radar/http/top/ases/tls_version/{tls_version}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "tls_version": {
+              "description": "TLS version.",
+              "enum": [
+                "TLSv1_0",
+                "TLSv1_1",
+                "TLSv1_2",
+                "TLSv1_3",
+                "TLSvQUIC"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "tls_version"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "tls_version": {
-          "description": "TLS version.",
-          "enum": [
-            "TLSv1_0",
-            "TLSv1_1",
-            "TLSv1_2",
-            "TLSv1_3",
-            "TLSvQUIC"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "tls_version"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases/tls_version/${pathParam(args, "tls_version")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/ases/tools.ts b/src/generated/forge-mcp/radar/http/ases/tools.ts
index 0f59a5f93..693551111 100644
--- a/src/generated/forge-mcp/radar/http/ases/tools.ts
+++ b/src/generated/forge-mcp/radar/http/ases/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.http.ases`.
@@ -10,182 +10,189 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_http_ases_get",
     title: "Get top ASes by HTTP requests",
-    description: "Retrieves the top autonomous systems by HTTP requests.",
+    description: "Retrieves the top autonomous systems by HTTP requests.\n\nGET /radar/http/top/ases",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,24 +651,24 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/ases`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/botClass/tools.ts b/src/generated/forge-mcp/radar/http/locations/botClass/tools.ts
index 5db58bd52..0b5a9c986 100644
--- a/src/generated/forge-mcp/radar/http/locations/botClass/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/botClass/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.locations.bot_class`.
+ * The tools of `radar.http.locations.botClass`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_locations_bot_class_get",
+    name: "radar_http_locations_botClass_get",
     title: "Get top locations by HTTP requests for a bot class",
-    description: "Retrieves the top locations, by HTTP requests, of the requested bot class.",
+    description: "Retrieves the top locations, by HTTP requests, of the requested bot class.\n\nGET /radar/http/top/locations/bot_class/{bot_class}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "enum": [
-            "LIKELY_AUTOMATED",
-            "LIKELY_HUMAN"
-          ],
-          "type": "string"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "bot_class": {
+              "description": "Bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "enum": [
+                "LIKELY_AUTOMATED",
+                "LIKELY_HUMAN"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "bot_class"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "bot_class"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations/bot_class/${pathParam(args, "bot_class")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/browserFamily/tools.ts b/src/generated/forge-mcp/radar/http/locations/browserFamily/tools.ts
index e12f91a5a..357600ca2 100644
--- a/src/generated/forge-mcp/radar/http/locations/browserFamily/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/browserFamily/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.locations.browser_family`.
+ * The tools of `radar.http.locations.browserFamily`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_locations_browser_family_get",
+    name: "radar_http_locations_browserFamily_get",
     title: "Get top locations by HTTP requests for a browser family",
-    description: "Retrieves the top locations, by HTTP requests, of the requested browser family.",
+    description: "Retrieves the top locations, by HTTP requests, of the requested browser family.\n\nGET /radar/http/top/locations/browser_family/{browser_family}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Browser family.",
-          "enum": [
-            "CHROME",
-            "EDGE",
-            "FIREFOX",
-            "SAFARI"
-          ],
-          "type": "string"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "browser_family": {
+              "description": "Browser family.",
+              "enum": [
+                "CHROME",
+                "EDGE",
+                "FIREFOX",
+                "SAFARI"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "browser_family"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "browser_family"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations/browser_family/${pathParam(args, "browser_family")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/deviceType/tools.ts b/src/generated/forge-mcp/radar/http/locations/deviceType/tools.ts
index c10549761..d072a75ac 100644
--- a/src/generated/forge-mcp/radar/http/locations/deviceType/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/deviceType/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.locations.device_type`.
+ * The tools of `radar.http.locations.deviceType`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_locations_device_type_get",
+    name: "radar_http_locations_deviceType_get",
     title: "Get top locations by HTTP requests for a device type",
-    description: "Retrieves the top locations, by HTTP requests, of the requested device type.",
+    description: "Retrieves the top locations, by HTTP requests, of the requested device type.\n\nGET /radar/http/top/locations/device_type/{device_type}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "device_type": {
+              "description": "Device type.",
+              "enum": [
+                "DESKTOP",
+                "MOBILE",
+                "OTHER"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Device type.",
-          "enum": [
-            "DESKTOP",
-            "MOBILE",
-            "OTHER"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "device_type"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "device_type"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations/device_type/${pathParam(args, "device_type")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/httpMethod/tools.ts b/src/generated/forge-mcp/radar/http/locations/httpMethod/tools.ts
index bb9cd237c..48942e8b0 100644
--- a/src/generated/forge-mcp/radar/http/locations/httpMethod/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/httpMethod/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.locations.http_method`.
+ * The tools of `radar.http.locations.httpMethod`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_locations_http_method_get",
+    name: "radar_http_locations_httpMethod_get",
     title: "Get top locations by HTTP requests for an HTTP version",
-    description: "Retrieves the top locations, by HTTP requests, of the requested HTTP version.",
+    description: "Retrieves the top locations, by HTTP requests, of the requested HTTP version.\n\nGET /radar/http/top/locations/http_version/{http_version}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "http_version": {
+              "description": "HTTP version.",
+              "enum": [
+                "HTTPv1",
+                "HTTPv2",
+                "HTTPv3"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "HTTP version.",
-          "enum": [
-            "HTTPv1",
-            "HTTPv2",
-            "HTTPv3"
+          "required": [
+            "http_version"
           ],
-          "type": "string"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "http_version"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations/http_version/${pathParam(args, "http_version")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/httpProtocol/tools.ts b/src/generated/forge-mcp/radar/http/locations/httpProtocol/tools.ts
index e04ade68b..9c7800b9e 100644
--- a/src/generated/forge-mcp/radar/http/locations/httpProtocol/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/httpProtocol/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.locations.http_protocol`.
+ * The tools of `radar.http.locations.httpProtocol`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_locations_http_protocol_get",
+    name: "radar_http_locations_httpProtocol_get",
     title: "Get top locations by HTTP requests for an HTTP protocol",
-    description: "Retrieves the top locations, by HTTP requests, of the requested HTTP protocol.",
+    description: "Retrieves the top locations, by HTTP requests, of the requested HTTP protocol.\n\nGET /radar/http/top/locations/http_protocol/{http_protocol}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "http_protocol": {
+              "description": "HTTP protocol (HTTP vs. HTTPS).",
+              "enum": [
+                "HTTP",
+                "HTTPS"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "HTTP protocol (HTTP vs. HTTPS).",
-          "enum": [
-            "HTTP",
-            "HTTPS"
+          "required": [
+            "http_protocol"
           ],
-          "type": "string"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "http_protocol"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations/http_protocol/${pathParam(args, "http_protocol")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/ipVersion/tools.ts b/src/generated/forge-mcp/radar/http/locations/ipVersion/tools.ts
index f2e687c98..53d432e53 100644
--- a/src/generated/forge-mcp/radar/http/locations/ipVersion/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/ipVersion/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.locations.ip_version`.
+ * The tools of `radar.http.locations.ipVersion`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_locations_ip_version_get",
+    name: "radar_http_locations_ipVersion_get",
     title: "Get top locations by HTTP requests for an IP version",
-    description: "Retrieves the top locations, by HTTP requests, of the requested IP version.",
+    description: "Retrieves the top locations, by HTTP requests, of the requested IP version.\n\nGET /radar/http/top/locations/ip_version/{ip_version}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "ip_version": {
+              "description": "IP version.",
+              "enum": [
+                "IPv4",
+                "IPv6"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "IP version.",
-          "enum": [
-            "IPv4",
-            "IPv6"
+          "required": [
+            "ip_version"
           ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "ip_version"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations/ip_version/${pathParam(args, "ip_version")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/os/tools.ts b/src/generated/forge-mcp/radar/http/locations/os/tools.ts
index e088d15f1..2a53733c2 100644
--- a/src/generated/forge-mcp/radar/http/locations/os/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/os/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.http.locations.os`.
@@ -10,182 +10,198 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_http_locations_os_get",
     title: "Get top locations by HTTP requests for an OS",
-    description: "Retrieves the top locations, by HTTP requests, of the requested operating system.",
+    description: "Retrieves the top locations, by HTTP requests, of the requested operating system.\n\nGET /radar/http/top/locations/os/{os}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "os": {
+              "description": "Operating system.",
+              "enum": [
+                "WINDOWS",
+                "MACOSX",
+                "IOS",
+                "ANDROID",
+                "CHROMEOS",
+                "LINUX",
+                "SMART_TV"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "os": {
-          "description": "Operating system.",
-          "enum": [
-            "WINDOWS",
-            "MACOSX",
-            "IOS",
-            "ANDROID",
-            "CHROMEOS",
-            "LINUX",
-            "SMART_TV"
+          "required": [
+            "os"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "os"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations/os/${pathParam(args, "os")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/tlsVersion/tools.ts b/src/generated/forge-mcp/radar/http/locations/tlsVersion/tools.ts
index 506eb6a53..2ed14221a 100644
--- a/src/generated/forge-mcp/radar/http/locations/tlsVersion/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/tlsVersion/tools.ts
@@ -1,191 +1,207 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.http.locations.tls_version`.
+ * The tools of `radar.http.locations.tlsVersion`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_locations_tls_version_get",
+    name: "radar_http_locations_tlsVersion_get",
     title: "Get top locations by HTTP requests for a TLS version",
-    description: "Retrieves the top locations, by HTTP requests, of the requested TLS protocol version.",
+    description: "Retrieves the top locations, by HTTP requests, of the requested TLS protocol version.\n\nGET /radar/http/top/locations/tls_version/{tls_version}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "tls_version": {
+              "description": "TLS version.",
+              "enum": [
+                "TLSv1_0",
+                "TLSv1_1",
+                "TLSv1_2",
+                "TLSv1_3",
+                "TLSvQUIC"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "tls_version"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "tls_version": {
-          "description": "TLS version.",
-          "enum": [
-            "TLSv1_0",
-            "TLSv1_1",
-            "TLSv1_2",
-            "TLSv1_3",
-            "TLSvQUIC"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "tls_version"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,23 +660,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations/tls_version/${pathParam(args, "tls_version")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/locations/tools.ts b/src/generated/forge-mcp/radar/http/locations/tools.ts
index ff9d9b3e6..95f0ea4b4 100644
--- a/src/generated/forge-mcp/radar/http/locations/tools.ts
+++ b/src/generated/forge-mcp/radar/http/locations/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.http.locations`.
@@ -10,182 +10,189 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_http_locations_get",
     title: "Get top locations by HTTP requests",
-    description: "Retrieves the top locations by HTTP requests.",
+    description: "Retrieves the top locations by HTTP requests.\n\nGET /radar/http/top/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -644,24 +651,24 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/top/locations`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["botClass", args["bot_class"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/http/tools.ts b/src/generated/forge-mcp/radar/http/tools.ts
index 15e58d010..a5b019050 100644
--- a/src/generated/forge-mcp/radar/http/tools.ts
+++ b/src/generated/forge-mcp/radar/http/tools.ts
@@ -1,237 +1,253 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.http`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_http_summary_v2",
+    name: "radar_http_summaryV2",
     title: "Get HTTP requests summary by dimension",
-    description: "Retrieves the distribution of HTTP requests by the specified dimension.",
+    description: "Retrieves the distribution of HTTP requests by the specified dimension.\n\nGET /radar/http/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "api_traffic": {
-          "description": "Filters results by API traffic classification. API traffic is identified by JSON or XML response content types on dynamic (non-cacheable) HTTP requests. Incompatible with the `browserFamily`, `deviceType`, `httpProtocol`, `httpVersion`, `ipVersion`, `os`, and `tlsVersion` filters/dimensions. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "API",
-              "NON_API"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "content_type": {
-          "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "HTML",
-              "IMAGES",
-              "JSON",
-              "JAVASCRIPT",
-              "CSS",
-              "PLAIN_TEXT",
-              "FONTS",
-              "XML",
-              "YAML",
-              "VIDEO",
-              "AUDIO",
-              "MARKDOWN",
-              "DOCUMENTS",
-              "BINARY",
-              "SERIALIZATION",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the HTTP attribute by which to group the results.",
+              "enum": [
+                "ADM1",
+                "API_TRAFFIC",
+                "AS",
+                "BOT_CLASS",
+                "BROWSER",
+                "BROWSER_FAMILY",
+                "CONTENT_TYPE",
+                "DEVICE_TYPE",
+                "HTTP_PROTOCOL",
+                "HTTP_VERSION",
+                "IP_VERSION",
+                "LOCATION",
+                "OS",
+                "POST_QUANTUM",
+                "TLS_VERSION"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the HTTP attribute by which to group the results.",
-          "enum": [
-            "ADM1",
-            "API_TRAFFIC",
-            "AS",
-            "BOT_CLASS",
-            "BROWSER",
-            "BROWSER_FAMILY",
-            "CONTENT_TYPE",
-            "DEVICE_TYPE",
-            "HTTP_PROTOCOL",
-            "HTTP_VERSION",
-            "IP_VERSION",
-            "LOCATION",
-            "OS",
-            "POST_QUANTUM",
-            "TLS_VERSION"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "apiTraffic": {
+              "description": "Filters results by API traffic classification. API traffic is identified by JSON or XML response content types on dynamic (non-cacheable) HTTP requests. Incompatible with the `browserFamily`, `deviceType`, `httpProtocol`, `httpVersion`, `ipVersion`, `os`, and `tlsVersion` filters/dimensions. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "API",
+                  "NON_API"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "contentType": {
+              "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "HTML",
+                  "IMAGES",
+                  "JSON",
+                  "JAVASCRIPT",
+                  "CSS",
+                  "PLAIN_TEXT",
+                  "FONTS",
+                  "XML",
+                  "YAML",
+                  "VIDEO",
+                  "AUDIO",
+                  "MARKDOWN",
+                  "DOCUMENTS",
+                  "BINARY",
+                  "SERIALIZATION",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -663,256 +679,263 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["apiTraffic", args["api_traffic"], true],
-        ["botClass", args["bot_class"], true],
-        ["contentType", args["content_type"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["apiTraffic", param(args, "query", "apiTraffic"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["contentType", param(args, "query", "contentType"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_http_timeseries",
     title: "Get HTTP requests time series",
-    description: "Retrieves the HTTP requests over time.",
+    description: "Retrieves the HTTP requests over time.\n\nGET /radar/http/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "api_traffic": {
-          "description": "Filters results by API traffic classification. API traffic is identified by JSON or XML response content types on dynamic (non-cacheable) HTTP requests. Incompatible with the `browserFamily`, `deviceType`, `httpProtocol`, `httpVersion`, `ipVersion`, `os`, and `tlsVersion` filters/dimensions. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "API",
-              "NON_API"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "browser_family": {
-          "description": "Filters results by browser family.",
-          "items": {
-            "enum": [
-              "CHROME",
-              "EDGE",
-              "FIREFOX",
-              "SAFARI"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "content_type": {
-          "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "HTML",
-              "IMAGES",
-              "JSON",
-              "JAVASCRIPT",
-              "CSS",
-              "PLAIN_TEXT",
-              "FONTS",
-              "XML",
-              "YAML",
-              "VIDEO",
-              "AUDIO",
-              "MARKDOWN",
-              "DOCUMENTS",
-              "BINARY",
-              "SERIALIZATION",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "normalization": {
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
-          "enum": [
-            "PERCENTAGE_CHANGE",
-            "MIN0_MAX"
-          ],
-          "type": "string"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "apiTraffic": {
+              "description": "Filters results by API traffic classification. API traffic is identified by JSON or XML response content types on dynamic (non-cacheable) HTTP requests. Incompatible with the `browserFamily`, `deviceType`, `httpProtocol`, `httpVersion`, `ipVersion`, `os`, and `tlsVersion` filters/dimensions. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "API",
+                  "NON_API"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "browserFamily": {
+              "description": "Filters results by browser family.",
+              "items": {
+                "enum": [
+                  "CHROME",
+                  "EDGE",
+                  "FIREFOX",
+                  "SAFARI"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "contentType": {
+              "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "HTML",
+                  "IMAGES",
+                  "JSON",
+                  "JAVASCRIPT",
+                  "CSS",
+                  "PLAIN_TEXT",
+                  "FONTS",
+                  "XML",
+                  "YAML",
+                  "VIDEO",
+                  "AUDIO",
+                  "MARKDOWN",
+                  "DOCUMENTS",
+                  "BINARY",
+                  "SERIALIZATION",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
+              "enum": [
+                "PERCENTAGE_CHANGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1396,274 +1419,290 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["normalization", args["normalization"], true],
-        ["apiTraffic", args["api_traffic"], true],
-        ["botClass", args["bot_class"], true],
-        ["contentType", args["content_type"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["browserFamily", args["browser_family"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["apiTraffic", param(args, "query", "apiTraffic"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["contentType", param(args, "query", "contentType"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["browserFamily", param(args, "query", "browserFamily"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_http_timeseries_groups_v2",
+    name: "radar_http_timeseriesGroupsV2",
     title: "Get HTTP requests time series grouped by dimension",
-    description: "Retrieves the distribution of HTTP requests grouped by dimension.",
+    description: "Retrieves the distribution of HTTP requests grouped by dimension.\n\nGET /radar/http/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "api_traffic": {
-          "description": "Filters results by API traffic classification. API traffic is identified by JSON or XML response content types on dynamic (non-cacheable) HTTP requests. Incompatible with the `browserFamily`, `deviceType`, `httpProtocol`, `httpVersion`, `ipVersion`, `os`, and `tlsVersion` filters/dimensions. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "API",
-              "NON_API"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "content_type": {
-          "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
-          "items": {
-            "enum": [
-              "HTML",
-              "IMAGES",
-              "JSON",
-              "JAVASCRIPT",
-              "CSS",
-              "PLAIN_TEXT",
-              "FONTS",
-              "XML",
-              "YAML",
-              "VIDEO",
-              "AUDIO",
-              "MARKDOWN",
-              "DOCUMENTS",
-              "BINARY",
-              "SERIALIZATION",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "device_type": {
-          "description": "Filters results by device type.",
-          "items": {
-            "enum": [
-              "DESKTOP",
-              "MOBILE",
-              "OTHER"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the HTTP attribute by which to group the results.",
-          "enum": [
-            "ADM1",
-            "API_TRAFFIC",
-            "AS",
-            "BOT_CLASS",
-            "BROWSER",
-            "BROWSER_FAMILY",
-            "CONTENT_TYPE",
-            "DEVICE_TYPE",
-            "HTTP_PROTOCOL",
-            "HTTP_VERSION",
-            "IP_VERSION",
-            "LOCATION",
-            "OS",
-            "POST_QUANTUM",
-            "TLS_VERSION"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_protocol": {
-          "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
-          "items": {
-            "enum": [
-              "HTTP",
-              "HTTPS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "http_version": {
-          "description": "Filters results by HTTP version.",
-          "items": {
-            "enum": [
-              "HTTPv1",
-              "HTTPv2",
-              "HTTPv3"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ip_version": {
-          "description": "Filters results by IP version (Ipv4 vs. IPv6).",
-          "items": {
-            "enum": [
-              "IPv4",
-              "IPv6"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the HTTP attribute by which to group the results.",
+              "enum": [
+                "ADM1",
+                "API_TRAFFIC",
+                "AS",
+                "BOT_CLASS",
+                "BROWSER",
+                "BROWSER_FAMILY",
+                "CONTENT_TYPE",
+                "DEVICE_TYPE",
+                "HTTP_PROTOCOL",
+                "HTTP_VERSION",
+                "IP_VERSION",
+                "LOCATION",
+                "OS",
+                "POST_QUANTUM",
+                "TLS_VERSION"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "os": {
-          "description": "Filters results by operating system.",
-          "items": {
-            "enum": [
-              "WINDOWS",
-              "MACOSX",
-              "IOS",
-              "ANDROID",
-              "CHROMEOS",
-              "LINUX",
-              "SMART_TV"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "tls_version": {
-          "description": "Filters results by TLS version.",
-          "items": {
-            "enum": [
-              "TLSv1_0",
-              "TLSv1_1",
-              "TLSv1_2",
-              "TLSv1_3",
-              "TLSvQUIC"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "apiTraffic": {
+              "description": "Filters results by API traffic classification. API traffic is identified by JSON or XML response content types on dynamic (non-cacheable) HTTP requests. Incompatible with the `browserFamily`, `deviceType`, `httpProtocol`, `httpVersion`, `ipVersion`, `os`, and `tlsVersion` filters/dimensions. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "API",
+                  "NON_API"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "contentType": {
+              "description": "Filters results by content type category. When set, results can only be further filtered by location, continent, or Autonomous System.",
+              "items": {
+                "enum": [
+                  "HTML",
+                  "IMAGES",
+                  "JSON",
+                  "JAVASCRIPT",
+                  "CSS",
+                  "PLAIN_TEXT",
+                  "FONTS",
+                  "XML",
+                  "YAML",
+                  "VIDEO",
+                  "AUDIO",
+                  "MARKDOWN",
+                  "DOCUMENTS",
+                  "BINARY",
+                  "SERIALIZATION",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "deviceType": {
+              "description": "Filters results by device type.",
+              "items": {
+                "enum": [
+                  "DESKTOP",
+                  "MOBILE",
+                  "OTHER"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpProtocol": {
+              "description": "Filters results by HTTP protocol (HTTP vs. HTTPS).",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "HTTPS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "httpVersion": {
+              "description": "Filters results by HTTP version.",
+              "items": {
+                "enum": [
+                  "HTTPv1",
+                  "HTTPv2",
+                  "HTTPv3"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "ipVersion": {
+              "description": "Filters results by IP version (Ipv4 vs. IPv6).",
+              "items": {
+                "enum": [
+                  "IPv4",
+                  "IPv6"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            },
+            "os": {
+              "description": "Filters results by operating system.",
+              "items": {
+                "enum": [
+                  "WINDOWS",
+                  "MACOSX",
+                  "IOS",
+                  "ANDROID",
+                  "CHROMEOS",
+                  "LINUX",
+                  "SMART_TV"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "tlsVersion": {
+              "description": "Filters results by TLS version.",
+              "items": {
+                "enum": [
+                  "TLSv1_0",
+                  "TLSv1_1",
+                  "TLSv1_2",
+                  "TLSv1_3",
+                  "TLSvQUIC"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2147,27 +2186,27 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/http/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["apiTraffic", args["api_traffic"], true],
-        ["botClass", args["bot_class"], true],
-        ["contentType", args["content_type"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["deviceType", args["device_type"], true],
-        ["httpProtocol", args["http_protocol"], true],
-        ["httpVersion", args["http_version"], true],
-        ["normalization", args["normalization"], true],
-        ["ipVersion", args["ip_version"], true],
-        ["os", args["os"], true],
-        ["tlsVersion", args["tls_version"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["apiTraffic", param(args, "query", "apiTraffic"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["contentType", param(args, "query", "contentType"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["httpProtocol", param(args, "query", "httpProtocol"), true],
+        ["httpVersion", param(args, "query", "httpVersion"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["ipVersion", param(args, "query", "ipVersion"), true],
+        ["os", param(args, "query", "os"), true],
+        ["tlsVersion", param(args, "query", "tlsVersion"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/leakedCredentials/tools.ts b/src/generated/forge-mcp/radar/leakedCredentials/tools.ts
index 5ec6cebb3..30fd854fc 100644
--- a/src/generated/forge-mcp/radar/leakedCredentials/tools.ts
+++ b/src/generated/forge-mcp/radar/leakedCredentials/tools.ts
@@ -1,116 +1,132 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `radar.leaked_credentials`.
+ * The tools of `radar.leakedCredentials`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_leaked_credentials_summary_v2",
+    name: "radar_leakedCredentials_summaryV2",
     title: "Get HTTP authentication requests distribution by dimension",
-    description: "Retrieves an aggregated summary of HTTP authentication requests grouped by the specified dimension.",
+    description: "Retrieves an aggregated summary of HTTP authentication requests grouped by the specified dimension.\n\nGET /radar/leaked_credential_checks/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "compromised": {
-          "description": "Filters results by compromised credential status (clean vs. compromised).",
-          "items": {
-            "enum": [
-              "CLEAN",
-              "COMPROMISED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "COMPROMISED",
+                "BOT_CLASS"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "COMPROMISED",
-            "BOT_CLASS"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "compromised": {
+              "description": "Filters results by compromised credential status (clean vs. compromised).",
+              "items": {
+                "enum": [
+                  "CLEAN",
+                  "COMPROMISED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -542,156 +558,172 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/leaked_credential_checks/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["botClass", args["bot_class"], true],
-        ["compromised", args["compromised"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["compromised", param(args, "query", "compromised"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_leaked_credentials_timeseries_groups_v2",
+    name: "radar_leakedCredentials_timeseriesGroupsV2",
     title: "Get time series distribution of HTTP authentication requests by dimension.",
-    description: "Retrieves the distribution of HTTP authentication requests, grouped by the specified dimension over time.",
+    description: "Retrieves the distribution of HTTP authentication requests, grouped by the specified dimension over time.\n\nGET /radar/leaked_credential_checks/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bot_class": {
-          "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
-          "items": {
-            "enum": [
-              "LIKELY_AUTOMATED",
-              "LIKELY_HUMAN"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "check_result": {
-          "description": "Filters results by leaked credential check result.",
-          "items": {
-            "enum": [
-              "CLEAN",
-              "USERNAME_LEAKED",
-              "USERNAME_PASSWORD_SIMILAR",
-              "USERNAME_AND_PASSWORD_LEAKED",
-              "PASSWORD_LEAKED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "compromised": {
-          "description": "Filters results by compromised credential status (clean vs. compromised).",
-          "items": {
-            "enum": [
-              "CLEAN",
-              "COMPROMISED"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the attribute by which to group the results.",
+              "enum": [
+                "COMPROMISED",
+                "BOT_CLASS"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the attribute by which to group the results.",
-          "enum": [
-            "COMPROMISED",
-            "BOT_CLASS"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "botClass": {
+              "description": "Filters results by bot class. Refer to [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).",
+              "items": {
+                "enum": [
+                  "LIKELY_AUTOMATED",
+                  "LIKELY_HUMAN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "checkResult": {
+              "description": "Filters results by leaked credential check result.",
+              "items": {
+                "enum": [
+                  "CLEAN",
+                  "USERNAME_LEAKED",
+                  "USERNAME_PASSWORD_SIMILAR",
+                  "USERNAME_AND_PASSWORD_LEAKED",
+                  "PASSWORD_LEAKED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "compromised": {
+              "description": "Filters results by compromised credential status (clean vs. compromised).",
+              "items": {
+                "enum": [
+                  "CLEAN",
+                  "COMPROMISED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
+              "enum": [
+                "PERCENTAGE_CHANGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
-          "enum": [
-            "PERCENTAGE_CHANGE",
-            "MIN0_MAX"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1175,20 +1207,20 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/leaked_credential_checks/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["botClass", args["bot_class"], true],
-        ["compromised", args["compromised"], true],
-        ["checkResult", args["check_result"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["botClass", param(args, "query", "botClass"), true],
+        ["compromised", param(args, "query", "compromised"), true],
+        ["checkResult", param(args, "query", "checkResult"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/netflows/tools.ts b/src/generated/forge-mcp/radar/netflows/tools.ts
index 0bfce114d..2a20d93c3 100644
--- a/src/generated/forge-mcp/radar/netflows/tools.ts
+++ b/src/generated/forge-mcp/radar/netflows/tools.ts
@@ -1,114 +1,130 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.netflows`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_netflows_summary_v2",
+    name: "radar_netflows_summaryV2",
     title: "Get network traffic distribution by dimension",
-    description: "Retrieves the distribution of network traffic (NetFlows) by the specified dimension.",
+    description: "Retrieves the distribution of network traffic (NetFlows) by the specified dimension.\n\nGET /radar/netflows/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the NetFlows attribute by which to group the results.",
+              "enum": [
+                "ADM1",
+                "AS",
+                "LOCATION",
+                "PRODUCT"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the NetFlows attribute by which to group the results.",
-          "enum": [
-            "ADM1",
-            "AS",
-            "LOCATION",
-            "PRODUCT"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "product": {
-          "description": "Filters the results by network traffic product types.",
-          "items": {
-            "enum": [
-              "HTTP",
-              "ALL"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "product": {
+              "description": "Filters the results by network traffic product types.",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "ALL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -540,123 +556,130 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/netflows/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["product", args["product"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["product", param(args, "query", "product"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_netflows_timeseries",
     title: "Get network traffic time series",
-    description: "Retrieves network traffic (NetFlows) over time.",
+    description: "Retrieves network traffic (NetFlows) over time.\n\nGET /radar/netflows/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "normalization": {
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
-          "enum": [
-            "PERCENTAGE_CHANGE",
-            "MIN0_MAX"
-          ],
-          "type": "string"
-        },
-        "product": {
-          "description": "Filters the results by network traffic product types.",
-          "items": {
-            "enum": [
-              "HTTP",
-              "ALL"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
+              "enum": [
+                "PERCENTAGE_CHANGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            },
+            "product": {
+              "description": "Filters the results by network traffic product types.",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "ALL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1142,143 +1165,159 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/netflows/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["product", args["product"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["product", param(args, "query", "product"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_netflows_timeseries_groups",
+    name: "radar_netflows_timeseriesGroups",
     title: "Get time series distribution of network traffic by dimension",
-    description: "Retrieves the distribution of NetFlows traffic, grouped by the specified dimension over time.",
+    description: "Retrieves the distribution of NetFlows traffic, grouped by the specified dimension over time.\n\nGET /radar/netflows/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the NetFlows attribute by which to group the results.",
-          "enum": [
-            "ADM1",
-            "AS",
-            "LOCATION",
-            "PRODUCT"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the NetFlows attribute by which to group the results.",
+              "enum": [
+                "ADM1",
+                "AS",
+                "LOCATION",
+                "PRODUCT"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX",
-            "PERCENTAGE_CHANGE"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "product": {
-          "description": "Filters the results by network traffic product types.",
-          "items": {
-            "enum": [
-              "HTTP",
-              "ALL"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/). `PERCENTAGE_CHANGE` requires exactly one comparison series (e.g. a `control` date range).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX",
+                "PERCENTAGE_CHANGE"
+              ],
+              "type": "string"
+            },
+            "product": {
+              "description": "Filters the results by network traffic product types.",
+              "items": {
+                "enum": [
+                  "HTTP",
+                  "ALL"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1762,19 +1801,19 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/netflows/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["normalization", args["normalization"], true],
-        ["product", args["product"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["product", param(args, "query", "product"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/netflows/top/tools.ts b/src/generated/forge-mcp/radar/netflows/top/tools.ts
index 87bff6d6c..ebd37b37f 100644
--- a/src/generated/forge-mcp/radar/netflows/top/tools.ts
+++ b/src/generated/forge-mcp/radar/netflows/top/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.netflows.top`.
@@ -10,82 +10,89 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_netflows_top_ases",
     title: "Get top ASes by network traffic",
-    description: "Retrieves the top autonomous systems by network traffic (NetFlows).",
+    description: "Retrieves the top autonomous systems by network traffic (NetFlows).\n\nGET /radar/netflows/top/ases",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -544,98 +551,105 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/netflows/top/ases`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_netflows_top_locations",
     title: "Get top locations by network traffic",
-    description: "Retrieves the top locations by network traffic (NetFlows).",
+    description: "Retrieves the top locations by network traffic (NetFlows).\n\nGET /radar/netflows/top/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "geo_id": {
-          "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "geoId": {
+              "description": "Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689` excludes results from the 2267056 (Lisbon), but includes results from 5128638 (New York).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1094,16 +1108,16 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/netflows/top/locations`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["geoId", args["geo_id"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["geoId", param(args, "query", "geoId"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/origins/tools.ts b/src/generated/forge-mcp/radar/origins/tools.ts
index ac333c500..f17120165 100644
--- a/src/generated/forge-mcp/radar/origins/tools.ts
+++ b/src/generated/forge-mcp/radar/origins/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.origins`.
@@ -10,32 +10,48 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_origins_get",
     title: "Get Origin details",
-    description: "Retrieves the requested origin information with its regions.",
+    description: "Retrieves the requested origin information with its regions.\n\nGET /radar/origins/{slug}",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "slug": {
+              "description": "Origin slug.",
+              "enum": [
+                "AMAZON",
+                "GOOGLE",
+                "MICROSOFT",
+                "ORACLE"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "slug"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "slug": {
-          "description": "Origin slug.",
-          "enum": [
-            "AMAZON",
-            "GOOGLE",
-            "MICROSOFT",
-            "ORACLE"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "slug"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -168,35 +184,42 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/origins/${pathParam(args, "slug")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_origins_list",
     title: "List Origins",
-    description: "Retrieves a list of origins with their regions.",
+    description: "Retrieves a list of origins with their regions.\n\nGET /radar/origins",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -354,108 +377,127 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/origins`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_origins_summary",
     title: "Get origin metrics distribution by dimension",
-    description: "Retrieves an aggregated summary of origin metrics grouped by the specified dimension.",
+    description: "Retrieves an aggregated summary of origin metrics grouped by the specified dimension.\n\nGET /radar/origins/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the origin attribute by which to group the results. `ORIGIN` groups across all providers and does not accept an `origin` or `region`. `REGION` requires an `origin`. `SUCCESS_RATE` and `PERCENTILE` require both an `origin` and a `region` and constrain the `metric` (`SUCCESS_RATE` supports only `REQUESTS`; `PERCENTILE` supports any metric except `REQUESTS`). `limitPerGroup` is only supported on the `REGION` dimension.",
+              "enum": [
+                "ORIGIN",
+                "REGION",
+                "SUCCESS_RATE",
+                "PERCENTILE"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the origin attribute by which to group the results. `ORIGIN` groups across all providers and does not accept an `origin` or `region`. `REGION` requires an `origin`. `SUCCESS_RATE` and `PERCENTILE` require both an `origin` and a `region` and constrain the `metric` (`SUCCESS_RATE` supports only `REQUESTS`; `PERCENTILE` supports any metric except `REQUESTS`). `limitPerGroup` is only supported on the `REGION` dimension.",
-          "enum": [
-            "ORIGIN",
-            "REGION",
-            "SUCCESS_RATE",
-            "PERCENTILE"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "metric": {
-          "description": "Specifies the metric to retrieve. Allowed metrics depend on the selected dimension (see the `dimension` path parameter).",
-          "enum": [
-            "CONNECTION_FAILURES",
-            "REQUESTS",
-            "RESPONSE_HEADER_RECEIVE_DURATION",
-            "TCP_HANDSHAKE_DURATION",
-            "TCP_RTT",
-            "TLS_HANDSHAKE_DURATION"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "origin": {
-          "description": "Filters results by origin. Required for every dimension except `ORIGIN`; must not be set on the `ORIGIN` dimension, which groups across all providers.",
-          "items": {
-            "enum": [
-              "AMAZON",
-              "GOOGLE",
-              "MICROSOFT",
-              "ORACLE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         },
-        "region": {
-          "description": "Filters results by origin region. Requires `origin` to be set and is validated against it.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "metric": {
+              "description": "Specifies the metric to retrieve. Allowed metrics depend on the selected dimension (see the `dimension` path parameter).",
+              "enum": [
+                "CONNECTION_FAILURES",
+                "REQUESTS",
+                "RESPONSE_HEADER_RECEIVE_DURATION",
+                "TCP_HANDSHAKE_DURATION",
+                "TCP_RTT",
+                "TLS_HANDSHAKE_DURATION"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "origin": {
+              "description": "Filters results by origin. Required for every dimension except `ORIGIN`; must not be set on the `ORIGIN` dimension, which groups across all providers.",
+              "items": {
+                "enum": [
+                  "AMAZON",
+                  "GOOGLE",
+                  "MICROSOFT",
+                  "ORACLE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "region": {
+              "description": "Filters results by origin region. Requires `origin` to be set and is validated against it.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "required": [
+            "metric"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "dimension",
-        "metric"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -887,110 +929,120 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/origins/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["origin", args["origin"], true],
-        ["metric", args["metric"], true],
-        ["region", args["region"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["origin", param(args, "query", "origin"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["region", param(args, "query", "region"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_origins_timeseries",
     title: "Get origin metrics time series",
-    description: "Retrieves the time series of origin metrics for the specified origin.",
+    description: "Retrieves the time series of origin metrics for the specified origin.\n\nGET /radar/origins/timeseries",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "metric": {
+              "description": "Specifies the metric to retrieve. Without a `region`, only `REQUESTS` or `CONNECTION_FAILURES` are available; specify a `region` to use the latency metrics.",
+              "enum": [
+                "CONNECTION_FAILURES",
+                "REQUESTS",
+                "RESPONSE_HEADER_RECEIVE_DURATION",
+                "TCP_HANDSHAKE_DURATION",
+                "TCP_RTT",
+                "TLS_HANDSHAKE_DURATION"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "origin": {
+              "description": "Filters results by origin.",
+              "items": {
+                "enum": [
+                  "AMAZON",
+                  "GOOGLE",
+                  "MICROSOFT",
+                  "ORACLE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "region": {
+              "description": "Filters results by origin region. Requires `origin` to be set and is validated against it.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "metric": {
-          "description": "Specifies the metric to retrieve. Without a `region`, only `REQUESTS` or `CONNECTION_FAILURES` are available; specify a `region` to use the latency metrics.",
-          "enum": [
-            "CONNECTION_FAILURES",
-            "REQUESTS",
-            "RESPONSE_HEADER_RECEIVE_DURATION",
-            "TCP_HANDSHAKE_DURATION",
-            "TCP_RTT",
-            "TLS_HANDSHAKE_DURATION"
+          "required": [
+            "origin",
+            "metric"
           ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "origin": {
-          "description": "Filters results by origin.",
-          "items": {
-            "enum": [
-              "AMAZON",
-              "GOOGLE",
-              "MICROSOFT",
-              "ORACLE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "region": {
-          "description": "Filters results by origin region. Requires `origin` to be set and is validated against it.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "origin",
-        "metric"
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1474,133 +1526,152 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/origins/timeseries`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["origin", args["origin"], true],
-        ["metric", args["metric"], true],
-        ["region", args["region"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["origin", param(args, "query", "origin"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["region", param(args, "query", "region"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_origins_timeseries_groups",
+    name: "radar_origins_timeseriesGroups",
     title: "Get origin metrics time series grouped by dimension",
-    description: "Retrieves the distribution of origin metrics grouped by the specified dimension over time.",
+    description: "Retrieves the distribution of origin metrics grouped by the specified dimension over time.\n\nGET /radar/origins/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the origin attribute by which to group the results. `ORIGIN` groups across all providers and does not accept an `origin` or `region`. `REGION` requires an `origin`. `SUCCESS_RATE` and `PERCENTILE` require both an `origin` and a `region` and constrain the `metric` (`SUCCESS_RATE` supports only `REQUESTS`; `PERCENTILE` supports any metric except `REQUESTS`). `limitPerGroup` is only supported on the `REGION` dimension.",
+              "enum": [
+                "ORIGIN",
+                "REGION",
+                "SUCCESS_RATE",
+                "PERCENTILE"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the origin attribute by which to group the results. `ORIGIN` groups across all providers and does not accept an `origin` or `region`. `REGION` requires an `origin`. `SUCCESS_RATE` and `PERCENTILE` require both an `origin` and a `region` and constrain the `metric` (`SUCCESS_RATE` supports only `REQUESTS`; `PERCENTILE` supports any metric except `REQUESTS`). `limitPerGroup` is only supported on the `REGION` dimension.",
-          "enum": [
-            "ORIGIN",
-            "REGION",
-            "SUCCESS_RATE",
-            "PERCENTILE"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "metric": {
-          "description": "Specifies the metric to retrieve. Allowed metrics depend on the selected dimension (see the `dimension` path parameter).",
-          "enum": [
-            "CONNECTION_FAILURES",
-            "REQUESTS",
-            "RESPONSE_HEADER_RECEIVE_DURATION",
-            "TCP_HANDSHAKE_DURATION",
-            "TCP_RTT",
-            "TLS_HANDSHAKE_DURATION"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "metric": {
+              "description": "Specifies the metric to retrieve. Allowed metrics depend on the selected dimension (see the `dimension` path parameter).",
+              "enum": [
+                "CONNECTION_FAILURES",
+                "REQUESTS",
+                "RESPONSE_HEADER_RECEIVE_DURATION",
+                "TCP_HANDSHAKE_DURATION",
+                "TCP_RTT",
+                "TLS_HANDSHAKE_DURATION"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "normalization": {
+              "default": "PERCENTAGE",
+              "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
+              "enum": [
+                "PERCENTAGE",
+                "MIN0_MAX"
+              ],
+              "type": "string"
+            },
+            "origin": {
+              "description": "Filters results by origin. Required for every dimension except `ORIGIN`; must not be set on the `ORIGIN` dimension, which groups across all providers.",
+              "items": {
+                "enum": [
+                  "AMAZON",
+                  "GOOGLE",
+                  "MICROSOFT",
+                  "ORACLE"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "region": {
+              "description": "Filters results by origin region. Requires `origin` to be set and is validated against it.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "normalization": {
-          "default": "PERCENTAGE",
-          "description": "Normalization method applied to the results. Refer to [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).",
-          "enum": [
-            "PERCENTAGE",
-            "MIN0_MAX"
+          "required": [
+            "metric"
           ],
-          "type": "string"
-        },
-        "origin": {
-          "description": "Filters results by origin. Required for every dimension except `ORIGIN`; must not be set on the `ORIGIN` dimension, which groups across all providers.",
-          "items": {
-            "enum": [
-              "AMAZON",
-              "GOOGLE",
-              "MICROSOFT",
-              "ORACLE"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "region": {
-          "description": "Filters results by origin region. Requires `origin` to be set and is validated against it.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension",
-        "metric"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2098,17 +2169,17 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/origins/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["origin", args["origin"], true],
-        ["metric", args["metric"], true],
-        ["region", args["region"], true],
-        ["normalization", args["normalization"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["origin", param(args, "query", "origin"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["region", param(args, "query", "region"), true],
+        ["normalization", param(args, "query", "normalization"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/postQuantum/origin/tools.ts b/src/generated/forge-mcp/radar/postQuantum/origin/tools.ts
index 9b89a8f22..085def8c2 100644
--- a/src/generated/forge-mcp/radar/postQuantum/origin/tools.ts
+++ b/src/generated/forge-mcp/radar/postQuantum/origin/tools.ts
@@ -1,68 +1,84 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
- * The tools of `radar.post_quantum.origin`.
+ * The tools of `radar.postQuantum.origin`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_post_quantum_origin_summary",
+    name: "radar_postQuantum_origin_summary",
     title: "Get Origin Post-Quantum Data Summary",
-    description: "Returns a summary of origin post-quantum data grouped by the specified dimension.",
+    description: "Returns a summary of origin post-quantum data grouped by the specified dimension.\n\nGET /radar/post_quantum/origin/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the origin post-quantum data dimension by which to group the results.",
+              "enum": [
+                "KEY_AGREEMENT"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the origin post-quantum data dimension by which to group the results.",
-          "enum": [
-            "KEY_AGREEMENT"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -494,70 +510,86 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/post_quantum/origin/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_post_quantum_origin_timeseries_groups",
+    name: "radar_postQuantum_origin_timeseriesGroups",
     title: "Get Origin Post-Quantum Data Over Time",
-    description: "Returns a timeseries of origin post-quantum data grouped by the specified dimension.",
+    description: "Returns a timeseries of origin post-quantum data grouped by the specified dimension.\n\nGET /radar/post_quantum/origin/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Specifies the origin post-quantum data dimension by which to group the results.",
+              "enum": [
+                "KEY_AGREEMENT"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Specifies the origin post-quantum data dimension by which to group the results.",
-          "enum": [
-            "KEY_AGREEMENT"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1041,11 +1073,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/post_quantum/origin/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/postQuantum/tls/tools.ts b/src/generated/forge-mcp/radar/postQuantum/tls/tools.ts
index d5af91b2a..407975d00 100644
--- a/src/generated/forge-mcp/radar/postQuantum/tls/tools.ts
+++ b/src/generated/forge-mcp/radar/postQuantum/tls/tools.ts
@@ -1,27 +1,37 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
- * The tools of `radar.post_quantum.tls`.
+ * The tools of `radar.postQuantum.tls`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_post_quantum_tls_support",
+    name: "radar_postQuantum_tls_support",
     title: "Check Post-Quantum TLS support",
-    description: "Tests whether a hostname or IP address supports Post-Quantum (PQ) TLS key exchange. Returns information about the negotiated key exchange algorithm, whether it uses PQ cryptography, and any detected TLS implementation bugs (Split ClientHello, HRR failure, etc.).",
+    description: "Tests whether a hostname or IP address supports Post-Quantum (PQ) TLS key exchange. Returns information about the negotiated key exchange algorithm, whether it uses PQ cryptography, and any detected TLS implementation bugs (Split ClientHello, HRR failure, etc.).\n\nGET /radar/post_quantum/tls/support",
     inputSchema: {
       type: "object",
       properties: {
-        "host": {
-          "description": "Hostname or IP address to test for Post-Quantum TLS support, optionally with port (defaults to 443).",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "host": {
+              "description": "Hostname or IP address to test for Post-Quantum TLS support, optionally with port (defaults to 443).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "host"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "host"
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -191,7 +201,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/post_quantum/tls/support`,
       query: [
-        ["host", args["host"], true],
+        ["host", param(args, "query", "host"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/quality/iqi/tools.ts b/src/generated/forge-mcp/radar/quality/iqi/tools.ts
index 680fe07b8..7e1189eb9 100644
--- a/src/generated/forge-mcp/radar/quality/iqi/tools.ts
+++ b/src/generated/forge-mcp/radar/quality/iqi/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.quality.iqi`.
@@ -10,82 +10,92 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_quality_iqi_summary",
     title: "Get Internet Quality Index (IQI) summary",
-    description: "Retrieves a summary (percentiles) of bandwidth, latency, or DNS response time from the Radar Internet Quality Index (IQI).",
+    description: "Retrieves a summary (percentiles) of bandwidth, latency, or DNS response time from the Radar Internet Quality Index (IQI).\n\nGET /radar/quality/iqi/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "metric": {
+              "description": "Defines which metric to return (bandwidth, latency, or DNS response time).",
+              "enum": [
+                "BANDWIDTH",
+                "DNS",
+                "LATENCY"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "metric": {
-          "description": "Defines which metric to return (bandwidth, latency, or DNS response time).",
-          "enum": [
-            "BANDWIDTH",
-            "DNS",
-            "LATENCY"
+          "required": [
+            "metric"
           ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "metric"
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -543,111 +553,121 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/quality/iqi/summary`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["metric", args["metric"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_quality_iqi_timeseries_groups",
+    name: "radar_quality_iqi_timeseriesGroups",
     title: "Get Internet Quality Index (IQI) time series",
-    description: "Retrieves a time series (percentiles) of bandwidth, latency, or DNS response time from the Radar Internet Quality Index (IQI).",
+    description: "Retrieves a time series (percentiles) of bandwidth, latency, or DNS response time from the Radar Internet Quality Index (IQI).\n\nGET /radar/quality/iqi/timeseries_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "interpolation": {
-          "description": "Enables interpolation for all series (using the average).",
-          "type": "boolean"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "interpolation": {
+              "description": "Enables interpolation for all series (using the average).",
+              "type": "boolean"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "metric": {
+              "description": "Defines which metric to return (bandwidth, latency, or DNS response time).",
+              "enum": [
+                "BANDWIDTH",
+                "DNS",
+                "LATENCY"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "metric": {
-          "description": "Defines which metric to return (bandwidth, latency, or DNS response time).",
-          "enum": [
-            "BANDWIDTH",
-            "DNS",
-            "LATENCY"
+          "required": [
+            "metric"
           ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "metric"
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1145,17 +1165,17 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/quality/iqi/timeseries_groups`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["interpolation", args["interpolation"], true],
-        ["metric", args["metric"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["interpolation", param(args, "query", "interpolation"), true],
+        ["metric", param(args, "query", "metric"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/quality/speed/tools.ts b/src/generated/forge-mcp/radar/quality/speed/tools.ts
index f93af5ed3..9220d201c 100644
--- a/src/generated/forge-mcp/radar/quality/speed/tools.ts
+++ b/src/generated/forge-mcp/radar/quality/speed/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.quality.speed`.
@@ -10,69 +10,76 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_quality_speed_histogram",
     title: "Get speed tests histogram",
-    description: "Retrieves a histogram from the previous 90 days of Cloudflare Speed Test data, split into fixed bandwidth (Mbps), latency (ms), or jitter (ms) buckets.",
+    description: "Retrieves a histogram from the previous 90 days of Cloudflare Speed Test data, split into fixed bandwidth (Mbps), latency (ms), or jitter (ms) buckets.\n\nGET /radar/quality/speed/histogram",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "bucket_size": {
-          "description": "Specifies the width for every bucket in the histogram.",
-          "type": "integer"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "metric_group": {
-          "default": "bandwidth",
-          "description": "Metrics to be returned.",
-          "enum": [
-            "BANDWIDTH",
-            "LATENCY",
-            "JITTER"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "bucketSize": {
+              "description": "Specifies the width for every bucket in the histogram.",
+              "type": "integer"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "metricGroup": {
+              "default": "bandwidth",
+              "description": "Metrics to be returned.",
+              "enum": [
+                "BANDWIDTH",
+                "LATENCY",
+                "JITTER"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -570,69 +577,76 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/quality/speed/histogram`,
       query: [
-        ["name", args["name"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["bucketSize", args["bucket_size"], true],
-        ["metricGroup", args["metric_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["bucketSize", param(args, "query", "bucketSize"), true],
+        ["metricGroup", param(args, "query", "metricGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_quality_speed_summary",
     title: "Get speed tests summary",
-    description: "Retrieves a summary of bandwidth, latency, jitter, and packet loss, from the previous 90 days of Cloudflare Speed Test data.",
+    description: "Retrieves a summary of bandwidth, latency, jitter, and packet loss, from the previous 90 days of Cloudflare Speed Test data.\n\nGET /radar/quality/speed/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1122,12 +1136,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/quality/speed/summary`,
       query: [
-        ["name", args["name"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/quality/speed/top/tools.ts b/src/generated/forge-mcp/radar/quality/speed/top/tools.ts
index ec13bdff2..c9cd2c373 100644
--- a/src/generated/forge-mcp/radar/quality/speed/top/tools.ts
+++ b/src/generated/forge-mcp/radar/quality/speed/top/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
  * The tools of `radar.quality.speed.top`.
@@ -10,77 +10,84 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_quality_speed_top_ases",
     title: "Get top ASes by speed test results",
-    description: "Retrieves the top autonomous systems by bandwidth, latency, jitter, or packet loss, from the previous 90 days of Cloudflare Speed Test data.",
+    description: "Retrieves the top autonomous systems by bandwidth, latency, jitter, or packet loss, from the previous 90 days of Cloudflare Speed Test data.\n\nGET /radar/quality/speed/top/ases",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "orderBy": {
+              "default": "BANDWIDTH_DOWNLOAD",
+              "description": "Specifies the metric to order the results by.",
+              "enum": [
+                "BANDWIDTH_DOWNLOAD",
+                "BANDWIDTH_UPLOAD",
+                "LATENCY_IDLE",
+                "LATENCY_LOADED",
+                "JITTER_IDLE",
+                "JITTER_LOADED"
+              ],
+              "type": "string"
+            },
+            "reverse": {
+              "description": "Reverses the order of results.",
+              "type": "boolean"
+            }
           },
-          "type": "array"
-        },
-        "order_by": {
-          "default": "BANDWIDTH_DOWNLOAD",
-          "description": "Specifies the metric to order the results by.",
-          "enum": [
-            "BANDWIDTH_DOWNLOAD",
-            "BANDWIDTH_UPLOAD",
-            "LATENCY_IDLE",
-            "LATENCY_LOADED",
-            "JITTER_IDLE",
-            "JITTER_LOADED"
-          ],
-          "type": "string"
-        },
-        "reverse": {
-          "description": "Reverses the order of results.",
-          "type": "boolean"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -595,92 +602,99 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/quality/speed/top/ases`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["orderBy", args["order_by"], true],
-        ["reverse", args["reverse"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
+        ["reverse", param(args, "query", "reverse"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_quality_speed_top_locations",
     title: "Get top locations by speed test results",
-    description: "Retrieves the top locations by bandwidth, latency, jitter, or packet loss, from the previous 90 days of Cloudflare Speed Test data.",
+    description: "Retrieves the top locations by bandwidth, latency, jitter, or packet loss, from the previous 90 days of Cloudflare Speed Test data.\n\nGET /radar/quality/speed/top/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "orderBy": {
+              "default": "BANDWIDTH_DOWNLOAD",
+              "description": "Specifies the metric to order the results by.",
+              "enum": [
+                "BANDWIDTH_DOWNLOAD",
+                "BANDWIDTH_UPLOAD",
+                "LATENCY_IDLE",
+                "LATENCY_LOADED",
+                "JITTER_IDLE",
+                "JITTER_LOADED"
+              ],
+              "type": "string"
+            },
+            "reverse": {
+              "description": "Reverses the order of results.",
+              "type": "boolean"
+            }
           },
-          "type": "array"
-        },
-        "order_by": {
-          "default": "BANDWIDTH_DOWNLOAD",
-          "description": "Specifies the metric to order the results by.",
-          "enum": [
-            "BANDWIDTH_DOWNLOAD",
-            "BANDWIDTH_UPLOAD",
-            "LATENCY_IDLE",
-            "LATENCY_LOADED",
-            "JITTER_IDLE",
-            "JITTER_LOADED"
-          ],
-          "type": "string"
-        },
-        "reverse": {
-          "description": "Reverses the order of results.",
-          "type": "boolean"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1195,15 +1209,15 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/quality/speed/top/locations`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["orderBy", args["order_by"], true],
-        ["reverse", args["reverse"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["orderBy", param(args, "query", "orderBy"), true],
+        ["reverse", param(args, "query", "reverse"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ranking/domain/tools.ts b/src/generated/forge-mcp/radar/ranking/domain/tools.ts
index b13fd0c1a..9cd037d59 100644
--- a/src/generated/forge-mcp/radar/ranking/domain/tools.ts
+++ b/src/generated/forge-mcp/radar/ranking/domain/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.ranking.domain`.
@@ -10,60 +10,76 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_ranking_domain_get",
     title: "Get domain rank details",
-    description: "Retrieves domain rank details. Cloudflare provides an ordered rank for the top 100 domains, but for the remainder it only provides ranking buckets like top 200 thousand, top one million, etc.. These are available through Radar datasets endpoints.",
+    description: "Retrieves domain rank details. Cloudflare provides an ordered rank for the top 100 domains, but for the remainder it only provides ranking buckets like top 200 thousand, top one million, etc.. These are available through Radar datasets endpoints.\n\nGET /radar/ranking/domain/{domain}",
     inputSchema: {
       type: "object",
       properties: {
-        "date": {
-          "description": "Filters results by the specified array of dates.",
-          "items": {
-            "format": "date",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "domain": {
+              "description": "Domain name.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "domain": {
-          "description": "Domain name.",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "domain"
           ],
-          "type": "string"
-        },
-        "include_top_locations": {
-          "description": "Includes top locations in the response.",
-          "type": "boolean"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
+          "type": "object"
         },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "date": {
+              "description": "Filters results by the specified array of dates.",
+              "items": {
+                "format": "date",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "includeTopLocations": {
+              "description": "Includes top locations in the response.",
+              "type": "boolean"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "rankingType": {
+              "default": "POPULAR",
+              "description": "The ranking type.",
+              "enum": [
+                "POPULAR",
+                "TRENDING_RISE",
+                "TRENDING_STEADY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "ranking_type": {
-          "default": "POPULAR",
-          "description": "The ranking type.",
-          "enum": [
-            "POPULAR",
-            "TRENDING_RISE",
-            "TRENDING_STEADY"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "domain"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -337,12 +353,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ranking/domain/${pathParam(args, "domain")}`,
       query: [
-        ["limit", args["limit"], true],
-        ["rankingType", args["ranking_type"], true],
-        ["name", args["name"], true],
-        ["includeTopLocations", args["include_top_locations"], true],
-        ["date", args["date"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["rankingType", param(args, "query", "rankingType"), true],
+        ["name", param(args, "query", "name"), true],
+        ["includeTopLocations", param(args, "query", "includeTopLocations"), true],
+        ["date", param(args, "query", "date"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ranking/internetServices/tools.ts b/src/generated/forge-mcp/radar/ranking/internetServices/tools.ts
index c6a2c1b65..0fb403097 100644
--- a/src/generated/forge-mcp/radar/ranking/internetServices/tools.ts
+++ b/src/generated/forge-mcp/radar/ranking/internetServices/tools.ts
@@ -1,47 +1,54 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
- * The tools of `radar.ranking.internet_services`.
+ * The tools of `radar.ranking.internetServices`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_ranking_internet_services_categories",
+    name: "radar_ranking_internetServices_categories",
     title: "List Internet services categories",
-    description: "Retrieves the list of Internet services categories.",
+    description: "Retrieves the list of Internet services categories.\n\nGET /radar/ranking/internet_services/categories",
     inputSchema: {
       type: "object",
       properties: {
-        "date": {
-          "description": "Filters results by the specified array of dates.",
-          "items": {
-            "format": "date",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "date": {
+              "description": "Filters results by the specified array of dates.",
+              "items": {
+                "format": "date",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -169,71 +176,78 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ranking/internet_services/categories`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["date", args["date"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["date", param(args, "query", "date"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_ranking_internet_services_timeseries_groups",
+    name: "radar_ranking_internetServices_timeseriesGroups",
     title: "Get Internet services rank time series",
-    description: "Retrieves Internet Services rank update changes over time.",
+    description: "Retrieves Internet Services rank update changes over time.\n\nGET /radar/ranking/internet_services/timeseries_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "service_category": {
-          "description": "Filters results by Internet service category.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "serviceCategory": {
+              "description": "Filters results by Internet service category.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -731,58 +745,65 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ranking/internet_services/timeseries_groups`,
       query: [
-        ["serviceCategory", args["service_category"], true],
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["format", args["format"], true],
+        ["serviceCategory", param(args, "query", "serviceCategory"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_ranking_internet_services_top",
+    name: "radar_ranking_internetServices_top",
     title: "Get top Internet services",
-    description: "Retrieves top Internet services based on their rank.",
+    description: "Retrieves top Internet services based on their rank.\n\nGET /radar/ranking/internet_services/top",
     inputSchema: {
       type: "object",
       properties: {
-        "date": {
-          "description": "Filters results by the specified array of dates.",
-          "items": {
-            "format": "date",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "service_category": {
-          "description": "Filters results by Internet service category.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "date": {
+              "description": "Filters results by the specified array of dates.",
+              "items": {
+                "format": "date",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "serviceCategory": {
+              "description": "Filters results by Internet service category.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1286,11 +1307,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ranking/internet_services/top`,
       query: [
-        ["serviceCategory", args["service_category"], true],
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["date", args["date"], true],
-        ["format", args["format"], true],
+        ["serviceCategory", param(args, "query", "serviceCategory"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["date", param(args, "query", "date"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/ranking/tools.ts b/src/generated/forge-mcp/radar/ranking/tools.ts
index 8b9c00040..46fee4a07 100644
--- a/src/generated/forge-mcp/radar/ranking/tools.ts
+++ b/src/generated/forge-mcp/radar/ranking/tools.ts
@@ -1,94 +1,101 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../_/tool.js";
+import { type Tool, param } from "../../_/tool.js";
 
 /**
  * The tools of `radar.ranking`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_ranking_timeseries_groups",
+    name: "radar_ranking_timeseriesGroups",
     title: "Get domains rank time series",
-    description: "Retrieves domains rank over time.",
+    description: "Retrieves domains rank over time.\n\nGET /radar/ranking/timeseries_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "domain_category": {
-          "description": "Filters results by domain category.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "domains": {
-          "description": "Filters results by domain name. Specify a comma-separated list of domain names.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "domainCategory": {
+              "description": "Filters results by domain category.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "domains": {
+              "description": "Filters results by domain name. Specify a comma-separated list of domain names.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "rankingType": {
+              "default": "POPULAR",
+              "description": "The ranking type.",
+              "enum": [
+                "POPULAR",
+                "TRENDING_RISE",
+                "TRENDING_STEADY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "ranking_type": {
-          "default": "POPULAR",
-          "description": "The ranking type.",
-          "enum": [
-            "POPULAR",
-            "TRENDING_RISE",
-            "TRENDING_STEADY"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -586,78 +593,85 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ranking/timeseries_groups`,
       query: [
-        ["limit", args["limit"], true],
-        ["rankingType", args["ranking_type"], true],
-        ["name", args["name"], true],
-        ["location", args["location"], true],
-        ["domains", args["domains"], true],
-        ["domainCategory", args["domain_category"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["rankingType", param(args, "query", "rankingType"), true],
+        ["name", param(args, "query", "name"), true],
+        ["location", param(args, "query", "location"), true],
+        ["domains", param(args, "query", "domains"), true],
+        ["domainCategory", param(args, "query", "domainCategory"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_ranking_top",
     title: "Get top or trending domains",
-    description: "Retrieves the top or trending domains based on their rank. Popular domains are domains of broad appeal based on how people use the Internet. Trending domains are domains that are generating a surge in interest. For more information on top domains, see https://blog.cloudflare.com/radar-domain-rankings/.",
+    description: "Retrieves the top or trending domains based on their rank. Popular domains are domains of broad appeal based on how people use the Internet. Trending domains are domains that are generating a surge in interest. For more information on top domains, see https://blog.cloudflare.com/radar-domain-rankings/.\n\nGET /radar/ranking/top",
     inputSchema: {
       type: "object",
       properties: {
-        "date": {
-          "description": "Filters results by the specified array of dates.",
-          "items": {
-            "format": "date",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "domain_category": {
-          "description": "Filters results by domain category.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "date": {
+              "description": "Filters results by the specified array of dates.",
+              "items": {
+                "format": "date",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "domainCategory": {
+              "description": "Filters results by domain category.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 location codes.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "rankingType": {
+              "default": "POPULAR",
+              "description": "The ranking type.",
+              "enum": [
+                "POPULAR",
+                "TRENDING_RISE",
+                "TRENDING_STEADY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "ranking_type": {
-          "default": "POPULAR",
-          "description": "The ranking type.",
-          "enum": [
-            "POPULAR",
-            "TRENDING_RISE",
-            "TRENDING_STEADY"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1205,13 +1219,13 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/ranking/top`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["location", args["location"], true],
-        ["domainCategory", args["domain_category"], true],
-        ["date", args["date"], true],
-        ["rankingType", args["ranking_type"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["location", param(args, "query", "location"), true],
+        ["domainCategory", param(args, "query", "domainCategory"), true],
+        ["date", param(args, "query", "date"), true],
+        ["rankingType", param(args, "query", "rankingType"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/robotsTxt/top/tools.ts b/src/generated/forge-mcp/radar/robotsTxt/top/tools.ts
index c65769333..9c96d547d 100644
--- a/src/generated/forge-mcp/radar/robotsTxt/top/tools.ts
+++ b/src/generated/forge-mcp/radar/robotsTxt/top/tools.ts
@@ -1,56 +1,63 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
- * The tools of `radar.robots_txt.top`.
+ * The tools of `radar.robotsTxt.top`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_robots_txt_top_domain_categories",
+    name: "radar_robotsTxt_top_domainCategories",
     title: "Get top domain categories by robots.txt files parsed",
-    description: "Retrieves the top domain categories by the number of robots.txt files parsed.",
+    description: "Retrieves the top domain categories by the number of robots.txt files parsed.\n\nGET /radar/robots_txt/top/domain_categories",
     inputSchema: {
       type: "object",
       properties: {
-        "date": {
-          "description": "Filters results by the specified array of dates.",
-          "items": {
-            "format": "date",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "date": {
+              "description": "Filters results by the specified array of dates.",
+              "items": {
+                "format": "date",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "userAgentCategory": {
+              "default": "AI",
+              "description": "Filters results by user agent category.",
+              "enum": [
+                "AI"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "user_agent_category": {
-          "default": "AI",
-          "description": "Filters results by user agent category.",
-          "enum": [
-            "AI"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -501,11 +508,11 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/robots_txt/top/domain_categories`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["userAgentCategory", args["user_agent_category"], true],
-        ["date", args["date"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["userAgentCategory", param(args, "query", "userAgentCategory"), true],
+        ["date", param(args, "query", "date"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/robotsTxt/top/userAgents/tools.ts b/src/generated/forge-mcp/radar/robotsTxt/top/userAgents/tools.ts
index 585b44c79..ba27f7ded 100644
--- a/src/generated/forge-mcp/radar/robotsTxt/top/userAgents/tools.ts
+++ b/src/generated/forge-mcp/radar/robotsTxt/top/userAgents/tools.ts
@@ -1,71 +1,78 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 
 /**
- * The tools of `radar.robots_txt.top.user_agents`.
+ * The tools of `radar.robotsTxt.top.userAgents`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_robots_txt_top_user_agents_directive",
+    name: "radar_robotsTxt_top_userAgents_directive",
     title: "Get top user agents on robots.txt files",
-    description: "Retrieves the top user agents on robots.txt files.",
+    description: "Retrieves the top user agents on robots.txt files.\n\nGET /radar/robots_txt/top/user_agents/directive",
     inputSchema: {
       type: "object",
       properties: {
-        "date": {
-          "description": "Filters results by the specified array of dates.",
-          "items": {
-            "format": "date",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "directive": {
-          "description": "Filters results by robots.txt directive.",
-          "enum": [
-            "ALLOW",
-            "DISALLOW"
-          ],
-          "type": "string"
-        },
-        "domain_category": {
-          "description": "Filters results by domain category.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "date": {
+              "description": "Filters results by the specified array of dates.",
+              "items": {
+                "format": "date",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "directive": {
+              "description": "Filters results by robots.txt directive.",
+              "enum": [
+                "ALLOW",
+                "DISALLOW"
+              ],
+              "type": "string"
+            },
+            "domainCategory": {
+              "description": "Filters results by domain category.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "userAgentCategory": {
+              "default": "AI",
+              "description": "Filters results by user agent category.",
+              "enum": [
+                "AI"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "user_agent_category": {
-          "default": "AI",
-          "description": "Filters results by user agent category.",
-          "enum": [
-            "AI"
-          ],
-          "type": "string"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -528,13 +535,13 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/robots_txt/top/user_agents/directive`,
       query: [
-        ["limit", args["limit"], true],
-        ["name", args["name"], true],
-        ["userAgentCategory", args["user_agent_category"], true],
-        ["date", args["date"], true],
-        ["domainCategory", args["domain_category"], true],
-        ["directive", args["directive"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["name", param(args, "query", "name"), true],
+        ["userAgentCategory", param(args, "query", "userAgentCategory"), true],
+        ["date", param(args, "query", "date"), true],
+        ["domainCategory", param(args, "query", "domainCategory"), true],
+        ["directive", param(args, "query", "directive"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/search/tools.ts b/src/generated/forge-mcp/radar/search/tools.ts
index d49b06fe3..4ab50db9c 100644
--- a/src/generated/forge-mcp/radar/search/tools.ts
+++ b/src/generated/forge-mcp/radar/search/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../_/tool.js";
+import { type Tool, param } from "../../_/tool.js";
 
 /**
  * The tools of `radar.search`.
@@ -10,77 +10,87 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_search_global",
     title: "Search for locations, ASes, reports, and more",
-    description: "Searches for locations, autonomous systems, reports, bots, certificate logs, certificate authorities, industries and verticals. Location names can be localized by sending an `Accept-Language` HTTP header with a BCP 47 language tag (e.g., `Accept-Language: pt-PT`). The full quality-value chain is supported (e.g., `pt-PT,pt;q=0.9,en;q=0.8`).",
+    description: "Searches for locations, autonomous systems, reports, bots, certificate logs, certificate authorities, industries and verticals. Location names can be localized by sending an `Accept-Language` HTTP header with a BCP 47 language tag (e.g., `Accept-Language: pt-PT`). The full quality-value chain is supported (e.g., `pt-PT,pt;q=0.9,en;q=0.8`).\n\nGET /radar/search/global",
     inputSchema: {
       type: "object",
       properties: {
-        "exclude": {
-          "description": "Search types excluded from results.",
-          "items": {
-            "enum": [
-              "ADM1S",
-              "ASNS",
-              "BOTS",
-              "CERTIFICATE_AUTHORITIES",
-              "CERTIFICATE_LOGS",
-              "ORIGINS",
-              "ORIGIN_REGIONS",
-              "INDUSTRIES",
-              "LOCATIONS",
-              "NOTEBOOKS",
-              "TLDS",
-              "VERTICALS"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "exclude": {
+              "description": "Search types excluded from results.",
+              "items": {
+                "enum": [
+                  "ADM1S",
+                  "ASNS",
+                  "BOTS",
+                  "CERTIFICATE_AUTHORITIES",
+                  "CERTIFICATE_LOGS",
+                  "ORIGINS",
+                  "ORIGIN_REGIONS",
+                  "INDUSTRIES",
+                  "LOCATIONS",
+                  "NOTEBOOKS",
+                  "TLDS",
+                  "VERTICALS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "include": {
+              "description": "Search types included in results.",
+              "items": {
+                "enum": [
+                  "ADM1S",
+                  "ASNS",
+                  "BOTS",
+                  "CERTIFICATE_AUTHORITIES",
+                  "CERTIFICATE_LOGS",
+                  "ORIGINS",
+                  "ORIGIN_REGIONS",
+                  "INDUSTRIES",
+                  "LOCATIONS",
+                  "NOTEBOOKS",
+                  "TLDS",
+                  "VERTICALS"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per search category.",
+              "type": "number"
+            },
+            "query": {
+              "description": "String used to perform the search operation.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "query"
           ],
-          "type": "string"
-        },
-        "include": {
-          "description": "Search types included in results.",
-          "items": {
-            "enum": [
-              "ADM1S",
-              "ASNS",
-              "BOTS",
-              "CERTIFICATE_AUTHORITIES",
-              "CERTIFICATE_LOGS",
-              "ORIGINS",
-              "ORIGIN_REGIONS",
-              "INDUSTRIES",
-              "LOCATIONS",
-              "NOTEBOOKS",
-              "TLDS",
-              "VERTICALS"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per search category.",
-          "type": "number"
-        },
-        "query": {
-          "description": "String used to perform the search operation.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
         "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -224,12 +234,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/search/global`,
       query: [
-        ["limit", args["limit"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["query", args["query"], true],
-        ["include", args["include"], true],
-        ["exclude", args["exclude"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["query", param(args, "query", "query"), true],
+        ["include", param(args, "query", "include"), true],
+        ["exclude", param(args, "query", "exclude"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/tcpResetsTimeouts/tools.ts b/src/generated/forge-mcp/radar/tcpResetsTimeouts/tools.ts
index 907772901..d14894482 100644
--- a/src/generated/forge-mcp/radar/tcpResetsTimeouts/tools.ts
+++ b/src/generated/forge-mcp/radar/tcpResetsTimeouts/tools.ts
@@ -1,79 +1,86 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../_/tool.js";
+import { type Tool, param } from "../../_/tool.js";
 
 /**
- * The tools of `radar.tcp_resets_timeouts`.
+ * The tools of `radar.tcpResetsTimeouts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_tcp_resets_timeouts_summary",
+    name: "radar_tcpResetsTimeouts_summary",
     title: "Get TCP resets and timeouts summary",
-    description: "Retrieves the distribution of connection stage by TCP connections terminated within the first 10 packets by a reset or timeout.",
+    description: "Retrieves the distribution of connection stage by TCP connections terminated within the first 10 packets by a reset or timeout.\n\nGET /radar/tcp_resets_timeouts/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -547,94 +554,101 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/tcp_resets_timeouts/summary`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_tcp_resets_timeouts_timeseries_groups",
+    name: "radar_tcpResetsTimeouts_timeseriesGroups",
     title: "Get TCP resets and timeouts time series",
-    description: "Retrieves the distribution of connection stage by TCP connections terminated within the first 10 packets by a reset or timeout over time.",
+    description: "Retrieves the distribution of connection stage by TCP connections terminated within the first 10 packets by a reset or timeout over time.\n\nGET /radar/tcp_resets_timeouts/timeseries_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes results from AS174, but includes results from AS3356.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1176,15 +1190,15 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/tcp_resets_timeouts/timeseries_groups`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/tlds/performance/tools.ts b/src/generated/forge-mcp/radar/tlds/performance/tools.ts
index e539f6c75..104760554 100644
--- a/src/generated/forge-mcp/radar/tlds/performance/tools.ts
+++ b/src/generated/forge-mcp/radar/tlds/performance/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `radar.tlds.performance`.
@@ -10,90 +10,106 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_tlds_performance_summary",
     title: "Get TLD Performance Summary",
-    description: "Returns a summary of TLD authoritative nameserver performance grouped by the specified dimension.",
+    description: "Returns a summary of TLD authoritative nameserver performance grouped by the specified dimension.\n\nGET /radar/tlds/performance/summary/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Dimension to summarize TLD nameserver latency by.",
+              "enum": [
+                "LATENCY",
+                "NAMESERVER_LATENCY",
+                "LOCATION_LATENCY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Dimension to summarize TLD nameserver latency by.",
-          "enum": [
-            "LATENCY",
-            "NAMESERVER_LATENCY",
-            "LOCATION_LATENCY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "nameserver": {
-          "description": "Filters results by nameserver hostname.",
-          "type": "string"
+          "type": "object"
         },
-        "tld": {
-          "description": "Filters results by top-level domain.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "nameserver": {
+              "description": "Filters results by nameserver hostname.",
+              "type": "string"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -525,116 +541,132 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/tlds/performance/summary/${pathParam(args, "dimension")}`,
       query: [
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["tld", args["tld"], true],
-        ["nameserver", args["nameserver"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["nameserver", param(args, "query", "nameserver"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_tlds_performance_timeseries_groups",
+    name: "radar_tlds_performance_timeseriesGroups",
     title: "Get TLD Performance Over Time",
-    description: "Returns a timeseries of TLD authoritative nameserver performance grouped by the specified dimension.",
+    description: "Returns a timeseries of TLD authoritative nameserver performance grouped by the specified dimension.\n\nGET /radar/tlds/performance/timeseries_groups/{dimension}",
     inputSchema: {
       type: "object",
       properties: {
-        "agg_interval": {
-          "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
-          "enum": [
-            "15m",
-            "1h",
-            "1d",
-            "1w"
-          ],
-          "type": "string"
-        },
-        "continent": {
-          "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_range": {
-          "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "date_start": {
-          "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
-          "items": {
-            "format": "date-time",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "dimension": {
+              "description": "Dimension for the TLD nameserver latency timeseries.",
+              "enum": [
+                "LATENCY",
+                "NAMESERVER_LATENCY",
+                "LOCATION_LATENCY"
+              ],
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "dimension": {
-          "description": "Dimension for the TLD nameserver latency timeseries.",
-          "enum": [
-            "LATENCY",
-            "NAMESERVER_LATENCY",
-            "LOCATION_LATENCY"
-          ],
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+          "required": [
+            "dimension"
           ],
-          "type": "string"
-        },
-        "limit_per_group": {
-          "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "name": {
-          "description": "Array of names used to label the series in the response.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "nameserver": {
-          "description": "Filters results by nameserver hostname.",
-          "type": "string"
+          "type": "object"
         },
-        "tld": {
-          "description": "Filters results by top-level domain.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aggInterval": {
+              "description": "Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals). Refer to [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/). When omitted, the interval is auto-selected from the requested date range; finer intervals are only available for shorter ranges. If the requested interval is too granular for the date range, the request is rejected.",
+              "enum": [
+                "15m",
+                "1h",
+                "1d",
+                "1w"
+              ],
+              "type": "string"
+            },
+            "continent": {
+              "description": "Filters results by continent. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude continents from results. For example, `-EU,NA` excludes results from EU, but includes results from NA.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateRange": {
+              "description": "Filters results by relative date range ending at the current time, with each value producing a separate series. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`). Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `7dcontrol` covers days -14 to -7, `10dcontrol` covers days -24 to -14). For example, pass `7d` and `7dcontrol` to compare this week with the previous week. All series must resolve to the same duration as the main series; relative ranges (including `control`) satisfy this automatically. Use this parameter or set specific start and end dates (`dateStart` and `dateEnd` parameters).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "dateStart": {
+              "description": "Start of the date range. Alternative to `dateRange`; provide together with `dateEnd`. When requesting comparison series, every series must resolve to the same duration as the main series. Each `dateStart`/`dateEnd` is floored to the nearest 15 minutes before evaluation, so windows whose durations match only before alignment may be rejected.",
+              "items": {
+                "format": "date-time",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limitPerGroup": {
+              "description": "Limits the number of objects per group to the top items within the specified time range. When item count exceeds the limit, extra items appear grouped under an \"other\" category. Only supported on high-cardinality dimensions; otherwise the request is rejected. Minimum value is 2.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude locations from results. For example, `-US,PT` excludes results from the US, but includes results from PT.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "name": {
+              "description": "Array of names used to label the series in the response.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "nameserver": {
+              "description": "Filters results by nameserver hostname.",
+              "type": "string"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "dimension"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1132,17 +1164,17 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/tlds/performance/timeseries_groups/${pathParam(args, "dimension")}`,
       query: [
-        ["aggInterval", args["agg_interval"], true],
-        ["name", args["name"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["location", args["location"], true],
-        ["continent", args["continent"], true],
-        ["tld", args["tld"], true],
-        ["nameserver", args["nameserver"], true],
-        ["limitPerGroup", args["limit_per_group"], true],
-        ["format", args["format"], true],
+        ["aggInterval", param(args, "query", "aggInterval"), true],
+        ["name", param(args, "query", "name"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["location", param(args, "query", "location"), true],
+        ["continent", param(args, "query", "continent"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["nameserver", param(args, "query", "nameserver"), true],
+        ["limitPerGroup", param(args, "query", "limitPerGroup"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/tlds/tools.ts b/src/generated/forge-mcp/radar/tlds/tools.ts
index 7e513e97f..3b16abefc 100644
--- a/src/generated/forge-mcp/radar/tlds/tools.ts
+++ b/src/generated/forge-mcp/radar/tlds/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `radar.tlds`.
@@ -10,26 +10,42 @@ export const tools: readonly Tool[] = [
   {
     name: "radar_tlds_get",
     title: "Get TLD details",
-    description: "Retrieves the requested TLD information.",
+    description: "Retrieves the requested TLD information.\n\nGET /radar/tlds/{tld}",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "tld": {
+              "description": "Top-level domain.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "tld"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tld": {
-          "description": "Top-level domain.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "tld"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -148,54 +164,61 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/tlds/${pathParam(args, "tld")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
     name: "radar_tlds_list",
     title: "List TLDs",
-    description: "Retrieves a list of TLDs.",
+    description: "Retrieves a list of TLDs.\n\nGET /radar/tlds",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
-        },
-        "tld": {
-          "description": "Filters results by top-level domain. Specify a comma-separated list of TLDs.",
-          "type": "string"
-        },
-        "tld_manager": {
-          "description": "Filters results by TLD manager.",
-          "type": "string"
-        },
-        "tld_type": {
-          "description": "Filters results by TLD type.",
-          "enum": [
-            "GENERIC",
-            "COUNTRY_CODE",
-            "GENERIC_RESTRICTED",
-            "INFRASTRUCTURE",
-            "SPONSORED"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            },
+            "tld": {
+              "description": "Filters results by top-level domain. Specify a comma-separated list of TLDs.",
+              "type": "string"
+            },
+            "tldManager": {
+              "description": "Filters results by TLD manager.",
+              "type": "string"
+            },
+            "tldType": {
+              "description": "Filters results by TLD type.",
+              "enum": [
+                "GENERIC",
+                "COUNTRY_CODE",
+                "GENERIC_RESTRICTED",
+                "INFRASTRUCTURE",
+                "SPONSORED"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -339,12 +362,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/tlds`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["tldManager", args["tld_manager"], true],
-        ["tldType", args["tld_type"], true],
-        ["tld", args["tld"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["tldManager", param(args, "query", "tldManager"), true],
+        ["tldType", param(args, "query", "tldType"), true],
+        ["tld", param(args, "query", "tld"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/trafficAnomalies/locations/tools.ts b/src/generated/forge-mcp/radar/trafficAnomalies/locations/tools.ts
index 52f0a4835..4ea47a6e3 100644
--- a/src/generated/forge-mcp/radar/trafficAnomalies/locations/tools.ts
+++ b/src/generated/forge-mcp/radar/trafficAnomalies/locations/tools.ts
@@ -1,54 +1,61 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 
 /**
- * The tools of `radar.traffic_anomalies.locations`.
+ * The tools of `radar.trafficAnomalies.locations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_traffic_anomalies_locations_get",
+    name: "radar_trafficAnomalies_locations_get",
     title: "Get top locations by total traffic anomalies",
-    description: "Retrieves the sum of Internet traffic anomalies, grouped by location. These anomalies are signals that might indicate an outage, automatically detected by Radar and manually verified by our team.",
+    description: "Retrieves the sum of Internet traffic anomalies, grouped by location. These anomalies are signals that might indicate an outage, automatically detected by Radar and manually verified by our team.\n\nGET /radar/traffic_anomalies/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_range": {
-          "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "status": {
-          "enum": [
-            "VERIFIED",
-            "UNVERIFIED"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateRange": {
+              "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "status": {
+              "enum": [
+                "VERIFIED",
+                "UNVERIFIED"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -192,12 +199,12 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/traffic_anomalies/locations`,
       query: [
-        ["limit", args["limit"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["status", args["status"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["status", param(args, "query", "status"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/radar/trafficAnomalies/tools.ts b/src/generated/forge-mcp/radar/trafficAnomalies/tools.ts
index d35e03605..303dba48f 100644
--- a/src/generated/forge-mcp/radar/trafficAnomalies/tools.ts
+++ b/src/generated/forge-mcp/radar/trafficAnomalies/tools.ts
@@ -1,113 +1,120 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `radar.traffic_anomalies`.
+ * The tools of `radar.trafficAnomalies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "radar_traffic_anomalies_get",
+    name: "radar_trafficAnomalies_get",
     title: "Get latest Internet traffic anomalies",
-    description: "Retrieves the latest Internet traffic anomalies, which are signals that might indicate an outage. These alerts are automatically detected by Radar and manually verified by our team.",
+    description: "Retrieves the latest Internet traffic anomalies, which are signals that might indicate an outage. These alerts are automatically detected by Radar and manually verified by our team.\n\nGET /radar/traffic_anomalies",
     inputSchema: {
       type: "object",
       properties: {
-        "asn": {
-          "description": "Filters results by Autonomous System. Specify a single Autonomous System Number (ASN) as integer.",
-          "type": "integer"
-        },
-        "data_source": {
-          "description": "Filters results by data source.",
-          "enum": [
-            "ALL",
-            "AI_BOTS",
-            "AI_GATEWAY",
-            "BGP",
-            "BOTS",
-            "CONNECTION_ANOMALY",
-            "CT",
-            "DNS",
-            "DNS_MAGNITUDE",
-            "DNS_AS112",
-            "DOS",
-            "EMAIL_ROUTING",
-            "EMAIL_SECURITY",
-            "FW",
-            "FW_PG",
-            "HTTP",
-            "HTTP_CONTROL",
-            "HTTP_CRAWLER_REFERER",
-            "HTTP_ORIGINS",
-            "IQI",
-            "LEAKED_CREDENTIALS",
-            "NET",
-            "ROBOTS_TXT",
-            "SPEED",
-            "WORKERS_AI"
-          ],
-          "type": "string"
-        },
-        "date_end": {
-          "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "date_range": {
-          "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
-          "type": "string"
-        },
-        "date_start": {
-          "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 5,
-          "description": "Limits the number of objects returned in the response.",
-          "type": "integer"
-        },
-        "location": {
-          "description": "Filters results by location. Specify an alpha-2 location code.",
-          "type": "string"
-        },
-        "offset": {
-          "description": "Skips the specified number of objects before fetching the results.",
-          "type": "integer"
-        },
-        "origin": {
-          "description": "Filters results by origin.",
-          "type": "string"
-        },
-        "status": {
-          "enum": [
-            "VERIFIED",
-            "UNVERIFIED"
-          ],
-          "type": "string"
-        },
-        "type": {
-          "description": "Filters results by entity type (LOCATION, AS, or ORIGIN).",
-          "items": {
-            "enum": [
-              "LOCATION",
-              "AS",
-              "ORIGIN"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asn": {
+              "description": "Filters results by Autonomous System. Specify a single Autonomous System Number (ASN) as integer.",
+              "type": "integer"
+            },
+            "dataSource": {
+              "description": "Filters results by data source.",
+              "enum": [
+                "ALL",
+                "AI_BOTS",
+                "AI_GATEWAY",
+                "BGP",
+                "BOTS",
+                "CONNECTION_ANOMALY",
+                "CT",
+                "DNS",
+                "DNS_MAGNITUDE",
+                "DNS_AS112",
+                "DOS",
+                "EMAIL_ROUTING",
+                "EMAIL_SECURITY",
+                "FW",
+                "FW_PG",
+                "HTTP",
+                "HTTP_CONTROL",
+                "HTTP_CRAWLER_REFERER",
+                "HTTP_ORIGINS",
+                "IQI",
+                "LEAKED_CREDENTIALS",
+                "NET",
+                "ROBOTS_TXT",
+                "SPEED",
+                "WORKERS_AI"
+              ],
+              "type": "string"
+            },
+            "dateEnd": {
+              "description": "End of the date range (inclusive). Alternative to `dateRange`; provide together with `dateStart`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "dateRange": {
+              "description": "Filters results by a relative date range ending at the current time. Use `<n>d` for days (up to `364d`) or `<n>w` for weeks (up to `52w`), e.g. `7d`. Append `control` to request the equivalent previous period for comparison: the comparison window is shifted back by the current window's length rounded up to a whole number of weeks, so it keeps the same weekday alignment and does not overlap the current window (e.g. `3dcontrol` covers days -10 to -7, `7dcontrol` covers days -14 to -7, `28dcontrol` covers days -56 to -28, and `10dcontrol` covers days -24 to -14). Mutually exclusive with `dateStart`/`dateEnd`.",
+              "type": "string"
+            },
+            "dateStart": {
+              "description": "Start of the date range (inclusive). Alternative to `dateRange`; provide together with `dateEnd`.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 5,
+              "description": "Limits the number of objects returned in the response.",
+              "type": "integer"
+            },
+            "location": {
+              "description": "Filters results by location. Specify an alpha-2 location code.",
+              "type": "string"
+            },
+            "offset": {
+              "description": "Skips the specified number of objects before fetching the results.",
+              "type": "integer"
+            },
+            "origin": {
+              "description": "Filters results by origin.",
+              "type": "string"
+            },
+            "status": {
+              "enum": [
+                "VERIFIED",
+                "UNVERIFIED"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "description": "Filters results by entity type (LOCATION, AS, or ORIGIN).",
+              "items": {
+                "enum": [
+                  "LOCATION",
+                  "AS",
+                  "ORIGIN"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -547,44 +554,60 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/traffic_anomalies`,
       query: [
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
-        ["dateRange", args["date_range"], true],
-        ["dateStart", args["date_start"], true],
-        ["dateEnd", args["date_end"], true],
-        ["status", args["status"], true],
-        ["type", args["type"], true],
-        ["dataSource", args["data_source"], true],
-        ["asn", args["asn"], true],
-        ["location", args["location"], true],
-        ["origin", args["origin"], true],
-        ["format", args["format"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
+        ["dateRange", param(args, "query", "dateRange"), true],
+        ["dateStart", param(args, "query", "dateStart"), true],
+        ["dateEnd", param(args, "query", "dateEnd"), true],
+        ["status", param(args, "query", "status"), true],
+        ["type", param(args, "query", "type"), true],
+        ["dataSource", param(args, "query", "dataSource"), true],
+        ["asn", param(args, "query", "asn"), true],
+        ["location", param(args, "query", "location"), true],
+        ["origin", param(args, "query", "origin"), true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
   {
-    name: "radar_traffic_anomalies_get_by_id",
+    name: "radar_trafficAnomalies_getById",
     title: "Get traffic anomaly by UUID",
-    description: "Retrieves a single Internet traffic anomaly by UUID.",
+    description: "Retrieves a single Internet traffic anomaly by UUID.\n\nGET /radar/traffic_anomalies/{uuid}",
     inputSchema: {
       type: "object",
       properties: {
-        "format": {
-          "description": "Format in which results will be returned.",
-          "enum": [
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "uuid": {
+              "description": "Traffic anomaly UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "uuid"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "uuid": {
-          "description": "Traffic anomaly UUID.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "description": "Format in which results will be returned.",
+              "enum": [
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "uuid"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -999,7 +1022,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/radar/traffic_anomalies/${pathParam(args, "uuid")}`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ready/tools.ts b/src/generated/forge-mcp/ready/tools.ts
index 30a6eaa43..a6839e9cc 100644
--- a/src/generated/forge-mcp/ready/tools.ts
+++ b/src/generated/forge-mcp/ready/tools.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 
 import type { Tool } from "../_/tool.js";
-import { brand_protection_api_Error_output } from "../outputs.js";
+import { brand$$protection$$api_Error } from "../outputs.js";
 
 /**
  * The tools of `ready`.
@@ -11,10 +11,11 @@ export const tools: readonly Tool[] = [
   {
     name: "ready_get",
     title: "Run readiness checks",
-    description: "Return a success message after running readiness checks.",
+    description: "Return a success message after running readiness checks.\n\nGET /ready",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -45,7 +46,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "brand-protection-api_Error": brand_protection_api_Error_output,
+        "brand-protection-api_Error": brand$$protection$$api_Error,
       },
     },
     request: (_args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/analytics/livestreams/daily/tools.ts b/src/generated/forge-mcp/realtime/kit/analytics/livestreams/daily/tools.ts
index 1820eb2f1..d90d4aac4 100644
--- a/src/generated/forge-mcp/realtime/kit/analytics/livestreams/daily/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/analytics/livestreams/daily/tools.ts
@@ -1,15 +1,11 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../../schemas.js";
 
 /**
  * The tools of `realtime.kit.analytics.livestreams.daily`.
@@ -18,39 +14,51 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_analytics_livestreams_daily_get",
     title: "Fetch day-wise analytics data for your livestreams",
-    description: "Returns day-wise livestream analytics for the specified time range.\n\nThis method is beta.",
+    description: "Returns day-wise livestream analytics for the specified time range.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/analytics/livestreams/daywise",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "end_time": {
-          "description": "Specify the end time as a Unix timestamp in seconds to access the livestream analytics.",
-          "type": "integer"
-        },
-        "filters": {
-          "description": "Optional filters for livestream analytics.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         },
-        "start_time": {
-          "description": "Specify the start time as a Unix timestamp in seconds to access the livestream analytics.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "end_time": {
+              "description": "Specify the end time as a Unix timestamp in seconds to access the livestream analytics.",
+              "type": "integer"
+            },
+            "filters": {
+              "description": "Optional filters for livestream analytics.",
+              "type": "string"
+            },
+            "start_time": {
+              "description": "Specify the start time as a Unix timestamp in seconds to access the livestream analytics.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -144,16 +152,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/analytics/livestreams/daywise`,
       query: [
-        ["start_time", args["start_time"], true],
-        ["end_time", args["end_time"], true],
-        ["filters", args["filters"], true],
+        ["start_time", param(args, "query", "start_time"), true],
+        ["end_time", param(args, "query", "end_time"), true],
+        ["filters", param(args, "query", "filters"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/realtime/kit/analytics/livestreams/tools.ts b/src/generated/forge-mcp/realtime/kit/analytics/livestreams/tools.ts
index 4b4148e0e..c2317ac93 100644
--- a/src/generated/forge-mcp/realtime/kit/analytics/livestreams/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/analytics/livestreams/tools.ts
@@ -1,15 +1,11 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
 
 /**
  * The tools of `realtime.kit.analytics.livestreams`.
@@ -18,39 +14,51 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_analytics_livestreams_get",
     title: "Fetch complete analytics data for your livestreams",
-    description: "Returns livestream analytics for the specified time range.\n\nThis method is beta.",
+    description: "Returns livestream analytics for the specified time range.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/analytics/livestreams/overall",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "end_time": {
-          "description": "Specify the end time as a Unix timestamp in seconds to access the livestream analytics.",
-          "type": "integer"
-        },
-        "filters": {
-          "description": "Optional filters for livestream analytics.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         },
-        "start_time": {
-          "description": "Specify the start time as a Unix timestamp in seconds to access the livestream analytics.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "end_time": {
+              "description": "Specify the end time as a Unix timestamp in seconds to access the livestream analytics.",
+              "type": "integer"
+            },
+            "filters": {
+              "description": "Optional filters for livestream analytics.",
+              "type": "string"
+            },
+            "start_time": {
+              "description": "Specify the start time as a Unix timestamp in seconds to access the livestream analytics.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -118,16 +126,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/analytics/livestreams/overall`,
       query: [
-        ["start_time", args["start_time"], true],
-        ["end_time", args["end_time"], true],
-        ["filters", args["filters"], true],
+        ["start_time", param(args, "query", "start_time"), true],
+        ["end_time", param(args, "query", "end_time"), true],
+        ["filters", param(args, "query", "filters"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/realtime/kit/analytics/usage/tools.ts b/src/generated/forge-mcp/realtime/kit/analytics/usage/tools.ts
index c771246fe..fb64a669a 100644
--- a/src/generated/forge-mcp/realtime/kit/analytics/usage/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/analytics/usage/tools.ts
@@ -1,15 +1,11 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
 
 /**
  * The tools of `realtime.kit.analytics.usage`.
@@ -18,35 +14,47 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_analytics_usage_get",
     title: "Fetch day-wise session and recording analytics data for an App",
-    description: "Returns day-wise session and recording analytics data of an App for the specified time range start_date to end_date. If start_date and end_date are not provided, the default time range is set from 30 days ago to the current date.\n\nThis method is beta.",
+    description: "Returns day-wise session and recording analytics data of an App for the specified time range start_date to end_date. If start_date and end_date are not provided, the default time range is set from 30 days ago to the current date.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/analytics/daywise",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "end_date": {
-          "description": "end date in YYYY-MM-DD format",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         },
-        "start_date": {
-          "description": "start date in YYYY-MM-DD format",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "end_date": {
+              "description": "end date in YYYY-MM-DD format",
+              "type": "string"
+            },
+            "start_date": {
+              "description": "start date in YYYY-MM-DD format",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -208,15 +216,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/analytics/daywise`,
       query: [
-        ["start_date", args["start_date"], true],
-        ["end_date", args["end_date"], true],
+        ["start_date", param(args, "query", "start_date"), true],
+        ["end_date", param(args, "query", "end_date"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/realtime/kit/apps/tools.ts b/src/generated/forge-mcp/realtime/kit/apps/tools.ts
index 813c92fcb..65bf4b9f0 100644
--- a/src/generated/forge-mcp/realtime/kit/apps/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/apps/tools.ts
@@ -1,16 +1,12 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  realtimekit_ErrorResponse_output,
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_ErrorResponse,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../schemas.js";
 
 /**
  * The tools of `realtime.kit.apps`.
@@ -19,14 +15,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_apps_create",
     title: "Create App",
-    description: "Create new app for your account\n\nThis method is beta.",
+    description: "Create new app for your account\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "properties": {
             "name": {
@@ -37,15 +29,26 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -127,8 +130,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -139,27 +142,33 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_apps_get",
     title: "Fetch app details",
-    description: "Fetch details for an app in your account.\n\nThis method is beta.",
+    description: "Fetch details for an app in your account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -245,8 +254,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -256,44 +265,57 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_apps_list",
     title: "Fetch all apps",
-    description: "Fetch all apps for your account\n\nThis method is beta.",
+    description: "Fetch all apps for your account\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "page_no": {
-          "default": 1,
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "Search string that matches apps by name.",
-          "type": "string"
-        },
-        "sort_order": {
-          "default": "DESC",
-          "description": "Sort order for apps by creation time.",
-          "enum": [
-            "ASC",
-            "DESC"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_no": {
+              "default": 1,
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search string that matches apps by name.",
+              "type": "string"
+            },
+            "sort_order": {
+              "default": "DESC",
+              "description": "Sort order for apps by creation time.",
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -399,35 +421,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/apps`,
       query: [
-        ["page_no", args["page_no"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["sort_order", args["sort_order"], true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_apps_update",
     title: "Update an app",
-    description: "Update the name of an app in your account.\n\nThis method is beta.",
+    description: "Update the name of an app in your account.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/realtime/kit/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "format": "uuid",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "name": {
@@ -439,16 +453,31 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -580,7 +609,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_ErrorResponse": realtimekit_ErrorResponse_output,
+        "realtimekit_ErrorResponse": realtimekit_ErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/livestreams/sessions/tools.ts b/src/generated/forge-mcp/realtime/kit/livestreams/sessions/tools.ts
index c69eb52ce..135b3bb7f 100644
--- a/src/generated/forge-mcp/realtime/kit/livestreams/sessions/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/livestreams/sessions/tools.ts
@@ -3,15 +3,11 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_LivestreamSession_output,
-  realtimekit_Livestream_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_Livestream,
+  realtimekit_LivestreamSession,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
 
 /**
  * The tools of `realtime.kit.livestreams.sessions`.
@@ -20,31 +16,37 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_livestreams_sessions_get",
     title: "Fetch livestream session details using livestream session ID",
-    description: "Returns livestream session details for the given livestream session ID. Retrieve the `livestream_session_id`using the `Fetch livestream session details using a session ID` API.\n\nThis method is beta.",
+    description: "Returns livestream session details for the given livestream session ID. Retrieve the `livestream_session_id`using the `Fetch livestream session details using a session ID` API.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/livestreams/sessions/{livestream-session-id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "livestream_session_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "livestream-session-id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "livestream-session-id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "livestream_session_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -61,7 +63,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
       },
     },
     annotations: {
@@ -101,43 +103,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/livestreams/sessions/${pathParam(args, "livestream_session_id")}`,
+      path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/livestreams/sessions/${pathParam(args, "livestream-session-id")}`,
     }),
   },
   {
-    name: "realtime_kit_livestreams_sessions_list_active",
+    name: "realtime_kit_livestreams_sessions_listActive",
     title: "Fetch active livestream session details",
-    description: "Returns details of all active livestreams for the given livestream ID. Retreive the livestream ID using the `Start livestreaming a meeting` API.\n\nThis method is beta.",
+    description: "Returns details of all active livestreams for the given livestream ID. Retreive the livestream ID using the `Start livestreaming a meeting` API.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/livestreams/{livestream_id}/active-livestream-session",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "livestream_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "livestream_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "livestream_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "livestream_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -166,8 +174,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
       },
     },
     annotations: {
@@ -219,10 +227,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/livestreams/tools.ts b/src/generated/forge-mcp/realtime/kit/livestreams/tools.ts
index 94c634870..74fe8f6f5 100644
--- a/src/generated/forge-mcp/realtime/kit/livestreams/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/livestreams/tools.ts
@@ -1,18 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_LivestreamSession_output,
-  realtimekit_Livestream_output,
-  realtimekit_PagingInfo_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_Livestream,
+  realtimekit_LivestreamSession,
+  realtimekit_PagingInfo,
+  realtimekit_ValidationIssue,
 } from "../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../schemas.js";
 
 /**
  * The tools of `realtime.kit.livestreams`.
@@ -21,39 +17,51 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_livestreams_get",
     title: "Fetch livestream details using livestream ID",
-    description: "Returns details of a livestream with sessions for the given livestream ID. Retreive the livestream ID using the `Start livestreaming a meeting` API.\n\nThis method is beta.",
+    description: "Returns details of a livestream with sessions for the given livestream ID. Retreive the livestream ID using the `Start livestreaming a meeting` API.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/livestreams/{livestream_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "livestream_id": {
-          "type": "string"
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "livestream_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "livestream_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "livestream_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -89,9 +97,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
       },
     },
     annotations: {
@@ -150,86 +158,98 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/livestreams/${pathParam(args, "livestream_id")}`,
       query: [
-        ["page_no", args["page_no"], true],
-        ["per_page", args["per_page"], true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_livestreams_list",
     title: "Fetch all livestreams",
-    description: "Returns details of livestreams associated with the given App ID. It includes livestreams created by your App and RealtimeKit meetings that are livestreamed by your App. If you only want details of livestreams created by your App and not RealtimeKit meetings, you can use the `exclude_meetings` query parameter.\n\nThis method is beta.",
+    description: "Returns details of livestreams associated with the given App ID. It includes livestreams created by your App and RealtimeKit meetings that are livestreamed by your App. If you only want details of livestreams created by your App and not RealtimeKit meetings, you can use the `exclude_meetings` query parameter.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/livestreams",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "end_time": {
-          "description": "Specify the end time range in ISO format to access the live stream.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "exclude_meetings": {
-          "default": false,
-          "description": "Exclude the RealtimeKit meetings that are livestreamed.",
-          "type": "boolean"
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "sort_order": {
-          "description": "Specifies the sorting order for the results.",
-          "enum": [
-            "ASC",
-            "DSC"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "start_time": {
-          "description": "Specify the start time range in ISO format to access the live stream.",
-          "format": "date-time",
-          "type": "string"
+          "type": "object"
         },
-        "status": {
-          "description": "Specifies the status of the operation.",
-          "enum": [
-            "LIVE",
-            "IDLE",
-            "ERRORED",
-            "INVOKED"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "end_time": {
+              "description": "Specify the end time range in ISO format to access the live stream.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "exclude_meetings": {
+              "default": false,
+              "description": "Exclude the RealtimeKit meetings that are livestreamed.",
+              "type": "boolean"
+            },
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "sort_order": {
+              "description": "Specifies the sorting order for the results.",
+              "enum": [
+                "ASC",
+                "DSC"
+              ],
+              "type": "string"
+            },
+            "start_time": {
+              "description": "Specify the start time range in ISO format to access the live stream.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "status": {
+              "description": "Specifies the status of the operation.",
+              "enum": [
+                "LIVE",
+                "IDLE",
+                "ERRORED",
+                "INVOKED"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -253,8 +273,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
       },
     },
     annotations: {
@@ -301,40 +321,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/livestreams`,
       query: [
-        ["exclude_meetings", args["exclude_meetings"], true],
-        ["per_page", args["per_page"], true],
-        ["page_no", args["page_no"], true],
-        ["status", args["status"], true],
-        ["start_time", args["start_time"], true],
-        ["end_time", args["end_time"], true],
-        ["sort_order", args["sort_order"], true],
+        ["exclude_meetings", param(args, "query", "exclude_meetings"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["status", param(args, "query", "status"), true],
+        ["start_time", param(args, "query", "start_time"), true],
+        ["end_time", param(args, "query", "end_time"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_livestreams_start",
     title: "Start livestreaming a meeting",
-    description: "Starts livestream of a meeting associated with the given meeting ID. Retreive the meeting ID using the `Create a meeting` API.\n\nThis method is beta.",
+    description: "Starts livestream of a meeting associated with the given meeting ID. Retreive the meeting ID using the `Create a meeting` API.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/livestreams",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "properties": {
             "name": {
@@ -363,22 +375,36 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -540,8 +566,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -552,33 +578,39 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_livestreams_stop",
     title: "Stop livestreaming a meeting",
-    description: "Stops the active livestream of a meeting associated with the given meeting ID. Retreive the meeting ID using the `Create a meeting` API.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation stops the active livestream. Viewers lose the broadcast immediately.",
+    description: "Stops the active livestream of a meeting associated with the given meeting ID. Retreive the meeting ID using the `Create a meeting` API.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation stops the active livestream. Viewers lose the broadcast immediately.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-livestream/stop",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -634,8 +666,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/active/outputs.ts b/src/generated/forge-mcp/realtime/kit/meetings/active/outputs.ts
index a43133f9d..e23fef647 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/active/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/active/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `realtimekit_SessionParticipant` in responses.
  */
-export const realtimekit_SessionParticipant_output: JsonSchema = {
+export const realtimekit_SessionParticipant: JsonSchema = {
   "properties": {
     "created_at": {
       "type": "string"
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/active/polls/outputs.ts b/src/generated/forge-mcp/realtime/kit/meetings/active/polls/outputs.ts
index 5975ef974..593fd7b6c 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/active/polls/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/active/polls/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
 /**
  * The schema of `realtimekit_Poll` in responses.
  */
-export const realtimekit_Poll_output: JsonSchema = {
+export const realtimekit_Poll: JsonSchema = {
   "properties": {
     "anonymous": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/active/polls/tools.ts b/src/generated/forge-mcp/realtime/kit/meetings/active/polls/tools.ts
index 793e855c5..998962896 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/active/polls/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/active/polls/tools.ts
@@ -2,11 +2,7 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../../schemas.js";
-import { realtimekit_Poll_output } from "./outputs.js";
+import { realtimekit_Poll } from "./outputs.js";
 
 /**
  * The tools of `realtime.kit.meetings.active.polls`.
@@ -15,18 +11,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_active_polls_create",
     title: "Create a poll",
-    description: "Creates a new poll in an active session for the given meeting ID.\n\nThis method is beta.",
+    description: "Creates a new poll in an active session for the given meeting ID.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/poll",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "description": "Request body for creating a new poll",
           "properties": {
@@ -56,21 +44,35 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -91,7 +93,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_Poll": realtimekit_Poll_output,
+        "realtimekit_Poll": realtimekit_Poll,
       },
     },
     annotations: {
@@ -133,7 +135,7 @@ export const tools: readonly Tool[] = [
         "400": null
       },
       $defs: {
-        "realtimekit_Poll": realtimekit_Poll_output,
+        "realtimekit_Poll": realtimekit_Poll,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/active/tools.ts b/src/generated/forge-mcp/realtime/kit/meetings/active/tools.ts
index 6d8df1862..2ede627ce 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/active/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/active/tools.ts
@@ -3,15 +3,11 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_ActiveSession_output,
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_ActiveSession,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_SessionParticipant_output } from "./outputs.js";
+import { realtimekit_SessionParticipant } from "./outputs.js";
 
 /**
  * The tools of `realtime.kit.meetings.active`.
@@ -20,32 +16,38 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_active_get",
     title: "Fetch details of an active session",
-    description: "Returns details of an ongoing active session for the given meeting ID.\n\nThis method is beta.",
+    description: "Returns details of an ongoing active session for the given meeting ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -58,7 +60,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_ActiveSession": realtimekit_ActiveSession_output,
+        "realtimekit_ActiveSession": realtimekit_ActiveSession,
       },
     },
     annotations: {
@@ -94,9 +96,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_ActiveSession": realtimekit_ActiveSession_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_ActiveSession": realtimekit_ActiveSession,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -106,18 +108,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_active_kick",
     title: "Kick participants from an active session",
-    description: "Kicks one or more participants from an active session using user ID or custom participant ID.\n\nThis method is beta.",
+    description: "Kicks one or more participants from an active session using user ID or custom participant ID.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/kick",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "description": "Request body for kicking participants from an active session. At least one of `participant_ids` or `custom_participant_ids` must contain a value.",
           "properties": {
@@ -139,21 +133,35 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -177,7 +185,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_SessionParticipant": realtimekit_SessionParticipant_output,
+        "realtimekit_SessionParticipant": realtimekit_SessionParticipant,
       },
     },
     annotations: {
@@ -224,9 +232,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_SessionParticipant": realtimekit_SessionParticipant_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_SessionParticipant": realtimekit_SessionParticipant,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -235,34 +243,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "realtime_kit_meetings_active_kick_all",
+    name: "realtime_kit_meetings_active_kickAll",
     title: "Kick all participants",
-    description: "Kicks all participants from an active session for the given meeting ID.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation disconnects every active participant immediately.",
+    description: "Kicks all participants from an active session for the given meeting ID.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation disconnects every active participant immediately.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/kick-all",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -324,8 +338,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -335,18 +349,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_active_mute",
     title: "Mute participants of an active session",
-    description: "Mutes one or more participants from an active session using user ID or custom participant ID.\n\nThis method is beta.",
+    description: "Mutes one or more participants from an active session using user ID or custom participant ID.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/mute",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "description": "Request body for muting participants in an active session. At least one of `participant_ids` or `custom_participant_ids` must contain a value.",
           "properties": {
@@ -367,21 +373,35 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -405,7 +425,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_SessionParticipant": realtimekit_SessionParticipant_output,
+        "realtimekit_SessionParticipant": realtimekit_SessionParticipant,
       },
     },
     annotations: {
@@ -452,9 +472,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_SessionParticipant": realtimekit_SessionParticipant_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_SessionParticipant": realtimekit_SessionParticipant,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -463,20 +483,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "realtime_kit_meetings_active_mute_all",
+    name: "realtime_kit_meetings_active_muteAll",
     title: "Mute all participants",
-    description: "Mutes all participants of an active session for the given meeting ID.\n\nThis method is beta.",
+    description: "Mutes all participants of an active session for the given meeting ID.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/mute-all",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "description": "Request body for muting all participants in an active session.",
           "properties": {
@@ -488,21 +500,35 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -564,8 +590,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/livestream/tools.ts b/src/generated/forge-mcp/realtime/kit/meetings/livestream/tools.ts
index 8021d2ebd..bfc5f33e8 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/livestream/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/livestream/tools.ts
@@ -1,18 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_LivestreamSession_output,
-  realtimekit_Livestream_output,
-  realtimekit_PagingInfo_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_Livestream,
+  realtimekit_LivestreamSession,
+  realtimekit_PagingInfo,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
 
 /**
  * The tools of `realtime.kit.meetings.livestream`.
@@ -21,41 +17,53 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_livestream_get",
     title: "Fetch livestream session details for a meeting",
-    description: "Returns livestream session details for the given meeting ID. Retreive the meeting ID using the `Create a meeting` API.\n\nThis method is beta.",
+    description: "Returns livestream session details for the given meeting ID. Retreive the meeting ID using the `Create a meeting` API.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/livestream",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "format": "uuid",
-          "type": "string"
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -99,9 +107,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
       },
     },
     annotations: {
@@ -168,51 +176,57 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/meetings/${pathParam(args, "meeting_id")}/livestream`,
       query: [
-        ["page_no", args["page_no"], true],
-        ["per_page", args["per_page"], true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "realtime_kit_meetings_livestream_list_active",
+    name: "realtime_kit_meetings_livestream_listActive",
     title: "Fetch active livestreams for a meeting",
-    description: "Returns details of all active livestreams for the given meeting ID.\n\nThis method is beta.",
+    description: "Returns details of all active livestreams for the given meeting ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-livestream",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -229,7 +243,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "realtimekit_Livestream": realtimekit_Livestream_output,
+        "realtimekit_Livestream": realtimekit_Livestream,
       },
     },
     annotations: {
@@ -269,9 +283,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_Livestream": realtimekit_Livestream_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_Livestream": realtimekit_Livestream,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/outputs.ts b/src/generated/forge-mcp/realtime/kit/meetings/outputs.ts
index 388490fe5..f464e8c8a 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `realtimekit_AIConfig` in responses.
  */
-export const realtimekit_AIConfig_output: JsonSchema = {
+export const realtimekit_AIConfig: JsonSchema = {
   "properties": {
     "summarization": {
       "$ref": "#/$defs/realtimekit_SummarizationConfig"
@@ -21,7 +21,7 @@ export const realtimekit_AIConfig_output: JsonSchema = {
 /**
  * The schema of `realtimekit_SummarizationConfig` in responses.
  */
-export const realtimekit_SummarizationConfig_output: JsonSchema = {
+export const realtimekit_SummarizationConfig: JsonSchema = {
   "properties": {
     "summary_type": {
       "enum": [
@@ -54,7 +54,7 @@ export const realtimekit_SummarizationConfig_output: JsonSchema = {
 /**
  * The schema of `realtimekit_TranscriptionConfig` in responses.
  */
-export const realtimekit_TranscriptionConfig_output: JsonSchema = {
+export const realtimekit_TranscriptionConfig: JsonSchema = {
   "properties": {
     "keywords": {
       "items": {
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/participants/outputs.ts b/src/generated/forge-mcp/realtime/kit/meetings/participants/outputs.ts
index e5dea3eeb..3e804ee2e 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/participants/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/participants/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `realtimekit_Participant` in responses.
  */
-export const realtimekit_Participant_output: JsonSchema = {
+export const realtimekit_Participant: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/participants/tokens/tools.ts b/src/generated/forge-mcp/realtime/kit/meetings/participants/tokens/tools.ts
index b7aaef24a..2ed6390f4 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/participants/tokens/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/participants/tokens/tools.ts
@@ -3,14 +3,10 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_GenericSuccessResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_GenericSuccessResponse,
+  realtimekit_ValidationIssue,
 } from "../../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../../schemas.js";
 import { realtimekit_ParticipantTokenValidity } from "../schemas.js";
 
 /**
@@ -20,41 +16,49 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_participants_tokens_refresh",
     title: "Refresh participant's authentication token",
-    description: "Regenerates participant's authentication token for the given meeting and participant ID.\n\nThis method is beta.",
+    description: "Regenerates participant's authentication token for the given meeting and participant ID.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}/token",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/realtimekit_ParticipantTokenValidity"
         },
-        "meeting_id": {
-          "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "participant_id": {
-          "description": "ID of the participant. You can fetch the participant ID using the add a  participant API.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "participant_id": {
+              "description": "ID of the participant. You can fetch the participant ID using the add a  participant API.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id",
+            "participant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
-        "participant_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
         "realtimekit_ParticipantTokenValidity": realtimekit_ParticipantTokenValidity,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
       },
     },
     outputSchema: {
@@ -93,7 +97,7 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
       },
     },
     annotations: {
@@ -157,9 +161,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -170,18 +174,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_participants_tokens_revoke",
     title: "Revoke participant's authentication token",
-    description: "Revokes a previously issued participant authentication token without deleting the participant. Other tokens issued to the participant remain valid.\n\nThis method is beta.",
+    description: "Revokes a previously issued participant authentication token without deleting the participant. Other tokens issued to the participant remain valid.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}/token",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "properties": {
             "token": {
@@ -194,27 +190,41 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "participant_id": {
-          "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "participant_id": {
+              "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id",
+            "participant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
-        "participant_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -242,7 +252,7 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
       },
     },
     annotations: {
@@ -299,9 +309,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/participants/tools.ts b/src/generated/forge-mcp/realtime/kit/meetings/participants/tools.ts
index e4fe05c60..d58aaf0ca 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/participants/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/participants/tools.ts
@@ -1,19 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_GenericSuccessResponse_output,
-  realtimekit_PagingInfo_output,
-  realtimekit_PagingResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_GenericSuccessResponse,
+  realtimekit_PagingInfo,
+  realtimekit_PagingResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_Participant_output } from "./outputs.js";
+import { realtimekit_Participant } from "./outputs.js";
 import { realtimekit_ParticipantTokenValidity } from "./schemas.js";
 
 /**
@@ -23,26 +19,18 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_participants_create",
     title: "Add a participant",
-    description: "Adds a participant to the given meeting ID.\n\nThis method is beta.",
+    description: "Adds a participant to the given meeting ID.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "properties": {
             "custom_participant_id": {
-              "description": "A unique participant ID. You must specify a unique ID for the participant, for example, UUID, email address, and so on. ",
+              "description": "A unique participant ID. You must specify a unique ID for the participant, for example, UUID, email address, and so on.",
               "type": "string"
             },
             "name": {
-              "description": "(Optional) Name of the participant. ",
+              "description": "(Optional) Name of the participant.",
               "oneOf": [
                 {
                   "type": "string"
@@ -53,7 +41,7 @@ export const tools: readonly Tool[] = [
               ]
             },
             "picture": {
-              "description": "(Optional) A URL to a picture to be used for the participant. ",
+              "description": "(Optional) A URL to a picture to be used for the participant.",
               "oneOf": [
                 {
                   "type": "string"
@@ -79,22 +67,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "realtimekit_ParticipantTokenValidity": realtimekit_ParticipantTokenValidity,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
       },
     },
     outputSchema: {
@@ -135,8 +139,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Participant": realtimekit_Participant,
       },
     },
     annotations: {
@@ -202,10 +206,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Participant": realtimekit_Participant,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -216,38 +220,44 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_participants_delete",
     title: "Delete a participant",
-    description: "Deletes a participant for the given meeting and participant ID.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation removes the participant from the meeting and revokes their authentication token.",
+    description: "Deletes a participant for the given meeting and participant ID.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation removes the participant from the meeting and revokes their authentication token.\n\nDELETE /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "participant_id": {
-          "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "participant_id": {
+              "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id",
+            "participant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
-        "participant_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -287,7 +297,7 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
       },
     },
     annotations: {
@@ -353,9 +363,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -365,38 +375,44 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_participants_get",
     title: "Fetch a participant's detail",
-    description: "Returns a participant details for the given meeting and participant ID.\n\nThis method is beta.",
+    description: "Returns a participant details for the given meeting and participant ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "participant_id": {
-          "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "participant_id": {
+              "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id",
+            "participant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
-        "participant_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -416,8 +432,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Participant": realtimekit_Participant,
       },
     },
     annotations: {
@@ -463,10 +479,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Participant": realtimekit_Participant,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -476,41 +492,53 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_participants_list",
     title: "Fetch all participants of a meeting",
-    description: "Returns all participants detail for the given meeting ID.\n\nThis method is beta.",
+    description: "Returns all participants detail for the given meeting ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of results per page",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -530,9 +558,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_PagingResponse": realtimekit_PagingResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_PagingResponse": realtimekit_PagingResponse,
+        "realtimekit_Participant": realtimekit_Participant,
       },
     },
     annotations: {
@@ -578,36 +606,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_PagingResponse": realtimekit_PagingResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_PagingResponse": realtimekit_PagingResponse,
+        "realtimekit_Participant": realtimekit_Participant,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/meetings/${pathParam(args, "meeting_id")}/participants`,
       query: [
-        ["page_no", args["page_no"], true],
-        ["per_page", args["per_page"], true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_meetings_participants_replace",
     title: "Replace a participant's detail",
-    description: "Replaces a participant's details for the given meeting and participant ID.\n\nThis method is beta.",
+    description: "Replaces a participant's details for the given meeting and participant ID.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "properties": {
             "custom_participant_id": {
@@ -647,27 +667,41 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "participant_id": {
-          "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "participant_id": {
+              "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id",
+            "participant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
-        "participant_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -707,8 +741,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Participant": realtimekit_Participant,
       },
     },
     annotations: {
@@ -774,10 +808,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Participant": realtimekit_Participant,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -788,18 +822,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_participants_update",
     title: "Edit a participant's detail",
-    description: "Updates a participant's details for the given meeting and participant ID.\n\nThis method is beta.",
+    description: "Updates a participant's details for the given meeting and participant ID.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "properties": {
             "name": {
@@ -838,27 +864,41 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "participant_id": {
-          "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. You can fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "participant_id": {
+              "description": "ID of the participant. You can fetch the participant ID using the add a participant API.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id",
+            "participant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
-        "participant_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -898,8 +938,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Participant": realtimekit_Participant,
       },
     },
     annotations: {
@@ -965,10 +1005,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Participant": realtimekit_Participant_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Participant": realtimekit_Participant,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/meetings/tools.ts b/src/generated/forge-mcp/realtime/kit/meetings/tools.ts
index 60c4cd202..9bfb82e90 100644
--- a/src/generated/forge-mcp/realtime/kit/meetings/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/meetings/tools.ts
@@ -1,40 +1,38 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
-import {
-  realtimekit_AudioConfig_output,
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_GenericSuccessResponse_output,
-  realtimekit_LivestreamingConfig_output,
-  realtimekit_Meeting_output,
-  realtimekit_PagingInfo_output,
-  realtimekit_PagingResponse_output,
-  realtimekit_RecordingConfig_output,
-  realtimekit_StorageConfig_output,
-  realtimekit_ValidationIssue_output,
-  realtimekit_VideoConfig_output,
-  realtimekit_realtimekitBucketConfig_output,
-} from "../outputs.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
   realtimekit_AudioConfig,
+  realtimekit_GenericErrorResponse,
+  realtimekit_GenericSuccessResponse,
   realtimekit_LivestreamingConfig,
+  realtimekit_Meeting,
+  realtimekit_PagingInfo,
+  realtimekit_PagingResponse,
   realtimekit_RecordingConfig,
   realtimekit_StorageConfig,
+  realtimekit_ValidationIssue,
   realtimekit_VideoConfig,
-  realtimekit_account_identifier,
-  realtimekit_app_id,
   realtimekit_realtimekitBucketConfig,
-} from "../schemas.js";
+} from "../outputs.js";
 import {
-  realtimekit_AIConfig_output,
-  realtimekit_SummarizationConfig_output,
-  realtimekit_TranscriptionConfig_output,
-} from "./outputs.js";
+  realtimekit_AudioConfig as realtimekit_AudioConfig$,
+  realtimekit_LivestreamingConfig as realtimekit_LivestreamingConfig$,
+  realtimekit_RecordingConfig as realtimekit_RecordingConfig$,
+  realtimekit_StorageConfig as realtimekit_StorageConfig$,
+  realtimekit_VideoConfig as realtimekit_VideoConfig$,
+  realtimekit_realtimekitBucketConfig as realtimekit_realtimekitBucketConfig$,
+} from "../schemas.js";
 import {
   realtimekit_AIConfig,
   realtimekit_SummarizationConfig,
   realtimekit_TranscriptionConfig,
+} from "./outputs.js";
+import {
+  realtimekit_AIConfig as realtimekit_AIConfig$,
+  realtimekit_SummarizationConfig as realtimekit_SummarizationConfig$,
+  realtimekit_TranscriptionConfig as realtimekit_TranscriptionConfig$,
 } from "./schemas.js";
 
 /**
@@ -44,18 +42,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_create",
     title: "Create a meeting",
-    description: "Create a meeting for the given App ID.\n\nThis method is beta.",
+    description: "Create a meeting for the given App ID.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/meetings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "description": "Create meeting body",
           "properties": {
@@ -94,7 +84,7 @@ export const tools: readonly Tool[] = [
             },
             "recording_config": {
               "$ref": "#/$defs/realtimekit_RecordingConfig",
-              "description": "Recording Configurations to be used for this meeting. This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.\n"
+              "description": "Recording Configurations to be used for this meeting. This level of configs takes higher preference over App level configs on the RealtimeKit developer portal."
             },
             "session_keep_alive_time_in_secs": {
               "default": 60,
@@ -124,25 +114,41 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
+        "realtimekit_AIConfig": realtimekit_AIConfig$,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig$,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig$,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig$,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig$,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig$,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig$,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig$,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig$,
       },
     },
     outputSchema: {
@@ -186,17 +192,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig_output,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig_output,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AIConfig": realtimekit_AIConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     annotations: {
@@ -262,19 +268,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig_output,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig_output,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AIConfig": realtimekit_AIConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     request: (args) => ({
@@ -285,36 +291,48 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_get",
     title: "Fetch a meeting for an App",
-    description: "Returns a meeting details in an App for the given meeting ID.\n\nThis method is beta.",
+    description: "Returns a meeting details in an App for the given meeting ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         },
-        "name": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -357,17 +375,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig_output,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig_output,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AIConfig": realtimekit_AIConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     annotations: {
@@ -436,82 +454,94 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig_output,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig_output,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AIConfig": realtimekit_AIConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/meetings/${pathParam(args, "meeting_id")}`,
       query: [
-        ["name", args["name"], true],
+        ["name", param(args, "query", "name"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_meetings_list",
     title: "Fetch all meetings for an App",
-    description: "Returns all meetings for the given App ID.\n\nThis method is beta.",
+    description: "Returns all meetings for the given App ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/meetings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "end_time": {
-          "description": "The end time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Number of results per page",
-          "type": "number"
-        },
-        "search": {
-          "description": "The search query string. You can search using the meeting ID or title.",
-          "type": "string"
-        },
-        "start_time": {
-          "description": "The start time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "status": {
-          "description": "Filter meetings by status.",
-          "enum": [
-            "ACTIVE",
-            "INACTIVE"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "end_time": {
+              "description": "The end time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page",
+              "type": "number"
+            },
+            "search": {
+              "description": "The search query string. You can search using the meeting ID or title.",
+              "type": "string"
+            },
+            "start_time": {
+              "description": "The start time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter meetings by status.",
+              "enum": [
+                "ACTIVE",
+                "INACTIVE"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -531,15 +561,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_PagingResponse": realtimekit_PagingResponse_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_PagingResponse": realtimekit_PagingResponse,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     annotations: {
@@ -582,46 +612,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_PagingResponse": realtimekit_PagingResponse_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_PagingResponse": realtimekit_PagingResponse,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/meetings`,
       query: [
-        ["page_no", args["page_no"], true],
-        ["per_page", args["per_page"], true],
-        ["start_time", args["start_time"], true],
-        ["end_time", args["end_time"], true],
-        ["search", args["search"], true],
-        ["status", args["status"], true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["start_time", param(args, "query", "start_time"), true],
+        ["end_time", param(args, "query", "end_time"), true],
+        ["search", param(args, "query", "search"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_meetings_replace",
     title: "Replace a meeting",
-    description: "Replaces all the details for the given meeting ID.\n\nThis method is beta.",
+    description: "Replaces all the details for the given meeting ID.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "description": "Create meeting body",
           "properties": {
@@ -660,7 +682,7 @@ export const tools: readonly Tool[] = [
             },
             "recording_config": {
               "$ref": "#/$defs/realtimekit_RecordingConfig",
-              "description": "Recording Configurations to be used for this meeting. This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.\n"
+              "description": "Recording Configurations to be used for this meeting. This level of configs takes higher preference over App level configs on the RealtimeKit developer portal."
             },
             "session_keep_alive_time_in_secs": {
               "default": 60,
@@ -691,30 +713,46 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
+        "realtimekit_AIConfig": realtimekit_AIConfig$,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig$,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig$,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig$,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig$,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig$,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig$,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig$,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig$,
       },
     },
     outputSchema: {
@@ -758,17 +796,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig_output,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig_output,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AIConfig": realtimekit_AIConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     annotations: {
@@ -834,19 +872,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig_output,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig_output,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AIConfig": realtimekit_AIConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     request: (args) => ({
@@ -857,18 +895,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_meetings_update",
     title: "Update a meeting",
-    description: "Updates a meeting in an App for the given meeting ID.\n\nThis method is beta.",
+    description: "Updates a meeting in an App for the given meeting ID.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "description": "Update meeting body",
           "properties": {
@@ -890,7 +920,7 @@ export const tools: readonly Tool[] = [
             },
             "recording_config": {
               "$ref": "#/$defs/realtimekit_RecordingConfig",
-              "description": "Recording Configurations to be used for this meeting. This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.\n"
+              "description": "Recording Configurations to be used for this meeting. This level of configs takes higher preference over App level configs on the RealtimeKit developer portal."
             },
             "session_keep_alive_time_in_secs": {
               "description": "Time in seconds, for which a session remains active, after the last participant has left the meeting.",
@@ -919,30 +949,46 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "meeting_id": {
-          "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting. Fetch the meeting ID using the create a meeting API.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
+        "realtimekit_AIConfig": realtimekit_AIConfig$,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig$,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig$,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig$,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig$,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig$,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig$,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig$,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig$,
       },
     },
     outputSchema: {
@@ -986,17 +1032,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig_output,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig_output,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AIConfig": realtimekit_AIConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     annotations: {
@@ -1065,19 +1111,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_AIConfig": realtimekit_AIConfig_output,
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig_output,
-        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AIConfig": realtimekit_AIConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_SummarizationConfig": realtimekit_SummarizationConfig,
+        "realtimekit_TranscriptionConfig": realtimekit_TranscriptionConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/outputs.ts b/src/generated/forge-mcp/realtime/kit/outputs.ts
index 140a8d645..b87961485 100644
--- a/src/generated/forge-mcp/realtime/kit/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `realtimekit_ActiveSession` in responses.
  */
-export const realtimekit_ActiveSession_output: JsonSchema = {
+export const realtimekit_ActiveSession: JsonSchema = {
   "properties": {
     "associated_id": {
       "type": "string"
@@ -83,7 +83,7 @@ export const realtimekit_ActiveSession_output: JsonSchema = {
 /**
  * The schema of `realtimekit_AudioConfig` in responses.
  */
-export const realtimekit_AudioConfig_output: JsonSchema = {
+export const realtimekit_AudioConfig: JsonSchema = {
   "properties": {
     "channel": {
       "enum": [
@@ -109,7 +109,7 @@ export const realtimekit_AudioConfig_output: JsonSchema = {
 /**
  * The schema of `realtimekit_ErrorResponse` in responses.
  */
-export const realtimekit_ErrorResponse_output: JsonSchema = {
+export const realtimekit_ErrorResponse: JsonSchema = {
   "properties": {
     "error": {
       "properties": {
@@ -140,7 +140,7 @@ export const realtimekit_ErrorResponse_output: JsonSchema = {
 /**
  * The schema of `realtimekit_GenericErrorResponse` in responses.
  */
-export const realtimekit_GenericErrorResponse_output: JsonSchema = {
+export const realtimekit_GenericErrorResponse: JsonSchema = {
   "properties": {
     "error": {
       "properties": {
@@ -187,7 +187,7 @@ export const realtimekit_GenericErrorResponse_output: JsonSchema = {
 /**
  * The schema of `realtimekit_GenericSuccessResponse` in responses.
  */
-export const realtimekit_GenericSuccessResponse_output: JsonSchema = {
+export const realtimekit_GenericSuccessResponse: JsonSchema = {
   "properties": {
     "data": {
       "type": "object"
@@ -205,7 +205,7 @@ export const realtimekit_GenericSuccessResponse_output: JsonSchema = {
 /**
  * The schema of `realtimekit_Livestream` in responses.
  */
-export const realtimekit_Livestream_output: JsonSchema = {
+export const realtimekit_Livestream: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -288,7 +288,7 @@ export const realtimekit_Livestream_output: JsonSchema = {
 /**
  * The schema of `realtimekit_LivestreamSession` in responses.
  */
-export const realtimekit_LivestreamSession_output: JsonSchema = {
+export const realtimekit_LivestreamSession: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -374,7 +374,7 @@ export const realtimekit_LivestreamSession_output: JsonSchema = {
 /**
  * The schema of `realtimekit_LivestreamingConfig` in responses.
  */
-export const realtimekit_LivestreamingConfig_output: JsonSchema = {
+export const realtimekit_LivestreamingConfig: JsonSchema = {
   "properties": {
     "rtmp_url": {
       "type": "string"
@@ -386,7 +386,7 @@ export const realtimekit_LivestreamingConfig_output: JsonSchema = {
 /**
  * The schema of `realtimekit_Meeting` in responses.
  */
-export const realtimekit_Meeting_output: JsonSchema = {
+export const realtimekit_Meeting: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -443,7 +443,7 @@ export const realtimekit_Meeting_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PagingInfo` in responses.
  */
-export const realtimekit_PagingInfo_output: JsonSchema = {
+export const realtimekit_PagingInfo: JsonSchema = {
   "properties": {
     "end_offset": {
       "type": "number"
@@ -466,7 +466,7 @@ export const realtimekit_PagingInfo_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PagingResponse` in responses.
  */
-export const realtimekit_PagingResponse_output: JsonSchema = {
+export const realtimekit_PagingResponse: JsonSchema = {
   "properties": {
     "data": {
       "items": {
@@ -492,7 +492,7 @@ export const realtimekit_PagingResponse_output: JsonSchema = {
 /**
  * The schema of `realtimekit_RecordingConfig` in responses.
  */
-export const realtimekit_RecordingConfig_output: JsonSchema = {
+export const realtimekit_RecordingConfig: JsonSchema = {
   "properties": {
     "audio_config": {
       "$ref": "#/$defs/realtimekit_AudioConfig"
@@ -522,7 +522,7 @@ export const realtimekit_RecordingConfig_output: JsonSchema = {
 /**
  * The schema of `realtimekit_StorageConfig` in responses.
  */
-export const realtimekit_StorageConfig_output: JsonSchema = {
+export const realtimekit_StorageConfig: JsonSchema = {
   "oneOf": [
     {
       "allOf": [
@@ -674,7 +674,7 @@ export const realtimekit_StorageConfig_output: JsonSchema = {
 /**
  * The schema of `realtimekit_ValidationIssue` in responses.
  */
-export const realtimekit_ValidationIssue_output: JsonSchema = {
+export const realtimekit_ValidationIssue: JsonSchema = {
   "properties": {
     "code": {
       "type": "string"
@@ -706,7 +706,7 @@ export const realtimekit_ValidationIssue_output: JsonSchema = {
 /**
  * The schema of `realtimekit_VideoConfig` in responses.
  */
-export const realtimekit_VideoConfig_output: JsonSchema = {
+export const realtimekit_VideoConfig: JsonSchema = {
   "properties": {
     "codec": {
       "enum": [
@@ -760,7 +760,7 @@ export const realtimekit_VideoConfig_output: JsonSchema = {
 /**
  * The schema of `realtimekit_realtimekitBucketConfig` in responses.
  */
-export const realtimekit_realtimekitBucketConfig_output: JsonSchema = {
+export const realtimekit_realtimekitBucketConfig: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/realtime/kit/presets/outputs.ts b/src/generated/forge-mcp/realtime/kit/presets/outputs.ts
index 6e9d0646f..7d936f395 100644
--- a/src/generated/forge-mcp/realtime/kit/presets/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/presets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `realtimekit_Preset` in responses.
  */
-export const realtimekit_Preset_output: JsonSchema = {
+export const realtimekit_Preset: JsonSchema = {
   "properties": {
     "config": {
       "properties": {
@@ -562,7 +562,7 @@ export const realtimekit_Preset_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PresetListItem` in responses.
  */
-export const realtimekit_PresetListItem_output: JsonSchema = {
+export const realtimekit_PresetListItem: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -586,7 +586,7 @@ export const realtimekit_PresetListItem_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PresetPluginConfig` in responses.
  */
-export const realtimekit_PresetPluginConfig_output: JsonSchema = {
+export const realtimekit_PresetPluginConfig: JsonSchema = {
   "additionalProperties": {
     "properties": {
       "access_control": {
diff --git a/src/generated/forge-mcp/realtime/kit/presets/schemas.ts b/src/generated/forge-mcp/realtime/kit/presets/schemas.ts
index e9cb783b1..3e52c406d 100644
--- a/src/generated/forge-mcp/realtime/kit/presets/schemas.ts
+++ b/src/generated/forge-mcp/realtime/kit/presets/schemas.ts
@@ -73,7 +73,7 @@ export const realtimekit_Preset: JsonSchema = {
                   "type": "number"
                 },
                 "quality": {
-                  "description": "Quality of screen share ",
+                  "description": "Quality of screen share",
                   "enum": [
                     "hd",
                     "vga",
@@ -692,7 +692,7 @@ export const realtimekit_UpdatePreset: JsonSchema = {
                   "type": "number"
                 },
                 "quality": {
-                  "description": "Quality of screen share ",
+                  "description": "Quality of screen share",
                   "enum": [
                     "hd",
                     "vga",
diff --git a/src/generated/forge-mcp/realtime/kit/presets/tools.ts b/src/generated/forge-mcp/realtime/kit/presets/tools.ts
index 4101ad30e..9962f8e1a 100644
--- a/src/generated/forge-mcp/realtime/kit/presets/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/presets/tools.ts
@@ -1,26 +1,22 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_GenericSuccessResponse_output,
-  realtimekit_PagingInfo_output,
-  realtimekit_PagingResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_GenericSuccessResponse,
+  realtimekit_PagingInfo,
+  realtimekit_PagingResponse,
+  realtimekit_ValidationIssue,
 } from "../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../schemas.js";
-import {
-  realtimekit_PresetListItem_output,
-  realtimekit_PresetPluginConfig_output,
-  realtimekit_Preset_output,
-} from "./outputs.js";
 import {
   realtimekit_Preset,
+  realtimekit_PresetListItem,
   realtimekit_PresetPluginConfig,
+} from "./outputs.js";
+import {
+  realtimekit_Preset as realtimekit_Preset$,
+  realtimekit_PresetPluginConfig as realtimekit_PresetPluginConfig$,
   realtimekit_UpdatePreset,
 } from "./schemas.js";
 
@@ -31,32 +27,40 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_presets_create",
     title: "Create a preset",
-    description: "Creates a preset belonging to the current App\n\nThis method is beta.",
+    description: "Creates a preset belonging to the current App\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/presets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/realtimekit_Preset"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "realtimekit_Preset": realtimekit_Preset,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
+        "realtimekit_Preset": realtimekit_Preset$,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig$,
       },
     },
     outputSchema: {
@@ -103,9 +107,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
       },
     },
     annotations: {
@@ -174,11 +178,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -189,33 +193,39 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_presets_delete",
     title: "Delete a preset",
-    description: "Deletes a preset using the provided preset ID\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the preset.",
+    description: "Deletes a preset using the provided preset ID\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the preset.\n\nDELETE /accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "preset_id": {
-          "description": "ID of the preset to fetch",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "preset_id": {
+              "description": "ID of the preset to fetch",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "preset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "preset_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -261,9 +271,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
       },
     },
     annotations: {
@@ -332,11 +342,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -346,33 +356,39 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_presets_get",
     title: "Fetch details of a preset",
-    description: "Fetches details of a preset using the provided preset ID\n\nThis method is beta.",
+    description: "Fetches details of a preset using the provided preset ID\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "preset_id": {
-          "description": "ID of the preset to fetch",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "preset_id": {
+              "description": "ID of the preset to fetch",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "preset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "preset_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -418,9 +434,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
       },
     },
     annotations: {
@@ -489,11 +505,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -503,39 +519,51 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_presets_list",
     title: "Fetch all presets",
-    description: "Fetches all the presets belonging to an App.\n\nThis method is beta.",
+    description: "Fetches all the presets belonging to an App.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/presets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Number of results per page",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Search presets by name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page",
+              "type": "number"
+            },
+            "search": {
+              "description": "Search presets by name.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -555,9 +583,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_PagingResponse": realtimekit_PagingResponse_output,
-        "realtimekit_PresetListItem": realtimekit_PresetListItem_output,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_PagingResponse": realtimekit_PagingResponse,
+        "realtimekit_PresetListItem": realtimekit_PresetListItem,
       },
     },
     annotations: {
@@ -600,57 +628,65 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_PagingResponse": realtimekit_PagingResponse_output,
-        "realtimekit_PresetListItem": realtimekit_PresetListItem_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_PagingResponse": realtimekit_PagingResponse,
+        "realtimekit_PresetListItem": realtimekit_PresetListItem,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/presets`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page_no", args["page_no"], true],
-        ["search", args["search"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_presets_replace",
     title: "Replace a preset",
-    description: "Replace all details for the preset using the provided preset ID.\n\nThis method is beta.",
+    description: "Replace all details for the preset using the provided preset ID.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/realtimekit_Preset"
         },
-        "preset_id": {
-          "description": "ID of the preset to replace",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "preset_id": {
+              "description": "ID of the preset to replace",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "preset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "preset_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "realtimekit_Preset": realtimekit_Preset,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
+        "realtimekit_Preset": realtimekit_Preset$,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig$,
       },
     },
     outputSchema: {
@@ -697,9 +733,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
       },
     },
     annotations: {
@@ -768,11 +804,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -783,38 +819,46 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_presets_update",
     title: "Update a preset",
-    description: "Update a preset by the provided preset ID\n\nThis method is beta.",
+    description: "Update a preset by the provided preset ID\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/realtimekit_UpdatePreset"
         },
-        "preset_id": {
-          "description": "ID of the preset to fetch",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "preset_id": {
+              "description": "ID of the preset to fetch",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "preset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "preset_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig$,
         "realtimekit_UpdatePreset": realtimekit_UpdatePreset,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
       },
     },
     outputSchema: {
@@ -861,9 +905,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
       },
     },
     annotations: {
@@ -932,11 +976,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Preset": realtimekit_Preset_output,
-        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Preset": realtimekit_Preset,
+        "realtimekit_PresetPluginConfig": realtimekit_PresetPluginConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/recordings/active/tools.ts b/src/generated/forge-mcp/realtime/kit/recordings/active/tools.ts
index 8e73ddfa3..f1e8d404c 100644
--- a/src/generated/forge-mcp/realtime/kit/recordings/active/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/recordings/active/tools.ts
@@ -3,15 +3,11 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_GenericSuccessResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_GenericSuccessResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_Recording_output } from "../outputs.js";
+import { realtimekit_Recording } from "../outputs.js";
 
 /**
  * The tools of `realtime.kit.recordings.active`.
@@ -20,32 +16,38 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_recordings_active_get",
     title: "Fetch active recording",
-    description: "Returns the active recording details for the given meeting ID.\n\nThis method is beta.",
+    description: "Returns the active recording details for the given meeting ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/recordings/active-recording/{meeting_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "meeting_id": {
-          "description": "ID of the meeting",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "meeting_id": {
+              "description": "ID of the meeting",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "meeting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "meeting_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -65,8 +67,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
       },
     },
     annotations: {
@@ -109,10 +111,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/recordings/outputs.ts b/src/generated/forge-mcp/realtime/kit/recordings/outputs.ts
index 1b018d139..962013816 100644
--- a/src/generated/forge-mcp/realtime/kit/recordings/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/recordings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `realtimekit_Recording` in responses.
  */
-export const realtimekit_Recording_output: JsonSchema = {
+export const realtimekit_Recording: JsonSchema = {
   "properties": {
     "audio_download_url": {
       "oneOf": [
@@ -127,7 +127,7 @@ export const realtimekit_Recording_output: JsonSchema = {
 /**
  * The schema of `realtimekit_startReason` in responses.
  */
-export const realtimekit_startReason_output: JsonSchema = {
+export const realtimekit_startReason: JsonSchema = {
   "properties": {
     "caller": {
       "properties": {
@@ -162,7 +162,7 @@ export const realtimekit_startReason_output: JsonSchema = {
 /**
  * The schema of `realtimekit_stopReason` in responses.
  */
-export const realtimekit_stopReason_output: JsonSchema = {
+export const realtimekit_stopReason: JsonSchema = {
   "properties": {
     "caller": {
       "properties": {
diff --git a/src/generated/forge-mcp/realtime/kit/recordings/tools.ts b/src/generated/forge-mcp/realtime/kit/recordings/tools.ts
index dee8d1820..d6a35df29 100644
--- a/src/generated/forge-mcp/realtime/kit/recordings/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/recordings/tools.ts
@@ -1,34 +1,32 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
-import {
-  realtimekit_AudioConfig_output,
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_GenericSuccessResponse_output,
-  realtimekit_LivestreamingConfig_output,
-  realtimekit_Meeting_output,
-  realtimekit_PagingInfo_output,
-  realtimekit_PagingResponse_output,
-  realtimekit_RecordingConfig_output,
-  realtimekit_StorageConfig_output,
-  realtimekit_ValidationIssue_output,
-  realtimekit_VideoConfig_output,
-  realtimekit_realtimekitBucketConfig_output,
-} from "../outputs.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
   realtimekit_AudioConfig,
+  realtimekit_GenericErrorResponse,
+  realtimekit_GenericSuccessResponse,
   realtimekit_LivestreamingConfig,
+  realtimekit_Meeting,
+  realtimekit_PagingInfo,
+  realtimekit_PagingResponse,
+  realtimekit_RecordingConfig,
   realtimekit_StorageConfig,
+  realtimekit_ValidationIssue,
   realtimekit_VideoConfig,
-  realtimekit_account_identifier,
-  realtimekit_app_id,
   realtimekit_realtimekitBucketConfig,
+} from "../outputs.js";
+import {
+  realtimekit_AudioConfig as realtimekit_AudioConfig$,
+  realtimekit_LivestreamingConfig as realtimekit_LivestreamingConfig$,
+  realtimekit_StorageConfig as realtimekit_StorageConfig$,
+  realtimekit_VideoConfig as realtimekit_VideoConfig$,
+  realtimekit_realtimekitBucketConfig as realtimekit_realtimekitBucketConfig$,
 } from "../schemas.js";
 import {
-  realtimekit_Recording_output,
-  realtimekit_startReason_output,
-  realtimekit_stopReason_output,
+  realtimekit_Recording,
+  realtimekit_startReason,
+  realtimekit_stopReason,
 } from "./outputs.js";
 import { realtimekit_InteractiveConfig } from "./schemas.js";
 
@@ -39,18 +37,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_recordings_control",
     title: "Pause/Resume/Stop recording",
-    description: "Pause/Resume/Stop a given recording ID.\n\nThis method is beta.",
+    description: "Pause/Resume/Stop a given recording ID.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/realtime/kit/{app_id}/recordings/{recording_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "properties": {
             "action": {
@@ -67,22 +57,36 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "recording_id": {
-          "description": "ID of the recording",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "recording_id": {
+              "description": "ID of the recording",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "recording_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "recording_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -117,11 +121,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_startReason": realtimekit_startReason_output,
-        "realtimekit_stopReason": realtimekit_stopReason_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_startReason": realtimekit_startReason,
+        "realtimekit_stopReason": realtimekit_stopReason,
       },
     },
     annotations: {
@@ -180,13 +184,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_startReason": realtimekit_startReason_output,
-        "realtimekit_stopReason": realtimekit_stopReason_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_startReason": realtimekit_startReason,
+        "realtimekit_stopReason": realtimekit_stopReason,
       },
     },
     request: (args) => ({
@@ -197,33 +201,39 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_recordings_get",
     title: "Fetch details of a recording",
-    description: "Returns details of a recording for the given recording ID.\n\nThis method is beta.",
+    description: "Returns details of a recording for the given recording ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/recordings/{recording_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "recording_id": {
-          "description": "ID of the recording",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "recording_id": {
+              "description": "ID of the recording",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "recording_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "recording_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -258,11 +268,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_startReason": realtimekit_startReason_output,
-        "realtimekit_stopReason": realtimekit_stopReason_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_startReason": realtimekit_startReason,
+        "realtimekit_stopReason": realtimekit_stopReason,
       },
     },
     annotations: {
@@ -321,13 +331,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_startReason": realtimekit_startReason_output,
-        "realtimekit_stopReason": realtimekit_stopReason_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_startReason": realtimekit_startReason,
+        "realtimekit_stopReason": realtimekit_stopReason,
       },
     },
     request: (args) => ({
@@ -337,86 +347,98 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_recordings_list",
     title: "Fetch all recordings for an App",
-    description: "Returns all recordings for an App. If the `meeting_id` parameter is passed, returns all recordings for the given meeting ID.\n\nThis method is beta.",
+    description: "Returns all recordings for an App. If the `meeting_id` parameter is passed, returns all recordings for the given meeting ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/recordings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "end_time": {
-          "description": "The end time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "expired": {
-          "description": "If passed, only shows expired/non-expired recordings on RealtimeKit's bucket",
-          "type": "boolean"
-        },
-        "meeting_id": {
-          "description": "ID of a meeting. Optional. Will limit results to only this meeting if passed.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Number of results per page",
-          "type": "number"
-        },
-        "search": {
-          "description": "The search query string. You can search using the meeting ID or title.",
-          "type": "string"
-        },
-        "sort_by": {
-          "enum": [
-            "invokedTime"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "enum": [
-            "ASC",
-            "DESC"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "start_time": {
-          "description": "The start time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
-          "format": "date-time",
-          "type": "string"
+          "type": "object"
         },
-        "status": {
-          "description": "Filter by one or more recording status",
-          "items": {
-            "enum": [
-              "INVOKED",
-              "RECORDING",
-              "UPLOADING",
-              "UPLOADED",
-              "ERRORED",
-              "PAUSED"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "end_time": {
+              "description": "The end time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "expired": {
+              "description": "If passed, only shows expired/non-expired recordings on RealtimeKit's bucket",
+              "type": "boolean"
+            },
+            "meeting_id": {
+              "description": "ID of a meeting. Optional. Will limit results to only this meeting if passed.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page",
+              "type": "number"
+            },
+            "search": {
+              "description": "The search query string. You can search using the meeting ID or title.",
+              "type": "string"
+            },
+            "sort_by": {
+              "enum": [
+                "invokedTime"
+              ],
+              "type": "string"
+            },
+            "sort_order": {
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            },
+            "start_time": {
+              "description": "The start time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter by one or more recording status",
+              "items": {
+                "enum": [
+                  "INVOKED",
+                  "RECORDING",
+                  "UPLOADING",
+                  "UPLOADED",
+                  "ERRORED",
+                  "PAUSED"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -456,16 +478,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_PagingResponse": realtimekit_PagingResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_PagingResponse": realtimekit_PagingResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     annotations: {
@@ -528,51 +550,43 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_AudioConfig": realtimekit_AudioConfig_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig_output,
-        "realtimekit_Meeting": realtimekit_Meeting_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_PagingResponse": realtimekit_PagingResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_RecordingConfig": realtimekit_RecordingConfig_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig_output,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig_output,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
+        "realtimekit_Meeting": realtimekit_Meeting,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_PagingResponse": realtimekit_PagingResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_RecordingConfig": realtimekit_RecordingConfig,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/recordings`,
       query: [
-        ["meeting_id", args["meeting_id"], true],
-        ["page_no", args["page_no"], true],
-        ["per_page", args["per_page"], true],
-        ["expired", args["expired"], true],
-        ["search", args["search"], true],
-        ["sort_by", args["sort_by"], true],
-        ["sort_order", args["sort_order"], true],
-        ["start_time", args["start_time"], true],
-        ["end_time", args["end_time"], true],
-        ["status", args["status"], false],
+        ["meeting_id", param(args, "query", "meeting_id"), true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["expired", param(args, "query", "expired"), true],
+        ["search", param(args, "query", "search"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
+        ["start_time", param(args, "query", "start_time"), true],
+        ["end_time", param(args, "query", "end_time"), true],
+        ["status", param(args, "query", "status"), false],
       ],
     }),
   },
   {
     name: "realtime_kit_recordings_start",
     title: "Start recording a meeting",
-    description: "Starts recording a meeting. The meeting can be started by an App admin directly, or a participant with permissions to start a recording, based on the type of authorization used.\n\nThis method is beta.",
+    description: "Starts recording a meeting. The meeting can be started by an App admin directly, or a participant with permissions to start a recording, based on the type of authorization used.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/recordings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "properties": {
             "allow_multiple_recordings": {
@@ -622,22 +636,38 @@ export const tools: readonly Tool[] = [
             "meeting_id"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "realtimekit_AudioConfig": realtimekit_AudioConfig,
+        "realtimekit_AudioConfig": realtimekit_AudioConfig$,
         "realtimekit_InteractiveConfig": realtimekit_InteractiveConfig,
-        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig,
-        "realtimekit_VideoConfig": realtimekit_VideoConfig,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig,
+        "realtimekit_LivestreamingConfig": realtimekit_LivestreamingConfig$,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig$,
+        "realtimekit_VideoConfig": realtimekit_VideoConfig$,
+        "realtimekit_realtimekitBucketConfig": realtimekit_realtimekitBucketConfig$,
       },
     },
     outputSchema: {
@@ -673,11 +703,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_startReason": realtimekit_startReason_output,
-        "realtimekit_stopReason": realtimekit_stopReason_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_startReason": realtimekit_startReason,
+        "realtimekit_stopReason": realtimekit_stopReason,
       },
     },
     annotations: {
@@ -736,13 +766,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_StorageConfig": realtimekit_StorageConfig_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_startReason": realtimekit_startReason_output,
-        "realtimekit_stopReason": realtimekit_stopReason_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_StorageConfig": realtimekit_StorageConfig,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_startReason": realtimekit_startReason,
+        "realtimekit_stopReason": realtimekit_stopReason,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/recordings/tracks/tools.ts b/src/generated/forge-mcp/realtime/kit/recordings/tracks/tools.ts
index 39518abe0..7b2efb899 100644
--- a/src/generated/forge-mcp/realtime/kit/recordings/tracks/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/recordings/tracks/tools.ts
@@ -3,15 +3,11 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_GenericSuccessResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_GenericSuccessResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_Recording_output } from "../outputs.js";
+import { realtimekit_Recording } from "../outputs.js";
 import { realtimekit_TrackConfigLayer } from "./schemas.js";
 
 /**
@@ -21,18 +17,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_recordings_tracks_start",
     title: "Start recording participant audio tracks",
-    description: "Starts track recording for a meeting. Track recording currently records separate participant audio tracks as WebM files in the RealtimeKit bucket. Video track recording is in development. For more information, refer to [Track recording](/realtime/realtimekit/recording-guide/track-recording/).\n\nThis method is beta.",
+    description: "Starts track recording for a meeting. Track recording currently records separate participant audio tracks as WebM files in the RealtimeKit bucket. Video track recording is in development. For more information, refer to [Track recording](/realtime/realtimekit/recording-guide/track-recording/).\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/recordings/track",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "description": "Starts audio track recording for an active meeting. Use `layers` only when you need to set a file name prefix. Selective track recording (`user_ids`) is in early beta contact support to use this feature.",
           "properties": {
@@ -62,17 +50,33 @@ export const tools: readonly Tool[] = [
             "meeting_id"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "realtimekit_TrackConfigLayer": realtimekit_TrackConfigLayer,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
       },
     },
     outputSchema: {
@@ -98,8 +102,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
       },
     },
     annotations: {
@@ -147,10 +151,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse_output,
-        "realtimekit_Recording": realtimekit_Recording_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_GenericSuccessResponse": realtimekit_GenericSuccessResponse,
+        "realtimekit_Recording": realtimekit_Recording,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/schemas.ts b/src/generated/forge-mcp/realtime/kit/schemas.ts
index 64a2408d2..dfeb588df 100644
--- a/src/generated/forge-mcp/realtime/kit/schemas.ts
+++ b/src/generated/forge-mcp/realtime/kit/schemas.ts
@@ -54,7 +54,7 @@ export const realtimekit_LivestreamingConfig: JsonSchema = {
  * The schema of `realtimekit_RecordingConfig`.
  */
 export const realtimekit_RecordingConfig: JsonSchema = {
-  "description": "Recording Configurations to be used for this meeting. This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.\n",
+  "description": "Recording Configurations to be used for this meeting. This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.",
   "properties": {
     "audio_config": {
       "$ref": "#/$defs/realtimekit_AudioConfig",
@@ -99,7 +99,7 @@ export const realtimekit_StorageConfig: JsonSchema = {
               "type": "string"
             },
             "auth_method": {
-              "description": "Authentication method used for \"sftp\" type storage medium\n",
+              "description": "Authentication method used for \"sftp\" type storage medium",
               "enum": [
                 "KEY",
                 "PASSWORD"
@@ -319,22 +319,6 @@ export const realtimekit_VideoConfig: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `realtimekit_account_identifier`.
- */
-export const realtimekit_account_identifier: JsonSchema = {
-  "description": "The account identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `realtimekit_app_id`.
- */
-export const realtimekit_app_id: JsonSchema = {
-  "description": "The app identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `realtimekit_realtimekitBucketConfig`.
  */
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/chat/outputs.ts b/src/generated/forge-mcp/realtime/kit/sessions/chat/outputs.ts
index 81656187b..64de39101 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/chat/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/chat/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `realtimekit_ChatMessage` in responses.
  */
-export const realtimekit_ChatMessage_output: JsonSchema = {
+export const realtimekit_ChatMessage: JsonSchema = {
   "properties": {
     "chat_download_url": {
       "type": "string"
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/chat/tools.ts b/src/generated/forge-mcp/realtime/kit/sessions/chat/tools.ts
index 975ec05a6..9aa47fa70 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/chat/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/chat/tools.ts
@@ -3,14 +3,10 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_ChatMessage_output } from "./outputs.js";
+import { realtimekit_ChatMessage } from "./outputs.js";
 
 /**
  * The tools of `realtime.kit.sessions.chat`.
@@ -19,33 +15,39 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_sessions_chat_export",
     title: "Fetch all chat messages of a session",
-    description: "Returns a URL to download all chat messages of the session ID in CSV format.\n\nThis method is beta.",
+    description: "Returns a URL to download all chat messages of the session ID in CSV format.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/chat",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "session_id": {
-          "description": "ID of the session",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "ID of the session",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "session_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -58,7 +60,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_ChatMessage": realtimekit_ChatMessage_output,
+        "realtimekit_ChatMessage": realtimekit_ChatMessage,
       },
     },
     annotations: {
@@ -94,9 +96,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_ChatMessage": realtimekit_ChatMessage_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_ChatMessage": realtimekit_ChatMessage,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/livestreams/tools.ts b/src/generated/forge-mcp/realtime/kit/sessions/livestreams/tools.ts
index f0053a5cc..c96cda998 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/livestreams/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/livestreams/tools.ts
@@ -1,17 +1,13 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_LivestreamSession_output,
-  realtimekit_PagingInfo_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_LivestreamSession,
+  realtimekit_PagingInfo,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
 
 /**
  * The tools of `realtime.kit.sessions.livestreams`.
@@ -20,40 +16,52 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_sessions_livestreams_get",
     title: "Fetch livestream session details using a session ID",
-    description: "Returns livestream session details for the given session ID. Retreive the session ID using the `Fetch all sessions of an App` API.\n\nThis method is beta.",
+    description: "Returns livestream session details for the given session ID. Retreive the session ID using the `Fetch all sessions of an App` API.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/livestream-sessions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "session_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "session_id"
+          ],
+          "type": "object"
         },
-        "session_id": {
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "session_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -85,8 +93,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
       },
     },
     annotations: {
@@ -141,17 +149,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_LivestreamSession": realtimekit_LivestreamSession_output,
-        "realtimekit_PagingInfo": realtimekit_PagingInfo_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_LivestreamSession": realtimekit_LivestreamSession,
+        "realtimekit_PagingInfo": realtimekit_PagingInfo,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/sessions/${pathParam(args, "session_id")}/livestream-sessions`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page_no", args["page_no"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page_no", param(args, "query", "page_no"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/outputs.ts b/src/generated/forge-mcp/realtime/kit/sessions/outputs.ts
index 4a2ac3d8b..33b4b2f1d 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `realtimekit_PeerEvent` in responses.
  */
-export const realtimekit_PeerEvent_output: JsonSchema = {
+export const realtimekit_PeerEvent: JsonSchema = {
   "properties": {
     "created_at": {
       "type": "string"
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/participants/outputs.ts b/src/generated/forge-mcp/realtime/kit/sessions/participants/outputs.ts
index d27f18eb9..70ebd6466 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/participants/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/participants/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `realtimekit_ParticipantsList` in responses.
  */
-export const realtimekit_ParticipantsList_output: JsonSchema = {
+export const realtimekit_ParticipantsList: JsonSchema = {
   "properties": {
     "created_at": {
       "type": "string"
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/participants/tools.ts b/src/generated/forge-mcp/realtime/kit/sessions/participants/tools.ts
index eb7512341..0ad0df41a 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/participants/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/participants/tools.ts
@@ -1,17 +1,13 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_PeerEvent_output } from "../outputs.js";
-import { realtimekit_ParticipantsList_output } from "./outputs.js";
+import { realtimekit_PeerEvent } from "../outputs.js";
+import { realtimekit_ParticipantsList } from "./outputs.js";
 
 /**
  * The tools of `realtime.kit.sessions.participants`.
@@ -20,44 +16,56 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_sessions_participants_get",
     title: "Fetch details of a participant",
-    description: "Returns details of the given participant ID for the given session ID. Use the peer report endpoint to retrieve call statistics.\n\nThis method is beta.",
+    description: "Returns details of the given participant ID for the given session ID. Use the peer report endpoint to retrieve call statistics.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/participants/{participant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "include_peer_events": {
-          "default": false,
-          "description": "if true, response includes all the peer events of participant.",
-          "type": "boolean"
-        },
-        "participant_id": {
-          "description": "ID of the participant",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "participant_id": {
+              "description": "ID of the participant",
+              "format": "uuid",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "ID of the session",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "session_id",
+            "participant_id"
+          ],
+          "type": "object"
         },
-        "session_id": {
-          "description": "ID of the session",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_peer_events": {
+              "default": false,
+              "description": "if true, response includes all the peer events of participant.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "session_id",
-        "participant_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -75,8 +83,8 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_ParticipantsList": realtimekit_ParticipantsList_output,
-        "realtimekit_PeerEvent": realtimekit_PeerEvent_output,
+        "realtimekit_ParticipantsList": realtimekit_ParticipantsList,
+        "realtimekit_PeerEvent": realtimekit_PeerEvent,
       },
     },
     annotations: {
@@ -117,90 +125,102 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ParticipantsList": realtimekit_ParticipantsList_output,
-        "realtimekit_PeerEvent": realtimekit_PeerEvent_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ParticipantsList": realtimekit_ParticipantsList,
+        "realtimekit_PeerEvent": realtimekit_PeerEvent,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/sessions/${pathParam(args, "session_id")}/participants/${pathParam(args, "participant_id")}`,
       query: [
-        ["include_peer_events", args["include_peer_events"], true],
+        ["include_peer_events", param(args, "query", "include_peer_events"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_sessions_participants_list",
     title: "Fetch participants list of a session",
-    description: "Returns a list of participants for the given session ID.\n\nThis method is beta.",
+    description: "Returns a list of participants for the given session ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/participants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "include_peer_events": {
-          "default": false,
-          "description": "if true, response includes all the peer events of participants.",
-          "type": "boolean"
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 25,
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "The search query string. You can search using participant ID, custom participant ID, or display name.",
-          "type": "string"
-        },
-        "session_id": {
-          "description": "ID of the session",
-          "format": "uuid",
-          "type": "string"
-        },
-        "sort_by": {
-          "enum": [
-            "joinedAt",
-            "duration"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "enum": [
-            "ASC",
-            "DESC"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "ID of the session",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "session_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "view": {
-          "default": "raw",
-          "description": "In breakout room sessions, the view parameter can be set to `raw` for session specific duration for participants or `consolidated` to accumulate breakout room durations.",
-          "enum": [
-            "raw",
-            "consolidated"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_peer_events": {
+              "default": false,
+              "description": "if true, response includes all the peer events of participants.",
+              "type": "boolean"
+            },
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "The search query string. You can search using participant ID, custom participant ID, or display name.",
+              "type": "string"
+            },
+            "sort_by": {
+              "enum": [
+                "joinedAt",
+                "duration"
+              ],
+              "type": "string"
+            },
+            "sort_order": {
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            },
+            "view": {
+              "default": "raw",
+              "description": "In breakout room sessions, the view parameter can be set to `raw` for session specific duration for participants or `consolidated` to accumulate breakout room durations.",
+              "enum": [
+                "raw",
+                "consolidated"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "session_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -221,8 +241,8 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_ParticipantsList": realtimekit_ParticipantsList_output,
-        "realtimekit_PeerEvent": realtimekit_PeerEvent_output,
+        "realtimekit_ParticipantsList": realtimekit_ParticipantsList,
+        "realtimekit_PeerEvent": realtimekit_PeerEvent,
       },
     },
     annotations: {
@@ -266,22 +286,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ParticipantsList": realtimekit_ParticipantsList_output,
-        "realtimekit_PeerEvent": realtimekit_PeerEvent_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ParticipantsList": realtimekit_ParticipantsList,
+        "realtimekit_PeerEvent": realtimekit_PeerEvent,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/sessions/${pathParam(args, "session_id")}/participants`,
       query: [
-        ["search", args["search"], true],
-        ["page_no", args["page_no"], true],
-        ["per_page", args["per_page"], true],
-        ["sort_order", args["sort_order"], true],
-        ["sort_by", args["sort_by"], true],
-        ["include_peer_events", args["include_peer_events"], true],
-        ["view", args["view"], true],
+        ["search", param(args, "query", "search"), true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
+        ["include_peer_events", param(args, "query", "include_peer_events"), true],
+        ["view", param(args, "query", "view"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/peers/outputs.ts b/src/generated/forge-mcp/realtime/kit/sessions/peers/outputs.ts
index 00b67e294..102ae8514 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/peers/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/peers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `realtimekit_AudioConsumerStats` in responses.
  */
-export const realtimekit_AudioConsumerStats_output: JsonSchema = {
+export const realtimekit_AudioConsumerStats: JsonSchema = {
   "properties": {
     "bytes_received": {
       "type": "number"
@@ -57,7 +57,7 @@ export const realtimekit_AudioConsumerStats_output: JsonSchema = {
 /**
  * The schema of `realtimekit_AudioConsumerStatsCumulative` in responses.
  */
-export const realtimekit_AudioConsumerStatsCumulative_output: JsonSchema = {
+export const realtimekit_AudioConsumerStatsCumulative: JsonSchema = {
   "properties": {
     "jitter_buffer_delay": {
       "$ref": "#/$defs/realtimekit_LatencyCumulative"
@@ -75,7 +75,7 @@ export const realtimekit_AudioConsumerStatsCumulative_output: JsonSchema = {
 /**
  * The schema of `realtimekit_AudioProducerStats` in responses.
  */
-export const realtimekit_AudioProducerStats_output: JsonSchema = {
+export const realtimekit_AudioProducerStats: JsonSchema = {
   "properties": {
     "bytes_sent": {
       "type": "number"
@@ -114,7 +114,7 @@ export const realtimekit_AudioProducerStats_output: JsonSchema = {
 /**
  * The schema of `realtimekit_AudioProducerStatsCumulative` in responses.
  */
-export const realtimekit_AudioProducerStatsCumulative_output: JsonSchema = {
+export const realtimekit_AudioProducerStatsCumulative: JsonSchema = {
   "properties": {
     "packet_loss": {
       "$ref": "#/$defs/realtimekit_PacketLossCumulative"
@@ -132,7 +132,7 @@ export const realtimekit_AudioProducerStatsCumulative_output: JsonSchema = {
 /**
  * The schema of `realtimekit_CandidatePairStats` in responses.
  */
-export const realtimekit_CandidatePairStats_output: JsonSchema = {
+export const realtimekit_CandidatePairStats: JsonSchema = {
   "properties": {
     "available_incoming_bitrate": {
       "type": "number"
@@ -225,7 +225,7 @@ export const realtimekit_CandidatePairStats_output: JsonSchema = {
 /**
  * The schema of `realtimekit_LatencyCumulative` in responses.
  */
-export const realtimekit_LatencyCumulative_output: JsonSchema = {
+export const realtimekit_LatencyCumulative: JsonSchema = {
   "properties": {
     "100ms_or_greater_event_fraction": {
       "type": "number"
@@ -246,7 +246,7 @@ export const realtimekit_LatencyCumulative_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PacketLossCumulative` in responses.
  */
-export const realtimekit_PacketLossCumulative_output: JsonSchema = {
+export const realtimekit_PacketLossCumulative: JsonSchema = {
   "properties": {
     "10_or_greater_event_fraction": {
       "type": "number"
@@ -270,7 +270,7 @@ export const realtimekit_PacketLossCumulative_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PeerParticipantDetails` in responses.
  */
-export const realtimekit_PeerParticipantDetails_output: JsonSchema = {
+export const realtimekit_PeerParticipantDetails: JsonSchema = {
   "properties": {
     "created_at": {
       "type": "string"
@@ -323,7 +323,7 @@ export const realtimekit_PeerParticipantDetails_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PeerReport` in responses.
  */
-export const realtimekit_PeerReport_output: JsonSchema = {
+export const realtimekit_PeerReport: JsonSchema = {
   "properties": {
     "metadata": {
       "$ref": "#/$defs/realtimekit_PeerReportMetadata"
@@ -338,7 +338,7 @@ export const realtimekit_PeerReport_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PeerReportDevice` in responses.
  */
-export const realtimekit_PeerReportDevice_output: JsonSchema = {
+export const realtimekit_PeerReportDevice: JsonSchema = {
   "properties": {
     "device_id": {
       "type": "string"
@@ -356,7 +356,7 @@ export const realtimekit_PeerReportDevice_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PeerReportDeviceUpdate` in responses.
  */
-export const realtimekit_PeerReportDeviceUpdate_output: JsonSchema = {
+export const realtimekit_PeerReportDeviceUpdate: JsonSchema = {
   "properties": {
     "added": {
       "items": {
@@ -380,7 +380,7 @@ export const realtimekit_PeerReportDeviceUpdate_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PeerReportEvent` in responses.
  */
-export const realtimekit_PeerReportEvent_output: JsonSchema = {
+export const realtimekit_PeerReportEvent: JsonSchema = {
   "properties": {
     "metadata": {
       "additionalProperties": {
@@ -414,7 +414,7 @@ export const realtimekit_PeerReportEvent_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PeerReportMetadata` in responses.
  */
-export const realtimekit_PeerReportMetadata_output: JsonSchema = {
+export const realtimekit_PeerReportMetadata: JsonSchema = {
   "properties": {
     "audio_devices_updates": {
       "items": {
@@ -617,7 +617,7 @@ export const realtimekit_PeerReportMetadata_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PeerReportQuality` in responses.
  */
-export const realtimekit_PeerReportQuality_output: JsonSchema = {
+export const realtimekit_PeerReportQuality: JsonSchema = {
   "properties": {
     "audio_consumer": {
       "items": {
@@ -698,7 +698,7 @@ export const realtimekit_PeerReportQuality_output: JsonSchema = {
 /**
  * The schema of `realtimekit_PercentileStats` in responses.
  */
-export const realtimekit_PercentileStats_output: JsonSchema = {
+export const realtimekit_PercentileStats: JsonSchema = {
   "properties": {
     "avg": {
       "type": "number"
@@ -719,7 +719,7 @@ export const realtimekit_PercentileStats_output: JsonSchema = {
 /**
  * The schema of `realtimekit_VideoConsumerStats` in responses.
  */
-export const realtimekit_VideoConsumerStats_output: JsonSchema = {
+export const realtimekit_VideoConsumerStats: JsonSchema = {
   "properties": {
     "bytes_received": {
       "type": "number"
@@ -788,7 +788,7 @@ export const realtimekit_VideoConsumerStats_output: JsonSchema = {
 /**
  * The schema of `realtimekit_VideoConsumerStatsCumulative` in responses.
  */
-export const realtimekit_VideoConsumerStatsCumulative_output: JsonSchema = {
+export const realtimekit_VideoConsumerStatsCumulative: JsonSchema = {
   "properties": {
     "frame_per_second": {
       "$ref": "#/$defs/realtimekit_PercentileStats"
@@ -829,7 +829,7 @@ export const realtimekit_VideoConsumerStatsCumulative_output: JsonSchema = {
 /**
  * The schema of `realtimekit_VideoProducerStats` in responses.
  */
-export const realtimekit_VideoProducerStats_output: JsonSchema = {
+export const realtimekit_VideoProducerStats: JsonSchema = {
   "properties": {
     "bytes_sent": {
       "type": "number"
@@ -918,7 +918,7 @@ export const realtimekit_VideoProducerStats_output: JsonSchema = {
 /**
  * The schema of `realtimekit_VideoProducerStatsCumulative` in responses.
  */
-export const realtimekit_VideoProducerStatsCumulative_output: JsonSchema = {
+export const realtimekit_VideoProducerStatsCumulative: JsonSchema = {
   "properties": {
     "frame_per_second": {
       "$ref": "#/$defs/realtimekit_PercentileStats"
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/peers/tools.ts b/src/generated/forge-mcp/realtime/kit/sessions/peers/tools.ts
index d8cbf9ee0..2058c6ac4 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/peers/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/peers/tools.ts
@@ -1,36 +1,32 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
+import { realtimekit_PeerEvent } from "../outputs.js";
 import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_PeerEvent_output } from "../outputs.js";
-import {
-  realtimekit_AudioConsumerStatsCumulative_output,
-  realtimekit_AudioConsumerStats_output,
-  realtimekit_AudioProducerStatsCumulative_output,
-  realtimekit_AudioProducerStats_output,
-  realtimekit_CandidatePairStats_output,
-  realtimekit_LatencyCumulative_output,
-  realtimekit_PacketLossCumulative_output,
-  realtimekit_PeerParticipantDetails_output,
-  realtimekit_PeerReportDeviceUpdate_output,
-  realtimekit_PeerReportDevice_output,
-  realtimekit_PeerReportEvent_output,
-  realtimekit_PeerReportMetadata_output,
-  realtimekit_PeerReportQuality_output,
-  realtimekit_PeerReport_output,
-  realtimekit_PercentileStats_output,
-  realtimekit_VideoConsumerStatsCumulative_output,
-  realtimekit_VideoConsumerStats_output,
-  realtimekit_VideoProducerStatsCumulative_output,
-  realtimekit_VideoProducerStats_output,
+  realtimekit_AudioConsumerStats,
+  realtimekit_AudioConsumerStatsCumulative,
+  realtimekit_AudioProducerStats,
+  realtimekit_AudioProducerStatsCumulative,
+  realtimekit_CandidatePairStats,
+  realtimekit_LatencyCumulative,
+  realtimekit_PacketLossCumulative,
+  realtimekit_PeerParticipantDetails,
+  realtimekit_PeerReport,
+  realtimekit_PeerReportDevice,
+  realtimekit_PeerReportDeviceUpdate,
+  realtimekit_PeerReportEvent,
+  realtimekit_PeerReportMetadata,
+  realtimekit_PeerReportQuality,
+  realtimekit_PercentileStats,
+  realtimekit_VideoConsumerStats,
+  realtimekit_VideoConsumerStatsCumulative,
+  realtimekit_VideoProducerStats,
+  realtimekit_VideoProducerStatsCumulative,
 } from "./outputs.js";
 
 /**
@@ -40,49 +36,61 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_sessions_peers_get",
     title: "Fetch details of peer",
-    description: "Returns participant details for the given peer ID along with call statistics.\n\nThis method is beta.",
+    description: "Returns participant details for the given peer ID along with call statistics.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions/peer-report/{peer_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "filters": {
-          "description": "Filter to apply to the peer report.",
-          "enum": [
-            "device_info",
-            "ip_information",
-            "precall_network_information",
-            "events",
-            "quality_stats"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "peer_id": {
+              "description": "ID of the peer",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "peer_id"
           ],
-          "type": "string"
-        },
-        "include_peer_events": {
-          "default": false,
-          "description": "if true, response includes all the peer events of participant.",
-          "type": "boolean"
+          "type": "object"
         },
-        "peer_id": {
-          "description": "ID of the peer",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "filters": {
+              "description": "Filter to apply to the peer report.",
+              "enum": [
+                "device_info",
+                "ip_information",
+                "precall_network_information",
+                "events",
+                "quality_stats"
+              ],
+              "type": "string"
+            },
+            "include_peer_events": {
+              "default": false,
+              "description": "if true, response includes all the peer events of participant.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "peer_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -100,26 +108,26 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_AudioConsumerStats": realtimekit_AudioConsumerStats_output,
-        "realtimekit_AudioConsumerStatsCumulative": realtimekit_AudioConsumerStatsCumulative_output,
-        "realtimekit_AudioProducerStats": realtimekit_AudioProducerStats_output,
-        "realtimekit_AudioProducerStatsCumulative": realtimekit_AudioProducerStatsCumulative_output,
-        "realtimekit_CandidatePairStats": realtimekit_CandidatePairStats_output,
-        "realtimekit_LatencyCumulative": realtimekit_LatencyCumulative_output,
-        "realtimekit_PacketLossCumulative": realtimekit_PacketLossCumulative_output,
-        "realtimekit_PeerEvent": realtimekit_PeerEvent_output,
-        "realtimekit_PeerParticipantDetails": realtimekit_PeerParticipantDetails_output,
-        "realtimekit_PeerReport": realtimekit_PeerReport_output,
-        "realtimekit_PeerReportDevice": realtimekit_PeerReportDevice_output,
-        "realtimekit_PeerReportDeviceUpdate": realtimekit_PeerReportDeviceUpdate_output,
-        "realtimekit_PeerReportEvent": realtimekit_PeerReportEvent_output,
-        "realtimekit_PeerReportMetadata": realtimekit_PeerReportMetadata_output,
-        "realtimekit_PeerReportQuality": realtimekit_PeerReportQuality_output,
-        "realtimekit_PercentileStats": realtimekit_PercentileStats_output,
-        "realtimekit_VideoConsumerStats": realtimekit_VideoConsumerStats_output,
-        "realtimekit_VideoConsumerStatsCumulative": realtimekit_VideoConsumerStatsCumulative_output,
-        "realtimekit_VideoProducerStats": realtimekit_VideoProducerStats_output,
-        "realtimekit_VideoProducerStatsCumulative": realtimekit_VideoProducerStatsCumulative_output,
+        "realtimekit_AudioConsumerStats": realtimekit_AudioConsumerStats,
+        "realtimekit_AudioConsumerStatsCumulative": realtimekit_AudioConsumerStatsCumulative,
+        "realtimekit_AudioProducerStats": realtimekit_AudioProducerStats,
+        "realtimekit_AudioProducerStatsCumulative": realtimekit_AudioProducerStatsCumulative,
+        "realtimekit_CandidatePairStats": realtimekit_CandidatePairStats,
+        "realtimekit_LatencyCumulative": realtimekit_LatencyCumulative,
+        "realtimekit_PacketLossCumulative": realtimekit_PacketLossCumulative,
+        "realtimekit_PeerEvent": realtimekit_PeerEvent,
+        "realtimekit_PeerParticipantDetails": realtimekit_PeerParticipantDetails,
+        "realtimekit_PeerReport": realtimekit_PeerReport,
+        "realtimekit_PeerReportDevice": realtimekit_PeerReportDevice,
+        "realtimekit_PeerReportDeviceUpdate": realtimekit_PeerReportDeviceUpdate,
+        "realtimekit_PeerReportEvent": realtimekit_PeerReportEvent,
+        "realtimekit_PeerReportMetadata": realtimekit_PeerReportMetadata,
+        "realtimekit_PeerReportQuality": realtimekit_PeerReportQuality,
+        "realtimekit_PercentileStats": realtimekit_PercentileStats,
+        "realtimekit_VideoConsumerStats": realtimekit_VideoConsumerStats,
+        "realtimekit_VideoConsumerStatsCumulative": realtimekit_VideoConsumerStatsCumulative,
+        "realtimekit_VideoProducerStats": realtimekit_VideoProducerStats,
+        "realtimekit_VideoProducerStatsCumulative": realtimekit_VideoProducerStatsCumulative,
       },
     },
     annotations: {
@@ -160,35 +168,35 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_AudioConsumerStats": realtimekit_AudioConsumerStats_output,
-        "realtimekit_AudioConsumerStatsCumulative": realtimekit_AudioConsumerStatsCumulative_output,
-        "realtimekit_AudioProducerStats": realtimekit_AudioProducerStats_output,
-        "realtimekit_AudioProducerStatsCumulative": realtimekit_AudioProducerStatsCumulative_output,
-        "realtimekit_CandidatePairStats": realtimekit_CandidatePairStats_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_LatencyCumulative": realtimekit_LatencyCumulative_output,
-        "realtimekit_PacketLossCumulative": realtimekit_PacketLossCumulative_output,
-        "realtimekit_PeerEvent": realtimekit_PeerEvent_output,
-        "realtimekit_PeerParticipantDetails": realtimekit_PeerParticipantDetails_output,
-        "realtimekit_PeerReport": realtimekit_PeerReport_output,
-        "realtimekit_PeerReportDevice": realtimekit_PeerReportDevice_output,
-        "realtimekit_PeerReportDeviceUpdate": realtimekit_PeerReportDeviceUpdate_output,
-        "realtimekit_PeerReportEvent": realtimekit_PeerReportEvent_output,
-        "realtimekit_PeerReportMetadata": realtimekit_PeerReportMetadata_output,
-        "realtimekit_PeerReportQuality": realtimekit_PeerReportQuality_output,
-        "realtimekit_PercentileStats": realtimekit_PercentileStats_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_VideoConsumerStats": realtimekit_VideoConsumerStats_output,
-        "realtimekit_VideoConsumerStatsCumulative": realtimekit_VideoConsumerStatsCumulative_output,
-        "realtimekit_VideoProducerStats": realtimekit_VideoProducerStats_output,
-        "realtimekit_VideoProducerStatsCumulative": realtimekit_VideoProducerStatsCumulative_output,
+        "realtimekit_AudioConsumerStats": realtimekit_AudioConsumerStats,
+        "realtimekit_AudioConsumerStatsCumulative": realtimekit_AudioConsumerStatsCumulative,
+        "realtimekit_AudioProducerStats": realtimekit_AudioProducerStats,
+        "realtimekit_AudioProducerStatsCumulative": realtimekit_AudioProducerStatsCumulative,
+        "realtimekit_CandidatePairStats": realtimekit_CandidatePairStats,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_LatencyCumulative": realtimekit_LatencyCumulative,
+        "realtimekit_PacketLossCumulative": realtimekit_PacketLossCumulative,
+        "realtimekit_PeerEvent": realtimekit_PeerEvent,
+        "realtimekit_PeerParticipantDetails": realtimekit_PeerParticipantDetails,
+        "realtimekit_PeerReport": realtimekit_PeerReport,
+        "realtimekit_PeerReportDevice": realtimekit_PeerReportDevice,
+        "realtimekit_PeerReportDeviceUpdate": realtimekit_PeerReportDeviceUpdate,
+        "realtimekit_PeerReportEvent": realtimekit_PeerReportEvent,
+        "realtimekit_PeerReportMetadata": realtimekit_PeerReportMetadata,
+        "realtimekit_PeerReportQuality": realtimekit_PeerReportQuality,
+        "realtimekit_PercentileStats": realtimekit_PercentileStats,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_VideoConsumerStats": realtimekit_VideoConsumerStats,
+        "realtimekit_VideoConsumerStatsCumulative": realtimekit_VideoConsumerStatsCumulative,
+        "realtimekit_VideoProducerStats": realtimekit_VideoProducerStats,
+        "realtimekit_VideoProducerStatsCumulative": realtimekit_VideoProducerStatsCumulative,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/sessions/peer-report/${pathParam(args, "peer_id")}`,
       query: [
-        ["filters", args["filters"], true],
-        ["include_peer_events", args["include_peer_events"], true],
+        ["filters", param(args, "query", "filters"), true],
+        ["include_peer_events", param(args, "query", "include_peer_events"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/summaries/outputs.ts b/src/generated/forge-mcp/realtime/kit/sessions/summaries/outputs.ts
index 3a9c2d13c..b1a34f868 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/summaries/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/summaries/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `realtimekit_TranscriptSummary` in responses.
  */
-export const realtimekit_TranscriptSummary_output: JsonSchema = {
+export const realtimekit_TranscriptSummary: JsonSchema = {
   "properties": {
     "sessionId": {
       "type": "string"
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/summaries/tools.ts b/src/generated/forge-mcp/realtime/kit/sessions/summaries/tools.ts
index 4c9492bf4..c0d145162 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/summaries/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/summaries/tools.ts
@@ -3,14 +3,10 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_TranscriptSummary_output } from "./outputs.js";
+import { realtimekit_TranscriptSummary } from "./outputs.js";
 
 /**
  * The tools of `realtime.kit.sessions.summaries`.
@@ -19,32 +15,38 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_sessions_summaries_export",
     title: "Fetch summary of transcripts for a session",
-    description: "Returns a Summary URL to download the Summary of Transcripts for the session ID as plain text.\n\nThis method is beta.",
+    description: "Returns a Summary URL to download the Summary of Transcripts for the session ID as plain text.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "session_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "session_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "session_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -57,7 +59,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_TranscriptSummary": realtimekit_TranscriptSummary_output,
+        "realtimekit_TranscriptSummary": realtimekit_TranscriptSummary,
       },
     },
     annotations: {
@@ -93,9 +95,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_TranscriptSummary": realtimekit_TranscriptSummary_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_TranscriptSummary": realtimekit_TranscriptSummary,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
@@ -105,32 +107,38 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_sessions_summaries_generate",
     title: "Generate summary of Transcripts for the session",
-    description: "Trigger Summary generation of Transcripts for the session ID.\n\nThis method is beta.",
+    description: "Trigger Summary generation of Transcripts for the session ID.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "session_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "session_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "session_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "session_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -194,8 +202,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/tools.ts b/src/generated/forge-mcp/realtime/kit/sessions/tools.ts
index 451b0af4a..fab7846eb 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/tools.ts
@@ -1,16 +1,12 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  realtimekit_ActiveSession_output,
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_ActiveSession,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../schemas.js";
 
 /**
  * The tools of `realtime.kit.sessions`.
@@ -19,38 +15,50 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_sessions_get",
     title: "Fetch details of a session",
-    description: "Returns data of the given session ID including recording details.\n\nThis method is beta.",
+    description: "Returns data of the given session ID including recording details.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "include_breakout_rooms": {
-          "default": false,
-          "description": "List all breakout rooms",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "ID of the session",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "session_id"
+          ],
+          "type": "object"
         },
-        "session_id": {
-          "description": "ID of the session",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_breakout_rooms": {
+              "default": false,
+              "description": "List all breakout rooms",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "session_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -63,7 +71,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_ActiveSession": realtimekit_ActiveSession_output,
+        "realtimekit_ActiveSession": realtimekit_ActiveSession,
       },
     },
     annotations: {
@@ -99,93 +107,105 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_ActiveSession": realtimekit_ActiveSession_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_ActiveSession": realtimekit_ActiveSession,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/sessions/${pathParam(args, "session_id")}`,
       query: [
-        ["include_breakout_rooms", args["include_breakout_rooms"], true],
+        ["include_breakout_rooms", param(args, "query", "include_breakout_rooms"), true],
       ],
     }),
   },
   {
     name: "realtime_kit_sessions_list",
     title: "Fetch all sessions of an App",
-    description: "Returns details of all sessions of an App.\n\nThis method is beta.",
+    description: "Returns details of all sessions of an App.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "associated_id": {
-          "description": "ID of the meeting that sessions should be associated with",
-          "format": "uuid",
-          "type": "string"
-        },
-        "end_time": {
-          "description": "The end time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "page_no": {
-          "description": "The page number from which you want your page search results to be displayed.",
-          "type": "number"
-        },
-        "participants": {
-          "type": "string"
-        },
-        "per_page": {
-          "description": "Number of results per page",
-          "type": "number"
-        },
-        "search": {
-          "description": "Search string that matches sessions based on meeting title, meeting ID, and session ID",
-          "type": "string"
-        },
-        "sort_by": {
-          "enum": [
-            "minutesConsumed",
-            "createdAt"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "enum": [
-            "ASC",
-            "DESC"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "start_time": {
-          "description": "The start time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
-          "format": "date-time",
-          "type": "string"
+          "type": "object"
         },
-        "status": {
-          "enum": [
-            "LIVE",
-            "ENDED"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "associated_id": {
+              "description": "ID of the meeting that sessions should be associated with",
+              "format": "uuid",
+              "type": "string"
+            },
+            "end_time": {
+              "description": "The end time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "page_no": {
+              "description": "The page number from which you want your page search results to be displayed.",
+              "type": "number"
+            },
+            "participants": {
+              "type": "string"
+            },
+            "per_page": {
+              "description": "Number of results per page",
+              "type": "number"
+            },
+            "search": {
+              "description": "Search string that matches sessions based on meeting title, meeting ID, and session ID",
+              "type": "string"
+            },
+            "sort_by": {
+              "enum": [
+                "minutesConsumed",
+                "createdAt"
+              ],
+              "type": "string"
+            },
+            "sort_order": {
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            },
+            "start_time": {
+              "description": "The start time range for which you want to retrieve the meetings. The time must be specified in ISO format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "status": {
+              "enum": [
+                "LIVE",
+                "ENDED"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -220,7 +240,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_ActiveSession": realtimekit_ActiveSession_output,
+        "realtimekit_ActiveSession": realtimekit_ActiveSession,
       },
     },
     annotations: {
@@ -278,24 +298,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_ActiveSession": realtimekit_ActiveSession_output,
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_ActiveSession": realtimekit_ActiveSession,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/sessions`,
       query: [
-        ["page_no", args["page_no"], true],
-        ["per_page", args["per_page"], true],
-        ["sort_by", args["sort_by"], true],
-        ["sort_order", args["sort_order"], true],
-        ["start_time", args["start_time"], true],
-        ["end_time", args["end_time"], true],
-        ["participants", args["participants"], true],
-        ["status", args["status"], true],
-        ["search", args["search"], true],
-        ["associated_id", args["associated_id"], true],
+        ["page_no", param(args, "query", "page_no"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
+        ["start_time", param(args, "query", "start_time"), true],
+        ["end_time", param(args, "query", "end_time"), true],
+        ["participants", param(args, "query", "participants"), true],
+        ["status", param(args, "query", "status"), true],
+        ["search", param(args, "query", "search"), true],
+        ["associated_id", param(args, "query", "associated_id"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/transcripts/outputs.ts b/src/generated/forge-mcp/realtime/kit/sessions/transcripts/outputs.ts
index edcb99aef..93d1dba87 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/transcripts/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/transcripts/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `realtimekit_Transcript` in responses.
  */
-export const realtimekit_Transcript_output: JsonSchema = {
+export const realtimekit_Transcript: JsonSchema = {
   "properties": {
     "sessionId": {
       "type": "string"
diff --git a/src/generated/forge-mcp/realtime/kit/sessions/transcripts/tools.ts b/src/generated/forge-mcp/realtime/kit/sessions/transcripts/tools.ts
index 2dd921ece..74d3119aa 100644
--- a/src/generated/forge-mcp/realtime/kit/sessions/transcripts/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/sessions/transcripts/tools.ts
@@ -1,16 +1,12 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_Transcript_output } from "./outputs.js";
+import { realtimekit_Transcript } from "./outputs.js";
 
 /**
  * The tools of `realtime.kit.sessions.transcripts`.
@@ -19,44 +15,56 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_sessions_transcripts_export",
     title: "Fetch the complete transcript for a session",
-    description: "Returns a URL to download the transcript for the session ID in CSV format.\n\nThis method is beta.",
+    description: "Returns a URL to download the transcript for the session ID in CSV format.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/transcript",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "format": {
-          "default": "CSV",
-          "description": "Transcript file format to fetch.",
-          "enum": [
-            "SRT",
-            "VTT",
-            "JSON",
-            "CSV"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "session_id": {
+              "description": "ID of the session",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "session_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "session_id": {
-          "description": "ID of the session",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "format": {
+              "default": "CSV",
+              "description": "Transcript file format to fetch.",
+              "enum": [
+                "SRT",
+                "VTT",
+                "JSON",
+                "CSV"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "session_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -69,7 +77,7 @@ export const tools: readonly Tool[] = [
       },
       "type": "object",
       $defs: {
-        "realtimekit_Transcript": realtimekit_Transcript_output,
+        "realtimekit_Transcript": realtimekit_Transcript,
       },
     },
     annotations: {
@@ -105,15 +113,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_Transcript": realtimekit_Transcript_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_Transcript": realtimekit_Transcript,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/realtime/kit/${pathParam(args, "app_id")}/sessions/${pathParam(args, "session_id")}/transcript`,
       query: [
-        ["format", args["format"], true],
+        ["format", param(args, "query", "format"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/realtime/kit/webhooks/events/outputs.ts b/src/generated/forge-mcp/realtime/kit/webhooks/events/outputs.ts
index 2ff0bfde4..f0a657cb9 100644
--- a/src/generated/forge-mcp/realtime/kit/webhooks/events/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/webhooks/events/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `realtimekit_WebhookEventsSuccessResponse` in responses.
  */
-export const realtimekit_WebhookEventsSuccessResponse_output: JsonSchema = {
+export const realtimekit_WebhookEventsSuccessResponse: JsonSchema = {
   "properties": {
     "data": {
       "items": {
diff --git a/src/generated/forge-mcp/realtime/kit/webhooks/events/tools.ts b/src/generated/forge-mcp/realtime/kit/webhooks/events/tools.ts
index bc858fd67..4855d5f09 100644
--- a/src/generated/forge-mcp/realtime/kit/webhooks/events/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/webhooks/events/tools.ts
@@ -3,14 +3,10 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  realtimekit_GenericErrorResponse_output,
-  realtimekit_ValidationIssue_output,
+  realtimekit_GenericErrorResponse,
+  realtimekit_ValidationIssue,
 } from "../../outputs.js";
-import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../../schemas.js";
-import { realtimekit_WebhookEventsSuccessResponse_output } from "./outputs.js";
+import { realtimekit_WebhookEventsSuccessResponse } from "./outputs.js";
 
 /**
  * The tools of `realtime.kit.webhooks.events`.
@@ -19,32 +15,38 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_webhooks_events_list",
     title: "Fetch all supported webhook events",
-    description: "Returns the list of webhook event names supported by RealtimeKit.\n\nThis method is beta.",
+    description: "Returns the list of webhook event names supported by RealtimeKit.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/webhooks/all",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/realtimekit_WebhookEventsSuccessResponse",
       $defs: {
-        "realtimekit_WebhookEventsSuccessResponse": realtimekit_WebhookEventsSuccessResponse_output,
+        "realtimekit_WebhookEventsSuccessResponse": realtimekit_WebhookEventsSuccessResponse,
       },
     },
     annotations: {
@@ -72,9 +74,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse_output,
-        "realtimekit_ValidationIssue": realtimekit_ValidationIssue_output,
-        "realtimekit_WebhookEventsSuccessResponse": realtimekit_WebhookEventsSuccessResponse_output,
+        "realtimekit_GenericErrorResponse": realtimekit_GenericErrorResponse,
+        "realtimekit_ValidationIssue": realtimekit_ValidationIssue,
+        "realtimekit_WebhookEventsSuccessResponse": realtimekit_WebhookEventsSuccessResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/kit/webhooks/outputs.ts b/src/generated/forge-mcp/realtime/kit/webhooks/outputs.ts
index dd9f75786..3647a9906 100644
--- a/src/generated/forge-mcp/realtime/kit/webhooks/outputs.ts
+++ b/src/generated/forge-mcp/realtime/kit/webhooks/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `realtimekit_Webhook` in responses.
  */
-export const realtimekit_Webhook_output: JsonSchema = {
+export const realtimekit_Webhook: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -62,7 +62,7 @@ export const realtimekit_Webhook_output: JsonSchema = {
 /**
  * The schema of `realtimekit_WebhookSuccessResponse` in responses.
  */
-export const realtimekit_WebhookSuccessResponse_output: JsonSchema = {
+export const realtimekit_WebhookSuccessResponse: JsonSchema = {
   "properties": {
     "data": {
       "$ref": "#/$defs/realtimekit_Webhook"
@@ -81,7 +81,7 @@ export const realtimekit_WebhookSuccessResponse_output: JsonSchema = {
 /**
  * The schema of `realtimekit_WebhooksListSuccessResponse` in responses.
  */
-export const realtimekit_WebhooksListSuccessResponse_output: JsonSchema = {
+export const realtimekit_WebhooksListSuccessResponse: JsonSchema = {
   "properties": {
     "data": {
       "items": {
diff --git a/src/generated/forge-mcp/realtime/kit/webhooks/tools.ts b/src/generated/forge-mcp/realtime/kit/webhooks/tools.ts
index b45f6e32e..28dbf2aaf 100644
--- a/src/generated/forge-mcp/realtime/kit/webhooks/tools.ts
+++ b/src/generated/forge-mcp/realtime/kit/webhooks/tools.ts
@@ -2,15 +2,11 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../../_/tool.js";
-import { realtimekit_ErrorResponse_output } from "../outputs.js";
+import { realtimekit_ErrorResponse } from "../outputs.js";
 import {
-  realtimekit_account_identifier,
-  realtimekit_app_id,
-} from "../schemas.js";
-import {
-  realtimekit_WebhookSuccessResponse_output,
-  realtimekit_Webhook_output,
-  realtimekit_WebhooksListSuccessResponse_output,
+  realtimekit_Webhook,
+  realtimekit_WebhookSuccessResponse,
+  realtimekit_WebhooksListSuccessResponse,
 } from "./outputs.js";
 import {
   realtimekit_PatchWebhookRequest,
@@ -24,38 +20,46 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_webhooks_create",
     title: "Add a webhook",
-    description: "Adds a new webhook to an App.\n\nThis method is beta.",
+    description: "Adds a new webhook to an App.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/realtime/kit/{app_id}/webhooks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/realtimekit_WebhookRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "realtimekit_WebhookRequest": realtimekit_WebhookRequest,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/realtimekit_WebhookSuccessResponse",
       $defs: {
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     annotations: {
@@ -84,9 +88,9 @@ export const tools: readonly Tool[] = [
         "401": {}
       },
       $defs: {
-        "realtimekit_ErrorResponse": realtimekit_ErrorResponse_output,
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_ErrorResponse": realtimekit_ErrorResponse,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     request: (args) => ({
@@ -97,39 +101,45 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_webhooks_delete",
     title: "Delete a webhook",
-    description: "Removes a webhook for the given webhook ID.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the webhook. Event delivery to it will stop.",
+    description: "Removes a webhook for the given webhook ID.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation deletes the webhook. Event delivery to it will stop.\n\nDELETE /accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "webhook_id": {
-          "description": "ID of the webhook",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "ID of the webhook",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "webhook_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/realtimekit_WebhookSuccessResponse",
       $defs: {
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     annotations: {
@@ -159,9 +169,9 @@ export const tools: readonly Tool[] = [
         "401": {}
       },
       $defs: {
-        "realtimekit_ErrorResponse": realtimekit_ErrorResponse_output,
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_ErrorResponse": realtimekit_ErrorResponse,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     request: (args) => ({
@@ -171,39 +181,45 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_webhooks_get",
     title: "Fetch details of a webhook",
-    description: "Returns webhook details for the given webhook ID.\n\nThis method is beta.",
+    description: "Returns webhook details for the given webhook ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
-        "webhook_id": {
-          "description": "ID of the webhook",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "ID of the webhook",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "webhook_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/realtimekit_WebhookSuccessResponse",
       $defs: {
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     annotations: {
@@ -233,9 +249,9 @@ export const tools: readonly Tool[] = [
         "401": {}
       },
       $defs: {
-        "realtimekit_ErrorResponse": realtimekit_ErrorResponse_output,
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_ErrorResponse": realtimekit_ErrorResponse,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     request: (args) => ({
@@ -245,33 +261,39 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_webhooks_list",
     title: "Fetch all webhooks details",
-    description: "Returns details of all webhooks for an App.\n\nThis method is beta.",
+    description: "Returns details of all webhooks for an App.\n\nThis method is beta.\n\nGET /accounts/{account_id}/realtime/kit/{app_id}/webhooks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/realtimekit_WebhooksListSuccessResponse",
       $defs: {
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhooksListSuccessResponse": realtimekit_WebhooksListSuccessResponse_output,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhooksListSuccessResponse": realtimekit_WebhooksListSuccessResponse,
       },
     },
     annotations: {
@@ -297,8 +319,8 @@ export const tools: readonly Tool[] = [
         "401": {}
       },
       $defs: {
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhooksListSuccessResponse": realtimekit_WebhooksListSuccessResponse_output,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhooksListSuccessResponse": realtimekit_WebhooksListSuccessResponse,
       },
     },
     request: (args) => ({
@@ -308,44 +330,52 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_webhooks_replace",
     title: "Replace a webhook",
-    description: "Replace all details for the given webhook ID.\n\nThis method is beta.",
+    description: "Replace all details for the given webhook ID.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/realtimekit_WebhookRequest"
         },
-        "webhook_id": {
-          "description": "ID of the webhook",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "ID of the webhook",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "webhook_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "realtimekit_WebhookRequest": realtimekit_WebhookRequest,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/realtimekit_WebhookSuccessResponse",
       $defs: {
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     annotations: {
@@ -375,9 +405,9 @@ export const tools: readonly Tool[] = [
         "401": {}
       },
       $defs: {
-        "realtimekit_ErrorResponse": realtimekit_ErrorResponse_output,
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_ErrorResponse": realtimekit_ErrorResponse,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     request: (args) => ({
@@ -388,44 +418,52 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_kit_webhooks_update",
     title: "Edit a webhook",
-    description: "Edits the webhook details for the given webhook ID.\n\nThis method is beta.",
+    description: "Edits the webhook details for the given webhook ID.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/realtimekit_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/realtimekit_app_id",
-          "description": "The app identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/realtimekit_PatchWebhookRequest"
         },
-        "webhook_id": {
-          "description": "ID of the webhook",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The app identifier tag.",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "ID of the webhook",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "webhook_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "realtimekit_PatchWebhookRequest": realtimekit_PatchWebhookRequest,
-        "realtimekit_account_identifier": realtimekit_account_identifier,
-        "realtimekit_app_id": realtimekit_app_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/realtimekit_WebhookSuccessResponse",
       $defs: {
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     annotations: {
@@ -455,9 +493,9 @@ export const tools: readonly Tool[] = [
         "401": {}
       },
       $defs: {
-        "realtimekit_ErrorResponse": realtimekit_ErrorResponse_output,
-        "realtimekit_Webhook": realtimekit_Webhook_output,
-        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse_output,
+        "realtimekit_ErrorResponse": realtimekit_ErrorResponse,
+        "realtimekit_Webhook": realtimekit_Webhook,
+        "realtimekit_WebhookSuccessResponse": realtimekit_WebhookSuccessResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/moq/relays/outputs.ts b/src/generated/forge-mcp/realtime/moq/relays/outputs.ts
index 3b8008d8c..df5a379f1 100644
--- a/src/generated/forge-mcp/realtime/moq/relays/outputs.ts
+++ b/src/generated/forge-mcp/realtime/moq/relays/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `moq_api-response-common` in responses.
  */
-export const moq_api_response_common_output: JsonSchema = {
+export const moq_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -51,7 +51,7 @@ export const moq_api_response_common_output: JsonSchema = {
 /**
  * The schema of `moq_api-response-error` in responses.
  */
-export const moq_api_response_error_output: JsonSchema = {
+export const moq_api$$response$$error: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -102,7 +102,7 @@ export const moq_api_response_error_output: JsonSchema = {
 /**
  * The schema of `moq_cloudflare_jwt_issuer` in responses.
  */
-export const moq_cloudflare_jwt_issuer_output: JsonSchema = {
+export const moq_cloudflare_jwt_issuer: JsonSchema = {
   "properties": {
     "cloudflare_tokens": {
       "items": {
@@ -134,7 +134,7 @@ export const moq_cloudflare_jwt_issuer_output: JsonSchema = {
 /**
  * The schema of `moq_cloudflare_jwt_token` in responses.
  */
-export const moq_cloudflare_jwt_token_output: JsonSchema = {
+export const moq_cloudflare_jwt_token: JsonSchema = {
   "properties": {
     "created": {
       "format": "date-time",
@@ -177,14 +177,14 @@ export const moq_cloudflare_jwt_token_output: JsonSchema = {
 /**
  * The schema of `moq_issuer` in responses.
  */
-export const moq_issuer_output: JsonSchema = {
+export const moq_issuer: JsonSchema = {
   "$ref": "#/$defs/moq_cloudflare_jwt_issuer"
 };
 
 /**
  * The schema of `moq_relay` in responses.
  */
-export const moq_relay_output: JsonSchema = {
+export const moq_relay: JsonSchema = {
   "properties": {
     "config": {
       "$ref": "#/$defs/moq_relay_config"
@@ -223,7 +223,7 @@ export const moq_relay_output: JsonSchema = {
 /**
  * The schema of `moq_relay_config` in responses.
  */
-export const moq_relay_config_output: JsonSchema = {
+export const moq_relay_config: JsonSchema = {
   "properties": {
     "upstreams": {
       "$ref": "#/$defs/moq_upstreams"
@@ -235,7 +235,7 @@ export const moq_relay_config_output: JsonSchema = {
 /**
  * The schema of `moq_relay_create_response` in responses.
  */
-export const moq_relay_create_response_output: JsonSchema = {
+export const moq_relay_create_response: JsonSchema = {
   "properties": {
     "config": {
       "$ref": "#/$defs/moq_relay_config"
@@ -275,7 +275,7 @@ export const moq_relay_create_response_output: JsonSchema = {
 /**
  * The schema of `moq_relay_list_item` in responses.
  */
-export const moq_relay_list_item_output: JsonSchema = {
+export const moq_relay_list_item: JsonSchema = {
   "properties": {
     "created": {
       "format": "date-time",
@@ -304,7 +304,7 @@ export const moq_relay_list_item_output: JsonSchema = {
 /**
  * The schema of `moq_result_info` in responses.
  */
-export const moq_result_info_output: JsonSchema = {
+export const moq_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -319,7 +319,7 @@ export const moq_result_info_output: JsonSchema = {
 /**
  * The schema of `moq_upstream` in responses.
  */
-export const moq_upstream_output: JsonSchema = {
+export const moq_upstream: JsonSchema = {
   "properties": {
     "url": {
       "type": "string"
@@ -334,7 +334,7 @@ export const moq_upstream_output: JsonSchema = {
 /**
  * The schema of `moq_upstreams` in responses.
  */
-export const moq_upstreams_output: JsonSchema = {
+export const moq_upstreams: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/realtime/moq/relays/schemas.ts b/src/generated/forge-mcp/realtime/moq/relays/schemas.ts
index 48b909a82..ea646afbe 100644
--- a/src/generated/forge-mcp/realtime/moq/relays/schemas.ts
+++ b/src/generated/forge-mcp/realtime/moq/relays/schemas.ts
@@ -3,23 +3,15 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `moq_account_identifier`.
- */
-export const moq_account_identifier: JsonSchema = {
-  "description": "Cloudflare account identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `moq_relay_config`.
  */
 export const moq_relay_config: JsonSchema = {
-  "description": "Relay configuration. All sub-objects use whole-object replacement when\npresent; omitted sub-objects preserve the existing value.\n",
+  "description": "Relay configuration. All sub-objects use whole-object replacement when\npresent; omitted sub-objects preserve the existing value.",
   "properties": {
     "upstreams": {
       "$ref": "#/$defs/moq_upstreams",
-      "description": "Upstreams are external MOQT server publishers that a relay falls back\nto when it has no local publisher for a requested namespace/track.\n"
+      "description": "Upstreams are external MOQT server publishers that a relay falls back\nto when it has no local publisher for a requested namespace/track."
     }
   },
   "type": "object"
@@ -32,7 +24,7 @@ export const moq_upstream: JsonSchema = {
   "description": "A single upstream MOQT server publisher.",
   "properties": {
     "url": {
-      "description": "Upstream MOQT server publisher URL. Must be an absolute URL with a\nhost and a scheme the relay can dial: moqt:// (raw QUIC) or https://\n(WebTransport). Validated on update (PUT); rejected with 21013.\n",
+      "description": "Upstream MOQT server publisher URL. Must be an absolute URL with a\nhost and a scheme the relay can dial: moqt:// (raw QUIC) or https://\n(WebTransport). Validated on update (PUT); rejected with 21013.",
       "type": "string"
     }
   },
@@ -46,7 +38,7 @@ export const moq_upstream: JsonSchema = {
  * The schema of `moq_upstreams`.
  */
 export const moq_upstreams: JsonSchema = {
-  "description": "Upstreams are external MOQT server publishers that a relay falls back\nto when it has no local publisher for a requested namespace/track.\n",
+  "description": "Upstreams are external MOQT server publishers that a relay falls back\nto when it has no local publisher for a requested namespace/track.",
   "properties": {
     "enabled": {
       "default": false,
@@ -54,7 +46,7 @@ export const moq_upstreams: JsonSchema = {
     },
     "upstreams": {
       "default": [],
-      "description": "Ordered list of upstream MOQT server publishers. Each entry is an\nobject (not a bare string) so per-upstream configuration can be\nadded in the future without another breaking change.\n",
+      "description": "Ordered list of upstream MOQT server publishers. Each entry is an\nobject (not a bare string) so per-upstream configuration can be\nadded in the future without another breaking change.",
       "items": {
         "$ref": "#/$defs/moq_upstream"
       },
diff --git a/src/generated/forge-mcp/realtime/moq/relays/tokens/outputs.ts b/src/generated/forge-mcp/realtime/moq/relays/tokens/outputs.ts
index b24606ff9..73d7f955a 100644
--- a/src/generated/forge-mcp/realtime/moq/relays/tokens/outputs.ts
+++ b/src/generated/forge-mcp/realtime/moq/relays/tokens/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `moq_tokens_envelope` in responses.
  */
-export const moq_tokens_envelope_output: JsonSchema = {
+export const moq_tokens_envelope: JsonSchema = {
   "properties": {
     "issuers": {
       "items": {
diff --git a/src/generated/forge-mcp/realtime/moq/relays/tokens/tools.ts b/src/generated/forge-mcp/realtime/moq/relays/tokens/tools.ts
index 82f960db5..4aac036a4 100644
--- a/src/generated/forge-mcp/realtime/moq/relays/tokens/tools.ts
+++ b/src/generated/forge-mcp/realtime/moq/relays/tokens/tools.ts
@@ -3,14 +3,13 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  moq_api_response_common_output,
-  moq_api_response_error_output,
-  moq_cloudflare_jwt_issuer_output,
-  moq_cloudflare_jwt_token_output,
-  moq_issuer_output,
+  moq_api$$response$$common,
+  moq_api$$response$$error,
+  moq_cloudflare_jwt_issuer,
+  moq_cloudflare_jwt_token,
+  moq_issuer,
 } from "../outputs.js";
-import { moq_account_identifier } from "../schemas.js";
-import { moq_tokens_envelope_output } from "./outputs.js";
+import { moq_tokens_envelope } from "./outputs.js";
 
 /**
  * The tools of `realtime.moq.relays.tokens`.
@@ -19,18 +18,14 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_moq_relays_tokens_create",
     title: "Create a token",
-    description: "Mints a new relay-scoped token and adds it to the relay's accepted-auth\nregistry. The token value (secret) is shown once in the response. A relay\nmay hold up to 10 tokens; creating an 11th is rejected.\n\nThis method is beta.",
+    description: "Mints a new relay-scoped token and adds it to the relay's accepted-auth\nregistry. The token value (secret) is shown once in the response. A relay\nmay hold up to 10 tokens; creating an 11th is rejected.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/moq/relays/{relay_id}/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/moq_account_identifier",
-          "description": "Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "expires": {
-              "description": "Optional expiry (RFC 3339). Defaults to 1 year from creation;\nrejected if more than 1 year in the future.\n",
+              "description": "Optional expiry (RFC 3339). Defaults to 1 year from creation;\nrejected if more than 1 year in the future.",
               "format": "date-time",
               "type": "string"
             },
@@ -39,7 +34,7 @@ export const tools: readonly Tool[] = [
               "type": "string"
             },
             "operations": {
-              "description": "Non-empty subset of the V1 roles the token is allowed to\nperform. Signed into the token.\n",
+              "description": "Non-empty subset of the V1 roles the token is allowed to\nperform. Signed into the token.",
               "items": {
                 "enum": [
                   "publish",
@@ -56,19 +51,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "relay_id": {
-          "description": "Relay unique identifier (32 hex characters).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "relay_id": {
+              "description": "Relay unique identifier (32 hex characters).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "relay_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "relay_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "moq_account_identifier": moq_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -85,11 +91,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer_output,
-        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token_output,
-        "moq_issuer": moq_issuer_output,
-        "moq_tokens_envelope": moq_tokens_envelope_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer,
+        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token,
+        "moq_issuer": moq_issuer,
+        "moq_tokens_envelope": moq_tokens_envelope,
       },
     },
     annotations: {
@@ -135,12 +141,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_api-response-error": moq_api_response_error_output,
-        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer_output,
-        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token_output,
-        "moq_issuer": moq_issuer_output,
-        "moq_tokens_envelope": moq_tokens_envelope_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_api-response-error": moq_api$$response$$error,
+        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer,
+        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token,
+        "moq_issuer": moq_issuer,
+        "moq_tokens_envelope": moq_tokens_envelope,
       },
     },
     request: (args) => ({
@@ -151,36 +157,43 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_moq_relays_tokens_delete",
     title: "Revoke a token",
-    description: "Revokes a token by removing it from the set the relay accepts. Relays\ncache that set, so revocation takes effect within seconds rather than\ninstantly, and connections already established with the token are not\nclosed. Revoking an unknown token succeeds, so the call is idempotent.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Revoking this token blocks new connections that present it. Sessions already connected with it stay up.",
+    description: "Revokes a token by removing it from the set the relay accepts. Relays\ncache that set, so revocation takes effect within seconds rather than\ninstantly, and connections already established with the token are not\nclosed. Revoking an unknown token succeeds, so the call is idempotent.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Revoking this token blocks new connections that present it. Sessions already connected with it stay up.\n\nDELETE /accounts/{account_id}/moq/relays/{relay_id}/tokens/{jti}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/moq_account_identifier",
-          "description": "Cloudflare account identifier."
-        },
-        "jti": {
-          "description": "Token identifier (jti — 32 hex characters).",
-          "type": "string"
-        },
-        "relay_id": {
-          "description": "Relay unique identifier (32 hex characters).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "jti": {
+              "description": "Token identifier (jti — 32 hex characters).",
+              "type": "string"
+            },
+            "relay_id": {
+              "description": "Relay unique identifier (32 hex characters).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "relay_id",
+            "jti"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "relay_id",
-        "jti"
+        "path"
       ],
-      $defs: {
-        "moq_account_identifier": moq_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/moq_api-response-common",
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
+        "moq_api-response-common": moq_api$$response$$common,
       },
     },
     annotations: {
@@ -211,8 +224,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_api-response-error": moq_api_response_error_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_api-response-error": moq_api$$response$$error,
       },
     },
     request: (args) => ({
@@ -222,26 +235,33 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_moq_relays_tokens_list",
     title: "List tokens",
-    description: "Returns metadata for every token the relay accepts. Secrets are never\nreturned, so a token that has been lost cannot be recovered here. There\nis no expiry filter: compare each token's `expires` to the current time\nto tell which ones have lapsed.\n\nThis method is beta.",
+    description: "Returns metadata for every token the relay accepts. Secrets are never\nreturned, so a token that has been lost cannot be recovered here. There\nis no expiry filter: compare each token's `expires` to the current time\nto tell which ones have lapsed.\n\nThis method is beta.\n\nGET /accounts/{account_id}/moq/relays/{relay_id}/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/moq_account_identifier",
-          "description": "Cloudflare account identifier."
-        },
-        "relay_id": {
-          "description": "Relay unique identifier (32 hex characters).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "relay_id": {
+              "description": "Relay unique identifier (32 hex characters).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "relay_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "relay_id"
+        "path"
       ],
-      $defs: {
-        "moq_account_identifier": moq_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -258,11 +278,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer_output,
-        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token_output,
-        "moq_issuer": moq_issuer_output,
-        "moq_tokens_envelope": moq_tokens_envelope_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer,
+        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token,
+        "moq_issuer": moq_issuer,
+        "moq_tokens_envelope": moq_tokens_envelope,
       },
     },
     annotations: {
@@ -305,12 +325,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_api-response-error": moq_api_response_error_output,
-        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer_output,
-        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token_output,
-        "moq_issuer": moq_issuer_output,
-        "moq_tokens_envelope": moq_tokens_envelope_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_api-response-error": moq_api$$response$$error,
+        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer,
+        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token,
+        "moq_issuer": moq_issuer,
+        "moq_tokens_envelope": moq_tokens_envelope,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/moq/relays/tools.ts b/src/generated/forge-mcp/realtime/moq/relays/tools.ts
index 87c449d96..b227437f1 100644
--- a/src/generated/forge-mcp/realtime/moq/relays/tools.ts
+++ b/src/generated/forge-mcp/realtime/moq/relays/tools.ts
@@ -1,26 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  moq_api_response_common_output,
-  moq_api_response_error_output,
-  moq_cloudflare_jwt_issuer_output,
-  moq_cloudflare_jwt_token_output,
-  moq_issuer_output,
-  moq_relay_config_output,
-  moq_relay_create_response_output,
-  moq_relay_list_item_output,
-  moq_relay_output,
-  moq_result_info_output,
-  moq_upstream_output,
-  moq_upstreams_output,
-} from "./outputs.js";
-import {
-  moq_account_identifier,
+  moq_api$$response$$common,
+  moq_api$$response$$error,
+  moq_cloudflare_jwt_issuer,
+  moq_cloudflare_jwt_token,
+  moq_issuer,
+  moq_relay,
   moq_relay_config,
+  moq_relay_create_response,
+  moq_relay_list_item,
+  moq_result_info,
   moq_upstream,
   moq_upstreams,
+} from "./outputs.js";
+import {
+  moq_relay_config as moq_relay_config$,
+  moq_upstream as moq_upstream$,
+  moq_upstreams as moq_upstreams$,
 } from "./schemas.js";
 
 /**
@@ -30,14 +29,10 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_moq_relays_create",
     title: "Create a relay",
-    description: "Provisions a new MoQ relay instance. Auto-creates a publish+subscribe\ntoken and a subscribe-only token. Token values are included in the\nresponse (shown once). Config is always set to defaults (upstreams\noff) and cannot be supplied here — sending a non-empty `config` is\nrejected (21014); `null` or `{}` is accepted as absent. Use PUT to\nconfigure the relay after it exists.\n\nThis method is beta.",
+    description: "Provisions a new MoQ relay instance. Auto-creates a publish+subscribe\ntoken and a subscribe-only token. Token values are included in the\nresponse (shown once). Config is always set to defaults (upstreams\noff) and cannot be supplied here — sending a non-empty `config` is\nrejected (21014); `null` or `{}` is accepted as absent. Use PUT to\nconfigure the relay after it exists.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/moq/relays",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/moq_account_identifier",
-          "description": "Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "name": {
@@ -49,15 +44,26 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "moq_account_identifier": moq_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -74,14 +80,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer_output,
-        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token_output,
-        "moq_issuer": moq_issuer_output,
-        "moq_relay_config": moq_relay_config_output,
-        "moq_relay_create_response": moq_relay_create_response_output,
-        "moq_upstream": moq_upstream_output,
-        "moq_upstreams": moq_upstreams_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer,
+        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token,
+        "moq_issuer": moq_issuer,
+        "moq_relay_config": moq_relay_config,
+        "moq_relay_create_response": moq_relay_create_response,
+        "moq_upstream": moq_upstream,
+        "moq_upstreams": moq_upstreams,
       },
     },
     annotations: {
@@ -127,15 +133,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_api-response-error": moq_api_response_error_output,
-        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer_output,
-        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token_output,
-        "moq_issuer": moq_issuer_output,
-        "moq_relay_config": moq_relay_config_output,
-        "moq_relay_create_response": moq_relay_create_response_output,
-        "moq_upstream": moq_upstream_output,
-        "moq_upstreams": moq_upstreams_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_api-response-error": moq_api$$response$$error,
+        "moq_cloudflare_jwt_issuer": moq_cloudflare_jwt_issuer,
+        "moq_cloudflare_jwt_token": moq_cloudflare_jwt_token,
+        "moq_issuer": moq_issuer,
+        "moq_relay_config": moq_relay_config,
+        "moq_relay_create_response": moq_relay_create_response,
+        "moq_upstream": moq_upstream,
+        "moq_upstreams": moq_upstreams,
       },
     },
     request: (args) => ({
@@ -146,26 +152,33 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_moq_relays_delete",
     title: "Delete a relay",
-    description: "Soft-deletes a MoQ relay. The relay ID goes in the URL path —\n`DELETE /accounts/{account_id}/moq/relays/{relay_id}` — not the\nrequest body; there is no collection-level delete endpoint.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Deleting this relay revokes every token issued for it, so publishers and subscribers can no longer connect. This cannot be undone.",
+    description: "Soft-deletes a MoQ relay. The relay ID goes in the URL path —\n`DELETE /accounts/{account_id}/moq/relays/{relay_id}` — not the\nrequest body; there is no collection-level delete endpoint.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Deleting this relay revokes every token issued for it, so publishers and subscribers can no longer connect. This cannot be undone.\n\nDELETE /accounts/{account_id}/moq/relays/{relay_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/moq_account_identifier",
-          "description": "Cloudflare account identifier."
-        },
-        "relay_id": {
-          "description": "Relay unique identifier (32 hex characters).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "relay_id": {
+              "description": "Relay unique identifier (32 hex characters).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "relay_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "relay_id"
+        "path"
       ],
-      $defs: {
-        "moq_account_identifier": moq_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -189,7 +202,7 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
+        "moq_api-response-common": moq_api$$response$$common,
       },
     },
     annotations: {
@@ -239,8 +252,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_api-response-error": moq_api_response_error_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_api-response-error": moq_api$$response$$error,
       },
     },
     request: (args) => ({
@@ -250,26 +263,33 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_moq_relays_get",
     title: "Get a relay",
-    description: "Retrieves a single MoQ relay including config and status.\nTokens are NOT included.\n\nThis method is beta.",
+    description: "Retrieves a single MoQ relay including config and status.\nTokens are NOT included.\n\nThis method is beta.\n\nGET /accounts/{account_id}/moq/relays/{relay_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/moq_account_identifier",
-          "description": "Cloudflare account identifier."
-        },
-        "relay_id": {
-          "description": "Relay unique identifier (32 hex characters).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "relay_id": {
+              "description": "Relay unique identifier (32 hex characters).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "relay_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "relay_id"
+        "path"
       ],
-      $defs: {
-        "moq_account_identifier": moq_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -286,11 +306,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_relay": moq_relay_output,
-        "moq_relay_config": moq_relay_config_output,
-        "moq_upstream": moq_upstream_output,
-        "moq_upstreams": moq_upstreams_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_relay": moq_relay,
+        "moq_relay_config": moq_relay_config,
+        "moq_upstream": moq_upstream,
+        "moq_upstreams": moq_upstreams,
       },
     },
     annotations: {
@@ -333,12 +353,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_api-response-error": moq_api_response_error_output,
-        "moq_relay": moq_relay_output,
-        "moq_relay_config": moq_relay_config_output,
-        "moq_upstream": moq_upstream_output,
-        "moq_upstreams": moq_upstreams_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_api-response-error": moq_api$$response$$error,
+        "moq_relay": moq_relay,
+        "moq_relay_config": moq_relay_config,
+        "moq_upstream": moq_upstream,
+        "moq_upstreams": moq_upstreams,
       },
     },
     request: (args) => ({
@@ -348,41 +368,54 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_moq_relays_list",
     title: "List relays",
-    description: "Lists all MoQ relays for the account. Returns only metadata.\nConfig, status, and tokens are omitted.\n\nResults are cursor-paginated (keyset on the `created` timestamp).\nUse `created_before` / `created_after` with the `created` value of the\nfirst/last item in a page to fetch the adjacent page. `result_info`\nreports the page `count` and the `total` matching the cursor filters.\n\nThis method is beta.",
+    description: "Lists all MoQ relays for the account. Returns only metadata.\nConfig, status, and tokens are omitted.\n\nResults are cursor-paginated (keyset on the `created` timestamp).\nUse `created_before` / `created_after` with the `created` value of the\nfirst/last item in a page to fetch the adjacent page. `result_info`\nreports the page `count` and the `total` matching the cursor filters.\n\nThis method is beta.\n\nGET /accounts/{account_id}/moq/relays",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/moq_account_identifier",
-          "description": "Cloudflare account identifier."
-        },
-        "asc": {
-          "default": false,
-          "description": "Sort order by `created`. When true, results are returned oldest-first\n(ascending); otherwise newest-first (descending, the default).\n",
-          "type": "boolean"
-        },
-        "created_after": {
-          "description": "Cursor for pagination. Returns relays created strictly after this\nRFC 3339 timestamp (typically the `created` value of the last item\non the current page, to fetch the next page).\n",
-          "format": "date-time",
-          "type": "string"
-        },
-        "created_before": {
-          "description": "Cursor for pagination. Returns relays created strictly before this\nRFC 3339 timestamp (typically the `created` value of the first item\non the current page, to fetch the previous page).\n",
-          "format": "date-time",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 1000,
-          "description": "Maximum number of relays to return per page. Values above the maximum are\nclamped to it rather than rejected.\n",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "asc": {
+              "default": false,
+              "description": "Sort order by `created`. When true, results are returned oldest-first\n(ascending); otherwise newest-first (descending, the default).",
+              "type": "boolean"
+            },
+            "created_after": {
+              "description": "Cursor for pagination. Returns relays created strictly after this\nRFC 3339 timestamp (typically the `created` value of the last item\non the current page, to fetch the next page).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "created_before": {
+              "description": "Cursor for pagination. Returns relays created strictly before this\nRFC 3339 timestamp (typically the `created` value of the first item\non the current page, to fetch the previous page).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 1000,
+              "description": "Maximum number of relays to return per page. Values above the maximum are\nclamped to it rather than rejected.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "moq_account_identifier": moq_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -405,9 +438,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_relay_list_item": moq_relay_list_item_output,
-        "moq_result_info": moq_result_info_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_relay_list_item": moq_relay_list_item,
+        "moq_result_info": moq_result_info,
       },
     },
     annotations: {
@@ -453,33 +486,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_api-response-error": moq_api_response_error_output,
-        "moq_relay_list_item": moq_relay_list_item_output,
-        "moq_result_info": moq_result_info_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_api-response-error": moq_api$$response$$error,
+        "moq_relay_list_item": moq_relay_list_item,
+        "moq_result_info": moq_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/moq/relays`,
       query: [
-        ["created_before", args["created_before"], true],
-        ["created_after", args["created_after"], true],
-        ["per_page", args["per_page"], true],
-        ["asc", args["asc"], true],
+        ["created_before", param(args, "query", "created_before"), true],
+        ["created_after", param(args, "query", "created_after"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["asc", param(args, "query", "asc"), true],
       ],
     }),
   },
   {
     name: "realtime_moq_relays_update",
     title: "Update a relay",
-    description: "Updates a relay's name and/or configuration. The relay ID goes in\nthe URL path — `PUT /accounts/{account_id}/moq/relays/{relay_id}` —\nnot the request body; there is no collection-level update endpoint.\nThis is also the only way to set a relay's config (config cannot be\nset at create time). Partial updates: omitted fields are preserved;\nconfig sub-objects replace as whole objects when present.\n\nThis method is beta.",
+    description: "Updates a relay's name and/or configuration. The relay ID goes in\nthe URL path — `PUT /accounts/{account_id}/moq/relays/{relay_id}` —\nnot the request body; there is no collection-level update endpoint.\nThis is also the only way to set a relay's config (config cannot be\nset at create time). Partial updates: omitted fields are preserved;\nconfig sub-objects replace as whole objects when present.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/moq/relays/{relay_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/moq_account_identifier",
-          "description": "Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "config": {
@@ -491,21 +520,34 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "relay_id": {
-          "description": "Relay unique identifier (32 hex characters).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "relay_id": {
+              "description": "Relay unique identifier (32 hex characters).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "relay_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "relay_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "moq_account_identifier": moq_account_identifier,
-        "moq_relay_config": moq_relay_config,
-        "moq_upstream": moq_upstream,
-        "moq_upstreams": moq_upstreams,
+        "moq_relay_config": moq_relay_config$,
+        "moq_upstream": moq_upstream$,
+        "moq_upstreams": moq_upstreams$,
       },
     },
     outputSchema: {
@@ -523,11 +565,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_relay": moq_relay_output,
-        "moq_relay_config": moq_relay_config_output,
-        "moq_upstream": moq_upstream_output,
-        "moq_upstreams": moq_upstreams_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_relay": moq_relay,
+        "moq_relay_config": moq_relay_config,
+        "moq_upstream": moq_upstream,
+        "moq_upstreams": moq_upstreams,
       },
     },
     annotations: {
@@ -570,12 +612,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "moq_api-response-common": moq_api_response_common_output,
-        "moq_api-response-error": moq_api_response_error_output,
-        "moq_relay": moq_relay_output,
-        "moq_relay_config": moq_relay_config_output,
-        "moq_upstream": moq_upstream_output,
-        "moq_upstreams": moq_upstreams_output,
+        "moq_api-response-common": moq_api$$response$$common,
+        "moq_api-response-error": moq_api$$response$$error,
+        "moq_relay": moq_relay,
+        "moq_relay_config": moq_relay_config,
+        "moq_upstream": moq_upstream,
+        "moq_upstreams": moq_upstreams,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/outputs.ts b/src/generated/forge-mcp/realtime/outputs.ts
index c47592d1a..f46b375ce 100644
--- a/src/generated/forge-mcp/realtime/outputs.ts
+++ b/src/generated/forge-mcp/realtime/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `calls_api-response-common` in responses.
  */
-export const calls_api_response_common_output: JsonSchema = {
+export const calls_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/calls_messages"
@@ -32,7 +32,7 @@ export const calls_api_response_common_output: JsonSchema = {
 /**
  * The schema of `calls_api-response-common-failure` in responses.
  */
-export const calls_api_response_common_failure_output: JsonSchema = {
+export const calls_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/calls_messages"
@@ -62,7 +62,7 @@ export const calls_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `calls_api-response-single` in responses.
  */
-export const calls_api_response_single_output: JsonSchema = {
+export const calls_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/calls_messages"
@@ -85,25 +85,10 @@ export const calls_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `calls_created` in responses.
- */
-export const calls_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `calls_identifier` in responses.
- */
-export const calls_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `calls_messages` in responses.
  */
-export const calls_messages_output: JsonSchema = {
+export const calls_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -132,18 +117,3 @@ export const calls_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `calls_modified` in responses.
- */
-export const calls_modified_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `calls_name` in responses.
- */
-export const calls_name_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/realtime/schemas.ts b/src/generated/forge-mcp/realtime/schemas.ts
deleted file mode 100644
index 3e8254c0b..000000000
--- a/src/generated/forge-mcp/realtime/schemas.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `calls_account_identifier`.
- */
-export const calls_account_identifier: JsonSchema = {
-  "description": "The account identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `calls_identifier`.
- */
-export const calls_identifier: JsonSchema = {
-  "description": "A Cloudflare-generated unique identifier for a item.",
-  "type": "string"
-};
-
-/**
- * The schema of `calls_name`.
- */
-export const calls_name: JsonSchema = {
-  "description": "A short description of a Realtime SFU app, not shown to end users.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/realtime/sfu/apps/outputs.ts b/src/generated/forge-mcp/realtime/sfu/apps/outputs.ts
index 1346247e3..abb16f895 100644
--- a/src/generated/forge-mcp/realtime/sfu/apps/outputs.ts
+++ b/src/generated/forge-mcp/realtime/sfu/apps/outputs.ts
@@ -6,19 +6,21 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `calls_app` in responses.
  */
-export const calls_app_output: JsonSchema = {
+export const calls_app: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/calls_created"
+      "format": "date-time",
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/calls_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/calls_name"
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/calls_identifier"
+      "type": "string"
     }
   },
   "required": [
@@ -33,7 +35,7 @@ export const calls_app_output: JsonSchema = {
 /**
  * The schema of `calls_app_response_collection` in responses.
  */
-export const calls_app_response_collection_output: JsonSchema = {
+export const calls_app_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/calls_api-response-common"
@@ -55,7 +57,7 @@ export const calls_app_response_collection_output: JsonSchema = {
 /**
  * The schema of `calls_app_response_single` in responses.
  */
-export const calls_app_response_single_output: JsonSchema = {
+export const calls_app_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/calls_api-response-single"
@@ -74,7 +76,7 @@ export const calls_app_response_single_output: JsonSchema = {
 /**
  * The schema of `calls_app_response_single_with_secret` in responses.
  */
-export const calls_app_response_single_with_secret_output: JsonSchema = {
+export const calls_app_response_single_with_secret: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/calls_api-response-single"
@@ -93,22 +95,24 @@ export const calls_app_response_single_with_secret_output: JsonSchema = {
 /**
  * The schema of `calls_app_with_secret` in responses.
  */
-export const calls_app_with_secret_output: JsonSchema = {
+export const calls_app_with_secret: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/calls_created"
+      "format": "date-time",
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/calls_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/calls_name"
+      "type": "string"
     },
     "secret": {
-      "$ref": "#/$defs/calls_secret"
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/calls_identifier"
+      "type": "string"
     }
   },
   "required": [
@@ -120,10 +124,3 @@ export const calls_app_with_secret_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `calls_secret` in responses.
- */
-export const calls_secret_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/realtime/sfu/apps/schemas.ts b/src/generated/forge-mcp/realtime/sfu/apps/schemas.ts
index 5a1790941..9723a41d8 100644
--- a/src/generated/forge-mcp/realtime/sfu/apps/schemas.ts
+++ b/src/generated/forge-mcp/realtime/sfu/apps/schemas.ts
@@ -9,9 +9,9 @@ import type { JsonSchema } from "../../../_/tool.js";
 export const calls_app_editable_fields: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/calls_name",
       "default": "",
-      "description": "A short description of a Realtime SFU app, not shown to end users."
+      "description": "A short description of a Realtime SFU app, not shown to end users.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/realtime/sfu/apps/tools.ts b/src/generated/forge-mcp/realtime/sfu/apps/tools.ts
index 9a25eea0a..4bc7fb11d 100644
--- a/src/generated/forge-mcp/realtime/sfu/apps/tools.ts
+++ b/src/generated/forge-mcp/realtime/sfu/apps/tools.ts
@@ -3,27 +3,17 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  calls_api_response_common_failure_output,
-  calls_api_response_common_output,
-  calls_api_response_single_output,
-  calls_created_output,
-  calls_identifier_output,
-  calls_messages_output,
-  calls_modified_output,
-  calls_name_output,
+  calls_api$$response$$common,
+  calls_api$$response$$common$$failure,
+  calls_api$$response$$single,
+  calls_messages,
 } from "../../outputs.js";
 import {
-  calls_account_identifier,
-  calls_identifier,
-  calls_name,
-} from "../../schemas.js";
-import {
-  calls_app_output,
-  calls_app_response_collection_output,
-  calls_app_response_single_output,
-  calls_app_response_single_with_secret_output,
-  calls_app_with_secret_output,
-  calls_secret_output,
+  calls_app,
+  calls_app_response_collection,
+  calls_app_response_single,
+  calls_app_response_single_with_secret,
+  calls_app_with_secret,
 } from "./outputs.js";
 import { calls_app_editable_fields } from "./schemas.js";
 
@@ -34,40 +24,43 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_sfu_apps_create",
     title: "Create an SFU app",
-    description: "Creates a Realtime SFU app. An app is an isolated namespace in which sessions can access the app's tracks.",
+    description: "Creates a Realtime SFU app. An app is an isolated namespace in which sessions can access the app's tracks.\n\nPOST /accounts/{account_id}/calls/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/calls_app_editable_fields"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "calls_account_identifier": calls_account_identifier,
         "calls_app_editable_fields": calls_app_editable_fields,
-        "calls_name": calls_name,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/calls_app_response_single_with_secret",
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_app_response_single_with_secret": calls_app_response_single_with_secret_output,
-        "calls_app_with_secret": calls_app_with_secret_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_secret": calls_secret_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_app_response_single_with_secret": calls_app_response_single_with_secret,
+        "calls_app_with_secret": calls_app_with_secret,
+        "calls_messages": calls_messages,
       },
     },
     annotations: {
@@ -94,16 +87,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "calls_api-response-common-failure": calls_api_response_common_failure_output,
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_app_response_single_with_secret": calls_app_response_single_with_secret_output,
-        "calls_app_with_secret": calls_app_with_secret_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_secret": calls_secret_output,
+        "calls_api-response-common-failure": calls_api$$response$$common$$failure,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_app_response_single_with_secret": calls_app_response_single_with_secret,
+        "calls_app_with_secret": calls_app_with_secret,
+        "calls_messages": calls_messages,
       },
     },
     request: (args) => ({
@@ -114,39 +102,41 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_sfu_apps_delete",
     title: "Delete an SFU app",
-    description: "Deletes a Realtime SFU app.\n\nConfirm with the user before calling this tool. This operation permanently deletes the SFU app.",
+    description: "Deletes a Realtime SFU app.\n\nConfirm with the user before calling this tool. This operation permanently deletes the SFU app.\n\nDELETE /accounts/{account_id}/calls/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/calls_identifier",
-          "description": "A Cloudflare-generated unique identifier for a item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "A Cloudflare-generated unique identifier for a item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "calls_account_identifier": calls_account_identifier,
-        "calls_identifier": calls_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/calls_app_response_single",
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_app": calls_app_output,
-        "calls_app_response_single": calls_app_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_app": calls_app,
+        "calls_app_response_single": calls_app_response_single,
+        "calls_messages": calls_messages,
       },
     },
     annotations: {
@@ -171,14 +161,10 @@ export const tools: readonly Tool[] = [
         "4XX": {}
       },
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_app": calls_app_output,
-        "calls_app_response_single": calls_app_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_app": calls_app,
+        "calls_app_response_single": calls_app_response_single,
+        "calls_messages": calls_messages,
       },
     },
     request: (args) => ({
@@ -188,39 +174,41 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_sfu_apps_get",
     title: "Retrieve SFU app details",
-    description: "Fetches details for a single Realtime SFU app.",
+    description: "Fetches details for a single Realtime SFU app.\n\nGET /accounts/{account_id}/calls/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/calls_identifier",
-          "description": "A Cloudflare-generated unique identifier for a item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "A Cloudflare-generated unique identifier for a item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "calls_account_identifier": calls_account_identifier,
-        "calls_identifier": calls_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/calls_app_response_single",
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_app": calls_app_output,
-        "calls_app_response_single": calls_app_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_app": calls_app,
+        "calls_app_response_single": calls_app_response_single,
+        "calls_messages": calls_messages,
       },
     },
     annotations: {
@@ -248,15 +236,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "calls_api-response-common-failure": calls_api_response_common_failure_output,
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_app": calls_app_output,
-        "calls_app_response_single": calls_app_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
+        "calls_api-response-common-failure": calls_api$$response$$common$$failure,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_app": calls_app,
+        "calls_app_response_single": calls_app_response_single,
+        "calls_messages": calls_messages,
       },
     },
     request: (args) => ({
@@ -266,33 +250,36 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_sfu_apps_list",
     title: "List apps",
-    description: "Lists all apps in the Cloudflare account",
+    description: "Lists all apps in the Cloudflare account\n\nGET /accounts/{account_id}/calls/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "calls_account_identifier": calls_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/calls_app_response_collection",
       $defs: {
-        "calls_api-response-common": calls_api_response_common_output,
-        "calls_app": calls_app_output,
-        "calls_app_response_collection": calls_app_response_collection_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
+        "calls_api-response-common": calls_api$$response$$common,
+        "calls_app": calls_app,
+        "calls_app_response_collection": calls_app_response_collection,
+        "calls_messages": calls_messages,
       },
     },
     annotations: {
@@ -320,15 +307,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "calls_api-response-common": calls_api_response_common_output,
-        "calls_api-response-common-failure": calls_api_response_common_failure_output,
-        "calls_app": calls_app_output,
-        "calls_app_response_collection": calls_app_response_collection_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
+        "calls_api-response-common": calls_api$$response$$common,
+        "calls_api-response-common-failure": calls_api$$response$$common$$failure,
+        "calls_app": calls_app,
+        "calls_app_response_collection": calls_app_response_collection,
+        "calls_messages": calls_messages,
       },
     },
     request: (args) => ({
@@ -338,45 +321,48 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_sfu_apps_update",
     title: "Update SFU app details",
-    description: "Updates details for a single Realtime SFU app.",
+    description: "Updates details for a single Realtime SFU app.\n\nPUT /accounts/{account_id}/calls/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "app_id": {
-          "$ref": "#/$defs/calls_identifier",
-          "description": "A Cloudflare-generated unique identifier for a item."
-        },
         "body": {
           "$ref": "#/$defs/calls_app_editable_fields"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "A Cloudflare-generated unique identifier for a item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "calls_account_identifier": calls_account_identifier,
         "calls_app_editable_fields": calls_app_editable_fields,
-        "calls_identifier": calls_identifier,
-        "calls_name": calls_name,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/calls_app_response_single",
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_app": calls_app_output,
-        "calls_app_response_single": calls_app_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_app": calls_app,
+        "calls_app_response_single": calls_app_response_single,
+        "calls_messages": calls_messages,
       },
     },
     annotations: {
@@ -403,15 +389,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "calls_api-response-common-failure": calls_api_response_common_failure_output,
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_app": calls_app_output,
-        "calls_app_response_single": calls_app_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
+        "calls_api-response-common-failure": calls_api$$response$$common$$failure,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_app": calls_app,
+        "calls_app_response_single": calls_app_response_single,
+        "calls_messages": calls_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/realtime/turn/keys/outputs.ts b/src/generated/forge-mcp/realtime/turn/keys/outputs.ts
index f2e28d916..408aa6a30 100644
--- a/src/generated/forge-mcp/realtime/turn/keys/outputs.ts
+++ b/src/generated/forge-mcp/realtime/turn/keys/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `calls_turn_key` in responses.
- */
-export const calls_turn_key_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `calls_turn_key_collection` in responses.
  */
-export const calls_turn_key_collection_output: JsonSchema = {
+export const calls_turn_key_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/calls_api-response-common"
@@ -32,29 +25,24 @@ export const calls_turn_key_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `calls_turn_key_name` in responses.
- */
-export const calls_turn_key_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `calls_turn_key_object` in responses.
  */
-export const calls_turn_key_object_output: JsonSchema = {
+export const calls_turn_key_object: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/calls_created"
+      "format": "date-time",
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/calls_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/calls_name"
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/calls_identifier"
+      "type": "string"
     }
   },
   "required": [
@@ -69,7 +57,7 @@ export const calls_turn_key_object_output: JsonSchema = {
 /**
  * The schema of `calls_turn_key_response_single` in responses.
  */
-export const calls_turn_key_response_single_output: JsonSchema = {
+export const calls_turn_key_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/calls_api-response-single"
@@ -88,7 +76,7 @@ export const calls_turn_key_response_single_output: JsonSchema = {
 /**
  * The schema of `calls_turn_key_single_with_secret` in responses.
  */
-export const calls_turn_key_single_with_secret_output: JsonSchema = {
+export const calls_turn_key_single_with_secret: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/calls_api-response-single"
@@ -107,22 +95,24 @@ export const calls_turn_key_single_with_secret_output: JsonSchema = {
 /**
  * The schema of `calls_turn_key_with_key` in responses.
  */
-export const calls_turn_key_with_key_output: JsonSchema = {
+export const calls_turn_key_with_key: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/calls_created"
+      "format": "date-time",
+      "type": "string"
     },
     "key": {
-      "$ref": "#/$defs/calls_turn_key"
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/calls_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/calls_turn_key_name"
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/calls_identifier"
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/realtime/turn/keys/schemas.ts b/src/generated/forge-mcp/realtime/turn/keys/schemas.ts
index 25b577cbc..85061fb68 100644
--- a/src/generated/forge-mcp/realtime/turn/keys/schemas.ts
+++ b/src/generated/forge-mcp/realtime/turn/keys/schemas.ts
@@ -9,18 +9,10 @@ import type { JsonSchema } from "../../../_/tool.js";
 export const calls_turn_key_editable_fields: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/calls_turn_key_name",
       "default": "",
-      "description": "A short description of a TURN key, not shown to end users."
+      "description": "A short description of a TURN key, not shown to end users.",
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `calls_turn_key_name`.
- */
-export const calls_turn_key_name: JsonSchema = {
-  "description": "A short description of a TURN key, not shown to end users.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/realtime/turn/keys/tools.ts b/src/generated/forge-mcp/realtime/turn/keys/tools.ts
index 7772847ee..4da1bb8e5 100644
--- a/src/generated/forge-mcp/realtime/turn/keys/tools.ts
+++ b/src/generated/forge-mcp/realtime/turn/keys/tools.ts
@@ -3,29 +3,19 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  calls_api_response_common_failure_output,
-  calls_api_response_common_output,
-  calls_api_response_single_output,
-  calls_created_output,
-  calls_identifier_output,
-  calls_messages_output,
-  calls_modified_output,
-  calls_name_output,
+  calls_api$$response$$common,
+  calls_api$$response$$common$$failure,
+  calls_api$$response$$single,
+  calls_messages,
 } from "../../outputs.js";
-import { calls_account_identifier, calls_identifier } from "../../schemas.js";
 import {
-  calls_turn_key_collection_output,
-  calls_turn_key_name_output,
-  calls_turn_key_object_output,
-  calls_turn_key_output,
-  calls_turn_key_response_single_output,
-  calls_turn_key_single_with_secret_output,
-  calls_turn_key_with_key_output,
+  calls_turn_key_collection,
+  calls_turn_key_object,
+  calls_turn_key_response_single,
+  calls_turn_key_single_with_secret,
+  calls_turn_key_with_key,
 } from "./outputs.js";
-import {
-  calls_turn_key_editable_fields,
-  calls_turn_key_name,
-} from "./schemas.js";
+import { calls_turn_key_editable_fields } from "./schemas.js";
 
 /**
  * The tools of `realtime.turn.keys`.
@@ -34,40 +24,43 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_turn_keys_create",
     title: "Create a TURN key",
-    description: "Creates a new Realtime TURN key.",
+    description: "Creates a new Realtime TURN key.\n\nPOST /accounts/{account_id}/calls/turn_keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/calls_turn_key_editable_fields"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "calls_account_identifier": calls_account_identifier,
         "calls_turn_key_editable_fields": calls_turn_key_editable_fields,
-        "calls_turn_key_name": calls_turn_key_name,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/calls_turn_key_single_with_secret",
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_turn_key": calls_turn_key_output,
-        "calls_turn_key_name": calls_turn_key_name_output,
-        "calls_turn_key_single_with_secret": calls_turn_key_single_with_secret_output,
-        "calls_turn_key_with_key": calls_turn_key_with_key_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_messages": calls_messages,
+        "calls_turn_key_single_with_secret": calls_turn_key_single_with_secret,
+        "calls_turn_key_with_key": calls_turn_key_with_key,
       },
     },
     annotations: {
@@ -94,16 +87,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "calls_api-response-common-failure": calls_api_response_common_failure_output,
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_turn_key": calls_turn_key_output,
-        "calls_turn_key_name": calls_turn_key_name_output,
-        "calls_turn_key_single_with_secret": calls_turn_key_single_with_secret_output,
-        "calls_turn_key_with_key": calls_turn_key_with_key_output,
+        "calls_api-response-common-failure": calls_api$$response$$common$$failure,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_messages": calls_messages,
+        "calls_turn_key_single_with_secret": calls_turn_key_single_with_secret,
+        "calls_turn_key_with_key": calls_turn_key_with_key,
       },
     },
     request: (args) => ({
@@ -114,39 +102,41 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_turn_keys_delete",
     title: "Delete TURN key",
-    description: "Deletes a Realtime TURN key.\n\nConfirm with the user before calling this tool. This operation permanently deletes the TURN key. Clients using it can no longer generate credentials.",
+    description: "Deletes a Realtime TURN key.\n\nConfirm with the user before calling this tool. This operation permanently deletes the TURN key. Clients using it can no longer generate credentials.\n\nDELETE /accounts/{account_id}/calls/turn_keys/{key_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "key_id": {
-          "$ref": "#/$defs/calls_identifier",
-          "description": "A Cloudflare-generated unique identifier for a item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "key_id": {
+              "description": "A Cloudflare-generated unique identifier for a item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "key_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "key_id"
+        "path"
       ],
-      $defs: {
-        "calls_account_identifier": calls_account_identifier,
-        "calls_identifier": calls_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/calls_turn_key_response_single",
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_turn_key_object": calls_turn_key_object_output,
-        "calls_turn_key_response_single": calls_turn_key_response_single_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_messages": calls_messages,
+        "calls_turn_key_object": calls_turn_key_object,
+        "calls_turn_key_response_single": calls_turn_key_response_single,
       },
     },
     annotations: {
@@ -171,14 +161,10 @@ export const tools: readonly Tool[] = [
         "4XX": {}
       },
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_turn_key_object": calls_turn_key_object_output,
-        "calls_turn_key_response_single": calls_turn_key_response_single_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_messages": calls_messages,
+        "calls_turn_key_object": calls_turn_key_object,
+        "calls_turn_key_response_single": calls_turn_key_response_single,
       },
     },
     request: (args) => ({
@@ -188,39 +174,41 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_turn_keys_get",
     title: "Retrieve TURN key details",
-    description: "Fetches details for a single TURN key.",
+    description: "Fetches details for a single TURN key.\n\nGET /accounts/{account_id}/calls/turn_keys/{key_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "key_id": {
-          "$ref": "#/$defs/calls_identifier",
-          "description": "A Cloudflare-generated unique identifier for a item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "key_id": {
+              "description": "A Cloudflare-generated unique identifier for a item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "key_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "key_id"
+        "path"
       ],
-      $defs: {
-        "calls_account_identifier": calls_account_identifier,
-        "calls_identifier": calls_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/calls_turn_key_response_single",
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_turn_key_object": calls_turn_key_object_output,
-        "calls_turn_key_response_single": calls_turn_key_response_single_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_messages": calls_messages,
+        "calls_turn_key_object": calls_turn_key_object,
+        "calls_turn_key_response_single": calls_turn_key_response_single,
       },
     },
     annotations: {
@@ -248,15 +236,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "calls_api-response-common-failure": calls_api_response_common_failure_output,
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_turn_key_object": calls_turn_key_object_output,
-        "calls_turn_key_response_single": calls_turn_key_response_single_output,
+        "calls_api-response-common-failure": calls_api$$response$$common$$failure,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_messages": calls_messages,
+        "calls_turn_key_object": calls_turn_key_object,
+        "calls_turn_key_response_single": calls_turn_key_response_single,
       },
     },
     request: (args) => ({
@@ -266,33 +250,36 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_turn_keys_list",
     title: "List TURN keys",
-    description: "Lists all TURN keys in the Cloudflare account.",
+    description: "Lists all TURN keys in the Cloudflare account.\n\nGET /accounts/{account_id}/calls/turn_keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "calls_account_identifier": calls_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/calls_turn_key_collection",
       $defs: {
-        "calls_api-response-common": calls_api_response_common_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_turn_key_collection": calls_turn_key_collection_output,
-        "calls_turn_key_object": calls_turn_key_object_output,
+        "calls_api-response-common": calls_api$$response$$common,
+        "calls_messages": calls_messages,
+        "calls_turn_key_collection": calls_turn_key_collection,
+        "calls_turn_key_object": calls_turn_key_object,
       },
     },
     annotations: {
@@ -320,15 +307,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "calls_api-response-common": calls_api_response_common_output,
-        "calls_api-response-common-failure": calls_api_response_common_failure_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_turn_key_collection": calls_turn_key_collection_output,
-        "calls_turn_key_object": calls_turn_key_object_output,
+        "calls_api-response-common": calls_api$$response$$common,
+        "calls_api-response-common-failure": calls_api$$response$$common$$failure,
+        "calls_messages": calls_messages,
+        "calls_turn_key_collection": calls_turn_key_collection,
+        "calls_turn_key_object": calls_turn_key_object,
       },
     },
     request: (args) => ({
@@ -338,45 +321,48 @@ export const tools: readonly Tool[] = [
   {
     name: "realtime_turn_keys_update",
     title: "Update TURN key details",
-    description: "Updates details for a single TURN key.",
+    description: "Updates details for a single TURN key.\n\nPUT /accounts/{account_id}/calls/turn_keys/{key_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/calls_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/calls_turn_key_editable_fields"
         },
-        "key_id": {
-          "$ref": "#/$defs/calls_identifier",
-          "description": "A Cloudflare-generated unique identifier for a item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "key_id": {
+              "description": "A Cloudflare-generated unique identifier for a item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "key_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "key_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "calls_account_identifier": calls_account_identifier,
-        "calls_identifier": calls_identifier,
         "calls_turn_key_editable_fields": calls_turn_key_editable_fields,
-        "calls_turn_key_name": calls_turn_key_name,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/calls_turn_key_response_single",
       $defs: {
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_turn_key_object": calls_turn_key_object_output,
-        "calls_turn_key_response_single": calls_turn_key_response_single_output,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_messages": calls_messages,
+        "calls_turn_key_object": calls_turn_key_object,
+        "calls_turn_key_response_single": calls_turn_key_response_single,
       },
     },
     annotations: {
@@ -403,15 +389,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "calls_api-response-common-failure": calls_api_response_common_failure_output,
-        "calls_api-response-single": calls_api_response_single_output,
-        "calls_created": calls_created_output,
-        "calls_identifier": calls_identifier_output,
-        "calls_messages": calls_messages_output,
-        "calls_modified": calls_modified_output,
-        "calls_name": calls_name_output,
-        "calls_turn_key_object": calls_turn_key_object_output,
-        "calls_turn_key_response_single": calls_turn_key_response_single_output,
+        "calls_api-response-common-failure": calls_api$$response$$common$$failure,
+        "calls_api-response-single": calls_api$$response$$single,
+        "calls_messages": calls_messages,
+        "calls_turn_key_object": calls_turn_key_object,
+        "calls_turn_key_response_single": calls_turn_key_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/registrar/extensions/outputs.ts b/src/generated/forge-mcp/registrar/extensions/outputs.ts
index d86b98986..517e1880a 100644
--- a/src/generated/forge-mcp/registrar/extensions/outputs.ts
+++ b/src/generated/forge-mcp/registrar/extensions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `registrar-api_extension-item` in responses.
  */
-export const registrar_api_extension_item_output: JsonSchema = {
+export const registrar$$api_extension$$item: JsonSchema = {
   "properties": {
     "metadata": {
       "properties": {
@@ -41,7 +41,7 @@ export const registrar_api_extension_item_output: JsonSchema = {
 /**
  * The schema of `registrar-api_extension-response-collection` in responses.
  */
-export const registrar_api_extension_response_collection_output: JsonSchema = {
+export const registrar$$api_extension$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_api-response-common"
@@ -77,7 +77,7 @@ export const registrar_api_extension_response_collection_output: JsonSchema = {
 /**
  * The schema of `registrar-api_extension-response-single` in responses.
  */
-export const registrar_api_extension_response_single_output: JsonSchema = {
+export const registrar$$api_extension$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_api-response-common"
diff --git a/src/generated/forge-mcp/registrar/extensions/tools.ts b/src/generated/forge-mcp/registrar/extensions/tools.ts
index f5acbaf04..64575b1f1 100644
--- a/src/generated/forge-mcp/registrar/extensions/tools.ts
+++ b/src/generated/forge-mcp/registrar/extensions/tools.ts
@@ -1,17 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  registrar_api_api_response_common_failure_output,
-  registrar_api_api_response_common_output,
-  registrar_api_messages_output,
+  registrar$$api_api$$response$$common,
+  registrar$$api_api$$response$$common$$failure,
+  registrar$$api_messages,
 } from "../outputs.js";
-import { registrar_api_identifier } from "../schemas.js";
 import {
-  registrar_api_extension_item_output,
-  registrar_api_extension_response_collection_output,
-  registrar_api_extension_response_single_output,
+  registrar$$api_extension$$item,
+  registrar$$api_extension$$response$$collection,
+  registrar$$api_extension$$response$$single,
 } from "./outputs.js";
 
 /**
@@ -21,34 +20,41 @@ export const tools: readonly Tool[] = [
   {
     name: "registrar_extensions_get",
     title: "Get extension",
-    description: "Returns metadata and JSON Schema documents describing the expected input\nstructure for registration and transfer operations on a specific\nextension (TLD).\n\nSupports HTTP conditional GET via `ETag`. Include the `ETag` value\nfrom a previous response in an `If-None-Match` header to receive a\n`304 Not Modified` when the data has not changed.",
+    description: "Returns metadata and JSON Schema documents describing the expected input\nstructure for registration and transfer operations on a specific\nextension (TLD).\n\nSupports HTTP conditional GET via `ETag`. Include the `ETag` value\nfrom a previous response in an `If-None-Match` header to receive a\n`304 Not Modified` when the data has not changed.\n\nGET /accounts/{account_id}/registrar/extensions/{extension}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Identifier."
-        },
-        "extension": {
-          "description": "The extension name (e.g., `com`, `co.uk`).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "extension": {
+              "description": "The extension name (e.g., `com`, `co.uk`).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "extension"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "extension"
+        "path"
       ],
-      $defs: {
-        "registrar-api_identifier": registrar_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_extension-response-single",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_extension-item": registrar_api_extension_item_output,
-        "registrar-api_extension-response-single": registrar_api_extension_response_single_output,
-        "registrar-api_messages": registrar_api_messages_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_extension-item": registrar$$api_extension$$item,
+        "registrar-api_extension-response-single": registrar$$api_extension$$response$$single,
+        "registrar-api_messages": registrar$$api_messages,
       },
     },
     annotations: {
@@ -71,11 +77,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_extension-item": registrar_api_extension_item_output,
-        "registrar-api_extension-response-single": registrar_api_extension_response_single_output,
-        "registrar-api_messages": registrar_api_messages_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_extension-item": registrar$$api_extension$$item,
+        "registrar-api_extension-response-single": registrar$$api_extension$$response$$single,
+        "registrar-api_messages": registrar$$api_messages,
       },
     },
     request: (args) => ({
@@ -85,61 +91,74 @@ export const tools: readonly Tool[] = [
   {
     name: "registrar_extensions_list",
     title: "List extensions",
-    description: "Returns metadata and JSON Schema documents describing the expected input\nstructure for registration and transfer operations on each supported\nextension (TLD).\n\nThis endpoint uses cursor-based pagination. Results are ordered by\nextension name by default. To fetch the next page, pass the `cursor`\nvalue from the `result_info` object in the response as the `cursor`\nquery parameter in your next request. An empty `cursor` string\nindicates there are no more pages.\n\nSupports HTTP conditional GET via `ETag`. Include the `ETag` value\nfrom a previous response in an `If-None-Match` header to receive a\n`304 Not Modified` when the data has not changed.",
+    description: "Returns metadata and JSON Schema documents describing the expected input\nstructure for registration and transfer operations on each supported\nextension (TLD).\n\nThis endpoint uses cursor-based pagination. Results are ordered by\nextension name by default. To fetch the next page, pass the `cursor`\nvalue from the `result_info` object in the response as the `cursor`\nquery parameter in your next request. An empty `cursor` string\nindicates there are no more pages.\n\nSupports HTTP conditional GET via `ETag`. Include the `ETag` value\nfrom a previous response in an `If-None-Match` header to receive a\n`304 Not Modified` when the data has not changed.\n\nGET /accounts/{account_id}/registrar/extensions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Identifier."
-        },
-        "cursor": {
-          "description": "Opaque token from a previous response's `result_info.cursor`.\nPass this value to fetch the next page of results. Omit (or\npass an empty string) for the first page.\n",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction for results. Defaults to ascending order.\n",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Filter extensions by exact name match.\nFor example, `name=com` returns only the `com` extension.\n",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items to return per page.",
-          "type": "integer"
-        },
-        "sort_by": {
-          "default": "name",
-          "description": "Column to sort results by. Defaults to `name` when omitted.\n",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token from a previous response's `result_info.cursor`.\nPass this value to fetch the next page of results. Omit (or\npass an empty string) for the first page.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction for results. Defaults to ascending order.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter extensions by exact name match.\nFor example, `name=com` returns only the `com` extension.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items to return per page.",
+              "type": "integer"
+            },
+            "sort_by": {
+              "default": "name",
+              "description": "Column to sort results by. Defaults to `name` when omitted.",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "registrar-api_identifier": registrar_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_extension-response-collection",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_extension-item": registrar_api_extension_item_output,
-        "registrar-api_extension-response-collection": registrar_api_extension_response_collection_output,
-        "registrar-api_messages": registrar_api_messages_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_extension-item": registrar$$api_extension$$item,
+        "registrar-api_extension-response-collection": registrar$$api_extension$$response$$collection,
+        "registrar-api_messages": registrar$$api_messages,
       },
     },
     annotations: {
@@ -162,21 +181,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_extension-item": registrar_api_extension_item_output,
-        "registrar-api_extension-response-collection": registrar_api_extension_response_collection_output,
-        "registrar-api_messages": registrar_api_messages_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_extension-item": registrar$$api_extension$$item,
+        "registrar-api_extension-response-collection": registrar$$api_extension$$response$$collection,
+        "registrar-api_messages": registrar$$api_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar/extensions`,
       query: [
-        ["name", args["name"], true],
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
-        ["sort_by", args["sort_by"], true],
+        ["name", param(args, "query", "name"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/registrar/outputs.ts b/src/generated/forge-mcp/registrar/outputs.ts
index fb14fbb3f..de3baefd4 100644
--- a/src/generated/forge-mcp/registrar/outputs.ts
+++ b/src/generated/forge-mcp/registrar/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `registrar-api_api-response-common` in responses.
  */
-export const registrar_api_api_response_common_output: JsonSchema = {
+export const registrar$$api_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/registrar-api_messages"
@@ -49,7 +49,7 @@ export const registrar_api_api_response_common_output: JsonSchema = {
 /**
  * The schema of `registrar-api_api-response-common-failure` in responses.
  */
-export const registrar_api_api_response_common_failure_output: JsonSchema = {
+export const registrar$$api_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/registrar-api_messages"
@@ -79,7 +79,7 @@ export const registrar_api_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `registrar-api_messages` in responses.
  */
-export const registrar_api_messages_output: JsonSchema = {
+export const registrar$$api_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/registrar/registrations/outputs.ts b/src/generated/forge-mcp/registrar/registrations/outputs.ts
index d79082c3e..dd12dddce 100644
--- a/src/generated/forge-mcp/registrar/registrations/outputs.ts
+++ b/src/generated/forge-mcp/registrar/registrations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `registrar-api_cursor_result_info` in responses.
  */
-export const registrar_api_cursor_result_info_output: JsonSchema = {
+export const registrar$$api_cursor_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -29,7 +29,7 @@ export const registrar_api_cursor_result_info_output: JsonSchema = {
 /**
  * The schema of `registrar-api_domain_check_response` in responses.
  */
-export const registrar_api_domain_check_response_output: JsonSchema = {
+export const registrar$$api_domain_check_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_api-response-common"
@@ -62,7 +62,7 @@ export const registrar_api_domain_check_response_output: JsonSchema = {
 /**
  * The schema of `registrar-api_domain_check_result` in responses.
  */
-export const registrar_api_domain_check_result_output: JsonSchema = {
+export const registrar$$api_domain_check_result: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -98,17 +98,10 @@ export const registrar_api_domain_check_result_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `registrar-api_domain_name` in responses.
- */
-export const registrar_api_domain_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `registrar-api_domain_search_response` in responses.
  */
-export const registrar_api_domain_search_response_output: JsonSchema = {
+export const registrar$$api_domain_search_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_api-response-common"
@@ -141,7 +134,7 @@ export const registrar_api_domain_search_response_output: JsonSchema = {
 /**
  * The schema of `registrar-api_domain_search_result` in responses.
  */
-export const registrar_api_domain_search_result_output: JsonSchema = {
+export const registrar$$api_domain_search_result: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -177,36 +170,10 @@ export const registrar_api_domain_search_result_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `registrar-api_domain_transfer_check_reason` in responses.
- */
-export const registrar_api_domain_transfer_check_reason_output: JsonSchema = {
-  "enum": [
-    "extension_not_supported_via_api",
-    "extension_not_supported",
-    "domain_premium",
-    "extension_disallows_transfer",
-    "domain_not_exists",
-    "domain_on_cloudflare",
-    "domain_locked",
-    "registry_status",
-    "domain_outside_transfer_window",
-    "domain_max_term",
-    "invalid_auth_code",
-    "invalid_auth_code_format",
-    "dnssec_enabled",
-    "zone_not_found",
-    "zone_status_invalid",
-    "invalid_zone_plan",
-    "domain_unsupported"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `registrar-api_domain_transfer_check_response` in responses.
  */
-export const registrar_api_domain_transfer_check_response_output: JsonSchema = {
+export const registrar$$api_domain_transfer_check_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_api-response-common"
@@ -239,7 +206,7 @@ export const registrar_api_domain_transfer_check_response_output: JsonSchema = {
 /**
  * The schema of `registrar-api_domain_transfer_check_result` in responses.
  */
-export const registrar_api_domain_transfer_check_result_output: JsonSchema = {
+export const registrar$$api_domain_transfer_check_result: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -253,7 +220,26 @@ export const registrar_api_domain_transfer_check_result_output: JsonSchema = {
           "items": {
             "properties": {
               "code": {
-                "$ref": "#/$defs/registrar-api_domain_transfer_check_reason"
+                "enum": [
+                  "extension_not_supported_via_api",
+                  "extension_not_supported",
+                  "domain_premium",
+                  "extension_disallows_transfer",
+                  "domain_not_exists",
+                  "domain_on_cloudflare",
+                  "domain_locked",
+                  "registry_status",
+                  "domain_outside_transfer_window",
+                  "domain_max_term",
+                  "invalid_auth_code",
+                  "invalid_auth_code_format",
+                  "dnssec_enabled",
+                  "zone_not_found",
+                  "zone_status_invalid",
+                  "invalid_zone_plan",
+                  "domain_unsupported"
+                ],
+                "type": "string"
               }
             },
             "required": [
@@ -282,7 +268,26 @@ export const registrar_api_domain_transfer_check_result_output: JsonSchema = {
               "items": {
                 "properties": {
                   "code": {
-                    "$ref": "#/$defs/registrar-api_domain_transfer_check_reason"
+                    "enum": [
+                      "extension_not_supported_via_api",
+                      "extension_not_supported",
+                      "domain_premium",
+                      "extension_disallows_transfer",
+                      "domain_not_exists",
+                      "domain_on_cloudflare",
+                      "domain_locked",
+                      "registry_status",
+                      "domain_outside_transfer_window",
+                      "domain_max_term",
+                      "invalid_auth_code",
+                      "invalid_auth_code_format",
+                      "dnssec_enabled",
+                      "zone_not_found",
+                      "zone_status_invalid",
+                      "invalid_zone_plan",
+                      "domain_unsupported"
+                    ],
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -311,7 +316,26 @@ export const registrar_api_domain_transfer_check_result_output: JsonSchema = {
               "items": {
                 "properties": {
                   "code": {
-                    "$ref": "#/$defs/registrar-api_domain_transfer_check_reason"
+                    "enum": [
+                      "extension_not_supported_via_api",
+                      "extension_not_supported",
+                      "domain_premium",
+                      "extension_disallows_transfer",
+                      "domain_not_exists",
+                      "domain_on_cloudflare",
+                      "domain_locked",
+                      "registry_status",
+                      "domain_outside_transfer_window",
+                      "domain_max_term",
+                      "invalid_auth_code",
+                      "invalid_auth_code_format",
+                      "dnssec_enabled",
+                      "zone_not_found",
+                      "zone_status_invalid",
+                      "invalid_zone_plan",
+                      "domain_unsupported"
+                    ],
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -342,7 +366,7 @@ export const registrar_api_domain_transfer_check_result_output: JsonSchema = {
 /**
  * The schema of `registrar-api_pricing_base` in responses.
  */
-export const registrar_api_pricing_base_output: JsonSchema = {
+export const registrar$$api_pricing_base: JsonSchema = {
   "properties": {
     "currency": {
       "type": "string"
@@ -361,7 +385,7 @@ export const registrar_api_pricing_base_output: JsonSchema = {
 /**
  * The schema of `registrar-api_pricing_registration` in responses.
  */
-export const registrar_api_pricing_registration_output: JsonSchema = {
+export const registrar$$api_pricing_registration: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_pricing_base"
@@ -383,7 +407,7 @@ export const registrar_api_pricing_registration_output: JsonSchema = {
 /**
  * The schema of `registrar-api_pricing_transfer` in responses.
  */
-export const registrar_api_pricing_transfer_output: JsonSchema = {
+export const registrar$$api_pricing_transfer: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_pricing_base"
@@ -405,7 +429,7 @@ export const registrar_api_pricing_transfer_output: JsonSchema = {
 /**
  * The schema of `registrar-api_registration` in responses.
  */
-export const registrar_api_registration_output: JsonSchema = {
+export const registrar$$api_registration: JsonSchema = {
   "properties": {
     "auto_renew": {
       "type": "boolean"
@@ -415,7 +439,7 @@ export const registrar_api_registration_output: JsonSchema = {
       "type": "string"
     },
     "domain_name": {
-      "$ref": "#/$defs/registrar-api_domain_name"
+      "type": "string"
     },
     "expires_at": {
       "oneOf": [
@@ -466,7 +490,7 @@ export const registrar_api_registration_output: JsonSchema = {
 /**
  * The schema of `registrar-api_registration-response-collection` in responses.
  */
-export const registrar_api_registration_response_collection_output: JsonSchema = {
+export const registrar$$api_registration$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_api-response-common"
@@ -495,7 +519,7 @@ export const registrar_api_registration_response_collection_output: JsonSchema =
 /**
  * The schema of `registrar-api_registration-response-single` in responses.
  */
-export const registrar_api_registration_response_single_output: JsonSchema = {
+export const registrar$$api_registration$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_api-response-common"
@@ -514,7 +538,7 @@ export const registrar_api_registration_response_single_output: JsonSchema = {
 /**
  * The schema of `registrar-api_workflow-status-response-single` in responses.
  */
-export const registrar_api_workflow_status_response_single_output: JsonSchema = {
+export const registrar$$api_workflow$$status$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api_api-response-common"
@@ -533,7 +557,7 @@ export const registrar_api_workflow_status_response_single_output: JsonSchema =
 /**
  * The schema of `registrar-api_workflow_error` in responses.
  */
-export const registrar_api_workflow_error_output: JsonSchema = {
+export const registrar$$api_workflow_error: JsonSchema = {
   "properties": {
     "code": {
       "type": "string"
@@ -552,7 +576,7 @@ export const registrar_api_workflow_error_output: JsonSchema = {
 /**
  * The schema of `registrar-api_workflow_links` in responses.
  */
-export const registrar_api_workflow_links_output: JsonSchema = {
+export const registrar$$api_workflow_links: JsonSchema = {
   "properties": {
     "resource": {
       "type": "string"
@@ -570,7 +594,7 @@ export const registrar_api_workflow_links_output: JsonSchema = {
 /**
  * The schema of `registrar-api_workflow_status` in responses.
  */
-export const registrar_api_workflow_status_output: JsonSchema = {
+export const registrar$$api_workflow_status: JsonSchema = {
   "properties": {
     "completed": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/registrar/registrations/schemas.ts b/src/generated/forge-mcp/registrar/registrations/schemas.ts
index 99144e809..25593ae34 100644
--- a/src/generated/forge-mcp/registrar/registrations/schemas.ts
+++ b/src/generated/forge-mcp/registrar/registrations/schemas.ts
@@ -6,11 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `registrar-api_domain_check_request`.
  */
-export const registrar_api_domain_check_request: JsonSchema = {
+export const registrar$$api_domain_check_request: JsonSchema = {
   "description": "Request body for checking domain availability.",
   "properties": {
     "domains": {
-      "description": "List of fully qualified domain names (FQDNs) to check for availability. Each domain must include the extension.\n- Minimum: 1 domain.\n- Maximum: 20 domains per request.\n- The response returns domains on unsupported extensions with `registrable: false` and a `reason` field.\n- The response may omit malformed domain names (e.g., names missing an extension).\n",
+      "description": "List of fully qualified domain names (FQDNs) to check for availability. Each domain must include the extension.\n- Minimum: 1 domain.\n- Maximum: 20 domains per request.\n- The response returns domains on unsupported extensions with `registrable: false` and a `reason` field.\n- The response may omit malformed domain names (e.g., names missing an extension).",
       "items": {
         "type": "string"
       },
@@ -25,18 +25,10 @@ export const registrar_api_domain_check_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `registrar-api_domain_name`.
- */
-export const registrar_api_domain_name: JsonSchema = {
-  "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n",
-  "type": "string"
-};
-
 /**
  * The schema of `registrar-api_domain_transfer_check_request`.
  */
-export const registrar_api_domain_transfer_check_request: JsonSchema = {
+export const registrar$$api_domain_transfer_check_request: JsonSchema = {
   "description": "Request body for checking domain transfer eligibility.",
   "properties": {
     "domains": {
@@ -45,7 +37,7 @@ export const registrar_api_domain_transfer_check_request: JsonSchema = {
         "properties": {
           "auth_code": {
             "contentEncoding": "base64",
-            "description": "Base64-encoded auth/EPP code from the current registrar.\nRequired for most TLDs. `.uk` namespaces do not use auth\ncodes.\n",
+            "description": "Base64-encoded auth/EPP code from the current registrar.\nRequired for most TLDs. `.uk` namespaces do not use auth\ncodes.",
             "type": "string"
           },
           "domain_name": {
@@ -72,15 +64,15 @@ export const registrar_api_domain_transfer_check_request: JsonSchema = {
 /**
  * The schema of `registrar-api_registration_contact`.
  */
-export const registrar_api_registration_contact: JsonSchema = {
-  "description": "Contact data for the domain registration. This information\nis submitted to the domain registry and, depending on extension and\nprivacy settings, may appear in public WHOIS records.\n",
+export const registrar$$api_registration_contact: JsonSchema = {
+  "description": "Contact data for the domain registration. This information\nis submitted to the domain registry and, depending on extension and\nprivacy settings, may appear in public WHOIS records.",
   "properties": {
     "email": {
-      "description": "Email address for the registrant. Used for domain-related\ncommunications from the registry, including ownership verification\nand renewal notices.\n",
+      "description": "Email address for the registrant. Used for domain-related\ncommunications from the registry, including ownership verification\nand renewal notices.",
       "type": "string"
     },
     "fax": {
-      "description": "Fax number in E.164 format (e.g., `+1.5555555555`). Optional.\nMost registrations do not require a fax number.\n",
+      "description": "Fax number in E.164 format (e.g., `+1.5555555555`). Optional.\nMost registrations do not require a fax number.",
       "type": "string"
     },
     "phone": {
@@ -89,7 +81,7 @@ export const registrar_api_registration_contact: JsonSchema = {
     },
     "postal_info": {
       "$ref": "#/$defs/registrar-api_registration_contact_postal_info",
-      "description": "Postal/mailing information for the contact. The `name` field is the\ncomplete contact name in one string. Some registries require a complete\npersonal name, including a family or last name where applicable, but this\nAPI does not accept separate first-name and last-name fields for\nregistration contacts.\n"
+      "description": "Postal/mailing information for the contact. The `name` field is the\ncomplete contact name in one string. Some registries require a complete\npersonal name, including a family or last name where applicable, but this\nAPI does not accept separate first-name and last-name fields for\nregistration contacts."
     }
   },
   "required": [
@@ -103,7 +95,7 @@ export const registrar_api_registration_contact: JsonSchema = {
 /**
  * The schema of `registrar-api_registration_contact_address`.
  */
-export const registrar_api_registration_contact_address: JsonSchema = {
+export const registrar$$api_registration_contact_address: JsonSchema = {
   "description": "Physical mailing address for the registrant contact.",
   "properties": {
     "city": {
@@ -140,8 +132,8 @@ export const registrar_api_registration_contact_address: JsonSchema = {
 /**
  * The schema of `registrar-api_registration_contact_postal_info`.
  */
-export const registrar_api_registration_contact_postal_info: JsonSchema = {
-  "description": "Postal/mailing information for the contact. The `name` field is the\ncomplete contact name in one string. Some registries require a complete\npersonal name, including a family or last name where applicable, but this\nAPI does not accept separate first-name and last-name fields for\nregistration contacts.\n",
+export const registrar$$api_registration_contact_postal_info: JsonSchema = {
+  "description": "Postal/mailing information for the contact. The `name` field is the\ncomplete contact name in one string. Some registries require a complete\npersonal name, including a family or last name where applicable, but this\nAPI does not accept separate first-name and last-name fields for\nregistration contacts.",
   "properties": {
     "address": {
       "$ref": "#/$defs/registrar-api_registration_contact_address",
@@ -166,24 +158,24 @@ export const registrar_api_registration_contact_postal_info: JsonSchema = {
 /**
  * The schema of `registrar-api_registration_contacts`.
  */
-export const registrar_api_registration_contacts: JsonSchema = {
-  "description": "Provides contact data for the registration request.\n\nThe per-extension schema from\n`GET /accounts/{account_id}/registrar/extensions/{extension}` defines the\naccepted contact roles. Every currently supported extension requires only\n`contacts.registrant` from API callers. Callers may provide additional roles\nsuch as `technical`, `administrator`, and `billing` when the extension\nschema includes them. When a registry requires an omitted role, Cloudflare\nmay derive that contact from `contacts.registrant`.\n\nWhen the request omits either the entire `contacts` object or\n`contacts.registrant`, the system uses the account's default address book\nentry as the registrant contact. The account owner must configure this\ndefault at `https://dash.cloudflare.com/{account_id}/domains/registrations`,\nwhere they can create or update the address book entry and accept the\nrequired agreement. Dashboard settings currently provide the only way to\nmanage address book entries.\n\nWithout either a default address book entry or a registrant contact, the\nregistration request fails validation.\n",
+export const registrar$$api_registration_contacts: JsonSchema = {
+  "description": "Provides contact data for the registration request.\n\nThe per-extension schema from\n`GET /accounts/{account_id}/registrar/extensions/{extension}` defines the\naccepted contact roles. Every currently supported extension requires only\n`contacts.registrant` from API callers. Callers may provide additional roles\nsuch as `technical`, `administrator`, and `billing` when the extension\nschema includes them. When a registry requires an omitted role, Cloudflare\nmay derive that contact from `contacts.registrant`.\n\nWhen the request omits either the entire `contacts` object or\n`contacts.registrant`, the system uses the account's default address book\nentry as the registrant contact. The account owner must configure this\ndefault at `https://dash.cloudflare.com/{account_id}/domains/registrations`,\nwhere they can create or update the address book entry and accept the\nrequired agreement. Dashboard settings currently provide the only way to\nmanage address book entries.\n\nWithout either a default address book entry or a registrant contact, the\nregistration request fails validation.",
   "properties": {
     "administrator": {
       "$ref": "#/$defs/registrar-api_registration_contact",
-      "description": "Optional administrator contact. Accepted only when the extension\nschema includes this role. When the registry requires an omitted\ncontact, Cloudflare may derive it from `contacts.registrant`.\n"
+      "description": "Optional administrator contact. Accepted only when the extension\nschema includes this role. When the registry requires an omitted\ncontact, Cloudflare may derive it from `contacts.registrant`."
     },
     "billing": {
       "$ref": "#/$defs/registrar-api_registration_contact",
-      "description": "Optional billing contact. Accepted only when the extension schema\nincludes this role. When the registry requires an omitted contact,\nCloudflare may derive it from `contacts.registrant`.\n"
+      "description": "Optional billing contact. Accepted only when the extension schema\nincludes this role. When the registry requires an omitted contact,\nCloudflare may derive it from `contacts.registrant`."
     },
     "registrant": {
       "$ref": "#/$defs/registrar-api_registration_contact",
-      "description": "Optional registrant contact. If omitted, the account's default\naddress book entry is used instead.\n"
+      "description": "Optional registrant contact. If omitted, the account's default\naddress book entry is used instead."
     },
     "technical": {
       "$ref": "#/$defs/registrar-api_registration_contact",
-      "description": "Optional technical contact. Accepted only when the extension schema\nincludes this role. When the registry requires an omitted contact,\nCloudflare may derive it from `contacts.registrant`.\n"
+      "description": "Optional technical contact. Accepted only when the extension schema\nincludes this role. When the registry requires an omitted contact,\nCloudflare may derive it from `contacts.registrant`."
     }
   },
   "type": "object"
@@ -192,31 +184,31 @@ export const registrar_api_registration_contacts: JsonSchema = {
 /**
  * The schema of `registrar-api_registration_create_request`.
  */
-export const registrar_api_registration_create_request: JsonSchema = {
+export const registrar$$api_registration_create_request: JsonSchema = {
   "properties": {
     "acknowledgements": {
-      "description": "Provides user acknowledgements for a specific extension or premium\nregistration flow. The extension registration schema from the\nextension discovery endpoint identifies the required keys.\n",
+      "description": "Provides user acknowledgements for a specific extension or premium\nregistration flow. The extension registration schema from the\nextension discovery endpoint identifies the required keys.",
       "type": "object"
     },
     "auto_renew": {
       "default": false,
-      "description": "Enable or disable automatic renewal. Defaults to `false` if omitted.\nSetting this field to `true` is an explicit opt-in authorizing\nCloudflare to charge the account's default payment method up to 30\ndays before domain expiry to renew the domain automatically.\nRenewal pricing may change over time based on registry pricing.\n",
+      "description": "Enable or disable automatic renewal. Defaults to `false` if omitted.\nSetting this field to `true` is an explicit opt-in authorizing\nCloudflare to charge the account's default payment method up to 30\ndays before domain expiry to renew the domain automatically.\nRenewal pricing may change over time based on registry pricing.",
       "type": "boolean"
     },
     "contact_extensions": {
-      "description": "Provides registry-specific contact extension values for the registrant.\n`GET /accounts/{account_id}/registrar/extensions/{extension}` identifies\nthe required keys and allowed values for each extension in the\n`registration_schema.properties.contact_extensions` object.\n\nExamples include `.us` nexus fields, `.uk` registrant type fields,\nand `.ca` legal type fields. Omit this object when the extension's\nregistration schema excludes `contact_extensions`.\n",
+      "description": "Provides registry-specific contact extension values for the registrant.\n`GET /accounts/{account_id}/registrar/extensions/{extension}` identifies\nthe required keys and allowed values for each extension in the\n`registration_schema.properties.contact_extensions` object.\n\nExamples include `.us` nexus fields, `.uk` registrant type fields,\nand `.ca` legal type fields. Omit this object when the extension's\nregistration schema excludes `contact_extensions`.",
       "type": "object"
     },
     "contacts": {
       "$ref": "#/$defs/registrar-api_registration_contacts"
     },
     "domain_name": {
-      "$ref": "#/$defs/registrar-api_domain_name",
-      "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n"
+      "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.",
+      "type": "string"
     },
     "privacy_mode": {
       "default": "redaction",
-      "description": "Sets the WHOIS privacy mode for the registration. Defaults to `redaction`.\n- `off`: Disables WHOIS privacy.\n- `redaction`: Requests WHOIS redaction where the extension supports it.\n  Some extensions exclude privacy and redaction.\n",
+      "description": "Sets the WHOIS privacy mode for the registration. Defaults to `redaction`.\n- `off`: Disables WHOIS privacy.\n- `redaction`: Requests WHOIS redaction where the extension supports it.\n  Some extensions exclude privacy and redaction.",
       "enum": [
         "off",
         "redaction"
@@ -224,7 +216,7 @@ export const registrar_api_registration_create_request: JsonSchema = {
       "type": "string"
     },
     "years": {
-      "description": "Sets the registration term from 1 to 10 years. When omitted, this\nfield defaults to the registry's minimum registration period for the\nextension. Most extensions require 1 year, while some require longer\nminimum terms (e.g., `.ai` requires 2 years).\n\nEach registry may also enforce its own maximum registration term. A\nrequest above that maximum fails. When uncertain, omit this field to\nuse the default.\n",
+      "description": "Sets the registration term from 1 to 10 years. When omitted, this\nfield defaults to the registry's minimum registration period for the\nextension. Most extensions require 1 year, while some require longer\nminimum terms (e.g., `.ai` requires 2 years).\n\nEach registry may also enforce its own maximum registration term. A\nrequest above that maximum fails. When uncertain, omit this field to\nuse the default.",
       "type": "integer"
     }
   },
@@ -237,11 +229,11 @@ export const registrar_api_registration_create_request: JsonSchema = {
 /**
  * The schema of `registrar-api_registration_update_request`.
  */
-export const registrar_api_registration_update_request: JsonSchema = {
-  "description": "Request to update an existing domain registration.\n\nThis endpoint currently supports updating `auto_renew` only.\n",
+export const registrar$$api_registration_update_request: JsonSchema = {
+  "description": "Request to update an existing domain registration.\n\nThis endpoint currently supports updating `auto_renew` only.",
   "properties": {
     "auto_renew": {
-      "description": "Enable or disable automatic renewal.\nSetting this field to `true` authorizes Cloudflare to charge the\naccount's default payment method up to 30 days before domain expiry\nto renew the domain automatically. Renewal pricing may change over\ntime based on registry pricing.\n",
+      "description": "Enable or disable automatic renewal.\nSetting this field to `true` authorizes Cloudflare to charge the\naccount's default payment method up to 30 days before domain expiry\nto renew the domain automatically. Renewal pricing may change over\ntime based on registry pricing.",
       "type": "boolean"
     }
   },
@@ -251,27 +243,27 @@ export const registrar_api_registration_update_request: JsonSchema = {
 /**
  * The schema of `registrar-api_transfer_in_create_request`.
  */
-export const registrar_api_transfer_in_create_request: JsonSchema = {
+export const registrar$$api_transfer_in_create_request: JsonSchema = {
   "properties": {
     "auth_code": {
       "contentEncoding": "base64",
-      "description": "The EPP/authorization code from your current registrar, base64-encoded\nper RFC 4648 §4. Obtain this from your current registrar's control panel.\nRequired for all extensions, except for UK.\n",
+      "description": "The EPP/authorization code from your current registrar, base64-encoded\nper RFC 4648 §4. Obtain this from your current registrar's control panel.\nRequired for all extensions, except for UK.",
       "type": "string"
     },
     "auto_renew": {
       "default": false,
-      "description": "Enable or disable automatic renewal after transfer. Defaults to `false` if omitted.\n",
+      "description": "Enable or disable automatic renewal after transfer. Defaults to `false` if omitted.",
       "type": "boolean"
     },
     "contact_extensions": {
-      "description": "Registry-specific contact extension values for the registrant.\n`GET /accounts/{account_id}/registrar/extensions/{extension}` documents the\nrequired keys and allowed values for each extension in the\n`transfer_schema.properties.contact_extensions` object.\n\nExamples include `.us` nexus fields, `.uk` registrant type fields,\nand `.ca` legal type fields. Include this object only when the extension's\ntransfer schema defines `contact_extensions`.\n",
+      "description": "Registry-specific contact extension values for the registrant.\n`GET /accounts/{account_id}/registrar/extensions/{extension}` documents the\nrequired keys and allowed values for each extension in the\n`transfer_schema.properties.contact_extensions` object.\n\nExamples include `.us` nexus fields, `.uk` registrant type fields,\nand `.ca` legal type fields. Include this object only when the extension's\ntransfer schema defines `contact_extensions`.",
       "type": "object"
     },
     "contacts": {
       "$ref": "#/$defs/registrar-api_registration_contacts"
     },
     "privacy_mode": {
-      "description": "WHOIS privacy mode to apply after transfer completes. Defaults to\nthe extension's default privacy mode (typically `redaction`).\n",
+      "description": "WHOIS privacy mode to apply after transfer completes. Defaults to\nthe extension's default privacy mode (typically `redaction`).",
       "enum": [
         "off",
         "redaction"
diff --git a/src/generated/forge-mcp/registrar/registrations/tools.ts b/src/generated/forge-mcp/registrar/registrations/tools.ts
index eb952a5e2..6d0ef6c59 100644
--- a/src/generated/forge-mcp/registrar/registrations/tools.ts
+++ b/src/generated/forge-mcp/registrar/registrations/tools.ts
@@ -1,45 +1,41 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  registrar_api_api_response_common_failure_output,
-  registrar_api_api_response_common_output,
-  registrar_api_messages_output,
+  registrar$$api_api$$response$$common,
+  registrar$$api_api$$response$$common$$failure,
+  registrar$$api_messages,
 } from "../outputs.js";
-import { registrar_api_identifier } from "../schemas.js";
 import {
-  registrar_api_cursor_result_info_output,
-  registrar_api_domain_check_response_output,
-  registrar_api_domain_check_result_output,
-  registrar_api_domain_name_output,
-  registrar_api_domain_search_response_output,
-  registrar_api_domain_search_result_output,
-  registrar_api_domain_transfer_check_reason_output,
-  registrar_api_domain_transfer_check_response_output,
-  registrar_api_domain_transfer_check_result_output,
-  registrar_api_pricing_base_output,
-  registrar_api_pricing_registration_output,
-  registrar_api_pricing_transfer_output,
-  registrar_api_registration_output,
-  registrar_api_registration_response_collection_output,
-  registrar_api_registration_response_single_output,
-  registrar_api_workflow_error_output,
-  registrar_api_workflow_links_output,
-  registrar_api_workflow_status_output,
-  registrar_api_workflow_status_response_single_output,
+  registrar$$api_cursor_result_info,
+  registrar$$api_domain_check_response,
+  registrar$$api_domain_check_result,
+  registrar$$api_domain_search_response,
+  registrar$$api_domain_search_result,
+  registrar$$api_domain_transfer_check_response,
+  registrar$$api_domain_transfer_check_result,
+  registrar$$api_pricing_base,
+  registrar$$api_pricing_registration,
+  registrar$$api_pricing_transfer,
+  registrar$$api_registration,
+  registrar$$api_registration$$response$$collection,
+  registrar$$api_registration$$response$$single,
+  registrar$$api_workflow$$status$$response$$single,
+  registrar$$api_workflow_error,
+  registrar$$api_workflow_links,
+  registrar$$api_workflow_status,
 } from "./outputs.js";
 import {
-  registrar_api_domain_check_request,
-  registrar_api_domain_name,
-  registrar_api_domain_transfer_check_request,
-  registrar_api_registration_contact,
-  registrar_api_registration_contact_address,
-  registrar_api_registration_contact_postal_info,
-  registrar_api_registration_contacts,
-  registrar_api_registration_create_request,
-  registrar_api_registration_update_request,
-  registrar_api_transfer_in_create_request,
+  registrar$$api_domain_check_request,
+  registrar$$api_domain_transfer_check_request,
+  registrar$$api_registration_contact,
+  registrar$$api_registration_contact_address,
+  registrar$$api_registration_contact_postal_info,
+  registrar$$api_registration_contacts,
+  registrar$$api_registration_create_request,
+  registrar$$api_registration_update_request,
+  registrar$$api_transfer_in_create_request,
 } from "./schemas.js";
 
 /**
@@ -49,37 +45,46 @@ export const tools: readonly Tool[] = [
   {
     name: "registrar_registrations_check",
     title: "Check domain availability",
-    description: "Performs real-time, authoritative availability checks directly against domain\nregistries. Use this endpoint to verify a domain is available before attempting\nregistration via `POST /registrations`.\n\n**Important:** Unlike the Search endpoint, these results are authoritative and\nreflect current registry status. Always check availability immediately before\nregistration as domain status can change rapidly.\n\n**Note:** This endpoint uses POST to accept a list of domains in the request\nbody. It is a read-only operation — it does not create, modify, or reserve\nany domains.\n\n### Extension support\n\nOnly domains on extensions supported for programmatic registration by this API\ncan be registered. If you check a domain on an unsupported extension, the response\nwill include `registrable: false` with a `reason` field explaining why:\n\n- `extension_not_supported_via_api` — Cloudflare Registrar supports this extension\n  in the dashboard, but it is not yet available for programmatic registration via\n  this API. Register via `https://dash.cloudflare.com/{account_id}/domains/registrations` instead.\n- `extension_not_supported` — This extension is not supported by Cloudflare\n  Registrar.\n- `extension_disallows_registration` — The extension's registry has temporarily\n  or permanently frozen new registrations. No registrar can register domains on\n  this extension at this time.\n- `domain_premium` — The domain is premium priced. Premium registration is not\n  currently supported by this API.\n- `domain_unavailable` — The domain is already registered, reserved, or otherwise\n  not available for registration on a supported extension.\n\nThe `reason` field is only present when `registrable` is `false`.\n\n### Behavior\n- Maximum 20 domains per request\n- Pricing is only returned for domains where `registrable: true`\n- Results are not cached; each request queries the registry\n\n### Workflow\n1. Call this endpoint with domains the user wants to register.\n2. For each domain where `registrable: true`, present pricing to the user.\n3. If `tier: premium`, note that premium registration is not currently\n   supported by this API and do not proceed to `POST /registrations`.\n4. Proceed to `POST /registrations` only for supported non-premium domains.",
+    description: "Performs real-time, authoritative availability checks directly against domain\nregistries. Use this endpoint to verify a domain is available before attempting\nregistration via `POST /registrations`.\n\n**Important:** Unlike the Search endpoint, these results are authoritative and\nreflect current registry status. Always check availability immediately before\nregistration as domain status can change rapidly.\n\n**Note:** This endpoint uses POST to accept a list of domains in the request\nbody. It is a read-only operation — it does not create, modify, or reserve\nany domains.\n\n### Extension support\n\nOnly domains on extensions supported for programmatic registration by this API\ncan be registered. If you check a domain on an unsupported extension, the response\nwill include `registrable: false` with a `reason` field explaining why:\n\n- `extension_not_supported_via_api` — Cloudflare Registrar supports this extension\n  in the dashboard, but it is not yet available for programmatic registration via\n  this API. Register via `https://dash.cloudflare.com/{account_id}/domains/registrations` instead.\n- `extension_not_supported` — This extension is not supported by Cloudflare\n  Registrar.\n- `extension_disallows_registration` — The extension's registry has temporarily\n  or permanently frozen new registrations. No registrar can register domains on\n  this extension at this time.\n- `domain_premium` — The domain is premium priced. Premium registration is not\n  currently supported by this API.\n- `domain_unavailable` — The domain is already registered, reserved, or otherwise\n  not available for registration on a supported extension.\n\nThe `reason` field is only present when `registrable` is `false`.\n\n### Behavior\n- Maximum 20 domains per request\n- Pricing is only returned for domains where `registrable: true`\n- Results are not cached; each request queries the registry\n\n### Workflow\n1. Call this endpoint with domains the user wants to register.\n2. For each domain where `registrable: true`, present pricing to the user.\n3. If `tier: premium`, note that premium registration is not currently\n   supported by this API and do not proceed to `POST /registrations`.\n4. Proceed to `POST /registrations` only for supported non-premium domains.\n\nPOST /accounts/{account_id}/registrar/domain-check",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
         "body": {
           "$ref": "#/$defs/registrar-api_domain_check_request",
           "description": "List of fully qualified domain names (FQDNs) to check. Each domain must include the extension (e.g., \"example.com\", not \"example\")."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "registrar-api_domain_check_request": registrar_api_domain_check_request,
-        "registrar-api_identifier": registrar_api_identifier,
+        "registrar-api_domain_check_request": registrar$$api_domain_check_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_domain_check_response",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_domain_check_response": registrar_api_domain_check_response_output,
-        "registrar-api_domain_check_result": registrar_api_domain_check_result_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_pricing_base": registrar_api_pricing_base_output,
-        "registrar-api_pricing_registration": registrar_api_pricing_registration_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_domain_check_response": registrar$$api_domain_check_response,
+        "registrar-api_domain_check_result": registrar$$api_domain_check_result,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_pricing_base": registrar$$api_pricing_base,
+        "registrar-api_pricing_registration": registrar$$api_pricing_registration,
       },
     },
     annotations: {
@@ -108,13 +113,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_domain_check_response": registrar_api_domain_check_response_output,
-        "registrar-api_domain_check_result": registrar_api_domain_check_result_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_pricing_base": registrar_api_pricing_base_output,
-        "registrar-api_pricing_registration": registrar_api_pricing_registration_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_domain_check_response": registrar$$api_domain_check_response,
+        "registrar-api_domain_check_result": registrar$$api_domain_check_result,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_pricing_base": registrar$$api_pricing_base,
+        "registrar-api_pricing_registration": registrar$$api_pricing_registration,
       },
     },
     request: (args) => ({
@@ -125,45 +130,59 @@ export const tools: readonly Tool[] = [
   {
     name: "registrar_registrations_create",
     title: "Create Registration",
-    description: "Starts a domain registration workflow. This is a billable operation — successful\nregistration charges the account's default payment method. All successful\ndomain registrations are non-refundable — once the workflow completes with\n`state: succeeded`, the charge cannot be reversed.\n\n### Prerequisites\n- The account must have a billing profile with a valid default payment method.\n  Set this up at `https://dash.cloudflare.com/{account_id}/billing/payment-info`.\n- The account must not already be at the maximum supported domain limit.\n  A single account may own up to 500 domains in total across registrations\n  created through either the dashboard or this API.\n- The domain must be on a supported extension for programmatic registration.\n- Use `POST /domain-check` immediately before calling this endpoint to confirm\n  real-time availability and pricing.\n\n### Supported extensions\n\nThis API supports programmatic registration for all extensions supported by\nthe dashboard experience, with the following exceptions:\n\n`giving`, `mom`, `inc`, `lol`, `sh`, `link`, `cc`, `new`\n\nCloudflare Registrar supports 400+ extensions in the dashboard. Extensions\nlisted above can be registered at\n`https://dash.cloudflare.com/{account_id}/domains/registrations`.\n\n### Express mode\nThe only required field is `domain_name`. If `contacts` is omitted, the system\nuses the account's default address book entry as the registrant. If no default\nexists and no contact is provided, the request fails. Set up a default address\nbook entry and accept the required agreement at\n`https://dash.cloudflare.com/{account_id}/domains/registrations`.\n\n### Defaults\n- `years`: defaults to the extension's minimum registration period (1 year for\n  most extensions, but varies — for example, `.ai` (if supported) requires a minimum of 2 years).\n- `auto_renew`: defaults to `false`. Setting it to `true` is an explicit\n  opt-in authorizing Cloudflare to charge the account's default payment\n  method up to 30 days before domain expiry to renew the registration.\n  Renewal pricing may change over time based on registry pricing.\n- `privacy_mode`: defaults to `redaction`.\n\n### Premium domains\nPremium domain registration is not currently supported by this API.\nIf `POST /domain-check` returns `tier: premium`, do not call this\nendpoint for that domain.\n\n### Response behavior\nBy default, the server holds the connection for a bounded, server-defined\namount of time while the registration completes. Most registrations finish\nwithin this window and return `201 Created` with a completed workflow status.\n\nIf the registration is still processing after this synchronous wait window,\nthe server returns `202 Accepted`. Poll the URL in `links.self` to track progress.\n\nTo skip the wait and receive an immediate `202`, send `Prefer: respond-async`.",
+    description: "Starts a domain registration workflow. This is a billable operation — successful\nregistration charges the account's default payment method. All successful\ndomain registrations are non-refundable — once the workflow completes with\n`state: succeeded`, the charge cannot be reversed.\n\n### Prerequisites\n- The account must have a billing profile with a valid default payment method.\n  Set this up at `https://dash.cloudflare.com/{account_id}/billing/payment-info`.\n- The account must not already be at the maximum supported domain limit.\n  A single account may own up to 500 domains in total across registrations\n  created through either the dashboard or this API.\n- The domain must be on a supported extension for programmatic registration.\n- Use `POST /domain-check` immediately before calling this endpoint to confirm\n  real-time availability and pricing.\n\n### Supported extensions\n\nThis API supports programmatic registration for all extensions supported by\nthe dashboard experience, with the following exceptions:\n\n`giving`, `mom`, `inc`, `lol`, `sh`, `link`, `cc`, `new`\n\nCloudflare Registrar supports 400+ extensions in the dashboard. Extensions\nlisted above can be registered at\n`https://dash.cloudflare.com/{account_id}/domains/registrations`.\n\n### Express mode\nThe only required field is `domain_name`. If `contacts` is omitted, the system\nuses the account's default address book entry as the registrant. If no default\nexists and no contact is provided, the request fails. Set up a default address\nbook entry and accept the required agreement at\n`https://dash.cloudflare.com/{account_id}/domains/registrations`.\n\n### Defaults\n- `years`: defaults to the extension's minimum registration period (1 year for\n  most extensions, but varies — for example, `.ai` (if supported) requires a minimum of 2 years).\n- `auto_renew`: defaults to `false`. Setting it to `true` is an explicit\n  opt-in authorizing Cloudflare to charge the account's default payment\n  method up to 30 days before domain expiry to renew the registration.\n  Renewal pricing may change over time based on registry pricing.\n- `privacy_mode`: defaults to `redaction`.\n\n### Premium domains\nPremium domain registration is not currently supported by this API.\nIf `POST /domain-check` returns `tier: premium`, do not call this\nendpoint for that domain.\n\n### Response behavior\nBy default, the server holds the connection for a bounded, server-defined\namount of time while the registration completes. Most registrations finish\nwithin this window and return `201 Created` with a completed workflow status.\n\nIf the registration is still processing after this synchronous wait window,\nthe server returns `202 Accepted`. Poll the URL in `links.self` to track progress.\n\nTo skip the wait and receive an immediate `202`, send `Prefer: respond-async`.\n\nPOST /accounts/{account_id}/registrar/registrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
         "body": {
           "$ref": "#/$defs/registrar-api_registration_create_request"
         },
-        "prefer": {
-          "description": "Set to `respond-async` to receive an immediate `202 Accepted` without\nwaiting for the operation to complete (RFC 7240).\n\nThe header may be combined with other preferences using standard\ncomma-separated syntax.\n",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Prefer": {
+              "description": "Set to `respond-async` to receive an immediate `202 Accepted` without\nwaiting for the operation to complete (RFC 7240).\n\nThe header may be combined with other preferences using standard\ncomma-separated syntax.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "registrar-api_domain_name": registrar_api_domain_name,
-        "registrar-api_identifier": registrar_api_identifier,
-        "registrar-api_registration_contact": registrar_api_registration_contact,
-        "registrar-api_registration_contact_address": registrar_api_registration_contact_address,
-        "registrar-api_registration_contact_postal_info": registrar_api_registration_contact_postal_info,
-        "registrar-api_registration_contacts": registrar_api_registration_contacts,
-        "registrar-api_registration_create_request": registrar_api_registration_create_request,
+        "registrar-api_registration_contact": registrar$$api_registration_contact,
+        "registrar-api_registration_contact_address": registrar$$api_registration_contact_address,
+        "registrar-api_registration_contact_postal_info": registrar$$api_registration_contact_postal_info,
+        "registrar-api_registration_contacts": registrar$$api_registration_contacts,
+        "registrar-api_registration_create_request": registrar$$api_registration_create_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_workflow-status-response-single",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     annotations: {
@@ -188,19 +207,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar/registrations`,
       headers: [
-        ["Prefer", args["prefer"]],
+        ["Prefer", param(args, "headers", "Prefer")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -208,36 +227,41 @@ export const tools: readonly Tool[] = [
   {
     name: "registrar_registrations_get",
     title: "Get Registration",
-    description: "Returns the current state of a domain registration.\n\nThis is the canonical read endpoint for a domain you own. It returns\nthe full registration resource including current settings and expiration.\nWhen the registration resource is ready, both `created_at` and `expires_at`\nare present in the response.",
+    description: "Returns the current state of a domain registration.\n\nThis is the canonical read endpoint for a domain you own. It returns\nthe full registration resource including current settings and expiration.\nWhen the registration resource is ready, both `created_at` and `expires_at`\nare present in the response.\n\nGET /accounts/{account_id}/registrar/registrations/{domain_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api_domain_name",
-          "description": "Domain name to retrieve."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Domain name to retrieve.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "registrar-api_domain_name": registrar_api_domain_name,
-        "registrar-api_identifier": registrar_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_registration-response-single",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_domain_name": registrar_api_domain_name_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_registration": registrar_api_registration_output,
-        "registrar-api_registration-response-single": registrar_api_registration_response_single_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_registration": registrar$$api_registration,
+        "registrar-api_registration-response-single": registrar$$api_registration$$response$$single,
       },
     },
     annotations: {
@@ -259,12 +283,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_domain_name": registrar_api_domain_name_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_registration": registrar_api_registration_output,
-        "registrar-api_registration-response-single": registrar_api_registration_response_single_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_registration": registrar$$api_registration,
+        "registrar-api_registration-response-single": registrar$$api_registration$$response$$single,
       },
     },
     request: (args) => ({
@@ -272,39 +295,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_registrations_get_registration_status",
+    name: "registrar_registrations_getRegistrationStatus",
     title: "Get Registration Status",
-    description: "Returns the current status of a domain registration workflow.\n\nUse this endpoint to poll for completion when the POST response\nreturned `202 Accepted`. The URL is provided in the `links.self`\nfield of the workflow status response.\n\nPoll this endpoint until the workflow reaches a terminal state or a\nstate that requires user attention.\n\n**Terminal states:** `succeeded` and `failed` are terminal and always\nhave `completed: true`.\n\n**Non-terminal states:**\n- `action_required` has `completed: false` and will not resolve on its\n  own. The workflow is paused pending user intervention.\n- `blocked` has `completed: false` and indicates the workflow is waiting\n  on a third party such as the extension registry or losing registrar.\n  Continue polling while informing the user of the delay.\n\nUse increasing backoff between polls. When `state: blocked`, use a\nlonger polling interval and do not poll indefinitely.\n\nA naive polling loop that only checks `completed` can run indefinitely\nwhen `state: action_required`. Break explicitly on `action_required`:\n\n```js\nlet status;\ndo {\n  await new Promise(r => setTimeout(r, 2000));\n  status = await cloudflare.request({\n    method: 'GET',\n    path: reg.result.links.self,\n  });\n} while (\n  !status.result.completed &&\n  status.result.state !== 'action_required'\n);\n\nif (status.result.state === 'action_required') {\n  // Surface context.action and context.confirmation_sent_to to the user.\n  // Do not re-submit the registration request.\n}\n```",
+    description: "Returns the current status of a domain registration workflow.\n\nUse this endpoint to poll for completion when the POST response\nreturned `202 Accepted`. The URL is provided in the `links.self`\nfield of the workflow status response.\n\nPoll this endpoint until the workflow reaches a terminal state or a\nstate that requires user attention.\n\n**Terminal states:** `succeeded` and `failed` are terminal and always\nhave `completed: true`.\n\n**Non-terminal states:**\n- `action_required` has `completed: false` and will not resolve on its\n  own. The workflow is paused pending user intervention.\n- `blocked` has `completed: false` and indicates the workflow is waiting\n  on a third party such as the extension registry or losing registrar.\n  Continue polling while informing the user of the delay.\n\nUse increasing backoff between polls. When `state: blocked`, use a\nlonger polling interval and do not poll indefinitely.\n\nA naive polling loop that only checks `completed` can run indefinitely\nwhen `state: action_required`. Break explicitly on `action_required`:\n\n```js\nlet status;\ndo {\n  await new Promise(r => setTimeout(r, 2000));\n  status = await cloudflare.request({\n    method: 'GET',\n    path: reg.result.links.self,\n  });\n} while (\n  !status.result.completed &&\n  status.result.state !== 'action_required'\n);\n\nif (status.result.state === 'action_required') {\n  // Surface context.action and context.confirmation_sent_to to the user.\n  // Do not re-submit the registration request.\n}\n```\n\nGET /accounts/{account_id}/registrar/registrations/{domain_name}/registration-status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api_domain_name",
-          "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "registrar-api_domain_name": registrar_api_domain_name,
-        "registrar-api_identifier": registrar_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_workflow-status-response-single",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     annotations: {
@@ -326,13 +355,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     request: (args) => ({
@@ -340,39 +369,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_registrations_get_transfer_status",
+    name: "registrar_registrations_getTransferStatus",
     title: "Get Transfer Status",
-    description: "Returns the current status of a domain transfer workflow.\n\nUse this endpoint to poll transfer progress after initiating a transfer\nwith `POST /accounts/{account_id}/registrar/registrations/{domain_name}/transfer-in`.\nThe URL is provided in the `links.self` field of the transfer response.\n\n### Transfer timelines\nTransfers typically take 1–10 days due to ICANN-mandated approval windows.\n\n### Workflow states\n\n**Terminal states:** `succeeded` and `failed` are terminal and always\nhave `completed: true`.\n\n**Non-terminal states:**\n- `in_progress`: Transfer has been submitted to the registry and is being\n  processed. Continue polling.\n- `blocked`: The workflow is waiting on the losing registrar or registry\n  to release the domain. This is the **most common state** for transfers\n  and is entirely normal — it means the ICANN transfer approval window is\n  in effect. The losing registrar has up to 5 days to approve or reject.\n  Continue polling with longer intervals (e.g., every 30–60 minutes).\n- `action_required`: The user needs to take action (e.g., the FOA email\n  needs to be accepted). See `context` for details on what is needed.\n- `pending`: Transfer workflow created but not yet started processing.\n\n### Polling guidance\nAdjust your polling interval based on the current workflow state:\n- `pending` or `in_progress`: Poll every 30 seconds.\n- `blocked`: The transfer is waiting on a third party (e.g., losing\n  registrar approval). Poll every 30–60 minutes.\n- `action_required`: Stop polling. The workflow will not advance until\n  the user takes action. Check `context` for details on what is needed.\n- `succeeded` or `failed`: Terminal — stop polling.",
+    description: "Returns the current status of a domain transfer workflow.\n\nUse this endpoint to poll transfer progress after initiating a transfer\nwith `POST /accounts/{account_id}/registrar/registrations/{domain_name}/transfer-in`.\nThe URL is provided in the `links.self` field of the transfer response.\n\n### Transfer timelines\nTransfers typically take 1–10 days due to ICANN-mandated approval windows.\n\n### Workflow states\n\n**Terminal states:** `succeeded` and `failed` are terminal and always\nhave `completed: true`.\n\n**Non-terminal states:**\n- `in_progress`: Transfer has been submitted to the registry and is being\n  processed. Continue polling.\n- `blocked`: The workflow is waiting on the losing registrar or registry\n  to release the domain. This is the **most common state** for transfers\n  and is entirely normal — it means the ICANN transfer approval window is\n  in effect. The losing registrar has up to 5 days to approve or reject.\n  Continue polling with longer intervals (e.g., every 30–60 minutes).\n- `action_required`: The user needs to take action (e.g., the FOA email\n  needs to be accepted). See `context` for details on what is needed.\n- `pending`: Transfer workflow created but not yet started processing.\n\n### Polling guidance\nAdjust your polling interval based on the current workflow state:\n- `pending` or `in_progress`: Poll every 30 seconds.\n- `blocked`: The transfer is waiting on a third party (e.g., losing\n  registrar approval). Poll every 30–60 minutes.\n- `action_required`: Stop polling. The workflow will not advance until\n  the user takes action. Check `context` for details on what is needed.\n- `succeeded` or `failed`: Terminal — stop polling.\n\nGET /accounts/{account_id}/registrar/registrations/{domain_name}/transfer-in-status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api_domain_name",
-          "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "registrar-api_domain_name": registrar_api_domain_name,
-        "registrar-api_identifier": registrar_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_workflow-status-response-single",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     annotations: {
@@ -394,13 +429,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     request: (args) => ({
@@ -408,39 +443,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_registrations_get_update_status",
+    name: "registrar_registrations_getUpdateStatus",
     title: "Get Update Status",
-    description: "Returns the current status of a domain update workflow.\n\nUse this endpoint to poll for completion when the PATCH response\nreturned `202 Accepted`. The URL is provided in the `links.self`\nfield of the workflow status response.\n\nPoll this endpoint until the workflow reaches a terminal state or a\nstate that requires user attention.\n\nUse increasing backoff between polls. When the workflow remains blocked\non a third party, use a longer polling interval and do not poll indefinitely.",
+    description: "Returns the current status of a domain update workflow.\n\nUse this endpoint to poll for completion when the PATCH response\nreturned `202 Accepted`. The URL is provided in the `links.self`\nfield of the workflow status response.\n\nPoll this endpoint until the workflow reaches a terminal state or a\nstate that requires user attention.\n\nUse increasing backoff between polls. When the workflow remains blocked\non a third party, use a longer polling interval and do not poll indefinitely.\n\nGET /accounts/{account_id}/registrar/registrations/{domain_name}/update-status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api_domain_name",
-          "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "registrar-api_domain_name": registrar_api_domain_name,
-        "registrar-api_identifier": registrar_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_workflow-status-response-single",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     annotations: {
@@ -462,13 +503,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     request: (args) => ({
@@ -478,59 +519,71 @@ export const tools: readonly Tool[] = [
   {
     name: "registrar_registrations_list",
     title: "List Registrations",
-    description: "Returns a paginated list of domain registrations owned by the account.\n\nThis endpoint uses cursor-based pagination. Results are ordered by registration\ndate by default. To fetch the next page, pass the `cursor` value from the\n`result_info` object in the response as the `cursor` query parameter in\nyour next request. An empty `cursor` string indicates there are no more\npages.",
+    description: "Returns a paginated list of domain registrations owned by the account.\n\nThis endpoint uses cursor-based pagination. Results are ordered by registration\ndate by default. To fetch the next page, pass the `cursor` value from the\n`result_info` object in the response as the `cursor` query parameter in\nyour next request. An empty `cursor` string indicates there are no more\npages.\n\nGET /accounts/{account_id}/registrar/registrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID."
-        },
-        "cursor": {
-          "description": "Opaque token from a previous response's `result_info.cursor`.\nPass this value to fetch the next page of results. Omit (or\npass an empty string) for the first page.\n",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction for results. Defaults to ascending order.\n",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items to return per page.",
-          "type": "integer"
-        },
-        "sort_by": {
-          "default": "registry_created_at",
-          "description": "Column to sort results by. Defaults to registration date (`registry_created_at`) when omitted.",
-          "enum": [
-            "registry_created_at",
-            "registry_expires_at",
-            "name"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token from a previous response's `result_info.cursor`.\nPass this value to fetch the next page of results. Omit (or\npass an empty string) for the first page.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction for results. Defaults to ascending order.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items to return per page.",
+              "type": "integer"
+            },
+            "sort_by": {
+              "default": "registry_created_at",
+              "description": "Column to sort results by. Defaults to registration date (`registry_created_at`) when omitted.",
+              "enum": [
+                "registry_created_at",
+                "registry_expires_at",
+                "name"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "registrar-api_identifier": registrar_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_registration-response-collection",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_cursor_result_info": registrar_api_cursor_result_info_output,
-        "registrar-api_domain_name": registrar_api_domain_name_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_registration": registrar_api_registration_output,
-        "registrar-api_registration-response-collection": registrar_api_registration_response_collection_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_cursor_result_info": registrar$$api_cursor_result_info,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_registration": registrar$$api_registration,
+        "registrar-api_registration-response-collection": registrar$$api_registration$$response$$collection,
       },
     },
     annotations: {
@@ -552,71 +605,86 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_cursor_result_info": registrar_api_cursor_result_info_output,
-        "registrar-api_domain_name": registrar_api_domain_name_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_registration": registrar_api_registration_output,
-        "registrar-api_registration-response-collection": registrar_api_registration_response_collection_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_cursor_result_info": registrar$$api_cursor_result_info,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_registration": registrar$$api_registration,
+        "registrar-api_registration-response-collection": registrar$$api_registration$$response$$collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar/registrations`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
-        ["sort_by", args["sort_by"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
       ],
     }),
   },
   {
     name: "registrar_registrations_search",
     title: "Search for available domains",
-    description: "Searches for domain name suggestions based on a keyword, phrase, or partial domain name.\nReturns a list of potentially available domains with pricing information.\n\n**Important:** Results are non-authoritative and based on cached data. Always use the\n`/domain-check` endpoint to verify real-time availability before attempting registration.\n\nSuggestions are scoped to extensions supported for programmatic registration\nvia this API (`POST /registrations`). Domains on unsupported extensions will\nnot appear in results, even if they are available at the registry level.\n\n### Use cases\n- Brand name discovery (e.g., \"acme corp\" → acmecorp.com, acmecorp.dev)\n- Keyword-based suggestions (e.g., \"coffee shop\" → coffeeshop.com, mycoffeeshop.net)\n- Alternative extension discovery (e.g., \"example.com\" → example.com, example.app, example.xyz)\n\n### Workflow\n1. Call this endpoint with a keyword or domain name.\n2. Present suggestions to the user.\n3. Call `/domain-check` with the user's chosen domains to confirm real-time availability and pricing.\n4. Proceed to `POST /registrations` only for supported non-premium domains\n   where the Check response returns `registrable: true`.\n\n**Note:** Searching with just a domain extension (e.g., \"com\" or \".app\") is not supported. Provide a keyword or domain name.",
+    description: "Searches for domain name suggestions based on a keyword, phrase, or partial domain name.\nReturns a list of potentially available domains with pricing information.\n\n**Important:** Results are non-authoritative and based on cached data. Always use the\n`/domain-check` endpoint to verify real-time availability before attempting registration.\n\nSuggestions are scoped to extensions supported for programmatic registration\nvia this API (`POST /registrations`). Domains on unsupported extensions will\nnot appear in results, even if they are available at the registry level.\n\n### Use cases\n- Brand name discovery (e.g., \"acme corp\" → acmecorp.com, acmecorp.dev)\n- Keyword-based suggestions (e.g., \"coffee shop\" → coffeeshop.com, mycoffeeshop.net)\n- Alternative extension discovery (e.g., \"example.com\" → example.com, example.app, example.xyz)\n\n### Workflow\n1. Call this endpoint with a keyword or domain name.\n2. Present suggestions to the user.\n3. Call `/domain-check` with the user's chosen domains to confirm real-time availability and pricing.\n4. Proceed to `POST /registrations` only for supported non-premium domains\n   where the Check response returns `registrable: true`.\n\n**Note:** Searching with just a domain extension (e.g., \"com\" or \".app\") is not supported. Provide a keyword or domain name.\n\nGET /accounts/{account_id}/registrar/domain-search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
-        "extensions": {
-          "description": "Limits results to specific domain extensions from the supported set. If not specified,\nreturns results across all supported extensions. Extensions not in the supported\nset are silently ignored.\n",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            }
           },
-          "maxItems": 20,
-          "type": "array"
-        },
-        "limit": {
-          "default": 20,
-          "description": "Maximum number of domain suggestions to return. Defaults to 20 if not specified.\n",
-          "type": "integer"
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
         "query": {
-          "description": "The search term to find domain suggestions. Accepts keywords, phrases, or full domain names.\n- Phrases: \"coffee shop\" returns coffeeshop.com, mycoffeeshop.net, etc.\n- Domain names: \"example.com\" returns example.com and variations across extensions\n",
-          "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "extensions": {
+              "description": "Limits results to specific domain extensions from the supported set. If not specified,\nreturns results across all supported extensions. Extensions not in the supported\nset are silently ignored.",
+              "items": {
+                "type": "string"
+              },
+              "maxItems": 20,
+              "type": "array"
+            },
+            "limit": {
+              "default": 20,
+              "description": "Maximum number of domain suggestions to return. Defaults to 20 if not specified.",
+              "type": "integer"
+            },
+            "q": {
+              "description": "The search term to find domain suggestions. Accepts keywords, phrases, or full domain names.\n- Phrases: \"coffee shop\" returns coffeeshop.com, mycoffeeshop.net, etc.\n- Domain names: \"example.com\" returns example.com and variations across extensions",
+              "type": "string"
+            }
+          },
+          "required": [
+            "q"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "query"
       ],
-      $defs: {
-        "registrar-api_identifier": registrar_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_domain_search_response",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_domain_search_response": registrar_api_domain_search_response_output,
-        "registrar-api_domain_search_result": registrar_api_domain_search_result_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_pricing_base": registrar_api_pricing_base_output,
-        "registrar-api_pricing_registration": registrar_api_pricing_registration_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_domain_search_response": registrar$$api_domain_search_response,
+        "registrar-api_domain_search_result": registrar$$api_domain_search_result,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_pricing_base": registrar$$api_pricing_base,
+        "registrar-api_pricing_registration": registrar$$api_pricing_registration,
       },
     },
     annotations: {
@@ -638,59 +706,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_domain_search_response": registrar_api_domain_search_response_output,
-        "registrar-api_domain_search_result": registrar_api_domain_search_result_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_pricing_base": registrar_api_pricing_base_output,
-        "registrar-api_pricing_registration": registrar_api_pricing_registration_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_domain_search_response": registrar$$api_domain_search_response,
+        "registrar-api_domain_search_result": registrar$$api_domain_search_result,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_pricing_base": registrar$$api_pricing_base,
+        "registrar-api_pricing_registration": registrar$$api_pricing_registration,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar/domain-search`,
       query: [
-        ["q", args["query"], true],
-        ["extensions", args["extensions"], false],
-        ["limit", args["limit"], true],
+        ["q", param(args, "query", "q"), true],
+        ["extensions", param(args, "query", "extensions"), false],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
-    name: "registrar_registrations_transfer_check",
+    name: "registrar_registrations_transferCheck",
     title: "Check domain transfer eligibility",
-    description: "Performs real-time, authoritative eligibility checks directly against needed requirements.\nUse this endpoint to verify a domain is available before\nattempting a transfer via `POST /registrations/:domain_name/transfer-in`.\n\n**Note:** This endpoint uses POST to accept a list of domains in the request\nbody. It is a read-only operation — it does not create, modify, or reserve\nany domains.\n\n### Behavior\n- Maximum 10 domains per request\n- Pricing is only returned for domains where `transferable: true`\n- Results are not cached; each request queries the registry & other needed upstreams\n\n## Extension Support\n\nAll `.uk` extensions (`.uk`, `.co.uk`, etc) do not support auth codes. As such,\nCloudflare will ignore the `auth_code` section of this request for `.uk` domains.\n\nThis means that a `.uk` domain depends on public data to obtain domain information,\nso it might be a few minutes outdated.\n\n### Workflow\n1. Call this endpoint with domains the user wants to transfer.\n2. For each domain where `transferable: true`, present pricing to the user.\n3. For each domain where `transferable: false`, present reasons to the user\n4. Proceed to `POST /registrations/:domain_name/transfer-in` only for the `transferable: true` domains.",
+    description: "Performs real-time, authoritative eligibility checks directly against needed requirements.\nUse this endpoint to verify a domain is available before\nattempting a transfer via `POST /registrations/:domain_name/transfer-in`.\n\n**Note:** This endpoint uses POST to accept a list of domains in the request\nbody. It is a read-only operation — it does not create, modify, or reserve\nany domains.\n\n### Behavior\n- Maximum 10 domains per request\n- Pricing is only returned for domains where `transferable: true`\n- Results are not cached; each request queries the registry & other needed upstreams\n\n## Extension Support\n\nAll `.uk` extensions (`.uk`, `.co.uk`, etc) do not support auth codes. As such,\nCloudflare will ignore the `auth_code` section of this request for `.uk` domains.\n\nThis means that a `.uk` domain depends on public data to obtain domain information,\nso it might be a few minutes outdated.\n\n### Workflow\n1. Call this endpoint with domains the user wants to transfer.\n2. For each domain where `transferable: true`, present pricing to the user.\n3. For each domain where `transferable: false`, present reasons to the user\n4. Proceed to `POST /registrations/:domain_name/transfer-in` only for the `transferable: true` domains.\n\nPOST /accounts/{account_id}/registrar/domain-transfer-check",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
         "body": {
           "$ref": "#/$defs/registrar-api_domain_transfer_check_request",
           "description": "List of transferable domain objects to check."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "registrar-api_domain_transfer_check_request": registrar_api_domain_transfer_check_request,
-        "registrar-api_identifier": registrar_api_identifier,
+        "registrar-api_domain_transfer_check_request": registrar$$api_domain_transfer_check_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_domain_transfer_check_response",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_domain_transfer_check_reason": registrar_api_domain_transfer_check_reason_output,
-        "registrar-api_domain_transfer_check_response": registrar_api_domain_transfer_check_response_output,
-        "registrar-api_domain_transfer_check_result": registrar_api_domain_transfer_check_result_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_pricing_base": registrar_api_pricing_base_output,
-        "registrar-api_pricing_transfer": registrar_api_pricing_transfer_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_domain_transfer_check_response": registrar$$api_domain_transfer_check_response,
+        "registrar-api_domain_transfer_check_result": registrar$$api_domain_transfer_check_result,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_pricing_base": registrar$$api_pricing_base,
+        "registrar-api_pricing_transfer": registrar$$api_pricing_transfer,
       },
     },
     annotations: {
@@ -715,14 +791,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_domain_transfer_check_reason": registrar_api_domain_transfer_check_reason_output,
-        "registrar-api_domain_transfer_check_response": registrar_api_domain_transfer_check_response_output,
-        "registrar-api_domain_transfer_check_result": registrar_api_domain_transfer_check_result_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_pricing_base": registrar_api_pricing_base_output,
-        "registrar-api_pricing_transfer": registrar_api_pricing_transfer_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_domain_transfer_check_response": registrar$$api_domain_transfer_check_response,
+        "registrar-api_domain_transfer_check_result": registrar$$api_domain_transfer_check_result,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_pricing_base": registrar$$api_pricing_base,
+        "registrar-api_pricing_transfer": registrar$$api_pricing_transfer,
       },
     },
     request: (args) => ({
@@ -731,52 +806,66 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_registrations_transfer_in",
+    name: "registrar_registrations_transferIn",
     title: "Initiate Transfer",
-    description: "Starts a domain transfer-in workflow. This is typically a billable\noperation — successful transfers charge the account's default payment\nmethod, except for extensions with zero transfer pricing (e.g. UK\nextensions). All successful domain transfers are non-refundable.\n\n### How transfers work\nDomain transfers move a domain from another registrar to Cloudflare.\nTransfers typically take 1-10 days due to ICANN-mandated approval windows.\n\n### Prerequisites\n- The domain must already have a zone in the Cloudflare account (added\n  through the dashboard or zone API).\n- The zone must have DNSSec disabled.\n- For billable transfers (i.e. extensions with non-zero transfer pricing), the\n  account must have a billing profile with a valid default payment method.\n  Set this up at `https://dash.cloudflare.com/{account_id}/billing/payment-info`.\n- The domain must be unlocked at the current registrar.\n- An authorization/EPP code from the current registrar is required,\n  except for UK extensions — see Auth code below.\n\n### Auth code\nAn authorization code (also called EPP code, transfer key, or auth-info code)\nis required for most extensions, with the exception of UK extensions. Obtain\nthis from your current registrar's control panel.\n\nThe auth code in the request body must be base64-encoded per RFC 4648 §4 (standard\nalphabet, no line breaks).\n\n### Response behavior\nSuccessful transfer initiation returns `202 Accepted`. Validation or\ninitiation failures return the documented `4XX` responses. Poll\n`GET /accounts/{account_id}/registrar/registrations/{domain_name}/transfer-in-status` to track progress.\n\n### Premium domains\nPremium domain transfers are not currently supported by this API. Please use\nthe [dashboard](https://dash.cloudflare.com/) for now.\n\n### Billing\nThe account's default payment method is charged upon successful transfer\ncompletion, unless the extension has zero transfer pricing (e.g. UK\nextensions). The transfer adds time to the domain's existing expiration\ndate (typically 1 year).",
+    description: "Starts a domain transfer-in workflow. This is typically a billable\noperation — successful transfers charge the account's default payment\nmethod, except for extensions with zero transfer pricing (e.g. UK\nextensions). All successful domain transfers are non-refundable.\n\n### How transfers work\nDomain transfers move a domain from another registrar to Cloudflare.\nTransfers typically take 1-10 days due to ICANN-mandated approval windows.\n\n### Prerequisites\n- The domain must already have a zone in the Cloudflare account (added\n  through the dashboard or zone API).\n- The zone must have DNSSec disabled.\n- For billable transfers (i.e. extensions with non-zero transfer pricing), the\n  account must have a billing profile with a valid default payment method.\n  Set this up at `https://dash.cloudflare.com/{account_id}/billing/payment-info`.\n- The domain must be unlocked at the current registrar.\n- An authorization/EPP code from the current registrar is required,\n  except for UK extensions — see Auth code below.\n\n### Auth code\nAn authorization code (also called EPP code, transfer key, or auth-info code)\nis required for most extensions, with the exception of UK extensions. Obtain\nthis from your current registrar's control panel.\n\nThe auth code in the request body must be base64-encoded per RFC 4648 §4 (standard\nalphabet, no line breaks).\n\n### Response behavior\nSuccessful transfer initiation returns `202 Accepted`. Validation or\ninitiation failures return the documented `4XX` responses. Poll\n`GET /accounts/{account_id}/registrar/registrations/{domain_name}/transfer-in-status` to track progress.\n\n### Premium domains\nPremium domain transfers are not currently supported by this API. Please use\nthe [dashboard](https://dash.cloudflare.com/) for now.\n\n### Billing\nThe account's default payment method is charged upon successful transfer\ncompletion, unless the extension has zero transfer pricing (e.g. UK\nextensions). The transfer adds time to the domain's existing expiration\ndate (typically 1 year).\n\nPOST /accounts/{account_id}/registrar/registrations/{domain_name}/transfer-in",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
         "body": {
           "$ref": "#/$defs/registrar-api_transfer_in_create_request"
         },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api_domain_name",
-          "description": "Domain name to transfer."
-        },
-        "prefer": {
-          "description": "Set to `respond-async` to indicate a preference for asynchronous\nprocessing (RFC 7240).\n",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Prefer": {
+              "description": "Set to `respond-async` to indicate a preference for asynchronous\nprocessing (RFC 7240).",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Domain name to transfer.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "registrar-api_domain_name": registrar_api_domain_name,
-        "registrar-api_identifier": registrar_api_identifier,
-        "registrar-api_registration_contact": registrar_api_registration_contact,
-        "registrar-api_registration_contact_address": registrar_api_registration_contact_address,
-        "registrar-api_registration_contact_postal_info": registrar_api_registration_contact_postal_info,
-        "registrar-api_registration_contacts": registrar_api_registration_contacts,
-        "registrar-api_transfer_in_create_request": registrar_api_transfer_in_create_request,
+        "registrar-api_registration_contact": registrar$$api_registration_contact,
+        "registrar-api_registration_contact_address": registrar$$api_registration_contact_address,
+        "registrar-api_registration_contact_postal_info": registrar$$api_registration_contact_postal_info,
+        "registrar-api_registration_contacts": registrar$$api_registration_contacts,
+        "registrar-api_transfer_in_create_request": registrar$$api_transfer_in_create_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_workflow-status-response-single",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     annotations: {
@@ -798,19 +887,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar/registrations/${pathParam(args, "domain_name")}/transfer-in`,
       headers: [
-        ["Prefer", args["prefer"]],
+        ["Prefer", param(args, "headers", "Prefer")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -818,49 +907,63 @@ export const tools: readonly Tool[] = [
   {
     name: "registrar_registrations_update",
     title: "Update Registration",
-    description: "Updates an existing domain registration.\n\nBy default, the server holds the connection for a bounded, server-defined\namount of time while the update completes. Most updates finish within this\nwindow and return `200 OK` with a completed workflow status.\n\nIf the update is still processing after this synchronous wait window, the\nserver returns `202 Accepted`. Poll the URL in `links.self` to track progress.\n\nTo skip the wait and receive an immediate `202`, send `Prefer: respond-async`.\n\nThis endpoint currently supports updating `auto_renew` only.",
+    description: "Updates an existing domain registration.\n\nBy default, the server holds the connection for a bounded, server-defined\namount of time while the update completes. Most updates finish within this\nwindow and return `200 OK` with a completed workflow status.\n\nIf the update is still processing after this synchronous wait window, the\nserver returns `202 Accepted`. Poll the URL in `links.self` to track progress.\n\nTo skip the wait and receive an immediate `202`, send `Prefer: respond-async`.\n\nThis endpoint currently supports updating `auto_renew` only.\n\nPATCH /accounts/{account_id}/registrar/registrations/{domain_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api_identifier",
-          "description": "Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/registrar-api_registration_update_request"
         },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api_domain_name",
-          "description": "Domain name to update."
-        },
-        "prefer": {
-          "description": "Set to `respond-async` to receive an immediate `202 Accepted` without\nwaiting for the operation to complete (RFC 7240).\n",
-          "enum": [
-            "respond-async"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Prefer": {
+              "description": "Set to `respond-async` to receive an immediate `202 Accepted` without\nwaiting for the operation to complete (RFC 7240).",
+              "enum": [
+                "respond-async"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Domain name to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "registrar-api_domain_name": registrar_api_domain_name,
-        "registrar-api_identifier": registrar_api_identifier,
-        "registrar-api_registration_update_request": registrar_api_registration_update_request,
+        "registrar-api_registration_update_request": registrar$$api_registration_update_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api_workflow-status-response-single",
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     annotations: {
@@ -885,19 +988,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api_api-response-common": registrar_api_api_response_common_output,
-        "registrar-api_api-response-common-failure": registrar_api_api_response_common_failure_output,
-        "registrar-api_messages": registrar_api_messages_output,
-        "registrar-api_workflow-status-response-single": registrar_api_workflow_status_response_single_output,
-        "registrar-api_workflow_error": registrar_api_workflow_error_output,
-        "registrar-api_workflow_links": registrar_api_workflow_links_output,
-        "registrar-api_workflow_status": registrar_api_workflow_status_output,
+        "registrar-api_api-response-common": registrar$$api_api$$response$$common,
+        "registrar-api_api-response-common-failure": registrar$$api_api$$response$$common$$failure,
+        "registrar-api_messages": registrar$$api_messages,
+        "registrar-api_workflow-status-response-single": registrar$$api_workflow$$status$$response$$single,
+        "registrar-api_workflow_error": registrar$$api_workflow_error,
+        "registrar-api_workflow_links": registrar$$api_workflow_links,
+        "registrar-api_workflow_status": registrar$$api_workflow_status,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar/registrations/${pathParam(args, "domain_name")}`,
       headers: [
-        ["Prefer", args["prefer"]],
+        ["Prefer", param(args, "headers", "Prefer")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/registrar/schemas.ts b/src/generated/forge-mcp/registrar/schemas.ts
deleted file mode 100644
index 1ec520634..000000000
--- a/src/generated/forge-mcp/registrar/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `registrar-api_identifier`.
- */
-export const registrar_api_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/registrarSandbox/extensions/outputs.ts b/src/generated/forge-mcp/registrarSandbox/extensions/outputs.ts
index ebe0c2da5..fd9b1a28c 100644
--- a/src/generated/forge-mcp/registrarSandbox/extensions/outputs.ts
+++ b/src/generated/forge-mcp/registrarSandbox/extensions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `registrar-api-sandbox_extension-item` in responses.
  */
-export const registrar_api_sandbox_extension_item_output: JsonSchema = {
+export const registrar$$api$$sandbox_extension$$item: JsonSchema = {
   "properties": {
     "metadata": {
       "properties": {
@@ -42,7 +42,7 @@ export const registrar_api_sandbox_extension_item_output: JsonSchema = {
  * The schema of `registrar-api-sandbox_extension-response-collection` in
  * responses.
  */
-export const registrar_api_sandbox_extension_response_collection_output: JsonSchema = {
+export const registrar$$api$$sandbox_extension$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api-sandbox_api-response-common"
@@ -78,7 +78,7 @@ export const registrar_api_sandbox_extension_response_collection_output: JsonSch
 /**
  * The schema of `registrar-api-sandbox_extension-response-single` in responses.
  */
-export const registrar_api_sandbox_extension_response_single_output: JsonSchema = {
+export const registrar$$api$$sandbox_extension$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api-sandbox_api-response-common"
diff --git a/src/generated/forge-mcp/registrarSandbox/extensions/tools.ts b/src/generated/forge-mcp/registrarSandbox/extensions/tools.ts
index 991d42aed..8de992e0b 100644
--- a/src/generated/forge-mcp/registrarSandbox/extensions/tools.ts
+++ b/src/generated/forge-mcp/registrarSandbox/extensions/tools.ts
@@ -1,54 +1,60 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  registrar_api_sandbox_api_response_common_failure_output,
-  registrar_api_sandbox_api_response_common_output,
-  registrar_api_sandbox_messages_output,
+  registrar$$api$$sandbox_api$$response$$common,
+  registrar$$api$$sandbox_api$$response$$common$$failure,
+  registrar$$api$$sandbox_messages,
 } from "../outputs.js";
-import { registrar_api_sandbox_identifier } from "../schemas.js";
 import {
-  registrar_api_sandbox_extension_item_output,
-  registrar_api_sandbox_extension_response_collection_output,
-  registrar_api_sandbox_extension_response_single_output,
+  registrar$$api$$sandbox_extension$$item,
+  registrar$$api$$sandbox_extension$$response$$collection,
+  registrar$$api$$sandbox_extension$$response$$single,
 } from "./outputs.js";
 
 /**
- * The tools of `registrar_sandbox.extensions`.
+ * The tools of `registrarSandbox.extensions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "registrar_sandbox_extensions_get",
+    name: "registrarSandbox_extensions_get",
     title: "Get extension",
-    description: "Returns metadata and JSON Schema documents describing the expected input\nstructure for registration and transfer operations on a specific\nextension (TLD).\n\nSupports HTTP conditional GET via `ETag`. Include the `ETag` value\nfrom a previous response in an `If-None-Match` header to receive a\n`304 Not Modified` when the data has not changed.",
+    description: "Returns metadata and JSON Schema documents describing the expected input\nstructure for registration and transfer operations on a specific\nextension (TLD).\n\nSupports HTTP conditional GET via `ETag`. Include the `ETag` value\nfrom a previous response in an `If-None-Match` header to receive a\n`304 Not Modified` when the data has not changed.\n\nGET /accounts/{account_id}/registrar-sandbox/extensions/{extension}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Identifier."
-        },
-        "extension": {
-          "description": "The extension name (e.g., `com`, `co.uk`).",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "extension": {
+              "description": "The extension name (e.g., `com`, `co.uk`).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "extension"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "extension"
+        "path"
       ],
-      $defs: {
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_extension-response-single",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_extension-item": registrar_api_sandbox_extension_item_output,
-        "registrar-api-sandbox_extension-response-single": registrar_api_sandbox_extension_response_single_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_extension-item": registrar$$api$$sandbox_extension$$item,
+        "registrar-api-sandbox_extension-response-single": registrar$$api$$sandbox_extension$$response$$single,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
       },
     },
     annotations: {
@@ -71,11 +77,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_extension-item": registrar_api_sandbox_extension_item_output,
-        "registrar-api-sandbox_extension-response-single": registrar_api_sandbox_extension_response_single_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_extension-item": registrar$$api$$sandbox_extension$$item,
+        "registrar-api-sandbox_extension-response-single": registrar$$api$$sandbox_extension$$response$$single,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
       },
     },
     request: (args) => ({
@@ -83,63 +89,76 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_sandbox_extensions_list",
+    name: "registrarSandbox_extensions_list",
     title: "List extensions",
-    description: "Returns metadata and JSON Schema documents describing the expected input\nstructure for registration and transfer operations on each supported\nextension (TLD).\n\nThis endpoint uses cursor-based pagination. Results are ordered by\nextension name by default. To fetch the next page, pass the `cursor`\nvalue from the `result_info` object in the response as the `cursor`\nquery parameter in your next request. An empty `cursor` string\nindicates there are no more pages.\n\nSupports HTTP conditional GET via `ETag`. Include the `ETag` value\nfrom a previous response in an `If-None-Match` header to receive a\n`304 Not Modified` when the data has not changed.",
+    description: "Returns metadata and JSON Schema documents describing the expected input\nstructure for registration and transfer operations on each supported\nextension (TLD).\n\nThis endpoint uses cursor-based pagination. Results are ordered by\nextension name by default. To fetch the next page, pass the `cursor`\nvalue from the `result_info` object in the response as the `cursor`\nquery parameter in your next request. An empty `cursor` string\nindicates there are no more pages.\n\nSupports HTTP conditional GET via `ETag`. Include the `ETag` value\nfrom a previous response in an `If-None-Match` header to receive a\n`304 Not Modified` when the data has not changed.\n\nGET /accounts/{account_id}/registrar-sandbox/extensions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Identifier."
-        },
-        "cursor": {
-          "description": "Opaque token from a previous response's `result_info.cursor`.\nPass this value to fetch the next page of results. Omit (or\npass an empty string) for the first page.\n",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction for results. Defaults to ascending order.\n",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Filter extensions by exact name match.\nFor example, `name=com` returns only the `com` extension.\n",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items to return per page.",
-          "type": "integer"
-        },
-        "sort_by": {
-          "default": "name",
-          "description": "Column to sort results by. Defaults to `name` when omitted.\n",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token from a previous response's `result_info.cursor`.\nPass this value to fetch the next page of results. Omit (or\npass an empty string) for the first page.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction for results. Defaults to ascending order.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter extensions by exact name match.\nFor example, `name=com` returns only the `com` extension.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items to return per page.",
+              "type": "integer"
+            },
+            "sort_by": {
+              "default": "name",
+              "description": "Column to sort results by. Defaults to `name` when omitted.",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_extension-response-collection",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_extension-item": registrar_api_sandbox_extension_item_output,
-        "registrar-api-sandbox_extension-response-collection": registrar_api_sandbox_extension_response_collection_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_extension-item": registrar$$api$$sandbox_extension$$item,
+        "registrar-api-sandbox_extension-response-collection": registrar$$api$$sandbox_extension$$response$$collection,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
       },
     },
     annotations: {
@@ -162,21 +181,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_extension-item": registrar_api_sandbox_extension_item_output,
-        "registrar-api-sandbox_extension-response-collection": registrar_api_sandbox_extension_response_collection_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_extension-item": registrar$$api$$sandbox_extension$$item,
+        "registrar-api-sandbox_extension-response-collection": registrar$$api$$sandbox_extension$$response$$collection,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar-sandbox/extensions`,
       query: [
-        ["name", args["name"], true],
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
-        ["sort_by", args["sort_by"], true],
+        ["name", param(args, "query", "name"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/registrarSandbox/outputs.ts b/src/generated/forge-mcp/registrarSandbox/outputs.ts
index 44fe0d49c..473fe86ab 100644
--- a/src/generated/forge-mcp/registrarSandbox/outputs.ts
+++ b/src/generated/forge-mcp/registrarSandbox/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `registrar-api-sandbox_api-response-common` in responses.
  */
-export const registrar_api_sandbox_api_response_common_output: JsonSchema = {
+export const registrar$$api$$sandbox_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/registrar-api-sandbox_messages"
@@ -50,7 +50,7 @@ export const registrar_api_sandbox_api_response_common_output: JsonSchema = {
  * The schema of `registrar-api-sandbox_api-response-common-failure` in
  * responses.
  */
-export const registrar_api_sandbox_api_response_common_failure_output: JsonSchema = {
+export const registrar$$api$$sandbox_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/registrar-api-sandbox_messages"
@@ -80,7 +80,7 @@ export const registrar_api_sandbox_api_response_common_failure_output: JsonSchem
 /**
  * The schema of `registrar-api-sandbox_messages` in responses.
  */
-export const registrar_api_sandbox_messages_output: JsonSchema = {
+export const registrar$$api$$sandbox_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/registrarSandbox/registrations/outputs.ts b/src/generated/forge-mcp/registrarSandbox/registrations/outputs.ts
index 967dc061a..036dcdb04 100644
--- a/src/generated/forge-mcp/registrarSandbox/registrations/outputs.ts
+++ b/src/generated/forge-mcp/registrarSandbox/registrations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `registrar-api-sandbox_cursor_result_info` in responses.
  */
-export const registrar_api_sandbox_cursor_result_info_output: JsonSchema = {
+export const registrar$$api$$sandbox_cursor_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -29,7 +29,7 @@ export const registrar_api_sandbox_cursor_result_info_output: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_domain_check_response` in responses.
  */
-export const registrar_api_sandbox_domain_check_response_output: JsonSchema = {
+export const registrar$$api$$sandbox_domain_check_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api-sandbox_api-response-common"
@@ -62,7 +62,7 @@ export const registrar_api_sandbox_domain_check_response_output: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_domain_check_result` in responses.
  */
-export const registrar_api_sandbox_domain_check_result_output: JsonSchema = {
+export const registrar$$api$$sandbox_domain_check_result: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -98,17 +98,10 @@ export const registrar_api_sandbox_domain_check_result_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `registrar-api-sandbox_domain_name` in responses.
- */
-export const registrar_api_sandbox_domain_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `registrar-api-sandbox_domain_search_response` in responses.
  */
-export const registrar_api_sandbox_domain_search_response_output: JsonSchema = {
+export const registrar$$api$$sandbox_domain_search_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api-sandbox_api-response-common"
@@ -141,7 +134,7 @@ export const registrar_api_sandbox_domain_search_response_output: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_domain_search_result` in responses.
  */
-export const registrar_api_sandbox_domain_search_result_output: JsonSchema = {
+export const registrar$$api$$sandbox_domain_search_result: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -180,7 +173,7 @@ export const registrar_api_sandbox_domain_search_result_output: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_pricing_base` in responses.
  */
-export const registrar_api_sandbox_pricing_base_output: JsonSchema = {
+export const registrar$$api$$sandbox_pricing_base: JsonSchema = {
   "properties": {
     "currency": {
       "type": "string"
@@ -199,7 +192,7 @@ export const registrar_api_sandbox_pricing_base_output: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_pricing_registration` in responses.
  */
-export const registrar_api_sandbox_pricing_registration_output: JsonSchema = {
+export const registrar$$api$$sandbox_pricing_registration: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api-sandbox_pricing_base"
@@ -221,7 +214,7 @@ export const registrar_api_sandbox_pricing_registration_output: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_registration` in responses.
  */
-export const registrar_api_sandbox_registration_output: JsonSchema = {
+export const registrar$$api$$sandbox_registration: JsonSchema = {
   "properties": {
     "auto_renew": {
       "type": "boolean"
@@ -231,7 +224,7 @@ export const registrar_api_sandbox_registration_output: JsonSchema = {
       "type": "string"
     },
     "domain_name": {
-      "$ref": "#/$defs/registrar-api-sandbox_domain_name"
+      "type": "string"
     },
     "expires_at": {
       "oneOf": [
@@ -283,7 +276,7 @@ export const registrar_api_sandbox_registration_output: JsonSchema = {
  * The schema of `registrar-api-sandbox_registration-response-collection` in
  * responses.
  */
-export const registrar_api_sandbox_registration_response_collection_output: JsonSchema = {
+export const registrar$$api$$sandbox_registration$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api-sandbox_api-response-common"
@@ -313,7 +306,7 @@ export const registrar_api_sandbox_registration_response_collection_output: Json
  * The schema of `registrar-api-sandbox_registration-response-single` in
  * responses.
  */
-export const registrar_api_sandbox_registration_response_single_output: JsonSchema = {
+export const registrar$$api$$sandbox_registration$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api-sandbox_api-response-common"
@@ -333,7 +326,7 @@ export const registrar_api_sandbox_registration_response_single_output: JsonSche
  * The schema of `registrar-api-sandbox_workflow-status-response-single` in
  * responses.
  */
-export const registrar_api_sandbox_workflow_status_response_single_output: JsonSchema = {
+export const registrar$$api$$sandbox_workflow$$status$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/registrar-api-sandbox_api-response-common"
@@ -352,7 +345,7 @@ export const registrar_api_sandbox_workflow_status_response_single_output: JsonS
 /**
  * The schema of `registrar-api-sandbox_workflow_error` in responses.
  */
-export const registrar_api_sandbox_workflow_error_output: JsonSchema = {
+export const registrar$$api$$sandbox_workflow_error: JsonSchema = {
   "properties": {
     "code": {
       "type": "string"
@@ -371,7 +364,7 @@ export const registrar_api_sandbox_workflow_error_output: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_workflow_links` in responses.
  */
-export const registrar_api_sandbox_workflow_links_output: JsonSchema = {
+export const registrar$$api$$sandbox_workflow_links: JsonSchema = {
   "properties": {
     "resource": {
       "type": "string"
@@ -389,7 +382,7 @@ export const registrar_api_sandbox_workflow_links_output: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_workflow_status` in responses.
  */
-export const registrar_api_sandbox_workflow_status_output: JsonSchema = {
+export const registrar$$api$$sandbox_workflow_status: JsonSchema = {
   "properties": {
     "completed": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/registrarSandbox/registrations/schemas.ts b/src/generated/forge-mcp/registrarSandbox/registrations/schemas.ts
index fb1f04740..4356f7fd4 100644
--- a/src/generated/forge-mcp/registrarSandbox/registrations/schemas.ts
+++ b/src/generated/forge-mcp/registrarSandbox/registrations/schemas.ts
@@ -6,11 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `registrar-api-sandbox_domain_check_request`.
  */
-export const registrar_api_sandbox_domain_check_request: JsonSchema = {
+export const registrar$$api$$sandbox_domain_check_request: JsonSchema = {
   "description": "Request body for checking domain availability.",
   "properties": {
     "domains": {
-      "description": "List of fully qualified domain names (FQDNs) to check for availability. Each domain must include the extension.\n- Minimum: 1 domain.\n- Maximum: 20 domains per request.\n- The response returns domains on unsupported extensions with `registrable: false` and a `reason` field.\n- The response may omit malformed domain names (e.g., names missing an extension).\n",
+      "description": "List of fully qualified domain names (FQDNs) to check for availability. Each domain must include the extension.\n- Minimum: 1 domain.\n- Maximum: 20 domains per request.\n- The response returns domains on unsupported extensions with `registrable: false` and a `reason` field.\n- The response may omit malformed domain names (e.g., names missing an extension).",
       "items": {
         "type": "string"
       },
@@ -25,26 +25,18 @@ export const registrar_api_sandbox_domain_check_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `registrar-api-sandbox_domain_name`.
- */
-export const registrar_api_sandbox_domain_name: JsonSchema = {
-  "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n",
-  "type": "string"
-};
-
 /**
  * The schema of `registrar-api-sandbox_registration_contact`.
  */
-export const registrar_api_sandbox_registration_contact: JsonSchema = {
-  "description": "Contact data for the domain registration. This information\nis submitted to the domain registry and, depending on extension and\nprivacy settings, may appear in public WHOIS records.\n",
+export const registrar$$api$$sandbox_registration_contact: JsonSchema = {
+  "description": "Contact data for the domain registration. This information\nis submitted to the domain registry and, depending on extension and\nprivacy settings, may appear in public WHOIS records.",
   "properties": {
     "email": {
-      "description": "Email address for the registrant. Used for domain-related\ncommunications from the registry, including ownership verification\nand renewal notices.\n",
+      "description": "Email address for the registrant. Used for domain-related\ncommunications from the registry, including ownership verification\nand renewal notices.",
       "type": "string"
     },
     "fax": {
-      "description": "Fax number in E.164 format (e.g., `+1.5555555555`). Optional.\nMost registrations do not require a fax number.\n",
+      "description": "Fax number in E.164 format (e.g., `+1.5555555555`). Optional.\nMost registrations do not require a fax number.",
       "type": "string"
     },
     "phone": {
@@ -53,7 +45,7 @@ export const registrar_api_sandbox_registration_contact: JsonSchema = {
     },
     "postal_info": {
       "$ref": "#/$defs/registrar-api-sandbox_registration_contact_postal_info",
-      "description": "Postal/mailing information for the contact. The `name` field is the\ncomplete contact name in one string. Some registries require a complete\npersonal name, including a family or last name where applicable, but this\nAPI does not accept separate first-name and last-name fields for\nregistration contacts.\n"
+      "description": "Postal/mailing information for the contact. The `name` field is the\ncomplete contact name in one string. Some registries require a complete\npersonal name, including a family or last name where applicable, but this\nAPI does not accept separate first-name and last-name fields for\nregistration contacts."
     }
   },
   "required": [
@@ -67,7 +59,7 @@ export const registrar_api_sandbox_registration_contact: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_registration_contact_address`.
  */
-export const registrar_api_sandbox_registration_contact_address: JsonSchema = {
+export const registrar$$api$$sandbox_registration_contact_address: JsonSchema = {
   "description": "Physical mailing address for the registrant contact.",
   "properties": {
     "city": {
@@ -104,8 +96,8 @@ export const registrar_api_sandbox_registration_contact_address: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_registration_contact_postal_info`.
  */
-export const registrar_api_sandbox_registration_contact_postal_info: JsonSchema = {
-  "description": "Postal/mailing information for the contact. The `name` field is the\ncomplete contact name in one string. Some registries require a complete\npersonal name, including a family or last name where applicable, but this\nAPI does not accept separate first-name and last-name fields for\nregistration contacts.\n",
+export const registrar$$api$$sandbox_registration_contact_postal_info: JsonSchema = {
+  "description": "Postal/mailing information for the contact. The `name` field is the\ncomplete contact name in one string. Some registries require a complete\npersonal name, including a family or last name where applicable, but this\nAPI does not accept separate first-name and last-name fields for\nregistration contacts.",
   "properties": {
     "address": {
       "$ref": "#/$defs/registrar-api-sandbox_registration_contact_address",
@@ -130,24 +122,24 @@ export const registrar_api_sandbox_registration_contact_postal_info: JsonSchema
 /**
  * The schema of `registrar-api-sandbox_registration_contacts`.
  */
-export const registrar_api_sandbox_registration_contacts: JsonSchema = {
-  "description": "Provides contact data for the registration request.\n\nThe per-extension schema from\n`GET /accounts/{account_id}/registrar/extensions/{extension}` defines the\naccepted contact roles. Every currently supported extension requires only\n`contacts.registrant` from API callers. Callers may provide additional roles\nsuch as `technical`, `administrator`, and `billing` when the extension\nschema includes them. When a registry requires an omitted role, Cloudflare\nmay derive that contact from `contacts.registrant`.\n\nWhen the request omits either the entire `contacts` object or\n`contacts.registrant`, the system uses the account's default address book\nentry as the registrant contact. The account owner must configure this\ndefault at `https://dash.cloudflare.com/{account_id}/domains/registrations`,\nwhere they can create or update the address book entry and accept the\nrequired agreement. Dashboard settings currently provide the only way to\nmanage address book entries.\n\nWithout either a default address book entry or a registrant contact, the\nregistration request fails validation.\n",
+export const registrar$$api$$sandbox_registration_contacts: JsonSchema = {
+  "description": "Provides contact data for the registration request.\n\nThe per-extension schema from\n`GET /accounts/{account_id}/registrar/extensions/{extension}` defines the\naccepted contact roles. Every currently supported extension requires only\n`contacts.registrant` from API callers. Callers may provide additional roles\nsuch as `technical`, `administrator`, and `billing` when the extension\nschema includes them. When a registry requires an omitted role, Cloudflare\nmay derive that contact from `contacts.registrant`.\n\nWhen the request omits either the entire `contacts` object or\n`contacts.registrant`, the system uses the account's default address book\nentry as the registrant contact. The account owner must configure this\ndefault at `https://dash.cloudflare.com/{account_id}/domains/registrations`,\nwhere they can create or update the address book entry and accept the\nrequired agreement. Dashboard settings currently provide the only way to\nmanage address book entries.\n\nWithout either a default address book entry or a registrant contact, the\nregistration request fails validation.",
   "properties": {
     "administrator": {
       "$ref": "#/$defs/registrar-api-sandbox_registration_contact",
-      "description": "Optional administrator contact. Accepted only when the extension\nschema includes this role. When the registry requires an omitted\ncontact, Cloudflare may derive it from `contacts.registrant`.\n"
+      "description": "Optional administrator contact. Accepted only when the extension\nschema includes this role. When the registry requires an omitted\ncontact, Cloudflare may derive it from `contacts.registrant`."
     },
     "billing": {
       "$ref": "#/$defs/registrar-api-sandbox_registration_contact",
-      "description": "Optional billing contact. Accepted only when the extension schema\nincludes this role. When the registry requires an omitted contact,\nCloudflare may derive it from `contacts.registrant`.\n"
+      "description": "Optional billing contact. Accepted only when the extension schema\nincludes this role. When the registry requires an omitted contact,\nCloudflare may derive it from `contacts.registrant`."
     },
     "registrant": {
       "$ref": "#/$defs/registrar-api-sandbox_registration_contact",
-      "description": "Optional registrant contact. If omitted, the account's default\naddress book entry is used instead.\n"
+      "description": "Optional registrant contact. If omitted, the account's default\naddress book entry is used instead."
     },
     "technical": {
       "$ref": "#/$defs/registrar-api-sandbox_registration_contact",
-      "description": "Optional technical contact. Accepted only when the extension schema\nincludes this role. When the registry requires an omitted contact,\nCloudflare may derive it from `contacts.registrant`.\n"
+      "description": "Optional technical contact. Accepted only when the extension schema\nincludes this role. When the registry requires an omitted contact,\nCloudflare may derive it from `contacts.registrant`."
     }
   },
   "type": "object"
@@ -156,31 +148,31 @@ export const registrar_api_sandbox_registration_contacts: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_registration_create_request`.
  */
-export const registrar_api_sandbox_registration_create_request: JsonSchema = {
+export const registrar$$api$$sandbox_registration_create_request: JsonSchema = {
   "properties": {
     "acknowledgements": {
-      "description": "Provides user acknowledgements for a specific extension or premium\nregistration flow. The extension registration schema from the\nextension discovery endpoint identifies the required keys.\n",
+      "description": "Provides user acknowledgements for a specific extension or premium\nregistration flow. The extension registration schema from the\nextension discovery endpoint identifies the required keys.",
       "type": "object"
     },
     "auto_renew": {
       "default": false,
-      "description": "Enable or disable automatic renewal. Defaults to `false` if omitted.\nSetting this field to `true` is an explicit opt-in authorizing\nCloudflare to charge the account's default payment method up to 30\ndays before domain expiry to renew the domain automatically.\nRenewal pricing may change over time based on registry pricing.\n",
+      "description": "Enable or disable automatic renewal. Defaults to `false` if omitted.\nSetting this field to `true` is an explicit opt-in authorizing\nCloudflare to charge the account's default payment method up to 30\ndays before domain expiry to renew the domain automatically.\nRenewal pricing may change over time based on registry pricing.",
       "type": "boolean"
     },
     "contact_extensions": {
-      "description": "Provides registry-specific contact extension values for the registrant.\n`GET /accounts/{account_id}/registrar/extensions/{extension}` identifies\nthe required keys and allowed values for each extension in the\n`registration_schema.properties.contact_extensions` object.\n\nExamples include `.us` nexus fields, `.uk` registrant type fields,\nand `.ca` legal type fields. Omit this object when the extension's\nregistration schema excludes `contact_extensions`.\n",
+      "description": "Provides registry-specific contact extension values for the registrant.\n`GET /accounts/{account_id}/registrar/extensions/{extension}` identifies\nthe required keys and allowed values for each extension in the\n`registration_schema.properties.contact_extensions` object.\n\nExamples include `.us` nexus fields, `.uk` registrant type fields,\nand `.ca` legal type fields. Omit this object when the extension's\nregistration schema excludes `contact_extensions`.",
       "type": "object"
     },
     "contacts": {
       "$ref": "#/$defs/registrar-api-sandbox_registration_contacts"
     },
     "domain_name": {
-      "$ref": "#/$defs/registrar-api-sandbox_domain_name",
-      "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n"
+      "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.",
+      "type": "string"
     },
     "privacy_mode": {
       "default": "redaction",
-      "description": "Sets the WHOIS privacy mode for the registration. Defaults to `redaction`.\n- `off`: Disables WHOIS privacy.\n- `redaction`: Requests WHOIS redaction where the extension supports it.\n  Some extensions exclude privacy and redaction.\n",
+      "description": "Sets the WHOIS privacy mode for the registration. Defaults to `redaction`.\n- `off`: Disables WHOIS privacy.\n- `redaction`: Requests WHOIS redaction where the extension supports it.\n  Some extensions exclude privacy and redaction.",
       "enum": [
         "off",
         "redaction"
@@ -188,7 +180,7 @@ export const registrar_api_sandbox_registration_create_request: JsonSchema = {
       "type": "string"
     },
     "years": {
-      "description": "Sets the registration term from 1 to 10 years. When omitted, this\nfield defaults to the registry's minimum registration period for the\nextension. Most extensions require 1 year, while some require longer\nminimum terms (e.g., `.ai` requires 2 years).\n\nEach registry may also enforce its own maximum registration term. A\nrequest above that maximum fails. When uncertain, omit this field to\nuse the default.\n",
+      "description": "Sets the registration term from 1 to 10 years. When omitted, this\nfield defaults to the registry's minimum registration period for the\nextension. Most extensions require 1 year, while some require longer\nminimum terms (e.g., `.ai` requires 2 years).\n\nEach registry may also enforce its own maximum registration term. A\nrequest above that maximum fails. When uncertain, omit this field to\nuse the default.",
       "type": "integer"
     }
   },
@@ -201,11 +193,11 @@ export const registrar_api_sandbox_registration_create_request: JsonSchema = {
 /**
  * The schema of `registrar-api-sandbox_registration_update_request`.
  */
-export const registrar_api_sandbox_registration_update_request: JsonSchema = {
-  "description": "Request to update an existing domain registration.\n\nThis endpoint currently supports updating `auto_renew` only.\n",
+export const registrar$$api$$sandbox_registration_update_request: JsonSchema = {
+  "description": "Request to update an existing domain registration.\n\nThis endpoint currently supports updating `auto_renew` only.",
   "properties": {
     "auto_renew": {
-      "description": "Enable or disable automatic renewal.\nSetting this field to `true` authorizes Cloudflare to charge the\naccount's default payment method up to 30 days before domain expiry\nto renew the domain automatically. Renewal pricing may change over\ntime based on registry pricing.\n",
+      "description": "Enable or disable automatic renewal.\nSetting this field to `true` authorizes Cloudflare to charge the\naccount's default payment method up to 30 days before domain expiry\nto renew the domain automatically. Renewal pricing may change over\ntime based on registry pricing.",
       "type": "boolean"
     }
   },
diff --git a/src/generated/forge-mcp/registrarSandbox/registrations/tools.ts b/src/generated/forge-mcp/registrarSandbox/registrations/tools.ts
index e59c80ae8..4daab4180 100644
--- a/src/generated/forge-mcp/registrarSandbox/registrations/tools.ts
+++ b/src/generated/forge-mcp/registrarSandbox/registrations/tools.ts
@@ -1,79 +1,85 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  registrar_api_sandbox_api_response_common_failure_output,
-  registrar_api_sandbox_api_response_common_output,
-  registrar_api_sandbox_messages_output,
+  registrar$$api$$sandbox_api$$response$$common,
+  registrar$$api$$sandbox_api$$response$$common$$failure,
+  registrar$$api$$sandbox_messages,
 } from "../outputs.js";
-import { registrar_api_sandbox_identifier } from "../schemas.js";
 import {
-  registrar_api_sandbox_cursor_result_info_output,
-  registrar_api_sandbox_domain_check_response_output,
-  registrar_api_sandbox_domain_check_result_output,
-  registrar_api_sandbox_domain_name_output,
-  registrar_api_sandbox_domain_search_response_output,
-  registrar_api_sandbox_domain_search_result_output,
-  registrar_api_sandbox_pricing_base_output,
-  registrar_api_sandbox_pricing_registration_output,
-  registrar_api_sandbox_registration_output,
-  registrar_api_sandbox_registration_response_collection_output,
-  registrar_api_sandbox_registration_response_single_output,
-  registrar_api_sandbox_workflow_error_output,
-  registrar_api_sandbox_workflow_links_output,
-  registrar_api_sandbox_workflow_status_output,
-  registrar_api_sandbox_workflow_status_response_single_output,
+  registrar$$api$$sandbox_cursor_result_info,
+  registrar$$api$$sandbox_domain_check_response,
+  registrar$$api$$sandbox_domain_check_result,
+  registrar$$api$$sandbox_domain_search_response,
+  registrar$$api$$sandbox_domain_search_result,
+  registrar$$api$$sandbox_pricing_base,
+  registrar$$api$$sandbox_pricing_registration,
+  registrar$$api$$sandbox_registration,
+  registrar$$api$$sandbox_registration$$response$$collection,
+  registrar$$api$$sandbox_registration$$response$$single,
+  registrar$$api$$sandbox_workflow$$status$$response$$single,
+  registrar$$api$$sandbox_workflow_error,
+  registrar$$api$$sandbox_workflow_links,
+  registrar$$api$$sandbox_workflow_status,
 } from "./outputs.js";
 import {
-  registrar_api_sandbox_domain_check_request,
-  registrar_api_sandbox_domain_name,
-  registrar_api_sandbox_registration_contact,
-  registrar_api_sandbox_registration_contact_address,
-  registrar_api_sandbox_registration_contact_postal_info,
-  registrar_api_sandbox_registration_contacts,
-  registrar_api_sandbox_registration_create_request,
-  registrar_api_sandbox_registration_update_request,
+  registrar$$api$$sandbox_domain_check_request,
+  registrar$$api$$sandbox_registration_contact,
+  registrar$$api$$sandbox_registration_contact_address,
+  registrar$$api$$sandbox_registration_contact_postal_info,
+  registrar$$api$$sandbox_registration_contacts,
+  registrar$$api$$sandbox_registration_create_request,
+  registrar$$api$$sandbox_registration_update_request,
 } from "./schemas.js";
 
 /**
- * The tools of `registrar_sandbox.registrations`.
+ * The tools of `registrarSandbox.registrations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "registrar_sandbox_registrations_check",
+    name: "registrarSandbox_registrations_check",
     title: "Check domain availability",
-    description: "Performs real-time, authoritative availability checks directly against domain\nregistries. Use this endpoint to verify a domain is available before attempting\nregistration via `POST /registrations`.\n\n**Important:** Unlike the Search endpoint, these results are authoritative and\nreflect current registry status. Always check availability immediately before\nregistration as domain status can change rapidly.\n\n**Note:** This endpoint uses POST to accept a list of domains in the request\nbody. It is a read-only operation — it does not create, modify, or reserve\nany domains.\n\n### Extension support\n\nOnly domains on extensions supported for programmatic registration by this API\ncan be registered. If you check a domain on an unsupported extension, the response\nwill include `registrable: false` with a `reason` field explaining why:\n\n- `extension_not_supported_via_api` — Cloudflare Registrar supports this extension\n  in the dashboard, but it is not yet available for programmatic registration via\n  this API. Register via `https://dash.cloudflare.com/{account_id}/domains/registrations` instead.\n- `extension_not_supported` — This extension is not supported by Cloudflare\n  Registrar.\n- `extension_disallows_registration` — The extension's registry has temporarily\n  or permanently frozen new registrations. No registrar can register domains on\n  this extension at this time.\n- `domain_premium` — The domain is premium priced. Premium registration is not\n  currently supported by this API.\n- `domain_unavailable` — The domain is already registered, reserved, or otherwise\n  not available for registration on a supported extension.\n\nThe `reason` field is only present when `registrable` is `false`.\n\n### Behavior\n- Maximum 20 domains per request\n- Pricing is only returned for domains where `registrable: true`\n- Results are not cached; each request queries the registry\n\n### Workflow\n1. Call this endpoint with domains the user wants to register.\n2. For each domain where `registrable: true`, present pricing to the user.\n3. If `tier: premium`, note that premium registration is not currently\n   supported by this API and do not proceed to `POST /registrations`.\n4. Proceed to `POST /registrations` only for supported non-premium domains.",
+    description: "Performs real-time, authoritative availability checks directly against domain\nregistries. Use this endpoint to verify a domain is available before attempting\nregistration via `POST /registrations`.\n\n**Important:** Unlike the Search endpoint, these results are authoritative and\nreflect current registry status. Always check availability immediately before\nregistration as domain status can change rapidly.\n\n**Note:** This endpoint uses POST to accept a list of domains in the request\nbody. It is a read-only operation — it does not create, modify, or reserve\nany domains.\n\n### Extension support\n\nOnly domains on extensions supported for programmatic registration by this API\ncan be registered. If you check a domain on an unsupported extension, the response\nwill include `registrable: false` with a `reason` field explaining why:\n\n- `extension_not_supported_via_api` — Cloudflare Registrar supports this extension\n  in the dashboard, but it is not yet available for programmatic registration via\n  this API. Register via `https://dash.cloudflare.com/{account_id}/domains/registrations` instead.\n- `extension_not_supported` — This extension is not supported by Cloudflare\n  Registrar.\n- `extension_disallows_registration` — The extension's registry has temporarily\n  or permanently frozen new registrations. No registrar can register domains on\n  this extension at this time.\n- `domain_premium` — The domain is premium priced. Premium registration is not\n  currently supported by this API.\n- `domain_unavailable` — The domain is already registered, reserved, or otherwise\n  not available for registration on a supported extension.\n\nThe `reason` field is only present when `registrable` is `false`.\n\n### Behavior\n- Maximum 20 domains per request\n- Pricing is only returned for domains where `registrable: true`\n- Results are not cached; each request queries the registry\n\n### Workflow\n1. Call this endpoint with domains the user wants to register.\n2. For each domain where `registrable: true`, present pricing to the user.\n3. If `tier: premium`, note that premium registration is not currently\n   supported by this API and do not proceed to `POST /registrations`.\n4. Proceed to `POST /registrations` only for supported non-premium domains.\n\nPOST /accounts/{account_id}/registrar-sandbox/domain-check",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
         "body": {
           "$ref": "#/$defs/registrar-api-sandbox_domain_check_request",
           "description": "List of fully qualified domain names (FQDNs) to check. Each domain must include the extension (e.g., \"example.com\", not \"example\")."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "registrar-api-sandbox_domain_check_request": registrar_api_sandbox_domain_check_request,
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
+        "registrar-api-sandbox_domain_check_request": registrar$$api$$sandbox_domain_check_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_domain_check_response",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_domain_check_response": registrar_api_sandbox_domain_check_response_output,
-        "registrar-api-sandbox_domain_check_result": registrar_api_sandbox_domain_check_result_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_pricing_base": registrar_api_sandbox_pricing_base_output,
-        "registrar-api-sandbox_pricing_registration": registrar_api_sandbox_pricing_registration_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_domain_check_response": registrar$$api$$sandbox_domain_check_response,
+        "registrar-api-sandbox_domain_check_result": registrar$$api$$sandbox_domain_check_result,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_pricing_base": registrar$$api$$sandbox_pricing_base,
+        "registrar-api-sandbox_pricing_registration": registrar$$api$$sandbox_pricing_registration,
       },
     },
     annotations: {
@@ -102,13 +108,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_domain_check_response": registrar_api_sandbox_domain_check_response_output,
-        "registrar-api-sandbox_domain_check_result": registrar_api_sandbox_domain_check_result_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_pricing_base": registrar_api_sandbox_pricing_base_output,
-        "registrar-api-sandbox_pricing_registration": registrar_api_sandbox_pricing_registration_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_domain_check_response": registrar$$api$$sandbox_domain_check_response,
+        "registrar-api-sandbox_domain_check_result": registrar$$api$$sandbox_domain_check_result,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_pricing_base": registrar$$api$$sandbox_pricing_base,
+        "registrar-api-sandbox_pricing_registration": registrar$$api$$sandbox_pricing_registration,
       },
     },
     request: (args) => ({
@@ -117,47 +123,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_sandbox_registrations_create",
+    name: "registrarSandbox_registrations_create",
     title: "Create Registration",
-    description: "Starts a domain registration workflow.\n\n### Prerequisites\n- The account must not already be at the maximum supported domain limit.\n    A single account may own up to 500 domains in total across registrations\n    created through either the dashboard or this API.\n- The domain must be on a supported extension for programmatic registration.\n- Use `POST /domain-check` immediately before calling this endpoint to confirm\n    real-time availability and pricing.\n\n### Defaults\n- `years`: defaults to the extension's minimum registration period (1 year for\n    most extensions, but varies — for example, `.ai` (if supported) requires a minimum of 2 years).\n- `auto_renew`: defaults to `false`. Setting it to `true` is an explicit\n    opt-in authorizing Cloudflare to charge the account's default payment\n    method up to 30 days before domain expiry to renew the registration.\n    Renewal pricing may change over time based on registry pricing.\n- `privacy_mode`: defaults to `redaction`.\n\n### Premium domains\nPremium domain registration is not currently supported by this API.\nIf `POST /domain-check` returns `tier: premium`, do not call this\nendpoint for that domain.\n\n### Response behavior\nBy default, the server holds the connection for a bounded, server-defined\namount of time while the registration completes. Most registrations finish\nwithin this window and return `201 Created` with a completed workflow status.\n\nIf the registration is still processing after this synchronous wait window,\nthe server returns `202 Accepted`. Poll the URL in `links.self` to track progress.\n\nTo skip the wait and receive an immediate `202`, send `Prefer: respond-async`.",
+    description: "Starts a domain registration workflow.\n\n### Prerequisites\n- The account must not already be at the maximum supported domain limit.\n    A single account may own up to 500 domains in total across registrations\n    created through either the dashboard or this API.\n- The domain must be on a supported extension for programmatic registration.\n- Use `POST /domain-check` immediately before calling this endpoint to confirm\n    real-time availability and pricing.\n\n### Defaults\n- `years`: defaults to the extension's minimum registration period (1 year for\n    most extensions, but varies — for example, `.ai` (if supported) requires a minimum of 2 years).\n- `auto_renew`: defaults to `false`. Setting it to `true` is an explicit\n    opt-in authorizing Cloudflare to charge the account's default payment\n    method up to 30 days before domain expiry to renew the registration.\n    Renewal pricing may change over time based on registry pricing.\n- `privacy_mode`: defaults to `redaction`.\n\n### Premium domains\nPremium domain registration is not currently supported by this API.\nIf `POST /domain-check` returns `tier: premium`, do not call this\nendpoint for that domain.\n\n### Response behavior\nBy default, the server holds the connection for a bounded, server-defined\namount of time while the registration completes. Most registrations finish\nwithin this window and return `201 Created` with a completed workflow status.\n\nIf the registration is still processing after this synchronous wait window,\nthe server returns `202 Accepted`. Poll the URL in `links.self` to track progress.\n\nTo skip the wait and receive an immediate `202`, send `Prefer: respond-async`.\n\nPOST /accounts/{account_id}/registrar-sandbox/registrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
         "body": {
           "$ref": "#/$defs/registrar-api-sandbox_registration_create_request"
         },
-        "prefer": {
-          "description": "Set to `respond-async` to receive an immediate `202 Accepted` without\nwaiting for the operation to complete (RFC 7240).\n\nThe header may be combined with other preferences using standard\ncomma-separated syntax.\n",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Prefer": {
+              "description": "Set to `respond-async` to receive an immediate `202 Accepted` without\nwaiting for the operation to complete (RFC 7240).\n\nThe header may be combined with other preferences using standard\ncomma-separated syntax.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name,
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-        "registrar-api-sandbox_registration_contact": registrar_api_sandbox_registration_contact,
-        "registrar-api-sandbox_registration_contact_address": registrar_api_sandbox_registration_contact_address,
-        "registrar-api-sandbox_registration_contact_postal_info": registrar_api_sandbox_registration_contact_postal_info,
-        "registrar-api-sandbox_registration_contacts": registrar_api_sandbox_registration_contacts,
-        "registrar-api-sandbox_registration_create_request": registrar_api_sandbox_registration_create_request,
+        "registrar-api-sandbox_registration_contact": registrar$$api$$sandbox_registration_contact,
+        "registrar-api-sandbox_registration_contact_address": registrar$$api$$sandbox_registration_contact_address,
+        "registrar-api-sandbox_registration_contact_postal_info": registrar$$api$$sandbox_registration_contact_postal_info,
+        "registrar-api-sandbox_registration_contacts": registrar$$api$$sandbox_registration_contacts,
+        "registrar-api-sandbox_registration_create_request": registrar$$api$$sandbox_registration_create_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_workflow-status-response-single",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_workflow-status-response-single": registrar_api_sandbox_workflow_status_response_single_output,
-        "registrar-api-sandbox_workflow_error": registrar_api_sandbox_workflow_error_output,
-        "registrar-api-sandbox_workflow_links": registrar_api_sandbox_workflow_links_output,
-        "registrar-api-sandbox_workflow_status": registrar_api_sandbox_workflow_status_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_workflow-status-response-single": registrar$$api$$sandbox_workflow$$status$$response$$single,
+        "registrar-api-sandbox_workflow_error": registrar$$api$$sandbox_workflow_error,
+        "registrar-api-sandbox_workflow_links": registrar$$api$$sandbox_workflow_links,
+        "registrar-api-sandbox_workflow_status": registrar$$api$$sandbox_workflow_status,
       },
     },
     annotations: {
@@ -182,56 +202,61 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_workflow-status-response-single": registrar_api_sandbox_workflow_status_response_single_output,
-        "registrar-api-sandbox_workflow_error": registrar_api_sandbox_workflow_error_output,
-        "registrar-api-sandbox_workflow_links": registrar_api_sandbox_workflow_links_output,
-        "registrar-api-sandbox_workflow_status": registrar_api_sandbox_workflow_status_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_workflow-status-response-single": registrar$$api$$sandbox_workflow$$status$$response$$single,
+        "registrar-api-sandbox_workflow_error": registrar$$api$$sandbox_workflow_error,
+        "registrar-api-sandbox_workflow_links": registrar$$api$$sandbox_workflow_links,
+        "registrar-api-sandbox_workflow_status": registrar$$api$$sandbox_workflow_status,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar-sandbox/registrations`,
       headers: [
-        ["Prefer", args["prefer"]],
+        ["Prefer", param(args, "headers", "Prefer")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "registrar_sandbox_registrations_get",
+    name: "registrarSandbox_registrations_get",
     title: "Get Registration",
-    description: "Returns the current state of a domain registration.\n\nThis is the canonical read endpoint for a domain you own. It returns\nthe full registration resource including current settings and expiration.\nWhen the registration resource is ready, both `created_at` and `expires_at`\nare present in the response.",
+    description: "Returns the current state of a domain registration.\n\nThis is the canonical read endpoint for a domain you own. It returns\nthe full registration resource including current settings and expiration.\nWhen the registration resource is ready, both `created_at` and `expires_at`\nare present in the response.\n\nGET /accounts/{account_id}/registrar-sandbox/registrations/{domain_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Cloudflare account ID."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api-sandbox_domain_name",
-          "description": "Domain name to retrieve."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Domain name to retrieve.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name,
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_registration-response-single",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_registration": registrar_api_sandbox_registration_output,
-        "registrar-api-sandbox_registration-response-single": registrar_api_sandbox_registration_response_single_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_registration": registrar$$api$$sandbox_registration,
+        "registrar-api-sandbox_registration-response-single": registrar$$api$$sandbox_registration$$response$$single,
       },
     },
     annotations: {
@@ -253,12 +278,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_registration": registrar_api_sandbox_registration_output,
-        "registrar-api-sandbox_registration-response-single": registrar_api_sandbox_registration_response_single_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_registration": registrar$$api$$sandbox_registration,
+        "registrar-api-sandbox_registration-response-single": registrar$$api$$sandbox_registration$$response$$single,
       },
     },
     request: (args) => ({
@@ -266,39 +290,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_sandbox_registrations_get_registration_status",
+    name: "registrarSandbox_registrations_getRegistrationStatus",
     title: "Get Registration Status",
-    description: "Returns the current status of a domain registration workflow.\n\nUse this endpoint to poll for completion when the POST response\nreturned `202 Accepted`. The URL is provided in the `links.self`\nfield of the workflow status response.\n\nPoll this endpoint until the workflow reaches a terminal state or a\nstate that requires user attention.\n\n**Terminal states:** `succeeded` and `failed` are terminal and always\nhave `completed: true`.\n\n**Non-terminal states:**\n- `action_required` has `completed: false` and will not resolve on its\n  own. The workflow is paused pending user intervention.\n- `blocked` has `completed: false` and indicates the workflow is waiting\n  on a third party such as the extension registry or losing registrar.\n  Continue polling while informing the user of the delay.\n\nUse increasing backoff between polls. When `state: blocked`, use a\nlonger polling interval and do not poll indefinitely.\n\nA naive polling loop that only checks `completed` can run indefinitely\nwhen `state: action_required`. Break explicitly on `action_required`:\n\n```js\nlet status;\ndo {\n  await new Promise(r => setTimeout(r, 2000));\n  status = await cloudflare.request({\n    method: 'GET',\n    path: reg.result.links.self,\n  });\n} while (\n  !status.result.completed &&\n  status.result.state !== 'action_required'\n);\n\nif (status.result.state === 'action_required') {\n  // Surface context.action and context.confirmation_sent_to to the user.\n  // Do not re-submit the registration request.\n}\n```",
+    description: "Returns the current status of a domain registration workflow.\n\nUse this endpoint to poll for completion when the POST response\nreturned `202 Accepted`. The URL is provided in the `links.self`\nfield of the workflow status response.\n\nPoll this endpoint until the workflow reaches a terminal state or a\nstate that requires user attention.\n\n**Terminal states:** `succeeded` and `failed` are terminal and always\nhave `completed: true`.\n\n**Non-terminal states:**\n- `action_required` has `completed: false` and will not resolve on its\n  own. The workflow is paused pending user intervention.\n- `blocked` has `completed: false` and indicates the workflow is waiting\n  on a third party such as the extension registry or losing registrar.\n  Continue polling while informing the user of the delay.\n\nUse increasing backoff between polls. When `state: blocked`, use a\nlonger polling interval and do not poll indefinitely.\n\nA naive polling loop that only checks `completed` can run indefinitely\nwhen `state: action_required`. Break explicitly on `action_required`:\n\n```js\nlet status;\ndo {\n  await new Promise(r => setTimeout(r, 2000));\n  status = await cloudflare.request({\n    method: 'GET',\n    path: reg.result.links.self,\n  });\n} while (\n  !status.result.completed &&\n  status.result.state !== 'action_required'\n);\n\nif (status.result.state === 'action_required') {\n  // Surface context.action and context.confirmation_sent_to to the user.\n  // Do not re-submit the registration request.\n}\n```\n\nGET /accounts/{account_id}/registrar-sandbox/registrations/{domain_name}/registration-status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api-sandbox_domain_name",
-          "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name,
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_workflow-status-response-single",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_workflow-status-response-single": registrar_api_sandbox_workflow_status_response_single_output,
-        "registrar-api-sandbox_workflow_error": registrar_api_sandbox_workflow_error_output,
-        "registrar-api-sandbox_workflow_links": registrar_api_sandbox_workflow_links_output,
-        "registrar-api-sandbox_workflow_status": registrar_api_sandbox_workflow_status_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_workflow-status-response-single": registrar$$api$$sandbox_workflow$$status$$response$$single,
+        "registrar-api-sandbox_workflow_error": registrar$$api$$sandbox_workflow_error,
+        "registrar-api-sandbox_workflow_links": registrar$$api$$sandbox_workflow_links,
+        "registrar-api-sandbox_workflow_status": registrar$$api$$sandbox_workflow_status,
       },
     },
     annotations: {
@@ -320,13 +350,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_workflow-status-response-single": registrar_api_sandbox_workflow_status_response_single_output,
-        "registrar-api-sandbox_workflow_error": registrar_api_sandbox_workflow_error_output,
-        "registrar-api-sandbox_workflow_links": registrar_api_sandbox_workflow_links_output,
-        "registrar-api-sandbox_workflow_status": registrar_api_sandbox_workflow_status_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_workflow-status-response-single": registrar$$api$$sandbox_workflow$$status$$response$$single,
+        "registrar-api-sandbox_workflow_error": registrar$$api$$sandbox_workflow_error,
+        "registrar-api-sandbox_workflow_links": registrar$$api$$sandbox_workflow_links,
+        "registrar-api-sandbox_workflow_status": registrar$$api$$sandbox_workflow_status,
       },
     },
     request: (args) => ({
@@ -334,39 +364,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_sandbox_registrations_get_update_status",
+    name: "registrarSandbox_registrations_getUpdateStatus",
     title: "Get Update Status",
-    description: "Returns the current status of a domain update workflow.\n\nUse this endpoint to poll for completion when the PATCH response\nreturned `202 Accepted`. The URL is provided in the `links.self`\nfield of the workflow status response.\n\nPoll this endpoint until the workflow reaches a terminal state or a\nstate that requires user attention.\n\nUse increasing backoff between polls. When the workflow remains blocked\non a third party, use a longer polling interval and do not poll indefinitely.",
+    description: "Returns the current status of a domain update workflow.\n\nUse this endpoint to poll for completion when the PATCH response\nreturned `202 Accepted`. The URL is provided in the `links.self`\nfield of the workflow status response.\n\nPoll this endpoint until the workflow reaches a terminal state or a\nstate that requires user attention.\n\nUse increasing backoff between polls. When the workflow remains blocked\non a third party, use a longer polling interval and do not poll indefinitely.\n\nGET /accounts/{account_id}/registrar-sandbox/registrations/{domain_name}/update-status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Cloudflare account ID."
-        },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api-sandbox_domain_name",
-          "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Provides a fully qualified domain name (FQDN), including the extension\n(e.g., `example.com`, `mybrand.app`). The domain name uniquely identifies\na registration. Cloudflare permits only one registration per domain, making\nthe domain name a natural idempotency key for registration requests.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name"
+        "path"
       ],
-      $defs: {
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name,
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_workflow-status-response-single",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_workflow-status-response-single": registrar_api_sandbox_workflow_status_response_single_output,
-        "registrar-api-sandbox_workflow_error": registrar_api_sandbox_workflow_error_output,
-        "registrar-api-sandbox_workflow_links": registrar_api_sandbox_workflow_links_output,
-        "registrar-api-sandbox_workflow_status": registrar_api_sandbox_workflow_status_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_workflow-status-response-single": registrar$$api$$sandbox_workflow$$status$$response$$single,
+        "registrar-api-sandbox_workflow_error": registrar$$api$$sandbox_workflow_error,
+        "registrar-api-sandbox_workflow_links": registrar$$api$$sandbox_workflow_links,
+        "registrar-api-sandbox_workflow_status": registrar$$api$$sandbox_workflow_status,
       },
     },
     annotations: {
@@ -388,13 +424,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_workflow-status-response-single": registrar_api_sandbox_workflow_status_response_single_output,
-        "registrar-api-sandbox_workflow_error": registrar_api_sandbox_workflow_error_output,
-        "registrar-api-sandbox_workflow_links": registrar_api_sandbox_workflow_links_output,
-        "registrar-api-sandbox_workflow_status": registrar_api_sandbox_workflow_status_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_workflow-status-response-single": registrar$$api$$sandbox_workflow$$status$$response$$single,
+        "registrar-api-sandbox_workflow_error": registrar$$api$$sandbox_workflow_error,
+        "registrar-api-sandbox_workflow_links": registrar$$api$$sandbox_workflow_links,
+        "registrar-api-sandbox_workflow_status": registrar$$api$$sandbox_workflow_status,
       },
     },
     request: (args) => ({
@@ -402,61 +438,73 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "registrar_sandbox_registrations_list",
+    name: "registrarSandbox_registrations_list",
     title: "List Registrations",
-    description: "Returns a paginated list of domain registrations owned by the account.\n\nThis endpoint uses cursor-based pagination. Results are ordered by registration\ndate by default. To fetch the next page, pass the `cursor` value from the\n`result_info` object in the response as the `cursor` query parameter in\nyour next request. An empty `cursor` string indicates there are no more\npages.",
+    description: "Returns a paginated list of domain registrations owned by the account.\n\nThis endpoint uses cursor-based pagination. Results are ordered by registration\ndate by default. To fetch the next page, pass the `cursor` value from the\n`result_info` object in the response as the `cursor` query parameter in\nyour next request. An empty `cursor` string indicates there are no more\npages.\n\nGET /accounts/{account_id}/registrar-sandbox/registrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Cloudflare account ID."
-        },
-        "cursor": {
-          "description": "Opaque token from a previous response's `result_info.cursor`.\nPass this value to fetch the next page of results. Omit (or\npass an empty string) for the first page.\n",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction for results. Defaults to ascending order.\n",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items to return per page.",
-          "type": "integer"
+          "type": "object"
         },
-        "sort_by": {
-          "default": "registry_created_at",
-          "description": "Column to sort results by. Defaults to registration date (`registry_created_at`) when omitted.",
-          "enum": [
-            "registry_created_at",
-            "registry_expires_at",
-            "name"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token from a previous response's `result_info.cursor`.\nPass this value to fetch the next page of results. Omit (or\npass an empty string) for the first page.",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction for results. Defaults to ascending order.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items to return per page.",
+              "type": "integer"
+            },
+            "sort_by": {
+              "default": "registry_created_at",
+              "description": "Column to sort results by. Defaults to registration date (`registry_created_at`) when omitted.",
+              "enum": [
+                "registry_created_at",
+                "registry_expires_at",
+                "name"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_registration-response-collection",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_cursor_result_info": registrar_api_sandbox_cursor_result_info_output,
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_registration": registrar_api_sandbox_registration_output,
-        "registrar-api-sandbox_registration-response-collection": registrar_api_sandbox_registration_response_collection_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_cursor_result_info": registrar$$api$$sandbox_cursor_result_info,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_registration": registrar$$api$$sandbox_registration,
+        "registrar-api-sandbox_registration-response-collection": registrar$$api$$sandbox_registration$$response$$collection,
       },
     },
     annotations: {
@@ -478,71 +526,86 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_cursor_result_info": registrar_api_sandbox_cursor_result_info_output,
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_registration": registrar_api_sandbox_registration_output,
-        "registrar-api-sandbox_registration-response-collection": registrar_api_sandbox_registration_response_collection_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_cursor_result_info": registrar$$api$$sandbox_cursor_result_info,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_registration": registrar$$api$$sandbox_registration,
+        "registrar-api-sandbox_registration-response-collection": registrar$$api$$sandbox_registration$$response$$collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar-sandbox/registrations`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
-        ["sort_by", args["sort_by"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
       ],
     }),
   },
   {
-    name: "registrar_sandbox_registrations_search",
+    name: "registrarSandbox_registrations_search",
     title: "Search for available domains",
-    description: "Searches for domain name suggestions based on a keyword, phrase, or partial domain name.\nReturns a list of potentially available domains with pricing information.\n\n**Important:** Results are non-authoritative and based on cached data. Always use the\n`/domain-check` endpoint to verify real-time availability before attempting registration.\n\nSuggestions are scoped to extensions supported for programmatic registration\nvia this API (`POST /registrations`). Domains on unsupported extensions will\nnot appear in results, even if they are available at the registry level.\n\n### Use cases\n- Brand name discovery (e.g., \"acme corp\" → acmecorp.com, acmecorp.dev)\n- Keyword-based suggestions (e.g., \"coffee shop\" → coffeeshop.com, mycoffeeshop.net)\n- Alternative extension discovery (e.g., \"example.com\" → example.com, example.app, example.xyz)\n\n### Workflow\n1. Call this endpoint with a keyword or domain name.\n2. Present suggestions to the user.\n3. Call `/domain-check` with the user's chosen domains to confirm real-time availability and pricing.\n4. Proceed to `POST /registrations` only for supported non-premium domains\n   where the Check response returns `registrable: true`.\n\n**Note:** Searching with just a domain extension (e.g., \"com\" or \".app\") is not supported. Provide a keyword or domain name.",
+    description: "Searches for domain name suggestions based on a keyword, phrase, or partial domain name.\nReturns a list of potentially available domains with pricing information.\n\n**Important:** Results are non-authoritative and based on cached data. Always use the\n`/domain-check` endpoint to verify real-time availability before attempting registration.\n\nSuggestions are scoped to extensions supported for programmatic registration\nvia this API (`POST /registrations`). Domains on unsupported extensions will\nnot appear in results, even if they are available at the registry level.\n\n### Use cases\n- Brand name discovery (e.g., \"acme corp\" → acmecorp.com, acmecorp.dev)\n- Keyword-based suggestions (e.g., \"coffee shop\" → coffeeshop.com, mycoffeeshop.net)\n- Alternative extension discovery (e.g., \"example.com\" → example.com, example.app, example.xyz)\n\n### Workflow\n1. Call this endpoint with a keyword or domain name.\n2. Present suggestions to the user.\n3. Call `/domain-check` with the user's chosen domains to confirm real-time availability and pricing.\n4. Proceed to `POST /registrations` only for supported non-premium domains\n   where the Check response returns `registrable: true`.\n\n**Note:** Searching with just a domain extension (e.g., \"com\" or \".app\") is not supported. Provide a keyword or domain name.\n\nGET /accounts/{account_id}/registrar-sandbox/domain-search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Cloudflare account ID. Required for all Registrar API operations."
-        },
-        "extensions": {
-          "description": "Limits results to specific domain extensions from the supported set. If not specified,\nreturns results across all supported extensions. Extensions not in the supported\nset are silently ignored.\n",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID. Required for all Registrar API operations.",
+              "type": "string"
+            }
           },
-          "maxItems": 20,
-          "type": "array"
-        },
-        "limit": {
-          "default": 20,
-          "description": "Maximum number of domain suggestions to return. Defaults to 20 if not specified.\n",
-          "type": "integer"
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
         "query": {
-          "description": "The search term to find domain suggestions. Accepts keywords, phrases, or full domain names.\n- Phrases: \"coffee shop\" returns coffeeshop.com, mycoffeeshop.net, etc.\n- Domain names: \"example.com\" returns example.com and variations across extensions\n",
-          "type": "string"
+          "additionalProperties": false,
+          "properties": {
+            "extensions": {
+              "description": "Limits results to specific domain extensions from the supported set. If not specified,\nreturns results across all supported extensions. Extensions not in the supported\nset are silently ignored.",
+              "items": {
+                "type": "string"
+              },
+              "maxItems": 20,
+              "type": "array"
+            },
+            "limit": {
+              "default": 20,
+              "description": "Maximum number of domain suggestions to return. Defaults to 20 if not specified.",
+              "type": "integer"
+            },
+            "q": {
+              "description": "The search term to find domain suggestions. Accepts keywords, phrases, or full domain names.\n- Phrases: \"coffee shop\" returns coffeeshop.com, mycoffeeshop.net, etc.\n- Domain names: \"example.com\" returns example.com and variations across extensions",
+              "type": "string"
+            }
+          },
+          "required": [
+            "q"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "query"
       ],
-      $defs: {
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_domain_search_response",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_domain_search_response": registrar_api_sandbox_domain_search_response_output,
-        "registrar-api-sandbox_domain_search_result": registrar_api_sandbox_domain_search_result_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_pricing_base": registrar_api_sandbox_pricing_base_output,
-        "registrar-api-sandbox_pricing_registration": registrar_api_sandbox_pricing_registration_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_domain_search_response": registrar$$api$$sandbox_domain_search_response,
+        "registrar-api-sandbox_domain_search_result": registrar$$api$$sandbox_domain_search_result,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_pricing_base": registrar$$api$$sandbox_pricing_base,
+        "registrar-api-sandbox_pricing_registration": registrar$$api$$sandbox_pricing_registration,
       },
     },
     annotations: {
@@ -564,70 +627,84 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_domain_search_response": registrar_api_sandbox_domain_search_response_output,
-        "registrar-api-sandbox_domain_search_result": registrar_api_sandbox_domain_search_result_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_pricing_base": registrar_api_sandbox_pricing_base_output,
-        "registrar-api-sandbox_pricing_registration": registrar_api_sandbox_pricing_registration_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_domain_search_response": registrar$$api$$sandbox_domain_search_response,
+        "registrar-api-sandbox_domain_search_result": registrar$$api$$sandbox_domain_search_result,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_pricing_base": registrar$$api$$sandbox_pricing_base,
+        "registrar-api-sandbox_pricing_registration": registrar$$api$$sandbox_pricing_registration,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar-sandbox/domain-search`,
       query: [
-        ["q", args["query"], true],
-        ["extensions", args["extensions"], false],
-        ["limit", args["limit"], true],
+        ["q", param(args, "query", "q"), true],
+        ["extensions", param(args, "query", "extensions"), false],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
-    name: "registrar_sandbox_registrations_update",
+    name: "registrarSandbox_registrations_update",
     title: "Update Registration",
-    description: "Updates an existing domain registration.\n\nBy default, the server holds the connection for a bounded, server-defined\namount of time while the update completes. Most updates finish within this\nwindow and return `200 OK` with a completed workflow status.\n\nIf the update is still processing after this synchronous wait window, the\nserver returns `202 Accepted`. Poll the URL in `links.self` to track progress.\n\nTo skip the wait and receive an immediate `202`, send `Prefer: respond-async`.\n\nThis endpoint currently supports updating `auto_renew` only.",
+    description: "Updates an existing domain registration.\n\nBy default, the server holds the connection for a bounded, server-defined\namount of time while the update completes. Most updates finish within this\nwindow and return `200 OK` with a completed workflow status.\n\nIf the update is still processing after this synchronous wait window, the\nserver returns `202 Accepted`. Poll the URL in `links.self` to track progress.\n\nTo skip the wait and receive an immediate `202`, send `Prefer: respond-async`.\n\nThis endpoint currently supports updating `auto_renew` only.\n\nPATCH /accounts/{account_id}/registrar-sandbox/registrations/{domain_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/registrar-api-sandbox_identifier",
-          "description": "Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/registrar-api-sandbox_registration_update_request"
         },
-        "domain_name": {
-          "$ref": "#/$defs/registrar-api-sandbox_domain_name",
-          "description": "Domain name to update."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Prefer": {
+              "description": "Set to `respond-async` to receive an immediate `202 Accepted` without\nwaiting for the operation to complete (RFC 7240).",
+              "enum": [
+                "respond-async"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "prefer": {
-          "description": "Set to `respond-async` to receive an immediate `202 Accepted` without\nwaiting for the operation to complete (RFC 7240).\n",
-          "enum": [
-            "respond-async"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID.",
+              "type": "string"
+            },
+            "domain_name": {
+              "description": "Domain name to update.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_name"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "registrar-api-sandbox_domain_name": registrar_api_sandbox_domain_name,
-        "registrar-api-sandbox_identifier": registrar_api_sandbox_identifier,
-        "registrar-api-sandbox_registration_update_request": registrar_api_sandbox_registration_update_request,
+        "registrar-api-sandbox_registration_update_request": registrar$$api$$sandbox_registration_update_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/registrar-api-sandbox_workflow-status-response-single",
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_workflow-status-response-single": registrar_api_sandbox_workflow_status_response_single_output,
-        "registrar-api-sandbox_workflow_error": registrar_api_sandbox_workflow_error_output,
-        "registrar-api-sandbox_workflow_links": registrar_api_sandbox_workflow_links_output,
-        "registrar-api-sandbox_workflow_status": registrar_api_sandbox_workflow_status_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_workflow-status-response-single": registrar$$api$$sandbox_workflow$$status$$response$$single,
+        "registrar-api-sandbox_workflow_error": registrar$$api$$sandbox_workflow_error,
+        "registrar-api-sandbox_workflow_links": registrar$$api$$sandbox_workflow_links,
+        "registrar-api-sandbox_workflow_status": registrar$$api$$sandbox_workflow_status,
       },
     },
     annotations: {
@@ -652,19 +729,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "registrar-api-sandbox_api-response-common": registrar_api_sandbox_api_response_common_output,
-        "registrar-api-sandbox_api-response-common-failure": registrar_api_sandbox_api_response_common_failure_output,
-        "registrar-api-sandbox_messages": registrar_api_sandbox_messages_output,
-        "registrar-api-sandbox_workflow-status-response-single": registrar_api_sandbox_workflow_status_response_single_output,
-        "registrar-api-sandbox_workflow_error": registrar_api_sandbox_workflow_error_output,
-        "registrar-api-sandbox_workflow_links": registrar_api_sandbox_workflow_links_output,
-        "registrar-api-sandbox_workflow_status": registrar_api_sandbox_workflow_status_output,
+        "registrar-api-sandbox_api-response-common": registrar$$api$$sandbox_api$$response$$common,
+        "registrar-api-sandbox_api-response-common-failure": registrar$$api$$sandbox_api$$response$$common$$failure,
+        "registrar-api-sandbox_messages": registrar$$api$$sandbox_messages,
+        "registrar-api-sandbox_workflow-status-response-single": registrar$$api$$sandbox_workflow$$status$$response$$single,
+        "registrar-api-sandbox_workflow_error": registrar$$api$$sandbox_workflow_error,
+        "registrar-api-sandbox_workflow_links": registrar$$api$$sandbox_workflow_links,
+        "registrar-api-sandbox_workflow_status": registrar$$api$$sandbox_workflow_status,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/registrar-sandbox/registrations/${pathParam(args, "domain_name")}`,
       headers: [
-        ["Prefer", args["prefer"]],
+        ["Prefer", param(args, "headers", "Prefer")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/registrarSandbox/schemas.ts b/src/generated/forge-mcp/registrarSandbox/schemas.ts
deleted file mode 100644
index 4023a85d1..000000000
--- a/src/generated/forge-mcp/registrarSandbox/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `registrar-api-sandbox_identifier`.
- */
-export const registrar_api_sandbox_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/reporting/industry/outputs.ts b/src/generated/forge-mcp/reporting/industry/outputs.ts
index e8a2620d8..5fbe94a48 100644
--- a/src/generated/forge-mcp/reporting/industry/outputs.ts
+++ b/src/generated/forge-mcp/reporting/industry/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `reports_AccountIndustryErrorResponse` in responses.
  */
-export const reports_AccountIndustryErrorResponse_output: JsonSchema = {
+export const reports_AccountIndustryErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -48,7 +48,7 @@ export const reports_AccountIndustryErrorResponse_output: JsonSchema = {
 /**
  * The schema of `reports_AccountIndustryPatchResponse` in responses.
  */
-export const reports_AccountIndustryPatchResponse_output: JsonSchema = {
+export const reports_AccountIndustryPatchResponse: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -184,7 +184,7 @@ export const reports_AccountIndustryPatchResponse_output: JsonSchema = {
 /**
  * The schema of `reports_AccountIndustrySingleResponse` in responses.
  */
-export const reports_AccountIndustrySingleResponse_output: JsonSchema = {
+export const reports_AccountIndustrySingleResponse: JsonSchema = {
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/reporting/industry/tools.ts b/src/generated/forge-mcp/reporting/industry/tools.ts
index 2bfda055c..5b51dfb03 100644
--- a/src/generated/forge-mcp/reporting/industry/tools.ts
+++ b/src/generated/forge-mcp/reporting/industry/tools.ts
@@ -2,11 +2,11 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
-import { reports_Error_output, reports_Message_output } from "../outputs.js";
+import { reports_Error, reports_Message } from "../outputs.js";
 import {
-  reports_AccountIndustryErrorResponse_output,
-  reports_AccountIndustryPatchResponse_output,
-  reports_AccountIndustrySingleResponse_output,
+  reports_AccountIndustryErrorResponse,
+  reports_AccountIndustryPatchResponse,
+  reports_AccountIndustrySingleResponse,
 } from "./outputs.js";
 import { reports_PatchAccountIndustryBody } from "./schemas.js";
 
@@ -17,18 +17,28 @@ export const tools: readonly Tool[] = [
   {
     name: "reporting_industry_get",
     title: "Get an account industry",
-    description: "Gets the industry classification for an account.",
+    description: "Gets the industry classification for an account.\n\nGET /accounts/{account_id}/reporting/industry",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare public account ID (32-character hexadecimal string)",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare public account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -60,9 +70,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "reports_AccountIndustrySingleResponse": reports_AccountIndustrySingleResponse_output,
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
+        "reports_AccountIndustrySingleResponse": reports_AccountIndustrySingleResponse,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
       },
     },
     annotations: {
@@ -116,10 +126,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "reports_AccountIndustryErrorResponse": reports_AccountIndustryErrorResponse_output,
-        "reports_AccountIndustrySingleResponse": reports_AccountIndustrySingleResponse_output,
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
+        "reports_AccountIndustryErrorResponse": reports_AccountIndustryErrorResponse,
+        "reports_AccountIndustrySingleResponse": reports_AccountIndustrySingleResponse,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
       },
     },
     request: (args) => ({
@@ -129,21 +139,31 @@ export const tools: readonly Tool[] = [
   {
     name: "reporting_industry_update",
     title: "Update an account industry",
-    description: "Updates the industry classification for an account.",
+    description: "Updates the industry classification for an account.\n\nPATCH /accounts/{account_id}/reporting/industry",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare public account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/reports_PatchAccountIndustryBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare public account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
         "reports_PatchAccountIndustryBody": reports_PatchAccountIndustryBody,
       },
@@ -178,9 +198,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "reports_AccountIndustryPatchResponse": reports_AccountIndustryPatchResponse_output,
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
+        "reports_AccountIndustryPatchResponse": reports_AccountIndustryPatchResponse,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
       },
     },
     annotations: {
@@ -240,10 +260,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "reports_AccountIndustryErrorResponse": reports_AccountIndustryErrorResponse_output,
-        "reports_AccountIndustryPatchResponse": reports_AccountIndustryPatchResponse_output,
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
+        "reports_AccountIndustryErrorResponse": reports_AccountIndustryErrorResponse,
+        "reports_AccountIndustryPatchResponse": reports_AccountIndustryPatchResponse,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/reporting/outputs.ts b/src/generated/forge-mcp/reporting/outputs.ts
index 4853ed151..c96ebb773 100644
--- a/src/generated/forge-mcp/reporting/outputs.ts
+++ b/src/generated/forge-mcp/reporting/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `reports_Error` in responses.
  */
-export const reports_Error_output: JsonSchema = {
+export const reports_Error: JsonSchema = {
   "properties": {
     "code": {
       "type": "number"
@@ -25,7 +25,7 @@ export const reports_Error_output: JsonSchema = {
 /**
  * The schema of `reports_Message` in responses.
  */
-export const reports_Message_output: JsonSchema = {
+export const reports_Message: JsonSchema = {
   "properties": {
     "code": {
       "type": "number"
@@ -44,7 +44,7 @@ export const reports_Message_output: JsonSchema = {
 /**
  * The schema of `reports_PolicyErrorResponse` in responses.
  */
-export const reports_PolicyErrorResponse_output: JsonSchema = {
+export const reports_PolicyErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/reporting/policies/outputs.ts b/src/generated/forge-mcp/reporting/policies/outputs.ts
index b96b5cc60..d8acf63a8 100644
--- a/src/generated/forge-mcp/reporting/policies/outputs.ts
+++ b/src/generated/forge-mcp/reporting/policies/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `reports_PoliciesListResponse` in responses.
  */
-export const reports_PoliciesListResponse_output: JsonSchema = {
+export const reports_PoliciesListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -101,7 +101,7 @@ export const reports_PoliciesListResponse_output: JsonSchema = {
 /**
  * The schema of `reports_PolicySingleResponse` in responses.
  */
-export const reports_PolicySingleResponse_output: JsonSchema = {
+export const reports_PolicySingleResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/reporting/policies/tools.ts b/src/generated/forge-mcp/reporting/policies/tools.ts
index 6ee20daed..a9782da10 100644
--- a/src/generated/forge-mcp/reporting/policies/tools.ts
+++ b/src/generated/forge-mcp/reporting/policies/tools.ts
@@ -3,13 +3,13 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  reports_Error_output,
-  reports_Message_output,
-  reports_PolicyErrorResponse_output,
+  reports_Error,
+  reports_Message,
+  reports_PolicyErrorResponse,
 } from "../outputs.js";
 import {
-  reports_PoliciesListResponse_output,
-  reports_PolicySingleResponse_output,
+  reports_PoliciesListResponse,
+  reports_PolicySingleResponse,
 } from "./outputs.js";
 
 /**
@@ -19,31 +19,41 @@ export const tools: readonly Tool[] = [
   {
     name: "reporting_policies_get",
     title: "Get a reporting policy",
-    description: "Gets a reporting policy by identifier.",
+    description: "Gets a reporting policy by identifier.\n\nGET /accounts/{account_id}/reporting/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare public account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "policy_id": {
-          "description": "Unique identifier for the policy (UUID format)",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare public account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Unique identifier for the policy (UUID format)",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/reports_PolicySingleResponse",
       $defs: {
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
-        "reports_PolicySingleResponse": reports_PolicySingleResponse_output,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
+        "reports_PolicySingleResponse": reports_PolicySingleResponse,
       },
     },
     annotations: {
@@ -70,10 +80,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
-        "reports_PolicyErrorResponse": reports_PolicyErrorResponse_output,
-        "reports_PolicySingleResponse": reports_PolicySingleResponse_output,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
+        "reports_PolicyErrorResponse": reports_PolicyErrorResponse,
+        "reports_PolicySingleResponse": reports_PolicySingleResponse,
       },
     },
     request: (args) => ({
@@ -83,25 +93,35 @@ export const tools: readonly Tool[] = [
   {
     name: "reporting_policies_list",
     title: "List reporting policies",
-    description: "Lists all reporting policies for an account.",
+    description: "Lists all reporting policies for an account.\n\nGET /accounts/{account_id}/reporting/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare public account ID (32-character hexadecimal string)",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare public account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/reports_PoliciesListResponse",
       $defs: {
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
-        "reports_PoliciesListResponse": reports_PoliciesListResponse_output,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
+        "reports_PoliciesListResponse": reports_PoliciesListResponse,
       },
     },
     annotations: {
@@ -128,10 +148,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
-        "reports_PoliciesListResponse": reports_PoliciesListResponse_output,
-        "reports_PolicyErrorResponse": reports_PolicyErrorResponse_output,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
+        "reports_PoliciesListResponse": reports_PoliciesListResponse,
+        "reports_PolicyErrorResponse": reports_PolicyErrorResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/reporting/reports/outputs.ts b/src/generated/forge-mcp/reporting/reports/outputs.ts
index 1a26e8bbe..a7a4716a3 100644
--- a/src/generated/forge-mcp/reporting/reports/outputs.ts
+++ b/src/generated/forge-mcp/reporting/reports/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `reports_ApplicationSecurityReportV1` in responses.
  */
-export const reports_ApplicationSecurityReportV1_output: JsonSchema = {
+export const reports_ApplicationSecurityReportV1: JsonSchema = {
   "properties": {
     "input": {
       "properties": {
@@ -61,7 +61,7 @@ export const reports_ApplicationSecurityReportV1_output: JsonSchema = {
 /**
  * The schema of `reports_ApplicationSecurityReportV1Data` in responses.
  */
-export const reports_ApplicationSecurityReportV1Data_output: JsonSchema = {
+export const reports_ApplicationSecurityReportV1Data: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
@@ -391,7 +391,7 @@ export const reports_ApplicationSecurityReportV1Data_output: JsonSchema = {
 /**
  * The schema of `reports_GetReportResponse` in responses.
  */
-export const reports_GetReportResponse_output: JsonSchema = {
+export const reports_GetReportResponse: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -554,7 +554,7 @@ export const reports_GetReportResponse_output: JsonSchema = {
 /**
  * The schema of `reports_ReportSingleResponse` in responses.
  */
-export const reports_ReportSingleResponse_output: JsonSchema = {
+export const reports_ReportSingleResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -588,7 +588,7 @@ export const reports_ReportSingleResponse_output: JsonSchema = {
 /**
  * The schema of `reports_ReportsListResponse` in responses.
  */
-export const reports_ReportsListResponse_output: JsonSchema = {
+export const reports_ReportsListResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/reporting/reports/tools.ts b/src/generated/forge-mcp/reporting/reports/tools.ts
index 69273aaa4..178366877 100644
--- a/src/generated/forge-mcp/reporting/reports/tools.ts
+++ b/src/generated/forge-mcp/reporting/reports/tools.ts
@@ -3,16 +3,16 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  reports_Error_output,
-  reports_Message_output,
-  reports_PolicyErrorResponse_output,
+  reports_Error,
+  reports_Message,
+  reports_PolicyErrorResponse,
 } from "../outputs.js";
 import {
-  reports_ApplicationSecurityReportV1Data_output,
-  reports_ApplicationSecurityReportV1_output,
-  reports_GetReportResponse_output,
-  reports_ReportSingleResponse_output,
-  reports_ReportsListResponse_output,
+  reports_ApplicationSecurityReportV1,
+  reports_ApplicationSecurityReportV1Data,
+  reports_GetReportResponse,
+  reports_ReportSingleResponse,
+  reports_ReportsListResponse,
 } from "./outputs.js";
 
 /**
@@ -22,34 +22,44 @@ export const tools: readonly Tool[] = [
   {
     name: "reporting_reports_get",
     title: "Get a generated report",
-    description: "Gets a generated report by identifier.",
+    description: "Gets a generated report by identifier.\n\nGET /accounts/{account_id}/reporting/reports/{report_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare public account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "report_id": {
-          "description": "Unique report identifier",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare public account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "report_id": {
+              "description": "Unique report identifier",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "report_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "report_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/reports_ReportSingleResponse",
       $defs: {
-        "reports_ApplicationSecurityReportV1": reports_ApplicationSecurityReportV1_output,
-        "reports_ApplicationSecurityReportV1Data": reports_ApplicationSecurityReportV1Data_output,
-        "reports_Error": reports_Error_output,
-        "reports_GetReportResponse": reports_GetReportResponse_output,
-        "reports_Message": reports_Message_output,
-        "reports_ReportSingleResponse": reports_ReportSingleResponse_output,
+        "reports_ApplicationSecurityReportV1": reports_ApplicationSecurityReportV1,
+        "reports_ApplicationSecurityReportV1Data": reports_ApplicationSecurityReportV1Data,
+        "reports_Error": reports_Error,
+        "reports_GetReportResponse": reports_GetReportResponse,
+        "reports_Message": reports_Message,
+        "reports_ReportSingleResponse": reports_ReportSingleResponse,
       },
     },
     annotations: {
@@ -76,13 +86,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "reports_ApplicationSecurityReportV1": reports_ApplicationSecurityReportV1_output,
-        "reports_ApplicationSecurityReportV1Data": reports_ApplicationSecurityReportV1Data_output,
-        "reports_Error": reports_Error_output,
-        "reports_GetReportResponse": reports_GetReportResponse_output,
-        "reports_Message": reports_Message_output,
-        "reports_PolicyErrorResponse": reports_PolicyErrorResponse_output,
-        "reports_ReportSingleResponse": reports_ReportSingleResponse_output,
+        "reports_ApplicationSecurityReportV1": reports_ApplicationSecurityReportV1,
+        "reports_ApplicationSecurityReportV1Data": reports_ApplicationSecurityReportV1Data,
+        "reports_Error": reports_Error,
+        "reports_GetReportResponse": reports_GetReportResponse,
+        "reports_Message": reports_Message,
+        "reports_PolicyErrorResponse": reports_PolicyErrorResponse,
+        "reports_ReportSingleResponse": reports_ReportSingleResponse,
       },
     },
     request: (args) => ({
@@ -92,25 +102,35 @@ export const tools: readonly Tool[] = [
   {
     name: "reporting_reports_list",
     title: "List generated reports",
-    description: "Lists all generated reports for an account.",
+    description: "Lists all generated reports for an account.\n\nGET /accounts/{account_id}/reporting/reports",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare public account ID (32-character hexadecimal string)",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare public account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/reports_ReportsListResponse",
       $defs: {
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
-        "reports_ReportsListResponse": reports_ReportsListResponse_output,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
+        "reports_ReportsListResponse": reports_ReportsListResponse,
       },
     },
     annotations: {
@@ -137,10 +157,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "reports_Error": reports_Error_output,
-        "reports_Message": reports_Message_output,
-        "reports_PolicyErrorResponse": reports_PolicyErrorResponse_output,
-        "reports_ReportsListResponse": reports_ReportsListResponse_output,
+        "reports_Error": reports_Error,
+        "reports_Message": reports_Message,
+        "reports_PolicyErrorResponse": reports_PolicyErrorResponse,
+        "reports_ReportsListResponse": reports_ReportsListResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/requestTracers/traces/outputs.ts b/src/generated/forge-mcp/requestTracers/traces/outputs.ts
index 7e9ac3646..946308d03 100644
--- a/src/generated/forge-mcp/requestTracers/traces/outputs.ts
+++ b/src/generated/forge-mcp/requestTracers/traces/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `request-tracer_api-response-common` in responses.
  */
-export const request_tracer_api_response_common_output: JsonSchema = {
+export const request$$tracer_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/request-tracer_messages"
@@ -32,7 +32,7 @@ export const request_tracer_api_response_common_output: JsonSchema = {
 /**
  * The schema of `request-tracer_api-response-common-failure` in responses.
  */
-export const request_tracer_api_response_common_failure_output: JsonSchema = {
+export const request$$tracer_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/request-tracer_messages"
@@ -62,7 +62,7 @@ export const request_tracer_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `request-tracer_messages` in responses.
  */
-export const request_tracer_messages_output: JsonSchema = {
+export const request$$tracer_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -84,7 +84,7 @@ export const request_tracer_messages_output: JsonSchema = {
 /**
  * The schema of `request-tracer_trace` in responses.
  */
-export const request_tracer_trace_output: JsonSchema = {
+export const request$$tracer_trace: JsonSchema = {
   "items": {
     "properties": {
       "action": {
diff --git a/src/generated/forge-mcp/requestTracers/traces/schemas.ts b/src/generated/forge-mcp/requestTracers/traces/schemas.ts
deleted file mode 100644
index 8559f3cef..000000000
--- a/src/generated/forge-mcp/requestTracers/traces/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `request-tracer_account_identifier`.
- */
-export const request_tracer_account_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/requestTracers/traces/tools.ts b/src/generated/forge-mcp/requestTracers/traces/tools.ts
index d11a6e50b..251010fd1 100644
--- a/src/generated/forge-mcp/requestTracers/traces/tools.ts
+++ b/src/generated/forge-mcp/requestTracers/traces/tools.ts
@@ -3,28 +3,23 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  request_tracer_api_response_common_failure_output,
-  request_tracer_api_response_common_output,
-  request_tracer_messages_output,
-  request_tracer_trace_output,
+  request$$tracer_api$$response$$common,
+  request$$tracer_api$$response$$common$$failure,
+  request$$tracer_messages,
+  request$$tracer_trace,
 } from "./outputs.js";
-import { request_tracer_account_identifier } from "./schemas.js";
 
 /**
- * The tools of `request_tracers.traces`.
+ * The tools of `requestTracers.traces`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "request_tracers_traces_create",
+    name: "requestTracers_traces_create",
     title: "Request Trace",
-    description: "Traces a simulated HTTP request through Cloudflare's edge to analyze how rules, settings, and configurations would process the request. Useful for debugging firewall rules, page rules, and other request transformations without sending actual traffic. Supports custom headers, cookies, body content, and geolocation context.",
+    description: "Traces a simulated HTTP request through Cloudflare's edge to analyze how rules, settings, and configurations would process the request. Useful for debugging firewall rules, page rules, and other request transformations without sending actual traffic. Supports custom headers, cookies, body content, and geolocation context.\n\nPOST /accounts/{account_id}/request-tracer/trace",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/request-tracer_account_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "body": {
@@ -134,15 +129,26 @@ export const tools: readonly Tool[] = [
             "url"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "request-tracer_account_identifier": request_tracer_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -167,9 +173,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "request-tracer_api-response-common": request_tracer_api_response_common_output,
-        "request-tracer_messages": request_tracer_messages_output,
-        "request-tracer_trace": request_tracer_trace_output,
+        "request-tracer_api-response-common": request$$tracer_api$$response$$common,
+        "request-tracer_messages": request$$tracer_messages,
+        "request-tracer_trace": request$$tracer_trace,
       },
     },
     annotations: {
@@ -222,10 +228,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "request-tracer_api-response-common": request_tracer_api_response_common_output,
-        "request-tracer_api-response-common-failure": request_tracer_api_response_common_failure_output,
-        "request-tracer_messages": request_tracer_messages_output,
-        "request-tracer_trace": request_tracer_trace_output,
+        "request-tracer_api-response-common": request$$tracer_api$$response$$common,
+        "request-tracer_api-response-common-failure": request$$tracer_api$$response$$common$$failure,
+        "request-tracer_messages": request$$tracer_messages,
+        "request-tracer_trace": request$$tracer_trace,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/resourceSharing/excludedRecipients/outputs.ts b/src/generated/forge-mcp/resourceSharing/excludedRecipients/outputs.ts
index 38da2d88c..42b0d3dac 100644
--- a/src/generated/forge-mcp/resourceSharing/excludedRecipients/outputs.ts
+++ b/src/generated/forge-mcp/resourceSharing/excludedRecipients/outputs.ts
@@ -3,30 +3,25 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `resource-sharing_excluded_recipient_id` in responses.
- */
-export const resource_sharing_excluded_recipient_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `resource-sharing_share_excluded_recipient_object` in
  * responses.
  */
-export const resource_sharing_share_excluded_recipient_object_output: JsonSchema = {
+export const resource$$sharing_share_excluded_recipient_object: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/resource-sharing_account_id"
+      "type": "string"
     },
     "created": {
-      "$ref": "#/$defs/resource-sharing_created"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/resource-sharing_excluded_recipient_id"
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/resource-sharing_modified"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "required": [
@@ -42,7 +37,7 @@ export const resource_sharing_share_excluded_recipient_object_output: JsonSchema
  * The schema of `resource-sharing_share_excluded_recipient_response_collection`
  * in responses.
  */
-export const resource_sharing_share_excluded_recipient_response_collection_output: JsonSchema = {
+export const resource$$sharing_share_excluded_recipient_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-collection"
@@ -58,7 +53,7 @@ export const resource_sharing_share_excluded_recipient_response_collection_outpu
  * `resource-sharing_share_excluded_recipient_response_collection_result` in
  * responses.
  */
-export const resource_sharing_share_excluded_recipient_response_collection_result_output: JsonSchema = {
+export const resource$$sharing_share_excluded_recipient_response_collection_result: JsonSchema = {
   "properties": {
     "result": {
       "items": {
@@ -74,7 +69,7 @@ export const resource_sharing_share_excluded_recipient_response_collection_resul
  * The schema of `resource-sharing_share_excluded_recipient_response_single` in
  * responses.
  */
-export const resource_sharing_share_excluded_recipient_response_single_output: JsonSchema = {
+export const resource$$sharing_share_excluded_recipient_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-common"
@@ -90,7 +85,7 @@ export const resource_sharing_share_excluded_recipient_response_single_output: J
  * `resource-sharing_share_excluded_recipient_response_single_result` in
  * responses.
  */
-export const resource_sharing_share_excluded_recipient_response_single_result_output: JsonSchema = {
+export const resource$$sharing_share_excluded_recipient_response_single_result: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/resource-sharing_share_excluded_recipient_object"
diff --git a/src/generated/forge-mcp/resourceSharing/excludedRecipients/schemas.ts b/src/generated/forge-mcp/resourceSharing/excludedRecipients/schemas.ts
index 14a739d99..0a8087303 100644
--- a/src/generated/forge-mcp/resourceSharing/excludedRecipients/schemas.ts
+++ b/src/generated/forge-mcp/resourceSharing/excludedRecipients/schemas.ts
@@ -6,11 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `resource-sharing_create_share_excluded_recipient_request`.
  */
-export const resource_sharing_create_share_excluded_recipient_request: JsonSchema = {
+export const resource$$sharing_create_share_excluded_recipient_request: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/resource-sharing_account_id",
-      "description": "The account to exclude from the organization-targeted share."
+      "description": "The account to exclude from the organization-targeted share.",
+      "type": "string"
     }
   },
   "required": [
@@ -19,18 +19,10 @@ export const resource_sharing_create_share_excluded_recipient_request: JsonSchem
   "type": "object"
 };
 
-/**
- * The schema of `resource-sharing_excluded_recipient_id`.
- */
-export const resource_sharing_excluded_recipient_id: JsonSchema = {
-  "description": "Share Excluded Recipient identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `resource-sharing_update_share_excluded_recipients_request`.
  */
-export const resource_sharing_update_share_excluded_recipients_request: JsonSchema = {
+export const resource$$sharing_update_share_excluded_recipients_request: JsonSchema = {
   "items": {
     "$ref": "#/$defs/resource-sharing_create_share_excluded_recipient_request"
   },
diff --git a/src/generated/forge-mcp/resourceSharing/excludedRecipients/tools.ts b/src/generated/forge-mcp/resourceSharing/excludedRecipients/tools.ts
index a9fa17116..74fccc12f 100644
--- a/src/generated/forge-mcp/resourceSharing/excludedRecipients/tools.ts
+++ b/src/generated/forge-mcp/resourceSharing/excludedRecipients/tools.ts
@@ -1,84 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_sharing_account_id_output,
-  resource_sharing_api_response_collection_info_output,
-  resource_sharing_api_response_collection_output,
-  resource_sharing_api_response_common_failure_output,
-  resource_sharing_api_response_common_output,
-  resource_sharing_created_output,
-  resource_sharing_modified_output,
-  resource_sharing_result_info_output,
-  resource_sharing_v4error_output,
-  resource_sharing_v4errors_output,
+  resource$$sharing_api$$response$$collection,
+  resource$$sharing_api$$response$$collection$$info,
+  resource$$sharing_api$$response$$common,
+  resource$$sharing_api$$response$$common$$failure,
+  resource$$sharing_result_info,
+  resource$$sharing_v4error,
+  resource$$sharing_v4errors,
 } from "../../outputs.js";
 import {
-  resource_sharing_account_id,
-  resource_sharing_share_id,
-} from "../../schemas.js";
-import {
-  resource_sharing_excluded_recipient_id_output,
-  resource_sharing_share_excluded_recipient_object_output,
-  resource_sharing_share_excluded_recipient_response_collection_output,
-  resource_sharing_share_excluded_recipient_response_collection_result_output,
-  resource_sharing_share_excluded_recipient_response_single_output,
-  resource_sharing_share_excluded_recipient_response_single_result_output,
+  resource$$sharing_share_excluded_recipient_object,
+  resource$$sharing_share_excluded_recipient_response_collection,
+  resource$$sharing_share_excluded_recipient_response_collection_result,
+  resource$$sharing_share_excluded_recipient_response_single,
+  resource$$sharing_share_excluded_recipient_response_single_result,
 } from "./outputs.js";
 import {
-  resource_sharing_create_share_excluded_recipient_request,
-  resource_sharing_excluded_recipient_id,
-  resource_sharing_update_share_excluded_recipients_request,
+  resource$$sharing_create_share_excluded_recipient_request,
+  resource$$sharing_update_share_excluded_recipients_request,
 } from "./schemas.js";
 
 /**
- * The tools of `resource_sharing.excluded_recipients`.
+ * The tools of `resourceSharing.excludedRecipients`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "resource_sharing_excluded_recipients_create",
+    name: "resourceSharing_excludedRecipients_create",
     title: "Trigger an account exclusion from a share",
-    description: "Excludes a single account from an organization-targeted share. The share continues to target the entire organization, but the excluded account is skipped during reconciliation.",
+    description: "Excludes a single account from an organization-targeted share. The share continues to target the entire organization, but the excluded account is skipped during reconciliation.\n\nPOST /accounts/{account_id}/shares/{share_id}/excluded-recipients",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/resource-sharing_create_share_excluded_recipient_request"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_create_share_excluded_recipient_request": resource_sharing_create_share_excluded_recipient_request,
-        "resource-sharing_share_id": resource_sharing_share_id,
+        "resource-sharing_create_share_excluded_recipient_request": resource$$sharing_create_share_excluded_recipient_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_excluded_recipient_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_share_excluded_recipient_object": resource_sharing_share_excluded_recipient_object_output,
-        "resource-sharing_share_excluded_recipient_response_single": resource_sharing_share_excluded_recipient_response_single_output,
-        "resource-sharing_share_excluded_recipient_response_single_result": resource_sharing_share_excluded_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_share_excluded_recipient_object": resource$$sharing_share_excluded_recipient_object,
+        "resource-sharing_share_excluded_recipient_response_single": resource$$sharing_share_excluded_recipient_response_single,
+        "resource-sharing_share_excluded_recipient_response_single_result": resource$$sharing_share_excluded_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -112,17 +107,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_share_excluded_recipient_object": resource_sharing_share_excluded_recipient_object_output,
-        "resource-sharing_share_excluded_recipient_response_single": resource_sharing_share_excluded_recipient_response_single_output,
-        "resource-sharing_share_excluded_recipient_response_single_result": resource_sharing_share_excluded_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_share_excluded_recipient_object": resource$$sharing_share_excluded_recipient_object,
+        "resource-sharing_share_excluded_recipient_response_single": resource$$sharing_share_excluded_recipient_response_single,
+        "resource-sharing_share_excluded_recipient_response_single_result": resource$$sharing_share_excluded_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -131,49 +122,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_excluded_recipients_delete",
+    name: "resourceSharing_excludedRecipients_delete",
     title: "Trigger an account un-exclusion from a share",
-    description: "Removes a single account from a share's excluded-recipient list. The account becomes eligible to receive the share again on the next reconciliation cycle.",
+    description: "Removes a single account from a share's excluded-recipient list. The account becomes eligible to receive the share again on the next reconciliation cycle.\n\nDELETE /accounts/{account_id}/shares/{share_id}/excluded-recipients/{excluded_recipient_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "excluded_recipient_id": {
-          "$ref": "#/$defs/resource-sharing_excluded_recipient_id",
-          "description": "Share Excluded Recipient identifier tag."
-        },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "excluded_recipient_id": {
+              "description": "Share Excluded Recipient identifier tag.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id",
+            "excluded_recipient_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
-        "excluded_recipient_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_excluded_recipient_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_share_excluded_recipient_object": resource_sharing_share_excluded_recipient_object_output,
-        "resource-sharing_share_excluded_recipient_response_single": resource_sharing_share_excluded_recipient_response_single_output,
-        "resource-sharing_share_excluded_recipient_response_single_result": resource_sharing_share_excluded_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_share_excluded_recipient_object": resource$$sharing_share_excluded_recipient_object,
+        "resource-sharing_share_excluded_recipient_response_single": resource$$sharing_share_excluded_recipient_response_single,
+        "resource-sharing_share_excluded_recipient_response_single_result": resource$$sharing_share_excluded_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -207,17 +199,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_share_excluded_recipient_object": resource_sharing_share_excluded_recipient_object_output,
-        "resource-sharing_share_excluded_recipient_response_single": resource_sharing_share_excluded_recipient_response_single_output,
-        "resource-sharing_share_excluded_recipient_response_single_result": resource_sharing_share_excluded_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_share_excluded_recipient_object": resource$$sharing_share_excluded_recipient_object,
+        "resource-sharing_share_excluded_recipient_response_single": resource$$sharing_share_excluded_recipient_response_single,
+        "resource-sharing_share_excluded_recipient_response_single_result": resource$$sharing_share_excluded_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -225,49 +213,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_excluded_recipients_get",
+    name: "resourceSharing_excludedRecipients_get",
     title: "Get share excluded recipient by ID",
-    description: "Gets a single excluded recipient of a share by its identifier tag.",
+    description: "Gets a single excluded recipient of a share by its identifier tag.\n\nGET /accounts/{account_id}/shares/{share_id}/excluded-recipients/{excluded_recipient_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "excluded_recipient_id": {
-          "$ref": "#/$defs/resource-sharing_excluded_recipient_id",
-          "description": "Share Excluded Recipient identifier tag."
-        },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "excluded_recipient_id": {
+              "description": "Share Excluded Recipient identifier tag.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id",
+            "excluded_recipient_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
-        "excluded_recipient_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_excluded_recipient_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_share_excluded_recipient_object": resource_sharing_share_excluded_recipient_object_output,
-        "resource-sharing_share_excluded_recipient_response_single": resource_sharing_share_excluded_recipient_response_single_output,
-        "resource-sharing_share_excluded_recipient_response_single_result": resource_sharing_share_excluded_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_share_excluded_recipient_object": resource$$sharing_share_excluded_recipient_object,
+        "resource-sharing_share_excluded_recipient_response_single": resource$$sharing_share_excluded_recipient_response_single,
+        "resource-sharing_share_excluded_recipient_response_single_result": resource$$sharing_share_excluded_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -301,17 +290,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_share_excluded_recipient_object": resource_sharing_share_excluded_recipient_object_output,
-        "resource-sharing_share_excluded_recipient_response_single": resource_sharing_share_excluded_recipient_response_single_output,
-        "resource-sharing_share_excluded_recipient_response_single_result": resource_sharing_share_excluded_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_share_excluded_recipient_object": resource$$sharing_share_excluded_recipient_object,
+        "resource-sharing_share_excluded_recipient_response_single": resource$$sharing_share_excluded_recipient_response_single,
+        "resource-sharing_share_excluded_recipient_response_single_result": resource$$sharing_share_excluded_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -319,56 +304,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_excluded_recipients_list",
+    name: "resourceSharing_excludedRecipients_list",
     title: "List share excluded recipients by share ID",
-    description: "Lists the accounts excluded from an organization-targeted share. Only valid for shares with `target_type=organization`.",
+    description: "Lists the accounts excluded from an organization-targeted share. Only valid for shares with `target_type=organization`.\n\nGET /accounts/{account_id}/shares/{share_id}/excluded-recipients",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_excluded_recipient_response_collection",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_excluded_recipient_object": resource_sharing_share_excluded_recipient_object_output,
-        "resource-sharing_share_excluded_recipient_response_collection": resource_sharing_share_excluded_recipient_response_collection_output,
-        "resource-sharing_share_excluded_recipient_response_collection_result": resource_sharing_share_excluded_recipient_response_collection_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_excluded_recipient_object": resource$$sharing_share_excluded_recipient_object,
+        "resource-sharing_share_excluded_recipient_response_collection": resource$$sharing_share_excluded_recipient_response_collection,
+        "resource-sharing_share_excluded_recipient_response_collection_result": resource$$sharing_share_excluded_recipient_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -402,59 +395,63 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_excluded_recipient_id": resource_sharing_excluded_recipient_id_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_excluded_recipient_object": resource_sharing_share_excluded_recipient_object_output,
-        "resource-sharing_share_excluded_recipient_response_collection": resource_sharing_share_excluded_recipient_response_collection_output,
-        "resource-sharing_share_excluded_recipient_response_collection_result": resource_sharing_share_excluded_recipient_response_collection_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_excluded_recipient_object": resource$$sharing_share_excluded_recipient_object,
+        "resource-sharing_share_excluded_recipient_response_collection": resource$$sharing_share_excluded_recipient_response_collection,
+        "resource-sharing_share_excluded_recipient_response_collection_result": resource$$sharing_share_excluded_recipient_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/shares/${pathParam(args, "share_id")}/excluded-recipients`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "resource_sharing_excluded_recipients_update",
+    name: "resourceSharing_excludedRecipients_update",
     title: "Trigger excluded-account reconciliation on a share",
-    description: "Reconciles a share's excluded recipients to match the given list. Only valid for shares with `target_type=organization`.",
+    description: "Reconciles a share's excluded recipients to match the given list. Only valid for shares with `target_type=organization`.\n\nPUT /accounts/{account_id}/shares/{share_id}/excluded-recipients",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/resource-sharing_update_share_excluded_recipients_request"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_create_share_excluded_recipient_request": resource_sharing_create_share_excluded_recipient_request,
-        "resource-sharing_share_id": resource_sharing_share_id,
-        "resource-sharing_update_share_excluded_recipients_request": resource_sharing_update_share_excluded_recipients_request,
+        "resource-sharing_create_share_excluded_recipient_request": resource$$sharing_create_share_excluded_recipient_request,
+        "resource-sharing_update_share_excluded_recipients_request": resource$$sharing_update_share_excluded_recipients_request,
       },
     },
     annotations: {
@@ -485,9 +482,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/resourceSharing/outputs.ts b/src/generated/forge-mcp/resourceSharing/outputs.ts
index 7e54bc2cc..042e54cc5 100644
--- a/src/generated/forge-mcp/resourceSharing/outputs.ts
+++ b/src/generated/forge-mcp/resourceSharing/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `resource-sharing_share_response_single` in responses.
  */
-export const resource_sharing_share_response_single_output: JsonSchema = {
+export const resource$$sharing_share_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-common"
@@ -20,7 +20,7 @@ export const resource_sharing_share_response_single_output: JsonSchema = {
 /**
  * The schema of `resource-sharing_share_response_single_result` in responses.
  */
-export const resource_sharing_share_response_single_result_output: JsonSchema = {
+export const resource$$sharing_share_response_single_result: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/resource-sharing_share_object"
diff --git a/src/generated/forge-mcp/resourceSharing/recipients/outputs.ts b/src/generated/forge-mcp/resourceSharing/recipients/outputs.ts
index 8355a4910..cf5f41892 100644
--- a/src/generated/forge-mcp/resourceSharing/recipients/outputs.ts
+++ b/src/generated/forge-mcp/resourceSharing/recipients/outputs.ts
@@ -3,60 +3,33 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `resource-sharing_recipient_association_status` in responses.
- */
-export const resource_sharing_recipient_association_status_output: JsonSchema = {
-  "enum": [
-    "associating",
-    "associated",
-    "disassociating",
-    "disassociated"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_recipient_id` in responses.
- */
-export const resource_sharing_recipient_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_recipient_resource_error` in responses.
- */
-export const resource_sharing_recipient_resource_error_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_recipient_resource_error_terminal` in
- * responses.
- */
-export const resource_sharing_recipient_resource_error_terminal_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `resource-sharing_share_recipient_object` in responses.
  */
-export const resource_sharing_share_recipient_object_output: JsonSchema = {
+export const resource$$sharing_share_recipient_object: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/resource-sharing_account_id"
+      "type": "string"
     },
     "association_status": {
-      "$ref": "#/$defs/resource-sharing_recipient_association_status"
+      "enum": [
+        "associating",
+        "associated",
+        "disassociating",
+        "disassociated"
+      ],
+      "type": "string"
     },
     "created": {
-      "$ref": "#/$defs/resource-sharing_created"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/resource-sharing_recipient_id"
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/resource-sharing_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "resources": {
       "items": {
@@ -79,19 +52,19 @@ export const resource_sharing_share_recipient_object_output: JsonSchema = {
  * The schema of `resource-sharing_share_recipient_resource_object` in
  * responses.
  */
-export const resource_sharing_share_recipient_resource_object_output: JsonSchema = {
+export const resource$$sharing_share_recipient_resource_object: JsonSchema = {
   "properties": {
     "error": {
-      "$ref": "#/$defs/resource-sharing_recipient_resource_error"
+      "type": "string"
     },
     "resource_id": {
-      "$ref": "#/$defs/resource-sharing_resource_resource_id"
+      "type": "string"
     },
     "resource_version": {
-      "$ref": "#/$defs/resource-sharing_resource_version"
+      "type": "integer"
     },
     "terminal": {
-      "$ref": "#/$defs/resource-sharing_recipient_resource_error_terminal"
+      "type": "boolean"
     }
   },
   "required": [
@@ -107,7 +80,7 @@ export const resource_sharing_share_recipient_resource_object_output: JsonSchema
  * The schema of `resource-sharing_share_recipient_response_collection` in
  * responses.
  */
-export const resource_sharing_share_recipient_response_collection_output: JsonSchema = {
+export const resource$$sharing_share_recipient_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-collection"
@@ -122,7 +95,7 @@ export const resource_sharing_share_recipient_response_collection_output: JsonSc
  * The schema of `resource-sharing_share_recipient_response_collection_result`
  * in responses.
  */
-export const resource_sharing_share_recipient_response_collection_result_output: JsonSchema = {
+export const resource$$sharing_share_recipient_response_collection_result: JsonSchema = {
   "properties": {
     "result": {
       "items": {
@@ -138,7 +111,7 @@ export const resource_sharing_share_recipient_response_collection_result_output:
  * The schema of `resource-sharing_share_recipient_response_single` in
  * responses.
  */
-export const resource_sharing_share_recipient_response_single_output: JsonSchema = {
+export const resource$$sharing_share_recipient_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-common"
@@ -153,7 +126,7 @@ export const resource_sharing_share_recipient_response_single_output: JsonSchema
  * The schema of `resource-sharing_share_recipient_response_single_result` in
  * responses.
  */
-export const resource_sharing_share_recipient_response_single_result_output: JsonSchema = {
+export const resource$$sharing_share_recipient_response_single_result: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/resource-sharing_share_recipient_object"
diff --git a/src/generated/forge-mcp/resourceSharing/recipients/schemas.ts b/src/generated/forge-mcp/resourceSharing/recipients/schemas.ts
index 40b8c8de8..b55ee22be 100644
--- a/src/generated/forge-mcp/resourceSharing/recipients/schemas.ts
+++ b/src/generated/forge-mcp/resourceSharing/recipients/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `resource-sharing_recipient_id`.
- */
-export const resource_sharing_recipient_id: JsonSchema = {
-  "description": "Share Recipient identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `resource-sharing_update_share_recipients_request`.
  */
-export const resource_sharing_update_share_recipients_request: JsonSchema = {
+export const resource$$sharing_update_share_recipients_request: JsonSchema = {
   "items": {
     "$ref": "#/$defs/resource-sharing_create_share_recipient_request"
   },
diff --git a/src/generated/forge-mcp/resourceSharing/recipients/tools.ts b/src/generated/forge-mcp/resourceSharing/recipients/tools.ts
index 1ce5def9b..3e9a56c6f 100644
--- a/src/generated/forge-mcp/resourceSharing/recipients/tools.ts
+++ b/src/generated/forge-mcp/resourceSharing/recipients/tools.ts
@@ -1,98 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_sharing_account_id_output,
-  resource_sharing_api_response_collection_info_output,
-  resource_sharing_api_response_collection_output,
-  resource_sharing_api_response_common_failure_output,
-  resource_sharing_api_response_common_output,
-  resource_sharing_created_output,
-  resource_sharing_modified_output,
-  resource_sharing_resource_resource_id_output,
-  resource_sharing_resource_version_output,
-  resource_sharing_result_info_output,
-  resource_sharing_v4error_output,
-  resource_sharing_v4errors_output,
+  resource$$sharing_api$$response$$collection,
+  resource$$sharing_api$$response$$collection$$info,
+  resource$$sharing_api$$response$$common,
+  resource$$sharing_api$$response$$common$$failure,
+  resource$$sharing_result_info,
+  resource$$sharing_v4error,
+  resource$$sharing_v4errors,
 } from "../../outputs.js";
+import { resource$$sharing_create_share_recipient_request } from "../schemas.js";
 import {
-  resource_sharing_account_id,
-  resource_sharing_organization_id,
-  resource_sharing_share_id,
-} from "../../schemas.js";
-import { resource_sharing_create_share_recipient_request } from "../schemas.js";
-import {
-  resource_sharing_recipient_association_status_output,
-  resource_sharing_recipient_id_output,
-  resource_sharing_recipient_resource_error_output,
-  resource_sharing_recipient_resource_error_terminal_output,
-  resource_sharing_share_recipient_object_output,
-  resource_sharing_share_recipient_resource_object_output,
-  resource_sharing_share_recipient_response_collection_output,
-  resource_sharing_share_recipient_response_collection_result_output,
-  resource_sharing_share_recipient_response_single_output,
-  resource_sharing_share_recipient_response_single_result_output,
+  resource$$sharing_share_recipient_object,
+  resource$$sharing_share_recipient_resource_object,
+  resource$$sharing_share_recipient_response_collection,
+  resource$$sharing_share_recipient_response_collection_result,
+  resource$$sharing_share_recipient_response_single,
+  resource$$sharing_share_recipient_response_single_result,
 } from "./outputs.js";
-import {
-  resource_sharing_recipient_id,
-  resource_sharing_update_share_recipients_request,
-} from "./schemas.js";
+import { resource$$sharing_update_share_recipients_request } from "./schemas.js";
 
 /**
- * The tools of `resource_sharing.recipients`.
+ * The tools of `resourceSharing.recipients`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "resource_sharing_recipients_create",
+    name: "resourceSharing_recipients_create",
     title: "Trigger a recipient addition to a share",
-    description: "Adds a single recipient to an account-targeted resource share, granting\nthem access to the shared resources. The recipient account must belong\nto the same organization as the share owner.\n\nTo replace the entire recipient list in one call, use\n`PUT /accounts/{account_id}/shares/{share_id}/recipients` instead.",
+    description: "Adds a single recipient to an account-targeted resource share, granting\nthem access to the shared resources. The recipient account must belong\nto the same organization as the share owner.\n\nTo replace the entire recipient list in one call, use\n`PUT /accounts/{account_id}/shares/{share_id}/recipients` instead.\n\nPOST /accounts/{account_id}/shares/{share_id}/recipients",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/resource-sharing_create_share_recipient_request"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_create_share_recipient_request": resource_sharing_create_share_recipient_request,
-        "resource-sharing_organization_id": resource_sharing_organization_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
+        "resource-sharing_create_share_recipient_request": resource$$sharing_create_share_recipient_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_recipient_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_recipient_association_status": resource_sharing_recipient_association_status_output,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id_output,
-        "resource-sharing_recipient_resource_error": resource_sharing_recipient_resource_error_output,
-        "resource-sharing_recipient_resource_error_terminal": resource_sharing_recipient_resource_error_terminal_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_recipient_object": resource_sharing_share_recipient_object_output,
-        "resource-sharing_share_recipient_resource_object": resource_sharing_share_recipient_resource_object_output,
-        "resource-sharing_share_recipient_response_single": resource_sharing_share_recipient_response_single_output,
-        "resource-sharing_share_recipient_response_single_result": resource_sharing_share_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_share_recipient_object": resource$$sharing_share_recipient_object,
+        "resource-sharing_share_recipient_resource_object": resource$$sharing_share_recipient_resource_object,
+        "resource-sharing_share_recipient_response_single": resource$$sharing_share_recipient_response_single,
+        "resource-sharing_share_recipient_response_single_result": resource$$sharing_share_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -126,23 +107,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_recipient_association_status": resource_sharing_recipient_association_status_output,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id_output,
-        "resource-sharing_recipient_resource_error": resource_sharing_recipient_resource_error_output,
-        "resource-sharing_recipient_resource_error_terminal": resource_sharing_recipient_resource_error_terminal_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_recipient_object": resource_sharing_share_recipient_object_output,
-        "resource-sharing_share_recipient_resource_object": resource_sharing_share_recipient_resource_object_output,
-        "resource-sharing_share_recipient_response_single": resource_sharing_share_recipient_response_single_output,
-        "resource-sharing_share_recipient_response_single_result": resource_sharing_share_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_share_recipient_object": resource$$sharing_share_recipient_object,
+        "resource-sharing_share_recipient_resource_object": resource$$sharing_share_recipient_resource_object,
+        "resource-sharing_share_recipient_response_single": resource$$sharing_share_recipient_response_single,
+        "resource-sharing_share_recipient_response_single_result": resource$$sharing_share_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -151,55 +123,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_recipients_delete",
+    name: "resourceSharing_recipients_delete",
     title: "Trigger a recipient removal from a share",
-    description: "Performs a **soft delete**: sets the recipient's\n`desired_association_status` to `disassociated`, which signals the\nbackground reconciliation workflow (Temporal) to remove the shared\nresources from the recipient account. The recipient record remains in\nthe database for audit purposes and is still returned by\n`GET /accounts/{account_id}/shares/{share_id}/recipients` with its\nupdated status.\n\nResource access is not fully removed until the workflow completes and\n`current_association_status` transitions to `disassociated`. The\nrecipient record itself is never physically deleted.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Performs a **soft delete**: sets the recipient's\n`desired_association_status` to `disassociated`, which signals the\nbackground reconciliation workflow (Temporal) to remove the shared\nresources from the recipient account. The recipient record remains in\nthe database for audit purposes and is still returned by\n`GET /accounts/{account_id}/shares/{share_id}/recipients` with its\nupdated status.\n\nResource access is not fully removed until the workflow completes and\n`current_association_status` transitions to `disassociated`. The\nrecipient record itself is never physically deleted.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "recipient_id": {
-          "$ref": "#/$defs/resource-sharing_recipient_id",
-          "description": "Share Recipient identifier tag."
-        },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "recipient_id": {
+              "description": "Share Recipient identifier tag.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id",
+            "recipient_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
-        "recipient_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_recipient_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_recipient_association_status": resource_sharing_recipient_association_status_output,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id_output,
-        "resource-sharing_recipient_resource_error": resource_sharing_recipient_resource_error_output,
-        "resource-sharing_recipient_resource_error_terminal": resource_sharing_recipient_resource_error_terminal_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_recipient_object": resource_sharing_share_recipient_object_output,
-        "resource-sharing_share_recipient_resource_object": resource_sharing_share_recipient_resource_object_output,
-        "resource-sharing_share_recipient_response_single": resource_sharing_share_recipient_response_single_output,
-        "resource-sharing_share_recipient_response_single_result": resource_sharing_share_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_share_recipient_object": resource$$sharing_share_recipient_object,
+        "resource-sharing_share_recipient_resource_object": resource$$sharing_share_recipient_resource_object,
+        "resource-sharing_share_recipient_response_single": resource$$sharing_share_recipient_response_single,
+        "resource-sharing_share_recipient_response_single_result": resource$$sharing_share_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -233,23 +201,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_recipient_association_status": resource_sharing_recipient_association_status_output,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id_output,
-        "resource-sharing_recipient_resource_error": resource_sharing_recipient_resource_error_output,
-        "resource-sharing_recipient_resource_error_terminal": resource_sharing_recipient_resource_error_terminal_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_recipient_object": resource_sharing_share_recipient_object_output,
-        "resource-sharing_share_recipient_resource_object": resource_sharing_share_recipient_resource_object_output,
-        "resource-sharing_share_recipient_response_single": resource_sharing_share_recipient_response_single_output,
-        "resource-sharing_share_recipient_response_single_result": resource_sharing_share_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_share_recipient_object": resource$$sharing_share_recipient_object,
+        "resource-sharing_share_recipient_resource_object": resource$$sharing_share_recipient_resource_object,
+        "resource-sharing_share_recipient_response_single": resource$$sharing_share_recipient_response_single,
+        "resource-sharing_share_recipient_response_single_result": resource$$sharing_share_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -257,59 +216,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_recipients_get",
+    name: "resourceSharing_recipients_get",
     title: "Get share recipient by ID",
-    description: "Get share recipient by ID.",
+    description: "Get share recipient by ID.\n\nGET /accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "include_resources": {
-          "description": "Include resources in the response.",
-          "type": "boolean"
-        },
-        "recipient_id": {
-          "$ref": "#/$defs/resource-sharing_recipient_id",
-          "description": "Share Recipient identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "recipient_id": {
+              "description": "Share Recipient identifier tag.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id",
+            "recipient_id"
+          ],
+          "type": "object"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_resources": {
+              "description": "Include resources in the response.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
-        "recipient_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_recipient_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_recipient_association_status": resource_sharing_recipient_association_status_output,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id_output,
-        "resource-sharing_recipient_resource_error": resource_sharing_recipient_resource_error_output,
-        "resource-sharing_recipient_resource_error_terminal": resource_sharing_recipient_resource_error_terminal_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_recipient_object": resource_sharing_share_recipient_object_output,
-        "resource-sharing_share_recipient_resource_object": resource_sharing_share_recipient_resource_object_output,
-        "resource-sharing_share_recipient_response_single": resource_sharing_share_recipient_response_single_output,
-        "resource-sharing_share_recipient_response_single_result": resource_sharing_share_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_share_recipient_object": resource$$sharing_share_recipient_object,
+        "resource-sharing_share_recipient_resource_object": resource$$sharing_share_recipient_resource_object,
+        "resource-sharing_share_recipient_response_single": resource$$sharing_share_recipient_response_single,
+        "resource-sharing_share_recipient_response_single_result": resource$$sharing_share_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -343,93 +304,87 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_recipient_association_status": resource_sharing_recipient_association_status_output,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id_output,
-        "resource-sharing_recipient_resource_error": resource_sharing_recipient_resource_error_output,
-        "resource-sharing_recipient_resource_error_terminal": resource_sharing_recipient_resource_error_terminal_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_recipient_object": resource_sharing_share_recipient_object_output,
-        "resource-sharing_share_recipient_resource_object": resource_sharing_share_recipient_resource_object_output,
-        "resource-sharing_share_recipient_response_single": resource_sharing_share_recipient_response_single_output,
-        "resource-sharing_share_recipient_response_single_result": resource_sharing_share_recipient_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_share_recipient_object": resource$$sharing_share_recipient_object,
+        "resource-sharing_share_recipient_resource_object": resource$$sharing_share_recipient_resource_object,
+        "resource-sharing_share_recipient_response_single": resource$$sharing_share_recipient_response_single,
+        "resource-sharing_share_recipient_response_single_result": resource$$sharing_share_recipient_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/shares/${pathParam(args, "share_id")}/recipients/${pathParam(args, "recipient_id")}`,
       query: [
-        ["include_resources", args["include_resources"], true],
+        ["include_resources", param(args, "query", "include_resources"), true],
       ],
     }),
   },
   {
-    name: "resource_sharing_recipients_list",
+    name: "resourceSharing_recipients_list",
     title: "List share recipients by share ID",
-    description: "List share recipients by share ID. Returns **all** recipients\nregardless of their `association_status` (associating, associated,\ndisassociating, disassociated). Callers that want only \"active\"\nrecipients must filter client-side on the `association_status` field.",
+    description: "List share recipients by share ID. Returns **all** recipients\nregardless of their `association_status` (associating, associated,\ndisassociating, disassociated). Callers that want only \"active\"\nrecipients must filter client-side on the `association_status` field.\n\nGET /accounts/{account_id}/shares/{share_id}/recipients",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "include_resources": {
-          "description": "Include resources in the response.",
-          "type": "boolean"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
-          "type": "integer"
-        },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_resources": {
+              "description": "Include resources in the response.",
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_recipient_response_collection",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_recipient_association_status": resource_sharing_recipient_association_status_output,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id_output,
-        "resource-sharing_recipient_resource_error": resource_sharing_recipient_resource_error_output,
-        "resource-sharing_recipient_resource_error_terminal": resource_sharing_recipient_resource_error_terminal_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_recipient_object": resource_sharing_share_recipient_object_output,
-        "resource-sharing_share_recipient_resource_object": resource_sharing_share_recipient_resource_object_output,
-        "resource-sharing_share_recipient_response_collection": resource_sharing_share_recipient_response_collection_output,
-        "resource-sharing_share_recipient_response_collection_result": resource_sharing_share_recipient_response_collection_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_recipient_object": resource$$sharing_share_recipient_object,
+        "resource-sharing_share_recipient_resource_object": resource$$sharing_share_recipient_resource_object,
+        "resource-sharing_share_recipient_response_collection": resource$$sharing_share_recipient_response_collection,
+        "resource-sharing_share_recipient_response_collection_result": resource$$sharing_share_recipient_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -463,67 +418,65 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_recipient_association_status": resource_sharing_recipient_association_status_output,
-        "resource-sharing_recipient_id": resource_sharing_recipient_id_output,
-        "resource-sharing_recipient_resource_error": resource_sharing_recipient_resource_error_output,
-        "resource-sharing_recipient_resource_error_terminal": resource_sharing_recipient_resource_error_terminal_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_recipient_object": resource_sharing_share_recipient_object_output,
-        "resource-sharing_share_recipient_resource_object": resource_sharing_share_recipient_resource_object_output,
-        "resource-sharing_share_recipient_response_collection": resource_sharing_share_recipient_response_collection_output,
-        "resource-sharing_share_recipient_response_collection_result": resource_sharing_share_recipient_response_collection_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_recipient_object": resource$$sharing_share_recipient_object,
+        "resource-sharing_share_recipient_resource_object": resource$$sharing_share_recipient_resource_object,
+        "resource-sharing_share_recipient_response_collection": resource$$sharing_share_recipient_response_collection,
+        "resource-sharing_share_recipient_response_collection_result": resource$$sharing_share_recipient_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/shares/${pathParam(args, "share_id")}/recipients`,
       query: [
-        ["include_resources", args["include_resources"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["include_resources", param(args, "query", "include_resources"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "resource_sharing_recipients_update",
+    name: "resourceSharing_recipients_update",
     title: "Trigger recipient reconciliation on a share",
-    description: "Replaces the full recipient list for an account-targeted share. The\nserver computes the diff between the current and desired recipients:\nnew accounts are added, accounts no longer in the list are marked for\ndisassociation, and unchanged accounts are left as-is.\n\nReturns an error if the share targets an organization\n(`target_type=organization`); org-targeted shares derive their\nrecipients dynamically from org membership and cannot be modified\nthrough this endpoint.",
+    description: "Replaces the full recipient list for an account-targeted share. The\nserver computes the diff between the current and desired recipients:\nnew accounts are added, accounts no longer in the list are marked for\ndisassociation, and unchanged accounts are left as-is.\n\nReturns an error if the share targets an organization\n(`target_type=organization`); org-targeted shares derive their\nrecipients dynamically from org membership and cannot be modified\nthrough this endpoint.\n\nPUT /accounts/{account_id}/shares/{share_id}/recipients",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/resource-sharing_update_share_recipients_request"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_create_share_recipient_request": resource_sharing_create_share_recipient_request,
-        "resource-sharing_organization_id": resource_sharing_organization_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-        "resource-sharing_update_share_recipients_request": resource_sharing_update_share_recipients_request,
+        "resource-sharing_create_share_recipient_request": resource$$sharing_create_share_recipient_request,
+        "resource-sharing_update_share_recipients_request": resource$$sharing_update_share_recipients_request,
       },
     },
     annotations: {
@@ -554,9 +507,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/resourceSharing/resources/outputs.ts b/src/generated/forge-mcp/resourceSharing/resources/outputs.ts
index a9c6773d7..9e0f92acd 100644
--- a/src/generated/forge-mcp/resourceSharing/resources/outputs.ts
+++ b/src/generated/forge-mcp/resourceSharing/resources/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `resource-sharing_share_resource_response_collection` in
  * responses.
  */
-export const resource_sharing_share_resource_response_collection_output: JsonSchema = {
+export const resource$$sharing_share_resource_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-collection"
@@ -22,7 +22,7 @@ export const resource_sharing_share_resource_response_collection_output: JsonSch
  * The schema of `resource-sharing_share_resource_response_collection_result` in
  * responses.
  */
-export const resource_sharing_share_resource_response_collection_result_output: JsonSchema = {
+export const resource$$sharing_share_resource_response_collection_result: JsonSchema = {
   "properties": {
     "result": {
       "items": {
@@ -37,7 +37,7 @@ export const resource_sharing_share_resource_response_collection_result_output:
 /**
  * The schema of `resource-sharing_share_resource_response_single` in responses.
  */
-export const resource_sharing_share_resource_response_single_output: JsonSchema = {
+export const resource$$sharing_share_resource_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-sharing_api-response-common"
@@ -52,7 +52,7 @@ export const resource_sharing_share_resource_response_single_output: JsonSchema
  * The schema of `resource-sharing_share_resource_response_single_result` in
  * responses.
  */
-export const resource_sharing_share_resource_response_single_result_output: JsonSchema = {
+export const resource$$sharing_share_resource_response_single_result: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/resource-sharing_share_resource_object"
diff --git a/src/generated/forge-mcp/resourceSharing/resources/schemas.ts b/src/generated/forge-mcp/resourceSharing/resources/schemas.ts
index fb2bad410..328cce226 100644
--- a/src/generated/forge-mcp/resourceSharing/resources/schemas.ts
+++ b/src/generated/forge-mcp/resourceSharing/resources/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `resource-sharing_update_share_resource_request`.
  */
-export const resource_sharing_update_share_resource_request: JsonSchema = {
+export const resource$$sharing_update_share_resource_request: JsonSchema = {
   "properties": {
     "meta": {
       "$ref": "#/$defs/resource-sharing_resource_meta",
diff --git a/src/generated/forge-mcp/resourceSharing/resources/tools.ts b/src/generated/forge-mcp/resourceSharing/resources/tools.ts
index e5562366b..9a909fbee 100644
--- a/src/generated/forge-mcp/resourceSharing/resources/tools.ts
+++ b/src/generated/forge-mcp/resourceSharing/resources/tools.ts
@@ -1,99 +1,81 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_sharing_account_id_output,
-  resource_sharing_api_response_collection_info_output,
-  resource_sharing_api_response_collection_output,
-  resource_sharing_api_response_common_failure_output,
-  resource_sharing_api_response_common_output,
-  resource_sharing_created_output,
-  resource_sharing_modified_output,
-  resource_sharing_resource_id_output,
-  resource_sharing_resource_meta_output,
-  resource_sharing_resource_resource_id_output,
-  resource_sharing_resource_status_output,
-  resource_sharing_resource_type_output,
-  resource_sharing_resource_version_output,
-  resource_sharing_result_info_output,
-  resource_sharing_share_resource_object_output,
-  resource_sharing_v4error_output,
-  resource_sharing_v4errors_output,
+  resource$$sharing_api$$response$$collection,
+  resource$$sharing_api$$response$$collection$$info,
+  resource$$sharing_api$$response$$common,
+  resource$$sharing_api$$response$$common$$failure,
+  resource$$sharing_resource_meta,
+  resource$$sharing_result_info,
+  resource$$sharing_share_resource_object,
+  resource$$sharing_v4error,
+  resource$$sharing_v4errors,
 } from "../../outputs.js";
+import { resource$$sharing_resource_meta as resource$$sharing_resource_meta$ } from "../../schemas.js";
+import { resource$$sharing_create_share_resource_request } from "../schemas.js";
 import {
-  resource_sharing_account_id,
-  resource_sharing_resource_id,
-  resource_sharing_resource_meta,
-  resource_sharing_resource_resource_id,
-  resource_sharing_resource_status,
-  resource_sharing_resource_type,
-  resource_sharing_share_id,
-} from "../../schemas.js";
-import { resource_sharing_create_share_resource_request } from "../schemas.js";
-import {
-  resource_sharing_share_resource_response_collection_output,
-  resource_sharing_share_resource_response_collection_result_output,
-  resource_sharing_share_resource_response_single_output,
-  resource_sharing_share_resource_response_single_result_output,
+  resource$$sharing_share_resource_response_collection,
+  resource$$sharing_share_resource_response_collection_result,
+  resource$$sharing_share_resource_response_single,
+  resource$$sharing_share_resource_response_single_result,
 } from "./outputs.js";
-import { resource_sharing_update_share_resource_request } from "./schemas.js";
+import { resource$$sharing_update_share_resource_request } from "./schemas.js";
 
 /**
- * The tools of `resource_sharing.resources`.
+ * The tools of `resourceSharing.resources`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "resource_sharing_resources_create",
+    name: "resourceSharing_resources_create",
     title: "Trigger a resource addition to a share",
-    description: "Adds a resource to an existing share, making it available to share recipients.",
+    description: "Adds a resource to an existing share, making it available to share recipients.\n\nPOST /accounts/{account_id}/shares/{share_id}/resources",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/resource-sharing_create_share_resource_request"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_create_share_resource_request": resource_sharing_create_share_resource_request,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id,
-        "resource-sharing_resource_type": resource_sharing_resource_type,
-        "resource-sharing_share_id": resource_sharing_share_id,
+        "resource-sharing_create_share_resource_request": resource$$sharing_create_share_resource_request,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_resource_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_single": resource_sharing_share_resource_response_single_output,
-        "resource-sharing_share_resource_response_single_result": resource_sharing_share_resource_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_single": resource$$sharing_share_resource_response_single,
+        "resource-sharing_share_resource_response_single_result": resource$$sharing_share_resource_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -127,22 +109,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_single": resource_sharing_share_resource_response_single_output,
-        "resource-sharing_share_resource_response_single_result": resource_sharing_share_resource_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_single": resource$$sharing_share_resource_response_single,
+        "resource-sharing_share_resource_response_single_result": resource$$sharing_share_resource_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -151,54 +125,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_resources_delete",
+    name: "resourceSharing_resources_delete",
     title: "Trigger a resource deletion from a share",
-    description: "Deletion is not immediate, an updated share resource object with a new status will be returned.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Deletion is not immediate, an updated share resource object with a new status will be returned.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/shares/{share_id}/resources/{share_resource_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
-        },
-        "share_resource_id": {
-          "$ref": "#/$defs/resource-sharing_resource_id",
-          "description": "Share Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            },
+            "share_resource_id": {
+              "description": "Share Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id",
+            "share_resource_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
-        "share_resource_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_resource_id": resource_sharing_resource_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_resource_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_single": resource_sharing_share_resource_response_single_output,
-        "resource-sharing_share_resource_response_single_result": resource_sharing_share_resource_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_single": resource$$sharing_share_resource_response_single,
+        "resource-sharing_share_resource_response_single_result": resource$$sharing_share_resource_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -232,22 +203,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_single": resource_sharing_share_resource_response_single_output,
-        "resource-sharing_share_resource_response_single_result": resource_sharing_share_resource_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_single": resource$$sharing_share_resource_response_single,
+        "resource-sharing_share_resource_response_single_result": resource$$sharing_share_resource_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -255,54 +218,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_resources_get",
+    name: "resourceSharing_resources_get",
     title: "Get share resource by ID",
-    description: "Get share resource by ID.",
+    description: "Get share resource by ID.\n\nGET /accounts/{account_id}/shares/{share_id}/resources/{share_resource_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
-        },
-        "share_resource_id": {
-          "$ref": "#/$defs/resource-sharing_resource_id",
-          "description": "Share Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            },
+            "share_resource_id": {
+              "description": "Share Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id",
+            "share_resource_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
-        "share_resource_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_resource_id": resource_sharing_resource_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_resource_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_single": resource_sharing_share_resource_response_single_output,
-        "resource-sharing_share_resource_response_single_result": resource_sharing_share_resource_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_single": resource$$sharing_share_resource_response_single,
+        "resource-sharing_share_resource_response_single_result": resource$$sharing_share_resource_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -336,22 +296,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_single": resource_sharing_share_resource_response_single_output,
-        "resource-sharing_share_resource_response_single_result": resource_sharing_share_resource_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_single": resource$$sharing_share_resource_response_single,
+        "resource-sharing_share_resource_response_single_result": resource$$sharing_share_resource_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -359,71 +311,87 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_resources_list",
+    name: "resourceSharing_resources_list",
     title: "List share resources by share ID",
-    description: "List share resources by share ID.",
+    description: "List share resources by share ID.\n\nGET /accounts/{account_id}/shares/{share_id}/resources",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
-          "type": "integer"
-        },
-        "resource_type": {
-          "$ref": "#/$defs/resource-sharing_resource_type",
-          "description": "Filter share resources by resource_type."
-        },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         },
-        "status": {
-          "$ref": "#/$defs/resource-sharing_resource_status",
-          "description": "Filter share resources by status."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
+              "type": "integer"
+            },
+            "resource_type": {
+              "description": "Filter share resources by resource_type.",
+              "enum": [
+                "custom-ruleset",
+                "gateway-policy",
+                "gateway-destination-ip",
+                "gateway-block-page-settings",
+                "gateway-extended-email-matching",
+                "idp-federation-grant",
+                "trust-grant"
+              ],
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter share resources by status.",
+              "enum": [
+                "active",
+                "deleting",
+                "deleted"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_resource_status": resource_sharing_resource_status,
-        "resource-sharing_resource_type": resource_sharing_resource_type,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_resource_response_collection",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_collection": resource_sharing_share_resource_response_collection_output,
-        "resource-sharing_share_resource_response_collection_result": resource_sharing_share_resource_response_collection_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_collection": resource$$sharing_share_resource_response_collection,
+        "resource-sharing_share_resource_response_collection_result": resource$$sharing_share_resource_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -457,92 +425,83 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_collection": resource_sharing_share_resource_response_collection_output,
-        "resource-sharing_share_resource_response_collection_result": resource_sharing_share_resource_response_collection_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_collection": resource$$sharing_share_resource_response_collection,
+        "resource-sharing_share_resource_response_collection_result": resource$$sharing_share_resource_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/shares/${pathParam(args, "share_id")}/resources`,
       query: [
-        ["status", args["status"], true],
-        ["resource_type", args["resource_type"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["status", param(args, "query", "status"), true],
+        ["resource_type", param(args, "query", "resource_type"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "resource_sharing_resources_update",
+    name: "resourceSharing_resources_update",
     title: "Trigger a resource metadata update in a share",
-    description: "Update is not immediate, an updated share resource object with a new status will be returned.",
+    description: "Update is not immediate, an updated share resource object with a new status will be returned.\n\nPUT /accounts/{account_id}/shares/{share_id}/resources/{share_resource_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/resource-sharing_update_share_resource_request"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
-        },
-        "share_resource_id": {
-          "$ref": "#/$defs/resource-sharing_resource_id",
-          "description": "Share Resource identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            },
+            "share_resource_id": {
+              "description": "Share Resource identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id",
+            "share_resource_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
-        "share_resource_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_resource_id": resource_sharing_resource_id,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta,
-        "resource-sharing_share_id": resource_sharing_share_id,
-        "resource-sharing_update_share_resource_request": resource_sharing_update_share_resource_request,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta$,
+        "resource-sharing_update_share_resource_request": resource$$sharing_update_share_resource_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_resource_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_single": resource_sharing_share_resource_response_single_output,
-        "resource-sharing_share_resource_response_single_result": resource_sharing_share_resource_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_single": resource$$sharing_share_resource_response_single,
+        "resource-sharing_share_resource_response_single_result": resource$$sharing_share_resource_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -575,22 +534,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_resource_response_single": resource_sharing_share_resource_response_single_output,
-        "resource-sharing_share_resource_response_single_result": resource_sharing_share_resource_response_single_result_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_resource_response_single": resource$$sharing_share_resource_response_single,
+        "resource-sharing_share_resource_response_single_result": resource$$sharing_share_resource_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/resourceSharing/schemas.ts b/src/generated/forge-mcp/resourceSharing/schemas.ts
index dd13a9877..dbbffa0f3 100644
--- a/src/generated/forge-mcp/resourceSharing/schemas.ts
+++ b/src/generated/forge-mcp/resourceSharing/schemas.ts
@@ -6,21 +6,21 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `resource-sharing_create_share_recipient_request`.
  */
-export const resource_sharing_create_share_recipient_request: JsonSchema = {
-  "description": "Optionally specify `recipient_account_id` to target a specific account, or `organization_id` to target the caller's whole organization. If neither is provided, the caller's organization is used.\nThe legacy field `account_id` is accepted as a synonym for `recipient_account_id` during the deprecation period (see `x-sunset` on that field).\n",
+export const resource$$sharing_create_share_recipient_request: JsonSchema = {
+  "description": "Optionally specify `recipient_account_id` to target a specific account, or `organization_id` to target the caller's whole organization. If neither is provided, the caller's organization is used.\nThe legacy field `account_id` is accepted as a synonym for `recipient_account_id` during the deprecation period (see `x-sunset` on that field).",
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/resource-sharing_account_id",
       "deprecated": true,
-      "description": "Deprecated alias for `recipient_account_id`. Use `recipient_account_id` instead.\nThe body field collided with the URL path parameter of the same name, which prevented SDK generators from distinguishing the source account (in the URL) from the recipient account (in the body). Both names will continue to be accepted until 2027-05-26 (see `x-sunset`).\n"
+      "description": "Deprecated alias for `recipient_account_id`. Use `recipient_account_id` instead.\nThe body field collided with the URL path parameter of the same name, which prevented SDK generators from distinguishing the source account (in the URL) from the recipient account (in the body). Both names will continue to be accepted until 2027-05-26 (see `x-sunset`).",
+      "type": "string"
     },
     "organization_id": {
-      "$ref": "#/$defs/resource-sharing_organization_id",
-      "description": "Organization identifier."
+      "description": "Organization identifier.",
+      "type": "string"
     },
     "recipient_account_id": {
-      "$ref": "#/$defs/resource-sharing_account_id",
-      "description": "The account that will receive the share."
+      "description": "The account that will receive the share.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -29,11 +29,11 @@ export const resource_sharing_create_share_recipient_request: JsonSchema = {
 /**
  * The schema of `resource-sharing_create_share_request`.
  */
-export const resource_sharing_create_share_request: JsonSchema = {
+export const resource$$sharing_create_share_request: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/resource-sharing_share_name",
-      "description": "The name of the share."
+      "description": "The name of the share.",
+      "type": "string"
     },
     "recipients": {
       "items": {
@@ -59,23 +59,32 @@ export const resource_sharing_create_share_request: JsonSchema = {
 /**
  * The schema of `resource-sharing_create_share_resource_request`.
  */
-export const resource_sharing_create_share_resource_request: JsonSchema = {
+export const resource$$sharing_create_share_resource_request: JsonSchema = {
   "properties": {
     "meta": {
       "$ref": "#/$defs/resource-sharing_resource_meta",
       "description": "Resource Metadata."
     },
     "resource_account_id": {
-      "$ref": "#/$defs/resource-sharing_account_id",
-      "description": "Account identifier."
+      "description": "Account identifier.",
+      "type": "string"
     },
     "resource_id": {
-      "$ref": "#/$defs/resource-sharing_resource_resource_id",
-      "description": "Share Resource identifier."
+      "description": "Share Resource identifier.",
+      "type": "string"
     },
     "resource_type": {
-      "$ref": "#/$defs/resource-sharing_resource_type",
-      "description": "Resource Type."
+      "description": "Resource Type.",
+      "enum": [
+        "custom-ruleset",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+        "idp-federation-grant",
+        "trust-grant"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -90,12 +99,12 @@ export const resource_sharing_create_share_resource_request: JsonSchema = {
 /**
  * The schema of `resource-sharing_update_share_request`.
  */
-export const resource_sharing_update_share_request: JsonSchema = {
-  "description": "Request body for `PUT /accounts/{account_id}/shares/{share_id}`. The\nshare's display `name` and `tags` can be updated via this endpoint. To\nmodify recipients, use the\n`/accounts/{account_id}/shares/{share_id}/recipients` subresource\nendpoints (POST, PUT, DELETE).\n",
+export const resource$$sharing_update_share_request: JsonSchema = {
+  "description": "Request body for `PUT /accounts/{account_id}/shares/{share_id}`. The\nshare's display `name` and `tags` can be updated via this endpoint. To\nmodify recipients, use the\n`/accounts/{account_id}/shares/{share_id}/recipients` subresource\nendpoints (POST, PUT, DELETE).",
   "properties": {
     "name": {
-      "$ref": "#/$defs/resource-sharing_share_name",
-      "description": "The name of the share."
+      "description": "The name of the share.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/resourceSharing/tools.ts b/src/generated/forge-mcp/resourceSharing/tools.ts
index 6c0477acd..48c629ffd 100644
--- a/src/generated/forge-mcp/resourceSharing/tools.ts
+++ b/src/generated/forge-mcp/resourceSharing/tools.ts
@@ -1,120 +1,84 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  resource_sharing_account_id_output,
-  resource_sharing_account_name_output,
-  resource_sharing_api_response_collection_info_output,
-  resource_sharing_api_response_collection_output,
-  resource_sharing_api_response_common_failure_output,
-  resource_sharing_api_response_common_output,
-  resource_sharing_created_output,
-  resource_sharing_modified_output,
-  resource_sharing_organization_id_output,
-  resource_sharing_resource_id_output,
-  resource_sharing_resource_meta_output,
-  resource_sharing_resource_resource_id_output,
-  resource_sharing_resource_status_output,
-  resource_sharing_resource_type_output,
-  resource_sharing_resource_version_output,
-  resource_sharing_result_info_output,
-  resource_sharing_share_id_output,
-  resource_sharing_share_kind_output,
-  resource_sharing_share_name_output,
-  resource_sharing_share_object_output,
-  resource_sharing_share_resource_object_output,
-  resource_sharing_share_response_collection_output,
-  resource_sharing_share_response_collection_result_output,
-  resource_sharing_share_status_output,
-  resource_sharing_share_target_type_output,
-  resource_sharing_v4error_output,
-  resource_sharing_v4errors_output,
+  resource$$sharing_api$$response$$collection,
+  resource$$sharing_api$$response$$collection$$info,
+  resource$$sharing_api$$response$$common,
+  resource$$sharing_api$$response$$common$$failure,
+  resource$$sharing_resource_meta,
+  resource$$sharing_result_info,
+  resource$$sharing_share_object,
+  resource$$sharing_share_resource_object,
+  resource$$sharing_share_response_collection,
+  resource$$sharing_share_response_collection_result,
+  resource$$sharing_v4error,
+  resource$$sharing_v4errors,
 } from "../outputs.js";
+import { resource$$sharing_resource_meta as resource$$sharing_resource_meta$ } from "../schemas.js";
 import {
-  resource_sharing_account_id,
-  resource_sharing_organization_id,
-  resource_sharing_resource_meta,
-  resource_sharing_resource_resource_id,
-  resource_sharing_resource_type,
-  resource_sharing_share_id,
-  resource_sharing_share_kind,
-  resource_sharing_share_name,
-  resource_sharing_share_status,
-  resource_sharing_share_target_type,
-} from "../schemas.js";
-import {
-  resource_sharing_share_response_single_output,
-  resource_sharing_share_response_single_result_output,
+  resource$$sharing_share_response_single,
+  resource$$sharing_share_response_single_result,
 } from "./outputs.js";
 import {
-  resource_sharing_create_share_recipient_request,
-  resource_sharing_create_share_request,
-  resource_sharing_create_share_resource_request,
-  resource_sharing_update_share_request,
+  resource$$sharing_create_share_recipient_request,
+  resource$$sharing_create_share_request,
+  resource$$sharing_create_share_resource_request,
+  resource$$sharing_update_share_request,
 } from "./schemas.js";
 
 /**
- * The tools of `resource_sharing`.
+ * The tools of `resourceSharing`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "resource_sharing_create",
+    name: "resourceSharing_create",
     title: "Trigger a share creation",
-    description: "Creates a new resource share for sharing Cloudflare resources with other accounts or organizations.",
+    description: "Creates a new resource share for sharing Cloudflare resources with other accounts or organizations.\n\nPOST /accounts/{account_id}/shares",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/resource-sharing_create_share_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_create_share_recipient_request": resource_sharing_create_share_recipient_request,
-        "resource-sharing_create_share_request": resource_sharing_create_share_request,
-        "resource-sharing_create_share_resource_request": resource_sharing_create_share_resource_request,
-        "resource-sharing_organization_id": resource_sharing_organization_id,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id,
-        "resource-sharing_resource_type": resource_sharing_resource_type,
-        "resource-sharing_share_name": resource_sharing_share_name,
+        "resource-sharing_create_share_recipient_request": resource$$sharing_create_share_recipient_request,
+        "resource-sharing_create_share_request": resource$$sharing_create_share_request,
+        "resource-sharing_create_share_resource_request": resource$$sharing_create_share_resource_request,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_single": resource_sharing_share_response_single_output,
-        "resource-sharing_share_response_single_result": resource_sharing_share_response_single_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_single": resource$$sharing_share_response_single,
+        "resource-sharing_share_response_single_result": resource$$sharing_share_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -148,30 +112,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_single": resource_sharing_share_response_single_output,
-        "resource-sharing_share_response_single_result": resource_sharing_share_response_single_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_single": resource$$sharing_share_response_single,
+        "resource-sharing_share_response_single_result": resource$$sharing_share_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -180,56 +129,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_delete",
+    name: "resourceSharing_delete",
     title: "Trigger a share deletion",
-    description: "Deletion is not immediate, an updated share object with a new status will be returned.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Deletion is not immediate, an updated share object with a new status will be returned.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/shares/{share_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_single": resource_sharing_share_response_single_output,
-        "resource-sharing_share_response_single_result": resource_sharing_share_response_single_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_single": resource$$sharing_share_response_single,
+        "resource-sharing_share_response_single_result": resource$$sharing_share_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -263,30 +203,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_single": resource_sharing_share_response_single_output,
-        "resource-sharing_share_response_single_result": resource_sharing_share_response_single_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_single": resource$$sharing_share_response_single,
+        "resource-sharing_share_response_single_result": resource$$sharing_share_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
@@ -294,64 +219,61 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "resource_sharing_get",
+    name: "resourceSharing_get",
     title: "Get account share by ID",
-    description: "Fetches share by ID.",
+    description: "Fetches share by ID.\n\nGET /accounts/{account_id}/shares/{share_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "include_recipient_counts": {
-          "description": "Include recipient counts in the response.",
-          "type": "boolean"
-        },
-        "include_resources": {
-          "description": "Include resources in the response.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_recipient_counts": {
+              "description": "Include recipient counts in the response.",
+              "type": "boolean"
+            },
+            "include_resources": {
+              "description": "Include resources in the response.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_single": resource_sharing_share_response_single_output,
-        "resource-sharing_share_response_single_result": resource_sharing_share_response_single_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_single": resource$$sharing_share_response_single,
+        "resource-sharing_share_response_single_result": resource$$sharing_share_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -392,155 +314,157 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_single": resource_sharing_share_response_single_output,
-        "resource-sharing_share_response_single_result": resource_sharing_share_response_single_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_single": resource$$sharing_share_response_single,
+        "resource-sharing_share_response_single_result": resource$$sharing_share_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/shares/${pathParam(args, "share_id")}`,
       query: [
-        ["include_resources", args["include_resources"], true],
-        ["include_recipient_counts", args["include_recipient_counts"], true],
+        ["include_resources", param(args, "query", "include_resources"), true],
+        ["include_recipient_counts", param(args, "query", "include_recipient_counts"), true],
       ],
     }),
   },
   {
-    name: "resource_sharing_list",
+    name: "resourceSharing_list",
     title: "List account shares",
-    description: "Lists all account shares.",
+    description: "Lists all account shares.\n\nGET /accounts/{account_id}/shares",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Direction to sort objects.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "include_recipient_counts": {
-          "description": "Include recipient counts in the response.",
-          "type": "boolean"
-        },
-        "include_resources": {
-          "description": "Include resources in the response.",
-          "type": "boolean"
-        },
-        "kind": {
-          "$ref": "#/$defs/resource-sharing_share_kind",
-          "description": "Filter shares by kind."
-        },
-        "order": {
-          "default": "created",
-          "description": "Order shares by values in the given field.",
-          "enum": [
-            "name",
-            "created"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
-          "type": "integer"
-        },
-        "resource_types": {
-          "description": "Filter share resources by resource_types.",
-          "items": {
-            "$ref": "#/$defs/resource-sharing_resource_type"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "status": {
-          "$ref": "#/$defs/resource-sharing_share_status",
-          "description": "Filter shares by status."
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "tag": {
-          "description": "Filter shares by tag. Each value is either `key=value` (matches shares whose tags contain that key/value pair) or `key` alone (matches shares that have any value for that key). May be repeated; multiple `tag` parameters are ANDed together. Maximum 20 `tag` parameters per request.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "Direction to sort objects.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "include_recipient_counts": {
+              "description": "Include recipient counts in the response.",
+              "type": "boolean"
+            },
+            "include_resources": {
+              "description": "Include resources in the response.",
+              "type": "boolean"
+            },
+            "kind": {
+              "description": "Filter shares by kind.",
+              "enum": [
+                "sent",
+                "received"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "created",
+              "description": "Order shares by values in the given field.",
+              "enum": [
+                "name",
+                "created"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number. Defaults to `1` when `per_page` is supplied without\n`page`. May be omitted entirely along with `per_page` to receive a\nnon-paginated response.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of objects to return per page. Defaults to `20` when `page` is supplied without `per_page`. May be omitted entirely along with `page` to receive a non-paginated response.",
+              "type": "integer"
+            },
+            "resource_types": {
+              "description": "Filter share resources by resource_types.",
+              "items": {
+                "description": "Resource Type.",
+                "enum": [
+                  "custom-ruleset",
+                  "gateway-policy",
+                  "gateway-destination-ip",
+                  "gateway-block-page-settings",
+                  "gateway-extended-email-matching",
+                  "idp-federation-grant",
+                  "trust-grant"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "status": {
+              "description": "Filter shares by status.",
+              "enum": [
+                "active",
+                "deleting",
+                "deleted"
+              ],
+              "type": "string"
+            },
+            "tag": {
+              "description": "Filter shares by tag. Each value is either `key=value` (matches shares whose tags contain that key/value pair) or `key` alone (matches shares that have any value for that key). May be repeated; multiple `tag` parameters are ANDed together. Maximum 20 `tag` parameters per request.",
+              "items": {
+                "type": "string"
+              },
+              "maxItems": 20,
+              "type": "array"
+            },
+            "target_type": {
+              "description": "Filter shares by target_type.",
+              "enum": [
+                "account",
+                "organization"
+              ],
+              "type": "string"
+            }
           },
-          "maxItems": 20,
-          "type": "array"
-        },
-        "target_type": {
-          "$ref": "#/$defs/resource-sharing_share_target_type",
-          "description": "Filter shares by target_type."
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_resource_type": resource_sharing_resource_type,
-        "resource-sharing_share_kind": resource_sharing_share_kind,
-        "resource-sharing_share_status": resource_sharing_share_status,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_response_collection",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_collection": resource_sharing_share_response_collection_output,
-        "resource-sharing_share_response_collection_result": resource_sharing_share_response_collection_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_collection": resource$$sharing_share_response_collection,
+        "resource-sharing_share_response_collection_result": resource$$sharing_share_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -582,109 +506,86 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-collection": resource_sharing_api_response_collection_output,
-        "resource-sharing_api-response-collection-info": resource_sharing_api_response_collection_info_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_result_info": resource_sharing_result_info_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_collection": resource_sharing_share_response_collection_output,
-        "resource-sharing_share_response_collection_result": resource_sharing_share_response_collection_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-collection": resource$$sharing_api$$response$$collection,
+        "resource-sharing_api-response-collection-info": resource$$sharing_api$$response$$collection$$info,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_result_info": resource$$sharing_result_info,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_collection": resource$$sharing_share_response_collection,
+        "resource-sharing_share_response_collection_result": resource$$sharing_share_response_collection_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/shares`,
       query: [
-        ["status", args["status"], true],
-        ["kind", args["kind"], true],
-        ["target_type", args["target_type"], true],
-        ["resource_types", args["resource_types"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["include_resources", args["include_resources"], true],
-        ["include_recipient_counts", args["include_recipient_counts"], true],
-        ["tag", args["tag"], true],
+        ["status", param(args, "query", "status"), true],
+        ["kind", param(args, "query", "kind"), true],
+        ["target_type", param(args, "query", "target_type"), true],
+        ["resource_types", param(args, "query", "resource_types"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["include_resources", param(args, "query", "include_resources"), true],
+        ["include_recipient_counts", param(args, "query", "include_recipient_counts"), true],
+        ["tag", param(args, "query", "tag"), true],
       ],
     }),
   },
   {
-    name: "resource_sharing_update",
+    name: "resourceSharing_update",
     title: "Trigger a share rename",
-    description: "Updates the share's display name and tags. This endpoint does **not**\nmodify recipients or resources — those are managed via dedicated\nsubresource endpoints:\n\n- **Recipients**: Use `POST /accounts/{account_id}/shares/{share_id}/recipients`\n  to add a single recipient, `PUT /accounts/{account_id}/shares/{share_id}/recipients`\n  to replace the full recipient list, or\n  `DELETE /accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}`\n  to remove a recipient.\n- **Resources**: Use the share's resource subresource endpoints.\n\nUpdating is not immediate; an updated share object with a new status\nwill be returned.",
+    description: "Updates the share's display name and tags. This endpoint does **not**\nmodify recipients or resources — those are managed via dedicated\nsubresource endpoints:\n\n- **Recipients**: Use `POST /accounts/{account_id}/shares/{share_id}/recipients`\n  to add a single recipient, `PUT /accounts/{account_id}/shares/{share_id}/recipients`\n  to replace the full recipient list, or\n  `DELETE /accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}`\n  to remove a recipient.\n- **Resources**: Use the share's resource subresource endpoints.\n\nUpdating is not immediate; an updated share object with a new status\nwill be returned.\n\nPUT /accounts/{account_id}/shares/{share_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-sharing_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/resource-sharing_update_share_request"
         },
-        "share_id": {
-          "$ref": "#/$defs/resource-sharing_share_id",
-          "description": "Share identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "share_id": {
+              "description": "Share identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "share_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "share_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id,
-        "resource-sharing_share_id": resource_sharing_share_id,
-        "resource-sharing_share_name": resource_sharing_share_name,
-        "resource-sharing_update_share_request": resource_sharing_update_share_request,
+        "resource-sharing_update_share_request": resource$$sharing_update_share_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/resource-sharing_share_response_single",
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_single": resource_sharing_share_response_single_output,
-        "resource-sharing_share_response_single_result": resource_sharing_share_response_single_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_single": resource$$sharing_share_response_single,
+        "resource-sharing_share_response_single_result": resource$$sharing_share_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     annotations: {
@@ -717,30 +618,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-sharing_account_id": resource_sharing_account_id_output,
-        "resource-sharing_account_name": resource_sharing_account_name_output,
-        "resource-sharing_api-response-common": resource_sharing_api_response_common_output,
-        "resource-sharing_api-response-common-failure": resource_sharing_api_response_common_failure_output,
-        "resource-sharing_created": resource_sharing_created_output,
-        "resource-sharing_modified": resource_sharing_modified_output,
-        "resource-sharing_organization_id": resource_sharing_organization_id_output,
-        "resource-sharing_resource_id": resource_sharing_resource_id_output,
-        "resource-sharing_resource_meta": resource_sharing_resource_meta_output,
-        "resource-sharing_resource_resource_id": resource_sharing_resource_resource_id_output,
-        "resource-sharing_resource_status": resource_sharing_resource_status_output,
-        "resource-sharing_resource_type": resource_sharing_resource_type_output,
-        "resource-sharing_resource_version": resource_sharing_resource_version_output,
-        "resource-sharing_share_id": resource_sharing_share_id_output,
-        "resource-sharing_share_kind": resource_sharing_share_kind_output,
-        "resource-sharing_share_name": resource_sharing_share_name_output,
-        "resource-sharing_share_object": resource_sharing_share_object_output,
-        "resource-sharing_share_resource_object": resource_sharing_share_resource_object_output,
-        "resource-sharing_share_response_single": resource_sharing_share_response_single_output,
-        "resource-sharing_share_response_single_result": resource_sharing_share_response_single_result_output,
-        "resource-sharing_share_status": resource_sharing_share_status_output,
-        "resource-sharing_share_target_type": resource_sharing_share_target_type_output,
-        "resource-sharing_v4error": resource_sharing_v4error_output,
-        "resource-sharing_v4errors": resource_sharing_v4errors_output,
+        "resource-sharing_api-response-common": resource$$sharing_api$$response$$common,
+        "resource-sharing_api-response-common-failure": resource$$sharing_api$$response$$common$$failure,
+        "resource-sharing_resource_meta": resource$$sharing_resource_meta,
+        "resource-sharing_share_object": resource$$sharing_share_object,
+        "resource-sharing_share_resource_object": resource$$sharing_share_resource_object,
+        "resource-sharing_share_response_single": resource$$sharing_share_response_single,
+        "resource-sharing_share_response_single_result": resource$$sharing_share_response_single_result,
+        "resource-sharing_v4error": resource$$sharing_v4error,
+        "resource-sharing_v4errors": resource$$sharing_v4errors,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/rules/lists/bulkOperations/outputs.ts b/src/generated/forge-mcp/rules/lists/bulkOperations/outputs.ts
index 468b84057..e4185c920 100644
--- a/src/generated/forge-mcp/rules/lists/bulkOperations/outputs.ts
+++ b/src/generated/forge-mcp/rules/lists/bulkOperations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `lists_bulk-operation-response-single` in responses.
  */
-export const lists_bulk_operation_response_single_output: JsonSchema = {
+export const lists_bulk$$operation$$response$$single: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -25,13 +25,13 @@ export const lists_bulk_operation_response_single_output: JsonSchema = {
 /**
  * The schema of `lists_bulk_operation_completed` in responses.
  */
-export const lists_bulk_operation_completed_output: JsonSchema = {
+export const lists_bulk_operation_completed: JsonSchema = {
   "properties": {
     "completed": {
-      "$ref": "#/$defs/lists_completed"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/lists_operation_id"
+      "type": "string"
     },
     "status": {
       "enum": [
@@ -51,16 +51,16 @@ export const lists_bulk_operation_completed_output: JsonSchema = {
 /**
  * The schema of `lists_bulk_operation_failed` in responses.
  */
-export const lists_bulk_operation_failed_output: JsonSchema = {
+export const lists_bulk_operation_failed: JsonSchema = {
   "properties": {
     "completed": {
-      "$ref": "#/$defs/lists_completed"
+      "type": "string"
     },
     "error": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/lists_operation_id"
+      "type": "string"
     },
     "status": {
       "enum": [
@@ -81,10 +81,10 @@ export const lists_bulk_operation_failed_output: JsonSchema = {
 /**
  * The schema of `lists_bulk_operation_pending_or_running` in responses.
  */
-export const lists_bulk_operation_pending_or_running_output: JsonSchema = {
+export const lists_bulk_operation_pending_or_running: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/lists_operation_id"
+      "type": "string"
     },
     "status": {
       "enum": [
@@ -101,17 +101,10 @@ export const lists_bulk_operation_pending_or_running_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `lists_completed` in responses.
- */
-export const lists_completed_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `lists_operation` in responses.
  */
-export const lists_operation_output: JsonSchema = {
+export const lists_operation: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/lists_bulk_operation_pending_or_running"
diff --git a/src/generated/forge-mcp/rules/lists/bulkOperations/tools.ts b/src/generated/forge-mcp/rules/lists/bulkOperations/tools.ts
index 28ba0c327..004ff62d6 100644
--- a/src/generated/forge-mcp/rules/lists/bulkOperations/tools.ts
+++ b/src/generated/forge-mcp/rules/lists/bulkOperations/tools.ts
@@ -3,62 +3,63 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  lists_api_response_common_failure_output,
-  lists_api_response_common_output,
-  lists_messages_output,
-  lists_operation_id_output,
+  lists_api$$response$$common,
+  lists_api$$response$$common$$failure,
+  lists_messages,
 } from "../outputs.js";
-import { lists_account_id, lists_operation_id } from "../schemas.js";
 import {
-  lists_bulk_operation_completed_output,
-  lists_bulk_operation_failed_output,
-  lists_bulk_operation_pending_or_running_output,
-  lists_bulk_operation_response_single_output,
-  lists_completed_output,
-  lists_operation_output,
+  lists_bulk$$operation$$response$$single,
+  lists_bulk_operation_completed,
+  lists_bulk_operation_failed,
+  lists_bulk_operation_pending_or_running,
+  lists_operation,
 } from "./outputs.js";
 
 /**
- * The tools of `rules.lists.bulk_operations`.
+ * The tools of `rules.lists.bulkOperations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "rules_lists_bulk_operations_get",
+    name: "rules_lists_bulkOperations_get",
     title: "Get bulk operation status",
-    description: "Gets the current status of an asynchronous operation on a list.\n\nThe `status` property can have one of the following values: `pending`, `running`, `completed`, or `failed`. If the status is `failed`, the `error` property will contain a message describing the error.",
+    description: "Gets the current status of an asynchronous operation on a list.\n\nThe `status` property can have one of the following values: `pending`, `running`, `completed`, or `failed`. If the status is `failed`, the `error` property will contain a message describing the error.\n\nGET /accounts/{account_id}/rules/lists/bulk_operations/{operation_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
-        "operation_id": {
-          "$ref": "#/$defs/lists_operation_id",
-          "description": "The unique operation ID of the asynchronous action."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "operation_id": {
+              "description": "The unique operation ID of the asynchronous action.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "operation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "operation_id"
+        "path"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_operation_id": lists_operation_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_bulk-operation-response-single",
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_bulk-operation-response-single": lists_bulk_operation_response_single_output,
-        "lists_bulk_operation_completed": lists_bulk_operation_completed_output,
-        "lists_bulk_operation_failed": lists_bulk_operation_failed_output,
-        "lists_bulk_operation_pending_or_running": lists_bulk_operation_pending_or_running_output,
-        "lists_completed": lists_completed_output,
-        "lists_messages": lists_messages_output,
-        "lists_operation": lists_operation_output,
-        "lists_operation_id": lists_operation_id_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_bulk-operation-response-single": lists_bulk$$operation$$response$$single,
+        "lists_bulk_operation_completed": lists_bulk_operation_completed,
+        "lists_bulk_operation_failed": lists_bulk_operation_failed,
+        "lists_bulk_operation_pending_or_running": lists_bulk_operation_pending_or_running,
+        "lists_messages": lists_messages,
+        "lists_operation": lists_operation,
       },
     },
     annotations: {
@@ -99,16 +100,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_bulk-operation-response-single": lists_bulk_operation_response_single_output,
-        "lists_bulk_operation_completed": lists_bulk_operation_completed_output,
-        "lists_bulk_operation_failed": lists_bulk_operation_failed_output,
-        "lists_bulk_operation_pending_or_running": lists_bulk_operation_pending_or_running_output,
-        "lists_completed": lists_completed_output,
-        "lists_messages": lists_messages_output,
-        "lists_operation": lists_operation_output,
-        "lists_operation_id": lists_operation_id_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_bulk-operation-response-single": lists_bulk$$operation$$response$$single,
+        "lists_bulk_operation_completed": lists_bulk_operation_completed,
+        "lists_bulk_operation_failed": lists_bulk_operation_failed,
+        "lists_bulk_operation_pending_or_running": lists_bulk_operation_pending_or_running,
+        "lists_messages": lists_messages,
+        "lists_operation": lists_operation,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/rules/lists/items/outputs.ts b/src/generated/forge-mcp/rules/lists/items/outputs.ts
index 545b8b2ab..38c15bd9a 100644
--- a/src/generated/forge-mcp/rules/lists/items/outputs.ts
+++ b/src/generated/forge-mcp/rules/lists/items/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `lists_item` in responses.
  */
-export const lists_item_output: JsonSchema = {
+export const lists_item: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/lists_list_item_ip_full"
@@ -26,7 +26,7 @@ export const lists_item_output: JsonSchema = {
 /**
  * The schema of `lists_item-response-single` in responses.
  */
-export const lists_item_response_single_output: JsonSchema = {
+export const lists_item$$response$$single: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -42,29 +42,22 @@ export const lists_item_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `lists_item_asn` in responses.
- */
-export const lists_item_asn_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `lists_item_base` in responses.
  */
-export const lists_item_base_output: JsonSchema = {
+export const lists_item_base: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/lists_item_comment"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/lists_created_on"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/lists_item_id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/lists_modified_on"
+      "type": "string"
     }
   },
   "required": [
@@ -75,17 +68,10 @@ export const lists_item_base_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `lists_item_comment` in responses.
- */
-export const lists_item_comment_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `lists_item_hostname` in responses.
  */
-export const lists_item_hostname_output: JsonSchema = {
+export const lists_item_hostname: JsonSchema = {
   "properties": {
     "exclude_exact_hostname": {
       "type": "boolean"
@@ -100,24 +86,10 @@ export const lists_item_hostname_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `lists_item_id` in responses.
- */
-export const lists_item_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `lists_item_ip` in responses.
- */
-export const lists_item_ip_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `lists_item_redirect` in responses.
  */
-export const lists_item_redirect_output: JsonSchema = {
+export const lists_item_redirect: JsonSchema = {
   "properties": {
     "include_subdomains": {
       "type": "boolean"
@@ -157,7 +129,7 @@ export const lists_item_redirect_output: JsonSchema = {
 /**
  * The schema of `lists_items` in responses.
  */
-export const lists_items_output: JsonSchema = {
+export const lists_items: JsonSchema = {
   "items": {
     "$ref": "#/$defs/lists_item"
   },
@@ -167,7 +139,7 @@ export const lists_items_output: JsonSchema = {
 /**
  * The schema of `lists_items-list-response-collection` in responses.
  */
-export const lists_items_list_response_collection_output: JsonSchema = {
+export const lists_items$$list$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -202,7 +174,7 @@ export const lists_items_list_response_collection_output: JsonSchema = {
 /**
  * The schema of `lists_list_item_asn_full` in responses.
  */
-export const lists_list_item_asn_full_output: JsonSchema = {
+export const lists_list_item_asn_full: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/lists_list_item_asn_object"
@@ -216,10 +188,10 @@ export const lists_list_item_asn_full_output: JsonSchema = {
 /**
  * The schema of `lists_list_item_asn_object` in responses.
  */
-export const lists_list_item_asn_object_output: JsonSchema = {
+export const lists_list_item_asn_object: JsonSchema = {
   "properties": {
     "asn": {
-      "$ref": "#/$defs/lists_item_asn"
+      "type": "integer"
     }
   },
   "required": [
@@ -231,7 +203,7 @@ export const lists_list_item_asn_object_output: JsonSchema = {
 /**
  * The schema of `lists_list_item_hostname_full` in responses.
  */
-export const lists_list_item_hostname_full_output: JsonSchema = {
+export const lists_list_item_hostname_full: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/lists_list_item_hostname_object"
@@ -245,7 +217,7 @@ export const lists_list_item_hostname_full_output: JsonSchema = {
 /**
  * The schema of `lists_list_item_hostname_object` in responses.
  */
-export const lists_list_item_hostname_object_output: JsonSchema = {
+export const lists_list_item_hostname_object: JsonSchema = {
   "properties": {
     "hostname": {
       "$ref": "#/$defs/lists_item_hostname"
@@ -260,7 +232,7 @@ export const lists_list_item_hostname_object_output: JsonSchema = {
 /**
  * The schema of `lists_list_item_ip_full` in responses.
  */
-export const lists_list_item_ip_full_output: JsonSchema = {
+export const lists_list_item_ip_full: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/lists_list_item_ip_object"
@@ -274,10 +246,10 @@ export const lists_list_item_ip_full_output: JsonSchema = {
 /**
  * The schema of `lists_list_item_ip_object` in responses.
  */
-export const lists_list_item_ip_object_output: JsonSchema = {
+export const lists_list_item_ip_object: JsonSchema = {
   "properties": {
     "ip": {
-      "$ref": "#/$defs/lists_item_ip"
+      "type": "string"
     }
   },
   "required": [
@@ -289,7 +261,7 @@ export const lists_list_item_ip_object_output: JsonSchema = {
 /**
  * The schema of `lists_list_item_redirect_full` in responses.
  */
-export const lists_list_item_redirect_full_output: JsonSchema = {
+export const lists_list_item_redirect_full: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/lists_list_item_redirect_object"
@@ -303,7 +275,7 @@ export const lists_list_item_redirect_full_output: JsonSchema = {
 /**
  * The schema of `lists_list_item_redirect_object` in responses.
  */
-export const lists_list_item_redirect_object_output: JsonSchema = {
+export const lists_list_item_redirect_object: JsonSchema = {
   "properties": {
     "redirect": {
       "$ref": "#/$defs/lists_item_redirect"
@@ -318,14 +290,14 @@ export const lists_list_item_redirect_object_output: JsonSchema = {
 /**
  * The schema of `lists_lists-async-response` in responses.
  */
-export const lists_lists_async_response_output: JsonSchema = {
+export const lists_lists$$async$$response: JsonSchema = {
   "allOf": [
     {
       "properties": {
         "result": {
           "properties": {
             "operation_id": {
-              "$ref": "#/$defs/lists_operation_id"
+              "type": "string"
             }
           },
           "required": [
diff --git a/src/generated/forge-mcp/rules/lists/items/schemas.ts b/src/generated/forge-mcp/rules/lists/items/schemas.ts
index 2fa2ad6f2..993b657fc 100644
--- a/src/generated/forge-mcp/rules/lists/items/schemas.ts
+++ b/src/generated/forge-mcp/rules/lists/items/schemas.ts
@@ -3,30 +3,14 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `lists_item_asn`.
- */
-export const lists_item_asn: JsonSchema = {
-  "description": "Defines a non-negative 32 bit integer.",
-  "type": "integer"
-};
-
-/**
- * The schema of `lists_item_comment`.
- */
-export const lists_item_comment: JsonSchema = {
-  "description": "Defines an informative summary of the list item.",
-  "type": "string"
-};
-
 /**
  * The schema of `lists_item_comment_object`.
  */
 export const lists_item_comment_object: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/lists_item_comment",
-      "description": "Defines an informative summary of the list item."
+      "description": "Defines an informative summary of the list item.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -52,22 +36,6 @@ export const lists_item_hostname: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `lists_item_id`.
- */
-export const lists_item_id: JsonSchema = {
-  "description": "Defines the unique ID of the item in the List.",
-  "type": "string"
-};
-
-/**
- * The schema of `lists_item_ip`.
- */
-export const lists_item_ip: JsonSchema = {
-  "description": "An IPv4 address, an IPv4 CIDR, an IPv6 address, or an IPv6 CIDR.",
-  "type": "string"
-};
-
 /**
  * The schema of `lists_item_redirect`.
  */
@@ -117,7 +85,7 @@ export const lists_item_redirect: JsonSchema = {
 /**
  * The schema of `lists_items-update-request-collection`.
  */
-export const lists_items_update_request_collection: JsonSchema = {
+export const lists_items$$update$$request$$collection: JsonSchema = {
   "items": {
     "oneOf": [
       {
@@ -157,8 +125,8 @@ export const lists_list_item_asn_comment: JsonSchema = {
 export const lists_list_item_asn_object: JsonSchema = {
   "properties": {
     "asn": {
-      "$ref": "#/$defs/lists_item_asn",
-      "description": "Defines a non-negative 32 bit integer."
+      "description": "Defines a non-negative 32 bit integer.",
+      "type": "integer"
     }
   },
   "required": [
@@ -217,8 +185,8 @@ export const lists_list_item_ip_comment: JsonSchema = {
 export const lists_list_item_ip_object: JsonSchema = {
   "properties": {
     "ip": {
-      "$ref": "#/$defs/lists_item_ip",
-      "description": "An IPv4 address, an IPv4 CIDR, an IPv6 address, or an IPv6 CIDR."
+      "description": "An IPv4 address, an IPv4 CIDR, an IPv6 address, or an IPv6 CIDR.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/rules/lists/items/tools.ts b/src/generated/forge-mcp/rules/lists/items/tools.ts
index abaff3e1b..4fb204c49 100644
--- a/src/generated/forge-mcp/rules/lists/items/tools.ts
+++ b/src/generated/forge-mcp/rules/lists/items/tools.ts
@@ -1,56 +1,44 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  lists_api_response_collection_output,
-  lists_api_response_common_failure_output,
-  lists_api_response_common_output,
-  lists_created_on_output,
-  lists_messages_output,
-  lists_modified_on_output,
-  lists_operation_id_output,
+  lists_api$$response$$collection,
+  lists_api$$response$$common,
+  lists_api$$response$$common$$failure,
+  lists_messages,
 } from "../outputs.js";
-import { lists_account_id, lists_list_id } from "../schemas.js";
 import {
-  lists_item_asn_output,
-  lists_item_base_output,
-  lists_item_comment_output,
-  lists_item_hostname_output,
-  lists_item_id_output,
-  lists_item_ip_output,
-  lists_item_output,
-  lists_item_redirect_output,
-  lists_item_response_single_output,
-  lists_items_list_response_collection_output,
-  lists_items_output,
-  lists_list_item_asn_full_output,
-  lists_list_item_asn_object_output,
-  lists_list_item_hostname_full_output,
-  lists_list_item_hostname_object_output,
-  lists_list_item_ip_full_output,
-  lists_list_item_ip_object_output,
-  lists_list_item_redirect_full_output,
-  lists_list_item_redirect_object_output,
-  lists_lists_async_response_output,
+  lists_item,
+  lists_item$$response$$single,
+  lists_item_base,
+  lists_item_hostname,
+  lists_item_redirect,
+  lists_items,
+  lists_items$$list$$response$$collection,
+  lists_list_item_asn_full,
+  lists_list_item_asn_object,
+  lists_list_item_hostname_full,
+  lists_list_item_hostname_object,
+  lists_list_item_ip_full,
+  lists_list_item_ip_object,
+  lists_list_item_redirect_full,
+  lists_list_item_redirect_object,
+  lists_lists$$async$$response,
 } from "./outputs.js";
 import {
-  lists_item_asn,
-  lists_item_comment,
   lists_item_comment_object,
-  lists_item_hostname,
-  lists_item_id,
-  lists_item_ip,
-  lists_item_redirect,
-  lists_items_update_request_collection,
+  lists_item_hostname as lists_item_hostname$,
+  lists_item_redirect as lists_item_redirect$,
+  lists_items$$update$$request$$collection,
   lists_list_item_asn_comment,
-  lists_list_item_asn_object,
+  lists_list_item_asn_object as lists_list_item_asn_object$,
   lists_list_item_hostname_comment,
-  lists_list_item_hostname_object,
+  lists_list_item_hostname_object as lists_list_item_hostname_object$,
   lists_list_item_ip_comment,
-  lists_list_item_ip_object,
+  lists_list_item_ip_object as lists_list_item_ip_object$,
   lists_list_item_redirect_comment,
-  lists_list_item_redirect_object,
+  lists_list_item_redirect_object as lists_list_item_redirect_object$,
 } from "./schemas.js";
 
 /**
@@ -60,55 +48,59 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_items_create",
     title: "Create list items",
-    description: "Appends new items to the list.\n\nThis operation is asynchronous. To get the current operation status, invoke the `Get bulk operation status` endpoint with the returned `operation_id`.\n\nThere is a limit of 1 pending bulk operation per account. If an outstanding bulk operation is in progress, the request will be rejected.",
+    description: "Appends new items to the list.\n\nThis operation is asynchronous. To get the current operation status, invoke the `Get bulk operation status` endpoint with the returned `operation_id`.\n\nThere is a limit of 1 pending bulk operation per account. If an outstanding bulk operation is in progress, the request will be rejected.\n\nPOST /accounts/{account_id}/rules/lists/{list_id}/items",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
         "body": {
           "$ref": "#/$defs/lists_items-update-request-collection"
         },
-        "list_id": {
-          "$ref": "#/$defs/lists_list_id",
-          "description": "The unique ID of the list."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "The unique ID of the list.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_item_asn": lists_item_asn,
-        "lists_item_comment": lists_item_comment,
         "lists_item_comment_object": lists_item_comment_object,
-        "lists_item_hostname": lists_item_hostname,
-        "lists_item_ip": lists_item_ip,
-        "lists_item_redirect": lists_item_redirect,
-        "lists_items-update-request-collection": lists_items_update_request_collection,
-        "lists_list_id": lists_list_id,
+        "lists_item_hostname": lists_item_hostname$,
+        "lists_item_redirect": lists_item_redirect$,
+        "lists_items-update-request-collection": lists_items$$update$$request$$collection,
         "lists_list_item_asn_comment": lists_list_item_asn_comment,
-        "lists_list_item_asn_object": lists_list_item_asn_object,
+        "lists_list_item_asn_object": lists_list_item_asn_object$,
         "lists_list_item_hostname_comment": lists_list_item_hostname_comment,
-        "lists_list_item_hostname_object": lists_list_item_hostname_object,
+        "lists_list_item_hostname_object": lists_list_item_hostname_object$,
         "lists_list_item_ip_comment": lists_list_item_ip_comment,
-        "lists_list_item_ip_object": lists_list_item_ip_object,
+        "lists_list_item_ip_object": lists_list_item_ip_object$,
         "lists_list_item_redirect_comment": lists_list_item_redirect_comment,
-        "lists_list_item_redirect_object": lists_list_item_redirect_object,
+        "lists_list_item_redirect_object": lists_list_item_redirect_object$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/lists_lists-async-response",
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_lists-async-response": lists_lists_async_response_output,
-        "lists_messages": lists_messages_output,
-        "lists_operation_id": lists_operation_id_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_lists-async-response": lists_lists$$async$$response,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -148,12 +140,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_lists-async-response": lists_lists_async_response_output,
-        "lists_messages": lists_messages_output,
-        "lists_operation_id": lists_operation_id_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_lists-async-response": lists_lists$$async$$response,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
@@ -164,14 +155,10 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_items_delete",
     title: "Delete list items",
-    description: "Removes one or more items from a list.\n\nThis operation is asynchronous. To get the current operation status, invoke the `Get bulk operation status` endpoint with the returned `operation_id`.\n\nThere is a limit of 1 pending bulk operation per account. If an outstanding bulk operation is in progress, the request will be rejected.\n\nConfirm with the user before calling this tool. This operation deletes the selected items from the custom list.",
+    description: "Removes one or more items from a list.\n\nThis operation is asynchronous. To get the current operation status, invoke the `Get bulk operation status` endpoint with the returned `operation_id`.\n\nThere is a limit of 1 pending bulk operation per account. If an outstanding bulk operation is in progress, the request will be rejected.\n\nConfirm with the user before calling this tool. This operation deletes the selected items from the custom list.\n\nDELETE /accounts/{account_id}/rules/lists/{list_id}/items",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
         "body": {
           "properties": {
             "items": {
@@ -194,29 +181,38 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "list_id": {
-          "$ref": "#/$defs/lists_list_id",
-          "description": "The unique ID of the list."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "The unique ID of the list.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_list_id": lists_list_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_lists-async-response",
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_lists-async-response": lists_lists_async_response_output,
-        "lists_messages": lists_messages_output,
-        "lists_operation_id": lists_operation_id_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_lists-async-response": lists_lists$$async$$response,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -256,12 +252,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_lists-async-response": lists_lists_async_response_output,
-        "lists_messages": lists_messages_output,
-        "lists_operation_id": lists_operation_id_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_lists-async-response": lists_lists$$async$$response,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
@@ -272,58 +267,57 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_items_get",
     title: "Get a list item",
-    description: "Fetches a list item in the list.",
+    description: "Fetches a list item in the list.\n\nGET /accounts/{account_id}/rules/lists/{list_id}/items/{item_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
-        "item_id": {
-          "$ref": "#/$defs/lists_item_id",
-          "description": "Defines the unique ID of the item in the List."
-        },
-        "list_id": {
-          "$ref": "#/$defs/lists_list_id",
-          "description": "The unique ID of the list."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "item_id": {
+              "description": "Defines the unique ID of the item in the List.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "The unique ID of the list.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id",
+            "item_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id",
-        "item_id"
+        "path"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_item_id": lists_item_id,
-        "lists_list_id": lists_list_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_item-response-single",
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_item": lists_item_output,
-        "lists_item-response-single": lists_item_response_single_output,
-        "lists_item_asn": lists_item_asn_output,
-        "lists_item_base": lists_item_base_output,
-        "lists_item_comment": lists_item_comment_output,
-        "lists_item_hostname": lists_item_hostname_output,
-        "lists_item_id": lists_item_id_output,
-        "lists_item_ip": lists_item_ip_output,
-        "lists_item_redirect": lists_item_redirect_output,
-        "lists_list_item_asn_full": lists_list_item_asn_full_output,
-        "lists_list_item_asn_object": lists_list_item_asn_object_output,
-        "lists_list_item_hostname_full": lists_list_item_hostname_full_output,
-        "lists_list_item_hostname_object": lists_list_item_hostname_object_output,
-        "lists_list_item_ip_full": lists_list_item_ip_full_output,
-        "lists_list_item_ip_object": lists_list_item_ip_object_output,
-        "lists_list_item_redirect_full": lists_list_item_redirect_full_output,
-        "lists_list_item_redirect_object": lists_list_item_redirect_object_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_item": lists_item,
+        "lists_item-response-single": lists_item$$response$$single,
+        "lists_item_base": lists_item_base,
+        "lists_item_hostname": lists_item_hostname,
+        "lists_item_redirect": lists_item_redirect,
+        "lists_list_item_asn_full": lists_list_item_asn_full,
+        "lists_list_item_asn_object": lists_list_item_asn_object,
+        "lists_list_item_hostname_full": lists_list_item_hostname_full,
+        "lists_list_item_hostname_object": lists_list_item_hostname_object,
+        "lists_list_item_ip_full": lists_list_item_ip_full,
+        "lists_list_item_ip_object": lists_list_item_ip_object,
+        "lists_list_item_redirect_full": lists_list_item_redirect_full,
+        "lists_list_item_redirect_object": lists_list_item_redirect_object,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -364,28 +358,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_item": lists_item_output,
-        "lists_item-response-single": lists_item_response_single_output,
-        "lists_item_asn": lists_item_asn_output,
-        "lists_item_base": lists_item_base_output,
-        "lists_item_comment": lists_item_comment_output,
-        "lists_item_hostname": lists_item_hostname_output,
-        "lists_item_id": lists_item_id_output,
-        "lists_item_ip": lists_item_ip_output,
-        "lists_item_redirect": lists_item_redirect_output,
-        "lists_list_item_asn_full": lists_list_item_asn_full_output,
-        "lists_list_item_asn_object": lists_list_item_asn_object_output,
-        "lists_list_item_hostname_full": lists_list_item_hostname_full_output,
-        "lists_list_item_hostname_object": lists_list_item_hostname_object_output,
-        "lists_list_item_ip_full": lists_list_item_ip_full_output,
-        "lists_list_item_ip_object": lists_list_item_ip_object_output,
-        "lists_list_item_redirect_full": lists_list_item_redirect_full_output,
-        "lists_list_item_redirect_object": lists_list_item_redirect_object_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_item": lists_item,
+        "lists_item-response-single": lists_item$$response$$single,
+        "lists_item_base": lists_item_base,
+        "lists_item_hostname": lists_item_hostname,
+        "lists_item_redirect": lists_item_redirect,
+        "lists_list_item_asn_full": lists_list_item_asn_full,
+        "lists_list_item_asn_object": lists_list_item_asn_object,
+        "lists_list_item_hostname_full": lists_list_item_hostname_full,
+        "lists_list_item_hostname_object": lists_list_item_hostname_object,
+        "lists_list_item_ip_full": lists_list_item_ip_full,
+        "lists_list_item_ip_object": lists_list_item_ip_object,
+        "lists_list_item_redirect_full": lists_list_item_redirect_full,
+        "lists_list_item_redirect_object": lists_list_item_redirect_object,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
@@ -395,66 +383,72 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_items_list",
     title: "Get list items",
-    description: "Fetches all the items in the list.",
+    description: "Fetches all the items in the list.\n\nGET /accounts/{account_id}/rules/lists/{list_id}/items",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
-        "cursor": {
-          "description": "The pagination cursor. An opaque string token that indicates where to continue when requesting the next/previous set of records. The response provides cursor values under `result_info.cursors`. You should make no assumptions about a cursor's content or length.",
-          "type": "string"
-        },
-        "list_id": {
-          "$ref": "#/$defs/lists_list_id",
-          "description": "The unique ID of the list."
-        },
-        "per_page": {
-          "description": "Amount of results to include in each paginated response. A non-negative 32 bit integer.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "The unique ID of the list.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "A search query to filter returned items. Its meaning depends on the list type: IP addresses must start with the provided string, hostnames and bulk redirects must contain the string, and ASNs must match the string exactly.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "The pagination cursor. An opaque string token that indicates where to continue when requesting the next/previous set of records. The response provides cursor values under `result_info.cursors`. You should make no assumptions about a cursor's content or length.",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "Amount of results to include in each paginated response. A non-negative 32 bit integer.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "A search query to filter returned items. Its meaning depends on the list type: IP addresses must start with the provided string, hostnames and bulk redirects must contain the string, and ASNs must match the string exactly.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id"
+        "path"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_list_id": lists_list_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_items-list-response-collection",
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_item": lists_item_output,
-        "lists_item_asn": lists_item_asn_output,
-        "lists_item_base": lists_item_base_output,
-        "lists_item_comment": lists_item_comment_output,
-        "lists_item_hostname": lists_item_hostname_output,
-        "lists_item_id": lists_item_id_output,
-        "lists_item_ip": lists_item_ip_output,
-        "lists_item_redirect": lists_item_redirect_output,
-        "lists_items": lists_items_output,
-        "lists_items-list-response-collection": lists_items_list_response_collection_output,
-        "lists_list_item_asn_full": lists_list_item_asn_full_output,
-        "lists_list_item_asn_object": lists_list_item_asn_object_output,
-        "lists_list_item_hostname_full": lists_list_item_hostname_full_output,
-        "lists_list_item_hostname_object": lists_list_item_hostname_object_output,
-        "lists_list_item_ip_full": lists_list_item_ip_full_output,
-        "lists_list_item_ip_object": lists_list_item_ip_object_output,
-        "lists_list_item_redirect_full": lists_list_item_redirect_full_output,
-        "lists_list_item_redirect_object": lists_list_item_redirect_object_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_item": lists_item,
+        "lists_item_base": lists_item_base,
+        "lists_item_hostname": lists_item_hostname,
+        "lists_item_redirect": lists_item_redirect,
+        "lists_items": lists_items,
+        "lists_items-list-response-collection": lists_items$$list$$response$$collection,
+        "lists_list_item_asn_full": lists_list_item_asn_full,
+        "lists_list_item_asn_object": lists_list_item_asn_object,
+        "lists_list_item_hostname_full": lists_list_item_hostname_full,
+        "lists_list_item_hostname_object": lists_list_item_hostname_object,
+        "lists_list_item_ip_full": lists_list_item_ip_full,
+        "lists_list_item_ip_object": lists_list_item_ip_object,
+        "lists_list_item_redirect_full": lists_list_item_redirect_full,
+        "lists_list_item_redirect_object": lists_list_item_redirect_object,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -495,93 +489,91 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_item": lists_item_output,
-        "lists_item_asn": lists_item_asn_output,
-        "lists_item_base": lists_item_base_output,
-        "lists_item_comment": lists_item_comment_output,
-        "lists_item_hostname": lists_item_hostname_output,
-        "lists_item_id": lists_item_id_output,
-        "lists_item_ip": lists_item_ip_output,
-        "lists_item_redirect": lists_item_redirect_output,
-        "lists_items": lists_items_output,
-        "lists_items-list-response-collection": lists_items_list_response_collection_output,
-        "lists_list_item_asn_full": lists_list_item_asn_full_output,
-        "lists_list_item_asn_object": lists_list_item_asn_object_output,
-        "lists_list_item_hostname_full": lists_list_item_hostname_full_output,
-        "lists_list_item_hostname_object": lists_list_item_hostname_object_output,
-        "lists_list_item_ip_full": lists_list_item_ip_full_output,
-        "lists_list_item_ip_object": lists_list_item_ip_object_output,
-        "lists_list_item_redirect_full": lists_list_item_redirect_full_output,
-        "lists_list_item_redirect_object": lists_list_item_redirect_object_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_item": lists_item,
+        "lists_item_base": lists_item_base,
+        "lists_item_hostname": lists_item_hostname,
+        "lists_item_redirect": lists_item_redirect,
+        "lists_items": lists_items,
+        "lists_items-list-response-collection": lists_items$$list$$response$$collection,
+        "lists_list_item_asn_full": lists_list_item_asn_full,
+        "lists_list_item_asn_object": lists_list_item_asn_object,
+        "lists_list_item_hostname_full": lists_list_item_hostname_full,
+        "lists_list_item_hostname_object": lists_list_item_hostname_object,
+        "lists_list_item_ip_full": lists_list_item_ip_full,
+        "lists_list_item_ip_object": lists_list_item_ip_object,
+        "lists_list_item_redirect_full": lists_list_item_redirect_full,
+        "lists_list_item_redirect_object": lists_list_item_redirect_object,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/rules/lists/${pathParam(args, "list_id")}/items`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
   {
     name: "rules_lists_items_update",
     title: "Update all list items",
-    description: "Removes all existing items from the list and adds the provided items to the list.\n\nThis operation is asynchronous. To get the current operation status, invoke the `Get bulk operation status` endpoint with the returned `operation_id`.\n\nThere is a limit of 1 pending bulk operation per account. If an outstanding bulk operation is in progress, the request will be rejected.",
+    description: "Removes all existing items from the list and adds the provided items to the list.\n\nThis operation is asynchronous. To get the current operation status, invoke the `Get bulk operation status` endpoint with the returned `operation_id`.\n\nThere is a limit of 1 pending bulk operation per account. If an outstanding bulk operation is in progress, the request will be rejected.\n\nPUT /accounts/{account_id}/rules/lists/{list_id}/items",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
         "body": {
           "$ref": "#/$defs/lists_items-update-request-collection"
         },
-        "list_id": {
-          "$ref": "#/$defs/lists_list_id",
-          "description": "The unique ID of the list."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "The unique ID of the list.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_item_asn": lists_item_asn,
-        "lists_item_comment": lists_item_comment,
         "lists_item_comment_object": lists_item_comment_object,
-        "lists_item_hostname": lists_item_hostname,
-        "lists_item_ip": lists_item_ip,
-        "lists_item_redirect": lists_item_redirect,
-        "lists_items-update-request-collection": lists_items_update_request_collection,
-        "lists_list_id": lists_list_id,
+        "lists_item_hostname": lists_item_hostname$,
+        "lists_item_redirect": lists_item_redirect$,
+        "lists_items-update-request-collection": lists_items$$update$$request$$collection,
         "lists_list_item_asn_comment": lists_list_item_asn_comment,
-        "lists_list_item_asn_object": lists_list_item_asn_object,
+        "lists_list_item_asn_object": lists_list_item_asn_object$,
         "lists_list_item_hostname_comment": lists_list_item_hostname_comment,
-        "lists_list_item_hostname_object": lists_list_item_hostname_object,
+        "lists_list_item_hostname_object": lists_list_item_hostname_object$,
         "lists_list_item_ip_comment": lists_list_item_ip_comment,
-        "lists_list_item_ip_object": lists_list_item_ip_object,
+        "lists_list_item_ip_object": lists_list_item_ip_object$,
         "lists_list_item_redirect_comment": lists_list_item_redirect_comment,
-        "lists_list_item_redirect_object": lists_list_item_redirect_object,
+        "lists_list_item_redirect_object": lists_list_item_redirect_object$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/lists_lists-async-response",
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_lists-async-response": lists_lists_async_response_output,
-        "lists_messages": lists_messages_output,
-        "lists_operation_id": lists_operation_id_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_lists-async-response": lists_lists$$async$$response,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -621,12 +613,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_lists-async-response": lists_lists_async_response_output,
-        "lists_messages": lists_messages_output,
-        "lists_operation_id": lists_operation_id_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_lists-async-response": lists_lists$$async$$response,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/rules/lists/outputs.ts b/src/generated/forge-mcp/rules/lists/outputs.ts
index 387eb404f..714a68fb2 100644
--- a/src/generated/forge-mcp/rules/lists/outputs.ts
+++ b/src/generated/forge-mcp/rules/lists/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `lists_api-response-collection` in responses.
  */
-export const lists_api_response_collection_output: JsonSchema = {
+export const lists_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -35,7 +35,7 @@ export const lists_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `lists_api-response-common` in responses.
  */
-export const lists_api_response_common_output: JsonSchema = {
+export const lists_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/lists_messages"
@@ -75,7 +75,7 @@ export const lists_api_response_common_output: JsonSchema = {
 /**
  * The schema of `lists_api-response-common-failure` in responses.
  */
-export const lists_api_response_common_failure_output: JsonSchema = {
+export const lists_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/lists_messages"
@@ -102,61 +102,40 @@ export const lists_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `lists_created_on` in responses.
- */
-export const lists_created_on_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `lists_description` in responses.
- */
-export const lists_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `lists_kind` in responses.
- */
-export const lists_kind_output: JsonSchema = {
-  "enum": [
-    "ip",
-    "redirect",
-    "hostname",
-    "asn"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `lists_list` in responses.
  */
-export const lists_list_output: JsonSchema = {
+export const lists_list: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/lists_created_on"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/lists_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/lists_list_id"
+      "type": "string"
     },
     "kind": {
-      "$ref": "#/$defs/lists_kind"
+      "enum": [
+        "ip",
+        "redirect",
+        "hostname",
+        "asn"
+      ],
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/lists_modified_on"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/lists_name"
+      "type": "string"
     },
     "num_items": {
-      "$ref": "#/$defs/lists_num_items"
+      "type": "number"
     },
     "num_referencing_filters": {
-      "$ref": "#/$defs/lists_num_referencing_filters"
+      "type": "number"
     }
   },
   "required": [
@@ -174,14 +153,14 @@ export const lists_list_output: JsonSchema = {
 /**
  * The schema of `lists_list-delete-response-collection` in responses.
  */
-export const lists_list_delete_response_collection_output: JsonSchema = {
+export const lists_list$$delete$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "properties": {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/lists_list_id"
+              "type": "string"
             }
           },
           "required": [
@@ -201,7 +180,7 @@ export const lists_list_delete_response_collection_output: JsonSchema = {
 /**
  * The schema of `lists_list-response-collection` in responses.
  */
-export const lists_list_response_collection_output: JsonSchema = {
+export const lists_list$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -217,17 +196,10 @@ export const lists_list_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `lists_list_id` in responses.
- */
-export const lists_list_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `lists_lists-response-collection` in responses.
  */
-export const lists_lists_response_collection_output: JsonSchema = {
+export const lists_lists$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -249,7 +221,7 @@ export const lists_lists_response_collection_output: JsonSchema = {
 /**
  * The schema of `lists_messages` in responses.
  */
-export const lists_messages_output: JsonSchema = {
+export const lists_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -267,38 +239,3 @@ export const lists_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `lists_modified_on` in responses.
- */
-export const lists_modified_on_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `lists_name` in responses.
- */
-export const lists_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `lists_num_items` in responses.
- */
-export const lists_num_items_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `lists_num_referencing_filters` in responses.
- */
-export const lists_num_referencing_filters_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `lists_operation_id` in responses.
- */
-export const lists_operation_id_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/rules/lists/schemas.ts b/src/generated/forge-mcp/rules/lists/schemas.ts
deleted file mode 100644
index 0c3a3d36a..000000000
--- a/src/generated/forge-mcp/rules/lists/schemas.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `lists_account_id`.
- */
-export const lists_account_id: JsonSchema = {
-  "description": "The Account ID for this resource.",
-  "type": "string"
-};
-
-/**
- * The schema of `lists_description`.
- */
-export const lists_description: JsonSchema = {
-  "description": "An informative summary of the list.",
-  "type": "string"
-};
-
-/**
- * The schema of `lists_kind`.
- */
-export const lists_kind: JsonSchema = {
-  "description": "The type of the list. Each type supports specific list items (IP addresses, ASNs, hostnames or redirects).",
-  "enum": [
-    "ip",
-    "redirect",
-    "hostname",
-    "asn"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `lists_list_id`.
- */
-export const lists_list_id: JsonSchema = {
-  "description": "The unique ID of the list.",
-  "type": "string"
-};
-
-/**
- * The schema of `lists_name`.
- */
-export const lists_name: JsonSchema = {
-  "description": "An informative name for the list. Use this name in filter and rule expressions.",
-  "type": "string"
-};
-
-/**
- * The schema of `lists_operation_id`.
- */
-export const lists_operation_id: JsonSchema = {
-  "description": "The unique operation ID of the asynchronous action.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/rules/lists/tools.ts b/src/generated/forge-mcp/rules/lists/tools.ts
index e1bec6fd9..e35e1f477 100644
--- a/src/generated/forge-mcp/rules/lists/tools.ts
+++ b/src/generated/forge-mcp/rules/lists/tools.ts
@@ -3,30 +3,15 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  lists_api_response_collection_output,
-  lists_api_response_common_failure_output,
-  lists_api_response_common_output,
-  lists_created_on_output,
-  lists_description_output,
-  lists_kind_output,
-  lists_list_delete_response_collection_output,
-  lists_list_id_output,
-  lists_list_output,
-  lists_list_response_collection_output,
-  lists_lists_response_collection_output,
-  lists_messages_output,
-  lists_modified_on_output,
-  lists_name_output,
-  lists_num_items_output,
-  lists_num_referencing_filters_output,
+  lists_api$$response$$collection,
+  lists_api$$response$$common,
+  lists_api$$response$$common$$failure,
+  lists_list,
+  lists_list$$delete$$response$$collection,
+  lists_list$$response$$collection,
+  lists_lists$$response$$collection,
+  lists_messages,
 } from "./outputs.js";
-import {
-  lists_account_id,
-  lists_description,
-  lists_kind,
-  lists_list_id,
-  lists_name,
-} from "./schemas.js";
 
 /**
  * The tools of `rules.lists`.
@@ -35,27 +20,29 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_create",
     title: "Create a list",
-    description: "Creates a new list of the specified kind.",
+    description: "Creates a new list of the specified kind.\n\nPOST /accounts/{account_id}/rules/lists",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/lists_description",
-              "description": "An informative summary of the list."
+              "description": "An informative summary of the list.",
+              "type": "string"
             },
             "kind": {
-              "$ref": "#/$defs/lists_kind",
-              "description": "The type of the list. Each type supports specific list items (IP addresses, ASNs, hostnames or redirects)."
+              "description": "The type of the list. Each type supports specific list items (IP addresses, ASNs, hostnames or redirects).",
+              "enum": [
+                "ip",
+                "redirect",
+                "hostname",
+                "asn"
+              ],
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/lists_name",
-              "description": "An informative name for the list. Use this name in filter and rule expressions."
+              "description": "An informative name for the list. Use this name in filter and rule expressions.",
+              "type": "string"
             }
           },
           "required": [
@@ -63,34 +50,34 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_description": lists_description,
-        "lists_kind": lists_kind,
-        "lists_name": lists_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_list-response-collection",
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_description": lists_description_output,
-        "lists_kind": lists_kind_output,
-        "lists_list": lists_list_output,
-        "lists_list-response-collection": lists_list_response_collection_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
-        "lists_name": lists_name_output,
-        "lists_num_items": lists_num_items_output,
-        "lists_num_referencing_filters": lists_num_referencing_filters_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_list": lists_list,
+        "lists_list-response-collection": lists_list$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -130,19 +117,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_description": lists_description_output,
-        "lists_kind": lists_kind_output,
-        "lists_list": lists_list_output,
-        "lists_list-response-collection": lists_list_response_collection_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
-        "lists_name": lists_name_output,
-        "lists_num_items": lists_num_items_output,
-        "lists_num_referencing_filters": lists_num_referencing_filters_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_list": lists_list,
+        "lists_list-response-collection": lists_list$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
@@ -153,35 +132,40 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_delete",
     title: "Delete a list",
-    description: "Deletes a specific list and all its items.\n\nConfirm with the user before calling this tool. This operation deletes the custom list and every item it contains.",
+    description: "Deletes a specific list and all its items.\n\nConfirm with the user before calling this tool. This operation deletes the custom list and every item it contains.\n\nDELETE /accounts/{account_id}/rules/lists/{list_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
-        "list_id": {
-          "$ref": "#/$defs/lists_list_id",
-          "description": "The unique ID of the list."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "The unique ID of the list.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id"
+        "path"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_list_id": lists_list_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_list-delete-response-collection",
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_list-delete-response-collection": lists_list_delete_response_collection_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_messages": lists_messages_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_list-delete-response-collection": lists_list$$delete$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -221,11 +205,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_list-delete-response-collection": lists_list_delete_response_collection_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_messages": lists_messages_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_list-delete-response-collection": lists_list$$delete$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
@@ -235,43 +218,41 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_get",
     title: "Get a list",
-    description: "Fetches the details of a list.",
+    description: "Fetches the details of a list.\n\nGET /accounts/{account_id}/rules/lists/{list_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
-        "list_id": {
-          "$ref": "#/$defs/lists_list_id",
-          "description": "The unique ID of the list."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "The unique ID of the list.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id"
+        "path"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_list_id": lists_list_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_list-response-collection",
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_description": lists_description_output,
-        "lists_kind": lists_kind_output,
-        "lists_list": lists_list_output,
-        "lists_list-response-collection": lists_list_response_collection_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
-        "lists_name": lists_name_output,
-        "lists_num_items": lists_num_items_output,
-        "lists_num_referencing_filters": lists_num_referencing_filters_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_list": lists_list,
+        "lists_list-response-collection": lists_list$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -311,19 +292,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_description": lists_description_output,
-        "lists_kind": lists_kind_output,
-        "lists_list": lists_list_output,
-        "lists_list-response-collection": lists_list_response_collection_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
-        "lists_name": lists_name_output,
-        "lists_num_items": lists_num_items_output,
-        "lists_num_referencing_filters": lists_num_referencing_filters_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_list": lists_list,
+        "lists_list-response-collection": lists_list$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
@@ -333,38 +306,37 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_list",
     title: "Get lists",
-    description: "Fetches all lists in the account.",
+    description: "Fetches all lists in the account.\n\nGET /accounts/{account_id}/rules/lists",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_lists-response-collection",
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_description": lists_description_output,
-        "lists_kind": lists_kind_output,
-        "lists_list": lists_list_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_lists-response-collection": lists_lists_response_collection_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
-        "lists_name": lists_name_output,
-        "lists_num_items": lists_num_items_output,
-        "lists_num_referencing_filters": lists_num_referencing_filters_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_list": lists_list,
+        "lists_lists-response-collection": lists_lists$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -405,20 +377,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-collection": lists_api_response_collection_output,
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_description": lists_description_output,
-        "lists_kind": lists_kind_output,
-        "lists_list": lists_list_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_lists-response-collection": lists_lists_response_collection_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
-        "lists_name": lists_name_output,
-        "lists_num_items": lists_num_items_output,
-        "lists_num_referencing_filters": lists_num_referencing_filters_output,
+        "lists_api-response-collection": lists_api$$response$$collection,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_list": lists_list,
+        "lists_lists-response-collection": lists_lists$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
@@ -428,54 +392,51 @@ export const tools: readonly Tool[] = [
   {
     name: "rules_lists_update",
     title: "Update a list",
-    description: "Updates the description of a list.",
+    description: "Updates the description of a list.\n\nPUT /accounts/{account_id}/rules/lists/{list_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/lists_account_id",
-          "description": "The Account ID for this resource."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/lists_description",
-              "description": "An informative summary of the list."
+              "description": "An informative summary of the list.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "list_id": {
-          "$ref": "#/$defs/lists_list_id",
-          "description": "The unique ID of the list."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The Account ID for this resource.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "The unique ID of the list.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "lists_account_id": lists_account_id,
-        "lists_description": lists_description,
-        "lists_list_id": lists_list_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/lists_list-response-collection",
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_description": lists_description_output,
-        "lists_kind": lists_kind_output,
-        "lists_list": lists_list_output,
-        "lists_list-response-collection": lists_list_response_collection_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
-        "lists_name": lists_name_output,
-        "lists_num_items": lists_num_items_output,
-        "lists_num_referencing_filters": lists_num_referencing_filters_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_list": lists_list,
+        "lists_list-response-collection": lists_list$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     annotations: {
@@ -515,19 +476,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "lists_api-response-common": lists_api_response_common_output,
-        "lists_api-response-common-failure": lists_api_response_common_failure_output,
-        "lists_created_on": lists_created_on_output,
-        "lists_description": lists_description_output,
-        "lists_kind": lists_kind_output,
-        "lists_list": lists_list_output,
-        "lists_list-response-collection": lists_list_response_collection_output,
-        "lists_list_id": lists_list_id_output,
-        "lists_messages": lists_messages_output,
-        "lists_modified_on": lists_modified_on_output,
-        "lists_name": lists_name_output,
-        "lists_num_items": lists_num_items_output,
-        "lists_num_referencing_filters": lists_num_referencing_filters_output,
+        "lists_api-response-common": lists_api$$response$$common,
+        "lists_api-response-common-failure": lists_api$$response$$common$$failure,
+        "lists_list": lists_list,
+        "lists_list-response-collection": lists_list$$response$$collection,
+        "lists_messages": lists_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/rulesets/entrypoint/tools.ts b/src/generated/forge-mcp/rulesets/entrypoint/tools.ts
index 3e044be39..c03e16bc3 100644
--- a/src/generated/forge-mcp/rulesets/entrypoint/tools.ts
+++ b/src/generated/forge-mcp/rulesets/entrypoint/tools.ts
@@ -1,123 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  rulesets_Errors_output,
-  rulesets_Message_output,
-  rulesets_Messages_output,
-  rulesets_Response_output,
+  rulesets_Errors,
+  rulesets_Message,
+  rulesets_Messages,
+  rulesets_Response,
 } from "../../outputs.js";
 import {
-  rulesets_BlockRule_output,
-  rulesets_ChallengeRule_output,
-  rulesets_CompressResponseRule_output,
-  rulesets_DDoSDynamicRule_output,
-  rulesets_ExecuteCategoryOverrides_output,
-  rulesets_ExecuteMatchedData_output,
-  rulesets_ExecuteOverrides_output,
-  rulesets_ExecuteRuleOverrides_output,
-  rulesets_ExecuteRule_output,
-  rulesets_ExecuteSensitivityLevel_output,
-  rulesets_ForceConnectionCloseRule_output,
-  rulesets_JsChallengeRule_output,
-  rulesets_LogCustomFieldCookieFields_output,
-  rulesets_LogCustomFieldRawResponseFields_output,
-  rulesets_LogCustomFieldRequestFields_output,
-  rulesets_LogCustomFieldResponseFields_output,
-  rulesets_LogCustomFieldRule_output,
-  rulesets_LogCustomFieldTransformedRequestFields_output,
-  rulesets_LogRule_output,
-  rulesets_ManagedChallengeRule_output,
-  rulesets_RedirectFromList_output,
-  rulesets_RedirectFromValue_output,
-  rulesets_RedirectRule_output,
-  rulesets_RequestRule_output,
-  rulesets_ResponseRule_output,
-  rulesets_ResponseRules_output,
-  rulesets_RewriteHeaderExpression_output,
-  rulesets_RewriteHeaderOperation_output,
-  rulesets_RewriteHeaderValue_output,
-  rulesets_RewriteHeaders_output,
-  rulesets_RewriteRule_output,
-  rulesets_RewriteUriPath_output,
-  rulesets_RewriteUriQuery_output,
-  rulesets_RewriteUri_output,
-  rulesets_RouteHostHeader_output,
-  rulesets_RouteOrigin_output,
-  rulesets_RouteRule_output,
-  rulesets_RouteSNI_output,
-  rulesets_RuleAction_output,
-  rulesets_RuleCategories_output,
-  rulesets_RuleCategory_output,
-  rulesets_RuleEnabled_output,
-  rulesets_RuleExposedCredentialCheck_output,
-  rulesets_RuleId_output,
-  rulesets_RuleLogging_output,
-  rulesets_RuleRatelimit_output,
-  rulesets_Rule_output,
-  rulesets_RulesetId_output,
-  rulesets_RulesetKind_output,
-  rulesets_RulesetPhase_output,
-  rulesets_RulesetVersion_output,
-  rulesets_Ruleset_output,
-  rulesets_ScoreIncrement_output,
-  rulesets_ScoreRule_output,
-  rulesets_ServeErrorAssetName_output,
-  rulesets_ServeErrorContentType_output,
-  rulesets_ServeErrorContent_output,
-  rulesets_ServeErrorRule_output,
-  rulesets_ServeErrorStatusCode_output,
-  rulesets_SetCacheControlCloudflareOnly_output,
-  rulesets_SetCacheControlDirectiveWithQualifiers_output,
-  rulesets_SetCacheControlDirectiveWithValue_output,
-  rulesets_SetCacheControlDirective_output,
-  rulesets_SetCacheControlOperation_output,
-  rulesets_SetCacheControlRule_output,
-  rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-  rulesets_SetCacheSettingsBrowserTTL_output,
-  rulesets_SetCacheSettingsCacheKey_output,
-  rulesets_SetCacheSettingsCacheReserve_output,
-  rulesets_SetCacheSettingsCache_output,
-  rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-  rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-  rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-  rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-  rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-  rulesets_SetCacheSettingsCustomCacheKey_output,
-  rulesets_SetCacheSettingsEdgeTTL_output,
-  rulesets_SetCacheSettingsOriginCacheControl_output,
-  rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-  rulesets_SetCacheSettingsOriginRangeRequests_output,
-  rulesets_SetCacheSettingsReadTimeout_output,
-  rulesets_SetCacheSettingsRespectStrongEtags_output,
-  rulesets_SetCacheSettingsRule_output,
-  rulesets_SetCacheSettingsServeStale_output,
-  rulesets_SetCacheSettingsSharedDictionary_output,
-  rulesets_SetCacheSettingsStatusCodeTTL_output,
-  rulesets_SetCacheSettingsStripETags_output,
-  rulesets_SetCacheSettingsStripLastModified_output,
-  rulesets_SetCacheSettingsStripSetCookie_output,
-  rulesets_SetCacheSettingsVaryDefault_output,
-  rulesets_SetCacheSettingsVaryHeader_output,
-  rulesets_SetCacheSettingsVary_output,
-  rulesets_SetCacheTagsExpression_output,
-  rulesets_SetCacheTagsOperation_output,
-  rulesets_SetCacheTagsRule_output,
-  rulesets_SetCacheTagsValues_output,
-  rulesets_SetConfigAutominify_output,
-  rulesets_SetConfigRule_output,
-  rulesets_SkipPhase_output,
-  rulesets_SkipPhases_output,
-  rulesets_SkipProducts_output,
-  rulesets_SkipRule_output,
-  rulesets_SkipRules_output,
-  rulesets_SkipRuleset_output,
-  rulesets_SkipRulesets_output,
-  rulesets_TransformResponseHTMLRule_output,
-} from "../outputs.js";
-import {
-  rulesets_AccountId,
   rulesets_BlockRule,
   rulesets_ChallengeRule,
   rulesets_CompressResponseRule,
@@ -127,7 +18,6 @@ import {
   rulesets_ExecuteOverrides,
   rulesets_ExecuteRule,
   rulesets_ExecuteRuleOverrides,
-  rulesets_ExecuteSensitivityLevel,
   rulesets_ForceConnectionCloseRule,
   rulesets_JsChallengeRule,
   rulesets_LogCustomFieldCookieFields,
@@ -142,46 +32,30 @@ import {
   rulesets_RedirectFromValue,
   rulesets_RedirectRule,
   rulesets_RequestRule,
-  rulesets_RequestRules,
-  rulesets_RewriteHeaderExpression,
-  rulesets_RewriteHeaderOperation,
-  rulesets_RewriteHeaderValue,
+  rulesets_ResponseRule,
+  rulesets_ResponseRules,
   rulesets_RewriteHeaders,
   rulesets_RewriteRule,
   rulesets_RewriteUri,
   rulesets_RewriteUriPath,
   rulesets_RewriteUriQuery,
-  rulesets_RouteHostHeader,
   rulesets_RouteOrigin,
   rulesets_RouteRule,
   rulesets_RouteSNI,
   rulesets_Rule,
-  rulesets_RuleAction,
-  rulesets_RuleCategory,
-  rulesets_RuleEnabled,
+  rulesets_RuleCategories,
   rulesets_RuleExposedCredentialCheck,
-  rulesets_RuleId,
   rulesets_RuleLogging,
   rulesets_RuleRatelimit,
   rulesets_Ruleset,
-  rulesets_RulesetId,
-  rulesets_RulesetPhase,
-  rulesets_ScoreIncrement,
   rulesets_ScoreRule,
-  rulesets_ServeErrorAssetName,
-  rulesets_ServeErrorContent,
-  rulesets_ServeErrorContentType,
   rulesets_ServeErrorRule,
-  rulesets_ServeErrorStatusCode,
-  rulesets_SetCacheControlCloudflareOnly,
   rulesets_SetCacheControlDirective,
   rulesets_SetCacheControlDirectiveWithQualifiers,
   rulesets_SetCacheControlDirectiveWithValue,
-  rulesets_SetCacheControlOperation,
   rulesets_SetCacheControlRule,
   rulesets_SetCacheSettingsAdditionalCacheablePorts,
   rulesets_SetCacheSettingsBrowserTTL,
-  rulesets_SetCacheSettingsCache,
   rulesets_SetCacheSettingsCacheKey,
   rulesets_SetCacheSettingsCacheReserve,
   rulesets_SetCacheSettingsCustomCacheKey,
@@ -191,35 +65,98 @@ import {
   rulesets_SetCacheSettingsCustomCacheKeyQueryString,
   rulesets_SetCacheSettingsCustomCacheKeyUser,
   rulesets_SetCacheSettingsEdgeTTL,
-  rulesets_SetCacheSettingsOriginCacheControl,
-  rulesets_SetCacheSettingsOriginErrorPagePassthru,
   rulesets_SetCacheSettingsOriginRangeRequests,
-  rulesets_SetCacheSettingsReadTimeout,
-  rulesets_SetCacheSettingsRespectStrongEtags,
   rulesets_SetCacheSettingsRule,
   rulesets_SetCacheSettingsServeStale,
   rulesets_SetCacheSettingsSharedDictionary,
   rulesets_SetCacheSettingsStatusCodeTTL,
-  rulesets_SetCacheSettingsStripETags,
-  rulesets_SetCacheSettingsStripLastModified,
-  rulesets_SetCacheSettingsStripSetCookie,
   rulesets_SetCacheSettingsVary,
   rulesets_SetCacheSettingsVaryDefault,
   rulesets_SetCacheSettingsVaryHeader,
-  rulesets_SetCacheTagsExpression,
-  rulesets_SetCacheTagsOperation,
   rulesets_SetCacheTagsRule,
   rulesets_SetCacheTagsValues,
   rulesets_SetConfigAutominify,
   rulesets_SetConfigRule,
-  rulesets_SkipPhase,
   rulesets_SkipPhases,
   rulesets_SkipProducts,
   rulesets_SkipRule,
   rulesets_SkipRules,
-  rulesets_SkipRuleset,
   rulesets_SkipRulesets,
   rulesets_TransformResponseHTMLRule,
+} from "../outputs.js";
+import {
+  rulesets_BlockRule as rulesets_BlockRule$,
+  rulesets_ChallengeRule as rulesets_ChallengeRule$,
+  rulesets_CompressResponseRule as rulesets_CompressResponseRule$,
+  rulesets_DDoSDynamicRule as rulesets_DDoSDynamicRule$,
+  rulesets_ExecuteCategoryOverrides as rulesets_ExecuteCategoryOverrides$,
+  rulesets_ExecuteMatchedData as rulesets_ExecuteMatchedData$,
+  rulesets_ExecuteOverrides as rulesets_ExecuteOverrides$,
+  rulesets_ExecuteRule as rulesets_ExecuteRule$,
+  rulesets_ExecuteRuleOverrides as rulesets_ExecuteRuleOverrides$,
+  rulesets_ForceConnectionCloseRule as rulesets_ForceConnectionCloseRule$,
+  rulesets_JsChallengeRule as rulesets_JsChallengeRule$,
+  rulesets_LogCustomFieldCookieFields as rulesets_LogCustomFieldCookieFields$,
+  rulesets_LogCustomFieldRawResponseFields as rulesets_LogCustomFieldRawResponseFields$,
+  rulesets_LogCustomFieldRequestFields as rulesets_LogCustomFieldRequestFields$,
+  rulesets_LogCustomFieldResponseFields as rulesets_LogCustomFieldResponseFields$,
+  rulesets_LogCustomFieldRule as rulesets_LogCustomFieldRule$,
+  rulesets_LogCustomFieldTransformedRequestFields as rulesets_LogCustomFieldTransformedRequestFields$,
+  rulesets_LogRule as rulesets_LogRule$,
+  rulesets_ManagedChallengeRule as rulesets_ManagedChallengeRule$,
+  rulesets_RedirectFromList as rulesets_RedirectFromList$,
+  rulesets_RedirectFromValue as rulesets_RedirectFromValue$,
+  rulesets_RedirectRule as rulesets_RedirectRule$,
+  rulesets_RequestRule as rulesets_RequestRule$,
+  rulesets_RequestRules,
+  rulesets_RewriteHeaders as rulesets_RewriteHeaders$,
+  rulesets_RewriteRule as rulesets_RewriteRule$,
+  rulesets_RewriteUri as rulesets_RewriteUri$,
+  rulesets_RewriteUriPath as rulesets_RewriteUriPath$,
+  rulesets_RewriteUriQuery as rulesets_RewriteUriQuery$,
+  rulesets_RouteOrigin as rulesets_RouteOrigin$,
+  rulesets_RouteRule as rulesets_RouteRule$,
+  rulesets_RouteSNI as rulesets_RouteSNI$,
+  rulesets_Rule as rulesets_Rule$,
+  rulesets_RuleExposedCredentialCheck as rulesets_RuleExposedCredentialCheck$,
+  rulesets_RuleLogging as rulesets_RuleLogging$,
+  rulesets_RuleRatelimit as rulesets_RuleRatelimit$,
+  rulesets_Ruleset as rulesets_Ruleset$,
+  rulesets_ScoreRule as rulesets_ScoreRule$,
+  rulesets_ServeErrorRule as rulesets_ServeErrorRule$,
+  rulesets_SetCacheControlDirective as rulesets_SetCacheControlDirective$,
+  rulesets_SetCacheControlDirectiveWithQualifiers as rulesets_SetCacheControlDirectiveWithQualifiers$,
+  rulesets_SetCacheControlDirectiveWithValue as rulesets_SetCacheControlDirectiveWithValue$,
+  rulesets_SetCacheControlRule as rulesets_SetCacheControlRule$,
+  rulesets_SetCacheSettingsAdditionalCacheablePorts as rulesets_SetCacheSettingsAdditionalCacheablePorts$,
+  rulesets_SetCacheSettingsBrowserTTL as rulesets_SetCacheSettingsBrowserTTL$,
+  rulesets_SetCacheSettingsCacheKey as rulesets_SetCacheSettingsCacheKey$,
+  rulesets_SetCacheSettingsCacheReserve as rulesets_SetCacheSettingsCacheReserve$,
+  rulesets_SetCacheSettingsCustomCacheKey as rulesets_SetCacheSettingsCustomCacheKey$,
+  rulesets_SetCacheSettingsCustomCacheKeyCookie as rulesets_SetCacheSettingsCustomCacheKeyCookie$,
+  rulesets_SetCacheSettingsCustomCacheKeyHeader as rulesets_SetCacheSettingsCustomCacheKeyHeader$,
+  rulesets_SetCacheSettingsCustomCacheKeyHost as rulesets_SetCacheSettingsCustomCacheKeyHost$,
+  rulesets_SetCacheSettingsCustomCacheKeyQueryString as rulesets_SetCacheSettingsCustomCacheKeyQueryString$,
+  rulesets_SetCacheSettingsCustomCacheKeyUser as rulesets_SetCacheSettingsCustomCacheKeyUser$,
+  rulesets_SetCacheSettingsEdgeTTL as rulesets_SetCacheSettingsEdgeTTL$,
+  rulesets_SetCacheSettingsOriginRangeRequests as rulesets_SetCacheSettingsOriginRangeRequests$,
+  rulesets_SetCacheSettingsRule as rulesets_SetCacheSettingsRule$,
+  rulesets_SetCacheSettingsServeStale as rulesets_SetCacheSettingsServeStale$,
+  rulesets_SetCacheSettingsSharedDictionary as rulesets_SetCacheSettingsSharedDictionary$,
+  rulesets_SetCacheSettingsStatusCodeTTL as rulesets_SetCacheSettingsStatusCodeTTL$,
+  rulesets_SetCacheSettingsVary as rulesets_SetCacheSettingsVary$,
+  rulesets_SetCacheSettingsVaryDefault as rulesets_SetCacheSettingsVaryDefault$,
+  rulesets_SetCacheSettingsVaryHeader as rulesets_SetCacheSettingsVaryHeader$,
+  rulesets_SetCacheTagsRule as rulesets_SetCacheTagsRule$,
+  rulesets_SetCacheTagsValues as rulesets_SetCacheTagsValues$,
+  rulesets_SetConfigAutominify as rulesets_SetConfigAutominify$,
+  rulesets_SetConfigRule as rulesets_SetConfigRule$,
+  rulesets_SkipPhases as rulesets_SkipPhases$,
+  rulesets_SkipProducts as rulesets_SkipProducts$,
+  rulesets_SkipRule as rulesets_SkipRule$,
+  rulesets_SkipRules as rulesets_SkipRules$,
+  rulesets_SkipRulesets as rulesets_SkipRulesets$,
+  rulesets_TransformResponseHTMLRule as rulesets_TransformResponseHTMLRule$,
 } from "../schemas.js";
 
 /**
@@ -229,36 +166,69 @@ export const tools: readonly Tool[] = [
   {
     name: "rulesets_entrypoint_get",
     title: "Get an account or zone entry point ruleset",
-    description: "Fetches the latest version of the account or zone entry point ruleset for a given phase.",
+    description: "Fetches the latest version of the account or zone entry point ruleset for a given phase.\n\nGET /{account_or_zone}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "ruleset_phase": {
+              "description": "The phase of the ruleset.",
+              "enum": [
+                "ddos_l4",
+                "ddos_l7",
+                "http_config_settings",
+                "http_custom_errors",
+                "http_log_custom_fields",
+                "http_ratelimit",
+                "http_request_cache_settings",
+                "http_request_dynamic_redirect",
+                "http_request_firewall_custom",
+                "http_request_firewall_managed",
+                "http_request_late_transform",
+                "http_request_origin",
+                "http_request_redirect",
+                "http_request_sanitize",
+                "http_request_sbfm",
+                "http_request_transform",
+                "http_response_cache_settings",
+                "http_response_compression",
+                "http_response_firewall_custom",
+                "http_response_firewall_managed",
+                "http_response_headers_transform",
+                "magic_transit",
+                "magic_transit_ids_managed",
+                "magic_transit_managed",
+                "magic_transit_ratelimit"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "ruleset_phase"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "phase": {
-          "$ref": "#/$defs/rulesets_RulesetPhase",
-          "description": "The phase of the ruleset."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "phase"
+        "path"
       ],
-      $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -276,13 +246,46 @@ export const tools: readonly Tool[] = [
                 {
                   "properties": {
                     "kind": {
-                      "$ref": "#/$defs/rulesets_RulesetKind"
+                      "enum": [
+                        "managed",
+                        "custom",
+                        "root",
+                        "zone"
+                      ],
+                      "type": "string"
                     },
                     "name": {
                       "type": "string"
                     },
                     "phase": {
-                      "$ref": "#/$defs/rulesets_RulesetPhase"
+                      "enum": [
+                        "ddos_l4",
+                        "ddos_l7",
+                        "http_config_settings",
+                        "http_custom_errors",
+                        "http_log_custom_fields",
+                        "http_ratelimit",
+                        "http_request_cache_settings",
+                        "http_request_dynamic_redirect",
+                        "http_request_firewall_custom",
+                        "http_request_firewall_managed",
+                        "http_request_late_transform",
+                        "http_request_origin",
+                        "http_request_redirect",
+                        "http_request_sanitize",
+                        "http_request_sbfm",
+                        "http_request_transform",
+                        "http_response_cache_settings",
+                        "http_response_compression",
+                        "http_response_firewall_custom",
+                        "http_response_firewall_managed",
+                        "http_response_headers_transform",
+                        "magic_transit",
+                        "magic_transit_ids_managed",
+                        "magic_transit_managed",
+                        "magic_transit_ratelimit"
+                      ],
+                      "type": "string"
                     },
                     "rules": {
                       "$ref": "#/$defs/rulesets_ResponseRules"
@@ -309,116 +312,84 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     annotations: {
@@ -474,13 +445,46 @@ export const tools: readonly Tool[] = [
                     {
                       "properties": {
                         "kind": {
-                          "$ref": "#/$defs/rulesets_RulesetKind"
+                          "enum": [
+                            "managed",
+                            "custom",
+                            "root",
+                            "zone"
+                          ],
+                          "type": "string"
                         },
                         "name": {
                           "type": "string"
                         },
                         "phase": {
-                          "$ref": "#/$defs/rulesets_RulesetPhase"
+                          "enum": [
+                            "ddos_l4",
+                            "ddos_l7",
+                            "http_config_settings",
+                            "http_custom_errors",
+                            "http_log_custom_fields",
+                            "http_ratelimit",
+                            "http_request_cache_settings",
+                            "http_request_dynamic_redirect",
+                            "http_request_firewall_custom",
+                            "http_request_firewall_managed",
+                            "http_request_late_transform",
+                            "http_request_origin",
+                            "http_request_redirect",
+                            "http_request_sanitize",
+                            "http_request_sbfm",
+                            "http_request_transform",
+                            "http_response_cache_settings",
+                            "http_response_compression",
+                            "http_response_firewall_custom",
+                            "http_response_firewall_managed",
+                            "http_response_headers_transform",
+                            "magic_transit",
+                            "magic_transit_ids_managed",
+                            "magic_transit_managed",
+                            "magic_transit_ratelimit"
+                          ],
+                          "type": "string"
                         },
                         "rules": {
                           "$ref": "#/$defs/rulesets_ResponseRules"
@@ -530,186 +534,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
-      },
-    },
-    request: (args) => ({
-      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/phases/${pathParam(args, "phase")}/entrypoint`,
-    }),
-  },
-  {
-    name: "rulesets_entrypoint_update",
-    title: "Update an account or zone entry point ruleset",
-    description: "Updates an account or zone entry point ruleset, creating a new version.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "body": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/rulesets_Ruleset"
-            },
-            {
-              "properties": {
-                "rules": {
-                  "$ref": "#/$defs/rulesets_RequestRules",
-                  "default": [],
-                  "description": "The list of rules in the ruleset."
-                }
-              },
-              "type": "object"
-            }
-          ]
-        },
-        "phase": {
-          "$ref": "#/$defs/rulesets_RulesetPhase",
-          "description": "The phase of the ruleset."
-        },
-        "validate_only": {
-          "default": false,
-          "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
-          "type": "boolean"
-        }
-      },
-      required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "phase",
-        "body"
-      ],
-      $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
         "rulesets_BlockRule": rulesets_BlockRule,
         "rulesets_ChallengeRule": rulesets_ChallengeRule,
         "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
         "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
         "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
         "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
         "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
         "rulesets_ExecuteRule": rulesets_ExecuteRule,
         "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel,
         "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
         "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
         "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
@@ -720,50 +554,37 @@ export const tools: readonly Tool[] = [
         "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
         "rulesets_LogRule": rulesets_LogRule,
         "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
         "rulesets_RedirectFromList": rulesets_RedirectFromList,
         "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
         "rulesets_RedirectRule": rulesets_RedirectRule,
         "rulesets_RequestRule": rulesets_RequestRule,
-        "rulesets_RequestRules": rulesets_RequestRules,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
         "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
         "rulesets_RewriteRule": rulesets_RewriteRule,
         "rulesets_RewriteUri": rulesets_RewriteUri,
         "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
         "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader,
         "rulesets_RouteOrigin": rulesets_RouteOrigin,
         "rulesets_RouteRule": rulesets_RouteRule,
         "rulesets_RouteSNI": rulesets_RouteSNI,
         "rulesets_Rule": rulesets_Rule,
-        "rulesets_RuleAction": rulesets_RuleAction,
-        "rulesets_RuleCategory": rulesets_RuleCategory,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
         "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
-        "rulesets_RuleId": rulesets_RuleId,
         "rulesets_RuleLogging": rulesets_RuleLogging,
         "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
         "rulesets_Ruleset": rulesets_Ruleset,
-        "rulesets_RulesetId": rulesets_RulesetId,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement,
         "rulesets_ScoreRule": rulesets_ScoreRule,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType,
         "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly,
         "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
         "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
         "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation,
         "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
         "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
         "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache,
         "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
         "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
         "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
@@ -773,37 +594,200 @@ export const tools: readonly Tool[] = [
         "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
         "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
         "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru,
         "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags,
         "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
         "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
         "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
         "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie,
         "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
         "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
         "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation,
         "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
         "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
         "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
         "rulesets_SetConfigRule": rulesets_SetConfigRule,
-        "rulesets_SkipPhase": rulesets_SkipPhase,
         "rulesets_SkipPhases": rulesets_SkipPhases,
         "rulesets_SkipProducts": rulesets_SkipProducts,
         "rulesets_SkipRule": rulesets_SkipRule,
         "rulesets_SkipRules": rulesets_SkipRules,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset,
         "rulesets_SkipRulesets": rulesets_SkipRulesets,
         "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
+    request: (args) => ({
+      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/phases/${pathParam(args, "ruleset_phase")}/entrypoint`,
+    }),
+  },
+  {
+    name: "rulesets_entrypoint_update",
+    title: "Update an account or zone entry point ruleset",
+    description: "Updates an account or zone entry point ruleset, creating a new version.\n\nPUT /{account_or_zone}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint",
+    inputSchema: {
+      type: "object",
+      properties: {
+        "body": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/rulesets_Ruleset"
+            },
+            {
+              "properties": {
+                "rules": {
+                  "$ref": "#/$defs/rulesets_RequestRules",
+                  "default": [],
+                  "description": "The list of rules in the ruleset."
+                }
+              },
+              "type": "object"
+            }
+          ]
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "ruleset_phase": {
+              "description": "The phase of the ruleset.",
+              "enum": [
+                "ddos_l4",
+                "ddos_l7",
+                "http_config_settings",
+                "http_custom_errors",
+                "http_log_custom_fields",
+                "http_ratelimit",
+                "http_request_cache_settings",
+                "http_request_dynamic_redirect",
+                "http_request_firewall_custom",
+                "http_request_firewall_managed",
+                "http_request_late_transform",
+                "http_request_origin",
+                "http_request_redirect",
+                "http_request_sanitize",
+                "http_request_sbfm",
+                "http_request_transform",
+                "http_response_cache_settings",
+                "http_response_compression",
+                "http_response_firewall_custom",
+                "http_response_firewall_managed",
+                "http_response_headers_transform",
+                "magic_transit",
+                "magic_transit_ids_managed",
+                "magic_transit_managed",
+                "magic_transit_ratelimit"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "ruleset_phase"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dry_run": {
+              "default": false,
+              "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      },
+      required: [
+        "path",
+        "body"
+      ],
+      additionalProperties: false,
+      $defs: {
+        "rulesets_BlockRule": rulesets_BlockRule$,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule$,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule$,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule$,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides$,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData$,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides$,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule$,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides$,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule$,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule$,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields$,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields$,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields$,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields$,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule$,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields$,
+        "rulesets_LogRule": rulesets_LogRule$,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule$,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList$,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue$,
+        "rulesets_RedirectRule": rulesets_RedirectRule$,
+        "rulesets_RequestRule": rulesets_RequestRule$,
+        "rulesets_RequestRules": rulesets_RequestRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders$,
+        "rulesets_RewriteRule": rulesets_RewriteRule$,
+        "rulesets_RewriteUri": rulesets_RewriteUri$,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath$,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery$,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin$,
+        "rulesets_RouteRule": rulesets_RouteRule$,
+        "rulesets_RouteSNI": rulesets_RouteSNI$,
+        "rulesets_Rule": rulesets_Rule$,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck$,
+        "rulesets_RuleLogging": rulesets_RuleLogging$,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit$,
+        "rulesets_Ruleset": rulesets_Ruleset$,
+        "rulesets_ScoreRule": rulesets_ScoreRule$,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule$,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective$,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers$,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue$,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule$,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts$,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL$,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey$,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve$,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey$,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost$,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString$,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser$,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL$,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests$,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule$,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale$,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary$,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL$,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary$,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault$,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader$,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule$,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues$,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify$,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule$,
+        "rulesets_SkipPhases": rulesets_SkipPhases$,
+        "rulesets_SkipProducts": rulesets_SkipProducts$,
+        "rulesets_SkipRule": rulesets_SkipRule$,
+        "rulesets_SkipRules": rulesets_SkipRules$,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets$,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule$,
+      },
+    },
     outputSchema: {
       "allOf": [
         {
@@ -822,13 +806,46 @@ export const tools: readonly Tool[] = [
                     {
                       "properties": {
                         "kind": {
-                          "$ref": "#/$defs/rulesets_RulesetKind"
+                          "enum": [
+                            "managed",
+                            "custom",
+                            "root",
+                            "zone"
+                          ],
+                          "type": "string"
                         },
                         "name": {
                           "type": "string"
                         },
                         "phase": {
-                          "$ref": "#/$defs/rulesets_RulesetPhase"
+                          "enum": [
+                            "ddos_l4",
+                            "ddos_l7",
+                            "http_config_settings",
+                            "http_custom_errors",
+                            "http_log_custom_fields",
+                            "http_ratelimit",
+                            "http_request_cache_settings",
+                            "http_request_dynamic_redirect",
+                            "http_request_firewall_custom",
+                            "http_request_firewall_managed",
+                            "http_request_late_transform",
+                            "http_request_origin",
+                            "http_request_redirect",
+                            "http_request_sanitize",
+                            "http_request_sbfm",
+                            "http_request_transform",
+                            "http_response_cache_settings",
+                            "http_response_compression",
+                            "http_response_firewall_custom",
+                            "http_response_firewall_managed",
+                            "http_response_headers_transform",
+                            "magic_transit",
+                            "magic_transit_ids_managed",
+                            "magic_transit_managed",
+                            "magic_transit_ratelimit"
+                          ],
+                          "type": "string"
                         },
                         "rules": {
                           "$ref": "#/$defs/rulesets_ResponseRules"
@@ -860,116 +877,84 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     annotations: {
@@ -1019,13 +1004,46 @@ export const tools: readonly Tool[] = [
                         {
                           "properties": {
                             "kind": {
-                              "$ref": "#/$defs/rulesets_RulesetKind"
+                              "enum": [
+                                "managed",
+                                "custom",
+                                "root",
+                                "zone"
+                              ],
+                              "type": "string"
                             },
                             "name": {
                               "type": "string"
                             },
                             "phase": {
-                              "$ref": "#/$defs/rulesets_RulesetPhase"
+                              "enum": [
+                                "ddos_l4",
+                                "ddos_l7",
+                                "http_config_settings",
+                                "http_custom_errors",
+                                "http_log_custom_fields",
+                                "http_ratelimit",
+                                "http_request_cache_settings",
+                                "http_request_dynamic_redirect",
+                                "http_request_firewall_custom",
+                                "http_request_firewall_managed",
+                                "http_request_late_transform",
+                                "http_request_origin",
+                                "http_request_redirect",
+                                "http_request_sanitize",
+                                "http_request_sbfm",
+                                "http_request_transform",
+                                "http_response_cache_settings",
+                                "http_response_compression",
+                                "http_response_firewall_custom",
+                                "http_response_firewall_managed",
+                                "http_response_headers_transform",
+                                "magic_transit",
+                                "magic_transit_ids_managed",
+                                "magic_transit_managed",
+                                "magic_transit_ratelimit"
+                              ],
+                              "type": "string"
                             },
                             "rules": {
                               "$ref": "#/$defs/rulesets_ResponseRules"
@@ -1080,122 +1098,90 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     request: (args) => ({
-      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/phases/${pathParam(args, "phase")}/entrypoint`,
+      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/phases/${pathParam(args, "ruleset_phase")}/entrypoint`,
       query: [
-        ["dry_run", args["validate_only"], true],
+        ["dry_run", param(args, "query", "dry_run"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/rulesets/outputs.ts b/src/generated/forge-mcp/rulesets/outputs.ts
index beb2245ea..3300ea3e9 100644
--- a/src/generated/forge-mcp/rulesets/outputs.ts
+++ b/src/generated/forge-mcp/rulesets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `rulesets_BlockRule` in responses.
  */
-export const rulesets_BlockRule_output: JsonSchema = {
+export const rulesets_BlockRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -55,7 +55,7 @@ export const rulesets_BlockRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_ChallengeRule` in responses.
  */
-export const rulesets_ChallengeRule_output: JsonSchema = {
+export const rulesets_ChallengeRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -80,7 +80,7 @@ export const rulesets_ChallengeRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_CompressResponseRule` in responses.
  */
-export const rulesets_CompressResponseRule_output: JsonSchema = {
+export const rulesets_CompressResponseRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -130,17 +130,10 @@ export const rulesets_CompressResponseRule_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_Cursor` in responses.
- */
-export const rulesets_Cursor_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_DDoSDynamicRule` in responses.
  */
-export const rulesets_DDoSDynamicRule_output: JsonSchema = {
+export const rulesets_DDoSDynamicRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -165,13 +158,13 @@ export const rulesets_DDoSDynamicRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_ExecuteCategoryOverrides` in responses.
  */
-export const rulesets_ExecuteCategoryOverrides_output: JsonSchema = {
+export const rulesets_ExecuteCategoryOverrides: JsonSchema = {
   "items": {
     "properties": {
       "action": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleAction"
+            "type": "string"
           },
           {
             "type": "string"
@@ -181,7 +174,7 @@ export const rulesets_ExecuteCategoryOverrides_output: JsonSchema = {
       "category": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleCategory"
+            "type": "string"
           },
           {
             "type": "string"
@@ -191,7 +184,7 @@ export const rulesets_ExecuteCategoryOverrides_output: JsonSchema = {
       "enabled": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleEnabled"
+            "type": "boolean"
           },
           {
             "type": "boolean"
@@ -201,7 +194,13 @@ export const rulesets_ExecuteCategoryOverrides_output: JsonSchema = {
       "sensitivity_level": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_ExecuteSensitivityLevel"
+            "enum": [
+              "default",
+              "medium",
+              "low",
+              "eoff"
+            ],
+            "type": "string"
           },
           {
             "type": "string"
@@ -221,7 +220,7 @@ export const rulesets_ExecuteCategoryOverrides_output: JsonSchema = {
 /**
  * The schema of `rulesets_ExecuteMatchedData` in responses.
  */
-export const rulesets_ExecuteMatchedData_output: JsonSchema = {
+export const rulesets_ExecuteMatchedData: JsonSchema = {
   "properties": {
     "public_key": {
       "type": "string"
@@ -236,12 +235,12 @@ export const rulesets_ExecuteMatchedData_output: JsonSchema = {
 /**
  * The schema of `rulesets_ExecuteOverrides` in responses.
  */
-export const rulesets_ExecuteOverrides_output: JsonSchema = {
+export const rulesets_ExecuteOverrides: JsonSchema = {
   "properties": {
     "action": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RuleAction"
+          "type": "string"
         },
         {
           "type": "string"
@@ -254,7 +253,7 @@ export const rulesets_ExecuteOverrides_output: JsonSchema = {
     "enabled": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RuleEnabled"
+          "type": "boolean"
         },
         {
           "type": "boolean"
@@ -267,7 +266,13 @@ export const rulesets_ExecuteOverrides_output: JsonSchema = {
     "sensitivity_level": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_ExecuteSensitivityLevel"
+          "enum": [
+            "default",
+            "medium",
+            "low",
+            "eoff"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -281,7 +286,7 @@ export const rulesets_ExecuteOverrides_output: JsonSchema = {
 /**
  * The schema of `rulesets_ExecuteRule` in responses.
  */
-export const rulesets_ExecuteRule_output: JsonSchema = {
+export const rulesets_ExecuteRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -299,7 +304,7 @@ export const rulesets_ExecuteRule_output: JsonSchema = {
             "id": {
               "allOf": [
                 {
-                  "$ref": "#/$defs/rulesets_RulesetId"
+                  "type": "string"
                 },
                 {
                   "type": "string"
@@ -330,13 +335,13 @@ export const rulesets_ExecuteRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_ExecuteRuleOverrides` in responses.
  */
-export const rulesets_ExecuteRuleOverrides_output: JsonSchema = {
+export const rulesets_ExecuteRuleOverrides: JsonSchema = {
   "items": {
     "properties": {
       "action": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleAction"
+            "type": "string"
           },
           {
             "type": "string"
@@ -346,7 +351,7 @@ export const rulesets_ExecuteRuleOverrides_output: JsonSchema = {
       "enabled": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleEnabled"
+            "type": "boolean"
           },
           {
             "type": "boolean"
@@ -356,7 +361,7 @@ export const rulesets_ExecuteRuleOverrides_output: JsonSchema = {
       "id": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleId"
+            "type": "string"
           },
           {
             "type": "string"
@@ -369,7 +374,13 @@ export const rulesets_ExecuteRuleOverrides_output: JsonSchema = {
       "sensitivity_level": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_ExecuteSensitivityLevel"
+            "enum": [
+              "default",
+              "medium",
+              "low",
+              "eoff"
+            ],
+            "type": "string"
           },
           {
             "type": "string"
@@ -386,23 +397,10 @@ export const rulesets_ExecuteRuleOverrides_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `rulesets_ExecuteSensitivityLevel` in responses.
- */
-export const rulesets_ExecuteSensitivityLevel_output: JsonSchema = {
-  "enum": [
-    "default",
-    "medium",
-    "low",
-    "eoff"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_ForceConnectionCloseRule` in responses.
  */
-export const rulesets_ForceConnectionCloseRule_output: JsonSchema = {
+export const rulesets_ForceConnectionCloseRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -427,7 +425,7 @@ export const rulesets_ForceConnectionCloseRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_JsChallengeRule` in responses.
  */
-export const rulesets_JsChallengeRule_output: JsonSchema = {
+export const rulesets_JsChallengeRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -452,7 +450,7 @@ export const rulesets_JsChallengeRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_LogCustomFieldCookieFields` in responses.
  */
-export const rulesets_LogCustomFieldCookieFields_output: JsonSchema = {
+export const rulesets_LogCustomFieldCookieFields: JsonSchema = {
   "items": {
     "properties": {
       "name": {
@@ -471,7 +469,7 @@ export const rulesets_LogCustomFieldCookieFields_output: JsonSchema = {
 /**
  * The schema of `rulesets_LogCustomFieldRawResponseFields` in responses.
  */
-export const rulesets_LogCustomFieldRawResponseFields_output: JsonSchema = {
+export const rulesets_LogCustomFieldRawResponseFields: JsonSchema = {
   "items": {
     "properties": {
       "name": {
@@ -493,7 +491,7 @@ export const rulesets_LogCustomFieldRawResponseFields_output: JsonSchema = {
 /**
  * The schema of `rulesets_LogCustomFieldRequestFields` in responses.
  */
-export const rulesets_LogCustomFieldRequestFields_output: JsonSchema = {
+export const rulesets_LogCustomFieldRequestFields: JsonSchema = {
   "items": {
     "properties": {
       "name": {
@@ -512,7 +510,7 @@ export const rulesets_LogCustomFieldRequestFields_output: JsonSchema = {
 /**
  * The schema of `rulesets_LogCustomFieldResponseFields` in responses.
  */
-export const rulesets_LogCustomFieldResponseFields_output: JsonSchema = {
+export const rulesets_LogCustomFieldResponseFields: JsonSchema = {
   "items": {
     "properties": {
       "name": {
@@ -534,7 +532,7 @@ export const rulesets_LogCustomFieldResponseFields_output: JsonSchema = {
 /**
  * The schema of `rulesets_LogCustomFieldRule` in responses.
  */
-export const rulesets_LogCustomFieldRule_output: JsonSchema = {
+export const rulesets_LogCustomFieldRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -579,7 +577,7 @@ export const rulesets_LogCustomFieldRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_LogCustomFieldTransformedRequestFields` in responses.
  */
-export const rulesets_LogCustomFieldTransformedRequestFields_output: JsonSchema = {
+export const rulesets_LogCustomFieldTransformedRequestFields: JsonSchema = {
   "items": {
     "properties": {
       "name": {
@@ -598,7 +596,7 @@ export const rulesets_LogCustomFieldTransformedRequestFields_output: JsonSchema
 /**
  * The schema of `rulesets_LogRule` in responses.
  */
-export const rulesets_LogRule_output: JsonSchema = {
+export const rulesets_LogRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -623,7 +621,7 @@ export const rulesets_LogRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_ManagedChallengeRule` in responses.
  */
-export const rulesets_ManagedChallengeRule_output: JsonSchema = {
+export const rulesets_ManagedChallengeRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -648,7 +646,7 @@ export const rulesets_ManagedChallengeRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_RedirectFromList` in responses.
  */
-export const rulesets_RedirectFromList_output: JsonSchema = {
+export const rulesets_RedirectFromList: JsonSchema = {
   "properties": {
     "key": {
       "type": "string"
@@ -667,7 +665,7 @@ export const rulesets_RedirectFromList_output: JsonSchema = {
 /**
  * The schema of `rulesets_RedirectFromValue` in responses.
  */
-export const rulesets_RedirectFromValue_output: JsonSchema = {
+export const rulesets_RedirectFromValue: JsonSchema = {
   "properties": {
     "preserve_query_string": {
       "type": "boolean"
@@ -703,7 +701,7 @@ export const rulesets_RedirectFromValue_output: JsonSchema = {
 /**
  * The schema of `rulesets_RedirectRule` in responses.
  */
-export const rulesets_RedirectRule_output: JsonSchema = {
+export const rulesets_RedirectRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -739,7 +737,7 @@ export const rulesets_RedirectRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_RequestRule` in responses.
  */
-export const rulesets_RequestRule_output: JsonSchema = {
+export const rulesets_RequestRule: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/rulesets_BlockRule"
@@ -810,7 +808,7 @@ export const rulesets_RequestRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_ResponseRule` in responses.
  */
-export const rulesets_ResponseRule_output: JsonSchema = {
+export const rulesets_ResponseRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_RequestRule"
@@ -848,7 +846,7 @@ export const rulesets_ResponseRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_ResponseRules` in responses.
  */
-export const rulesets_ResponseRules_output: JsonSchema = {
+export const rulesets_ResponseRules: JsonSchema = {
   "items": {
     "$ref": "#/$defs/rulesets_ResponseRule"
   },
@@ -858,14 +856,14 @@ export const rulesets_ResponseRules_output: JsonSchema = {
 /**
  * The schema of `rulesets_ResultInfo` in responses.
  */
-export const rulesets_ResultInfo_output: JsonSchema = {
+export const rulesets_ResultInfo: JsonSchema = {
   "properties": {
     "cursors": {
       "properties": {
         "after": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_Cursor"
+              "type": "string"
             },
             {
               "type": "string"
@@ -882,31 +880,10 @@ export const rulesets_ResultInfo_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RewriteHeaderExpression` in responses.
- */
-export const rulesets_RewriteHeaderExpression_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RewriteHeaderOperation` in responses.
- */
-export const rulesets_RewriteHeaderOperation_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RewriteHeaderValue` in responses.
- */
-export const rulesets_RewriteHeaderValue_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_RewriteHeaders` in responses.
  */
-export const rulesets_RewriteHeaders_output: JsonSchema = {
+export const rulesets_RewriteHeaders: JsonSchema = {
   "additionalProperties": {
     "oneOf": [
       {
@@ -914,7 +891,7 @@ export const rulesets_RewriteHeaders_output: JsonSchema = {
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "type": "string"
               },
               {
                 "enum": [
@@ -925,7 +902,7 @@ export const rulesets_RewriteHeaders_output: JsonSchema = {
             ]
           },
           "value": {
-            "$ref": "#/$defs/rulesets_RewriteHeaderValue"
+            "type": "string"
           }
         },
         "required": [
@@ -937,12 +914,12 @@ export const rulesets_RewriteHeaders_output: JsonSchema = {
       {
         "properties": {
           "expression": {
-            "$ref": "#/$defs/rulesets_RewriteHeaderExpression"
+            "type": "string"
           },
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "type": "string"
               },
               {
                 "enum": [
@@ -964,7 +941,7 @@ export const rulesets_RewriteHeaders_output: JsonSchema = {
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "type": "string"
               },
               {
                 "enum": [
@@ -975,7 +952,7 @@ export const rulesets_RewriteHeaders_output: JsonSchema = {
             ]
           },
           "value": {
-            "$ref": "#/$defs/rulesets_RewriteHeaderValue"
+            "type": "string"
           }
         },
         "required": [
@@ -987,12 +964,12 @@ export const rulesets_RewriteHeaders_output: JsonSchema = {
       {
         "properties": {
           "expression": {
-            "$ref": "#/$defs/rulesets_RewriteHeaderExpression"
+            "type": "string"
           },
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "type": "string"
               },
               {
                 "enum": [
@@ -1014,7 +991,7 @@ export const rulesets_RewriteHeaders_output: JsonSchema = {
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "type": "string"
               },
               {
                 "enum": [
@@ -1038,7 +1015,7 @@ export const rulesets_RewriteHeaders_output: JsonSchema = {
 /**
  * The schema of `rulesets_RewriteRule` in responses.
  */
-export const rulesets_RewriteRule_output: JsonSchema = {
+export const rulesets_RewriteRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -1074,7 +1051,7 @@ export const rulesets_RewriteRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_RewriteUri` in responses.
  */
-export const rulesets_RewriteUri_output: JsonSchema = {
+export const rulesets_RewriteUri: JsonSchema = {
   "allOf": [
     {
       "anyOf": [
@@ -1116,7 +1093,7 @@ export const rulesets_RewriteUri_output: JsonSchema = {
 /**
  * The schema of `rulesets_RewriteUriPath` in responses.
  */
-export const rulesets_RewriteUriPath_output: JsonSchema = {
+export const rulesets_RewriteUriPath: JsonSchema = {
   "properties": {
     "expression": {
       "type": "string"
@@ -1131,7 +1108,7 @@ export const rulesets_RewriteUriPath_output: JsonSchema = {
 /**
  * The schema of `rulesets_RewriteUriQuery` in responses.
  */
-export const rulesets_RewriteUriQuery_output: JsonSchema = {
+export const rulesets_RewriteUriQuery: JsonSchema = {
   "properties": {
     "expression": {
       "type": "string"
@@ -1143,17 +1120,10 @@ export const rulesets_RewriteUriQuery_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RouteHostHeader` in responses.
- */
-export const rulesets_RouteHostHeader_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_RouteOrigin` in responses.
  */
-export const rulesets_RouteOrigin_output: JsonSchema = {
+export const rulesets_RouteOrigin: JsonSchema = {
   "properties": {
     "host": {
       "type": "string"
@@ -1168,7 +1138,7 @@ export const rulesets_RouteOrigin_output: JsonSchema = {
 /**
  * The schema of `rulesets_RouteRule` in responses.
  */
-export const rulesets_RouteRule_output: JsonSchema = {
+export const rulesets_RouteRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -1184,7 +1154,7 @@ export const rulesets_RouteRule_output: JsonSchema = {
         "action_parameters": {
           "properties": {
             "host_header": {
-              "$ref": "#/$defs/rulesets_RouteHostHeader"
+              "type": "string"
             },
             "origin": {
               "$ref": "#/$defs/rulesets_RouteOrigin"
@@ -1207,7 +1177,7 @@ export const rulesets_RouteRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_RouteSNI` in responses.
  */
-export const rulesets_RouteSNI_output: JsonSchema = {
+export const rulesets_RouteSNI: JsonSchema = {
   "properties": {
     "value": {
       "type": "string"
@@ -1222,10 +1192,10 @@ export const rulesets_RouteSNI_output: JsonSchema = {
 /**
  * The schema of `rulesets_Rule` in responses.
  */
-export const rulesets_Rule_output: JsonSchema = {
+export const rulesets_Rule: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/rulesets_RuleAction"
+      "type": "string"
     },
     "action_parameters": {
       "type": "object"
@@ -1239,7 +1209,7 @@ export const rulesets_Rule_output: JsonSchema = {
     "enabled": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RuleEnabled"
+          "type": "boolean"
         },
         {
           "type": "boolean"
@@ -1253,7 +1223,7 @@ export const rulesets_Rule_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/rulesets_RuleId"
+      "type": "string"
     },
     "last_updated": {
       "format": "date-time",
@@ -1279,42 +1249,21 @@ export const rulesets_Rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RuleAction` in responses.
- */
-export const rulesets_RuleAction_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_RuleCategories` in responses.
  */
-export const rulesets_RuleCategories_output: JsonSchema = {
+export const rulesets_RuleCategories: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/rulesets_RuleCategory"
+    "type": "string"
   },
   "minItems": 1,
   "type": "array"
 };
 
-/**
- * The schema of `rulesets_RuleCategory` in responses.
- */
-export const rulesets_RuleCategory_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RuleEnabled` in responses.
- */
-export const rulesets_RuleEnabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_RuleExposedCredentialCheck` in responses.
  */
-export const rulesets_RuleExposedCredentialCheck_output: JsonSchema = {
+export const rulesets_RuleExposedCredentialCheck: JsonSchema = {
   "properties": {
     "password_expression": {
       "type": "string"
@@ -1330,17 +1279,10 @@ export const rulesets_RuleExposedCredentialCheck_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RuleId` in responses.
- */
-export const rulesets_RuleId_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_RuleLogging` in responses.
  */
-export const rulesets_RuleLogging_output: JsonSchema = {
+export const rulesets_RuleLogging: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -1355,7 +1297,7 @@ export const rulesets_RuleLogging_output: JsonSchema = {
 /**
  * The schema of `rulesets_RuleRatelimit` in responses.
  */
-export const rulesets_RuleRatelimit_output: JsonSchema = {
+export const rulesets_RuleRatelimit: JsonSchema = {
   "properties": {
     "characteristics": {
       "items": {
@@ -1396,7 +1338,7 @@ export const rulesets_RuleRatelimit_output: JsonSchema = {
 /**
  * The schema of `rulesets_Ruleset` in responses.
  */
-export const rulesets_Ruleset_output: JsonSchema = {
+export const rulesets_Ruleset: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -1404,7 +1346,7 @@ export const rulesets_Ruleset_output: JsonSchema = {
     "id": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RulesetId"
+          "type": "string"
         },
         {
           "type": "string"
@@ -1421,7 +1363,7 @@ export const rulesets_Ruleset_output: JsonSchema = {
     "version": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RulesetVersion"
+          "type": "string"
         },
         {
           "type": "string"
@@ -1437,78 +1379,10 @@ export const rulesets_Ruleset_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RulesetId` in responses.
- */
-export const rulesets_RulesetId_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RulesetKind` in responses.
- */
-export const rulesets_RulesetKind_output: JsonSchema = {
-  "enum": [
-    "managed",
-    "custom",
-    "root",
-    "zone"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RulesetPhase` in responses.
- */
-export const rulesets_RulesetPhase_output: JsonSchema = {
-  "enum": [
-    "ddos_l4",
-    "ddos_l7",
-    "http_config_settings",
-    "http_custom_errors",
-    "http_log_custom_fields",
-    "http_ratelimit",
-    "http_request_cache_settings",
-    "http_request_dynamic_redirect",
-    "http_request_firewall_custom",
-    "http_request_firewall_managed",
-    "http_request_late_transform",
-    "http_request_origin",
-    "http_request_redirect",
-    "http_request_sanitize",
-    "http_request_sbfm",
-    "http_request_transform",
-    "http_response_cache_settings",
-    "http_response_compression",
-    "http_response_firewall_custom",
-    "http_response_firewall_managed",
-    "http_response_headers_transform",
-    "magic_transit",
-    "magic_transit_ids_managed",
-    "magic_transit_managed",
-    "magic_transit_ratelimit"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RulesetVersion` in responses.
- */
-export const rulesets_RulesetVersion_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_ScoreIncrement` in responses.
- */
-export const rulesets_ScoreIncrement_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `rulesets_ScoreRule` in responses.
  */
-export const rulesets_ScoreRule_output: JsonSchema = {
+export const rulesets_ScoreRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -1524,7 +1398,7 @@ export const rulesets_ScoreRule_output: JsonSchema = {
         "action_parameters": {
           "properties": {
             "increment": {
-              "$ref": "#/$defs/rulesets_ScoreIncrement"
+              "type": "integer"
             }
           },
           "required": [
@@ -1541,37 +1415,10 @@ export const rulesets_ScoreRule_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_ServeErrorAssetName` in responses.
- */
-export const rulesets_ServeErrorAssetName_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_ServeErrorContent` in responses.
- */
-export const rulesets_ServeErrorContent_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_ServeErrorContentType` in responses.
- */
-export const rulesets_ServeErrorContentType_output: JsonSchema = {
-  "enum": [
-    "application/json",
-    "text/html",
-    "text/plain",
-    "text/xml"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_ServeErrorRule` in responses.
  */
-export const rulesets_ServeErrorRule_output: JsonSchema = {
+export const rulesets_ServeErrorRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -1589,10 +1436,16 @@ export const rulesets_ServeErrorRule_output: JsonSchema = {
             {
               "properties": {
                 "content_type": {
-                  "$ref": "#/$defs/rulesets_ServeErrorContentType"
+                  "enum": [
+                    "application/json",
+                    "text/html",
+                    "text/plain",
+                    "text/xml"
+                  ],
+                  "type": "string"
                 },
                 "status_code": {
-                  "$ref": "#/$defs/rulesets_ServeErrorStatusCode"
+                  "type": "integer"
                 }
               },
               "required": [
@@ -1605,7 +1458,7 @@ export const rulesets_ServeErrorRule_output: JsonSchema = {
                 {
                   "properties": {
                     "content": {
-                      "$ref": "#/$defs/rulesets_ServeErrorContent"
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -1616,7 +1469,7 @@ export const rulesets_ServeErrorRule_output: JsonSchema = {
                 {
                   "properties": {
                     "asset_name": {
-                      "$ref": "#/$defs/rulesets_ServeErrorAssetName"
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -1637,34 +1490,24 @@ export const rulesets_ServeErrorRule_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_ServeErrorStatusCode` in responses.
- */
-export const rulesets_ServeErrorStatusCode_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `rulesets_SetCacheControlCloudflareOnly` in responses.
- */
-export const rulesets_SetCacheControlCloudflareOnly_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheControlDirective` in responses.
  */
-export const rulesets_SetCacheControlDirective_output: JsonSchema = {
+export const rulesets_SetCacheControlDirective: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly"
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1683,12 +1526,16 @@ export const rulesets_SetCacheControlDirective_output: JsonSchema = {
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly"
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1710,17 +1557,21 @@ export const rulesets_SetCacheControlDirective_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheControlDirectiveWithQualifiers` in responses.
  */
-export const rulesets_SetCacheControlDirectiveWithQualifiers_output: JsonSchema = {
+export const rulesets_SetCacheControlDirectiveWithQualifiers: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly"
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1745,12 +1596,16 @@ export const rulesets_SetCacheControlDirectiveWithQualifiers_output: JsonSchema
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly"
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1772,17 +1627,21 @@ export const rulesets_SetCacheControlDirectiveWithQualifiers_output: JsonSchema
 /**
  * The schema of `rulesets_SetCacheControlDirectiveWithValue` in responses.
  */
-export const rulesets_SetCacheControlDirectiveWithValue_output: JsonSchema = {
+export const rulesets_SetCacheControlDirectiveWithValue: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly"
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1805,12 +1664,16 @@ export const rulesets_SetCacheControlDirectiveWithValue_output: JsonSchema = {
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly"
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1829,21 +1692,10 @@ export const rulesets_SetCacheControlDirectiveWithValue_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_SetCacheControlOperation` in responses.
- */
-export const rulesets_SetCacheControlOperation_output: JsonSchema = {
-  "enum": [
-    "set",
-    "remove"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_SetCacheControlRule` in responses.
  */
-export const rulesets_SetCacheControlRule_output: JsonSchema = {
+export const rulesets_SetCacheControlRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -1913,7 +1765,7 @@ export const rulesets_SetCacheControlRule_output: JsonSchema = {
  * The schema of `rulesets_SetCacheSettingsAdditionalCacheablePorts` in
  * responses.
  */
-export const rulesets_SetCacheSettingsAdditionalCacheablePorts_output: JsonSchema = {
+export const rulesets_SetCacheSettingsAdditionalCacheablePorts: JsonSchema = {
   "items": {
     "type": "integer"
   },
@@ -1924,7 +1776,7 @@ export const rulesets_SetCacheSettingsAdditionalCacheablePorts_output: JsonSchem
 /**
  * The schema of `rulesets_SetCacheSettingsBrowserTTL` in responses.
  */
-export const rulesets_SetCacheSettingsBrowserTTL_output: JsonSchema = {
+export const rulesets_SetCacheSettingsBrowserTTL: JsonSchema = {
   "properties": {
     "default": {
       "type": "integer"
@@ -1945,17 +1797,10 @@ export const rulesets_SetCacheSettingsBrowserTTL_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SetCacheSettingsCache` in responses.
- */
-export const rulesets_SetCacheSettingsCache_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheSettingsCacheKey` in responses.
  */
-export const rulesets_SetCacheSettingsCacheKey_output: JsonSchema = {
+export const rulesets_SetCacheSettingsCacheKey: JsonSchema = {
   "properties": {
     "cache_by_device_type": {
       "type": "boolean"
@@ -1976,7 +1821,7 @@ export const rulesets_SetCacheSettingsCacheKey_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsCacheReserve` in responses.
  */
-export const rulesets_SetCacheSettingsCacheReserve_output: JsonSchema = {
+export const rulesets_SetCacheSettingsCacheReserve: JsonSchema = {
   "properties": {
     "eligible": {
       "type": "boolean"
@@ -1994,7 +1839,7 @@ export const rulesets_SetCacheSettingsCacheReserve_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsCustomCacheKey` in responses.
  */
-export const rulesets_SetCacheSettingsCustomCacheKey_output: JsonSchema = {
+export const rulesets_SetCacheSettingsCustomCacheKey: JsonSchema = {
   "properties": {
     "cookie": {
       "$ref": "#/$defs/rulesets_SetCacheSettingsCustomCacheKeyCookie"
@@ -2018,7 +1863,7 @@ export const rulesets_SetCacheSettingsCustomCacheKey_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsCustomCacheKeyCookie` in responses.
  */
-export const rulesets_SetCacheSettingsCustomCacheKeyCookie_output: JsonSchema = {
+export const rulesets_SetCacheSettingsCustomCacheKeyCookie: JsonSchema = {
   "properties": {
     "check_presence": {
       "items": {
@@ -2041,7 +1886,7 @@ export const rulesets_SetCacheSettingsCustomCacheKeyCookie_output: JsonSchema =
 /**
  * The schema of `rulesets_SetCacheSettingsCustomCacheKeyHeader` in responses.
  */
-export const rulesets_SetCacheSettingsCustomCacheKeyHeader_output: JsonSchema = {
+export const rulesets_SetCacheSettingsCustomCacheKeyHeader: JsonSchema = {
   "properties": {
     "check_presence": {
       "items": {
@@ -2077,7 +1922,7 @@ export const rulesets_SetCacheSettingsCustomCacheKeyHeader_output: JsonSchema =
 /**
  * The schema of `rulesets_SetCacheSettingsCustomCacheKeyHost` in responses.
  */
-export const rulesets_SetCacheSettingsCustomCacheKeyHost_output: JsonSchema = {
+export const rulesets_SetCacheSettingsCustomCacheKeyHost: JsonSchema = {
   "properties": {
     "resolved": {
       "type": "boolean"
@@ -2090,7 +1935,7 @@ export const rulesets_SetCacheSettingsCustomCacheKeyHost_output: JsonSchema = {
  * The schema of `rulesets_SetCacheSettingsCustomCacheKeyQueryString` in
  * responses.
  */
-export const rulesets_SetCacheSettingsCustomCacheKeyQueryString_output: JsonSchema = {
+export const rulesets_SetCacheSettingsCustomCacheKeyQueryString: JsonSchema = {
   "properties": {
     "exclude": {
       "properties": {
@@ -2135,7 +1980,7 @@ export const rulesets_SetCacheSettingsCustomCacheKeyQueryString_output: JsonSche
 /**
  * The schema of `rulesets_SetCacheSettingsCustomCacheKeyUser` in responses.
  */
-export const rulesets_SetCacheSettingsCustomCacheKeyUser_output: JsonSchema = {
+export const rulesets_SetCacheSettingsCustomCacheKeyUser: JsonSchema = {
   "properties": {
     "device_type": {
       "type": "boolean"
@@ -2153,7 +1998,7 @@ export const rulesets_SetCacheSettingsCustomCacheKeyUser_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsEdgeTTL` in responses.
  */
-export const rulesets_SetCacheSettingsEdgeTTL_output: JsonSchema = {
+export const rulesets_SetCacheSettingsEdgeTTL: JsonSchema = {
   "properties": {
     "default": {
       "type": "integer"
@@ -2176,25 +2021,10 @@ export const rulesets_SetCacheSettingsEdgeTTL_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SetCacheSettingsOriginCacheControl` in responses.
- */
-export const rulesets_SetCacheSettingsOriginCacheControl_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `rulesets_SetCacheSettingsOriginErrorPagePassthru` in
- * responses.
- */
-export const rulesets_SetCacheSettingsOriginErrorPagePassthru_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheSettingsOriginRangeRequests` in responses.
  */
-export const rulesets_SetCacheSettingsOriginRangeRequests_output: JsonSchema = {
+export const rulesets_SetCacheSettingsOriginRangeRequests: JsonSchema = {
   "properties": {
     "mode": {
       "enum": [
@@ -2211,24 +2041,10 @@ export const rulesets_SetCacheSettingsOriginRangeRequests_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SetCacheSettingsReadTimeout` in responses.
- */
-export const rulesets_SetCacheSettingsReadTimeout_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `rulesets_SetCacheSettingsRespectStrongEtags` in responses.
- */
-export const rulesets_SetCacheSettingsRespectStrongEtags_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheSettingsRule` in responses.
  */
-export const rulesets_SetCacheSettingsRule_output: JsonSchema = {
+export const rulesets_SetCacheSettingsRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -2250,7 +2066,7 @@ export const rulesets_SetCacheSettingsRule_output: JsonSchema = {
               "$ref": "#/$defs/rulesets_SetCacheSettingsBrowserTTL"
             },
             "cache": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsCache"
+              "type": "boolean"
             },
             "cache_key": {
               "$ref": "#/$defs/rulesets_SetCacheSettingsCacheKey"
@@ -2262,19 +2078,19 @@ export const rulesets_SetCacheSettingsRule_output: JsonSchema = {
               "$ref": "#/$defs/rulesets_SetCacheSettingsEdgeTTL"
             },
             "origin_cache_control": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsOriginCacheControl"
+              "type": "boolean"
             },
             "origin_error_page_passthru": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsOriginErrorPagePassthru"
+              "type": "boolean"
             },
             "origin_range_requests": {
               "$ref": "#/$defs/rulesets_SetCacheSettingsOriginRangeRequests"
             },
             "read_timeout": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsReadTimeout"
+              "type": "integer"
             },
             "respect_strong_etags": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsRespectStrongEtags"
+              "type": "boolean"
             },
             "serve_stale": {
               "$ref": "#/$defs/rulesets_SetCacheSettingsServeStale"
@@ -2283,13 +2099,13 @@ export const rulesets_SetCacheSettingsRule_output: JsonSchema = {
               "$ref": "#/$defs/rulesets_SetCacheSettingsSharedDictionary"
             },
             "strip_etags": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsStripETags"
+              "type": "boolean"
             },
             "strip_last_modified": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsStripLastModified"
+              "type": "boolean"
             },
             "strip_set_cookie": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsStripSetCookie"
+              "type": "boolean"
             },
             "vary": {
               "$ref": "#/$defs/rulesets_SetCacheSettingsVary"
@@ -2309,7 +2125,7 @@ export const rulesets_SetCacheSettingsRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsServeStale` in responses.
  */
-export const rulesets_SetCacheSettingsServeStale_output: JsonSchema = {
+export const rulesets_SetCacheSettingsServeStale: JsonSchema = {
   "properties": {
     "disable_stale_while_updating": {
       "type": "boolean"
@@ -2321,7 +2137,7 @@ export const rulesets_SetCacheSettingsServeStale_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsSharedDictionary` in responses.
  */
-export const rulesets_SetCacheSettingsSharedDictionary_output: JsonSchema = {
+export const rulesets_SetCacheSettingsSharedDictionary: JsonSchema = {
   "properties": {
     "match_pattern": {
       "type": "string"
@@ -2336,7 +2152,7 @@ export const rulesets_SetCacheSettingsSharedDictionary_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsStatusCodeTTL` in responses.
  */
-export const rulesets_SetCacheSettingsStatusCodeTTL_output: JsonSchema = {
+export const rulesets_SetCacheSettingsStatusCodeTTL: JsonSchema = {
   "items": {
     "properties": {
       "status_code": {
@@ -2366,31 +2182,10 @@ export const rulesets_SetCacheSettingsStatusCodeTTL_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `rulesets_SetCacheSettingsStripETags` in responses.
- */
-export const rulesets_SetCacheSettingsStripETags_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `rulesets_SetCacheSettingsStripLastModified` in responses.
- */
-export const rulesets_SetCacheSettingsStripLastModified_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `rulesets_SetCacheSettingsStripSetCookie` in responses.
- */
-export const rulesets_SetCacheSettingsStripSetCookie_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheSettingsVary` in responses.
  */
-export const rulesets_SetCacheSettingsVary_output: JsonSchema = {
+export const rulesets_SetCacheSettingsVary: JsonSchema = {
   "properties": {
     "default": {
       "$ref": "#/$defs/rulesets_SetCacheSettingsVaryDefault"
@@ -2408,7 +2203,7 @@ export const rulesets_SetCacheSettingsVary_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsVaryDefault` in responses.
  */
-export const rulesets_SetCacheSettingsVaryDefault_output: JsonSchema = {
+export const rulesets_SetCacheSettingsVaryDefault: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -2428,7 +2223,7 @@ export const rulesets_SetCacheSettingsVaryDefault_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheSettingsVaryHeader` in responses.
  */
-export const rulesets_SetCacheSettingsVaryHeader_output: JsonSchema = {
+export const rulesets_SetCacheSettingsVaryHeader: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -2459,29 +2254,10 @@ export const rulesets_SetCacheSettingsVaryHeader_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SetCacheTagsExpression` in responses.
- */
-export const rulesets_SetCacheTagsExpression_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_SetCacheTagsOperation` in responses.
- */
-export const rulesets_SetCacheTagsOperation_output: JsonSchema = {
-  "enum": [
-    "add",
-    "remove",
-    "set"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_SetCacheTagsRule` in responses.
  */
-export const rulesets_SetCacheTagsRule_output: JsonSchema = {
+export const rulesets_SetCacheTagsRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -2501,7 +2277,12 @@ export const rulesets_SetCacheTagsRule_output: JsonSchema = {
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2524,12 +2305,17 @@ export const rulesets_SetCacheTagsRule_output: JsonSchema = {
             {
               "properties": {
                 "expression": {
-                  "$ref": "#/$defs/rulesets_SetCacheTagsExpression"
+                  "type": "string"
                 },
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2551,7 +2337,12 @@ export const rulesets_SetCacheTagsRule_output: JsonSchema = {
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2574,12 +2365,17 @@ export const rulesets_SetCacheTagsRule_output: JsonSchema = {
             {
               "properties": {
                 "expression": {
-                  "$ref": "#/$defs/rulesets_SetCacheTagsExpression"
+                  "type": "string"
                 },
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2601,7 +2397,12 @@ export const rulesets_SetCacheTagsRule_output: JsonSchema = {
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2624,12 +2425,17 @@ export const rulesets_SetCacheTagsRule_output: JsonSchema = {
             {
               "properties": {
                 "expression": {
-                  "$ref": "#/$defs/rulesets_SetCacheTagsExpression"
+                  "type": "string"
                 },
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2660,7 +2466,7 @@ export const rulesets_SetCacheTagsRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetCacheTagsValues` in responses.
  */
-export const rulesets_SetCacheTagsValues_output: JsonSchema = {
+export const rulesets_SetCacheTagsValues: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -2672,7 +2478,7 @@ export const rulesets_SetCacheTagsValues_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetConfigAutominify` in responses.
  */
-export const rulesets_SetConfigAutominify_output: JsonSchema = {
+export const rulesets_SetConfigAutominify: JsonSchema = {
   "properties": {
     "css": {
       "type": "boolean"
@@ -2690,7 +2496,7 @@ export const rulesets_SetConfigAutominify_output: JsonSchema = {
 /**
  * The schema of `rulesets_SetConfigRule` in responses.
  */
-export const rulesets_SetConfigRule_output: JsonSchema = {
+export const rulesets_SetConfigRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -2835,24 +2641,41 @@ export const rulesets_SetConfigRule_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_SkipPhase` in responses.
- */
-export const rulesets_SkipPhase_output: JsonSchema = {
-  "enum": [
-    "current"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_SkipPhases` in responses.
  */
-export const rulesets_SkipPhases_output: JsonSchema = {
+export const rulesets_SkipPhases: JsonSchema = {
   "items": {
     "allOf": [
       {
-        "$ref": "#/$defs/rulesets_RulesetPhase"
+        "enum": [
+          "ddos_l4",
+          "ddos_l7",
+          "http_config_settings",
+          "http_custom_errors",
+          "http_log_custom_fields",
+          "http_ratelimit",
+          "http_request_cache_settings",
+          "http_request_dynamic_redirect",
+          "http_request_firewall_custom",
+          "http_request_firewall_managed",
+          "http_request_late_transform",
+          "http_request_origin",
+          "http_request_redirect",
+          "http_request_sanitize",
+          "http_request_sbfm",
+          "http_request_transform",
+          "http_response_cache_settings",
+          "http_response_compression",
+          "http_response_firewall_custom",
+          "http_response_firewall_managed",
+          "http_response_headers_transform",
+          "magic_transit",
+          "magic_transit_ids_managed",
+          "magic_transit_managed",
+          "magic_transit_ratelimit"
+        ],
+        "type": "string"
       },
       {
         "type": "string"
@@ -2866,7 +2689,7 @@ export const rulesets_SkipPhases_output: JsonSchema = {
 /**
  * The schema of `rulesets_SkipProducts` in responses.
  */
-export const rulesets_SkipProducts_output: JsonSchema = {
+export const rulesets_SkipProducts: JsonSchema = {
   "items": {
     "enum": [
       "bic",
@@ -2886,7 +2709,7 @@ export const rulesets_SkipProducts_output: JsonSchema = {
 /**
  * The schema of `rulesets_SkipRule` in responses.
  */
-export const rulesets_SkipRule_output: JsonSchema = {
+export const rulesets_SkipRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
@@ -2902,7 +2725,10 @@ export const rulesets_SkipRule_output: JsonSchema = {
         "action_parameters": {
           "properties": {
             "phase": {
-              "$ref": "#/$defs/rulesets_SkipPhase"
+              "enum": [
+                "current"
+              ],
+              "type": "string"
             },
             "phases": {
               "$ref": "#/$defs/rulesets_SkipPhases"
@@ -2914,7 +2740,10 @@ export const rulesets_SkipRule_output: JsonSchema = {
               "$ref": "#/$defs/rulesets_SkipRules"
             },
             "ruleset": {
-              "$ref": "#/$defs/rulesets_SkipRuleset"
+              "enum": [
+                "current"
+              ],
+              "type": "string"
             },
             "rulesets": {
               "$ref": "#/$defs/rulesets_SkipRulesets"
@@ -2934,12 +2763,12 @@ export const rulesets_SkipRule_output: JsonSchema = {
 /**
  * The schema of `rulesets_SkipRules` in responses.
  */
-export const rulesets_SkipRules_output: JsonSchema = {
+export const rulesets_SkipRules: JsonSchema = {
   "additionalProperties": {
     "items": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RuleId"
+          "type": "string"
         },
         {
           "type": "string"
@@ -2952,24 +2781,14 @@ export const rulesets_SkipRules_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SkipRuleset` in responses.
- */
-export const rulesets_SkipRuleset_output: JsonSchema = {
-  "enum": [
-    "current"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_SkipRulesets` in responses.
  */
-export const rulesets_SkipRulesets_output: JsonSchema = {
+export const rulesets_SkipRulesets: JsonSchema = {
   "items": {
     "allOf": [
       {
-        "$ref": "#/$defs/rulesets_RulesetId"
+        "type": "string"
       },
       {
         "type": "string"
@@ -2983,7 +2802,7 @@ export const rulesets_SkipRulesets_output: JsonSchema = {
 /**
  * The schema of `rulesets_TransformResponseHTMLRule` in responses.
  */
-export const rulesets_TransformResponseHTMLRule_output: JsonSchema = {
+export const rulesets_TransformResponseHTMLRule: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rulesets_Rule"
diff --git a/src/generated/forge-mcp/rulesets/rules/tools.ts b/src/generated/forge-mcp/rulesets/rules/tools.ts
index 8703f2a82..ea5ee93d3 100644
--- a/src/generated/forge-mcp/rulesets/rules/tools.ts
+++ b/src/generated/forge-mcp/rulesets/rules/tools.ts
@@ -1,123 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  rulesets_Errors_output,
-  rulesets_Message_output,
-  rulesets_Messages_output,
-  rulesets_Response_output,
+  rulesets_Errors,
+  rulesets_Message,
+  rulesets_Messages,
+  rulesets_Response,
 } from "../../outputs.js";
 import {
-  rulesets_BlockRule_output,
-  rulesets_ChallengeRule_output,
-  rulesets_CompressResponseRule_output,
-  rulesets_DDoSDynamicRule_output,
-  rulesets_ExecuteCategoryOverrides_output,
-  rulesets_ExecuteMatchedData_output,
-  rulesets_ExecuteOverrides_output,
-  rulesets_ExecuteRuleOverrides_output,
-  rulesets_ExecuteRule_output,
-  rulesets_ExecuteSensitivityLevel_output,
-  rulesets_ForceConnectionCloseRule_output,
-  rulesets_JsChallengeRule_output,
-  rulesets_LogCustomFieldCookieFields_output,
-  rulesets_LogCustomFieldRawResponseFields_output,
-  rulesets_LogCustomFieldRequestFields_output,
-  rulesets_LogCustomFieldResponseFields_output,
-  rulesets_LogCustomFieldRule_output,
-  rulesets_LogCustomFieldTransformedRequestFields_output,
-  rulesets_LogRule_output,
-  rulesets_ManagedChallengeRule_output,
-  rulesets_RedirectFromList_output,
-  rulesets_RedirectFromValue_output,
-  rulesets_RedirectRule_output,
-  rulesets_RequestRule_output,
-  rulesets_ResponseRule_output,
-  rulesets_ResponseRules_output,
-  rulesets_RewriteHeaderExpression_output,
-  rulesets_RewriteHeaderOperation_output,
-  rulesets_RewriteHeaderValue_output,
-  rulesets_RewriteHeaders_output,
-  rulesets_RewriteRule_output,
-  rulesets_RewriteUriPath_output,
-  rulesets_RewriteUriQuery_output,
-  rulesets_RewriteUri_output,
-  rulesets_RouteHostHeader_output,
-  rulesets_RouteOrigin_output,
-  rulesets_RouteRule_output,
-  rulesets_RouteSNI_output,
-  rulesets_RuleAction_output,
-  rulesets_RuleCategories_output,
-  rulesets_RuleCategory_output,
-  rulesets_RuleEnabled_output,
-  rulesets_RuleExposedCredentialCheck_output,
-  rulesets_RuleId_output,
-  rulesets_RuleLogging_output,
-  rulesets_RuleRatelimit_output,
-  rulesets_Rule_output,
-  rulesets_RulesetId_output,
-  rulesets_RulesetKind_output,
-  rulesets_RulesetPhase_output,
-  rulesets_RulesetVersion_output,
-  rulesets_Ruleset_output,
-  rulesets_ScoreIncrement_output,
-  rulesets_ScoreRule_output,
-  rulesets_ServeErrorAssetName_output,
-  rulesets_ServeErrorContentType_output,
-  rulesets_ServeErrorContent_output,
-  rulesets_ServeErrorRule_output,
-  rulesets_ServeErrorStatusCode_output,
-  rulesets_SetCacheControlCloudflareOnly_output,
-  rulesets_SetCacheControlDirectiveWithQualifiers_output,
-  rulesets_SetCacheControlDirectiveWithValue_output,
-  rulesets_SetCacheControlDirective_output,
-  rulesets_SetCacheControlOperation_output,
-  rulesets_SetCacheControlRule_output,
-  rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-  rulesets_SetCacheSettingsBrowserTTL_output,
-  rulesets_SetCacheSettingsCacheKey_output,
-  rulesets_SetCacheSettingsCacheReserve_output,
-  rulesets_SetCacheSettingsCache_output,
-  rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-  rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-  rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-  rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-  rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-  rulesets_SetCacheSettingsCustomCacheKey_output,
-  rulesets_SetCacheSettingsEdgeTTL_output,
-  rulesets_SetCacheSettingsOriginCacheControl_output,
-  rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-  rulesets_SetCacheSettingsOriginRangeRequests_output,
-  rulesets_SetCacheSettingsReadTimeout_output,
-  rulesets_SetCacheSettingsRespectStrongEtags_output,
-  rulesets_SetCacheSettingsRule_output,
-  rulesets_SetCacheSettingsServeStale_output,
-  rulesets_SetCacheSettingsSharedDictionary_output,
-  rulesets_SetCacheSettingsStatusCodeTTL_output,
-  rulesets_SetCacheSettingsStripETags_output,
-  rulesets_SetCacheSettingsStripLastModified_output,
-  rulesets_SetCacheSettingsStripSetCookie_output,
-  rulesets_SetCacheSettingsVaryDefault_output,
-  rulesets_SetCacheSettingsVaryHeader_output,
-  rulesets_SetCacheSettingsVary_output,
-  rulesets_SetCacheTagsExpression_output,
-  rulesets_SetCacheTagsOperation_output,
-  rulesets_SetCacheTagsRule_output,
-  rulesets_SetCacheTagsValues_output,
-  rulesets_SetConfigAutominify_output,
-  rulesets_SetConfigRule_output,
-  rulesets_SkipPhase_output,
-  rulesets_SkipPhases_output,
-  rulesets_SkipProducts_output,
-  rulesets_SkipRule_output,
-  rulesets_SkipRules_output,
-  rulesets_SkipRuleset_output,
-  rulesets_SkipRulesets_output,
-  rulesets_TransformResponseHTMLRule_output,
-} from "../outputs.js";
-import {
-  rulesets_AccountId,
   rulesets_BlockRule,
   rulesets_ChallengeRule,
   rulesets_CompressResponseRule,
@@ -127,7 +18,6 @@ import {
   rulesets_ExecuteOverrides,
   rulesets_ExecuteRule,
   rulesets_ExecuteRuleOverrides,
-  rulesets_ExecuteSensitivityLevel,
   rulesets_ForceConnectionCloseRule,
   rulesets_JsChallengeRule,
   rulesets_LogCustomFieldCookieFields,
@@ -142,44 +32,30 @@ import {
   rulesets_RedirectFromValue,
   rulesets_RedirectRule,
   rulesets_RequestRule,
-  rulesets_RewriteHeaderExpression,
-  rulesets_RewriteHeaderOperation,
-  rulesets_RewriteHeaderValue,
+  rulesets_ResponseRule,
+  rulesets_ResponseRules,
   rulesets_RewriteHeaders,
   rulesets_RewriteRule,
   rulesets_RewriteUri,
   rulesets_RewriteUriPath,
   rulesets_RewriteUriQuery,
-  rulesets_RouteHostHeader,
   rulesets_RouteOrigin,
   rulesets_RouteRule,
   rulesets_RouteSNI,
   rulesets_Rule,
-  rulesets_RuleAction,
-  rulesets_RuleCategory,
-  rulesets_RuleEnabled,
+  rulesets_RuleCategories,
   rulesets_RuleExposedCredentialCheck,
-  rulesets_RuleId,
   rulesets_RuleLogging,
   rulesets_RuleRatelimit,
-  rulesets_RulesetId,
-  rulesets_RulesetPhase,
-  rulesets_ScoreIncrement,
+  rulesets_Ruleset,
   rulesets_ScoreRule,
-  rulesets_ServeErrorAssetName,
-  rulesets_ServeErrorContent,
-  rulesets_ServeErrorContentType,
   rulesets_ServeErrorRule,
-  rulesets_ServeErrorStatusCode,
-  rulesets_SetCacheControlCloudflareOnly,
   rulesets_SetCacheControlDirective,
   rulesets_SetCacheControlDirectiveWithQualifiers,
   rulesets_SetCacheControlDirectiveWithValue,
-  rulesets_SetCacheControlOperation,
   rulesets_SetCacheControlRule,
   rulesets_SetCacheSettingsAdditionalCacheablePorts,
   rulesets_SetCacheSettingsBrowserTTL,
-  rulesets_SetCacheSettingsCache,
   rulesets_SetCacheSettingsCacheKey,
   rulesets_SetCacheSettingsCacheReserve,
   rulesets_SetCacheSettingsCustomCacheKey,
@@ -189,35 +65,96 @@ import {
   rulesets_SetCacheSettingsCustomCacheKeyQueryString,
   rulesets_SetCacheSettingsCustomCacheKeyUser,
   rulesets_SetCacheSettingsEdgeTTL,
-  rulesets_SetCacheSettingsOriginCacheControl,
-  rulesets_SetCacheSettingsOriginErrorPagePassthru,
   rulesets_SetCacheSettingsOriginRangeRequests,
-  rulesets_SetCacheSettingsReadTimeout,
-  rulesets_SetCacheSettingsRespectStrongEtags,
   rulesets_SetCacheSettingsRule,
   rulesets_SetCacheSettingsServeStale,
   rulesets_SetCacheSettingsSharedDictionary,
   rulesets_SetCacheSettingsStatusCodeTTL,
-  rulesets_SetCacheSettingsStripETags,
-  rulesets_SetCacheSettingsStripLastModified,
-  rulesets_SetCacheSettingsStripSetCookie,
   rulesets_SetCacheSettingsVary,
   rulesets_SetCacheSettingsVaryDefault,
   rulesets_SetCacheSettingsVaryHeader,
-  rulesets_SetCacheTagsExpression,
-  rulesets_SetCacheTagsOperation,
   rulesets_SetCacheTagsRule,
   rulesets_SetCacheTagsValues,
   rulesets_SetConfigAutominify,
   rulesets_SetConfigRule,
-  rulesets_SkipPhase,
   rulesets_SkipPhases,
   rulesets_SkipProducts,
   rulesets_SkipRule,
   rulesets_SkipRules,
-  rulesets_SkipRuleset,
   rulesets_SkipRulesets,
   rulesets_TransformResponseHTMLRule,
+} from "../outputs.js";
+import {
+  rulesets_BlockRule as rulesets_BlockRule$,
+  rulesets_ChallengeRule as rulesets_ChallengeRule$,
+  rulesets_CompressResponseRule as rulesets_CompressResponseRule$,
+  rulesets_DDoSDynamicRule as rulesets_DDoSDynamicRule$,
+  rulesets_ExecuteCategoryOverrides as rulesets_ExecuteCategoryOverrides$,
+  rulesets_ExecuteMatchedData as rulesets_ExecuteMatchedData$,
+  rulesets_ExecuteOverrides as rulesets_ExecuteOverrides$,
+  rulesets_ExecuteRule as rulesets_ExecuteRule$,
+  rulesets_ExecuteRuleOverrides as rulesets_ExecuteRuleOverrides$,
+  rulesets_ForceConnectionCloseRule as rulesets_ForceConnectionCloseRule$,
+  rulesets_JsChallengeRule as rulesets_JsChallengeRule$,
+  rulesets_LogCustomFieldCookieFields as rulesets_LogCustomFieldCookieFields$,
+  rulesets_LogCustomFieldRawResponseFields as rulesets_LogCustomFieldRawResponseFields$,
+  rulesets_LogCustomFieldRequestFields as rulesets_LogCustomFieldRequestFields$,
+  rulesets_LogCustomFieldResponseFields as rulesets_LogCustomFieldResponseFields$,
+  rulesets_LogCustomFieldRule as rulesets_LogCustomFieldRule$,
+  rulesets_LogCustomFieldTransformedRequestFields as rulesets_LogCustomFieldTransformedRequestFields$,
+  rulesets_LogRule as rulesets_LogRule$,
+  rulesets_ManagedChallengeRule as rulesets_ManagedChallengeRule$,
+  rulesets_RedirectFromList as rulesets_RedirectFromList$,
+  rulesets_RedirectFromValue as rulesets_RedirectFromValue$,
+  rulesets_RedirectRule as rulesets_RedirectRule$,
+  rulesets_RequestRule as rulesets_RequestRule$,
+  rulesets_RewriteHeaders as rulesets_RewriteHeaders$,
+  rulesets_RewriteRule as rulesets_RewriteRule$,
+  rulesets_RewriteUri as rulesets_RewriteUri$,
+  rulesets_RewriteUriPath as rulesets_RewriteUriPath$,
+  rulesets_RewriteUriQuery as rulesets_RewriteUriQuery$,
+  rulesets_RouteOrigin as rulesets_RouteOrigin$,
+  rulesets_RouteRule as rulesets_RouteRule$,
+  rulesets_RouteSNI as rulesets_RouteSNI$,
+  rulesets_Rule as rulesets_Rule$,
+  rulesets_RuleExposedCredentialCheck as rulesets_RuleExposedCredentialCheck$,
+  rulesets_RuleLogging as rulesets_RuleLogging$,
+  rulesets_RuleRatelimit as rulesets_RuleRatelimit$,
+  rulesets_ScoreRule as rulesets_ScoreRule$,
+  rulesets_ServeErrorRule as rulesets_ServeErrorRule$,
+  rulesets_SetCacheControlDirective as rulesets_SetCacheControlDirective$,
+  rulesets_SetCacheControlDirectiveWithQualifiers as rulesets_SetCacheControlDirectiveWithQualifiers$,
+  rulesets_SetCacheControlDirectiveWithValue as rulesets_SetCacheControlDirectiveWithValue$,
+  rulesets_SetCacheControlRule as rulesets_SetCacheControlRule$,
+  rulesets_SetCacheSettingsAdditionalCacheablePorts as rulesets_SetCacheSettingsAdditionalCacheablePorts$,
+  rulesets_SetCacheSettingsBrowserTTL as rulesets_SetCacheSettingsBrowserTTL$,
+  rulesets_SetCacheSettingsCacheKey as rulesets_SetCacheSettingsCacheKey$,
+  rulesets_SetCacheSettingsCacheReserve as rulesets_SetCacheSettingsCacheReserve$,
+  rulesets_SetCacheSettingsCustomCacheKey as rulesets_SetCacheSettingsCustomCacheKey$,
+  rulesets_SetCacheSettingsCustomCacheKeyCookie as rulesets_SetCacheSettingsCustomCacheKeyCookie$,
+  rulesets_SetCacheSettingsCustomCacheKeyHeader as rulesets_SetCacheSettingsCustomCacheKeyHeader$,
+  rulesets_SetCacheSettingsCustomCacheKeyHost as rulesets_SetCacheSettingsCustomCacheKeyHost$,
+  rulesets_SetCacheSettingsCustomCacheKeyQueryString as rulesets_SetCacheSettingsCustomCacheKeyQueryString$,
+  rulesets_SetCacheSettingsCustomCacheKeyUser as rulesets_SetCacheSettingsCustomCacheKeyUser$,
+  rulesets_SetCacheSettingsEdgeTTL as rulesets_SetCacheSettingsEdgeTTL$,
+  rulesets_SetCacheSettingsOriginRangeRequests as rulesets_SetCacheSettingsOriginRangeRequests$,
+  rulesets_SetCacheSettingsRule as rulesets_SetCacheSettingsRule$,
+  rulesets_SetCacheSettingsServeStale as rulesets_SetCacheSettingsServeStale$,
+  rulesets_SetCacheSettingsSharedDictionary as rulesets_SetCacheSettingsSharedDictionary$,
+  rulesets_SetCacheSettingsStatusCodeTTL as rulesets_SetCacheSettingsStatusCodeTTL$,
+  rulesets_SetCacheSettingsVary as rulesets_SetCacheSettingsVary$,
+  rulesets_SetCacheSettingsVaryDefault as rulesets_SetCacheSettingsVaryDefault$,
+  rulesets_SetCacheSettingsVaryHeader as rulesets_SetCacheSettingsVaryHeader$,
+  rulesets_SetCacheTagsRule as rulesets_SetCacheTagsRule$,
+  rulesets_SetCacheTagsValues as rulesets_SetCacheTagsValues$,
+  rulesets_SetConfigAutominify as rulesets_SetConfigAutominify$,
+  rulesets_SetConfigRule as rulesets_SetConfigRule$,
+  rulesets_SkipPhases as rulesets_SkipPhases$,
+  rulesets_SkipProducts as rulesets_SkipProducts$,
+  rulesets_SkipRule as rulesets_SkipRule$,
+  rulesets_SkipRules as rulesets_SkipRules$,
+  rulesets_SkipRulesets as rulesets_SkipRulesets$,
+  rulesets_TransformResponseHTMLRule as rulesets_TransformResponseHTMLRule$,
 } from "../schemas.js";
 import { rulesets_RulePosition } from "./schemas.js";
 
@@ -228,22 +165,10 @@ export const tools: readonly Tool[] = [
   {
     name: "rulesets_rules_create",
     title: "Create an account or zone ruleset rule",
-    description: "Adds a new rule to an account or zone ruleset. The rule will be added to the end of the existing list of rules in the ruleset by default.",
+    description: "Adds a new rule to an account or zone ruleset. The rule will be added to the end of the existing list of rules in the ruleset by default.\n\nPOST /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "allOf": [
             {
@@ -308,34 +233,223 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "ruleset_id": {
-          "$ref": "#/$defs/rulesets_RulesetId",
-          "description": "The unique ID of the ruleset."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The unique ID of the ruleset.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "ruleset_id"
+          ],
+          "type": "object"
         },
-        "validate_only": {
-          "default": false,
-          "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dry_run": {
+              "default": false,
+              "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "ruleset_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "rulesets_BlockRule": rulesets_BlockRule$,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule$,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule$,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule$,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides$,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData$,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides$,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule$,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides$,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule$,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule$,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields$,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields$,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields$,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields$,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule$,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields$,
+        "rulesets_LogRule": rulesets_LogRule$,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule$,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList$,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue$,
+        "rulesets_RedirectRule": rulesets_RedirectRule$,
+        "rulesets_RequestRule": rulesets_RequestRule$,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders$,
+        "rulesets_RewriteRule": rulesets_RewriteRule$,
+        "rulesets_RewriteUri": rulesets_RewriteUri$,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath$,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery$,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin$,
+        "rulesets_RouteRule": rulesets_RouteRule$,
+        "rulesets_RouteSNI": rulesets_RouteSNI$,
+        "rulesets_Rule": rulesets_Rule$,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck$,
+        "rulesets_RuleLogging": rulesets_RuleLogging$,
+        "rulesets_RulePosition": rulesets_RulePosition,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit$,
+        "rulesets_ScoreRule": rulesets_ScoreRule$,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule$,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective$,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers$,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue$,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule$,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts$,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL$,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey$,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve$,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey$,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost$,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString$,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser$,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL$,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests$,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule$,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale$,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary$,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL$,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary$,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault$,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader$,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule$,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues$,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify$,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule$,
+        "rulesets_SkipPhases": rulesets_SkipPhases$,
+        "rulesets_SkipProducts": rulesets_SkipProducts$,
+        "rulesets_SkipRule": rulesets_SkipRule$,
+        "rulesets_SkipRules": rulesets_SkipRules$,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets$,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/rulesets_Response"
+        },
+        {
+          "properties": {
+            "errors": {},
+            "result": {
+              "oneOf": [
+                {
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/rulesets_Ruleset"
+                    },
+                    {
+                      "properties": {
+                        "kind": {
+                          "enum": [
+                            "managed",
+                            "custom",
+                            "root",
+                            "zone"
+                          ],
+                          "type": "string"
+                        },
+                        "name": {
+                          "type": "string"
+                        },
+                        "phase": {
+                          "enum": [
+                            "ddos_l4",
+                            "ddos_l7",
+                            "http_config_settings",
+                            "http_custom_errors",
+                            "http_log_custom_fields",
+                            "http_ratelimit",
+                            "http_request_cache_settings",
+                            "http_request_dynamic_redirect",
+                            "http_request_firewall_custom",
+                            "http_request_firewall_managed",
+                            "http_request_late_transform",
+                            "http_request_origin",
+                            "http_request_redirect",
+                            "http_request_sanitize",
+                            "http_request_sbfm",
+                            "http_request_transform",
+                            "http_response_cache_settings",
+                            "http_response_compression",
+                            "http_response_firewall_custom",
+                            "http_response_firewall_managed",
+                            "http_response_headers_transform",
+                            "magic_transit",
+                            "magic_transit_ids_managed",
+                            "magic_transit_managed",
+                            "magic_transit_ratelimit"
+                          ],
+                          "type": "string"
+                        },
+                        "rules": {
+                          "$ref": "#/$defs/rulesets_ResponseRules"
+                        }
+                      },
+                      "required": [
+                        "kind",
+                        "name",
+                        "phase",
+                        "rules"
+                      ],
+                      "type": "object"
+                    }
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "success": {
+              "enum": [
+                true
+              ],
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
         "rulesets_BlockRule": rulesets_BlockRule,
         "rulesets_ChallengeRule": rulesets_ChallengeRule,
         "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
         "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
         "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
         "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
         "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
         "rulesets_ExecuteRule": rulesets_ExecuteRule,
         "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel,
         "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
         "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
         "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
@@ -346,49 +460,37 @@ export const tools: readonly Tool[] = [
         "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
         "rulesets_LogRule": rulesets_LogRule,
         "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
         "rulesets_RedirectFromList": rulesets_RedirectFromList,
         "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
         "rulesets_RedirectRule": rulesets_RedirectRule,
         "rulesets_RequestRule": rulesets_RequestRule,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
         "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
         "rulesets_RewriteRule": rulesets_RewriteRule,
         "rulesets_RewriteUri": rulesets_RewriteUri,
         "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
         "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader,
         "rulesets_RouteOrigin": rulesets_RouteOrigin,
         "rulesets_RouteRule": rulesets_RouteRule,
         "rulesets_RouteSNI": rulesets_RouteSNI,
         "rulesets_Rule": rulesets_Rule,
-        "rulesets_RuleAction": rulesets_RuleAction,
-        "rulesets_RuleCategory": rulesets_RuleCategory,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
         "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
-        "rulesets_RuleId": rulesets_RuleId,
         "rulesets_RuleLogging": rulesets_RuleLogging,
-        "rulesets_RulePosition": rulesets_RulePosition,
         "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
-        "rulesets_RulesetId": rulesets_RulesetId,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement,
+        "rulesets_Ruleset": rulesets_Ruleset,
         "rulesets_ScoreRule": rulesets_ScoreRule,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType,
         "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly,
         "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
         "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
         "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation,
         "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
         "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
         "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache,
         "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
         "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
         "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
@@ -398,205 +500,26 @@ export const tools: readonly Tool[] = [
         "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
         "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
         "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru,
         "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags,
         "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
         "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
         "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
         "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie,
         "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
         "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
         "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation,
         "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
         "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
         "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
         "rulesets_SetConfigRule": rulesets_SetConfigRule,
-        "rulesets_SkipPhase": rulesets_SkipPhase,
         "rulesets_SkipPhases": rulesets_SkipPhases,
         "rulesets_SkipProducts": rulesets_SkipProducts,
         "rulesets_SkipRule": rulesets_SkipRule,
         "rulesets_SkipRules": rulesets_SkipRules,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset,
         "rulesets_SkipRulesets": rulesets_SkipRulesets,
         "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/rulesets_Response"
-        },
-        {
-          "properties": {
-            "errors": {},
-            "result": {
-              "oneOf": [
-                {
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/rulesets_Ruleset"
-                    },
-                    {
-                      "properties": {
-                        "kind": {
-                          "$ref": "#/$defs/rulesets_RulesetKind"
-                        },
-                        "name": {
-                          "type": "string"
-                        },
-                        "phase": {
-                          "$ref": "#/$defs/rulesets_RulesetPhase"
-                        },
-                        "rules": {
-                          "$ref": "#/$defs/rulesets_ResponseRules"
-                        }
-                      },
-                      "required": [
-                        "kind",
-                        "name",
-                        "phase",
-                        "rules"
-                      ],
-                      "type": "object"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
-            "success": {
-              "enum": [
-                true
-              ],
-              "type": "boolean"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -644,13 +567,46 @@ export const tools: readonly Tool[] = [
                         {
                           "properties": {
                             "kind": {
-                              "$ref": "#/$defs/rulesets_RulesetKind"
+                              "enum": [
+                                "managed",
+                                "custom",
+                                "root",
+                                "zone"
+                              ],
+                              "type": "string"
                             },
                             "name": {
                               "type": "string"
                             },
                             "phase": {
-                              "$ref": "#/$defs/rulesets_RulesetPhase"
+                              "enum": [
+                                "ddos_l4",
+                                "ddos_l7",
+                                "http_config_settings",
+                                "http_custom_errors",
+                                "http_log_custom_fields",
+                                "http_ratelimit",
+                                "http_request_cache_settings",
+                                "http_request_dynamic_redirect",
+                                "http_request_firewall_custom",
+                                "http_request_firewall_managed",
+                                "http_request_late_transform",
+                                "http_request_origin",
+                                "http_request_redirect",
+                                "http_request_sanitize",
+                                "http_request_sbfm",
+                                "http_request_transform",
+                                "http_response_cache_settings",
+                                "http_response_compression",
+                                "http_response_firewall_custom",
+                                "http_response_firewall_managed",
+                                "http_response_headers_transform",
+                                "magic_transit",
+                                "magic_transit_ids_managed",
+                                "magic_transit_managed",
+                                "magic_transit_ratelimit"
+                              ],
+                              "type": "string"
                             },
                             "rules": {
                               "$ref": "#/$defs/rulesets_ResponseRules"
@@ -705,122 +661,90 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/${pathParam(args, "ruleset_id")}/rules`,
       query: [
-        ["dry_run", args["validate_only"], true],
+        ["dry_run", param(args, "query", "dry_run"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -828,47 +752,58 @@ export const tools: readonly Tool[] = [
   {
     name: "rulesets_rules_delete",
     title: "Delete an account or zone ruleset rule",
-    description: "Deletes an existing rule from an account or zone ruleset.",
+    description: "Deletes an existing rule from an account or zone ruleset.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The unique ID of the rule.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The unique ID of the ruleset.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "ruleset_id",
+            "rule_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/rulesets_RuleId",
-          "description": "The unique ID of the rule."
-        },
-        "ruleset_id": {
-          "$ref": "#/$defs/rulesets_RulesetId",
-          "description": "The unique ID of the ruleset."
+          "type": "object"
         },
-        "validate_only": {
-          "default": false,
-          "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dry_run": {
+              "default": false,
+              "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "ruleset_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
-        "rulesets_RuleId": rulesets_RuleId,
-        "rulesets_RulesetId": rulesets_RulesetId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -888,13 +823,46 @@ export const tools: readonly Tool[] = [
                     {
                       "properties": {
                         "kind": {
-                          "$ref": "#/$defs/rulesets_RulesetKind"
+                          "enum": [
+                            "managed",
+                            "custom",
+                            "root",
+                            "zone"
+                          ],
+                          "type": "string"
                         },
                         "name": {
                           "type": "string"
                         },
                         "phase": {
-                          "$ref": "#/$defs/rulesets_RulesetPhase"
+                          "enum": [
+                            "ddos_l4",
+                            "ddos_l7",
+                            "http_config_settings",
+                            "http_custom_errors",
+                            "http_log_custom_fields",
+                            "http_ratelimit",
+                            "http_request_cache_settings",
+                            "http_request_dynamic_redirect",
+                            "http_request_firewall_custom",
+                            "http_request_firewall_managed",
+                            "http_request_late_transform",
+                            "http_request_origin",
+                            "http_request_redirect",
+                            "http_request_sanitize",
+                            "http_request_sbfm",
+                            "http_request_transform",
+                            "http_response_cache_settings",
+                            "http_response_compression",
+                            "http_response_firewall_custom",
+                            "http_response_firewall_managed",
+                            "http_response_headers_transform",
+                            "magic_transit",
+                            "magic_transit_ids_managed",
+                            "magic_transit_managed",
+                            "magic_transit_ratelimit"
+                          ],
+                          "type": "string"
                         },
                         "rules": {
                           "$ref": "#/$defs/rulesets_ResponseRules"
@@ -926,138 +894,106 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
-      },
-    },
-    annotations: {
-      "destructiveHint": true,
-      "idempotentHint": true,
-      "openWorldHint": true,
-      "readOnlyHint": false,
-      "title": "Delete an account or zone ruleset rule"
-    },
-    method: "DELETE",
-    path: "/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/rules/{rule_id}",
-    extensions: {
-      "x-api-token-group": [
-        "Mass URL Redirects Write",
-        "Magic Firewall Write",
-        "L4 DDoS Managed Ruleset Write",
-        "Transform Rules Write",
-        "Select Configuration Write",
-        "Account WAF Write",
-        "Account Rulesets Write",
-        "Logs Write"
-      ],
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
+      },
+    },
+    annotations: {
+      "destructiveHint": true,
+      "idempotentHint": true,
+      "openWorldHint": true,
+      "readOnlyHint": false,
+      "title": "Delete an account or zone ruleset rule"
+    },
+    method: "DELETE",
+    path: "/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/rules/{rule_id}",
+    extensions: {
+      "x-api-token-group": [
+        "Mass URL Redirects Write",
+        "Magic Firewall Write",
+        "L4 DDoS Managed Ruleset Write",
+        "Transform Rules Write",
+        "Select Configuration Write",
+        "Account WAF Write",
+        "Account Rulesets Write",
+        "Logs Write"
+      ],
       "x-cfPlanAvailability": {
         "business": true,
         "enterprise": true,
@@ -1085,13 +1021,46 @@ export const tools: readonly Tool[] = [
                         {
                           "properties": {
                             "kind": {
-                              "$ref": "#/$defs/rulesets_RulesetKind"
+                              "enum": [
+                                "managed",
+                                "custom",
+                                "root",
+                                "zone"
+                              ],
+                              "type": "string"
                             },
                             "name": {
                               "type": "string"
                             },
                             "phase": {
-                              "$ref": "#/$defs/rulesets_RulesetPhase"
+                              "enum": [
+                                "ddos_l4",
+                                "ddos_l7",
+                                "http_config_settings",
+                                "http_custom_errors",
+                                "http_log_custom_fields",
+                                "http_ratelimit",
+                                "http_request_cache_settings",
+                                "http_request_dynamic_redirect",
+                                "http_request_firewall_custom",
+                                "http_request_firewall_managed",
+                                "http_request_late_transform",
+                                "http_request_origin",
+                                "http_request_redirect",
+                                "http_request_sanitize",
+                                "http_request_sbfm",
+                                "http_request_transform",
+                                "http_response_cache_settings",
+                                "http_response_compression",
+                                "http_response_firewall_custom",
+                                "http_response_firewall_managed",
+                                "http_response_headers_transform",
+                                "magic_transit",
+                                "magic_transit_ids_managed",
+                                "magic_transit_managed",
+                                "magic_transit_ratelimit"
+                              ],
+                              "type": "string"
                             },
                             "rules": {
                               "$ref": "#/$defs/rulesets_ResponseRules"
@@ -1146,144 +1115,100 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/${pathParam(args, "ruleset_id")}/rules/${pathParam(args, "rule_id")}`,
       query: [
-        ["dry_run", args["validate_only"], true],
+        ["dry_run", param(args, "query", "dry_run"), true],
       ],
     }),
   },
   {
     name: "rulesets_rules_update",
     title: "Update an account or zone ruleset rule",
-    description: "Updates an existing rule in an account or zone ruleset.",
+    description: "Updates an existing rule in an account or zone ruleset.\n\nPATCH /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "allOf": [
             {
@@ -1348,39 +1273,228 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "rule_id": {
-          "$ref": "#/$defs/rulesets_RuleId",
-          "description": "The unique ID of the rule."
-        },
-        "ruleset_id": {
-          "$ref": "#/$defs/rulesets_RulesetId",
-          "description": "The unique ID of the ruleset."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The unique ID of the rule.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The unique ID of the ruleset.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "ruleset_id",
+            "rule_id"
+          ],
+          "type": "object"
         },
-        "validate_only": {
-          "default": false,
-          "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dry_run": {
+              "default": false,
+              "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "ruleset_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "rulesets_BlockRule": rulesets_BlockRule$,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule$,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule$,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule$,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides$,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData$,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides$,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule$,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides$,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule$,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule$,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields$,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields$,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields$,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields$,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule$,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields$,
+        "rulesets_LogRule": rulesets_LogRule$,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule$,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList$,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue$,
+        "rulesets_RedirectRule": rulesets_RedirectRule$,
+        "rulesets_RequestRule": rulesets_RequestRule$,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders$,
+        "rulesets_RewriteRule": rulesets_RewriteRule$,
+        "rulesets_RewriteUri": rulesets_RewriteUri$,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath$,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery$,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin$,
+        "rulesets_RouteRule": rulesets_RouteRule$,
+        "rulesets_RouteSNI": rulesets_RouteSNI$,
+        "rulesets_Rule": rulesets_Rule$,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck$,
+        "rulesets_RuleLogging": rulesets_RuleLogging$,
+        "rulesets_RulePosition": rulesets_RulePosition,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit$,
+        "rulesets_ScoreRule": rulesets_ScoreRule$,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule$,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective$,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers$,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue$,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule$,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts$,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL$,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey$,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve$,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey$,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost$,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString$,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser$,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL$,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests$,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule$,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale$,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary$,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL$,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary$,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault$,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader$,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule$,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues$,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify$,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule$,
+        "rulesets_SkipPhases": rulesets_SkipPhases$,
+        "rulesets_SkipProducts": rulesets_SkipProducts$,
+        "rulesets_SkipRule": rulesets_SkipRule$,
+        "rulesets_SkipRules": rulesets_SkipRules$,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets$,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/rulesets_Response"
+        },
+        {
+          "properties": {
+            "errors": {},
+            "result": {
+              "oneOf": [
+                {
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/rulesets_Ruleset"
+                    },
+                    {
+                      "properties": {
+                        "kind": {
+                          "enum": [
+                            "managed",
+                            "custom",
+                            "root",
+                            "zone"
+                          ],
+                          "type": "string"
+                        },
+                        "name": {
+                          "type": "string"
+                        },
+                        "phase": {
+                          "enum": [
+                            "ddos_l4",
+                            "ddos_l7",
+                            "http_config_settings",
+                            "http_custom_errors",
+                            "http_log_custom_fields",
+                            "http_ratelimit",
+                            "http_request_cache_settings",
+                            "http_request_dynamic_redirect",
+                            "http_request_firewall_custom",
+                            "http_request_firewall_managed",
+                            "http_request_late_transform",
+                            "http_request_origin",
+                            "http_request_redirect",
+                            "http_request_sanitize",
+                            "http_request_sbfm",
+                            "http_request_transform",
+                            "http_response_cache_settings",
+                            "http_response_compression",
+                            "http_response_firewall_custom",
+                            "http_response_firewall_managed",
+                            "http_response_headers_transform",
+                            "magic_transit",
+                            "magic_transit_ids_managed",
+                            "magic_transit_managed",
+                            "magic_transit_ratelimit"
+                          ],
+                          "type": "string"
+                        },
+                        "rules": {
+                          "$ref": "#/$defs/rulesets_ResponseRules"
+                        }
+                      },
+                      "required": [
+                        "kind",
+                        "name",
+                        "phase",
+                        "rules"
+                      ],
+                      "type": "object"
+                    }
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "success": {
+              "enum": [
+                true
+              ],
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
         "rulesets_BlockRule": rulesets_BlockRule,
         "rulesets_ChallengeRule": rulesets_ChallengeRule,
         "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
         "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
         "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
         "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
         "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
         "rulesets_ExecuteRule": rulesets_ExecuteRule,
         "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel,
         "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
         "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
         "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
@@ -1391,49 +1505,37 @@ export const tools: readonly Tool[] = [
         "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
         "rulesets_LogRule": rulesets_LogRule,
         "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
         "rulesets_RedirectFromList": rulesets_RedirectFromList,
         "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
         "rulesets_RedirectRule": rulesets_RedirectRule,
         "rulesets_RequestRule": rulesets_RequestRule,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
         "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
         "rulesets_RewriteRule": rulesets_RewriteRule,
         "rulesets_RewriteUri": rulesets_RewriteUri,
         "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
         "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader,
         "rulesets_RouteOrigin": rulesets_RouteOrigin,
         "rulesets_RouteRule": rulesets_RouteRule,
         "rulesets_RouteSNI": rulesets_RouteSNI,
         "rulesets_Rule": rulesets_Rule,
-        "rulesets_RuleAction": rulesets_RuleAction,
-        "rulesets_RuleCategory": rulesets_RuleCategory,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
         "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
-        "rulesets_RuleId": rulesets_RuleId,
         "rulesets_RuleLogging": rulesets_RuleLogging,
-        "rulesets_RulePosition": rulesets_RulePosition,
         "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
-        "rulesets_RulesetId": rulesets_RulesetId,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement,
+        "rulesets_Ruleset": rulesets_Ruleset,
         "rulesets_ScoreRule": rulesets_ScoreRule,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType,
         "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly,
         "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
         "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
         "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation,
         "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
         "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
         "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache,
         "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
         "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
         "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
@@ -1443,205 +1545,26 @@ export const tools: readonly Tool[] = [
         "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
         "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
         "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru,
         "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags,
         "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
         "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
         "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
         "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie,
         "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
         "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
         "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation,
         "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
         "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
         "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
         "rulesets_SetConfigRule": rulesets_SetConfigRule,
-        "rulesets_SkipPhase": rulesets_SkipPhase,
         "rulesets_SkipPhases": rulesets_SkipPhases,
         "rulesets_SkipProducts": rulesets_SkipProducts,
         "rulesets_SkipRule": rulesets_SkipRule,
         "rulesets_SkipRules": rulesets_SkipRules,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset,
         "rulesets_SkipRulesets": rulesets_SkipRulesets,
         "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/rulesets_Response"
-        },
-        {
-          "properties": {
-            "errors": {},
-            "result": {
-              "oneOf": [
-                {
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/rulesets_Ruleset"
-                    },
-                    {
-                      "properties": {
-                        "kind": {
-                          "$ref": "#/$defs/rulesets_RulesetKind"
-                        },
-                        "name": {
-                          "type": "string"
-                        },
-                        "phase": {
-                          "$ref": "#/$defs/rulesets_RulesetPhase"
-                        },
-                        "rules": {
-                          "$ref": "#/$defs/rulesets_ResponseRules"
-                        }
-                      },
-                      "required": [
-                        "kind",
-                        "name",
-                        "phase",
-                        "rules"
-                      ],
-                      "type": "object"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
-            "success": {
-              "enum": [
-                true
-              ],
-              "type": "boolean"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -1689,13 +1612,46 @@ export const tools: readonly Tool[] = [
                         {
                           "properties": {
                             "kind": {
-                              "$ref": "#/$defs/rulesets_RulesetKind"
+                              "enum": [
+                                "managed",
+                                "custom",
+                                "root",
+                                "zone"
+                              ],
+                              "type": "string"
                             },
                             "name": {
                               "type": "string"
                             },
                             "phase": {
-                              "$ref": "#/$defs/rulesets_RulesetPhase"
+                              "enum": [
+                                "ddos_l4",
+                                "ddos_l7",
+                                "http_config_settings",
+                                "http_custom_errors",
+                                "http_log_custom_fields",
+                                "http_ratelimit",
+                                "http_request_cache_settings",
+                                "http_request_dynamic_redirect",
+                                "http_request_firewall_custom",
+                                "http_request_firewall_managed",
+                                "http_request_late_transform",
+                                "http_request_origin",
+                                "http_request_redirect",
+                                "http_request_sanitize",
+                                "http_request_sbfm",
+                                "http_request_transform",
+                                "http_response_cache_settings",
+                                "http_response_compression",
+                                "http_response_firewall_custom",
+                                "http_response_firewall_managed",
+                                "http_response_headers_transform",
+                                "magic_transit",
+                                "magic_transit_ids_managed",
+                                "magic_transit_managed",
+                                "magic_transit_ratelimit"
+                              ],
+                              "type": "string"
                             },
                             "rules": {
                               "$ref": "#/$defs/rulesets_ResponseRules"
@@ -1750,122 +1706,90 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/${pathParam(args, "ruleset_id")}/rules/${pathParam(args, "rule_id")}`,
       query: [
-        ["dry_run", args["validate_only"], true],
+        ["dry_run", param(args, "query", "dry_run"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/rulesets/schemas.ts b/src/generated/forge-mcp/rulesets/schemas.ts
index 618a57833..6685795dc 100644
--- a/src/generated/forge-mcp/rulesets/schemas.ts
+++ b/src/generated/forge-mcp/rulesets/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `rulesets_AccountId`.
- */
-export const rulesets_AccountId: JsonSchema = {
-  "description": "The unique ID of the account.",
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_BlockRule`.
  */
@@ -144,14 +136,6 @@ export const rulesets_CompressResponseRule: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_Cursor`.
- */
-export const rulesets_Cursor: JsonSchema = {
-  "description": "The cursor to use for the next page.",
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_DDoSDynamicRule`.
  */
@@ -187,7 +171,8 @@ export const rulesets_ExecuteCategoryOverrides: JsonSchema = {
       "action": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleAction"
+            "description": "The action to perform when the rule matches.",
+            "type": "string"
           },
           {
             "type": "string"
@@ -197,7 +182,8 @@ export const rulesets_ExecuteCategoryOverrides: JsonSchema = {
       "category": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleCategory"
+            "description": "The category of a rule.",
+            "type": "string"
           },
           {
             "type": "string"
@@ -207,7 +193,8 @@ export const rulesets_ExecuteCategoryOverrides: JsonSchema = {
       "enabled": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleEnabled"
+            "description": "Whether the rule should be executed.",
+            "type": "boolean"
           },
           {
             "type": "boolean"
@@ -217,7 +204,14 @@ export const rulesets_ExecuteCategoryOverrides: JsonSchema = {
       "sensitivity_level": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_ExecuteSensitivityLevel"
+            "description": "Sensitivity Level",
+            "enum": [
+              "default",
+              "medium",
+              "low",
+              "eoff"
+            ],
+            "type": "string"
           },
           {
             "type": "string"
@@ -260,7 +254,8 @@ export const rulesets_ExecuteOverrides: JsonSchema = {
     "action": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RuleAction"
+          "description": "The action to perform when the rule matches.",
+          "type": "string"
         },
         {
           "type": "string"
@@ -274,7 +269,8 @@ export const rulesets_ExecuteOverrides: JsonSchema = {
     "enabled": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RuleEnabled"
+          "description": "Whether the rule should be executed.",
+          "type": "boolean"
         },
         {
           "type": "boolean"
@@ -288,7 +284,14 @@ export const rulesets_ExecuteOverrides: JsonSchema = {
     "sensitivity_level": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_ExecuteSensitivityLevel"
+          "description": "Sensitivity Level",
+          "enum": [
+            "default",
+            "medium",
+            "low",
+            "eoff"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -320,7 +323,8 @@ export const rulesets_ExecuteRule: JsonSchema = {
             "id": {
               "allOf": [
                 {
-                  "$ref": "#/$defs/rulesets_RulesetId"
+                  "description": "The unique ID of the ruleset.",
+                  "type": "string"
                 },
                 {
                   "type": "string"
@@ -360,7 +364,8 @@ export const rulesets_ExecuteRuleOverrides: JsonSchema = {
       "action": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleAction"
+            "description": "The action to perform when the rule matches.",
+            "type": "string"
           },
           {
             "type": "string"
@@ -370,7 +375,8 @@ export const rulesets_ExecuteRuleOverrides: JsonSchema = {
       "enabled": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleEnabled"
+            "description": "Whether the rule should be executed.",
+            "type": "boolean"
           },
           {
             "type": "boolean"
@@ -380,7 +386,8 @@ export const rulesets_ExecuteRuleOverrides: JsonSchema = {
       "id": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_RuleId"
+            "description": "The unique ID of the rule.",
+            "type": "string"
           },
           {
             "type": "string"
@@ -394,7 +401,14 @@ export const rulesets_ExecuteRuleOverrides: JsonSchema = {
       "sensitivity_level": {
         "allOf": [
           {
-            "$ref": "#/$defs/rulesets_ExecuteSensitivityLevel"
+            "description": "Sensitivity Level",
+            "enum": [
+              "default",
+              "medium",
+              "low",
+              "eoff"
+            ],
+            "type": "string"
           },
           {
             "type": "string"
@@ -411,20 +425,6 @@ export const rulesets_ExecuteRuleOverrides: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `rulesets_ExecuteSensitivityLevel`.
- */
-export const rulesets_ExecuteSensitivityLevel: JsonSchema = {
-  "description": "Sensitivity Level",
-  "enum": [
-    "default",
-    "medium",
-    "low",
-    "eoff"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_ForceConnectionCloseRule`.
  */
@@ -690,14 +690,6 @@ export const rulesets_ManagedChallengeRule: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_PerPage`.
- */
-export const rulesets_PerPage: JsonSchema = {
-  "description": "The number of rulesets to return per page.",
-  "type": "integer"
-};
-
 /**
  * The schema of `rulesets_RedirectFromList`.
  */
@@ -883,30 +875,6 @@ export const rulesets_RequestRules: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `rulesets_RewriteHeaderExpression`.
- */
-export const rulesets_RewriteHeaderExpression: JsonSchema = {
-  "description": "An expression that evaluates to a value for the header.",
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RewriteHeaderOperation`.
- */
-export const rulesets_RewriteHeaderOperation: JsonSchema = {
-  "description": "The operation to perform on the header.",
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RewriteHeaderValue`.
- */
-export const rulesets_RewriteHeaderValue: JsonSchema = {
-  "description": "A static value for the header.",
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_RewriteHeaders`.
  */
@@ -918,7 +886,8 @@ export const rulesets_RewriteHeaders: JsonSchema = {
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "description": "The operation to perform on the header.",
+                "type": "string"
               },
               {
                 "enum": [
@@ -929,8 +898,8 @@ export const rulesets_RewriteHeaders: JsonSchema = {
             ]
           },
           "value": {
-            "$ref": "#/$defs/rulesets_RewriteHeaderValue",
-            "description": "A static value for the header."
+            "description": "A static value for the header.",
+            "type": "string"
           }
         },
         "required": [
@@ -942,13 +911,14 @@ export const rulesets_RewriteHeaders: JsonSchema = {
       {
         "properties": {
           "expression": {
-            "$ref": "#/$defs/rulesets_RewriteHeaderExpression",
-            "description": "An expression that evaluates to a value for the header."
+            "description": "An expression that evaluates to a value for the header.",
+            "type": "string"
           },
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "description": "The operation to perform on the header.",
+                "type": "string"
               },
               {
                 "enum": [
@@ -970,7 +940,8 @@ export const rulesets_RewriteHeaders: JsonSchema = {
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "description": "The operation to perform on the header.",
+                "type": "string"
               },
               {
                 "enum": [
@@ -981,8 +952,8 @@ export const rulesets_RewriteHeaders: JsonSchema = {
             ]
           },
           "value": {
-            "$ref": "#/$defs/rulesets_RewriteHeaderValue",
-            "description": "A static value for the header."
+            "description": "A static value for the header.",
+            "type": "string"
           }
         },
         "required": [
@@ -994,13 +965,14 @@ export const rulesets_RewriteHeaders: JsonSchema = {
       {
         "properties": {
           "expression": {
-            "$ref": "#/$defs/rulesets_RewriteHeaderExpression",
-            "description": "An expression that evaluates to a value for the header."
+            "description": "An expression that evaluates to a value for the header.",
+            "type": "string"
           },
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "description": "The operation to perform on the header.",
+                "type": "string"
               },
               {
                 "enum": [
@@ -1022,7 +994,8 @@ export const rulesets_RewriteHeaders: JsonSchema = {
           "operation": {
             "allOf": [
               {
-                "$ref": "#/$defs/rulesets_RewriteHeaderOperation"
+                "description": "The operation to perform on the header.",
+                "type": "string"
               },
               {
                 "enum": [
@@ -1156,14 +1129,6 @@ export const rulesets_RewriteUriQuery: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RouteHostHeader`.
- */
-export const rulesets_RouteHostHeader: JsonSchema = {
-  "description": "A value to rewrite the HTTP host header to.",
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_RouteOrigin`.
  */
@@ -1201,8 +1166,8 @@ export const rulesets_RouteRule: JsonSchema = {
         "action_parameters": {
           "properties": {
             "host_header": {
-              "$ref": "#/$defs/rulesets_RouteHostHeader",
-              "description": "A value to rewrite the HTTP host header to."
+              "description": "A value to rewrite the HTTP host header to.",
+              "type": "string"
             },
             "origin": {
               "$ref": "#/$defs/rulesets_RouteOrigin",
@@ -1248,8 +1213,8 @@ export const rulesets_Rule: JsonSchema = {
   "description": "Rule",
   "properties": {
     "action": {
-      "$ref": "#/$defs/rulesets_RuleAction",
-      "description": "The action to perform when the rule matches."
+      "description": "The action to perform when the rule matches.",
+      "type": "string"
     },
     "action_parameters": {
       "default": {},
@@ -1264,7 +1229,8 @@ export const rulesets_Rule: JsonSchema = {
     "enabled": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RuleEnabled"
+          "description": "Whether the rule should be executed.",
+          "type": "boolean"
         },
         {
           "type": "boolean"
@@ -1280,8 +1246,8 @@ export const rulesets_Rule: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/rulesets_RuleId",
-      "description": "The unique ID of the rule."
+      "description": "The unique ID of the rule.",
+      "type": "string"
     },
     "logging": {
       "$ref": "#/$defs/rulesets_RuleLogging",
@@ -1299,30 +1265,6 @@ export const rulesets_Rule: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RuleAction`.
- */
-export const rulesets_RuleAction: JsonSchema = {
-  "description": "The action to perform when the rule matches.",
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RuleCategory`.
- */
-export const rulesets_RuleCategory: JsonSchema = {
-  "description": "The category of a rule.",
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RuleEnabled`.
- */
-export const rulesets_RuleEnabled: JsonSchema = {
-  "description": "Whether the rule should be executed.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_RuleExposedCredentialCheck`.
  */
@@ -1345,14 +1287,6 @@ export const rulesets_RuleExposedCredentialCheck: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RuleId`.
- */
-export const rulesets_RuleId: JsonSchema = {
-  "description": "The unique ID of the rule.",
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_RuleLogging`.
  */
@@ -1435,7 +1369,8 @@ export const rulesets_Ruleset: JsonSchema = {
     "id": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RulesetId"
+          "description": "The unique ID of the ruleset.",
+          "type": "string"
         },
         {
           "type": "string"
@@ -1453,71 +1388,6 @@ export const rulesets_Ruleset: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_RulesetId`.
- */
-export const rulesets_RulesetId: JsonSchema = {
-  "description": "The unique ID of the ruleset.",
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RulesetKind`.
- */
-export const rulesets_RulesetKind: JsonSchema = {
-  "description": "The kind of the ruleset.",
-  "enum": [
-    "managed",
-    "custom",
-    "root",
-    "zone"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_RulesetPhase`.
- */
-export const rulesets_RulesetPhase: JsonSchema = {
-  "description": "The phase of the ruleset.",
-  "enum": [
-    "ddos_l4",
-    "ddos_l7",
-    "http_config_settings",
-    "http_custom_errors",
-    "http_log_custom_fields",
-    "http_ratelimit",
-    "http_request_cache_settings",
-    "http_request_dynamic_redirect",
-    "http_request_firewall_custom",
-    "http_request_firewall_managed",
-    "http_request_late_transform",
-    "http_request_origin",
-    "http_request_redirect",
-    "http_request_sanitize",
-    "http_request_sbfm",
-    "http_request_transform",
-    "http_response_cache_settings",
-    "http_response_compression",
-    "http_response_firewall_custom",
-    "http_response_firewall_managed",
-    "http_response_headers_transform",
-    "magic_transit",
-    "magic_transit_ids_managed",
-    "magic_transit_managed",
-    "magic_transit_ratelimit"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_ScoreIncrement`.
- */
-export const rulesets_ScoreIncrement: JsonSchema = {
-  "description": "A delta to change the score by, which can be either positive or negative.",
-  "type": "integer"
-};
-
 /**
  * The schema of `rulesets_ScoreRule`.
  */
@@ -1537,8 +1407,8 @@ export const rulesets_ScoreRule: JsonSchema = {
         "action_parameters": {
           "properties": {
             "increment": {
-              "$ref": "#/$defs/rulesets_ScoreIncrement",
-              "description": "A delta to change the score by, which can be either positive or negative."
+              "description": "A delta to change the score by, which can be either positive or negative.",
+              "type": "integer"
             }
           },
           "required": [
@@ -1555,36 +1425,6 @@ export const rulesets_ScoreRule: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_ServeErrorAssetName`.
- */
-export const rulesets_ServeErrorAssetName: JsonSchema = {
-  "description": "The name of a custom asset to serve as the error response.",
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_ServeErrorContent`.
- */
-export const rulesets_ServeErrorContent: JsonSchema = {
-  "description": "The response content.",
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_ServeErrorContentType`.
- */
-export const rulesets_ServeErrorContentType: JsonSchema = {
-  "description": "The content type header to set with the error response.",
-  "enum": [
-    "application/json",
-    "text/html",
-    "text/plain",
-    "text/xml"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_ServeErrorRule`.
  */
@@ -1606,12 +1446,18 @@ export const rulesets_ServeErrorRule: JsonSchema = {
             {
               "properties": {
                 "content_type": {
-                  "$ref": "#/$defs/rulesets_ServeErrorContentType",
-                  "description": "The content type header to set with the error response."
+                  "description": "The content type header to set with the error response.",
+                  "enum": [
+                    "application/json",
+                    "text/html",
+                    "text/plain",
+                    "text/xml"
+                  ],
+                  "type": "string"
                 },
                 "status_code": {
-                  "$ref": "#/$defs/rulesets_ServeErrorStatusCode",
-                  "description": "The status code to use for the error."
+                  "description": "The status code to use for the error.",
+                  "type": "integer"
                 }
               },
               "required": [
@@ -1624,8 +1470,8 @@ export const rulesets_ServeErrorRule: JsonSchema = {
                 {
                   "properties": {
                     "content": {
-                      "$ref": "#/$defs/rulesets_ServeErrorContent",
-                      "description": "The response content."
+                      "description": "The response content.",
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -1636,8 +1482,8 @@ export const rulesets_ServeErrorRule: JsonSchema = {
                 {
                   "properties": {
                     "asset_name": {
-                      "$ref": "#/$defs/rulesets_ServeErrorAssetName",
-                      "description": "The name of a custom asset to serve as the error response."
+                      "description": "The name of a custom asset to serve as the error response.",
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -1658,22 +1504,6 @@ export const rulesets_ServeErrorRule: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_ServeErrorStatusCode`.
- */
-export const rulesets_ServeErrorStatusCode: JsonSchema = {
-  "description": "The status code to use for the error.",
-  "type": "integer"
-};
-
-/**
- * The schema of `rulesets_SetCacheControlCloudflareOnly`.
- */
-export const rulesets_SetCacheControlCloudflareOnly: JsonSchema = {
-  "description": "Whether the directive should only be applied to the Cloudflare CDN cache.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheControlDirective`.
  */
@@ -1683,14 +1513,19 @@ export const rulesets_SetCacheControlDirective: JsonSchema = {
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly",
           "default": false,
-          "description": "Whether the directive should only be applied to the Cloudflare CDN cache."
+          "description": "Whether the directive should only be applied to the Cloudflare CDN cache.",
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "description": "The operation to perform on the cache-control directive.",
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1709,14 +1544,19 @@ export const rulesets_SetCacheControlDirective: JsonSchema = {
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly",
           "default": false,
-          "description": "Whether the directive should only be applied to the Cloudflare CDN cache."
+          "description": "Whether the directive should only be applied to the Cloudflare CDN cache.",
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "description": "The operation to perform on the cache-control directive.",
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1744,14 +1584,19 @@ export const rulesets_SetCacheControlDirectiveWithQualifiers: JsonSchema = {
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly",
           "default": false,
-          "description": "Whether the directive should only be applied to the Cloudflare CDN cache."
+          "description": "Whether the directive should only be applied to the Cloudflare CDN cache.",
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "description": "The operation to perform on the cache-control directive.",
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1777,14 +1622,19 @@ export const rulesets_SetCacheControlDirectiveWithQualifiers: JsonSchema = {
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly",
           "default": false,
-          "description": "Whether the directive should only be applied to the Cloudflare CDN cache."
+          "description": "Whether the directive should only be applied to the Cloudflare CDN cache.",
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "description": "The operation to perform on the cache-control directive.",
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1812,14 +1662,19 @@ export const rulesets_SetCacheControlDirectiveWithValue: JsonSchema = {
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly",
           "default": false,
-          "description": "Whether the directive should only be applied to the Cloudflare CDN cache."
+          "description": "Whether the directive should only be applied to the Cloudflare CDN cache.",
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "description": "The operation to perform on the cache-control directive.",
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1843,14 +1698,19 @@ export const rulesets_SetCacheControlDirectiveWithValue: JsonSchema = {
     {
       "properties": {
         "cloudflare_only": {
-          "$ref": "#/$defs/rulesets_SetCacheControlCloudflareOnly",
           "default": false,
-          "description": "Whether the directive should only be applied to the Cloudflare CDN cache."
+          "description": "Whether the directive should only be applied to the Cloudflare CDN cache.",
+          "type": "boolean"
         },
         "operation": {
           "allOf": [
             {
-              "$ref": "#/$defs/rulesets_SetCacheControlOperation"
+              "description": "The operation to perform on the cache-control directive.",
+              "enum": [
+                "set",
+                "remove"
+              ],
+              "type": "string"
             },
             {
               "enum": [
@@ -1869,18 +1729,6 @@ export const rulesets_SetCacheControlDirectiveWithValue: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_SetCacheControlOperation`.
- */
-export const rulesets_SetCacheControlOperation: JsonSchema = {
-  "description": "The operation to perform on the cache-control directive.",
-  "enum": [
-    "set",
-    "remove"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_SetCacheControlRule`.
  */
@@ -2002,14 +1850,6 @@ export const rulesets_SetCacheSettingsBrowserTTL: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SetCacheSettingsCache`.
- */
-export const rulesets_SetCacheSettingsCache: JsonSchema = {
-  "description": "Whether the request's response from the origin is eligible for caching. Caching itself will still depend on the cache control header and your other caching configurations.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheSettingsCacheKey`.
  */
@@ -2272,22 +2112,6 @@ export const rulesets_SetCacheSettingsEdgeTTL: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SetCacheSettingsOriginCacheControl`.
- */
-export const rulesets_SetCacheSettingsOriginCacheControl: JsonSchema = {
-  "description": "Whether Cloudflare will aim to strictly adhere to RFC 7234.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `rulesets_SetCacheSettingsOriginErrorPagePassthru`.
- */
-export const rulesets_SetCacheSettingsOriginErrorPagePassthru: JsonSchema = {
-  "description": "Whether to generate Cloudflare error pages for issues from the origin server.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheSettingsOriginRangeRequests`.
  */
@@ -2310,22 +2134,6 @@ export const rulesets_SetCacheSettingsOriginRangeRequests: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SetCacheSettingsReadTimeout`.
- */
-export const rulesets_SetCacheSettingsReadTimeout: JsonSchema = {
-  "description": "A timeout value between two successive read operations to use for your origin server. Historically, the timeout value between two read options from Cloudflare to an origin server is 100 seconds. If you are attempting to reduce HTTP 524 errors because of timeouts from an origin server, try increasing this timeout value.",
-  "type": "integer"
-};
-
-/**
- * The schema of `rulesets_SetCacheSettingsRespectStrongEtags`.
- */
-export const rulesets_SetCacheSettingsRespectStrongEtags: JsonSchema = {
-  "description": "Whether Cloudflare should respect strong ETag (entity tag) headers. If false, Cloudflare converts strong ETag headers to weak ETag headers.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheSettingsRule`.
  */
@@ -2353,8 +2161,8 @@ export const rulesets_SetCacheSettingsRule: JsonSchema = {
               "description": "How long client browsers should cache the response. Cloudflare cache purge will not purge content cached on client browsers, so high browser TTLs may lead to stale content."
             },
             "cache": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsCache",
-              "description": "Whether the request's response from the origin is eligible for caching. Caching itself will still depend on the cache control header and your other caching configurations."
+              "description": "Whether the request's response from the origin is eligible for caching. Caching itself will still depend on the cache control header and your other caching configurations.",
+              "type": "boolean"
             },
             "cache_key": {
               "$ref": "#/$defs/rulesets_SetCacheSettingsCacheKey",
@@ -2369,24 +2177,24 @@ export const rulesets_SetCacheSettingsRule: JsonSchema = {
               "description": "How long the Cloudflare edge network should cache the response."
             },
             "origin_cache_control": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsOriginCacheControl",
-              "description": "Whether Cloudflare will aim to strictly adhere to RFC 7234."
+              "description": "Whether Cloudflare will aim to strictly adhere to RFC 7234.",
+              "type": "boolean"
             },
             "origin_error_page_passthru": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsOriginErrorPagePassthru",
-              "description": "Whether to generate Cloudflare error pages for issues from the origin server."
+              "description": "Whether to generate Cloudflare error pages for issues from the origin server.",
+              "type": "boolean"
             },
             "origin_range_requests": {
               "$ref": "#/$defs/rulesets_SetCacheSettingsOriginRangeRequests",
               "description": "Controls whether Cloudflare fetches a large asset from the origin as a series of range requests instead of one whole-body request."
             },
             "read_timeout": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsReadTimeout",
-              "description": "A timeout value between two successive read operations to use for your origin server. Historically, the timeout value between two read options from Cloudflare to an origin server is 100 seconds. If you are attempting to reduce HTTP 524 errors because of timeouts from an origin server, try increasing this timeout value."
+              "description": "A timeout value between two successive read operations to use for your origin server. Historically, the timeout value between two read options from Cloudflare to an origin server is 100 seconds. If you are attempting to reduce HTTP 524 errors because of timeouts from an origin server, try increasing this timeout value.",
+              "type": "integer"
             },
             "respect_strong_etags": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsRespectStrongEtags",
-              "description": "Whether Cloudflare should respect strong ETag (entity tag) headers. If false, Cloudflare converts strong ETag headers to weak ETag headers."
+              "description": "Whether Cloudflare should respect strong ETag (entity tag) headers. If false, Cloudflare converts strong ETag headers to weak ETag headers.",
+              "type": "boolean"
             },
             "serve_stale": {
               "$ref": "#/$defs/rulesets_SetCacheSettingsServeStale",
@@ -2397,16 +2205,16 @@ export const rulesets_SetCacheSettingsRule: JsonSchema = {
               "description": "Configuration for shared dictionary compression. When set, Cloudflare injects Use-As-Dictionary headers on matching cacheable responses."
             },
             "strip_etags": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsStripETags",
-              "description": "Whether to strip ETag headers from the origin response before caching."
+              "description": "Whether to strip ETag headers from the origin response before caching.",
+              "type": "boolean"
             },
             "strip_last_modified": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsStripLastModified",
-              "description": "Whether to strip Last-Modified headers from the origin response before caching."
+              "description": "Whether to strip Last-Modified headers from the origin response before caching.",
+              "type": "boolean"
             },
             "strip_set_cookie": {
-              "$ref": "#/$defs/rulesets_SetCacheSettingsStripSetCookie",
-              "description": "Whether to strip Set-Cookie headers from the origin response before caching."
+              "description": "Whether to strip Set-Cookie headers from the origin response before caching.",
+              "type": "boolean"
             },
             "vary": {
               "$ref": "#/$defs/rulesets_SetCacheSettingsVary",
@@ -2494,30 +2302,6 @@ export const rulesets_SetCacheSettingsStatusCodeTTL: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `rulesets_SetCacheSettingsStripETags`.
- */
-export const rulesets_SetCacheSettingsStripETags: JsonSchema = {
-  "description": "Whether to strip ETag headers from the origin response before caching.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `rulesets_SetCacheSettingsStripLastModified`.
- */
-export const rulesets_SetCacheSettingsStripLastModified: JsonSchema = {
-  "description": "Whether to strip Last-Modified headers from the origin response before caching.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `rulesets_SetCacheSettingsStripSetCookie`.
- */
-export const rulesets_SetCacheSettingsStripSetCookie: JsonSchema = {
-  "description": "Whether to strip Set-Cookie headers from the origin response before caching.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `rulesets_SetCacheSettingsVary`.
  */
@@ -2599,27 +2383,6 @@ export const rulesets_SetCacheSettingsVaryHeader: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SetCacheTagsExpression`.
- */
-export const rulesets_SetCacheTagsExpression: JsonSchema = {
-  "description": "An expression that evaluates to an array of cache tag values.",
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_SetCacheTagsOperation`.
- */
-export const rulesets_SetCacheTagsOperation: JsonSchema = {
-  "description": "The operation to perform on the cache tags.",
-  "enum": [
-    "add",
-    "remove",
-    "set"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_SetCacheTagsRule`.
  */
@@ -2643,7 +2406,13 @@ export const rulesets_SetCacheTagsRule: JsonSchema = {
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "description": "The operation to perform on the cache tags.",
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2667,13 +2436,19 @@ export const rulesets_SetCacheTagsRule: JsonSchema = {
             {
               "properties": {
                 "expression": {
-                  "$ref": "#/$defs/rulesets_SetCacheTagsExpression",
-                  "description": "An expression that evaluates to an array of cache tag values."
+                  "description": "An expression that evaluates to an array of cache tag values.",
+                  "type": "string"
                 },
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "description": "The operation to perform on the cache tags.",
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2695,7 +2470,13 @@ export const rulesets_SetCacheTagsRule: JsonSchema = {
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "description": "The operation to perform on the cache tags.",
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2719,13 +2500,19 @@ export const rulesets_SetCacheTagsRule: JsonSchema = {
             {
               "properties": {
                 "expression": {
-                  "$ref": "#/$defs/rulesets_SetCacheTagsExpression",
-                  "description": "An expression that evaluates to an array of cache tag values."
+                  "description": "An expression that evaluates to an array of cache tag values.",
+                  "type": "string"
                 },
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "description": "The operation to perform on the cache tags.",
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2747,7 +2534,13 @@ export const rulesets_SetCacheTagsRule: JsonSchema = {
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "description": "The operation to perform on the cache tags.",
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -2771,13 +2564,19 @@ export const rulesets_SetCacheTagsRule: JsonSchema = {
             {
               "properties": {
                 "expression": {
-                  "$ref": "#/$defs/rulesets_SetCacheTagsExpression",
-                  "description": "An expression that evaluates to an array of cache tag values."
+                  "description": "An expression that evaluates to an array of cache tag values.",
+                  "type": "string"
                 },
                 "operation": {
                   "allOf": [
                     {
-                      "$ref": "#/$defs/rulesets_SetCacheTagsOperation"
+                      "description": "The operation to perform on the cache tags.",
+                      "enum": [
+                        "add",
+                        "remove",
+                        "set"
+                      ],
+                      "type": "string"
                     },
                     {
                       "enum": [
@@ -3018,17 +2817,6 @@ export const rulesets_SetConfigRule: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rulesets_SkipPhase`.
- */
-export const rulesets_SkipPhase: JsonSchema = {
-  "description": "A phase to skip the execution of. This option is only compatible with the products option.",
-  "enum": [
-    "current"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_SkipPhases`.
  */
@@ -3037,7 +2825,35 @@ export const rulesets_SkipPhases: JsonSchema = {
   "items": {
     "allOf": [
       {
-        "$ref": "#/$defs/rulesets_RulesetPhase"
+        "description": "The phase of the ruleset.",
+        "enum": [
+          "ddos_l4",
+          "ddos_l7",
+          "http_config_settings",
+          "http_custom_errors",
+          "http_log_custom_fields",
+          "http_ratelimit",
+          "http_request_cache_settings",
+          "http_request_dynamic_redirect",
+          "http_request_firewall_custom",
+          "http_request_firewall_managed",
+          "http_request_late_transform",
+          "http_request_origin",
+          "http_request_redirect",
+          "http_request_sanitize",
+          "http_request_sbfm",
+          "http_request_transform",
+          "http_response_cache_settings",
+          "http_response_compression",
+          "http_response_firewall_custom",
+          "http_response_firewall_managed",
+          "http_response_headers_transform",
+          "magic_transit",
+          "magic_transit_ids_managed",
+          "magic_transit_managed",
+          "magic_transit_ratelimit"
+        ],
+        "type": "string"
       },
       {
         "type": "string"
@@ -3088,8 +2904,11 @@ export const rulesets_SkipRule: JsonSchema = {
         "action_parameters": {
           "properties": {
             "phase": {
-              "$ref": "#/$defs/rulesets_SkipPhase",
-              "description": "A phase to skip the execution of. This option is only compatible with the products option."
+              "description": "A phase to skip the execution of. This option is only compatible with the products option.",
+              "enum": [
+                "current"
+              ],
+              "type": "string"
             },
             "phases": {
               "$ref": "#/$defs/rulesets_SkipPhases",
@@ -3104,8 +2923,11 @@ export const rulesets_SkipRule: JsonSchema = {
               "description": "A mapping of ruleset IDs to a list of rule IDs in that ruleset to skip the execution of. This option is incompatible with the ruleset option."
             },
             "ruleset": {
-              "$ref": "#/$defs/rulesets_SkipRuleset",
-              "description": "A ruleset to skip the execution of. This option is incompatible with the rulesets option."
+              "description": "A ruleset to skip the execution of. This option is incompatible with the rulesets option.",
+              "enum": [
+                "current"
+              ],
+              "type": "string"
             },
             "rulesets": {
               "$ref": "#/$defs/rulesets_SkipRulesets",
@@ -3131,7 +2953,8 @@ export const rulesets_SkipRules: JsonSchema = {
     "items": {
       "allOf": [
         {
-          "$ref": "#/$defs/rulesets_RuleId"
+          "description": "The unique ID of the rule.",
+          "type": "string"
         },
         {
           "type": "string"
@@ -3145,17 +2968,6 @@ export const rulesets_SkipRules: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rulesets_SkipRuleset`.
- */
-export const rulesets_SkipRuleset: JsonSchema = {
-  "description": "A ruleset to skip the execution of. This option is incompatible with the rulesets option.",
-  "enum": [
-    "current"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `rulesets_SkipRulesets`.
  */
@@ -3164,7 +2976,8 @@ export const rulesets_SkipRulesets: JsonSchema = {
   "items": {
     "allOf": [
       {
-        "$ref": "#/$defs/rulesets_RulesetId"
+        "description": "The unique ID of the ruleset.",
+        "type": "string"
       },
       {
         "type": "string"
diff --git a/src/generated/forge-mcp/rulesets/tools.ts b/src/generated/forge-mcp/rulesets/tools.ts
index 584c9ca91..ed7de70d6 100644
--- a/src/generated/forge-mcp/rulesets/tools.ts
+++ b/src/generated/forge-mcp/rulesets/tools.ts
@@ -1,136 +1,23 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  rulesets_Errors_output,
-  rulesets_Message_output,
-  rulesets_Messages_output,
-  rulesets_Response_output,
+  rulesets_Errors,
+  rulesets_Message,
+  rulesets_Messages,
+  rulesets_Response,
 } from "../outputs.js";
 import {
-  rulesets_BlockRule_output,
-  rulesets_ChallengeRule_output,
-  rulesets_CompressResponseRule_output,
-  rulesets_Cursor_output,
-  rulesets_DDoSDynamicRule_output,
-  rulesets_ExecuteCategoryOverrides_output,
-  rulesets_ExecuteMatchedData_output,
-  rulesets_ExecuteOverrides_output,
-  rulesets_ExecuteRuleOverrides_output,
-  rulesets_ExecuteRule_output,
-  rulesets_ExecuteSensitivityLevel_output,
-  rulesets_ForceConnectionCloseRule_output,
-  rulesets_JsChallengeRule_output,
-  rulesets_LogCustomFieldCookieFields_output,
-  rulesets_LogCustomFieldRawResponseFields_output,
-  rulesets_LogCustomFieldRequestFields_output,
-  rulesets_LogCustomFieldResponseFields_output,
-  rulesets_LogCustomFieldRule_output,
-  rulesets_LogCustomFieldTransformedRequestFields_output,
-  rulesets_LogRule_output,
-  rulesets_ManagedChallengeRule_output,
-  rulesets_RedirectFromList_output,
-  rulesets_RedirectFromValue_output,
-  rulesets_RedirectRule_output,
-  rulesets_RequestRule_output,
-  rulesets_ResponseRule_output,
-  rulesets_ResponseRules_output,
-  rulesets_ResultInfo_output,
-  rulesets_RewriteHeaderExpression_output,
-  rulesets_RewriteHeaderOperation_output,
-  rulesets_RewriteHeaderValue_output,
-  rulesets_RewriteHeaders_output,
-  rulesets_RewriteRule_output,
-  rulesets_RewriteUriPath_output,
-  rulesets_RewriteUriQuery_output,
-  rulesets_RewriteUri_output,
-  rulesets_RouteHostHeader_output,
-  rulesets_RouteOrigin_output,
-  rulesets_RouteRule_output,
-  rulesets_RouteSNI_output,
-  rulesets_RuleAction_output,
-  rulesets_RuleCategories_output,
-  rulesets_RuleCategory_output,
-  rulesets_RuleEnabled_output,
-  rulesets_RuleExposedCredentialCheck_output,
-  rulesets_RuleId_output,
-  rulesets_RuleLogging_output,
-  rulesets_RuleRatelimit_output,
-  rulesets_Rule_output,
-  rulesets_RulesetId_output,
-  rulesets_RulesetKind_output,
-  rulesets_RulesetPhase_output,
-  rulesets_RulesetVersion_output,
-  rulesets_Ruleset_output,
-  rulesets_ScoreIncrement_output,
-  rulesets_ScoreRule_output,
-  rulesets_ServeErrorAssetName_output,
-  rulesets_ServeErrorContentType_output,
-  rulesets_ServeErrorContent_output,
-  rulesets_ServeErrorRule_output,
-  rulesets_ServeErrorStatusCode_output,
-  rulesets_SetCacheControlCloudflareOnly_output,
-  rulesets_SetCacheControlDirectiveWithQualifiers_output,
-  rulesets_SetCacheControlDirectiveWithValue_output,
-  rulesets_SetCacheControlDirective_output,
-  rulesets_SetCacheControlOperation_output,
-  rulesets_SetCacheControlRule_output,
-  rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-  rulesets_SetCacheSettingsBrowserTTL_output,
-  rulesets_SetCacheSettingsCacheKey_output,
-  rulesets_SetCacheSettingsCacheReserve_output,
-  rulesets_SetCacheSettingsCache_output,
-  rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-  rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-  rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-  rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-  rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-  rulesets_SetCacheSettingsCustomCacheKey_output,
-  rulesets_SetCacheSettingsEdgeTTL_output,
-  rulesets_SetCacheSettingsOriginCacheControl_output,
-  rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-  rulesets_SetCacheSettingsOriginRangeRequests_output,
-  rulesets_SetCacheSettingsReadTimeout_output,
-  rulesets_SetCacheSettingsRespectStrongEtags_output,
-  rulesets_SetCacheSettingsRule_output,
-  rulesets_SetCacheSettingsServeStale_output,
-  rulesets_SetCacheSettingsSharedDictionary_output,
-  rulesets_SetCacheSettingsStatusCodeTTL_output,
-  rulesets_SetCacheSettingsStripETags_output,
-  rulesets_SetCacheSettingsStripLastModified_output,
-  rulesets_SetCacheSettingsStripSetCookie_output,
-  rulesets_SetCacheSettingsVaryDefault_output,
-  rulesets_SetCacheSettingsVaryHeader_output,
-  rulesets_SetCacheSettingsVary_output,
-  rulesets_SetCacheTagsExpression_output,
-  rulesets_SetCacheTagsOperation_output,
-  rulesets_SetCacheTagsRule_output,
-  rulesets_SetCacheTagsValues_output,
-  rulesets_SetConfigAutominify_output,
-  rulesets_SetConfigRule_output,
-  rulesets_SkipPhase_output,
-  rulesets_SkipPhases_output,
-  rulesets_SkipProducts_output,
-  rulesets_SkipRule_output,
-  rulesets_SkipRules_output,
-  rulesets_SkipRuleset_output,
-  rulesets_SkipRulesets_output,
-  rulesets_TransformResponseHTMLRule_output,
-} from "./outputs.js";
-import {
-  rulesets_AccountId,
   rulesets_BlockRule,
   rulesets_ChallengeRule,
   rulesets_CompressResponseRule,
-  rulesets_Cursor,
   rulesets_DDoSDynamicRule,
   rulesets_ExecuteCategoryOverrides,
   rulesets_ExecuteMatchedData,
   rulesets_ExecuteOverrides,
   rulesets_ExecuteRule,
   rulesets_ExecuteRuleOverrides,
-  rulesets_ExecuteSensitivityLevel,
   rulesets_ForceConnectionCloseRule,
   rulesets_JsChallengeRule,
   rulesets_LogCustomFieldCookieFields,
@@ -141,52 +28,35 @@ import {
   rulesets_LogCustomFieldTransformedRequestFields,
   rulesets_LogRule,
   rulesets_ManagedChallengeRule,
-  rulesets_PerPage,
   rulesets_RedirectFromList,
   rulesets_RedirectFromValue,
   rulesets_RedirectRule,
   rulesets_RequestRule,
-  rulesets_RequestRules,
-  rulesets_RewriteHeaderExpression,
-  rulesets_RewriteHeaderOperation,
-  rulesets_RewriteHeaderValue,
+  rulesets_ResponseRule,
+  rulesets_ResponseRules,
+  rulesets_ResultInfo,
   rulesets_RewriteHeaders,
   rulesets_RewriteRule,
   rulesets_RewriteUri,
   rulesets_RewriteUriPath,
   rulesets_RewriteUriQuery,
-  rulesets_RouteHostHeader,
   rulesets_RouteOrigin,
   rulesets_RouteRule,
   rulesets_RouteSNI,
   rulesets_Rule,
-  rulesets_RuleAction,
-  rulesets_RuleCategory,
-  rulesets_RuleEnabled,
+  rulesets_RuleCategories,
   rulesets_RuleExposedCredentialCheck,
-  rulesets_RuleId,
   rulesets_RuleLogging,
   rulesets_RuleRatelimit,
   rulesets_Ruleset,
-  rulesets_RulesetId,
-  rulesets_RulesetKind,
-  rulesets_RulesetPhase,
-  rulesets_ScoreIncrement,
   rulesets_ScoreRule,
-  rulesets_ServeErrorAssetName,
-  rulesets_ServeErrorContent,
-  rulesets_ServeErrorContentType,
   rulesets_ServeErrorRule,
-  rulesets_ServeErrorStatusCode,
-  rulesets_SetCacheControlCloudflareOnly,
   rulesets_SetCacheControlDirective,
   rulesets_SetCacheControlDirectiveWithQualifiers,
   rulesets_SetCacheControlDirectiveWithValue,
-  rulesets_SetCacheControlOperation,
   rulesets_SetCacheControlRule,
   rulesets_SetCacheSettingsAdditionalCacheablePorts,
   rulesets_SetCacheSettingsBrowserTTL,
-  rulesets_SetCacheSettingsCache,
   rulesets_SetCacheSettingsCacheKey,
   rulesets_SetCacheSettingsCacheReserve,
   rulesets_SetCacheSettingsCustomCacheKey,
@@ -196,35 +66,98 @@ import {
   rulesets_SetCacheSettingsCustomCacheKeyQueryString,
   rulesets_SetCacheSettingsCustomCacheKeyUser,
   rulesets_SetCacheSettingsEdgeTTL,
-  rulesets_SetCacheSettingsOriginCacheControl,
-  rulesets_SetCacheSettingsOriginErrorPagePassthru,
   rulesets_SetCacheSettingsOriginRangeRequests,
-  rulesets_SetCacheSettingsReadTimeout,
-  rulesets_SetCacheSettingsRespectStrongEtags,
   rulesets_SetCacheSettingsRule,
   rulesets_SetCacheSettingsServeStale,
   rulesets_SetCacheSettingsSharedDictionary,
   rulesets_SetCacheSettingsStatusCodeTTL,
-  rulesets_SetCacheSettingsStripETags,
-  rulesets_SetCacheSettingsStripLastModified,
-  rulesets_SetCacheSettingsStripSetCookie,
   rulesets_SetCacheSettingsVary,
   rulesets_SetCacheSettingsVaryDefault,
   rulesets_SetCacheSettingsVaryHeader,
-  rulesets_SetCacheTagsExpression,
-  rulesets_SetCacheTagsOperation,
   rulesets_SetCacheTagsRule,
   rulesets_SetCacheTagsValues,
   rulesets_SetConfigAutominify,
   rulesets_SetConfigRule,
-  rulesets_SkipPhase,
   rulesets_SkipPhases,
   rulesets_SkipProducts,
   rulesets_SkipRule,
   rulesets_SkipRules,
-  rulesets_SkipRuleset,
   rulesets_SkipRulesets,
   rulesets_TransformResponseHTMLRule,
+} from "./outputs.js";
+import {
+  rulesets_BlockRule as rulesets_BlockRule$,
+  rulesets_ChallengeRule as rulesets_ChallengeRule$,
+  rulesets_CompressResponseRule as rulesets_CompressResponseRule$,
+  rulesets_DDoSDynamicRule as rulesets_DDoSDynamicRule$,
+  rulesets_ExecuteCategoryOverrides as rulesets_ExecuteCategoryOverrides$,
+  rulesets_ExecuteMatchedData as rulesets_ExecuteMatchedData$,
+  rulesets_ExecuteOverrides as rulesets_ExecuteOverrides$,
+  rulesets_ExecuteRule as rulesets_ExecuteRule$,
+  rulesets_ExecuteRuleOverrides as rulesets_ExecuteRuleOverrides$,
+  rulesets_ForceConnectionCloseRule as rulesets_ForceConnectionCloseRule$,
+  rulesets_JsChallengeRule as rulesets_JsChallengeRule$,
+  rulesets_LogCustomFieldCookieFields as rulesets_LogCustomFieldCookieFields$,
+  rulesets_LogCustomFieldRawResponseFields as rulesets_LogCustomFieldRawResponseFields$,
+  rulesets_LogCustomFieldRequestFields as rulesets_LogCustomFieldRequestFields$,
+  rulesets_LogCustomFieldResponseFields as rulesets_LogCustomFieldResponseFields$,
+  rulesets_LogCustomFieldRule as rulesets_LogCustomFieldRule$,
+  rulesets_LogCustomFieldTransformedRequestFields as rulesets_LogCustomFieldTransformedRequestFields$,
+  rulesets_LogRule as rulesets_LogRule$,
+  rulesets_ManagedChallengeRule as rulesets_ManagedChallengeRule$,
+  rulesets_RedirectFromList as rulesets_RedirectFromList$,
+  rulesets_RedirectFromValue as rulesets_RedirectFromValue$,
+  rulesets_RedirectRule as rulesets_RedirectRule$,
+  rulesets_RequestRule as rulesets_RequestRule$,
+  rulesets_RequestRules,
+  rulesets_RewriteHeaders as rulesets_RewriteHeaders$,
+  rulesets_RewriteRule as rulesets_RewriteRule$,
+  rulesets_RewriteUri as rulesets_RewriteUri$,
+  rulesets_RewriteUriPath as rulesets_RewriteUriPath$,
+  rulesets_RewriteUriQuery as rulesets_RewriteUriQuery$,
+  rulesets_RouteOrigin as rulesets_RouteOrigin$,
+  rulesets_RouteRule as rulesets_RouteRule$,
+  rulesets_RouteSNI as rulesets_RouteSNI$,
+  rulesets_Rule as rulesets_Rule$,
+  rulesets_RuleExposedCredentialCheck as rulesets_RuleExposedCredentialCheck$,
+  rulesets_RuleLogging as rulesets_RuleLogging$,
+  rulesets_RuleRatelimit as rulesets_RuleRatelimit$,
+  rulesets_Ruleset as rulesets_Ruleset$,
+  rulesets_ScoreRule as rulesets_ScoreRule$,
+  rulesets_ServeErrorRule as rulesets_ServeErrorRule$,
+  rulesets_SetCacheControlDirective as rulesets_SetCacheControlDirective$,
+  rulesets_SetCacheControlDirectiveWithQualifiers as rulesets_SetCacheControlDirectiveWithQualifiers$,
+  rulesets_SetCacheControlDirectiveWithValue as rulesets_SetCacheControlDirectiveWithValue$,
+  rulesets_SetCacheControlRule as rulesets_SetCacheControlRule$,
+  rulesets_SetCacheSettingsAdditionalCacheablePorts as rulesets_SetCacheSettingsAdditionalCacheablePorts$,
+  rulesets_SetCacheSettingsBrowserTTL as rulesets_SetCacheSettingsBrowserTTL$,
+  rulesets_SetCacheSettingsCacheKey as rulesets_SetCacheSettingsCacheKey$,
+  rulesets_SetCacheSettingsCacheReserve as rulesets_SetCacheSettingsCacheReserve$,
+  rulesets_SetCacheSettingsCustomCacheKey as rulesets_SetCacheSettingsCustomCacheKey$,
+  rulesets_SetCacheSettingsCustomCacheKeyCookie as rulesets_SetCacheSettingsCustomCacheKeyCookie$,
+  rulesets_SetCacheSettingsCustomCacheKeyHeader as rulesets_SetCacheSettingsCustomCacheKeyHeader$,
+  rulesets_SetCacheSettingsCustomCacheKeyHost as rulesets_SetCacheSettingsCustomCacheKeyHost$,
+  rulesets_SetCacheSettingsCustomCacheKeyQueryString as rulesets_SetCacheSettingsCustomCacheKeyQueryString$,
+  rulesets_SetCacheSettingsCustomCacheKeyUser as rulesets_SetCacheSettingsCustomCacheKeyUser$,
+  rulesets_SetCacheSettingsEdgeTTL as rulesets_SetCacheSettingsEdgeTTL$,
+  rulesets_SetCacheSettingsOriginRangeRequests as rulesets_SetCacheSettingsOriginRangeRequests$,
+  rulesets_SetCacheSettingsRule as rulesets_SetCacheSettingsRule$,
+  rulesets_SetCacheSettingsServeStale as rulesets_SetCacheSettingsServeStale$,
+  rulesets_SetCacheSettingsSharedDictionary as rulesets_SetCacheSettingsSharedDictionary$,
+  rulesets_SetCacheSettingsStatusCodeTTL as rulesets_SetCacheSettingsStatusCodeTTL$,
+  rulesets_SetCacheSettingsVary as rulesets_SetCacheSettingsVary$,
+  rulesets_SetCacheSettingsVaryDefault as rulesets_SetCacheSettingsVaryDefault$,
+  rulesets_SetCacheSettingsVaryHeader as rulesets_SetCacheSettingsVaryHeader$,
+  rulesets_SetCacheTagsRule as rulesets_SetCacheTagsRule$,
+  rulesets_SetCacheTagsValues as rulesets_SetCacheTagsValues$,
+  rulesets_SetConfigAutominify as rulesets_SetConfigAutominify$,
+  rulesets_SetConfigRule as rulesets_SetConfigRule$,
+  rulesets_SkipPhases as rulesets_SkipPhases$,
+  rulesets_SkipProducts as rulesets_SkipProducts$,
+  rulesets_SkipRule as rulesets_SkipRule$,
+  rulesets_SkipRules as rulesets_SkipRules$,
+  rulesets_SkipRulesets as rulesets_SkipRulesets$,
+  rulesets_TransformResponseHTMLRule as rulesets_TransformResponseHTMLRule$,
 } from "./schemas.js";
 
 /**
@@ -234,22 +167,10 @@ export const tools: readonly Tool[] = [
   {
     name: "rulesets_create",
     title: "Create an account or zone ruleset",
-    description: "Creates a ruleset.",
+    description: "Creates a ruleset.\n\nPOST /{account_or_zone}/{account_or_zone_id}/rulesets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "allOf": [
             {
@@ -258,12 +179,45 @@ export const tools: readonly Tool[] = [
             {
               "properties": {
                 "kind": {
-                  "$ref": "#/$defs/rulesets_RulesetKind",
-                  "description": "The kind of the ruleset."
+                  "description": "The kind of the ruleset.",
+                  "enum": [
+                    "managed",
+                    "custom",
+                    "root",
+                    "zone"
+                  ],
+                  "type": "string"
                 },
                 "phase": {
-                  "$ref": "#/$defs/rulesets_RulesetPhase",
-                  "description": "The phase of the ruleset."
+                  "description": "The phase of the ruleset.",
+                  "enum": [
+                    "ddos_l4",
+                    "ddos_l7",
+                    "http_config_settings",
+                    "http_custom_errors",
+                    "http_log_custom_fields",
+                    "http_ratelimit",
+                    "http_request_cache_settings",
+                    "http_request_dynamic_redirect",
+                    "http_request_firewall_custom",
+                    "http_request_firewall_managed",
+                    "http_request_late_transform",
+                    "http_request_origin",
+                    "http_request_redirect",
+                    "http_request_sanitize",
+                    "http_request_sbfm",
+                    "http_request_transform",
+                    "http_response_cache_settings",
+                    "http_response_compression",
+                    "http_response_firewall_custom",
+                    "http_response_firewall_managed",
+                    "http_response_headers_transform",
+                    "magic_transit",
+                    "magic_transit_ids_managed",
+                    "magic_transit_managed",
+                    "magic_transit_ratelimit"
+                  ],
+                  "type": "string"
                 },
                 "rules": {
                   "$ref": "#/$defs/rulesets_RequestRules",
@@ -275,29 +229,219 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "validate_only": {
-          "default": false,
-          "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dry_run": {
+              "default": false,
+              "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "rulesets_BlockRule": rulesets_BlockRule$,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule$,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule$,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule$,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides$,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData$,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides$,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule$,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides$,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule$,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule$,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields$,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields$,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields$,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields$,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule$,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields$,
+        "rulesets_LogRule": rulesets_LogRule$,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule$,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList$,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue$,
+        "rulesets_RedirectRule": rulesets_RedirectRule$,
+        "rulesets_RequestRule": rulesets_RequestRule$,
+        "rulesets_RequestRules": rulesets_RequestRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders$,
+        "rulesets_RewriteRule": rulesets_RewriteRule$,
+        "rulesets_RewriteUri": rulesets_RewriteUri$,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath$,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery$,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin$,
+        "rulesets_RouteRule": rulesets_RouteRule$,
+        "rulesets_RouteSNI": rulesets_RouteSNI$,
+        "rulesets_Rule": rulesets_Rule$,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck$,
+        "rulesets_RuleLogging": rulesets_RuleLogging$,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit$,
+        "rulesets_Ruleset": rulesets_Ruleset$,
+        "rulesets_ScoreRule": rulesets_ScoreRule$,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule$,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective$,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers$,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue$,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule$,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts$,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL$,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey$,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve$,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey$,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost$,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString$,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser$,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL$,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests$,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule$,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale$,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary$,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL$,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary$,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault$,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader$,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule$,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues$,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify$,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule$,
+        "rulesets_SkipPhases": rulesets_SkipPhases$,
+        "rulesets_SkipProducts": rulesets_SkipProducts$,
+        "rulesets_SkipRule": rulesets_SkipRule$,
+        "rulesets_SkipRules": rulesets_SkipRules$,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets$,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/rulesets_Response"
+        },
+        {
+          "properties": {
+            "errors": {},
+            "result": {
+              "oneOf": [
+                {
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/rulesets_Ruleset"
+                    },
+                    {
+                      "properties": {
+                        "kind": {
+                          "enum": [
+                            "managed",
+                            "custom",
+                            "root",
+                            "zone"
+                          ],
+                          "type": "string"
+                        },
+                        "name": {
+                          "type": "string"
+                        },
+                        "phase": {
+                          "enum": [
+                            "ddos_l4",
+                            "ddos_l7",
+                            "http_config_settings",
+                            "http_custom_errors",
+                            "http_log_custom_fields",
+                            "http_ratelimit",
+                            "http_request_cache_settings",
+                            "http_request_dynamic_redirect",
+                            "http_request_firewall_custom",
+                            "http_request_firewall_managed",
+                            "http_request_late_transform",
+                            "http_request_origin",
+                            "http_request_redirect",
+                            "http_request_sanitize",
+                            "http_request_sbfm",
+                            "http_request_transform",
+                            "http_response_cache_settings",
+                            "http_response_compression",
+                            "http_response_firewall_custom",
+                            "http_response_firewall_managed",
+                            "http_response_headers_transform",
+                            "magic_transit",
+                            "magic_transit_ids_managed",
+                            "magic_transit_managed",
+                            "magic_transit_ratelimit"
+                          ],
+                          "type": "string"
+                        },
+                        "rules": {
+                          "$ref": "#/$defs/rulesets_ResponseRules"
+                        }
+                      },
+                      "required": [
+                        "kind",
+                        "name",
+                        "phase",
+                        "rules"
+                      ],
+                      "type": "object"
+                    }
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "success": {
+              "enum": [
+                true
+              ],
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
         "rulesets_BlockRule": rulesets_BlockRule,
         "rulesets_ChallengeRule": rulesets_ChallengeRule,
         "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
         "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
         "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
         "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
         "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
         "rulesets_ExecuteRule": rulesets_ExecuteRule,
         "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel,
         "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
         "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
         "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
@@ -308,51 +452,37 @@ export const tools: readonly Tool[] = [
         "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
         "rulesets_LogRule": rulesets_LogRule,
         "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
         "rulesets_RedirectFromList": rulesets_RedirectFromList,
         "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
         "rulesets_RedirectRule": rulesets_RedirectRule,
         "rulesets_RequestRule": rulesets_RequestRule,
-        "rulesets_RequestRules": rulesets_RequestRules,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
         "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
         "rulesets_RewriteRule": rulesets_RewriteRule,
         "rulesets_RewriteUri": rulesets_RewriteUri,
         "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
         "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader,
         "rulesets_RouteOrigin": rulesets_RouteOrigin,
         "rulesets_RouteRule": rulesets_RouteRule,
         "rulesets_RouteSNI": rulesets_RouteSNI,
         "rulesets_Rule": rulesets_Rule,
-        "rulesets_RuleAction": rulesets_RuleAction,
-        "rulesets_RuleCategory": rulesets_RuleCategory,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
         "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
-        "rulesets_RuleId": rulesets_RuleId,
         "rulesets_RuleLogging": rulesets_RuleLogging,
         "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
         "rulesets_Ruleset": rulesets_Ruleset,
-        "rulesets_RulesetId": rulesets_RulesetId,
-        "rulesets_RulesetKind": rulesets_RulesetKind,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement,
         "rulesets_ScoreRule": rulesets_ScoreRule,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType,
         "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly,
         "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
         "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
         "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation,
         "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
         "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
         "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache,
         "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
         "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
         "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
@@ -362,205 +492,26 @@ export const tools: readonly Tool[] = [
         "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
         "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
         "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru,
         "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags,
         "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
         "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
         "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
         "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie,
         "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
         "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
         "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation,
         "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
         "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
         "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
         "rulesets_SetConfigRule": rulesets_SetConfigRule,
-        "rulesets_SkipPhase": rulesets_SkipPhase,
         "rulesets_SkipPhases": rulesets_SkipPhases,
         "rulesets_SkipProducts": rulesets_SkipProducts,
         "rulesets_SkipRule": rulesets_SkipRule,
         "rulesets_SkipRules": rulesets_SkipRules,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset,
         "rulesets_SkipRulesets": rulesets_SkipRulesets,
         "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/rulesets_Response"
-        },
-        {
-          "properties": {
-            "errors": {},
-            "result": {
-              "oneOf": [
-                {
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/rulesets_Ruleset"
-                    },
-                    {
-                      "properties": {
-                        "kind": {
-                          "$ref": "#/$defs/rulesets_RulesetKind"
-                        },
-                        "name": {
-                          "type": "string"
-                        },
-                        "phase": {
-                          "$ref": "#/$defs/rulesets_RulesetPhase"
-                        },
-                        "rules": {
-                          "$ref": "#/$defs/rulesets_ResponseRules"
-                        }
-                      },
-                      "required": [
-                        "kind",
-                        "name",
-                        "phase",
-                        "rules"
-                      ],
-                      "type": "object"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
-            "success": {
-              "enum": [
-                true
-              ],
-              "type": "boolean"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -608,13 +559,46 @@ export const tools: readonly Tool[] = [
                         {
                           "properties": {
                             "kind": {
-                              "$ref": "#/$defs/rulesets_RulesetKind"
+                              "enum": [
+                                "managed",
+                                "custom",
+                                "root",
+                                "zone"
+                              ],
+                              "type": "string"
                             },
                             "name": {
                               "type": "string"
                             },
                             "phase": {
-                              "$ref": "#/$defs/rulesets_RulesetPhase"
+                              "enum": [
+                                "ddos_l4",
+                                "ddos_l7",
+                                "http_config_settings",
+                                "http_custom_errors",
+                                "http_log_custom_fields",
+                                "http_ratelimit",
+                                "http_request_cache_settings",
+                                "http_request_dynamic_redirect",
+                                "http_request_firewall_custom",
+                                "http_request_firewall_managed",
+                                "http_request_late_transform",
+                                "http_request_origin",
+                                "http_request_redirect",
+                                "http_request_sanitize",
+                                "http_request_sbfm",
+                                "http_request_transform",
+                                "http_response_cache_settings",
+                                "http_response_compression",
+                                "http_response_firewall_custom",
+                                "http_response_firewall_managed",
+                                "http_response_headers_transform",
+                                "magic_transit",
+                                "magic_transit_ids_managed",
+                                "magic_transit_managed",
+                                "magic_transit_ratelimit"
+                              ],
+                              "type": "string"
                             },
                             "rules": {
                               "$ref": "#/$defs/rulesets_ResponseRules"
@@ -669,122 +653,90 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets`,
       query: [
-        ["dry_run", args["validate_only"], true],
+        ["dry_run", param(args, "query", "dry_run"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -792,41 +744,53 @@ export const tools: readonly Tool[] = [
   {
     name: "rulesets_delete",
     title: "Delete an account or zone ruleset",
-    description: "Deletes all versions of an existing account or zone ruleset.",
+    description: "Deletes all versions of an existing account or zone ruleset.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The unique ID of the ruleset.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "ruleset_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "id": {
-          "$ref": "#/$defs/rulesets_RulesetId",
-          "description": "The unique ID of the ruleset."
+          "type": "object"
         },
-        "validate_only": {
-          "default": false,
-          "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dry_run": {
+              "default": false,
+              "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "id"
+        "path"
       ],
-      $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
-        "rulesets_RulesetId": rulesets_RulesetId,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -881,52 +845,58 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
       },
     },
     request: (args) => ({
-      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/${pathParam(args, "id")}`,
+      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/${pathParam(args, "ruleset_id")}`,
       query: [
-        ["dry_run", args["validate_only"], true],
+        ["dry_run", param(args, "query", "dry_run"), true],
       ],
     }),
   },
   {
     name: "rulesets_get",
     title: "Get an account or zone ruleset",
-    description: "Fetches the latest version of an account or zone ruleset.",
+    description: "Fetches the latest version of an account or zone ruleset.\n\nGET /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The unique ID of the ruleset.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "ruleset_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "id": {
-          "$ref": "#/$defs/rulesets_RulesetId",
-          "description": "The unique ID of the ruleset."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "id"
+        "path"
       ],
-      $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
-        "rulesets_RulesetId": rulesets_RulesetId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -944,13 +914,46 @@ export const tools: readonly Tool[] = [
                 {
                   "properties": {
                     "kind": {
-                      "$ref": "#/$defs/rulesets_RulesetKind"
+                      "enum": [
+                        "managed",
+                        "custom",
+                        "root",
+                        "zone"
+                      ],
+                      "type": "string"
                     },
                     "name": {
                       "type": "string"
                     },
                     "phase": {
-                      "$ref": "#/$defs/rulesets_RulesetPhase"
+                      "enum": [
+                        "ddos_l4",
+                        "ddos_l7",
+                        "http_config_settings",
+                        "http_custom_errors",
+                        "http_log_custom_fields",
+                        "http_ratelimit",
+                        "http_request_cache_settings",
+                        "http_request_dynamic_redirect",
+                        "http_request_firewall_custom",
+                        "http_request_firewall_managed",
+                        "http_request_late_transform",
+                        "http_request_origin",
+                        "http_request_redirect",
+                        "http_request_sanitize",
+                        "http_request_sbfm",
+                        "http_request_transform",
+                        "http_response_cache_settings",
+                        "http_response_compression",
+                        "http_response_firewall_custom",
+                        "http_response_firewall_managed",
+                        "http_response_headers_transform",
+                        "magic_transit",
+                        "magic_transit_ids_managed",
+                        "magic_transit_managed",
+                        "magic_transit_ratelimit"
+                      ],
+                      "type": "string"
                     },
                     "rules": {
                       "$ref": "#/$defs/rulesets_ResponseRules"
@@ -977,120 +980,88 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
-      },
-    },
-    annotations: {
-      "destructiveHint": false,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
+      },
+    },
+    annotations: {
+      "destructiveHint": false,
       "idempotentHint": true,
       "openWorldHint": true,
       "readOnlyHint": true,
@@ -1142,13 +1113,46 @@ export const tools: readonly Tool[] = [
                     {
                       "properties": {
                         "kind": {
-                          "$ref": "#/$defs/rulesets_RulesetKind"
+                          "enum": [
+                            "managed",
+                            "custom",
+                            "root",
+                            "zone"
+                          ],
+                          "type": "string"
                         },
                         "name": {
                           "type": "string"
                         },
                         "phase": {
-                          "$ref": "#/$defs/rulesets_RulesetPhase"
+                          "enum": [
+                            "ddos_l4",
+                            "ddos_l7",
+                            "http_config_settings",
+                            "http_custom_errors",
+                            "http_log_custom_fields",
+                            "http_ratelimit",
+                            "http_request_cache_settings",
+                            "http_request_dynamic_redirect",
+                            "http_request_firewall_custom",
+                            "http_request_firewall_managed",
+                            "http_request_late_transform",
+                            "http_request_origin",
+                            "http_request_redirect",
+                            "http_request_sanitize",
+                            "http_request_sbfm",
+                            "http_request_transform",
+                            "http_response_cache_settings",
+                            "http_response_compression",
+                            "http_response_firewall_custom",
+                            "http_response_firewall_managed",
+                            "http_response_headers_transform",
+                            "magic_transit",
+                            "magic_transit_ids_managed",
+                            "magic_transit_managed",
+                            "magic_transit_ratelimit"
+                          ],
+                          "type": "string"
                         },
                         "rules": {
                           "$ref": "#/$defs/rulesets_ResponseRules"
@@ -1198,159 +1202,138 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     request: (args) => ({
-      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/${pathParam(args, "id")}`,
+      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/${pathParam(args, "ruleset_id")}`,
     }),
   },
   {
     name: "rulesets_list",
     title: "List account or zone rulesets",
-    description: "Fetches all rulesets.",
+    description: "Fetches all rulesets.\n\nGET /{account_or_zone}/{account_or_zone_id}/rulesets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "cursor": {
-          "$ref": "#/$defs/rulesets_Cursor",
-          "description": "The cursor to use for the next page."
+          "type": "object"
         },
-        "per_page": {
-          "$ref": "#/$defs/rulesets_PerPage",
-          "description": "The number of rulesets to return per page."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "The cursor to use for the next page.",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "The number of rulesets to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
-        "rulesets_Cursor": rulesets_Cursor,
-        "rulesets_PerPage": rulesets_PerPage,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -1369,13 +1352,46 @@ export const tools: readonly Tool[] = [
                   {
                     "properties": {
                       "kind": {
-                        "$ref": "#/$defs/rulesets_RulesetKind"
+                        "enum": [
+                          "managed",
+                          "custom",
+                          "root",
+                          "zone"
+                        ],
+                        "type": "string"
                       },
                       "name": {
                         "type": "string"
                       },
                       "phase": {
-                        "$ref": "#/$defs/rulesets_RulesetPhase"
+                        "enum": [
+                          "ddos_l4",
+                          "ddos_l7",
+                          "http_config_settings",
+                          "http_custom_errors",
+                          "http_log_custom_fields",
+                          "http_ratelimit",
+                          "http_request_cache_settings",
+                          "http_request_dynamic_redirect",
+                          "http_request_firewall_custom",
+                          "http_request_firewall_managed",
+                          "http_request_late_transform",
+                          "http_request_origin",
+                          "http_request_redirect",
+                          "http_request_sanitize",
+                          "http_request_sbfm",
+                          "http_request_transform",
+                          "http_response_cache_settings",
+                          "http_response_compression",
+                          "http_response_firewall_custom",
+                          "http_response_firewall_managed",
+                          "http_response_headers_transform",
+                          "magic_transit",
+                          "magic_transit_ids_managed",
+                          "magic_transit_managed",
+                          "magic_transit_ratelimit"
+                        ],
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -1403,17 +1419,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_Cursor": rulesets_Cursor_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResultInfo": rulesets_ResultInfo_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResultInfo": rulesets_ResultInfo,
+        "rulesets_Ruleset": rulesets_Ruleset,
       },
     },
     annotations: {
@@ -1470,13 +1481,46 @@ export const tools: readonly Tool[] = [
                       {
                         "properties": {
                           "kind": {
-                            "$ref": "#/$defs/rulesets_RulesetKind"
+                            "enum": [
+                              "managed",
+                              "custom",
+                              "root",
+                              "zone"
+                            ],
+                            "type": "string"
                           },
                           "name": {
                             "type": "string"
                           },
                           "phase": {
-                            "$ref": "#/$defs/rulesets_RulesetPhase"
+                            "enum": [
+                              "ddos_l4",
+                              "ddos_l7",
+                              "http_config_settings",
+                              "http_custom_errors",
+                              "http_log_custom_fields",
+                              "http_ratelimit",
+                              "http_request_cache_settings",
+                              "http_request_dynamic_redirect",
+                              "http_request_firewall_custom",
+                              "http_request_firewall_managed",
+                              "http_request_late_transform",
+                              "http_request_origin",
+                              "http_request_redirect",
+                              "http_request_sanitize",
+                              "http_request_sbfm",
+                              "http_request_transform",
+                              "http_response_cache_settings",
+                              "http_response_compression",
+                              "http_response_firewall_custom",
+                              "http_response_firewall_managed",
+                              "http_response_headers_transform",
+                              "magic_transit",
+                              "magic_transit_ids_managed",
+                              "magic_transit_managed",
+                              "magic_transit_ratelimit"
+                            ],
+                            "type": "string"
                           }
                         },
                         "required": [
@@ -1527,46 +1571,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_Cursor": rulesets_Cursor_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResultInfo": rulesets_ResultInfo_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResultInfo": rulesets_ResultInfo,
+        "rulesets_Ruleset": rulesets_Ruleset,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "rulesets_update",
     title: "Update an account or zone ruleset",
-    description: "Updates an account or zone ruleset, creating a new version.",
+    description: "Updates an account or zone ruleset, creating a new version.\n\nPUT /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/rulesets_AccountId",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "allOf": [
             {
@@ -1575,12 +1602,45 @@ export const tools: readonly Tool[] = [
             {
               "properties": {
                 "kind": {
-                  "$ref": "#/$defs/rulesets_RulesetKind",
-                  "description": "The kind of the ruleset."
+                  "description": "The kind of the ruleset.",
+                  "enum": [
+                    "managed",
+                    "custom",
+                    "root",
+                    "zone"
+                  ],
+                  "type": "string"
                 },
                 "phase": {
-                  "$ref": "#/$defs/rulesets_RulesetPhase",
-                  "description": "The phase of the ruleset."
+                  "description": "The phase of the ruleset.",
+                  "enum": [
+                    "ddos_l4",
+                    "ddos_l7",
+                    "http_config_settings",
+                    "http_custom_errors",
+                    "http_log_custom_fields",
+                    "http_ratelimit",
+                    "http_request_cache_settings",
+                    "http_request_dynamic_redirect",
+                    "http_request_firewall_custom",
+                    "http_request_firewall_managed",
+                    "http_request_late_transform",
+                    "http_request_origin",
+                    "http_request_redirect",
+                    "http_request_sanitize",
+                    "http_request_sbfm",
+                    "http_request_transform",
+                    "http_response_cache_settings",
+                    "http_response_compression",
+                    "http_response_firewall_custom",
+                    "http_response_firewall_managed",
+                    "http_response_headers_transform",
+                    "magic_transit",
+                    "magic_transit_ids_managed",
+                    "magic_transit_managed",
+                    "magic_transit_ratelimit"
+                  ],
+                  "type": "string"
                 },
                 "rules": {
                   "$ref": "#/$defs/rulesets_RequestRules",
@@ -1592,34 +1652,224 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "ruleset_id": {
-          "$ref": "#/$defs/rulesets_RulesetId",
-          "description": "The unique ID of the ruleset."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The unique ID of the ruleset.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "ruleset_id"
+          ],
+          "type": "object"
         },
-        "validate_only": {
-          "default": false,
-          "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dry_run": {
+              "default": false,
+              "description": "Validates the request without persisting changes when set to `true`. Responses that normally return 200 return `result: null`; endpoints that normally return 204 continue to return 204.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "ruleset_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "rulesets_BlockRule": rulesets_BlockRule$,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule$,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule$,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule$,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides$,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData$,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides$,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule$,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides$,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule$,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule$,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields$,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields$,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields$,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields$,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule$,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields$,
+        "rulesets_LogRule": rulesets_LogRule$,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule$,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList$,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue$,
+        "rulesets_RedirectRule": rulesets_RedirectRule$,
+        "rulesets_RequestRule": rulesets_RequestRule$,
+        "rulesets_RequestRules": rulesets_RequestRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders$,
+        "rulesets_RewriteRule": rulesets_RewriteRule$,
+        "rulesets_RewriteUri": rulesets_RewriteUri$,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath$,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery$,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin$,
+        "rulesets_RouteRule": rulesets_RouteRule$,
+        "rulesets_RouteSNI": rulesets_RouteSNI$,
+        "rulesets_Rule": rulesets_Rule$,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck$,
+        "rulesets_RuleLogging": rulesets_RuleLogging$,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit$,
+        "rulesets_Ruleset": rulesets_Ruleset$,
+        "rulesets_ScoreRule": rulesets_ScoreRule$,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule$,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective$,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers$,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue$,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule$,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts$,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL$,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey$,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve$,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey$,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader$,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost$,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString$,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser$,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL$,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests$,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule$,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale$,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary$,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL$,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary$,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault$,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader$,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule$,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues$,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify$,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule$,
+        "rulesets_SkipPhases": rulesets_SkipPhases$,
+        "rulesets_SkipProducts": rulesets_SkipProducts$,
+        "rulesets_SkipRule": rulesets_SkipRule$,
+        "rulesets_SkipRules": rulesets_SkipRules$,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets$,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/rulesets_Response"
+        },
+        {
+          "properties": {
+            "errors": {},
+            "result": {
+              "oneOf": [
+                {
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/rulesets_Ruleset"
+                    },
+                    {
+                      "properties": {
+                        "kind": {
+                          "enum": [
+                            "managed",
+                            "custom",
+                            "root",
+                            "zone"
+                          ],
+                          "type": "string"
+                        },
+                        "name": {
+                          "type": "string"
+                        },
+                        "phase": {
+                          "enum": [
+                            "ddos_l4",
+                            "ddos_l7",
+                            "http_config_settings",
+                            "http_custom_errors",
+                            "http_log_custom_fields",
+                            "http_ratelimit",
+                            "http_request_cache_settings",
+                            "http_request_dynamic_redirect",
+                            "http_request_firewall_custom",
+                            "http_request_firewall_managed",
+                            "http_request_late_transform",
+                            "http_request_origin",
+                            "http_request_redirect",
+                            "http_request_sanitize",
+                            "http_request_sbfm",
+                            "http_request_transform",
+                            "http_response_cache_settings",
+                            "http_response_compression",
+                            "http_response_firewall_custom",
+                            "http_response_firewall_managed",
+                            "http_response_headers_transform",
+                            "magic_transit",
+                            "magic_transit_ids_managed",
+                            "magic_transit_managed",
+                            "magic_transit_ratelimit"
+                          ],
+                          "type": "string"
+                        },
+                        "rules": {
+                          "$ref": "#/$defs/rulesets_ResponseRules"
+                        }
+                      },
+                      "required": [
+                        "kind",
+                        "name",
+                        "phase",
+                        "rules"
+                      ],
+                      "type": "object"
+                    }
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "success": {
+              "enum": [
+                true
+              ],
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
-        "rulesets_AccountId": rulesets_AccountId,
         "rulesets_BlockRule": rulesets_BlockRule,
         "rulesets_ChallengeRule": rulesets_ChallengeRule,
         "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
         "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
         "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
         "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
         "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
         "rulesets_ExecuteRule": rulesets_ExecuteRule,
         "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel,
         "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
         "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
         "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
@@ -1630,51 +1880,37 @@ export const tools: readonly Tool[] = [
         "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
         "rulesets_LogRule": rulesets_LogRule,
         "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
         "rulesets_RedirectFromList": rulesets_RedirectFromList,
         "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
         "rulesets_RedirectRule": rulesets_RedirectRule,
         "rulesets_RequestRule": rulesets_RequestRule,
-        "rulesets_RequestRules": rulesets_RequestRules,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
         "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
         "rulesets_RewriteRule": rulesets_RewriteRule,
         "rulesets_RewriteUri": rulesets_RewriteUri,
         "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
         "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader,
         "rulesets_RouteOrigin": rulesets_RouteOrigin,
         "rulesets_RouteRule": rulesets_RouteRule,
         "rulesets_RouteSNI": rulesets_RouteSNI,
         "rulesets_Rule": rulesets_Rule,
-        "rulesets_RuleAction": rulesets_RuleAction,
-        "rulesets_RuleCategory": rulesets_RuleCategory,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
         "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
-        "rulesets_RuleId": rulesets_RuleId,
         "rulesets_RuleLogging": rulesets_RuleLogging,
         "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
         "rulesets_Ruleset": rulesets_Ruleset,
-        "rulesets_RulesetId": rulesets_RulesetId,
-        "rulesets_RulesetKind": rulesets_RulesetKind,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement,
         "rulesets_ScoreRule": rulesets_ScoreRule,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType,
         "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly,
         "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
         "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
         "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation,
         "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
         "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
         "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache,
         "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
         "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
         "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
@@ -1684,205 +1920,26 @@ export const tools: readonly Tool[] = [
         "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
         "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
         "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru,
         "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags,
         "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
         "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
         "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
         "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie,
         "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
         "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
         "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation,
         "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
         "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
         "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
         "rulesets_SetConfigRule": rulesets_SetConfigRule,
-        "rulesets_SkipPhase": rulesets_SkipPhase,
         "rulesets_SkipPhases": rulesets_SkipPhases,
         "rulesets_SkipProducts": rulesets_SkipProducts,
         "rulesets_SkipRule": rulesets_SkipRule,
         "rulesets_SkipRules": rulesets_SkipRules,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset,
         "rulesets_SkipRulesets": rulesets_SkipRulesets,
         "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/rulesets_Response"
-        },
-        {
-          "properties": {
-            "errors": {},
-            "result": {
-              "oneOf": [
-                {
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/rulesets_Ruleset"
-                    },
-                    {
-                      "properties": {
-                        "kind": {
-                          "$ref": "#/$defs/rulesets_RulesetKind"
-                        },
-                        "name": {
-                          "type": "string"
-                        },
-                        "phase": {
-                          "$ref": "#/$defs/rulesets_RulesetPhase"
-                        },
-                        "rules": {
-                          "$ref": "#/$defs/rulesets_ResponseRules"
-                        }
-                      },
-                      "required": [
-                        "kind",
-                        "name",
-                        "phase",
-                        "rules"
-                      ],
-                      "type": "object"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
-            "success": {
-              "enum": [
-                true
-              ],
-              "type": "boolean"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
-      },
-    },
     annotations: {
       "destructiveHint": true,
       "idempotentHint": true,
@@ -1930,13 +1987,46 @@ export const tools: readonly Tool[] = [
                         {
                           "properties": {
                             "kind": {
-                              "$ref": "#/$defs/rulesets_RulesetKind"
+                              "enum": [
+                                "managed",
+                                "custom",
+                                "root",
+                                "zone"
+                              ],
+                              "type": "string"
                             },
                             "name": {
                               "type": "string"
                             },
                             "phase": {
-                              "$ref": "#/$defs/rulesets_RulesetPhase"
+                              "enum": [
+                                "ddos_l4",
+                                "ddos_l7",
+                                "http_config_settings",
+                                "http_custom_errors",
+                                "http_log_custom_fields",
+                                "http_ratelimit",
+                                "http_request_cache_settings",
+                                "http_request_dynamic_redirect",
+                                "http_request_firewall_custom",
+                                "http_request_firewall_managed",
+                                "http_request_late_transform",
+                                "http_request_origin",
+                                "http_request_redirect",
+                                "http_request_sanitize",
+                                "http_request_sbfm",
+                                "http_request_transform",
+                                "http_response_cache_settings",
+                                "http_response_compression",
+                                "http_response_firewall_custom",
+                                "http_response_firewall_managed",
+                                "http_response_headers_transform",
+                                "magic_transit",
+                                "magic_transit_ids_managed",
+                                "magic_transit_managed",
+                                "magic_transit_ratelimit"
+                              ],
+                              "type": "string"
                             },
                             "rules": {
                               "$ref": "#/$defs/rulesets_ResponseRules"
@@ -1991,122 +2081,90 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_BlockRule": rulesets_BlockRule_output,
-        "rulesets_ChallengeRule": rulesets_ChallengeRule_output,
-        "rulesets_CompressResponseRule": rulesets_CompressResponseRule_output,
-        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule_output,
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides_output,
-        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData_output,
-        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides_output,
-        "rulesets_ExecuteRule": rulesets_ExecuteRule_output,
-        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides_output,
-        "rulesets_ExecuteSensitivityLevel": rulesets_ExecuteSensitivityLevel_output,
-        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule_output,
-        "rulesets_JsChallengeRule": rulesets_JsChallengeRule_output,
-        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields_output,
-        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields_output,
-        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields_output,
-        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields_output,
-        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule_output,
-        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields_output,
-        "rulesets_LogRule": rulesets_LogRule_output,
-        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_RedirectFromList": rulesets_RedirectFromList_output,
-        "rulesets_RedirectFromValue": rulesets_RedirectFromValue_output,
-        "rulesets_RedirectRule": rulesets_RedirectRule_output,
-        "rulesets_RequestRule": rulesets_RequestRule_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_ResponseRule": rulesets_ResponseRule_output,
-        "rulesets_ResponseRules": rulesets_ResponseRules_output,
-        "rulesets_RewriteHeaderExpression": rulesets_RewriteHeaderExpression_output,
-        "rulesets_RewriteHeaderOperation": rulesets_RewriteHeaderOperation_output,
-        "rulesets_RewriteHeaderValue": rulesets_RewriteHeaderValue_output,
-        "rulesets_RewriteHeaders": rulesets_RewriteHeaders_output,
-        "rulesets_RewriteRule": rulesets_RewriteRule_output,
-        "rulesets_RewriteUri": rulesets_RewriteUri_output,
-        "rulesets_RewriteUriPath": rulesets_RewriteUriPath_output,
-        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery_output,
-        "rulesets_RouteHostHeader": rulesets_RouteHostHeader_output,
-        "rulesets_RouteOrigin": rulesets_RouteOrigin_output,
-        "rulesets_RouteRule": rulesets_RouteRule_output,
-        "rulesets_RouteSNI": rulesets_RouteSNI_output,
-        "rulesets_Rule": rulesets_Rule_output,
-        "rulesets_RuleAction": rulesets_RuleAction_output,
-        "rulesets_RuleCategories": rulesets_RuleCategories_output,
-        "rulesets_RuleCategory": rulesets_RuleCategory_output,
-        "rulesets_RuleEnabled": rulesets_RuleEnabled_output,
-        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck_output,
-        "rulesets_RuleId": rulesets_RuleId_output,
-        "rulesets_RuleLogging": rulesets_RuleLogging_output,
-        "rulesets_RuleRatelimit": rulesets_RuleRatelimit_output,
-        "rulesets_Ruleset": rulesets_Ruleset_output,
-        "rulesets_RulesetId": rulesets_RulesetId_output,
-        "rulesets_RulesetKind": rulesets_RulesetKind_output,
-        "rulesets_RulesetPhase": rulesets_RulesetPhase_output,
-        "rulesets_RulesetVersion": rulesets_RulesetVersion_output,
-        "rulesets_ScoreIncrement": rulesets_ScoreIncrement_output,
-        "rulesets_ScoreRule": rulesets_ScoreRule_output,
-        "rulesets_ServeErrorAssetName": rulesets_ServeErrorAssetName_output,
-        "rulesets_ServeErrorContent": rulesets_ServeErrorContent_output,
-        "rulesets_ServeErrorContentType": rulesets_ServeErrorContentType_output,
-        "rulesets_ServeErrorRule": rulesets_ServeErrorRule_output,
-        "rulesets_ServeErrorStatusCode": rulesets_ServeErrorStatusCode_output,
-        "rulesets_SetCacheControlCloudflareOnly": rulesets_SetCacheControlCloudflareOnly_output,
-        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective_output,
-        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers_output,
-        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue_output,
-        "rulesets_SetCacheControlOperation": rulesets_SetCacheControlOperation_output,
-        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule_output,
-        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts_output,
-        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL_output,
-        "rulesets_SetCacheSettingsCache": rulesets_SetCacheSettingsCache_output,
-        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey_output,
-        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve_output,
-        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString_output,
-        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser_output,
-        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL_output,
-        "rulesets_SetCacheSettingsOriginCacheControl": rulesets_SetCacheSettingsOriginCacheControl_output,
-        "rulesets_SetCacheSettingsOriginErrorPagePassthru": rulesets_SetCacheSettingsOriginErrorPagePassthru_output,
-        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests_output,
-        "rulesets_SetCacheSettingsReadTimeout": rulesets_SetCacheSettingsReadTimeout_output,
-        "rulesets_SetCacheSettingsRespectStrongEtags": rulesets_SetCacheSettingsRespectStrongEtags_output,
-        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule_output,
-        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale_output,
-        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary_output,
-        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL_output,
-        "rulesets_SetCacheSettingsStripETags": rulesets_SetCacheSettingsStripETags_output,
-        "rulesets_SetCacheSettingsStripLastModified": rulesets_SetCacheSettingsStripLastModified_output,
-        "rulesets_SetCacheSettingsStripSetCookie": rulesets_SetCacheSettingsStripSetCookie_output,
-        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary_output,
-        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault_output,
-        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader_output,
-        "rulesets_SetCacheTagsExpression": rulesets_SetCacheTagsExpression_output,
-        "rulesets_SetCacheTagsOperation": rulesets_SetCacheTagsOperation_output,
-        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule_output,
-        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues_output,
-        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify_output,
-        "rulesets_SetConfigRule": rulesets_SetConfigRule_output,
-        "rulesets_SkipPhase": rulesets_SkipPhase_output,
-        "rulesets_SkipPhases": rulesets_SkipPhases_output,
-        "rulesets_SkipProducts": rulesets_SkipProducts_output,
-        "rulesets_SkipRule": rulesets_SkipRule_output,
-        "rulesets_SkipRules": rulesets_SkipRules_output,
-        "rulesets_SkipRuleset": rulesets_SkipRuleset_output,
-        "rulesets_SkipRulesets": rulesets_SkipRulesets_output,
-        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule_output,
+        "rulesets_BlockRule": rulesets_BlockRule,
+        "rulesets_ChallengeRule": rulesets_ChallengeRule,
+        "rulesets_CompressResponseRule": rulesets_CompressResponseRule,
+        "rulesets_DDoSDynamicRule": rulesets_DDoSDynamicRule,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_ExecuteCategoryOverrides": rulesets_ExecuteCategoryOverrides,
+        "rulesets_ExecuteMatchedData": rulesets_ExecuteMatchedData,
+        "rulesets_ExecuteOverrides": rulesets_ExecuteOverrides,
+        "rulesets_ExecuteRule": rulesets_ExecuteRule,
+        "rulesets_ExecuteRuleOverrides": rulesets_ExecuteRuleOverrides,
+        "rulesets_ForceConnectionCloseRule": rulesets_ForceConnectionCloseRule,
+        "rulesets_JsChallengeRule": rulesets_JsChallengeRule,
+        "rulesets_LogCustomFieldCookieFields": rulesets_LogCustomFieldCookieFields,
+        "rulesets_LogCustomFieldRawResponseFields": rulesets_LogCustomFieldRawResponseFields,
+        "rulesets_LogCustomFieldRequestFields": rulesets_LogCustomFieldRequestFields,
+        "rulesets_LogCustomFieldResponseFields": rulesets_LogCustomFieldResponseFields,
+        "rulesets_LogCustomFieldRule": rulesets_LogCustomFieldRule,
+        "rulesets_LogCustomFieldTransformedRequestFields": rulesets_LogCustomFieldTransformedRequestFields,
+        "rulesets_LogRule": rulesets_LogRule,
+        "rulesets_ManagedChallengeRule": rulesets_ManagedChallengeRule,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_RedirectFromList": rulesets_RedirectFromList,
+        "rulesets_RedirectFromValue": rulesets_RedirectFromValue,
+        "rulesets_RedirectRule": rulesets_RedirectRule,
+        "rulesets_RequestRule": rulesets_RequestRule,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_ResponseRule": rulesets_ResponseRule,
+        "rulesets_ResponseRules": rulesets_ResponseRules,
+        "rulesets_RewriteHeaders": rulesets_RewriteHeaders,
+        "rulesets_RewriteRule": rulesets_RewriteRule,
+        "rulesets_RewriteUri": rulesets_RewriteUri,
+        "rulesets_RewriteUriPath": rulesets_RewriteUriPath,
+        "rulesets_RewriteUriQuery": rulesets_RewriteUriQuery,
+        "rulesets_RouteOrigin": rulesets_RouteOrigin,
+        "rulesets_RouteRule": rulesets_RouteRule,
+        "rulesets_RouteSNI": rulesets_RouteSNI,
+        "rulesets_Rule": rulesets_Rule,
+        "rulesets_RuleCategories": rulesets_RuleCategories,
+        "rulesets_RuleExposedCredentialCheck": rulesets_RuleExposedCredentialCheck,
+        "rulesets_RuleLogging": rulesets_RuleLogging,
+        "rulesets_RuleRatelimit": rulesets_RuleRatelimit,
+        "rulesets_Ruleset": rulesets_Ruleset,
+        "rulesets_ScoreRule": rulesets_ScoreRule,
+        "rulesets_ServeErrorRule": rulesets_ServeErrorRule,
+        "rulesets_SetCacheControlDirective": rulesets_SetCacheControlDirective,
+        "rulesets_SetCacheControlDirectiveWithQualifiers": rulesets_SetCacheControlDirectiveWithQualifiers,
+        "rulesets_SetCacheControlDirectiveWithValue": rulesets_SetCacheControlDirectiveWithValue,
+        "rulesets_SetCacheControlRule": rulesets_SetCacheControlRule,
+        "rulesets_SetCacheSettingsAdditionalCacheablePorts": rulesets_SetCacheSettingsAdditionalCacheablePorts,
+        "rulesets_SetCacheSettingsBrowserTTL": rulesets_SetCacheSettingsBrowserTTL,
+        "rulesets_SetCacheSettingsCacheKey": rulesets_SetCacheSettingsCacheKey,
+        "rulesets_SetCacheSettingsCacheReserve": rulesets_SetCacheSettingsCacheReserve,
+        "rulesets_SetCacheSettingsCustomCacheKey": rulesets_SetCacheSettingsCustomCacheKey,
+        "rulesets_SetCacheSettingsCustomCacheKeyCookie": rulesets_SetCacheSettingsCustomCacheKeyCookie,
+        "rulesets_SetCacheSettingsCustomCacheKeyHeader": rulesets_SetCacheSettingsCustomCacheKeyHeader,
+        "rulesets_SetCacheSettingsCustomCacheKeyHost": rulesets_SetCacheSettingsCustomCacheKeyHost,
+        "rulesets_SetCacheSettingsCustomCacheKeyQueryString": rulesets_SetCacheSettingsCustomCacheKeyQueryString,
+        "rulesets_SetCacheSettingsCustomCacheKeyUser": rulesets_SetCacheSettingsCustomCacheKeyUser,
+        "rulesets_SetCacheSettingsEdgeTTL": rulesets_SetCacheSettingsEdgeTTL,
+        "rulesets_SetCacheSettingsOriginRangeRequests": rulesets_SetCacheSettingsOriginRangeRequests,
+        "rulesets_SetCacheSettingsRule": rulesets_SetCacheSettingsRule,
+        "rulesets_SetCacheSettingsServeStale": rulesets_SetCacheSettingsServeStale,
+        "rulesets_SetCacheSettingsSharedDictionary": rulesets_SetCacheSettingsSharedDictionary,
+        "rulesets_SetCacheSettingsStatusCodeTTL": rulesets_SetCacheSettingsStatusCodeTTL,
+        "rulesets_SetCacheSettingsVary": rulesets_SetCacheSettingsVary,
+        "rulesets_SetCacheSettingsVaryDefault": rulesets_SetCacheSettingsVaryDefault,
+        "rulesets_SetCacheSettingsVaryHeader": rulesets_SetCacheSettingsVaryHeader,
+        "rulesets_SetCacheTagsRule": rulesets_SetCacheTagsRule,
+        "rulesets_SetCacheTagsValues": rulesets_SetCacheTagsValues,
+        "rulesets_SetConfigAutominify": rulesets_SetConfigAutominify,
+        "rulesets_SetConfigRule": rulesets_SetConfigRule,
+        "rulesets_SkipPhases": rulesets_SkipPhases,
+        "rulesets_SkipProducts": rulesets_SkipProducts,
+        "rulesets_SkipRule": rulesets_SkipRule,
+        "rulesets_SkipRules": rulesets_SkipRules,
+        "rulesets_SkipRulesets": rulesets_SkipRulesets,
+        "rulesets_TransformResponseHTMLRule": rulesets_TransformResponseHTMLRule,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/rulesets/${pathParam(args, "ruleset_id")}`,
       query: [
-        ["dry_run", args["validate_only"], true],
+        ["dry_run", param(args, "query", "dry_run"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/rum/outputs.ts b/src/generated/forge-mcp/rum/outputs.ts
index 7492f10e0..507286945 100644
--- a/src/generated/forge-mcp/rum/outputs.ts
+++ b/src/generated/forge-mcp/rum/outputs.ts
@@ -6,16 +6,17 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `rum_rule` in responses.
  */
-export const rum_rule_output: JsonSchema = {
+export const rum_rule: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/rum_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "host": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/rum_rule_identifier"
+      "type": "string"
     },
     "inclusive": {
       "type": "boolean"
@@ -36,17 +37,10 @@ export const rum_rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `rum_rule_identifier` in responses.
- */
-export const rum_rule_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rum_rules` in responses.
  */
-export const rum_rules_output: JsonSchema = {
+export const rum_rules: JsonSchema = {
   "items": {
     "$ref": "#/$defs/rum_rule"
   },
@@ -56,42 +50,20 @@ export const rum_rules_output: JsonSchema = {
 /**
  * The schema of `rum_ruleset` in responses.
  */
-export const rum_ruleset_output: JsonSchema = {
+export const rum_ruleset: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/rum_ruleset_identifier"
+      "type": "string"
     },
     "zone_name": {
       "type": "string"
     },
     "zone_tag": {
-      "$ref": "#/$defs/rum_zone_tag"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `rum_ruleset_identifier` in responses.
- */
-export const rum_ruleset_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rum_timestamp` in responses.
- */
-export const rum_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `rum_zone_tag` in responses.
- */
-export const rum_zone_tag_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/rum/rules/outputs.ts b/src/generated/forge-mcp/rum/rules/outputs.ts
index 1a8e64edc..eb3d371bd 100644
--- a/src/generated/forge-mcp/rum/rules/outputs.ts
+++ b/src/generated/forge-mcp/rum/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `rum_rule-id-response-single` in responses.
  */
-export const rum_rule_id_response_single_output: JsonSchema = {
+export const rum_rule$$id$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -16,7 +16,7 @@ export const rum_rule_id_response_single_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/rum_rule_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -30,7 +30,7 @@ export const rum_rule_id_response_single_output: JsonSchema = {
 /**
  * The schema of `rum_rule-response-single` in responses.
  */
-export const rum_rule_response_single_output: JsonSchema = {
+export const rum_rule$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -49,7 +49,7 @@ export const rum_rule_response_single_output: JsonSchema = {
 /**
  * The schema of `rum_rules-response-collection` in responses.
  */
-export const rum_rules_response_collection_output: JsonSchema = {
+export const rum_rules$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
diff --git a/src/generated/forge-mcp/rum/rules/schemas.ts b/src/generated/forge-mcp/rum/rules/schemas.ts
index e8daada45..356ec2652 100644
--- a/src/generated/forge-mcp/rum/rules/schemas.ts
+++ b/src/generated/forge-mcp/rum/rules/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `rum_create-rule-request`.
  */
-export const rum_create_rule_request: JsonSchema = {
+export const rum_create$$rule$$request: JsonSchema = {
   "properties": {
     "host": {
       "type": "string"
@@ -32,12 +32,13 @@ export const rum_create_rule_request: JsonSchema = {
 /**
  * The schema of `rum_modify-rules-request`.
  */
-export const rum_modify_rules_request: JsonSchema = {
+export const rum_modify$$rules$$request: JsonSchema = {
   "properties": {
     "delete_rules": {
       "description": "A list of rule identifiers to delete.",
       "items": {
-        "$ref": "#/$defs/rum_rule_identifier"
+        "description": "The Web Analytics rule identifier.",
+        "type": "string"
       },
       "type": "array"
     },
@@ -49,8 +50,8 @@ export const rum_modify_rules_request: JsonSchema = {
             "type": "string"
           },
           "id": {
-            "$ref": "#/$defs/rum_rule_identifier",
-            "description": "The Web Analytics rule identifier."
+            "description": "The Web Analytics rule identifier.",
+            "type": "string"
           },
           "inclusive": {
             "type": "boolean"
diff --git a/src/generated/forge-mcp/rum/rules/tools.ts b/src/generated/forge-mcp/rum/rules/tools.ts
index 57915fa82..f38163a89 100644
--- a/src/generated/forge-mcp/rum/rules/tools.ts
+++ b/src/generated/forge-mcp/rum/rules/tools.ts
@@ -3,30 +3,20 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  rum_api_response_common_failure_output,
-  rum_api_response_common_output,
-  rum_messages_2_output,
-  rum_messages_output,
+  rum_api$$response$$common,
+  rum_api$$response$$common$$failure,
+  rum_messages,
+  rum_messages$$2,
 } from "../../outputs.js";
-import { rum_identifier } from "../../schemas.js";
+import { rum_rule, rum_rules, rum_ruleset } from "../outputs.js";
 import {
-  rum_rule_identifier_output,
-  rum_rule_output,
-  rum_rules_output,
-  rum_ruleset_identifier_output,
-  rum_ruleset_output,
-  rum_timestamp_output,
-  rum_zone_tag_output,
-} from "../outputs.js";
-import { rum_rule_identifier, rum_ruleset_identifier } from "../schemas.js";
-import {
-  rum_rule_id_response_single_output,
-  rum_rule_response_single_output,
-  rum_rules_response_collection_output,
+  rum_rule$$id$$response$$single,
+  rum_rule$$response$$single,
+  rum_rules$$response$$collection,
 } from "./outputs.js";
 import {
-  rum_create_rule_request,
-  rum_modify_rules_request,
+  rum_create$$rule$$request,
+  rum_modify$$rules$$request,
 } from "./schemas.js";
 
 /**
@@ -34,49 +24,52 @@ import {
  */
 export const tools: readonly Tool[] = [
   {
-    name: "rum_rules_bulk_create",
+    name: "rum_rules_bulkCreate",
     title: "Update Web Analytics rules",
-    description: "Modifies one or more rules in a Web Analytics ruleset with a single request.",
+    description: "Modifies one or more rules in a Web Analytics ruleset with a single request.\n\nPOST /accounts/{account_id}/rum/v2/{ruleset_id}/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/rum_modify-rules-request"
         },
-        "ruleset_id": {
-          "$ref": "#/$defs/rum_ruleset_identifier",
-          "description": "The Web Analytics ruleset identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The Web Analytics ruleset identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ruleset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ruleset_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "rum_identifier": rum_identifier,
-        "rum_modify-rules-request": rum_modify_rules_request,
-        "rum_rule_identifier": rum_rule_identifier,
-        "rum_ruleset_identifier": rum_ruleset_identifier,
+        "rum_modify-rules-request": rum_modify$$rules$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/rum_rules-response-collection",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_messages": rum_messages_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_rules-response-collection": rum_rules_response_collection_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_rules-response-collection": rum_rules$$response$$collection,
+        "rum_ruleset": rum_ruleset,
       },
     },
     annotations: {
@@ -109,18 +102,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_rules-response-collection": rum_rules_response_collection_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_rules-response-collection": rum_rules$$response$$collection,
+        "rum_ruleset": rum_ruleset,
       },
     },
     request: (args) => ({
@@ -131,42 +120,48 @@ export const tools: readonly Tool[] = [
   {
     name: "rum_rules_create",
     title: "Create a Web Analytics rule",
-    description: "Creates a new rule in a Web Analytics ruleset.",
+    description: "Creates a new rule in a Web Analytics ruleset.\n\nPOST /accounts/{account_id}/rum/v2/{ruleset_id}/rule",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/rum_create-rule-request"
         },
-        "ruleset_id": {
-          "$ref": "#/$defs/rum_ruleset_identifier",
-          "description": "The Web Analytics ruleset identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The Web Analytics ruleset identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ruleset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ruleset_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "rum_create-rule-request": rum_create_rule_request,
-        "rum_identifier": rum_identifier,
-        "rum_ruleset_identifier": rum_ruleset_identifier,
+        "rum_create-rule-request": rum_create$$rule$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/rum_rule-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_messages": rum_messages_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule-response-single": rum_rule_response_single_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_timestamp": rum_timestamp_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rule": rum_rule,
+        "rum_rule-response-single": rum_rule$$response$$single,
       },
     },
     annotations: {
@@ -196,14 +191,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule-response-single": rum_rule_response_single_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_timestamp": rum_timestamp_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rule": rum_rule,
+        "rum_rule-response-single": rum_rule$$response$$single,
       },
     },
     request: (args) => ({
@@ -214,41 +207,45 @@ export const tools: readonly Tool[] = [
   {
     name: "rum_rules_delete",
     title: "Delete a Web Analytics rule",
-    description: "Deletes an existing rule from a Web Analytics ruleset.",
+    description: "Deletes an existing rule from a Web Analytics ruleset.\n\nDELETE /accounts/{account_id}/rum/v2/{ruleset_id}/rule/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/rum_rule_identifier",
-          "description": "The Web Analytics rule identifier."
-        },
-        "ruleset_id": {
-          "$ref": "#/$defs/rum_ruleset_identifier",
-          "description": "The Web Analytics ruleset identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The Web Analytics rule identifier.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The Web Analytics ruleset identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ruleset_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ruleset_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-        "rum_rule_identifier": rum_rule_identifier,
-        "rum_ruleset_identifier": rum_ruleset_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_rule-id-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_messages": rum_messages_output,
-        "rum_rule-id-response-single": rum_rule_id_response_single_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rule-id-response-single": rum_rule$$id$$response$$single,
       },
     },
     annotations: {
@@ -278,12 +275,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rule-id-response-single": rum_rule_id_response_single_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rule-id-response-single": rum_rule$$id$$response$$single,
       },
     },
     request: (args) => ({
@@ -293,41 +289,43 @@ export const tools: readonly Tool[] = [
   {
     name: "rum_rules_list",
     title: "List rules in Web Analytics ruleset",
-    description: "Lists all the rules in a Web Analytics ruleset.",
+    description: "Lists all the rules in a Web Analytics ruleset.\n\nGET /accounts/{account_id}/rum/v2/{ruleset_id}/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
-        "ruleset_id": {
-          "$ref": "#/$defs/rum_ruleset_identifier",
-          "description": "The Web Analytics ruleset identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The Web Analytics ruleset identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ruleset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ruleset_id"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-        "rum_ruleset_identifier": rum_ruleset_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_rules-response-collection",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_messages": rum_messages_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_rules-response-collection": rum_rules_response_collection_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_rules-response-collection": rum_rules$$response$$collection,
+        "rum_ruleset": rum_ruleset,
       },
     },
     annotations: {
@@ -357,18 +355,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_rules-response-collection": rum_rules_response_collection_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_rules-response-collection": rum_rules$$response$$collection,
+        "rum_ruleset": rum_ruleset,
       },
     },
     request: (args) => ({
@@ -378,48 +372,53 @@ export const tools: readonly Tool[] = [
   {
     name: "rum_rules_update",
     title: "Update a Web Analytics rule",
-    description: "Updates a rule in a Web Analytics ruleset.",
+    description: "Updates a rule in a Web Analytics ruleset.\n\nPUT /accounts/{account_id}/rum/v2/{ruleset_id}/rule/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/rum_create-rule-request"
         },
-        "rule_id": {
-          "$ref": "#/$defs/rum_rule_identifier",
-          "description": "The Web Analytics rule identifier."
-        },
-        "ruleset_id": {
-          "$ref": "#/$defs/rum_ruleset_identifier",
-          "description": "The Web Analytics ruleset identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "The Web Analytics rule identifier.",
+              "type": "string"
+            },
+            "ruleset_id": {
+              "description": "The Web Analytics ruleset identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "ruleset_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "ruleset_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "rum_create-rule-request": rum_create_rule_request,
-        "rum_identifier": rum_identifier,
-        "rum_rule_identifier": rum_rule_identifier,
-        "rum_ruleset_identifier": rum_ruleset_identifier,
+        "rum_create-rule-request": rum_create$$rule$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/rum_rule-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_messages": rum_messages_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule-response-single": rum_rule_response_single_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_timestamp": rum_timestamp_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rule": rum_rule,
+        "rum_rule-response-single": rum_rule$$response$$single,
       },
     },
     annotations: {
@@ -449,14 +448,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule-response-single": rum_rule_response_single_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_timestamp": rum_timestamp_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rule": rum_rule,
+        "rum_rule-response-single": rum_rule$$response$$single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/rum/schemas.ts b/src/generated/forge-mcp/rum/schemas.ts
deleted file mode 100644
index 9cc7ca574..000000000
--- a/src/generated/forge-mcp/rum/schemas.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `rum_rule_identifier`.
- */
-export const rum_rule_identifier: JsonSchema = {
-  "description": "The Web Analytics rule identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `rum_ruleset_identifier`.
- */
-export const rum_ruleset_identifier: JsonSchema = {
-  "description": "The Web Analytics ruleset identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `rum_zone_tag`.
- */
-export const rum_zone_tag: JsonSchema = {
-  "description": "The zone identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/rum/siteInfo/outputs.ts b/src/generated/forge-mcp/rum/siteInfo/outputs.ts
index f4f0df597..7294876de 100644
--- a/src/generated/forge-mcp/rum/siteInfo/outputs.ts
+++ b/src/generated/forge-mcp/rum/siteInfo/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `rum_auto_install` in responses.
- */
-export const rum_auto_install_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `rum_empty-response` in responses.
  */
-export const rum_empty_response_output: JsonSchema = {
+export const rum_empty$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -32,7 +25,7 @@ export const rum_empty_response_output: JsonSchema = {
 /**
  * The schema of `rum_result_info` in responses.
  */
-export const rum_result_info_output: JsonSchema = {
+export const rum_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -63,13 +56,14 @@ export const rum_result_info_output: JsonSchema = {
 /**
  * The schema of `rum_site` in responses.
  */
-export const rum_site_output: JsonSchema = {
+export const rum_site: JsonSchema = {
   "properties": {
     "auto_install": {
-      "$ref": "#/$defs/rum_auto_install"
+      "type": "boolean"
     },
     "created": {
-      "$ref": "#/$defs/rum_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "rules": {
       "$ref": "#/$defs/rum_rules"
@@ -78,13 +72,13 @@ export const rum_site_output: JsonSchema = {
       "$ref": "#/$defs/rum_ruleset"
     },
     "site_tag": {
-      "$ref": "#/$defs/rum_site_tag"
+      "type": "string"
     },
     "site_token": {
-      "$ref": "#/$defs/rum_site_token"
+      "type": "string"
     },
     "snippet": {
-      "$ref": "#/$defs/rum_snippet"
+      "type": "string"
     }
   },
   "type": "object"
@@ -93,7 +87,7 @@ export const rum_site_output: JsonSchema = {
 /**
  * The schema of `rum_site-response-single` in responses.
  */
-export const rum_site_response_single_output: JsonSchema = {
+export const rum_site$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -112,7 +106,7 @@ export const rum_site_response_single_output: JsonSchema = {
 /**
  * The schema of `rum_site-tag-list-response` in responses.
  */
-export const rum_site_tag_list_response_output: JsonSchema = {
+export const rum_site$$tag$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -121,7 +115,7 @@ export const rum_site_tag_list_response_output: JsonSchema = {
       "properties": {
         "result": {
           "items": {
-            "$ref": "#/$defs/rum_site_tag"
+            "type": "string"
           },
           "type": "array"
         }
@@ -134,7 +128,7 @@ export const rum_site_tag_list_response_output: JsonSchema = {
 /**
  * The schema of `rum_site-tag-response-single` in responses.
  */
-export const rum_site_tag_response_single_output: JsonSchema = {
+export const rum_site$$tag$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -144,7 +138,7 @@ export const rum_site_tag_response_single_output: JsonSchema = {
         "result": {
           "properties": {
             "site_tag": {
-              "$ref": "#/$defs/rum_site_tag"
+              "type": "string"
             }
           },
           "type": "object"
@@ -155,24 +149,10 @@ export const rum_site_tag_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rum_site_tag` in responses.
- */
-export const rum_site_tag_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `rum_site_token` in responses.
- */
-export const rum_site_token_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rum_sites-response-collection` in responses.
  */
-export const rum_sites_response_collection_output: JsonSchema = {
+export const rum_sites$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -194,17 +174,10 @@ export const rum_sites_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `rum_snippet` in responses.
- */
-export const rum_snippet_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rum_zone-tag-list-response` in responses.
  */
-export const rum_zone_tag_list_response_output: JsonSchema = {
+export const rum_zone$$tag$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -213,7 +186,7 @@ export const rum_zone_tag_list_response_output: JsonSchema = {
       "properties": {
         "result": {
           "items": {
-            "$ref": "#/$defs/rum_zone_tag"
+            "type": "string"
           },
           "type": "array"
         }
diff --git a/src/generated/forge-mcp/rum/siteInfo/schemas.ts b/src/generated/forge-mcp/rum/siteInfo/schemas.ts
index 6f94b2d28..992c47563 100644
--- a/src/generated/forge-mcp/rum/siteInfo/schemas.ts
+++ b/src/generated/forge-mcp/rum/siteInfo/schemas.ts
@@ -3,111 +3,51 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `rum_auto_install`.
- */
-export const rum_auto_install: JsonSchema = {
-  "description": "If enabled, the JavaScript snippet is automatically injected for orange-clouded sites.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `rum_create-site-request`.
  */
-export const rum_create_site_request: JsonSchema = {
+export const rum_create$$site$$request: JsonSchema = {
   "properties": {
     "auto_install": {
-      "$ref": "#/$defs/rum_auto_install",
-      "description": "If enabled, the JavaScript snippet is automatically injected for orange-clouded sites."
+      "description": "If enabled, the JavaScript snippet is automatically injected for orange-clouded sites.",
+      "type": "boolean"
     },
     "host": {
-      "$ref": "#/$defs/rum_host",
-      "description": "The hostname to use for gray-clouded sites."
+      "description": "The hostname to use for gray-clouded sites.",
+      "type": "string"
     },
     "zone_tag": {
-      "$ref": "#/$defs/rum_zone_tag",
-      "description": "The zone identifier."
+      "description": "The zone identifier.",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `rum_enabled`.
- */
-export const rum_enabled: JsonSchema = {
-  "description": "Enables or disables RUM. This option can be used only when auto_install is set to true.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `rum_host`.
- */
-export const rum_host: JsonSchema = {
-  "description": "The hostname to use for gray-clouded sites.",
-  "type": "string"
-};
-
-/**
- * The schema of `rum_lite`.
- */
-export const rum_lite: JsonSchema = {
-  "description": "If enabled, the JavaScript snippet will not be injected for visitors from the EU.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `rum_order_by`.
- */
-export const rum_order_by: JsonSchema = {
-  "description": "The property used to sort the list of results.",
-  "enum": [
-    "host",
-    "created"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `rum_page`.
- */
-export const rum_page: JsonSchema = {
-  "description": "Current page within the paginated list of results.",
-  "type": "number"
-};
-
-/**
- * The schema of `rum_per_page`.
- */
-export const rum_per_page: JsonSchema = {
-  "description": "Number of items to return per page of results.",
-  "type": "number"
-};
-
 /**
  * The schema of `rum_update-site-request`.
  */
-export const rum_update_site_request: JsonSchema = {
+export const rum_update$$site$$request: JsonSchema = {
   "properties": {
     "auto_install": {
-      "$ref": "#/$defs/rum_auto_install",
-      "description": "If enabled, the JavaScript snippet is automatically injected for orange-clouded sites."
+      "description": "If enabled, the JavaScript snippet is automatically injected for orange-clouded sites.",
+      "type": "boolean"
     },
     "enabled": {
-      "$ref": "#/$defs/rum_enabled",
-      "description": "Enables or disables RUM. This option can be used only when auto_install is set to true."
+      "description": "Enables or disables RUM. This option can be used only when auto_install is set to true.",
+      "type": "boolean"
     },
     "host": {
-      "$ref": "#/$defs/rum_host",
-      "description": "The hostname to use for gray-clouded sites."
+      "description": "The hostname to use for gray-clouded sites.",
+      "type": "string"
     },
     "lite": {
-      "$ref": "#/$defs/rum_lite",
-      "description": "If enabled, the JavaScript snippet will not be injected for visitors from the EU."
+      "description": "If enabled, the JavaScript snippet will not be injected for visitors from the EU.",
+      "type": "boolean"
     },
     "zone_tag": {
-      "$ref": "#/$defs/rum_zone_tag",
-      "description": "The zone identifier."
+      "description": "The zone identifier.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/rum/siteInfo/tools.ts b/src/generated/forge-mcp/rum/siteInfo/tools.ts
index 19c2ecba4..916314fcc 100644
--- a/src/generated/forge-mcp/rum/siteInfo/tools.ts
+++ b/src/generated/forge-mcp/rum/siteInfo/tools.ts
@@ -1,99 +1,76 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  rum_api_response_common_failure_output,
-  rum_api_response_common_output,
-  rum_messages_2_output,
-  rum_messages_output,
+  rum_api$$response$$common,
+  rum_api$$response$$common$$failure,
+  rum_messages,
+  rum_messages$$2,
 } from "../../outputs.js";
-import { rum_identifier } from "../../schemas.js";
+import { rum_rule, rum_rules, rum_ruleset } from "../outputs.js";
 import {
-  rum_rule_identifier_output,
-  rum_rule_output,
-  rum_rules_output,
-  rum_ruleset_identifier_output,
-  rum_ruleset_output,
-  rum_timestamp_output,
-  rum_zone_tag_output,
-} from "../outputs.js";
-import { rum_zone_tag } from "../schemas.js";
-import {
-  rum_auto_install_output,
-  rum_empty_response_output,
-  rum_result_info_output,
-  rum_site_output,
-  rum_site_response_single_output,
-  rum_site_tag_list_response_output,
-  rum_site_tag_output,
-  rum_site_tag_response_single_output,
-  rum_site_token_output,
-  rum_sites_response_collection_output,
-  rum_snippet_output,
-  rum_zone_tag_list_response_output,
+  rum_empty$$response,
+  rum_result_info,
+  rum_site,
+  rum_site$$response$$single,
+  rum_site$$tag$$list$$response,
+  rum_site$$tag$$response$$single,
+  rum_sites$$response$$collection,
+  rum_zone$$tag$$list$$response,
 } from "./outputs.js";
 import {
-  rum_auto_install,
-  rum_create_site_request,
-  rum_enabled,
-  rum_host,
-  rum_lite,
-  rum_order_by,
-  rum_page,
-  rum_per_page,
-  rum_update_site_request,
+  rum_create$$site$$request,
+  rum_update$$site$$request,
 } from "./schemas.js";
 
 /**
- * The tools of `rum.site_info`.
+ * The tools of `rum.siteInfo`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "rum_site_info_create",
+    name: "rum_siteInfo_create",
     title: "Create a Web Analytics site",
-    description: "Creates a new Web Analytics site.",
+    description: "Creates a new Web Analytics site.\n\nPOST /accounts/{account_id}/rum/site_info",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/rum_create-site-request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "rum_auto_install": rum_auto_install,
-        "rum_create-site-request": rum_create_site_request,
-        "rum_host": rum_host,
-        "rum_identifier": rum_identifier,
-        "rum_zone_tag": rum_zone_tag,
+        "rum_create-site-request": rum_create$$site$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/rum_site-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_auto_install": rum_auto_install_output,
-        "rum_messages": rum_messages_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_site": rum_site_output,
-        "rum_site-response-single": rum_site_response_single_output,
-        "rum_site_tag": rum_site_tag_output,
-        "rum_site_token": rum_site_token_output,
-        "rum_snippet": rum_snippet_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_ruleset": rum_ruleset,
+        "rum_site": rum_site,
+        "rum_site-response-single": rum_site$$response$$single,
       },
     },
     annotations: {
@@ -126,23 +103,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_auto_install": rum_auto_install_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_site": rum_site_output,
-        "rum_site-response-single": rum_site_response_single_output,
-        "rum_site_tag": rum_site_tag_output,
-        "rum_site_token": rum_site_token_output,
-        "rum_snippet": rum_snippet_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_ruleset": rum_ruleset,
+        "rum_site": rum_site,
+        "rum_site-response-single": rum_site$$response$$single,
       },
     },
     request: (args) => ({
@@ -151,36 +120,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "rum_site_info_delete",
+    name: "rum_siteInfo_delete",
     title: "Delete a Web Analytics site",
-    description: "Deletes an existing Web Analytics site.",
+    description: "Deletes an existing Web Analytics site.\n\nDELETE /accounts/{account_id}/rum/site_info/{site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
-        "site_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_site-tag-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_messages": rum_messages_output,
-        "rum_site-tag-response-single": rum_site_tag_response_single_output,
-        "rum_site_tag": rum_site_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_site-tag-response-single": rum_site$$tag$$response$$single,
       },
     },
     annotations: {
@@ -213,12 +188,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_site-tag-response-single": rum_site_tag_response_single_output,
-        "rum_site_tag": rum_site_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_site-tag-response-single": rum_site$$tag$$response$$single,
       },
     },
     request: (args) => ({
@@ -226,47 +200,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "rum_site_info_get",
+    name: "rum_siteInfo_get",
     title: "Get a Web Analytics site",
-    description: "Retrieves a Web Analytics site.",
+    description: "Retrieves a Web Analytics site.\n\nGET /accounts/{account_id}/rum/site_info/{site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
-        "site_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_site-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_auto_install": rum_auto_install_output,
-        "rum_messages": rum_messages_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_site": rum_site_output,
-        "rum_site-response-single": rum_site_response_single_output,
-        "rum_site_tag": rum_site_tag_output,
-        "rum_site_token": rum_site_token_output,
-        "rum_snippet": rum_snippet_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_ruleset": rum_ruleset,
+        "rum_site": rum_site,
+        "rum_site-response-single": rum_site$$response$$single,
       },
     },
     annotations: {
@@ -299,23 +272,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_auto_install": rum_auto_install_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_site": rum_site_output,
-        "rum_site-response-single": rum_site_response_single_output,
-        "rum_site_tag": rum_site_tag_output,
-        "rum_site_token": rum_site_token_output,
-        "rum_snippet": rum_snippet_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_ruleset": rum_ruleset,
+        "rum_site": rum_site,
+        "rum_site-response-single": rum_site$$response$$single,
       },
     },
     request: (args) => ({
@@ -323,58 +288,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "rum_site_info_list",
+    name: "rum_siteInfo_list",
     title: "List Web Analytics sites",
-    description: "Lists all Web Analytics sites of an account.",
+    description: "Lists all Web Analytics sites of an account.\n\nGET /accounts/{account_id}/rum/site_info/list",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
-        "order_by": {
-          "$ref": "#/$defs/rum_order_by",
-          "description": "The property used to sort the list of results."
-        },
-        "page": {
-          "$ref": "#/$defs/rum_page",
-          "description": "Current page within the paginated list of results."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "$ref": "#/$defs/rum_per_page",
-          "description": "Number of items to return per page of results."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "order_by": {
+              "description": "The property used to sort the list of results.",
+              "enum": [
+                "host",
+                "created"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Current page within the paginated list of results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of items to return per page of results.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-        "rum_order_by": rum_order_by,
-        "rum_page": rum_page,
-        "rum_per_page": rum_per_page,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_sites-response-collection",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_auto_install": rum_auto_install_output,
-        "rum_messages": rum_messages_output,
-        "rum_result_info": rum_result_info_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_site": rum_site_output,
-        "rum_site_tag": rum_site_tag_output,
-        "rum_site_token": rum_site_token_output,
-        "rum_sites-response-collection": rum_sites_response_collection_output,
-        "rum_snippet": rum_snippet_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_result_info": rum_result_info,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_ruleset": rum_ruleset,
+        "rum_site": rum_site,
+        "rum_sites-response-collection": rum_sites$$response$$collection,
       },
     },
     annotations: {
@@ -407,65 +378,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_auto_install": rum_auto_install_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_result_info": rum_result_info_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_site": rum_site_output,
-        "rum_site_tag": rum_site_tag_output,
-        "rum_site_token": rum_site_token_output,
-        "rum_sites-response-collection": rum_sites_response_collection_output,
-        "rum_snippet": rum_snippet_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_result_info": rum_result_info,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_ruleset": rum_ruleset,
+        "rum_site": rum_site,
+        "rum_sites-response-collection": rum_sites$$response$$collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/rum/site_info/list`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
-        ["order_by", args["order_by"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
+        ["order_by", param(args, "query", "order_by"), true],
       ],
     }),
   },
   {
-    name: "rum_site_info_list_site_tags",
+    name: "rum_siteInfo_listSiteTags",
     title: "List Web Analytics site tags",
-    description: "Returns all site tags for an account as an array of site tag strings. This endpoint returns all results without pagination.",
+    description: "Returns all site tags for an account as an array of site tag strings. This endpoint returns all results without pagination.\n\nGET /accounts/{account_id}/rum/site_info/site_tag/list",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "all": {
-          "description": "When true, includes sites that are disabled or paused.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "all": {
+              "description": "When true, includes sites that are disabled or paused.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_site-tag-list-response",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_messages": rum_messages_output,
-        "rum_site-tag-list-response": rum_site_tag_list_response_output,
-        "rum_site_tag": rum_site_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_site-tag-list-response": rum_site$$tag$$list$$response,
       },
     },
     annotations: {
@@ -498,47 +473,52 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_site-tag-list-response": rum_site_tag_list_response_output,
-        "rum_site_tag": rum_site_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_site-tag-list-response": rum_site$$tag$$list$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/rum/site_info/site_tag/list`,
       query: [
-        ["all", args["all"], true],
+        ["all", param(args, "query", "all"), true],
       ],
     }),
   },
   {
-    name: "rum_site_info_list_zone_tags",
+    name: "rum_siteInfo_listZoneTags",
     title: "List Web Analytics zone tags",
-    description: "Returns all zone tags associated with Web Analytics sites for an account. These can be used to filter or exclude zones in the zone selection input. This endpoint returns all results without pagination.",
+    description: "Returns all zone tags associated with Web Analytics sites for an account. These can be used to filter or exclude zones in the zone selection input. This endpoint returns all results without pagination.\n\nGET /accounts/{account_id}/rum/site_info/zone_tag/list",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_zone-tag-list-response",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_messages": rum_messages_output,
-        "rum_zone-tag-list-response": rum_zone_tag_list_response_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_zone-tag-list-response": rum_zone$$tag$$list$$response,
       },
     },
     annotations: {
@@ -571,12 +551,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_zone-tag-list-response": rum_zone_tag_list_response_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_zone-tag-list-response": rum_zone$$tag$$list$$response,
       },
     },
     request: (args) => ({
@@ -584,57 +563,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "rum_site_info_update",
+    name: "rum_siteInfo_update",
     title: "Update a Web Analytics site",
-    description: "Updates an existing Web Analytics site.",
+    description: "Updates an existing Web Analytics site.\n\nPUT /accounts/{account_id}/rum/site_info/{site_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/rum_update-site-request"
         },
-        "site_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "site_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "site_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "site_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "rum_auto_install": rum_auto_install,
-        "rum_enabled": rum_enabled,
-        "rum_host": rum_host,
-        "rum_identifier": rum_identifier,
-        "rum_lite": rum_lite,
-        "rum_update-site-request": rum_update_site_request,
-        "rum_zone_tag": rum_zone_tag,
+        "rum_update-site-request": rum_update$$site$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/rum_site-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_auto_install": rum_auto_install_output,
-        "rum_messages": rum_messages_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_site": rum_site_output,
-        "rum_site-response-single": rum_site_response_single_output,
-        "rum_site_tag": rum_site_tag_output,
-        "rum_site_token": rum_site_token_output,
-        "rum_snippet": rum_snippet_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_ruleset": rum_ruleset,
+        "rum_site": rum_site,
+        "rum_site-response-single": rum_site$$response$$single,
       },
     },
     annotations: {
@@ -667,23 +642,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_auto_install": rum_auto_install_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rule": rum_rule_output,
-        "rum_rule_identifier": rum_rule_identifier_output,
-        "rum_rules": rum_rules_output,
-        "rum_ruleset": rum_ruleset_output,
-        "rum_ruleset_identifier": rum_ruleset_identifier_output,
-        "rum_site": rum_site_output,
-        "rum_site-response-single": rum_site_response_single_output,
-        "rum_site_tag": rum_site_tag_output,
-        "rum_site_token": rum_site_token_output,
-        "rum_snippet": rum_snippet_output,
-        "rum_timestamp": rum_timestamp_output,
-        "rum_zone_tag": rum_zone_tag_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rule": rum_rule,
+        "rum_rules": rum_rules,
+        "rum_ruleset": rum_ruleset,
+        "rum_site": rum_site,
+        "rum_site-response-single": rum_site$$response$$single,
       },
     },
     request: (args) => ({
@@ -692,35 +659,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "rum_site_info_validate_hostname",
+    name: "rum_siteInfo_validateHostname",
     title: "Validate a Web Analytics site hostname",
-    description: "Validates that the provided hostname is well-formed, does not contain wildcards, and has a valid TLD. Returns an empty result on success.",
+    description: "Validates that the provided hostname is well-formed, does not contain wildcards, and has a valid TLD. Returns an empty result on success.\n\nGET /accounts/{account_id}/rum/site_info/validate/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
-        },
-        "hostname": {
-          "description": "The hostname to validate (e.g. example.com). The `pattern` below validates the hostname's structure (label syntax) only. In addition, the hostname must end in a valid public suffix (TLD). For the list of valid suffixes and how it is used, see the Public Suffix List: https://wiki.mozilla.org/Public_Suffix_List/Use_Cases\n",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "hostname": {
+              "description": "The hostname to validate (e.g. example.com). The `pattern` below validates the hostname's structure (label syntax) only. In addition, the hostname must end in a valid public suffix (TLD). For the list of valid suffixes and how it is used, see the Public Suffix List: https://wiki.mozilla.org/Public_Suffix_List/Use_Cases",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "hostname"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_empty-response",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_empty-response": rum_empty_response_output,
-        "rum_messages": rum_messages_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_empty-response": rum_empty$$response,
+        "rum_messages": rum_messages,
       },
     },
     annotations: {
@@ -753,11 +727,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_empty-response": rum_empty_response_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_empty-response": rum_empty$$response,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/schemas.ts b/src/generated/forge-mcp/schemas.ts
index 738a13ef7..815ae140e 100644
--- a/src/generated/forge-mcp/schemas.ts
+++ b/src/generated/forge-mcp/schemas.ts
@@ -3,21 +3,13 @@
 
 import type { JsonSchema } from "./_/tool.js";
 
-/**
- * The schema of `aaa_identifier`.
- */
-export const aaa_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
 /**
  * The schema of `analytics-sql_SqlQueryAccountScope`.
  */
-export const analytics_sql_SqlQueryAccountScope: JsonSchema = {
+export const analytics$$sql_SqlQueryAccountScope: JsonSchema = {
   "properties": {
     "accountTag": {
-      "description": "Account tag used to authorize and scope the query. Must be a 32-character lowercase hex string.\n",
+      "description": "Account tag used to authorize and scope the query. Must be a 32-character lowercase hex string.",
       "type": "string"
     }
   },
@@ -30,10 +22,10 @@ export const analytics_sql_SqlQueryAccountScope: JsonSchema = {
 /**
  * The schema of `analytics-sql_SqlQueryRequest`.
  */
-export const analytics_sql_SqlQueryRequest: JsonSchema = {
+export const analytics$$sql_SqlQueryRequest: JsonSchema = {
   "properties": {
     "params": {
-      "description": "Positional array values for `$1`, `$2`, and similar placeholders, or named object values for placeholders such as `$status`.\n",
+      "description": "Positional array values for `$1`, `$2`, and similar placeholders, or named object values for placeholders such as `$status`.",
       "oneOf": [
         {
           "items": {
@@ -60,12 +52,12 @@ export const analytics_sql_SqlQueryRequest: JsonSchema = {
       ]
     },
     "query": {
-      "description": "SQL query to execute. A trailing FORMAT selects JSON, JSONEachRow, TabSeparated, or TSV output on any dataset.\n",
+      "description": "SQL query to execute. A trailing FORMAT selects JSON, JSONEachRow, TabSeparated, or TSV output on any dataset.",
       "type": "string"
     },
     "scope": {
       "$ref": "#/$defs/analytics-sql_SqlQueryScope",
-      "description": "Account or zone scope applied to the query. Include exactly one scope tag. Do not include account or zone tenancy predicates in the SQL query when this field is present.\n"
+      "description": "Account or zone scope applied to the query. Include exactly one scope tag. Do not include account or zone tenancy predicates in the SQL query when this field is present."
     },
     "time_range": {
       "$ref": "#/$defs/analytics-sql_SqlQueryTimeRange"
@@ -80,8 +72,8 @@ export const analytics_sql_SqlQueryRequest: JsonSchema = {
 /**
  * The schema of `analytics-sql_SqlQueryScope`.
  */
-export const analytics_sql_SqlQueryScope: JsonSchema = {
-  "description": "Account or zone scope applied to the query. Include exactly one scope tag. Do not include account or zone tenancy predicates in the SQL query when this field is present.\n",
+export const analytics$$sql_SqlQueryScope: JsonSchema = {
+  "description": "Account or zone scope applied to the query. Include exactly one scope tag. Do not include account or zone tenancy predicates in the SQL query when this field is present.",
   "oneOf": [
     {
       "$ref": "#/$defs/analytics-sql_SqlQueryAccountScope"
@@ -95,8 +87,8 @@ export const analytics_sql_SqlQueryScope: JsonSchema = {
 /**
  * The schema of `analytics-sql_SqlQueryTimeRange`.
  */
-export const analytics_sql_SqlQueryTimeRange: JsonSchema = {
-  "description": "Time bounds applied to the dataset's timestamp column. Do not include timestamp predicates in the SQL query when this field is present.\n",
+export const analytics$$sql_SqlQueryTimeRange: JsonSchema = {
+  "description": "Time bounds applied to the dataset's timestamp column. Do not include timestamp predicates in the SQL query when this field is present.",
   "properties": {
     "end": {
       "description": "Inclusive upper bound for the dataset's timestamp column.",
@@ -116,10 +108,10 @@ export const analytics_sql_SqlQueryTimeRange: JsonSchema = {
 /**
  * The schema of `analytics-sql_SqlQueryZoneScope`.
  */
-export const analytics_sql_SqlQueryZoneScope: JsonSchema = {
+export const analytics$$sql_SqlQueryZoneScope: JsonSchema = {
   "properties": {
     "zoneTag": {
-      "description": "Zone tag used to authorize and scope the query. Must be a 32-character lowercase hex string.\n",
+      "description": "Zone tag used to authorize and scope the query. Must be a 32-character lowercase hex string.",
       "type": "string"
     }
   },
@@ -132,19 +124,30 @@ export const analytics_sql_SqlQueryZoneScope: JsonSchema = {
 /**
  * The schema of `api-shield_basic_operation`.
  */
-export const api_shield_basic_operation: JsonSchema = {
+export const api$$shield_basic_operation: JsonSchema = {
   "properties": {
     "endpoint": {
-      "$ref": "#/$defs/api-shield_endpoint",
-      "description": "The endpoint which can contain path parameter templates in curly braces, each will be replaced from left to right with {varN}, starting with {var1}, during insertion. This will further be Cloudflare-normalized upon insertion. See: https://developers.cloudflare.com/rules/normalization/how-it-works/."
+      "description": "The endpoint which can contain path parameter templates in curly braces, each will be replaced from left to right with {varN}, starting with {var1}, during insertion. This will further be Cloudflare-normalized upon insertion. See: https://developers.cloudflare.com/rules/normalization/how-it-works/.",
+      "type": "string"
     },
     "host": {
-      "$ref": "#/$defs/api-shield_host",
-      "description": "RFC3986-compliant host."
+      "description": "RFC3986-compliant host.",
+      "type": "string"
     },
     "method": {
-      "$ref": "#/$defs/api-shield_method",
-      "description": "The HTTP method used to access the endpoint."
+      "description": "The HTTP method used to access the endpoint.",
+      "enum": [
+        "GET",
+        "POST",
+        "HEAD",
+        "OPTIONS",
+        "PUT",
+        "DELETE",
+        "CONNECT",
+        "PATCH",
+        "TRACE"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -155,89 +158,10 @@ export const api_shield_basic_operation: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_endpoint`.
- */
-export const api_shield_endpoint: JsonSchema = {
-  "description": "The endpoint which can contain path parameter templates in curly braces, each will be replaced from left to right with {varN}, starting with {var1}, during insertion. This will further be Cloudflare-normalized upon insertion. See: https://developers.cloudflare.com/rules/normalization/how-it-works/.",
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_host`.
- */
-export const api_shield_host: JsonSchema = {
-  "description": "RFC3986-compliant host.",
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_identifier`.
- */
-export const api_shield_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_identifier-2`.
- */
-export const api_shield_identifier_2: JsonSchema = {
-  "allOf": [
-    {
-      "$ref": "#/$defs/api-shield_identifier"
-    },
-    {
-      "type": "string"
-    }
-  ]
-};
-
-/**
- * The schema of `api-shield_method`.
- */
-export const api_shield_method: JsonSchema = {
-  "description": "The HTTP method used to access the endpoint.",
-  "enum": [
-    "GET",
-    "POST",
-    "HEAD",
-    "OPTIONS",
-    "PUT",
-    "DELETE",
-    "CONNECT",
-    "PATCH",
-    "TRACE"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_uuid`.
- */
-export const api_shield_uuid: JsonSchema = {
-  "description": "UUID.",
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_uuid-2`.
- */
-export const api_shield_uuid_2: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/api-shield_uuid"
-    }
-  ]
-};
-
 /**
  * The schema of `bill-subs-api_component_value`.
  */
-export const bill_subs_api_component_value: JsonSchema = {
+export const bill$$subs$$api_component_value: JsonSchema = {
   "description": "A component value for a subscription.",
   "properties": {
     "default": {
@@ -276,7 +200,7 @@ export const bill_subs_api_component_value: JsonSchema = {
 /**
  * The schema of `bill-subs-api_component_values`.
  */
-export const bill_subs_api_component_values: JsonSchema = {
+export const bill$$subs$$api_component_values: JsonSchema = {
   "description": "Configurable component values for the subscription.",
   "items": {
     "$ref": "#/$defs/bill-subs-api_component_value"
@@ -284,41 +208,10 @@ export const bill_subs_api_component_values: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `bill-subs-api_frequency`.
- */
-export const bill_subs_api_frequency: JsonSchema = {
-  "description": "How often the subscription is renewed automatically.",
-  "enum": [
-    "weekly",
-    "monthly",
-    "quarterly",
-    "yearly"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_identifier`.
- */
-export const bill_subs_api_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_install_id`.
- */
-export const bill_subs_api_install_id: JsonSchema = {
-  "deprecated": true,
-  "description": "app install id.",
-  "type": "string"
-};
-
 /**
  * The schema of `bill-subs-api_rate_plan`.
  */
-export const bill_subs_api_rate_plan: JsonSchema = {
+export const bill$$subs$$api_rate_plan: JsonSchema = {
   "description": "The rate plan applied to the subscription.",
   "properties": {
     "currency": {
@@ -356,26 +249,19 @@ export const bill_subs_api_rate_plan: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `bill-subs-api_schemas-identifier`.
- */
-export const bill_subs_api_schemas_identifier: JsonSchema = {
-  "description": "Subscription identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `bill-subs-api_subscription-v2`.
  */
-export const bill_subs_api_subscription_v2: JsonSchema = {
+export const bill$$subs$$api_subscription$$v2: JsonSchema = {
   "properties": {
     "app": {
       "deprecated": true,
       "description": "Cloudflare Apps Marketplace is sunset. This field is retained for legacy grandfathered app subscriptions only.",
       "properties": {
         "install_id": {
-          "$ref": "#/$defs/bill-subs-api_install_id",
-          "description": "app install id."
+          "deprecated": true,
+          "description": "app install id.",
+          "type": "string"
         }
       },
       "type": "object"
@@ -385,8 +271,14 @@ export const bill_subs_api_subscription_v2: JsonSchema = {
       "description": "Configurable component values for the subscription."
     },
     "frequency": {
-      "$ref": "#/$defs/bill-subs-api_frequency",
-      "description": "How often the subscription is renewed automatically."
+      "description": "How often the subscription is renewed automatically.",
+      "enum": [
+        "weekly",
+        "monthly",
+        "quarterly",
+        "yearly"
+      ],
+      "type": "string"
     },
     "rate_plan": {
       "$ref": "#/$defs/bill-subs-api_rate_plan",
@@ -402,27 +294,19 @@ export const bill_subs_api_subscription_v2: JsonSchema = {
 /**
  * The schema of `bill-subs-api_zone`.
  */
-export const bill_subs_api_zone: JsonSchema = {
+export const bill$$subs$$api_zone: JsonSchema = {
   "description": "A simple zone object. May have null properties if not a zone subscription.",
   "type": "object"
 };
 
-/**
- * The schema of `billable-usage-api_identifier`.
- */
-export const billable_usage_api_identifier: JsonSchema = {
-  "description": "Represents a Cloudflare resource identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `builds_BuildSeedRepoInput`.
  */
 export const builds_BuildSeedRepoInput: JsonSchema = {
   "properties": {
     "branch": {
-      "$ref": "#/$defs/builds_branch",
-      "description": "Repository branch to seed."
+      "description": "Repository branch to seed.",
+      "type": "string"
     },
     "files": {
       "description": "Files to add or replace for this build. Maximum 2.",
@@ -495,12 +379,12 @@ export const builds_BuildSeedRepoInputFile: JsonSchema = {
 export const builds_CreateBuildRequest: JsonSchema = {
   "properties": {
     "branch": {
-      "$ref": "#/$defs/builds_branch",
-      "description": "Git branch name (required if commit_hash not provided)"
+      "description": "Git branch name (required if commit_hash not provided)",
+      "type": "string"
     },
     "commit_hash": {
-      "$ref": "#/$defs/builds_commit_hash",
-      "description": "Git commit hash (required if branch not provided)"
+      "description": "Git commit hash (required if branch not provided)",
+      "type": "string"
     },
     "seed_repo": {
       "$ref": "#/$defs/builds_BuildSeedRepoInput",
@@ -510,20 +394,6 @@ export const builds_CreateBuildRequest: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `builds_SCMProviderType`.
- */
-export const builds_SCMProviderType: JsonSchema = {
-  "description": "Source control provider.",
-  "enum": [
-    "github",
-    "gitlab",
-    "gitlab_internal",
-    "origin"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `builds_UpdateWorkerBuildSettingsInput`.
  */
@@ -531,21 +401,22 @@ export const builds_UpdateWorkerBuildSettingsInput: JsonSchema = {
   "description": "Partial build settings for updating a Worker build configuration",
   "properties": {
     "build_caching_enabled": {
-      "$ref": "#/$defs/builds_build_caching_enabled",
       "default": false,
-      "description": "Whether builds reuse cached dependencies and build artifacts."
+      "description": "Whether builds reuse cached dependencies and build artifacts.",
+      "type": "boolean"
     },
     "build_command": {
-      "$ref": "#/$defs/builds_build_command",
-      "description": "Command to build the Worker."
+      "description": "Command to build the Worker.",
+      "type": "string"
     },
     "build_token_uuid": {
-      "$ref": "#/$defs/builds_build_token_uuid",
-      "description": "UUID of the build token used when deploying the Worker."
+      "description": "UUID of the build token used when deploying the Worker.",
+      "format": "uuid",
+      "type": "string"
     },
     "deploy_command": {
-      "$ref": "#/$defs/builds_deploy_command",
-      "description": "Command to deploy the Worker."
+      "description": "Command to deploy the Worker.",
+      "type": "string"
     },
     "environment_variables": {
       "additionalProperties": {
@@ -553,8 +424,8 @@ export const builds_UpdateWorkerBuildSettingsInput: JsonSchema = {
           {
             "properties": {
               "is_secret": {
-                "$ref": "#/$defs/builds_is_secret",
-                "description": "Whether to hide the value after it is saved. Secret values remain available to builds but appear as `null` when you list variables; non-secret values remain visible."
+                "description": "Whether to hide the value after it is saved. Secret values remain available to builds but appear as `null` when you list variables; non-secret values remain visible.",
+                "type": "boolean"
               },
               "value": {
                 "description": "Value made available to the build. Maximum length is 5000 characters.",
@@ -587,29 +458,13 @@ export const builds_UpdateWorkerBuildSettingsInput: JsonSchema = {
       "description": "Path patterns that can start builds."
     },
     "root_directory": {
-      "$ref": "#/$defs/builds_root_directory",
-      "description": "Repository directory in which build and deploy commands run."
+      "description": "Repository directory in which build and deploy commands run.",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `builds_account_id`.
- */
-export const builds_account_id: JsonSchema = {
-  "description": "Account identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_branch`.
- */
-export const builds_branch: JsonSchema = {
-  "description": "Git branch name.",
-  "type": "string"
-};
-
 /**
  * The schema of `builds_branch_excludes`.
  */
@@ -632,87 +487,6 @@ export const builds_branch_includes: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `builds_build_caching_enabled`.
- */
-export const builds_build_caching_enabled: JsonSchema = {
-  "description": "Whether builds reuse cached dependencies and build artifacts.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `builds_build_command`.
- */
-export const builds_build_command: JsonSchema = {
-  "description": "Command to build the Worker.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_build_token_name`.
- */
-export const builds_build_token_name: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `builds_build_token_uuid`.
- */
-export const builds_build_token_uuid: JsonSchema = {
-  "description": "UUID of the build token used when deploying the Worker.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_build_uuid`.
- */
-export const builds_build_uuid: JsonSchema = {
-  "description": "Build UUID.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_commit_hash`.
- */
-export const builds_commit_hash: JsonSchema = {
-  "description": "Git commit hash",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_deploy_command`.
- */
-export const builds_deploy_command: JsonSchema = {
-  "description": "Command to deploy the Worker.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_deploy_hook_name`.
- */
-export const builds_deploy_hook_name: JsonSchema = {
-  "description": "Deploy hook name (1-58 characters).",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_external_script_id`.
- */
-export const builds_external_script_id: JsonSchema = {
-  "description": "System-generated tag of the Worker. This is not the Worker name.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_is_secret`.
- */
-export const builds_is_secret: JsonSchema = {
-  "description": "Whether to hide the value after it is saved. Secret values remain available to builds but appear as `null` when you list variables; non-secret values remain visible.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `builds_path_excludes`.
  */
@@ -735,94 +509,20 @@ export const builds_path_includes: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `builds_provider_account_id`.
- */
-export const builds_provider_account_id: JsonSchema = {
-  "description": "Provider-specific identifier of the account or namespace that owns the repository.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_provider_account_name`.
- */
-export const builds_provider_account_name: JsonSchema = {
-  "description": "Human-readable name of the account or namespace that owns the repository.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_repo_connection_uuid`.
- */
-export const builds_repo_connection_uuid: JsonSchema = {
-  "description": "Repository connection UUID.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_repo_id`.
- */
-export const builds_repo_id: JsonSchema = {
-  "description": "Provider-specific repository identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_repo_name`.
- */
-export const builds_repo_name: JsonSchema = {
-  "description": "Human-readable repository name.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_root_directory`.
- */
-export const builds_root_directory: JsonSchema = {
-  "description": "Repository directory in which build and deploy commands run.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_trigger_name`.
- */
-export const builds_trigger_name: JsonSchema = {
-  "description": "Human-readable name of the build trigger.",
-  "type": "string"
-};
-
-/**
- * The schema of `builds_trigger_uuid`.
- */
-export const builds_trigger_uuid: JsonSchema = {
-  "description": "Trigger UUID.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `cache-settings_identifier`.
- */
-export const cache_settings_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `dns-custom-nameservers_CustomNSInput`.
  */
-export const dns_custom_nameservers_CustomNSInput: JsonSchema = {
+export const dns$$custom$$nameservers_CustomNSInput: JsonSchema = {
   "description": "Custom NS Input",
   "properties": {
     "ns_name": {
-      "$ref": "#/$defs/dns-custom-nameservers_ns_name",
-      "description": "The FQDN of the name server."
+      "description": "The FQDN of the name server.",
+      "type": "string"
     },
     "ns_set": {
-      "$ref": "#/$defs/dns-custom-nameservers_ns_set",
       "default": 1,
-      "description": "The number of the set that this name server belongs to."
+      "description": "The number of the set that this name server belongs to.",
+      "type": "number"
     }
   },
   "required": [
@@ -831,30 +531,6 @@ export const dns_custom_nameservers_CustomNSInput: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dns-custom-nameservers_ns_name`.
- */
-export const dns_custom_nameservers_ns_name: JsonSchema = {
-  "description": "The FQDN of the name server.",
-  "type": "string"
-};
-
-/**
- * The schema of `dns-custom-nameservers_ns_set`.
- */
-export const dns_custom_nameservers_ns_set: JsonSchema = {
-  "description": "The number of the set that this name server belongs to.",
-  "type": "number"
-};
-
-/**
- * The schema of `email_identifier`.
- */
-export const email_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_asn_configuration`.
  */
@@ -984,14 +660,6 @@ export const firewall_ipv6_configuration: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `firewall_notes`.
- */
-export const firewall_notes: JsonSchema = {
-  "description": "An informative summary of the rule, typically used as a reminder or explanation.",
-  "type": "string"
-};
-
 /**
  * The schema of `firewall_rule`.
  */
@@ -1002,11 +670,19 @@ export const firewall_rule: JsonSchema = {
       "description": "The rule configuration."
     },
     "mode": {
-      "$ref": "#/$defs/firewall_schemas-mode"
+      "description": "The action to apply to a matched request.",
+      "enum": [
+        "block",
+        "challenge",
+        "whitelist",
+        "js_challenge",
+        "managed_challenge"
+      ],
+      "type": "string"
     },
     "notes": {
-      "$ref": "#/$defs/firewall_notes",
-      "description": "An informative summary of the rule, typically used as a reminder or explanation."
+      "description": "An informative summary of the rule, typically used as a reminder or explanation.",
+      "type": "string"
     }
   },
   "required": [
@@ -1016,60 +692,6 @@ export const firewall_rule: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `firewall_rule_identifier`.
- */
-export const firewall_rule_identifier: JsonSchema = {
-  "description": "Unique identifier for a rule.",
-  "type": "string"
-};
-
-/**
- * The schema of `firewall_schemas-mode`.
- */
-export const firewall_schemas_mode: JsonSchema = {
-  "description": "The action to apply to a matched request.",
-  "enum": [
-    "block",
-    "challenge",
-    "whitelist",
-    "js_challenge",
-    "managed_challenge"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_access`.
- */
-export const iam_access: JsonSchema = {
-  "description": "Allow or deny operations against the resources.",
-  "enum": [
-    "allow",
-    "deny"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_account-type`.
- */
-export const iam_account_type: JsonSchema = {
-  "enum": [
-    "standard",
-    "enterprise"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_account_identifier`.
- */
-export const iam_account_identifier: JsonSchema = {
-  "$ref": "#/$defs/iam_common_components-schemas-identifier",
-  "description": "Account identifier tag."
-};
-
 /**
  * The schema of `iam_cidr_list`.
  */
@@ -1081,14 +703,6 @@ export const iam_cidr_list: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `iam_common_components-schemas-identifier`.
- */
-export const iam_common_components_schemas_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_condition`.
  */
@@ -1111,16 +725,18 @@ export const iam_create_payload: JsonSchema = {
       "$ref": "#/$defs/iam_condition"
     },
     "expires_on": {
-      "$ref": "#/$defs/iam_expires_on",
-      "description": "The expiration time on or after which the JWT MUST NOT be accepted for processing."
+      "description": "The expiration time on or after which the JWT MUST NOT be accepted for processing.",
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/iam_name",
-      "description": "Token name."
+      "description": "Token name.",
+      "type": "string"
     },
     "not_before": {
-      "$ref": "#/$defs/iam_not_before",
-      "description": "The time before which the token MUST NOT be accepted for processing."
+      "description": "The time before which the token MUST NOT be accepted for processing.",
+      "format": "date-time",
+      "type": "string"
     },
     "policies": {
       "$ref": "#/$defs/iam_token_policies",
@@ -1134,50 +750,6 @@ export const iam_create_payload: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_effect`.
- */
-export const iam_effect: JsonSchema = {
-  "description": "Allow or deny operations against the resources.",
-  "enum": [
-    "allow",
-    "deny"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_email`.
- */
-export const iam_email: JsonSchema = {
-  "description": "The contact email address of the user.",
-  "type": "string"
-};
-
-/**
- * The schema of `iam_expires_on`.
- */
-export const iam_expires_on: JsonSchema = {
-  "description": "The expiration time on or after which the JWT MUST NOT be accepted for processing.",
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `iam_first_name`.
- */
-export const iam_first_name: JsonSchema = {
-  "description": "User's first name",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `iam_grants`.
  */
@@ -1194,47 +766,7 @@ export const iam_grants: JsonSchema = {
 };
 
 /**
- * The schema of `iam_last_name`.
- */
-export const iam_last_name: JsonSchema = {
-  "description": "User's last name",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `iam_membership_components-schemas-identifier`.
- */
-export const iam_membership_components_schemas_identifier: JsonSchema = {
-  "description": "Membership identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `iam_name`.
- */
-export const iam_name: JsonSchema = {
-  "description": "Token name.",
-  "type": "string"
-};
-
-/**
- * The schema of `iam_not_before`.
- */
-export const iam_not_before: JsonSchema = {
-  "description": "The time before which the token MUST NOT be accepted for processing.",
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `iam_permission_group`.
+ * The schema of `iam_permission_group`.
  */
 export const iam_permission_group: JsonSchema = {
   "description": "A named group of permissions that map to a group of operations against resources.",
@@ -1352,8 +884,12 @@ export const iam_policy_with_permission_groups_and_resources: JsonSchema = {
   "description": "Policy with Permission Groups and Resources",
   "properties": {
     "effect": {
-      "$ref": "#/$defs/iam_effect",
-      "description": "Allow or deny operations against the resources."
+      "description": "Allow or deny operations against the resources.",
+      "enum": [
+        "allow",
+        "deny"
+      ],
+      "type": "string"
     },
     "permission_groups": {
       "$ref": "#/$defs/iam_permission_groups",
@@ -1440,24 +976,31 @@ export const iam_token_body: JsonSchema = {
       "$ref": "#/$defs/iam_condition"
     },
     "expires_on": {
-      "$ref": "#/$defs/iam_expires_on",
-      "description": "The expiration time on or after which the JWT MUST NOT be accepted for processing."
+      "description": "The expiration time on or after which the JWT MUST NOT be accepted for processing.",
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/iam_name",
-      "description": "Token name."
+      "description": "Token name.",
+      "type": "string"
     },
     "not_before": {
-      "$ref": "#/$defs/iam_not_before",
-      "description": "The time before which the token MUST NOT be accepted for processing."
+      "description": "The time before which the token MUST NOT be accepted for processing.",
+      "format": "date-time",
+      "type": "string"
     },
     "policies": {
       "$ref": "#/$defs/iam_token_policies",
       "description": "List of access policies assigned to the token."
     },
     "status": {
-      "$ref": "#/$defs/iam_token_status",
-      "description": "Status of the token."
+      "description": "Status of the token.",
+      "enum": [
+        "active",
+        "disabled",
+        "expired"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -1467,14 +1010,6 @@ export const iam_token_body: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_token_identifier`.
- */
-export const iam_token_identifier: JsonSchema = {
-  "description": "Token identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_token_policies`.
  */
@@ -1486,31 +1021,10 @@ export const iam_token_policies: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `iam_token_status`.
- */
-export const iam_token_status: JsonSchema = {
-  "description": "Status of the token.",
-  "enum": [
-    "active",
-    "disabled",
-    "expired"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `infra_AccountTag`.
- */
-export const infra_AccountTag: JsonSchema = {
-  "description": "Account identifier",
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_Host`.
  */
-export const load_balancing_Host: JsonSchema = {
+export const load$$balancing_Host: JsonSchema = {
   "description": "The 'Host' header allows to override the hostname set in the HTTP request. Current support is 1 'Host' header override per origin.",
   "items": {
     "type": "string"
@@ -1518,26 +1032,10 @@ export const load_balancing_Host: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_address`.
- */
-export const load_balancing_address: JsonSchema = {
-  "description": "The IP address (IPv4 or IPv6) of the origin, or its publicly addressable hostname. Hostnames entered here should resolve directly to the origin, and not be a hostname proxied by Cloudflare. To set an internal/reserved address, virtual_network_id must also be set.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_allow_insecure`.
- */
-export const load_balancing_allow_insecure: JsonSchema = {
-  "description": "Do not validate the certificate when monitor use HTTPS. This parameter is currently only valid for HTTP and HTTPS monitors.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_check_regions`.
  */
-export const load_balancing_check_regions: JsonSchema = {
+export const load$$balancing_check_regions: JsonSchema = {
   "description": "A list of regions from which to run health checks. Null means every Cloudflare data center.",
   "oneOf": [
     {
@@ -1569,58 +1067,10 @@ export const load_balancing_check_regions: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_consecutive_down`.
- */
-export const load_balancing_consecutive_down: JsonSchema = {
-  "description": "To be marked unhealthy the monitored origin must fail this healthcheck N consecutive times.",
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_consecutive_up`.
- */
-export const load_balancing_consecutive_up: JsonSchema = {
-  "description": "To be marked healthy the monitored origin must pass this healthcheck N consecutive times.",
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_description`.
- */
-export const load_balancing_description: JsonSchema = {
-  "description": "Object description.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_enabled`.
- */
-export const load_balancing_enabled: JsonSchema = {
-  "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any).",
-  "type": "boolean"
-};
-
-/**
- * The schema of `load-balancing_expected_body`.
- */
-export const load_balancing_expected_body: JsonSchema = {
-  "description": "A case-insensitive sub-string to look for in the response body. If this string is not found, the origin will be marked as unhealthy. This parameter is only valid for HTTP and HTTPS monitors.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_expected_codes`.
- */
-export const load_balancing_expected_codes: JsonSchema = {
-  "description": "The expected HTTP response code or code range of the health check. This parameter is only valid for HTTP and HTTPS monitors.",
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_filter_options`.
  */
-export const load_balancing_filter_options: JsonSchema = {
+export const load$$balancing_filter_options: JsonSchema = {
   "description": "Filter options for a particular resource type (pool or origin). Use null to reset.",
   "oneOf": [
     {
@@ -1657,18 +1107,10 @@ export const load_balancing_filter_options: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_follow_redirects`.
- */
-export const load_balancing_follow_redirects: JsonSchema = {
-  "description": "Follow redirects if returned by the origin. This parameter is only valid for HTTP and HTTPS monitors.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_header`.
  */
-export const load_balancing_header: JsonSchema = {
+export const load$$balancing_header: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -1682,7 +1124,7 @@ export const load_balancing_header: JsonSchema = {
 /**
  * The schema of `load-balancing_health_sources`.
  */
-export const load_balancing_health_sources: JsonSchema = {
+export const load$$balancing_health_sources: JsonSchema = {
   "description": "A list of health sources, ordered from highest to lowest priority, used to evaluate individual origin health and overall pool health. The load balancer uses the first source that has data and falls back to the next. Currently accepted values are null or the exact array [\"regional\", \"global\"]; any other combination is rejected. Null (the default) behaves like [\"local\", \"global\"]. [\"regional\", \"global\"] makes each region steer on its own health, falling back to the global decision when a region has no fresh data. Setting regional requires at least one region in check_regions.",
   "oneOf": [
     {
@@ -1702,33 +1144,10 @@ export const load_balancing_health_sources: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_identifier`.
- */
-export const load_balancing_identifier: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_interval`.
- */
-export const load_balancing_interval: JsonSchema = {
-  "description": "The interval between each health check. Shorter intervals may improve failover time, but will increase load on the origins as we check from multiple locations.",
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_latitude`.
- */
-export const load_balancing_latitude: JsonSchema = {
-  "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set.",
-  "type": "number"
-};
-
 /**
  * The schema of `load-balancing_load_shedding`.
  */
-export const load_balancing_load_shedding: JsonSchema = {
+export const load$$balancing_load_shedding: JsonSchema = {
   "description": "Configures load shedding policies and percentages for the pool.",
   "oneOf": [
     {
@@ -1769,141 +1188,108 @@ export const load_balancing_load_shedding: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `load-balancing_longitude`.
- */
-export const load_balancing_longitude: JsonSchema = {
-  "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set.",
-  "type": "number"
-};
-
-/**
- * The schema of `load-balancing_method`.
- */
-export const load_balancing_method: JsonSchema = {
-  "description": "The method to use for the health check. This defaults to 'GET' for HTTP/HTTPS based checks and 'connection_established' for TCP based health checks.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_minimum_origins`.
- */
-export const load_balancing_minimum_origins: JsonSchema = {
-  "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool.",
-  "type": "integer"
-};
-
 /**
  * The schema of `load-balancing_monitor-editable`.
  */
-export const load_balancing_monitor_editable: JsonSchema = {
+export const load$$balancing_monitor$$editable: JsonSchema = {
   "properties": {
     "allow_insecure": {
-      "$ref": "#/$defs/load-balancing_allow_insecure",
       "default": false,
-      "description": "Do not validate the certificate when monitor use HTTPS. This parameter is currently only valid for HTTP and HTTPS monitors."
+      "description": "Do not validate the certificate when monitor use HTTPS. This parameter is currently only valid for HTTP and HTTPS monitors.",
+      "type": "boolean"
     },
     "consecutive_down": {
-      "$ref": "#/$defs/load-balancing_consecutive_down",
-      "description": "To be marked unhealthy the monitored origin must fail this healthcheck N consecutive times."
+      "description": "To be marked unhealthy the monitored origin must fail this healthcheck N consecutive times.",
+      "type": "integer"
     },
     "consecutive_up": {
-      "$ref": "#/$defs/load-balancing_consecutive_up",
-      "description": "To be marked healthy the monitored origin must pass this healthcheck N consecutive times."
+      "description": "To be marked healthy the monitored origin must pass this healthcheck N consecutive times.",
+      "type": "integer"
     },
     "description": {
-      "$ref": "#/$defs/load-balancing_description",
       "default": "",
-      "description": "Object description."
+      "description": "Object description.",
+      "type": "string"
     },
     "expected_body": {
-      "$ref": "#/$defs/load-balancing_expected_body",
       "default": "",
-      "description": "A case-insensitive sub-string to look for in the response body. If this string is not found, the origin will be marked as unhealthy. This parameter is only valid for HTTP and HTTPS monitors."
+      "description": "A case-insensitive sub-string to look for in the response body. If this string is not found, the origin will be marked as unhealthy. This parameter is only valid for HTTP and HTTPS monitors.",
+      "type": "string"
     },
     "expected_codes": {
-      "$ref": "#/$defs/load-balancing_expected_codes",
       "default": "",
-      "description": "The expected HTTP response code or code range of the health check. This parameter is only valid for HTTP and HTTPS monitors."
+      "description": "The expected HTTP response code or code range of the health check. This parameter is only valid for HTTP and HTTPS monitors.",
+      "type": "string"
     },
     "follow_redirects": {
-      "$ref": "#/$defs/load-balancing_follow_redirects",
       "default": false,
-      "description": "Follow redirects if returned by the origin. This parameter is only valid for HTTP and HTTPS monitors."
+      "description": "Follow redirects if returned by the origin. This parameter is only valid for HTTP and HTTPS monitors.",
+      "type": "boolean"
     },
     "header": {
       "$ref": "#/$defs/load-balancing_header",
       "description": "The HTTP request headers to send in the health check. It is recommended you set a Host header by default. The User-Agent header cannot be overridden. This parameter is only valid for HTTP and HTTPS monitors."
     },
     "interval": {
-      "$ref": "#/$defs/load-balancing_interval",
       "default": 60,
-      "description": "The interval between each health check. Shorter intervals may improve failover time, but will increase load on the origins as we check from multiple locations."
+      "description": "The interval between each health check. Shorter intervals may improve failover time, but will increase load on the origins as we check from multiple locations.",
+      "type": "integer"
     },
     "method": {
-      "$ref": "#/$defs/load-balancing_method",
-      "description": "The method to use for the health check. This defaults to 'GET' for HTTP/HTTPS based checks and 'connection_established' for TCP based health checks."
+      "description": "The method to use for the health check. This defaults to 'GET' for HTTP/HTTPS based checks and 'connection_established' for TCP based health checks.",
+      "type": "string"
     },
     "path": {
-      "$ref": "#/$defs/load-balancing_path",
-      "description": "The endpoint path you want to conduct a health check against. This parameter is only valid for HTTP and HTTPS monitors."
+      "description": "The endpoint path you want to conduct a health check against. This parameter is only valid for HTTP and HTTPS monitors.",
+      "type": "string"
     },
     "port": {
-      "$ref": "#/$defs/load-balancing_port",
-      "description": "The port number to connect to for the health check. Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define the port when using a non-standard port (HTTP: default 80, HTTPS: default 443)."
+      "description": "The port number to connect to for the health check. Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define the port when using a non-standard port (HTTP: default 80, HTTPS: default 443).",
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "probe_zone": {
-      "$ref": "#/$defs/load-balancing_probe_zone",
       "default": "",
-      "description": "Assign this monitor to emulate the specified zone while probing. This parameter is only valid for HTTP and HTTPS monitors."
+      "description": "Assign this monitor to emulate the specified zone while probing. This parameter is only valid for HTTP and HTTPS monitors.",
+      "type": "string"
     },
     "retries": {
-      "$ref": "#/$defs/load-balancing_retries",
       "default": 2,
-      "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately."
+      "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately.",
+      "type": "integer"
     },
     "timeout": {
-      "$ref": "#/$defs/load-balancing_timeout",
       "default": 5,
-      "description": "The timeout (in seconds) before marking the health check as failed."
+      "description": "The timeout (in seconds) before marking the health check as failed.",
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/load-balancing_type",
       "default": "http",
-      "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP','HTTPS', 'TCP', 'ICMP-PING', 'UDP-ICMP', and 'SMTP'."
+      "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP','HTTPS', 'TCP', 'ICMP-PING', 'UDP-ICMP', and 'SMTP'.",
+      "enum": [
+        "http",
+        "https",
+        "tcp",
+        "udp_icmp",
+        "icmp_ping",
+        "smtp"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_monitor_group_id`.
- */
-export const load_balancing_monitor_group_id: JsonSchema = {
-  "description": "The ID of the Monitor Group to use for checking the health of origins within this pool.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_monitor_id`.
- */
-export const load_balancing_monitor_id: JsonSchema = {
-  "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_name`.
- */
-export const load_balancing_name: JsonSchema = {
-  "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed.",
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_networks`.
  */
-export const load_balancing_networks: JsonSchema = {
+export const load$$balancing_networks: JsonSchema = {
   "description": "List of networks where Load Balancer or Pool is enabled.",
   "items": {
     "type": "string"
@@ -1911,18 +1297,10 @@ export const load_balancing_networks: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_notification_email`.
- */
-export const load_balancing_notification_email: JsonSchema = {
-  "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list.",
-  "type": "string"
-};
-
 /**
  * The schema of `load-balancing_notification_filter`.
  */
-export const load_balancing_notification_filter: JsonSchema = {
+export const load$$balancing_notification_filter: JsonSchema = {
   "description": "Filter pool and origin health notifications by resource type or health status. Use null to reset.",
   "oneOf": [
     {
@@ -1947,68 +1325,52 @@ export const load_balancing_notification_filter: JsonSchema = {
 /**
  * The schema of `load-balancing_origin`.
  */
-export const load_balancing_origin: JsonSchema = {
+export const load$$balancing_origin: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/load-balancing_address",
-      "description": "The IP address (IPv4 or IPv6) of the origin, or its publicly addressable hostname. Hostnames entered here should resolve directly to the origin, and not be a hostname proxied by Cloudflare. To set an internal/reserved address, virtual_network_id must also be set."
+      "description": "The IP address (IPv4 or IPv6) of the origin, or its publicly addressable hostname. Hostnames entered here should resolve directly to the origin, and not be a hostname proxied by Cloudflare. To set an internal/reserved address, virtual_network_id must also be set.",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/load-balancing_schemas-enabled",
       "default": true,
-      "description": "Whether to enable (the default) this origin within the pool. Disabled origins will not receive traffic and are excluded from health checks. The origin will only be disabled for the current pool."
+      "description": "Whether to enable (the default) this origin within the pool. Disabled origins will not receive traffic and are excluded from health checks. The origin will only be disabled for the current pool.",
+      "type": "boolean"
     },
     "flatten_cname": {
-      "$ref": "#/$defs/load-balancing_origin_flatten_cname",
       "default": true,
-      "description": "Whether to flatten CNAME records for this origin, resolving them to A/AAAA records before returning to the client. When true (the default), the director resolves CNAME addresses to their underlying A/AAAA records. When false, the origin address is returned as a raw CNAME record without resolution. This setting mirrors the DNS API record flatten_cname setting."
+      "description": "Whether to flatten CNAME records for this origin, resolving them to A/AAAA records before returning to the client. When true (the default), the director resolves CNAME addresses to their underlying A/AAAA records. When false, the origin address is returned as a raw CNAME record without resolution. This setting mirrors the DNS API record flatten_cname setting.",
+      "type": "boolean"
     },
     "header": {
       "$ref": "#/$defs/load-balancing_schemas-header",
       "description": "The request header is used to pass additional information with an HTTP request. Currently supported header is 'Host'."
     },
     "name": {
-      "$ref": "#/$defs/load-balancing_schemas-name",
-      "description": "A human-identifiable name for the origin."
+      "description": "A human-identifiable name for the origin.",
+      "type": "string"
     },
     "port": {
-      "$ref": "#/$defs/load-balancing_origin_port",
       "default": 0,
-      "description": "The port for upstream connections. A value of 0 means the default port for the protocol will be used."
+      "description": "The port for upstream connections. A value of 0 means the default port for the protocol will be used.",
+      "type": "integer"
     },
     "virtual_network_id": {
-      "$ref": "#/$defs/load-balancing_virtual_network_id",
-      "description": "The virtual network subnet ID the origin belongs in. Virtual network must also belong to the account."
+      "description": "The virtual network subnet ID the origin belongs in. Virtual network must also belong to the account.",
+      "type": "string"
     },
     "weight": {
-      "$ref": "#/$defs/load-balancing_weight",
       "default": 1,
-      "description": "The weight of this origin relative to other origins in the pool. Based on the configured weight the total traffic is distributed among origins within the pool.\n- `origin_steering.policy=\"least_outstanding_requests\"`: Use weight to scale the origin's outstanding requests.\n- `origin_steering.policy=\"least_connections\"`: Use weight to scale the origin's open connections."
+      "description": "The weight of this origin relative to other origins in the pool. Based on the configured weight the total traffic is distributed among origins within the pool.\n- `origin_steering.policy=\"least_outstanding_requests\"`: Use weight to scale the origin's outstanding requests.\n- `origin_steering.policy=\"least_connections\"`: Use weight to scale the origin's open connections.",
+      "type": "number"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_origin_flatten_cname`.
- */
-export const load_balancing_origin_flatten_cname: JsonSchema = {
-  "description": "Whether to flatten CNAME records for this origin, resolving them to A/AAAA records before returning to the client. When true (the default), the director resolves CNAME addresses to their underlying A/AAAA records. When false, the origin address is returned as a raw CNAME record without resolution. This setting mirrors the DNS API record flatten_cname setting.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `load-balancing_origin_port`.
- */
-export const load_balancing_origin_port: JsonSchema = {
-  "description": "The port for upstream connections. A value of 0 means the default port for the protocol will be used.",
-  "type": "integer"
-};
-
 /**
  * The schema of `load-balancing_origin_steering`.
  */
-export const load_balancing_origin_steering: JsonSchema = {
+export const load$$balancing_origin_steering: JsonSchema = {
   "description": "Configures origin steering for the pool. Controls how origins are selected for new sessions and traffic without session affinity.",
   "oneOf": [
     {
@@ -2036,7 +1398,7 @@ export const load_balancing_origin_steering: JsonSchema = {
 /**
  * The schema of `load-balancing_origins`.
  */
-export const load_balancing_origins: JsonSchema = {
+export const load$$balancing_origins: JsonSchema = {
   "description": "The list of origins within this pool. Traffic directed at this pool is balanced across all currently healthy origins, provided the pool itself is healthy.",
   "items": {
     "$ref": "#/$defs/load-balancing_origin"
@@ -2044,73 +1406,10 @@ export const load_balancing_origins: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `load-balancing_patch_pools_notification_email`.
- */
-export const load_balancing_patch_pools_notification_email: JsonSchema = {
-  "description": "The email address to send health status notifications to. This field is now deprecated in favor of Cloudflare Notifications for Load Balancing, so only resetting this field with an empty string `\"\"` is accepted.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_path`.
- */
-export const load_balancing_path: JsonSchema = {
-  "description": "The endpoint path you want to conduct a health check against. This parameter is only valid for HTTP and HTTPS monitors.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_port`.
- */
-export const load_balancing_port: JsonSchema = {
-  "description": "The port number to connect to for the health check. Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define the port when using a non-standard port (HTTP: default 80, HTTPS: default 443).",
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `load-balancing_probe_zone`.
- */
-export const load_balancing_probe_zone: JsonSchema = {
-  "description": "Assign this monitor to emulate the specified zone while probing. This parameter is only valid for HTTP and HTTPS monitors.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_retries`.
- */
-export const load_balancing_retries: JsonSchema = {
-  "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately.",
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_schemas-description`.
- */
-export const load_balancing_schemas_description: JsonSchema = {
-  "description": "A human-readable description of the pool.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_schemas-enabled`.
- */
-export const load_balancing_schemas_enabled: JsonSchema = {
-  "description": "Whether to enable (the default) this origin within the pool. Disabled origins will not receive traffic and are excluded from health checks. The origin will only be disabled for the current pool.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `load-balancing_schemas-header`.
  */
-export const load_balancing_schemas_header: JsonSchema = {
+export const load$$balancing_schemas$$header: JsonSchema = {
   "description": "The request header is used to pass additional information with an HTTP request. Currently supported header is 'Host'.",
   "properties": {
     "Host": {
@@ -2121,95 +1420,10 @@ export const load_balancing_schemas_header: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `load-balancing_schemas-identifier`.
- */
-export const load_balancing_schemas_identifier: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_schemas-name`.
- */
-export const load_balancing_schemas_name: JsonSchema = {
-  "description": "A human-identifiable name for the origin.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_subdivision_code_a2`.
- */
-export const load_balancing_subdivision_code_a2: JsonSchema = {
-  "description": "Two-letter subdivision code followed in ISO 3166-2.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_timeout`.
- */
-export const load_balancing_timeout: JsonSchema = {
-  "description": "The timeout (in seconds) before marking the health check as failed.",
-  "type": "integer"
-};
-
-/**
- * The schema of `load-balancing_type`.
- */
-export const load_balancing_type: JsonSchema = {
-  "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP','HTTPS', 'TCP', 'ICMP-PING', 'UDP-ICMP', and 'SMTP'.",
-  "enum": [
-    "http",
-    "https",
-    "tcp",
-    "udp_icmp",
-    "icmp_ping",
-    "smtp"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_virtual_network_id`.
- */
-export const load_balancing_virtual_network_id: JsonSchema = {
-  "description": "The virtual network subnet ID the origin belongs in. Virtual network must also belong to the account.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_weight`.
- */
-export const load_balancing_weight: JsonSchema = {
-  "description": "The weight of this origin relative to other origins in the pool. Based on the configured weight the total traffic is distributed among origins within the pool.\n- `origin_steering.policy=\"least_outstanding_requests\"`: Use weight to scale the origin's outstanding requests.\n- `origin_steering.policy=\"least_connections\"`: Use weight to scale the origin's open connections.",
-  "type": "number"
-};
-
-/**
- * The schema of `mconn-telemetry_account_id`.
- */
-export const mconn_telemetry_account_id: JsonSchema = {
-  "description": "Account identifier",
-  "type": "string"
-};
-
-/**
- * The schema of `mconn_account_id`.
- */
-export const mconn_account_id: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `mconn_uuid`.
- */
-export const mconn_uuid: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `organizations-api_ModifyProfileRequest`.
  */
-export const organizations_api_ModifyProfileRequest: JsonSchema = {
+export const organizations$$api_ModifyProfileRequest: JsonSchema = {
   "description": "Partial business profile update. Omitted, empty, or null fields remain unchanged. At least\none of business name, address, phone, or email must be non-empty.",
   "properties": {
     "business_address": {
@@ -2266,35 +1480,11 @@ export const organizations_api_ModifyProfileRequest: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `organizations-api_OrganizationID`.
- */
-export const organizations_api_OrganizationID: JsonSchema = {
-  "description": "Organization ID",
-  "type": "string"
-};
-
-/**
- * The schema of `r2-data-catalog_account-id`.
- */
-export const r2_data_catalog_account_id: JsonSchema = {
-  "description": "Use this to identify the account.",
-  "type": "string"
-};
-
-/**
- * The schema of `r2-data-catalog_bucket-name`.
- */
-export const r2_data_catalog_bucket_name: JsonSchema = {
-  "description": "Specifies the R2 bucket name.",
-  "type": "string"
-};
-
 /**
  * The schema of `r2-data-catalog_catalog-activation-request`.
  */
-export const r2_data_catalog_catalog_activation_request: JsonSchema = {
-  "description": "Contains the optional request to enable a catalog. Send an empty body\nto keep the defaults. If you include `credential`, the service checks\nthat the token can access the bucket, then stores it as the catalog's\nmaintenance credential, like the store credentials operation.\n",
+export const r2$$data$$catalog_catalog$$activation$$request: JsonSchema = {
+  "description": "Contains the optional request to enable a catalog. Send an empty body\nto keep the defaults. If you include `credential`, the service checks\nthat the token can access the bucket, then stores it as the catalog's\nmaintenance credential, like the store credentials operation.",
   "properties": {
     "credential": {
       "$ref": "#/$defs/r2-data-catalog_catalog-credential-request",
@@ -2307,7 +1497,7 @@ export const r2_data_catalog_catalog_activation_request: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_catalog-credential-request`.
  */
-export const r2_data_catalog_catalog_credential_request: JsonSchema = {
+export const r2$$data$$catalog_catalog$$credential$$request: JsonSchema = {
   "description": "Contains request to store catalog credentials.",
   "properties": {
     "token": {
@@ -2321,22 +1511,10 @@ export const r2_data_catalog_catalog_credential_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `r2-data-catalog_catalog-maintenance-state`.
- */
-export const r2_data_catalog_catalog_maintenance_state: JsonSchema = {
-  "description": "Specifies the state of maintenance operations.",
-  "enum": [
-    "enabled",
-    "disabled"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `r2-data-catalog_catalog-maintenance-update-request`.
  */
-export const r2_data_catalog_catalog_maintenance_update_request: JsonSchema = {
+export const r2$$data$$catalog_catalog$$maintenance$$update$$request: JsonSchema = {
   "description": "Contains request to update catalog maintenance configuration.",
   "properties": {
     "compaction": {
@@ -2351,33 +1529,29 @@ export const r2_data_catalog_catalog_maintenance_update_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `r2-data-catalog_catalog-target-file-size`.
- */
-export const r2_data_catalog_catalog_target_file_size: JsonSchema = {
-  "description": "Sets the target file size for compaction in megabytes. Defaults to \"128\".",
-  "enum": [
-    "64",
-    "128",
-    "256",
-    "512"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `r2-data-catalog_compaction-update-params`.
  */
-export const r2_data_catalog_compaction_update_params: JsonSchema = {
+export const r2$$data$$catalog_compaction$$update$$params: JsonSchema = {
   "description": "Updates compaction configuration (all fields optional).",
   "properties": {
     "state": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-state",
-      "description": "Specifies the state of maintenance operations."
+      "description": "Specifies the state of maintenance operations.",
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     },
     "target_size_mb": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-target-file-size",
-      "description": "Sets the target file size for compaction in megabytes. Defaults to \"128\"."
+      "description": "Sets the target file size for compaction in megabytes. Defaults to \"128\".",
+      "enum": [
+        "64",
+        "128",
+        "256",
+        "512"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -2386,7 +1560,7 @@ export const r2_data_catalog_compaction_update_params: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_queue-maintenance-request`.
  */
-export const r2_data_catalog_queue_maintenance_request: JsonSchema = {
+export const r2$$data$$catalog_queue$$maintenance$$request: JsonSchema = {
   "properties": {
     "request_id": {
       "oneOf": [
@@ -2406,7 +1580,7 @@ export const r2_data_catalog_queue_maintenance_request: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_snapshot-expiration-update-params`.
  */
-export const r2_data_catalog_snapshot_expiration_update_params: JsonSchema = {
+export const r2$$data$$catalog_snapshot$$expiration$$update$$params: JsonSchema = {
   "description": "Updates snapshot expiration configuration (all fields optional).",
   "properties": {
     "max_snapshot_age": {
@@ -2418,8 +1592,12 @@ export const r2_data_catalog_snapshot_expiration_update_params: JsonSchema = {
       "type": "integer"
     },
     "state": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-state",
-      "description": "Specifies the state of maintenance operations."
+      "description": "Specifies the state of maintenance operations.",
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -2428,252 +1606,89 @@ export const r2_data_catalog_snapshot_expiration_update_params: JsonSchema = {
 /**
  * The schema of `r2-data-catalog_table-compaction-update-params`.
  */
-export const r2_data_catalog_table_compaction_update_params: JsonSchema = {
+export const r2$$data$$catalog_table$$compaction$$update$$params: JsonSchema = {
   "description": "Updates table compaction configuration; all fields are optional.",
   "properties": {
     "state": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-maintenance-state",
-      "description": "Specifies the state of maintenance operations."
-    },
-    "target_size_mb": {
-      "$ref": "#/$defs/r2-data-catalog_catalog-target-file-size",
-      "description": "Sets the target file size for compaction in megabytes. Defaults to \"128\"."
-    }
-  },
-  "type": "object"
-};
-
-/**
- * The schema of `r2-data-catalog_table-maintenance-update-request`.
- */
-export const r2_data_catalog_table_maintenance_update_request: JsonSchema = {
-  "description": "Contains request to update table maintenance configuration.",
-  "properties": {
-    "compaction": {
-      "$ref": "#/$defs/r2-data-catalog_table-compaction-update-params",
-      "description": "Updates table compaction configuration; all fields are optional."
+      "description": "Specifies the state of maintenance operations.",
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "type": "string"
     },
-    "snapshot_expiration": {
-      "$ref": "#/$defs/r2-data-catalog_snapshot-expiration-update-params",
-      "description": "Updates snapshot expiration configuration (all fields optional)."
-    }
-  },
-  "type": "object"
-};
-
-/**
- * The schema of `resource-sharing_account_id`.
- */
-export const resource_sharing_account_id: JsonSchema = {
-  "description": "Account identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_organization_id`.
- */
-export const resource_sharing_organization_id: JsonSchema = {
-  "description": "Organization identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_resource_id`.
- */
-export const resource_sharing_resource_id: JsonSchema = {
-  "description": "Share Resource identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_resource_meta`.
- */
-export const resource_sharing_resource_meta: JsonSchema = {
-  "description": "Resource Metadata.",
-  "type": "object"
-};
-
-/**
- * The schema of `resource-sharing_resource_resource_id`.
- */
-export const resource_sharing_resource_resource_id: JsonSchema = {
-  "description": "Share Resource identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_resource_status`.
- */
-export const resource_sharing_resource_status: JsonSchema = {
-  "description": "Resource Status.",
-  "enum": [
-    "active",
-    "deleting",
-    "deleted"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_resource_type`.
- */
-export const resource_sharing_resource_type: JsonSchema = {
-  "description": "Resource Type.",
-  "enum": [
-    "custom-ruleset",
-    "gateway-policy",
-    "gateway-destination-ip",
-    "gateway-block-page-settings",
-    "gateway-extended-email-matching",
-    "idp-federation-grant",
-    "trust-grant"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_share_id`.
- */
-export const resource_sharing_share_id: JsonSchema = {
-  "description": "Share identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_share_kind`.
- */
-export const resource_sharing_share_kind: JsonSchema = {
-  "enum": [
-    "sent",
-    "received"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_share_name`.
- */
-export const resource_sharing_share_name: JsonSchema = {
-  "description": "The name of the share.",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_share_status`.
- */
-export const resource_sharing_share_status: JsonSchema = {
-  "enum": [
-    "active",
-    "deleting",
-    "deleted"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-sharing_share_target_type`.
- */
-export const resource_sharing_share_target_type: JsonSchema = {
-  "enum": [
-    "account",
-    "organization"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `rulesets_ZoneId`.
- */
-export const rulesets_ZoneId: JsonSchema = {
-  "description": "The unique ID of the zone.",
-  "type": "string"
-};
-
-/**
- * The schema of `rum_identifier`.
- */
-export const rum_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `security-center_dismissed`.
- */
-export const security_center_dismissed: JsonSchema = {
-  "type": "boolean"
+    "target_size_mb": {
+      "description": "Sets the target file size for compaction in megabytes. Defaults to \"128\".",
+      "enum": [
+        "64",
+        "128",
+        "256",
+        "512"
+      ],
+      "type": "string"
+    }
+  },
+  "type": "object"
 };
 
 /**
- * The schema of `security-center_identifier`.
+ * The schema of `r2-data-catalog_table-maintenance-update-request`.
  */
-export const security_center_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
+export const r2$$data$$catalog_table$$maintenance$$update$$request: JsonSchema = {
+  "description": "Contains request to update table maintenance configuration.",
+  "properties": {
+    "compaction": {
+      "$ref": "#/$defs/r2-data-catalog_table-compaction-update-params",
+      "description": "Updates table compaction configuration; all fields are optional."
+    },
+    "snapshot_expiration": {
+      "$ref": "#/$defs/r2-data-catalog_snapshot-expiration-update-params",
+      "description": "Updates snapshot expiration configuration (all fields optional)."
+    }
+  },
+  "type": "object"
 };
 
 /**
- * The schema of `security-center_issueClass`.
+ * The schema of `resource-sharing_resource_meta`.
  */
-export const security_center_issueClass: JsonSchema = {
-  "type": "string"
+export const resource$$sharing_resource_meta: JsonSchema = {
+  "description": "Resource Metadata.",
+  "type": "object"
 };
 
 /**
  * The schema of `security-center_issueClasses`.
  */
-export const security_center_issueClasses: JsonSchema = {
+export const security$$center_issueClasses: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/security-center_issueClass"
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `security-center_issueType`.
- */
-export const security_center_issueType: JsonSchema = {
-  "enum": [
-    "compliance_violation",
-    "email_security",
-    "exposed_infrastructure",
-    "insecure_configuration",
-    "weak_authentication",
-    "configuration_suggestion"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `security-center_issueTypes`.
  */
-export const security_center_issueTypes: JsonSchema = {
+export const security$$center_issueTypes: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/security-center_issueType"
+    "enum": [
+      "compliance_violation",
+      "email_security",
+      "exposed_infrastructure",
+      "insecure_configuration",
+      "weak_authentication",
+      "configuration_suggestion"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `security-center_page`.
- */
-export const security_center_page: JsonSchema = {
-  "description": "Specifies the current page within paginated list of results.",
-  "type": "integer"
-};
-
-/**
- * The schema of `security-center_perPage`.
- */
-export const security_center_perPage: JsonSchema = {
-  "description": "Sets the number of results per page of results.",
-  "type": "integer"
-};
-
 /**
  * The schema of `security-center_products`.
  */
-export const security_center_products: JsonSchema = {
+export const security$$center_products: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -2683,7 +1698,7 @@ export const security_center_products: JsonSchema = {
 /**
  * The schema of `security-center_severityQueryParam`.
  */
-export const security_center_severityQueryParam: JsonSchema = {
+export const security$$center_severityQueryParam: JsonSchema = {
   "items": {
     "enum": [
       "low",
@@ -2695,241 +1710,52 @@ export const security_center_severityQueryParam: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `security-center_source`.
- */
-export const security_center_source: JsonSchema = {
-  "description": "Who generated the insight. `cloudflare` for Cloudflare-generated insights, otherwise the partner.",
-  "enum": [
-    "cloudflare",
-    "riskrecon"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `security-center_sources`.
  */
-export const security_center_sources: JsonSchema = {
+export const security$$center_sources: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/security-center_source"
+    "description": "Who generated the insight. `cloudflare` for Cloudflare-generated insights, otherwise the partner.",
+    "enum": [
+      "cloudflare",
+      "riskrecon"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `security-center_subject`.
- */
-export const security_center_subject: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `security-center_subjects`.
  */
-export const security_center_subjects: JsonSchema = {
+export const security$$center_subjects: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/security-center_subject"
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `security-center_userClassification`.
- */
-export const security_center_userClassification: JsonSchema = {
-  "description": "User-defined classification for the insight. Can be 'false_positive', 'accept_risk', 'other', or null.",
-  "oneOf": [
-    {
-      "enum": [
-        "false_positive",
-        "accept_risk",
-        "other"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `speed_identifier`.
- */
-export const speed_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_identifier`.
- */
-export const tls_certificates_and_hostnames_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_account_id`.
- */
-export const tunnel_account_id: JsonSchema = {
-  "description": "Cloudflare account ID",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_client_id`.
- */
-export const tunnel_client_id: JsonSchema = {
-  "description": "UUID of the Cloudflare Tunnel connector.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_config_src`.
- */
-export const tunnel_config_src: JsonSchema = {
-  "description": "Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel on the Zero Trust dashboard.",
-  "enum": [
-    "local",
-    "cloudflare"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_existed_at`.
- */
-export const tunnel_existed_at: JsonSchema = {
-  "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_identifier`.
- */
-export const tunnel_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_ip`.
- */
-export const tunnel_ip: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_page_number`.
- */
-export const tunnel_page_number: JsonSchema = {
-  "description": "Page number of paginated results.",
-  "type": "number"
-};
-
-/**
- * The schema of `tunnel_per_page`.
- */
-export const tunnel_per_page: JsonSchema = {
-  "description": "Number of results to display.",
-  "type": "number"
-};
-
-/**
- * The schema of `tunnel_status`.
- */
-export const tunnel_status: JsonSchema = {
-  "description": "The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).",
-  "enum": [
-    "inactive",
-    "degraded",
-    "healthy",
-    "down"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_id`.
- */
-export const tunnel_tunnel_id: JsonSchema = {
-  "description": "UUID of the tunnel.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_id-2`.
- */
-export const tunnel_tunnel_id_2: JsonSchema = {
-  "description": "UUID of the tunnel.",
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_name`.
- */
-export const tunnel_tunnel_name: JsonSchema = {
-  "description": "A user-friendly name for a tunnel.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_secret`.
- */
-export const tunnel_tunnel_secret: JsonSchema = {
-  "description": "Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string.",
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_tunnel_type`.
- */
-export const tunnel_tunnel_type: JsonSchema = {
-  "description": "The type of tunnel.",
-  "enum": [
-    "cfd_tunnel",
-    "warp_connector",
-    "warp",
-    "magic",
-    "ip_sec",
-    "gre",
-    "cni"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tunnel_tunnel_types`.
  */
 export const tunnel_tunnel_types: JsonSchema = {
   "description": "The types of tunnels to filter by, separated by commas.",
   "items": {
-    "$ref": "#/$defs/tunnel_tunnel_type"
+    "description": "The type of tunnel.",
+    "enum": [
+      "cfd_tunnel",
+      "warp_connector",
+      "warp",
+      "magic",
+      "ip_sec",
+      "gre",
+      "cni"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `usage-analytics_identifier`.
- */
-export const usage_analytics_identifier: JsonSchema = {
-  "description": "Cloudflare resource identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `waf-product-api-bundle_identifier`.
- */
-export const waf_product_api_bundle_identifier: JsonSchema = {
-  "description": "Defines an identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `workers_binding_item`.
  */
@@ -3059,8 +1885,8 @@ export const workers_binding_item: JsonSchema = {
 export const workers_binding_kind_ai: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3087,8 +1913,8 @@ export const workers_binding_kind_ai_search: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "namespace": {
       "description": "The namespace the instance belongs to. Defaults to \"default\" if omitted. Customers who don't use namespaces can simply omit this field.",
@@ -3116,8 +1942,8 @@ export const workers_binding_kind_ai_search: JsonSchema = {
 export const workers_binding_kind_ai_search_namespace: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "namespace": {
       "description": "The user-chosen namespace name. Must exist before deploy -- Wrangler handles auto-creation on deploy failure (R2 bucket pattern). The \"default\" namespace is auto-created by config-api for new accounts. Grants full access (CRUD + search + chat) to all instances within the namespace.",
@@ -3149,8 +1975,8 @@ export const workers_binding_kind_analytics_engine: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3174,8 +2000,8 @@ export const workers_binding_kind_analytics_engine: JsonSchema = {
 export const workers_binding_kind_artifacts: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "namespace": {
       "description": "The Artifacts namespace exposed to the Worker in the Worker's account. Must be 2-63 characters, start with an ASCII alphanumeric character, contain only ASCII alphanumeric characters, dots, underscores, and hyphens, and must not end with a hyphen. The namespace does not need to be created before binding it.",
@@ -3203,8 +2029,8 @@ export const workers_binding_kind_artifacts: JsonSchema = {
 export const workers_binding_kind_assets: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3227,8 +2053,8 @@ export const workers_binding_kind_assets: JsonSchema = {
 export const workers_binding_kind_browser: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3260,8 +2086,8 @@ export const workers_binding_kind_d1: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3285,8 +2111,8 @@ export const workers_binding_kind_d1: JsonSchema = {
 export const workers_binding_kind_data_blob: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "part": {
       "description": "The name of the file containing the data content. Only accepted for `service worker syntax` Workers.",
@@ -3315,8 +2141,8 @@ export const workers_binding_kind_data_blob: JsonSchema = {
 export const workers_binding_kind_dispatch_namespace: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "namespace": {
       "description": "The name of the dispatch namespace.",
@@ -3396,13 +2222,14 @@ export const workers_binding_kind_durable_object_namespace: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "namespace_id": {
       "allOf": [
         {
-          "$ref": "#/$defs/workers_namespace_identifier"
+          "description": "Namespace identifier tag.",
+          "type": "string"
         },
         {
           "type": "string"
@@ -3438,8 +2265,8 @@ export const workers_binding_kind_flagship: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3467,8 +2294,8 @@ export const workers_binding_kind_hyperdrive: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3492,8 +2319,8 @@ export const workers_binding_kind_hyperdrive: JsonSchema = {
 export const workers_binding_kind_images: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3553,8 +2380,8 @@ export const workers_binding_kind_json: JsonSchema = {
       "type": "object"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3579,8 +2406,8 @@ export const workers_binding_kind_k2: JsonSchema = {
   "description": "A K2 stream binding. Available only to accounts enabled for K2.",
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "stream": {
       "description": "ID of a K2 stream owned by the account deploying the Worker.",
@@ -3608,12 +2435,12 @@ export const workers_binding_kind_k2: JsonSchema = {
 export const workers_binding_kind_kv_namespace: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "namespace_id": {
-      "$ref": "#/$defs/workers_namespace_identifier",
-      "description": "Namespace identifier tag."
+      "description": "Namespace identifier tag.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3637,8 +2464,8 @@ export const workers_binding_kind_kv_namespace: JsonSchema = {
 export const workers_binding_kind_media: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3661,8 +2488,8 @@ export const workers_binding_kind_media: JsonSchema = {
 export const workers_binding_kind_messaging: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "namespace": {
       "description": "The Messaging namespace to bind to.",
@@ -3694,8 +2521,8 @@ export const workers_binding_kind_mtls_certificate: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3719,8 +2546,8 @@ export const workers_binding_kind_mtls_certificate: JsonSchema = {
 export const workers_binding_kind_pipelines: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "pipeline": {
       "description": "Name of the Pipeline to bind to.",
@@ -3748,8 +2575,8 @@ export const workers_binding_kind_pipelines: JsonSchema = {
 export const workers_binding_kind_plain_text: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "text": {
       "description": "The text value to use.",
@@ -3777,8 +2604,8 @@ export const workers_binding_kind_plain_text: JsonSchema = {
 export const workers_binding_kind_queue: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "queue_name": {
       "description": "Name of the Queue to bind to.",
@@ -3820,8 +2647,8 @@ export const workers_binding_kind_r2_bucket: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3845,8 +2672,8 @@ export const workers_binding_kind_r2_bucket: JsonSchema = {
 export const workers_binding_kind_ratelimit: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "namespace_id": {
       "description": "Identifier of the rate limit namespace to bind to.",
@@ -3860,7 +2687,7 @@ export const workers_binding_kind_ratelimit: JsonSchema = {
           "type": "number"
         },
         "mitigation_timeout": {
-          "description": "Duration in seconds to apply the mitigation action after the rate limit is exceeded. Valid values are 0 (disabled), 10, or multiples of 60 up to 86400. Must be greater than or equal to the period when non-zero.\n",
+          "description": "Duration in seconds to apply the mitigation action after the rate limit is exceeded. Valid values are 0 (disabled), 10, or multiples of 60 up to 86400. Must be greater than or equal to the period when non-zero.",
           "type": "integer"
         },
         "period": {
@@ -3919,8 +2746,8 @@ export const workers_binding_kind_secret_key: JsonSchema = {
       "type": "object"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -3963,8 +2790,8 @@ export const workers_binding_kind_secret_key: JsonSchema = {
 export const workers_binding_kind_secret_text: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "text": {
       "description": "The secret value to use.",
@@ -3992,8 +2819,8 @@ export const workers_binding_kind_secret_text: JsonSchema = {
 export const workers_binding_kind_secrets_store_secret: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "secret_name": {
       "description": "Name of the secret in the store.",
@@ -4044,8 +2871,8 @@ export const workers_binding_kind_send_email: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -4077,8 +2904,8 @@ export const workers_binding_kind_service: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "service": {
       "description": "Name of Worker to bind to.",
@@ -4106,8 +2933,8 @@ export const workers_binding_kind_service: JsonSchema = {
 export const workers_binding_kind_text_blob: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "part": {
       "description": "The name of the file containing the text content. Only accepted for `service worker syntax` Workers.",
@@ -4140,8 +2967,8 @@ export const workers_binding_kind_vectorize: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -4165,8 +2992,8 @@ export const workers_binding_kind_vectorize: JsonSchema = {
 export const workers_binding_kind_version_metadata: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "type": {
       "description": "The kind of resource that the binding provides.",
@@ -4189,22 +3016,22 @@ export const workers_binding_kind_version_metadata: JsonSchema = {
 export const workers_binding_kind_vpc_network: JsonSchema = {
   "properties": {
     "identity": {
-      "description": "Enables Gateway identity for the binding. Requires network_id to be \"cf1:network\" and cannot be combined with tunnel_id or an explicit \"cf1:vnet:<UUID>\" network_id.\n",
+      "description": "Enables Gateway identity for the binding. Requires network_id to be \"cf1:network\" and cannot be combined with tunnel_id or an explicit \"cf1:vnet:<UUID>\" network_id.",
       "enum": [
         "runtime-email-alpha"
       ],
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "network_id": {
-      "description": "Identifier of the network to bind to. Use \"cf1:network\" to select the account's default virtual network at runtime, or \"cf1:vnet:<UUID>\" to select an explicit virtual network in the Worker's account. Mutually exclusive with tunnel_id.\n",
+      "description": "Identifier of the network to bind to. Use \"cf1:network\" to select the account's default virtual network at runtime, or \"cf1:vnet:<UUID>\" to select an explicit virtual network in the Worker's account. Mutually exclusive with tunnel_id.",
       "type": "string"
     },
     "tunnel_id": {
-      "description": "UUID of the Cloudflare Tunnel to bind to. Mutually exclusive with network_id.\n",
+      "description": "UUID of the Cloudflare Tunnel to bind to. Mutually exclusive with network_id.",
       "type": "string"
     },
     "type": {
@@ -4228,8 +3055,8 @@ export const workers_binding_kind_vpc_network: JsonSchema = {
 export const workers_binding_kind_vpc_service: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "service_id": {
       "description": "Identifier of the VPC service to bind to.",
@@ -4257,8 +3084,8 @@ export const workers_binding_kind_vpc_service: JsonSchema = {
 export const workers_binding_kind_wasm_module: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "part": {
       "description": "The name of the file containing the WebAssembly module content. Only accepted for `service worker syntax` Workers.",
@@ -4291,8 +3118,8 @@ export const workers_binding_kind_workflow: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/workers_binding_name",
-      "description": "A JavaScript variable name for the binding."
+      "description": "A JavaScript variable name for the binding.",
+      "type": "string"
     },
     "script_name": {
       "description": "Script name that contains the Workflow. If not provided, defaults to this script name.",
@@ -4318,14 +3145,6 @@ export const workers_binding_kind_workflow: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_binding_name`.
- */
-export const workers_binding_name: JsonSchema = {
-  "description": "A JavaScript variable name for the binding.",
-  "type": "string"
-};
-
 /**
  * The schema of `workers_bindings`.
  */
@@ -4341,11 +3160,11 @@ export const workers_bindings: JsonSchema = {
  * The schema of `workers_cache_options`.
  */
 export const workers_cache_options: JsonSchema = {
-  "description": "Global CacheW configuration for the Worker. When caching is on,\nthe platform provisions a `cloudflare.app` zone for the Worker.\nA `type: worker` entry in the `exports` map can override this\nvalue for a single entrypoint.\n",
+  "description": "Global CacheW configuration for the Worker. When caching is on,\nthe platform provisions a `cloudflare.app` zone for the Worker.\nA `type: worker` entry in the `exports` map can override this\nvalue for a single entrypoint.",
   "properties": {
     "cross_version_cache": {
       "default": false,
-      "description": "Whether cached responses are shared across Worker version\nuploads. This is independent of `enabled`. It can stay true\nwhile caching is off, so the preference survives turning\ncaching off and back on.\n",
+      "description": "Whether cached responses are shared across Worker version\nuploads. This is independent of `enabled`. It can stay true\nwhile caching is off, so the preference survives turning\ncaching off and back on.",
       "type": "boolean"
     },
     "enabled": {
@@ -4409,29 +3228,14 @@ export const workers_code_update_strategy: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_compatibility_date`.
- */
-export const workers_compatibility_date: JsonSchema = {
-  "description": "Date indicating targeted support in the Workers runtime. Backwards incompatible fixes to the runtime following this date will not affect this Worker.",
-  "type": "string"
-};
-
-/**
- * The schema of `workers_compatibility_flag`.
- */
-export const workers_compatibility_flag: JsonSchema = {
-  "description": "Flag that enables or disables a specific feature in the Workers runtime.",
-  "type": "string"
-};
-
 /**
  * The schema of `workers_compatibility_flags`.
  */
 export const workers_compatibility_flags: JsonSchema = {
   "description": "Flags that enable or disable certain features in the Workers runtime. Used to enable upcoming features or opt in or out of specific changes not included in a `compatibility_date`.",
   "items": {
-    "$ref": "#/$defs/workers_compatibility_flag"
+    "description": "Flag that enables or disables a specific feature in the Workers runtime.",
+    "type": "string"
   },
   "type": "array"
 };
@@ -4439,7 +3243,7 @@ export const workers_compatibility_flags: JsonSchema = {
 /**
  * The schema of `workers_create-assets-upload-session-object`.
  */
-export const workers_create_assets_upload_session_object: JsonSchema = {
+export const workers_create$$assets$$upload$$session$$object: JsonSchema = {
   "properties": {
     "manifest": {
       "additionalProperties": {
@@ -4459,7 +3263,7 @@ export const workers_create_assets_upload_session_object: JsonSchema = {
  * The schema of `workers_durable_object_deleted_export`.
  */
 export const workers_durable_object_deleted_export: JsonSchema = {
-  "description": "A `deleted` tombstone: retires the provisioned namespace for this\nclass and all of its data. The class must be absent from the\nuploaded code and no other Worker in the account may bind to the\nnamespace, otherwise the deploy is rejected. No other fields are\nallowed. Deletion is irreversible.\n",
+  "description": "A `deleted` tombstone: retires the provisioned namespace for this\nclass and all of its data. The class must be absent from the\nuploaded code and no other Worker in the account may bind to the\nnamespace, otherwise the deploy is rejected. No other fields are\nallowed. Deletion is irreversible.",
   "properties": {
     "state": {
       "description": "Tombstone that deletes the namespace.",
@@ -4487,10 +3291,10 @@ export const workers_durable_object_deleted_export: JsonSchema = {
  * The schema of `workers_durable_object_expecting_transfer_export`.
  */
 export const workers_durable_object_expecting_transfer_export: JsonSchema = {
-  "description": "The target side of a two-phase transfer (`state:\nexpecting-transfer`). Declares that this script expects to receive\na namespace for this class from the `transfer_from` script. This\nis a live entry, not a tombstone: bindings resolve through the\nsource's namespace until the source commits with a `transferred`\ntombstone. `storage` and `transfer_from` are required; `renamed_to`\nand `transferred_to` are not allowed.\n",
+  "description": "The target side of a two-phase transfer (`state:\nexpecting-transfer`). Declares that this script expects to receive\na namespace for this class from the `transfer_from` script. This\nis a live entry, not a tombstone: bindings resolve through the\nsource's namespace until the source commits with a `transferred`\ntombstone. `storage` and `transfer_from` are required; `renamed_to`\nand `transferred_to` are not allowed.",
   "properties": {
     "container": {
-      "description": "Name of the container (declared in the upload's\n`metadata.containers`) that backs this Durable Object once the\ntransfer settles. Valid only on live entries.\n",
+      "description": "Name of the container (declared in the upload's\n`metadata.containers`) that backs this Durable Object once the\ntransfer settles. Valid only on live entries.",
       "type": "string"
     },
     "state": {
@@ -4501,11 +3305,15 @@ export const workers_durable_object_expecting_transfer_export: JsonSchema = {
       "type": "string"
     },
     "storage": {
-      "$ref": "#/$defs/workers_export_storage",
-      "description": "Durable Object storage backend. `sqlite` is the recommended (and\nonly) backend for new namespaces. `legacy-kv` is accepted only for\na class whose namespace already exists as KV-backed; the `exports`\nflow never provisions a new `legacy-kv` namespace.\n"
+      "description": "Durable Object storage backend. `sqlite` is the recommended (and\nonly) backend for new namespaces. `legacy-kv` is accepted only for\na class whose namespace already exists as KV-backed; the `exports`\nflow never provisions a new `legacy-kv` namespace.",
+      "enum": [
+        "sqlite",
+        "legacy-kv"
+      ],
+      "type": "string"
     },
     "transfer_from": {
-      "description": "The source script name to receive the namespace from. Must be\nin the same account and dispatch-namespace context. Present on\nreads for `expecting-transfer` entries.\n",
+      "description": "The source script name to receive the namespace from. Must be\nin the same account and dispatch-namespace context. Present on\nreads for `expecting-transfer` entries.",
       "type": "string"
     },
     "type": {
@@ -4529,10 +3337,10 @@ export const workers_durable_object_expecting_transfer_export: JsonSchema = {
  * The schema of `workers_durable_object_export`.
  */
 export const workers_durable_object_export: JsonSchema = {
-  "description": "A live Durable Object export (`state: created`, the default). The\nplatform auto-provisions the namespace on first deploy, matches it\non subsequent deploys, and never mutates or deletes it as a side\neffect of a code-only change. `storage` is required; `renamed_to`,\n`transferred_to` and `transfer_from` are not allowed on a live\nentry.\n",
+  "description": "A live Durable Object export (`state: created`, the default). The\nplatform auto-provisions the namespace on first deploy, matches it\non subsequent deploys, and never mutates or deletes it as a side\neffect of a code-only change. `storage` is required; `renamed_to`,\n`transferred_to` and `transfer_from` are not allowed on a live\nentry.",
   "properties": {
     "container": {
-      "description": "Name of the container (declared in the upload's\n`metadata.containers`) that backs this Durable Object. When\nset, the namespace is container-enabled. Valid only on live\nentries.\n",
+      "description": "Name of the container (declared in the upload's\n`metadata.containers`) that backs this Durable Object. When\nset, the namespace is container-enabled. Valid only on live\nentries.",
       "type": "string"
     },
     "state": {
@@ -4544,8 +3352,12 @@ export const workers_durable_object_export: JsonSchema = {
       "type": "string"
     },
     "storage": {
-      "$ref": "#/$defs/workers_export_storage",
-      "description": "Durable Object storage backend. `sqlite` is the recommended (and\nonly) backend for new namespaces. `legacy-kv` is accepted only for\na class whose namespace already exists as KV-backed; the `exports`\nflow never provisions a new `legacy-kv` namespace.\n"
+      "description": "Durable Object storage backend. `sqlite` is the recommended (and\nonly) backend for new namespaces. `legacy-kv` is accepted only for\na class whose namespace already exists as KV-backed; the `exports`\nflow never provisions a new `legacy-kv` namespace.",
+      "enum": [
+        "sqlite",
+        "legacy-kv"
+      ],
+      "type": "string"
     },
     "type": {
       "description": "Marks this entry as a Durable Object export.",
@@ -4566,7 +3378,7 @@ export const workers_durable_object_export: JsonSchema = {
  * The schema of `workers_durable_object_export_variants`.
  */
 export const workers_durable_object_export_variants: JsonSchema = {
-  "description": "Any Durable Object export entry (`type: durable-object`), across\nall lifecycle states. The optional `state` field selects the\nvariant (default `created`); the tombstone states (`deleted`,\n`renamed`, `transferred`) and the live transfer target\n(`expecting-transfer`) are the alternatives. The server validates\nthe exact per-state field combinations; fields not listed for a\nvariant are rejected.\n",
+  "description": "Any Durable Object export entry (`type: durable-object`), across\nall lifecycle states. The optional `state` field selects the\nvariant (default `created`); the tombstone states (`deleted`,\n`renamed`, `transferred`) and the live transfer target\n(`expecting-transfer`) are the alternatives. The server validates\nthe exact per-state field combinations; fields not listed for a\nvariant are rejected.",
   "oneOf": [
     {
       "$ref": "#/$defs/workers_durable_object_export"
@@ -4590,10 +3402,10 @@ export const workers_durable_object_export_variants: JsonSchema = {
  * The schema of `workers_durable_object_renamed_export`.
  */
 export const workers_durable_object_renamed_export: JsonSchema = {
-  "description": "A `renamed` tombstone: rewrites the provisioned namespace's class\nname from this map key to `renamed_to`. The source class may stay\nin code during the rollout window (an info notice is emitted).\n`storage`, `transferred_to` and `transfer_from` are not allowed.\n",
+  "description": "A `renamed` tombstone: rewrites the provisioned namespace's class\nname from this map key to `renamed_to`. The source class may stay\nin code during the rollout window (an info notice is emitted).\n`storage`, `transferred_to` and `transfer_from` are not allowed.",
   "properties": {
     "renamed_to": {
-      "description": "The destination class name. Must differ from the source class\n(the map key) and must be declared as a live (`created`) entry\nin the same `exports` map. Write-only: never present in GET\nresponses.\n",
+      "description": "The destination class name. Must differ from the source class\n(the map key) and must be declared as a live (`created`) entry\nin the same `exports` map. Write-only: never present in GET\nresponses.",
       "type": "string"
     },
     "state": {
@@ -4623,7 +3435,7 @@ export const workers_durable_object_renamed_export: JsonSchema = {
  * The schema of `workers_durable_object_transferred_export`.
  */
 export const workers_durable_object_transferred_export: JsonSchema = {
-  "description": "A `transferred` tombstone (source side of a two-phase transfer):\nhands ownership of the provisioned namespace to another script in\nthe same account, named by `transferred_to`. The target must have\nalready deployed a matching `expecting-transfer` entry. The source\nclass may stay in code during the rollout window (an info notice\nis emitted). `storage`, `renamed_to` and `transfer_from` are not\nallowed.\n",
+  "description": "A `transferred` tombstone (source side of a two-phase transfer):\nhands ownership of the provisioned namespace to another script in\nthe same account, named by `transferred_to`. The target must have\nalready deployed a matching `expecting-transfer` entry. The source\nclass may stay in code during the rollout window (an info notice\nis emitted). `storage`, `renamed_to` and `transfer_from` are not\nallowed.",
   "properties": {
     "state": {
       "description": "Tombstone that transfers the namespace to another script.",
@@ -4633,7 +3445,7 @@ export const workers_durable_object_transferred_export: JsonSchema = {
       "type": "string"
     },
     "transferred_to": {
-      "description": "The destination script name. Must be in the same account and\nthe same dispatch-namespace context (or both non-dispatch).\nCross-dispatch-namespace transfers are rejected. Write-only:\nnever present in GET responses.\n",
+      "description": "The destination script name. Must be in the same account and\nthe same dispatch-namespace context (or both non-dispatch).\nCross-dispatch-namespace transfers are rejected. Write-only:\nnever present in GET responses.",
       "type": "string"
     },
     "type": {
@@ -4656,7 +3468,7 @@ export const workers_durable_object_transferred_export: JsonSchema = {
  * The schema of `workers_entrypoint_cache_options`.
  */
 export const workers_entrypoint_cache_options: JsonSchema = {
-  "description": "CacheW configuration for a single `type: worker` entrypoint.\nWhen present it overrides the Worker's global\n`cache_options.enabled` for that entrypoint, so a Worker can turn\ncaching on globally and opt one entrypoint out, or the reverse.\n",
+  "description": "CacheW configuration for a single `type: worker` entrypoint.\nWhen present it overrides the Worker's global\n`cache_options.enabled` for that entrypoint, so a Worker can turn\ncaching on globally and opt one entrypoint out, or the reverse.",
   "properties": {
     "enabled": {
       "description": "Whether caching is enabled for this entrypoint.",
@@ -4673,7 +3485,7 @@ export const workers_entrypoint_cache_options: JsonSchema = {
  * The schema of `workers_export_config`.
  */
 export const workers_export_config: JsonSchema = {
-  "description": "A single entry in the `exports` map, keyed by export name (a\n`WorkerEntrypoint` class name, a Durable Object class name, or\n`default` for the Worker's default export). The `type`\ndiscriminator selects the top-level shape: `worker` entrypoint\nentries may carry `cache` configuration, while `durable-object`\nentries are further refined by the optional `state` field\n(default `created`). Tombstone states (`deleted`, `renamed`,\n`transferred`) express destructive lifecycle operations\ndeclaratively; `expecting-transfer` is the live target side of a\ntransfer. The server validates the exact per-(type, state) field\ncombinations; fields not listed for a variant are rejected.\n",
+  "description": "A single entry in the `exports` map, keyed by export name (a\n`WorkerEntrypoint` class name, a Durable Object class name, or\n`default` for the Worker's default export). The `type`\ndiscriminator selects the top-level shape: `worker` entrypoint\nentries may carry `cache` configuration, while `durable-object`\nentries are further refined by the optional `state` field\n(default `created`). Tombstone states (`deleted`, `renamed`,\n`transferred`) express destructive lifecycle operations\ndeclaratively; `expecting-transfer` is the live target side of a\ntransfer. The server validates the exact per-(type, state) field\ncombinations; fields not listed for a variant are rejected.",
   "oneOf": [
     {
       "$ref": "#/$defs/workers_worker_export"
@@ -4684,18 +3496,6 @@ export const workers_export_config: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_export_storage`.
- */
-export const workers_export_storage: JsonSchema = {
-  "description": "Durable Object storage backend. `sqlite` is the recommended (and\nonly) backend for new namespaces. `legacy-kv` is accepted only for\na class whose namespace already exists as KV-backed; the `exports`\nflow never provisions a new `legacy-kv` namespace.\n",
-  "enum": [
-    "sqlite",
-    "legacy-kv"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `workers_exports_config_map`.
  */
@@ -4703,7 +3503,7 @@ export const workers_exports_config_map: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/workers_export_config"
   },
-  "description": "Declarative exports for the Worker, keyed by export name. Worker\nentrypoint entries (`type: worker`) carry cache configuration for\nthat entrypoint. Durable Object entries (`type: durable-object`)\nare also configured here and drive namespace reconciliation. At\nmost 100 entries; class names are at most 128 characters.\n",
+  "description": "Declarative exports for the Worker, keyed by export name. Worker\nentrypoint entries (`type: worker`) carry cache configuration for\nthat entrypoint. Durable Object entries (`type: durable-object`)\nare also configured here and drive namespace reconciliation. At\nmost 100 entries; class names are at most 128 characters.",
   "type": "object"
 };
 
@@ -4711,7 +3511,7 @@ export const workers_exports_config_map: JsonSchema = {
  * The schema of `workers_exports_reconciliation_info`.
  */
 export const workers_exports_reconciliation_info: JsonSchema = {
-  "description": "A non-blocking reconciliation info entry. Emitted for stale\ntombstones (a no-op on this deploy) and for tombstones applied\nwith the source class still in code (the supported zero-downtime\nrollout pattern).\n",
+  "description": "A non-blocking reconciliation info entry. Emitted for stale\ntombstones (a no-op on this deploy) and for tombstones applied\nwith the source class still in code (the supported zero-downtime\nrollout pattern).",
   "properties": {
     "class": {
       "description": "The class name the info entry is about.",
@@ -4727,15 +3527,50 @@ export const workers_exports_reconciliation_info: JsonSchema = {
       "type": "string"
     },
     "referencing_scripts": {
-      "description": "Other Workers in the account that still bind to the affected\nclass. Advisory: while non-empty the tombstone is not yet safe\nto remove — redeploy these Workers with bindings re-pointed\nfirst.\n",
+      "description": "Other Workers in the account that still bind to the affected\nclass. Advisory: while non-empty the tombstone is not yet safe\nto remove — redeploy these Workers with bindings re-pointed\nfirst.",
       "items": {
         "type": "string"
       },
       "type": "array"
     },
     "scenario": {
-      "$ref": "#/$defs/workers_exports_reconciliation_scenario",
-      "description": "Stable, machine-readable tag identifying which reconciliation\nscenario produced an error, warning, or info entry. Clients may\nbranch on this value instead of parsing `message`.\n"
+      "description": "Stable, machine-readable tag identifying which reconciliation\nscenario produced an error, warning, or info entry. Clients may\nbranch on this value instead of parsing `message`.",
+      "enum": [
+        "code_class_not_in_exports",
+        "provisioned_class_missing_from_config",
+        "config_export_not_in_code",
+        "config_references_nonexistent_class",
+        "orphaned_provisioned_namespace",
+        "storage_type_mismatch",
+        "free_tier_requires_sqlite",
+        "invalid_export",
+        "tombstone_delete_class_still_in_code",
+        "tombstone_delete_blocked_by_external_bindings",
+        "tombstone_renamed_to_occupied",
+        "transferred_pending_not_found",
+        "transferred_target_missing",
+        "transferred_target_mismatch",
+        "phase_one_transfer_source_missing",
+        "phase_one_transfer_source_namespace_missing",
+        "phase_one_transfer_target_class_provisioned",
+        "phase_one_transfer_after_commit_mismatch",
+        "phase_one_transfer_duplicate",
+        "phase_one_transfer_target_in_dispatch_namespace",
+        "phase_one_transfer_source_in_dispatch_namespace",
+        "transferred_source_in_dispatch_namespace",
+        "transferred_target_in_dispatch_namespace",
+        "container_undeclared_reference",
+        "container_class_not_durable_object",
+        "container_wiring_inconsistent",
+        "container_multiple_durable_objects",
+        "transfer_container_parity_mismatch",
+        "transfer_container_parity_mismatch_on_commit",
+        "tombstone_class_still_in_code",
+        "stale_tombstone",
+        "transfer_receive_already_applied",
+        "transfer_receive_cleanup_complete"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -4772,7 +3607,7 @@ export const workers_exports_reconciliation_rename: JsonSchema = {
  * The schema of `workers_exports_reconciliation_result`.
  */
 export const workers_exports_reconciliation_result: JsonSchema = {
-  "description": "Summary of what the declarative exports reconciliation did on this\nupload. Present only on uploads that included an `exports` block.\nReconciliation acts on Durable Object entries; `type: worker`\nentries in the same map do not participate. Every array is always\npresent (possibly empty) so clients can iterate unconditionally.\nClients should surface `warnings` prominently, render `info` at\nlower visibility, and use `removable_entries` as the \"safe to\ndelete from your config\" hint.\n",
+  "description": "Summary of what the declarative exports reconciliation did on this\nupload. Present only on uploads that included an `exports` block.\nReconciliation acts on Durable Object entries; `type: worker`\nentries in the same map do not participate. Every array is always\npresent (possibly empty) so clients can iterate unconditionally.\nClients should surface `warnings` prominently, render `info` at\nlower visibility, and use `removable_entries` as the \"safe to\ndelete from your config\" hint.",
   "properties": {
     "created": {
       "description": "Class names for which a new namespace was provisioned.",
@@ -4789,14 +3624,14 @@ export const workers_exports_reconciliation_result: JsonSchema = {
       "type": "array"
     },
     "info": {
-      "description": "Non-blocking info entries (stale tombstones, tombstone applied\nwith class still in code). See `exports_reconciliation_info`.\n",
+      "description": "Non-blocking info entries (stale tombstones, tombstone applied\nwith class still in code). See `exports_reconciliation_info`.",
       "items": {
         "$ref": "#/$defs/workers_exports_reconciliation_info"
       },
       "type": "array"
     },
     "removable_entries": {
-      "description": "Source class names whose tombstone entry is now stale and safe\nto delete from `exports` (no remaining referencing scripts).\n",
+      "description": "Source class names whose tombstone entry is now stale and safe\nto delete from `exports` (no remaining referencing scripts).",
       "items": {
         "type": "string"
       },
@@ -4852,49 +3687,6 @@ export const workers_exports_reconciliation_result: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_exports_reconciliation_scenario`.
- */
-export const workers_exports_reconciliation_scenario: JsonSchema = {
-  "description": "Stable, machine-readable tag identifying which reconciliation\nscenario produced an error, warning, or info entry. Clients may\nbranch on this value instead of parsing `message`.\n",
-  "enum": [
-    "code_class_not_in_exports",
-    "provisioned_class_missing_from_config",
-    "config_export_not_in_code",
-    "config_references_nonexistent_class",
-    "orphaned_provisioned_namespace",
-    "storage_type_mismatch",
-    "free_tier_requires_sqlite",
-    "invalid_export",
-    "tombstone_delete_class_still_in_code",
-    "tombstone_delete_blocked_by_external_bindings",
-    "tombstone_renamed_to_occupied",
-    "transferred_pending_not_found",
-    "transferred_target_missing",
-    "transferred_target_mismatch",
-    "phase_one_transfer_source_missing",
-    "phase_one_transfer_source_namespace_missing",
-    "phase_one_transfer_target_class_provisioned",
-    "phase_one_transfer_after_commit_mismatch",
-    "phase_one_transfer_duplicate",
-    "phase_one_transfer_target_in_dispatch_namespace",
-    "phase_one_transfer_source_in_dispatch_namespace",
-    "transferred_source_in_dispatch_namespace",
-    "transferred_target_in_dispatch_namespace",
-    "container_undeclared_reference",
-    "container_class_not_durable_object",
-    "container_wiring_inconsistent",
-    "container_multiple_durable_objects",
-    "transfer_container_parity_mismatch",
-    "transfer_container_parity_mismatch_on_commit",
-    "tombstone_class_still_in_code",
-    "stale_tombstone",
-    "transfer_receive_already_applied",
-    "transfer_receive_cleanup_complete"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `workers_exports_reconciliation_transfer`.
  */
@@ -4929,7 +3721,7 @@ export const workers_exports_reconciliation_transfer: JsonSchema = {
  * The schema of `workers_exports_reconciliation_transfer_pending`.
  */
 export const workers_exports_reconciliation_transfer_pending: JsonSchema = {
-  "description": "A single phase-1 transfer hint recorded on the target side (a live\n`expecting-transfer` entry).\n",
+  "description": "A single phase-1 transfer hint recorded on the target side (a live\n`expecting-transfer` entry).",
   "properties": {
     "class": {
       "description": "The target-side class name awaiting transfer.",
@@ -4951,7 +3743,7 @@ export const workers_exports_reconciliation_transfer_pending: JsonSchema = {
  * The schema of `workers_exports_reconciliation_warning`.
  */
 export const workers_exports_reconciliation_warning: JsonSchema = {
-  "description": "A non-blocking reconciliation warning. Reserved: no scenario\npopulates this array today (`code_class_not_in_exports` is\nsurfaced as info and `provisioned_class_missing_from_config` is a\nhard error). Clients should still surface any entries that appear.\n",
+  "description": "A non-blocking reconciliation warning. Reserved: no scenario\npopulates this array today (`code_class_not_in_exports` is\nsurfaced as info and `provisioned_class_missing_from_config` is a\nhard error). Clients should still surface any entries that appear.",
   "properties": {
     "class": {
       "description": "The class name the warning is about.",
@@ -4967,8 +3759,43 @@ export const workers_exports_reconciliation_warning: JsonSchema = {
       "type": "string"
     },
     "scenario": {
-      "$ref": "#/$defs/workers_exports_reconciliation_scenario",
-      "description": "Stable, machine-readable tag identifying which reconciliation\nscenario produced an error, warning, or info entry. Clients may\nbranch on this value instead of parsing `message`.\n"
+      "description": "Stable, machine-readable tag identifying which reconciliation\nscenario produced an error, warning, or info entry. Clients may\nbranch on this value instead of parsing `message`.",
+      "enum": [
+        "code_class_not_in_exports",
+        "provisioned_class_missing_from_config",
+        "config_export_not_in_code",
+        "config_references_nonexistent_class",
+        "orphaned_provisioned_namespace",
+        "storage_type_mismatch",
+        "free_tier_requires_sqlite",
+        "invalid_export",
+        "tombstone_delete_class_still_in_code",
+        "tombstone_delete_blocked_by_external_bindings",
+        "tombstone_renamed_to_occupied",
+        "transferred_pending_not_found",
+        "transferred_target_missing",
+        "transferred_target_mismatch",
+        "phase_one_transfer_source_missing",
+        "phase_one_transfer_source_namespace_missing",
+        "phase_one_transfer_target_class_provisioned",
+        "phase_one_transfer_after_commit_mismatch",
+        "phase_one_transfer_duplicate",
+        "phase_one_transfer_target_in_dispatch_namespace",
+        "phase_one_transfer_source_in_dispatch_namespace",
+        "transferred_source_in_dispatch_namespace",
+        "transferred_target_in_dispatch_namespace",
+        "container_undeclared_reference",
+        "container_class_not_durable_object",
+        "container_wiring_inconsistent",
+        "container_multiple_durable_objects",
+        "transfer_container_parity_mismatch",
+        "transfer_container_parity_mismatch_on_commit",
+        "tombstone_class_still_in_code",
+        "stale_tombstone",
+        "transfer_receive_already_applied",
+        "transfer_receive_cleanup_complete"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -4979,14 +3806,6 @@ export const workers_exports_reconciliation_warning: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_identifier`.
- */
-export const workers_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `workers_limits`.
  */
@@ -5005,18 +3824,10 @@ export const workers_limits: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_logpush`.
- */
-export const workers_logpush: JsonSchema = {
-  "description": "Whether Logpush is turned on for the Worker.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `workers_manifest-value`.
  */
-export const workers_manifest_value: JsonSchema = {
+export const workers_manifest$$value: JsonSchema = {
   "properties": {
     "hash": {
       "description": "The hash of the file.",
@@ -5137,18 +3948,10 @@ export const workers_multiple_step_migrations: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_namespace_identifier`.
- */
-export const workers_namespace_identifier: JsonSchema = {
-  "description": "Namespace identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `workers_observability-2`.
  */
-export const workers_observability_2: JsonSchema = {
+export const workers_observability$$2: JsonSchema = {
   "description": "Observability settings for the Worker.",
   "properties": {
     "enabled": {
@@ -5488,14 +4291,6 @@ export const workers_placement_target: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `workers_script_name`.
- */
-export const workers_script_name: JsonSchema = {
-  "description": "Name of the script.",
-  "type": "string"
-};
-
 /**
  * The schema of `workers_secret`.
  */
@@ -5514,8 +4309,8 @@ export const workers_secret: JsonSchema = {
 /**
  * The schema of `workers_secret-patch-request`.
  */
-export const workers_secret_patch_request: JsonSchema = {
-  "description": "JSON Merge Patch (RFC 7396) request body for bulk secret changes.\n",
+export const workers_secret$$patch$$request: JsonSchema = {
+  "description": "JSON Merge Patch (RFC 7396) request body for bulk secret changes.",
   "properties": {
     "secrets": {
       "additionalProperties": {
@@ -5528,7 +4323,7 @@ export const workers_secret_patch_request: JsonSchema = {
           }
         ]
       },
-      "description": "Map of secret names to secret values:\n- Set to a secret object to create or update.\n- Set to `null` to delete.\n- Omit to leave unchanged.\n",
+      "description": "Map of secret names to secret values:\n- Set to a secret object to create or update.\n- Set to `null` to delete.\n- Omit to leave unchanged.",
       "type": "object"
     },
     "version_tags": {
@@ -5539,22 +4334,6 @@ export const workers_secret_patch_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_secret_name`.
- */
-export const workers_secret_name: JsonSchema = {
-  "description": "A JavaScript variable name for the secret binding.",
-  "type": "string"
-};
-
-/**
- * The schema of `workers_secret_name_url_encoded`.
- */
-export const workers_secret_name_url_encoded: JsonSchema = {
-  "description": "Flag that indicates whether the secret name is URL encoded.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `workers_single_step_migrations`.
  */
@@ -5570,13 +4349,6 @@ export const workers_single_step_migrations: JsonSchema = {
   "description": "A single set of migrations to apply."
 };
 
-/**
- * The schema of `workers_tag`.
- */
-export const workers_tag: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_tags`.
  */
@@ -5585,7 +4357,7 @@ export const workers_tags: JsonSchema = {
   "oneOf": [
     {
       "items": {
-        "$ref": "#/$defs/workers_tag"
+        "type": "string"
       },
       "maxItems": 10,
       "type": "array"
@@ -5621,28 +4393,15 @@ export const workers_tail_consumers_script: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `workers_usage_model`.
- */
-export const workers_usage_model: JsonSchema = {
-  "description": "Usage model for the Worker invocations.",
-  "enum": [
-    "standard",
-    "bundled",
-    "unbound"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `workers_worker_export`.
  */
 export const workers_worker_export: JsonSchema = {
-  "description": "A named Worker entrypoint export (`type: worker`). Worker\nentrypoints are always live (`state: created`) and carry no\nstorage or lifecycle fields. The optional `cache` block overrides\nthe Worker's global `cache_options.enabled` for this entrypoint.\n",
+  "description": "A named Worker entrypoint export (`type: worker`). Worker\nentrypoints are always live (`state: created`) and carry no\nstorage or lifecycle fields. The optional `cache` block overrides\nthe Worker's global `cache_options.enabled` for this entrypoint.",
   "properties": {
     "cache": {
       "$ref": "#/$defs/workers_entrypoint_cache_options",
-      "description": "Cache override for this entrypoint. Overrides the Worker's\nglobal `cache_options.enabled` for this entrypoint only.\n"
+      "description": "Cache override for this entrypoint. Overrides the Worker's\nglobal `cache_options.enabled` for this entrypoint only."
     },
     "state": {
       "default": "created",
@@ -5665,11 +4424,3 @@ export const workers_worker_export: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `zones_identifier-2`.
- */
-export const zones_identifier_2: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/scim/groups/outputs.ts b/src/generated/forge-mcp/scim/groups/outputs.ts
index dd981d9b0..79552e817 100644
--- a/src/generated/forge-mcp/scim/groups/outputs.ts
+++ b/src/generated/forge-mcp/scim/groups/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_scim_group` in responses.
  */
-export const iam_scim_group_output: JsonSchema = {
+export const iam_scim_group: JsonSchema = {
   "properties": {
     "displayName": {
       "type": "string"
@@ -52,7 +52,7 @@ export const iam_scim_group_output: JsonSchema = {
 /**
  * The schema of `iam_scim_group_list_response` in responses.
  */
-export const iam_scim_group_list_response_output: JsonSchema = {
+export const iam_scim_group_list_response: JsonSchema = {
   "properties": {
     "Resources": {
       "items": {
@@ -87,7 +87,7 @@ export const iam_scim_group_list_response_output: JsonSchema = {
 /**
  * The schema of `iam_scim_group_meta` in responses.
  */
-export const iam_scim_group_meta_output: JsonSchema = {
+export const iam_scim_group_meta: JsonSchema = {
   "properties": {
     "resourceType": {
       "type": "string"
@@ -99,7 +99,7 @@ export const iam_scim_group_meta_output: JsonSchema = {
 /**
  * The schema of `iam_scim_group_summary` in responses.
  */
-export const iam_scim_group_summary_output: JsonSchema = {
+export const iam_scim_group_summary: JsonSchema = {
   "properties": {
     "displayName": {
       "type": "string"
diff --git a/src/generated/forge-mcp/scim/groups/schemas.ts b/src/generated/forge-mcp/scim/groups/schemas.ts
index 82e0c13c1..bb53edbea 100644
--- a/src/generated/forge-mcp/scim/groups/schemas.ts
+++ b/src/generated/forge-mcp/scim/groups/schemas.ts
@@ -7,10 +7,10 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `iam_scim_group_create_request`.
  */
 export const iam_scim_group_create_request: JsonSchema = {
-  "description": "Request body for creating a SCIM Group. The `displayName` must not be empty and must not begin with `CF` (reserved for system groups).\n",
+  "description": "Request body for creating a SCIM Group. The `displayName` must not be empty and must not begin with `CF` (reserved for system groups).",
   "properties": {
     "displayName": {
-      "description": "A human-readable name for the Group. REQUIRED. Must not start with `CF` (reserved prefix for Cloudflare-managed virtual groups).\n",
+      "description": "A human-readable name for the Group. REQUIRED. Must not start with `CF` (reserved prefix for Cloudflare-managed virtual groups).",
       "type": "string"
     },
     "externalId": {
@@ -24,14 +24,6 @@ export const iam_scim_group_create_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_scim_group_identifier`.
- */
-export const iam_scim_group_identifier: JsonSchema = {
-  "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.\n",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_scim_group_patch_member_value`.
  */
@@ -50,7 +42,7 @@ export const iam_scim_group_patch_member_value: JsonSchema = {
  * The schema of `iam_scim_group_patch_op_request`.
  */
 export const iam_scim_group_patch_op_request: JsonSchema = {
-  "description": "Request body for a SCIM PATCH operation on a Group resource (RFC 7644 Section 3.5.2).\n",
+  "description": "Request body for a SCIM PATCH operation on a Group resource (RFC 7644 Section 3.5.2).",
   "properties": {
     "Operations": {
       "description": "List of PATCH operations to apply.",
@@ -77,7 +69,7 @@ export const iam_scim_group_patch_op_request: JsonSchema = {
  * The schema of `iam_scim_group_patch_operation`.
  */
 export const iam_scim_group_patch_operation: JsonSchema = {
-  "description": "A single PATCH operation for a Group resource. Supports `add`, `remove`, and `replace` on `members`, `displayName`, and `externalId`.\n",
+  "description": "A single PATCH operation for a Group resource. Supports `add`, `remove`, and `replace` on `members`, `displayName`, and `externalId`.",
   "properties": {
     "op": {
       "description": "The operation to perform.",
@@ -89,11 +81,11 @@ export const iam_scim_group_patch_operation: JsonSchema = {
       "type": "string"
     },
     "path": {
-      "description": "Attribute path targeted by this operation. Use `members` to modify group membership. May also include a filter expression to target specific members, e.g. `members[value eq \"userTag\"]`.\n",
+      "description": "Attribute path targeted by this operation. Use `members` to modify group membership. May also include a filter expression to target specific members, e.g. `members[value eq \"userTag\"]`.",
       "type": "string"
     },
     "value": {
-      "description": "The value(s) for the operation. For member add/replace operations, an array of member value objects. For `displayName` or `externalId` updates, a string value.\n",
+      "description": "The value(s) for the operation. For member add/replace operations, an array of member value objects. For `displayName` or `externalId` updates, a string value.",
       "oneOf": [
         {
           "items": {
@@ -124,11 +116,11 @@ export const iam_scim_group_replace_request: JsonSchema = {
       "type": "string"
     },
     "externalId": {
-      "description": "Identifier for the Group as defined by the provisioning client (IdP). Omission clears the existing value.\n",
+      "description": "Identifier for the Group as defined by the provisioning client (IdP). Omission clears the existing value.",
       "type": "string"
     },
     "members": {
-      "description": "The complete replacement member set. Omission is treated as an empty list.\n",
+      "description": "The complete replacement member set. Omission is treated as an empty list.",
       "items": {
         "$ref": "#/$defs/iam_scim_group_patch_member_value"
       },
diff --git a/src/generated/forge-mcp/scim/groups/tools.ts b/src/generated/forge-mcp/scim/groups/tools.ts
index d5d39659b..8b0356c26 100644
--- a/src/generated/forge-mcp/scim/groups/tools.ts
+++ b/src/generated/forge-mcp/scim/groups/tools.ts
@@ -1,21 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
+import { iam_scim_error_response } from "../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import { iam_scim_error_response_output } from "../outputs.js";
-import {
-  iam_scim_group_list_response_output,
-  iam_scim_group_meta_output,
-  iam_scim_group_output,
-  iam_scim_group_summary_output,
+  iam_scim_group,
+  iam_scim_group_list_response,
+  iam_scim_group_meta,
+  iam_scim_group_summary,
 } from "./outputs.js";
 import {
   iam_scim_group_create_request,
-  iam_scim_group_identifier,
   iam_scim_group_patch_member_value,
   iam_scim_group_patch_op_request,
   iam_scim_group_patch_operation,
@@ -29,33 +24,41 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_groups_create",
     title: "Create SCIM Group",
-    description: "Creates a new SCIM Group (user group) for the account. The `displayName` must not be empty and must not begin with `CF` (reserved for system groups).",
+    description: "Creates a new SCIM Group (user group) for the account. The `displayName` must not be empty and must not begin with `CF` (reserved for system groups).\n\nPOST /accounts/{account_id}/scim/v2/Groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_scim_group_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
         "iam_scim_group_create_request": iam_scim_group_create_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_group",
       $defs: {
-        "iam_scim_group": iam_scim_group_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
+        "iam_scim_group": iam_scim_group,
+        "iam_scim_group_meta": iam_scim_group_meta,
       },
     },
     annotations: {
@@ -94,9 +97,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_group": iam_scim_group_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_group": iam_scim_group,
+        "iam_scim_group_meta": iam_scim_group_meta,
       },
     },
     request: (args) => ({
@@ -107,28 +110,33 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_groups_delete",
     title: "Delete SCIM Group",
-    description: "Deletes a SCIM Group (custom user groups only). System groups backed by Cloudflare permission groups cannot be deleted via SCIM. Returns 204 No Content on success.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Deletes a SCIM Group (custom user groups only). System groups backed by Cloudflare permission groups cannot be deleted via SCIM. Returns 204 No Content on success.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /accounts/{account_id}/scim/v2/Groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "group_id": {
-          "$ref": "#/$defs/iam_scim_group_identifier",
-          "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_scim_group_identifier": iam_scim_group_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -164,7 +172,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
+        "iam_scim_error_response": iam_scim_error_response,
       },
     },
     request: (args) => ({
@@ -174,31 +182,38 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_groups_edit",
     title: "Patch SCIM Group",
-    description: "Partially updates a SCIM Group via PATCH operations (RFC 7644 Section 3.5.2). Supports add, remove, and replace operations on `members`, `displayName`, and `externalId`. For system groups (prefixed `cloudflare-v1-`), only member management operations are supported.",
+    description: "Partially updates a SCIM Group via PATCH operations (RFC 7644 Section 3.5.2). Supports add, remove, and replace operations on `members`, `displayName`, and `externalId`. For system groups (prefixed `cloudflare-v1-`), only member management operations are supported.\n\nPATCH /accounts/{account_id}/scim/v2/Groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_scim_group_patch_op_request"
         },
-        "group_id": {
-          "$ref": "#/$defs/iam_scim_group_identifier",
-          "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_scim_group_identifier": iam_scim_group_identifier,
         "iam_scim_group_patch_member_value": iam_scim_group_patch_member_value,
         "iam_scim_group_patch_op_request": iam_scim_group_patch_op_request,
         "iam_scim_group_patch_operation": iam_scim_group_patch_operation,
@@ -207,8 +222,8 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/iam_scim_group",
       $defs: {
-        "iam_scim_group": iam_scim_group_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
+        "iam_scim_group": iam_scim_group,
+        "iam_scim_group_meta": iam_scim_group_meta,
       },
     },
     annotations: {
@@ -247,9 +262,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_group": iam_scim_group_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_group": iam_scim_group,
+        "iam_scim_group_meta": iam_scim_group_meta,
       },
     },
     request: (args) => ({
@@ -260,34 +275,39 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_groups_get",
     title: "Get SCIM Group",
-    description: "Retrieves a single SCIM Group resource by group ID.",
+    description: "Retrieves a single SCIM Group resource by group ID.\n\nGET /accounts/{account_id}/scim/v2/Groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "group_id": {
-          "$ref": "#/$defs/iam_scim_group_identifier",
-          "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_scim_group_identifier": iam_scim_group_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_group",
       $defs: {
-        "iam_scim_group": iam_scim_group_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
+        "iam_scim_group": iam_scim_group,
+        "iam_scim_group_meta": iam_scim_group_meta,
       },
     },
     annotations: {
@@ -327,9 +347,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_group": iam_scim_group_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_group": iam_scim_group,
+        "iam_scim_group_meta": iam_scim_group_meta,
       },
     },
     request: (args) => ({
@@ -339,42 +359,54 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_groups_list",
     title: "List SCIM Groups",
-    description: "Lists SCIM Group resources for the account. Returns both system groups (backed by Cloudflare permission groups, prefixed `cloudflare-v1-`) and custom user groups. Supports filtering by `displayName` using SCIM filter syntax.",
+    description: "Lists SCIM Group resources for the account. Returns both system groups (backed by Cloudflare permission groups, prefixed `cloudflare-v1-`) and custom user groups. Supports filtering by `displayName` using SCIM filter syntax.\n\nGET /accounts/{account_id}/scim/v2/Groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "count": {
-          "description": "Specifies the desired maximum number of query results per page.\n",
-          "type": "integer"
-        },
-        "filter": {
-          "description": "SCIM filter expression (RFC 7644 Section 3.4.2.2). Only `displayName eq \"value\"` is supported.\n",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "start_index": {
-          "default": 1,
-          "description": "The 1-based index of the first result in the current set of list results. Values less than 1 are treated as 1.\n",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "count": {
+              "description": "Specifies the desired maximum number of query results per page.",
+              "type": "integer"
+            },
+            "filter": {
+              "description": "SCIM filter expression (RFC 7644 Section 3.4.2.2). Only `displayName eq \"value\"` is supported.",
+              "type": "string"
+            },
+            "startIndex": {
+              "default": 1,
+              "description": "The 1-based index of the first result in the current set of list results. Values less than 1 are treated as 1.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_group_list_response",
       $defs: {
-        "iam_scim_group_list_response": iam_scim_group_list_response_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
-        "iam_scim_group_summary": iam_scim_group_summary_output,
+        "iam_scim_group_list_response": iam_scim_group_list_response,
+        "iam_scim_group_meta": iam_scim_group_meta,
+        "iam_scim_group_summary": iam_scim_group_summary,
       },
     },
     annotations: {
@@ -414,49 +446,56 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_group_list_response": iam_scim_group_list_response_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
-        "iam_scim_group_summary": iam_scim_group_summary_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_group_list_response": iam_scim_group_list_response,
+        "iam_scim_group_meta": iam_scim_group_meta,
+        "iam_scim_group_summary": iam_scim_group_summary,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/scim/v2/Groups`,
       query: [
-        ["startIndex", args["start_index"], true],
-        ["count", args["count"], true],
-        ["filter", args["filter"], true],
+        ["startIndex", param(args, "query", "startIndex"), true],
+        ["count", param(args, "query", "count"), true],
+        ["filter", param(args, "query", "filter"), true],
       ],
     }),
   },
   {
     name: "scim_groups_update",
     title: "Replace SCIM Group",
-    description: "Replaces the mutable attributes of a SCIM Group (RFC 7644 Section 3.5.1), including its complete member set. Omitting `externalId` clears it, and omitting `members` replaces the member set with an empty list. For system groups (prefixed `cloudflare-v1-`), only the member set is replaced.",
+    description: "Replaces the mutable attributes of a SCIM Group (RFC 7644 Section 3.5.1), including its complete member set. Omitting `externalId` clears it, and omitting `members` replaces the member set with an empty list. For system groups (prefixed `cloudflare-v1-`), only the member set is replaced.\n\nPUT /accounts/{account_id}/scim/v2/Groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_scim_group_replace_request"
         },
-        "group_id": {
-          "$ref": "#/$defs/iam_scim_group_identifier",
-          "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.\n"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "The group identifier for a SCIM Group resource. For system groups this is prefixed `cloudflare-v1-<permissionGroupTag>`; for custom user groups this is a UUID-style tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_scim_group_identifier": iam_scim_group_identifier,
         "iam_scim_group_patch_member_value": iam_scim_group_patch_member_value,
         "iam_scim_group_replace_request": iam_scim_group_replace_request,
       },
@@ -464,8 +503,8 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/iam_scim_group",
       $defs: {
-        "iam_scim_group": iam_scim_group_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
+        "iam_scim_group": iam_scim_group,
+        "iam_scim_group_meta": iam_scim_group_meta,
       },
     },
     annotations: {
@@ -504,9 +543,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_group": iam_scim_group_output,
-        "iam_scim_group_meta": iam_scim_group_meta_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_group": iam_scim_group,
+        "iam_scim_group_meta": iam_scim_group_meta,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/scim/outputs.ts b/src/generated/forge-mcp/scim/outputs.ts
index ec208f899..8b68131ff 100644
--- a/src/generated/forge-mcp/scim/outputs.ts
+++ b/src/generated/forge-mcp/scim/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `iam_scim_error_response` in responses.
  */
-export const iam_scim_error_response_output: JsonSchema = {
+export const iam_scim_error_response: JsonSchema = {
   "properties": {
     "detail": {
       "type": "string"
diff --git a/src/generated/forge-mcp/scim/resourceTypes/outputs.ts b/src/generated/forge-mcp/scim/resourceTypes/outputs.ts
index c95c12aa9..d1474956f 100644
--- a/src/generated/forge-mcp/scim/resourceTypes/outputs.ts
+++ b/src/generated/forge-mcp/scim/resourceTypes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_scim_resource_type` in responses.
  */
-export const iam_scim_resource_type_output: JsonSchema = {
+export const iam_scim_resource_type: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -52,7 +52,7 @@ export const iam_scim_resource_type_output: JsonSchema = {
 /**
  * The schema of `iam_scim_resource_type_list_response` in responses.
  */
-export const iam_scim_resource_type_list_response_output: JsonSchema = {
+export const iam_scim_resource_type_list_response: JsonSchema = {
   "properties": {
     "Resources": {
       "items": {
@@ -87,7 +87,7 @@ export const iam_scim_resource_type_list_response_output: JsonSchema = {
 /**
  * The schema of `iam_scim_resource_type_meta` in responses.
  */
-export const iam_scim_resource_type_meta_output: JsonSchema = {
+export const iam_scim_resource_type_meta: JsonSchema = {
   "properties": {
     "location": {
       "type": "string"
@@ -102,7 +102,7 @@ export const iam_scim_resource_type_meta_output: JsonSchema = {
 /**
  * The schema of `iam_scim_schema_extension` in responses.
  */
-export const iam_scim_schema_extension_output: JsonSchema = {
+export const iam_scim_schema_extension: JsonSchema = {
   "properties": {
     "required": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/scim/resourceTypes/tools.ts b/src/generated/forge-mcp/scim/resourceTypes/tools.ts
index e8bf3759e..948c31c44 100644
--- a/src/generated/forge-mcp/scim/resourceTypes/tools.ts
+++ b/src/generated/forge-mcp/scim/resourceTypes/tools.ts
@@ -2,57 +2,59 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
+import { iam_scim_error_response } from "../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import { iam_scim_error_response_output } from "../outputs.js";
-import {
-  iam_scim_resource_type_list_response_output,
-  iam_scim_resource_type_meta_output,
-  iam_scim_resource_type_output,
-  iam_scim_schema_extension_output,
+  iam_scim_resource_type,
+  iam_scim_resource_type_list_response,
+  iam_scim_resource_type_meta,
+  iam_scim_schema_extension,
 } from "./outputs.js";
 
 /**
- * The tools of `scim.resource_types`.
+ * The tools of `scim.resourceTypes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "scim_resource_types_get",
+    name: "scim_resourceTypes_get",
     title: "Get SCIM Resource Type",
-    description: "Returns a single SCIM resource type by ID (RFC 7643 Section 6). Valid IDs are `User` and `Group`.",
+    description: "Returns a single SCIM resource type by ID (RFC 7643 Section 6). Valid IDs are `User` and `Group`.\n\nGET /accounts/{account_id}/scim/v2/ResourceTypes/{resource_type_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "resource_type_id": {
-          "description": "The resource type identifier.",
-          "enum": [
-            "User",
-            "Group"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "resource_type_id": {
+              "description": "The resource type identifier.",
+              "enum": [
+                "User",
+                "Group"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "resource_type_id"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "resource_type_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_resource_type",
       $defs: {
-        "iam_scim_resource_type": iam_scim_resource_type_output,
-        "iam_scim_resource_type_meta": iam_scim_resource_type_meta_output,
-        "iam_scim_schema_extension": iam_scim_schema_extension_output,
+        "iam_scim_resource_type": iam_scim_resource_type,
+        "iam_scim_resource_type_meta": iam_scim_resource_type_meta,
+        "iam_scim_schema_extension": iam_scim_schema_extension,
       },
     },
     annotations: {
@@ -92,10 +94,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_resource_type": iam_scim_resource_type_output,
-        "iam_scim_resource_type_meta": iam_scim_resource_type_meta_output,
-        "iam_scim_schema_extension": iam_scim_schema_extension_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_resource_type": iam_scim_resource_type,
+        "iam_scim_resource_type_meta": iam_scim_resource_type_meta,
+        "iam_scim_schema_extension": iam_scim_schema_extension,
       },
     },
     request: (args) => ({
@@ -103,32 +105,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "scim_resource_types_list",
+    name: "scim_resourceTypes_list",
     title: "List SCIM Resource Types",
-    description: "Returns the list of SCIM resource types supported by the Cloudflare SCIM service (RFC 7643 Section 6, RFC 7644 Section 4). Clients use this to discover available resource categories (e.g. Users, Groups) and their associated schemas. Query parameters are not supported on this endpoint.",
+    description: "Returns the list of SCIM resource types supported by the Cloudflare SCIM service (RFC 7643 Section 6, RFC 7644 Section 4). Clients use this to discover available resource categories (e.g. Users, Groups) and their associated schemas. Query parameters are not supported on this endpoint.\n\nGET /accounts/{account_id}/scim/v2/ResourceTypes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_resource_type_list_response",
       $defs: {
-        "iam_scim_resource_type": iam_scim_resource_type_output,
-        "iam_scim_resource_type_list_response": iam_scim_resource_type_list_response_output,
-        "iam_scim_resource_type_meta": iam_scim_resource_type_meta_output,
-        "iam_scim_schema_extension": iam_scim_schema_extension_output,
+        "iam_scim_resource_type": iam_scim_resource_type,
+        "iam_scim_resource_type_list_response": iam_scim_resource_type_list_response,
+        "iam_scim_resource_type_meta": iam_scim_resource_type_meta,
+        "iam_scim_schema_extension": iam_scim_schema_extension,
       },
     },
     annotations: {
@@ -168,11 +176,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_resource_type": iam_scim_resource_type_output,
-        "iam_scim_resource_type_list_response": iam_scim_resource_type_list_response_output,
-        "iam_scim_resource_type_meta": iam_scim_resource_type_meta_output,
-        "iam_scim_schema_extension": iam_scim_schema_extension_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_resource_type": iam_scim_resource_type,
+        "iam_scim_resource_type_list_response": iam_scim_resource_type_list_response,
+        "iam_scim_resource_type_meta": iam_scim_resource_type_meta,
+        "iam_scim_schema_extension": iam_scim_schema_extension,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/scim/schemas/outputs.ts b/src/generated/forge-mcp/scim/schemas/outputs.ts
index 775dd99d4..5a5ade831 100644
--- a/src/generated/forge-mcp/scim/schemas/outputs.ts
+++ b/src/generated/forge-mcp/scim/schemas/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_scim_schema` in responses.
  */
-export const iam_scim_schema_output: JsonSchema = {
+export const iam_scim_schema: JsonSchema = {
   "properties": {
     "attributes": {
       "items": {
@@ -45,7 +45,7 @@ export const iam_scim_schema_output: JsonSchema = {
 /**
  * The schema of `iam_scim_schema_attr` in responses.
  */
-export const iam_scim_schema_attr_output: JsonSchema = {
+export const iam_scim_schema_attr: JsonSchema = {
   "properties": {
     "canonicalValues": {
       "items": {
@@ -136,7 +136,7 @@ export const iam_scim_schema_attr_output: JsonSchema = {
 /**
  * The schema of `iam_scim_schema_list_response` in responses.
  */
-export const iam_scim_schema_list_response_output: JsonSchema = {
+export const iam_scim_schema_list_response: JsonSchema = {
   "properties": {
     "Resources": {
       "items": {
@@ -171,7 +171,7 @@ export const iam_scim_schema_list_response_output: JsonSchema = {
 /**
  * The schema of `iam_scim_schema_meta` in responses.
  */
-export const iam_scim_schema_meta_output: JsonSchema = {
+export const iam_scim_schema_meta: JsonSchema = {
   "properties": {
     "location": {
       "type": "string"
diff --git a/src/generated/forge-mcp/scim/schemas/tools.ts b/src/generated/forge-mcp/scim/schemas/tools.ts
index 0f4354202..45f29a66d 100644
--- a/src/generated/forge-mcp/scim/schemas/tools.ts
+++ b/src/generated/forge-mcp/scim/schemas/tools.ts
@@ -2,16 +2,12 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
+import { iam_scim_error_response } from "../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import { iam_scim_error_response_output } from "../outputs.js";
-import {
-  iam_scim_schema_attr_output,
-  iam_scim_schema_list_response_output,
-  iam_scim_schema_meta_output,
-  iam_scim_schema_output,
+  iam_scim_schema,
+  iam_scim_schema_attr,
+  iam_scim_schema_list_response,
+  iam_scim_schema_meta,
 } from "./outputs.js";
 
 /**
@@ -21,34 +17,40 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_schemas_get",
     title: "Get SCIM Schema",
-    description: "Returns a single SCIM schema definition by schema URI ID (RFC 7643 Section 7). Valid IDs are `urn:ietf:params:scim:schemas:core:2.0:User` and `urn:ietf:params:scim:schemas:core:2.0:Group`.",
+    description: "Returns a single SCIM schema definition by schema URI ID (RFC 7643 Section 7). Valid IDs are `urn:ietf:params:scim:schemas:core:2.0:User` and `urn:ietf:params:scim:schemas:core:2.0:Group`.\n\nGET /accounts/{account_id}/scim/v2/Schemas/{schema_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "schema_id": {
-          "description": "The schema URI identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "schema_id": {
+              "description": "The schema URI identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "schema_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "schema_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_schema",
       $defs: {
-        "iam_scim_schema": iam_scim_schema_output,
-        "iam_scim_schema_attr": iam_scim_schema_attr_output,
-        "iam_scim_schema_meta": iam_scim_schema_meta_output,
+        "iam_scim_schema": iam_scim_schema,
+        "iam_scim_schema_attr": iam_scim_schema_attr,
+        "iam_scim_schema_meta": iam_scim_schema_meta,
       },
     },
     annotations: {
@@ -88,10 +90,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_schema": iam_scim_schema_output,
-        "iam_scim_schema_attr": iam_scim_schema_attr_output,
-        "iam_scim_schema_meta": iam_scim_schema_meta_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_schema": iam_scim_schema,
+        "iam_scim_schema_attr": iam_scim_schema_attr,
+        "iam_scim_schema_meta": iam_scim_schema_meta,
       },
     },
     request: (args) => ({
@@ -101,30 +103,36 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_schemas_list",
     title: "List SCIM Schemas",
-    description: "Returns the list of SCIM schemas supported by the Cloudflare SCIM service (RFC 7643 Section 7, RFC 7644 Section 4). Clients use this to introspect the attributes of each resource type. Query parameters are not supported on this endpoint.",
+    description: "Returns the list of SCIM schemas supported by the Cloudflare SCIM service (RFC 7643 Section 7, RFC 7644 Section 4). Clients use this to introspect the attributes of each resource type. Query parameters are not supported on this endpoint.\n\nGET /accounts/{account_id}/scim/v2/Schemas",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_schema_list_response",
       $defs: {
-        "iam_scim_schema": iam_scim_schema_output,
-        "iam_scim_schema_attr": iam_scim_schema_attr_output,
-        "iam_scim_schema_list_response": iam_scim_schema_list_response_output,
-        "iam_scim_schema_meta": iam_scim_schema_meta_output,
+        "iam_scim_schema": iam_scim_schema,
+        "iam_scim_schema_attr": iam_scim_schema_attr,
+        "iam_scim_schema_list_response": iam_scim_schema_list_response,
+        "iam_scim_schema_meta": iam_scim_schema_meta,
       },
     },
     annotations: {
@@ -164,11 +172,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_schema": iam_scim_schema_output,
-        "iam_scim_schema_attr": iam_scim_schema_attr_output,
-        "iam_scim_schema_list_response": iam_scim_schema_list_response_output,
-        "iam_scim_schema_meta": iam_scim_schema_meta_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_schema": iam_scim_schema,
+        "iam_scim_schema_attr": iam_scim_schema_attr,
+        "iam_scim_schema_list_response": iam_scim_schema_list_response,
+        "iam_scim_schema_meta": iam_scim_schema_meta,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/scim/serviceProviderConfig/outputs.ts b/src/generated/forge-mcp/scim/serviceProviderConfig/outputs.ts
index d6f881af1..9c32e985a 100644
--- a/src/generated/forge-mcp/scim/serviceProviderConfig/outputs.ts
+++ b/src/generated/forge-mcp/scim/serviceProviderConfig/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_scim_authentication_scheme` in responses.
  */
-export const iam_scim_authentication_scheme_output: JsonSchema = {
+export const iam_scim_authentication_scheme: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -38,7 +38,7 @@ export const iam_scim_authentication_scheme_output: JsonSchema = {
 /**
  * The schema of `iam_scim_bulk_feature` in responses.
  */
-export const iam_scim_bulk_feature_output: JsonSchema = {
+export const iam_scim_bulk_feature: JsonSchema = {
   "properties": {
     "maxOperations": {
       "type": "integer"
@@ -61,7 +61,7 @@ export const iam_scim_bulk_feature_output: JsonSchema = {
 /**
  * The schema of `iam_scim_feature` in responses.
  */
-export const iam_scim_feature_output: JsonSchema = {
+export const iam_scim_feature: JsonSchema = {
   "properties": {
     "supported": {
       "type": "boolean"
@@ -76,7 +76,7 @@ export const iam_scim_feature_output: JsonSchema = {
 /**
  * The schema of `iam_scim_filter_feature` in responses.
  */
-export const iam_scim_filter_feature_output: JsonSchema = {
+export const iam_scim_filter_feature: JsonSchema = {
   "properties": {
     "maxResults": {
       "type": "integer"
@@ -95,7 +95,7 @@ export const iam_scim_filter_feature_output: JsonSchema = {
 /**
  * The schema of `iam_scim_service_provider_config` in responses.
  */
-export const iam_scim_service_provider_config_output: JsonSchema = {
+export const iam_scim_service_provider_config: JsonSchema = {
   "properties": {
     "authenticationSchemes": {
       "items": {
diff --git a/src/generated/forge-mcp/scim/serviceProviderConfig/tools.ts b/src/generated/forge-mcp/scim/serviceProviderConfig/tools.ts
index 91e597925..9b878dd20 100644
--- a/src/generated/forge-mcp/scim/serviceProviderConfig/tools.ts
+++ b/src/generated/forge-mcp/scim/serviceProviderConfig/tools.ts
@@ -2,51 +2,53 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
+import { iam_scim_error_response } from "../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import { iam_scim_error_response_output } from "../outputs.js";
-import {
-  iam_scim_authentication_scheme_output,
-  iam_scim_bulk_feature_output,
-  iam_scim_feature_output,
-  iam_scim_filter_feature_output,
-  iam_scim_service_provider_config_output,
+  iam_scim_authentication_scheme,
+  iam_scim_bulk_feature,
+  iam_scim_feature,
+  iam_scim_filter_feature,
+  iam_scim_service_provider_config,
 } from "./outputs.js";
 
 /**
- * The tools of `scim.service_provider_config`.
+ * The tools of `scim.serviceProviderConfig`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "scim_service_provider_config_get",
+    name: "scim_serviceProviderConfig_get",
     title: "Get SCIM Service Provider Config",
-    description: "Returns the SCIM 2.0 Service Provider configuration (RFC 7643 Section 5). IdPs use this endpoint to auto-configure their SCIM integration with Cloudflare, discovering which optional features (patch, bulk, filter, etc.) are supported.",
+    description: "Returns the SCIM 2.0 Service Provider configuration (RFC 7643 Section 5). IdPs use this endpoint to auto-configure their SCIM integration with Cloudflare, discovering which optional features (patch, bulk, filter, etc.) are supported.\n\nGET /accounts/{account_id}/scim/v2/ServiceProviderConfig",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_service_provider_config",
       $defs: {
-        "iam_scim_authentication_scheme": iam_scim_authentication_scheme_output,
-        "iam_scim_bulk_feature": iam_scim_bulk_feature_output,
-        "iam_scim_feature": iam_scim_feature_output,
-        "iam_scim_filter_feature": iam_scim_filter_feature_output,
-        "iam_scim_service_provider_config": iam_scim_service_provider_config_output,
+        "iam_scim_authentication_scheme": iam_scim_authentication_scheme,
+        "iam_scim_bulk_feature": iam_scim_bulk_feature,
+        "iam_scim_feature": iam_scim_feature,
+        "iam_scim_filter_feature": iam_scim_filter_feature,
+        "iam_scim_service_provider_config": iam_scim_service_provider_config,
       },
     },
     annotations: {
@@ -86,12 +88,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_authentication_scheme": iam_scim_authentication_scheme_output,
-        "iam_scim_bulk_feature": iam_scim_bulk_feature_output,
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_feature": iam_scim_feature_output,
-        "iam_scim_filter_feature": iam_scim_filter_feature_output,
-        "iam_scim_service_provider_config": iam_scim_service_provider_config_output,
+        "iam_scim_authentication_scheme": iam_scim_authentication_scheme,
+        "iam_scim_bulk_feature": iam_scim_bulk_feature,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_feature": iam_scim_feature,
+        "iam_scim_filter_feature": iam_scim_filter_feature,
+        "iam_scim_service_provider_config": iam_scim_service_provider_config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/scim/users/outputs.ts b/src/generated/forge-mcp/scim/users/outputs.ts
index 26af6140a..0b0a89b9c 100644
--- a/src/generated/forge-mcp/scim/users/outputs.ts
+++ b/src/generated/forge-mcp/scim/users/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `iam_scim_user` in responses.
  */
-export const iam_scim_user_output: JsonSchema = {
+export const iam_scim_user: JsonSchema = {
   "properties": {
     "active": {
       "type": "boolean"
@@ -65,7 +65,7 @@ export const iam_scim_user_output: JsonSchema = {
 /**
  * The schema of `iam_scim_user_email_object` in responses.
  */
-export const iam_scim_user_email_object_output: JsonSchema = {
+export const iam_scim_user_email_object: JsonSchema = {
   "properties": {
     "primary": {
       "type": "boolean"
@@ -86,7 +86,7 @@ export const iam_scim_user_email_object_output: JsonSchema = {
 /**
  * The schema of `iam_scim_user_list_response` in responses.
  */
-export const iam_scim_user_list_response_output: JsonSchema = {
+export const iam_scim_user_list_response: JsonSchema = {
   "properties": {
     "Resources": {
       "items": {
@@ -121,7 +121,7 @@ export const iam_scim_user_list_response_output: JsonSchema = {
 /**
  * The schema of `iam_scim_user_name_object` in responses.
  */
-export const iam_scim_user_name_object_output: JsonSchema = {
+export const iam_scim_user_name_object: JsonSchema = {
   "properties": {
     "familyName": {
       "type": "string"
diff --git a/src/generated/forge-mcp/scim/users/schemas.ts b/src/generated/forge-mcp/scim/users/schemas.ts
index f15e75c34..7c853da0d 100644
--- a/src/generated/forge-mcp/scim/users/schemas.ts
+++ b/src/generated/forge-mcp/scim/users/schemas.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `iam_scim_patch_op_request`.
  */
 export const iam_scim_patch_op_request: JsonSchema = {
-  "description": "Request body for a SCIM PATCH operation on a User resource (RFC 7644 Section 3.5.2).\n",
+  "description": "Request body for a SCIM PATCH operation on a User resource (RFC 7644 Section 3.5.2).",
   "properties": {
     "Operations": {
       "description": "List of PATCH operations to apply.",
@@ -38,7 +38,7 @@ export const iam_scim_patch_operation: JsonSchema = {
   "description": "A single PATCH operation (RFC 7644 Section 3.5.2).",
   "properties": {
     "op": {
-      "description": "The operation to perform. Only `replace` is currently supported; `add` and `remove` are accepted without error but have no effect. Matched case-insensitively.\n",
+      "description": "The operation to perform. Only `replace` is currently supported; `add` and `remove` are accepted without error but have no effect. Matched case-insensitively.",
       "enum": [
         "add",
         "remove",
@@ -47,11 +47,11 @@ export const iam_scim_patch_operation: JsonSchema = {
       "type": "string"
     },
     "path": {
-      "description": "Attribute path targeted by this operation. When absent, `value` must be a singular complex attribute.\n",
+      "description": "Attribute path targeted by this operation. When absent, `value` must be a singular complex attribute.",
       "type": "string"
     },
     "value": {
-      "description": "The value(s) for the operation. For `replace` without a path, this should be an object of attribute name/value pairs. For member path operations, this should be an array of member value objects.\n"
+      "description": "The value(s) for the operation. For `replace` without a path, this should be an object of attribute name/value pairs. For member path operations, this should be an array of member value objects."
     }
   },
   "required": [
@@ -64,7 +64,7 @@ export const iam_scim_patch_operation: JsonSchema = {
  * The schema of `iam_scim_user_create_request`.
  */
 export const iam_scim_user_create_request: JsonSchema = {
-  "description": "Request body for creating a SCIM User (POST). The `emails` field is required with a primary email matching `userName`, and `active` must be `true`.\n",
+  "description": "Request body for creating a SCIM User (POST). The `emails` field is required with a primary email matching `userName`, and `active` must be `true`.",
   "properties": {
     "active": {
       "description": "A Boolean value indicating the user's administrative status. Must be `true` for user creation.",
@@ -135,14 +135,6 @@ export const iam_scim_user_email_object: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_scim_user_identifier`.
- */
-export const iam_scim_user_identifier: JsonSchema = {
-  "description": "The user tag identifying a SCIM User resource (account member).",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_scim_user_name_object`.
  */
@@ -165,7 +157,7 @@ export const iam_scim_user_name_object: JsonSchema = {
  * The schema of `iam_scim_user_replace_request`.
  */
 export const iam_scim_user_replace_request: JsonSchema = {
-  "description": "Request body for replacing a SCIM User (PUT). Only `schemas` and `userName` are required; other fields are optional.\n",
+  "description": "Request body for replacing a SCIM User (PUT). Only `schemas` and `userName` are required; other fields are optional.",
   "properties": {
     "active": {
       "description": "A Boolean value indicating the user's administrative status. Optional; if omitted, the current value is preserved. Set to `false` to deprovision the user, removing their membership from the account.",
diff --git a/src/generated/forge-mcp/scim/users/tools.ts b/src/generated/forge-mcp/scim/users/tools.ts
index 8950bd3e1..75df3a973 100644
--- a/src/generated/forge-mcp/scim/users/tools.ts
+++ b/src/generated/forge-mcp/scim/users/tools.ts
@@ -1,25 +1,20 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
+import { iam_scim_error_response } from "../outputs.js";
 import {
-  iam_account_identifier,
-  iam_common_components_schemas_identifier,
-} from "../../schemas.js";
-import { iam_scim_error_response_output } from "../outputs.js";
-import {
-  iam_scim_user_email_object_output,
-  iam_scim_user_list_response_output,
-  iam_scim_user_name_object_output,
-  iam_scim_user_output,
+  iam_scim_user,
+  iam_scim_user_email_object,
+  iam_scim_user_list_response,
+  iam_scim_user_name_object,
 } from "./outputs.js";
 import {
   iam_scim_patch_op_request,
   iam_scim_patch_operation,
   iam_scim_user_create_request,
-  iam_scim_user_email_object,
-  iam_scim_user_identifier,
-  iam_scim_user_name_object,
+  iam_scim_user_email_object as iam_scim_user_email_object$,
+  iam_scim_user_name_object as iam_scim_user_name_object$,
   iam_scim_user_replace_request,
 } from "./schemas.js";
 
@@ -30,36 +25,44 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_users_create",
     title: "Create SCIM User",
-    description: "Provisions a new account member via SCIM. The `userName` field must be a valid email address and must match the primary email in `emails`. The account must be an Enterprise account with SCIM entitlements enabled.",
+    description: "Provisions a new account member via SCIM. The `userName` field must be a valid email address and must match the primary email in `emails`. The account must be an Enterprise account with SCIM entitlements enabled.\n\nPOST /accounts/{account_id}/scim/v2/Users",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_scim_user_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
         "iam_scim_user_create_request": iam_scim_user_create_request,
-        "iam_scim_user_email_object": iam_scim_user_email_object,
-        "iam_scim_user_name_object": iam_scim_user_name_object,
+        "iam_scim_user_email_object": iam_scim_user_email_object$,
+        "iam_scim_user_name_object": iam_scim_user_name_object$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_user",
       $defs: {
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     annotations: {
@@ -98,10 +101,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     request: (args) => ({
@@ -112,28 +115,33 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_users_delete",
     title: "Delete SCIM User",
-    description: "Deprovisions a SCIM User by removing their membership from this account (RFC 7644 Section 3.6). This does not delete the global Cloudflare user.\n\nConfirm with the user before calling this tool. Are you sure you want to remove this user from the account?",
+    description: "Deprovisions a SCIM User by removing their membership from this account (RFC 7644 Section 3.6). This does not delete the global Cloudflare user.\n\nConfirm with the user before calling this tool. Are you sure you want to remove this user from the account?\n\nDELETE /accounts/{account_id}/scim/v2/Users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "user_id": {
-          "$ref": "#/$defs/iam_scim_user_identifier",
-          "description": "The user tag identifying a SCIM User resource (account member)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "The user tag identifying a SCIM User resource (account member).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_scim_user_identifier": iam_scim_user_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -169,7 +177,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
+        "iam_scim_error_response": iam_scim_error_response,
       },
     },
     request: (args) => ({
@@ -179,41 +187,48 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_users_edit",
     title: "Patch SCIM User",
-    description: "Partially updates a SCIM User via PATCH operations (RFC 7644 Section 3.5.2). Supports updating `userName`, `name.givenName`, `name.familyName`, and `active`. Setting `active: false` deprovisions the user (removes them from the account). For IdP compatibility, `emails[type eq \"work\"].value` is also accepted as an alias for `userName`.",
+    description: "Partially updates a SCIM User via PATCH operations (RFC 7644 Section 3.5.2). Supports updating `userName`, `name.givenName`, `name.familyName`, and `active`. Setting `active: false` deprovisions the user (removes them from the account). For IdP compatibility, `emails[type eq \"work\"].value` is also accepted as an alias for `userName`.\n\nPATCH /accounts/{account_id}/scim/v2/Users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_scim_patch_op_request"
         },
-        "user_id": {
-          "$ref": "#/$defs/iam_scim_user_identifier",
-          "description": "The user tag identifying a SCIM User resource (account member)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "The user tag identifying a SCIM User resource (account member).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
         "iam_scim_patch_op_request": iam_scim_patch_op_request,
         "iam_scim_patch_operation": iam_scim_patch_operation,
-        "iam_scim_user_identifier": iam_scim_user_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_user",
       $defs: {
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     annotations: {
@@ -252,10 +267,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     request: (args) => ({
@@ -266,35 +281,40 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_users_get",
     title: "Get SCIM User",
-    description: "Retrieves a single account member as a SCIM User resource by user tag.",
+    description: "Retrieves a single account member as a SCIM User resource by user tag.\n\nGET /accounts/{account_id}/scim/v2/Users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
-        "user_id": {
-          "$ref": "#/$defs/iam_scim_user_identifier",
-          "description": "The user tag identifying a SCIM User resource (account member)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "The user tag identifying a SCIM User resource (account member).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_scim_user_identifier": iam_scim_user_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_user",
       $defs: {
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     annotations: {
@@ -334,10 +354,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     request: (args) => ({
@@ -347,43 +367,55 @@ export const tools: readonly Tool[] = [
   {
     name: "scim_users_list",
     title: "List SCIM Users",
-    description: "Lists account members as SCIM User resources. Supports optional filtering by `userName` (email) using the SCIM filter syntax (e.g. `userName eq \"user@example.com\"`). Pagination is controlled via `startIndex` and `count` query parameters per RFC 7644 Section 3.4.2.4.",
+    description: "Lists account members as SCIM User resources. Supports optional filtering by `userName` (email) using the SCIM filter syntax (e.g. `userName eq \"user@example.com\"`). Pagination is controlled via `startIndex` and `count` query parameters per RFC 7644 Section 3.4.2.4.\n\nGET /accounts/{account_id}/scim/v2/Users",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "count": {
-          "description": "Specifies the desired maximum number of query results per page.\n",
-          "type": "integer"
-        },
-        "filter": {
-          "description": "SCIM filter expression (RFC 7644 Section 3.4.2.2). Only `userName eq \"value\"` is supported.\n",
-          "type": "string"
-        },
-        "start_index": {
-          "default": 1,
-          "description": "The 1-based index of the first result in the current set of list results. Values less than 1 are treated as 1.\n",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "count": {
+              "description": "Specifies the desired maximum number of query results per page.",
+              "type": "integer"
+            },
+            "filter": {
+              "description": "SCIM filter expression (RFC 7644 Section 3.4.2.2). Only `userName eq \"value\"` is supported.",
+              "type": "string"
+            },
+            "startIndex": {
+              "default": 1,
+              "description": "The 1-based index of the first result in the current set of list results. Values less than 1 are treated as 1.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_user_list_response",
       $defs: {
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_list_response": iam_scim_user_list_response_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_list_response": iam_scim_user_list_response,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     annotations: {
@@ -423,61 +455,68 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_list_response": iam_scim_user_list_response_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_list_response": iam_scim_user_list_response,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/scim/v2/Users`,
       query: [
-        ["startIndex", args["start_index"], true],
-        ["count", args["count"], true],
-        ["filter", args["filter"], true],
+        ["startIndex", param(args, "query", "startIndex"), true],
+        ["count", param(args, "query", "count"), true],
+        ["filter", param(args, "query", "filter"), true],
       ],
     }),
   },
   {
     name: "scim_users_update",
     title: "Replace SCIM User",
-    description: "Replaces a SCIM User resource (RFC 7644 Section 3.5.1). Fully replaces the mutable attributes of the user. Supports updating `userName`, `name`, `emails`, and `active`.",
+    description: "Replaces a SCIM User resource (RFC 7644 Section 3.5.1). Fully replaces the mutable attributes of the user. Supports updating `userName`, `name`, `emails`, and `active`.\n\nPUT /accounts/{account_id}/scim/v2/Users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/iam_account_identifier",
-          "description": "Account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/iam_scim_user_replace_request"
         },
-        "user_id": {
-          "$ref": "#/$defs/iam_scim_user_identifier",
-          "description": "The user tag identifying a SCIM User resource (account member)."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier tag.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "The user tag identifying a SCIM User resource (account member).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "iam_account_identifier": iam_account_identifier,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier,
-        "iam_scim_user_email_object": iam_scim_user_email_object,
-        "iam_scim_user_identifier": iam_scim_user_identifier,
-        "iam_scim_user_name_object": iam_scim_user_name_object,
+        "iam_scim_user_email_object": iam_scim_user_email_object$,
+        "iam_scim_user_name_object": iam_scim_user_name_object$,
         "iam_scim_user_replace_request": iam_scim_user_replace_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/iam_scim_user",
       $defs: {
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     annotations: {
@@ -516,10 +555,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_scim_error_response": iam_scim_error_response_output,
-        "iam_scim_user": iam_scim_user_output,
-        "iam_scim_user_email_object": iam_scim_user_email_object_output,
-        "iam_scim_user_name_object": iam_scim_user_name_object_output,
+        "iam_scim_error_response": iam_scim_error_response,
+        "iam_scim_user": iam_scim_user,
+        "iam_scim_user_email_object": iam_scim_user_email_object,
+        "iam_scim_user_name_object": iam_scim_user_name_object,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/secretsStore/outputs.ts b/src/generated/forge-mcp/secretsStore/outputs.ts
index a18c32bd0..8112556b6 100644
--- a/src/generated/forge-mcp/secretsStore/outputs.ts
+++ b/src/generated/forge-mcp/secretsStore/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `secrets-store_api-response-collection` in responses.
  */
-export const secrets_store_api_response_collection_output: JsonSchema = {
+export const secrets$$store_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secrets-store_api-response-common"
@@ -42,7 +42,7 @@ export const secrets_store_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `secrets-store_api-response-common` in responses.
  */
-export const secrets_store_api_response_common_output: JsonSchema = {
+export const secrets$$store_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/secrets-store_messages"
@@ -68,7 +68,7 @@ export const secrets_store_api_response_common_output: JsonSchema = {
 /**
  * The schema of `secrets-store_api-response-common-failure` in responses.
  */
-export const secrets_store_api_response_common_failure_output: JsonSchema = {
+export const secrets$$store_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/secrets-store_messages"
@@ -95,18 +95,10 @@ export const secrets_store_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `secrets-store_created` in responses.
- */
-export const secrets_store_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_messages` in responses.
  */
-export const secrets_store_messages_output: JsonSchema = {
+export const secrets$$store_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -135,18 +127,3 @@ export const secrets_store_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `secrets-store_modified` in responses.
- */
-export const secrets_store_modified_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `secrets-store_store_identifier` in responses.
- */
-export const secrets_store_store_identifier_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/secretsStore/quota/outputs.ts b/src/generated/forge-mcp/secretsStore/quota/outputs.ts
index d5836df27..2c7aafa09 100644
--- a/src/generated/forge-mcp/secretsStore/quota/outputs.ts
+++ b/src/generated/forge-mcp/secretsStore/quota/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `secrets-store_quota` in responses.
- */
-export const secrets_store_quota_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `secrets-store_quota_response` in responses.
  */
-export const secrets_store_quota_response_output: JsonSchema = {
+export const secrets$$store_quota_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secrets-store_api-response-collection"
@@ -32,7 +25,7 @@ export const secrets_store_quota_response_output: JsonSchema = {
 /**
  * The schema of `secrets-store_secretsUsageObject` in responses.
  */
-export const secrets_store_secretsUsageObject_output: JsonSchema = {
+export const secrets$$store_secretsUsageObject: JsonSchema = {
   "properties": {
     "secrets": {
       "$ref": "#/$defs/secrets-store_usageQuotaObject"
@@ -44,23 +37,16 @@ export const secrets_store_secretsUsageObject_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `secrets-store_usage` in responses.
- */
-export const secrets_store_usage_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `secrets-store_usageQuotaObject` in responses.
  */
-export const secrets_store_usageQuotaObject_output: JsonSchema = {
+export const secrets$$store_usageQuotaObject: JsonSchema = {
   "properties": {
     "quota": {
-      "$ref": "#/$defs/secrets-store_quota"
+      "type": "number"
     },
     "usage": {
-      "$ref": "#/$defs/secrets-store_usage"
+      "type": "number"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/secretsStore/quota/tools.ts b/src/generated/forge-mcp/secretsStore/quota/tools.ts
index d0c5c3064..2a64f3981 100644
--- a/src/generated/forge-mcp/secretsStore/quota/tools.ts
+++ b/src/generated/forge-mcp/secretsStore/quota/tools.ts
@@ -3,50 +3,56 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  secrets_store_api_response_collection_output,
-  secrets_store_api_response_common_failure_output,
-  secrets_store_api_response_common_output,
-  secrets_store_messages_output,
+  secrets$$store_api$$response$$collection,
+  secrets$$store_api$$response$$common,
+  secrets$$store_api$$response$$common$$failure,
+  secrets$$store_messages,
 } from "../outputs.js";
 import {
-  secrets_store_quota_output,
-  secrets_store_quota_response_output,
-  secrets_store_secretsUsageObject_output,
-  secrets_store_usageQuotaObject_output,
-  secrets_store_usage_output,
+  secrets$$store_quota_response,
+  secrets$$store_secretsUsageObject,
+  secrets$$store_usageQuotaObject,
 } from "./outputs.js";
 
 /**
- * The tools of `secrets_store.quota`.
+ * The tools of `secretsStore.quota`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "secrets_store_quota_get",
+    name: "secretsStore_quota_get",
     title: "View secret usage",
-    description: "Lists the number of secrets used in the account.\n\nThis method is beta.",
+    description: "Lists the number of secrets used in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/secrets_store/quota",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_quota_response",
       $defs: {
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_quota": secrets_store_quota_output,
-        "secrets-store_quota_response": secrets_store_quota_response_output,
-        "secrets-store_secretsUsageObject": secrets_store_secretsUsageObject_output,
-        "secrets-store_usage": secrets_store_usage_output,
-        "secrets-store_usageQuotaObject": secrets_store_usageQuotaObject_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_quota_response": secrets$$store_quota_response,
+        "secrets-store_secretsUsageObject": secrets$$store_secretsUsageObject,
+        "secrets-store_usageQuotaObject": secrets$$store_usageQuotaObject,
       },
     },
     annotations: {
@@ -81,15 +87,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_quota": secrets_store_quota_output,
-        "secrets-store_quota_response": secrets_store_quota_response_output,
-        "secrets-store_secretsUsageObject": secrets_store_secretsUsageObject_output,
-        "secrets-store_usage": secrets_store_usage_output,
-        "secrets-store_usageQuotaObject": secrets_store_usageQuotaObject_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_quota_response": secrets$$store_quota_response,
+        "secrets-store_secretsUsageObject": secrets$$store_secretsUsageObject,
+        "secrets-store_usageQuotaObject": secrets$$store_usageQuotaObject,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/secretsStore/secrets/outputs.ts b/src/generated/forge-mcp/secretsStore/secrets/outputs.ts
index 95adb14f0..7a3c682ff 100644
--- a/src/generated/forge-mcp/secretsStore/secrets/outputs.ts
+++ b/src/generated/forge-mcp/secretsStore/secrets/outputs.ts
@@ -3,22 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `secrets-store_SecretStatus` in responses.
- */
-export const secrets_store_SecretStatus_output: JsonSchema = {
-  "enum": [
-    "pending",
-    "active",
-    "deleted"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_api-response-single` in responses.
  */
-export const secrets_store_api_response_single_output: JsonSchema = {
+export const secrets$$store_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/secrets-store_messages"
@@ -41,17 +29,10 @@ export const secrets_store_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `secrets-store_comment` in responses.
- */
-export const secrets_store_comment_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_delete_response` in responses.
  */
-export const secrets_store_delete_response_output: JsonSchema = {
+export const secrets$$store_delete_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secrets-store_api-response-single"
@@ -74,17 +55,10 @@ export const secrets_store_delete_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `secrets-store_identifier` in responses.
- */
-export const secrets_store_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_inheritable_scopes` in responses.
  */
-export const secrets_store_inheritable_scopes_output: JsonSchema = {
+export const secrets$$store_inheritable_scopes: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -109,31 +83,38 @@ export const secrets_store_inheritable_scopes_output: JsonSchema = {
 /**
  * The schema of `secrets-store_secretObject` in responses.
  */
-export const secrets_store_secretObject_output: JsonSchema = {
+export const secrets$$store_secretObject: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/secrets-store_comment"
+      "type": "string"
     },
     "created": {
-      "$ref": "#/$defs/secrets-store_created"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/secrets-store_identifier"
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/secrets-store_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/secrets-store_secret_name"
+      "type": "string"
     },
     "scopes": {
       "$ref": "#/$defs/secrets-store_inheritable_scopes"
     },
     "status": {
-      "$ref": "#/$defs/secrets-store_SecretStatus"
+      "enum": [
+        "pending",
+        "active",
+        "deleted"
+      ],
+      "type": "string"
     },
     "store_id": {
-      "$ref": "#/$defs/secrets-store_store_identifier"
+      "type": "string"
     }
   },
   "required": [
@@ -147,17 +128,10 @@ export const secrets_store_secretObject_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `secrets-store_secret_name` in responses.
- */
-export const secrets_store_secret_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_secret_response` in responses.
  */
-export const secrets_store_secret_response_output: JsonSchema = {
+export const secrets$$store_secret_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secrets-store_api-response-single"
@@ -176,7 +150,7 @@ export const secrets_store_secret_response_output: JsonSchema = {
 /**
  * The schema of `secrets-store_secrets_response_collection` in responses.
  */
-export const secrets_store_secrets_response_collection_output: JsonSchema = {
+export const secrets$$store_secrets_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secrets-store_api-response-collection"
diff --git a/src/generated/forge-mcp/secretsStore/secrets/schemas.ts b/src/generated/forge-mcp/secretsStore/secrets/schemas.ts
index c26d19074..c99dd6673 100644
--- a/src/generated/forge-mcp/secretsStore/secrets/schemas.ts
+++ b/src/generated/forge-mcp/secretsStore/secrets/schemas.ts
@@ -3,34 +3,26 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `secrets-store_comment`.
- */
-export const secrets_store_comment: JsonSchema = {
-  "description": "Freeform text describing the secret.",
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_createSecretObject`.
  */
-export const secrets_store_createSecretObject: JsonSchema = {
+export const secrets$$store_createSecretObject: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/secrets-store_comment",
-      "description": "Freeform text describing the secret."
+      "description": "Freeform text describing the secret.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/secrets-store_secret_name",
-      "description": "The name of the secret."
+      "description": "The name of the secret.",
+      "type": "string"
     },
     "scopes": {
       "$ref": "#/$defs/secrets-store_scopes",
       "description": "The list of services that can use this secret. Omit it on create or duplicate to inherit the store's scopes. An empty list lets no service use the secret."
     },
     "value": {
-      "$ref": "#/$defs/secrets-store_value",
-      "description": "The value of the secret. Maximum 64 KiB (65,536 bytes). Note that this is 'write only' - the API never returns this value; it exists only to create or modify secrets."
+      "description": "The value of the secret. Maximum 64 KiB (65,536 bytes). Note that this is 'write only' - the API never returns this value; it exists only to create or modify secrets.",
+      "type": "string"
     }
   },
   "required": [
@@ -43,13 +35,14 @@ export const secrets_store_createSecretObject: JsonSchema = {
 /**
  * The schema of `secrets-store_deleteSecretsRequest`.
  */
-export const secrets_store_deleteSecretsRequest: JsonSchema = {
+export const secrets$$store_deleteSecretsRequest: JsonSchema = {
   "description": "Request body for bulk deleting secrets.",
   "properties": {
     "ids": {
       "description": "List of secret identifier tags to delete.",
       "items": {
-        "$ref": "#/$defs/secrets-store_identifier"
+        "description": "Secret identifier tag.",
+        "type": "string"
       },
       "type": "array"
     }
@@ -63,15 +56,15 @@ export const secrets_store_deleteSecretsRequest: JsonSchema = {
 /**
  * The schema of `secrets-store_duplicateSecretObject`.
  */
-export const secrets_store_duplicateSecretObject: JsonSchema = {
+export const secrets$$store_duplicateSecretObject: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/secrets-store_comment",
-      "description": "Freeform text describing the secret."
+      "description": "Freeform text describing the secret.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/secrets-store_secret_name",
-      "description": "The name of the secret."
+      "description": "The name of the secret.",
+      "type": "string"
     },
     "scopes": {
       "$ref": "#/$defs/secrets-store_scopes",
@@ -84,18 +77,10 @@ export const secrets_store_duplicateSecretObject: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `secrets-store_identifier`.
- */
-export const secrets_store_identifier: JsonSchema = {
-  "description": "Secret identifier tag.",
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_inheritable_scopes`.
  */
-export const secrets_store_inheritable_scopes: JsonSchema = {
+export const secrets$$store_inheritable_scopes: JsonSchema = {
   "description": "The list of services that can use this secret, or null when the secret inherits its store's scopes. Set it to null in a patch to inherit again. An empty list lets no service use the secret.",
   "oneOf": [
     {
@@ -121,19 +106,19 @@ export const secrets_store_inheritable_scopes: JsonSchema = {
 /**
  * The schema of `secrets-store_patchSecretObject`.
  */
-export const secrets_store_patchSecretObject: JsonSchema = {
+export const secrets$$store_patchSecretObject: JsonSchema = {
   "properties": {
     "comment": {
-      "$ref": "#/$defs/secrets-store_comment",
-      "description": "Freeform text describing the secret."
+      "description": "Freeform text describing the secret.",
+      "type": "string"
     },
     "scopes": {
       "$ref": "#/$defs/secrets-store_inheritable_scopes",
       "description": "The list of services that can use this secret, or null when the secret inherits its store's scopes. Set it to null in a patch to inherit again. An empty list lets no service use the secret."
     },
     "value": {
-      "$ref": "#/$defs/secrets-store_value",
-      "description": "The value of the secret. Maximum 64 KiB (65,536 bytes). Note that this is 'write only' - the API never returns this value; it exists only to create or modify secrets."
+      "description": "The value of the secret. Maximum 64 KiB (65,536 bytes). Note that this is 'write only' - the API never returns this value; it exists only to create or modify secrets.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -142,7 +127,7 @@ export const secrets_store_patchSecretObject: JsonSchema = {
 /**
  * The schema of `secrets-store_scopes`.
  */
-export const secrets_store_scopes: JsonSchema = {
+export const secrets$$store_scopes: JsonSchema = {
   "description": "The list of services that can use this secret. Omit it on create or duplicate to inherit the store's scopes. An empty list lets no service use the secret.",
   "items": {
     "enum": [
@@ -157,19 +142,3 @@ export const secrets_store_scopes: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `secrets-store_secret_name`.
- */
-export const secrets_store_secret_name: JsonSchema = {
-  "description": "The name of the secret.",
-  "type": "string"
-};
-
-/**
- * The schema of `secrets-store_value`.
- */
-export const secrets_store_value: JsonSchema = {
-  "description": "The value of the secret. Maximum 64 KiB (65,536 bytes). Note that this is 'write only' - the API never returns this value; it exists only to create or modify secrets.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/secretsStore/secrets/tools.ts b/src/generated/forge-mcp/secretsStore/secrets/tools.ts
index edb1eb32e..77e33b95d 100644
--- a/src/generated/forge-mcp/secretsStore/secrets/tools.ts
+++ b/src/generated/forge-mcp/secretsStore/secrets/tools.ts
@@ -1,80 +1,78 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  secrets_store_api_response_collection_output,
-  secrets_store_api_response_common_failure_output,
-  secrets_store_api_response_common_output,
-  secrets_store_created_output,
-  secrets_store_messages_output,
-  secrets_store_modified_output,
-  secrets_store_store_identifier_output,
+  secrets$$store_api$$response$$collection,
+  secrets$$store_api$$response$$common,
+  secrets$$store_api$$response$$common$$failure,
+  secrets$$store_messages,
 } from "../outputs.js";
 import {
-  secrets_store_SecretStatus_output,
-  secrets_store_api_response_single_output,
-  secrets_store_comment_output,
-  secrets_store_delete_response_output,
-  secrets_store_identifier_output,
-  secrets_store_inheritable_scopes_output,
-  secrets_store_secretObject_output,
-  secrets_store_secret_name_output,
-  secrets_store_secret_response_output,
-  secrets_store_secrets_response_collection_output,
+  secrets$$store_api$$response$$single,
+  secrets$$store_delete_response,
+  secrets$$store_inheritable_scopes,
+  secrets$$store_secretObject,
+  secrets$$store_secret_response,
+  secrets$$store_secrets_response_collection,
 } from "./outputs.js";
 import {
-  secrets_store_comment,
-  secrets_store_createSecretObject,
-  secrets_store_deleteSecretsRequest,
-  secrets_store_duplicateSecretObject,
-  secrets_store_identifier,
-  secrets_store_inheritable_scopes,
-  secrets_store_patchSecretObject,
-  secrets_store_scopes,
-  secrets_store_secret_name,
-  secrets_store_value,
+  secrets$$store_createSecretObject,
+  secrets$$store_deleteSecretsRequest,
+  secrets$$store_duplicateSecretObject,
+  secrets$$store_inheritable_scopes as secrets$$store_inheritable_scopes$,
+  secrets$$store_patchSecretObject,
+  secrets$$store_scopes,
 } from "./schemas.js";
 
 /**
- * The tools of `secrets_store.secrets`.
+ * The tools of `secretsStore.secrets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "secrets_store_secrets_bulk_delete",
+    name: "secretsStore_secrets_bulkDelete",
     title: "Delete secrets",
-    description: "Deletes one or more secrets.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the specified secrets and cannot be undone.",
+    description: "Deletes one or more secrets.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes the specified secrets and cannot be undone.\n\nDELETE /accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/secrets-store_deleteSecretsRequest"
         },
-        "store_id": {
-          "description": "Store identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "store_id": {
+              "description": "Store identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "store_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "store_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secrets-store_deleteSecretsRequest": secrets_store_deleteSecretsRequest,
-        "secrets-store_identifier": secrets_store_identifier,
+        "secrets-store_deleteSecretsRequest": secrets$$store_deleteSecretsRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_delete_response",
       $defs: {
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_delete_response": secrets_store_delete_response_output,
-        "secrets-store_messages": secrets_store_messages_output,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_delete_response": secrets$$store_delete_response,
+        "secrets-store_messages": secrets$$store_messages,
       },
     },
     annotations: {
@@ -108,10 +106,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_delete_response": secrets_store_delete_response_output,
-        "secrets-store_messages": secrets_store_messages_output,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_delete_response": secrets$$store_delete_response,
+        "secrets-store_messages": secrets$$store_messages,
       },
     },
     request: (args) => ({
@@ -120,56 +118,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "secrets_store_secrets_create",
+    name: "secretsStore_secrets_create",
     title: "Create a secret",
-    description: "Creates a secret in the account.\n\nThis method is beta.",
+    description: "Creates a secret in the account.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
         "body": {
           "items": {
             "$ref": "#/$defs/secrets-store_createSecretObject"
           },
           "type": "array"
         },
-        "store_id": {
-          "description": "Store identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "store_id": {
+              "description": "Store identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "store_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "store_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secrets-store_comment": secrets_store_comment,
-        "secrets-store_createSecretObject": secrets_store_createSecretObject,
-        "secrets-store_scopes": secrets_store_scopes,
-        "secrets-store_secret_name": secrets_store_secret_name,
-        "secrets-store_value": secrets_store_value,
+        "secrets-store_createSecretObject": secrets$$store_createSecretObject,
+        "secrets-store_scopes": secrets$$store_scopes,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_secrets_response_collection",
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secrets_response_collection": secrets_store_secrets_response_collection_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secrets_response_collection": secrets$$store_secrets_response_collection,
       },
     },
     annotations: {
@@ -203,20 +201,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secrets_response_collection": secrets_store_secrets_response_collection_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secrets_response_collection": secrets$$store_secrets_response_collection,
       },
     },
     request: (args) => ({
@@ -225,37 +216,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "secrets_store_secrets_delete",
+    name: "secretsStore_secrets_delete",
     title: "Delete a secret",
-    description: "Deletes a single secret.\n\nThis method is beta.",
+    description: "Deletes a single secret.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "secret_id": {
-          "description": "Secret identifier.",
-          "type": "string"
-        },
-        "store_id": {
-          "description": "Store identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "secret_id": {
+              "description": "Secret identifier.",
+              "type": "string"
+            },
+            "store_id": {
+              "description": "Store identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "store_id",
+            "secret_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "store_id",
-        "secret_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_delete_response",
       $defs: {
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_delete_response": secrets_store_delete_response_output,
-        "secrets-store_messages": secrets_store_messages_output,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_delete_response": secrets$$store_delete_response,
+        "secrets-store_messages": secrets$$store_messages,
       },
     },
     annotations: {
@@ -289,10 +290,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_delete_response": secrets_store_delete_response_output,
-        "secrets-store_messages": secrets_store_messages_output,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_delete_response": secrets$$store_delete_response,
+        "secrets-store_messages": secrets$$store_messages,
       },
     },
     request: (args) => ({
@@ -300,56 +301,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "secrets_store_secrets_duplicate",
+    name: "secretsStore_secrets_duplicate",
     title: "Duplicate Secret",
-    description: "Creates a duplicate of the secret, keeping the value.\n\nThis method is beta.",
+    description: "Creates a duplicate of the secret, keeping the value.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}/duplicate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/secrets-store_duplicateSecretObject"
         },
-        "secret_id": {
-          "description": "Secret identifier.",
-          "type": "string"
-        },
-        "store_id": {
-          "description": "Store identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "secret_id": {
+              "description": "Secret identifier.",
+              "type": "string"
+            },
+            "store_id": {
+              "description": "Store identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "store_id",
+            "secret_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "store_id",
-        "secret_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secrets-store_comment": secrets_store_comment,
-        "secrets-store_duplicateSecretObject": secrets_store_duplicateSecretObject,
-        "secrets-store_scopes": secrets_store_scopes,
-        "secrets-store_secret_name": secrets_store_secret_name,
+        "secrets-store_duplicateSecretObject": secrets$$store_duplicateSecretObject,
+        "secrets-store_scopes": secrets$$store_scopes,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_secret_response",
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secret_response": secrets_store_secret_response_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secret_response": secrets$$store_secret_response,
       },
     },
     annotations: {
@@ -383,19 +385,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secret_response": secrets_store_secret_response_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secret_response": secrets$$store_secret_response,
       },
     },
     request: (args) => ({
@@ -404,56 +399,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "secrets_store_secrets_edit",
+    name: "secretsStore_secrets_edit",
     title: "Patch a secret",
-    description: "Updates a single secret.\n\nThis method is beta.",
+    description: "Updates a single secret.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/secrets-store_patchSecretObject"
         },
-        "secret_id": {
-          "description": "Secret identifier.",
-          "type": "string"
-        },
-        "store_id": {
-          "description": "Store identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "secret_id": {
+              "description": "Secret identifier.",
+              "type": "string"
+            },
+            "store_id": {
+              "description": "Store identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "store_id",
+            "secret_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "store_id",
-        "secret_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "secrets-store_comment": secrets_store_comment,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes,
-        "secrets-store_patchSecretObject": secrets_store_patchSecretObject,
-        "secrets-store_value": secrets_store_value,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes$,
+        "secrets-store_patchSecretObject": secrets$$store_patchSecretObject,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_secret_response",
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secret_response": secrets_store_secret_response_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secret_response": secrets$$store_secret_response,
       },
     },
     annotations: {
@@ -487,19 +483,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secret_response": secrets_store_secret_response_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secret_response": secrets$$store_secret_response,
       },
     },
     request: (args) => ({
@@ -508,46 +497,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "secrets_store_secrets_get",
+    name: "secretsStore_secrets_get",
     title: "Get a secret by ID",
-    description: "Returns details of a single secret.\n\nThis method is beta.",
+    description: "Returns details of a single secret.\n\nThis method is beta.\n\nGET /accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "secret_id": {
-          "description": "Secret identifier.",
-          "type": "string"
-        },
-        "store_id": {
-          "description": "Store identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "secret_id": {
+              "description": "Secret identifier.",
+              "type": "string"
+            },
+            "store_id": {
+              "description": "Store identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "store_id",
+            "secret_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "store_id",
-        "secret_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_secret_response",
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secret_response": secrets_store_secret_response_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secret_response": secrets$$store_secret_response,
       },
     },
     annotations: {
@@ -582,19 +574,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_api-response-single": secrets_store_api_response_single_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secret_response": secrets_store_secret_response_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_api-response-single": secrets$$store_api$$response$$single,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secret_response": secrets$$store_secret_response,
       },
     },
     request: (args) => ({
@@ -602,90 +587,99 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "secrets_store_secrets_list",
+    name: "secretsStore_secrets_list",
     title: "List store secrets",
-    description: "Lists all store secrets.\n\nThis method is beta.",
+    description: "Lists all store secrets.\n\nThis method is beta.\n\nGET /accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "direction": {
-          "default": "desc",
-          "description": "Direction to sort objects.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "default": "created",
-          "description": "Order secrets by values in the given field.",
-          "enum": [
-            "name",
-            "comment",
-            "created",
-            "modified",
-            "status"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "store_id": {
+              "description": "Store identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "store_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "Page number.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of objects to return per page.",
-          "type": "integer"
+          "type": "object"
         },
-        "scopes": {
-          "description": "Only secrets with the given scopes will be returned.",
-          "items": {
-            "enum": [
-              "workers",
-              "ai_gateway",
-              "dex",
-              "access",
-              "containers",
-              "websearch"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "desc",
+              "description": "Direction to sort objects.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "created",
+              "description": "Order secrets by values in the given field.",
+              "enum": [
+                "name",
+                "comment",
+                "created",
+                "modified",
+                "status"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Page number.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of objects to return per page.",
+              "type": "integer"
+            },
+            "scopes": {
+              "description": "Only secrets with the given scopes will be returned.",
+              "items": {
+                "enum": [
+                  "workers",
+                  "ai_gateway",
+                  "dex",
+                  "access",
+                  "containers",
+                  "websearch"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "search": {
+              "description": "Search secrets using a filter string, filtering across name and comment.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "search": {
-          "description": "Search secrets using a filter string, filtering across name and comment.",
-          "type": "string"
-        },
-        "store_id": {
-          "description": "Store identifier.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "store_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_secrets_response_collection",
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secrets_response_collection": secrets_store_secrets_response_collection_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secrets_response_collection": secrets$$store_secrets_response_collection,
       },
     },
     annotations: {
@@ -720,31 +714,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_SecretStatus": secrets_store_SecretStatus_output,
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_comment": secrets_store_comment_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_identifier": secrets_store_identifier_output,
-        "secrets-store_inheritable_scopes": secrets_store_inheritable_scopes_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_secretObject": secrets_store_secretObject_output,
-        "secrets-store_secret_name": secrets_store_secret_name_output,
-        "secrets-store_secrets_response_collection": secrets_store_secrets_response_collection_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_inheritable_scopes": secrets$$store_inheritable_scopes,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_secretObject": secrets$$store_secretObject,
+        "secrets-store_secrets_response_collection": secrets$$store_secrets_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/secrets_store/stores/${pathParam(args, "store_id")}/secrets`,
       query: [
-        ["direction", args["direction"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["order", args["order"], true],
-        ["scopes", args["scopes"], false],
+        ["direction", param(args, "query", "direction"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order", param(args, "query", "order"), true],
+        ["scopes", param(args, "query", "scopes"), false],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/secretsStore/stores/outputs.ts b/src/generated/forge-mcp/secretsStore/stores/outputs.ts
index 726433d2b..82a136391 100644
--- a/src/generated/forge-mcp/secretsStore/stores/outputs.ts
+++ b/src/generated/forge-mcp/secretsStore/stores/outputs.ts
@@ -3,32 +3,27 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `secrets-store_account_identifier` in responses.
- */
-export const secrets_store_account_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_storeObject` in responses.
  */
-export const secrets_store_storeObject_output: JsonSchema = {
+export const secrets$$store_storeObject: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/secrets-store_account_identifier"
+      "type": "string"
     },
     "created": {
-      "$ref": "#/$defs/secrets-store_created"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/secrets-store_store_identifier"
+      "type": "string"
     },
     "modified": {
-      "$ref": "#/$defs/secrets-store_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/secrets-store_store_name"
+      "type": "string"
     }
   },
   "required": [
@@ -40,17 +35,10 @@ export const secrets_store_storeObject_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `secrets-store_store_name` in responses.
- */
-export const secrets_store_store_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `secrets-store_store_response` in responses.
  */
-export const secrets_store_store_response_output: JsonSchema = {
+export const secrets$$store_store_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secrets-store_api-response-collection"
@@ -69,7 +57,7 @@ export const secrets_store_store_response_output: JsonSchema = {
 /**
  * The schema of `secrets-store_stores_response_collection` in responses.
  */
-export const secrets_store_stores_response_collection_output: JsonSchema = {
+export const secrets$$store_stores_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/secrets-store_api-response-collection"
diff --git a/src/generated/forge-mcp/secretsStore/stores/tools.ts b/src/generated/forge-mcp/secretsStore/stores/tools.ts
index b8df3a5b6..5fcd07c52 100644
--- a/src/generated/forge-mcp/secretsStore/stores/tools.ts
+++ b/src/generated/forge-mcp/secretsStore/stores/tools.ts
@@ -1,62 +1,62 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  secrets_store_api_response_collection_output,
-  secrets_store_api_response_common_failure_output,
-  secrets_store_api_response_common_output,
-  secrets_store_created_output,
-  secrets_store_messages_output,
-  secrets_store_modified_output,
-  secrets_store_store_identifier_output,
+  secrets$$store_api$$response$$collection,
+  secrets$$store_api$$response$$common,
+  secrets$$store_api$$response$$common$$failure,
+  secrets$$store_messages,
 } from "../outputs.js";
 import {
-  secrets_store_account_identifier_output,
-  secrets_store_storeObject_output,
-  secrets_store_store_name_output,
-  secrets_store_store_response_output,
-  secrets_store_stores_response_collection_output,
+  secrets$$store_storeObject,
+  secrets$$store_store_response,
+  secrets$$store_stores_response_collection,
 } from "./outputs.js";
 
 /**
- * The tools of `secrets_store.stores`.
+ * The tools of `secretsStore.stores`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "secrets_store_stores_get",
+    name: "secretsStore_stores_get",
     title: "Get a store by ID",
-    description: "Returns details of a single store.\n\nThis method is beta.",
+    description: "Returns details of a single store.\n\nThis method is beta.\n\nGET /accounts/{account_id}/secrets_store/stores/{store_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "store_id": {
-          "description": "Store identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "store_id": {
+              "description": "Store identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "store_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "store_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_store_response",
       $defs: {
-        "secrets-store_account_identifier": secrets_store_account_identifier_output,
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_storeObject": secrets_store_storeObject_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
-        "secrets-store_store_name": secrets_store_store_name_output,
-        "secrets-store_store_response": secrets_store_store_response_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_storeObject": secrets$$store_storeObject,
+        "secrets-store_store_response": secrets$$store_store_response,
       },
     },
     annotations: {
@@ -91,17 +91,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_account_identifier": secrets_store_account_identifier_output,
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_storeObject": secrets_store_storeObject_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
-        "secrets-store_store_name": secrets_store_store_name_output,
-        "secrets-store_store_response": secrets_store_store_response_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_storeObject": secrets$$store_storeObject,
+        "secrets-store_store_response": secrets$$store_store_response,
       },
     },
     request: (args) => ({
@@ -109,61 +104,72 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "secrets_store_stores_list",
+    name: "secretsStore_stores_list",
     title: "List account stores",
-    description: "Lists all the stores in an account.\n\nThis method is beta.",
+    description: "Lists all the stores in an account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/secrets_store/stores",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account identifier.",
-          "type": "string"
-        },
-        "direction": {
-          "default": "desc",
-          "description": "Direction to sort objects.",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "order": {
-          "default": "created",
-          "description": "Order stores by values in the given field.",
-          "enum": [
-            "name",
-            "created",
-            "modified"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "description": "Page number.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of objects to return per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "desc",
+              "description": "Direction to sort objects.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "created",
+              "description": "Order stores by values in the given field.",
+              "enum": [
+                "name",
+                "created",
+                "modified"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Page number.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of objects to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/secrets-store_stores_response_collection",
       $defs: {
-        "secrets-store_account_identifier": secrets_store_account_identifier_output,
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_storeObject": secrets_store_storeObject_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
-        "secrets-store_store_name": secrets_store_store_name_output,
-        "secrets-store_stores_response_collection": secrets_store_stores_response_collection_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_storeObject": secrets$$store_storeObject,
+        "secrets-store_stores_response_collection": secrets$$store_stores_response_collection,
       },
     },
     annotations: {
@@ -198,26 +204,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "secrets-store_account_identifier": secrets_store_account_identifier_output,
-        "secrets-store_api-response-collection": secrets_store_api_response_collection_output,
-        "secrets-store_api-response-common": secrets_store_api_response_common_output,
-        "secrets-store_api-response-common-failure": secrets_store_api_response_common_failure_output,
-        "secrets-store_created": secrets_store_created_output,
-        "secrets-store_messages": secrets_store_messages_output,
-        "secrets-store_modified": secrets_store_modified_output,
-        "secrets-store_storeObject": secrets_store_storeObject_output,
-        "secrets-store_store_identifier": secrets_store_store_identifier_output,
-        "secrets-store_store_name": secrets_store_store_name_output,
-        "secrets-store_stores_response_collection": secrets_store_stores_response_collection_output,
+        "secrets-store_api-response-collection": secrets$$store_api$$response$$collection,
+        "secrets-store_api-response-common": secrets$$store_api$$response$$common,
+        "secrets-store_api-response-common-failure": secrets$$store_api$$response$$common$$failure,
+        "secrets-store_messages": secrets$$store_messages,
+        "secrets-store_storeObject": secrets$$store_storeObject,
+        "secrets-store_stores_response_collection": secrets$$store_stores_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/secrets_store/stores`,
       query: [
-        ["direction", args["direction"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
+        ["direction", param(args, "query", "direction"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/securityInsights/auditLogs/outputs.ts b/src/generated/forge-mcp/securityInsights/auditLogs/outputs.ts
index 9eb773775..e3805f9a9 100644
--- a/src/generated/forge-mcp/securityInsights/auditLogs/outputs.ts
+++ b/src/generated/forge-mcp/securityInsights/auditLogs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `security-center_auditLog` in responses.
  */
-export const security_center_auditLog_output: JsonSchema = {
+export const security$$center_auditLog: JsonSchema = {
   "properties": {
     "changed_at": {
       "format": "date-time",
@@ -69,7 +69,7 @@ export const security_center_auditLog_output: JsonSchema = {
 /**
  * The schema of `security-center_auditLogResponse` in responses.
  */
-export const security_center_auditLogResponse_output: JsonSchema = {
+export const security$$center_auditLogResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/security-center_api-response-common"
diff --git a/src/generated/forge-mcp/securityInsights/auditLogs/tools.ts b/src/generated/forge-mcp/securityInsights/auditLogs/tools.ts
index 1a3ffbd43..4247d5966 100644
--- a/src/generated/forge-mcp/securityInsights/auditLogs/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/auditLogs/tools.ts
@@ -1,101 +1,113 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../outputs.js";
-import { security_center_identifier } from "../../schemas.js";
 import {
-  security_center_auditLogResponse_output,
-  security_center_auditLog_output,
+  security$$center_auditLog,
+  security$$center_auditLogResponse,
 } from "./outputs.js";
 
 /**
- * The tools of `security_insights.audit_logs`.
+ * The tools of `securityInsights.auditLogs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_audit_logs_get",
+    name: "securityInsights_auditLogs_get",
     title: "Retrieves Issue Audit Log",
-    description: "Lists audit log entries for a specific Security Center insight, showing changes to its status and classification over time.",
+    description: "Lists audit log entries for a specific Security Center insight, showing changes to its status and classification over time.\n\nGET /{account_or_zone}/{account_or_zone_id}/security-center/insights/{issue_id}/audit-log",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "issue_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "issue_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "before": {
-          "description": "Filter entries changed before this timestamp (RFC 3339).",
-          "format": "date-time",
-          "type": "string"
-        },
-        "changed_by": {
-          "description": "Filter by the actor that made the change.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque cursor for pagination. Use the cursor value from result_info of the previous response.",
-          "type": "string"
-        },
-        "field_changed": {
-          "description": "Filter by the field that was changed.",
-          "enum": [
-            "status",
-            "user_classification"
-          ],
-          "type": "string"
-        },
-        "issue_id": {
-          "type": "string"
-        },
-        "order": {
-          "default": "desc",
-          "description": "Sort order for results. Use 'asc' for oldest first or 'desc' for newest first.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 25,
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "since": {
-          "description": "Filter entries changed at or after this timestamp (RFC 3339).",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "before": {
+              "description": "Filter entries changed before this timestamp (RFC 3339).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "changed_by": {
+              "description": "Filter by the actor that made the change.",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Opaque cursor for pagination. Use the cursor value from result_info of the previous response.",
+              "type": "string"
+            },
+            "field_changed": {
+              "description": "Filter by the field that was changed.",
+              "enum": [
+                "status",
+                "user_classification"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "desc",
+              "description": "Sort order for results. Use 'asc' for oldest first or 'desc' for newest first.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "since": {
+              "description": "Filter entries changed at or after this timestamp (RFC 3339).",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "issue_id"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_auditLogResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_auditLog": security_center_auditLog_output,
-        "security-center_auditLogResponse": security_center_auditLogResponse_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_auditLog": security$$center_auditLog,
+        "security-center_auditLogResponse": security$$center_auditLogResponse,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -117,101 +129,114 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_auditLog": security_center_auditLog_output,
-        "security-center_auditLogResponse": security_center_auditLogResponse_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_auditLog": security$$center_auditLog,
+        "security-center_auditLogResponse": security$$center_auditLogResponse,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/security-center/insights/${pathParam(args, "issue_id")}/audit-log`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["cursor", args["cursor"], true],
-        ["field_changed", args["field_changed"], true],
-        ["changed_by", args["changed_by"], true],
-        ["since", args["since"], true],
-        ["before", args["before"], true],
-        ["order", args["order"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["field_changed", param(args, "query", "field_changed"), true],
+        ["changed_by", param(args, "query", "changed_by"), true],
+        ["since", param(args, "query", "since"), true],
+        ["before", param(args, "query", "before"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
   {
-    name: "security_insights_audit_logs_list",
+    name: "securityInsights_auditLogs_list",
     title: "Retrieves account or zone Audit Log",
-    description: "Lists audit log entries for all Security Center insights in the account or zone, showing changes to insight status and classification.",
+    description: "Lists audit log entries for all Security Center insights in the account or zone, showing changes to insight status and classification.\n\nGET /{account_or_zone}/{account_or_zone_id}/security-center/insights/audit-log",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "before": {
-          "description": "Filter entries changed before this timestamp (RFC 3339).",
-          "format": "date-time",
-          "type": "string"
-        },
-        "changed_by": {
-          "description": "Filter by the actor that made the change.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque cursor for pagination. Use the cursor value from result_info of the previous response.",
-          "type": "string"
-        },
-        "field_changed": {
-          "description": "Filter by the field that was changed.",
-          "enum": [
-            "status",
-            "user_classification"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "default": "desc",
-          "description": "Sort order for results. Use 'asc' for oldest first or 'desc' for newest first.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 25,
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "since": {
-          "description": "Filter entries changed at or after this timestamp (RFC 3339).",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "before": {
+              "description": "Filter entries changed before this timestamp (RFC 3339).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "changed_by": {
+              "description": "Filter by the actor that made the change.",
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Opaque cursor for pagination. Use the cursor value from result_info of the previous response.",
+              "type": "string"
+            },
+            "field_changed": {
+              "description": "Filter by the field that was changed.",
+              "enum": [
+                "status",
+                "user_classification"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "desc",
+              "description": "Sort order for results. Use 'asc' for oldest first or 'desc' for newest first.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "since": {
+              "description": "Filter entries changed at or after this timestamp (RFC 3339).",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_auditLogResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_auditLog": security_center_auditLog_output,
-        "security-center_auditLogResponse": security_center_auditLogResponse_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_auditLog": security$$center_auditLog,
+        "security-center_auditLogResponse": security$$center_auditLogResponse,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -233,23 +258,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_auditLog": security_center_auditLog_output,
-        "security-center_auditLogResponse": security_center_auditLogResponse_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_auditLog": security$$center_auditLog,
+        "security-center_auditLogResponse": security$$center_auditLogResponse,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/security-center/insights/audit-log`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["cursor", args["cursor"], true],
-        ["field_changed", args["field_changed"], true],
-        ["changed_by", args["changed_by"], true],
-        ["since", args["since"], true],
-        ["before", args["before"], true],
-        ["order", args["order"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["field_changed", param(args, "query", "field_changed"), true],
+        ["changed_by", param(args, "query", "changed_by"), true],
+        ["since", param(args, "query", "since"), true],
+        ["before", param(args, "query", "before"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/securityInsights/context/tools.ts b/src/generated/forge-mcp/securityInsights/context/tools.ts
index 55e34586b..b9990f7c9 100644
--- a/src/generated/forge-mcp/securityInsights/context/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/context/tools.ts
@@ -3,38 +3,44 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../outputs.js";
-import { security_center_identifier } from "../../schemas.js";
 
 /**
- * The tools of `security_insights.context`.
+ * The tools of `securityInsights.context`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_context_get",
+    name: "securityInsights_context_get",
     title: "Retrieves Security Center Insight Context",
-    description: "Returns the full context payload for an insight. This endpoint is used for insights with large payloads that are not included inline in the list response.",
+    description: "Returns the full context payload for an insight. This endpoint is used for insights with large payloads that are not included inline in the list response.\n\nGET /accounts/{account_id}/security-center/insights/{issue_id}/context",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
-        },
-        "issue_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "issue_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "issue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "issue_id"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -51,8 +57,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -86,9 +92,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/securityInsights/count/outputs.ts b/src/generated/forge-mcp/securityInsights/count/outputs.ts
index 445da1e1e..cb2c609fd 100644
--- a/src/generated/forge-mcp/securityInsights/count/outputs.ts
+++ b/src/generated/forge-mcp/securityInsights/count/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `security-center_partnerInsightCountResponse` in responses.
  */
-export const security_center_partnerInsightCountResponse_output: JsonSchema = {
+export const security$$center_partnerInsightCountResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/security-center_api-response-common"
diff --git a/src/generated/forge-mcp/securityInsights/count/tools.ts b/src/generated/forge-mcp/securityInsights/count/tools.ts
index 06eb96cdc..7ad6cab2e 100644
--- a/src/generated/forge-mcp/securityInsights/count/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/count/tools.ts
@@ -1,114 +1,118 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
-  security_center_valueCountsResponse_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
+  security$$center_valueCountsResponse,
 } from "../../outputs.js";
 import {
-  security_center_dismissed,
-  security_center_identifier,
-  security_center_issueClass,
-  security_center_issueClasses,
-  security_center_issueType,
-  security_center_issueTypes,
-  security_center_products,
-  security_center_severityQueryParam,
-  security_center_source,
-  security_center_sources,
-  security_center_subject,
-  security_center_subjects,
+  security$$center_issueClasses,
+  security$$center_issueTypes,
+  security$$center_products,
+  security$$center_severityQueryParam,
+  security$$center_sources,
+  security$$center_subjects,
 } from "../../schemas.js";
-import { security_center_partnerInsightCountResponse_output } from "./outputs.js";
+import { security$$center_partnerInsightCountResponse } from "./outputs.js";
 
 /**
- * The tools of `security_insights.count`.
+ * The tools of `securityInsights.count`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_count_by_class",
+    name: "securityInsights_count_byClass",
     title: "Retrieves Security Center Insight Counts by Class",
-    description: "Retrieves Security Center insight counts aggregated by classification class.",
+    description: "Retrieves Security Center insight counts aggregated by classification class.\n\nGET /{account_or_zone}/{account_or_zone_id}/security-center/insights/class",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "dismissed": {
-          "$ref": "#/$defs/security-center_dismissed"
-        },
-        "issue_class": {
-          "$ref": "#/$defs/security-center_issueClasses"
-        },
-        "issue_class_neq": {
-          "$ref": "#/$defs/security-center_issueClasses"
-        },
-        "issue_type": {
-          "$ref": "#/$defs/security-center_issueTypes"
-        },
-        "issue_type_neq": {
-          "$ref": "#/$defs/security-center_issueTypes"
-        },
-        "product": {
-          "$ref": "#/$defs/security-center_products"
-        },
-        "product_neq": {
-          "$ref": "#/$defs/security-center_products"
-        },
-        "severity": {
-          "$ref": "#/$defs/security-center_severityQueryParam"
-        },
-        "severity_neq": {
-          "$ref": "#/$defs/security-center_severityQueryParam"
-        },
-        "source": {
-          "$ref": "#/$defs/security-center_sources"
-        },
-        "subject": {
-          "$ref": "#/$defs/security-center_subjects"
-        },
-        "subject_neq": {
-          "$ref": "#/$defs/security-center_subjects"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dismissed": {
+              "type": "boolean"
+            },
+            "issue_class": {
+              "$ref": "#/$defs/security-center_issueClasses"
+            },
+            "issue_class~neq": {
+              "$ref": "#/$defs/security-center_issueClasses"
+            },
+            "issue_type": {
+              "$ref": "#/$defs/security-center_issueTypes"
+            },
+            "issue_type~neq": {
+              "$ref": "#/$defs/security-center_issueTypes"
+            },
+            "product": {
+              "$ref": "#/$defs/security-center_products"
+            },
+            "product~neq": {
+              "$ref": "#/$defs/security-center_products"
+            },
+            "severity": {
+              "$ref": "#/$defs/security-center_severityQueryParam"
+            },
+            "severity~neq": {
+              "$ref": "#/$defs/security-center_severityQueryParam"
+            },
+            "source": {
+              "$ref": "#/$defs/security-center_sources"
+            },
+            "subject": {
+              "$ref": "#/$defs/security-center_subjects"
+            },
+            "subject~neq": {
+              "$ref": "#/$defs/security-center_subjects"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_dismissed": security_center_dismissed,
-        "security-center_identifier": security_center_identifier,
-        "security-center_issueClass": security_center_issueClass,
-        "security-center_issueClasses": security_center_issueClasses,
-        "security-center_issueType": security_center_issueType,
-        "security-center_issueTypes": security_center_issueTypes,
-        "security-center_products": security_center_products,
-        "security-center_severityQueryParam": security_center_severityQueryParam,
-        "security-center_source": security_center_source,
-        "security-center_sources": security_center_sources,
-        "security-center_subject": security_center_subject,
-        "security-center_subjects": security_center_subjects,
+        "security-center_issueClasses": security$$center_issueClasses,
+        "security-center_issueTypes": security$$center_issueTypes,
+        "security-center_products": security$$center_products,
+        "security-center_severityQueryParam": security$$center_severityQueryParam,
+        "security-center_sources": security$$center_sources,
+        "security-center_subjects": security$$center_subjects,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_valueCountsResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_valueCountsResponse": security_center_valueCountsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_valueCountsResponse": security$$center_valueCountsResponse,
       },
     },
     annotations: {
@@ -130,71 +134,87 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_valueCountsResponse": security_center_valueCountsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_valueCountsResponse": security$$center_valueCountsResponse,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/security-center/insights/class`,
       query: [
-        ["dismissed", args["dismissed"], true],
-        ["issue_class", args["issue_class"], true],
-        ["issue_type", args["issue_type"], true],
-        ["product", args["product"], true],
-        ["source", args["source"], true],
-        ["severity", args["severity"], true],
-        ["subject", args["subject"], true],
-        ["issue_class~neq", args["issue_class_neq"], true],
-        ["issue_type~neq", args["issue_type_neq"], true],
-        ["product~neq", args["product_neq"], true],
-        ["severity~neq", args["severity_neq"], true],
-        ["subject~neq", args["subject_neq"], true],
+        ["dismissed", param(args, "query", "dismissed"), true],
+        ["issue_class", param(args, "query", "issue_class"), true],
+        ["issue_type", param(args, "query", "issue_type"), true],
+        ["product", param(args, "query", "product"), true],
+        ["source", param(args, "query", "source"), true],
+        ["severity", param(args, "query", "severity"), true],
+        ["subject", param(args, "query", "subject"), true],
+        ["issue_class~neq", param(args, "query", "issue_class~neq"), true],
+        ["issue_type~neq", param(args, "query", "issue_type~neq"), true],
+        ["product~neq", param(args, "query", "product~neq"), true],
+        ["severity~neq", param(args, "query", "severity~neq"), true],
+        ["subject~neq", param(args, "query", "subject~neq"), true],
       ],
     }),
   },
   {
-    name: "security_insights_count_by_partner",
+    name: "securityInsights_count_byPartner",
     title: "Retrieves a Partner Security Center Insight Count",
-    description: "Retrieves the uncapped count of active, non-dismissed, unclassified RiskRecon insights for the account or zone.\n\nThis method is beta.",
+    description: "Retrieves the uncapped count of active, non-dismissed, unclassified RiskRecon insights for the account or zone.\n\nThis method is beta.\n\nGET /{account_or_zone}/{account_or_zone_id}/security-center/insights/partner-count",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "source": {
-          "enum": [
-            "riskrecon"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "source": {
+              "enum": [
+                "riskrecon"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "source"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "source"
+        "path",
+        "query"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_partnerInsightCountResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerInsightCountResponse": security_center_partnerInsightCountResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerInsightCountResponse": security$$center_partnerInsightCountResponse,
       },
     },
     annotations: {
@@ -216,100 +236,110 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerInsightCountResponse": security_center_partnerInsightCountResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerInsightCountResponse": security$$center_partnerInsightCountResponse,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/security-center/insights/partner-count`,
       query: [
-        ["source", args["source"], true],
+        ["source", param(args, "query", "source"), true],
       ],
     }),
   },
   {
-    name: "security_insights_count_by_severity",
+    name: "securityInsights_count_bySeverity",
     title: "Retrieves Security Center Insight Counts by Severity",
-    description: "Retrieves Security Center insight counts aggregated by severity level (critical, high, medium, low).",
+    description: "Retrieves Security Center insight counts aggregated by severity level (critical, high, medium, low).\n\nGET /{account_or_zone}/{account_or_zone_id}/security-center/insights/severity",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "dismissed": {
-          "$ref": "#/$defs/security-center_dismissed"
-        },
-        "issue_class": {
-          "$ref": "#/$defs/security-center_issueClasses"
-        },
-        "issue_class_neq": {
-          "$ref": "#/$defs/security-center_issueClasses"
-        },
-        "issue_type": {
-          "$ref": "#/$defs/security-center_issueTypes"
-        },
-        "issue_type_neq": {
-          "$ref": "#/$defs/security-center_issueTypes"
-        },
-        "product": {
-          "$ref": "#/$defs/security-center_products"
-        },
-        "product_neq": {
-          "$ref": "#/$defs/security-center_products"
-        },
-        "severity": {
-          "$ref": "#/$defs/security-center_severityQueryParam"
-        },
-        "severity_neq": {
-          "$ref": "#/$defs/security-center_severityQueryParam"
-        },
-        "source": {
-          "$ref": "#/$defs/security-center_sources"
-        },
-        "subject": {
-          "$ref": "#/$defs/security-center_subjects"
-        },
-        "subject_neq": {
-          "$ref": "#/$defs/security-center_subjects"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dismissed": {
+              "type": "boolean"
+            },
+            "issue_class": {
+              "$ref": "#/$defs/security-center_issueClasses"
+            },
+            "issue_class~neq": {
+              "$ref": "#/$defs/security-center_issueClasses"
+            },
+            "issue_type": {
+              "$ref": "#/$defs/security-center_issueTypes"
+            },
+            "issue_type~neq": {
+              "$ref": "#/$defs/security-center_issueTypes"
+            },
+            "product": {
+              "$ref": "#/$defs/security-center_products"
+            },
+            "product~neq": {
+              "$ref": "#/$defs/security-center_products"
+            },
+            "severity": {
+              "$ref": "#/$defs/security-center_severityQueryParam"
+            },
+            "severity~neq": {
+              "$ref": "#/$defs/security-center_severityQueryParam"
+            },
+            "source": {
+              "$ref": "#/$defs/security-center_sources"
+            },
+            "subject": {
+              "$ref": "#/$defs/security-center_subjects"
+            },
+            "subject~neq": {
+              "$ref": "#/$defs/security-center_subjects"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_dismissed": security_center_dismissed,
-        "security-center_identifier": security_center_identifier,
-        "security-center_issueClass": security_center_issueClass,
-        "security-center_issueClasses": security_center_issueClasses,
-        "security-center_issueType": security_center_issueType,
-        "security-center_issueTypes": security_center_issueTypes,
-        "security-center_products": security_center_products,
-        "security-center_severityQueryParam": security_center_severityQueryParam,
-        "security-center_source": security_center_source,
-        "security-center_sources": security_center_sources,
-        "security-center_subject": security_center_subject,
-        "security-center_subjects": security_center_subjects,
+        "security-center_issueClasses": security$$center_issueClasses,
+        "security-center_issueTypes": security$$center_issueTypes,
+        "security-center_products": security$$center_products,
+        "security-center_severityQueryParam": security$$center_severityQueryParam,
+        "security-center_sources": security$$center_sources,
+        "security-center_subjects": security$$center_subjects,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_valueCountsResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_valueCountsResponse": security_center_valueCountsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_valueCountsResponse": security$$center_valueCountsResponse,
       },
     },
     annotations: {
@@ -331,111 +361,121 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_valueCountsResponse": security_center_valueCountsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_valueCountsResponse": security$$center_valueCountsResponse,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/security-center/insights/severity`,
       query: [
-        ["dismissed", args["dismissed"], true],
-        ["issue_class", args["issue_class"], true],
-        ["issue_type", args["issue_type"], true],
-        ["product", args["product"], true],
-        ["source", args["source"], true],
-        ["severity", args["severity"], true],
-        ["subject", args["subject"], true],
-        ["issue_class~neq", args["issue_class_neq"], true],
-        ["issue_type~neq", args["issue_type_neq"], true],
-        ["product~neq", args["product_neq"], true],
-        ["severity~neq", args["severity_neq"], true],
-        ["subject~neq", args["subject_neq"], true],
+        ["dismissed", param(args, "query", "dismissed"), true],
+        ["issue_class", param(args, "query", "issue_class"), true],
+        ["issue_type", param(args, "query", "issue_type"), true],
+        ["product", param(args, "query", "product"), true],
+        ["source", param(args, "query", "source"), true],
+        ["severity", param(args, "query", "severity"), true],
+        ["subject", param(args, "query", "subject"), true],
+        ["issue_class~neq", param(args, "query", "issue_class~neq"), true],
+        ["issue_type~neq", param(args, "query", "issue_type~neq"), true],
+        ["product~neq", param(args, "query", "product~neq"), true],
+        ["severity~neq", param(args, "query", "severity~neq"), true],
+        ["subject~neq", param(args, "query", "subject~neq"), true],
       ],
     }),
   },
   {
-    name: "security_insights_count_by_type",
+    name: "securityInsights_count_byType",
     title: "Retrieves Security Center Insight Counts by Type",
-    description: "Retrieves Security Center insight counts aggregated by insight type.",
+    description: "Retrieves Security Center insight counts aggregated by insight type.\n\nGET /{account_or_zone}/{account_or_zone_id}/security-center/insights/type",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "dismissed": {
-          "$ref": "#/$defs/security-center_dismissed"
-        },
-        "issue_class": {
-          "$ref": "#/$defs/security-center_issueClasses"
-        },
-        "issue_class_neq": {
-          "$ref": "#/$defs/security-center_issueClasses"
-        },
-        "issue_type": {
-          "$ref": "#/$defs/security-center_issueTypes"
-        },
-        "issue_type_neq": {
-          "$ref": "#/$defs/security-center_issueTypes"
-        },
-        "product": {
-          "$ref": "#/$defs/security-center_products"
-        },
-        "product_neq": {
-          "$ref": "#/$defs/security-center_products"
-        },
-        "severity": {
-          "$ref": "#/$defs/security-center_severityQueryParam"
-        },
-        "severity_neq": {
-          "$ref": "#/$defs/security-center_severityQueryParam"
-        },
-        "source": {
-          "$ref": "#/$defs/security-center_sources"
-        },
-        "subject": {
-          "$ref": "#/$defs/security-center_subjects"
-        },
-        "subject_neq": {
-          "$ref": "#/$defs/security-center_subjects"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dismissed": {
+              "type": "boolean"
+            },
+            "issue_class": {
+              "$ref": "#/$defs/security-center_issueClasses"
+            },
+            "issue_class~neq": {
+              "$ref": "#/$defs/security-center_issueClasses"
+            },
+            "issue_type": {
+              "$ref": "#/$defs/security-center_issueTypes"
+            },
+            "issue_type~neq": {
+              "$ref": "#/$defs/security-center_issueTypes"
+            },
+            "product": {
+              "$ref": "#/$defs/security-center_products"
+            },
+            "product~neq": {
+              "$ref": "#/$defs/security-center_products"
+            },
+            "severity": {
+              "$ref": "#/$defs/security-center_severityQueryParam"
+            },
+            "severity~neq": {
+              "$ref": "#/$defs/security-center_severityQueryParam"
+            },
+            "source": {
+              "$ref": "#/$defs/security-center_sources"
+            },
+            "subject": {
+              "$ref": "#/$defs/security-center_subjects"
+            },
+            "subject~neq": {
+              "$ref": "#/$defs/security-center_subjects"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_dismissed": security_center_dismissed,
-        "security-center_identifier": security_center_identifier,
-        "security-center_issueClass": security_center_issueClass,
-        "security-center_issueClasses": security_center_issueClasses,
-        "security-center_issueType": security_center_issueType,
-        "security-center_issueTypes": security_center_issueTypes,
-        "security-center_products": security_center_products,
-        "security-center_severityQueryParam": security_center_severityQueryParam,
-        "security-center_source": security_center_source,
-        "security-center_sources": security_center_sources,
-        "security-center_subject": security_center_subject,
-        "security-center_subjects": security_center_subjects,
+        "security-center_issueClasses": security$$center_issueClasses,
+        "security-center_issueTypes": security$$center_issueTypes,
+        "security-center_products": security$$center_products,
+        "security-center_severityQueryParam": security$$center_severityQueryParam,
+        "security-center_sources": security$$center_sources,
+        "security-center_subjects": security$$center_subjects,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_valueCountsResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_valueCountsResponse": security_center_valueCountsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_valueCountsResponse": security$$center_valueCountsResponse,
       },
     },
     annotations: {
@@ -457,27 +497,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_valueCountsResponse": security_center_valueCountsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_valueCountsResponse": security$$center_valueCountsResponse,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/security-center/insights/type`,
       query: [
-        ["dismissed", args["dismissed"], true],
-        ["issue_class", args["issue_class"], true],
-        ["issue_type", args["issue_type"], true],
-        ["product", args["product"], true],
-        ["source", args["source"], true],
-        ["severity", args["severity"], true],
-        ["subject", args["subject"], true],
-        ["issue_class~neq", args["issue_class_neq"], true],
-        ["issue_type~neq", args["issue_type_neq"], true],
-        ["product~neq", args["product_neq"], true],
-        ["severity~neq", args["severity_neq"], true],
-        ["subject~neq", args["subject_neq"], true],
+        ["dismissed", param(args, "query", "dismissed"), true],
+        ["issue_class", param(args, "query", "issue_class"), true],
+        ["issue_type", param(args, "query", "issue_type"), true],
+        ["product", param(args, "query", "product"), true],
+        ["source", param(args, "query", "source"), true],
+        ["severity", param(args, "query", "severity"), true],
+        ["subject", param(args, "query", "subject"), true],
+        ["issue_class~neq", param(args, "query", "issue_class~neq"), true],
+        ["issue_type~neq", param(args, "query", "issue_type~neq"), true],
+        ["product~neq", param(args, "query", "product~neq"), true],
+        ["severity~neq", param(args, "query", "severity~neq"), true],
+        ["subject~neq", param(args, "query", "subject~neq"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/securityInsights/partners/outputs.ts b/src/generated/forge-mcp/securityInsights/partners/outputs.ts
index 82d9150d9..230c6ee8b 100644
--- a/src/generated/forge-mcp/securityInsights/partners/outputs.ts
+++ b/src/generated/forge-mcp/securityInsights/partners/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `security-center_partnerAssetResultInfo` in responses.
  */
-export const security_center_partnerAssetResultInfo_output: JsonSchema = {
+export const security$$center_partnerAssetResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -25,21 +25,10 @@ export const security_center_partnerAssetResultInfo_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `security-center_partnerEntitlement` in responses.
- */
-export const security_center_partnerEntitlement_output: JsonSchema = {
-  "enum": [
-    "baseline",
-    "premium"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `security-center_shadowHost` in responses.
  */
-export const security_center_shadowHost_output: JsonSchema = {
+export const security$$center_shadowHost: JsonSchema = {
   "properties": {
     "criticality": {
       "enum": [
@@ -81,7 +70,7 @@ export const security_center_shadowHost_output: JsonSchema = {
 /**
  * The schema of `security-center_shadowHostsResponse` in responses.
  */
-export const security_center_shadowHostsResponse_output: JsonSchema = {
+export const security$$center_shadowHostsResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/security-center_api-response-common"
@@ -97,7 +86,11 @@ export const security_center_shadowHostsResponse_output: JsonSchema = {
               "type": "string"
             },
             "entitlement": {
-              "$ref": "#/$defs/security-center_partnerEntitlement"
+              "enum": [
+                "baseline",
+                "premium"
+              ],
+              "type": "string"
             },
             "items": {
               "items": {
diff --git a/src/generated/forge-mcp/securityInsights/partners/settings/outputs.ts b/src/generated/forge-mcp/securityInsights/partners/settings/outputs.ts
index 14f188577..f97f63730 100644
--- a/src/generated/forge-mcp/securityInsights/partners/settings/outputs.ts
+++ b/src/generated/forge-mcp/securityInsights/partners/settings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `security-center_partnerSettings` in responses.
  */
-export const security_center_partnerSettings_output: JsonSchema = {
+export const security$$center_partnerSettings: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -21,7 +21,7 @@ export const security_center_partnerSettings_output: JsonSchema = {
 /**
  * The schema of `security-center_partnerSettingsGetResponse` in responses.
  */
-export const security_center_partnerSettingsGetResponse_output: JsonSchema = {
+export const security$$center_partnerSettingsGetResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/security-center_api-response-common"
@@ -57,7 +57,7 @@ export const security_center_partnerSettingsGetResponse_output: JsonSchema = {
 /**
  * The schema of `security-center_partnerSettingsPostResponse` in responses.
  */
-export const security_center_partnerSettingsPostResponse_output: JsonSchema = {
+export const security$$center_partnerSettingsPostResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/security-center_api-response-common"
diff --git a/src/generated/forge-mcp/securityInsights/partners/settings/schemas.ts b/src/generated/forge-mcp/securityInsights/partners/settings/schemas.ts
index 04adfe35d..5aa92bca9 100644
--- a/src/generated/forge-mcp/securityInsights/partners/settings/schemas.ts
+++ b/src/generated/forge-mcp/securityInsights/partners/settings/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `security-center_partnerSettings`.
  */
-export const security_center_partnerSettings: JsonSchema = {
+export const security$$center_partnerSettings: JsonSchema = {
   "properties": {
     "enabled": {
       "description": "Whether the partner integration is enabled for the account.",
diff --git a/src/generated/forge-mcp/securityInsights/partners/settings/tools.ts b/src/generated/forge-mcp/securityInsights/partners/settings/tools.ts
index 9d615797a..89099d1b4 100644
--- a/src/generated/forge-mcp/securityInsights/partners/settings/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/partners/settings/tools.ts
@@ -3,55 +3,61 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../../outputs.js";
-import { security_center_identifier } from "../../../schemas.js";
 import {
-  security_center_partnerSettingsGetResponse_output,
-  security_center_partnerSettingsPostResponse_output,
-  security_center_partnerSettings_output,
+  security$$center_partnerSettings,
+  security$$center_partnerSettingsGetResponse,
+  security$$center_partnerSettingsPostResponse,
 } from "./outputs.js";
-import { security_center_partnerSettings } from "./schemas.js";
+import { security$$center_partnerSettings as security$$center_partnerSettings$ } from "./schemas.js";
 
 /**
- * The tools of `security_insights.partners.settings`.
+ * The tools of `securityInsights.partners.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_partners_settings_get",
+    name: "securityInsights_partners_settings_get",
     title: "Retrieves Partner Integration Settings",
-    description: "Returns whether the account has enabled the selected partner integration and, if enabled, whether the account has been matched with the partner. An integration that has not been configured is returned as disabled.\n\nThis method is beta.",
+    description: "Returns whether the account has enabled the selected partner integration and, if enabled, whether the account has been matched with the partner. An integration that has not been configured is returned as disabled.\n\nThis method is beta.\n\nGET /accounts/{account_id}/security-center/partners/{partner}/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
-        },
-        "partner": {
-          "description": "The partner integration identifier.",
-          "enum": [
-            "riskrecon"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "partner": {
+              "description": "The partner integration identifier.",
+              "enum": [
+                "riskrecon"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "partner"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "partner"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_partnerSettingsGetResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerSettingsGetResponse": security_center_partnerSettingsGetResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerSettingsGetResponse": security$$center_partnerSettingsGetResponse,
       },
     },
     annotations: {
@@ -73,10 +79,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerSettingsGetResponse": security_center_partnerSettingsGetResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerSettingsGetResponse": security$$center_partnerSettingsGetResponse,
       },
     },
     request: (args) => ({
@@ -84,44 +90,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "security_insights_partners_settings_update",
+    name: "securityInsights_partners_settings_update",
     title: "Updates Partner Integration Settings",
-    description: "Enables or disables the selected partner integration for the account. Enabling the integration for the first time also schedules an account scan for that partner.\n\nThis method is beta.",
+    description: "Enables or disables the selected partner integration for the account. Enabling the integration for the first time also schedules an account scan for that partner.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/security-center/partners/{partner}/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/security-center_partnerSettings"
         },
-        "partner": {
-          "description": "The partner integration identifier.",
-          "enum": [
-            "riskrecon"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "partner": {
+              "description": "The partner integration identifier.",
+              "enum": [
+                "riskrecon"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "partner"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "partner",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_identifier": security_center_identifier,
-        "security-center_partnerSettings": security_center_partnerSettings,
+        "security-center_partnerSettings": security$$center_partnerSettings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_partnerSettingsPostResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerSettings": security_center_partnerSettings_output,
-        "security-center_partnerSettingsPostResponse": security_center_partnerSettingsPostResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerSettings": security$$center_partnerSettings,
+        "security-center_partnerSettingsPostResponse": security$$center_partnerSettingsPostResponse,
       },
     },
     annotations: {
@@ -143,11 +158,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerSettings": security_center_partnerSettings_output,
-        "security-center_partnerSettingsPostResponse": security_center_partnerSettingsPostResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerSettings": security$$center_partnerSettings,
+        "security-center_partnerSettingsPostResponse": security$$center_partnerSettingsPostResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/securityInsights/partners/shadowHosts/tools.ts b/src/generated/forge-mcp/securityInsights/partners/shadowHosts/tools.ts
index ccc68c1eb..911a7d9bb 100644
--- a/src/generated/forge-mcp/securityInsights/partners/shadowHosts/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/partners/shadowHosts/tools.ts
@@ -1,69 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../../outputs.js";
-import { security_center_identifier } from "../../../schemas.js";
 import {
-  security_center_partnerAssetResultInfo_output,
-  security_center_partnerEntitlement_output,
-  security_center_shadowHost_output,
-  security_center_shadowHostsResponse_output,
+  security$$center_partnerAssetResultInfo,
+  security$$center_shadowHost,
+  security$$center_shadowHostsResponse,
 } from "../outputs.js";
 
 /**
- * The tools of `security_insights.partners.shadow_hosts`.
+ * The tools of `securityInsights.partners.shadowHosts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_partners_shadow_hosts_list",
+    name: "securityInsights_partners_shadowHosts_list",
     title: "Lists Partner-Discovered Shadow Hosts for a Zone",
-    description: "Lists partner-discovered hosts beneath the zone that are not in the account.\n\nThis method is beta.",
+    description: "Lists partner-discovered hosts beneath the zone that are not in the account.\n\nThis method is beta.\n\nGET /zones/{zone_id}/security-center/partners/{partner}/shadow-hosts",
     inputSchema: {
       type: "object",
       properties: {
-        "cursor": {
-          "description": "Opaque cursor from the previous response's `result_info.cursor`. Omit for the first page.",
-          "type": "string"
-        },
-        "partner": {
-          "description": "The partner integration identifier.",
-          "enum": [
-            "riskrecon"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "partner": {
+              "description": "The partner integration identifier.",
+              "enum": [
+                "riskrecon"
+              ],
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "partner"
           ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 25,
-          "description": "Number of premium partner asset results per page. Values other than 1 must be a multiple of 5.",
-          "type": "integer"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque cursor from the previous response's `result_info.cursor`. Omit for the first page.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of premium partner asset results per page. Values other than 1 must be a multiple of 5.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "partner"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_shadowHostsResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerAssetResultInfo": security_center_partnerAssetResultInfo_output,
-        "security-center_partnerEntitlement": security_center_partnerEntitlement_output,
-        "security-center_shadowHost": security_center_shadowHost_output,
-        "security-center_shadowHostsResponse": security_center_shadowHostsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerAssetResultInfo": security$$center_partnerAssetResultInfo,
+        "security-center_shadowHost": security$$center_shadowHost,
+        "security-center_shadowHostsResponse": security$$center_shadowHostsResponse,
       },
     },
     annotations: {
@@ -91,20 +101,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerAssetResultInfo": security_center_partnerAssetResultInfo_output,
-        "security-center_partnerEntitlement": security_center_partnerEntitlement_output,
-        "security-center_shadowHost": security_center_shadowHost_output,
-        "security-center_shadowHostsResponse": security_center_shadowHostsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerAssetResultInfo": security$$center_partnerAssetResultInfo,
+        "security-center_shadowHost": security$$center_shadowHost,
+        "security-center_shadowHostsResponse": security$$center_shadowHostsResponse,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/security-center/partners/${pathParam(args, "partner")}/shadow-hosts`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/securityInsights/partners/shadowZoneHosts/tools.ts b/src/generated/forge-mcp/securityInsights/partners/shadowZoneHosts/tools.ts
index 8cc383133..8642b6ec6 100644
--- a/src/generated/forge-mcp/securityInsights/partners/shadowZoneHosts/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/partners/shadowZoneHosts/tools.ts
@@ -1,74 +1,84 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../../outputs.js";
-import { security_center_identifier } from "../../../schemas.js";
 import {
-  security_center_partnerAssetResultInfo_output,
-  security_center_partnerEntitlement_output,
-  security_center_shadowHost_output,
-  security_center_shadowHostsResponse_output,
+  security$$center_partnerAssetResultInfo,
+  security$$center_shadowHost,
+  security$$center_shadowHostsResponse,
 } from "../outputs.js";
 
 /**
- * The tools of `security_insights.partners.shadow_zone_hosts`.
+ * The tools of `securityInsights.partners.shadowZoneHosts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_partners_shadow_zone_hosts_list",
+    name: "securityInsights_partners_shadowZoneHosts_list",
     title: "Lists Hosts in a Partner-Discovered Shadow Zone",
-    description: "Lists hosts discovered beneath a shadow-zone domain. This endpoint is available only to premium accounts and supports JSON and CSV output.\n\nThis method is beta.",
+    description: "Lists hosts discovered beneath a shadow-zone domain. This endpoint is available only to premium accounts and supports JSON and CSV output.\n\nThis method is beta.\n\nGET /accounts/{account_id}/security-center/partners/{partner}/shadow-zones/{domain}/hosts",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
-        },
-        "cursor": {
-          "description": "Opaque cursor from the previous response's `result_info.cursor`. Omit for the first page.",
-          "type": "string"
-        },
-        "domain": {
-          "description": "The shadow-zone domain.",
-          "type": "string"
-        },
-        "partner": {
-          "description": "The partner integration identifier.",
-          "enum": [
-            "riskrecon"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "domain": {
+              "description": "The shadow-zone domain.",
+              "type": "string"
+            },
+            "partner": {
+              "description": "The partner integration identifier.",
+              "enum": [
+                "riskrecon"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "partner",
+            "domain"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "per_page": {
-          "default": 25,
-          "description": "Number of premium partner asset results per page. Values other than 1 must be a multiple of 5.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque cursor from the previous response's `result_info.cursor`. Omit for the first page.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of premium partner asset results per page. Values other than 1 must be a multiple of 5.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "partner",
-        "domain"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_shadowHostsResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerAssetResultInfo": security_center_partnerAssetResultInfo_output,
-        "security-center_partnerEntitlement": security_center_partnerEntitlement_output,
-        "security-center_shadowHost": security_center_shadowHost_output,
-        "security-center_shadowHostsResponse": security_center_shadowHostsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerAssetResultInfo": security$$center_partnerAssetResultInfo,
+        "security-center_shadowHost": security$$center_shadowHost,
+        "security-center_shadowHostsResponse": security$$center_shadowHostsResponse,
       },
     },
     annotations: {
@@ -90,20 +100,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerAssetResultInfo": security_center_partnerAssetResultInfo_output,
-        "security-center_partnerEntitlement": security_center_partnerEntitlement_output,
-        "security-center_shadowHost": security_center_shadowHost_output,
-        "security-center_shadowHostsResponse": security_center_shadowHostsResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerAssetResultInfo": security$$center_partnerAssetResultInfo,
+        "security-center_shadowHost": security$$center_shadowHost,
+        "security-center_shadowHostsResponse": security$$center_shadowHostsResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/security-center/partners/${pathParam(args, "partner")}/shadow-zones/${pathParam(args, "domain")}/hosts`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/securityInsights/partners/shadowZones/outputs.ts b/src/generated/forge-mcp/securityInsights/partners/shadowZones/outputs.ts
index 5d4367e60..ddd72ca70 100644
--- a/src/generated/forge-mcp/securityInsights/partners/shadowZones/outputs.ts
+++ b/src/generated/forge-mcp/securityInsights/partners/shadowZones/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `security-center_shadowZone` in responses.
  */
-export const security_center_shadowZone_output: JsonSchema = {
+export const security$$center_shadowZone: JsonSchema = {
   "properties": {
     "discovered_at": {
       "format": "date-time",
@@ -30,7 +30,7 @@ export const security_center_shadowZone_output: JsonSchema = {
 /**
  * The schema of `security-center_shadowZonesResponse` in responses.
  */
-export const security_center_shadowZonesResponse_output: JsonSchema = {
+export const security$$center_shadowZonesResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/security-center_api-response-common"
@@ -43,7 +43,11 @@ export const security_center_shadowZonesResponse_output: JsonSchema = {
               "type": "boolean"
             },
             "entitlement": {
-              "$ref": "#/$defs/security-center_partnerEntitlement"
+              "enum": [
+                "baseline",
+                "premium"
+              ],
+              "type": "string"
             },
             "items": {
               "items": {
diff --git a/src/generated/forge-mcp/securityInsights/partners/shadowZones/tools.ts b/src/generated/forge-mcp/securityInsights/partners/shadowZones/tools.ts
index a20d99797..4669fd068 100644
--- a/src/generated/forge-mcp/securityInsights/partners/shadowZones/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/partners/shadowZones/tools.ts
@@ -1,71 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../../outputs.js";
-import { security_center_identifier } from "../../../schemas.js";
+import { security$$center_partnerAssetResultInfo } from "../outputs.js";
 import {
-  security_center_partnerAssetResultInfo_output,
-  security_center_partnerEntitlement_output,
-} from "../outputs.js";
-import {
-  security_center_shadowZone_output,
-  security_center_shadowZonesResponse_output,
+  security$$center_shadowZone,
+  security$$center_shadowZonesResponse,
 } from "./outputs.js";
 
 /**
- * The tools of `security_insights.partners.shadow_zones`.
+ * The tools of `securityInsights.partners.shadowZones`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_partners_shadow_zones_list",
+    name: "securityInsights_partners_shadowZones_list",
     title: "Lists Partner-Discovered Shadow Zones",
-    description: "Lists domains discovered by the selected partner that are not in the account. Baseline accounts receive the total count only; premium accounts receive paginated items and may request CSV output.\n\nThis method is beta.",
+    description: "Lists domains discovered by the selected partner that are not in the account. Baseline accounts receive the total count only; premium accounts receive paginated items and may request CSV output.\n\nThis method is beta.\n\nGET /accounts/{account_id}/security-center/partners/{partner}/shadow-zones",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
-        },
-        "cursor": {
-          "description": "Opaque cursor from the previous response's `result_info.cursor`. Omit for the first page.",
-          "type": "string"
-        },
-        "partner": {
-          "description": "The partner integration identifier.",
-          "enum": [
-            "riskrecon"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "partner": {
+              "description": "The partner integration identifier.",
+              "enum": [
+                "riskrecon"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "partner"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "per_page": {
-          "default": 25,
-          "description": "Number of premium partner asset results per page. Values other than 1 must be a multiple of 5.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque cursor from the previous response's `result_info.cursor`. Omit for the first page.",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of premium partner asset results per page. Values other than 1 must be a multiple of 5.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "partner"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_shadowZonesResponse",
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerAssetResultInfo": security_center_partnerAssetResultInfo_output,
-        "security-center_partnerEntitlement": security_center_partnerEntitlement_output,
-        "security-center_shadowZone": security_center_shadowZone_output,
-        "security-center_shadowZonesResponse": security_center_shadowZonesResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerAssetResultInfo": security$$center_partnerAssetResultInfo,
+        "security-center_shadowZone": security$$center_shadowZone,
+        "security-center_shadowZonesResponse": security$$center_shadowZonesResponse,
       },
     },
     annotations: {
@@ -87,20 +95,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_partnerAssetResultInfo": security_center_partnerAssetResultInfo_output,
-        "security-center_partnerEntitlement": security_center_partnerEntitlement_output,
-        "security-center_shadowZone": security_center_shadowZone_output,
-        "security-center_shadowZonesResponse": security_center_shadowZonesResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_partnerAssetResultInfo": security$$center_partnerAssetResultInfo,
+        "security-center_shadowZone": security$$center_shadowZone,
+        "security-center_shadowZonesResponse": security$$center_shadowZonesResponse,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/security-center/partners/${pathParam(args, "partner")}/shadow-zones`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["per_page", args["per_page"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/securityInsights/scans/outputs.ts b/src/generated/forge-mcp/securityInsights/scans/outputs.ts
index 65a59fc34..85d460c38 100644
--- a/src/generated/forge-mcp/securityInsights/scans/outputs.ts
+++ b/src/generated/forge-mcp/securityInsights/scans/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `security-center_newScanResponse` in responses.
  */
-export const security_center_newScanResponse_output: JsonSchema = {
+export const security$$center_newScanResponse: JsonSchema = {
   "properties": {
     "scan_id": {
       "type": "string"
@@ -18,7 +18,7 @@ export const security_center_newScanResponse_output: JsonSchema = {
 /**
  * The schema of `security-center_scanQuota` in responses.
  */
-export const security_center_scanQuota_output: JsonSchema = {
+export const security$$center_scanQuota: JsonSchema = {
   "properties": {
     "available": {
       "type": "integer"
@@ -37,7 +37,7 @@ export const security_center_scanQuota_output: JsonSchema = {
 /**
  * The schema of `security-center_scanStatusResponse` in responses.
  */
-export const security_center_scanStatusResponse_output: JsonSchema = {
+export const security$$center_scanStatusResponse: JsonSchema = {
   "properties": {
     "scan_id": {
       "type": "string"
@@ -65,7 +65,7 @@ export const security_center_scanStatusResponse_output: JsonSchema = {
 /**
  * The schema of `security-center_scansListResponse` in responses.
  */
-export const security_center_scansListResponse_output: JsonSchema = {
+export const security$$center_scansListResponse: JsonSchema = {
   "properties": {
     "quota": {
       "$ref": "#/$defs/security-center_scanQuota"
diff --git a/src/generated/forge-mcp/securityInsights/scans/schemas.ts b/src/generated/forge-mcp/securityInsights/scans/schemas.ts
index aee05e31b..800229d34 100644
--- a/src/generated/forge-mcp/securityInsights/scans/schemas.ts
+++ b/src/generated/forge-mcp/securityInsights/scans/schemas.ts
@@ -6,13 +6,21 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `security-center_newScanRequest`.
  */
-export const security_center_newScanRequest: JsonSchema = {
+export const security$$center_newScanRequest: JsonSchema = {
   "description": "Request body for starting an on-demand scan. Specify issue_type or issue_class to scope the scan, or provide an empty object to scan all issue types.",
   "oneOf": [
     {
       "properties": {
         "issue_type": {
-          "$ref": "#/$defs/security-center_issueType"
+          "enum": [
+            "compliance_violation",
+            "email_security",
+            "exposed_infrastructure",
+            "insecure_configuration",
+            "weak_authentication",
+            "configuration_suggestion"
+          ],
+          "type": "string"
         }
       },
       "required": [
@@ -23,7 +31,7 @@ export const security_center_newScanRequest: JsonSchema = {
     {
       "properties": {
         "issue_class": {
-          "$ref": "#/$defs/security-center_issueClass"
+          "type": "string"
         }
       },
       "required": [
diff --git a/src/generated/forge-mcp/securityInsights/scans/tools.ts b/src/generated/forge-mcp/securityInsights/scans/tools.ts
index 620887c57..aff20d5af 100644
--- a/src/generated/forge-mcp/securityInsights/scans/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/scans/tools.ts
@@ -3,54 +3,56 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../outputs.js";
 import {
-  security_center_identifier,
-  security_center_issueClass,
-  security_center_issueType,
-} from "../../schemas.js";
-import {
-  security_center_newScanResponse_output,
-  security_center_scanQuota_output,
-  security_center_scanStatusResponse_output,
-  security_center_scansListResponse_output,
+  security$$center_newScanResponse,
+  security$$center_scanQuota,
+  security$$center_scanStatusResponse,
+  security$$center_scansListResponse,
 } from "./outputs.js";
-import { security_center_newScanRequest } from "./schemas.js";
+import { security$$center_newScanRequest } from "./schemas.js";
 
 /**
- * The tools of `security_insights.scans`.
+ * The tools of `securityInsights.scans`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_scans_list",
+    name: "securityInsights_scans_list",
     title: "Get Recent account or zone Scans",
-    description: "Returns the most recent on-demand scans for the account or zone, up to a maximum of 5. Each scan includes its ID, start time, and current status. This includes both account or zone-wide and zone-scoped scans. Also returns quota information showing how many scans have been used and how many remain in the current 24-hour window.",
+    description: "Returns the most recent on-demand scans for the account or zone, up to a maximum of 5. Each scan includes its ID, start time, and current status. This includes both account or zone-wide and zone-scoped scans. Also returns quota information showing how many scans have been used and how many remain in the current 24-hour window.\n\nGET /{account_or_zone}/{account_or_zone_id}/security-center/insights/scans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -67,11 +69,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_scanQuota": security_center_scanQuota_output,
-        "security-center_scanStatusResponse": security_center_scanStatusResponse_output,
-        "security-center_scansListResponse": security_center_scansListResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_scanQuota": security$$center_scanQuota,
+        "security-center_scanStatusResponse": security$$center_scanStatusResponse,
+        "security-center_scansListResponse": security$$center_scansListResponse,
       },
     },
     annotations: {
@@ -105,12 +107,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_scanQuota": security_center_scanQuota_output,
-        "security-center_scanStatusResponse": security_center_scanStatusResponse_output,
-        "security-center_scansListResponse": security_center_scansListResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_scanQuota": security$$center_scanQuota,
+        "security-center_scanStatusResponse": security$$center_scanStatusResponse,
+        "security-center_scansListResponse": security$$center_scansListResponse,
       },
     },
     request: (args) => ({
@@ -118,38 +120,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "security_insights_scans_start",
+    name: "securityInsights_scans_start",
     title: "Start On-Demand account or zone Scan",
-    description: "Initiates an on-demand security scan for the entire account or zone, scanning all zones associated with the account or zone. Rate limited to 5 scans per account or zone per 24-hour window.",
+    description: "Initiates an on-demand security scan for the entire account or zone, scanning all zones associated with the account or zone. Rate limited to 5 scans per account or zone per 24-hour window.\n\nPOST /{account_or_zone}/{account_or_zone_id}/security-center/insights/scans",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/security-center_newScanRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_identifier": security_center_identifier,
-        "security-center_issueClass": security_center_issueClass,
-        "security-center_issueType": security_center_issueType,
-        "security-center_newScanRequest": security_center_newScanRequest,
+        "security-center_newScanRequest": security$$center_newScanRequest,
       },
     },
     outputSchema: {
@@ -167,9 +176,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_newScanResponse": security_center_newScanResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_newScanResponse": security$$center_newScanResponse,
       },
     },
     annotations: {
@@ -203,10 +212,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_newScanResponse": security_center_newScanResponse_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_newScanResponse": security$$center_newScanResponse,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/securityInsights/schemas.ts b/src/generated/forge-mcp/securityInsights/schemas.ts
index 9ed91d0c7..1663c9bcf 100644
--- a/src/generated/forge-mcp/securityInsights/schemas.ts
+++ b/src/generated/forge-mcp/securityInsights/schemas.ts
@@ -6,11 +6,23 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `security-center_userClassificationUpdate`.
  */
-export const security_center_userClassificationUpdate: JsonSchema = {
+export const security$$center_userClassificationUpdate: JsonSchema = {
   "properties": {
     "classification": {
-      "$ref": "#/$defs/security-center_userClassification",
-      "description": "User-defined classification for the insight. Can be 'false_positive', 'accept_risk', 'other', or null."
+      "description": "User-defined classification for the insight. Can be 'false_positive', 'accept_risk', 'other', or null.",
+      "oneOf": [
+        {
+          "enum": [
+            "false_positive",
+            "accept_risk",
+            "other"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "rationale": {
       "description": "Rationale for the classification change. Required when classification is 'accept_risk' or 'other'.",
diff --git a/src/generated/forge-mcp/securityInsights/state/outputs.ts b/src/generated/forge-mcp/securityInsights/state/outputs.ts
index fd52c5bb9..63ae0809f 100644
--- a/src/generated/forge-mcp/securityInsights/state/outputs.ts
+++ b/src/generated/forge-mcp/securityInsights/state/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `security-center_accountStateResponse` in responses.
  */
-export const security_center_accountStateResponse_output: JsonSchema = {
+export const security$$center_accountStateResponse: JsonSchema = {
   "properties": {
     "recent_dormant_reactivation": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/securityInsights/state/schemas.ts b/src/generated/forge-mcp/securityInsights/state/schemas.ts
index d3ffa3c35..3eedcadd5 100644
--- a/src/generated/forge-mcp/securityInsights/state/schemas.ts
+++ b/src/generated/forge-mcp/securityInsights/state/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `security-center_updateAccountStateRequest`.
  */
-export const security_center_updateAccountStateRequest: JsonSchema = {
+export const security$$center_updateAccountStateRequest: JsonSchema = {
   "properties": {
     "scans_enabled": {
       "description": "Enable or disable scans for the account.",
diff --git a/src/generated/forge-mcp/securityInsights/state/tools.ts b/src/generated/forge-mcp/securityInsights/state/tools.ts
index abc12f246..f5745c2ee 100644
--- a/src/generated/forge-mcp/securityInsights/state/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/state/tools.ts
@@ -3,36 +3,42 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_messages,
 } from "../../outputs.js";
-import { security_center_identifier } from "../../schemas.js";
-import { security_center_accountStateResponse_output } from "./outputs.js";
-import { security_center_updateAccountStateRequest } from "./schemas.js";
+import { security$$center_accountStateResponse } from "./outputs.js";
+import { security$$center_updateAccountStateRequest } from "./schemas.js";
 
 /**
- * The tools of `security_insights.state`.
+ * The tools of `securityInsights.state`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_state_get",
+    name: "securityInsights_state_get",
     title: "Retrieves Account State",
-    description: "Returns account-level Security Center state: whether scans are enabled for the account and whether the account was recently reactivated from a dormant state.",
+    description: "Returns account-level Security Center state: whether scans are enabled for the account and whether the account was recently reactivated from a dormant state.\n\nGET /accounts/{account_id}/security-center/state",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -49,9 +55,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "security-center_accountStateResponse": security_center_accountStateResponse_output,
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_accountStateResponse": security$$center_accountStateResponse,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -85,10 +91,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_accountStateResponse": security_center_accountStateResponse_output,
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_accountStateResponse": security$$center_accountStateResponse,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
@@ -96,27 +102,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "security_insights_state_update",
+    name: "securityInsights_state_update",
     title: "Updates Account State",
-    description: "Updates account-level Security Center state. Currently supports enabling or disabling scans for the account. Returns the account's state after the update.",
+    description: "Updates account-level Security Center state. Currently supports enabling or disabling scans for the account. Returns the account's state after the update.\n\nPUT /accounts/{account_id}/security-center/state",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/security-center_updateAccountStateRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_identifier": security_center_identifier,
-        "security-center_updateAccountStateRequest": security_center_updateAccountStateRequest,
+        "security-center_updateAccountStateRequest": security$$center_updateAccountStateRequest,
       },
     },
     outputSchema: {
@@ -134,9 +149,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "security-center_accountStateResponse": security_center_accountStateResponse_output,
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_accountStateResponse": security$$center_accountStateResponse,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -170,10 +185,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_accountStateResponse": security_center_accountStateResponse_output,
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_accountStateResponse": security$$center_accountStateResponse,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/securityInsights/tools.ts b/src/generated/forge-mcp/securityInsights/tools.ts
index 8839c85bd..db5f9f441 100644
--- a/src/generated/forge-mcp/securityInsights/tools.ts
+++ b/src/generated/forge-mcp/securityInsights/tools.ts
@@ -1,88 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_api_response_single_output,
-  security_center_count_output,
-  security_center_issueClass_output,
-  security_center_issueType_output,
-  security_center_issue_output,
-  security_center_messages_output,
-  security_center_page_output,
-  security_center_perPage_output,
-  security_center_source_output,
-  security_center_subject_output,
-  security_center_userClassification_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_api$$response$$single,
+  security$$center_issue,
+  security$$center_messages,
 } from "../outputs.js";
 import {
-  security_center_dismissed,
-  security_center_identifier,
-  security_center_issueClass,
-  security_center_issueClasses,
-  security_center_issueType,
-  security_center_issueTypes,
-  security_center_page,
-  security_center_perPage,
-  security_center_products,
-  security_center_severityQueryParam,
-  security_center_source,
-  security_center_sources,
-  security_center_subject,
-  security_center_subjects,
-  security_center_userClassification,
+  security$$center_issueClasses,
+  security$$center_issueTypes,
+  security$$center_products,
+  security$$center_severityQueryParam,
+  security$$center_sources,
+  security$$center_subjects,
 } from "../schemas.js";
-import { security_center_userClassificationUpdate } from "./schemas.js";
+import { security$$center_userClassificationUpdate } from "./schemas.js";
 
 /**
- * The tools of `security_insights`.
+ * The tools of `securityInsights`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_insights_classify",
+    name: "securityInsights_classify",
     title: "Updates Security Center Insight Classification",
-    description: "Updates the user classification for a Security Center insight. Valid values are 'false_positive' or 'accept_risk'. To reset, set classification to null. Cannot change directly between classification values - must reset to null first.",
+    description: "Updates the user classification for a Security Center insight. Valid values are 'false_positive' or 'accept_risk'. To reset, set classification to null. Cannot change directly between classification values - must reset to null first.\n\nPATCH /{account_or_zone}/{account_or_zone_id}/security-center/insights/{issue_id}/classification",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/security-center_userClassificationUpdate"
         },
-        "issue_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "issue_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "issue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "issue_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_identifier": security_center_identifier,
-        "security-center_userClassification": security_center_userClassification,
-        "security-center_userClassificationUpdate": security_center_userClassificationUpdate,
+        "security-center_userClassificationUpdate": security$$center_userClassificationUpdate,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_api-response-single",
       $defs: {
-        "security-center_api-response-single": security_center_api_response_single_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-single": security$$center_api$$response$$single,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -104,9 +95,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_api-response-single": security_center_api_response_single_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_api-response-single": security$$center_api$$response$$single,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
@@ -115,24 +106,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "security_insights_dismiss",
+    name: "securityInsights_dismiss",
     title: "Archives Security Center Insight",
-    description: "Archives a Security Center insight for an account or zone, removing it from the active insights list while preserving historical data.",
+    description: "Archives a Security Center insight for an account or zone, removing it from the active insights list while preserving historical data.\n\nPUT /{account_or_zone}/{account_or_zone_id}/security-center/insights/{issue_id}/dismiss",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "dismiss": {
@@ -142,25 +121,44 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "issue_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "issue_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "issue_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "issue_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_api-response-single",
       $defs: {
-        "security-center_api-response-single": security_center_api_response_single_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-single": security$$center_api$$response$$single,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -189,9 +187,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_api-response-single": security_center_api_response_single_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_api-response-single": security$$center_api$$response$$single,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
@@ -200,88 +198,98 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "security_insights_list",
+    name: "securityInsights_list",
     title: "Retrieves Security Center Insights",
-    description: "Lists all Security Center insights for the account or zone, showing security findings and recommendations.",
+    description: "Lists all Security Center insights for the account or zone, showing security findings and recommendations.\n\nGET /{account_or_zone}/{account_or_zone_id}/security-center/insights",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "dismissed": {
-          "$ref": "#/$defs/security-center_dismissed"
-        },
-        "issue_class": {
-          "$ref": "#/$defs/security-center_issueClasses"
-        },
-        "issue_class_neq": {
-          "$ref": "#/$defs/security-center_issueClasses"
-        },
-        "issue_type": {
-          "$ref": "#/$defs/security-center_issueTypes"
-        },
-        "issue_type_neq": {
-          "$ref": "#/$defs/security-center_issueTypes"
-        },
-        "page": {
-          "$ref": "#/$defs/security-center_page",
-          "default": 1
-        },
-        "per_page": {
-          "$ref": "#/$defs/security-center_perPage",
-          "default": 25
-        },
-        "product": {
-          "$ref": "#/$defs/security-center_products"
-        },
-        "product_neq": {
-          "$ref": "#/$defs/security-center_products"
-        },
-        "severity": {
-          "$ref": "#/$defs/security-center_severityQueryParam"
-        },
-        "severity_neq": {
-          "$ref": "#/$defs/security-center_severityQueryParam"
-        },
-        "source": {
-          "$ref": "#/$defs/security-center_sources"
-        },
-        "subject": {
-          "$ref": "#/$defs/security-center_subjects"
+          "type": "object"
         },
-        "subject_neq": {
-          "$ref": "#/$defs/security-center_subjects"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dismissed": {
+              "type": "boolean"
+            },
+            "issue_class": {
+              "$ref": "#/$defs/security-center_issueClasses"
+            },
+            "issue_class~neq": {
+              "$ref": "#/$defs/security-center_issueClasses"
+            },
+            "issue_type": {
+              "$ref": "#/$defs/security-center_issueTypes"
+            },
+            "issue_type~neq": {
+              "$ref": "#/$defs/security-center_issueTypes"
+            },
+            "page": {
+              "default": 1,
+              "description": "Specifies the current page within paginated list of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Sets the number of results per page of results.",
+              "type": "integer"
+            },
+            "product": {
+              "$ref": "#/$defs/security-center_products"
+            },
+            "product~neq": {
+              "$ref": "#/$defs/security-center_products"
+            },
+            "severity": {
+              "$ref": "#/$defs/security-center_severityQueryParam"
+            },
+            "severity~neq": {
+              "$ref": "#/$defs/security-center_severityQueryParam"
+            },
+            "source": {
+              "$ref": "#/$defs/security-center_sources"
+            },
+            "subject": {
+              "$ref": "#/$defs/security-center_subjects"
+            },
+            "subject~neq": {
+              "$ref": "#/$defs/security-center_subjects"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_dismissed": security_center_dismissed,
-        "security-center_identifier": security_center_identifier,
-        "security-center_issueClass": security_center_issueClass,
-        "security-center_issueClasses": security_center_issueClasses,
-        "security-center_issueType": security_center_issueType,
-        "security-center_issueTypes": security_center_issueTypes,
-        "security-center_page": security_center_page,
-        "security-center_perPage": security_center_perPage,
-        "security-center_products": security_center_products,
-        "security-center_severityQueryParam": security_center_severityQueryParam,
-        "security-center_source": security_center_source,
-        "security-center_sources": security_center_sources,
-        "security-center_subject": security_center_subject,
-        "security-center_subjects": security_center_subjects,
+        "security-center_issueClasses": security$$center_issueClasses,
+        "security-center_issueTypes": security$$center_issueTypes,
+        "security-center_products": security$$center_products,
+        "security-center_severityQueryParam": security$$center_severityQueryParam,
+        "security-center_sources": security$$center_sources,
+        "security-center_subjects": security$$center_subjects,
       },
     },
     outputSchema: {
@@ -294,7 +302,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "count": {
-                  "$ref": "#/$defs/security-center_count"
+                  "type": "integer"
                 },
                 "issues": {
                   "items": {
@@ -303,10 +311,10 @@ export const tools: readonly Tool[] = [
                   "type": "array"
                 },
                 "page": {
-                  "$ref": "#/$defs/security-center_page"
+                  "type": "integer"
                 },
                 "per_page": {
-                  "$ref": "#/$defs/security-center_perPage"
+                  "type": "integer"
                 }
               },
               "type": "object"
@@ -316,17 +324,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_count": security_center_count_output,
-        "security-center_issue": security_center_issue_output,
-        "security-center_issueClass": security_center_issueClass_output,
-        "security-center_issueType": security_center_issueType_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_page": security_center_page_output,
-        "security-center_perPage": security_center_perPage_output,
-        "security-center_source": security_center_source_output,
-        "security-center_subject": security_center_subject_output,
-        "security-center_userClassification": security_center_userClassification_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_issue": security$$center_issue,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -350,7 +350,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "count": {
-                      "$ref": "#/$defs/security-center_count"
+                      "type": "integer"
                     },
                     "issues": {
                       "items": {
@@ -359,10 +359,10 @@ export const tools: readonly Tool[] = [
                       "type": "array"
                     },
                     "page": {
-                      "$ref": "#/$defs/security-center_page"
+                      "type": "integer"
                     },
                     "per_page": {
-                      "$ref": "#/$defs/security-center_perPage"
+                      "type": "integer"
                     }
                   },
                   "type": "object"
@@ -377,37 +377,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_count": security_center_count_output,
-        "security-center_issue": security_center_issue_output,
-        "security-center_issueClass": security_center_issueClass_output,
-        "security-center_issueType": security_center_issueType_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_page": security_center_page_output,
-        "security-center_perPage": security_center_perPage_output,
-        "security-center_source": security_center_source_output,
-        "security-center_subject": security_center_subject_output,
-        "security-center_userClassification": security_center_userClassification_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_issue": security$$center_issue,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/security-center/insights`,
       query: [
-        ["dismissed", args["dismissed"], true],
-        ["issue_class", args["issue_class"], true],
-        ["issue_type", args["issue_type"], true],
-        ["product", args["product"], true],
-        ["source", args["source"], true],
-        ["severity", args["severity"], true],
-        ["subject", args["subject"], true],
-        ["issue_class~neq", args["issue_class_neq"], true],
-        ["issue_type~neq", args["issue_type_neq"], true],
-        ["product~neq", args["product_neq"], true],
-        ["severity~neq", args["severity_neq"], true],
-        ["subject~neq", args["subject_neq"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["dismissed", param(args, "query", "dismissed"), true],
+        ["issue_class", param(args, "query", "issue_class"), true],
+        ["issue_type", param(args, "query", "issue_type"), true],
+        ["product", param(args, "query", "product"), true],
+        ["source", param(args, "query", "source"), true],
+        ["severity", param(args, "query", "severity"), true],
+        ["subject", param(args, "query", "subject"), true],
+        ["issue_class~neq", param(args, "query", "issue_class~neq"), true],
+        ["issue_type~neq", param(args, "query", "issue_type~neq"), true],
+        ["product~neq", param(args, "query", "product~neq"), true],
+        ["severity~neq", param(args, "query", "severity~neq"), true],
+        ["subject~neq", param(args, "query", "subject~neq"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/securityTxt/outputs.ts b/src/generated/forge-mcp/securityTxt/outputs.ts
index 1918771a2..01f8069ac 100644
--- a/src/generated/forge-mcp/securityTxt/outputs.ts
+++ b/src/generated/forge-mcp/securityTxt/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `security-center_securityTxt` in responses.
  */
-export const security_center_securityTxt_output: JsonSchema = {
+export const security$$center_securityTxt: JsonSchema = {
   "properties": {
     "acknowledgments": {
       "items": {
diff --git a/src/generated/forge-mcp/securityTxt/schemas.ts b/src/generated/forge-mcp/securityTxt/schemas.ts
index 330c3e17c..1ad699c75 100644
--- a/src/generated/forge-mcp/securityTxt/schemas.ts
+++ b/src/generated/forge-mcp/securityTxt/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `security-center_securityTxt`.
  */
-export const security_center_securityTxt: JsonSchema = {
+export const security$$center_securityTxt: JsonSchema = {
   "properties": {
     "acknowledgments": {
       "items": {
diff --git a/src/generated/forge-mcp/securityTxt/tools.ts b/src/generated/forge-mcp/securityTxt/tools.ts
index 211c1fd4c..71277dfe5 100644
--- a/src/generated/forge-mcp/securityTxt/tools.ts
+++ b/src/generated/forge-mcp/securityTxt/tools.ts
@@ -3,43 +3,49 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  security_center_api_response_common_failure_output,
-  security_center_api_response_common_output,
-  security_center_api_response_single_output,
-  security_center_messages_output,
+  security$$center_api$$response$$common,
+  security$$center_api$$response$$common$$failure,
+  security$$center_api$$response$$single,
+  security$$center_messages,
 } from "../outputs.js";
-import { security_center_identifier } from "../schemas.js";
-import { security_center_securityTxt_output } from "./outputs.js";
-import { security_center_securityTxt } from "./schemas.js";
+import { security$$center_securityTxt } from "./outputs.js";
+import { security$$center_securityTxt as security$$center_securityTxt$ } from "./schemas.js";
 
 /**
- * The tools of `security_txt`.
+ * The tools of `securityTxt`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "security_txt_delete",
+    name: "securityTxt_delete",
     title: "Deletes security.txt",
-    description: "Removes the security.txt file configuration for a zone. The /.well-known/security.txt endpoint will no longer be served.",
+    description: "Removes the security.txt file configuration for a zone. The /.well-known/security.txt endpoint will no longer be served.\n\nDELETE /zones/{zone_id}/security-center/securitytxt",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_api-response-single",
       $defs: {
-        "security-center_api-response-single": security_center_api_response_single_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-single": security$$center_api$$response$$single,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -66,9 +72,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_api-response-single": security_center_api_response_single_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_api-response-single": security$$center_api$$response$$single,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
@@ -76,23 +82,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "security_txt_get",
+    name: "securityTxt_get",
     title: "Retrieves security.txt",
-    description: "Retrieves the current security.txt file configuration for a zone, used for security vulnerability reporting.",
+    description: "Retrieves the current security.txt file configuration for a zone, used for security vulnerability reporting.\n\nGET /zones/{zone_id}/security-center/securitytxt",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "security-center_identifier": security_center_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -109,9 +122,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_securityTxt": security_center_securityTxt_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_messages": security$$center_messages,
+        "security-center_securityTxt": security$$center_securityTxt,
       },
     },
     annotations: {
@@ -151,10 +164,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common": security_center_api_response_common_output,
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_messages": security_center_messages_output,
-        "security-center_securityTxt": security_center_securityTxt_output,
+        "security-center_api-response-common": security$$center_api$$response$$common,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_messages": security$$center_messages,
+        "security-center_securityTxt": security$$center_securityTxt,
       },
     },
     request: (args) => ({
@@ -162,34 +175,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "security_txt_update",
+    name: "securityTxt_update",
     title: "Updates security.txt",
-    description: "Updates the security.txt file configuration for a zone, which provides security researchers with vulnerability reporting information.",
+    description: "Updates the security.txt file configuration for a zone, which provides security researchers with vulnerability reporting information.\n\nPUT /zones/{zone_id}/security-center/securitytxt",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/security-center_securityTxt"
         },
-        "zone_id": {
-          "$ref": "#/$defs/security-center_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "security-center_identifier": security_center_identifier,
-        "security-center_securityTxt": security_center_securityTxt,
+        "security-center_securityTxt": security$$center_securityTxt$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/security-center_api-response-single",
       $defs: {
-        "security-center_api-response-single": security_center_api_response_single_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-single": security$$center_api$$response$$single,
+        "security-center_messages": security$$center_messages,
       },
     },
     annotations: {
@@ -216,9 +238,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "security-center_api-response-common-failure": security_center_api_response_common_failure_output,
-        "security-center_api-response-single": security_center_api_response_single_output,
-        "security-center_messages": security_center_messages_output,
+        "security-center_api-response-common-failure": security$$center_api$$response$$common$$failure,
+        "security-center_api-response-single": security$$center_api$$response$$single,
+        "security-center_messages": security$$center_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/signedUrl/tools.ts b/src/generated/forge-mcp/signedUrl/tools.ts
index 96057ac55..463926df3 100644
--- a/src/generated/forge-mcp/signedUrl/tools.ts
+++ b/src/generated/forge-mcp/signedUrl/tools.ts
@@ -2,19 +2,20 @@
 /* eslint-disable */
 
 import type { Tool } from "../_/tool.js";
-import { brand_protection_api_Error_output } from "../outputs.js";
+import { brand$$protection$$api_Error } from "../outputs.js";
 
 /**
- * The tools of `signed_url`.
+ * The tools of `signedUrl`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "signed_url_get",
+    name: "signedUrl_get",
     title: "Internal route for testing signed URLs",
-    description: "Internal route for testing signed URLs.",
+    description: "Internal route for testing signed URLs.\n\nGET /signed-url",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -45,7 +46,7 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "brand-protection-api_Error": brand_protection_api_Error_output,
+        "brand-protection-api_Error": brand$$protection$$api_Error,
       },
     },
     request: (_args) => ({
diff --git a/src/generated/forge-mcp/smartShield/cacheReserveClear/outputs.ts b/src/generated/forge-mcp/smartShield/cacheReserveClear/outputs.ts
index e7b2af8e6..d5c177eba 100644
--- a/src/generated/forge-mcp/smartShield/cacheReserveClear/outputs.ts
+++ b/src/generated/forge-mcp/smartShield/cacheReserveClear/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `smartshield_base` in responses.
  */
-export const smartshield_base_output: JsonSchema = {
+export const smartshield_base: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -32,7 +32,7 @@ export const smartshield_base_output: JsonSchema = {
 /**
  * The schema of `smartshield_cache_reserve_clear` in responses.
  */
-export const smartshield_cache_reserve_clear_output: JsonSchema = {
+export const smartshield_cache_reserve_clear: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/smartshield_base"
@@ -51,18 +51,10 @@ export const smartshield_cache_reserve_clear_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_cache_reserve_clear_end_ts` in responses.
- */
-export const smartshield_cache_reserve_clear_end_ts_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_cache_reserve_clear_response_value` in responses.
  */
-export const smartshield_cache_reserve_clear_response_value_output: JsonSchema = {
+export const smartshield_cache_reserve_clear_response_value: JsonSchema = {
   "properties": {
     "result": {
       "allOf": [
@@ -72,13 +64,19 @@ export const smartshield_cache_reserve_clear_response_value_output: JsonSchema =
         {
           "properties": {
             "end_ts": {
-              "$ref": "#/$defs/smartshield_cache_reserve_clear_end_ts"
+              "format": "date-time",
+              "type": "string"
             },
             "start_ts": {
-              "$ref": "#/$defs/smartshield_cache_reserve_clear_start_ts"
+              "format": "date-time",
+              "type": "string"
             },
             "state": {
-              "$ref": "#/$defs/smartshield_cache_reserve_clear_state"
+              "enum": [
+                "In-progress",
+                "Completed"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -92,22 +90,3 @@ export const smartshield_cache_reserve_clear_response_value_output: JsonSchema =
   },
   "type": "object"
 };
-
-/**
- * The schema of `smartshield_cache_reserve_clear_start_ts` in responses.
- */
-export const smartshield_cache_reserve_clear_start_ts_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `smartshield_cache_reserve_clear_state` in responses.
- */
-export const smartshield_cache_reserve_clear_state_output: JsonSchema = {
-  "enum": [
-    "In-progress",
-    "Completed"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/smartShield/cacheReserveClear/tools.ts b/src/generated/forge-mcp/smartShield/cacheReserveClear/tools.ts
index 2b9c80b37..60e0b1fe0 100644
--- a/src/generated/forge-mcp/smartShield/cacheReserveClear/tools.ts
+++ b/src/generated/forge-mcp/smartShield/cacheReserveClear/tools.ts
@@ -3,43 +3,46 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  smartshield_api_response_common_failure_output,
-  smartshield_api_response_common_output,
-  smartshield_api_response_result_output,
-  smartshield_messages_output,
+  smartshield_api$$response$$common,
+  smartshield_api$$response$$common$$failure,
+  smartshield_api$$response$$result,
+  smartshield_messages,
 } from "../outputs.js";
-import { smartshield_identifier } from "../schemas.js";
 import {
-  smartshield_base_output,
-  smartshield_cache_reserve_clear_end_ts_output,
-  smartshield_cache_reserve_clear_output,
-  smartshield_cache_reserve_clear_response_value_output,
-  smartshield_cache_reserve_clear_start_ts_output,
-  smartshield_cache_reserve_clear_state_output,
+  smartshield_base,
+  smartshield_cache_reserve_clear,
+  smartshield_cache_reserve_clear_response_value,
 } from "./outputs.js";
 
 /**
- * The tools of `smart_shield.cache_reserve_clear`.
+ * The tools of `smartShield.cacheReserveClear`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "smart_shield_cache_reserve_clear_clear",
+    name: "smartShield_cacheReserveClear_clear",
     title: "Start Cache Reserve Clear",
-    description: "You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.\n\nConfirm with the user before calling this tool. This operation permanently clears Cache Reserve for this zone and cannot be undone.",
+    description: "You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.\n\nConfirm with the user before calling this tool. This operation permanently clears Cache Reserve for this zone and cannot be undone.\n\nPOST /zones/{zone_id}/smart_shield/cache_reserve_clear",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "smartshield_identifier": smartshield_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -51,15 +54,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_base": smartshield_base_output,
-        "smartshield_cache_reserve_clear": smartshield_cache_reserve_clear_output,
-        "smartshield_cache_reserve_clear_end_ts": smartshield_cache_reserve_clear_end_ts_output,
-        "smartshield_cache_reserve_clear_response_value": smartshield_cache_reserve_clear_response_value_output,
-        "smartshield_cache_reserve_clear_start_ts": smartshield_cache_reserve_clear_start_ts_output,
-        "smartshield_cache_reserve_clear_state": smartshield_cache_reserve_clear_state_output,
-        "smartshield_messages": smartshield_messages_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_base": smartshield_base,
+        "smartshield_cache_reserve_clear": smartshield_cache_reserve_clear,
+        "smartshield_cache_reserve_clear_response_value": smartshield_cache_reserve_clear_response_value,
+        "smartshield_messages": smartshield_messages,
       },
     },
     annotations: {
@@ -105,16 +105,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_base": smartshield_base_output,
-        "smartshield_cache_reserve_clear": smartshield_cache_reserve_clear_output,
-        "smartshield_cache_reserve_clear_end_ts": smartshield_cache_reserve_clear_end_ts_output,
-        "smartshield_cache_reserve_clear_response_value": smartshield_cache_reserve_clear_response_value_output,
-        "smartshield_cache_reserve_clear_start_ts": smartshield_cache_reserve_clear_start_ts_output,
-        "smartshield_cache_reserve_clear_state": smartshield_cache_reserve_clear_state_output,
-        "smartshield_messages": smartshield_messages_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_base": smartshield_base,
+        "smartshield_cache_reserve_clear": smartshield_cache_reserve_clear,
+        "smartshield_cache_reserve_clear_response_value": smartshield_cache_reserve_clear_response_value,
+        "smartshield_messages": smartshield_messages,
       },
     },
     request: (args) => ({
@@ -122,23 +119,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "smart_shield_cache_reserve_clear_status",
+    name: "smartShield_cacheReserveClear_status",
     title: "Get Cache Reserve Clear",
-    description: "You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.",
+    description: "You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.\n\nGET /zones/{zone_id}/smart_shield/cache_reserve_clear",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "smartshield_identifier": smartshield_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -150,15 +154,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_base": smartshield_base_output,
-        "smartshield_cache_reserve_clear": smartshield_cache_reserve_clear_output,
-        "smartshield_cache_reserve_clear_end_ts": smartshield_cache_reserve_clear_end_ts_output,
-        "smartshield_cache_reserve_clear_response_value": smartshield_cache_reserve_clear_response_value_output,
-        "smartshield_cache_reserve_clear_start_ts": smartshield_cache_reserve_clear_start_ts_output,
-        "smartshield_cache_reserve_clear_state": smartshield_cache_reserve_clear_state_output,
-        "smartshield_messages": smartshield_messages_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_base": smartshield_base,
+        "smartshield_cache_reserve_clear": smartshield_cache_reserve_clear,
+        "smartshield_cache_reserve_clear_response_value": smartshield_cache_reserve_clear_response_value,
+        "smartshield_messages": smartshield_messages,
       },
     },
     annotations: {
@@ -206,16 +207,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_base": smartshield_base_output,
-        "smartshield_cache_reserve_clear": smartshield_cache_reserve_clear_output,
-        "smartshield_cache_reserve_clear_end_ts": smartshield_cache_reserve_clear_end_ts_output,
-        "smartshield_cache_reserve_clear_response_value": smartshield_cache_reserve_clear_response_value_output,
-        "smartshield_cache_reserve_clear_start_ts": smartshield_cache_reserve_clear_start_ts_output,
-        "smartshield_cache_reserve_clear_state": smartshield_cache_reserve_clear_state_output,
-        "smartshield_messages": smartshield_messages_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_base": smartshield_base,
+        "smartshield_cache_reserve_clear": smartshield_cache_reserve_clear,
+        "smartshield_cache_reserve_clear_response_value": smartshield_cache_reserve_clear_response_value,
+        "smartshield_messages": smartshield_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/smartShield/healthChecks/outputs.ts b/src/generated/forge-mcp/smartShield/healthChecks/outputs.ts
index a15ca4fb9..1ca28bdab 100644
--- a/src/generated/forge-mcp/smartShield/healthChecks/outputs.ts
+++ b/src/generated/forge-mcp/smartShield/healthChecks/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `smartshield_address` in responses.
- */
-export const smartshield_address_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_api-response-collection` in responses.
  */
-export const smartshield_api_response_collection_output: JsonSchema = {
+export const smartshield_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/smartshield_api-response-common"
@@ -45,7 +38,7 @@ export const smartshield_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `smartshield_check_regions` in responses.
  */
-export const smartshield_check_regions_output: JsonSchema = {
+export const smartshield_check_regions: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -75,92 +68,72 @@ export const smartshield_check_regions_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_consecutive_fails` in responses.
- */
-export const smartshield_consecutive_fails_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `smartshield_consecutive_successes` in responses.
- */
-export const smartshield_consecutive_successes_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `smartshield_description` in responses.
- */
-export const smartshield_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `smartshield_failure_reason` in responses.
- */
-export const smartshield_failure_reason_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_healthchecks` in responses.
  */
-export const smartshield_healthchecks_output: JsonSchema = {
+export const smartshield_healthchecks: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/smartshield_address"
+      "type": "string"
     },
     "check_regions": {
       "$ref": "#/$defs/smartshield_check_regions"
     },
     "consecutive_fails": {
-      "$ref": "#/$defs/smartshield_consecutive_fails"
+      "type": "integer"
     },
     "consecutive_successes": {
-      "$ref": "#/$defs/smartshield_consecutive_successes"
+      "type": "integer"
     },
     "created_on": {
-      "$ref": "#/$defs/smartshield_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/smartshield_description"
+      "type": "string"
     },
     "failure_reason": {
-      "$ref": "#/$defs/smartshield_failure_reason"
+      "type": "string"
     },
     "http_config": {
       "$ref": "#/$defs/smartshield_http_config"
     },
     "id": {
-      "$ref": "#/$defs/smartshield_identifier"
+      "type": "string"
     },
     "interval": {
-      "$ref": "#/$defs/smartshield_interval"
+      "type": "integer"
     },
     "modified_on": {
-      "$ref": "#/$defs/smartshield_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/smartshield_name"
+      "type": "string"
     },
     "retries": {
-      "$ref": "#/$defs/smartshield_retries"
+      "type": "integer"
     },
     "status": {
-      "$ref": "#/$defs/smartshield_status"
+      "enum": [
+        "unknown",
+        "healthy",
+        "unhealthy",
+        "suspended"
+      ],
+      "type": "string"
     },
     "suspended": {
-      "$ref": "#/$defs/smartshield_suspended"
+      "type": "boolean"
     },
     "tcp_config": {
       "$ref": "#/$defs/smartshield_tcp_config"
     },
     "timeout": {
-      "$ref": "#/$defs/smartshield_timeout"
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/smartshield_type"
+      "type": "string"
     }
   },
   "type": "object"
@@ -169,7 +142,7 @@ export const smartshield_healthchecks_output: JsonSchema = {
 /**
  * The schema of `smartshield_http_config` in responses.
  */
-export const smartshield_http_config_output: JsonSchema = {
+export const smartshield_http_config: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -233,24 +206,10 @@ export const smartshield_http_config_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_interval` in responses.
- */
-export const smartshield_interval_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `smartshield_name` in responses.
- */
-export const smartshield_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_response_collection` in responses.
  */
-export const smartshield_response_collection_output: JsonSchema = {
+export const smartshield_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/smartshield_api-response-collection"
@@ -272,7 +231,7 @@ export const smartshield_response_collection_output: JsonSchema = {
 /**
  * The schema of `smartshield_result_info` in responses.
  */
-export const smartshield_result_info_output: JsonSchema = {
+export const smartshield_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -290,17 +249,10 @@ export const smartshield_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `smartshield_retries` in responses.
- */
-export const smartshield_retries_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `smartshield_single_hc_id_response` in responses.
  */
-export const smartshield_single_hc_id_response_output: JsonSchema = {
+export const smartshield_single_hc_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/smartshield_api-response-common"
@@ -310,7 +262,7 @@ export const smartshield_single_hc_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/smartshield_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -324,7 +276,7 @@ export const smartshield_single_hc_id_response_output: JsonSchema = {
 /**
  * The schema of `smartshield_single_hc_response` in responses.
  */
-export const smartshield_single_hc_response_output: JsonSchema = {
+export const smartshield_single_hc_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/smartshield_api-response-common"
@@ -340,30 +292,10 @@ export const smartshield_single_hc_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_status` in responses.
- */
-export const smartshield_status_output: JsonSchema = {
-  "enum": [
-    "unknown",
-    "healthy",
-    "unhealthy",
-    "suspended"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `smartshield_suspended` in responses.
- */
-export const smartshield_suspended_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `smartshield_tcp_config` in responses.
  */
-export const smartshield_tcp_config_output: JsonSchema = {
+export const smartshield_tcp_config: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -384,25 +316,3 @@ export const smartshield_tcp_config_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `smartshield_timeout` in responses.
- */
-export const smartshield_timeout_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `smartshield_timestamp` in responses.
- */
-export const smartshield_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `smartshield_type` in responses.
- */
-export const smartshield_type_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/smartShield/healthChecks/schemas.ts b/src/generated/forge-mcp/smartShield/healthChecks/schemas.ts
index 86f2d1b20..f121aa932 100644
--- a/src/generated/forge-mcp/smartShield/healthChecks/schemas.ts
+++ b/src/generated/forge-mcp/smartShield/healthChecks/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `smartshield_address`.
- */
-export const smartshield_address: JsonSchema = {
-  "description": "The hostname or IP address of the origin server to run health checks on.",
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_check_regions`.
  */
@@ -45,93 +37,69 @@ export const smartshield_check_regions: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_consecutive_fails`.
- */
-export const smartshield_consecutive_fails: JsonSchema = {
-  "description": "The number of consecutive fails required from a health check before changing the health to unhealthy.",
-  "type": "integer"
-};
-
-/**
- * The schema of `smartshield_consecutive_successes`.
- */
-export const smartshield_consecutive_successes: JsonSchema = {
-  "description": "The number of consecutive successes required from a health check before changing the health to healthy.",
-  "type": "integer"
-};
-
-/**
- * The schema of `smartshield_description`.
- */
-export const smartshield_description: JsonSchema = {
-  "description": "A human-readable description of the health check.",
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_healthchecks`.
  */
 export const smartshield_healthchecks: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/smartshield_address",
-      "description": "The hostname or IP address of the origin server to run health checks on."
+      "description": "The hostname or IP address of the origin server to run health checks on.",
+      "type": "string"
     },
     "check_regions": {
       "$ref": "#/$defs/smartshield_check_regions",
       "description": "A list of regions from which to run health checks. Null means Cloudflare will pick a default region."
     },
     "consecutive_fails": {
-      "$ref": "#/$defs/smartshield_consecutive_fails",
       "default": 1,
-      "description": "The number of consecutive fails required from a health check before changing the health to unhealthy."
+      "description": "The number of consecutive fails required from a health check before changing the health to unhealthy.",
+      "type": "integer"
     },
     "consecutive_successes": {
-      "$ref": "#/$defs/smartshield_consecutive_successes",
       "default": 1,
-      "description": "The number of consecutive successes required from a health check before changing the health to healthy."
+      "description": "The number of consecutive successes required from a health check before changing the health to healthy.",
+      "type": "integer"
     },
     "description": {
-      "$ref": "#/$defs/smartshield_description",
-      "description": "A human-readable description of the health check."
+      "description": "A human-readable description of the health check.",
+      "type": "string"
     },
     "http_config": {
       "$ref": "#/$defs/smartshield_http_config",
       "description": "Parameters specific to an HTTP or HTTPS health check."
     },
     "interval": {
-      "$ref": "#/$defs/smartshield_interval",
       "default": 60,
-      "description": "The interval between each health check. Shorter intervals may give quicker notifications if the origin status changes, but will increase load on the origin as we check from multiple locations."
+      "description": "The interval between each health check. Shorter intervals may give quicker notifications if the origin status changes, but will increase load on the origin as we check from multiple locations.",
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/smartshield_name",
-      "description": "A short name to identify the health check. Only alphanumeric characters, hyphens and underscores are allowed."
+      "description": "A short name to identify the health check. Only alphanumeric characters, hyphens and underscores are allowed.",
+      "type": "string"
     },
     "retries": {
-      "$ref": "#/$defs/smartshield_retries",
       "default": 2,
-      "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately."
+      "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately.",
+      "type": "integer"
     },
     "suspended": {
-      "$ref": "#/$defs/smartshield_suspended",
       "default": false,
-      "description": "If suspended, no health checks are sent to the origin."
+      "description": "If suspended, no health checks are sent to the origin.",
+      "type": "boolean"
     },
     "tcp_config": {
       "$ref": "#/$defs/smartshield_tcp_config",
       "description": "Parameters specific to TCP health check."
     },
     "timeout": {
-      "$ref": "#/$defs/smartshield_timeout",
       "default": 5,
-      "description": "The timeout (in seconds) before marking the health check as failed."
+      "description": "The timeout (in seconds) before marking the health check as failed.",
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/smartshield_type",
       "default": "HTTP",
-      "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'."
+      "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'.",
+      "type": "string"
     }
   },
   "type": "object"
@@ -221,85 +189,69 @@ export const smartshield_http_config: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_interval`.
- */
-export const smartshield_interval: JsonSchema = {
-  "description": "The interval between each health check. Shorter intervals may give quicker notifications if the origin status changes, but will increase load on the origin as we check from multiple locations.",
-  "type": "integer"
-};
-
-/**
- * The schema of `smartshield_name`.
- */
-export const smartshield_name: JsonSchema = {
-  "description": "A short name to identify the health check. Only alphanumeric characters, hyphens and underscores are allowed.",
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_query_healthcheck`.
  */
 export const smartshield_query_healthcheck: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/smartshield_address",
-      "description": "The hostname or IP address of the origin server to run health checks on."
+      "description": "The hostname or IP address of the origin server to run health checks on.",
+      "type": "string"
     },
     "check_regions": {
       "$ref": "#/$defs/smartshield_check_regions",
       "description": "A list of regions from which to run health checks. Null means Cloudflare will pick a default region."
     },
     "consecutive_fails": {
-      "$ref": "#/$defs/smartshield_consecutive_fails",
       "default": 1,
-      "description": "The number of consecutive fails required from a health check before changing the health to unhealthy."
+      "description": "The number of consecutive fails required from a health check before changing the health to unhealthy.",
+      "type": "integer"
     },
     "consecutive_successes": {
-      "$ref": "#/$defs/smartshield_consecutive_successes",
       "default": 1,
-      "description": "The number of consecutive successes required from a health check before changing the health to healthy."
+      "description": "The number of consecutive successes required from a health check before changing the health to healthy.",
+      "type": "integer"
     },
     "description": {
-      "$ref": "#/$defs/smartshield_description",
-      "description": "A human-readable description of the health check."
+      "description": "A human-readable description of the health check.",
+      "type": "string"
     },
     "http_config": {
       "$ref": "#/$defs/smartshield_http_config",
       "description": "Parameters specific to an HTTP or HTTPS health check."
     },
     "interval": {
-      "$ref": "#/$defs/smartshield_interval",
       "default": 60,
-      "description": "The interval between each health check. Shorter intervals may give quicker notifications if the origin status changes, but will increase load on the origin as we check from multiple locations."
+      "description": "The interval between each health check. Shorter intervals may give quicker notifications if the origin status changes, but will increase load on the origin as we check from multiple locations.",
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/smartshield_name",
-      "description": "A short name to identify the health check. Only alphanumeric characters, hyphens and underscores are allowed."
+      "description": "A short name to identify the health check. Only alphanumeric characters, hyphens and underscores are allowed.",
+      "type": "string"
     },
     "retries": {
-      "$ref": "#/$defs/smartshield_retries",
       "default": 2,
-      "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately."
+      "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately.",
+      "type": "integer"
     },
     "suspended": {
-      "$ref": "#/$defs/smartshield_suspended",
       "default": false,
-      "description": "If suspended, no health checks are sent to the origin."
+      "description": "If suspended, no health checks are sent to the origin.",
+      "type": "boolean"
     },
     "tcp_config": {
       "$ref": "#/$defs/smartshield_tcp_config",
       "description": "Parameters specific to TCP health check."
     },
     "timeout": {
-      "$ref": "#/$defs/smartshield_timeout",
       "default": 5,
-      "description": "The timeout (in seconds) before marking the health check as failed."
+      "description": "The timeout (in seconds) before marking the health check as failed.",
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/smartshield_type",
       "default": "HTTP",
-      "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'."
+      "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'.",
+      "type": "string"
     }
   },
   "required": [
@@ -309,14 +261,6 @@ export const smartshield_query_healthcheck: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `smartshield_retries`.
- */
-export const smartshield_retries: JsonSchema = {
-  "description": "The number of retries to attempt in case of a timeout before marking the origin as unhealthy. Retries are attempted immediately.",
-  "type": "integer"
-};
-
 /**
  * The schema of `smartshield_single_hc_response`.
  */
@@ -336,14 +280,6 @@ export const smartshield_single_hc_response: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_suspended`.
- */
-export const smartshield_suspended: JsonSchema = {
-  "description": "If suspended, no health checks are sent to the origin.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `smartshield_tcp_config`.
  */
@@ -373,19 +309,3 @@ export const smartshield_tcp_config: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `smartshield_timeout`.
- */
-export const smartshield_timeout: JsonSchema = {
-  "description": "The timeout (in seconds) before marking the health check as failed.",
-  "type": "integer"
-};
-
-/**
- * The schema of `smartshield_type`.
- */
-export const smartshield_type: JsonSchema = {
-  "description": "The protocol to use for the health check. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/smartShield/healthChecks/tools.ts b/src/generated/forge-mcp/smartShield/healthChecks/tools.ts
index c95a4f09f..1eaa81594 100644
--- a/src/generated/forge-mcp/smartShield/healthChecks/tools.ts
+++ b/src/generated/forge-mcp/smartShield/healthChecks/tools.ts
@@ -1,129 +1,89 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  smartshield_api_response_common_failure_output,
-  smartshield_api_response_common_output,
-  smartshield_api_response_result_output,
-  smartshield_identifier_output,
-  smartshield_messages_output,
+  smartshield_api$$response$$common,
+  smartshield_api$$response$$common$$failure,
+  smartshield_api$$response$$result,
+  smartshield_messages,
 } from "../outputs.js";
 import {
-  smartshield_api_response_common,
-  smartshield_api_response_result,
-  smartshield_identifier,
-  smartshield_messages,
+  smartshield_api$$response$$common as smartshield_api$$response$$common$,
+  smartshield_api$$response$$result as smartshield_api$$response$$result$,
+  smartshield_messages as smartshield_messages$,
 } from "../schemas.js";
 import {
-  smartshield_address_output,
-  smartshield_api_response_collection_output,
-  smartshield_check_regions_output,
-  smartshield_consecutive_fails_output,
-  smartshield_consecutive_successes_output,
-  smartshield_description_output,
-  smartshield_failure_reason_output,
-  smartshield_healthchecks_output,
-  smartshield_http_config_output,
-  smartshield_interval_output,
-  smartshield_name_output,
-  smartshield_response_collection_output,
-  smartshield_result_info_output,
-  smartshield_retries_output,
-  smartshield_single_hc_id_response_output,
-  smartshield_single_hc_response_output,
-  smartshield_status_output,
-  smartshield_suspended_output,
-  smartshield_tcp_config_output,
-  smartshield_timeout_output,
-  smartshield_timestamp_output,
-  smartshield_type_output,
-} from "./outputs.js";
-import {
-  smartshield_address,
+  smartshield_api$$response$$collection,
   smartshield_check_regions,
-  smartshield_consecutive_fails,
-  smartshield_consecutive_successes,
-  smartshield_description,
   smartshield_healthchecks,
   smartshield_http_config,
-  smartshield_interval,
-  smartshield_name,
-  smartshield_query_healthcheck,
-  smartshield_retries,
+  smartshield_response_collection,
+  smartshield_result_info,
+  smartshield_single_hc_id_response,
   smartshield_single_hc_response,
-  smartshield_suspended,
   smartshield_tcp_config,
-  smartshield_timeout,
-  smartshield_type,
+} from "./outputs.js";
+import {
+  smartshield_check_regions as smartshield_check_regions$,
+  smartshield_healthchecks as smartshield_healthchecks$,
+  smartshield_http_config as smartshield_http_config$,
+  smartshield_query_healthcheck,
+  smartshield_single_hc_response as smartshield_single_hc_response$,
+  smartshield_tcp_config as smartshield_tcp_config$,
 } from "./schemas.js";
 
 /**
- * The tools of `smart_shield.health_checks`.
+ * The tools of `smartShield.healthChecks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "smart_shield_health_checks_create",
+    name: "smartShield_healthChecks_create",
     title: "Create Health Check",
-    description: "Create a new health check.",
+    description: "Create a new health check.\n\nPOST /zones/{zone_id}/smart_shield/healthchecks",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/smartshield_query_healthcheck"
         },
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "smartshield_address": smartshield_address,
-        "smartshield_check_regions": smartshield_check_regions,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes,
-        "smartshield_description": smartshield_description,
-        "smartshield_http_config": smartshield_http_config,
-        "smartshield_identifier": smartshield_identifier,
-        "smartshield_interval": smartshield_interval,
-        "smartshield_name": smartshield_name,
+        "smartshield_check_regions": smartshield_check_regions$,
+        "smartshield_http_config": smartshield_http_config$,
         "smartshield_query_healthcheck": smartshield_query_healthcheck,
-        "smartshield_retries": smartshield_retries,
-        "smartshield_suspended": smartshield_suspended,
-        "smartshield_tcp_config": smartshield_tcp_config,
-        "smartshield_timeout": smartshield_timeout,
-        "smartshield_type": smartshield_type,
+        "smartshield_tcp_config": smartshield_tcp_config$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/smartshield_single_hc_response",
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_single_hc_response": smartshield_single_hc_response_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_response": smartshield_single_hc_response,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     annotations: {
@@ -156,29 +116,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_single_hc_response": smartshield_single_hc_response_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_response": smartshield_single_hc_response,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     request: (args) => ({
@@ -187,37 +133,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "smart_shield_health_checks_delete",
+    name: "smartShield_healthChecks_delete",
     title: "Delete Health Check",
-    description: "Delete a health check.",
+    description: "Delete a health check.\n\nDELETE /zones/{zone_id}/smart_shield/healthchecks/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "healthcheck_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id"
+        "path"
       ],
-      $defs: {
-        "smartshield_identifier": smartshield_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/smartshield_single_hc_id_response",
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_single_hc_id_response": smartshield_single_hc_id_response_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_id_response": smartshield_single_hc_id_response,
       },
     },
     annotations: {
@@ -250,12 +202,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_single_hc_id_response": smartshield_single_hc_id_response_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_id_response": smartshield_single_hc_id_response,
       },
     },
     request: (args) => ({
@@ -263,72 +214,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "smart_shield_health_checks_edit",
+    name: "smartShield_healthChecks_edit",
     title: "Patch Health Check",
-    description: "Patch a configured health check.",
+    description: "Patch a configured health check.\n\nPATCH /zones/{zone_id}/smart_shield/healthchecks/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/smartshield_query_healthcheck"
         },
-        "healthcheck_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "smartshield_address": smartshield_address,
-        "smartshield_check_regions": smartshield_check_regions,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes,
-        "smartshield_description": smartshield_description,
-        "smartshield_http_config": smartshield_http_config,
-        "smartshield_identifier": smartshield_identifier,
-        "smartshield_interval": smartshield_interval,
-        "smartshield_name": smartshield_name,
+        "smartshield_check_regions": smartshield_check_regions$,
+        "smartshield_http_config": smartshield_http_config$,
         "smartshield_query_healthcheck": smartshield_query_healthcheck,
-        "smartshield_retries": smartshield_retries,
-        "smartshield_suspended": smartshield_suspended,
-        "smartshield_tcp_config": smartshield_tcp_config,
-        "smartshield_timeout": smartshield_timeout,
-        "smartshield_type": smartshield_type,
+        "smartshield_tcp_config": smartshield_tcp_config$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/smartshield_single_hc_response",
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_single_hc_response": smartshield_single_hc_response_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_response": smartshield_single_hc_response,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     annotations: {
@@ -361,29 +297,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_single_hc_response": smartshield_single_hc_response_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_response": smartshield_single_hc_response,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     request: (args) => ({
@@ -392,54 +314,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "smart_shield_health_checks_get",
+    name: "smartShield_healthChecks_get",
     title: "Health Check Details",
-    description: "Fetch a single configured health check.",
+    description: "Fetch a single configured health check.\n\nGET /zones/{zone_id}/smart_shield/healthchecks/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "healthcheck_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id"
+        "path"
       ],
-      $defs: {
-        "smartshield_identifier": smartshield_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/smartshield_single_hc_response",
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_single_hc_response": smartshield_single_hc_response_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_response": smartshield_single_hc_response,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     annotations: {
@@ -473,29 +388,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_single_hc_response": smartshield_single_hc_response_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_response": smartshield_single_hc_response,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     request: (args) => ({
@@ -503,61 +404,60 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "smart_shield_health_checks_list",
+    name: "smartShield_healthChecks_list",
     title: "List Health Checks",
-    description: "List configured health checks.",
+    description: "List configured health checks.\n\nGET /zones/{zone_id}/smart_shield/healthchecks",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 25,
-          "description": "Maximum number of results per page. Must be a multiple of 5.",
-          "type": "number"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Maximum number of results per page. Must be a multiple of 5.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "smartshield_identifier": smartshield_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/smartshield_response_collection",
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-collection": smartshield_api_response_collection_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_response_collection": smartshield_response_collection_output,
-        "smartshield_result_info": smartshield_result_info_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-collection": smartshield_api$$response$$collection,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_response_collection": smartshield_response_collection,
+        "smartshield_result_info": smartshield_result_info,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     annotations: {
@@ -591,112 +491,83 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-collection": smartshield_api_response_collection_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_response_collection": smartshield_response_collection_output,
-        "smartshield_result_info": smartshield_result_info_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-collection": smartshield_api$$response$$collection,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_response_collection": smartshield_response_collection,
+        "smartshield_result_info": smartshield_result_info,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/smart_shield/healthchecks`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "smart_shield_health_checks_update",
+    name: "smartShield_healthChecks_update",
     title: "Update Health Check",
-    description: "Update a configured health check.",
+    description: "Update a configured health check.\n\nPUT /zones/{zone_id}/smart_shield/healthchecks/{healthcheck_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/smartshield_single_hc_response"
         },
-        "healthcheck_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "healthcheck_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "healthcheck_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "healthcheck_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "smartshield_api-response-common": smartshield_api$$response$$common$,
+        "smartshield_api-response-result": smartshield_api$$response$$result$,
+        "smartshield_check_regions": smartshield_check_regions$,
+        "smartshield_healthchecks": smartshield_healthchecks$,
+        "smartshield_http_config": smartshield_http_config$,
+        "smartshield_messages": smartshield_messages$,
+        "smartshield_single_hc_response": smartshield_single_hc_response$,
+        "smartshield_tcp_config": smartshield_tcp_config$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/smartshield_single_hc_response",
       $defs: {
-        "smartshield_address": smartshield_address,
-        "smartshield_api-response-common": smartshield_api_response_common,
-        "smartshield_api-response-result": smartshield_api_response_result,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
         "smartshield_check_regions": smartshield_check_regions,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes,
-        "smartshield_description": smartshield_description,
         "smartshield_healthchecks": smartshield_healthchecks,
         "smartshield_http_config": smartshield_http_config,
-        "smartshield_identifier": smartshield_identifier,
-        "smartshield_interval": smartshield_interval,
         "smartshield_messages": smartshield_messages,
-        "smartshield_name": smartshield_name,
-        "smartshield_retries": smartshield_retries,
         "smartshield_single_hc_response": smartshield_single_hc_response,
-        "smartshield_suspended": smartshield_suspended,
         "smartshield_tcp_config": smartshield_tcp_config,
-        "smartshield_timeout": smartshield_timeout,
-        "smartshield_type": smartshield_type,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/smartshield_single_hc_response",
-      $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_single_hc_response": smartshield_single_hc_response_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
       },
     },
     annotations: {
@@ -729,29 +600,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_address": smartshield_address_output,
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_check_regions": smartshield_check_regions_output,
-        "smartshield_consecutive_fails": smartshield_consecutive_fails_output,
-        "smartshield_consecutive_successes": smartshield_consecutive_successes_output,
-        "smartshield_description": smartshield_description_output,
-        "smartshield_failure_reason": smartshield_failure_reason_output,
-        "smartshield_healthchecks": smartshield_healthchecks_output,
-        "smartshield_http_config": smartshield_http_config_output,
-        "smartshield_identifier": smartshield_identifier_output,
-        "smartshield_interval": smartshield_interval_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_name": smartshield_name_output,
-        "smartshield_retries": smartshield_retries_output,
-        "smartshield_single_hc_response": smartshield_single_hc_response_output,
-        "smartshield_status": smartshield_status_output,
-        "smartshield_suspended": smartshield_suspended_output,
-        "smartshield_tcp_config": smartshield_tcp_config_output,
-        "smartshield_timeout": smartshield_timeout_output,
-        "smartshield_timestamp": smartshield_timestamp_output,
-        "smartshield_type": smartshield_type_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_check_regions": smartshield_check_regions,
+        "smartshield_healthchecks": smartshield_healthchecks,
+        "smartshield_http_config": smartshield_http_config,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_hc_response": smartshield_single_hc_response,
+        "smartshield_tcp_config": smartshield_tcp_config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/smartShield/outputs.ts b/src/generated/forge-mcp/smartShield/outputs.ts
index b0fce1281..70b195c9a 100644
--- a/src/generated/forge-mcp/smartShield/outputs.ts
+++ b/src/generated/forge-mcp/smartShield/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `smartshield_api-response-common` in responses.
  */
-export const smartshield_api_response_common_output: JsonSchema = {
+export const smartshield_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/smartshield_messages"
@@ -36,7 +36,7 @@ export const smartshield_api_response_common_output: JsonSchema = {
 /**
  * The schema of `smartshield_api-response-common-failure` in responses.
  */
-export const smartshield_api_response_common_failure_output: JsonSchema = {
+export const smartshield_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/smartshield_messages"
@@ -64,7 +64,7 @@ export const smartshield_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `smartshield_api-response-result` in responses.
  */
-export const smartshield_api_response_result_output: JsonSchema = {
+export const smartshield_api$$response$$result: JsonSchema = {
   "anyOf": [
     {
       "type": "object"
@@ -81,17 +81,10 @@ export const smartshield_api_response_result_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_identifier` in responses.
- */
-export const smartshield_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_messages` in responses.
  */
-export const smartshield_messages_output: JsonSchema = {
+export const smartshield_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -113,7 +106,7 @@ export const smartshield_messages_output: JsonSchema = {
 /**
  * The schema of `smartshield_single_smart_shield_get_response` in responses.
  */
-export const smartshield_single_smart_shield_get_response_output: JsonSchema = {
+export const smartshield_single_smart_shield_get_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/smartshield_api-response-common"
@@ -132,7 +125,7 @@ export const smartshield_single_smart_shield_get_response_output: JsonSchema = {
 /**
  * The schema of `smartshield_single_smart_shield_patch_response` in responses.
  */
-export const smartshield_single_smart_shield_patch_response_output: JsonSchema = {
+export const smartshield_single_smart_shield_patch_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/smartshield_api-response-common"
@@ -151,7 +144,7 @@ export const smartshield_single_smart_shield_patch_response_output: JsonSchema =
 /**
  * The schema of `smartshield_smart_shield_settings` in responses.
  */
-export const smartshield_smart_shield_settings_output: JsonSchema = {
+export const smartshield_smart_shield_settings: JsonSchema = {
   "properties": {
     "cache_reserve": {
       "properties": {
@@ -235,7 +228,7 @@ export const smartshield_smart_shield_settings_output: JsonSchema = {
 /**
  * The schema of `smartshield_smart_shield_settings_get_response` in responses.
  */
-export const smartshield_smart_shield_settings_get_response_output: JsonSchema = {
+export const smartshield_smart_shield_settings_get_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/smartshield_smart_shield_settings"
@@ -255,7 +248,7 @@ export const smartshield_smart_shield_settings_get_response_output: JsonSchema =
  * The schema of `smartshield_smart_shield_settings_patch_response` in
  * responses.
  */
-export const smartshield_smart_shield_settings_patch_response_output: JsonSchema = {
+export const smartshield_smart_shield_settings_patch_response: JsonSchema = {
   "properties": {
     "cache_reserve": {
       "properties": {
diff --git a/src/generated/forge-mcp/smartShield/schemas.ts b/src/generated/forge-mcp/smartShield/schemas.ts
index 396b77a2e..bcf1ecacc 100644
--- a/src/generated/forge-mcp/smartShield/schemas.ts
+++ b/src/generated/forge-mcp/smartShield/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `smartshield_api-response-common`.
  */
-export const smartshield_api_response_common: JsonSchema = {
+export const smartshield_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/smartshield_messages"
@@ -37,7 +37,7 @@ export const smartshield_api_response_common: JsonSchema = {
 /**
  * The schema of `smartshield_api-response-result`.
  */
-export const smartshield_api_response_result: JsonSchema = {
+export const smartshield_api$$response$$result: JsonSchema = {
   "anyOf": [
     {
       "type": "object"
@@ -54,14 +54,6 @@ export const smartshield_api_response_result: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `smartshield_identifier`.
- */
-export const smartshield_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `smartshield_messages`.
  */
diff --git a/src/generated/forge-mcp/smartShield/tools.ts b/src/generated/forge-mcp/smartShield/tools.ts
index cc4b3942c..601a621fc 100644
--- a/src/generated/forge-mcp/smartShield/tools.ts
+++ b/src/generated/forge-mcp/smartShield/tools.ts
@@ -3,43 +3,47 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  smartshield_api_response_common_failure_output,
-  smartshield_api_response_common_output,
-  smartshield_api_response_result_output,
-  smartshield_messages_output,
-  smartshield_single_smart_shield_get_response_output,
-  smartshield_single_smart_shield_patch_response_output,
-  smartshield_smart_shield_settings_get_response_output,
-  smartshield_smart_shield_settings_output,
-  smartshield_smart_shield_settings_patch_response_output,
+  smartshield_api$$response$$common,
+  smartshield_api$$response$$common$$failure,
+  smartshield_api$$response$$result,
+  smartshield_messages,
+  smartshield_single_smart_shield_get_response,
+  smartshield_single_smart_shield_patch_response,
+  smartshield_smart_shield_settings,
+  smartshield_smart_shield_settings_get_response,
+  smartshield_smart_shield_settings_patch_response,
 } from "./outputs.js";
-import {
-  smartshield_identifier,
-  smartshield_smart_shield_settings_patch_body,
-} from "./schemas.js";
+import { smartshield_smart_shield_settings_patch_body } from "./schemas.js";
 
 /**
- * The tools of `smart_shield`.
+ * The tools of `smartShield`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "smart_shield_get",
+    name: "smartShield_get",
     title: "Get Smart Shield Settings",
-    description: "Retrieve Smart Shield Settings.",
+    description: "Retrieve Smart Shield Settings.\n\nGET /zones/{zone_id}/smart_shield",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "smartshield_identifier": smartshield_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -51,12 +55,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_single_smart_shield_get_response": smartshield_single_smart_shield_get_response_output,
-        "smartshield_smart_shield_settings": smartshield_smart_shield_settings_output,
-        "smartshield_smart_shield_settings_get_response": smartshield_smart_shield_settings_get_response_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_smart_shield_get_response": smartshield_single_smart_shield_get_response,
+        "smartshield_smart_shield_settings": smartshield_smart_shield_settings,
+        "smartshield_smart_shield_settings_get_response": smartshield_smart_shield_settings_get_response,
       },
     },
     annotations: {
@@ -110,13 +114,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_single_smart_shield_get_response": smartshield_single_smart_shield_get_response_output,
-        "smartshield_smart_shield_settings": smartshield_smart_shield_settings_output,
-        "smartshield_smart_shield_settings_get_response": smartshield_smart_shield_settings_get_response_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_smart_shield_get_response": smartshield_single_smart_shield_get_response,
+        "smartshield_smart_shield_settings": smartshield_smart_shield_settings,
+        "smartshield_smart_shield_settings_get_response": smartshield_smart_shield_settings_get_response,
       },
     },
     request: (args) => ({
@@ -124,26 +128,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "smart_shield_update",
+    name: "smartShield_update",
     title: "Patch Smart Shield Settings",
-    description: "Set Smart Shield Settings.",
+    description: "Set Smart Shield Settings.\n\nPATCH /zones/{zone_id}/smart_shield",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/smartshield_smart_shield_settings_patch_body"
         },
-        "zone_id": {
-          "$ref": "#/$defs/smartshield_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "smartshield_identifier": smartshield_identifier,
         "smartshield_smart_shield_settings_patch_body": smartshield_smart_shield_settings_patch_body,
       },
     },
@@ -157,11 +170,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_single_smart_shield_patch_response": smartshield_single_smart_shield_patch_response_output,
-        "smartshield_smart_shield_settings_patch_response": smartshield_smart_shield_settings_patch_response_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_smart_shield_patch_response": smartshield_single_smart_shield_patch_response,
+        "smartshield_smart_shield_settings_patch_response": smartshield_smart_shield_settings_patch_response,
       },
     },
     annotations: {
@@ -214,12 +227,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "smartshield_api-response-common": smartshield_api_response_common_output,
-        "smartshield_api-response-common-failure": smartshield_api_response_common_failure_output,
-        "smartshield_api-response-result": smartshield_api_response_result_output,
-        "smartshield_messages": smartshield_messages_output,
-        "smartshield_single_smart_shield_patch_response": smartshield_single_smart_shield_patch_response_output,
-        "smartshield_smart_shield_settings_patch_response": smartshield_smart_shield_settings_patch_response_output,
+        "smartshield_api-response-common": smartshield_api$$response$$common,
+        "smartshield_api-response-common-failure": smartshield_api$$response$$common$$failure,
+        "smartshield_api-response-result": smartshield_api$$response$$result,
+        "smartshield_messages": smartshield_messages,
+        "smartshield_single_smart_shield_patch_response": smartshield_single_smart_shield_patch_response,
+        "smartshield_smart_shield_settings_patch_response": smartshield_smart_shield_settings_patch_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/snippets/content/tools.ts b/src/generated/forge-mcp/snippets/content/tools.ts
index f35c8671c..518b7c202 100644
--- a/src/generated/forge-mcp/snippets/content/tools.ts
+++ b/src/generated/forge-mcp/snippets/content/tools.ts
@@ -3,12 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  snippets_Errors_output,
-  snippets_Message_output,
-  snippets_Messages_output,
-  snippets_Response_output,
+  snippets_Errors,
+  snippets_Message,
+  snippets_Messages,
+  snippets_Response,
 } from "../outputs.js";
-import { snippets_SnippetName, snippets_ZoneId } from "../schemas.js";
 
 /**
  * The tools of `snippets.content`.
@@ -17,27 +16,33 @@ export const tools: readonly Tool[] = [
   {
     name: "snippets_content_get",
     title: "Get a zone snippet content",
-    description: "Fetches the content of a snippet belonging to the zone.",
+    description: "Fetches the content of a snippet belonging to the zone.\n\nGET /zones/{zone_id}/snippets/{snippet_name}/content",
     inputSchema: {
       type: "object",
       properties: {
-        "snippet_name": {
-          "$ref": "#/$defs/snippets_SnippetName",
-          "description": "Identify the snippet."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/snippets_ZoneId",
-          "description": "Use this field to specify the unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "snippet_name": {
+              "description": "Identify the snippet.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Use this field to specify the unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "snippet_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "snippet_name"
+        "path"
       ],
-      $defs: {
-        "snippets_SnippetName": snippets_SnippetName,
-        "snippets_ZoneId": snippets_ZoneId,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -107,10 +112,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/snippets/outputs.ts b/src/generated/forge-mcp/snippets/outputs.ts
index 09ec32b5d..78e8e15f9 100644
--- a/src/generated/forge-mcp/snippets/outputs.ts
+++ b/src/generated/forge-mcp/snippets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `snippets_Errors` in responses.
  */
-export const snippets_Errors_output: JsonSchema = {
+export const snippets_Errors: JsonSchema = {
   "items": {
     "$ref": "#/$defs/snippets_Message"
   },
@@ -16,7 +16,7 @@ export const snippets_Errors_output: JsonSchema = {
 /**
  * The schema of `snippets_Message` in responses.
  */
-export const snippets_Message_output: JsonSchema = {
+export const snippets_Message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -34,31 +34,17 @@ export const snippets_Message_output: JsonSchema = {
 /**
  * The schema of `snippets_Messages` in responses.
  */
-export const snippets_Messages_output: JsonSchema = {
+export const snippets_Messages: JsonSchema = {
   "items": {
     "$ref": "#/$defs/snippets_Message"
   },
   "type": "array"
 };
 
-/**
- * The schema of `snippets_Page` in responses.
- */
-export const snippets_Page_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `snippets_PerPage` in responses.
- */
-export const snippets_PerPage_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `snippets_Response` in responses.
  */
-export const snippets_Response_output: JsonSchema = {
+export const snippets_Response: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/snippets_Errors"
@@ -81,16 +67,16 @@ export const snippets_Response_output: JsonSchema = {
 /**
  * The schema of `snippets_ResultInfo` in responses.
  */
-export const snippets_ResultInfo_output: JsonSchema = {
+export const snippets_ResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
     },
     "page": {
-      "$ref": "#/$defs/snippets_Page"
+      "type": "integer"
     },
     "per_page": {
-      "$ref": "#/$defs/snippets_PerPage"
+      "type": "integer"
     },
     "total_count": {
       "type": "integer"
@@ -112,7 +98,7 @@ export const snippets_ResultInfo_output: JsonSchema = {
 /**
  * The schema of `snippets_Snippet` in responses.
  */
-export const snippets_Snippet_output: JsonSchema = {
+export const snippets_Snippet: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -123,7 +109,7 @@ export const snippets_Snippet_output: JsonSchema = {
       "type": "string"
     },
     "snippet_name": {
-      "$ref": "#/$defs/snippets_SnippetName"
+      "type": "string"
     }
   },
   "required": [
@@ -132,10 +118,3 @@ export const snippets_Snippet_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `snippets_SnippetName` in responses.
- */
-export const snippets_SnippetName_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/snippets/rules/outputs.ts b/src/generated/forge-mcp/snippets/rules/outputs.ts
index 810a14c52..1c5cecb6d 100644
--- a/src/generated/forge-mcp/snippets/rules/outputs.ts
+++ b/src/generated/forge-mcp/snippets/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `snippets_SnippetRules` in responses.
  */
-export const snippets_SnippetRules_output: JsonSchema = {
+export const snippets_SnippetRules: JsonSchema = {
   "items": {
     "properties": {
       "description": {
@@ -26,7 +26,7 @@ export const snippets_SnippetRules_output: JsonSchema = {
         "type": "string"
       },
       "snippet_name": {
-        "$ref": "#/$defs/snippets_SnippetName"
+        "type": "string"
       }
     },
     "required": [
diff --git a/src/generated/forge-mcp/snippets/rules/schemas.ts b/src/generated/forge-mcp/snippets/rules/schemas.ts
index 7acca667d..4dc4687ac 100644
--- a/src/generated/forge-mcp/snippets/rules/schemas.ts
+++ b/src/generated/forge-mcp/snippets/rules/schemas.ts
@@ -25,8 +25,8 @@ export const snippets_SnippetRules: JsonSchema = {
         "type": "string"
       },
       "snippet_name": {
-        "$ref": "#/$defs/snippets_SnippetName",
-        "description": "Identify the snippet."
+        "description": "Identify the snippet.",
+        "type": "string"
       }
     },
     "required": [
diff --git a/src/generated/forge-mcp/snippets/rules/tools.ts b/src/generated/forge-mcp/snippets/rules/tools.ts
index caf1ea382..9da71229d 100644
--- a/src/generated/forge-mcp/snippets/rules/tools.ts
+++ b/src/generated/forge-mcp/snippets/rules/tools.ts
@@ -3,15 +3,13 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  snippets_Errors_output,
-  snippets_Message_output,
-  snippets_Messages_output,
-  snippets_Response_output,
-  snippets_SnippetName_output,
+  snippets_Errors,
+  snippets_Message,
+  snippets_Messages,
+  snippets_Response,
 } from "../outputs.js";
-import { snippets_SnippetName, snippets_ZoneId } from "../schemas.js";
-import { snippets_SnippetRules_output } from "./outputs.js";
-import { snippets_SnippetRules } from "./schemas.js";
+import { snippets_SnippetRules } from "./outputs.js";
+import { snippets_SnippetRules as snippets_SnippetRules$ } from "./schemas.js";
 
 /**
  * The tools of `snippets.rules`.
@@ -20,21 +18,28 @@ export const tools: readonly Tool[] = [
   {
     name: "snippets_rules_delete",
     title: "Delete zone snippet rules",
-    description: "Deletes all snippet rules belonging to the zone.",
+    description: "Deletes all snippet rules belonging to the zone.\n\nDELETE /zones/{zone_id}/snippets/snippet_rules",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/snippets_ZoneId",
-          "description": "Use this field to specify the unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Use this field to specify the unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "snippets_ZoneId": snippets_ZoneId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -58,12 +63,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
-        "snippets_SnippetRules": snippets_SnippetRules_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_SnippetRules": snippets_SnippetRules,
       },
     },
     annotations: {
@@ -154,12 +158,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
-        "snippets_SnippetRules": snippets_SnippetRules_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_SnippetRules": snippets_SnippetRules,
       },
     },
     request: (args) => ({
@@ -169,21 +172,28 @@ export const tools: readonly Tool[] = [
   {
     name: "snippets_rules_list",
     title: "List zone snippet rules",
-    description: "Fetches all snippet rules belonging to the zone.",
+    description: "Fetches all snippet rules belonging to the zone.\n\nGET /zones/{zone_id}/snippets/snippet_rules",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/snippets_ZoneId",
-          "description": "Use this field to specify the unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Use this field to specify the unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "snippets_ZoneId": snippets_ZoneId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -207,12 +217,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
-        "snippets_SnippetRules": snippets_SnippetRules_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_SnippetRules": snippets_SnippetRules,
       },
     },
     annotations: {
@@ -304,12 +313,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
-        "snippets_SnippetRules": snippets_SnippetRules_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_SnippetRules": snippets_SnippetRules,
       },
     },
     request: (args) => ({
@@ -319,7 +327,7 @@ export const tools: readonly Tool[] = [
   {
     name: "snippets_rules_update",
     title: "Update zone snippet rules",
-    description: "Updates all snippet rules belonging to the zone.",
+    description: "Updates all snippet rules belonging to the zone.\n\nPUT /zones/{zone_id}/snippets/snippet_rules",
     inputSchema: {
       type: "object",
       properties: {
@@ -335,19 +343,27 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/snippets_ZoneId",
-          "description": "Use this field to specify the unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Use this field to specify the unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "snippets_SnippetName": snippets_SnippetName,
-        "snippets_SnippetRules": snippets_SnippetRules,
-        "snippets_ZoneId": snippets_ZoneId,
+        "snippets_SnippetRules": snippets_SnippetRules$,
       },
     },
     outputSchema: {
@@ -372,12 +388,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
-        "snippets_SnippetRules": snippets_SnippetRules_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_SnippetRules": snippets_SnippetRules,
       },
     },
     annotations: {
@@ -468,12 +483,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
-        "snippets_SnippetRules": snippets_SnippetRules_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_SnippetRules": snippets_SnippetRules,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/snippets/schemas.ts b/src/generated/forge-mcp/snippets/schemas.ts
deleted file mode 100644
index 62897dacf..000000000
--- a/src/generated/forge-mcp/snippets/schemas.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `snippets_Page`.
- */
-export const snippets_Page: JsonSchema = {
-  "description": "Specifies the current page number.",
-  "type": "integer"
-};
-
-/**
- * The schema of `snippets_PerPage`.
- */
-export const snippets_PerPage: JsonSchema = {
-  "description": "Specifies how many results to return per page.",
-  "type": "integer"
-};
-
-/**
- * The schema of `snippets_SnippetName`.
- */
-export const snippets_SnippetName: JsonSchema = {
-  "description": "Identify the snippet.",
-  "type": "string"
-};
-
-/**
- * The schema of `snippets_ZoneId`.
- */
-export const snippets_ZoneId: JsonSchema = {
-  "description": "Use this field to specify the unique ID of the zone.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/snippets/tools.ts b/src/generated/forge-mcp/snippets/tools.ts
index 762540b96..3308be7a4 100644
--- a/src/generated/forge-mcp/snippets/tools.ts
+++ b/src/generated/forge-mcp/snippets/tools.ts
@@ -1,24 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  snippets_Errors_output,
-  snippets_Message_output,
-  snippets_Messages_output,
-  snippets_Page_output,
-  snippets_PerPage_output,
-  snippets_Response_output,
-  snippets_ResultInfo_output,
-  snippets_SnippetName_output,
-  snippets_Snippet_output,
+  snippets_Errors,
+  snippets_Message,
+  snippets_Messages,
+  snippets_Response,
+  snippets_ResultInfo,
+  snippets_Snippet,
 } from "./outputs.js";
-import {
-  snippets_Page,
-  snippets_PerPage,
-  snippets_SnippetName,
-  snippets_ZoneId,
-} from "./schemas.js";
 
 /**
  * The tools of `snippets`.
@@ -27,27 +18,33 @@ export const tools: readonly Tool[] = [
   {
     name: "snippets_delete",
     title: "Delete a zone snippet",
-    description: "Deletes a snippet belonging to the zone. Returns a 4XX response if the zone or snippet no longer exists.",
+    description: "Deletes a snippet belonging to the zone. Returns a 4XX response if the zone or snippet no longer exists.\n\nDELETE /zones/{zone_id}/snippets/{snippet_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "snippet_name": {
-          "$ref": "#/$defs/snippets_SnippetName",
-          "description": "Identify the snippet."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/snippets_ZoneId",
-          "description": "Use this field to specify the unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "snippet_name": {
+              "description": "Identify the snippet.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Use this field to specify the unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "snippet_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "snippet_name"
+        "path"
       ],
-      $defs: {
-        "snippets_SnippetName": snippets_SnippetName,
-        "snippets_ZoneId": snippets_ZoneId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -71,10 +68,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
       },
     },
     annotations: {
@@ -165,10 +162,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
       },
     },
     request: (args) => ({
@@ -178,27 +175,33 @@ export const tools: readonly Tool[] = [
   {
     name: "snippets_get",
     title: "Get a zone snippet",
-    description: "Fetches a snippet belonging to the zone.",
+    description: "Fetches a snippet belonging to the zone.\n\nGET /zones/{zone_id}/snippets/{snippet_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "snippet_name": {
-          "$ref": "#/$defs/snippets_SnippetName",
-          "description": "Identify the snippet."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/snippets_ZoneId",
-          "description": "Use this field to specify the unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "snippet_name": {
+              "description": "Identify the snippet.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Use this field to specify the unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "snippet_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "snippet_name"
+        "path"
       ],
-      $defs: {
-        "snippets_SnippetName": snippets_SnippetName,
-        "snippets_ZoneId": snippets_ZoneId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -222,12 +225,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_Snippet": snippets_Snippet_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_Snippet": snippets_Snippet,
       },
     },
     annotations: {
@@ -319,12 +321,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_Snippet": snippets_Snippet_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_Snippet": snippets_Snippet,
       },
     },
     request: (args) => ({
@@ -334,33 +335,44 @@ export const tools: readonly Tool[] = [
   {
     name: "snippets_list",
     title: "List zone snippets",
-    description: "Fetches all snippets belonging to the zone.",
+    description: "Fetches all snippets belonging to the zone.\n\nGET /zones/{zone_id}/snippets",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "$ref": "#/$defs/snippets_Page",
-          "default": 1,
-          "description": "Specifies the current page number."
-        },
-        "per_page": {
-          "$ref": "#/$defs/snippets_PerPage",
-          "default": 25,
-          "description": "Specifies how many results to return per page."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Use this field to specify the unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/snippets_ZoneId",
-          "description": "Use this field to specify the unique ID of the zone."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Specifies the current page number.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Specifies how many results to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "snippets_Page": snippets_Page,
-        "snippets_PerPage": snippets_PerPage,
-        "snippets_ZoneId": snippets_ZoneId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -390,15 +402,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Page": snippets_Page_output,
-        "snippets_PerPage": snippets_PerPage_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_ResultInfo": snippets_ResultInfo_output,
-        "snippets_Snippet": snippets_Snippet_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_ResultInfo": snippets_ResultInfo,
+        "snippets_Snippet": snippets_Snippet,
       },
     },
     annotations: {
@@ -496,22 +505,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "snippets_Errors": snippets_Errors_output,
-        "snippets_Message": snippets_Message_output,
-        "snippets_Messages": snippets_Messages_output,
-        "snippets_Page": snippets_Page_output,
-        "snippets_PerPage": snippets_PerPage_output,
-        "snippets_Response": snippets_Response_output,
-        "snippets_ResultInfo": snippets_ResultInfo_output,
-        "snippets_Snippet": snippets_Snippet_output,
-        "snippets_SnippetName": snippets_SnippetName_output,
+        "snippets_Errors": snippets_Errors,
+        "snippets_Message": snippets_Message,
+        "snippets_Messages": snippets_Messages,
+        "snippets_Response": snippets_Response,
+        "snippets_ResultInfo": snippets_ResultInfo,
+        "snippets_Snippet": snippets_Snippet,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/snippets`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/outputs.ts b/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/outputs.ts
index e15942e58..1ab4bb805 100644
--- a/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/outputs.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `spectrum-analytics_query-response-aggregate` in responses.
  */
-export const spectrum_analytics_query_response_aggregate_output: JsonSchema = {
+export const spectrum$$analytics_query$$response$$aggregate: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-analytics_api-response-single"
@@ -22,7 +22,7 @@ export const spectrum_analytics_query_response_aggregate_output: JsonSchema = {
                     "type": "string"
                   },
                   {
-                    "$ref": "#/$defs/spectrum-analytics_identifier"
+                    "type": "string"
                   }
                 ]
               },
diff --git a/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/schemas.ts b/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/schemas.ts
deleted file mode 100644
index f2eaf0815..000000000
--- a/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../../_/tool.js";
-
-/**
- * The schema of `spectrum-analytics_app_id_param`.
- */
-export const spectrum_analytics_app_id_param: JsonSchema = {
-  "description": "Comma-delimited list of Spectrum Application Id(s). If provided, the response will be limited to Spectrum Application Id(s) that match.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/tools.ts b/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/tools.ts
index 99980dd78..a187d9e2c 100644
--- a/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/tools.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/aggregates/currents/tools.ts
@@ -1,16 +1,13 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  spectrum_analytics_api_response_common_failure_output,
-  spectrum_analytics_api_response_single_output,
-  spectrum_analytics_identifier_output,
-  spectrum_analytics_messages_output,
+  spectrum$$analytics_api$$response$$common$$failure,
+  spectrum$$analytics_api$$response$$single,
+  spectrum$$analytics_messages,
 } from "../../outputs.js";
-import { spectrum_analytics_identifier } from "../../schemas.js";
-import { spectrum_analytics_query_response_aggregate_output } from "./outputs.js";
-import { spectrum_analytics_app_id_param } from "./schemas.js";
+import { spectrum$$analytics_query$$response$$aggregate } from "./outputs.js";
 
 /**
  * The tools of `spectrum.analytics.aggregates.currents`.
@@ -19,38 +16,49 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_analytics_aggregates_currents_get",
     title: "Get current aggregated analytics",
-    description: "Retrieves analytics aggregated from the last minute of usage on Spectrum applications underneath a given zone.",
+    description: "Retrieves analytics aggregated from the last minute of usage on Spectrum applications underneath a given zone.\n\nGET /zones/{zone_id}/spectrum/analytics/aggregate/current",
     inputSchema: {
       type: "object",
       properties: {
-        "app_id": {
-          "$ref": "#/$defs/spectrum-analytics_app_id_param",
-          "description": "Comma-delimited list of Spectrum Application Id(s). If provided, the response will be limited to Spectrum Application Id(s) that match."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "colo_name": {
-          "description": "Co-location identifier.",
-          "type": "string"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-analytics_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "appID": {
+              "description": "Comma-delimited list of Spectrum Application Id(s). If provided, the response will be limited to Spectrum Application Id(s) that match.",
+              "type": "string"
+            },
+            "colo_name": {
+              "description": "Co-location identifier.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "spectrum-analytics_app_id_param": spectrum_analytics_app_id_param,
-        "spectrum-analytics_identifier": spectrum_analytics_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-analytics_query-response-aggregate",
       $defs: {
-        "spectrum-analytics_api-response-single": spectrum_analytics_api_response_single_output,
-        "spectrum-analytics_identifier": spectrum_analytics_identifier_output,
-        "spectrum-analytics_messages": spectrum_analytics_messages_output,
-        "spectrum-analytics_query-response-aggregate": spectrum_analytics_query_response_aggregate_output,
+        "spectrum-analytics_api-response-single": spectrum$$analytics_api$$response$$single,
+        "spectrum-analytics_messages": spectrum$$analytics_messages,
+        "spectrum-analytics_query-response-aggregate": spectrum$$analytics_query$$response$$aggregate,
       },
     },
     annotations: {
@@ -77,18 +85,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-analytics_api-response-common-failure": spectrum_analytics_api_response_common_failure_output,
-        "spectrum-analytics_api-response-single": spectrum_analytics_api_response_single_output,
-        "spectrum-analytics_identifier": spectrum_analytics_identifier_output,
-        "spectrum-analytics_messages": spectrum_analytics_messages_output,
-        "spectrum-analytics_query-response-aggregate": spectrum_analytics_query_response_aggregate_output,
+        "spectrum-analytics_api-response-common-failure": spectrum$$analytics_api$$response$$common$$failure,
+        "spectrum-analytics_api-response-single": spectrum$$analytics_api$$response$$single,
+        "spectrum-analytics_messages": spectrum$$analytics_messages,
+        "spectrum-analytics_query-response-aggregate": spectrum$$analytics_query$$response$$aggregate,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/spectrum/analytics/aggregate/current`,
       query: [
-        ["appID", args["app_id"], true],
-        ["colo_name", args["colo_name"], true],
+        ["appID", param(args, "query", "appID"), true],
+        ["colo_name", param(args, "query", "colo_name"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/spectrum/analytics/events/bytimes/tools.ts b/src/generated/forge-mcp/spectrum/analytics/events/bytimes/tools.ts
index 1b907c3c8..785287180 100644
--- a/src/generated/forge-mcp/spectrum/analytics/events/bytimes/tools.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/events/bytimes/tools.ts
@@ -1,36 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  spectrum_analytics_api_response_common_failure_output,
-  spectrum_analytics_api_response_single_output,
-  spectrum_analytics_messages_output,
-  spectrum_analytics_since_output,
-  spectrum_analytics_timestamp_output,
-  spectrum_analytics_until_output,
+  spectrum$$analytics_api$$response$$common$$failure,
+  spectrum$$analytics_api$$response$$single,
+  spectrum$$analytics_messages,
 } from "../../outputs.js";
 import {
-  spectrum_analytics_identifier,
-  spectrum_analytics_since,
-  spectrum_analytics_timestamp,
-  spectrum_analytics_until,
-} from "../../schemas.js";
-import {
-  spectrum_analytics_column_output,
-  spectrum_analytics_dimensions_output,
-  spectrum_analytics_filters_output,
-  spectrum_analytics_metrics_output,
-  spectrum_analytics_query_output,
-  spectrum_analytics_query_response_single_output,
-  spectrum_analytics_sort_output,
-  spectrum_analytics_stat_output,
+  spectrum$$analytics_column,
+  spectrum$$analytics_dimensions,
+  spectrum$$analytics_metrics,
+  spectrum$$analytics_query,
+  spectrum$$analytics_query$$response$$single,
+  spectrum$$analytics_sort,
+  spectrum$$analytics_stat,
 } from "../outputs.js";
 import {
-  spectrum_analytics_dimensions,
-  spectrum_analytics_filters,
-  spectrum_analytics_metrics,
-  spectrum_analytics_sort,
+  spectrum$$analytics_dimensions as spectrum$$analytics_dimensions$,
+  spectrum$$analytics_metrics as spectrum$$analytics_metrics$,
+  spectrum$$analytics_sort as spectrum$$analytics_sort$,
 } from "../schemas.js";
 
 /**
@@ -40,82 +29,108 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_analytics_events_bytimes_get",
     title: "Get analytics by time",
-    description: "Retrieves a list of aggregate metrics grouped by time interval.",
+    description: "Retrieves a list of aggregate metrics grouped by time interval.\n\nGET /zones/{zone_id}/spectrum/analytics/events/bytime",
     inputSchema: {
       type: "object",
       properties: {
-        "dimensions": {
-          "$ref": "#/$defs/spectrum-analytics_dimensions",
-          "description": "Can be used to break down the data by given attributes. Options are:\n\nDimension                 | Name                            | Example\n--------------------------|---------------------------------|--------------------------\nevent                     | Connection Event                | connect, progress, disconnect, originError, clientFiltered\nappID                     | Application ID                  | 40d67c87c6cd4b889a4fd57805225e85\ncoloName                  | Colo Name                       | SFO\nipVersion                 | IP version used by the client   | 4, 6."
-        },
-        "filters": {
-          "$ref": "#/$defs/spectrum-analytics_filters",
-          "description": "Used to filter rows by one or more dimensions. Filters can be combined using OR and AND boolean logic. AND takes precedence over OR in all the expressions. The OR operator is defined using a comma (,) or OR keyword surrounded by whitespace. The AND operator is defined using a semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon is a reserved character in URLs (rfc1738) and needs to be percent-encoded as %3B. Comparison options are:\n\nOperator                  | Name                            | URL Encoded\n--------------------------|---------------------------------|--------------------------\n==                        | Equals                          | %3D%3D\n!=                        | Does not equals                 | !%3D\n\\>                        | Greater Than                    | %3E\n\\<                        | Less Than                       | %3C\n\\>=                       | Greater than or equal to        | %3E%3D\n\\<=                       | Less than or equal to           | %3C%3D\n\nUse the above to construct filters."
-        },
-        "metrics": {
-          "$ref": "#/$defs/spectrum-analytics_metrics",
-          "description": "One or more metrics to compute. Options are:\n\nMetric                    | Name                                | Example                  | Unit\n--------------------------|-------------------------------------|--------------------------|--------------------------\ncount                     | Count of total events               | 1000                     | Count\nbytesIngress              | Sum of ingress bytes                | 1000                     | Sum\nbytesEgress               | Sum of egress bytes                 | 1000                     | Sum\ndurationAvg               | Average connection duration         | 1.0                      | Time in milliseconds\ndurationMedian            | Median connection duration          | 1.0                      | Time in milliseconds\nduration90th              | 90th percentile connection duration | 1.0                      | Time in milliseconds\nduration99th              | 99th percentile connection duration | 1.0                      | Time in milliseconds."
-        },
-        "since": {
-          "$ref": "#/$defs/spectrum-analytics_since"
-        },
-        "sort": {
-          "$ref": "#/$defs/spectrum-analytics_sort",
-          "description": "The sort order for the result set; sort fields must be included in `metrics` or `dimensions`."
-        },
-        "time_delta": {
-          "description": "Used to select time series resolution.",
-          "enum": [
-            "year",
-            "quarter",
-            "month",
-            "week",
-            "day",
-            "hour",
-            "dekaminute",
-            "minute"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "until": {
-          "$ref": "#/$defs/spectrum-analytics_until"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-analytics_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dimensions": {
+              "$ref": "#/$defs/spectrum-analytics_dimensions",
+              "description": "Can be used to break down the data by given attributes. Options are:\n\nDimension                 | Name                            | Example\n--------------------------|---------------------------------|--------------------------\nevent                     | Connection Event                | connect, progress, disconnect, originError, clientFiltered\nappID                     | Application ID                  | 40d67c87c6cd4b889a4fd57805225e85\ncoloName                  | Colo Name                       | SFO\nipVersion                 | IP version used by the client   | 4, 6."
+            },
+            "filters": {
+              "description": "Used to filter rows by one or more dimensions. Filters can be combined using OR and AND boolean logic. AND takes precedence over OR in all the expressions. The OR operator is defined using a comma (,) or OR keyword surrounded by whitespace. The AND operator is defined using a semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon is a reserved character in URLs (rfc1738) and needs to be percent-encoded as %3B. Comparison options are:\n\nOperator                  | Name                            | URL Encoded\n--------------------------|---------------------------------|--------------------------\n==                        | Equals                          | %3D%3D\n!=                        | Does not equals                 | !%3D\n\\>                        | Greater Than                    | %3E\n\\<                        | Less Than                       | %3C\n\\>=                       | Greater than or equal to        | %3E%3D\n\\<=                       | Less than or equal to           | %3C%3D\n\nUse the above to construct filters.",
+              "type": "string"
+            },
+            "metrics": {
+              "$ref": "#/$defs/spectrum-analytics_metrics",
+              "description": "One or more metrics to compute. Options are:\n\nMetric                    | Name                                | Example                  | Unit\n--------------------------|-------------------------------------|--------------------------|--------------------------\ncount                     | Count of total events               | 1000                     | Count\nbytesIngress              | Sum of ingress bytes                | 1000                     | Sum\nbytesEgress               | Sum of egress bytes                 | 1000                     | Sum\ndurationAvg               | Average connection duration         | 1.0                      | Time in milliseconds\ndurationMedian            | Median connection duration          | 1.0                      | Time in milliseconds\nduration90th              | 90th percentile connection duration | 1.0                      | Time in milliseconds\nduration99th              | 99th percentile connection duration | 1.0                      | Time in milliseconds."
+            },
+            "since": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            },
+            "sort": {
+              "$ref": "#/$defs/spectrum-analytics_sort",
+              "description": "The sort order for the result set; sort fields must be included in `metrics` or `dimensions`."
+            },
+            "time_delta": {
+              "description": "Used to select time series resolution.",
+              "enum": [
+                "year",
+                "quarter",
+                "month",
+                "week",
+                "day",
+                "hour",
+                "dekaminute",
+                "minute"
+              ],
+              "type": "string"
+            },
+            "until": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "time_delta"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "time_delta"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
       $defs: {
-        "spectrum-analytics_dimensions": spectrum_analytics_dimensions,
-        "spectrum-analytics_filters": spectrum_analytics_filters,
-        "spectrum-analytics_identifier": spectrum_analytics_identifier,
-        "spectrum-analytics_metrics": spectrum_analytics_metrics,
-        "spectrum-analytics_since": spectrum_analytics_since,
-        "spectrum-analytics_sort": spectrum_analytics_sort,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp,
-        "spectrum-analytics_until": spectrum_analytics_until,
+        "spectrum-analytics_dimensions": spectrum$$analytics_dimensions$,
+        "spectrum-analytics_metrics": spectrum$$analytics_metrics$,
+        "spectrum-analytics_sort": spectrum$$analytics_sort$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-analytics_query-response-single",
       $defs: {
-        "spectrum-analytics_api-response-single": spectrum_analytics_api_response_single_output,
-        "spectrum-analytics_column": spectrum_analytics_column_output,
-        "spectrum-analytics_dimensions": spectrum_analytics_dimensions_output,
-        "spectrum-analytics_filters": spectrum_analytics_filters_output,
-        "spectrum-analytics_messages": spectrum_analytics_messages_output,
-        "spectrum-analytics_metrics": spectrum_analytics_metrics_output,
-        "spectrum-analytics_query": spectrum_analytics_query_output,
-        "spectrum-analytics_query-response-single": spectrum_analytics_query_response_single_output,
-        "spectrum-analytics_since": spectrum_analytics_since_output,
-        "spectrum-analytics_sort": spectrum_analytics_sort_output,
-        "spectrum-analytics_stat": spectrum_analytics_stat_output,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp_output,
-        "spectrum-analytics_until": spectrum_analytics_until_output,
+        "spectrum-analytics_api-response-single": spectrum$$analytics_api$$response$$single,
+        "spectrum-analytics_column": spectrum$$analytics_column,
+        "spectrum-analytics_dimensions": spectrum$$analytics_dimensions,
+        "spectrum-analytics_messages": spectrum$$analytics_messages,
+        "spectrum-analytics_metrics": spectrum$$analytics_metrics,
+        "spectrum-analytics_query": spectrum$$analytics_query,
+        "spectrum-analytics_query-response-single": spectrum$$analytics_query$$response$$single,
+        "spectrum-analytics_sort": spectrum$$analytics_sort,
+        "spectrum-analytics_stat": spectrum$$analytics_stat,
       },
     },
     annotations: {
@@ -142,32 +157,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-analytics_api-response-common-failure": spectrum_analytics_api_response_common_failure_output,
-        "spectrum-analytics_api-response-single": spectrum_analytics_api_response_single_output,
-        "spectrum-analytics_column": spectrum_analytics_column_output,
-        "spectrum-analytics_dimensions": spectrum_analytics_dimensions_output,
-        "spectrum-analytics_filters": spectrum_analytics_filters_output,
-        "spectrum-analytics_messages": spectrum_analytics_messages_output,
-        "spectrum-analytics_metrics": spectrum_analytics_metrics_output,
-        "spectrum-analytics_query": spectrum_analytics_query_output,
-        "spectrum-analytics_query-response-single": spectrum_analytics_query_response_single_output,
-        "spectrum-analytics_since": spectrum_analytics_since_output,
-        "spectrum-analytics_sort": spectrum_analytics_sort_output,
-        "spectrum-analytics_stat": spectrum_analytics_stat_output,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp_output,
-        "spectrum-analytics_until": spectrum_analytics_until_output,
+        "spectrum-analytics_api-response-common-failure": spectrum$$analytics_api$$response$$common$$failure,
+        "spectrum-analytics_api-response-single": spectrum$$analytics_api$$response$$single,
+        "spectrum-analytics_column": spectrum$$analytics_column,
+        "spectrum-analytics_dimensions": spectrum$$analytics_dimensions,
+        "spectrum-analytics_messages": spectrum$$analytics_messages,
+        "spectrum-analytics_metrics": spectrum$$analytics_metrics,
+        "spectrum-analytics_query": spectrum$$analytics_query,
+        "spectrum-analytics_query-response-single": spectrum$$analytics_query$$response$$single,
+        "spectrum-analytics_sort": spectrum$$analytics_sort,
+        "spectrum-analytics_stat": spectrum$$analytics_stat,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/spectrum/analytics/events/bytime`,
       query: [
-        ["dimensions", args["dimensions"], true],
-        ["sort", args["sort"], true],
-        ["until", args["until"], true],
-        ["metrics", args["metrics"], true],
-        ["filters", args["filters"], true],
-        ["since", args["since"], true],
-        ["time_delta", args["time_delta"], true],
+        ["dimensions", param(args, "query", "dimensions"), true],
+        ["sort", param(args, "query", "sort"), true],
+        ["until", param(args, "query", "until"), true],
+        ["metrics", param(args, "query", "metrics"), true],
+        ["filters", param(args, "query", "filters"), true],
+        ["since", param(args, "query", "since"), true],
+        ["time_delta", param(args, "query", "time_delta"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/spectrum/analytics/events/outputs.ts b/src/generated/forge-mcp/spectrum/analytics/events/outputs.ts
index cc11a34e3..f30355814 100644
--- a/src/generated/forge-mcp/spectrum/analytics/events/outputs.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/events/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `spectrum-analytics_column` in responses.
  */
-export const spectrum_analytics_column_output: JsonSchema = {
+export const spectrum$$analytics_column: JsonSchema = {
   "properties": {
     "dimensions": {
       "items": {
@@ -40,7 +40,7 @@ export const spectrum_analytics_column_output: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_dimensions` in responses.
  */
-export const spectrum_analytics_dimensions_output: JsonSchema = {
+export const spectrum$$analytics_dimensions: JsonSchema = {
   "items": {
     "enum": [
       "event",
@@ -53,17 +53,10 @@ export const spectrum_analytics_dimensions_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `spectrum-analytics_filters` in responses.
- */
-export const spectrum_analytics_filters_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-analytics_metrics` in responses.
  */
-export const spectrum_analytics_metrics_output: JsonSchema = {
+export const spectrum$$analytics_metrics: JsonSchema = {
   "items": {
     "enum": [
       "count",
@@ -82,13 +75,13 @@ export const spectrum_analytics_metrics_output: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_query` in responses.
  */
-export const spectrum_analytics_query_output: JsonSchema = {
+export const spectrum$$analytics_query: JsonSchema = {
   "properties": {
     "dimensions": {
       "$ref": "#/$defs/spectrum-analytics_dimensions"
     },
     "filters": {
-      "$ref": "#/$defs/spectrum-analytics_filters"
+      "type": "string"
     },
     "limit": {
       "type": "number"
@@ -97,13 +90,29 @@ export const spectrum_analytics_query_output: JsonSchema = {
       "$ref": "#/$defs/spectrum-analytics_metrics"
     },
     "since": {
-      "$ref": "#/$defs/spectrum-analytics_since"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "sort": {
       "$ref": "#/$defs/spectrum-analytics_sort"
     },
     "until": {
-      "$ref": "#/$defs/spectrum-analytics_until"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
@@ -112,7 +121,7 @@ export const spectrum_analytics_query_output: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_query-response-single` in responses.
  */
-export const spectrum_analytics_query_response_single_output: JsonSchema = {
+export const spectrum$$analytics_query$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-analytics_api-response-single"
@@ -145,7 +154,8 @@ export const spectrum_analytics_query_response_single_output: JsonSchema = {
             "time_intervals": {
               "items": {
                 "items": {
-                  "$ref": "#/$defs/spectrum-analytics_timestamp"
+                  "format": "date-time",
+                  "type": "string"
                 },
                 "type": "array"
               },
@@ -175,7 +185,7 @@ export const spectrum_analytics_query_response_single_output: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_sort` in responses.
  */
-export const spectrum_analytics_sort_output: JsonSchema = {
+export const spectrum$$analytics_sort: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -185,7 +195,7 @@ export const spectrum_analytics_sort_output: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_stat` in responses.
  */
-export const spectrum_analytics_stat_output: JsonSchema = {
+export const spectrum$$analytics_stat: JsonSchema = {
   "additionalProperties": {
     "type": "number"
   },
diff --git a/src/generated/forge-mcp/spectrum/analytics/events/schemas.ts b/src/generated/forge-mcp/spectrum/analytics/events/schemas.ts
index 9441a0df1..65f4867e9 100644
--- a/src/generated/forge-mcp/spectrum/analytics/events/schemas.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/events/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `spectrum-analytics_dimensions`.
  */
-export const spectrum_analytics_dimensions: JsonSchema = {
+export const spectrum$$analytics_dimensions: JsonSchema = {
   "description": "Can be used to break down the data by given attributes. Options are:\n\nDimension                 | Name                            | Example\n--------------------------|---------------------------------|--------------------------\nevent                     | Connection Event                | connect, progress, disconnect, originError, clientFiltered\nappID                     | Application ID                  | 40d67c87c6cd4b889a4fd57805225e85\ncoloName                  | Colo Name                       | SFO\nipVersion                 | IP version used by the client   | 4, 6.",
   "items": {
     "enum": [
@@ -20,18 +20,10 @@ export const spectrum_analytics_dimensions: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `spectrum-analytics_filters`.
- */
-export const spectrum_analytics_filters: JsonSchema = {
-  "description": "Used to filter rows by one or more dimensions. Filters can be combined using OR and AND boolean logic. AND takes precedence over OR in all the expressions. The OR operator is defined using a comma (,) or OR keyword surrounded by whitespace. The AND operator is defined using a semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon is a reserved character in URLs (rfc1738) and needs to be percent-encoded as %3B. Comparison options are:\n\nOperator                  | Name                            | URL Encoded\n--------------------------|---------------------------------|--------------------------\n==                        | Equals                          | %3D%3D\n!=                        | Does not equals                 | !%3D\n\\>                        | Greater Than                    | %3E\n\\<                        | Less Than                       | %3C\n\\>=                       | Greater than or equal to        | %3E%3D\n\\<=                       | Less than or equal to           | %3C%3D\n\nUse the above to construct filters.",
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-analytics_metrics`.
  */
-export const spectrum_analytics_metrics: JsonSchema = {
+export const spectrum$$analytics_metrics: JsonSchema = {
   "description": "One or more metrics to compute. Options are:\n\nMetric                    | Name                                | Example                  | Unit\n--------------------------|-------------------------------------|--------------------------|--------------------------\ncount                     | Count of total events               | 1000                     | Count\nbytesIngress              | Sum of ingress bytes                | 1000                     | Sum\nbytesEgress               | Sum of egress bytes                 | 1000                     | Sum\ndurationAvg               | Average connection duration         | 1.0                      | Time in milliseconds\ndurationMedian            | Median connection duration          | 1.0                      | Time in milliseconds\nduration90th              | 90th percentile connection duration | 1.0                      | Time in milliseconds\nduration99th              | 99th percentile connection duration | 1.0                      | Time in milliseconds.",
   "items": {
     "enum": [
@@ -51,7 +43,7 @@ export const spectrum_analytics_metrics: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_sort`.
  */
-export const spectrum_analytics_sort: JsonSchema = {
+export const spectrum$$analytics_sort: JsonSchema = {
   "description": "The sort order for the result set; sort fields must be included in `metrics` or `dimensions`.",
   "items": {
     "type": "string"
diff --git a/src/generated/forge-mcp/spectrum/analytics/events/summaries/tools.ts b/src/generated/forge-mcp/spectrum/analytics/events/summaries/tools.ts
index b41192ea2..805297315 100644
--- a/src/generated/forge-mcp/spectrum/analytics/events/summaries/tools.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/events/summaries/tools.ts
@@ -1,36 +1,25 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  spectrum_analytics_api_response_common_failure_output,
-  spectrum_analytics_api_response_single_output,
-  spectrum_analytics_messages_output,
-  spectrum_analytics_since_output,
-  spectrum_analytics_timestamp_output,
-  spectrum_analytics_until_output,
+  spectrum$$analytics_api$$response$$common$$failure,
+  spectrum$$analytics_api$$response$$single,
+  spectrum$$analytics_messages,
 } from "../../outputs.js";
 import {
-  spectrum_analytics_identifier,
-  spectrum_analytics_since,
-  spectrum_analytics_timestamp,
-  spectrum_analytics_until,
-} from "../../schemas.js";
-import {
-  spectrum_analytics_column_output,
-  spectrum_analytics_dimensions_output,
-  spectrum_analytics_filters_output,
-  spectrum_analytics_metrics_output,
-  spectrum_analytics_query_output,
-  spectrum_analytics_query_response_single_output,
-  spectrum_analytics_sort_output,
-  spectrum_analytics_stat_output,
+  spectrum$$analytics_column,
+  spectrum$$analytics_dimensions,
+  spectrum$$analytics_metrics,
+  spectrum$$analytics_query,
+  spectrum$$analytics_query$$response$$single,
+  spectrum$$analytics_sort,
+  spectrum$$analytics_stat,
 } from "../outputs.js";
 import {
-  spectrum_analytics_dimensions,
-  spectrum_analytics_filters,
-  spectrum_analytics_metrics,
-  spectrum_analytics_sort,
+  spectrum$$analytics_dimensions as spectrum$$analytics_dimensions$,
+  spectrum$$analytics_metrics as spectrum$$analytics_metrics$,
+  spectrum$$analytics_sort as spectrum$$analytics_sort$,
 } from "../schemas.js";
 
 /**
@@ -40,67 +29,90 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_analytics_events_summaries_get",
     title: "Get analytics summary",
-    description: "Retrieves a list of summarised aggregate metrics over a given time period.",
+    description: "Retrieves a list of summarised aggregate metrics over a given time period.\n\nGET /zones/{zone_id}/spectrum/analytics/events/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "dimensions": {
-          "$ref": "#/$defs/spectrum-analytics_dimensions",
-          "description": "Can be used to break down the data by given attributes. Options are:\n\nDimension                 | Name                            | Example\n--------------------------|---------------------------------|--------------------------\nevent                     | Connection Event                | connect, progress, disconnect, originError, clientFiltered\nappID                     | Application ID                  | 40d67c87c6cd4b889a4fd57805225e85\ncoloName                  | Colo Name                       | SFO\nipVersion                 | IP version used by the client   | 4, 6."
-        },
-        "filters": {
-          "$ref": "#/$defs/spectrum-analytics_filters",
-          "description": "Used to filter rows by one or more dimensions. Filters can be combined using OR and AND boolean logic. AND takes precedence over OR in all the expressions. The OR operator is defined using a comma (,) or OR keyword surrounded by whitespace. The AND operator is defined using a semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon is a reserved character in URLs (rfc1738) and needs to be percent-encoded as %3B. Comparison options are:\n\nOperator                  | Name                            | URL Encoded\n--------------------------|---------------------------------|--------------------------\n==                        | Equals                          | %3D%3D\n!=                        | Does not equals                 | !%3D\n\\>                        | Greater Than                    | %3E\n\\<                        | Less Than                       | %3C\n\\>=                       | Greater than or equal to        | %3E%3D\n\\<=                       | Less than or equal to           | %3C%3D\n\nUse the above to construct filters."
-        },
-        "metrics": {
-          "$ref": "#/$defs/spectrum-analytics_metrics",
-          "description": "One or more metrics to compute. Options are:\n\nMetric                    | Name                                | Example                  | Unit\n--------------------------|-------------------------------------|--------------------------|--------------------------\ncount                     | Count of total events               | 1000                     | Count\nbytesIngress              | Sum of ingress bytes                | 1000                     | Sum\nbytesEgress               | Sum of egress bytes                 | 1000                     | Sum\ndurationAvg               | Average connection duration         | 1.0                      | Time in milliseconds\ndurationMedian            | Median connection duration          | 1.0                      | Time in milliseconds\nduration90th              | 90th percentile connection duration | 1.0                      | Time in milliseconds\nduration99th              | 99th percentile connection duration | 1.0                      | Time in milliseconds."
-        },
-        "since": {
-          "$ref": "#/$defs/spectrum-analytics_since"
-        },
-        "sort": {
-          "$ref": "#/$defs/spectrum-analytics_sort",
-          "description": "The sort order for the result set; sort fields must be included in `metrics` or `dimensions`."
-        },
-        "until": {
-          "$ref": "#/$defs/spectrum-analytics_until"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-analytics_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "dimensions": {
+              "$ref": "#/$defs/spectrum-analytics_dimensions",
+              "description": "Can be used to break down the data by given attributes. Options are:\n\nDimension                 | Name                            | Example\n--------------------------|---------------------------------|--------------------------\nevent                     | Connection Event                | connect, progress, disconnect, originError, clientFiltered\nappID                     | Application ID                  | 40d67c87c6cd4b889a4fd57805225e85\ncoloName                  | Colo Name                       | SFO\nipVersion                 | IP version used by the client   | 4, 6."
+            },
+            "filters": {
+              "description": "Used to filter rows by one or more dimensions. Filters can be combined using OR and AND boolean logic. AND takes precedence over OR in all the expressions. The OR operator is defined using a comma (,) or OR keyword surrounded by whitespace. The AND operator is defined using a semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon is a reserved character in URLs (rfc1738) and needs to be percent-encoded as %3B. Comparison options are:\n\nOperator                  | Name                            | URL Encoded\n--------------------------|---------------------------------|--------------------------\n==                        | Equals                          | %3D%3D\n!=                        | Does not equals                 | !%3D\n\\>                        | Greater Than                    | %3E\n\\<                        | Less Than                       | %3C\n\\>=                       | Greater than or equal to        | %3E%3D\n\\<=                       | Less than or equal to           | %3C%3D\n\nUse the above to construct filters.",
+              "type": "string"
+            },
+            "metrics": {
+              "$ref": "#/$defs/spectrum-analytics_metrics",
+              "description": "One or more metrics to compute. Options are:\n\nMetric                    | Name                                | Example                  | Unit\n--------------------------|-------------------------------------|--------------------------|--------------------------\ncount                     | Count of total events               | 1000                     | Count\nbytesIngress              | Sum of ingress bytes                | 1000                     | Sum\nbytesEgress               | Sum of egress bytes                 | 1000                     | Sum\ndurationAvg               | Average connection duration         | 1.0                      | Time in milliseconds\ndurationMedian            | Median connection duration          | 1.0                      | Time in milliseconds\nduration90th              | 90th percentile connection duration | 1.0                      | Time in milliseconds\nduration99th              | 99th percentile connection duration | 1.0                      | Time in milliseconds."
+            },
+            "since": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            },
+            "sort": {
+              "$ref": "#/$defs/spectrum-analytics_sort",
+              "description": "The sort order for the result set; sort fields must be included in `metrics` or `dimensions`."
+            },
+            "until": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "spectrum-analytics_dimensions": spectrum_analytics_dimensions,
-        "spectrum-analytics_filters": spectrum_analytics_filters,
-        "spectrum-analytics_identifier": spectrum_analytics_identifier,
-        "spectrum-analytics_metrics": spectrum_analytics_metrics,
-        "spectrum-analytics_since": spectrum_analytics_since,
-        "spectrum-analytics_sort": spectrum_analytics_sort,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp,
-        "spectrum-analytics_until": spectrum_analytics_until,
+        "spectrum-analytics_dimensions": spectrum$$analytics_dimensions$,
+        "spectrum-analytics_metrics": spectrum$$analytics_metrics$,
+        "spectrum-analytics_sort": spectrum$$analytics_sort$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-analytics_query-response-single",
       $defs: {
-        "spectrum-analytics_api-response-single": spectrum_analytics_api_response_single_output,
-        "spectrum-analytics_column": spectrum_analytics_column_output,
-        "spectrum-analytics_dimensions": spectrum_analytics_dimensions_output,
-        "spectrum-analytics_filters": spectrum_analytics_filters_output,
-        "spectrum-analytics_messages": spectrum_analytics_messages_output,
-        "spectrum-analytics_metrics": spectrum_analytics_metrics_output,
-        "spectrum-analytics_query": spectrum_analytics_query_output,
-        "spectrum-analytics_query-response-single": spectrum_analytics_query_response_single_output,
-        "spectrum-analytics_since": spectrum_analytics_since_output,
-        "spectrum-analytics_sort": spectrum_analytics_sort_output,
-        "spectrum-analytics_stat": spectrum_analytics_stat_output,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp_output,
-        "spectrum-analytics_until": spectrum_analytics_until_output,
+        "spectrum-analytics_api-response-single": spectrum$$analytics_api$$response$$single,
+        "spectrum-analytics_column": spectrum$$analytics_column,
+        "spectrum-analytics_dimensions": spectrum$$analytics_dimensions,
+        "spectrum-analytics_messages": spectrum$$analytics_messages,
+        "spectrum-analytics_metrics": spectrum$$analytics_metrics,
+        "spectrum-analytics_query": spectrum$$analytics_query,
+        "spectrum-analytics_query-response-single": spectrum$$analytics_query$$response$$single,
+        "spectrum-analytics_sort": spectrum$$analytics_sort,
+        "spectrum-analytics_stat": spectrum$$analytics_stat,
       },
     },
     annotations: {
@@ -127,31 +139,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-analytics_api-response-common-failure": spectrum_analytics_api_response_common_failure_output,
-        "spectrum-analytics_api-response-single": spectrum_analytics_api_response_single_output,
-        "spectrum-analytics_column": spectrum_analytics_column_output,
-        "spectrum-analytics_dimensions": spectrum_analytics_dimensions_output,
-        "spectrum-analytics_filters": spectrum_analytics_filters_output,
-        "spectrum-analytics_messages": spectrum_analytics_messages_output,
-        "spectrum-analytics_metrics": spectrum_analytics_metrics_output,
-        "spectrum-analytics_query": spectrum_analytics_query_output,
-        "spectrum-analytics_query-response-single": spectrum_analytics_query_response_single_output,
-        "spectrum-analytics_since": spectrum_analytics_since_output,
-        "spectrum-analytics_sort": spectrum_analytics_sort_output,
-        "spectrum-analytics_stat": spectrum_analytics_stat_output,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp_output,
-        "spectrum-analytics_until": spectrum_analytics_until_output,
+        "spectrum-analytics_api-response-common-failure": spectrum$$analytics_api$$response$$common$$failure,
+        "spectrum-analytics_api-response-single": spectrum$$analytics_api$$response$$single,
+        "spectrum-analytics_column": spectrum$$analytics_column,
+        "spectrum-analytics_dimensions": spectrum$$analytics_dimensions,
+        "spectrum-analytics_messages": spectrum$$analytics_messages,
+        "spectrum-analytics_metrics": spectrum$$analytics_metrics,
+        "spectrum-analytics_query": spectrum$$analytics_query,
+        "spectrum-analytics_query-response-single": spectrum$$analytics_query$$response$$single,
+        "spectrum-analytics_sort": spectrum$$analytics_sort,
+        "spectrum-analytics_stat": spectrum$$analytics_stat,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/spectrum/analytics/events/summary`,
       query: [
-        ["dimensions", args["dimensions"], true],
-        ["sort", args["sort"], true],
-        ["until", args["until"], true],
-        ["metrics", args["metrics"], true],
-        ["filters", args["filters"], true],
-        ["since", args["since"], true],
+        ["dimensions", param(args, "query", "dimensions"), true],
+        ["sort", param(args, "query", "sort"), true],
+        ["until", param(args, "query", "until"), true],
+        ["metrics", param(args, "query", "metrics"), true],
+        ["filters", param(args, "query", "filters"), true],
+        ["since", param(args, "query", "since"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/spectrum/analytics/outputs.ts b/src/generated/forge-mcp/spectrum/analytics/outputs.ts
index f980c6f67..ab5889d50 100644
--- a/src/generated/forge-mcp/spectrum/analytics/outputs.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `spectrum-analytics_api-response-common-failure` in responses.
  */
-export const spectrum_analytics_api_response_common_failure_output: JsonSchema = {
+export const spectrum$$analytics_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/spectrum-analytics_messages"
@@ -36,7 +36,7 @@ export const spectrum_analytics_api_response_common_failure_output: JsonSchema =
 /**
  * The schema of `spectrum-analytics_api-response-single` in responses.
  */
-export const spectrum_analytics_api_response_single_output: JsonSchema = {
+export const spectrum$$analytics_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/spectrum-analytics_messages"
@@ -59,17 +59,10 @@ export const spectrum_analytics_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `spectrum-analytics_identifier` in responses.
- */
-export const spectrum_analytics_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-analytics_messages` in responses.
  */
-export const spectrum_analytics_messages_output: JsonSchema = {
+export const spectrum$$analytics_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -98,39 +91,3 @@ export const spectrum_analytics_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `spectrum-analytics_since` in responses.
- */
-export const spectrum_analytics_since_output: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/spectrum-analytics_timestamp"
-    }
-  ]
-};
-
-/**
- * The schema of `spectrum-analytics_timestamp` in responses.
- */
-export const spectrum_analytics_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-analytics_until` in responses.
- */
-export const spectrum_analytics_until_output: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/spectrum-analytics_timestamp"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/spectrum/analytics/schemas.ts b/src/generated/forge-mcp/spectrum/analytics/schemas.ts
deleted file mode 100644
index b337084da..000000000
--- a/src/generated/forge-mcp/spectrum/analytics/schemas.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `spectrum-analytics_identifier`.
- */
-export const spectrum_analytics_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-analytics_since`.
- */
-export const spectrum_analytics_since: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/spectrum-analytics_timestamp"
-    }
-  ]
-};
-
-/**
- * The schema of `spectrum-analytics_timestamp`.
- */
-export const spectrum_analytics_timestamp: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-analytics_until`.
- */
-export const spectrum_analytics_until: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/spectrum-analytics_timestamp"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/spectrum/analytics/zones/report/outputs.ts b/src/generated/forge-mcp/spectrum/analytics/zones/report/outputs.ts
index e92e7ae9f..edc51950f 100644
--- a/src/generated/forge-mcp/spectrum/analytics/zones/report/outputs.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/zones/report/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `spectrum-analytics_api-response-collection` in responses.
  */
-export const spectrum_analytics_api_response_collection_output: JsonSchema = {
+export const spectrum$$analytics_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-analytics_api-response-common"
@@ -42,7 +42,7 @@ export const spectrum_analytics_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_api-response-common` in responses.
  */
-export const spectrum_analytics_api_response_common_output: JsonSchema = {
+export const spectrum$$analytics_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/spectrum-analytics_messages"
@@ -68,7 +68,7 @@ export const spectrum_analytics_api_response_common_output: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_zone_report` in responses.
  */
-export const spectrum_analytics_zone_report_output: JsonSchema = {
+export const spectrum$$analytics_zone_report: JsonSchema = {
   "properties": {
     "totals": {
       "properties": {
@@ -98,7 +98,7 @@ export const spectrum_analytics_zone_report_output: JsonSchema = {
       "type": "object"
     },
     "zone_id": {
-      "$ref": "#/$defs/spectrum-analytics_identifier"
+      "type": "string"
     }
   },
   "required": [
@@ -111,7 +111,7 @@ export const spectrum_analytics_zone_report_output: JsonSchema = {
 /**
  * The schema of `spectrum-analytics_zones_report_response` in responses.
  */
-export const spectrum_analytics_zones_report_response_output: JsonSchema = {
+export const spectrum$$analytics_zones_report_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-analytics_api-response-collection"
@@ -121,10 +121,26 @@ export const spectrum_analytics_zones_report_response_output: JsonSchema = {
         "query": {
           "properties": {
             "since": {
-              "$ref": "#/$defs/spectrum-analytics_since"
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
             },
             "until": {
-              "$ref": "#/$defs/spectrum-analytics_until"
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
             }
           },
           "required": [
diff --git a/src/generated/forge-mcp/spectrum/analytics/zones/report/tools.ts b/src/generated/forge-mcp/spectrum/analytics/zones/report/tools.ts
index 6df462235..0ae797941 100644
--- a/src/generated/forge-mcp/spectrum/analytics/zones/report/tools.ts
+++ b/src/generated/forge-mcp/spectrum/analytics/zones/report/tools.ts
@@ -1,25 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../../_/tool.js";
+import { type Tool, param } from "../../../../_/tool.js";
 import {
-  spectrum_analytics_api_response_common_failure_output,
-  spectrum_analytics_identifier_output,
-  spectrum_analytics_messages_output,
-  spectrum_analytics_since_output,
-  spectrum_analytics_timestamp_output,
-  spectrum_analytics_until_output,
+  spectrum$$analytics_api$$response$$common$$failure,
+  spectrum$$analytics_messages,
 } from "../../outputs.js";
 import {
-  spectrum_analytics_since,
-  spectrum_analytics_timestamp,
-  spectrum_analytics_until,
-} from "../../schemas.js";
-import {
-  spectrum_analytics_api_response_collection_output,
-  spectrum_analytics_api_response_common_output,
-  spectrum_analytics_zone_report_output,
-  spectrum_analytics_zones_report_response_output,
+  spectrum$$analytics_api$$response$$collection,
+  spectrum$$analytics_api$$response$$common,
+  spectrum$$analytics_zone_report,
+  spectrum$$analytics_zones_report_response,
 } from "./outputs.js";
 
 /**
@@ -29,40 +20,54 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_analytics_zones_report_get",
     title: "Get zones bandwidth report",
-    description: "Retrieves a list of total bandwidth by zone over a given time period.",
+    description: "Retrieves a list of total bandwidth by zone over a given time period.\n\nGET /user/spectrum_analytics/zones/report",
     inputSchema: {
       type: "object",
       properties: {
-        "cdn_traffic": {
-          "default": true,
-          "description": "Include CDN traffic in the bandwidth aggregation.",
-          "type": "boolean"
-        },
-        "since": {
-          "$ref": "#/$defs/spectrum-analytics_since"
-        },
-        "until": {
-          "$ref": "#/$defs/spectrum-analytics_until"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cdn_traffic": {
+              "default": true,
+              "description": "Include CDN traffic in the bandwidth aggregation.",
+              "type": "boolean"
+            },
+            "since": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            },
+            "until": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
-      $defs: {
-        "spectrum-analytics_since": spectrum_analytics_since,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp,
-        "spectrum-analytics_until": spectrum_analytics_until,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-analytics_zones_report_response",
       $defs: {
-        "spectrum-analytics_api-response-collection": spectrum_analytics_api_response_collection_output,
-        "spectrum-analytics_api-response-common": spectrum_analytics_api_response_common_output,
-        "spectrum-analytics_identifier": spectrum_analytics_identifier_output,
-        "spectrum-analytics_messages": spectrum_analytics_messages_output,
-        "spectrum-analytics_since": spectrum_analytics_since_output,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp_output,
-        "spectrum-analytics_until": spectrum_analytics_until_output,
-        "spectrum-analytics_zone_report": spectrum_analytics_zone_report_output,
-        "spectrum-analytics_zones_report_response": spectrum_analytics_zones_report_response_output,
+        "spectrum-analytics_api-response-collection": spectrum$$analytics_api$$response$$collection,
+        "spectrum-analytics_api-response-common": spectrum$$analytics_api$$response$$common,
+        "spectrum-analytics_messages": spectrum$$analytics_messages,
+        "spectrum-analytics_zone_report": spectrum$$analytics_zone_report,
+        "spectrum-analytics_zones_report_response": spectrum$$analytics_zones_report_response,
       },
     },
     annotations: {
@@ -90,24 +95,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-analytics_api-response-collection": spectrum_analytics_api_response_collection_output,
-        "spectrum-analytics_api-response-common": spectrum_analytics_api_response_common_output,
-        "spectrum-analytics_api-response-common-failure": spectrum_analytics_api_response_common_failure_output,
-        "spectrum-analytics_identifier": spectrum_analytics_identifier_output,
-        "spectrum-analytics_messages": spectrum_analytics_messages_output,
-        "spectrum-analytics_since": spectrum_analytics_since_output,
-        "spectrum-analytics_timestamp": spectrum_analytics_timestamp_output,
-        "spectrum-analytics_until": spectrum_analytics_until_output,
-        "spectrum-analytics_zone_report": spectrum_analytics_zone_report_output,
-        "spectrum-analytics_zones_report_response": spectrum_analytics_zones_report_response_output,
+        "spectrum-analytics_api-response-collection": spectrum$$analytics_api$$response$$collection,
+        "spectrum-analytics_api-response-common": spectrum$$analytics_api$$response$$common,
+        "spectrum-analytics_api-response-common-failure": spectrum$$analytics_api$$response$$common$$failure,
+        "spectrum-analytics_messages": spectrum$$analytics_messages,
+        "spectrum-analytics_zone_report": spectrum$$analytics_zone_report,
+        "spectrum-analytics_zones_report_response": spectrum$$analytics_zones_report_response,
       },
     },
     request: (args) => ({
       path: `/user/spectrum_analytics/zones/report`,
       query: [
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["cdn_traffic", args["cdn_traffic"], true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["cdn_traffic", param(args, "query", "cdn_traffic"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/spectrum/apps/outputs.ts b/src/generated/forge-mcp/spectrum/apps/outputs.ts
index 11738482e..51ce1db71 100644
--- a/src/generated/forge-mcp/spectrum/apps/outputs.ts
+++ b/src/generated/forge-mcp/spectrum/apps/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `spectrum-config_api-response-single` in responses.
  */
-export const spectrum_config_api_response_single_output: JsonSchema = {
+export const spectrum$$config_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/spectrum-config_messages"
@@ -32,7 +32,7 @@ export const spectrum_config_api_response_single_output: JsonSchema = {
 /**
  * The schema of `spectrum-config_api-response-single-id` in responses.
  */
-export const spectrum_config_api_response_single_id_output: JsonSchema = {
+export const spectrum$$config_api$$response$$single$$id: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_api-response-common"
@@ -44,7 +44,7 @@ export const spectrum_config_api_response_single_id_output: JsonSchema = {
             {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/spectrum-config_identifier"
+                  "type": "string"
                 }
               },
               "required": [
@@ -66,7 +66,7 @@ export const spectrum_config_api_response_single_id_output: JsonSchema = {
 /**
  * The schema of `spectrum-config_app_config` in responses.
  */
-export const spectrum_config_app_config_output: JsonSchema = {
+export const spectrum$$config_app_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_base_app_config"
@@ -74,7 +74,7 @@ export const spectrum_config_app_config_output: JsonSchema = {
     {
       "properties": {
         "argo_smart_routing": {
-          "$ref": "#/$defs/spectrum-config_argo_smart_routing"
+          "type": "boolean"
         },
         "dns": {
           "$ref": "#/$defs/spectrum-config_dns"
@@ -83,7 +83,7 @@ export const spectrum_config_app_config_output: JsonSchema = {
           "$ref": "#/$defs/spectrum-config_edge_ips"
         },
         "ip_firewall": {
-          "$ref": "#/$defs/spectrum-config_ip_firewall"
+          "type": "boolean"
         },
         "origin_direct": {
           "$ref": "#/$defs/spectrum-config_origin_direct"
@@ -92,25 +92,51 @@ export const spectrum_config_app_config_output: JsonSchema = {
           "$ref": "#/$defs/spectrum-config_origin_dns"
         },
         "origin_port": {
-          "$ref": "#/$defs/spectrum-config_origin_port"
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "origin_worker_id": {
-          "$ref": "#/$defs/spectrum-config_origin_worker_id"
+          "type": "string"
         },
         "protocol": {
-          "$ref": "#/$defs/spectrum-config_protocol"
+          "type": "string"
         },
         "proxy_protocol": {
-          "$ref": "#/$defs/spectrum-config_proxy_protocol"
+          "enum": [
+            "off",
+            "v1",
+            "v2",
+            "simple"
+          ],
+          "type": "string"
         },
         "tls": {
-          "$ref": "#/$defs/spectrum-config_tls"
+          "enum": [
+            "off",
+            "flexible",
+            "full",
+            "strict"
+          ],
+          "type": "string"
         },
         "traffic_type": {
-          "$ref": "#/$defs/spectrum-config_traffic_type"
+          "enum": [
+            "direct",
+            "http",
+            "https",
+            "worker"
+          ],
+          "type": "string"
         },
         "virtual_network_id": {
-          "$ref": "#/$defs/spectrum-config_virtual_network_id"
+          "format": "uuid",
+          "type": "string"
         }
       },
       "required": [
@@ -126,7 +152,7 @@ export const spectrum_config_app_config_output: JsonSchema = {
 /**
  * The schema of `spectrum-config_app_config_collection` in responses.
  */
-export const spectrum_config_app_config_collection_output: JsonSchema = {
+export const spectrum$$config_app_config_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_api-response-collection"
@@ -158,7 +184,7 @@ export const spectrum_config_app_config_collection_output: JsonSchema = {
 /**
  * The schema of `spectrum-config_app_config_single` in responses.
  */
-export const spectrum_config_app_config_single_output: JsonSchema = {
+export const spectrum$$config_app_config_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_api-response-single"
@@ -181,33 +207,21 @@ export const spectrum_config_app_config_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `spectrum-config_app_identifier` in responses.
- */
-export const spectrum_config_app_identifier_output: JsonSchema = {
-  "$ref": "#/$defs/spectrum-config_identifier"
-};
-
-/**
- * The schema of `spectrum-config_argo_smart_routing` in responses.
- */
-export const spectrum_config_argo_smart_routing_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `spectrum-config_base_app_config` in responses.
  */
-export const spectrum_config_base_app_config_output: JsonSchema = {
+export const spectrum$$config_base_app_config: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/spectrum-config_created"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/spectrum-config_app_identifier"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/spectrum-config_modified"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "required": [
@@ -218,57 +232,29 @@ export const spectrum_config_base_app_config_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `spectrum-config_created` in responses.
- */
-export const spectrum_config_created_output: JsonSchema = {
-  "$ref": "#/$defs/spectrum-config_timestamp"
-};
-
 /**
  * The schema of `spectrum-config_dns` in responses.
  */
-export const spectrum_config_dns_output: JsonSchema = {
+export const spectrum$$config_dns: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/spectrum-config_dns_name"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/spectrum-config_dns_type"
+      "enum": [
+        "CNAME",
+        "ADDRESS"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `spectrum-config_dns_name` in responses.
- */
-export const spectrum_config_dns_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_dns_ttl` in responses.
- */
-export const spectrum_config_dns_ttl_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `spectrum-config_dns_type` in responses.
- */
-export const spectrum_config_dns_type_output: JsonSchema = {
-  "enum": [
-    "CNAME",
-    "ADDRESS"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-config_edge_ips` in responses.
  */
-export const spectrum_config_edge_ips_output: JsonSchema = {
+export const spectrum$$config_edge_ips: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -309,24 +295,10 @@ export const spectrum_config_edge_ips_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `spectrum-config_ip_firewall` in responses.
- */
-export const spectrum_config_ip_firewall_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `spectrum-config_modified` in responses.
- */
-export const spectrum_config_modified_output: JsonSchema = {
-  "$ref": "#/$defs/spectrum-config_timestamp"
-};
-
 /**
  * The schema of `spectrum-config_origin_direct` in responses.
  */
-export const spectrum_config_origin_direct_output: JsonSchema = {
+export const spectrum$$config_origin_direct: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -336,66 +308,31 @@ export const spectrum_config_origin_direct_output: JsonSchema = {
 /**
  * The schema of `spectrum-config_origin_dns` in responses.
  */
-export const spectrum_config_origin_dns_output: JsonSchema = {
+export const spectrum$$config_origin_dns: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/spectrum-config_origin_dns_name"
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/spectrum-config_dns_ttl"
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/spectrum-config_origin_dns_type"
+      "enum": [
+        "",
+        "A",
+        "AAAA",
+        "SRV"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `spectrum-config_origin_dns_name` in responses.
- */
-export const spectrum_config_origin_dns_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_origin_dns_type` in responses.
- */
-export const spectrum_config_origin_dns_type_output: JsonSchema = {
-  "enum": [
-    "",
-    "A",
-    "AAAA",
-    "SRV"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_origin_port` in responses.
- */
-export const spectrum_config_origin_port_output: JsonSchema = {
-  "anyOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "string"
-    }
-  ]
-};
-
-/**
- * The schema of `spectrum-config_origin_worker_id` in responses.
- */
-export const spectrum_config_origin_worker_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-config_paygo_app_config` in responses.
  */
-export const spectrum_config_paygo_app_config_output: JsonSchema = {
+export const spectrum$$config_paygo_app_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_base_app_config"
@@ -409,7 +346,7 @@ export const spectrum_config_paygo_app_config_output: JsonSchema = {
           "$ref": "#/$defs/spectrum-config_origin_direct"
         },
         "protocol": {
-          "$ref": "#/$defs/spectrum-config_protocol"
+          "type": "string"
         }
       },
       "required": [
@@ -420,65 +357,3 @@ export const spectrum_config_paygo_app_config_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `spectrum-config_protocol` in responses.
- */
-export const spectrum_config_protocol_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_proxy_protocol` in responses.
- */
-export const spectrum_config_proxy_protocol_output: JsonSchema = {
-  "enum": [
-    "off",
-    "v1",
-    "v2",
-    "simple"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_timestamp` in responses.
- */
-export const spectrum_config_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_tls` in responses.
- */
-export const spectrum_config_tls_output: JsonSchema = {
-  "enum": [
-    "off",
-    "flexible",
-    "full",
-    "strict"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_traffic_type` in responses.
- */
-export const spectrum_config_traffic_type_output: JsonSchema = {
-  "enum": [
-    "direct",
-    "http",
-    "https",
-    "worker"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_virtual_network_id` in responses.
- */
-export const spectrum_config_virtual_network_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/spectrum/apps/schemas.ts b/src/generated/forge-mcp/spectrum/apps/schemas.ts
index 668e45997..0f1fd0908 100644
--- a/src/generated/forge-mcp/spectrum/apps/schemas.ts
+++ b/src/generated/forge-mcp/spectrum/apps/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `spectrum-config_app_config`.
  */
-export const spectrum_config_app_config: JsonSchema = {
+export const spectrum$$config_app_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_base_app_config"
@@ -14,9 +14,9 @@ export const spectrum_config_app_config: JsonSchema = {
     {
       "properties": {
         "argo_smart_routing": {
-          "$ref": "#/$defs/spectrum-config_argo_smart_routing",
           "default": false,
-          "description": "Enables Argo Smart Routing for this application.\nNotes: Only available for TCP or UDP applications with traffic_type set to \"direct\"."
+          "description": "Enables Argo Smart Routing for this application.\nNotes: Only available for TCP or UDP applications with traffic_type set to \"direct\".",
+          "type": "boolean"
         },
         "dns": {
           "$ref": "#/$defs/spectrum-config_dns",
@@ -31,9 +31,9 @@ export const spectrum_config_app_config: JsonSchema = {
           "description": "The anycast edge IP configuration for the hostname of this application."
         },
         "ip_firewall": {
-          "$ref": "#/$defs/spectrum-config_ip_firewall",
           "default": false,
-          "description": "Enables IP Access Rules for this application.\nNotes: Only available for TCP applications."
+          "description": "Enables IP Access Rules for this application.\nNotes: Only available for TCP applications.",
+          "type": "boolean"
         },
         "origin_direct": {
           "$ref": "#/$defs/spectrum-config_origin_direct",
@@ -44,35 +44,61 @@ export const spectrum_config_app_config: JsonSchema = {
           "description": "The name and type of DNS record for the Spectrum application."
         },
         "origin_port": {
-          "$ref": "#/$defs/spectrum-config_origin_port",
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "string"
+            }
+          ],
           "description": "The destination port at the origin. Only specified in conjunction with origin_dns. May use an integer to specify a single origin port, for example `1000`, or a string to specify a range of origin ports, for example `\"1000-2000\"`.\nNotes: If specifying a port range, the number of ports in the range must match the number of ports specified in the \"protocol\" field."
         },
         "origin_worker_id": {
-          "$ref": "#/$defs/spectrum-config_origin_worker_id",
-          "description": "Optional Worker script tag (worker ID) to use as the application's origin. Only supported for TCP applications with traffic_type \"worker\"; mutually exclusive with origin_direct, origin_dns, origin_port, proxy_protocol, and argo_smart_routing. tls may only be \"off\" or \"flexible\"."
+          "description": "Optional Worker script tag (worker ID) to use as the application's origin. Only supported for TCP applications with traffic_type \"worker\"; mutually exclusive with origin_direct, origin_dns, origin_port, proxy_protocol, and argo_smart_routing. tls may only be \"off\" or \"flexible\".",
+          "type": "string"
         },
         "protocol": {
-          "$ref": "#/$defs/spectrum-config_protocol",
-          "description": "The port configuration at Cloudflare's edge. May specify a single port, for example `\"tcp/1000\"`, or a range of ports, for example `\"tcp/1000-2000\"`."
+          "description": "The port configuration at Cloudflare's edge. May specify a single port, for example `\"tcp/1000\"`, or a range of ports, for example `\"tcp/1000-2000\"`.",
+          "type": "string"
         },
         "proxy_protocol": {
-          "$ref": "#/$defs/spectrum-config_proxy_protocol",
           "default": "off",
-          "description": "Enables Proxy Protocol to the origin. Refer to [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/) for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple Proxy Protocol."
+          "description": "Enables Proxy Protocol to the origin. Refer to [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/) for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple Proxy Protocol.",
+          "enum": [
+            "off",
+            "v1",
+            "v2",
+            "simple"
+          ],
+          "type": "string"
         },
         "tls": {
-          "$ref": "#/$defs/spectrum-config_tls",
           "default": "off",
-          "description": "The type of TLS termination associated with the application."
+          "description": "The type of TLS termination associated with the application.",
+          "enum": [
+            "off",
+            "flexible",
+            "full",
+            "strict"
+          ],
+          "type": "string"
         },
         "traffic_type": {
-          "$ref": "#/$defs/spectrum-config_traffic_type",
           "default": "direct",
-          "description": "Determines how data travels from the edge to your origin. When set to \"direct\", Spectrum will send traffic directly to your origin, and the application's type is derived from the `protocol`. When set to \"http\" or \"https\", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and the application type matches this property exactly. When set to \"worker\", traffic is sent to the Worker specified by `origin_worker_id`."
+          "description": "Determines how data travels from the edge to your origin. When set to \"direct\", Spectrum will send traffic directly to your origin, and the application's type is derived from the `protocol`. When set to \"http\" or \"https\", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and the application type matches this property exactly. When set to \"worker\", traffic is sent to the Worker specified by `origin_worker_id`.",
+          "enum": [
+            "direct",
+            "http",
+            "https",
+            "worker"
+          ],
+          "type": "string"
         },
         "virtual_network_id": {
-          "$ref": "#/$defs/spectrum-config_virtual_network_id",
-          "description": "Optional UUID of a virtual network for routing origin traffic through tunnel virtual networks."
+          "description": "Optional UUID of a virtual network for routing origin traffic through tunnel virtual networks.",
+          "format": "uuid",
+          "type": "string"
         }
       },
       "required": [
@@ -85,79 +111,39 @@ export const spectrum_config_app_config: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `spectrum-config_app_identifier`.
- */
-export const spectrum_config_app_identifier: JsonSchema = {
-  "$ref": "#/$defs/spectrum-config_identifier",
-  "description": "App identifier."
-};
-
-/**
- * The schema of `spectrum-config_argo_smart_routing`.
- */
-export const spectrum_config_argo_smart_routing: JsonSchema = {
-  "description": "Enables Argo Smart Routing for this application.\nNotes: Only available for TCP or UDP applications with traffic_type set to \"direct\".",
-  "type": "boolean"
-};
-
 /**
  * The schema of `spectrum-config_base_app_config`.
  */
-export const spectrum_config_base_app_config: JsonSchema = {
+export const spectrum$$config_base_app_config: JsonSchema = {
   "type": "object"
 };
 
 /**
  * The schema of `spectrum-config_dns`.
  */
-export const spectrum_config_dns: JsonSchema = {
+export const spectrum$$config_dns: JsonSchema = {
   "description": "The name and type of DNS record for the Spectrum application.",
   "properties": {
     "name": {
-      "$ref": "#/$defs/spectrum-config_dns_name",
-      "description": "The name of the DNS record associated with the application."
+      "description": "The name of the DNS record associated with the application.",
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/spectrum-config_dns_type",
-      "description": "The type of DNS record associated with the application."
+      "description": "The type of DNS record associated with the application.",
+      "enum": [
+        "CNAME",
+        "ADDRESS"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `spectrum-config_dns_name`.
- */
-export const spectrum_config_dns_name: JsonSchema = {
-  "description": "The name of the DNS record associated with the application.",
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_dns_ttl`.
- */
-export const spectrum_config_dns_ttl: JsonSchema = {
-  "description": "The TTL of our resolution of your DNS record in seconds.",
-  "type": "integer"
-};
-
-/**
- * The schema of `spectrum-config_dns_type`.
- */
-export const spectrum_config_dns_type: JsonSchema = {
-  "description": "The type of DNS record associated with the application.",
-  "enum": [
-    "CNAME",
-    "ADDRESS"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-config_edge_ips`.
  */
-export const spectrum_config_edge_ips: JsonSchema = {
+export const spectrum$$config_edge_ips: JsonSchema = {
   "description": "The anycast edge IP configuration for the hostname of this application.",
   "oneOf": [
     {
@@ -203,18 +189,10 @@ export const spectrum_config_edge_ips: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `spectrum-config_ip_firewall`.
- */
-export const spectrum_config_ip_firewall: JsonSchema = {
-  "description": "Enables IP Access Rules for this application.\nNotes: Only available for TCP applications.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `spectrum-config_origin_direct`.
  */
-export const spectrum_config_origin_direct: JsonSchema = {
+export const spectrum$$config_origin_direct: JsonSchema = {
   "description": "List of origin IP addresses. Array may contain multiple IP addresses for load balancing.",
   "items": {
     "type": "string"
@@ -225,74 +203,35 @@ export const spectrum_config_origin_direct: JsonSchema = {
 /**
  * The schema of `spectrum-config_origin_dns`.
  */
-export const spectrum_config_origin_dns: JsonSchema = {
+export const spectrum$$config_origin_dns: JsonSchema = {
   "description": "The name and type of DNS record for the Spectrum application.",
   "properties": {
     "name": {
-      "$ref": "#/$defs/spectrum-config_origin_dns_name",
-      "description": "The name of the DNS record associated with the origin."
+      "description": "The name of the DNS record associated with the origin.",
+      "type": "string"
     },
     "ttl": {
-      "$ref": "#/$defs/spectrum-config_dns_ttl",
-      "description": "The TTL of our resolution of your DNS record in seconds."
+      "description": "The TTL of our resolution of your DNS record in seconds.",
+      "type": "integer"
     },
     "type": {
-      "$ref": "#/$defs/spectrum-config_origin_dns_type",
-      "description": "The type of DNS record associated with the origin. \"\" is used to specify a combination of A/AAAA records."
+      "description": "The type of DNS record associated with the origin. \"\" is used to specify a combination of A/AAAA records.",
+      "enum": [
+        "",
+        "A",
+        "AAAA",
+        "SRV"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `spectrum-config_origin_dns_name`.
- */
-export const spectrum_config_origin_dns_name: JsonSchema = {
-  "description": "The name of the DNS record associated with the origin.",
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_origin_dns_type`.
- */
-export const spectrum_config_origin_dns_type: JsonSchema = {
-  "description": "The type of DNS record associated with the origin. \"\" is used to specify a combination of A/AAAA records.",
-  "enum": [
-    "",
-    "A",
-    "AAAA",
-    "SRV"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_origin_port`.
- */
-export const spectrum_config_origin_port: JsonSchema = {
-  "anyOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "string"
-    }
-  ],
-  "description": "The destination port at the origin. Only specified in conjunction with origin_dns. May use an integer to specify a single origin port, for example `1000`, or a string to specify a range of origin ports, for example `\"1000-2000\"`.\nNotes: If specifying a port range, the number of ports in the range must match the number of ports specified in the \"protocol\" field."
-};
-
-/**
- * The schema of `spectrum-config_origin_worker_id`.
- */
-export const spectrum_config_origin_worker_id: JsonSchema = {
-  "description": "Optional Worker script tag (worker ID) to use as the application's origin. Only supported for TCP applications with traffic_type \"worker\"; mutually exclusive with origin_direct, origin_dns, origin_port, proxy_protocol, and argo_smart_routing. tls may only be \"off\" or \"flexible\".",
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-config_paygo_app_config`.
  */
-export const spectrum_config_paygo_app_config: JsonSchema = {
+export const spectrum$$config_paygo_app_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_base_app_config"
@@ -308,8 +247,8 @@ export const spectrum_config_paygo_app_config: JsonSchema = {
           "description": "List of origin IP addresses. Array may contain multiple IP addresses for load balancing."
         },
         "protocol": {
-          "$ref": "#/$defs/spectrum-config_protocol",
-          "description": "The port configuration at Cloudflare's edge. May specify a single port, for example `\"tcp/1000\"`, or a range of ports, for example `\"tcp/1000-2000\"`."
+          "description": "The port configuration at Cloudflare's edge. May specify a single port, for example `\"tcp/1000\"`, or a range of ports, for example `\"tcp/1000-2000\"`.",
+          "type": "string"
         }
       },
       "required": [
@@ -321,60 +260,10 @@ export const spectrum_config_paygo_app_config: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `spectrum-config_protocol`.
- */
-export const spectrum_config_protocol: JsonSchema = {
-  "description": "The port configuration at Cloudflare's edge. May specify a single port, for example `\"tcp/1000\"`, or a range of ports, for example `\"tcp/1000-2000\"`.",
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_proxy_protocol`.
- */
-export const spectrum_config_proxy_protocol: JsonSchema = {
-  "description": "Enables Proxy Protocol to the origin. Refer to [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/) for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple Proxy Protocol.",
-  "enum": [
-    "off",
-    "v1",
-    "v2",
-    "simple"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_tls`.
- */
-export const spectrum_config_tls: JsonSchema = {
-  "description": "The type of TLS termination associated with the application.",
-  "enum": [
-    "off",
-    "flexible",
-    "full",
-    "strict"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_traffic_type`.
- */
-export const spectrum_config_traffic_type: JsonSchema = {
-  "description": "Determines how data travels from the edge to your origin. When set to \"direct\", Spectrum will send traffic directly to your origin, and the application's type is derived from the `protocol`. When set to \"http\" or \"https\", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and the application type matches this property exactly. When set to \"worker\", traffic is sent to the Worker specified by `origin_worker_id`.",
-  "enum": [
-    "direct",
-    "http",
-    "https",
-    "worker"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-config_update_app_config`.
  */
-export const spectrum_config_update_app_config: JsonSchema = {
+export const spectrum$$config_update_app_config: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/spectrum-config_app_config"
@@ -384,12 +273,3 @@ export const spectrum_config_update_app_config: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `spectrum-config_virtual_network_id`.
- */
-export const spectrum_config_virtual_network_id: JsonSchema = {
-  "description": "Optional UUID of a virtual network for routing origin traffic through tunnel virtual networks.",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/spectrum/apps/tools.ts b/src/generated/forge-mcp/spectrum/apps/tools.ts
index e1d431941..fd67565fe 100644
--- a/src/generated/forge-mcp/spectrum/apps/tools.ts
+++ b/src/generated/forge-mcp/spectrum/apps/tools.ts
@@ -1,73 +1,35 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  spectrum_config_api_response_collection_output,
-  spectrum_config_api_response_common_failure_output,
-  spectrum_config_api_response_common_output,
-  spectrum_config_identifier_output,
-  spectrum_config_messages_output,
+  spectrum$$config_api$$response$$collection,
+  spectrum$$config_api$$response$$common,
+  spectrum$$config_api$$response$$common$$failure,
+  spectrum$$config_messages,
 } from "../outputs.js";
 import {
-  spectrum_config_identifier,
-  spectrum_config_zone_identifier,
-} from "../schemas.js";
-import {
-  spectrum_config_api_response_single_id_output,
-  spectrum_config_api_response_single_output,
-  spectrum_config_app_config_collection_output,
-  spectrum_config_app_config_output,
-  spectrum_config_app_config_single_output,
-  spectrum_config_app_identifier_output,
-  spectrum_config_argo_smart_routing_output,
-  spectrum_config_base_app_config_output,
-  spectrum_config_created_output,
-  spectrum_config_dns_name_output,
-  spectrum_config_dns_output,
-  spectrum_config_dns_ttl_output,
-  spectrum_config_dns_type_output,
-  spectrum_config_edge_ips_output,
-  spectrum_config_ip_firewall_output,
-  spectrum_config_modified_output,
-  spectrum_config_origin_direct_output,
-  spectrum_config_origin_dns_name_output,
-  spectrum_config_origin_dns_output,
-  spectrum_config_origin_dns_type_output,
-  spectrum_config_origin_port_output,
-  spectrum_config_origin_worker_id_output,
-  spectrum_config_paygo_app_config_output,
-  spectrum_config_protocol_output,
-  spectrum_config_proxy_protocol_output,
-  spectrum_config_timestamp_output,
-  spectrum_config_tls_output,
-  spectrum_config_traffic_type_output,
-  spectrum_config_virtual_network_id_output,
+  spectrum$$config_api$$response$$single,
+  spectrum$$config_api$$response$$single$$id,
+  spectrum$$config_app_config,
+  spectrum$$config_app_config_collection,
+  spectrum$$config_app_config_single,
+  spectrum$$config_base_app_config,
+  spectrum$$config_dns,
+  spectrum$$config_edge_ips,
+  spectrum$$config_origin_direct,
+  spectrum$$config_origin_dns,
+  spectrum$$config_paygo_app_config,
 } from "./outputs.js";
 import {
-  spectrum_config_app_config,
-  spectrum_config_app_identifier,
-  spectrum_config_argo_smart_routing,
-  spectrum_config_base_app_config,
-  spectrum_config_dns,
-  spectrum_config_dns_name,
-  spectrum_config_dns_ttl,
-  spectrum_config_dns_type,
-  spectrum_config_edge_ips,
-  spectrum_config_ip_firewall,
-  spectrum_config_origin_direct,
-  spectrum_config_origin_dns,
-  spectrum_config_origin_dns_name,
-  spectrum_config_origin_dns_type,
-  spectrum_config_origin_port,
-  spectrum_config_origin_worker_id,
-  spectrum_config_paygo_app_config,
-  spectrum_config_protocol,
-  spectrum_config_proxy_protocol,
-  spectrum_config_tls,
-  spectrum_config_traffic_type,
-  spectrum_config_update_app_config,
-  spectrum_config_virtual_network_id,
+  spectrum$$config_app_config as spectrum$$config_app_config$,
+  spectrum$$config_base_app_config as spectrum$$config_base_app_config$,
+  spectrum$$config_dns as spectrum$$config_dns$,
+  spectrum$$config_edge_ips as spectrum$$config_edge_ips$,
+  spectrum$$config_origin_direct as spectrum$$config_origin_direct$,
+  spectrum$$config_origin_dns as spectrum$$config_origin_dns$,
+  spectrum$$config_paygo_app_config as spectrum$$config_paygo_app_config$,
+  spectrum$$config_update_app_config,
 } from "./schemas.js";
 
 /**
@@ -77,81 +39,56 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_apps_create",
     title: "Create Spectrum application using a name for the origin",
-    description: "Creates a new Spectrum application from a configuration using a name for the origin.",
+    description: "Creates a new Spectrum application from a configuration using a name for the origin.\n\nPOST /zones/{zone_id}/spectrum/apps",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/spectrum-config_update_app_config"
         },
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-config_zone_identifier",
-          "description": "Zone identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "spectrum-config_app_config": spectrum_config_app_config,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config,
-        "spectrum-config_dns": spectrum_config_dns,
-        "spectrum-config_dns_name": spectrum_config_dns_name,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl,
-        "spectrum-config_dns_type": spectrum_config_dns_type,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips,
-        "spectrum-config_identifier": spectrum_config_identifier,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type,
-        "spectrum-config_origin_port": spectrum_config_origin_port,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config,
-        "spectrum-config_protocol": spectrum_config_protocol,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol,
-        "spectrum-config_tls": spectrum_config_tls,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type,
-        "spectrum-config_update_app_config": spectrum_config_update_app_config,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id,
-        "spectrum-config_zone_identifier": spectrum_config_zone_identifier,
+        "spectrum-config_app_config": spectrum$$config_app_config$,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config$,
+        "spectrum-config_dns": spectrum$$config_dns$,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips$,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct$,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns$,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config$,
+        "spectrum-config_update_app_config": spectrum$$config_update_app_config,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-config_app_config_single",
       $defs: {
-        "spectrum-config_api-response-single": spectrum_config_api_response_single_output,
-        "spectrum-config_app_config": spectrum_config_app_config_output,
-        "spectrum-config_app_config_single": spectrum_config_app_config_single_output,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier_output,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing_output,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config_output,
-        "spectrum-config_created": spectrum_config_created_output,
-        "spectrum-config_dns": spectrum_config_dns_output,
-        "spectrum-config_dns_name": spectrum_config_dns_name_output,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl_output,
-        "spectrum-config_dns_type": spectrum_config_dns_type_output,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_modified": spectrum_config_modified_output,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct_output,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns_output,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name_output,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type_output,
-        "spectrum-config_origin_port": spectrum_config_origin_port_output,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id_output,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config_output,
-        "spectrum-config_protocol": spectrum_config_protocol_output,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol_output,
-        "spectrum-config_timestamp": spectrum_config_timestamp_output,
-        "spectrum-config_tls": spectrum_config_tls_output,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type_output,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id_output,
+        "spectrum-config_api-response-single": spectrum$$config_api$$response$$single,
+        "spectrum-config_app_config": spectrum$$config_app_config,
+        "spectrum-config_app_config_single": spectrum$$config_app_config_single,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config,
+        "spectrum-config_dns": spectrum$$config_dns,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config,
       },
     },
     annotations: {
@@ -178,36 +115,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-config_api-response-common-failure": spectrum_config_api_response_common_failure_output,
-        "spectrum-config_api-response-single": spectrum_config_api_response_single_output,
-        "spectrum-config_app_config": spectrum_config_app_config_output,
-        "spectrum-config_app_config_single": spectrum_config_app_config_single_output,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier_output,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing_output,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config_output,
-        "spectrum-config_created": spectrum_config_created_output,
-        "spectrum-config_dns": spectrum_config_dns_output,
-        "spectrum-config_dns_name": spectrum_config_dns_name_output,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl_output,
-        "spectrum-config_dns_type": spectrum_config_dns_type_output,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_modified": spectrum_config_modified_output,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct_output,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns_output,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name_output,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type_output,
-        "spectrum-config_origin_port": spectrum_config_origin_port_output,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id_output,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config_output,
-        "spectrum-config_protocol": spectrum_config_protocol_output,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol_output,
-        "spectrum-config_timestamp": spectrum_config_timestamp_output,
-        "spectrum-config_tls": spectrum_config_tls_output,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type_output,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id_output,
+        "spectrum-config_api-response-common-failure": spectrum$$config_api$$response$$common$$failure,
+        "spectrum-config_api-response-single": spectrum$$config_api$$response$$single,
+        "spectrum-config_app_config": spectrum$$config_app_config,
+        "spectrum-config_app_config_single": spectrum$$config_app_config_single,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config,
+        "spectrum-config_dns": spectrum$$config_dns,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config,
       },
     },
     request: (args) => ({
@@ -218,36 +136,40 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_apps_delete",
     title: "Delete Spectrum application",
-    description: "Deletes a previously existing application.",
+    description: "Deletes a previously existing application.\n\nDELETE /zones/{zone_id}/spectrum/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "app_id": {
-          "$ref": "#/$defs/spectrum-config_app_identifier",
-          "description": "App identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-config_zone_identifier",
-          "description": "Zone identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "app_id": {
+              "description": "App identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "spectrum-config_app_identifier": spectrum_config_app_identifier,
-        "spectrum-config_identifier": spectrum_config_identifier,
-        "spectrum-config_zone_identifier": spectrum_config_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-config_api-response-single-id",
       $defs: {
-        "spectrum-config_api-response-common": spectrum_config_api_response_common_output,
-        "spectrum-config_api-response-single-id": spectrum_config_api_response_single_id_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
+        "spectrum-config_api-response-common": spectrum$$config_api$$response$$common,
+        "spectrum-config_api-response-single-id": spectrum$$config_api$$response$$single$$id,
+        "spectrum-config_messages": spectrum$$config_messages,
       },
     },
     annotations: {
@@ -274,11 +196,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-config_api-response-common": spectrum_config_api_response_common_output,
-        "spectrum-config_api-response-common-failure": spectrum_config_api_response_common_failure_output,
-        "spectrum-config_api-response-single-id": spectrum_config_api_response_single_id_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
+        "spectrum-config_api-response-common": spectrum$$config_api$$response$$common,
+        "spectrum-config_api-response-common-failure": spectrum$$config_api$$response$$common$$failure,
+        "spectrum-config_api-response-single-id": spectrum$$config_api$$response$$single$$id,
+        "spectrum-config_messages": spectrum$$config_messages,
       },
     },
     request: (args) => ({
@@ -288,61 +209,47 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_apps_get",
     title: "Get Spectrum application configuration",
-    description: "Gets the application configuration of a specific application inside a zone.",
+    description: "Gets the application configuration of a specific application inside a zone.\n\nGET /zones/{zone_id}/spectrum/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "app_id": {
-          "$ref": "#/$defs/spectrum-config_app_identifier",
-          "description": "App identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-config_zone_identifier",
-          "description": "Zone identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "app_id": {
+              "description": "App identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "spectrum-config_app_identifier": spectrum_config_app_identifier,
-        "spectrum-config_identifier": spectrum_config_identifier,
-        "spectrum-config_zone_identifier": spectrum_config_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-config_app_config_single",
       $defs: {
-        "spectrum-config_api-response-single": spectrum_config_api_response_single_output,
-        "spectrum-config_app_config": spectrum_config_app_config_output,
-        "spectrum-config_app_config_single": spectrum_config_app_config_single_output,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier_output,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing_output,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config_output,
-        "spectrum-config_created": spectrum_config_created_output,
-        "spectrum-config_dns": spectrum_config_dns_output,
-        "spectrum-config_dns_name": spectrum_config_dns_name_output,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl_output,
-        "spectrum-config_dns_type": spectrum_config_dns_type_output,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_modified": spectrum_config_modified_output,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct_output,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns_output,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name_output,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type_output,
-        "spectrum-config_origin_port": spectrum_config_origin_port_output,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id_output,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config_output,
-        "spectrum-config_protocol": spectrum_config_protocol_output,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol_output,
-        "spectrum-config_timestamp": spectrum_config_timestamp_output,
-        "spectrum-config_tls": spectrum_config_tls_output,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type_output,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id_output,
+        "spectrum-config_api-response-single": spectrum$$config_api$$response$$single,
+        "spectrum-config_app_config": spectrum$$config_app_config,
+        "spectrum-config_app_config_single": spectrum$$config_app_config_single,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config,
+        "spectrum-config_dns": spectrum$$config_dns,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config,
       },
     },
     annotations: {
@@ -370,36 +277,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-config_api-response-common-failure": spectrum_config_api_response_common_failure_output,
-        "spectrum-config_api-response-single": spectrum_config_api_response_single_output,
-        "spectrum-config_app_config": spectrum_config_app_config_output,
-        "spectrum-config_app_config_single": spectrum_config_app_config_single_output,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier_output,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing_output,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config_output,
-        "spectrum-config_created": spectrum_config_created_output,
-        "spectrum-config_dns": spectrum_config_dns_output,
-        "spectrum-config_dns_name": spectrum_config_dns_name_output,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl_output,
-        "spectrum-config_dns_type": spectrum_config_dns_type_output,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_modified": spectrum_config_modified_output,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct_output,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns_output,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name_output,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type_output,
-        "spectrum-config_origin_port": spectrum_config_origin_port_output,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id_output,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config_output,
-        "spectrum-config_protocol": spectrum_config_protocol_output,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol_output,
-        "spectrum-config_timestamp": spectrum_config_timestamp_output,
-        "spectrum-config_tls": spectrum_config_tls_output,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type_output,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id_output,
+        "spectrum-config_api-response-common-failure": spectrum$$config_api$$response$$common$$failure,
+        "spectrum-config_api-response-single": spectrum$$config_api$$response$$single,
+        "spectrum-config_app_config": spectrum$$config_app_config,
+        "spectrum-config_app_config_single": spectrum$$config_app_config_single,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config,
+        "spectrum-config_dns": spectrum$$config_dns,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config,
       },
     },
     request: (args) => ({
@@ -409,86 +297,79 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_apps_list",
     title: "List Spectrum applications",
-    description: "Retrieves a list of currently existing Spectrum applications inside a zone.",
+    description: "Retrieves a list of currently existing Spectrum applications inside a zone.\n\nGET /zones/{zone_id}/spectrum/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "default": "asc",
-          "description": "Sets the direction by which results are ordered.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "default": "dns",
-          "description": "Application field by which results are ordered.",
-          "enum": [
-            "protocol",
-            "app_id",
-            "created_on",
-            "modified_on",
-            "dns"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "Page number of paginated results. This parameter is required in order to use other pagination parameters. If included in the query, `result_info` will be present in the response.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Sets the maximum number of results per page.",
-          "type": "number"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-config_zone_identifier",
-          "description": "Zone identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "default": "asc",
+              "description": "Sets the direction by which results are ordered.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "dns",
+              "description": "Application field by which results are ordered.",
+              "enum": [
+                "protocol",
+                "app_id",
+                "created_on",
+                "modified_on",
+                "dns"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Page number of paginated results. This parameter is required in order to use other pagination parameters. If included in the query, `result_info` will be present in the response.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Sets the maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "spectrum-config_identifier": spectrum_config_identifier,
-        "spectrum-config_zone_identifier": spectrum_config_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-config_app_config_collection",
       $defs: {
-        "spectrum-config_api-response-collection": spectrum_config_api_response_collection_output,
-        "spectrum-config_api-response-common": spectrum_config_api_response_common_output,
-        "spectrum-config_app_config": spectrum_config_app_config_output,
-        "spectrum-config_app_config_collection": spectrum_config_app_config_collection_output,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier_output,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing_output,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config_output,
-        "spectrum-config_created": spectrum_config_created_output,
-        "spectrum-config_dns": spectrum_config_dns_output,
-        "spectrum-config_dns_name": spectrum_config_dns_name_output,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl_output,
-        "spectrum-config_dns_type": spectrum_config_dns_type_output,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_modified": spectrum_config_modified_output,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct_output,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns_output,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name_output,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type_output,
-        "spectrum-config_origin_port": spectrum_config_origin_port_output,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id_output,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config_output,
-        "spectrum-config_protocol": spectrum_config_protocol_output,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol_output,
-        "spectrum-config_timestamp": spectrum_config_timestamp_output,
-        "spectrum-config_tls": spectrum_config_tls_output,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type_output,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id_output,
+        "spectrum-config_api-response-collection": spectrum$$config_api$$response$$collection,
+        "spectrum-config_api-response-common": spectrum$$config_api$$response$$common,
+        "spectrum-config_app_config": spectrum$$config_app_config,
+        "spectrum-config_app_config_collection": spectrum$$config_app_config_collection,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config,
+        "spectrum-config_dns": spectrum$$config_dns,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config,
       },
     },
     annotations: {
@@ -516,133 +397,88 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-config_api-response-collection": spectrum_config_api_response_collection_output,
-        "spectrum-config_api-response-common": spectrum_config_api_response_common_output,
-        "spectrum-config_api-response-common-failure": spectrum_config_api_response_common_failure_output,
-        "spectrum-config_app_config": spectrum_config_app_config_output,
-        "spectrum-config_app_config_collection": spectrum_config_app_config_collection_output,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier_output,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing_output,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config_output,
-        "spectrum-config_created": spectrum_config_created_output,
-        "spectrum-config_dns": spectrum_config_dns_output,
-        "spectrum-config_dns_name": spectrum_config_dns_name_output,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl_output,
-        "spectrum-config_dns_type": spectrum_config_dns_type_output,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_modified": spectrum_config_modified_output,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct_output,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns_output,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name_output,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type_output,
-        "spectrum-config_origin_port": spectrum_config_origin_port_output,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id_output,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config_output,
-        "spectrum-config_protocol": spectrum_config_protocol_output,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol_output,
-        "spectrum-config_timestamp": spectrum_config_timestamp_output,
-        "spectrum-config_tls": spectrum_config_tls_output,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type_output,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id_output,
+        "spectrum-config_api-response-collection": spectrum$$config_api$$response$$collection,
+        "spectrum-config_api-response-common": spectrum$$config_api$$response$$common,
+        "spectrum-config_api-response-common-failure": spectrum$$config_api$$response$$common$$failure,
+        "spectrum-config_app_config": spectrum$$config_app_config,
+        "spectrum-config_app_config_collection": spectrum$$config_app_config_collection,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config,
+        "spectrum-config_dns": spectrum$$config_dns,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/spectrum/apps`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
-        ["order", args["order"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
   {
     name: "spectrum_apps_update",
     title: "Update Spectrum application configuration using a name for the origin",
-    description: "Updates a previously existing application's configuration that uses a name for the origin.",
+    description: "Updates a previously existing application's configuration that uses a name for the origin.\n\nPUT /zones/{zone_id}/spectrum/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "app_id": {
-          "$ref": "#/$defs/spectrum-config_app_identifier",
-          "description": "App identifier."
-        },
         "body": {
           "$ref": "#/$defs/spectrum-config_update_app_config"
         },
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-config_zone_identifier",
-          "description": "Zone identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "app_id": {
+              "description": "App identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "spectrum-config_app_config": spectrum_config_app_config,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config,
-        "spectrum-config_dns": spectrum_config_dns,
-        "spectrum-config_dns_name": spectrum_config_dns_name,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl,
-        "spectrum-config_dns_type": spectrum_config_dns_type,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips,
-        "spectrum-config_identifier": spectrum_config_identifier,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type,
-        "spectrum-config_origin_port": spectrum_config_origin_port,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config,
-        "spectrum-config_protocol": spectrum_config_protocol,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol,
-        "spectrum-config_tls": spectrum_config_tls,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type,
-        "spectrum-config_update_app_config": spectrum_config_update_app_config,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id,
-        "spectrum-config_zone_identifier": spectrum_config_zone_identifier,
+        "spectrum-config_app_config": spectrum$$config_app_config$,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config$,
+        "spectrum-config_dns": spectrum$$config_dns$,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips$,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct$,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns$,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config$,
+        "spectrum-config_update_app_config": spectrum$$config_update_app_config,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-config_app_config_single",
       $defs: {
-        "spectrum-config_api-response-single": spectrum_config_api_response_single_output,
-        "spectrum-config_app_config": spectrum_config_app_config_output,
-        "spectrum-config_app_config_single": spectrum_config_app_config_single_output,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier_output,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing_output,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config_output,
-        "spectrum-config_created": spectrum_config_created_output,
-        "spectrum-config_dns": spectrum_config_dns_output,
-        "spectrum-config_dns_name": spectrum_config_dns_name_output,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl_output,
-        "spectrum-config_dns_type": spectrum_config_dns_type_output,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_modified": spectrum_config_modified_output,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct_output,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns_output,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name_output,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type_output,
-        "spectrum-config_origin_port": spectrum_config_origin_port_output,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id_output,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config_output,
-        "spectrum-config_protocol": spectrum_config_protocol_output,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol_output,
-        "spectrum-config_timestamp": spectrum_config_timestamp_output,
-        "spectrum-config_tls": spectrum_config_tls_output,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type_output,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id_output,
+        "spectrum-config_api-response-single": spectrum$$config_api$$response$$single,
+        "spectrum-config_app_config": spectrum$$config_app_config,
+        "spectrum-config_app_config_single": spectrum$$config_app_config_single,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config,
+        "spectrum-config_dns": spectrum$$config_dns,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config,
       },
     },
     annotations: {
@@ -669,36 +505,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-config_api-response-common-failure": spectrum_config_api_response_common_failure_output,
-        "spectrum-config_api-response-single": spectrum_config_api_response_single_output,
-        "spectrum-config_app_config": spectrum_config_app_config_output,
-        "spectrum-config_app_config_single": spectrum_config_app_config_single_output,
-        "spectrum-config_app_identifier": spectrum_config_app_identifier_output,
-        "spectrum-config_argo_smart_routing": spectrum_config_argo_smart_routing_output,
-        "spectrum-config_base_app_config": spectrum_config_base_app_config_output,
-        "spectrum-config_created": spectrum_config_created_output,
-        "spectrum-config_dns": spectrum_config_dns_output,
-        "spectrum-config_dns_name": spectrum_config_dns_name_output,
-        "spectrum-config_dns_ttl": spectrum_config_dns_ttl_output,
-        "spectrum-config_dns_type": spectrum_config_dns_type_output,
-        "spectrum-config_edge_ips": spectrum_config_edge_ips_output,
-        "spectrum-config_identifier": spectrum_config_identifier_output,
-        "spectrum-config_ip_firewall": spectrum_config_ip_firewall_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_modified": spectrum_config_modified_output,
-        "spectrum-config_origin_direct": spectrum_config_origin_direct_output,
-        "spectrum-config_origin_dns": spectrum_config_origin_dns_output,
-        "spectrum-config_origin_dns_name": spectrum_config_origin_dns_name_output,
-        "spectrum-config_origin_dns_type": spectrum_config_origin_dns_type_output,
-        "spectrum-config_origin_port": spectrum_config_origin_port_output,
-        "spectrum-config_origin_worker_id": spectrum_config_origin_worker_id_output,
-        "spectrum-config_paygo_app_config": spectrum_config_paygo_app_config_output,
-        "spectrum-config_protocol": spectrum_config_protocol_output,
-        "spectrum-config_proxy_protocol": spectrum_config_proxy_protocol_output,
-        "spectrum-config_timestamp": spectrum_config_timestamp_output,
-        "spectrum-config_tls": spectrum_config_tls_output,
-        "spectrum-config_traffic_type": spectrum_config_traffic_type_output,
-        "spectrum-config_virtual_network_id": spectrum_config_virtual_network_id_output,
+        "spectrum-config_api-response-common-failure": spectrum$$config_api$$response$$common$$failure,
+        "spectrum-config_api-response-single": spectrum$$config_api$$response$$single,
+        "spectrum-config_app_config": spectrum$$config_app_config,
+        "spectrum-config_app_config_single": spectrum$$config_app_config_single,
+        "spectrum-config_base_app_config": spectrum$$config_base_app_config,
+        "spectrum-config_dns": spectrum$$config_dns,
+        "spectrum-config_edge_ips": spectrum$$config_edge_ips,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_origin_direct": spectrum$$config_origin_direct,
+        "spectrum-config_origin_dns": spectrum$$config_origin_dns,
+        "spectrum-config_paygo_app_config": spectrum$$config_paygo_app_config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/spectrum/outputs.ts b/src/generated/forge-mcp/spectrum/outputs.ts
index 62ae2b25c..782ba5cc9 100644
--- a/src/generated/forge-mcp/spectrum/outputs.ts
+++ b/src/generated/forge-mcp/spectrum/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `spectrum-config_api-response-collection` in responses.
  */
-export const spectrum_config_api_response_collection_output: JsonSchema = {
+export const spectrum$$config_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_api-response-common"
@@ -42,7 +42,7 @@ export const spectrum_config_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `spectrum-config_api-response-common` in responses.
  */
-export const spectrum_config_api_response_common_output: JsonSchema = {
+export const spectrum$$config_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/spectrum-config_messages"
@@ -68,7 +68,7 @@ export const spectrum_config_api_response_common_output: JsonSchema = {
 /**
  * The schema of `spectrum-config_api-response-common-failure` in responses.
  */
-export const spectrum_config_api_response_common_failure_output: JsonSchema = {
+export const spectrum$$config_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/spectrum-config_messages"
@@ -95,17 +95,10 @@ export const spectrum_config_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `spectrum-config_identifier` in responses.
- */
-export const spectrum_config_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `spectrum-config_messages` in responses.
  */
-export const spectrum_config_messages_output: JsonSchema = {
+export const spectrum$$config_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/spectrum/protocols/outputs.ts b/src/generated/forge-mcp/spectrum/protocols/outputs.ts
index 8edeedcb8..56592f01e 100644
--- a/src/generated/forge-mcp/spectrum/protocols/outputs.ts
+++ b/src/generated/forge-mcp/spectrum/protocols/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `spectrum-config_app_protocol` in responses.
  */
-export const spectrum_config_app_protocol_output: JsonSchema = {
+export const spectrum$$config_app_protocol: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -36,7 +36,7 @@ export const spectrum_config_app_protocol_output: JsonSchema = {
 /**
  * The schema of `spectrum-config_protocol_collection` in responses.
  */
-export const spectrum_config_protocol_collection_output: JsonSchema = {
+export const spectrum$$config_protocol_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/spectrum-config_api-response-collection"
diff --git a/src/generated/forge-mcp/spectrum/protocols/tools.ts b/src/generated/forge-mcp/spectrum/protocols/tools.ts
index 6e709ebb4..55c9deb59 100644
--- a/src/generated/forge-mcp/spectrum/protocols/tools.ts
+++ b/src/generated/forge-mcp/spectrum/protocols/tools.ts
@@ -3,18 +3,14 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  spectrum_config_api_response_collection_output,
-  spectrum_config_api_response_common_failure_output,
-  spectrum_config_api_response_common_output,
-  spectrum_config_messages_output,
+  spectrum$$config_api$$response$$collection,
+  spectrum$$config_api$$response$$common,
+  spectrum$$config_api$$response$$common$$failure,
+  spectrum$$config_messages,
 } from "../outputs.js";
 import {
-  spectrum_config_identifier,
-  spectrum_config_zone_identifier,
-} from "../schemas.js";
-import {
-  spectrum_config_app_protocol_output,
-  spectrum_config_protocol_collection_output,
+  spectrum$$config_app_protocol,
+  spectrum$$config_protocol_collection,
 } from "./outputs.js";
 
 /**
@@ -24,31 +20,37 @@ export const tools: readonly Tool[] = [
   {
     name: "spectrum_protocols_list",
     title: "List Spectrum application protocols",
-    description: "Retrieves a list of Spectrum application protocols available for a zone.",
+    description: "Retrieves a list of Spectrum application protocols available for a zone.\n\nGET /zones/{zone_id}/spectrum/protocols",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/spectrum-config_zone_identifier",
-          "description": "Zone identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "spectrum-config_identifier": spectrum_config_identifier,
-        "spectrum-config_zone_identifier": spectrum_config_zone_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/spectrum-config_protocol_collection",
       $defs: {
-        "spectrum-config_api-response-collection": spectrum_config_api_response_collection_output,
-        "spectrum-config_api-response-common": spectrum_config_api_response_common_output,
-        "spectrum-config_app_protocol": spectrum_config_app_protocol_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_protocol_collection": spectrum_config_protocol_collection_output,
+        "spectrum-config_api-response-collection": spectrum$$config_api$$response$$collection,
+        "spectrum-config_api-response-common": spectrum$$config_api$$response$$common,
+        "spectrum-config_app_protocol": spectrum$$config_app_protocol,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_protocol_collection": spectrum$$config_protocol_collection,
       },
     },
     annotations: {
@@ -76,12 +78,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "spectrum-config_api-response-collection": spectrum_config_api_response_collection_output,
-        "spectrum-config_api-response-common": spectrum_config_api_response_common_output,
-        "spectrum-config_api-response-common-failure": spectrum_config_api_response_common_failure_output,
-        "spectrum-config_app_protocol": spectrum_config_app_protocol_output,
-        "spectrum-config_messages": spectrum_config_messages_output,
-        "spectrum-config_protocol_collection": spectrum_config_protocol_collection_output,
+        "spectrum-config_api-response-collection": spectrum$$config_api$$response$$collection,
+        "spectrum-config_api-response-common": spectrum$$config_api$$response$$common,
+        "spectrum-config_api-response-common-failure": spectrum$$config_api$$response$$common$$failure,
+        "spectrum-config_app_protocol": spectrum$$config_app_protocol,
+        "spectrum-config_messages": spectrum$$config_messages,
+        "spectrum-config_protocol_collection": spectrum$$config_protocol_collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/spectrum/schemas.ts b/src/generated/forge-mcp/spectrum/schemas.ts
deleted file mode 100644
index 2c2702413..000000000
--- a/src/generated/forge-mcp/spectrum/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `spectrum-config_identifier`.
- */
-export const spectrum_config_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `spectrum-config_zone_identifier`.
- */
-export const spectrum_config_zone_identifier: JsonSchema = {
-  "$ref": "#/$defs/spectrum-config_identifier",
-  "description": "Zone identifier."
-};
diff --git a/src/generated/forge-mcp/speed/availabilities/outputs.ts b/src/generated/forge-mcp/speed/availabilities/outputs.ts
index a9fccf116..55a2e3c87 100644
--- a/src/generated/forge-mcp/speed/availabilities/outputs.ts
+++ b/src/generated/forge-mcp/speed/availabilities/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `observatory_availabilities` in responses.
  */
-export const observatory_availabilities_output: JsonSchema = {
+export const observatory_availabilities: JsonSchema = {
   "properties": {
     "quota": {
       "properties": {
@@ -80,7 +80,7 @@ export const observatory_availabilities_output: JsonSchema = {
 /**
  * The schema of `observatory_availabilities-response` in responses.
  */
-export const observatory_availabilities_response_output: JsonSchema = {
+export const observatory_availabilities$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/observatory_api-response-single"
@@ -99,7 +99,7 @@ export const observatory_availabilities_response_output: JsonSchema = {
 /**
  * The schema of `observatory_plan-properties-info` in responses.
  */
-export const observatory_plan_properties_info_output: JsonSchema = {
+export const observatory_plan$$properties$$info: JsonSchema = {
   "properties": {
     "business": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/speed/availabilities/tools.ts b/src/generated/forge-mcp/speed/availabilities/tools.ts
index f13d5cc93..6504e45e9 100644
--- a/src/generated/forge-mcp/speed/availabilities/tools.ts
+++ b/src/generated/forge-mcp/speed/availabilities/tools.ts
@@ -3,17 +3,15 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  observatory_api_response_common_failure_output,
-  observatory_api_response_single_output,
-  observatory_labeled_region_output,
-  observatory_messages_output,
-  observatory_region_output,
+  observatory_api$$response$$common$$failure,
+  observatory_api$$response$$single,
+  observatory_labeled_region,
+  observatory_messages,
 } from "../outputs.js";
-import { observatory_identifier } from "../schemas.js";
 import {
-  observatory_availabilities_output,
-  observatory_availabilities_response_output,
-  observatory_plan_properties_info_output,
+  observatory_availabilities,
+  observatory_availabilities$$response,
+  observatory_plan$$properties$$info,
 } from "./outputs.js";
 
 /**
@@ -23,32 +21,38 @@ export const tools: readonly Tool[] = [
   {
     name: "speed_availabilities_list",
     title: "Get quota and availability",
-    description: "Retrieves quota for all plans, as well as the current zone quota.",
+    description: "Retrieves quota for all plans, as well as the current zone quota.\n\nGET /zones/{zone_id}/speed_api/availabilities",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_availabilities-response",
       $defs: {
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_availabilities": observatory_availabilities_output,
-        "observatory_availabilities-response": observatory_availabilities_response_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_plan-properties-info": observatory_plan_properties_info_output,
-        "observatory_region": observatory_region_output,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_availabilities": observatory_availabilities,
+        "observatory_availabilities-response": observatory_availabilities$$response,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_messages": observatory_messages,
+        "observatory_plan-properties-info": observatory_plan$$properties$$info,
       },
     },
     annotations: {
@@ -82,14 +86,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_availabilities": observatory_availabilities_output,
-        "observatory_availabilities-response": observatory_availabilities_response_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_plan-properties-info": observatory_plan_properties_info_output,
-        "observatory_region": observatory_region_output,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_availabilities": observatory_availabilities,
+        "observatory_availabilities-response": observatory_availabilities$$response,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_messages": observatory_messages,
+        "observatory_plan-properties-info": observatory_plan$$properties$$info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/speed/outputs.ts b/src/generated/forge-mcp/speed/outputs.ts
index b90605d2c..7640a4ffc 100644
--- a/src/generated/forge-mcp/speed/outputs.ts
+++ b/src/generated/forge-mcp/speed/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `observatory_api-response-common-failure` in responses.
  */
-export const observatory_api_response_common_failure_output: JsonSchema = {
+export const observatory_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/observatory_messages"
@@ -36,7 +36,7 @@ export const observatory_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `observatory_api-response-single` in responses.
  */
-export const observatory_api_response_single_output: JsonSchema = {
+export const observatory_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/observatory_messages"
@@ -59,7 +59,7 @@ export const observatory_api_response_single_output: JsonSchema = {
 /**
  * The schema of `observatory_count-response` in responses.
  */
-export const observatory_count_response_output: JsonSchema = {
+export const observatory_count$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/observatory_api-response-single"
@@ -80,61 +80,70 @@ export const observatory_count_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `observatory_device_type` in responses.
- */
-export const observatory_device_type_output: JsonSchema = {
-  "enum": [
-    "DESKTOP",
-    "MOBILE"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `observatory_labeled_region` in responses.
  */
-export const observatory_labeled_region_output: JsonSchema = {
+export const observatory_labeled_region: JsonSchema = {
   "properties": {
     "label": {
       "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/observatory_region"
+      "enum": [
+        "asia-east1",
+        "asia-northeast1",
+        "asia-northeast2",
+        "asia-south1",
+        "asia-southeast1",
+        "australia-southeast1",
+        "europe-north1",
+        "europe-southwest1",
+        "europe-west1",
+        "europe-west2",
+        "europe-west3",
+        "europe-west4",
+        "europe-west8",
+        "europe-west9",
+        "me-west1",
+        "southamerica-east1",
+        "us-central1",
+        "us-east1",
+        "us-east4",
+        "us-south1",
+        "us-west1"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `observatory_lighthouse_error_code` in responses.
- */
-export const observatory_lighthouse_error_code_output: JsonSchema = {
-  "enum": [
-    "NOT_REACHABLE",
-    "DNS_FAILURE",
-    "NOT_HTML",
-    "LIGHTHOUSE_TIMEOUT",
-    "UNKNOWN"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `observatory_lighthouse_report` in responses.
  */
-export const observatory_lighthouse_report_output: JsonSchema = {
+export const observatory_lighthouse_report: JsonSchema = {
   "properties": {
     "cls": {
       "type": "number"
     },
     "deviceType": {
-      "$ref": "#/$defs/observatory_device_type"
+      "enum": [
+        "DESKTOP",
+        "MOBILE"
+      ],
+      "type": "string"
     },
     "error": {
       "properties": {
         "code": {
-          "$ref": "#/$defs/observatory_lighthouse_error_code"
+          "enum": [
+            "NOT_REACHABLE",
+            "DNS_FAILURE",
+            "NOT_HTML",
+            "LIGHTHOUSE_TIMEOUT",
+            "UNKNOWN"
+          ],
+          "type": "string"
         },
         "detail": {
           "type": "string"
@@ -161,7 +170,12 @@ export const observatory_lighthouse_report_output: JsonSchema = {
       "type": "number"
     },
     "state": {
-      "$ref": "#/$defs/observatory_lighthouse_state"
+      "enum": [
+        "RUNNING",
+        "COMPLETE",
+        "FAILED"
+      ],
+      "type": "string"
     },
     "tbt": {
       "type": "number"
@@ -176,22 +190,10 @@ export const observatory_lighthouse_report_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `observatory_lighthouse_state` in responses.
- */
-export const observatory_lighthouse_state_output: JsonSchema = {
-  "enum": [
-    "RUNNING",
-    "COMPLETE",
-    "FAILED"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `observatory_messages` in responses.
  */
-export const observatory_messages_output: JsonSchema = {
+export const observatory_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -213,16 +215,17 @@ export const observatory_messages_output: JsonSchema = {
 /**
  * The schema of `observatory_page_test` in responses.
  */
-export const observatory_page_test_output: JsonSchema = {
+export const observatory_page_test: JsonSchema = {
   "properties": {
     "date": {
-      "$ref": "#/$defs/observatory_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "desktopReport": {
       "$ref": "#/$defs/observatory_lighthouse_report"
     },
     "id": {
-      "$ref": "#/$defs/observatory_uuid"
+      "type": "string"
     },
     "mobileReport": {
       "$ref": "#/$defs/observatory_lighthouse_report"
@@ -231,74 +234,15 @@ export const observatory_page_test_output: JsonSchema = {
       "$ref": "#/$defs/observatory_labeled_region"
     },
     "scheduleFrequency": {
-      "$ref": "#/$defs/observatory_schedule_frequency"
+      "enum": [
+        "DAILY",
+        "WEEKLY"
+      ],
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/observatory_url"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `observatory_region` in responses.
- */
-export const observatory_region_output: JsonSchema = {
-  "enum": [
-    "asia-east1",
-    "asia-northeast1",
-    "asia-northeast2",
-    "asia-south1",
-    "asia-southeast1",
-    "australia-southeast1",
-    "europe-north1",
-    "europe-southwest1",
-    "europe-west1",
-    "europe-west2",
-    "europe-west3",
-    "europe-west4",
-    "europe-west8",
-    "europe-west9",
-    "me-west1",
-    "southamerica-east1",
-    "us-central1",
-    "us-east1",
-    "us-east4",
-    "us-south1",
-    "us-west1"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_schedule_frequency` in responses.
- */
-export const observatory_schedule_frequency_output: JsonSchema = {
-  "enum": [
-    "DAILY",
-    "WEEKLY"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_timestamp` in responses.
- */
-export const observatory_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_url` in responses.
- */
-export const observatory_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_uuid` in responses.
- */
-export const observatory_uuid_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/speed/pages/outputs.ts b/src/generated/forge-mcp/speed/pages/outputs.ts
index ff14bce38..151cfe376 100644
--- a/src/generated/forge-mcp/speed/pages/outputs.ts
+++ b/src/generated/forge-mcp/speed/pages/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `observatory_api-response-collection` in responses.
  */
-export const observatory_api_response_collection_output: JsonSchema = {
+export const observatory_api$$response$$collection: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/observatory_messages"
@@ -29,7 +29,7 @@ export const observatory_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `observatory_pages-response-collection` in responses.
  */
-export const observatory_pages_response_collection_output: JsonSchema = {
+export const observatory_pages$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/observatory_api-response-collection"
@@ -43,7 +43,11 @@ export const observatory_pages_response_collection_output: JsonSchema = {
                 "$ref": "#/$defs/observatory_labeled_region"
               },
               "scheduleFrequency": {
-                "$ref": "#/$defs/observatory_schedule_frequency"
+                "enum": [
+                  "DAILY",
+                  "WEEKLY"
+                ],
+                "type": "string"
               },
               "tests": {
                 "items": {
@@ -52,7 +56,7 @@ export const observatory_pages_response_collection_output: JsonSchema = {
                 "type": "array"
               },
               "url": {
-                "$ref": "#/$defs/observatory_url"
+                "type": "string"
               }
             },
             "type": "object"
@@ -68,7 +72,7 @@ export const observatory_pages_response_collection_output: JsonSchema = {
 /**
  * The schema of `observatory_trend` in responses.
  */
-export const observatory_trend_output: JsonSchema = {
+export const observatory_trend: JsonSchema = {
   "properties": {
     "cls": {
       "items": {
@@ -181,7 +185,7 @@ export const observatory_trend_output: JsonSchema = {
 /**
  * The schema of `observatory_trend-response` in responses.
  */
-export const observatory_trend_response_output: JsonSchema = {
+export const observatory_trend$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/observatory_api-response-single"
diff --git a/src/generated/forge-mcp/speed/pages/tests/outputs.ts b/src/generated/forge-mcp/speed/pages/tests/outputs.ts
index c127019ec..5a3aa9e82 100644
--- a/src/generated/forge-mcp/speed/pages/tests/outputs.ts
+++ b/src/generated/forge-mcp/speed/pages/tests/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `observatory_page-test-response-collection` in responses.
  */
-export const observatory_page_test_response_collection_output: JsonSchema = {
+export const observatory_page$$test$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/observatory_api-response-collection"
@@ -36,7 +36,7 @@ export const observatory_page_test_response_collection_output: JsonSchema = {
 /**
  * The schema of `observatory_page-test-response-single` in responses.
  */
-export const observatory_page_test_response_single_output: JsonSchema = {
+export const observatory_page$$test$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/observatory_api-response-single"
@@ -55,7 +55,7 @@ export const observatory_page_test_response_single_output: JsonSchema = {
 /**
  * The schema of `observatory_result_info` in responses.
  */
-export const observatory_result_info_output: JsonSchema = {
+export const observatory_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/speed/pages/tests/tools.ts b/src/generated/forge-mcp/speed/pages/tests/tools.ts
index f1b642a8d..d826b4c31 100644
--- a/src/generated/forge-mcp/speed/pages/tests/tools.ts
+++ b/src/generated/forge-mcp/speed/pages/tests/tools.ts
@@ -1,34 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  observatory_api_response_common_failure_output,
-  observatory_api_response_single_output,
-  observatory_count_response_output,
-  observatory_device_type_output,
-  observatory_labeled_region_output,
-  observatory_lighthouse_error_code_output,
-  observatory_lighthouse_report_output,
-  observatory_lighthouse_state_output,
-  observatory_messages_output,
-  observatory_page_test_output,
-  observatory_region_output,
-  observatory_schedule_frequency_output,
-  observatory_timestamp_output,
-  observatory_url_output,
-  observatory_uuid_output,
+  observatory_api$$response$$common$$failure,
+  observatory_api$$response$$single,
+  observatory_count$$response,
+  observatory_labeled_region,
+  observatory_lighthouse_report,
+  observatory_messages,
+  observatory_page_test,
 } from "../../outputs.js";
+import { observatory_api$$response$$collection } from "../outputs.js";
 import {
-  observatory_identifier,
-  observatory_region,
-  observatory_url,
-} from "../../schemas.js";
-import { observatory_api_response_collection_output } from "../outputs.js";
-import {
-  observatory_page_test_response_collection_output,
-  observatory_page_test_response_single_output,
-  observatory_result_info_output,
+  observatory_page$$test$$response$$collection,
+  observatory_page$$test$$response$$single,
+  observatory_result_info,
 } from "./outputs.js";
 
 /**
@@ -38,7 +25,7 @@ export const tools: readonly Tool[] = [
   {
     name: "speed_pages_tests_create",
     title: "Start page test",
-    description: "Starts a test for a specific webpage, in a specific region.",
+    description: "Starts a test for a specific webpage, in a specific region.\n\nPOST /zones/{zone_id}/speed_api/pages/{url}/tests",
     inputSchema: {
       type: "object",
       properties: {
@@ -47,7 +34,31 @@ export const tools: readonly Tool[] = [
             "region": {
               "allOf": [
                 {
-                  "$ref": "#/$defs/observatory_region"
+                  "description": "A test region.",
+                  "enum": [
+                    "asia-east1",
+                    "asia-northeast1",
+                    "asia-northeast2",
+                    "asia-south1",
+                    "asia-southeast1",
+                    "australia-southeast1",
+                    "europe-north1",
+                    "europe-southwest1",
+                    "europe-west1",
+                    "europe-west2",
+                    "europe-west3",
+                    "europe-west4",
+                    "europe-west8",
+                    "europe-west9",
+                    "me-west1",
+                    "southamerica-east1",
+                    "us-central1",
+                    "us-east1",
+                    "us-east4",
+                    "us-south1",
+                    "us-west1"
+                  ],
+                  "type": "string"
                 },
                 {
                   "type": "string"
@@ -57,42 +68,39 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "url": {
-          "$ref": "#/$defs/observatory_url",
-          "description": "A URL."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "url": {
+              "description": "A URL.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "url"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "url"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-        "observatory_region": observatory_region,
-        "observatory_url": observatory_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_page-test-response-single",
       $defs: {
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page-test-response-single": observatory_page_test_response_single_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page-test-response-single": observatory_page$$test$$response$$single,
+        "observatory_page_test": observatory_page_test,
       },
     },
     annotations: {
@@ -125,21 +133,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page-test-response-single": observatory_page_test_response_single_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page-test-response-single": observatory_page$$test$$response$$single,
+        "observatory_page_test": observatory_page_test,
       },
     },
     request: (args) => ({
@@ -150,45 +150,80 @@ export const tools: readonly Tool[] = [
   {
     name: "speed_pages_tests_delete",
     title: "Delete all page tests",
-    description: "Deletes all tests for a specific webpage from a specific region. Deleted tests are still counted as part of the quota.",
+    description: "Deletes all tests for a specific webpage from a specific region. Deleted tests are still counted as part of the quota.\n\nDELETE /zones/{zone_id}/speed_api/pages/{url}/tests",
     inputSchema: {
       type: "object",
       properties: {
-        "region": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/observatory_region"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "url": {
+              "description": "A URL.",
+              "type": "string"
             },
-            {
+            "zone_id": {
+              "description": "Identifier.",
               "type": "string"
             }
-          ]
-        },
-        "url": {
-          "$ref": "#/$defs/observatory_url",
-          "description": "A URL."
+          },
+          "required": [
+            "zone_id",
+            "url"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "region": {
+              "allOf": [
+                {
+                  "description": "A test region.",
+                  "enum": [
+                    "asia-east1",
+                    "asia-northeast1",
+                    "asia-northeast2",
+                    "asia-south1",
+                    "asia-southeast1",
+                    "australia-southeast1",
+                    "europe-north1",
+                    "europe-southwest1",
+                    "europe-west1",
+                    "europe-west2",
+                    "europe-west3",
+                    "europe-west4",
+                    "europe-west8",
+                    "europe-west9",
+                    "me-west1",
+                    "southamerica-east1",
+                    "us-central1",
+                    "us-east1",
+                    "us-east4",
+                    "us-south1",
+                    "us-west1"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "url"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-        "observatory_region": observatory_region,
-        "observatory_url": observatory_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_count-response",
       $defs: {
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_count-response": observatory_count_response_output,
-        "observatory_messages": observatory_messages_output,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_count-response": observatory_count$$response,
+        "observatory_messages": observatory_messages,
       },
     },
     annotations: {
@@ -221,65 +256,63 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_count-response": observatory_count_response_output,
-        "observatory_messages": observatory_messages_output,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_count-response": observatory_count$$response,
+        "observatory_messages": observatory_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/speed_api/pages/${pathParam(args, "url")}/tests`,
       query: [
-        ["region", args["region"], true],
+        ["region", param(args, "query", "region"), true],
       ],
     }),
   },
   {
     name: "speed_pages_tests_get",
     title: "Get a page test result",
-    description: "Retrieves the result of a specific test.",
+    description: "Retrieves the result of a specific test.\n\nGET /zones/{zone_id}/speed_api/pages/{url}/tests/{test_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "test_id": {
-          "type": "string"
-        },
-        "url": {
-          "$ref": "#/$defs/observatory_url",
-          "description": "A URL."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "test_id": {
+              "type": "string"
+            },
+            "url": {
+              "description": "A URL.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "url",
+            "test_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "url",
-        "test_id"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-        "observatory_url": observatory_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_page-test-response-single",
       $defs: {
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page-test-response-single": observatory_page_test_response_single_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page-test-response-single": observatory_page$$test$$response$$single,
+        "observatory_page_test": observatory_page_test,
       },
     },
     annotations: {
@@ -313,21 +346,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page-test-response-single": observatory_page_test_response_single_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page-test-response-single": observatory_page$$test$$response$$single,
+        "observatory_page_test": observatory_page_test,
       },
     },
     request: (args) => ({
@@ -337,65 +362,92 @@ export const tools: readonly Tool[] = [
   {
     name: "speed_pages_tests_list",
     title: "List page test history",
-    description: "Test history (list of tests) for a specific webpage.",
+    description: "Test history (list of tests) for a specific webpage.\n\nGET /zones/{zone_id}/speed_api/pages/{url}/tests",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "type": "integer"
-        },
-        "region": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/observatory_region"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "url": {
+              "description": "A URL.",
+              "type": "string"
             },
-            {
+            "zone_id": {
+              "description": "Identifier.",
               "type": "string"
             }
-          ]
-        },
-        "url": {
-          "$ref": "#/$defs/observatory_url",
-          "description": "A URL."
+          },
+          "required": [
+            "zone_id",
+            "url"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "type": "integer"
+            },
+            "region": {
+              "allOf": [
+                {
+                  "description": "A test region.",
+                  "enum": [
+                    "asia-east1",
+                    "asia-northeast1",
+                    "asia-northeast2",
+                    "asia-south1",
+                    "asia-southeast1",
+                    "australia-southeast1",
+                    "europe-north1",
+                    "europe-southwest1",
+                    "europe-west1",
+                    "europe-west2",
+                    "europe-west3",
+                    "europe-west4",
+                    "europe-west8",
+                    "europe-west9",
+                    "me-west1",
+                    "southamerica-east1",
+                    "us-central1",
+                    "us-east1",
+                    "us-east4",
+                    "us-south1",
+                    "us-west1"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "url"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-        "observatory_region": observatory_region,
-        "observatory_url": observatory_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_page-test-response-collection",
       $defs: {
-        "observatory_api-response-collection": observatory_api_response_collection_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page-test-response-collection": observatory_page_test_response_collection_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_region": observatory_region_output,
-        "observatory_result_info": observatory_result_info_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-collection": observatory_api$$response$$collection,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page-test-response-collection": observatory_page$$test$$response$$collection,
+        "observatory_page_test": observatory_page_test,
+        "observatory_result_info": observatory_result_info,
       },
     },
     annotations: {
@@ -429,30 +481,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-collection": observatory_api_response_collection_output,
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page-test-response-collection": observatory_page_test_response_collection_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_region": observatory_region_output,
-        "observatory_result_info": observatory_result_info_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-collection": observatory_api$$response$$collection,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page-test-response-collection": observatory_page$$test$$response$$collection,
+        "observatory_page_test": observatory_page_test,
+        "observatory_result_info": observatory_result_info,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/speed_api/pages/${pathParam(args, "url")}/tests`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["region", args["region"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["region", param(args, "query", "region"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/speed/pages/tools.ts b/src/generated/forge-mcp/speed/pages/tools.ts
index 8608c64d7..f4ab03913 100644
--- a/src/generated/forge-mcp/speed/pages/tools.ts
+++ b/src/generated/forge-mcp/speed/pages/tools.ts
@@ -1,35 +1,20 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  observatory_api_response_common_failure_output,
-  observatory_api_response_single_output,
-  observatory_device_type_output,
-  observatory_labeled_region_output,
-  observatory_lighthouse_error_code_output,
-  observatory_lighthouse_report_output,
-  observatory_lighthouse_state_output,
-  observatory_messages_output,
-  observatory_page_test_output,
-  observatory_region_output,
-  observatory_schedule_frequency_output,
-  observatory_timestamp_output,
-  observatory_url_output,
-  observatory_uuid_output,
+  observatory_api$$response$$common$$failure,
+  observatory_api$$response$$single,
+  observatory_labeled_region,
+  observatory_lighthouse_report,
+  observatory_messages,
+  observatory_page_test,
 } from "../outputs.js";
 import {
-  observatory_device_type,
-  observatory_identifier,
-  observatory_region,
-  observatory_timestamp,
-  observatory_url,
-} from "../schemas.js";
-import {
-  observatory_api_response_collection_output,
-  observatory_pages_response_collection_output,
-  observatory_trend_output,
-  observatory_trend_response_output,
+  observatory_api$$response$$collection,
+  observatory_pages$$response$$collection,
+  observatory_trend,
+  observatory_trend$$response,
 } from "./outputs.js";
 
 /**
@@ -39,39 +24,38 @@ export const tools: readonly Tool[] = [
   {
     name: "speed_pages_list",
     title: "List tested webpages",
-    description: "Lists all webpages which have been tested.",
+    description: "Lists all webpages which have been tested.\n\nGET /zones/{zone_id}/speed_api/pages",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_pages-response-collection",
       $defs: {
-        "observatory_api-response-collection": observatory_api_response_collection_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_pages-response-collection": observatory_pages_response_collection_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-collection": observatory_api$$response$$collection,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page_test": observatory_page_test,
+        "observatory_pages-response-collection": observatory_pages$$response$$collection,
       },
     },
     annotations: {
@@ -105,21 +89,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-collection": observatory_api_response_collection_output,
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_pages-response-collection": observatory_pages_response_collection_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-collection": observatory_api$$response$$collection,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page_test": observatory_page_test,
+        "observatory_pages-response-collection": observatory_pages$$response$$collection,
       },
     },
     request: (args) => ({
@@ -129,65 +105,106 @@ export const tools: readonly Tool[] = [
   {
     name: "speed_pages_trend",
     title: "List core web vital metrics trend",
-    description: "Lists the core web vital metrics trend over time for a specific page.",
+    description: "Lists the core web vital metrics trend over time for a specific page.\n\nGET /zones/{zone_id}/speed_api/pages/{url}/trend",
     inputSchema: {
       type: "object",
       properties: {
-        "device_type": {
-          "$ref": "#/$defs/observatory_device_type",
-          "description": "The type of device."
-        },
-        "end": {
-          "$ref": "#/$defs/observatory_timestamp"
-        },
-        "metrics": {
-          "description": "A comma-separated list of metrics to include in the results.",
-          "type": "string"
-        },
-        "region": {
-          "$ref": "#/$defs/observatory_region",
-          "description": "A test region."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "url": {
+              "description": "A URL.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "url"
+          ],
+          "type": "object"
         },
-        "start": {
-          "$ref": "#/$defs/observatory_timestamp"
-        },
-        "tz": {
-          "description": "The timezone of the start and end timestamps.",
-          "type": "string"
-        },
-        "url": {
-          "$ref": "#/$defs/observatory_url",
-          "description": "A URL."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "deviceType": {
+              "description": "The type of device.",
+              "enum": [
+                "DESKTOP",
+                "MOBILE"
+              ],
+              "type": "string"
+            },
+            "end": {
+              "format": "date-time",
+              "type": "string"
+            },
+            "metrics": {
+              "description": "A comma-separated list of metrics to include in the results.",
+              "type": "string"
+            },
+            "region": {
+              "description": "A test region.",
+              "enum": [
+                "asia-east1",
+                "asia-northeast1",
+                "asia-northeast2",
+                "asia-south1",
+                "asia-southeast1",
+                "australia-southeast1",
+                "europe-north1",
+                "europe-southwest1",
+                "europe-west1",
+                "europe-west2",
+                "europe-west3",
+                "europe-west4",
+                "europe-west8",
+                "europe-west9",
+                "me-west1",
+                "southamerica-east1",
+                "us-central1",
+                "us-east1",
+                "us-east4",
+                "us-south1",
+                "us-west1"
+              ],
+              "type": "string"
+            },
+            "start": {
+              "format": "date-time",
+              "type": "string"
+            },
+            "tz": {
+              "description": "The timezone of the start and end timestamps.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "region",
+            "deviceType",
+            "start",
+            "tz",
+            "metrics"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "url",
-        "region",
-        "device_type",
-        "start",
-        "tz",
-        "metrics"
+        "path",
+        "query"
       ],
-      $defs: {
-        "observatory_device_type": observatory_device_type,
-        "observatory_identifier": observatory_identifier,
-        "observatory_region": observatory_region,
-        "observatory_timestamp": observatory_timestamp,
-        "observatory_url": observatory_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_trend-response",
       $defs: {
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_trend": observatory_trend_output,
-        "observatory_trend-response": observatory_trend_response_output,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_messages": observatory_messages,
+        "observatory_trend": observatory_trend,
+        "observatory_trend-response": observatory_trend$$response,
       },
     },
     annotations: {
@@ -221,22 +238,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_trend": observatory_trend_output,
-        "observatory_trend-response": observatory_trend_response_output,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_messages": observatory_messages,
+        "observatory_trend": observatory_trend,
+        "observatory_trend-response": observatory_trend$$response,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/speed_api/pages/${pathParam(args, "url")}/trend`,
       query: [
-        ["region", args["region"], true],
-        ["deviceType", args["device_type"], true],
-        ["start", args["start"], true],
-        ["end", args["end"], true],
-        ["tz", args["tz"], true],
-        ["metrics", args["metrics"], true],
+        ["region", param(args, "query", "region"), true],
+        ["deviceType", param(args, "query", "deviceType"), true],
+        ["start", param(args, "query", "start"), true],
+        ["end", param(args, "query", "end"), true],
+        ["tz", param(args, "query", "tz"), true],
+        ["metrics", param(args, "query", "metrics"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/speed/schedule/outputs.ts b/src/generated/forge-mcp/speed/schedule/outputs.ts
index 16326d08d..7a8cadde4 100644
--- a/src/generated/forge-mcp/speed/schedule/outputs.ts
+++ b/src/generated/forge-mcp/speed/schedule/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `observatory_create-schedule-response` in responses.
  */
-export const observatory_create_schedule_response_output: JsonSchema = {
+export const observatory_create$$schedule$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/observatory_api-response-single"
@@ -33,16 +33,43 @@ export const observatory_create_schedule_response_output: JsonSchema = {
 /**
  * The schema of `observatory_schedule` in responses.
  */
-export const observatory_schedule_output: JsonSchema = {
+export const observatory_schedule: JsonSchema = {
   "properties": {
     "frequency": {
-      "$ref": "#/$defs/observatory_schedule_frequency"
+      "enum": [
+        "DAILY",
+        "WEEKLY"
+      ],
+      "type": "string"
     },
     "region": {
-      "$ref": "#/$defs/observatory_region"
+      "enum": [
+        "asia-east1",
+        "asia-northeast1",
+        "asia-northeast2",
+        "asia-south1",
+        "asia-southeast1",
+        "australia-southeast1",
+        "europe-north1",
+        "europe-southwest1",
+        "europe-west1",
+        "europe-west2",
+        "europe-west3",
+        "europe-west4",
+        "europe-west8",
+        "europe-west9",
+        "me-west1",
+        "southamerica-east1",
+        "us-central1",
+        "us-east1",
+        "us-east4",
+        "us-south1",
+        "us-west1"
+      ],
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/observatory_url"
+      "type": "string"
     }
   },
   "type": "object"
@@ -51,7 +78,7 @@ export const observatory_schedule_output: JsonSchema = {
 /**
  * The schema of `observatory_schedule-response-single` in responses.
  */
-export const observatory_schedule_response_single_output: JsonSchema = {
+export const observatory_schedule$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/observatory_api-response-single"
diff --git a/src/generated/forge-mcp/speed/schedule/tools.ts b/src/generated/forge-mcp/speed/schedule/tools.ts
index 6871aa181..d63f60747 100644
--- a/src/generated/forge-mcp/speed/schedule/tools.ts
+++ b/src/generated/forge-mcp/speed/schedule/tools.ts
@@ -1,34 +1,20 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  observatory_api_response_common_failure_output,
-  observatory_api_response_single_output,
-  observatory_count_response_output,
-  observatory_device_type_output,
-  observatory_labeled_region_output,
-  observatory_lighthouse_error_code_output,
-  observatory_lighthouse_report_output,
-  observatory_lighthouse_state_output,
-  observatory_messages_output,
-  observatory_page_test_output,
-  observatory_region_output,
-  observatory_schedule_frequency_output,
-  observatory_timestamp_output,
-  observatory_url_output,
-  observatory_uuid_output,
+  observatory_api$$response$$common$$failure,
+  observatory_api$$response$$single,
+  observatory_count$$response,
+  observatory_labeled_region,
+  observatory_lighthouse_report,
+  observatory_messages,
+  observatory_page_test,
 } from "../outputs.js";
 import {
-  observatory_identifier,
-  observatory_region,
-  observatory_schedule_frequency,
-  observatory_url,
-} from "../schemas.js";
-import {
-  observatory_create_schedule_response_output,
-  observatory_schedule_output,
-  observatory_schedule_response_single_output,
+  observatory_create$$schedule$$response,
+  observatory_schedule,
+  observatory_schedule$$response$$single,
 } from "./outputs.js";
 
 /**
@@ -38,62 +24,92 @@ export const tools: readonly Tool[] = [
   {
     name: "speed_schedule_create",
     title: "Create scheduled page test",
-    description: "Creates a scheduled test for a page.",
+    description: "Creates a scheduled test for a page.\n\nPOST /zones/{zone_id}/speed_api/schedule/{url}",
     inputSchema: {
       type: "object",
       properties: {
-        "frequency": {
-          "$ref": "#/$defs/observatory_schedule_frequency",
-          "description": "The frequency of the scheduled test. Defaults to WEEKLY for free plans, DAILY for paid plans."
-        },
-        "region": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/observatory_region"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "url": {
+              "description": "A URL.",
+              "type": "string"
             },
-            {
+            "zone_id": {
+              "description": "Identifier.",
               "type": "string"
             }
-          ]
+          },
+          "required": [
+            "zone_id",
+            "url"
+          ],
+          "type": "object"
         },
-        "url": {
-          "$ref": "#/$defs/observatory_url",
-          "description": "A URL."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "frequency": {
+              "description": "The frequency of the scheduled test. Defaults to WEEKLY for free plans, DAILY for paid plans.",
+              "enum": [
+                "DAILY",
+                "WEEKLY"
+              ],
+              "type": "string"
+            },
+            "region": {
+              "allOf": [
+                {
+                  "description": "A test region.",
+                  "enum": [
+                    "asia-east1",
+                    "asia-northeast1",
+                    "asia-northeast2",
+                    "asia-south1",
+                    "asia-southeast1",
+                    "australia-southeast1",
+                    "europe-north1",
+                    "europe-southwest1",
+                    "europe-west1",
+                    "europe-west2",
+                    "europe-west3",
+                    "europe-west4",
+                    "europe-west8",
+                    "europe-west9",
+                    "me-west1",
+                    "southamerica-east1",
+                    "us-central1",
+                    "us-east1",
+                    "us-east4",
+                    "us-south1",
+                    "us-west1"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "url"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-        "observatory_region": observatory_region,
-        "observatory_schedule_frequency": observatory_schedule_frequency,
-        "observatory_url": observatory_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_create-schedule-response",
       $defs: {
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_create-schedule-response": observatory_create_schedule_response_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule": observatory_schedule_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_create-schedule-response": observatory_create$$schedule$$response,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page_test": observatory_page_test,
+        "observatory_schedule": observatory_schedule,
       },
     },
     annotations: {
@@ -126,74 +142,101 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_create-schedule-response": observatory_create_schedule_response_output,
-        "observatory_device_type": observatory_device_type_output,
-        "observatory_labeled_region": observatory_labeled_region_output,
-        "observatory_lighthouse_error_code": observatory_lighthouse_error_code_output,
-        "observatory_lighthouse_report": observatory_lighthouse_report_output,
-        "observatory_lighthouse_state": observatory_lighthouse_state_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_page_test": observatory_page_test_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule": observatory_schedule_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_timestamp": observatory_timestamp_output,
-        "observatory_url": observatory_url_output,
-        "observatory_uuid": observatory_uuid_output,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_create-schedule-response": observatory_create$$schedule$$response,
+        "observatory_labeled_region": observatory_labeled_region,
+        "observatory_lighthouse_report": observatory_lighthouse_report,
+        "observatory_messages": observatory_messages,
+        "observatory_page_test": observatory_page_test,
+        "observatory_schedule": observatory_schedule,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/speed_api/schedule/${pathParam(args, "url")}`,
       query: [
-        ["region", args["region"], true],
-        ["frequency", args["frequency"], true],
+        ["region", param(args, "query", "region"), true],
+        ["frequency", param(args, "query", "frequency"), true],
       ],
     }),
   },
   {
     name: "speed_schedule_delete",
     title: "Delete scheduled page test",
-    description: "Deletes a scheduled test for a page.",
+    description: "Deletes a scheduled test for a page.\n\nDELETE /zones/{zone_id}/speed_api/schedule/{url}",
     inputSchema: {
       type: "object",
       properties: {
-        "region": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/observatory_region"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "url": {
+              "description": "A URL.",
+              "type": "string"
             },
-            {
+            "zone_id": {
+              "description": "Identifier.",
               "type": "string"
             }
-          ]
+          },
+          "required": [
+            "zone_id",
+            "url"
+          ],
+          "type": "object"
         },
-        "url": {
-          "$ref": "#/$defs/observatory_url",
-          "description": "A URL."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "region": {
+              "allOf": [
+                {
+                  "description": "A test region.",
+                  "enum": [
+                    "asia-east1",
+                    "asia-northeast1",
+                    "asia-northeast2",
+                    "asia-south1",
+                    "asia-southeast1",
+                    "australia-southeast1",
+                    "europe-north1",
+                    "europe-southwest1",
+                    "europe-west1",
+                    "europe-west2",
+                    "europe-west3",
+                    "europe-west4",
+                    "europe-west8",
+                    "europe-west9",
+                    "me-west1",
+                    "southamerica-east1",
+                    "us-central1",
+                    "us-east1",
+                    "us-east4",
+                    "us-south1",
+                    "us-west1"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "url"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-        "observatory_region": observatory_region,
-        "observatory_url": observatory_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_count-response",
       $defs: {
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_count-response": observatory_count_response_output,
-        "observatory_messages": observatory_messages_output,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_count-response": observatory_count$$response,
+        "observatory_messages": observatory_messages,
       },
     },
     annotations: {
@@ -226,65 +269,97 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_count-response": observatory_count_response_output,
-        "observatory_messages": observatory_messages_output,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_count-response": observatory_count$$response,
+        "observatory_messages": observatory_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/speed_api/schedule/${pathParam(args, "url")}`,
       query: [
-        ["region", args["region"], true],
+        ["region", param(args, "query", "region"), true],
       ],
     }),
   },
   {
     name: "speed_schedule_get",
     title: "Get a page test schedule",
-    description: "Retrieves the test schedule for a page in a specific region.",
+    description: "Retrieves the test schedule for a page in a specific region.\n\nGET /zones/{zone_id}/speed_api/schedule/{url}",
     inputSchema: {
       type: "object",
       properties: {
-        "region": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/observatory_region"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "url": {
+              "description": "A URL.",
+              "type": "string"
             },
-            {
+            "zone_id": {
+              "description": "Identifier.",
               "type": "string"
             }
-          ]
+          },
+          "required": [
+            "zone_id",
+            "url"
+          ],
+          "type": "object"
         },
-        "url": {
-          "$ref": "#/$defs/observatory_url",
-          "description": "A URL."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/observatory_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "region": {
+              "allOf": [
+                {
+                  "description": "A test region.",
+                  "enum": [
+                    "asia-east1",
+                    "asia-northeast1",
+                    "asia-northeast2",
+                    "asia-south1",
+                    "asia-southeast1",
+                    "australia-southeast1",
+                    "europe-north1",
+                    "europe-southwest1",
+                    "europe-west1",
+                    "europe-west2",
+                    "europe-west3",
+                    "europe-west4",
+                    "europe-west8",
+                    "europe-west9",
+                    "me-west1",
+                    "southamerica-east1",
+                    "us-central1",
+                    "us-east1",
+                    "us-east4",
+                    "us-south1",
+                    "us-west1"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "url"
+        "path"
       ],
-      $defs: {
-        "observatory_identifier": observatory_identifier,
-        "observatory_region": observatory_region,
-        "observatory_url": observatory_url,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/observatory_schedule-response-single",
       $defs: {
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule": observatory_schedule_output,
-        "observatory_schedule-response-single": observatory_schedule_response_single_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_url": observatory_url_output,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_messages": observatory_messages,
+        "observatory_schedule": observatory_schedule,
+        "observatory_schedule-response-single": observatory_schedule$$response$$single,
       },
     },
     annotations: {
@@ -318,20 +393,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "observatory_api-response-common-failure": observatory_api_response_common_failure_output,
-        "observatory_api-response-single": observatory_api_response_single_output,
-        "observatory_messages": observatory_messages_output,
-        "observatory_region": observatory_region_output,
-        "observatory_schedule": observatory_schedule_output,
-        "observatory_schedule-response-single": observatory_schedule_response_single_output,
-        "observatory_schedule_frequency": observatory_schedule_frequency_output,
-        "observatory_url": observatory_url_output,
+        "observatory_api-response-common-failure": observatory_api$$response$$common$$failure,
+        "observatory_api-response-single": observatory_api$$response$$single,
+        "observatory_messages": observatory_messages,
+        "observatory_schedule": observatory_schedule,
+        "observatory_schedule-response-single": observatory_schedule$$response$$single,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/speed_api/schedule/${pathParam(args, "url")}`,
       query: [
-        ["region", args["region"], true],
+        ["region", param(args, "query", "region"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/speed/schemas.ts b/src/generated/forge-mcp/speed/schemas.ts
deleted file mode 100644
index 5c34c55b7..000000000
--- a/src/generated/forge-mcp/speed/schemas.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `observatory_device_type`.
- */
-export const observatory_device_type: JsonSchema = {
-  "description": "The type of device.",
-  "enum": [
-    "DESKTOP",
-    "MOBILE"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_identifier`.
- */
-export const observatory_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_region`.
- */
-export const observatory_region: JsonSchema = {
-  "description": "A test region.",
-  "enum": [
-    "asia-east1",
-    "asia-northeast1",
-    "asia-northeast2",
-    "asia-south1",
-    "asia-southeast1",
-    "australia-southeast1",
-    "europe-north1",
-    "europe-southwest1",
-    "europe-west1",
-    "europe-west2",
-    "europe-west3",
-    "europe-west4",
-    "europe-west8",
-    "europe-west9",
-    "me-west1",
-    "southamerica-east1",
-    "us-central1",
-    "us-east1",
-    "us-east4",
-    "us-south1",
-    "us-west1"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_schedule_frequency`.
- */
-export const observatory_schedule_frequency: JsonSchema = {
-  "description": "The frequency of the test.",
-  "enum": [
-    "DAILY",
-    "WEEKLY"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_timestamp`.
- */
-export const observatory_timestamp: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `observatory_url`.
- */
-export const observatory_url: JsonSchema = {
-  "description": "A URL.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/sql/tools.ts b/src/generated/forge-mcp/sql/tools.ts
index 349b1aec6..a5fe29053 100644
--- a/src/generated/forge-mcp/sql/tools.ts
+++ b/src/generated/forge-mcp/sql/tools.ts
@@ -1,29 +1,28 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../_/tool.js";
+import { type Tool, param } from "../_/tool.js";
 import {
-  analytics_sql_ApiErrorResponse_output,
-  analytics_sql_Attribute_output,
-  analytics_sql_ClickHouseJsonQueryResponse_output,
-  analytics_sql_CustomAttribute_output,
-  analytics_sql_DatasetAvailability_output,
-  analytics_sql_GatewayApiErrorResponse_output,
-  analytics_sql_IntrospectionColumn_output,
-  analytics_sql_IntrospectionDatasetKind_output,
-  analytics_sql_IntrospectionDataset_output,
-  analytics_sql_IntrospectionResponse_output,
-  analytics_sql_IntrospectionSampling_output,
-  analytics_sql_LogExplorerQueryResponse_output,
-  analytics_sql_SqlQueryResponse_output,
-  analytics_sql_SqlQueryStatistics_output,
+  analytics$$sql_ApiErrorResponse,
+  analytics$$sql_Attribute,
+  analytics$$sql_ClickHouseJsonQueryResponse,
+  analytics$$sql_CustomAttribute,
+  analytics$$sql_DatasetAvailability,
+  analytics$$sql_GatewayApiErrorResponse,
+  analytics$$sql_IntrospectionColumn,
+  analytics$$sql_IntrospectionDataset,
+  analytics$$sql_IntrospectionDatasetKind,
+  analytics$$sql_IntrospectionResponse,
+  analytics$$sql_LogExplorerQueryResponse,
+  analytics$$sql_SqlQueryResponse,
+  analytics$$sql_SqlQueryStatistics,
 } from "../outputs.js";
 import {
-  analytics_sql_SqlQueryAccountScope,
-  analytics_sql_SqlQueryRequest,
-  analytics_sql_SqlQueryScope,
-  analytics_sql_SqlQueryTimeRange,
-  analytics_sql_SqlQueryZoneScope,
+  analytics$$sql_SqlQueryAccountScope,
+  analytics$$sql_SqlQueryRequest,
+  analytics$$sql_SqlQueryScope,
+  analytics$$sql_SqlQueryTimeRange,
+  analytics$$sql_SqlQueryZoneScope,
 } from "../schemas.js";
 
 /**
@@ -33,59 +32,68 @@ export const tools: readonly Tool[] = [
   {
     name: "sql_datasets",
     title: "List available analytics datasets",
-    description: "Returns the analytics dataset catalogue. By default, the response contains dataset names, titles, categories, descriptions, kinds, and hidden flags. Set `include_columns` to include each dataset's column names, descriptions, data types, and hidden flags. The caller must have Account Analytics Read permission on the account identified by `account_tag`. Dataset names, descriptions, and columns are the same for every authorized account. When `include_custom_attributes` or `include_attributes` is set, the response also includes attribute names and types discovered from that account's own data, which legitimately differs per caller. `attributes` is a replacement for `custom_attributes` that will eventually be removed; until then, set either flag independently to receive the corresponding field. `hidden` marks catalogue entries a client should de-emphasise. It has no effect on access: hidden datasets and columns are returned here and remain fully queryable.\n\nThe catalogue lists the datasets this deployment is able to describe, which is not a fixed list. Some datasets are described by the service that owns them and are listed only where that service is available, so the same account may see a different catalogue in different environments, and datasets may appear or disappear without a change to this API. Clients should query the catalogue rather than hard-coding it, and should not treat a dataset's absence as proof that it does not exist.\n\nWorkers Analytics Engine datasets are named by the account that writes them, so they are discovered from that account's own data rather than from a fixed list. They appear as `events.analyticsEngine.<dataset_name>` and differ per account. A dataset is listed for as long as any of its data is retained, so it does not disappear from the catalogue merely because writes have stopped. An account with a very large number of datasets may receive a truncated list. Set `include_wae=false` to omit them.\n\nLog Explorer datasets are listed only where the account has them, so they differ per account and are not part of the static catalogue. Set `include_lex=false` to omit them.",
+    description: "Returns the analytics dataset catalogue. By default, the response contains dataset names, titles, categories, descriptions, kinds, and hidden flags. Set `include_columns` to include each dataset's column names, descriptions, data types, and hidden flags. The caller must have Account Analytics Read permission on the account identified by `account_tag`. Dataset names, descriptions, and columns are the same for every authorized account. When `include_custom_attributes` or `include_attributes` is set, the response also includes attribute names and types discovered from that account's own data, which legitimately differs per caller. `attributes` is a replacement for `custom_attributes` that will eventually be removed; until then, set either flag independently to receive the corresponding field. `hidden` marks catalogue entries a client should de-emphasise. It has no effect on access: hidden datasets and columns are returned here and remain fully queryable.\n\nThe catalogue lists the datasets this deployment is able to describe, which is not a fixed list. Some datasets are described by the service that owns them and are listed only where that service is available, so the same account may see a different catalogue in different environments, and datasets may appear or disappear without a change to this API. Clients should query the catalogue rather than hard-coding it, and should not treat a dataset's absence as proof that it does not exist.\n\nWorkers Analytics Engine datasets are named by the account that writes them, so they are discovered from that account's own data rather than from a fixed list. They appear as `events.analyticsEngine.<dataset_name>` and differ per account. A dataset is listed for as long as any of its data is retained, so it does not disappear from the catalogue merely because writes have stopped. An account with a very large number of datasets may receive a truncated list. Set `include_wae=false` to omit them.\n\nLog Explorer datasets are listed only where the account has them, so they differ per account and are not part of the static catalogue. Set `include_lex=false` to omit them.\n\nGET /analytics/sql/introspection",
     inputSchema: {
       type: "object",
       properties: {
-        "account_tag": {
-          "description": "Account whose available analytics datasets are returned.",
-          "type": "string"
-        },
-        "dataset_name": {
-          "description": "Return only the dataset with this exact name. An empty value is treated as if the parameter had been omitted, and does not filter the catalogue. A name that matches no dataset in this deployment's catalogue is rejected with `422`; a dataset that exists but is not describable here is rejected identically, so the two cases cannot be told apart.\n\nA Workers Analytics Engine dataset is named in full, as `events.analyticsEngine.<dataset_name>`; the namespace on its own returns every such dataset the account has. A `dataset_name` the account does not have is rejected with `422` like any other unknown name.\n",
-          "type": "string"
-        },
-        "include_attributes": {
-          "default": false,
-          "description": "Include a capped set of attribute names and types observed during the preceding seven days, as `attributes`. Requires a nonempty dataset_name. Replaces `include_custom_attributes`, which is deprecated.\n",
-          "type": "boolean"
-        },
-        "include_columns": {
-          "default": false,
-          "description": "Include column metadata for each returned dataset.",
-          "type": "boolean"
-        },
-        "include_custom_attributes": {
-          "default": false,
-          "description": "Include a capped set of custom attribute names and types observed during the preceding seven days, as `custom_attributes`. Requires a nonempty dataset_name. Deprecated in favor of `include_attributes`.\n",
-          "type": "boolean"
-        },
-        "include_lex": {
-          "default": true,
-          "description": "Include Log Explorer datasets, which are listed only where the account has them. Set to `false` to return only datasets described from the static catalogue, which avoids that lookup.\n",
-          "type": "boolean"
-        },
-        "include_wae": {
-          "default": true,
-          "description": "Include Workers Analytics Engine datasets, which are discovered from the account's own data. Set to `false` to return only datasets described from the static catalogue, which avoids that lookup.\n",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "account_tag": {
+              "description": "Account whose available analytics datasets are returned.",
+              "type": "string"
+            },
+            "dataset_name": {
+              "description": "Return only the dataset with this exact name. An empty value is treated as if the parameter had been omitted, and does not filter the catalogue. A name that matches no dataset in this deployment's catalogue is rejected with `422`; a dataset that exists but is not describable here is rejected identically, so the two cases cannot be told apart.\n\nA Workers Analytics Engine dataset is named in full, as `events.analyticsEngine.<dataset_name>`; the namespace on its own returns every such dataset the account has. A `dataset_name` the account does not have is rejected with `422` like any other unknown name.",
+              "type": "string"
+            },
+            "include_attributes": {
+              "default": false,
+              "description": "Include a capped set of attribute names and types observed during the preceding seven days, as `attributes`. Requires a nonempty dataset_name. Replaces `include_custom_attributes`, which is deprecated.",
+              "type": "boolean"
+            },
+            "include_columns": {
+              "default": false,
+              "description": "Include column metadata for each returned dataset.",
+              "type": "boolean"
+            },
+            "include_custom_attributes": {
+              "default": false,
+              "description": "Include a capped set of custom attribute names and types observed during the preceding seven days, as `custom_attributes`. Requires a nonempty dataset_name. Deprecated in favor of `include_attributes`.",
+              "type": "boolean"
+            },
+            "include_lex": {
+              "default": true,
+              "description": "Include Log Explorer datasets, which are listed only where the account has them. Set to `false` to return only datasets described from the static catalogue, which avoids that lookup.",
+              "type": "boolean"
+            },
+            "include_wae": {
+              "default": true,
+              "description": "Include Workers Analytics Engine datasets, which are discovered from the account's own data. Set to `false` to return only datasets described from the static catalogue, which avoids that lookup.",
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "account_tag"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_tag"
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/analytics-sql_IntrospectionResponse",
       $defs: {
-        "analytics-sql_Attribute": analytics_sql_Attribute_output,
-        "analytics-sql_CustomAttribute": analytics_sql_CustomAttribute_output,
-        "analytics-sql_DatasetAvailability": analytics_sql_DatasetAvailability_output,
-        "analytics-sql_IntrospectionColumn": analytics_sql_IntrospectionColumn_output,
-        "analytics-sql_IntrospectionDataset": analytics_sql_IntrospectionDataset_output,
-        "analytics-sql_IntrospectionDatasetKind": analytics_sql_IntrospectionDatasetKind_output,
-        "analytics-sql_IntrospectionResponse": analytics_sql_IntrospectionResponse_output,
-        "analytics-sql_IntrospectionSampling": analytics_sql_IntrospectionSampling_output,
+        "analytics-sql_Attribute": analytics$$sql_Attribute,
+        "analytics-sql_CustomAttribute": analytics$$sql_CustomAttribute,
+        "analytics-sql_DatasetAvailability": analytics$$sql_DatasetAvailability,
+        "analytics-sql_IntrospectionColumn": analytics$$sql_IntrospectionColumn,
+        "analytics-sql_IntrospectionDataset": analytics$$sql_IntrospectionDataset,
+        "analytics-sql_IntrospectionDatasetKind": analytics$$sql_IntrospectionDatasetKind,
+        "analytics-sql_IntrospectionResponse": analytics$$sql_IntrospectionResponse,
       },
     },
     annotations: {
@@ -123,35 +131,34 @@ export const tools: readonly Tool[] = [
         "503": null
       },
       $defs: {
-        "analytics-sql_ApiErrorResponse": analytics_sql_ApiErrorResponse_output,
-        "analytics-sql_Attribute": analytics_sql_Attribute_output,
-        "analytics-sql_CustomAttribute": analytics_sql_CustomAttribute_output,
-        "analytics-sql_DatasetAvailability": analytics_sql_DatasetAvailability_output,
-        "analytics-sql_GatewayApiErrorResponse": analytics_sql_GatewayApiErrorResponse_output,
-        "analytics-sql_IntrospectionColumn": analytics_sql_IntrospectionColumn_output,
-        "analytics-sql_IntrospectionDataset": analytics_sql_IntrospectionDataset_output,
-        "analytics-sql_IntrospectionDatasetKind": analytics_sql_IntrospectionDatasetKind_output,
-        "analytics-sql_IntrospectionResponse": analytics_sql_IntrospectionResponse_output,
-        "analytics-sql_IntrospectionSampling": analytics_sql_IntrospectionSampling_output,
+        "analytics-sql_ApiErrorResponse": analytics$$sql_ApiErrorResponse,
+        "analytics-sql_Attribute": analytics$$sql_Attribute,
+        "analytics-sql_CustomAttribute": analytics$$sql_CustomAttribute,
+        "analytics-sql_DatasetAvailability": analytics$$sql_DatasetAvailability,
+        "analytics-sql_GatewayApiErrorResponse": analytics$$sql_GatewayApiErrorResponse,
+        "analytics-sql_IntrospectionColumn": analytics$$sql_IntrospectionColumn,
+        "analytics-sql_IntrospectionDataset": analytics$$sql_IntrospectionDataset,
+        "analytics-sql_IntrospectionDatasetKind": analytics$$sql_IntrospectionDatasetKind,
+        "analytics-sql_IntrospectionResponse": analytics$$sql_IntrospectionResponse,
       },
     },
     request: (args) => ({
       path: `/analytics/sql/introspection`,
       query: [
-        ["account_tag", args["account_tag"], true],
-        ["include_columns", args["include_columns"], true],
-        ["include_custom_attributes", args["include_custom_attributes"], true],
-        ["include_attributes", args["include_attributes"], true],
-        ["include_wae", args["include_wae"], true],
-        ["include_lex", args["include_lex"], true],
-        ["dataset_name", args["dataset_name"], true],
+        ["account_tag", param(args, "query", "account_tag"), true],
+        ["include_columns", param(args, "query", "include_columns"), true],
+        ["include_custom_attributes", param(args, "query", "include_custom_attributes"), true],
+        ["include_attributes", param(args, "query", "include_attributes"), true],
+        ["include_wae", param(args, "query", "include_wae"), true],
+        ["include_lex", param(args, "query", "include_lex"), true],
+        ["dataset_name", param(args, "query", "dataset_name"), true],
       ],
     }),
   },
   {
     name: "sql_query",
     title: "Query analytics datasets",
-    description: "Executes a SQL query against the analytics datasets available to the caller. Send either raw SQL or a JSON object containing the query and optional positional or named parameters, time range, and account or zone scope. Raw SQL placeholders can also be bound with query parameters named `param_<name>`. A trailing `FORMAT JSON`, `FORMAT JSONEachRow`, `FORMAT TabSeparated`, or `FORMAT TSV` is supported for all datasets. Without FORMAT, each backend retains its existing default JSON response.",
+    description: "Executes a SQL query against the analytics datasets available to the caller. Send either raw SQL or a JSON object containing the query and optional positional or named parameters, time range, and account or zone scope. Raw SQL placeholders can also be bound with query parameters named `param_<name>`. A trailing `FORMAT JSON`, `FORMAT JSONEachRow`, `FORMAT TabSeparated`, or `FORMAT TSV` is supported for all datasets. Without FORMAT, each backend retains its existing default JSON response.\n\nPOST /analytics/sql",
     inputSchema: {
       type: "object",
       properties: {
@@ -162,12 +169,13 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "analytics-sql_SqlQueryAccountScope": analytics_sql_SqlQueryAccountScope,
-        "analytics-sql_SqlQueryRequest": analytics_sql_SqlQueryRequest,
-        "analytics-sql_SqlQueryScope": analytics_sql_SqlQueryScope,
-        "analytics-sql_SqlQueryTimeRange": analytics_sql_SqlQueryTimeRange,
-        "analytics-sql_SqlQueryZoneScope": analytics_sql_SqlQueryZoneScope,
+        "analytics-sql_SqlQueryAccountScope": analytics$$sql_SqlQueryAccountScope,
+        "analytics-sql_SqlQueryRequest": analytics$$sql_SqlQueryRequest,
+        "analytics-sql_SqlQueryScope": analytics$$sql_SqlQueryScope,
+        "analytics-sql_SqlQueryTimeRange": analytics$$sql_SqlQueryTimeRange,
+        "analytics-sql_SqlQueryZoneScope": analytics$$sql_SqlQueryZoneScope,
       },
     },
     outputSchema: {
@@ -183,10 +191,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "analytics-sql_ClickHouseJsonQueryResponse": analytics_sql_ClickHouseJsonQueryResponse_output,
-        "analytics-sql_LogExplorerQueryResponse": analytics_sql_LogExplorerQueryResponse_output,
-        "analytics-sql_SqlQueryResponse": analytics_sql_SqlQueryResponse_output,
-        "analytics-sql_SqlQueryStatistics": analytics_sql_SqlQueryStatistics_output,
+        "analytics-sql_ClickHouseJsonQueryResponse": analytics$$sql_ClickHouseJsonQueryResponse,
+        "analytics-sql_LogExplorerQueryResponse": analytics$$sql_LogExplorerQueryResponse,
+        "analytics-sql_SqlQueryResponse": analytics$$sql_SqlQueryResponse,
+        "analytics-sql_SqlQueryStatistics": analytics$$sql_SqlQueryStatistics,
       },
     },
     annotations: {
@@ -242,12 +250,12 @@ export const tools: readonly Tool[] = [
         "507": null
       },
       $defs: {
-        "analytics-sql_ApiErrorResponse": analytics_sql_ApiErrorResponse_output,
-        "analytics-sql_ClickHouseJsonQueryResponse": analytics_sql_ClickHouseJsonQueryResponse_output,
-        "analytics-sql_GatewayApiErrorResponse": analytics_sql_GatewayApiErrorResponse_output,
-        "analytics-sql_LogExplorerQueryResponse": analytics_sql_LogExplorerQueryResponse_output,
-        "analytics-sql_SqlQueryResponse": analytics_sql_SqlQueryResponse_output,
-        "analytics-sql_SqlQueryStatistics": analytics_sql_SqlQueryStatistics_output,
+        "analytics-sql_ApiErrorResponse": analytics$$sql_ApiErrorResponse,
+        "analytics-sql_ClickHouseJsonQueryResponse": analytics$$sql_ClickHouseJsonQueryResponse,
+        "analytics-sql_GatewayApiErrorResponse": analytics$$sql_GatewayApiErrorResponse,
+        "analytics-sql_LogExplorerQueryResponse": analytics$$sql_LogExplorerQueryResponse,
+        "analytics-sql_SqlQueryResponse": analytics$$sql_SqlQueryResponse,
+        "analytics-sql_SqlQueryStatistics": analytics$$sql_SqlQueryStatistics,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/analyze/outputs.ts b/src/generated/forge-mcp/ssl/analyze/outputs.ts
index a9dc8f6c5..d9456c3f7 100644
--- a/src/generated/forge-mcp/ssl/analyze/outputs.ts
+++ b/src/generated/forge-mcp/ssl/analyze/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `tls-certificates-and-hostnames_certificate_analyze_response`
  * in responses.
  */
-export const tls_certificates_and_hostnames_certificate_analyze_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_analyze_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
diff --git a/src/generated/forge-mcp/ssl/analyze/tools.ts b/src/generated/forge-mcp/ssl/analyze/tools.ts
index 60347865a..242fdb427 100644
--- a/src/generated/forge-mcp/ssl/analyze/tools.ts
+++ b/src/generated/forge-mcp/ssl/analyze/tools.ts
@@ -3,16 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
-import {
-  tls_certificates_and_hostnames_bundle_method,
-  tls_certificates_and_hostnames_certificate,
-} from "../schemas.js";
-import { tls_certificates_and_hostnames_certificate_analyze_response_output } from "./outputs.js";
+import { tls$$certificates$$and$$hostnames_certificate_analyze_response } from "./outputs.js";
 
 /**
  * The tools of `ssl.analyze`.
@@ -21,45 +16,55 @@ export const tools: readonly Tool[] = [
   {
     name: "ssl_analyze_create",
     title: "Analyze Certificate",
-    description: "Returns the set of hostnames, the signature algorithm, and the expiration date of the certificate.",
+    description: "Returns the set of hostnames, the signature algorithm, and the expiration date of the certificate.\n\nPOST /zones/{zone_id}/ssl/analyze",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "bundle_method": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_bundle_method",
               "default": "ubiquitous",
-              "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it."
+              "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it.",
+              "enum": [
+                "ubiquitous",
+                "optimal",
+                "force"
+              ],
+              "type": "string"
             },
             "certificate": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate",
-              "description": "The zone's SSL certificate or certificate and the intermediate(s)."
+              "description": "The zone's SSL certificate or certificate and the intermediate(s).",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method,
-        "tls-certificates-and-hostnames_certificate": tls_certificates_and_hostnames_certificate,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_analyze_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_analyze_response": tls_certificates_and_hostnames_certificate_analyze_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_analyze_response": tls$$certificates$$and$$hostnames_certificate_analyze_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -107,10 +112,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_analyze_response": tls_certificates_and_hostnames_certificate_analyze_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_analyze_response": tls$$certificates$$and$$hostnames_certificate_analyze_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/autoOriginTlsKex/outputs.ts b/src/generated/forge-mcp/ssl/autoOriginTlsKex/outputs.ts
index a9825e702..e7e290ce6 100644
--- a/src/generated/forge-mcp/ssl/autoOriginTlsKex/outputs.ts
+++ b/src/generated/forge-mcp/ssl/autoOriginTlsKex/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache_auto_origin_tls_kex_failure_response` in responses.
  */
-export const cache_auto_origin_tls_kex_failure_response_output: JsonSchema = {
+export const cache_auto_origin_tls_kex_failure_response: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cache_messages"
@@ -33,7 +33,7 @@ export const cache_auto_origin_tls_kex_failure_response_output: JsonSchema = {
 /**
  * The schema of `cache_auto_origin_tls_kex_response` in responses.
  */
-export const cache_auto_origin_tls_kex_response_output: JsonSchema = {
+export const cache_auto_origin_tls_kex_response: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cache_messages"
@@ -60,10 +60,10 @@ export const cache_auto_origin_tls_kex_response_output: JsonSchema = {
 /**
  * The schema of `cache_auto_origin_tls_kex_result` in responses.
  */
-export const cache_auto_origin_tls_kex_result_output: JsonSchema = {
+export const cache_auto_origin_tls_kex_result: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/cache_auto_origin_tls_kex_value"
+      "type": "boolean"
     },
     "id": {
       "type": "string"
@@ -80,10 +80,3 @@ export const cache_auto_origin_tls_kex_result_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `cache_auto_origin_tls_kex_value` in responses.
- */
-export const cache_auto_origin_tls_kex_value_output: JsonSchema = {
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/ssl/autoOriginTlsKex/schemas.ts b/src/generated/forge-mcp/ssl/autoOriginTlsKex/schemas.ts
index f2a7b82aa..72c9ba12c 100644
--- a/src/generated/forge-mcp/ssl/autoOriginTlsKex/schemas.ts
+++ b/src/generated/forge-mcp/ssl/autoOriginTlsKex/schemas.ts
@@ -10,8 +10,8 @@ export const cache_auto_origin_tls_kex_patch: JsonSchema = {
   "description": "Update enablement of Auto-Origin TLS KEX selection.",
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/cache_auto_origin_tls_kex_value",
-      "description": "Controls enablement of Auto-Origin TLS KEX selection for the zone."
+      "description": "Controls enablement of Auto-Origin TLS KEX selection for the zone.",
+      "type": "boolean"
     }
   },
   "required": [
@@ -19,11 +19,3 @@ export const cache_auto_origin_tls_kex_patch: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `cache_auto_origin_tls_kex_value`.
- */
-export const cache_auto_origin_tls_kex_value: JsonSchema = {
-  "description": "Controls enablement of Auto-Origin TLS KEX selection for the zone.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/ssl/autoOriginTlsKex/tools.ts b/src/generated/forge-mcp/ssl/autoOriginTlsKex/tools.ts
index 4c9658036..2a981071f 100644
--- a/src/generated/forge-mcp/ssl/autoOriginTlsKex/tools.ts
+++ b/src/generated/forge-mcp/ssl/autoOriginTlsKex/tools.ts
@@ -2,54 +2,56 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
-import { cache_messages_output } from "../outputs.js";
-import { cache_identifier } from "../schemas.js";
+import { cache_messages } from "../outputs.js";
 import {
-  cache_auto_origin_tls_kex_failure_response_output,
-  cache_auto_origin_tls_kex_response_output,
-  cache_auto_origin_tls_kex_result_output,
-  cache_auto_origin_tls_kex_value_output,
+  cache_auto_origin_tls_kex_failure_response,
+  cache_auto_origin_tls_kex_response,
+  cache_auto_origin_tls_kex_result,
 } from "./outputs.js";
-import {
-  cache_auto_origin_tls_kex_patch,
-  cache_auto_origin_tls_kex_value,
-} from "./schemas.js";
+import { cache_auto_origin_tls_kex_patch } from "./schemas.js";
 
 /**
- * The tools of `ssl.auto_origin_tls_kex`.
+ * The tools of `ssl.autoOriginTlsKex`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_auto_origin_tls_kex_edit",
+    name: "ssl_autoOriginTlsKex_edit",
     title: "Patch Auto-Origin TLS KEX enrollment status for the given zone",
-    description: "Enable or disable Auto-Origin TLS KEX selection for the zone by sending `{\"enabled\": true}` or `{\"enabled\": false}`. When enabled, Cloudflare runs a periodic scan of the zone's origins to determine the preferred key-exchange algorithm and writes that preference to the edge so it is sent first in the TLS ClientHello to the origin.",
+    description: "Enable or disable Auto-Origin TLS KEX selection for the zone by sending `{\"enabled\": true}` or `{\"enabled\": false}`. When enabled, Cloudflare runs a periodic scan of the zone's origins to determine the preferred key-exchange algorithm and writes that preference to the edge so it is sent first in the TLS ClientHello to the origin.\n\nPATCH /zones/{zone_id}/settings/auto_origin_tls_kex",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/cache_auto_origin_tls_kex_patch"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cache_auto_origin_tls_kex_patch": cache_auto_origin_tls_kex_patch,
-        "cache_auto_origin_tls_kex_value": cache_auto_origin_tls_kex_value,
-        "cache_identifier": cache_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cache_auto_origin_tls_kex_response",
       $defs: {
-        "cache_auto_origin_tls_kex_response": cache_auto_origin_tls_kex_response_output,
-        "cache_auto_origin_tls_kex_result": cache_auto_origin_tls_kex_result_output,
-        "cache_auto_origin_tls_kex_value": cache_auto_origin_tls_kex_value_output,
-        "cache_messages": cache_messages_output,
+        "cache_auto_origin_tls_kex_response": cache_auto_origin_tls_kex_response,
+        "cache_auto_origin_tls_kex_result": cache_auto_origin_tls_kex_result,
+        "cache_messages": cache_messages,
       },
     },
     annotations: {
@@ -79,11 +81,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache_auto_origin_tls_kex_failure_response": cache_auto_origin_tls_kex_failure_response_output,
-        "cache_auto_origin_tls_kex_response": cache_auto_origin_tls_kex_response_output,
-        "cache_auto_origin_tls_kex_result": cache_auto_origin_tls_kex_result_output,
-        "cache_auto_origin_tls_kex_value": cache_auto_origin_tls_kex_value_output,
-        "cache_messages": cache_messages_output,
+        "cache_auto_origin_tls_kex_failure_response": cache_auto_origin_tls_kex_failure_response,
+        "cache_auto_origin_tls_kex_response": cache_auto_origin_tls_kex_response,
+        "cache_auto_origin_tls_kex_result": cache_auto_origin_tls_kex_result,
+        "cache_messages": cache_messages,
       },
     },
     request: (args) => ({
@@ -92,30 +93,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_auto_origin_tls_kex_get",
+    name: "ssl_autoOriginTlsKex_get",
     title: "Get Auto-Origin TLS KEX enrollment status for the given zone",
-    description: "When enabled, Cloudflare automatically selects the preferred TLS key-exchange algorithm to use when establishing the TLS connection to the zone's origin, picking from the algorithms permitted by the zone's `origin_tls_compliance_modes` setting. When disabled, the default key-exchange ordering is used.",
+    description: "When enabled, Cloudflare automatically selects the preferred TLS key-exchange algorithm to use when establishing the TLS connection to the zone's origin, picking from the algorithms permitted by the zone's `origin_tls_compliance_modes` setting. When disabled, the default key-exchange ordering is used.\n\nGET /zones/{zone_id}/settings/auto_origin_tls_kex",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache_identifier": cache_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cache_auto_origin_tls_kex_response",
       $defs: {
-        "cache_auto_origin_tls_kex_response": cache_auto_origin_tls_kex_response_output,
-        "cache_auto_origin_tls_kex_result": cache_auto_origin_tls_kex_result_output,
-        "cache_auto_origin_tls_kex_value": cache_auto_origin_tls_kex_value_output,
-        "cache_messages": cache_messages_output,
+        "cache_auto_origin_tls_kex_response": cache_auto_origin_tls_kex_response,
+        "cache_auto_origin_tls_kex_result": cache_auto_origin_tls_kex_result,
+        "cache_messages": cache_messages,
       },
     },
     annotations: {
@@ -145,11 +152,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache_auto_origin_tls_kex_failure_response": cache_auto_origin_tls_kex_failure_response_output,
-        "cache_auto_origin_tls_kex_response": cache_auto_origin_tls_kex_response_output,
-        "cache_auto_origin_tls_kex_result": cache_auto_origin_tls_kex_result_output,
-        "cache_auto_origin_tls_kex_value": cache_auto_origin_tls_kex_value_output,
-        "cache_messages": cache_messages_output,
+        "cache_auto_origin_tls_kex_failure_response": cache_auto_origin_tls_kex_failure_response,
+        "cache_auto_origin_tls_kex_response": cache_auto_origin_tls_kex_response,
+        "cache_auto_origin_tls_kex_result": cache_auto_origin_tls_kex_result,
+        "cache_messages": cache_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/automaticUpgrader/schemas.ts b/src/generated/forge-mcp/ssl/automaticUpgrader/schemas.ts
index 4474be8f6..43001cc95 100644
--- a/src/generated/forge-mcp/ssl/automaticUpgrader/schemas.ts
+++ b/src/generated/forge-mcp/ssl/automaticUpgrader/schemas.ts
@@ -10,8 +10,12 @@ export const cache_schemas_patch: JsonSchema = {
   "description": "Update enablement of Automatic SSL/TLS.",
   "properties": {
     "value": {
-      "$ref": "#/$defs/cache_schemas_value",
-      "description": "Controls enablement of Automatic SSL/TLS."
+      "description": "Controls enablement of Automatic SSL/TLS.",
+      "enum": [
+        "auto",
+        "custom"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -19,15 +23,3 @@ export const cache_schemas_patch: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `cache_schemas_value`.
- */
-export const cache_schemas_value: JsonSchema = {
-  "description": "Controls enablement of Automatic SSL/TLS.",
-  "enum": [
-    "auto",
-    "custom"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/automaticUpgrader/tools.ts b/src/generated/forge-mcp/ssl/automaticUpgrader/tools.ts
index fd55683f4..dd941a3ad 100644
--- a/src/generated/forge-mcp/ssl/automaticUpgrader/tools.ts
+++ b/src/generated/forge-mcp/ssl/automaticUpgrader/tools.ts
@@ -3,42 +3,48 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cache_api_response_common_failure_output,
-  cache_api_response_single_id_output,
-  cache_messages_output,
-  cache_result_output,
+  cache_api$$response$$common$$failure,
+  cache_api$$response$$single$$id,
+  cache_messages,
+  cache_result,
 } from "../outputs.js";
-import { cache_identifier } from "../schemas.js";
-import { cache_schemas_patch, cache_schemas_value } from "./schemas.js";
+import { cache_schemas_patch } from "./schemas.js";
 
 /**
- * The tools of `ssl.automatic_upgrader`.
+ * The tools of `ssl.automaticUpgrader`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_automatic_upgrader_get",
+    name: "ssl_automaticUpgrader_get",
     title: "Get Automatic SSL/TLS enrollment status for the given zone",
-    description: "If the system is enabled, the response will include next_scheduled_scan, representing the next time this zone will be scanned and the zone's ssl/tls encryption mode is potentially upgraded by the system. If the system is disabled, next_scheduled_scan will not be present in the response body.",
+    description: "If the system is enabled, the response will include next_scheduled_scan, representing the next time this zone will be scanned and the zone's ssl/tls encryption mode is potentially upgraded by the system. If the system is disabled, next_scheduled_scan will not be present in the response body.\n\nGET /zones/{zone_id}/settings/ssl_automatic_mode",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache_identifier": cache_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cache_api-response-single-id",
       $defs: {
-        "cache_api-response-single-id": cache_api_response_single_id_output,
-        "cache_messages": cache_messages_output,
-        "cache_result": cache_result_output,
+        "cache_api-response-single-id": cache_api$$response$$single$$id,
+        "cache_messages": cache_messages,
+        "cache_result": cache_result,
       },
     },
     annotations: {
@@ -79,10 +85,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache_api-response-common-failure": cache_api_response_common_failure_output,
-        "cache_api-response-single-id": cache_api_response_single_id_output,
-        "cache_messages": cache_messages_output,
-        "cache_result": cache_result_output,
+        "cache_api-response-common-failure": cache_api$$response$$common$$failure,
+        "cache_api-response-single-id": cache_api$$response$$single$$id,
+        "cache_messages": cache_messages,
+        "cache_result": cache_result,
       },
     },
     request: (args) => ({
@@ -90,35 +96,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_automatic_upgrader_patch",
+    name: "ssl_automaticUpgrader_patch",
     title: "Patch Automatic SSL/TLS Enrollment status for given zone",
-    description: "The automatic system is enabled when this endpoint is hit with value in the request body is set to \"auto\", and disabled when the request body value is set to \"custom\".",
+    description: "The automatic system is enabled when this endpoint is hit with value in the request body is set to \"auto\", and disabled when the request body value is set to \"custom\".\n\nPATCH /zones/{zone_id}/settings/ssl_automatic_mode",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/cache_schemas_patch"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache_identifier": cache_identifier,
         "cache_schemas_patch": cache_schemas_patch,
-        "cache_schemas_value": cache_schemas_value,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cache_api-response-single-id",
       $defs: {
-        "cache_api-response-single-id": cache_api_response_single_id_output,
-        "cache_messages": cache_messages_output,
-        "cache_result": cache_result_output,
+        "cache_api-response-single-id": cache_api$$response$$single$$id,
+        "cache_messages": cache_messages,
+        "cache_result": cache_result,
       },
     },
     annotations: {
@@ -158,10 +172,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache_api-response-common-failure": cache_api_response_common_failure_output,
-        "cache_api-response-single-id": cache_api_response_single_id_output,
-        "cache_messages": cache_messages_output,
-        "cache_result": cache_result_output,
+        "cache_api-response-common-failure": cache_api$$response$$common$$failure,
+        "cache_api-response-single-id": cache_api$$response$$single$$id,
+        "cache_messages": cache_messages,
+        "cache_result": cache_result,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/outputs.ts b/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/outputs.ts
index cacb960b6..04535b6f1 100644
--- a/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/outputs.ts
+++ b/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `tls-certificates-and-hostnames_hostname_associations_response`
  * in responses.
  */
-export const tls_certificates_and_hostnames_hostname_associations_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname_associations_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -31,7 +31,7 @@ export const tls_certificates_and_hostnames_hostname_associations_response_outpu
 /**
  * The schema of `tls-certificates-and-hostnames_hostnames-2` in responses.
  */
-export const tls_certificates_and_hostnames_hostnames_2_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostnames$$2: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/schemas.ts b/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/schemas.ts
index 9b73cf7bd..96bd5a516 100644
--- a/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/schemas.ts
+++ b/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `tls-certificates-and-hostnames_hostname_association`.
  */
-export const tls_certificates_and_hostnames_hostname_association: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname_association: JsonSchema = {
   "properties": {
     "hostnames": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_hostnames-2"
@@ -22,7 +22,7 @@ export const tls_certificates_and_hostnames_hostname_association: JsonSchema = {
 /**
  * The schema of `tls-certificates-and-hostnames_hostnames-2`.
  */
-export const tls_certificates_and_hostnames_hostnames_2: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostnames$$2: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/tools.ts b/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/tools.ts
index ec5f8fb52..918625b22 100644
--- a/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/tools.ts
+++ b/src/generated/forge-mcp/ssl/certificateAuthorities/hostnameAssociations/tools.ts
@@ -1,56 +1,68 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_hostname_associations_response_output,
-  tls_certificates_and_hostnames_hostnames_2_output,
+  tls$$certificates$$and$$hostnames_hostname_associations_response,
+  tls$$certificates$$and$$hostnames_hostnames$$2,
 } from "./outputs.js";
 import {
-  tls_certificates_and_hostnames_hostname_association,
-  tls_certificates_and_hostnames_hostnames_2,
+  tls$$certificates$$and$$hostnames_hostname_association,
+  tls$$certificates$$and$$hostnames_hostnames$$2 as tls$$certificates$$and$$hostnames_hostnames$$2$,
 } from "./schemas.js";
 
 /**
- * The tools of `ssl.certificate_authorities.hostname_associations`.
+ * The tools of `ssl.certificateAuthorities.hostnameAssociations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_certificate_authorities_hostname_associations_get",
+    name: "ssl_certificateAuthorities_hostnameAssociations_get",
     title: "List Hostname Associations",
-    description: "List Hostname Associations.",
+    description: "List Hostname Associations.\n\nGET /zones/{zone_id}/certificate_authorities/hostname_associations",
     inputSchema: {
       type: "object",
       properties: {
-        "mtls_certificate_id": {
-          "description": "The UUID to match against for a certificate that was uploaded to the mTLS Certificate Management endpoint. If no mtls_certificate_id is given, the results will be the hostnames associated to your active Cloudflare Managed CA.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "mtls_certificate_id": {
+              "description": "The UUID to match against for a certificate that was uploaded to the mTLS Certificate Management endpoint. If no mtls_certificate_id is given, the results will be the hostnames associated to your active Cloudflare Managed CA.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_associations_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_hostname_associations_response": tls_certificates_and_hostnames_hostname_associations_response_output,
-        "tls-certificates-and-hostnames_hostnames-2": tls_certificates_and_hostnames_hostnames_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_hostname_associations_response": tls$$certificates$$and$$hostnames_hostname_associations_response,
+        "tls-certificates-and-hostnames_hostnames-2": tls$$certificates$$and$$hostnames_hostnames$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -84,52 +96,61 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_hostname_associations_response": tls_certificates_and_hostnames_hostname_associations_response_output,
-        "tls-certificates-and-hostnames_hostnames-2": tls_certificates_and_hostnames_hostnames_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_hostname_associations_response": tls$$certificates$$and$$hostnames_hostname_associations_response,
+        "tls-certificates-and-hostnames_hostnames-2": tls$$certificates$$and$$hostnames_hostnames$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/certificate_authorities/hostname_associations`,
       query: [
-        ["mtls_certificate_id", args["mtls_certificate_id"], true],
+        ["mtls_certificate_id", param(args, "query", "mtls_certificate_id"), true],
       ],
     }),
   },
   {
-    name: "ssl_certificate_authorities_hostname_associations_update",
+    name: "ssl_certificateAuthorities_hostnameAssociations_update",
     title: "Replace Hostname Associations",
-    description: "Replace Hostname Associations.",
+    description: "Replace Hostname Associations.\n\nPUT /zones/{zone_id}/certificate_authorities/hostname_associations",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_association"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_hostname_association": tls_certificates_and_hostnames_hostname_association,
-        "tls-certificates-and-hostnames_hostnames-2": tls_certificates_and_hostnames_hostnames_2,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
+        "tls-certificates-and-hostnames_hostname_association": tls$$certificates$$and$$hostnames_hostname_association,
+        "tls-certificates-and-hostnames_hostnames-2": tls$$certificates$$and$$hostnames_hostnames$$2$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_associations_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_hostname_associations_response": tls_certificates_and_hostnames_hostname_associations_response_output,
-        "tls-certificates-and-hostnames_hostnames-2": tls_certificates_and_hostnames_hostnames_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_hostname_associations_response": tls$$certificates$$and$$hostnames_hostname_associations_response,
+        "tls-certificates-and-hostnames_hostnames-2": tls$$certificates$$and$$hostnames_hostnames$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -162,11 +183,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_hostname_associations_response": tls_certificates_and_hostnames_hostname_associations_response_output,
-        "tls-certificates-and-hostnames_hostnames-2": tls_certificates_and_hostnames_hostnames_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_hostname_associations_response": tls$$certificates$$and$$hostnames_hostname_associations_response,
+        "tls-certificates-and-hostnames_hostnames-2": tls$$certificates$$and$$hostnames_hostnames$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/certificatePacks/outputs.ts b/src/generated/forge-mcp/ssl/certificatePacks/outputs.ts
index afb5b8db1..4c20045e1 100644
--- a/src/generated/forge-mcp/ssl/certificatePacks/outputs.ts
+++ b/src/generated/forge-mcp/ssl/certificatePacks/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * `tls-certificates-and-hostnames_advanced_certificate_pack_response_single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_advanced_certificate_pack_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_advanced_certificate_pack_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -24,26 +24,18 @@ export const tls_certificates_and_hostnames_advanced_certificate_pack_response_s
   ]
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_authority-2` in
- * responses.
- */
-export const tls_certificates_and_hostnames_certificate_authority_2_output: JsonSchema = {
-  "enum": [
-    "google",
-    "lets_encrypt",
-    "ssl_com"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_certificate_pack` in responses.
  */
-export const tls_certificates_and_hostnames_certificate_pack_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_pack: JsonSchema = {
   "properties": {
     "certificate_authority": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_authority-2"
+      "enum": [
+        "google",
+        "lets_encrypt",
+        "ssl_com"
+      ],
+      "type": "string"
     },
     "certificates": {
       "items": {
@@ -52,7 +44,7 @@ export const tls_certificates_and_hostnames_certificate_pack_output: JsonSchema
       "type": "array"
     },
     "cloudflare_branding": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_cloudflare_branding"
+      "type": "boolean"
     },
     "dcv_delegation_records": {
       "items": {
@@ -64,16 +56,49 @@ export const tls_certificates_and_hostnames_certificate_pack_output: JsonSchema
       "$ref": "#/$defs/tls-certificates-and-hostnames_hosts-2"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_pack_identifier"
+      "type": "string"
     },
     "primary_certificate": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_primary"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-5"
+      "enum": [
+        "initializing",
+        "pending_validation",
+        "deleted",
+        "pending_issuance",
+        "pending_deployment",
+        "pending_deletion",
+        "pending_expiration",
+        "expired",
+        "active",
+        "initializing_timed_out",
+        "validation_timed_out",
+        "issuance_timed_out",
+        "deployment_timed_out",
+        "deletion_timed_out",
+        "pending_cleanup",
+        "staging_deployment",
+        "staging_active",
+        "deactivating",
+        "inactive",
+        "backup_issued",
+        "holding_deployment"
+      ],
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_type-2"
+      "enum": [
+        "mh_custom",
+        "managed_hostname",
+        "sni_custom",
+        "universal",
+        "advanced",
+        "total_tls",
+        "keyless",
+        "legacy_custom"
+      ],
+      "type": "string"
     },
     "validation_errors": {
       "items": {
@@ -87,7 +112,12 @@ export const tls_certificates_and_hostnames_certificate_pack_output: JsonSchema
       "type": "array"
     },
     "validation_method": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_validation_method"
+      "enum": [
+        "txt",
+        "http",
+        "email"
+      ],
+      "type": "string"
     },
     "validation_records": {
       "items": {
@@ -96,7 +126,13 @@ export const tls_certificates_and_hostnames_certificate_pack_output: JsonSchema
       "type": "array"
     },
     "validity_days": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_validity_days"
+      "enum": [
+        14,
+        30,
+        90,
+        365
+      ],
+      "type": "integer"
     }
   },
   "required": [
@@ -113,7 +149,7 @@ export const tls_certificates_and_hostnames_certificate_pack_output: JsonSchema
  * The schema of `tls-certificates-and-hostnames_certificate_pack_certificate`
  * in responses.
  */
-export const tls_certificates_and_hostnames_certificate_pack_certificate_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_pack_certificate: JsonSchema = {
   "properties": {
     "bundle_method": {
       "type": "string"
@@ -165,7 +201,7 @@ export const tls_certificates_and_hostnames_certificate_pack_certificate_output:
       "type": "string"
     },
     "zone_id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_identifier"
+      "type": "string"
     }
   },
   "required": [
@@ -176,20 +212,12 @@ export const tls_certificates_and_hostnames_certificate_pack_certificate_output:
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_pack_identifier` in
- * responses.
- */
-export const tls_certificates_and_hostnames_certificate_pack_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_certificate_pack_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_pack_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_pack_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -213,7 +241,7 @@ export const tls_certificates_and_hostnames_certificate_pack_response_collection
  * `tls-certificates-and-hostnames_certificate_pack_response_single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_pack_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_pack_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -229,20 +257,12 @@ export const tls_certificates_and_hostnames_certificate_pack_response_single_out
   ]
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_cloudflare_branding` in
- * responses.
- */
-export const tls_certificates_and_hostnames_cloudflare_branding_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_delete_advanced_certificate_pack_response_single`
  * in responses.
  */
-export const tls_certificates_and_hostnames_delete_advanced_certificate_pack_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_delete_advanced_certificate_pack_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -252,7 +272,7 @@ export const tls_certificates_and_hostnames_delete_advanced_certificate_pack_res
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_pack_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -266,89 +286,9 @@ export const tls_certificates_and_hostnames_delete_advanced_certificate_pack_res
 /**
  * The schema of `tls-certificates-and-hostnames_hosts-2` in responses.
  */
-export const tls_certificates_and_hostnames_hosts_2_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hosts$$2: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_primary` in responses.
- */
-export const tls_certificates_and_hostnames_primary_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_status-5` in responses.
- */
-export const tls_certificates_and_hostnames_status_5_output: JsonSchema = {
-  "enum": [
-    "initializing",
-    "pending_validation",
-    "deleted",
-    "pending_issuance",
-    "pending_deployment",
-    "pending_deletion",
-    "pending_expiration",
-    "expired",
-    "active",
-    "initializing_timed_out",
-    "validation_timed_out",
-    "issuance_timed_out",
-    "deployment_timed_out",
-    "deletion_timed_out",
-    "pending_cleanup",
-    "staging_deployment",
-    "staging_active",
-    "deactivating",
-    "inactive",
-    "backup_issued",
-    "holding_deployment"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_type-2` in responses.
- */
-export const tls_certificates_and_hostnames_type_2_output: JsonSchema = {
-  "enum": [
-    "mh_custom",
-    "managed_hostname",
-    "sni_custom",
-    "universal",
-    "advanced",
-    "total_tls",
-    "keyless",
-    "legacy_custom"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_validation_method` in
- * responses.
- */
-export const tls_certificates_and_hostnames_validation_method_output: JsonSchema = {
-  "enum": [
-    "txt",
-    "http",
-    "email"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_validity_days` in responses.
- */
-export const tls_certificates_and_hostnames_validity_days_output: JsonSchema = {
-  "enum": [
-    14,
-    30,
-    90,
-    365
-  ],
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/ssl/certificatePacks/quota/outputs.ts b/src/generated/forge-mcp/ssl/certificatePacks/quota/outputs.ts
index dafe301dd..ada37dceb 100644
--- a/src/generated/forge-mcp/ssl/certificatePacks/quota/outputs.ts
+++ b/src/generated/forge-mcp/ssl/certificatePacks/quota/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * `tls-certificates-and-hostnames_certificate_pack_quota_response` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_pack_quota_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_pack_quota_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -32,7 +32,7 @@ export const tls_certificates_and_hostnames_certificate_pack_quota_response_outp
 /**
  * The schema of `tls-certificates-and-hostnames_quota` in responses.
  */
-export const tls_certificates_and_hostnames_quota_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_quota: JsonSchema = {
   "properties": {
     "allocated": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/ssl/certificatePacks/quota/tools.ts b/src/generated/forge-mcp/ssl/certificatePacks/quota/tools.ts
index c485bea48..8e5251dfa 100644
--- a/src/generated/forge-mcp/ssl/certificatePacks/quota/tools.ts
+++ b/src/generated/forge-mcp/ssl/certificatePacks/quota/tools.ts
@@ -3,46 +3,52 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_certificate_pack_quota_response_output,
-  tls_certificates_and_hostnames_quota_output,
+  tls$$certificates$$and$$hostnames_certificate_pack_quota_response,
+  tls$$certificates$$and$$hostnames_quota,
 } from "./outputs.js";
 
 /**
- * The tools of `ssl.certificate_packs.quota`.
+ * The tools of `ssl.certificatePacks.quota`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_certificate_packs_quota_get",
+    name: "ssl_certificatePacks_quota_get",
     title: "Get Certificate Pack Quotas",
-    description: "For a given zone, list certificate pack quotas.",
+    description: "For a given zone, list certificate pack quotas.\n\nGET /zones/{zone_id}/ssl/certificate_packs/quota",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_pack_quota_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_pack_quota_response": tls_certificates_and_hostnames_certificate_pack_quota_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_quota": tls_certificates_and_hostnames_quota_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_pack_quota_response": tls$$certificates$$and$$hostnames_certificate_pack_quota_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_quota": tls$$certificates$$and$$hostnames_quota,
       },
     },
     annotations: {
@@ -88,11 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_pack_quota_response": tls_certificates_and_hostnames_certificate_pack_quota_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_quota": tls_certificates_and_hostnames_quota_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_pack_quota_response": tls$$certificates$$and$$hostnames_certificate_pack_quota_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_quota": tls$$certificates$$and$$hostnames_quota,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/certificatePacks/schemas.ts b/src/generated/forge-mcp/ssl/certificatePacks/schemas.ts
index 636514f94..718ed3132 100644
--- a/src/generated/forge-mcp/ssl/certificatePacks/schemas.ts
+++ b/src/generated/forge-mcp/ssl/certificatePacks/schemas.ts
@@ -3,80 +3,13 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_advanced_type`.
- */
-export const tls_certificates_and_hostnames_advanced_type: JsonSchema = {
-  "description": "Type of certificate pack.",
-  "enum": [
-    "advanced"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_authority-2`.
- */
-export const tls_certificates_and_hostnames_certificate_authority_2: JsonSchema = {
-  "description": "Certificate Authority selected for the order.  For information on any certificate authority specific details or restrictions [see this page for more details](https://developers.cloudflare.com/ssl/reference/certificate-authorities).",
-  "enum": [
-    "google",
-    "lets_encrypt",
-    "ssl_com"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_pack_identifier`.
- */
-export const tls_certificates_and_hostnames_certificate_pack_identifier: JsonSchema = {
-  "description": "The unique identifier for a certificate_pack.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_cloudflare_branding`.
- */
-export const tls_certificates_and_hostnames_cloudflare_branding: JsonSchema = {
-  "description": "Whether or not to add Cloudflare Branding for the order.  This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to true.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_hosts-2`.
  */
-export const tls_certificates_and_hostnames_hosts_2: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hosts$$2: JsonSchema = {
   "description": "Comma separated list of valid host names for the certificate packs. Must contain the zone apex, may not contain more than 50 hosts, and may not be empty.",
   "items": {
     "type": "string"
   },
   "type": "array"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_validation_method`.
- */
-export const tls_certificates_and_hostnames_validation_method: JsonSchema = {
-  "description": "Validation Method selected for the order.",
-  "enum": [
-    "txt",
-    "http",
-    "email"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_validity_days`.
- */
-export const tls_certificates_and_hostnames_validity_days: JsonSchema = {
-  "description": "Validity Days selected for the order.",
-  "enum": [
-    14,
-    30,
-    90,
-    365
-  ],
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/ssl/certificatePacks/tools.ts b/src/generated/forge-mcp/ssl/certificatePacks/tools.ts
index dc3904a15..d349013df 100644
--- a/src/generated/forge-mcp/ssl/certificatePacks/tools.ts
+++ b/src/generated/forge-mcp/ssl/certificatePacks/tools.ts
@@ -1,80 +1,81 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_identifier_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_validation_record_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
+  tls$$certificates$$and$$hostnames_validation_record,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_advanced_certificate_pack_response_single_output,
-  tls_certificates_and_hostnames_certificate_authority_2_output,
-  tls_certificates_and_hostnames_certificate_pack_certificate_output,
-  tls_certificates_and_hostnames_certificate_pack_identifier_output,
-  tls_certificates_and_hostnames_certificate_pack_output,
-  tls_certificates_and_hostnames_certificate_pack_response_collection_output,
-  tls_certificates_and_hostnames_certificate_pack_response_single_output,
-  tls_certificates_and_hostnames_cloudflare_branding_output,
-  tls_certificates_and_hostnames_delete_advanced_certificate_pack_response_single_output,
-  tls_certificates_and_hostnames_hosts_2_output,
-  tls_certificates_and_hostnames_primary_output,
-  tls_certificates_and_hostnames_status_5_output,
-  tls_certificates_and_hostnames_type_2_output,
-  tls_certificates_and_hostnames_validation_method_output,
-  tls_certificates_and_hostnames_validity_days_output,
+  tls$$certificates$$and$$hostnames_advanced_certificate_pack_response_single,
+  tls$$certificates$$and$$hostnames_certificate_pack,
+  tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+  tls$$certificates$$and$$hostnames_certificate_pack_response_collection,
+  tls$$certificates$$and$$hostnames_certificate_pack_response_single,
+  tls$$certificates$$and$$hostnames_delete_advanced_certificate_pack_response_single,
+  tls$$certificates$$and$$hostnames_hosts$$2,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_advanced_type,
-  tls_certificates_and_hostnames_certificate_authority_2,
-  tls_certificates_and_hostnames_certificate_pack_identifier,
-  tls_certificates_and_hostnames_cloudflare_branding,
-  tls_certificates_and_hostnames_hosts_2,
-  tls_certificates_and_hostnames_validation_method,
-  tls_certificates_and_hostnames_validity_days,
-} from "./schemas.js";
+import { tls$$certificates$$and$$hostnames_hosts$$2 as tls$$certificates$$and$$hostnames_hosts$$2$ } from "./schemas.js";
 
 /**
- * The tools of `ssl.certificate_packs`.
+ * The tools of `ssl.certificatePacks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_certificate_packs_create",
+    name: "ssl_certificatePacks_create",
     title: "Order Advanced Certificate Manager Certificate Pack",
-    description: "For a given zone, order an advanced certificate pack.",
+    description: "For a given zone, order an advanced certificate pack.\n\nPOST /zones/{zone_id}/ssl/certificate_packs/order",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "certificate_authority": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_authority-2",
-              "description": "Certificate Authority selected for the order.  For information on any certificate authority specific details or restrictions [see this page for more details](https://developers.cloudflare.com/ssl/reference/certificate-authorities)."
+              "description": "Certificate Authority selected for the order.  For information on any certificate authority specific details or restrictions [see this page for more details](https://developers.cloudflare.com/ssl/reference/certificate-authorities).",
+              "enum": [
+                "google",
+                "lets_encrypt",
+                "ssl_com"
+              ],
+              "type": "string"
             },
             "cloudflare_branding": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_cloudflare_branding",
-              "description": "Whether or not to add Cloudflare Branding for the order.  This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to true."
+              "description": "Whether or not to add Cloudflare Branding for the order.  This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to true.",
+              "type": "boolean"
             },
             "hosts": {
               "$ref": "#/$defs/tls-certificates-and-hostnames_hosts-2",
               "description": "Comma separated list of valid host names for the certificate packs. Must contain the zone apex, may not contain more than 50 hosts, and may not be empty."
             },
             "type": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_advanced_type",
-              "description": "Type of certificate pack."
+              "description": "Type of certificate pack.",
+              "enum": [
+                "advanced"
+              ],
+              "type": "string"
             },
             "validation_method": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_validation_method",
-              "description": "Validation Method selected for the order."
+              "description": "Validation Method selected for the order.",
+              "enum": [
+                "txt",
+                "http",
+                "email"
+              ],
+              "type": "string"
             },
             "validity_days": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_validity_days",
-              "description": "Validity Days selected for the order."
+              "description": "Validity Days selected for the order.",
+              "enum": [
+                14,
+                30,
+                90,
+                365
+              ],
+              "type": "integer"
             }
           },
           "required": [
@@ -86,44 +87,39 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_advanced_type": tls_certificates_and_hostnames_advanced_type,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_advanced_certificate_pack_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_advanced_certificate_pack_response_single": tls_certificates_and_hostnames_advanced_certificate_pack_response_single_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2_output,
-        "tls-certificates-and-hostnames_certificate_pack": tls_certificates_and_hostnames_certificate_pack_output,
-        "tls-certificates-and-hostnames_certificate_pack_certificate": tls_certificates_and_hostnames_certificate_pack_certificate_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding_output,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_primary": tls_certificates_and_hostnames_primary_output,
-        "tls-certificates-and-hostnames_status-5": tls_certificates_and_hostnames_status_5_output,
-        "tls-certificates-and-hostnames_type-2": tls_certificates_and_hostnames_type_2_output,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days_output,
+        "tls-certificates-and-hostnames_advanced_certificate_pack_response_single": tls$$certificates$$and$$hostnames_advanced_certificate_pack_response_single,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_pack": tls$$certificates$$and$$hostnames_certificate_pack,
+        "tls-certificates-and-hostnames_certificate_pack_certificate": tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
       },
     },
     annotations: {
@@ -169,23 +165,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_advanced_certificate_pack_response_single": tls_certificates_and_hostnames_advanced_certificate_pack_response_single_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2_output,
-        "tls-certificates-and-hostnames_certificate_pack": tls_certificates_and_hostnames_certificate_pack_output,
-        "tls-certificates-and-hostnames_certificate_pack_certificate": tls_certificates_and_hostnames_certificate_pack_certificate_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding_output,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_primary": tls_certificates_and_hostnames_primary_output,
-        "tls-certificates-and-hostnames_status-5": tls_certificates_and_hostnames_status_5_output,
-        "tls-certificates-and-hostnames_type-2": tls_certificates_and_hostnames_type_2_output,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days_output,
+        "tls-certificates-and-hostnames_advanced_certificate_pack_response_single": tls$$certificates$$and$$hostnames_advanced_certificate_pack_response_single,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_pack": tls$$certificates$$and$$hostnames_certificate_pack,
+        "tls-certificates-and-hostnames_certificate_pack_certificate": tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
       },
     },
     request: (args) => ({
@@ -194,37 +181,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_certificate_packs_delete",
+    name: "ssl_certificatePacks_delete",
     title: "Delete Advanced Certificate Manager Certificate Pack",
-    description: "For a given zone, delete an advanced certificate pack.",
+    description: "For a given zone, delete an advanced certificate pack.\n\nDELETE /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_pack_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_pack_identifier",
-          "description": "The unique identifier for a certificate_pack."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_pack_id": {
+              "description": "The unique identifier for a certificate_pack.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "certificate_pack_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "certificate_pack_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_delete_advanced_certificate_pack_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_delete_advanced_certificate_pack_response_single": tls_certificates_and_hostnames_delete_advanced_certificate_pack_response_single_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_delete_advanced_certificate_pack_response_single": tls$$certificates$$and$$hostnames_delete_advanced_certificate_pack_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -270,11 +262,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_delete_advanced_certificate_pack_response_single": tls_certificates_and_hostnames_delete_advanced_certificate_pack_response_single_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_delete_advanced_certificate_pack_response_single": tls$$certificates$$and$$hostnames_delete_advanced_certificate_pack_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -282,60 +273,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_certificate_packs_edit",
+    name: "ssl_certificatePacks_edit",
     title: "Restart Validation or Update Advanced Certificate Manager Certificate Pack",
-    description: "For a given zone, restart validation or add cloudflare branding for an advanced certificate pack.  The former is only a validation operation for a Certificate Pack in a validation_timed_out status.",
+    description: "For a given zone, restart validation or add cloudflare branding for an advanced certificate pack.  The former is only a validation operation for a Certificate Pack in a validation_timed_out status.\n\nPATCH /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "cloudflare_branding": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_cloudflare_branding",
-              "description": "Whether or not to add Cloudflare Branding for the order.  This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to true."
+              "description": "Whether or not to add Cloudflare Branding for the order.  This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to true.",
+              "type": "boolean"
             }
           },
           "type": "object"
         },
-        "certificate_pack_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_pack_identifier",
-          "description": "The unique identifier for a certificate_pack."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_pack_id": {
+              "description": "The unique identifier for a certificate_pack.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "certificate_pack_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "certificate_pack_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_advanced_certificate_pack_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_advanced_certificate_pack_response_single": tls_certificates_and_hostnames_advanced_certificate_pack_response_single_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2_output,
-        "tls-certificates-and-hostnames_certificate_pack": tls_certificates_and_hostnames_certificate_pack_output,
-        "tls-certificates-and-hostnames_certificate_pack_certificate": tls_certificates_and_hostnames_certificate_pack_certificate_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding_output,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_primary": tls_certificates_and_hostnames_primary_output,
-        "tls-certificates-and-hostnames_status-5": tls_certificates_and_hostnames_status_5_output,
-        "tls-certificates-and-hostnames_type-2": tls_certificates_and_hostnames_type_2_output,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days_output,
+        "tls-certificates-and-hostnames_advanced_certificate_pack_response_single": tls$$certificates$$and$$hostnames_advanced_certificate_pack_response_single,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_pack": tls$$certificates$$and$$hostnames_certificate_pack,
+        "tls-certificates-and-hostnames_certificate_pack_certificate": tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
       },
     },
     annotations: {
@@ -381,23 +368,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_advanced_certificate_pack_response_single": tls_certificates_and_hostnames_advanced_certificate_pack_response_single_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2_output,
-        "tls-certificates-and-hostnames_certificate_pack": tls_certificates_and_hostnames_certificate_pack_output,
-        "tls-certificates-and-hostnames_certificate_pack_certificate": tls_certificates_and_hostnames_certificate_pack_certificate_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding_output,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_primary": tls_certificates_and_hostnames_primary_output,
-        "tls-certificates-and-hostnames_status-5": tls_certificates_and_hostnames_status_5_output,
-        "tls-certificates-and-hostnames_type-2": tls_certificates_and_hostnames_type_2_output,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days_output,
+        "tls-certificates-and-hostnames_advanced_certificate_pack_response_single": tls$$certificates$$and$$hostnames_advanced_certificate_pack_response_single,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_pack": tls$$certificates$$and$$hostnames_certificate_pack,
+        "tls-certificates-and-hostnames_certificate_pack_certificate": tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
       },
     },
     request: (args) => ({
@@ -406,49 +384,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_certificate_packs_get",
+    name: "ssl_certificatePacks_get",
     title: "Get Certificate Pack",
-    description: "For a given zone, get a certificate pack.",
+    description: "For a given zone, get a certificate pack.\n\nGET /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_pack_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_pack_identifier",
-          "description": "The unique identifier for a certificate_pack."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_pack_id": {
+              "description": "The unique identifier for a certificate_pack.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "certificate_pack_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "certificate_pack_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_pack_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2_output,
-        "tls-certificates-and-hostnames_certificate_pack": tls_certificates_and_hostnames_certificate_pack_output,
-        "tls-certificates-and-hostnames_certificate_pack_certificate": tls_certificates_and_hostnames_certificate_pack_certificate_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_certificate_pack_response_single": tls_certificates_and_hostnames_certificate_pack_response_single_output,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding_output,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_primary": tls_certificates_and_hostnames_primary_output,
-        "tls-certificates-and-hostnames_status-5": tls_certificates_and_hostnames_status_5_output,
-        "tls-certificates-and-hostnames_type-2": tls_certificates_and_hostnames_type_2_output,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_pack": tls$$certificates$$and$$hostnames_certificate_pack,
+        "tls-certificates-and-hostnames_certificate_pack_certificate": tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+        "tls-certificates-and-hostnames_certificate_pack_response_single": tls$$certificates$$and$$hostnames_certificate_pack_response_single,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
       },
     },
     annotations: {
@@ -494,23 +469,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2_output,
-        "tls-certificates-and-hostnames_certificate_pack": tls_certificates_and_hostnames_certificate_pack_output,
-        "tls-certificates-and-hostnames_certificate_pack_certificate": tls_certificates_and_hostnames_certificate_pack_certificate_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_certificate_pack_response_single": tls_certificates_and_hostnames_certificate_pack_response_single_output,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding_output,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_primary": tls_certificates_and_hostnames_primary_output,
-        "tls-certificates-and-hostnames_status-5": tls_certificates_and_hostnames_status_5_output,
-        "tls-certificates-and-hostnames_type-2": tls_certificates_and_hostnames_type_2_output,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_pack": tls$$certificates$$and$$hostnames_certificate_pack,
+        "tls-certificates-and-hostnames_certificate_pack_certificate": tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+        "tls-certificates-and-hostnames_certificate_pack_response_single": tls$$certificates$$and$$hostnames_certificate_pack_response_single,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
       },
     },
     request: (args) => ({
@@ -518,69 +484,73 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_certificate_packs_list",
+    name: "ssl_certificatePacks_list",
     title: "List Certificate Packs",
-    description: "For a given zone, list all active certificate packs.",
+    description: "For a given zone, list all active certificate packs.\n\nGET /zones/{zone_id}/ssl/certificate_packs",
     inputSchema: {
       type: "object",
       properties: {
-        "deploy": {
-          "description": "Specify the deployment environment for the certificate packs.",
-          "enum": [
-            "staging",
-            "production"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of certificate packs per page.",
-          "type": "number"
-        },
-        "status": {
-          "description": "Include Certificate Packs of all statuses, not just active ones.",
-          "enum": [
-            "all"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "deploy": {
+              "description": "Specify the deployment environment for the certificate packs.",
+              "enum": [
+                "staging",
+                "production"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of certificate packs per page.",
+              "type": "number"
+            },
+            "status": {
+              "description": "Include Certificate Packs of all statuses, not just active ones.",
+              "enum": [
+                "all"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_pack_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2_output,
-        "tls-certificates-and-hostnames_certificate_pack": tls_certificates_and_hostnames_certificate_pack_output,
-        "tls-certificates-and-hostnames_certificate_pack_certificate": tls_certificates_and_hostnames_certificate_pack_certificate_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_certificate_pack_response_collection": tls_certificates_and_hostnames_certificate_pack_response_collection_output,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding_output,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_primary": tls_certificates_and_hostnames_primary_output,
-        "tls-certificates-and-hostnames_status-5": tls_certificates_and_hostnames_status_5_output,
-        "tls-certificates-and-hostnames_type-2": tls_certificates_and_hostnames_type_2_output,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_certificate_pack": tls$$certificates$$and$$hostnames_certificate_pack,
+        "tls-certificates-and-hostnames_certificate_pack_certificate": tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+        "tls-certificates-and-hostnames_certificate_pack_response_collection": tls$$certificates$$and$$hostnames_certificate_pack_response_collection,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
       },
     },
     annotations: {
@@ -626,33 +596,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate_authority-2": tls_certificates_and_hostnames_certificate_authority_2_output,
-        "tls-certificates-and-hostnames_certificate_pack": tls_certificates_and_hostnames_certificate_pack_output,
-        "tls-certificates-and-hostnames_certificate_pack_certificate": tls_certificates_and_hostnames_certificate_pack_certificate_output,
-        "tls-certificates-and-hostnames_certificate_pack_identifier": tls_certificates_and_hostnames_certificate_pack_identifier_output,
-        "tls-certificates-and-hostnames_certificate_pack_response_collection": tls_certificates_and_hostnames_certificate_pack_response_collection_output,
-        "tls-certificates-and-hostnames_cloudflare_branding": tls_certificates_and_hostnames_cloudflare_branding_output,
-        "tls-certificates-and-hostnames_hosts-2": tls_certificates_and_hostnames_hosts_2_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_primary": tls_certificates_and_hostnames_primary_output,
-        "tls-certificates-and-hostnames_status-5": tls_certificates_and_hostnames_status_5_output,
-        "tls-certificates-and-hostnames_type-2": tls_certificates_and_hostnames_type_2_output,
-        "tls-certificates-and-hostnames_validation_method": tls_certificates_and_hostnames_validation_method_output,
-        "tls-certificates-and-hostnames_validation_record": tls_certificates_and_hostnames_validation_record_output,
-        "tls-certificates-and-hostnames_validity_days": tls_certificates_and_hostnames_validity_days_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificate_pack": tls$$certificates$$and$$hostnames_certificate_pack,
+        "tls-certificates-and-hostnames_certificate_pack_certificate": tls$$certificates$$and$$hostnames_certificate_pack_certificate,
+        "tls-certificates-and-hostnames_certificate_pack_response_collection": tls$$certificates$$and$$hostnames_certificate_pack_response_collection,
+        "tls-certificates-and-hostnames_hosts-2": tls$$certificates$$and$$hostnames_hosts$$2,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_validation_record": tls$$certificates$$and$$hostnames_validation_record,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/ssl/certificate_packs`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["status", args["status"], true],
-        ["deploy", args["deploy"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["status", param(args, "query", "status"), true],
+        ["deploy", param(args, "query", "deploy"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ssl/clientCertificates/outputs.ts b/src/generated/forge-mcp/ssl/clientCertificates/outputs.ts
index 8f85fa585..2258e7650 100644
--- a/src/generated/forge-mcp/ssl/clientCertificates/outputs.ts
+++ b/src/generated/forge-mcp/ssl/clientCertificates/outputs.ts
@@ -3,18 +3,11 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-7` in responses.
- */
-export const tls_certificates_and_hostnames_certificate_7_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_certificate_authority-4` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_authority_4_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_authority$$4: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -30,80 +23,78 @@ export const tls_certificates_and_hostnames_certificate_authority_4_output: Json
  * The schema of `tls-certificates-and-hostnames_client_certificate` in
  * responses.
  */
-export const tls_certificates_and_hostnames_client_certificate_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_client_certificate: JsonSchema = {
   "properties": {
     "certificate": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-7"
+      "type": "string"
     },
     "certificate_authority": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_authority-4"
     },
     "common_name": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_common_name"
+      "type": "string"
     },
     "country": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_country"
+      "type": "string"
     },
     "csr": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_csr-2"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expired_on"
+      "type": "string"
     },
     "fingerprint_sha256": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_fingerprint_sha256"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_identifier"
+      "type": "string"
     },
     "issued_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_issued_on"
+      "type": "string"
     },
     "location": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_location"
+      "type": "string"
     },
     "organization": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_organization"
+      "type": "string"
     },
     "organizational_unit": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_organizational_unit"
+      "type": "string"
     },
     "serial_number": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_serial_number-3"
+      "type": "string"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature-3"
+      "type": "string"
     },
     "ski": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_ski"
+      "type": "string"
     },
     "state": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_state"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-11"
+      "enum": [
+        "active",
+        "pending_reactivation",
+        "pending_revocation",
+        "revoked"
+      ],
+      "type": "string"
     },
     "validity_days": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_validity_days-2"
+      "type": "integer"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_client_certificate_identifier`
- * in responses.
- */
-export const tls_certificates_and_hostnames_client_certificate_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_client_certificate_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_client_certificate_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_client_certificate_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -127,7 +118,7 @@ export const tls_certificates_and_hostnames_client_certificate_response_collecti
  * `tls-certificates-and-hostnames_client_certificate_response_single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_client_certificate_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_client_certificate_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -142,116 +133,3 @@ export const tls_certificates_and_hostnames_client_certificate_response_single_o
     }
   ]
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_common_name` in responses.
- */
-export const tls_certificates_and_hostnames_common_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_country` in responses.
- */
-export const tls_certificates_and_hostnames_country_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_csr-2` in responses.
- */
-export const tls_certificates_and_hostnames_csr_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_expired_on` in responses.
- */
-export const tls_certificates_and_hostnames_expired_on_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_fingerprint_sha256` in
- * responses.
- */
-export const tls_certificates_and_hostnames_fingerprint_sha256_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_issued_on` in responses.
- */
-export const tls_certificates_and_hostnames_issued_on_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_location` in responses.
- */
-export const tls_certificates_and_hostnames_location_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_organization` in responses.
- */
-export const tls_certificates_and_hostnames_organization_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_organizational_unit` in
- * responses.
- */
-export const tls_certificates_and_hostnames_organizational_unit_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_serial_number-3` in responses.
- */
-export const tls_certificates_and_hostnames_serial_number_3_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_signature-3` in responses.
- */
-export const tls_certificates_and_hostnames_signature_3_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_ski` in responses.
- */
-export const tls_certificates_and_hostnames_ski_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_state` in responses.
- */
-export const tls_certificates_and_hostnames_state_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_status-11` in responses.
- */
-export const tls_certificates_and_hostnames_status_11_output: JsonSchema = {
-  "enum": [
-    "active",
-    "pending_reactivation",
-    "pending_revocation",
-    "revoked"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_validity_days-2` in responses.
- */
-export const tls_certificates_and_hostnames_validity_days_2_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/ssl/clientCertificates/schemas.ts b/src/generated/forge-mcp/ssl/clientCertificates/schemas.ts
deleted file mode 100644
index f73fe75f6..000000000
--- a/src/generated/forge-mcp/ssl/clientCertificates/schemas.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_client_certificate_identifier`.
- */
-export const tls_certificates_and_hostnames_client_certificate_identifier: JsonSchema = {
-  "description": "Client Certificate Tag",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_csr-2`.
- */
-export const tls_certificates_and_hostnames_csr_2: JsonSchema = {
-  "description": "The Certificate Signing Request (CSR). Must be newline-encoded.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_validity_days-2`.
- */
-export const tls_certificates_and_hostnames_validity_days_2: JsonSchema = {
-  "description": "The number of days the Client Certificate will be valid after the issued_on date.",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/ssl/clientCertificates/tools.ts b/src/generated/forge-mcp/ssl/clientCertificates/tools.ts
index 4efd7c071..3bff7da1e 100644
--- a/src/generated/forge-mcp/ssl/clientCertificates/tools.ts
+++ b/src/generated/forge-mcp/ssl/clientCertificates/tools.ts
@@ -1,64 +1,41 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_certificate_7_output,
-  tls_certificates_and_hostnames_certificate_authority_4_output,
-  tls_certificates_and_hostnames_client_certificate_identifier_output,
-  tls_certificates_and_hostnames_client_certificate_output,
-  tls_certificates_and_hostnames_client_certificate_response_collection_output,
-  tls_certificates_and_hostnames_client_certificate_response_single_output,
-  tls_certificates_and_hostnames_common_name_output,
-  tls_certificates_and_hostnames_country_output,
-  tls_certificates_and_hostnames_csr_2_output,
-  tls_certificates_and_hostnames_expired_on_output,
-  tls_certificates_and_hostnames_fingerprint_sha256_output,
-  tls_certificates_and_hostnames_issued_on_output,
-  tls_certificates_and_hostnames_location_output,
-  tls_certificates_and_hostnames_organization_output,
-  tls_certificates_and_hostnames_organizational_unit_output,
-  tls_certificates_and_hostnames_serial_number_3_output,
-  tls_certificates_and_hostnames_signature_3_output,
-  tls_certificates_and_hostnames_ski_output,
-  tls_certificates_and_hostnames_state_output,
-  tls_certificates_and_hostnames_status_11_output,
-  tls_certificates_and_hostnames_validity_days_2_output,
+  tls$$certificates$$and$$hostnames_certificate_authority$$4,
+  tls$$certificates$$and$$hostnames_client_certificate,
+  tls$$certificates$$and$$hostnames_client_certificate_response_collection,
+  tls$$certificates$$and$$hostnames_client_certificate_response_single,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_client_certificate_identifier,
-  tls_certificates_and_hostnames_csr_2,
-  tls_certificates_and_hostnames_validity_days_2,
-} from "./schemas.js";
 
 /**
- * The tools of `ssl.client_certificates`.
+ * The tools of `ssl.clientCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_client_certificates_create",
+    name: "ssl_clientCertificates_create",
     title: "Create Client Certificate",
-    description: "Create a new API Shield mTLS Client Certificate.",
+    description: "Create a new API Shield mTLS Client Certificate.\n\nPOST /zones/{zone_id}/client_certificates",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "csr": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_csr-2",
-              "description": "The Certificate Signing Request (CSR). Must be newline-encoded."
+              "description": "The Certificate Signing Request (CSR). Must be newline-encoded.",
+              "type": "string"
             },
             "validity_days": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_validity_days-2",
-              "description": "The number of days the Client Certificate will be valid after the issued_on date."
+              "description": "The number of days the Client Certificate will be valid after the issued_on date.",
+              "type": "integer"
             }
           },
           "required": [
@@ -67,46 +44,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_single": tls_certificates_and_hostnames_client_certificate_response_single_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_single": tls$$certificates$$and$$hostnames_client_certificate_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -151,29 +116,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_single": tls_certificates_and_hostnames_client_certificate_response_single_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_single": tls$$certificates$$and$$hostnames_client_certificate_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -182,55 +130,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_client_certificates_delete",
+    name: "ssl_clientCertificates_delete",
     title: "Revoke Client Certificate",
-    description: "Set a API Shield mTLS Client Certificate to pending_revocation status for processing to revoked status.",
+    description: "Set a API Shield mTLS Client Certificate to pending_revocation status for processing to revoked status.\n\nDELETE /zones/{zone_id}/client_certificates/{client_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "client_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_identifier",
-          "description": "Client Certificate Tag"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "client_certificate_id": {
+              "description": "Client Certificate Tag",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "client_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "client_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_single": tls_certificates_and_hostnames_client_certificate_response_single_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_single": tls$$certificates$$and$$hostnames_client_certificate_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -268,29 +205,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_single": tls_certificates_and_hostnames_client_certificate_response_single_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_single": tls$$certificates$$and$$hostnames_client_certificate_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -298,9 +218,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_client_certificates_edit",
+    name: "ssl_clientCertificates_edit",
     title: "Reactivate Client Certificate",
-    description: "If a API Shield mTLS Client Certificate is in a pending_revocation state, you may reactivate it with this endpoint.",
+    description: "If a API Shield mTLS Client Certificate is in a pending_revocation state, you may reactivate it with this endpoint.\n\nPATCH /zones/{zone_id}/client_certificates/{client_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -312,50 +232,39 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "client_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_identifier",
-          "description": "Client Certificate Tag"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "client_certificate_id": {
+              "description": "Client Certificate Tag",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "client_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "client_certificate_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_single": tls_certificates_and_hostnames_client_certificate_response_single_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_single": tls$$certificates$$and$$hostnames_client_certificate_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -393,29 +302,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_single": tls_certificates_and_hostnames_client_certificate_response_single_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_single": tls$$certificates$$and$$hostnames_client_certificate_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -424,55 +316,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_client_certificates_get",
+    name: "ssl_clientCertificates_get",
     title: "Client Certificate Details",
-    description: "Get Details for a single mTLS API Shield Client Certificate.",
+    description: "Get Details for a single mTLS API Shield Client Certificate.\n\nGET /zones/{zone_id}/client_certificates/{client_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "client_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_identifier",
-          "description": "Client Certificate Tag"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "client_certificate_id": {
+              "description": "Client Certificate Tag",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "client_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "client_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_single": tls_certificates_and_hostnames_client_certificate_response_single_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_single": tls$$certificates$$and$$hostnames_client_certificate_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -511,29 +392,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_single": tls_certificates_and_hostnames_client_certificate_response_single_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_single": tls$$certificates$$and$$hostnames_client_certificate_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -541,79 +405,75 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_client_certificates_list",
+    name: "ssl_clientCertificates_list",
     title: "List Client Certificates",
-    description: "List all of your Zone's API Shield mTLS Client Certificates by Status and/or using Pagination.",
+    description: "List all of your Zone's API Shield mTLS Client Certificates by Status and/or using Pagination.\n\nGET /zones/{zone_id}/client_certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "limit": {
-          "description": "Limit to the number of records returned.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Offset the results.",
-          "type": "integer"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of records per page.",
-          "type": "number"
-        },
-        "status": {
-          "description": "Client Certitifcate Status to filter results by.",
-          "enum": [
-            "all",
-            "active",
-            "pending_reactivation",
-            "pending_revocation",
-            "revoked"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "description": "Limit to the number of records returned.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Offset the results.",
+              "type": "integer"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of records per page.",
+              "type": "number"
+            },
+            "status": {
+              "description": "Client Certitifcate Status to filter results by.",
+              "enum": [
+                "all",
+                "active",
+                "pending_reactivation",
+                "pending_revocation",
+                "revoked"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_client_certificate_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_collection": tls_certificates_and_hostnames_client_certificate_response_collection_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_collection": tls$$certificates$$and$$hostnames_client_certificate_response_collection,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -652,40 +512,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate-7": tls_certificates_and_hostnames_certificate_7_output,
-        "tls-certificates-and-hostnames_certificate_authority-4": tls_certificates_and_hostnames_certificate_authority_4_output,
-        "tls-certificates-and-hostnames_client_certificate": tls_certificates_and_hostnames_client_certificate_output,
-        "tls-certificates-and-hostnames_client_certificate_identifier": tls_certificates_and_hostnames_client_certificate_identifier_output,
-        "tls-certificates-and-hostnames_client_certificate_response_collection": tls_certificates_and_hostnames_client_certificate_response_collection_output,
-        "tls-certificates-and-hostnames_common_name": tls_certificates_and_hostnames_common_name_output,
-        "tls-certificates-and-hostnames_country": tls_certificates_and_hostnames_country_output,
-        "tls-certificates-and-hostnames_csr-2": tls_certificates_and_hostnames_csr_2_output,
-        "tls-certificates-and-hostnames_expired_on": tls_certificates_and_hostnames_expired_on_output,
-        "tls-certificates-and-hostnames_fingerprint_sha256": tls_certificates_and_hostnames_fingerprint_sha256_output,
-        "tls-certificates-and-hostnames_issued_on": tls_certificates_and_hostnames_issued_on_output,
-        "tls-certificates-and-hostnames_location": tls_certificates_and_hostnames_location_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_organization": tls_certificates_and_hostnames_organization_output,
-        "tls-certificates-and-hostnames_organizational_unit": tls_certificates_and_hostnames_organizational_unit_output,
-        "tls-certificates-and-hostnames_serial_number-3": tls_certificates_and_hostnames_serial_number_3_output,
-        "tls-certificates-and-hostnames_signature-3": tls_certificates_and_hostnames_signature_3_output,
-        "tls-certificates-and-hostnames_ski": tls_certificates_and_hostnames_ski_output,
-        "tls-certificates-and-hostnames_state": tls_certificates_and_hostnames_state_output,
-        "tls-certificates-and-hostnames_status-11": tls_certificates_and_hostnames_status_11_output,
-        "tls-certificates-and-hostnames_validity_days-2": tls_certificates_and_hostnames_validity_days_2_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificate_authority-4": tls$$certificates$$and$$hostnames_certificate_authority$$4,
+        "tls-certificates-and-hostnames_client_certificate": tls$$certificates$$and$$hostnames_client_certificate,
+        "tls-certificates-and-hostnames_client_certificate_response_collection": tls$$certificates$$and$$hostnames_client_certificate_response_collection,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/client_certificates`,
       query: [
-        ["status", args["status"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["status", param(args, "query", "status"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ssl/ctAlerting/outputs.ts b/src/generated/forge-mcp/ssl/ctAlerting/outputs.ts
index 83939f871..fc9be5e08 100644
--- a/src/generated/forge-mcp/ssl/ctAlerting/outputs.ts
+++ b/src/generated/forge-mcp/ssl/ctAlerting/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `tls-certificates-and-hostnames_ct_alerting_emails` in
  * responses.
  */
-export const tls_certificates_and_hostnames_ct_alerting_emails_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ct_alerting_emails: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -15,25 +15,17 @@ export const tls_certificates_and_hostnames_ct_alerting_emails_output: JsonSchem
   "type": "array"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_ct_alerting_enabled` in
- * responses.
- */
-export const tls_certificates_and_hostnames_ct_alerting_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_ct_alerting_subscription` in
  * responses.
  */
-export const tls_certificates_and_hostnames_ct_alerting_subscription_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ct_alerting_subscription: JsonSchema = {
   "properties": {
     "emails": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ct_alerting_emails"
     },
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_ct_alerting_enabled"
+      "type": "boolean"
     }
   },
   "required": [
@@ -47,7 +39,7 @@ export const tls_certificates_and_hostnames_ct_alerting_subscription_output: Jso
  * `tls-certificates-and-hostnames_ct_alerting_subscription_response_single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_ct_alerting_subscription_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ct_alerting_subscription_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
diff --git a/src/generated/forge-mcp/ssl/ctAlerting/schemas.ts b/src/generated/forge-mcp/ssl/ctAlerting/schemas.ts
index 5550acd84..fc7331f59 100644
--- a/src/generated/forge-mcp/ssl/ctAlerting/schemas.ts
+++ b/src/generated/forge-mcp/ssl/ctAlerting/schemas.ts
@@ -6,8 +6,8 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `tls-certificates-and-hostnames_ct_alerting_emails`.
  */
-export const tls_certificates_and_hostnames_ct_alerting_emails: JsonSchema = {
-  "description": "Email addresses that receive CT alert notifications for the zone. A maximum of 100 addresses may be configured. Each address must be a valid RFC 5322 email address and must not contain a comma.\n",
+export const tls$$certificates$$and$$hostnames_ct_alerting_emails: JsonSchema = {
+  "description": "Email addresses that receive CT alert notifications for the zone. A maximum of 100 addresses may be configured. Each address must be a valid RFC 5322 email address and must not contain a comma.",
   "items": {
     "type": "string"
   },
@@ -15,28 +15,20 @@ export const tls_certificates_and_hostnames_ct_alerting_emails: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_ct_alerting_enabled`.
- */
-export const tls_certificates_and_hostnames_ct_alerting_enabled: JsonSchema = {
-  "description": "Whether CT alerting is enabled for the zone.",
-  "type": "boolean"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_ct_alerting_subscription_update`.
  */
-export const tls_certificates_and_hostnames_ct_alerting_subscription_update: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ct_alerting_subscription_update: JsonSchema = {
   "description": "Request body for updating CT alerting subscription settings.",
   "properties": {
     "emails": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ct_alerting_emails",
-      "description": "Email addresses that receive CT alert notifications for the zone. A maximum of 100 addresses may be configured. Each address must be a valid RFC 5322 email address and must not contain a comma.\n"
+      "description": "Email addresses that receive CT alert notifications for the zone. A maximum of 100 addresses may be configured. Each address must be a valid RFC 5322 email address and must not contain a comma."
     },
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_ct_alerting_enabled",
-      "description": "Whether CT alerting is enabled for the zone."
+      "description": "Whether CT alerting is enabled for the zone.",
+      "type": "boolean"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/ssl/ctAlerting/tools.ts b/src/generated/forge-mcp/ssl/ctAlerting/tools.ts
index f98942620..069acb70e 100644
--- a/src/generated/forge-mcp/ssl/ctAlerting/tools.ts
+++ b/src/generated/forge-mcp/ssl/ctAlerting/tools.ts
@@ -3,55 +3,58 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_ct_alerting_emails_output,
-  tls_certificates_and_hostnames_ct_alerting_enabled_output,
-  tls_certificates_and_hostnames_ct_alerting_subscription_output,
-  tls_certificates_and_hostnames_ct_alerting_subscription_response_single_output,
+  tls$$certificates$$and$$hostnames_ct_alerting_emails,
+  tls$$certificates$$and$$hostnames_ct_alerting_subscription,
+  tls$$certificates$$and$$hostnames_ct_alerting_subscription_response_single,
 } from "./outputs.js";
 import {
-  tls_certificates_and_hostnames_ct_alerting_emails,
-  tls_certificates_and_hostnames_ct_alerting_enabled,
-  tls_certificates_and_hostnames_ct_alerting_subscription_update,
+  tls$$certificates$$and$$hostnames_ct_alerting_emails as tls$$certificates$$and$$hostnames_ct_alerting_emails$,
+  tls$$certificates$$and$$hostnames_ct_alerting_subscription_update,
 } from "./schemas.js";
 
 /**
- * The tools of `ssl.ct_alerting`.
+ * The tools of `ssl.ctAlerting`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_ct_alerting_get",
+    name: "ssl_ctAlerting_get",
     title: "Get CT Alerting Subscription",
-    description: "Retrieve the Certificate Transparency alerting subscription settings for a zone. Returns whether CT monitoring is enabled and the list of email addresses that receive alerts, if any have been configured.",
+    description: "Retrieve the Certificate Transparency alerting subscription settings for a zone. Returns whether CT monitoring is enabled and the list of email addresses that receive alerts, if any have been configured.\n\nGET /zones/{zone_id}/ct/alerting",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ct_alerting_subscription_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ct_alerting_emails": tls_certificates_and_hostnames_ct_alerting_emails_output,
-        "tls-certificates-and-hostnames_ct_alerting_enabled": tls_certificates_and_hostnames_ct_alerting_enabled_output,
-        "tls-certificates-and-hostnames_ct_alerting_subscription": tls_certificates_and_hostnames_ct_alerting_subscription_output,
-        "tls-certificates-and-hostnames_ct_alerting_subscription_response_single": tls_certificates_and_hostnames_ct_alerting_subscription_response_single_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_ct_alerting_emails": tls$$certificates$$and$$hostnames_ct_alerting_emails,
+        "tls-certificates-and-hostnames_ct_alerting_subscription": tls$$certificates$$and$$hostnames_ct_alerting_subscription,
+        "tls-certificates-and-hostnames_ct_alerting_subscription_response_single": tls$$certificates$$and$$hostnames_ct_alerting_subscription_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -92,13 +95,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ct_alerting_emails": tls_certificates_and_hostnames_ct_alerting_emails_output,
-        "tls-certificates-and-hostnames_ct_alerting_enabled": tls_certificates_and_hostnames_ct_alerting_enabled_output,
-        "tls-certificates-and-hostnames_ct_alerting_subscription": tls_certificates_and_hostnames_ct_alerting_subscription_output,
-        "tls-certificates-and-hostnames_ct_alerting_subscription_response_single": tls_certificates_and_hostnames_ct_alerting_subscription_response_single_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_ct_alerting_emails": tls$$certificates$$and$$hostnames_ct_alerting_emails,
+        "tls-certificates-and-hostnames_ct_alerting_subscription": tls$$certificates$$and$$hostnames_ct_alerting_subscription,
+        "tls-certificates-and-hostnames_ct_alerting_subscription_response_single": tls$$certificates$$and$$hostnames_ct_alerting_subscription_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -106,40 +108,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_ct_alerting_update",
+    name: "ssl_ctAlerting_update",
     title: "Update CT Alerting Subscription",
-    description: "Create or update the Certificate Transparency alerting subscription for a zone. Enables or disables email notifications when certificates are issued for the zone's domains.\nThe `enabled` field is required on every request and controls whether the subscription is active. The `emails` field is optional and, when provided, replaces the stored recipient list for the zone. When `emails` is omitted, the stored recipient list is preserved and only the enabled state is toggled. A maximum of 100 email addresses may be configured per zone.\nRequests that omit `enabled` are rejected with error code 1008.\nSubscribe and unsubscribe notification emails are only sent for recipients whose effective subscription state changes. Idempotent requests (no state change) send no notification email.",
+    description: "Create or update the Certificate Transparency alerting subscription for a zone. Enables or disables email notifications when certificates are issued for the zone's domains.\nThe `enabled` field is required on every request and controls whether the subscription is active. The `emails` field is optional and, when provided, replaces the stored recipient list for the zone. When `emails` is omitted, the stored recipient list is preserved and only the enabled state is toggled. A maximum of 100 email addresses may be configured per zone.\nRequests that omit `enabled` are rejected with error code 1008.\nSubscribe and unsubscribe notification emails are only sent for recipients whose effective subscription state changes. Idempotent requests (no state change) send no notification email.\n\nPATCH /zones/{zone_id}/ct/alerting",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/tls-certificates-and-hostnames_ct_alerting_subscription_update"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_ct_alerting_emails": tls_certificates_and_hostnames_ct_alerting_emails,
-        "tls-certificates-and-hostnames_ct_alerting_enabled": tls_certificates_and_hostnames_ct_alerting_enabled,
-        "tls-certificates-and-hostnames_ct_alerting_subscription_update": tls_certificates_and_hostnames_ct_alerting_subscription_update,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
+        "tls-certificates-and-hostnames_ct_alerting_emails": tls$$certificates$$and$$hostnames_ct_alerting_emails$,
+        "tls-certificates-and-hostnames_ct_alerting_subscription_update": tls$$certificates$$and$$hostnames_ct_alerting_subscription_update,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ct_alerting_subscription_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ct_alerting_emails": tls_certificates_and_hostnames_ct_alerting_emails_output,
-        "tls-certificates-and-hostnames_ct_alerting_enabled": tls_certificates_and_hostnames_ct_alerting_enabled_output,
-        "tls-certificates-and-hostnames_ct_alerting_subscription": tls_certificates_and_hostnames_ct_alerting_subscription_output,
-        "tls-certificates-and-hostnames_ct_alerting_subscription_response_single": tls_certificates_and_hostnames_ct_alerting_subscription_response_single_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_ct_alerting_emails": tls$$certificates$$and$$hostnames_ct_alerting_emails,
+        "tls-certificates-and-hostnames_ct_alerting_subscription": tls$$certificates$$and$$hostnames_ct_alerting_subscription,
+        "tls-certificates-and-hostnames_ct_alerting_subscription_response_single": tls$$certificates$$and$$hostnames_ct_alerting_subscription_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -179,13 +188,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ct_alerting_emails": tls_certificates_and_hostnames_ct_alerting_emails_output,
-        "tls-certificates-and-hostnames_ct_alerting_enabled": tls_certificates_and_hostnames_ct_alerting_enabled_output,
-        "tls-certificates-and-hostnames_ct_alerting_subscription": tls_certificates_and_hostnames_ct_alerting_subscription_output,
-        "tls-certificates-and-hostnames_ct_alerting_subscription_response_single": tls_certificates_and_hostnames_ct_alerting_subscription_response_single_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_ct_alerting_emails": tls$$certificates$$and$$hostnames_ct_alerting_emails,
+        "tls-certificates-and-hostnames_ct_alerting_subscription": tls$$certificates$$and$$hostnames_ct_alerting_subscription,
+        "tls-certificates-and-hostnames_ct_alerting_subscription_response_single": tls$$certificates$$and$$hostnames_ct_alerting_subscription_response_single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/customCertificates/outputs.ts b/src/generated/forge-mcp/ssl/customCertificates/outputs.ts
index a0ba5748e..bfc853754 100644
--- a/src/generated/forge-mcp/ssl/customCertificates/outputs.ts
+++ b/src/generated/forge-mcp/ssl/customCertificates/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * `tls-certificates-and-hostnames_certificate_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -31,7 +31,7 @@ export const tls_certificates_and_hostnames_certificate_response_collection_outp
  * The schema of `tls-certificates-and-hostnames_certificate_response_id_only`
  * in responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_id_only_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_id_only: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -41,7 +41,7 @@ export const tls_certificates_and_hostnames_certificate_response_id_only_output:
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_certificate_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -56,7 +56,7 @@ export const tls_certificates_and_hostnames_certificate_response_id_only_output:
  * The schema of `tls-certificates-and-hostnames_certificate_response_single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -76,16 +76,22 @@ export const tls_certificates_and_hostnames_certificate_response_single_output:
  * The schema of `tls-certificates-and-hostnames_custom-certificate` in
  * responses.
  */
-export const tls_certificates_and_hostnames_custom_certificate_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_custom$$certificate: JsonSchema = {
   "properties": {
     "bundle_method": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_bundle_method"
+      "enum": [
+        "ubiquitous",
+        "optimal",
+        "force"
+      ],
+      "type": "string"
     },
     "custom_csr_id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_id"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expires_on"
+      "format": "date-time",
+      "type": "string"
     },
     "geo_restrictions": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_geo_restrictions"
@@ -94,34 +100,43 @@ export const tls_certificates_and_hostnames_custom_certificate_output: JsonSchem
       "$ref": "#/$defs/tls-certificates-and-hostnames_hosts"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_custom_certificate_identifier"
+      "type": "string"
     },
     "issuer": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_issuer"
+      "type": "string"
     },
     "keyless_server": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_keyless-certificate"
     },
     "modified_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "policy_restrictions": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_policy_restrictions"
+      "type": "string"
     },
     "priority": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_priority"
+      "type": "number"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status"
+      "enum": [
+        "active",
+        "expired",
+        "deleted",
+        "pending",
+        "initializing"
+      ],
+      "type": "string"
     },
     "uploaded_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_uploaded_on"
+      "format": "date-time",
+      "type": "string"
     },
     "zone_id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_identifier"
+      "type": "string"
     }
   },
   "required": [
@@ -131,33 +146,10 @@ export const tls_certificates_and_hostnames_custom_certificate_output: JsonSchem
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_custom_certificate_identifier`
- * in responses.
- */
-export const tls_certificates_and_hostnames_custom_certificate_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_custom_csr_id` in responses.
- */
-export const tls_certificates_and_hostnames_custom_csr_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_expires_on` in responses.
- */
-export const tls_certificates_and_hostnames_expires_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_geo_restrictions` in responses.
  */
-export const tls_certificates_and_hostnames_geo_restrictions_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_geo_restrictions: JsonSchema = {
   "properties": {
     "label": {
       "enum": [
@@ -174,46 +166,9 @@ export const tls_certificates_and_hostnames_geo_restrictions_output: JsonSchema
 /**
  * The schema of `tls-certificates-and-hostnames_hosts` in responses.
  */
-export const tls_certificates_and_hostnames_hosts_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hosts: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_modified_on` in responses.
- */
-export const tls_certificates_and_hostnames_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_policy_restrictions` in
- * responses.
- */
-export const tls_certificates_and_hostnames_policy_restrictions_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_priority` in responses.
- */
-export const tls_certificates_and_hostnames_priority_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_status` in responses.
- */
-export const tls_certificates_and_hostnames_status_output: JsonSchema = {
-  "enum": [
-    "active",
-    "expired",
-    "deleted",
-    "pending",
-    "initializing"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/customCertificates/prioritize/tools.ts b/src/generated/forge-mcp/ssl/customCertificates/prioritize/tools.ts
index bc1e9b414..32e657915 100644
--- a/src/generated/forge-mcp/ssl/customCertificates/prioritize/tools.ts
+++ b/src/generated/forge-mcp/ssl/customCertificates/prioritize/tools.ts
@@ -3,52 +3,30 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_identifier_output,
-  tls_certificates_and_hostnames_issuer_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_signature_output,
-  tls_certificates_and_hostnames_uploaded_on_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_bundle_method_output,
-  tls_certificates_and_hostnames_enabled_output,
-  tls_certificates_and_hostnames_host_output,
-  tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-  tls_certificates_and_hostnames_keyless_certificate_output,
-  tls_certificates_and_hostnames_keyless_private_ip_output,
-  tls_certificates_and_hostnames_keyless_tunnel_output,
-  tls_certificates_and_hostnames_keyless_vnet_id_output,
-  tls_certificates_and_hostnames_name_output,
-  tls_certificates_and_hostnames_port_output,
-  tls_certificates_and_hostnames_status_2_output,
+  tls$$certificates$$and$$hostnames_keyless$$certificate,
+  tls$$certificates$$and$$hostnames_keyless_tunnel,
 } from "../../outputs.js";
 import {
-  tls_certificates_and_hostnames_certificate_response_collection_output,
-  tls_certificates_and_hostnames_custom_certificate_identifier_output,
-  tls_certificates_and_hostnames_custom_certificate_output,
-  tls_certificates_and_hostnames_custom_csr_id_output,
-  tls_certificates_and_hostnames_expires_on_output,
-  tls_certificates_and_hostnames_geo_restrictions_output,
-  tls_certificates_and_hostnames_hosts_output,
-  tls_certificates_and_hostnames_modified_on_output,
-  tls_certificates_and_hostnames_policy_restrictions_output,
-  tls_certificates_and_hostnames_priority_output,
-  tls_certificates_and_hostnames_status_output,
+  tls$$certificates$$and$$hostnames_certificate_response_collection,
+  tls$$certificates$$and$$hostnames_custom$$certificate,
+  tls$$certificates$$and$$hostnames_geo_restrictions,
+  tls$$certificates$$and$$hostnames_hosts,
 } from "../outputs.js";
-import { tls_certificates_and_hostnames_priority } from "../schemas.js";
 
 /**
- * The tools of `ssl.custom_certificates.prioritize`.
+ * The tools of `ssl.customCertificates.prioritize`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_custom_certificates_prioritize_update",
+    name: "ssl_customCertificates_prioritize_update",
     title: "Re-prioritize SSL Certificates",
-    description: "If a zone has multiple SSL certificates, you can set the order in which they should be used during a request. The higher priority will break ties across overlapping 'legacy_custom' certificates.",
+    description: "If a zone has multiple SSL certificates, you can set the order in which they should be used during a request. The higher priority will break ties across overlapping 'legacy_custom' certificates.\n\nPUT /zones/{zone_id}/custom_certificates/prioritize",
     inputSchema: {
       type: "object",
       properties: {
@@ -59,8 +37,8 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "priority": {
-                    "$ref": "#/$defs/tls-certificates-and-hostnames_priority",
-                    "description": "The order/priority in which the certificate will be used in a request. The higher priority will break ties across overlapping 'legacy_custom' certificates, but 'legacy_custom' certificates will always supercede 'sni_custom' certificates."
+                    "description": "The order/priority in which the certificate will be used in a request. The higher priority will break ties across overlapping 'legacy_custom' certificates, but 'legacy_custom' certificates will always supercede 'sni_custom' certificates.",
+                    "type": "number"
                   }
                 },
                 "type": "object"
@@ -73,52 +51,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_collection": tls_certificates_and_hostnames_certificate_response_collection_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_certificate_response_collection": tls$$certificates$$and$$hostnames_certificate_response_collection,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -164,36 +128,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_collection": tls_certificates_and_hostnames_certificate_response_collection_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificate_response_collection": tls$$certificates$$and$$hostnames_certificate_response_collection,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/customCertificates/schemas.ts b/src/generated/forge-mcp/ssl/customCertificates/schemas.ts
index 972997f84..f1185c66f 100644
--- a/src/generated/forge-mcp/ssl/customCertificates/schemas.ts
+++ b/src/generated/forge-mcp/ssl/customCertificates/schemas.ts
@@ -3,38 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_custom_certificate_identifier`.
- */
-export const tls_certificates_and_hostnames_custom_certificate_identifier: JsonSchema = {
-  "description": "Custom certificate identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_custom_csr_id`.
- */
-export const tls_certificates_and_hostnames_custom_csr_id: JsonSchema = {
-  "description": "The identifier for the Custom CSR that was used.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_deploy`.
- */
-export const tls_certificates_and_hostnames_deploy: JsonSchema = {
-  "description": "The environment to deploy the certificate to, defaults to production.",
-  "enum": [
-    "staging",
-    "production"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_geo_restrictions`.
  */
-export const tls_certificates_and_hostnames_geo_restrictions: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_geo_restrictions: JsonSchema = {
   "description": "Specify the region where your private key can be held locally for optimal TLS performance. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Options allow distribution to only to U.S. data centers, only to E.U. data centers, or only to highest security data centers. Default distribution is to all Cloudflare datacenters, for optimal performance.",
   "properties": {
     "label": {
@@ -48,39 +20,3 @@ export const tls_certificates_and_hostnames_geo_restrictions: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_policy`.
- */
-export const tls_certificates_and_hostnames_policy: JsonSchema = {
-  "description": "Specify the policy that determines the region where your private key will be held locally. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Any combination of countries, specified by their two letter country code (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) can be chosen, such as 'country: IN', as well as 'region: EU' which refers to the EU region. If there are too few data centers satisfying the policy, it will be rejected.\nNote: The API accepts this field as either \"policy\" or \"policy_restrictions\" in requests. Responses return this field as \"policy_restrictions\".",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_priority`.
- */
-export const tls_certificates_and_hostnames_priority: JsonSchema = {
-  "description": "The order/priority in which the certificate will be used in a request. The higher priority will break ties across overlapping 'legacy_custom' certificates, but 'legacy_custom' certificates will always supercede 'sni_custom' certificates.",
-  "type": "number"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_private_key`.
- */
-export const tls_certificates_and_hostnames_private_key: JsonSchema = {
-  "description": "The zone's private key. Not required if custom_csr_id is provided, in which case the private key is retrieved from the CSR record held by Cloudflare.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_type`.
- */
-export const tls_certificates_and_hostnames_type: JsonSchema = {
-  "description": "The type 'legacy_custom' enables support for legacy clients which do not include SNI in the TLS handshake.",
-  "enum": [
-    "legacy_custom",
-    "sni_custom"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/customCertificates/tools.ts b/src/generated/forge-mcp/ssl/customCertificates/tools.ts
index 7eb072da1..aeb51e5e8 100644
--- a/src/generated/forge-mcp/ssl/customCertificates/tools.ts
+++ b/src/generated/forge-mcp/ssl/customCertificates/tools.ts
@@ -1,108 +1,88 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_identifier_output,
-  tls_certificates_and_hostnames_issuer_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_signature_output,
-  tls_certificates_and_hostnames_uploaded_on_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_bundle_method_output,
-  tls_certificates_and_hostnames_enabled_output,
-  tls_certificates_and_hostnames_host_output,
-  tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-  tls_certificates_and_hostnames_keyless_certificate_output,
-  tls_certificates_and_hostnames_keyless_private_ip_output,
-  tls_certificates_and_hostnames_keyless_tunnel_output,
-  tls_certificates_and_hostnames_keyless_vnet_id_output,
-  tls_certificates_and_hostnames_name_output,
-  tls_certificates_and_hostnames_port_output,
-  tls_certificates_and_hostnames_status_2_output,
+  tls$$certificates$$and$$hostnames_keyless$$certificate,
+  tls$$certificates$$and$$hostnames_keyless_tunnel,
 } from "../outputs.js";
 import {
-  tls_certificates_and_hostnames_bundle_method,
-  tls_certificates_and_hostnames_certificate,
-} from "../schemas.js";
-import {
-  tls_certificates_and_hostnames_certificate_response_collection_output,
-  tls_certificates_and_hostnames_certificate_response_id_only_output,
-  tls_certificates_and_hostnames_certificate_response_single_output,
-  tls_certificates_and_hostnames_custom_certificate_identifier_output,
-  tls_certificates_and_hostnames_custom_certificate_output,
-  tls_certificates_and_hostnames_custom_csr_id_output,
-  tls_certificates_and_hostnames_expires_on_output,
-  tls_certificates_and_hostnames_geo_restrictions_output,
-  tls_certificates_and_hostnames_hosts_output,
-  tls_certificates_and_hostnames_modified_on_output,
-  tls_certificates_and_hostnames_policy_restrictions_output,
-  tls_certificates_and_hostnames_priority_output,
-  tls_certificates_and_hostnames_status_output,
+  tls$$certificates$$and$$hostnames_certificate_response_collection,
+  tls$$certificates$$and$$hostnames_certificate_response_id_only,
+  tls$$certificates$$and$$hostnames_certificate_response_single,
+  tls$$certificates$$and$$hostnames_custom$$certificate,
+  tls$$certificates$$and$$hostnames_geo_restrictions,
+  tls$$certificates$$and$$hostnames_hosts,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_custom_certificate_identifier,
-  tls_certificates_and_hostnames_custom_csr_id,
-  tls_certificates_and_hostnames_deploy,
-  tls_certificates_and_hostnames_geo_restrictions,
-  tls_certificates_and_hostnames_policy,
-  tls_certificates_and_hostnames_private_key,
-  tls_certificates_and_hostnames_type,
-} from "./schemas.js";
+import { tls$$certificates$$and$$hostnames_geo_restrictions as tls$$certificates$$and$$hostnames_geo_restrictions$ } from "./schemas.js";
 
 /**
- * The tools of `ssl.custom_certificates`.
+ * The tools of `ssl.customCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_custom_certificates_create",
+    name: "ssl_customCertificates_create",
     title: "Create SSL Configuration",
-    description: "Upload a new SSL certificate for a zone.",
+    description: "Upload a new SSL certificate for a zone.\n\nPOST /zones/{zone_id}/custom_certificates",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "bundle_method": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_bundle_method",
               "default": "ubiquitous",
-              "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it."
+              "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it.",
+              "enum": [
+                "ubiquitous",
+                "optimal",
+                "force"
+              ],
+              "type": "string"
             },
             "certificate": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate",
-              "description": "The zone's SSL certificate or certificate and the intermediate(s)."
+              "description": "The zone's SSL certificate or certificate and the intermediate(s).",
+              "type": "string"
             },
             "custom_csr_id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_id",
-              "description": "The identifier for the Custom CSR that was used."
+              "description": "The identifier for the Custom CSR that was used.",
+              "type": "string"
             },
             "deploy": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_deploy",
               "default": "production",
-              "description": "The environment to deploy the certificate to, defaults to production."
+              "description": "The environment to deploy the certificate to, defaults to production.",
+              "enum": [
+                "staging",
+                "production"
+              ],
+              "type": "string"
             },
             "geo_restrictions": {
               "$ref": "#/$defs/tls-certificates-and-hostnames_geo_restrictions",
               "description": "Specify the region where your private key can be held locally for optimal TLS performance. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Options allow distribution to only to U.S. data centers, only to E.U. data centers, or only to highest security data centers. Default distribution is to all Cloudflare datacenters, for optimal performance."
             },
             "policy": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_policy",
-              "description": "Specify the policy that determines the region where your private key will be held locally. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Any combination of countries, specified by their two letter country code (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) can be chosen, such as 'country: IN', as well as 'region: EU' which refers to the EU region. If there are too few data centers satisfying the policy, it will be rejected.\nNote: The API accepts this field as either \"policy\" or \"policy_restrictions\" in requests. Responses return this field as \"policy_restrictions\"."
+              "description": "Specify the policy that determines the region where your private key will be held locally. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Any combination of countries, specified by their two letter country code (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) can be chosen, such as 'country: IN', as well as 'region: EU' which refers to the EU region. If there are too few data centers satisfying the policy, it will be rejected.\nNote: The API accepts this field as either \"policy\" or \"policy_restrictions\" in requests. Responses return this field as \"policy_restrictions\".",
+              "type": "string"
             },
             "private_key": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_private_key",
-              "description": "The zone's private key. Not required if custom_csr_id is provided, in which case the private key is retrieved from the CSR record held by Cloudflare."
+              "description": "The zone's private key. Not required if custom_csr_id is provided, in which case the private key is retrieved from the CSR record held by Cloudflare.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_type",
               "default": "legacy_custom",
-              "description": "The type 'legacy_custom' enables support for legacy clients which do not include SNI in the TLS handshake."
+              "description": "The type 'legacy_custom' enables support for legacy clients which do not include SNI in the TLS handshake.",
+              "enum": [
+                "legacy_custom",
+                "sni_custom"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -110,58 +90,40 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method,
-        "tls-certificates-and-hostnames_certificate": tls_certificates_and_hostnames_certificate,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id,
-        "tls-certificates-and-hostnames_deploy": tls_certificates_and_hostnames_deploy,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_policy": tls_certificates_and_hostnames_policy,
-        "tls-certificates-and-hostnames_private_key": tls_certificates_and_hostnames_private_key,
-        "tls-certificates-and-hostnames_type": tls_certificates_and_hostnames_type,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_single": tls_certificates_and_hostnames_certificate_response_single_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single": tls$$certificates$$and$$hostnames_certificate_response_single,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -207,35 +169,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_single": tls_certificates_and_hostnames_certificate_response_single_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single": tls$$certificates$$and$$hostnames_certificate_response_single,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -244,37 +186,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_custom_certificates_delete",
+    name: "ssl_customCertificates_delete",
     title: "Delete SSL Configuration",
-    description: "Remove a SSL certificate from a zone.",
+    description: "Remove a SSL certificate from a zone.\n\nDELETE /zones/{zone_id}/custom_certificates/{custom_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "custom_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_certificate_identifier",
-          "description": "Custom certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_certificate_id": {
+              "description": "Custom certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_id_only",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_response_id_only": tls_certificates_and_hostnames_certificate_response_id_only_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_id_only": tls$$certificates$$and$$hostnames_certificate_response_id_only,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -320,11 +267,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate_response_id_only": tls_certificates_and_hostnames_certificate_response_id_only_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_id_only": tls$$certificates$$and$$hostnames_certificate_response_id_only,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -332,104 +278,95 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_custom_certificates_edit",
+    name: "ssl_customCertificates_edit",
     title: "Edit SSL Configuration",
-    description: "Upload a new private key and/or PEM/CRT for the SSL certificate. Note: PATCHing a configuration for sni_custom certificates will result in a new resource id being returned, and the previous one being deleted.",
+    description: "Upload a new private key and/or PEM/CRT for the SSL certificate. Note: PATCHing a configuration for sni_custom certificates will result in a new resource id being returned, and the previous one being deleted.\n\nPATCH /zones/{zone_id}/custom_certificates/{custom_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "bundle_method": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_bundle_method",
               "default": "ubiquitous",
-              "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it."
+              "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it.",
+              "enum": [
+                "ubiquitous",
+                "optimal",
+                "force"
+              ],
+              "type": "string"
             },
             "certificate": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate",
-              "description": "The zone's SSL certificate or certificate and the intermediate(s)."
+              "description": "The zone's SSL certificate or certificate and the intermediate(s).",
+              "type": "string"
             },
             "custom_csr_id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_custom_csr_id",
-              "description": "The identifier for the Custom CSR that was used."
+              "description": "The identifier for the Custom CSR that was used.",
+              "type": "string"
             },
             "deploy": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_deploy",
               "default": "production",
-              "description": "The environment to deploy the certificate to, defaults to production."
+              "description": "The environment to deploy the certificate to, defaults to production.",
+              "enum": [
+                "staging",
+                "production"
+              ],
+              "type": "string"
             },
             "geo_restrictions": {
               "$ref": "#/$defs/tls-certificates-and-hostnames_geo_restrictions",
               "description": "Specify the region where your private key can be held locally for optimal TLS performance. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Options allow distribution to only to U.S. data centers, only to E.U. data centers, or only to highest security data centers. Default distribution is to all Cloudflare datacenters, for optimal performance."
             },
             "policy": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_policy",
-              "description": "Specify the policy that determines the region where your private key will be held locally. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Any combination of countries, specified by their two letter country code (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) can be chosen, such as 'country: IN', as well as 'region: EU' which refers to the EU region. If there are too few data centers satisfying the policy, it will be rejected.\nNote: The API accepts this field as either \"policy\" or \"policy_restrictions\" in requests. Responses return this field as \"policy_restrictions\"."
+              "description": "Specify the policy that determines the region where your private key will be held locally. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Any combination of countries, specified by their two letter country code (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) can be chosen, such as 'country: IN', as well as 'region: EU' which refers to the EU region. If there are too few data centers satisfying the policy, it will be rejected.\nNote: The API accepts this field as either \"policy\" or \"policy_restrictions\" in requests. Responses return this field as \"policy_restrictions\".",
+              "type": "string"
             },
             "private_key": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_private_key",
-              "description": "The zone's private key. Not required if custom_csr_id is provided, in which case the private key is retrieved from the CSR record held by Cloudflare."
+              "description": "The zone's private key. Not required if custom_csr_id is provided, in which case the private key is retrieved from the CSR record held by Cloudflare.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "custom_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_certificate_identifier",
-          "description": "Custom certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_certificate_id": {
+              "description": "Custom certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_certificate_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method,
-        "tls-certificates-and-hostnames_certificate": tls_certificates_and_hostnames_certificate,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id,
-        "tls-certificates-and-hostnames_deploy": tls_certificates_and_hostnames_deploy,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_policy": tls_certificates_and_hostnames_policy,
-        "tls-certificates-and-hostnames_private_key": tls_certificates_and_hostnames_private_key,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_single": tls_certificates_and_hostnames_certificate_response_single_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single": tls$$certificates$$and$$hostnames_certificate_response_single,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -475,35 +412,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_single": tls_certificates_and_hostnames_certificate_response_single_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single": tls$$certificates$$and$$hostnames_certificate_response_single,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -512,61 +429,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_custom_certificates_get",
+    name: "ssl_customCertificates_get",
     title: "SSL Configuration Details",
-    description: "Retrieves details for a specific custom SSL certificate, including certificate metadata, bundle method, geographic restrictions, and associated keyless server configuration.",
+    description: "Retrieves details for a specific custom SSL certificate, including certificate metadata, bundle method, geographic restrictions, and associated keyless server configuration.\n\nGET /zones/{zone_id}/custom_certificates/{custom_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "custom_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_custom_certificate_identifier",
-          "description": "Custom certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_certificate_id": {
+              "description": "Custom certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "custom_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "custom_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_single": tls_certificates_and_hostnames_certificate_response_single_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single": tls$$certificates$$and$$hostnames_certificate_response_single,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -614,35 +517,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_single": tls_certificates_and_hostnames_certificate_response_single_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single": tls$$certificates$$and$$hostnames_certificate_response_single,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -650,86 +533,79 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_custom_certificates_list",
+    name: "ssl_customCertificates_list",
     title: "List SSL Configurations",
-    description: "List, search, and filter all of your custom SSL certificates. The higher priority will break ties across overlapping 'legacy_custom' certificates, but 'legacy_custom' certificates will always supercede 'sni_custom' certificates.",
+    description: "List, search, and filter all of your custom SSL certificates. The higher priority will break ties across overlapping 'legacy_custom' certificates, but 'legacy_custom' certificates will always supercede 'sni_custom' certificates.\n\nGET /zones/{zone_id}/custom_certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "match": {
-          "default": "all",
-          "description": "Whether to match all search requirements or at least one (any).",
-          "enum": [
-            "any",
-            "all"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of zones per page.",
-          "type": "number"
-        },
-        "status": {
-          "description": "Status of the zone's custom SSL.",
-          "enum": [
-            "active",
-            "expired",
-            "deleted",
-            "pending",
-            "initializing"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "match": {
+              "default": "all",
+              "description": "Whether to match all search requirements or at least one (any).",
+              "enum": [
+                "any",
+                "all"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of zones per page.",
+              "type": "number"
+            },
+            "status": {
+              "description": "Status of the zone's custom SSL.",
+              "enum": [
+                "active",
+                "expired",
+                "deleted",
+                "pending",
+                "initializing"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_collection": tls_certificates_and_hostnames_certificate_response_collection_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_certificate_response_collection": tls$$certificates$$and$$hostnames_certificate_response_collection,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -777,45 +653,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method_output,
-        "tls-certificates-and-hostnames_certificate_response_collection": tls_certificates_and_hostnames_certificate_response_collection_output,
-        "tls-certificates-and-hostnames_custom-certificate": tls_certificates_and_hostnames_custom_certificate_output,
-        "tls-certificates-and-hostnames_custom_certificate_identifier": tls_certificates_and_hostnames_custom_certificate_identifier_output,
-        "tls-certificates-and-hostnames_custom_csr_id": tls_certificates_and_hostnames_custom_csr_id_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_expires_on": tls_certificates_and_hostnames_expires_on_output,
-        "tls-certificates-and-hostnames_geo_restrictions": tls_certificates_and_hostnames_geo_restrictions_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_hosts": tls_certificates_and_hostnames_hosts_output,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_modified_on": tls_certificates_and_hostnames_modified_on_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_policy_restrictions": tls_certificates_and_hostnames_policy_restrictions_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_priority": tls_certificates_and_hostnames_priority_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status": tls_certificates_and_hostnames_status_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
-        "tls-certificates-and-hostnames_uploaded_on": tls_certificates_and_hostnames_uploaded_on_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificate_response_collection": tls$$certificates$$and$$hostnames_certificate_response_collection,
+        "tls-certificates-and-hostnames_custom-certificate": tls$$certificates$$and$$hostnames_custom$$certificate,
+        "tls-certificates-and-hostnames_geo_restrictions": tls$$certificates$$and$$hostnames_geo_restrictions,
+        "tls-certificates-and-hostnames_hosts": tls$$certificates$$and$$hostnames_hosts,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/custom_certificates`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["match", args["match"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["match", param(args, "query", "match"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ssl/dcvDelegation/outputs.ts b/src/generated/forge-mcp/ssl/dcvDelegation/outputs.ts
index 1a2b8f20c..a7475561a 100644
--- a/src/generated/forge-mcp/ssl/dcvDelegation/outputs.ts
+++ b/src/generated/forge-mcp/ssl/dcvDelegation/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `tls-certificates-and-hostnames_dcv_delegation_response` in
  * responses.
  */
-export const tls_certificates_and_hostnames_dcv_delegation_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_dcv_delegation_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -23,20 +23,13 @@ export const tls_certificates_and_hostnames_dcv_delegation_response_output: Json
   ]
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_uuid` in responses.
- */
-export const tls_certificates_and_hostnames_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_uuidObject` in responses.
  */
-export const tls_certificates_and_hostnames_uuidObject_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_uuidObject: JsonSchema = {
   "properties": {
     "uuid": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_uuid"
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/ssl/dcvDelegation/tools.ts b/src/generated/forge-mcp/ssl/dcvDelegation/tools.ts
index c65444234..0e8388a9b 100644
--- a/src/generated/forge-mcp/ssl/dcvDelegation/tools.ts
+++ b/src/generated/forge-mcp/ssl/dcvDelegation/tools.ts
@@ -3,48 +3,52 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_dcv_delegation_response_output,
-  tls_certificates_and_hostnames_uuidObject_output,
-  tls_certificates_and_hostnames_uuid_output,
+  tls$$certificates$$and$$hostnames_dcv_delegation_response,
+  tls$$certificates$$and$$hostnames_uuidObject,
 } from "./outputs.js";
 
 /**
- * The tools of `ssl.dcv_delegation`.
+ * The tools of `ssl.dcvDelegation`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_dcv_delegation_get",
+    name: "ssl_dcvDelegation_get",
     title: "Retrieve the DCV Delegation unique identifier.",
-    description: "Retrieve the account and zone specific unique identifier used as part of the CNAME target for DCV Delegation.",
+    description: "Retrieve the account and zone specific unique identifier used as part of the CNAME target for DCV Delegation.\n\nGET /zones/{zone_id}/dcv_delegation/uuid",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_dcv_delegation_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_dcv_delegation_response": tls_certificates_and_hostnames_dcv_delegation_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_uuid": tls_certificates_and_hostnames_uuid_output,
-        "tls-certificates-and-hostnames_uuidObject": tls_certificates_and_hostnames_uuidObject_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_dcv_delegation_response": tls$$certificates$$and$$hostnames_dcv_delegation_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_uuidObject": tls$$certificates$$and$$hostnames_uuidObject,
       },
     },
     annotations: {
@@ -85,12 +89,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_dcv_delegation_response": tls_certificates_and_hostnames_dcv_delegation_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_uuid": tls_certificates_and_hostnames_uuid_output,
-        "tls-certificates-and-hostnames_uuidObject": tls_certificates_and_hostnames_uuidObject_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_dcv_delegation_response": tls$$certificates$$and$$hostnames_dcv_delegation_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_uuidObject": tls$$certificates$$and$$hostnames_uuidObject,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/keylessCertificates/outputs.ts b/src/generated/forge-mcp/ssl/keylessCertificates/outputs.ts
index 1afe76fb0..d889624c6 100644
--- a/src/generated/forge-mcp/ssl/keylessCertificates/outputs.ts
+++ b/src/generated/forge-mcp/ssl/keylessCertificates/outputs.ts
@@ -6,27 +6,27 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `tls-certificates-and-hostnames_base` in responses.
  */
-export const tls_certificates_and_hostnames_base_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_base: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
       "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_enabled"
+      "type": "boolean"
     },
     "host": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_host"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_certificate_identifier"
+      "type": "string"
     },
     "modified_on": {
       "format": "date-time",
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_name"
+      "type": "string"
     },
     "permissions": {
       "items": {
@@ -35,10 +35,14 @@ export const tls_certificates_and_hostnames_base_output: JsonSchema = {
       "type": "array"
     },
     "port": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_port"
+      "type": "number"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-2"
+      "enum": [
+        "active",
+        "deleted"
+      ],
+      "type": "string"
     },
     "tunnel": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_tunnel"
@@ -62,7 +66,7 @@ export const tls_certificates_and_hostnames_base_output: JsonSchema = {
  * The schema of `tls-certificates-and-hostnames_keyless_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_keyless_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_keyless_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -85,7 +89,7 @@ export const tls_certificates_and_hostnames_keyless_response_collection_output:
  * The schema of `tls-certificates-and-hostnames_keyless_response_single` in
  * responses.
  */
-export const tls_certificates_and_hostnames_keyless_response_single_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_keyless_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -105,7 +109,7 @@ export const tls_certificates_and_hostnames_keyless_response_single_output: Json
  * The schema of `tls-certificates-and-hostnames_keyless_response_single_id` in
  * responses.
  */
-export const tls_certificates_and_hostnames_keyless_response_single_id_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_keyless_response_single_id: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -115,7 +119,7 @@ export const tls_certificates_and_hostnames_keyless_response_single_id_output: J
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_certificate_identifier"
+              "type": "string"
             }
           },
           "type": "object"
diff --git a/src/generated/forge-mcp/ssl/keylessCertificates/schemas.ts b/src/generated/forge-mcp/ssl/keylessCertificates/schemas.ts
deleted file mode 100644
index f55a5f7c6..000000000
--- a/src/generated/forge-mcp/ssl/keylessCertificates/schemas.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-2`.
- */
-export const tls_certificates_and_hostnames_certificate_2: JsonSchema = {
-  "description": "The zone's SSL certificate or SSL certificate and intermediate(s).",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_enabled_write`.
- */
-export const tls_certificates_and_hostnames_enabled_write: JsonSchema = {
-  "deprecated": true,
-  "description": "Whether or not the Keyless SSL is on or off.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_name_write`.
- */
-export const tls_certificates_and_hostnames_name_write: JsonSchema = {
-  "description": "The keyless SSL name.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/keylessCertificates/tools.ts b/src/generated/forge-mcp/ssl/keylessCertificates/tools.ts
index 31d62ab2a..6d4747eea 100644
--- a/src/generated/forge-mcp/ssl/keylessCertificates/tools.ts
+++ b/src/generated/forge-mcp/ssl/keylessCertificates/tools.ts
@@ -3,80 +3,63 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_enabled_output,
-  tls_certificates_and_hostnames_host_output,
-  tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-  tls_certificates_and_hostnames_keyless_certificate_output,
-  tls_certificates_and_hostnames_keyless_private_ip_output,
-  tls_certificates_and_hostnames_keyless_tunnel_output,
-  tls_certificates_and_hostnames_keyless_vnet_id_output,
-  tls_certificates_and_hostnames_name_output,
-  tls_certificates_and_hostnames_port_output,
-  tls_certificates_and_hostnames_status_2_output,
+  tls$$certificates$$and$$hostnames_keyless$$certificate,
+  tls$$certificates$$and$$hostnames_keyless_tunnel,
 } from "../outputs.js";
+import { tls$$certificates$$and$$hostnames_keyless_tunnel as tls$$certificates$$and$$hostnames_keyless_tunnel$ } from "../schemas.js";
 import {
-  tls_certificates_and_hostnames_bundle_method,
-  tls_certificates_and_hostnames_host,
-  tls_certificates_and_hostnames_keyless_certificate_identifier,
-  tls_certificates_and_hostnames_keyless_private_ip,
-  tls_certificates_and_hostnames_keyless_tunnel,
-  tls_certificates_and_hostnames_keyless_vnet_id,
-  tls_certificates_and_hostnames_port,
-} from "../schemas.js";
-import {
-  tls_certificates_and_hostnames_base_output,
-  tls_certificates_and_hostnames_keyless_response_collection_output,
-  tls_certificates_and_hostnames_keyless_response_single_id_output,
-  tls_certificates_and_hostnames_keyless_response_single_output,
+  tls$$certificates$$and$$hostnames_base,
+  tls$$certificates$$and$$hostnames_keyless_response_collection,
+  tls$$certificates$$and$$hostnames_keyless_response_single,
+  tls$$certificates$$and$$hostnames_keyless_response_single_id,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_certificate_2,
-  tls_certificates_and_hostnames_enabled_write,
-  tls_certificates_and_hostnames_name_write,
-} from "./schemas.js";
 
 /**
- * The tools of `ssl.keyless_certificates`.
+ * The tools of `ssl.keylessCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_keyless_certificates_create",
+    name: "ssl_keylessCertificates_create",
     title: "Create Keyless SSL Configuration",
-    description: "Creates a Keyless SSL configuration that allows SSL/TLS termination without exposing private keys to Cloudflare. Keys remain on your infrastructure.",
+    description: "Creates a Keyless SSL configuration that allows SSL/TLS termination without exposing private keys to Cloudflare. Keys remain on your infrastructure.\n\nPOST /zones/{zone_id}/keyless_certificates",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "bundle_method": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_bundle_method",
               "default": "ubiquitous",
-              "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it."
+              "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it.",
+              "enum": [
+                "ubiquitous",
+                "optimal",
+                "force"
+              ],
+              "type": "string"
             },
             "certificate": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-2",
-              "description": "The zone's SSL certificate or SSL certificate and intermediate(s)."
+              "description": "The zone's SSL certificate or SSL certificate and intermediate(s).",
+              "type": "string"
             },
             "host": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_host",
-              "description": "The keyless SSL name."
+              "description": "The keyless SSL name.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_name_write",
-              "description": "The keyless SSL name."
+              "description": "The keyless SSL name.",
+              "type": "string"
             },
             "port": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_port",
               "default": 24008,
-              "description": "The keyless SSL port used to communicate between Cloudflare and the client's Keyless SSL server."
+              "description": "The keyless SSL port used to communicate between Cloudflare and the client's Keyless SSL server.",
+              "type": "number"
             },
             "tunnel": {
               "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_tunnel",
@@ -90,43 +73,37 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_bundle_method": tls_certificates_and_hostnames_bundle_method,
-        "tls-certificates-and-hostnames_certificate-2": tls_certificates_and_hostnames_certificate_2,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id,
-        "tls-certificates-and-hostnames_name_write": tls_certificates_and_hostnames_name_write,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_base": tls_certificates_and_hostnames_base_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_response_single": tls_certificates_and_hostnames_keyless_response_single_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_base": tls$$certificates$$and$$hostnames_base,
+        "tls-certificates-and-hostnames_keyless_response_single": tls$$certificates$$and$$hostnames_keyless_response_single,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -171,20 +148,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_base": tls_certificates_and_hostnames_base_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_response_single": tls_certificates_and_hostnames_keyless_response_single_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_base": tls$$certificates$$and$$hostnames_base,
+        "tls-certificates-and-hostnames_keyless_response_single": tls$$certificates$$and$$hostnames_keyless_response_single,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -193,37 +162,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_keyless_certificates_delete",
+    name: "ssl_keylessCertificates_delete",
     title: "Delete Keyless SSL Configuration",
-    description: "Removes a Keyless SSL configuration. SSL connections will no longer use the keyless server for cryptographic operations.",
+    description: "Removes a Keyless SSL configuration. SSL connections will no longer use the keyless server for cryptographic operations.\n\nDELETE /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "keyless_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_certificate_identifier",
-          "description": "Keyless certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "keyless_certificate_id": {
+              "description": "Keyless certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "keyless_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "keyless_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_response_single_id",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_response_single_id": tls_certificates_and_hostnames_keyless_response_single_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_keyless_response_single_id": tls$$certificates$$and$$hostnames_keyless_response_single_id,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -268,11 +242,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_response_single_id": tls_certificates_and_hostnames_keyless_response_single_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_keyless_response_single_id": tls$$certificates$$and$$hostnames_keyless_response_single_id,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -280,30 +253,31 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_keyless_certificates_edit",
+    name: "ssl_keylessCertificates_edit",
     title: "Edit Keyless SSL Configuration",
-    description: "This will update attributes of a Keyless SSL. Consists of one or more of the following:  host,name,port.",
+    description: "This will update attributes of a Keyless SSL. Consists of one or more of the following:  host,name,port.\n\nPATCH /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "enabled": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_enabled_write",
-              "description": "Whether or not the Keyless SSL is on or off."
+              "deprecated": true,
+              "description": "Whether or not the Keyless SSL is on or off.",
+              "type": "boolean"
             },
             "host": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_host",
-              "description": "The keyless SSL name."
+              "description": "The keyless SSL name.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_name_write",
-              "description": "The keyless SSL name."
+              "description": "The keyless SSL name.",
+              "type": "string"
             },
             "port": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_port",
               "default": 24008,
-              "description": "The keyless SSL port used to communicate between Cloudflare and the client's Keyless SSL server."
+              "description": "The keyless SSL port used to communicate between Cloudflare and the client's Keyless SSL server.",
+              "type": "number"
             },
             "tunnel": {
               "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_tunnel",
@@ -312,48 +286,42 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "keyless_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_certificate_identifier",
-          "description": "Keyless certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "keyless_certificate_id": {
+              "description": "Keyless certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "keyless_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "keyless_certificate_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_enabled_write": tls_certificates_and_hostnames_enabled_write,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id,
-        "tls-certificates-and-hostnames_name_write": tls_certificates_and_hostnames_name_write,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_base": tls_certificates_and_hostnames_base_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_response_single": tls_certificates_and_hostnames_keyless_response_single_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_base": tls$$certificates$$and$$hostnames_base,
+        "tls-certificates-and-hostnames_keyless_response_single": tls$$certificates$$and$$hostnames_keyless_response_single,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -398,20 +366,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_base": tls_certificates_and_hostnames_base_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_response_single": tls_certificates_and_hostnames_keyless_response_single_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_base": tls$$certificates$$and$$hostnames_base,
+        "tls-certificates-and-hostnames_keyless_response_single": tls$$certificates$$and$$hostnames_keyless_response_single,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -420,46 +380,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_keyless_certificates_get",
+    name: "ssl_keylessCertificates_get",
     title: "Get Keyless SSL Configuration",
-    description: "Get details for one Keyless SSL configuration.",
+    description: "Get details for one Keyless SSL configuration.\n\nGET /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "keyless_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_certificate_identifier",
-          "description": "Keyless certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "keyless_certificate_id": {
+              "description": "Keyless certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "keyless_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "keyless_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_response_single",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_base": tls_certificates_and_hostnames_base_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_response_single": tls_certificates_and_hostnames_keyless_response_single_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_base": tls$$certificates$$and$$hostnames_base,
+        "tls-certificates-and-hostnames_keyless_response_single": tls$$certificates$$and$$hostnames_keyless_response_single,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -542,20 +500,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_base": tls_certificates_and_hostnames_base_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_response_single": tls_certificates_and_hostnames_keyless_response_single_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_base": tls$$certificates$$and$$hostnames_base,
+        "tls-certificates-and-hostnames_keyless_response_single": tls$$certificates$$and$$hostnames_keyless_response_single,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -563,41 +513,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_keyless_certificates_list",
+    name: "ssl_keylessCertificates_list",
     title: "List Keyless SSL Configurations",
-    description: "List all Keyless SSL configurations for a given zone.",
+    description: "List all Keyless SSL configurations for a given zone.\n\nGET /zones/{zone_id}/keyless_certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_response_collection": tls_certificates_and_hostnames_keyless_response_collection_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_response_collection": tls$$certificates$$and$$hostnames_keyless_response_collection,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -643,21 +592,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_enabled": tls_certificates_and_hostnames_enabled_output,
-        "tls-certificates-and-hostnames_host": tls_certificates_and_hostnames_host_output,
-        "tls-certificates-and-hostnames_keyless-certificate": tls_certificates_and_hostnames_keyless_certificate_output,
-        "tls-certificates-and-hostnames_keyless_certificate_identifier": tls_certificates_and_hostnames_keyless_certificate_identifier_output,
-        "tls-certificates-and-hostnames_keyless_private_ip": tls_certificates_and_hostnames_keyless_private_ip_output,
-        "tls-certificates-and-hostnames_keyless_response_collection": tls_certificates_and_hostnames_keyless_response_collection_output,
-        "tls-certificates-and-hostnames_keyless_tunnel": tls_certificates_and_hostnames_keyless_tunnel_output,
-        "tls-certificates-and-hostnames_keyless_vnet_id": tls_certificates_and_hostnames_keyless_vnet_id_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_name": tls_certificates_and_hostnames_name_output,
-        "tls-certificates-and-hostnames_port": tls_certificates_and_hostnames_port_output,
-        "tls-certificates-and-hostnames_status-2": tls_certificates_and_hostnames_status_2_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_keyless-certificate": tls$$certificates$$and$$hostnames_keyless$$certificate,
+        "tls-certificates-and-hostnames_keyless_response_collection": tls$$certificates$$and$$hostnames_keyless_response_collection,
+        "tls-certificates-and-hostnames_keyless_tunnel": tls$$certificates$$and$$hostnames_keyless_tunnel,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/mtlsCertificates/associations/outputs.ts b/src/generated/forge-mcp/ssl/mtlsCertificates/associations/outputs.ts
index 6d170e17d..c454798ce 100644
--- a/src/generated/forge-mcp/ssl/mtlsCertificates/associations/outputs.ts
+++ b/src/generated/forge-mcp/ssl/mtlsCertificates/associations/outputs.ts
@@ -7,13 +7,13 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `tls-certificates-and-hostnames_associationObject` in
  * responses.
  */
-export const tls_certificates_and_hostnames_associationObject_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_associationObject: JsonSchema = {
   "properties": {
     "service": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_service"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-10"
+      "type": "string"
     }
   },
   "type": "object"
@@ -24,7 +24,7 @@ export const tls_certificates_and_hostnames_associationObject_output: JsonSchema
  * `tls-certificates-and-hostnames_association_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_association_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_association_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -42,17 +42,3 @@ export const tls_certificates_and_hostnames_association_response_collection_outp
     }
   ]
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_service` in responses.
- */
-export const tls_certificates_and_hostnames_service_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_status-10` in responses.
- */
-export const tls_certificates_and_hostnames_status_10_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/mtlsCertificates/associations/tools.ts b/src/generated/forge-mcp/ssl/mtlsCertificates/associations/tools.ts
index 02014a9ae..05b7f1772 100644
--- a/src/generated/forge-mcp/ssl/mtlsCertificates/associations/tools.ts
+++ b/src/generated/forge-mcp/ssl/mtlsCertificates/associations/tools.ts
@@ -3,59 +3,59 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
-import { tls_certificates_and_hostnames_mtls_certificate_identifier } from "../schemas.js";
 import {
-  tls_certificates_and_hostnames_associationObject_output,
-  tls_certificates_and_hostnames_association_response_collection_output,
-  tls_certificates_and_hostnames_service_output,
-  tls_certificates_and_hostnames_status_10_output,
+  tls$$certificates$$and$$hostnames_associationObject,
+  tls$$certificates$$and$$hostnames_association_response_collection,
 } from "./outputs.js";
 
 /**
- * The tools of `ssl.mtls_certificates.associations`.
+ * The tools of `ssl.mtlsCertificates.associations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_mtls_certificates_associations_get",
+    name: "ssl_mtlsCertificates_associations_get",
     title: "List mTLS certificate associations",
-    description: "Lists all active associations between the certificate and Cloudflare services.",
+    description: "Lists all active associations between the certificate and Cloudflare services.\n\nGET /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}/associations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
-        },
-        "mtls_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_mtls_certificate_identifier",
-          "description": "Certificate identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "mtls_certificate_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "mtls_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "mtls_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_association_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_associationObject": tls_certificates_and_hostnames_associationObject_output,
-        "tls-certificates-and-hostnames_association_response_collection": tls_certificates_and_hostnames_association_response_collection_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_service": tls_certificates_and_hostnames_service_output,
-        "tls-certificates-and-hostnames_status-10": tls_certificates_and_hostnames_status_10_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_associationObject": tls$$certificates$$and$$hostnames_associationObject,
+        "tls-certificates-and-hostnames_association_response_collection": tls$$certificates$$and$$hostnames_association_response_collection,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -101,14 +101,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_associationObject": tls_certificates_and_hostnames_associationObject_output,
-        "tls-certificates-and-hostnames_association_response_collection": tls_certificates_and_hostnames_association_response_collection_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_service": tls_certificates_and_hostnames_service_output,
-        "tls-certificates-and-hostnames_status-10": tls_certificates_and_hostnames_status_10_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_associationObject": tls$$certificates$$and$$hostnames_associationObject,
+        "tls-certificates-and-hostnames_association_response_collection": tls$$certificates$$and$$hostnames_association_response_collection,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/mtlsCertificates/outputs.ts b/src/generated/forge-mcp/ssl/mtlsCertificates/outputs.ts
index 1a2fefdd5..9ca1b3aed 100644
--- a/src/generated/forge-mcp/ssl/mtlsCertificates/outputs.ts
+++ b/src/generated/forge-mcp/ssl/mtlsCertificates/outputs.ts
@@ -3,48 +3,48 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_ca` in responses.
- */
-export const tls_certificates_and_hostnames_ca_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_certificateObject-3` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificateObject_3_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificateObject$$3: JsonSchema = {
   "properties": {
     "ca": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_ca"
+      "type": "boolean"
     },
     "certificates": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificates-2"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expires_on-2"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_mtls_certificate_identifier"
+      "type": "string"
     },
     "issuer": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_issuer-2"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_name-2"
+      "type": "string"
     },
     "serial_number": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_serial_number-2"
+      "type": "string"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_type-3"
+      "enum": [
+        "custom",
+        "gateway_managed",
+        "access_managed"
+      ],
+      "type": "string"
     },
     "uploaded_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_uploaded_on-4"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -54,40 +54,48 @@ export const tls_certificates_and_hostnames_certificateObject_3_output: JsonSche
  * The schema of `tls-certificates-and-hostnames_certificateObjectPost` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificateObjectPost_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificateObjectPost: JsonSchema = {
   "properties": {
     "ca": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_ca"
+      "type": "boolean"
     },
     "certificates": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificates-2"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expires_on-2"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_mtls_certificate_identifier"
+      "type": "string"
     },
     "issuer": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_issuer-2"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_name-2"
+      "type": "string"
     },
     "serial_number": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_serial_number-2"
+      "type": "string"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_type-3"
+      "enum": [
+        "custom",
+        "gateway_managed",
+        "access_managed"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at-4"
+      "format": "date-time",
+      "type": "string"
     },
     "uploaded_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_uploaded_on-4"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -98,7 +106,7 @@ export const tls_certificates_and_hostnames_certificateObjectPost_output: JsonSc
  * `tls-certificates-and-hostnames_certificate_response_collection-5` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_collection_5_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_collection$$5: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -146,7 +154,7 @@ export const tls_certificates_and_hostnames_certificate_response_collection_5_ou
  * The schema of `tls-certificates-and-hostnames_certificate_response_single-5`
  * in responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_single_5_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_single$$5: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -167,7 +175,7 @@ export const tls_certificates_and_hostnames_certificate_response_single_5_output
  * `tls-certificates-and-hostnames_certificate_response_single_post` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_single_post_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_single_post: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -182,67 +190,3 @@ export const tls_certificates_and_hostnames_certificate_response_single_post_out
     }
   ]
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificates-2` in responses.
- */
-export const tls_certificates_and_hostnames_certificates_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_issuer-2` in responses.
- */
-export const tls_certificates_and_hostnames_issuer_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_mtls_certificate_identifier` in
- * responses.
- */
-export const tls_certificates_and_hostnames_mtls_certificate_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_name-2` in responses.
- */
-export const tls_certificates_and_hostnames_name_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_serial_number-2` in responses.
- */
-export const tls_certificates_and_hostnames_serial_number_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_type-3` in responses.
- */
-export const tls_certificates_and_hostnames_type_3_output: JsonSchema = {
-  "enum": [
-    "custom",
-    "gateway_managed",
-    "access_managed"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_updated_at-4` in responses.
- */
-export const tls_certificates_and_hostnames_updated_at_4_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_uploaded_on-4` in responses.
- */
-export const tls_certificates_and_hostnames_uploaded_on_4_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/mtlsCertificates/schemas.ts b/src/generated/forge-mcp/ssl/mtlsCertificates/schemas.ts
deleted file mode 100644
index e2c537276..000000000
--- a/src/generated/forge-mcp/ssl/mtlsCertificates/schemas.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_ca`.
- */
-export const tls_certificates_and_hostnames_ca: JsonSchema = {
-  "description": "Indicates whether the certificate is a CA or leaf certificate.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificates-2`.
- */
-export const tls_certificates_and_hostnames_certificates_2: JsonSchema = {
-  "description": "The uploaded root CA certificate.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_mtls_certificate_identifier`.
- */
-export const tls_certificates_and_hostnames_mtls_certificate_identifier: JsonSchema = {
-  "description": "Certificate identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_name-2`.
- */
-export const tls_certificates_and_hostnames_name_2: JsonSchema = {
-  "description": "Optional unique name for the certificate. Only used for human readability.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_private_key-4`.
- */
-export const tls_certificates_and_hostnames_private_key_4: JsonSchema = {
-  "description": "The private key for the certificate. This field is only needed for specific use cases such as using a custom certificate with Zero Trust's block page.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/mtlsCertificates/tools.ts b/src/generated/forge-mcp/ssl/mtlsCertificates/tools.ts
index d48890894..f895112df 100644
--- a/src/generated/forge-mcp/ssl/mtlsCertificates/tools.ts
+++ b/src/generated/forge-mcp/ssl/mtlsCertificates/tools.ts
@@ -1,73 +1,50 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_expires_on_2_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_signature_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_ca_output,
-  tls_certificates_and_hostnames_certificateObjectPost_output,
-  tls_certificates_and_hostnames_certificateObject_3_output,
-  tls_certificates_and_hostnames_certificate_response_collection_5_output,
-  tls_certificates_and_hostnames_certificate_response_single_5_output,
-  tls_certificates_and_hostnames_certificate_response_single_post_output,
-  tls_certificates_and_hostnames_certificates_2_output,
-  tls_certificates_and_hostnames_issuer_2_output,
-  tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-  tls_certificates_and_hostnames_name_2_output,
-  tls_certificates_and_hostnames_serial_number_2_output,
-  tls_certificates_and_hostnames_type_3_output,
-  tls_certificates_and_hostnames_updated_at_4_output,
-  tls_certificates_and_hostnames_uploaded_on_4_output,
+  tls$$certificates$$and$$hostnames_certificateObject$$3,
+  tls$$certificates$$and$$hostnames_certificateObjectPost,
+  tls$$certificates$$and$$hostnames_certificate_response_collection$$5,
+  tls$$certificates$$and$$hostnames_certificate_response_single$$5,
+  tls$$certificates$$and$$hostnames_certificate_response_single_post,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_ca,
-  tls_certificates_and_hostnames_certificates_2,
-  tls_certificates_and_hostnames_mtls_certificate_identifier,
-  tls_certificates_and_hostnames_name_2,
-  tls_certificates_and_hostnames_private_key_4,
-} from "./schemas.js";
 
 /**
- * The tools of `ssl.mtls_certificates`.
+ * The tools of `ssl.mtlsCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_mtls_certificates_create",
+    name: "ssl_mtlsCertificates_create",
     title: "Upload mTLS certificate",
-    description: "Upload a certificate that you want to use with mTLS-enabled Cloudflare services, such as Bring Your Own CA (BYO-CA) for mTLS. To create certificates issued by the Cloudflare managed CA, use the [Create Client Certificate endpoint](/api/resources/client_certificates/methods/create/).",
+    description: "Upload a certificate that you want to use with mTLS-enabled Cloudflare services, such as Bring Your Own CA (BYO-CA) for mTLS. To create certificates issued by the Cloudflare managed CA, use the [Create Client Certificate endpoint](/api/resources/client_certificates/methods/create/).\n\nPOST /accounts/{account_id}/mtls_certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "ca": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_ca",
-              "description": "Indicates whether the certificate is a CA or leaf certificate."
+              "description": "Indicates whether the certificate is a CA or leaf certificate.",
+              "type": "boolean"
             },
             "certificates": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificates-2",
-              "description": "The uploaded root CA certificate."
+              "description": "The uploaded root CA certificate.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_name-2",
-              "description": "Optional unique name for the certificate. Only used for human readability."
+              "description": "Optional unique name for the certificate. Only used for human readability.",
+              "type": "string"
             },
             "private_key": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_private_key-4",
-              "description": "The private key for the certificate. This field is only needed for specific use cases such as using a custom certificate with Zero Trust's block page."
+              "description": "The private key for the certificate. This field is only needed for specific use cases such as using a custom certificate with Zero Trust's block page.",
+              "type": "string"
             }
           },
           "required": [
@@ -75,38 +52,34 @@ export const tools: readonly Tool[] = [
             "certificates"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2,
-        "tls-certificates-and-hostnames_private_key-4": tls_certificates_and_hostnames_private_key_4,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single_post",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca_output,
-        "tls-certificates-and-hostnames_certificateObjectPost": tls_certificates_and_hostnames_certificateObjectPost_output,
-        "tls-certificates-and-hostnames_certificate_response_single_post": tls_certificates_and_hostnames_certificate_response_single_post_output,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer-2": tls_certificates_and_hostnames_issuer_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2_output,
-        "tls-certificates-and-hostnames_serial_number-2": tls_certificates_and_hostnames_serial_number_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_type-3": tls_certificates_and_hostnames_type_3_output,
-        "tls-certificates-and-hostnames_updated_at-4": tls_certificates_and_hostnames_updated_at_4_output,
-        "tls-certificates-and-hostnames_uploaded_on-4": tls_certificates_and_hostnames_uploaded_on_4_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObjectPost": tls$$certificates$$and$$hostnames_certificateObjectPost,
+        "tls-certificates-and-hostnames_certificate_response_single_post": tls$$certificates$$and$$hostnames_certificate_response_single_post,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -151,22 +124,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca_output,
-        "tls-certificates-and-hostnames_certificateObjectPost": tls_certificates_and_hostnames_certificateObjectPost_output,
-        "tls-certificates-and-hostnames_certificate_response_single_post": tls_certificates_and_hostnames_certificate_response_single_post_output,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer-2": tls_certificates_and_hostnames_issuer_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2_output,
-        "tls-certificates-and-hostnames_serial_number-2": tls_certificates_and_hostnames_serial_number_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_type-3": tls_certificates_and_hostnames_type_3_output,
-        "tls-certificates-and-hostnames_updated_at-4": tls_certificates_and_hostnames_updated_at_4_output,
-        "tls-certificates-and-hostnames_uploaded_on-4": tls_certificates_and_hostnames_uploaded_on_4_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObjectPost": tls$$certificates$$and$$hostnames_certificateObjectPost,
+        "tls-certificates-and-hostnames_certificate_response_single_post": tls$$certificates$$and$$hostnames_certificate_response_single_post,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -175,47 +137,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_mtls_certificates_delete",
+    name: "ssl_mtlsCertificates_delete",
     title: "Delete mTLS certificate",
-    description: "Deletes the mTLS certificate unless the certificate is in use by one or more Cloudflare services.",
+    description: "Deletes the mTLS certificate unless the certificate is in use by one or more Cloudflare services.\n\nDELETE /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
-        },
-        "mtls_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_mtls_certificate_identifier",
-          "description": "Certificate identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "mtls_certificate_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "mtls_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "mtls_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-5",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca_output,
-        "tls-certificates-and-hostnames_certificateObject-3": tls_certificates_and_hostnames_certificateObject_3_output,
-        "tls-certificates-and-hostnames_certificate_response_single-5": tls_certificates_and_hostnames_certificate_response_single_5_output,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer-2": tls_certificates_and_hostnames_issuer_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2_output,
-        "tls-certificates-and-hostnames_serial_number-2": tls_certificates_and_hostnames_serial_number_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_type-3": tls_certificates_and_hostnames_type_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-4": tls_certificates_and_hostnames_uploaded_on_4_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-3": tls$$certificates$$and$$hostnames_certificateObject$$3,
+        "tls-certificates-and-hostnames_certificate_response_single-5": tls$$certificates$$and$$hostnames_certificate_response_single$$5,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -260,21 +218,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca_output,
-        "tls-certificates-and-hostnames_certificateObject-3": tls_certificates_and_hostnames_certificateObject_3_output,
-        "tls-certificates-and-hostnames_certificate_response_single-5": tls_certificates_and_hostnames_certificate_response_single_5_output,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer-2": tls_certificates_and_hostnames_issuer_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2_output,
-        "tls-certificates-and-hostnames_serial_number-2": tls_certificates_and_hostnames_serial_number_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_type-3": tls_certificates_and_hostnames_type_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-4": tls_certificates_and_hostnames_uploaded_on_4_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-3": tls$$certificates$$and$$hostnames_certificateObject$$3,
+        "tls-certificates-and-hostnames_certificate_response_single-5": tls$$certificates$$and$$hostnames_certificate_response_single$$5,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -282,47 +230,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_mtls_certificates_get",
+    name: "ssl_mtlsCertificates_get",
     title: "Get mTLS certificate",
-    description: "Fetches a single mTLS certificate uploaded to your account. To get a certificate issued by the Cloudflare managed CA, use the [Client Certificate Details endpoint](/api/resources/client_certificates/methods/get/).",
+    description: "Fetches a single mTLS certificate uploaded to your account. To get a certificate issued by the Cloudflare managed CA, use the [Client Certificate Details endpoint](/api/resources/client_certificates/methods/get/).\n\nGET /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
-        },
-        "mtls_certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_mtls_certificate_identifier",
-          "description": "Certificate identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "mtls_certificate_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "mtls_certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "mtls_certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-5",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca_output,
-        "tls-certificates-and-hostnames_certificateObject-3": tls_certificates_and_hostnames_certificateObject_3_output,
-        "tls-certificates-and-hostnames_certificate_response_single-5": tls_certificates_and_hostnames_certificate_response_single_5_output,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer-2": tls_certificates_and_hostnames_issuer_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2_output,
-        "tls-certificates-and-hostnames_serial_number-2": tls_certificates_and_hostnames_serial_number_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_type-3": tls_certificates_and_hostnames_type_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-4": tls_certificates_and_hostnames_uploaded_on_4_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-3": tls$$certificates$$and$$hostnames_certificateObject$$3,
+        "tls-certificates-and-hostnames_certificate_response_single-5": tls$$certificates$$and$$hostnames_certificate_response_single$$5,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -368,21 +312,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca_output,
-        "tls-certificates-and-hostnames_certificateObject-3": tls_certificates_and_hostnames_certificateObject_3_output,
-        "tls-certificates-and-hostnames_certificate_response_single-5": tls_certificates_and_hostnames_certificate_response_single_5_output,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer-2": tls_certificates_and_hostnames_issuer_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2_output,
-        "tls-certificates-and-hostnames_serial_number-2": tls_certificates_and_hostnames_serial_number_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_type-3": tls_certificates_and_hostnames_type_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-4": tls_certificates_and_hostnames_uploaded_on_4_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-3": tls$$certificates$$and$$hostnames_certificateObject$$3,
+        "tls-certificates-and-hostnames_certificate_response_single-5": tls$$certificates$$and$$hostnames_certificate_response_single$$5,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -390,54 +324,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_mtls_certificates_list",
+    name: "ssl_mtlsCertificates_list",
     title: "List mTLS certificates",
-    description: "Lists all mTLS certificates uploaded to your account, such as Bring Your Own CA (BYO-CA) for mTLS. To list certificates issued by the Cloudflare managed CA, use the [List Client Certificates endpoint](/api/resources/client_certificates/methods/list/).",
+    description: "Lists all mTLS certificates uploaded to your account, such as Bring Your Own CA (BYO-CA) for mTLS. To list certificates issued by the Cloudflare managed CA, use the [List Client Certificates endpoint](/api/resources/client_certificates/methods/list/).\n\nGET /accounts/{account_id}/mtls_certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "type": {
-          "description": "Filters results by certificate type. Multiple types can be comma-separated.",
-          "items": {
-            "enum": [
-              "custom",
-              "gateway_managed",
-              "access_managed"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "type": {
+              "description": "Filters results by certificate type. Multiple types can be comma-separated.",
+              "items": {
+                "enum": [
+                  "custom",
+                  "gateway_managed",
+                  "access_managed"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_collection-5",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca_output,
-        "tls-certificates-and-hostnames_certificateObject-3": tls_certificates_and_hostnames_certificateObject_3_output,
-        "tls-certificates-and-hostnames_certificate_response_collection-5": tls_certificates_and_hostnames_certificate_response_collection_5_output,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer-2": tls_certificates_and_hostnames_issuer_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2_output,
-        "tls-certificates-and-hostnames_serial_number-2": tls_certificates_and_hostnames_serial_number_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_type-3": tls_certificates_and_hostnames_type_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-4": tls_certificates_and_hostnames_uploaded_on_4_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_certificateObject-3": tls$$certificates$$and$$hostnames_certificateObject$$3,
+        "tls-certificates-and-hostnames_certificate_response_collection-5": tls$$certificates$$and$$hostnames_certificate_response_collection$$5,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -483,28 +420,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_ca": tls_certificates_and_hostnames_ca_output,
-        "tls-certificates-and-hostnames_certificateObject-3": tls_certificates_and_hostnames_certificateObject_3_output,
-        "tls-certificates-and-hostnames_certificate_response_collection-5": tls_certificates_and_hostnames_certificate_response_collection_5_output,
-        "tls-certificates-and-hostnames_certificates-2": tls_certificates_and_hostnames_certificates_2_output,
-        "tls-certificates-and-hostnames_expires_on-2": tls_certificates_and_hostnames_expires_on_2_output,
-        "tls-certificates-and-hostnames_issuer-2": tls_certificates_and_hostnames_issuer_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_mtls_certificate_identifier": tls_certificates_and_hostnames_mtls_certificate_identifier_output,
-        "tls-certificates-and-hostnames_name-2": tls_certificates_and_hostnames_name_2_output,
-        "tls-certificates-and-hostnames_serial_number-2": tls_certificates_and_hostnames_serial_number_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_type-3": tls_certificates_and_hostnames_type_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-4": tls_certificates_and_hostnames_uploaded_on_4_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificateObject-3": tls$$certificates$$and$$hostnames_certificateObject$$3,
+        "tls-certificates-and-hostnames_certificate_response_collection-5": tls$$certificates$$and$$hostnames_certificate_response_collection$$5,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/mtls_certificates`,
       query: [
-        ["type", args["type"], false],
+        ["type", param(args, "query", "type"), false],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ssl/originCaCertificates/outputs.ts b/src/generated/forge-mcp/ssl/originCaCertificates/outputs.ts
index fdc195504..fd1d1eed3 100644
--- a/src/generated/forge-mcp/ssl/originCaCertificates/outputs.ts
+++ b/src/generated/forge-mcp/ssl/originCaCertificates/outputs.ts
@@ -3,19 +3,12 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-4` in responses.
- */
-export const tls_certificates_and_hostnames_certificate_4_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_certificate_response_collection-2` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_collection_2_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_collection$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -38,7 +31,7 @@ export const tls_certificates_and_hostnames_certificate_response_collection_2_ou
  * The schema of `tls-certificates-and-hostnames_certificate_response_single-2`
  * in responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_single_2_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_single$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -58,15 +51,16 @@ export const tls_certificates_and_hostnames_certificate_response_single_2_output
  * The schema of `tls-certificates-and-hostnames_certificate_revoke_response` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_revoke_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_revoke_response: JsonSchema = {
   "properties": {
     "result": {
       "properties": {
         "id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_origin_ca_certificate_identifier"
+          "type": "string"
         },
         "revoked_at": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_revoked_at"
+          "format": "date-time",
+          "type": "string"
         }
       },
       "type": "object"
@@ -78,28 +72,42 @@ export const tls_certificates_and_hostnames_certificate_revoke_response_output:
 /**
  * The schema of `tls-certificates-and-hostnames_certificates` in responses.
  */
-export const tls_certificates_and_hostnames_certificates_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificates: JsonSchema = {
   "properties": {
     "certificate": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-4"
+      "type": "string"
     },
     "csr": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_csr"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expires_on-3"
+      "type": "string"
     },
     "hostnames": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_hostnames"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_origin_ca_certificate_identifier"
+      "type": "string"
     },
     "request_type": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_request_type"
+      "enum": [
+        "origin-rsa",
+        "origin-ecc",
+        "keyless-certificate"
+      ],
+      "type": "string"
     },
     "requested_validity": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_requested_validity"
+      "enum": [
+        7,
+        30,
+        90,
+        365,
+        730,
+        1095,
+        5475
+      ],
+      "type": "integer"
     }
   },
   "required": [
@@ -111,24 +119,10 @@ export const tls_certificates_and_hostnames_certificates_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_csr` in responses.
- */
-export const tls_certificates_and_hostnames_csr_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_expires_on-3` in responses.
- */
-export const tls_certificates_and_hostnames_expires_on_3_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_hostnames` in responses.
  */
-export const tls_certificates_and_hostnames_hostnames_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostnames: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -136,49 +130,3 @@ export const tls_certificates_and_hostnames_hostnames_output: JsonSchema = {
   "minItems": 1,
   "type": "array"
 };
-
-/**
- * The schema of
- * `tls-certificates-and-hostnames_origin_ca_certificate_identifier` in
- * responses.
- */
-export const tls_certificates_and_hostnames_origin_ca_certificate_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_request_type` in responses.
- */
-export const tls_certificates_and_hostnames_request_type_output: JsonSchema = {
-  "enum": [
-    "origin-rsa",
-    "origin-ecc",
-    "keyless-certificate"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_requested_validity` in
- * responses.
- */
-export const tls_certificates_and_hostnames_requested_validity_output: JsonSchema = {
-  "enum": [
-    7,
-    30,
-    90,
-    365,
-    730,
-    1095,
-    5475
-  ],
-  "type": "integer"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_revoked_at` in responses.
- */
-export const tls_certificates_and_hostnames_revoked_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/originCaCertificates/schemas.ts b/src/generated/forge-mcp/ssl/originCaCertificates/schemas.ts
index 564401bf9..a83203d54 100644
--- a/src/generated/forge-mcp/ssl/originCaCertificates/schemas.ts
+++ b/src/generated/forge-mcp/ssl/originCaCertificates/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_csr`.
- */
-export const tls_certificates_and_hostnames_csr: JsonSchema = {
-  "description": "The Certificate Signing Request (CSR). Must be newline-encoded.",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_hostnames`.
  */
-export const tls_certificates_and_hostnames_hostnames: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostnames: JsonSchema = {
   "description": "Array of hostnames or wildcard names bound to the certificate.\nHostnames must be fully qualified domain names (FQDNs) belonging to zones on your account (e.g., `example.com` or `sub.example.com`). Wildcards are supported only as a `*.` prefix for a single level (e.g., `*.example.com`). Double wildcards (`*.*.example.com`) and interior wildcards (`foo.*.example.com`) are not allowed. The wildcard suffix must be a multi-label domain (`*.example.com` is valid, but `*.com` is not). Unicode/IDN hostnames are accepted and automatically converted to punycode.",
   "items": {
     "type": "string"
@@ -23,42 +15,3 @@ export const tls_certificates_and_hostnames_hostnames: JsonSchema = {
   "minItems": 1,
   "type": "array"
 };
-
-/**
- * The schema of
- * `tls-certificates-and-hostnames_origin_ca_certificate_identifier`.
- */
-export const tls_certificates_and_hostnames_origin_ca_certificate_identifier: JsonSchema = {
-  "description": "The x509 serial number of the Origin CA certificate.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_request_type`.
- */
-export const tls_certificates_and_hostnames_request_type: JsonSchema = {
-  "description": "Signature type desired on certificate (\"origin-rsa\" (rsa), \"origin-ecc\" (ecdsa), or \"keyless-certificate\" (for Keyless SSL servers).",
-  "enum": [
-    "origin-rsa",
-    "origin-ecc",
-    "keyless-certificate"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_requested_validity`.
- */
-export const tls_certificates_and_hostnames_requested_validity: JsonSchema = {
-  "description": "The number of days for which the certificate should be valid.",
-  "enum": [
-    7,
-    30,
-    90,
-    365,
-    730,
-    1095,
-    5475
-  ],
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/ssl/originCaCertificates/tools.ts b/src/generated/forge-mcp/ssl/originCaCertificates/tools.ts
index 86740b493..beb755949 100644
--- a/src/generated/forge-mcp/ssl/originCaCertificates/tools.ts
+++ b/src/generated/forge-mcp/ssl/originCaCertificates/tools.ts
@@ -1,66 +1,66 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_certificate_4_output,
-  tls_certificates_and_hostnames_certificate_response_collection_2_output,
-  tls_certificates_and_hostnames_certificate_response_single_2_output,
-  tls_certificates_and_hostnames_certificate_revoke_response_output,
-  tls_certificates_and_hostnames_certificates_output,
-  tls_certificates_and_hostnames_csr_output,
-  tls_certificates_and_hostnames_expires_on_3_output,
-  tls_certificates_and_hostnames_hostnames_output,
-  tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-  tls_certificates_and_hostnames_request_type_output,
-  tls_certificates_and_hostnames_requested_validity_output,
-  tls_certificates_and_hostnames_revoked_at_output,
+  tls$$certificates$$and$$hostnames_certificate_response_collection$$2,
+  tls$$certificates$$and$$hostnames_certificate_response_single$$2,
+  tls$$certificates$$and$$hostnames_certificate_revoke_response,
+  tls$$certificates$$and$$hostnames_certificates,
+  tls$$certificates$$and$$hostnames_hostnames,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_csr,
-  tls_certificates_and_hostnames_hostnames,
-  tls_certificates_and_hostnames_origin_ca_certificate_identifier,
-  tls_certificates_and_hostnames_request_type,
-  tls_certificates_and_hostnames_requested_validity,
-} from "./schemas.js";
+import { tls$$certificates$$and$$hostnames_hostnames as tls$$certificates$$and$$hostnames_hostnames$ } from "./schemas.js";
 
 /**
- * The tools of `ssl.origin_ca_certificates`.
+ * The tools of `ssl.originCaCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_origin_ca_certificates_create",
+    name: "ssl_originCaCertificates_create",
     title: "Create Certificate",
-    description: "Create an Origin CA certificate. You can use an Origin CA Key as your User Service Key or an API token when calling this endpoint ([see above](#requests)).",
+    description: "Create an Origin CA certificate. You can use an Origin CA Key as your User Service Key or an API token when calling this endpoint ([see above](#requests)).\n\nPOST /certificates",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "csr": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_csr",
-              "description": "The Certificate Signing Request (CSR). Must be newline-encoded."
+              "description": "The Certificate Signing Request (CSR). Must be newline-encoded.",
+              "type": "string"
             },
             "hostnames": {
               "$ref": "#/$defs/tls-certificates-and-hostnames_hostnames",
               "description": "Array of hostnames or wildcard names bound to the certificate.\nHostnames must be fully qualified domain names (FQDNs) belonging to zones on your account (e.g., `example.com` or `sub.example.com`). Wildcards are supported only as a `*.` prefix for a single level (e.g., `*.example.com`). Double wildcards (`*.*.example.com`) and interior wildcards (`foo.*.example.com`) are not allowed. The wildcard suffix must be a multi-label domain (`*.example.com` is valid, but `*.com` is not). Unicode/IDN hostnames are accepted and automatically converted to punycode."
             },
             "request_type": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_request_type",
-              "description": "Signature type desired on certificate (\"origin-rsa\" (rsa), \"origin-ecc\" (ecdsa), or \"keyless-certificate\" (for Keyless SSL servers)."
+              "description": "Signature type desired on certificate (\"origin-rsa\" (rsa), \"origin-ecc\" (ecdsa), or \"keyless-certificate\" (for Keyless SSL servers).",
+              "enum": [
+                "origin-rsa",
+                "origin-ecc",
+                "keyless-certificate"
+              ],
+              "type": "string"
             },
             "requested_validity": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_requested_validity",
               "default": 5475,
-              "description": "The number of days for which the certificate should be valid."
+              "description": "The number of days for which the certificate should be valid.",
+              "enum": [
+                7,
+                30,
+                90,
+                365,
+                730,
+                1095,
+                5475
+              ],
+              "type": "integer"
             }
           },
           "required": [
@@ -74,27 +74,19 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_csr": tls_certificates_and_hostnames_csr,
-        "tls-certificates-and-hostnames_hostnames": tls_certificates_and_hostnames_hostnames,
-        "tls-certificates-and-hostnames_request_type": tls_certificates_and_hostnames_request_type,
-        "tls-certificates-and-hostnames_requested_validity": tls_certificates_and_hostnames_requested_validity,
+        "tls-certificates-and-hostnames_hostnames": tls$$certificates$$and$$hostnames_hostnames$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-2",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-4": tls_certificates_and_hostnames_certificate_4_output,
-        "tls-certificates-and-hostnames_certificate_response_single-2": tls_certificates_and_hostnames_certificate_response_single_2_output,
-        "tls-certificates-and-hostnames_certificates": tls_certificates_and_hostnames_certificates_output,
-        "tls-certificates-and-hostnames_csr": tls_certificates_and_hostnames_csr_output,
-        "tls-certificates-and-hostnames_expires_on-3": tls_certificates_and_hostnames_expires_on_3_output,
-        "tls-certificates-and-hostnames_hostnames": tls_certificates_and_hostnames_hostnames_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-        "tls-certificates-and-hostnames_request_type": tls_certificates_and_hostnames_request_type_output,
-        "tls-certificates-and-hostnames_requested_validity": tls_certificates_and_hostnames_requested_validity_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single-2": tls$$certificates$$and$$hostnames_certificate_response_single$$2,
+        "tls-certificates-and-hostnames_certificates": tls$$certificates$$and$$hostnames_certificates,
+        "tls-certificates-and-hostnames_hostnames": tls$$certificates$$and$$hostnames_hostnames,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -131,18 +123,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-4": tls_certificates_and_hostnames_certificate_4_output,
-        "tls-certificates-and-hostnames_certificate_response_single-2": tls_certificates_and_hostnames_certificate_response_single_2_output,
-        "tls-certificates-and-hostnames_certificates": tls_certificates_and_hostnames_certificates_output,
-        "tls-certificates-and-hostnames_csr": tls_certificates_and_hostnames_csr_output,
-        "tls-certificates-and-hostnames_expires_on-3": tls_certificates_and_hostnames_expires_on_3_output,
-        "tls-certificates-and-hostnames_hostnames": tls_certificates_and_hostnames_hostnames_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-        "tls-certificates-and-hostnames_request_type": tls_certificates_and_hostnames_request_type_output,
-        "tls-certificates-and-hostnames_requested_validity": tls_certificates_and_hostnames_requested_validity_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single-2": tls$$certificates$$and$$hostnames_certificate_response_single$$2,
+        "tls-certificates-and-hostnames_certificates": tls$$certificates$$and$$hostnames_certificates,
+        "tls-certificates-and-hostnames_hostnames": tls$$certificates$$and$$hostnames_hostnames,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -151,30 +137,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_ca_certificates_delete",
+    name: "ssl_originCaCertificates_delete",
     title: "Revoke Certificate",
-    description: "Revoke an existing Origin CA certificate by its serial number. You can use an Origin CA Key as your User Service Key or an API token when calling this endpoint ([see above](#requests)).",
+    description: "Revoke an existing Origin CA certificate by its serial number. You can use an Origin CA Key as your User Service Key or an API token when calling this endpoint ([see above](#requests)).\n\nDELETE /certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_origin_ca_certificate_identifier",
-          "description": "The x509 serial number of the Origin CA certificate."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_id": {
+              "description": "The x509 serial number of the Origin CA certificate.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_revoke_response",
       $defs: {
-        "tls-certificates-and-hostnames_certificate_revoke_response": tls_certificates_and_hostnames_certificate_revoke_response_output,
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-        "tls-certificates-and-hostnames_revoked_at": tls_certificates_and_hostnames_revoked_at_output,
+        "tls-certificates-and-hostnames_certificate_revoke_response": tls$$certificates$$and$$hostnames_certificate_revoke_response,
       },
     },
     annotations: {
@@ -211,11 +202,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate_revoke_response": tls_certificates_and_hostnames_certificate_revoke_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-        "tls-certificates-and-hostnames_revoked_at": tls_certificates_and_hostnames_revoked_at_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificate_revoke_response": tls$$certificates$$and$$hostnames_certificate_revoke_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -223,38 +212,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_ca_certificates_get",
+    name: "ssl_originCaCertificates_get",
     title: "Get Certificate",
-    description: "Get an existing Origin CA certificate by its serial number. You can use an Origin CA Key as your User Service Key or an API token when calling this endpoint ([see above](#requests)).",
+    description: "Get an existing Origin CA certificate by its serial number. You can use an Origin CA Key as your User Service Key or an API token when calling this endpoint ([see above](#requests)).\n\nGET /certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_origin_ca_certificate_identifier",
-          "description": "The x509 serial number of the Origin CA certificate."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_id": {
+              "description": "The x509 serial number of the Origin CA certificate.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-2",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-4": tls_certificates_and_hostnames_certificate_4_output,
-        "tls-certificates-and-hostnames_certificate_response_single-2": tls_certificates_and_hostnames_certificate_response_single_2_output,
-        "tls-certificates-and-hostnames_certificates": tls_certificates_and_hostnames_certificates_output,
-        "tls-certificates-and-hostnames_csr": tls_certificates_and_hostnames_csr_output,
-        "tls-certificates-and-hostnames_expires_on-3": tls_certificates_and_hostnames_expires_on_3_output,
-        "tls-certificates-and-hostnames_hostnames": tls_certificates_and_hostnames_hostnames_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-        "tls-certificates-and-hostnames_request_type": tls_certificates_and_hostnames_request_type_output,
-        "tls-certificates-and-hostnames_requested_validity": tls_certificates_and_hostnames_requested_validity_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single-2": tls$$certificates$$and$$hostnames_certificate_response_single$$2,
+        "tls-certificates-and-hostnames_certificates": tls$$certificates$$and$$hostnames_certificates,
+        "tls-certificates-and-hostnames_hostnames": tls$$certificates$$and$$hostnames_hostnames,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -291,18 +281,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-4": tls_certificates_and_hostnames_certificate_4_output,
-        "tls-certificates-and-hostnames_certificate_response_single-2": tls_certificates_and_hostnames_certificate_response_single_2_output,
-        "tls-certificates-and-hostnames_certificates": tls_certificates_and_hostnames_certificates_output,
-        "tls-certificates-and-hostnames_csr": tls_certificates_and_hostnames_csr_output,
-        "tls-certificates-and-hostnames_expires_on-3": tls_certificates_and_hostnames_expires_on_3_output,
-        "tls-certificates-and-hostnames_hostnames": tls_certificates_and_hostnames_hostnames_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-        "tls-certificates-and-hostnames_request_type": tls_certificates_and_hostnames_request_type_output,
-        "tls-certificates-and-hostnames_requested_validity": tls_certificates_and_hostnames_requested_validity_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificate_response_single-2": tls$$certificates$$and$$hostnames_certificate_response_single$$2,
+        "tls-certificates-and-hostnames_certificates": tls$$certificates$$and$$hostnames_certificates,
+        "tls-certificates-and-hostnames_hostnames": tls$$certificates$$and$$hostnames_hostnames,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -310,57 +294,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_ca_certificates_list",
+    name: "ssl_originCaCertificates_list",
     title: "List Certificates",
-    description: "List all existing Origin CA certificates for a given zone. You can use an Origin CA Key as your User Service Key or an API token when calling this endpoint ([see above](#requests)).",
+    description: "List all existing Origin CA certificates for a given zone. You can use an Origin CA Key as your User Service Key or an API token when calling this endpoint ([see above](#requests)).\n\nGET /certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "limit": {
-          "description": "Limit to the number of records returned.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Offset the results.",
-          "type": "integer"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of records per page.",
-          "type": "number"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "description": "Limit to the number of records returned.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Offset the results.",
+              "type": "integer"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of records per page.",
+              "type": "number"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "query"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_collection-2",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_certificate-4": tls_certificates_and_hostnames_certificate_4_output,
-        "tls-certificates-and-hostnames_certificate_response_collection-2": tls_certificates_and_hostnames_certificate_response_collection_2_output,
-        "tls-certificates-and-hostnames_certificates": tls_certificates_and_hostnames_certificates_output,
-        "tls-certificates-and-hostnames_csr": tls_certificates_and_hostnames_csr_output,
-        "tls-certificates-and-hostnames_expires_on-3": tls_certificates_and_hostnames_expires_on_3_output,
-        "tls-certificates-and-hostnames_hostnames": tls_certificates_and_hostnames_hostnames_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-        "tls-certificates-and-hostnames_request_type": tls_certificates_and_hostnames_request_type_output,
-        "tls-certificates-and-hostnames_requested_validity": tls_certificates_and_hostnames_requested_validity_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_certificate_response_collection-2": tls$$certificates$$and$$hostnames_certificate_response_collection$$2,
+        "tls-certificates-and-hostnames_certificates": tls$$certificates$$and$$hostnames_certificates,
+        "tls-certificates-and-hostnames_hostnames": tls$$certificates$$and$$hostnames_hostnames,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -397,29 +382,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate-4": tls_certificates_and_hostnames_certificate_4_output,
-        "tls-certificates-and-hostnames_certificate_response_collection-2": tls_certificates_and_hostnames_certificate_response_collection_2_output,
-        "tls-certificates-and-hostnames_certificates": tls_certificates_and_hostnames_certificates_output,
-        "tls-certificates-and-hostnames_csr": tls_certificates_and_hostnames_csr_output,
-        "tls-certificates-and-hostnames_expires_on-3": tls_certificates_and_hostnames_expires_on_3_output,
-        "tls-certificates-and-hostnames_hostnames": tls_certificates_and_hostnames_hostnames_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_origin_ca_certificate_identifier": tls_certificates_and_hostnames_origin_ca_certificate_identifier_output,
-        "tls-certificates-and-hostnames_request_type": tls_certificates_and_hostnames_request_type_output,
-        "tls-certificates-and-hostnames_requested_validity": tls_certificates_and_hostnames_requested_validity_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificate_response_collection-2": tls$$certificates$$and$$hostnames_certificate_response_collection$$2,
+        "tls-certificates-and-hostnames_certificates": tls$$certificates$$and$$hostnames_certificates,
+        "tls-certificates-and-hostnames_hostnames": tls$$certificates$$and$$hostnames_hostnames,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
       path: `/certificates`,
       query: [
-        ["zone_id", args["zone_id"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["limit", args["limit"], true],
-        ["offset", args["offset"], true],
+        ["zone_id", param(args, "query", "zone_id"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["offset", param(args, "query", "offset"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameAssociations/outputs.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameAssociations/outputs.ts
index d609cb592..30ce5a6fa 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameAssociations/outputs.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameAssociations/outputs.ts
@@ -7,25 +7,43 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `tls-certificates-and-hostnames_hostname_assoc_object` in
  * responses.
  */
-export const tls_certificates_and_hostnames_hostname_assoc_object_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname_assoc_object: JsonSchema = {
   "properties": {
     "cert_id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_cert_id"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_created_at-3"
+      "format": "date-time",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-5"
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "hostname": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-2"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-9"
+      "enum": [
+        "initializing",
+        "pending_deployment",
+        "pending_deletion",
+        "active",
+        "deleted",
+        "deployment_timed_out",
+        "deletion_timed_out"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at-3"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -36,7 +54,7 @@ export const tls_certificates_and_hostnames_hostname_assoc_object_output: JsonSc
  * `tls-certificates-and-hostnames_hostname_assoc_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_hostname_assoc_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname_assoc_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameAssociations/tools.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameAssociations/tools.ts
index 70038af74..3e6e0a438 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameAssociations/tools.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameAssociations/tools.ts
@@ -1,87 +1,85 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_cert_id_output,
-  tls_certificates_and_hostnames_created_at_3_output,
-  tls_certificates_and_hostnames_enabled_5_output,
-  tls_certificates_and_hostnames_hostname_2_output,
-  tls_certificates_and_hostnames_status_9_output,
-  tls_certificates_and_hostnames_updated_at_3_output,
-} from "../outputs.js";
-import {
-  tls_certificates_and_hostnames_hostname_assoc_object_output,
-  tls_certificates_and_hostnames_hostname_assoc_response_collection_output,
+  tls$$certificates$$and$$hostnames_hostname_assoc_object,
+  tls$$certificates$$and$$hostnames_hostname_assoc_response_collection,
 } from "./outputs.js";
 
 /**
- * The tools of `ssl.origin_tls_client_auth.hostname_associations`.
+ * The tools of `ssl.originTlsClientAuth.hostnameAssociations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_origin_tls_client_auth_hostname_associations_list",
+    name: "ssl_originTlsClientAuth_hostnameAssociations_list",
     title: "List Hostname Associations",
-    description: "List certificate ID - hostname associations for the given zone. Shows which hostnames are associated to which certificates for authenticated origin pulls.",
+    description: "List certificate ID - hostname associations for the given zone. Shows which hostnames are associated to which certificates for authenticated origin pulls.\n\nGET /zones/{zone_id}/origin_tls_client_auth/hostnames",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 50,
-          "description": "Number of associations per page.",
-          "type": "number"
-        },
-        "status": {
-          "description": "Filter associations by status. Use comma-separated values to filter by multiple statuses, or \"all\" to include every status. Defaults to \"active\" if not provided.",
-          "enum": [
-            "active",
-            "pending_deployment",
-            "pending_deletion",
-            "deleted",
-            "deployment_timed_out",
-            "deletion_timed_out",
-            "all"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of associations per page.",
+              "type": "number"
+            },
+            "status": {
+              "description": "Filter associations by status. Use comma-separated values to filter by multiple statuses, or \"all\" to include every status. Defaults to \"active\" if not provided.",
+              "enum": [
+                "active",
+                "pending_deployment",
+                "pending_deletion",
+                "deleted",
+                "deployment_timed_out",
+                "deletion_timed_out",
+                "all"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_assoc_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_cert_id": tls_certificates_and_hostnames_cert_id_output,
-        "tls-certificates-and-hostnames_created_at-3": tls_certificates_and_hostnames_created_at_3_output,
-        "tls-certificates-and-hostnames_enabled-5": tls_certificates_and_hostnames_enabled_5_output,
-        "tls-certificates-and-hostnames_hostname-2": tls_certificates_and_hostnames_hostname_2_output,
-        "tls-certificates-and-hostnames_hostname_assoc_object": tls_certificates_and_hostnames_hostname_assoc_object_output,
-        "tls-certificates-and-hostnames_hostname_assoc_response_collection": tls_certificates_and_hostnames_hostname_assoc_response_collection_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_updated_at-3": tls_certificates_and_hostnames_updated_at_3_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_hostname_assoc_object": tls$$certificates$$and$$hostnames_hostname_assoc_object,
+        "tls-certificates-and-hostnames_hostname_assoc_response_collection": tls$$certificates$$and$$hostnames_hostname_assoc_response_collection,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -122,26 +120,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_cert_id": tls_certificates_and_hostnames_cert_id_output,
-        "tls-certificates-and-hostnames_created_at-3": tls_certificates_and_hostnames_created_at_3_output,
-        "tls-certificates-and-hostnames_enabled-5": tls_certificates_and_hostnames_enabled_5_output,
-        "tls-certificates-and-hostnames_hostname-2": tls_certificates_and_hostnames_hostname_2_output,
-        "tls-certificates-and-hostnames_hostname_assoc_object": tls_certificates_and_hostnames_hostname_assoc_object_output,
-        "tls-certificates-and-hostnames_hostname_assoc_response_collection": tls_certificates_and_hostnames_hostname_assoc_response_collection_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_updated_at-3": tls_certificates_and_hostnames_updated_at_3_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_hostname_assoc_object": tls$$certificates$$and$$hostnames_hostname_assoc_object,
+        "tls-certificates-and-hostnames_hostname_assoc_response_collection": tls$$certificates$$and$$hostnames_hostname_assoc_response_collection,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/origin_tls_client_auth/hostnames`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameCertificates/outputs.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameCertificates/outputs.ts
index 0c807023c..c63bf7d98 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameCertificates/outputs.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameCertificates/outputs.ts
@@ -7,31 +7,42 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `tls-certificates-and-hostnames_certificateObject-2` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificateObject_2_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificateObject$$2: JsonSchema = {
   "properties": {
     "certificate": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-6"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expires_on-5"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_aop_certificate_identifier"
+      "type": "string"
     },
     "issuer": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_issuer"
+      "type": "string"
     },
     "serial_number": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_serial_number"
+      "type": "string"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-9"
+      "enum": [
+        "initializing",
+        "pending_deployment",
+        "pending_deletion",
+        "active",
+        "deleted",
+        "deployment_timed_out",
+        "deletion_timed_out"
+      ],
+      "type": "string"
     },
     "uploaded_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_uploaded_on-3"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -42,7 +53,7 @@ export const tls_certificates_and_hostnames_certificateObject_2_output: JsonSche
  * `tls-certificates-and-hostnames_certificate_response_collection-4` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_collection_4_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_collection$$4: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -65,7 +76,7 @@ export const tls_certificates_and_hostnames_certificate_response_collection_4_ou
  * The schema of `tls-certificates-and-hostnames_certificate_response_single-4`
  * in responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_single_4_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_single$$4: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameCertificates/tools.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameCertificates/tools.ts
index b7e4bbc80..78fcf10db 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameCertificates/tools.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnameCertificates/tools.ts
@@ -3,54 +3,38 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_issuer_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_signature_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_certificate_6_output,
-  tls_certificates_and_hostnames_expires_on_5_output,
-  tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-  tls_certificates_and_hostnames_serial_number_output,
-  tls_certificates_and_hostnames_status_9_output,
-  tls_certificates_and_hostnames_uploaded_on_3_output,
-} from "../outputs.js";
-import {
-  tls_certificates_and_hostnames_certificate_6,
-  tls_certificates_and_hostnames_hostname_aop_certificate_identifier,
-  tls_certificates_and_hostnames_private_key_3,
-} from "../schemas.js";
-import {
-  tls_certificates_and_hostnames_certificateObject_2_output,
-  tls_certificates_and_hostnames_certificate_response_collection_4_output,
-  tls_certificates_and_hostnames_certificate_response_single_4_output,
+  tls$$certificates$$and$$hostnames_certificateObject$$2,
+  tls$$certificates$$and$$hostnames_certificate_response_collection$$4,
+  tls$$certificates$$and$$hostnames_certificate_response_single$$4,
 } from "./outputs.js";
 
 /**
- * The tools of `ssl.origin_tls_client_auth.hostname_certificates`.
+ * The tools of `ssl.originTlsClientAuth.hostnameCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_origin_tls_client_auth_hostname_certificates_create",
+    name: "ssl_originTlsClientAuth_hostnameCertificates_create",
     title: "Upload a Hostname Client Certificate",
-    description: "Upload a certificate to be used for client authentication on a hostname. 10 hostname certificates per zone are allowed.",
+    description: "Upload a certificate to be used for client authentication on a hostname. 10 hostname certificates per zone are allowed.\n\nPOST /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "certificate": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-6",
-              "description": "The hostname certificate."
+              "description": "The hostname certificate.",
+              "type": "string"
             },
             "private_key": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_private_key-3",
-              "description": "The hostname certificate's private key."
+              "description": "The hostname certificate's private key.",
+              "type": "string"
             }
           },
           "required": [
@@ -59,36 +43,33 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_private_key-3": tls_certificates_and_hostnames_private_key_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-4",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_certificateObject-2": tls_certificates_and_hostnames_certificateObject_2_output,
-        "tls-certificates-and-hostnames_certificate_response_single-4": tls_certificates_and_hostnames_certificate_response_single_4_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-2": tls$$certificates$$and$$hostnames_certificateObject$$2,
+        "tls-certificates-and-hostnames_certificate_response_single-4": tls$$certificates$$and$$hostnames_certificate_response_single$$4,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -128,19 +109,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_certificateObject-2": tls_certificates_and_hostnames_certificateObject_2_output,
-        "tls-certificates-and-hostnames_certificate_response_single-4": tls_certificates_and_hostnames_certificate_response_single_4_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-2": tls$$certificates$$and$$hostnames_certificateObject$$2,
+        "tls-certificates-and-hostnames_certificate_response_single-4": tls$$certificates$$and$$hostnames_certificate_response_single$$4,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -149,45 +122,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_tls_client_auth_hostname_certificates_delete",
+    name: "ssl_originTlsClientAuth_hostnameCertificates_delete",
     title: "Delete Hostname Client Certificate",
-    description: "Removes a client certificate used for authenticated origin pulls on a specific hostname.\nNote: Before deleting the certificate, you must first invalidate the hostname for client authentication by sending a PUT request with `enabled` set to null. After invalidating the association, the certificate can be safely deleted.",
+    description: "Removes a client certificate used for authenticated origin pulls on a specific hostname.\nNote: Before deleting the certificate, you must first invalidate the hostname for client authentication by sending a PUT request with `enabled` set to null. After invalidating the association, the certificate can be safely deleted.\n\nDELETE /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_aop_certificate_identifier",
-          "description": "Certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-4",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_certificateObject-2": tls_certificates_and_hostnames_certificateObject_2_output,
-        "tls-certificates-and-hostnames_certificate_response_single-4": tls_certificates_and_hostnames_certificate_response_single_4_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-2": tls$$certificates$$and$$hostnames_certificateObject$$2,
+        "tls-certificates-and-hostnames_certificate_response_single-4": tls$$certificates$$and$$hostnames_certificate_response_single$$4,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -227,19 +198,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_certificateObject-2": tls_certificates_and_hostnames_certificateObject_2_output,
-        "tls-certificates-and-hostnames_certificate_response_single-4": tls_certificates_and_hostnames_certificate_response_single_4_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-2": tls$$certificates$$and$$hostnames_certificateObject$$2,
+        "tls-certificates-and-hostnames_certificate_response_single-4": tls$$certificates$$and$$hostnames_certificate_response_single$$4,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -247,45 +210,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_tls_client_auth_hostname_certificates_get",
+    name: "ssl_originTlsClientAuth_hostnameCertificates_get",
     title: "Get the Hostname Client Certificate",
-    description: "Get the certificate by ID to be used for client authentication on a hostname.",
+    description: "Get the certificate by ID to be used for client authentication on a hostname.\n\nGET /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_aop_certificate_identifier",
-          "description": "Certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-4",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_certificateObject-2": tls_certificates_and_hostnames_certificateObject_2_output,
-        "tls-certificates-and-hostnames_certificate_response_single-4": tls_certificates_and_hostnames_certificate_response_single_4_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-2": tls$$certificates$$and$$hostnames_certificateObject$$2,
+        "tls-certificates-and-hostnames_certificate_response_single-4": tls$$certificates$$and$$hostnames_certificate_response_single$$4,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -326,19 +287,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_certificateObject-2": tls_certificates_and_hostnames_certificateObject_2_output,
-        "tls-certificates-and-hostnames_certificate_response_single-4": tls_certificates_and_hostnames_certificate_response_single_4_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject-2": tls$$certificates$$and$$hostnames_certificateObject$$2,
+        "tls-certificates-and-hostnames_certificate_response_single-4": tls$$certificates$$and$$hostnames_certificate_response_single$$4,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -346,40 +299,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_tls_client_auth_hostname_certificates_list",
+    name: "ssl_originTlsClientAuth_hostnameCertificates_list",
     title: "List Certificates",
-    description: "Lists all client certificates configured for per-hostname authenticated origin pulls on the zone.",
+    description: "Lists all client certificates configured for per-hostname authenticated origin pulls on the zone.\n\nGET /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_collection-4",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_certificateObject-2": tls_certificates_and_hostnames_certificateObject_2_output,
-        "tls-certificates-and-hostnames_certificate_response_collection-4": tls_certificates_and_hostnames_certificate_response_collection_4_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_certificateObject-2": tls$$certificates$$and$$hostnames_certificateObject$$2,
+        "tls-certificates-and-hostnames_certificate_response_collection-4": tls$$certificates$$and$$hostnames_certificate_response_collection$$4,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -420,20 +372,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_certificateObject-2": tls_certificates_and_hostnames_certificateObject_2_output,
-        "tls-certificates-and-hostnames_certificate_response_collection-4": tls_certificates_and_hostnames_certificate_response_collection_4_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificateObject-2": tls$$certificates$$and$$hostnames_certificateObject$$2,
+        "tls-certificates-and-hostnames_certificate_response_collection-4": tls$$certificates$$and$$hostnames_certificate_response_collection$$4,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/outputs.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/outputs.ts
index 9cf5adfcd..2f3caeb5e 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/outputs.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/outputs.ts
@@ -8,27 +8,34 @@ import type { JsonSchema } from "../../../_/tool.js";
  * `tls-certificates-and-hostnames_hostname-authenticated-origin-pull` in
  * responses.
  */
-export const tls_certificates_and_hostnames_hostname_authenticated_origin_pull_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname$$authenticated$$origin$$pull: JsonSchema = {
   "allOf": [
     {
       "properties": {
         "cert_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_aop_certificate_identifier"
+          "type": "string"
         },
         "certificate": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-6"
+          "type": "string"
         },
         "enabled": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-5"
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "hostname": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-2"
+          "type": "string"
         },
         "id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_aop_certificate_identifier"
+          "type": "string"
         },
         "private_key": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_private_key-3"
+          "type": "string"
         }
       },
       "type": "object"
@@ -44,7 +51,7 @@ export const tls_certificates_and_hostnames_hostname_authenticated_origin_pull_o
  * `tls-certificates-and-hostnames_hostname_aop_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_hostname_aop_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname_aop_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -67,7 +74,7 @@ export const tls_certificates_and_hostnames_hostname_aop_response_collection_out
  * The schema of `tls-certificates-and-hostnames_hostname_aop_single_response`
  * in responses.
  */
-export const tls_certificates_and_hostnames_hostname_aop_single_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname_aop_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -87,49 +94,79 @@ export const tls_certificates_and_hostnames_hostname_aop_single_response_output:
  * The schema of `tls-certificates-and-hostnames_hostname_certid_object` in
  * responses.
  */
-export const tls_certificates_and_hostnames_hostname_certid_object_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname_certid_object: JsonSchema = {
   "properties": {
     "cert_id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_aop_certificate_identifier"
+      "type": "string"
     },
     "cert_status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-9"
+      "enum": [
+        "initializing",
+        "pending_deployment",
+        "pending_deletion",
+        "active",
+        "deleted",
+        "deployment_timed_out",
+        "deletion_timed_out"
+      ],
+      "type": "string"
     },
     "cert_updated_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at-3"
+      "format": "date-time",
+      "type": "string"
     },
     "cert_uploaded_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_uploaded_on-3"
+      "format": "date-time",
+      "type": "string"
     },
     "certificate": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-6"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_created_at-3"
+      "format": "date-time",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-5"
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expires_on-5"
+      "format": "date-time",
+      "type": "string"
     },
     "hostname": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-2"
+      "type": "string"
     },
     "issuer": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_issuer"
+      "type": "string"
     },
     "serial_number": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_serial_number"
+      "type": "string"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-9"
+      "enum": [
+        "initializing",
+        "pending_deployment",
+        "pending_deletion",
+        "active",
+        "deleted",
+        "deployment_timed_out",
+        "deletion_timed_out"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at-3"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/schemas.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/schemas.ts
index 6979aaf25..56cd97dc0 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/schemas.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `tls-certificates-and-hostnames_config`.
  */
-export const tls_certificates_and_hostnames_config: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_config: JsonSchema = {
   "items": {
     "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_certid_input"
   },
@@ -16,19 +16,26 @@ export const tls_certificates_and_hostnames_config: JsonSchema = {
 /**
  * The schema of `tls-certificates-and-hostnames_hostname_certid_input`.
  */
-export const tls_certificates_and_hostnames_hostname_certid_input: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_hostname_certid_input: JsonSchema = {
   "properties": {
     "cert_id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_cert_id",
-      "description": "Certificate identifier tag."
+      "description": "Certificate identifier tag.",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-5",
-      "description": "Indicates whether hostname-level authenticated origin pulls is enabled. A null value voids the association."
+      "description": "Indicates whether hostname-level authenticated origin pulls is enabled. A null value voids the association.",
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "hostname": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-2",
-      "description": "The hostname on the origin for which the client certificate uploaded will be used."
+      "description": "The hostname on the origin for which the client certificate uploaded will be used.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/tools.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/tools.ts
index eb545aff5..293e09096 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/tools.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/hostnames/tools.ts
@@ -3,92 +3,65 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_issuer_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_signature_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_certificate_6_output,
-  tls_certificates_and_hostnames_created_at_3_output,
-  tls_certificates_and_hostnames_enabled_5_output,
-  tls_certificates_and_hostnames_expires_on_5_output,
-  tls_certificates_and_hostnames_hostname_2_output,
-  tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-  tls_certificates_and_hostnames_private_key_3_output,
-  tls_certificates_and_hostnames_serial_number_output,
-  tls_certificates_and_hostnames_status_9_output,
-  tls_certificates_and_hostnames_updated_at_3_output,
-  tls_certificates_and_hostnames_uploaded_on_3_output,
-} from "../outputs.js";
-import {
-  tls_certificates_and_hostnames_cert_id,
-  tls_certificates_and_hostnames_enabled_5,
-  tls_certificates_and_hostnames_hostname_2,
-} from "../schemas.js";
-import {
-  tls_certificates_and_hostnames_hostname_aop_response_collection_output,
-  tls_certificates_and_hostnames_hostname_aop_single_response_output,
-  tls_certificates_and_hostnames_hostname_authenticated_origin_pull_output,
-  tls_certificates_and_hostnames_hostname_certid_object_output,
+  tls$$certificates$$and$$hostnames_hostname$$authenticated$$origin$$pull,
+  tls$$certificates$$and$$hostnames_hostname_aop_response_collection,
+  tls$$certificates$$and$$hostnames_hostname_aop_single_response,
+  tls$$certificates$$and$$hostnames_hostname_certid_object,
 } from "./outputs.js";
 import {
-  tls_certificates_and_hostnames_config,
-  tls_certificates_and_hostnames_hostname_certid_input,
+  tls$$certificates$$and$$hostnames_config,
+  tls$$certificates$$and$$hostnames_hostname_certid_input,
 } from "./schemas.js";
 
 /**
- * The tools of `ssl.origin_tls_client_auth.hostnames`.
+ * The tools of `ssl.originTlsClientAuth.hostnames`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_origin_tls_client_auth_hostnames_get",
+    name: "ssl_originTlsClientAuth_hostnames_get",
     title: "Get the Hostname Status for Client Authentication",
-    description: "Retrieves the client certificate authentication status for a specific hostname, showing whether authenticated origin pulls are enabled.",
+    description: "Retrieves the client certificate authentication status for a specific hostname, showing whether authenticated origin pulls are enabled.\n\nGET /zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
-        "hostname": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-2",
-          "description": "The hostname on the origin for which the client certificate uploaded will be used."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "hostname": {
+              "description": "The hostname on the origin for which the client certificate uploaded will be used.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "hostname"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_hostname-2": tls_certificates_and_hostnames_hostname_2,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_aop_single_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_created_at-3": tls_certificates_and_hostnames_created_at_3_output,
-        "tls-certificates-and-hostnames_enabled-5": tls_certificates_and_hostnames_enabled_5_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname-2": tls_certificates_and_hostnames_hostname_2_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_hostname_aop_single_response": tls_certificates_and_hostnames_hostname_aop_single_response_output,
-        "tls-certificates-and-hostnames_hostname_certid_object": tls_certificates_and_hostnames_hostname_certid_object_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_updated_at-3": tls_certificates_and_hostnames_updated_at_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_hostname_aop_single_response": tls$$certificates$$and$$hostnames_hostname_aop_single_response,
+        "tls-certificates-and-hostnames_hostname_certid_object": tls$$certificates$$and$$hostnames_hostname_certid_object,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -129,23 +102,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_created_at-3": tls_certificates_and_hostnames_created_at_3_output,
-        "tls-certificates-and-hostnames_enabled-5": tls_certificates_and_hostnames_enabled_5_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname-2": tls_certificates_and_hostnames_hostname_2_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_hostname_aop_single_response": tls_certificates_and_hostnames_hostname_aop_single_response_output,
-        "tls-certificates-and-hostnames_hostname_certid_object": tls_certificates_and_hostnames_hostname_certid_object_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_updated_at-3": tls_certificates_and_hostnames_updated_at_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_hostname_aop_single_response": tls$$certificates$$and$$hostnames_hostname_aop_single_response,
+        "tls-certificates-and-hostnames_hostname_certid_object": tls$$certificates$$and$$hostnames_hostname_certid_object,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -153,9 +114,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_tls_client_auth_hostnames_update",
+    name: "ssl_originTlsClientAuth_hostnames_update",
     title: "Enable or Disable a Hostname for Client Authentication",
-    description: "Associate a hostname to a certificate and enable, disable or invalidate the association. If disabled, client certificate will not be sent to the hostname even if activated at the zone level. 100 maximum associations on a single certificate are allowed. Note: Use a null value for parameter *enabled* to invalidate the association.",
+    description: "Associate a hostname to a certificate and enable, disable or invalidate the association. If disabled, client certificate will not be sent to the hostname even if activated at the zone level. 100 maximum associations on a single certificate are allowed. Note: Use a null value for parameter *enabled* to invalidate the association.\n\nPUT /zones/{zone_id}/origin_tls_client_auth/hostnames",
     inputSchema: {
       type: "object",
       properties: {
@@ -170,46 +131,39 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_cert_id": tls_certificates_and_hostnames_cert_id,
-        "tls-certificates-and-hostnames_config": tls_certificates_and_hostnames_config,
-        "tls-certificates-and-hostnames_enabled-5": tls_certificates_and_hostnames_enabled_5,
-        "tls-certificates-and-hostnames_hostname-2": tls_certificates_and_hostnames_hostname_2,
-        "tls-certificates-and-hostnames_hostname_certid_input": tls_certificates_and_hostnames_hostname_certid_input,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
+        "tls-certificates-and-hostnames_config": tls$$certificates$$and$$hostnames_config,
+        "tls-certificates-and-hostnames_hostname_certid_input": tls$$certificates$$and$$hostnames_hostname_certid_input,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_hostname_aop_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_created_at-3": tls_certificates_and_hostnames_created_at_3_output,
-        "tls-certificates-and-hostnames_enabled-5": tls_certificates_and_hostnames_enabled_5_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname-2": tls_certificates_and_hostnames_hostname_2_output,
-        "tls-certificates-and-hostnames_hostname-authenticated-origin-pull": tls_certificates_and_hostnames_hostname_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_hostname_aop_response_collection": tls_certificates_and_hostnames_hostname_aop_response_collection_output,
-        "tls-certificates-and-hostnames_hostname_certid_object": tls_certificates_and_hostnames_hostname_certid_object_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-3": tls_certificates_and_hostnames_private_key_3_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_updated_at-3": tls_certificates_and_hostnames_updated_at_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_hostname-authenticated-origin-pull": tls$$certificates$$and$$hostnames_hostname$$authenticated$$origin$$pull,
+        "tls-certificates-and-hostnames_hostname_aop_response_collection": tls$$certificates$$and$$hostnames_hostname_aop_response_collection,
+        "tls-certificates-and-hostnames_hostname_certid_object": tls$$certificates$$and$$hostnames_hostname_certid_object,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -249,26 +203,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate-6": tls_certificates_and_hostnames_certificate_6_output,
-        "tls-certificates-and-hostnames_created_at-3": tls_certificates_and_hostnames_created_at_3_output,
-        "tls-certificates-and-hostnames_enabled-5": tls_certificates_and_hostnames_enabled_5_output,
-        "tls-certificates-and-hostnames_expires_on-5": tls_certificates_and_hostnames_expires_on_5_output,
-        "tls-certificates-and-hostnames_hostname-2": tls_certificates_and_hostnames_hostname_2_output,
-        "tls-certificates-and-hostnames_hostname-authenticated-origin-pull": tls_certificates_and_hostnames_hostname_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_hostname_aop_certificate_identifier": tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output,
-        "tls-certificates-and-hostnames_hostname_aop_response_collection": tls_certificates_and_hostnames_hostname_aop_response_collection_output,
-        "tls-certificates-and-hostnames_hostname_certid_object": tls_certificates_and_hostnames_hostname_certid_object_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-3": tls_certificates_and_hostnames_private_key_3_output,
-        "tls-certificates-and-hostnames_serial_number": tls_certificates_and_hostnames_serial_number_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-9": tls_certificates_and_hostnames_status_9_output,
-        "tls-certificates-and-hostnames_updated_at-3": tls_certificates_and_hostnames_updated_at_3_output,
-        "tls-certificates-and-hostnames_uploaded_on-3": tls_certificates_and_hostnames_uploaded_on_3_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_hostname-authenticated-origin-pull": tls$$certificates$$and$$hostnames_hostname$$authenticated$$origin$$pull,
+        "tls-certificates-and-hostnames_hostname_aop_response_collection": tls$$certificates$$and$$hostnames_hostname_aop_response_collection,
+        "tls-certificates-and-hostnames_hostname_certid_object": tls$$certificates$$and$$hostnames_hostname_certid_object,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/outputs.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/outputs.ts
deleted file mode 100644
index 0fb81e5c5..000000000
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/outputs.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_cert_id` in responses.
- */
-export const tls_certificates_and_hostnames_cert_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-6` in responses.
- */
-export const tls_certificates_and_hostnames_certificate_6_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_created_at-3` in responses.
- */
-export const tls_certificates_and_hostnames_created_at_3_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_enabled-4` in responses.
- */
-export const tls_certificates_and_hostnames_enabled_4_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_enabled-5` in responses.
- */
-export const tls_certificates_and_hostnames_enabled_5_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_expires_on-5` in responses.
- */
-export const tls_certificates_and_hostnames_expires_on_5_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_hostname-2` in responses.
- */
-export const tls_certificates_and_hostnames_hostname_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of
- * `tls-certificates-and-hostnames_hostname_aop_certificate_identifier` in
- * responses.
- */
-export const tls_certificates_and_hostnames_hostname_aop_certificate_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_private_key-3` in responses.
- */
-export const tls_certificates_and_hostnames_private_key_3_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_serial_number` in responses.
- */
-export const tls_certificates_and_hostnames_serial_number_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_status-9` in responses.
- */
-export const tls_certificates_and_hostnames_status_9_output: JsonSchema = {
-  "enum": [
-    "initializing",
-    "pending_deployment",
-    "pending_deletion",
-    "active",
-    "deleted",
-    "deployment_timed_out",
-    "deletion_timed_out"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_updated_at-3` in responses.
- */
-export const tls_certificates_and_hostnames_updated_at_3_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_uploaded_on-3` in responses.
- */
-export const tls_certificates_and_hostnames_uploaded_on_3_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/schemas.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/schemas.ts
deleted file mode 100644
index 09abe0dec..000000000
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/schemas.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_cert_id`.
- */
-export const tls_certificates_and_hostnames_cert_id: JsonSchema = {
-  "description": "Certificate identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-6`.
- */
-export const tls_certificates_and_hostnames_certificate_6: JsonSchema = {
-  "description": "The hostname certificate.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_enabled-4`.
- */
-export const tls_certificates_and_hostnames_enabled_4: JsonSchema = {
-  "description": "Indicates whether zone-level authenticated origin pulls is enabled.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_enabled-5`.
- */
-export const tls_certificates_and_hostnames_enabled_5: JsonSchema = {
-  "description": "Indicates whether hostname-level authenticated origin pulls is enabled. A null value voids the association.",
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_hostname-2`.
- */
-export const tls_certificates_and_hostnames_hostname_2: JsonSchema = {
-  "description": "The hostname on the origin for which the client certificate uploaded will be used.",
-  "type": "string"
-};
-
-/**
- * The schema of
- * `tls-certificates-and-hostnames_hostname_aop_certificate_identifier`.
- */
-export const tls_certificates_and_hostnames_hostname_aop_certificate_identifier: JsonSchema = {
-  "description": "Certificate identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_private_key-3`.
- */
-export const tls_certificates_and_hostnames_private_key_3: JsonSchema = {
-  "description": "The hostname certificate's private key.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/settings/outputs.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/settings/outputs.ts
index b3472564d..5919f8e44 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/settings/outputs.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/settings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `tls-certificates-and-hostnames_enabled_response` in responses.
  */
-export const tls_certificates_and_hostnames_enabled_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_enabled_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -16,7 +16,7 @@ export const tls_certificates_and_hostnames_enabled_response_output: JsonSchema
         "result": {
           "properties": {
             "enabled": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-4"
+              "type": "boolean"
             }
           },
           "type": "object"
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/settings/tools.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/settings/tools.ts
index d7230e8ef..6c10c82e7 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/settings/tools.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/settings/tools.ts
@@ -3,45 +3,48 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
-import { tls_certificates_and_hostnames_enabled_4_output } from "../outputs.js";
-import { tls_certificates_and_hostnames_enabled_4 } from "../schemas.js";
-import { tls_certificates_and_hostnames_enabled_response_output } from "./outputs.js";
+import { tls$$certificates$$and$$hostnames_enabled_response } from "./outputs.js";
 
 /**
- * The tools of `ssl.origin_tls_client_auth.settings`.
+ * The tools of `ssl.originTlsClientAuth.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_origin_tls_client_auth_settings_get",
+    name: "ssl_originTlsClientAuth_settings_get",
     title: "Get Enablement Setting for Zone",
-    description: "Get whether zone-level authenticated origin pulls is enabled or not. It is false by default.",
+    description: "Get whether zone-level authenticated origin pulls is enabled or not. It is false by default.\n\nGET /zones/{zone_id}/origin_tls_client_auth/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_enabled_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_enabled_response": tls_certificates_and_hostnames_enabled_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_enabled_response": tls$$certificates$$and$$hostnames_enabled_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -82,11 +85,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_enabled_response": tls_certificates_and_hostnames_enabled_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_enabled_response": tls$$certificates$$and$$hostnames_enabled_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
@@ -94,17 +96,17 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_tls_client_auth_settings_update",
+    name: "ssl_originTlsClientAuth_settings_update",
     title: "Set Enablement for Zone",
-    description: "Enable or disable zone-level authenticated origin pulls. 'enabled' should be set true either before/after the certificate is uploaded to see the certificate in use.",
+    description: "Enable or disable zone-level authenticated origin pulls. 'enabled' should be set true either before/after the certificate is uploaded to see the certificate in use.\n\nPUT /zones/{zone_id}/origin_tls_client_auth/settings",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "enabled": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-4",
-              "description": "Indicates whether zone-level authenticated origin pulls is enabled."
+              "description": "Indicates whether zone-level authenticated origin pulls is enabled.",
+              "type": "boolean"
             }
           },
           "required": [
@@ -112,27 +114,32 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_enabled_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_enabled_response": tls_certificates_and_hostnames_enabled_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_enabled_response": tls$$certificates$$and$$hostnames_enabled_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     annotations: {
@@ -172,11 +179,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_enabled_response": tls_certificates_and_hostnames_enabled_response_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_enabled_response": tls$$certificates$$and$$hostnames_enabled_response,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/outputs.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/outputs.ts
index 6201c0fc8..5d6a78768 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/outputs.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/outputs.ts
@@ -3,39 +3,43 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-5` in responses.
- */
-export const tls_certificates_and_hostnames_certificate_5_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_certificateObject` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificateObject_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificateObject: JsonSchema = {
   "properties": {
     "certificate": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-5"
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_expires_on-4"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_zone_aop_certificate_identifier"
+      "type": "string"
     },
     "issuer": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_issuer"
+      "type": "string"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-8"
+      "enum": [
+        "initializing",
+        "pending_deployment",
+        "pending_deletion",
+        "active",
+        "deleted",
+        "deployment_timed_out",
+        "deletion_timed_out"
+      ],
+      "type": "string"
     },
     "uploaded_on": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_uploaded_on-2"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -46,7 +50,7 @@ export const tls_certificates_and_hostnames_certificateObject_output: JsonSchema
  * `tls-certificates-and-hostnames_certificate_response_collection-3` in
  * responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_collection_3_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_collection$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -69,7 +73,7 @@ export const tls_certificates_and_hostnames_certificate_response_collection_3_ou
  * The schema of `tls-certificates-and-hostnames_certificate_response_single-3`
  * in responses.
  */
-export const tls_certificates_and_hostnames_certificate_response_single_3_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_certificate_response_single$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -85,64 +89,25 @@ export const tls_certificates_and_hostnames_certificate_response_single_3_output
   ]
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_expires_on-4` in responses.
- */
-export const tls_certificates_and_hostnames_expires_on_4_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_private_key-2` in responses.
- */
-export const tls_certificates_and_hostnames_private_key_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_status-8` in responses.
- */
-export const tls_certificates_and_hostnames_status_8_output: JsonSchema = {
-  "enum": [
-    "initializing",
-    "pending_deployment",
-    "pending_deletion",
-    "active",
-    "deleted",
-    "deployment_timed_out",
-    "deletion_timed_out"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_uploaded_on-2` in responses.
- */
-export const tls_certificates_and_hostnames_uploaded_on_2_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_zone-authenticated-origin-pull`
  * in responses.
  */
-export const tls_certificates_and_hostnames_zone_authenticated_origin_pull_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull: JsonSchema = {
   "allOf": [
     {
       "properties": {
         "certificate": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-5"
+          "type": "string"
         },
         "enabled": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-4"
+          "type": "boolean"
         },
         "id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_zone_aop_certificate_identifier"
+          "type": "string"
         },
         "private_key": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_private_key-2"
+          "type": "string"
         }
       },
       "type": "object"
@@ -152,12 +117,3 @@ export const tls_certificates_and_hostnames_zone_authenticated_origin_pull_outpu
     }
   ]
 };
-
-/**
- * The schema of
- * `tls-certificates-and-hostnames_zone_aop_certificate_identifier` in
- * responses.
- */
-export const tls_certificates_and_hostnames_zone_aop_certificate_identifier_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/schemas.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/schemas.ts
deleted file mode 100644
index e72558e3a..000000000
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/schemas.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate-5`.
- */
-export const tls_certificates_and_hostnames_certificate_5: JsonSchema = {
-  "description": "The zone's leaf certificate.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_private_key-2`.
- */
-export const tls_certificates_and_hostnames_private_key_2: JsonSchema = {
-  "description": "The zone's private key.",
-  "type": "string"
-};
-
-/**
- * The schema of
- * `tls-certificates-and-hostnames_zone_aop_certificate_identifier`.
- */
-export const tls_certificates_and_hostnames_zone_aop_certificate_identifier: JsonSchema = {
-  "description": "Certificate identifier tag.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/tools.ts b/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/tools.ts
index cc505ac8a..009351d98 100644
--- a/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/tools.ts
+++ b/src/generated/forge-mcp/ssl/originTlsClientAuth/zoneCertificates/tools.ts
@@ -3,54 +3,39 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_issuer_output,
-  tls_certificates_and_hostnames_messages_output,
-  tls_certificates_and_hostnames_signature_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
-import { tls_certificates_and_hostnames_enabled_4_output } from "../outputs.js";
 import {
-  tls_certificates_and_hostnames_certificateObject_output,
-  tls_certificates_and_hostnames_certificate_5_output,
-  tls_certificates_and_hostnames_certificate_response_collection_3_output,
-  tls_certificates_and_hostnames_certificate_response_single_3_output,
-  tls_certificates_and_hostnames_expires_on_4_output,
-  tls_certificates_and_hostnames_private_key_2_output,
-  tls_certificates_and_hostnames_status_8_output,
-  tls_certificates_and_hostnames_uploaded_on_2_output,
-  tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
-  tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
+  tls$$certificates$$and$$hostnames_certificateObject,
+  tls$$certificates$$and$$hostnames_certificate_response_collection$$3,
+  tls$$certificates$$and$$hostnames_certificate_response_single$$3,
+  tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_certificate_5,
-  tls_certificates_and_hostnames_private_key_2,
-  tls_certificates_and_hostnames_zone_aop_certificate_identifier,
-} from "./schemas.js";
 
 /**
- * The tools of `ssl.origin_tls_client_auth.zone_certificates`.
+ * The tools of `ssl.originTlsClientAuth.zoneCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "ssl_origin_tls_client_auth_zone_certificates_create",
+    name: "ssl_originTlsClientAuth_zoneCertificates_create",
     title: "Upload Certificate",
-    description: "Upload your own certificate you want Cloudflare to use for edge-to-origin communication to override the shared certificate. Please note that it is important to keep only one certificate active. Also, make sure to enable zone-level authenticated origin pulls by making a PUT call to settings endpoint to see the uploaded certificate in use.",
+    description: "Upload your own certificate you want Cloudflare to use for edge-to-origin communication to override the shared certificate. Please note that it is important to keep only one certificate active. Also, make sure to enable zone-level authenticated origin pulls by making a PUT call to settings endpoint to see the uploaded certificate in use.\n\nPOST /zones/{zone_id}/origin_tls_client_auth",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "certificate": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_certificate-5",
-              "description": "The zone's leaf certificate."
+              "description": "The zone's leaf certificate.",
+              "type": "string"
             },
             "private_key": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_private_key-2",
-              "description": "The zone's private key."
+              "description": "The zone's private key.",
+              "type": "string"
             }
           },
           "required": [
@@ -59,38 +44,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-3",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5_output,
-        "tls-certificates-and-hostnames_certificateObject": tls_certificates_and_hostnames_certificateObject_output,
-        "tls-certificates-and-hostnames_certificate_response_single-3": tls_certificates_and_hostnames_certificate_response_single_3_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_expires_on-4": tls_certificates_and_hostnames_expires_on_4_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-8": tls_certificates_and_hostnames_status_8_output,
-        "tls-certificates-and-hostnames_uploaded_on-2": tls_certificates_and_hostnames_uploaded_on_2_output,
-        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject": tls$$certificates$$and$$hostnames_certificateObject,
+        "tls-certificates-and-hostnames_certificate_response_single-3": tls$$certificates$$and$$hostnames_certificate_response_single$$3,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
       },
     },
     annotations: {
@@ -135,21 +116,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5_output,
-        "tls-certificates-and-hostnames_certificateObject": tls_certificates_and_hostnames_certificateObject_output,
-        "tls-certificates-and-hostnames_certificate_response_single-3": tls_certificates_and_hostnames_certificate_response_single_3_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_expires_on-4": tls_certificates_and_hostnames_expires_on_4_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-8": tls_certificates_and_hostnames_status_8_output,
-        "tls-certificates-and-hostnames_uploaded_on-2": tls_certificates_and_hostnames_uploaded_on_2_output,
-        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject": tls$$certificates$$and$$hostnames_certificateObject,
+        "tls-certificates-and-hostnames_certificate_response_single-3": tls$$certificates$$and$$hostnames_certificate_response_single$$3,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
       },
     },
     request: (args) => ({
@@ -158,47 +130,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_tls_client_auth_zone_certificates_delete",
+    name: "ssl_originTlsClientAuth_zoneCertificates_delete",
     title: "Delete Certificate",
-    description: "Removes a client certificate used for zone-level authenticated origin pulls.",
+    description: "Removes a client certificate used for zone-level authenticated origin pulls.\n\nDELETE /zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_zone_aop_certificate_identifier",
-          "description": "Certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-3",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5_output,
-        "tls-certificates-and-hostnames_certificateObject": tls_certificates_and_hostnames_certificateObject_output,
-        "tls-certificates-and-hostnames_certificate_response_single-3": tls_certificates_and_hostnames_certificate_response_single_3_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_expires_on-4": tls_certificates_and_hostnames_expires_on_4_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-8": tls_certificates_and_hostnames_status_8_output,
-        "tls-certificates-and-hostnames_uploaded_on-2": tls_certificates_and_hostnames_uploaded_on_2_output,
-        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject": tls$$certificates$$and$$hostnames_certificateObject,
+        "tls-certificates-and-hostnames_certificate_response_single-3": tls$$certificates$$and$$hostnames_certificate_response_single$$3,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
       },
     },
     annotations: {
@@ -238,21 +207,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5_output,
-        "tls-certificates-and-hostnames_certificateObject": tls_certificates_and_hostnames_certificateObject_output,
-        "tls-certificates-and-hostnames_certificate_response_single-3": tls_certificates_and_hostnames_certificate_response_single_3_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_expires_on-4": tls_certificates_and_hostnames_expires_on_4_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-8": tls_certificates_and_hostnames_status_8_output,
-        "tls-certificates-and-hostnames_uploaded_on-2": tls_certificates_and_hostnames_uploaded_on_2_output,
-        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject": tls$$certificates$$and$$hostnames_certificateObject,
+        "tls-certificates-and-hostnames_certificate_response_single-3": tls$$certificates$$and$$hostnames_certificate_response_single$$3,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
       },
     },
     request: (args) => ({
@@ -260,47 +220,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_tls_client_auth_zone_certificates_get",
+    name: "ssl_originTlsClientAuth_zoneCertificates_get",
     title: "Get Certificate Details",
-    description: "Retrieves details for a specific client certificate used in zone-level authenticated origin pulls.",
+    description: "Retrieves details for a specific client certificate used in zone-level authenticated origin pulls.\n\nGET /zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "certificate_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_zone_aop_certificate_identifier",
-          "description": "Certificate identifier tag."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_id": {
+              "description": "Certificate identifier tag.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_single-3",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5_output,
-        "tls-certificates-and-hostnames_certificateObject": tls_certificates_and_hostnames_certificateObject_output,
-        "tls-certificates-and-hostnames_certificate_response_single-3": tls_certificates_and_hostnames_certificate_response_single_3_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_expires_on-4": tls_certificates_and_hostnames_expires_on_4_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-8": tls_certificates_and_hostnames_status_8_output,
-        "tls-certificates-and-hostnames_uploaded_on-2": tls_certificates_and_hostnames_uploaded_on_2_output,
-        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject": tls$$certificates$$and$$hostnames_certificateObject,
+        "tls-certificates-and-hostnames_certificate_response_single-3": tls$$certificates$$and$$hostnames_certificate_response_single$$3,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
       },
     },
     annotations: {
@@ -341,21 +298,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5_output,
-        "tls-certificates-and-hostnames_certificateObject": tls_certificates_and_hostnames_certificateObject_output,
-        "tls-certificates-and-hostnames_certificate_response_single-3": tls_certificates_and_hostnames_certificate_response_single_3_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_expires_on-4": tls_certificates_and_hostnames_expires_on_4_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-8": tls_certificates_and_hostnames_status_8_output,
-        "tls-certificates-and-hostnames_uploaded_on-2": tls_certificates_and_hostnames_uploaded_on_2_output,
-        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_certificateObject": tls$$certificates$$and$$hostnames_certificateObject,
+        "tls-certificates-and-hostnames_certificate_response_single-3": tls$$certificates$$and$$hostnames_certificate_response_single$$3,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
       },
     },
     request: (args) => ({
@@ -363,42 +311,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "ssl_origin_tls_client_auth_zone_certificates_list",
+    name: "ssl_originTlsClientAuth_zoneCertificates_list",
     title: "List Certificates",
-    description: "Lists all client certificates configured for zone-level authenticated origin pulls.",
+    description: "Lists all client certificates configured for zone-level authenticated origin pulls.\n\nGET /zones/{zone_id}/origin_tls_client_auth",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_response_collection-3",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5_output,
-        "tls-certificates-and-hostnames_certificateObject": tls_certificates_and_hostnames_certificateObject_output,
-        "tls-certificates-and-hostnames_certificate_response_collection-3": tls_certificates_and_hostnames_certificate_response_collection_3_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_expires_on-4": tls_certificates_and_hostnames_expires_on_4_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-8": tls_certificates_and_hostnames_status_8_output,
-        "tls-certificates-and-hostnames_uploaded_on-2": tls_certificates_and_hostnames_uploaded_on_2_output,
-        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_certificateObject": tls$$certificates$$and$$hostnames_certificateObject,
+        "tls-certificates-and-hostnames_certificate_response_collection-3": tls$$certificates$$and$$hostnames_certificate_response_collection$$3,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
       },
     },
     annotations: {
@@ -444,22 +390,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_certificate-5": tls_certificates_and_hostnames_certificate_5_output,
-        "tls-certificates-and-hostnames_certificateObject": tls_certificates_and_hostnames_certificateObject_output,
-        "tls-certificates-and-hostnames_certificate_response_collection-3": tls_certificates_and_hostnames_certificate_response_collection_3_output,
-        "tls-certificates-and-hostnames_enabled-4": tls_certificates_and_hostnames_enabled_4_output,
-        "tls-certificates-and-hostnames_expires_on-4": tls_certificates_and_hostnames_expires_on_4_output,
-        "tls-certificates-and-hostnames_issuer": tls_certificates_and_hostnames_issuer_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_private_key-2": tls_certificates_and_hostnames_private_key_2_output,
-        "tls-certificates-and-hostnames_signature": tls_certificates_and_hostnames_signature_output,
-        "tls-certificates-and-hostnames_status-8": tls_certificates_and_hostnames_status_8_output,
-        "tls-certificates-and-hostnames_uploaded_on-2": tls_certificates_and_hostnames_uploaded_on_2_output,
-        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls_certificates_and_hostnames_zone_authenticated_origin_pull_output,
-        "tls-certificates-and-hostnames_zone_aop_certificate_identifier": tls_certificates_and_hostnames_zone_aop_certificate_identifier_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_certificateObject": tls$$certificates$$and$$hostnames_certificateObject,
+        "tls-certificates-and-hostnames_certificate_response_collection-3": tls$$certificates$$and$$hostnames_certificate_response_collection$$3,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_zone-authenticated-origin-pull": tls$$certificates$$and$$hostnames_zone$$authenticated$$origin$$pull,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/outputs.ts b/src/generated/forge-mcp/ssl/outputs.ts
index 217ee5386..a0e1fd5f9 100644
--- a/src/generated/forge-mcp/ssl/outputs.ts
+++ b/src/generated/forge-mcp/ssl/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `cache_api-response-common-failure` in responses.
  */
-export const cache_api_response_common_failure_output: JsonSchema = {
+export const cache_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cache_messages"
@@ -33,7 +33,7 @@ export const cache_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `cache_api-response-single-id` in responses.
  */
-export const cache_api_response_single_id_output: JsonSchema = {
+export const cache_api$$response$$single$$id: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/cache_messages"
@@ -60,7 +60,7 @@ export const cache_api_response_single_id_output: JsonSchema = {
 /**
  * The schema of `cache_messages` in responses.
  */
-export const cache_messages_output: JsonSchema = {
+export const cache_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -82,7 +82,7 @@ export const cache_messages_output: JsonSchema = {
 /**
  * The schema of `cache_result` in responses.
  */
-export const cache_result_output: JsonSchema = {
+export const cache_result: JsonSchema = {
   "properties": {
     "editable": {
       "type": "boolean"
@@ -122,57 +122,31 @@ export const cache_result_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_bundle_method` in responses.
- */
-export const tls_certificates_and_hostnames_bundle_method_output: JsonSchema = {
-  "enum": [
-    "ubiquitous",
-    "optimal",
-    "force"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_enabled` in responses.
- */
-export const tls_certificates_and_hostnames_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_host` in responses.
- */
-export const tls_certificates_and_hostnames_host_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_keyless-certificate` in
  * responses.
  */
-export const tls_certificates_and_hostnames_keyless_certificate_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_keyless$$certificate: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
       "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_enabled"
+      "type": "boolean"
     },
     "host": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_host"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_certificate_identifier"
+      "type": "string"
     },
     "modified_on": {
       "format": "date-time",
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_name"
+      "type": "string"
     },
     "permissions": {
       "items": {
@@ -181,10 +155,14 @@ export const tls_certificates_and_hostnames_keyless_certificate_output: JsonSche
       "type": "array"
     },
     "port": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_port"
+      "type": "number"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-2"
+      "enum": [
+        "active",
+        "deleted"
+      ],
+      "type": "string"
     },
     "tunnel": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_tunnel"
@@ -204,32 +182,16 @@ export const tls_certificates_and_hostnames_keyless_certificate_output: JsonSche
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_keyless_certificate_identifier`
- * in responses.
- */
-export const tls_certificates_and_hostnames_keyless_certificate_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_keyless_private_ip` in
- * responses.
- */
-export const tls_certificates_and_hostnames_keyless_private_ip_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_keyless_tunnel` in responses.
  */
-export const tls_certificates_and_hostnames_keyless_tunnel_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_keyless_tunnel: JsonSchema = {
   "properties": {
     "private_ip": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_private_ip"
+      "type": "string"
     },
     "vnet_id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_vnet_id"
+      "type": "string"
     }
   },
   "required": [
@@ -238,35 +200,3 @@ export const tls_certificates_and_hostnames_keyless_tunnel_output: JsonSchema =
   ],
   "type": "object"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_keyless_vnet_id` in responses.
- */
-export const tls_certificates_and_hostnames_keyless_vnet_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_name` in responses.
- */
-export const tls_certificates_and_hostnames_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_port` in responses.
- */
-export const tls_certificates_and_hostnames_port_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_status-2` in responses.
- */
-export const tls_certificates_and_hostnames_status_2_output: JsonSchema = {
-  "enum": [
-    "active",
-    "deleted"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/schemas.ts b/src/generated/forge-mcp/ssl/schemas.ts
index 12bfd89f9..25e62c9ed 100644
--- a/src/generated/forge-mcp/ssl/schemas.ts
+++ b/src/generated/forge-mcp/ssl/schemas.ts
@@ -3,72 +3,19 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `cache_identifier`.
- */
-export const cache_identifier: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_bundle_method`.
- */
-export const tls_certificates_and_hostnames_bundle_method: JsonSchema = {
-  "description": "A ubiquitous bundle has the highest probability of being verified everywhere, even by clients using outdated or unusual trust stores. An optimal bundle uses the shortest chain and newest intermediates. And the force bundle verifies the chain, but does not otherwise modify it.",
-  "enum": [
-    "ubiquitous",
-    "optimal",
-    "force"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate`.
- */
-export const tls_certificates_and_hostnames_certificate: JsonSchema = {
-  "description": "The zone's SSL certificate or certificate and the intermediate(s).",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_host`.
- */
-export const tls_certificates_and_hostnames_host: JsonSchema = {
-  "description": "The keyless SSL name.",
-  "type": "string"
-};
-
-/**
- * The schema of
- * `tls-certificates-and-hostnames_keyless_certificate_identifier`.
- */
-export const tls_certificates_and_hostnames_keyless_certificate_identifier: JsonSchema = {
-  "description": "Keyless certificate identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_keyless_private_ip`.
- */
-export const tls_certificates_and_hostnames_keyless_private_ip: JsonSchema = {
-  "description": "Private IP of the Key Server Host.",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_keyless_tunnel`.
  */
-export const tls_certificates_and_hostnames_keyless_tunnel: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_keyless_tunnel: JsonSchema = {
   "description": "Configuration for using Keyless SSL through a Cloudflare Tunnel.",
   "properties": {
     "private_ip": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_private_ip",
-      "description": "Private IP of the Key Server Host."
+      "description": "Private IP of the Key Server Host.",
+      "type": "string"
     },
     "vnet_id": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_keyless_vnet_id",
-      "description": "Cloudflare Tunnel Virtual Network ID."
+      "description": "Cloudflare Tunnel Virtual Network ID.",
+      "type": "string"
     }
   },
   "required": [
@@ -77,19 +24,3 @@ export const tls_certificates_and_hostnames_keyless_tunnel: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_keyless_vnet_id`.
- */
-export const tls_certificates_and_hostnames_keyless_vnet_id: JsonSchema = {
-  "description": "Cloudflare Tunnel Virtual Network ID.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_port`.
- */
-export const tls_certificates_and_hostnames_port: JsonSchema = {
-  "description": "The keyless SSL port used to communicate between Cloudflare and the client's Keyless SSL server.",
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/ssl/universal/settings/outputs.ts b/src/generated/forge-mcp/ssl/universal/settings/outputs.ts
index b8a09cc1b..e0afc5bb3 100644
--- a/src/generated/forge-mcp/ssl/universal/settings/outputs.ts
+++ b/src/generated/forge-mcp/ssl/universal/settings/outputs.ts
@@ -3,19 +3,12 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_enabled-2` in responses.
- */
-export const tls_certificates_and_hostnames_enabled_2_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_ssl_universal_settings_response` in
  * responses.
  */
-export const tls_certificates_and_hostnames_ssl_universal_settings_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ssl_universal_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -34,10 +27,10 @@ export const tls_certificates_and_hostnames_ssl_universal_settings_response_outp
 /**
  * The schema of `tls-certificates-and-hostnames_universal` in responses.
  */
-export const tls_certificates_and_hostnames_universal_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_universal: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-2"
+      "type": "boolean"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/ssl/universal/settings/schemas.ts b/src/generated/forge-mcp/ssl/universal/settings/schemas.ts
index 3c775a536..4d820fdde 100644
--- a/src/generated/forge-mcp/ssl/universal/settings/schemas.ts
+++ b/src/generated/forge-mcp/ssl/universal/settings/schemas.ts
@@ -3,22 +3,14 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_enabled-2`.
- */
-export const tls_certificates_and_hostnames_enabled_2: JsonSchema = {
-  "description": "Disabling Universal SSL removes any currently active Universal SSL certificates for your zone from the edge and prevents any future Universal SSL certificates from being ordered. If there are no advanced certificates or custom certificates uploaded for the domain, visitors will be unable to access the domain over HTTPS.\n\nBy disabling Universal SSL, you understand that the following Cloudflare settings and preferences will result in visitors being unable to visit your domain unless you have uploaded a custom certificate or purchased an advanced certificate.\n\n* HSTS\n* Always Use HTTPS\n* Opportunistic Encryption\n* Onion Routing\n* Any Page Rules redirecting traffic to HTTPS\n\nSimilarly, any HTTP redirect to HTTPS at the origin while the Cloudflare proxy is enabled will result in users being unable to visit your site without a valid certificate at Cloudflare's edge.\n\nIf you do not have a valid custom or advanced certificate at Cloudflare's edge and are unsure if any of the above Cloudflare settings are enabled, or if any HTTP redirects exist at your origin, we advise leaving Universal SSL enabled for your domain.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_universal`.
  */
-export const tls_certificates_and_hostnames_universal: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_universal: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_enabled-2",
-      "description": "Disabling Universal SSL removes any currently active Universal SSL certificates for your zone from the edge and prevents any future Universal SSL certificates from being ordered. If there are no advanced certificates or custom certificates uploaded for the domain, visitors will be unable to access the domain over HTTPS.\n\nBy disabling Universal SSL, you understand that the following Cloudflare settings and preferences will result in visitors being unable to visit your domain unless you have uploaded a custom certificate or purchased an advanced certificate.\n\n* HSTS\n* Always Use HTTPS\n* Opportunistic Encryption\n* Onion Routing\n* Any Page Rules redirecting traffic to HTTPS\n\nSimilarly, any HTTP redirect to HTTPS at the origin while the Cloudflare proxy is enabled will result in users being unable to visit your site without a valid certificate at Cloudflare's edge.\n\nIf you do not have a valid custom or advanced certificate at Cloudflare's edge and are unsure if any of the above Cloudflare settings are enabled, or if any HTTP redirects exist at your origin, we advise leaving Universal SSL enabled for your domain."
+      "description": "Disabling Universal SSL removes any currently active Universal SSL certificates for your zone from the edge and prevents any future Universal SSL certificates from being ordered. If there are no advanced certificates or custom certificates uploaded for the domain, visitors will be unable to access the domain over HTTPS.\n\nBy disabling Universal SSL, you understand that the following Cloudflare settings and preferences will result in visitors being unable to visit your domain unless you have uploaded a custom certificate or purchased an advanced certificate.\n\n* HSTS\n* Always Use HTTPS\n* Opportunistic Encryption\n* Onion Routing\n* Any Page Rules redirecting traffic to HTTPS\n\nSimilarly, any HTTP redirect to HTTPS at the origin while the Cloudflare proxy is enabled will result in users being unable to visit your site without a valid certificate at Cloudflare's edge.\n\nIf you do not have a valid custom or advanced certificate at Cloudflare's edge and are unsure if any of the above Cloudflare settings are enabled, or if any HTTP redirects exist at your origin, we advise leaving Universal SSL enabled for your domain.",
+      "type": "boolean"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/ssl/universal/settings/tools.ts b/src/generated/forge-mcp/ssl/universal/settings/tools.ts
index 0efe1e861..206728738 100644
--- a/src/generated/forge-mcp/ssl/universal/settings/tools.ts
+++ b/src/generated/forge-mcp/ssl/universal/settings/tools.ts
@@ -3,20 +3,15 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_enabled_2_output,
-  tls_certificates_and_hostnames_ssl_universal_settings_response_output,
-  tls_certificates_and_hostnames_universal_output,
+  tls$$certificates$$and$$hostnames_ssl_universal_settings_response,
+  tls$$certificates$$and$$hostnames_universal,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_enabled_2,
-  tls_certificates_and_hostnames_universal,
-} from "./schemas.js";
+import { tls$$certificates$$and$$hostnames_universal as tls$$certificates$$and$$hostnames_universal$ } from "./schemas.js";
 
 /**
  * The tools of `ssl.universal.settings`.
@@ -25,36 +20,43 @@ export const tools: readonly Tool[] = [
   {
     name: "ssl_universal_settings_edit",
     title: "Edit Universal SSL Settings",
-    description: "Patch Universal SSL Settings for a Zone.",
+    description: "Patch Universal SSL Settings for a Zone.\n\nPATCH /zones/{zone_id}/ssl/universal/settings",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/tls-certificates-and-hostnames_universal"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_enabled-2": tls_certificates_and_hostnames_enabled_2,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_universal": tls_certificates_and_hostnames_universal,
+        "tls-certificates-and-hostnames_universal": tls$$certificates$$and$$hostnames_universal$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ssl_universal_settings_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_enabled-2": tls_certificates_and_hostnames_enabled_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ssl_universal_settings_response": tls_certificates_and_hostnames_ssl_universal_settings_response_output,
-        "tls-certificates-and-hostnames_universal": tls_certificates_and_hostnames_universal_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ssl_universal_settings_response": tls$$certificates$$and$$hostnames_ssl_universal_settings_response,
+        "tls-certificates-and-hostnames_universal": tls$$certificates$$and$$hostnames_universal,
       },
     },
     annotations: {
@@ -100,12 +102,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_enabled-2": tls_certificates_and_hostnames_enabled_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ssl_universal_settings_response": tls_certificates_and_hostnames_ssl_universal_settings_response_output,
-        "tls-certificates-and-hostnames_universal": tls_certificates_and_hostnames_universal_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ssl_universal_settings_response": tls$$certificates$$and$$hostnames_ssl_universal_settings_response,
+        "tls-certificates-and-hostnames_universal": tls$$certificates$$and$$hostnames_universal,
       },
     },
     request: (args) => ({
@@ -116,30 +117,36 @@ export const tools: readonly Tool[] = [
   {
     name: "ssl_universal_settings_get",
     title: "Universal SSL Settings Details",
-    description: "Get Universal SSL Settings for a Zone.",
+    description: "Get Universal SSL Settings for a Zone.\n\nGET /zones/{zone_id}/ssl/universal/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ssl_universal_settings_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_enabled-2": tls_certificates_and_hostnames_enabled_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ssl_universal_settings_response": tls_certificates_and_hostnames_ssl_universal_settings_response_output,
-        "tls-certificates-and-hostnames_universal": tls_certificates_and_hostnames_universal_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ssl_universal_settings_response": tls$$certificates$$and$$hostnames_ssl_universal_settings_response,
+        "tls-certificates-and-hostnames_universal": tls$$certificates$$and$$hostnames_universal,
       },
     },
     annotations: {
@@ -185,12 +192,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_enabled-2": tls_certificates_and_hostnames_enabled_2_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ssl_universal_settings_response": tls_certificates_and_hostnames_ssl_universal_settings_response_output,
-        "tls-certificates-and-hostnames_universal": tls_certificates_and_hostnames_universal_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ssl_universal_settings_response": tls$$certificates$$and$$hostnames_ssl_universal_settings_response,
+        "tls-certificates-and-hostnames_universal": tls$$certificates$$and$$hostnames_universal,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/ssl/verification/outputs.ts b/src/generated/forge-mcp/ssl/verification/outputs.ts
index b7e843c4f..a72f848f5 100644
--- a/src/generated/forge-mcp/ssl/verification/outputs.ts
+++ b/src/generated/forge-mcp/ssl/verification/outputs.ts
@@ -3,55 +3,12 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_brand_check` in responses.
- */
-export const tls_certificates_and_hostnames_brand_check_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_cert_pack_uuid` in responses.
- */
-export const tls_certificates_and_hostnames_cert_pack_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_certificate_status` in
- * responses.
- */
-export const tls_certificates_and_hostnames_certificate_status_output: JsonSchema = {
-  "enum": [
-    "initializing",
-    "authorizing",
-    "active",
-    "expired",
-    "issuing",
-    "timing_out",
-    "pending_deployment"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_signature-2` in responses.
- */
-export const tls_certificates_and_hostnames_signature_2_output: JsonSchema = {
-  "enum": [
-    "ECDSAWithSHA256",
-    "SHA1WithRSA",
-    "SHA256WithRSA"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of
  * `tls-certificates-and-hostnames_ssl_validation_method_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_ssl_validation_method_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ssl_validation_method_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -61,10 +18,16 @@ export const tls_certificates_and_hostnames_ssl_validation_method_response_colle
         "result": {
           "properties": {
             "status": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_status-6"
+              "type": "string"
             },
             "validation_method": {
-              "$ref": "#/$defs/tls-certificates-and-hostnames_validation_method_definition"
+              "enum": [
+                "http",
+                "cname",
+                "txt",
+                "email"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
@@ -80,7 +43,7 @@ export const tls_certificates_and_hostnames_ssl_validation_method_response_colle
  * `tls-certificates-and-hostnames_ssl_verification_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_ssl_verification_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_ssl_verification_response_collection: JsonSchema = {
   "properties": {
     "result": {
       "items": {
@@ -92,68 +55,57 @@ export const tls_certificates_and_hostnames_ssl_verification_response_collection
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_status-6` in responses.
- */
-export const tls_certificates_and_hostnames_status_6_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_validation_method-2` in
- * responses.
- */
-export const tls_certificates_and_hostnames_validation_method_2_output: JsonSchema = {
-  "enum": [
-    "http",
-    "cname",
-    "txt"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_validation_method_definition`
- * in responses.
- */
-export const tls_certificates_and_hostnames_validation_method_definition_output: JsonSchema = {
-  "enum": [
-    "http",
-    "cname",
-    "txt",
-    "email"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_verification` in responses.
  */
-export const tls_certificates_and_hostnames_verification_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_verification: JsonSchema = {
   "properties": {
     "brand_check": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_brand_check"
+      "type": "boolean"
     },
     "cert_pack_uuid": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_cert_pack_uuid"
+      "type": "string"
     },
     "certificate_status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_certificate_status"
+      "enum": [
+        "initializing",
+        "authorizing",
+        "active",
+        "expired",
+        "issuing",
+        "timing_out",
+        "pending_deployment"
+      ],
+      "type": "string"
     },
     "signature": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_signature-2"
+      "enum": [
+        "ECDSAWithSHA256",
+        "SHA1WithRSA",
+        "SHA256WithRSA"
+      ],
+      "type": "string"
     },
     "validation_method": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_validation_method-2"
+      "enum": [
+        "http",
+        "cname",
+        "txt"
+      ],
+      "type": "string"
     },
     "verification_info": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_verification_info"
     },
     "verification_status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_verification_status"
+      "type": "boolean"
     },
     "verification_type": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_verification_type"
+      "enum": [
+        "cname",
+        "meta tag"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -166,7 +118,7 @@ export const tls_certificates_and_hostnames_verification_output: JsonSchema = {
  * The schema of `tls-certificates-and-hostnames_verification_info` in
  * responses.
  */
-export const tls_certificates_and_hostnames_verification_info_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_verification_info: JsonSchema = {
   "properties": {
     "record_name": {
       "enum": [
@@ -189,23 +141,3 @@ export const tls_certificates_and_hostnames_verification_info_output: JsonSchema
   },
   "type": "object"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_verification_status` in
- * responses.
- */
-export const tls_certificates_and_hostnames_verification_status_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_verification_type` in
- * responses.
- */
-export const tls_certificates_and_hostnames_verification_type_output: JsonSchema = {
-  "enum": [
-    "cname",
-    "meta tag"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/verification/schemas.ts b/src/generated/forge-mcp/ssl/verification/schemas.ts
index d8c23e04d..6afed1c81 100644
--- a/src/generated/forge-mcp/ssl/verification/schemas.ts
+++ b/src/generated/forge-mcp/ssl/verification/schemas.ts
@@ -3,22 +3,20 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_cert_pack_uuid`.
- */
-export const tls_certificates_and_hostnames_cert_pack_uuid: JsonSchema = {
-  "description": "Certificate Pack UUID.",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_validation_method-3`.
  */
-export const tls_certificates_and_hostnames_validation_method_3: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_validation_method$$3: JsonSchema = {
   "properties": {
     "validation_method": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_validation_method_definition",
-      "description": "Desired validation method."
+      "description": "Desired validation method.",
+      "enum": [
+        "http",
+        "cname",
+        "txt",
+        "email"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -26,17 +24,3 @@ export const tls_certificates_and_hostnames_validation_method_3: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `tls-certificates-and-hostnames_validation_method_definition`.
- */
-export const tls_certificates_and_hostnames_validation_method_definition: JsonSchema = {
-  "description": "Desired validation method.",
-  "enum": [
-    "http",
-    "cname",
-    "txt",
-    "email"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/ssl/verification/tools.ts b/src/generated/forge-mcp/ssl/verification/tools.ts
index d7ade9058..bb0bc40bb 100644
--- a/src/generated/forge-mcp/ssl/verification/tools.ts
+++ b/src/generated/forge-mcp/ssl/verification/tools.ts
@@ -1,33 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../schemas.js";
 import {
-  tls_certificates_and_hostnames_brand_check_output,
-  tls_certificates_and_hostnames_cert_pack_uuid_output,
-  tls_certificates_and_hostnames_certificate_status_output,
-  tls_certificates_and_hostnames_signature_2_output,
-  tls_certificates_and_hostnames_ssl_validation_method_response_collection_output,
-  tls_certificates_and_hostnames_ssl_verification_response_collection_output,
-  tls_certificates_and_hostnames_status_6_output,
-  tls_certificates_and_hostnames_validation_method_2_output,
-  tls_certificates_and_hostnames_validation_method_definition_output,
-  tls_certificates_and_hostnames_verification_info_output,
-  tls_certificates_and_hostnames_verification_output,
-  tls_certificates_and_hostnames_verification_status_output,
-  tls_certificates_and_hostnames_verification_type_output,
+  tls$$certificates$$and$$hostnames_ssl_validation_method_response_collection,
+  tls$$certificates$$and$$hostnames_ssl_verification_response_collection,
+  tls$$certificates$$and$$hostnames_verification,
+  tls$$certificates$$and$$hostnames_verification_info,
 } from "./outputs.js";
-import {
-  tls_certificates_and_hostnames_cert_pack_uuid,
-  tls_certificates_and_hostnames_validation_method_3,
-  tls_certificates_and_hostnames_validation_method_definition,
-} from "./schemas.js";
+import { tls$$certificates$$and$$hostnames_validation_method$$3 } from "./schemas.js";
 
 /**
  * The tools of `ssl.verification`.
@@ -36,42 +22,47 @@ export const tools: readonly Tool[] = [
   {
     name: "ssl_verification_edit",
     title: "Edit SSL Certificate Pack Validation Method",
-    description: "Edit SSL validation method for a certificate pack. A PATCH request will request an immediate validation check on any certificate, and return the updated status. If a validation method is provided, the validation will be immediately attempted using that method.",
+    description: "Edit SSL validation method for a certificate pack. A PATCH request will request an immediate validation check on any certificate, and return the updated status. If a validation method is provided, the validation will be immediately attempted using that method.\n\nPATCH /zones/{zone_id}/ssl/verification/{certificate_pack_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/tls-certificates-and-hostnames_validation_method-3"
         },
-        "certificate_pack_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_cert_pack_uuid",
-          "description": "Certificate Pack UUID."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "certificate_pack_id": {
+              "description": "Certificate Pack UUID.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "certificate_pack_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "certificate_pack_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_cert_pack_uuid": tls_certificates_and_hostnames_cert_pack_uuid,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_validation_method-3": tls_certificates_and_hostnames_validation_method_3,
-        "tls-certificates-and-hostnames_validation_method_definition": tls_certificates_and_hostnames_validation_method_definition,
+        "tls-certificates-and-hostnames_validation_method-3": tls$$certificates$$and$$hostnames_validation_method$$3,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ssl_validation_method_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ssl_validation_method_response_collection": tls_certificates_and_hostnames_ssl_validation_method_response_collection_output,
-        "tls-certificates-and-hostnames_status-6": tls_certificates_and_hostnames_status_6_output,
-        "tls-certificates-and-hostnames_validation_method_definition": tls_certificates_and_hostnames_validation_method_definition_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ssl_validation_method_response_collection": tls$$certificates$$and$$hostnames_ssl_validation_method_response_collection,
       },
     },
     annotations: {
@@ -120,12 +111,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_ssl_validation_method_response_collection": tls_certificates_and_hostnames_ssl_validation_method_response_collection_output,
-        "tls-certificates-and-hostnames_status-6": tls_certificates_and_hostnames_status_6_output,
-        "tls-certificates-and-hostnames_validation_method_definition": tls_certificates_and_hostnames_validation_method_definition_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ssl_validation_method_response_collection": tls$$certificates$$and$$hostnames_ssl_validation_method_response_collection,
       },
     },
     request: (args) => ({
@@ -136,42 +125,48 @@ export const tools: readonly Tool[] = [
   {
     name: "ssl_verification_get",
     title: "SSL Verification Details",
-    description: "Get SSL Verification Info for a Zone.",
+    description: "Get SSL Verification Info for a Zone.\n\nGET /zones/{zone_id}/ssl/verification",
     inputSchema: {
       type: "object",
       properties: {
-        "retry": {
-          "description": "Immediately retry SSL Verification.",
-          "enum": [
-            true
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "boolean"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "retry": {
+              "description": "Immediately retry SSL Verification.",
+              "enum": [
+                true
+              ],
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_ssl_verification_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_brand_check": tls_certificates_and_hostnames_brand_check_output,
-        "tls-certificates-and-hostnames_cert_pack_uuid": tls_certificates_and_hostnames_cert_pack_uuid_output,
-        "tls-certificates-and-hostnames_certificate_status": tls_certificates_and_hostnames_certificate_status_output,
-        "tls-certificates-and-hostnames_signature-2": tls_certificates_and_hostnames_signature_2_output,
-        "tls-certificates-and-hostnames_ssl_verification_response_collection": tls_certificates_and_hostnames_ssl_verification_response_collection_output,
-        "tls-certificates-and-hostnames_validation_method-2": tls_certificates_and_hostnames_validation_method_2_output,
-        "tls-certificates-and-hostnames_verification": tls_certificates_and_hostnames_verification_output,
-        "tls-certificates-and-hostnames_verification_info": tls_certificates_and_hostnames_verification_info_output,
-        "tls-certificates-and-hostnames_verification_status": tls_certificates_and_hostnames_verification_status_output,
-        "tls-certificates-and-hostnames_verification_type": tls_certificates_and_hostnames_verification_type_output,
+        "tls-certificates-and-hostnames_ssl_verification_response_collection": tls$$certificates$$and$$hostnames_ssl_verification_response_collection,
+        "tls-certificates-and-hostnames_verification": tls$$certificates$$and$$hostnames_verification,
+        "tls-certificates-and-hostnames_verification_info": tls$$certificates$$and$$hostnames_verification_info,
       },
     },
     annotations: {
@@ -219,24 +214,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_brand_check": tls_certificates_and_hostnames_brand_check_output,
-        "tls-certificates-and-hostnames_cert_pack_uuid": tls_certificates_and_hostnames_cert_pack_uuid_output,
-        "tls-certificates-and-hostnames_certificate_status": tls_certificates_and_hostnames_certificate_status_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_signature-2": tls_certificates_and_hostnames_signature_2_output,
-        "tls-certificates-and-hostnames_ssl_verification_response_collection": tls_certificates_and_hostnames_ssl_verification_response_collection_output,
-        "tls-certificates-and-hostnames_validation_method-2": tls_certificates_and_hostnames_validation_method_2_output,
-        "tls-certificates-and-hostnames_verification": tls_certificates_and_hostnames_verification_output,
-        "tls-certificates-and-hostnames_verification_info": tls_certificates_and_hostnames_verification_info_output,
-        "tls-certificates-and-hostnames_verification_status": tls_certificates_and_hostnames_verification_status_output,
-        "tls-certificates-and-hostnames_verification_type": tls_certificates_and_hostnames_verification_type_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_ssl_verification_response_collection": tls$$certificates$$and$$hostnames_ssl_verification_response_collection,
+        "tls-certificates-and-hostnames_verification": tls$$certificates$$and$$hostnames_verification,
+        "tls-certificates-and-hostnames_verification_info": tls$$certificates$$and$$hostnames_verification_info,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/ssl/verification`,
       query: [
-        ["retry", args["retry"], true],
+        ["retry", param(args, "query", "retry"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/stream/keys/outputs.ts b/src/generated/forge-mcp/stream/keys/outputs.ts
index 7719a0346..ffcfcc3cb 100644
--- a/src/generated/forge-mcp/stream/keys/outputs.ts
+++ b/src/generated/forge-mcp/stream/keys/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `stream_jwk` in responses.
- */
-export const stream_jwk_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_key_generation_response` in responses.
  */
-export const stream_key_generation_response_output: JsonSchema = {
+export const stream_key_generation_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
@@ -32,7 +25,7 @@ export const stream_key_generation_response_output: JsonSchema = {
 /**
  * The schema of `stream_key_response_collection` in responses.
  */
-export const stream_key_response_collection_output: JsonSchema = {
+export const stream_key_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
@@ -43,10 +36,11 @@ export const stream_key_response_collection_output: JsonSchema = {
           "items": {
             "properties": {
               "created": {
-                "$ref": "#/$defs/stream_signing_key_created"
+                "format": "date-time",
+                "type": "string"
               },
               "id": {
-                "$ref": "#/$defs/stream_identifier-2"
+                "type": "string"
               },
               "key_id": {
                 "type": "string"
@@ -65,35 +59,21 @@ export const stream_key_response_collection_output: JsonSchema = {
 /**
  * The schema of `stream_keys` in responses.
  */
-export const stream_keys_output: JsonSchema = {
+export const stream_keys: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/stream_signing_key_created"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/stream_identifier-2"
+      "type": "string"
     },
     "jwk": {
-      "$ref": "#/$defs/stream_jwk"
+      "type": "string"
     },
     "pem": {
-      "$ref": "#/$defs/stream_pem"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `stream_pem` in responses.
- */
-export const stream_pem_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_signing_key_created` in responses.
- */
-export const stream_signing_key_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/stream/keys/tools.ts b/src/generated/forge-mcp/stream/keys/tools.ts
index f78c0b247..a2935b729 100644
--- a/src/generated/forge-mcp/stream/keys/tools.ts
+++ b/src/generated/forge-mcp/stream/keys/tools.ts
@@ -3,21 +3,16 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_common_output,
-  stream_api_response_single_output,
-  stream_deleted_response_output,
-  stream_identifier_2_output,
-  stream_messages_output,
+  stream_api$$response$$common,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_deleted_response,
+  stream_messages,
 } from "../outputs.js";
-import { stream_identifier_2 } from "../schemas.js";
 import {
-  stream_jwk_output,
-  stream_key_generation_response_output,
-  stream_key_response_collection_output,
-  stream_keys_output,
-  stream_pem_output,
-  stream_signing_key_created_output,
+  stream_key_generation_response,
+  stream_key_response_collection,
+  stream_keys,
 } from "./outputs.js";
 
 /**
@@ -27,33 +22,36 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_keys_create",
     title: "Create signing keys",
-    description: "Creates an RSA private key in PEM and JWK formats. Key files are only displayed once after creation. Keys are created, used, and deleted independently of videos, and every key can sign any video.",
+    description: "Creates an RSA private key in PEM and JWK formats. Key files are only displayed once after creation. Keys are created, used, and deleted independently of videos, and every key can sign any video.\n\nPOST /accounts/{account_id}/stream/keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_key_generation_response",
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_identifier-2": stream_identifier_2_output,
-        "stream_jwk": stream_jwk_output,
-        "stream_key_generation_response": stream_key_generation_response_output,
-        "stream_keys": stream_keys_output,
-        "stream_messages": stream_messages_output,
-        "stream_pem": stream_pem_output,
-        "stream_signing_key_created": stream_signing_key_created_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_key_generation_response": stream_key_generation_response,
+        "stream_keys": stream_keys,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -80,15 +78,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_identifier-2": stream_identifier_2_output,
-        "stream_jwk": stream_jwk_output,
-        "stream_key_generation_response": stream_key_generation_response_output,
-        "stream_keys": stream_keys_output,
-        "stream_messages": stream_messages_output,
-        "stream_pem": stream_pem_output,
-        "stream_signing_key_created": stream_signing_key_created_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_key_generation_response": stream_key_generation_response,
+        "stream_keys": stream_keys,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -98,33 +92,40 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_keys_delete",
     title: "Delete signing keys",
-    description: "Deletes signing keys and revokes all signed URLs generated with the key.\n\nConfirm with the user before calling this tool. Permanently delete signing key? All tokens created with this key will become unauthorized!",
+    description: "Deletes signing keys and revokes all signed URLs generated with the key.\n\nConfirm with the user before calling this tool. Permanently delete signing key? All tokens created with this key will become unauthorized!\n\nDELETE /accounts/{account_id}/stream/keys/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_deleted_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -151,10 +152,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -164,30 +165,35 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_keys_list",
     title: "List signing keys",
-    description: "Lists the video ID and creation date and time when a signing key was created.",
+    description: "Lists the video ID and creation date and time when a signing key was created.\n\nGET /accounts/{account_id}/stream/keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_key_response_collection",
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_identifier-2": stream_identifier_2_output,
-        "stream_key_response_collection": stream_key_response_collection_output,
-        "stream_messages": stream_messages_output,
-        "stream_signing_key_created": stream_signing_key_created_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_key_response_collection": stream_key_response_collection,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -215,12 +221,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_identifier-2": stream_identifier_2_output,
-        "stream_key_response_collection": stream_key_response_collection_output,
-        "stream_messages": stream_messages_output,
-        "stream_signing_key_created": stream_signing_key_created_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_key_response_collection": stream_key_response_collection,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/liveInputs/outputs.ts b/src/generated/forge-mcp/stream/liveInputs/outputs.ts
index 8d3cc9bcd..4d0ed0c90 100644
--- a/src/generated/forge-mcp/stream/liveInputs/outputs.ts
+++ b/src/generated/forge-mcp/stream/liveInputs/outputs.ts
@@ -6,118 +6,86 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `stream_input_rtmps` in responses.
  */
-export const stream_input_rtmps_output: JsonSchema = {
+export const stream_input_rtmps: JsonSchema = {
   "properties": {
     "streamKey": {
-      "$ref": "#/$defs/stream_input_rtmps_stream_key"
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/stream_input_rtmps_url"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_input_rtmps_stream_key` in responses.
- */
-export const stream_input_rtmps_stream_key_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_input_rtmps_url` in responses.
- */
-export const stream_input_rtmps_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_input_srt` in responses.
  */
-export const stream_input_srt_output: JsonSchema = {
+export const stream_input_srt: JsonSchema = {
   "properties": {
     "passphrase": {
-      "$ref": "#/$defs/stream_input_srt_stream_passphrase"
+      "type": "string"
     },
     "streamId": {
-      "$ref": "#/$defs/stream_input_srt_stream_id"
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/stream_input_srt_url"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_input_srt_stream_id` in responses.
- */
-export const stream_input_srt_stream_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_input_srt_stream_passphrase` in responses.
- */
-export const stream_input_srt_stream_passphrase_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_input_srt_url` in responses.
- */
-export const stream_input_srt_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_input_webrtc` in responses.
  */
-export const stream_input_webrtc_output: JsonSchema = {
+export const stream_input_webrtc: JsonSchema = {
   "properties": {
     "url": {
-      "$ref": "#/$defs/stream_input_webrtc_url"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_input_webrtc_url` in responses.
- */
-export const stream_input_webrtc_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_live_input` in responses.
  */
-export const stream_live_input_output: JsonSchema = {
+export const stream_live_input: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/stream_live_input_created"
+      "format": "date-time",
+      "type": "string"
     },
     "deleteRecordingAfterDays": {
-      "$ref": "#/$defs/stream_live_input_recording_deletion"
+      "type": "number"
     },
     "enabled": {
-      "$ref": "#/$defs/stream_live_input_enabled"
+      "type": "boolean"
     },
     "keysRotatedAt": {
-      "$ref": "#/$defs/stream_live_input_keys_rotated_at"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "meta": {
       "$ref": "#/$defs/stream_live_input_metadata"
     },
     "modified": {
-      "$ref": "#/$defs/stream_live_input_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "playback": {
       "$ref": "#/$defs/stream_live_input_playback"
     },
     "preferLowLatency": {
-      "$ref": "#/$defs/stream_live_input_prefer_low_latency"
+      "type": "boolean"
     },
     "recording": {
       "$ref": "#/$defs/stream_live_input_recording_settings"
@@ -135,10 +103,27 @@ export const stream_live_input_output: JsonSchema = {
       "$ref": "#/$defs/stream_playback_srt"
     },
     "status": {
-      "$ref": "#/$defs/stream_live_input_status"
+      "oneOf": [
+        {
+          "enum": [
+            "connected",
+            "reconnected",
+            "reconnecting",
+            "client_disconnect",
+            "ttl_exceeded",
+            "failed_to_connect",
+            "failed_to_reconnect",
+            "new_configuration_accepted"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "uid": {
-      "$ref": "#/$defs/stream_live_input_identifier"
+      "type": "string"
     },
     "webRTC": {
       "$ref": "#/$defs/stream_input_webrtc"
@@ -150,80 +135,37 @@ export const stream_live_input_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_live_input_created` in responses.
- */
-export const stream_live_input_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_live_input_enabled` in responses.
- */
-export const stream_live_input_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_live_input_identifier` in responses.
- */
-export const stream_live_input_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_live_input_keys_rotated_at` in responses.
- */
-export const stream_live_input_keys_rotated_at_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `stream_live_input_metadata` in responses.
  */
-export const stream_live_input_metadata_output: JsonSchema = {
+export const stream_live_input_metadata: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_live_input_modified` in responses.
- */
-export const stream_live_input_modified_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `stream_live_input_object_without_url` in responses.
  */
-export const stream_live_input_object_without_url_output: JsonSchema = {
+export const stream_live_input_object_without_url: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/stream_live_input_created"
+      "format": "date-time",
+      "type": "string"
     },
     "deleteRecordingAfterDays": {
-      "$ref": "#/$defs/stream_live_input_recording_deletion"
+      "type": "number"
     },
     "enabled": {
-      "$ref": "#/$defs/stream_live_input_enabled"
+      "type": "boolean"
     },
     "meta": {
       "$ref": "#/$defs/stream_live_input_metadata"
     },
     "modified": {
-      "$ref": "#/$defs/stream_live_input_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/stream_live_input_identifier"
+      "type": "string"
     }
   },
   "type": "object"
@@ -232,13 +174,13 @@ export const stream_live_input_object_without_url_output: JsonSchema = {
 /**
  * The schema of `stream_live_input_playback` in responses.
  */
-export const stream_live_input_playback_output: JsonSchema = {
+export const stream_live_input_playback: JsonSchema = {
   "properties": {
     "dash": {
-      "$ref": "#/$defs/stream_playback_dash_url"
+      "type": "string"
     },
     "hls": {
-      "$ref": "#/$defs/stream_playback_hls_url"
+      "type": "string"
     }
   },
   "required": [
@@ -248,90 +190,48 @@ export const stream_live_input_playback_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_live_input_prefer_low_latency` in responses.
- */
-export const stream_live_input_prefer_low_latency_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `stream_live_input_recording_allowedOrigins` in responses.
  */
-export const stream_live_input_recording_allowedOrigins_output: JsonSchema = {
+export const stream_live_input_recording_allowedOrigins: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `stream_live_input_recording_deletion` in responses.
- */
-export const stream_live_input_recording_deletion_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `stream_live_input_recording_hideLiveViewerCount` in responses.
- */
-export const stream_live_input_recording_hideLiveViewerCount_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_live_input_recording_mode` in responses.
- */
-export const stream_live_input_recording_mode_output: JsonSchema = {
-  "enum": [
-    "off",
-    "automatic"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `stream_live_input_recording_requireSignedURLs` in responses.
- */
-export const stream_live_input_recording_requireSignedURLs_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `stream_live_input_recording_settings` in responses.
  */
-export const stream_live_input_recording_settings_output: JsonSchema = {
+export const stream_live_input_recording_settings: JsonSchema = {
   "properties": {
     "allowedOrigins": {
       "$ref": "#/$defs/stream_live_input_recording_allowedOrigins"
     },
     "hideLiveViewerCount": {
-      "$ref": "#/$defs/stream_live_input_recording_hideLiveViewerCount"
+      "type": "boolean"
     },
     "mode": {
-      "$ref": "#/$defs/stream_live_input_recording_mode"
+      "enum": [
+        "off",
+        "automatic"
+      ],
+      "type": "string"
     },
     "requireSignedURLs": {
-      "$ref": "#/$defs/stream_live_input_recording_requireSignedURLs"
+      "type": "boolean"
     },
     "timeoutSeconds": {
-      "$ref": "#/$defs/stream_live_input_recording_timeoutSeconds"
+      "type": "integer"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_live_input_recording_timeoutSeconds` in responses.
- */
-export const stream_live_input_recording_timeoutSeconds_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `stream_live_input_response_collection` in responses.
  */
-export const stream_live_input_response_collection_output: JsonSchema = {
+export const stream_live_input_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
@@ -364,7 +264,7 @@ export const stream_live_input_response_collection_output: JsonSchema = {
 /**
  * The schema of `stream_live_input_response_single` in responses.
  */
-export const stream_live_input_response_single_output: JsonSchema = {
+export const stream_live_input_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
@@ -380,127 +280,47 @@ export const stream_live_input_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `stream_live_input_status` in responses.
- */
-export const stream_live_input_status_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "connected",
-        "reconnected",
-        "reconnecting",
-        "client_disconnect",
-        "ttl_exceeded",
-        "failed_to_connect",
-        "failed_to_reconnect",
-        "new_configuration_accepted"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `stream_playback_dash_url` in responses.
- */
-export const stream_playback_dash_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_playback_hls_url` in responses.
- */
-export const stream_playback_hls_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_playback_rtmps` in responses.
  */
-export const stream_playback_rtmps_output: JsonSchema = {
+export const stream_playback_rtmps: JsonSchema = {
   "properties": {
     "streamKey": {
-      "$ref": "#/$defs/stream_playback_rtmps_stream_key"
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/stream_playback_rtmps_url"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_playback_rtmps_stream_key` in responses.
- */
-export const stream_playback_rtmps_stream_key_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_playback_rtmps_url` in responses.
- */
-export const stream_playback_rtmps_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_playback_srt` in responses.
  */
-export const stream_playback_srt_output: JsonSchema = {
+export const stream_playback_srt: JsonSchema = {
   "properties": {
     "passphrase": {
-      "$ref": "#/$defs/stream_playback_srt_stream_passphrase"
+      "type": "string"
     },
     "streamId": {
-      "$ref": "#/$defs/stream_playback_srt_stream_id"
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/stream_playback_srt_url"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_playback_srt_stream_id` in responses.
- */
-export const stream_playback_srt_stream_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_playback_srt_stream_passphrase` in responses.
- */
-export const stream_playback_srt_stream_passphrase_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_playback_srt_url` in responses.
- */
-export const stream_playback_srt_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_playback_webrtc` in responses.
  */
-export const stream_playback_webrtc_output: JsonSchema = {
+export const stream_playback_webrtc: JsonSchema = {
   "properties": {
     "url": {
-      "$ref": "#/$defs/stream_playback_webrtc_url"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `stream_playback_webrtc_url` in responses.
- */
-export const stream_playback_webrtc_url_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/stream/liveInputs/outputs/outputs.ts b/src/generated/forge-mcp/stream/liveInputs/outputs/outputs.ts
index 89f58ef1d..4a330170e 100644
--- a/src/generated/forge-mcp/stream/liveInputs/outputs/outputs.ts
+++ b/src/generated/forge-mcp/stream/liveInputs/outputs/outputs.ts
@@ -6,42 +6,28 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `stream_output` in responses.
  */
-export const stream_output_output: JsonSchema = {
+export const stream_output: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/stream_output_enabled"
+      "type": "boolean"
     },
     "streamKey": {
-      "$ref": "#/$defs/stream_output_streamKey"
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/stream_output_identifier"
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/stream_output_url"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_output_enabled` in responses.
- */
-export const stream_output_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_output_identifier` in responses.
- */
-export const stream_output_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_output_response_collection` in responses.
  */
-export const stream_output_response_collection_output: JsonSchema = {
+export const stream_output_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
@@ -63,7 +49,7 @@ export const stream_output_response_collection_output: JsonSchema = {
 /**
  * The schema of `stream_output_response_single` in responses.
  */
-export const stream_output_response_single_output: JsonSchema = {
+export const stream_output_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
@@ -78,17 +64,3 @@ export const stream_output_response_single_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `stream_output_streamKey` in responses.
- */
-export const stream_output_streamKey_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_output_url` in responses.
- */
-export const stream_output_url_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/stream/liveInputs/outputs/schemas.ts b/src/generated/forge-mcp/stream/liveInputs/outputs/schemas.ts
index c15295e46..209b4ba2e 100644
--- a/src/generated/forge-mcp/stream/liveInputs/outputs/schemas.ts
+++ b/src/generated/forge-mcp/stream/liveInputs/outputs/schemas.ts
@@ -9,17 +9,17 @@ import type { JsonSchema } from "../../../_/tool.js";
 export const stream_create_output_request: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/stream_output_enabled",
       "default": true,
-      "description": "When enabled, live video streamed to the associated live input will be sent to the output URL. When disabled, live video will not be sent to the output URL, even when streaming to the associated live input. Use this to control precisely when you start and stop simulcasting to specific destinations like YouTube and Twitch."
+      "description": "When enabled, live video streamed to the associated live input will be sent to the output URL. When disabled, live video will not be sent to the output URL, even when streaming to the associated live input. Use this to control precisely when you start and stop simulcasting to specific destinations like YouTube and Twitch.",
+      "type": "boolean"
     },
     "streamKey": {
-      "$ref": "#/$defs/stream_output_streamKey",
-      "description": "The streamKey used to authenticate against an output's target."
+      "description": "The streamKey used to authenticate against an output's target.",
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/stream_output_url",
-      "description": "The URL an output uses to restream."
+      "description": "The URL an output uses to restream.",
+      "type": "string"
     }
   },
   "required": [
@@ -29,47 +29,15 @@ export const stream_create_output_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_output_enabled`.
- */
-export const stream_output_enabled: JsonSchema = {
-  "description": "When enabled, live video streamed to the associated live input will be sent to the output URL. When disabled, live video will not be sent to the output URL, even when streaming to the associated live input. Use this to control precisely when you start and stop simulcasting to specific destinations like YouTube and Twitch.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_output_identifier`.
- */
-export const stream_output_identifier: JsonSchema = {
-  "description": "A unique identifier for the output.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_output_streamKey`.
- */
-export const stream_output_streamKey: JsonSchema = {
-  "description": "The streamKey used to authenticate against an output's target.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_output_url`.
- */
-export const stream_output_url: JsonSchema = {
-  "description": "The URL an output uses to restream.",
-  "type": "string"
-};
-
 /**
  * The schema of `stream_update_output_request`.
  */
 export const stream_update_output_request: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/stream_output_enabled",
       "default": true,
-      "description": "When enabled, live video streamed to the associated live input will be sent to the output URL. When disabled, live video will not be sent to the output URL, even when streaming to the associated live input. Use this to control precisely when you start and stop simulcasting to specific destinations like YouTube and Twitch."
+      "description": "When enabled, live video streamed to the associated live input will be sent to the output URL. When disabled, live video will not be sent to the output URL, even when streaming to the associated live input. Use this to control precisely when you start and stop simulcasting to specific destinations like YouTube and Twitch.",
+      "type": "boolean"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/stream/liveInputs/outputs/tools.ts b/src/generated/forge-mcp/stream/liveInputs/outputs/tools.ts
index 386e7428a..0cbce5b77 100644
--- a/src/generated/forge-mcp/stream/liveInputs/outputs/tools.ts
+++ b/src/generated/forge-mcp/stream/liveInputs/outputs/tools.ts
@@ -3,79 +3,70 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_common_output,
-  stream_api_response_single_output,
-  stream_messages_output,
+  stream_api$$response$$common,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_messages,
 } from "../../outputs.js";
-import { stream_identifier_2 } from "../../schemas.js";
-import { stream_live_input_identifier } from "../schemas.js";
 import {
-  stream_output_enabled_output,
-  stream_output_identifier_output,
-  stream_output_output,
-  stream_output_response_collection_output,
-  stream_output_response_single_output,
-  stream_output_streamKey_output,
-  stream_output_url_output,
+  stream_output,
+  stream_output_response_collection,
+  stream_output_response_single,
 } from "./outputs.js";
 import {
   stream_create_output_request,
-  stream_output_enabled,
-  stream_output_identifier,
-  stream_output_streamKey,
-  stream_output_url,
   stream_update_output_request,
 } from "./schemas.js";
 
 /**
- * The tools of `stream.live_inputs.outputs`.
+ * The tools of `stream.liveInputs.outputs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "stream_live_inputs_outputs_create",
+    name: "stream_liveInputs_outputs_create",
     title: "Create a new output, connected to a live input",
-    description: "Creates a new output that can be used to simulcast or restream live video to other RTMP or SRT destinations. Outputs are always linked to a specific live input — one live input can have many outputs.",
+    description: "Creates a new output that can be used to simulcast or restream live video to other RTMP or SRT destinations. Outputs are always linked to a specific live input — one live input can have many outputs.\n\nPOST /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/stream_create_output_request"
         },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "stream_create_output_request": stream_create_output_request,
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-        "stream_output_enabled": stream_output_enabled,
-        "stream_output_streamKey": stream_output_streamKey,
-        "stream_output_url": stream_output_url,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_output_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_output": stream_output_output,
-        "stream_output_enabled": stream_output_enabled_output,
-        "stream_output_identifier": stream_output_identifier_output,
-        "stream_output_response_single": stream_output_response_single_output,
-        "stream_output_streamKey": stream_output_streamKey_output,
-        "stream_output_url": stream_output_url_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_output": stream_output,
+        "stream_output_response_single": stream_output_response_single,
       },
     },
     annotations: {
@@ -97,15 +88,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_output": stream_output_output,
-        "stream_output_enabled": stream_output_enabled_output,
-        "stream_output_identifier": stream_output_identifier_output,
-        "stream_output_response_single": stream_output_response_single_output,
-        "stream_output_streamKey": stream_output_streamKey_output,
-        "stream_output_url": stream_output_url_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_output": stream_output,
+        "stream_output_response_single": stream_output_response_single,
       },
     },
     request: (args) => ({
@@ -114,35 +101,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_live_inputs_outputs_delete",
+    name: "stream_liveInputs_outputs_delete",
     title: "Delete an output",
-    description: "Deletes an output and removes it from the associated live input.\n\nConfirm with the user before calling this tool. Delete this output? Any active broadcast to this target will be terminated.",
+    description: "Deletes an output and removes it from the associated live input.\n\nConfirm with the user before calling this tool. Delete this output? Any active broadcast to this target will be terminated.\n\nDELETE /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs/{output_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
-        },
-        "output_identifier": {
-          "$ref": "#/$defs/stream_output_identifier",
-          "description": "A unique identifier for the output."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            },
+            "output_identifier": {
+              "description": "A unique identifier for the output.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier",
+            "output_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier",
-        "output_identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-        "stream_output_identifier": stream_output_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
     },
@@ -171,41 +163,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_live_inputs_outputs_list",
+    name: "stream_liveInputs_outputs_list",
     title: "List all outputs associated with a specified live input",
-    description: "Retrieves all outputs associated with a specified live input.",
+    description: "Retrieves all outputs associated with a specified live input.\n\nGET /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_output_response_collection",
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_messages": stream_messages_output,
-        "stream_output": stream_output_output,
-        "stream_output_enabled": stream_output_enabled_output,
-        "stream_output_identifier": stream_output_identifier_output,
-        "stream_output_response_collection": stream_output_response_collection_output,
-        "stream_output_streamKey": stream_output_streamKey_output,
-        "stream_output_url": stream_output_url_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_messages": stream_messages,
+        "stream_output": stream_output,
+        "stream_output_response_collection": stream_output_response_collection,
       },
     },
     annotations: {
@@ -233,15 +227,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_messages": stream_messages_output,
-        "stream_output": stream_output_output,
-        "stream_output_enabled": stream_output_enabled_output,
-        "stream_output_identifier": stream_output_identifier_output,
-        "stream_output_response_collection": stream_output_response_collection_output,
-        "stream_output_streamKey": stream_output_streamKey_output,
-        "stream_output_url": stream_output_url_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
+        "stream_output": stream_output,
+        "stream_output_response_collection": stream_output_response_collection,
       },
     },
     request: (args) => ({
@@ -249,53 +239,55 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_live_inputs_outputs_update",
+    name: "stream_liveInputs_outputs_update",
     title: "Update an output",
-    description: "Updates the state of an output.",
+    description: "Updates the state of an output.\n\nPUT /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs/{output_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/stream_update_output_request"
         },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
-        },
-        "output_identifier": {
-          "$ref": "#/$defs/stream_output_identifier",
-          "description": "A unique identifier for the output."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            },
+            "output_identifier": {
+              "description": "A unique identifier for the output.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier",
+            "output_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier",
-        "output_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-        "stream_output_enabled": stream_output_enabled,
-        "stream_output_identifier": stream_output_identifier,
         "stream_update_output_request": stream_update_output_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_output_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_output": stream_output_output,
-        "stream_output_enabled": stream_output_enabled_output,
-        "stream_output_identifier": stream_output_identifier_output,
-        "stream_output_response_single": stream_output_response_single_output,
-        "stream_output_streamKey": stream_output_streamKey_output,
-        "stream_output_url": stream_output_url_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_output": stream_output,
+        "stream_output_response_single": stream_output_response_single,
       },
     },
     annotations: {
@@ -322,15 +314,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_output": stream_output_output,
-        "stream_output_enabled": stream_output_enabled_output,
-        "stream_output_identifier": stream_output_identifier_output,
-        "stream_output_response_single": stream_output_response_single_output,
-        "stream_output_streamKey": stream_output_streamKey_output,
-        "stream_output_url": stream_output_url_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_output": stream_output,
+        "stream_output_response_single": stream_output_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/liveInputs/schemas.ts b/src/generated/forge-mcp/stream/liveInputs/schemas.ts
index 05011388f..f84b24998 100644
--- a/src/generated/forge-mcp/stream/liveInputs/schemas.ts
+++ b/src/generated/forge-mcp/stream/liveInputs/schemas.ts
@@ -9,26 +9,26 @@ import type { JsonSchema } from "../../_/tool.js";
 export const stream_create_input_request: JsonSchema = {
   "properties": {
     "defaultCreator": {
-      "$ref": "#/$defs/stream_live_input_default_creator",
-      "description": "Sets the creator ID asssociated with this live input."
+      "description": "Sets the creator ID asssociated with this live input.",
+      "type": "string"
     },
     "deleteRecordingAfterDays": {
-      "$ref": "#/$defs/stream_live_input_recording_deletion",
-      "description": "Indicates the number of days after which the live inputs recordings will be deleted. When a stream completes and the recording is ready, the value is used to calculate a scheduled deletion date for that recording. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion."
+      "description": "Indicates the number of days after which the live inputs recordings will be deleted. When a stream completes and the recording is ready, the value is used to calculate a scheduled deletion date for that recording. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion.",
+      "type": "number"
     },
     "enabled": {
-      "$ref": "#/$defs/stream_live_input_enabled",
       "default": true,
-      "description": "Indicates whether the live input is enabled and can accept streams."
+      "description": "Indicates whether the live input is enabled and can accept streams.",
+      "type": "boolean"
     },
     "meta": {
       "$ref": "#/$defs/stream_live_input_metadata",
       "description": "A user modifiable key-value store used to reference other systems of record for managing live inputs."
     },
     "preferLowLatency": {
-      "$ref": "#/$defs/stream_live_input_prefer_low_latency",
       "default": false,
-      "description": "When enabled, the live stream is delivered using Low-Latency HLS (LL-HLS), reducing glass-to-glass latency for viewers at the cost of reduced player compatibility."
+      "description": "When enabled, the live stream is delivered using Low-Latency HLS (LL-HLS), reducing glass-to-glass latency for viewers at the cost of reduced player compatibility.",
+      "type": "boolean"
     },
     "recording": {
       "$ref": "#/$defs/stream_live_input_recording_settings",
@@ -38,30 +38,6 @@ export const stream_create_input_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_live_input_default_creator`.
- */
-export const stream_live_input_default_creator: JsonSchema = {
-  "description": "Sets the creator ID asssociated with this live input.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_live_input_enabled`.
- */
-export const stream_live_input_enabled: JsonSchema = {
-  "description": "Indicates whether the live input is enabled and can accept streams.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_live_input_identifier`.
- */
-export const stream_live_input_identifier: JsonSchema = {
-  "description": "A unique identifier for a live input.",
-  "type": "string"
-};
-
 /**
  * The schema of `stream_live_input_metadata`.
  */
@@ -70,14 +46,6 @@ export const stream_live_input_metadata: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_live_input_prefer_low_latency`.
- */
-export const stream_live_input_prefer_low_latency: JsonSchema = {
-  "description": "When enabled, the live stream is delivered using Low-Latency HLS (LL-HLS), reducing glass-to-glass latency for viewers at the cost of reduced player compatibility.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `stream_live_input_recording_allowedOrigins`.
  */
@@ -89,42 +57,6 @@ export const stream_live_input_recording_allowedOrigins: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `stream_live_input_recording_deletion`.
- */
-export const stream_live_input_recording_deletion: JsonSchema = {
-  "description": "Indicates the number of days after which the live inputs recordings will be deleted. When a stream completes and the recording is ready, the value is used to calculate a scheduled deletion date for that recording. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion.",
-  "type": "number"
-};
-
-/**
- * The schema of `stream_live_input_recording_hideLiveViewerCount`.
- */
-export const stream_live_input_recording_hideLiveViewerCount: JsonSchema = {
-  "description": "Disables reporting the number of live viewers when this property is set to `true`.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_live_input_recording_mode`.
- */
-export const stream_live_input_recording_mode: JsonSchema = {
-  "description": "Specifies the recording behavior for the live input. Set this value to `off` to prevent a recording. Set the value to `automatic` to begin a recording and transition to on-demand after Stream Live stops receiving input.",
-  "enum": [
-    "off",
-    "automatic"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `stream_live_input_recording_requireSignedURLs`.
- */
-export const stream_live_input_recording_requireSignedURLs: JsonSchema = {
-  "description": "Indicates if a video using the live input has the `requireSignedURLs` property set. Also enforces access controls on any video recording of the livestream with the live input.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `stream_live_input_recording_settings`.
  */
@@ -136,63 +68,59 @@ export const stream_live_input_recording_settings: JsonSchema = {
       "description": "Lists the origins allowed to display videos created with this input. Enter allowed origin domains in an array and use `*` for wildcard subdomains. An empty array allows videos to be viewed on any origin."
     },
     "hideLiveViewerCount": {
-      "$ref": "#/$defs/stream_live_input_recording_hideLiveViewerCount",
       "default": false,
-      "description": "Disables reporting the number of live viewers when this property is set to `true`."
+      "description": "Disables reporting the number of live viewers when this property is set to `true`.",
+      "type": "boolean"
     },
     "mode": {
-      "$ref": "#/$defs/stream_live_input_recording_mode",
       "default": "off",
-      "description": "Specifies the recording behavior for the live input. Set this value to `off` to prevent a recording. Set the value to `automatic` to begin a recording and transition to on-demand after Stream Live stops receiving input."
+      "description": "Specifies the recording behavior for the live input. Set this value to `off` to prevent a recording. Set the value to `automatic` to begin a recording and transition to on-demand after Stream Live stops receiving input.",
+      "enum": [
+        "off",
+        "automatic"
+      ],
+      "type": "string"
     },
     "requireSignedURLs": {
-      "$ref": "#/$defs/stream_live_input_recording_requireSignedURLs",
       "default": false,
-      "description": "Indicates if a video using the live input has the `requireSignedURLs` property set. Also enforces access controls on any video recording of the livestream with the live input."
+      "description": "Indicates if a video using the live input has the `requireSignedURLs` property set. Also enforces access controls on any video recording of the livestream with the live input.",
+      "type": "boolean"
     },
     "timeoutSeconds": {
-      "$ref": "#/$defs/stream_live_input_recording_timeoutSeconds",
       "default": 0,
-      "description": "Determines the amount of time a live input configured in `automatic` mode should wait before a recording transitions from live to on-demand. `0` is recommended for most use cases and indicates the platform default should be used."
+      "description": "Determines the amount of time a live input configured in `automatic` mode should wait before a recording transitions from live to on-demand. `0` is recommended for most use cases and indicates the platform default should be used.",
+      "type": "integer"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_live_input_recording_timeoutSeconds`.
- */
-export const stream_live_input_recording_timeoutSeconds: JsonSchema = {
-  "description": "Determines the amount of time a live input configured in `automatic` mode should wait before a recording transitions from live to on-demand. `0` is recommended for most use cases and indicates the platform default should be used.",
-  "type": "integer"
-};
-
 /**
  * The schema of `stream_update_input_request`.
  */
 export const stream_update_input_request: JsonSchema = {
   "properties": {
     "defaultCreator": {
-      "$ref": "#/$defs/stream_live_input_default_creator",
-      "description": "Sets the creator ID asssociated with this live input."
+      "description": "Sets the creator ID asssociated with this live input.",
+      "type": "string"
     },
     "deleteRecordingAfterDays": {
-      "$ref": "#/$defs/stream_live_input_recording_deletion",
-      "description": "Indicates the number of days after which the live inputs recordings will be deleted. When a stream completes and the recording is ready, the value is used to calculate a scheduled deletion date for that recording. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion."
+      "description": "Indicates the number of days after which the live inputs recordings will be deleted. When a stream completes and the recording is ready, the value is used to calculate a scheduled deletion date for that recording. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion.",
+      "type": "number"
     },
     "enabled": {
-      "$ref": "#/$defs/stream_live_input_enabled",
       "default": true,
-      "description": "Indicates whether the live input is enabled and can accept streams."
+      "description": "Indicates whether the live input is enabled and can accept streams.",
+      "type": "boolean"
     },
     "meta": {
       "$ref": "#/$defs/stream_live_input_metadata",
       "description": "A user modifiable key-value store used to reference other systems of record for managing live inputs."
     },
     "preferLowLatency": {
-      "$ref": "#/$defs/stream_live_input_prefer_low_latency",
       "default": false,
-      "description": "When enabled, the live stream is delivered using Low-Latency HLS (LL-HLS), reducing glass-to-glass latency for viewers at the cost of reduced player compatibility."
+      "description": "When enabled, the live stream is delivered using Low-Latency HLS (LL-HLS), reducing glass-to-glass latency for viewers at the cost of reduced player compatibility.",
+      "type": "boolean"
     },
     "recording": {
       "$ref": "#/$defs/stream_live_input_recording_settings",
diff --git a/src/generated/forge-mcp/stream/liveInputs/tools.ts b/src/generated/forge-mcp/stream/liveInputs/tools.ts
index c4628e20e..bfa32897d 100644
--- a/src/generated/forge-mcp/stream/liveInputs/tools.ts
+++ b/src/generated/forge-mcp/stream/liveInputs/tools.ts
@@ -1,159 +1,104 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_common_output,
-  stream_api_response_single_output,
-  stream_messages_output,
+  stream_api$$response$$common,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_messages,
 } from "../outputs.js";
-import { stream_identifier_2, stream_include_counts } from "../schemas.js";
 import {
-  stream_input_rtmps_output,
-  stream_input_rtmps_stream_key_output,
-  stream_input_rtmps_url_output,
-  stream_input_srt_output,
-  stream_input_srt_stream_id_output,
-  stream_input_srt_stream_passphrase_output,
-  stream_input_srt_url_output,
-  stream_input_webrtc_output,
-  stream_input_webrtc_url_output,
-  stream_live_input_created_output,
-  stream_live_input_enabled_output,
-  stream_live_input_identifier_output,
-  stream_live_input_keys_rotated_at_output,
-  stream_live_input_metadata_output,
-  stream_live_input_modified_output,
-  stream_live_input_object_without_url_output,
-  stream_live_input_output,
-  stream_live_input_playback_output,
-  stream_live_input_prefer_low_latency_output,
-  stream_live_input_recording_allowedOrigins_output,
-  stream_live_input_recording_deletion_output,
-  stream_live_input_recording_hideLiveViewerCount_output,
-  stream_live_input_recording_mode_output,
-  stream_live_input_recording_requireSignedURLs_output,
-  stream_live_input_recording_settings_output,
-  stream_live_input_recording_timeoutSeconds_output,
-  stream_live_input_response_collection_output,
-  stream_live_input_response_single_output,
-  stream_live_input_status_output,
-  stream_playback_dash_url_output,
-  stream_playback_hls_url_output,
-  stream_playback_rtmps_output,
-  stream_playback_rtmps_stream_key_output,
-  stream_playback_rtmps_url_output,
-  stream_playback_srt_output,
-  stream_playback_srt_stream_id_output,
-  stream_playback_srt_stream_passphrase_output,
-  stream_playback_srt_url_output,
-  stream_playback_webrtc_output,
-  stream_playback_webrtc_url_output,
-} from "./outputs.js";
-import {
-  stream_create_input_request,
-  stream_live_input_default_creator,
-  stream_live_input_enabled,
-  stream_live_input_identifier,
+  stream_input_rtmps,
+  stream_input_srt,
+  stream_input_webrtc,
+  stream_live_input,
   stream_live_input_metadata,
-  stream_live_input_prefer_low_latency,
+  stream_live_input_object_without_url,
+  stream_live_input_playback,
   stream_live_input_recording_allowedOrigins,
-  stream_live_input_recording_deletion,
-  stream_live_input_recording_hideLiveViewerCount,
-  stream_live_input_recording_mode,
-  stream_live_input_recording_requireSignedURLs,
   stream_live_input_recording_settings,
-  stream_live_input_recording_timeoutSeconds,
+  stream_live_input_response_collection,
+  stream_live_input_response_single,
+  stream_playback_rtmps,
+  stream_playback_srt,
+  stream_playback_webrtc,
+} from "./outputs.js";
+import {
+  stream_create_input_request,
+  stream_live_input_metadata as stream_live_input_metadata$,
+  stream_live_input_recording_allowedOrigins as stream_live_input_recording_allowedOrigins$,
+  stream_live_input_recording_settings as stream_live_input_recording_settings$,
   stream_update_input_request,
 } from "./schemas.js";
 
 /**
- * The tools of `stream.live_inputs`.
+ * The tools of `stream.liveInputs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "stream_live_inputs_create",
+    name: "stream_liveInputs_create",
     title: "Create a live input",
-    description: "Creates a live input, and returns credentials that you or your users can use to stream live video to Cloudflare Stream.",
+    description: "Creates a live input, and returns credentials that you or your users can use to stream live video to Cloudflare Stream.\n\nPOST /accounts/{account_id}/stream/live_inputs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/stream_create_input_request"
         },
-        "idempotency_key": {
-          "description": "Prevents duplicate live inputs from being created when retrying this request. The key is scoped to the account, may contain up to 255 bytes, and expires six hours after the live input is created. Reusing a key for a deleted input before expiry returns a 409 Conflict response.",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Idempotency-Key": {
+              "description": "Prevents duplicate live inputs from being created when retrying this request. The key is scoped to the account, may contain up to 255 bytes, and expires six hours after the live input is created. Reusing a key for a deleted input before expiry returns a 409 Conflict response.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "stream_create_input_request": stream_create_input_request,
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_default_creator": stream_live_input_default_creator,
-        "stream_live_input_enabled": stream_live_input_enabled,
-        "stream_live_input_metadata": stream_live_input_metadata,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds,
+        "stream_live_input_metadata": stream_live_input_metadata$,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins$,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_live_input_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     annotations: {
@@ -180,81 +125,61 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/stream/live_inputs`,
       headers: [
-        ["Idempotency-Key", args["idempotency_key"]],
+        ["Idempotency-Key", param(args, "headers", "Idempotency-Key")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "stream_live_inputs_delete",
+    name: "stream_liveInputs_delete",
     title: "Delete a live input",
-    description: "Permanently delete a live input, making it inaccessible and blocking current and future broadcasts to it. Existing recordings will be retained.\n\nConfirm with the user before calling this tool. Permanently delete this live input? It cannot be recreated.",
+    description: "Permanently delete a live input, making it inaccessible and blocking current and future broadcasts to it. Existing recordings will be retained.\n\nConfirm with the user before calling this tool. Permanently delete this live input? It cannot be recreated.\n\nDELETE /accounts/{account_id}/stream/live_inputs/{live_input_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
     },
@@ -283,73 +208,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_live_inputs_disable",
+    name: "stream_liveInputs_disable",
     title: "Disable a live input",
-    description: "Prevents a live input from being streamed to and terminates any active broadcasts until re-enabled.\n\nConfirm with the user before calling this tool. Disable this live input? Active broadcasts will be terminated and future connections will be blocked until it is re-enabled.",
+    description: "Prevents a live input from being streamed to and terminates any active broadcasts until re-enabled.\n\nConfirm with the user before calling this tool. Disable this live input? Active broadcasts will be terminated and future connections will be blocked until it is re-enabled.\n\nPOST /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/disable",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_live_input_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     annotations: {
@@ -371,47 +276,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     request: (args) => ({
@@ -419,73 +298,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_live_inputs_enable",
+    name: "stream_liveInputs_enable",
     title: "Enable a live input",
-    description: "Allows a disabled live input to start receiving broadcasts again.",
+    description: "Allows a disabled live input to start receiving broadcasts again.\n\nPOST /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/enable",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_live_input_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     annotations: {
@@ -507,47 +366,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     request: (args) => ({
@@ -555,73 +388,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_live_inputs_get",
+    name: "stream_liveInputs_get",
     title: "Retrieve a live input",
-    description: "Retrieves details of an existing live input.",
+    description: "Retrieves details of an existing live input.\n\nGET /accounts/{account_id}/stream/live_inputs/{live_input_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_live_input_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     annotations: {
@@ -649,47 +462,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     request: (args) => ({
@@ -697,43 +484,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_live_inputs_list",
+    name: "stream_liveInputs_list",
     title: "List live inputs",
-    description: "Lists the live inputs created for an account. To get the credentials needed to stream to a specific live input, request a single live input.",
+    description: "Lists the live inputs created for an account. To get the credentials needed to stream to a specific live input, request a single live input.\n\nGET /accounts/{account_id}/stream/live_inputs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "include_counts": {
-          "$ref": "#/$defs/stream_include_counts",
-          "default": false,
-          "description": "Includes the total number of videos associated with the submitted query parameters."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_counts": {
+              "default": false,
+              "description": "Includes the total number of videos associated with the submitted query parameters.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_include_counts": stream_include_counts,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_live_input_response_collection",
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_object_without_url": stream_live_input_object_without_url_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_response_collection": stream_live_input_response_collection_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_object_without_url": stream_live_input_object_without_url,
+        "stream_live_input_response_collection": stream_live_input_response_collection,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -761,94 +555,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_object_without_url": stream_live_input_object_without_url_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_response_collection": stream_live_input_response_collection_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_object_without_url": stream_live_input_object_without_url,
+        "stream_live_input_response_collection": stream_live_input_response_collection,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/stream/live_inputs`,
       query: [
-        ["include_counts", args["include_counts"], true],
+        ["include_counts", param(args, "query", "include_counts"), true],
       ],
     }),
   },
   {
-    name: "stream_live_inputs_rotate_keys",
+    name: "stream_liveInputs_rotateKeys",
     title: "Rotate keys for a live input",
-    description: "Rotates the credentials for a live input without changing its identifier. Old credentials are revoked, broadcasts using stale credentials are automatically disconnected shortly after rotation, and the response returns refreshed credentials.\n\nConfirm with the user before calling this tool. Rotate keys for this live input? Active broadcasts will be terminated. New broadcasts cannot start with outdated credentials.",
+    description: "Rotates the credentials for a live input without changing its identifier. Old credentials are revoked, broadcasts using stale credentials are automatically disconnected shortly after rotation, and the response returns refreshed credentials.\n\nConfirm with the user before calling this tool. Rotate keys for this live input? Active broadcasts will be terminated. New broadcasts cannot start with outdated credentials.\n\nPOST /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/rotate_keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_identifier": stream_live_input_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_live_input_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     annotations: {
@@ -870,47 +639,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     request: (args) => ({
@@ -918,89 +661,63 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_live_inputs_update",
+    name: "stream_liveInputs_update",
     title: "Update a live input",
-    description: "Updates a specified live input.",
+    description: "Updates a specified live input.\n\nPUT /accounts/{account_id}/stream/live_inputs/{live_input_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/stream_update_input_request"
         },
-        "live_input_identifier": {
-          "$ref": "#/$defs/stream_live_input_identifier",
-          "description": "A unique identifier for a live input."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "live_input_identifier": {
+              "description": "A unique identifier for a live input.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "live_input_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "live_input_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_identifier-2": stream_identifier_2,
-        "stream_live_input_default_creator": stream_live_input_default_creator,
-        "stream_live_input_enabled": stream_live_input_enabled,
-        "stream_live_input_identifier": stream_live_input_identifier,
-        "stream_live_input_metadata": stream_live_input_metadata,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds,
+        "stream_live_input_metadata": stream_live_input_metadata$,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins$,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings$,
         "stream_update_input_request": stream_update_input_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_live_input_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     annotations: {
@@ -1027,47 +744,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_input_rtmps": stream_input_rtmps_output,
-        "stream_input_rtmps_stream_key": stream_input_rtmps_stream_key_output,
-        "stream_input_rtmps_url": stream_input_rtmps_url_output,
-        "stream_input_srt": stream_input_srt_output,
-        "stream_input_srt_stream_id": stream_input_srt_stream_id_output,
-        "stream_input_srt_stream_passphrase": stream_input_srt_stream_passphrase_output,
-        "stream_input_srt_url": stream_input_srt_url_output,
-        "stream_input_webrtc": stream_input_webrtc_output,
-        "stream_input_webrtc_url": stream_input_webrtc_url_output,
-        "stream_live_input": stream_live_input_output,
-        "stream_live_input_created": stream_live_input_created_output,
-        "stream_live_input_enabled": stream_live_input_enabled_output,
-        "stream_live_input_identifier": stream_live_input_identifier_output,
-        "stream_live_input_keys_rotated_at": stream_live_input_keys_rotated_at_output,
-        "stream_live_input_metadata": stream_live_input_metadata_output,
-        "stream_live_input_modified": stream_live_input_modified_output,
-        "stream_live_input_playback": stream_live_input_playback_output,
-        "stream_live_input_prefer_low_latency": stream_live_input_prefer_low_latency_output,
-        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins_output,
-        "stream_live_input_recording_deletion": stream_live_input_recording_deletion_output,
-        "stream_live_input_recording_hideLiveViewerCount": stream_live_input_recording_hideLiveViewerCount_output,
-        "stream_live_input_recording_mode": stream_live_input_recording_mode_output,
-        "stream_live_input_recording_requireSignedURLs": stream_live_input_recording_requireSignedURLs_output,
-        "stream_live_input_recording_settings": stream_live_input_recording_settings_output,
-        "stream_live_input_recording_timeoutSeconds": stream_live_input_recording_timeoutSeconds_output,
-        "stream_live_input_response_single": stream_live_input_response_single_output,
-        "stream_live_input_status": stream_live_input_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_playback_dash_url": stream_playback_dash_url_output,
-        "stream_playback_hls_url": stream_playback_hls_url_output,
-        "stream_playback_rtmps": stream_playback_rtmps_output,
-        "stream_playback_rtmps_stream_key": stream_playback_rtmps_stream_key_output,
-        "stream_playback_rtmps_url": stream_playback_rtmps_url_output,
-        "stream_playback_srt": stream_playback_srt_output,
-        "stream_playback_srt_stream_id": stream_playback_srt_stream_id_output,
-        "stream_playback_srt_stream_passphrase": stream_playback_srt_stream_passphrase_output,
-        "stream_playback_srt_url": stream_playback_srt_url_output,
-        "stream_playback_webrtc": stream_playback_webrtc_output,
-        "stream_playback_webrtc_url": stream_playback_webrtc_url_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input_rtmps": stream_input_rtmps,
+        "stream_input_srt": stream_input_srt,
+        "stream_input_webrtc": stream_input_webrtc,
+        "stream_live_input": stream_live_input,
+        "stream_live_input_metadata": stream_live_input_metadata,
+        "stream_live_input_playback": stream_live_input_playback,
+        "stream_live_input_recording_allowedOrigins": stream_live_input_recording_allowedOrigins,
+        "stream_live_input_recording_settings": stream_live_input_recording_settings,
+        "stream_live_input_response_single": stream_live_input_response_single,
+        "stream_messages": stream_messages,
+        "stream_playback_rtmps": stream_playback_rtmps,
+        "stream_playback_srt": stream_playback_srt,
+        "stream_playback_webrtc": stream_playback_webrtc,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/outputs.ts b/src/generated/forge-mcp/stream/outputs.ts
index a44c381ec..094560bc7 100644
--- a/src/generated/forge-mcp/stream/outputs.ts
+++ b/src/generated/forge-mcp/stream/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `stream_api-response-common` in responses.
  */
-export const stream_api_response_common_output: JsonSchema = {
+export const stream_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/stream_messages"
@@ -32,7 +32,7 @@ export const stream_api_response_common_output: JsonSchema = {
 /**
  * The schema of `stream_api-response-common-failure` in responses.
  */
-export const stream_api_response_common_failure_output: JsonSchema = {
+export const stream_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/stream_messages"
@@ -62,7 +62,7 @@ export const stream_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `stream_api-response-single` in responses.
  */
-export const stream_api_response_single_output: JsonSchema = {
+export const stream_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/stream_messages"
@@ -85,17 +85,10 @@ export const stream_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_creator` in responses.
- */
-export const stream_creator_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_deleted_response` in responses.
  */
-export const stream_deleted_response_output: JsonSchema = {
+export const stream_deleted_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
@@ -111,31 +104,10 @@ export const stream_deleted_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `stream_downloadedFrom` in responses.
- */
-export const stream_downloadedFrom_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_height` in responses.
- */
-export const stream_height_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `stream_identifier-2` in responses.
- */
-export const stream_identifier_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_messages` in responses.
  */
-export const stream_messages_output: JsonSchema = {
+export const stream_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -165,45 +137,10 @@ export const stream_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `stream_name` in responses.
- */
-export const stream_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_opacity` in responses.
- */
-export const stream_opacity_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `stream_padding` in responses.
- */
-export const stream_padding_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `stream_position` in responses.
- */
-export const stream_position_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_scale` in responses.
- */
-export const stream_scale_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `stream_storage_use_response` in responses.
  */
-export const stream_storage_use_response_output: JsonSchema = {
+export const stream_storage_use_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
@@ -213,7 +150,7 @@ export const stream_storage_use_response_output: JsonSchema = {
         "result": {
           "properties": {
             "creator": {
-              "$ref": "#/$defs/stream_creator"
+              "type": "string"
             },
             "totalStorageMinutes": {
               "type": "number"
@@ -233,73 +170,45 @@ export const stream_storage_use_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `stream_watermark_created` in responses.
- */
-export const stream_watermark_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_watermark_identifier` in responses.
- */
-export const stream_watermark_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_watermark_size` in responses.
- */
-export const stream_watermark_size_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `stream_watermarks` in responses.
  */
-export const stream_watermarks_output: JsonSchema = {
+export const stream_watermarks: JsonSchema = {
   "properties": {
     "created": {
-      "$ref": "#/$defs/stream_watermark_created"
+      "format": "date-time",
+      "type": "string"
     },
     "downloadedFrom": {
-      "$ref": "#/$defs/stream_downloadedFrom"
+      "type": "string"
     },
     "height": {
-      "$ref": "#/$defs/stream_height"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/stream_name"
+      "type": "string"
     },
     "opacity": {
-      "$ref": "#/$defs/stream_opacity"
+      "type": "number"
     },
     "padding": {
-      "$ref": "#/$defs/stream_padding"
+      "type": "number"
     },
     "position": {
-      "$ref": "#/$defs/stream_position"
+      "type": "string"
     },
     "scale": {
-      "$ref": "#/$defs/stream_scale"
+      "type": "number"
     },
     "size": {
-      "$ref": "#/$defs/stream_watermark_size"
+      "type": "number"
     },
     "uid": {
-      "$ref": "#/$defs/stream_watermark_identifier"
+      "type": "string"
     },
     "width": {
-      "$ref": "#/$defs/stream_width"
+      "type": "integer"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `stream_width` in responses.
- */
-export const stream_width_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/stream/schemas.ts b/src/generated/forge-mcp/stream/schemas.ts
deleted file mode 100644
index 5d3c5d31e..000000000
--- a/src/generated/forge-mcp/stream/schemas.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `stream_account_identifier`.
- */
-export const stream_account_identifier: JsonSchema = {
-  "description": "The account identifier tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_creator`.
- */
-export const stream_creator: JsonSchema = {
-  "description": "A user-defined identifier for the media creator.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_identifier-2`.
- */
-export const stream_identifier_2: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_include_counts`.
- */
-export const stream_include_counts: JsonSchema = {
-  "description": "Includes the total number of videos associated with the submitted query parameters.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_name`.
- */
-export const stream_name: JsonSchema = {
-  "description": "A short description of the watermark profile.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_opacity`.
- */
-export const stream_opacity: JsonSchema = {
-  "description": "The translucency of the image. A value of `0.0` makes the image completely transparent, and `1.0` makes the image completely opaque. Note that if the image is already semi-transparent, setting this to `1.0` will not make the image completely opaque.",
-  "type": "number"
-};
-
-/**
- * The schema of `stream_padding`.
- */
-export const stream_padding: JsonSchema = {
-  "description": "The whitespace between the adjacent edges (determined by position) of the video and the image. `0.0` indicates no padding, and `1.0` indicates a fully padded video width or length, as determined by the algorithm.",
-  "type": "number"
-};
-
-/**
- * The schema of `stream_position`.
- */
-export const stream_position: JsonSchema = {
-  "description": "The location of the image. Valid positions are: `upperRight`, `upperLeft`, `lowerLeft`, `lowerRight`, and `center`. Note that `center` ignores the `padding` parameter.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_scale`.
- */
-export const stream_scale: JsonSchema = {
-  "description": "The size of the image relative to the overall size of the video. This parameter will adapt to horizontal and vertical videos automatically. `0.0` indicates no scaling (use the size of the image as-is), and `1.0 `fills the entire video.",
-  "type": "number"
-};
-
-/**
- * The schema of `stream_watermark_identifier`.
- */
-export const stream_watermark_identifier: JsonSchema = {
-  "description": "The unique identifier for a watermark profile.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/stream/tools.ts b/src/generated/forge-mcp/stream/tools.ts
index 728a0b454..7b5054073 100644
--- a/src/generated/forge-mcp/stream/tools.ts
+++ b/src/generated/forge-mcp/stream/tools.ts
@@ -1,51 +1,60 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_single_output,
-  stream_creator_output,
-  stream_messages_output,
-  stream_storage_use_response_output,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_messages,
+  stream_storage_use_response,
 } from "./outputs.js";
-import { stream_account_identifier, stream_creator } from "./schemas.js";
 
 /**
  * The tools of `stream`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "stream_storage_usage",
+    name: "stream_storageUsage",
     title: "Storage use",
-    description: "Returns information about an account's storage use.",
+    description: "Returns information about an account's storage use.\n\nGET /accounts/{account_id}/stream/storage-usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "creator": {
-          "$ref": "#/$defs/stream_creator",
-          "description": "A user-defined identifier for the media creator."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "creator": {
+              "description": "A user-defined identifier for the media creator.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_creator": stream_creator,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_storage_use_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_creator": stream_creator_output,
-        "stream_messages": stream_messages_output,
-        "stream_storage_use_response": stream_storage_use_response_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_storage_use_response": stream_storage_use_response,
       },
     },
     annotations: {
@@ -73,17 +82,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_creator": stream_creator_output,
-        "stream_messages": stream_messages_output,
-        "stream_storage_use_response": stream_storage_use_response_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_storage_use_response": stream_storage_use_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/stream/storage-usage`,
       query: [
-        ["creator", args["creator"], true],
+        ["creator", param(args, "query", "creator"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/stream/usage/tools.ts b/src/generated/forge-mcp/stream/usage/tools.ts
index ae93ec86e..d62000916 100644
--- a/src/generated/forge-mcp/stream/usage/tools.ts
+++ b/src/generated/forge-mcp/stream/usage/tools.ts
@@ -1,15 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  usage_analytics_api_error_output,
-  usage_analytics_api_message_output,
-  usage_analytics_error_response_output,
-  usage_analytics_stream_usage_data_point_output,
-  usage_analytics_stream_usage_response_output,
+  usage$$analytics_api_error,
+  usage$$analytics_api_message,
+  usage$$analytics_error_response,
+  usage$$analytics_stream_usage_data_point,
+  usage$$analytics_stream_usage_response,
 } from "../../outputs.js";
-import { usage_analytics_identifier } from "../../schemas.js";
 
 /**
  * The tools of `stream.usage`.
@@ -18,74 +17,87 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_usage_get",
     title: "Get account or zone Stream usage",
-    description: "Retrieve Stream usage analytics for an account or zone. Returns time-series data for Stream billable minutes viewed across all zones in the account or zone. The gateway rewrites this path before forwarding to the backend usage handler.\n\nThis method is deprecated.",
+    description: "Retrieve Stream usage analytics for an account or zone. Returns time-series data for Stream billable minutes viewed across all zones in the account or zone. The gateway rewrites this path before forwarding to the backend usage handler.\n\nThis method is deprecated.\n\nGET /{account_or_zone}/{account_or_zone_id}/stream/usage",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/usage-analytics_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "filters": {
-          "description": "Filter expressions to apply to the query. Format: field==value. Multiple filters can be combined.\n",
-          "type": "string"
-        },
-        "limit": {
-          "default": 100,
-          "description": "Maximum number of data points to return. The actual number of results depends on the interaction between the time range (since/until) and time_delta granularity. Results are truncated to this limit without error if the time range produces more data points than the limit allows.\n",
-          "type": "integer"
-        },
-        "metrics": {
-          "description": "Comma-separated list of metrics to include in the response. Available metrics depend on the endpoint. Billing usage supports: streamMinutesViewed, rateLimitingRequestsAllowed, loadBalancingQueries, argoAcceleratedBytes, workersRequests, workersKVReads, imageResizingRequests, spectrumBytesTransferred, mediaUniqueTransformations. Stream/media usage supports: streamMinutesViewed.\n",
-          "type": "string"
-        },
-        "since": {
-          "description": "Start of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to 6 hours before the current time.\n",
-          "format": "date-time",
-          "type": "string"
-        },
-        "time_delta": {
-          "default": "hour",
-          "description": "Time unit to aggregate usage observations into. Data retention is approximately 18 months. The effective number of data points returned depends on the time range and granularity selected. For example, requesting hourly granularity over 18 months could produce up to ~13,000 data points; use the limit parameter to cap results and be aware that responses may be truncated.\n",
-          "enum": [
-            "hour",
-            "day",
-            "week",
-            "month",
-            "quarter",
-            "year"
-          ],
-          "type": "string"
-        },
-        "until": {
-          "description": "End of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to the current time.\n",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "filters": {
+              "description": "Filter expressions to apply to the query. Format: field==value. Multiple filters can be combined.",
+              "type": "string"
+            },
+            "limit": {
+              "default": 100,
+              "description": "Maximum number of data points to return. The actual number of results depends on the interaction between the time range (since/until) and time_delta granularity. Results are truncated to this limit without error if the time range produces more data points than the limit allows.",
+              "type": "integer"
+            },
+            "metrics": {
+              "description": "Comma-separated list of metrics to include in the response. Available metrics depend on the endpoint. Billing usage supports: streamMinutesViewed, rateLimitingRequestsAllowed, loadBalancingQueries, argoAcceleratedBytes, workersRequests, workersKVReads, imageResizingRequests, spectrumBytesTransferred, mediaUniqueTransformations. Stream/media usage supports: streamMinutesViewed.",
+              "type": "string"
+            },
+            "since": {
+              "description": "Start of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to 6 hours before the current time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "time_delta": {
+              "default": "hour",
+              "description": "Time unit to aggregate usage observations into. Data retention is approximately 18 months. The effective number of data points returned depends on the time range and granularity selected. For example, requesting hourly granularity over 18 months could produce up to ~13,000 data points; use the limit parameter to cap results and be aware that responses may be truncated.",
+              "enum": [
+                "hour",
+                "day",
+                "week",
+                "month",
+                "quarter",
+                "year"
+              ],
+              "type": "string"
+            },
+            "until": {
+              "description": "End of the time range for the query (inclusive). ISO 8601 timestamp. Defaults to the current time.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "usage-analytics_identifier": usage_analytics_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/usage-analytics_stream_usage_response",
       $defs: {
-        "usage-analytics_api_error": usage_analytics_api_error_output,
-        "usage-analytics_api_message": usage_analytics_api_message_output,
-        "usage-analytics_stream_usage_data_point": usage_analytics_stream_usage_data_point_output,
-        "usage-analytics_stream_usage_response": usage_analytics_stream_usage_response_output,
+        "usage-analytics_api_error": usage$$analytics_api_error,
+        "usage-analytics_api_message": usage$$analytics_api_message,
+        "usage-analytics_stream_usage_data_point": usage$$analytics_stream_usage_data_point,
+        "usage-analytics_stream_usage_response": usage$$analytics_stream_usage_response,
       },
     },
     annotations: {
@@ -118,22 +130,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "usage-analytics_api_error": usage_analytics_api_error_output,
-        "usage-analytics_api_message": usage_analytics_api_message_output,
-        "usage-analytics_error_response": usage_analytics_error_response_output,
-        "usage-analytics_stream_usage_data_point": usage_analytics_stream_usage_data_point_output,
-        "usage-analytics_stream_usage_response": usage_analytics_stream_usage_response_output,
+        "usage-analytics_api_error": usage$$analytics_api_error,
+        "usage-analytics_api_message": usage$$analytics_api_message,
+        "usage-analytics_error_response": usage$$analytics_error_response,
+        "usage-analytics_stream_usage_data_point": usage$$analytics_stream_usage_data_point,
+        "usage-analytics_stream_usage_response": usage$$analytics_stream_usage_response,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/stream/usage`,
       query: [
-        ["metrics", args["metrics"], true],
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["time_delta", args["time_delta"], true],
-        ["limit", args["limit"], true],
-        ["filters", args["filters"], true],
+        ["metrics", param(args, "query", "metrics"), true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["time_delta", param(args, "query", "time_delta"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["filters", param(args, "query", "filters"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/stream/videos/audioTracks/outputs.ts b/src/generated/forge-mcp/stream/videos/audioTracks/outputs.ts
index 627c6c4fc..d3f82d6fd 100644
--- a/src/generated/forge-mcp/stream/videos/audioTracks/outputs.ts
+++ b/src/generated/forge-mcp/stream/videos/audioTracks/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `stream_addAudioTrackResponse` in responses.
  */
-export const stream_addAudioTrackResponse_output: JsonSchema = {
+export const stream_addAudioTrackResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
@@ -25,54 +25,33 @@ export const stream_addAudioTrackResponse_output: JsonSchema = {
 /**
  * The schema of `stream_additionalAudio` in responses.
  */
-export const stream_additionalAudio_output: JsonSchema = {
+export const stream_additionalAudio: JsonSchema = {
   "properties": {
     "default": {
-      "$ref": "#/$defs/stream_audio_default"
+      "type": "boolean"
     },
     "label": {
-      "$ref": "#/$defs/stream_audio_label"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/stream_audio_state"
+      "enum": [
+        "queued",
+        "ready",
+        "error"
+      ],
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/stream_identifier"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_audio_default` in responses.
- */
-export const stream_audio_default_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_audio_label` in responses.
- */
-export const stream_audio_label_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_audio_state` in responses.
- */
-export const stream_audio_state_output: JsonSchema = {
-  "enum": [
-    "queued",
-    "ready",
-    "error"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `stream_listAudioTrackResponse` in responses.
  */
-export const stream_listAudioTrackResponse_output: JsonSchema = {
+export const stream_listAudioTrackResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
diff --git a/src/generated/forge-mcp/stream/videos/audioTracks/schemas.ts b/src/generated/forge-mcp/stream/videos/audioTracks/schemas.ts
index 3467de21d..e722824a3 100644
--- a/src/generated/forge-mcp/stream/videos/audioTracks/schemas.ts
+++ b/src/generated/forge-mcp/stream/videos/audioTracks/schemas.ts
@@ -3,38 +3,14 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `stream_audio_default`.
- */
-export const stream_audio_default: JsonSchema = {
-  "description": "Denotes whether the audio track will be played by default in a player.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_audio_identifier`.
- */
-export const stream_audio_identifier: JsonSchema = {
-  "description": "The unique identifier for an additional audio track.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_audio_label`.
- */
-export const stream_audio_label: JsonSchema = {
-  "description": "A string to uniquely identify the track amongst other audio track labels for the specified video.",
-  "type": "string"
-};
-
 /**
  * The schema of `stream_copyAudioTrack`.
  */
 export const stream_copyAudioTrack: JsonSchema = {
   "properties": {
     "label": {
-      "$ref": "#/$defs/stream_audio_label",
-      "description": "A string to uniquely identify the track amongst other audio track labels for the specified video."
+      "description": "A string to uniquely identify the track amongst other audio track labels for the specified video.",
+      "type": "string"
     },
     "url": {
       "description": "An audio track URL. The server must be publicly routable and support `HTTP HEAD` requests and `HTTP GET` range requests. The server should respond to `HTTP HEAD` requests with a `content-range` header that includes the size of the file.",
@@ -53,13 +29,13 @@ export const stream_copyAudioTrack: JsonSchema = {
 export const stream_editAudioTrack: JsonSchema = {
   "properties": {
     "default": {
-      "$ref": "#/$defs/stream_audio_default",
       "default": false,
-      "description": "Denotes whether the audio track will be played by default in a player."
+      "description": "Denotes whether the audio track will be played by default in a player.",
+      "type": "boolean"
     },
     "label": {
-      "$ref": "#/$defs/stream_audio_label",
-      "description": "A string to uniquely identify the track amongst other audio track labels for the specified video."
+      "description": "A string to uniquely identify the track amongst other audio track labels for the specified video.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/stream/videos/audioTracks/tools.ts b/src/generated/forge-mcp/stream/videos/audioTracks/tools.ts
index 0c26d3452..7fe59cedd 100644
--- a/src/generated/forge-mcp/stream/videos/audioTracks/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/audioTracks/tools.ts
@@ -3,77 +3,68 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_common_output,
-  stream_api_response_single_output,
-  stream_deleted_response_output,
-  stream_messages_output,
+  stream_api$$response$$common,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_deleted_response,
+  stream_messages,
 } from "../../outputs.js";
-import { stream_account_identifier } from "../../schemas.js";
-import { stream_identifier_output } from "../outputs.js";
-import { stream_identifier } from "../schemas.js";
 import {
-  stream_addAudioTrackResponse_output,
-  stream_additionalAudio_output,
-  stream_audio_default_output,
-  stream_audio_label_output,
-  stream_audio_state_output,
-  stream_listAudioTrackResponse_output,
+  stream_addAudioTrackResponse,
+  stream_additionalAudio,
+  stream_listAudioTrackResponse,
 } from "./outputs.js";
-import {
-  stream_audio_default,
-  stream_audio_identifier,
-  stream_audio_label,
-  stream_copyAudioTrack,
-  stream_editAudioTrack,
-} from "./schemas.js";
+import { stream_copyAudioTrack, stream_editAudioTrack } from "./schemas.js";
 
 /**
- * The tools of `stream.videos.audio_tracks`.
+ * The tools of `stream.videos.audioTracks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "stream_videos_audio_tracks_copy",
+    name: "stream_videos_audioTracks_copy",
     title: "Add audio tracks to a video",
-    description: "Adds an additional audio track to a video using the provided audio track URL.",
+    description: "Adds an additional audio track to a video using the provided audio track URL.\n\nPOST /accounts/{account_id}/stream/{identifier}/audio/copy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/stream_copyAudioTrack"
         },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_audio_label": stream_audio_label,
         "stream_copyAudioTrack": stream_copyAudioTrack,
-        "stream_identifier": stream_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_addAudioTrackResponse",
       $defs: {
-        "stream_addAudioTrackResponse": stream_addAudioTrackResponse_output,
-        "stream_additionalAudio": stream_additionalAudio_output,
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_audio_default": stream_audio_default_output,
-        "stream_audio_label": stream_audio_label_output,
-        "stream_audio_state": stream_audio_state_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_messages": stream_messages_output,
+        "stream_addAudioTrackResponse": stream_addAudioTrackResponse,
+        "stream_additionalAudio": stream_additionalAudio,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -95,15 +86,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_addAudioTrackResponse": stream_addAudioTrackResponse_output,
-        "stream_additionalAudio": stream_additionalAudio_output,
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_audio_default": stream_audio_default_output,
-        "stream_audio_label": stream_audio_label_output,
-        "stream_audio_state": stream_audio_state_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_messages": stream_messages_output,
+        "stream_addAudioTrackResponse": stream_addAudioTrackResponse,
+        "stream_additionalAudio": stream_additionalAudio,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -112,42 +99,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_videos_audio_tracks_delete",
+    name: "stream_videos_audioTracks_delete",
     title: "Delete additional audio tracks on a video",
-    description: "Deletes additional audio tracks on a video. Deleting a default audio track is not allowed. You must assign another audio track as default prior to deletion.\n\nConfirm with the user before calling this tool. Permanently delete this audio track?",
+    description: "Deletes additional audio tracks on a video. Deleting a default audio track is not allowed. You must assign another audio track as default prior to deletion.\n\nConfirm with the user before calling this tool. Permanently delete this audio track?\n\nDELETE /accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "audio_identifier": {
-          "$ref": "#/$defs/stream_audio_identifier",
-          "description": "The unique identifier for an additional audio track."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "audio_identifier": {
+              "description": "The unique identifier for an additional audio track.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier",
+            "audio_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
-        "audio_identifier"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_audio_identifier": stream_audio_identifier,
-        "stream_identifier": stream_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_deleted_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -174,9 +166,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -184,54 +176,55 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_videos_audio_tracks_edit",
+    name: "stream_videos_audioTracks_edit",
     title: "Edit additional audio tracks on a video",
-    description: "Edits additional audio tracks on a video. Editing the default status of an audio track to `true` will mark all other audio tracks on the video default status to `false`.",
+    description: "Edits additional audio tracks on a video. Editing the default status of an audio track to `true` will mark all other audio tracks on the video default status to `false`.\n\nPATCH /accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "audio_identifier": {
-          "$ref": "#/$defs/stream_audio_identifier",
-          "description": "The unique identifier for an additional audio track."
-        },
         "body": {
           "$ref": "#/$defs/stream_editAudioTrack"
         },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "audio_identifier": {
+              "description": "The unique identifier for an additional audio track.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier",
+            "audio_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
-        "audio_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_audio_default": stream_audio_default,
-        "stream_audio_identifier": stream_audio_identifier,
-        "stream_audio_label": stream_audio_label,
         "stream_editAudioTrack": stream_editAudioTrack,
-        "stream_identifier": stream_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_addAudioTrackResponse",
       $defs: {
-        "stream_addAudioTrackResponse": stream_addAudioTrackResponse_output,
-        "stream_additionalAudio": stream_additionalAudio_output,
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_audio_default": stream_audio_default_output,
-        "stream_audio_label": stream_audio_label_output,
-        "stream_audio_state": stream_audio_state_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_messages": stream_messages_output,
+        "stream_addAudioTrackResponse": stream_addAudioTrackResponse,
+        "stream_additionalAudio": stream_additionalAudio,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -258,15 +251,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_addAudioTrackResponse": stream_addAudioTrackResponse_output,
-        "stream_additionalAudio": stream_additionalAudio_output,
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_audio_default": stream_audio_default_output,
-        "stream_audio_label": stream_audio_label_output,
-        "stream_audio_state": stream_audio_state_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_messages": stream_messages_output,
+        "stream_addAudioTrackResponse": stream_addAudioTrackResponse,
+        "stream_additionalAudio": stream_additionalAudio,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -275,41 +264,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_videos_audio_tracks_list",
+    name: "stream_videos_audioTracks_list",
     title: "List additional audio tracks on a video",
-    description: "Lists additional audio tracks on a video. Note this API will not return information for audio attached to the video upload.",
+    description: "Lists additional audio tracks on a video. Note this API will not return information for audio attached to the video upload.\n\nGET /accounts/{account_id}/stream/{identifier}/audio",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_identifier": stream_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_listAudioTrackResponse",
       $defs: {
-        "stream_additionalAudio": stream_additionalAudio_output,
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_audio_default": stream_audio_default_output,
-        "stream_audio_label": stream_audio_label_output,
-        "stream_audio_state": stream_audio_state_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_listAudioTrackResponse": stream_listAudioTrackResponse_output,
-        "stream_messages": stream_messages_output,
+        "stream_additionalAudio": stream_additionalAudio,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_listAudioTrackResponse": stream_listAudioTrackResponse,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -337,15 +328,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_additionalAudio": stream_additionalAudio_output,
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_audio_default": stream_audio_default_output,
-        "stream_audio_label": stream_audio_label_output,
-        "stream_audio_state": stream_audio_state_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_listAudioTrackResponse": stream_listAudioTrackResponse_output,
-        "stream_messages": stream_messages_output,
+        "stream_additionalAudio": stream_additionalAudio,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_listAudioTrackResponse": stream_listAudioTrackResponse,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/videos/captions/language/outputs.ts b/src/generated/forge-mcp/stream/videos/captions/language/outputs.ts
index 372442a9e..bc71b0d11 100644
--- a/src/generated/forge-mcp/stream/videos/captions/language/outputs.ts
+++ b/src/generated/forge-mcp/stream/videos/captions/language/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `stream_language_response_single` in responses.
  */
-export const stream_language_response_single_output: JsonSchema = {
+export const stream_language_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
diff --git a/src/generated/forge-mcp/stream/videos/captions/language/tools.ts b/src/generated/forge-mcp/stream/videos/captions/language/tools.ts
index f7524df6e..45972fda2 100644
--- a/src/generated/forge-mcp/stream/videos/captions/language/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/captions/language/tools.ts
@@ -3,22 +3,13 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_common_output,
-  stream_api_response_single_output,
-  stream_messages_output,
+  stream_api$$response$$common,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_messages,
 } from "../../../outputs.js";
-import { stream_identifier_2 } from "../../../schemas.js";
-import { stream_identifier } from "../../schemas.js";
-import {
-  stream_caption_status_output,
-  stream_captions_output,
-  stream_generated_caption_output,
-  stream_label_output,
-  stream_language_output,
-} from "../outputs.js";
-import { stream_language } from "../schemas.js";
-import { stream_language_response_single_output } from "./outputs.js";
+import { stream_captions } from "../outputs.js";
+import { stream_language_response_single } from "./outputs.js";
 
 /**
  * The tools of `stream.videos.captions.language`.
@@ -27,33 +18,38 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_captions_language_delete",
     title: "Delete captions or subtitles",
-    description: "Removes the captions or subtitles from a video.\n\nConfirm with the user before calling this tool. Remove this caption?",
+    description: "Removes the captions or subtitles from a video.\n\nConfirm with the user before calling this tool. Remove this caption?\n\nDELETE /accounts/{account_id}/stream/{identifier}/captions/{language}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
-        },
-        "language": {
-          "$ref": "#/$defs/stream_language",
-          "description": "The language tag in BCP 47 format."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            },
+            "language": {
+              "description": "The language tag in BCP 47 format.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier",
+            "language"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
-        "language"
+        "path"
       ],
-      $defs: {
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-        "stream_language": stream_language,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -70,8 +66,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -110,9 +106,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -122,45 +118,46 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_captions_language_generate",
     title: "Generate captions or subtitles for a provided language via AI",
-    description: "Generate captions or subtitles for provided language via AI.",
+    description: "Generate captions or subtitles for provided language via AI.\n\nPOST /accounts/{account_id}/stream/{identifier}/captions/{language}/generate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
-        },
-        "language": {
-          "$ref": "#/$defs/stream_language",
-          "description": "The language tag in BCP 47 format."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            },
+            "language": {
+              "description": "The language tag in BCP 47 format.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier",
+            "language"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
-        "language"
+        "path"
       ],
-      $defs: {
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-        "stream_language": stream_language,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_language_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_caption_status": stream_caption_status_output,
-        "stream_captions": stream_captions_output,
-        "stream_generated_caption": stream_generated_caption_output,
-        "stream_label": stream_label_output,
-        "stream_language": stream_language_output,
-        "stream_language_response_single": stream_language_response_single_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_captions": stream_captions,
+        "stream_language_response_single": stream_language_response_single,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -182,15 +179,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_caption_status": stream_caption_status_output,
-        "stream_captions": stream_captions_output,
-        "stream_generated_caption": stream_generated_caption_output,
-        "stream_label": stream_label_output,
-        "stream_language": stream_language_output,
-        "stream_language_response_single": stream_language_response_single_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_captions": stream_captions,
+        "stream_language_response_single": stream_language_response_single,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -200,45 +193,46 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_captions_language_get",
     title: "List captions or subtitles for a provided language",
-    description: "Lists the captions or subtitles for provided language.",
+    description: "Lists the captions or subtitles for provided language.\n\nGET /accounts/{account_id}/stream/{identifier}/captions/{language}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
-        },
-        "language": {
-          "$ref": "#/$defs/stream_language",
-          "description": "The language tag in BCP 47 format."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            },
+            "language": {
+              "description": "The language tag in BCP 47 format.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier",
+            "language"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
-        "language"
+        "path"
       ],
-      $defs: {
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-        "stream_language": stream_language,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_language_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_caption_status": stream_caption_status_output,
-        "stream_captions": stream_captions_output,
-        "stream_generated_caption": stream_generated_caption_output,
-        "stream_label": stream_label_output,
-        "stream_language": stream_language_output,
-        "stream_language_response_single": stream_language_response_single_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_captions": stream_captions,
+        "stream_language_response_single": stream_language_response_single,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -266,15 +260,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_caption_status": stream_caption_status_output,
-        "stream_captions": stream_captions_output,
-        "stream_generated_caption": stream_generated_caption_output,
-        "stream_label": stream_label_output,
-        "stream_language": stream_language_output,
-        "stream_language_response_single": stream_language_response_single_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_captions": stream_captions,
+        "stream_language_response_single": stream_language_response_single,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/videos/captions/language/vtt/tools.ts b/src/generated/forge-mcp/stream/videos/captions/language/vtt/tools.ts
index fa95c6e1c..640162cd9 100644
--- a/src/generated/forge-mcp/stream/videos/captions/language/vtt/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/captions/language/vtt/tools.ts
@@ -3,12 +3,9 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_messages_output,
+  stream_api$$response$$common$$failure,
+  stream_messages,
 } from "../../../../outputs.js";
-import { stream_identifier_2 } from "../../../../schemas.js";
-import { stream_identifier } from "../../../schemas.js";
-import { stream_language } from "../../schemas.js";
 
 /**
  * The tools of `stream.videos.captions.language.vtt`.
@@ -17,33 +14,38 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_captions_language_vtt_get",
     title: "Return WebVTT captions for a provided language",
-    description: "Return WebVTT captions for a provided language.",
+    description: "Return WebVTT captions for a provided language.\n\nGET /accounts/{account_id}/stream/{identifier}/captions/{language}/vtt",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
-        },
-        "language": {
-          "$ref": "#/$defs/stream_language",
-          "description": "The language tag in BCP 47 format."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            },
+            "language": {
+              "description": "The language tag in BCP 47 format.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier",
+            "language"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
-        "language"
+        "path"
       ],
-      $defs: {
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-        "stream_language": stream_language,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -68,8 +70,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/videos/captions/outputs.ts b/src/generated/forge-mcp/stream/videos/captions/outputs.ts
index 98a88b9e0..4cdd7f153 100644
--- a/src/generated/forge-mcp/stream/videos/captions/outputs.ts
+++ b/src/generated/forge-mcp/stream/videos/captions/outputs.ts
@@ -3,64 +3,36 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `stream_caption_status` in responses.
- */
-export const stream_caption_status_output: JsonSchema = {
-  "enum": [
-    "ready",
-    "inprogress",
-    "error"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `stream_captions` in responses.
  */
-export const stream_captions_output: JsonSchema = {
+export const stream_captions: JsonSchema = {
   "properties": {
     "generated": {
-      "$ref": "#/$defs/stream_generated_caption"
+      "type": "boolean"
     },
     "label": {
-      "$ref": "#/$defs/stream_label"
+      "type": "string"
     },
     "language": {
-      "$ref": "#/$defs/stream_language"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/stream_caption_status"
+      "enum": [
+        "ready",
+        "inprogress",
+        "error"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_generated_caption` in responses.
- */
-export const stream_generated_caption_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_label` in responses.
- */
-export const stream_label_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_language` in responses.
- */
-export const stream_language_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_language_response_collection` in responses.
  */
-export const stream_language_response_collection_output: JsonSchema = {
+export const stream_language_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
diff --git a/src/generated/forge-mcp/stream/videos/captions/schemas.ts b/src/generated/forge-mcp/stream/videos/captions/schemas.ts
deleted file mode 100644
index 11ec0eff6..000000000
--- a/src/generated/forge-mcp/stream/videos/captions/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `stream_language`.
- */
-export const stream_language: JsonSchema = {
-  "description": "The language tag in BCP 47 format.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/stream/videos/captions/tools.ts b/src/generated/forge-mcp/stream/videos/captions/tools.ts
index 03ee72fcd..8aebf3cfa 100644
--- a/src/generated/forge-mcp/stream/videos/captions/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/captions/tools.ts
@@ -3,19 +3,13 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_common_output,
-  stream_messages_output,
+  stream_api$$response$$common,
+  stream_api$$response$$common$$failure,
+  stream_messages,
 } from "../../outputs.js";
-import { stream_identifier_2 } from "../../schemas.js";
-import { stream_identifier } from "../schemas.js";
 import {
-  stream_caption_status_output,
-  stream_captions_output,
-  stream_generated_caption_output,
-  stream_label_output,
-  stream_language_output,
-  stream_language_response_collection_output,
+  stream_captions,
+  stream_language_response_collection,
 } from "./outputs.js";
 
 /**
@@ -25,39 +19,41 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_captions_list",
     title: "List captions or subtitles",
-    description: "Lists the available captions or subtitles for a specific video.",
+    description: "Lists the available captions or subtitles for a specific video.\n\nGET /accounts/{account_id}/stream/{identifier}/captions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_language_response_collection",
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_caption_status": stream_caption_status_output,
-        "stream_captions": stream_captions_output,
-        "stream_generated_caption": stream_generated_caption_output,
-        "stream_label": stream_label_output,
-        "stream_language": stream_language_output,
-        "stream_language_response_collection": stream_language_response_collection_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_captions": stream_captions,
+        "stream_language_response_collection": stream_language_response_collection,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -85,15 +81,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_caption_status": stream_caption_status_output,
-        "stream_captions": stream_captions_output,
-        "stream_generated_caption": stream_generated_caption_output,
-        "stream_label": stream_label_output,
-        "stream_language": stream_language_output,
-        "stream_language_response_collection": stream_language_response_collection_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_captions": stream_captions,
+        "stream_language_response_collection": stream_language_response_collection,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/videos/directUpload/outputs.ts b/src/generated/forge-mcp/stream/videos/directUpload/outputs.ts
index 923500ef4..2ad922426 100644
--- a/src/generated/forge-mcp/stream/videos/directUpload/outputs.ts
+++ b/src/generated/forge-mcp/stream/videos/directUpload/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `stream_direct_upload_response` in responses.
  */
-export const stream_direct_upload_response_output: JsonSchema = {
+export const stream_direct_upload_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
@@ -16,10 +16,11 @@ export const stream_direct_upload_response_output: JsonSchema = {
         "result": {
           "properties": {
             "scheduledDeletion": {
-              "$ref": "#/$defs/stream_scheduledDeletion"
+              "format": "date-time",
+              "type": "string"
             },
             "uid": {
-              "$ref": "#/$defs/stream_identifier"
+              "type": "string"
             },
             "uploadURL": {
               "type": "string"
diff --git a/src/generated/forge-mcp/stream/videos/directUpload/schemas.ts b/src/generated/forge-mcp/stream/videos/directUpload/schemas.ts
index ab7b39ce9..7b3c38690 100644
--- a/src/generated/forge-mcp/stream/videos/directUpload/schemas.ts
+++ b/src/generated/forge-mcp/stream/videos/directUpload/schemas.ts
@@ -13,8 +13,8 @@ export const stream_direct_upload_request: JsonSchema = {
       "description": "Lists the origins allowed to display the video. Enter allowed origin domains in an array and use `*` for wildcard subdomains. Empty arrays allow the video to be viewed on any origin."
     },
     "creator": {
-      "$ref": "#/$defs/stream_creator",
-      "description": "A user-defined identifier for the media creator."
+      "description": "A user-defined identifier for the media creator.",
+      "type": "string"
     },
     "expiry": {
       "default": "Now + 30 minutes",
@@ -23,26 +23,27 @@ export const stream_direct_upload_request: JsonSchema = {
       "type": "string"
     },
     "maxDurationSeconds": {
-      "$ref": "#/$defs/stream_maxDurationSeconds",
-      "description": "The maximum duration in seconds for a video upload. Can be set for a video that is not yet uploaded to limit its duration. Uploads that exceed the specified duration will fail during processing. A value of `-1` means the value is unknown."
+      "description": "The maximum duration in seconds for a video upload. Can be set for a video that is not yet uploaded to limit its duration. Uploads that exceed the specified duration will fail during processing. A value of `-1` means the value is unknown.",
+      "type": "integer"
     },
     "meta": {
       "$ref": "#/$defs/stream_media_metadata",
       "description": "A user modifiable key-value store used to reference other systems of record for managing videos."
     },
     "requireSignedURLs": {
-      "$ref": "#/$defs/stream_requireSignedURLs",
       "default": false,
-      "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video."
+      "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video.",
+      "type": "boolean"
     },
     "scheduledDeletion": {
-      "$ref": "#/$defs/stream_scheduledDeletion",
-      "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time."
+      "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time.",
+      "format": "date-time",
+      "type": "string"
     },
     "thumbnailTimestampPct": {
-      "$ref": "#/$defs/stream_thumbnailTimestampPct",
       "default": 0,
-      "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video."
+      "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video.",
+      "type": "number"
     },
     "watermark": {
       "$ref": "#/$defs/stream_watermark_at_upload"
diff --git a/src/generated/forge-mcp/stream/videos/directUpload/tools.ts b/src/generated/forge-mcp/stream/videos/directUpload/tools.ts
index 6769511ac..06234e763 100644
--- a/src/generated/forge-mcp/stream/videos/directUpload/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/directUpload/tools.ts
@@ -1,101 +1,78 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_single_output,
-  stream_downloadedFrom_output,
-  stream_height_output,
-  stream_messages_output,
-  stream_name_output,
-  stream_opacity_output,
-  stream_padding_output,
-  stream_position_output,
-  stream_scale_output,
-  stream_watermark_created_output,
-  stream_watermark_identifier_output,
-  stream_watermark_size_output,
-  stream_watermarks_output,
-  stream_width_output,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_messages,
+  stream_watermarks,
 } from "../../outputs.js";
-import { stream_account_identifier, stream_creator } from "../../schemas.js";
-import {
-  stream_identifier_output,
-  stream_scheduledDeletion_output,
-} from "../outputs.js";
 import {
   stream_allowedOrigins,
-  stream_maxDurationSeconds,
   stream_media_metadata,
-  stream_requireSignedURLs,
-  stream_scheduledDeletion,
-  stream_thumbnailTimestampPct,
   stream_watermark_at_upload,
 } from "../schemas.js";
-import { stream_direct_upload_response_output } from "./outputs.js";
+import { stream_direct_upload_response } from "./outputs.js";
 import { stream_direct_upload_request } from "./schemas.js";
 
 /**
- * The tools of `stream.videos.direct_upload`.
+ * The tools of `stream.videos.directUpload`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "stream_videos_direct_upload_create",
+    name: "stream_videos_directUpload_create",
     title: "Upload videos via direct upload URLs",
-    description: "Creates a direct upload endpoint that allows an end-user to upload a video without an API key.",
+    description: "Creates a direct upload endpoint that allows an end-user to upload a video without an API key.\n\nPOST /accounts/{account_id}/stream/direct_upload",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/stream_direct_upload_request"
         },
-        "upload_creator": {
-          "$ref": "#/$defs/stream_creator",
-          "description": "A user-defined identifier for the media creator."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Upload-Creator": {
+              "description": "A user-defined identifier for the media creator.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_account_identifier": stream_account_identifier,
         "stream_allowedOrigins": stream_allowedOrigins,
-        "stream_creator": stream_creator,
         "stream_direct_upload_request": stream_direct_upload_request,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds,
         "stream_media_metadata": stream_media_metadata,
-        "stream_requireSignedURLs": stream_requireSignedURLs,
-        "stream_scheduledDeletion": stream_scheduledDeletion,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct,
         "stream_watermark_at_upload": stream_watermark_at_upload,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_direct_upload_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_direct_upload_response": stream_direct_upload_response_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_messages": stream_messages_output,
-        "stream_name": stream_name_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_position": stream_position_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_direct_upload_response": stream_direct_upload_response,
+        "stream_messages": stream_messages,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -122,30 +99,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_direct_upload_response": stream_direct_upload_response_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_messages": stream_messages_output,
-        "stream_name": stream_name_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_position": stream_position_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_direct_upload_response": stream_direct_upload_response,
+        "stream_messages": stream_messages,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/stream/direct_upload`,
       headers: [
-        ["Upload-Creator", args["upload_creator"]],
+        ["Upload-Creator", param(args, "headers", "Upload-Creator")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/stream/videos/downloads/schemas.ts b/src/generated/forge-mcp/stream/videos/downloads/schemas.ts
deleted file mode 100644
index ce0afac29..000000000
--- a/src/generated/forge-mcp/stream/videos/downloads/schemas.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `stream_download_type`.
- */
-export const stream_download_type: JsonSchema = {
-  "description": "The type of downloads available are: `default`, `audio`.",
-  "enum": [
-    "default",
-    "audio"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/stream/videos/downloads/tools.ts b/src/generated/forge-mcp/stream/videos/downloads/tools.ts
index 9c6fcc1fe..a89c18742 100644
--- a/src/generated/forge-mcp/stream/videos/downloads/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/downloads/tools.ts
@@ -3,21 +3,12 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_single_output,
-  stream_deleted_response_output,
-  stream_messages_output,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_deleted_response,
+  stream_messages,
 } from "../../outputs.js";
-import { stream_identifier_2 } from "../../schemas.js";
-import {
-  stream_download_percent_complete_output,
-  stream_download_status_output,
-  stream_download_url_output,
-  stream_downloads_output,
-  stream_downloads_response_output,
-} from "../outputs.js";
-import { stream_identifier } from "../schemas.js";
-import { stream_download_type } from "./schemas.js";
+import { stream_downloads, stream_downloads_response } from "../outputs.js";
 
 /**
  * The tools of `stream.videos.downloads`.
@@ -26,45 +17,51 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_downloads_create",
     title: "Create download",
-    description: "Creates a download for a video of specified type. For backwards-compatibility, POST requests to /downloads will enable the default download.",
+    description: "Creates a download for a video of specified type. For backwards-compatibility, POST requests to /downloads will enable the default download.\n\nPOST /accounts/{account_id}/stream/{identifier}/downloads/{download_type}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "download_type": {
-          "$ref": "#/$defs/stream_download_type",
-          "default": "default",
-          "description": "The type of downloads available are: `default`, `audio`."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "download_type": {
+              "default": "default",
+              "description": "The type of downloads available are: `default`, `audio`.",
+              "enum": [
+                "default",
+                "audio"
+              ],
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier",
+            "download_type"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
-        "download_type"
+        "path"
       ],
-      $defs: {
-        "stream_download_type": stream_download_type,
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_downloads_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_download_percent_complete": stream_download_percent_complete_output,
-        "stream_download_status": stream_download_status_output,
-        "stream_download_url": stream_download_url_output,
-        "stream_downloads": stream_downloads_output,
-        "stream_downloads_response": stream_downloads_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_downloads": stream_downloads,
+        "stream_downloads_response": stream_downloads_response,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -86,14 +83,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_download_percent_complete": stream_download_percent_complete_output,
-        "stream_download_status": stream_download_status_output,
-        "stream_download_url": stream_download_url_output,
-        "stream_downloads": stream_downloads_output,
-        "stream_downloads_response": stream_downloads_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_downloads": stream_downloads,
+        "stream_downloads_response": stream_downloads_response,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -103,41 +97,50 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_downloads_delete",
     title: "Delete download",
-    description: "Delete specific type of download. For backwards-compatibility, DELETE requests to /downloads will delete the default download.\n\nConfirm with the user before calling this tool. Remove this download? It will need to be regenerated for future use.",
+    description: "Delete specific type of download. For backwards-compatibility, DELETE requests to /downloads will delete the default download.\n\nConfirm with the user before calling this tool. Remove this download? It will need to be regenerated for future use.\n\nDELETE /accounts/{account_id}/stream/{identifier}/downloads/{download_type}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "download_type": {
-          "$ref": "#/$defs/stream_download_type",
-          "default": "default",
-          "description": "The type of downloads available are: `default`, `audio`."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "download_type": {
+              "default": "default",
+              "description": "The type of downloads available are: `default`, `audio`.",
+              "enum": [
+                "default",
+                "audio"
+              ],
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier",
+            "download_type"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
-        "download_type"
+        "path"
       ],
-      $defs: {
-        "stream_download_type": stream_download_type,
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_deleted_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -164,10 +167,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/videos/downloadsDefault/tools.ts b/src/generated/forge-mcp/stream/videos/downloadsDefault/tools.ts
index 43c0ee1ad..a34d5c624 100644
--- a/src/generated/forge-mcp/stream/videos/downloadsDefault/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/downloadsDefault/tools.ts
@@ -3,60 +3,55 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_single_output,
-  stream_deleted_response_output,
-  stream_messages_output,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_deleted_response,
+  stream_messages,
 } from "../../outputs.js";
-import { stream_identifier_2 } from "../../schemas.js";
-import {
-  stream_download_percent_complete_output,
-  stream_download_status_output,
-  stream_download_url_output,
-  stream_downloads_output,
-  stream_downloads_response_output,
-} from "../outputs.js";
-import { stream_identifier } from "../schemas.js";
+import { stream_downloads, stream_downloads_response } from "../outputs.js";
 
 /**
- * The tools of `stream.videos.downloads_default`.
+ * The tools of `stream.videos.downloadsDefault`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "stream_videos_downloads_default_create",
+    name: "stream_videos_downloadsDefault_create",
     title: "Create downloads",
-    description: "Creates a download for a video when a video is ready to view. Use `/downloads/{download_type}` instead for type-specific downloads. Available types are `default` and `audio`.\n\nThis method is deprecated.",
+    description: "Creates a download for a video when a video is ready to view. Use `/downloads/{download_type}` instead for type-specific downloads. Available types are `default` and `audio`.\n\nThis method is deprecated.\n\nPOST /accounts/{account_id}/stream/{identifier}/downloads",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_downloads_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_download_percent_complete": stream_download_percent_complete_output,
-        "stream_download_status": stream_download_status_output,
-        "stream_download_url": stream_download_url_output,
-        "stream_downloads": stream_downloads_output,
-        "stream_downloads_response": stream_downloads_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_downloads": stream_downloads,
+        "stream_downloads_response": stream_downloads_response,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -78,14 +73,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_download_percent_complete": stream_download_percent_complete_output,
-        "stream_download_status": stream_download_status_output,
-        "stream_download_url": stream_download_url_output,
-        "stream_downloads": stream_downloads_output,
-        "stream_downloads_response": stream_downloads_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_downloads": stream_downloads,
+        "stream_downloads_response": stream_downloads_response,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -93,36 +85,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_videos_downloads_default_delete",
+    name: "stream_videos_downloadsDefault_delete",
     title: "Delete downloads",
-    description: "Delete the downloads for a video. Use `/downloads/{download_type}` instead for type-specific downloads. Available types are `default` and `audio`.\n\nThis method is deprecated.\n\nConfirm with the user before calling this tool. Remove this default download? It will need to be regenerated for future use.",
+    description: "Delete the downloads for a video. Use `/downloads/{download_type}` instead for type-specific downloads. Available types are `default` and `audio`.\n\nThis method is deprecated.\n\nConfirm with the user before calling this tool. Remove this default download? It will need to be regenerated for future use.\n\nDELETE /accounts/{account_id}/stream/{identifier}/downloads",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_deleted_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -149,10 +147,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -160,40 +158,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "stream_videos_downloads_default_list",
+    name: "stream_videos_downloadsDefault_list",
     title: "List downloads",
-    description: "Lists the downloads created for a video.\n\nThis method is deprecated.",
+    description: "Lists the downloads created for a video.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/stream/{identifier}/downloads",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_identifier-2",
-          "description": "Identifier."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_identifier": stream_identifier,
-        "stream_identifier-2": stream_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_downloads_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_download_percent_complete": stream_download_percent_complete_output,
-        "stream_download_status": stream_download_status_output,
-        "stream_download_url": stream_download_url_output,
-        "stream_downloads": stream_downloads_output,
-        "stream_downloads_response": stream_downloads_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_downloads": stream_downloads,
+        "stream_downloads_response": stream_downloads_response,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -221,14 +222,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_download_percent_complete": stream_download_percent_complete_output,
-        "stream_download_status": stream_download_status_output,
-        "stream_download_url": stream_download_url_output,
-        "stream_downloads": stream_downloads_output,
-        "stream_downloads_response": stream_downloads_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_downloads": stream_downloads,
+        "stream_downloads_response": stream_downloads_response,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/videos/outputs.ts b/src/generated/forge-mcp/stream/videos/outputs.ts
index 9357fb2b7..45d8b23f4 100644
--- a/src/generated/forge-mcp/stream/videos/outputs.ts
+++ b/src/generated/forge-mcp/stream/videos/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `stream_allowedOrigins` in responses.
  */
-export const stream_allowedOrigins_output: JsonSchema = {
+export const stream_allowedOrigins: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -16,7 +16,7 @@ export const stream_allowedOrigins_output: JsonSchema = {
 /**
  * The schema of `stream_clipResponseSingle` in responses.
  */
-export const stream_clipResponseSingle_output: JsonSchema = {
+export const stream_clipResponseSingle: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
@@ -32,53 +32,24 @@ export const stream_clipResponseSingle_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `stream_created` in responses.
- */
-export const stream_created_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_download_percent_complete` in responses.
- */
-export const stream_download_percent_complete_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `stream_download_status` in responses.
- */
-export const stream_download_status_output: JsonSchema = {
-  "enum": [
-    "ready",
-    "inprogress",
-    "error"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `stream_download_url` in responses.
- */
-export const stream_download_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_downloads` in responses.
  */
-export const stream_downloads_output: JsonSchema = {
+export const stream_downloads: JsonSchema = {
   "properties": {
     "percentComplete": {
-      "$ref": "#/$defs/stream_download_percent_complete"
+      "type": "number"
     },
     "status": {
-      "$ref": "#/$defs/stream_download_status"
+      "enum": [
+        "ready",
+        "inprogress",
+        "error"
+      ],
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/stream_download_url"
+      "type": "string"
     }
   },
   "required": [
@@ -91,7 +62,7 @@ export const stream_downloads_output: JsonSchema = {
 /**
  * The schema of `stream_downloads_response` in responses.
  */
-export const stream_downloads_response_output: JsonSchema = {
+export const stream_downloads_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
@@ -115,38 +86,10 @@ export const stream_downloads_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `stream_duration` in responses.
- */
-export const stream_duration_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `stream_errorReasonCode` in responses.
- */
-export const stream_errorReasonCode_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_errorReasonText` in responses.
- */
-export const stream_errorReasonText_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_identifier` in responses.
- */
-export const stream_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_input` in responses.
  */
-export const stream_input_output: JsonSchema = {
+export const stream_input: JsonSchema = {
   "properties": {
     "height": {
       "type": "integer"
@@ -158,91 +101,47 @@ export const stream_input_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_liveInput` in responses.
- */
-export const stream_liveInput_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_maxDurationSeconds` in responses.
- */
-export const stream_maxDurationSeconds_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `stream_media_metadata` in responses.
  */
-export const stream_media_metadata_output: JsonSchema = {
+export const stream_media_metadata: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_media_state` in responses.
- */
-export const stream_media_state_output: JsonSchema = {
-  "enum": [
-    "pendingupload",
-    "downloading",
-    "queued",
-    "inprogress",
-    "ready",
-    "error",
-    "live-inprogress"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `stream_media_status` in responses.
  */
-export const stream_media_status_output: JsonSchema = {
+export const stream_media_status: JsonSchema = {
   "properties": {
     "errorReasonCode": {
-      "$ref": "#/$defs/stream_errorReasonCode"
+      "type": "string"
     },
     "errorReasonText": {
-      "$ref": "#/$defs/stream_errorReasonText"
+      "type": "string"
     },
     "pctComplete": {
-      "$ref": "#/$defs/stream_pctComplete"
+      "type": "string"
     },
     "state": {
-      "$ref": "#/$defs/stream_media_state"
+      "enum": [
+        "pendingupload",
+        "downloading",
+        "queued",
+        "inprogress",
+        "ready",
+        "error",
+        "live-inprogress"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `stream_modified` in responses.
- */
-export const stream_modified_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_oneTimeUploadExpiry` in responses.
- */
-export const stream_oneTimeUploadExpiry_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_pctComplete` in responses.
- */
-export const stream_pctComplete_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `stream_playback` in responses.
  */
-export const stream_playback_output: JsonSchema = {
+export const stream_playback: JsonSchema = {
   "properties": {
     "dash": {
       "type": "string"
@@ -254,76 +153,10 @@ export const stream_playback_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_preview` in responses.
- */
-export const stream_preview_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_readyToStream` in responses.
- */
-export const stream_readyToStream_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_readyToStreamAt` in responses.
- */
-export const stream_readyToStreamAt_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_requireSignedURLs` in responses.
- */
-export const stream_requireSignedURLs_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_scheduledDeletion` in responses.
- */
-export const stream_scheduledDeletion_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_size` in responses.
- */
-export const stream_size_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `stream_thumbnailTimestampPct` in responses.
- */
-export const stream_thumbnailTimestampPct_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `stream_thumbnail_url` in responses.
- */
-export const stream_thumbnail_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `stream_uploaded` in responses.
- */
-export const stream_uploaded_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `stream_video_response_collection` in responses.
  */
-export const stream_video_response_collection_output: JsonSchema = {
+export const stream_video_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
@@ -356,7 +189,7 @@ export const stream_video_response_collection_output: JsonSchema = {
 /**
  * The schema of `stream_video_response_single` in responses.
  */
-export const stream_video_response_single_output: JsonSchema = {
+export const stream_video_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
@@ -375,7 +208,7 @@ export const stream_video_response_single_output: JsonSchema = {
 /**
  * The schema of `stream_videos` in responses.
  */
-export const stream_videos_output: JsonSchema = {
+export const stream_videos: JsonSchema = {
   "properties": {
     "allowedOrigins": {
       "$ref": "#/$defs/stream_allowedOrigins"
@@ -384,22 +217,23 @@ export const stream_videos_output: JsonSchema = {
       "type": "string"
     },
     "created": {
-      "$ref": "#/$defs/stream_created"
+      "format": "date-time",
+      "type": "string"
     },
     "creator": {
-      "$ref": "#/$defs/stream_creator"
+      "type": "string"
     },
     "duration": {
-      "$ref": "#/$defs/stream_duration"
+      "type": "number"
     },
     "input": {
       "$ref": "#/$defs/stream_input"
     },
     "liveInput": {
-      "$ref": "#/$defs/stream_liveInput"
+      "type": "string"
     },
     "maxDurationSeconds": {
-      "$ref": "#/$defs/stream_maxDurationSeconds"
+      "type": "integer"
     },
     "maxSizeBytes": {
       "type": "integer"
@@ -408,13 +242,14 @@ export const stream_videos_output: JsonSchema = {
       "$ref": "#/$defs/stream_media_metadata"
     },
     "modified": {
-      "$ref": "#/$defs/stream_modified"
+      "format": "date-time",
+      "type": "string"
     },
     "playback": {
       "$ref": "#/$defs/stream_playback"
     },
     "preview": {
-      "$ref": "#/$defs/stream_preview"
+      "type": "string"
     },
     "publicDetails": {
       "properties": {
@@ -465,37 +300,41 @@ export const stream_videos_output: JsonSchema = {
       "type": "object"
     },
     "readyToStream": {
-      "$ref": "#/$defs/stream_readyToStream"
+      "type": "boolean"
     },
     "readyToStreamAt": {
-      "$ref": "#/$defs/stream_readyToStreamAt"
+      "format": "date-time",
+      "type": "string"
     },
     "requireSignedURLs": {
-      "$ref": "#/$defs/stream_requireSignedURLs"
+      "type": "boolean"
     },
     "scheduledDeletion": {
-      "$ref": "#/$defs/stream_scheduledDeletion"
+      "format": "date-time",
+      "type": "string"
     },
     "size": {
-      "$ref": "#/$defs/stream_size"
+      "type": "number"
     },
     "status": {
       "$ref": "#/$defs/stream_media_status"
     },
     "thumbnail": {
-      "$ref": "#/$defs/stream_thumbnail_url"
+      "type": "string"
     },
     "thumbnailTimestampPct": {
-      "$ref": "#/$defs/stream_thumbnailTimestampPct"
+      "type": "number"
     },
     "uid": {
-      "$ref": "#/$defs/stream_identifier"
+      "type": "string"
     },
     "uploadExpiry": {
-      "$ref": "#/$defs/stream_oneTimeUploadExpiry"
+      "format": "date-time",
+      "type": "string"
     },
     "uploaded": {
-      "$ref": "#/$defs/stream_uploaded"
+      "format": "date-time",
+      "type": "string"
     },
     "watermark": {
       "$ref": "#/$defs/stream_watermarks"
diff --git a/src/generated/forge-mcp/stream/videos/schemas.ts b/src/generated/forge-mcp/stream/videos/schemas.ts
index 330cfc797..78b5796de 100644
--- a/src/generated/forge-mcp/stream/videos/schemas.ts
+++ b/src/generated/forge-mcp/stream/videos/schemas.ts
@@ -14,63 +14,6 @@ export const stream_allowedOrigins: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `stream_asc`.
- */
-export const stream_asc: JsonSchema = {
-  "description": "Lists videos in ascending order of creation.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_clipped_from_video_uid`.
- */
-export const stream_clipped_from_video_uid: JsonSchema = {
-  "description": "The unique video identifier (UID).",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_direct_user`.
- */
-export const stream_direct_user: JsonSchema = {
-  "description": "Provisions a URL to let your end users upload videos directly to Cloudflare Stream without exposing your API token to clients.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_end`.
- */
-export const stream_end: JsonSchema = {
-  "description": "Lists videos created before the specified date.",
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_end_time_seconds`.
- */
-export const stream_end_time_seconds: JsonSchema = {
-  "description": "Specifies the end time for the video clip in seconds.",
-  "type": "integer"
-};
-
-/**
- * The schema of `stream_identifier`.
- */
-export const stream_identifier: JsonSchema = {
-  "description": "A Cloudflare-generated unique identifier for a media item.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_maxDurationSeconds`.
- */
-export const stream_maxDurationSeconds: JsonSchema = {
-  "description": "The maximum duration in seconds for a video upload. Can be set for a video that is not yet uploaded to limit its duration. Uploads that exceed the specified duration will fail during processing. A value of `-1` means the value is unknown.",
-  "type": "integer"
-};
-
 /**
  * The schema of `stream_media_metadata`.
  */
@@ -79,117 +22,6 @@ export const stream_media_metadata: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_media_state`.
- */
-export const stream_media_state: JsonSchema = {
-  "description": "Specifies the processing status for all quality levels for a video.",
-  "enum": [
-    "pendingupload",
-    "downloading",
-    "queued",
-    "inprogress",
-    "ready",
-    "error",
-    "live-inprogress"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `stream_oneTimeUploadExpiry`.
- */
-export const stream_oneTimeUploadExpiry: JsonSchema = {
-  "description": "The date and time when the video upload URL is no longer valid for direct user uploads.",
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_requireSignedURLs`.
- */
-export const stream_requireSignedURLs: JsonSchema = {
-  "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `stream_scheduledDeletion`.
- */
-export const stream_scheduledDeletion: JsonSchema = {
-  "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time.",
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_search`.
- */
-export const stream_search: JsonSchema = {
-  "description": "Provides a partial word match of the `name` key in the `meta` field. Slow for medium to large video libraries. May be unavailable for very large libraries.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_start`.
- */
-export const stream_start: JsonSchema = {
-  "description": "Lists videos created after the specified date.",
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_start_time_seconds`.
- */
-export const stream_start_time_seconds: JsonSchema = {
-  "description": "Specifies the start time for the video clip in seconds.",
-  "type": "integer"
-};
-
-/**
- * The schema of `stream_thumbnailTimestampPct`.
- */
-export const stream_thumbnailTimestampPct: JsonSchema = {
-  "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video.",
-  "type": "number"
-};
-
-/**
- * The schema of `stream_tus_resumable`.
- */
-export const stream_tus_resumable: JsonSchema = {
-  "description": "Specifies the TUS protocol version. This value must be included in every upload request.\nNotes: The only supported version of TUS protocol is 1.0.0.",
-  "enum": [
-    "1.0.0"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `stream_type`.
- */
-export const stream_type: JsonSchema = {
-  "description": "Specifies whether the video is `vod` or `live`.",
-  "type": "string"
-};
-
-/**
- * The schema of `stream_upload_length`.
- */
-export const stream_upload_length: JsonSchema = {
-  "description": "Indicates the size of the entire upload in bytes. The value must be a non-negative integer.",
-  "type": "integer"
-};
-
-/**
- * The schema of `stream_upload_metadata`.
- */
-export const stream_upload_metadata: JsonSchema = {
-  "description": "Comma-separated key-value pairs following the TUS protocol specification. Values are Base-64 encoded.\nSupported keys: `name`, `requiresignedurls`, `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`, `maxdurationseconds`.",
-  "type": "string"
-};
-
 /**
  * The schema of `stream_videoClipStandard`.
  */
@@ -200,16 +32,16 @@ export const stream_videoClipStandard: JsonSchema = {
       "description": "Lists the origins allowed to display the video. Enter allowed origin domains in an array and use `*` for wildcard subdomains. Empty arrays allow the video to be viewed on any origin."
     },
     "clippedFromVideoUID": {
-      "$ref": "#/$defs/stream_clipped_from_video_uid",
-      "description": "The unique video identifier (UID)."
+      "description": "The unique video identifier (UID).",
+      "type": "string"
     },
     "creator": {
-      "$ref": "#/$defs/stream_creator",
-      "description": "A user-defined identifier for the media creator."
+      "description": "A user-defined identifier for the media creator.",
+      "type": "string"
     },
     "endTimeSeconds": {
-      "$ref": "#/$defs/stream_end_time_seconds",
-      "description": "Specifies the end time for the video clip in seconds."
+      "description": "Specifies the end time for the video clip in seconds.",
+      "type": "integer"
     },
     "input": {
       "description": "A video's URL. Preferred over 'url'.",
@@ -224,22 +56,23 @@ export const stream_videoClipStandard: JsonSchema = {
       "type": "string"
     },
     "requireSignedURLs": {
-      "$ref": "#/$defs/stream_requireSignedURLs",
       "default": false,
-      "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video."
+      "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video.",
+      "type": "boolean"
     },
     "scheduledDeletion": {
-      "$ref": "#/$defs/stream_scheduledDeletion",
-      "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time."
+      "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time.",
+      "format": "date-time",
+      "type": "string"
     },
     "startTimeSeconds": {
-      "$ref": "#/$defs/stream_start_time_seconds",
-      "description": "Specifies the start time for the video clip in seconds."
+      "description": "Specifies the start time for the video clip in seconds.",
+      "type": "integer"
     },
     "thumbnailTimestampPct": {
-      "$ref": "#/$defs/stream_thumbnailTimestampPct",
       "default": 0,
-      "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video."
+      "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video.",
+      "type": "number"
     },
     "url": {
       "description": "A video's URL (legacy field, use 'input' instead).",
@@ -268,8 +101,8 @@ export const stream_video_copy_request: JsonSchema = {
       "description": "Lists the origins allowed to display the video. Enter allowed origin domains in an array and use `*` for wildcard subdomains. Empty arrays allow the video to be viewed on any origin."
     },
     "creator": {
-      "$ref": "#/$defs/stream_creator",
-      "description": "A user-defined identifier for the media creator."
+      "description": "A user-defined identifier for the media creator.",
+      "type": "string"
     },
     "input": {
       "description": "A video's URL. The server must be publicly routable and support `HTTP HEAD` requests and `HTTP GET` range requests. The server should respond to `HTTP HEAD` requests with a `content-range` header that includes the size of the file. This is the preferred field over `url`.",
@@ -284,18 +117,19 @@ export const stream_video_copy_request: JsonSchema = {
       "type": "string"
     },
     "requireSignedURLs": {
-      "$ref": "#/$defs/stream_requireSignedURLs",
       "default": false,
-      "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video."
+      "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video.",
+      "type": "boolean"
     },
     "scheduledDeletion": {
-      "$ref": "#/$defs/stream_scheduledDeletion",
-      "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time."
+      "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time.",
+      "format": "date-time",
+      "type": "string"
     },
     "thumbnailTimestampPct": {
-      "$ref": "#/$defs/stream_thumbnailTimestampPct",
       "default": 0,
-      "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video."
+      "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video.",
+      "type": "number"
     },
     "url": {
       "description": "A video's URL. The server must be publicly routable and support `HTTP HEAD` requests and `HTTP GET` range requests. The server should respond to `HTTP HEAD` requests with a `content-range` header that includes the size of the file. This field is deprecated in favor of `input`.",
@@ -308,14 +142,6 @@ export const stream_video_copy_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `stream_video_name`.
- */
-export const stream_video_name: JsonSchema = {
-  "description": "Provides a fast, exact string match on the `name` key in the `meta` field.",
-  "type": "string"
-};
-
 /**
  * The schema of `stream_video_update`.
  */
@@ -326,12 +152,12 @@ export const stream_video_update: JsonSchema = {
       "description": "Lists the origins allowed to display the video. Enter allowed origin domains in an array and use `*` for wildcard subdomains. Empty arrays allow the video to be viewed on any origin."
     },
     "creator": {
-      "$ref": "#/$defs/stream_creator",
-      "description": "A user-defined identifier for the media creator."
+      "description": "A user-defined identifier for the media creator.",
+      "type": "string"
     },
     "maxDurationSeconds": {
-      "$ref": "#/$defs/stream_maxDurationSeconds",
-      "description": "The maximum duration in seconds for a video upload. Can be set for a video that is not yet uploaded to limit its duration. Uploads that exceed the specified duration will fail during processing. A value of `-1` means the value is unknown."
+      "description": "The maximum duration in seconds for a video upload. Can be set for a video that is not yet uploaded to limit its duration. Uploads that exceed the specified duration will fail during processing. A value of `-1` means the value is unknown.",
+      "type": "integer"
     },
     "meta": {
       "$ref": "#/$defs/stream_media_metadata",
@@ -384,26 +210,28 @@ export const stream_video_update: JsonSchema = {
       "type": "object"
     },
     "requireSignedURLs": {
-      "$ref": "#/$defs/stream_requireSignedURLs",
       "default": false,
-      "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video."
+      "description": "Indicates whether the video can be a accessed using the UID. When set to `true`, a signed token must be generated with a signing key to view the video.",
+      "type": "boolean"
     },
     "scheduledDeletion": {
-      "$ref": "#/$defs/stream_scheduledDeletion",
-      "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time."
+      "description": "Indicates the date and time at which the video will be deleted. Omit the field to indicate no change, or include with a `null` value to remove an existing scheduled deletion. If specified, must be at least 30 days from upload time.",
+      "format": "date-time",
+      "type": "string"
     },
     "thumbnailTimestampPct": {
-      "$ref": "#/$defs/stream_thumbnailTimestampPct",
       "default": 0,
-      "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video."
+      "description": "The timestamp for a thumbnail image calculated as a percentage value of the video's duration. To convert from a second-wise timestamp to a percentage, divide the desired timestamp by the total duration of the video.  If this value is not set, the default thumbnail image is taken from 0s of the video.",
+      "type": "number"
     },
     "uid": {
       "description": "The unique identifier for the video. Can be used to verify the video being updated.",
       "type": "string"
     },
     "uploadExpiry": {
-      "$ref": "#/$defs/stream_oneTimeUploadExpiry",
-      "description": "The date and time when the video upload URL is no longer valid for direct user uploads."
+      "description": "The date and time when the video upload URL is no longer valid for direct user uploads.",
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/stream/videos/token/outputs.ts b/src/generated/forge-mcp/stream/videos/token/outputs.ts
index 246113ffe..db71db9c4 100644
--- a/src/generated/forge-mcp/stream/videos/token/outputs.ts
+++ b/src/generated/forge-mcp/stream/videos/token/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `stream_signed_token_response` in responses.
  */
-export const stream_signed_token_response_output: JsonSchema = {
+export const stream_signed_token_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
diff --git a/src/generated/forge-mcp/stream/videos/token/tools.ts b/src/generated/forge-mcp/stream/videos/token/tools.ts
index be6985aa6..c0225bf5d 100644
--- a/src/generated/forge-mcp/stream/videos/token/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/token/tools.ts
@@ -3,13 +3,11 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_single_output,
-  stream_messages_output,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_messages,
 } from "../../outputs.js";
-import { stream_account_identifier } from "../../schemas.js";
-import { stream_identifier } from "../schemas.js";
-import { stream_signed_token_response_output } from "./outputs.js";
+import { stream_signed_token_response } from "./outputs.js";
 import { stream_accessRules, stream_signed_token_request } from "./schemas.js";
 
 /**
@@ -19,40 +17,48 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_token_create",
     title: "Create signed URL tokens for videos",
-    description: "Creates a signed URL token for a video. If a body is not provided in the request, a token is created with default values.\n\nConfirm with the user before calling this tool. Provision temporary token? For use at scale, consider creating a signing key instead.",
+    description: "Creates a signed URL token for a video. If a body is not provided in the request, a token is created with default values.\n\nConfirm with the user before calling this tool. Provision temporary token? For use at scale, consider creating a signing key instead.\n\nPOST /accounts/{account_id}/stream/{identifier}/token",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/stream_signed_token_request"
         },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "stream_accessRules": stream_accessRules,
-        "stream_account_identifier": stream_account_identifier,
-        "stream_identifier": stream_identifier,
         "stream_signed_token_request": stream_signed_token_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_signed_token_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_signed_token_response": stream_signed_token_response_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_signed_token_response": stream_signed_token_response,
       },
     },
     annotations: {
@@ -74,10 +80,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_signed_token_response": stream_signed_token_response_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_signed_token_response": stream_signed_token_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/videos/tools.ts b/src/generated/forge-mcp/stream/videos/tools.ts
index f9aee331b..4b6c76571 100644
--- a/src/generated/forge-mcp/stream/videos/tools.ts
+++ b/src/generated/forge-mcp/stream/videos/tools.ts
@@ -1,87 +1,30 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_common_output,
-  stream_api_response_single_output,
-  stream_creator_output,
-  stream_downloadedFrom_output,
-  stream_height_output,
-  stream_messages_output,
-  stream_name_output,
-  stream_opacity_output,
-  stream_padding_output,
-  stream_position_output,
-  stream_scale_output,
-  stream_watermark_created_output,
-  stream_watermark_identifier_output,
-  stream_watermark_size_output,
-  stream_watermarks_output,
-  stream_width_output,
+  stream_api$$response$$common,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_messages,
+  stream_watermarks,
 } from "../outputs.js";
-import {
-  stream_account_identifier,
-  stream_creator,
-  stream_include_counts,
-} from "../schemas.js";
-import {
-  stream_allowedOrigins_output,
-  stream_clipResponseSingle_output,
-  stream_created_output,
-  stream_duration_output,
-  stream_errorReasonCode_output,
-  stream_errorReasonText_output,
-  stream_identifier_output,
-  stream_input_output,
-  stream_liveInput_output,
-  stream_maxDurationSeconds_output,
-  stream_media_metadata_output,
-  stream_media_state_output,
-  stream_media_status_output,
-  stream_modified_output,
-  stream_oneTimeUploadExpiry_output,
-  stream_pctComplete_output,
-  stream_playback_output,
-  stream_preview_output,
-  stream_readyToStreamAt_output,
-  stream_readyToStream_output,
-  stream_requireSignedURLs_output,
-  stream_scheduledDeletion_output,
-  stream_size_output,
-  stream_thumbnailTimestampPct_output,
-  stream_thumbnail_url_output,
-  stream_uploaded_output,
-  stream_video_response_collection_output,
-  stream_video_response_single_output,
-  stream_videos_output,
-} from "./outputs.js";
 import {
   stream_allowedOrigins,
-  stream_asc,
-  stream_clipped_from_video_uid,
-  stream_direct_user,
-  stream_end,
-  stream_end_time_seconds,
-  stream_identifier,
-  stream_maxDurationSeconds,
+  stream_clipResponseSingle,
+  stream_input,
   stream_media_metadata,
-  stream_media_state,
-  stream_oneTimeUploadExpiry,
-  stream_requireSignedURLs,
-  stream_scheduledDeletion,
-  stream_search,
-  stream_start,
-  stream_start_time_seconds,
-  stream_thumbnailTimestampPct,
-  stream_tus_resumable,
-  stream_type,
-  stream_upload_length,
-  stream_upload_metadata,
+  stream_media_status,
+  stream_playback,
+  stream_video_response_collection,
+  stream_video_response_single,
+  stream_videos,
+} from "./outputs.js";
+import {
+  stream_allowedOrigins as stream_allowedOrigins$,
+  stream_media_metadata as stream_media_metadata$,
   stream_videoClipStandard,
   stream_video_copy_request,
-  stream_video_name,
   stream_video_update,
   stream_watermarkAtUpload,
   stream_watermark_at_upload,
@@ -94,33 +37,35 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_clip",
     title: "Clip videos given a start and end time",
-    description: "Clips a video based on the specified start and end times provided in seconds.",
+    description: "Clips a video based on the specified start and end times provided in seconds.\n\nPOST /accounts/{account_id}/stream/clip",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/stream_videoClipStandard"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_allowedOrigins": stream_allowedOrigins,
-        "stream_clipped_from_video_uid": stream_clipped_from_video_uid,
-        "stream_creator": stream_creator,
-        "stream_end_time_seconds": stream_end_time_seconds,
-        "stream_media_metadata": stream_media_metadata,
-        "stream_requireSignedURLs": stream_requireSignedURLs,
-        "stream_scheduledDeletion": stream_scheduledDeletion,
-        "stream_start_time_seconds": stream_start_time_seconds,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct,
+        "stream_allowedOrigins": stream_allowedOrigins$,
+        "stream_media_metadata": stream_media_metadata$,
         "stream_videoClipStandard": stream_videoClipStandard,
         "stream_watermarkAtUpload": stream_watermarkAtUpload,
       },
@@ -128,48 +73,16 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/stream_clipResponseSingle",
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_clipResponseSingle": stream_clipResponseSingle_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_clipResponseSingle": stream_clipResponseSingle,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -196,49 +109,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_clipResponseSingle": stream_clipResponseSingle_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_clipResponseSingle": stream_clipResponseSingle,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
@@ -249,34 +130,45 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_copy",
     title: "Upload videos from a URL",
-    description: "Uploads a video to Stream from a provided URL.",
+    description: "Uploads a video to Stream from a provided URL.\n\nPOST /accounts/{account_id}/stream/copy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/stream_video_copy_request"
         },
-        "upload_creator": {
-          "$ref": "#/$defs/stream_creator",
-          "description": "A user-defined identifier for the media creator."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Upload-Creator": {
+              "description": "A user-defined identifier for the media creator.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_allowedOrigins": stream_allowedOrigins,
-        "stream_creator": stream_creator,
-        "stream_media_metadata": stream_media_metadata,
-        "stream_requireSignedURLs": stream_requireSignedURLs,
-        "stream_scheduledDeletion": stream_scheduledDeletion,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct,
+        "stream_allowedOrigins": stream_allowedOrigins$,
+        "stream_media_metadata": stream_media_metadata$,
         "stream_video_copy_request": stream_video_copy_request,
         "stream_watermark_at_upload": stream_watermark_at_upload,
       },
@@ -284,48 +176,16 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/stream_video_response_single",
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_video_response_single": stream_video_response_single_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_video_response_single": stream_video_response_single,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -352,55 +212,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_video_response_single": stream_video_response_single_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_video_response_single": stream_video_response_single,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/stream/copy`,
       headers: [
-        ["Upload-Creator", args["upload_creator"]],
+        ["Upload-Creator", param(args, "headers", "Upload-Creator")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -408,49 +236,69 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_create",
     title: "Initiate video uploads using TUS",
-    description: "Initiates a video upload using the TUS protocol. On success, the server responds with a status code 201 (created) and includes a `location` header to indicate where the content should be uploaded. Refer to https://tus.io for protocol details.",
+    description: "Initiates a video upload using the TUS protocol. On success, the server responds with a status code 201 (created) and includes a `location` header to indicate where the content should be uploaded. Refer to https://tus.io for protocol details.\n\nPOST /accounts/{account_id}/stream",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "direct_user": {
-          "$ref": "#/$defs/stream_direct_user",
-          "default": false,
-          "description": "Provisions a URL to let your end users upload videos directly to Cloudflare Stream without exposing your API token to clients."
-        },
-        "tus_resumable": {
-          "$ref": "#/$defs/stream_tus_resumable",
-          "description": "Specifies the TUS protocol version. This value must be included in every upload request.\nNotes: The only supported version of TUS protocol is 1.0.0."
-        },
-        "upload_creator": {
-          "$ref": "#/$defs/stream_creator",
-          "description": "A user-defined identifier for the media creator."
-        },
-        "upload_length": {
-          "$ref": "#/$defs/stream_upload_length",
-          "description": "Indicates the size of the entire upload in bytes. The value must be a non-negative integer."
-        },
-        "upload_metadata": {
-          "$ref": "#/$defs/stream_upload_metadata",
-          "description": "Comma-separated key-value pairs following the TUS protocol specification. Values are Base-64 encoded.\nSupported keys: `name`, `requiresignedurls`, `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`, `maxdurationseconds`."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "Tus-Resumable": {
+              "description": "Specifies the TUS protocol version. This value must be included in every upload request.\nNotes: The only supported version of TUS protocol is 1.0.0.",
+              "enum": [
+                "1.0.0"
+              ],
+              "type": "string"
+            },
+            "Upload-Creator": {
+              "description": "A user-defined identifier for the media creator.",
+              "type": "string"
+            },
+            "Upload-Length": {
+              "description": "Indicates the size of the entire upload in bytes. The value must be a non-negative integer.",
+              "type": "integer"
+            },
+            "Upload-Metadata": {
+              "description": "Comma-separated key-value pairs following the TUS protocol specification. Values are Base-64 encoded.\nSupported keys: `name`, `requiresignedurls`, `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`, `maxdurationseconds`.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "Tus-Resumable",
+            "Upload-Length"
+          ],
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direct_user": {
+              "default": false,
+              "description": "Provisions a URL to let your end users upload videos directly to Cloudflare Stream without exposing your API token to clients.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tus_resumable",
-        "upload_length"
+        "path",
+        "headers"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_creator": stream_creator,
-        "stream_direct_user": stream_direct_user,
-        "stream_tus_resumable": stream_tus_resumable,
-        "stream_upload_length": stream_upload_length,
-        "stream_upload_metadata": stream_upload_metadata,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -474,47 +322,53 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/stream`,
       query: [
-        ["direct_user", args["direct_user"], true],
+        ["direct_user", param(args, "query", "direct_user"), true],
       ],
       headers: [
-        ["Tus-Resumable", args["tus_resumable"]],
-        ["Upload-Creator", args["upload_creator"]],
-        ["Upload-Length", args["upload_length"]],
-        ["Upload-Metadata", args["upload_metadata"]],
+        ["Tus-Resumable", param(args, "headers", "Tus-Resumable")],
+        ["Upload-Creator", param(args, "headers", "Upload-Creator")],
+        ["Upload-Length", param(args, "headers", "Upload-Length")],
+        ["Upload-Metadata", param(args, "headers", "Upload-Metadata")],
       ],
     }),
   },
   {
     name: "stream_videos_delete",
     title: "Delete video",
-    description: "Deletes a video and its copies from Cloudflare Stream.\n\nConfirm with the user before calling this tool. Permanently delete this video?",
+    description: "Deletes a video and its copies from Cloudflare Stream.\n\nConfirm with the user before calling this tool. Permanently delete this video?\n\nDELETE /accounts/{account_id}/stream/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_identifier": stream_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -538,8 +392,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -549,86 +403,56 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_edit",
     title: "Edit video details",
-    description: "Edit details for a single video.",
+    description: "Edit details for a single video.\n\nPOST /accounts/{account_id}/stream/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/stream_video_update"
         },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_allowedOrigins": stream_allowedOrigins,
-        "stream_creator": stream_creator,
-        "stream_identifier": stream_identifier,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds,
-        "stream_media_metadata": stream_media_metadata,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry,
-        "stream_requireSignedURLs": stream_requireSignedURLs,
-        "stream_scheduledDeletion": stream_scheduledDeletion,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct,
+        "stream_allowedOrigins": stream_allowedOrigins$,
+        "stream_media_metadata": stream_media_metadata$,
         "stream_video_update": stream_video_update,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_video_response_single",
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_video_response_single": stream_video_response_single_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_video_response_single": stream_video_response_single,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -650,49 +474,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_video_response_single": stream_video_response_single_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_video_response_single": stream_video_response_single,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
@@ -703,27 +495,33 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_embed",
     title: "Deprecated: Retrieve legacy embed code HTML",
-    description: "Fetches the legacy HTML code snippet to embed a video in a web page delivered through Cloudflare. On success, returns an HTML fragment for use on web pages to display a video. On failure, returns a JSON response body.\n\nThis method is deprecated.",
+    description: "Fetches the legacy HTML code snippet to embed a video in a web page delivered through Cloudflare. On success, returns an HTML fragment for use on web pages to display a video. On failure, returns a JSON response body.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/stream/{identifier}/embed",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_identifier": stream_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -748,8 +546,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -759,73 +557,47 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_get",
     title: "Retrieve video details",
-    description: "Fetches details for a single video.",
+    description: "Fetches details for a single video.\n\nGET /accounts/{account_id}/stream/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_identifier",
-          "description": "A Cloudflare-generated unique identifier for a media item."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "A Cloudflare-generated unique identifier for a media item.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_identifier": stream_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_video_response_single",
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_video_response_single": stream_video_response_single_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_video_response_single": stream_video_response_single,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -853,49 +625,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_video_response_single": stream_video_response_single_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_video_response_single": stream_video_response_single,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
@@ -905,140 +645,123 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_videos_list",
     title: "List videos",
-    description: "Lists up to 1000 videos from a single request. For a specific range, refer to the optional parameters.",
+    description: "Lists up to 1000 videos from a single request. For a specific range, refer to the optional parameters.\n\nGET /accounts/{account_id}/stream",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "after": {
-          "description": "Alias for 'start'. Returns videos created after this date/time (RFC 3339 format).",
-          "format": "date-time",
-          "type": "string"
-        },
-        "asc": {
-          "$ref": "#/$defs/stream_asc",
-          "default": false,
-          "description": "Lists videos in ascending order of creation."
-        },
-        "before": {
-          "description": "Alias for 'end'. Returns videos created before this date/time (RFC 3339 format).",
-          "format": "date-time",
-          "type": "string"
-        },
-        "creator": {
-          "$ref": "#/$defs/stream_creator",
-          "description": "A user-defined identifier for the media creator."
-        },
-        "end": {
-          "$ref": "#/$defs/stream_end",
-          "description": "Lists videos created before the specified date."
-        },
-        "id": {
-          "description": "Filter by video ID(s). Can be a single ID or a comma-separated list of IDs.",
-          "type": "string"
-        },
-        "include_counts": {
-          "$ref": "#/$defs/stream_include_counts",
-          "default": false,
-          "description": "Includes the total number of videos associated with the submitted query parameters."
-        },
-        "limit": {
-          "description": "Maximum number of videos to return (default 1000, max 1000).",
-          "type": "integer"
-        },
-        "live_input_id": {
-          "description": "Filter by live input ID to find videos associated with a specific live stream.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Filter by video name/UID(s). Can be a single name or a comma-separated list.",
-          "type": "string"
-        },
-        "search": {
-          "$ref": "#/$defs/stream_search",
-          "description": "Provides a partial word match of the `name` key in the `meta` field. Slow for medium to large video libraries. May be unavailable for very large libraries."
-        },
-        "start": {
-          "$ref": "#/$defs/stream_start",
-          "description": "Lists videos created after the specified date."
-        },
-        "status": {
-          "$ref": "#/$defs/stream_media_state",
-          "description": "Specifies the processing status for all quality levels for a video."
-        },
-        "type": {
-          "$ref": "#/$defs/stream_type",
-          "description": "Specifies whether the video is `vod` or `live`."
-        },
-        "video_name": {
-          "$ref": "#/$defs/stream_video_name",
-          "description": "Provides a fast, exact string match on the `name` key in the `meta` field."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "after": {
+              "description": "Alias for 'start'. Returns videos created after this date/time (RFC 3339 format).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "asc": {
+              "default": false,
+              "description": "Lists videos in ascending order of creation.",
+              "type": "boolean"
+            },
+            "before": {
+              "description": "Alias for 'end'. Returns videos created before this date/time (RFC 3339 format).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "creator": {
+              "description": "A user-defined identifier for the media creator.",
+              "type": "string"
+            },
+            "end": {
+              "description": "Lists videos created before the specified date.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "id": {
+              "description": "Filter by video ID(s). Can be a single ID or a comma-separated list of IDs.",
+              "type": "string"
+            },
+            "include_counts": {
+              "default": false,
+              "description": "Includes the total number of videos associated with the submitted query parameters.",
+              "type": "boolean"
+            },
+            "limit": {
+              "description": "Maximum number of videos to return (default 1000, max 1000).",
+              "type": "integer"
+            },
+            "live_input_id": {
+              "description": "Filter by live input ID to find videos associated with a specific live stream.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by video name/UID(s). Can be a single name or a comma-separated list.",
+              "type": "string"
+            },
+            "search": {
+              "description": "Provides a partial word match of the `name` key in the `meta` field. Slow for medium to large video libraries. May be unavailable for very large libraries.",
+              "type": "string"
+            },
+            "start": {
+              "description": "Lists videos created after the specified date.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "status": {
+              "description": "Specifies the processing status for all quality levels for a video.",
+              "enum": [
+                "pendingupload",
+                "downloading",
+                "queued",
+                "inprogress",
+                "ready",
+                "error",
+                "live-inprogress"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "description": "Specifies whether the video is `vod` or `live`.",
+              "type": "string"
+            },
+            "video_name": {
+              "description": "Provides a fast, exact string match on the `name` key in the `meta` field.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_asc": stream_asc,
-        "stream_creator": stream_creator,
-        "stream_end": stream_end,
-        "stream_include_counts": stream_include_counts,
-        "stream_media_state": stream_media_state,
-        "stream_search": stream_search,
-        "stream_start": stream_start,
-        "stream_type": stream_type,
-        "stream_video_name": stream_video_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_video_response_collection",
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_video_response_collection": stream_video_response_collection_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_video_response_collection": stream_video_response_collection,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -1066,69 +789,37 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_allowedOrigins": stream_allowedOrigins_output,
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_created": stream_created_output,
-        "stream_creator": stream_creator_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_duration": stream_duration_output,
-        "stream_errorReasonCode": stream_errorReasonCode_output,
-        "stream_errorReasonText": stream_errorReasonText_output,
-        "stream_height": stream_height_output,
-        "stream_identifier": stream_identifier_output,
-        "stream_input": stream_input_output,
-        "stream_liveInput": stream_liveInput_output,
-        "stream_maxDurationSeconds": stream_maxDurationSeconds_output,
-        "stream_media_metadata": stream_media_metadata_output,
-        "stream_media_state": stream_media_state_output,
-        "stream_media_status": stream_media_status_output,
-        "stream_messages": stream_messages_output,
-        "stream_modified": stream_modified_output,
-        "stream_name": stream_name_output,
-        "stream_oneTimeUploadExpiry": stream_oneTimeUploadExpiry_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_pctComplete": stream_pctComplete_output,
-        "stream_playback": stream_playback_output,
-        "stream_position": stream_position_output,
-        "stream_preview": stream_preview_output,
-        "stream_readyToStream": stream_readyToStream_output,
-        "stream_readyToStreamAt": stream_readyToStreamAt_output,
-        "stream_requireSignedURLs": stream_requireSignedURLs_output,
-        "stream_scale": stream_scale_output,
-        "stream_scheduledDeletion": stream_scheduledDeletion_output,
-        "stream_size": stream_size_output,
-        "stream_thumbnailTimestampPct": stream_thumbnailTimestampPct_output,
-        "stream_thumbnail_url": stream_thumbnail_url_output,
-        "stream_uploaded": stream_uploaded_output,
-        "stream_video_response_collection": stream_video_response_collection_output,
-        "stream_videos": stream_videos_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_allowedOrigins": stream_allowedOrigins,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_input": stream_input,
+        "stream_media_metadata": stream_media_metadata,
+        "stream_media_status": stream_media_status,
+        "stream_messages": stream_messages,
+        "stream_playback": stream_playback,
+        "stream_video_response_collection": stream_video_response_collection,
+        "stream_videos": stream_videos,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/stream`,
       query: [
-        ["status", args["status"], true],
-        ["creator", args["creator"], true],
-        ["type", args["type"], true],
-        ["asc", args["asc"], true],
-        ["video_name", args["video_name"], true],
-        ["search", args["search"], true],
-        ["start", args["start"], true],
-        ["end", args["end"], true],
-        ["include_counts", args["include_counts"], true],
-        ["id", args["id"], true],
-        ["name", args["name"], true],
-        ["live_input_id", args["live_input_id"], true],
-        ["before", args["before"], true],
-        ["after", args["after"], true],
-        ["limit", args["limit"], true],
+        ["status", param(args, "query", "status"), true],
+        ["creator", param(args, "query", "creator"), true],
+        ["type", param(args, "query", "type"), true],
+        ["asc", param(args, "query", "asc"), true],
+        ["video_name", param(args, "query", "video_name"), true],
+        ["search", param(args, "query", "search"), true],
+        ["start", param(args, "query", "start"), true],
+        ["end", param(args, "query", "end"), true],
+        ["include_counts", param(args, "query", "include_counts"), true],
+        ["id", param(args, "query", "id"), true],
+        ["name", param(args, "query", "name"), true],
+        ["live_input_id", param(args, "query", "live_input_id"), true],
+        ["before", param(args, "query", "before"), true],
+        ["after", param(args, "query", "after"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/stream/watermarks/outputs.ts b/src/generated/forge-mcp/stream/watermarks/outputs.ts
index 40b35b167..fd9bc59cf 100644
--- a/src/generated/forge-mcp/stream/watermarks/outputs.ts
+++ b/src/generated/forge-mcp/stream/watermarks/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `stream_watermark_response_collection` in responses.
  */
-export const stream_watermark_response_collection_output: JsonSchema = {
+export const stream_watermark_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-common"
@@ -28,7 +28,7 @@ export const stream_watermark_response_collection_output: JsonSchema = {
 /**
  * The schema of `stream_watermark_response_single` in responses.
  */
-export const stream_watermark_response_single_output: JsonSchema = {
+export const stream_watermark_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
diff --git a/src/generated/forge-mcp/stream/watermarks/tools.ts b/src/generated/forge-mcp/stream/watermarks/tools.ts
index 625428687..46f69e525 100644
--- a/src/generated/forge-mcp/stream/watermarks/tools.ts
+++ b/src/generated/forge-mcp/stream/watermarks/tools.ts
@@ -3,35 +3,15 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_common_output,
-  stream_api_response_single_output,
-  stream_downloadedFrom_output,
-  stream_height_output,
-  stream_messages_output,
-  stream_name_output,
-  stream_opacity_output,
-  stream_padding_output,
-  stream_position_output,
-  stream_scale_output,
-  stream_watermark_created_output,
-  stream_watermark_identifier_output,
-  stream_watermark_size_output,
-  stream_watermarks_output,
-  stream_width_output,
+  stream_api$$response$$common,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_messages,
+  stream_watermarks,
 } from "../outputs.js";
 import {
-  stream_account_identifier,
-  stream_name,
-  stream_opacity,
-  stream_padding,
-  stream_position,
-  stream_scale,
-  stream_watermark_identifier,
-} from "../schemas.js";
-import {
-  stream_watermark_response_collection_output,
-  stream_watermark_response_single_output,
+  stream_watermark_response_collection,
+  stream_watermark_response_single,
 } from "./outputs.js";
 
 /**
@@ -41,40 +21,36 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_watermarks_create",
     title: "Create watermark profiles via basic upload",
-    description: "Creates watermark profiles using a single `HTTP POST multipart/form-data` request.",
+    description: "Creates watermark profiles using a single `HTTP POST multipart/form-data` request.\n\nPOST /accounts/{account_id}/stream/watermarks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/stream_name",
               "default": "",
-              "description": "A short description of the watermark profile."
+              "description": "A short description of the watermark profile.",
+              "type": "string"
             },
             "opacity": {
-              "$ref": "#/$defs/stream_opacity",
               "default": 1,
-              "description": "The translucency of the image. A value of `0.0` makes the image completely transparent, and `1.0` makes the image completely opaque. Note that if the image is already semi-transparent, setting this to `1.0` will not make the image completely opaque."
+              "description": "The translucency of the image. A value of `0.0` makes the image completely transparent, and `1.0` makes the image completely opaque. Note that if the image is already semi-transparent, setting this to `1.0` will not make the image completely opaque.",
+              "type": "number"
             },
             "padding": {
-              "$ref": "#/$defs/stream_padding",
               "default": 0.05,
-              "description": "The whitespace between the adjacent edges (determined by position) of the video and the image. `0.0` indicates no padding, and `1.0` indicates a fully padded video width or length, as determined by the algorithm."
+              "description": "The whitespace between the adjacent edges (determined by position) of the video and the image. `0.0` indicates no padding, and `1.0` indicates a fully padded video width or length, as determined by the algorithm.",
+              "type": "number"
             },
             "position": {
-              "$ref": "#/$defs/stream_position",
               "default": "upperRight",
-              "description": "The location of the image. Valid positions are: `upperRight`, `upperLeft`, `lowerLeft`, `lowerRight`, and `center`. Note that `center` ignores the `padding` parameter."
+              "description": "The location of the image. Valid positions are: `upperRight`, `upperLeft`, `lowerLeft`, `lowerRight`, and `center`. Note that `center` ignores the `padding` parameter.",
+              "type": "string"
             },
             "scale": {
-              "$ref": "#/$defs/stream_scale",
               "default": 0.15,
-              "description": "The size of the image relative to the overall size of the video. This parameter will adapt to horizontal and vertical videos automatically. `0.0` indicates no scaling (use the size of the image as-is), and `1.0 `fills the entire video."
+              "description": "The size of the image relative to the overall size of the video. This parameter will adapt to horizontal and vertical videos automatically. `0.0` indicates no scaling (use the size of the image as-is), and `1.0 `fills the entire video.",
+              "type": "number"
             },
             "url": {
               "description": "URL of the watermark image to copy.",
@@ -82,39 +58,34 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_name": stream_name,
-        "stream_opacity": stream_opacity,
-        "stream_padding": stream_padding,
-        "stream_position": stream_position,
-        "stream_scale": stream_scale,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_watermark_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_height": stream_height_output,
-        "stream_messages": stream_messages_output,
-        "stream_name": stream_name_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_position": stream_position_output,
-        "stream_scale": stream_scale_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_response_single": stream_watermark_response_single_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_watermark_response_single": stream_watermark_response_single,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -141,22 +112,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_height": stream_height_output,
-        "stream_messages": stream_messages_output,
-        "stream_name": stream_name_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_position": stream_position_output,
-        "stream_scale": stream_scale_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_response_single": stream_watermark_response_single_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_watermark_response_single": stream_watermark_response_single,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
@@ -167,27 +127,33 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_watermarks_delete",
     title: "Delete watermark profiles",
-    description: "Deletes a watermark profile.\n\nConfirm with the user before calling this tool. Remove this watermark profile? New upload requests referencing this profile will fail.",
+    description: "Deletes a watermark profile.\n\nConfirm with the user before calling this tool. Remove this watermark profile? New upload requests referencing this profile will fail.\n\nDELETE /accounts/{account_id}/stream/watermarks/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_watermark_identifier",
-          "description": "The unique identifier for a watermark profile."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "The unique identifier for a watermark profile.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_watermark_identifier": stream_watermark_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -204,8 +170,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -244,9 +210,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -256,46 +222,41 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_watermarks_get",
     title: "Watermark profile details",
-    description: "Retrieves details for a single watermark profile.",
+    description: "Retrieves details for a single watermark profile.\n\nGET /accounts/{account_id}/stream/watermarks/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
-        "identifier": {
-          "$ref": "#/$defs/stream_watermark_identifier",
-          "description": "The unique identifier for a watermark profile."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "The unique identifier for a watermark profile.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-        "stream_watermark_identifier": stream_watermark_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_watermark_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_height": stream_height_output,
-        "stream_messages": stream_messages_output,
-        "stream_name": stream_name_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_position": stream_position_output,
-        "stream_scale": stream_scale_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_response_single": stream_watermark_response_single_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_watermark_response_single": stream_watermark_response_single,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -323,22 +284,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_height": stream_height_output,
-        "stream_messages": stream_messages_output,
-        "stream_name": stream_name_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_position": stream_position_output,
-        "stream_scale": stream_scale_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_response_single": stream_watermark_response_single_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_watermark_response_single": stream_watermark_response_single,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
@@ -348,40 +298,36 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_watermarks_list",
     title: "List watermark profiles",
-    description: "Lists all watermark profiles for an account.",
+    description: "Lists all watermark profiles for an account.\n\nGET /accounts/{account_id}/stream/watermarks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_watermark_response_collection",
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_height": stream_height_output,
-        "stream_messages": stream_messages_output,
-        "stream_name": stream_name_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_position": stream_position_output,
-        "stream_scale": stream_scale_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_response_collection": stream_watermark_response_collection_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_messages": stream_messages,
+        "stream_watermark_response_collection": stream_watermark_response_collection,
+        "stream_watermarks": stream_watermarks,
       },
     },
     annotations: {
@@ -409,22 +355,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common": stream_api_response_common_output,
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_downloadedFrom": stream_downloadedFrom_output,
-        "stream_height": stream_height_output,
-        "stream_messages": stream_messages_output,
-        "stream_name": stream_name_output,
-        "stream_opacity": stream_opacity_output,
-        "stream_padding": stream_padding_output,
-        "stream_position": stream_position_output,
-        "stream_scale": stream_scale_output,
-        "stream_watermark_created": stream_watermark_created_output,
-        "stream_watermark_identifier": stream_watermark_identifier_output,
-        "stream_watermark_response_collection": stream_watermark_response_collection_output,
-        "stream_watermark_size": stream_watermark_size_output,
-        "stream_watermarks": stream_watermarks_output,
-        "stream_width": stream_width_output,
+        "stream_api-response-common": stream_api$$response$$common,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_messages": stream_messages,
+        "stream_watermark_response_collection": stream_watermark_response_collection,
+        "stream_watermarks": stream_watermarks,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/stream/webhooks/outputs.ts b/src/generated/forge-mcp/stream/webhooks/outputs.ts
index fff463d22..8415b44bc 100644
--- a/src/generated/forge-mcp/stream/webhooks/outputs.ts
+++ b/src/generated/forge-mcp/stream/webhooks/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `stream_webhook_response_single` in responses.
  */
-export const stream_webhook_response_single_output: JsonSchema = {
+export const stream_webhook_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/stream_api-response-single"
diff --git a/src/generated/forge-mcp/stream/webhooks/tools.ts b/src/generated/forge-mcp/stream/webhooks/tools.ts
index 1fce986e2..46859587c 100644
--- a/src/generated/forge-mcp/stream/webhooks/tools.ts
+++ b/src/generated/forge-mcp/stream/webhooks/tools.ts
@@ -3,13 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  stream_api_response_common_failure_output,
-  stream_api_response_single_output,
-  stream_deleted_response_output,
-  stream_messages_output,
+  stream_api$$response$$common$$failure,
+  stream_api$$response$$single,
+  stream_deleted_response,
+  stream_messages,
 } from "../outputs.js";
-import { stream_account_identifier } from "../schemas.js";
-import { stream_webhook_response_single_output } from "./outputs.js";
+import { stream_webhook_response_single } from "./outputs.js";
 import { stream_webhook_request } from "./schemas.js";
 
 /**
@@ -19,28 +18,35 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_webhooks_delete",
     title: "Delete webhooks",
-    description: "Deletes the on-demand video webhook.\n\nConfirm with the user before calling this tool. Delete this webhook? If recreated, the secret will change.",
+    description: "Deletes the on-demand video webhook.\n\nConfirm with the user before calling this tool. Delete this webhook? If recreated, the secret will change.\n\nDELETE /accounts/{account_id}/stream/webhook",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_deleted_response",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     annotations: {
@@ -67,10 +73,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_deleted_response": stream_deleted_response_output,
-        "stream_messages": stream_messages_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_deleted_response": stream_deleted_response,
+        "stream_messages": stream_messages,
       },
     },
     request: (args) => ({
@@ -80,28 +86,35 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_webhooks_get",
     title: "View webhook",
-    description: "Retrieve current on-demand webhook information.",
+    description: "Retrieve current on-demand webhook information.\n\nGET /accounts/{account_id}/stream/webhook",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "stream_account_identifier": stream_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/stream_webhook_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_webhook_response_single": stream_webhook_response_single_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_webhook_response_single": stream_webhook_response_single,
       },
     },
     annotations: {
@@ -129,10 +142,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_webhook_response_single": stream_webhook_response_single_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_webhook_response_single": stream_webhook_response_single,
       },
     },
     request: (args) => ({
@@ -142,33 +155,42 @@ export const tools: readonly Tool[] = [
   {
     name: "stream_webhooks_update",
     title: "Create VOD webhooks",
-    description: "Create a webhook for notifications about on-demand video uploads.\n\nConfirm with the user before calling this tool. Create a webhook for on-demand operations? Will replace previously configured webhook. Live input webhooks are handled via Notifications Service.",
+    description: "Create a webhook for notifications about on-demand video uploads.\n\nConfirm with the user before calling this tool. Create a webhook for on-demand operations? Will replace previously configured webhook. Live input webhooks are handled via Notifications Service.\n\nPUT /accounts/{account_id}/stream/webhook",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/stream_account_identifier",
-          "description": "The account identifier tag."
-        },
         "body": {
           "$ref": "#/$defs/stream_webhook_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "The account identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "stream_account_identifier": stream_account_identifier,
         "stream_webhook_request": stream_webhook_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/stream_webhook_response_single",
       $defs: {
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_webhook_response_single": stream_webhook_response_single_output,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_webhook_response_single": stream_webhook_response_single,
       },
     },
     annotations: {
@@ -195,10 +217,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "stream_api-response-common-failure": stream_api_response_common_failure_output,
-        "stream_api-response-single": stream_api_response_single_output,
-        "stream_messages": stream_messages_output,
-        "stream_webhook_response_single": stream_webhook_response_single_output,
+        "stream_api-response-common-failure": stream_api$$response$$common$$failure,
+        "stream_api-response-single": stream_api$$response$$single,
+        "stream_messages": stream_messages,
+        "stream_webhook_response_single": stream_webhook_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/tags/accountResources/outputs.ts b/src/generated/forge-mcp/tags/accountResources/outputs.ts
index 04a81f451..570ee9c3f 100644
--- a/src/generated/forge-mcp/tags/accountResources/outputs.ts
+++ b/src/generated/forge-mcp/tags/accountResources/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `resource-tagging_tagged_resource_response_single` in
  * responses.
  */
-export const resource_tagging_tagged_resource_response_single_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-tagging_api-response-common"
diff --git a/src/generated/forge-mcp/tags/accountResources/schemas.ts b/src/generated/forge-mcp/tags/accountResources/schemas.ts
index 42fb33985..353367394 100644
--- a/src/generated/forge-mcp/tags/accountResources/schemas.ts
+++ b/src/generated/forge-mcp/tags/accountResources/schemas.ts
@@ -3,110 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `resource-tagging_account_resource_type`.
- */
-export const resource_tagging_account_resource_type: JsonSchema = {
-  "description": "Identifies the type of account-level resource.",
-  "enum": [
-    "access_application",
-    "access_group",
-    "access_service_token",
-    "account",
-    "account_ruleset",
-    "ai_gateway",
-    "ai_search_instance",
-    "ai_search_namespace",
-    "alerting_policy",
-    "alerting_webhook",
-    "cloudflared_tunnel",
-    "cws_deployment",
-    "cws_policy",
-    "cws_policy_set",
-    "cws_workload",
-    "d1_database",
-    "device",
-    "durable_object_namespace",
-    "gateway_list",
-    "gateway_rule",
-    "image",
-    "infrastructure_target",
-    "kv_namespace",
-    "load_balancer_monitor",
-    "load_balancer_pool",
-    "namespace_worker",
-    "pages_project",
-    "queue",
-    "r2_bucket",
-    "resource_share",
-    "stream_live_input",
-    "stream_video",
-    "vectorize_index",
-    "worker",
-    "worker_version"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-tagging_account_resource_type_base_enum`.
- */
-export const resource_tagging_account_resource_type_base_enum: JsonSchema = {
-  "description": "Enum for base account-level resource types (those with no extra required fields).",
-  "enum": [
-    "access_application",
-    "access_group",
-    "access_service_token",
-    "account",
-    "account_ruleset",
-    "ai_gateway",
-    "ai_search_instance",
-    "ai_search_namespace",
-    "alerting_policy",
-    "alerting_webhook",
-    "cloudflared_tunnel",
-    "cws_deployment",
-    "cws_policy",
-    "cws_policy_set",
-    "cws_workload",
-    "d1_database",
-    "device",
-    "durable_object_namespace",
-    "gateway_list",
-    "gateway_rule",
-    "image",
-    "infrastructure_target",
-    "kv_namespace",
-    "load_balancer_monitor",
-    "load_balancer_pool",
-    "namespace_worker",
-    "pages_project",
-    "queue",
-    "r2_bucket",
-    "resource_share",
-    "stream_live_input",
-    "stream_video",
-    "vectorize_index",
-    "worker"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `resource-tagging_account_resource_type_worker_version_enum`.
- */
-export const resource_tagging_account_resource_type_worker_version_enum: JsonSchema = {
-  "description": "Enum for worker_version resource type.",
-  "enum": [
-    "worker_version"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `resource-tagging_delete_tags_request_account_level`.
  */
-export const resource_tagging_delete_tags_request_account_level: JsonSchema = {
+export const resource$$tagging_delete_tags_request_account_level: JsonSchema = {
   "description": "Request body schema for deleting tags from account-level resources. Use /zones/{zone_id}/tags for zone-level resources.",
   "oneOf": [
     {
@@ -121,16 +21,52 @@ export const resource_tagging_delete_tags_request_account_level: JsonSchema = {
 /**
  * The schema of `resource-tagging_delete_tags_request_account_level_base`.
  */
-export const resource_tagging_delete_tags_request_account_level_base: JsonSchema = {
+export const resource$$tagging_delete_tags_request_account_level_base: JsonSchema = {
   "description": "Request body schema for deleting tags from account-level resources.",
   "properties": {
     "resource_id": {
-      "$ref": "#/$defs/resource-tagging_resource_id",
-      "description": "Identifies the unique resource."
+      "description": "Identifies the unique resource.",
+      "type": "string"
     },
     "resource_type": {
-      "$ref": "#/$defs/resource-tagging_account_resource_type_base_enum",
-      "description": "Enum for base account-level resource types (those with no extra required fields)."
+      "description": "Enum for base account-level resource types (those with no extra required fields).",
+      "enum": [
+        "access_application",
+        "access_group",
+        "access_service_token",
+        "account",
+        "account_ruleset",
+        "ai_gateway",
+        "ai_search_instance",
+        "ai_search_namespace",
+        "alerting_policy",
+        "alerting_webhook",
+        "cloudflared_tunnel",
+        "cws_deployment",
+        "cws_policy",
+        "cws_policy_set",
+        "cws_workload",
+        "d1_database",
+        "device",
+        "durable_object_namespace",
+        "gateway_list",
+        "gateway_rule",
+        "image",
+        "infrastructure_target",
+        "kv_namespace",
+        "load_balancer_monitor",
+        "load_balancer_pool",
+        "namespace_worker",
+        "pages_project",
+        "queue",
+        "r2_bucket",
+        "resource_share",
+        "stream_live_input",
+        "stream_video",
+        "vectorize_index",
+        "worker"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -144,20 +80,23 @@ export const resource_tagging_delete_tags_request_account_level_base: JsonSchema
  * The schema of
  * `resource-tagging_delete_tags_request_account_level_worker_version`.
  */
-export const resource_tagging_delete_tags_request_account_level_worker_version: JsonSchema = {
+export const resource$$tagging_delete_tags_request_account_level_worker_version: JsonSchema = {
   "description": "Request body schema for deleting tags from worker_version resources.",
   "properties": {
     "resource_id": {
-      "$ref": "#/$defs/resource-tagging_resource_id",
-      "description": "Identifies the unique resource."
+      "description": "Identifies the unique resource.",
+      "type": "string"
     },
     "resource_type": {
-      "$ref": "#/$defs/resource-tagging_account_resource_type_worker_version_enum",
-      "description": "Enum for worker_version resource type."
+      "description": "Enum for worker_version resource type.",
+      "enum": [
+        "worker_version"
+      ],
+      "type": "string"
     },
     "worker_id": {
-      "$ref": "#/$defs/resource-tagging_worker_id",
-      "description": "Worker ID is required only for worker_version resources"
+      "description": "Worker ID is required only for worker_version resources",
+      "type": "string"
     }
   },
   "required": [
@@ -171,7 +110,7 @@ export const resource_tagging_delete_tags_request_account_level_worker_version:
 /**
  * The schema of `resource-tagging_set_tags_request_account_level`.
  */
-export const resource_tagging_set_tags_request_account_level: JsonSchema = {
+export const resource$$tagging_set_tags_request_account_level: JsonSchema = {
   "description": "Request body schema for setting tags on account-level resources.",
   "oneOf": [
     {
@@ -186,7 +125,7 @@ export const resource_tagging_set_tags_request_account_level: JsonSchema = {
 /**
  * The schema of `resource-tagging_set_tags_request_account_level_base`.
  */
-export const resource_tagging_set_tags_request_account_level_base: JsonSchema = {
+export const resource$$tagging_set_tags_request_account_level_base: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-tagging_delete_tags_request_account_level_base"
@@ -208,7 +147,7 @@ export const resource_tagging_set_tags_request_account_level_base: JsonSchema =
  * The schema of
  * `resource-tagging_set_tags_request_account_level_worker_version`.
  */
-export const resource_tagging_set_tags_request_account_level_worker_version: JsonSchema = {
+export const resource$$tagging_set_tags_request_account_level_worker_version: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-tagging_delete_tags_request_account_level_worker_version"
diff --git a/src/generated/forge-mcp/tags/accountResources/tools.ts b/src/generated/forge-mcp/tags/accountResources/tools.ts
index ceba170d4..d5f6e4b18 100644
--- a/src/generated/forge-mcp/tags/accountResources/tools.ts
+++ b/src/generated/forge-mcp/tags/accountResources/tools.ts
@@ -1,139 +1,132 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_tagging_access_application_id_output,
-  resource_tagging_api_response_common_failure_output,
-  resource_tagging_api_response_common_output,
-  resource_tagging_etag_output,
-  resource_tagging_identifier_output,
-  resource_tagging_messages_output,
-  resource_tagging_namespace_worker_navigation_output,
-  resource_tagging_resource_id_output,
-  resource_tagging_resource_name_output,
-  resource_tagging_tagged_resource_object_access_application_output,
-  resource_tagging_tagged_resource_object_access_application_policy_base_output,
-  resource_tagging_tagged_resource_object_access_application_policy_output,
-  resource_tagging_tagged_resource_object_access_group_output,
-  resource_tagging_tagged_resource_object_access_service_token_output,
-  resource_tagging_tagged_resource_object_account_level_base_output,
-  resource_tagging_tagged_resource_object_account_output,
-  resource_tagging_tagged_resource_object_account_ruleset_output,
-  resource_tagging_tagged_resource_object_ai_gateway_output,
-  resource_tagging_tagged_resource_object_ai_search_instance_output,
-  resource_tagging_tagged_resource_object_ai_search_namespace_output,
-  resource_tagging_tagged_resource_object_alerting_policy_output,
-  resource_tagging_tagged_resource_object_alerting_webhook_output,
-  resource_tagging_tagged_resource_object_api_gateway_operation_output,
-  resource_tagging_tagged_resource_object_cloudflared_tunnel_output,
-  resource_tagging_tagged_resource_object_custom_certificate_output,
-  resource_tagging_tagged_resource_object_custom_hostname_output,
-  resource_tagging_tagged_resource_object_cws_deployment_output,
-  resource_tagging_tagged_resource_object_cws_policy_output,
-  resource_tagging_tagged_resource_object_cws_policy_set_output,
-  resource_tagging_tagged_resource_object_cws_workload_output,
-  resource_tagging_tagged_resource_object_d1_database_output,
-  resource_tagging_tagged_resource_object_device_output,
-  resource_tagging_tagged_resource_object_dns_record_output,
-  resource_tagging_tagged_resource_object_durable_object_namespace_output,
-  resource_tagging_tagged_resource_object_gateway_list_output,
-  resource_tagging_tagged_resource_object_gateway_rule_output,
-  resource_tagging_tagged_resource_object_healthcheck_output,
-  resource_tagging_tagged_resource_object_image_output,
-  resource_tagging_tagged_resource_object_infrastructure_target_output,
-  resource_tagging_tagged_resource_object_kv_namespace_output,
-  resource_tagging_tagged_resource_object_load_balancer_monitor_output,
-  resource_tagging_tagged_resource_object_load_balancer_output,
-  resource_tagging_tagged_resource_object_load_balancer_pool_output,
-  resource_tagging_tagged_resource_object_managed_client_certificate_output,
-  resource_tagging_tagged_resource_object_namespace_worker_output,
-  resource_tagging_tagged_resource_object_output,
-  resource_tagging_tagged_resource_object_pages_project_output,
-  resource_tagging_tagged_resource_object_queue_output,
-  resource_tagging_tagged_resource_object_r2_bucket_output,
-  resource_tagging_tagged_resource_object_resource_share_output,
-  resource_tagging_tagged_resource_object_stream_live_input_output,
-  resource_tagging_tagged_resource_object_stream_video_output,
-  resource_tagging_tagged_resource_object_vectorize_index_output,
-  resource_tagging_tagged_resource_object_worker_output,
-  resource_tagging_tagged_resource_object_worker_route_output,
-  resource_tagging_tagged_resource_object_worker_version_base_output,
-  resource_tagging_tagged_resource_object_worker_version_output,
-  resource_tagging_tagged_resource_object_zone_level_base_output,
-  resource_tagging_tagged_resource_object_zone_output,
-  resource_tagging_tagged_resource_object_zone_ruleset_output,
-  resource_tagging_tags_output,
-  resource_tagging_tags_updated_at_output,
-  resource_tagging_worker_id_output,
-  resource_tagging_zone_id_output,
+  resource$$tagging_api$$response$$common,
+  resource$$tagging_api$$response$$common$$failure,
+  resource$$tagging_messages,
+  resource$$tagging_namespace_worker_navigation,
+  resource$$tagging_tagged_resource_object,
+  resource$$tagging_tagged_resource_object_access_application,
+  resource$$tagging_tagged_resource_object_access_application_policy,
+  resource$$tagging_tagged_resource_object_access_application_policy_base,
+  resource$$tagging_tagged_resource_object_access_group,
+  resource$$tagging_tagged_resource_object_access_service_token,
+  resource$$tagging_tagged_resource_object_account,
+  resource$$tagging_tagged_resource_object_account_level_base,
+  resource$$tagging_tagged_resource_object_account_ruleset,
+  resource$$tagging_tagged_resource_object_ai_gateway,
+  resource$$tagging_tagged_resource_object_ai_search_instance,
+  resource$$tagging_tagged_resource_object_ai_search_namespace,
+  resource$$tagging_tagged_resource_object_alerting_policy,
+  resource$$tagging_tagged_resource_object_alerting_webhook,
+  resource$$tagging_tagged_resource_object_api_gateway_operation,
+  resource$$tagging_tagged_resource_object_cloudflared_tunnel,
+  resource$$tagging_tagged_resource_object_custom_certificate,
+  resource$$tagging_tagged_resource_object_custom_hostname,
+  resource$$tagging_tagged_resource_object_cws_deployment,
+  resource$$tagging_tagged_resource_object_cws_policy,
+  resource$$tagging_tagged_resource_object_cws_policy_set,
+  resource$$tagging_tagged_resource_object_cws_workload,
+  resource$$tagging_tagged_resource_object_d1_database,
+  resource$$tagging_tagged_resource_object_device,
+  resource$$tagging_tagged_resource_object_dns_record,
+  resource$$tagging_tagged_resource_object_durable_object_namespace,
+  resource$$tagging_tagged_resource_object_gateway_list,
+  resource$$tagging_tagged_resource_object_gateway_rule,
+  resource$$tagging_tagged_resource_object_healthcheck,
+  resource$$tagging_tagged_resource_object_image,
+  resource$$tagging_tagged_resource_object_infrastructure_target,
+  resource$$tagging_tagged_resource_object_kv_namespace,
+  resource$$tagging_tagged_resource_object_load_balancer,
+  resource$$tagging_tagged_resource_object_load_balancer_monitor,
+  resource$$tagging_tagged_resource_object_load_balancer_pool,
+  resource$$tagging_tagged_resource_object_managed_client_certificate,
+  resource$$tagging_tagged_resource_object_namespace_worker,
+  resource$$tagging_tagged_resource_object_pages_project,
+  resource$$tagging_tagged_resource_object_queue,
+  resource$$tagging_tagged_resource_object_r2_bucket,
+  resource$$tagging_tagged_resource_object_resource_share,
+  resource$$tagging_tagged_resource_object_stream_live_input,
+  resource$$tagging_tagged_resource_object_stream_video,
+  resource$$tagging_tagged_resource_object_vectorize_index,
+  resource$$tagging_tagged_resource_object_worker,
+  resource$$tagging_tagged_resource_object_worker_route,
+  resource$$tagging_tagged_resource_object_worker_version,
+  resource$$tagging_tagged_resource_object_worker_version_base,
+  resource$$tagging_tagged_resource_object_zone,
+  resource$$tagging_tagged_resource_object_zone_level_base,
+  resource$$tagging_tagged_resource_object_zone_ruleset,
+  resource$$tagging_tags,
 } from "../outputs.js";
+import { resource$$tagging_tags as resource$$tagging_tags$ } from "../schemas.js";
+import { resource$$tagging_tagged_resource_response_single } from "./outputs.js";
 import {
-  resource_tagging_account_id,
-  resource_tagging_identifier,
-  resource_tagging_resource_id,
-  resource_tagging_tags,
-  resource_tagging_worker_id,
-} from "../schemas.js";
-import { resource_tagging_tagged_resource_response_single_output } from "./outputs.js";
-import {
-  resource_tagging_account_resource_type,
-  resource_tagging_account_resource_type_base_enum,
-  resource_tagging_account_resource_type_worker_version_enum,
-  resource_tagging_delete_tags_request_account_level,
-  resource_tagging_delete_tags_request_account_level_base,
-  resource_tagging_delete_tags_request_account_level_worker_version,
-  resource_tagging_set_tags_request_account_level,
-  resource_tagging_set_tags_request_account_level_base,
-  resource_tagging_set_tags_request_account_level_worker_version,
+  resource$$tagging_delete_tags_request_account_level,
+  resource$$tagging_delete_tags_request_account_level_base,
+  resource$$tagging_delete_tags_request_account_level_worker_version,
+  resource$$tagging_set_tags_request_account_level,
+  resource$$tagging_set_tags_request_account_level_base,
+  resource$$tagging_set_tags_request_account_level_worker_version,
 } from "./schemas.js";
 
 /**
- * The tools of `tags.account_resources`.
+ * The tools of `tags.accountResources`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "tags_account_resources_delete",
+    name: "tags_accountResources_delete",
     title: "Delete tags from an account or zone-level resource",
-    description: "Removes all tags from a specific account or zone-level resource.\n\nThis method is beta.",
+    description: "Removes all tags from a specific account or zone-level resource.\n\nThis method is beta.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/resource-tagging_account_id",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/resource-tagging_delete_tags_request_account_level"
         },
-        "if_match": {
-          "description": "ETag value for optimistic concurrency control. When provided, the server will\nverify the current resource ETag matches before applying the write. Returns\n412 Precondition Failed if the resource has been modified since the ETag was\nobtained. Omit this header for unconditional writes.\n",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "If-Match": {
+              "description": "ETag value for optimistic concurrency control. When provided, the server will\nverify the current resource ETag matches before applying the write. Returns\n412 Precondition Failed if the resource has been modified since the ETag was\nobtained. Omit this header for unconditional writes.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-tagging_account_id": resource_tagging_account_id,
-        "resource-tagging_account_resource_type_base_enum": resource_tagging_account_resource_type_base_enum,
-        "resource-tagging_account_resource_type_worker_version_enum": resource_tagging_account_resource_type_worker_version_enum,
-        "resource-tagging_delete_tags_request_account_level": resource_tagging_delete_tags_request_account_level,
-        "resource-tagging_delete_tags_request_account_level_base": resource_tagging_delete_tags_request_account_level_base,
-        "resource-tagging_delete_tags_request_account_level_worker_version": resource_tagging_delete_tags_request_account_level_worker_version,
-        "resource-tagging_identifier": resource_tagging_identifier,
-        "resource-tagging_resource_id": resource_tagging_resource_id,
-        "resource-tagging_worker_id": resource_tagging_worker_id,
+        "resource-tagging_delete_tags_request_account_level": resource$$tagging_delete_tags_request_account_level,
+        "resource-tagging_delete_tags_request_account_level_base": resource$$tagging_delete_tags_request_account_level_base,
+        "resource-tagging_delete_tags_request_account_level_worker_version": resource$$tagging_delete_tags_request_account_level_worker_version,
       },
     },
     annotations: {
@@ -168,131 +161,172 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-tagging_api-response-common-failure": resource_tagging_api_response_common_failure_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
+        "resource-tagging_api-response-common-failure": resource$$tagging_api$$response$$common$$failure,
+        "resource-tagging_messages": resource$$tagging_messages,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/tags`,
       headers: [
-        ["If-Match", args["if_match"]],
+        ["If-Match", param(args, "headers", "If-Match")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "tags_account_resources_get",
+    name: "tags_accountResources_get",
     title: "Get tags for an account or zone-level resource",
-    description: "Retrieves tags for a specific account or zone-level resource.\n\nThis method is beta.",
+    description: "Retrieves tags for a specific account or zone-level resource.\n\nThis method is beta.\n\nGET /{account_or_zone}/{account_or_zone_id}/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/resource-tagging_account_id",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "resource_id": {
-          "$ref": "#/$defs/resource-tagging_resource_id",
-          "description": "The ID of the resource to retrieve tags for."
-        },
-        "resource_type": {
-          "$ref": "#/$defs/resource-tagging_account_resource_type",
-          "description": "The type of the resource."
+          "type": "object"
         },
-        "worker_id": {
-          "$ref": "#/$defs/resource-tagging_worker_id",
-          "description": "Worker identifier. Required for worker_version resources."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "resource_id": {
+              "description": "The ID of the resource to retrieve tags for.",
+              "type": "string"
+            },
+            "resource_type": {
+              "description": "The type of the resource.",
+              "enum": [
+                "access_application",
+                "access_group",
+                "access_service_token",
+                "account",
+                "account_ruleset",
+                "ai_gateway",
+                "ai_search_instance",
+                "ai_search_namespace",
+                "alerting_policy",
+                "alerting_webhook",
+                "cloudflared_tunnel",
+                "cws_deployment",
+                "cws_policy",
+                "cws_policy_set",
+                "cws_workload",
+                "d1_database",
+                "device",
+                "durable_object_namespace",
+                "gateway_list",
+                "gateway_rule",
+                "image",
+                "infrastructure_target",
+                "kv_namespace",
+                "load_balancer_monitor",
+                "load_balancer_pool",
+                "namespace_worker",
+                "pages_project",
+                "queue",
+                "r2_bucket",
+                "resource_share",
+                "stream_live_input",
+                "stream_video",
+                "vectorize_index",
+                "worker",
+                "worker_version"
+              ],
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Worker identifier. Required for worker_version resources.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "resource_id",
+            "resource_type"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "resource_id",
-        "resource_type"
+        "path",
+        "query"
       ],
-      $defs: {
-        "resource-tagging_account_id": resource_tagging_account_id,
-        "resource-tagging_account_resource_type": resource_tagging_account_resource_type,
-        "resource-tagging_identifier": resource_tagging_identifier,
-        "resource-tagging_resource_id": resource_tagging_resource_id,
-        "resource-tagging_worker_id": resource_tagging_worker_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-tagging_tagged_resource_response_single",
       $defs: {
-        "resource-tagging_access_application_id": resource_tagging_access_application_id_output,
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_etag": resource_tagging_etag_output,
-        "resource-tagging_identifier": resource_tagging_identifier_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_namespace_worker_navigation": resource_tagging_namespace_worker_navigation_output,
-        "resource-tagging_resource_id": resource_tagging_resource_id_output,
-        "resource-tagging_resource_name": resource_tagging_resource_name_output,
-        "resource-tagging_tagged_resource_object": resource_tagging_tagged_resource_object_output,
-        "resource-tagging_tagged_resource_object_access_application": resource_tagging_tagged_resource_object_access_application_output,
-        "resource-tagging_tagged_resource_object_access_application_policy": resource_tagging_tagged_resource_object_access_application_policy_output,
-        "resource-tagging_tagged_resource_object_access_application_policy_base": resource_tagging_tagged_resource_object_access_application_policy_base_output,
-        "resource-tagging_tagged_resource_object_access_group": resource_tagging_tagged_resource_object_access_group_output,
-        "resource-tagging_tagged_resource_object_access_service_token": resource_tagging_tagged_resource_object_access_service_token_output,
-        "resource-tagging_tagged_resource_object_account": resource_tagging_tagged_resource_object_account_output,
-        "resource-tagging_tagged_resource_object_account_level_base": resource_tagging_tagged_resource_object_account_level_base_output,
-        "resource-tagging_tagged_resource_object_account_ruleset": resource_tagging_tagged_resource_object_account_ruleset_output,
-        "resource-tagging_tagged_resource_object_ai_gateway": resource_tagging_tagged_resource_object_ai_gateway_output,
-        "resource-tagging_tagged_resource_object_ai_search_instance": resource_tagging_tagged_resource_object_ai_search_instance_output,
-        "resource-tagging_tagged_resource_object_ai_search_namespace": resource_tagging_tagged_resource_object_ai_search_namespace_output,
-        "resource-tagging_tagged_resource_object_alerting_policy": resource_tagging_tagged_resource_object_alerting_policy_output,
-        "resource-tagging_tagged_resource_object_alerting_webhook": resource_tagging_tagged_resource_object_alerting_webhook_output,
-        "resource-tagging_tagged_resource_object_api_gateway_operation": resource_tagging_tagged_resource_object_api_gateway_operation_output,
-        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource_tagging_tagged_resource_object_cloudflared_tunnel_output,
-        "resource-tagging_tagged_resource_object_custom_certificate": resource_tagging_tagged_resource_object_custom_certificate_output,
-        "resource-tagging_tagged_resource_object_custom_hostname": resource_tagging_tagged_resource_object_custom_hostname_output,
-        "resource-tagging_tagged_resource_object_cws_deployment": resource_tagging_tagged_resource_object_cws_deployment_output,
-        "resource-tagging_tagged_resource_object_cws_policy": resource_tagging_tagged_resource_object_cws_policy_output,
-        "resource-tagging_tagged_resource_object_cws_policy_set": resource_tagging_tagged_resource_object_cws_policy_set_output,
-        "resource-tagging_tagged_resource_object_cws_workload": resource_tagging_tagged_resource_object_cws_workload_output,
-        "resource-tagging_tagged_resource_object_d1_database": resource_tagging_tagged_resource_object_d1_database_output,
-        "resource-tagging_tagged_resource_object_device": resource_tagging_tagged_resource_object_device_output,
-        "resource-tagging_tagged_resource_object_dns_record": resource_tagging_tagged_resource_object_dns_record_output,
-        "resource-tagging_tagged_resource_object_durable_object_namespace": resource_tagging_tagged_resource_object_durable_object_namespace_output,
-        "resource-tagging_tagged_resource_object_gateway_list": resource_tagging_tagged_resource_object_gateway_list_output,
-        "resource-tagging_tagged_resource_object_gateway_rule": resource_tagging_tagged_resource_object_gateway_rule_output,
-        "resource-tagging_tagged_resource_object_healthcheck": resource_tagging_tagged_resource_object_healthcheck_output,
-        "resource-tagging_tagged_resource_object_image": resource_tagging_tagged_resource_object_image_output,
-        "resource-tagging_tagged_resource_object_infrastructure_target": resource_tagging_tagged_resource_object_infrastructure_target_output,
-        "resource-tagging_tagged_resource_object_kv_namespace": resource_tagging_tagged_resource_object_kv_namespace_output,
-        "resource-tagging_tagged_resource_object_load_balancer": resource_tagging_tagged_resource_object_load_balancer_output,
-        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource_tagging_tagged_resource_object_load_balancer_monitor_output,
-        "resource-tagging_tagged_resource_object_load_balancer_pool": resource_tagging_tagged_resource_object_load_balancer_pool_output,
-        "resource-tagging_tagged_resource_object_managed_client_certificate": resource_tagging_tagged_resource_object_managed_client_certificate_output,
-        "resource-tagging_tagged_resource_object_namespace_worker": resource_tagging_tagged_resource_object_namespace_worker_output,
-        "resource-tagging_tagged_resource_object_pages_project": resource_tagging_tagged_resource_object_pages_project_output,
-        "resource-tagging_tagged_resource_object_queue": resource_tagging_tagged_resource_object_queue_output,
-        "resource-tagging_tagged_resource_object_r2_bucket": resource_tagging_tagged_resource_object_r2_bucket_output,
-        "resource-tagging_tagged_resource_object_resource_share": resource_tagging_tagged_resource_object_resource_share_output,
-        "resource-tagging_tagged_resource_object_stream_live_input": resource_tagging_tagged_resource_object_stream_live_input_output,
-        "resource-tagging_tagged_resource_object_stream_video": resource_tagging_tagged_resource_object_stream_video_output,
-        "resource-tagging_tagged_resource_object_vectorize_index": resource_tagging_tagged_resource_object_vectorize_index_output,
-        "resource-tagging_tagged_resource_object_worker": resource_tagging_tagged_resource_object_worker_output,
-        "resource-tagging_tagged_resource_object_worker_route": resource_tagging_tagged_resource_object_worker_route_output,
-        "resource-tagging_tagged_resource_object_worker_version": resource_tagging_tagged_resource_object_worker_version_output,
-        "resource-tagging_tagged_resource_object_worker_version_base": resource_tagging_tagged_resource_object_worker_version_base_output,
-        "resource-tagging_tagged_resource_object_zone": resource_tagging_tagged_resource_object_zone_output,
-        "resource-tagging_tagged_resource_object_zone_level_base": resource_tagging_tagged_resource_object_zone_level_base_output,
-        "resource-tagging_tagged_resource_object_zone_ruleset": resource_tagging_tagged_resource_object_zone_ruleset_output,
-        "resource-tagging_tagged_resource_response_single": resource_tagging_tagged_resource_response_single_output,
-        "resource-tagging_tags": resource_tagging_tags_output,
-        "resource-tagging_tags_updated_at": resource_tagging_tags_updated_at_output,
-        "resource-tagging_worker_id": resource_tagging_worker_id_output,
-        "resource-tagging_zone_id": resource_tagging_zone_id_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_namespace_worker_navigation": resource$$tagging_namespace_worker_navigation,
+        "resource-tagging_tagged_resource_object": resource$$tagging_tagged_resource_object,
+        "resource-tagging_tagged_resource_object_access_application": resource$$tagging_tagged_resource_object_access_application,
+        "resource-tagging_tagged_resource_object_access_application_policy": resource$$tagging_tagged_resource_object_access_application_policy,
+        "resource-tagging_tagged_resource_object_access_application_policy_base": resource$$tagging_tagged_resource_object_access_application_policy_base,
+        "resource-tagging_tagged_resource_object_access_group": resource$$tagging_tagged_resource_object_access_group,
+        "resource-tagging_tagged_resource_object_access_service_token": resource$$tagging_tagged_resource_object_access_service_token,
+        "resource-tagging_tagged_resource_object_account": resource$$tagging_tagged_resource_object_account,
+        "resource-tagging_tagged_resource_object_account_level_base": resource$$tagging_tagged_resource_object_account_level_base,
+        "resource-tagging_tagged_resource_object_account_ruleset": resource$$tagging_tagged_resource_object_account_ruleset,
+        "resource-tagging_tagged_resource_object_ai_gateway": resource$$tagging_tagged_resource_object_ai_gateway,
+        "resource-tagging_tagged_resource_object_ai_search_instance": resource$$tagging_tagged_resource_object_ai_search_instance,
+        "resource-tagging_tagged_resource_object_ai_search_namespace": resource$$tagging_tagged_resource_object_ai_search_namespace,
+        "resource-tagging_tagged_resource_object_alerting_policy": resource$$tagging_tagged_resource_object_alerting_policy,
+        "resource-tagging_tagged_resource_object_alerting_webhook": resource$$tagging_tagged_resource_object_alerting_webhook,
+        "resource-tagging_tagged_resource_object_api_gateway_operation": resource$$tagging_tagged_resource_object_api_gateway_operation,
+        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource$$tagging_tagged_resource_object_cloudflared_tunnel,
+        "resource-tagging_tagged_resource_object_custom_certificate": resource$$tagging_tagged_resource_object_custom_certificate,
+        "resource-tagging_tagged_resource_object_custom_hostname": resource$$tagging_tagged_resource_object_custom_hostname,
+        "resource-tagging_tagged_resource_object_cws_deployment": resource$$tagging_tagged_resource_object_cws_deployment,
+        "resource-tagging_tagged_resource_object_cws_policy": resource$$tagging_tagged_resource_object_cws_policy,
+        "resource-tagging_tagged_resource_object_cws_policy_set": resource$$tagging_tagged_resource_object_cws_policy_set,
+        "resource-tagging_tagged_resource_object_cws_workload": resource$$tagging_tagged_resource_object_cws_workload,
+        "resource-tagging_tagged_resource_object_d1_database": resource$$tagging_tagged_resource_object_d1_database,
+        "resource-tagging_tagged_resource_object_device": resource$$tagging_tagged_resource_object_device,
+        "resource-tagging_tagged_resource_object_dns_record": resource$$tagging_tagged_resource_object_dns_record,
+        "resource-tagging_tagged_resource_object_durable_object_namespace": resource$$tagging_tagged_resource_object_durable_object_namespace,
+        "resource-tagging_tagged_resource_object_gateway_list": resource$$tagging_tagged_resource_object_gateway_list,
+        "resource-tagging_tagged_resource_object_gateway_rule": resource$$tagging_tagged_resource_object_gateway_rule,
+        "resource-tagging_tagged_resource_object_healthcheck": resource$$tagging_tagged_resource_object_healthcheck,
+        "resource-tagging_tagged_resource_object_image": resource$$tagging_tagged_resource_object_image,
+        "resource-tagging_tagged_resource_object_infrastructure_target": resource$$tagging_tagged_resource_object_infrastructure_target,
+        "resource-tagging_tagged_resource_object_kv_namespace": resource$$tagging_tagged_resource_object_kv_namespace,
+        "resource-tagging_tagged_resource_object_load_balancer": resource$$tagging_tagged_resource_object_load_balancer,
+        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource$$tagging_tagged_resource_object_load_balancer_monitor,
+        "resource-tagging_tagged_resource_object_load_balancer_pool": resource$$tagging_tagged_resource_object_load_balancer_pool,
+        "resource-tagging_tagged_resource_object_managed_client_certificate": resource$$tagging_tagged_resource_object_managed_client_certificate,
+        "resource-tagging_tagged_resource_object_namespace_worker": resource$$tagging_tagged_resource_object_namespace_worker,
+        "resource-tagging_tagged_resource_object_pages_project": resource$$tagging_tagged_resource_object_pages_project,
+        "resource-tagging_tagged_resource_object_queue": resource$$tagging_tagged_resource_object_queue,
+        "resource-tagging_tagged_resource_object_r2_bucket": resource$$tagging_tagged_resource_object_r2_bucket,
+        "resource-tagging_tagged_resource_object_resource_share": resource$$tagging_tagged_resource_object_resource_share,
+        "resource-tagging_tagged_resource_object_stream_live_input": resource$$tagging_tagged_resource_object_stream_live_input,
+        "resource-tagging_tagged_resource_object_stream_video": resource$$tagging_tagged_resource_object_stream_video,
+        "resource-tagging_tagged_resource_object_vectorize_index": resource$$tagging_tagged_resource_object_vectorize_index,
+        "resource-tagging_tagged_resource_object_worker": resource$$tagging_tagged_resource_object_worker,
+        "resource-tagging_tagged_resource_object_worker_route": resource$$tagging_tagged_resource_object_worker_route,
+        "resource-tagging_tagged_resource_object_worker_version": resource$$tagging_tagged_resource_object_worker_version,
+        "resource-tagging_tagged_resource_object_worker_version_base": resource$$tagging_tagged_resource_object_worker_version_base,
+        "resource-tagging_tagged_resource_object_zone": resource$$tagging_tagged_resource_object_zone,
+        "resource-tagging_tagged_resource_object_zone_level_base": resource$$tagging_tagged_resource_object_zone_level_base,
+        "resource-tagging_tagged_resource_object_zone_ruleset": resource$$tagging_tagged_resource_object_zone_ruleset,
+        "resource-tagging_tagged_resource_response_single": resource$$tagging_tagged_resource_response_single,
+        "resource-tagging_tags": resource$$tagging_tags,
       },
     },
     annotations: {
@@ -326,196 +360,190 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-tagging_access_application_id": resource_tagging_access_application_id_output,
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_api-response-common-failure": resource_tagging_api_response_common_failure_output,
-        "resource-tagging_etag": resource_tagging_etag_output,
-        "resource-tagging_identifier": resource_tagging_identifier_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_namespace_worker_navigation": resource_tagging_namespace_worker_navigation_output,
-        "resource-tagging_resource_id": resource_tagging_resource_id_output,
-        "resource-tagging_resource_name": resource_tagging_resource_name_output,
-        "resource-tagging_tagged_resource_object": resource_tagging_tagged_resource_object_output,
-        "resource-tagging_tagged_resource_object_access_application": resource_tagging_tagged_resource_object_access_application_output,
-        "resource-tagging_tagged_resource_object_access_application_policy": resource_tagging_tagged_resource_object_access_application_policy_output,
-        "resource-tagging_tagged_resource_object_access_application_policy_base": resource_tagging_tagged_resource_object_access_application_policy_base_output,
-        "resource-tagging_tagged_resource_object_access_group": resource_tagging_tagged_resource_object_access_group_output,
-        "resource-tagging_tagged_resource_object_access_service_token": resource_tagging_tagged_resource_object_access_service_token_output,
-        "resource-tagging_tagged_resource_object_account": resource_tagging_tagged_resource_object_account_output,
-        "resource-tagging_tagged_resource_object_account_level_base": resource_tagging_tagged_resource_object_account_level_base_output,
-        "resource-tagging_tagged_resource_object_account_ruleset": resource_tagging_tagged_resource_object_account_ruleset_output,
-        "resource-tagging_tagged_resource_object_ai_gateway": resource_tagging_tagged_resource_object_ai_gateway_output,
-        "resource-tagging_tagged_resource_object_ai_search_instance": resource_tagging_tagged_resource_object_ai_search_instance_output,
-        "resource-tagging_tagged_resource_object_ai_search_namespace": resource_tagging_tagged_resource_object_ai_search_namespace_output,
-        "resource-tagging_tagged_resource_object_alerting_policy": resource_tagging_tagged_resource_object_alerting_policy_output,
-        "resource-tagging_tagged_resource_object_alerting_webhook": resource_tagging_tagged_resource_object_alerting_webhook_output,
-        "resource-tagging_tagged_resource_object_api_gateway_operation": resource_tagging_tagged_resource_object_api_gateway_operation_output,
-        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource_tagging_tagged_resource_object_cloudflared_tunnel_output,
-        "resource-tagging_tagged_resource_object_custom_certificate": resource_tagging_tagged_resource_object_custom_certificate_output,
-        "resource-tagging_tagged_resource_object_custom_hostname": resource_tagging_tagged_resource_object_custom_hostname_output,
-        "resource-tagging_tagged_resource_object_cws_deployment": resource_tagging_tagged_resource_object_cws_deployment_output,
-        "resource-tagging_tagged_resource_object_cws_policy": resource_tagging_tagged_resource_object_cws_policy_output,
-        "resource-tagging_tagged_resource_object_cws_policy_set": resource_tagging_tagged_resource_object_cws_policy_set_output,
-        "resource-tagging_tagged_resource_object_cws_workload": resource_tagging_tagged_resource_object_cws_workload_output,
-        "resource-tagging_tagged_resource_object_d1_database": resource_tagging_tagged_resource_object_d1_database_output,
-        "resource-tagging_tagged_resource_object_device": resource_tagging_tagged_resource_object_device_output,
-        "resource-tagging_tagged_resource_object_dns_record": resource_tagging_tagged_resource_object_dns_record_output,
-        "resource-tagging_tagged_resource_object_durable_object_namespace": resource_tagging_tagged_resource_object_durable_object_namespace_output,
-        "resource-tagging_tagged_resource_object_gateway_list": resource_tagging_tagged_resource_object_gateway_list_output,
-        "resource-tagging_tagged_resource_object_gateway_rule": resource_tagging_tagged_resource_object_gateway_rule_output,
-        "resource-tagging_tagged_resource_object_healthcheck": resource_tagging_tagged_resource_object_healthcheck_output,
-        "resource-tagging_tagged_resource_object_image": resource_tagging_tagged_resource_object_image_output,
-        "resource-tagging_tagged_resource_object_infrastructure_target": resource_tagging_tagged_resource_object_infrastructure_target_output,
-        "resource-tagging_tagged_resource_object_kv_namespace": resource_tagging_tagged_resource_object_kv_namespace_output,
-        "resource-tagging_tagged_resource_object_load_balancer": resource_tagging_tagged_resource_object_load_balancer_output,
-        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource_tagging_tagged_resource_object_load_balancer_monitor_output,
-        "resource-tagging_tagged_resource_object_load_balancer_pool": resource_tagging_tagged_resource_object_load_balancer_pool_output,
-        "resource-tagging_tagged_resource_object_managed_client_certificate": resource_tagging_tagged_resource_object_managed_client_certificate_output,
-        "resource-tagging_tagged_resource_object_namespace_worker": resource_tagging_tagged_resource_object_namespace_worker_output,
-        "resource-tagging_tagged_resource_object_pages_project": resource_tagging_tagged_resource_object_pages_project_output,
-        "resource-tagging_tagged_resource_object_queue": resource_tagging_tagged_resource_object_queue_output,
-        "resource-tagging_tagged_resource_object_r2_bucket": resource_tagging_tagged_resource_object_r2_bucket_output,
-        "resource-tagging_tagged_resource_object_resource_share": resource_tagging_tagged_resource_object_resource_share_output,
-        "resource-tagging_tagged_resource_object_stream_live_input": resource_tagging_tagged_resource_object_stream_live_input_output,
-        "resource-tagging_tagged_resource_object_stream_video": resource_tagging_tagged_resource_object_stream_video_output,
-        "resource-tagging_tagged_resource_object_vectorize_index": resource_tagging_tagged_resource_object_vectorize_index_output,
-        "resource-tagging_tagged_resource_object_worker": resource_tagging_tagged_resource_object_worker_output,
-        "resource-tagging_tagged_resource_object_worker_route": resource_tagging_tagged_resource_object_worker_route_output,
-        "resource-tagging_tagged_resource_object_worker_version": resource_tagging_tagged_resource_object_worker_version_output,
-        "resource-tagging_tagged_resource_object_worker_version_base": resource_tagging_tagged_resource_object_worker_version_base_output,
-        "resource-tagging_tagged_resource_object_zone": resource_tagging_tagged_resource_object_zone_output,
-        "resource-tagging_tagged_resource_object_zone_level_base": resource_tagging_tagged_resource_object_zone_level_base_output,
-        "resource-tagging_tagged_resource_object_zone_ruleset": resource_tagging_tagged_resource_object_zone_ruleset_output,
-        "resource-tagging_tagged_resource_response_single": resource_tagging_tagged_resource_response_single_output,
-        "resource-tagging_tags": resource_tagging_tags_output,
-        "resource-tagging_tags_updated_at": resource_tagging_tags_updated_at_output,
-        "resource-tagging_worker_id": resource_tagging_worker_id_output,
-        "resource-tagging_zone_id": resource_tagging_zone_id_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_api-response-common-failure": resource$$tagging_api$$response$$common$$failure,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_namespace_worker_navigation": resource$$tagging_namespace_worker_navigation,
+        "resource-tagging_tagged_resource_object": resource$$tagging_tagged_resource_object,
+        "resource-tagging_tagged_resource_object_access_application": resource$$tagging_tagged_resource_object_access_application,
+        "resource-tagging_tagged_resource_object_access_application_policy": resource$$tagging_tagged_resource_object_access_application_policy,
+        "resource-tagging_tagged_resource_object_access_application_policy_base": resource$$tagging_tagged_resource_object_access_application_policy_base,
+        "resource-tagging_tagged_resource_object_access_group": resource$$tagging_tagged_resource_object_access_group,
+        "resource-tagging_tagged_resource_object_access_service_token": resource$$tagging_tagged_resource_object_access_service_token,
+        "resource-tagging_tagged_resource_object_account": resource$$tagging_tagged_resource_object_account,
+        "resource-tagging_tagged_resource_object_account_level_base": resource$$tagging_tagged_resource_object_account_level_base,
+        "resource-tagging_tagged_resource_object_account_ruleset": resource$$tagging_tagged_resource_object_account_ruleset,
+        "resource-tagging_tagged_resource_object_ai_gateway": resource$$tagging_tagged_resource_object_ai_gateway,
+        "resource-tagging_tagged_resource_object_ai_search_instance": resource$$tagging_tagged_resource_object_ai_search_instance,
+        "resource-tagging_tagged_resource_object_ai_search_namespace": resource$$tagging_tagged_resource_object_ai_search_namespace,
+        "resource-tagging_tagged_resource_object_alerting_policy": resource$$tagging_tagged_resource_object_alerting_policy,
+        "resource-tagging_tagged_resource_object_alerting_webhook": resource$$tagging_tagged_resource_object_alerting_webhook,
+        "resource-tagging_tagged_resource_object_api_gateway_operation": resource$$tagging_tagged_resource_object_api_gateway_operation,
+        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource$$tagging_tagged_resource_object_cloudflared_tunnel,
+        "resource-tagging_tagged_resource_object_custom_certificate": resource$$tagging_tagged_resource_object_custom_certificate,
+        "resource-tagging_tagged_resource_object_custom_hostname": resource$$tagging_tagged_resource_object_custom_hostname,
+        "resource-tagging_tagged_resource_object_cws_deployment": resource$$tagging_tagged_resource_object_cws_deployment,
+        "resource-tagging_tagged_resource_object_cws_policy": resource$$tagging_tagged_resource_object_cws_policy,
+        "resource-tagging_tagged_resource_object_cws_policy_set": resource$$tagging_tagged_resource_object_cws_policy_set,
+        "resource-tagging_tagged_resource_object_cws_workload": resource$$tagging_tagged_resource_object_cws_workload,
+        "resource-tagging_tagged_resource_object_d1_database": resource$$tagging_tagged_resource_object_d1_database,
+        "resource-tagging_tagged_resource_object_device": resource$$tagging_tagged_resource_object_device,
+        "resource-tagging_tagged_resource_object_dns_record": resource$$tagging_tagged_resource_object_dns_record,
+        "resource-tagging_tagged_resource_object_durable_object_namespace": resource$$tagging_tagged_resource_object_durable_object_namespace,
+        "resource-tagging_tagged_resource_object_gateway_list": resource$$tagging_tagged_resource_object_gateway_list,
+        "resource-tagging_tagged_resource_object_gateway_rule": resource$$tagging_tagged_resource_object_gateway_rule,
+        "resource-tagging_tagged_resource_object_healthcheck": resource$$tagging_tagged_resource_object_healthcheck,
+        "resource-tagging_tagged_resource_object_image": resource$$tagging_tagged_resource_object_image,
+        "resource-tagging_tagged_resource_object_infrastructure_target": resource$$tagging_tagged_resource_object_infrastructure_target,
+        "resource-tagging_tagged_resource_object_kv_namespace": resource$$tagging_tagged_resource_object_kv_namespace,
+        "resource-tagging_tagged_resource_object_load_balancer": resource$$tagging_tagged_resource_object_load_balancer,
+        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource$$tagging_tagged_resource_object_load_balancer_monitor,
+        "resource-tagging_tagged_resource_object_load_balancer_pool": resource$$tagging_tagged_resource_object_load_balancer_pool,
+        "resource-tagging_tagged_resource_object_managed_client_certificate": resource$$tagging_tagged_resource_object_managed_client_certificate,
+        "resource-tagging_tagged_resource_object_namespace_worker": resource$$tagging_tagged_resource_object_namespace_worker,
+        "resource-tagging_tagged_resource_object_pages_project": resource$$tagging_tagged_resource_object_pages_project,
+        "resource-tagging_tagged_resource_object_queue": resource$$tagging_tagged_resource_object_queue,
+        "resource-tagging_tagged_resource_object_r2_bucket": resource$$tagging_tagged_resource_object_r2_bucket,
+        "resource-tagging_tagged_resource_object_resource_share": resource$$tagging_tagged_resource_object_resource_share,
+        "resource-tagging_tagged_resource_object_stream_live_input": resource$$tagging_tagged_resource_object_stream_live_input,
+        "resource-tagging_tagged_resource_object_stream_video": resource$$tagging_tagged_resource_object_stream_video,
+        "resource-tagging_tagged_resource_object_vectorize_index": resource$$tagging_tagged_resource_object_vectorize_index,
+        "resource-tagging_tagged_resource_object_worker": resource$$tagging_tagged_resource_object_worker,
+        "resource-tagging_tagged_resource_object_worker_route": resource$$tagging_tagged_resource_object_worker_route,
+        "resource-tagging_tagged_resource_object_worker_version": resource$$tagging_tagged_resource_object_worker_version,
+        "resource-tagging_tagged_resource_object_worker_version_base": resource$$tagging_tagged_resource_object_worker_version_base,
+        "resource-tagging_tagged_resource_object_zone": resource$$tagging_tagged_resource_object_zone,
+        "resource-tagging_tagged_resource_object_zone_level_base": resource$$tagging_tagged_resource_object_zone_level_base,
+        "resource-tagging_tagged_resource_object_zone_ruleset": resource$$tagging_tagged_resource_object_zone_ruleset,
+        "resource-tagging_tagged_resource_response_single": resource$$tagging_tagged_resource_response_single,
+        "resource-tagging_tags": resource$$tagging_tags,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/tags`,
       query: [
-        ["resource_id", args["resource_id"], true],
-        ["resource_type", args["resource_type"], true],
-        ["worker_id", args["worker_id"], true],
+        ["resource_id", param(args, "query", "resource_id"), true],
+        ["resource_type", param(args, "query", "resource_type"), true],
+        ["worker_id", param(args, "query", "worker_id"), true],
       ],
     }),
   },
   {
-    name: "tags_account_resources_update",
+    name: "tags_accountResources_update",
     title: "Set tags for an account or zone-level resource",
-    description: "Creates or updates tags for a specific account or zone-level resource. Replaces all existing tags for the resource.\n\nThis method is beta.",
+    description: "Creates or updates tags for a specific account or zone-level resource. Replaces all existing tags for the resource.\n\nThis method is beta.\n\nPUT /{account_or_zone}/{account_or_zone_id}/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/resource-tagging_account_id",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/resource-tagging_set_tags_request_account_level"
         },
-        "if_match": {
-          "description": "ETag value for optimistic concurrency control. When provided, the server will\nverify the current resource ETag matches before applying the write. Returns\n412 Precondition Failed if the resource has been modified since the ETag was\nobtained. Omit this header for unconditional writes.\n",
-          "type": "string"
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "If-Match": {
+              "description": "ETag value for optimistic concurrency control. When provided, the server will\nverify the current resource ETag matches before applying the write. Returns\n412 Precondition Failed if the resource has been modified since the ETag was\nobtained. Omit this header for unconditional writes.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "resource-tagging_account_id": resource_tagging_account_id,
-        "resource-tagging_account_resource_type_base_enum": resource_tagging_account_resource_type_base_enum,
-        "resource-tagging_account_resource_type_worker_version_enum": resource_tagging_account_resource_type_worker_version_enum,
-        "resource-tagging_delete_tags_request_account_level_base": resource_tagging_delete_tags_request_account_level_base,
-        "resource-tagging_delete_tags_request_account_level_worker_version": resource_tagging_delete_tags_request_account_level_worker_version,
-        "resource-tagging_identifier": resource_tagging_identifier,
-        "resource-tagging_resource_id": resource_tagging_resource_id,
-        "resource-tagging_set_tags_request_account_level": resource_tagging_set_tags_request_account_level,
-        "resource-tagging_set_tags_request_account_level_base": resource_tagging_set_tags_request_account_level_base,
-        "resource-tagging_set_tags_request_account_level_worker_version": resource_tagging_set_tags_request_account_level_worker_version,
-        "resource-tagging_tags": resource_tagging_tags,
-        "resource-tagging_worker_id": resource_tagging_worker_id,
+        "resource-tagging_delete_tags_request_account_level_base": resource$$tagging_delete_tags_request_account_level_base,
+        "resource-tagging_delete_tags_request_account_level_worker_version": resource$$tagging_delete_tags_request_account_level_worker_version,
+        "resource-tagging_set_tags_request_account_level": resource$$tagging_set_tags_request_account_level,
+        "resource-tagging_set_tags_request_account_level_base": resource$$tagging_set_tags_request_account_level_base,
+        "resource-tagging_set_tags_request_account_level_worker_version": resource$$tagging_set_tags_request_account_level_worker_version,
+        "resource-tagging_tags": resource$$tagging_tags$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/resource-tagging_tagged_resource_response_single",
       $defs: {
-        "resource-tagging_access_application_id": resource_tagging_access_application_id_output,
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_etag": resource_tagging_etag_output,
-        "resource-tagging_identifier": resource_tagging_identifier_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_namespace_worker_navigation": resource_tagging_namespace_worker_navigation_output,
-        "resource-tagging_resource_id": resource_tagging_resource_id_output,
-        "resource-tagging_resource_name": resource_tagging_resource_name_output,
-        "resource-tagging_tagged_resource_object": resource_tagging_tagged_resource_object_output,
-        "resource-tagging_tagged_resource_object_access_application": resource_tagging_tagged_resource_object_access_application_output,
-        "resource-tagging_tagged_resource_object_access_application_policy": resource_tagging_tagged_resource_object_access_application_policy_output,
-        "resource-tagging_tagged_resource_object_access_application_policy_base": resource_tagging_tagged_resource_object_access_application_policy_base_output,
-        "resource-tagging_tagged_resource_object_access_group": resource_tagging_tagged_resource_object_access_group_output,
-        "resource-tagging_tagged_resource_object_access_service_token": resource_tagging_tagged_resource_object_access_service_token_output,
-        "resource-tagging_tagged_resource_object_account": resource_tagging_tagged_resource_object_account_output,
-        "resource-tagging_tagged_resource_object_account_level_base": resource_tagging_tagged_resource_object_account_level_base_output,
-        "resource-tagging_tagged_resource_object_account_ruleset": resource_tagging_tagged_resource_object_account_ruleset_output,
-        "resource-tagging_tagged_resource_object_ai_gateway": resource_tagging_tagged_resource_object_ai_gateway_output,
-        "resource-tagging_tagged_resource_object_ai_search_instance": resource_tagging_tagged_resource_object_ai_search_instance_output,
-        "resource-tagging_tagged_resource_object_ai_search_namespace": resource_tagging_tagged_resource_object_ai_search_namespace_output,
-        "resource-tagging_tagged_resource_object_alerting_policy": resource_tagging_tagged_resource_object_alerting_policy_output,
-        "resource-tagging_tagged_resource_object_alerting_webhook": resource_tagging_tagged_resource_object_alerting_webhook_output,
-        "resource-tagging_tagged_resource_object_api_gateway_operation": resource_tagging_tagged_resource_object_api_gateway_operation_output,
-        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource_tagging_tagged_resource_object_cloudflared_tunnel_output,
-        "resource-tagging_tagged_resource_object_custom_certificate": resource_tagging_tagged_resource_object_custom_certificate_output,
-        "resource-tagging_tagged_resource_object_custom_hostname": resource_tagging_tagged_resource_object_custom_hostname_output,
-        "resource-tagging_tagged_resource_object_cws_deployment": resource_tagging_tagged_resource_object_cws_deployment_output,
-        "resource-tagging_tagged_resource_object_cws_policy": resource_tagging_tagged_resource_object_cws_policy_output,
-        "resource-tagging_tagged_resource_object_cws_policy_set": resource_tagging_tagged_resource_object_cws_policy_set_output,
-        "resource-tagging_tagged_resource_object_cws_workload": resource_tagging_tagged_resource_object_cws_workload_output,
-        "resource-tagging_tagged_resource_object_d1_database": resource_tagging_tagged_resource_object_d1_database_output,
-        "resource-tagging_tagged_resource_object_device": resource_tagging_tagged_resource_object_device_output,
-        "resource-tagging_tagged_resource_object_dns_record": resource_tagging_tagged_resource_object_dns_record_output,
-        "resource-tagging_tagged_resource_object_durable_object_namespace": resource_tagging_tagged_resource_object_durable_object_namespace_output,
-        "resource-tagging_tagged_resource_object_gateway_list": resource_tagging_tagged_resource_object_gateway_list_output,
-        "resource-tagging_tagged_resource_object_gateway_rule": resource_tagging_tagged_resource_object_gateway_rule_output,
-        "resource-tagging_tagged_resource_object_healthcheck": resource_tagging_tagged_resource_object_healthcheck_output,
-        "resource-tagging_tagged_resource_object_image": resource_tagging_tagged_resource_object_image_output,
-        "resource-tagging_tagged_resource_object_infrastructure_target": resource_tagging_tagged_resource_object_infrastructure_target_output,
-        "resource-tagging_tagged_resource_object_kv_namespace": resource_tagging_tagged_resource_object_kv_namespace_output,
-        "resource-tagging_tagged_resource_object_load_balancer": resource_tagging_tagged_resource_object_load_balancer_output,
-        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource_tagging_tagged_resource_object_load_balancer_monitor_output,
-        "resource-tagging_tagged_resource_object_load_balancer_pool": resource_tagging_tagged_resource_object_load_balancer_pool_output,
-        "resource-tagging_tagged_resource_object_managed_client_certificate": resource_tagging_tagged_resource_object_managed_client_certificate_output,
-        "resource-tagging_tagged_resource_object_namespace_worker": resource_tagging_tagged_resource_object_namespace_worker_output,
-        "resource-tagging_tagged_resource_object_pages_project": resource_tagging_tagged_resource_object_pages_project_output,
-        "resource-tagging_tagged_resource_object_queue": resource_tagging_tagged_resource_object_queue_output,
-        "resource-tagging_tagged_resource_object_r2_bucket": resource_tagging_tagged_resource_object_r2_bucket_output,
-        "resource-tagging_tagged_resource_object_resource_share": resource_tagging_tagged_resource_object_resource_share_output,
-        "resource-tagging_tagged_resource_object_stream_live_input": resource_tagging_tagged_resource_object_stream_live_input_output,
-        "resource-tagging_tagged_resource_object_stream_video": resource_tagging_tagged_resource_object_stream_video_output,
-        "resource-tagging_tagged_resource_object_vectorize_index": resource_tagging_tagged_resource_object_vectorize_index_output,
-        "resource-tagging_tagged_resource_object_worker": resource_tagging_tagged_resource_object_worker_output,
-        "resource-tagging_tagged_resource_object_worker_route": resource_tagging_tagged_resource_object_worker_route_output,
-        "resource-tagging_tagged_resource_object_worker_version": resource_tagging_tagged_resource_object_worker_version_output,
-        "resource-tagging_tagged_resource_object_worker_version_base": resource_tagging_tagged_resource_object_worker_version_base_output,
-        "resource-tagging_tagged_resource_object_zone": resource_tagging_tagged_resource_object_zone_output,
-        "resource-tagging_tagged_resource_object_zone_level_base": resource_tagging_tagged_resource_object_zone_level_base_output,
-        "resource-tagging_tagged_resource_object_zone_ruleset": resource_tagging_tagged_resource_object_zone_ruleset_output,
-        "resource-tagging_tagged_resource_response_single": resource_tagging_tagged_resource_response_single_output,
-        "resource-tagging_tags": resource_tagging_tags_output,
-        "resource-tagging_tags_updated_at": resource_tagging_tags_updated_at_output,
-        "resource-tagging_worker_id": resource_tagging_worker_id_output,
-        "resource-tagging_zone_id": resource_tagging_zone_id_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_namespace_worker_navigation": resource$$tagging_namespace_worker_navigation,
+        "resource-tagging_tagged_resource_object": resource$$tagging_tagged_resource_object,
+        "resource-tagging_tagged_resource_object_access_application": resource$$tagging_tagged_resource_object_access_application,
+        "resource-tagging_tagged_resource_object_access_application_policy": resource$$tagging_tagged_resource_object_access_application_policy,
+        "resource-tagging_tagged_resource_object_access_application_policy_base": resource$$tagging_tagged_resource_object_access_application_policy_base,
+        "resource-tagging_tagged_resource_object_access_group": resource$$tagging_tagged_resource_object_access_group,
+        "resource-tagging_tagged_resource_object_access_service_token": resource$$tagging_tagged_resource_object_access_service_token,
+        "resource-tagging_tagged_resource_object_account": resource$$tagging_tagged_resource_object_account,
+        "resource-tagging_tagged_resource_object_account_level_base": resource$$tagging_tagged_resource_object_account_level_base,
+        "resource-tagging_tagged_resource_object_account_ruleset": resource$$tagging_tagged_resource_object_account_ruleset,
+        "resource-tagging_tagged_resource_object_ai_gateway": resource$$tagging_tagged_resource_object_ai_gateway,
+        "resource-tagging_tagged_resource_object_ai_search_instance": resource$$tagging_tagged_resource_object_ai_search_instance,
+        "resource-tagging_tagged_resource_object_ai_search_namespace": resource$$tagging_tagged_resource_object_ai_search_namespace,
+        "resource-tagging_tagged_resource_object_alerting_policy": resource$$tagging_tagged_resource_object_alerting_policy,
+        "resource-tagging_tagged_resource_object_alerting_webhook": resource$$tagging_tagged_resource_object_alerting_webhook,
+        "resource-tagging_tagged_resource_object_api_gateway_operation": resource$$tagging_tagged_resource_object_api_gateway_operation,
+        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource$$tagging_tagged_resource_object_cloudflared_tunnel,
+        "resource-tagging_tagged_resource_object_custom_certificate": resource$$tagging_tagged_resource_object_custom_certificate,
+        "resource-tagging_tagged_resource_object_custom_hostname": resource$$tagging_tagged_resource_object_custom_hostname,
+        "resource-tagging_tagged_resource_object_cws_deployment": resource$$tagging_tagged_resource_object_cws_deployment,
+        "resource-tagging_tagged_resource_object_cws_policy": resource$$tagging_tagged_resource_object_cws_policy,
+        "resource-tagging_tagged_resource_object_cws_policy_set": resource$$tagging_tagged_resource_object_cws_policy_set,
+        "resource-tagging_tagged_resource_object_cws_workload": resource$$tagging_tagged_resource_object_cws_workload,
+        "resource-tagging_tagged_resource_object_d1_database": resource$$tagging_tagged_resource_object_d1_database,
+        "resource-tagging_tagged_resource_object_device": resource$$tagging_tagged_resource_object_device,
+        "resource-tagging_tagged_resource_object_dns_record": resource$$tagging_tagged_resource_object_dns_record,
+        "resource-tagging_tagged_resource_object_durable_object_namespace": resource$$tagging_tagged_resource_object_durable_object_namespace,
+        "resource-tagging_tagged_resource_object_gateway_list": resource$$tagging_tagged_resource_object_gateway_list,
+        "resource-tagging_tagged_resource_object_gateway_rule": resource$$tagging_tagged_resource_object_gateway_rule,
+        "resource-tagging_tagged_resource_object_healthcheck": resource$$tagging_tagged_resource_object_healthcheck,
+        "resource-tagging_tagged_resource_object_image": resource$$tagging_tagged_resource_object_image,
+        "resource-tagging_tagged_resource_object_infrastructure_target": resource$$tagging_tagged_resource_object_infrastructure_target,
+        "resource-tagging_tagged_resource_object_kv_namespace": resource$$tagging_tagged_resource_object_kv_namespace,
+        "resource-tagging_tagged_resource_object_load_balancer": resource$$tagging_tagged_resource_object_load_balancer,
+        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource$$tagging_tagged_resource_object_load_balancer_monitor,
+        "resource-tagging_tagged_resource_object_load_balancer_pool": resource$$tagging_tagged_resource_object_load_balancer_pool,
+        "resource-tagging_tagged_resource_object_managed_client_certificate": resource$$tagging_tagged_resource_object_managed_client_certificate,
+        "resource-tagging_tagged_resource_object_namespace_worker": resource$$tagging_tagged_resource_object_namespace_worker,
+        "resource-tagging_tagged_resource_object_pages_project": resource$$tagging_tagged_resource_object_pages_project,
+        "resource-tagging_tagged_resource_object_queue": resource$$tagging_tagged_resource_object_queue,
+        "resource-tagging_tagged_resource_object_r2_bucket": resource$$tagging_tagged_resource_object_r2_bucket,
+        "resource-tagging_tagged_resource_object_resource_share": resource$$tagging_tagged_resource_object_resource_share,
+        "resource-tagging_tagged_resource_object_stream_live_input": resource$$tagging_tagged_resource_object_stream_live_input,
+        "resource-tagging_tagged_resource_object_stream_video": resource$$tagging_tagged_resource_object_stream_video,
+        "resource-tagging_tagged_resource_object_vectorize_index": resource$$tagging_tagged_resource_object_vectorize_index,
+        "resource-tagging_tagged_resource_object_worker": resource$$tagging_tagged_resource_object_worker,
+        "resource-tagging_tagged_resource_object_worker_route": resource$$tagging_tagged_resource_object_worker_route,
+        "resource-tagging_tagged_resource_object_worker_version": resource$$tagging_tagged_resource_object_worker_version,
+        "resource-tagging_tagged_resource_object_worker_version_base": resource$$tagging_tagged_resource_object_worker_version_base,
+        "resource-tagging_tagged_resource_object_zone": resource$$tagging_tagged_resource_object_zone,
+        "resource-tagging_tagged_resource_object_zone_level_base": resource$$tagging_tagged_resource_object_zone_level_base,
+        "resource-tagging_tagged_resource_object_zone_ruleset": resource$$tagging_tagged_resource_object_zone_ruleset,
+        "resource-tagging_tagged_resource_response_single": resource$$tagging_tagged_resource_response_single,
+        "resource-tagging_tags": resource$$tagging_tags,
       },
     },
     annotations: {
@@ -552,77 +580,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-tagging_access_application_id": resource_tagging_access_application_id_output,
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_api-response-common-failure": resource_tagging_api_response_common_failure_output,
-        "resource-tagging_etag": resource_tagging_etag_output,
-        "resource-tagging_identifier": resource_tagging_identifier_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_namespace_worker_navigation": resource_tagging_namespace_worker_navigation_output,
-        "resource-tagging_resource_id": resource_tagging_resource_id_output,
-        "resource-tagging_resource_name": resource_tagging_resource_name_output,
-        "resource-tagging_tagged_resource_object": resource_tagging_tagged_resource_object_output,
-        "resource-tagging_tagged_resource_object_access_application": resource_tagging_tagged_resource_object_access_application_output,
-        "resource-tagging_tagged_resource_object_access_application_policy": resource_tagging_tagged_resource_object_access_application_policy_output,
-        "resource-tagging_tagged_resource_object_access_application_policy_base": resource_tagging_tagged_resource_object_access_application_policy_base_output,
-        "resource-tagging_tagged_resource_object_access_group": resource_tagging_tagged_resource_object_access_group_output,
-        "resource-tagging_tagged_resource_object_access_service_token": resource_tagging_tagged_resource_object_access_service_token_output,
-        "resource-tagging_tagged_resource_object_account": resource_tagging_tagged_resource_object_account_output,
-        "resource-tagging_tagged_resource_object_account_level_base": resource_tagging_tagged_resource_object_account_level_base_output,
-        "resource-tagging_tagged_resource_object_account_ruleset": resource_tagging_tagged_resource_object_account_ruleset_output,
-        "resource-tagging_tagged_resource_object_ai_gateway": resource_tagging_tagged_resource_object_ai_gateway_output,
-        "resource-tagging_tagged_resource_object_ai_search_instance": resource_tagging_tagged_resource_object_ai_search_instance_output,
-        "resource-tagging_tagged_resource_object_ai_search_namespace": resource_tagging_tagged_resource_object_ai_search_namespace_output,
-        "resource-tagging_tagged_resource_object_alerting_policy": resource_tagging_tagged_resource_object_alerting_policy_output,
-        "resource-tagging_tagged_resource_object_alerting_webhook": resource_tagging_tagged_resource_object_alerting_webhook_output,
-        "resource-tagging_tagged_resource_object_api_gateway_operation": resource_tagging_tagged_resource_object_api_gateway_operation_output,
-        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource_tagging_tagged_resource_object_cloudflared_tunnel_output,
-        "resource-tagging_tagged_resource_object_custom_certificate": resource_tagging_tagged_resource_object_custom_certificate_output,
-        "resource-tagging_tagged_resource_object_custom_hostname": resource_tagging_tagged_resource_object_custom_hostname_output,
-        "resource-tagging_tagged_resource_object_cws_deployment": resource_tagging_tagged_resource_object_cws_deployment_output,
-        "resource-tagging_tagged_resource_object_cws_policy": resource_tagging_tagged_resource_object_cws_policy_output,
-        "resource-tagging_tagged_resource_object_cws_policy_set": resource_tagging_tagged_resource_object_cws_policy_set_output,
-        "resource-tagging_tagged_resource_object_cws_workload": resource_tagging_tagged_resource_object_cws_workload_output,
-        "resource-tagging_tagged_resource_object_d1_database": resource_tagging_tagged_resource_object_d1_database_output,
-        "resource-tagging_tagged_resource_object_device": resource_tagging_tagged_resource_object_device_output,
-        "resource-tagging_tagged_resource_object_dns_record": resource_tagging_tagged_resource_object_dns_record_output,
-        "resource-tagging_tagged_resource_object_durable_object_namespace": resource_tagging_tagged_resource_object_durable_object_namespace_output,
-        "resource-tagging_tagged_resource_object_gateway_list": resource_tagging_tagged_resource_object_gateway_list_output,
-        "resource-tagging_tagged_resource_object_gateway_rule": resource_tagging_tagged_resource_object_gateway_rule_output,
-        "resource-tagging_tagged_resource_object_healthcheck": resource_tagging_tagged_resource_object_healthcheck_output,
-        "resource-tagging_tagged_resource_object_image": resource_tagging_tagged_resource_object_image_output,
-        "resource-tagging_tagged_resource_object_infrastructure_target": resource_tagging_tagged_resource_object_infrastructure_target_output,
-        "resource-tagging_tagged_resource_object_kv_namespace": resource_tagging_tagged_resource_object_kv_namespace_output,
-        "resource-tagging_tagged_resource_object_load_balancer": resource_tagging_tagged_resource_object_load_balancer_output,
-        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource_tagging_tagged_resource_object_load_balancer_monitor_output,
-        "resource-tagging_tagged_resource_object_load_balancer_pool": resource_tagging_tagged_resource_object_load_balancer_pool_output,
-        "resource-tagging_tagged_resource_object_managed_client_certificate": resource_tagging_tagged_resource_object_managed_client_certificate_output,
-        "resource-tagging_tagged_resource_object_namespace_worker": resource_tagging_tagged_resource_object_namespace_worker_output,
-        "resource-tagging_tagged_resource_object_pages_project": resource_tagging_tagged_resource_object_pages_project_output,
-        "resource-tagging_tagged_resource_object_queue": resource_tagging_tagged_resource_object_queue_output,
-        "resource-tagging_tagged_resource_object_r2_bucket": resource_tagging_tagged_resource_object_r2_bucket_output,
-        "resource-tagging_tagged_resource_object_resource_share": resource_tagging_tagged_resource_object_resource_share_output,
-        "resource-tagging_tagged_resource_object_stream_live_input": resource_tagging_tagged_resource_object_stream_live_input_output,
-        "resource-tagging_tagged_resource_object_stream_video": resource_tagging_tagged_resource_object_stream_video_output,
-        "resource-tagging_tagged_resource_object_vectorize_index": resource_tagging_tagged_resource_object_vectorize_index_output,
-        "resource-tagging_tagged_resource_object_worker": resource_tagging_tagged_resource_object_worker_output,
-        "resource-tagging_tagged_resource_object_worker_route": resource_tagging_tagged_resource_object_worker_route_output,
-        "resource-tagging_tagged_resource_object_worker_version": resource_tagging_tagged_resource_object_worker_version_output,
-        "resource-tagging_tagged_resource_object_worker_version_base": resource_tagging_tagged_resource_object_worker_version_base_output,
-        "resource-tagging_tagged_resource_object_zone": resource_tagging_tagged_resource_object_zone_output,
-        "resource-tagging_tagged_resource_object_zone_level_base": resource_tagging_tagged_resource_object_zone_level_base_output,
-        "resource-tagging_tagged_resource_object_zone_ruleset": resource_tagging_tagged_resource_object_zone_ruleset_output,
-        "resource-tagging_tagged_resource_response_single": resource_tagging_tagged_resource_response_single_output,
-        "resource-tagging_tags": resource_tagging_tags_output,
-        "resource-tagging_tags_updated_at": resource_tagging_tags_updated_at_output,
-        "resource-tagging_worker_id": resource_tagging_worker_id_output,
-        "resource-tagging_zone_id": resource_tagging_zone_id_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_api-response-common-failure": resource$$tagging_api$$response$$common$$failure,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_namespace_worker_navigation": resource$$tagging_namespace_worker_navigation,
+        "resource-tagging_tagged_resource_object": resource$$tagging_tagged_resource_object,
+        "resource-tagging_tagged_resource_object_access_application": resource$$tagging_tagged_resource_object_access_application,
+        "resource-tagging_tagged_resource_object_access_application_policy": resource$$tagging_tagged_resource_object_access_application_policy,
+        "resource-tagging_tagged_resource_object_access_application_policy_base": resource$$tagging_tagged_resource_object_access_application_policy_base,
+        "resource-tagging_tagged_resource_object_access_group": resource$$tagging_tagged_resource_object_access_group,
+        "resource-tagging_tagged_resource_object_access_service_token": resource$$tagging_tagged_resource_object_access_service_token,
+        "resource-tagging_tagged_resource_object_account": resource$$tagging_tagged_resource_object_account,
+        "resource-tagging_tagged_resource_object_account_level_base": resource$$tagging_tagged_resource_object_account_level_base,
+        "resource-tagging_tagged_resource_object_account_ruleset": resource$$tagging_tagged_resource_object_account_ruleset,
+        "resource-tagging_tagged_resource_object_ai_gateway": resource$$tagging_tagged_resource_object_ai_gateway,
+        "resource-tagging_tagged_resource_object_ai_search_instance": resource$$tagging_tagged_resource_object_ai_search_instance,
+        "resource-tagging_tagged_resource_object_ai_search_namespace": resource$$tagging_tagged_resource_object_ai_search_namespace,
+        "resource-tagging_tagged_resource_object_alerting_policy": resource$$tagging_tagged_resource_object_alerting_policy,
+        "resource-tagging_tagged_resource_object_alerting_webhook": resource$$tagging_tagged_resource_object_alerting_webhook,
+        "resource-tagging_tagged_resource_object_api_gateway_operation": resource$$tagging_tagged_resource_object_api_gateway_operation,
+        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource$$tagging_tagged_resource_object_cloudflared_tunnel,
+        "resource-tagging_tagged_resource_object_custom_certificate": resource$$tagging_tagged_resource_object_custom_certificate,
+        "resource-tagging_tagged_resource_object_custom_hostname": resource$$tagging_tagged_resource_object_custom_hostname,
+        "resource-tagging_tagged_resource_object_cws_deployment": resource$$tagging_tagged_resource_object_cws_deployment,
+        "resource-tagging_tagged_resource_object_cws_policy": resource$$tagging_tagged_resource_object_cws_policy,
+        "resource-tagging_tagged_resource_object_cws_policy_set": resource$$tagging_tagged_resource_object_cws_policy_set,
+        "resource-tagging_tagged_resource_object_cws_workload": resource$$tagging_tagged_resource_object_cws_workload,
+        "resource-tagging_tagged_resource_object_d1_database": resource$$tagging_tagged_resource_object_d1_database,
+        "resource-tagging_tagged_resource_object_device": resource$$tagging_tagged_resource_object_device,
+        "resource-tagging_tagged_resource_object_dns_record": resource$$tagging_tagged_resource_object_dns_record,
+        "resource-tagging_tagged_resource_object_durable_object_namespace": resource$$tagging_tagged_resource_object_durable_object_namespace,
+        "resource-tagging_tagged_resource_object_gateway_list": resource$$tagging_tagged_resource_object_gateway_list,
+        "resource-tagging_tagged_resource_object_gateway_rule": resource$$tagging_tagged_resource_object_gateway_rule,
+        "resource-tagging_tagged_resource_object_healthcheck": resource$$tagging_tagged_resource_object_healthcheck,
+        "resource-tagging_tagged_resource_object_image": resource$$tagging_tagged_resource_object_image,
+        "resource-tagging_tagged_resource_object_infrastructure_target": resource$$tagging_tagged_resource_object_infrastructure_target,
+        "resource-tagging_tagged_resource_object_kv_namespace": resource$$tagging_tagged_resource_object_kv_namespace,
+        "resource-tagging_tagged_resource_object_load_balancer": resource$$tagging_tagged_resource_object_load_balancer,
+        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource$$tagging_tagged_resource_object_load_balancer_monitor,
+        "resource-tagging_tagged_resource_object_load_balancer_pool": resource$$tagging_tagged_resource_object_load_balancer_pool,
+        "resource-tagging_tagged_resource_object_managed_client_certificate": resource$$tagging_tagged_resource_object_managed_client_certificate,
+        "resource-tagging_tagged_resource_object_namespace_worker": resource$$tagging_tagged_resource_object_namespace_worker,
+        "resource-tagging_tagged_resource_object_pages_project": resource$$tagging_tagged_resource_object_pages_project,
+        "resource-tagging_tagged_resource_object_queue": resource$$tagging_tagged_resource_object_queue,
+        "resource-tagging_tagged_resource_object_r2_bucket": resource$$tagging_tagged_resource_object_r2_bucket,
+        "resource-tagging_tagged_resource_object_resource_share": resource$$tagging_tagged_resource_object_resource_share,
+        "resource-tagging_tagged_resource_object_stream_live_input": resource$$tagging_tagged_resource_object_stream_live_input,
+        "resource-tagging_tagged_resource_object_stream_video": resource$$tagging_tagged_resource_object_stream_video,
+        "resource-tagging_tagged_resource_object_vectorize_index": resource$$tagging_tagged_resource_object_vectorize_index,
+        "resource-tagging_tagged_resource_object_worker": resource$$tagging_tagged_resource_object_worker,
+        "resource-tagging_tagged_resource_object_worker_route": resource$$tagging_tagged_resource_object_worker_route,
+        "resource-tagging_tagged_resource_object_worker_version": resource$$tagging_tagged_resource_object_worker_version,
+        "resource-tagging_tagged_resource_object_worker_version_base": resource$$tagging_tagged_resource_object_worker_version_base,
+        "resource-tagging_tagged_resource_object_zone": resource$$tagging_tagged_resource_object_zone,
+        "resource-tagging_tagged_resource_object_zone_level_base": resource$$tagging_tagged_resource_object_zone_level_base,
+        "resource-tagging_tagged_resource_object_zone_ruleset": resource$$tagging_tagged_resource_object_zone_ruleset,
+        "resource-tagging_tagged_resource_response_single": resource$$tagging_tagged_resource_response_single,
+        "resource-tagging_tags": resource$$tagging_tags,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/tags`,
       headers: [
-        ["If-Match", args["if_match"]],
+        ["If-Match", param(args, "headers", "If-Match")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/tags/keys/outputs.ts b/src/generated/forge-mcp/tags/keys/outputs.ts
index 4762d1fa7..bfc78f9c7 100644
--- a/src/generated/forge-mcp/tags/keys/outputs.ts
+++ b/src/generated/forge-mcp/tags/keys/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `resource-tagging_tag_keys_response_collection` in responses.
  */
-export const resource_tagging_tag_keys_response_collection_output: JsonSchema = {
+export const resource$$tagging_tag_keys_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-tagging_api-response-common"
diff --git a/src/generated/forge-mcp/tags/keys/tools.ts b/src/generated/forge-mcp/tags/keys/tools.ts
index 640f00d86..cd983de46 100644
--- a/src/generated/forge-mcp/tags/keys/tools.ts
+++ b/src/generated/forge-mcp/tags/keys/tools.ts
@@ -1,18 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_tagging_api_response_common_failure_output,
-  resource_tagging_api_response_common_output,
-  resource_tagging_cursor_result_info_output,
-  resource_tagging_messages_output,
+  resource$$tagging_api$$response$$common,
+  resource$$tagging_api$$response$$common$$failure,
+  resource$$tagging_cursor_result_info,
+  resource$$tagging_messages,
 } from "../outputs.js";
-import {
-  resource_tagging_account_id,
-  resource_tagging_identifier,
-} from "../schemas.js";
-import { resource_tagging_tag_keys_response_collection_output } from "./outputs.js";
+import { resource$$tagging_tag_keys_response_collection } from "./outputs.js";
 
 /**
  * The tools of `tags.keys`.
@@ -21,33 +17,46 @@ export const tools: readonly Tool[] = [
   {
     name: "tags_keys_list",
     title: "List tag keys",
-    description: "Lists all distinct tag keys used across resources in an account.\n\nThis method is beta.",
+    description: "Lists all distinct tag keys used across resources in an account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/tags/keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-tagging_account_id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "description": "Cursor for pagination.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Cursor for pagination.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "resource-tagging_account_id": resource_tagging_account_id,
-        "resource-tagging_identifier": resource_tagging_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-tagging_tag_keys_response_collection",
       $defs: {
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_cursor_result_info": resource_tagging_cursor_result_info_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_tag_keys_response_collection": resource_tagging_tag_keys_response_collection_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_cursor_result_info": resource$$tagging_cursor_result_info,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_tag_keys_response_collection": resource$$tagging_tag_keys_response_collection,
       },
     },
     annotations: {
@@ -81,17 +90,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_api-response-common-failure": resource_tagging_api_response_common_failure_output,
-        "resource-tagging_cursor_result_info": resource_tagging_cursor_result_info_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_tag_keys_response_collection": resource_tagging_tag_keys_response_collection_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_api-response-common-failure": resource$$tagging_api$$response$$common$$failure,
+        "resource-tagging_cursor_result_info": resource$$tagging_cursor_result_info,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_tag_keys_response_collection": resource$$tagging_tag_keys_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/tags/keys`,
       query: [
-        ["cursor", args["cursor"], true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/tags/outputs.ts b/src/generated/forge-mcp/tags/outputs.ts
index 6d0964cb9..03a2cae55 100644
--- a/src/generated/forge-mcp/tags/outputs.ts
+++ b/src/generated/forge-mcp/tags/outputs.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `resource-tagging_access_application_id` in responses.
- */
-export const resource_tagging_access_application_id_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `resource-tagging_api-response-common` in responses.
  */
-export const resource_tagging_api_response_common_output: JsonSchema = {
+export const resource$$tagging_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/resource-tagging_messages"
@@ -40,7 +32,7 @@ export const resource_tagging_api_response_common_output: JsonSchema = {
 /**
  * The schema of `resource-tagging_api-response-common-failure` in responses.
  */
-export const resource_tagging_api_response_common_failure_output: JsonSchema = {
+export const resource$$tagging_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/resource-tagging_messages"
@@ -70,7 +62,7 @@ export const resource_tagging_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `resource-tagging_cursor_result_info` in responses.
  */
-export const resource_tagging_cursor_result_info_output: JsonSchema = {
+export const resource$$tagging_cursor_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -89,24 +81,10 @@ export const resource_tagging_cursor_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `resource-tagging_etag` in responses.
- */
-export const resource_tagging_etag_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-tagging_identifier` in responses.
- */
-export const resource_tagging_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `resource-tagging_messages` in responses.
  */
-export const resource_tagging_messages_output: JsonSchema = {
+export const resource$$tagging_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -139,7 +117,7 @@ export const resource_tagging_messages_output: JsonSchema = {
 /**
  * The schema of `resource-tagging_namespace_worker_navigation` in responses.
  */
-export const resource_tagging_namespace_worker_navigation_output: JsonSchema = {
+export const resource$$tagging_namespace_worker_navigation: JsonSchema = {
   "properties": {
     "namespace_id": {
       "type": "string"
@@ -159,24 +137,10 @@ export const resource_tagging_namespace_worker_navigation_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `resource-tagging_resource_id` in responses.
- */
-export const resource_tagging_resource_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-tagging_resource_name` in responses.
- */
-export const resource_tagging_resource_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `resource-tagging_tagged_resource_object` in responses.
  */
-export const resource_tagging_tagged_resource_object_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/resource-tagging_tagged_resource_object_access_application"
@@ -323,7 +287,7 @@ export const resource_tagging_tagged_resource_object_output: JsonSchema = {
  * The schema of `resource-tagging_tagged_resource_object_access_application` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_access_application_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_access_application: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -350,7 +314,7 @@ export const resource_tagging_tagged_resource_object_access_application_output:
  * `resource-tagging_tagged_resource_object_access_application_policy` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_access_application_policy_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_access_application_policy: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -377,28 +341,30 @@ export const resource_tagging_tagged_resource_object_access_application_policy_o
  * `resource-tagging_tagged_resource_object_access_application_policy_base` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_access_application_policy_base_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_access_application_policy_base: JsonSchema = {
   "properties": {
     "access_application_id": {
-      "$ref": "#/$defs/resource-tagging_access_application_id"
+      "format": "uuid",
+      "type": "string"
     },
     "etag": {
-      "$ref": "#/$defs/resource-tagging_etag"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/resource-tagging_resource_id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/resource-tagging_resource_name"
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/resource-tagging_tags"
     },
     "tags_updated_at": {
-      "$ref": "#/$defs/resource-tagging_tags_updated_at"
+      "format": "date-time",
+      "type": "string"
     },
     "zone_id": {
-      "$ref": "#/$defs/resource-tagging_zone_id"
+      "type": "string"
     }
   },
   "required": [
@@ -416,7 +382,7 @@ export const resource_tagging_tagged_resource_object_access_application_policy_b
  * The schema of `resource-tagging_tagged_resource_object_access_group` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_access_group_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_access_group: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -442,7 +408,7 @@ export const resource_tagging_tagged_resource_object_access_group_output: JsonSc
  * The schema of `resource-tagging_tagged_resource_object_access_service_token`
  * in responses.
  */
-export const resource_tagging_tagged_resource_object_access_service_token_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_access_service_token: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -467,7 +433,7 @@ export const resource_tagging_tagged_resource_object_access_service_token_output
 /**
  * The schema of `resource-tagging_tagged_resource_object_account` in responses.
  */
-export const resource_tagging_tagged_resource_object_account_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_account: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -493,22 +459,23 @@ export const resource_tagging_tagged_resource_object_account_output: JsonSchema
  * The schema of `resource-tagging_tagged_resource_object_account_level_base` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_account_level_base_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_account_level_base: JsonSchema = {
   "properties": {
     "etag": {
-      "$ref": "#/$defs/resource-tagging_etag"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/resource-tagging_resource_id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/resource-tagging_resource_name"
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/resource-tagging_tags"
     },
     "tags_updated_at": {
-      "$ref": "#/$defs/resource-tagging_tags_updated_at"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "required": [
@@ -524,7 +491,7 @@ export const resource_tagging_tagged_resource_object_account_level_base_output:
  * The schema of `resource-tagging_tagged_resource_object_account_ruleset` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_account_ruleset_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_account_ruleset: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -550,7 +517,7 @@ export const resource_tagging_tagged_resource_object_account_ruleset_output: Jso
  * The schema of `resource-tagging_tagged_resource_object_ai_gateway` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_ai_gateway_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_ai_gateway: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -576,7 +543,7 @@ export const resource_tagging_tagged_resource_object_ai_gateway_output: JsonSche
  * The schema of `resource-tagging_tagged_resource_object_ai_search_instance` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_ai_search_instance_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_ai_search_instance: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -602,7 +569,7 @@ export const resource_tagging_tagged_resource_object_ai_search_instance_output:
  * The schema of `resource-tagging_tagged_resource_object_ai_search_namespace`
  * in responses.
  */
-export const resource_tagging_tagged_resource_object_ai_search_namespace_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_ai_search_namespace: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -628,7 +595,7 @@ export const resource_tagging_tagged_resource_object_ai_search_namespace_output:
  * The schema of `resource-tagging_tagged_resource_object_alerting_policy` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_alerting_policy_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_alerting_policy: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -654,7 +621,7 @@ export const resource_tagging_tagged_resource_object_alerting_policy_output: Jso
  * The schema of `resource-tagging_tagged_resource_object_alerting_webhook` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_alerting_webhook_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_alerting_webhook: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -680,7 +647,7 @@ export const resource_tagging_tagged_resource_object_alerting_webhook_output: Js
  * The schema of `resource-tagging_tagged_resource_object_api_gateway_operation`
  * in responses.
  */
-export const resource_tagging_tagged_resource_object_api_gateway_operation_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_api_gateway_operation: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -706,7 +673,7 @@ export const resource_tagging_tagged_resource_object_api_gateway_operation_outpu
  * The schema of `resource-tagging_tagged_resource_object_cloudflared_tunnel` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_cloudflared_tunnel_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_cloudflared_tunnel: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -732,7 +699,7 @@ export const resource_tagging_tagged_resource_object_cloudflared_tunnel_output:
  * The schema of `resource-tagging_tagged_resource_object_custom_certificate` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_custom_certificate_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_custom_certificate: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -758,7 +725,7 @@ export const resource_tagging_tagged_resource_object_custom_certificate_output:
  * The schema of `resource-tagging_tagged_resource_object_custom_hostname` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_custom_hostname_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_custom_hostname: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -784,7 +751,7 @@ export const resource_tagging_tagged_resource_object_custom_hostname_output: Jso
  * The schema of `resource-tagging_tagged_resource_object_cws_deployment` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_cws_deployment_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_cws_deployment: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -810,7 +777,7 @@ export const resource_tagging_tagged_resource_object_cws_deployment_output: Json
  * The schema of `resource-tagging_tagged_resource_object_cws_policy` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_cws_policy_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_cws_policy: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -836,7 +803,7 @@ export const resource_tagging_tagged_resource_object_cws_policy_output: JsonSche
  * The schema of `resource-tagging_tagged_resource_object_cws_policy_set` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_cws_policy_set_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_cws_policy_set: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -862,7 +829,7 @@ export const resource_tagging_tagged_resource_object_cws_policy_set_output: Json
  * The schema of `resource-tagging_tagged_resource_object_cws_workload` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_cws_workload_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_cws_workload: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -888,7 +855,7 @@ export const resource_tagging_tagged_resource_object_cws_workload_output: JsonSc
  * The schema of `resource-tagging_tagged_resource_object_d1_database` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_d1_database_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_d1_database: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -913,7 +880,7 @@ export const resource_tagging_tagged_resource_object_d1_database_output: JsonSch
 /**
  * The schema of `resource-tagging_tagged_resource_object_device` in responses.
  */
-export const resource_tagging_tagged_resource_object_device_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_device: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -939,7 +906,7 @@ export const resource_tagging_tagged_resource_object_device_output: JsonSchema =
  * The schema of `resource-tagging_tagged_resource_object_dns_record` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_dns_record_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_dns_record: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -966,7 +933,7 @@ export const resource_tagging_tagged_resource_object_dns_record_output: JsonSche
  * `resource-tagging_tagged_resource_object_durable_object_namespace` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_durable_object_namespace_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_durable_object_namespace: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -992,7 +959,7 @@ export const resource_tagging_tagged_resource_object_durable_object_namespace_ou
  * The schema of `resource-tagging_tagged_resource_object_gateway_list` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_gateway_list_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_gateway_list: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1018,7 +985,7 @@ export const resource_tagging_tagged_resource_object_gateway_list_output: JsonSc
  * The schema of `resource-tagging_tagged_resource_object_gateway_rule` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_gateway_rule_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_gateway_rule: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1044,7 +1011,7 @@ export const resource_tagging_tagged_resource_object_gateway_rule_output: JsonSc
  * The schema of `resource-tagging_tagged_resource_object_healthcheck` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_healthcheck_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_healthcheck: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1069,7 +1036,7 @@ export const resource_tagging_tagged_resource_object_healthcheck_output: JsonSch
 /**
  * The schema of `resource-tagging_tagged_resource_object_image` in responses.
  */
-export const resource_tagging_tagged_resource_object_image_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_image: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1095,7 +1062,7 @@ export const resource_tagging_tagged_resource_object_image_output: JsonSchema =
  * The schema of `resource-tagging_tagged_resource_object_infrastructure_target`
  * in responses.
  */
-export const resource_tagging_tagged_resource_object_infrastructure_target_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_infrastructure_target: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1121,7 +1088,7 @@ export const resource_tagging_tagged_resource_object_infrastructure_target_outpu
  * The schema of `resource-tagging_tagged_resource_object_kv_namespace` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_kv_namespace_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_kv_namespace: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1147,7 +1114,7 @@ export const resource_tagging_tagged_resource_object_kv_namespace_output: JsonSc
  * The schema of `resource-tagging_tagged_resource_object_load_balancer` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_load_balancer_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_load_balancer: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1173,7 +1140,7 @@ export const resource_tagging_tagged_resource_object_load_balancer_output: JsonS
  * The schema of `resource-tagging_tagged_resource_object_load_balancer_monitor`
  * in responses.
  */
-export const resource_tagging_tagged_resource_object_load_balancer_monitor_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_load_balancer_monitor: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1199,7 +1166,7 @@ export const resource_tagging_tagged_resource_object_load_balancer_monitor_outpu
  * The schema of `resource-tagging_tagged_resource_object_load_balancer_pool` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_load_balancer_pool_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_load_balancer_pool: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1226,7 +1193,7 @@ export const resource_tagging_tagged_resource_object_load_balancer_pool_output:
  * `resource-tagging_tagged_resource_object_managed_client_certificate` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_managed_client_certificate_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_managed_client_certificate: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1252,7 +1219,7 @@ export const resource_tagging_tagged_resource_object_managed_client_certificate_
  * The schema of `resource-tagging_tagged_resource_object_namespace_worker` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_namespace_worker_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_namespace_worker: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1281,7 +1248,7 @@ export const resource_tagging_tagged_resource_object_namespace_worker_output: Js
  * The schema of `resource-tagging_tagged_resource_object_pages_project` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_pages_project_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_pages_project: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1306,7 +1273,7 @@ export const resource_tagging_tagged_resource_object_pages_project_output: JsonS
 /**
  * The schema of `resource-tagging_tagged_resource_object_queue` in responses.
  */
-export const resource_tagging_tagged_resource_object_queue_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_queue: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1332,7 +1299,7 @@ export const resource_tagging_tagged_resource_object_queue_output: JsonSchema =
  * The schema of `resource-tagging_tagged_resource_object_r2_bucket` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_r2_bucket_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_r2_bucket: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1358,7 +1325,7 @@ export const resource_tagging_tagged_resource_object_r2_bucket_output: JsonSchem
  * The schema of `resource-tagging_tagged_resource_object_resource_share` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_resource_share_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_resource_share: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1384,7 +1351,7 @@ export const resource_tagging_tagged_resource_object_resource_share_output: Json
  * The schema of `resource-tagging_tagged_resource_object_stream_live_input` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_stream_live_input_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_stream_live_input: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1410,7 +1377,7 @@ export const resource_tagging_tagged_resource_object_stream_live_input_output: J
  * The schema of `resource-tagging_tagged_resource_object_stream_video` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_stream_video_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_stream_video: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1436,7 +1403,7 @@ export const resource_tagging_tagged_resource_object_stream_video_output: JsonSc
  * The schema of `resource-tagging_tagged_resource_object_vectorize_index` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_vectorize_index_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_vectorize_index: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1461,7 +1428,7 @@ export const resource_tagging_tagged_resource_object_vectorize_index_output: Jso
 /**
  * The schema of `resource-tagging_tagged_resource_object_worker` in responses.
  */
-export const resource_tagging_tagged_resource_object_worker_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_worker: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1487,7 +1454,7 @@ export const resource_tagging_tagged_resource_object_worker_output: JsonSchema =
  * The schema of `resource-tagging_tagged_resource_object_worker_route` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_worker_route_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_worker_route: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1513,7 +1480,7 @@ export const resource_tagging_tagged_resource_object_worker_route_output: JsonSc
  * The schema of `resource-tagging_tagged_resource_object_worker_version` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_worker_version_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_worker_version: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1539,25 +1506,26 @@ export const resource_tagging_tagged_resource_object_worker_version_output: Json
  * The schema of `resource-tagging_tagged_resource_object_worker_version_base`
  * in responses.
  */
-export const resource_tagging_tagged_resource_object_worker_version_base_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_worker_version_base: JsonSchema = {
   "properties": {
     "etag": {
-      "$ref": "#/$defs/resource-tagging_etag"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/resource-tagging_resource_id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/resource-tagging_resource_name"
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/resource-tagging_tags"
     },
     "tags_updated_at": {
-      "$ref": "#/$defs/resource-tagging_tags_updated_at"
+      "format": "date-time",
+      "type": "string"
     },
     "worker_id": {
-      "$ref": "#/$defs/resource-tagging_worker_id"
+      "type": "string"
     }
   },
   "required": [
@@ -1573,7 +1541,7 @@ export const resource_tagging_tagged_resource_object_worker_version_base_output:
 /**
  * The schema of `resource-tagging_tagged_resource_object_zone` in responses.
  */
-export const resource_tagging_tagged_resource_object_zone_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_zone: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1599,25 +1567,26 @@ export const resource_tagging_tagged_resource_object_zone_output: JsonSchema = {
  * The schema of `resource-tagging_tagged_resource_object_zone_level_base` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_zone_level_base_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_zone_level_base: JsonSchema = {
   "properties": {
     "etag": {
-      "$ref": "#/$defs/resource-tagging_etag"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/resource-tagging_resource_id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/resource-tagging_resource_name"
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/resource-tagging_tags"
     },
     "tags_updated_at": {
-      "$ref": "#/$defs/resource-tagging_tags_updated_at"
+      "format": "date-time",
+      "type": "string"
     },
     "zone_id": {
-      "$ref": "#/$defs/resource-tagging_zone_id"
+      "type": "string"
     }
   },
   "required": [
@@ -1634,7 +1603,7 @@ export const resource_tagging_tagged_resource_object_zone_level_base_output: Jso
  * The schema of `resource-tagging_tagged_resource_object_zone_ruleset` in
  * responses.
  */
-export const resource_tagging_tagged_resource_object_zone_ruleset_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_object_zone_ruleset: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1659,31 +1628,9 @@ export const resource_tagging_tagged_resource_object_zone_ruleset_output: JsonSc
 /**
  * The schema of `resource-tagging_tags` in responses.
  */
-export const resource_tagging_tags_output: JsonSchema = {
+export const resource$$tagging_tags: JsonSchema = {
   "additionalProperties": {
     "type": "string"
   },
   "type": "object"
 };
-
-/**
- * The schema of `resource-tagging_tags_updated_at` in responses.
- */
-export const resource_tagging_tags_updated_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-tagging_worker_id` in responses.
- */
-export const resource_tagging_worker_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `resource-tagging_zone_id` in responses.
- */
-export const resource_tagging_zone_id_output: JsonSchema = {
-  "$ref": "#/$defs/resource-tagging_identifier"
-};
diff --git a/src/generated/forge-mcp/tags/resources/outputs.ts b/src/generated/forge-mcp/tags/resources/outputs.ts
index cfedbf1ba..7324e4815 100644
--- a/src/generated/forge-mcp/tags/resources/outputs.ts
+++ b/src/generated/forge-mcp/tags/resources/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `resource-tagging_tagged_resource_response_collection` in
  * responses.
  */
-export const resource_tagging_tagged_resource_response_collection_output: JsonSchema = {
+export const resource$$tagging_tagged_resource_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-tagging_api-response-common"
diff --git a/src/generated/forge-mcp/tags/resources/tools.ts b/src/generated/forge-mcp/tags/resources/tools.ts
index fcf56bb75..713c540e3 100644
--- a/src/generated/forge-mcp/tags/resources/tools.ts
+++ b/src/generated/forge-mcp/tags/resources/tools.ts
@@ -1,81 +1,67 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_tagging_access_application_id_output,
-  resource_tagging_api_response_common_failure_output,
-  resource_tagging_api_response_common_output,
-  resource_tagging_cursor_result_info_output,
-  resource_tagging_etag_output,
-  resource_tagging_identifier_output,
-  resource_tagging_messages_output,
-  resource_tagging_namespace_worker_navigation_output,
-  resource_tagging_resource_id_output,
-  resource_tagging_resource_name_output,
-  resource_tagging_tagged_resource_object_access_application_output,
-  resource_tagging_tagged_resource_object_access_application_policy_base_output,
-  resource_tagging_tagged_resource_object_access_application_policy_output,
-  resource_tagging_tagged_resource_object_access_group_output,
-  resource_tagging_tagged_resource_object_access_service_token_output,
-  resource_tagging_tagged_resource_object_account_level_base_output,
-  resource_tagging_tagged_resource_object_account_output,
-  resource_tagging_tagged_resource_object_account_ruleset_output,
-  resource_tagging_tagged_resource_object_ai_gateway_output,
-  resource_tagging_tagged_resource_object_ai_search_instance_output,
-  resource_tagging_tagged_resource_object_ai_search_namespace_output,
-  resource_tagging_tagged_resource_object_alerting_policy_output,
-  resource_tagging_tagged_resource_object_alerting_webhook_output,
-  resource_tagging_tagged_resource_object_api_gateway_operation_output,
-  resource_tagging_tagged_resource_object_cloudflared_tunnel_output,
-  resource_tagging_tagged_resource_object_custom_certificate_output,
-  resource_tagging_tagged_resource_object_custom_hostname_output,
-  resource_tagging_tagged_resource_object_cws_deployment_output,
-  resource_tagging_tagged_resource_object_cws_policy_output,
-  resource_tagging_tagged_resource_object_cws_policy_set_output,
-  resource_tagging_tagged_resource_object_cws_workload_output,
-  resource_tagging_tagged_resource_object_d1_database_output,
-  resource_tagging_tagged_resource_object_device_output,
-  resource_tagging_tagged_resource_object_dns_record_output,
-  resource_tagging_tagged_resource_object_durable_object_namespace_output,
-  resource_tagging_tagged_resource_object_gateway_list_output,
-  resource_tagging_tagged_resource_object_gateway_rule_output,
-  resource_tagging_tagged_resource_object_healthcheck_output,
-  resource_tagging_tagged_resource_object_image_output,
-  resource_tagging_tagged_resource_object_infrastructure_target_output,
-  resource_tagging_tagged_resource_object_kv_namespace_output,
-  resource_tagging_tagged_resource_object_load_balancer_monitor_output,
-  resource_tagging_tagged_resource_object_load_balancer_output,
-  resource_tagging_tagged_resource_object_load_balancer_pool_output,
-  resource_tagging_tagged_resource_object_managed_client_certificate_output,
-  resource_tagging_tagged_resource_object_namespace_worker_output,
-  resource_tagging_tagged_resource_object_output,
-  resource_tagging_tagged_resource_object_pages_project_output,
-  resource_tagging_tagged_resource_object_queue_output,
-  resource_tagging_tagged_resource_object_r2_bucket_output,
-  resource_tagging_tagged_resource_object_resource_share_output,
-  resource_tagging_tagged_resource_object_stream_live_input_output,
-  resource_tagging_tagged_resource_object_stream_video_output,
-  resource_tagging_tagged_resource_object_vectorize_index_output,
-  resource_tagging_tagged_resource_object_worker_output,
-  resource_tagging_tagged_resource_object_worker_route_output,
-  resource_tagging_tagged_resource_object_worker_version_base_output,
-  resource_tagging_tagged_resource_object_worker_version_output,
-  resource_tagging_tagged_resource_object_zone_level_base_output,
-  resource_tagging_tagged_resource_object_zone_output,
-  resource_tagging_tagged_resource_object_zone_ruleset_output,
-  resource_tagging_tags_output,
-  resource_tagging_tags_updated_at_output,
-  resource_tagging_worker_id_output,
-  resource_tagging_zone_id_output,
+  resource$$tagging_api$$response$$common,
+  resource$$tagging_api$$response$$common$$failure,
+  resource$$tagging_cursor_result_info,
+  resource$$tagging_messages,
+  resource$$tagging_namespace_worker_navigation,
+  resource$$tagging_tagged_resource_object,
+  resource$$tagging_tagged_resource_object_access_application,
+  resource$$tagging_tagged_resource_object_access_application_policy,
+  resource$$tagging_tagged_resource_object_access_application_policy_base,
+  resource$$tagging_tagged_resource_object_access_group,
+  resource$$tagging_tagged_resource_object_access_service_token,
+  resource$$tagging_tagged_resource_object_account,
+  resource$$tagging_tagged_resource_object_account_level_base,
+  resource$$tagging_tagged_resource_object_account_ruleset,
+  resource$$tagging_tagged_resource_object_ai_gateway,
+  resource$$tagging_tagged_resource_object_ai_search_instance,
+  resource$$tagging_tagged_resource_object_ai_search_namespace,
+  resource$$tagging_tagged_resource_object_alerting_policy,
+  resource$$tagging_tagged_resource_object_alerting_webhook,
+  resource$$tagging_tagged_resource_object_api_gateway_operation,
+  resource$$tagging_tagged_resource_object_cloudflared_tunnel,
+  resource$$tagging_tagged_resource_object_custom_certificate,
+  resource$$tagging_tagged_resource_object_custom_hostname,
+  resource$$tagging_tagged_resource_object_cws_deployment,
+  resource$$tagging_tagged_resource_object_cws_policy,
+  resource$$tagging_tagged_resource_object_cws_policy_set,
+  resource$$tagging_tagged_resource_object_cws_workload,
+  resource$$tagging_tagged_resource_object_d1_database,
+  resource$$tagging_tagged_resource_object_device,
+  resource$$tagging_tagged_resource_object_dns_record,
+  resource$$tagging_tagged_resource_object_durable_object_namespace,
+  resource$$tagging_tagged_resource_object_gateway_list,
+  resource$$tagging_tagged_resource_object_gateway_rule,
+  resource$$tagging_tagged_resource_object_healthcheck,
+  resource$$tagging_tagged_resource_object_image,
+  resource$$tagging_tagged_resource_object_infrastructure_target,
+  resource$$tagging_tagged_resource_object_kv_namespace,
+  resource$$tagging_tagged_resource_object_load_balancer,
+  resource$$tagging_tagged_resource_object_load_balancer_monitor,
+  resource$$tagging_tagged_resource_object_load_balancer_pool,
+  resource$$tagging_tagged_resource_object_managed_client_certificate,
+  resource$$tagging_tagged_resource_object_namespace_worker,
+  resource$$tagging_tagged_resource_object_pages_project,
+  resource$$tagging_tagged_resource_object_queue,
+  resource$$tagging_tagged_resource_object_r2_bucket,
+  resource$$tagging_tagged_resource_object_resource_share,
+  resource$$tagging_tagged_resource_object_stream_live_input,
+  resource$$tagging_tagged_resource_object_stream_video,
+  resource$$tagging_tagged_resource_object_vectorize_index,
+  resource$$tagging_tagged_resource_object_worker,
+  resource$$tagging_tagged_resource_object_worker_route,
+  resource$$tagging_tagged_resource_object_worker_version,
+  resource$$tagging_tagged_resource_object_worker_version_base,
+  resource$$tagging_tagged_resource_object_zone,
+  resource$$tagging_tagged_resource_object_zone_level_base,
+  resource$$tagging_tagged_resource_object_zone_ruleset,
+  resource$$tagging_tags,
 } from "../outputs.js";
-import {
-  resource_tagging_account_id,
-  resource_tagging_identifier,
-  resource_tagging_resource_id,
-  resource_tagging_resource_type,
-} from "../schemas.js";
-import { resource_tagging_tagged_resource_response_collection_output } from "./outputs.js";
+import { resource$$tagging_tagged_resource_response_collection } from "./outputs.js";
 
 /**
  * The tools of `tags.resources`.
@@ -84,132 +70,185 @@ export const tools: readonly Tool[] = [
   {
     name: "tags_resources_list",
     title: "List tagged resources",
-    description: "Lists all tagged resources for an account.\n\nThis method is beta.",
+    description: "Lists all tagged resources for an account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/tags/resources",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-tagging_account_id"
-        },
-        "case_insensitive": {
-          "default": false,
-          "description": "Match `tag` keys and values case-insensitively. Stored casing is unchanged. Example: ?tag=environment=production&case_insensitive=true",
-          "type": "boolean"
-        },
-        "cursor": {
-          "description": "Cursor for pagination.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Filter by resource ID. Can be repeated up to 50 times to filter by multiple IDs. Example: ?id=abc&id=def",
-          "items": {
-            "$ref": "#/$defs/resource-tagging_resource_id"
-          },
-          "maxItems": 50,
-          "type": "array"
-        },
-        "include_navigation": {
-          "default": false,
-          "description": "Resolve current namespace Worker navigation by immutable child tag. Optional read-only navigation is omitted for deleted or unresolved children. Lookups are limited to this page, at most five concurrently, with a shared two-second budget. Tag identity, ETag, filters and pagination are unchanged; name filtering still uses the stored resource name. Defaults to false.",
-          "type": "boolean"
-        },
-        "name": {
-          "description": "Filter by resource name. Performs a case-insensitive substring match. Example: ?name=my-zone",
-          "type": "string"
-        },
-        "tag": {
-          "description": "Filter resources by tag criteria. This parameter can be repeated multiple times, with AND logic between parameters.\n\nSupported syntax:\n- **Key-only**: `tag=<key>` - Resource must have the tag key (e.g., `tag=production`)\n- **Key-value**: `tag=<key>=<value>` - Resource must have the tag with specific value (e.g., `tag=env=prod`)\n- **Multiple values (OR)**: `tag=<key>=<v1>,<v2>` - Resource must have tag with any of the values (e.g., `tag=env=prod,staging`)\n- **Negate key-only**: `tag=!<key>` - Resource must not have the tag key (e.g., `tag=!archived`)\n- **Negate key-value**: `tag=<key>!=<value>` - Resource must not have the tag with specific value (e.g., `tag=region!=us-west-1`)\n\nMultiple tag parameters are combined with AND logic.\n",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "type": {
-          "description": "Filter by resource type. Can be repeated to filter by multiple types (OR logic). Example: ?type=zone&type=worker",
-          "items": {
-            "$ref": "#/$defs/resource-tagging_resource_type"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "case_insensitive": {
+              "default": false,
+              "description": "Match `tag` keys and values case-insensitively. Stored casing is unchanged. Example: ?tag=environment=production&case_insensitive=true",
+              "type": "boolean"
+            },
+            "cursor": {
+              "description": "Cursor for pagination.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Filter by resource ID. Can be repeated up to 50 times to filter by multiple IDs. Example: ?id=abc&id=def",
+              "items": {
+                "description": "Identifies the unique resource.",
+                "type": "string"
+              },
+              "maxItems": 50,
+              "type": "array"
+            },
+            "include_navigation": {
+              "default": false,
+              "description": "Resolve current namespace Worker navigation by immutable child tag. Optional read-only navigation is omitted for deleted or unresolved children. Lookups are limited to this page, at most five concurrently, with a shared two-second budget. Tag identity, ETag, filters and pagination are unchanged; name filtering still uses the stored resource name. Defaults to false.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "Filter by resource name. Performs a case-insensitive substring match. Example: ?name=my-zone",
+              "type": "string"
+            },
+            "tag": {
+              "description": "Filter resources by tag criteria. This parameter can be repeated multiple times, with AND logic between parameters.\n\nSupported syntax:\n- **Key-only**: `tag=<key>` - Resource must have the tag key (e.g., `tag=production`)\n- **Key-value**: `tag=<key>=<value>` - Resource must have the tag with specific value (e.g., `tag=env=prod`)\n- **Multiple values (OR)**: `tag=<key>=<v1>,<v2>` - Resource must have tag with any of the values (e.g., `tag=env=prod,staging`)\n- **Negate key-only**: `tag=!<key>` - Resource must not have the tag key (e.g., `tag=!archived`)\n- **Negate key-value**: `tag=<key>!=<value>` - Resource must not have the tag with specific value (e.g., `tag=region!=us-west-1`)\n\nMultiple tag parameters are combined with AND logic.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "type": {
+              "description": "Filter by resource type. Can be repeated to filter by multiple types (OR logic). Example: ?type=zone&type=worker",
+              "items": {
+                "description": "Identifies the type of resource.",
+                "enum": [
+                  "access_application",
+                  "access_application_policy",
+                  "access_group",
+                  "access_service_token",
+                  "account",
+                  "account_ruleset",
+                  "ai_gateway",
+                  "ai_search_instance",
+                  "ai_search_namespace",
+                  "alerting_policy",
+                  "alerting_webhook",
+                  "api_gateway_operation",
+                  "cloudflared_tunnel",
+                  "custom_certificate",
+                  "custom_hostname",
+                  "cws_deployment",
+                  "cws_policy",
+                  "cws_policy_set",
+                  "cws_workload",
+                  "d1_database",
+                  "device",
+                  "dns_record",
+                  "durable_object_namespace",
+                  "gateway_list",
+                  "gateway_rule",
+                  "healthcheck",
+                  "image",
+                  "infrastructure_target",
+                  "kv_namespace",
+                  "load_balancer",
+                  "load_balancer_monitor",
+                  "load_balancer_pool",
+                  "managed_client_certificate",
+                  "namespace_worker",
+                  "pages_project",
+                  "queue",
+                  "r2_bucket",
+                  "resource_share",
+                  "stream_live_input",
+                  "stream_video",
+                  "vectorize_index",
+                  "worker",
+                  "worker_route",
+                  "worker_version",
+                  "zone",
+                  "zone_ruleset"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "resource-tagging_account_id": resource_tagging_account_id,
-        "resource-tagging_identifier": resource_tagging_identifier,
-        "resource-tagging_resource_id": resource_tagging_resource_id,
-        "resource-tagging_resource_type": resource_tagging_resource_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-tagging_tagged_resource_response_collection",
       $defs: {
-        "resource-tagging_access_application_id": resource_tagging_access_application_id_output,
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_cursor_result_info": resource_tagging_cursor_result_info_output,
-        "resource-tagging_etag": resource_tagging_etag_output,
-        "resource-tagging_identifier": resource_tagging_identifier_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_namespace_worker_navigation": resource_tagging_namespace_worker_navigation_output,
-        "resource-tagging_resource_id": resource_tagging_resource_id_output,
-        "resource-tagging_resource_name": resource_tagging_resource_name_output,
-        "resource-tagging_tagged_resource_object": resource_tagging_tagged_resource_object_output,
-        "resource-tagging_tagged_resource_object_access_application": resource_tagging_tagged_resource_object_access_application_output,
-        "resource-tagging_tagged_resource_object_access_application_policy": resource_tagging_tagged_resource_object_access_application_policy_output,
-        "resource-tagging_tagged_resource_object_access_application_policy_base": resource_tagging_tagged_resource_object_access_application_policy_base_output,
-        "resource-tagging_tagged_resource_object_access_group": resource_tagging_tagged_resource_object_access_group_output,
-        "resource-tagging_tagged_resource_object_access_service_token": resource_tagging_tagged_resource_object_access_service_token_output,
-        "resource-tagging_tagged_resource_object_account": resource_tagging_tagged_resource_object_account_output,
-        "resource-tagging_tagged_resource_object_account_level_base": resource_tagging_tagged_resource_object_account_level_base_output,
-        "resource-tagging_tagged_resource_object_account_ruleset": resource_tagging_tagged_resource_object_account_ruleset_output,
-        "resource-tagging_tagged_resource_object_ai_gateway": resource_tagging_tagged_resource_object_ai_gateway_output,
-        "resource-tagging_tagged_resource_object_ai_search_instance": resource_tagging_tagged_resource_object_ai_search_instance_output,
-        "resource-tagging_tagged_resource_object_ai_search_namespace": resource_tagging_tagged_resource_object_ai_search_namespace_output,
-        "resource-tagging_tagged_resource_object_alerting_policy": resource_tagging_tagged_resource_object_alerting_policy_output,
-        "resource-tagging_tagged_resource_object_alerting_webhook": resource_tagging_tagged_resource_object_alerting_webhook_output,
-        "resource-tagging_tagged_resource_object_api_gateway_operation": resource_tagging_tagged_resource_object_api_gateway_operation_output,
-        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource_tagging_tagged_resource_object_cloudflared_tunnel_output,
-        "resource-tagging_tagged_resource_object_custom_certificate": resource_tagging_tagged_resource_object_custom_certificate_output,
-        "resource-tagging_tagged_resource_object_custom_hostname": resource_tagging_tagged_resource_object_custom_hostname_output,
-        "resource-tagging_tagged_resource_object_cws_deployment": resource_tagging_tagged_resource_object_cws_deployment_output,
-        "resource-tagging_tagged_resource_object_cws_policy": resource_tagging_tagged_resource_object_cws_policy_output,
-        "resource-tagging_tagged_resource_object_cws_policy_set": resource_tagging_tagged_resource_object_cws_policy_set_output,
-        "resource-tagging_tagged_resource_object_cws_workload": resource_tagging_tagged_resource_object_cws_workload_output,
-        "resource-tagging_tagged_resource_object_d1_database": resource_tagging_tagged_resource_object_d1_database_output,
-        "resource-tagging_tagged_resource_object_device": resource_tagging_tagged_resource_object_device_output,
-        "resource-tagging_tagged_resource_object_dns_record": resource_tagging_tagged_resource_object_dns_record_output,
-        "resource-tagging_tagged_resource_object_durable_object_namespace": resource_tagging_tagged_resource_object_durable_object_namespace_output,
-        "resource-tagging_tagged_resource_object_gateway_list": resource_tagging_tagged_resource_object_gateway_list_output,
-        "resource-tagging_tagged_resource_object_gateway_rule": resource_tagging_tagged_resource_object_gateway_rule_output,
-        "resource-tagging_tagged_resource_object_healthcheck": resource_tagging_tagged_resource_object_healthcheck_output,
-        "resource-tagging_tagged_resource_object_image": resource_tagging_tagged_resource_object_image_output,
-        "resource-tagging_tagged_resource_object_infrastructure_target": resource_tagging_tagged_resource_object_infrastructure_target_output,
-        "resource-tagging_tagged_resource_object_kv_namespace": resource_tagging_tagged_resource_object_kv_namespace_output,
-        "resource-tagging_tagged_resource_object_load_balancer": resource_tagging_tagged_resource_object_load_balancer_output,
-        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource_tagging_tagged_resource_object_load_balancer_monitor_output,
-        "resource-tagging_tagged_resource_object_load_balancer_pool": resource_tagging_tagged_resource_object_load_balancer_pool_output,
-        "resource-tagging_tagged_resource_object_managed_client_certificate": resource_tagging_tagged_resource_object_managed_client_certificate_output,
-        "resource-tagging_tagged_resource_object_namespace_worker": resource_tagging_tagged_resource_object_namespace_worker_output,
-        "resource-tagging_tagged_resource_object_pages_project": resource_tagging_tagged_resource_object_pages_project_output,
-        "resource-tagging_tagged_resource_object_queue": resource_tagging_tagged_resource_object_queue_output,
-        "resource-tagging_tagged_resource_object_r2_bucket": resource_tagging_tagged_resource_object_r2_bucket_output,
-        "resource-tagging_tagged_resource_object_resource_share": resource_tagging_tagged_resource_object_resource_share_output,
-        "resource-tagging_tagged_resource_object_stream_live_input": resource_tagging_tagged_resource_object_stream_live_input_output,
-        "resource-tagging_tagged_resource_object_stream_video": resource_tagging_tagged_resource_object_stream_video_output,
-        "resource-tagging_tagged_resource_object_vectorize_index": resource_tagging_tagged_resource_object_vectorize_index_output,
-        "resource-tagging_tagged_resource_object_worker": resource_tagging_tagged_resource_object_worker_output,
-        "resource-tagging_tagged_resource_object_worker_route": resource_tagging_tagged_resource_object_worker_route_output,
-        "resource-tagging_tagged_resource_object_worker_version": resource_tagging_tagged_resource_object_worker_version_output,
-        "resource-tagging_tagged_resource_object_worker_version_base": resource_tagging_tagged_resource_object_worker_version_base_output,
-        "resource-tagging_tagged_resource_object_zone": resource_tagging_tagged_resource_object_zone_output,
-        "resource-tagging_tagged_resource_object_zone_level_base": resource_tagging_tagged_resource_object_zone_level_base_output,
-        "resource-tagging_tagged_resource_object_zone_ruleset": resource_tagging_tagged_resource_object_zone_ruleset_output,
-        "resource-tagging_tagged_resource_response_collection": resource_tagging_tagged_resource_response_collection_output,
-        "resource-tagging_tags": resource_tagging_tags_output,
-        "resource-tagging_tags_updated_at": resource_tagging_tags_updated_at_output,
-        "resource-tagging_worker_id": resource_tagging_worker_id_output,
-        "resource-tagging_zone_id": resource_tagging_zone_id_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_cursor_result_info": resource$$tagging_cursor_result_info,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_namespace_worker_navigation": resource$$tagging_namespace_worker_navigation,
+        "resource-tagging_tagged_resource_object": resource$$tagging_tagged_resource_object,
+        "resource-tagging_tagged_resource_object_access_application": resource$$tagging_tagged_resource_object_access_application,
+        "resource-tagging_tagged_resource_object_access_application_policy": resource$$tagging_tagged_resource_object_access_application_policy,
+        "resource-tagging_tagged_resource_object_access_application_policy_base": resource$$tagging_tagged_resource_object_access_application_policy_base,
+        "resource-tagging_tagged_resource_object_access_group": resource$$tagging_tagged_resource_object_access_group,
+        "resource-tagging_tagged_resource_object_access_service_token": resource$$tagging_tagged_resource_object_access_service_token,
+        "resource-tagging_tagged_resource_object_account": resource$$tagging_tagged_resource_object_account,
+        "resource-tagging_tagged_resource_object_account_level_base": resource$$tagging_tagged_resource_object_account_level_base,
+        "resource-tagging_tagged_resource_object_account_ruleset": resource$$tagging_tagged_resource_object_account_ruleset,
+        "resource-tagging_tagged_resource_object_ai_gateway": resource$$tagging_tagged_resource_object_ai_gateway,
+        "resource-tagging_tagged_resource_object_ai_search_instance": resource$$tagging_tagged_resource_object_ai_search_instance,
+        "resource-tagging_tagged_resource_object_ai_search_namespace": resource$$tagging_tagged_resource_object_ai_search_namespace,
+        "resource-tagging_tagged_resource_object_alerting_policy": resource$$tagging_tagged_resource_object_alerting_policy,
+        "resource-tagging_tagged_resource_object_alerting_webhook": resource$$tagging_tagged_resource_object_alerting_webhook,
+        "resource-tagging_tagged_resource_object_api_gateway_operation": resource$$tagging_tagged_resource_object_api_gateway_operation,
+        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource$$tagging_tagged_resource_object_cloudflared_tunnel,
+        "resource-tagging_tagged_resource_object_custom_certificate": resource$$tagging_tagged_resource_object_custom_certificate,
+        "resource-tagging_tagged_resource_object_custom_hostname": resource$$tagging_tagged_resource_object_custom_hostname,
+        "resource-tagging_tagged_resource_object_cws_deployment": resource$$tagging_tagged_resource_object_cws_deployment,
+        "resource-tagging_tagged_resource_object_cws_policy": resource$$tagging_tagged_resource_object_cws_policy,
+        "resource-tagging_tagged_resource_object_cws_policy_set": resource$$tagging_tagged_resource_object_cws_policy_set,
+        "resource-tagging_tagged_resource_object_cws_workload": resource$$tagging_tagged_resource_object_cws_workload,
+        "resource-tagging_tagged_resource_object_d1_database": resource$$tagging_tagged_resource_object_d1_database,
+        "resource-tagging_tagged_resource_object_device": resource$$tagging_tagged_resource_object_device,
+        "resource-tagging_tagged_resource_object_dns_record": resource$$tagging_tagged_resource_object_dns_record,
+        "resource-tagging_tagged_resource_object_durable_object_namespace": resource$$tagging_tagged_resource_object_durable_object_namespace,
+        "resource-tagging_tagged_resource_object_gateway_list": resource$$tagging_tagged_resource_object_gateway_list,
+        "resource-tagging_tagged_resource_object_gateway_rule": resource$$tagging_tagged_resource_object_gateway_rule,
+        "resource-tagging_tagged_resource_object_healthcheck": resource$$tagging_tagged_resource_object_healthcheck,
+        "resource-tagging_tagged_resource_object_image": resource$$tagging_tagged_resource_object_image,
+        "resource-tagging_tagged_resource_object_infrastructure_target": resource$$tagging_tagged_resource_object_infrastructure_target,
+        "resource-tagging_tagged_resource_object_kv_namespace": resource$$tagging_tagged_resource_object_kv_namespace,
+        "resource-tagging_tagged_resource_object_load_balancer": resource$$tagging_tagged_resource_object_load_balancer,
+        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource$$tagging_tagged_resource_object_load_balancer_monitor,
+        "resource-tagging_tagged_resource_object_load_balancer_pool": resource$$tagging_tagged_resource_object_load_balancer_pool,
+        "resource-tagging_tagged_resource_object_managed_client_certificate": resource$$tagging_tagged_resource_object_managed_client_certificate,
+        "resource-tagging_tagged_resource_object_namespace_worker": resource$$tagging_tagged_resource_object_namespace_worker,
+        "resource-tagging_tagged_resource_object_pages_project": resource$$tagging_tagged_resource_object_pages_project,
+        "resource-tagging_tagged_resource_object_queue": resource$$tagging_tagged_resource_object_queue,
+        "resource-tagging_tagged_resource_object_r2_bucket": resource$$tagging_tagged_resource_object_r2_bucket,
+        "resource-tagging_tagged_resource_object_resource_share": resource$$tagging_tagged_resource_object_resource_share,
+        "resource-tagging_tagged_resource_object_stream_live_input": resource$$tagging_tagged_resource_object_stream_live_input,
+        "resource-tagging_tagged_resource_object_stream_video": resource$$tagging_tagged_resource_object_stream_video,
+        "resource-tagging_tagged_resource_object_vectorize_index": resource$$tagging_tagged_resource_object_vectorize_index,
+        "resource-tagging_tagged_resource_object_worker": resource$$tagging_tagged_resource_object_worker,
+        "resource-tagging_tagged_resource_object_worker_route": resource$$tagging_tagged_resource_object_worker_route,
+        "resource-tagging_tagged_resource_object_worker_version": resource$$tagging_tagged_resource_object_worker_version,
+        "resource-tagging_tagged_resource_object_worker_version_base": resource$$tagging_tagged_resource_object_worker_version_base,
+        "resource-tagging_tagged_resource_object_zone": resource$$tagging_tagged_resource_object_zone,
+        "resource-tagging_tagged_resource_object_zone_level_base": resource$$tagging_tagged_resource_object_zone_level_base,
+        "resource-tagging_tagged_resource_object_zone_ruleset": resource$$tagging_tagged_resource_object_zone_ruleset,
+        "resource-tagging_tagged_resource_response_collection": resource$$tagging_tagged_resource_response_collection,
+        "resource-tagging_tags": resource$$tagging_tags,
       },
     },
     annotations: {
@@ -243,84 +282,76 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-tagging_access_application_id": resource_tagging_access_application_id_output,
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_api-response-common-failure": resource_tagging_api_response_common_failure_output,
-        "resource-tagging_cursor_result_info": resource_tagging_cursor_result_info_output,
-        "resource-tagging_etag": resource_tagging_etag_output,
-        "resource-tagging_identifier": resource_tagging_identifier_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_namespace_worker_navigation": resource_tagging_namespace_worker_navigation_output,
-        "resource-tagging_resource_id": resource_tagging_resource_id_output,
-        "resource-tagging_resource_name": resource_tagging_resource_name_output,
-        "resource-tagging_tagged_resource_object": resource_tagging_tagged_resource_object_output,
-        "resource-tagging_tagged_resource_object_access_application": resource_tagging_tagged_resource_object_access_application_output,
-        "resource-tagging_tagged_resource_object_access_application_policy": resource_tagging_tagged_resource_object_access_application_policy_output,
-        "resource-tagging_tagged_resource_object_access_application_policy_base": resource_tagging_tagged_resource_object_access_application_policy_base_output,
-        "resource-tagging_tagged_resource_object_access_group": resource_tagging_tagged_resource_object_access_group_output,
-        "resource-tagging_tagged_resource_object_access_service_token": resource_tagging_tagged_resource_object_access_service_token_output,
-        "resource-tagging_tagged_resource_object_account": resource_tagging_tagged_resource_object_account_output,
-        "resource-tagging_tagged_resource_object_account_level_base": resource_tagging_tagged_resource_object_account_level_base_output,
-        "resource-tagging_tagged_resource_object_account_ruleset": resource_tagging_tagged_resource_object_account_ruleset_output,
-        "resource-tagging_tagged_resource_object_ai_gateway": resource_tagging_tagged_resource_object_ai_gateway_output,
-        "resource-tagging_tagged_resource_object_ai_search_instance": resource_tagging_tagged_resource_object_ai_search_instance_output,
-        "resource-tagging_tagged_resource_object_ai_search_namespace": resource_tagging_tagged_resource_object_ai_search_namespace_output,
-        "resource-tagging_tagged_resource_object_alerting_policy": resource_tagging_tagged_resource_object_alerting_policy_output,
-        "resource-tagging_tagged_resource_object_alerting_webhook": resource_tagging_tagged_resource_object_alerting_webhook_output,
-        "resource-tagging_tagged_resource_object_api_gateway_operation": resource_tagging_tagged_resource_object_api_gateway_operation_output,
-        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource_tagging_tagged_resource_object_cloudflared_tunnel_output,
-        "resource-tagging_tagged_resource_object_custom_certificate": resource_tagging_tagged_resource_object_custom_certificate_output,
-        "resource-tagging_tagged_resource_object_custom_hostname": resource_tagging_tagged_resource_object_custom_hostname_output,
-        "resource-tagging_tagged_resource_object_cws_deployment": resource_tagging_tagged_resource_object_cws_deployment_output,
-        "resource-tagging_tagged_resource_object_cws_policy": resource_tagging_tagged_resource_object_cws_policy_output,
-        "resource-tagging_tagged_resource_object_cws_policy_set": resource_tagging_tagged_resource_object_cws_policy_set_output,
-        "resource-tagging_tagged_resource_object_cws_workload": resource_tagging_tagged_resource_object_cws_workload_output,
-        "resource-tagging_tagged_resource_object_d1_database": resource_tagging_tagged_resource_object_d1_database_output,
-        "resource-tagging_tagged_resource_object_device": resource_tagging_tagged_resource_object_device_output,
-        "resource-tagging_tagged_resource_object_dns_record": resource_tagging_tagged_resource_object_dns_record_output,
-        "resource-tagging_tagged_resource_object_durable_object_namespace": resource_tagging_tagged_resource_object_durable_object_namespace_output,
-        "resource-tagging_tagged_resource_object_gateway_list": resource_tagging_tagged_resource_object_gateway_list_output,
-        "resource-tagging_tagged_resource_object_gateway_rule": resource_tagging_tagged_resource_object_gateway_rule_output,
-        "resource-tagging_tagged_resource_object_healthcheck": resource_tagging_tagged_resource_object_healthcheck_output,
-        "resource-tagging_tagged_resource_object_image": resource_tagging_tagged_resource_object_image_output,
-        "resource-tagging_tagged_resource_object_infrastructure_target": resource_tagging_tagged_resource_object_infrastructure_target_output,
-        "resource-tagging_tagged_resource_object_kv_namespace": resource_tagging_tagged_resource_object_kv_namespace_output,
-        "resource-tagging_tagged_resource_object_load_balancer": resource_tagging_tagged_resource_object_load_balancer_output,
-        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource_tagging_tagged_resource_object_load_balancer_monitor_output,
-        "resource-tagging_tagged_resource_object_load_balancer_pool": resource_tagging_tagged_resource_object_load_balancer_pool_output,
-        "resource-tagging_tagged_resource_object_managed_client_certificate": resource_tagging_tagged_resource_object_managed_client_certificate_output,
-        "resource-tagging_tagged_resource_object_namespace_worker": resource_tagging_tagged_resource_object_namespace_worker_output,
-        "resource-tagging_tagged_resource_object_pages_project": resource_tagging_tagged_resource_object_pages_project_output,
-        "resource-tagging_tagged_resource_object_queue": resource_tagging_tagged_resource_object_queue_output,
-        "resource-tagging_tagged_resource_object_r2_bucket": resource_tagging_tagged_resource_object_r2_bucket_output,
-        "resource-tagging_tagged_resource_object_resource_share": resource_tagging_tagged_resource_object_resource_share_output,
-        "resource-tagging_tagged_resource_object_stream_live_input": resource_tagging_tagged_resource_object_stream_live_input_output,
-        "resource-tagging_tagged_resource_object_stream_video": resource_tagging_tagged_resource_object_stream_video_output,
-        "resource-tagging_tagged_resource_object_vectorize_index": resource_tagging_tagged_resource_object_vectorize_index_output,
-        "resource-tagging_tagged_resource_object_worker": resource_tagging_tagged_resource_object_worker_output,
-        "resource-tagging_tagged_resource_object_worker_route": resource_tagging_tagged_resource_object_worker_route_output,
-        "resource-tagging_tagged_resource_object_worker_version": resource_tagging_tagged_resource_object_worker_version_output,
-        "resource-tagging_tagged_resource_object_worker_version_base": resource_tagging_tagged_resource_object_worker_version_base_output,
-        "resource-tagging_tagged_resource_object_zone": resource_tagging_tagged_resource_object_zone_output,
-        "resource-tagging_tagged_resource_object_zone_level_base": resource_tagging_tagged_resource_object_zone_level_base_output,
-        "resource-tagging_tagged_resource_object_zone_ruleset": resource_tagging_tagged_resource_object_zone_ruleset_output,
-        "resource-tagging_tagged_resource_response_collection": resource_tagging_tagged_resource_response_collection_output,
-        "resource-tagging_tags": resource_tagging_tags_output,
-        "resource-tagging_tags_updated_at": resource_tagging_tags_updated_at_output,
-        "resource-tagging_worker_id": resource_tagging_worker_id_output,
-        "resource-tagging_zone_id": resource_tagging_zone_id_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_api-response-common-failure": resource$$tagging_api$$response$$common$$failure,
+        "resource-tagging_cursor_result_info": resource$$tagging_cursor_result_info,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_namespace_worker_navigation": resource$$tagging_namespace_worker_navigation,
+        "resource-tagging_tagged_resource_object": resource$$tagging_tagged_resource_object,
+        "resource-tagging_tagged_resource_object_access_application": resource$$tagging_tagged_resource_object_access_application,
+        "resource-tagging_tagged_resource_object_access_application_policy": resource$$tagging_tagged_resource_object_access_application_policy,
+        "resource-tagging_tagged_resource_object_access_application_policy_base": resource$$tagging_tagged_resource_object_access_application_policy_base,
+        "resource-tagging_tagged_resource_object_access_group": resource$$tagging_tagged_resource_object_access_group,
+        "resource-tagging_tagged_resource_object_access_service_token": resource$$tagging_tagged_resource_object_access_service_token,
+        "resource-tagging_tagged_resource_object_account": resource$$tagging_tagged_resource_object_account,
+        "resource-tagging_tagged_resource_object_account_level_base": resource$$tagging_tagged_resource_object_account_level_base,
+        "resource-tagging_tagged_resource_object_account_ruleset": resource$$tagging_tagged_resource_object_account_ruleset,
+        "resource-tagging_tagged_resource_object_ai_gateway": resource$$tagging_tagged_resource_object_ai_gateway,
+        "resource-tagging_tagged_resource_object_ai_search_instance": resource$$tagging_tagged_resource_object_ai_search_instance,
+        "resource-tagging_tagged_resource_object_ai_search_namespace": resource$$tagging_tagged_resource_object_ai_search_namespace,
+        "resource-tagging_tagged_resource_object_alerting_policy": resource$$tagging_tagged_resource_object_alerting_policy,
+        "resource-tagging_tagged_resource_object_alerting_webhook": resource$$tagging_tagged_resource_object_alerting_webhook,
+        "resource-tagging_tagged_resource_object_api_gateway_operation": resource$$tagging_tagged_resource_object_api_gateway_operation,
+        "resource-tagging_tagged_resource_object_cloudflared_tunnel": resource$$tagging_tagged_resource_object_cloudflared_tunnel,
+        "resource-tagging_tagged_resource_object_custom_certificate": resource$$tagging_tagged_resource_object_custom_certificate,
+        "resource-tagging_tagged_resource_object_custom_hostname": resource$$tagging_tagged_resource_object_custom_hostname,
+        "resource-tagging_tagged_resource_object_cws_deployment": resource$$tagging_tagged_resource_object_cws_deployment,
+        "resource-tagging_tagged_resource_object_cws_policy": resource$$tagging_tagged_resource_object_cws_policy,
+        "resource-tagging_tagged_resource_object_cws_policy_set": resource$$tagging_tagged_resource_object_cws_policy_set,
+        "resource-tagging_tagged_resource_object_cws_workload": resource$$tagging_tagged_resource_object_cws_workload,
+        "resource-tagging_tagged_resource_object_d1_database": resource$$tagging_tagged_resource_object_d1_database,
+        "resource-tagging_tagged_resource_object_device": resource$$tagging_tagged_resource_object_device,
+        "resource-tagging_tagged_resource_object_dns_record": resource$$tagging_tagged_resource_object_dns_record,
+        "resource-tagging_tagged_resource_object_durable_object_namespace": resource$$tagging_tagged_resource_object_durable_object_namespace,
+        "resource-tagging_tagged_resource_object_gateway_list": resource$$tagging_tagged_resource_object_gateway_list,
+        "resource-tagging_tagged_resource_object_gateway_rule": resource$$tagging_tagged_resource_object_gateway_rule,
+        "resource-tagging_tagged_resource_object_healthcheck": resource$$tagging_tagged_resource_object_healthcheck,
+        "resource-tagging_tagged_resource_object_image": resource$$tagging_tagged_resource_object_image,
+        "resource-tagging_tagged_resource_object_infrastructure_target": resource$$tagging_tagged_resource_object_infrastructure_target,
+        "resource-tagging_tagged_resource_object_kv_namespace": resource$$tagging_tagged_resource_object_kv_namespace,
+        "resource-tagging_tagged_resource_object_load_balancer": resource$$tagging_tagged_resource_object_load_balancer,
+        "resource-tagging_tagged_resource_object_load_balancer_monitor": resource$$tagging_tagged_resource_object_load_balancer_monitor,
+        "resource-tagging_tagged_resource_object_load_balancer_pool": resource$$tagging_tagged_resource_object_load_balancer_pool,
+        "resource-tagging_tagged_resource_object_managed_client_certificate": resource$$tagging_tagged_resource_object_managed_client_certificate,
+        "resource-tagging_tagged_resource_object_namespace_worker": resource$$tagging_tagged_resource_object_namespace_worker,
+        "resource-tagging_tagged_resource_object_pages_project": resource$$tagging_tagged_resource_object_pages_project,
+        "resource-tagging_tagged_resource_object_queue": resource$$tagging_tagged_resource_object_queue,
+        "resource-tagging_tagged_resource_object_r2_bucket": resource$$tagging_tagged_resource_object_r2_bucket,
+        "resource-tagging_tagged_resource_object_resource_share": resource$$tagging_tagged_resource_object_resource_share,
+        "resource-tagging_tagged_resource_object_stream_live_input": resource$$tagging_tagged_resource_object_stream_live_input,
+        "resource-tagging_tagged_resource_object_stream_video": resource$$tagging_tagged_resource_object_stream_video,
+        "resource-tagging_tagged_resource_object_vectorize_index": resource$$tagging_tagged_resource_object_vectorize_index,
+        "resource-tagging_tagged_resource_object_worker": resource$$tagging_tagged_resource_object_worker,
+        "resource-tagging_tagged_resource_object_worker_route": resource$$tagging_tagged_resource_object_worker_route,
+        "resource-tagging_tagged_resource_object_worker_version": resource$$tagging_tagged_resource_object_worker_version,
+        "resource-tagging_tagged_resource_object_worker_version_base": resource$$tagging_tagged_resource_object_worker_version_base,
+        "resource-tagging_tagged_resource_object_zone": resource$$tagging_tagged_resource_object_zone,
+        "resource-tagging_tagged_resource_object_zone_level_base": resource$$tagging_tagged_resource_object_zone_level_base,
+        "resource-tagging_tagged_resource_object_zone_ruleset": resource$$tagging_tagged_resource_object_zone_ruleset,
+        "resource-tagging_tagged_resource_response_collection": resource$$tagging_tagged_resource_response_collection,
+        "resource-tagging_tags": resource$$tagging_tags,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/tags/resources`,
       query: [
-        ["include_navigation", args["include_navigation"], true],
-        ["type", args["type"], true],
-        ["name", args["name"], true],
-        ["id", args["id"], true],
-        ["case_insensitive", args["case_insensitive"], true],
-        ["tag", args["tag"], true],
-        ["cursor", args["cursor"], true],
+        ["include_navigation", param(args, "query", "include_navigation"), true],
+        ["type", param(args, "query", "type"), true],
+        ["name", param(args, "query", "name"), true],
+        ["id", param(args, "query", "id"), true],
+        ["case_insensitive", param(args, "query", "case_insensitive"), true],
+        ["tag", param(args, "query", "tag"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/tags/schemas.ts b/src/generated/forge-mcp/tags/schemas.ts
index 0688d0401..32256b8b8 100644
--- a/src/generated/forge-mcp/tags/schemas.ts
+++ b/src/generated/forge-mcp/tags/schemas.ts
@@ -3,100 +3,13 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `resource-tagging_account_id`.
- */
-export const resource_tagging_account_id: JsonSchema = {
-  "$ref": "#/$defs/resource-tagging_identifier"
-};
-
-/**
- * The schema of `resource-tagging_identifier`.
- */
-export const resource_tagging_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-tagging_resource_id`.
- */
-export const resource_tagging_resource_id: JsonSchema = {
-  "description": "Identifies the unique resource.",
-  "type": "string"
-};
-
-/**
- * The schema of `resource-tagging_resource_type`.
- */
-export const resource_tagging_resource_type: JsonSchema = {
-  "description": "Identifies the type of resource.",
-  "enum": [
-    "access_application",
-    "access_application_policy",
-    "access_group",
-    "access_service_token",
-    "account",
-    "account_ruleset",
-    "ai_gateway",
-    "ai_search_instance",
-    "ai_search_namespace",
-    "alerting_policy",
-    "alerting_webhook",
-    "api_gateway_operation",
-    "cloudflared_tunnel",
-    "custom_certificate",
-    "custom_hostname",
-    "cws_deployment",
-    "cws_policy",
-    "cws_policy_set",
-    "cws_workload",
-    "d1_database",
-    "device",
-    "dns_record",
-    "durable_object_namespace",
-    "gateway_list",
-    "gateway_rule",
-    "healthcheck",
-    "image",
-    "infrastructure_target",
-    "kv_namespace",
-    "load_balancer",
-    "load_balancer_monitor",
-    "load_balancer_pool",
-    "managed_client_certificate",
-    "namespace_worker",
-    "pages_project",
-    "queue",
-    "r2_bucket",
-    "resource_share",
-    "stream_live_input",
-    "stream_video",
-    "vectorize_index",
-    "worker",
-    "worker_route",
-    "worker_version",
-    "zone",
-    "zone_ruleset"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `resource-tagging_tags`.
  */
-export const resource_tagging_tags: JsonSchema = {
+export const resource$$tagging_tags: JsonSchema = {
   "additionalProperties": {
     "type": "string"
   },
   "description": "Contains key-value pairs of tags. Keys may contain at most 256 characters. Values may contain at most 1024 characters and may be empty for key-only tags.",
   "type": "object"
 };
-
-/**
- * The schema of `resource-tagging_worker_id`.
- */
-export const resource_tagging_worker_id: JsonSchema = {
-  "description": "Worker ID is required only for worker_version resources",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/tags/summary/outputs.ts b/src/generated/forge-mcp/tags/summary/outputs.ts
index 226de1747..b4c54dede 100644
--- a/src/generated/forge-mcp/tags/summary/outputs.ts
+++ b/src/generated/forge-mcp/tags/summary/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `resource-tagging_tag_key_summary` in responses.
  */
-export const resource_tagging_tag_key_summary_output: JsonSchema = {
+export const resource$$tagging_tag_key_summary: JsonSchema = {
   "properties": {
     "key": {
       "type": "string"
@@ -29,7 +29,7 @@ export const resource_tagging_tag_key_summary_output: JsonSchema = {
  * The schema of `resource-tagging_tag_key_summary_response_collection` in
  * responses.
  */
-export const resource_tagging_tag_key_summary_response_collection_output: JsonSchema = {
+export const resource$$tagging_tag_key_summary_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-tagging_api-response-common"
diff --git a/src/generated/forge-mcp/tags/summary/tools.ts b/src/generated/forge-mcp/tags/summary/tools.ts
index 5b5e94772..28c08788a 100644
--- a/src/generated/forge-mcp/tags/summary/tools.ts
+++ b/src/generated/forge-mcp/tags/summary/tools.ts
@@ -1,20 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_tagging_api_response_common_failure_output,
-  resource_tagging_api_response_common_output,
-  resource_tagging_cursor_result_info_output,
-  resource_tagging_messages_output,
+  resource$$tagging_api$$response$$common,
+  resource$$tagging_api$$response$$common$$failure,
+  resource$$tagging_cursor_result_info,
+  resource$$tagging_messages,
 } from "../outputs.js";
 import {
-  resource_tagging_account_id,
-  resource_tagging_identifier,
-} from "../schemas.js";
-import {
-  resource_tagging_tag_key_summary_output,
-  resource_tagging_tag_key_summary_response_collection_output,
+  resource$$tagging_tag_key_summary,
+  resource$$tagging_tag_key_summary_response_collection,
 } from "./outputs.js";
 
 /**
@@ -24,34 +20,47 @@ export const tools: readonly Tool[] = [
   {
     name: "tags_summary_get",
     title: "List tag key summary",
-    description: "Lists all distinct tag keys and their distinct values across resources in an account.\n\nThis method is beta.",
+    description: "Lists all distinct tag keys and their distinct values across resources in an account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/tags/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-tagging_account_id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "description": "Cursor for pagination.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Cursor for pagination.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "resource-tagging_account_id": resource_tagging_account_id,
-        "resource-tagging_identifier": resource_tagging_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-tagging_tag_key_summary_response_collection",
       $defs: {
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_cursor_result_info": resource_tagging_cursor_result_info_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_tag_key_summary": resource_tagging_tag_key_summary_output,
-        "resource-tagging_tag_key_summary_response_collection": resource_tagging_tag_key_summary_response_collection_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_cursor_result_info": resource$$tagging_cursor_result_info,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_tag_key_summary": resource$$tagging_tag_key_summary,
+        "resource-tagging_tag_key_summary_response_collection": resource$$tagging_tag_key_summary_response_collection,
       },
     },
     annotations: {
@@ -85,18 +94,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_api-response-common-failure": resource_tagging_api_response_common_failure_output,
-        "resource-tagging_cursor_result_info": resource_tagging_cursor_result_info_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_tag_key_summary": resource_tagging_tag_key_summary_output,
-        "resource-tagging_tag_key_summary_response_collection": resource_tagging_tag_key_summary_response_collection_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_api-response-common-failure": resource$$tagging_api$$response$$common$$failure,
+        "resource-tagging_cursor_result_info": resource$$tagging_cursor_result_info,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_tag_key_summary": resource$$tagging_tag_key_summary,
+        "resource-tagging_tag_key_summary_response_collection": resource$$tagging_tag_key_summary_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/tags/summary`,
       query: [
-        ["cursor", args["cursor"], true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/tags/values/outputs.ts b/src/generated/forge-mcp/tags/values/outputs.ts
index 878314ca5..b5859df16 100644
--- a/src/generated/forge-mcp/tags/values/outputs.ts
+++ b/src/generated/forge-mcp/tags/values/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `resource-tagging_tag_values_response_collection` in responses.
  */
-export const resource_tagging_tag_values_response_collection_output: JsonSchema = {
+export const resource$$tagging_tag_values_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/resource-tagging_api-response-common"
diff --git a/src/generated/forge-mcp/tags/values/tools.ts b/src/generated/forge-mcp/tags/values/tools.ts
index 1794aa569..65d3d2801 100644
--- a/src/generated/forge-mcp/tags/values/tools.ts
+++ b/src/generated/forge-mcp/tags/values/tools.ts
@@ -1,19 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  resource_tagging_api_response_common_failure_output,
-  resource_tagging_api_response_common_output,
-  resource_tagging_cursor_result_info_output,
-  resource_tagging_messages_output,
+  resource$$tagging_api$$response$$common,
+  resource$$tagging_api$$response$$common$$failure,
+  resource$$tagging_cursor_result_info,
+  resource$$tagging_messages,
 } from "../outputs.js";
-import {
-  resource_tagging_account_id,
-  resource_tagging_identifier,
-  resource_tagging_resource_type,
-} from "../schemas.js";
-import { resource_tagging_tag_values_response_collection_output } from "./outputs.js";
+import { resource$$tagging_tag_values_response_collection } from "./outputs.js";
 
 /**
  * The tools of `tags.values`.
@@ -22,43 +17,103 @@ export const tools: readonly Tool[] = [
   {
     name: "tags_values_list",
     title: "List tag values",
-    description: "Lists all distinct values for a given tag key, optionally filtered by resource type.\n\nThis method is beta.",
+    description: "Lists all distinct values for a given tag key, optionally filtered by resource type.\n\nThis method is beta.\n\nGET /accounts/{account_id}/tags/values/{tag_key}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/resource-tagging_account_id"
-        },
-        "cursor": {
-          "description": "Cursor for pagination.",
-          "type": "string"
-        },
-        "tag_key": {
-          "description": "The tag key to retrieve values for.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "tag_key": {
+              "description": "The tag key to retrieve values for.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_key"
+          ],
+          "type": "object"
         },
-        "type": {
-          "$ref": "#/$defs/resource-tagging_resource_type",
-          "description": "Filter by resource type."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Cursor for pagination.",
+              "type": "string"
+            },
+            "type": {
+              "description": "Filter by resource type.",
+              "enum": [
+                "access_application",
+                "access_application_policy",
+                "access_group",
+                "access_service_token",
+                "account",
+                "account_ruleset",
+                "ai_gateway",
+                "ai_search_instance",
+                "ai_search_namespace",
+                "alerting_policy",
+                "alerting_webhook",
+                "api_gateway_operation",
+                "cloudflared_tunnel",
+                "custom_certificate",
+                "custom_hostname",
+                "cws_deployment",
+                "cws_policy",
+                "cws_policy_set",
+                "cws_workload",
+                "d1_database",
+                "device",
+                "dns_record",
+                "durable_object_namespace",
+                "gateway_list",
+                "gateway_rule",
+                "healthcheck",
+                "image",
+                "infrastructure_target",
+                "kv_namespace",
+                "load_balancer",
+                "load_balancer_monitor",
+                "load_balancer_pool",
+                "managed_client_certificate",
+                "namespace_worker",
+                "pages_project",
+                "queue",
+                "r2_bucket",
+                "resource_share",
+                "stream_live_input",
+                "stream_video",
+                "vectorize_index",
+                "worker",
+                "worker_route",
+                "worker_version",
+                "zone",
+                "zone_ruleset"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_key"
+        "path"
       ],
-      $defs: {
-        "resource-tagging_account_id": resource_tagging_account_id,
-        "resource-tagging_identifier": resource_tagging_identifier,
-        "resource-tagging_resource_type": resource_tagging_resource_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/resource-tagging_tag_values_response_collection",
       $defs: {
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_cursor_result_info": resource_tagging_cursor_result_info_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_tag_values_response_collection": resource_tagging_tag_values_response_collection_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_cursor_result_info": resource$$tagging_cursor_result_info,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_tag_values_response_collection": resource$$tagging_tag_values_response_collection,
       },
     },
     annotations: {
@@ -92,18 +147,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "resource-tagging_api-response-common": resource_tagging_api_response_common_output,
-        "resource-tagging_api-response-common-failure": resource_tagging_api_response_common_failure_output,
-        "resource-tagging_cursor_result_info": resource_tagging_cursor_result_info_output,
-        "resource-tagging_messages": resource_tagging_messages_output,
-        "resource-tagging_tag_values_response_collection": resource_tagging_tag_values_response_collection_output,
+        "resource-tagging_api-response-common": resource$$tagging_api$$response$$common,
+        "resource-tagging_api-response-common-failure": resource$$tagging_api$$response$$common$$failure,
+        "resource-tagging_cursor_result_info": resource$$tagging_cursor_result_info,
+        "resource-tagging_messages": resource$$tagging_messages,
+        "resource-tagging_tag_values_response_collection": resource$$tagging_tag_values_response_collection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/tags/values/${pathParam(args, "tag_key")}`,
       query: [
-        ["type", args["type"], true],
-        ["cursor", args["cursor"], true],
+        ["type", param(args, "query", "type"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/tenantCustomNameservers/outputs.ts b/src/generated/forge-mcp/tenantCustomNameservers/outputs.ts
index b29ed1ab0..2c17adb8a 100644
--- a/src/generated/forge-mcp/tenantCustomNameservers/outputs.ts
+++ b/src/generated/forge-mcp/tenantCustomNameservers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `dns-custom-nameservers_CustomNS-2` in responses.
  */
-export const dns_custom_nameservers_CustomNS_2_output: JsonSchema = {
+export const dns$$custom$$nameservers_CustomNS$$2: JsonSchema = {
   "properties": {
     "dns_records": {
       "items": {
@@ -27,10 +27,10 @@ export const dns_custom_nameservers_CustomNS_2_output: JsonSchema = {
       "type": "array"
     },
     "ns_name": {
-      "$ref": "#/$defs/dns-custom-nameservers_ns_name"
+      "type": "string"
     },
     "ns_set": {
-      "$ref": "#/$defs/dns-custom-nameservers_ns_set"
+      "type": "number"
     },
     "status": {
       "enum": [
@@ -41,7 +41,7 @@ export const dns_custom_nameservers_CustomNS_2_output: JsonSchema = {
       "type": "string"
     },
     "zone_tag": {
-      "$ref": "#/$defs/dns-custom-nameservers_identifier-2"
+      "type": "string"
     }
   },
   "required": [
@@ -56,7 +56,7 @@ export const dns_custom_nameservers_CustomNS_2_output: JsonSchema = {
 /**
  * The schema of `dns-custom-nameservers_empty_response-3` in responses.
  */
-export const dns_custom_nameservers_empty_response_3_output: JsonSchema = {
+export const dns$$custom$$nameservers_empty_response$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-custom-nameservers_api-response-collection"
@@ -79,7 +79,7 @@ export const dns_custom_nameservers_empty_response_3_output: JsonSchema = {
 /**
  * The schema of `dns-custom-nameservers_tcns_response_collection` in responses.
  */
-export const dns_custom_nameservers_tcns_response_collection_output: JsonSchema = {
+export const dns$$custom$$nameservers_tcns_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-custom-nameservers_api-response-collection"
@@ -101,7 +101,7 @@ export const dns_custom_nameservers_tcns_response_collection_output: JsonSchema
 /**
  * The schema of `dns-custom-nameservers_tcns_response_single` in responses.
  */
-export const dns_custom_nameservers_tcns_response_single_output: JsonSchema = {
+export const dns$$custom$$nameservers_tcns_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dns-custom-nameservers_api-response-single"
diff --git a/src/generated/forge-mcp/tenantCustomNameservers/schemas.ts b/src/generated/forge-mcp/tenantCustomNameservers/schemas.ts
deleted file mode 100644
index a766e3199..000000000
--- a/src/generated/forge-mcp/tenantCustomNameservers/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `dns-custom-nameservers_identifier-3`.
- */
-export const dns_custom_nameservers_identifier_3: JsonSchema = {
-  "description": "Tenant identifier tag.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/tenantCustomNameservers/tools.ts b/src/generated/forge-mcp/tenantCustomNameservers/tools.ts
index 9b31c6c4d..49a067ea7 100644
--- a/src/generated/forge-mcp/tenantCustomNameservers/tools.ts
+++ b/src/generated/forge-mcp/tenantCustomNameservers/tools.ts
@@ -3,68 +3,64 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  dns_custom_nameservers_api_response_collection_output,
-  dns_custom_nameservers_api_response_common_failure_output,
-  dns_custom_nameservers_api_response_common_output,
-  dns_custom_nameservers_api_response_single_output,
-  dns_custom_nameservers_identifier_2_output,
-  dns_custom_nameservers_messages_output,
-  dns_custom_nameservers_ns_name_output,
-  dns_custom_nameservers_ns_set_output,
+  dns$$custom$$nameservers_api$$response$$collection,
+  dns$$custom$$nameservers_api$$response$$common,
+  dns$$custom$$nameservers_api$$response$$common$$failure,
+  dns$$custom$$nameservers_api$$response$$single,
+  dns$$custom$$nameservers_messages,
 } from "../outputs.js";
+import { dns$$custom$$nameservers_CustomNSInput } from "../schemas.js";
 import {
-  dns_custom_nameservers_CustomNSInput,
-  dns_custom_nameservers_ns_name,
-  dns_custom_nameservers_ns_set,
-} from "../schemas.js";
-import {
-  dns_custom_nameservers_CustomNS_2_output,
-  dns_custom_nameservers_empty_response_3_output,
-  dns_custom_nameservers_tcns_response_collection_output,
-  dns_custom_nameservers_tcns_response_single_output,
+  dns$$custom$$nameservers_CustomNS$$2,
+  dns$$custom$$nameservers_empty_response$$3,
+  dns$$custom$$nameservers_tcns_response_collection,
+  dns$$custom$$nameservers_tcns_response_single,
 } from "./outputs.js";
-import { dns_custom_nameservers_identifier_3 } from "./schemas.js";
 
 /**
- * The tools of `tenant_custom_nameservers`.
+ * The tools of `tenantCustomNameservers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "tenant_custom_nameservers_create",
+    name: "tenantCustomNameservers_create",
     title: "Add Tenant Custom Nameserver",
-    description: "Adds a custom nameserver for a tenant.",
+    description: "Adds a custom nameserver for a tenant.\n\nPOST /tenants/{tenant_id}/custom_ns",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/dns-custom-nameservers_CustomNSInput"
         },
-        "tenant_id": {
-          "$ref": "#/$defs/dns-custom-nameservers_identifier-3",
-          "description": "Tenant identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "tenant_id": {
+              "description": "Tenant identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "tenant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "tenant_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dns-custom-nameservers_CustomNSInput": dns_custom_nameservers_CustomNSInput,
-        "dns-custom-nameservers_identifier-3": dns_custom_nameservers_identifier_3,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set,
+        "dns-custom-nameservers_CustomNSInput": dns$$custom$$nameservers_CustomNSInput,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/dns-custom-nameservers_tcns_response_single",
       $defs: {
-        "dns-custom-nameservers_CustomNS-2": dns_custom_nameservers_CustomNS_2_output,
-        "dns-custom-nameservers_api-response-single": dns_custom_nameservers_api_response_single_output,
-        "dns-custom-nameservers_identifier-2": dns_custom_nameservers_identifier_2_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name_output,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set_output,
-        "dns-custom-nameservers_tcns_response_single": dns_custom_nameservers_tcns_response_single_output,
+        "dns-custom-nameservers_CustomNS-2": dns$$custom$$nameservers_CustomNS$$2,
+        "dns-custom-nameservers_api-response-single": dns$$custom$$nameservers_api$$response$$single,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
+        "dns-custom-nameservers_tcns_response_single": dns$$custom$$nameservers_tcns_response_single,
       },
     },
     annotations: {
@@ -101,14 +97,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-custom-nameservers_CustomNS-2": dns_custom_nameservers_CustomNS_2_output,
-        "dns-custom-nameservers_api-response-common-failure": dns_custom_nameservers_api_response_common_failure_output,
-        "dns-custom-nameservers_api-response-single": dns_custom_nameservers_api_response_single_output,
-        "dns-custom-nameservers_identifier-2": dns_custom_nameservers_identifier_2_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name_output,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set_output,
-        "dns-custom-nameservers_tcns_response_single": dns_custom_nameservers_tcns_response_single_output,
+        "dns-custom-nameservers_CustomNS-2": dns$$custom$$nameservers_CustomNS$$2,
+        "dns-custom-nameservers_api-response-common-failure": dns$$custom$$nameservers_api$$response$$common$$failure,
+        "dns-custom-nameservers_api-response-single": dns$$custom$$nameservers_api$$response$$single,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
+        "dns-custom-nameservers_tcns_response_single": dns$$custom$$nameservers_tcns_response_single,
       },
     },
     request: (args) => ({
@@ -117,37 +110,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "tenant_custom_nameservers_delete",
+    name: "tenantCustomNameservers_delete",
     title: "Delete Tenant Custom Nameserver",
-    description: "Deletes a tenant's custom nameserver.",
+    description: "Deletes a tenant's custom nameserver.\n\nDELETE /tenants/{tenant_id}/custom_ns/{custom_ns_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "custom_ns_id": {
-          "$ref": "#/$defs/dns-custom-nameservers_ns_name",
-          "description": "The FQDN of the name server."
-        },
-        "tenant_id": {
-          "$ref": "#/$defs/dns-custom-nameservers_identifier-3",
-          "description": "Tenant identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "custom_ns_id": {
+              "description": "The FQDN of the name server.",
+              "type": "string"
+            },
+            "tenant_id": {
+              "description": "Tenant identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "tenant_id",
+            "custom_ns_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "tenant_id",
-        "custom_ns_id"
+        "path"
       ],
-      $defs: {
-        "dns-custom-nameservers_identifier-3": dns_custom_nameservers_identifier_3,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-custom-nameservers_empty_response-3",
       $defs: {
-        "dns-custom-nameservers_api-response-collection": dns_custom_nameservers_api_response_collection_output,
-        "dns-custom-nameservers_api-response-common": dns_custom_nameservers_api_response_common_output,
-        "dns-custom-nameservers_empty_response-3": dns_custom_nameservers_empty_response_3_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
+        "dns-custom-nameservers_api-response-collection": dns$$custom$$nameservers_api$$response$$collection,
+        "dns-custom-nameservers_api-response-common": dns$$custom$$nameservers_api$$response$$common,
+        "dns-custom-nameservers_empty_response-3": dns$$custom$$nameservers_empty_response$$3,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
       },
     },
     annotations: {
@@ -184,11 +183,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-custom-nameservers_api-response-collection": dns_custom_nameservers_api_response_collection_output,
-        "dns-custom-nameservers_api-response-common": dns_custom_nameservers_api_response_common_output,
-        "dns-custom-nameservers_api-response-common-failure": dns_custom_nameservers_api_response_common_failure_output,
-        "dns-custom-nameservers_empty_response-3": dns_custom_nameservers_empty_response_3_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
+        "dns-custom-nameservers_api-response-collection": dns$$custom$$nameservers_api$$response$$collection,
+        "dns-custom-nameservers_api-response-common": dns$$custom$$nameservers_api$$response$$common,
+        "dns-custom-nameservers_api-response-common-failure": dns$$custom$$nameservers_api$$response$$common$$failure,
+        "dns-custom-nameservers_empty_response-3": dns$$custom$$nameservers_empty_response$$3,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
       },
     },
     request: (args) => ({
@@ -196,35 +195,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "tenant_custom_nameservers_get",
+    name: "tenantCustomNameservers_get",
     title: "List Tenant Custom Nameservers",
-    description: "Lists a tenant's custom nameservers.",
+    description: "Lists a tenant's custom nameservers.\n\nGET /tenants/{tenant_id}/custom_ns",
     inputSchema: {
       type: "object",
       properties: {
-        "tenant_id": {
-          "$ref": "#/$defs/dns-custom-nameservers_identifier-3",
-          "description": "Tenant identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "tenant_id": {
+              "description": "Tenant identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "tenant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "tenant_id"
+        "path"
       ],
-      $defs: {
-        "dns-custom-nameservers_identifier-3": dns_custom_nameservers_identifier_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/dns-custom-nameservers_tcns_response_collection",
       $defs: {
-        "dns-custom-nameservers_CustomNS-2": dns_custom_nameservers_CustomNS_2_output,
-        "dns-custom-nameservers_api-response-collection": dns_custom_nameservers_api_response_collection_output,
-        "dns-custom-nameservers_api-response-common": dns_custom_nameservers_api_response_common_output,
-        "dns-custom-nameservers_identifier-2": dns_custom_nameservers_identifier_2_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name_output,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set_output,
-        "dns-custom-nameservers_tcns_response_collection": dns_custom_nameservers_tcns_response_collection_output,
+        "dns-custom-nameservers_CustomNS-2": dns$$custom$$nameservers_CustomNS$$2,
+        "dns-custom-nameservers_api-response-collection": dns$$custom$$nameservers_api$$response$$collection,
+        "dns-custom-nameservers_api-response-common": dns$$custom$$nameservers_api$$response$$common,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
+        "dns-custom-nameservers_tcns_response_collection": dns$$custom$$nameservers_tcns_response_collection,
       },
     },
     annotations: {
@@ -261,15 +264,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dns-custom-nameservers_CustomNS-2": dns_custom_nameservers_CustomNS_2_output,
-        "dns-custom-nameservers_api-response-collection": dns_custom_nameservers_api_response_collection_output,
-        "dns-custom-nameservers_api-response-common": dns_custom_nameservers_api_response_common_output,
-        "dns-custom-nameservers_api-response-common-failure": dns_custom_nameservers_api_response_common_failure_output,
-        "dns-custom-nameservers_identifier-2": dns_custom_nameservers_identifier_2_output,
-        "dns-custom-nameservers_messages": dns_custom_nameservers_messages_output,
-        "dns-custom-nameservers_ns_name": dns_custom_nameservers_ns_name_output,
-        "dns-custom-nameservers_ns_set": dns_custom_nameservers_ns_set_output,
-        "dns-custom-nameservers_tcns_response_collection": dns_custom_nameservers_tcns_response_collection_output,
+        "dns-custom-nameservers_CustomNS-2": dns$$custom$$nameservers_CustomNS$$2,
+        "dns-custom-nameservers_api-response-collection": dns$$custom$$nameservers_api$$response$$collection,
+        "dns-custom-nameservers_api-response-common": dns$$custom$$nameservers_api$$response$$common,
+        "dns-custom-nameservers_api-response-common-failure": dns$$custom$$nameservers_api$$response$$common$$failure,
+        "dns-custom-nameservers_messages": dns$$custom$$nameservers_messages,
+        "dns-custom-nameservers_tcns_response_collection": dns$$custom$$nameservers_tcns_response_collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/tunnel/outputs.ts b/src/generated/forge-mcp/tunnel/outputs.ts
index e36666f87..84b072d88 100644
--- a/src/generated/forge-mcp/tunnel/outputs.ts
+++ b/src/generated/forge-mcp/tunnel/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `tunnel_cfd-tunnel-response-collection` in responses.
  */
-export const tunnel_cfd_tunnel_response_collection_output: JsonSchema = {
+export const tunnel_cfd$$tunnel$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
diff --git a/src/generated/forge-mcp/tunnel/tools.ts b/src/generated/forge-mcp/tunnel/tools.ts
index 7c2aa1738..a35bb4fa8 100644
--- a/src/generated/forge-mcp/tunnel/tools.ts
+++ b/src/generated/forge-mcp/tunnel/tools.ts
@@ -1,45 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  tunnel_account_id_output,
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_cfd_tunnel_output,
-  tunnel_client_id_output,
-  tunnel_colo_name_output,
-  tunnel_config_src_output,
-  tunnel_connection_id_output,
-  tunnel_connections_deprecated_output,
-  tunnel_conns_active_at_output,
-  tunnel_conns_inactive_at_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_ip_output,
-  tunnel_is_pending_reconnect_output,
-  tunnel_messages_output,
-  tunnel_metadata_output,
-  tunnel_remote_config_output,
-  tunnel_result_info_output,
-  tunnel_schemas_connection_output,
-  tunnel_status_output,
-  tunnel_tunnel_id_output,
-  tunnel_tunnel_name_output,
-  tunnel_tunnel_type_output,
-  tunnel_version_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_cfd_tunnel,
+  tunnel_connections_deprecated,
+  tunnel_messages,
+  tunnel_metadata,
+  tunnel_result_info,
+  tunnel_schemas$$connection,
 } from "../outputs.js";
-import {
-  tunnel_account_id,
-  tunnel_existed_at,
-  tunnel_page_number,
-  tunnel_per_page,
-  tunnel_status,
-  tunnel_tunnel_id,
-  tunnel_tunnel_name,
-} from "../schemas.js";
-import { tunnel_cfd_tunnel_response_collection_output } from "./outputs.js";
+import { tunnel_cfd$$tunnel$$response$$collection } from "./outputs.js";
 
 /**
  * The tools of `tunnel`.
@@ -48,100 +22,97 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnel_list",
     title: "List Cloudflare Tunnels",
-    description: "Lists and filters Cloudflare Tunnels in an account.",
+    description: "Lists and filters Cloudflare Tunnels in an account.\n\nGET /accounts/{account_id}/cfd_tunnel",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "exclude_prefix": {
-          "type": "string"
-        },
-        "existed_at": {
-          "$ref": "#/$defs/tunnel_existed_at",
-          "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded."
-        },
-        "include_prefix": {
-          "type": "string"
-        },
-        "is_deleted": {
-          "description": "If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If empty, all tunnels will be included.",
-          "type": "boolean"
-        },
-        "name": {
-          "$ref": "#/$defs/tunnel_tunnel_name",
-          "description": "A user-friendly name for a tunnel."
-        },
-        "page": {
-          "$ref": "#/$defs/tunnel_page_number",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/tunnel_per_page",
-          "description": "Number of results to display."
-        },
-        "status": {
-          "$ref": "#/$defs/tunnel_status",
-          "description": "The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge)."
-        },
-        "uuid": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
-        },
-        "was_active_at": {
-          "format": "date-time",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "was_inactive_at": {
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "exclude_prefix": {
+              "type": "string"
+            },
+            "existed_at": {
+              "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded.",
+              "type": "string"
+            },
+            "include_prefix": {
+              "type": "string"
+            },
+            "is_deleted": {
+              "description": "If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If empty, all tunnels will be included.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "A user-friendly name for a tunnel.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results to display.",
+              "type": "number"
+            },
+            "status": {
+              "description": "The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).",
+              "enum": [
+                "inactive",
+                "degraded",
+                "healthy",
+                "down"
+              ],
+              "type": "string"
+            },
+            "uuid": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "was_active_at": {
+              "format": "date-time",
+              "type": "string"
+            },
+            "was_inactive_at": {
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_existed_at": tunnel_existed_at,
-        "tunnel_page_number": tunnel_page_number,
-        "tunnel_per_page": tunnel_per_page,
-        "tunnel_status": tunnel_status,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-        "tunnel_tunnel_name": tunnel_tunnel_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_cfd-tunnel-response-collection",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_cfd-tunnel-response-collection": tunnel_cfd_tunnel_response_collection_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_cfd-tunnel-response-collection": tunnel_cfd$$tunnel$$response$$collection,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     annotations: {
@@ -183,49 +154,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_cfd-tunnel-response-collection": tunnel_cfd_tunnel_response_collection_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_cfd-tunnel-response-collection": tunnel_cfd$$tunnel$$response$$collection,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cfd_tunnel`,
       query: [
-        ["name", args["name"], true],
-        ["is_deleted", args["is_deleted"], true],
-        ["existed_at", args["existed_at"], true],
-        ["uuid", args["uuid"], true],
-        ["was_active_at", args["was_active_at"], true],
-        ["was_inactive_at", args["was_inactive_at"], true],
-        ["include_prefix", args["include_prefix"], true],
-        ["exclude_prefix", args["exclude_prefix"], true],
-        ["status", args["status"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["is_deleted", param(args, "query", "is_deleted"), true],
+        ["existed_at", param(args, "query", "existed_at"), true],
+        ["uuid", param(args, "query", "uuid"), true],
+        ["was_active_at", param(args, "query", "was_active_at"), true],
+        ["was_inactive_at", param(args, "query", "was_inactive_at"), true],
+        ["include_prefix", param(args, "query", "include_prefix"), true],
+        ["exclude_prefix", param(args, "query", "exclude_prefix"), true],
+        ["status", param(args, "query", "status"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/tunnels/config/outputs.ts b/src/generated/forge-mcp/tunnels/config/outputs.ts
index d948cc6a2..412d77384 100644
--- a/src/generated/forge-mcp/tunnels/config/outputs.ts
+++ b/src/generated/forge-mcp/tunnels/config/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `tunnel_config` in responses.
  */
-export const tunnel_config_output: JsonSchema = {
+export const tunnel_config: JsonSchema = {
   "properties": {
     "ingress": {
       "items": {
@@ -22,46 +22,34 @@ export const tunnel_config_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tunnel_config_src-2` in responses.
- */
-export const tunnel_config_src_2_output: JsonSchema = {
-  "enum": [
-    "local",
-    "cloudflare"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `tunnel_config_version-2` in responses.
- */
-export const tunnel_config_version_2_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `tunnel_configuration` in responses.
  */
-export const tunnel_configuration_output: JsonSchema = {
+export const tunnel_configuration: JsonSchema = {
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/tunnel_identifier"
+      "type": "string"
     },
     "config": {
       "$ref": "#/$defs/tunnel_config"
     },
     "created_at": {
-      "$ref": "#/$defs/tunnel_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "source": {
-      "$ref": "#/$defs/tunnel_config_src-2"
+      "enum": [
+        "local",
+        "cloudflare"
+      ],
+      "type": "string"
     },
     "tunnel_id": {
-      "$ref": "#/$defs/tunnel_tunnel_id-2"
+      "format": "uuid",
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/tunnel_config_version-2"
+      "type": "integer"
     }
   },
   "type": "object"
@@ -70,7 +58,7 @@ export const tunnel_configuration_output: JsonSchema = {
 /**
  * The schema of `tunnel_configuration_response` in responses.
  */
-export const tunnel_configuration_response_output: JsonSchema = {
+export const tunnel_configuration_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-single-2"
@@ -89,7 +77,7 @@ export const tunnel_configuration_response_output: JsonSchema = {
 /**
  * The schema of `tunnel_ingressRule` in responses.
  */
-export const tunnel_ingressRule_output: JsonSchema = {
+export const tunnel_ingressRule: JsonSchema = {
   "properties": {
     "hostname": {
       "type": "string"
@@ -114,7 +102,7 @@ export const tunnel_ingressRule_output: JsonSchema = {
 /**
  * The schema of `tunnel_originRequest` in responses.
  */
-export const tunnel_originRequest_output: JsonSchema = {
+export const tunnel_originRequest: JsonSchema = {
   "properties": {
     "access": {
       "properties": {
@@ -182,11 +170,3 @@ export const tunnel_originRequest_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `tunnel_timestamp` in responses.
- */
-export const tunnel_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/tunnels/config/schemas.ts b/src/generated/forge-mcp/tunnels/config/schemas.ts
index e59cdd91c..621917729 100644
--- a/src/generated/forge-mcp/tunnels/config/schemas.ts
+++ b/src/generated/forge-mcp/tunnels/config/schemas.ts
@@ -44,7 +44,7 @@ export const tunnel_ingressRule: JsonSchema = {
       "type": "string"
     },
     "service": {
-      "description": "Protocol and address of destination server. Supported protocols: http://, https://, unix://, tcp://, ssh://, rdp://, unix+tls://, smb://. Alternatively can return a HTTP status code http_status:[code] e.g. 'http_status:404'.\n",
+      "description": "Protocol and address of destination server. Supported protocols: http://, https://, unix://, tcp://, ssh://, rdp://, unix+tls://, smb://. Alternatively can return a HTTP status code http_status:[code] e.g. 'http_status:404'.",
       "type": "string"
     }
   },
@@ -130,7 +130,7 @@ export const tunnel_originRequest: JsonSchema = {
       "type": "string"
     },
     "proxyType": {
-      "description": "cloudflared starts a proxy server to translate HTTP traffic into TCP when proxying, for example, SSH or RDP. This configures what type of proxy will be started. Valid options are: \"\" for the regular proxy and \"socks\" for a SOCKS5 proxy.\n",
+      "description": "cloudflared starts a proxy server to translate HTTP traffic into TCP when proxying, for example, SSH or RDP. This configures what type of proxy will be started. Valid options are: \"\" for the regular proxy and \"socks\" for a SOCKS5 proxy.",
       "type": "string"
     },
     "tcpKeepAlive": {
diff --git a/src/generated/forge-mcp/tunnels/config/tools.ts b/src/generated/forge-mcp/tunnels/config/tools.ts
index 7d0196002..76205e701 100644
--- a/src/generated/forge-mcp/tunnels/config/tools.ts
+++ b/src/generated/forge-mcp/tunnels/config/tools.ts
@@ -3,27 +3,21 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_2_output,
-  tunnel_api_response_single_2_output,
-  tunnel_identifier_output,
-  tunnel_messages_2_output,
-  tunnel_tunnel_id_2_output,
+  tunnel_api$$response$$common$$failure$$2,
+  tunnel_api$$response$$single$$2,
+  tunnel_messages$$2,
 } from "../../outputs.js";
-import { tunnel_identifier, tunnel_tunnel_id_2 } from "../../schemas.js";
-import {
-  tunnel_config_output,
-  tunnel_config_src_2_output,
-  tunnel_config_version_2_output,
-  tunnel_configuration_output,
-  tunnel_configuration_response_output,
-  tunnel_ingressRule_output,
-  tunnel_originRequest_output,
-  tunnel_timestamp_output,
-} from "./outputs.js";
 import {
   tunnel_config,
+  tunnel_configuration,
+  tunnel_configuration_response,
   tunnel_ingressRule,
   tunnel_originRequest,
+} from "./outputs.js";
+import {
+  tunnel_config as tunnel_config$,
+  tunnel_ingressRule as tunnel_ingressRule$,
+  tunnel_originRequest as tunnel_originRequest$,
 } from "./schemas.js";
 
 /**
@@ -33,43 +27,45 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_config_get",
     title: "Get Tunnel configuration",
-    description: "Retrieves the configuration for a remotely managed Cloudflare Tunnel.",
+    description: "Retrieves the configuration for a remotely managed Cloudflare Tunnel.\n\nGET /accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_identifier",
-          "description": "Identifier."
-        },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id-2",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_identifier": tunnel_identifier,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_configuration_response",
       $defs: {
-        "tunnel_api-response-single-2": tunnel_api_response_single_2_output,
-        "tunnel_config": tunnel_config_output,
-        "tunnel_config_src-2": tunnel_config_src_2_output,
-        "tunnel_config_version-2": tunnel_config_version_2_output,
-        "tunnel_configuration": tunnel_configuration_output,
-        "tunnel_configuration_response": tunnel_configuration_response_output,
-        "tunnel_identifier": tunnel_identifier_output,
-        "tunnel_ingressRule": tunnel_ingressRule_output,
-        "tunnel_messages-2": tunnel_messages_2_output,
-        "tunnel_originRequest": tunnel_originRequest_output,
-        "tunnel_timestamp": tunnel_timestamp_output,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2_output,
+        "tunnel_api-response-single-2": tunnel_api$$response$$single$$2,
+        "tunnel_config": tunnel_config,
+        "tunnel_configuration": tunnel_configuration,
+        "tunnel_configuration_response": tunnel_configuration_response,
+        "tunnel_ingressRule": tunnel_ingressRule,
+        "tunnel_messages-2": tunnel_messages$$2,
+        "tunnel_originRequest": tunnel_originRequest,
       },
     },
     annotations: {
@@ -101,19 +97,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common-failure-2": tunnel_api_response_common_failure_2_output,
-        "tunnel_api-response-single-2": tunnel_api_response_single_2_output,
-        "tunnel_config": tunnel_config_output,
-        "tunnel_config_src-2": tunnel_config_src_2_output,
-        "tunnel_config_version-2": tunnel_config_version_2_output,
-        "tunnel_configuration": tunnel_configuration_output,
-        "tunnel_configuration_response": tunnel_configuration_response_output,
-        "tunnel_identifier": tunnel_identifier_output,
-        "tunnel_ingressRule": tunnel_ingressRule_output,
-        "tunnel_messages-2": tunnel_messages_2_output,
-        "tunnel_originRequest": tunnel_originRequest_output,
-        "tunnel_timestamp": tunnel_timestamp_output,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2_output,
+        "tunnel_api-response-common-failure-2": tunnel_api$$response$$common$$failure$$2,
+        "tunnel_api-response-single-2": tunnel_api$$response$$single$$2,
+        "tunnel_config": tunnel_config,
+        "tunnel_configuration": tunnel_configuration,
+        "tunnel_configuration_response": tunnel_configuration_response,
+        "tunnel_ingressRule": tunnel_ingressRule,
+        "tunnel_messages-2": tunnel_messages$$2,
+        "tunnel_originRequest": tunnel_originRequest,
       },
     },
     request: (args) => ({
@@ -123,14 +114,10 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_config_update",
     title: "Update Tunnel configuration",
-    description: "Replaces the configuration for a remotely managed Cloudflare Tunnel, including its ingress rules and origin request settings.",
+    description: "Replaces the configuration for a remotely managed Cloudflare Tunnel, including its ingress rules and origin request settings.\n\nPUT /accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "config": {
@@ -139,39 +126,47 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id-2",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tunnel_config": tunnel_config,
-        "tunnel_identifier": tunnel_identifier,
-        "tunnel_ingressRule": tunnel_ingressRule,
-        "tunnel_originRequest": tunnel_originRequest,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2,
+        "tunnel_config": tunnel_config$,
+        "tunnel_ingressRule": tunnel_ingressRule$,
+        "tunnel_originRequest": tunnel_originRequest$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_configuration_response",
       $defs: {
-        "tunnel_api-response-single-2": tunnel_api_response_single_2_output,
-        "tunnel_config": tunnel_config_output,
-        "tunnel_config_src-2": tunnel_config_src_2_output,
-        "tunnel_config_version-2": tunnel_config_version_2_output,
-        "tunnel_configuration": tunnel_configuration_output,
-        "tunnel_configuration_response": tunnel_configuration_response_output,
-        "tunnel_identifier": tunnel_identifier_output,
-        "tunnel_ingressRule": tunnel_ingressRule_output,
-        "tunnel_messages-2": tunnel_messages_2_output,
-        "tunnel_originRequest": tunnel_originRequest_output,
-        "tunnel_timestamp": tunnel_timestamp_output,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2_output,
+        "tunnel_api-response-single-2": tunnel_api$$response$$single$$2,
+        "tunnel_config": tunnel_config,
+        "tunnel_configuration": tunnel_configuration,
+        "tunnel_configuration_response": tunnel_configuration_response,
+        "tunnel_ingressRule": tunnel_ingressRule,
+        "tunnel_messages-2": tunnel_messages$$2,
+        "tunnel_originRequest": tunnel_originRequest,
       },
     },
     annotations: {
@@ -200,19 +195,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common-failure-2": tunnel_api_response_common_failure_2_output,
-        "tunnel_api-response-single-2": tunnel_api_response_single_2_output,
-        "tunnel_config": tunnel_config_output,
-        "tunnel_config_src-2": tunnel_config_src_2_output,
-        "tunnel_config_version-2": tunnel_config_version_2_output,
-        "tunnel_configuration": tunnel_configuration_output,
-        "tunnel_configuration_response": tunnel_configuration_response_output,
-        "tunnel_identifier": tunnel_identifier_output,
-        "tunnel_ingressRule": tunnel_ingressRule_output,
-        "tunnel_messages-2": tunnel_messages_2_output,
-        "tunnel_originRequest": tunnel_originRequest_output,
-        "tunnel_timestamp": tunnel_timestamp_output,
-        "tunnel_tunnel_id-2": tunnel_tunnel_id_2_output,
+        "tunnel_api-response-common-failure-2": tunnel_api$$response$$common$$failure$$2,
+        "tunnel_api-response-single-2": tunnel_api$$response$$single$$2,
+        "tunnel_config": tunnel_config,
+        "tunnel_configuration": tunnel_configuration,
+        "tunnel_configuration_response": tunnel_configuration_response,
+        "tunnel_ingressRule": tunnel_ingressRule,
+        "tunnel_messages-2": tunnel_messages$$2,
+        "tunnel_originRequest": tunnel_originRequest,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/tunnels/connections/outputs.ts b/src/generated/forge-mcp/tunnels/connections/outputs.ts
index f5215ba7b..3836cf047 100644
--- a/src/generated/forge-mcp/tunnels/connections/outputs.ts
+++ b/src/generated/forge-mcp/tunnels/connections/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `tunnel_tunnel_connections_response` in responses.
  */
-export const tunnel_tunnel_connections_response_output: JsonSchema = {
+export const tunnel_tunnel_connections_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
diff --git a/src/generated/forge-mcp/tunnels/connections/tools.ts b/src/generated/forge-mcp/tunnels/connections/tools.ts
index bcd54a428..d76e9bbcf 100644
--- a/src/generated/forge-mcp/tunnels/connections/tools.ts
+++ b/src/generated/forge-mcp/tunnels/connections/tools.ts
@@ -1,36 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_arch_output,
-  tunnel_client_id_output,
-  tunnel_colo_name_output,
-  tunnel_connection_id_output,
-  tunnel_empty_response_output,
-  tunnel_features_output,
-  tunnel_ip_output,
-  tunnel_is_pending_reconnect_output,
-  tunnel_messages_output,
-  tunnel_result_info_output,
-  tunnel_run_at_output,
-  tunnel_schemas_connection_output,
-  tunnel_version_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_empty_response,
+  tunnel_features,
+  tunnel_messages,
+  tunnel_result_info,
+  tunnel_schemas$$connection,
 } from "../../outputs.js";
-import {
-  tunnel_account_id,
-  tunnel_client_id,
-  tunnel_tunnel_id,
-} from "../../schemas.js";
-import {
-  tunnel_config_version_output,
-  tunnel_connections_output,
-  tunnel_tunnel_client_output,
-} from "../outputs.js";
-import { tunnel_tunnel_connections_response_output } from "./outputs.js";
+import { tunnel_connections, tunnel_tunnel_client } from "../outputs.js";
+import { tunnel_tunnel_connections_response } from "./outputs.js";
 
 /**
  * The tools of `tunnels.connections`.
@@ -39,39 +22,52 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_connections_cleanup",
     title: "Clean up Cloudflare Tunnel connections",
-    description: "Removes a connection (aka Cloudflare Tunnel Connector) from a Cloudflare Tunnel independently of its current state. If no connector id (client_id) is provided all connectors will be removed. We recommend running this command after rotating tokens.\n\nConfirm with the user before calling this tool. This operation removes Cloudflare Tunnel connections.",
+    description: "Removes a connection (aka Cloudflare Tunnel Connector) from a Cloudflare Tunnel independently of its current state. If no connector id (client_id) is provided all connectors will be removed. We recommend running this command after rotating tokens.\n\nConfirm with the user before calling this tool. This operation removes Cloudflare Tunnel connections.\n\nDELETE /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "client_id": {
-          "$ref": "#/$defs/tunnel_client_id",
-          "description": "UUID of the Cloudflare Tunnel connector."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "client_id": {
+              "description": "UUID of the Cloudflare Tunnel connector.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_client_id": tunnel_client_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_empty_response",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_empty_response": tunnel_empty_response_output,
-        "tunnel_messages": tunnel_messages_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_empty_response": tunnel_empty_response,
+        "tunnel_messages": tunnel_messages,
       },
     },
     annotations: {
@@ -107,65 +103,63 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_empty_response": tunnel_empty_response_output,
-        "tunnel_messages": tunnel_messages_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_empty_response": tunnel_empty_response,
+        "tunnel_messages": tunnel_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cfd_tunnel/${pathParam(args, "tunnel_id")}/connections`,
       query: [
-        ["client_id", args["client_id"], true],
+        ["client_id", param(args, "query", "client_id"), true],
       ],
     }),
   },
   {
     name: "tunnels_connections_list",
     title: "List Cloudflare Tunnel connections",
-    description: "Lists the connections for a Cloudflare Tunnel, including connector IDs, cloudflared versions, and Cloudflare locations.",
+    description: "Lists the connections for a Cloudflare Tunnel, including connector IDs, cloudflared versions, and Cloudflare locations.\n\nGET /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_tunnel_connections_response",
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_arch": tunnel_arch_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_version": tunnel_config_version_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections": tunnel_connections_output,
-        "tunnel_features": tunnel_features_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_run_at": tunnel_run_at_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_tunnel_client": tunnel_tunnel_client_output,
-        "tunnel_tunnel_connections_response": tunnel_tunnel_connections_response_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_connections": tunnel_connections,
+        "tunnel_features": tunnel_features,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_tunnel_client": tunnel_tunnel_client,
+        "tunnel_tunnel_connections_response": tunnel_tunnel_connections_response,
       },
     },
     annotations: {
@@ -204,25 +198,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_arch": tunnel_arch_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_version": tunnel_config_version_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections": tunnel_connections_output,
-        "tunnel_features": tunnel_features_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_run_at": tunnel_run_at_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_tunnel_client": tunnel_tunnel_client_output,
-        "tunnel_tunnel_connections_response": tunnel_tunnel_connections_response_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_connections": tunnel_connections,
+        "tunnel_features": tunnel_features,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_tunnel_client": tunnel_tunnel_client,
+        "tunnel_tunnel_connections_response": tunnel_tunnel_connections_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/tunnels/connectors/outputs.ts b/src/generated/forge-mcp/tunnels/connectors/outputs.ts
index e3ef07688..c7f28836b 100644
--- a/src/generated/forge-mcp/tunnels/connectors/outputs.ts
+++ b/src/generated/forge-mcp/tunnels/connectors/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `tunnel_tunnel_client_response` in responses.
  */
-export const tunnel_tunnel_client_response_output: JsonSchema = {
+export const tunnel_tunnel_client_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
diff --git a/src/generated/forge-mcp/tunnels/connectors/tools.ts b/src/generated/forge-mcp/tunnels/connectors/tools.ts
index 318b1c454..f3a9ffca5 100644
--- a/src/generated/forge-mcp/tunnels/connectors/tools.ts
+++ b/src/generated/forge-mcp/tunnels/connectors/tools.ts
@@ -3,31 +3,14 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_arch_output,
-  tunnel_client_id_output,
-  tunnel_colo_name_output,
-  tunnel_connection_id_output,
-  tunnel_features_output,
-  tunnel_ip_output,
-  tunnel_is_pending_reconnect_output,
-  tunnel_messages_output,
-  tunnel_run_at_output,
-  tunnel_schemas_connection_output,
-  tunnel_version_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_features,
+  tunnel_messages,
+  tunnel_schemas$$connection,
 } from "../../outputs.js";
-import {
-  tunnel_account_id,
-  tunnel_client_id,
-  tunnel_tunnel_id,
-} from "../../schemas.js";
-import {
-  tunnel_config_version_output,
-  tunnel_connections_output,
-  tunnel_tunnel_client_output,
-} from "../outputs.js";
-import { tunnel_tunnel_client_response_output } from "./outputs.js";
+import { tunnel_connections, tunnel_tunnel_client } from "../outputs.js";
+import { tunnel_tunnel_client_response } from "./outputs.js";
 
 /**
  * The tools of `tunnels.connectors`.
@@ -36,53 +19,51 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_connectors_get",
     title: "Get Cloudflare Tunnel connector",
-    description: "Retrieves a connector and its connection details for a Cloudflare Tunnel, including its cloudflared version, architecture, and connected Cloudflare locations.",
+    description: "Retrieves a connector and its connection details for a Cloudflare Tunnel, including its cloudflared version, architecture, and connected Cloudflare locations.\n\nGET /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connectors/{connector_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "connector_id": {
-          "$ref": "#/$defs/tunnel_client_id",
-          "description": "UUID of the Cloudflare Tunnel connector."
-        },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "connector_id": {
+              "description": "UUID of the Cloudflare Tunnel connector.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id",
+            "connector_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id",
-        "connector_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_client_id": tunnel_client_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_tunnel_client_response",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_arch": tunnel_arch_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_version": tunnel_config_version_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections": tunnel_connections_output,
-        "tunnel_features": tunnel_features_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_run_at": tunnel_run_at_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_tunnel_client": tunnel_tunnel_client_output,
-        "tunnel_tunnel_client_response": tunnel_tunnel_client_response_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_connections": tunnel_connections,
+        "tunnel_features": tunnel_features,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_tunnel_client": tunnel_tunnel_client,
+        "tunnel_tunnel_client_response": tunnel_tunnel_client_response,
       },
     },
     annotations: {
@@ -121,23 +102,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_arch": tunnel_arch_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_version": tunnel_config_version_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections": tunnel_connections_output,
-        "tunnel_features": tunnel_features_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_run_at": tunnel_run_at_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_tunnel_client": tunnel_tunnel_client_output,
-        "tunnel_tunnel_client_response": tunnel_tunnel_client_response_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_connections": tunnel_connections,
+        "tunnel_features": tunnel_features,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_tunnel_client": tunnel_tunnel_client,
+        "tunnel_tunnel_client_response": tunnel_tunnel_client_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/tunnels/managementToken/schemas.ts b/src/generated/forge-mcp/tunnels/managementToken/schemas.ts
deleted file mode 100644
index 292d563c4..000000000
--- a/src/generated/forge-mcp/tunnels/managementToken/schemas.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tunnel_management-resources`.
- */
-export const tunnel_management_resources: JsonSchema = {
-  "description": "Management resources the token will have access to.",
-  "enum": [
-    "logs"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/tunnels/managementToken/tools.ts b/src/generated/forge-mcp/tunnels/managementToken/tools.ts
index 9527d45a1..9c8be02de 100644
--- a/src/generated/forge-mcp/tunnels/managementToken/tools.ts
+++ b/src/generated/forge-mcp/tunnels/managementToken/tools.ts
@@ -3,35 +3,32 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_messages_output,
-  tunnel_tunnel_response_token_output,
-  tunnel_tunnel_token_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
+  tunnel_tunnel_response_token,
 } from "../../outputs.js";
-import { tunnel_account_id, tunnel_tunnel_id } from "../../schemas.js";
-import { tunnel_management_resources } from "./schemas.js";
 
 /**
- * The tools of `tunnels.management_token`.
+ * The tools of `tunnels.managementToken`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "tunnels_management_token_create",
+    name: "tunnels_managementToken_create",
     title: "Get a Cloudflare Tunnel management token",
-    description: "Creates a short-lived management token for the requested Tunnel management resources, such as streaming logs. Treat the token as a secret.",
+    description: "Creates a short-lived management token for the requested Tunnel management resources, such as streaming logs. Treat the token as a secret.\n\nPOST /accounts/{account_id}/cfd_tunnel/{tunnel_id}/management",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "resources": {
               "items": {
-                "$ref": "#/$defs/tunnel_management-resources"
+                "description": "Management resources the token will have access to.",
+                "enum": [
+                  "logs"
+                ],
+                "type": "string"
               },
               "type": "array"
             }
@@ -41,29 +38,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_management-resources": tunnel_management_resources,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_tunnel_response_token",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_response_token": tunnel_tunnel_response_token_output,
-        "tunnel_tunnel_token": tunnel_tunnel_token_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_tunnel_response_token": tunnel_tunnel_response_token,
       },
     },
     annotations: {
@@ -99,11 +105,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_response_token": tunnel_tunnel_response_token_output,
-        "tunnel_tunnel_token": tunnel_tunnel_token_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_tunnel_response_token": tunnel_tunnel_response_token,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/tunnels/outputs.ts b/src/generated/forge-mcp/tunnels/outputs.ts
index 2d39fcd6f..a23bb5725 100644
--- a/src/generated/forge-mcp/tunnels/outputs.ts
+++ b/src/generated/forge-mcp/tunnels/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `tunnel_cfd-tunnel-response-single` in responses.
  */
-export const tunnel_cfd_tunnel_response_single_output: JsonSchema = {
+export const tunnel_cfd$$tunnel$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -22,17 +22,10 @@ export const tunnel_cfd_tunnel_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `tunnel_config_version` in responses.
- */
-export const tunnel_config_version_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `tunnel_connections` in responses.
  */
-export const tunnel_connections_output: JsonSchema = {
+export const tunnel_connections: JsonSchema = {
   "items": {
     "$ref": "#/$defs/tunnel_schemas-connection"
   },
@@ -42,7 +35,7 @@ export const tunnel_connections_output: JsonSchema = {
 /**
  * The schema of `tunnel_tunnel-response-collection` in responses.
  */
-export const tunnel_tunnel_response_collection_output: JsonSchema = {
+export const tunnel_tunnel$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-collection"
@@ -71,13 +64,13 @@ export const tunnel_tunnel_response_collection_output: JsonSchema = {
 /**
  * The schema of `tunnel_tunnel_client` in responses.
  */
-export const tunnel_tunnel_client_output: JsonSchema = {
+export const tunnel_tunnel_client: JsonSchema = {
   "properties": {
     "arch": {
-      "$ref": "#/$defs/tunnel_arch"
+      "type": "string"
     },
     "config_version": {
-      "$ref": "#/$defs/tunnel_config_version"
+      "type": "integer"
     },
     "conns": {
       "$ref": "#/$defs/tunnel_connections"
@@ -86,13 +79,15 @@ export const tunnel_tunnel_client_output: JsonSchema = {
       "$ref": "#/$defs/tunnel_features"
     },
     "id": {
-      "$ref": "#/$defs/tunnel_connection_id"
+      "format": "uuid",
+      "type": "string"
     },
     "run_at": {
-      "$ref": "#/$defs/tunnel_run_at"
+      "format": "date-time",
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/tunnel_version"
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/tunnels/token/tools.ts b/src/generated/forge-mcp/tunnels/token/tools.ts
index d7a428f97..fc70c028a 100644
--- a/src/generated/forge-mcp/tunnels/token/tools.ts
+++ b/src/generated/forge-mcp/tunnels/token/tools.ts
@@ -3,13 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_messages_output,
-  tunnel_tunnel_response_token_output,
-  tunnel_tunnel_token_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
+  tunnel_tunnel_response_token,
 } from "../../outputs.js";
-import { tunnel_account_id, tunnel_tunnel_id } from "../../schemas.js";
 
 /**
  * The tools of `tunnels.token`.
@@ -18,35 +16,41 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_token_get",
     title: "Get a Cloudflare Tunnel token",
-    description: "Retrieves the token used to run cloudflared and associate it with a specific Cloudflare Tunnel. Treat the token as a secret.",
+    description: "Retrieves the token used to run cloudflared and associate it with a specific Cloudflare Tunnel. Treat the token as a secret.\n\nGET /accounts/{account_id}/cfd_tunnel/{tunnel_id}/token",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_tunnel_response_token",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_response_token": tunnel_tunnel_response_token_output,
-        "tunnel_tunnel_token": tunnel_tunnel_token_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_tunnel_response_token": tunnel_tunnel_response_token,
       },
     },
     annotations: {
@@ -82,11 +86,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_tunnel_response_token": tunnel_tunnel_response_token_output,
-        "tunnel_tunnel_token": tunnel_tunnel_token_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_tunnel_response_token": tunnel_tunnel_response_token,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/tunnels/tools.ts b/src/generated/forge-mcp/tunnels/tools.ts
index e52732336..e0e423dd9 100644
--- a/src/generated/forge-mcp/tunnels/tools.ts
+++ b/src/generated/forge-mcp/tunnels/tools.ts
@@ -1,52 +1,23 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  tunnel_account_id_output,
-  tunnel_api_response_collection_output,
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_cfd_tunnel_output,
-  tunnel_client_id_output,
-  tunnel_colo_name_output,
-  tunnel_config_src_output,
-  tunnel_connection_id_output,
-  tunnel_connections_deprecated_output,
-  tunnel_conns_active_at_output,
-  tunnel_conns_inactive_at_output,
-  tunnel_created_at_output,
-  tunnel_deleted_at_output,
-  tunnel_ip_output,
-  tunnel_is_pending_reconnect_output,
-  tunnel_messages_output,
-  tunnel_metadata_output,
-  tunnel_remote_config_output,
-  tunnel_result_info_output,
-  tunnel_schemas_connection_output,
-  tunnel_status_output,
-  tunnel_tunnel_id_output,
-  tunnel_tunnel_name_output,
-  tunnel_tunnel_type_output,
-  tunnel_version_output,
-  tunnel_warp_connector_tunnel_output,
+  tunnel_api$$response$$collection,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_cfd_tunnel,
+  tunnel_connections_deprecated,
+  tunnel_messages,
+  tunnel_metadata,
+  tunnel_result_info,
+  tunnel_schemas$$connection,
+  tunnel_warp_connector_tunnel,
 } from "../outputs.js";
+import { tunnel_tunnel_types } from "../schemas.js";
 import {
-  tunnel_account_id,
-  tunnel_config_src,
-  tunnel_existed_at,
-  tunnel_page_number,
-  tunnel_per_page,
-  tunnel_status,
-  tunnel_tunnel_id,
-  tunnel_tunnel_name,
-  tunnel_tunnel_secret,
-  tunnel_tunnel_type,
-  tunnel_tunnel_types,
-} from "../schemas.js";
-import {
-  tunnel_cfd_tunnel_response_single_output,
-  tunnel_tunnel_response_collection_output,
+  tunnel_cfd$$tunnel$$response$$single,
+  tunnel_tunnel$$response$$collection,
 } from "./outputs.js";
 
 /**
@@ -56,72 +27,64 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_create",
     title: "Create a Cloudflare Tunnel",
-    description: "Creates a remotely or locally managed Cloudflare Tunnel in an account. After creation, retrieve its token and run cloudflared to establish the connector connection.",
+    description: "Creates a remotely or locally managed Cloudflare Tunnel in an account. After creation, retrieve its token and run cloudflared to establish the connector connection.\n\nPOST /accounts/{account_id}/cfd_tunnel",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "config_src": {
-              "$ref": "#/$defs/tunnel_config_src"
+              "description": "Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel on the Zero Trust dashboard.",
+              "enum": [
+                "local",
+                "cloudflare"
+              ],
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/tunnel_tunnel_name",
-              "description": "A user-friendly name for a tunnel."
+              "description": "A user-friendly name for a tunnel.",
+              "type": "string"
             },
             "tunnel_secret": {
-              "$ref": "#/$defs/tunnel_tunnel_secret",
-              "description": "Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string."
+              "description": "Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string.",
+              "type": "string"
             }
           },
           "required": [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_config_src": tunnel_config_src,
-        "tunnel_tunnel_name": tunnel_tunnel_name,
-        "tunnel_tunnel_secret": tunnel_tunnel_secret,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_cfd-tunnel-response-single",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_cfd-tunnel-response-single": tunnel_cfd_tunnel_response_single_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_cfd-tunnel-response-single": tunnel_cfd$$tunnel$$response$$single,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     annotations: {
@@ -157,31 +120,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_cfd-tunnel-response-single": tunnel_cfd_tunnel_response_single_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_cfd-tunnel-response-single": tunnel_cfd$$tunnel$$response$$single,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     request: (args) => ({
@@ -192,55 +138,45 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_delete",
     title: "Delete a Cloudflare Tunnel",
-    description: "Permanently deletes a Cloudflare Tunnel from an account. The tunnel must have no active connections.\n\nConfirm with the user before calling this tool. This operation permanently deletes a Cloudflare Tunnel.",
+    description: "Permanently deletes a Cloudflare Tunnel from an account. The tunnel must have no active connections.\n\nConfirm with the user before calling this tool. This operation permanently deletes a Cloudflare Tunnel.\n\nDELETE /accounts/{account_id}/cfd_tunnel/{tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_cfd-tunnel-response-single",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_cfd-tunnel-response-single": tunnel_cfd_tunnel_response_single_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_cfd-tunnel-response-single": tunnel_cfd$$tunnel$$response$$single,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     annotations: {
@@ -276,31 +212,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_cfd-tunnel-response-single": tunnel_cfd_tunnel_response_single_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_cfd-tunnel-response-single": tunnel_cfd$$tunnel$$response$$single,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     request: (args) => ({
@@ -310,71 +229,59 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_edit",
     title: "Update a Cloudflare Tunnel",
-    description: "Updates the name or secret of an existing Cloudflare Tunnel.",
+    description: "Updates the name or secret of an existing Cloudflare Tunnel.\n\nPATCH /accounts/{account_id}/cfd_tunnel/{tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/tunnel_tunnel_name",
-              "description": "A user-friendly name for a tunnel."
+              "description": "A user-friendly name for a tunnel.",
+              "type": "string"
             },
             "tunnel_secret": {
-              "$ref": "#/$defs/tunnel_tunnel_secret",
-              "description": "Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string."
+              "description": "Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-        "tunnel_tunnel_name": tunnel_tunnel_name,
-        "tunnel_tunnel_secret": tunnel_tunnel_secret,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_cfd-tunnel-response-single",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_cfd-tunnel-response-single": tunnel_cfd_tunnel_response_single_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_cfd-tunnel-response-single": tunnel_cfd$$tunnel$$response$$single,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     annotations: {
@@ -410,31 +317,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_cfd-tunnel-response-single": tunnel_cfd_tunnel_response_single_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_cfd-tunnel-response-single": tunnel_cfd$$tunnel$$response$$single,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     request: (args) => ({
@@ -445,55 +335,45 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_get",
     title: "Get a Cloudflare Tunnel",
-    description: "Fetches a single Cloudflare Tunnel.",
+    description: "Fetches a single Cloudflare Tunnel.\n\nGET /accounts/{account_id}/cfd_tunnel/{tunnel_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "tunnel_id": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            },
+            "tunnel_id": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tunnel_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tunnel_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_cfd-tunnel-response-single",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_cfd-tunnel-response-single": tunnel_cfd_tunnel_response_single_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_cfd-tunnel-response-single": tunnel_cfd$$tunnel$$response$$single,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     annotations: {
@@ -532,31 +412,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_cfd-tunnel-response-single": tunnel_cfd_tunnel_response_single_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_cfd-tunnel-response-single": tunnel_cfd$$tunnel$$response$$single,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
       },
     },
     request: (args) => ({
@@ -566,106 +429,105 @@ export const tools: readonly Tool[] = [
   {
     name: "tunnels_list",
     title: "List All Tunnels",
-    description: "Lists and filters all types of Tunnels in an account.",
+    description: "Lists and filters all types of Tunnels in an account.\n\nGET /accounts/{account_id}/tunnels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
-        "exclude_prefix": {
-          "type": "string"
-        },
-        "existed_at": {
-          "$ref": "#/$defs/tunnel_existed_at",
-          "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded."
-        },
-        "include_prefix": {
-          "type": "string"
-        },
-        "is_deleted": {
-          "description": "If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If empty, all tunnels will be included.",
-          "type": "boolean"
-        },
-        "name": {
-          "description": "A user-friendly name for the tunnel.",
-          "type": "string"
-        },
-        "page": {
-          "$ref": "#/$defs/tunnel_page_number",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/tunnel_per_page",
-          "description": "Number of results to display."
-        },
-        "status": {
-          "$ref": "#/$defs/tunnel_status",
-          "description": "The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge)."
-        },
-        "tun_types": {
-          "$ref": "#/$defs/tunnel_tunnel_types",
-          "description": "The types of tunnels to filter by, separated by commas."
-        },
-        "uuid": {
-          "$ref": "#/$defs/tunnel_tunnel_id",
-          "description": "UUID of the tunnel."
-        },
-        "was_active_at": {
-          "format": "date-time",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "was_inactive_at": {
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "exclude_prefix": {
+              "type": "string"
+            },
+            "existed_at": {
+              "description": "If provided, include only resources that were created (and not deleted) before this time. URL encoded.",
+              "type": "string"
+            },
+            "include_prefix": {
+              "type": "string"
+            },
+            "is_deleted": {
+              "description": "If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If empty, all tunnels will be included.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "A user-friendly name for the tunnel.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results to display.",
+              "type": "number"
+            },
+            "status": {
+              "description": "The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).",
+              "enum": [
+                "inactive",
+                "degraded",
+                "healthy",
+                "down"
+              ],
+              "type": "string"
+            },
+            "tun_types": {
+              "$ref": "#/$defs/tunnel_tunnel_types",
+              "description": "The types of tunnels to filter by, separated by commas."
+            },
+            "uuid": {
+              "description": "UUID of the tunnel.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "was_active_at": {
+              "format": "date-time",
+              "type": "string"
+            },
+            "was_inactive_at": {
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_existed_at": tunnel_existed_at,
-        "tunnel_page_number": tunnel_page_number,
-        "tunnel_per_page": tunnel_per_page,
-        "tunnel_status": tunnel_status,
-        "tunnel_tunnel_id": tunnel_tunnel_id,
-        "tunnel_tunnel_type": tunnel_tunnel_type,
         "tunnel_tunnel_types": tunnel_tunnel_types,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_tunnel-response-collection",
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel-response-collection": tunnel_tunnel_response_collection_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_tunnel-response-collection": tunnel_tunnel$$response$$collection,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     annotations: {
@@ -704,51 +566,34 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_account_id": tunnel_account_id_output,
-        "tunnel_api-response-collection": tunnel_api_response_collection_output,
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_cfd_tunnel": tunnel_cfd_tunnel_output,
-        "tunnel_client_id": tunnel_client_id_output,
-        "tunnel_colo_name": tunnel_colo_name_output,
-        "tunnel_config_src": tunnel_config_src_output,
-        "tunnel_connection_id": tunnel_connection_id_output,
-        "tunnel_connections_deprecated": tunnel_connections_deprecated_output,
-        "tunnel_conns_active_at": tunnel_conns_active_at_output,
-        "tunnel_conns_inactive_at": tunnel_conns_inactive_at_output,
-        "tunnel_created_at": tunnel_created_at_output,
-        "tunnel_deleted_at": tunnel_deleted_at_output,
-        "tunnel_ip": tunnel_ip_output,
-        "tunnel_is_pending_reconnect": tunnel_is_pending_reconnect_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_metadata": tunnel_metadata_output,
-        "tunnel_remote_config": tunnel_remote_config_output,
-        "tunnel_result_info": tunnel_result_info_output,
-        "tunnel_schemas-connection": tunnel_schemas_connection_output,
-        "tunnel_status": tunnel_status_output,
-        "tunnel_tunnel-response-collection": tunnel_tunnel_response_collection_output,
-        "tunnel_tunnel_id": tunnel_tunnel_id_output,
-        "tunnel_tunnel_name": tunnel_tunnel_name_output,
-        "tunnel_tunnel_type": tunnel_tunnel_type_output,
-        "tunnel_version": tunnel_version_output,
-        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel_output,
+        "tunnel_api-response-collection": tunnel_api$$response$$collection,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_cfd_tunnel": tunnel_cfd_tunnel,
+        "tunnel_connections_deprecated": tunnel_connections_deprecated,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_metadata": tunnel_metadata,
+        "tunnel_result_info": tunnel_result_info,
+        "tunnel_schemas-connection": tunnel_schemas$$connection,
+        "tunnel_tunnel-response-collection": tunnel_tunnel$$response$$collection,
+        "tunnel_warp_connector_tunnel": tunnel_warp_connector_tunnel,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/tunnels`,
       query: [
-        ["name", args["name"], true],
-        ["is_deleted", args["is_deleted"], true],
-        ["existed_at", args["existed_at"], true],
-        ["uuid", args["uuid"], true],
-        ["was_active_at", args["was_active_at"], true],
-        ["was_inactive_at", args["was_inactive_at"], true],
-        ["include_prefix", args["include_prefix"], true],
-        ["exclude_prefix", args["exclude_prefix"], true],
-        ["tun_types", args["tun_types"], true],
-        ["status", args["status"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["is_deleted", param(args, "query", "is_deleted"), true],
+        ["existed_at", param(args, "query", "existed_at"), true],
+        ["uuid", param(args, "query", "uuid"), true],
+        ["was_active_at", param(args, "query", "was_active_at"), true],
+        ["was_inactive_at", param(args, "query", "was_inactive_at"), true],
+        ["include_prefix", param(args, "query", "include_prefix"), true],
+        ["exclude_prefix", param(args, "query", "exclude_prefix"), true],
+        ["tun_types", param(args, "query", "tun_types"), true],
+        ["status", param(args, "query", "status"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/turnstile/widgets/outputs.ts b/src/generated/forge-mcp/turnstile/widgets/outputs.ts
index 3c5ba4cf7..c473ed533 100644
--- a/src/generated/forge-mcp/turnstile/widgets/outputs.ts
+++ b/src/generated/forge-mcp/turnstile/widgets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `turnstile_api-response-common` in responses.
  */
-export const turnstile_api_response_common_output: JsonSchema = {
+export const turnstile_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/turnstile_messages"
@@ -29,7 +29,7 @@ export const turnstile_api_response_common_output: JsonSchema = {
 /**
  * The schema of `turnstile_api-response-common-failure` in responses.
  */
-export const turnstile_api_response_common_failure_output: JsonSchema = {
+export const turnstile_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/turnstile_messages"
@@ -60,83 +60,20 @@ export const turnstile_api_response_common_failure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `turnstile_bot_fight_mode` in responses.
- */
-export const turnstile_bot_fight_mode_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `turnstile_clearance_level` in responses.
- */
-export const turnstile_clearance_level_output: JsonSchema = {
-  "enum": [
-    "no_clearance",
-    "jschallenge",
-    "managed",
-    "interactive"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_created_on` in responses.
- */
-export const turnstile_created_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_deployed_via` in responses.
- */
-export const turnstile_deployed_via_output: JsonSchema = {
-  "enum": [
-    "wrangler",
-    "dashboard",
-    "spin",
-    "api",
-    "unknown"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `turnstile_domains` in responses.
  */
-export const turnstile_domains_output: JsonSchema = {
+export const turnstile_domains: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `turnstile_ephemeral_id` in responses.
- */
-export const turnstile_ephemeral_id_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `turnstile_last_modified_via` in responses.
- */
-export const turnstile_last_modified_via_output: JsonSchema = {
-  "enum": [
-    "wrangler",
-    "dashboard",
-    "spin",
-    "api",
-    "unknown"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `turnstile_messages` in responses.
  */
-export const turnstile_messages_output: JsonSchema = {
+export const turnstile_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -155,43 +92,10 @@ export const turnstile_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `turnstile_modified_on` in responses.
- */
-export const turnstile_modified_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_name` in responses.
- */
-export const turnstile_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_offlabel` in responses.
- */
-export const turnstile_offlabel_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `turnstile_region` in responses.
- */
-export const turnstile_region_output: JsonSchema = {
-  "enum": [
-    "world",
-    "china"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `turnstile_result_info` in responses.
  */
-export const turnstile_result_info_output: JsonSchema = {
+export const turnstile_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -215,66 +119,83 @@ export const turnstile_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `turnstile_secret` in responses.
- */
-export const turnstile_secret_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_sitekey` in responses.
- */
-export const turnstile_sitekey_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `turnstile_widget_detail` in responses.
  */
-export const turnstile_widget_detail_output: JsonSchema = {
+export const turnstile_widget_detail: JsonSchema = {
   "properties": {
     "bot_fight_mode": {
-      "$ref": "#/$defs/turnstile_bot_fight_mode"
+      "type": "boolean"
     },
     "clearance_level": {
-      "$ref": "#/$defs/turnstile_clearance_level"
+      "enum": [
+        "no_clearance",
+        "jschallenge",
+        "managed",
+        "interactive"
+      ],
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/turnstile_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "deployed_via": {
-      "$ref": "#/$defs/turnstile_deployed_via"
+      "enum": [
+        "wrangler",
+        "dashboard",
+        "spin",
+        "api",
+        "unknown"
+      ],
+      "type": "string"
     },
     "domains": {
       "$ref": "#/$defs/turnstile_domains"
     },
     "ephemeral_id": {
-      "$ref": "#/$defs/turnstile_ephemeral_id"
+      "type": "boolean"
     },
     "last_modified_via": {
-      "$ref": "#/$defs/turnstile_last_modified_via"
+      "enum": [
+        "wrangler",
+        "dashboard",
+        "spin",
+        "api",
+        "unknown"
+      ],
+      "type": "string"
     },
     "mode": {
-      "$ref": "#/$defs/turnstile_widget_mode"
+      "enum": [
+        "non-interactive",
+        "invisible",
+        "managed"
+      ],
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/turnstile_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/turnstile_name"
+      "type": "string"
     },
     "offlabel": {
-      "$ref": "#/$defs/turnstile_offlabel"
+      "type": "boolean"
     },
     "region": {
-      "$ref": "#/$defs/turnstile_region"
+      "enum": [
+        "world",
+        "china"
+      ],
+      "type": "string"
     },
     "secret": {
-      "$ref": "#/$defs/turnstile_secret"
+      "type": "string"
     },
     "sitekey": {
-      "$ref": "#/$defs/turnstile_sitekey"
+      "type": "string"
     }
   },
   "required": [
@@ -297,46 +218,77 @@ export const turnstile_widget_detail_output: JsonSchema = {
 /**
  * The schema of `turnstile_widget_list` in responses.
  */
-export const turnstile_widget_list_output: JsonSchema = {
+export const turnstile_widget_list: JsonSchema = {
   "properties": {
     "bot_fight_mode": {
-      "$ref": "#/$defs/turnstile_bot_fight_mode"
+      "type": "boolean"
     },
     "clearance_level": {
-      "$ref": "#/$defs/turnstile_clearance_level"
+      "enum": [
+        "no_clearance",
+        "jschallenge",
+        "managed",
+        "interactive"
+      ],
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/turnstile_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "deployed_via": {
-      "$ref": "#/$defs/turnstile_deployed_via"
+      "enum": [
+        "wrangler",
+        "dashboard",
+        "spin",
+        "api",
+        "unknown"
+      ],
+      "type": "string"
     },
     "domains": {
       "$ref": "#/$defs/turnstile_domains"
     },
     "ephemeral_id": {
-      "$ref": "#/$defs/turnstile_ephemeral_id"
+      "type": "boolean"
     },
     "last_modified_via": {
-      "$ref": "#/$defs/turnstile_last_modified_via"
+      "enum": [
+        "wrangler",
+        "dashboard",
+        "spin",
+        "api",
+        "unknown"
+      ],
+      "type": "string"
     },
     "mode": {
-      "$ref": "#/$defs/turnstile_widget_mode"
+      "enum": [
+        "non-interactive",
+        "invisible",
+        "managed"
+      ],
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/turnstile_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/turnstile_name"
+      "type": "string"
     },
     "offlabel": {
-      "$ref": "#/$defs/turnstile_offlabel"
+      "type": "boolean"
     },
     "region": {
-      "$ref": "#/$defs/turnstile_region"
+      "enum": [
+        "world",
+        "china"
+      ],
+      "type": "string"
     },
     "sitekey": {
-      "$ref": "#/$defs/turnstile_sitekey"
+      "type": "string"
     }
   },
   "required": [
@@ -354,15 +306,3 @@ export const turnstile_widget_list_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `turnstile_widget_mode` in responses.
- */
-export const turnstile_widget_mode_output: JsonSchema = {
-  "enum": [
-    "non-interactive",
-    "invisible",
-    "managed"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/turnstile/widgets/schemas.ts b/src/generated/forge-mcp/turnstile/widgets/schemas.ts
index 1e3ed45d1..28973d3b1 100644
--- a/src/generated/forge-mcp/turnstile/widgets/schemas.ts
+++ b/src/generated/forge-mcp/turnstile/widgets/schemas.ts
@@ -3,28 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `turnstile_bot_fight_mode`.
- */
-export const turnstile_bot_fight_mode: JsonSchema = {
-  "description": "If bot_fight_mode is set to `true`, Cloudflare issues computationally\nexpensive challenges in response to malicious bots (ENT only).\n",
-  "type": "boolean"
-};
-
-/**
- * The schema of `turnstile_clearance_level`.
- */
-export const turnstile_clearance_level: JsonSchema = {
-  "description": "If Turnstile is embedded on a Cloudflare site and the widget should grant challenge clearance,\nthis setting can determine the clearance level to be set\n",
-  "enum": [
-    "no_clearance",
-    "jschallenge",
-    "managed",
-    "interactive"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `turnstile_domains`.
  */
@@ -34,76 +12,3 @@ export const turnstile_domains: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `turnstile_ephemeral_id`.
- */
-export const turnstile_ephemeral_id: JsonSchema = {
-  "description": "Return the Ephemeral ID in /siteverify (ENT only).\n",
-  "type": "boolean"
-};
-
-/**
- * The schema of `turnstile_identifier`.
- */
-export const turnstile_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_invalidate_immediately`.
- */
-export const turnstile_invalidate_immediately: JsonSchema = {
-  "description": "If `invalidate_immediately` is set to `false`, the previous secret will\nremain valid for two hours. Otherwise, the secret is immediately\ninvalidated, and requests using it will be rejected.\n",
-  "type": "boolean"
-};
-
-/**
- * The schema of `turnstile_name`.
- */
-export const turnstile_name: JsonSchema = {
-  "description": "Human readable widget name. Not unique. Cloudflare suggests that you\nset this to a meaningful string to make it easier to identify your\nwidget, and where it is used.\n",
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_offlabel`.
- */
-export const turnstile_offlabel: JsonSchema = {
-  "description": "Do not show any Cloudflare branding on the widget (ENT only).\n",
-  "type": "boolean"
-};
-
-/**
- * The schema of `turnstile_region`.
- */
-export const turnstile_region: JsonSchema = {
-  "description": "Region where this widget can be used. This cannot be changed after creation.\n",
-  "enum": [
-    "world",
-    "china"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_sitekey`.
- */
-export const turnstile_sitekey: JsonSchema = {
-  "description": "Unique identifier for a Turnstile widget.",
-  "type": "string"
-};
-
-/**
- * The schema of `turnstile_widget_mode`.
- */
-export const turnstile_widget_mode: JsonSchema = {
-  "description": "Widget Mode",
-  "enum": [
-    "non-interactive",
-    "invisible",
-    "managed"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/turnstile/widgets/tools.ts b/src/generated/forge-mcp/turnstile/widgets/tools.ts
index 6f3b05b02..e4411a020 100644
--- a/src/generated/forge-mcp/turnstile/widgets/tools.ts
+++ b/src/generated/forge-mcp/turnstile/widgets/tools.ts
@@ -1,42 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  turnstile_api_response_common_failure_output,
-  turnstile_api_response_common_output,
-  turnstile_bot_fight_mode_output,
-  turnstile_clearance_level_output,
-  turnstile_created_on_output,
-  turnstile_deployed_via_output,
-  turnstile_domains_output,
-  turnstile_ephemeral_id_output,
-  turnstile_last_modified_via_output,
-  turnstile_messages_output,
-  turnstile_modified_on_output,
-  turnstile_name_output,
-  turnstile_offlabel_output,
-  turnstile_region_output,
-  turnstile_result_info_output,
-  turnstile_secret_output,
-  turnstile_sitekey_output,
-  turnstile_widget_detail_output,
-  turnstile_widget_list_output,
-  turnstile_widget_mode_output,
-} from "./outputs.js";
-import {
-  turnstile_bot_fight_mode,
-  turnstile_clearance_level,
+  turnstile_api$$response$$common,
+  turnstile_api$$response$$common$$failure,
   turnstile_domains,
-  turnstile_ephemeral_id,
-  turnstile_identifier,
-  turnstile_invalidate_immediately,
-  turnstile_name,
-  turnstile_offlabel,
-  turnstile_region,
-  turnstile_sitekey,
-  turnstile_widget_mode,
-} from "./schemas.js";
+  turnstile_messages,
+  turnstile_result_info,
+  turnstile_widget_detail,
+  turnstile_widget_list,
+} from "./outputs.js";
+import { turnstile_domains as turnstile_domains$ } from "./schemas.js";
 
 /**
  * The tools of `turnstile.widgets`.
@@ -45,46 +20,58 @@ export const tools: readonly Tool[] = [
   {
     name: "turnstile_widgets_create",
     title: "Create a Turnstile Widget",
-    description: "Creates a Turnstile widget for an account.",
+    description: "Creates a Turnstile widget for an account.\n\nPOST /accounts/{account_id}/challenges/widgets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/turnstile_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "properties": {
             "bot_fight_mode": {
-              "$ref": "#/$defs/turnstile_bot_fight_mode",
-              "description": "If bot_fight_mode is set to `true`, Cloudflare issues computationally\nexpensive challenges in response to malicious bots (ENT only).\n"
+              "description": "If bot_fight_mode is set to `true`, Cloudflare issues computationally\nexpensive challenges in response to malicious bots (ENT only).",
+              "type": "boolean"
             },
             "clearance_level": {
-              "$ref": "#/$defs/turnstile_clearance_level",
-              "description": "If Turnstile is embedded on a Cloudflare site and the widget should grant challenge clearance,\nthis setting can determine the clearance level to be set\n"
+              "description": "If Turnstile is embedded on a Cloudflare site and the widget should grant challenge clearance,\nthis setting can determine the clearance level to be set",
+              "enum": [
+                "no_clearance",
+                "jschallenge",
+                "managed",
+                "interactive"
+              ],
+              "type": "string"
             },
             "domains": {
               "$ref": "#/$defs/turnstile_domains"
             },
             "ephemeral_id": {
-              "$ref": "#/$defs/turnstile_ephemeral_id",
-              "description": "Return the Ephemeral ID in /siteverify (ENT only).\n"
+              "description": "Return the Ephemeral ID in /siteverify (ENT only).",
+              "type": "boolean"
             },
             "mode": {
-              "$ref": "#/$defs/turnstile_widget_mode"
+              "description": "Widget Mode",
+              "enum": [
+                "non-interactive",
+                "invisible",
+                "managed"
+              ],
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/turnstile_name",
-              "description": "Human readable widget name. Not unique. Cloudflare suggests that you\nset this to a meaningful string to make it easier to identify your\nwidget, and where it is used.\n"
+              "description": "Human readable widget name. Not unique. Cloudflare suggests that you\nset this to a meaningful string to make it easier to identify your\nwidget, and where it is used.",
+              "type": "string"
             },
             "offlabel": {
-              "$ref": "#/$defs/turnstile_offlabel",
-              "description": "Do not show any Cloudflare branding on the widget (ENT only).\n"
+              "description": "Do not show any Cloudflare branding on the widget (ENT only).",
+              "type": "boolean"
             },
             "region": {
-              "$ref": "#/$defs/turnstile_region",
               "default": "world",
-              "description": "Region where this widget can be used. This cannot be changed after creation.\n"
+              "description": "Region where this widget can be used. This cannot be changed after creation.",
+              "enum": [
+                "world",
+                "china"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -94,54 +81,66 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "direction": {
-          "description": "Direction to order widgets.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter widgets by field. The `name` field uses case-insensitive\nsubstring matching; `sitekey` uses exact matching.\nFormat: `field:value`\n\nSupported fields:\n- `name` - Filter by widget name (e.g., `filter=name:login-form`)\n- `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)\n\nReturns 400 Bad Request if the field is unsupported or format is invalid.\nAn empty filter value returns all results.\n",
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to order widgets by.",
-          "enum": [
-            "id",
-            "sitekey",
-            "name",
-            "created_on",
-            "modified_on"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 25,
-          "description": "Number of items per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order widgets.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter widgets by field. The `name` field uses case-insensitive\nsubstring matching; `sitekey` uses exact matching.\nFormat: `field:value`\n\nSupported fields:\n- `name` - Filter by widget name (e.g., `filter=name:login-form`)\n- `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)\n\nReturns 400 Bad Request if the field is unsupported or format is invalid.\nAn empty filter value returns all results.",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to order widgets by.",
+              "enum": [
+                "id",
+                "sitekey",
+                "name",
+                "created_on",
+                "modified_on"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of items per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode,
-        "turnstile_clearance_level": turnstile_clearance_level,
-        "turnstile_domains": turnstile_domains,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id,
-        "turnstile_identifier": turnstile_identifier,
-        "turnstile_name": turnstile_name,
-        "turnstile_offlabel": turnstile_offlabel,
-        "turnstile_region": turnstile_region,
-        "turnstile_widget_mode": turnstile_widget_mode,
+        "turnstile_domains": turnstile_domains$,
       },
     },
     outputSchema: {
@@ -167,24 +166,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_result_info": turnstile_result_info_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_result_info": turnstile_result_info,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     annotations: {
@@ -237,35 +223,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_api-response-common-failure": turnstile_api_response_common_failure_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_result_info": turnstile_result_info_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_api-response-common-failure": turnstile_api$$response$$common$$failure,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_result_info": turnstile_result_info,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/challenges/widgets`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["filter", args["filter"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["filter", param(args, "query", "filter"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -273,27 +246,33 @@ export const tools: readonly Tool[] = [
   {
     name: "turnstile_widgets_delete",
     title: "Delete a Turnstile Widget",
-    description: "Deletes a Turnstile widget from an account.",
+    description: "Deletes a Turnstile widget from an account.\n\nDELETE /accounts/{account_id}/challenges/widgets/{sitekey}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/turnstile_identifier",
-          "description": "Identifier"
-        },
-        "sitekey": {
-          "$ref": "#/$defs/turnstile_sitekey",
-          "description": "Unique identifier for a Turnstile widget."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "sitekey": {
+              "description": "Unique identifier for a Turnstile widget.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sitekey"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sitekey"
+        "path"
       ],
-      $defs: {
-        "turnstile_identifier": turnstile_identifier,
-        "turnstile_sitekey": turnstile_sitekey,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -310,23 +289,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     annotations: {
@@ -366,24 +332,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_api-response-common-failure": turnstile_api_response_common_failure_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_api-response-common-failure": turnstile_api$$response$$common$$failure,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     request: (args) => ({
@@ -393,27 +346,33 @@ export const tools: readonly Tool[] = [
   {
     name: "turnstile_widgets_get",
     title: "Turnstile Widget Details",
-    description: "Returns the configuration of a Turnstile widget.",
+    description: "Returns the configuration of a Turnstile widget.\n\nGET /accounts/{account_id}/challenges/widgets/{sitekey}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/turnstile_identifier",
-          "description": "Identifier"
-        },
-        "sitekey": {
-          "$ref": "#/$defs/turnstile_sitekey",
-          "description": "Unique identifier for a Turnstile widget."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "sitekey": {
+              "description": "Unique identifier for a Turnstile widget.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sitekey"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sitekey"
+        "path"
       ],
-      $defs: {
-        "turnstile_identifier": turnstile_identifier,
-        "turnstile_sitekey": turnstile_sitekey,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -430,23 +389,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     annotations: {
@@ -488,24 +434,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_api-response-common-failure": turnstile_api_response_common_failure_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_api-response-common-failure": turnstile_api$$response$$common$$failure,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     request: (args) => ({
@@ -515,54 +448,67 @@ export const tools: readonly Tool[] = [
   {
     name: "turnstile_widgets_list",
     title: "List Turnstile Widgets",
-    description: "Lists Turnstile widgets for an account.",
+    description: "Lists Turnstile widgets for an account.\n\nGET /accounts/{account_id}/challenges/widgets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/turnstile_identifier",
-          "description": "Identifier"
-        },
-        "direction": {
-          "description": "Direction to order widgets.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter widgets by field. The `name` field uses case-insensitive\nsubstring matching; `sitekey` uses exact matching.\nFormat: `field:value`\n\nSupported fields:\n- `name` - Filter by widget name (e.g., `filter=name:login-form`)\n- `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)\n\nReturns 400 Bad Request if the field is unsupported or format is invalid.\nAn empty filter value returns all results.\n",
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to order widgets by.",
-          "enum": [
-            "id",
-            "sitekey",
-            "name",
-            "created_on",
-            "modified_on"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 25,
-          "description": "Number of items per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order widgets.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter widgets by field. The `name` field uses case-insensitive\nsubstring matching; `sitekey` uses exact matching.\nFormat: `field:value`\n\nSupported fields:\n- `name` - Filter by widget name (e.g., `filter=name:login-form`)\n- `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)\n\nReturns 400 Bad Request if the field is unsupported or format is invalid.\nAn empty filter value returns all results.",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to order widgets by.",
+              "enum": [
+                "id",
+                "sitekey",
+                "name",
+                "created_on",
+                "modified_on"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of items per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "turnstile_identifier": turnstile_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -590,23 +536,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_result_info": turnstile_result_info_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_list": turnstile_widget_list_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_result_info": turnstile_result_info,
+        "turnstile_widget_list": turnstile_widget_list,
       },
     },
     annotations: {
@@ -659,73 +593,66 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_api-response-common-failure": turnstile_api_response_common_failure_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_result_info": turnstile_result_info_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_list": turnstile_widget_list_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_api-response-common-failure": turnstile_api$$response$$common$$failure,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_result_info": turnstile_result_info,
+        "turnstile_widget_list": turnstile_widget_list,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/challenges/widgets`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["filter", args["filter"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["filter", param(args, "query", "filter"), true],
       ],
     }),
   },
   {
-    name: "turnstile_widgets_rotate_secret",
+    name: "turnstile_widgets_rotateSecret",
     title: "Rotate Secret for a Turnstile Widget",
-    description: "Generates a new secret key for this widget. If `invalidate_immediately`\nis set to `false`, the previous secret remains valid for 2 hours.\n\nNote that secrets cannot be rotated again during the grace period.",
+    description: "Generates a new secret key for this widget. If `invalidate_immediately`\nis set to `false`, the previous secret remains valid for 2 hours.\n\nNote that secrets cannot be rotated again during the grace period.\n\nPOST /accounts/{account_id}/challenges/widgets/{sitekey}/rotate_secret",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/turnstile_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "properties": {
             "invalidate_immediately": {
-              "$ref": "#/$defs/turnstile_invalidate_immediately",
               "default": false,
-              "description": "If `invalidate_immediately` is set to `false`, the previous secret will\nremain valid for two hours. Otherwise, the secret is immediately\ninvalidated, and requests using it will be rejected.\n"
+              "description": "If `invalidate_immediately` is set to `false`, the previous secret will\nremain valid for two hours. Otherwise, the secret is immediately\ninvalidated, and requests using it will be rejected.",
+              "type": "boolean"
             }
           },
           "type": "object"
         },
-        "sitekey": {
-          "$ref": "#/$defs/turnstile_sitekey",
-          "description": "Unique identifier for a Turnstile widget."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "sitekey": {
+              "description": "Unique identifier for a Turnstile widget.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sitekey"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sitekey",
+        "path",
         "body"
       ],
-      $defs: {
-        "turnstile_identifier": turnstile_identifier,
-        "turnstile_invalidate_immediately": turnstile_invalidate_immediately,
-        "turnstile_sitekey": turnstile_sitekey,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -742,23 +669,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     annotations: {
@@ -798,24 +712,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_api-response-common-failure": turnstile_api_response_common_failure_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_api-response-common-failure": turnstile_api$$response$$common$$failure,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     request: (args) => ({
@@ -826,46 +727,58 @@ export const tools: readonly Tool[] = [
   {
     name: "turnstile_widgets_update",
     title: "Update a Turnstile Widget",
-    description: "Updates the configuration of a Turnstile widget.",
+    description: "Updates the configuration of a Turnstile widget.\n\nPUT /accounts/{account_id}/challenges/widgets/{sitekey}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/turnstile_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "properties": {
             "bot_fight_mode": {
-              "$ref": "#/$defs/turnstile_bot_fight_mode",
-              "description": "If bot_fight_mode is set to `true`, Cloudflare issues computationally\nexpensive challenges in response to malicious bots (ENT only).\n"
+              "description": "If bot_fight_mode is set to `true`, Cloudflare issues computationally\nexpensive challenges in response to malicious bots (ENT only).",
+              "type": "boolean"
             },
             "clearance_level": {
-              "$ref": "#/$defs/turnstile_clearance_level",
-              "description": "If Turnstile is embedded on a Cloudflare site and the widget should grant challenge clearance,\nthis setting can determine the clearance level to be set\n"
+              "description": "If Turnstile is embedded on a Cloudflare site and the widget should grant challenge clearance,\nthis setting can determine the clearance level to be set",
+              "enum": [
+                "no_clearance",
+                "jschallenge",
+                "managed",
+                "interactive"
+              ],
+              "type": "string"
             },
             "domains": {
               "$ref": "#/$defs/turnstile_domains"
             },
             "ephemeral_id": {
-              "$ref": "#/$defs/turnstile_ephemeral_id",
-              "description": "Return the Ephemeral ID in /siteverify (ENT only).\n"
+              "description": "Return the Ephemeral ID in /siteverify (ENT only).",
+              "type": "boolean"
             },
             "mode": {
-              "$ref": "#/$defs/turnstile_widget_mode"
+              "description": "Widget Mode",
+              "enum": [
+                "non-interactive",
+                "invisible",
+                "managed"
+              ],
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/turnstile_name",
-              "description": "Human readable widget name. Not unique. Cloudflare suggests that you\nset this to a meaningful string to make it easier to identify your\nwidget, and where it is used.\n"
+              "description": "Human readable widget name. Not unique. Cloudflare suggests that you\nset this to a meaningful string to make it easier to identify your\nwidget, and where it is used.",
+              "type": "string"
             },
             "offlabel": {
-              "$ref": "#/$defs/turnstile_offlabel",
-              "description": "Do not show any Cloudflare branding on the widget (ENT only).\n"
+              "description": "Do not show any Cloudflare branding on the widget (ENT only).",
+              "type": "boolean"
             },
             "region": {
-              "$ref": "#/$defs/turnstile_region",
               "default": "world",
-              "description": "Region where this widget can be used. This cannot be changed after creation.\n"
+              "description": "Region where this widget can be used. This cannot be changed after creation.",
+              "enum": [
+                "world",
+                "china"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -875,27 +788,32 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "sitekey": {
-          "$ref": "#/$defs/turnstile_sitekey",
-          "description": "Unique identifier for a Turnstile widget."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "sitekey": {
+              "description": "Unique identifier for a Turnstile widget.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sitekey"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sitekey",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode,
-        "turnstile_clearance_level": turnstile_clearance_level,
-        "turnstile_domains": turnstile_domains,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id,
-        "turnstile_identifier": turnstile_identifier,
-        "turnstile_name": turnstile_name,
-        "turnstile_offlabel": turnstile_offlabel,
-        "turnstile_region": turnstile_region,
-        "turnstile_sitekey": turnstile_sitekey,
-        "turnstile_widget_mode": turnstile_widget_mode,
+        "turnstile_domains": turnstile_domains$,
       },
     },
     outputSchema: {
@@ -913,23 +831,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     annotations: {
@@ -974,24 +879,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "turnstile_api-response-common": turnstile_api_response_common_output,
-        "turnstile_api-response-common-failure": turnstile_api_response_common_failure_output,
-        "turnstile_bot_fight_mode": turnstile_bot_fight_mode_output,
-        "turnstile_clearance_level": turnstile_clearance_level_output,
-        "turnstile_created_on": turnstile_created_on_output,
-        "turnstile_deployed_via": turnstile_deployed_via_output,
-        "turnstile_domains": turnstile_domains_output,
-        "turnstile_ephemeral_id": turnstile_ephemeral_id_output,
-        "turnstile_last_modified_via": turnstile_last_modified_via_output,
-        "turnstile_messages": turnstile_messages_output,
-        "turnstile_modified_on": turnstile_modified_on_output,
-        "turnstile_name": turnstile_name_output,
-        "turnstile_offlabel": turnstile_offlabel_output,
-        "turnstile_region": turnstile_region_output,
-        "turnstile_secret": turnstile_secret_output,
-        "turnstile_sitekey": turnstile_sitekey_output,
-        "turnstile_widget_detail": turnstile_widget_detail_output,
-        "turnstile_widget_mode": turnstile_widget_mode_output,
+        "turnstile_api-response-common": turnstile_api$$response$$common,
+        "turnstile_api-response-common-failure": turnstile_api$$response$$common$$failure,
+        "turnstile_domains": turnstile_domains,
+        "turnstile_messages": turnstile_messages,
+        "turnstile_widget_detail": turnstile_widget_detail,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/urlNormalization/outputs.ts b/src/generated/forge-mcp/urlNormalization/outputs.ts
index c162c59f4..d61efb944 100644
--- a/src/generated/forge-mcp/urlNormalization/outputs.ts
+++ b/src/generated/forge-mcp/urlNormalization/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `rulesets_UrlNormalization` in responses.
  */
-export const rulesets_UrlNormalization_output: JsonSchema = {
+export const rulesets_UrlNormalization: JsonSchema = {
   "properties": {
     "scope": {
       "enum": [
diff --git a/src/generated/forge-mcp/urlNormalization/tools.ts b/src/generated/forge-mcp/urlNormalization/tools.ts
index 5661318e2..ccd0f89a8 100644
--- a/src/generated/forge-mcp/urlNormalization/tools.ts
+++ b/src/generated/forge-mcp/urlNormalization/tools.ts
@@ -3,37 +3,43 @@
 
 import { type Tool, pathParam } from "../_/tool.js";
 import {
-  rulesets_Errors_output,
-  rulesets_Message_output,
-  rulesets_Messages_output,
-  rulesets_Response_output,
+  rulesets_Errors,
+  rulesets_Message,
+  rulesets_Messages,
+  rulesets_Response,
 } from "../outputs.js";
-import { rulesets_ZoneId } from "../schemas.js";
-import { rulesets_UrlNormalization_output } from "./outputs.js";
-import { rulesets_UrlNormalization } from "./schemas.js";
+import { rulesets_UrlNormalization } from "./outputs.js";
+import { rulesets_UrlNormalization as rulesets_UrlNormalization$ } from "./schemas.js";
 
 /**
- * The tools of `url_normalization`.
+ * The tools of `urlNormalization`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "url_normalization_delete",
+    name: "urlNormalization_delete",
     title: "Delete URL Normalization settings",
-    description: "Deletes the URL Normalization settings.",
+    description: "Deletes the URL Normalization settings.\n\nDELETE /zones/{zone_id}/url_normalization",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/rulesets_ZoneId",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "rulesets_ZoneId": rulesets_ZoneId,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -101,10 +107,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
       },
     },
     request: (args) => ({
@@ -112,23 +118,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "url_normalization_get",
+    name: "urlNormalization_get",
     title: "Get URL Normalization settings",
-    description: "Fetches the current URL Normalization settings.",
+    description: "Fetches the current URL Normalization settings.\n\nGET /zones/{zone_id}/url_normalization",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/rulesets_ZoneId",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "rulesets_ZoneId": rulesets_ZoneId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -152,11 +165,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_UrlNormalization": rulesets_UrlNormalization_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_UrlNormalization": rulesets_UrlNormalization,
       },
     },
     annotations: {
@@ -267,11 +280,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_UrlNormalization": rulesets_UrlNormalization_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_UrlNormalization": rulesets_UrlNormalization,
       },
     },
     request: (args) => ({
@@ -279,27 +292,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "url_normalization_update",
+    name: "urlNormalization_update",
     title: "Update URL Normalization settings",
-    description: "Updates the URL Normalization settings.",
+    description: "Updates the URL Normalization settings.\n\nPUT /zones/{zone_id}/url_normalization",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/rulesets_UrlNormalization"
         },
-        "zone_id": {
-          "$ref": "#/$defs/rulesets_ZoneId",
-          "description": "The unique ID of the zone."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "The unique ID of the zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "rulesets_UrlNormalization": rulesets_UrlNormalization,
-        "rulesets_ZoneId": rulesets_ZoneId,
+        "rulesets_UrlNormalization": rulesets_UrlNormalization$,
       },
     },
     outputSchema: {
@@ -324,11 +346,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_UrlNormalization": rulesets_UrlNormalization_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_UrlNormalization": rulesets_UrlNormalization,
       },
     },
     annotations: {
@@ -418,11 +440,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rulesets_Errors": rulesets_Errors_output,
-        "rulesets_Message": rulesets_Message_output,
-        "rulesets_Messages": rulesets_Messages_output,
-        "rulesets_Response": rulesets_Response_output,
-        "rulesets_UrlNormalization": rulesets_UrlNormalization_output,
+        "rulesets_Errors": rulesets_Errors,
+        "rulesets_Message": rulesets_Message,
+        "rulesets_Messages": rulesets_Messages,
+        "rulesets_Response": rulesets_Response,
+        "rulesets_UrlNormalization": rulesets_UrlNormalization,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/urlScanner/responses/tools.ts b/src/generated/forge-mcp/urlScanner/responses/tools.ts
index d27e130da..ad1d68dd2 100644
--- a/src/generated/forge-mcp/urlScanner/responses/tools.ts
+++ b/src/generated/forge-mcp/urlScanner/responses/tools.ts
@@ -4,29 +4,39 @@
 import { type Tool, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `url_scanner.responses`.
+ * The tools of `urlScanner.responses`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "url_scanner_responses_get",
+    name: "urlScanner_responses_get",
     title: "Get raw response",
-    description: "Returns the raw response of the network request. Find the `response_id` in the `data.requests.response.hash`.",
+    description: "Returns the raw response of the network request. Find the `response_id` in the `data.requests.response.hash`.\n\nGET /accounts/{account_id}/urlscanner/v2/responses/{response_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "response_id": {
-          "description": "Response hash.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "response_id": {
+              "description": "Response hash.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "response_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "response_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
diff --git a/src/generated/forge-mcp/urlScanner/scans/tools.ts b/src/generated/forge-mcp/urlScanner/scans/tools.ts
index 462c39025..9596aef79 100644
--- a/src/generated/forge-mcp/urlScanner/scans/tools.ts
+++ b/src/generated/forge-mcp/urlScanner/scans/tools.ts
@@ -1,23 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
- * The tools of `url_scanner.scans`.
+ * The tools of `urlScanner.scans`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "url_scanner_scans_bulk_create",
+    name: "urlScanner_scans_bulkCreate",
     title: "Bulk create URL Scans",
-    description: "Submit URLs to scan. Check limits at https://developers.cloudflare.com/security-center/investigate/scan-limits/ and take into account scans submitted in bulk have lower priority and may take longer to finish.",
+    description: "Submit URLs to scan. Check limits at https://developers.cloudflare.com/security-center/investigate/scan-limits/ and take into account scans submitted in bulk have lower priority and may take longer to finish.\n\nPOST /accounts/{account_id}/urlscanner/v2/bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "items": {
             "properties": {
@@ -72,11 +68,25 @@ export const tools: readonly Tool[] = [
             "type": "object"
           },
           "type": "array"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "items": {
@@ -274,16 +284,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "url_scanner_scans_create",
+    name: "urlScanner_scans_create",
     title: "Create URL Scan",
-    description: "Submit a URL to scan. Check limits at https://developers.cloudflare.com/security-center/investigate/scan-limits/.",
+    description: "Submit a URL to scan. Check limits at https://developers.cloudflare.com/security-center/investigate/scan-limits/.\n\nPOST /accounts/{account_id}/urlscanner/v2/scan",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "properties": {
             "agentReadiness": {
@@ -481,11 +487,25 @@ export const tools: readonly Tool[] = [
             "url"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -726,26 +746,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "url_scanner_scans_dom",
+    name: "urlScanner_scans_dom",
     title: "Get URL scan's DOM",
-    description: "Returns a plain text response, with the scan's DOM content as rendered by Chrome.",
+    description: "Returns a plain text response, with the scan's DOM content as rendered by Chrome.\n\nGET /accounts/{account_id}/urlscanner/v2/dom/{scan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "scan_id": {
-          "description": "Scan UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "scan_id": {
+              "description": "Scan UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "scan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "scan_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -882,26 +912,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "url_scanner_scans_get",
+    name: "urlScanner_scans_get",
     title: "Get URL scan",
-    description: "Get URL scan by uuid",
+    description: "Get URL scan by uuid\n\nGET /accounts/{account_id}/urlscanner/v2/result/{scan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "scan_id": {
-          "description": "Scan UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "scan_id": {
+              "description": "Scan UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "scan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "scan_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -10289,26 +10329,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "url_scanner_scans_har",
+    name: "urlScanner_scans_har",
     title: "Get URL scan's HAR",
-    description: "Get a URL scan's HAR file. See HAR spec at http://www.softwareishard.com/blog/har-12-spec/.",
+    description: "Get a URL scan's HAR file. See HAR spec at http://www.softwareishard.com/blog/har-12-spec/.\n\nGET /accounts/{account_id}/urlscanner/v2/har/{scan_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "scan_id": {
-          "description": "Scan UUID.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "scan_id": {
+              "description": "Scan UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "scan_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "scan_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -10960,28 +11010,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "url_scanner_scans_list",
+    name: "urlScanner_scans_list",
     title: "Search URL scans",
-    description: "Use a subset of ElasticSearch Query syntax to filter scans. Some example queries:<br/> <br/>- 'path:\"/bundles/jquery.js\"': Searches for scans who requested resources with the given path.<br/>- 'page.asn:AS24940 AND hash:xxx': Websites hosted in AS24940 where a resource with the given hash was downloaded.<br/>- 'page.domain:microsoft* AND verdicts.malicious:true AND NOT page.domain:microsoft.com': malicious scans whose hostname starts with \"microsoft\".<br/>- 'apikey:me AND date:[2025-01 TO 2025-02]': my scans from 2025 January to 2025 February.",
+    description: "Use a subset of ElasticSearch Query syntax to filter scans. Some example queries:<br/> <br/>- 'path:\"/bundles/jquery.js\"': Searches for scans who requested resources with the given path.<br/>- 'page.asn:AS24940 AND hash:xxx': Websites hosted in AS24940 where a resource with the given hash was downloaded.<br/>- 'page.domain:microsoft* AND verdicts.malicious:true AND NOT page.domain:microsoft.com': malicious scans whose hostname starts with \"microsoft\".<br/>- 'apikey:me AND date:[2025-01 TO 2025-02]': my scans from 2025 January to 2025 February.\n\nGET /accounts/{account_id}/urlscanner/v2/search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
         "query": {
-          "description": "Filter scans",
-          "type": "string"
-        },
-        "size": {
-          "description": "Limit the number of objects in the response.",
-          "type": "integer"
+          "additionalProperties": false,
+          "properties": {
+            "q": {
+              "description": "Filter scans",
+              "type": "string"
+            },
+            "size": {
+              "description": "Limit the number of objects in the response.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -11269,42 +11335,58 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/urlscanner/v2/search`,
       query: [
-        ["size", args["size"], true],
-        ["q", args["query"], true],
+        ["size", param(args, "query", "size"), true],
+        ["q", param(args, "query", "q"), true],
       ],
     }),
   },
   {
-    name: "url_scanner_scans_screenshot",
+    name: "urlScanner_scans_screenshot",
     title: "Get screenshot",
-    description: "Get scan's screenshot by resolution (desktop/mobile/tablet).",
+    description: "Get scan's screenshot by resolution (desktop/mobile/tablet).\n\nGET /accounts/{account_id}/urlscanner/v2/screenshots/{scan_id}.png",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
-        "resolution": {
-          "default": "desktop",
-          "description": "Target device type.",
-          "enum": [
-            "desktop",
-            "mobile",
-            "tablet"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            },
+            "scan_id": {
+              "description": "Scan UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "scan_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "scan_id": {
-          "description": "Scan UUID.",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "resolution": {
+              "default": "desktop",
+              "description": "Target device type.",
+              "enum": [
+                "desktop",
+                "mobile",
+                "tablet"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "scan_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -11439,7 +11521,7 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/urlscanner/v2/screenshots/${pathParam(args, "scan_id")}.png`,
       query: [
-        ["resolution", args["resolution"], true],
+        ["resolution", param(args, "query", "resolution"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/user/auditLogs/tools.ts b/src/generated/forge-mcp/user/auditLogs/tools.ts
index 1b58904e2..172db6232 100644
--- a/src/generated/forge-mcp/user/auditLogs/tools.ts
+++ b/src/generated/forge-mcp/user/auditLogs/tools.ts
@@ -1,109 +1,114 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../_/tool.js";
+import { type Tool, param } from "../../_/tool.js";
 import {
-  aaa_api_response_common_failure_output,
-  aaa_api_response_common_output,
-  aaa_audit_logs_output,
-  aaa_audit_logs_response_collection_output$,
-  aaa_identifier_output,
-  aaa_messages_output,
+  aaa_api$$response$$common,
+  aaa_api$$response$$common$$failure,
+  aaa_audit$$logs,
+  aaa_audit_logs_response_collection,
+  aaa_messages,
 } from "../../outputs.js";
 
 /**
- * The tools of `user.audit_logs`.
+ * The tools of `user.auditLogs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_audit_logs_list",
+    name: "user_auditLogs_list",
     title: "Get user audit logs",
-    description: "Gets a list of audit logs for a user account. Can be filtered by who made the change, on which zone, and the timeframe of the change.",
+    description: "Gets a list of audit logs for a user account. Can be filtered by who made the change, on which zone, and the timeframe of the change.\n\nGET /user/audit_logs",
     inputSchema: {
       type: "object",
       properties: {
-        "action_type": {
-          "description": "Filters by the action type.",
-          "type": "string"
-        },
-        "actor_email": {
-          "description": "Filters by the email address of the actor that made the change.",
-          "type": "string"
-        },
-        "actor_ip": {
-          "description": "Filters by the IP address of the request that made the change by specific IP address or valid CIDR Range.",
-          "type": "string"
-        },
-        "before": {
-          "oneOf": [
-            {
-              "format": "date",
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "action.type": {
+              "description": "Filters by the action type.",
               "type": "string"
             },
-            {
-              "format": "date-time",
+            "actor.email": {
+              "description": "Filters by the email address of the actor that made the change.",
               "type": "string"
-            }
-          ]
-        },
-        "direction": {
-          "default": "desc",
-          "description": "Changes the direction of the chronological sorting.",
-          "enum": [
-            "desc",
-            "asc"
-          ],
-          "type": "string"
-        },
-        "export": {
-          "description": "Indicates that this request is an export of logs in CSV format.",
-          "type": "boolean"
-        },
-        "hide_user_logs": {
-          "default": false,
-          "description": "Indicates whether or not to hide user level audit logs.",
-          "type": "boolean"
-        },
-        "id": {
-          "description": "Finds a specific log by its ID.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Defines which page of results to return.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Sets the number of results to return per page.",
-          "type": "number"
-        },
-        "since": {
-          "oneOf": [
-            {
-              "format": "date",
+            },
+            "actor.ip": {
+              "description": "Filters by the IP address of the request that made the change by specific IP address or valid CIDR Range.",
               "type": "string"
             },
-            {
-              "format": "date-time",
+            "before": {
+              "oneOf": [
+                {
+                  "format": "date",
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            },
+            "direction": {
+              "default": "desc",
+              "description": "Changes the direction of the chronological sorting.",
+              "enum": [
+                "desc",
+                "asc"
+              ],
+              "type": "string"
+            },
+            "export": {
+              "description": "Indicates that this request is an export of logs in CSV format.",
+              "type": "boolean"
+            },
+            "hide_user_logs": {
+              "default": false,
+              "description": "Indicates whether or not to hide user level audit logs.",
+              "type": "boolean"
+            },
+            "id": {
+              "description": "Finds a specific log by its ID.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Defines which page of results to return.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Sets the number of results to return per page.",
+              "type": "number"
+            },
+            "since": {
+              "oneOf": [
+                {
+                  "format": "date",
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
+            },
+            "zone.name": {
+              "description": "Filters by the name of the zone associated to the change.",
               "type": "string"
             }
-          ]
-        },
-        "zone_name": {
-          "description": "Filters by the name of the zone associated to the change.",
-          "type": "string"
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/aaa_audit_logs_response_collection",
       $defs: {
-        "aaa_api-response-common": aaa_api_response_common_output,
-        "aaa_audit-logs": aaa_audit_logs_output,
-        "aaa_audit_logs_response_collection": aaa_audit_logs_response_collection_output$,
-        "aaa_identifier": aaa_identifier_output,
-        "aaa_messages": aaa_messages_output,
+        "aaa_api-response-common": aaa_api$$response$$common,
+        "aaa_audit-logs": aaa_audit$$logs,
+        "aaa_audit_logs_response_collection": aaa_audit_logs_response_collection,
+        "aaa_messages": aaa_messages,
       },
     },
     annotations: {
@@ -144,29 +149,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "aaa_api-response-common": aaa_api_response_common_output,
-        "aaa_api-response-common-failure": aaa_api_response_common_failure_output,
-        "aaa_audit-logs": aaa_audit_logs_output,
-        "aaa_audit_logs_response_collection": aaa_audit_logs_response_collection_output$,
-        "aaa_identifier": aaa_identifier_output,
-        "aaa_messages": aaa_messages_output,
+        "aaa_api-response-common": aaa_api$$response$$common,
+        "aaa_api-response-common-failure": aaa_api$$response$$common$$failure,
+        "aaa_audit-logs": aaa_audit$$logs,
+        "aaa_audit_logs_response_collection": aaa_audit_logs_response_collection,
+        "aaa_messages": aaa_messages,
       },
     },
     request: (args) => ({
       path: `/user/audit_logs`,
       query: [
-        ["id", args["id"], true],
-        ["export", args["export"], true],
-        ["action.type", args["action_type"], true],
-        ["actor.ip", args["actor_ip"], true],
-        ["actor.email", args["actor_email"], true],
-        ["since", args["since"], true],
-        ["before", args["before"], true],
-        ["zone.name", args["zone_name"], true],
-        ["direction", args["direction"], true],
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
-        ["hide_user_logs", args["hide_user_logs"], true],
+        ["id", param(args, "query", "id"), true],
+        ["export", param(args, "query", "export"), true],
+        ["action.type", param(args, "query", "action.type"), true],
+        ["actor.ip", param(args, "query", "actor.ip"), true],
+        ["actor.email", param(args, "query", "actor.email"), true],
+        ["since", param(args, "query", "since"), true],
+        ["before", param(args, "query", "before"), true],
+        ["zone.name", param(args, "query", "zone.name"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
+        ["hide_user_logs", param(args, "query", "hide_user_logs"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/user/firewall/accessRules/outputs.ts b/src/generated/forge-mcp/user/firewall/accessRules/outputs.ts
index dd75b7c40..19eb12868 100644
--- a/src/generated/forge-mcp/user/firewall/accessRules/outputs.ts
+++ b/src/generated/forge-mcp/user/firewall/accessRules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `firewall_rule_collection_response` in responses.
  */
-export const firewall_rule_collection_response_output: JsonSchema = {
+export const firewall_rule_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-collection"
@@ -28,7 +28,7 @@ export const firewall_rule_collection_response_output: JsonSchema = {
 /**
  * The schema of `firewall_rule_single_id_response` in responses.
  */
-export const firewall_rule_single_id_response_output: JsonSchema = {
+export const firewall_rule_single_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-single"
@@ -38,7 +38,7 @@ export const firewall_rule_single_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/firewall_schemas-identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -52,7 +52,7 @@ export const firewall_rule_single_id_response_output: JsonSchema = {
 /**
  * The schema of `firewall_rule_single_response` in responses.
  */
-export const firewall_rule_single_response_output: JsonSchema = {
+export const firewall_rule_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/firewall_api-response-single"
diff --git a/src/generated/forge-mcp/user/firewall/accessRules/tools.ts b/src/generated/forge-mcp/user/firewall/accessRules/tools.ts
index 8539daf29..80cbf3ca7 100644
--- a/src/generated/forge-mcp/user/firewall/accessRules/tools.ts
+++ b/src/generated/forge-mcp/user/firewall/accessRules/tools.ts
@@ -1,50 +1,44 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
-import {
-  firewall_api_response_collection_output,
-  firewall_api_response_common_failure_output,
-  firewall_api_response_common_output,
-  firewall_api_response_single_output,
-  firewall_asn_configuration_output,
-  firewall_cidr_configuration_output,
-  firewall_configuration_output,
-  firewall_country_configuration_output,
-  firewall_ip_configuration_output,
-  firewall_ipv6_configuration_output,
-  firewall_messages_output,
-  firewall_notes_output,
-  firewall_result_info_output,
-  firewall_rule_output,
-  firewall_schemas_identifier_output,
-  firewall_schemas_mode_output,
-} from "../../../outputs.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
+  firewall_api$$response$$collection,
+  firewall_api$$response$$common,
+  firewall_api$$response$$common$$failure,
+  firewall_api$$response$$single,
   firewall_asn_configuration,
   firewall_cidr_configuration,
   firewall_configuration,
   firewall_country_configuration,
   firewall_ip_configuration,
   firewall_ipv6_configuration,
-  firewall_notes,
-  firewall_rule_identifier,
-  firewall_schemas_mode,
+  firewall_messages,
+  firewall_result_info,
+  firewall_rule,
+} from "../../../outputs.js";
+import {
+  firewall_asn_configuration as firewall_asn_configuration$,
+  firewall_cidr_configuration as firewall_cidr_configuration$,
+  firewall_configuration as firewall_configuration$,
+  firewall_country_configuration as firewall_country_configuration$,
+  firewall_ip_configuration as firewall_ip_configuration$,
+  firewall_ipv6_configuration as firewall_ipv6_configuration$,
 } from "../../../schemas.js";
 import {
-  firewall_rule_collection_response_output,
-  firewall_rule_single_id_response_output,
-  firewall_rule_single_response_output,
+  firewall_rule_collection_response,
+  firewall_rule_single_id_response,
+  firewall_rule_single_response,
 } from "./outputs.js";
 
 /**
- * The tools of `user.firewall.access_rules`.
+ * The tools of `user.firewall.accessRules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_firewall_access_rules_create",
+    name: "user_firewall_accessRules_create",
     title: "Create an IP Access rule",
-    description: "Creates a new IP Access rule for all zones owned by the current user.\n\nNote: To create an IP Access rule that applies to a specific zone, refer to the [IP Access rules for a zone](#ip-access-rules-for-a-zone) endpoints.",
+    description: "Creates a new IP Access rule for all zones owned by the current user.\n\nNote: To create an IP Access rule that applies to a specific zone, refer to the [IP Access rules for a zone](#ip-access-rules-for-a-zone) endpoints.\n\nPOST /user/firewall/access_rules/rules",
     inputSchema: {
       type: "object",
       properties: {
@@ -55,11 +49,20 @@ export const tools: readonly Tool[] = [
               "description": "The rule configuration."
             },
             "mode": {
-              "$ref": "#/$defs/firewall_schemas-mode"
+              "description": "The action to apply to a matched request.",
+              "enum": [
+                "block",
+                "challenge",
+                "whitelist",
+                "js_challenge",
+                "managed_challenge"
+              ],
+              "type": "string"
             },
             "notes": {
-              "$ref": "#/$defs/firewall_notes",
-              "default": ""
+              "default": "",
+              "description": "An informative summary of the rule, typically used as a reminder or explanation.",
+              "type": "string"
             }
           },
           "required": [
@@ -72,34 +75,30 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "firewall_asn_configuration": firewall_asn_configuration$,
+        "firewall_cidr_configuration": firewall_cidr_configuration$,
+        "firewall_configuration": firewall_configuration$,
+        "firewall_country_configuration": firewall_country_configuration$,
+        "firewall_ip_configuration": firewall_ip_configuration$,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/firewall_rule_single_response",
       $defs: {
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
         "firewall_asn_configuration": firewall_asn_configuration,
         "firewall_cidr_configuration": firewall_cidr_configuration,
         "firewall_configuration": firewall_configuration,
         "firewall_country_configuration": firewall_country_configuration,
         "firewall_ip_configuration": firewall_ip_configuration,
         "firewall_ipv6_configuration": firewall_ipv6_configuration,
-        "firewall_notes": firewall_notes,
-        "firewall_schemas-mode": firewall_schemas_mode,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/firewall_rule_single_response",
-      $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_rule_single_response": firewall_rule_single_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
+        "firewall_messages": firewall_messages,
+        "firewall_rule": firewall_rule,
+        "firewall_rule_single_response": firewall_rule_single_response,
       },
     },
     annotations: {
@@ -132,21 +131,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_rule_single_response": firewall_rule_single_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_rule": firewall_rule,
+        "firewall_rule_single_response": firewall_rule_single_response,
       },
     },
     request: (args) => ({
@@ -155,32 +151,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_firewall_access_rules_delete",
+    name: "user_firewall_accessRules_delete",
     title: "Delete an IP Access rule",
-    description: "Deletes an IP Access rule at the user level.\n\nNote: Deleting a user-level rule will affect all zones owned by the user.\n\nConfirm with the user before calling this tool. This operation deletes the user-level IP Access Rule and affects every zone owned by the user.",
+    description: "Deletes an IP Access rule at the user level.\n\nNote: Deleting a user-level rule will affect all zones owned by the user.\n\nConfirm with the user before calling this tool. This operation deletes the user-level IP Access Rule and affects every zone owned by the user.\n\nDELETE /user/firewall/access_rules/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_id": {
-          "$ref": "#/$defs/firewall_rule_identifier",
-          "description": "Unique identifier for a rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "description": "Unique identifier for a rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "firewall_rule_identifier": firewall_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_rule_single_id_response",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_rule_single_id_response": firewall_rule_single_id_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_messages": firewall_messages,
+        "firewall_rule_single_id_response": firewall_rule_single_id_response,
       },
     },
     annotations: {
@@ -213,12 +215,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_rule_single_id_response": firewall_rule_single_id_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_messages": firewall_messages,
+        "firewall_rule_single_id_response": firewall_rule_single_id_response,
       },
     },
     request: (args) => ({
@@ -226,56 +227,66 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_firewall_access_rules_edit",
+    name: "user_firewall_accessRules_edit",
     title: "Update an IP Access rule",
-    description: "Updates an IP Access rule defined at the user level. You can only update the rule action (`mode` parameter) and notes.",
+    description: "Updates an IP Access rule defined at the user level. You can only update the rule action (`mode` parameter) and notes.\n\nPATCH /user/firewall/access_rules/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "mode": {
-              "$ref": "#/$defs/firewall_schemas-mode"
+              "description": "The action to apply to a matched request.",
+              "enum": [
+                "block",
+                "challenge",
+                "whitelist",
+                "js_challenge",
+                "managed_challenge"
+              ],
+              "type": "string"
             },
             "notes": {
-              "$ref": "#/$defs/firewall_notes",
-              "description": "An informative summary of the rule, typically used as a reminder or explanation."
+              "description": "An informative summary of the rule, typically used as a reminder or explanation.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "rule_id": {
-          "$ref": "#/$defs/firewall_rule_identifier",
-          "description": "Unique identifier for a rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "description": "Unique identifier for a rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "rule_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "firewall_notes": firewall_notes,
-        "firewall_rule_identifier": firewall_rule_identifier,
-        "firewall_schemas-mode": firewall_schemas_mode,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_rule_single_response",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_rule_single_response": firewall_rule_single_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_rule": firewall_rule,
+        "firewall_rule_single_response": firewall_rule_single_response,
       },
     },
     annotations: {
@@ -308,21 +319,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_rule_single_response": firewall_rule_single_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_rule": firewall_rule,
+        "firewall_rule_single_response": firewall_rule_single_response,
       },
     },
     request: (args) => ({
@@ -331,41 +339,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_firewall_access_rules_get",
+    name: "user_firewall_accessRules_get",
     title: "Get an IP Access rule",
-    description: "Fetches the details of an IP Access rule defined at the user level.",
+    description: "Fetches the details of an IP Access rule defined at the user level.\n\nGET /user/firewall/access_rules/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_id": {
-          "$ref": "#/$defs/firewall_rule_identifier",
-          "description": "Unique identifier for a rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "description": "Unique identifier for a rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "firewall_rule_identifier": firewall_rule_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_rule_single_response",
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_rule_single_response": firewall_rule_single_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_rule": firewall_rule,
+        "firewall_rule_single_response": firewall_rule_single_response,
       },
     },
     annotations: {
@@ -399,21 +411,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_api-response-single": firewall_api_response_single_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_rule_single_response": firewall_rule_single_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_api-response-single": firewall_api$$response$$single,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_rule": firewall_rule,
+        "firewall_rule_single_response": firewall_rule_single_response,
       },
     },
     request: (args) => ({
@@ -421,91 +430,99 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_firewall_access_rules_list",
+    name: "user_firewall_accessRules_list",
     title: "List IP Access rules",
-    description: "Fetches IP Access rules of the user. You can filter the results using several optional parameters.",
+    description: "Fetches IP Access rules of the user. You can filter the results using several optional parameters.\n\nGET /user/firewall/access_rules/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "access_rule_mode": {
-          "$ref": "#/$defs/firewall_schemas-mode",
-          "description": "The action to apply to a matched request."
-        },
-        "configuration_target": {
-          "description": "Defines the target to search in existing rules.",
-          "enum": [
-            "ip",
-            "ip_range",
-            "asn",
-            "country"
-          ],
-          "type": "string"
-        },
-        "configuration_value": {
-          "description": "Defines the target value to search for in existing rules: an IP address, an IP address range, or a country code, depending on the provided `configuration.target`.\nNotes: You can search for a single IPv4 address, an IP address range with a subnet of '/16' or '/24', or a two-letter ISO-3166-1 alpha-2 country code.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Defines the direction used to sort returned rules.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "match": {
-          "default": "all",
-          "description": "Defines the search requirements. When set to `all`, all the search requirements must match. When set to `any`, only one of the search requirements has to match.",
-          "enum": [
-            "any",
-            "all"
-          ],
-          "type": "string"
-        },
-        "notes": {
-          "description": "Defines the string to search for in the notes of existing IP Access rules.\nNotes: For example, the string 'attack' would match IP Access rules with notes 'Attack 26/02' and 'Attack 27/02'. The search is case insensitive.",
-          "type": "string"
-        },
-        "order": {
-          "description": "Defines the field used to sort returned rules.",
-          "enum": [
-            "configuration.target",
-            "configuration.value",
-            "mode"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "description": "Defines the requested page within paginated list of results.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Defines the maximum number of results requested.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "configuration.target": {
+              "description": "Defines the target to search in existing rules.",
+              "enum": [
+                "ip",
+                "ip_range",
+                "asn",
+                "country"
+              ],
+              "type": "string"
+            },
+            "configuration.value": {
+              "description": "Defines the target value to search for in existing rules: an IP address, an IP address range, or a country code, depending on the provided `configuration.target`.\nNotes: You can search for a single IPv4 address, an IP address range with a subnet of '/16' or '/24', or a two-letter ISO-3166-1 alpha-2 country code.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Defines the direction used to sort returned rules.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "match": {
+              "default": "all",
+              "description": "Defines the search requirements. When set to `all`, all the search requirements must match. When set to `any`, only one of the search requirements has to match.",
+              "enum": [
+                "any",
+                "all"
+              ],
+              "type": "string"
+            },
+            "mode": {
+              "description": "The action to apply to a matched request.",
+              "enum": [
+                "block",
+                "challenge",
+                "whitelist",
+                "js_challenge",
+                "managed_challenge"
+              ],
+              "type": "string"
+            },
+            "notes": {
+              "description": "Defines the string to search for in the notes of existing IP Access rules.\nNotes: For example, the string 'attack' would match IP Access rules with notes 'Attack 26/02' and 'Attack 27/02'. The search is case insensitive.",
+              "type": "string"
+            },
+            "order": {
+              "description": "Defines the field used to sort returned rules.",
+              "enum": [
+                "configuration.target",
+                "configuration.value",
+                "mode"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Defines the requested page within paginated list of results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Defines the maximum number of results requested.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
-      $defs: {
-        "firewall_schemas-mode": firewall_schemas_mode,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/firewall_rule_collection_response",
       $defs: {
-        "firewall_api-response-collection": firewall_api_response_collection_output,
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_result_info": firewall_result_info_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_rule_collection_response": firewall_rule_collection_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
+        "firewall_api-response-collection": firewall_api$$response$$collection,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_result_info": firewall_result_info,
+        "firewall_rule": firewall_rule,
+        "firewall_rule_collection_response": firewall_rule_collection_response,
       },
     },
     annotations: {
@@ -539,36 +556,33 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "firewall_api-response-collection": firewall_api_response_collection_output,
-        "firewall_api-response-common": firewall_api_response_common_output,
-        "firewall_api-response-common-failure": firewall_api_response_common_failure_output,
-        "firewall_asn_configuration": firewall_asn_configuration_output,
-        "firewall_cidr_configuration": firewall_cidr_configuration_output,
-        "firewall_configuration": firewall_configuration_output,
-        "firewall_country_configuration": firewall_country_configuration_output,
-        "firewall_ip_configuration": firewall_ip_configuration_output,
-        "firewall_ipv6_configuration": firewall_ipv6_configuration_output,
-        "firewall_messages": firewall_messages_output,
-        "firewall_notes": firewall_notes_output,
-        "firewall_result_info": firewall_result_info_output,
-        "firewall_rule": firewall_rule_output,
-        "firewall_rule_collection_response": firewall_rule_collection_response_output,
-        "firewall_schemas-identifier": firewall_schemas_identifier_output,
-        "firewall_schemas-mode": firewall_schemas_mode_output,
+        "firewall_api-response-collection": firewall_api$$response$$collection,
+        "firewall_api-response-common": firewall_api$$response$$common,
+        "firewall_api-response-common-failure": firewall_api$$response$$common$$failure,
+        "firewall_asn_configuration": firewall_asn_configuration,
+        "firewall_cidr_configuration": firewall_cidr_configuration,
+        "firewall_configuration": firewall_configuration,
+        "firewall_country_configuration": firewall_country_configuration,
+        "firewall_ip_configuration": firewall_ip_configuration,
+        "firewall_ipv6_configuration": firewall_ipv6_configuration,
+        "firewall_messages": firewall_messages,
+        "firewall_result_info": firewall_result_info,
+        "firewall_rule": firewall_rule,
+        "firewall_rule_collection_response": firewall_rule_collection_response,
       },
     },
     request: (args) => ({
       path: `/user/firewall/access_rules/rules`,
       query: [
-        ["mode", args["access_rule_mode"], true],
-        ["configuration.target", args["configuration_target"], true],
-        ["configuration.value", args["configuration_value"], true],
-        ["notes", args["notes"], true],
-        ["match", args["match"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["mode", param(args, "query", "mode"), true],
+        ["configuration.target", param(args, "query", "configuration.target"), true],
+        ["configuration.value", param(args, "query", "configuration.value"), true],
+        ["notes", param(args, "query", "notes"), true],
+        ["match", param(args, "query", "match"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/user/invites/outputs.ts b/src/generated/forge-mcp/user/invites/outputs.ts
index c7a670ac1..89297fa2a 100644
--- a/src/generated/forge-mcp/user/invites/outputs.ts
+++ b/src/generated/forge-mcp/user/invites/outputs.ts
@@ -3,39 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `iam_invite_components-schemas-identifier` in responses.
- */
-export const iam_invite_components_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `iam_invited_by` in responses.
- */
-export const iam_invited_by_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `iam_invited_member_email` in responses.
- */
-export const iam_invited_member_email_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `iam_invited_on` in responses.
- */
-export const iam_invited_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_schemas-collection_invite_response` in responses.
  */
-export const iam_schemas_collection_invite_response_output: JsonSchema = {
+export const iam_schemas$$collection_invite_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -54,18 +25,10 @@ export const iam_schemas_collection_invite_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `iam_schemas-expires_on` in responses.
- */
-export const iam_schemas_expires_on_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `iam_single_invite_response` in responses.
  */
-export const iam_single_invite_response_output: JsonSchema = {
+export const iam_single_invite_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -84,19 +47,20 @@ export const iam_single_invite_response_output: JsonSchema = {
 /**
  * The schema of `iam_user_invite` in responses.
  */
-export const iam_user_invite_output: JsonSchema = {
+export const iam_user_invite: JsonSchema = {
   "properties": {
     "expires_on": {
-      "$ref": "#/$defs/iam_schemas-expires_on"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_invite_components-schemas-identifier"
+      "type": "string"
     },
     "invited_by": {
-      "$ref": "#/$defs/iam_invited_by"
+      "type": "string"
     },
     "invited_member_email": {
-      "$ref": "#/$defs/iam_invited_member_email"
+      "type": "string"
     },
     "invited_member_id": {
       "oneOf": [
@@ -109,7 +73,8 @@ export const iam_user_invite_output: JsonSchema = {
       ]
     },
     "invited_on": {
-      "$ref": "#/$defs/iam_invited_on"
+      "format": "date-time",
+      "type": "string"
     },
     "organization_id": {
       "type": "string"
diff --git a/src/generated/forge-mcp/user/invites/schemas.ts b/src/generated/forge-mcp/user/invites/schemas.ts
deleted file mode 100644
index b418becc0..000000000
--- a/src/generated/forge-mcp/user/invites/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `iam_invite_components-schemas-identifier`.
- */
-export const iam_invite_components_schemas_identifier: JsonSchema = {
-  "description": "Invite identifier tag.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/user/invites/tools.ts b/src/generated/forge-mcp/user/invites/tools.ts
index a17a53b8f..d78bc1d27 100644
--- a/src/generated/forge-mcp/user/invites/tools.ts
+++ b/src/generated/forge-mcp/user/invites/tools.ts
@@ -3,25 +3,19 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_output,
-  iam_messages_2_output,
-  iam_result_info_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_messages$$2,
+  iam_result_info,
 } from "../../outputs.js";
-import { iam_role_names_output } from "../outputs.js";
+import { iam_role_names } from "../outputs.js";
 import {
-  iam_invite_components_schemas_identifier_output,
-  iam_invited_by_output,
-  iam_invited_member_email_output,
-  iam_invited_on_output,
-  iam_schemas_collection_invite_response_output,
-  iam_schemas_expires_on_output,
-  iam_single_invite_response_output,
-  iam_user_invite_output,
+  iam_schemas$$collection_invite_response,
+  iam_single_invite_response,
+  iam_user_invite,
 } from "./outputs.js";
-import { iam_invite_components_schemas_identifier } from "./schemas.js";
 
 /**
  * The tools of `user.invites`.
@@ -30,35 +24,37 @@ export const tools: readonly Tool[] = [
   {
     name: "user_invites_get",
     title: "Invitation Details",
-    description: "Gets the details of an invitation.",
+    description: "Gets the details of an invitation.\n\nGET /user/invites/{invite_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "invite_id": {
-          "$ref": "#/$defs/iam_invite_components-schemas-identifier",
-          "description": "Invite identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "invite_id": {
+              "description": "Invite identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "invite_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "invite_id"
+        "path"
       ],
-      $defs: {
-        "iam_invite_components-schemas-identifier": iam_invite_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_invite_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_invite_components-schemas-identifier": iam_invite_components_schemas_identifier_output,
-        "iam_invited_by": iam_invited_by_output,
-        "iam_invited_member_email": iam_invited_member_email_output,
-        "iam_invited_on": iam_invited_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-expires_on": iam_schemas_expires_on_output,
-        "iam_single_invite_response": iam_single_invite_response_output,
-        "iam_user_invite": iam_user_invite_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_role_names": iam_role_names,
+        "iam_single_invite_response": iam_single_invite_response,
+        "iam_user_invite": iam_user_invite,
       },
     },
     annotations: {
@@ -92,17 +88,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_invite_components-schemas-identifier": iam_invite_components_schemas_identifier_output,
-        "iam_invited_by": iam_invited_by_output,
-        "iam_invited_member_email": iam_invited_member_email_output,
-        "iam_invited_on": iam_invited_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-expires_on": iam_schemas_expires_on_output,
-        "iam_single_invite_response": iam_single_invite_response_output,
-        "iam_user_invite": iam_user_invite_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_role_names": iam_role_names,
+        "iam_single_invite_response": iam_single_invite_response,
+        "iam_user_invite": iam_user_invite,
       },
     },
     request: (args) => ({
@@ -112,26 +103,22 @@ export const tools: readonly Tool[] = [
   {
     name: "user_invites_list",
     title: "List Invitations",
-    description: "Lists all invitations associated with my user.",
+    description: "Lists all invitations associated with my user.\n\nGET /user/invites",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_schemas-collection_invite_response",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_invite_components-schemas-identifier": iam_invite_components_schemas_identifier_output,
-        "iam_invited_by": iam_invited_by_output,
-        "iam_invited_member_email": iam_invited_member_email_output,
-        "iam_invited_on": iam_invited_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-collection_invite_response": iam_schemas_collection_invite_response_output,
-        "iam_schemas-expires_on": iam_schemas_expires_on_output,
-        "iam_user_invite": iam_user_invite_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_messages-2": iam_messages$$2,
+        "iam_result_info": iam_result_info,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-collection_invite_response": iam_schemas$$collection_invite_response,
+        "iam_user_invite": iam_user_invite,
       },
     },
     annotations: {
@@ -165,19 +152,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_invite_components-schemas-identifier": iam_invite_components_schemas_identifier_output,
-        "iam_invited_by": iam_invited_by_output,
-        "iam_invited_member_email": iam_invited_member_email_output,
-        "iam_invited_on": iam_invited_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-collection_invite_response": iam_schemas_collection_invite_response_output,
-        "iam_schemas-expires_on": iam_schemas_expires_on_output,
-        "iam_user_invite": iam_user_invite_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_messages-2": iam_messages$$2,
+        "iam_result_info": iam_result_info,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-collection_invite_response": iam_schemas$$collection_invite_response,
+        "iam_user_invite": iam_user_invite,
       },
     },
     request: (_args) => ({
@@ -187,7 +169,7 @@ export const tools: readonly Tool[] = [
   {
     name: "user_invites_respond",
     title: "Respond to Invitation",
-    description: "Responds to an invitation.",
+    description: "Responds to an invitation.\n\nPATCH /user/invites/{invite_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -207,32 +189,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "invite_id": {
-          "$ref": "#/$defs/iam_invite_components-schemas-identifier",
-          "description": "Invite identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "invite_id": {
+              "description": "Invite identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "invite_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "invite_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "iam_invite_components-schemas-identifier": iam_invite_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_invite_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_invite_components-schemas-identifier": iam_invite_components_schemas_identifier_output,
-        "iam_invited_by": iam_invited_by_output,
-        "iam_invited_member_email": iam_invited_member_email_output,
-        "iam_invited_on": iam_invited_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-expires_on": iam_schemas_expires_on_output,
-        "iam_single_invite_response": iam_single_invite_response_output,
-        "iam_user_invite": iam_user_invite_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_role_names": iam_role_names,
+        "iam_single_invite_response": iam_single_invite_response,
+        "iam_user_invite": iam_user_invite,
       },
     },
     annotations: {
@@ -265,17 +249,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_invite_components-schemas-identifier": iam_invite_components_schemas_identifier_output,
-        "iam_invited_by": iam_invited_by_output,
-        "iam_invited_member_email": iam_invited_member_email_output,
-        "iam_invited_on": iam_invited_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-expires_on": iam_schemas_expires_on_output,
-        "iam_single_invite_response": iam_single_invite_response_output,
-        "iam_user_invite": iam_user_invite_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_role_names": iam_role_names,
+        "iam_single_invite_response": iam_single_invite_response,
+        "iam_user_invite": iam_user_invite,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/monitors/preview/tools.ts b/src/generated/forge-mcp/user/loadBalancers/monitors/preview/tools.ts
index d49f84830..49f8d279b 100644
--- a/src/generated/forge-mcp/user/loadBalancers/monitors/preview/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/monitors/preview/tools.ts
@@ -3,85 +3,61 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_identifier_output,
-  load_balancing_messages_output,
-  load_balancing_preview_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
+  load$$balancing_preview_response,
 } from "../../../../outputs.js";
 import {
-  load_balancing_allow_insecure,
-  load_balancing_consecutive_down,
-  load_balancing_consecutive_up,
-  load_balancing_description,
-  load_balancing_expected_body,
-  load_balancing_expected_codes,
-  load_balancing_follow_redirects,
-  load_balancing_header,
-  load_balancing_identifier,
-  load_balancing_interval,
-  load_balancing_method,
-  load_balancing_monitor_editable,
-  load_balancing_path,
-  load_balancing_port,
-  load_balancing_probe_zone,
-  load_balancing_retries,
-  load_balancing_timeout,
-  load_balancing_type,
+  load$$balancing_header,
+  load$$balancing_monitor$$editable,
 } from "../../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.monitors.preview`.
+ * The tools of `user.loadBalancers.monitors.preview`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_monitors_preview_create",
+    name: "user_loadBalancers_monitors_preview_create",
     title: "Preview Monitor",
-    description: "Preview pools using the specified monitor with provided monitor details. The returned preview_id can be used in the preview endpoint to retrieve the results.",
+    description: "Preview pools using the specified monitor with provided monitor details. The returned preview_id can be used in the preview endpoint to retrieve the results.\n\nPOST /user/load_balancers/monitors/{monitor_id}/preview",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
         },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "monitor_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_identifier": load_balancing_identifier,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_preview_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_preview_response": load_balancing_preview_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_preview_response": load$$balancing_preview_response,
       },
     },
     annotations: {
@@ -103,12 +79,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_preview_response": load_balancing_preview_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_preview_response": load$$balancing_preview_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/monitors/references/tools.ts b/src/generated/forge-mcp/user/loadBalancers/monitors/references/tools.ts
index f0dd511f9..0eb6f669e 100644
--- a/src/generated/forge-mcp/user/loadBalancers/monitors/references/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/monitors/references/tools.ts
@@ -3,41 +3,47 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_messages_output,
-  load_balancing_monitor_references_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_messages,
+  load$$balancing_monitor$$references$$response,
 } from "../../../../outputs.js";
-import { load_balancing_identifier } from "../../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.monitors.references`.
+ * The tools of `user.loadBalancers.monitors.references`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_monitors_references_list",
+    name: "user_loadBalancers_monitors_references_list",
     title: "List Monitor References",
-    description: "Get the list of resources that reference the provided monitor.",
+    description: "Get the list of resources that reference the provided monitor.\n\nGET /user/load_balancers/monitors/{monitor_id}/references",
     inputSchema: {
       type: "object",
       properties: {
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "monitor_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_identifier": load_balancing_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-references-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-references-response": load_balancing_monitor_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-references-response": load$$balancing_monitor$$references$$response,
       },
     },
     annotations: {
@@ -65,10 +71,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_monitor-references-response": load_balancing_monitor_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor-references-response": load$$balancing_monitor$$references$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/monitors/tools.ts b/src/generated/forge-mcp/user/loadBalancers/monitors/tools.ts
index dd5af4869..08124bb1b 100644
--- a/src/generated/forge-mcp/user/loadBalancers/monitors/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/monitors/tools.ts
@@ -3,65 +3,32 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_allow_insecure_output,
-  load_balancing_api_paginated_response_collection_output,
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_consecutive_down_output,
-  load_balancing_consecutive_up_output,
-  load_balancing_description_output,
-  load_balancing_expected_body_output,
-  load_balancing_expected_codes_output,
-  load_balancing_follow_redirects_output,
-  load_balancing_header_output,
-  load_balancing_id_response_output,
-  load_balancing_identifier_output,
-  load_balancing_interval_output,
-  load_balancing_messages_output,
-  load_balancing_method_output,
-  load_balancing_monitor_editable_output,
-  load_balancing_monitor_output,
-  load_balancing_monitor_response_collection_output,
-  load_balancing_monitor_response_single_output,
-  load_balancing_path_output,
-  load_balancing_port_output,
-  load_balancing_probe_zone_output,
-  load_balancing_result_info_output,
-  load_balancing_retries_output,
-  load_balancing_timeout_output,
-  load_balancing_timestamp_output,
-  load_balancing_type_output,
+  load$$balancing_api$$paginated$$response$$collection,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_header,
+  load$$balancing_id_response,
+  load$$balancing_messages,
+  load$$balancing_monitor,
+  load$$balancing_monitor$$editable,
+  load$$balancing_monitor$$response$$collection,
+  load$$balancing_monitor$$response$$single,
+  load$$balancing_result_info,
 } from "../../../outputs.js";
 import {
-  load_balancing_allow_insecure,
-  load_balancing_consecutive_down,
-  load_balancing_consecutive_up,
-  load_balancing_description,
-  load_balancing_expected_body,
-  load_balancing_expected_codes,
-  load_balancing_follow_redirects,
-  load_balancing_header,
-  load_balancing_identifier,
-  load_balancing_interval,
-  load_balancing_method,
-  load_balancing_monitor_editable,
-  load_balancing_path,
-  load_balancing_port,
-  load_balancing_probe_zone,
-  load_balancing_retries,
-  load_balancing_timeout,
-  load_balancing_type,
+  load$$balancing_header as load$$balancing_header$,
+  load$$balancing_monitor$$editable as load$$balancing_monitor$$editable$,
 } from "../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.monitors`.
+ * The tools of `user.loadBalancers.monitors`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_monitors_create",
+    name: "user_loadBalancers_monitors_create",
     title: "Create Monitor",
-    description: "Create a configured monitor.",
+    description: "Create a configured monitor.\n\nPOST /user/load_balancers/monitors",
     inputSchema: {
       type: "object",
       properties: {
@@ -72,53 +39,22 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header$,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-single",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     annotations: {
@@ -145,31 +81,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     request: (args) => ({
@@ -178,31 +97,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_monitors_delete",
+    name: "user_loadBalancers_monitors_delete",
     title: "Delete Monitor",
-    description: "Delete a configured monitor.",
+    description: "Delete a configured monitor.\n\nDELETE /user/load_balancers/monitors/{monitor_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "monitor_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_identifier": load_balancing_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_id_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_id_response": load_balancing_id_response_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_id_response": load$$balancing_id_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     annotations: {
@@ -229,12 +154,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_id_response": load_balancing_id_response_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_id_response": load$$balancing_id_response,
+        "load-balancing_messages": load$$balancing_messages,
       },
     },
     request: (args) => ({
@@ -242,71 +166,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_monitors_edit",
+    name: "user_loadBalancers_monitors_edit",
     title: "Patch Monitor",
-    description: "Apply changes to an existing monitor, overwriting the supplied properties.",
+    description: "Apply changes to an existing monitor, overwriting the supplied properties.\n\nPATCH /user/load_balancers/monitors/{monitor_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
         },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "monitor_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_identifier": load_balancing_identifier,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header$,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-single",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     annotations: {
@@ -333,31 +234,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     request: (args) => ({
@@ -366,50 +250,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_monitors_get",
+    name: "user_loadBalancers_monitors_get",
     title: "Monitor Details",
-    description: "Fetch a single configured monitor for a user.",
+    description: "Fetch a single configured monitor for a user.\n\nGET /user/load_balancers/monitors/{monitor_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "monitor_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_identifier": load_balancing_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-single",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     annotations: {
@@ -437,31 +311,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     request: (args) => ({
@@ -469,41 +326,25 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_monitors_list",
+    name: "user_loadBalancers_monitors_list",
     title: "List Monitors",
-    description: "List configured monitors for a user.",
+    description: "List configured monitors for a user.\n\nGET /user/load_balancers/monitors",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-collection",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-collection": load_balancing_monitor_response_collection_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-collection": load$$balancing_monitor$$response$$collection,
+        "load-balancing_result_info": load$$balancing_result_info,
       },
     },
     annotations: {
@@ -531,32 +372,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-collection": load_balancing_monitor_response_collection_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-collection": load$$balancing_monitor$$response$$collection,
+        "load-balancing_result_info": load$$balancing_result_info,
       },
     },
     request: (_args) => ({
@@ -564,71 +388,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_monitors_update",
+    name: "user_loadBalancers_monitors_update",
     title: "Update Monitor",
-    description: "Modify a configured monitor.",
+    description: "Modify a configured monitor.\n\nPUT /user/load_balancers/monitors/{monitor_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
         },
-        "monitor_id": {
-          "$ref": "#/$defs/load-balancing_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "monitor_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "monitor_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "monitor_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_identifier": load_balancing_identifier,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header$,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_monitor-response-single",
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     annotations: {
@@ -655,31 +456,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down_output,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up_output,
-        "load-balancing_description": load_balancing_description_output,
-        "load-balancing_expected_body": load_balancing_expected_body_output,
-        "load-balancing_expected_codes": load_balancing_expected_codes_output,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects_output,
-        "load-balancing_header": load_balancing_header_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_interval": load_balancing_interval_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_method": load_balancing_method_output,
-        "load-balancing_monitor": load_balancing_monitor_output,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable_output,
-        "load-balancing_monitor-response-single": load_balancing_monitor_response_single_output,
-        "load-balancing_path": load_balancing_path_output,
-        "load-balancing_port": load_balancing_port_output,
-        "load-balancing_probe_zone": load_balancing_probe_zone_output,
-        "load-balancing_retries": load_balancing_retries_output,
-        "load-balancing_timeout": load_balancing_timeout_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_type": load_balancing_type_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_monitor": load$$balancing_monitor,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
+        "load-balancing_monitor-response-single": load$$balancing_monitor$$response$$single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/pools/edit/pools/tools.ts b/src/generated/forge-mcp/user/loadBalancers/pools/edit/pools/tools.ts
index 668a3c3da..2e2087736 100644
--- a/src/generated/forge-mcp/user/loadBalancers/pools/edit/pools/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/pools/edit/pools/tools.ts
@@ -3,86 +3,48 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  load_balancing_Host_output,
-  load_balancing_address_output,
-  load_balancing_api_paginated_response_collection_output,
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_check_regions_output,
-  load_balancing_disabled_at_output,
-  load_balancing_enabled_output,
-  load_balancing_filter_options_output,
-  load_balancing_health_sources_output,
-  load_balancing_latitude_output,
-  load_balancing_load_shedding_output,
-  load_balancing_longitude_output,
-  load_balancing_messages_output,
-  load_balancing_minimum_origins_output,
-  load_balancing_monitor_group_id_output,
-  load_balancing_monitor_id_output,
-  load_balancing_name_output,
-  load_balancing_networks_output,
-  load_balancing_notification_email_output,
-  load_balancing_notification_filter_output,
-  load_balancing_origin_flatten_cname_output,
-  load_balancing_origin_output,
-  load_balancing_origin_port_output,
-  load_balancing_origin_steering_output,
-  load_balancing_origins_output,
-  load_balancing_pool_output,
-  load_balancing_result_info_output,
-  load_balancing_schemas_description_output,
-  load_balancing_schemas_disabled_at_output,
-  load_balancing_schemas_enabled_output,
-  load_balancing_schemas_header_output,
-  load_balancing_schemas_identifier_output,
-  load_balancing_schemas_name_output,
-  load_balancing_schemas_response_collection_output,
-  load_balancing_schemas_single_response_output,
-  load_balancing_timestamp_output,
-  load_balancing_virtual_network_id_output,
-  load_balancing_weight_output,
+  load$$balancing_Host,
+  load$$balancing_api$$paginated$$response$$collection,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_check_regions,
+  load$$balancing_filter_options,
+  load$$balancing_health_sources,
+  load$$balancing_load_shedding,
+  load$$balancing_messages,
+  load$$balancing_networks,
+  load$$balancing_notification_filter,
+  load$$balancing_origin,
+  load$$balancing_origin_steering,
+  load$$balancing_origins,
+  load$$balancing_pool,
+  load$$balancing_result_info,
+  load$$balancing_schemas$$header,
+  load$$balancing_schemas$$response_collection,
+  load$$balancing_schemas$$single_response,
 } from "../../../../../outputs.js";
 import {
-  load_balancing_Host,
-  load_balancing_address,
-  load_balancing_check_regions,
-  load_balancing_enabled,
-  load_balancing_filter_options,
-  load_balancing_health_sources,
-  load_balancing_latitude,
-  load_balancing_load_shedding,
-  load_balancing_longitude,
-  load_balancing_minimum_origins,
-  load_balancing_monitor_group_id,
-  load_balancing_monitor_id,
-  load_balancing_name,
-  load_balancing_notification_email,
-  load_balancing_notification_filter,
-  load_balancing_origin,
-  load_balancing_origin_flatten_cname,
-  load_balancing_origin_port,
-  load_balancing_origin_steering,
-  load_balancing_origins,
-  load_balancing_patch_pools_notification_email,
-  load_balancing_schemas_description,
-  load_balancing_schemas_enabled,
-  load_balancing_schemas_header,
-  load_balancing_schemas_identifier,
-  load_balancing_schemas_name,
-  load_balancing_virtual_network_id,
-  load_balancing_weight,
+  load$$balancing_Host as load$$balancing_Host$,
+  load$$balancing_check_regions as load$$balancing_check_regions$,
+  load$$balancing_filter_options as load$$balancing_filter_options$,
+  load$$balancing_health_sources as load$$balancing_health_sources$,
+  load$$balancing_load_shedding as load$$balancing_load_shedding$,
+  load$$balancing_notification_filter as load$$balancing_notification_filter$,
+  load$$balancing_origin as load$$balancing_origin$,
+  load$$balancing_origin_steering as load$$balancing_origin_steering$,
+  load$$balancing_origins as load$$balancing_origins$,
+  load$$balancing_schemas$$header as load$$balancing_schemas$$header$,
 } from "../../../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.pools.edit.pools`.
+ * The tools of `user.loadBalancers.pools.edit.pools`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_pools_edit_pools_pool",
+    name: "user_loadBalancers_pools_edit_pools_pool",
     title: "Patch Pool",
-    description: "Apply changes to an existing pool, overwriting the supplied properties.",
+    description: "Apply changes to an existing pool, overwriting the supplied properties.\n\nPATCH /user/load_balancers/pools/{pool_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -93,52 +55,52 @@ export const tools: readonly Tool[] = [
               "description": "A list of regions from which to run health checks. Null means every Cloudflare data center."
             },
             "description": {
-              "$ref": "#/$defs/load-balancing_schemas-description",
               "default": "",
-              "description": "A human-readable description of the pool."
+              "description": "A human-readable description of the pool.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/load-balancing_enabled",
               "default": true,
-              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any)."
+              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any).",
+              "type": "boolean"
             },
             "health_sources": {
               "$ref": "#/$defs/load-balancing_health_sources",
               "description": "A list of health sources, ordered from highest to lowest priority, used to evaluate individual origin health and overall pool health. The load balancer uses the first source that has data and falls back to the next. Currently accepted values are null or the exact array [\"regional\", \"global\"]; any other combination is rejected. Null (the default) behaves like [\"local\", \"global\"]. [\"regional\", \"global\"] makes each region steer on its own health, falling back to the global decision when a region has no fresh data. Setting regional requires at least one region in check_regions."
             },
             "latitude": {
-              "$ref": "#/$defs/load-balancing_latitude",
-              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set."
+              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set.",
+              "type": "number"
             },
             "load_shedding": {
               "$ref": "#/$defs/load-balancing_load_shedding",
               "description": "Configures load shedding policies and percentages for the pool."
             },
             "longitude": {
-              "$ref": "#/$defs/load-balancing_longitude",
-              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set."
+              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set.",
+              "type": "number"
             },
             "minimum_origins": {
-              "$ref": "#/$defs/load-balancing_minimum_origins",
               "default": 1,
-              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool."
+              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool.",
+              "type": "integer"
             },
             "monitor": {
-              "$ref": "#/$defs/load-balancing_monitor_id",
-              "description": "The ID of the Monitor to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "monitor_group": {
-              "$ref": "#/$defs/load-balancing_monitor_group_id",
-              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/load-balancing_name",
-              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed."
+              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed.",
+              "type": "string"
             },
             "notification_email": {
-              "$ref": "#/$defs/load-balancing_notification_email",
               "default": "",
-              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list."
+              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list.",
+              "type": "string"
             },
             "notification_filter": {
               "$ref": "#/$defs/load-balancing_notification_filter",
@@ -155,83 +117,56 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "pool_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_Host": load_balancing_Host,
-        "load-balancing_address": load_balancing_address,
-        "load-balancing_check_regions": load_balancing_check_regions,
-        "load-balancing_enabled": load_balancing_enabled,
-        "load-balancing_filter_options": load_balancing_filter_options,
-        "load-balancing_health_sources": load_balancing_health_sources,
-        "load-balancing_latitude": load_balancing_latitude,
-        "load-balancing_load_shedding": load_balancing_load_shedding,
-        "load-balancing_longitude": load_balancing_longitude,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
-        "load-balancing_name": load_balancing_name,
-        "load-balancing_notification_email": load_balancing_notification_email,
-        "load-balancing_notification_filter": load_balancing_notification_filter,
-        "load-balancing_origin": load_balancing_origin,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname,
-        "load-balancing_origin_port": load_balancing_origin_port,
-        "load-balancing_origin_steering": load_balancing_origin_steering,
-        "load-balancing_origins": load_balancing_origins,
-        "load-balancing_schemas-description": load_balancing_schemas_description,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled,
-        "load-balancing_schemas-header": load_balancing_schemas_header,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-        "load-balancing_schemas-name": load_balancing_schemas_name,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id,
-        "load-balancing_weight": load_balancing_weight,
+        "load-balancing_Host": load$$balancing_Host$,
+        "load-balancing_check_regions": load$$balancing_check_regions$,
+        "load-balancing_filter_options": load$$balancing_filter_options$,
+        "load-balancing_health_sources": load$$balancing_health_sources$,
+        "load-balancing_load_shedding": load$$balancing_load_shedding$,
+        "load-balancing_notification_filter": load$$balancing_notification_filter$,
+        "load-balancing_origin": load$$balancing_origin$,
+        "load-balancing_origin_steering": load$$balancing_origin_steering$,
+        "load-balancing_origins": load$$balancing_origins$,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-single_response",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     annotations: {
@@ -258,43 +193,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     request: (args) => ({
@@ -303,17 +218,17 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_pools_edit_pools_pools",
+    name: "user_loadBalancers_pools_edit_pools_pools",
     title: "Patch Pools",
-    description: "Apply changes to a number of existing pools, overwriting the supplied properties. Pools are ordered by ascending `name`. Returns the list of affected pools. Supports the standard pagination query parameters, either `limit`/`offset` or `per_page`/`page`.",
+    description: "Apply changes to a number of existing pools, overwriting the supplied properties. Pools are ordered by ascending `name`. Returns the list of affected pools. Supports the standard pagination query parameters, either `limit`/`offset` or `per_page`/`page`.\n\nPATCH /user/load_balancers/pools",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "notification_email": {
-              "$ref": "#/$defs/load-balancing_patch_pools_notification_email",
-              "description": "The email address to send health status notifications to. This field is now deprecated in favor of Cloudflare Notifications for Load Balancing, so only resetting this field with an empty string `\"\"` is accepted."
+              "description": "The email address to send health status notifications to. This field is now deprecated in favor of Cloudflare Notifications for Load Balancing, so only resetting this field with an empty string `\"\"` is accepted.",
+              "type": "string"
             }
           },
           "type": "object"
@@ -322,50 +237,28 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
-      $defs: {
-        "load-balancing_patch_pools_notification_email": load_balancing_patch_pools_notification_email,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-response_collection",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-response_collection": load_balancing_schemas_response_collection_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-response_collection": load$$balancing_schemas$$response_collection,
       },
     },
     annotations: {
@@ -392,44 +285,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-response_collection": load_balancing_schemas_response_collection_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-response_collection": load$$balancing_schemas$$response_collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/pools/health/tools.ts b/src/generated/forge-mcp/user/loadBalancers/pools/health/tools.ts
index d9d2ec0e6..541d74a57 100644
--- a/src/generated/forge-mcp/user/loadBalancers/pools/health/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/pools/health/tools.ts
@@ -3,45 +3,51 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_health_details_output,
-  load_balancing_messages_output,
-  load_balancing_origin_health_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_health_details,
+  load$$balancing_messages,
+  load$$balancing_origin$$health,
 } from "../../../../outputs.js";
-import { load_balancing_schemas_identifier } from "../../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.pools.health`.
+ * The tools of `user.loadBalancers.pools.health`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_pools_health_get",
+    name: "user_loadBalancers_pools_health_get",
     title: "Pool Health Details",
-    description: "Fetch the latest pool health status for a single pool.",
+    description: "Fetch the latest pool health status for a single pool.\n\nGET /user/load_balancers/pools/{pool_id}/health",
     inputSchema: {
       type: "object",
       properties: {
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "pool_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_health_details",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_health_details": load_balancing_health_details_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin-health": load_balancing_origin_health_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_health_details": load$$balancing_health_details,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin-health": load$$balancing_origin$$health,
       },
     },
     annotations: {
@@ -69,12 +75,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_health_details": load_balancing_health_details_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin-health": load_balancing_origin_health_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_health_details": load$$balancing_health_details,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin-health": load$$balancing_origin$$health,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/pools/preview/tools.ts b/src/generated/forge-mcp/user/loadBalancers/pools/preview/tools.ts
index 6f165f5ca..75e0e5acc 100644
--- a/src/generated/forge-mcp/user/loadBalancers/pools/preview/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/pools/preview/tools.ts
@@ -3,85 +3,61 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_identifier_output,
-  load_balancing_messages_output,
-  load_balancing_preview_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
+  load$$balancing_preview_response,
 } from "../../../../outputs.js";
 import {
-  load_balancing_allow_insecure,
-  load_balancing_consecutive_down,
-  load_balancing_consecutive_up,
-  load_balancing_description,
-  load_balancing_expected_body,
-  load_balancing_expected_codes,
-  load_balancing_follow_redirects,
-  load_balancing_header,
-  load_balancing_interval,
-  load_balancing_method,
-  load_balancing_monitor_editable,
-  load_balancing_path,
-  load_balancing_port,
-  load_balancing_probe_zone,
-  load_balancing_retries,
-  load_balancing_schemas_identifier,
-  load_balancing_timeout,
-  load_balancing_type,
+  load$$balancing_header,
+  load$$balancing_monitor$$editable,
 } from "../../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.pools.preview`.
+ * The tools of `user.loadBalancers.pools.preview`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_pools_preview_create",
+    name: "user_loadBalancers_pools_preview_create",
     title: "Preview Pool",
-    description: "Preview pool health using provided monitor details. The returned preview_id can be used in the preview endpoint to retrieve the results.",
+    description: "Preview pool health using provided monitor details. The returned preview_id can be used in the preview endpoint to retrieve the results.\n\nPOST /user/load_balancers/pools/{pool_id}/preview",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/load-balancing_monitor-editable"
         },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "pool_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_allow_insecure": load_balancing_allow_insecure,
-        "load-balancing_consecutive_down": load_balancing_consecutive_down,
-        "load-balancing_consecutive_up": load_balancing_consecutive_up,
-        "load-balancing_description": load_balancing_description,
-        "load-balancing_expected_body": load_balancing_expected_body,
-        "load-balancing_expected_codes": load_balancing_expected_codes,
-        "load-balancing_follow_redirects": load_balancing_follow_redirects,
-        "load-balancing_header": load_balancing_header,
-        "load-balancing_interval": load_balancing_interval,
-        "load-balancing_method": load_balancing_method,
-        "load-balancing_monitor-editable": load_balancing_monitor_editable,
-        "load-balancing_path": load_balancing_path,
-        "load-balancing_port": load_balancing_port,
-        "load-balancing_probe_zone": load_balancing_probe_zone,
-        "load-balancing_retries": load_balancing_retries,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-        "load-balancing_timeout": load_balancing_timeout,
-        "load-balancing_type": load_balancing_type,
+        "load-balancing_header": load$$balancing_header,
+        "load-balancing_monitor-editable": load$$balancing_monitor$$editable,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_preview_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_preview_response": load_balancing_preview_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_preview_response": load$$balancing_preview_response,
       },
     },
     annotations: {
@@ -103,12 +79,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_identifier": load_balancing_identifier_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_preview_response": load_balancing_preview_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_preview_response": load$$balancing_preview_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/pools/references/tools.ts b/src/generated/forge-mcp/user/loadBalancers/pools/references/tools.ts
index 63b31c97a..ebc074b80 100644
--- a/src/generated/forge-mcp/user/loadBalancers/pools/references/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/pools/references/tools.ts
@@ -3,41 +3,47 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_messages_output,
-  load_balancing_pools_references_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_messages,
+  load$$balancing_pools$$references$$response,
 } from "../../../../outputs.js";
-import { load_balancing_schemas_identifier } from "../../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.pools.references`.
+ * The tools of `user.loadBalancers.pools.references`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_pools_references_list",
+    name: "user_loadBalancers_pools_references_list",
     title: "List Pool References",
-    description: "Get the list of resources that reference the provided pool.",
+    description: "Get the list of resources that reference the provided pool.\n\nGET /user/load_balancers/pools/{pool_id}/references",
     inputSchema: {
       type: "object",
       properties: {
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "pool_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_pools-references-response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_pools-references-response": load_balancing_pools_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_pools-references-response": load$$balancing_pools$$references$$response,
       },
     },
     annotations: {
@@ -65,10 +71,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_pools-references-response": load_balancing_pools_references_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_pools-references-response": load$$balancing_pools$$references$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/pools/tools.ts b/src/generated/forge-mcp/user/loadBalancers/pools/tools.ts
index 53814da73..45a9f50c6 100644
--- a/src/generated/forge-mcp/user/loadBalancers/pools/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/pools/tools.ts
@@ -1,89 +1,52 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_Host_output,
-  load_balancing_address_output,
-  load_balancing_api_paginated_response_collection_output,
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_check_regions_output,
-  load_balancing_disabled_at_output,
-  load_balancing_enabled_output,
-  load_balancing_filter_options_output,
-  load_balancing_health_sources_output,
-  load_balancing_latitude_output,
-  load_balancing_load_shedding_output,
-  load_balancing_longitude_output,
-  load_balancing_messages_output,
-  load_balancing_minimum_origins_output,
-  load_balancing_monitor_group_id_output,
-  load_balancing_monitor_id_output,
-  load_balancing_name_output,
-  load_balancing_networks_output,
-  load_balancing_notification_email_output,
-  load_balancing_notification_filter_output,
-  load_balancing_origin_flatten_cname_output,
-  load_balancing_origin_output,
-  load_balancing_origin_port_output,
-  load_balancing_origin_steering_output,
-  load_balancing_origins_output,
-  load_balancing_pool_output,
-  load_balancing_result_info_output,
-  load_balancing_schemas_description_output,
-  load_balancing_schemas_disabled_at_output,
-  load_balancing_schemas_enabled_output,
-  load_balancing_schemas_header_output,
-  load_balancing_schemas_id_response_output,
-  load_balancing_schemas_identifier_output,
-  load_balancing_schemas_name_output,
-  load_balancing_schemas_response_collection_output,
-  load_balancing_schemas_single_response_output,
-  load_balancing_timestamp_output,
-  load_balancing_virtual_network_id_output,
-  load_balancing_weight_output,
+  load$$balancing_Host,
+  load$$balancing_api$$paginated$$response$$collection,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_check_regions,
+  load$$balancing_filter_options,
+  load$$balancing_health_sources,
+  load$$balancing_load_shedding,
+  load$$balancing_messages,
+  load$$balancing_networks,
+  load$$balancing_notification_filter,
+  load$$balancing_origin,
+  load$$balancing_origin_steering,
+  load$$balancing_origins,
+  load$$balancing_pool,
+  load$$balancing_result_info,
+  load$$balancing_schemas$$header,
+  load$$balancing_schemas$$id_response,
+  load$$balancing_schemas$$response_collection,
+  load$$balancing_schemas$$single_response,
 } from "../../../outputs.js";
 import {
-  load_balancing_Host,
-  load_balancing_address,
-  load_balancing_check_regions,
-  load_balancing_enabled,
-  load_balancing_filter_options,
-  load_balancing_health_sources,
-  load_balancing_latitude,
-  load_balancing_load_shedding,
-  load_balancing_longitude,
-  load_balancing_minimum_origins,
-  load_balancing_monitor_group_id,
-  load_balancing_monitor_id,
-  load_balancing_name,
-  load_balancing_networks,
-  load_balancing_notification_email,
-  load_balancing_notification_filter,
-  load_balancing_origin,
-  load_balancing_origin_flatten_cname,
-  load_balancing_origin_port,
-  load_balancing_origin_steering,
-  load_balancing_origins,
-  load_balancing_schemas_description,
-  load_balancing_schemas_enabled,
-  load_balancing_schemas_header,
-  load_balancing_schemas_identifier,
-  load_balancing_schemas_name,
-  load_balancing_virtual_network_id,
-  load_balancing_weight,
+  load$$balancing_Host as load$$balancing_Host$,
+  load$$balancing_check_regions as load$$balancing_check_regions$,
+  load$$balancing_filter_options as load$$balancing_filter_options$,
+  load$$balancing_health_sources as load$$balancing_health_sources$,
+  load$$balancing_load_shedding as load$$balancing_load_shedding$,
+  load$$balancing_networks as load$$balancing_networks$,
+  load$$balancing_notification_filter as load$$balancing_notification_filter$,
+  load$$balancing_origin as load$$balancing_origin$,
+  load$$balancing_origin_steering as load$$balancing_origin_steering$,
+  load$$balancing_origins as load$$balancing_origins$,
+  load$$balancing_schemas$$header as load$$balancing_schemas$$header$,
 } from "../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.pools`.
+ * The tools of `user.loadBalancers.pools`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_pools_create",
+    name: "user_loadBalancers_pools_create",
     title: "Create Pool",
-    description: "Create a new pool.",
+    description: "Create a new pool.\n\nPOST /user/load_balancers/pools",
     inputSchema: {
       type: "object",
       properties: {
@@ -94,56 +57,56 @@ export const tools: readonly Tool[] = [
               "description": "A list of regions from which to run health checks. Null means every Cloudflare data center."
             },
             "description": {
-              "$ref": "#/$defs/load-balancing_schemas-description",
               "default": "",
-              "description": "A human-readable description of the pool."
+              "description": "A human-readable description of the pool.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/load-balancing_enabled",
               "default": true,
-              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any)."
+              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any).",
+              "type": "boolean"
             },
             "health_sources": {
               "$ref": "#/$defs/load-balancing_health_sources",
               "description": "A list of health sources, ordered from highest to lowest priority, used to evaluate individual origin health and overall pool health. The load balancer uses the first source that has data and falls back to the next. Currently accepted values are null or the exact array [\"regional\", \"global\"]; any other combination is rejected. Null (the default) behaves like [\"local\", \"global\"]. [\"regional\", \"global\"] makes each region steer on its own health, falling back to the global decision when a region has no fresh data. Setting regional requires at least one region in check_regions."
             },
             "latitude": {
-              "$ref": "#/$defs/load-balancing_latitude",
-              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set."
+              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set.",
+              "type": "number"
             },
             "load_shedding": {
               "$ref": "#/$defs/load-balancing_load_shedding",
               "description": "Configures load shedding policies and percentages for the pool."
             },
             "longitude": {
-              "$ref": "#/$defs/load-balancing_longitude",
-              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set."
+              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set.",
+              "type": "number"
             },
             "minimum_origins": {
-              "$ref": "#/$defs/load-balancing_minimum_origins",
               "default": 1,
-              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool."
+              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool.",
+              "type": "integer"
             },
             "monitor": {
-              "$ref": "#/$defs/load-balancing_monitor_id",
-              "description": "The ID of the Monitor to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "monitor_group": {
-              "$ref": "#/$defs/load-balancing_monitor_group_id",
-              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/load-balancing_name",
-              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed."
+              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed.",
+              "type": "string"
             },
             "networks": {
               "$ref": "#/$defs/load-balancing_networks",
               "description": "List of networks where Load Balancer or Pool is enabled."
             },
             "notification_email": {
-              "$ref": "#/$defs/load-balancing_notification_email",
               "default": "",
-              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list."
+              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list.",
+              "type": "string"
             },
             "notification_filter": {
               "$ref": "#/$defs/load-balancing_notification_filter",
@@ -168,75 +131,40 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_Host": load_balancing_Host,
-        "load-balancing_address": load_balancing_address,
-        "load-balancing_check_regions": load_balancing_check_regions,
-        "load-balancing_enabled": load_balancing_enabled,
-        "load-balancing_filter_options": load_balancing_filter_options,
-        "load-balancing_health_sources": load_balancing_health_sources,
-        "load-balancing_latitude": load_balancing_latitude,
-        "load-balancing_load_shedding": load_balancing_load_shedding,
-        "load-balancing_longitude": load_balancing_longitude,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
-        "load-balancing_name": load_balancing_name,
-        "load-balancing_networks": load_balancing_networks,
-        "load-balancing_notification_email": load_balancing_notification_email,
-        "load-balancing_notification_filter": load_balancing_notification_filter,
-        "load-balancing_origin": load_balancing_origin,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname,
-        "load-balancing_origin_port": load_balancing_origin_port,
-        "load-balancing_origin_steering": load_balancing_origin_steering,
-        "load-balancing_origins": load_balancing_origins,
-        "load-balancing_schemas-description": load_balancing_schemas_description,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled,
-        "load-balancing_schemas-header": load_balancing_schemas_header,
-        "load-balancing_schemas-name": load_balancing_schemas_name,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id,
-        "load-balancing_weight": load_balancing_weight,
+        "load-balancing_Host": load$$balancing_Host$,
+        "load-balancing_check_regions": load$$balancing_check_regions$,
+        "load-balancing_filter_options": load$$balancing_filter_options$,
+        "load-balancing_health_sources": load$$balancing_health_sources$,
+        "load-balancing_load_shedding": load$$balancing_load_shedding$,
+        "load-balancing_networks": load$$balancing_networks$,
+        "load-balancing_notification_filter": load$$balancing_notification_filter$,
+        "load-balancing_origin": load$$balancing_origin$,
+        "load-balancing_origin_steering": load$$balancing_origin_steering$,
+        "load-balancing_origins": load$$balancing_origins$,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-single_response",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     annotations: {
@@ -263,43 +191,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     request: (args) => ({
@@ -308,31 +216,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_pools_delete",
+    name: "user_loadBalancers_pools_delete",
     title: "Delete Pool",
-    description: "Delete a configured pool.",
+    description: "Delete a configured pool.\n\nDELETE /user/load_balancers/pools/{pool_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "pool_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-id_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_schemas-id_response": load_balancing_schemas_id_response_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_schemas-id_response": load$$balancing_schemas$$id_response,
       },
     },
     annotations: {
@@ -359,12 +273,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_schemas-id_response": load_balancing_schemas_id_response_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_schemas-id_response": load$$balancing_schemas$$id_response,
       },
     },
     request: (args) => ({
@@ -372,62 +285,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_pools_get",
+    name: "user_loadBalancers_pools_get",
     title: "Pool Details",
-    description: "Fetch a single configured pool.",
+    description: "Fetch a single configured pool.\n\nGET /user/load_balancers/pools/{pool_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "pool_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-single_response",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     annotations: {
@@ -455,43 +355,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     request: (args) => ({
@@ -499,58 +379,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_load_balancers_pools_list",
+    name: "user_loadBalancers_pools_list",
     title: "List Pools",
-    description: "List configured pools.",
+    description: "List configured pools.\n\nGET /user/load_balancers/pools",
     inputSchema: {
       type: "object",
       properties: {
-        "monitor": {
-          "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "monitor": {
+              "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-response_collection",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-response_collection": load_balancing_schemas_response_collection_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-response_collection": load$$balancing_schemas$$response_collection,
       },
     },
     annotations: {
@@ -578,57 +445,37 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-response_collection": load_balancing_schemas_response_collection_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_result_info": load$$balancing_result_info,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-response_collection": load$$balancing_schemas$$response_collection,
       },
     },
     request: (args) => ({
       path: `/user/load_balancers/pools`,
       query: [
-        ["monitor", args["monitor"], true],
+        ["monitor", param(args, "query", "monitor"), true],
       ],
     }),
   },
   {
-    name: "user_load_balancers_pools_update",
+    name: "user_loadBalancers_pools_update",
     title: "Update Pool",
-    description: "Modify a configured pool.",
+    description: "Modify a configured pool.\n\nPUT /user/load_balancers/pools/{pool_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -639,56 +486,56 @@ export const tools: readonly Tool[] = [
               "description": "A list of regions from which to run health checks. Null means every Cloudflare data center."
             },
             "description": {
-              "$ref": "#/$defs/load-balancing_schemas-description",
               "default": "",
-              "description": "A human-readable description of the pool."
+              "description": "A human-readable description of the pool.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/load-balancing_enabled",
               "default": true,
-              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any)."
+              "description": "Whether to enable (the default) or disable this pool. Disabled pools will not receive traffic and are excluded from health checks. Disabling a pool will cause any load balancers using it to failover to the next pool (if any).",
+              "type": "boolean"
             },
             "health_sources": {
               "$ref": "#/$defs/load-balancing_health_sources",
               "description": "A list of health sources, ordered from highest to lowest priority, used to evaluate individual origin health and overall pool health. The load balancer uses the first source that has data and falls back to the next. Currently accepted values are null or the exact array [\"regional\", \"global\"]; any other combination is rejected. Null (the default) behaves like [\"local\", \"global\"]. [\"regional\", \"global\"] makes each region steer on its own health, falling back to the global decision when a region has no fresh data. Setting regional requires at least one region in check_regions."
             },
             "latitude": {
-              "$ref": "#/$defs/load-balancing_latitude",
-              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set."
+              "description": "The latitude of the data center containing the origins used in this pool in decimal degrees. If this is set, longitude must also be set.",
+              "type": "number"
             },
             "load_shedding": {
               "$ref": "#/$defs/load-balancing_load_shedding",
               "description": "Configures load shedding policies and percentages for the pool."
             },
             "longitude": {
-              "$ref": "#/$defs/load-balancing_longitude",
-              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set."
+              "description": "The longitude of the data center containing the origins used in this pool in decimal degrees. If this is set, latitude must also be set.",
+              "type": "number"
             },
             "minimum_origins": {
-              "$ref": "#/$defs/load-balancing_minimum_origins",
               "default": 1,
-              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool."
+              "description": "The minimum number of origins that must be healthy for this pool to serve traffic. If the number of healthy origins falls below this number, the pool will be marked unhealthy and will failover to the next available pool.",
+              "type": "integer"
             },
             "monitor": {
-              "$ref": "#/$defs/load-balancing_monitor_id",
-              "description": "The ID of the Monitor to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "monitor_group": {
-              "$ref": "#/$defs/load-balancing_monitor_group_id",
-              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool."
+              "description": "The ID of the Monitor Group to use for checking the health of origins within this pool.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/load-balancing_name",
-              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed."
+              "description": "A short name (tag) for the pool. Only alphanumeric characters, hyphens, and underscores are allowed.",
+              "type": "string"
             },
             "networks": {
               "$ref": "#/$defs/load-balancing_networks",
               "description": "List of networks where Load Balancer or Pool is enabled."
             },
             "notification_email": {
-              "$ref": "#/$defs/load-balancing_notification_email",
               "default": "",
-              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list."
+              "description": "This field is now deprecated. It has been moved to Cloudflare's Centralized Notification service https://developers.cloudflare.com/fundamentals/notifications/. The email address to send health status notifications to. This can be an individual mailbox or a mailing list. Multiple emails can be supplied as a comma delimited list.",
+              "type": "string"
             },
             "notification_filter": {
               "$ref": "#/$defs/load-balancing_notification_filter",
@@ -709,84 +556,57 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "pool_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "pool_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "pool_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "load-balancing_Host": load_balancing_Host,
-        "load-balancing_address": load_balancing_address,
-        "load-balancing_check_regions": load_balancing_check_regions,
-        "load-balancing_enabled": load_balancing_enabled,
-        "load-balancing_filter_options": load_balancing_filter_options,
-        "load-balancing_health_sources": load_balancing_health_sources,
-        "load-balancing_latitude": load_balancing_latitude,
-        "load-balancing_load_shedding": load_balancing_load_shedding,
-        "load-balancing_longitude": load_balancing_longitude,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id,
-        "load-balancing_monitor_id": load_balancing_monitor_id,
-        "load-balancing_name": load_balancing_name,
-        "load-balancing_networks": load_balancing_networks,
-        "load-balancing_notification_email": load_balancing_notification_email,
-        "load-balancing_notification_filter": load_balancing_notification_filter,
-        "load-balancing_origin": load_balancing_origin,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname,
-        "load-balancing_origin_port": load_balancing_origin_port,
-        "load-balancing_origin_steering": load_balancing_origin_steering,
-        "load-balancing_origins": load_balancing_origins,
-        "load-balancing_schemas-description": load_balancing_schemas_description,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled,
-        "load-balancing_schemas-header": load_balancing_schemas_header,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-        "load-balancing_schemas-name": load_balancing_schemas_name,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id,
-        "load-balancing_weight": load_balancing_weight,
+        "load-balancing_Host": load$$balancing_Host$,
+        "load-balancing_check_regions": load$$balancing_check_regions$,
+        "load-balancing_filter_options": load$$balancing_filter_options$,
+        "load-balancing_health_sources": load$$balancing_health_sources$,
+        "load-balancing_load_shedding": load$$balancing_load_shedding$,
+        "load-balancing_networks": load$$balancing_networks$,
+        "load-balancing_notification_filter": load$$balancing_notification_filter$,
+        "load-balancing_origin": load$$balancing_origin$,
+        "load-balancing_origin_steering": load$$balancing_origin_steering$,
+        "load-balancing_origins": load$$balancing_origins$,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_schemas-single_response",
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     annotations: {
@@ -813,43 +633,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_Host": load_balancing_Host_output,
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_check_regions": load_balancing_check_regions_output,
-        "load-balancing_disabled_at": load_balancing_disabled_at_output,
-        "load-balancing_enabled": load_balancing_enabled_output,
-        "load-balancing_filter_options": load_balancing_filter_options_output,
-        "load-balancing_health_sources": load_balancing_health_sources_output,
-        "load-balancing_latitude": load_balancing_latitude_output,
-        "load-balancing_load_shedding": load_balancing_load_shedding_output,
-        "load-balancing_longitude": load_balancing_longitude_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_minimum_origins": load_balancing_minimum_origins_output,
-        "load-balancing_monitor_group_id": load_balancing_monitor_group_id_output,
-        "load-balancing_monitor_id": load_balancing_monitor_id_output,
-        "load-balancing_name": load_balancing_name_output,
-        "load-balancing_networks": load_balancing_networks_output,
-        "load-balancing_notification_email": load_balancing_notification_email_output,
-        "load-balancing_notification_filter": load_balancing_notification_filter_output,
-        "load-balancing_origin": load_balancing_origin_output,
-        "load-balancing_origin_flatten_cname": load_balancing_origin_flatten_cname_output,
-        "load-balancing_origin_port": load_balancing_origin_port_output,
-        "load-balancing_origin_steering": load_balancing_origin_steering_output,
-        "load-balancing_origins": load_balancing_origins_output,
-        "load-balancing_pool": load_balancing_pool_output,
-        "load-balancing_schemas-description": load_balancing_schemas_description_output,
-        "load-balancing_schemas-disabled_at": load_balancing_schemas_disabled_at_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-header": load_balancing_schemas_header_output,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
-        "load-balancing_schemas-single_response": load_balancing_schemas_single_response_output,
-        "load-balancing_timestamp": load_balancing_timestamp_output,
-        "load-balancing_virtual_network_id": load_balancing_virtual_network_id_output,
-        "load-balancing_weight": load_balancing_weight_output,
+        "load-balancing_Host": load$$balancing_Host,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_check_regions": load$$balancing_check_regions,
+        "load-balancing_filter_options": load$$balancing_filter_options,
+        "load-balancing_health_sources": load$$balancing_health_sources,
+        "load-balancing_load_shedding": load$$balancing_load_shedding,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_networks": load$$balancing_networks,
+        "load-balancing_notification_filter": load$$balancing_notification_filter,
+        "load-balancing_origin": load$$balancing_origin,
+        "load-balancing_origin_steering": load$$balancing_origin_steering,
+        "load-balancing_origins": load$$balancing_origins,
+        "load-balancing_pool": load$$balancing_pool,
+        "load-balancing_schemas-header": load$$balancing_schemas$$header,
+        "load-balancing_schemas-single_response": load$$balancing_schemas$$single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/preview/schemas.ts b/src/generated/forge-mcp/user/loadBalancers/preview/schemas.ts
deleted file mode 100644
index 2700b9bc0..000000000
--- a/src/generated/forge-mcp/user/loadBalancers/preview/schemas.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `load-balancing_preview_id`.
- */
-export const load_balancing_preview_id: JsonSchema = {};
diff --git a/src/generated/forge-mcp/user/loadBalancers/preview/tools.ts b/src/generated/forge-mcp/user/loadBalancers/preview/tools.ts
index a1cdd750e..59afc098d 100644
--- a/src/generated/forge-mcp/user/loadBalancers/preview/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/preview/tools.ts
@@ -3,47 +3,51 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_messages_output,
-  load_balancing_origin_health_data_output,
-  load_balancing_preview_result_output,
-  load_balancing_preview_result_response_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
+  load$$balancing_origin_health_data,
+  load$$balancing_preview_result,
+  load$$balancing_preview_result_response,
 } from "../../../outputs.js";
-import { load_balancing_preview_id } from "./schemas.js";
 
 /**
- * The tools of `user.load_balancers.preview`.
+ * The tools of `user.loadBalancers.preview`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_preview_get",
+    name: "user_loadBalancers_preview_get",
     title: "Preview Result",
-    description: "Get the result of a previous preview operation using the provided preview_id.",
+    description: "Get the result of a previous preview operation using the provided preview_id.\n\nGET /user/load_balancers/preview/{preview_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "preview_id": {
-          "$ref": "#/$defs/load-balancing_preview_id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "preview_id": {}
+          },
+          "required": [
+            "preview_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "preview_id"
+        "path"
       ],
-      $defs: {
-        "load-balancing_preview_id": load_balancing_preview_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_preview_result_response",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin_health_data": load_balancing_origin_health_data_output,
-        "load-balancing_preview_result": load_balancing_preview_result_output,
-        "load-balancing_preview_result_response": load_balancing_preview_result_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin_health_data": load$$balancing_origin_health_data,
+        "load-balancing_preview_result": load$$balancing_preview_result,
+        "load-balancing_preview_result_response": load$$balancing_preview_result_response,
       },
     },
     annotations: {
@@ -71,13 +75,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin_health_data": load_balancing_origin_health_data_output,
-        "load-balancing_preview_result": load_balancing_preview_result_output,
-        "load-balancing_preview_result_response": load_balancing_preview_result_response_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin_health_data": load$$balancing_origin_health_data,
+        "load-balancing_preview_result": load$$balancing_preview_result,
+        "load-balancing_preview_result_response": load$$balancing_preview_result_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/loadBalancers/regions/tools.ts b/src/generated/forge-mcp/user/loadBalancers/regions/tools.ts
index f30a27ba7..b2e8ee85c 100644
--- a/src/generated/forge-mcp/user/loadBalancers/regions/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancers/regions/tools.ts
@@ -1,47 +1,50 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 import {
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_api_response_single_output,
-  load_balancing_messages_output,
-  load_balancing_region_components_schemas_response_collection_output,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_api$$response$$single,
+  load$$balancing_messages,
+  load$$balancing_region_components$$schemas$$response_collection,
 } from "../../../outputs.js";
-import { load_balancing_subdivision_code_a2 } from "../../../schemas.js";
 
 /**
- * The tools of `user.load_balancers.regions`.
+ * The tools of `user.loadBalancers.regions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancers_regions_list",
+    name: "user_loadBalancers_regions_list",
     title: "List Regions",
-    description: "List all region mappings in the user context.",
+    description: "List all region mappings in the user context.\n\nGET /user/load_balancers/regions",
     inputSchema: {
       type: "object",
       properties: {
-        "country_code": {
-          "description": "Two-letter alpha-2 country code as defined in ISO 3166-1.",
-          "type": "string"
-        },
-        "subdivision_code": {
-          "$ref": "#/$defs/load-balancing_subdivision_code_a2",
-          "description": "Two-letter subdivision code followed in ISO 3166-2."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "country_code": {
+              "description": "Two-letter alpha-2 country code as defined in ISO 3166-1.",
+              "type": "string"
+            },
+            "subdivision_code": {
+              "description": "Two-letter subdivision code followed in ISO 3166-2.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
-      $defs: {
-        "load-balancing_subdivision_code_a2": load_balancing_subdivision_code_a2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_region_components-schemas-response_collection",
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_region_components-schemas-response_collection": load_balancing_region_components_schemas_response_collection_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_region_components-schemas-response_collection": load$$balancing_region_components$$schemas$$response_collection,
       },
     },
     annotations: {
@@ -69,18 +72,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_api-response-single": load_balancing_api_response_single_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_region_components-schemas-response_collection": load_balancing_region_components_schemas_response_collection_output,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_api-response-single": load$$balancing_api$$response$$single,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_region_components-schemas-response_collection": load$$balancing_region_components$$schemas$$response_collection,
       },
     },
     request: (args) => ({
       path: `/user/load_balancers/regions`,
       query: [
-        ["subdivision_code", args["subdivision_code"], true],
-        ["country_code", args["country_code"], true],
+        ["subdivision_code", param(args, "query", "subdivision_code"), true],
+        ["country_code", param(args, "query", "country_code"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/user/loadBalancingAnalytics/events/outputs.ts b/src/generated/forge-mcp/user/loadBalancingAnalytics/events/outputs.ts
index 834740f60..274c9c73d 100644
--- a/src/generated/forge-mcp/user/loadBalancingAnalytics/events/outputs.ts
+++ b/src/generated/forge-mcp/user/loadBalancingAnalytics/events/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `load-balancing_analytics` in responses.
  */
-export const load_balancing_analytics_output: JsonSchema = {
+export const load$$balancing_analytics: JsonSchema = {
   "properties": {
     "id": {
       "type": "integer"
@@ -32,7 +32,7 @@ export const load_balancing_analytics_output: JsonSchema = {
  * The schema of `load-balancing_components-schemas-response_collection` in
  * responses.
  */
-export const load_balancing_components_schemas_response_collection_output: JsonSchema = {
+export const load$$balancing_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/load-balancing_api-paginated-response-collection"
@@ -54,57 +54,29 @@ export const load_balancing_components_schemas_response_collection_output: JsonS
 /**
  * The schema of `load-balancing_origin-analytics` in responses.
  */
-export const load_balancing_origin_analytics_output: JsonSchema = {
+export const load$$balancing_origin$$analytics: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/load-balancing_address"
+      "type": "string"
     },
     "changed": {
-      "$ref": "#/$defs/load-balancing_origin-changed"
+      "type": "boolean"
     },
     "enabled": {
-      "$ref": "#/$defs/load-balancing_schemas-enabled"
+      "type": "boolean"
     },
     "failure_reason": {
-      "$ref": "#/$defs/load-balancing_origin-failure-reason"
+      "type": "string"
     },
     "healthy": {
-      "$ref": "#/$defs/load-balancing_origin-healthy"
+      "type": "boolean"
     },
     "ip": {
-      "$ref": "#/$defs/load-balancing_origin-ip"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/load-balancing_schemas-name"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `load-balancing_origin-changed` in responses.
- */
-export const load_balancing_origin_changed_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `load-balancing_origin-failure-reason` in responses.
- */
-export const load_balancing_origin_failure_reason_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_origin-healthy` in responses.
- */
-export const load_balancing_origin_healthy_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `load-balancing_origin-ip` in responses.
- */
-export const load_balancing_origin_ip_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/user/loadBalancingAnalytics/events/schemas.ts b/src/generated/forge-mcp/user/loadBalancingAnalytics/events/schemas.ts
deleted file mode 100644
index 2467b5623..000000000
--- a/src/generated/forge-mcp/user/loadBalancingAnalytics/events/schemas.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `load-balancing_origin_healthy`.
- */
-export const load_balancing_origin_healthy: JsonSchema = {
-  "description": "If true, filter events where the origin status is healthy. If false, filter events where the origin status is unhealthy.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `load-balancing_pool_name`.
- */
-export const load_balancing_pool_name: JsonSchema = {
-  "description": "The name for the pool to filter.",
-  "type": "string"
-};
-
-/**
- * The schema of `load-balancing_until`.
- */
-export const load_balancing_until: JsonSchema = {
-  "description": "End date and time of requesting data period in the ISO8601 format.",
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/user/loadBalancingAnalytics/events/tools.ts b/src/generated/forge-mcp/user/loadBalancingAnalytics/events/tools.ts
index 9c9638b60..bac455598 100644
--- a/src/generated/forge-mcp/user/loadBalancingAnalytics/events/tools.ts
+++ b/src/generated/forge-mcp/user/loadBalancingAnalytics/events/tools.ts
@@ -1,99 +1,81 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 import {
-  load_balancing_address_output,
-  load_balancing_api_paginated_response_collection_output,
-  load_balancing_api_response_common_failure_output,
-  load_balancing_api_response_common_output,
-  load_balancing_messages_output,
-  load_balancing_result_info_output,
-  load_balancing_schemas_enabled_output,
-  load_balancing_schemas_name_output,
+  load$$balancing_api$$paginated$$response$$collection,
+  load$$balancing_api$$response$$common,
+  load$$balancing_api$$response$$common$$failure,
+  load$$balancing_messages,
+  load$$balancing_result_info,
 } from "../../../outputs.js";
-import { load_balancing_schemas_identifier } from "../../../schemas.js";
 import {
-  load_balancing_analytics_output,
-  load_balancing_components_schemas_response_collection_output,
-  load_balancing_origin_analytics_output,
-  load_balancing_origin_changed_output,
-  load_balancing_origin_failure_reason_output,
-  load_balancing_origin_healthy_output,
-  load_balancing_origin_ip_output,
+  load$$balancing_analytics,
+  load$$balancing_components$$schemas$$response_collection,
+  load$$balancing_origin$$analytics,
 } from "./outputs.js";
-import {
-  load_balancing_origin_healthy,
-  load_balancing_pool_name,
-  load_balancing_until,
-} from "./schemas.js";
 
 /**
- * The tools of `user.load_balancing_analytics.events`.
+ * The tools of `user.loadBalancingAnalytics.events`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_load_balancing_analytics_events_list",
+    name: "user_loadBalancingAnalytics_events_list",
     title: "List Healthcheck Events",
-    description: "List origin health changes.",
+    description: "List origin health changes.\n\nGET /user/load_balancing_analytics/events",
     inputSchema: {
       type: "object",
       properties: {
-        "origin_healthy": {
-          "$ref": "#/$defs/load-balancing_origin_healthy",
-          "default": true,
-          "description": "If true, filter events where the origin status is healthy. If false, filter events where the origin status is unhealthy."
-        },
-        "origin_name": {
-          "description": "The name for the origin to filter.",
-          "type": "string"
-        },
-        "pool_healthy": {
-          "default": true,
-          "description": "If true, filter events where the pool status is healthy. If false, filter events where the pool status is unhealthy.",
-          "type": "boolean"
-        },
-        "pool_id": {
-          "$ref": "#/$defs/load-balancing_schemas-identifier"
-        },
-        "pool_name": {
-          "$ref": "#/$defs/load-balancing_pool_name",
-          "description": "The name for the pool to filter."
-        },
-        "since": {
-          "description": "Start date and time of requesting data period in the ISO8601 format.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "until": {
-          "$ref": "#/$defs/load-balancing_until",
-          "description": "End date and time of requesting data period in the ISO8601 format."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "origin_healthy": {
+              "default": true,
+              "description": "If true, filter events where the origin status is healthy. If false, filter events where the origin status is unhealthy.",
+              "type": "boolean"
+            },
+            "origin_name": {
+              "description": "The name for the origin to filter.",
+              "type": "string"
+            },
+            "pool_healthy": {
+              "default": true,
+              "description": "If true, filter events where the pool status is healthy. If false, filter events where the pool status is unhealthy.",
+              "type": "boolean"
+            },
+            "pool_id": {
+              "type": "string"
+            },
+            "pool_name": {
+              "description": "The name for the pool to filter.",
+              "type": "string"
+            },
+            "since": {
+              "description": "Start date and time of requesting data period in the ISO8601 format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "until": {
+              "description": "End date and time of requesting data period in the ISO8601 format.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
-      $defs: {
-        "load-balancing_origin_healthy": load_balancing_origin_healthy,
-        "load-balancing_pool_name": load_balancing_pool_name,
-        "load-balancing_schemas-identifier": load_balancing_schemas_identifier,
-        "load-balancing_until": load_balancing_until,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/load-balancing_components-schemas-response_collection",
       $defs: {
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_analytics": load_balancing_analytics_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_components-schemas-response_collection": load_balancing_components_schemas_response_collection_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin-analytics": load_balancing_origin_analytics_output,
-        "load-balancing_origin-changed": load_balancing_origin_changed_output,
-        "load-balancing_origin-failure-reason": load_balancing_origin_failure_reason_output,
-        "load-balancing_origin-healthy": load_balancing_origin_healthy_output,
-        "load-balancing_origin-ip": load_balancing_origin_ip_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
+        "load-balancing_analytics": load$$balancing_analytics,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_components-schemas-response_collection": load$$balancing_components$$schemas$$response_collection,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin-analytics": load$$balancing_origin$$analytics,
+        "load-balancing_result_info": load$$balancing_result_info,
       },
     },
     annotations: {
@@ -121,33 +103,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "load-balancing_address": load_balancing_address_output,
-        "load-balancing_analytics": load_balancing_analytics_output,
-        "load-balancing_api-paginated-response-collection": load_balancing_api_paginated_response_collection_output,
-        "load-balancing_api-response-common": load_balancing_api_response_common_output,
-        "load-balancing_api-response-common-failure": load_balancing_api_response_common_failure_output,
-        "load-balancing_components-schemas-response_collection": load_balancing_components_schemas_response_collection_output,
-        "load-balancing_messages": load_balancing_messages_output,
-        "load-balancing_origin-analytics": load_balancing_origin_analytics_output,
-        "load-balancing_origin-changed": load_balancing_origin_changed_output,
-        "load-balancing_origin-failure-reason": load_balancing_origin_failure_reason_output,
-        "load-balancing_origin-healthy": load_balancing_origin_healthy_output,
-        "load-balancing_origin-ip": load_balancing_origin_ip_output,
-        "load-balancing_result_info": load_balancing_result_info_output,
-        "load-balancing_schemas-enabled": load_balancing_schemas_enabled_output,
-        "load-balancing_schemas-name": load_balancing_schemas_name_output,
+        "load-balancing_analytics": load$$balancing_analytics,
+        "load-balancing_api-paginated-response-collection": load$$balancing_api$$paginated$$response$$collection,
+        "load-balancing_api-response-common": load$$balancing_api$$response$$common,
+        "load-balancing_api-response-common-failure": load$$balancing_api$$response$$common$$failure,
+        "load-balancing_components-schemas-response_collection": load$$balancing_components$$schemas$$response_collection,
+        "load-balancing_messages": load$$balancing_messages,
+        "load-balancing_origin-analytics": load$$balancing_origin$$analytics,
+        "load-balancing_result_info": load$$balancing_result_info,
       },
     },
     request: (args) => ({
       path: `/user/load_balancing_analytics/events`,
       query: [
-        ["until", args["until"], true],
-        ["pool_name", args["pool_name"], true],
-        ["origin_healthy", args["origin_healthy"], true],
-        ["pool_id", args["pool_id"], true],
-        ["since", args["since"], true],
-        ["origin_name", args["origin_name"], true],
-        ["pool_healthy", args["pool_healthy"], true],
+        ["until", param(args, "query", "until"), true],
+        ["pool_name", param(args, "query", "pool_name"), true],
+        ["origin_healthy", param(args, "query", "origin_healthy"), true],
+        ["pool_id", param(args, "query", "pool_id"), true],
+        ["since", param(args, "query", "since"), true],
+        ["origin_name", param(args, "query", "origin_name"), true],
+        ["pool_healthy", param(args, "query", "pool_healthy"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/user/memberships/outputs.ts b/src/generated/forge-mcp/user/memberships/outputs.ts
index 29d9dfa18..7ea60c601 100644
--- a/src/generated/forge-mcp/user/memberships/outputs.ts
+++ b/src/generated/forge-mcp/user/memberships/outputs.ts
@@ -3,24 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `iam_api_access_enabled` in responses.
- */
-export const iam_api_access_enabled_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `iam_collection_membership_response` in responses.
  */
-export const iam_collection_membership_response_output: JsonSchema = {
+export const iam_collection_membership_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -43,7 +29,7 @@ export const iam_collection_membership_response_output: JsonSchema = {
  * The schema of `iam_collection_membership_response_with_policies` in
  * responses.
  */
-export const iam_collection_membership_response_with_policies_output: JsonSchema = {
+export const iam_collection_membership_response_with_policies: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-collection"
@@ -65,16 +51,23 @@ export const iam_collection_membership_response_with_policies_output: JsonSchema
 /**
  * The schema of `iam_membership` in responses.
  */
-export const iam_membership_output: JsonSchema = {
+export const iam_membership: JsonSchema = {
   "properties": {
     "account": {
       "$ref": "#/$defs/iam_schemas-account"
     },
     "api_access_enabled": {
-      "$ref": "#/$defs/iam_api_access_enabled"
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "id": {
-      "$ref": "#/$defs/iam_membership_components-schemas-identifier"
+      "type": "string"
     },
     "permissions": {
       "$ref": "#/$defs/iam_permissions"
@@ -83,7 +76,12 @@ export const iam_membership_output: JsonSchema = {
       "$ref": "#/$defs/iam_role_names"
     },
     "status": {
-      "$ref": "#/$defs/iam_schemas-status"
+      "enum": [
+        "accepted",
+        "pending",
+        "rejected"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -92,16 +90,23 @@ export const iam_membership_output: JsonSchema = {
 /**
  * The schema of `iam_membership-with-policies` in responses.
  */
-export const iam_membership_with_policies_output: JsonSchema = {
+export const iam_membership$$with$$policies: JsonSchema = {
   "properties": {
     "account": {
       "$ref": "#/$defs/iam_schemas-account"
     },
     "api_access_enabled": {
-      "$ref": "#/$defs/iam_api_access_enabled"
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "id": {
-      "$ref": "#/$defs/iam_membership_components-schemas-identifier"
+      "type": "string"
     },
     "permissions": {
       "$ref": "#/$defs/iam_permissions"
@@ -116,7 +121,12 @@ export const iam_membership_with_policies_output: JsonSchema = {
       "$ref": "#/$defs/iam_role_names"
     },
     "status": {
-      "$ref": "#/$defs/iam_schemas-status"
+      "enum": [
+        "accepted",
+        "pending",
+        "rejected"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -125,14 +135,14 @@ export const iam_membership_with_policies_output: JsonSchema = {
 /**
  * The schema of `iam_schemas-account` in responses.
  */
-export const iam_schemas_account_output: JsonSchema = {
+export const iam_schemas$$account: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/iam_common_components-schemas-identifier"
+      "type": "string"
     },
     "managed_by": {
       "properties": {
@@ -166,7 +176,11 @@ export const iam_schemas_account_output: JsonSchema = {
       "type": "object"
     },
     "type": {
-      "$ref": "#/$defs/iam_account-type"
+      "enum": [
+        "standard",
+        "enterprise"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -177,22 +191,10 @@ export const iam_schemas_account_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `iam_schemas-status` in responses.
- */
-export const iam_schemas_status_output: JsonSchema = {
-  "enum": [
-    "accepted",
-    "pending",
-    "rejected"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `iam_single_membership_response_with_policies` in responses.
  */
-export const iam_single_membership_response_with_policies_output: JsonSchema = {
+export const iam_single_membership_response_with_policies: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
diff --git a/src/generated/forge-mcp/user/memberships/schemas.ts b/src/generated/forge-mcp/user/memberships/schemas.ts
deleted file mode 100644
index 1169ad118..000000000
--- a/src/generated/forge-mcp/user/memberships/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `iam_properties-name`.
- */
-export const iam_properties_name: JsonSchema = {
-  "description": "Account name",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/user/memberships/tools.ts b/src/generated/forge-mcp/user/memberships/tools.ts
index 5f6b9cdf1..a6ceca341 100644
--- a/src/generated/forge-mcp/user/memberships/tools.ts
+++ b/src/generated/forge-mcp/user/memberships/tools.ts
@@ -1,44 +1,33 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  iam_access_output,
-  iam_account_type_output,
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_output,
-  iam_common_components_schemas_identifier_output,
-  iam_grants_output,
-  iam_list_member_policy_output,
-  iam_membership_components_schemas_identifier_output,
-  iam_messages_2_output,
-  iam_permission_group_output,
-  iam_permission_groups_output,
-  iam_permissions_output,
-  iam_policy_identifier_output,
-  iam_resource_group_output,
-  iam_resource_groups_output,
-  iam_result_info_output,
-  iam_scope_key_output,
-  iam_scope_object_key_output,
-  iam_scope_object_output,
-  iam_scope_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_grants,
+  iam_list_member_policy,
+  iam_messages$$2,
+  iam_permission_group,
+  iam_permission_groups,
+  iam_permissions,
+  iam_resource_group,
+  iam_resource_groups,
+  iam_result_info,
+  iam_scope,
+  iam_scope_object,
 } from "../../outputs.js";
-import { iam_membership_components_schemas_identifier } from "../../schemas.js";
-import { iam_role_names_output } from "../outputs.js";
+import { iam_role_names } from "../outputs.js";
 import {
-  iam_api_access_enabled_output,
-  iam_collection_membership_response_output,
-  iam_collection_membership_response_with_policies_output,
-  iam_membership_output,
-  iam_membership_with_policies_output,
-  iam_schemas_account_output,
-  iam_schemas_status_output,
-  iam_single_membership_response_with_policies_output,
+  iam_collection_membership_response,
+  iam_collection_membership_response_with_policies,
+  iam_membership,
+  iam_membership$$with$$policies,
+  iam_schemas$$account,
+  iam_single_membership_response_with_policies,
 } from "./outputs.js";
-import { iam_properties_name } from "./schemas.js";
 
 /**
  * The tools of `user.memberships`.
@@ -47,21 +36,28 @@ export const tools: readonly Tool[] = [
   {
     name: "user_memberships_delete",
     title: "Delete Membership",
-    description: "Remove the associated member from an account.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Remove the associated member from an account.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /memberships/{membership_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "membership_id": {
-          "$ref": "#/$defs/iam_membership_components-schemas-identifier",
-          "description": "Membership identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "membership_id": {
+              "description": "Membership identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "membership_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "membership_id"
+        "path"
       ],
-      $defs: {
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -73,7 +69,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/iam_membership_components-schemas-identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -83,9 +79,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -114,7 +109,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/iam_membership_components-schemas-identifier"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -129,10 +124,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -142,58 +136,62 @@ export const tools: readonly Tool[] = [
   {
     name: "user_memberships_list",
     title: "List Memberships",
-    description: "List memberships of accounts the user can access.",
+    description: "List memberships of accounts the user can access.\n\nGET /memberships",
     inputSchema: {
       type: "object",
       properties: {
-        "account_name": {
-          "$ref": "#/$defs/iam_properties-name",
-          "description": "Account name"
-        },
-        "direction": {
-          "description": "Direction to order memberships.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "$ref": "#/$defs/iam_properties-name",
-          "description": "Account name"
-        },
-        "order": {
-          "description": "Field to order memberships by.",
-          "enum": [
-            "id",
-            "account.name",
-            "status"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of memberships per page.",
-          "type": "number"
-        },
-        "status": {
-          "description": "Status of this membership.",
-          "enum": [
-            "accepted",
-            "pending",
-            "rejected"
-          ],
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "account.name": {
+              "description": "Account name",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to order memberships.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Account name",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to order memberships by.",
+              "enum": [
+                "id",
+                "account.name",
+                "status"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of memberships per page.",
+              "type": "number"
+            },
+            "status": {
+              "description": "Status of this membership.",
+              "enum": [
+                "accepted",
+                "pending",
+                "rejected"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
-      $defs: {
-        "iam_properties-name": iam_properties_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "oneOf": [
@@ -205,34 +203,25 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api_access_enabled": iam_api_access_enabled_output,
-        "iam_collection_membership_response": iam_collection_membership_response_output,
-        "iam_collection_membership_response_with_policies": iam_collection_membership_response_with_policies_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_grants": iam_grants_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_membership": iam_membership_output,
-        "iam_membership-with-policies": iam_membership_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-account": iam_schemas_account_output,
-        "iam_schemas-status": iam_schemas_status_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_collection_membership_response": iam_collection_membership_response,
+        "iam_collection_membership_response_with_policies": iam_collection_membership_response_with_policies,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_membership": iam_membership,
+        "iam_membership-with-policies": iam_membership$$with$$policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_result_info": iam_result_info,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-account": iam_schemas$$account,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     annotations: {
@@ -267,54 +256,45 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api_access_enabled": iam_api_access_enabled_output,
-        "iam_collection_membership_response": iam_collection_membership_response_output,
-        "iam_collection_membership_response_with_policies": iam_collection_membership_response_with_policies_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_grants": iam_grants_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_membership": iam_membership_output,
-        "iam_membership-with-policies": iam_membership_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-account": iam_schemas_account_output,
-        "iam_schemas-status": iam_schemas_status_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_collection_membership_response": iam_collection_membership_response,
+        "iam_collection_membership_response_with_policies": iam_collection_membership_response_with_policies,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_membership": iam_membership,
+        "iam_membership-with-policies": iam_membership$$with$$policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_result_info": iam_result_info,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-account": iam_schemas$$account,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
       },
     },
     request: (args) => ({
       path: `/memberships`,
       query: [
-        ["account.name", args["account_name"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["name", args["name"], true],
-        ["status", args["status"], true],
+        ["account.name", param(args, "query", "account.name"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["name", param(args, "query", "name"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
   {
     name: "user_memberships_update",
     title: "Update Membership",
-    description: "Accept or reject this account invitation.",
+    description: "Accept or reject this account invitation.\n\nPUT /memberships/{membership_id}",
     inputSchema: {
       type: "object",
       properties: {
@@ -334,46 +314,44 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "membership_id": {
-          "$ref": "#/$defs/iam_membership_components-schemas-identifier",
-          "description": "Membership identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "membership_id": {
+              "description": "Membership identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "membership_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "membership_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_membership_response_with_policies",
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_api_access_enabled": iam_api_access_enabled_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_grants": iam_grants_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_membership-with-policies": iam_membership_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-account": iam_schemas_account_output,
-        "iam_schemas-status": iam_schemas_status_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_membership-with-policies": iam_membership$$with$$policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-account": iam_schemas$$account,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies,
       },
     },
     annotations: {
@@ -400,31 +378,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_api_access_enabled": iam_api_access_enabled_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_grants": iam_grants_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_membership-with-policies": iam_membership_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-account": iam_schemas_account_output,
-        "iam_schemas-status": iam_schemas_status_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_membership-with-policies": iam_membership$$with$$policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-account": iam_schemas$$account,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies,
       },
     },
     request: (args) => ({
@@ -433,51 +402,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_memberships_user_memberships_get",
+    name: "user_memberships_userMembershipsGet",
     title: "Get User Membership",
-    description: "Get a specific membership for the currently authenticated user.",
+    description: "Get a specific membership for the currently authenticated user.\n\nGET /user/memberships/{membership_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "membership_id": {
-          "$ref": "#/$defs/iam_membership_components-schemas-identifier",
-          "description": "Membership identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "membership_id": {
+              "description": "Membership identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "membership_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "membership_id"
+        "path"
       ],
-      $defs: {
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_membership_response_with_policies",
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_api_access_enabled": iam_api_access_enabled_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_grants": iam_grants_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_membership-with-policies": iam_membership_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-account": iam_schemas_account_output,
-        "iam_schemas-status": iam_schemas_status_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_membership-with-policies": iam_membership$$with$$policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-account": iam_schemas$$account,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies,
       },
     },
     annotations: {
@@ -516,31 +483,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_api_access_enabled": iam_api_access_enabled_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_grants": iam_grants_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_membership-with-policies": iam_membership_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-account": iam_schemas_account_output,
-        "iam_schemas-status": iam_schemas_status_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_membership-with-policies": iam_membership$$with$$policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-account": iam_schemas$$account,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies,
       },
     },
     request: (args) => ({
@@ -548,51 +506,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "user_memberships_user_s_account_memberships_membership_details",
+    name: "user_memberships_userSAccountMembershipsMembershipDetails",
     title: "Membership Details",
-    description: "Get a specific membership.",
+    description: "Get a specific membership.\n\nGET /memberships/{membership_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "membership_id": {
-          "$ref": "#/$defs/iam_membership_components-schemas-identifier",
-          "description": "Membership identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "membership_id": {
+              "description": "Membership identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "membership_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "membership_id"
+        "path"
       ],
-      $defs: {
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_membership_response_with_policies",
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_api_access_enabled": iam_api_access_enabled_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_grants": iam_grants_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_membership-with-policies": iam_membership_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-account": iam_schemas_account_output,
-        "iam_schemas-status": iam_schemas_status_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_membership-with-policies": iam_membership$$with$$policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-account": iam_schemas$$account,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies,
       },
     },
     annotations: {
@@ -620,31 +576,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_access": iam_access_output,
-        "iam_account-type": iam_account_type_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_api_access_enabled": iam_api_access_enabled_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_grants": iam_grants_output,
-        "iam_list_member_policy": iam_list_member_policy_output,
-        "iam_membership-with-policies": iam_membership_with_policies_output,
-        "iam_membership_components-schemas-identifier": iam_membership_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_permissions": iam_permissions_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_resource_group": iam_resource_group_output,
-        "iam_resource_groups": iam_resource_groups_output,
-        "iam_role_names": iam_role_names_output,
-        "iam_schemas-account": iam_schemas_account_output,
-        "iam_schemas-status": iam_schemas_status_output,
-        "iam_scope": iam_scope_output,
-        "iam_scope_key": iam_scope_key_output,
-        "iam_scope_object": iam_scope_object_output,
-        "iam_scope_object_key": iam_scope_object_key_output,
-        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_grants": iam_grants,
+        "iam_list_member_policy": iam_list_member_policy,
+        "iam_membership-with-policies": iam_membership$$with$$policies,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_permissions": iam_permissions,
+        "iam_resource_group": iam_resource_group,
+        "iam_resource_groups": iam_resource_groups,
+        "iam_role_names": iam_role_names,
+        "iam_schemas-account": iam_schemas$$account,
+        "iam_scope": iam_scope,
+        "iam_scope_object": iam_scope_object,
+        "iam_single_membership_response_with_policies": iam_single_membership_response_with_policies,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/outputs.ts b/src/generated/forge-mcp/user/outputs.ts
index 4055ae4ba..cbb9456ad 100644
--- a/src/generated/forge-mcp/user/outputs.ts
+++ b/src/generated/forge-mcp/user/outputs.ts
@@ -3,41 +3,16 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `iam_components-schemas-status` in responses.
- */
-export const iam_components_schemas_status_output: JsonSchema = {
-  "enum": [
-    "member",
-    "invited"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `iam_country` in responses.
- */
-export const iam_country_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `iam_organization` in responses.
  */
-export const iam_organization_output: JsonSchema = {
+export const iam_organization: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/iam_common_components-schemas-identifier"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/iam_schemas-name"
+      "type": "string"
     },
     "permissions": {
       "$ref": "#/$defs/iam_schemas-permissions"
@@ -49,7 +24,11 @@ export const iam_organization_output: JsonSchema = {
       "type": "array"
     },
     "status": {
-      "$ref": "#/$defs/iam_components-schemas-status"
+      "enum": [
+        "member",
+        "invited"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -58,24 +37,17 @@ export const iam_organization_output: JsonSchema = {
 /**
  * The schema of `iam_role_names` in responses.
  */
-export const iam_role_names_output: JsonSchema = {
+export const iam_role_names: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `iam_schemas-name` in responses.
- */
-export const iam_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `iam_schemas-permissions` in responses.
  */
-export const iam_schemas_permissions_output: JsonSchema = {
+export const iam_schemas$$permissions: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -85,7 +57,7 @@ export const iam_schemas_permissions_output: JsonSchema = {
 /**
  * The schema of `iam_single_user_response` in responses.
  */
-export const iam_single_user_response_output: JsonSchema = {
+export const iam_single_user_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/iam_api-response-single"
@@ -101,13 +73,27 @@ export const iam_single_user_response_output: JsonSchema = {
               "type": "array"
             },
             "country": {
-              "$ref": "#/$defs/iam_country"
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "email": {
               "type": "string"
             },
             "first_name": {
-              "$ref": "#/$defs/iam_first_name"
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "has_business_zones": {
               "type": "boolean"
@@ -122,7 +108,14 @@ export const iam_single_user_response_output: JsonSchema = {
               "type": "string"
             },
             "last_name": {
-              "$ref": "#/$defs/iam_last_name"
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "organizations": {
               "items": {
@@ -134,16 +127,30 @@ export const iam_single_user_response_output: JsonSchema = {
               "type": "boolean"
             },
             "telephone": {
-              "$ref": "#/$defs/iam_telephone"
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "two_factor_authentication_enabled": {
-              "$ref": "#/$defs/iam_two_factor_authentication_enabled"
+              "type": "boolean"
             },
             "two_factor_authentication_locked": {
-              "$ref": "#/$defs/iam_two_factor_authentication_locked"
+              "type": "boolean"
             },
             "zipcode": {
-              "$ref": "#/$defs/iam_zipcode"
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
           },
           "required": [
@@ -157,38 +164,3 @@ export const iam_single_user_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `iam_telephone` in responses.
- */
-export const iam_telephone_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `iam_two_factor_authentication_locked` in responses.
- */
-export const iam_two_factor_authentication_locked_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `iam_zipcode` in responses.
- */
-export const iam_zipcode_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/user/schemas.ts b/src/generated/forge-mcp/user/schemas.ts
deleted file mode 100644
index c9b141774..000000000
--- a/src/generated/forge-mcp/user/schemas.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../_/tool.js";
-
-/**
- * The schema of `iam_country`.
- */
-export const iam_country: JsonSchema = {
-  "description": "The country in which the user lives.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `iam_telephone`.
- */
-export const iam_telephone: JsonSchema = {
-  "description": "User's telephone number",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `iam_zipcode`.
- */
-export const iam_zipcode: JsonSchema = {
-  "description": "The zipcode or postal code where the user lives.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/user/subscriptions/outputs.ts b/src/generated/forge-mcp/user/subscriptions/outputs.ts
index 70312b757..dbf0d3133 100644
--- a/src/generated/forge-mcp/user/subscriptions/outputs.ts
+++ b/src/generated/forge-mcp/user/subscriptions/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `bill-subs-api_user_subscription_response_collection` in
  * responses.
  */
-export const bill_subs_api_user_subscription_response_collection_output: JsonSchema = {
+export const bill$$subs$$api_user_subscription_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-collection"
@@ -29,7 +29,7 @@ export const bill_subs_api_user_subscription_response_collection_output: JsonSch
 /**
  * The schema of `bill-subs-api_user_subscription_response_single` in responses.
  */
-export const bill_subs_api_user_subscription_response_single_output: JsonSchema = {
+export const bill$$subs$$api_user_subscription_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
diff --git a/src/generated/forge-mcp/user/subscriptions/tools.ts b/src/generated/forge-mcp/user/subscriptions/tools.ts
index ed44854bc..34c98ee75 100644
--- a/src/generated/forge-mcp/user/subscriptions/tools.ts
+++ b/src/generated/forge-mcp/user/subscriptions/tools.ts
@@ -3,41 +3,28 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_collection_output,
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_component_value_output,
-  bill_subs_api_component_values_output,
-  bill_subs_api_currency_output,
-  bill_subs_api_current_period_end_output,
-  bill_subs_api_current_period_start_output,
-  bill_subs_api_frequency_output,
-  bill_subs_api_identifier_output,
-  bill_subs_api_install_id_output,
-  bill_subs_api_messages_output,
-  bill_subs_api_name_output,
-  bill_subs_api_price_output,
-  bill_subs_api_rate_plan_output,
-  bill_subs_api_result_info_output,
-  bill_subs_api_schemas_identifier_output,
-  bill_subs_api_state_output,
-  bill_subs_api_subscription_output,
-  bill_subs_api_zone_output,
+  bill$$subs$$api_api$$response$$collection,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_component_value,
+  bill$$subs$$api_component_values,
+  bill$$subs$$api_messages,
+  bill$$subs$$api_rate_plan,
+  bill$$subs$$api_result_info,
+  bill$$subs$$api_subscription,
+  bill$$subs$$api_zone,
 } from "../../outputs.js";
 import {
-  bill_subs_api_component_value,
-  bill_subs_api_component_values,
-  bill_subs_api_frequency,
-  bill_subs_api_install_id,
-  bill_subs_api_rate_plan,
-  bill_subs_api_schemas_identifier,
-  bill_subs_api_subscription_v2,
-  bill_subs_api_zone,
+  bill$$subs$$api_component_value as bill$$subs$$api_component_value$,
+  bill$$subs$$api_component_values as bill$$subs$$api_component_values$,
+  bill$$subs$$api_rate_plan as bill$$subs$$api_rate_plan$,
+  bill$$subs$$api_subscription$$v2,
+  bill$$subs$$api_zone as bill$$subs$$api_zone$,
 } from "../../schemas.js";
 import {
-  bill_subs_api_user_subscription_response_collection_output,
-  bill_subs_api_user_subscription_response_single_output,
+  bill$$subs$$api_user_subscription_response_collection,
+  bill$$subs$$api_user_subscription_response_single,
 } from "./outputs.js";
 
 /**
@@ -47,32 +34,36 @@ export const tools: readonly Tool[] = [
   {
     name: "user_subscriptions_delete",
     title: "Delete User Subscription",
-    description: "Deletes a user's subscription.",
+    description: "Deletes a user's subscription.\n\nDELETE /user/subscriptions/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "identifier": {
-          "$ref": "#/$defs/bill-subs-api_schemas-identifier",
-          "description": "Subscription identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Subscription identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
         "subscription_id": {
-          "$ref": "#/$defs/bill-subs-api_schemas-identifier"
+          "type": "string"
         }
       },
       "type": "object",
-      $defs: {
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-      },
     },
     annotations: {
       "destructiveHint": true,
@@ -98,7 +89,7 @@ export const tools: readonly Tool[] = [
         "200": {
           "properties": {
             "subscription_id": {
-              "$ref": "#/$defs/bill-subs-api_schemas-identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -108,9 +99,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -120,34 +110,25 @@ export const tools: readonly Tool[] = [
   {
     name: "user_subscriptions_get",
     title: "Get User Subscriptions",
-    description: "Lists all of a user's subscriptions.",
+    description: "Lists all of a user's subscriptions.\n\nGET /user/subscriptions",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_user_subscription_response_collection",
       $defs: {
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_user_subscription_response_collection": bill_subs_api_user_subscription_response_collection_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_user_subscription_response_collection": bill$$subs$$api_user_subscription_response_collection,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     annotations: {
@@ -180,27 +161,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription": bill_subs_api_subscription_output,
-        "bill-subs-api_user_subscription_response_collection": bill_subs_api_user_subscription_response_collection_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
+        "bill-subs-api_subscription": bill$$subs$$api_subscription,
+        "bill-subs-api_user_subscription_response_collection": bill$$subs$$api_user_subscription_response_collection,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
       },
     },
     request: (_args) => ({
@@ -210,40 +181,47 @@ export const tools: readonly Tool[] = [
   {
     name: "user_subscriptions_update",
     title: "Update User Subscription",
-    description: "Updates a user's subscriptions.",
+    description: "Updates a user's subscriptions.\n\nPUT /user/subscriptions/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/bill-subs-api_subscription-v2"
         },
-        "identifier": {
-          "$ref": "#/$defs/bill-subs-api_schemas-identifier",
-          "description": "Subscription identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Subscription identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_component_value": bill_subs_api_component_value,
-        "bill-subs-api_component_values": bill_subs_api_component_values,
-        "bill-subs-api_frequency": bill_subs_api_frequency,
-        "bill-subs-api_install_id": bill_subs_api_install_id,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2,
-        "bill-subs-api_zone": bill_subs_api_zone,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value$,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values$,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan$,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_zone": bill$$subs$$api_zone$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_user_subscription_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_user_subscription_response_single": bill_subs_api_user_subscription_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_user_subscription_response_single": bill$$subs$$api_user_subscription_response_single,
       },
     },
     annotations: {
@@ -282,11 +260,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_user_subscription_response_single": bill_subs_api_user_subscription_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_user_subscription_response_single": bill$$subs$$api_user_subscription_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/user/tokens/permissionGroups/tools.ts b/src/generated/forge-mcp/user/tokens/permissionGroups/tools.ts
index 7802ac18b..25b05fa77 100644
--- a/src/generated/forge-mcp/user/tokens/permissionGroups/tools.ts
+++ b/src/generated/forge-mcp/user/tokens/permissionGroups/tools.ts
@@ -1,45 +1,52 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import type { Tool } from "../../../_/tool.js";
+import { type Tool, param } from "../../../_/tool.js";
 import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_messages_2_output,
-  iam_permissions_group_response_collection_output,
-  iam_result_info_output,
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_messages$$2,
+  iam_permissions_group_response_collection,
+  iam_result_info,
 } from "../../../outputs.js";
 
 /**
- * The tools of `user.tokens.permission_groups`.
+ * The tools of `user.tokens.permissionGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "user_tokens_permission_groups_list",
+    name: "user_tokens_permissionGroups_list",
     title: "List Token Permission Groups",
-    description: "Find all available permission groups for API Tokens.",
+    description: "Find all available permission groups for API Tokens.\n\nGET /user/tokens/permission_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "name": {
-          "description": "Filter by the name of the permission group.\nThe value must be URL-encoded.",
-          "type": "string"
-        },
-        "scope": {
-          "description": "Filter by the scope of the permission group.\nThe value must be URL-encoded.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "Filter by the name of the permission group.\nThe value must be URL-encoded.",
+              "type": "string"
+            },
+            "scope": {
+              "description": "Filter by the scope of the permission group.\nThe value must be URL-encoded.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_permissions_group_response_collection",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permissions_group_response_collection": iam_permissions_group_response_collection_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permissions_group_response_collection": iam_permissions_group_response_collection,
+        "iam_result_info": iam_result_info,
       },
     },
     annotations: {
@@ -78,19 +85,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_permissions_group_response_collection": iam_permissions_group_response_collection_output,
-        "iam_result_info": iam_result_info_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permissions_group_response_collection": iam_permissions_group_response_collection,
+        "iam_result_info": iam_result_info,
       },
     },
     request: (args) => ({
       path: `/user/tokens/permission_groups`,
       query: [
-        ["name", args["name"], true],
-        ["scope", args["scope"], true],
+        ["name", param(args, "query", "name"), true],
+        ["scope", param(args, "query", "scope"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/user/tokens/tools.ts b/src/generated/forge-mcp/user/tokens/tools.ts
index 1b6312654..6ab1cc0f3 100644
--- a/src/generated/forge-mcp/user/tokens/tools.ts
+++ b/src/generated/forge-mcp/user/tokens/tools.ts
@@ -1,58 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import {
-  iam_api_response_collection_output,
-  iam_api_response_common_failure_output,
-  iam_api_response_common_output,
-  iam_api_response_single_id_output,
-  iam_api_response_single_output,
-  iam_cidr_list_output,
-  iam_collection_tokens_response_output,
-  iam_common_components_schemas_identifier_output,
-  iam_condition_output,
-  iam_creator_email_at_creation_output,
-  iam_effect_output,
-  iam_expires_on_output,
-  iam_issued_on_output,
-  iam_last_used_on_output,
-  iam_messages_2_output,
-  iam_modified_on_output,
-  iam_name_output,
-  iam_not_before_output,
-  iam_permission_group_output,
-  iam_permission_groups_output,
-  iam_policy_identifier_output,
-  iam_policy_with_permission_groups_and_resources_output,
-  iam_provisioner_id_output,
-  iam_provisioner_type_output,
-  iam_request_ip_output,
-  iam_resources_output,
-  iam_resources_type_object_nested_output,
-  iam_resources_type_object_string_output,
-  iam_response_single_value_output,
-  iam_result_info_output,
-  iam_single_token_create_response_output,
-  iam_single_token_response_output,
-  iam_token_base_output,
-  iam_token_identifier_output,
-  iam_token_policies_output,
-  iam_token_prefix_output,
-  iam_token_status_output,
-  iam_token_suffix_output,
-  iam_token_verify_response_single_segment_output,
-  iam_token_with_value_output,
-  iam_value_output,
-} from "../../outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
+  iam_api$$response$$collection,
+  iam_api$$response$$common,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_api$$response$$single$$id,
   iam_cidr_list,
+  iam_collection_tokens_response,
   iam_condition,
-  iam_create_payload,
-  iam_effect,
-  iam_expires_on,
-  iam_name,
-  iam_not_before,
+  iam_messages$$2,
   iam_permission_group,
   iam_permission_groups,
   iam_policy_with_permission_groups_and_resources,
@@ -60,10 +19,28 @@ import {
   iam_resources,
   iam_resources_type_object_nested,
   iam_resources_type_object_string,
-  iam_token_body,
-  iam_token_identifier,
+  iam_response_single_value,
+  iam_result_info,
+  iam_single_token_create_response,
+  iam_single_token_response,
+  iam_token_base,
   iam_token_policies,
-  iam_token_status,
+  iam_token_verify_response_single_segment,
+  iam_token_with_value,
+} from "../../outputs.js";
+import {
+  iam_cidr_list as iam_cidr_list$,
+  iam_condition as iam_condition$,
+  iam_create_payload,
+  iam_permission_group as iam_permission_group$,
+  iam_permission_groups as iam_permission_groups$,
+  iam_policy_with_permission_groups_and_resources as iam_policy_with_permission_groups_and_resources$,
+  iam_request_ip as iam_request_ip$,
+  iam_resources as iam_resources$,
+  iam_resources_type_object_nested as iam_resources_type_object_nested$,
+  iam_resources_type_object_string as iam_resources_type_object_string$,
+  iam_token_body,
+  iam_token_policies as iam_token_policies$,
 } from "../../schemas.js";
 
 /**
@@ -73,7 +50,7 @@ export const tools: readonly Tool[] = [
   {
     name: "user_tokens_create",
     title: "Create Token",
-    description: "Create a new access token.",
+    description: "Create a new access token.\n\nPOST /user/tokens",
     inputSchema: {
       type: "object",
       properties: {
@@ -84,14 +61,28 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "iam_cidr_list": iam_cidr_list$,
+        "iam_condition": iam_condition$,
+        "iam_create_payload": iam_create_payload,
+        "iam_permission_group": iam_permission_group$,
+        "iam_permission_groups": iam_permission_groups$,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources$,
+        "iam_request_ip": iam_request_ip$,
+        "iam_resources": iam_resources$,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested$,
+        "iam_resources_type_object_string": iam_resources_type_object_string$,
+        "iam_token_policies": iam_token_policies$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/iam_single_token_create_response",
       $defs: {
+        "iam_api-response-single": iam_api$$response$$single,
         "iam_cidr_list": iam_cidr_list,
         "iam_condition": iam_condition,
-        "iam_create_payload": iam_create_payload,
-        "iam_effect": iam_effect,
-        "iam_expires_on": iam_expires_on,
-        "iam_name": iam_name,
-        "iam_not_before": iam_not_before,
+        "iam_messages-2": iam_messages$$2,
         "iam_permission_group": iam_permission_group,
         "iam_permission_groups": iam_permission_groups,
         "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
@@ -99,43 +90,10 @@ export const tools: readonly Tool[] = [
         "iam_resources": iam_resources,
         "iam_resources_type_object_nested": iam_resources_type_object_nested,
         "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_create_response": iam_single_token_create_response,
+        "iam_token_base": iam_token_base,
         "iam_token_policies": iam_token_policies,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/iam_single_token_create_response",
-      $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_create_response": iam_single_token_create_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
-        "iam_token_with_value": iam_token_with_value_output,
-        "iam_value": iam_value_output,
+        "iam_token_with_value": iam_token_with_value,
       },
     },
     annotations: {
@@ -173,38 +131,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_create_response": iam_single_token_create_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
-        "iam_token_with_value": iam_token_with_value_output,
-        "iam_value": iam_value_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_create_response": iam_single_token_create_response,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
+        "iam_token_with_value": iam_token_with_value,
       },
     },
     request: (args) => ({
@@ -215,29 +157,35 @@ export const tools: readonly Tool[] = [
   {
     name: "user_tokens_delete",
     title: "Delete Token",
-    description: "Destroy a token.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.",
+    description: "Destroy a token.\n\nConfirm with the user before calling this tool. Are you sure? This action cannot be undone.\n\nDELETE /user/tokens/{token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "token_id": {
-          "$ref": "#/$defs/iam_token_identifier",
-          "description": "Token identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "token_id": {
+              "description": "Token identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "token_id"
+        "path"
       ],
-      $defs: {
-        "iam_token_identifier": iam_token_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_api-response-single-id",
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     annotations: {
@@ -275,11 +223,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single-id": iam_api_response_single_id_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_messages-2": iam_messages_2_output,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single-id": iam_api$$response$$single$$id,
+        "iam_messages-2": iam_messages$$2,
       },
     },
     request: (args) => ({
@@ -289,54 +236,46 @@ export const tools: readonly Tool[] = [
   {
     name: "user_tokens_get",
     title: "Token Details",
-    description: "Get information about a specific token.",
+    description: "Get information about a specific token.\n\nGET /user/tokens/{token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "token_id": {
-          "$ref": "#/$defs/iam_token_identifier",
-          "description": "Token identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "token_id": {
+              "description": "Token identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "token_id"
+        "path"
       ],
-      $defs: {
-        "iam_token_identifier": iam_token_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_token_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_response": iam_single_token_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_response": iam_single_token_response,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     annotations: {
@@ -375,36 +314,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_response": iam_single_token_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_response": iam_single_token_response,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     request: (args) => ({
@@ -414,69 +338,61 @@ export const tools: readonly Tool[] = [
   {
     name: "user_tokens_list",
     title: "List Tokens",
-    description: "List all access tokens you created. Results include active, disabled, and recently-expired tokens when include_expired is set to true.",
+    description: "List all access tokens you created. Results include active, disabled, and recently-expired tokens when include_expired is set to true.\n\nGET /user/tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "include_expired": {
-          "default": false,
-          "description": "When true, includes recently-expired tokens in the response.",
-          "type": "boolean"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "include_expired": {
+              "default": false,
+              "description": "When true, includes recently-expired tokens in the response.",
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_collection_tokens_response",
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_collection_tokens_response": iam_collection_tokens_response_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_collection_tokens_response": iam_collection_tokens_response,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_result_info": iam_result_info,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     annotations: {
@@ -515,76 +431,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-collection": iam_api_response_collection_output,
-        "iam_api-response-common": iam_api_response_common_output,
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_collection_tokens_response": iam_collection_tokens_response_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_result_info": iam_result_info_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-collection": iam_api$$response$$collection,
+        "iam_api-response-common": iam_api$$response$$common,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_collection_tokens_response": iam_collection_tokens_response,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_result_info": iam_result_info,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     request: (args) => ({
       path: `/user/tokens`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["direction", args["direction"], true],
-        ["include_expired", args["include_expired"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["include_expired", param(args, "query", "include_expired"), true],
       ],
     }),
   },
   {
     name: "user_tokens_roll",
     title: "Roll Token",
-    description: "Roll the token secret.\n\nConfirm with the user before calling this tool. Rolling this token will invalidate the current secret and generate a new one. Any integrations using the current secret will stop working.",
+    description: "Roll the token secret.\n\nConfirm with the user before calling this tool. Rolling this token will invalidate the current secret and generate a new one. Any integrations using the current secret will stop working.\n\nPUT /user/tokens/{token_id}/value",
     inputSchema: {
       type: "object",
       properties: {
-        "token_id": {
-          "$ref": "#/$defs/iam_token_identifier",
-          "description": "Token identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "token_id": {
+              "description": "Token identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "token_id"
+        "path"
       ],
-      $defs: {
-        "iam_token_identifier": iam_token_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_response_single_value",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_value": iam_response_single_value_output,
-        "iam_value": iam_value_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_value": iam_response_single_value,
       },
     },
     annotations: {
@@ -622,11 +529,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_response_single_value": iam_response_single_value_output,
-        "iam_value": iam_value_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_response_single_value": iam_response_single_value,
       },
     },
     request: (args) => ({
@@ -636,29 +542,53 @@ export const tools: readonly Tool[] = [
   {
     name: "user_tokens_update",
     title: "Update Token",
-    description: "Update an existing token.",
+    description: "Update an existing token.\n\nPUT /user/tokens/{token_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/iam_token_body"
         },
-        "token_id": {
-          "$ref": "#/$defs/iam_token_identifier",
-          "description": "Token identifier tag."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "token_id": {
+              "description": "Token identifier tag.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "token_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
+        "iam_cidr_list": iam_cidr_list$,
+        "iam_condition": iam_condition$,
+        "iam_permission_group": iam_permission_group$,
+        "iam_permission_groups": iam_permission_groups$,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources$,
+        "iam_request_ip": iam_request_ip$,
+        "iam_resources": iam_resources$,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested$,
+        "iam_resources_type_object_string": iam_resources_type_object_string$,
+        "iam_token_body": iam_token_body,
+        "iam_token_policies": iam_token_policies$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/iam_single_token_response",
+      $defs: {
+        "iam_api-response-single": iam_api$$response$$single,
         "iam_cidr_list": iam_cidr_list,
         "iam_condition": iam_condition,
-        "iam_effect": iam_effect,
-        "iam_expires_on": iam_expires_on,
-        "iam_name": iam_name,
-        "iam_not_before": iam_not_before,
+        "iam_messages-2": iam_messages$$2,
         "iam_permission_group": iam_permission_group,
         "iam_permission_groups": iam_permission_groups,
         "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
@@ -666,44 +596,9 @@ export const tools: readonly Tool[] = [
         "iam_resources": iam_resources,
         "iam_resources_type_object_nested": iam_resources_type_object_nested,
         "iam_resources_type_object_string": iam_resources_type_object_string,
-        "iam_token_body": iam_token_body,
-        "iam_token_identifier": iam_token_identifier,
+        "iam_single_token_response": iam_single_token_response,
+        "iam_token_base": iam_token_base,
         "iam_token_policies": iam_token_policies,
-        "iam_token_status": iam_token_status,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/iam_single_token_response",
-      $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_response": iam_single_token_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
       },
     },
     annotations: {
@@ -741,36 +636,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_cidr_list": iam_cidr_list_output,
-        "iam_condition": iam_condition_output,
-        "iam_creator_email_at_creation": iam_creator_email_at_creation_output,
-        "iam_effect": iam_effect_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_issued_on": iam_issued_on_output,
-        "iam_last_used_on": iam_last_used_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_modified_on": iam_modified_on_output,
-        "iam_name": iam_name_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_permission_group": iam_permission_group_output,
-        "iam_permission_groups": iam_permission_groups_output,
-        "iam_policy_identifier": iam_policy_identifier_output,
-        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources_output,
-        "iam_provisioner_id": iam_provisioner_id_output,
-        "iam_provisioner_type": iam_provisioner_type_output,
-        "iam_request_ip": iam_request_ip_output,
-        "iam_resources": iam_resources_output,
-        "iam_resources_type_object_nested": iam_resources_type_object_nested_output,
-        "iam_resources_type_object_string": iam_resources_type_object_string_output,
-        "iam_single_token_response": iam_single_token_response_output,
-        "iam_token_base": iam_token_base_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_policies": iam_token_policies_output,
-        "iam_token_prefix": iam_token_prefix_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_suffix": iam_token_suffix_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_cidr_list": iam_cidr_list,
+        "iam_condition": iam_condition,
+        "iam_messages-2": iam_messages$$2,
+        "iam_permission_group": iam_permission_group,
+        "iam_permission_groups": iam_permission_groups,
+        "iam_policy_with_permission_groups_and_resources": iam_policy_with_permission_groups_and_resources,
+        "iam_request_ip": iam_request_ip,
+        "iam_resources": iam_resources,
+        "iam_resources_type_object_nested": iam_resources_type_object_nested,
+        "iam_resources_type_object_string": iam_resources_type_object_string,
+        "iam_single_token_response": iam_single_token_response,
+        "iam_token_base": iam_token_base,
+        "iam_token_policies": iam_token_policies,
       },
     },
     request: (args) => ({
@@ -781,21 +661,18 @@ export const tools: readonly Tool[] = [
   {
     name: "user_tokens_verify",
     title: "Verify Token",
-    description: "Test whether a token works.",
+    description: "Test whether a token works.\n\nGET /user/tokens/verify",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_token_verify_response_single_segment",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_verify_response_single_segment": iam_token_verify_response_single_segment_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_token_verify_response_single_segment": iam_token_verify_response_single_segment,
       },
     },
     annotations: {
@@ -825,14 +702,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_expires_on": iam_expires_on_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_not_before": iam_not_before_output,
-        "iam_token_identifier": iam_token_identifier_output,
-        "iam_token_status": iam_token_status_output,
-        "iam_token_verify_response_single_segment": iam_token_verify_response_single_segment_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_token_verify_response_single_segment": iam_token_verify_response_single_segment,
       },
     },
     request: (_args) => ({
diff --git a/src/generated/forge-mcp/user/tools.ts b/src/generated/forge-mcp/user/tools.ts
index 8da18e7b5..c51ad172c 100644
--- a/src/generated/forge-mcp/user/tools.ts
+++ b/src/generated/forge-mcp/user/tools.ts
@@ -3,27 +3,15 @@
 
 import type { Tool } from "../_/tool.js";
 import {
-  iam_api_response_common_failure_output,
-  iam_api_response_single_output,
-  iam_common_components_schemas_identifier_output,
-  iam_first_name_output,
-  iam_last_name_output,
-  iam_messages_2_output,
-  iam_two_factor_authentication_enabled_output,
+  iam_api$$response$$common$$failure,
+  iam_api$$response$$single,
+  iam_messages$$2,
 } from "../outputs.js";
-import { iam_first_name, iam_last_name } from "../schemas.js";
 import {
-  iam_components_schemas_status_output,
-  iam_country_output,
-  iam_organization_output,
-  iam_schemas_name_output,
-  iam_schemas_permissions_output,
-  iam_single_user_response_output,
-  iam_telephone_output,
-  iam_two_factor_authentication_locked_output,
-  iam_zipcode_output,
+  iam_organization,
+  iam_schemas$$permissions,
+  iam_single_user_response,
 } from "./outputs.js";
-import { iam_country, iam_telephone, iam_zipcode } from "./schemas.js";
 
 /**
  * The tools of `user`.
@@ -32,31 +20,66 @@ export const tools: readonly Tool[] = [
   {
     name: "user_edit",
     title: "Edit User",
-    description: "Edit part of your user details.",
+    description: "Edit part of your user details.\n\nPATCH /user",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "country": {
-              "$ref": "#/$defs/iam_country",
-              "description": "The country in which the user lives."
+              "description": "The country in which the user lives.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "first_name": {
-              "$ref": "#/$defs/iam_first_name",
-              "description": "User's first name"
+              "description": "User's first name",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "last_name": {
-              "$ref": "#/$defs/iam_last_name",
-              "description": "User's last name"
+              "description": "User's last name",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "telephone": {
-              "$ref": "#/$defs/iam_telephone",
-              "description": "User's telephone number"
+              "description": "User's telephone number",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
             "zipcode": {
-              "$ref": "#/$defs/iam_zipcode",
-              "description": "The zipcode or postal code where the user lives."
+              "description": "The zipcode or postal code where the user lives.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
           },
           "type": "object"
@@ -65,32 +88,16 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
-      $defs: {
-        "iam_country": iam_country,
-        "iam_first_name": iam_first_name,
-        "iam_last_name": iam_last_name,
-        "iam_telephone": iam_telephone,
-        "iam_zipcode": iam_zipcode,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_user_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_components-schemas-status": iam_components_schemas_status_output,
-        "iam_country": iam_country_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_organization": iam_organization_output,
-        "iam_schemas-name": iam_schemas_name_output,
-        "iam_schemas-permissions": iam_schemas_permissions_output,
-        "iam_single_user_response": iam_single_user_response_output,
-        "iam_telephone": iam_telephone_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
-        "iam_two_factor_authentication_locked": iam_two_factor_authentication_locked_output,
-        "iam_zipcode": iam_zipcode_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_organization": iam_organization,
+        "iam_schemas-permissions": iam_schemas$$permissions,
+        "iam_single_user_response": iam_single_user_response,
       },
     },
     annotations: {
@@ -128,22 +135,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_components-schemas-status": iam_components_schemas_status_output,
-        "iam_country": iam_country_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_organization": iam_organization_output,
-        "iam_schemas-name": iam_schemas_name_output,
-        "iam_schemas-permissions": iam_schemas_permissions_output,
-        "iam_single_user_response": iam_single_user_response_output,
-        "iam_telephone": iam_telephone_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
-        "iam_two_factor_authentication_locked": iam_two_factor_authentication_locked_output,
-        "iam_zipcode": iam_zipcode_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_organization": iam_organization,
+        "iam_schemas-permissions": iam_schemas$$permissions,
+        "iam_single_user_response": iam_single_user_response,
       },
     },
     request: (args) => ({
@@ -154,29 +151,20 @@ export const tools: readonly Tool[] = [
   {
     name: "user_get",
     title: "User Details",
-    description: "Retrieves detailed information about the currently authenticated user, including email, name, and account memberships.",
+    description: "Retrieves detailed information about the currently authenticated user, including email, name, and account memberships.\n\nGET /user",
     inputSchema: {
       type: "object",
       properties: {},
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/iam_single_user_response",
       $defs: {
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_components-schemas-status": iam_components_schemas_status_output,
-        "iam_country": iam_country_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_organization": iam_organization_output,
-        "iam_schemas-name": iam_schemas_name_output,
-        "iam_schemas-permissions": iam_schemas_permissions_output,
-        "iam_single_user_response": iam_single_user_response_output,
-        "iam_telephone": iam_telephone_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
-        "iam_two_factor_authentication_locked": iam_two_factor_authentication_locked_output,
-        "iam_zipcode": iam_zipcode_output,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_organization": iam_organization,
+        "iam_schemas-permissions": iam_schemas$$permissions,
+        "iam_single_user_response": iam_single_user_response,
       },
     },
     annotations: {
@@ -215,22 +203,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "iam_api-response-common-failure": iam_api_response_common_failure_output,
-        "iam_api-response-single": iam_api_response_single_output,
-        "iam_common_components-schemas-identifier": iam_common_components_schemas_identifier_output,
-        "iam_components-schemas-status": iam_components_schemas_status_output,
-        "iam_country": iam_country_output,
-        "iam_first_name": iam_first_name_output,
-        "iam_last_name": iam_last_name_output,
-        "iam_messages-2": iam_messages_2_output,
-        "iam_organization": iam_organization_output,
-        "iam_schemas-name": iam_schemas_name_output,
-        "iam_schemas-permissions": iam_schemas_permissions_output,
-        "iam_single_user_response": iam_single_user_response_output,
-        "iam_telephone": iam_telephone_output,
-        "iam_two_factor_authentication_enabled": iam_two_factor_authentication_enabled_output,
-        "iam_two_factor_authentication_locked": iam_two_factor_authentication_locked_output,
-        "iam_zipcode": iam_zipcode_output,
+        "iam_api-response-common-failure": iam_api$$response$$common$$failure,
+        "iam_api-response-single": iam_api$$response$$single,
+        "iam_messages-2": iam_messages$$2,
+        "iam_organization": iam_organization,
+        "iam_schemas-permissions": iam_schemas$$permissions,
+        "iam_single_user_response": iam_single_user_response,
       },
     },
     request: (_args) => ({
diff --git a/src/generated/forge-mcp/vectorize/metadataIndex/outputs.ts b/src/generated/forge-mcp/vectorize/metadataIndex/outputs.ts
index d3c946e89..a74753d39 100644
--- a/src/generated/forge-mcp/vectorize/metadataIndex/outputs.ts
+++ b/src/generated/forge-mcp/vectorize/metadataIndex/outputs.ts
@@ -6,10 +6,11 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `vectorize_create-metadata-index-response` in responses.
  */
-export const vectorize_create_metadata_index_response_output: JsonSchema = {
+export const vectorize_create$$metadata$$index$$response: JsonSchema = {
   "properties": {
     "mutationId": {
-      "$ref": "#/$defs/vectorize_mutation-uuid"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "type": "object"
@@ -18,10 +19,11 @@ export const vectorize_create_metadata_index_response_output: JsonSchema = {
 /**
  * The schema of `vectorize_delete-metadata-index-response` in responses.
  */
-export const vectorize_delete_metadata_index_response_output: JsonSchema = {
+export const vectorize_delete$$metadata$$index$$response: JsonSchema = {
   "properties": {
     "mutationId": {
-      "$ref": "#/$defs/vectorize_mutation-uuid"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "type": "object"
@@ -30,7 +32,7 @@ export const vectorize_delete_metadata_index_response_output: JsonSchema = {
 /**
  * The schema of `vectorize_list-metadata-index-response` in responses.
  */
-export const vectorize_list_metadata_index_response_output: JsonSchema = {
+export const vectorize_list$$metadata$$index$$response: JsonSchema = {
   "properties": {
     "metadataIndexes": {
       "items": {
diff --git a/src/generated/forge-mcp/vectorize/metadataIndex/schemas.ts b/src/generated/forge-mcp/vectorize/metadataIndex/schemas.ts
index 3c1d82488..bad8012e5 100644
--- a/src/generated/forge-mcp/vectorize/metadataIndex/schemas.ts
+++ b/src/generated/forge-mcp/vectorize/metadataIndex/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `vectorize_create-metadata-index-request`.
  */
-export const vectorize_create_metadata_index_request: JsonSchema = {
+export const vectorize_create$$metadata$$index$$request: JsonSchema = {
   "properties": {
     "indexType": {
       "description": "Specifies the type of metadata property to index.",
@@ -32,7 +32,7 @@ export const vectorize_create_metadata_index_request: JsonSchema = {
 /**
  * The schema of `vectorize_delete-metadata-index-request`.
  */
-export const vectorize_delete_metadata_index_request: JsonSchema = {
+export const vectorize_delete$$metadata$$index$$request: JsonSchema = {
   "properties": {
     "propertyName": {
       "description": "Specifies the metadata property for which the index must be deleted.",
diff --git a/src/generated/forge-mcp/vectorize/metadataIndex/tools.ts b/src/generated/forge-mcp/vectorize/metadataIndex/tools.ts
index c39496856..a56c55d51 100644
--- a/src/generated/forge-mcp/vectorize/metadataIndex/tools.ts
+++ b/src/generated/forge-mcp/vectorize/metadataIndex/tools.ts
@@ -3,54 +3,60 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  vectorize_api_response_common_failure_output,
-  vectorize_api_response_common_output,
-  vectorize_api_response_single_output,
-  vectorize_messages_output,
-  vectorize_mutation_uuid_output,
+  vectorize_api$$response$$common,
+  vectorize_api$$response$$common$$failure,
+  vectorize_api$$response$$single,
+  vectorize_messages,
 } from "../outputs.js";
-import { vectorize_identifier, vectorize_index_name } from "../schemas.js";
 import {
-  vectorize_create_metadata_index_response_output,
-  vectorize_delete_metadata_index_response_output,
-  vectorize_list_metadata_index_response_output,
+  vectorize_create$$metadata$$index$$response,
+  vectorize_delete$$metadata$$index$$response,
+  vectorize_list$$metadata$$index$$response,
 } from "./outputs.js";
 import {
-  vectorize_create_metadata_index_request,
-  vectorize_delete_metadata_index_request,
+  vectorize_create$$metadata$$index$$request,
+  vectorize_delete$$metadata$$index$$request,
 } from "./schemas.js";
 
 /**
- * The tools of `vectorize.metadata_index`.
+ * The tools of `vectorize.metadataIndex`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "vectorize_metadata_index_create",
+    name: "vectorize_metadataIndex_create",
     title: "Create Metadata Index",
-    description: "Enable metadata filtering based on metadata property. Limited to 10 properties.",
+    description: "Enable metadata filtering based on metadata property. Limited to 10 properties.\n\nPOST /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/create",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/vectorize_create-metadata-index-request"
         },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vectorize_create-metadata-index-request": vectorize_create_metadata_index_request,
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-name": vectorize_index_name,
+        "vectorize_create-metadata-index-request": vectorize_create$$metadata$$index$$request,
       },
     },
     outputSchema: {
@@ -68,11 +74,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_create-metadata-index-response": vectorize_create_metadata_index_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_mutation-uuid": vectorize_mutation_uuid_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_create-metadata-index-response": vectorize_create$$metadata$$index$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -116,12 +121,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_create-metadata-index-response": vectorize_create_metadata_index_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_mutation-uuid": vectorize_mutation_uuid_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_create-metadata-index-response": vectorize_create$$metadata$$index$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -130,32 +134,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "vectorize_metadata_index_delete",
+    name: "vectorize_metadataIndex_delete",
     title: "Delete Metadata Index",
-    description: "Allow Vectorize to delete the specified metadata index.\n\nConfirm with the user before calling this tool. This operation deletes a metadata index destructively.",
+    description: "Allow Vectorize to delete the specified metadata index.\n\nConfirm with the user before calling this tool. This operation deletes a metadata index destructively.\n\nPOST /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/delete",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/vectorize_delete-metadata-index-request"
         },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vectorize_delete-metadata-index-request": vectorize_delete_metadata_index_request,
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-name": vectorize_index_name,
+        "vectorize_delete-metadata-index-request": vectorize_delete$$metadata$$index$$request,
       },
     },
     outputSchema: {
@@ -173,11 +185,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_delete-metadata-index-response": vectorize_delete_metadata_index_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_mutation-uuid": vectorize_mutation_uuid_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_delete-metadata-index-response": vectorize_delete$$metadata$$index$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -221,12 +232,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_delete-metadata-index-response": vectorize_delete_metadata_index_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_mutation-uuid": vectorize_mutation_uuid_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_delete-metadata-index-response": vectorize_delete$$metadata$$index$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -235,28 +245,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "vectorize_metadata_index_list",
+    name: "vectorize_metadataIndex_list",
     title: "List Metadata Indexes",
-    description: "List Metadata Indexes for the specified Vectorize Index.",
+    description: "List Metadata Indexes for the specified Vectorize Index.\n\nGET /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/list",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name"
+        "path"
       ],
-      $defs: {
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-name": vectorize_index_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -273,10 +289,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_list-metadata-index-response": vectorize_list_metadata_index_response_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_list-metadata-index-response": vectorize_list$$metadata$$index$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -316,11 +332,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_list-metadata-index-response": vectorize_list_metadata_index_response_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_list-metadata-index-response": vectorize_list$$metadata$$index$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/vectorize/outputs.ts b/src/generated/forge-mcp/vectorize/outputs.ts
index e3827c31d..c024fd2f6 100644
--- a/src/generated/forge-mcp/vectorize/outputs.ts
+++ b/src/generated/forge-mcp/vectorize/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `vectorize_api-response-common` in responses.
  */
-export const vectorize_api_response_common_output: JsonSchema = {
+export const vectorize_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/vectorize_messages"
@@ -49,7 +49,7 @@ export const vectorize_api_response_common_output: JsonSchema = {
 /**
  * The schema of `vectorize_api-response-common-failure` in responses.
  */
-export const vectorize_api_response_common_failure_output: JsonSchema = {
+export const vectorize_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/vectorize_messages"
@@ -79,7 +79,7 @@ export const vectorize_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `vectorize_api-response-single` in responses.
  */
-export const vectorize_api_response_single_output: JsonSchema = {
+export const vectorize_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/vectorize_api-response-common"
@@ -108,7 +108,7 @@ export const vectorize_api_response_single_output: JsonSchema = {
 /**
  * The schema of `vectorize_create-index-response` in responses.
  */
-export const vectorize_create_index_response_output: JsonSchema = {
+export const vectorize_create$$index$$response: JsonSchema = {
   "properties": {
     "config": {
       "allOf": [
@@ -118,7 +118,14 @@ export const vectorize_create_index_response_output: JsonSchema = {
         {
           "properties": {
             "preset": {
-              "$ref": "#/$defs/vectorize_index-preset"
+              "enum": [
+                "@cf/baai/bge-small-en-v1.5",
+                "@cf/baai/bge-base-en-v1.5",
+                "@cf/baai/bge-large-en-v1.5",
+                "openai/text-embedding-ada-002",
+                "cohere/embed-multilingual-v2.0"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
@@ -130,14 +137,14 @@ export const vectorize_create_index_response_output: JsonSchema = {
       "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/vectorize_index-description"
+      "type": "string"
     },
     "modified_on": {
       "format": "date-time",
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/vectorize_index-name"
+      "type": "string"
     }
   },
   "type": "object"
@@ -147,32 +154,31 @@ export const vectorize_create_index_response_output: JsonSchema = {
  * The schema of `vectorize_index-delete-vectors-by-id-v2-response` in
  * responses.
  */
-export const vectorize_index_delete_vectors_by_id_v2_response_output: JsonSchema = {
+export const vectorize_index$$delete$$vectors$$by$$id$$v2$$response: JsonSchema = {
   "properties": {
     "mutationId": {
-      "$ref": "#/$defs/vectorize_mutation-uuid"
+      "format": "uuid",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `vectorize_index-description` in responses.
- */
-export const vectorize_index_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `vectorize_index-dimension-configuration` in responses.
  */
-export const vectorize_index_dimension_configuration_output: JsonSchema = {
+export const vectorize_index$$dimension$$configuration: JsonSchema = {
   "properties": {
     "dimensions": {
-      "$ref": "#/$defs/vectorize_index-dimensions"
+      "type": "integer"
     },
     "metric": {
-      "$ref": "#/$defs/vectorize_index-metric"
+      "enum": [
+        "cosine",
+        "euclidean",
+        "dot-product"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -182,21 +188,14 @@ export const vectorize_index_dimension_configuration_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vectorize_index-dimensions` in responses.
- */
-export const vectorize_index_dimensions_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `vectorize_index-get-vectors-by-id-response` in responses.
  */
-export const vectorize_index_get_vectors_by_id_response_output: JsonSchema = {
+export const vectorize_index$$get$$vectors$$by$$id$$response: JsonSchema = {
   "items": {
     "properties": {
       "id": {
-        "$ref": "#/$defs/vectorize_vector-identifier"
+        "type": "string"
       },
       "metadata": {
         "type": "object"
@@ -226,10 +225,10 @@ export const vectorize_index_get_vectors_by_id_response_output: JsonSchema = {
 /**
  * The schema of `vectorize_index-info-response` in responses.
  */
-export const vectorize_index_info_response_output: JsonSchema = {
+export const vectorize_index$$info$$response: JsonSchema = {
   "properties": {
     "dimensions": {
-      "$ref": "#/$defs/vectorize_index-dimensions"
+      "type": "integer"
     },
     "processedUpToDatetime": {
       "oneOf": [
@@ -245,7 +244,8 @@ export const vectorize_index_info_response_output: JsonSchema = {
     "processedUpToMutation": {
       "oneOf": [
         {
-          "$ref": "#/$defs/vectorize_mutation-uuid"
+          "format": "uuid",
+          "type": "string"
         },
         {
           "type": "null"
@@ -262,7 +262,7 @@ export const vectorize_index_info_response_output: JsonSchema = {
 /**
  * The schema of `vectorize_index-list-vectors-response` in responses.
  */
-export const vectorize_index_list_vectors_response_output: JsonSchema = {
+export const vectorize_index$$list$$vectors$$response: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -310,43 +310,10 @@ export const vectorize_index_list_vectors_response_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vectorize_index-metric` in responses.
- */
-export const vectorize_index_metric_output: JsonSchema = {
-  "enum": [
-    "cosine",
-    "euclidean",
-    "dot-product"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `vectorize_index-name` in responses.
- */
-export const vectorize_index_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `vectorize_index-preset` in responses.
- */
-export const vectorize_index_preset_output: JsonSchema = {
-  "enum": [
-    "@cf/baai/bge-small-en-v1.5",
-    "@cf/baai/bge-base-en-v1.5",
-    "@cf/baai/bge-large-en-v1.5",
-    "openai/text-embedding-ada-002",
-    "cohere/embed-multilingual-v2.0"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `vectorize_index-query-v2-response` in responses.
  */
-export const vectorize_index_query_v2_response_output: JsonSchema = {
+export const vectorize_index$$query$$v2$$response: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -355,7 +322,7 @@ export const vectorize_index_query_v2_response_output: JsonSchema = {
       "items": {
         "properties": {
           "id": {
-            "$ref": "#/$defs/vectorize_vector-identifier"
+            "type": "string"
           },
           "metadata": {
             "oneOf": [
@@ -405,7 +372,7 @@ export const vectorize_index_query_v2_response_output: JsonSchema = {
 /**
  * The schema of `vectorize_messages` in responses.
  */
-export const vectorize_messages_output: JsonSchema = {
+export const vectorize_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -424,28 +391,13 @@ export const vectorize_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `vectorize_mutation-uuid` in responses.
- */
-export const vectorize_mutation_uuid_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `vectorize_vector-identifier` in responses.
- */
-export const vectorize_vector_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `vectorize_vector-list-item` in responses.
  */
-export const vectorize_vector_list_item_output: JsonSchema = {
+export const vectorize_vector$$list$$item: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/vectorize_vector-identifier"
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/vectorize/schemas.ts b/src/generated/forge-mcp/vectorize/schemas.ts
index 607267f82..1f6631b00 100644
--- a/src/generated/forge-mcp/vectorize/schemas.ts
+++ b/src/generated/forge-mcp/vectorize/schemas.ts
@@ -6,17 +6,17 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `vectorize_create-index-request`.
  */
-export const vectorize_create_index_request: JsonSchema = {
+export const vectorize_create$$index$$request: JsonSchema = {
   "properties": {
     "config": {
       "$ref": "#/$defs/vectorize_index-configuration"
     },
     "description": {
-      "$ref": "#/$defs/vectorize_index-description",
-      "description": "Specifies the description of the index."
+      "description": "Specifies the description of the index.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/vectorize_index-name"
+      "type": "string"
     }
   },
   "required": [
@@ -26,18 +26,10 @@ export const vectorize_create_index_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vectorize_identifier`.
- */
-export const vectorize_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
 /**
  * The schema of `vectorize_index-configuration`.
  */
-export const vectorize_index_configuration: JsonSchema = {
+export const vectorize_index$$configuration: JsonSchema = {
   "description": "Specifies the type of configuration to use for the index.",
   "oneOf": [
     {
@@ -52,12 +44,13 @@ export const vectorize_index_configuration: JsonSchema = {
 /**
  * The schema of `vectorize_index-delete-vectors-by-id-request`.
  */
-export const vectorize_index_delete_vectors_by_id_request: JsonSchema = {
+export const vectorize_index$$delete$$vectors$$by$$id$$request: JsonSchema = {
   "properties": {
     "ids": {
       "description": "A list of vector identifiers to delete from the index indicated by the path.",
       "items": {
-        "$ref": "#/$defs/vectorize_vector-identifier"
+        "description": "Identifier for a Vector",
+        "type": "string"
       },
       "type": "array"
     }
@@ -65,26 +58,23 @@ export const vectorize_index_delete_vectors_by_id_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vectorize_index-description`.
- */
-export const vectorize_index_description: JsonSchema = {
-  "description": "Specifies the description of the index.",
-  "type": "string"
-};
-
 /**
  * The schema of `vectorize_index-dimension-configuration`.
  */
-export const vectorize_index_dimension_configuration: JsonSchema = {
+export const vectorize_index$$dimension$$configuration: JsonSchema = {
   "properties": {
     "dimensions": {
-      "$ref": "#/$defs/vectorize_index-dimensions",
-      "description": "Specifies the number of dimensions for the index"
+      "description": "Specifies the number of dimensions for the index",
+      "type": "integer"
     },
     "metric": {
-      "$ref": "#/$defs/vectorize_index-metric",
-      "description": "Specifies the type of metric to use calculating distance."
+      "description": "Specifies the type of metric to use calculating distance.",
+      "enum": [
+        "cosine",
+        "euclidean",
+        "dot-product"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -94,23 +84,16 @@ export const vectorize_index_dimension_configuration: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vectorize_index-dimensions`.
- */
-export const vectorize_index_dimensions: JsonSchema = {
-  "description": "Specifies the number of dimensions for the index",
-  "type": "integer"
-};
-
 /**
  * The schema of `vectorize_index-get-vectors-by-id-request`.
  */
-export const vectorize_index_get_vectors_by_id_request: JsonSchema = {
+export const vectorize_index$$get$$vectors$$by$$id$$request: JsonSchema = {
   "properties": {
     "ids": {
       "description": "A list of vector identifiers to retrieve from the index indicated by the path.",
       "items": {
-        "$ref": "#/$defs/vectorize_vector-identifier"
+        "description": "Identifier for a Vector",
+        "type": "string"
       },
       "type": "array"
     }
@@ -118,49 +101,21 @@ export const vectorize_index_get_vectors_by_id_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `vectorize_index-metric`.
- */
-export const vectorize_index_metric: JsonSchema = {
-  "description": "Specifies the type of metric to use calculating distance.",
-  "enum": [
-    "cosine",
-    "euclidean",
-    "dot-product"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `vectorize_index-name`.
- */
-export const vectorize_index_name: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `vectorize_index-preset`.
- */
-export const vectorize_index_preset: JsonSchema = {
-  "description": "Specifies the preset to use for the index.",
-  "enum": [
-    "@cf/baai/bge-small-en-v1.5",
-    "@cf/baai/bge-base-en-v1.5",
-    "@cf/baai/bge-large-en-v1.5",
-    "openai/text-embedding-ada-002",
-    "cohere/embed-multilingual-v2.0"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `vectorize_index-preset-configuration`.
  */
-export const vectorize_index_preset_configuration: JsonSchema = {
+export const vectorize_index$$preset$$configuration: JsonSchema = {
   "properties": {
     "preset": {
-      "$ref": "#/$defs/vectorize_index-preset",
-      "description": "Specifies the preset to use for the index."
+      "description": "Specifies the preset to use for the index.",
+      "enum": [
+        "@cf/baai/bge-small-en-v1.5",
+        "@cf/baai/bge-base-en-v1.5",
+        "@cf/baai/bge-large-en-v1.5",
+        "openai/text-embedding-ada-002",
+        "cohere/embed-multilingual-v2.0"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -172,7 +127,7 @@ export const vectorize_index_preset_configuration: JsonSchema = {
 /**
  * The schema of `vectorize_index-query-v2-request`.
  */
-export const vectorize_index_query_v2_request: JsonSchema = {
+export const vectorize_index$$query$$v2$$request: JsonSchema = {
   "properties": {
     "filter": {
       "description": "A metadata filter expression used to limit nearest neighbor results.",
@@ -211,11 +166,3 @@ export const vectorize_index_query_v2_request: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `vectorize_vector-identifier`.
- */
-export const vectorize_vector_identifier: JsonSchema = {
-  "description": "Identifier for a Vector",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/vectorize/tools.ts b/src/generated/forge-mcp/vectorize/tools.ts
index ce338ce0e..de4890ba0 100644
--- a/src/generated/forge-mcp/vectorize/tools.ts
+++ b/src/generated/forge-mcp/vectorize/tools.ts
@@ -1,43 +1,29 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  vectorize_api_response_common_failure_output,
-  vectorize_api_response_common_output,
-  vectorize_api_response_single_output,
-  vectorize_create_index_response_output,
-  vectorize_index_delete_vectors_by_id_v2_response_output,
-  vectorize_index_description_output,
-  vectorize_index_dimension_configuration_output,
-  vectorize_index_dimensions_output,
-  vectorize_index_get_vectors_by_id_response_output,
-  vectorize_index_info_response_output,
-  vectorize_index_list_vectors_response_output,
-  vectorize_index_metric_output,
-  vectorize_index_name_output,
-  vectorize_index_preset_output,
-  vectorize_index_query_v2_response_output,
-  vectorize_messages_output,
-  vectorize_mutation_uuid_output,
-  vectorize_vector_identifier_output,
-  vectorize_vector_list_item_output,
+  vectorize_api$$response$$common,
+  vectorize_api$$response$$common$$failure,
+  vectorize_api$$response$$single,
+  vectorize_create$$index$$response,
+  vectorize_index$$delete$$vectors$$by$$id$$v2$$response,
+  vectorize_index$$dimension$$configuration,
+  vectorize_index$$get$$vectors$$by$$id$$response,
+  vectorize_index$$info$$response,
+  vectorize_index$$list$$vectors$$response,
+  vectorize_index$$query$$v2$$response,
+  vectorize_messages,
+  vectorize_vector$$list$$item,
 } from "./outputs.js";
 import {
-  vectorize_create_index_request,
-  vectorize_identifier,
-  vectorize_index_configuration,
-  vectorize_index_delete_vectors_by_id_request,
-  vectorize_index_description,
-  vectorize_index_dimension_configuration,
-  vectorize_index_dimensions,
-  vectorize_index_get_vectors_by_id_request,
-  vectorize_index_metric,
-  vectorize_index_name,
-  vectorize_index_preset,
-  vectorize_index_preset_configuration,
-  vectorize_index_query_v2_request,
-  vectorize_vector_identifier,
+  vectorize_create$$index$$request,
+  vectorize_index$$configuration,
+  vectorize_index$$delete$$vectors$$by$$id$$request,
+  vectorize_index$$dimension$$configuration as vectorize_index$$dimension$$configuration$,
+  vectorize_index$$get$$vectors$$by$$id$$request,
+  vectorize_index$$preset$$configuration,
+  vectorize_index$$query$$v2$$request,
 } from "./schemas.js";
 
 /**
@@ -47,33 +33,37 @@ export const tools: readonly Tool[] = [
   {
     name: "vectorize_create",
     title: "Create Vectorize Index",
-    description: "Creates and returns a new Vectorize Index.",
+    description: "Creates and returns a new Vectorize Index.\n\nPOST /accounts/{account_id}/vectorize/v2/indexes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/vectorize_create-index-request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vectorize_create-index-request": vectorize_create_index_request,
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-configuration": vectorize_index_configuration,
-        "vectorize_index-description": vectorize_index_description,
-        "vectorize_index-dimension-configuration": vectorize_index_dimension_configuration,
-        "vectorize_index-dimensions": vectorize_index_dimensions,
-        "vectorize_index-metric": vectorize_index_metric,
-        "vectorize_index-name": vectorize_index_name,
-        "vectorize_index-preset": vectorize_index_preset,
-        "vectorize_index-preset-configuration": vectorize_index_preset_configuration,
+        "vectorize_create-index-request": vectorize_create$$index$$request,
+        "vectorize_index-configuration": vectorize_index$$configuration,
+        "vectorize_index-dimension-configuration": vectorize_index$$dimension$$configuration$,
+        "vectorize_index-preset-configuration": vectorize_index$$preset$$configuration,
       },
     },
     outputSchema: {
@@ -91,16 +81,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_create-index-response": vectorize_create_index_response_output,
-        "vectorize_index-description": vectorize_index_description_output,
-        "vectorize_index-dimension-configuration": vectorize_index_dimension_configuration_output,
-        "vectorize_index-dimensions": vectorize_index_dimensions_output,
-        "vectorize_index-metric": vectorize_index_metric_output,
-        "vectorize_index-name": vectorize_index_name_output,
-        "vectorize_index-preset": vectorize_index_preset_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_create-index-response": vectorize_create$$index$$response,
+        "vectorize_index-dimension-configuration": vectorize_index$$dimension$$configuration,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -144,17 +129,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_create-index-response": vectorize_create_index_response_output,
-        "vectorize_index-description": vectorize_index_description_output,
-        "vectorize_index-dimension-configuration": vectorize_index_dimension_configuration_output,
-        "vectorize_index-dimensions": vectorize_index_dimensions_output,
-        "vectorize_index-metric": vectorize_index_metric_output,
-        "vectorize_index-name": vectorize_index_name_output,
-        "vectorize_index-preset": vectorize_index_preset_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_create-index-response": vectorize_create$$index$$response,
+        "vectorize_index-dimension-configuration": vectorize_index$$dimension$$configuration,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -165,26 +145,32 @@ export const tools: readonly Tool[] = [
   {
     name: "vectorize_delete",
     title: "Delete Vectorize Index",
-    description: "Deletes the specified Vectorize Index.",
+    description: "Deletes the specified Vectorize Index.\n\nDELETE /accounts/{account_id}/vectorize/v2/indexes/{index_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name"
+        "path"
       ],
-      $defs: {
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-name": vectorize_index_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -208,9 +194,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -261,10 +247,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -272,33 +258,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "vectorize_delete_by_ids",
+    name: "vectorize_deleteByIds",
     title: "Delete Vectors By Identifier",
-    description: "Delete a set of vectors from an index by their vector identifiers.",
+    description: "Delete a set of vectors from an index by their vector identifiers.\n\nPOST /accounts/{account_id}/vectorize/v2/indexes/{index_name}/delete_by_ids",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/vectorize_index-delete-vectors-by-id-request"
         },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-delete-vectors-by-id-request": vectorize_index_delete_vectors_by_id_request,
-        "vectorize_index-name": vectorize_index_name,
-        "vectorize_vector-identifier": vectorize_vector_identifier,
+        "vectorize_index-delete-vectors-by-id-request": vectorize_index$$delete$$vectors$$by$$id$$request,
       },
     },
     outputSchema: {
@@ -316,11 +309,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_index-delete-vectors-by-id-v2-response": vectorize_index_delete_vectors_by_id_v2_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_mutation-uuid": vectorize_mutation_uuid_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_index-delete-vectors-by-id-v2-response": vectorize_index$$delete$$vectors$$by$$id$$v2$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -364,12 +356,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_index-delete-vectors-by-id-v2-response": vectorize_index_delete_vectors_by_id_v2_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_mutation-uuid": vectorize_mutation_uuid_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_index-delete-vectors-by-id-v2-response": vectorize_index$$delete$$vectors$$by$$id$$v2$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -380,26 +371,32 @@ export const tools: readonly Tool[] = [
   {
     name: "vectorize_get",
     title: "Get Vectorize Index",
-    description: "Returns the specified Vectorize Index.",
+    description: "Returns the specified Vectorize Index.\n\nGET /accounts/{account_id}/vectorize/v2/indexes/{index_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name"
+        "path"
       ],
-      $defs: {
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-name": vectorize_index_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -416,16 +413,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_create-index-response": vectorize_create_index_response_output,
-        "vectorize_index-description": vectorize_index_description_output,
-        "vectorize_index-dimension-configuration": vectorize_index_dimension_configuration_output,
-        "vectorize_index-dimensions": vectorize_index_dimensions_output,
-        "vectorize_index-metric": vectorize_index_metric_output,
-        "vectorize_index-name": vectorize_index_name_output,
-        "vectorize_index-preset": vectorize_index_preset_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_create-index-response": vectorize_create$$index$$response,
+        "vectorize_index-dimension-configuration": vectorize_index$$dimension$$configuration,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -470,17 +462,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_create-index-response": vectorize_create_index_response_output,
-        "vectorize_index-description": vectorize_index_description_output,
-        "vectorize_index-dimension-configuration": vectorize_index_dimension_configuration_output,
-        "vectorize_index-dimensions": vectorize_index_dimensions_output,
-        "vectorize_index-metric": vectorize_index_metric_output,
-        "vectorize_index-name": vectorize_index_name_output,
-        "vectorize_index-preset": vectorize_index_preset_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_create-index-response": vectorize_create$$index$$response,
+        "vectorize_index-dimension-configuration": vectorize_index$$dimension$$configuration,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -488,33 +475,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "vectorize_get_by_ids",
+    name: "vectorize_getByIds",
     title: "Get Vectors By Identifier",
-    description: "Get a set of vectors from an index by their vector identifiers.",
+    description: "Get a set of vectors from an index by their vector identifiers.\n\nPOST /accounts/{account_id}/vectorize/v2/indexes/{index_name}/get_by_ids",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/vectorize_index-get-vectors-by-id-request"
         },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-get-vectors-by-id-request": vectorize_index_get_vectors_by_id_request,
-        "vectorize_index-name": vectorize_index_name,
-        "vectorize_vector-identifier": vectorize_vector_identifier,
+        "vectorize_index-get-vectors-by-id-request": vectorize_index$$get$$vectors$$by$$id$$request,
       },
     },
     outputSchema: {
@@ -532,10 +526,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_index-get-vectors-by-id-response": vectorize_index_get_vectors_by_id_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_vector-identifier": vectorize_vector_identifier_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_index-get-vectors-by-id-response": vectorize_index$$get$$vectors$$by$$id$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -575,11 +568,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_index-get-vectors-by-id-response": vectorize_index_get_vectors_by_id_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_vector-identifier": vectorize_vector_identifier_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_index-get-vectors-by-id-response": vectorize_index$$get$$vectors$$by$$id$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -590,26 +582,32 @@ export const tools: readonly Tool[] = [
   {
     name: "vectorize_info",
     title: "Get Vectorize Index Info",
-    description: "Get information about a vectorize index.",
+    description: "Get information about a vectorize index.\n\nGET /accounts/{account_id}/vectorize/v2/indexes/{index_name}/info",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name"
+        "path"
       ],
-      $defs: {
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-name": vectorize_index_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -626,12 +624,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_index-dimensions": vectorize_index_dimensions_output,
-        "vectorize_index-info-response": vectorize_index_info_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_mutation-uuid": vectorize_mutation_uuid_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_index-info-response": vectorize_index$$info$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -676,13 +672,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_index-dimensions": vectorize_index_dimensions_output,
-        "vectorize_index-info-response": vectorize_index_info_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_mutation-uuid": vectorize_mutation_uuid_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_index-info-response": vectorize_index$$info$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -692,21 +686,28 @@ export const tools: readonly Tool[] = [
   {
     name: "vectorize_list",
     title: "List Vectorize Indexes",
-    description: "Returns a list of Vectorize Indexes",
+    description: "Returns a list of Vectorize Indexes\n\nGET /accounts/{account_id}/vectorize/v2/indexes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "vectorize_identifier": vectorize_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -726,15 +727,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_create-index-response": vectorize_create_index_response_output,
-        "vectorize_index-description": vectorize_index_description_output,
-        "vectorize_index-dimension-configuration": vectorize_index_dimension_configuration_output,
-        "vectorize_index-dimensions": vectorize_index_dimensions_output,
-        "vectorize_index-metric": vectorize_index_metric_output,
-        "vectorize_index-name": vectorize_index_name_output,
-        "vectorize_index-preset": vectorize_index_preset_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_create-index-response": vectorize_create$$index$$response,
+        "vectorize_index-dimension-configuration": vectorize_index$$dimension$$configuration,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -782,16 +778,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_create-index-response": vectorize_create_index_response_output,
-        "vectorize_index-description": vectorize_index_description_output,
-        "vectorize_index-dimension-configuration": vectorize_index_dimension_configuration_output,
-        "vectorize_index-dimensions": vectorize_index_dimensions_output,
-        "vectorize_index-metric": vectorize_index_metric_output,
-        "vectorize_index-name": vectorize_index_name_output,
-        "vectorize_index-preset": vectorize_index_preset_output,
-        "vectorize_messages": vectorize_messages_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_create-index-response": vectorize_create$$index$$response,
+        "vectorize_index-dimension-configuration": vectorize_index$$dimension$$configuration,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
@@ -799,37 +790,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "vectorize_list_vectors",
+    name: "vectorize_listVectors",
     title: "List Vectors",
-    description: "Returns a paginated list of vector identifiers from the specified index.",
+    description: "Returns a paginated list of vector identifiers from the specified index.\n\nGET /accounts/{account_id}/vectorize/v2/indexes/{index_name}/list",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
-        "count": {
-          "default": 100,
-          "description": "Maximum number of vectors to return",
-          "type": "integer"
-        },
-        "cursor": {
-          "description": "Cursor for pagination to get the next page of results",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "count": {
+              "default": 100,
+              "description": "Maximum number of vectors to return",
+              "type": "integer"
+            },
+            "cursor": {
+              "description": "Cursor for pagination to get the next page of results",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name"
+        "path"
       ],
-      $defs: {
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-name": vectorize_index_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -846,12 +849,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_index-list-vectors-response": vectorize_index_list_vectors_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_vector-identifier": vectorize_vector_identifier_output,
-        "vectorize_vector-list-item": vectorize_vector_list_item_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_index-list-vectors-response": vectorize_index$$list$$vectors$$response,
+        "vectorize_messages": vectorize_messages,
+        "vectorize_vector-list-item": vectorize_vector$$list$$item,
       },
     },
     annotations: {
@@ -896,50 +898,57 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_index-list-vectors-response": vectorize_index_list_vectors_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_vector-identifier": vectorize_vector_identifier_output,
-        "vectorize_vector-list-item": vectorize_vector_list_item_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_index-list-vectors-response": vectorize_index$$list$$vectors$$response,
+        "vectorize_messages": vectorize_messages,
+        "vectorize_vector-list-item": vectorize_vector$$list$$item,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/vectorize/v2/indexes/${pathParam(args, "index_name")}/list`,
       query: [
-        ["count", args["count"], true],
-        ["cursor", args["cursor"], true],
+        ["count", param(args, "query", "count"), true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
     name: "vectorize_query",
     title: "Query Vectors",
-    description: "Finds vectors closest to a given vector in an index.",
+    description: "Finds vectors closest to a given vector in an index.\n\nPOST /accounts/{account_id}/vectorize/v2/indexes/{index_name}/query",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/vectorize_identifier",
-          "description": "Identifier"
-        },
         "body": {
           "$ref": "#/$defs/vectorize_index-query-v2-request"
         },
-        "index_name": {
-          "$ref": "#/$defs/vectorize_index-name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "index_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "index_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "index_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "vectorize_identifier": vectorize_identifier,
-        "vectorize_index-name": vectorize_index_name,
-        "vectorize_index-query-v2-request": vectorize_index_query_v2_request,
+        "vectorize_index-query-v2-request": vectorize_index$$query$$v2$$request,
       },
     },
     outputSchema: {
@@ -957,11 +966,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_index-query-v2-response": vectorize_index_query_v2_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_vector-identifier": vectorize_vector_identifier_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_index-query-v2-response": vectorize_index$$query$$v2$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     annotations: {
@@ -1001,12 +1009,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "vectorize_api-response-common": vectorize_api_response_common_output,
-        "vectorize_api-response-common-failure": vectorize_api_response_common_failure_output,
-        "vectorize_api-response-single": vectorize_api_response_single_output,
-        "vectorize_index-query-v2-response": vectorize_index_query_v2_response_output,
-        "vectorize_messages": vectorize_messages_output,
-        "vectorize_vector-identifier": vectorize_vector_identifier_output,
+        "vectorize_api-response-common": vectorize_api$$response$$common,
+        "vectorize_api-response-common-failure": vectorize_api$$response$$common$$failure,
+        "vectorize_api-response-single": vectorize_api$$response$$single,
+        "vectorize_index-query-v2-response": vectorize_index$$query$$v2$$response,
+        "vectorize_messages": vectorize_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/waitingRooms/accountWaitingRooms/outputs.ts b/src/generated/forge-mcp/waitingRooms/accountWaitingRooms/outputs.ts
index 48921b45b..d7a0b64e4 100644
--- a/src/generated/forge-mcp/waitingRooms/accountWaitingRooms/outputs.ts
+++ b/src/generated/forge-mcp/waitingRooms/accountWaitingRooms/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `waitingroom_response_collection` in responses.
  */
-export const waitingroom_response_collection_output: JsonSchema = {
+export const waitingroom_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-collection"
diff --git a/src/generated/forge-mcp/waitingRooms/accountWaitingRooms/tools.ts b/src/generated/forge-mcp/waitingRooms/accountWaitingRooms/tools.ts
index 4c8375e65..b5e65a17e 100644
--- a/src/generated/forge-mcp/waitingRooms/accountWaitingRooms/tools.ts
+++ b/src/generated/forge-mcp/waitingRooms/accountWaitingRooms/tools.ts
@@ -1,117 +1,85 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  waitingroom_additional_routes_output,
-  waitingroom_api_response_collection_output,
-  waitingroom_api_response_common_2_output,
-  waitingroom_api_response_common_failure_output,
-  waitingroom_cookie_attributes_output,
-  waitingroom_cookie_suffix_output,
-  waitingroom_custom_page_html_output,
-  waitingroom_default_template_language_output,
-  waitingroom_description_output,
-  waitingroom_disable_session_renewal_output,
-  waitingroom_enabled_origin_commands_output,
-  waitingroom_host_output,
-  waitingroom_json_response_enabled_output,
-  waitingroom_messages_output,
-  waitingroom_name_output,
-  waitingroom_new_users_per_minute_output,
-  waitingroom_next_event_prequeue_start_time_output,
-  waitingroom_next_event_start_time_output,
-  waitingroom_path_output,
-  waitingroom_queue_all_output,
-  waitingroom_queueing_method_output,
-  waitingroom_queueing_status_code_output,
-  waitingroom_session_duration_output,
-  waitingroom_suspended_output,
-  waitingroom_timestamp_output,
-  waitingroom_total_active_users_output,
-  waitingroom_turnstile_action_output,
-  waitingroom_turnstile_mode_output,
-  waitingroom_waiting_room_id_output,
-  waitingroom_waitingroom_output,
+  waitingroom_additional_routes,
+  waitingroom_api$$response$$collection,
+  waitingroom_api$$response$$common$$2,
+  waitingroom_api$$response$$common$$failure,
+  waitingroom_cookie_attributes,
+  waitingroom_enabled_origin_commands,
+  waitingroom_messages,
+  waitingroom_waitingroom,
 } from "../outputs.js";
-import { waitingroom_identifier } from "../schemas.js";
-import { waitingroom_response_collection_output } from "./outputs.js";
+import { waitingroom_response_collection } from "./outputs.js";
 
 /**
- * The tools of `waiting_rooms.account_waiting_rooms`.
+ * The tools of `waitingRooms.accountWaitingRooms`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "waiting_rooms_account_waiting_rooms_list",
+    name: "waitingRooms_accountWaitingRooms_list",
     title: "List waiting rooms for account or zone",
-    description: "Lists waiting rooms for account or zone.",
+    description: "Lists waiting rooms for account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/waiting_rooms",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
+          "type": "object"
         },
-        "per_page": {
-          "default": 25,
-          "description": "Maximum number of results per page. Must be a multiple of 5.",
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Maximum number of results per page. Must be a multiple of 5.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_response_collection",
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_response_collection": waitingroom_response_collection_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_response_collection": waitingroom_response_collection,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     annotations: {
@@ -151,44 +119,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_response_collection": waitingroom_response_collection_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_response_collection": waitingroom_response_collection,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/waiting_rooms`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/waitingRooms/events/details/outputs.ts b/src/generated/forge-mcp/waitingRooms/events/details/outputs.ts
index 7b61548fe..33c9e08dd 100644
--- a/src/generated/forge-mcp/waitingRooms/events/details/outputs.ts
+++ b/src/generated/forge-mcp/waitingRooms/events/details/outputs.ts
@@ -3,39 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `waitingroom_event_details_custom_page_html` in responses.
- */
-export const waitingroom_event_details_custom_page_html_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_details_disable_session_renewal` in
- * responses.
- */
-export const waitingroom_event_details_disable_session_renewal_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_event_details_new_users_per_minute` in responses.
- */
-export const waitingroom_event_details_new_users_per_minute_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_event_details_queueing_method` in responses.
- */
-export const waitingroom_event_details_queueing_method_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `waitingroom_event_details_response` in responses.
  */
-export const waitingroom_event_details_response_output: JsonSchema = {
+export const waitingroom_event_details_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-single"
@@ -54,70 +25,65 @@ export const waitingroom_event_details_response_output: JsonSchema = {
 /**
  * The schema of `waitingroom_event_details_result` in responses.
  */
-export const waitingroom_event_details_result_output: JsonSchema = {
+export const waitingroom_event_details_result: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/waitingroom_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "custom_page_html": {
-      "$ref": "#/$defs/waitingroom_event_details_custom_page_html"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/waitingroom_event_description"
+      "type": "string"
     },
     "disable_session_renewal": {
-      "$ref": "#/$defs/waitingroom_event_details_disable_session_renewal"
+      "type": "boolean"
     },
     "event_end_time": {
-      "$ref": "#/$defs/waitingroom_event_end_time"
+      "type": "string"
     },
     "event_start_time": {
-      "$ref": "#/$defs/waitingroom_event_start_time"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/waitingroom_event_id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/waitingroom_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/waitingroom_event_name"
+      "type": "string"
     },
     "new_users_per_minute": {
-      "$ref": "#/$defs/waitingroom_event_details_new_users_per_minute"
+      "type": "integer"
     },
     "prequeue_start_time": {
-      "$ref": "#/$defs/waitingroom_event_prequeue_start_time"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "queueing_method": {
-      "$ref": "#/$defs/waitingroom_event_details_queueing_method"
+      "type": "string"
     },
     "session_duration": {
-      "$ref": "#/$defs/waitingroom_event_details_session_duration"
+      "type": "integer"
     },
     "shuffle_at_event_start": {
-      "$ref": "#/$defs/waitingroom_event_shuffle_at_event_start"
+      "type": "boolean"
     },
     "suspended": {
-      "$ref": "#/$defs/waitingroom_event_suspended"
+      "type": "boolean"
     },
     "total_active_users": {
-      "$ref": "#/$defs/waitingroom_event_details_total_active_users"
+      "type": "integer"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `waitingroom_event_details_session_duration` in responses.
- */
-export const waitingroom_event_details_session_duration_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_event_details_total_active_users` in responses.
- */
-export const waitingroom_event_details_total_active_users_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/waitingRooms/events/details/tools.ts b/src/generated/forge-mcp/waitingRooms/events/details/tools.ts
index 6c560337b..82f5b515a 100644
--- a/src/generated/forge-mcp/waitingRooms/events/details/tools.ts
+++ b/src/generated/forge-mcp/waitingRooms/events/details/tools.ts
@@ -3,94 +3,62 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  waitingroom_api_response_common_failure_output,
-  waitingroom_api_response_common_output,
-  waitingroom_api_response_single_output,
-  waitingroom_messages_output,
-  waitingroom_timestamp_output,
+  waitingroom_api$$response$$common,
+  waitingroom_api$$response$$common$$failure,
+  waitingroom_api$$response$$single,
+  waitingroom_messages,
 } from "../../outputs.js";
 import {
-  waitingroom_identifier,
-  waitingroom_waiting_room_id,
-} from "../../schemas.js";
-import {
-  waitingroom_event_description_output,
-  waitingroom_event_end_time_output,
-  waitingroom_event_id_output,
-  waitingroom_event_name_output,
-  waitingroom_event_prequeue_start_time_output,
-  waitingroom_event_shuffle_at_event_start_output,
-  waitingroom_event_start_time_output,
-  waitingroom_event_suspended_output,
-} from "../outputs.js";
-import { waitingroom_event_id } from "../schemas.js";
-import {
-  waitingroom_event_details_custom_page_html_output,
-  waitingroom_event_details_disable_session_renewal_output,
-  waitingroom_event_details_new_users_per_minute_output,
-  waitingroom_event_details_queueing_method_output,
-  waitingroom_event_details_response_output,
-  waitingroom_event_details_result_output,
-  waitingroom_event_details_session_duration_output,
-  waitingroom_event_details_total_active_users_output,
+  waitingroom_event_details_response,
+  waitingroom_event_details_result,
 } from "./outputs.js";
 
 /**
- * The tools of `waiting_rooms.events.details`.
+ * The tools of `waitingRooms.events.details`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "waiting_rooms_events_details_get",
+    name: "waitingRooms_events_details_get",
     title: "Preview active event details",
-    description: "Previews an event's configuration as if it was active. Inherited fields from the waiting room will be displayed with their current values.",
+    description: "Previews an event's configuration as if it was active. Inherited fields from the waiting room will be displayed with their current values.\n\nGET /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}/details",
     inputSchema: {
       type: "object",
       properties: {
-        "event_id": {
-          "$ref": "#/$defs/waitingroom_event_id"
-        },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "event_id": {
+              "type": "string"
+            },
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
-        "event_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_event_id": waitingroom_event_id,
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_event_details_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_details_custom_page_html": waitingroom_event_details_custom_page_html_output,
-        "waitingroom_event_details_disable_session_renewal": waitingroom_event_details_disable_session_renewal_output,
-        "waitingroom_event_details_new_users_per_minute": waitingroom_event_details_new_users_per_minute_output,
-        "waitingroom_event_details_queueing_method": waitingroom_event_details_queueing_method_output,
-        "waitingroom_event_details_response": waitingroom_event_details_response_output,
-        "waitingroom_event_details_result": waitingroom_event_details_result_output,
-        "waitingroom_event_details_session_duration": waitingroom_event_details_session_duration_output,
-        "waitingroom_event_details_total_active_users": waitingroom_event_details_total_active_users_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_details_response": waitingroom_event_details_response,
+        "waitingroom_event_details_result": waitingroom_event_details_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     annotations: {
@@ -131,27 +99,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_details_custom_page_html": waitingroom_event_details_custom_page_html_output,
-        "waitingroom_event_details_disable_session_renewal": waitingroom_event_details_disable_session_renewal_output,
-        "waitingroom_event_details_new_users_per_minute": waitingroom_event_details_new_users_per_minute_output,
-        "waitingroom_event_details_queueing_method": waitingroom_event_details_queueing_method_output,
-        "waitingroom_event_details_response": waitingroom_event_details_response_output,
-        "waitingroom_event_details_result": waitingroom_event_details_result_output,
-        "waitingroom_event_details_session_duration": waitingroom_event_details_session_duration_output,
-        "waitingroom_event_details_total_active_users": waitingroom_event_details_total_active_users_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_details_response": waitingroom_event_details_response,
+        "waitingroom_event_details_result": waitingroom_event_details_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/waitingRooms/events/outputs.ts b/src/generated/forge-mcp/waitingRooms/events/outputs.ts
index 5bb9071c9..a6a719108 100644
--- a/src/generated/forge-mcp/waitingRooms/events/outputs.ts
+++ b/src/generated/forge-mcp/waitingRooms/events/outputs.ts
@@ -3,59 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `waitingroom_event_custom_page_html` in responses.
- */
-export const waitingroom_event_custom_page_html_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_description` in responses.
- */
-export const waitingroom_event_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_disable_session_renewal` in responses.
- */
-export const waitingroom_event_disable_session_renewal_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_end_time` in responses.
- */
-export const waitingroom_event_end_time_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_id` in responses.
- */
-export const waitingroom_event_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `waitingroom_event_id_response` in responses.
  */
-export const waitingroom_event_id_response_output: JsonSchema = {
+export const waitingroom_event_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-single"
@@ -65,7 +16,7 @@ export const waitingroom_event_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/waitingroom_event_id"
+              "type": "string"
             }
           },
           "type": "object"
@@ -76,59 +27,10 @@ export const waitingroom_event_id_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `waitingroom_event_name` in responses.
- */
-export const waitingroom_event_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_new_users_per_minute` in responses.
- */
-export const waitingroom_event_new_users_per_minute_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_prequeue_start_time` in responses.
- */
-export const waitingroom_event_prequeue_start_time_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_queueing_method` in responses.
- */
-export const waitingroom_event_queueing_method_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `waitingroom_event_response` in responses.
  */
-export const waitingroom_event_response_output: JsonSchema = {
+export const waitingroom_event_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-single"
@@ -147,7 +49,7 @@ export const waitingroom_event_response_output: JsonSchema = {
 /**
  * The schema of `waitingroom_event_response_collection` in responses.
  */
-export const waitingroom_event_response_collection_output: JsonSchema = {
+export const waitingroom_event_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-collection"
@@ -169,149 +71,137 @@ export const waitingroom_event_response_collection_output: JsonSchema = {
 /**
  * The schema of `waitingroom_event_result` in responses.
  */
-export const waitingroom_event_result_output: JsonSchema = {
+export const waitingroom_event_result: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/waitingroom_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "custom_page_html": {
-      "$ref": "#/$defs/waitingroom_event_custom_page_html"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "description": {
-      "$ref": "#/$defs/waitingroom_event_description"
+      "type": "string"
     },
     "disable_session_renewal": {
-      "$ref": "#/$defs/waitingroom_event_disable_session_renewal"
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "event_end_time": {
-      "$ref": "#/$defs/waitingroom_event_end_time"
+      "type": "string"
     },
     "event_start_time": {
-      "$ref": "#/$defs/waitingroom_event_start_time"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/waitingroom_event_id"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/waitingroom_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/waitingroom_event_name"
+      "type": "string"
     },
     "new_users_per_minute": {
-      "$ref": "#/$defs/waitingroom_event_new_users_per_minute"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "prequeue_start_time": {
-      "$ref": "#/$defs/waitingroom_event_prequeue_start_time"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "queueing_method": {
-      "$ref": "#/$defs/waitingroom_event_queueing_method"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "session_duration": {
-      "$ref": "#/$defs/waitingroom_event_session_duration"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "shuffle_at_event_start": {
-      "$ref": "#/$defs/waitingroom_event_shuffle_at_event_start"
+      "type": "boolean"
     },
     "suspended": {
-      "$ref": "#/$defs/waitingroom_event_suspended"
+      "type": "boolean"
     },
     "total_active_users": {
-      "$ref": "#/$defs/waitingroom_event_total_active_users"
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "turnstile_action": {
-      "$ref": "#/$defs/waitingroom_event_turnstile_action"
+      "oneOf": [
+        {
+          "enum": [
+            "log",
+            "infinite_queue"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "turnstile_mode": {
-      "$ref": "#/$defs/waitingroom_event_turnstile_mode"
+      "oneOf": [
+        {
+          "enum": [
+            "off",
+            "invisible",
+            "visible_non_interactive",
+            "visible_managed"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `waitingroom_event_session_duration` in responses.
- */
-export const waitingroom_event_session_duration_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_shuffle_at_event_start` in responses.
- */
-export const waitingroom_event_shuffle_at_event_start_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_event_start_time` in responses.
- */
-export const waitingroom_event_start_time_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_suspended` in responses.
- */
-export const waitingroom_event_suspended_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_event_total_active_users` in responses.
- */
-export const waitingroom_event_total_active_users_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_turnstile_action` in responses.
- */
-export const waitingroom_event_turnstile_action_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "log",
-        "infinite_queue"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_turnstile_mode` in responses.
- */
-export const waitingroom_event_turnstile_mode_output: JsonSchema = {
-  "oneOf": [
-    {
-      "enum": [
-        "off",
-        "invisible",
-        "visible_non_interactive",
-        "visible_managed"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/waitingRooms/events/schemas.ts b/src/generated/forge-mcp/waitingRooms/events/schemas.ts
index 67964e7c9..92f037ec6 100644
--- a/src/generated/forge-mcp/waitingRooms/events/schemas.ts
+++ b/src/generated/forge-mcp/waitingRooms/events/schemas.ts
@@ -3,273 +3,146 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `waitingroom_event_custom_page_html`.
- */
-export const waitingroom_event_custom_page_html: JsonSchema = {
-  "description": "If set, the event will override the waiting room's `custom_page_html` property while it is active. If null, the event will inherit it.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_description`.
- */
-export const waitingroom_event_description: JsonSchema = {
-  "description": "A note that you can use to add more details about the event.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_disable_session_renewal`.
- */
-export const waitingroom_event_disable_session_renewal: JsonSchema = {
-  "description": "If set, the event will override the waiting room's `disable_session_renewal` property while it is active. If null, the event will inherit it.",
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_end_time`.
- */
-export const waitingroom_event_end_time: JsonSchema = {
-  "description": "An ISO 8601 timestamp that marks the end of the event.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_id`.
- */
-export const waitingroom_event_id: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_name`.
- */
-export const waitingroom_event_name: JsonSchema = {
-  "description": "A unique name to identify the event. Only alphanumeric characters, hyphens and underscores are allowed.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_new_users_per_minute`.
- */
-export const waitingroom_event_new_users_per_minute: JsonSchema = {
-  "description": "If set, the event will override the waiting room's `new_users_per_minute` property while it is active. If null, the event will inherit it. This can only be set if the event's `total_active_users` property is also set.",
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_prequeue_start_time`.
- */
-export const waitingroom_event_prequeue_start_time: JsonSchema = {
-  "description": "An ISO 8601 timestamp that marks when to begin queueing all users before the event starts. The prequeue must start at least five minutes before `event_start_time`.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_queueing_method`.
- */
-export const waitingroom_event_queueing_method: JsonSchema = {
-  "description": "If set, the event will override the waiting room's `queueing_method` property while it is active. If null, the event will inherit it.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_session_duration`.
- */
-export const waitingroom_event_session_duration: JsonSchema = {
-  "description": "If set, the event will override the waiting room's `session_duration` property while it is active. If null, the event will inherit it.",
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_shuffle_at_event_start`.
- */
-export const waitingroom_event_shuffle_at_event_start: JsonSchema = {
-  "description": "If enabled, users in the prequeue will be shuffled randomly at the `event_start_time`. Requires that `prequeue_start_time` is not null. This is useful for situations when many users will join the event prequeue at the same time and you want to shuffle them to ensure fairness. Naturally, it makes the most sense to enable this feature when the `queueing_method` during the event respects ordering such as **fifo**, or else the shuffling may be unnecessary.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_event_start_time`.
- */
-export const waitingroom_event_start_time: JsonSchema = {
-  "description": "An ISO 8601 timestamp that marks the start of the event. At this time, queued users will be processed with the event's configuration. The start time must be at least one minute before `event_end_time`.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_event_suspended`.
- */
-export const waitingroom_event_suspended: JsonSchema = {
-  "description": "Suspends or allows an event. If set to `true`, the event is ignored and traffic will be handled based on the waiting room configuration.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_event_total_active_users`.
- */
-export const waitingroom_event_total_active_users: JsonSchema = {
-  "description": "If set, the event will override the waiting room's `total_active_users` property while it is active. If null, the event will inherit it. This can only be set if the event's `new_users_per_minute` property is also set.",
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_turnstile_action`.
- */
-export const waitingroom_event_turnstile_action: JsonSchema = {
-  "description": "If set, the event will override the waiting room's `turnstile_action` property while it is active. If null, the event will inherit it.",
-  "oneOf": [
-    {
-      "enum": [
-        "log",
-        "infinite_queue"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_event_turnstile_mode`.
- */
-export const waitingroom_event_turnstile_mode: JsonSchema = {
-  "description": "If set, the event will override the waiting room's `turnstile_mode` property while it is active. If null, the event will inherit it.",
-  "oneOf": [
-    {
-      "enum": [
-        "off",
-        "invisible",
-        "visible_non_interactive",
-        "visible_managed"
-      ],
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `waitingroom_query_event`.
  */
 export const waitingroom_query_event: JsonSchema = {
   "properties": {
     "custom_page_html": {
-      "$ref": "#/$defs/waitingroom_event_custom_page_html",
-      "description": "If set, the event will override the waiting room's `custom_page_html` property while it is active. If null, the event will inherit it."
+      "description": "If set, the event will override the waiting room's `custom_page_html` property while it is active. If null, the event will inherit it.",
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "description": {
-      "$ref": "#/$defs/waitingroom_event_description",
       "default": "",
-      "description": "A note that you can use to add more details about the event."
+      "description": "A note that you can use to add more details about the event.",
+      "type": "string"
     },
     "disable_session_renewal": {
-      "$ref": "#/$defs/waitingroom_event_disable_session_renewal",
-      "description": "If set, the event will override the waiting room's `disable_session_renewal` property while it is active. If null, the event will inherit it."
+      "description": "If set, the event will override the waiting room's `disable_session_renewal` property while it is active. If null, the event will inherit it.",
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "event_end_time": {
-      "$ref": "#/$defs/waitingroom_event_end_time",
-      "description": "An ISO 8601 timestamp that marks the end of the event."
+      "description": "An ISO 8601 timestamp that marks the end of the event.",
+      "type": "string"
     },
     "event_start_time": {
-      "$ref": "#/$defs/waitingroom_event_start_time",
-      "description": "An ISO 8601 timestamp that marks the start of the event. At this time, queued users will be processed with the event's configuration. The start time must be at least one minute before `event_end_time`."
+      "description": "An ISO 8601 timestamp that marks the start of the event. At this time, queued users will be processed with the event's configuration. The start time must be at least one minute before `event_end_time`.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/waitingroom_event_name",
-      "description": "A unique name to identify the event. Only alphanumeric characters, hyphens and underscores are allowed."
+      "description": "A unique name to identify the event. Only alphanumeric characters, hyphens and underscores are allowed.",
+      "type": "string"
     },
     "new_users_per_minute": {
-      "$ref": "#/$defs/waitingroom_event_new_users_per_minute",
-      "description": "If set, the event will override the waiting room's `new_users_per_minute` property while it is active. If null, the event will inherit it. This can only be set if the event's `total_active_users` property is also set."
+      "description": "If set, the event will override the waiting room's `new_users_per_minute` property while it is active. If null, the event will inherit it. This can only be set if the event's `total_active_users` property is also set.",
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "prequeue_start_time": {
-      "$ref": "#/$defs/waitingroom_event_prequeue_start_time",
-      "description": "An ISO 8601 timestamp that marks when to begin queueing all users before the event starts. The prequeue must start at least five minutes before `event_start_time`."
+      "description": "An ISO 8601 timestamp that marks when to begin queueing all users before the event starts. The prequeue must start at least five minutes before `event_start_time`.",
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "queueing_method": {
-      "$ref": "#/$defs/waitingroom_event_queueing_method",
-      "description": "If set, the event will override the waiting room's `queueing_method` property while it is active. If null, the event will inherit it."
+      "description": "If set, the event will override the waiting room's `queueing_method` property while it is active. If null, the event will inherit it.",
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "session_duration": {
-      "$ref": "#/$defs/waitingroom_event_session_duration",
-      "description": "If set, the event will override the waiting room's `session_duration` property while it is active. If null, the event will inherit it."
+      "description": "If set, the event will override the waiting room's `session_duration` property while it is active. If null, the event will inherit it.",
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "shuffle_at_event_start": {
-      "$ref": "#/$defs/waitingroom_event_shuffle_at_event_start",
       "default": false,
-      "description": "If enabled, users in the prequeue will be shuffled randomly at the `event_start_time`. Requires that `prequeue_start_time` is not null. This is useful for situations when many users will join the event prequeue at the same time and you want to shuffle them to ensure fairness. Naturally, it makes the most sense to enable this feature when the `queueing_method` during the event respects ordering such as **fifo**, or else the shuffling may be unnecessary."
+      "description": "If enabled, users in the prequeue will be shuffled randomly at the `event_start_time`. Requires that `prequeue_start_time` is not null. This is useful for situations when many users will join the event prequeue at the same time and you want to shuffle them to ensure fairness. Naturally, it makes the most sense to enable this feature when the `queueing_method` during the event respects ordering such as **fifo**, or else the shuffling may be unnecessary.",
+      "type": "boolean"
     },
     "suspended": {
-      "$ref": "#/$defs/waitingroom_event_suspended",
       "default": false,
-      "description": "Suspends or allows an event. If set to `true`, the event is ignored and traffic will be handled based on the waiting room configuration."
+      "description": "Suspends or allows an event. If set to `true`, the event is ignored and traffic will be handled based on the waiting room configuration.",
+      "type": "boolean"
     },
     "total_active_users": {
-      "$ref": "#/$defs/waitingroom_event_total_active_users",
-      "description": "If set, the event will override the waiting room's `total_active_users` property while it is active. If null, the event will inherit it. This can only be set if the event's `new_users_per_minute` property is also set."
+      "description": "If set, the event will override the waiting room's `total_active_users` property while it is active. If null, the event will inherit it. This can only be set if the event's `new_users_per_minute` property is also set.",
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "turnstile_action": {
-      "$ref": "#/$defs/waitingroom_event_turnstile_action",
-      "description": "If set, the event will override the waiting room's `turnstile_action` property while it is active. If null, the event will inherit it."
+      "description": "If set, the event will override the waiting room's `turnstile_action` property while it is active. If null, the event will inherit it.",
+      "oneOf": [
+        {
+          "enum": [
+            "log",
+            "infinite_queue"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "turnstile_mode": {
-      "$ref": "#/$defs/waitingroom_event_turnstile_mode",
-      "description": "If set, the event will override the waiting room's `turnstile_mode` property while it is active. If null, the event will inherit it."
+      "description": "If set, the event will override the waiting room's `turnstile_mode` property while it is active. If null, the event will inherit it.",
+      "oneOf": [
+        {
+          "enum": [
+            "off",
+            "invisible",
+            "visible_non_interactive",
+            "visible_managed"
+          ],
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/waitingRooms/events/tools.ts b/src/generated/forge-mcp/waitingRooms/events/tools.ts
index 0216767a7..612d55d0d 100644
--- a/src/generated/forge-mcp/waitingRooms/events/tools.ts
+++ b/src/generated/forge-mcp/waitingRooms/events/tools.ts
@@ -1,135 +1,72 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  waitingroom_api_response_collection_output,
-  waitingroom_api_response_common_2_output,
-  waitingroom_api_response_common_failure_output,
-  waitingroom_api_response_common_output,
-  waitingroom_api_response_single_output,
-  waitingroom_messages_output,
-  waitingroom_timestamp_output,
+  waitingroom_api$$response$$collection,
+  waitingroom_api$$response$$common,
+  waitingroom_api$$response$$common$$2,
+  waitingroom_api$$response$$common$$failure,
+  waitingroom_api$$response$$single,
+  waitingroom_messages,
 } from "../outputs.js";
 import {
-  waitingroom_identifier,
-  waitingroom_waiting_room_id,
-} from "../schemas.js";
-import {
-  waitingroom_event_custom_page_html_output,
-  waitingroom_event_description_output,
-  waitingroom_event_disable_session_renewal_output,
-  waitingroom_event_end_time_output,
-  waitingroom_event_id_output,
-  waitingroom_event_id_response_output,
-  waitingroom_event_name_output,
-  waitingroom_event_new_users_per_minute_output,
-  waitingroom_event_prequeue_start_time_output,
-  waitingroom_event_queueing_method_output,
-  waitingroom_event_response_collection_output,
-  waitingroom_event_response_output,
-  waitingroom_event_result_output,
-  waitingroom_event_session_duration_output,
-  waitingroom_event_shuffle_at_event_start_output,
-  waitingroom_event_start_time_output,
-  waitingroom_event_suspended_output,
-  waitingroom_event_total_active_users_output,
-  waitingroom_event_turnstile_action_output,
-  waitingroom_event_turnstile_mode_output,
+  waitingroom_event_id_response,
+  waitingroom_event_response,
+  waitingroom_event_response_collection,
+  waitingroom_event_result,
 } from "./outputs.js";
-import {
-  waitingroom_event_custom_page_html,
-  waitingroom_event_description,
-  waitingroom_event_disable_session_renewal,
-  waitingroom_event_end_time,
-  waitingroom_event_id,
-  waitingroom_event_name,
-  waitingroom_event_new_users_per_minute,
-  waitingroom_event_prequeue_start_time,
-  waitingroom_event_queueing_method,
-  waitingroom_event_session_duration,
-  waitingroom_event_shuffle_at_event_start,
-  waitingroom_event_start_time,
-  waitingroom_event_suspended,
-  waitingroom_event_total_active_users,
-  waitingroom_event_turnstile_action,
-  waitingroom_event_turnstile_mode,
-  waitingroom_query_event,
-} from "./schemas.js";
+import { waitingroom_query_event } from "./schemas.js";
 
 /**
- * The tools of `waiting_rooms.events`.
+ * The tools of `waitingRooms.events`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "waiting_rooms_events_create",
+    name: "waitingRooms_events_create",
     title: "Create event",
-    description: "Only available for the Waiting Room Advanced subscription. Creates an event for a waiting room. An event takes place during a specified period of time, temporarily changing the behavior of a waiting room. While the event is active, some of the properties in the event's configuration may either override or inherit from the waiting room's configuration. Note that events cannot overlap with each other, so only one event can be active at a time.",
+    description: "Only available for the Waiting Room Advanced subscription. Creates an event for a waiting room. An event takes place during a specified period of time, temporarily changing the behavior of a waiting room. While the event is active, some of the properties in the event's configuration may either override or inherit from the waiting room's configuration. Note that events cannot overlap with each other, so only one event can be active at a time.\n\nPOST /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_query_event"
         },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html,
-        "waitingroom_event_description": waitingroom_event_description,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal,
-        "waitingroom_event_end_time": waitingroom_event_end_time,
-        "waitingroom_event_name": waitingroom_event_name,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start,
-        "waitingroom_event_start_time": waitingroom_event_start_time,
-        "waitingroom_event_suspended": waitingroom_event_suspended,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode,
-        "waitingroom_identifier": waitingroom_identifier,
         "waitingroom_query_event": waitingroom_query_event,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_event_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response": waitingroom_event_response_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_response": waitingroom_event_response,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     annotations: {
@@ -166,29 +103,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response": waitingroom_event_response_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_response": waitingroom_event_response,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     request: (args) => ({
@@ -197,42 +117,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_events_delete",
+    name: "waitingRooms_events_delete",
     title: "Delete event",
-    description: "Deletes an event for a waiting room.\n\nConfirm with the user before calling this tool. This operation deletes the event from the waiting room.",
+    description: "Deletes an event for a waiting room.\n\nConfirm with the user before calling this tool. This operation deletes the event from the waiting room.\n\nDELETE /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "event_id": {
-          "$ref": "#/$defs/waitingroom_event_id"
-        },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "event_id": {
+              "type": "string"
+            },
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
-        "event_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_event_id": waitingroom_event_id,
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_event_id_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_id_response": waitingroom_event_id_response_output,
-        "waitingroom_messages": waitingroom_messages_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_id_response": waitingroom_event_id_response,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     annotations: {
@@ -272,12 +196,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_id_response": waitingroom_event_id_response_output,
-        "waitingroom_messages": waitingroom_messages_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_id_response": waitingroom_event_id_response,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     request: (args) => ({
@@ -285,79 +208,54 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_events_edit",
+    name: "waitingRooms_events_edit",
     title: "Patch event",
-    description: "Patches a configured event for a waiting room.",
+    description: "Patches a configured event for a waiting room.\n\nPATCH /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_query_event"
         },
-        "event_id": {
-          "$ref": "#/$defs/waitingroom_event_id"
-        },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "event_id": {
+              "type": "string"
+            },
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
-        "event_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html,
-        "waitingroom_event_description": waitingroom_event_description,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal,
-        "waitingroom_event_end_time": waitingroom_event_end_time,
-        "waitingroom_event_id": waitingroom_event_id,
-        "waitingroom_event_name": waitingroom_event_name,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start,
-        "waitingroom_event_start_time": waitingroom_event_start_time,
-        "waitingroom_event_suspended": waitingroom_event_suspended,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode,
-        "waitingroom_identifier": waitingroom_identifier,
         "waitingroom_query_event": waitingroom_query_event,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_event_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response": waitingroom_event_response_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_response": waitingroom_event_response,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     annotations: {
@@ -397,29 +295,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response": waitingroom_event_response_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_response": waitingroom_event_response,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     request: (args) => ({
@@ -428,59 +309,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_events_get",
+    name: "waitingRooms_events_get",
     title: "Event details",
-    description: "Fetches a single configured event for a waiting room.",
+    description: "Fetches a single configured event for a waiting room.\n\nGET /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "event_id": {
-          "$ref": "#/$defs/waitingroom_event_id"
-        },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "event_id": {
+              "type": "string"
+            },
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
-        "event_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_event_id": waitingroom_event_id,
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_event_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response": waitingroom_event_response_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_response": waitingroom_event_response,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     annotations: {
@@ -521,29 +390,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response": waitingroom_event_response_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_response": waitingroom_event_response,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     request: (args) => ({
@@ -551,64 +403,59 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_events_list",
+    name: "waitingRooms_events_list",
     title: "List events",
-    description: "Lists events for a waiting room.",
+    description: "Lists events for a waiting room.\n\nGET /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events",
     inputSchema: {
       type: "object",
       properties: {
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 25,
-          "description": "Maximum number of results per page. Must be a multiple of 5.",
-          "type": "number"
-        },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Maximum number of results per page. Must be a multiple of 5.",
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_event_response_collection",
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response_collection": waitingroom_event_response_collection_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_event_response_collection": waitingroom_event_response_collection,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     annotations: {
@@ -649,113 +496,71 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response_collection": waitingroom_event_response_collection_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_event_response_collection": waitingroom_event_response_collection,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/waiting_rooms/${pathParam(args, "waiting_room_id")}/events`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "waiting_rooms_events_update",
+    name: "waitingRooms_events_update",
     title: "Update event",
-    description: "Updates a configured event for a waiting room.",
+    description: "Updates a configured event for a waiting room.\n\nPUT /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_query_event"
         },
-        "event_id": {
-          "$ref": "#/$defs/waitingroom_event_id"
-        },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "event_id": {
+              "type": "string"
+            },
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id",
+            "event_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
-        "event_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html,
-        "waitingroom_event_description": waitingroom_event_description,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal,
-        "waitingroom_event_end_time": waitingroom_event_end_time,
-        "waitingroom_event_id": waitingroom_event_id,
-        "waitingroom_event_name": waitingroom_event_name,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start,
-        "waitingroom_event_start_time": waitingroom_event_start_time,
-        "waitingroom_event_suspended": waitingroom_event_suspended,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode,
-        "waitingroom_identifier": waitingroom_identifier,
         "waitingroom_query_event": waitingroom_query_event,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_event_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response": waitingroom_event_response_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_response": waitingroom_event_response,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     annotations: {
@@ -795,29 +600,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_event_custom_page_html": waitingroom_event_custom_page_html_output,
-        "waitingroom_event_description": waitingroom_event_description_output,
-        "waitingroom_event_disable_session_renewal": waitingroom_event_disable_session_renewal_output,
-        "waitingroom_event_end_time": waitingroom_event_end_time_output,
-        "waitingroom_event_id": waitingroom_event_id_output,
-        "waitingroom_event_name": waitingroom_event_name_output,
-        "waitingroom_event_new_users_per_minute": waitingroom_event_new_users_per_minute_output,
-        "waitingroom_event_prequeue_start_time": waitingroom_event_prequeue_start_time_output,
-        "waitingroom_event_queueing_method": waitingroom_event_queueing_method_output,
-        "waitingroom_event_response": waitingroom_event_response_output,
-        "waitingroom_event_result": waitingroom_event_result_output,
-        "waitingroom_event_session_duration": waitingroom_event_session_duration_output,
-        "waitingroom_event_shuffle_at_event_start": waitingroom_event_shuffle_at_event_start_output,
-        "waitingroom_event_start_time": waitingroom_event_start_time_output,
-        "waitingroom_event_suspended": waitingroom_event_suspended_output,
-        "waitingroom_event_total_active_users": waitingroom_event_total_active_users_output,
-        "waitingroom_event_turnstile_action": waitingroom_event_turnstile_action_output,
-        "waitingroom_event_turnstile_mode": waitingroom_event_turnstile_mode_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_event_response": waitingroom_event_response,
+        "waitingroom_event_result": waitingroom_event_result,
+        "waitingroom_messages": waitingroom_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/waitingRooms/outputs.ts b/src/generated/forge-mcp/waitingRooms/outputs.ts
index 2f4d75791..8ba52ef25 100644
--- a/src/generated/forge-mcp/waitingRooms/outputs.ts
+++ b/src/generated/forge-mcp/waitingRooms/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `waitingroom_additional_routes` in responses.
  */
-export const waitingroom_additional_routes_output: JsonSchema = {
+export const waitingroom_additional_routes: JsonSchema = {
   "items": {
     "properties": {
       "host": {
@@ -24,7 +24,7 @@ export const waitingroom_additional_routes_output: JsonSchema = {
 /**
  * The schema of `waitingroom_api-response-collection` in responses.
  */
-export const waitingroom_api_response_collection_output: JsonSchema = {
+export const waitingroom_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-common-2"
@@ -60,7 +60,7 @@ export const waitingroom_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `waitingroom_api-response-common` in responses.
  */
-export const waitingroom_api_response_common_output: JsonSchema = {
+export const waitingroom_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/waitingroom_messages"
@@ -94,7 +94,7 @@ export const waitingroom_api_response_common_output: JsonSchema = {
 /**
  * The schema of `waitingroom_api-response-common-2` in responses.
  */
-export const waitingroom_api_response_common_2_output: JsonSchema = {
+export const waitingroom_api$$response$$common$$2: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/waitingroom_messages"
@@ -120,7 +120,7 @@ export const waitingroom_api_response_common_2_output: JsonSchema = {
 /**
  * The schema of `waitingroom_api-response-common-failure` in responses.
  */
-export const waitingroom_api_response_common_failure_output: JsonSchema = {
+export const waitingroom_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/waitingroom_messages"
@@ -150,7 +150,7 @@ export const waitingroom_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `waitingroom_api-response-single` in responses.
  */
-export const waitingroom_api_response_single_output: JsonSchema = {
+export const waitingroom_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-common"
@@ -176,7 +176,7 @@ export const waitingroom_api_response_single_output: JsonSchema = {
 /**
  * The schema of `waitingroom_cookie_attributes` in responses.
  */
-export const waitingroom_cookie_attributes_output: JsonSchema = {
+export const waitingroom_cookie_attributes: JsonSchema = {
   "properties": {
     "samesite": {
       "enum": [
@@ -199,86 +199,10 @@ export const waitingroom_cookie_attributes_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `waitingroom_cookie_suffix` in responses.
- */
-export const waitingroom_cookie_suffix_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_custom_page_html` in responses.
- */
-export const waitingroom_custom_page_html_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_default_template_language` in responses.
- */
-export const waitingroom_default_template_language_output: JsonSchema = {
-  "enum": [
-    "en-US",
-    "es-ES",
-    "de-DE",
-    "fr-FR",
-    "it-IT",
-    "ja-JP",
-    "ko-KR",
-    "pt-BR",
-    "zh-CN",
-    "zh-TW",
-    "nl-NL",
-    "pl-PL",
-    "id-ID",
-    "tr-TR",
-    "ar-EG",
-    "ru-RU",
-    "fa-IR",
-    "bg-BG",
-    "hr-HR",
-    "cs-CZ",
-    "da-DK",
-    "fi-FI",
-    "lt-LT",
-    "lv-LV",
-    "ms-MY",
-    "nb-NO",
-    "ro-RO",
-    "el-GR",
-    "he-IL",
-    "hi-IN",
-    "hu-HU",
-    "sr-BA",
-    "sk-SK",
-    "sl-SI",
-    "sv-SE",
-    "tl-PH",
-    "th-TH",
-    "uk-UA",
-    "vi-VN"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_description` in responses.
- */
-export const waitingroom_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_disable_session_renewal` in responses.
- */
-export const waitingroom_disable_session_renewal_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `waitingroom_enabled_origin_commands` in responses.
  */
-export const waitingroom_enabled_origin_commands_output: JsonSchema = {
+export const waitingroom_enabled_origin_commands: JsonSchema = {
   "items": {
     "enum": [
       "revoke"
@@ -288,24 +212,10 @@ export const waitingroom_enabled_origin_commands_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `waitingroom_host` in responses.
- */
-export const waitingroom_host_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_json_response_enabled` in responses.
- */
-export const waitingroom_json_response_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `waitingroom_messages` in responses.
  */
-export const waitingroom_messages_output: JsonSchema = {
+export const waitingroom_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -335,98 +245,10 @@ export const waitingroom_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `waitingroom_name` in responses.
- */
-export const waitingroom_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_new_users_per_minute` in responses.
- */
-export const waitingroom_new_users_per_minute_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_next_event_prequeue_start_time` in responses.
- */
-export const waitingroom_next_event_prequeue_start_time_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_next_event_start_time` in responses.
- */
-export const waitingroom_next_event_start_time_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `waitingroom_path` in responses.
- */
-export const waitingroom_path_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_queue_all` in responses.
- */
-export const waitingroom_queue_all_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_queueing_method` in responses.
- */
-export const waitingroom_queueing_method_output: JsonSchema = {
-  "enum": [
-    "fifo",
-    "random",
-    "passthrough",
-    "reject"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_queueing_status_code` in responses.
- */
-export const waitingroom_queueing_status_code_output: JsonSchema = {
-  "enum": [
-    200,
-    202,
-    429
-  ],
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_session_duration` in responses.
- */
-export const waitingroom_session_duration_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `waitingroom_single_response` in responses.
  */
-export const waitingroom_single_response_output: JsonSchema = {
+export const waitingroom_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-single"
@@ -442,63 +264,10 @@ export const waitingroom_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `waitingroom_suspended` in responses.
- */
-export const waitingroom_suspended_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_timestamp` in responses.
- */
-export const waitingroom_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_total_active_users` in responses.
- */
-export const waitingroom_total_active_users_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_turnstile_action` in responses.
- */
-export const waitingroom_turnstile_action_output: JsonSchema = {
-  "enum": [
-    "log",
-    "infinite_queue"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_turnstile_mode` in responses.
- */
-export const waitingroom_turnstile_mode_output: JsonSchema = {
-  "enum": [
-    "off",
-    "invisible",
-    "visible_non_interactive",
-    "visible_managed"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_waiting_room_id` in responses.
- */
-export const waitingroom_waiting_room_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `waitingroom_waiting_room_id_response` in responses.
  */
-export const waitingroom_waiting_room_id_response_output: JsonSchema = {
+export const waitingroom_waiting_room_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-single"
@@ -508,7 +277,7 @@ export const waitingroom_waiting_room_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/waitingroom_waiting_room_id"
+              "type": "string"
             }
           },
           "type": "object"
@@ -522,7 +291,7 @@ export const waitingroom_waiting_room_id_response_output: JsonSchema = {
 /**
  * The schema of `waitingroom_waitingroom` in responses.
  */
-export const waitingroom_waitingroom_output: JsonSchema = {
+export const waitingroom_waitingroom: JsonSchema = {
   "properties": {
     "additional_routes": {
       "$ref": "#/$defs/waitingroom_additional_routes"
@@ -531,76 +300,154 @@ export const waitingroom_waitingroom_output: JsonSchema = {
       "$ref": "#/$defs/waitingroom_cookie_attributes"
     },
     "cookie_suffix": {
-      "$ref": "#/$defs/waitingroom_cookie_suffix"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/waitingroom_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "custom_page_html": {
-      "$ref": "#/$defs/waitingroom_custom_page_html"
+      "type": "string"
     },
     "default_template_language": {
-      "$ref": "#/$defs/waitingroom_default_template_language"
+      "enum": [
+        "en-US",
+        "es-ES",
+        "de-DE",
+        "fr-FR",
+        "it-IT",
+        "ja-JP",
+        "ko-KR",
+        "pt-BR",
+        "zh-CN",
+        "zh-TW",
+        "nl-NL",
+        "pl-PL",
+        "id-ID",
+        "tr-TR",
+        "ar-EG",
+        "ru-RU",
+        "fa-IR",
+        "bg-BG",
+        "hr-HR",
+        "cs-CZ",
+        "da-DK",
+        "fi-FI",
+        "lt-LT",
+        "lv-LV",
+        "ms-MY",
+        "nb-NO",
+        "ro-RO",
+        "el-GR",
+        "he-IL",
+        "hi-IN",
+        "hu-HU",
+        "sr-BA",
+        "sk-SK",
+        "sl-SI",
+        "sv-SE",
+        "tl-PH",
+        "th-TH",
+        "uk-UA",
+        "vi-VN"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/waitingroom_description"
+      "type": "string"
     },
     "disable_session_renewal": {
-      "$ref": "#/$defs/waitingroom_disable_session_renewal"
+      "type": "boolean"
     },
     "enabled_origin_commands": {
       "$ref": "#/$defs/waitingroom_enabled_origin_commands"
     },
     "host": {
-      "$ref": "#/$defs/waitingroom_host"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/waitingroom_waiting_room_id"
+      "type": "string"
     },
     "json_response_enabled": {
-      "$ref": "#/$defs/waitingroom_json_response_enabled"
+      "type": "boolean"
     },
     "modified_on": {
-      "$ref": "#/$defs/waitingroom_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/waitingroom_name"
+      "type": "string"
     },
     "new_users_per_minute": {
-      "$ref": "#/$defs/waitingroom_new_users_per_minute"
+      "type": "integer"
     },
     "next_event_prequeue_start_time": {
-      "$ref": "#/$defs/waitingroom_next_event_prequeue_start_time"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "next_event_start_time": {
-      "$ref": "#/$defs/waitingroom_next_event_start_time"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "path": {
-      "$ref": "#/$defs/waitingroom_path"
+      "type": "string"
     },
     "queue_all": {
-      "$ref": "#/$defs/waitingroom_queue_all"
+      "type": "boolean"
     },
     "queueing_method": {
-      "$ref": "#/$defs/waitingroom_queueing_method"
+      "enum": [
+        "fifo",
+        "random",
+        "passthrough",
+        "reject"
+      ],
+      "type": "string"
     },
     "queueing_status_code": {
-      "$ref": "#/$defs/waitingroom_queueing_status_code"
+      "enum": [
+        200,
+        202,
+        429
+      ],
+      "type": "integer"
     },
     "session_duration": {
-      "$ref": "#/$defs/waitingroom_session_duration"
+      "type": "integer"
     },
     "suspended": {
-      "$ref": "#/$defs/waitingroom_suspended"
+      "type": "boolean"
     },
     "total_active_users": {
-      "$ref": "#/$defs/waitingroom_total_active_users"
+      "type": "integer"
     },
     "turnstile_action": {
-      "$ref": "#/$defs/waitingroom_turnstile_action"
+      "enum": [
+        "log",
+        "infinite_queue"
+      ],
+      "type": "string"
     },
     "turnstile_mode": {
-      "$ref": "#/$defs/waitingroom_turnstile_mode"
+      "enum": [
+        "off",
+        "invisible",
+        "visible_non_interactive",
+        "visible_managed"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/waitingRooms/page/outputs.ts b/src/generated/forge-mcp/waitingRooms/page/outputs.ts
index 5fcc66049..f9b0458e7 100644
--- a/src/generated/forge-mcp/waitingRooms/page/outputs.ts
+++ b/src/generated/forge-mcp/waitingRooms/page/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `waitingroom_preview_response` in responses.
  */
-export const waitingroom_preview_response_output: JsonSchema = {
+export const waitingroom_preview_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-single"
@@ -16,7 +16,7 @@ export const waitingroom_preview_response_output: JsonSchema = {
         "result": {
           "properties": {
             "preview_url": {
-              "$ref": "#/$defs/waitingroom_preview_url"
+              "type": "string"
             }
           },
           "type": "object"
@@ -26,10 +26,3 @@ export const waitingroom_preview_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `waitingroom_preview_url` in responses.
- */
-export const waitingroom_preview_url_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/waitingRooms/page/schemas.ts b/src/generated/forge-mcp/waitingRooms/page/schemas.ts
index 20284ba7c..d1f884047 100644
--- a/src/generated/forge-mcp/waitingRooms/page/schemas.ts
+++ b/src/generated/forge-mcp/waitingRooms/page/schemas.ts
@@ -9,9 +9,9 @@ import type { JsonSchema } from "../../_/tool.js";
 export const waitingroom_query_preview: JsonSchema = {
   "properties": {
     "custom_html": {
-      "$ref": "#/$defs/waitingroom_custom_page_html",
       "default": "",
-      "description": "Only available for the Waiting Room Advanced subscription. This is a template html file that will be rendered at the edge. If no custom_page_html is provided, the default waiting room will be used. The template is based on mustache ( https://mustache.github.io/ ). There are several variables that are evaluated by the Cloudflare edge:\n1. {{`waitTimeKnown`}} Acts like a boolean value that indicates the behavior to take when wait time is not available, for instance when queue_all is **true**.\n2. {{`waitTimeFormatted`}} Estimated wait time for the user. For example, five minutes. Alternatively, you can use:\n3. {{`waitTime`}} Number of minutes of estimated wait for a user.\n4. {{`waitTimeHours`}} Number of hours of estimated wait for a user (`Math.floor(waitTime/60)`).\n5. {{`waitTimeHourMinutes`}} Number of minutes above the `waitTimeHours` value (`waitTime%60`).\n6. {{`queueIsFull`}} Changes to **true** when no more people can be added to the queue.\n\nTo view the full list of variables, look at the `cfWaitingRoom` object described under the `json_response_enabled` property in other Waiting Room API calls."
+      "description": "Only available for the Waiting Room Advanced subscription. This is a template html file that will be rendered at the edge. If no custom_page_html is provided, the default waiting room will be used. The template is based on mustache ( https://mustache.github.io/ ). There are several variables that are evaluated by the Cloudflare edge:\n1. {{`waitTimeKnown`}} Acts like a boolean value that indicates the behavior to take when wait time is not available, for instance when queue_all is **true**.\n2. {{`waitTimeFormatted`}} Estimated wait time for the user. For example, five minutes. Alternatively, you can use:\n3. {{`waitTime`}} Number of minutes of estimated wait for a user.\n4. {{`waitTimeHours`}} Number of hours of estimated wait for a user (`Math.floor(waitTime/60)`).\n5. {{`waitTimeHourMinutes`}} Number of minutes above the `waitTimeHours` value (`waitTime%60`).\n6. {{`queueIsFull`}} Changes to **true** when no more people can be added to the queue.\n\nTo view the full list of variables, look at the `cfWaitingRoom` object described under the `json_response_enabled` property in other Waiting Room API calls.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/waitingRooms/page/tools.ts b/src/generated/forge-mcp/waitingRooms/page/tools.ts
index 9b4ba656a..a05ec03b3 100644
--- a/src/generated/forge-mcp/waitingRooms/page/tools.ts
+++ b/src/generated/forge-mcp/waitingRooms/page/tools.ts
@@ -3,58 +3,58 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  waitingroom_api_response_common_failure_output,
-  waitingroom_api_response_common_output,
-  waitingroom_api_response_single_output,
-  waitingroom_messages_output,
+  waitingroom_api$$response$$common,
+  waitingroom_api$$response$$common$$failure,
+  waitingroom_api$$response$$single,
+  waitingroom_messages,
 } from "../outputs.js";
-import {
-  waitingroom_custom_page_html,
-  waitingroom_identifier,
-} from "../schemas.js";
-import {
-  waitingroom_preview_response_output,
-  waitingroom_preview_url_output,
-} from "./outputs.js";
+import { waitingroom_preview_response } from "./outputs.js";
 import { waitingroom_query_preview } from "./schemas.js";
 
 /**
- * The tools of `waiting_rooms.page`.
+ * The tools of `waitingRooms.page`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "waiting_rooms_page_preview",
+    name: "waitingRooms_page_preview",
     title: "Create a custom waiting room page preview",
-    description: "Creates a waiting room page preview. Upload a custom waiting room page for preview. You will receive a preview URL in the form `http://waitingrooms.dev/preview/<uuid>`. You can use the following query parameters to change the state of the preview:\n1. `force_queue`: Boolean indicating if all users will be queued in the waiting room and no one will be let into the origin website (also known as queueAll).\n2. `queue_is_full`: Boolean indicating if the waiting room's queue is currently full and not accepting new users at the moment.\n3. `queueing_method`: The queueing method currently used by the waiting room.\n\t- **fifo** indicates a FIFO queue.\n\t- **random** indicates a Random queue.\n\t- **passthrough** indicates a Passthrough queue. Keep in mind that the waiting room page will only be displayed if `force_queue=true` or `event=prequeueing` — for other cases the request will pass through to the origin. For our preview, this will be a fake origin website returning \\\"Welcome\\\". \n\t- **reject** indicates a Reject queue.\n4. `event`: Used to preview a waiting room event.\n\t- **none** indicates no event is occurring.\n\t- **prequeueing** indicates that an event is prequeueing (between `prequeue_start_time` and `event_start_time`).\n\t- **started** indicates that an event has started (between `event_start_time` and `event_end_time`).\n5. `shuffle_at_event_start`: Boolean indicating if the event will shuffle users in the prequeue when it starts. This can only be set to **true** if an event is active (`event` is not **none**).\n\nFor example, you can make a request to `http://waitingrooms.dev/preview/<uuid>?force_queue=false&queue_is_full=false&queueing_method=random&event=started&shuffle_at_event_start=true`\n6. `waitTime`: Non-zero, positive integer indicating the estimated wait time in minutes. The default value is 10 minutes.\n\nFor example, you can make a request to `http://waitingrooms.dev/preview/<uuid>?waitTime=50` to configure the estimated wait time as 50 minutes.",
+    description: "Creates a waiting room page preview. Upload a custom waiting room page for preview. You will receive a preview URL in the form `http://waitingrooms.dev/preview/<uuid>`. You can use the following query parameters to change the state of the preview:\n1. `force_queue`: Boolean indicating if all users will be queued in the waiting room and no one will be let into the origin website (also known as queueAll).\n2. `queue_is_full`: Boolean indicating if the waiting room's queue is currently full and not accepting new users at the moment.\n3. `queueing_method`: The queueing method currently used by the waiting room.\n\t- **fifo** indicates a FIFO queue.\n\t- **random** indicates a Random queue.\n\t- **passthrough** indicates a Passthrough queue. Keep in mind that the waiting room page will only be displayed if `force_queue=true` or `event=prequeueing` — for other cases the request will pass through to the origin. For our preview, this will be a fake origin website returning \\\"Welcome\\\". \n\t- **reject** indicates a Reject queue.\n4. `event`: Used to preview a waiting room event.\n\t- **none** indicates no event is occurring.\n\t- **prequeueing** indicates that an event is prequeueing (between `prequeue_start_time` and `event_start_time`).\n\t- **started** indicates that an event has started (between `event_start_time` and `event_end_time`).\n5. `shuffle_at_event_start`: Boolean indicating if the event will shuffle users in the prequeue when it starts. This can only be set to **true** if an event is active (`event` is not **none**).\n\nFor example, you can make a request to `http://waitingrooms.dev/preview/<uuid>?force_queue=false&queue_is_full=false&queueing_method=random&event=started&shuffle_at_event_start=true`\n6. `waitTime`: Non-zero, positive integer indicating the estimated wait time in minutes. The default value is 10 minutes.\n\nFor example, you can make a request to `http://waitingrooms.dev/preview/<uuid>?waitTime=50` to configure the estimated wait time as 50 minutes.\n\nPOST /zones/{zone_id}/waiting_rooms/preview",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_query_preview"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_custom_page_html": waitingroom_custom_page_html,
-        "waitingroom_identifier": waitingroom_identifier,
         "waitingroom_query_preview": waitingroom_query_preview,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_preview_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_preview_response": waitingroom_preview_response_output,
-        "waitingroom_preview_url": waitingroom_preview_url_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_preview_response": waitingroom_preview_response,
       },
     },
     annotations: {
@@ -94,12 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_preview_response": waitingroom_preview_response_output,
-        "waitingroom_preview_url": waitingroom_preview_url_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_preview_response": waitingroom_preview_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/waitingRooms/rules/outputs.ts b/src/generated/forge-mcp/waitingRooms/rules/outputs.ts
index da7bcc6cd..e22277361 100644
--- a/src/generated/forge-mcp/waitingRooms/rules/outputs.ts
+++ b/src/generated/forge-mcp/waitingRooms/rules/outputs.ts
@@ -3,85 +3,44 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `waitingroom_rule_action` in responses.
- */
-export const waitingroom_rule_action_output: JsonSchema = {
-  "enum": [
-    "bypass_waiting_room"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_rule_description` in responses.
- */
-export const waitingroom_rule_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_rule_enabled` in responses.
- */
-export const waitingroom_rule_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_rule_expression` in responses.
- */
-export const waitingroom_rule_expression_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_rule_id` in responses.
- */
-export const waitingroom_rule_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `waitingroom_rule_result` in responses.
  */
-export const waitingroom_rule_result_output: JsonSchema = {
+export const waitingroom_rule_result: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/waitingroom_rule_action"
+      "enum": [
+        "bypass_waiting_room"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/waitingroom_rule_description"
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/waitingroom_rule_enabled"
+      "type": "boolean"
     },
     "expression": {
-      "$ref": "#/$defs/waitingroom_rule_expression"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/waitingroom_rule_id"
+      "type": "string"
     },
     "last_updated": {
-      "$ref": "#/$defs/waitingroom_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/waitingroom_rule_version"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `waitingroom_rule_version` in responses.
- */
-export const waitingroom_rule_version_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `waitingroom_rules_response_collection` in responses.
  */
-export const waitingroom_rules_response_collection_output: JsonSchema = {
+export const waitingroom_rules_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-collection"
diff --git a/src/generated/forge-mcp/waitingRooms/rules/schemas.ts b/src/generated/forge-mcp/waitingRooms/rules/schemas.ts
index 774b0c5e2..2cce6a66c 100644
--- a/src/generated/forge-mcp/waitingRooms/rules/schemas.ts
+++ b/src/generated/forge-mcp/waitingRooms/rules/schemas.ts
@@ -9,22 +9,25 @@ import type { JsonSchema } from "../../_/tool.js";
 export const waitingroom_create_rule: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/waitingroom_rule_action",
-      "description": "The action to take when the expression matches."
+      "description": "The action to take when the expression matches.",
+      "enum": [
+        "bypass_waiting_room"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/waitingroom_rule_description",
       "default": "",
-      "description": "The description of the rule."
+      "description": "The description of the rule.",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/waitingroom_rule_enabled",
       "default": true,
-      "description": "When set to true, the rule is enabled."
+      "description": "When set to true, the rule is enabled.",
+      "type": "boolean"
     },
     "expression": {
-      "$ref": "#/$defs/waitingroom_rule_expression",
-      "description": "Criteria defining when there is a match for the current rule."
+      "description": "Criteria defining when there is a match for the current rule.",
+      "type": "string"
     }
   },
   "required": [
@@ -40,22 +43,25 @@ export const waitingroom_create_rule: JsonSchema = {
 export const waitingroom_patch_rule: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/waitingroom_rule_action",
-      "description": "The action to take when the expression matches."
+      "description": "The action to take when the expression matches.",
+      "enum": [
+        "bypass_waiting_room"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/waitingroom_rule_description",
       "default": "",
-      "description": "The description of the rule."
+      "description": "The description of the rule.",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/waitingroom_rule_enabled",
       "default": true,
-      "description": "When set to true, the rule is enabled."
+      "description": "When set to true, the rule is enabled.",
+      "type": "boolean"
     },
     "expression": {
-      "$ref": "#/$defs/waitingroom_rule_expression",
-      "description": "Criteria defining when there is a match for the current rule."
+      "description": "Criteria defining when there is a match for the current rule.",
+      "type": "string"
     },
     "position": {
       "$ref": "#/$defs/waitingroom_rule_position",
@@ -69,49 +75,6 @@ export const waitingroom_patch_rule: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `waitingroom_rule_action`.
- */
-export const waitingroom_rule_action: JsonSchema = {
-  "description": "The action to take when the expression matches.",
-  "enum": [
-    "bypass_waiting_room"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_rule_description`.
- */
-export const waitingroom_rule_description: JsonSchema = {
-  "description": "The description of the rule.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_rule_enabled`.
- */
-export const waitingroom_rule_enabled: JsonSchema = {
-  "description": "When set to true, the rule is enabled.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_rule_expression`.
- */
-export const waitingroom_rule_expression: JsonSchema = {
-  "description": "Criteria defining when there is a match for the current rule.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_rule_id`.
- */
-export const waitingroom_rule_id: JsonSchema = {
-  "description": "The ID of the rule.",
-  "type": "string"
-};
-
 /**
  * The schema of `waitingroom_rule_position`.
  */
diff --git a/src/generated/forge-mcp/waitingRooms/rules/tools.ts b/src/generated/forge-mcp/waitingRooms/rules/tools.ts
index 5852ec2d9..9b0be3f2d 100644
--- a/src/generated/forge-mcp/waitingRooms/rules/tools.ts
+++ b/src/generated/forge-mcp/waitingRooms/rules/tools.ts
@@ -3,90 +3,71 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  waitingroom_api_response_collection_output,
-  waitingroom_api_response_common_2_output,
-  waitingroom_api_response_common_failure_output,
-  waitingroom_messages_output,
-  waitingroom_timestamp_output,
+  waitingroom_api$$response$$collection,
+  waitingroom_api$$response$$common$$2,
+  waitingroom_api$$response$$common$$failure,
+  waitingroom_messages,
 } from "../outputs.js";
 import {
-  waitingroom_identifier,
-  waitingroom_waiting_room_id,
-} from "../schemas.js";
-import {
-  waitingroom_rule_action_output,
-  waitingroom_rule_description_output,
-  waitingroom_rule_enabled_output,
-  waitingroom_rule_expression_output,
-  waitingroom_rule_id_output,
-  waitingroom_rule_result_output,
-  waitingroom_rule_version_output,
-  waitingroom_rules_response_collection_output,
+  waitingroom_rule_result,
+  waitingroom_rules_response_collection,
 } from "./outputs.js";
 import {
   waitingroom_create_rule,
   waitingroom_patch_rule,
-  waitingroom_rule_action,
-  waitingroom_rule_description,
-  waitingroom_rule_enabled,
-  waitingroom_rule_expression,
-  waitingroom_rule_id,
   waitingroom_rule_position,
   waitingroom_update_rules,
 } from "./schemas.js";
 
 /**
- * The tools of `waiting_rooms.rules`.
+ * The tools of `waitingRooms.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "waiting_rooms_rules_create",
+    name: "waitingRooms_rules_create",
     title: "Create Waiting Room Rule",
-    description: "Only available for the Waiting Room Advanced subscription. Creates a rule for a waiting room.",
+    description: "Only available for the Waiting Room Advanced subscription. Creates a rule for a waiting room.\n\nPOST /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_create_rule"
         },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "waitingroom_create_rule": waitingroom_create_rule,
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_rule_action": waitingroom_rule_action,
-        "waitingroom_rule_description": waitingroom_rule_description,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled,
-        "waitingroom_rule_expression": waitingroom_rule_expression,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_rules_response_collection",
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     annotations: {
@@ -123,19 +104,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     request: (args) => ({
@@ -144,50 +118,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_rules_delete",
+    name: "waitingRooms_rules_delete",
     title: "Delete Waiting Room Rule",
-    description: "Deletes a rule for a waiting room.\n\nConfirm with the user before calling this tool. This operation deletes the rule from the waiting room.",
+    description: "Deletes a rule for a waiting room.\n\nConfirm with the user before calling this tool. This operation deletes the rule from the waiting room.\n\nDELETE /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "rule_id": {
-          "$ref": "#/$defs/waitingroom_rule_id",
-          "description": "The ID of the rule."
-        },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "description": "The ID of the rule.",
+              "type": "string"
+            },
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_rule_id": waitingroom_rule_id,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_rules_response_collection",
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     annotations: {
@@ -227,19 +199,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     request: (args) => ({
@@ -247,60 +212,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_rules_edit",
+    name: "waitingRooms_rules_edit",
     title: "Patch Waiting Room Rule",
-    description: "Patches a rule for a waiting room.",
+    description: "Patches a rule for a waiting room.\n\nPATCH /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_patch_rule"
         },
-        "rule_id": {
-          "$ref": "#/$defs/waitingroom_rule_id",
-          "description": "The ID of the rule."
-        },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "rule_id": {
+              "description": "The ID of the rule.",
+              "type": "string"
+            },
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
         "waitingroom_patch_rule": waitingroom_patch_rule,
-        "waitingroom_rule_action": waitingroom_rule_action,
-        "waitingroom_rule_description": waitingroom_rule_description,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled,
-        "waitingroom_rule_expression": waitingroom_rule_expression,
-        "waitingroom_rule_id": waitingroom_rule_id,
         "waitingroom_rule_position": waitingroom_rule_position,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_rules_response_collection",
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     annotations: {
@@ -340,19 +301,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     request: (args) => ({
@@ -361,44 +315,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_rules_get",
+    name: "waitingRooms_rules_get",
     title: "List Waiting Room Rules",
-    description: "Lists rules for a waiting room.",
+    description: "Lists rules for a waiting room.\n\nGET /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_rules_response_collection",
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     annotations: {
@@ -439,19 +392,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     request: (args) => ({
@@ -459,54 +405,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_rules_update",
+    name: "waitingRooms_rules_update",
     title: "Replace Waiting Room Rules",
-    description: "Only available for the Waiting Room Advanced subscription. Replaces all rules for a waiting room.",
+    description: "Only available for the Waiting Room Advanced subscription. Replaces all rules for a waiting room.\n\nPUT /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_update_rules"
         },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "waitingroom_create_rule": waitingroom_create_rule,
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_rule_action": waitingroom_rule_action,
-        "waitingroom_rule_description": waitingroom_rule_description,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled,
-        "waitingroom_rule_expression": waitingroom_rule_expression,
         "waitingroom_update_rules": waitingroom_update_rules,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_rules_response_collection",
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     annotations: {
@@ -546,19 +489,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-collection": waitingroom_api_response_collection_output,
-        "waitingroom_api-response-common-2": waitingroom_api_response_common_2_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_rule_action": waitingroom_rule_action_output,
-        "waitingroom_rule_description": waitingroom_rule_description_output,
-        "waitingroom_rule_enabled": waitingroom_rule_enabled_output,
-        "waitingroom_rule_expression": waitingroom_rule_expression_output,
-        "waitingroom_rule_id": waitingroom_rule_id_output,
-        "waitingroom_rule_result": waitingroom_rule_result_output,
-        "waitingroom_rule_version": waitingroom_rule_version_output,
-        "waitingroom_rules_response_collection": waitingroom_rules_response_collection_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
+        "waitingroom_api-response-collection": waitingroom_api$$response$$collection,
+        "waitingroom_api-response-common-2": waitingroom_api$$response$$common$$2,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_rule_result": waitingroom_rule_result,
+        "waitingroom_rules_response_collection": waitingroom_rules_response_collection,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/waitingRooms/schemas.ts b/src/generated/forge-mcp/waitingRooms/schemas.ts
index e7943f993..8a6826690 100644
--- a/src/generated/forge-mcp/waitingRooms/schemas.ts
+++ b/src/generated/forge-mcp/waitingRooms/schemas.ts
@@ -56,87 +56,6 @@ export const waitingroom_cookie_attributes: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `waitingroom_cookie_suffix`.
- */
-export const waitingroom_cookie_suffix: JsonSchema = {
-  "description": "Appends a '_' + a custom suffix to the end of Cloudflare Waiting Room's cookie name(__cf_waitingroom). If `cookie_suffix` is \"abcd\", the cookie name will be `__cf_waitingroom_abcd`. This field is required if using `additional_routes`.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_custom_page_html`.
- */
-export const waitingroom_custom_page_html: JsonSchema = {
-  "description": "Only available for the Waiting Room Advanced subscription. This is a template html file that will be rendered at the edge. If no custom_page_html is provided, the default waiting room will be used. The template is based on mustache ( https://mustache.github.io/ ). There are several variables that are evaluated by the Cloudflare edge:\n1. {{`waitTimeKnown`}} Acts like a boolean value that indicates the behavior to take when wait time is not available, for instance when queue_all is **true**.\n2. {{`waitTimeFormatted`}} Estimated wait time for the user. For example, five minutes. Alternatively, you can use:\n3. {{`waitTime`}} Number of minutes of estimated wait for a user.\n4. {{`waitTimeHours`}} Number of hours of estimated wait for a user (`Math.floor(waitTime/60)`).\n5. {{`waitTimeHourMinutes`}} Number of minutes above the `waitTimeHours` value (`waitTime%60`).\n6. {{`queueIsFull`}} Changes to **true** when no more people can be added to the queue.\n\nTo view the full list of variables, look at the `cfWaitingRoom` object described under the `json_response_enabled` property in other Waiting Room API calls.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_default_template_language`.
- */
-export const waitingroom_default_template_language: JsonSchema = {
-  "description": "The language of the default page template. If no default_template_language is provided, then `en-US` (English) will be used.",
-  "enum": [
-    "en-US",
-    "es-ES",
-    "de-DE",
-    "fr-FR",
-    "it-IT",
-    "ja-JP",
-    "ko-KR",
-    "pt-BR",
-    "zh-CN",
-    "zh-TW",
-    "nl-NL",
-    "pl-PL",
-    "id-ID",
-    "tr-TR",
-    "ar-EG",
-    "ru-RU",
-    "fa-IR",
-    "bg-BG",
-    "hr-HR",
-    "cs-CZ",
-    "da-DK",
-    "fi-FI",
-    "lt-LT",
-    "lv-LV",
-    "ms-MY",
-    "nb-NO",
-    "ro-RO",
-    "el-GR",
-    "he-IL",
-    "hi-IN",
-    "hu-HU",
-    "sr-BA",
-    "sk-SK",
-    "sl-SI",
-    "sv-SE",
-    "tl-PH",
-    "th-TH",
-    "uk-UA",
-    "vi-VN"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_description`.
- */
-export const waitingroom_description: JsonSchema = {
-  "description": "A note that you can use to add more details about the waiting room.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_disable_session_renewal`.
- */
-export const waitingroom_disable_session_renewal: JsonSchema = {
-  "description": "Only available for the Waiting Room Advanced subscription. Disables automatic renewal of session cookies. If `true`, an accepted user will have session_duration minutes to browse the site. After that, they will have to go through the waiting room again. If `false`, a user's session cookie will be automatically renewed on every request.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `waitingroom_enabled_origin_commands`.
  */
@@ -151,54 +70,6 @@ export const waitingroom_enabled_origin_commands: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `waitingroom_host`.
- */
-export const waitingroom_host: JsonSchema = {
-  "description": "The host name to which the waiting room will be applied (no wildcards). Please do not include the scheme (http:// or https://). The host and path combination must be unique.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_identifier`.
- */
-export const waitingroom_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_json_response_enabled`.
- */
-export const waitingroom_json_response_enabled: JsonSchema = {
-  "description": "Only available for the Waiting Room Advanced subscription. If `true`, requests to the waiting room with the header `Accept: application/json` will receive a JSON response object with information on the user's status in the waiting room as opposed to the configured static HTML page. This JSON response object has one property `cfWaitingRoom` which is an object containing the following fields:\n1. `inWaitingRoom`: Boolean indicating if the user is in the waiting room (always **true**).\n2. `waitTimeKnown`: Boolean indicating if the current estimated wait times are accurate. If **false**, they are not available.\n3. `waitTime`: Valid only when `waitTimeKnown` is **true**. Integer indicating the current estimated time in minutes the user will wait in the waiting room. When `queueingMethod` is **random**, this is set to `waitTime50Percentile`.\n4. `waitTime25Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 25% of users that gain entry the fastest (25th percentile).\n5. `waitTime50Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 50% of users that gain entry the fastest (50th percentile). In other words, half of the queued users are expected to let into the origin website before `waitTime50Percentile` and half are expected to be let in after it.\n6. `waitTime75Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 75% of users that gain entry the fastest (75th percentile).\n7. `waitTimeFormatted`: String displaying the `waitTime` formatted in English for users. If `waitTimeKnown` is **false**, `waitTimeFormatted` will display **unavailable**.\n8. `queueIsFull`: Boolean indicating if the waiting room's queue is currently full and not accepting new users at the moment.\n9. `queueAll`: Boolean indicating if all users will be queued in the waiting room and no one will be let into the origin website.\n10. `lastUpdated`: String displaying the timestamp as an ISO 8601 string of the user's last attempt to leave the waiting room and be let into the origin website. The user is able to make another attempt after `refreshIntervalSeconds` past this time. If the user makes a request too soon, it will be ignored and `lastUpdated` will not change.\n11. `refreshIntervalSeconds`: Integer indicating the number of seconds after `lastUpdated` until the user is able to make another attempt to leave the waiting room and be let into the origin website. When the `queueingMethod` is `reject`, there is no specified refresh time —\\_it will always be **zero**.\n12. `queueingMethod`: The queueing method currently used by the waiting room. It is either **fifo**, **random**, **passthrough**, or **reject**.\n13. `isFIFOQueue`: Boolean indicating if the waiting room uses a FIFO (First-In-First-Out) queue.\n14. `isRandomQueue`: Boolean indicating if the waiting room uses a Random queue where users gain access randomly.\n15. `isPassthroughQueue`: Boolean indicating if the waiting room uses a passthrough queue. Keep in mind that when passthrough is enabled, this JSON response will only exist when `queueAll` is **true** or `isEventPrequeueing` is **true** because in all other cases requests will go directly to the origin.\n16. `isRejectQueue`: Boolean indicating if the waiting room uses a reject queue.\n17. `isEventActive`: Boolean indicating if an event is currently occurring. Events are able to change a waiting room's behavior during a specified period of time. For additional information, look at the event properties `prequeue_start_time`, `event_start_time`, and `event_end_time` in the documentation for creating waiting room events. Events are considered active between these start and end times, as well as during the prequeueing period if it exists.\n18. `isEventPrequeueing`: Valid only when `isEventActive` is **true**. Boolean indicating if an event is currently prequeueing users before it starts.\n19. `timeUntilEventStart`: Valid only when `isEventPrequeueing` is **true**. Integer indicating the number of minutes until the event starts.\n20. `timeUntilEventStartFormatted`: String displaying the `timeUntilEventStart` formatted in English for users. If `isEventPrequeueing` is **false**, `timeUntilEventStartFormatted` will display **unavailable**.\n21. `timeUntilEventEnd`: Valid only when `isEventActive` is **true**. Integer indicating the number of minutes until the event ends.\n22. `timeUntilEventEndFormatted`: String displaying the `timeUntilEventEnd` formatted in English for users. If `isEventActive` is **false**, `timeUntilEventEndFormatted` will display **unavailable**.\n23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean indicating if the users in the prequeue are shuffled randomly when the event starts.\n24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to the `custom_html` template to ensure the Turnstile widget appears.\n25. `infiniteQueue`: Boolean indicating whether the response is for a user in the infinite queue.\n\nAn example cURL to a waiting room could be:\n\n\tcurl -X GET \"https://example.com/waitingroom\" \\\n\t\t-H \"Accept: application/json\"\n\nIf `json_response_enabled` is **true** and the request hits the waiting room, an example JSON response when `queueingMethod` is **fifo** and no event is active could be:\n\n\t{\n\t\t\"cfWaitingRoom\": {\n\t\t\t\"inWaitingRoom\": true,\n\t\t\t\"waitTimeKnown\": true,\n\t\t\t\"waitTime\": 10,\n\t\t\t\"waitTime25Percentile\": 0,\n\t\t\t\"waitTime50Percentile\": 0,\n\t\t\t\"waitTime75Percentile\": 0,\n\t\t\t\"waitTimeFormatted\": \"10 minutes\",\n\t\t\t\"queueIsFull\": false,\n\t\t\t\"queueAll\": false,\n\t\t\t\"lastUpdated\": \"2020-08-03T23:46:00.000Z\",\n\t\t\t\"refreshIntervalSeconds\": 20,\n\t\t\t\"queueingMethod\": \"fifo\",\n\t\t\t\"isFIFOQueue\": true,\n\t\t\t\"isRandomQueue\": false,\n\t\t\t\"isPassthroughQueue\": false,\n\t\t\t\"isRejectQueue\": false,\n\t\t\t\"isEventActive\": false,\n\t\t\t\"isEventPrequeueing\": false,\n\t\t\t\"timeUntilEventStart\": 0,\n\t\t\t\"timeUntilEventStartFormatted\": \"unavailable\",\n\t\t\t\"timeUntilEventEnd\": 0,\n\t\t\t\"timeUntilEventEndFormatted\": \"unavailable\",\n\t\t\t\"shuffleAtEventStart\": false\n\t\t}\n\t}\n\nIf `json_response_enabled` is **true** and the request hits the waiting room, an example JSON response when `queueingMethod` is **random** and an event is active could be:\n\n\t{\n\t\t\"cfWaitingRoom\": {\n\t\t\t\"inWaitingRoom\": true,\n\t\t\t\"waitTimeKnown\": true,\n\t\t\t\"waitTime\": 10,\n\t\t\t\"waitTime25Percentile\": 5,\n\t\t\t\"waitTime50Percentile\": 10,\n\t\t\t\"waitTime75Percentile\": 15,\n\t\t\t\"waitTimeFormatted\": \"5 minutes to 15 minutes\",\n\t\t\t\"queueIsFull\": false,\n\t\t\t\"queueAll\": false,\n\t\t\t\"lastUpdated\": \"2020-08-03T23:46:00.000Z\",\n\t\t\t\"refreshIntervalSeconds\": 20,\n\t\t\t\"queueingMethod\": \"random\",\n\t\t\t\"isFIFOQueue\": false,\n\t\t\t\"isRandomQueue\": true,\n\t\t\t\"isPassthroughQueue\": false,\n\t\t\t\"isRejectQueue\": false,\n\t\t\t\"isEventActive\": true,\n\t\t\t\"isEventPrequeueing\": false,\n\t\t\t\"timeUntilEventStart\": 0,\n\t\t\t\"timeUntilEventStartFormatted\": \"unavailable\",\n\t\t\t\"timeUntilEventEnd\": 15,\n\t\t\t\"timeUntilEventEndFormatted\": \"15 minutes\",\n\t\t\t\"shuffleAtEventStart\": true\n\t\t}\n\t}",
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_name`.
- */
-export const waitingroom_name: JsonSchema = {
-  "description": "A unique name to identify the waiting room. Only alphanumeric characters, hyphens and underscores are allowed.",
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_new_users_per_minute`.
- */
-export const waitingroom_new_users_per_minute: JsonSchema = {
-  "description": "Sets the number of new users that will be let into the route every minute. This value is used as baseline for the number of users that are let in per minute. So it is possible that there is a little more or little less traffic coming to the route based on the traffic patterns at that time around the world.",
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_path`.
- */
-export const waitingroom_path: JsonSchema = {
-  "description": "Sets the path within the host to enable the waiting room on. The waiting room will be enabled for all subpaths as well. If there are two waiting rooms on the same subpath, the waiting room for the most specific path will be chosen. Wildcards and query parameters are not supported.",
-  "type": "string"
-};
-
 /**
  * The schema of `waitingroom_query_waitingroom`.
  */
@@ -213,29 +84,70 @@ export const waitingroom_query_waitingroom: JsonSchema = {
       "description": "Configures cookie attributes for the waiting room cookie. This encrypted cookie stores a user's status in the waiting room, such as queue position."
     },
     "cookie_suffix": {
-      "$ref": "#/$defs/waitingroom_cookie_suffix",
       "default": "",
-      "description": "Appends a '_' + a custom suffix to the end of Cloudflare Waiting Room's cookie name(__cf_waitingroom). If `cookie_suffix` is \"abcd\", the cookie name will be `__cf_waitingroom_abcd`. This field is required if using `additional_routes`."
+      "description": "Appends a '_' + a custom suffix to the end of Cloudflare Waiting Room's cookie name(__cf_waitingroom). If `cookie_suffix` is \"abcd\", the cookie name will be `__cf_waitingroom_abcd`. This field is required if using `additional_routes`.",
+      "type": "string"
     },
     "custom_page_html": {
-      "$ref": "#/$defs/waitingroom_custom_page_html",
       "default": "",
-      "description": "Only available for the Waiting Room Advanced subscription. This is a template html file that will be rendered at the edge. If no custom_page_html is provided, the default waiting room will be used. The template is based on mustache ( https://mustache.github.io/ ). There are several variables that are evaluated by the Cloudflare edge:\n1. {{`waitTimeKnown`}} Acts like a boolean value that indicates the behavior to take when wait time is not available, for instance when queue_all is **true**.\n2. {{`waitTimeFormatted`}} Estimated wait time for the user. For example, five minutes. Alternatively, you can use:\n3. {{`waitTime`}} Number of minutes of estimated wait for a user.\n4. {{`waitTimeHours`}} Number of hours of estimated wait for a user (`Math.floor(waitTime/60)`).\n5. {{`waitTimeHourMinutes`}} Number of minutes above the `waitTimeHours` value (`waitTime%60`).\n6. {{`queueIsFull`}} Changes to **true** when no more people can be added to the queue.\n\nTo view the full list of variables, look at the `cfWaitingRoom` object described under the `json_response_enabled` property in other Waiting Room API calls."
+      "description": "Only available for the Waiting Room Advanced subscription. This is a template html file that will be rendered at the edge. If no custom_page_html is provided, the default waiting room will be used. The template is based on mustache ( https://mustache.github.io/ ). There are several variables that are evaluated by the Cloudflare edge:\n1. {{`waitTimeKnown`}} Acts like a boolean value that indicates the behavior to take when wait time is not available, for instance when queue_all is **true**.\n2. {{`waitTimeFormatted`}} Estimated wait time for the user. For example, five minutes. Alternatively, you can use:\n3. {{`waitTime`}} Number of minutes of estimated wait for a user.\n4. {{`waitTimeHours`}} Number of hours of estimated wait for a user (`Math.floor(waitTime/60)`).\n5. {{`waitTimeHourMinutes`}} Number of minutes above the `waitTimeHours` value (`waitTime%60`).\n6. {{`queueIsFull`}} Changes to **true** when no more people can be added to the queue.\n\nTo view the full list of variables, look at the `cfWaitingRoom` object described under the `json_response_enabled` property in other Waiting Room API calls.",
+      "type": "string"
     },
     "default_template_language": {
-      "$ref": "#/$defs/waitingroom_default_template_language",
       "default": "en-US",
-      "description": "The language of the default page template. If no default_template_language is provided, then `en-US` (English) will be used."
+      "description": "The language of the default page template. If no default_template_language is provided, then `en-US` (English) will be used.",
+      "enum": [
+        "en-US",
+        "es-ES",
+        "de-DE",
+        "fr-FR",
+        "it-IT",
+        "ja-JP",
+        "ko-KR",
+        "pt-BR",
+        "zh-CN",
+        "zh-TW",
+        "nl-NL",
+        "pl-PL",
+        "id-ID",
+        "tr-TR",
+        "ar-EG",
+        "ru-RU",
+        "fa-IR",
+        "bg-BG",
+        "hr-HR",
+        "cs-CZ",
+        "da-DK",
+        "fi-FI",
+        "lt-LT",
+        "lv-LV",
+        "ms-MY",
+        "nb-NO",
+        "ro-RO",
+        "el-GR",
+        "he-IL",
+        "hi-IN",
+        "hu-HU",
+        "sr-BA",
+        "sk-SK",
+        "sl-SI",
+        "sv-SE",
+        "tl-PH",
+        "th-TH",
+        "uk-UA",
+        "vi-VN"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/waitingroom_description",
       "default": "",
-      "description": "A note that you can use to add more details about the waiting room."
+      "description": "A note that you can use to add more details about the waiting room.",
+      "type": "string"
     },
     "disable_session_renewal": {
-      "$ref": "#/$defs/waitingroom_disable_session_renewal",
       "default": false,
-      "description": "Only available for the Waiting Room Advanced subscription. Disables automatic renewal of session cookies. If `true`, an accepted user will have session_duration minutes to browse the site. After that, they will have to go through the waiting room again. If `false`, a user's session cookie will be automatically renewed on every request."
+      "description": "Only available for the Waiting Room Advanced subscription. Disables automatic renewal of session cookies. If `true`, an accepted user will have session_duration minutes to browse the site. After that, they will have to go through the waiting room again. If `false`, a user's session cookie will be automatically renewed on every request.",
+      "type": "boolean"
     },
     "enabled_origin_commands": {
       "$ref": "#/$defs/waitingroom_enabled_origin_commands",
@@ -243,65 +155,86 @@ export const waitingroom_query_waitingroom: JsonSchema = {
       "description": "A list of enabled origin commands."
     },
     "host": {
-      "$ref": "#/$defs/waitingroom_host",
-      "description": "The host name to which the waiting room will be applied (no wildcards). Please do not include the scheme (http:// or https://). The host and path combination must be unique."
+      "description": "The host name to which the waiting room will be applied (no wildcards). Please do not include the scheme (http:// or https://). The host and path combination must be unique.",
+      "type": "string"
     },
     "json_response_enabled": {
-      "$ref": "#/$defs/waitingroom_json_response_enabled",
       "default": false,
-      "description": "Only available for the Waiting Room Advanced subscription. If `true`, requests to the waiting room with the header `Accept: application/json` will receive a JSON response object with information on the user's status in the waiting room as opposed to the configured static HTML page. This JSON response object has one property `cfWaitingRoom` which is an object containing the following fields:\n1. `inWaitingRoom`: Boolean indicating if the user is in the waiting room (always **true**).\n2. `waitTimeKnown`: Boolean indicating if the current estimated wait times are accurate. If **false**, they are not available.\n3. `waitTime`: Valid only when `waitTimeKnown` is **true**. Integer indicating the current estimated time in minutes the user will wait in the waiting room. When `queueingMethod` is **random**, this is set to `waitTime50Percentile`.\n4. `waitTime25Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 25% of users that gain entry the fastest (25th percentile).\n5. `waitTime50Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 50% of users that gain entry the fastest (50th percentile). In other words, half of the queued users are expected to let into the origin website before `waitTime50Percentile` and half are expected to be let in after it.\n6. `waitTime75Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 75% of users that gain entry the fastest (75th percentile).\n7. `waitTimeFormatted`: String displaying the `waitTime` formatted in English for users. If `waitTimeKnown` is **false**, `waitTimeFormatted` will display **unavailable**.\n8. `queueIsFull`: Boolean indicating if the waiting room's queue is currently full and not accepting new users at the moment.\n9. `queueAll`: Boolean indicating if all users will be queued in the waiting room and no one will be let into the origin website.\n10. `lastUpdated`: String displaying the timestamp as an ISO 8601 string of the user's last attempt to leave the waiting room and be let into the origin website. The user is able to make another attempt after `refreshIntervalSeconds` past this time. If the user makes a request too soon, it will be ignored and `lastUpdated` will not change.\n11. `refreshIntervalSeconds`: Integer indicating the number of seconds after `lastUpdated` until the user is able to make another attempt to leave the waiting room and be let into the origin website. When the `queueingMethod` is `reject`, there is no specified refresh time —\\_it will always be **zero**.\n12. `queueingMethod`: The queueing method currently used by the waiting room. It is either **fifo**, **random**, **passthrough**, or **reject**.\n13. `isFIFOQueue`: Boolean indicating if the waiting room uses a FIFO (First-In-First-Out) queue.\n14. `isRandomQueue`: Boolean indicating if the waiting room uses a Random queue where users gain access randomly.\n15. `isPassthroughQueue`: Boolean indicating if the waiting room uses a passthrough queue. Keep in mind that when passthrough is enabled, this JSON response will only exist when `queueAll` is **true** or `isEventPrequeueing` is **true** because in all other cases requests will go directly to the origin.\n16. `isRejectQueue`: Boolean indicating if the waiting room uses a reject queue.\n17. `isEventActive`: Boolean indicating if an event is currently occurring. Events are able to change a waiting room's behavior during a specified period of time. For additional information, look at the event properties `prequeue_start_time`, `event_start_time`, and `event_end_time` in the documentation for creating waiting room events. Events are considered active between these start and end times, as well as during the prequeueing period if it exists.\n18. `isEventPrequeueing`: Valid only when `isEventActive` is **true**. Boolean indicating if an event is currently prequeueing users before it starts.\n19. `timeUntilEventStart`: Valid only when `isEventPrequeueing` is **true**. Integer indicating the number of minutes until the event starts.\n20. `timeUntilEventStartFormatted`: String displaying the `timeUntilEventStart` formatted in English for users. If `isEventPrequeueing` is **false**, `timeUntilEventStartFormatted` will display **unavailable**.\n21. `timeUntilEventEnd`: Valid only when `isEventActive` is **true**. Integer indicating the number of minutes until the event ends.\n22. `timeUntilEventEndFormatted`: String displaying the `timeUntilEventEnd` formatted in English for users. If `isEventActive` is **false**, `timeUntilEventEndFormatted` will display **unavailable**.\n23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean indicating if the users in the prequeue are shuffled randomly when the event starts.\n24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to the `custom_html` template to ensure the Turnstile widget appears.\n25. `infiniteQueue`: Boolean indicating whether the response is for a user in the infinite queue.\n\nAn example cURL to a waiting room could be:\n\n\tcurl -X GET \"https://example.com/waitingroom\" \\\n\t\t-H \"Accept: application/json\"\n\nIf `json_response_enabled` is **true** and the request hits the waiting room, an example JSON response when `queueingMethod` is **fifo** and no event is active could be:\n\n\t{\n\t\t\"cfWaitingRoom\": {\n\t\t\t\"inWaitingRoom\": true,\n\t\t\t\"waitTimeKnown\": true,\n\t\t\t\"waitTime\": 10,\n\t\t\t\"waitTime25Percentile\": 0,\n\t\t\t\"waitTime50Percentile\": 0,\n\t\t\t\"waitTime75Percentile\": 0,\n\t\t\t\"waitTimeFormatted\": \"10 minutes\",\n\t\t\t\"queueIsFull\": false,\n\t\t\t\"queueAll\": false,\n\t\t\t\"lastUpdated\": \"2020-08-03T23:46:00.000Z\",\n\t\t\t\"refreshIntervalSeconds\": 20,\n\t\t\t\"queueingMethod\": \"fifo\",\n\t\t\t\"isFIFOQueue\": true,\n\t\t\t\"isRandomQueue\": false,\n\t\t\t\"isPassthroughQueue\": false,\n\t\t\t\"isRejectQueue\": false,\n\t\t\t\"isEventActive\": false,\n\t\t\t\"isEventPrequeueing\": false,\n\t\t\t\"timeUntilEventStart\": 0,\n\t\t\t\"timeUntilEventStartFormatted\": \"unavailable\",\n\t\t\t\"timeUntilEventEnd\": 0,\n\t\t\t\"timeUntilEventEndFormatted\": \"unavailable\",\n\t\t\t\"shuffleAtEventStart\": false\n\t\t}\n\t}\n\nIf `json_response_enabled` is **true** and the request hits the waiting room, an example JSON response when `queueingMethod` is **random** and an event is active could be:\n\n\t{\n\t\t\"cfWaitingRoom\": {\n\t\t\t\"inWaitingRoom\": true,\n\t\t\t\"waitTimeKnown\": true,\n\t\t\t\"waitTime\": 10,\n\t\t\t\"waitTime25Percentile\": 5,\n\t\t\t\"waitTime50Percentile\": 10,\n\t\t\t\"waitTime75Percentile\": 15,\n\t\t\t\"waitTimeFormatted\": \"5 minutes to 15 minutes\",\n\t\t\t\"queueIsFull\": false,\n\t\t\t\"queueAll\": false,\n\t\t\t\"lastUpdated\": \"2020-08-03T23:46:00.000Z\",\n\t\t\t\"refreshIntervalSeconds\": 20,\n\t\t\t\"queueingMethod\": \"random\",\n\t\t\t\"isFIFOQueue\": false,\n\t\t\t\"isRandomQueue\": true,\n\t\t\t\"isPassthroughQueue\": false,\n\t\t\t\"isRejectQueue\": false,\n\t\t\t\"isEventActive\": true,\n\t\t\t\"isEventPrequeueing\": false,\n\t\t\t\"timeUntilEventStart\": 0,\n\t\t\t\"timeUntilEventStartFormatted\": \"unavailable\",\n\t\t\t\"timeUntilEventEnd\": 15,\n\t\t\t\"timeUntilEventEndFormatted\": \"15 minutes\",\n\t\t\t\"shuffleAtEventStart\": true\n\t\t}\n\t}"
+      "description": "Only available for the Waiting Room Advanced subscription. If `true`, requests to the waiting room with the header `Accept: application/json` will receive a JSON response object with information on the user's status in the waiting room as opposed to the configured static HTML page. This JSON response object has one property `cfWaitingRoom` which is an object containing the following fields:\n1. `inWaitingRoom`: Boolean indicating if the user is in the waiting room (always **true**).\n2. `waitTimeKnown`: Boolean indicating if the current estimated wait times are accurate. If **false**, they are not available.\n3. `waitTime`: Valid only when `waitTimeKnown` is **true**. Integer indicating the current estimated time in minutes the user will wait in the waiting room. When `queueingMethod` is **random**, this is set to `waitTime50Percentile`.\n4. `waitTime25Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 25% of users that gain entry the fastest (25th percentile).\n5. `waitTime50Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 50% of users that gain entry the fastest (50th percentile). In other words, half of the queued users are expected to let into the origin website before `waitTime50Percentile` and half are expected to be let in after it.\n6. `waitTime75Percentile`: Valid only when `queueingMethod` is **random** and `waitTimeKnown` is **true**. Integer indicating the current estimated maximum wait time for the 75% of users that gain entry the fastest (75th percentile).\n7. `waitTimeFormatted`: String displaying the `waitTime` formatted in English for users. If `waitTimeKnown` is **false**, `waitTimeFormatted` will display **unavailable**.\n8. `queueIsFull`: Boolean indicating if the waiting room's queue is currently full and not accepting new users at the moment.\n9. `queueAll`: Boolean indicating if all users will be queued in the waiting room and no one will be let into the origin website.\n10. `lastUpdated`: String displaying the timestamp as an ISO 8601 string of the user's last attempt to leave the waiting room and be let into the origin website. The user is able to make another attempt after `refreshIntervalSeconds` past this time. If the user makes a request too soon, it will be ignored and `lastUpdated` will not change.\n11. `refreshIntervalSeconds`: Integer indicating the number of seconds after `lastUpdated` until the user is able to make another attempt to leave the waiting room and be let into the origin website. When the `queueingMethod` is `reject`, there is no specified refresh time —\\_it will always be **zero**.\n12. `queueingMethod`: The queueing method currently used by the waiting room. It is either **fifo**, **random**, **passthrough**, or **reject**.\n13. `isFIFOQueue`: Boolean indicating if the waiting room uses a FIFO (First-In-First-Out) queue.\n14. `isRandomQueue`: Boolean indicating if the waiting room uses a Random queue where users gain access randomly.\n15. `isPassthroughQueue`: Boolean indicating if the waiting room uses a passthrough queue. Keep in mind that when passthrough is enabled, this JSON response will only exist when `queueAll` is **true** or `isEventPrequeueing` is **true** because in all other cases requests will go directly to the origin.\n16. `isRejectQueue`: Boolean indicating if the waiting room uses a reject queue.\n17. `isEventActive`: Boolean indicating if an event is currently occurring. Events are able to change a waiting room's behavior during a specified period of time. For additional information, look at the event properties `prequeue_start_time`, `event_start_time`, and `event_end_time` in the documentation for creating waiting room events. Events are considered active between these start and end times, as well as during the prequeueing period if it exists.\n18. `isEventPrequeueing`: Valid only when `isEventActive` is **true**. Boolean indicating if an event is currently prequeueing users before it starts.\n19. `timeUntilEventStart`: Valid only when `isEventPrequeueing` is **true**. Integer indicating the number of minutes until the event starts.\n20. `timeUntilEventStartFormatted`: String displaying the `timeUntilEventStart` formatted in English for users. If `isEventPrequeueing` is **false**, `timeUntilEventStartFormatted` will display **unavailable**.\n21. `timeUntilEventEnd`: Valid only when `isEventActive` is **true**. Integer indicating the number of minutes until the event ends.\n22. `timeUntilEventEndFormatted`: String displaying the `timeUntilEventEnd` formatted in English for users. If `isEventActive` is **false**, `timeUntilEventEndFormatted` will display **unavailable**.\n23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean indicating if the users in the prequeue are shuffled randomly when the event starts.\n24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to the `custom_html` template to ensure the Turnstile widget appears.\n25. `infiniteQueue`: Boolean indicating whether the response is for a user in the infinite queue.\n\nAn example cURL to a waiting room could be:\n\n\tcurl -X GET \"https://example.com/waitingroom\" \\\n\t\t-H \"Accept: application/json\"\n\nIf `json_response_enabled` is **true** and the request hits the waiting room, an example JSON response when `queueingMethod` is **fifo** and no event is active could be:\n\n\t{\n\t\t\"cfWaitingRoom\": {\n\t\t\t\"inWaitingRoom\": true,\n\t\t\t\"waitTimeKnown\": true,\n\t\t\t\"waitTime\": 10,\n\t\t\t\"waitTime25Percentile\": 0,\n\t\t\t\"waitTime50Percentile\": 0,\n\t\t\t\"waitTime75Percentile\": 0,\n\t\t\t\"waitTimeFormatted\": \"10 minutes\",\n\t\t\t\"queueIsFull\": false,\n\t\t\t\"queueAll\": false,\n\t\t\t\"lastUpdated\": \"2020-08-03T23:46:00.000Z\",\n\t\t\t\"refreshIntervalSeconds\": 20,\n\t\t\t\"queueingMethod\": \"fifo\",\n\t\t\t\"isFIFOQueue\": true,\n\t\t\t\"isRandomQueue\": false,\n\t\t\t\"isPassthroughQueue\": false,\n\t\t\t\"isRejectQueue\": false,\n\t\t\t\"isEventActive\": false,\n\t\t\t\"isEventPrequeueing\": false,\n\t\t\t\"timeUntilEventStart\": 0,\n\t\t\t\"timeUntilEventStartFormatted\": \"unavailable\",\n\t\t\t\"timeUntilEventEnd\": 0,\n\t\t\t\"timeUntilEventEndFormatted\": \"unavailable\",\n\t\t\t\"shuffleAtEventStart\": false\n\t\t}\n\t}\n\nIf `json_response_enabled` is **true** and the request hits the waiting room, an example JSON response when `queueingMethod` is **random** and an event is active could be:\n\n\t{\n\t\t\"cfWaitingRoom\": {\n\t\t\t\"inWaitingRoom\": true,\n\t\t\t\"waitTimeKnown\": true,\n\t\t\t\"waitTime\": 10,\n\t\t\t\"waitTime25Percentile\": 5,\n\t\t\t\"waitTime50Percentile\": 10,\n\t\t\t\"waitTime75Percentile\": 15,\n\t\t\t\"waitTimeFormatted\": \"5 minutes to 15 minutes\",\n\t\t\t\"queueIsFull\": false,\n\t\t\t\"queueAll\": false,\n\t\t\t\"lastUpdated\": \"2020-08-03T23:46:00.000Z\",\n\t\t\t\"refreshIntervalSeconds\": 20,\n\t\t\t\"queueingMethod\": \"random\",\n\t\t\t\"isFIFOQueue\": false,\n\t\t\t\"isRandomQueue\": true,\n\t\t\t\"isPassthroughQueue\": false,\n\t\t\t\"isRejectQueue\": false,\n\t\t\t\"isEventActive\": true,\n\t\t\t\"isEventPrequeueing\": false,\n\t\t\t\"timeUntilEventStart\": 0,\n\t\t\t\"timeUntilEventStartFormatted\": \"unavailable\",\n\t\t\t\"timeUntilEventEnd\": 15,\n\t\t\t\"timeUntilEventEndFormatted\": \"15 minutes\",\n\t\t\t\"shuffleAtEventStart\": true\n\t\t}\n\t}",
+      "type": "boolean"
     },
     "name": {
-      "$ref": "#/$defs/waitingroom_name",
-      "description": "A unique name to identify the waiting room. Only alphanumeric characters, hyphens and underscores are allowed."
+      "description": "A unique name to identify the waiting room. Only alphanumeric characters, hyphens and underscores are allowed.",
+      "type": "string"
     },
     "new_users_per_minute": {
-      "$ref": "#/$defs/waitingroom_new_users_per_minute",
-      "description": "Sets the number of new users that will be let into the route every minute. This value is used as baseline for the number of users that are let in per minute. So it is possible that there is a little more or little less traffic coming to the route based on the traffic patterns at that time around the world."
+      "description": "Sets the number of new users that will be let into the route every minute. This value is used as baseline for the number of users that are let in per minute. So it is possible that there is a little more or little less traffic coming to the route based on the traffic patterns at that time around the world.",
+      "type": "integer"
     },
     "path": {
-      "$ref": "#/$defs/waitingroom_path",
       "default": "/",
-      "description": "Sets the path within the host to enable the waiting room on. The waiting room will be enabled for all subpaths as well. If there are two waiting rooms on the same subpath, the waiting room for the most specific path will be chosen. Wildcards and query parameters are not supported."
+      "description": "Sets the path within the host to enable the waiting room on. The waiting room will be enabled for all subpaths as well. If there are two waiting rooms on the same subpath, the waiting room for the most specific path will be chosen. Wildcards and query parameters are not supported.",
+      "type": "string"
     },
     "queue_all": {
-      "$ref": "#/$defs/waitingroom_queue_all",
       "default": false,
-      "description": "If queue_all is `true`, all the traffic that is coming to a route will be sent to the waiting room. No new traffic can get to the route once this field is set and estimated time will become unavailable."
+      "description": "If queue_all is `true`, all the traffic that is coming to a route will be sent to the waiting room. No new traffic can get to the route once this field is set and estimated time will become unavailable.",
+      "type": "boolean"
     },
     "queueing_method": {
-      "$ref": "#/$defs/waitingroom_queueing_method",
       "default": "fifo",
-      "description": "Sets the queueing method used by the waiting room. Changing this parameter from the **default** queueing method is only available for the Waiting Room Advanced subscription. Regardless of the queueing method, if `queue_all` is enabled or an event is prequeueing, users in the waiting room will not be accepted to the origin. These users will always see a waiting room page that refreshes automatically. The valid queueing methods are:\n1. `fifo` **(default)**: First-In-First-Out queue where customers gain access in the order they arrived.\n2. `random`: Random queue where customers gain access randomly, regardless of arrival time.\n3. `passthrough`: Users will pass directly through the waiting room and into the origin website. As a result, any configured limits will not be respected while this is enabled. This method can be used as an alternative to disabling a waiting room (with `suspended`) so that analytics are still reported. This can be used if you wish to allow all traffic normally, but want to restrict traffic during a waiting room event, or vice versa.\n4. `reject`: Users will be immediately rejected from the waiting room. As a result, no users will reach the origin website while this is enabled. This can be used if you wish to reject all traffic while performing maintenance, block traffic during a specified period of time (an event), or block traffic while events are not occurring. Consider a waiting room used for vaccine distribution that only allows traffic during sign-up events, and otherwise blocks all traffic. For this case, the waiting room uses `reject`, and its events override this with `fifo`, `random`, or `passthrough`. When this queueing method is enabled and neither `queueAll` is enabled nor an event is prequeueing, the waiting room page **will not refresh automatically**."
+      "description": "Sets the queueing method used by the waiting room. Changing this parameter from the **default** queueing method is only available for the Waiting Room Advanced subscription. Regardless of the queueing method, if `queue_all` is enabled or an event is prequeueing, users in the waiting room will not be accepted to the origin. These users will always see a waiting room page that refreshes automatically. The valid queueing methods are:\n1. `fifo` **(default)**: First-In-First-Out queue where customers gain access in the order they arrived.\n2. `random`: Random queue where customers gain access randomly, regardless of arrival time.\n3. `passthrough`: Users will pass directly through the waiting room and into the origin website. As a result, any configured limits will not be respected while this is enabled. This method can be used as an alternative to disabling a waiting room (with `suspended`) so that analytics are still reported. This can be used if you wish to allow all traffic normally, but want to restrict traffic during a waiting room event, or vice versa.\n4. `reject`: Users will be immediately rejected from the waiting room. As a result, no users will reach the origin website while this is enabled. This can be used if you wish to reject all traffic while performing maintenance, block traffic during a specified period of time (an event), or block traffic while events are not occurring. Consider a waiting room used for vaccine distribution that only allows traffic during sign-up events, and otherwise blocks all traffic. For this case, the waiting room uses `reject`, and its events override this with `fifo`, `random`, or `passthrough`. When this queueing method is enabled and neither `queueAll` is enabled nor an event is prequeueing, the waiting room page **will not refresh automatically**.",
+      "enum": [
+        "fifo",
+        "random",
+        "passthrough",
+        "reject"
+      ],
+      "type": "string"
     },
     "queueing_status_code": {
-      "$ref": "#/$defs/waitingroom_queueing_status_code",
       "default": 200,
-      "description": "HTTP status code returned to a user while in the queue."
+      "description": "HTTP status code returned to a user while in the queue.",
+      "enum": [
+        200,
+        202,
+        429
+      ],
+      "type": "integer"
     },
     "session_duration": {
-      "$ref": "#/$defs/waitingroom_session_duration",
       "default": 5,
-      "description": "Lifetime of a cookie (in minutes) set by Cloudflare for users who get access to the route. If a user is not seen by Cloudflare again in that time period, they will be treated as a new user that visits the route."
+      "description": "Lifetime of a cookie (in minutes) set by Cloudflare for users who get access to the route. If a user is not seen by Cloudflare again in that time period, they will be treated as a new user that visits the route.",
+      "type": "integer"
     },
     "suspended": {
-      "$ref": "#/$defs/waitingroom_suspended",
       "default": false,
-      "description": "Suspends or allows traffic going to the waiting room. If set to `true`, the traffic will not go to the waiting room."
+      "description": "Suspends or allows traffic going to the waiting room. If set to `true`, the traffic will not go to the waiting room.",
+      "type": "boolean"
     },
     "total_active_users": {
-      "$ref": "#/$defs/waitingroom_total_active_users",
-      "description": "Sets the total number of active user sessions on the route at a point in time. A route is a combination of host and path on which a waiting room is available. This value is used as a baseline for the total number of active user sessions on the route. It is possible to have a situation where there are more or less active users sessions on the route based on the traffic patterns at that time around the world."
+      "description": "Sets the total number of active user sessions on the route at a point in time. A route is a combination of host and path on which a waiting room is available. This value is used as a baseline for the total number of active user sessions on the route. It is possible to have a situation where there are more or less active users sessions on the route based on the traffic patterns at that time around the world.",
+      "type": "integer"
     },
     "turnstile_action": {
-      "$ref": "#/$defs/waitingroom_turnstile_action",
       "default": "log",
-      "description": "Which action to take when a bot is detected using Turnstile. `log` will\nhave no impact on queueing behavior, simply keeping track of how many\nbots are detected in Waiting Room Analytics. `infinite_queue` will send\nbots to a false queueing state, where they will never reach your\norigin. `infinite_queue` requires Advanced Waiting Room.\n"
+      "description": "Which action to take when a bot is detected using Turnstile. `log` will\nhave no impact on queueing behavior, simply keeping track of how many\nbots are detected in Waiting Room Analytics. `infinite_queue` will send\nbots to a false queueing state, where they will never reach your\norigin. `infinite_queue` requires Advanced Waiting Room.",
+      "enum": [
+        "log",
+        "infinite_queue"
+      ],
+      "type": "string"
     },
     "turnstile_mode": {
-      "$ref": "#/$defs/waitingroom_turnstile_mode",
       "default": "invisible",
-      "description": "Which Turnstile widget type to use for detecting bot traffic. See\n[the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)\nfor the definitions of these widget types. Set to `off` to disable the\nTurnstile integration entirely. Setting this to anything other than\n`off` or `invisible` requires Advanced Waiting Room.\n"
+      "description": "Which Turnstile widget type to use for detecting bot traffic. See\n[the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)\nfor the definitions of these widget types. Set to `off` to disable the\nTurnstile integration entirely. Setting this to anything other than\n`off` or `invisible` requires Advanced Waiting Room.",
+      "enum": [
+        "off",
+        "invisible",
+        "visible_non_interactive",
+        "visible_managed"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -312,95 +245,3 @@ export const waitingroom_query_waitingroom: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `waitingroom_queue_all`.
- */
-export const waitingroom_queue_all: JsonSchema = {
-  "description": "If queue_all is `true`, all the traffic that is coming to a route will be sent to the waiting room. No new traffic can get to the route once this field is set and estimated time will become unavailable.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_queueing_method`.
- */
-export const waitingroom_queueing_method: JsonSchema = {
-  "description": "Sets the queueing method used by the waiting room. Changing this parameter from the **default** queueing method is only available for the Waiting Room Advanced subscription. Regardless of the queueing method, if `queue_all` is enabled or an event is prequeueing, users in the waiting room will not be accepted to the origin. These users will always see a waiting room page that refreshes automatically. The valid queueing methods are:\n1. `fifo` **(default)**: First-In-First-Out queue where customers gain access in the order they arrived.\n2. `random`: Random queue where customers gain access randomly, regardless of arrival time.\n3. `passthrough`: Users will pass directly through the waiting room and into the origin website. As a result, any configured limits will not be respected while this is enabled. This method can be used as an alternative to disabling a waiting room (with `suspended`) so that analytics are still reported. This can be used if you wish to allow all traffic normally, but want to restrict traffic during a waiting room event, or vice versa.\n4. `reject`: Users will be immediately rejected from the waiting room. As a result, no users will reach the origin website while this is enabled. This can be used if you wish to reject all traffic while performing maintenance, block traffic during a specified period of time (an event), or block traffic while events are not occurring. Consider a waiting room used for vaccine distribution that only allows traffic during sign-up events, and otherwise blocks all traffic. For this case, the waiting room uses `reject`, and its events override this with `fifo`, `random`, or `passthrough`. When this queueing method is enabled and neither `queueAll` is enabled nor an event is prequeueing, the waiting room page **will not refresh automatically**.",
-  "enum": [
-    "fifo",
-    "random",
-    "passthrough",
-    "reject"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_queueing_status_code`.
- */
-export const waitingroom_queueing_status_code: JsonSchema = {
-  "description": "HTTP status code returned to a user while in the queue.",
-  "enum": [
-    200,
-    202,
-    429
-  ],
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_session_duration`.
- */
-export const waitingroom_session_duration: JsonSchema = {
-  "description": "Lifetime of a cookie (in minutes) set by Cloudflare for users who get access to the route. If a user is not seen by Cloudflare again in that time period, they will be treated as a new user that visits the route.",
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_suspended`.
- */
-export const waitingroom_suspended: JsonSchema = {
-  "description": "Suspends or allows traffic going to the waiting room. If set to `true`, the traffic will not go to the waiting room.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `waitingroom_total_active_users`.
- */
-export const waitingroom_total_active_users: JsonSchema = {
-  "description": "Sets the total number of active user sessions on the route at a point in time. A route is a combination of host and path on which a waiting room is available. This value is used as a baseline for the total number of active user sessions on the route. It is possible to have a situation where there are more or less active users sessions on the route based on the traffic patterns at that time around the world.",
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_turnstile_action`.
- */
-export const waitingroom_turnstile_action: JsonSchema = {
-  "description": "Which action to take when a bot is detected using Turnstile. `log` will\nhave no impact on queueing behavior, simply keeping track of how many\nbots are detected in Waiting Room Analytics. `infinite_queue` will send\nbots to a false queueing state, where they will never reach your\norigin. `infinite_queue` requires Advanced Waiting Room.\n",
-  "enum": [
-    "log",
-    "infinite_queue"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_turnstile_mode`.
- */
-export const waitingroom_turnstile_mode: JsonSchema = {
-  "description": "Which Turnstile widget type to use for detecting bot traffic. See\n[the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)\nfor the definitions of these widget types. Set to `off` to disable the\nTurnstile integration entirely. Setting this to anything other than\n`off` or `invisible` requires Advanced Waiting Room.\n",
-  "enum": [
-    "off",
-    "invisible",
-    "visible_non_interactive",
-    "visible_managed"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_waiting_room_id`.
- */
-export const waitingroom_waiting_room_id: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/waitingRooms/settings/outputs.ts b/src/generated/forge-mcp/waitingRooms/settings/outputs.ts
index 8821e3430..591291e28 100644
--- a/src/generated/forge-mcp/waitingRooms/settings/outputs.ts
+++ b/src/generated/forge-mcp/waitingRooms/settings/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `waitingroom_search_engine_crawler_bypass` in responses.
- */
-export const waitingroom_search_engine_crawler_bypass_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `waitingroom_zone_settings_response` in responses.
  */
-export const waitingroom_zone_settings_response_output: JsonSchema = {
+export const waitingroom_zone_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-single"
@@ -23,7 +16,7 @@ export const waitingroom_zone_settings_response_output: JsonSchema = {
         "result": {
           "properties": {
             "search_engine_crawler_bypass": {
-              "$ref": "#/$defs/waitingroom_search_engine_crawler_bypass"
+              "type": "boolean"
             }
           },
           "required": [
diff --git a/src/generated/forge-mcp/waitingRooms/settings/schemas.ts b/src/generated/forge-mcp/waitingRooms/settings/schemas.ts
index 3e87f725f..3637cb5cf 100644
--- a/src/generated/forge-mcp/waitingRooms/settings/schemas.ts
+++ b/src/generated/forge-mcp/waitingRooms/settings/schemas.ts
@@ -3,23 +3,15 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `waitingroom_search_engine_crawler_bypass`.
- */
-export const waitingroom_search_engine_crawler_bypass: JsonSchema = {
-  "description": "Whether to allow verified search engine crawlers to bypass all waiting rooms on this zone.\nVerified search engine crawlers will not be tracked or counted by the waiting room system,\nand will not appear in waiting room analytics.\n",
-  "type": "boolean"
-};
-
 /**
  * The schema of `waitingroom_zone_settings`.
  */
 export const waitingroom_zone_settings: JsonSchema = {
   "properties": {
     "search_engine_crawler_bypass": {
-      "$ref": "#/$defs/waitingroom_search_engine_crawler_bypass",
       "default": false,
-      "description": "Whether to allow verified search engine crawlers to bypass all waiting rooms on this zone.\nVerified search engine crawlers will not be tracked or counted by the waiting room system,\nand will not appear in waiting room analytics.\n"
+      "description": "Whether to allow verified search engine crawlers to bypass all waiting rooms on this zone.\nVerified search engine crawlers will not be tracked or counted by the waiting room system,\nand will not appear in waiting room analytics.",
+      "type": "boolean"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/waitingRooms/settings/tools.ts b/src/generated/forge-mcp/waitingRooms/settings/tools.ts
index 7948beebe..3db50ab5e 100644
--- a/src/generated/forge-mcp/waitingRooms/settings/tools.ts
+++ b/src/generated/forge-mcp/waitingRooms/settings/tools.ts
@@ -3,58 +3,58 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  waitingroom_api_response_common_failure_output,
-  waitingroom_api_response_common_output,
-  waitingroom_api_response_single_output,
-  waitingroom_messages_output,
+  waitingroom_api$$response$$common,
+  waitingroom_api$$response$$common$$failure,
+  waitingroom_api$$response$$single,
+  waitingroom_messages,
 } from "../outputs.js";
-import { waitingroom_identifier } from "../schemas.js";
-import {
-  waitingroom_search_engine_crawler_bypass_output,
-  waitingroom_zone_settings_response_output,
-} from "./outputs.js";
-import {
-  waitingroom_search_engine_crawler_bypass,
-  waitingroom_zone_settings,
-} from "./schemas.js";
+import { waitingroom_zone_settings_response } from "./outputs.js";
+import { waitingroom_zone_settings } from "./schemas.js";
 
 /**
- * The tools of `waiting_rooms.settings`.
+ * The tools of `waitingRooms.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "waiting_rooms_settings_edit",
+    name: "waitingRooms_settings_edit",
     title: "Patch zone-level Waiting Room settings",
-    description: "Patch zone-level Waiting Room settings.",
+    description: "Patch zone-level Waiting Room settings.\n\nPATCH /zones/{zone_id}/waiting_rooms/settings",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_zone_settings"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_search_engine_crawler_bypass": waitingroom_search_engine_crawler_bypass,
         "waitingroom_zone_settings": waitingroom_zone_settings,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_zone_settings_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_search_engine_crawler_bypass": waitingroom_search_engine_crawler_bypass_output,
-        "waitingroom_zone_settings_response": waitingroom_zone_settings_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_zone_settings_response": waitingroom_zone_settings_response,
       },
     },
     annotations: {
@@ -94,12 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_search_engine_crawler_bypass": waitingroom_search_engine_crawler_bypass_output,
-        "waitingroom_zone_settings_response": waitingroom_zone_settings_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_zone_settings_response": waitingroom_zone_settings_response,
       },
     },
     request: (args) => ({
@@ -108,32 +107,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_settings_get",
+    name: "waitingRooms_settings_get",
     title: "Get zone-level Waiting Room settings",
-    description: "Get zone-level Waiting Room settings.",
+    description: "Get zone-level Waiting Room settings.\n\nGET /zones/{zone_id}/waiting_rooms/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_zone_settings_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_search_engine_crawler_bypass": waitingroom_search_engine_crawler_bypass_output,
-        "waitingroom_zone_settings_response": waitingroom_zone_settings_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_zone_settings_response": waitingroom_zone_settings_response,
       },
     },
     annotations: {
@@ -174,12 +179,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_search_engine_crawler_bypass": waitingroom_search_engine_crawler_bypass_output,
-        "waitingroom_zone_settings_response": waitingroom_zone_settings_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_zone_settings_response": waitingroom_zone_settings_response,
       },
     },
     request: (args) => ({
@@ -187,38 +191,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_settings_update",
+    name: "waitingRooms_settings_update",
     title: "Update zone-level Waiting Room settings",
-    description: "Replace zone-level Waiting Room settings.",
+    description: "Replace zone-level Waiting Room settings.\n\nPUT /zones/{zone_id}/waiting_rooms/settings",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_zone_settings"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_search_engine_crawler_bypass": waitingroom_search_engine_crawler_bypass,
         "waitingroom_zone_settings": waitingroom_zone_settings,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_zone_settings_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_search_engine_crawler_bypass": waitingroom_search_engine_crawler_bypass_output,
-        "waitingroom_zone_settings_response": waitingroom_zone_settings_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_zone_settings_response": waitingroom_zone_settings_response,
       },
     },
     annotations: {
@@ -258,12 +269,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_search_engine_crawler_bypass": waitingroom_search_engine_crawler_bypass_output,
-        "waitingroom_zone_settings_response": waitingroom_zone_settings_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_zone_settings_response": waitingroom_zone_settings_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/waitingRooms/statuses/outputs.ts b/src/generated/forge-mcp/waitingRooms/statuses/outputs.ts
index cb65212ef..bd28c0425 100644
--- a/src/generated/forge-mcp/waitingRooms/statuses/outputs.ts
+++ b/src/generated/forge-mcp/waitingRooms/statuses/outputs.ts
@@ -3,51 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `waitingroom_estimated_queued_users` in responses.
- */
-export const waitingroom_estimated_queued_users_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_estimated_total_active_users` in responses.
- */
-export const waitingroom_estimated_total_active_users_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_max_estimated_time_minutes` in responses.
- */
-export const waitingroom_max_estimated_time_minutes_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `waitingroom_status` in responses.
- */
-export const waitingroom_status_output: JsonSchema = {
-  "enum": [
-    "event_prequeueing",
-    "not_queueing",
-    "queueing",
-    "suspended"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `waitingroom_status_event_id` in responses.
- */
-export const waitingroom_status_event_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `waitingroom_status_response` in responses.
  */
-export const waitingroom_status_response_output: JsonSchema = {
+export const waitingroom_status_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/waitingroom_api-response-single"
@@ -57,19 +16,25 @@ export const waitingroom_status_response_output: JsonSchema = {
         "result": {
           "properties": {
             "estimated_queued_users": {
-              "$ref": "#/$defs/waitingroom_estimated_queued_users"
+              "type": "integer"
             },
             "estimated_total_active_users": {
-              "$ref": "#/$defs/waitingroom_estimated_total_active_users"
+              "type": "integer"
             },
             "event_id": {
-              "$ref": "#/$defs/waitingroom_status_event_id"
+              "type": "string"
             },
             "max_estimated_time_minutes": {
-              "$ref": "#/$defs/waitingroom_max_estimated_time_minutes"
+              "type": "integer"
             },
             "status": {
-              "$ref": "#/$defs/waitingroom_status"
+              "enum": [
+                "event_prequeueing",
+                "not_queueing",
+                "queueing",
+                "suspended"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
diff --git a/src/generated/forge-mcp/waitingRooms/statuses/tools.ts b/src/generated/forge-mcp/waitingRooms/statuses/tools.ts
index 2ab503462..c20e10767 100644
--- a/src/generated/forge-mcp/waitingRooms/statuses/tools.ts
+++ b/src/generated/forge-mcp/waitingRooms/statuses/tools.ts
@@ -3,64 +3,54 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  waitingroom_api_response_common_failure_output,
-  waitingroom_api_response_common_output,
-  waitingroom_api_response_single_output,
-  waitingroom_messages_output,
+  waitingroom_api$$response$$common,
+  waitingroom_api$$response$$common$$failure,
+  waitingroom_api$$response$$single,
+  waitingroom_messages,
 } from "../outputs.js";
-import {
-  waitingroom_identifier,
-  waitingroom_waiting_room_id,
-} from "../schemas.js";
-import {
-  waitingroom_estimated_queued_users_output,
-  waitingroom_estimated_total_active_users_output,
-  waitingroom_max_estimated_time_minutes_output,
-  waitingroom_status_event_id_output,
-  waitingroom_status_output,
-  waitingroom_status_response_output,
-} from "./outputs.js";
+import { waitingroom_status_response } from "./outputs.js";
 
 /**
- * The tools of `waiting_rooms.statuses`.
+ * The tools of `waitingRooms.statuses`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "waiting_rooms_statuses_get",
+    name: "waitingRooms_statuses_get",
     title: "Get waiting room status",
-    description: "Fetches the status of a configured waiting room. Response fields include:\n1. `status`: String indicating the status of the waiting room. The possible status are:\n\t- **not_queueing** indicates that the configured thresholds have not been met and all users are going through to the origin.\n\t- **queueing** indicates that the thresholds have been met and some users are held in the waiting room.\n\t- **event_prequeueing** indicates that an event is active and is currently prequeueing users before it starts.\n\t- **suspended** indicates that the room is suspended.\n2. `event_id`: String of the current event's `id` if an event is active, otherwise an empty string.\n3. `estimated_queued_users`: Integer of the estimated number of users currently waiting in the queue.\n4. `estimated_total_active_users`: Integer of the estimated number of users currently active on the origin.\n5. `max_estimated_time_minutes`: Integer of the maximum estimated time currently presented to the users.",
+    description: "Fetches the status of a configured waiting room. Response fields include:\n1. `status`: String indicating the status of the waiting room. The possible status are:\n\t- **not_queueing** indicates that the configured thresholds have not been met and all users are going through to the origin.\n\t- **queueing** indicates that the thresholds have been met and some users are held in the waiting room.\n\t- **event_prequeueing** indicates that an event is active and is currently prequeueing users before it starts.\n\t- **suspended** indicates that the room is suspended.\n2. `event_id`: String of the current event's `id` if an event is active, otherwise an empty string.\n3. `estimated_queued_users`: Integer of the estimated number of users currently waiting in the queue.\n4. `estimated_total_active_users`: Integer of the estimated number of users currently active on the origin.\n5. `max_estimated_time_minutes`: Integer of the maximum estimated time currently presented to the users.\n\nGET /zones/{zone_id}/waiting_rooms/{waiting_room_id}/status",
     inputSchema: {
       type: "object",
       properties: {
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_status_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_estimated_queued_users": waitingroom_estimated_queued_users_output,
-        "waitingroom_estimated_total_active_users": waitingroom_estimated_total_active_users_output,
-        "waitingroom_max_estimated_time_minutes": waitingroom_max_estimated_time_minutes_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_status": waitingroom_status_output,
-        "waitingroom_status_event_id": waitingroom_status_event_id_output,
-        "waitingroom_status_response": waitingroom_status_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_status_response": waitingroom_status_response,
       },
     },
     annotations: {
@@ -101,16 +91,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_estimated_queued_users": waitingroom_estimated_queued_users_output,
-        "waitingroom_estimated_total_active_users": waitingroom_estimated_total_active_users_output,
-        "waitingroom_max_estimated_time_minutes": waitingroom_max_estimated_time_minutes_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_status": waitingroom_status_output,
-        "waitingroom_status_event_id": waitingroom_status_event_id_output,
-        "waitingroom_status_response": waitingroom_status_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_status_response": waitingroom_status_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/waitingRooms/tools.ts b/src/generated/forge-mcp/waitingRooms/tools.ts
index 4a74c7e19..66e6a2524 100644
--- a/src/generated/forge-mcp/waitingRooms/tools.ts
+++ b/src/generated/forge-mcp/waitingRooms/tools.ts
@@ -2,149 +2,76 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../_/tool.js";
-import {
-  waitingroom_additional_routes_output,
-  waitingroom_api_response_common_failure_output,
-  waitingroom_api_response_common_output,
-  waitingroom_api_response_single_output,
-  waitingroom_cookie_attributes_output,
-  waitingroom_cookie_suffix_output,
-  waitingroom_custom_page_html_output,
-  waitingroom_default_template_language_output,
-  waitingroom_description_output,
-  waitingroom_disable_session_renewal_output,
-  waitingroom_enabled_origin_commands_output,
-  waitingroom_host_output,
-  waitingroom_json_response_enabled_output,
-  waitingroom_messages_output,
-  waitingroom_name_output,
-  waitingroom_new_users_per_minute_output,
-  waitingroom_next_event_prequeue_start_time_output,
-  waitingroom_next_event_start_time_output,
-  waitingroom_path_output,
-  waitingroom_queue_all_output,
-  waitingroom_queueing_method_output,
-  waitingroom_queueing_status_code_output,
-  waitingroom_session_duration_output,
-  waitingroom_single_response_output,
-  waitingroom_suspended_output,
-  waitingroom_timestamp_output,
-  waitingroom_total_active_users_output,
-  waitingroom_turnstile_action_output,
-  waitingroom_turnstile_mode_output,
-  waitingroom_waiting_room_id_output,
-  waitingroom_waiting_room_id_response_output,
-  waitingroom_waitingroom_output,
-} from "./outputs.js";
 import {
   waitingroom_additional_routes,
+  waitingroom_api$$response$$common,
+  waitingroom_api$$response$$common$$failure,
+  waitingroom_api$$response$$single,
   waitingroom_cookie_attributes,
-  waitingroom_cookie_suffix,
-  waitingroom_custom_page_html,
-  waitingroom_default_template_language,
-  waitingroom_description,
-  waitingroom_disable_session_renewal,
   waitingroom_enabled_origin_commands,
-  waitingroom_host,
-  waitingroom_identifier,
-  waitingroom_json_response_enabled,
-  waitingroom_name,
-  waitingroom_new_users_per_minute,
-  waitingroom_path,
+  waitingroom_messages,
+  waitingroom_single_response,
+  waitingroom_waiting_room_id_response,
+  waitingroom_waitingroom,
+} from "./outputs.js";
+import {
+  waitingroom_additional_routes as waitingroom_additional_routes$,
+  waitingroom_cookie_attributes as waitingroom_cookie_attributes$,
+  waitingroom_enabled_origin_commands as waitingroom_enabled_origin_commands$,
   waitingroom_query_waitingroom,
-  waitingroom_queue_all,
-  waitingroom_queueing_method,
-  waitingroom_queueing_status_code,
-  waitingroom_session_duration,
-  waitingroom_suspended,
-  waitingroom_total_active_users,
-  waitingroom_turnstile_action,
-  waitingroom_turnstile_mode,
-  waitingroom_waiting_room_id,
 } from "./schemas.js";
 
 /**
- * The tools of `waiting_rooms`.
+ * The tools of `waitingRooms`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "waiting_rooms_create",
+    name: "waitingRooms_create",
     title: "Create waiting room",
-    description: "Creates a new waiting room.",
+    description: "Creates a new waiting room.\n\nPOST /zones/{zone_id}/waiting_rooms",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_query_waitingroom"
         },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html,
-        "waitingroom_default_template_language": waitingroom_default_template_language,
-        "waitingroom_description": waitingroom_description,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
-        "waitingroom_host": waitingroom_host,
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled,
-        "waitingroom_name": waitingroom_name,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute,
-        "waitingroom_path": waitingroom_path,
+        "waitingroom_additional_routes": waitingroom_additional_routes$,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes$,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands$,
         "waitingroom_query_waitingroom": waitingroom_query_waitingroom,
-        "waitingroom_queue_all": waitingroom_queue_all,
-        "waitingroom_queueing_method": waitingroom_queueing_method,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code,
-        "waitingroom_session_duration": waitingroom_session_duration,
-        "waitingroom_suspended": waitingroom_suspended,
-        "waitingroom_total_active_users": waitingroom_total_active_users,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_single_response",
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_single_response": waitingroom_single_response_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_single_response": waitingroom_single_response,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     annotations: {
@@ -184,37 +111,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_single_response": waitingroom_single_response_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_single_response": waitingroom_single_response,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     request: (args) => ({
@@ -223,37 +128,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_delete",
+    name: "waitingRooms_delete",
     title: "Delete waiting room",
-    description: "Deletes a waiting room.\n\nConfirm with the user before calling this tool. This operation deletes the waiting room from the zone.",
+    description: "Deletes a waiting room.\n\nConfirm with the user before calling this tool. This operation deletes the waiting room from the zone.\n\nDELETE /zones/{zone_id}/waiting_rooms/{waiting_room_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_waiting_room_id_response",
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waiting_room_id_response": waitingroom_waiting_room_id_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_waiting_room_id_response": waitingroom_waiting_room_id_response,
       },
     },
     annotations: {
@@ -293,12 +203,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waiting_room_id_response": waitingroom_waiting_room_id_response_output,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_waiting_room_id_response": waitingroom_waiting_room_id_response,
       },
     },
     request: (args) => ({
@@ -306,88 +215,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_edit",
+    name: "waitingRooms_edit",
     title: "Patch waiting room",
-    description: "Patches a configured waiting room.",
+    description: "Patches a configured waiting room.\n\nPATCH /zones/{zone_id}/waiting_rooms/{waiting_room_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_query_waitingroom"
         },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html,
-        "waitingroom_default_template_language": waitingroom_default_template_language,
-        "waitingroom_description": waitingroom_description,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
-        "waitingroom_host": waitingroom_host,
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled,
-        "waitingroom_name": waitingroom_name,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute,
-        "waitingroom_path": waitingroom_path,
+        "waitingroom_additional_routes": waitingroom_additional_routes$,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes$,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands$,
         "waitingroom_query_waitingroom": waitingroom_query_waitingroom,
-        "waitingroom_queue_all": waitingroom_queue_all,
-        "waitingroom_queueing_method": waitingroom_queueing_method,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code,
-        "waitingroom_session_duration": waitingroom_session_duration,
-        "waitingroom_suspended": waitingroom_suspended,
-        "waitingroom_total_active_users": waitingroom_total_active_users,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_single_response",
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_single_response": waitingroom_single_response_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_single_response": waitingroom_single_response,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     annotations: {
@@ -427,37 +304,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_single_response": waitingroom_single_response_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_single_response": waitingroom_single_response,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     request: (args) => ({
@@ -466,62 +321,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_get",
+    name: "waitingRooms_get",
     title: "Waiting room details",
-    description: "Fetches a single configured waiting room.",
+    description: "Fetches a single configured waiting room.\n\nGET /zones/{zone_id}/waiting_rooms/{waiting_room_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id"
+        "path"
       ],
-      $defs: {
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_single_response",
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_single_response": waitingroom_single_response_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_single_response": waitingroom_single_response,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     annotations: {
@@ -562,37 +401,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_single_response": waitingroom_single_response_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_single_response": waitingroom_single_response,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     request: (args) => ({
@@ -600,88 +417,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "waiting_rooms_update",
+    name: "waitingRooms_update",
     title: "Update waiting room",
-    description: "Updates a configured waiting room.",
+    description: "Updates a configured waiting room.\n\nPUT /zones/{zone_id}/waiting_rooms/{waiting_room_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/waitingroom_query_waitingroom"
         },
-        "waiting_room_id": {
-          "$ref": "#/$defs/waitingroom_waiting_room_id"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/waitingroom_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "waiting_room_id": {
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "waiting_room_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "waiting_room_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html,
-        "waitingroom_default_template_language": waitingroom_default_template_language,
-        "waitingroom_description": waitingroom_description,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
-        "waitingroom_host": waitingroom_host,
-        "waitingroom_identifier": waitingroom_identifier,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled,
-        "waitingroom_name": waitingroom_name,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute,
-        "waitingroom_path": waitingroom_path,
+        "waitingroom_additional_routes": waitingroom_additional_routes$,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes$,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands$,
         "waitingroom_query_waitingroom": waitingroom_query_waitingroom,
-        "waitingroom_queue_all": waitingroom_queue_all,
-        "waitingroom_queueing_method": waitingroom_queueing_method,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code,
-        "waitingroom_session_duration": waitingroom_session_duration,
-        "waitingroom_suspended": waitingroom_suspended,
-        "waitingroom_total_active_users": waitingroom_total_active_users,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/waitingroom_single_response",
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_single_response": waitingroom_single_response_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_single_response": waitingroom_single_response,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     annotations: {
@@ -721,37 +506,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "waitingroom_additional_routes": waitingroom_additional_routes_output,
-        "waitingroom_api-response-common": waitingroom_api_response_common_output,
-        "waitingroom_api-response-common-failure": waitingroom_api_response_common_failure_output,
-        "waitingroom_api-response-single": waitingroom_api_response_single_output,
-        "waitingroom_cookie_attributes": waitingroom_cookie_attributes_output,
-        "waitingroom_cookie_suffix": waitingroom_cookie_suffix_output,
-        "waitingroom_custom_page_html": waitingroom_custom_page_html_output,
-        "waitingroom_default_template_language": waitingroom_default_template_language_output,
-        "waitingroom_description": waitingroom_description_output,
-        "waitingroom_disable_session_renewal": waitingroom_disable_session_renewal_output,
-        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands_output,
-        "waitingroom_host": waitingroom_host_output,
-        "waitingroom_json_response_enabled": waitingroom_json_response_enabled_output,
-        "waitingroom_messages": waitingroom_messages_output,
-        "waitingroom_name": waitingroom_name_output,
-        "waitingroom_new_users_per_minute": waitingroom_new_users_per_minute_output,
-        "waitingroom_next_event_prequeue_start_time": waitingroom_next_event_prequeue_start_time_output,
-        "waitingroom_next_event_start_time": waitingroom_next_event_start_time_output,
-        "waitingroom_path": waitingroom_path_output,
-        "waitingroom_queue_all": waitingroom_queue_all_output,
-        "waitingroom_queueing_method": waitingroom_queueing_method_output,
-        "waitingroom_queueing_status_code": waitingroom_queueing_status_code_output,
-        "waitingroom_session_duration": waitingroom_session_duration_output,
-        "waitingroom_single_response": waitingroom_single_response_output,
-        "waitingroom_suspended": waitingroom_suspended_output,
-        "waitingroom_timestamp": waitingroom_timestamp_output,
-        "waitingroom_total_active_users": waitingroom_total_active_users_output,
-        "waitingroom_turnstile_action": waitingroom_turnstile_action_output,
-        "waitingroom_turnstile_mode": waitingroom_turnstile_mode_output,
-        "waitingroom_waiting_room_id": waitingroom_waiting_room_id_output,
-        "waitingroom_waitingroom": waitingroom_waitingroom_output,
+        "waitingroom_additional_routes": waitingroom_additional_routes,
+        "waitingroom_api-response-common": waitingroom_api$$response$$common,
+        "waitingroom_api-response-common-failure": waitingroom_api$$response$$common$$failure,
+        "waitingroom_api-response-single": waitingroom_api$$response$$single,
+        "waitingroom_cookie_attributes": waitingroom_cookie_attributes,
+        "waitingroom_enabled_origin_commands": waitingroom_enabled_origin_commands,
+        "waitingroom_messages": waitingroom_messages,
+        "waitingroom_single_response": waitingroom_single_response,
+        "waitingroom_waitingroom": waitingroom_waitingroom,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/outputs.ts b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/outputs.ts
index e3e6cb1bd..c374faa92 100644
--- a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/outputs.ts
+++ b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
 /**
  * The schema of `web3_content_list_entry_collection_response` in responses.
  */
-export const web3_content_list_entry_collection_response_output: JsonSchema = {
+export const web3_content_list_entry_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/web3_api-response-collection"
@@ -30,7 +30,7 @@ export const web3_content_list_entry_collection_response_output: JsonSchema = {
 /**
  * The schema of `web3_content_list_entry_single_response` in responses.
  */
-export const web3_content_list_entry_single_response_output: JsonSchema = {
+export const web3_content_list_entry_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/web3_api-response-single"
diff --git a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/schemas.ts b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/schemas.ts
index 91100aa01..ac1c3ce4d 100644
--- a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/schemas.ts
+++ b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/schemas.ts
@@ -9,16 +9,20 @@ import type { JsonSchema } from "../../../../../_/tool.js";
 export const web3_content_list_entry_create_request: JsonSchema = {
   "properties": {
     "content": {
-      "$ref": "#/$defs/web3_content_list_entry_content",
-      "description": "Specify the CID or content path of content to block."
+      "description": "Specify the CID or content path of content to block.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/web3_content_list_entry_description",
-      "description": "Specify an optional description of the content list entry."
+      "description": "Specify an optional description of the content list entry.",
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/web3_content_list_entry_type",
-      "description": "Specify the type of content list entry to block."
+      "description": "Specify the type of content list entry to block.",
+      "enum": [
+        "cid",
+        "content_path"
+      ],
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/tools.ts b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/tools.ts
index c937a5ed8..c340e9b59 100644
--- a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/tools.ts
+++ b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/entries/tools.ts
@@ -3,84 +3,74 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  web3_api_response_collection_output,
-  web3_api_response_common_failure_output,
-  web3_api_response_common_output,
-  web3_api_response_single_id_output,
-  web3_api_response_single_output,
-  web3_identifier_output,
-  web3_messages_output,
-  web3_result_info_output,
-  web3_timestamp_output,
+  web3_api$$response$$collection,
+  web3_api$$response$$common,
+  web3_api$$response$$common$$failure,
+  web3_api$$response$$single,
+  web3_api$$response$$single$$id,
+  web3_messages,
+  web3_result_info,
 } from "../../../outputs.js";
-import { web3_identifier } from "../../../schemas.js";
 import {
-  web3_content_list_entries_output,
-  web3_content_list_entry_content_output,
-  web3_content_list_entry_description_output,
-  web3_content_list_entry_output,
-  web3_content_list_entry_type_output,
+  web3_content_list_entries,
+  web3_content_list_entry,
 } from "../outputs.js";
 import {
-  web3_content_list_entry_content,
-  web3_content_list_entry_description,
-  web3_content_list_entry_type,
-} from "../schemas.js";
-import {
-  web3_content_list_entry_collection_response_output,
-  web3_content_list_entry_single_response_output,
+  web3_content_list_entry_collection_response,
+  web3_content_list_entry_single_response,
 } from "./outputs.js";
 import { web3_content_list_entry_create_request } from "./schemas.js";
 
 /**
- * The tools of `web3.hostnames.ipfs_universal_paths.content_lists.entries`.
+ * The tools of `web3.hostnames.ipfsUniversalPaths.contentLists.entries`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web3_hostnames_ipfs_universal_paths_content_lists_entries_create",
+    name: "web3_hostnames_ipfsUniversalPaths_contentLists_entries_create",
     title: "Create IPFS Universal Path Gateway Content List Entry",
-    description: "Create IPFS Universal Path Gateway Content List Entry",
+    description: "Create IPFS Universal Path Gateway Content List Entry\n\nPOST /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/web3_content_list_entry_create_request"
         },
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "web3_content_list_entry_content": web3_content_list_entry_content,
         "web3_content_list_entry_create_request": web3_content_list_entry_create_request,
-        "web3_content_list_entry_description": web3_content_list_entry_description,
-        "web3_content_list_entry_type": web3_content_list_entry_type,
-        "web3_identifier": web3_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/web3_content_list_entry_single_response",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_entry": web3_content_list_entry_output,
-        "web3_content_list_entry_content": web3_content_list_entry_content_output,
-        "web3_content_list_entry_description": web3_content_list_entry_description_output,
-        "web3_content_list_entry_single_response": web3_content_list_entry_single_response_output,
-        "web3_content_list_entry_type": web3_content_list_entry_type_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_timestamp": web3_timestamp_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_entry": web3_content_list_entry,
+        "web3_content_list_entry_single_response": web3_content_list_entry_single_response,
+        "web3_messages": web3_messages,
       },
     },
     annotations: {
@@ -127,17 +117,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_entry": web3_content_list_entry_output,
-        "web3_content_list_entry_content": web3_content_list_entry_content_output,
-        "web3_content_list_entry_description": web3_content_list_entry_description_output,
-        "web3_content_list_entry_single_response": web3_content_list_entry_single_response_output,
-        "web3_content_list_entry_type": web3_content_list_entry_type_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_timestamp": web3_timestamp_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_entry": web3_content_list_entry,
+        "web3_content_list_entry_single_response": web3_content_list_entry_single_response,
+        "web3_messages": web3_messages,
       },
     },
     request: (args) => ({
@@ -146,43 +131,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web3_hostnames_ipfs_universal_paths_content_lists_entries_delete",
+    name: "web3_hostnames_ipfsUniversalPaths_contentLists_entries_delete",
     title: "Delete IPFS Universal Path Gateway Content List Entry",
-    description: "Delete IPFS Universal Path Gateway Content List Entry",
+    description: "Delete IPFS Universal Path Gateway Content List Entry\n\nDELETE /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {},
-        "content_list_entry_identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "content_list_entry_identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier",
+            "content_list_entry_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier",
-        "content_list_entry_identifier",
+        "path",
         "body"
       ],
-      $defs: {
-        "web3_identifier": web3_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/web3_api-response-single-id",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single-id": web3_api_response_single_id_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single-id": web3_api$$response$$single$$id,
+        "web3_messages": web3_messages,
       },
     },
     annotations: {
@@ -232,11 +223,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single-id": web3_api_response_single_id_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single-id": web3_api$$response$$single$$id,
+        "web3_messages": web3_messages,
       },
     },
     request: (args) => ({
@@ -245,47 +235,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web3_hostnames_ipfs_universal_paths_content_lists_entries_get",
+    name: "web3_hostnames_ipfsUniversalPaths_contentLists_entries_get",
     title: "IPFS Universal Path Gateway Content List Entry Details",
-    description: "IPFS Universal Path Gateway Content List Entry Details",
+    description: "IPFS Universal Path Gateway Content List Entry Details\n\nGET /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "content_list_entry_identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "content_list_entry_identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier",
+            "content_list_entry_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier",
-        "content_list_entry_identifier"
+        "path"
       ],
-      $defs: {
-        "web3_identifier": web3_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/web3_content_list_entry_single_response",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_entry": web3_content_list_entry_output,
-        "web3_content_list_entry_content": web3_content_list_entry_content_output,
-        "web3_content_list_entry_description": web3_content_list_entry_description_output,
-        "web3_content_list_entry_single_response": web3_content_list_entry_single_response_output,
-        "web3_content_list_entry_type": web3_content_list_entry_type_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_timestamp": web3_timestamp_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_entry": web3_content_list_entry,
+        "web3_content_list_entry_single_response": web3_content_list_entry_single_response,
+        "web3_messages": web3_messages,
       },
     },
     annotations: {
@@ -336,17 +328,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_entry": web3_content_list_entry_output,
-        "web3_content_list_entry_content": web3_content_list_entry_content_output,
-        "web3_content_list_entry_description": web3_content_list_entry_description_output,
-        "web3_content_list_entry_single_response": web3_content_list_entry_single_response_output,
-        "web3_content_list_entry_type": web3_content_list_entry_type_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_timestamp": web3_timestamp_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_entry": web3_content_list_entry,
+        "web3_content_list_entry_single_response": web3_content_list_entry_single_response,
+        "web3_messages": web3_messages,
       },
     },
     request: (args) => ({
@@ -354,44 +341,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web3_hostnames_ipfs_universal_paths_content_lists_entries_list",
+    name: "web3_hostnames_ipfsUniversalPaths_contentLists_entries_list",
     title: "List IPFS Universal Path Gateway Content List Entries",
-    description: "List IPFS Universal Path Gateway Content List Entries",
+    description: "List IPFS Universal Path Gateway Content List Entries\n\nGET /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
     inputSchema: {
       type: "object",
       properties: {
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "web3_identifier": web3_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/web3_content_list_entry_collection_response",
       $defs: {
-        "web3_api-response-collection": web3_api_response_collection_output,
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_content_list_entries": web3_content_list_entries_output,
-        "web3_content_list_entry": web3_content_list_entry_output,
-        "web3_content_list_entry_collection_response": web3_content_list_entry_collection_response_output,
-        "web3_content_list_entry_content": web3_content_list_entry_content_output,
-        "web3_content_list_entry_description": web3_content_list_entry_description_output,
-        "web3_content_list_entry_type": web3_content_list_entry_type_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_result_info": web3_result_info_output,
-        "web3_timestamp": web3_timestamp_output,
+        "web3_api-response-collection": web3_api$$response$$collection,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_content_list_entries": web3_content_list_entries,
+        "web3_content_list_entry": web3_content_list_entry,
+        "web3_content_list_entry_collection_response": web3_content_list_entry_collection_response,
+        "web3_messages": web3_messages,
+        "web3_result_info": web3_result_info,
       },
     },
     annotations: {
@@ -442,19 +431,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-collection": web3_api_response_collection_output,
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_content_list_entries": web3_content_list_entries_output,
-        "web3_content_list_entry": web3_content_list_entry_output,
-        "web3_content_list_entry_collection_response": web3_content_list_entry_collection_response_output,
-        "web3_content_list_entry_content": web3_content_list_entry_content_output,
-        "web3_content_list_entry_description": web3_content_list_entry_description_output,
-        "web3_content_list_entry_type": web3_content_list_entry_type_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_result_info": web3_result_info_output,
-        "web3_timestamp": web3_timestamp_output,
+        "web3_api-response-collection": web3_api$$response$$collection,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_content_list_entries": web3_content_list_entries,
+        "web3_content_list_entry": web3_content_list_entry,
+        "web3_content_list_entry_collection_response": web3_content_list_entry_collection_response,
+        "web3_messages": web3_messages,
+        "web3_result_info": web3_result_info,
       },
     },
     request: (args) => ({
@@ -462,55 +446,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web3_hostnames_ipfs_universal_paths_content_lists_entries_update",
+    name: "web3_hostnames_ipfsUniversalPaths_contentLists_entries_update",
     title: "Edit IPFS Universal Path Gateway Content List Entry",
-    description: "Edit IPFS Universal Path Gateway Content List Entry",
+    description: "Edit IPFS Universal Path Gateway Content List Entry\n\nPUT /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/web3_content_list_entry_create_request"
         },
-        "content_list_entry_identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "content_list_entry_identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier",
+            "content_list_entry_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier",
-        "content_list_entry_identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "web3_content_list_entry_content": web3_content_list_entry_content,
         "web3_content_list_entry_create_request": web3_content_list_entry_create_request,
-        "web3_content_list_entry_description": web3_content_list_entry_description,
-        "web3_content_list_entry_type": web3_content_list_entry_type,
-        "web3_identifier": web3_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/web3_content_list_entry_single_response",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_entry": web3_content_list_entry_output,
-        "web3_content_list_entry_content": web3_content_list_entry_content_output,
-        "web3_content_list_entry_description": web3_content_list_entry_description_output,
-        "web3_content_list_entry_single_response": web3_content_list_entry_single_response_output,
-        "web3_content_list_entry_type": web3_content_list_entry_type_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_timestamp": web3_timestamp_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_entry": web3_content_list_entry,
+        "web3_content_list_entry_single_response": web3_content_list_entry_single_response,
+        "web3_messages": web3_messages,
       },
     },
     annotations: {
@@ -560,17 +545,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_entry": web3_content_list_entry_output,
-        "web3_content_list_entry_content": web3_content_list_entry_content_output,
-        "web3_content_list_entry_description": web3_content_list_entry_description_output,
-        "web3_content_list_entry_single_response": web3_content_list_entry_single_response_output,
-        "web3_content_list_entry_type": web3_content_list_entry_type_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_timestamp": web3_timestamp_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_entry": web3_content_list_entry,
+        "web3_content_list_entry_single_response": web3_content_list_entry_single_response,
+        "web3_messages": web3_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/outputs.ts b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/outputs.ts
index 55c99c80d..e94ef1298 100644
--- a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/outputs.ts
+++ b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/outputs.ts
@@ -3,23 +3,16 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `web3_content_list_action` in responses.
- */
-export const web3_content_list_action_output: JsonSchema = {
-  "enum": [
-    "block"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `web3_content_list_details` in responses.
  */
-export const web3_content_list_details_output: JsonSchema = {
+export const web3_content_list_details: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/web3_content_list_action"
+      "enum": [
+        "block"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -28,7 +21,7 @@ export const web3_content_list_details_output: JsonSchema = {
 /**
  * The schema of `web3_content_list_details_response` in responses.
  */
-export const web3_content_list_details_response_output: JsonSchema = {
+export const web3_content_list_details_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/web3_api-response-single"
@@ -47,7 +40,7 @@ export const web3_content_list_details_response_output: JsonSchema = {
 /**
  * The schema of `web3_content_list_entries` in responses.
  */
-export const web3_content_list_entries_output: JsonSchema = {
+export const web3_content_list_entries: JsonSchema = {
   "items": {
     "$ref": "#/$defs/web3_content_list_entry"
   },
@@ -57,51 +50,32 @@ export const web3_content_list_entries_output: JsonSchema = {
 /**
  * The schema of `web3_content_list_entry` in responses.
  */
-export const web3_content_list_entry_output: JsonSchema = {
+export const web3_content_list_entry: JsonSchema = {
   "properties": {
     "content": {
-      "$ref": "#/$defs/web3_content_list_entry_content"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/web3_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/web3_content_list_entry_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/web3_identifier"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/web3_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/web3_content_list_entry_type"
+      "enum": [
+        "cid",
+        "content_path"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `web3_content_list_entry_content` in responses.
- */
-export const web3_content_list_entry_content_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `web3_content_list_entry_description` in responses.
- */
-export const web3_content_list_entry_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `web3_content_list_entry_type` in responses.
- */
-export const web3_content_list_entry_type_output: JsonSchema = {
-  "enum": [
-    "cid",
-    "content_path"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/schemas.ts b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/schemas.ts
index 6af431843..bf3a7ea8f 100644
--- a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/schemas.ts
+++ b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/schemas.ts
@@ -3,17 +3,6 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `web3_content_list_action`.
- */
-export const web3_content_list_action: JsonSchema = {
-  "description": "Behavior of the content list.",
-  "enum": [
-    "block"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `web3_content_list_entries`.
  */
@@ -32,57 +21,36 @@ export const web3_content_list_entry: JsonSchema = {
   "description": "Specify a content list entry to block.",
   "properties": {
     "content": {
-      "$ref": "#/$defs/web3_content_list_entry_content",
-      "description": "Specify the CID or content path of content to block."
+      "description": "Specify the CID or content path of content to block.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/web3_content_list_entry_description",
-      "description": "Specify an optional description of the content list entry."
+      "description": "Specify an optional description of the content list entry.",
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/web3_content_list_entry_type",
-      "description": "Specify the type of content list entry to block."
+      "description": "Specify the type of content list entry to block.",
+      "enum": [
+        "cid",
+        "content_path"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `web3_content_list_entry_content`.
- */
-export const web3_content_list_entry_content: JsonSchema = {
-  "description": "Specify the CID or content path of content to block.",
-  "type": "string"
-};
-
-/**
- * The schema of `web3_content_list_entry_description`.
- */
-export const web3_content_list_entry_description: JsonSchema = {
-  "description": "Specify an optional description of the content list entry.",
-  "type": "string"
-};
-
-/**
- * The schema of `web3_content_list_entry_type`.
- */
-export const web3_content_list_entry_type: JsonSchema = {
-  "description": "Specify the type of content list entry to block.",
-  "enum": [
-    "cid",
-    "content_path"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `web3_content_list_update_request`.
  */
 export const web3_content_list_update_request: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/web3_content_list_action",
-      "description": "Behavior of the content list."
+      "description": "Behavior of the content list.",
+      "enum": [
+        "block"
+      ],
+      "type": "string"
     },
     "entries": {
       "$ref": "#/$defs/web3_content_list_entries",
diff --git a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/tools.ts b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/tools.ts
index b9813f8c9..689beef38 100644
--- a/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/tools.ts
+++ b/src/generated/forge-mcp/web3/hostnames/ipfsUniversalPaths/contentLists/tools.ts
@@ -3,64 +3,64 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  web3_api_response_common_failure_output,
-  web3_api_response_common_output,
-  web3_api_response_single_output,
-  web3_messages_output,
+  web3_api$$response$$common,
+  web3_api$$response$$common$$failure,
+  web3_api$$response$$single,
+  web3_messages,
 } from "../../outputs.js";
-import { web3_identifier } from "../../schemas.js";
 import {
-  web3_content_list_action_output,
-  web3_content_list_details_output,
-  web3_content_list_details_response_output,
+  web3_content_list_details,
+  web3_content_list_details_response,
 } from "./outputs.js";
 import {
-  web3_content_list_action,
   web3_content_list_entries,
   web3_content_list_entry,
-  web3_content_list_entry_content,
-  web3_content_list_entry_description,
-  web3_content_list_entry_type,
   web3_content_list_update_request,
 } from "./schemas.js";
 
 /**
- * The tools of `web3.hostnames.ipfs_universal_paths.content_lists`.
+ * The tools of `web3.hostnames.ipfsUniversalPaths.contentLists`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web3_hostnames_ipfs_universal_paths_content_lists_get",
+    name: "web3_hostnames_ipfsUniversalPaths_contentLists_get",
     title: "IPFS Universal Path Gateway Content List Details",
-    description: "IPFS Universal Path Gateway Content List Details",
+    description: "IPFS Universal Path Gateway Content List Details\n\nGET /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
     inputSchema: {
       type: "object",
       properties: {
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "web3_identifier": web3_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/web3_content_list_details_response",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_action": web3_content_list_action_output,
-        "web3_content_list_details": web3_content_list_details_output,
-        "web3_content_list_details_response": web3_content_list_details_response_output,
-        "web3_messages": web3_messages_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_details": web3_content_list_details,
+        "web3_content_list_details_response": web3_content_list_details_response,
+        "web3_messages": web3_messages,
       },
     },
     annotations: {
@@ -111,13 +111,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_action": web3_content_list_action_output,
-        "web3_content_list_details": web3_content_list_details_output,
-        "web3_content_list_details_response": web3_content_list_details_response_output,
-        "web3_messages": web3_messages_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_details": web3_content_list_details,
+        "web3_content_list_details_response": web3_content_list_details_response,
+        "web3_messages": web3_messages,
       },
     },
     request: (args) => ({
@@ -125,49 +124,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web3_hostnames_ipfs_universal_paths_content_lists_update",
+    name: "web3_hostnames_ipfsUniversalPaths_contentLists_update",
     title: "Update IPFS Universal Path Gateway Content List",
-    description: "Update IPFS Universal Path Gateway Content List",
+    description: "Update IPFS Universal Path Gateway Content List\n\nPUT /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/web3_content_list_update_request"
         },
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "web3_content_list_action": web3_content_list_action,
         "web3_content_list_entries": web3_content_list_entries,
         "web3_content_list_entry": web3_content_list_entry,
-        "web3_content_list_entry_content": web3_content_list_entry_content,
-        "web3_content_list_entry_description": web3_content_list_entry_description,
-        "web3_content_list_entry_type": web3_content_list_entry_type,
         "web3_content_list_update_request": web3_content_list_update_request,
-        "web3_identifier": web3_identifier,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/web3_content_list_details_response",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_action": web3_content_list_action_output,
-        "web3_content_list_details": web3_content_list_details_output,
-        "web3_content_list_details_response": web3_content_list_details_response_output,
-        "web3_messages": web3_messages_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_details": web3_content_list_details,
+        "web3_content_list_details_response": web3_content_list_details_response,
+        "web3_messages": web3_messages,
       },
     },
     annotations: {
@@ -217,13 +220,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_content_list_action": web3_content_list_action_output,
-        "web3_content_list_details": web3_content_list_details_output,
-        "web3_content_list_details_response": web3_content_list_details_response_output,
-        "web3_messages": web3_messages_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_content_list_details": web3_content_list_details,
+        "web3_content_list_details_response": web3_content_list_details_response,
+        "web3_messages": web3_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/web3/hostnames/outputs.ts b/src/generated/forge-mcp/web3/hostnames/outputs.ts
index 696e692c3..1d2199ad9 100644
--- a/src/generated/forge-mcp/web3/hostnames/outputs.ts
+++ b/src/generated/forge-mcp/web3/hostnames/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `web3_api-response-collection` in responses.
  */
-export const web3_api_response_collection_output: JsonSchema = {
+export const web3_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/web3_api-response-common"
@@ -36,7 +36,7 @@ export const web3_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `web3_api-response-common` in responses.
  */
-export const web3_api_response_common_output: JsonSchema = {
+export const web3_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/web3_messages"
@@ -77,7 +77,7 @@ export const web3_api_response_common_output: JsonSchema = {
 /**
  * The schema of `web3_api-response-common-failure` in responses.
  */
-export const web3_api_response_common_failure_output: JsonSchema = {
+export const web3_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/web3_messages"
@@ -107,7 +107,7 @@ export const web3_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `web3_api-response-single` in responses.
  */
-export const web3_api_response_single_output: JsonSchema = {
+export const web3_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/web3_api-response-common"
@@ -136,7 +136,7 @@ export const web3_api_response_single_output: JsonSchema = {
 /**
  * The schema of `web3_api-response-single-id` in responses.
  */
-export const web3_api_response_single_id_output: JsonSchema = {
+export const web3_api$$response$$single$$id: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/web3_api-response-common"
@@ -148,7 +148,7 @@ export const web3_api_response_single_id_output: JsonSchema = {
             {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/web3_identifier"
+                  "type": "string"
                 }
               },
               "required": [
@@ -170,7 +170,7 @@ export const web3_api_response_single_id_output: JsonSchema = {
 /**
  * The schema of `web3_collection_response` in responses.
  */
-export const web3_collection_response_output: JsonSchema = {
+export const web3_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/web3_api-response-collection"
@@ -189,31 +189,10 @@ export const web3_collection_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `web3_description` in responses.
- */
-export const web3_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `web3_dnslink` in responses.
- */
-export const web3_dnslink_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `web3_identifier` in responses.
- */
-export const web3_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `web3_messages` in responses.
  */
-export const web3_messages_output: JsonSchema = {
+export const web3_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -232,17 +211,10 @@ export const web3_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `web3_name` in responses.
- */
-export const web3_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `web3_result_info` in responses.
  */
-export const web3_result_info_output: JsonSchema = {
+export const web3_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -263,7 +235,7 @@ export const web3_result_info_output: JsonSchema = {
 /**
  * The schema of `web3_single_response` in responses.
  */
-export const web3_single_response_output: JsonSchema = {
+export const web3_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/web3_api-response-single"
@@ -279,67 +251,47 @@ export const web3_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `web3_status` in responses.
- */
-export const web3_status_output: JsonSchema = {
-  "enum": [
-    "active",
-    "pending",
-    "deleting",
-    "error"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `web3_target` in responses.
- */
-export const web3_target_output: JsonSchema = {
-  "enum": [
-    "ethereum",
-    "ipfs",
-    "ipfs_universal_path"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `web3_timestamp` in responses.
- */
-export const web3_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `web3_web3-hostname` in responses.
  */
-export const web3_web3_hostname_output: JsonSchema = {
+export const web3_web3$$hostname: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/web3_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/web3_description"
+      "type": "string"
     },
     "dnslink": {
-      "$ref": "#/$defs/web3_dnslink"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/web3_identifier"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/web3_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/web3_name"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/web3_status"
+      "enum": [
+        "active",
+        "pending",
+        "deleting",
+        "error"
+      ],
+      "type": "string"
     },
     "target": {
-      "$ref": "#/$defs/web3_target"
+      "enum": [
+        "ethereum",
+        "ipfs",
+        "ipfs_universal_path"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/web3/hostnames/schemas.ts b/src/generated/forge-mcp/web3/hostnames/schemas.ts
index b18d93f1e..21f98653b 100644
--- a/src/generated/forge-mcp/web3/hostnames/schemas.ts
+++ b/src/generated/forge-mcp/web3/hostnames/schemas.ts
@@ -9,20 +9,25 @@ import type { JsonSchema } from "../../_/tool.js";
 export const web3_create_request: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/web3_description",
-      "description": "Specify an optional description of the hostname."
+      "description": "Specify an optional description of the hostname.",
+      "type": "string"
     },
     "dnslink": {
-      "$ref": "#/$defs/web3_dnslink",
-      "description": "Specify the DNSLink value used if the target is ipfs."
+      "description": "Specify the DNSLink value used if the target is ipfs.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/web3_name",
-      "description": "Specify the hostname that points to the target gateway via CNAME."
+      "description": "Specify the hostname that points to the target gateway via CNAME.",
+      "type": "string"
     },
     "target": {
-      "$ref": "#/$defs/web3_target",
-      "description": "Specify the target gateway of the hostname."
+      "description": "Specify the target gateway of the hostname.",
+      "enum": [
+        "ethereum",
+        "ipfs",
+        "ipfs_universal_path"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -32,64 +37,19 @@ export const web3_create_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `web3_description`.
- */
-export const web3_description: JsonSchema = {
-  "description": "Specify an optional description of the hostname.",
-  "type": "string"
-};
-
-/**
- * The schema of `web3_dnslink`.
- */
-export const web3_dnslink: JsonSchema = {
-  "description": "Specify the DNSLink value used if the target is ipfs.",
-  "type": "string"
-};
-
-/**
- * The schema of `web3_identifier`.
- */
-export const web3_identifier: JsonSchema = {
-  "description": "Specify the identifier of the hostname.",
-  "type": "string"
-};
-
 /**
  * The schema of `web3_modify_request`.
  */
 export const web3_modify_request: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/web3_description",
-      "description": "Specify an optional description of the hostname."
+      "description": "Specify an optional description of the hostname.",
+      "type": "string"
     },
     "dnslink": {
-      "$ref": "#/$defs/web3_dnslink",
-      "description": "Specify the DNSLink value used if the target is ipfs."
+      "description": "Specify the DNSLink value used if the target is ipfs.",
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `web3_name`.
- */
-export const web3_name: JsonSchema = {
-  "description": "Specify the hostname that points to the target gateway via CNAME.",
-  "type": "string"
-};
-
-/**
- * The schema of `web3_target`.
- */
-export const web3_target: JsonSchema = {
-  "description": "Specify the target gateway of the hostname.",
-  "enum": [
-    "ethereum",
-    "ipfs",
-    "ipfs_universal_path"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/web3/hostnames/tools.ts b/src/generated/forge-mcp/web3/hostnames/tools.ts
index 11cd04a2d..78a027ac0 100644
--- a/src/generated/forge-mcp/web3/hostnames/tools.ts
+++ b/src/generated/forge-mcp/web3/hostnames/tools.ts
@@ -3,33 +3,18 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  web3_api_response_collection_output,
-  web3_api_response_common_failure_output,
-  web3_api_response_common_output,
-  web3_api_response_single_id_output,
-  web3_api_response_single_output,
-  web3_collection_response_output,
-  web3_description_output,
-  web3_dnslink_output,
-  web3_identifier_output,
-  web3_messages_output,
-  web3_name_output,
-  web3_result_info_output,
-  web3_single_response_output,
-  web3_status_output,
-  web3_target_output,
-  web3_timestamp_output,
-  web3_web3_hostname_output,
+  web3_api$$response$$collection,
+  web3_api$$response$$common,
+  web3_api$$response$$common$$failure,
+  web3_api$$response$$single,
+  web3_api$$response$$single$$id,
+  web3_collection_response,
+  web3_messages,
+  web3_result_info,
+  web3_single_response,
+  web3_web3$$hostname,
 } from "./outputs.js";
-import {
-  web3_create_request,
-  web3_description,
-  web3_dnslink,
-  web3_identifier,
-  web3_modify_request,
-  web3_name,
-  web3_target,
-} from "./schemas.js";
+import { web3_create_request, web3_modify_request } from "./schemas.js";
 
 /**
  * The tools of `web3.hostnames`.
@@ -38,46 +23,44 @@ export const tools: readonly Tool[] = [
   {
     name: "web3_hostnames_create",
     title: "Create Web3 Hostname",
-    description: "Create Web3 Hostname",
+    description: "Create Web3 Hostname\n\nPOST /zones/{zone_id}/web3/hostnames",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/web3_create_request"
         },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "web3_create_request": web3_create_request,
-        "web3_description": web3_description,
-        "web3_dnslink": web3_dnslink,
-        "web3_identifier": web3_identifier,
-        "web3_name": web3_name,
-        "web3_target": web3_target,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/web3_single_response",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_single_response": web3_single_response_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_messages": web3_messages,
+        "web3_single_response": web3_single_response,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     annotations: {
@@ -127,22 +110,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-collection": web3_api_response_collection_output,
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_collection_response": web3_collection_response_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_result_info": web3_result_info_output,
-        "web3_single_response": web3_single_response_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-collection": web3_api$$response$$collection,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_collection_response": web3_collection_response,
+        "web3_messages": web3_messages,
+        "web3_result_info": web3_result_info,
+        "web3_single_response": web3_single_response,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     request: (args) => ({
@@ -153,36 +129,42 @@ export const tools: readonly Tool[] = [
   {
     name: "web3_hostnames_delete",
     title: "Delete Web3 Hostname",
-    description: "Delete Web3 Hostname",
+    description: "Delete Web3 Hostname\n\nDELETE /zones/{zone_id}/web3/hostnames/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {},
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier",
+        "path",
         "body"
       ],
-      $defs: {
-        "web3_identifier": web3_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/web3_api-response-single-id",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single-id": web3_api_response_single_id_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single-id": web3_api$$response$$single$$id,
+        "web3_messages": web3_messages,
       },
     },
     annotations: {
@@ -232,21 +214,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-collection": web3_api_response_collection_output,
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single-id": web3_api_response_single_id_output,
-        "web3_collection_response": web3_collection_response_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_result_info": web3_result_info_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-collection": web3_api$$response$$collection,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single-id": web3_api$$response$$single$$id,
+        "web3_collection_response": web3_collection_response,
+        "web3_messages": web3_messages,
+        "web3_result_info": web3_result_info,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     request: (args) => ({
@@ -257,49 +232,49 @@ export const tools: readonly Tool[] = [
   {
     name: "web3_hostnames_edit",
     title: "Edit Web3 Hostname",
-    description: "Edit Web3 Hostname",
+    description: "Edit Web3 Hostname\n\nPATCH /zones/{zone_id}/web3/hostnames/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/web3_modify_request"
         },
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "web3_description": web3_description,
-        "web3_dnslink": web3_dnslink,
-        "web3_identifier": web3_identifier,
         "web3_modify_request": web3_modify_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/web3_single_response",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_single_response": web3_single_response_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_messages": web3_messages,
+        "web3_single_response": web3_single_response,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     annotations: {
@@ -349,22 +324,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-collection": web3_api_response_collection_output,
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_collection_response": web3_collection_response_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_result_info": web3_result_info_output,
-        "web3_single_response": web3_single_response_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-collection": web3_api$$response$$collection,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_collection_response": web3_collection_response,
+        "web3_messages": web3_messages,
+        "web3_result_info": web3_result_info,
+        "web3_single_response": web3_single_response,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     request: (args) => ({
@@ -375,42 +343,42 @@ export const tools: readonly Tool[] = [
   {
     name: "web3_hostnames_get",
     title: "Web3 Hostname Details",
-    description: "Web3 Hostname Details",
+    description: "Web3 Hostname Details\n\nGET /zones/{zone_id}/web3/hostnames/{identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "identifier": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "identifier": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "identifier"
+        "path"
       ],
-      $defs: {
-        "web3_identifier": web3_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/web3_single_response",
       $defs: {
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_single_response": web3_single_response_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_messages": web3_messages,
+        "web3_single_response": web3_single_response,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     annotations: {
@@ -461,22 +429,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-collection": web3_api_response_collection_output,
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_api-response-single": web3_api_response_single_output,
-        "web3_collection_response": web3_collection_response_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_result_info": web3_result_info_output,
-        "web3_single_response": web3_single_response_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-collection": web3_api$$response$$collection,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_api-response-single": web3_api$$response$$single,
+        "web3_collection_response": web3_collection_response,
+        "web3_messages": web3_messages,
+        "web3_result_info": web3_result_info,
+        "web3_single_response": web3_single_response,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     request: (args) => ({
@@ -486,38 +447,38 @@ export const tools: readonly Tool[] = [
   {
     name: "web3_hostnames_list",
     title: "List Web3 Hostnames",
-    description: "List Web3 Hostnames",
+    description: "List Web3 Hostnames\n\nGET /zones/{zone_id}/web3/hostnames",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/web3_identifier",
-          "description": "Specify the identifier of the hostname."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Specify the identifier of the hostname.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "web3_identifier": web3_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/web3_collection_response",
       $defs: {
-        "web3_api-response-collection": web3_api_response_collection_output,
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_collection_response": web3_collection_response_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_result_info": web3_result_info_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-collection": web3_api$$response$$collection,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_collection_response": web3_collection_response,
+        "web3_messages": web3_messages,
+        "web3_result_info": web3_result_info,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     annotations: {
@@ -568,20 +529,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "web3_api-response-collection": web3_api_response_collection_output,
-        "web3_api-response-common": web3_api_response_common_output,
-        "web3_api-response-common-failure": web3_api_response_common_failure_output,
-        "web3_collection_response": web3_collection_response_output,
-        "web3_description": web3_description_output,
-        "web3_dnslink": web3_dnslink_output,
-        "web3_identifier": web3_identifier_output,
-        "web3_messages": web3_messages_output,
-        "web3_name": web3_name_output,
-        "web3_result_info": web3_result_info_output,
-        "web3_status": web3_status_output,
-        "web3_target": web3_target_output,
-        "web3_timestamp": web3_timestamp_output,
-        "web3_web3-hostname": web3_web3_hostname_output,
+        "web3_api-response-collection": web3_api$$response$$collection,
+        "web3_api-response-common": web3_api$$response$$common,
+        "web3_api-response-common-failure": web3_api$$response$$common$$failure,
+        "web3_collection_response": web3_collection_response,
+        "web3_messages": web3_messages,
+        "web3_result_info": web3_result_info,
+        "web3_web3-hostname": web3_web3$$hostname,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/webAssets/discovery/operations/outputs.ts b/src/generated/forge-mcp/webAssets/discovery/operations/outputs.ts
index a03f86ff9..92597a18a 100644
--- a/src/generated/forge-mcp/webAssets/discovery/operations/outputs.ts
+++ b/src/generated/forge-mcp/webAssets/discovery/operations/outputs.ts
@@ -3,22 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `api-shield_api_discovery_origin` in responses.
- */
-export const api_shield_api_discovery_origin_output: JsonSchema = {
-  "enum": [
-    "ML",
-    "SessionIdentifier",
-    "LabelDiscovery"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_api_discovery_patch_multiple_request` in responses.
  */
-export const api_shield_api_discovery_patch_multiple_request_output: JsonSchema = {
+export const api$$shield_api_discovery_patch_multiple_request: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/api-shield_api_discovery_patch_multiple_request_entry"
   },
@@ -29,42 +17,23 @@ export const api_shield_api_discovery_patch_multiple_request_output: JsonSchema
  * The schema of `api-shield_api_discovery_patch_multiple_request_entry` in
  * responses.
  */
-export const api_shield_api_discovery_patch_multiple_request_entry_output: JsonSchema = {
+export const api$$shield_api_discovery_patch_multiple_request_entry: JsonSchema = {
   "properties": {
     "state": {
-      "$ref": "#/$defs/api-shield_api_discovery_state_patch"
+      "enum": [
+        "review",
+        "ignored"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_api_discovery_state` in responses.
- */
-export const api_shield_api_discovery_state_output: JsonSchema = {
-  "enum": [
-    "review",
-    "saved",
-    "ignored"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_api_discovery_state_patch` in responses.
- */
-export const api_shield_api_discovery_state_patch_output: JsonSchema = {
-  "enum": [
-    "review",
-    "ignored"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_discovery_operation` in responses.
  */
-export const api_shield_discovery_operation_output: JsonSchema = {
+export const api$$shield_discovery_operation: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -72,19 +41,44 @@ export const api_shield_discovery_operation_output: JsonSchema = {
           "$ref": "#/$defs/api-shield_traffic_stats"
         },
         "id": {
-          "$ref": "#/$defs/api-shield_uuid-2"
+          "allOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "last_updated": {
-          "$ref": "#/$defs/api-shield_timestamp-2"
+          "allOf": [
+            {
+              "format": "date-time",
+              "type": "string"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "origin": {
           "items": {
-            "$ref": "#/$defs/api-shield_api_discovery_origin"
+            "enum": [
+              "ML",
+              "SessionIdentifier",
+              "LabelDiscovery"
+            ],
+            "type": "string"
           },
           "type": "array"
         },
         "state": {
-          "$ref": "#/$defs/api-shield_api_discovery_state"
+          "enum": [
+            "review",
+            "saved",
+            "ignored"
+          ],
+          "type": "string"
         }
       },
       "required": [
@@ -104,7 +98,7 @@ export const api_shield_discovery_operation_output: JsonSchema = {
 /**
  * The schema of `api-shield_patch_discoveries_response` in responses.
  */
-export const api_shield_patch_discoveries_response_output: JsonSchema = {
+export const api$$shield_patch_discoveries_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
@@ -126,7 +120,7 @@ export const api_shield_patch_discoveries_response_output: JsonSchema = {
 /**
  * The schema of `api-shield_patch_discovery_response` in responses.
  */
-export const api_shield_patch_discovery_response_output: JsonSchema = {
+export const api$$shield_patch_discovery_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
@@ -136,7 +130,12 @@ export const api_shield_patch_discovery_response_output: JsonSchema = {
         "result": {
           "properties": {
             "state": {
-              "$ref": "#/$defs/api-shield_api_discovery_state"
+              "enum": [
+                "review",
+                "saved",
+                "ignored"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
@@ -153,12 +152,20 @@ export const api_shield_patch_discovery_response_output: JsonSchema = {
 /**
  * The schema of `api-shield_traffic_stats` in responses.
  */
-export const api_shield_traffic_stats_output: JsonSchema = {
+export const api$$shield_traffic_stats: JsonSchema = {
   "properties": {
     "traffic_stats": {
       "properties": {
         "last_updated": {
-          "$ref": "#/$defs/api-shield_timestamp-2"
+          "allOf": [
+            {
+              "format": "date-time",
+              "type": "string"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "period_seconds": {
           "type": "integer"
diff --git a/src/generated/forge-mcp/webAssets/discovery/operations/schemas.ts b/src/generated/forge-mcp/webAssets/discovery/operations/schemas.ts
index 8fd9842fe..9b5d5d4bc 100644
--- a/src/generated/forge-mcp/webAssets/discovery/operations/schemas.ts
+++ b/src/generated/forge-mcp/webAssets/discovery/operations/schemas.ts
@@ -3,23 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `api-shield_api_discovery_origin`.
- */
-export const api_shield_api_discovery_origin: JsonSchema = {
-  "description": "* `ML` - Discovered operation was sourced using ML API Discovery * `SessionIdentifier` - Discovered operation was sourced using Session Identifier API Discovery * `LabelDiscovery` - Discovered operation was identified to have a specific label\n",
-  "enum": [
-    "ML",
-    "SessionIdentifier",
-    "LabelDiscovery"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_api_discovery_patch_multiple_request`.
  */
-export const api_shield_api_discovery_patch_multiple_request: JsonSchema = {
+export const api$$shield_api_discovery_patch_multiple_request: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/api-shield_api_discovery_patch_multiple_request_entry"
   },
@@ -29,38 +16,17 @@ export const api_shield_api_discovery_patch_multiple_request: JsonSchema = {
 /**
  * The schema of `api-shield_api_discovery_patch_multiple_request_entry`.
  */
-export const api_shield_api_discovery_patch_multiple_request_entry: JsonSchema = {
+export const api$$shield_api_discovery_patch_multiple_request_entry: JsonSchema = {
   "description": "Mappings of discovered operations (keys) to objects describing their state",
   "properties": {
     "state": {
-      "$ref": "#/$defs/api-shield_api_discovery_state_patch",
-      "description": "Mark state of operation in API Discovery\n  * `review` - Mark operation as for review\n  * `ignored` - Mark operation as ignored\n"
+      "description": "Mark state of operation in API Discovery\n  * `review` - Mark operation as for review\n  * `ignored` - Mark operation as ignored",
+      "enum": [
+        "review",
+        "ignored"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `api-shield_api_discovery_state`.
- */
-export const api_shield_api_discovery_state: JsonSchema = {
-  "description": "State of operation in API Discovery\n  * `review` - Operation is not saved into API Shield Endpoint Management\n  * `saved` - Operation is saved into API Shield Endpoint Management\n  * `ignored` - Operation is marked as ignored\n",
-  "enum": [
-    "review",
-    "saved",
-    "ignored"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_api_discovery_state_patch`.
- */
-export const api_shield_api_discovery_state_patch: JsonSchema = {
-  "description": "Mark state of operation in API Discovery\n  * `review` - Mark operation as for review\n  * `ignored` - Mark operation as ignored\n",
-  "enum": [
-    "review",
-    "ignored"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/webAssets/discovery/operations/tools.ts b/src/generated/forge-mcp/webAssets/discovery/operations/tools.ts
index f5910e0a6..a4d23c3ec 100644
--- a/src/generated/forge-mcp/webAssets/discovery/operations/tools.ts
+++ b/src/generated/forge-mcp/webAssets/discovery/operations/tools.ts
@@ -1,85 +1,80 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_basic_operation_output,
-  api_shield_endpoint_output,
-  api_shield_host_output,
-  api_shield_messages_output,
-  api_shield_method_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_basic_operation,
+  api$$shield_messages,
 } from "../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../schemas.js";
-import {
-  api_shield_api_discovery_origin_output,
-  api_shield_api_discovery_patch_multiple_request_entry_output,
-  api_shield_api_discovery_patch_multiple_request_output,
-  api_shield_api_discovery_state_output,
-  api_shield_api_discovery_state_patch_output,
-  api_shield_discovery_operation_output,
-  api_shield_patch_discoveries_response_output,
-  api_shield_patch_discovery_response_output,
-  api_shield_traffic_stats_output,
+  api$$shield_api_discovery_patch_multiple_request,
+  api$$shield_api_discovery_patch_multiple_request_entry,
+  api$$shield_discovery_operation,
+  api$$shield_patch_discoveries_response,
+  api$$shield_patch_discovery_response,
+  api$$shield_traffic_stats,
 } from "./outputs.js";
 import {
-  api_shield_api_discovery_origin,
-  api_shield_api_discovery_patch_multiple_request,
-  api_shield_api_discovery_patch_multiple_request_entry,
-  api_shield_api_discovery_state,
-  api_shield_api_discovery_state_patch,
+  api$$shield_api_discovery_patch_multiple_request as api$$shield_api_discovery_patch_multiple_request$,
+  api$$shield_api_discovery_patch_multiple_request_entry as api$$shield_api_discovery_patch_multiple_request_entry$,
 } from "./schemas.js";
 
 /**
- * The tools of `web_assets.discovery.operations`.
+ * The tools of `webAssets.discovery.operations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_discovery_operations_bulk_edit",
+    name: "webAssets_discovery_operations_bulkEdit",
     title: "Edit discovered web and API operations",
-    description: "Updates the state of one or more discovered web and API operations.",
+    description: "Updates the state of one or more discovered web and API operations.\n\nPATCH /zones/{zone_id}/api_gateway/discovery/operations",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_api_discovery_patch_multiple_request"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_api_discovery_patch_multiple_request": api_shield_api_discovery_patch_multiple_request,
-        "api-shield_api_discovery_patch_multiple_request_entry": api_shield_api_discovery_patch_multiple_request_entry,
-        "api-shield_api_discovery_state_patch": api_shield_api_discovery_state_patch,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
+        "api-shield_api_discovery_patch_multiple_request": api$$shield_api_discovery_patch_multiple_request$,
+        "api-shield_api_discovery_patch_multiple_request_entry": api$$shield_api_discovery_patch_multiple_request_entry$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_patch_discoveries_response",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api_discovery_patch_multiple_request": api_shield_api_discovery_patch_multiple_request_output,
-        "api-shield_api_discovery_patch_multiple_request_entry": api_shield_api_discovery_patch_multiple_request_entry_output,
-        "api-shield_api_discovery_state_patch": api_shield_api_discovery_state_patch_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_patch_discoveries_response": api_shield_patch_discoveries_response_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api_discovery_patch_multiple_request": api$$shield_api_discovery_patch_multiple_request,
+        "api-shield_api_discovery_patch_multiple_request_entry": api$$shield_api_discovery_patch_multiple_request_entry,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_patch_discoveries_response": api$$shield_patch_discoveries_response,
       },
     },
     annotations: {
@@ -107,13 +102,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api_discovery_patch_multiple_request": api_shield_api_discovery_patch_multiple_request_output,
-        "api-shield_api_discovery_patch_multiple_request_entry": api_shield_api_discovery_patch_multiple_request_entry_output,
-        "api-shield_api_discovery_state_patch": api_shield_api_discovery_state_patch_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_patch_discoveries_response": api_shield_patch_discoveries_response_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_api_discovery_patch_multiple_request": api$$shield_api_discovery_patch_multiple_request,
+        "api-shield_api_discovery_patch_multiple_request_entry": api$$shield_api_discovery_patch_multiple_request_entry,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_patch_discoveries_response": api$$shield_patch_discoveries_response,
       },
     },
     request: (args) => ({
@@ -122,48 +116,71 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_discovery_operations_edit",
+    name: "webAssets_discovery_operations_edit",
     title: "Edit a discovered web or API operation",
-    description: "Updates the state of a discovered web or API operation.",
+    description: "Updates the state of a discovered web or API operation.\n\nPATCH /zones/{zone_id}/api_gateway/discovery/operations/{discovery_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "state": {
-              "$ref": "#/$defs/api-shield_api_discovery_state_patch"
+              "description": "Mark state of operation in API Discovery\n  * `review` - Mark operation as for review\n  * `ignored` - Mark operation as ignored",
+              "enum": [
+                "review",
+                "ignored"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "discovery_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Discovery ID of a discovered operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "discovery_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Discovery ID of a discovered operation"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "discovery_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "discovery_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "api-shield_api_discovery_state_patch": api_shield_api_discovery_state_patch,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_patch_discovery_response",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api_discovery_state": api_shield_api_discovery_state_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_patch_discovery_response": api_shield_patch_discovery_response_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_patch_discovery_response": api$$shield_patch_discovery_response,
       },
     },
     annotations: {
@@ -191,11 +208,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api_discovery_state": api_shield_api_discovery_state_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_patch_discovery_response": api_shield_patch_discovery_response_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_patch_discovery_response": api$$shield_patch_discovery_response,
       },
     },
     request: (args) => ({
@@ -204,30 +220,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_discovery_operations_get",
+    name: "webAssets_discovery_operations_get",
     title: "Get a discovered web or API operation",
-    description: "Returns a discovered web or API operation by discovery ID.",
+    description: "Returns a discovered web or API operation by discovery ID.\n\nGET /zones/{zone_id}/api_gateway/discovery/operations/{discovery_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "discovery_id": {
-          "$ref": "#/$defs/api-shield_uuid-2",
-          "description": "Discovery ID of a discovered operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "discovery_id": {
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ],
+              "description": "Discovery ID of a discovered operation"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "discovery_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "discovery_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -250,21 +286,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api_discovery_origin": api_shield_api_discovery_origin_output,
-        "api-shield_api_discovery_state": api_shield_api_discovery_state_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_discovery_operation": api_shield_discovery_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_traffic_stats": api_shield_traffic_stats_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_discovery_operation": api$$shield_discovery_operation,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_traffic_stats": api$$shield_traffic_stats,
       },
     },
     annotations: {
@@ -312,22 +339,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api_discovery_origin": api_shield_api_discovery_origin_output,
-        "api-shield_api_discovery_state": api_shield_api_discovery_state_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_discovery_operation": api_shield_discovery_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_traffic_stats": api_shield_traffic_stats_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_discovery_operation": api$$shield_discovery_operation,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_traffic_stats": api$$shield_traffic_stats,
       },
     },
     request: (args) => ({
@@ -335,84 +353,112 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_discovery_operations_list",
+    name: "webAssets_discovery_operations_list",
     title: "List discovered web and API operations",
-    description: "Returns the latest web and API operations discovered from zone traffic.",
+    description: "Returns the latest web and API operations discovered from zone traffic.\n\nGET /zones/{zone_id}/api_gateway/discovery/operations",
     inputSchema: {
       type: "object",
       properties: {
-        "diff": {
-          "description": "When `true`, only return API Discovery results that are not saved into API Shield Endpoint Management",
-          "type": "boolean"
-        },
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "endpoint": {
-          "description": "Filter results to only include endpoints containing this pattern.",
-          "type": "string"
-        },
-        "host": {
-          "description": "Filter results to only include the specified hosts.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "method": {
-          "description": "Filter results to only include the specified HTTP methods.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
           },
-          "type": "array"
-        },
-        "order": {
-          "description": "Field to order by",
-          "enum": [
-            "host",
-            "method",
-            "endpoint",
-            "traffic_stats.requests",
-            "traffic_stats.last_updated"
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
-        },
-        "origin": {
-          "$ref": "#/$defs/api-shield_api_discovery_origin",
-          "description": "Filter results to only include discovery results sourced from a particular discovery engine\n  * `ML` - Discovered operations that were sourced using ML API Discovery\n  * `SessionIdentifier` - Discovered operations that were sourced using Session Identifier API Discovery\n"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
-        },
-        "state": {
-          "$ref": "#/$defs/api-shield_api_discovery_state",
-          "description": "Filter results to only include discovery results in a particular state. States are as follows\n  * `review` - Discovered operations that are not saved into API Shield Endpoint Management\n  * `saved` - Discovered operations that are already saved into API Shield Endpoint Management\n  * `ignored` - Discovered operations that have been marked as ignored\n"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "diff": {
+              "description": "When `true`, only return API Discovery results that are not saved into API Shield Endpoint Management",
+              "type": "boolean"
+            },
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "endpoint": {
+              "description": "Filter results to only include endpoints containing this pattern.",
+              "type": "string"
+            },
+            "host": {
+              "description": "Filter results to only include the specified hosts.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "method": {
+              "description": "Filter results to only include the specified HTTP methods.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "order": {
+              "description": "Field to order by",
+              "enum": [
+                "host",
+                "method",
+                "endpoint",
+                "traffic_stats.requests",
+                "traffic_stats.last_updated"
+              ],
+              "type": "string"
+            },
+            "origin": {
+              "description": "Filter results to only include discovery results sourced from a particular discovery engine\n  * `ML` - Discovered operations that were sourced using ML API Discovery\n  * `SessionIdentifier` - Discovered operations that were sourced using Session Identifier API Discovery",
+              "enum": [
+                "ML",
+                "SessionIdentifier",
+                "LabelDiscovery"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            },
+            "state": {
+              "description": "Filter results to only include discovery results in a particular state. States are as follows\n  * `review` - Discovered operations that are not saved into API Shield Endpoint Management\n  * `saved` - Discovered operations that are already saved into API Shield Endpoint Management\n  * `ignored` - Discovered operations that have been marked as ignored",
+              "enum": [
+                "review",
+                "saved",
+                "ignored"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_api_discovery_origin": api_shield_api_discovery_origin,
-        "api-shield_api_discovery_state": api_shield_api_discovery_state,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -435,21 +481,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api_discovery_origin": api_shield_api_discovery_origin_output,
-        "api-shield_api_discovery_state": api_shield_api_discovery_state_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_discovery_operation": api_shield_discovery_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_traffic_stats": api_shield_traffic_stats_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_discovery_operation": api$$shield_discovery_operation,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_traffic_stats": api$$shield_traffic_stats,
       },
     },
     annotations: {
@@ -497,37 +534,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_api_discovery_origin": api_shield_api_discovery_origin_output,
-        "api-shield_api_discovery_state": api_shield_api_discovery_state_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_discovery_operation": api_shield_discovery_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_traffic_stats": api_shield_traffic_stats_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_discovery_operation": api$$shield_discovery_operation,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_traffic_stats": api$$shield_traffic_stats,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/discovery/operations`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["host", args["host"], true],
-        ["method", args["method"], true],
-        ["endpoint", args["endpoint"], true],
-        ["direction", args["direction"], true],
-        ["order", args["order"], true],
-        ["diff", args["diff"], true],
-        ["origin", args["origin"], true],
-        ["state", args["state"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["host", param(args, "query", "host"), true],
+        ["method", param(args, "query", "method"), true],
+        ["endpoint", param(args, "query", "endpoint"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["order", param(args, "query", "order"), true],
+        ["diff", param(args, "query", "diff"), true],
+        ["origin", param(args, "query", "origin"), true],
+        ["state", param(args, "query", "state"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/webAssets/discovery/outputs.ts b/src/generated/forge-mcp/webAssets/discovery/outputs.ts
index d4bf7b527..284f6c1f9 100644
--- a/src/generated/forge-mcp/webAssets/discovery/outputs.ts
+++ b/src/generated/forge-mcp/webAssets/discovery/outputs.ts
@@ -6,14 +6,14 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `api-shield_openapi` in responses.
  */
-export const api_shield_openapi_output: JsonSchema = {
+export const api$$shield_openapi: JsonSchema = {
   "type": "object"
 };
 
 /**
  * The schema of `api-shield_schema_response_discovery` in responses.
  */
-export const api_shield_schema_response_discovery_output: JsonSchema = {
+export const api$$shield_schema_response_discovery: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
@@ -29,7 +29,15 @@ export const api_shield_schema_response_discovery_output: JsonSchema = {
               "type": "array"
             },
             "timestamp": {
-              "$ref": "#/$defs/api-shield_timestamp-2"
+              "allOf": [
+                {
+                  "format": "date-time",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
             }
           },
           "required": [
diff --git a/src/generated/forge-mcp/webAssets/discovery/tools.ts b/src/generated/forge-mcp/webAssets/discovery/tools.ts
index 36287d4af..20ae62e4d 100644
--- a/src/generated/forge-mcp/webAssets/discovery/tools.ts
+++ b/src/generated/forge-mcp/webAssets/discovery/tools.ts
@@ -3,53 +3,59 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-} from "../../schemas.js";
-import {
-  api_shield_openapi_output,
-  api_shield_schema_response_discovery_output,
+  api$$shield_openapi,
+  api$$shield_schema_response_discovery,
 } from "./outputs.js";
 
 /**
- * The tools of `web_assets.discovery`.
+ * The tools of `webAssets.discovery`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_discovery_get",
+    name: "webAssets_discovery_get",
     title: "Export discovered API operations as OpenAPI schemas",
-    description: "Returns the latest API operations discovered from zone traffic, rendered as OpenAPI schemas.",
+    description: "Returns the latest API operations discovered from zone traffic, rendered as OpenAPI schemas.\n\nGET /zones/{zone_id}/api_gateway/discovery",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_schema_response_discovery",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_openapi": api_shield_openapi_output,
-        "api-shield_schema_response_discovery": api_shield_schema_response_discovery_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_openapi": api$$shield_openapi,
+        "api-shield_schema_response_discovery": api$$shield_schema_response_discovery,
       },
     },
     annotations: {
@@ -86,13 +92,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_openapi": api_shield_openapi_output,
-        "api-shield_schema_response_discovery": api_shield_schema_response_discovery_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_openapi": api$$shield_openapi,
+        "api-shield_schema_response_discovery": api$$shield_schema_response_discovery,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/webAssets/labels/managed/operations/tools.ts b/src/generated/forge-mcp/webAssets/labels/managed/operations/tools.ts
index b1bffe7e3..8951dcc04 100644
--- a/src/generated/forge-mcp/webAssets/labels/managed/operations/tools.ts
+++ b/src/generated/forge-mcp/webAssets/labels/managed/operations/tools.ts
@@ -3,71 +3,70 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../../schemas.js";
-import {
-  api_shield_label_description_output,
-  api_shield_label_metadata_output,
-  api_shield_label_name_output,
-  api_shield_label_output,
-  api_shield_label_source_output,
+  api$$shield_label,
+  api$$shield_label_metadata,
 } from "../../../outputs.js";
+import { api$$shield_operation_id_selector } from "../../../schemas.js";
 import {
-  api_shield_label_name,
-  api_shield_operation_id_selector,
-} from "../../../schemas.js";
-import {
-  api_shield_full_label_output,
-  api_shield_label_mapped_resources_output,
+  api$$shield_full_label,
+  api$$shield_label_mapped_resources,
 } from "../../outputs.js";
-import { api_shield_replace_operations_attached_to_label_request } from "../../schemas.js";
-import { api_shield_full_managed_label_output } from "../outputs.js";
+import { api$$shield_replace_operations_attached_to_label_request } from "../../schemas.js";
+import { api$$shield_full_managed_label } from "../outputs.js";
 
 /**
- * The tools of `web_assets.labels.managed.operations`.
+ * The tools of `webAssets.labels.managed.operations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_labels_managed_operations_update",
+    name: "webAssets_labels_managed_operations_update",
     title: "Replace operations attached to a managed label",
-    description: "Replaces the complete set of web and API operations attached to the managed label.",
+    description: "Replaces the complete set of web and API operations attached to the managed label.\n\nPUT /zones/{zone_id}/api_gateway/labels/managed/{name}/resources/operation",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_replace_operations_attached_to_label_request"
         },
-        "name": {
-          "$ref": "#/$defs/api-shield_label_name",
-          "description": "The label name"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The label name",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_operation_id_selector": api_shield_operation_id_selector,
-        "api-shield_replace_operations_attached_to_label_request": api_shield_replace_operations_attached_to_label_request,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_operation_id_selector": api$$shield_operation_id_selector,
+        "api-shield_replace_operations_attached_to_label_request": api$$shield_replace_operations_attached_to_label_request,
       },
     },
     outputSchema: {
@@ -88,18 +87,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_full_managed_label": api_shield_full_managed_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_full_managed_label": api$$shield_full_managed_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -142,19 +136,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_full_managed_label": api_shield_full_managed_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_full_managed_label": api$$shield_full_managed_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/webAssets/labels/managed/outputs.ts b/src/generated/forge-mcp/webAssets/labels/managed/outputs.ts
index bb9af4adb..92a19859d 100644
--- a/src/generated/forge-mcp/webAssets/labels/managed/outputs.ts
+++ b/src/generated/forge-mcp/webAssets/labels/managed/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_full_managed_label` in responses.
  */
-export const api_shield_full_managed_label_output: JsonSchema = {
+export const api$$shield_full_managed_label: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_full_label"
diff --git a/src/generated/forge-mcp/webAssets/labels/managed/tools.ts b/src/generated/forge-mcp/webAssets/labels/managed/tools.ts
index 90e722280..af759939c 100644
--- a/src/generated/forge-mcp/webAssets/labels/managed/tools.ts
+++ b/src/generated/forge-mcp/webAssets/labels/managed/tools.ts
@@ -1,65 +1,74 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-} from "../../../schemas.js";
-import {
-  api_shield_label_description_output,
-  api_shield_label_metadata_output,
-  api_shield_label_name_output,
-  api_shield_label_output,
-  api_shield_label_source_output,
+  api$$shield_label,
+  api$$shield_label_metadata,
 } from "../../outputs.js";
-import { api_shield_label_name } from "../../schemas.js";
 import {
-  api_shield_full_label_output,
-  api_shield_label_mapped_resources_output,
+  api$$shield_full_label,
+  api$$shield_label_mapped_resources,
 } from "../outputs.js";
-import { api_shield_full_managed_label_output } from "./outputs.js";
+import { api$$shield_full_managed_label } from "./outputs.js";
 
 /**
- * The tools of `web_assets.labels.managed`.
+ * The tools of `webAssets.labels.managed`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_labels_managed_get",
+    name: "webAssets_labels_managed_get",
     title: "Get a managed operation label",
-    description: "Returns a managed label and the web and API operations associated with it.",
+    description: "Returns a managed label and the web and API operations associated with it.\n\nGET /zones/{zone_id}/api_gateway/labels/managed/{name}",
     inputSchema: {
       type: "object",
       properties: {
-        "name": {
-          "$ref": "#/$defs/api-shield_label_name",
-          "description": "The label name"
-        },
-        "with_mapped_resource_counts": {
-          "default": false,
-          "description": "Include `mapped_resources` for each label",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The label name",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "name"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "with_mapped_resource_counts": {
+              "default": false,
+              "description": "Include `mapped_resources` for each label",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "name"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -79,18 +88,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_full_managed_label": api_shield_full_managed_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_full_managed_label": api$$shield_full_managed_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -135,25 +139,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_full_managed_label": api_shield_full_managed_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_full_managed_label": api$$shield_full_managed_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/labels/managed/${pathParam(args, "name")}`,
       query: [
-        ["with_mapped_resource_counts", args["with_mapped_resource_counts"], true],
+        ["with_mapped_resource_counts", param(args, "query", "with_mapped_resource_counts"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/webAssets/labels/outputs.ts b/src/generated/forge-mcp/webAssets/labels/outputs.ts
index 769fb4664..490ceb584 100644
--- a/src/generated/forge-mcp/webAssets/labels/outputs.ts
+++ b/src/generated/forge-mcp/webAssets/labels/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `api-shield_full_label` in responses.
  */
-export const api_shield_full_label_output: JsonSchema = {
+export const api$$shield_full_label: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_label"
@@ -25,6 +25,6 @@ export const api_shield_full_label_output: JsonSchema = {
 /**
  * The schema of `api-shield_label_mapped_resources` in responses.
  */
-export const api_shield_label_mapped_resources_output: JsonSchema = {
+export const api$$shield_label_mapped_resources: JsonSchema = {
   "type": "object"
 };
diff --git a/src/generated/forge-mcp/webAssets/labels/schemas.ts b/src/generated/forge-mcp/webAssets/labels/schemas.ts
index 171835095..09e4bc256 100644
--- a/src/generated/forge-mcp/webAssets/labels/schemas.ts
+++ b/src/generated/forge-mcp/webAssets/labels/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `api-shield_replace_operations_attached_to_label_request`.
  */
-export const api_shield_replace_operations_attached_to_label_request: JsonSchema = {
+export const api$$shield_replace_operations_attached_to_label_request: JsonSchema = {
   "properties": {
     "selector": {
       "$ref": "#/$defs/api-shield_operation_id_selector",
diff --git a/src/generated/forge-mcp/webAssets/labels/tools.ts b/src/generated/forge-mcp/webAssets/labels/tools.ts
index 4bc7d17d8..17f6c0a33 100644
--- a/src/generated/forge-mcp/webAssets/labels/tools.ts
+++ b/src/generated/forge-mcp/webAssets/labels/tools.ts
@@ -1,97 +1,107 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../outputs.js";
+import { api$$shield_label, api$$shield_label_metadata } from "../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-} from "../../schemas.js";
-import {
-  api_shield_label_description_output,
-  api_shield_label_metadata_output,
-  api_shield_label_name_output,
-  api_shield_label_output,
-  api_shield_label_source_output,
-} from "../outputs.js";
-import { api_shield_label_source } from "../schemas.js";
-import {
-  api_shield_full_label_output,
-  api_shield_label_mapped_resources_output,
+  api$$shield_full_label,
+  api$$shield_label_mapped_resources,
 } from "./outputs.js";
 
 /**
- * The tools of `web_assets.labels`.
+ * The tools of `webAssets.labels`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_labels_list",
+    name: "webAssets_labels_list",
     title: "List operation labels",
-    description: "Returns all managed and user-defined labels available for web and API operations in the zone.",
+    description: "Returns all managed and user-defined labels available for web and API operations in the zone.\n\nGET /zones/{zone_id}/api_gateway/labels",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter for labels where the name or description matches using substring match",
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to order by",
-          "enum": [
-            "name",
-            "description",
-            "created_at",
-            "last_updated",
-            "mapped_resources.operations"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
-        },
-        "source": {
-          "$ref": "#/$defs/api-shield_label_source",
-          "description": "Filter for labels with source"
-        },
-        "with_mapped_resource_counts": {
-          "default": false,
-          "description": "Include `mapped_resources` for each label",
-          "type": "boolean"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter for labels where the name or description matches using substring match",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to order by",
+              "enum": [
+                "name",
+                "description",
+                "created_at",
+                "last_updated",
+                "mapped_resources.operations"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            },
+            "source": {
+              "description": "Filter for labels with source",
+              "enum": [
+                "user",
+                "managed"
+              ],
+              "type": "string"
+            },
+            "with_mapped_resource_counts": {
+              "default": false,
+              "description": "Include `mapped_resources` for each label",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_source": api_shield_label_source,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -114,18 +124,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -173,31 +178,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/labels`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["source", args["source"], true],
-        ["filter", args["filter"], true],
-        ["with_mapped_resource_counts", args["with_mapped_resource_counts"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["source", param(args, "query", "source"), true],
+        ["filter", param(args, "query", "filter"), true],
+        ["with_mapped_resource_counts", param(args, "query", "with_mapped_resource_counts"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/webAssets/labels/user/operations/tools.ts b/src/generated/forge-mcp/webAssets/labels/user/operations/tools.ts
index 746c5fe04..7e5149f90 100644
--- a/src/generated/forge-mcp/webAssets/labels/user/operations/tools.ts
+++ b/src/generated/forge-mcp/webAssets/labels/user/operations/tools.ts
@@ -3,70 +3,69 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../../schemas.js";
-import {
-  api_shield_label_description_output,
-  api_shield_label_metadata_output,
-  api_shield_label_name_output,
-  api_shield_label_output,
-  api_shield_label_source_output,
+  api$$shield_label,
+  api$$shield_label_metadata,
 } from "../../../outputs.js";
+import { api$$shield_operation_id_selector } from "../../../schemas.js";
 import {
-  api_shield_label_name,
-  api_shield_operation_id_selector,
-} from "../../../schemas.js";
-import {
-  api_shield_full_label_output,
-  api_shield_label_mapped_resources_output,
+  api$$shield_full_label,
+  api$$shield_label_mapped_resources,
 } from "../../outputs.js";
-import { api_shield_replace_operations_attached_to_label_request } from "../../schemas.js";
+import { api$$shield_replace_operations_attached_to_label_request } from "../../schemas.js";
 
 /**
- * The tools of `web_assets.labels.user.operations`.
+ * The tools of `webAssets.labels.user.operations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_labels_user_operations_update",
+    name: "webAssets_labels_user_operations_update",
     title: "Replace operations attached to a user-defined label",
-    description: "Replaces the complete set of web and API operations attached to the user-defined label.",
+    description: "Replaces the complete set of web and API operations attached to the user-defined label.\n\nPUT /zones/{zone_id}/api_gateway/labels/user/{name}/resources/operation",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_replace_operations_attached_to_label_request"
         },
-        "name": {
-          "$ref": "#/$defs/api-shield_label_name",
-          "description": "The label name"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The label name",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_operation_id_selector": api_shield_operation_id_selector,
-        "api-shield_replace_operations_attached_to_label_request": api_shield_replace_operations_attached_to_label_request,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_operation_id_selector": api$$shield_operation_id_selector,
+        "api-shield_replace_operations_attached_to_label_request": api$$shield_replace_operations_attached_to_label_request,
       },
     },
     outputSchema: {
@@ -87,17 +86,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -140,18 +134,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/webAssets/labels/user/schemas.ts b/src/generated/forge-mcp/webAssets/labels/user/schemas.ts
index a8ca1adf5..587b5add0 100644
--- a/src/generated/forge-mcp/webAssets/labels/user/schemas.ts
+++ b/src/generated/forge-mcp/webAssets/labels/user/schemas.ts
@@ -6,19 +6,19 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_label_request`.
  */
-export const api_shield_label_request: JsonSchema = {
+export const api$$shield_label_request: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/api-shield_label_description",
-      "description": "The description of the label"
+      "description": "The description of the label",
+      "type": "string"
     },
     "metadata": {
       "$ref": "#/$defs/api-shield_label_metadata",
       "description": "Metadata for the label"
     },
     "name": {
-      "$ref": "#/$defs/api-shield_label_name",
-      "description": "The name of the label"
+      "description": "The name of the label",
+      "type": "string"
     }
   },
   "required": [
@@ -30,11 +30,11 @@ export const api_shield_label_request: JsonSchema = {
 /**
  * The schema of `api-shield_patch_label_request`.
  */
-export const api_shield_patch_label_request: JsonSchema = {
+export const api$$shield_patch_label_request: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/api-shield_label_description",
-      "description": "The description of the label"
+      "description": "The description of the label",
+      "type": "string"
     },
     "metadata": {
       "$ref": "#/$defs/api-shield_label_metadata",
@@ -47,11 +47,11 @@ export const api_shield_patch_label_request: JsonSchema = {
 /**
  * The schema of `api-shield_put_label_request`.
  */
-export const api_shield_put_label_request: JsonSchema = {
+export const api$$shield_put_label_request: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/api-shield_label_description",
-      "description": "The description of the label"
+      "description": "The description of the label",
+      "type": "string"
     },
     "metadata": {
       "$ref": "#/$defs/api-shield_label_metadata",
diff --git a/src/generated/forge-mcp/webAssets/labels/user/tools.ts b/src/generated/forge-mcp/webAssets/labels/user/tools.ts
index f79d3dd63..28e010cc9 100644
--- a/src/generated/forge-mcp/webAssets/labels/user/tools.ts
+++ b/src/generated/forge-mcp/webAssets/labels/user/tools.ts
@@ -1,49 +1,36 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-} from "../../../schemas.js";
-import {
-  api_shield_label_description_output,
-  api_shield_label_metadata_output,
-  api_shield_label_name_output,
-  api_shield_label_output,
-  api_shield_label_source_output,
+  api$$shield_label,
+  api$$shield_label_metadata,
 } from "../../outputs.js";
+import { api$$shield_label_metadata as api$$shield_label_metadata$ } from "../../schemas.js";
 import {
-  api_shield_label_description,
-  api_shield_label_metadata,
-  api_shield_label_name,
-} from "../../schemas.js";
-import {
-  api_shield_full_label_output,
-  api_shield_label_mapped_resources_output,
+  api$$shield_full_label,
+  api$$shield_label_mapped_resources,
 } from "../outputs.js";
 import {
-  api_shield_label_request,
-  api_shield_patch_label_request,
-  api_shield_put_label_request,
+  api$$shield_label_request,
+  api$$shield_patch_label_request,
+  api$$shield_put_label_request,
 } from "./schemas.js";
 
 /**
- * The tools of `web_assets.labels.user`.
+ * The tools of `webAssets.labels.user`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_labels_user_bulk_create",
+    name: "webAssets_labels_user_bulkCreate",
     title: "Create user-defined operation labels",
-    description: "Creates one or more user-defined labels for classifying web and API operations.",
+    description: "Creates one or more user-defined labels for classifying web and API operations.\n\nPOST /zones/{zone_id}/api_gateway/labels/user",
     inputSchema: {
       type: "object",
       properties: {
@@ -53,21 +40,35 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_description": api_shield_label_description,
-        "api-shield_label_metadata": api_shield_label_metadata,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_label_request": api_shield_label_request,
+        "api-shield_label_metadata": api$$shield_label_metadata$,
+        "api-shield_label_request": api$$shield_label_request,
       },
     },
     outputSchema: {
@@ -91,16 +92,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -146,17 +142,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -165,31 +156,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_labels_user_bulk_delete",
+    name: "webAssets_labels_user_bulkDelete",
     title: "Delete user-defined operation labels",
-    description: "Deletes one or more user-defined labels and removes their associations with web and API operations.\n\nConfirm with the user before calling this tool. This operation deletes the selected user-defined labels and removes them from associated web and API operations.",
+    description: "Deletes one or more user-defined labels and removes their associations with web and API operations.\n\nConfirm with the user before calling this tool. This operation deletes the selected user-defined labels and removes them from associated web and API operations.\n\nDELETE /zones/{zone_id}/api_gateway/labels/user",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "items": {
-            "$ref": "#/$defs/api-shield_label_name"
+            "description": "The name of the label",
+            "type": "string"
           },
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -212,16 +217,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -267,17 +267,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -286,29 +281,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_labels_user_delete",
+    name: "webAssets_labels_user_delete",
     title: "Delete a user-defined operation label",
-    description: "Deletes a user-defined label and removes its associations with web and API operations.\n\nConfirm with the user before calling this tool. This operation deletes the user-defined label and removes it from associated web and API operations.",
+    description: "Deletes a user-defined label and removes its associations with web and API operations.\n\nConfirm with the user before calling this tool. This operation deletes the user-defined label and removes it from associated web and API operations.\n\nDELETE /zones/{zone_id}/api_gateway/labels/user/{name}",
     inputSchema: {
       type: "object",
       properties: {
-        "name": {
-          "$ref": "#/$defs/api-shield_label_name",
-          "description": "The label name"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The label name",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "name"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -328,15 +336,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -379,16 +382,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -396,35 +394,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_labels_user_edit",
+    name: "webAssets_labels_user_edit",
     title: "Edit a user-defined operation label",
-    description: "Updates only the supplied fields on a user-defined label.",
+    description: "Updates only the supplied fields on a user-defined label.\n\nPATCH /zones/{zone_id}/api_gateway/labels/user/{name}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_patch_label_request"
         },
-        "name": {
-          "$ref": "#/$defs/api-shield_label_name",
-          "description": "The label name"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The label name",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_description": api_shield_label_description,
-        "api-shield_label_metadata": api_shield_label_metadata,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_patch_label_request": api_shield_patch_label_request,
+        "api-shield_label_metadata": api$$shield_label_metadata$,
+        "api-shield_patch_label_request": api$$shield_patch_label_request,
       },
     },
     outputSchema: {
@@ -445,15 +457,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -496,16 +503,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -514,34 +516,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_labels_user_get",
+    name: "webAssets_labels_user_get",
     title: "Get a user-defined operation label",
-    description: "Returns a user-defined label and the web and API operations associated with it.",
+    description: "Returns a user-defined label and the web and API operations associated with it.\n\nGET /zones/{zone_id}/api_gateway/labels/user/{name}",
     inputSchema: {
       type: "object",
       properties: {
-        "name": {
-          "$ref": "#/$defs/api-shield_label_name",
-          "description": "The label name"
-        },
-        "with_mapped_resource_counts": {
-          "default": false,
-          "description": "Include `mapped_resources` for each label",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The label name",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "name"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "with_mapped_resource_counts": {
+              "default": false,
+              "description": "Include `mapped_resources` for each label",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "name"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -561,17 +582,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -616,57 +632,66 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_full_label": api_shield_full_label_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_mapped_resources": api_shield_label_mapped_resources_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_full_label": api$$shield_full_label,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_mapped_resources": api$$shield_label_mapped_resources,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/labels/user/${pathParam(args, "name")}`,
       query: [
-        ["with_mapped_resource_counts", args["with_mapped_resource_counts"], true],
+        ["with_mapped_resource_counts", param(args, "query", "with_mapped_resource_counts"), true],
       ],
     }),
   },
   {
-    name: "web_assets_labels_user_update",
+    name: "webAssets_labels_user_update",
     title: "Update a user-defined operation label",
-    description: "Replaces all editable fields on a user-defined label.",
+    description: "Replaces all editable fields on a user-defined label.\n\nPUT /zones/{zone_id}/api_gateway/labels/user/{name}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_put_label_request"
         },
-        "name": {
-          "$ref": "#/$defs/api-shield_label_name",
-          "description": "The label name"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The label name",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_description": api_shield_label_description,
-        "api-shield_label_metadata": api_shield_label_metadata,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_put_label_request": api_shield_put_label_request,
+        "api-shield_label_metadata": api$$shield_label_metadata$,
+        "api-shield_put_label_request": api$$shield_put_label_request,
       },
     },
     outputSchema: {
@@ -687,15 +712,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -738,16 +758,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/webAssets/operations/labels/outputs.ts b/src/generated/forge-mcp/webAssets/operations/labels/outputs.ts
index c0e0e9b45..c18cd4224 100644
--- a/src/generated/forge-mcp/webAssets/operations/labels/outputs.ts
+++ b/src/generated/forge-mcp/webAssets/operations/labels/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_operation_with_labels_only` in responses.
  */
-export const api_shield_operation_with_labels_only_output: JsonSchema = {
+export const api$$shield_operation_with_labels_only: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_standard_operation"
diff --git a/src/generated/forge-mcp/webAssets/operations/labels/schemas.ts b/src/generated/forge-mcp/webAssets/operations/labels/schemas.ts
index e2dd7c6dd..2de058d55 100644
--- a/src/generated/forge-mcp/webAssets/operations/labels/schemas.ts
+++ b/src/generated/forge-mcp/webAssets/operations/labels/schemas.ts
@@ -6,14 +6,15 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `api-shield_bulk_delete_labels_on_operation_request`.
  */
-export const api_shield_bulk_delete_labels_on_operation_request: JsonSchema = {
+export const api$$shield_bulk_delete_labels_on_operation_request: JsonSchema = {
   "properties": {
     "managed": {
       "properties": {
         "labels": {
           "description": "List of managed label names.",
           "items": {
-            "$ref": "#/$defs/api-shield_label_name"
+            "description": "The name of the label",
+            "type": "string"
           },
           "type": "array"
         }
@@ -29,7 +30,8 @@ export const api_shield_bulk_delete_labels_on_operation_request: JsonSchema = {
         "labels": {
           "description": "List of user label names.",
           "items": {
-            "$ref": "#/$defs/api-shield_label_name"
+            "description": "The name of the label",
+            "type": "string"
           },
           "type": "array"
         }
@@ -46,14 +48,15 @@ export const api_shield_bulk_delete_labels_on_operation_request: JsonSchema = {
 /**
  * The schema of `api-shield_bulk_post_labels_on_operation_request`.
  */
-export const api_shield_bulk_post_labels_on_operation_request: JsonSchema = {
+export const api$$shield_bulk_post_labels_on_operation_request: JsonSchema = {
   "properties": {
     "managed": {
       "properties": {
         "labels": {
           "description": "List of managed label names.",
           "items": {
-            "$ref": "#/$defs/api-shield_label_name"
+            "description": "The name of the label",
+            "type": "string"
           },
           "minItems": 1,
           "type": "array"
@@ -70,7 +73,8 @@ export const api_shield_bulk_post_labels_on_operation_request: JsonSchema = {
         "labels": {
           "description": "List of user label names.",
           "items": {
-            "$ref": "#/$defs/api-shield_label_name"
+            "description": "The name of the label",
+            "type": "string"
           },
           "minItems": 1,
           "type": "array"
@@ -88,7 +92,7 @@ export const api_shield_bulk_post_labels_on_operation_request: JsonSchema = {
 /**
  * The schema of `api-shield_bulk_put_labels_on_operation_request`.
  */
-export const api_shield_bulk_put_labels_on_operation_request: JsonSchema = {
+export const api$$shield_bulk_put_labels_on_operation_request: JsonSchema = {
   "properties": {
     "managed": {
       "description": "Managed labels to replace for all affected operations",
@@ -96,7 +100,8 @@ export const api_shield_bulk_put_labels_on_operation_request: JsonSchema = {
         "labels": {
           "description": "List of managed label names. Providing an empty array will result in all managed labels being removed from all affected operations",
           "items": {
-            "$ref": "#/$defs/api-shield_label_name"
+            "description": "The name of the label",
+            "type": "string"
           },
           "type": "array"
         }
@@ -116,7 +121,8 @@ export const api_shield_bulk_put_labels_on_operation_request: JsonSchema = {
         "labels": {
           "description": "List of user label names. Providing an empty array will result in all user labels being removed from all affected operations",
           "items": {
-            "$ref": "#/$defs/api-shield_label_name"
+            "description": "The name of the label",
+            "type": "string"
           },
           "type": "array"
         }
@@ -138,19 +144,21 @@ export const api_shield_bulk_put_labels_on_operation_request: JsonSchema = {
 /**
  * The schema of `api-shield_delete_labels_on_operation_request`.
  */
-export const api_shield_delete_labels_on_operation_request: JsonSchema = {
+export const api$$shield_delete_labels_on_operation_request: JsonSchema = {
   "properties": {
     "managed": {
       "description": "List of managed label names.",
       "items": {
-        "$ref": "#/$defs/api-shield_label_name"
+        "description": "The name of the label",
+        "type": "string"
       },
       "type": "array"
     },
     "user": {
       "description": "List of user label names.",
       "items": {
-        "$ref": "#/$defs/api-shield_label_name"
+        "description": "The name of the label",
+        "type": "string"
       },
       "type": "array"
     }
@@ -161,12 +169,13 @@ export const api_shield_delete_labels_on_operation_request: JsonSchema = {
 /**
  * The schema of `api-shield_post_labels_on_operation_request`.
  */
-export const api_shield_post_labels_on_operation_request: JsonSchema = {
+export const api$$shield_post_labels_on_operation_request: JsonSchema = {
   "properties": {
     "managed": {
       "description": "List of managed label names.",
       "items": {
-        "$ref": "#/$defs/api-shield_label_name"
+        "description": "The name of the label",
+        "type": "string"
       },
       "minItems": 1,
       "type": "array"
@@ -174,7 +183,8 @@ export const api_shield_post_labels_on_operation_request: JsonSchema = {
     "user": {
       "description": "List of user label names.",
       "items": {
-        "$ref": "#/$defs/api-shield_label_name"
+        "description": "The name of the label",
+        "type": "string"
       },
       "minItems": 1,
       "type": "array"
@@ -186,19 +196,21 @@ export const api_shield_post_labels_on_operation_request: JsonSchema = {
 /**
  * The schema of `api-shield_put_labels_on_operation_request`.
  */
-export const api_shield_put_labels_on_operation_request: JsonSchema = {
+export const api$$shield_put_labels_on_operation_request: JsonSchema = {
   "properties": {
     "managed": {
       "description": "List of managed label names. Omitting this property or passing an empty array will result in all managed labels being removed from the operation",
       "items": {
-        "$ref": "#/$defs/api-shield_label_name"
+        "description": "The name of the label",
+        "type": "string"
       },
       "type": "array"
     },
     "user": {
       "description": "List of user label names. Omitting this property or passing an empty array will result in all user labels being removed from the operation",
       "items": {
-        "$ref": "#/$defs/api-shield_label_name"
+        "description": "The name of the label",
+        "type": "string"
       },
       "type": "array"
     }
diff --git a/src/generated/forge-mcp/webAssets/operations/labels/tools.ts b/src/generated/forge-mcp/webAssets/operations/labels/tools.ts
index b6e891c6e..d9e9cb5e5 100644
--- a/src/generated/forge-mcp/webAssets/operations/labels/tools.ts
+++ b/src/generated/forge-mcp/webAssets/operations/labels/tools.ts
@@ -3,76 +3,70 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_basic_operation_output,
-  api_shield_endpoint_output,
-  api_shield_host_output,
-  api_shield_messages_output,
-  api_shield_method_output,
-  api_shield_standard_operation_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_basic_operation,
+  api$$shield_messages,
+  api$$shield_standard_operation,
 } from "../../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../../schemas.js";
-import {
-  api_shield_label_description_output,
-  api_shield_label_metadata_output,
-  api_shield_label_name_output,
-  api_shield_label_output,
-  api_shield_label_source_output,
+  api$$shield_label,
+  api$$shield_label_metadata,
 } from "../../outputs.js";
+import { api$$shield_operation_id_selector } from "../../schemas.js";
+import { api$$shield_operation_with_labels_only } from "./outputs.js";
 import {
-  api_shield_label_name,
-  api_shield_operation_id_selector,
-} from "../../schemas.js";
-import { api_shield_operation_with_labels_only_output } from "./outputs.js";
-import {
-  api_shield_bulk_delete_labels_on_operation_request,
-  api_shield_bulk_post_labels_on_operation_request,
-  api_shield_bulk_put_labels_on_operation_request,
-  api_shield_delete_labels_on_operation_request,
-  api_shield_post_labels_on_operation_request,
-  api_shield_put_labels_on_operation_request,
+  api$$shield_bulk_delete_labels_on_operation_request,
+  api$$shield_bulk_post_labels_on_operation_request,
+  api$$shield_bulk_put_labels_on_operation_request,
+  api$$shield_delete_labels_on_operation_request,
+  api$$shield_post_labels_on_operation_request,
+  api$$shield_put_labels_on_operation_request,
 } from "./schemas.js";
 
 /**
- * The tools of `web_assets.operations.labels`.
+ * The tools of `webAssets.operations.labels`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_operations_labels_bulk_create",
+    name: "webAssets_operations_labels_bulkCreate",
     title: "Attach labels to web or API operations",
-    description: "Attaches labels to multiple web or API operations in one request.",
+    description: "Attaches labels to multiple web or API operations in one request.\n\nPOST /zones/{zone_id}/api_gateway/operations/labels",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_bulk_post_labels_on_operation_request"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_bulk_post_labels_on_operation_request": api_shield_bulk_post_labels_on_operation_request,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_operation_id_selector": api_shield_operation_id_selector,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_bulk_post_labels_on_operation_request": api$$shield_bulk_post_labels_on_operation_request,
+        "api-shield_operation_id_selector": api$$shield_operation_id_selector,
       },
     },
     outputSchema: {
@@ -96,23 +90,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -158,24 +142,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
@@ -184,31 +158,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_labels_bulk_delete",
+    name: "webAssets_operations_labels_bulkDelete",
     title: "Remove labels from web or API operations",
-    description: "Removes labels from multiple web or API operations in one request.\n\nConfirm with the user before calling this tool. This operation removes the selected labels from the selected web and API operations.",
+    description: "Removes labels from multiple web or API operations in one request.\n\nConfirm with the user before calling this tool. This operation removes the selected labels from the selected web and API operations.\n\nDELETE /zones/{zone_id}/api_gateway/operations/labels",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_bulk_delete_labels_on_operation_request"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_bulk_delete_labels_on_operation_request": api_shield_bulk_delete_labels_on_operation_request,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_operation_id_selector": api_shield_operation_id_selector,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_bulk_delete_labels_on_operation_request": api$$shield_bulk_delete_labels_on_operation_request,
+        "api-shield_operation_id_selector": api$$shield_operation_id_selector,
       },
     },
     outputSchema: {
@@ -232,23 +219,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -294,24 +271,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
@@ -320,31 +287,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_labels_bulk_update",
+    name: "webAssets_operations_labels_bulkUpdate",
     title: "Replace labels on web or API operations",
-    description: "Replaces the complete label sets on multiple web or API operations in one request.",
+    description: "Replaces the complete label sets on multiple web or API operations in one request.\n\nPUT /zones/{zone_id}/api_gateway/operations/labels",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_bulk_put_labels_on_operation_request"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_bulk_put_labels_on_operation_request": api_shield_bulk_put_labels_on_operation_request,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_operation_id_selector": api_shield_operation_id_selector,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_bulk_put_labels_on_operation_request": api$$shield_bulk_put_labels_on_operation_request,
+        "api-shield_operation_id_selector": api$$shield_operation_id_selector,
       },
     },
     outputSchema: {
@@ -368,23 +348,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -430,24 +400,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
@@ -456,34 +416,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_labels_create",
+    name: "webAssets_operations_labels_create",
     title: "Attach labels to a web or API operation",
-    description: "Attaches one or more labels to a web or API operation.",
+    description: "Attaches one or more labels to a web or API operation.\n\nPOST /zones/{zone_id}/api_gateway/operations/{operation_id}/labels",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_post_labels_on_operation_request"
         },
-        "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid",
-          "description": "Identifier for the operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operation_id": {
+              "description": "Identifier for the operation",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "operation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operation_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_post_labels_on_operation_request": api_shield_post_labels_on_operation_request,
-        "api-shield_uuid": api_shield_uuid,
+        "api-shield_post_labels_on_operation_request": api$$shield_post_labels_on_operation_request,
       },
     },
     outputSchema: {
@@ -504,23 +478,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -563,24 +527,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
@@ -589,34 +543,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_labels_delete",
+    name: "webAssets_operations_labels_delete",
     title: "Remove labels from a web or API operation",
-    description: "Removes one or more labels from a web or API operation.\n\nConfirm with the user before calling this tool. This operation removes the selected labels from the web or API operation.",
+    description: "Removes one or more labels from a web or API operation.\n\nConfirm with the user before calling this tool. This operation removes the selected labels from the web or API operation.\n\nDELETE /zones/{zone_id}/api_gateway/operations/{operation_id}/labels",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_delete_labels_on_operation_request"
         },
-        "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid",
-          "description": "Identifier for the operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operation_id": {
+              "description": "Identifier for the operation",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "operation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operation_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_delete_labels_on_operation_request": api_shield_delete_labels_on_operation_request,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_uuid": api_shield_uuid,
+        "api-shield_delete_labels_on_operation_request": api$$shield_delete_labels_on_operation_request,
       },
     },
     outputSchema: {
@@ -637,23 +605,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -696,24 +654,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
@@ -722,34 +670,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_labels_update",
+    name: "webAssets_operations_labels_update",
     title: "Replace labels on a web or API operation",
-    description: "Replaces the complete label set on a web or API operation.",
+    description: "Replaces the complete label set on a web or API operation.\n\nPUT /zones/{zone_id}/api_gateway/operations/{operation_id}/labels",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_put_labels_on_operation_request"
         },
-        "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid",
-          "description": "Identifier for the operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operation_id": {
+              "description": "Identifier for the operation",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "operation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operation_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_label_name": api_shield_label_name,
-        "api-shield_put_labels_on_operation_request": api_shield_put_labels_on_operation_request,
-        "api-shield_uuid": api_shield_uuid,
+        "api-shield_put_labels_on_operation_request": api$$shield_put_labels_on_operation_request,
       },
     },
     outputSchema: {
@@ -770,23 +732,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -829,24 +781,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_label": api_shield_label_output,
-        "api-shield_label_description": api_shield_label_description_output,
-        "api-shield_label_metadata": api_shield_label_metadata_output,
-        "api-shield_label_name": api_shield_label_name_output,
-        "api-shield_label_source": api_shield_label_source_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation_with_labels_only": api_shield_operation_with_labels_only_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_label": api$$shield_label,
+        "api-shield_label_metadata": api$$shield_label_metadata,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation_with_labels_only": api$$shield_operation_with_labels_only,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/webAssets/operations/outputs.ts b/src/generated/forge-mcp/webAssets/operations/outputs.ts
index 49c5629ed..c7b955791 100644
--- a/src/generated/forge-mcp/webAssets/operations/outputs.ts
+++ b/src/generated/forge-mcp/webAssets/operations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `api-shield_multiple-operation-response` in responses.
  */
-export const api_shield_multiple_operation_response_output: JsonSchema = {
+export const api$$shield_multiple$$operation$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
@@ -32,7 +32,7 @@ export const api_shield_multiple_operation_response_output: JsonSchema = {
  * The schema of `api-shield_multiple-operation-response-paginated` in
  * responses.
  */
-export const api_shield_multiple_operation_response_paginated_output: JsonSchema = {
+export const api$$shield_multiple$$operation$$response$$paginated: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-collection"
@@ -57,7 +57,7 @@ export const api_shield_multiple_operation_response_paginated_output: JsonSchema
 /**
  * The schema of `api-shield_operation_schema_fragment` in responses.
  */
-export const api_shield_operation_schema_fragment_output: JsonSchema = {
+export const api$$shield_operation_schema_fragment: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -82,7 +82,7 @@ export const api_shield_operation_schema_fragment_output: JsonSchema = {
 /**
  * The schema of `api-shield_operation_schemas` in responses.
  */
-export const api_shield_operation_schemas_output: JsonSchema = {
+export const api$$shield_operation_schemas: JsonSchema = {
   "properties": {
     "learned": {
       "$ref": "#/$defs/api-shield_operation_schema_fragment"
@@ -97,7 +97,7 @@ export const api_shield_operation_schemas_output: JsonSchema = {
 /**
  * The schema of `api-shield_single-operation-response` in responses.
  */
-export const api_shield_single_operation_response_output: JsonSchema = {
+export const api$$shield_single$$operation$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
diff --git a/src/generated/forge-mcp/webAssets/operations/schemas.ts b/src/generated/forge-mcp/webAssets/operations/schemas.ts
index f29cb1d4a..f5313f2e6 100644
--- a/src/generated/forge-mcp/webAssets/operations/schemas.ts
+++ b/src/generated/forge-mcp/webAssets/operations/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `api-shield_object-with-operation-id`.
  */
-export const api_shield_object_with_operation_id: JsonSchema = {
+export const api$$shield_object$$with$$operation$$id: JsonSchema = {
   "properties": {
     "operation_id": {
       "allOf": [
@@ -14,7 +14,15 @@ export const api_shield_object_with_operation_id: JsonSchema = {
           "type": "string"
         },
         {
-          "$ref": "#/$defs/api-shield_uuid-2"
+          "allOf": [
+            {
+              "type": "string"
+            },
+            {
+              "description": "UUID.",
+              "type": "string"
+            }
+          ]
         }
       ]
     }
diff --git a/src/generated/forge-mcp/webAssets/operations/tools.ts b/src/generated/forge-mcp/webAssets/operations/tools.ts
index 50e425e5b..90e0e26a8 100644
--- a/src/generated/forge-mcp/webAssets/operations/tools.ts
+++ b/src/generated/forge-mcp/webAssets/operations/tools.ts
@@ -1,66 +1,42 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  api_shield_api_response_collection_output,
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_auth_id_tokens_output,
-  api_shield_basic_operation_output,
-  api_shield_confidence_intervals_bounds_output,
-  api_shield_data_points_output,
-  api_shield_endpoint_output,
-  api_shield_host_output,
-  api_shield_messages_output,
-  api_shield_method_output,
-  api_shield_operation_feature_api_routing_output,
-  api_shield_operation_feature_confidence_intervals_output,
-  api_shield_operation_feature_parameter_schemas_output,
-  api_shield_operation_feature_schema_info_output,
-  api_shield_operation_feature_thresholds_output,
-  api_shield_operation_features_output,
-  api_shield_operation_output,
-  api_shield_p50_output,
-  api_shield_p90_output,
-  api_shield_p99_output,
-  api_shield_parameter_schemas_definition_output,
-  api_shield_period_seconds_output,
-  api_shield_requests_output,
-  api_shield_standard_operation_output,
-  api_shield_suggested_threshold_output,
-  api_shield_timestamp_2_output,
-  api_shield_timestamp_output,
-  api_shield_uuid_2_output,
-  api_shield_uuid_output,
+  api$$shield_api$$response$$collection,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_basic_operation,
+  api$$shield_confidence_intervals_bounds,
+  api$$shield_messages,
+  api$$shield_operation,
+  api$$shield_operation_feature_api_routing,
+  api$$shield_operation_feature_confidence_intervals,
+  api$$shield_operation_feature_parameter_schemas,
+  api$$shield_operation_feature_schema_info,
+  api$$shield_operation_feature_thresholds,
+  api$$shield_operation_features,
+  api$$shield_parameter_schemas_definition,
+  api$$shield_standard_operation,
 } from "../../outputs.js";
+import { api$$shield_basic_operation as api$$shield_basic_operation$ } from "../../schemas.js";
 import {
-  api_shield_basic_operation,
-  api_shield_endpoint,
-  api_shield_host,
-  api_shield_identifier,
-  api_shield_identifier_2,
-  api_shield_method,
-  api_shield_uuid,
-  api_shield_uuid_2,
-} from "../../schemas.js";
-import {
-  api_shield_multiple_operation_response_output,
-  api_shield_multiple_operation_response_paginated_output,
-  api_shield_operation_schema_fragment_output,
-  api_shield_operation_schemas_output,
-  api_shield_single_operation_response_output,
+  api$$shield_multiple$$operation$$response,
+  api$$shield_multiple$$operation$$response$$paginated,
+  api$$shield_operation_schema_fragment,
+  api$$shield_operation_schemas,
+  api$$shield_single$$operation$$response,
 } from "./outputs.js";
-import { api_shield_object_with_operation_id } from "./schemas.js";
+import { api$$shield_object$$with$$operation$$id } from "./schemas.js";
 
 /**
- * The tools of `web_assets.operations`.
+ * The tools of `webAssets.operations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_operations_bulk_create",
+    name: "webAssets_operations_bulkCreate",
     title: "Create web or API operations",
-    description: "Creates one or more web or API operations. Hosts, methods, and paths are normalized; an existing matching operation is returned instead of duplicated.",
+    description: "Creates one or more web or API operations. Hosts, methods, and paths are normalized; an existing matching operation is returned instead of duplicated.\n\nPOST /zones/{zone_id}/api_gateway/operations",
     inputSchema: {
       type: "object",
       properties: {
@@ -70,55 +46,53 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_basic_operation": api_shield_basic_operation,
-        "api-shield_endpoint": api_shield_endpoint,
-        "api-shield_host": api_shield_host,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_method": api_shield_method,
+        "api-shield_basic_operation": api$$shield_basic_operation$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_multiple-operation-response",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_multiple-operation-response": api_shield_multiple_operation_response_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_multiple-operation-response": api$$shield_multiple$$operation$$response,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -146,36 +120,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_multiple-operation-response": api_shield_multiple_operation_response_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_multiple-operation-response": api$$shield_multiple$$operation$$response,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
@@ -184,9 +143,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_bulk_delete",
+    name: "webAssets_operations_bulkDelete",
     title: "Delete web or API operations",
-    description: "Deletes multiple web or API operations from endpoint management in one request.\n\nConfirm with the user before calling this tool. This operation deletes the selected web or API operations.",
+    description: "Deletes multiple web or API operations from endpoint management in one request.\n\nConfirm with the user before calling this tool. This operation deletes the selected web or API operations.\n\nDELETE /zones/{zone_id}/api_gateway/operations",
     inputSchema: {
       type: "object",
       properties: {
@@ -196,27 +155,41 @@ export const tools: readonly Tool[] = [
           },
           "type": "array"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_object-with-operation-id": api_shield_object_with_operation_id,
-        "api-shield_uuid": api_shield_uuid,
-        "api-shield_uuid-2": api_shield_uuid_2,
+        "api-shield_object-with-operation-id": api$$shield_object$$with$$operation$$id,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_api-response-common",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -244,9 +217,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -255,66 +228,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_create",
+    name: "webAssets_operations_create",
     title: "Create a web or API operation",
-    description: "Creates one web or API operation. The host, method, and path are normalized; an existing matching operation is returned instead of duplicated.",
+    description: "Creates one web or API operation. The host, method, and path are normalized; an existing matching operation is returned instead of duplicated.\n\nPOST /zones/{zone_id}/api_gateway/operations/item",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/api-shield_basic_operation"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "api-shield_basic_operation": api_shield_basic_operation,
-        "api-shield_endpoint": api_shield_endpoint,
-        "api-shield_host": api_shield_host,
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_method": api_shield_method,
+        "api-shield_basic_operation": api$$shield_basic_operation$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_single-operation-response",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_operation_schema_fragment": api_shield_operation_schema_fragment_output,
-        "api-shield_operation_schemas": api_shield_operation_schemas_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_single-operation-response": api_shield_single_operation_response_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_operation_schema_fragment": api$$shield_operation_schema_fragment,
+        "api-shield_operation_schemas": api$$shield_operation_schemas,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_single-operation-response": api$$shield_single$$operation$$response,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -342,38 +313,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_operation_schema_fragment": api_shield_operation_schema_fragment_output,
-        "api-shield_operation_schemas": api_shield_operation_schemas_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_single-operation-response": api_shield_single_operation_response_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_operation_schema_fragment": api$$shield_operation_schema_fragment,
+        "api-shield_operation_schemas": api$$shield_operation_schemas,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_single-operation-response": api$$shield_single$$operation$$response,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
@@ -382,35 +338,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_delete",
+    name: "webAssets_operations_delete",
     title: "Delete a web or API operation",
-    description: "Deletes a web or API operation from endpoint management so its feature configuration is no longer tracked.\n\nConfirm with the user before calling this tool. This operation deletes the web or API operation.",
+    description: "Deletes a web or API operation from endpoint management so its feature configuration is no longer tracked.\n\nConfirm with the user before calling this tool. This operation deletes the web or API operation.\n\nDELETE /zones/{zone_id}/api_gateway/operations/{operation_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid",
-          "description": "Identifier for the operation"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operation_id": {
+              "description": "Identifier for the operation",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "zone_id",
+            "operation_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operation_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_api-response-common",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     annotations: {
@@ -438,9 +407,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
       },
     },
     request: (args) => ({
@@ -448,82 +417,86 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "web_assets_operations_get",
+    name: "webAssets_operations_get",
     title: "Get a web or API operation",
-    description: "Returns a web or API operation, including its schema validation settings and requested feature data.",
+    description: "Returns a web or API operation, including its schema validation settings and requested feature data.\n\nGET /zones/{zone_id}/api_gateway/operations/{operation_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "feature": {
-          "description": "Add feature(s) to the results. The feature name that is given here corresponds to the resulting feature object. Have a look at the top-level object description for more details on the specific meaning.",
-          "items": {
-            "enum": [
-              "thresholds",
-              "parameter_schemas",
-              "schema_info",
-              "confidence_intervals"
-            ],
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "operation_id": {
+              "description": "Identifier for the operation",
+              "type": "string"
+            },
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
           },
-          "type": "array"
-        },
-        "operation_id": {
-          "$ref": "#/$defs/api-shield_uuid",
-          "description": "Identifier for the operation"
-        },
-        "with_schemas": {
-          "default": false,
-          "description": "When true, includes OpenAPI schemas (both uploaded and learned) for the operation in the response. Due to the conversion overhead, this parameter is only supported on single-operation retrieval.",
-          "type": "boolean"
+          "required": [
+            "zone_id",
+            "operation_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "feature": {
+              "description": "Add feature(s) to the results. The feature name that is given here corresponds to the resulting feature object. Have a look at the top-level object description for more details on the specific meaning.",
+              "items": {
+                "enum": [
+                  "thresholds",
+                  "parameter_schemas",
+                  "schema_info",
+                  "confidence_intervals"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "with_schemas": {
+              "default": false,
+              "description": "When true, includes OpenAPI schemas (both uploaded and learned) for the operation in the response. Due to the conversion overhead, this parameter is only supported on single-operation retrieval.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "operation_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-        "api-shield_uuid": api_shield_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_single-operation-response",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_operation_schema_fragment": api_shield_operation_schema_fragment_output,
-        "api-shield_operation_schemas": api_shield_operation_schemas_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_single-operation-response": api_shield_single_operation_response_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_operation_schema_fragment": api$$shield_operation_schema_fragment,
+        "api-shield_operation_schemas": api$$shield_operation_schemas,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_single-operation-response": api$$shield_single$$operation$$response,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -553,159 +526,149 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_operation_schema_fragment": api_shield_operation_schema_fragment_output,
-        "api-shield_operation_schemas": api_shield_operation_schemas_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_single-operation-response": api_shield_single_operation_response_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_operation_schema_fragment": api$$shield_operation_schema_fragment,
+        "api-shield_operation_schemas": api$$shield_operation_schemas,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_single-operation-response": api$$shield_single$$operation$$response,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/operations/${pathParam(args, "operation_id")}`,
       query: [
-        ["feature", args["feature"], true],
-        ["with_schemas", args["with_schemas"], true],
+        ["feature", param(args, "query", "feature"), true],
+        ["with_schemas", param(args, "query", "with_schemas"), true],
       ],
     }),
   },
   {
-    name: "web_assets_operations_list",
+    name: "webAssets_operations_list",
     title: "List web and API operations",
-    description: "Lists web and API operations tracked for the zone, including each operation's method, path, and feature configuration.",
+    description: "Lists web and API operations tracked for the zone, including each operation's method, path, and feature configuration.\n\nGET /zones/{zone_id}/api_gateway/operations",
     inputSchema: {
       type: "object",
       properties: {
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "endpoint": {
-          "description": "Filter results to only include endpoints containing this pattern.",
-          "type": "string"
-        },
-        "feature": {
-          "description": "Add feature(s) to the results. The feature name that is given here corresponds to the resulting feature object. Have a look at the top-level object description for more details on the specific meaning.",
-          "items": {
-            "enum": [
-              "thresholds",
-              "parameter_schemas",
-              "schema_info",
-              "confidence_intervals"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "host": {
-          "description": "Filter results to only include the specified hosts.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
           },
-          "type": "array"
-        },
-        "method": {
-          "description": "Filter results to only include the specified HTTP methods.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "order": {
-          "description": "Field to order by. When requesting a feature, the feature keys are available for ordering as well, e.g., `thresholds.suggested_threshold`.",
-          "enum": [
-            "method",
-            "host",
-            "endpoint",
-            "thresholds.$key"
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "endpoint": {
+              "description": "Filter results to only include endpoints containing this pattern.",
+              "type": "string"
+            },
+            "feature": {
+              "description": "Add feature(s) to the results. The feature name that is given here corresponds to the resulting feature object. Have a look at the top-level object description for more details on the specific meaning.",
+              "items": {
+                "enum": [
+                  "thresholds",
+                  "parameter_schemas",
+                  "schema_info",
+                  "confidence_intervals"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "host": {
+              "description": "Filter results to only include the specified hosts.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "method": {
+              "description": "Filter results to only include the specified HTTP methods.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "order": {
+              "description": "Field to order by. When requesting a feature, the feature keys are available for ordering as well, e.g., `thresholds.suggested_threshold`.",
+              "enum": [
+                "method",
+                "host",
+                "endpoint",
+                "thresholds.$key"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_multiple-operation-response-paginated",
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_multiple-operation-response-paginated": api_shield_multiple_operation_response_paginated_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_multiple-operation-response-paginated": api$$shield_multiple$$operation$$response$$paginated,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     annotations: {
@@ -735,50 +698,35 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-collection": api_shield_api_response_collection_output,
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_auth_id_tokens": api_shield_auth_id_tokens_output,
-        "api-shield_basic_operation": api_shield_basic_operation_output,
-        "api-shield_confidence_intervals_bounds": api_shield_confidence_intervals_bounds_output,
-        "api-shield_data_points": api_shield_data_points_output,
-        "api-shield_endpoint": api_shield_endpoint_output,
-        "api-shield_host": api_shield_host_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_method": api_shield_method_output,
-        "api-shield_multiple-operation-response-paginated": api_shield_multiple_operation_response_paginated_output,
-        "api-shield_operation": api_shield_operation_output,
-        "api-shield_operation_feature_api_routing": api_shield_operation_feature_api_routing_output,
-        "api-shield_operation_feature_confidence_intervals": api_shield_operation_feature_confidence_intervals_output,
-        "api-shield_operation_feature_parameter_schemas": api_shield_operation_feature_parameter_schemas_output,
-        "api-shield_operation_feature_schema_info": api_shield_operation_feature_schema_info_output,
-        "api-shield_operation_feature_thresholds": api_shield_operation_feature_thresholds_output,
-        "api-shield_operation_features": api_shield_operation_features_output,
-        "api-shield_p50": api_shield_p50_output,
-        "api-shield_p90": api_shield_p90_output,
-        "api-shield_p99": api_shield_p99_output,
-        "api-shield_parameter_schemas_definition": api_shield_parameter_schemas_definition_output,
-        "api-shield_period_seconds": api_shield_period_seconds_output,
-        "api-shield_requests": api_shield_requests_output,
-        "api-shield_standard_operation": api_shield_standard_operation_output,
-        "api-shield_suggested_threshold": api_shield_suggested_threshold_output,
-        "api-shield_timestamp": api_shield_timestamp_output,
-        "api-shield_timestamp-2": api_shield_timestamp_2_output,
-        "api-shield_uuid": api_shield_uuid_output,
-        "api-shield_uuid-2": api_shield_uuid_2_output,
+        "api-shield_api-response-collection": api$$shield_api$$response$$collection,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_basic_operation": api$$shield_basic_operation,
+        "api-shield_confidence_intervals_bounds": api$$shield_confidence_intervals_bounds,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_multiple-operation-response-paginated": api$$shield_multiple$$operation$$response$$paginated,
+        "api-shield_operation": api$$shield_operation,
+        "api-shield_operation_feature_api_routing": api$$shield_operation_feature_api_routing,
+        "api-shield_operation_feature_confidence_intervals": api$$shield_operation_feature_confidence_intervals,
+        "api-shield_operation_feature_parameter_schemas": api$$shield_operation_feature_parameter_schemas,
+        "api-shield_operation_feature_schema_info": api$$shield_operation_feature_schema_info,
+        "api-shield_operation_feature_thresholds": api$$shield_operation_feature_thresholds,
+        "api-shield_operation_features": api$$shield_operation_features,
+        "api-shield_parameter_schemas_definition": api$$shield_parameter_schemas_definition,
+        "api-shield_standard_operation": api$$shield_standard_operation,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/operations`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["host", args["host"], true],
-        ["method", args["method"], true],
-        ["endpoint", args["endpoint"], true],
-        ["feature", args["feature"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["host", param(args, "query", "host"), true],
+        ["method", param(args, "query", "method"), true],
+        ["endpoint", param(args, "query", "endpoint"), true],
+        ["feature", param(args, "query", "feature"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/webAssets/outputs.ts b/src/generated/forge-mcp/webAssets/outputs.ts
index 6cc3642c8..7344c0d6e 100644
--- a/src/generated/forge-mcp/webAssets/outputs.ts
+++ b/src/generated/forge-mcp/webAssets/outputs.ts
@@ -6,25 +6,45 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `api-shield_label` in responses.
  */
-export const api_shield_label_output: JsonSchema = {
+export const api$$shield_label: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/api-shield_timestamp-2"
+      "allOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "description": {
-      "$ref": "#/$defs/api-shield_label_description"
+      "type": "string"
     },
     "last_updated": {
-      "$ref": "#/$defs/api-shield_timestamp-2"
+      "allOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "metadata": {
       "$ref": "#/$defs/api-shield_label_metadata"
     },
     "name": {
-      "$ref": "#/$defs/api-shield_label_name"
+      "type": "string"
     },
     "source": {
-      "$ref": "#/$defs/api-shield_label_source"
+      "enum": [
+        "user",
+        "managed"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -38,34 +58,9 @@ export const api_shield_label_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_label_description` in responses.
- */
-export const api_shield_label_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_label_metadata` in responses.
  */
-export const api_shield_label_metadata_output: JsonSchema = {
+export const api$$shield_label_metadata: JsonSchema = {
   "type": "object"
 };
-
-/**
- * The schema of `api-shield_label_name` in responses.
- */
-export const api_shield_label_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_label_source` in responses.
- */
-export const api_shield_label_source_output: JsonSchema = {
-  "enum": [
-    "user",
-    "managed"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/webAssets/schemas.ts b/src/generated/forge-mcp/webAssets/schemas.ts
index da2a43783..2ff0358ca 100644
--- a/src/generated/forge-mcp/webAssets/schemas.ts
+++ b/src/generated/forge-mcp/webAssets/schemas.ts
@@ -3,53 +3,33 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `api-shield_label_description`.
- */
-export const api_shield_label_description: JsonSchema = {
-  "description": "The description of the label",
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_label_metadata`.
  */
-export const api_shield_label_metadata: JsonSchema = {
+export const api$$shield_label_metadata: JsonSchema = {
   "description": "Metadata for the label",
   "type": "object"
 };
 
-/**
- * The schema of `api-shield_label_name`.
- */
-export const api_shield_label_name: JsonSchema = {
-  "description": "The name of the label",
-  "type": "string"
-};
-
-/**
- * The schema of `api-shield_label_source`.
- */
-export const api_shield_label_source: JsonSchema = {
-  "description": "* `user` - label is owned by the user\n* `managed` - label is owned by cloudflare\n",
-  "enum": [
-    "user",
-    "managed"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `api-shield_operation_id_selector`.
  */
-export const api_shield_operation_id_selector: JsonSchema = {
+export const api$$shield_operation_id_selector: JsonSchema = {
   "description": "Operation IDs selector",
   "properties": {
     "include": {
       "properties": {
         "operation_ids": {
           "items": {
-            "$ref": "#/$defs/api-shield_uuid-2"
+            "allOf": [
+              {
+                "type": "string"
+              },
+              {
+                "description": "UUID.",
+                "type": "string"
+              }
+            ]
           },
           "minItems": 1,
           "type": "array"
diff --git a/src/generated/forge-mcp/webAssets/schemas/outputs.ts b/src/generated/forge-mcp/webAssets/schemas/outputs.ts
index 018ca46cc..d849ada22 100644
--- a/src/generated/forge-mcp/webAssets/schemas/outputs.ts
+++ b/src/generated/forge-mcp/webAssets/schemas/outputs.ts
@@ -6,14 +6,14 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `api-shield_openapi-with-thresholds` in responses.
  */
-export const api_shield_openapi_with_thresholds_output: JsonSchema = {
+export const api$$shield_openapi$$with$$thresholds: JsonSchema = {
   "type": "object"
 };
 
 /**
  * The schema of `api-shield_schema-response-with-thresholds` in responses.
  */
-export const api_shield_schema_response_with_thresholds_output: JsonSchema = {
+export const api$$shield_schema$$response$$with$$thresholds: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/api-shield_api-response-common"
diff --git a/src/generated/forge-mcp/webAssets/schemas/tools.ts b/src/generated/forge-mcp/webAssets/schemas/tools.ts
index fa0abc88c..4eaf04869 100644
--- a/src/generated/forge-mcp/webAssets/schemas/tools.ts
+++ b/src/generated/forge-mcp/webAssets/schemas/tools.ts
@@ -1,81 +1,97 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  api_shield_api_response_common_failure_output,
-  api_shield_api_response_common_output,
-  api_shield_messages_output,
+  api$$shield_api$$response$$common,
+  api$$shield_api$$response$$common$$failure,
+  api$$shield_messages,
 } from "../../outputs.js";
 import {
-  api_shield_identifier,
-  api_shield_identifier_2,
-} from "../../schemas.js";
-import {
-  api_shield_openapi_with_thresholds_output,
-  api_shield_schema_response_with_thresholds_output,
+  api$$shield_openapi$$with$$thresholds,
+  api$$shield_schema$$response$$with$$thresholds,
 } from "./outputs.js";
 
 /**
- * The tools of `web_assets.schemas`.
+ * The tools of `webAssets.schemas`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "web_assets_schemas_list",
+    name: "webAssets_schemas_list",
     title: "Export web and API operations as OpenAPI schemas",
-    description: "Returns tracked web and API operations and their feature configuration rendered as OpenAPI schemas.",
+    description: "Returns tracked web and API operations and their feature configuration rendered as OpenAPI schemas.\n\nGET /zones/{zone_id}/api_gateway/schemas",
     inputSchema: {
       type: "object",
       properties: {
-        "feature": {
-          "description": "Add feature(s) to the results. The feature name that is given here corresponds to the resulting feature object. Have a look at the top-level object description for more details on the specific meaning.",
-          "items": {
-            "enum": [
-              "thresholds",
-              "parameter_schemas",
-              "schema_info",
-              "confidence_intervals"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "host": {
-          "description": "Receive schema only for the given host(s).",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
           },
-          "type": "array"
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "include_schema_kind": {
-          "description": "Schema kinds to include in exported OpenAPI schemas.",
-          "items": {
-            "enum": [
-              "learned"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "feature": {
+              "description": "Add feature(s) to the results. The feature name that is given here corresponds to the resulting feature object. Have a look at the top-level object description for more details on the specific meaning.",
+              "items": {
+                "enum": [
+                  "thresholds",
+                  "parameter_schemas",
+                  "schema_info",
+                  "confidence_intervals"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "host": {
+              "description": "Receive schema only for the given host(s).",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "include_schema_kind": {
+              "description": "Schema kinds to include in exported OpenAPI schemas.",
+              "items": {
+                "enum": [
+                  "learned"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/api-shield_identifier-2"
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "api-shield_identifier": api_shield_identifier,
-        "api-shield_identifier-2": api_shield_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/api-shield_schema-response-with-thresholds",
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_openapi-with-thresholds": api_shield_openapi_with_thresholds_output,
-        "api-shield_schema-response-with-thresholds": api_shield_schema_response_with_thresholds_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_openapi-with-thresholds": api$$shield_openapi$$with$$thresholds,
+        "api-shield_schema-response-with-thresholds": api$$shield_schema$$response$$with$$thresholds,
       },
     },
     annotations: {
@@ -105,19 +121,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "api-shield_api-response-common": api_shield_api_response_common_output,
-        "api-shield_api-response-common-failure": api_shield_api_response_common_failure_output,
-        "api-shield_messages": api_shield_messages_output,
-        "api-shield_openapi-with-thresholds": api_shield_openapi_with_thresholds_output,
-        "api-shield_schema-response-with-thresholds": api_shield_schema_response_with_thresholds_output,
+        "api-shield_api-response-common": api$$shield_api$$response$$common,
+        "api-shield_api-response-common-failure": api$$shield_api$$response$$common$$failure,
+        "api-shield_messages": api$$shield_messages,
+        "api-shield_openapi-with-thresholds": api$$shield_openapi$$with$$thresholds,
+        "api-shield_schema-response-with-thresholds": api$$shield_schema$$response$$with$$thresholds,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/api_gateway/schemas`,
       query: [
-        ["host", args["host"], true],
-        ["feature", args["feature"], true],
-        ["include_schema_kind", args["include_schema_kind"], true],
+        ["host", param(args, "query", "host"), true],
+        ["feature", param(args, "query", "feature"), true],
+        ["include_schema_kind", param(args, "query", "include_schema_kind"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workers/accountSettings/outputs.ts b/src/generated/forge-mcp/workers/accountSettings/outputs.ts
index 830567fd9..535ea68aa 100644
--- a/src/generated/forge-mcp/workers/accountSettings/outputs.ts
+++ b/src/generated/forge-mcp/workers/accountSettings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_account-settings` in responses.
  */
-export const workers_account_settings_output: JsonSchema = {
+export const workers_account$$settings: JsonSchema = {
   "properties": {
     "default_usage_model": {
       "type": "string"
diff --git a/src/generated/forge-mcp/workers/accountSettings/schemas.ts b/src/generated/forge-mcp/workers/accountSettings/schemas.ts
index 4a32dd79e..04ecb7653 100644
--- a/src/generated/forge-mcp/workers/accountSettings/schemas.ts
+++ b/src/generated/forge-mcp/workers/accountSettings/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_account-settings`.
  */
-export const workers_account_settings: JsonSchema = {
+export const workers_account$$settings: JsonSchema = {
   "properties": {
     "default_usage_model": {
       "type": "string"
diff --git a/src/generated/forge-mcp/workers/accountSettings/tools.ts b/src/generated/forge-mcp/workers/accountSettings/tools.ts
index 5923d0a82..16c9943a3 100644
--- a/src/generated/forge-mcp/workers/accountSettings/tools.ts
+++ b/src/generated/forge-mcp/workers/accountSettings/tools.ts
@@ -3,36 +3,42 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier } from "../../schemas.js";
-import { workers_account_settings_output } from "./outputs.js";
-import { workers_account_settings } from "./schemas.js";
+import { workers_account$$settings } from "./outputs.js";
+import { workers_account$$settings as workers_account$$settings$ } from "./schemas.js";
 
 /**
- * The tools of `workers.account_settings`.
+ * The tools of `workers.accountSettings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_account_settings_get",
+    name: "workers_accountSettings_get",
     title: "Fetch Workers Account Settings",
-    description: "Fetches Workers account settings for an account.",
+    description: "Fetches Workers account settings for an account.\n\nGET /accounts/{account_id}/workers/account-settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -52,9 +58,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_account-settings": workers_account_settings_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_account-settings": workers_account$$settings,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -127,10 +133,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_account-settings": workers_account_settings_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_account-settings": workers_account$$settings,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -138,27 +144,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_account_settings_update",
+    name: "workers_accountSettings_update",
     title: "Configure Workers Account Settings",
-    description: "Configure Workers account settings for an account.",
+    description: "Configure Workers account settings for an account.\n\nPUT /accounts/{account_id}/workers/account-settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_account-settings"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_account-settings": workers_account_settings,
-        "workers_identifier": workers_identifier,
+        "workers_account-settings": workers_account$$settings$,
       },
     },
     outputSchema: {
@@ -179,9 +194,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_account-settings": workers_account_settings_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_account-settings": workers_account$$settings,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -226,10 +241,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_account-settings": workers_account_settings_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_account-settings": workers_account$$settings,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/assets/upload/tools.ts b/src/generated/forge-mcp/workers/assets/upload/tools.ts
index a409f19b9..f188d9a79 100644
--- a/src/generated/forge-mcp/workers/assets/upload/tools.ts
+++ b/src/generated/forge-mcp/workers/assets/upload/tools.ts
@@ -3,16 +3,14 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_create_assets_upload_session_response_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_create$$assets$$upload$$session$$response,
+  workers_messages,
 } from "../../../outputs.js";
 import {
-  workers_create_assets_upload_session_object,
-  workers_identifier,
-  workers_manifest_value,
-  workers_script_name,
+  workers_create$$assets$$upload$$session$$object,
+  workers_manifest$$value,
 } from "../../../schemas.js";
 
 /**
@@ -20,42 +18,50 @@ import {
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_assets_upload_create_session",
+    name: "workers_assets_upload_createSession",
     title: "Create Worker Assets Upload Session",
-    description: "Start uploading a collection of assets for use in a Worker version. To learn more about the direct uploads of assets, see https://developers.cloudflare.com/workers/static-assets/direct-upload/.",
+    description: "Start uploading a collection of assets for use in a Worker version. To learn more about the direct uploads of assets, see https://developers.cloudflare.com/workers/static-assets/direct-upload/.\n\nPOST /accounts/{account_id}/workers/scripts/{script_name}/assets-upload-session",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_create-assets-upload-session-object"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_create-assets-upload-session-object": workers_create_assets_upload_session_object,
-        "workers_identifier": workers_identifier,
-        "workers_manifest-value": workers_manifest_value,
-        "workers_script_name": workers_script_name,
+        "workers_create-assets-upload-session-object": workers_create$$assets$$upload$$session$$object,
+        "workers_manifest-value": workers_manifest$$value,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/workers_create-assets-upload-session-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_create-assets-upload-session-response": workers_create_assets_upload_session_response_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_create-assets-upload-session-response": workers_create$$assets$$upload$$session$$response,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -92,10 +98,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_create-assets-upload-session-response": workers_create_assets_upload_session_response_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_create-assets-upload-session-response": workers_create$$assets$$upload$$session$$response,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/deployments/outputs.ts b/src/generated/forge-mcp/workers/deployments/outputs.ts
index ec948f9bd..91534f4e8 100644
--- a/src/generated/forge-mcp/workers/deployments/outputs.ts
+++ b/src/generated/forge-mcp/workers/deployments/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_deployment` in responses.
  */
-export const workers_deployment_output: JsonSchema = {
+export const workers_deployment: JsonSchema = {
   "properties": {
     "annotations": {
       "properties": {
diff --git a/src/generated/forge-mcp/workers/deployments/tools.ts b/src/generated/forge-mcp/workers/deployments/tools.ts
index 47149499d..3a975b710 100644
--- a/src/generated/forge-mcp/workers/deployments/tools.ts
+++ b/src/generated/forge-mcp/workers/deployments/tools.ts
@@ -1,21 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_code_update_strategy_output,
-  workers_messages_output,
-} from "../../outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
   workers_code_update_strategy,
-  workers_identifier,
-  workers_script_name,
-} from "../../schemas.js";
-import { workers_deployment_output } from "./outputs.js";
-import { workers_deployment } from "./schemas.js";
+  workers_messages,
+} from "../../outputs.js";
+import { workers_code_update_strategy as workers_code_update_strategy$ } from "../../schemas.js";
+import { workers_deployment } from "./outputs.js";
+import { workers_deployment as workers_deployment$ } from "./schemas.js";
 
 /**
  * The tools of `workers.deployments`.
@@ -24,36 +20,50 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_deployments_create",
     title: "Create Worker Deployment",
-    description: "Deployments configure how [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions) are deployed to traffic. A deployment can consist of multiple versions of a Worker.",
+    description: "Deployments configure how [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions) are deployed to traffic. A deployment can consist of multiple versions of a Worker.\n\nPOST /accounts/{account_id}/workers/scripts/{script_name}/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_deployment"
         },
-        "bypass_deployment_checks": {
-          "description": "If set to true, the deployment will be created even if normally blocked by something such rolling back to an older version when a secret has changed.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "force": {
+              "description": "If set to true, the deployment will be created even if normally blocked by something such rolling back to an older version when a secret has changed.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_code_update_strategy": workers_code_update_strategy,
-        "workers_deployment": workers_deployment,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
+        "workers_code_update_strategy": workers_code_update_strategy$,
+        "workers_deployment": workers_deployment$,
       },
     },
     outputSchema: {
@@ -74,10 +84,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_code_update_strategy": workers_code_update_strategy_output,
-        "workers_deployment": workers_deployment_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_code_update_strategy": workers_code_update_strategy,
+        "workers_deployment": workers_deployment,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -123,17 +133,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_code_update_strategy": workers_code_update_strategy_output,
-        "workers_deployment": workers_deployment_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_code_update_strategy": workers_code_update_strategy,
+        "workers_deployment": workers_deployment,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/scripts/${pathParam(args, "script_name")}/deployments`,
       query: [
-        ["force", args["bypass_deployment_checks"], true],
+        ["force", param(args, "query", "force"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -141,38 +151,44 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_deployments_delete",
     title: "Delete Worker Deployment",
-    description: "Delete a Worker Deployment. The latest deployment, which is actively serving traffic, cannot be deleted. All other deployments can be deleted.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker deployment.",
+    description: "Delete a Worker Deployment. The latest deployment, which is actively serving traffic, cannot be deleted. All other deployments can be deleted.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker deployment.\n\nDELETE /accounts/{account_id}/workers/scripts/{script_name}/deployments/{deployment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "deployment_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "deployment_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-common",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -202,9 +218,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -214,32 +230,38 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_deployments_get",
     title: "Get Worker Deployment",
-    description: "Get information about a Worker Deployment.",
+    description: "Get information about a Worker Deployment.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/deployments/{deployment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "deployment_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "deployment_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -259,10 +281,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_code_update_strategy": workers_code_update_strategy_output,
-        "workers_deployment": workers_deployment_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_code_update_strategy": workers_code_update_strategy,
+        "workers_deployment": workers_deployment,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -314,11 +336,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_code_update_strategy": workers_code_update_strategy_output,
-        "workers_deployment": workers_deployment_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_code_update_strategy": workers_code_update_strategy,
+        "workers_deployment": workers_deployment,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -328,47 +350,59 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_deployments_list",
     title: "List Worker Deployments",
-    description: "List Worker deployments. The first deployment in the list is the latest deployment actively serving traffic.",
+    description: "List Worker deployments. The first deployment in the list is the latest deployment actively serving traffic.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 10,
-          "description": "Items per page.",
-          "type": "integer"
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
-        },
-        "since": {
-          "description": "Start of the deployment creation time range, inclusive.",
-          "format": "date-time",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         },
-        "until": {
-          "description": "End of the deployment creation time range, inclusive.",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Current page.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 10,
+              "description": "Items per page.",
+              "type": "integer"
+            },
+            "since": {
+              "description": "Start of the deployment creation time range, inclusive.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "until": {
+              "description": "End of the deployment creation time range, inclusive.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -399,11 +433,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_code_update_strategy": workers_code_update_strategy_output,
-        "workers_deployment": workers_deployment_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_code_update_strategy": workers_code_update_strategy,
+        "workers_deployment": workers_deployment,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -466,21 +500,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_code_update_strategy": workers_code_update_strategy_output,
-        "workers_deployment": workers_deployment_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_code_update_strategy": workers_code_update_strategy,
+        "workers_deployment": workers_deployment,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/scripts/${pathParam(args, "script_name")}/deployments`,
       query: [
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workers/domains/outputs.ts b/src/generated/forge-mcp/workers/domains/outputs.ts
index 1e32beddf..de502f34c 100644
--- a/src/generated/forge-mcp/workers/domains/outputs.ts
+++ b/src/generated/forge-mcp/workers/domains/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_Domain` in responses.
  */
-export const workers_Domain_output: JsonSchema = {
+export const workers_Domain: JsonSchema = {
   "properties": {
     "cert_id": {
       "format": "uuid",
diff --git a/src/generated/forge-mcp/workers/domains/tools.ts b/src/generated/forge-mcp/workers/domains/tools.ts
index 48be93aa2..1aa3a5c36 100644
--- a/src/generated/forge-mcp/workers/domains/tools.ts
+++ b/src/generated/forge-mcp/workers/domains/tools.ts
@@ -1,15 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier } from "../../schemas.js";
-import { workers_Domain_output } from "./outputs.js";
+import { workers_Domain } from "./outputs.js";
 
 /**
  * The tools of `workers.domains`.
@@ -18,32 +17,39 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_domains_delete",
     title: "Detach Worker Domain",
-    description: "Detaches a domain from a Worker. Both the Worker and all of its previews are no longer routable using this domain.\n\nConfirm with the user before calling this tool. This will stop routing traffic on this domain to the Worker.",
+    description: "Detaches a domain from a Worker. Both the Worker and all of its previews are no longer routable using this domain.\n\nConfirm with the user before calling this tool. This will stop routing traffic on this domain to the Worker.\n\nDELETE /accounts/{account_id}/workers/domains/{domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "domain_id": {
-          "description": "ID of the domain.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "domain_id": {
+              "description": "ID of the domain.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-common",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -73,9 +79,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -85,26 +91,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_domains_get",
     title: "Get Worker Domain",
-    description: "Gets information about a Worker domain.",
+    description: "Gets information about a Worker domain.\n\nGET /accounts/{account_id}/workers/domains/{domain_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "domain_id": {
-          "description": "ID of the domain.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "domain_id": {
+              "description": "ID of the domain.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -124,9 +137,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Domain": workers_Domain_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_Domain": workers_Domain,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -172,10 +185,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Domain": workers_Domain_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_Domain": workers_Domain,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -185,50 +198,63 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_domains_list",
     title: "List Worker Domains",
-    description: "Lists all Worker domains for an account.",
+    description: "Lists all Worker domains for an account.\n\nGET /accounts/{account_id}/workers/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "enabled": {
-          "description": "Whether the configured hostname is routable for the domain.",
-          "type": "boolean"
-        },
-        "environment": {
-          "deprecated": true,
-          "description": "Worker environment associated with the domain.",
-          "type": "string"
-        },
-        "hostname": {
-          "description": "Hostname of the domain.",
-          "type": "string"
-        },
-        "previews_enabled": {
-          "description": "Whether previews are routable for the domain.",
-          "type": "boolean"
-        },
-        "service": {
-          "description": "Name of the Worker associated with the domain.",
-          "type": "string"
-        },
-        "zone_id": {
-          "description": "ID of the zone containing the domain hostname.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "zone_name": {
-          "description": "Name of the zone containing the domain hostname.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "description": "Whether the configured hostname is routable for the domain.",
+              "type": "boolean"
+            },
+            "environment": {
+              "deprecated": true,
+              "description": "Worker environment associated with the domain.",
+              "type": "string"
+            },
+            "hostname": {
+              "description": "Hostname of the domain.",
+              "type": "string"
+            },
+            "previews_enabled": {
+              "description": "Whether previews are routable for the domain.",
+              "type": "boolean"
+            },
+            "service": {
+              "description": "Name of the Worker associated with the domain.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "ID of the zone containing the domain hostname.",
+              "type": "string"
+            },
+            "zone_name": {
+              "description": "Name of the zone containing the domain hostname.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -251,10 +277,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Domain": workers_Domain_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_Domain": workers_Domain,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -303,37 +329,33 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Domain": workers_Domain_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_Domain": workers_Domain,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/domains`,
       query: [
-        ["zone_id", args["zone_id"], true],
-        ["zone_name", args["zone_name"], true],
-        ["service", args["service"], true],
-        ["hostname", args["hostname"], true],
-        ["environment", args["environment"], true],
-        ["previews_enabled", args["previews_enabled"], true],
-        ["enabled", args["enabled"], true],
+        ["zone_id", param(args, "query", "zone_id"), true],
+        ["zone_name", param(args, "query", "zone_name"), true],
+        ["service", param(args, "query", "service"), true],
+        ["hostname", param(args, "query", "hostname"), true],
+        ["environment", param(args, "query", "environment"), true],
+        ["previews_enabled", param(args, "query", "previews_enabled"), true],
+        ["enabled", param(args, "query", "enabled"), true],
       ],
     }),
   },
   {
     name: "workers_domains_update",
     title: "Attach Worker Domain",
-    description: "Attaches a domain that routes traffic to a Worker.",
+    description: "Attaches a domain that routes traffic to a Worker.\n\nPUT /accounts/{account_id}/workers/domains",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "enabled": {
@@ -372,15 +394,26 @@ export const tools: readonly Tool[] = [
             "zone_name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -400,9 +433,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Domain": workers_Domain_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_Domain": workers_Domain,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -447,10 +480,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Domain": workers_Domain_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_Domain": workers_Domain,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/content/tools.ts b/src/generated/forge-mcp/workers/legacy/scripts/content/tools.ts
index 8179d72e2..2dd367998 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/content/tools.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/content/tools.ts
@@ -3,13 +3,9 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_messages_output,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../../../outputs.js";
-import {
-  workers_identifier,
-  workers_script_name,
-} from "../../../../schemas.js";
 
 /**
  * The tools of `workers.legacy.scripts.content`.
@@ -18,27 +14,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_content_get",
     title: "Get Worker Script Content",
-    description: "Fetch Worker script content only.\n\nThis method is deprecated.",
+    description: "Fetch Worker script content only.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/content/v2",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -73,8 +75,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/outputs.ts b/src/generated/forge-mcp/workers/legacy/scripts/outputs.ts
index 340d8c061..ae4c695c5 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/outputs.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `workers_script-response-collection` in responses.
  */
-export const workers_script_response_collection_output: JsonSchema = {
+export const workers_script$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/scriptAndVersionSettings/outputs.ts b/src/generated/forge-mcp/workers/legacy/scripts/scriptAndVersionSettings/outputs.ts
index 01d24ca81..a4fca6447 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/scriptAndVersionSettings/outputs.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/scriptAndVersionSettings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `workers_script-and-version-settings-item` in responses.
  */
-export const workers_script_and_version_settings_item_output: JsonSchema = {
+export const workers_script$$and$$version$$settings$$item: JsonSchema = {
   "properties": {
     "annotations": {
       "properties": {
@@ -41,7 +41,7 @@ export const workers_script_and_version_settings_item_output: JsonSchema = {
     "compatibility_date": {
       "allOf": [
         {
-          "$ref": "#/$defs/workers_compatibility_date"
+          "type": "string"
         },
         {
           "type": "string"
@@ -71,7 +71,7 @@ export const workers_script_and_version_settings_item_output: JsonSchema = {
       "$ref": "#/$defs/workers_limits"
     },
     "logpush": {
-      "$ref": "#/$defs/workers_logpush"
+      "type": "boolean"
     },
     "migrations": {
       "oneOf": [
@@ -116,7 +116,12 @@ export const workers_script_and_version_settings_item_output: JsonSchema = {
       ]
     },
     "usage_model": {
-      "$ref": "#/$defs/workers_usage_model"
+      "enum": [
+        "standard",
+        "bundled",
+        "unbound"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -125,7 +130,7 @@ export const workers_script_and_version_settings_item_output: JsonSchema = {
 /**
  * The schema of `workers_script-and-version-settings-response` in responses.
  */
-export const workers_script_and_version_settings_response_output: JsonSchema = {
+export const workers_script$$and$$version$$settings$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/scriptAndVersionSettings/tools.ts b/src/generated/forge-mcp/workers/legacy/scripts/scriptAndVersionSettings/tools.ts
index 8351063e6..4b72b15ac 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/scriptAndVersionSettings/tools.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/scriptAndVersionSettings/tools.ts
@@ -3,211 +3,195 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_binding_item_output,
-  workers_binding_kind_ai_output,
-  workers_binding_kind_ai_search_namespace_output,
-  workers_binding_kind_ai_search_output,
-  workers_binding_kind_analytics_engine_output,
-  workers_binding_kind_artifacts_output,
-  workers_binding_kind_assets_output,
-  workers_binding_kind_browser_output,
-  workers_binding_kind_d1_output,
-  workers_binding_kind_data_blob_output,
-  workers_binding_kind_dispatch_namespace_output,
-  workers_binding_kind_durable_object_namespace_output,
-  workers_binding_kind_flagship_output,
-  workers_binding_kind_hyperdrive_output,
-  workers_binding_kind_images_output,
-  workers_binding_kind_inherit_output,
-  workers_binding_kind_json_output,
-  workers_binding_kind_k2_output,
-  workers_binding_kind_kv_namespace_output,
-  workers_binding_kind_media_output,
-  workers_binding_kind_messaging_output,
-  workers_binding_kind_mtls_certificate_output,
-  workers_binding_kind_pipelines_output,
-  workers_binding_kind_plain_text_output,
-  workers_binding_kind_queue_output,
-  workers_binding_kind_r2_bucket_output,
-  workers_binding_kind_ratelimit_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_kind_secrets_store_secret_output,
-  workers_binding_kind_send_email_output,
-  workers_binding_kind_service_output,
-  workers_binding_kind_text_blob_output,
-  workers_binding_kind_vectorize_output,
-  workers_binding_kind_version_metadata_output,
-  workers_binding_kind_vpc_network_output,
-  workers_binding_kind_vpc_service_output,
-  workers_binding_kind_wasm_module_output,
-  workers_binding_kind_workflow_output,
-  workers_binding_name_output,
-  workers_bindings_output,
-  workers_cache_options_output,
-  workers_compatibility_date_output,
-  workers_compatibility_flag_output,
-  workers_compatibility_flags_output,
-  workers_durable_object_deleted_export_output,
-  workers_durable_object_expecting_transfer_export_output,
-  workers_durable_object_export_output,
-  workers_durable_object_export_variants_output,
-  workers_durable_object_renamed_export_output,
-  workers_durable_object_transferred_export_output,
-  workers_entrypoint_cache_options_output,
-  workers_export_config_output,
-  workers_export_storage_output,
-  workers_exports_config_map_output,
-  workers_exports_reconciliation_info_output,
-  workers_exports_reconciliation_rename_output,
-  workers_exports_reconciliation_result_output,
-  workers_exports_reconciliation_scenario_output,
-  workers_exports_reconciliation_transfer_output,
-  workers_exports_reconciliation_transfer_pending_output,
-  workers_exports_reconciliation_warning_output,
-  workers_limits_output,
-  workers_logpush_output,
-  workers_messages_output,
-  workers_migration_step_output,
-  workers_migration_tag_conditions_output,
-  workers_multiple_step_migrations_output,
-  workers_namespace_identifier_output,
-  workers_observability_2_output,
-  workers_placement_info_no_status_output,
-  workers_placement_target_output,
-  workers_single_step_migrations_output,
-  workers_tag_output,
-  workers_tags_output,
-  workers_tail_consumers_output,
-  workers_tail_consumers_script_output,
-  workers_usage_model_output,
-  workers_worker_export_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_binding_item,
+  workers_binding_kind_ai,
+  workers_binding_kind_ai_search,
+  workers_binding_kind_ai_search_namespace,
+  workers_binding_kind_analytics_engine,
+  workers_binding_kind_artifacts,
+  workers_binding_kind_assets,
+  workers_binding_kind_browser,
+  workers_binding_kind_d1,
+  workers_binding_kind_data_blob,
+  workers_binding_kind_dispatch_namespace,
+  workers_binding_kind_durable_object_namespace,
+  workers_binding_kind_flagship,
+  workers_binding_kind_hyperdrive,
+  workers_binding_kind_images,
+  workers_binding_kind_inherit,
+  workers_binding_kind_json,
+  workers_binding_kind_k2,
+  workers_binding_kind_kv_namespace,
+  workers_binding_kind_media,
+  workers_binding_kind_messaging,
+  workers_binding_kind_mtls_certificate,
+  workers_binding_kind_pipelines,
+  workers_binding_kind_plain_text,
+  workers_binding_kind_queue,
+  workers_binding_kind_r2_bucket,
+  workers_binding_kind_ratelimit,
+  workers_binding_kind_secret_key,
+  workers_binding_kind_secret_text,
+  workers_binding_kind_secrets_store_secret,
+  workers_binding_kind_send_email,
+  workers_binding_kind_service,
+  workers_binding_kind_text_blob,
+  workers_binding_kind_vectorize,
+  workers_binding_kind_version_metadata,
+  workers_binding_kind_vpc_network,
+  workers_binding_kind_vpc_service,
+  workers_binding_kind_wasm_module,
+  workers_binding_kind_workflow,
+  workers_bindings,
+  workers_cache_options,
+  workers_compatibility_flags,
+  workers_durable_object_deleted_export,
+  workers_durable_object_expecting_transfer_export,
+  workers_durable_object_export,
+  workers_durable_object_export_variants,
+  workers_durable_object_renamed_export,
+  workers_durable_object_transferred_export,
+  workers_entrypoint_cache_options,
+  workers_export_config,
+  workers_exports_config_map,
+  workers_exports_reconciliation_info,
+  workers_exports_reconciliation_rename,
+  workers_exports_reconciliation_result,
+  workers_exports_reconciliation_transfer,
+  workers_exports_reconciliation_transfer_pending,
+  workers_exports_reconciliation_warning,
+  workers_limits,
+  workers_messages,
+  workers_migration_step,
+  workers_migration_tag_conditions,
+  workers_multiple_step_migrations,
+  workers_observability$$2,
+  workers_placement_info_no_status,
+  workers_placement_target,
+  workers_single_step_migrations,
+  workers_tags,
+  workers_tail_consumers,
+  workers_tail_consumers_script,
+  workers_worker_export,
 } from "../../../../outputs.js";
 import {
-  workers_identifier,
-  workers_script_name,
-} from "../../../../schemas.js";
-import {
-  workers_script_and_version_settings_item_output,
-  workers_script_and_version_settings_response_output,
+  workers_script$$and$$version$$settings$$item,
+  workers_script$$and$$version$$settings$$response,
 } from "./outputs.js";
 
 /**
- * The tools of `workers.legacy.scripts.script_and_version_settings`.
+ * The tools of `workers.legacy.scripts.scriptAndVersionSettings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_legacy_scripts_script_and_version_settings_get",
+    name: "workers_legacy_scripts_scriptAndVersionSettings_get",
     title: "Get Worker Script and Version Settings",
-    description: "Get Worker script metadata and config, such as bindings or usage model.\n\nThis method is deprecated.",
+    description: "Get Worker script metadata and config, such as bindings or usage model.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_script-and-version-settings-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_limits": workers_limits_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_script-and-version-settings-item": workers_script_and_version_settings_item_output,
-        "workers_script-and-version-settings-response": workers_script_and_version_settings_response_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_script-and-version-settings-item": workers_script$$and$$version$$settings$$item,
+        "workers_script-and-version-settings-response": workers_script$$and$$version$$settings$$response,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -247,89 +231,80 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_limits": workers_limits_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_script-and-version-settings-item": workers_script_and_version_settings_item_output,
-        "workers_script-and-version-settings-response": workers_script_and_version_settings_response_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_script-and-version-settings-item": workers_script$$and$$version$$settings$$item,
+        "workers_script-and-version-settings-response": workers_script$$and$$version$$settings$$response,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/settings/outputs.ts b/src/generated/forge-mcp/workers/legacy/scripts/settings/outputs.ts
index 273f73421..5ea17af02 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/settings/outputs.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/settings/outputs.ts
@@ -6,10 +6,10 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `workers_script-settings-item` in responses.
  */
-export const workers_script_settings_item_output: JsonSchema = {
+export const workers_script$$settings$$item: JsonSchema = {
   "properties": {
     "logpush": {
-      "$ref": "#/$defs/workers_logpush"
+      "type": "boolean"
     },
     "observability": {
       "$ref": "#/$defs/workers_observability-2"
@@ -23,7 +23,7 @@ export const workers_script_settings_item_output: JsonSchema = {
           "oneOf": [
             {
               "items": {
-                "$ref": "#/$defs/workers_tag"
+                "type": "string"
               },
               "type": "array"
             },
@@ -54,7 +54,7 @@ export const workers_script_settings_item_output: JsonSchema = {
 /**
  * The schema of `workers_script-settings-response` in responses.
  */
-export const workers_script_settings_response_output: JsonSchema = {
+export const workers_script$$settings$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/settings/schemas.ts b/src/generated/forge-mcp/workers/legacy/scripts/settings/schemas.ts
index e6ebf2dfb..6f79d3086 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/settings/schemas.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/settings/schemas.ts
@@ -6,12 +6,12 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `workers_script-settings-item`.
  */
-export const workers_script_settings_item: JsonSchema = {
+export const workers_script$$settings$$item: JsonSchema = {
   "properties": {
     "logpush": {
-      "$ref": "#/$defs/workers_logpush",
       "default": false,
-      "description": "Whether Logpush is turned on for the Worker."
+      "description": "Whether Logpush is turned on for the Worker.",
+      "type": "boolean"
     },
     "observability": {
       "$ref": "#/$defs/workers_observability-2"
@@ -25,7 +25,7 @@ export const workers_script_settings_item: JsonSchema = {
           "oneOf": [
             {
               "items": {
-                "$ref": "#/$defs/workers_tag"
+                "type": "string"
               },
               "type": "array"
             },
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/settings/tools.ts b/src/generated/forge-mcp/workers/legacy/scripts/settings/tools.ts
index 8849c6539..34aa7136e 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/settings/tools.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/settings/tools.ts
@@ -3,32 +3,25 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_exports_reconciliation_error_output,
-  workers_exports_reconciliation_error_response_output,
-  workers_exports_reconciliation_scenario_output,
-  workers_logpush_output,
-  workers_messages_output,
-  workers_observability_2_output,
-  workers_tag_output,
-  workers_tags_output,
-  workers_tail_consumers_script_output,
-} from "../../../../outputs.js";
-import {
-  workers_identifier,
-  workers_logpush,
-  workers_observability_2,
-  workers_script_name,
-  workers_tag,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_exports_reconciliation_error,
+  workers_exports_reconciliation_error_response,
+  workers_messages,
+  workers_observability$$2,
   workers_tags,
   workers_tail_consumers_script,
+} from "../../../../outputs.js";
+import {
+  workers_observability$$2 as workers_observability$$2$,
+  workers_tags as workers_tags$,
+  workers_tail_consumers_script as workers_tail_consumers_script$,
 } from "../../../../schemas.js";
 import {
-  workers_script_settings_item_output,
-  workers_script_settings_response_output,
+  workers_script$$settings$$item,
+  workers_script$$settings$$response,
 } from "./outputs.js";
-import { workers_script_settings_item } from "./schemas.js";
+import { workers_script$$settings$$item as workers_script$$settings$$item$ } from "./schemas.js";
 
 /**
  * The tools of `workers.legacy.scripts.settings`.
@@ -37,50 +30,54 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_settings_edit",
     title: "Patch Worker Script Settings",
-    description: "Patch Worker script-level settings when using [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions). Including but not limited to Logpush and Tail Consumers.\n\nThis method is deprecated.",
+    description: "Patch Worker script-level settings when using [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions). Including but not limited to Logpush and Tail Consumers.\n\nThis method is deprecated.\n\nPATCH /accounts/{account_id}/workers/scripts/{script_name}/script-settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_script-settings-item"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_logpush": workers_logpush,
-        "workers_observability-2": workers_observability_2,
-        "workers_script-settings-item": workers_script_settings_item,
-        "workers_script_name": workers_script_name,
-        "workers_tag": workers_tag,
-        "workers_tags": workers_tags,
-        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_observability-2": workers_observability$$2$,
+        "workers_script-settings-item": workers_script$$settings$$item$,
+        "workers_tags": workers_tags$,
+        "workers_tail_consumers_script": workers_tail_consumers_script$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/workers_script-settings-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_script-settings-item": workers_script_settings_item_output,
-        "workers_script-settings-response": workers_script_settings_response_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_observability-2": workers_observability$$2,
+        "workers_script-settings-item": workers_script$$settings$$item,
+        "workers_script-settings-response": workers_script$$settings$$response,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
       },
     },
     annotations: {
@@ -121,19 +118,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_exports_reconciliation_error": workers_exports_reconciliation_error_output,
-        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_script-settings-item": workers_script_settings_item_output,
-        "workers_script-settings-response": workers_script_settings_response_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_exports_reconciliation_error": workers_exports_reconciliation_error,
+        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response,
+        "workers_messages": workers_messages,
+        "workers_observability-2": workers_observability$$2,
+        "workers_script-settings-item": workers_script$$settings$$item,
+        "workers_script-settings-response": workers_script$$settings$$response,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
       },
     },
     request: (args) => ({
@@ -144,40 +138,44 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_settings_get",
     title: "Get Worker Script Settings",
-    description: "Get Worker script-level settings when using [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions). Includes Logpush and Tail Consumers.\n\nThis method is deprecated.",
+    description: "Get Worker script-level settings when using [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions). Includes Logpush and Tail Consumers.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/script-settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_script-settings-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_script-settings-item": workers_script_settings_item_output,
-        "workers_script-settings-response": workers_script_settings_response_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_observability-2": workers_observability$$2,
+        "workers_script-settings-item": workers_script$$settings$$item,
+        "workers_script-settings-response": workers_script$$settings$$response,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
       },
     },
     annotations: {
@@ -217,16 +215,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_script-settings-item": workers_script_settings_item_output,
-        "workers_script-settings-response": workers_script_settings_response_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_observability-2": workers_observability$$2,
+        "workers_script-settings-item": workers_script$$settings$$item,
+        "workers_script-settings-response": workers_script$$settings$$response,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/subdomain/outputs.ts b/src/generated/forge-mcp/workers/legacy/scripts/subdomain/outputs.ts
index baa0253d7..25ad7bf40 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/subdomain/outputs.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/subdomain/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `workers_subdomain` in responses.
  */
-export const workers_subdomain_output: JsonSchema = {
+export const workers_subdomain: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/subdomain/tools.ts b/src/generated/forge-mcp/workers/legacy/scripts/subdomain/tools.ts
index 38e997542..c804a51d0 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/subdomain/tools.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/subdomain/tools.ts
@@ -3,15 +3,11 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../../../outputs.js";
-import {
-  workers_identifier,
-  workers_script_name,
-} from "../../../../schemas.js";
-import { workers_subdomain_output } from "./outputs.js";
+import { workers_subdomain } from "./outputs.js";
 
 /**
  * The tools of `workers.legacy.scripts.subdomain`.
@@ -20,14 +16,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_subdomain_create",
     title: "Update Worker Script Subdomain",
-    description: "Enable or disable a Worker script on the workers.dev subdomain.\n\nThis method is deprecated.",
+    description: "Enable or disable a Worker script on the workers.dev subdomain.\n\nThis method is deprecated.\n\nPOST /accounts/{account_id}/workers/scripts/{script_name}/subdomain",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "enabled": {
@@ -44,20 +36,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -77,9 +79,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain": workers_subdomain_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_subdomain": workers_subdomain,
       },
     },
     annotations: {
@@ -128,10 +130,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain": workers_subdomain_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_subdomain": workers_subdomain,
       },
     },
     request: (args) => ({
@@ -142,27 +144,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_subdomain_delete",
     title: "Delete Worker Script Subdomain",
-    description: "Disable all workers.dev subdomains for a Worker script.\n\nThis method is deprecated.\n\nConfirm with the user before calling this tool. This will disable all workers.dev subdomains for the Worker script.",
+    description: "Disable all workers.dev subdomains for a Worker script.\n\nThis method is deprecated.\n\nConfirm with the user before calling this tool. This will disable all workers.dev subdomains for the Worker script.\n\nDELETE /accounts/{account_id}/workers/scripts/{script_name}/subdomain",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -182,9 +190,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain": workers_subdomain_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_subdomain": workers_subdomain,
       },
     },
     annotations: {
@@ -233,10 +241,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain": workers_subdomain_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_subdomain": workers_subdomain,
       },
     },
     request: (args) => ({
@@ -246,27 +254,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_subdomain_get",
     title: "Get Worker Script Subdomain",
-    description: "Get whether a Worker script is available on the workers.dev subdomain.\n\nThis method is deprecated.",
+    description: "Get whether a Worker script is available on the workers.dev subdomain.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/subdomain",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -286,9 +300,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain": workers_subdomain_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_subdomain": workers_subdomain,
       },
     },
     annotations: {
@@ -343,10 +357,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain": workers_subdomain_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_subdomain": workers_subdomain,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/tools.ts b/src/generated/forge-mcp/workers/legacy/scripts/tools.ts
index a066602bf..38217d44c 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/tools.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/tools.ts
@@ -1,49 +1,34 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_api_response_null_result_output,
-  workers_cache_options_output,
-  workers_compatibility_date_output,
-  workers_compatibility_flag_output,
-  workers_compatibility_flags_output,
-  workers_created_on_output,
-  workers_durable_object_deleted_export_output,
-  workers_durable_object_expecting_transfer_export_output,
-  workers_durable_object_export_output,
-  workers_durable_object_export_variants_output,
-  workers_durable_object_renamed_export_output,
-  workers_durable_object_transferred_export_output,
-  workers_entrypoint_cache_options_output,
-  workers_etag_output,
-  workers_export_config_output,
-  workers_export_storage_output,
-  workers_exports_config_map_output,
-  workers_has_assets_output,
-  workers_has_modules_output,
-  workers_identifier_output,
-  workers_logpush_output,
-  workers_messages_output,
-  workers_modified_on_output,
-  workers_observability_2_output,
-  workers_placement_info_output,
-  workers_placement_mode_output,
-  workers_placement_status_output,
-  workers_placement_target_output,
-  workers_script_response_output,
-  workers_tag_output,
-  workers_tags_output,
-  workers_tail_consumers_output,
-  workers_tail_consumers_script_output,
-  workers_usage_model_output,
-  workers_worker_export_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_api$$response$$null$$result,
+  workers_cache_options,
+  workers_compatibility_flags,
+  workers_durable_object_deleted_export,
+  workers_durable_object_expecting_transfer_export,
+  workers_durable_object_export,
+  workers_durable_object_export_variants,
+  workers_durable_object_renamed_export,
+  workers_durable_object_transferred_export,
+  workers_entrypoint_cache_options,
+  workers_export_config,
+  workers_exports_config_map,
+  workers_messages,
+  workers_observability$$2,
+  workers_placement_info,
+  workers_placement_target,
+  workers_script$$response,
+  workers_tags,
+  workers_tail_consumers,
+  workers_tail_consumers_script,
+  workers_worker_export,
 } from "../../../outputs.js";
-import { workers_identifier, workers_script_name } from "../../../schemas.js";
-import { workers_route_output } from "../../outputs.js";
-import { workers_script_response_collection_output } from "./outputs.js";
+import { workers_route } from "../../outputs.js";
+import { workers_script$$response$$collection } from "./outputs.js";
 
 /**
  * The tools of `workers.legacy.scripts`.
@@ -52,38 +37,50 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_delete",
     title: "Delete Worker",
-    description: "Delete your worker. This call has no response body on a successful delete.\n\nThis method is deprecated.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker script.",
+    description: "Delete your worker. This call has no response body on a successful delete.\n\nThis method is deprecated.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker script.\n\nDELETE /accounts/{account_id}/workers/scripts/{script_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         },
-        "delete_with_references": {
-          "description": "If true, delete the Worker even when other Workers still reference it. Service bindings in those Workers may be left broken. Durable Object namespaces implemented by the deleted Worker are deleted even if other Workers reference them.",
-          "type": "boolean"
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "force": {
+              "description": "If true, delete the Worker even when other Workers still reference it. Service bindings in those Workers may be left broken. Durable Object namespaces implemented by the deleted Worker are deleted even if other Workers reference them.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-null-result",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -115,43 +112,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/scripts/${pathParam(args, "script_name")}`,
       query: [
-        ["force", args["delete_with_references"], true],
+        ["force", param(args, "query", "force"), true],
       ],
     }),
   },
   {
     name: "workers_legacy_scripts_get",
     title: "Download Worker Script",
-    description: "Fetch raw content for a Worker script. Note this is the original script content, not JSON encoded.\n\nThis method is deprecated.",
+    description: "Fetch raw content for a Worker script. Note this is the original script content, not JSON encoded.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -186,8 +189,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -197,66 +200,65 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_list",
     title: "List Worker Scripts",
-    description: "Fetch a list of uploaded Worker scripts.\n\nThis method is deprecated.",
+    description: "Fetch a list of uploaded Worker scripts.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "tags": {
-          "description": "Filter scripts by tags. Format: comma-separated list of tag:allowed pairs where allowed is 'yes' or 'no'.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "tags": {
+              "description": "Filter scripts by tags. Format: comma-separated list of tag:allowed pairs where allowed is 'yes' or 'no'.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_script-response-collection",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_etag": workers_etag_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_has_assets": workers_has_assets_output,
-        "workers_has_modules": workers_has_modules_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info": workers_placement_info_output,
-        "workers_placement_mode": workers_placement_mode_output,
-        "workers_placement_status": workers_placement_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_route": workers_route_output,
-        "workers_script-response": workers_script_response_output,
-        "workers_script-response-collection": workers_script_response_collection_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_messages": workers_messages,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info": workers_placement_info,
+        "workers_placement_target": workers_placement_target,
+        "workers_route": workers_route,
+        "workers_script-response": workers_script$$response,
+        "workers_script-response-collection": workers_script$$response$$collection,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -296,50 +298,36 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_etag": workers_etag_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_has_assets": workers_has_assets_output,
-        "workers_has_modules": workers_has_modules_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info": workers_placement_info_output,
-        "workers_placement_mode": workers_placement_mode_output,
-        "workers_placement_status": workers_placement_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_route": workers_route_output,
-        "workers_script-response": workers_script_response_output,
-        "workers_script-response-collection": workers_script_response_collection_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_messages": workers_messages,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info": workers_placement_info,
+        "workers_placement_target": workers_placement_target,
+        "workers_route": workers_route,
+        "workers_script-response": workers_script$$response,
+        "workers_script-response-collection": workers_script$$response$$collection,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/scripts`,
       query: [
-        ["tags", args["tags"], true],
+        ["tags", param(args, "query", "tags"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/usageModel/outputs.ts b/src/generated/forge-mcp/workers/legacy/scripts/usageModel/outputs.ts
index 4c305f524..56e683073 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/usageModel/outputs.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/usageModel/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `workers_usage-model-response` in responses.
  */
-export const workers_usage_model_response_output: JsonSchema = {
+export const workers_usage$$model$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
@@ -16,7 +16,12 @@ export const workers_usage_model_response_output: JsonSchema = {
         "result": {
           "properties": {
             "usage_model": {
-              "$ref": "#/$defs/workers_usage_model"
+              "enum": [
+                "standard",
+                "bundled",
+                "unbound"
+              ],
+              "type": "string"
             },
             "user_limits": {
               "$ref": "#/$defs/workers_user_limits"
@@ -36,7 +41,7 @@ export const workers_usage_model_response_output: JsonSchema = {
 /**
  * The schema of `workers_user_limits` in responses.
  */
-export const workers_user_limits_output: JsonSchema = {
+export const workers_user_limits: JsonSchema = {
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/usageModel/tools.ts b/src/generated/forge-mcp/workers/legacy/scripts/usageModel/tools.ts
index 288f00332..18bec2094 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/usageModel/tools.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/usageModel/tools.ts
@@ -3,59 +3,58 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
-  workers_usage_model_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../../../outputs.js";
 import {
-  workers_identifier,
-  workers_script_name,
-  workers_usage_model,
-} from "../../../../schemas.js";
-import {
-  workers_usage_model_response_output,
-  workers_user_limits_output,
+  workers_usage$$model$$response,
+  workers_user_limits,
 } from "./outputs.js";
-import { workers_user_limits } from "./schemas.js";
+import { workers_user_limits as workers_user_limits$ } from "./schemas.js";
 
 /**
- * The tools of `workers.legacy.scripts.usage_model`.
+ * The tools of `workers.legacy.scripts.usageModel`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_legacy_scripts_usage_model_get",
+    name: "workers_legacy_scripts_usageModel_get",
     title: "Get Worker Script Usage Model",
-    description: "Fetches the usage model for a Worker script.\n\nThis method is deprecated.",
+    description: "Fetches the usage model for a Worker script.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/usage-model",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_usage-model-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_usage-model-response": workers_usage_model_response_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_user_limits": workers_user_limits_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_usage-model-response": workers_usage$$model$$response,
+        "workers_user_limits": workers_user_limits,
       },
     },
     annotations: {
@@ -95,12 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_usage-model-response": workers_usage_model_response_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_user_limits": workers_user_limits_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_usage-model-response": workers_usage$$model$$response,
+        "workers_user_limits": workers_user_limits,
       },
     },
     request: (args) => ({
@@ -108,22 +106,23 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_legacy_scripts_usage_model_update",
+    name: "workers_legacy_scripts_usageModel_update",
     title: "Replace Worker Script Usage Model",
-    description: "Replaces the usage model for a Worker script. Requires a Workers Paid subscription.\n\nThis method is deprecated.",
+    description: "Replaces the usage model for a Worker script. Requires a Workers Paid subscription.\n\nThis method is deprecated.\n\nPUT /accounts/{account_id}/workers/scripts/{script_name}/usage-model",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "usage_model": {
-              "$ref": "#/$defs/workers_usage_model",
               "default": "standard",
-              "description": "Usage model for the Worker invocations."
+              "description": "Usage model for the Worker invocations.",
+              "enum": [
+                "standard",
+                "bundled",
+                "unbound"
+              ],
+              "type": "string"
             },
             "user_limits": {
               "$ref": "#/$defs/workers_user_limits",
@@ -132,31 +131,41 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_usage_model": workers_usage_model,
-        "workers_user_limits": workers_user_limits,
+        "workers_user_limits": workers_user_limits$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/workers_usage-model-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_usage-model-response": workers_usage_model_response_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_user_limits": workers_user_limits_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_usage-model-response": workers_usage$$model$$response,
+        "workers_user_limits": workers_user_limits,
       },
     },
     annotations: {
@@ -190,12 +199,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_usage-model-response": workers_usage_model_response_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_user_limits": workers_user_limits_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_usage-model-response": workers_usage$$model$$response,
+        "workers_user_limits": workers_user_limits,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/versions/outputs.ts b/src/generated/forge-mcp/workers/legacy/scripts/versions/outputs.ts
index d99e2f301..a8038857f 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/versions/outputs.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/versions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `workers_version-item-full` in responses.
  */
-export const workers_version_item_full_output: JsonSchema = {
+export const workers_version$$item$$full: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_version-item-short"
@@ -113,7 +113,7 @@ export const workers_version_item_full_output: JsonSchema = {
 /**
  * The schema of `workers_version-item-short` in responses.
  */
-export const workers_version_item_short_output: JsonSchema = {
+export const workers_version$$item$$short: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -164,7 +164,7 @@ export const workers_version_item_short_output: JsonSchema = {
 /**
  * The schema of `workers_versions-list-response` in responses.
  */
-export const workers_versions_list_response_output: JsonSchema = {
+export const workers_versions$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
@@ -194,7 +194,7 @@ export const workers_versions_list_response_output: JsonSchema = {
 /**
  * The schema of `workers_versions-single-response` in responses.
  */
-export const workers_versions_single_response_output: JsonSchema = {
+export const workers_versions$$single$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/versions/schemas.ts b/src/generated/forge-mcp/workers/legacy/scripts/versions/schemas.ts
deleted file mode 100644
index 21a73c399..000000000
--- a/src/generated/forge-mcp/workers/legacy/scripts/versions/schemas.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../../_/tool.js";
-
-/**
- * The schema of `workers_script_name-2`.
- */
-export const workers_script_name_2: JsonSchema = {
-  "description": "Name of the script.",
-  "type": "string"
-};
-
-/**
- * The schema of `workers_version_identifier`.
- */
-export const workers_version_identifier: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/workers/legacy/scripts/versions/tools.ts b/src/generated/forge-mcp/workers/legacy/scripts/versions/tools.ts
index b4da2ae22..92cbf1562 100644
--- a/src/generated/forge-mcp/workers/legacy/scripts/versions/tools.ts
+++ b/src/generated/forge-mcp/workers/legacy/scripts/versions/tools.ts
@@ -1,76 +1,68 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_binding_item_output,
-  workers_binding_kind_ai_output,
-  workers_binding_kind_ai_search_namespace_output,
-  workers_binding_kind_ai_search_output,
-  workers_binding_kind_analytics_engine_output,
-  workers_binding_kind_artifacts_output,
-  workers_binding_kind_assets_output,
-  workers_binding_kind_browser_output,
-  workers_binding_kind_d1_output,
-  workers_binding_kind_data_blob_output,
-  workers_binding_kind_dispatch_namespace_output,
-  workers_binding_kind_durable_object_namespace_output,
-  workers_binding_kind_flagship_output,
-  workers_binding_kind_hyperdrive_output,
-  workers_binding_kind_images_output,
-  workers_binding_kind_inherit_output,
-  workers_binding_kind_json_output,
-  workers_binding_kind_k2_output,
-  workers_binding_kind_kv_namespace_output,
-  workers_binding_kind_media_output,
-  workers_binding_kind_messaging_output,
-  workers_binding_kind_mtls_certificate_output,
-  workers_binding_kind_pipelines_output,
-  workers_binding_kind_plain_text_output,
-  workers_binding_kind_queue_output,
-  workers_binding_kind_r2_bucket_output,
-  workers_binding_kind_ratelimit_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_kind_secrets_store_secret_output,
-  workers_binding_kind_send_email_output,
-  workers_binding_kind_service_output,
-  workers_binding_kind_text_blob_output,
-  workers_binding_kind_vectorize_output,
-  workers_binding_kind_version_metadata_output,
-  workers_binding_kind_vpc_network_output,
-  workers_binding_kind_vpc_service_output,
-  workers_binding_kind_wasm_module_output,
-  workers_binding_kind_workflow_output,
-  workers_binding_name_output,
-  workers_bindings_output,
-  workers_durable_object_deleted_export_output,
-  workers_durable_object_expecting_transfer_export_output,
-  workers_durable_object_export_output,
-  workers_durable_object_export_variants_output,
-  workers_durable_object_renamed_export_output,
-  workers_durable_object_transferred_export_output,
-  workers_entrypoint_cache_options_output,
-  workers_export_config_output,
-  workers_export_storage_output,
-  workers_exports_config_map_output,
-  workers_messages_output,
-  workers_namespace_identifier_output,
-  workers_worker_export_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_binding_item,
+  workers_binding_kind_ai,
+  workers_binding_kind_ai_search,
+  workers_binding_kind_ai_search_namespace,
+  workers_binding_kind_analytics_engine,
+  workers_binding_kind_artifacts,
+  workers_binding_kind_assets,
+  workers_binding_kind_browser,
+  workers_binding_kind_d1,
+  workers_binding_kind_data_blob,
+  workers_binding_kind_dispatch_namespace,
+  workers_binding_kind_durable_object_namespace,
+  workers_binding_kind_flagship,
+  workers_binding_kind_hyperdrive,
+  workers_binding_kind_images,
+  workers_binding_kind_inherit,
+  workers_binding_kind_json,
+  workers_binding_kind_k2,
+  workers_binding_kind_kv_namespace,
+  workers_binding_kind_media,
+  workers_binding_kind_messaging,
+  workers_binding_kind_mtls_certificate,
+  workers_binding_kind_pipelines,
+  workers_binding_kind_plain_text,
+  workers_binding_kind_queue,
+  workers_binding_kind_r2_bucket,
+  workers_binding_kind_ratelimit,
+  workers_binding_kind_secret_key,
+  workers_binding_kind_secret_text,
+  workers_binding_kind_secrets_store_secret,
+  workers_binding_kind_send_email,
+  workers_binding_kind_service,
+  workers_binding_kind_text_blob,
+  workers_binding_kind_vectorize,
+  workers_binding_kind_version_metadata,
+  workers_binding_kind_vpc_network,
+  workers_binding_kind_vpc_service,
+  workers_binding_kind_wasm_module,
+  workers_binding_kind_workflow,
+  workers_bindings,
+  workers_durable_object_deleted_export,
+  workers_durable_object_expecting_transfer_export,
+  workers_durable_object_export,
+  workers_durable_object_export_variants,
+  workers_durable_object_renamed_export,
+  workers_durable_object_transferred_export,
+  workers_entrypoint_cache_options,
+  workers_export_config,
+  workers_exports_config_map,
+  workers_messages,
+  workers_worker_export,
 } from "../../../../outputs.js";
-import { workers_identifier } from "../../../../schemas.js";
 import {
-  workers_version_item_full_output,
-  workers_version_item_short_output,
-  workers_versions_list_response_output,
-  workers_versions_single_response_output,
+  workers_version$$item$$full,
+  workers_version$$item$$short,
+  workers_versions$$list$$response,
+  workers_versions$$single$$response,
 } from "./outputs.js";
-import {
-  workers_script_name_2,
-  workers_version_identifier,
-} from "./schemas.js";
 
 /**
  * The tools of `workers.legacy.scripts.versions`.
@@ -79,94 +71,96 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_versions_get",
     title: "Get Worker Script Version",
-    description: "Retrieves detailed information about a specific version of a Worker script.\n\nThis method is deprecated.",
+    description: "Retrieves detailed information about a specific version of a Worker script.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/versions/{version_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name-2",
-          "description": "Name of the script."
-        },
-        "version_id": {
-          "$ref": "#/$defs/workers_version_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            },
+            "version_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "version_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "version_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name-2": workers_script_name_2,
-        "workers_version_identifier": workers_version_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_versions-single-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_messages": workers_messages_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_version-item-full": workers_version_item_full_output,
-        "workers_version-item-short": workers_version_item_short_output,
-        "workers_versions-single-response": workers_versions_single_response_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_messages": workers_messages,
+        "workers_version-item-full": workers_version$$item$$full,
+        "workers_version-item-short": workers_version$$item$$short,
+        "workers_versions-single-response": workers_versions$$single$$response,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -211,65 +205,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_messages": workers_messages_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_version-item-full": workers_version_item_full_output,
-        "workers_version-item-short": workers_version_item_short_output,
-        "workers_versions-single-response": workers_versions_single_response_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_messages": workers_messages,
+        "workers_version-item-full": workers_version$$item$$full,
+        "workers_version-item-short": workers_version$$item$$short,
+        "workers_versions-single-response": workers_versions$$single$$response,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
@@ -279,49 +270,61 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_legacy_scripts_versions_list",
     title: "List Versions",
-    description: "List of Worker Versions. The first version in the list is the latest version.\n\nThis method is deprecated.",
+    description: "List of Worker Versions. The first version in the list is the latest version.\n\nThis method is deprecated.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "deployable": {
-          "default": false,
-          "description": "Only return versions that can be used in a deployment. Ignores pagination.",
-          "type": "boolean"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Items per-page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name-2",
-          "description": "Name of the script."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "deployable": {
+              "default": false,
+              "description": "Only return versions that can be used in a deployment. Ignores pagination.",
+              "type": "boolean"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Items per-page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name-2": workers_script_name_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_versions-list-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_version-item-short": workers_version_item_short_output,
-        "workers_versions-list-response": workers_versions_list_response_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_version-item-short": workers_version$$item$$short,
+        "workers_versions-list-response": workers_versions$$list$$response,
       },
     },
     annotations: {
@@ -368,19 +371,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_version-item-short": workers_version_item_short_output,
-        "workers_versions-list-response": workers_versions_list_response_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_version-item-short": workers_version$$item$$short,
+        "workers_versions-list-response": workers_versions$$list$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/scripts/${pathParam(args, "script_name")}/versions`,
       query: [
-        ["deployable", args["deployable"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["deployable", param(args, "query", "deployable"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workers/outputs.ts b/src/generated/forge-mcp/workers/outputs.ts
index 4ccacd514..887ccdb67 100644
--- a/src/generated/forge-mcp/workers/outputs.ts
+++ b/src/generated/forge-mcp/workers/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `workers_ErrorAuth` in responses.
  */
-export const workers_ErrorAuth_output: JsonSchema = {
+export const workers_ErrorAuth: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -28,7 +28,7 @@ export const workers_ErrorAuth_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorInternalServer` in responses.
  */
-export const workers_ErrorInternalServer_output: JsonSchema = {
+export const workers_ErrorInternalServer: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -50,7 +50,7 @@ export const workers_ErrorInternalServer_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorMissingParam` in responses.
  */
-export const workers_ErrorMissingParam_output: JsonSchema = {
+export const workers_ErrorMissingParam: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -72,7 +72,7 @@ export const workers_ErrorMissingParam_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerInvalid` in responses.
  */
-export const workers_ErrorWorkerInvalid_output: JsonSchema = {
+export const workers_ErrorWorkerInvalid: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -94,7 +94,7 @@ export const workers_ErrorWorkerInvalid_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerLimit` in responses.
  */
-export const workers_ErrorWorkerLimit_output: JsonSchema = {
+export const workers_ErrorWorkerLimit: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -116,7 +116,7 @@ export const workers_ErrorWorkerLimit_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerNameConflict` in responses.
  */
-export const workers_ErrorWorkerNameConflict_output: JsonSchema = {
+export const workers_ErrorWorkerNameConflict: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -138,7 +138,7 @@ export const workers_ErrorWorkerNameConflict_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerNameInvalid` in responses.
  */
-export const workers_ErrorWorkerNameInvalid_output: JsonSchema = {
+export const workers_ErrorWorkerNameInvalid: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -160,7 +160,7 @@ export const workers_ErrorWorkerNameInvalid_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerNamePreviewLengthLimit` in responses.
  */
-export const workers_ErrorWorkerNamePreviewLengthLimit_output: JsonSchema = {
+export const workers_ErrorWorkerNamePreviewLengthLimit: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -182,7 +182,7 @@ export const workers_ErrorWorkerNamePreviewLengthLimit_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerNameSubdomainLengthLimit` in responses.
  */
-export const workers_ErrorWorkerNameSubdomainLengthLimit_output: JsonSchema = {
+export const workers_ErrorWorkerNameSubdomainLengthLimit: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -204,7 +204,7 @@ export const workers_ErrorWorkerNameSubdomainLengthLimit_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerNotFound` in responses.
  */
-export const workers_ErrorWorkerNotFound_output: JsonSchema = {
+export const workers_ErrorWorkerNotFound: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -227,7 +227,7 @@ export const workers_ErrorWorkerNotFound_output: JsonSchema = {
  * The schema of `workers_ErrorWorkerObservabilitySamplingRateInvalid` in
  * responses.
  */
-export const workers_ErrorWorkerObservabilitySamplingRateInvalid_output: JsonSchema = {
+export const workers_ErrorWorkerObservabilitySamplingRateInvalid: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -249,7 +249,7 @@ export const workers_ErrorWorkerObservabilitySamplingRateInvalid_output: JsonSch
 /**
  * The schema of `workers_ErrorWorkerTagInvalid` in responses.
  */
-export const workers_ErrorWorkerTagInvalid_output: JsonSchema = {
+export const workers_ErrorWorkerTagInvalid: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -271,7 +271,7 @@ export const workers_ErrorWorkerTagInvalid_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerTagLengthLimit` in responses.
  */
-export const workers_ErrorWorkerTagLengthLimit_output: JsonSchema = {
+export const workers_ErrorWorkerTagLengthLimit: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -293,7 +293,7 @@ export const workers_ErrorWorkerTagLengthLimit_output: JsonSchema = {
 /**
  * The schema of `workers_ErrorWorkerTagLimit` in responses.
  */
-export const workers_ErrorWorkerTagLimit_output: JsonSchema = {
+export const workers_ErrorWorkerTagLimit: JsonSchema = {
   "properties": {
     "code": {
       "enum": [
@@ -315,7 +315,7 @@ export const workers_ErrorWorkerTagLimit_output: JsonSchema = {
 /**
  * The schema of `workers_PreviewsBaseConfig` in responses.
  */
-export const workers_PreviewsBaseConfig_output: JsonSchema = {
+export const workers_PreviewsBaseConfig: JsonSchema = {
   "properties": {
     "cache_options": {
       "$ref": "#/$defs/workers_cache_options"
@@ -356,7 +356,7 @@ export const workers_PreviewsBaseConfig_output: JsonSchema = {
 /**
  * The schema of `workers_Worker` in responses.
  */
-export const workers_Worker_output: JsonSchema = {
+export const workers_Worker: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
@@ -666,7 +666,7 @@ export const workers_Worker_output: JsonSchema = {
 /**
  * The schema of `workers_container_item` in responses.
  */
-export const workers_container_item_output: JsonSchema = {
+export const workers_container_item: JsonSchema = {
   "properties": {
     "class_name": {
       "type": "string"
@@ -681,7 +681,7 @@ export const workers_container_item_output: JsonSchema = {
 /**
  * The schema of `workers_containers` in responses.
  */
-export const workers_containers_output: JsonSchema = {
+export const workers_containers: JsonSchema = {
   "items": {
     "$ref": "#/$defs/workers_container_item"
   },
@@ -691,7 +691,7 @@ export const workers_containers_output: JsonSchema = {
 /**
  * The schema of `workers_env` in responses.
  */
-export const workers_env_output: JsonSchema = {
+export const workers_env: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/workers_env_binding_item"
   },
@@ -701,7 +701,7 @@ export const workers_env_output: JsonSchema = {
 /**
  * The schema of `workers_env_binding_item` in responses.
  */
-export const workers_env_binding_item_output: JsonSchema = {
+export const workers_env_binding_item: JsonSchema = {
   "properties": {
     "type": {
       "type": "string"
@@ -716,7 +716,7 @@ export const workers_env_binding_item_output: JsonSchema = {
 /**
  * The schema of `workers_observability` in responses.
  */
-export const workers_observability_output: JsonSchema = {
+export const workers_observability: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -806,10 +806,10 @@ export const workers_observability_output: JsonSchema = {
 /**
  * The schema of `workers_route` in responses.
  */
-export const workers_route_output: JsonSchema = {
+export const workers_route: JsonSchema = {
   "properties": {
     "id": {
-      "$ref": "#/$defs/workers_identifier"
+      "type": "string"
     },
     "pattern": {
       "type": "string"
diff --git a/src/generated/forge-mcp/workers/placement/regions/outputs.ts b/src/generated/forge-mcp/workers/placement/regions/outputs.ts
index 25327e8c8..d71758035 100644
--- a/src/generated/forge-mcp/workers/placement/regions/outputs.ts
+++ b/src/generated/forge-mcp/workers/placement/regions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `workers_placement-provider` in responses.
  */
-export const workers_placement_provider_output: JsonSchema = {
+export const workers_placement$$provider: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -28,7 +28,7 @@ export const workers_placement_provider_output: JsonSchema = {
 /**
  * The schema of `workers_placement-region` in responses.
  */
-export const workers_placement_region_output: JsonSchema = {
+export const workers_placement$$region: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -43,7 +43,7 @@ export const workers_placement_region_output: JsonSchema = {
 /**
  * The schema of `workers_placement-regions-response` in responses.
  */
-export const workers_placement_regions_response_output: JsonSchema = {
+export const workers_placement$$regions$$response: JsonSchema = {
   "properties": {
     "providers": {
       "items": {
diff --git a/src/generated/forge-mcp/workers/placement/regions/tools.ts b/src/generated/forge-mcp/workers/placement/regions/tools.ts
index 494a86b7c..e26aee3b3 100644
--- a/src/generated/forge-mcp/workers/placement/regions/tools.ts
+++ b/src/generated/forge-mcp/workers/placement/regions/tools.ts
@@ -3,15 +3,14 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../../outputs.js";
-import { workers_identifier } from "../../../schemas.js";
 import {
-  workers_placement_provider_output,
-  workers_placement_region_output,
-  workers_placement_regions_response_output,
+  workers_placement$$provider,
+  workers_placement$$region,
+  workers_placement$$regions$$response,
 } from "./outputs.js";
 
 /**
@@ -21,21 +20,28 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_placement_regions_list",
     title: "List Workers Smart Placement Regions",
-    description: "Returns a list of available placement regions organized by cloud provider. These regions can be used to configure Smart Placement for Workers.",
+    description: "Returns a list of available placement regions organized by cloud provider. These regions can be used to configure Smart Placement for Workers.\n\nGET /accounts/{account_id}/workers/placement/regions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -55,11 +61,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_placement-provider": workers_placement_provider_output,
-        "workers_placement-region": workers_placement_region_output,
-        "workers_placement-regions-response": workers_placement_regions_response_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_placement-provider": workers_placement$$provider,
+        "workers_placement-region": workers_placement$$region,
+        "workers_placement-regions-response": workers_placement$$regions$$response,
       },
     },
     annotations: {
@@ -106,12 +112,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_placement-provider": workers_placement_provider_output,
-        "workers_placement-region": workers_placement_region_output,
-        "workers_placement-regions-response": workers_placement_regions_response_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_placement-provider": workers_placement$$provider,
+        "workers_placement-region": workers_placement$$region,
+        "workers_placement-regions-response": workers_placement$$regions$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/previews/deployments/outputs.ts b/src/generated/forge-mcp/workers/previews/deployments/outputs.ts
index b40dc869d..4b6b8060c 100644
--- a/src/generated/forge-mcp/workers/previews/deployments/outputs.ts
+++ b/src/generated/forge-mcp/workers/previews/deployments/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `workers_PreviewDeployment` in responses.
  */
-export const workers_PreviewDeployment_output: JsonSchema = {
+export const workers_PreviewDeployment: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_PreviewDeploymentRequest"
@@ -65,7 +65,7 @@ export const workers_PreviewDeployment_output: JsonSchema = {
 /**
  * The schema of `workers_PreviewDeploymentConfig` in responses.
  */
-export const workers_PreviewDeploymentConfig_output: JsonSchema = {
+export const workers_PreviewDeploymentConfig: JsonSchema = {
   "properties": {
     "annotations": {
       "properties": {
@@ -106,7 +106,7 @@ export const workers_PreviewDeploymentConfig_output: JsonSchema = {
       "$ref": "#/$defs/workers_cache_options"
     },
     "compatibility_date": {
-      "$ref": "#/$defs/workers_compatibility_date"
+      "type": "string"
     },
     "compatibility_flags": {
       "$ref": "#/$defs/workers_compatibility_flags"
@@ -162,7 +162,7 @@ export const workers_PreviewDeploymentConfig_output: JsonSchema = {
 /**
  * The schema of `workers_PreviewDeploymentRequest` in responses.
  */
-export const workers_PreviewDeploymentRequest_output: JsonSchema = {
+export const workers_PreviewDeploymentRequest: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_PreviewDeploymentConfig"
@@ -201,7 +201,7 @@ export const workers_PreviewDeploymentRequest_output: JsonSchema = {
 /**
  * The schema of `workers_assets` in responses.
  */
-export const workers_assets_output: JsonSchema = {
+export const workers_assets: JsonSchema = {
   "properties": {
     "config": {
       "properties": {
diff --git a/src/generated/forge-mcp/workers/previews/deployments/schemas.ts b/src/generated/forge-mcp/workers/previews/deployments/schemas.ts
index a8ec96c24..c82e49f86 100644
--- a/src/generated/forge-mcp/workers/previews/deployments/schemas.ts
+++ b/src/generated/forge-mcp/workers/previews/deployments/schemas.ts
@@ -45,19 +45,19 @@ export const workers_PreviewDeploymentConfig: JsonSchema = {
     },
     "assets": {
       "$ref": "#/$defs/workers_assets",
-      "description": "Configuration for assets within a Worker.\n\n[`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and\n[`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files should be\nincluded as modules named `_headers` and `_redirects` with content type `text/plain`.\n"
+      "description": "Configuration for assets within a Worker.\n\n[`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and\n[`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files should be\nincluded as modules named `_headers` and `_redirects` with content type `text/plain`."
     },
     "bindings": {
       "$ref": "#/$defs/workers_bindings",
-      "description": "Bindings attached to the deployment, as an array of objects\nthat each name themselves. An upload can send `env` or\n`bindings`, and a read returns both. Uploads to a Preview whose\nparent Worker has a previews base config must use `env`.\n"
+      "description": "Bindings attached to the deployment, as an array of objects\nthat each name themselves. An upload can send `env` or\n`bindings`, and a read returns both. Uploads to a Preview whose\nparent Worker has a previews base config must use `env`."
     },
     "cache_options": {
       "$ref": "#/$defs/workers_cache_options",
-      "description": "Global CacheW configuration for the Worker. When caching is on,\nthe platform provisions a `cloudflare.app` zone for the Worker.\nA `type: worker` entry in the `exports` map can override this\nvalue for a single entrypoint.\n"
+      "description": "Global CacheW configuration for the Worker. When caching is on,\nthe platform provisions a `cloudflare.app` zone for the Worker.\nA `type: worker` entry in the `exports` map can override this\nvalue for a single entrypoint."
     },
     "compatibility_date": {
-      "$ref": "#/$defs/workers_compatibility_date",
-      "description": "Date indicating targeted support in the Workers runtime. Backwards incompatible fixes to the runtime following this date will not affect this Worker."
+      "description": "Date indicating targeted support in the Workers runtime. Backwards incompatible fixes to the runtime following this date will not affect this Worker.",
+      "type": "string"
     },
     "compatibility_flags": {
       "$ref": "#/$defs/workers_compatibility_flags",
@@ -70,11 +70,11 @@ export const workers_PreviewDeploymentConfig: JsonSchema = {
     },
     "env": {
       "$ref": "#/$defs/workers_env",
-      "description": "Bindings attached to the deployment, keyed by binding name. An\nupload can send `env` or `bindings`, and a read returns both.\n"
+      "description": "Bindings attached to the deployment, keyed by binding name. An\nupload can send `env` or `bindings`, and a read returns both."
     },
     "exports": {
       "$ref": "#/$defs/workers_exports_config_map",
-      "description": "Declarative exports for the deployment, including Durable\nObject classes (with their `storage` backend) and named Worker\nentrypoints. On reads, tombstoned lifecycle entries are\nomitted, so only live exports (`created` and\n`expecting-transfer`) are returned. `exports` and `migrations`\nare mutually exclusive on upload.\n"
+      "description": "Declarative exports for the deployment, including Durable\nObject classes (with their `storage` backend) and named Worker\nentrypoints. On reads, tombstoned lifecycle entries are\nomitted, so only live exports (`created` and\n`expecting-transfer`) are returned. `exports` and `migrations`\nare mutually exclusive on upload."
     },
     "limits": {
       "description": "Resource limits enforced at runtime.",
@@ -172,7 +172,7 @@ export const workers_PreviewDeploymentRequest: JsonSchema = {
  * The schema of `workers_assets`.
  */
 export const workers_assets: JsonSchema = {
-  "description": "Configuration for assets within a Worker.\n\n[`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and\n[`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files should be\nincluded as modules named `_headers` and `_redirects` with content type `text/plain`.\n",
+  "description": "Configuration for assets within a Worker.\n\n[`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and\n[`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files should be\nincluded as modules named `_headers` and `_redirects` with content type `text/plain`.",
   "properties": {
     "config": {
       "description": "Configuration for assets within a Worker.",
diff --git a/src/generated/forge-mcp/workers/previews/deployments/tools.ts b/src/generated/forge-mcp/workers/previews/deployments/tools.ts
index 7300738c9..f9e241f32 100644
--- a/src/generated/forge-mcp/workers/previews/deployments/tools.ts
+++ b/src/generated/forge-mcp/workers/previews/deployments/tools.ts
@@ -1,86 +1,11 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
-import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_binding_item_output,
-  workers_binding_kind_ai_output,
-  workers_binding_kind_ai_search_namespace_output,
-  workers_binding_kind_ai_search_output,
-  workers_binding_kind_analytics_engine_output,
-  workers_binding_kind_artifacts_output,
-  workers_binding_kind_assets_output,
-  workers_binding_kind_browser_output,
-  workers_binding_kind_d1_output,
-  workers_binding_kind_data_blob_output,
-  workers_binding_kind_dispatch_namespace_output,
-  workers_binding_kind_durable_object_namespace_output,
-  workers_binding_kind_flagship_output,
-  workers_binding_kind_hyperdrive_output,
-  workers_binding_kind_images_output,
-  workers_binding_kind_inherit_output,
-  workers_binding_kind_json_output,
-  workers_binding_kind_k2_output,
-  workers_binding_kind_kv_namespace_output,
-  workers_binding_kind_media_output,
-  workers_binding_kind_messaging_output,
-  workers_binding_kind_mtls_certificate_output,
-  workers_binding_kind_pipelines_output,
-  workers_binding_kind_plain_text_output,
-  workers_binding_kind_queue_output,
-  workers_binding_kind_r2_bucket_output,
-  workers_binding_kind_ratelimit_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_kind_secrets_store_secret_output,
-  workers_binding_kind_send_email_output,
-  workers_binding_kind_service_output,
-  workers_binding_kind_text_blob_output,
-  workers_binding_kind_vectorize_output,
-  workers_binding_kind_version_metadata_output,
-  workers_binding_kind_vpc_network_output,
-  workers_binding_kind_vpc_service_output,
-  workers_binding_kind_wasm_module_output,
-  workers_binding_kind_workflow_output,
-  workers_binding_name_output,
-  workers_bindings_output,
-  workers_cache_options_output,
-  workers_compatibility_date_output,
-  workers_compatibility_flag_output,
-  workers_compatibility_flags_output,
-  workers_durable_object_deleted_export_output,
-  workers_durable_object_expecting_transfer_export_output,
-  workers_durable_object_export_output,
-  workers_durable_object_export_variants_output,
-  workers_durable_object_renamed_export_output,
-  workers_durable_object_transferred_export_output,
-  workers_entrypoint_cache_options_output,
-  workers_export_config_output,
-  workers_export_storage_output,
-  workers_exports_config_map_output,
-  workers_exports_reconciliation_error_output,
-  workers_exports_reconciliation_error_response_output,
-  workers_exports_reconciliation_info_output,
-  workers_exports_reconciliation_rename_output,
-  workers_exports_reconciliation_result_output,
-  workers_exports_reconciliation_scenario_output,
-  workers_exports_reconciliation_transfer_output,
-  workers_exports_reconciliation_transfer_pending_output,
-  workers_exports_reconciliation_warning_output,
-  workers_messages_output,
-  workers_migration_step_output,
-  workers_migration_tag_conditions_output,
-  workers_multiple_step_migrations_output,
-  workers_namespace_identifier_output,
-  workers_placement_info_no_status_output,
-  workers_placement_target_output,
-  workers_single_step_migrations_output,
-  workers_worker_export_output,
-} from "../../../outputs.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
   workers_binding_item,
   workers_binding_kind_ai,
   workers_binding_kind_ai_search,
@@ -120,11 +45,8 @@ import {
   workers_binding_kind_vpc_service,
   workers_binding_kind_wasm_module,
   workers_binding_kind_workflow,
-  workers_binding_name,
   workers_bindings,
   workers_cache_options,
-  workers_compatibility_date,
-  workers_compatibility_flag,
   workers_compatibility_flags,
   workers_durable_object_deleted_export,
   workers_durable_object_expecting_transfer_export,
@@ -134,40 +56,106 @@ import {
   workers_durable_object_transferred_export,
   workers_entrypoint_cache_options,
   workers_export_config,
-  workers_export_storage,
   workers_exports_config_map,
-  workers_identifier,
+  workers_exports_reconciliation_error,
+  workers_exports_reconciliation_error_response,
+  workers_exports_reconciliation_info,
+  workers_exports_reconciliation_rename,
+  workers_exports_reconciliation_result,
+  workers_exports_reconciliation_transfer,
+  workers_exports_reconciliation_transfer_pending,
+  workers_exports_reconciliation_warning,
+  workers_messages,
   workers_migration_step,
   workers_migration_tag_conditions,
   workers_multiple_step_migrations,
-  workers_namespace_identifier,
   workers_placement_info_no_status,
   workers_placement_target,
   workers_single_step_migrations,
   workers_worker_export,
-} from "../../../schemas.js";
+} from "../../../outputs.js";
 import {
-  workers_container_item_output,
-  workers_containers_output,
-  workers_env_binding_item_output,
-  workers_env_output,
-} from "../../outputs.js";
+  workers_binding_item as workers_binding_item$,
+  workers_binding_kind_ai as workers_binding_kind_ai$,
+  workers_binding_kind_ai_search as workers_binding_kind_ai_search$,
+  workers_binding_kind_ai_search_namespace as workers_binding_kind_ai_search_namespace$,
+  workers_binding_kind_analytics_engine as workers_binding_kind_analytics_engine$,
+  workers_binding_kind_artifacts as workers_binding_kind_artifacts$,
+  workers_binding_kind_assets as workers_binding_kind_assets$,
+  workers_binding_kind_browser as workers_binding_kind_browser$,
+  workers_binding_kind_d1 as workers_binding_kind_d1$,
+  workers_binding_kind_data_blob as workers_binding_kind_data_blob$,
+  workers_binding_kind_dispatch_namespace as workers_binding_kind_dispatch_namespace$,
+  workers_binding_kind_durable_object_namespace as workers_binding_kind_durable_object_namespace$,
+  workers_binding_kind_flagship as workers_binding_kind_flagship$,
+  workers_binding_kind_hyperdrive as workers_binding_kind_hyperdrive$,
+  workers_binding_kind_images as workers_binding_kind_images$,
+  workers_binding_kind_inherit as workers_binding_kind_inherit$,
+  workers_binding_kind_json as workers_binding_kind_json$,
+  workers_binding_kind_k2 as workers_binding_kind_k2$,
+  workers_binding_kind_kv_namespace as workers_binding_kind_kv_namespace$,
+  workers_binding_kind_media as workers_binding_kind_media$,
+  workers_binding_kind_messaging as workers_binding_kind_messaging$,
+  workers_binding_kind_mtls_certificate as workers_binding_kind_mtls_certificate$,
+  workers_binding_kind_pipelines as workers_binding_kind_pipelines$,
+  workers_binding_kind_plain_text as workers_binding_kind_plain_text$,
+  workers_binding_kind_queue as workers_binding_kind_queue$,
+  workers_binding_kind_r2_bucket as workers_binding_kind_r2_bucket$,
+  workers_binding_kind_ratelimit as workers_binding_kind_ratelimit$,
+  workers_binding_kind_secret_key as workers_binding_kind_secret_key$,
+  workers_binding_kind_secret_text as workers_binding_kind_secret_text$,
+  workers_binding_kind_secrets_store_secret as workers_binding_kind_secrets_store_secret$,
+  workers_binding_kind_send_email as workers_binding_kind_send_email$,
+  workers_binding_kind_service as workers_binding_kind_service$,
+  workers_binding_kind_text_blob as workers_binding_kind_text_blob$,
+  workers_binding_kind_vectorize as workers_binding_kind_vectorize$,
+  workers_binding_kind_version_metadata as workers_binding_kind_version_metadata$,
+  workers_binding_kind_vpc_network as workers_binding_kind_vpc_network$,
+  workers_binding_kind_vpc_service as workers_binding_kind_vpc_service$,
+  workers_binding_kind_wasm_module as workers_binding_kind_wasm_module$,
+  workers_binding_kind_workflow as workers_binding_kind_workflow$,
+  workers_bindings as workers_bindings$,
+  workers_cache_options as workers_cache_options$,
+  workers_compatibility_flags as workers_compatibility_flags$,
+  workers_durable_object_deleted_export as workers_durable_object_deleted_export$,
+  workers_durable_object_expecting_transfer_export as workers_durable_object_expecting_transfer_export$,
+  workers_durable_object_export as workers_durable_object_export$,
+  workers_durable_object_export_variants as workers_durable_object_export_variants$,
+  workers_durable_object_renamed_export as workers_durable_object_renamed_export$,
+  workers_durable_object_transferred_export as workers_durable_object_transferred_export$,
+  workers_entrypoint_cache_options as workers_entrypoint_cache_options$,
+  workers_export_config as workers_export_config$,
+  workers_exports_config_map as workers_exports_config_map$,
+  workers_migration_step as workers_migration_step$,
+  workers_migration_tag_conditions as workers_migration_tag_conditions$,
+  workers_multiple_step_migrations as workers_multiple_step_migrations$,
+  workers_placement_info_no_status as workers_placement_info_no_status$,
+  workers_placement_target as workers_placement_target$,
+  workers_single_step_migrations as workers_single_step_migrations$,
+  workers_worker_export as workers_worker_export$,
+} from "../../../schemas.js";
 import {
   workers_container_item,
   workers_containers,
   workers_env,
   workers_env_binding_item,
-} from "../../schemas.js";
+} from "../../outputs.js";
 import {
-  workers_PreviewDeploymentConfig_output,
-  workers_PreviewDeploymentRequest_output,
-  workers_PreviewDeployment_output,
-  workers_assets_output,
-} from "./outputs.js";
+  workers_container_item as workers_container_item$,
+  workers_containers as workers_containers$,
+  workers_env as workers_env$,
+  workers_env_binding_item as workers_env_binding_item$,
+} from "../../schemas.js";
 import {
+  workers_PreviewDeployment,
   workers_PreviewDeploymentConfig,
   workers_PreviewDeploymentRequest,
   workers_assets,
+} from "./outputs.js";
+import {
+  workers_PreviewDeploymentConfig as workers_PreviewDeploymentConfig$,
+  workers_PreviewDeploymentRequest as workers_PreviewDeploymentRequest$,
+  workers_assets as workers_assets$,
 } from "./schemas.js";
 
 /**
@@ -177,40 +165,143 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_previews_deployments_create",
     title: "Create Preview Deployment",
-    description: "Create a new deployment for a Preview.\n\nThis method is beta.",
+    description: "Create a new deployment for a Preview.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_PreviewDeploymentRequest",
           "description": "Preview deployment creation parameters."
         },
-        "ignore_defaults": {
-          "description": "If true, preview defaults from the parent Worker are ignored.",
-          "type": "boolean"
-        },
-        "preview_id": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "ignore_defaults": {
+              "description": "If true, preview defaults from the parent Worker are ignored.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "preview_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig$,
+        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest$,
+        "workers_assets": workers_assets$,
+        "workers_binding_item": workers_binding_item$,
+        "workers_binding_kind_ai": workers_binding_kind_ai$,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search$,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace$,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine$,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts$,
+        "workers_binding_kind_assets": workers_binding_kind_assets$,
+        "workers_binding_kind_browser": workers_binding_kind_browser$,
+        "workers_binding_kind_d1": workers_binding_kind_d1$,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob$,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace$,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace$,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship$,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive$,
+        "workers_binding_kind_images": workers_binding_kind_images$,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit$,
+        "workers_binding_kind_json": workers_binding_kind_json$,
+        "workers_binding_kind_k2": workers_binding_kind_k2$,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace$,
+        "workers_binding_kind_media": workers_binding_kind_media$,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging$,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate$,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines$,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text$,
+        "workers_binding_kind_queue": workers_binding_kind_queue$,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket$,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit$,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key$,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text$,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret$,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email$,
+        "workers_binding_kind_service": workers_binding_kind_service$,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob$,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize$,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata$,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network$,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service$,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module$,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow$,
+        "workers_bindings": workers_bindings$,
+        "workers_cache_options": workers_cache_options$,
+        "workers_compatibility_flags": workers_compatibility_flags$,
+        "workers_container_item": workers_container_item$,
+        "workers_containers": workers_containers$,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export$,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export$,
+        "workers_durable_object_export": workers_durable_object_export$,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants$,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export$,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export$,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options$,
+        "workers_env": workers_env$,
+        "workers_env_binding_item": workers_env_binding_item$,
+        "workers_export_config": workers_export_config$,
+        "workers_exports_config_map": workers_exports_config_map$,
+        "workers_migration_step": workers_migration_step$,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions$,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations$,
+        "workers_placement_info_no_status": workers_placement_info_no_status$,
+        "workers_placement_target": workers_placement_target$,
+        "workers_single_step_migrations": workers_single_step_migrations$,
+        "workers_worker_export": workers_worker_export$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/workers_api-response-common"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/workers_PreviewDeployment"
+            }
+          },
+          "required": [
+            "result"
+          ],
+          "type": "object"
+        }
+      ],
       $defs: {
+        "workers_PreviewDeployment": workers_PreviewDeployment,
         "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig,
         "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest,
+        "workers_api-response-common": workers_api$$response$$common,
         "workers_assets": workers_assets,
         "workers_binding_item": workers_binding_item,
         "workers_binding_kind_ai": workers_binding_kind_ai,
@@ -251,11 +342,8 @@ export const tools: readonly Tool[] = [
         "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
         "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
         "workers_binding_kind_workflow": workers_binding_kind_workflow,
-        "workers_binding_name": workers_binding_name,
         "workers_bindings": workers_bindings,
         "workers_cache_options": workers_cache_options,
-        "workers_compatibility_date": workers_compatibility_date,
-        "workers_compatibility_flag": workers_compatibility_flag,
         "workers_compatibility_flags": workers_compatibility_flags,
         "workers_container_item": workers_container_item,
         "workers_containers": workers_containers,
@@ -269,119 +357,23 @@ export const tools: readonly Tool[] = [
         "workers_env": workers_env,
         "workers_env_binding_item": workers_env_binding_item,
         "workers_export_config": workers_export_config,
-        "workers_export_storage": workers_export_storage,
         "workers_exports_config_map": workers_exports_config_map,
-        "workers_identifier": workers_identifier,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
         "workers_migration_step": workers_migration_step,
         "workers_migration_tag_conditions": workers_migration_tag_conditions,
         "workers_multiple_step_migrations": workers_multiple_step_migrations,
-        "workers_namespace_identifier": workers_namespace_identifier,
         "workers_placement_info_no_status": workers_placement_info_no_status,
         "workers_placement_target": workers_placement_target,
         "workers_single_step_migrations": workers_single_step_migrations,
         "workers_worker_export": workers_worker_export,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/workers_api-response-common"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/workers_PreviewDeployment"
-            }
-          },
-          "required": [
-            "result"
-          ],
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "workers_PreviewDeployment": workers_PreviewDeployment_output,
-        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig_output,
-        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_assets": workers_assets_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -428,95 +420,89 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_PreviewDeployment": workers_PreviewDeployment_output,
-        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig_output,
-        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_assets": workers_assets_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_error": workers_exports_reconciliation_error_output,
-        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_PreviewDeployment": workers_PreviewDeployment,
+        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig,
+        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_assets": workers_assets,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_error": workers_exports_reconciliation_error,
+        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews/${pathParam(args, "preview_id")}/deployments`,
       query: [
-        ["ignore_defaults", args["ignore_defaults"], true],
+        ["ignore_defaults", param(args, "query", "ignore_defaults"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -524,42 +510,49 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_previews_deployments_delete",
     title: "Delete Preview Deployment",
-    description: "Delete a preview deployment.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This will permanently delete the preview deployment.",
+    description: "Delete a preview deployment.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This will permanently delete the preview deployment.\n\nDELETE /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}/deployments/{deployment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "deployment_id": {
-          "description": "Identifier for the deployment, which can be a UUID, a UUID prefix (minimum length 8), or the literal \"latest\" to operate on the most recently created deployment.",
-          "type": "string"
-        },
-        "preview_id": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
-        },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "Identifier for the deployment, which can be a UUID, a UUID prefix (minimum length 8), or the literal \"latest\" to operate on the most recently created deployment.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "preview_id",
-        "deployment_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-common",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -589,9 +582,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -601,39 +594,142 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_previews_deployments_edit",
     title: "Patch Latest Preview Deployment",
-    description: "Only `/deployments/latest` is supported. Creates a new preview deployment by applying a JSON Merge Patch (RFC 7396) to the latest deployment. Patching a specific deployment ID is not supported. Omitted fields are inherited from the latest deployment. Preview base config is used for the first deployment.\n\nThis method is beta.",
+    description: "Only `/deployments/latest` is supported. Creates a new preview deployment by applying a JSON Merge Patch (RFC 7396) to the latest deployment. Patching a specific deployment ID is not supported. Omitted fields are inherited from the latest deployment. Preview base config is used for the first deployment.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}/deployments/latest",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_PreviewDeploymentRequest",
           "description": "JSON Merge Patch to apply to the latest preview deployment. An empty object creates a new deployment with no changes."
         },
-        "ignore_defaults": {
-          "description": "If true, preview defaults from the parent Worker are ignored.",
-          "type": "boolean"
-        },
-        "preview_id": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "ignore_defaults": {
+              "description": "If true, preview defaults from the parent Worker are ignored.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "preview_id"
+        "path"
+      ],
+      additionalProperties: false,
+      $defs: {
+        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig$,
+        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest$,
+        "workers_assets": workers_assets$,
+        "workers_binding_item": workers_binding_item$,
+        "workers_binding_kind_ai": workers_binding_kind_ai$,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search$,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace$,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine$,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts$,
+        "workers_binding_kind_assets": workers_binding_kind_assets$,
+        "workers_binding_kind_browser": workers_binding_kind_browser$,
+        "workers_binding_kind_d1": workers_binding_kind_d1$,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob$,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace$,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace$,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship$,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive$,
+        "workers_binding_kind_images": workers_binding_kind_images$,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit$,
+        "workers_binding_kind_json": workers_binding_kind_json$,
+        "workers_binding_kind_k2": workers_binding_kind_k2$,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace$,
+        "workers_binding_kind_media": workers_binding_kind_media$,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging$,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate$,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines$,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text$,
+        "workers_binding_kind_queue": workers_binding_kind_queue$,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket$,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit$,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key$,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text$,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret$,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email$,
+        "workers_binding_kind_service": workers_binding_kind_service$,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob$,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize$,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata$,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network$,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service$,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module$,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow$,
+        "workers_bindings": workers_bindings$,
+        "workers_cache_options": workers_cache_options$,
+        "workers_compatibility_flags": workers_compatibility_flags$,
+        "workers_container_item": workers_container_item$,
+        "workers_containers": workers_containers$,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export$,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export$,
+        "workers_durable_object_export": workers_durable_object_export$,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants$,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export$,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export$,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options$,
+        "workers_env": workers_env$,
+        "workers_env_binding_item": workers_env_binding_item$,
+        "workers_export_config": workers_export_config$,
+        "workers_exports_config_map": workers_exports_config_map$,
+        "workers_migration_step": workers_migration_step$,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions$,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations$,
+        "workers_placement_info_no_status": workers_placement_info_no_status$,
+        "workers_placement_target": workers_placement_target$,
+        "workers_single_step_migrations": workers_single_step_migrations$,
+        "workers_worker_export": workers_worker_export$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/workers_api-response-common"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/workers_PreviewDeployment"
+            }
+          },
+          "required": [
+            "result"
+          ],
+          "type": "object"
+        }
       ],
       $defs: {
+        "workers_PreviewDeployment": workers_PreviewDeployment,
         "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig,
         "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest,
+        "workers_api-response-common": workers_api$$response$$common,
         "workers_assets": workers_assets,
         "workers_binding_item": workers_binding_item,
         "workers_binding_kind_ai": workers_binding_kind_ai,
@@ -674,11 +770,8 @@ export const tools: readonly Tool[] = [
         "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
         "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
         "workers_binding_kind_workflow": workers_binding_kind_workflow,
-        "workers_binding_name": workers_binding_name,
         "workers_bindings": workers_bindings,
         "workers_cache_options": workers_cache_options,
-        "workers_compatibility_date": workers_compatibility_date,
-        "workers_compatibility_flag": workers_compatibility_flag,
         "workers_compatibility_flags": workers_compatibility_flags,
         "workers_container_item": workers_container_item,
         "workers_containers": workers_containers,
@@ -692,119 +785,23 @@ export const tools: readonly Tool[] = [
         "workers_env": workers_env,
         "workers_env_binding_item": workers_env_binding_item,
         "workers_export_config": workers_export_config,
-        "workers_export_storage": workers_export_storage,
         "workers_exports_config_map": workers_exports_config_map,
-        "workers_identifier": workers_identifier,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
         "workers_migration_step": workers_migration_step,
         "workers_migration_tag_conditions": workers_migration_tag_conditions,
         "workers_multiple_step_migrations": workers_multiple_step_migrations,
-        "workers_namespace_identifier": workers_namespace_identifier,
         "workers_placement_info_no_status": workers_placement_info_no_status,
         "workers_placement_target": workers_placement_target,
         "workers_single_step_migrations": workers_single_step_migrations,
         "workers_worker_export": workers_worker_export,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/workers_api-response-common"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/workers_PreviewDeployment"
-            }
-          },
-          "required": [
-            "result"
-          ],
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "workers_PreviewDeployment": workers_PreviewDeployment_output,
-        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig_output,
-        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_assets": workers_assets_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -851,250 +848,251 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_PreviewDeployment": workers_PreviewDeployment_output,
-        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig_output,
-        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_assets": workers_assets_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_error": workers_exports_reconciliation_error_output,
-        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
-      },
-    },
-    request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews/${pathParam(args, "preview_id")}/deployments/latest`,
-      query: [
-        ["ignore_defaults", args["ignore_defaults"], true],
-      ],
-      body: { value: args["body"], mediaType: "application/json" },
-    }),
-  },
-  {
-    name: "workers_previews_deployments_get",
-    title: "Get Preview Deployment",
-    description: "Get details about a specific preview deployment.\n\nThis method is beta.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "deployment_id": {
-          "description": "Identifier for the deployment, which can be a UUID, a UUID prefix (minimum length 8), or the literal \"latest\" to operate on the most recently created deployment.",
-          "type": "string"
-        },
-        "include": {
-          "description": "Whether to include the `modules` property of the deployment in the response, which contains code and sourcemap content and may add several megabytes to the response size.",
-          "enum": [
-            "modules"
-          ],
-          "type": "string"
-        },
-        "preview_id": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
-        },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
-        }
-      },
-      required: [
-        "account_id",
-        "worker_id",
-        "preview_id",
-        "deployment_id"
-      ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
-    },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/workers_api-response-common"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/workers_PreviewDeployment"
-            }
-          },
-          "required": [
-            "result"
-          ],
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "workers_PreviewDeployment": workers_PreviewDeployment_output,
-        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig_output,
-        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_assets": workers_assets_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
-      },
-    },
-    annotations: {
-      "destructiveHint": false,
-      "idempotentHint": true,
-      "openWorldHint": true,
-      "readOnlyHint": true,
-      "title": "Get Preview Deployment"
-    },
-    method: "GET",
-    path: "/accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}/deployments/{deployment_id}",
-    extensions: {
+        "workers_PreviewDeployment": workers_PreviewDeployment,
+        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig,
+        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_assets": workers_assets,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_error": workers_exports_reconciliation_error,
+        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
+      },
+    },
+    request: (args) => ({
+      path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews/${pathParam(args, "preview_id")}/deployments/latest`,
+      query: [
+        ["ignore_defaults", param(args, "query", "ignore_defaults"), true],
+      ],
+      body: { value: args["body"], mediaType: "application/json" },
+    }),
+  },
+  {
+    name: "workers_previews_deployments_get",
+    title: "Get Preview Deployment",
+    description: "Get details about a specific preview deployment.\n\nThis method is beta.\n\nGET /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}/deployments/{deployment_id}",
+    inputSchema: {
+      type: "object",
+      properties: {
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "Identifier for the deployment, which can be a UUID, a UUID prefix (minimum length 8), or the literal \"latest\" to operate on the most recently created deployment.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id",
+            "deployment_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include": {
+              "description": "Whether to include the `modules` property of the deployment in the response, which contains code and sourcemap content and may add several megabytes to the response size.",
+              "enum": [
+                "modules"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      },
+      required: [
+        "path"
+      ],
+      additionalProperties: false,
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/workers_api-response-common"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/workers_PreviewDeployment"
+            }
+          },
+          "required": [
+            "result"
+          ],
+          "type": "object"
+        }
+      ],
+      $defs: {
+        "workers_PreviewDeployment": workers_PreviewDeployment,
+        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig,
+        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_assets": workers_assets,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
+      },
+    },
+    annotations: {
+      "destructiveHint": false,
+      "idempotentHint": true,
+      "openWorldHint": true,
+      "readOnlyHint": true,
+      "title": "Get Preview Deployment"
+    },
+    method: "GET",
+    path: "/accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}/deployments/{deployment_id}",
+    extensions: {
       "x-api-token-group": [
         "Workers Tail Read",
         "Workers Scripts Write",
@@ -1129,134 +1127,141 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_PreviewDeployment": workers_PreviewDeployment_output,
-        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig_output,
-        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_assets": workers_assets_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_PreviewDeployment": workers_PreviewDeployment,
+        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig,
+        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_assets": workers_assets,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews/${pathParam(args, "preview_id")}/deployments/${pathParam(args, "deployment_id")}`,
       query: [
-        ["include", args["include"], true],
+        ["include", param(args, "query", "include"), true],
       ],
     }),
   },
   {
     name: "workers_previews_deployments_list",
     title: "List Preview Deployments",
-    description: "List all deployments for a Preview.\n\nThis method is beta.",
+    description: "List all deployments for a Preview.\n\nThis method is beta.\n\nGET /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 10,
-          "description": "Items per-page.",
-          "type": "integer"
-        },
-        "preview_id": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Current page.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 10,
+              "description": "Items per-page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "preview_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -1279,87 +1284,81 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_PreviewDeployment": workers_PreviewDeployment_output,
-        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig_output,
-        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_assets": workers_assets_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_PreviewDeployment": workers_PreviewDeployment,
+        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig,
+        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_assets": workers_assets,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -1409,95 +1408,89 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_PreviewDeployment": workers_PreviewDeployment_output,
-        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig_output,
-        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_assets": workers_assets_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_PreviewDeployment": workers_PreviewDeployment,
+        "workers_PreviewDeploymentConfig": workers_PreviewDeploymentConfig,
+        "workers_PreviewDeploymentRequest": workers_PreviewDeploymentRequest,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_assets": workers_assets,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews/${pathParam(args, "preview_id")}/deployments`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workers/previews/outputs.ts b/src/generated/forge-mcp/workers/previews/outputs.ts
index b5fb94509..c05b6fd35 100644
--- a/src/generated/forge-mcp/workers/previews/outputs.ts
+++ b/src/generated/forge-mcp/workers/previews/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_Preview` in responses.
  */
-export const workers_Preview_output: JsonSchema = {
+export const workers_Preview: JsonSchema = {
   "properties": {
     "created_on": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/workers/previews/tools.ts b/src/generated/forge-mcp/workers/previews/tools.ts
index 4bb46836e..e7908598a 100644
--- a/src/generated/forge-mcp/workers/previews/tools.ts
+++ b/src/generated/forge-mcp/workers/previews/tools.ts
@@ -1,16 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier } from "../../schemas.js";
-import { workers_Preview_output } from "./outputs.js";
-import { workers_Preview } from "./schemas.js";
+import { workers_Preview } from "./outputs.js";
+import { workers_Preview as workers_Preview$ } from "./schemas.js";
 
 /**
  * The tools of `workers.previews`.
@@ -19,14 +18,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_previews_create",
     title: "Create Preview",
-    description: "Create a new Preview for a Worker.\n\nThis method is beta.",
+    description: "Create a new Preview for a Worker.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/workers/workers/{worker_id}/previews",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "description": "Preview creation parameters.",
           "properties": {
@@ -177,27 +172,44 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "ignore_base_config": {
-          "description": "If true, preview base config from the parent Worker is ignored.",
-          "type": "boolean"
-        },
-        "ignore_defaults": {
-          "description": "If true, preview defaults/base config from the parent Worker is ignored.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "ignore_base_config": {
+              "description": "If true, preview base config from the parent Worker is ignored.",
+              "type": "boolean"
+            },
+            "ignore_defaults": {
+              "description": "If true, preview defaults/base config from the parent Worker is ignored.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -217,9 +229,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -261,17 +273,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews`,
       query: [
-        ["ignore_defaults", args["ignore_defaults"], true],
-        ["ignore_base_config", args["ignore_base_config"], true],
+        ["ignore_defaults", param(args, "query", "ignore_defaults"), true],
+        ["ignore_base_config", param(args, "query", "ignore_base_config"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -279,36 +291,45 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_previews_edit",
     title: "Edit Preview",
-    description: "Perform a partial update on a Preview, where omitted properties are left unchanged.\n\nThis method is beta.",
+    description: "Perform a partial update on a Preview, where omitted properties are left unchanged.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_Preview",
           "description": "Preview partial update parameters."
         },
-        "preview_id": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
-        },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "preview_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_Preview": workers_Preview,
-        "workers_identifier": workers_identifier,
+        "workers_Preview": workers_Preview$,
       },
     },
     outputSchema: {
@@ -329,9 +350,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -373,10 +394,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -387,31 +408,38 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_previews_get",
     title: "Get Preview",
-    description: "Get details about a specific Preview.\n\nThis method is beta.",
+    description: "Get details about a specific Preview.\n\nThis method is beta.\n\nGET /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "preview_id": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
-        },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "preview_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -431,9 +459,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -480,10 +508,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -493,65 +521,78 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_previews_list",
     title: "List Previews",
-    description: "List all Previews for a Worker.\n\nThis method is beta.",
+    description: "List all Previews for a Worker.\n\nThis method is beta.\n\nGET /accounts/{account_id}/workers/workers/{worker_id}/previews",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "name": {
-          "description": "Partial-match filter on preview name.",
-          "type": "string"
-        },
-        "order": {
-          "default": "desc",
-          "description": "Sort direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order_by": {
-          "default": "deployed_on",
-          "description": "Property to sort results by.",
-          "enum": [
-            "deployed_on",
-            "updated_on",
-            "created_on",
-            "slug",
-            "name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 10,
-          "description": "Items per-page.",
-          "type": "integer"
-        },
-        "slug": {
-          "description": "Partial-match filter on preview slug.",
-          "type": "string"
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "Partial-match filter on preview name.",
+              "type": "string"
+            },
+            "order": {
+              "default": "desc",
+              "description": "Sort direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order_by": {
+              "default": "deployed_on",
+              "description": "Property to sort results by.",
+              "enum": [
+                "deployed_on",
+                "updated_on",
+                "created_on",
+                "slug",
+                "name"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 10,
+              "description": "Items per-page.",
+              "type": "integer"
+            },
+            "slug": {
+              "description": "Partial-match filter on preview slug.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -574,10 +615,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -627,36 +668,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order_by", args["order_by"], true],
-        ["order", args["order"], true],
-        ["slug", args["slug"], true],
-        ["name", args["name"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["order", param(args, "query", "order"), true],
+        ["slug", param(args, "query", "slug"), true],
+        ["name", param(args, "query", "name"), true],
       ],
     }),
   },
   {
     name: "workers_previews_update",
     title: "Update Preview",
-    description: "Perform a complete replacement of a Preview, where omitted properties are set to defaults.\n\nThis method is beta.",
+    description: "Perform a complete replacement of a Preview, where omitted properties are set to defaults.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/workers/workers/{worker_id}/previews/{preview_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "description": "Preview update parameters.",
           "properties": {
@@ -807,32 +844,49 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "ignore_base_config": {
-          "description": "If true, preview base config from the parent Worker is ignored.",
-          "type": "boolean"
-        },
-        "ignore_defaults": {
-          "description": "If true, preview defaults/base config from the parent Worker is ignored.",
-          "type": "boolean"
-        },
-        "preview_id": {
-          "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "Identifier for the Preview, which can be ID, slug, or URL-encoded name.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "preview_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "ignore_base_config": {
+              "description": "If true, preview base config from the parent Worker is ignored.",
+              "type": "boolean"
+            },
+            "ignore_defaults": {
+              "description": "If true, preview defaults/base config from the parent Worker is ignored.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "preview_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -852,9 +906,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -899,17 +953,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Preview": workers_Preview_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_Preview": workers_Preview,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/previews/${pathParam(args, "preview_id")}`,
       query: [
-        ["ignore_defaults", args["ignore_defaults"], true],
-        ["ignore_base_config", args["ignore_base_config"], true],
+        ["ignore_defaults", param(args, "query", "ignore_defaults"), true],
+        ["ignore_base_config", param(args, "query", "ignore_base_config"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/workers/routes/tools.ts b/src/generated/forge-mcp/workers/routes/tools.ts
index 3e5c9eb31..c79fad72a 100644
--- a/src/generated/forge-mcp/workers/routes/tools.ts
+++ b/src/generated/forge-mcp/workers/routes/tools.ts
@@ -3,14 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_identifier_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier } from "../../schemas.js";
-import { workers_route_output } from "../outputs.js";
-import { workers_route } from "../schemas.js";
+import { workers_route } from "../outputs.js";
+import { workers_route as workers_route$ } from "../schemas.js";
 
 /**
  * The tools of `workers.routes`.
@@ -19,25 +17,34 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_routes_create",
     title: "Create Worker Route",
-    description: "Creates a route that maps a URL pattern to a Worker.",
+    description: "Creates a route that maps a URL pattern to a Worker.\n\nPOST /zones/{zone_id}/workers/routes",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/workers_route"
         },
-        "zone_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_route": workers_route,
+        "workers_route": workers_route$,
       },
     },
     outputSchema: {
@@ -58,10 +65,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_route": workers_route_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_route": workers_route,
       },
     },
     annotations: {
@@ -106,11 +112,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_route": workers_route_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_route": workers_route,
       },
     },
     request: (args) => ({
@@ -121,26 +126,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_routes_delete",
     title: "Delete Worker Route",
-    description: "Deletes a Worker route.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker route.",
+    description: "Deletes a Worker route.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker route.\n\nDELETE /zones/{zone_id}/workers/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "route_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "route_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "route_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -152,7 +164,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/workers_identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -165,9 +177,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -199,7 +210,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/workers_identifier"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -217,10 +228,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -230,26 +240,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_routes_get",
     title: "Get Worker Route",
-    description: "Returns information about a Worker route, including URL pattern and Worker.",
+    description: "Returns information about a Worker route, including URL pattern and Worker.\n\nGET /zones/{zone_id}/workers/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "route_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "route_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "route_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -269,10 +286,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_route": workers_route_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_route": workers_route,
       },
     },
     annotations: {
@@ -318,11 +334,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_route": workers_route_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_route": workers_route,
       },
     },
     request: (args) => ({
@@ -332,21 +347,28 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_routes_list",
     title: "List Worker Routes",
-    description: "Returns Worker routes for a zone.",
+    description: "Returns Worker routes for a zone.\n\nGET /zones/{zone_id}/workers/routes",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -369,10 +391,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_route": workers_route_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_route": workers_route,
       },
     },
     annotations: {
@@ -421,11 +442,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_route": workers_route_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_route": workers_route,
       },
     },
     request: (args) => ({
@@ -435,30 +455,39 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_routes_update",
     title: "Replace Worker Route",
-    description: "Replaces the URL pattern or Worker associated with a Worker route.",
+    description: "Replaces the URL pattern or Worker associated with a Worker route.\n\nPUT /zones/{zone_id}/workers/routes/{route_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/workers_route"
         },
-        "route_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "route_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "route_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "route_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_route": workers_route,
+        "workers_route": workers_route$,
       },
     },
     outputSchema: {
@@ -479,10 +508,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_route": workers_route_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_route": workers_route,
       },
     },
     annotations: {
@@ -527,11 +555,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_route": workers_route_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_route": workers_route,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/schemas.ts b/src/generated/forge-mcp/workers/schemas.ts
index 4008bae7f..3882db0db 100644
--- a/src/generated/forge-mcp/workers/schemas.ts
+++ b/src/generated/forge-mcp/workers/schemas.ts
@@ -275,7 +275,7 @@ export const workers_env: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/workers_env_binding_item"
   },
-  "description": "Bindings attached to a Worker, keyed by binding name. `bindings`\ncarries the same information as an array of objects that each\nname themselves, and an upload can use one form or the other.\n",
+  "description": "Bindings attached to a Worker, keyed by binding name. `bindings`\ncarries the same information as an array of objects that each\nname themselves, and an upload can use one form or the other.",
   "type": "object"
 };
 
@@ -283,7 +283,7 @@ export const workers_env: JsonSchema = {
  * The schema of `workers_env_binding_item`.
  */
 export const workers_env_binding_item: JsonSchema = {
-  "description": "A single entry in the `env` map. An entry holds the same payload\nas an entry of `bindings` without the `name` property, because\nthe map key supplies the name. See `binding_item` for the payload\nof each binding kind.\n",
+  "description": "A single entry in the `env` map. An entry holds the same payload\nas an entry of `bindings` without the `name` property, because\nthe map key supplies the name. See `binding_item` for the payload\nof each binding kind.",
   "properties": {
     "type": {
       "description": "The kind of resource that the binding provides.",
diff --git a/src/generated/forge-mcp/workers/scripts/schedules/outputs.ts b/src/generated/forge-mcp/workers/scripts/schedules/outputs.ts
index 2946d8b3d..288f6f6c6 100644
--- a/src/generated/forge-mcp/workers/scripts/schedules/outputs.ts
+++ b/src/generated/forge-mcp/workers/scripts/schedules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `workers_schedule` in responses.
  */
-export const workers_schedule_output: JsonSchema = {
+export const workers_schedule: JsonSchema = {
   "properties": {
     "created_on": {
       "type": "string"
diff --git a/src/generated/forge-mcp/workers/scripts/schedules/tools.ts b/src/generated/forge-mcp/workers/scripts/schedules/tools.ts
index b8126f151..20b5c796c 100644
--- a/src/generated/forge-mcp/workers/scripts/schedules/tools.ts
+++ b/src/generated/forge-mcp/workers/scripts/schedules/tools.ts
@@ -3,13 +3,12 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../../outputs.js";
-import { workers_identifier, workers_script_name } from "../../../schemas.js";
-import { workers_schedule_output } from "./outputs.js";
-import { workers_schedule } from "./schemas.js";
+import { workers_schedule } from "./outputs.js";
+import { workers_schedule as workers_schedule$ } from "./schemas.js";
 
 /**
  * The tools of `workers.scripts.schedules`.
@@ -18,27 +17,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_scripts_schedules_get",
     title: "Get Worker Script Schedules (Cron Triggers)",
-    description: "Get the schedules (Cron Triggers) for a Worker script.",
+    description: "Get the schedules (Cron Triggers) for a Worker script.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/schedules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -69,9 +74,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_schedule": workers_schedule_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_schedule": workers_schedule,
       },
     },
     annotations: {
@@ -136,10 +141,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_schedule": workers_schedule_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_schedule": workers_schedule,
       },
     },
     request: (args) => ({
@@ -149,34 +154,42 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_scripts_schedules_update",
     title: "Update Worker Script Schedules (Cron Triggers)",
-    description: "Update the schedules (Cron Triggers) for a Worker script.",
+    description: "Update the schedules (Cron Triggers) for a Worker script.\n\nPUT /accounts/{account_id}/workers/scripts/{script_name}/schedules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "items": {
             "$ref": "#/$defs/workers_schedule"
           },
           "type": "array"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_schedule": workers_schedule,
-        "workers_script_name": workers_script_name,
+        "workers_schedule": workers_schedule$,
       },
     },
     outputSchema: {
@@ -208,9 +221,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_schedule": workers_schedule_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_schedule": workers_schedule,
       },
     },
     annotations: {
@@ -270,10 +283,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_schedule": workers_schedule_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_schedule": workers_schedule,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/scripts/tools.ts b/src/generated/forge-mcp/workers/scripts/tools.ts
index 8644a88ac..7c748ca82 100644
--- a/src/generated/forge-mcp/workers/scripts/tools.ts
+++ b/src/generated/forge-mcp/workers/scripts/tools.ts
@@ -1,18 +1,13 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_created_on_output,
-  workers_identifier_output,
-  workers_messages_output,
-  workers_modified_on_output,
-  workers_script_name_output,
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier } from "../../schemas.js";
 
 /**
  * The tools of `workers.scripts`.
@@ -21,49 +16,62 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_scripts_search",
     title: "Search Worker Scripts",
-    description: "Search for Worker scripts in an account.",
+    description: "Search for Worker scripts in an account.\n\nGET /accounts/{account_id}/workers/scripts-search",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "id": {
-          "description": "Worker ID (also called tag) to search for. Only exact matches are returned.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Worker name to search for. Both exact and partial matches are returned.",
-          "type": "string"
-        },
-        "order_by": {
-          "default": "name",
-          "description": "Property to sort results by. Results are sorted in ascending order.",
-          "enum": [
-            "created_on",
-            "modified_on",
-            "name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 10,
-          "description": "Items per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "Worker ID (also called tag) to search for. Only exact matches are returned.",
+              "type": "string"
+            },
+            "name": {
+              "description": "Worker name to search for. Both exact and partial matches are returned.",
+              "type": "string"
+            },
+            "order_by": {
+              "default": "name",
+              "description": "Property to sort results by. Results are sorted in ascending order.",
+              "enum": [
+                "created_on",
+                "modified_on",
+                "name"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 10,
+              "description": "Items per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -76,7 +84,8 @@ export const tools: readonly Tool[] = [
               "items": {
                 "properties": {
                   "created_on": {
-                    "$ref": "#/$defs/workers_created_on"
+                    "format": "date-time",
+                    "type": "string"
                   },
                   "environment_is_default": {
                     "type": "boolean"
@@ -85,13 +94,14 @@ export const tools: readonly Tool[] = [
                     "type": "string"
                   },
                   "id": {
-                    "$ref": "#/$defs/workers_identifier"
+                    "type": "string"
                   },
                   "modified_on": {
-                    "$ref": "#/$defs/workers_modified_on"
+                    "format": "date-time",
+                    "type": "string"
                   },
                   "script_name": {
-                    "$ref": "#/$defs/workers_script_name"
+                    "type": "string"
                   },
                   "service_name": {
                     "type": "string"
@@ -115,13 +125,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_script_name": workers_script_name_output,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -161,7 +167,8 @@ export const tools: readonly Tool[] = [
                   "items": {
                     "properties": {
                       "created_on": {
-                        "$ref": "#/$defs/workers_created_on"
+                        "format": "date-time",
+                        "type": "string"
                       },
                       "environment_is_default": {
                         "type": "boolean"
@@ -170,13 +177,14 @@ export const tools: readonly Tool[] = [
                         "type": "string"
                       },
                       "id": {
-                        "$ref": "#/$defs/workers_identifier"
+                        "type": "string"
                       },
                       "modified_on": {
-                        "$ref": "#/$defs/workers_modified_on"
+                        "format": "date-time",
+                        "type": "string"
                       },
                       "script_name": {
-                        "$ref": "#/$defs/workers_script_name"
+                        "type": "string"
                       },
                       "service_name": {
                         "type": "string"
@@ -205,24 +213,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_script_name": workers_script_name_output,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/scripts-search`,
       query: [
-        ["name", args["name"], true],
-        ["id", args["id"], true],
-        ["order_by", args["order_by"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["id", param(args, "query", "id"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workers/secrets/tools.ts b/src/generated/forge-mcp/workers/secrets/tools.ts
index b2268d83a..d02da6778 100644
--- a/src/generated/forge-mcp/workers/secrets/tools.ts
+++ b/src/generated/forge-mcp/workers/secrets/tools.ts
@@ -1,28 +1,22 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_api_response_null_result_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_name_output,
-  workers_messages_output,
-  workers_secret_output,
-  workers_secret_patch_response_output,
-} from "../../outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_api$$response$$null$$result,
   workers_binding_kind_secret_key,
   workers_binding_kind_secret_text,
-  workers_binding_name,
-  workers_identifier,
-  workers_script_name,
+  workers_messages,
   workers_secret,
-  workers_secret_name,
-  workers_secret_name_url_encoded,
-  workers_secret_patch_request,
+  workers_secret$$patch$$response,
+} from "../../outputs.js";
+import {
+  workers_binding_kind_secret_key as workers_binding_kind_secret_key$,
+  workers_binding_kind_secret_text as workers_binding_kind_secret_text$,
+  workers_secret as workers_secret$,
+  workers_secret$$patch$$request,
 } from "../../schemas.js";
 
 /**
@@ -32,35 +26,42 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_secrets_bulk",
     title: "Patch multiple Worker script secrets",
-    description: "Create, update, or delete multiple secrets on a Worker script in a single operation using JSON Merge Patch (RFC 7396).\nThis operation creates a single version with all changes included.\nPrefer this API instead of changing many secrets individually.\n\nUsage:\n\n- To create or update a secret, set its value to a secret object.\n- To delete a secret, set its value to `null`.\n- Secrets not included in the request are left unchanged.",
+    description: "Create, update, or delete multiple secrets on a Worker script in a single operation using JSON Merge Patch (RFC 7396).\nThis operation creates a single version with all changes included.\nPrefer this API instead of changing many secrets individually.\n\nUsage:\n\n- To create or update a secret, set its value to a secret object.\n- To delete a secret, set its value to `null`.\n- Secrets not included in the request are left unchanged.\n\nPATCH /accounts/{account_id}/workers/scripts/{script_name}/secrets-bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_secret-patch-request"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
-        "workers_binding_name": workers_binding_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_secret": workers_secret,
-        "workers_secret-patch-request": workers_secret_patch_request,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key$,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text$,
+        "workers_secret": workers_secret$,
+        "workers_secret-patch-request": workers_secret$$patch$$request,
       },
     },
     outputSchema: {
@@ -78,13 +79,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
-        "workers_secret-patch-response": workers_secret_patch_response_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
+        "workers_secret-patch-response": workers_secret$$patch$$response,
       },
     },
     annotations: {
@@ -130,14 +130,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
-        "workers_secret-patch-response": workers_secret_patch_response_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
+        "workers_secret-patch-response": workers_secret$$patch$$response,
       },
     },
     request: (args) => ({
@@ -148,45 +147,55 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_secrets_delete",
     title: "Delete Worker script secret",
-    description: "Remove a secret from a Worker script by creating a new version without that\nsecret.\n\nWhen changing more than one secret at a time, prefer the \"Patch multiple\nscript secrets\" API instead of changing many secrets individually.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker script secret.",
+    description: "Remove a secret from a Worker script by creating a new version without that\nsecret.\n\nWhen changing more than one secret at a time, prefer the \"Patch multiple\nscript secrets\" API instead of changing many secrets individually.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker script secret.\n\nDELETE /accounts/{account_id}/workers/scripts/{script_name}/secrets/{secret_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
-        },
-        "secret_name": {
-          "$ref": "#/$defs/workers_secret_name",
-          "description": "A JavaScript variable name for the secret binding."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            },
+            "secret_name": {
+              "description": "A JavaScript variable name for the secret binding.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "secret_name"
+          ],
+          "type": "object"
         },
-        "url_encoded": {
-          "$ref": "#/$defs/workers_secret_name_url_encoded",
-          "description": "Flag that indicates whether the secret name is URL encoded."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "url_encoded": {
+              "description": "Flag that indicates whether the secret name is URL encoded.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "secret_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_secret_name": workers_secret_name,
-        "workers_secret_name_url_encoded": workers_secret_name_url_encoded,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-null-result",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -217,54 +226,64 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/scripts/${pathParam(args, "script_name")}/secrets/${pathParam(args, "secret_name")}`,
       query: [
-        ["url_encoded", args["url_encoded"], true],
+        ["url_encoded", param(args, "query", "url_encoded"), true],
       ],
     }),
   },
   {
     name: "workers_secrets_get",
     title: "Get a secret binding",
-    description: "Get a given secret binding (value omitted) on a Worker script.",
+    description: "Get a given secret binding (value omitted) on a Worker script.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/secrets/{secret_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
-        },
-        "secret_name": {
-          "$ref": "#/$defs/workers_secret_name",
-          "description": "A JavaScript variable name for the secret binding."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            },
+            "secret_name": {
+              "description": "A JavaScript variable name for the secret binding.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "secret_name"
+          ],
+          "type": "object"
         },
-        "url_encoded": {
-          "$ref": "#/$defs/workers_secret_name_url_encoded",
-          "description": "Flag that indicates whether the secret name is URL encoded."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "url_encoded": {
+              "description": "Flag that indicates whether the secret name is URL encoded.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "secret_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_secret_name": workers_secret_name,
-        "workers_secret_name_url_encoded": workers_secret_name_url_encoded,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -281,12 +300,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     annotations: {
@@ -335,46 +353,51 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/scripts/${pathParam(args, "script_name")}/secrets/${pathParam(args, "secret_name")}`,
       query: [
-        ["url_encoded", args["url_encoded"], true],
+        ["url_encoded", param(args, "query", "url_encoded"), true],
       ],
     }),
   },
   {
     name: "workers_secrets_list",
     title: "List secrets bound to a Worker script",
-    description: "List the names of secrets bound to a Worker script.",
+    description: "List the names of secrets bound to a Worker script.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -394,12 +417,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     annotations: {
@@ -451,13 +473,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     request: (args) => ({
@@ -467,34 +488,41 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_secrets_update",
     title: "Add a secret to a Worker script",
-    description: "Add a secret to a Worker script by creating a new version with that secret.\n\nWhen changing more than one secret at a time, prefer the \"Patch multiple\nscript secrets\" API instead of changing many secrets individually.",
+    description: "Add a secret to a Worker script by creating a new version with that secret.\n\nWhen changing more than one secret at a time, prefer the \"Patch multiple\nscript secrets\" API instead of changing many secrets individually.\n\nPUT /accounts/{account_id}/workers/scripts/{script_name}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_secret"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
-        "workers_binding_name": workers_binding_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_secret": workers_secret,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key$,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text$,
+        "workers_secret": workers_secret$,
       },
     },
     outputSchema: {
@@ -512,12 +540,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     annotations: {
@@ -563,13 +590,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/subdomains/outputs.ts b/src/generated/forge-mcp/workers/subdomains/outputs.ts
index 7eff8a647..18b520339 100644
--- a/src/generated/forge-mcp/workers/subdomains/outputs.ts
+++ b/src/generated/forge-mcp/workers/subdomains/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_subdomain-2` in responses.
  */
-export const workers_subdomain_2_output: JsonSchema = {
+export const workers_subdomain$$2: JsonSchema = {
   "properties": {
     "subdomain": {
       "type": "string"
diff --git a/src/generated/forge-mcp/workers/subdomains/schemas.ts b/src/generated/forge-mcp/workers/subdomains/schemas.ts
index 797a28f0e..5894b6876 100644
--- a/src/generated/forge-mcp/workers/subdomains/schemas.ts
+++ b/src/generated/forge-mcp/workers/subdomains/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_subdomain-2`.
  */
-export const workers_subdomain_2: JsonSchema = {
+export const workers_subdomain$$2: JsonSchema = {
   "properties": {
     "subdomain": {
       "type": "string"
diff --git a/src/generated/forge-mcp/workers/subdomains/tools.ts b/src/generated/forge-mcp/workers/subdomains/tools.ts
index 14039df54..f82ce3503 100644
--- a/src/generated/forge-mcp/workers/subdomains/tools.ts
+++ b/src/generated/forge-mcp/workers/subdomains/tools.ts
@@ -3,13 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier } from "../../schemas.js";
-import { workers_subdomain_2_output } from "./outputs.js";
-import { workers_subdomain_2 } from "./schemas.js";
+import { workers_subdomain$$2 } from "./outputs.js";
+import { workers_subdomain$$2 as workers_subdomain$$2$ } from "./schemas.js";
 
 /**
  * The tools of `workers.subdomains`.
@@ -18,21 +17,28 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_subdomains_delete",
     title: "Delete Workers Subdomain",
-    description: "Deletes a Workers subdomain for an account.\n\nConfirm with the user before calling this tool. This will permanently delete the Workers subdomain.",
+    description: "Deletes a Workers subdomain for an account.\n\nConfirm with the user before calling this tool. This will permanently delete the Workers subdomain.\n\nDELETE /accounts/{account_id}/workers/subdomain",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -59,8 +65,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -70,21 +76,28 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_subdomains_get",
     title: "Get a Workers Subdomain",
-    description: "Returns a Workers subdomain for an account.",
+    description: "Returns a Workers subdomain for an account.\n\nGET /accounts/{account_id}/workers/subdomain",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -104,9 +117,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain-2": workers_subdomain_2_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_subdomain-2": workers_subdomain$$2,
       },
     },
     annotations: {
@@ -152,10 +165,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain-2": workers_subdomain_2_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_subdomain-2": workers_subdomain$$2,
       },
     },
     request: (args) => ({
@@ -165,25 +178,34 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_subdomains_update",
     title: "Create a Workers Subdomain",
-    description: "Creates a Workers subdomain for an account.",
+    description: "Creates a Workers subdomain for an account.\n\nPUT /accounts/{account_id}/workers/subdomain",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_subdomain-2"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_subdomain-2": workers_subdomain_2,
+        "workers_subdomain-2": workers_subdomain$$2$,
       },
     },
     outputSchema: {
@@ -204,9 +226,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain-2": workers_subdomain_2_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_subdomain-2": workers_subdomain$$2,
       },
     },
     annotations: {
@@ -251,10 +273,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_subdomain-2": workers_subdomain_2_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_subdomain-2": workers_subdomain$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/tail/outputs.ts b/src/generated/forge-mcp/workers/tail/outputs.ts
index 213d90d4b..5eff4a048 100644
--- a/src/generated/forge-mcp/workers/tail/outputs.ts
+++ b/src/generated/forge-mcp/workers/tail/outputs.ts
@@ -6,13 +6,13 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_tail` in responses.
  */
-export const workers_tail_output: JsonSchema = {
+export const workers_tail: JsonSchema = {
   "properties": {
     "expires_at": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/workers_identifier"
+      "type": "string"
     },
     "url": {
       "type": "string"
diff --git a/src/generated/forge-mcp/workers/tail/tools.ts b/src/generated/forge-mcp/workers/tail/tools.ts
index 7b5278e2f..7f1c4848b 100644
--- a/src/generated/forge-mcp/workers/tail/tools.ts
+++ b/src/generated/forge-mcp/workers/tail/tools.ts
@@ -3,13 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_identifier_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier, workers_script_name } from "../../schemas.js";
-import { workers_tail_output } from "./outputs.js";
+import { workers_tail } from "./outputs.js";
 
 /**
  * The tools of `workers.tail`.
@@ -18,38 +16,44 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_tail_delete",
     title: "Delete Worker Tail",
-    description: "Deletes a tail from a Worker.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker tail session.",
+    description: "Deletes a tail from a Worker.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker tail session.\n\nDELETE /accounts/{account_id}/workers/scripts/{script_name}/tails/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name",
-        "id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-common",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -84,9 +88,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -96,27 +100,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_tail_list",
     title: "List Worker Tails",
-    description: "Get a list of tails currently deployed on a Worker.",
+    description: "Get a list of tails currently deployed on a Worker.\n\nGET /accounts/{account_id}/workers/scripts/{script_name}/tails",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -136,10 +146,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_tail": workers_tail_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_tail": workers_tail,
       },
     },
     annotations: {
@@ -193,11 +202,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_tail": workers_tail_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_tail": workers_tail,
       },
     },
     request: (args) => ({
@@ -207,27 +215,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_tail_start",
     title: "Start Worker Tail",
-    description: "Starts a tail that receives logs and exceptions from a Worker.",
+    description: "Starts a tail that receives logs and exceptions from a Worker.\n\nPOST /accounts/{account_id}/workers/scripts/{script_name}/tails",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -247,10 +261,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_tail": workers_tail_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_tail": workers_tail,
       },
     },
     annotations: {
@@ -300,11 +313,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_tail": workers_tail_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_tail": workers_tail,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/tools.ts b/src/generated/forge-mcp/workers/tools.ts
index 63c1551f4..04b748fdf 100644
--- a/src/generated/forge-mcp/workers/tools.ts
+++ b/src/generated/forge-mcp/workers/tools.ts
@@ -1,51 +1,50 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
-import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_cache_options_output,
-  workers_limits_output,
-  workers_messages_output,
-  workers_placement_info_no_status_output,
-  workers_placement_target_output,
-} from "../outputs.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
   workers_cache_options,
-  workers_identifier,
   workers_limits,
+  workers_messages,
   workers_placement_info_no_status,
   workers_placement_target,
-} from "../schemas.js";
+} from "../outputs.js";
 import {
-  workers_ErrorAuth_output,
-  workers_ErrorInternalServer_output,
-  workers_ErrorMissingParam_output,
-  workers_ErrorWorkerInvalid_output,
-  workers_ErrorWorkerLimit_output,
-  workers_ErrorWorkerNameConflict_output,
-  workers_ErrorWorkerNameInvalid_output,
-  workers_ErrorWorkerNamePreviewLengthLimit_output,
-  workers_ErrorWorkerNameSubdomainLengthLimit_output,
-  workers_ErrorWorkerNotFound_output,
-  workers_ErrorWorkerObservabilitySamplingRateInvalid_output,
-  workers_ErrorWorkerTagInvalid_output,
-  workers_ErrorWorkerTagLengthLimit_output,
-  workers_ErrorWorkerTagLimit_output,
-  workers_PreviewsBaseConfig_output,
-  workers_Worker_output,
-  workers_env_binding_item_output,
-  workers_env_output,
-  workers_observability_output,
-} from "./outputs.js";
+  workers_cache_options as workers_cache_options$,
+  workers_limits as workers_limits$,
+  workers_placement_info_no_status as workers_placement_info_no_status$,
+  workers_placement_target as workers_placement_target$,
+} from "../schemas.js";
 import {
+  workers_ErrorAuth,
+  workers_ErrorInternalServer,
+  workers_ErrorMissingParam,
+  workers_ErrorWorkerInvalid,
+  workers_ErrorWorkerLimit,
+  workers_ErrorWorkerNameConflict,
+  workers_ErrorWorkerNameInvalid,
+  workers_ErrorWorkerNamePreviewLengthLimit,
+  workers_ErrorWorkerNameSubdomainLengthLimit,
+  workers_ErrorWorkerNotFound,
+  workers_ErrorWorkerObservabilitySamplingRateInvalid,
+  workers_ErrorWorkerTagInvalid,
+  workers_ErrorWorkerTagLengthLimit,
+  workers_ErrorWorkerTagLimit,
   workers_PreviewsBaseConfig,
   workers_Worker,
   workers_env,
   workers_env_binding_item,
   workers_observability,
+} from "./outputs.js";
+import {
+  workers_PreviewsBaseConfig as workers_PreviewsBaseConfig$,
+  workers_Worker as workers_Worker$,
+  workers_env as workers_env$,
+  workers_env_binding_item as workers_env_binding_item$,
+  workers_observability as workers_observability$,
 } from "./schemas.js";
 
 /**
@@ -55,14 +54,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_create",
     title: "Create Worker",
-    description: "Create a new Worker.",
+    description: "Create a new Worker.\n\nPOST /accounts/{account_id}/workers/workers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "description": "Worker creation parameters.",
           "properties": {
@@ -247,22 +242,35 @@ export const tools: readonly Tool[] = [
             "tail_consumers"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
-        "workers_cache_options": workers_cache_options,
-        "workers_env": workers_env,
-        "workers_env_binding_item": workers_env_binding_item,
-        "workers_identifier": workers_identifier,
-        "workers_limits": workers_limits,
-        "workers_observability": workers_observability,
-        "workers_placement_info_no_status": workers_placement_info_no_status,
-        "workers_placement_target": workers_placement_target,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig$,
+        "workers_cache_options": workers_cache_options$,
+        "workers_env": workers_env$,
+        "workers_env_binding_item": workers_env_binding_item$,
+        "workers_limits": workers_limits$,
+        "workers_observability": workers_observability$,
+        "workers_placement_info_no_status": workers_placement_info_no_status$,
+        "workers_placement_target": workers_placement_target$,
       },
     },
     outputSchema: {
@@ -283,17 +291,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     annotations: {
@@ -469,30 +477,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_ErrorAuth": workers_ErrorAuth_output,
-        "workers_ErrorInternalServer": workers_ErrorInternalServer_output,
-        "workers_ErrorWorkerInvalid": workers_ErrorWorkerInvalid_output,
-        "workers_ErrorWorkerLimit": workers_ErrorWorkerLimit_output,
-        "workers_ErrorWorkerNameConflict": workers_ErrorWorkerNameConflict_output,
-        "workers_ErrorWorkerNameInvalid": workers_ErrorWorkerNameInvalid_output,
-        "workers_ErrorWorkerNamePreviewLengthLimit": workers_ErrorWorkerNamePreviewLengthLimit_output,
-        "workers_ErrorWorkerNameSubdomainLengthLimit": workers_ErrorWorkerNameSubdomainLengthLimit_output,
-        "workers_ErrorWorkerObservabilitySamplingRateInvalid": workers_ErrorWorkerObservabilitySamplingRateInvalid_output,
-        "workers_ErrorWorkerTagInvalid": workers_ErrorWorkerTagInvalid_output,
-        "workers_ErrorWorkerTagLengthLimit": workers_ErrorWorkerTagLengthLimit_output,
-        "workers_ErrorWorkerTagLimit": workers_ErrorWorkerTagLimit_output,
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_ErrorAuth": workers_ErrorAuth,
+        "workers_ErrorInternalServer": workers_ErrorInternalServer,
+        "workers_ErrorWorkerInvalid": workers_ErrorWorkerInvalid,
+        "workers_ErrorWorkerLimit": workers_ErrorWorkerLimit,
+        "workers_ErrorWorkerNameConflict": workers_ErrorWorkerNameConflict,
+        "workers_ErrorWorkerNameInvalid": workers_ErrorWorkerNameInvalid,
+        "workers_ErrorWorkerNamePreviewLengthLimit": workers_ErrorWorkerNamePreviewLengthLimit,
+        "workers_ErrorWorkerNameSubdomainLengthLimit": workers_ErrorWorkerNameSubdomainLengthLimit,
+        "workers_ErrorWorkerObservabilitySamplingRateInvalid": workers_ErrorWorkerObservabilitySamplingRateInvalid,
+        "workers_ErrorWorkerTagInvalid": workers_ErrorWorkerTagInvalid,
+        "workers_ErrorWorkerTagLengthLimit": workers_ErrorWorkerTagLengthLimit,
+        "workers_ErrorWorkerTagLimit": workers_ErrorWorkerTagLimit,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     request: (args) => ({
@@ -503,36 +511,49 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_delete",
     title: "Delete Worker",
-    description: "Delete a Worker and all its associated resources (versions, deployments, etc.).\n\nConfirm with the user before calling this tool. This will permanently delete the Worker and its associated versions and deployments.",
+    description: "Delete a Worker and all its associated resources (versions, deployments, etc.).\n\nConfirm with the user before calling this tool. This will permanently delete the Worker and its associated versions and deployments.\n\nDELETE /accounts/{account_id}/workers/workers/{worker_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "delete_with_references": {
-          "description": "If true, delete the Worker even when other Workers still reference it. Service bindings in those Workers may be left broken. Durable Object namespaces implemented by the deleted Worker are deleted even if other Workers reference them.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "force": {
+              "description": "If true, delete the Worker even when other Workers still reference it. Service bindings in those Workers may be left broken. Durable Object namespaces implemented by the deleted Worker are deleted even if other Workers reference them.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-common",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -642,58 +663,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_ErrorAuth": workers_ErrorAuth_output,
-        "workers_ErrorInternalServer": workers_ErrorInternalServer_output,
-        "workers_ErrorMissingParam": workers_ErrorMissingParam_output,
-        "workers_ErrorWorkerNotFound": workers_ErrorWorkerNotFound_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_ErrorAuth": workers_ErrorAuth,
+        "workers_ErrorInternalServer": workers_ErrorInternalServer,
+        "workers_ErrorMissingParam": workers_ErrorMissingParam,
+        "workers_ErrorWorkerNotFound": workers_ErrorWorkerNotFound,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}`,
       query: [
-        ["force", args["delete_with_references"], true],
+        ["force", param(args, "query", "force"), true],
       ],
     }),
   },
   {
     name: "workers_edit",
     title: "Edit Worker",
-    description: "Perform a partial update on a Worker, where omitted properties are left unchanged from their current values.",
+    description: "Perform a partial update on a Worker, where omitted properties are left unchanged from their current values.\n\nPATCH /accounts/{account_id}/workers/workers/{worker_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_Worker",
           "description": "Worker partial update parameters."
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
-        "workers_Worker": workers_Worker,
-        "workers_cache_options": workers_cache_options,
-        "workers_env": workers_env,
-        "workers_env_binding_item": workers_env_binding_item,
-        "workers_identifier": workers_identifier,
-        "workers_limits": workers_limits,
-        "workers_observability": workers_observability,
-        "workers_placement_info_no_status": workers_placement_info_no_status,
-        "workers_placement_target": workers_placement_target,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig$,
+        "workers_Worker": workers_Worker$,
+        "workers_cache_options": workers_cache_options$,
+        "workers_env": workers_env$,
+        "workers_env_binding_item": workers_env_binding_item$,
+        "workers_limits": workers_limits$,
+        "workers_observability": workers_observability$,
+        "workers_placement_info_no_status": workers_placement_info_no_status$,
+        "workers_placement_target": workers_placement_target$,
       },
     },
     outputSchema: {
@@ -714,17 +744,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     annotations: {
@@ -928,32 +958,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_ErrorAuth": workers_ErrorAuth_output,
-        "workers_ErrorInternalServer": workers_ErrorInternalServer_output,
-        "workers_ErrorMissingParam": workers_ErrorMissingParam_output,
-        "workers_ErrorWorkerInvalid": workers_ErrorWorkerInvalid_output,
-        "workers_ErrorWorkerLimit": workers_ErrorWorkerLimit_output,
-        "workers_ErrorWorkerNameConflict": workers_ErrorWorkerNameConflict_output,
-        "workers_ErrorWorkerNameInvalid": workers_ErrorWorkerNameInvalid_output,
-        "workers_ErrorWorkerNamePreviewLengthLimit": workers_ErrorWorkerNamePreviewLengthLimit_output,
-        "workers_ErrorWorkerNameSubdomainLengthLimit": workers_ErrorWorkerNameSubdomainLengthLimit_output,
-        "workers_ErrorWorkerNotFound": workers_ErrorWorkerNotFound_output,
-        "workers_ErrorWorkerObservabilitySamplingRateInvalid": workers_ErrorWorkerObservabilitySamplingRateInvalid_output,
-        "workers_ErrorWorkerTagInvalid": workers_ErrorWorkerTagInvalid_output,
-        "workers_ErrorWorkerTagLengthLimit": workers_ErrorWorkerTagLengthLimit_output,
-        "workers_ErrorWorkerTagLimit": workers_ErrorWorkerTagLimit_output,
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_ErrorAuth": workers_ErrorAuth,
+        "workers_ErrorInternalServer": workers_ErrorInternalServer,
+        "workers_ErrorMissingParam": workers_ErrorMissingParam,
+        "workers_ErrorWorkerInvalid": workers_ErrorWorkerInvalid,
+        "workers_ErrorWorkerLimit": workers_ErrorWorkerLimit,
+        "workers_ErrorWorkerNameConflict": workers_ErrorWorkerNameConflict,
+        "workers_ErrorWorkerNameInvalid": workers_ErrorWorkerNameInvalid,
+        "workers_ErrorWorkerNamePreviewLengthLimit": workers_ErrorWorkerNamePreviewLengthLimit,
+        "workers_ErrorWorkerNameSubdomainLengthLimit": workers_ErrorWorkerNameSubdomainLengthLimit,
+        "workers_ErrorWorkerNotFound": workers_ErrorWorkerNotFound,
+        "workers_ErrorWorkerObservabilitySamplingRateInvalid": workers_ErrorWorkerObservabilitySamplingRateInvalid,
+        "workers_ErrorWorkerTagInvalid": workers_ErrorWorkerTagInvalid,
+        "workers_ErrorWorkerTagLengthLimit": workers_ErrorWorkerTagLengthLimit,
+        "workers_ErrorWorkerTagLimit": workers_ErrorWorkerTagLimit,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     request: (args) => ({
@@ -964,26 +994,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_get",
     title: "Get Worker",
-    description: "Get details about a specific Worker.",
+    description: "Get details about a specific Worker.\n\nGET /accounts/{account_id}/workers/workers/{worker_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -1003,17 +1040,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     annotations: {
@@ -1125,21 +1162,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_ErrorInternalServer": workers_ErrorInternalServer_output,
-        "workers_ErrorMissingParam": workers_ErrorMissingParam_output,
-        "workers_ErrorWorkerNotFound": workers_ErrorWorkerNotFound_output,
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_ErrorInternalServer": workers_ErrorInternalServer,
+        "workers_ErrorMissingParam": workers_ErrorMissingParam,
+        "workers_ErrorWorkerNotFound": workers_ErrorWorkerNotFound,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     request: (args) => ({
@@ -1149,51 +1186,64 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_list",
     title: "List Workers",
-    description: "List all Workers for an account.",
+    description: "List all Workers for an account.\n\nGET /accounts/{account_id}/workers/workers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "order": {
-          "default": "desc",
-          "description": "Sort direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order_by": {
-          "default": "deployed_on",
-          "description": "Property to sort results by.",
-          "enum": [
-            "deployed_on",
-            "updated_on",
-            "created_on",
-            "name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 10,
-          "description": "Items per-page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "order": {
+              "default": "desc",
+              "description": "Sort direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order_by": {
+              "default": "deployed_on",
+              "description": "Property to sort results by.",
+              "enum": [
+                "deployed_on",
+                "updated_on",
+                "created_on",
+                "name"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Current page.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 10,
+              "description": "Items per-page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -1216,18 +1266,18 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     annotations: {
@@ -1321,44 +1371,40 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_ErrorAuth": workers_ErrorAuth_output,
-        "workers_ErrorInternalServer": workers_ErrorInternalServer_output,
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_ErrorAuth": workers_ErrorAuth,
+        "workers_ErrorInternalServer": workers_ErrorInternalServer,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order_by", args["order_by"], true],
-        ["order", args["order"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
   {
     name: "workers_update",
     title: "Update Worker",
-    description: "Perform a complete replacement of a Worker, where omitted properties are set to their default values. This is the exact same as the Create Worker endpoint, but operates on an existing Worker. To perform a partial update instead, use the Edit Worker endpoint.",
+    description: "Perform a complete replacement of a Worker, where omitted properties are set to their default values. This is the exact same as the Create Worker endpoint, but operates on an existing Worker. To perform a partial update instead, use the Edit Worker endpoint.\n\nPUT /accounts/{account_id}/workers/workers/{worker_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "description": "Worker update parameters.",
           "properties": {
@@ -1544,26 +1590,39 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
-        "workers_cache_options": workers_cache_options,
-        "workers_env": workers_env,
-        "workers_env_binding_item": workers_env_binding_item,
-        "workers_identifier": workers_identifier,
-        "workers_limits": workers_limits,
-        "workers_observability": workers_observability,
-        "workers_placement_info_no_status": workers_placement_info_no_status,
-        "workers_placement_target": workers_placement_target,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig$,
+        "workers_cache_options": workers_cache_options$,
+        "workers_env": workers_env$,
+        "workers_env_binding_item": workers_env_binding_item$,
+        "workers_limits": workers_limits$,
+        "workers_observability": workers_observability$,
+        "workers_placement_info_no_status": workers_placement_info_no_status$,
+        "workers_placement_target": workers_placement_target$,
       },
     },
     outputSchema: {
@@ -1584,17 +1643,17 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     annotations: {
@@ -1798,32 +1857,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_ErrorAuth": workers_ErrorAuth_output,
-        "workers_ErrorInternalServer": workers_ErrorInternalServer_output,
-        "workers_ErrorMissingParam": workers_ErrorMissingParam_output,
-        "workers_ErrorWorkerInvalid": workers_ErrorWorkerInvalid_output,
-        "workers_ErrorWorkerLimit": workers_ErrorWorkerLimit_output,
-        "workers_ErrorWorkerNameConflict": workers_ErrorWorkerNameConflict_output,
-        "workers_ErrorWorkerNameInvalid": workers_ErrorWorkerNameInvalid_output,
-        "workers_ErrorWorkerNamePreviewLengthLimit": workers_ErrorWorkerNamePreviewLengthLimit_output,
-        "workers_ErrorWorkerNameSubdomainLengthLimit": workers_ErrorWorkerNameSubdomainLengthLimit_output,
-        "workers_ErrorWorkerNotFound": workers_ErrorWorkerNotFound_output,
-        "workers_ErrorWorkerObservabilitySamplingRateInvalid": workers_ErrorWorkerObservabilitySamplingRateInvalid_output,
-        "workers_ErrorWorkerTagInvalid": workers_ErrorWorkerTagInvalid_output,
-        "workers_ErrorWorkerTagLengthLimit": workers_ErrorWorkerTagLengthLimit_output,
-        "workers_ErrorWorkerTagLimit": workers_ErrorWorkerTagLimit_output,
-        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig_output,
-        "workers_Worker": workers_Worker_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_env": workers_env_output,
-        "workers_env_binding_item": workers_env_binding_item_output,
-        "workers_limits": workers_limits_output,
-        "workers_messages": workers_messages_output,
-        "workers_observability": workers_observability_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
+        "workers_ErrorAuth": workers_ErrorAuth,
+        "workers_ErrorInternalServer": workers_ErrorInternalServer,
+        "workers_ErrorMissingParam": workers_ErrorMissingParam,
+        "workers_ErrorWorkerInvalid": workers_ErrorWorkerInvalid,
+        "workers_ErrorWorkerLimit": workers_ErrorWorkerLimit,
+        "workers_ErrorWorkerNameConflict": workers_ErrorWorkerNameConflict,
+        "workers_ErrorWorkerNameInvalid": workers_ErrorWorkerNameInvalid,
+        "workers_ErrorWorkerNamePreviewLengthLimit": workers_ErrorWorkerNamePreviewLengthLimit,
+        "workers_ErrorWorkerNameSubdomainLengthLimit": workers_ErrorWorkerNameSubdomainLengthLimit,
+        "workers_ErrorWorkerNotFound": workers_ErrorWorkerNotFound,
+        "workers_ErrorWorkerObservabilitySamplingRateInvalid": workers_ErrorWorkerObservabilitySamplingRateInvalid,
+        "workers_ErrorWorkerTagInvalid": workers_ErrorWorkerTagInvalid,
+        "workers_ErrorWorkerTagLengthLimit": workers_ErrorWorkerTagLengthLimit,
+        "workers_ErrorWorkerTagLimit": workers_ErrorWorkerTagLimit,
+        "workers_PreviewsBaseConfig": workers_PreviewsBaseConfig,
+        "workers_Worker": workers_Worker,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_cache_options": workers_cache_options,
+        "workers_env": workers_env,
+        "workers_env_binding_item": workers_env_binding_item,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_observability": workers_observability,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workers/versions/latest/tools.ts b/src/generated/forge-mcp/workers/versions/latest/tools.ts
index 7ca27d143..1727c7dff 100644
--- a/src/generated/forge-mcp/workers/versions/latest/tools.ts
+++ b/src/generated/forge-mcp/workers/versions/latest/tools.ts
@@ -1,85 +1,10 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
-import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_binding_item_output,
-  workers_binding_kind_ai_output,
-  workers_binding_kind_ai_search_namespace_output,
-  workers_binding_kind_ai_search_output,
-  workers_binding_kind_analytics_engine_output,
-  workers_binding_kind_artifacts_output,
-  workers_binding_kind_assets_output,
-  workers_binding_kind_browser_output,
-  workers_binding_kind_d1_output,
-  workers_binding_kind_data_blob_output,
-  workers_binding_kind_dispatch_namespace_output,
-  workers_binding_kind_durable_object_namespace_output,
-  workers_binding_kind_flagship_output,
-  workers_binding_kind_hyperdrive_output,
-  workers_binding_kind_images_output,
-  workers_binding_kind_inherit_output,
-  workers_binding_kind_json_output,
-  workers_binding_kind_k2_output,
-  workers_binding_kind_kv_namespace_output,
-  workers_binding_kind_media_output,
-  workers_binding_kind_messaging_output,
-  workers_binding_kind_mtls_certificate_output,
-  workers_binding_kind_pipelines_output,
-  workers_binding_kind_plain_text_output,
-  workers_binding_kind_queue_output,
-  workers_binding_kind_r2_bucket_output,
-  workers_binding_kind_ratelimit_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_kind_secrets_store_secret_output,
-  workers_binding_kind_send_email_output,
-  workers_binding_kind_service_output,
-  workers_binding_kind_text_blob_output,
-  workers_binding_kind_vectorize_output,
-  workers_binding_kind_version_metadata_output,
-  workers_binding_kind_vpc_network_output,
-  workers_binding_kind_vpc_service_output,
-  workers_binding_kind_wasm_module_output,
-  workers_binding_kind_workflow_output,
-  workers_binding_name_output,
-  workers_bindings_output,
-  workers_cache_options_output,
-  workers_compatibility_date_output,
-  workers_compatibility_flag_output,
-  workers_compatibility_flags_output,
-  workers_durable_object_deleted_export_output,
-  workers_durable_object_expecting_transfer_export_output,
-  workers_durable_object_export_output,
-  workers_durable_object_export_variants_output,
-  workers_durable_object_renamed_export_output,
-  workers_durable_object_transferred_export_output,
-  workers_entrypoint_cache_options_output,
-  workers_export_config_output,
-  workers_export_storage_output,
-  workers_exports_config_map_output,
-  workers_exports_reconciliation_error_output,
-  workers_exports_reconciliation_error_response_output,
-  workers_exports_reconciliation_info_output,
-  workers_exports_reconciliation_rename_output,
-  workers_exports_reconciliation_result_output,
-  workers_exports_reconciliation_scenario_output,
-  workers_exports_reconciliation_transfer_output,
-  workers_exports_reconciliation_transfer_pending_output,
-  workers_exports_reconciliation_warning_output,
-  workers_messages_output,
-  workers_migration_step_output,
-  workers_migration_tag_conditions_output,
-  workers_multiple_step_migrations_output,
-  workers_namespace_identifier_output,
-  workers_placement_info_no_status_output,
-  workers_placement_target_output,
-  workers_single_step_migrations_output,
-  workers_worker_export_output,
-} from "../../../outputs.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
   workers_binding_item,
   workers_binding_kind_ai,
   workers_binding_kind_ai_search,
@@ -119,11 +44,8 @@ import {
   workers_binding_kind_vpc_service,
   workers_binding_kind_wasm_module,
   workers_binding_kind_workflow,
-  workers_binding_name,
   workers_bindings,
   workers_cache_options,
-  workers_compatibility_date,
-  workers_compatibility_flag,
   workers_compatibility_flags,
   workers_durable_object_deleted_export,
   workers_durable_object_expecting_transfer_export,
@@ -133,32 +55,97 @@ import {
   workers_durable_object_transferred_export,
   workers_entrypoint_cache_options,
   workers_export_config,
-  workers_export_storage,
   workers_exports_config_map,
+  workers_exports_reconciliation_error,
+  workers_exports_reconciliation_error_response,
   workers_exports_reconciliation_info,
   workers_exports_reconciliation_rename,
   workers_exports_reconciliation_result,
-  workers_exports_reconciliation_scenario,
   workers_exports_reconciliation_transfer,
   workers_exports_reconciliation_transfer_pending,
   workers_exports_reconciliation_warning,
-  workers_identifier,
+  workers_messages,
   workers_migration_step,
   workers_migration_tag_conditions,
   workers_multiple_step_migrations,
-  workers_namespace_identifier,
   workers_placement_info_no_status,
   workers_placement_target,
   workers_single_step_migrations,
   workers_worker_export,
+} from "../../../outputs.js";
+import {
+  workers_binding_item as workers_binding_item$,
+  workers_binding_kind_ai as workers_binding_kind_ai$,
+  workers_binding_kind_ai_search as workers_binding_kind_ai_search$,
+  workers_binding_kind_ai_search_namespace as workers_binding_kind_ai_search_namespace$,
+  workers_binding_kind_analytics_engine as workers_binding_kind_analytics_engine$,
+  workers_binding_kind_artifacts as workers_binding_kind_artifacts$,
+  workers_binding_kind_assets as workers_binding_kind_assets$,
+  workers_binding_kind_browser as workers_binding_kind_browser$,
+  workers_binding_kind_d1 as workers_binding_kind_d1$,
+  workers_binding_kind_data_blob as workers_binding_kind_data_blob$,
+  workers_binding_kind_dispatch_namespace as workers_binding_kind_dispatch_namespace$,
+  workers_binding_kind_durable_object_namespace as workers_binding_kind_durable_object_namespace$,
+  workers_binding_kind_flagship as workers_binding_kind_flagship$,
+  workers_binding_kind_hyperdrive as workers_binding_kind_hyperdrive$,
+  workers_binding_kind_images as workers_binding_kind_images$,
+  workers_binding_kind_inherit as workers_binding_kind_inherit$,
+  workers_binding_kind_json as workers_binding_kind_json$,
+  workers_binding_kind_k2 as workers_binding_kind_k2$,
+  workers_binding_kind_kv_namespace as workers_binding_kind_kv_namespace$,
+  workers_binding_kind_media as workers_binding_kind_media$,
+  workers_binding_kind_messaging as workers_binding_kind_messaging$,
+  workers_binding_kind_mtls_certificate as workers_binding_kind_mtls_certificate$,
+  workers_binding_kind_pipelines as workers_binding_kind_pipelines$,
+  workers_binding_kind_plain_text as workers_binding_kind_plain_text$,
+  workers_binding_kind_queue as workers_binding_kind_queue$,
+  workers_binding_kind_r2_bucket as workers_binding_kind_r2_bucket$,
+  workers_binding_kind_ratelimit as workers_binding_kind_ratelimit$,
+  workers_binding_kind_secret_key as workers_binding_kind_secret_key$,
+  workers_binding_kind_secret_text as workers_binding_kind_secret_text$,
+  workers_binding_kind_secrets_store_secret as workers_binding_kind_secrets_store_secret$,
+  workers_binding_kind_send_email as workers_binding_kind_send_email$,
+  workers_binding_kind_service as workers_binding_kind_service$,
+  workers_binding_kind_text_blob as workers_binding_kind_text_blob$,
+  workers_binding_kind_vectorize as workers_binding_kind_vectorize$,
+  workers_binding_kind_version_metadata as workers_binding_kind_version_metadata$,
+  workers_binding_kind_vpc_network as workers_binding_kind_vpc_network$,
+  workers_binding_kind_vpc_service as workers_binding_kind_vpc_service$,
+  workers_binding_kind_wasm_module as workers_binding_kind_wasm_module$,
+  workers_binding_kind_workflow as workers_binding_kind_workflow$,
+  workers_bindings as workers_bindings$,
+  workers_cache_options as workers_cache_options$,
+  workers_compatibility_flags as workers_compatibility_flags$,
+  workers_durable_object_deleted_export as workers_durable_object_deleted_export$,
+  workers_durable_object_expecting_transfer_export as workers_durable_object_expecting_transfer_export$,
+  workers_durable_object_export as workers_durable_object_export$,
+  workers_durable_object_export_variants as workers_durable_object_export_variants$,
+  workers_durable_object_renamed_export as workers_durable_object_renamed_export$,
+  workers_durable_object_transferred_export as workers_durable_object_transferred_export$,
+  workers_entrypoint_cache_options as workers_entrypoint_cache_options$,
+  workers_export_config as workers_export_config$,
+  workers_exports_config_map as workers_exports_config_map$,
+  workers_exports_reconciliation_info as workers_exports_reconciliation_info$,
+  workers_exports_reconciliation_rename as workers_exports_reconciliation_rename$,
+  workers_exports_reconciliation_result as workers_exports_reconciliation_result$,
+  workers_exports_reconciliation_transfer as workers_exports_reconciliation_transfer$,
+  workers_exports_reconciliation_transfer_pending as workers_exports_reconciliation_transfer_pending$,
+  workers_exports_reconciliation_warning as workers_exports_reconciliation_warning$,
+  workers_migration_step as workers_migration_step$,
+  workers_migration_tag_conditions as workers_migration_tag_conditions$,
+  workers_multiple_step_migrations as workers_multiple_step_migrations$,
+  workers_placement_info_no_status as workers_placement_info_no_status$,
+  workers_placement_target as workers_placement_target$,
+  workers_single_step_migrations as workers_single_step_migrations$,
+  workers_worker_export as workers_worker_export$,
 } from "../../../schemas.js";
+import { workers_container_item, workers_containers } from "../../outputs.js";
 import {
-  workers_container_item_output,
-  workers_containers_output,
-} from "../../outputs.js";
-import { workers_container_item, workers_containers } from "../../schemas.js";
-import { workers_Version_output } from "../outputs.js";
-import { workers_Version } from "../schemas.js";
+  workers_container_item as workers_container_item$,
+  workers_containers as workers_containers$,
+} from "../../schemas.js";
+import { workers_Version } from "../outputs.js";
+import { workers_Version as workers_Version$ } from "../schemas.js";
 
 /**
  * The tools of `workers.versions.latest`.
@@ -167,33 +154,137 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_versions_latest_edit",
     title: "Patch Latest Worker Version",
-    description: "Only `/versions/latest` is supported. Creates a new Worker version by applying a JSON Merge Patch (RFC 7396) to the latest version. Patching a specific version ID is not supported. Omitted fields are inherited from the latest version.",
+    description: "Only `/versions/latest` is supported. Creates a new Worker version by applying a JSON Merge Patch (RFC 7396) to the latest version. Patching a specific version ID is not supported. Omitted fields are inherited from the latest version.\n\nPATCH /accounts/{account_id}/workers/workers/{worker_id}/versions/latest",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_Version",
           "description": "JSON Merge Patch to apply to the latest version. An empty object creates a new version with no changes."
         },
-        "deploy": {
-          "description": "If true, a deployment will be created that sends 100% of traffic to the new version.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "deploy": {
+              "description": "If true, a deployment will be created that sends 100% of traffic to the new version.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id"
+        "path"
+      ],
+      additionalProperties: false,
+      $defs: {
+        "workers_Version": workers_Version$,
+        "workers_binding_item": workers_binding_item$,
+        "workers_binding_kind_ai": workers_binding_kind_ai$,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search$,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace$,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine$,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts$,
+        "workers_binding_kind_assets": workers_binding_kind_assets$,
+        "workers_binding_kind_browser": workers_binding_kind_browser$,
+        "workers_binding_kind_d1": workers_binding_kind_d1$,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob$,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace$,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace$,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship$,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive$,
+        "workers_binding_kind_images": workers_binding_kind_images$,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit$,
+        "workers_binding_kind_json": workers_binding_kind_json$,
+        "workers_binding_kind_k2": workers_binding_kind_k2$,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace$,
+        "workers_binding_kind_media": workers_binding_kind_media$,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging$,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate$,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines$,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text$,
+        "workers_binding_kind_queue": workers_binding_kind_queue$,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket$,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit$,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key$,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text$,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret$,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email$,
+        "workers_binding_kind_service": workers_binding_kind_service$,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob$,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize$,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata$,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network$,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service$,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module$,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow$,
+        "workers_bindings": workers_bindings$,
+        "workers_cache_options": workers_cache_options$,
+        "workers_compatibility_flags": workers_compatibility_flags$,
+        "workers_container_item": workers_container_item$,
+        "workers_containers": workers_containers$,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export$,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export$,
+        "workers_durable_object_export": workers_durable_object_export$,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants$,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export$,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export$,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options$,
+        "workers_export_config": workers_export_config$,
+        "workers_exports_config_map": workers_exports_config_map$,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info$,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename$,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result$,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer$,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending$,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning$,
+        "workers_migration_step": workers_migration_step$,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions$,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations$,
+        "workers_placement_info_no_status": workers_placement_info_no_status$,
+        "workers_placement_target": workers_placement_target$,
+        "workers_single_step_migrations": workers_single_step_migrations$,
+        "workers_worker_export": workers_worker_export$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/workers_api-response-common"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/workers_Version"
+            }
+          },
+          "required": [
+            "result"
+          ],
+          "type": "object"
+        }
       ],
       $defs: {
         "workers_Version": workers_Version,
+        "workers_api-response-common": workers_api$$response$$common,
         "workers_binding_item": workers_binding_item,
         "workers_binding_kind_ai": workers_binding_kind_ai,
         "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
@@ -233,11 +324,8 @@ export const tools: readonly Tool[] = [
         "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
         "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
         "workers_binding_kind_workflow": workers_binding_kind_workflow,
-        "workers_binding_name": workers_binding_name,
         "workers_bindings": workers_bindings,
         "workers_cache_options": workers_cache_options,
-        "workers_compatibility_date": workers_compatibility_date,
-        "workers_compatibility_flag": workers_compatibility_flag,
         "workers_compatibility_flags": workers_compatibility_flags,
         "workers_container_item": workers_container_item,
         "workers_containers": workers_containers,
@@ -249,121 +337,23 @@ export const tools: readonly Tool[] = [
         "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
         "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
         "workers_export_config": workers_export_config,
-        "workers_export_storage": workers_export_storage,
         "workers_exports_config_map": workers_exports_config_map,
         "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
         "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
         "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario,
         "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
         "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
         "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
-        "workers_identifier": workers_identifier,
+        "workers_messages": workers_messages,
         "workers_migration_step": workers_migration_step,
         "workers_migration_tag_conditions": workers_migration_tag_conditions,
         "workers_multiple_step_migrations": workers_multiple_step_migrations,
-        "workers_namespace_identifier": workers_namespace_identifier,
         "workers_placement_info_no_status": workers_placement_info_no_status,
         "workers_placement_target": workers_placement_target,
         "workers_single_step_migrations": workers_single_step_migrations,
         "workers_worker_export": workers_worker_export,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/workers_api-response-common"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/workers_Version"
-            }
-          },
-          "required": [
-            "result"
-          ],
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "workers_Version": workers_Version_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -417,90 +407,84 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Version": workers_Version_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_error": workers_exports_reconciliation_error_output,
-        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_Version": workers_Version,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_error": workers_exports_reconciliation_error,
+        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/versions/latest`,
       query: [
-        ["deploy", args["deploy"], true],
+        ["deploy", param(args, "query", "deploy"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
diff --git a/src/generated/forge-mcp/workers/versions/outputs.ts b/src/generated/forge-mcp/workers/versions/outputs.ts
index 43fe0c3e7..127486c98 100644
--- a/src/generated/forge-mcp/workers/versions/outputs.ts
+++ b/src/generated/forge-mcp/workers/versions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `workers_Version` in responses.
  */
-export const workers_Version_output: JsonSchema = {
+export const workers_Version: JsonSchema = {
   "properties": {
     "annotations": {
       "properties": {
@@ -88,7 +88,7 @@ export const workers_Version_output: JsonSchema = {
       "$ref": "#/$defs/workers_cache_options"
     },
     "compatibility_date": {
-      "$ref": "#/$defs/workers_compatibility_date"
+      "type": "string"
     },
     "compatibility_flags": {
       "$ref": "#/$defs/workers_compatibility_flags"
diff --git a/src/generated/forge-mcp/workers/versions/schemas.ts b/src/generated/forge-mcp/workers/versions/schemas.ts
index 0ee404507..84f653d3b 100644
--- a/src/generated/forge-mcp/workers/versions/schemas.ts
+++ b/src/generated/forge-mcp/workers/versions/schemas.ts
@@ -23,7 +23,7 @@ export const workers_Version: JsonSchema = {
       "type": "object"
     },
     "assets": {
-      "description": "Configuration for assets within a Worker.\n\n[`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and\n[`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files should be\nincluded as modules named `_headers` and `_redirects` with content type `text/plain`.\n",
+      "description": "Configuration for assets within a Worker.\n\n[`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and\n[`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files should be\nincluded as modules named `_headers` and `_redirects` with content type `text/plain`.",
       "properties": {
         "config": {
           "description": "Configuration for assets within a Worker.",
@@ -91,11 +91,11 @@ export const workers_Version: JsonSchema = {
     },
     "cache_options": {
       "$ref": "#/$defs/workers_cache_options",
-      "description": "Global CacheW configuration for the Worker. When caching is on,\nthe platform provisions a `cloudflare.app` zone for the Worker.\nA `type: worker` entry in the `exports` map can override this\nvalue for a single entrypoint.\n"
+      "description": "Global CacheW configuration for the Worker. When caching is on,\nthe platform provisions a `cloudflare.app` zone for the Worker.\nA `type: worker` entry in the `exports` map can override this\nvalue for a single entrypoint."
     },
     "compatibility_date": {
-      "$ref": "#/$defs/workers_compatibility_date",
-      "description": "Date indicating targeted support in the Workers runtime. Backwards incompatible fixes to the runtime following this date will not affect this Worker."
+      "description": "Date indicating targeted support in the Workers runtime. Backwards incompatible fixes to the runtime following this date will not affect this Worker.",
+      "type": "string"
     },
     "compatibility_flags": {
       "$ref": "#/$defs/workers_compatibility_flags",
@@ -108,11 +108,11 @@ export const workers_Version: JsonSchema = {
     },
     "exports": {
       "$ref": "#/$defs/workers_exports_config_map",
-      "description": "Declarative exports for the version, including Durable Object\nclasses (with their `storage` backend) and named Worker\nentrypoints. On reads, tombstoned lifecycle entries are\nomitted, so only live exports (`created` and\n`expecting-transfer`) are returned. `exports` and `migrations`\nare mutually exclusive on upload.\n"
+      "description": "Declarative exports for the version, including Durable Object\nclasses (with their `storage` backend) and named Worker\nentrypoints. On reads, tombstoned lifecycle entries are\nomitted, so only live exports (`created` and\n`expecting-transfer`) are returned. `exports` and `migrations`\nare mutually exclusive on upload."
     },
     "exports_reconciliation": {
       "$ref": "#/$defs/workers_exports_reconciliation_result",
-      "description": "Summary of the declarative exports reconciliation that ran on\nthis upload. Populated only when the uploaded metadata included\nan `exports` block. Durable Object entries drive reconciliation;\n`type: worker` entries do not contribute to this summary.\n"
+      "description": "Summary of the declarative exports reconciliation that ran on\nthis upload. Populated only when the uploaded metadata included\nan `exports` block. Durable Object entries drive reconciliation;\n`type: worker` entries do not contribute to this summary."
     },
     "limits": {
       "description": "Resource limits enforced at runtime.",
@@ -144,7 +144,7 @@ export const workers_Version: JsonSchema = {
       ]
     },
     "modules": {
-      "description": "Code, sourcemaps, and other content used at runtime.\n\nThis includes [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and\n[`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files used to configure\n[Static Assets](https://developers.cloudflare.com/workers/static-assets/). `_headers` and `_redirects` files should be\nincluded as modules named `_headers` and `_redirects` with content type `text/plain`.\n",
+      "description": "Code, sourcemaps, and other content used at runtime.\n\nThis includes [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and\n[`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files used to configure\n[Static Assets](https://developers.cloudflare.com/workers/static-assets/). `_headers` and `_redirects` files should be\nincluded as modules named `_headers` and `_redirects` with content type `text/plain`.",
       "items": {
         "properties": {
           "content_base64": {
@@ -171,7 +171,7 @@ export const workers_Version: JsonSchema = {
       "type": "array"
     },
     "package_dependencies": {
-      "description": "The list of npm packages that were installed and used when this Worker\nversion was built.\n",
+      "description": "The list of npm packages that were installed and used when this Worker\nversion was built.",
       "items": {
         "properties": {
           "installedVersion": {
diff --git a/src/generated/forge-mcp/workers/versions/tools.ts b/src/generated/forge-mcp/workers/versions/tools.ts
index 05259cbf1..52256b899 100644
--- a/src/generated/forge-mcp/workers/versions/tools.ts
+++ b/src/generated/forge-mcp/workers/versions/tools.ts
@@ -1,86 +1,11 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
-import {
-  workers_api_response_collection_output,
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_binding_item_output,
-  workers_binding_kind_ai_output,
-  workers_binding_kind_ai_search_namespace_output,
-  workers_binding_kind_ai_search_output,
-  workers_binding_kind_analytics_engine_output,
-  workers_binding_kind_artifacts_output,
-  workers_binding_kind_assets_output,
-  workers_binding_kind_browser_output,
-  workers_binding_kind_d1_output,
-  workers_binding_kind_data_blob_output,
-  workers_binding_kind_dispatch_namespace_output,
-  workers_binding_kind_durable_object_namespace_output,
-  workers_binding_kind_flagship_output,
-  workers_binding_kind_hyperdrive_output,
-  workers_binding_kind_images_output,
-  workers_binding_kind_inherit_output,
-  workers_binding_kind_json_output,
-  workers_binding_kind_k2_output,
-  workers_binding_kind_kv_namespace_output,
-  workers_binding_kind_media_output,
-  workers_binding_kind_messaging_output,
-  workers_binding_kind_mtls_certificate_output,
-  workers_binding_kind_pipelines_output,
-  workers_binding_kind_plain_text_output,
-  workers_binding_kind_queue_output,
-  workers_binding_kind_r2_bucket_output,
-  workers_binding_kind_ratelimit_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_kind_secrets_store_secret_output,
-  workers_binding_kind_send_email_output,
-  workers_binding_kind_service_output,
-  workers_binding_kind_text_blob_output,
-  workers_binding_kind_vectorize_output,
-  workers_binding_kind_version_metadata_output,
-  workers_binding_kind_vpc_network_output,
-  workers_binding_kind_vpc_service_output,
-  workers_binding_kind_wasm_module_output,
-  workers_binding_kind_workflow_output,
-  workers_binding_name_output,
-  workers_bindings_output,
-  workers_cache_options_output,
-  workers_compatibility_date_output,
-  workers_compatibility_flag_output,
-  workers_compatibility_flags_output,
-  workers_durable_object_deleted_export_output,
-  workers_durable_object_expecting_transfer_export_output,
-  workers_durable_object_export_output,
-  workers_durable_object_export_variants_output,
-  workers_durable_object_renamed_export_output,
-  workers_durable_object_transferred_export_output,
-  workers_entrypoint_cache_options_output,
-  workers_export_config_output,
-  workers_export_storage_output,
-  workers_exports_config_map_output,
-  workers_exports_reconciliation_error_output,
-  workers_exports_reconciliation_error_response_output,
-  workers_exports_reconciliation_info_output,
-  workers_exports_reconciliation_rename_output,
-  workers_exports_reconciliation_result_output,
-  workers_exports_reconciliation_scenario_output,
-  workers_exports_reconciliation_transfer_output,
-  workers_exports_reconciliation_transfer_pending_output,
-  workers_exports_reconciliation_warning_output,
-  workers_messages_output,
-  workers_migration_step_output,
-  workers_migration_tag_conditions_output,
-  workers_multiple_step_migrations_output,
-  workers_namespace_identifier_output,
-  workers_placement_info_no_status_output,
-  workers_placement_target_output,
-  workers_single_step_migrations_output,
-  workers_worker_export_output,
-} from "../../outputs.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
+  workers_api$$response$$collection,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
   workers_binding_item,
   workers_binding_kind_ai,
   workers_binding_kind_ai_search,
@@ -120,11 +45,8 @@ import {
   workers_binding_kind_vpc_service,
   workers_binding_kind_wasm_module,
   workers_binding_kind_workflow,
-  workers_binding_name,
   workers_bindings,
   workers_cache_options,
-  workers_compatibility_date,
-  workers_compatibility_flag,
   workers_compatibility_flags,
   workers_durable_object_deleted_export,
   workers_durable_object_expecting_transfer_export,
@@ -134,34 +56,102 @@ import {
   workers_durable_object_transferred_export,
   workers_entrypoint_cache_options,
   workers_export_config,
-  workers_export_storage,
   workers_exports_config_map,
+  workers_exports_reconciliation_error,
+  workers_exports_reconciliation_error_response,
   workers_exports_reconciliation_info,
   workers_exports_reconciliation_rename,
   workers_exports_reconciliation_result,
-  workers_exports_reconciliation_scenario,
   workers_exports_reconciliation_transfer,
   workers_exports_reconciliation_transfer_pending,
   workers_exports_reconciliation_warning,
-  workers_identifier,
+  workers_messages,
   workers_migration_step,
   workers_migration_tag_conditions,
   workers_multiple_step_migrations,
-  workers_namespace_identifier,
   workers_placement_info_no_status,
   workers_placement_target,
   workers_single_step_migrations,
   workers_worker_export,
+} from "../../outputs.js";
+import {
+  workers_binding_item as workers_binding_item$,
+  workers_binding_kind_ai as workers_binding_kind_ai$,
+  workers_binding_kind_ai_search as workers_binding_kind_ai_search$,
+  workers_binding_kind_ai_search_namespace as workers_binding_kind_ai_search_namespace$,
+  workers_binding_kind_analytics_engine as workers_binding_kind_analytics_engine$,
+  workers_binding_kind_artifacts as workers_binding_kind_artifacts$,
+  workers_binding_kind_assets as workers_binding_kind_assets$,
+  workers_binding_kind_browser as workers_binding_kind_browser$,
+  workers_binding_kind_d1 as workers_binding_kind_d1$,
+  workers_binding_kind_data_blob as workers_binding_kind_data_blob$,
+  workers_binding_kind_dispatch_namespace as workers_binding_kind_dispatch_namespace$,
+  workers_binding_kind_durable_object_namespace as workers_binding_kind_durable_object_namespace$,
+  workers_binding_kind_flagship as workers_binding_kind_flagship$,
+  workers_binding_kind_hyperdrive as workers_binding_kind_hyperdrive$,
+  workers_binding_kind_images as workers_binding_kind_images$,
+  workers_binding_kind_inherit as workers_binding_kind_inherit$,
+  workers_binding_kind_json as workers_binding_kind_json$,
+  workers_binding_kind_k2 as workers_binding_kind_k2$,
+  workers_binding_kind_kv_namespace as workers_binding_kind_kv_namespace$,
+  workers_binding_kind_media as workers_binding_kind_media$,
+  workers_binding_kind_messaging as workers_binding_kind_messaging$,
+  workers_binding_kind_mtls_certificate as workers_binding_kind_mtls_certificate$,
+  workers_binding_kind_pipelines as workers_binding_kind_pipelines$,
+  workers_binding_kind_plain_text as workers_binding_kind_plain_text$,
+  workers_binding_kind_queue as workers_binding_kind_queue$,
+  workers_binding_kind_r2_bucket as workers_binding_kind_r2_bucket$,
+  workers_binding_kind_ratelimit as workers_binding_kind_ratelimit$,
+  workers_binding_kind_secret_key as workers_binding_kind_secret_key$,
+  workers_binding_kind_secret_text as workers_binding_kind_secret_text$,
+  workers_binding_kind_secrets_store_secret as workers_binding_kind_secrets_store_secret$,
+  workers_binding_kind_send_email as workers_binding_kind_send_email$,
+  workers_binding_kind_service as workers_binding_kind_service$,
+  workers_binding_kind_text_blob as workers_binding_kind_text_blob$,
+  workers_binding_kind_vectorize as workers_binding_kind_vectorize$,
+  workers_binding_kind_version_metadata as workers_binding_kind_version_metadata$,
+  workers_binding_kind_vpc_network as workers_binding_kind_vpc_network$,
+  workers_binding_kind_vpc_service as workers_binding_kind_vpc_service$,
+  workers_binding_kind_wasm_module as workers_binding_kind_wasm_module$,
+  workers_binding_kind_workflow as workers_binding_kind_workflow$,
+  workers_bindings as workers_bindings$,
+  workers_cache_options as workers_cache_options$,
+  workers_compatibility_flags as workers_compatibility_flags$,
+  workers_durable_object_deleted_export as workers_durable_object_deleted_export$,
+  workers_durable_object_expecting_transfer_export as workers_durable_object_expecting_transfer_export$,
+  workers_durable_object_export as workers_durable_object_export$,
+  workers_durable_object_export_variants as workers_durable_object_export_variants$,
+  workers_durable_object_renamed_export as workers_durable_object_renamed_export$,
+  workers_durable_object_transferred_export as workers_durable_object_transferred_export$,
+  workers_entrypoint_cache_options as workers_entrypoint_cache_options$,
+  workers_export_config as workers_export_config$,
+  workers_exports_config_map as workers_exports_config_map$,
+  workers_exports_reconciliation_info as workers_exports_reconciliation_info$,
+  workers_exports_reconciliation_rename as workers_exports_reconciliation_rename$,
+  workers_exports_reconciliation_result as workers_exports_reconciliation_result$,
+  workers_exports_reconciliation_transfer as workers_exports_reconciliation_transfer$,
+  workers_exports_reconciliation_transfer_pending as workers_exports_reconciliation_transfer_pending$,
+  workers_exports_reconciliation_warning as workers_exports_reconciliation_warning$,
+  workers_migration_step as workers_migration_step$,
+  workers_migration_tag_conditions as workers_migration_tag_conditions$,
+  workers_multiple_step_migrations as workers_multiple_step_migrations$,
+  workers_placement_info_no_status as workers_placement_info_no_status$,
+  workers_placement_target as workers_placement_target$,
+  workers_single_step_migrations as workers_single_step_migrations$,
+  workers_worker_export as workers_worker_export$,
 } from "../../schemas.js";
 import {
-  workers_ErrorAuth_output,
-  workers_ErrorInternalServer_output,
-  workers_container_item_output,
-  workers_containers_output,
+  workers_ErrorAuth,
+  workers_ErrorInternalServer,
+  workers_container_item,
+  workers_containers,
 } from "../outputs.js";
-import { workers_container_item, workers_containers } from "../schemas.js";
-import { workers_Version_output } from "./outputs.js";
-import { workers_Version } from "./schemas.js";
+import {
+  workers_container_item as workers_container_item$,
+  workers_containers as workers_containers$,
+} from "../schemas.js";
+import { workers_Version } from "./outputs.js";
+import { workers_Version as workers_Version$ } from "./schemas.js";
 
 /**
  * The tools of `workers.versions`.
@@ -170,34 +160,138 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_versions_create",
     title: "Create Worker Version",
-    description: "Create a new version for a Worker.",
+    description: "Create a new version for a Worker.\n\nPOST /accounts/{account_id}/workers/workers/{worker_id}/versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_Version",
           "description": "Version creation parameters."
         },
-        "deploy": {
-          "description": "If true, a deployment will be created that sends 100% of traffic to the new version.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "deploy": {
+              "description": "If true, a deployment will be created that sends 100% of traffic to the new version.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "workers_Version": workers_Version$,
+        "workers_binding_item": workers_binding_item$,
+        "workers_binding_kind_ai": workers_binding_kind_ai$,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search$,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace$,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine$,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts$,
+        "workers_binding_kind_assets": workers_binding_kind_assets$,
+        "workers_binding_kind_browser": workers_binding_kind_browser$,
+        "workers_binding_kind_d1": workers_binding_kind_d1$,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob$,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace$,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace$,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship$,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive$,
+        "workers_binding_kind_images": workers_binding_kind_images$,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit$,
+        "workers_binding_kind_json": workers_binding_kind_json$,
+        "workers_binding_kind_k2": workers_binding_kind_k2$,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace$,
+        "workers_binding_kind_media": workers_binding_kind_media$,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging$,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate$,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines$,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text$,
+        "workers_binding_kind_queue": workers_binding_kind_queue$,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket$,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit$,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key$,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text$,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret$,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email$,
+        "workers_binding_kind_service": workers_binding_kind_service$,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob$,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize$,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata$,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network$,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service$,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module$,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow$,
+        "workers_bindings": workers_bindings$,
+        "workers_cache_options": workers_cache_options$,
+        "workers_compatibility_flags": workers_compatibility_flags$,
+        "workers_container_item": workers_container_item$,
+        "workers_containers": workers_containers$,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export$,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export$,
+        "workers_durable_object_export": workers_durable_object_export$,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants$,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export$,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export$,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options$,
+        "workers_export_config": workers_export_config$,
+        "workers_exports_config_map": workers_exports_config_map$,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info$,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename$,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result$,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer$,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending$,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning$,
+        "workers_migration_step": workers_migration_step$,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions$,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations$,
+        "workers_placement_info_no_status": workers_placement_info_no_status$,
+        "workers_placement_target": workers_placement_target$,
+        "workers_single_step_migrations": workers_single_step_migrations$,
+        "workers_worker_export": workers_worker_export$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/workers_api-response-common"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/workers_Version"
+            }
+          },
+          "required": [
+            "result"
+          ],
+          "type": "object"
+        }
+      ],
       $defs: {
         "workers_Version": workers_Version,
+        "workers_api-response-common": workers_api$$response$$common,
         "workers_binding_item": workers_binding_item,
         "workers_binding_kind_ai": workers_binding_kind_ai,
         "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
@@ -237,11 +331,8 @@ export const tools: readonly Tool[] = [
         "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
         "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
         "workers_binding_kind_workflow": workers_binding_kind_workflow,
-        "workers_binding_name": workers_binding_name,
         "workers_bindings": workers_bindings,
         "workers_cache_options": workers_cache_options,
-        "workers_compatibility_date": workers_compatibility_date,
-        "workers_compatibility_flag": workers_compatibility_flag,
         "workers_compatibility_flags": workers_compatibility_flags,
         "workers_container_item": workers_container_item,
         "workers_containers": workers_containers,
@@ -253,121 +344,23 @@ export const tools: readonly Tool[] = [
         "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
         "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
         "workers_export_config": workers_export_config,
-        "workers_export_storage": workers_export_storage,
         "workers_exports_config_map": workers_exports_config_map,
         "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
         "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
         "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario,
         "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
         "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
         "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
-        "workers_identifier": workers_identifier,
+        "workers_messages": workers_messages,
         "workers_migration_step": workers_migration_step,
         "workers_migration_tag_conditions": workers_migration_tag_conditions,
         "workers_multiple_step_migrations": workers_multiple_step_migrations,
-        "workers_namespace_identifier": workers_namespace_identifier,
         "workers_placement_info_no_status": workers_placement_info_no_status,
         "workers_placement_target": workers_placement_target,
         "workers_single_step_migrations": workers_single_step_migrations,
         "workers_worker_export": workers_worker_export,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/workers_api-response-common"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/workers_Version"
-            }
-          },
-          "required": [
-            "result"
-          ],
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "workers_Version": workers_Version_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -421,90 +414,84 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Version": workers_Version_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_error": workers_exports_reconciliation_error_output,
-        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_Version": workers_Version,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_error": workers_exports_reconciliation_error,
+        "workers_exports_reconciliation_error_response": workers_exports_reconciliation_error_response,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/versions`,
       query: [
-        ["deploy", args["deploy"], true],
+        ["deploy", param(args, "query", "deploy"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
@@ -512,37 +499,44 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_versions_delete",
     title: "Delete Worker Version",
-    description: "Delete a Worker version.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker version.",
+    description: "Delete a Worker version.\n\nConfirm with the user before calling this tool. This will permanently delete the Worker version.\n\nDELETE /accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "version_id": {
-          "description": "Identifier for the version, which can be a UUID, a UUID prefix (minimum length 8), or the literal \"latest\" to operate on the most recently created version.",
-          "type": "string"
-        },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "version_id": {
+              "description": "Identifier for the version, which can be a UUID, a UUID prefix (minimum length 8), or the literal \"latest\" to operate on the most recently created version.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "version_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "version_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-common",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -572,9 +566,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -584,38 +578,51 @@ export const tools: readonly Tool[] = [
   {
     name: "workers_versions_get",
     title: "Get Worker Version",
-    description: "Get details about a specific Worker version.",
+    description: "Get details about a specific Worker version.\n\nGET /accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "include": {
-          "description": "Whether to include the `modules` property of the version in the response, which contains code and sourcemap content and may add several megabytes to the response size.",
-          "enum": [
-            "modules"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "version_id": {
+              "description": "Identifier for the version, which can be a UUID, a UUID prefix (minimum length 8), or the literal \"latest\" to operate on the most recently created version.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "version_id"
           ],
-          "type": "string"
-        },
-        "version_id": {
-          "description": "Identifier for the version, which can be a UUID, a UUID prefix (minimum length 8), or the literal \"latest\" to operate on the most recently created version.",
-          "type": "string"
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include": {
+              "description": "Whether to include the `modules` property of the version in the response, which contains code and sourcemap content and may add several megabytes to the response size.",
+              "enum": [
+                "modules"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "version_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -635,81 +642,75 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Version": workers_Version_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_Version": workers_Version,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -759,124 +760,131 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Version": workers_Version_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_Version": workers_Version,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/versions/${pathParam(args, "version_id")}`,
       query: [
-        ["include", args["include"], true],
+        ["include", param(args, "query", "include"), true],
       ],
     }),
   },
   {
     name: "workers_versions_list",
     title: "List Worker Versions",
-    description: "List all versions for a Worker.",
+    description: "List all versions for a Worker.\n\nGET /accounts/{account_id}/workers/workers/{worker_id}/versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 10,
-          "description": "Items per-page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifier for the Worker, which can be ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id"
+          ],
+          "type": "object"
         },
-        "worker_id": {
-          "description": "Identifier for the Worker, which can be ID or name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Current page.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 10,
+              "description": "Items per-page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -899,82 +907,76 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_Version": workers_Version_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_Version": workers_Version,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -1029,104 +1031,94 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_Version": workers_Version_output,
-        "workers_api-response-collection": workers_api_response_collection_output,
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_container_item": workers_container_item_output,
-        "workers_containers": workers_containers_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_Version": workers_Version,
+        "workers_api-response-collection": workers_api$$response$$collection,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_container_item": workers_container_item,
+        "workers_containers": workers_containers,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/workers/${pathParam(args, "worker_id")}/versions`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
     name: "workers_versions_profile",
     title: "Profile Worker Version",
-    description: "Captures a CPU or heap profile from a recently active isolate running the specified Worker version. This endpoint requires the Worker profiling feature to be enabled for the account.\n\nThis method is alpha.",
+    description: "Captures a CPU or heap profile from a recently active isolate running the specified Worker version. This endpoint requires the Worker profiling feature to be enabled for the account.\n\nThis method is alpha.\n\nPOST /accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}/profile",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "actor_id": {
@@ -1155,24 +1147,35 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "version_id": {
-          "description": "Identifies the version by UUID or UUID prefix with a minimum length of eight characters. Use \"latest\" to select the most recently created version, which may not be deployed. Use \"latest-deployed\" to profile a version in the active deployment. Versions are tried in order of traffic share until one has a loaded isolate.",
-          "type": "string"
-        },
-        "worker_id": {
-          "description": "Identifies the Worker by ID or name.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "version_id": {
+              "description": "Identifies the version by UUID or UUID prefix with a minimum length of eight characters. Use \"latest\" to select the most recently created version, which may not be deployed. Use \"latest-deployed\" to profile a version in the active deployment. Versions are tried in order of traffic share until one has a loaded isolate.",
+              "type": "string"
+            },
+            "worker_id": {
+              "description": "Identifies the Worker by ID or name.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "worker_id",
+            "version_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "worker_id",
-        "version_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -1263,10 +1266,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_ErrorAuth": workers_ErrorAuth_output,
-        "workers_ErrorInternalServer": workers_ErrorInternalServer_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_ErrorAuth": workers_ErrorAuth,
+        "workers_ErrorInternalServer": workers_ErrorInternalServer,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersBuilds/workers/previews/outputs.ts b/src/generated/forge-mcp/workersBuilds/workers/previews/outputs.ts
index 0820f9e85..a0bb2357a 100644
--- a/src/generated/forge-mcp/workersBuilds/workers/previews/outputs.ts
+++ b/src/generated/forge-mcp/workersBuilds/workers/previews/outputs.ts
@@ -6,19 +6,19 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `builds_PreviewResponse` in responses.
  */
-export const builds_PreviewResponse_output: JsonSchema = {
+export const builds_PreviewResponse: JsonSchema = {
   "properties": {
     "auto_build": {
-      "$ref": "#/$defs/builds_preview_auto_build"
+      "type": "boolean"
     },
     "auto_delete": {
-      "$ref": "#/$defs/builds_preview_auto_delete"
+      "type": "boolean"
     },
     "branch": {
-      "$ref": "#/$defs/builds_branch"
+      "type": "string"
     },
     "preview_id": {
-      "$ref": "#/$defs/builds_external_script_id"
+      "type": "string"
     },
     "settings": {
       "$ref": "#/$defs/builds_WorkerBuildSettings"
@@ -30,34 +30,20 @@ export const builds_PreviewResponse_output: JsonSchema = {
 /**
  * The schema of `builds_PreviewSummary` in responses.
  */
-export const builds_PreviewSummary_output: JsonSchema = {
+export const builds_PreviewSummary: JsonSchema = {
   "properties": {
     "auto_build": {
-      "$ref": "#/$defs/builds_preview_auto_build"
+      "type": "boolean"
     },
     "auto_delete": {
-      "$ref": "#/$defs/builds_preview_auto_delete"
+      "type": "boolean"
     },
     "branch": {
-      "$ref": "#/$defs/builds_branch"
+      "type": "string"
     },
     "preview_id": {
-      "$ref": "#/$defs/builds_external_script_id"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `builds_preview_auto_build` in responses.
- */
-export const builds_preview_auto_build_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `builds_preview_auto_delete` in responses.
- */
-export const builds_preview_auto_delete_output: JsonSchema = {
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/workersBuilds/workers/previews/schemas.ts b/src/generated/forge-mcp/workersBuilds/workers/previews/schemas.ts
index 62e7c7c98..df048cac4 100644
--- a/src/generated/forge-mcp/workersBuilds/workers/previews/schemas.ts
+++ b/src/generated/forge-mcp/workersBuilds/workers/previews/schemas.ts
@@ -10,12 +10,12 @@ export const builds_UpdatePreviewRequest: JsonSchema = {
   "description": "Request body for updating a Preview. At least one field must be provided, and omitted fields are left unchanged.",
   "properties": {
     "auto_build": {
-      "$ref": "#/$defs/builds_preview_auto_build",
-      "description": "Whether pushes to the git branch build this Preview. Deploy hooks, manual builds, and retries run regardless of this setting."
+      "description": "Whether pushes to the git branch build this Preview. Deploy hooks, manual builds, and retries run regardless of this setting.",
+      "type": "boolean"
     },
     "auto_delete": {
-      "$ref": "#/$defs/builds_preview_auto_delete",
-      "description": "Whether deleting the git branch also deletes this Preview."
+      "description": "Whether deleting the git branch also deletes this Preview.",
+      "type": "boolean"
     },
     "branch": {
       "description": "Git branch this Preview tracks",
@@ -28,19 +28,3 @@ export const builds_UpdatePreviewRequest: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `builds_preview_auto_build`.
- */
-export const builds_preview_auto_build: JsonSchema = {
-  "description": "Whether pushes to the git branch build this Preview. Deploy hooks, manual builds, and retries run regardless of this setting.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `builds_preview_auto_delete`.
- */
-export const builds_preview_auto_delete: JsonSchema = {
-  "description": "Whether deleting the git branch also deletes this Preview.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/workersBuilds/workers/previews/tools.ts b/src/generated/forge-mcp/workersBuilds/workers/previews/tools.ts
index da36e2c5b..a28d4b09c 100644
--- a/src/generated/forge-mcp/workersBuilds/workers/previews/tools.ts
+++ b/src/generated/forge-mcp/workersBuilds/workers/previews/tools.ts
@@ -1,120 +1,80 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_BuildOutcome_output,
-  builds_BuildResponse_output,
-  builds_BuildStatus_output,
-  builds_BuildTriggerMetadataResponse_output,
-  builds_BuildTriggerSource_output,
-  builds_EnvironmentVariablesResponse_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_SCMProviderType_output,
-  builds_UpsertRepoConnectionResponse_output,
-  builds_WorkerBuildSettings_output,
-  builds_branch_excludes_output,
-  builds_branch_includes_output,
-  builds_branch_output,
-  builds_build_caching_enabled_output,
-  builds_build_command_output,
-  builds_build_token_name_output,
-  builds_build_token_uuid_output,
-  builds_build_uuid_output,
-  builds_commit_hash_output,
-  builds_created_on_output,
-  builds_deleted_on_output,
-  builds_deploy_command_output,
-  builds_deploy_hook_name_output,
-  builds_external_script_id_output,
-  builds_is_secret_output,
-  builds_modified_on_output,
-  builds_path_excludes_output,
-  builds_path_includes_output,
-  builds_provider_account_id_output,
-  builds_provider_account_name_output,
-  builds_repo_connection_uuid_output,
-  builds_repo_id_output,
-  builds_repo_name_output,
-  builds_root_directory_output,
-  builds_stopped_on_output,
-  builds_trigger_name_output,
-  builds_trigger_uuid_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_BuildResponse,
+  builds_BuildTriggerMetadataResponse,
+  builds_EnvironmentVariablesResponse,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
+  builds_UpsertRepoConnectionResponse,
+  builds_WorkerBuildSettings,
+  builds_branch_excludes,
+  builds_branch_includes,
+  builds_path_excludes,
+  builds_path_includes,
 } from "../../../outputs.js";
 import {
   builds_BuildSeedRepoInput,
   builds_BuildSeedRepoInputFile,
   builds_CreateBuildRequest,
   builds_UpdateWorkerBuildSettingsInput,
-  builds_account_id,
-  builds_branch,
-  builds_build_caching_enabled,
-  builds_build_command,
-  builds_build_token_uuid,
-  builds_commit_hash,
-  builds_deploy_command,
-  builds_external_script_id,
-  builds_is_secret,
-  builds_path_excludes,
-  builds_path_includes,
-  builds_root_directory,
+  builds_path_excludes as builds_path_excludes$,
+  builds_path_includes as builds_path_includes$,
 } from "../../../schemas.js";
-import {
-  builds_PreviewResponse_output,
-  builds_PreviewSummary_output,
-  builds_preview_auto_build_output,
-  builds_preview_auto_delete_output,
-} from "./outputs.js";
-import {
-  builds_UpdatePreviewRequest,
-  builds_preview_auto_build,
-  builds_preview_auto_delete,
-} from "./schemas.js";
+import { builds_PreviewResponse, builds_PreviewSummary } from "./outputs.js";
+import { builds_UpdatePreviewRequest } from "./schemas.js";
 
 /**
- * The tools of `workers_builds.workers.previews`.
+ * The tools of `workersBuilds.workers.previews`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_builds_workers_previews_create_build",
+    name: "workersBuilds_workers_previews_createBuild",
     title: "Create preview build",
-    description: "Trigger a build for a single Preview.",
+    description: "Trigger a build for a single Preview.\n\nPOST /accounts/{account_id}/builds/workers/{script_tag}/previews/{preview_id}/builds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_CreateBuildRequest"
         },
-        "preview_id": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The script tag of the Preview, which is a Worker in its own right"
-        },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "The script tag of the Preview, which is a Worker in its own right",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag",
+            "preview_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag",
-        "preview_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_BuildSeedRepoInput": builds_BuildSeedRepoInput,
         "builds_BuildSeedRepoInputFile": builds_BuildSeedRepoInputFile,
         "builds_CreateBuildRequest": builds_CreateBuildRequest,
-        "builds_account_id": builds_account_id,
-        "builds_branch": builds_branch,
-        "builds_commit_hash": builds_commit_hash,
-        "builds_external_script_id": builds_external_script_id,
       },
     },
     outputSchema: {
@@ -132,42 +92,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -212,43 +146,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -257,49 +165,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_builds_workers_previews_edit",
+    name: "workersBuilds_workers_previews_edit",
     title: "Update preview",
-    description: "Update a single Preview of a Worker. Supports partial updates to the tracked branch, the automation flags, and the build settings.",
+    description: "Update a single Preview of a Worker. Supports partial updates to the tracked branch, the automation flags, and the build settings.\n\nPATCH /accounts/{account_id}/builds/workers/{script_tag}/previews/{preview_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_UpdatePreviewRequest"
         },
-        "preview_id": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The script tag of the Preview, which is a Worker in its own right"
-        },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "The script tag of the Preview, which is a Worker in its own right",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag",
+            "preview_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag",
-        "preview_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_UpdatePreviewRequest": builds_UpdatePreviewRequest,
         "builds_UpdateWorkerBuildSettingsInput": builds_UpdateWorkerBuildSettingsInput,
-        "builds_account_id": builds_account_id,
-        "builds_build_caching_enabled": builds_build_caching_enabled,
-        "builds_build_command": builds_build_command,
-        "builds_build_token_uuid": builds_build_token_uuid,
-        "builds_deploy_command": builds_deploy_command,
-        "builds_external_script_id": builds_external_script_id,
-        "builds_is_secret": builds_is_secret,
-        "builds_path_excludes": builds_path_excludes,
-        "builds_path_includes": builds_path_includes,
-        "builds_preview_auto_build": builds_preview_auto_build,
-        "builds_preview_auto_delete": builds_preview_auto_delete,
-        "builds_root_directory": builds_root_directory,
+        "builds_path_excludes": builds_path_excludes$,
+        "builds_path_includes": builds_path_includes$,
       },
     },
     outputSchema: {
@@ -317,25 +225,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_PreviewResponse": builds_PreviewResponse_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_branch": builds_branch_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_preview_auto_build": builds_preview_auto_build_output,
-        "builds_preview_auto_delete": builds_preview_auto_delete_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_PreviewResponse": builds_PreviewResponse,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -383,26 +280,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_PreviewResponse": builds_PreviewResponse_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_branch": builds_branch_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_preview_auto_build": builds_preview_auto_build_output,
-        "builds_preview_auto_delete": builds_preview_auto_delete_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_PreviewResponse": builds_PreviewResponse,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -411,34 +297,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_builds_workers_previews_get",
+    name: "workersBuilds_workers_previews_get",
     title: "Get preview",
-    description: "Retrieve a single Preview of a Worker, including the build settings it currently uses.",
+    description: "Retrieve a single Preview of a Worker, including the build settings it currently uses.\n\nGET /accounts/{account_id}/builds/workers/{script_tag}/previews/{preview_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "preview_id": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The script tag of the Preview, which is a Worker in its own right"
-        },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "The script tag of the Preview, which is a Worker in its own right",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag",
+            "preview_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag",
-        "preview_id"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_external_script_id": builds_external_script_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -455,25 +347,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_PreviewResponse": builds_PreviewResponse_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_branch": builds_branch_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_preview_auto_build": builds_preview_auto_build_output,
-        "builds_preview_auto_delete": builds_preview_auto_delete_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_PreviewResponse": builds_PreviewResponse,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -516,26 +397,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_PreviewResponse": builds_PreviewResponse_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_branch": builds_branch_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_preview_auto_build": builds_preview_auto_build_output,
-        "builds_preview_auto_delete": builds_preview_auto_delete_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_PreviewResponse": builds_PreviewResponse,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
@@ -543,39 +413,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_builds_workers_previews_list",
+    name: "workersBuilds_workers_previews_list",
     title: "List previews",
-    description: "List the Previews of a Worker with pagination.",
+    description: "List the Previews of a Worker with pagination.\n\nGET /accounts/{account_id}/builds/workers/{script_tag}/previews",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number for pagination",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 50,
-          "description": "Number of items per page",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag"
+          ],
+          "type": "object"
         },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number for pagination",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of items per page",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_external_script_id": builds_external_script_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -598,14 +480,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_PreviewSummary": builds_PreviewSummary_output,
-        "builds_branch": builds_branch_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_preview_auto_build": builds_preview_auto_build_output,
-        "builds_preview_auto_delete": builds_preview_auto_delete_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_PreviewSummary": builds_PreviewSummary,
       },
     },
     annotations: {
@@ -651,64 +529,72 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_PreviewSummary": builds_PreviewSummary_output,
-        "builds_branch": builds_branch_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_preview_auto_build": builds_preview_auto_build_output,
-        "builds_preview_auto_delete": builds_preview_auto_delete_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_PreviewSummary": builds_PreviewSummary,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/builds/workers/${pathParam(args, "script_tag")}/previews`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "workers_builds_workers_previews_list_builds",
+    name: "workersBuilds_workers_previews_listBuilds",
     title: "List builds by preview",
-    description: "List the builds of a single Preview with pagination.",
+    description: "List the builds of a single Preview with pagination.\n\nGET /accounts/{account_id}/builds/workers/{script_tag}/previews/{preview_id}/builds",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number for pagination",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 50,
-          "description": "Number of items per page",
-          "type": "integer"
-        },
-        "preview_id": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The script tag of the Preview, which is a Worker in its own right"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "preview_id": {
+              "description": "The script tag of the Preview, which is a Worker in its own right",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag",
+            "preview_id"
+          ],
+          "type": "object"
         },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number for pagination",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of items per page",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag",
-        "preview_id"
+        "path"
       ],
-      $defs: {
-        "builds_account_id": builds_account_id,
-        "builds_external_script_id": builds_external_script_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -731,42 +617,16 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -815,50 +675,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_BuildOutcome": builds_BuildOutcome_output,
-        "builds_BuildResponse": builds_BuildResponse_output,
-        "builds_BuildStatus": builds_BuildStatus_output,
-        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse_output,
-        "builds_BuildTriggerSource": builds_BuildTriggerSource_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse_output,
-        "builds_branch": builds_branch_output,
-        "builds_branch_excludes": builds_branch_excludes_output,
-        "builds_branch_includes": builds_branch_includes_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_name": builds_build_token_name_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_build_uuid": builds_build_uuid_output,
-        "builds_commit_hash": builds_commit_hash_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deleted_on": builds_deleted_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_deploy_hook_name": builds_deploy_hook_name_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_modified_on": builds_modified_on_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_connection_uuid": builds_repo_connection_uuid_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
-        "builds_stopped_on": builds_stopped_on_output,
-        "builds_trigger_name": builds_trigger_name_output,
-        "builds_trigger_uuid": builds_trigger_uuid_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_BuildResponse": builds_BuildResponse,
+        "builds_BuildTriggerMetadataResponse": builds_BuildTriggerMetadataResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_UpsertRepoConnectionResponse": builds_UpsertRepoConnectionResponse,
+        "builds_branch_excludes": builds_branch_excludes,
+        "builds_branch_includes": builds_branch_includes,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/builds/workers/${pathParam(args, "script_tag")}/previews/${pathParam(args, "preview_id")}/builds`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workersBuilds/workers/tools.ts b/src/generated/forge-mcp/workersBuilds/workers/tools.ts
index 9f2b53524..1abead92e 100644
--- a/src/generated/forge-mcp/workersBuilds/workers/tools.ts
+++ b/src/generated/forge-mcp/workersBuilds/workers/tools.ts
@@ -3,65 +3,59 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  builds_APIResponse_output,
-  builds_ApiError_output,
-  builds_EnvironmentVariablesResponse_output,
-  builds_ErrorResponse_output,
-  builds_PaginationInfo_output,
-  builds_SCMProviderType_output,
-  builds_WorkerBuildSettings_output,
-  builds_WorkerGitRepository_output,
-  builds_WorkerResponse_output,
-  builds_build_caching_enabled_output,
-  builds_build_command_output,
-  builds_build_token_uuid_output,
-  builds_created_on_output,
-  builds_deploy_command_output,
-  builds_external_script_id_output,
-  builds_is_secret_output,
-  builds_path_excludes_output,
-  builds_path_includes_output,
-  builds_provider_account_id_output,
-  builds_provider_account_name_output,
-  builds_repo_id_output,
-  builds_repo_name_output,
-  builds_root_directory_output,
+  builds_APIResponse,
+  builds_ApiError,
+  builds_EnvironmentVariablesResponse,
+  builds_ErrorResponse,
+  builds_PaginationInfo,
+  builds_WorkerBuildSettings,
+  builds_WorkerGitRepository,
+  builds_WorkerResponse,
+  builds_path_excludes,
+  builds_path_includes,
 } from "../../outputs.js";
-import { builds_account_id, builds_external_script_id } from "../../schemas.js";
 import { builds_MigrateToPreviewsRequest } from "./schemas.js";
 
 /**
- * The tools of `workers_builds.workers`.
+ * The tools of `workersBuilds.workers`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_builds_workers_migrate_to_previews",
+    name: "workersBuilds_workers_migrateToPreviews",
     title: "Migrate worker to previews",
-    description: "Migrate a Worker's legacy non-production trigger to Previews. The legacy build settings become the Previews base config and the legacy trigger is removed.",
+    description: "Migrate a Worker's legacy non-production trigger to Previews. The legacy build settings become the Previews base config and the legacy trigger is removed.\n\nPOST /accounts/{account_id}/builds/workers/{script_tag}/migrate_to_previews",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/builds_account_id",
-          "description": "Account identifier."
-        },
         "body": {
           "$ref": "#/$defs/builds_MigrateToPreviewsRequest"
         },
-        "script_tag": {
-          "$ref": "#/$defs/builds_external_script_id",
-          "description": "The Worker script tag (external script ID)"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier.",
+              "type": "string"
+            },
+            "script_tag": {
+              "description": "The Worker script tag (external script ID)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "script_tag"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "script_tag",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "builds_MigrateToPreviewsRequest": builds_MigrateToPreviewsRequest,
-        "builds_account_id": builds_account_id,
-        "builds_external_script_id": builds_external_script_id,
       },
     },
     outputSchema: {
@@ -79,28 +73,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_WorkerGitRepository": builds_WorkerGitRepository_output,
-        "builds_WorkerResponse": builds_WorkerResponse_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_WorkerGitRepository": builds_WorkerGitRepository,
+        "builds_WorkerResponse": builds_WorkerResponse,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     annotations: {
@@ -145,29 +126,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "builds_APIResponse": builds_APIResponse_output,
-        "builds_ApiError": builds_ApiError_output,
-        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse_output,
-        "builds_ErrorResponse": builds_ErrorResponse_output,
-        "builds_PaginationInfo": builds_PaginationInfo_output,
-        "builds_SCMProviderType": builds_SCMProviderType_output,
-        "builds_WorkerBuildSettings": builds_WorkerBuildSettings_output,
-        "builds_WorkerGitRepository": builds_WorkerGitRepository_output,
-        "builds_WorkerResponse": builds_WorkerResponse_output,
-        "builds_build_caching_enabled": builds_build_caching_enabled_output,
-        "builds_build_command": builds_build_command_output,
-        "builds_build_token_uuid": builds_build_token_uuid_output,
-        "builds_created_on": builds_created_on_output,
-        "builds_deploy_command": builds_deploy_command_output,
-        "builds_external_script_id": builds_external_script_id_output,
-        "builds_is_secret": builds_is_secret_output,
-        "builds_path_excludes": builds_path_excludes_output,
-        "builds_path_includes": builds_path_includes_output,
-        "builds_provider_account_id": builds_provider_account_id_output,
-        "builds_provider_account_name": builds_provider_account_name_output,
-        "builds_repo_id": builds_repo_id_output,
-        "builds_repo_name": builds_repo_name_output,
-        "builds_root_directory": builds_root_directory_output,
+        "builds_APIResponse": builds_APIResponse,
+        "builds_ApiError": builds_ApiError,
+        "builds_EnvironmentVariablesResponse": builds_EnvironmentVariablesResponse,
+        "builds_ErrorResponse": builds_ErrorResponse,
+        "builds_PaginationInfo": builds_PaginationInfo,
+        "builds_WorkerBuildSettings": builds_WorkerBuildSettings,
+        "builds_WorkerGitRepository": builds_WorkerGitRepository,
+        "builds_WorkerResponse": builds_WorkerResponse,
+        "builds_path_excludes": builds_path_excludes,
+        "builds_path_includes": builds_path_includes,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/outputs.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/outputs.ts
index 3a62bb5cc..99f02b6fd 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/outputs.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `workers_dispatch_namespace_name` in responses.
- */
-export const workers_dispatch_namespace_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `workers_namespace-list-response` in responses.
  */
-export const workers_namespace_list_response_output: JsonSchema = {
+export const workers_namespace$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
@@ -35,31 +28,33 @@ export const workers_namespace_list_response_output: JsonSchema = {
 /**
  * The schema of `workers_namespace-response` in responses.
  */
-export const workers_namespace_response_output: JsonSchema = {
+export const workers_namespace$$response: JsonSchema = {
   "properties": {
     "created_by": {
-      "$ref": "#/$defs/workers_identifier"
+      "type": "string"
     },
     "created_on": {
-      "$ref": "#/$defs/workers_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "modified_by": {
-      "$ref": "#/$defs/workers_identifier"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/workers_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "namespace_id": {
-      "$ref": "#/$defs/workers_uuid"
+      "type": "string"
     },
     "namespace_name": {
-      "$ref": "#/$defs/workers_dispatch_namespace_name"
+      "type": "string"
     },
     "script_count": {
-      "$ref": "#/$defs/workers_script_count"
+      "type": "integer"
     },
     "trusted_workers": {
-      "$ref": "#/$defs/workers_trusted_workers"
+      "type": "boolean"
     }
   },
   "type": "object"
@@ -68,7 +63,7 @@ export const workers_namespace_response_output: JsonSchema = {
 /**
  * The schema of `workers_namespace-single-response` in responses.
  */
-export const workers_namespace_single_response_output: JsonSchema = {
+export const workers_namespace$$single$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
@@ -83,24 +78,3 @@ export const workers_namespace_single_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `workers_script_count` in responses.
- */
-export const workers_script_count_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `workers_trusted_workers` in responses.
- */
-export const workers_trusted_workers_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `workers_uuid` in responses.
- */
-export const workers_uuid_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/schemas.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/schemas.ts
deleted file mode 100644
index 74ad61e97..000000000
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `workers_dispatch_namespace_name`.
- */
-export const workers_dispatch_namespace_name: JsonSchema = {
-  "description": "Name of the Workers for Platforms dispatch namespace.",
-  "type": "string"
-};
-
-/**
- * The schema of `workers_trusted_workers`.
- */
-export const workers_trusted_workers: JsonSchema = {
-  "description": "Whether the Workers in the namespace are executed in a \"trusted\" manner. When a Worker is trusted, it has access to the shared caches for the zone in the Cache API, and has access to the `request.cf` object on incoming Requests. When a Worker is untrusted, caches are not shared across the zone, and `request.cf` is undefined. By default, Workers in a namespace are \"untrusted\".",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/assets/upload/tools.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/assets/upload/tools.ts
index f749602b0..a4b20d40b 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/assets/upload/tools.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/assets/upload/tools.ts
@@ -3,67 +3,70 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_create_assets_upload_session_response_output,
-  workers_messages_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_create$$assets$$upload$$session$$response,
+  workers_messages,
 } from "../../../../../outputs.js";
 import {
-  workers_create_assets_upload_session_object,
-  workers_identifier,
-  workers_manifest_value,
-  workers_script_name,
+  workers_create$$assets$$upload$$session$$object,
+  workers_manifest$$value,
 } from "../../../../../schemas.js";
-import { workers_dispatch_namespace_name } from "../../../schemas.js";
 
 /**
- * The tools of
- * `workers_for_platforms.dispatch_namespaces.scripts.assets.upload`.
+ * The tools of `workersForPlatforms.dispatchNamespaces.scripts.assets.upload`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_assets_upload_create_session",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_assets_upload_createSession",
     title: "Create Workers for Platforms Assets Upload Session",
-    description: "Start uploading a collection of assets for use in a Workers for Platforms script version. To learn more about the direct uploads of assets, see https://developers.cloudflare.com/workers/static-assets/direct-upload/.",
+    description: "Start uploading a collection of assets for use in a Workers for Platforms script version. To learn more about the direct uploads of assets, see https://developers.cloudflare.com/workers/static-assets/direct-upload/.\n\nPOST /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/assets-upload-session",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_create-assets-upload-session-object"
         },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_create-assets-upload-session-object": workers_create_assets_upload_session_object,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_manifest-value": workers_manifest_value,
-        "workers_script_name": workers_script_name,
+        "workers_create-assets-upload-session-object": workers_create$$assets$$upload$$session$$object,
+        "workers_manifest-value": workers_manifest$$value,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/workers_create-assets-upload-session-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_create-assets-upload-session-response": workers_create_assets_upload_session_response_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_create-assets-upload-session-response": workers_create$$assets$$upload$$session$$response,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -90,10 +93,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_create-assets-upload-session-response": workers_create_assets_upload_session_response_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_create-assets-upload-session-response": workers_create$$assets$$upload$$session$$response,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/bindings/tools.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/bindings/tools.ts
index e8811d781..6d7e0f993 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/bindings/tools.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/bindings/tools.ts
@@ -3,92 +3,90 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_binding_item_output,
-  workers_binding_kind_ai_output,
-  workers_binding_kind_ai_search_namespace_output,
-  workers_binding_kind_ai_search_output,
-  workers_binding_kind_analytics_engine_output,
-  workers_binding_kind_artifacts_output,
-  workers_binding_kind_assets_output,
-  workers_binding_kind_browser_output,
-  workers_binding_kind_d1_output,
-  workers_binding_kind_data_blob_output,
-  workers_binding_kind_dispatch_namespace_output,
-  workers_binding_kind_durable_object_namespace_output,
-  workers_binding_kind_flagship_output,
-  workers_binding_kind_hyperdrive_output,
-  workers_binding_kind_images_output,
-  workers_binding_kind_inherit_output,
-  workers_binding_kind_json_output,
-  workers_binding_kind_k2_output,
-  workers_binding_kind_kv_namespace_output,
-  workers_binding_kind_media_output,
-  workers_binding_kind_messaging_output,
-  workers_binding_kind_mtls_certificate_output,
-  workers_binding_kind_pipelines_output,
-  workers_binding_kind_plain_text_output,
-  workers_binding_kind_queue_output,
-  workers_binding_kind_r2_bucket_output,
-  workers_binding_kind_ratelimit_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_kind_secrets_store_secret_output,
-  workers_binding_kind_send_email_output,
-  workers_binding_kind_service_output,
-  workers_binding_kind_text_blob_output,
-  workers_binding_kind_vectorize_output,
-  workers_binding_kind_version_metadata_output,
-  workers_binding_kind_vpc_network_output,
-  workers_binding_kind_vpc_service_output,
-  workers_binding_kind_wasm_module_output,
-  workers_binding_kind_workflow_output,
-  workers_binding_name_output,
-  workers_bindings_output,
-  workers_messages_output,
-  workers_namespace_identifier_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_binding_item,
+  workers_binding_kind_ai,
+  workers_binding_kind_ai_search,
+  workers_binding_kind_ai_search_namespace,
+  workers_binding_kind_analytics_engine,
+  workers_binding_kind_artifacts,
+  workers_binding_kind_assets,
+  workers_binding_kind_browser,
+  workers_binding_kind_d1,
+  workers_binding_kind_data_blob,
+  workers_binding_kind_dispatch_namespace,
+  workers_binding_kind_durable_object_namespace,
+  workers_binding_kind_flagship,
+  workers_binding_kind_hyperdrive,
+  workers_binding_kind_images,
+  workers_binding_kind_inherit,
+  workers_binding_kind_json,
+  workers_binding_kind_k2,
+  workers_binding_kind_kv_namespace,
+  workers_binding_kind_media,
+  workers_binding_kind_messaging,
+  workers_binding_kind_mtls_certificate,
+  workers_binding_kind_pipelines,
+  workers_binding_kind_plain_text,
+  workers_binding_kind_queue,
+  workers_binding_kind_r2_bucket,
+  workers_binding_kind_ratelimit,
+  workers_binding_kind_secret_key,
+  workers_binding_kind_secret_text,
+  workers_binding_kind_secrets_store_secret,
+  workers_binding_kind_send_email,
+  workers_binding_kind_service,
+  workers_binding_kind_text_blob,
+  workers_binding_kind_vectorize,
+  workers_binding_kind_version_metadata,
+  workers_binding_kind_vpc_network,
+  workers_binding_kind_vpc_service,
+  workers_binding_kind_wasm_module,
+  workers_binding_kind_workflow,
+  workers_bindings,
+  workers_messages,
 } from "../../../../outputs.js";
-import {
-  workers_identifier,
-  workers_script_name,
-} from "../../../../schemas.js";
-import { workers_dispatch_namespace_name } from "../../schemas.js";
 
 /**
- * The tools of `workers_for_platforms.dispatch_namespaces.scripts.bindings`.
+ * The tools of `workersForPlatforms.dispatchNamespaces.scripts.bindings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_bindings_get",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_bindings_get",
     title: "Get Workers for Platforms Script Bindings",
-    description: "Fetch bindings from a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Fetch bindings from a script uploaded to a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/bindings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -108,50 +106,48 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_messages": workers_messages_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -195,51 +191,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_messages": workers_messages_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/content/tools.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/content/tools.ts
index e48ac5e41..45b2d98fd 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/content/tools.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/content/tools.ts
@@ -3,49 +3,49 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_messages_output,
+  workers_api$$response$$common$$failure,
+  workers_messages,
 } from "../../../../outputs.js";
-import {
-  workers_identifier,
-  workers_script_name,
-} from "../../../../schemas.js";
-import { workers_dispatch_namespace_name } from "../../schemas.js";
 
 /**
- * The tools of `workers_for_platforms.dispatch_namespaces.scripts.content`.
+ * The tools of `workersForPlatforms.dispatchNamespaces.scripts.content`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_content_get",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_content_get",
     title: "Get Workers for Platforms Script Content",
-    description: "Fetch content from a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Fetch content from a script uploaded to a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/content",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -74,8 +74,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/outputs.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/outputs.ts
index 66fd0d1c1..030c9b0ce 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/outputs.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/outputs.ts
@@ -6,13 +6,13 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `workers_namespace-script-delete-bulk-response` in responses.
  */
-export const workers_namespace_script_delete_bulk_response_output: JsonSchema = {
+export const workers_namespace$$script$$delete$$bulk$$response: JsonSchema = {
   "properties": {
     "deleted": {
       "items": {
         "properties": {
           "id": {
-            "$ref": "#/$defs/workers_uuid"
+            "type": "string"
           }
         },
         "type": "object"
@@ -32,16 +32,18 @@ export const workers_namespace_script_delete_bulk_response_output: JsonSchema =
 /**
  * The schema of `workers_namespace-script-response` in responses.
  */
-export const workers_namespace_script_response_output: JsonSchema = {
+export const workers_namespace$$script$$response: JsonSchema = {
   "properties": {
     "created_on": {
-      "$ref": "#/$defs/workers_created_on"
+      "format": "date-time",
+      "type": "string"
     },
     "dispatch_namespace": {
-      "$ref": "#/$defs/workers_dispatch_namespace_name"
+      "type": "string"
     },
     "modified_on": {
-      "$ref": "#/$defs/workers_modified_on"
+      "format": "date-time",
+      "type": "string"
     },
     "script": {
       "$ref": "#/$defs/workers_script-response"
@@ -53,7 +55,7 @@ export const workers_namespace_script_response_output: JsonSchema = {
 /**
  * The schema of `workers_namespace-script-response-single` in responses.
  */
-export const workers_namespace_script_response_single_output: JsonSchema = {
+export const workers_namespace$$script$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/secrets/tools.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/secrets/tools.ts
index feb1d5f31..ba66d5851 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/secrets/tools.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/secrets/tools.ts
@@ -1,73 +1,72 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
-import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_api_response_null_result_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_name_output,
-  workers_messages_output,
-  workers_secret_output,
-  workers_secret_patch_response_output,
-} from "../../../../outputs.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_api$$response$$null$$result,
   workers_binding_kind_secret_key,
   workers_binding_kind_secret_text,
-  workers_binding_name,
-  workers_identifier,
-  workers_script_name,
+  workers_messages,
   workers_secret,
-  workers_secret_name,
-  workers_secret_name_url_encoded,
-  workers_secret_patch_request,
+  workers_secret$$patch$$response,
+} from "../../../../outputs.js";
+import {
+  workers_binding_kind_secret_key as workers_binding_kind_secret_key$,
+  workers_binding_kind_secret_text as workers_binding_kind_secret_text$,
+  workers_secret as workers_secret$,
+  workers_secret$$patch$$request,
 } from "../../../../schemas.js";
-import { workers_dispatch_namespace_name } from "../../schemas.js";
 
 /**
- * The tools of `workers_for_platforms.dispatch_namespaces.scripts.secrets`.
+ * The tools of `workersForPlatforms.dispatchNamespaces.scripts.secrets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_secrets_bulk",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_secrets_bulk",
     title: "Patch multiple Workers for Platforms script secrets",
-    description: "Create, update, or delete multiple secrets on a Workers for Platforms script in a single operation using JSON Merge Patch (RFC 7396).\nThis operation creates a single version with all changes included.\nPrefer this API instead of changing many secrets individually.\n\nUsage:\n\n- To create or update a secret, set its value to a secret object.\n- To delete a secret, set its value to `null`.\n- Secrets not included in the request are left unchanged.",
+    description: "Create, update, or delete multiple secrets on a Workers for Platforms script in a single operation using JSON Merge Patch (RFC 7396).\nThis operation creates a single version with all changes included.\nPrefer this API instead of changing many secrets individually.\n\nUsage:\n\n- To create or update a secret, set its value to a secret object.\n- To delete a secret, set its value to `null`.\n- Secrets not included in the request are left unchanged.\n\nPATCH /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets-bulk",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_secret-patch-request"
         },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
-        "workers_binding_name": workers_binding_name,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_secret": workers_secret,
-        "workers_secret-patch-request": workers_secret_patch_request,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key$,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text$,
+        "workers_secret": workers_secret$,
+        "workers_secret-patch-request": workers_secret$$patch$$request,
       },
     },
     outputSchema: {
@@ -88,13 +87,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
-        "workers_secret-patch-response": workers_secret_patch_response_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
+        "workers_secret-patch-response": workers_secret$$patch$$response,
       },
     },
     annotations: {
@@ -134,14 +132,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
-        "workers_secret-patch-response": workers_secret_patch_response_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
+        "workers_secret-patch-response": workers_secret$$patch$$response,
       },
     },
     request: (args) => ({
@@ -150,53 +147,62 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_secrets_delete",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_secrets_delete",
     title: "Delete Workers for Platforms script secret",
-    description: "Remove a secret from a Workers for Platforms script by creating a new version without that\nsecret.\n\nWhen changing more than one secret at a time, prefer the \"Patch multiple\nscript secrets\" API instead of changing many secrets individually.\n\nConfirm with the user before calling this tool. This will permanently delete the Workers for Platforms script secret.",
+    description: "Remove a secret from a Workers for Platforms script by creating a new version without that\nsecret.\n\nWhen changing more than one secret at a time, prefer the \"Patch multiple\nscript secrets\" API instead of changing many secrets individually.\n\nConfirm with the user before calling this tool. This will permanently delete the Workers for Platforms script secret.\n\nDELETE /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
-        },
-        "secret_name": {
-          "$ref": "#/$defs/workers_secret_name",
-          "description": "A JavaScript variable name for the secret binding."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            },
+            "secret_name": {
+              "description": "A JavaScript variable name for the secret binding.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name",
+            "secret_name"
+          ],
+          "type": "object"
         },
-        "url_encoded": {
-          "$ref": "#/$defs/workers_secret_name_url_encoded",
-          "description": "Flag that indicates whether the secret name is URL encoded."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "url_encoded": {
+              "description": "Flag that indicates whether the secret name is URL encoded.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
-        "secret_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_secret_name": workers_secret_name,
-        "workers_secret_name_url_encoded": workers_secret_name_url_encoded,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-null-result",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -223,60 +229,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/dispatch/namespaces/${pathParam(args, "dispatch_namespace")}/scripts/${pathParam(args, "script_name")}/secrets/${pathParam(args, "secret_name")}`,
       query: [
-        ["url_encoded", args["url_encoded"], true],
+        ["url_encoded", param(args, "query", "url_encoded"), true],
       ],
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_secrets_get",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_secrets_get",
     title: "Get Workers for Platforms Script Secret",
-    description: "Get a given secret binding (value omitted) on a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Get a given secret binding (value omitted) on a script uploaded to a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
-        },
-        "secret_name": {
-          "$ref": "#/$defs/workers_secret_name",
-          "description": "A JavaScript variable name for the secret binding."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            },
+            "secret_name": {
+              "description": "A JavaScript variable name for the secret binding.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name",
+            "secret_name"
+          ],
+          "type": "object"
         },
-        "url_encoded": {
-          "$ref": "#/$defs/workers_secret_name_url_encoded",
-          "description": "Flag that indicates whether the secret name is URL encoded."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "url_encoded": {
+              "description": "Flag that indicates whether the secret name is URL encoded.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
-        "secret_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_secret_name": workers_secret_name,
-        "workers_secret_name_url_encoded": workers_secret_name_url_encoded,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -296,12 +311,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     annotations: {
@@ -345,52 +359,56 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/dispatch/namespaces/${pathParam(args, "dispatch_namespace")}/scripts/${pathParam(args, "script_name")}/secrets/${pathParam(args, "secret_name")}`,
       query: [
-        ["url_encoded", args["url_encoded"], true],
+        ["url_encoded", param(args, "query", "url_encoded"), true],
       ],
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_secrets_list",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_secrets_list",
     title: "List Workers for Platforms Script Secrets",
-    description: "List secrets bound to a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "List secrets bound to a script uploaded to a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -413,12 +431,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     annotations: {
@@ -465,13 +482,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     request: (args) => ({
@@ -479,42 +495,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_secrets_update",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_secrets_update",
     title: "Add a secret to a Workers for Platforms script",
-    description: "Add a secret to a Workers for Platforms script by creating a new version with that secret.\n\nWhen changing more than one secret at a time, prefer the \"Patch multiple\nscript secrets\" API instead of changing many secrets individually.",
+    description: "Add a secret to a Workers for Platforms script by creating a new version with that secret.\n\nWhen changing more than one secret at a time, prefer the \"Patch multiple\nscript secrets\" API instead of changing many secrets individually.\n\nPUT /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_secret"
         },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
-        "workers_binding_name": workers_binding_name,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_secret": workers_secret,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key$,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text$,
+        "workers_secret": workers_secret$,
       },
     },
     outputSchema: {
@@ -535,12 +557,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     annotations: {
@@ -585,13 +606,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_messages": workers_messages_output,
-        "workers_secret": workers_secret_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_messages": workers_messages,
+        "workers_secret": workers_secret,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/settings/outputs.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/settings/outputs.ts
index 87183bde9..c3ec46950 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/settings/outputs.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/settings/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * The schema of `workers_namespace-script-and-version-settings-item` in
  * responses.
  */
-export const workers_namespace_script_and_version_settings_item_output: JsonSchema = {
+export const workers_namespace$$script$$and$$version$$settings$$item: JsonSchema = {
   "properties": {
     "bindings": {
       "allOf": [
@@ -28,7 +28,7 @@ export const workers_namespace_script_and_version_settings_item_output: JsonSche
     "compatibility_date": {
       "allOf": [
         {
-          "$ref": "#/$defs/workers_compatibility_date"
+          "type": "string"
         },
         {
           "type": "string"
@@ -58,7 +58,7 @@ export const workers_namespace_script_and_version_settings_item_output: JsonSche
       "$ref": "#/$defs/workers_limits"
     },
     "logpush": {
-      "$ref": "#/$defs/workers_logpush"
+      "type": "boolean"
     },
     "migrations": {
       "oneOf": [
@@ -103,7 +103,12 @@ export const workers_namespace_script_and_version_settings_item_output: JsonSche
       ]
     },
     "usage_model": {
-      "$ref": "#/$defs/workers_usage_model"
+      "enum": [
+        "standard",
+        "bundled",
+        "unbound"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/settings/tools.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/settings/tools.ts
index 232bfb899..870e92944 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/settings/tools.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/settings/tools.ts
@@ -3,129 +3,120 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_binding_item_output,
-  workers_binding_kind_ai_output,
-  workers_binding_kind_ai_search_namespace_output,
-  workers_binding_kind_ai_search_output,
-  workers_binding_kind_analytics_engine_output,
-  workers_binding_kind_artifacts_output,
-  workers_binding_kind_assets_output,
-  workers_binding_kind_browser_output,
-  workers_binding_kind_d1_output,
-  workers_binding_kind_data_blob_output,
-  workers_binding_kind_dispatch_namespace_output,
-  workers_binding_kind_durable_object_namespace_output,
-  workers_binding_kind_flagship_output,
-  workers_binding_kind_hyperdrive_output,
-  workers_binding_kind_images_output,
-  workers_binding_kind_inherit_output,
-  workers_binding_kind_json_output,
-  workers_binding_kind_k2_output,
-  workers_binding_kind_kv_namespace_output,
-  workers_binding_kind_media_output,
-  workers_binding_kind_messaging_output,
-  workers_binding_kind_mtls_certificate_output,
-  workers_binding_kind_pipelines_output,
-  workers_binding_kind_plain_text_output,
-  workers_binding_kind_queue_output,
-  workers_binding_kind_r2_bucket_output,
-  workers_binding_kind_ratelimit_output,
-  workers_binding_kind_secret_key_output,
-  workers_binding_kind_secret_text_output,
-  workers_binding_kind_secrets_store_secret_output,
-  workers_binding_kind_send_email_output,
-  workers_binding_kind_service_output,
-  workers_binding_kind_text_blob_output,
-  workers_binding_kind_vectorize_output,
-  workers_binding_kind_version_metadata_output,
-  workers_binding_kind_vpc_network_output,
-  workers_binding_kind_vpc_service_output,
-  workers_binding_kind_wasm_module_output,
-  workers_binding_kind_workflow_output,
-  workers_binding_name_output,
-  workers_bindings_output,
-  workers_cache_options_output,
-  workers_compatibility_date_output,
-  workers_compatibility_flag_output,
-  workers_compatibility_flags_output,
-  workers_durable_object_deleted_export_output,
-  workers_durable_object_expecting_transfer_export_output,
-  workers_durable_object_export_output,
-  workers_durable_object_export_variants_output,
-  workers_durable_object_renamed_export_output,
-  workers_durable_object_transferred_export_output,
-  workers_entrypoint_cache_options_output,
-  workers_export_config_output,
-  workers_export_storage_output,
-  workers_exports_config_map_output,
-  workers_exports_reconciliation_info_output,
-  workers_exports_reconciliation_rename_output,
-  workers_exports_reconciliation_result_output,
-  workers_exports_reconciliation_scenario_output,
-  workers_exports_reconciliation_transfer_output,
-  workers_exports_reconciliation_transfer_pending_output,
-  workers_exports_reconciliation_warning_output,
-  workers_limits_output,
-  workers_logpush_output,
-  workers_messages_output,
-  workers_migration_step_output,
-  workers_migration_tag_conditions_output,
-  workers_multiple_step_migrations_output,
-  workers_namespace_identifier_output,
-  workers_observability_2_output,
-  workers_placement_info_no_status_output,
-  workers_placement_target_output,
-  workers_single_step_migrations_output,
-  workers_tag_output,
-  workers_tags_output,
-  workers_tail_consumers_output,
-  workers_tail_consumers_script_output,
-  workers_usage_model_output,
-  workers_worker_export_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_binding_item,
+  workers_binding_kind_ai,
+  workers_binding_kind_ai_search,
+  workers_binding_kind_ai_search_namespace,
+  workers_binding_kind_analytics_engine,
+  workers_binding_kind_artifacts,
+  workers_binding_kind_assets,
+  workers_binding_kind_browser,
+  workers_binding_kind_d1,
+  workers_binding_kind_data_blob,
+  workers_binding_kind_dispatch_namespace,
+  workers_binding_kind_durable_object_namespace,
+  workers_binding_kind_flagship,
+  workers_binding_kind_hyperdrive,
+  workers_binding_kind_images,
+  workers_binding_kind_inherit,
+  workers_binding_kind_json,
+  workers_binding_kind_k2,
+  workers_binding_kind_kv_namespace,
+  workers_binding_kind_media,
+  workers_binding_kind_messaging,
+  workers_binding_kind_mtls_certificate,
+  workers_binding_kind_pipelines,
+  workers_binding_kind_plain_text,
+  workers_binding_kind_queue,
+  workers_binding_kind_r2_bucket,
+  workers_binding_kind_ratelimit,
+  workers_binding_kind_secret_key,
+  workers_binding_kind_secret_text,
+  workers_binding_kind_secrets_store_secret,
+  workers_binding_kind_send_email,
+  workers_binding_kind_service,
+  workers_binding_kind_text_blob,
+  workers_binding_kind_vectorize,
+  workers_binding_kind_version_metadata,
+  workers_binding_kind_vpc_network,
+  workers_binding_kind_vpc_service,
+  workers_binding_kind_wasm_module,
+  workers_binding_kind_workflow,
+  workers_bindings,
+  workers_cache_options,
+  workers_compatibility_flags,
+  workers_durable_object_deleted_export,
+  workers_durable_object_expecting_transfer_export,
+  workers_durable_object_export,
+  workers_durable_object_export_variants,
+  workers_durable_object_renamed_export,
+  workers_durable_object_transferred_export,
+  workers_entrypoint_cache_options,
+  workers_export_config,
+  workers_exports_config_map,
+  workers_exports_reconciliation_info,
+  workers_exports_reconciliation_rename,
+  workers_exports_reconciliation_result,
+  workers_exports_reconciliation_transfer,
+  workers_exports_reconciliation_transfer_pending,
+  workers_exports_reconciliation_warning,
+  workers_limits,
+  workers_messages,
+  workers_migration_step,
+  workers_migration_tag_conditions,
+  workers_multiple_step_migrations,
+  workers_observability$$2,
+  workers_placement_info_no_status,
+  workers_placement_target,
+  workers_single_step_migrations,
+  workers_tags,
+  workers_tail_consumers,
+  workers_tail_consumers_script,
+  workers_worker_export,
 } from "../../../../outputs.js";
-import {
-  workers_identifier,
-  workers_script_name,
-} from "../../../../schemas.js";
-import { workers_dispatch_namespace_name } from "../../schemas.js";
-import { workers_namespace_script_and_version_settings_item_output } from "./outputs.js";
+import { workers_namespace$$script$$and$$version$$settings$$item } from "./outputs.js";
 
 /**
- * The tools of `workers_for_platforms.dispatch_namespaces.scripts.settings`.
+ * The tools of `workersForPlatforms.dispatchNamespaces.scripts.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_settings_get",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_settings_get",
     title: "Get Workers for Platforms Script Settings",
-    description: "Get settings for a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Get settings for a script uploaded to a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -142,87 +133,78 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_limits": workers_limits_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace-script-and-version-settings-item": workers_namespace_script_and_version_settings_item_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_namespace-script-and-version-settings-item": workers_namespace$$script$$and$$version$$settings$$item,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -263,88 +245,79 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_binding_item": workers_binding_item_output,
-        "workers_binding_kind_ai": workers_binding_kind_ai_output,
-        "workers_binding_kind_ai_search": workers_binding_kind_ai_search_output,
-        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace_output,
-        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine_output,
-        "workers_binding_kind_artifacts": workers_binding_kind_artifacts_output,
-        "workers_binding_kind_assets": workers_binding_kind_assets_output,
-        "workers_binding_kind_browser": workers_binding_kind_browser_output,
-        "workers_binding_kind_d1": workers_binding_kind_d1_output,
-        "workers_binding_kind_data_blob": workers_binding_kind_data_blob_output,
-        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace_output,
-        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace_output,
-        "workers_binding_kind_flagship": workers_binding_kind_flagship_output,
-        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive_output,
-        "workers_binding_kind_images": workers_binding_kind_images_output,
-        "workers_binding_kind_inherit": workers_binding_kind_inherit_output,
-        "workers_binding_kind_json": workers_binding_kind_json_output,
-        "workers_binding_kind_k2": workers_binding_kind_k2_output,
-        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace_output,
-        "workers_binding_kind_media": workers_binding_kind_media_output,
-        "workers_binding_kind_messaging": workers_binding_kind_messaging_output,
-        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate_output,
-        "workers_binding_kind_pipelines": workers_binding_kind_pipelines_output,
-        "workers_binding_kind_plain_text": workers_binding_kind_plain_text_output,
-        "workers_binding_kind_queue": workers_binding_kind_queue_output,
-        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket_output,
-        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit_output,
-        "workers_binding_kind_secret_key": workers_binding_kind_secret_key_output,
-        "workers_binding_kind_secret_text": workers_binding_kind_secret_text_output,
-        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret_output,
-        "workers_binding_kind_send_email": workers_binding_kind_send_email_output,
-        "workers_binding_kind_service": workers_binding_kind_service_output,
-        "workers_binding_kind_text_blob": workers_binding_kind_text_blob_output,
-        "workers_binding_kind_vectorize": workers_binding_kind_vectorize_output,
-        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata_output,
-        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network_output,
-        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service_output,
-        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module_output,
-        "workers_binding_kind_workflow": workers_binding_kind_workflow_output,
-        "workers_binding_name": workers_binding_name_output,
-        "workers_bindings": workers_bindings_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_exports_reconciliation_info": workers_exports_reconciliation_info_output,
-        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename_output,
-        "workers_exports_reconciliation_result": workers_exports_reconciliation_result_output,
-        "workers_exports_reconciliation_scenario": workers_exports_reconciliation_scenario_output,
-        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer_output,
-        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending_output,
-        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning_output,
-        "workers_limits": workers_limits_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_migration_step": workers_migration_step_output,
-        "workers_migration_tag_conditions": workers_migration_tag_conditions_output,
-        "workers_multiple_step_migrations": workers_multiple_step_migrations_output,
-        "workers_namespace-script-and-version-settings-item": workers_namespace_script_and_version_settings_item_output,
-        "workers_namespace_identifier": workers_namespace_identifier_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info_no_status": workers_placement_info_no_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_single_step_migrations": workers_single_step_migrations_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_binding_item": workers_binding_item,
+        "workers_binding_kind_ai": workers_binding_kind_ai,
+        "workers_binding_kind_ai_search": workers_binding_kind_ai_search,
+        "workers_binding_kind_ai_search_namespace": workers_binding_kind_ai_search_namespace,
+        "workers_binding_kind_analytics_engine": workers_binding_kind_analytics_engine,
+        "workers_binding_kind_artifacts": workers_binding_kind_artifacts,
+        "workers_binding_kind_assets": workers_binding_kind_assets,
+        "workers_binding_kind_browser": workers_binding_kind_browser,
+        "workers_binding_kind_d1": workers_binding_kind_d1,
+        "workers_binding_kind_data_blob": workers_binding_kind_data_blob,
+        "workers_binding_kind_dispatch_namespace": workers_binding_kind_dispatch_namespace,
+        "workers_binding_kind_durable_object_namespace": workers_binding_kind_durable_object_namespace,
+        "workers_binding_kind_flagship": workers_binding_kind_flagship,
+        "workers_binding_kind_hyperdrive": workers_binding_kind_hyperdrive,
+        "workers_binding_kind_images": workers_binding_kind_images,
+        "workers_binding_kind_inherit": workers_binding_kind_inherit,
+        "workers_binding_kind_json": workers_binding_kind_json,
+        "workers_binding_kind_k2": workers_binding_kind_k2,
+        "workers_binding_kind_kv_namespace": workers_binding_kind_kv_namespace,
+        "workers_binding_kind_media": workers_binding_kind_media,
+        "workers_binding_kind_messaging": workers_binding_kind_messaging,
+        "workers_binding_kind_mtls_certificate": workers_binding_kind_mtls_certificate,
+        "workers_binding_kind_pipelines": workers_binding_kind_pipelines,
+        "workers_binding_kind_plain_text": workers_binding_kind_plain_text,
+        "workers_binding_kind_queue": workers_binding_kind_queue,
+        "workers_binding_kind_r2_bucket": workers_binding_kind_r2_bucket,
+        "workers_binding_kind_ratelimit": workers_binding_kind_ratelimit,
+        "workers_binding_kind_secret_key": workers_binding_kind_secret_key,
+        "workers_binding_kind_secret_text": workers_binding_kind_secret_text,
+        "workers_binding_kind_secrets_store_secret": workers_binding_kind_secrets_store_secret,
+        "workers_binding_kind_send_email": workers_binding_kind_send_email,
+        "workers_binding_kind_service": workers_binding_kind_service,
+        "workers_binding_kind_text_blob": workers_binding_kind_text_blob,
+        "workers_binding_kind_vectorize": workers_binding_kind_vectorize,
+        "workers_binding_kind_version_metadata": workers_binding_kind_version_metadata,
+        "workers_binding_kind_vpc_network": workers_binding_kind_vpc_network,
+        "workers_binding_kind_vpc_service": workers_binding_kind_vpc_service,
+        "workers_binding_kind_wasm_module": workers_binding_kind_wasm_module,
+        "workers_binding_kind_workflow": workers_binding_kind_workflow,
+        "workers_bindings": workers_bindings,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_exports_reconciliation_info": workers_exports_reconciliation_info,
+        "workers_exports_reconciliation_rename": workers_exports_reconciliation_rename,
+        "workers_exports_reconciliation_result": workers_exports_reconciliation_result,
+        "workers_exports_reconciliation_transfer": workers_exports_reconciliation_transfer,
+        "workers_exports_reconciliation_transfer_pending": workers_exports_reconciliation_transfer_pending,
+        "workers_exports_reconciliation_warning": workers_exports_reconciliation_warning,
+        "workers_limits": workers_limits,
+        "workers_messages": workers_messages,
+        "workers_migration_step": workers_migration_step,
+        "workers_migration_tag_conditions": workers_migration_tag_conditions,
+        "workers_multiple_step_migrations": workers_multiple_step_migrations,
+        "workers_namespace-script-and-version-settings-item": workers_namespace$$script$$and$$version$$settings$$item,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info_no_status": workers_placement_info_no_status,
+        "workers_placement_target": workers_placement_target,
+        "workers_single_step_migrations": workers_single_step_migrations,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/outputs.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/outputs.ts
index 47c133403..13c49c383 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/outputs.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `workers_tags-kv-response` in responses.
  */
-export const workers_tags_kv_response_output: JsonSchema = {
+export const workers_tags$$kv$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/workers_api-response-common"
@@ -28,7 +28,7 @@ export const workers_tags_kv_response_output: JsonSchema = {
 /**
  * The schema of `workers_tags_kv` in responses.
  */
-export const workers_tags_kv_output: JsonSchema = {
+export const workers_tags_kv: JsonSchema = {
   "additionalProperties": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/schemas.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/schemas.ts
index 20b91c078..0bb79a16c 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/schemas.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/schemas.ts
@@ -18,11 +18,3 @@ export const workers_tag_patch: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `workers_typed_tag_key`.
- */
-export const workers_typed_tag_key: JsonSchema = {
-  "description": "A typed tag key containing only Unicode letters or numbers, underscores, periods, or hyphens. The complete UTF-8 encoded tag (the key plus `=` and the value when the value is non-empty) must not exceed 1024 bytes. Cloudflare-reserved prefixes are not accepted.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/tools.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/tools.ts
index 0751a41c5..613190a8e 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/tools.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tags/tools.ts
@@ -1,73 +1,67 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_api_response_null_result_output,
-  workers_messages_output,
-  workers_tag_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_api$$response$$null$$result,
+  workers_messages,
 } from "../../../../outputs.js";
-import {
-  workers_identifier,
-  workers_script_name,
-  workers_tag,
-  workers_tags,
-} from "../../../../schemas.js";
-import { workers_dispatch_namespace_name } from "../../schemas.js";
-import {
-  workers_tags_kv_output,
-  workers_tags_kv_response_output,
-} from "./outputs.js";
-import { workers_tag_patch, workers_typed_tag_key } from "./schemas.js";
+import { workers_tags } from "../../../../schemas.js";
+import { workers_tags$$kv$$response, workers_tags_kv } from "./outputs.js";
+import { workers_tag_patch } from "./schemas.js";
 
 /**
- * The tools of `workers_for_platforms.dispatch_namespaces.scripts.tags`.
+ * The tools of `workersForPlatforms.dispatchNamespaces.scripts.tags`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_tags_create",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_tags_create",
     title: "Create Workers for Platforms Script Tag",
-    description: "Add a single tag to a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Add a single tag to a script uploaded to a Workers for Platforms dispatch namespace.\n\nPUT /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags/{tag}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
-        },
-        "tag": {
-          "$ref": "#/$defs/workers_tag"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            },
+            "tag": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name",
+            "tag"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
-        "tag"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_tag": workers_tag,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-null-result",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -97,10 +91,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -108,52 +102,62 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_tags_delete",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_tags_delete",
     title: "Delete Workers for Platforms Script Tag",
-    description: "Delete a tag from a script uploaded to a Workers for Platforms dispatch namespace.\n\nOn `api-version` dates on or after `2026-10-01`, `tag` identifies a key and the operation returns the complete updated tag map. Deleting a missing key succeeds. Earlier versions retain the legacy string-tag behavior and return a null result.\n\nConfirm with the user before calling this tool. This will delete the tag from the Workers for Platforms script.",
+    description: "Delete a tag from a script uploaded to a Workers for Platforms dispatch namespace.\n\nOn `api-version` dates on or after `2026-10-01`, `tag` identifies a key and the operation returns the complete updated tag map. Deleting a missing key succeeds. Earlier versions retain the legacy string-tag behavior and return a null result.\n\nConfirm with the user before calling this tool. This will delete the tag from the Workers for Platforms script.\n\nDELETE /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags/{tag}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "api_version": {
-          "description": "Requested API compatibility date in `YYYY-MM-DD[.release]` format (UTC). The optional release suffix contains lowercase letters; for example, `2026-10-01.epoch`.\n\nTyped Worker tag operations require a date on or after `2026-10-01`.\n",
-          "type": "string"
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "api-version": {
+              "description": "Requested API compatibility date in `YYYY-MM-DD[.release]` format (UTC). The optional release suffix contains lowercase letters; for example, `2026-10-01.epoch`.\n\nTyped Worker tag operations require a date on or after `2026-10-01`.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "tag": {
-          "oneOf": [
-            {
-              "$ref": "#/$defs/workers_typed_tag_key"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
             },
-            {
-              "$ref": "#/$defs/workers_tag"
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            },
+            "tag": {
+              "oneOf": [
+                {
+                  "description": "A typed tag key containing only Unicode letters or numbers, underscores, periods, or hyphens. The complete UTF-8 encoded tag (the key plus `=` and the value when the value is non-empty) must not exceed 1024 bytes. Cloudflare-reserved prefixes are not accepted.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
             }
-          ]
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name",
+            "tag"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
-        "tag"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_tag": workers_tag,
-        "workers_typed_tag_key": workers_typed_tag_key,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "oneOf": [
@@ -165,11 +169,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
-        "workers_tags-kv-response": workers_tags_kv_response_output,
-        "workers_tags_kv": workers_tags_kv_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
+        "workers_tags-kv-response": workers_tags$$kv$$response,
+        "workers_tags_kv": workers_tags_kv,
       },
     },
     annotations: {
@@ -203,74 +207,86 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
-        "workers_tags-kv-response": workers_tags_kv_response_output,
-        "workers_tags_kv": workers_tags_kv_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
+        "workers_tags-kv-response": workers_tags$$kv$$response,
+        "workers_tags_kv": workers_tags_kv,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/dispatch/namespaces/${pathParam(args, "dispatch_namespace")}/scripts/${pathParam(args, "script_name")}/tags/${pathParam(args, "tag")}`,
       headers: [
-        ["api-version", args["api_version"]],
+        ["api-version", param(args, "headers", "api-version")],
       ],
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_tags_edit",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_tags_edit",
     title: "Update Workers for Platforms Script Tag",
-    description: "Add or update one tag key/value on a script uploaded to a Workers for Platforms dispatch namespace without replacing its other tags.\n\nThis operation requires an `api-version` on or after `2026-10-01`.",
+    description: "Add or update one tag key/value on a script uploaded to a Workers for Platforms dispatch namespace without replacing its other tags.\n\nThis operation requires an `api-version` on or after `2026-10-01`.\n\nPATCH /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags/{tag}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "api_version": {
-          "description": "Requested API compatibility date in `YYYY-MM-DD[.release]` format (UTC). The optional release suffix contains lowercase letters; for example, `2026-10-01.epoch`.\n\nTyped Worker tag operations require a date on or after `2026-10-01`.\n",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/workers_tag_patch"
         },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "headers": {
+          "additionalProperties": false,
+          "properties": {
+            "api-version": {
+              "description": "Requested API compatibility date in `YYYY-MM-DD[.release]` format (UTC). The optional release suffix contains lowercase letters; for example, `2026-10-01.epoch`.\n\nTyped Worker tag operations require a date on or after `2026-10-01`.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "tag": {
-          "$ref": "#/$defs/workers_typed_tag_key",
-          "description": "Tag key. Cloudflare-reserved prefixes are not accepted."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            },
+            "tag": {
+              "description": "Tag key. Cloudflare-reserved prefixes are not accepted.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name",
+            "tag"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
-        "tag",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
         "workers_tag_patch": workers_tag_patch,
-        "workers_typed_tag_key": workers_typed_tag_key,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/workers_tags-kv-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_tags-kv-response": workers_tags_kv_response_output,
-        "workers_tags_kv": workers_tags_kv_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_tags-kv-response": workers_tags$$kv$$response,
+        "workers_tags_kv": workers_tags_kv,
       },
     },
     annotations: {
@@ -297,51 +313,56 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_tags-kv-response": workers_tags_kv_response_output,
-        "workers_tags_kv": workers_tags_kv_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_tags-kv-response": workers_tags$$kv$$response,
+        "workers_tags_kv": workers_tags_kv,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/dispatch/namespaces/${pathParam(args, "dispatch_namespace")}/scripts/${pathParam(args, "script_name")}/tags/${pathParam(args, "tag")}`,
       headers: [
-        ["api-version", args["api_version"]],
+        ["api-version", param(args, "headers", "api-version")],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_tags_list",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_tags_list",
     title: "List Workers for Platforms Script Tags",
-    description: "Fetch tags from a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Fetch tags from a script uploaded to a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -352,7 +373,7 @@ export const tools: readonly Tool[] = [
           "properties": {
             "result": {
               "items": {
-                "$ref": "#/$defs/workers_tag"
+                "type": "string"
               },
               "type": "array"
             }
@@ -361,9 +382,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_tag": workers_tag_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -393,7 +413,7 @@ export const tools: readonly Tool[] = [
               "properties": {
                 "result": {
                   "items": {
-                    "$ref": "#/$defs/workers_tag"
+                    "type": "string"
                   },
                   "type": "array"
                 }
@@ -407,10 +427,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_tag": workers_tag_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -418,39 +437,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_tags_update",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_tags_update",
     title: "Replace Workers for Platforms Script Tags",
-    description: "Replace tags for a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Replace tags for a script uploaded to a Workers for Platforms dispatch namespace.\n\nPUT /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/workers_tags"
         },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-        "workers_tag": workers_tag,
         "workers_tags": workers_tags,
       },
     },
@@ -463,7 +488,7 @@ export const tools: readonly Tool[] = [
           "properties": {
             "result": {
               "items": {
-                "$ref": "#/$defs/workers_tag"
+                "type": "string"
               },
               "type": "array"
             }
@@ -475,9 +500,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_messages": workers_messages_output,
-        "workers_tag": workers_tag_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -505,7 +529,7 @@ export const tools: readonly Tool[] = [
               "properties": {
                 "result": {
                   "items": {
-                    "$ref": "#/$defs/workers_tag"
+                    "type": "string"
                   },
                   "type": "array"
                 }
@@ -522,10 +546,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_tag": workers_tag_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tools.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tools.ts
index af0696cb5..4afde0181 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tools.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/scripts/tools.ts
@@ -1,100 +1,95 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_api_response_null_result_output,
-  workers_cache_options_output,
-  workers_compatibility_date_output,
-  workers_compatibility_flag_output,
-  workers_compatibility_flags_output,
-  workers_created_on_output,
-  workers_durable_object_deleted_export_output,
-  workers_durable_object_expecting_transfer_export_output,
-  workers_durable_object_export_output,
-  workers_durable_object_export_variants_output,
-  workers_durable_object_renamed_export_output,
-  workers_durable_object_transferred_export_output,
-  workers_entrypoint_cache_options_output,
-  workers_etag_output,
-  workers_export_config_output,
-  workers_export_storage_output,
-  workers_exports_config_map_output,
-  workers_has_assets_output,
-  workers_has_modules_output,
-  workers_logpush_output,
-  workers_messages_output,
-  workers_modified_on_output,
-  workers_observability_2_output,
-  workers_placement_info_output,
-  workers_placement_mode_output,
-  workers_placement_status_output,
-  workers_placement_target_output,
-  workers_script_response_output,
-  workers_tag_output,
-  workers_tags_output,
-  workers_tail_consumers_output,
-  workers_tail_consumers_script_output,
-  workers_usage_model_output,
-  workers_worker_export_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_api$$response$$null$$result,
+  workers_cache_options,
+  workers_compatibility_flags,
+  workers_durable_object_deleted_export,
+  workers_durable_object_expecting_transfer_export,
+  workers_durable_object_export,
+  workers_durable_object_export_variants,
+  workers_durable_object_renamed_export,
+  workers_durable_object_transferred_export,
+  workers_entrypoint_cache_options,
+  workers_export_config,
+  workers_exports_config_map,
+  workers_messages,
+  workers_observability$$2,
+  workers_placement_info,
+  workers_placement_target,
+  workers_script$$response,
+  workers_tags,
+  workers_tail_consumers,
+  workers_tail_consumers_script,
+  workers_worker_export,
 } from "../../../outputs.js";
-import { workers_identifier, workers_script_name } from "../../../schemas.js";
 import {
-  workers_dispatch_namespace_name_output,
-  workers_uuid_output,
-} from "../outputs.js";
-import { workers_dispatch_namespace_name } from "../schemas.js";
-import {
-  workers_namespace_script_delete_bulk_response_output,
-  workers_namespace_script_response_output,
-  workers_namespace_script_response_single_output,
+  workers_namespace$$script$$delete$$bulk$$response,
+  workers_namespace$$script$$response,
+  workers_namespace$$script$$response$$single,
 } from "./outputs.js";
 
 /**
- * The tools of `workers_for_platforms.dispatch_namespaces.scripts`.
+ * The tools of `workersForPlatforms.dispatchNamespaces.scripts`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_bulk_delete",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_bulkDelete",
     title: "Delete Workers for Platforms Scripts",
-    description: "Delete multiple scripts from a Workers for Platforms dispatch namespace based on optional tag filters.\n\nConfirm with the user before calling this tool. This will permanently delete matching scripts in the Workers for Platforms dispatch namespace.",
+    description: "Delete multiple scripts from a Workers for Platforms dispatch namespace based on optional tag filters.\n\nConfirm with the user before calling this tool. This will permanently delete matching scripts in the Workers for Platforms dispatch namespace.\n\nDELETE /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "limit": {
-          "description": "Limit the number of scripts to delete.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace"
+          ],
+          "type": "object"
         },
-        "tags": {
-          "description": "Filter scripts by tags before deletion. Format: comma-separated list of tag:allowed pairs where allowed is 'yes' or 'no'.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "description": "Limit the number of scripts to delete.",
+              "type": "integer"
+            },
+            "tags": {
+              "description": "Filter scripts by tags before deletion. Format: comma-separated list of tag:allowed pairs where allowed is 'yes' or 'no'.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "tags"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "tags"
+        "path",
+        "query"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_namespace-script-delete-bulk-response",
       $defs: {
-        "workers_namespace-script-delete-bulk-response": workers_namespace_script_delete_bulk_response_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_namespace-script-delete-bulk-response": workers_namespace$$script$$delete$$bulk$$response,
       },
     },
     annotations: {
@@ -124,61 +119,71 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_messages": workers_messages_output,
-        "workers_namespace-script-delete-bulk-response": workers_namespace_script_delete_bulk_response_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_namespace-script-delete-bulk-response": workers_namespace$$script$$delete$$bulk$$response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/dispatch/namespaces/${pathParam(args, "dispatch_namespace")}/scripts`,
       query: [
-        ["tags", args["tags"], true],
-        ["limit", args["limit"], true],
+        ["tags", param(args, "query", "tags"), true],
+        ["limit", param(args, "query", "limit"), true],
       ],
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_delete",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_delete",
     title: "Delete Workers for Platforms Script",
-    description: "Delete a script from a Workers for Platforms dispatch namespace. This call has no response body on a successful delete.\n\nConfirm with the user before calling this tool. This will permanently delete the Workers for Platforms script.",
+    description: "Delete a script from a Workers for Platforms dispatch namespace. This call has no response body on a successful delete.\n\nConfirm with the user before calling this tool. This will permanently delete the Workers for Platforms script.\n\nDELETE /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "delete_with_references": {
-          "description": "If true, delete the script even when other Workers still reference it. Service bindings in those Workers may be left broken. Durable Object namespaces implemented by the deleted script are deleted even if other Workers reference them.",
-          "type": "boolean"
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "force": {
+              "description": "If true, delete the script even when other Workers still reference it. Service bindings in those Workers may be left broken. Durable Object namespaces implemented by the deleted script are deleted even if other Workers reference them.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-null-result",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -205,90 +210,81 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/dispatch/namespaces/${pathParam(args, "dispatch_namespace")}/scripts/${pathParam(args, "script_name")}`,
       query: [
-        ["force", args["delete_with_references"], true],
+        ["force", param(args, "query", "force"), true],
       ],
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_get",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_get",
     title: "Get Workers for Platforms Script details",
-    description: "Fetch information about a script uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Fetch information about a script uploaded to a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
-        },
-        "script_name": {
-          "$ref": "#/$defs/workers_script_name",
-          "description": "Name of the script."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            },
+            "script_name": {
+              "description": "Name of the script.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace",
+            "script_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
-        "script_name"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_script_name": workers_script_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_namespace-script-response-single",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_etag": workers_etag_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_has_assets": workers_has_assets_output,
-        "workers_has_modules": workers_has_modules_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-script-response": workers_namespace_script_response_output,
-        "workers_namespace-script-response-single": workers_namespace_script_response_single_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info": workers_placement_info_output,
-        "workers_placement_mode": workers_placement_mode_output,
-        "workers_placement_status": workers_placement_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_script-response": workers_script_response_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_messages": workers_messages,
+        "workers_namespace-script-response": workers_namespace$$script$$response,
+        "workers_namespace-script-response-single": workers_namespace$$script$$response$$single,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info": workers_placement_info,
+        "workers_placement_target": workers_placement_target,
+        "workers_script-response": workers_script$$response,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -317,44 +313,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_etag": workers_etag_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_has_assets": workers_has_assets_output,
-        "workers_has_modules": workers_has_modules_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-script-response": workers_namespace_script_response_output,
-        "workers_namespace-script-response-single": workers_namespace_script_response_single_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info": workers_placement_info_output,
-        "workers_placement_mode": workers_placement_mode_output,
-        "workers_placement_status": workers_placement_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_script-response": workers_script_response_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_messages": workers_messages,
+        "workers_namespace-script-response": workers_namespace$$script$$response,
+        "workers_namespace-script-response-single": workers_namespace$$script$$response$$single,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info": workers_placement_info,
+        "workers_placement_target": workers_placement_target,
+        "workers_script-response": workers_script$$response,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
@@ -362,33 +344,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_scripts_list",
+    name: "workersForPlatforms_dispatchNamespaces_scripts_list",
     title: "List Workers for Platforms Scripts",
-    description: "Fetch a list of scripts uploaded to a Workers for Platforms dispatch namespace.",
+    description: "Fetch a list of scripts uploaded to a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace"
+          ],
+          "type": "object"
         },
-        "tags": {
-          "description": "Filter scripts by tags. Format: comma-separated list of tag:allowed pairs where allowed is 'yes' or 'no'.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "tags": {
+              "description": "Filter scripts by tags. Format: comma-separated list of tag:allowed pairs where allowed is 'yes' or 'no'.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -411,42 +405,28 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_etag": workers_etag_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_has_assets": workers_has_assets_output,
-        "workers_has_modules": workers_has_modules_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-script-response": workers_namespace_script_response_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info": workers_placement_info_output,
-        "workers_placement_mode": workers_placement_mode_output,
-        "workers_placement_status": workers_placement_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_script-response": workers_script_response_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_messages": workers_messages,
+        "workers_namespace-script-response": workers_namespace$$script$$response,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info": workers_placement_info,
+        "workers_placement_target": workers_placement_target,
+        "workers_script-response": workers_script$$response,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     annotations: {
@@ -493,49 +473,35 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_cache_options": workers_cache_options_output,
-        "workers_compatibility_date": workers_compatibility_date_output,
-        "workers_compatibility_flag": workers_compatibility_flag_output,
-        "workers_compatibility_flags": workers_compatibility_flags_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_durable_object_deleted_export": workers_durable_object_deleted_export_output,
-        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export_output,
-        "workers_durable_object_export": workers_durable_object_export_output,
-        "workers_durable_object_export_variants": workers_durable_object_export_variants_output,
-        "workers_durable_object_renamed_export": workers_durable_object_renamed_export_output,
-        "workers_durable_object_transferred_export": workers_durable_object_transferred_export_output,
-        "workers_entrypoint_cache_options": workers_entrypoint_cache_options_output,
-        "workers_etag": workers_etag_output,
-        "workers_export_config": workers_export_config_output,
-        "workers_export_storage": workers_export_storage_output,
-        "workers_exports_config_map": workers_exports_config_map_output,
-        "workers_has_assets": workers_has_assets_output,
-        "workers_has_modules": workers_has_modules_output,
-        "workers_logpush": workers_logpush_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-script-response": workers_namespace_script_response_output,
-        "workers_observability-2": workers_observability_2_output,
-        "workers_placement_info": workers_placement_info_output,
-        "workers_placement_mode": workers_placement_mode_output,
-        "workers_placement_status": workers_placement_status_output,
-        "workers_placement_target": workers_placement_target_output,
-        "workers_script-response": workers_script_response_output,
-        "workers_tag": workers_tag_output,
-        "workers_tags": workers_tags_output,
-        "workers_tail_consumers": workers_tail_consumers_output,
-        "workers_tail_consumers_script": workers_tail_consumers_script_output,
-        "workers_usage_model": workers_usage_model_output,
-        "workers_worker_export": workers_worker_export_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_cache_options": workers_cache_options,
+        "workers_compatibility_flags": workers_compatibility_flags,
+        "workers_durable_object_deleted_export": workers_durable_object_deleted_export,
+        "workers_durable_object_expecting_transfer_export": workers_durable_object_expecting_transfer_export,
+        "workers_durable_object_export": workers_durable_object_export,
+        "workers_durable_object_export_variants": workers_durable_object_export_variants,
+        "workers_durable_object_renamed_export": workers_durable_object_renamed_export,
+        "workers_durable_object_transferred_export": workers_durable_object_transferred_export,
+        "workers_entrypoint_cache_options": workers_entrypoint_cache_options,
+        "workers_export_config": workers_export_config,
+        "workers_exports_config_map": workers_exports_config_map,
+        "workers_messages": workers_messages,
+        "workers_namespace-script-response": workers_namespace$$script$$response,
+        "workers_observability-2": workers_observability$$2,
+        "workers_placement_info": workers_placement_info,
+        "workers_placement_target": workers_placement_target,
+        "workers_script-response": workers_script$$response,
+        "workers_tags": workers_tags,
+        "workers_tail_consumers": workers_tail_consumers,
+        "workers_tail_consumers_script": workers_tail_consumers_script,
+        "workers_worker_export": workers_worker_export,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workers/dispatch/namespaces/${pathParam(args, "dispatch_namespace")}/scripts`,
       query: [
-        ["tags", args["tags"], true],
+        ["tags", param(args, "query", "tags"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/tools.ts b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/tools.ts
index 011b9cdf2..5d2a289e7 100644
--- a/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/tools.ts
+++ b/src/generated/forge-mcp/workersForPlatforms/dispatchNamespaces/tools.ts
@@ -3,44 +3,28 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  workers_api_response_common_failure_output,
-  workers_api_response_common_output,
-  workers_api_response_null_result_output,
-  workers_created_on_output,
-  workers_identifier_output,
-  workers_messages_output,
-  workers_modified_on_output,
+  workers_api$$response$$common,
+  workers_api$$response$$common$$failure,
+  workers_api$$response$$null$$result,
+  workers_messages,
 } from "../../outputs.js";
-import { workers_identifier } from "../../schemas.js";
 import {
-  workers_dispatch_namespace_name_output,
-  workers_namespace_list_response_output,
-  workers_namespace_response_output,
-  workers_namespace_single_response_output,
-  workers_script_count_output,
-  workers_trusted_workers_output,
-  workers_uuid_output,
+  workers_namespace$$list$$response,
+  workers_namespace$$response,
+  workers_namespace$$single$$response,
 } from "./outputs.js";
-import {
-  workers_dispatch_namespace_name,
-  workers_trusted_workers,
-} from "./schemas.js";
 
 /**
- * The tools of `workers_for_platforms.dispatch_namespaces`.
+ * The tools of `workersForPlatforms.dispatchNamespaces`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_for_platforms_dispatch_namespaces_create",
+    name: "workersForPlatforms_dispatchNamespaces_create",
     title: "Create Workers for Platforms Dispatch Namespace",
-    description: "Create a new Workers for Platforms dispatch namespace.",
+    description: "Create a new Workers for Platforms dispatch namespace.\n\nPOST /accounts/{account_id}/workers/dispatch/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "name": {
@@ -49,30 +33,34 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_namespace-single-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_namespace-single-response": workers_namespace_single_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_namespace-response": workers_namespace$$response,
+        "workers_namespace-single-response": workers_namespace$$single$$response,
       },
     },
     annotations: {
@@ -99,18 +87,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_namespace-single-response": workers_namespace_single_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_namespace-response": workers_namespace$$response,
+        "workers_namespace-single-response": workers_namespace$$single$$response,
       },
     },
     request: (args) => ({
@@ -119,36 +100,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_delete",
+    name: "workersForPlatforms_dispatchNamespaces_delete",
     title: "Delete Workers for Platforms Dispatch Namespace",
-    description: "Delete a Workers for Platforms dispatch namespace.\n\nConfirm with the user before calling this tool. This will permanently delete the Workers for Platforms dispatch namespace.",
+    description: "Delete a Workers for Platforms dispatch namespace.\n\nConfirm with the user before calling this tool. This will permanently delete the Workers for Platforms dispatch namespace.\n\nDELETE /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_api-response-null-result",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     annotations: {
@@ -175,10 +162,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_api-response-null-result": workers_api_response_null_result_output,
-        "workers_messages": workers_messages_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_api-response-null-result": workers_api$$response$$null$$result,
+        "workers_messages": workers_messages,
       },
     },
     request: (args) => ({
@@ -186,16 +173,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_edit",
+    name: "workersForPlatforms_dispatchNamespaces_edit",
     title: "Patch Workers for Platforms Dispatch Namespace",
-    description: "Patch a Workers for Platforms dispatch namespace. Omitted fields are left unchanged.",
+    description: "Patch a Workers for Platforms dispatch namespace. Omitted fields are left unchanged.\n\nPATCH /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "name": {
@@ -203,43 +186,45 @@ export const tools: readonly Tool[] = [
               "type": "string"
             },
             "trusted_workers": {
-              "$ref": "#/$defs/workers_trusted_workers",
               "default": false,
-              "description": "Whether the Workers in the namespace are executed in a \"trusted\" manner. When a Worker is trusted, it has access to the shared caches for the zone in the Cache API, and has access to the `request.cf` object on incoming Requests. When a Worker is untrusted, caches are not shared across the zone, and `request.cf` is undefined. By default, Workers in a namespace are \"untrusted\"."
+              "description": "Whether the Workers in the namespace are executed in a \"trusted\" manner. When a Worker is trusted, it has access to the shared caches for the zone in the Cache API, and has access to the `request.cf` object on incoming Requests. When a Worker is untrusted, caches are not shared across the zone, and `request.cf` is undefined. By default, Workers in a namespace are \"untrusted\".",
+              "type": "boolean"
             }
           },
           "type": "object"
         },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_trusted_workers": workers_trusted_workers,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_namespace-single-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_namespace-single-response": workers_namespace_single_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_namespace-response": workers_namespace$$response,
+        "workers_namespace-single-response": workers_namespace$$single$$response,
       },
     },
     annotations: {
@@ -269,18 +254,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_namespace-single-response": workers_namespace_single_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_namespace-response": workers_namespace$$response,
+        "workers_namespace-single-response": workers_namespace$$single$$response,
       },
     },
     request: (args) => ({
@@ -289,44 +267,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_get",
+    name: "workersForPlatforms_dispatchNamespaces_get",
     title: "Get Workers for Platforms Dispatch Namespace",
-    description: "Get a Workers for Platforms dispatch namespace.",
+    description: "Get a Workers for Platforms dispatch namespace.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace"
+        "path"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_namespace-single-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_namespace-single-response": workers_namespace_single_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_namespace-response": workers_namespace$$response,
+        "workers_namespace-single-response": workers_namespace$$single$$response,
       },
     },
     annotations: {
@@ -355,18 +332,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_namespace-single-response": workers_namespace_single_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_namespace-response": workers_namespace$$response,
+        "workers_namespace-single-response": workers_namespace$$single$$response,
       },
     },
     request: (args) => ({
@@ -374,38 +344,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_list",
+    name: "workersForPlatforms_dispatchNamespaces_list",
     title: "List Workers for Platforms Dispatch Namespaces",
-    description: "Fetch a list of Workers for Platforms dispatch namespaces.",
+    description: "Fetch a list of Workers for Platforms dispatch namespaces.\n\nGET /accounts/{account_id}/workers/dispatch/namespaces",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "workers_identifier": workers_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_namespace-list-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-list-response": workers_namespace_list_response_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_namespace-list-response": workers_namespace$$list$$response,
+        "workers_namespace-response": workers_namespace$$response,
       },
     },
     annotations: {
@@ -434,18 +404,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-list-response": workers_namespace_list_response_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_namespace-list-response": workers_namespace$$list$$response,
+        "workers_namespace-response": workers_namespace$$response,
       },
     },
     request: (args) => ({
@@ -453,16 +416,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_for_platforms_dispatch_namespaces_update",
+    name: "workersForPlatforms_dispatchNamespaces_update",
     title: "Update Workers for Platforms Dispatch Namespace",
-    description: "Update a Workers for Platforms dispatch namespace.",
+    description: "Update a Workers for Platforms dispatch namespace.\n\nPUT /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/workers_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "name": {
@@ -470,43 +429,45 @@ export const tools: readonly Tool[] = [
               "type": "string"
             },
             "trusted_workers": {
-              "$ref": "#/$defs/workers_trusted_workers",
               "default": false,
-              "description": "Whether the Workers in the namespace are executed in a \"trusted\" manner. When a Worker is trusted, it has access to the shared caches for the zone in the Cache API, and has access to the `request.cf` object on incoming Requests. When a Worker is untrusted, caches are not shared across the zone, and `request.cf` is undefined. By default, Workers in a namespace are \"untrusted\"."
+              "description": "Whether the Workers in the namespace are executed in a \"trusted\" manner. When a Worker is trusted, it has access to the shared caches for the zone in the Cache API, and has access to the `request.cf` object on incoming Requests. When a Worker is untrusted, caches are not shared across the zone, and `request.cf` is undefined. By default, Workers in a namespace are \"untrusted\".",
+              "type": "boolean"
             }
           },
           "type": "object"
         },
-        "dispatch_namespace": {
-          "$ref": "#/$defs/workers_dispatch_namespace_name",
-          "description": "Name of the Workers for Platforms dispatch namespace."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "dispatch_namespace": {
+              "description": "Name of the Workers for Platforms dispatch namespace.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dispatch_namespace"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dispatch_namespace",
+        "path",
         "body"
       ],
-      $defs: {
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name,
-        "workers_identifier": workers_identifier,
-        "workers_trusted_workers": workers_trusted_workers,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/workers_namespace-single-response",
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_namespace-single-response": workers_namespace_single_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_messages": workers_messages,
+        "workers_namespace-response": workers_namespace$$response,
+        "workers_namespace-single-response": workers_namespace$$single$$response,
       },
     },
     annotations: {
@@ -536,18 +497,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "workers_api-response-common": workers_api_response_common_output,
-        "workers_api-response-common-failure": workers_api_response_common_failure_output,
-        "workers_created_on": workers_created_on_output,
-        "workers_dispatch_namespace_name": workers_dispatch_namespace_name_output,
-        "workers_identifier": workers_identifier_output,
-        "workers_messages": workers_messages_output,
-        "workers_modified_on": workers_modified_on_output,
-        "workers_namespace-response": workers_namespace_response_output,
-        "workers_namespace-single-response": workers_namespace_single_response_output,
-        "workers_script_count": workers_script_count_output,
-        "workers_trusted_workers": workers_trusted_workers_output,
-        "workers_uuid": workers_uuid_output,
+        "workers_api-response-common": workers_api$$response$$common,
+        "workers_api-response-common-failure": workers_api$$response$$common$$failure,
+        "workers_messages": workers_messages,
+        "workers_namespace-response": workers_namespace$$response,
+        "workers_namespace-single-response": workers_namespace$$single$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workersVpc/services/outputs.ts b/src/generated/forge-mcp/workersVpc/services/outputs.ts
index a4bcee103..9ac304df8 100644
--- a/src/generated/forge-mcp/workersVpc/services/outputs.ts
+++ b/src/generated/forge-mcp/workersVpc/services/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `infra_ApiTlsSettings` in responses.
  */
-export const infra_ApiTlsSettings_output: JsonSchema = {
+export const infra_ApiTlsSettings: JsonSchema = {
   "properties": {
     "cert_verification_mode": {
       "type": "string"
@@ -41,7 +41,7 @@ export const infra_ApiTlsSettings_output: JsonSchema = {
 /**
  * The schema of `infra_ConnectivityServiceArray` in responses.
  */
-export const infra_ConnectivityServiceArray_output: JsonSchema = {
+export const infra_ConnectivityServiceArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/infra_ServiceConfig"
   },
@@ -51,7 +51,7 @@ export const infra_ConnectivityServiceArray_output: JsonSchema = {
 /**
  * The schema of `infra_DualStackHost` in responses.
  */
-export const infra_DualStackHost_output: JsonSchema = {
+export const infra_DualStackHost: JsonSchema = {
   "properties": {
     "ipv4": {
       "type": "string"
@@ -74,7 +74,7 @@ export const infra_DualStackHost_output: JsonSchema = {
 /**
  * The schema of `infra_HostnameHost` in responses.
  */
-export const infra_HostnameHost_output: JsonSchema = {
+export const infra_HostnameHost: JsonSchema = {
   "properties": {
     "hostname": {
       "type": "string"
@@ -93,7 +93,7 @@ export const infra_HostnameHost_output: JsonSchema = {
 /**
  * The schema of `infra_HttpServiceConfig` in responses.
  */
-export const infra_HttpServiceConfig_output: JsonSchema = {
+export const infra_HttpServiceConfig: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/infra_ServiceCommon"
@@ -129,7 +129,7 @@ export const infra_HttpServiceConfig_output: JsonSchema = {
 /**
  * The schema of `infra_IPv4Host` in responses.
  */
-export const infra_IPv4Host_output: JsonSchema = {
+export const infra_IPv4Host: JsonSchema = {
   "properties": {
     "ipv4": {
       "type": "string"
@@ -148,7 +148,7 @@ export const infra_IPv4Host_output: JsonSchema = {
 /**
  * The schema of `infra_IPv6Host` in responses.
  */
-export const infra_IPv6Host_output: JsonSchema = {
+export const infra_IPv6Host: JsonSchema = {
   "properties": {
     "ipv6": {
       "type": "string"
@@ -167,7 +167,7 @@ export const infra_IPv6Host_output: JsonSchema = {
 /**
  * The schema of `infra_Network` in responses.
  */
-export const infra_Network_output: JsonSchema = {
+export const infra_Network: JsonSchema = {
   "properties": {
     "tunnel_id": {
       "format": "uuid",
@@ -183,7 +183,7 @@ export const infra_Network_output: JsonSchema = {
 /**
  * The schema of `infra_ResolverNetwork` in responses.
  */
-export const infra_ResolverNetwork_output: JsonSchema = {
+export const infra_ResolverNetwork: JsonSchema = {
   "properties": {
     "resolver_ips": {
       "oneOf": [
@@ -212,7 +212,7 @@ export const infra_ResolverNetwork_output: JsonSchema = {
 /**
  * The schema of `infra_ServiceCommon` in responses.
  */
-export const infra_ServiceCommon_output: JsonSchema = {
+export const infra_ServiceCommon: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -239,7 +239,11 @@ export const infra_ServiceCommon_output: JsonSchema = {
       ]
     },
     "type": {
-      "$ref": "#/$defs/infra_ServiceType"
+      "enum": [
+        "tcp",
+        "http"
+      ],
+      "type": "string"
     },
     "updated_at": {
       "format": "date-time",
@@ -257,7 +261,7 @@ export const infra_ServiceCommon_output: JsonSchema = {
 /**
  * The schema of `infra_ServiceConfig` in responses.
  */
-export const infra_ServiceConfig_output: JsonSchema = {
+export const infra_ServiceConfig: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/infra_HttpServiceConfig"
@@ -271,7 +275,7 @@ export const infra_ServiceConfig_output: JsonSchema = {
 /**
  * The schema of `infra_ServiceHost` in responses.
  */
-export const infra_ServiceHost_output: JsonSchema = {
+export const infra_ServiceHost: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/infra_IPv4Host"
@@ -288,21 +292,10 @@ export const infra_ServiceHost_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `infra_ServiceType` in responses.
- */
-export const infra_ServiceType_output: JsonSchema = {
-  "enum": [
-    "tcp",
-    "http"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `infra_TcpServiceConfig` in responses.
  */
-export const infra_TcpServiceConfig_output: JsonSchema = {
+export const infra_TcpServiceConfig: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/infra_ServiceCommon"
diff --git a/src/generated/forge-mcp/workersVpc/services/schemas.ts b/src/generated/forge-mcp/workersVpc/services/schemas.ts
index 198d174bc..e7f713f72 100644
--- a/src/generated/forge-mcp/workersVpc/services/schemas.ts
+++ b/src/generated/forge-mcp/workersVpc/services/schemas.ts
@@ -225,7 +225,11 @@ export const infra_ServiceCommon: JsonSchema = {
       ]
     },
     "type": {
-      "$ref": "#/$defs/infra_ServiceType"
+      "enum": [
+        "tcp",
+        "http"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -270,17 +274,6 @@ export const infra_ServiceHost: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `infra_ServiceType`.
- */
-export const infra_ServiceType: JsonSchema = {
-  "enum": [
-    "tcp",
-    "http"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `infra_TcpServiceConfig`.
  */
diff --git a/src/generated/forge-mcp/workersVpc/services/tools.ts b/src/generated/forge-mcp/workersVpc/services/tools.ts
index 86f272f11..c3919f5e8 100644
--- a/src/generated/forge-mcp/workersVpc/services/tools.ts
+++ b/src/generated/forge-mcp/workersVpc/services/tools.ts
@@ -1,33 +1,17 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  infra_api_response_collection_output,
-  infra_api_response_common_failure_output,
-  infra_api_response_common_output,
-  infra_api_response_single_output,
-  infra_messages_output,
+  infra_api$$response$$collection,
+  infra_api$$response$$common,
+  infra_api$$response$$common$$failure,
+  infra_api$$response$$single,
+  infra_messages,
 } from "../../outputs.js";
-import { infra_AccountTag } from "../../schemas.js";
-import {
-  infra_ApiTlsSettings_output,
-  infra_ConnectivityServiceArray_output,
-  infra_DualStackHost_output,
-  infra_HostnameHost_output,
-  infra_HttpServiceConfig_output,
-  infra_IPv4Host_output,
-  infra_IPv6Host_output,
-  infra_Network_output,
-  infra_ResolverNetwork_output,
-  infra_ServiceCommon_output,
-  infra_ServiceConfig_output,
-  infra_ServiceHost_output,
-  infra_ServiceType_output,
-  infra_TcpServiceConfig_output,
-} from "./outputs.js";
 import {
   infra_ApiTlsSettings,
+  infra_ConnectivityServiceArray,
   infra_DualStackHost,
   infra_HostnameHost,
   infra_HttpServiceConfig,
@@ -38,48 +22,69 @@ import {
   infra_ServiceCommon,
   infra_ServiceConfig,
   infra_ServiceHost,
-  infra_ServiceType,
   infra_TcpServiceConfig,
+} from "./outputs.js";
+import {
+  infra_ApiTlsSettings as infra_ApiTlsSettings$,
+  infra_DualStackHost as infra_DualStackHost$,
+  infra_HostnameHost as infra_HostnameHost$,
+  infra_HttpServiceConfig as infra_HttpServiceConfig$,
+  infra_IPv4Host as infra_IPv4Host$,
+  infra_IPv6Host as infra_IPv6Host$,
+  infra_Network as infra_Network$,
+  infra_ResolverNetwork as infra_ResolverNetwork$,
+  infra_ServiceCommon as infra_ServiceCommon$,
+  infra_ServiceConfig as infra_ServiceConfig$,
+  infra_ServiceHost as infra_ServiceHost$,
+  infra_TcpServiceConfig as infra_TcpServiceConfig$,
 } from "./schemas.js";
 
 /**
- * The tools of `workers_vpc.services`.
+ * The tools of `workersVpc.services`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "workers_vpc_services_create",
+    name: "workersVpc_services_create",
     title: "Create Workers VPC connectivity service",
-    description: "Creates a new Workers VPC connectivity service in the account.\n\nThis method is beta.",
+    description: "Creates a new Workers VPC connectivity service in the account.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/connectivity/directory/services",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
         "body": {
           "$ref": "#/$defs/infra_ServiceConfig"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_ApiTlsSettings": infra_ApiTlsSettings,
-        "infra_DualStackHost": infra_DualStackHost,
-        "infra_HostnameHost": infra_HostnameHost,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig,
-        "infra_IPv4Host": infra_IPv4Host,
-        "infra_IPv6Host": infra_IPv6Host,
-        "infra_Network": infra_Network,
-        "infra_ResolverNetwork": infra_ResolverNetwork,
-        "infra_ServiceCommon": infra_ServiceCommon,
-        "infra_ServiceConfig": infra_ServiceConfig,
-        "infra_ServiceHost": infra_ServiceHost,
-        "infra_ServiceType": infra_ServiceType,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings$,
+        "infra_DualStackHost": infra_DualStackHost$,
+        "infra_HostnameHost": infra_HostnameHost$,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig$,
+        "infra_IPv4Host": infra_IPv4Host$,
+        "infra_IPv6Host": infra_IPv6Host$,
+        "infra_Network": infra_Network$,
+        "infra_ResolverNetwork": infra_ResolverNetwork$,
+        "infra_ServiceCommon": infra_ServiceCommon$,
+        "infra_ServiceConfig": infra_ServiceConfig$,
+        "infra_ServiceHost": infra_ServiceHost$,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig$,
       },
     },
     outputSchema: {
@@ -97,21 +102,20 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings_output,
-        "infra_DualStackHost": infra_DualStackHost_output,
-        "infra_HostnameHost": infra_HostnameHost_output,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig_output,
-        "infra_IPv4Host": infra_IPv4Host_output,
-        "infra_IPv6Host": infra_IPv6Host_output,
-        "infra_Network": infra_Network_output,
-        "infra_ResolverNetwork": infra_ResolverNetwork_output,
-        "infra_ServiceCommon": infra_ServiceCommon_output,
-        "infra_ServiceConfig": infra_ServiceConfig_output,
-        "infra_ServiceHost": infra_ServiceHost_output,
-        "infra_ServiceType": infra_ServiceType_output,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings,
+        "infra_DualStackHost": infra_DualStackHost,
+        "infra_HostnameHost": infra_HostnameHost,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig,
+        "infra_IPv4Host": infra_IPv4Host,
+        "infra_IPv6Host": infra_IPv6Host,
+        "infra_Network": infra_Network,
+        "infra_ResolverNetwork": infra_ResolverNetwork,
+        "infra_ServiceCommon": infra_ServiceCommon,
+        "infra_ServiceConfig": infra_ServiceConfig,
+        "infra_ServiceHost": infra_ServiceHost,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -145,22 +149,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings_output,
-        "infra_DualStackHost": infra_DualStackHost_output,
-        "infra_HostnameHost": infra_HostnameHost_output,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig_output,
-        "infra_IPv4Host": infra_IPv4Host_output,
-        "infra_IPv6Host": infra_IPv6Host_output,
-        "infra_Network": infra_Network_output,
-        "infra_ResolverNetwork": infra_ResolverNetwork_output,
-        "infra_ServiceCommon": infra_ServiceCommon_output,
-        "infra_ServiceConfig": infra_ServiceConfig_output,
-        "infra_ServiceHost": infra_ServiceHost_output,
-        "infra_ServiceType": infra_ServiceType_output,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings,
+        "infra_DualStackHost": infra_DualStackHost,
+        "infra_HostnameHost": infra_HostnameHost,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig,
+        "infra_IPv4Host": infra_IPv4Host,
+        "infra_IPv6Host": infra_IPv6Host,
+        "infra_Network": infra_Network,
+        "infra_ResolverNetwork": infra_ResolverNetwork,
+        "infra_ServiceCommon": infra_ServiceCommon,
+        "infra_ServiceConfig": infra_ServiceConfig,
+        "infra_ServiceHost": infra_ServiceHost,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
@@ -169,24 +172,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_vpc_services_delete",
+    name: "workersVpc_services_delete",
     title: "Delete Workers VPC connectivity service",
-    description: "Removes a single Workers VPC connectivity service by its ID. Any Worker\nbindings referencing this service will stop working.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes a Workers VPC connectivity service.",
+    description: "Removes a single Workers VPC connectivity service by its ID. Any Worker\nbindings referencing this service will stop working.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. This operation permanently deletes a Workers VPC connectivity service.\n\nDELETE /accounts/{account_id}/connectivity/directory/services/{service_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "service_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "service_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "service_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "service_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -205,8 +218,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_messages": infra_messages_output,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
@@ -214,24 +227,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_vpc_services_get",
+    name: "workersVpc_services_get",
     title: "Get Workers VPC connectivity service",
-    description: "Fetches a single Workers VPC connectivity service by its ID.\n\nThis method is beta.",
+    description: "Fetches a single Workers VPC connectivity service by its ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/connectivity/directory/services/{service_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "service_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "service_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "service_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "service_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -248,21 +271,20 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings_output,
-        "infra_DualStackHost": infra_DualStackHost_output,
-        "infra_HostnameHost": infra_HostnameHost_output,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig_output,
-        "infra_IPv4Host": infra_IPv4Host_output,
-        "infra_IPv6Host": infra_IPv6Host_output,
-        "infra_Network": infra_Network_output,
-        "infra_ResolverNetwork": infra_ResolverNetwork_output,
-        "infra_ServiceCommon": infra_ServiceCommon_output,
-        "infra_ServiceConfig": infra_ServiceConfig_output,
-        "infra_ServiceHost": infra_ServiceHost_output,
-        "infra_ServiceType": infra_ServiceType_output,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings,
+        "infra_DualStackHost": infra_DualStackHost,
+        "infra_HostnameHost": infra_HostnameHost,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig,
+        "infra_IPv4Host": infra_IPv4Host,
+        "infra_IPv6Host": infra_IPv6Host,
+        "infra_Network": infra_Network,
+        "infra_ResolverNetwork": infra_ResolverNetwork,
+        "infra_ServiceCommon": infra_ServiceCommon,
+        "infra_ServiceConfig": infra_ServiceConfig,
+        "infra_ServiceHost": infra_ServiceHost,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -296,22 +318,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings_output,
-        "infra_DualStackHost": infra_DualStackHost_output,
-        "infra_HostnameHost": infra_HostnameHost_output,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig_output,
-        "infra_IPv4Host": infra_IPv4Host_output,
-        "infra_IPv6Host": infra_IPv6Host_output,
-        "infra_Network": infra_Network_output,
-        "infra_ResolverNetwork": infra_ResolverNetwork_output,
-        "infra_ServiceCommon": infra_ServiceCommon_output,
-        "infra_ServiceConfig": infra_ServiceConfig_output,
-        "infra_ServiceHost": infra_ServiceHost_output,
-        "infra_ServiceType": infra_ServiceType_output,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings,
+        "infra_DualStackHost": infra_DualStackHost,
+        "infra_HostnameHost": infra_HostnameHost,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig,
+        "infra_IPv4Host": infra_IPv4Host,
+        "infra_IPv6Host": infra_IPv6Host,
+        "infra_Network": infra_Network,
+        "infra_ResolverNetwork": infra_ResolverNetwork,
+        "infra_ServiceCommon": infra_ServiceCommon,
+        "infra_ServiceConfig": infra_ServiceConfig,
+        "infra_ServiceHost": infra_ServiceHost,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
@@ -319,44 +340,60 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "workers_vpc_services_list",
+    name: "workersVpc_services_list",
     title: "List Workers VPC connectivity services",
-    description: "Lists the Workers VPC connectivity services in the account.\n\nThis method is beta.",
+    description: "Lists the Workers VPC connectivity services in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/connectivity/directory/services",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page in the response",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 1000,
-          "description": "Max amount of entries returned per page",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "type": {
-          "oneOf": [
-            {
-              "$ref": "#/$defs/infra_ServiceType"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Current page in the response",
+              "type": "integer"
             },
-            {
-              "type": "null"
+            "per_page": {
+              "default": 1000,
+              "description": "Max amount of entries returned per page",
+              "type": "integer"
+            },
+            "type": {
+              "oneOf": [
+                {
+                  "enum": [
+                    "tcp",
+                    "http"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
-          ]
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_ServiceType": infra_ServiceType,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -373,23 +410,22 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings_output,
-        "infra_ConnectivityServiceArray": infra_ConnectivityServiceArray_output,
-        "infra_DualStackHost": infra_DualStackHost_output,
-        "infra_HostnameHost": infra_HostnameHost_output,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig_output,
-        "infra_IPv4Host": infra_IPv4Host_output,
-        "infra_IPv6Host": infra_IPv6Host_output,
-        "infra_Network": infra_Network_output,
-        "infra_ResolverNetwork": infra_ResolverNetwork_output,
-        "infra_ServiceCommon": infra_ServiceCommon_output,
-        "infra_ServiceConfig": infra_ServiceConfig_output,
-        "infra_ServiceHost": infra_ServiceHost_output,
-        "infra_ServiceType": infra_ServiceType_output,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig_output,
-        "infra_api-response-collection": infra_api_response_collection_output,
-        "infra_api-response-common": infra_api_response_common_output,
-        "infra_messages": infra_messages_output,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings,
+        "infra_ConnectivityServiceArray": infra_ConnectivityServiceArray,
+        "infra_DualStackHost": infra_DualStackHost,
+        "infra_HostnameHost": infra_HostnameHost,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig,
+        "infra_IPv4Host": infra_IPv4Host,
+        "infra_IPv6Host": infra_IPv6Host,
+        "infra_Network": infra_Network,
+        "infra_ResolverNetwork": infra_ResolverNetwork,
+        "infra_ServiceCommon": infra_ServiceCommon,
+        "infra_ServiceConfig": infra_ServiceConfig,
+        "infra_ServiceHost": infra_ServiceHost,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_api-response-collection": infra_api$$response$$collection,
+        "infra_api-response-common": infra_api$$response$$common,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -423,72 +459,80 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings_output,
-        "infra_ConnectivityServiceArray": infra_ConnectivityServiceArray_output,
-        "infra_DualStackHost": infra_DualStackHost_output,
-        "infra_HostnameHost": infra_HostnameHost_output,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig_output,
-        "infra_IPv4Host": infra_IPv4Host_output,
-        "infra_IPv6Host": infra_IPv6Host_output,
-        "infra_Network": infra_Network_output,
-        "infra_ResolverNetwork": infra_ResolverNetwork_output,
-        "infra_ServiceCommon": infra_ServiceCommon_output,
-        "infra_ServiceConfig": infra_ServiceConfig_output,
-        "infra_ServiceHost": infra_ServiceHost_output,
-        "infra_ServiceType": infra_ServiceType_output,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig_output,
-        "infra_api-response-collection": infra_api_response_collection_output,
-        "infra_api-response-common": infra_api_response_common_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_messages": infra_messages_output,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings,
+        "infra_ConnectivityServiceArray": infra_ConnectivityServiceArray,
+        "infra_DualStackHost": infra_DualStackHost,
+        "infra_HostnameHost": infra_HostnameHost,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig,
+        "infra_IPv4Host": infra_IPv4Host,
+        "infra_IPv6Host": infra_IPv6Host,
+        "infra_Network": infra_Network,
+        "infra_ResolverNetwork": infra_ResolverNetwork,
+        "infra_ServiceCommon": infra_ServiceCommon,
+        "infra_ServiceConfig": infra_ServiceConfig,
+        "infra_ServiceHost": infra_ServiceHost,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_api-response-collection": infra_api$$response$$collection,
+        "infra_api-response-common": infra_api$$response$$common,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/connectivity/directory/services`,
       query: [
-        ["type", args["type"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["type", param(args, "query", "type"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "workers_vpc_services_update",
+    name: "workersVpc_services_update",
     title: "Update Workers VPC connectivity service",
-    description: "Updates an existing Workers VPC connectivity service by its ID.\n\nThis method is beta.",
+    description: "Updates an existing Workers VPC connectivity service by its ID.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/connectivity/directory/services/{service_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/infra_ServiceConfig"
         },
-        "service_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "service_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "service_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "service_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings,
-        "infra_DualStackHost": infra_DualStackHost,
-        "infra_HostnameHost": infra_HostnameHost,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig,
-        "infra_IPv4Host": infra_IPv4Host,
-        "infra_IPv6Host": infra_IPv6Host,
-        "infra_Network": infra_Network,
-        "infra_ResolverNetwork": infra_ResolverNetwork,
-        "infra_ServiceCommon": infra_ServiceCommon,
-        "infra_ServiceConfig": infra_ServiceConfig,
-        "infra_ServiceHost": infra_ServiceHost,
-        "infra_ServiceType": infra_ServiceType,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings$,
+        "infra_DualStackHost": infra_DualStackHost$,
+        "infra_HostnameHost": infra_HostnameHost$,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig$,
+        "infra_IPv4Host": infra_IPv4Host$,
+        "infra_IPv6Host": infra_IPv6Host$,
+        "infra_Network": infra_Network$,
+        "infra_ResolverNetwork": infra_ResolverNetwork$,
+        "infra_ServiceCommon": infra_ServiceCommon$,
+        "infra_ServiceConfig": infra_ServiceConfig$,
+        "infra_ServiceHost": infra_ServiceHost$,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig$,
       },
     },
     outputSchema: {
@@ -506,21 +550,20 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings_output,
-        "infra_DualStackHost": infra_DualStackHost_output,
-        "infra_HostnameHost": infra_HostnameHost_output,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig_output,
-        "infra_IPv4Host": infra_IPv4Host_output,
-        "infra_IPv6Host": infra_IPv6Host_output,
-        "infra_Network": infra_Network_output,
-        "infra_ResolverNetwork": infra_ResolverNetwork_output,
-        "infra_ServiceCommon": infra_ServiceCommon_output,
-        "infra_ServiceConfig": infra_ServiceConfig_output,
-        "infra_ServiceHost": infra_ServiceHost_output,
-        "infra_ServiceType": infra_ServiceType_output,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings,
+        "infra_DualStackHost": infra_DualStackHost,
+        "infra_HostnameHost": infra_HostnameHost,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig,
+        "infra_IPv4Host": infra_IPv4Host,
+        "infra_IPv6Host": infra_IPv6Host,
+        "infra_Network": infra_Network,
+        "infra_ResolverNetwork": infra_ResolverNetwork,
+        "infra_ServiceCommon": infra_ServiceCommon,
+        "infra_ServiceConfig": infra_ServiceConfig,
+        "infra_ServiceHost": infra_ServiceHost,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -554,22 +597,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_ApiTlsSettings": infra_ApiTlsSettings_output,
-        "infra_DualStackHost": infra_DualStackHost_output,
-        "infra_HostnameHost": infra_HostnameHost_output,
-        "infra_HttpServiceConfig": infra_HttpServiceConfig_output,
-        "infra_IPv4Host": infra_IPv4Host_output,
-        "infra_IPv6Host": infra_IPv6Host_output,
-        "infra_Network": infra_Network_output,
-        "infra_ResolverNetwork": infra_ResolverNetwork_output,
-        "infra_ServiceCommon": infra_ServiceCommon_output,
-        "infra_ServiceConfig": infra_ServiceConfig_output,
-        "infra_ServiceHost": infra_ServiceHost_output,
-        "infra_ServiceType": infra_ServiceType_output,
-        "infra_TcpServiceConfig": infra_TcpServiceConfig_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_ApiTlsSettings": infra_ApiTlsSettings,
+        "infra_DualStackHost": infra_DualStackHost,
+        "infra_HostnameHost": infra_HostnameHost,
+        "infra_HttpServiceConfig": infra_HttpServiceConfig,
+        "infra_IPv4Host": infra_IPv4Host,
+        "infra_IPv6Host": infra_IPv6Host,
+        "infra_Network": infra_Network,
+        "infra_ResolverNetwork": infra_ResolverNetwork,
+        "infra_ServiceCommon": infra_ServiceCommon,
+        "infra_ServiceConfig": infra_ServiceConfig,
+        "infra_ServiceHost": infra_ServiceHost,
+        "infra_TcpServiceConfig": infra_TcpServiceConfig,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/workflows/concurrency/tools.ts b/src/generated/forge-mcp/workflows/concurrency/tools.ts
index f4f34238c..adc0d99be 100644
--- a/src/generated/forge-mcp/workflows/concurrency/tools.ts
+++ b/src/generated/forge-mcp/workflows/concurrency/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `workflows.concurrency`.
@@ -10,13 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_concurrency_create",
     title: "Create a concurrency key",
-    description: "Creates an account-scoped concurrency key. Limits count steps still in flight from a previously deleted key of the same name.\n\nThis method is beta.",
+    description: "Creates an account-scoped concurrency key. Limits count steps still in flight from a previously deleted key of the same name.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/workflows/concurrency",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "limit": {
@@ -33,12 +30,25 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -424,23 +434,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_concurrency_delete",
     title: "Delete a concurrency key",
-    description: "Deletes a concurrency key. Fails while any workflow’s latest version references the key. The key disappears immediately, but steps already holding it keep their slots until they finish and still count against a key re-created with the same name.\n\nThis method is beta.",
+    description: "Deletes a concurrency key. Fails while any workflow’s latest version references the key. The key disappears immediately, but steps already holding it keep their slots until they finish and still count against a key re-created with the same name.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/workflows/concurrency/{key_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "key_id": {
-          "description": "Identifier of the concurrency key.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "key_id": {
+              "description": "Identifier of the concurrency key.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "key_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "key_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -869,13 +889,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_concurrency_edit",
     title: "Update a concurrency key",
-    description: "Updates the limit of a concurrency key. Applies to instances that start after the change.\n\nThis method is beta.",
+    description: "Updates the limit of a concurrency key. Applies to instances that start after the change.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/workflows/concurrency/{key_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "limit": {
@@ -888,17 +905,30 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "key_id": {
-          "description": "Identifier of the concurrency key.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "key_id": {
+              "description": "Identifier of the concurrency key.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "key_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "key_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1284,23 +1314,33 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_concurrency_get",
     title: "Get concurrency key details",
-    description: "Retrieves a concurrency key and the workflows whose latest version references it.\n\nThis method is beta.",
+    description: "Retrieves a concurrency key and the workflows whose latest version references it.\n\nThis method is beta.\n\nGET /accounts/{account_id}/workflows/concurrency/{key_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "key_id": {
-          "description": "Identifier of the concurrency key.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "key_id": {
+              "description": "Identifier of the concurrency key.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "key_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "key_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1727,25 +1767,41 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_concurrency_list",
     title: "List concurrency keys",
-    description: "Lists the account-scoped concurrency keys.\n\nThis method is beta.",
+    description: "Lists the account-scoped concurrency keys.\n\nThis method is beta.\n\nGET /accounts/{account_id}/workflows/concurrency",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 10,
-          "type": "number"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "number"
+            },
+            "per_page": {
+              "default": 10,
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2090,8 +2146,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workflows/concurrency`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workflows/instances/batch/tools.ts b/src/generated/forge-mcp/workflows/instances/batch/tools.ts
index 197c12f91..fb6972054 100644
--- a/src/generated/forge-mcp/workflows/instances/batch/tools.ts
+++ b/src/generated/forge-mcp/workflows/instances/batch/tools.ts
@@ -10,13 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_batch_create",
     title: "Batch create new Workflow instances",
-    description: "Creates multiple workflow instances in a single batch operation.",
+    description: "Creates multiple workflow instances in a single batch operation.\n\nPOST /accounts/{account_id}/workflows/{workflow_name}/instances/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "items": {
             "properties": {
@@ -78,15 +75,28 @@ export const tools: readonly Tool[] = [
           "minItems": 1,
           "type": "array"
         },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/workflows/instances/events/tools.ts b/src/generated/forge-mcp/workflows/instances/events/tools.ts
index 6955bae40..35bda1322 100644
--- a/src/generated/forge-mcp/workflows/instances/events/tools.ts
+++ b/src/generated/forge-mcp/workflows/instances/events/tools.ts
@@ -10,34 +10,44 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_events_send",
     title: "Send event to instance",
-    description: "Sends an event to a running workflow instance to trigger state transitions.",
+    description: "Sends an event to a running workflow instance to trigger state transitions.\n\nPOST /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/events/{event_type}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "type": "object"
         },
-        "event_type": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "event_type": {
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "instance_id",
+            "event_type"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "instance_id",
-        "event_type",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/workflows/instances/step/tools.ts b/src/generated/forge-mcp/workflows/instances/step/tools.ts
index 9b6e43c56..206d6f8ad 100644
--- a/src/generated/forge-mcp/workflows/instances/step/tools.ts
+++ b/src/generated/forge-mcp/workflows/instances/step/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 
 /**
  * The tools of `workflows.instances.step`.
@@ -10,44 +10,63 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_step_get",
     title: "Get full step output from instance",
-    description: "Retrieves the full, untruncated output for a specific step on a workflow instance. Returns a flat status-shaped JSON body with step `status` ('running' | 'waiting' | 'complete' | 'errored'), `error` (nullable), and `output` (the step value, or null while running/waiting/errored). When the step returned a ReadableStream from step.do, the response is served as 'application/octet-stream' with the raw bytes as the body instead of JSON. A `status='running'` response with non-null `error` indicates the step is currently retrying after a prior attempt failed.",
+    description: "Retrieves the full, untruncated output for a specific step on a workflow instance. Returns a flat status-shaped JSON body with step `status` ('running' | 'waiting' | 'complete' | 'errored'), `error` (nullable), and `output` (the step value, or null while running/waiting/errored). When the step returned a ReadableStream from step.do, the response is served as 'application/octet-stream' with the raw bytes as the body instead of JSON. A `status='running'` response with non-null `error` indicates the step is currently retrying after a prior attempt failed.\n\nGET /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/step",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "attempt": {
-          "description": "Specific attempt number to retrieve output or error for.",
-          "type": "integer"
-        },
-        "instance_id": {
-          "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
-          "type": "string"
-        },
-        "name": {
-          "description": "Exact step name from the instance logs response, including the generated counter suffix.",
-          "type": "string"
-        },
-        "type": {
-          "description": "Step type to disambiguate step.do and waitForEvent entries that share the same name.",
-          "enum": [
-            "step",
-            "waitForEvent"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "instance_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "workflow_name": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "attempt": {
+              "description": "Specific attempt number to retrieve output or error for.",
+              "type": "integer"
+            },
+            "name": {
+              "description": "Exact step name from the instance logs response, including the generated counter suffix.",
+              "type": "string"
+            },
+            "type": {
+              "description": "Step type to disambiguate step.do and waitForEvent entries that share the same name.",
+              "enum": [
+                "step",
+                "waitForEvent"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "name",
+            "type"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "instance_id",
-        "name",
-        "type"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -526,9 +545,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workflows/${pathParam(args, "workflow_name")}/instances/${pathParam(args, "instance_id")}/step`,
       query: [
-        ["name", args["name"], true],
-        ["type", args["type"], true],
-        ["attempt", args["attempt"], true],
+        ["name", param(args, "query", "name"), true],
+        ["type", param(args, "query", "type"), true],
+        ["attempt", param(args, "query", "attempt"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workflows/instances/tools.ts b/src/generated/forge-mcp/workflows/instances/tools.ts
index 3e71c616f..acce9db0a 100644
--- a/src/generated/forge-mcp/workflows/instances/tools.ts
+++ b/src/generated/forge-mcp/workflows/instances/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `workflows.instances`.
@@ -10,13 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_create",
     title: "Create a new workflow instance",
-    description: "Creates a new instance of a workflow, starting its execution.",
+    description: "Creates a new instance of a workflow, starting its execution.\n\nPOST /accounts/{account_id}/workflows/{workflow_name}/instances",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "instance_id": {
@@ -73,15 +70,28 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -472,26 +482,36 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_delete",
     title: "Delete a workflow instance",
-    description: "Deletes a workflow instance and its stored state.",
+    description: "Deletes a workflow instance and its stored state.\n\nDELETE /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "instance_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -770,44 +790,60 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_get",
     title: "Get logs and status from instance",
-    description: "Retrieves logs and execution status for a specific workflow instance.",
+    description: "Retrieves logs and execution status for a specific workflow instance.\n\nGET /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
-          "type": "string"
-        },
-        "order": {
-          "default": "asc",
-          "description": "Step ordering: \"asc\" (default, oldest first) or \"desc\" (newest first).",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "simple": {
-          "default": "false",
-          "description": "When true, omits step details and returns only metadata with step_count.",
-          "enum": [
-            "true",
-            "false"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "instance_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "workflow_name": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "order": {
+              "default": "asc",
+              "description": "Step ordering: \"asc\" (default, oldest first) or \"desc\" (newest first).",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "simple": {
+              "default": "false",
+              "description": "When true, omits step details and returns only metadata with step_count.",
+              "enum": [
+                "true",
+                "false"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2126,73 +2162,89 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workflows/${pathParam(args, "workflow_name")}/instances/${pathParam(args, "instance_id")}`,
       query: [
-        ["simple", args["simple"], true],
-        ["order", args["order"], true],
+        ["simple", param(args, "query", "simple"), true],
+        ["order", param(args, "query", "order"), true],
       ],
     }),
   },
   {
     name: "workflows_instances_list",
     title: "List of workflow instances",
-    description: "Lists all instances of a workflow with their execution status.",
+    description: "Lists all instances of a workflow with their execution status.\n\nGET /accounts/{account_id}/workflows/{workflow_name}/instances",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque token for cursor-based pagination. Mutually exclusive with `page`.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Defines the direction for cursor-based pagination.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "end": {
-          "description": "Accepts ISO 8601 with no timezone offsets and in UTC.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "page": {
-          "description": "Deprecated: use `cursor` for pagination instead.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 50,
-          "type": "number"
-        },
-        "start": {
-          "description": "Accepts ISO 8601 with no timezone offsets and in UTC.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "status": {
-          "enum": [
-            "queued",
-            "running",
-            "paused",
-            "errored",
-            "terminated",
-            "complete",
-            "waitingForPause",
-            "waiting",
-            "rollingBack"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "workflow_name": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token for cursor-based pagination. Mutually exclusive with `page`.",
+              "type": "string"
+            },
+            "date_end": {
+              "description": "Accepts ISO 8601 with no timezone offsets and in UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "date_start": {
+              "description": "Accepts ISO 8601 with no timezone offsets and in UTC.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Defines the direction for cursor-based pagination.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Deprecated: use `cursor` for pagination instead.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 50,
+              "type": "number"
+            },
+            "status": {
+              "enum": [
+                "queued",
+                "running",
+                "paused",
+                "errored",
+                "terminated",
+                "complete",
+                "waitingForPause",
+                "waiting",
+                "rollingBack"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2647,26 +2699,23 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workflows/${pathParam(args, "workflow_name")}/instances`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["cursor", args["cursor"], true],
-        ["direction", args["direction"], true],
-        ["status", args["status"], true],
-        ["date_start", args["start"], true],
-        ["date_end", args["end"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["status", param(args, "query", "status"), true],
+        ["date_start", param(args, "query", "date_start"), true],
+        ["date_end", param(args, "query", "date_end"), true],
       ],
     }),
   },
   {
     name: "workflows_instances_pause",
     title: "Change status of instance",
-    description: "Changes the execution status of a workflow instance (e.g., pause, resume, terminate).",
+    description: "Changes the execution status of a workflow instance (e.g., pause, resume, terminate).\n\nPATCH /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "oneOf": [
             {
@@ -2754,20 +2803,33 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "instance_id": {
-          "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "instance_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "instance_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3154,13 +3216,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_restart",
     title: "Change status of instance",
-    description: "Changes the execution status of a workflow instance (e.g., pause, resume, terminate).",
+    description: "Changes the execution status of a workflow instance (e.g., pause, resume, terminate).\n\nPATCH /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "oneOf": [
             {
@@ -3248,20 +3307,33 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "instance_id": {
-          "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "instance_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "instance_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -3645,13 +3717,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_resume",
     title: "Change status of instance",
-    description: "Changes the execution status of a workflow instance (e.g., pause, resume, terminate).",
+    description: "Changes the execution status of a workflow instance (e.g., pause, resume, terminate).\n\nPATCH /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "oneOf": [
             {
@@ -3739,20 +3808,33 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "instance_id": {
-          "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "instance_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "instance_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -4139,13 +4221,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_instances_terminate",
     title: "Change status of instance",
-    description: "Changes the execution status of a workflow instance (e.g., pause, resume, terminate).\n\nConfirm with the user before calling this tool. This operation terminates the running Workflow instance.",
+    description: "Changes the execution status of a workflow instance (e.g., pause, resume, terminate).\n\nConfirm with the user before calling this tool. This operation terminates the running Workflow instance.\n\nPATCH /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "oneOf": [
             {
@@ -4233,20 +4312,33 @@ export const tools: readonly Tool[] = [
             }
           ]
         },
-        "instance_id": {
-          "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "Instance identifier. User-created instances match `^[a-zA-Z0-9_][a-zA-Z0-9-_]*$` (max 100 characters); cron-triggered instances can use a longer, system-generated id derived from the cron expression.",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "instance_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "instance_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/workflows/settings/tools.ts b/src/generated/forge-mcp/workflows/settings/tools.ts
index 4c5158f22..5e6459567 100644
--- a/src/generated/forge-mcp/workflows/settings/tools.ts
+++ b/src/generated/forge-mcp/workflows/settings/tools.ts
@@ -10,13 +10,10 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_settings_edit",
     title: "Update account settings",
-    description: "Updates only the account-level Workflows settings fields present in the request body.",
+    description: "Updates only the account-level Workflows settings fields present in the request body.\n\nPATCH /accounts/{account_id}/workflows/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "properties": {
             "default_retention": {
@@ -49,12 +46,25 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -334,17 +344,27 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_settings_get",
     title: "Get account settings",
-    description: "Retrieves account-level Workflows settings, such as the default instance retention.",
+    description: "Retrieves account-level Workflows settings, such as the default instance retention.\n\nGET /accounts/{account_id}/workflows/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
diff --git a/src/generated/forge-mcp/workflows/tools.ts b/src/generated/forge-mcp/workflows/tools.ts
index d6fa6aa74..00b4c18f2 100644
--- a/src/generated/forge-mcp/workflows/tools.ts
+++ b/src/generated/forge-mcp/workflows/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 
 /**
  * The tools of `workflows`.
@@ -10,21 +10,31 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_delete",
     title: "Deletes a Workflow",
-    description: "Deletes a Workflow. This only deletes the Workflow and does not delete or modify any Worker associated to this Workflow or bounded to it.\n\nConfirm with the user before calling this tool. This operation permanently deletes the Workflow.",
+    description: "Deletes a Workflow. This only deletes the Workflow and does not delete or modify any Worker associated to this Workflow or bounded to it.\n\nConfirm with the user before calling this tool. This operation permanently deletes the Workflow.\n\nDELETE /accounts/{account_id}/workflows/{workflow_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -365,21 +375,31 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_get",
     title: "Get Workflow details",
-    description: "Retrieves configuration and metadata for a specific workflow.",
+    description: "Retrieves configuration and metadata for a specific workflow.\n\nGET /accounts/{account_id}/workflows/{workflow_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -850,29 +870,45 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_list",
     title: "List all Workflows",
-    description: "Lists all workflows configured for the account.",
+    description: "Lists all workflows configured for the account.\n\nGET /accounts/{account_id}/workflows",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "number"
-        },
-        "per_page": {
-          "default": 10,
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Allows filtering workflows` name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "number"
+            },
+            "per_page": {
+              "default": 10,
+              "type": "number"
+            },
+            "search": {
+              "description": "Allows filtering workflows` name.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -1301,9 +1337,9 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workflows`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
-        ["search", args["search"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/workflows/versions/tools.ts b/src/generated/forge-mcp/workflows/versions/tools.ts
index 5a4dd6442..dbd00585a 100644
--- a/src/generated/forge-mcp/workflows/versions/tools.ts
+++ b/src/generated/forge-mcp/workflows/versions/tools.ts
@@ -1,7 +1,7 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 
 /**
  * The tools of `workflows.versions`.
@@ -10,26 +10,36 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_versions_get",
     title: "Get Workflow version details",
-    description: "Retrieves details for a specific deployed workflow version.",
+    description: "Retrieves details for a specific deployed workflow version.\n\nGET /accounts/{account_id}/workflows/{workflow_name}/versions/{version_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "version_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "version_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "version_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "version_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -462,26 +472,36 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_versions_graph",
     title: "Get Workflow version graph",
-    description: "Retrieves the graph visualization of a workflow version.",
+    description: "Retrieves the graph visualization of a workflow version.\n\nGET /accounts/{account_id}/workflows/{workflow_name}/versions/{version_id}/graph",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "version_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "workflow_name": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "version_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name",
+            "version_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name",
-        "version_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2338,29 +2358,45 @@ export const tools: readonly Tool[] = [
   {
     name: "workflows_versions_list",
     title: "List deployed Workflow versions",
-    description: "Lists all deployed versions of a workflow.",
+    description: "Lists all deployed versions of a workflow.\n\nGET /accounts/{account_id}/workflows/{workflow_name}/versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "type": "number"
-        },
-        "per_page": {
-          "default": 50,
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "workflow_name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workflow_name"
+          ],
+          "type": "object"
         },
-        "workflow_name": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "type": "number"
+            },
+            "per_page": {
+              "default": 50,
+              "type": "number"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workflow_name"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -2751,8 +2787,8 @@ export const tools: readonly Tool[] = [
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/workflows/${pathParam(args, "workflow_name")}/versions`,
       query: [
-        ["per_page", args["per_page"], true],
-        ["page", args["page"], true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["page", param(args, "query", "page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zaraz/config/schemas.ts b/src/generated/forge-mcp/zaraz/config/schemas.ts
index 9e742b84c..10d43a101 100644
--- a/src/generated/forge-mcp/zaraz/config/schemas.ts
+++ b/src/generated/forge-mcp/zaraz/config/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `zaraz_zaraz-config-body`.
  */
-export const zaraz_zaraz_config_body: JsonSchema = {
+export const zaraz_zaraz$$config$$body: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_zaraz-config-base"
diff --git a/src/generated/forge-mcp/zaraz/config/tools.ts b/src/generated/forge-mcp/zaraz/config/tools.ts
index 6a2cf1127..d198e53ba 100644
--- a/src/generated/forge-mcp/zaraz/config/tools.ts
+++ b/src/generated/forge-mcp/zaraz/config/tools.ts
@@ -3,46 +3,45 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  zaraz_api_response_common_failure_output,
-  zaraz_api_response_common_output,
-  zaraz_base_mc_output,
-  zaraz_base_tool_output,
-  zaraz_click_listener_rule_output,
-  zaraz_custom_managed_component_output,
-  zaraz_element_visibility_rule_output,
-  zaraz_form_submission_rule_output,
-  zaraz_load_rule_output,
-  zaraz_managed_component_output,
-  zaraz_messages_output,
-  zaraz_scroll_depth_rule_output,
-  zaraz_secret_variable_output,
-  zaraz_string_variable_output,
-  zaraz_timer_rule_output,
-  zaraz_variable_match_rule_output,
-  zaraz_worker_variable_output,
-  zaraz_zaraz_config_base_output,
-  zaraz_zaraz_config_response_output,
-  zaraz_zaraz_config_return_output,
-} from "../outputs.js";
-import {
-  zaraz_base_mc,
-  zaraz_base_tool,
-  zaraz_click_listener_rule,
-  zaraz_custom_managed_component,
-  zaraz_element_visibility_rule,
-  zaraz_form_submission_rule,
-  zaraz_identifier,
-  zaraz_load_rule,
-  zaraz_managed_component,
-  zaraz_scroll_depth_rule,
+  zaraz_api$$response$$common,
+  zaraz_api$$response$$common$$failure,
+  zaraz_base$$mc,
+  zaraz_base$$tool,
+  zaraz_click$$listener$$rule,
+  zaraz_custom$$managed$$component,
+  zaraz_element$$visibility$$rule,
+  zaraz_form$$submission$$rule,
+  zaraz_load$$rule,
+  zaraz_managed$$component,
+  zaraz_messages,
+  zaraz_scroll$$depth$$rule,
   zaraz_secret_variable,
   zaraz_string_variable,
-  zaraz_timer_rule,
-  zaraz_variable_match_rule,
+  zaraz_timer$$rule,
+  zaraz_variable$$match$$rule,
   zaraz_worker_variable,
-  zaraz_zaraz_config_base,
+  zaraz_zaraz$$config$$base,
+  zaraz_zaraz$$config$$response,
+  zaraz_zaraz$$config$$return,
+} from "../outputs.js";
+import {
+  zaraz_base$$mc as zaraz_base$$mc$,
+  zaraz_base$$tool as zaraz_base$$tool$,
+  zaraz_click$$listener$$rule as zaraz_click$$listener$$rule$,
+  zaraz_custom$$managed$$component as zaraz_custom$$managed$$component$,
+  zaraz_element$$visibility$$rule as zaraz_element$$visibility$$rule$,
+  zaraz_form$$submission$$rule as zaraz_form$$submission$$rule$,
+  zaraz_load$$rule as zaraz_load$$rule$,
+  zaraz_managed$$component as zaraz_managed$$component$,
+  zaraz_scroll$$depth$$rule as zaraz_scroll$$depth$$rule$,
+  zaraz_secret_variable as zaraz_secret_variable$,
+  zaraz_string_variable as zaraz_string_variable$,
+  zaraz_timer$$rule as zaraz_timer$$rule$,
+  zaraz_variable$$match$$rule as zaraz_variable$$match$$rule$,
+  zaraz_worker_variable as zaraz_worker_variable$,
+  zaraz_zaraz$$config$$base as zaraz_zaraz$$config$$base$,
 } from "../schemas.js";
-import { zaraz_zaraz_config_body } from "./schemas.js";
+import { zaraz_zaraz$$config$$body } from "./schemas.js";
 
 /**
  * The tools of `zaraz.config`.
@@ -51,44 +50,51 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_config_get",
     title: "Get Zaraz configuration",
-    description: "Gets latest Zaraz configuration for a zone. It can be preview or published configuration, whichever was the last updated. Secret variables values will not be included.",
+    description: "Gets latest Zaraz configuration for a zone. It can be preview or published configuration, whichever was the last updated. Secret variables values will not be included.\n\nGET /zones/{zone_id}/settings/zaraz/config",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-config-response",
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-response": zaraz_zaraz_config_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-response": zaraz_zaraz$$config$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     annotations: {
@@ -117,26 +123,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-response": zaraz_zaraz_config_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-response": zaraz_zaraz$$config$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     request: (args) => ({
@@ -146,64 +152,73 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_config_update",
     title: "Update Zaraz configuration",
-    description: "Updates Zaraz configuration for a zone.",
+    description: "Updates Zaraz configuration for a zone.\n\nPUT /zones/{zone_id}/settings/zaraz/config",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/zaraz_zaraz-config-body"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zaraz_base-mc": zaraz_base_mc,
-        "zaraz_base-tool": zaraz_base_tool,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule,
-        "zaraz_identifier": zaraz_identifier,
-        "zaraz_load-rule": zaraz_load_rule,
-        "zaraz_managed-component": zaraz_managed_component,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule,
-        "zaraz_secret_variable": zaraz_secret_variable,
-        "zaraz_string_variable": zaraz_string_variable,
-        "zaraz_timer-rule": zaraz_timer_rule,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule,
-        "zaraz_worker_variable": zaraz_worker_variable,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base,
-        "zaraz_zaraz-config-body": zaraz_zaraz_config_body,
+        "zaraz_base-mc": zaraz_base$$mc$,
+        "zaraz_base-tool": zaraz_base$$tool$,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule$,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component$,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule$,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule$,
+        "zaraz_load-rule": zaraz_load$$rule$,
+        "zaraz_managed-component": zaraz_managed$$component$,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule$,
+        "zaraz_secret_variable": zaraz_secret_variable$,
+        "zaraz_string_variable": zaraz_string_variable$,
+        "zaraz_timer-rule": zaraz_timer$$rule$,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule$,
+        "zaraz_worker_variable": zaraz_worker_variable$,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base$,
+        "zaraz_zaraz-config-body": zaraz_zaraz$$config$$body,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-config-response",
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-response": zaraz_zaraz_config_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-response": zaraz_zaraz$$config$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     annotations: {
@@ -231,26 +246,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-response": zaraz_zaraz_config_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-response": zaraz_zaraz$$config$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zaraz/default/tools.ts b/src/generated/forge-mcp/zaraz/default/tools.ts
index bca76da38..c40764b9b 100644
--- a/src/generated/forge-mcp/zaraz/default/tools.ts
+++ b/src/generated/forge-mcp/zaraz/default/tools.ts
@@ -3,28 +3,27 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  zaraz_api_response_common_failure_output,
-  zaraz_api_response_common_output,
-  zaraz_base_mc_output,
-  zaraz_base_tool_output,
-  zaraz_click_listener_rule_output,
-  zaraz_custom_managed_component_output,
-  zaraz_element_visibility_rule_output,
-  zaraz_form_submission_rule_output,
-  zaraz_load_rule_output,
-  zaraz_managed_component_output,
-  zaraz_messages_output,
-  zaraz_scroll_depth_rule_output,
-  zaraz_secret_variable_output,
-  zaraz_string_variable_output,
-  zaraz_timer_rule_output,
-  zaraz_variable_match_rule_output,
-  zaraz_worker_variable_output,
-  zaraz_zaraz_config_base_output,
-  zaraz_zaraz_config_response_output,
-  zaraz_zaraz_config_return_output,
+  zaraz_api$$response$$common,
+  zaraz_api$$response$$common$$failure,
+  zaraz_base$$mc,
+  zaraz_base$$tool,
+  zaraz_click$$listener$$rule,
+  zaraz_custom$$managed$$component,
+  zaraz_element$$visibility$$rule,
+  zaraz_form$$submission$$rule,
+  zaraz_load$$rule,
+  zaraz_managed$$component,
+  zaraz_messages,
+  zaraz_scroll$$depth$$rule,
+  zaraz_secret_variable,
+  zaraz_string_variable,
+  zaraz_timer$$rule,
+  zaraz_variable$$match$$rule,
+  zaraz_worker_variable,
+  zaraz_zaraz$$config$$base,
+  zaraz_zaraz$$config$$response,
+  zaraz_zaraz$$config$$return,
 } from "../outputs.js";
-import { zaraz_identifier } from "../schemas.js";
 
 /**
  * The tools of `zaraz.default`.
@@ -33,44 +32,51 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_default_get",
     title: "Get default Zaraz configuration",
-    description: "Gets default Zaraz configuration for a zone.",
+    description: "Gets default Zaraz configuration for a zone.\n\nGET /zones/{zone_id}/settings/zaraz/default",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-config-response",
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-response": zaraz_zaraz_config_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-response": zaraz_zaraz$$config$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     annotations: {
@@ -99,26 +105,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-response": zaraz_zaraz_config_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-response": zaraz_zaraz$$config$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zaraz/export/tools.ts b/src/generated/forge-mcp/zaraz/export/tools.ts
index d08060269..a492c774d 100644
--- a/src/generated/forge-mcp/zaraz/export/tools.ts
+++ b/src/generated/forge-mcp/zaraz/export/tools.ts
@@ -3,26 +3,25 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  zaraz_api_response_common_failure_output,
-  zaraz_base_mc_output,
-  zaraz_base_tool_output,
-  zaraz_click_listener_rule_output,
-  zaraz_custom_managed_component_output,
-  zaraz_element_visibility_rule_output,
-  zaraz_form_submission_rule_output,
-  zaraz_load_rule_output,
-  zaraz_managed_component_output,
-  zaraz_messages_output,
-  zaraz_scroll_depth_rule_output,
-  zaraz_secret_variable_output,
-  zaraz_string_variable_output,
-  zaraz_timer_rule_output,
-  zaraz_variable_match_rule_output,
-  zaraz_worker_variable_output,
-  zaraz_zaraz_config_base_output,
-  zaraz_zaraz_config_return_output,
+  zaraz_api$$response$$common$$failure,
+  zaraz_base$$mc,
+  zaraz_base$$tool,
+  zaraz_click$$listener$$rule,
+  zaraz_custom$$managed$$component,
+  zaraz_element$$visibility$$rule,
+  zaraz_form$$submission$$rule,
+  zaraz_load$$rule,
+  zaraz_managed$$component,
+  zaraz_messages,
+  zaraz_scroll$$depth$$rule,
+  zaraz_secret_variable,
+  zaraz_string_variable,
+  zaraz_timer$$rule,
+  zaraz_variable$$match$$rule,
+  zaraz_worker_variable,
+  zaraz_zaraz$$config$$base,
+  zaraz_zaraz$$config$$return,
 } from "../outputs.js";
-import { zaraz_identifier } from "../schemas.js";
 
 /**
  * The tools of `zaraz.export`.
@@ -31,41 +30,48 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_export_get",
     title: "Export Zaraz configuration",
-    description: "Exports full current published Zaraz configuration for a zone, secret variables included.",
+    description: "Exports full current published Zaraz configuration for a zone, secret variables included.\n\nGET /zones/{zone_id}/settings/zaraz/export",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-config-return",
       $defs: {
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     annotations: {
@@ -94,24 +100,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zaraz/history/configs/outputs.ts b/src/generated/forge-mcp/zaraz/history/configs/outputs.ts
index 68b6d573d..d65c0dac2 100644
--- a/src/generated/forge-mcp/zaraz/history/configs/outputs.ts
+++ b/src/generated/forge-mcp/zaraz/history/configs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zaraz_zaraz-config-history-response` in responses.
  */
-export const zaraz_zaraz_config_history_response_output: JsonSchema = {
+export const zaraz_zaraz$$config$$history$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_api-response-common"
diff --git a/src/generated/forge-mcp/zaraz/history/configs/tools.ts b/src/generated/forge-mcp/zaraz/history/configs/tools.ts
index 056ec1bdb..dbb80179e 100644
--- a/src/generated/forge-mcp/zaraz/history/configs/tools.ts
+++ b/src/generated/forge-mcp/zaraz/history/configs/tools.ts
@@ -1,31 +1,30 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  zaraz_api_response_common_failure_output,
-  zaraz_api_response_common_output,
-  zaraz_base_mc_output,
-  zaraz_base_tool_output,
-  zaraz_click_listener_rule_output,
-  zaraz_custom_managed_component_output,
-  zaraz_element_visibility_rule_output,
-  zaraz_form_submission_rule_output,
-  zaraz_load_rule_output,
-  zaraz_managed_component_output,
-  zaraz_messages_output,
-  zaraz_scroll_depth_rule_output,
-  zaraz_secret_variable_output,
-  zaraz_string_variable_output,
-  zaraz_timer_rule_output,
-  zaraz_variable_match_rule_output,
-  zaraz_worker_variable_output,
-  zaraz_zaraz_config_base_output,
-  zaraz_zaraz_config_return_output,
+  zaraz_api$$response$$common,
+  zaraz_api$$response$$common$$failure,
+  zaraz_base$$mc,
+  zaraz_base$$tool,
+  zaraz_click$$listener$$rule,
+  zaraz_custom$$managed$$component,
+  zaraz_element$$visibility$$rule,
+  zaraz_form$$submission$$rule,
+  zaraz_load$$rule,
+  zaraz_managed$$component,
+  zaraz_messages,
+  zaraz_scroll$$depth$$rule,
+  zaraz_secret_variable,
+  zaraz_string_variable,
+  zaraz_timer$$rule,
+  zaraz_variable$$match$$rule,
+  zaraz_worker_variable,
+  zaraz_zaraz$$config$$base,
+  zaraz_zaraz$$config$$return,
 } from "../../outputs.js";
-import { zaraz_identifier } from "../../schemas.js";
-import { zaraz_zaraz_config_row_base_output } from "../outputs.js";
-import { zaraz_zaraz_config_history_response_output } from "./outputs.js";
+import { zaraz_zaraz$$config$$row$$base } from "../outputs.js";
+import { zaraz_zaraz$$config$$history$$response } from "./outputs.js";
 
 /**
  * The tools of `zaraz.history.configs`.
@@ -34,53 +33,69 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_history_configs_get",
     title: "Get Zaraz historical configurations by ID(s)",
-    description: "Gets a history of published Zaraz configurations by ID(s) for a zone.",
+    description: "Gets a history of published Zaraz configurations by ID(s) for a zone.\n\nGET /zones/{zone_id}/settings/zaraz/history/configs",
     inputSchema: {
       type: "object",
       properties: {
-        "ids": {
-          "description": "Comma separated list of Zaraz configuration IDs.",
-          "items": {
-            "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "ids": {
+              "description": "Comma separated list of Zaraz configuration IDs.",
+              "items": {
+                "type": "integer"
+              },
+              "type": "array"
+            }
+          },
+          "required": [
+            "ids"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "ids"
+        "path",
+        "query"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-config-history-response",
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-history-response": zaraz_zaraz_config_history_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
-        "zaraz_zaraz-config-row-base": zaraz_zaraz_config_row_base_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-history-response": zaraz_zaraz$$config$$history$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
+        "zaraz_zaraz-config-row-base": zaraz_zaraz$$config$$row$$base,
       },
     },
     annotations: {
@@ -109,33 +124,33 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-history-response": zaraz_zaraz_config_history_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
-        "zaraz_zaraz-config-row-base": zaraz_zaraz_config_row_base_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-history-response": zaraz_zaraz$$config$$history$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
+        "zaraz_zaraz-config-row-base": zaraz_zaraz$$config$$row$$base,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/settings/zaraz/history/configs`,
       query: [
-        ["ids", args["ids"], false],
+        ["ids", param(args, "query", "ids"), false],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zaraz/history/outputs.ts b/src/generated/forge-mcp/zaraz/history/outputs.ts
index b72d5a4c2..d4c68eb18 100644
--- a/src/generated/forge-mcp/zaraz/history/outputs.ts
+++ b/src/generated/forge-mcp/zaraz/history/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `zaraz_zaraz-config-row-base` in responses.
  */
-export const zaraz_zaraz_config_row_base_output: JsonSchema = {
+export const zaraz_zaraz$$config$$row$$base: JsonSchema = {
   "properties": {
     "createdAt": {
       "format": "date-time",
@@ -35,7 +35,7 @@ export const zaraz_zaraz_config_row_base_output: JsonSchema = {
 /**
  * The schema of `zaraz_zaraz-history-response` in responses.
  */
-export const zaraz_zaraz_history_response_output: JsonSchema = {
+export const zaraz_zaraz$$history$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_api-response-common"
diff --git a/src/generated/forge-mcp/zaraz/history/tools.ts b/src/generated/forge-mcp/zaraz/history/tools.ts
index 8f0be00a4..ca7138ff8 100644
--- a/src/generated/forge-mcp/zaraz/history/tools.ts
+++ b/src/generated/forge-mcp/zaraz/history/tools.ts
@@ -1,33 +1,32 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  zaraz_api_response_common_failure_output,
-  zaraz_api_response_common_output,
-  zaraz_base_mc_output,
-  zaraz_base_tool_output,
-  zaraz_click_listener_rule_output,
-  zaraz_custom_managed_component_output,
-  zaraz_element_visibility_rule_output,
-  zaraz_form_submission_rule_output,
-  zaraz_load_rule_output,
-  zaraz_managed_component_output,
-  zaraz_messages_output,
-  zaraz_scroll_depth_rule_output,
-  zaraz_secret_variable_output,
-  zaraz_string_variable_output,
-  zaraz_timer_rule_output,
-  zaraz_variable_match_rule_output,
-  zaraz_worker_variable_output,
-  zaraz_zaraz_config_base_output,
-  zaraz_zaraz_config_response_output,
-  zaraz_zaraz_config_return_output,
+  zaraz_api$$response$$common,
+  zaraz_api$$response$$common$$failure,
+  zaraz_base$$mc,
+  zaraz_base$$tool,
+  zaraz_click$$listener$$rule,
+  zaraz_custom$$managed$$component,
+  zaraz_element$$visibility$$rule,
+  zaraz_form$$submission$$rule,
+  zaraz_load$$rule,
+  zaraz_managed$$component,
+  zaraz_messages,
+  zaraz_scroll$$depth$$rule,
+  zaraz_secret_variable,
+  zaraz_string_variable,
+  zaraz_timer$$rule,
+  zaraz_variable$$match$$rule,
+  zaraz_worker_variable,
+  zaraz_zaraz$$config$$base,
+  zaraz_zaraz$$config$$response,
+  zaraz_zaraz$$config$$return,
 } from "../outputs.js";
-import { zaraz_identifier } from "../schemas.js";
 import {
-  zaraz_zaraz_config_row_base_output,
-  zaraz_zaraz_history_response_output,
+  zaraz_zaraz$$config$$row$$base,
+  zaraz_zaraz$$history$$response,
 } from "./outputs.js";
 
 /**
@@ -37,56 +36,69 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_history_list",
     title: "List Zaraz historical configuration records",
-    description: "Lists a history of published Zaraz configuration records for a zone.",
+    description: "Lists a history of published Zaraz configuration records for a zone.\n\nGET /zones/{zone_id}/settings/zaraz/history",
     inputSchema: {
       type: "object",
       properties: {
-        "limit": {
-          "description": "Maximum amount of results to list. Default value is 10.",
-          "type": "integer"
-        },
-        "offset": {
-          "description": "Ordinal number to start listing the results with. Default value is 0.",
-          "type": "integer"
-        },
-        "sort_field": {
-          "description": "The field to sort by. Default is updated_at.",
-          "enum": [
-            "id",
-            "user_id",
-            "description",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "description": "Sorting order. Default is DESC.",
-          "enum": [
-            "DESC",
-            "ASC"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "limit": {
+              "description": "Maximum amount of results to list. Default value is 10.",
+              "type": "integer"
+            },
+            "offset": {
+              "description": "Ordinal number to start listing the results with. Default value is 0.",
+              "type": "integer"
+            },
+            "sortField": {
+              "description": "The field to sort by. Default is updated_at.",
+              "enum": [
+                "id",
+                "user_id",
+                "description",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "sortOrder": {
+              "description": "Sorting order. Default is DESC.",
+              "enum": [
+                "DESC",
+                "ASC"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-history-response",
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_zaraz-config-row-base": zaraz_zaraz_config_row_base_output,
-        "zaraz_zaraz-history-response": zaraz_zaraz_history_response_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_zaraz-config-row-base": zaraz_zaraz$$config$$row$$base,
+        "zaraz_zaraz-history-response": zaraz_zaraz$$history$$response,
       },
     },
     annotations: {
@@ -115,68 +127,75 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_zaraz-config-row-base": zaraz_zaraz_config_row_base_output,
-        "zaraz_zaraz-history-response": zaraz_zaraz_history_response_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_zaraz-config-row-base": zaraz_zaraz$$config$$row$$base,
+        "zaraz_zaraz-history-response": zaraz_zaraz$$history$$response,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/settings/zaraz/history`,
       query: [
-        ["offset", args["offset"], true],
-        ["limit", args["limit"], true],
-        ["sortField", args["sort_field"], true],
-        ["sortOrder", args["sort_order"], true],
+        ["offset", param(args, "query", "offset"), true],
+        ["limit", param(args, "query", "limit"), true],
+        ["sortField", param(args, "query", "sortField"), true],
+        ["sortOrder", param(args, "query", "sortOrder"), true],
       ],
     }),
   },
   {
     name: "zaraz_history_update",
     title: "Restore Zaraz historical configuration by ID",
-    description: "Restores a historical published Zaraz configuration by ID for a zone.",
+    description: "Restores a historical published Zaraz configuration by ID for a zone.\n\nPUT /zones/{zone_id}/settings/zaraz/history",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "type": "integer"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-config-response",
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-response": zaraz_zaraz_config_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-response": zaraz_zaraz$$config$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     annotations: {
@@ -204,26 +223,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_base-mc": zaraz_base_mc_output,
-        "zaraz_base-tool": zaraz_base_tool_output,
-        "zaraz_click-listener-rule": zaraz_click_listener_rule_output,
-        "zaraz_custom-managed-component": zaraz_custom_managed_component_output,
-        "zaraz_element-visibility-rule": zaraz_element_visibility_rule_output,
-        "zaraz_form-submission-rule": zaraz_form_submission_rule_output,
-        "zaraz_load-rule": zaraz_load_rule_output,
-        "zaraz_managed-component": zaraz_managed_component_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_scroll-depth-rule": zaraz_scroll_depth_rule_output,
-        "zaraz_secret_variable": zaraz_secret_variable_output,
-        "zaraz_string_variable": zaraz_string_variable_output,
-        "zaraz_timer-rule": zaraz_timer_rule_output,
-        "zaraz_variable-match-rule": zaraz_variable_match_rule_output,
-        "zaraz_worker_variable": zaraz_worker_variable_output,
-        "zaraz_zaraz-config-base": zaraz_zaraz_config_base_output,
-        "zaraz_zaraz-config-response": zaraz_zaraz_config_response_output,
-        "zaraz_zaraz-config-return": zaraz_zaraz_config_return_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_base-mc": zaraz_base$$mc,
+        "zaraz_base-tool": zaraz_base$$tool,
+        "zaraz_click-listener-rule": zaraz_click$$listener$$rule,
+        "zaraz_custom-managed-component": zaraz_custom$$managed$$component,
+        "zaraz_element-visibility-rule": zaraz_element$$visibility$$rule,
+        "zaraz_form-submission-rule": zaraz_form$$submission$$rule,
+        "zaraz_load-rule": zaraz_load$$rule,
+        "zaraz_managed-component": zaraz_managed$$component,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_scroll-depth-rule": zaraz_scroll$$depth$$rule,
+        "zaraz_secret_variable": zaraz_secret_variable,
+        "zaraz_string_variable": zaraz_string_variable,
+        "zaraz_timer-rule": zaraz_timer$$rule,
+        "zaraz_variable-match-rule": zaraz_variable$$match$$rule,
+        "zaraz_worker_variable": zaraz_worker_variable,
+        "zaraz_zaraz-config-base": zaraz_zaraz$$config$$base,
+        "zaraz_zaraz-config-response": zaraz_zaraz$$config$$response,
+        "zaraz_zaraz-config-return": zaraz_zaraz$$config$$return,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zaraz/outputs.ts b/src/generated/forge-mcp/zaraz/outputs.ts
index 59029177f..6eff2a4f8 100644
--- a/src/generated/forge-mcp/zaraz/outputs.ts
+++ b/src/generated/forge-mcp/zaraz/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `zaraz_api-response-common` in responses.
  */
-export const zaraz_api_response_common_output: JsonSchema = {
+export const zaraz_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zaraz_messages"
@@ -29,7 +29,7 @@ export const zaraz_api_response_common_output: JsonSchema = {
 /**
  * The schema of `zaraz_api-response-common-failure` in responses.
  */
-export const zaraz_api_response_common_failure_output: JsonSchema = {
+export const zaraz_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zaraz_messages"
@@ -59,7 +59,7 @@ export const zaraz_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `zaraz_base-mc` in responses.
  */
-export const zaraz_base_mc_output: JsonSchema = {
+export const zaraz_base$$mc: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_base-tool"
@@ -168,7 +168,7 @@ export const zaraz_base_mc_output: JsonSchema = {
 /**
  * The schema of `zaraz_base-tool` in responses.
  */
-export const zaraz_base_tool_output: JsonSchema = {
+export const zaraz_base$$tool: JsonSchema = {
   "properties": {
     "blockingTriggers": {
       "items": {
@@ -217,7 +217,7 @@ export const zaraz_base_tool_output: JsonSchema = {
 /**
  * The schema of `zaraz_click-listener-rule` in responses.
  */
-export const zaraz_click_listener_rule_output: JsonSchema = {
+export const zaraz_click$$listener$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -263,7 +263,7 @@ export const zaraz_click_listener_rule_output: JsonSchema = {
 /**
  * The schema of `zaraz_custom-managed-component` in responses.
  */
-export const zaraz_custom_managed_component_output: JsonSchema = {
+export const zaraz_custom$$managed$$component: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_base-mc"
@@ -304,7 +304,7 @@ export const zaraz_custom_managed_component_output: JsonSchema = {
 /**
  * The schema of `zaraz_element-visibility-rule` in responses.
  */
-export const zaraz_element_visibility_rule_output: JsonSchema = {
+export const zaraz_element$$visibility$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -338,7 +338,7 @@ export const zaraz_element_visibility_rule_output: JsonSchema = {
 /**
  * The schema of `zaraz_form-submission-rule` in responses.
  */
-export const zaraz_form_submission_rule_output: JsonSchema = {
+export const zaraz_form$$submission$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -376,7 +376,7 @@ export const zaraz_form_submission_rule_output: JsonSchema = {
 /**
  * The schema of `zaraz_load-rule` in responses.
  */
-export const zaraz_load_rule_output: JsonSchema = {
+export const zaraz_load$$rule: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -415,7 +415,7 @@ export const zaraz_load_rule_output: JsonSchema = {
 /**
  * The schema of `zaraz_managed-component` in responses.
  */
-export const zaraz_managed_component_output: JsonSchema = {
+export const zaraz_managed$$component: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_base-mc"
@@ -440,7 +440,7 @@ export const zaraz_managed_component_output: JsonSchema = {
 /**
  * The schema of `zaraz_messages` in responses.
  */
-export const zaraz_messages_output: JsonSchema = {
+export const zaraz_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -473,7 +473,7 @@ export const zaraz_messages_output: JsonSchema = {
 /**
  * The schema of `zaraz_scroll-depth-rule` in responses.
  */
-export const zaraz_scroll_depth_rule_output: JsonSchema = {
+export const zaraz_scroll$$depth$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -507,7 +507,7 @@ export const zaraz_scroll_depth_rule_output: JsonSchema = {
 /**
  * The schema of `zaraz_secret_variable` in responses.
  */
-export const zaraz_secret_variable_output: JsonSchema = {
+export const zaraz_secret_variable: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -533,7 +533,7 @@ export const zaraz_secret_variable_output: JsonSchema = {
 /**
  * The schema of `zaraz_string_variable` in responses.
  */
-export const zaraz_string_variable_output: JsonSchema = {
+export const zaraz_string_variable: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -559,7 +559,7 @@ export const zaraz_string_variable_output: JsonSchema = {
 /**
  * The schema of `zaraz_timer-rule` in responses.
  */
-export const zaraz_timer_rule_output: JsonSchema = {
+export const zaraz_timer$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -597,7 +597,7 @@ export const zaraz_timer_rule_output: JsonSchema = {
 /**
  * The schema of `zaraz_variable-match-rule` in responses.
  */
-export const zaraz_variable_match_rule_output: JsonSchema = {
+export const zaraz_variable$$match$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -635,7 +635,7 @@ export const zaraz_variable_match_rule_output: JsonSchema = {
 /**
  * The schema of `zaraz_worker_variable` in responses.
  */
-export const zaraz_worker_variable_output: JsonSchema = {
+export const zaraz_worker_variable: JsonSchema = {
   "properties": {
     "name": {
       "type": "string"
@@ -673,7 +673,7 @@ export const zaraz_worker_variable_output: JsonSchema = {
 /**
  * The schema of `zaraz_zaraz-config-base` in responses.
  */
-export const zaraz_zaraz_config_base_output: JsonSchema = {
+export const zaraz_zaraz$$config$$base: JsonSchema = {
   "properties": {
     "analytics": {
       "properties": {
@@ -996,7 +996,7 @@ export const zaraz_zaraz_config_base_output: JsonSchema = {
 /**
  * The schema of `zaraz_zaraz-config-response` in responses.
  */
-export const zaraz_zaraz_config_response_output: JsonSchema = {
+export const zaraz_zaraz$$config$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_api-response-common"
@@ -1015,7 +1015,7 @@ export const zaraz_zaraz_config_response_output: JsonSchema = {
 /**
  * The schema of `zaraz_zaraz-config-return` in responses.
  */
-export const zaraz_zaraz_config_return_output: JsonSchema = {
+export const zaraz_zaraz$$config$$return: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_zaraz-config-base"
diff --git a/src/generated/forge-mcp/zaraz/publish/tools.ts b/src/generated/forge-mcp/zaraz/publish/tools.ts
index 36bc55120..a32a3c99e 100644
--- a/src/generated/forge-mcp/zaraz/publish/tools.ts
+++ b/src/generated/forge-mcp/zaraz/publish/tools.ts
@@ -3,11 +3,10 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  zaraz_api_response_common_failure_output,
-  zaraz_api_response_common_output,
-  zaraz_messages_output,
+  zaraz_api$$response$$common,
+  zaraz_api$$response$$common$$failure,
+  zaraz_messages,
 } from "../outputs.js";
-import { zaraz_identifier } from "../schemas.js";
 
 /**
  * The tools of `zaraz.publish`.
@@ -16,24 +15,31 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_publish_create",
     title: "Publish Zaraz preview configuration",
-    description: "Publish current Zaraz preview configuration for a zone.",
+    description: "Publish current Zaraz preview configuration for a zone.\n\nPOST /zones/{zone_id}/settings/zaraz/publish",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "type": "string"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -50,8 +56,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_messages": zaraz_messages_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_messages": zaraz_messages,
       },
     },
     annotations: {
@@ -95,9 +101,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_messages": zaraz_messages_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_messages": zaraz_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zaraz/schemas.ts b/src/generated/forge-mcp/zaraz/schemas.ts
index e417de0a7..6354676a0 100644
--- a/src/generated/forge-mcp/zaraz/schemas.ts
+++ b/src/generated/forge-mcp/zaraz/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `zaraz_base-mc`.
  */
-export const zaraz_base_mc: JsonSchema = {
+export const zaraz_base$$mc: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_base-tool"
@@ -128,7 +128,7 @@ export const zaraz_base_mc: JsonSchema = {
 /**
  * The schema of `zaraz_base-tool`.
  */
-export const zaraz_base_tool: JsonSchema = {
+export const zaraz_base$$tool: JsonSchema = {
   "properties": {
     "blockingTriggers": {
       "description": "List of blocking trigger IDs.",
@@ -184,7 +184,7 @@ export const zaraz_base_tool: JsonSchema = {
 /**
  * The schema of `zaraz_click-listener-rule`.
  */
-export const zaraz_click_listener_rule: JsonSchema = {
+export const zaraz_click$$listener$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -230,7 +230,7 @@ export const zaraz_click_listener_rule: JsonSchema = {
 /**
  * The schema of `zaraz_custom-managed-component`.
  */
-export const zaraz_custom_managed_component: JsonSchema = {
+export const zaraz_custom$$managed$$component: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_base-mc"
@@ -272,7 +272,7 @@ export const zaraz_custom_managed_component: JsonSchema = {
 /**
  * The schema of `zaraz_element-visibility-rule`.
  */
-export const zaraz_element_visibility_rule: JsonSchema = {
+export const zaraz_element$$visibility$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -306,7 +306,7 @@ export const zaraz_element_visibility_rule: JsonSchema = {
 /**
  * The schema of `zaraz_form-submission-rule`.
  */
-export const zaraz_form_submission_rule: JsonSchema = {
+export const zaraz_form$$submission$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -341,18 +341,10 @@ export const zaraz_form_submission_rule: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zaraz_identifier`.
- */
-export const zaraz_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
 /**
  * The schema of `zaraz_load-rule`.
  */
-export const zaraz_load_rule: JsonSchema = {
+export const zaraz_load$$rule: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -391,7 +383,7 @@ export const zaraz_load_rule: JsonSchema = {
 /**
  * The schema of `zaraz_managed-component`.
  */
-export const zaraz_managed_component: JsonSchema = {
+export const zaraz_managed$$component: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_base-mc"
@@ -416,7 +408,7 @@ export const zaraz_managed_component: JsonSchema = {
 /**
  * The schema of `zaraz_scroll-depth-rule`.
  */
-export const zaraz_scroll_depth_rule: JsonSchema = {
+export const zaraz_scroll$$depth$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -502,7 +494,7 @@ export const zaraz_string_variable: JsonSchema = {
 /**
  * The schema of `zaraz_timer-rule`.
  */
-export const zaraz_timer_rule: JsonSchema = {
+export const zaraz_timer$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -540,7 +532,7 @@ export const zaraz_timer_rule: JsonSchema = {
 /**
  * The schema of `zaraz_variable-match-rule`.
  */
-export const zaraz_variable_match_rule: JsonSchema = {
+export const zaraz_variable$$match$$rule: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -616,7 +608,7 @@ export const zaraz_worker_variable: JsonSchema = {
 /**
  * The schema of `zaraz_zaraz-config-base`.
  */
-export const zaraz_zaraz_config_base: JsonSchema = {
+export const zaraz_zaraz$$config$$base: JsonSchema = {
   "description": "Zaraz configuration.",
   "properties": {
     "analytics": {
diff --git a/src/generated/forge-mcp/zaraz/workflow/outputs.ts b/src/generated/forge-mcp/zaraz/workflow/outputs.ts
index 228638c20..ac05c203c 100644
--- a/src/generated/forge-mcp/zaraz/workflow/outputs.ts
+++ b/src/generated/forge-mcp/zaraz/workflow/outputs.ts
@@ -3,21 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `zaraz_zaraz-workflow` in responses.
- */
-export const zaraz_zaraz_workflow_output: JsonSchema = {
-  "enum": [
-    "realtime",
-    "preview"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zaraz_zaraz-workflow-response` in responses.
  */
-export const zaraz_zaraz_workflow_response_output: JsonSchema = {
+export const zaraz_zaraz$$workflow$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zaraz_api-response-common"
@@ -25,7 +14,11 @@ export const zaraz_zaraz_workflow_response_output: JsonSchema = {
     {
       "properties": {
         "result": {
-          "$ref": "#/$defs/zaraz_zaraz-workflow"
+          "enum": [
+            "realtime",
+            "preview"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
diff --git a/src/generated/forge-mcp/zaraz/workflow/schemas.ts b/src/generated/forge-mcp/zaraz/workflow/schemas.ts
deleted file mode 100644
index ff8a430d1..000000000
--- a/src/generated/forge-mcp/zaraz/workflow/schemas.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `zaraz_zaraz-workflow`.
- */
-export const zaraz_zaraz_workflow: JsonSchema = {
-  "description": "Zaraz workflow.",
-  "enum": [
-    "realtime",
-    "preview"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zaraz/workflow/tools.ts b/src/generated/forge-mcp/zaraz/workflow/tools.ts
index 3898a02ac..d77838eae 100644
--- a/src/generated/forge-mcp/zaraz/workflow/tools.ts
+++ b/src/generated/forge-mcp/zaraz/workflow/tools.ts
@@ -3,16 +3,11 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  zaraz_api_response_common_failure_output,
-  zaraz_api_response_common_output,
-  zaraz_messages_output,
+  zaraz_api$$response$$common,
+  zaraz_api$$response$$common$$failure,
+  zaraz_messages,
 } from "../outputs.js";
-import { zaraz_identifier } from "../schemas.js";
-import {
-  zaraz_zaraz_workflow_output,
-  zaraz_zaraz_workflow_response_output,
-} from "./outputs.js";
-import { zaraz_zaraz_workflow } from "./schemas.js";
+import { zaraz_zaraz$$workflow$$response } from "./outputs.js";
 
 /**
  * The tools of `zaraz.workflow`.
@@ -21,29 +16,35 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_workflow_get",
     title: "Get Zaraz workflow",
-    description: "Gets Zaraz workflow for a zone.",
+    description: "Gets Zaraz workflow for a zone.\n\nGET /zones/{zone_id}/settings/zaraz/workflow",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-workflow-response",
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_zaraz-workflow": zaraz_zaraz_workflow_output,
-        "zaraz_zaraz-workflow-response": zaraz_zaraz_workflow_response_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_zaraz-workflow-response": zaraz_zaraz$$workflow$$response,
       },
     },
     annotations: {
@@ -72,11 +73,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_zaraz-workflow": zaraz_zaraz_workflow_output,
-        "zaraz_zaraz-workflow-response": zaraz_zaraz_workflow_response_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_zaraz-workflow-response": zaraz_zaraz$$workflow$$response,
       },
     },
     request: (args) => ({
@@ -86,34 +86,44 @@ export const tools: readonly Tool[] = [
   {
     name: "zaraz_workflow_update",
     title: "Update Zaraz workflow",
-    description: "Updates Zaraz workflow for a zone.",
+    description: "Updates Zaraz workflow for a zone.\n\nPUT /zones/{zone_id}/settings/zaraz/workflow",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
-          "$ref": "#/$defs/zaraz_zaraz-workflow"
+          "description": "Zaraz workflow.",
+          "enum": [
+            "realtime",
+            "preview"
+          ],
+          "type": "string"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zaraz_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "zaraz_identifier": zaraz_identifier,
-        "zaraz_zaraz-workflow": zaraz_zaraz_workflow,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zaraz_zaraz-workflow-response",
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_zaraz-workflow": zaraz_zaraz_workflow_output,
-        "zaraz_zaraz-workflow-response": zaraz_zaraz_workflow_response_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_zaraz-workflow-response": zaraz_zaraz$$workflow$$response,
       },
     },
     annotations: {
@@ -141,11 +151,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zaraz_api-response-common": zaraz_api_response_common_output,
-        "zaraz_api-response-common-failure": zaraz_api_response_common_failure_output,
-        "zaraz_messages": zaraz_messages_output,
-        "zaraz_zaraz-workflow": zaraz_zaraz_workflow_output,
-        "zaraz_zaraz-workflow-response": zaraz_zaraz_workflow_response_output,
+        "zaraz_api-response-common": zaraz_api$$response$$common,
+        "zaraz_api-response-common-failure": zaraz_api$$response$$common$$failure,
+        "zaraz_messages": zaraz_messages,
+        "zaraz_zaraz-workflow-response": zaraz_zaraz$$workflow$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/applications/outputs.ts
index fa319a5d5..9c2e1de5d 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/outputs.ts
@@ -3,59 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_allow_all_headers` in responses.
- */
-export const access_allow_all_headers_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_all_methods` in responses.
- */
-export const access_allow_all_methods_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_all_origins` in responses.
- */
-export const access_allow_all_origins_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_authenticate_via_warp-2` in responses.
- */
-export const access_allow_authenticate_via_warp_2_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_credentials` in responses.
- */
-export const access_allow_credentials_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_email_alias` in responses.
- */
-export const access_allow_email_alias_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_iframe` in responses.
- */
-export const access_allow_iframe_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_allowed_headers` in responses.
  */
-export const access_allowed_headers_output: JsonSchema = {
+export const access_allowed_headers: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -65,7 +16,7 @@ export const access_allowed_headers_output: JsonSchema = {
 /**
  * The schema of `access_allowed_idps` in responses.
  */
-export const access_allowed_idps_output: JsonSchema = {
+export const access_allowed_idps: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -75,7 +26,7 @@ export const access_allowed_idps_output: JsonSchema = {
 /**
  * The schema of `access_allowed_methods` in responses.
  */
-export const access_allowed_methods_output: JsonSchema = {
+export const access_allowed_methods: JsonSchema = {
   "items": {
     "enum": [
       "GET",
@@ -96,24 +47,17 @@ export const access_allowed_methods_output: JsonSchema = {
 /**
  * The schema of `access_allowed_origins` in responses.
  */
-export const access_allowed_origins_output: JsonSchema = {
+export const access_allowed_origins: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `access_app_launcher_logo_url` in responses.
- */
-export const access_app_launcher_logo_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_app_launcher_props` in responses.
  */
-export const access_app_launcher_props_output: JsonSchema = {
+export const access_app_launcher_props: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_feature_app_props"
@@ -121,10 +65,10 @@ export const access_app_launcher_props_output: JsonSchema = {
     {
       "properties": {
         "app_launcher_logo_url": {
-          "$ref": "#/$defs/access_app_launcher_logo_url"
+          "type": "string"
         },
         "bg_color": {
-          "$ref": "#/$defs/access_bg_color"
+          "type": "string"
         },
         "domain": {
           "type": "string"
@@ -133,7 +77,7 @@ export const access_app_launcher_props_output: JsonSchema = {
           "$ref": "#/$defs/access_footer_links"
         },
         "header_bg_color": {
-          "$ref": "#/$defs/access_header_bg_color"
+          "type": "string"
         },
         "landing_page_design": {
           "$ref": "#/$defs/access_landing_page_design"
@@ -142,12 +86,29 @@ export const access_app_launcher_props_output: JsonSchema = {
           "type": "string"
         },
         "skip_app_launcher_login_page": {
-          "$ref": "#/$defs/access_skip_app_launcher_login_page"
+          "type": "boolean"
         },
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -160,17 +121,10 @@ export const access_app_launcher_props_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_app_launcher_visible` in responses.
- */
-export const access_app_launcher_visible_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_app_policy_response` in responses.
  */
-export const access_app_policy_response_output: JsonSchema = {
+export const access_app_policy_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_policy_resp"
@@ -178,10 +132,10 @@ export const access_app_policy_response_output: JsonSchema = {
     {
       "properties": {
         "account_id": {
-          "$ref": "#/$defs/access_identifier"
+          "type": "string"
         },
         "precedence": {
-          "$ref": "#/$defs/access_precedence"
+          "type": "integer"
         }
       },
       "type": "object"
@@ -192,7 +146,7 @@ export const access_app_policy_response_output: JsonSchema = {
 /**
  * The schema of `access_app_resp_embedded_policies` in responses.
  */
-export const access_app_resp_embedded_policies_output: JsonSchema = {
+export const access_app_resp_embedded_policies: JsonSchema = {
   "properties": {
     "policies": {
       "items": {
@@ -207,7 +161,7 @@ export const access_app_resp_embedded_policies_output: JsonSchema = {
 /**
  * The schema of `access_app_resp_embedded_target_criteria_infra` in responses.
  */
-export const access_app_resp_embedded_target_criteria_infra_output: JsonSchema = {
+export const access_app_resp_embedded_target_criteria_infra: JsonSchema = {
   "properties": {
     "target_criteria": {
       "items": {
@@ -223,7 +177,7 @@ export const access_app_resp_embedded_target_criteria_infra_output: JsonSchema =
  * The schema of `access_app_resp_embedded_target_criteria_self_hosted` in
  * responses.
  */
-export const access_app_resp_embedded_target_criteria_self_hosted_output: JsonSchema = {
+export const access_app_resp_embedded_target_criteria_self_hosted: JsonSchema = {
   "properties": {
     "target_criteria": {
       "items": {
@@ -238,7 +192,7 @@ export const access_app_resp_embedded_target_criteria_self_hosted_output: JsonSc
 /**
  * The schema of `access_app_response` in responses.
  */
-export const access_app_response_output: JsonSchema = {
+export const access_app_response: JsonSchema = {
   "anyOf": [
     {
       "allOf": [
@@ -422,52 +376,47 @@ export const access_app_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_aud-2` in responses.
- */
-export const access_aud_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_auto_redirect_to_identity-2` in responses.
- */
-export const access_auto_redirect_to_identity_2_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_basic_app_response_props` in responses.
  */
-export const access_basic_app_response_props_output: JsonSchema = {
+export const access_basic_app_response_props: JsonSchema = {
   "properties": {
     "aud": {
-      "$ref": "#/$defs/access_aud-2"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "id": {
-      "$ref": "#/$defs/access_uuid"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_bg_color` in responses.
- */
-export const access_bg_color_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_biso_props` in responses.
  */
-export const access_biso_props_output: JsonSchema = {
+export const access_biso_props: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_feature_app_props"
@@ -483,7 +432,24 @@ export const access_biso_props_output: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -499,19 +465,19 @@ export const access_biso_props_output: JsonSchema = {
 /**
  * The schema of `access_bookmark_props` in responses.
  */
-export const access_bookmark_props_output: JsonSchema = {
+export const access_bookmark_props: JsonSchema = {
   "properties": {
     "app_launcher_visible": {
-      "$ref": "#/$defs/access_app_launcher_visible"
+      "type": "boolean"
     },
     "domain": {
       "type": "string"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8"
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/access_tags-2"
@@ -519,7 +485,24 @@ export const access_bookmark_props_output: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -530,24 +513,10 @@ export const access_bookmark_props_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_button_color` in responses.
- */
-export const access_button_color_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_button_text_color` in responses.
- */
-export const access_button_text_color_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_connection_rules_infra` in responses.
  */
-export const access_connection_rules_infra_output: JsonSchema = {
+export const access_connection_rules_infra: JsonSchema = {
   "properties": {
     "ssh": {
       "$ref": "#/$defs/access_connection_rules_ssh"
@@ -559,10 +528,10 @@ export const access_connection_rules_infra_output: JsonSchema = {
 /**
  * The schema of `access_connection_rules_ssh` in responses.
  */
-export const access_connection_rules_ssh_output: JsonSchema = {
+export const access_connection_rules_ssh: JsonSchema = {
   "properties": {
     "allow_email_alias": {
-      "$ref": "#/$defs/access_allow_email_alias"
+      "type": "boolean"
     },
     "usernames": {
       "$ref": "#/$defs/access_usernames"
@@ -577,19 +546,19 @@ export const access_connection_rules_ssh_output: JsonSchema = {
 /**
  * The schema of `access_cors_headers` in responses.
  */
-export const access_cors_headers_output: JsonSchema = {
+export const access_cors_headers: JsonSchema = {
   "properties": {
     "allow_all_headers": {
-      "$ref": "#/$defs/access_allow_all_headers"
+      "type": "boolean"
     },
     "allow_all_methods": {
-      "$ref": "#/$defs/access_allow_all_methods"
+      "type": "boolean"
     },
     "allow_all_origins": {
-      "$ref": "#/$defs/access_allow_all_origins"
+      "type": "boolean"
     },
     "allow_credentials": {
-      "$ref": "#/$defs/access_allow_credentials"
+      "type": "boolean"
     },
     "allowed_headers": {
       "$ref": "#/$defs/access_allowed_headers"
@@ -601,37 +570,16 @@ export const access_cors_headers_output: JsonSchema = {
       "$ref": "#/$defs/access_allowed_origins"
     },
     "max_age": {
-      "$ref": "#/$defs/access_max_age"
+      "type": "number"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_custom_deny_message` in responses.
- */
-export const access_custom_deny_message_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_custom_deny_url` in responses.
- */
-export const access_custom_deny_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_custom_non_identity_deny_url` in responses.
- */
-export const access_custom_non_identity_deny_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_custom_pages-2` in responses.
  */
-export const access_custom_pages_2_output: JsonSchema = {
+export const access_custom_pages$$2: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -641,7 +589,7 @@ export const access_custom_pages_2_output: JsonSchema = {
 /**
  * The schema of `access_destination_overrides` in responses.
  */
-export const access_destination_overrides_output: JsonSchema = {
+export const access_destination_overrides: JsonSchema = {
   "items": {
     "properties": {
       "behavior": {
@@ -667,7 +615,7 @@ export const access_destination_overrides_output: JsonSchema = {
 /**
  * The schema of `access_destinations` in responses.
  */
-export const access_destinations_output: JsonSchema = {
+export const access_destinations: JsonSchema = {
   "items": {
     "oneOf": [
       {
@@ -812,24 +760,10 @@ export const access_destinations_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_domain` in responses.
- */
-export const access_domain_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_eager_redirect_cookie_setting` in responses.
- */
-export const access_eager_redirect_cookie_setting_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_empty_response-2` in responses.
  */
-export const access_empty_response_2_output: JsonSchema = {
+export const access_empty_response$$2: JsonSchema = {
   "properties": {
     "result": {
       "oneOf": [
@@ -852,17 +786,10 @@ export const access_empty_response_2_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_enable_binding_cookie` in responses.
- */
-export const access_enable_binding_cookie_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_end_user_all_preview_workers_destination` in responses.
  */
-export const access_end_user_all_preview_workers_destination_output: JsonSchema = {
+export const access_end_user_all_preview_workers_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides"
@@ -883,7 +810,7 @@ export const access_end_user_all_preview_workers_destination_output: JsonSchema
 /**
  * The schema of `access_end_user_all_workers_destination` in responses.
  */
-export const access_end_user_all_workers_destination_output: JsonSchema = {
+export const access_end_user_all_workers_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides"
@@ -904,7 +831,7 @@ export const access_end_user_all_workers_destination_output: JsonSchema = {
 /**
  * The schema of `access_end_user_destinations` in responses.
  */
-export const access_end_user_destinations_output: JsonSchema = {
+export const access_end_user_destinations: JsonSchema = {
   "items": {
     "oneOf": [
       {
@@ -930,7 +857,7 @@ export const access_end_user_destinations_output: JsonSchema = {
 /**
  * The schema of `access_end_user_oauth_configuration` in responses.
  */
-export const access_end_user_oauth_configuration_output: JsonSchema = {
+export const access_end_user_oauth_configuration: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_oauth_configuration"
@@ -952,7 +879,7 @@ export const access_end_user_oauth_configuration_output: JsonSchema = {
 /**
  * The schema of `access_end_user_preview_worker_destination` in responses.
  */
-export const access_end_user_preview_worker_destination_output: JsonSchema = {
+export const access_end_user_preview_worker_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides"
@@ -977,7 +904,7 @@ export const access_end_user_preview_worker_destination_output: JsonSchema = {
 /**
  * The schema of `access_end_user_props` in responses.
  */
-export const access_end_user_props_output: JsonSchema = {
+export const access_end_user_props: JsonSchema = {
   "properties": {
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps"
@@ -986,10 +913,10 @@ export const access_end_user_props_output: JsonSchema = {
       "$ref": "#/$defs/access_end_user_destinations"
     },
     "domain": {
-      "$ref": "#/$defs/access_domain"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8"
+      "type": "string"
     },
     "oauth_configuration": {
       "$ref": "#/$defs/access_end_user_oauth_configuration"
@@ -1000,7 +927,24 @@ export const access_end_user_props_output: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "enum": [
@@ -1012,7 +956,7 @@ export const access_end_user_props_output: JsonSchema = {
     },
     "user_populations": {
       "items": {
-        "$ref": "#/$defs/access_uuid"
+        "type": "string"
       },
       "maxItems": 1,
       "minItems": 1,
@@ -1030,7 +974,7 @@ export const access_end_user_props_output: JsonSchema = {
 /**
  * The schema of `access_end_user_public_destination` in responses.
  */
-export const access_end_user_public_destination_output: JsonSchema = {
+export const access_end_user_public_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides"
@@ -1054,7 +998,7 @@ export const access_end_user_public_destination_output: JsonSchema = {
 /**
  * The schema of `access_end_user_worker_destination` in responses.
  */
-export const access_end_user_worker_destination_output: JsonSchema = {
+export const access_end_user_worker_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides"
@@ -1079,34 +1023,51 @@ export const access_end_user_worker_destination_output: JsonSchema = {
 /**
  * The schema of `access_feature_app_props` in responses.
  */
-export const access_feature_app_props_output: JsonSchema = {
+export const access_feature_app_props: JsonSchema = {
   "properties": {
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps"
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2"
+      "type": "boolean"
     },
     "custom_deny_url": {
-      "$ref": "#/$defs/access_custom_deny_url"
+      "type": "string"
     },
     "custom_non_identity_deny_url": {
-      "$ref": "#/$defs/access_custom_non_identity_deny_url"
+      "type": "string"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2"
     },
     "domain": {
-      "$ref": "#/$defs/access_domain"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8"
+      "type": "string"
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration-2"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/access_type"
+      "enum": [
+        "self_hosted",
+        "end_user",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -1118,7 +1079,7 @@ export const access_feature_app_props_output: JsonSchema = {
 /**
  * The schema of `access_footer_links` in responses.
  */
-export const access_footer_links_output: JsonSchema = {
+export const access_footer_links: JsonSchema = {
   "items": {
     "properties": {
       "name": {
@@ -1137,31 +1098,10 @@ export const access_footer_links_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_header_bg_color` in responses.
- */
-export const access_header_bg_color_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_http_only_cookie_attribute` in responses.
- */
-export const access_http_only_cookie_attribute_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_image_url` in responses.
- */
-export const access_image_url_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_infra_app_resp_embedded_policies` in responses.
  */
-export const access_infra_app_resp_embedded_policies_output: JsonSchema = {
+export const access_infra_app_resp_embedded_policies: JsonSchema = {
   "properties": {
     "policies": {
       "items": {
@@ -1176,7 +1116,7 @@ export const access_infra_app_resp_embedded_policies_output: JsonSchema = {
 /**
  * The schema of `access_infra_mfa_config` in responses.
  */
-export const access_infra_mfa_config_output: JsonSchema = {
+export const access_infra_mfa_config: JsonSchema = {
   "properties": {
     "allowed_authenticators": {
       "items": {
@@ -1201,7 +1141,7 @@ export const access_infra_mfa_config_output: JsonSchema = {
 /**
  * The schema of `access_infra_policy_resp` in responses.
  */
-export const access_infra_policy_resp_output: JsonSchema = {
+export const access_infra_policy_resp: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1223,7 +1163,7 @@ export const access_infra_policy_resp_output: JsonSchema = {
 /**
  * The schema of `access_infra_props` in responses.
  */
-export const access_infra_props_output: JsonSchema = {
+export const access_infra_props: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -1231,7 +1171,7 @@ export const access_infra_props_output: JsonSchema = {
           "$ref": "#/$defs/access_infra_mfa_config"
         },
         "name": {
-          "$ref": "#/$defs/access_name-8"
+          "type": "string"
         },
         "session_duration": {
           "type": "string"
@@ -1239,7 +1179,24 @@ export const access_infra_props_output: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -1258,63 +1215,49 @@ export const access_infra_props_output: JsonSchema = {
 /**
  * The schema of `access_landing_page_design` in responses.
  */
-export const access_landing_page_design_output: JsonSchema = {
+export const access_landing_page_design: JsonSchema = {
   "properties": {
     "button_color": {
-      "$ref": "#/$defs/access_button_color"
+      "type": "string"
     },
     "button_text_color": {
-      "$ref": "#/$defs/access_button_text_color"
+      "type": "string"
     },
     "image_url": {
-      "$ref": "#/$defs/access_image_url"
+      "type": "string"
     },
     "message": {
-      "$ref": "#/$defs/access_message"
+      "type": "string"
     },
     "title": {
-      "$ref": "#/$defs/access_title"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_logo_url` in responses.
- */
-export const access_logo_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_max_age` in responses.
- */
-export const access_max_age_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `access_mcp_portal_props` in responses.
  */
-export const access_mcp_portal_props_output: JsonSchema = {
+export const access_mcp_portal_props: JsonSchema = {
   "properties": {
     "allow_authenticate_via_warp": {
-      "$ref": "#/$defs/access_allow_authenticate_via_warp-2"
+      "type": "boolean"
     },
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps"
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2"
+      "type": "boolean"
     },
     "custom_deny_message": {
-      "$ref": "#/$defs/access_custom_deny_message"
+      "type": "string"
     },
     "custom_deny_url": {
-      "$ref": "#/$defs/access_custom_deny_url"
+      "type": "string"
     },
     "custom_non_identity_deny_url": {
-      "$ref": "#/$defs/access_custom_non_identity_deny_url"
+      "type": "string"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2"
@@ -1323,31 +1266,31 @@ export const access_mcp_portal_props_output: JsonSchema = {
       "$ref": "#/$defs/access_destinations"
     },
     "domain": {
-      "$ref": "#/$defs/access_domain"
+      "type": "string"
     },
     "http_only_cookie_attribute": {
-      "$ref": "#/$defs/access_http_only_cookie_attribute"
+      "type": "boolean"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8"
+      "type": "string"
     },
     "oauth_configuration": {
       "$ref": "#/$defs/access_oauth_configuration"
     },
     "options_preflight_bypass": {
-      "$ref": "#/$defs/access_options_preflight_bypass"
+      "type": "boolean"
     },
     "same_site_cookie_attribute": {
-      "$ref": "#/$defs/access_same_site_cookie_attribute"
+      "type": "string"
     },
     "scim_config": {
       "$ref": "#/$defs/access_scim_config"
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration-2"
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/access_tags-2"
@@ -1355,7 +1298,24 @@ export const access_mcp_portal_props_output: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -1372,25 +1332,25 @@ export const access_mcp_portal_props_output: JsonSchema = {
 /**
  * The schema of `access_mcp_props` in responses.
  */
-export const access_mcp_props_output: JsonSchema = {
+export const access_mcp_props: JsonSchema = {
   "properties": {
     "allow_authenticate_via_warp": {
-      "$ref": "#/$defs/access_allow_authenticate_via_warp-2"
+      "type": "boolean"
     },
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps"
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2"
+      "type": "boolean"
     },
     "custom_deny_message": {
-      "$ref": "#/$defs/access_custom_deny_message"
+      "type": "string"
     },
     "custom_deny_url": {
-      "$ref": "#/$defs/access_custom_deny_url"
+      "type": "string"
     },
     "custom_non_identity_deny_url": {
-      "$ref": "#/$defs/access_custom_non_identity_deny_url"
+      "type": "string"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2"
@@ -1399,28 +1359,28 @@ export const access_mcp_props_output: JsonSchema = {
       "$ref": "#/$defs/access_destinations"
     },
     "http_only_cookie_attribute": {
-      "$ref": "#/$defs/access_http_only_cookie_attribute"
+      "type": "boolean"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8"
+      "type": "string"
     },
     "oauth_configuration": {
       "$ref": "#/$defs/access_oauth_configuration"
     },
     "options_preflight_bypass": {
-      "$ref": "#/$defs/access_options_preflight_bypass"
+      "type": "boolean"
     },
     "same_site_cookie_attribute": {
-      "$ref": "#/$defs/access_same_site_cookie_attribute"
+      "type": "string"
     },
     "scim_config": {
       "$ref": "#/$defs/access_scim_config"
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration-2"
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/access_tags-2"
@@ -1428,7 +1388,24 @@ export const access_mcp_props_output: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -1442,24 +1419,10 @@ export const access_mcp_props_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_message` in responses.
- */
-export const access_message_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_name-8` in responses.
- */
-export const access_name_8_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_oauth_configuration` in responses.
  */
-export const access_oauth_configuration_output: JsonSchema = {
+export const access_oauth_configuration: JsonSchema = {
   "properties": {
     "dynamic_client_registration": {
       "properties": {
@@ -1502,7 +1465,7 @@ export const access_oauth_configuration_output: JsonSchema = {
 /**
  * The schema of `access_oidc_saas_app` in responses.
  */
-export const access_oidc_saas_app_output: JsonSchema = {
+export const access_oidc_saas_app: JsonSchema = {
   "properties": {
     "access_token_lifetime": {
       "type": "string"
@@ -1527,7 +1490,15 @@ export const access_oidc_saas_app_output: JsonSchema = {
       "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "custom_claims": {
       "items": {
@@ -1623,64 +1594,24 @@ export const access_oidc_saas_app_output: JsonSchema = {
       "type": "array"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_options_preflight_bypass` in responses.
- */
-export const access_options_preflight_bypass_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_path_cookie_attribute` in responses.
- */
-export const access_path_cookie_attribute_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_port` in responses.
- */
-export const access_port_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_precedence` in responses.
- */
-export const access_precedence_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_protocol_infra_app` in responses.
- */
-export const access_protocol_infra_app_output: JsonSchema = {
-  "enum": [
-    "SSH"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `access_protocol_self_hosted_app` in responses.
- */
-export const access_protocol_self_hosted_app_output: JsonSchema = {
-  "enum": [
-    "RDP"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_proxy_endpoint_props` in responses.
  */
-export const access_proxy_endpoint_props_output: JsonSchema = {
+export const access_proxy_endpoint_props: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_feature_app_props"
@@ -1696,7 +1627,24 @@ export const access_proxy_endpoint_props_output: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -1712,7 +1660,7 @@ export const access_proxy_endpoint_props_output: JsonSchema = {
 /**
  * The schema of `access_rdp_props` in responses.
  */
-export const access_rdp_props_output: JsonSchema = {
+export const access_rdp_props: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_app_resp_embedded_target_criteria_self_hosted"
@@ -1725,7 +1673,24 @@ export const access_rdp_props_output: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -1738,17 +1703,10 @@ export const access_rdp_props_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_read_service_tokens_from_header` in responses.
- */
-export const access_read_service_tokens_from_header_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_response_collection-8` in responses.
  */
-export const access_response_collection_8_output: JsonSchema = {
+export const access_response_collection$$8: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -1770,25 +1728,25 @@ export const access_response_collection_8_output: JsonSchema = {
 /**
  * The schema of `access_saas_props` in responses.
  */
-export const access_saas_props_output: JsonSchema = {
+export const access_saas_props: JsonSchema = {
   "properties": {
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps"
     },
     "app_launcher_visible": {
-      "$ref": "#/$defs/access_app_launcher_visible"
+      "type": "boolean"
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2"
+      "type": "boolean"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8"
+      "type": "string"
     },
     "saas_app": {
       "oneOf": [
@@ -1809,7 +1767,24 @@ export const access_saas_props_output: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -1820,17 +1795,10 @@ export const access_saas_props_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_same_site_cookie_attribute` in responses.
- */
-export const access_same_site_cookie_attribute_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_saml_saas_app` in responses.
  */
-export const access_saml_saas_app_output: JsonSchema = {
+export const access_saml_saas_app: JsonSchema = {
   "properties": {
     "auth_type": {
       "enum": [
@@ -1843,7 +1811,15 @@ export const access_saml_saas_app_output: JsonSchema = {
       "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "custom_attributes": {
       "items": {
@@ -1921,7 +1897,15 @@ export const access_saml_saas_app_output: JsonSchema = {
       "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
@@ -1930,7 +1914,7 @@ export const access_saml_saas_app_output: JsonSchema = {
 /**
  * The schema of `access_scim_config` in responses.
  */
-export const access_scim_config_output: JsonSchema = {
+export const access_scim_config: JsonSchema = {
   "properties": {
     "authentication": {
       "oneOf": [
@@ -1972,7 +1956,7 @@ export const access_scim_config_output: JsonSchema = {
  * The schema of `access_scim_config_authentication_access_service_token` in
  * responses.
  */
-export const access_scim_config_authentication_access_service_token_output: JsonSchema = {
+export const access_scim_config_authentication_access_service_token: JsonSchema = {
   "properties": {
     "client_id": {
       "type": "string"
@@ -1998,7 +1982,7 @@ export const access_scim_config_authentication_access_service_token_output: Json
 /**
  * The schema of `access_scim_config_authentication_http_basic` in responses.
  */
-export const access_scim_config_authentication_http_basic_output: JsonSchema = {
+export const access_scim_config_authentication_http_basic: JsonSchema = {
   "properties": {
     "password": {
       "type": "string"
@@ -2024,7 +2008,7 @@ export const access_scim_config_authentication_http_basic_output: JsonSchema = {
 /**
  * The schema of `access_scim_config_authentication_oauth2` in responses.
  */
-export const access_scim_config_authentication_oauth2_output: JsonSchema = {
+export const access_scim_config_authentication_oauth2: JsonSchema = {
   "properties": {
     "authorization_url": {
       "type": "string"
@@ -2065,7 +2049,7 @@ export const access_scim_config_authentication_oauth2_output: JsonSchema = {
  * The schema of `access_scim_config_authentication_oauth_bearer_token` in
  * responses.
  */
-export const access_scim_config_authentication_oauth_bearer_token_output: JsonSchema = {
+export const access_scim_config_authentication_oauth_bearer_token: JsonSchema = {
   "properties": {
     "scheme": {
       "enum": [
@@ -2087,7 +2071,7 @@ export const access_scim_config_authentication_oauth_bearer_token_output: JsonSc
 /**
  * The schema of `access_scim_config_mapping` in responses.
  */
-export const access_scim_config_mapping_output: JsonSchema = {
+export const access_scim_config_mapping: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -2132,7 +2116,7 @@ export const access_scim_config_mapping_output: JsonSchema = {
 /**
  * The schema of `access_scim_config_multi_authentication` in responses.
  */
-export const access_scim_config_multi_authentication_output: JsonSchema = {
+export const access_scim_config_multi_authentication: JsonSchema = {
   "items": {
     "$ref": "#/$defs/access_scim_config_single_authentication"
   },
@@ -2142,7 +2126,7 @@ export const access_scim_config_multi_authentication_output: JsonSchema = {
 /**
  * The schema of `access_scim_config_single_authentication` in responses.
  */
-export const access_scim_config_single_authentication_output: JsonSchema = {
+export const access_scim_config_single_authentication: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/access_scim_config_authentication_http_basic"
@@ -2162,7 +2146,7 @@ export const access_scim_config_single_authentication_output: JsonSchema = {
 /**
  * The schema of `access_self_hosted_domains` in responses.
  */
-export const access_self_hosted_domains_output: JsonSchema = {
+export const access_self_hosted_domains: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -2172,34 +2156,34 @@ export const access_self_hosted_domains_output: JsonSchema = {
 /**
  * The schema of `access_self_hosted_props` in responses.
  */
-export const access_self_hosted_props_output: JsonSchema = {
+export const access_self_hosted_props: JsonSchema = {
   "properties": {
     "allow_authenticate_via_warp": {
-      "$ref": "#/$defs/access_allow_authenticate_via_warp-2"
+      "type": "boolean"
     },
     "allow_iframe": {
-      "$ref": "#/$defs/access_allow_iframe"
+      "type": "boolean"
     },
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps"
     },
     "app_launcher_visible": {
-      "$ref": "#/$defs/access_app_launcher_visible"
+      "type": "boolean"
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2"
+      "type": "boolean"
     },
     "cors_headers": {
       "$ref": "#/$defs/access_cors_headers"
     },
     "custom_deny_message": {
-      "$ref": "#/$defs/access_custom_deny_message"
+      "type": "string"
     },
     "custom_deny_url": {
-      "$ref": "#/$defs/access_custom_deny_url"
+      "type": "string"
     },
     "custom_non_identity_deny_url": {
-      "$ref": "#/$defs/access_custom_non_identity_deny_url"
+      "type": "string"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2"
@@ -2208,40 +2192,40 @@ export const access_self_hosted_props_output: JsonSchema = {
       "$ref": "#/$defs/access_destinations"
     },
     "domain": {
-      "$ref": "#/$defs/access_domain"
+      "type": "string"
     },
     "eager_redirect_cookie_setting": {
-      "$ref": "#/$defs/access_eager_redirect_cookie_setting"
+      "type": "boolean"
     },
     "enable_binding_cookie": {
-      "$ref": "#/$defs/access_enable_binding_cookie"
+      "type": "boolean"
     },
     "http_only_cookie_attribute": {
-      "$ref": "#/$defs/access_http_only_cookie_attribute"
+      "type": "boolean"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url"
+      "type": "string"
     },
     "mfa_config": {
       "$ref": "#/$defs/access_mfa_config"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8"
+      "type": "string"
     },
     "oauth_configuration": {
       "$ref": "#/$defs/access_oauth_configuration"
     },
     "options_preflight_bypass": {
-      "$ref": "#/$defs/access_options_preflight_bypass"
+      "type": "boolean"
     },
     "path_cookie_attribute": {
-      "$ref": "#/$defs/access_path_cookie_attribute"
+      "type": "boolean"
     },
     "read_service_tokens_from_header": {
-      "$ref": "#/$defs/access_read_service_tokens_from_header"
+      "type": "string"
     },
     "same_site_cookie_attribute": {
-      "$ref": "#/$defs/access_same_site_cookie_attribute"
+      "type": "string"
     },
     "scim_config": {
       "$ref": "#/$defs/access_scim_config"
@@ -2250,13 +2234,13 @@ export const access_self_hosted_props_output: JsonSchema = {
       "$ref": "#/$defs/access_self_hosted_domains"
     },
     "service_auth_401_redirect": {
-      "$ref": "#/$defs/access_service_auth_401_redirect"
+      "type": "boolean"
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration-2"
+      "type": "string"
     },
     "skip_interstitial": {
-      "$ref": "#/$defs/access_skip_interstitial"
+      "type": "boolean"
     },
     "tags": {
       "$ref": "#/$defs/access_tags-2"
@@ -2264,7 +2248,24 @@ export const access_self_hosted_props_output: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -2272,7 +2273,7 @@ export const access_self_hosted_props_output: JsonSchema = {
       ]
     },
     "use_clientless_isolation_app_launcher_url": {
-      "$ref": "#/$defs/access_use_clientless_isolation_app_launcher_url"
+      "type": "boolean"
     }
   },
   "required": [
@@ -2282,24 +2283,10 @@ export const access_self_hosted_props_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_service_auth_401_redirect` in responses.
- */
-export const access_service_auth_401_redirect_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_session_duration-2` in responses.
- */
-export const access_session_duration_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_single_response-9` in responses.
  */
-export const access_single_response_9_output: JsonSchema = {
+export const access_single_response$$9: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -2315,24 +2302,10 @@ export const access_single_response_9_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_skip_app_launcher_login_page` in responses.
- */
-export const access_skip_app_launcher_login_page_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_skip_interstitial` in responses.
- */
-export const access_skip_interstitial_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_ssh_props` in responses.
  */
-export const access_ssh_props_output: JsonSchema = {
+export const access_ssh_props: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_self_hosted_props"
@@ -2342,7 +2315,24 @@ export const access_ssh_props_output: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -2358,7 +2348,7 @@ export const access_ssh_props_output: JsonSchema = {
 /**
  * The schema of `access_tags-2` in responses.
  */
-export const access_tags_2_output: JsonSchema = {
+export const access_tags$$2: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -2368,7 +2358,7 @@ export const access_tags_2_output: JsonSchema = {
 /**
  * The schema of `access_target_attributes` in responses.
  */
-export const access_target_attributes_output: JsonSchema = {
+export const access_target_attributes: JsonSchema = {
   "additionalProperties": {
     "items": {
       "type": "string"
@@ -2381,7 +2371,7 @@ export const access_target_attributes_output: JsonSchema = {
 /**
  * The schema of `access_target_criteria_base` in responses.
  */
-export const access_target_criteria_base_output: JsonSchema = {
+export const access_target_criteria_base: JsonSchema = {
   "properties": {
     "exclude": {
       "$ref": "#/$defs/access_target_rule"
@@ -2390,7 +2380,7 @@ export const access_target_criteria_base_output: JsonSchema = {
       "$ref": "#/$defs/access_target_rule"
     },
     "port": {
-      "$ref": "#/$defs/access_port"
+      "type": "integer"
     },
     "require": {
       "$ref": "#/$defs/access_target_rule"
@@ -2408,7 +2398,7 @@ export const access_target_criteria_base_output: JsonSchema = {
 /**
  * The schema of `access_target_criteria_infra_app` in responses.
  */
-export const access_target_criteria_infra_app_output: JsonSchema = {
+export const access_target_criteria_infra_app: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_target_criteria_base"
@@ -2416,7 +2406,10 @@ export const access_target_criteria_infra_app_output: JsonSchema = {
     {
       "properties": {
         "protocol": {
-          "$ref": "#/$defs/access_protocol_infra_app"
+          "enum": [
+            "SSH"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2427,7 +2420,7 @@ export const access_target_criteria_infra_app_output: JsonSchema = {
 /**
  * The schema of `access_target_criteria_self_hosted_app` in responses.
  */
-export const access_target_criteria_self_hosted_app_output: JsonSchema = {
+export const access_target_criteria_self_hosted_app: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_target_criteria_base"
@@ -2435,7 +2428,10 @@ export const access_target_criteria_self_hosted_app_output: JsonSchema = {
     {
       "properties": {
         "protocol": {
-          "$ref": "#/$defs/access_protocol_self_hosted_app"
+          "enum": [
+            "RDP"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2446,7 +2442,7 @@ export const access_target_criteria_self_hosted_app_output: JsonSchema = {
 /**
  * The schema of `access_target_rule` in responses.
  */
-export const access_target_rule_output: JsonSchema = {
+export const access_target_rule: JsonSchema = {
   "properties": {
     "tags": {
       "additionalProperties": {
@@ -2469,7 +2465,7 @@ export const access_target_rule_output: JsonSchema = {
 /**
  * The schema of `access_target_rule_attributes` in responses.
  */
-export const access_target_rule_attributes_output: JsonSchema = {
+export const access_target_rule_attributes: JsonSchema = {
   "properties": {
     "hostname": {
       "items": {
@@ -2483,49 +2479,10 @@ export const access_target_rule_attributes_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_title` in responses.
- */
-export const access_title_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_type` in responses.
- */
-export const access_type_output: JsonSchema = {
-  "enum": [
-    "self_hosted",
-    "end_user",
-    "saas",
-    "ssh",
-    "vnc",
-    "app_launcher",
-    "warp",
-    "biso",
-    "bookmark",
-    "dash_sso",
-    "infrastructure",
-    "rdp",
-    "mcp",
-    "mcp_portal",
-    "proxy_endpoint"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `access_use_clientless_isolation_app_launcher_url` in
- * responses.
- */
-export const access_use_clientless_isolation_app_launcher_url_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_usernames` in responses.
  */
-export const access_usernames_output: JsonSchema = {
+export const access_usernames: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -2535,7 +2492,7 @@ export const access_usernames_output: JsonSchema = {
 /**
  * The schema of `access_vnc_props` in responses.
  */
-export const access_vnc_props_output: JsonSchema = {
+export const access_vnc_props: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_self_hosted_props"
@@ -2545,7 +2502,24 @@ export const access_vnc_props_output: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -2561,7 +2535,7 @@ export const access_vnc_props_output: JsonSchema = {
 /**
  * The schema of `access_warp_props` in responses.
  */
-export const access_warp_props_output: JsonSchema = {
+export const access_warp_props: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_feature_app_props"
@@ -2577,7 +2551,24 @@ export const access_warp_props_output: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/policies/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/applications/policies/outputs.ts
index 09d77dae0..6e8ac46f0 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/policies/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/policies/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_app_policy_result` in responses.
  */
-export const access_app_policy_result_output: JsonSchema = {
+export const access_app_policy_result: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/access_app_policy_response"
@@ -20,7 +20,7 @@ export const access_app_policy_result_output: JsonSchema = {
 /**
  * The schema of `access_response_collection-9` in responses.
  */
-export const access_response_collection_9_output: JsonSchema = {
+export const access_response_collection$$9: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -42,7 +42,7 @@ export const access_response_collection_9_output: JsonSchema = {
 /**
  * The schema of `access_single_response-10` in responses.
  */
-export const access_single_response_10_output: JsonSchema = {
+export const access_single_response$$10: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/policies/tools.ts b/src/generated/forge-mcp/zeroTrust/access/applications/policies/tools.ts
index c12f7d946..03c83f55c 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/policies/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/policies/tools.ts
@@ -1,195 +1,172 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_identifier_output,
-  access_messages_output,
-  access_timestamp_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
 import {
-  access_access_group_rule_output,
-  access_allowed_clipboard_local_to_remote_formats_output,
-  access_allowed_clipboard_remote_to_local_formats_output,
-  access_any_valid_service_token_rule_output,
-  access_approval_group_output,
-  access_approval_groups_output,
-  access_approval_required_output,
-  access_auth_context_rule_output,
-  access_authentication_method_rule_output,
-  access_azure_group_rule_output,
-  access_base_policy_resp_output,
-  access_certificate_rule_output,
-  access_cloudflare_account_member_rule_output,
-  access_common_name_rule_output,
-  access_connection_rules_output,
-  access_connection_rules_rdp_output,
-  access_country_rule_output,
-  access_decision_output,
-  access_device_posture_rule_output,
-  access_domain_rule_output,
-  access_email_list_rule_output,
-  access_email_rule_output,
-  access_everyone_rule_output,
-  access_exclude_2_output,
-  access_external_evaluation_rule_output,
-  access_github_organization_rule_output,
-  access_gsuite_group_rule_output,
-  access_include_2_output,
-  access_ip_list_rule_output,
-  access_ip_rule_output,
-  access_isolation_required_output,
-  access_linked_app_token_rule_output,
-  access_login_method_rule_output,
-  access_mfa_config_output,
-  access_name_9_output,
-  access_oidc_claim_rule_output,
-  access_okta_group_rule_output,
-  access_policy_resolution_account_id_output,
-  access_policy_resp_output,
-  access_purpose_justification_prompt_output,
-  access_purpose_justification_required_output,
-  access_rdp_clipboard_format_output,
-  access_require_2_output,
-  access_rule_output,
-  access_saml_group_rule_output,
-  access_service_token_rule_output,
-  access_service_token_tag_rule_output,
-  access_session_duration_3_output,
-  access_user_risk_score_rule_output,
-  access_uuid_2_output,
+  access_access_group_rule,
+  access_allowed_clipboard_local_to_remote_formats,
+  access_allowed_clipboard_remote_to_local_formats,
+  access_any_valid_service_token_rule,
+  access_approval_group,
+  access_approval_groups,
+  access_auth_context_rule,
+  access_authentication_method_rule,
+  access_azure_group_rule,
+  access_base_policy_resp,
+  access_certificate_rule,
+  access_cloudflare_account_member_rule,
+  access_common_name_rule,
+  access_connection_rules,
+  access_connection_rules_rdp,
+  access_country_rule,
+  access_device_posture_rule,
+  access_domain_rule,
+  access_email_list_rule,
+  access_email_rule,
+  access_everyone_rule,
+  access_exclude$$2,
+  access_external_evaluation_rule,
+  access_github_organization_rule,
+  access_gsuite_group_rule,
+  access_include$$2,
+  access_ip_list_rule,
+  access_ip_rule,
+  access_linked_app_token_rule,
+  access_login_method_rule,
+  access_mfa_config,
+  access_oidc_claim_rule,
+  access_okta_group_rule,
+  access_policy_resp,
+  access_require$$2,
+  access_rule,
+  access_saml_group_rule,
+  access_service_token_rule,
+  access_service_token_tag_rule,
+  access_user_risk_score_rule,
 } from "../../outputs.js";
 import {
-  access_allow_email_alias_output,
-  access_app_policy_response_output,
-  access_connection_rules_infra_output,
-  access_connection_rules_ssh_output,
-  access_infra_mfa_config_output,
-  access_infra_policy_resp_output,
-  access_precedence_output,
-  access_usernames_output,
+  access_app_policy_response,
+  access_connection_rules_infra,
+  access_connection_rules_ssh,
+  access_infra_mfa_config,
+  access_infra_policy_resp,
+  access_usernames,
 } from "../outputs.js";
 import {
-  access_app_policy_result_output,
-  access_response_collection_9_output,
-  access_single_response_10_output,
+  access_app_policy_result,
+  access_response_collection$$9,
+  access_single_response$$10,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.applications.policies`.
+ * The tools of `zeroTrust.access.applications.policies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_applications_policies_get",
+    name: "zeroTrust_access_applications_policies_get",
     title: "Get an Access application policy",
-    description: "Fetches a single Access policy configured for an application. Returns both exclusively owned and reusable policies used by the application.\n\nThis method is deprecated.",
+    description: "Fetches a single Access policy configured for an application. Returns both exclusively owned and reusable policies used by the application.\n\nThis method is deprecated.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The application ID.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The policy ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id",
+            "policy_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "The application ID."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "The policy ID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-10",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_policy_result": access_app_policy_result_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_precedence": access_precedence_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-10": access_single_response_10_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-single": access_api$$response$$single,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_policy_result": access_app_policy_result,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-10": access_single_response$$10,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
       },
     },
     annotations: {
@@ -217,71 +194,57 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_policy_result": access_app_policy_result_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_precedence": access_precedence_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-10": access_single_response_10_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_policy_result": access_app_policy_result,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-10": access_single_response$$10,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
       },
     },
     request: (args) => ({
@@ -289,117 +252,115 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_applications_policies_list",
+    name: "zeroTrust_access_applications_policies_list",
     title: "List Access application policies",
-    description: "Lists Access policies configured for an application. Returns both exclusively scoped and reusable policies used by the application.\n\nThis method is deprecated.",
+    description: "Lists Access policies configured for an application. Returns both exclusively scoped and reusable policies used by the application.\n\nThis method is deprecated.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The application ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "The application ID."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 200,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 200,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-9",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_policy_result": access_app_policy_result_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_precedence": access_precedence_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_response_collection-9": access_response_collection_9_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_policy_result": access_app_policy_result,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_response_collection-9": access_response_collection$$9,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
       },
     },
     annotations: {
@@ -427,180 +388,158 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_policy_result": access_app_policy_result_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_precedence": access_precedence_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_response_collection-9": access_response_collection_9_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_policy_result": access_app_policy_result,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_response_collection-9": access_response_collection$$9,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/apps/${pathParam(args, "app_id")}/policies`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_applications_policies_make_reusable",
+    name: "zeroTrust_access_applications_policies_makeReusable",
     title: "Convert an Access application policy to a reusable policy",
-    description: "Converts an application-scoped policy to a reusable policy. The policy will no longer be exclusively scoped to the application. Further updates to the policy should go through the /accounts/{account_id}/policies/{uid} endpoint.",
+    description: "Converts an application-scoped policy to a reusable policy. The policy will no longer be exclusively scoped to the application. Further updates to the policy should go through the /accounts/{account_id}/policies/{uid} endpoint.\n\nPUT /accounts/{account_id}/access/apps/{app_id}/policies/{policy_id}/make_reusable",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "The application ID."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "The policy ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "The application ID.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The policy ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "app_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "app_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-9",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_policy_result": access_app_policy_result_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_precedence": access_precedence_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_response_collection-9": access_response_collection_9_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_policy_result": access_app_policy_result,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_response_collection-9": access_response_collection$$9,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
       },
     },
     annotations: {
@@ -627,72 +566,58 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_policy_result": access_app_policy_result_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_precedence": access_precedence_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_response_collection-9": access_response_collection_9_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_policy_result": access_app_policy_result,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_response_collection-9": access_response_collection$$9,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/outputs.ts
index e1b68a5bb..0a082f51c 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/outputs.ts
@@ -3,38 +3,10 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `access_percent_approved` in responses.
- */
-export const access_percent_approved_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_percent_blocked` in responses.
- */
-export const access_percent_blocked_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_percent_errored` in responses.
- */
-export const access_percent_errored_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_percent_users_processed` in responses.
- */
-export const access_percent_users_processed_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `access_policy_init_resp` in responses.
  */
-export const access_policy_init_resp_output: JsonSchema = {
+export const access_policy_init_resp: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -44,10 +16,13 @@ export const access_policy_init_resp_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/access_policy_test_id"
+              "type": "string"
             },
             "status": {
-              "$ref": "#/$defs/access_status"
+              "enum": [
+                "success"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
@@ -58,17 +33,10 @@ export const access_policy_init_resp_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_policy_test_id` in responses.
- */
-export const access_policy_test_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_policy_update_resp` in responses.
  */
-export const access_policy_update_resp_output: JsonSchema = {
+export const access_policy_update_resp: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -78,34 +46,40 @@ export const access_policy_update_resp_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/access_policy_test_id"
+              "type": "string"
             },
             "percent_approved": {
-              "$ref": "#/$defs/access_percent_approved"
+              "type": "integer"
             },
             "percent_blocked": {
-              "$ref": "#/$defs/access_percent_blocked"
+              "type": "integer"
             },
             "percent_errored": {
-              "$ref": "#/$defs/access_percent_errored"
+              "type": "integer"
             },
             "percent_users_processed": {
-              "$ref": "#/$defs/access_percent_users_processed"
+              "type": "integer"
             },
             "status": {
-              "$ref": "#/$defs/access_update_status"
+              "enum": [
+                "blocked",
+                "processing",
+                "exceeded time",
+                "complete"
+              ],
+              "type": "string"
             },
             "total_users": {
-              "$ref": "#/$defs/access_total_users"
+              "type": "integer"
             },
             "users_approved": {
-              "$ref": "#/$defs/access_users_approved"
+              "type": "integer"
             },
             "users_blocked": {
-              "$ref": "#/$defs/access_users_blocked"
+              "type": "integer"
             },
             "users_errored": {
-              "$ref": "#/$defs/access_users_errored"
+              "type": "integer"
             }
           },
           "type": "object"
@@ -115,54 +89,3 @@ export const access_policy_update_resp_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `access_status` in responses.
- */
-export const access_status_output: JsonSchema = {
-  "enum": [
-    "success"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `access_total_users` in responses.
- */
-export const access_total_users_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_update_status` in responses.
- */
-export const access_update_status_output: JsonSchema = {
-  "enum": [
-    "blocked",
-    "processing",
-    "exceeded time",
-    "complete"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `access_users_approved` in responses.
- */
-export const access_users_approved_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_users_blocked` in responses.
- */
-export const access_users_blocked_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_users_errored` in responses.
- */
-export const access_users_errored_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/schemas.ts
index f71842b84..cab41d432 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/schemas.ts
@@ -24,11 +24,3 @@ export const access_policy_init_req: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `access_policy_test_id`.
- */
-export const access_policy_test_id: JsonSchema = {
-  "description": "The UUID of the policy test.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/tools.ts b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/tools.ts
index d1d260b87..2bcaa7e3f 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/tools.ts
@@ -3,11 +3,10 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier } from "../../../schemas.js";
 import {
   access_access_group_rule,
   access_allowed_clipboard_local_to_remote_formats,
@@ -15,7 +14,6 @@ import {
   access_any_valid_service_token_rule,
   access_approval_group,
   access_approval_groups,
-  access_approval_required,
   access_auth_context_rule,
   access_authentication_method_rule,
   access_azure_group_rule,
@@ -26,79 +24,70 @@ import {
   access_connection_rules,
   access_connection_rules_rdp,
   access_country_rule,
-  access_decision,
   access_device_posture_rule,
   access_domain_rule,
   access_email_list_rule,
   access_email_rule,
   access_everyone_rule,
-  access_exclude_2,
+  access_exclude$$2,
   access_external_evaluation_rule,
   access_github_organization_rule,
   access_gsuite_group_rule,
-  access_include_2,
+  access_include$$2,
   access_ip_list_rule,
   access_ip_rule,
-  access_isolation_required,
   access_linked_app_token_rule,
   access_login_method_rule,
   access_mfa_config,
-  access_name_9,
   access_oidc_claim_rule,
   access_okta_group_rule,
   access_policy_req,
-  access_policy_resolution_account_id,
-  access_purpose_justification_prompt,
-  access_purpose_justification_required,
-  access_rdp_clipboard_format,
-  access_require_2,
+  access_require$$2,
   access_rule,
   access_saml_group_rule,
   access_service_token_rule,
   access_service_token_tag_rule,
-  access_session_duration_3,
   access_user_risk_score_rule,
 } from "../../schemas.js";
 import {
-  access_percent_approved_output,
-  access_percent_blocked_output,
-  access_percent_errored_output,
-  access_percent_users_processed_output,
-  access_policy_init_resp_output,
-  access_policy_test_id_output,
-  access_policy_update_resp_output,
-  access_status_output,
-  access_total_users_output,
-  access_update_status_output,
-  access_users_approved_output,
-  access_users_blocked_output,
-  access_users_errored_output,
+  access_policy_init_resp,
+  access_policy_update_resp,
 } from "./outputs.js";
-import { access_policy_init_req, access_policy_test_id } from "./schemas.js";
+import { access_policy_init_req } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.applications.policy_tests`.
+ * The tools of `zeroTrust.access.applications.policyTests`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_applications_policy_tests_create",
+    name: "zeroTrust_access_applications_policyTests_create",
     title: "Start Access policy test",
-    description: "Starts an Access policy test.",
+    description: "Starts an Access policy test.\n\nPOST /accounts/{account_id}/access/policy-tests",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_policy_init_req"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "access_access_group_rule": access_access_group_rule,
         "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
@@ -106,7 +95,6 @@ export const tools: readonly Tool[] = [
         "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
         "access_approval_group": access_approval_group,
         "access_approval_groups": access_approval_groups,
-        "access_approval_required": access_approval_required,
         "access_auth_context_rule": access_auth_context_rule,
         "access_authentication_method_rule": access_authentication_method_rule,
         "access_azure_group_rule": access_azure_group_rule,
@@ -117,50 +105,39 @@ export const tools: readonly Tool[] = [
         "access_connection_rules": access_connection_rules,
         "access_connection_rules_rdp": access_connection_rules_rdp,
         "access_country_rule": access_country_rule,
-        "access_decision": access_decision,
         "access_device_posture_rule": access_device_posture_rule,
         "access_domain_rule": access_domain_rule,
         "access_email_list_rule": access_email_list_rule,
         "access_email_rule": access_email_rule,
         "access_everyone_rule": access_everyone_rule,
-        "access_exclude-2": access_exclude_2,
+        "access_exclude-2": access_exclude$$2,
         "access_external_evaluation_rule": access_external_evaluation_rule,
         "access_github_organization_rule": access_github_organization_rule,
         "access_gsuite_group_rule": access_gsuite_group_rule,
-        "access_identifier": access_identifier,
-        "access_include-2": access_include_2,
+        "access_include-2": access_include$$2,
         "access_ip_list_rule": access_ip_list_rule,
         "access_ip_rule": access_ip_rule,
-        "access_isolation_required": access_isolation_required,
         "access_linked_app_token_rule": access_linked_app_token_rule,
         "access_login_method_rule": access_login_method_rule,
         "access_mfa_config": access_mfa_config,
-        "access_name-9": access_name_9,
         "access_oidc_claim_rule": access_oidc_claim_rule,
         "access_okta_group_rule": access_okta_group_rule,
         "access_policy_init_req": access_policy_init_req,
         "access_policy_req": access_policy_req,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt,
-        "access_purpose_justification_required": access_purpose_justification_required,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format,
-        "access_require-2": access_require_2,
+        "access_require-2": access_require$$2,
         "access_rule": access_rule,
         "access_saml_group_rule": access_saml_group_rule,
         "access_service_token_rule": access_service_token_rule,
         "access_service_token_tag_rule": access_service_token_tag_rule,
-        "access_session_duration-3": access_session_duration_3,
         "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_policy_init_resp",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_policy_init_resp": access_policy_init_resp_output,
-        "access_policy_test_id": access_policy_test_id_output,
-        "access_status": access_status_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_policy_init_resp": access_policy_init_resp,
       },
     },
     annotations: {
@@ -187,12 +164,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_policy_init_resp": access_policy_init_resp_output,
-        "access_policy_test_id": access_policy_test_id_output,
-        "access_status": access_status_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_policy_init_resp": access_policy_init_resp,
       },
     },
     request: (args) => ({
@@ -201,46 +176,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_applications_policy_tests_get",
+    name: "zeroTrust_access_applications_policyTests_get",
     title: "Get the current status of a given Access policy test",
-    description: "Fetches the current status of a given Access policy test.",
+    description: "Fetches the current status of a given Access policy test.\n\nGET /accounts/{account_id}/access/policy-tests/{policy_test_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "policy_test_id": {
-          "$ref": "#/$defs/access_policy_test_id",
-          "description": "The UUID of the policy test."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "policy_test_id": {
+              "description": "The UUID of the policy test.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_test_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_test_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_policy_test_id": access_policy_test_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_policy_update_resp",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_percent_approved": access_percent_approved_output,
-        "access_percent_blocked": access_percent_blocked_output,
-        "access_percent_errored": access_percent_errored_output,
-        "access_percent_users_processed": access_percent_users_processed_output,
-        "access_policy_test_id": access_policy_test_id_output,
-        "access_policy_update_resp": access_policy_update_resp_output,
-        "access_total_users": access_total_users_output,
-        "access_update_status": access_update_status_output,
-        "access_users_approved": access_users_approved_output,
-        "access_users_blocked": access_users_blocked_output,
-        "access_users_errored": access_users_errored_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_policy_update_resp": access_policy_update_resp,
       },
     },
     annotations: {
@@ -268,20 +239,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_percent_approved": access_percent_approved_output,
-        "access_percent_blocked": access_percent_blocked_output,
-        "access_percent_errored": access_percent_errored_output,
-        "access_percent_users_processed": access_percent_users_processed_output,
-        "access_policy_test_id": access_policy_test_id_output,
-        "access_policy_update_resp": access_policy_update_resp_output,
-        "access_total_users": access_total_users_output,
-        "access_update_status": access_update_status_output,
-        "access_users_approved": access_users_approved_output,
-        "access_users_blocked": access_users_blocked_output,
-        "access_users_errored": access_users_errored_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_policy_update_resp": access_policy_update_resp,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/users/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/users/outputs.ts
index 990fe575b..0ae0583d2 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/users/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/users/outputs.ts
@@ -6,19 +6,24 @@ import type { JsonSchema } from "../../../../../_/tool.js";
 /**
  * The schema of `access_policy_users` in responses.
  */
-export const access_policy_users_output: JsonSchema = {
+export const access_policy_users: JsonSchema = {
   "properties": {
     "email": {
-      "$ref": "#/$defs/access_email-2"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/access_uuid"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-10"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/access_user_result"
+      "enum": [
+        "approved",
+        "blocked",
+        "error"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -27,7 +32,7 @@ export const access_policy_users_output: JsonSchema = {
 /**
  * The schema of `access_policy_users_resp` in responses.
  */
-export const access_policy_users_resp_output: JsonSchema = {
+export const access_policy_users_resp: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -45,15 +50,3 @@ export const access_policy_users_resp_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `access_user_result` in responses.
- */
-export const access_user_result_output: JsonSchema = {
-  "enum": [
-    "approved",
-    "blocked",
-    "error"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/users/tools.ts b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/users/tools.ts
index 4bfce7ea1..eec016c4d 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/users/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/policyTests/users/tools.ts
@@ -1,83 +1,80 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
-  access_uuid_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../../outputs.js";
-import { access_identifier } from "../../../../schemas.js";
-import {
-  access_email_2_output,
-  access_name_10_output,
-} from "../../../outputs.js";
-import { access_policy_test_id } from "../schemas.js";
-import {
-  access_policy_users_output,
-  access_policy_users_resp_output,
-  access_user_result_output,
-} from "./outputs.js";
+import { access_policy_users, access_policy_users_resp } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.applications.policy_tests.users`.
+ * The tools of `zeroTrust.access.applications.policyTests.users`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_applications_policy_tests_users_list",
+    name: "zeroTrust_access_applications_policyTests_users_list",
     title: "Get an Access policy test users page",
-    description: "Fetches a single page of user results from an Access policy test.",
+    description: "Fetches a single page of user results from an Access policy test.\n\nGET /accounts/{account_id}/access/policy-tests/{policy_test_id}/users",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 25,
-          "type": "integer"
-        },
-        "policy_test_id": {
-          "$ref": "#/$defs/access_policy_test_id",
-          "description": "The UUID of the policy test."
-        },
-        "status": {
-          "description": "Filter users by their policy evaluation status.",
-          "enum": [
-            "success",
-            "fail",
-            "error"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "policy_test_id": {
+              "description": "The UUID of the policy test.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_test_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 25,
+              "type": "integer"
+            },
+            "status": {
+              "description": "Filter users by their policy evaluation status.",
+              "enum": [
+                "success",
+                "fail",
+                "error"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_test_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_policy_test_id": access_policy_test_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_policy_users_resp",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_email-2": access_email_2_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_policy_users": access_policy_users_output,
-        "access_policy_users_resp": access_policy_users_resp_output,
-        "access_user_result": access_user_result_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_policy_users": access_policy_users,
+        "access_policy_users_resp": access_policy_users_resp,
       },
     },
     annotations: {
@@ -105,23 +102,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_email-2": access_email_2_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_policy_users": access_policy_users_output,
-        "access_policy_users_resp": access_policy_users_resp_output,
-        "access_user_result": access_user_result_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_policy_users": access_policy_users,
+        "access_policy_users_resp": access_policy_users_resp,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/policy-tests/${pathParam(args, "policy_test_id")}/users`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/applications/schemas.ts
index 0d5675b29..56035936c 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/schemas.ts
@@ -3,62 +3,6 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_allow_all_headers`.
- */
-export const access_allow_all_headers: JsonSchema = {
-  "description": "Allows all HTTP request headers.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_all_methods`.
- */
-export const access_allow_all_methods: JsonSchema = {
-  "description": "Allows all HTTP request methods.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_all_origins`.
- */
-export const access_allow_all_origins: JsonSchema = {
-  "description": "Allows all origins.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_authenticate_via_warp-2`.
- */
-export const access_allow_authenticate_via_warp_2: JsonSchema = {
-  "description": "When set to true, users can authenticate to this application using their WARP session.  When set to false this application will always require direct IdP authentication. This setting always overrides the organization setting for WARP authentication.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_credentials`.
- */
-export const access_allow_credentials: JsonSchema = {
-  "description": "When set to `true`, includes credentials (cookies, authorization headers, or TLS client certificates) with requests.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_email_alias`.
- */
-export const access_allow_email_alias: JsonSchema = {
-  "description": "Enables using Identity Provider email alias as SSH username.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_allow_iframe`.
- */
-export const access_allow_iframe: JsonSchema = {
-  "description": "Enables loading application content in an iFrame.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_allowed_headers`.
  */
@@ -114,28 +58,6 @@ export const access_allowed_origins: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_app_id`.
- */
-export const access_app_id: JsonSchema = {
-  "oneOf": [
-    {
-      "$ref": "#/$defs/access_identifier"
-    },
-    {
-      "$ref": "#/$defs/access_uuid"
-    }
-  ]
-};
-
-/**
- * The schema of `access_app_launcher_logo_url`.
- */
-export const access_app_launcher_logo_url: JsonSchema = {
-  "description": "The image URL of the logo shown in the App Launcher header.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_app_launcher_props`.
  */
@@ -147,34 +69,52 @@ export const access_app_launcher_props: JsonSchema = {
     {
       "properties": {
         "app_launcher_logo_url": {
-          "$ref": "#/$defs/access_app_launcher_logo_url",
-          "description": "The image URL of the logo shown in the App Launcher header."
+          "description": "The image URL of the logo shown in the App Launcher header.",
+          "type": "string"
         },
         "bg_color": {
-          "$ref": "#/$defs/access_bg_color",
-          "description": "The background color of the App Launcher page."
+          "description": "The background color of the App Launcher page.",
+          "type": "string"
         },
         "footer_links": {
           "$ref": "#/$defs/access_footer_links",
           "description": "The links in the App Launcher footer."
         },
         "header_bg_color": {
-          "$ref": "#/$defs/access_header_bg_color",
-          "description": "The background color of the App Launcher header."
+          "description": "The background color of the App Launcher header.",
+          "type": "string"
         },
         "landing_page_design": {
           "$ref": "#/$defs/access_landing_page_design",
           "description": "The design of the App Launcher landing page shown to users when they log in."
         },
         "skip_app_launcher_login_page": {
-          "$ref": "#/$defs/access_skip_app_launcher_login_page",
           "default": false,
-          "description": "Determines when to skip the App Launcher landing page."
+          "description": "Determines when to skip the App Launcher landing page.",
+          "type": "boolean"
         },
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "description": "The application type.",
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -187,14 +127,6 @@ export const access_app_launcher_props: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_app_launcher_visible`.
- */
-export const access_app_launcher_visible: JsonSchema = {
-  "description": "Displays the application in the App Launcher.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_app_policy_link`.
  */
@@ -202,16 +134,16 @@ export const access_app_policy_link: JsonSchema = {
   "description": "A JSON that links a reusable policy to an application.",
   "properties": {
     "account_id": {
-      "$ref": "#/$defs/access_identifier",
-      "description": "Identifier."
+      "description": "Identifier.",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/access_uuid-2",
-      "description": "The UUID of the policy"
+      "description": "The UUID of the policy",
+      "type": "string"
     },
     "precedence": {
-      "$ref": "#/$defs/access_precedence",
-      "description": "The order of execution for this policy. Must be unique for each policy within an app.\n"
+      "description": "The order of execution for this policy. Must be unique for each policy within an app.",
+      "type": "integer"
     }
   },
   "type": "object"
@@ -225,8 +157,8 @@ export const access_app_policy_request: JsonSchema = {
     {
       "properties": {
         "precedence": {
-          "$ref": "#/$defs/access_precedence",
-          "description": "The order of execution for this policy. Must be unique for each policy within an app.\n"
+          "description": "The order of execution for this policy. Must be unique for each policy within an app.",
+          "type": "integer"
         }
       },
       "type": "object"
@@ -255,7 +187,8 @@ export const access_app_req_embedded_policies: JsonSchema = {
                 "type": "string"
               },
               {
-                "$ref": "#/$defs/access_uuid-2"
+                "description": "The UUID of the policy",
+                "type": "string"
               }
             ]
           },
@@ -264,8 +197,8 @@ export const access_app_req_embedded_policies: JsonSchema = {
               {
                 "properties": {
                   "id": {
-                    "$ref": "#/$defs/access_uuid-2",
-                    "description": "The UUID of the policy"
+                    "description": "The UUID of the policy",
+                    "type": "string"
                   }
                 },
                 "type": "object"
@@ -481,22 +414,6 @@ export const access_app_resp_embedded_target_criteria_self_hosted: JsonSchema =
   "type": "object"
 };
 
-/**
- * The schema of `access_auto_redirect_to_identity-2`.
- */
-export const access_auto_redirect_to_identity_2: JsonSchema = {
-  "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_bg_color`.
- */
-export const access_bg_color: JsonSchema = {
-  "description": "The background color of the App Launcher page.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_biso_props`.
  */
@@ -510,7 +427,25 @@ export const access_biso_props: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "description": "The application type.",
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -530,21 +465,21 @@ export const access_bookmark_props: JsonSchema = {
   "description": "Bookmark application",
   "properties": {
     "app_launcher_visible": {
-      "$ref": "#/$defs/access_app_launcher_visible",
       "default": true,
-      "description": "Displays the application in the App Launcher."
+      "description": "Displays the application in the App Launcher.",
+      "type": "boolean"
     },
     "domain": {
       "description": "The URL or domain of the bookmark.",
       "type": "string"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url",
-      "description": "The image URL for the logo shown in the App Launcher dashboard."
+      "description": "The image URL for the logo shown in the App Launcher dashboard.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8",
-      "description": "The name of the application."
+      "description": "The name of the application.",
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/access_tags-2",
@@ -554,7 +489,25 @@ export const access_bookmark_props: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "description": "The application type.",
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -565,22 +518,6 @@ export const access_bookmark_props: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_button_color`.
- */
-export const access_button_color: JsonSchema = {
-  "description": "The background color of the log in button on the landing page.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_button_text_color`.
- */
-export const access_button_text_color: JsonSchema = {
-  "description": "The color of the text in the log in button on the landing page.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_connection_rules_infra`.
  */
@@ -602,8 +539,8 @@ export const access_connection_rules_ssh: JsonSchema = {
   "description": "The SSH-specific rules that define how users may connect to the targets secured by your application.",
   "properties": {
     "allow_email_alias": {
-      "$ref": "#/$defs/access_allow_email_alias",
-      "description": "Enables using Identity Provider email alias as SSH username."
+      "description": "Enables using Identity Provider email alias as SSH username.",
+      "type": "boolean"
     },
     "usernames": {
       "$ref": "#/$defs/access_usernames",
@@ -622,20 +559,20 @@ export const access_connection_rules_ssh: JsonSchema = {
 export const access_cors_headers: JsonSchema = {
   "properties": {
     "allow_all_headers": {
-      "$ref": "#/$defs/access_allow_all_headers",
-      "description": "Allows all HTTP request headers."
+      "description": "Allows all HTTP request headers.",
+      "type": "boolean"
     },
     "allow_all_methods": {
-      "$ref": "#/$defs/access_allow_all_methods",
-      "description": "Allows all HTTP request methods."
+      "description": "Allows all HTTP request methods.",
+      "type": "boolean"
     },
     "allow_all_origins": {
-      "$ref": "#/$defs/access_allow_all_origins",
-      "description": "Allows all origins."
+      "description": "Allows all origins.",
+      "type": "boolean"
     },
     "allow_credentials": {
-      "$ref": "#/$defs/access_allow_credentials",
-      "description": "When set to `true`, includes credentials (cookies, authorization headers, or TLS client certificates) with requests."
+      "description": "When set to `true`, includes credentials (cookies, authorization headers, or TLS client certificates) with requests.",
+      "type": "boolean"
     },
     "allowed_headers": {
       "$ref": "#/$defs/access_allowed_headers",
@@ -650,41 +587,17 @@ export const access_cors_headers: JsonSchema = {
       "description": "Allowed origins."
     },
     "max_age": {
-      "$ref": "#/$defs/access_max_age",
-      "description": "The maximum number of seconds the results of a preflight request can be cached."
+      "description": "The maximum number of seconds the results of a preflight request can be cached.",
+      "type": "number"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_custom_deny_message`.
- */
-export const access_custom_deny_message: JsonSchema = {
-  "description": "The custom error message shown to a user when they are denied access to the application.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_custom_deny_url`.
- */
-export const access_custom_deny_url: JsonSchema = {
-  "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_custom_non_identity_deny_url`.
- */
-export const access_custom_non_identity_deny_url: JsonSchema = {
-  "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_custom_pages-2`.
  */
-export const access_custom_pages_2: JsonSchema = {
+export const access_custom_pages$$2: JsonSchema = {
   "description": "The custom pages that will be displayed when applicable for this application",
   "items": {
     "type": "string"
@@ -696,7 +609,7 @@ export const access_custom_pages_2: JsonSchema = {
  * The schema of `access_destination_overrides`.
  */
 export const access_destination_overrides: JsonSchema = {
-  "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n",
+  "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.",
   "items": {
     "properties": {
       "behavior": {
@@ -707,7 +620,7 @@ export const access_destination_overrides: JsonSchema = {
         "type": "string"
       },
       "path_pattern": {
-        "description": "The request path pattern to match. Wildcards (`*`) are supported, but each path segment may have at most one wildcard. Unlike the `uri` in public destinations, override path patterns do not implicitly cover subpaths; to do that, use a wildcard.\n",
+        "description": "The request path pattern to match. Wildcards (`*`) are supported, but each path segment may have at most one wildcard. Unlike the `uri` in public destinations, override path patterns do not implicitly cover subpaths; to do that, use a wildcard.",
         "type": "string"
       }
     },
@@ -725,14 +638,14 @@ export const access_destination_overrides: JsonSchema = {
  * The schema of `access_destinations`.
  */
 export const access_destinations: JsonSchema = {
-  "description": "List of destinations secured by Access. This supersedes `self_hosted_domains` to allow for more flexibility in defining different types of domains. If `destinations` are provided, then `self_hosted_domains` will be ignored.\n",
+  "description": "List of destinations secured by Access. This supersedes `self_hosted_domains` to allow for more flexibility in defining different types of domains. If `destinations` are provided, then `self_hosted_domains` will be ignored.",
   "items": {
     "oneOf": [
       {
         "properties": {
           "overrides": {
             "$ref": "#/$defs/access_destination_overrides",
-            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
           },
           "type": {
             "enum": [
@@ -741,7 +654,7 @@ export const access_destinations: JsonSchema = {
             "type": "string"
           },
           "uri": {
-            "description": "The URI of the destination. Public destinations' URIs can include a domain and path with [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).\n",
+            "description": "The URI of the destination. Public destinations' URIs can include a domain and path with [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).",
             "type": "string"
           }
         },
@@ -766,7 +679,7 @@ export const access_destinations: JsonSchema = {
             "type": "string"
           },
           "port_range": {
-            "description": "The port range of the destination. Can be a single port or a range of ports. When omitted, all ports will match.\n",
+            "description": "The port range of the destination. Can be a single port or a range of ports. When omitted, all ports will match.",
             "type": "string"
           },
           "type": {
@@ -801,7 +714,7 @@ export const access_destinations: JsonSchema = {
         "properties": {
           "overrides": {
             "$ref": "#/$defs/access_destination_overrides",
-            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
           },
           "type": {
             "enum": [
@@ -824,7 +737,7 @@ export const access_destinations: JsonSchema = {
         "properties": {
           "overrides": {
             "$ref": "#/$defs/access_destination_overrides",
-            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
           },
           "type": {
             "enum": [
@@ -847,7 +760,7 @@ export const access_destinations: JsonSchema = {
         "properties": {
           "overrides": {
             "$ref": "#/$defs/access_destination_overrides",
-            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
           },
           "type": {
             "enum": [
@@ -865,7 +778,7 @@ export const access_destinations: JsonSchema = {
         "properties": {
           "overrides": {
             "$ref": "#/$defs/access_destination_overrides",
-            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+            "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
           },
           "type": {
             "enum": [
@@ -884,30 +797,6 @@ export const access_destinations: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_domain`.
- */
-export const access_domain: JsonSchema = {
-  "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_eager_redirect_cookie_setting`.
- */
-export const access_eager_redirect_cookie_setting: JsonSchema = {
-  "description": "Preemptively sets the Access session cookie on every hostname in a multi-hostname self-hosted application during the initial redirect chain, rather than setting it lazily on first visit. Defaults to true. Set to false to disable the eager redirect cookie behavior.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_enable_binding_cookie`.
- */
-export const access_enable_binding_cookie: JsonSchema = {
-  "description": "Enables the binding cookie, which increases security against compromised authorization tokens and CSRF attacks.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_end_user_all_preview_workers_destination`.
  */
@@ -915,7 +804,7 @@ export const access_end_user_all_preview_workers_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides",
-      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
     },
     "type": {
       "enum": [
@@ -937,7 +826,7 @@ export const access_end_user_all_workers_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides",
-      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
     },
     "type": {
       "enum": [
@@ -1010,7 +899,7 @@ export const access_end_user_preview_worker_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides",
-      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
     },
     "type": {
       "enum": [
@@ -1034,7 +923,7 @@ export const access_end_user_preview_worker_destination: JsonSchema = {
  * The schema of `access_end_user_props`.
  */
 export const access_end_user_props: JsonSchema = {
-  "description": "An end user application is a public self-hosted application backed by exactly one organization-owned user population. End user applications use a canonical allow-everyone policy and do not support custom policies, SCIM configuration, MFA configuration, or private destinations.\n",
+  "description": "An end user application is a public self-hosted application backed by exactly one organization-owned user population. End user applications use a canonical allow-everyone policy and do not support custom policies, SCIM configuration, MFA configuration, or private destinations.",
   "properties": {
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps",
@@ -1045,12 +934,12 @@ export const access_end_user_props: JsonSchema = {
       "description": "Public hostname and Workers destinations secured by Access."
     },
     "domain": {
-      "$ref": "#/$defs/access_domain",
-      "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher."
+      "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8",
-      "description": "The name of the application."
+      "description": "The name of the application.",
+      "type": "string"
     },
     "oauth_configuration": {
       "$ref": "#/$defs/access_end_user_oauth_configuration"
@@ -1058,12 +947,30 @@ export const access_end_user_props: JsonSchema = {
     "self_hosted_domains": {
       "$ref": "#/$defs/access_self_hosted_domains",
       "default": [],
-      "description": "List of public domains that Access will secure. This field is deprecated in favor of `destinations` and will be supported until **November 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be ignored.\n"
+      "description": "List of public domains that Access will secure. This field is deprecated in favor of `destinations` and will be supported until **November 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be ignored."
     },
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "description": "The application type.",
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "enum": [
@@ -1076,7 +983,8 @@ export const access_end_user_props: JsonSchema = {
     "user_populations": {
       "description": "The single user population associated with this application.",
       "items": {
-        "$ref": "#/$defs/access_uuid"
+        "description": "UUID.",
+        "type": "string"
       },
       "maxItems": 1,
       "minItems": 1,
@@ -1098,7 +1006,7 @@ export const access_end_user_public_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides",
-      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
     },
     "type": {
       "enum": [
@@ -1124,7 +1032,7 @@ export const access_end_user_worker_destination: JsonSchema = {
   "properties": {
     "overrides": {
       "$ref": "#/$defs/access_destination_overrides",
-      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations.\n"
+      "description": "Rules that override how Access handles requests to this destination. Each rule can make a matching path public, bypassing Access authentication. Overrides are supported for public destinations and Worker destinations."
     },
     "type": {
       "enum": [
@@ -1154,38 +1062,55 @@ export const access_feature_app_props: JsonSchema = {
       "description": "The identity providers your users can select when connecting to this application. Defaults to all IdPs configured in your account."
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2",
       "default": false,
-      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps."
+      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps.",
+      "type": "boolean"
     },
     "custom_deny_url": {
-      "$ref": "#/$defs/access_custom_deny_url",
-      "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules."
+      "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules.",
+      "type": "string"
     },
     "custom_non_identity_deny_url": {
-      "$ref": "#/$defs/access_custom_non_identity_deny_url",
-      "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules."
+      "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules.",
+      "type": "string"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2",
       "description": "The custom pages that will be displayed when applicable for this application"
     },
     "domain": {
-      "$ref": "#/$defs/access_domain",
-      "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher."
+      "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8",
-      "description": "The name of the application."
+      "description": "The name of the application.",
+      "type": "string"
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration-2",
       "default": "24h",
-      "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h."
+      "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/access_type",
-      "description": "The application type."
+      "description": "The application type.",
+      "enum": [
+        "self_hosted",
+        "end_user",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -1219,30 +1144,6 @@ export const access_footer_links: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_header_bg_color`.
- */
-export const access_header_bg_color: JsonSchema = {
-  "description": "The background color of the App Launcher header.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_http_only_cookie_attribute`.
- */
-export const access_http_only_cookie_attribute: JsonSchema = {
-  "description": "Enables the HttpOnly cookie attribute, which increases security against XSS attacks.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_image_url`.
- */
-export const access_image_url: JsonSchema = {
-  "description": "The URL of the image shown on the landing page.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_infra_app_req_embedded_policies`.
  */
@@ -1324,8 +1225,8 @@ export const access_infra_props: JsonSchema = {
           "description": "Configures multi-factor authentication (MFA) settings for infrastructure applications."
         },
         "name": {
-          "$ref": "#/$defs/access_name-8",
-          "description": "The name of the application."
+          "description": "The name of the application.",
+          "type": "string"
         },
         "session_duration": {
           "default": "24h",
@@ -1335,7 +1236,25 @@ export const access_infra_props: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "description": "The application type.",
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -1359,46 +1278,30 @@ export const access_landing_page_design: JsonSchema = {
   "description": "The design of the App Launcher landing page shown to users when they log in.",
   "properties": {
     "button_color": {
-      "$ref": "#/$defs/access_button_color",
-      "description": "The background color of the log in button on the landing page."
+      "description": "The background color of the log in button on the landing page.",
+      "type": "string"
     },
     "button_text_color": {
-      "$ref": "#/$defs/access_button_text_color",
-      "description": "The color of the text in the log in button on the landing page."
+      "description": "The color of the text in the log in button on the landing page.",
+      "type": "string"
     },
     "image_url": {
-      "$ref": "#/$defs/access_image_url",
-      "description": "The URL of the image shown on the landing page."
+      "description": "The URL of the image shown on the landing page.",
+      "type": "string"
     },
     "message": {
-      "$ref": "#/$defs/access_message",
-      "description": "The message shown on the landing page."
+      "description": "The message shown on the landing page.",
+      "type": "string"
     },
     "title": {
-      "$ref": "#/$defs/access_title",
       "default": "Welcome!",
-      "description": "The title shown on the landing page."
+      "description": "The title shown on the landing page.",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_logo_url`.
- */
-export const access_logo_url: JsonSchema = {
-  "description": "The image URL for the logo shown in the App Launcher dashboard.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_max_age`.
- */
-export const access_max_age: JsonSchema = {
-  "description": "The maximum number of seconds the results of a preflight request can be cached.",
-  "type": "number"
-};
-
 /**
  * The schema of `access_mcp_portal_props`.
  */
@@ -1406,29 +1309,29 @@ export const access_mcp_portal_props: JsonSchema = {
   "description": "MCP Server Portal Application",
   "properties": {
     "allow_authenticate_via_warp": {
-      "$ref": "#/$defs/access_allow_authenticate_via_warp-2",
-      "description": "When set to true, users can authenticate to this application using their WARP session.  When set to false this application will always require direct IdP authentication. This setting always overrides the organization setting for WARP authentication."
+      "description": "When set to true, users can authenticate to this application using their WARP session.  When set to false this application will always require direct IdP authentication. This setting always overrides the organization setting for WARP authentication.",
+      "type": "boolean"
     },
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps",
       "description": "The identity providers your users can select when connecting to this application. Defaults to all IdPs configured in your account."
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2",
       "default": false,
-      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps."
+      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps.",
+      "type": "boolean"
     },
     "custom_deny_message": {
-      "$ref": "#/$defs/access_custom_deny_message",
-      "description": "The custom error message shown to a user when they are denied access to the application."
+      "description": "The custom error message shown to a user when they are denied access to the application.",
+      "type": "string"
     },
     "custom_deny_url": {
-      "$ref": "#/$defs/access_custom_deny_url",
-      "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules."
+      "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules.",
+      "type": "string"
     },
     "custom_non_identity_deny_url": {
-      "$ref": "#/$defs/access_custom_non_identity_deny_url",
-      "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules."
+      "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules.",
+      "type": "string"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2",
@@ -1437,45 +1340,45 @@ export const access_mcp_portal_props: JsonSchema = {
     "destinations": {
       "$ref": "#/$defs/access_destinations",
       "default": [],
-      "description": "List of destinations secured by Access. This supersedes `self_hosted_domains` to allow for more flexibility in defining different types of domains. If `destinations` are provided, then `self_hosted_domains` will be ignored.\n"
+      "description": "List of destinations secured by Access. This supersedes `self_hosted_domains` to allow for more flexibility in defining different types of domains. If `destinations` are provided, then `self_hosted_domains` will be ignored."
     },
     "domain": {
-      "$ref": "#/$defs/access_domain",
-      "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher."
+      "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher.",
+      "type": "string"
     },
     "http_only_cookie_attribute": {
-      "$ref": "#/$defs/access_http_only_cookie_attribute",
       "default": true,
-      "description": "Enables the HttpOnly cookie attribute, which increases security against XSS attacks."
+      "description": "Enables the HttpOnly cookie attribute, which increases security against XSS attacks.",
+      "type": "boolean"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url",
-      "description": "The image URL for the logo shown in the App Launcher dashboard."
+      "description": "The image URL for the logo shown in the App Launcher dashboard.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8",
-      "description": "The name of the application."
+      "description": "The name of the application.",
+      "type": "string"
     },
     "oauth_configuration": {
       "$ref": "#/$defs/access_oauth_configuration",
-      "description": "**Beta:** Optional configuration for managing an OAuth authorization flow controlled by Access. When set, Access will act as the OAuth authorization server for this application. Only compatible with OAuth clients that support [RFC 8707](https://datatracker.ietf.org/doc/html/rfc8707) (Resource Indicators for OAuth 2.0). This feature is currently in beta.\n"
+      "description": "**Beta:** Optional configuration for managing an OAuth authorization flow controlled by Access. When set, Access will act as the OAuth authorization server for this application. Only compatible with OAuth clients that support [RFC 8707](https://datatracker.ietf.org/doc/html/rfc8707) (Resource Indicators for OAuth 2.0). This feature is currently in beta."
     },
     "options_preflight_bypass": {
-      "$ref": "#/$defs/access_options_preflight_bypass",
-      "description": "Allows options preflight requests to bypass Access authentication and go directly to the origin. Cannot turn on if cors_headers is set."
+      "description": "Allows options preflight requests to bypass Access authentication and go directly to the origin. Cannot turn on if cors_headers is set.",
+      "type": "boolean"
     },
     "same_site_cookie_attribute": {
-      "$ref": "#/$defs/access_same_site_cookie_attribute",
-      "description": "Sets the SameSite cookie setting, which provides increased security against CSRF attacks."
+      "description": "Sets the SameSite cookie setting, which provides increased security against CSRF attacks.",
+      "type": "string"
     },
     "scim_config": {
       "$ref": "#/$defs/access_scim_config",
       "description": "Configuration for provisioning to this application via SCIM. This is currently in closed beta."
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration-2",
       "default": "24h",
-      "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h."
+      "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/access_tags-2",
@@ -1485,7 +1388,25 @@ export const access_mcp_portal_props: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "description": "The application type.",
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -1506,29 +1427,29 @@ export const access_mcp_props: JsonSchema = {
   "description": "MCP Server Application",
   "properties": {
     "allow_authenticate_via_warp": {
-      "$ref": "#/$defs/access_allow_authenticate_via_warp-2",
-      "description": "When set to true, users can authenticate to this application using their WARP session.  When set to false this application will always require direct IdP authentication. This setting always overrides the organization setting for WARP authentication."
+      "description": "When set to true, users can authenticate to this application using their WARP session.  When set to false this application will always require direct IdP authentication. This setting always overrides the organization setting for WARP authentication.",
+      "type": "boolean"
     },
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps",
       "description": "The identity providers your users can select when connecting to this application. Defaults to all IdPs configured in your account."
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2",
       "default": false,
-      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps."
+      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps.",
+      "type": "boolean"
     },
     "custom_deny_message": {
-      "$ref": "#/$defs/access_custom_deny_message",
-      "description": "The custom error message shown to a user when they are denied access to the application."
+      "description": "The custom error message shown to a user when they are denied access to the application.",
+      "type": "string"
     },
     "custom_deny_url": {
-      "$ref": "#/$defs/access_custom_deny_url",
-      "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules."
+      "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules.",
+      "type": "string"
     },
     "custom_non_identity_deny_url": {
-      "$ref": "#/$defs/access_custom_non_identity_deny_url",
-      "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules."
+      "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules.",
+      "type": "string"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2",
@@ -1537,41 +1458,41 @@ export const access_mcp_props: JsonSchema = {
     "destinations": {
       "$ref": "#/$defs/access_destinations",
       "default": [],
-      "description": "List of destinations secured by Access. This supersedes `self_hosted_domains` to allow for more flexibility in defining different types of domains. If `destinations` are provided, then `self_hosted_domains` will be ignored.\n"
+      "description": "List of destinations secured by Access. This supersedes `self_hosted_domains` to allow for more flexibility in defining different types of domains. If `destinations` are provided, then `self_hosted_domains` will be ignored."
     },
     "http_only_cookie_attribute": {
-      "$ref": "#/$defs/access_http_only_cookie_attribute",
       "default": true,
-      "description": "Enables the HttpOnly cookie attribute, which increases security against XSS attacks."
+      "description": "Enables the HttpOnly cookie attribute, which increases security against XSS attacks.",
+      "type": "boolean"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url",
-      "description": "The image URL for the logo shown in the App Launcher dashboard."
+      "description": "The image URL for the logo shown in the App Launcher dashboard.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8",
-      "description": "The name of the application."
+      "description": "The name of the application.",
+      "type": "string"
     },
     "oauth_configuration": {
       "$ref": "#/$defs/access_oauth_configuration",
-      "description": "**Beta:** Optional configuration for managing an OAuth authorization flow controlled by Access. When set, Access will act as the OAuth authorization server for this application. Only compatible with OAuth clients that support [RFC 8707](https://datatracker.ietf.org/doc/html/rfc8707) (Resource Indicators for OAuth 2.0). This feature is currently in beta.\n"
+      "description": "**Beta:** Optional configuration for managing an OAuth authorization flow controlled by Access. When set, Access will act as the OAuth authorization server for this application. Only compatible with OAuth clients that support [RFC 8707](https://datatracker.ietf.org/doc/html/rfc8707) (Resource Indicators for OAuth 2.0). This feature is currently in beta."
     },
     "options_preflight_bypass": {
-      "$ref": "#/$defs/access_options_preflight_bypass",
-      "description": "Allows options preflight requests to bypass Access authentication and go directly to the origin. Cannot turn on if cors_headers is set."
+      "description": "Allows options preflight requests to bypass Access authentication and go directly to the origin. Cannot turn on if cors_headers is set.",
+      "type": "boolean"
     },
     "same_site_cookie_attribute": {
-      "$ref": "#/$defs/access_same_site_cookie_attribute",
-      "description": "Sets the SameSite cookie setting, which provides increased security against CSRF attacks."
+      "description": "Sets the SameSite cookie setting, which provides increased security against CSRF attacks.",
+      "type": "string"
     },
     "scim_config": {
       "$ref": "#/$defs/access_scim_config",
       "description": "Configuration for provisioning to this application via SCIM. This is currently in closed beta."
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration-2",
       "default": "24h",
-      "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h."
+      "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/access_tags-2",
@@ -1581,7 +1502,25 @@ export const access_mcp_props: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "description": "The application type.",
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -1595,27 +1534,11 @@ export const access_mcp_props: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_message`.
- */
-export const access_message: JsonSchema = {
-  "description": "The message shown on the landing page.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_name-8`.
- */
-export const access_name_8: JsonSchema = {
-  "description": "The name of the application.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_oauth_configuration`.
  */
 export const access_oauth_configuration: JsonSchema = {
-  "description": "**Beta:** Optional configuration for managing an OAuth authorization flow controlled by Access. When set, Access will act as the OAuth authorization server for this application. Only compatible with OAuth clients that support [RFC 8707](https://datatracker.ietf.org/doc/html/rfc8707) (Resource Indicators for OAuth 2.0). This feature is currently in beta.\n",
+  "description": "**Beta:** Optional configuration for managing an OAuth authorization flow controlled by Access. When set, Access will act as the OAuth authorization server for this application. Only compatible with OAuth clients that support [RFC 8707](https://datatracker.ietf.org/doc/html/rfc8707) (Resource Indicators for OAuth 2.0). This feature is currently in beta.",
   "properties": {
     "dynamic_client_registration": {
       "description": "Settings for OAuth dynamic client registration.",
@@ -1629,7 +1552,7 @@ export const access_oauth_configuration: JsonSchema = {
           "type": "boolean"
         },
         "allowed_uris": {
-          "description": "The URIs that are allowed as redirect URIs for dynamically registered clients. HTTP and HTTPS paths may end in `/*` to match all sub-paths. Custom-scheme URIs must be explicitly configured and match exactly.\n",
+          "description": "The URIs that are allowed as redirect URIs for dynamically registered clients. HTTP and HTTPS paths may end in `/*` to match all sub-paths. Custom-scheme URIs must be explicitly configured and match exactly.",
           "items": {
             "type": "string"
           },
@@ -1644,7 +1567,7 @@ export const access_oauth_configuration: JsonSchema = {
     },
     "enabled": {
       "default": true,
-      "description": "Whether the OAuth configuration is enabled for this application. When set to `false`, Access will not handle OAuth for this application. Defaults to `true` if omitted.\n",
+      "description": "Whether the OAuth configuration is enabled for this application. When set to `false`, Access will not handle OAuth for this application. Defaults to `true` if omitted.",
       "type": "boolean"
     },
     "grant": {
@@ -1700,7 +1623,15 @@ export const access_oidc_saas_app: JsonSchema = {
       "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "custom_claims": {
       "items": {
@@ -1809,66 +1740,20 @@ export const access_oidc_saas_app: JsonSchema = {
       "type": "array"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_options_preflight_bypass`.
- */
-export const access_options_preflight_bypass: JsonSchema = {
-  "description": "Allows options preflight requests to bypass Access authentication and go directly to the origin. Cannot turn on if cors_headers is set.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_path_cookie_attribute`.
- */
-export const access_path_cookie_attribute: JsonSchema = {
-  "description": "Enables cookie paths to scope an application's JWT to the application path. If disabled, the JWT will scope to the hostname by default",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_port`.
- */
-export const access_port: JsonSchema = {
-  "description": "The port that the targets use for the chosen communication protocol. A port cannot be assigned to multiple protocols.",
-  "type": "integer"
-};
-
-/**
- * The schema of `access_precedence`.
- */
-export const access_precedence: JsonSchema = {
-  "description": "The order of execution for this policy. Must be unique for each policy within an app.\n",
-  "type": "integer"
-};
-
-/**
- * The schema of `access_protocol_infra_app`.
- */
-export const access_protocol_infra_app: JsonSchema = {
-  "description": "The communication protocol your application secures.",
-  "enum": [
-    "SSH"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `access_protocol_self_hosted_app`.
- */
-export const access_protocol_self_hosted_app: JsonSchema = {
-  "description": "The communication protocol your application secures.",
-  "enum": [
-    "RDP"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_proxy_endpoint_props`.
  */
@@ -1890,7 +1775,25 @@ export const access_proxy_endpoint_props: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "description": "The application type.",
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -1919,7 +1822,25 @@ export const access_rdp_props: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "description": "The application type.",
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -1932,14 +1853,6 @@ export const access_rdp_props: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_read_service_tokens_from_header`.
- */
-export const access_read_service_tokens_from_header: JsonSchema = {
-  "description": "Allows matching Access Service Tokens passed HTTP in a single header with this name.\nThis works as an alternative to the (CF-Access-Client-Id, CF-Access-Client-Secret) pair of headers.\nThe header value will be interpreted as a json object similar to:\n  {\n    \"cf-access-client-id\": \"88bf3b6d86161464f6509f7219099e57.access.example.com\",\n    \"cf-access-client-secret\": \"bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5\"\n  }\n",
-  "type": "string"
-};
-
 /**
  * The schema of `access_saas_props`.
  */
@@ -1951,26 +1864,26 @@ export const access_saas_props: JsonSchema = {
       "description": "The identity providers your users can select when connecting to this application. Defaults to all IdPs configured in your account."
     },
     "app_launcher_visible": {
-      "$ref": "#/$defs/access_app_launcher_visible",
       "default": true,
-      "description": "Displays the application in the App Launcher."
+      "description": "Displays the application in the App Launcher.",
+      "type": "boolean"
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2",
       "default": false,
-      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps."
+      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps.",
+      "type": "boolean"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2",
       "description": "The custom pages that will be displayed when applicable for this application"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url",
-      "description": "The image URL for the logo shown in the App Launcher dashboard."
+      "description": "The image URL for the logo shown in the App Launcher dashboard.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-8",
-      "description": "The name of the application."
+      "description": "The name of the application.",
+      "type": "string"
     },
     "saas_app": {
       "oneOf": [
@@ -1994,7 +1907,25 @@ export const access_saas_props: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "description": "The application type.",
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -2005,14 +1936,6 @@ export const access_saas_props: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_same_site_cookie_attribute`.
- */
-export const access_same_site_cookie_attribute: JsonSchema = {
-  "description": "Sets the SameSite cookie setting, which provides increased security against CSRF attacks.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_saml_saas_app`.
  */
@@ -2032,7 +1955,15 @@ export const access_saml_saas_app: JsonSchema = {
       "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "custom_attributes": {
       "items": {
@@ -2106,7 +2037,7 @@ export const access_saml_saas_app: JsonSchema = {
       "type": "string"
     },
     "name_id_transform_jsonata": {
-      "description": "A [JSONata](https://jsonata.org/) expression that transforms an application's user identities into a NameID value for its SAML assertion. This expression should evaluate to a singular string. The output of this expression can override the `name_id_format` setting.\n",
+      "description": "A [JSONata](https://jsonata.org/) expression that transforms an application's user identities into a NameID value for its SAML assertion. This expression should evaluate to a singular string. The output of this expression can override the `name_id_format` setting.",
       "type": "string"
     },
     "public_key": {
@@ -2114,7 +2045,7 @@ export const access_saml_saas_app: JsonSchema = {
       "type": "string"
     },
     "saml_attribute_transform_jsonata": {
-      "description": "A [JSONata] (https://jsonata.org/) expression that transforms an application's user identities into attribute assertions in the SAML response. The expression can transform id, email, name, and groups values. It can also transform fields listed in the saml_attributes or oidc_fields of the identity provider used to authenticate. The output of this expression must be a JSON object.\n",
+      "description": "A [JSONata] (https://jsonata.org/) expression that transforms an application's user identities into attribute assertions in the SAML response. The expression can transform id, email, name, and groups values. It can also transform fields listed in the saml_attributes or oidc_fields of the identity provider used to authenticate. The output of this expression must be a JSON object.",
       "type": "string"
     },
     "sp_entity_id": {
@@ -2126,7 +2057,15 @@ export const access_saml_saas_app: JsonSchema = {
       "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
@@ -2402,7 +2341,7 @@ export const access_scim_config_single_authentication: JsonSchema = {
  */
 export const access_self_hosted_domains: JsonSchema = {
   "deprecated": true,
-  "description": "List of public domains that Access will secure. This field is deprecated in favor of `destinations` and will be supported until **November 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be ignored.\n",
+  "description": "List of public domains that Access will secure. This field is deprecated in favor of `destinations` and will be supported until **November 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be ignored.",
   "items": {
     "type": "string"
   },
@@ -2416,41 +2355,41 @@ export const access_self_hosted_props: JsonSchema = {
   "description": "Self Hosted Application",
   "properties": {
     "allow_authenticate_via_warp": {
-      "$ref": "#/$defs/access_allow_authenticate_via_warp-2",
-      "description": "When set to true, users can authenticate to this application using their WARP session.  When set to false this application will always require direct IdP authentication. This setting always overrides the organization setting for WARP authentication."
+      "description": "When set to true, users can authenticate to this application using their WARP session.  When set to false this application will always require direct IdP authentication. This setting always overrides the organization setting for WARP authentication.",
+      "type": "boolean"
     },
     "allow_iframe": {
-      "$ref": "#/$defs/access_allow_iframe",
-      "description": "Enables loading application content in an iFrame."
+      "description": "Enables loading application content in an iFrame.",
+      "type": "boolean"
     },
     "allowed_idps": {
       "$ref": "#/$defs/access_allowed_idps",
       "description": "The identity providers your users can select when connecting to this application. Defaults to all IdPs configured in your account."
     },
     "app_launcher_visible": {
-      "$ref": "#/$defs/access_app_launcher_visible",
       "default": true,
-      "description": "Displays the application in the App Launcher."
+      "description": "Displays the application in the App Launcher.",
+      "type": "boolean"
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity-2",
       "default": false,
-      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps."
+      "description": "When set to `true`, users skip the identity provider selection step during login. You must specify only one identity provider in allowed_idps.",
+      "type": "boolean"
     },
     "cors_headers": {
       "$ref": "#/$defs/access_cors_headers"
     },
     "custom_deny_message": {
-      "$ref": "#/$defs/access_custom_deny_message",
-      "description": "The custom error message shown to a user when they are denied access to the application."
+      "description": "The custom error message shown to a user when they are denied access to the application.",
+      "type": "string"
     },
     "custom_deny_url": {
-      "$ref": "#/$defs/access_custom_deny_url",
-      "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules."
+      "description": "The custom URL a user is redirected to when they are denied access to the application when failing identity-based rules.",
+      "type": "string"
     },
     "custom_non_identity_deny_url": {
-      "$ref": "#/$defs/access_custom_non_identity_deny_url",
-      "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules."
+      "description": "The custom URL a user is redirected to when they are denied access to the application when failing non-identity rules.",
+      "type": "string"
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages-2",
@@ -2459,59 +2398,59 @@ export const access_self_hosted_props: JsonSchema = {
     "destinations": {
       "$ref": "#/$defs/access_destinations",
       "default": [],
-      "description": "List of destinations secured by Access. This supersedes `self_hosted_domains` to allow for more flexibility in defining different types of domains. If `destinations` are provided, then `self_hosted_domains` will be ignored.\n"
+      "description": "List of destinations secured by Access. This supersedes `self_hosted_domains` to allow for more flexibility in defining different types of domains. If `destinations` are provided, then `self_hosted_domains` will be ignored."
     },
     "domain": {
-      "$ref": "#/$defs/access_domain",
-      "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher."
+      "description": "The primary hostname and path secured by Access. This domain will be displayed if the app is visible in the App Launcher.",
+      "type": "string"
     },
     "eager_redirect_cookie_setting": {
-      "$ref": "#/$defs/access_eager_redirect_cookie_setting",
       "default": true,
-      "description": "Preemptively sets the Access session cookie on every hostname in a multi-hostname self-hosted application during the initial redirect chain, rather than setting it lazily on first visit. Defaults to true. Set to false to disable the eager redirect cookie behavior."
+      "description": "Preemptively sets the Access session cookie on every hostname in a multi-hostname self-hosted application during the initial redirect chain, rather than setting it lazily on first visit. Defaults to true. Set to false to disable the eager redirect cookie behavior.",
+      "type": "boolean"
     },
     "enable_binding_cookie": {
-      "$ref": "#/$defs/access_enable_binding_cookie",
       "default": false,
-      "description": "Enables the binding cookie, which increases security against compromised authorization tokens and CSRF attacks."
+      "description": "Enables the binding cookie, which increases security against compromised authorization tokens and CSRF attacks.",
+      "type": "boolean"
     },
     "http_only_cookie_attribute": {
-      "$ref": "#/$defs/access_http_only_cookie_attribute",
       "default": true,
-      "description": "Enables the HttpOnly cookie attribute, which increases security against XSS attacks."
+      "description": "Enables the HttpOnly cookie attribute, which increases security against XSS attacks.",
+      "type": "boolean"
     },
     "logo_url": {
-      "$ref": "#/$defs/access_logo_url",
-      "description": "The image URL for the logo shown in the App Launcher dashboard."
+      "description": "The image URL for the logo shown in the App Launcher dashboard.",
+      "type": "string"
     },
     "mfa_config": {
       "$ref": "#/$defs/access_mfa_config",
       "description": "Configures multi-factor authentication (MFA) settings."
     },
     "name": {
-      "$ref": "#/$defs/access_name-8",
-      "description": "The name of the application."
+      "description": "The name of the application.",
+      "type": "string"
     },
     "oauth_configuration": {
       "$ref": "#/$defs/access_oauth_configuration",
-      "description": "**Beta:** Optional configuration for managing an OAuth authorization flow controlled by Access. When set, Access will act as the OAuth authorization server for this application. Only compatible with OAuth clients that support [RFC 8707](https://datatracker.ietf.org/doc/html/rfc8707) (Resource Indicators for OAuth 2.0). This feature is currently in beta.\n"
+      "description": "**Beta:** Optional configuration for managing an OAuth authorization flow controlled by Access. When set, Access will act as the OAuth authorization server for this application. Only compatible with OAuth clients that support [RFC 8707](https://datatracker.ietf.org/doc/html/rfc8707) (Resource Indicators for OAuth 2.0). This feature is currently in beta."
     },
     "options_preflight_bypass": {
-      "$ref": "#/$defs/access_options_preflight_bypass",
-      "description": "Allows options preflight requests to bypass Access authentication and go directly to the origin. Cannot turn on if cors_headers is set."
+      "description": "Allows options preflight requests to bypass Access authentication and go directly to the origin. Cannot turn on if cors_headers is set.",
+      "type": "boolean"
     },
     "path_cookie_attribute": {
-      "$ref": "#/$defs/access_path_cookie_attribute",
       "default": false,
-      "description": "Enables cookie paths to scope an application's JWT to the application path. If disabled, the JWT will scope to the hostname by default"
+      "description": "Enables cookie paths to scope an application's JWT to the application path. If disabled, the JWT will scope to the hostname by default",
+      "type": "boolean"
     },
     "read_service_tokens_from_header": {
-      "$ref": "#/$defs/access_read_service_tokens_from_header",
-      "description": "Allows matching Access Service Tokens passed HTTP in a single header with this name.\nThis works as an alternative to the (CF-Access-Client-Id, CF-Access-Client-Secret) pair of headers.\nThe header value will be interpreted as a json object similar to:\n  {\n    \"cf-access-client-id\": \"88bf3b6d86161464f6509f7219099e57.access.example.com\",\n    \"cf-access-client-secret\": \"bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5\"\n  }\n"
+      "description": "Allows matching Access Service Tokens passed HTTP in a single header with this name.\nThis works as an alternative to the (CF-Access-Client-Id, CF-Access-Client-Secret) pair of headers.\nThe header value will be interpreted as a json object similar to:\n  {\n    \"cf-access-client-id\": \"88bf3b6d86161464f6509f7219099e57.access.example.com\",\n    \"cf-access-client-secret\": \"bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5\"\n  }",
+      "type": "string"
     },
     "same_site_cookie_attribute": {
-      "$ref": "#/$defs/access_same_site_cookie_attribute",
-      "description": "Sets the SameSite cookie setting, which provides increased security against CSRF attacks."
+      "description": "Sets the SameSite cookie setting, which provides increased security against CSRF attacks.",
+      "type": "string"
     },
     "scim_config": {
       "$ref": "#/$defs/access_scim_config",
@@ -2520,20 +2459,20 @@ export const access_self_hosted_props: JsonSchema = {
     "self_hosted_domains": {
       "$ref": "#/$defs/access_self_hosted_domains",
       "default": [],
-      "description": "List of public domains that Access will secure. This field is deprecated in favor of `destinations` and will be supported until **November 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be ignored.\n"
+      "description": "List of public domains that Access will secure. This field is deprecated in favor of `destinations` and will be supported until **November 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be ignored."
     },
     "service_auth_401_redirect": {
-      "$ref": "#/$defs/access_service_auth_401_redirect",
-      "description": "Returns a 401 status code when the request is blocked by a Service Auth policy."
+      "description": "Returns a 401 status code when the request is blocked by a Service Auth policy.",
+      "type": "boolean"
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration-2",
       "default": "24h",
-      "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h."
+      "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
+      "type": "string"
     },
     "skip_interstitial": {
-      "$ref": "#/$defs/access_skip_interstitial",
-      "description": "Enables automatic authentication through cloudflared."
+      "description": "Enables automatic authentication through cloudflared.",
+      "type": "boolean"
     },
     "tags": {
       "$ref": "#/$defs/access_tags-2",
@@ -2543,7 +2482,25 @@ export const access_self_hosted_props: JsonSchema = {
     "type": {
       "allOf": [
         {
-          "$ref": "#/$defs/access_type"
+          "description": "The application type.",
+          "enum": [
+            "self_hosted",
+            "end_user",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -2551,9 +2508,9 @@ export const access_self_hosted_props: JsonSchema = {
       ]
     },
     "use_clientless_isolation_app_launcher_url": {
-      "$ref": "#/$defs/access_use_clientless_isolation_app_launcher_url",
       "default": false,
-      "description": "Determines if users can access this application via a clientless browser isolation URL.\nThis allows users to access private domains without connecting to Gateway. The option requires\nClientless Browser Isolation to be set up with policies that allow users of this application.\n"
+      "description": "Determines if users can access this application via a clientless browser isolation URL.\nThis allows users to access private domains without connecting to Gateway. The option requires\nClientless Browser Isolation to be set up with policies that allow users of this application.",
+      "type": "boolean"
     }
   },
   "required": [
@@ -2563,38 +2520,6 @@ export const access_self_hosted_props: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_service_auth_401_redirect`.
- */
-export const access_service_auth_401_redirect: JsonSchema = {
-  "description": "Returns a 401 status code when the request is blocked by a Service Auth policy.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_session_duration-2`.
- */
-export const access_session_duration_2: JsonSchema = {
-  "description": "The amount of time that tokens issued for this application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_skip_app_launcher_login_page`.
- */
-export const access_skip_app_launcher_login_page: JsonSchema = {
-  "description": "Determines when to skip the App Launcher landing page.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_skip_interstitial`.
- */
-export const access_skip_interstitial: JsonSchema = {
-  "description": "Enables automatic authentication through cloudflared.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_ssh_props`.
  */
@@ -2608,7 +2533,25 @@ export const access_ssh_props: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "description": "The application type.",
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -2624,7 +2567,7 @@ export const access_ssh_props: JsonSchema = {
 /**
  * The schema of `access_tags-2`.
  */
-export const access_tags_2: JsonSchema = {
+export const access_tags$$2: JsonSchema = {
   "description": "The tags you want assigned to an application. Tags are used to filter applications in the App Launcher dashboard.",
   "items": {
     "type": "string"
@@ -2662,7 +2605,8 @@ export const access_target_criteria_base: JsonSchema = {
       "description": "Target matches when any selector in this rule matches."
     },
     "port": {
-      "$ref": "#/$defs/access_port"
+      "description": "The port that the targets use for the chosen communication protocol. A port cannot be assigned to multiple protocols.",
+      "type": "integer"
     },
     "require": {
       "$ref": "#/$defs/access_target_rule",
@@ -2689,7 +2633,11 @@ export const access_target_criteria_infra_app: JsonSchema = {
     {
       "properties": {
         "protocol": {
-          "$ref": "#/$defs/access_protocol_infra_app"
+          "description": "The communication protocol your application secures.",
+          "enum": [
+            "SSH"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2708,7 +2656,11 @@ export const access_target_criteria_self_hosted_app: JsonSchema = {
     {
       "properties": {
         "protocol": {
-          "$ref": "#/$defs/access_protocol_self_hosted_app"
+          "description": "The communication protocol your application secures.",
+          "enum": [
+            "RDP"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2759,47 +2711,6 @@ export const access_target_rule_attributes: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_title`.
- */
-export const access_title: JsonSchema = {
-  "description": "The title shown on the landing page.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_type`.
- */
-export const access_type: JsonSchema = {
-  "description": "The application type.",
-  "enum": [
-    "self_hosted",
-    "end_user",
-    "saas",
-    "ssh",
-    "vnc",
-    "app_launcher",
-    "warp",
-    "biso",
-    "bookmark",
-    "dash_sso",
-    "infrastructure",
-    "rdp",
-    "mcp",
-    "mcp_portal",
-    "proxy_endpoint"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `access_use_clientless_isolation_app_launcher_url`.
- */
-export const access_use_clientless_isolation_app_launcher_url: JsonSchema = {
-  "description": "Determines if users can access this application via a clientless browser isolation URL.\nThis allows users to access private domains without connecting to Gateway. The option requires\nClientless Browser Isolation to be set up with policies that allow users of this application.\n",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_usernames`.
  */
@@ -2824,7 +2735,25 @@ export const access_vnc_props: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "description": "The application type.",
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
@@ -2850,7 +2779,25 @@ export const access_warp_props: JsonSchema = {
         "type": {
           "allOf": [
             {
-              "$ref": "#/$defs/access_type"
+              "description": "The application type.",
+              "enum": [
+                "self_hosted",
+                "end_user",
+                "saas",
+                "ssh",
+                "vnc",
+                "app_launcher",
+                "warp",
+                "biso",
+                "bookmark",
+                "dash_sso",
+                "infrastructure",
+                "rdp",
+                "mcp",
+                "mcp_portal",
+                "proxy_endpoint"
+              ],
+              "type": "string"
             },
             {
               "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/settings/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/applications/settings/outputs.ts
index 8be483eaa..7daa619b3 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/settings/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/settings/outputs.ts
@@ -6,13 +6,13 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_app_settings_response` in responses.
  */
-export const access_app_settings_response_output: JsonSchema = {
+export const access_app_settings_response: JsonSchema = {
   "properties": {
     "allow_iframe": {
-      "$ref": "#/$defs/access_allow_iframe"
+      "type": "boolean"
     },
     "skip_interstitial": {
-      "$ref": "#/$defs/access_skip_interstitial"
+      "type": "boolean"
     }
   },
   "type": "object"
@@ -21,7 +21,7 @@ export const access_app_settings_response_output: JsonSchema = {
 /**
  * The schema of `access_single_response_update` in responses.
  */
-export const access_single_response_update_output: JsonSchema = {
+export const access_single_response_update: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/settings/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/applications/settings/schemas.ts
index ee921764a..231cacc35 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/settings/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/settings/schemas.ts
@@ -9,12 +9,12 @@ import type { JsonSchema } from "../../../../_/tool.js";
 export const access_app_settings_request: JsonSchema = {
   "properties": {
     "allow_iframe": {
-      "$ref": "#/$defs/access_allow_iframe",
-      "description": "Enables loading application content in an iFrame."
+      "description": "Enables loading application content in an iFrame.",
+      "type": "boolean"
     },
     "skip_interstitial": {
-      "$ref": "#/$defs/access_skip_interstitial",
-      "description": "Enables automatic authentication through cloudflared."
+      "description": "Enables automatic authentication through cloudflared.",
+      "type": "boolean"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/settings/tools.ts b/src/generated/forge-mcp/zeroTrust/access/applications/settings/tools.ts
index b4267eea7..121585a7c 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/settings/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/settings/tools.ts
@@ -3,80 +3,82 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
 import {
-  access_allow_iframe_output,
-  access_skip_interstitial_output,
-} from "../outputs.js";
-import {
-  access_allow_iframe,
-  access_app_id,
-  access_skip_interstitial,
-} from "../schemas.js";
-import {
-  access_app_settings_response_output,
-  access_single_response_update_output,
+  access_app_settings_response,
+  access_single_response_update,
 } from "./outputs.js";
 import { access_app_settings_request } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.applications.settings`.
+ * The tools of `zeroTrust.access.applications.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_applications_settings_update",
+    name: "zeroTrust_access_applications_settings_update",
     title: "Update Access application settings",
-    description: "Updates Access application settings.",
+    description: "Updates Access application settings.\n\nPUT /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_app_id"
-        },
         "body": {
           "$ref": "#/$defs/access_app_settings_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "oneOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_allow_iframe": access_allow_iframe,
-        "access_app_id": access_app_id,
         "access_app_settings_request": access_app_settings_request,
-        "access_identifier": access_identifier,
-        "access_skip_interstitial": access_skip_interstitial,
-        "access_uuid": access_uuid,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response_update",
       $defs: {
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_settings_response": access_app_settings_response_output,
-        "access_messages": access_messages_output,
-        "access_single_response_update": access_single_response_update_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_app_settings_response": access_app_settings_response,
+        "access_messages": access_messages,
+        "access_single_response_update": access_single_response_update,
       },
     },
     annotations: {
@@ -103,13 +105,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_settings_response": access_app_settings_response_output,
-        "access_messages": access_messages_output,
-        "access_single_response_update": access_single_response_update_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_app_settings_response": access_app_settings_response,
+        "access_messages": access_messages,
+        "access_single_response_update": access_single_response_update,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/shortLivedCertificates/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/applications/shortLivedCertificates/outputs.ts
index 2a178cf45..b8e17745b 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/shortLivedCertificates/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/shortLivedCertificates/outputs.ts
@@ -3,42 +3,28 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `access_aud` in responses.
- */
-export const access_aud_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_ca` in responses.
  */
-export const access_ca_output: JsonSchema = {
+export const access_ca: JsonSchema = {
   "properties": {
     "aud": {
-      "$ref": "#/$defs/access_aud"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/access_id-2"
+      "type": "string"
     },
     "public_key": {
-      "$ref": "#/$defs/access_public_key"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_id-2` in responses.
- */
-export const access_id_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_id_response-2` in responses.
  */
-export const access_id_response_2_output: JsonSchema = {
+export const access_id_response$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -48,7 +34,7 @@ export const access_id_response_2_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/access_id-2"
+              "type": "string"
             }
           },
           "type": "object"
@@ -59,17 +45,10 @@ export const access_id_response_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_public_key` in responses.
- */
-export const access_public_key_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_response_collection-5` in responses.
  */
-export const access_response_collection_5_output: JsonSchema = {
+export const access_response_collection$$5: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -91,7 +70,7 @@ export const access_response_collection_5_output: JsonSchema = {
 /**
  * The schema of `access_single_response-6` in responses.
  */
-export const access_single_response_6_output: JsonSchema = {
+export const access_single_response$$6: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/shortLivedCertificates/tools.ts b/src/generated/forge-mcp/zeroTrust/access/applications/shortLivedCertificates/tools.ts
index 82f497312..809ee6c9d 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/shortLivedCertificates/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/shortLivedCertificates/tools.ts
@@ -1,73 +1,72 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
 import {
-  access_aud_output,
-  access_ca_output,
-  access_id_2_output,
-  access_id_response_2_output,
-  access_public_key_output,
-  access_response_collection_5_output,
-  access_single_response_6_output,
+  access_ca,
+  access_id_response$$2,
+  access_response_collection$$5,
+  access_single_response$$6,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.applications.short_lived_certificates`.
+ * The tools of `zeroTrust.access.applications.shortLivedCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_applications_short_lived_certificates_create",
+    name: "zeroTrust_access_applications_shortLivedCertificates_create",
     title: "Create a short-lived certificate CA",
-    description: "Generates a new short-lived certificate CA and public key.",
+    description: "Generates a new short-lived certificate CA and public key.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-6",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_aud": access_aud_output,
-        "access_ca": access_ca_output,
-        "access_id-2": access_id_2_output,
-        "access_messages": access_messages_output,
-        "access_public_key": access_public_key_output,
-        "access_single_response-6": access_single_response_6_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_ca": access_ca,
+        "access_messages": access_messages,
+        "access_single_response-6": access_single_response$$6,
       },
     },
     annotations: {
@@ -94,14 +93,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_aud": access_aud_output,
-        "access_ca": access_ca_output,
-        "access_id-2": access_id_2_output,
-        "access_messages": access_messages_output,
-        "access_public_key": access_public_key_output,
-        "access_single_response-6": access_single_response_6_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_ca": access_ca,
+        "access_messages": access_messages,
+        "access_single_response-6": access_single_response$$6,
       },
     },
     request: (args) => ({
@@ -109,46 +105,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_applications_short_lived_certificates_delete",
+    name: "zeroTrust_access_applications_shortLivedCertificates_delete",
     title: "Delete a short-lived certificate CA",
-    description: "Deletes a short-lived certificate CA.",
+    description: "Deletes a short-lived certificate CA.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response-2",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_id-2": access_id_2_output,
-        "access_id_response-2": access_id_response_2_output,
-        "access_messages": access_messages_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response-2": access_id_response$$2,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -175,11 +176,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_id-2": access_id_2_output,
-        "access_id_response-2": access_id_response_2_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response-2": access_id_response$$2,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -187,49 +187,52 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_applications_short_lived_certificates_get",
+    name: "zeroTrust_access_applications_shortLivedCertificates_get",
     title: "Get a short-lived certificate CA",
-    description: "Fetches a short-lived certificate CA and its public key.",
+    description: "Fetches a short-lived certificate CA and its public key.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-6",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_aud": access_aud_output,
-        "access_ca": access_ca_output,
-        "access_id-2": access_id_2_output,
-        "access_messages": access_messages_output,
-        "access_public_key": access_public_key_output,
-        "access_single_response-6": access_single_response_6_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_ca": access_ca,
+        "access_messages": access_messages,
+        "access_single_response-6": access_single_response$$6,
       },
     },
     annotations: {
@@ -257,14 +260,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_aud": access_aud_output,
-        "access_ca": access_ca_output,
-        "access_id-2": access_id_2_output,
-        "access_messages": access_messages_output,
-        "access_public_key": access_public_key_output,
-        "access_single_response-6": access_single_response_6_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_ca": access_ca,
+        "access_messages": access_messages,
+        "access_single_response-6": access_single_response$$6,
       },
     },
     request: (args) => ({
@@ -272,54 +272,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_applications_short_lived_certificates_list",
+    name: "zeroTrust_access_applications_shortLivedCertificates_list",
     title: "List short-lived certificate CAs",
-    description: "Lists short-lived certificate CAs and their public keys.",
+    description: "Lists short-lived certificate CAs and their public keys.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/apps/ca",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-5",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_aud": access_aud_output,
-        "access_ca": access_ca_output,
-        "access_id-2": access_id_2_output,
-        "access_messages": access_messages_output,
-        "access_public_key": access_public_key_output,
-        "access_response_collection-5": access_response_collection_5_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_ca": access_ca,
+        "access_messages": access_messages,
+        "access_response_collection-5": access_response_collection$$5,
       },
     },
     annotations: {
@@ -347,22 +357,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_aud": access_aud_output,
-        "access_ca": access_ca_output,
-        "access_id-2": access_id_2_output,
-        "access_messages": access_messages_output,
-        "access_public_key": access_public_key_output,
-        "access_response_collection-5": access_response_collection_5_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_ca": access_ca,
+        "access_messages": access_messages,
+        "access_response_collection-5": access_response_collection$$5,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/apps/ca`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/tools.ts b/src/generated/forge-mcp/zeroTrust/access/applications/tools.ts
index e65feecc9..03368ddaf 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/tools.ts
@@ -1,79 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_created_at_output,
-  access_id_response_output,
-  access_identifier_output,
-  access_messages_output,
-  access_timestamp_output,
-  access_updated_at_output,
-  access_uuid_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_id_response,
+  access_messages,
 } from "../../outputs.js";
-import {
-  access_created_at,
-  access_identifier,
-  access_timestamp,
-  access_updated_at,
-  access_uuid,
-} from "../../schemas.js";
-import {
-  access_access_group_rule_output,
-  access_allowed_clipboard_local_to_remote_formats_output,
-  access_allowed_clipboard_remote_to_local_formats_output,
-  access_any_valid_service_token_rule_output,
-  access_approval_group_output,
-  access_approval_groups_output,
-  access_approval_required_output,
-  access_auth_context_rule_output,
-  access_authentication_method_rule_output,
-  access_azure_group_rule_output,
-  access_base_policy_resp_output,
-  access_certificate_rule_output,
-  access_cloudflare_account_member_rule_output,
-  access_common_name_rule_output,
-  access_connection_rules_output,
-  access_connection_rules_rdp_output,
-  access_country_rule_output,
-  access_decision_output,
-  access_device_posture_rule_output,
-  access_domain_rule_output,
-  access_email_list_rule_output,
-  access_email_rule_output,
-  access_everyone_rule_output,
-  access_exclude_2_output,
-  access_external_evaluation_rule_output,
-  access_github_organization_rule_output,
-  access_gsuite_group_rule_output,
-  access_include_2_output,
-  access_ip_list_rule_output,
-  access_ip_rule_output,
-  access_isolation_required_output,
-  access_linked_app_token_rule_output,
-  access_login_method_rule_output,
-  access_mfa_config_output,
-  access_name_9_output,
-  access_oidc_claim_rule_output,
-  access_okta_group_rule_output,
-  access_policy_resolution_account_id_output,
-  access_policy_resp_output,
-  access_purpose_justification_prompt_output,
-  access_purpose_justification_required_output,
-  access_rdp_clipboard_format_output,
-  access_require_2_output,
-  access_rule_output,
-  access_saml_group_rule_output,
-  access_service_token_rule_output,
-  access_service_token_tag_rule_output,
-  access_session_duration_3_output,
-  access_user_risk_score_rule_output,
-  access_uuid_2_output,
-} from "../outputs.js";
 import {
   access_access_group_rule,
   access_allowed_clipboard_local_to_remote_formats,
@@ -81,202 +17,104 @@ import {
   access_any_valid_service_token_rule,
   access_approval_group,
   access_approval_groups,
-  access_approval_required,
   access_auth_context_rule,
   access_authentication_method_rule,
   access_azure_group_rule,
-  access_base_policy_req,
+  access_base_policy_resp,
   access_certificate_rule,
   access_cloudflare_account_member_rule,
   access_common_name_rule,
   access_connection_rules,
   access_connection_rules_rdp,
   access_country_rule,
-  access_decision,
   access_device_posture_rule,
   access_domain_rule,
   access_email_list_rule,
   access_email_rule,
   access_everyone_rule,
-  access_exclude_2,
+  access_exclude$$2,
   access_external_evaluation_rule,
   access_github_organization_rule,
   access_gsuite_group_rule,
-  access_include_2,
+  access_include$$2,
   access_ip_list_rule,
   access_ip_rule,
-  access_isolation_required,
   access_linked_app_token_rule,
   access_login_method_rule,
   access_mfa_config,
-  access_name_9,
   access_oidc_claim_rule,
   access_okta_group_rule,
-  access_policy_req,
-  access_policy_resolution_account_id,
-  access_purpose_justification_prompt,
-  access_purpose_justification_required,
-  access_rdp_clipboard_format,
-  access_require_2,
+  access_policy_resp,
+  access_require$$2,
   access_rule,
   access_saml_group_rule,
   access_service_token_rule,
   access_service_token_tag_rule,
-  access_session_duration_3,
   access_user_risk_score_rule,
-  access_uuid_2,
-} from "../schemas.js";
+} from "../outputs.js";
 import {
-  access_allow_all_headers_output,
-  access_allow_all_methods_output,
-  access_allow_all_origins_output,
-  access_allow_authenticate_via_warp_2_output,
-  access_allow_credentials_output,
-  access_allow_email_alias_output,
-  access_allow_iframe_output,
-  access_allowed_headers_output,
-  access_allowed_idps_output,
-  access_allowed_methods_output,
-  access_allowed_origins_output,
-  access_app_launcher_logo_url_output,
-  access_app_launcher_props_output,
-  access_app_launcher_visible_output,
-  access_app_policy_response_output,
-  access_app_resp_embedded_policies_output,
-  access_app_resp_embedded_target_criteria_infra_output,
-  access_app_resp_embedded_target_criteria_self_hosted_output,
-  access_app_response_output,
-  access_aud_2_output,
-  access_auto_redirect_to_identity_2_output,
-  access_basic_app_response_props_output,
-  access_bg_color_output,
-  access_biso_props_output,
-  access_bookmark_props_output,
-  access_button_color_output,
-  access_button_text_color_output,
-  access_connection_rules_infra_output,
-  access_connection_rules_ssh_output,
-  access_cors_headers_output,
-  access_custom_deny_message_output,
-  access_custom_deny_url_output,
-  access_custom_non_identity_deny_url_output,
-  access_custom_pages_2_output,
-  access_destination_overrides_output,
-  access_destinations_output,
-  access_domain_output,
-  access_eager_redirect_cookie_setting_output,
-  access_empty_response_2_output,
-  access_enable_binding_cookie_output,
-  access_end_user_all_preview_workers_destination_output,
-  access_end_user_all_workers_destination_output,
-  access_end_user_destinations_output,
-  access_end_user_oauth_configuration_output,
-  access_end_user_preview_worker_destination_output,
-  access_end_user_props_output,
-  access_end_user_public_destination_output,
-  access_end_user_worker_destination_output,
-  access_feature_app_props_output,
-  access_footer_links_output,
-  access_header_bg_color_output,
-  access_http_only_cookie_attribute_output,
-  access_image_url_output,
-  access_infra_app_resp_embedded_policies_output,
-  access_infra_mfa_config_output,
-  access_infra_policy_resp_output,
-  access_infra_props_output,
-  access_landing_page_design_output,
-  access_logo_url_output,
-  access_max_age_output,
-  access_mcp_portal_props_output,
-  access_mcp_props_output,
-  access_message_output,
-  access_name_8_output,
-  access_oauth_configuration_output,
-  access_oidc_saas_app_output,
-  access_options_preflight_bypass_output,
-  access_path_cookie_attribute_output,
-  access_port_output,
-  access_precedence_output,
-  access_protocol_infra_app_output,
-  access_protocol_self_hosted_app_output,
-  access_proxy_endpoint_props_output,
-  access_rdp_props_output,
-  access_read_service_tokens_from_header_output,
-  access_response_collection_8_output,
-  access_saas_props_output,
-  access_same_site_cookie_attribute_output,
-  access_saml_saas_app_output,
-  access_scim_config_authentication_access_service_token_output,
-  access_scim_config_authentication_http_basic_output,
-  access_scim_config_authentication_oauth2_output,
-  access_scim_config_authentication_oauth_bearer_token_output,
-  access_scim_config_mapping_output,
-  access_scim_config_multi_authentication_output,
-  access_scim_config_output,
-  access_scim_config_single_authentication_output,
-  access_self_hosted_domains_output,
-  access_self_hosted_props_output,
-  access_service_auth_401_redirect_output,
-  access_session_duration_2_output,
-  access_single_response_9_output,
-  access_skip_app_launcher_login_page_output,
-  access_skip_interstitial_output,
-  access_ssh_props_output,
-  access_tags_2_output,
-  access_target_attributes_output,
-  access_target_criteria_base_output,
-  access_target_criteria_infra_app_output,
-  access_target_criteria_self_hosted_app_output,
-  access_target_rule_attributes_output,
-  access_target_rule_output,
-  access_title_output,
-  access_type_output,
-  access_use_clientless_isolation_app_launcher_url_output,
-  access_usernames_output,
-  access_vnc_props_output,
-  access_warp_props_output,
-} from "./outputs.js";
+  access_access_group_rule as access_access_group_rule$,
+  access_allowed_clipboard_local_to_remote_formats as access_allowed_clipboard_local_to_remote_formats$,
+  access_allowed_clipboard_remote_to_local_formats as access_allowed_clipboard_remote_to_local_formats$,
+  access_any_valid_service_token_rule as access_any_valid_service_token_rule$,
+  access_approval_group as access_approval_group$,
+  access_approval_groups as access_approval_groups$,
+  access_auth_context_rule as access_auth_context_rule$,
+  access_authentication_method_rule as access_authentication_method_rule$,
+  access_azure_group_rule as access_azure_group_rule$,
+  access_base_policy_req,
+  access_certificate_rule as access_certificate_rule$,
+  access_cloudflare_account_member_rule as access_cloudflare_account_member_rule$,
+  access_common_name_rule as access_common_name_rule$,
+  access_connection_rules as access_connection_rules$,
+  access_connection_rules_rdp as access_connection_rules_rdp$,
+  access_country_rule as access_country_rule$,
+  access_device_posture_rule as access_device_posture_rule$,
+  access_domain_rule as access_domain_rule$,
+  access_email_list_rule as access_email_list_rule$,
+  access_email_rule as access_email_rule$,
+  access_everyone_rule as access_everyone_rule$,
+  access_exclude$$2 as access_exclude$$2$,
+  access_external_evaluation_rule as access_external_evaluation_rule$,
+  access_github_organization_rule as access_github_organization_rule$,
+  access_gsuite_group_rule as access_gsuite_group_rule$,
+  access_include$$2 as access_include$$2$,
+  access_ip_list_rule as access_ip_list_rule$,
+  access_ip_rule as access_ip_rule$,
+  access_linked_app_token_rule as access_linked_app_token_rule$,
+  access_login_method_rule as access_login_method_rule$,
+  access_mfa_config as access_mfa_config$,
+  access_oidc_claim_rule as access_oidc_claim_rule$,
+  access_okta_group_rule as access_okta_group_rule$,
+  access_policy_req,
+  access_require$$2 as access_require$$2$,
+  access_rule as access_rule$,
+  access_saml_group_rule as access_saml_group_rule$,
+  access_service_token_rule as access_service_token_rule$,
+  access_service_token_tag_rule as access_service_token_tag_rule$,
+  access_user_risk_score_rule as access_user_risk_score_rule$,
+} from "../schemas.js";
 import {
-  access_allow_all_headers,
-  access_allow_all_methods,
-  access_allow_all_origins,
-  access_allow_authenticate_via_warp_2,
-  access_allow_credentials,
-  access_allow_email_alias,
-  access_allow_iframe,
   access_allowed_headers,
   access_allowed_idps,
   access_allowed_methods,
   access_allowed_origins,
-  access_app_id,
-  access_app_launcher_logo_url,
   access_app_launcher_props,
-  access_app_launcher_visible,
-  access_app_policy_link,
-  access_app_policy_request,
-  access_app_req_embedded_policies,
-  access_app_req_embedded_scim_config,
-  access_app_request,
+  access_app_policy_response,
+  access_app_resp_embedded_policies,
   access_app_resp_embedded_target_criteria_infra,
   access_app_resp_embedded_target_criteria_self_hosted,
-  access_auto_redirect_to_identity_2,
-  access_bg_color,
+  access_app_response,
+  access_basic_app_response_props,
   access_biso_props,
   access_bookmark_props,
-  access_button_color,
-  access_button_text_color,
   access_connection_rules_infra,
   access_connection_rules_ssh,
   access_cors_headers,
-  access_custom_deny_message,
-  access_custom_deny_url,
-  access_custom_non_identity_deny_url,
-  access_custom_pages_2,
+  access_custom_pages$$2,
   access_destination_overrides,
   access_destinations,
-  access_domain,
-  access_eager_redirect_cookie_setting,
-  access_enable_binding_cookie,
+  access_empty_response$$2,
   access_end_user_all_preview_workers_destination,
   access_end_user_all_workers_destination,
   access_end_user_destinations,
@@ -287,33 +125,19 @@ import {
   access_end_user_worker_destination,
   access_feature_app_props,
   access_footer_links,
-  access_header_bg_color,
-  access_http_only_cookie_attribute,
-  access_image_url,
-  access_infra_app_req_embedded_policies,
+  access_infra_app_resp_embedded_policies,
   access_infra_mfa_config,
-  access_infra_policy_req,
+  access_infra_policy_resp,
   access_infra_props,
   access_landing_page_design,
-  access_logo_url,
-  access_max_age,
   access_mcp_portal_props,
   access_mcp_props,
-  access_message,
-  access_name_8,
   access_oauth_configuration,
   access_oidc_saas_app,
-  access_options_preflight_bypass,
-  access_path_cookie_attribute,
-  access_port,
-  access_precedence,
-  access_protocol_infra_app,
-  access_protocol_self_hosted_app,
   access_proxy_endpoint_props,
   access_rdp_props,
-  access_read_service_tokens_from_header,
+  access_response_collection$$8,
   access_saas_props,
-  access_same_site_cookie_attribute,
   access_saml_saas_app,
   access_scim_config,
   access_scim_config_authentication_access_service_token,
@@ -325,67 +149,251 @@ import {
   access_scim_config_single_authentication,
   access_self_hosted_domains,
   access_self_hosted_props,
-  access_service_auth_401_redirect,
-  access_session_duration_2,
-  access_skip_app_launcher_login_page,
-  access_skip_interstitial,
+  access_single_response$$9,
   access_ssh_props,
-  access_tags_2,
+  access_tags$$2,
   access_target_attributes,
   access_target_criteria_base,
   access_target_criteria_infra_app,
   access_target_criteria_self_hosted_app,
   access_target_rule,
   access_target_rule_attributes,
-  access_title,
-  access_type,
-  access_use_clientless_isolation_app_launcher_url,
   access_usernames,
   access_vnc_props,
   access_warp_props,
+} from "./outputs.js";
+import {
+  access_allowed_headers as access_allowed_headers$,
+  access_allowed_idps as access_allowed_idps$,
+  access_allowed_methods as access_allowed_methods$,
+  access_allowed_origins as access_allowed_origins$,
+  access_app_launcher_props as access_app_launcher_props$,
+  access_app_policy_link,
+  access_app_policy_request,
+  access_app_req_embedded_policies,
+  access_app_req_embedded_scim_config,
+  access_app_request,
+  access_app_resp_embedded_target_criteria_infra as access_app_resp_embedded_target_criteria_infra$,
+  access_app_resp_embedded_target_criteria_self_hosted as access_app_resp_embedded_target_criteria_self_hosted$,
+  access_biso_props as access_biso_props$,
+  access_bookmark_props as access_bookmark_props$,
+  access_connection_rules_infra as access_connection_rules_infra$,
+  access_connection_rules_ssh as access_connection_rules_ssh$,
+  access_cors_headers as access_cors_headers$,
+  access_custom_pages$$2 as access_custom_pages$$2$,
+  access_destination_overrides as access_destination_overrides$,
+  access_destinations as access_destinations$,
+  access_end_user_all_preview_workers_destination as access_end_user_all_preview_workers_destination$,
+  access_end_user_all_workers_destination as access_end_user_all_workers_destination$,
+  access_end_user_destinations as access_end_user_destinations$,
+  access_end_user_oauth_configuration as access_end_user_oauth_configuration$,
+  access_end_user_preview_worker_destination as access_end_user_preview_worker_destination$,
+  access_end_user_props as access_end_user_props$,
+  access_end_user_public_destination as access_end_user_public_destination$,
+  access_end_user_worker_destination as access_end_user_worker_destination$,
+  access_feature_app_props as access_feature_app_props$,
+  access_footer_links as access_footer_links$,
+  access_infra_app_req_embedded_policies,
+  access_infra_mfa_config as access_infra_mfa_config$,
+  access_infra_policy_req,
+  access_infra_props as access_infra_props$,
+  access_landing_page_design as access_landing_page_design$,
+  access_mcp_portal_props as access_mcp_portal_props$,
+  access_mcp_props as access_mcp_props$,
+  access_oauth_configuration as access_oauth_configuration$,
+  access_oidc_saas_app as access_oidc_saas_app$,
+  access_proxy_endpoint_props as access_proxy_endpoint_props$,
+  access_rdp_props as access_rdp_props$,
+  access_saas_props as access_saas_props$,
+  access_saml_saas_app as access_saml_saas_app$,
+  access_scim_config as access_scim_config$,
+  access_scim_config_authentication_access_service_token as access_scim_config_authentication_access_service_token$,
+  access_scim_config_authentication_http_basic as access_scim_config_authentication_http_basic$,
+  access_scim_config_authentication_oauth2 as access_scim_config_authentication_oauth2$,
+  access_scim_config_authentication_oauth_bearer_token as access_scim_config_authentication_oauth_bearer_token$,
+  access_scim_config_mapping as access_scim_config_mapping$,
+  access_scim_config_multi_authentication as access_scim_config_multi_authentication$,
+  access_scim_config_single_authentication as access_scim_config_single_authentication$,
+  access_self_hosted_domains as access_self_hosted_domains$,
+  access_self_hosted_props as access_self_hosted_props$,
+  access_ssh_props as access_ssh_props$,
+  access_tags$$2 as access_tags$$2$,
+  access_target_attributes as access_target_attributes$,
+  access_target_criteria_base as access_target_criteria_base$,
+  access_target_criteria_infra_app as access_target_criteria_infra_app$,
+  access_target_criteria_self_hosted_app as access_target_criteria_self_hosted_app$,
+  access_target_rule as access_target_rule$,
+  access_target_rule_attributes as access_target_rule_attributes$,
+  access_usernames as access_usernames$,
+  access_vnc_props as access_vnc_props$,
+  access_warp_props as access_warp_props$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.applications`.
+ * The tools of `zeroTrust.access.applications`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_applications_create",
+    name: "zeroTrust_access_applications_create",
     title: "Add an Access application",
-    description: "Adds a new application to Access.",
+    description: "Adds a new application to Access.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/apps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/access_app_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "access_access_group_rule": access_access_group_rule$,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats$,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats$,
+        "access_allowed_headers": access_allowed_headers$,
+        "access_allowed_idps": access_allowed_idps$,
+        "access_allowed_methods": access_allowed_methods$,
+        "access_allowed_origins": access_allowed_origins$,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule$,
+        "access_app_launcher_props": access_app_launcher_props$,
+        "access_app_policy_link": access_app_policy_link,
+        "access_app_policy_request": access_app_policy_request,
+        "access_app_req_embedded_policies": access_app_req_embedded_policies,
+        "access_app_req_embedded_scim_config": access_app_req_embedded_scim_config,
+        "access_app_request": access_app_request,
+        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra$,
+        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted$,
+        "access_approval_group": access_approval_group$,
+        "access_approval_groups": access_approval_groups$,
+        "access_auth_context_rule": access_auth_context_rule$,
+        "access_authentication_method_rule": access_authentication_method_rule$,
+        "access_azure_group_rule": access_azure_group_rule$,
+        "access_base_policy_req": access_base_policy_req,
+        "access_biso_props": access_biso_props$,
+        "access_bookmark_props": access_bookmark_props$,
+        "access_certificate_rule": access_certificate_rule$,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule$,
+        "access_common_name_rule": access_common_name_rule$,
+        "access_connection_rules": access_connection_rules$,
+        "access_connection_rules_infra": access_connection_rules_infra$,
+        "access_connection_rules_rdp": access_connection_rules_rdp$,
+        "access_connection_rules_ssh": access_connection_rules_ssh$,
+        "access_cors_headers": access_cors_headers$,
+        "access_country_rule": access_country_rule$,
+        "access_custom_pages-2": access_custom_pages$$2$,
+        "access_destination_overrides": access_destination_overrides$,
+        "access_destinations": access_destinations$,
+        "access_device_posture_rule": access_device_posture_rule$,
+        "access_domain_rule": access_domain_rule$,
+        "access_email_list_rule": access_email_list_rule$,
+        "access_email_rule": access_email_rule$,
+        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination$,
+        "access_end_user_all_workers_destination": access_end_user_all_workers_destination$,
+        "access_end_user_destinations": access_end_user_destinations$,
+        "access_end_user_oauth_configuration": access_end_user_oauth_configuration$,
+        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination$,
+        "access_end_user_props": access_end_user_props$,
+        "access_end_user_public_destination": access_end_user_public_destination$,
+        "access_end_user_worker_destination": access_end_user_worker_destination$,
+        "access_everyone_rule": access_everyone_rule$,
+        "access_exclude-2": access_exclude$$2$,
+        "access_external_evaluation_rule": access_external_evaluation_rule$,
+        "access_feature_app_props": access_feature_app_props$,
+        "access_footer_links": access_footer_links$,
+        "access_github_organization_rule": access_github_organization_rule$,
+        "access_gsuite_group_rule": access_gsuite_group_rule$,
+        "access_include-2": access_include$$2$,
+        "access_infra_app_req_embedded_policies": access_infra_app_req_embedded_policies,
+        "access_infra_mfa_config": access_infra_mfa_config$,
+        "access_infra_policy_req": access_infra_policy_req,
+        "access_infra_props": access_infra_props$,
+        "access_ip_list_rule": access_ip_list_rule$,
+        "access_ip_rule": access_ip_rule$,
+        "access_landing_page_design": access_landing_page_design$,
+        "access_linked_app_token_rule": access_linked_app_token_rule$,
+        "access_login_method_rule": access_login_method_rule$,
+        "access_mcp_portal_props": access_mcp_portal_props$,
+        "access_mcp_props": access_mcp_props$,
+        "access_mfa_config": access_mfa_config$,
+        "access_oauth_configuration": access_oauth_configuration$,
+        "access_oidc_claim_rule": access_oidc_claim_rule$,
+        "access_oidc_saas_app": access_oidc_saas_app$,
+        "access_okta_group_rule": access_okta_group_rule$,
+        "access_policy_req": access_policy_req,
+        "access_proxy_endpoint_props": access_proxy_endpoint_props$,
+        "access_rdp_props": access_rdp_props$,
+        "access_require-2": access_require$$2$,
+        "access_rule": access_rule$,
+        "access_saas_props": access_saas_props$,
+        "access_saml_group_rule": access_saml_group_rule$,
+        "access_saml_saas_app": access_saml_saas_app$,
+        "access_scim_config": access_scim_config$,
+        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token$,
+        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic$,
+        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2$,
+        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token$,
+        "access_scim_config_mapping": access_scim_config_mapping$,
+        "access_scim_config_multi_authentication": access_scim_config_multi_authentication$,
+        "access_scim_config_single_authentication": access_scim_config_single_authentication$,
+        "access_self_hosted_domains": access_self_hosted_domains$,
+        "access_self_hosted_props": access_self_hosted_props$,
+        "access_service_token_rule": access_service_token_rule$,
+        "access_service_token_tag_rule": access_service_token_tag_rule$,
+        "access_ssh_props": access_ssh_props$,
+        "access_tags-2": access_tags$$2$,
+        "access_target_attributes": access_target_attributes$,
+        "access_target_criteria_base": access_target_criteria_base$,
+        "access_target_criteria_infra_app": access_target_criteria_infra_app$,
+        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app$,
+        "access_target_rule": access_target_rule$,
+        "access_target_rule_attributes": access_target_rule_attributes$,
+        "access_user_risk_score_rule": access_user_risk_score_rule$,
+        "access_usernames": access_usernames$,
+        "access_vnc_props": access_vnc_props$,
+        "access_warp_props": access_warp_props$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/access_single_response-9"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/access_app_response"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
         "access_access_group_rule": access_access_group_rule,
-        "access_allow_all_headers": access_allow_all_headers,
-        "access_allow_all_methods": access_allow_all_methods,
-        "access_allow_all_origins": access_allow_all_origins,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2,
-        "access_allow_credentials": access_allow_credentials,
-        "access_allow_email_alias": access_allow_email_alias,
-        "access_allow_iframe": access_allow_iframe,
         "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
         "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
         "access_allowed_headers": access_allowed_headers,
@@ -393,29 +401,22 @@ export const tools: readonly Tool[] = [
         "access_allowed_methods": access_allowed_methods,
         "access_allowed_origins": access_allowed_origins,
         "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url,
+        "access_api-response-single": access_api$$response$$single,
         "access_app_launcher_props": access_app_launcher_props,
-        "access_app_launcher_visible": access_app_launcher_visible,
-        "access_app_policy_link": access_app_policy_link,
-        "access_app_policy_request": access_app_policy_request,
-        "access_app_req_embedded_policies": access_app_req_embedded_policies,
-        "access_app_req_embedded_scim_config": access_app_req_embedded_scim_config,
-        "access_app_request": access_app_request,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_resp_embedded_policies": access_app_resp_embedded_policies,
         "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra,
         "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted,
+        "access_app_response": access_app_response,
         "access_approval_group": access_approval_group,
         "access_approval_groups": access_approval_groups,
-        "access_approval_required": access_approval_required,
         "access_auth_context_rule": access_auth_context_rule,
         "access_authentication_method_rule": access_authentication_method_rule,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2,
         "access_azure_group_rule": access_azure_group_rule,
-        "access_base_policy_req": access_base_policy_req,
-        "access_bg_color": access_bg_color,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_basic_app_response_props": access_basic_app_response_props,
         "access_biso_props": access_biso_props,
         "access_bookmark_props": access_bookmark_props,
-        "access_button_color": access_button_color,
-        "access_button_text_color": access_button_text_color,
         "access_certificate_rule": access_certificate_rule,
         "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
         "access_common_name_rule": access_common_name_rule,
@@ -425,21 +426,13 @@ export const tools: readonly Tool[] = [
         "access_connection_rules_ssh": access_connection_rules_ssh,
         "access_cors_headers": access_cors_headers,
         "access_country_rule": access_country_rule,
-        "access_created_at": access_created_at,
-        "access_custom_deny_message": access_custom_deny_message,
-        "access_custom_deny_url": access_custom_deny_url,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url,
-        "access_custom_pages-2": access_custom_pages_2,
-        "access_decision": access_decision,
+        "access_custom_pages-2": access_custom_pages$$2,
         "access_destination_overrides": access_destination_overrides,
         "access_destinations": access_destinations,
         "access_device_posture_rule": access_device_posture_rule,
-        "access_domain": access_domain,
         "access_domain_rule": access_domain_rule,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting,
         "access_email_list_rule": access_email_list_rule,
         "access_email_rule": access_email_rule,
-        "access_enable_binding_cookie": access_enable_binding_cookie,
         "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination,
         "access_end_user_all_workers_destination": access_end_user_all_workers_destination,
         "access_end_user_destinations": access_end_user_destinations,
@@ -449,57 +442,36 @@ export const tools: readonly Tool[] = [
         "access_end_user_public_destination": access_end_user_public_destination,
         "access_end_user_worker_destination": access_end_user_worker_destination,
         "access_everyone_rule": access_everyone_rule,
-        "access_exclude-2": access_exclude_2,
+        "access_exclude-2": access_exclude$$2,
         "access_external_evaluation_rule": access_external_evaluation_rule,
         "access_feature_app_props": access_feature_app_props,
         "access_footer_links": access_footer_links,
         "access_github_organization_rule": access_github_organization_rule,
         "access_gsuite_group_rule": access_gsuite_group_rule,
-        "access_header_bg_color": access_header_bg_color,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute,
-        "access_identifier": access_identifier,
-        "access_image_url": access_image_url,
-        "access_include-2": access_include_2,
-        "access_infra_app_req_embedded_policies": access_infra_app_req_embedded_policies,
+        "access_include-2": access_include$$2,
+        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies,
         "access_infra_mfa_config": access_infra_mfa_config,
-        "access_infra_policy_req": access_infra_policy_req,
+        "access_infra_policy_resp": access_infra_policy_resp,
         "access_infra_props": access_infra_props,
         "access_ip_list_rule": access_ip_list_rule,
         "access_ip_rule": access_ip_rule,
-        "access_isolation_required": access_isolation_required,
         "access_landing_page_design": access_landing_page_design,
         "access_linked_app_token_rule": access_linked_app_token_rule,
         "access_login_method_rule": access_login_method_rule,
-        "access_logo_url": access_logo_url,
-        "access_max_age": access_max_age,
         "access_mcp_portal_props": access_mcp_portal_props,
         "access_mcp_props": access_mcp_props,
-        "access_message": access_message,
+        "access_messages": access_messages,
         "access_mfa_config": access_mfa_config,
-        "access_name-8": access_name_8,
-        "access_name-9": access_name_9,
         "access_oauth_configuration": access_oauth_configuration,
         "access_oidc_claim_rule": access_oidc_claim_rule,
         "access_oidc_saas_app": access_oidc_saas_app,
         "access_okta_group_rule": access_okta_group_rule,
-        "access_options_preflight_bypass": access_options_preflight_bypass,
-        "access_path_cookie_attribute": access_path_cookie_attribute,
-        "access_policy_req": access_policy_req,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id,
-        "access_port": access_port,
-        "access_precedence": access_precedence,
-        "access_protocol_infra_app": access_protocol_infra_app,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app,
+        "access_policy_resp": access_policy_resp,
         "access_proxy_endpoint_props": access_proxy_endpoint_props,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt,
-        "access_purpose_justification_required": access_purpose_justification_required,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format,
         "access_rdp_props": access_rdp_props,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header,
-        "access_require-2": access_require_2,
+        "access_require-2": access_require$$2,
         "access_rule": access_rule,
         "access_saas_props": access_saas_props,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute,
         "access_saml_group_rule": access_saml_group_rule,
         "access_saml_saas_app": access_saml_saas_app,
         "access_scim_config": access_scim_config,
@@ -512,214 +484,23 @@ export const tools: readonly Tool[] = [
         "access_scim_config_single_authentication": access_scim_config_single_authentication,
         "access_self_hosted_domains": access_self_hosted_domains,
         "access_self_hosted_props": access_self_hosted_props,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect,
         "access_service_token_rule": access_service_token_rule,
         "access_service_token_tag_rule": access_service_token_tag_rule,
-        "access_session_duration-2": access_session_duration_2,
-        "access_session_duration-3": access_session_duration_3,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page,
-        "access_skip_interstitial": access_skip_interstitial,
+        "access_single_response-9": access_single_response$$9,
         "access_ssh_props": access_ssh_props,
-        "access_tags-2": access_tags_2,
+        "access_tags-2": access_tags$$2,
         "access_target_attributes": access_target_attributes,
         "access_target_criteria_base": access_target_criteria_base,
         "access_target_criteria_infra_app": access_target_criteria_infra_app,
         "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app,
         "access_target_rule": access_target_rule,
         "access_target_rule_attributes": access_target_rule_attributes,
-        "access_timestamp": access_timestamp,
-        "access_title": access_title,
-        "access_type": access_type,
-        "access_updated_at": access_updated_at,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url,
         "access_user_risk_score_rule": access_user_risk_score_rule,
         "access_usernames": access_usernames,
-        "access_uuid": access_uuid,
-        "access_uuid-2": access_uuid_2,
         "access_vnc_props": access_vnc_props,
         "access_warp_props": access_warp_props,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/access_single_response-9"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/access_app_response"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_all_headers": access_allow_all_headers_output,
-        "access_allow_all_methods": access_allow_all_methods_output,
-        "access_allow_all_origins": access_allow_all_origins_output,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2_output,
-        "access_allow_credentials": access_allow_credentials_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_allowed_headers": access_allowed_headers_output,
-        "access_allowed_idps": access_allowed_idps_output,
-        "access_allowed_methods": access_allowed_methods_output,
-        "access_allowed_origins": access_allowed_origins_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url_output,
-        "access_app_launcher_props": access_app_launcher_props_output,
-        "access_app_launcher_visible": access_app_launcher_visible_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_resp_embedded_policies": access_app_resp_embedded_policies_output,
-        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra_output,
-        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted_output,
-        "access_app_response": access_app_response_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_aud-2": access_aud_2_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_basic_app_response_props": access_basic_app_response_props_output,
-        "access_bg_color": access_bg_color_output,
-        "access_biso_props": access_biso_props_output,
-        "access_bookmark_props": access_bookmark_props_output,
-        "access_button_color": access_button_color_output,
-        "access_button_text_color": access_button_text_color_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_cors_headers": access_cors_headers_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_deny_message": access_custom_deny_message_output,
-        "access_custom_deny_url": access_custom_deny_url_output,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url_output,
-        "access_custom_pages-2": access_custom_pages_2_output,
-        "access_decision": access_decision_output,
-        "access_destination_overrides": access_destination_overrides_output,
-        "access_destinations": access_destinations_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain": access_domain_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_enable_binding_cookie": access_enable_binding_cookie_output,
-        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination_output,
-        "access_end_user_all_workers_destination": access_end_user_all_workers_destination_output,
-        "access_end_user_destinations": access_end_user_destinations_output,
-        "access_end_user_oauth_configuration": access_end_user_oauth_configuration_output,
-        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination_output,
-        "access_end_user_props": access_end_user_props_output,
-        "access_end_user_public_destination": access_end_user_public_destination_output,
-        "access_end_user_worker_destination": access_end_user_worker_destination_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_feature_app_props": access_feature_app_props_output,
-        "access_footer_links": access_footer_links_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_header_bg_color": access_header_bg_color_output,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute_output,
-        "access_identifier": access_identifier_output,
-        "access_image_url": access_image_url_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_infra_props": access_infra_props_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_landing_page_design": access_landing_page_design_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_logo_url": access_logo_url_output,
-        "access_max_age": access_max_age_output,
-        "access_mcp_portal_props": access_mcp_portal_props_output,
-        "access_mcp_props": access_mcp_props_output,
-        "access_message": access_message_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-8": access_name_8_output,
-        "access_name-9": access_name_9_output,
-        "access_oauth_configuration": access_oauth_configuration_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_oidc_saas_app": access_oidc_saas_app_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_options_preflight_bypass": access_options_preflight_bypass_output,
-        "access_path_cookie_attribute": access_path_cookie_attribute_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_port": access_port_output,
-        "access_precedence": access_precedence_output,
-        "access_protocol_infra_app": access_protocol_infra_app_output,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app_output,
-        "access_proxy_endpoint_props": access_proxy_endpoint_props_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_rdp_props": access_rdp_props_output,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header_output,
-        "access_require-2": access_require_2_output,
-        "access_rule": access_rule_output,
-        "access_saas_props": access_saas_props_output,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_saml_saas_app": access_saml_saas_app_output,
-        "access_scim_config": access_scim_config_output,
-        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token_output,
-        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic_output,
-        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2_output,
-        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token_output,
-        "access_scim_config_mapping": access_scim_config_mapping_output,
-        "access_scim_config_multi_authentication": access_scim_config_multi_authentication_output,
-        "access_scim_config_single_authentication": access_scim_config_single_authentication_output,
-        "access_self_hosted_domains": access_self_hosted_domains_output,
-        "access_self_hosted_props": access_self_hosted_props_output,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-2": access_session_duration_2_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-9": access_single_response_9_output,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
-        "access_ssh_props": access_ssh_props_output,
-        "access_tags-2": access_tags_2_output,
-        "access_target_attributes": access_target_attributes_output,
-        "access_target_criteria_base": access_target_criteria_base_output,
-        "access_target_criteria_infra_app": access_target_criteria_infra_app_output,
-        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app_output,
-        "access_target_rule": access_target_rule_output,
-        "access_target_rule_attributes": access_target_rule_attributes_output,
-        "access_timestamp": access_timestamp_output,
-        "access_title": access_title_output,
-        "access_type": access_type_output,
-        "access_updated_at": access_updated_at_output,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid": access_uuid_output,
-        "access_uuid-2": access_uuid_2_output,
-        "access_vnc_props": access_vnc_props_output,
-        "access_warp_props": access_warp_props_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -757,170 +538,113 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_all_headers": access_allow_all_headers_output,
-        "access_allow_all_methods": access_allow_all_methods_output,
-        "access_allow_all_origins": access_allow_all_origins_output,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2_output,
-        "access_allow_credentials": access_allow_credentials_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_allowed_headers": access_allowed_headers_output,
-        "access_allowed_idps": access_allowed_idps_output,
-        "access_allowed_methods": access_allowed_methods_output,
-        "access_allowed_origins": access_allowed_origins_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url_output,
-        "access_app_launcher_props": access_app_launcher_props_output,
-        "access_app_launcher_visible": access_app_launcher_visible_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_resp_embedded_policies": access_app_resp_embedded_policies_output,
-        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra_output,
-        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted_output,
-        "access_app_response": access_app_response_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_aud-2": access_aud_2_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_basic_app_response_props": access_basic_app_response_props_output,
-        "access_bg_color": access_bg_color_output,
-        "access_biso_props": access_biso_props_output,
-        "access_bookmark_props": access_bookmark_props_output,
-        "access_button_color": access_button_color_output,
-        "access_button_text_color": access_button_text_color_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_cors_headers": access_cors_headers_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_deny_message": access_custom_deny_message_output,
-        "access_custom_deny_url": access_custom_deny_url_output,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url_output,
-        "access_custom_pages-2": access_custom_pages_2_output,
-        "access_decision": access_decision_output,
-        "access_destination_overrides": access_destination_overrides_output,
-        "access_destinations": access_destinations_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain": access_domain_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_enable_binding_cookie": access_enable_binding_cookie_output,
-        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination_output,
-        "access_end_user_all_workers_destination": access_end_user_all_workers_destination_output,
-        "access_end_user_destinations": access_end_user_destinations_output,
-        "access_end_user_oauth_configuration": access_end_user_oauth_configuration_output,
-        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination_output,
-        "access_end_user_props": access_end_user_props_output,
-        "access_end_user_public_destination": access_end_user_public_destination_output,
-        "access_end_user_worker_destination": access_end_user_worker_destination_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_feature_app_props": access_feature_app_props_output,
-        "access_footer_links": access_footer_links_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_header_bg_color": access_header_bg_color_output,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute_output,
-        "access_identifier": access_identifier_output,
-        "access_image_url": access_image_url_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_infra_props": access_infra_props_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_landing_page_design": access_landing_page_design_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_logo_url": access_logo_url_output,
-        "access_max_age": access_max_age_output,
-        "access_mcp_portal_props": access_mcp_portal_props_output,
-        "access_mcp_props": access_mcp_props_output,
-        "access_message": access_message_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-8": access_name_8_output,
-        "access_name-9": access_name_9_output,
-        "access_oauth_configuration": access_oauth_configuration_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_oidc_saas_app": access_oidc_saas_app_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_options_preflight_bypass": access_options_preflight_bypass_output,
-        "access_path_cookie_attribute": access_path_cookie_attribute_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_port": access_port_output,
-        "access_precedence": access_precedence_output,
-        "access_protocol_infra_app": access_protocol_infra_app_output,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app_output,
-        "access_proxy_endpoint_props": access_proxy_endpoint_props_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_rdp_props": access_rdp_props_output,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header_output,
-        "access_require-2": access_require_2_output,
-        "access_rule": access_rule_output,
-        "access_saas_props": access_saas_props_output,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_saml_saas_app": access_saml_saas_app_output,
-        "access_scim_config": access_scim_config_output,
-        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token_output,
-        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic_output,
-        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2_output,
-        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token_output,
-        "access_scim_config_mapping": access_scim_config_mapping_output,
-        "access_scim_config_multi_authentication": access_scim_config_multi_authentication_output,
-        "access_scim_config_single_authentication": access_scim_config_single_authentication_output,
-        "access_self_hosted_domains": access_self_hosted_domains_output,
-        "access_self_hosted_props": access_self_hosted_props_output,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-2": access_session_duration_2_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-9": access_single_response_9_output,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
-        "access_ssh_props": access_ssh_props_output,
-        "access_tags-2": access_tags_2_output,
-        "access_target_attributes": access_target_attributes_output,
-        "access_target_criteria_base": access_target_criteria_base_output,
-        "access_target_criteria_infra_app": access_target_criteria_infra_app_output,
-        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app_output,
-        "access_target_rule": access_target_rule_output,
-        "access_target_rule_attributes": access_target_rule_attributes_output,
-        "access_timestamp": access_timestamp_output,
-        "access_title": access_title_output,
-        "access_type": access_type_output,
-        "access_updated_at": access_updated_at_output,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid": access_uuid_output,
-        "access_uuid-2": access_uuid_2_output,
-        "access_vnc_props": access_vnc_props_output,
-        "access_warp_props": access_warp_props_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_allowed_headers": access_allowed_headers,
+        "access_allowed_idps": access_allowed_idps,
+        "access_allowed_methods": access_allowed_methods,
+        "access_allowed_origins": access_allowed_origins,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_app_launcher_props": access_app_launcher_props,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_resp_embedded_policies": access_app_resp_embedded_policies,
+        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra,
+        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted,
+        "access_app_response": access_app_response,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_basic_app_response_props": access_basic_app_response_props,
+        "access_biso_props": access_biso_props,
+        "access_bookmark_props": access_bookmark_props,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_cors_headers": access_cors_headers,
+        "access_country_rule": access_country_rule,
+        "access_custom_pages-2": access_custom_pages$$2,
+        "access_destination_overrides": access_destination_overrides,
+        "access_destinations": access_destinations,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination,
+        "access_end_user_all_workers_destination": access_end_user_all_workers_destination,
+        "access_end_user_destinations": access_end_user_destinations,
+        "access_end_user_oauth_configuration": access_end_user_oauth_configuration,
+        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination,
+        "access_end_user_props": access_end_user_props,
+        "access_end_user_public_destination": access_end_user_public_destination,
+        "access_end_user_worker_destination": access_end_user_worker_destination,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_feature_app_props": access_feature_app_props,
+        "access_footer_links": access_footer_links,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_infra_props": access_infra_props,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_landing_page_design": access_landing_page_design,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_mcp_portal_props": access_mcp_portal_props,
+        "access_mcp_props": access_mcp_props,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oauth_configuration": access_oauth_configuration,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_oidc_saas_app": access_oidc_saas_app,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_proxy_endpoint_props": access_proxy_endpoint_props,
+        "access_rdp_props": access_rdp_props,
+        "access_require-2": access_require$$2,
+        "access_rule": access_rule,
+        "access_saas_props": access_saas_props,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_saml_saas_app": access_saml_saas_app,
+        "access_scim_config": access_scim_config,
+        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token,
+        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic,
+        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2,
+        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token,
+        "access_scim_config_mapping": access_scim_config_mapping,
+        "access_scim_config_multi_authentication": access_scim_config_multi_authentication,
+        "access_scim_config_single_authentication": access_scim_config_single_authentication,
+        "access_self_hosted_domains": access_self_hosted_domains,
+        "access_self_hosted_props": access_self_hosted_props,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-9": access_single_response$$9,
+        "access_ssh_props": access_ssh_props,
+        "access_tags-2": access_tags$$2,
+        "access_target_attributes": access_target_attributes,
+        "access_target_criteria_base": access_target_criteria_base,
+        "access_target_criteria_infra_app": access_target_criteria_infra_app,
+        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app,
+        "access_target_rule": access_target_rule,
+        "access_target_rule_attributes": access_target_rule_attributes,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
+        "access_vnc_props": access_vnc_props,
+        "access_warp_props": access_warp_props,
       },
     },
     request: (args) => ({
@@ -929,46 +653,59 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_applications_delete",
+    name: "zeroTrust_access_applications_delete",
     title: "Delete an Access application",
-    description: "Deletes an application from Access.",
+    description: "Deletes an application from Access.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "oneOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_app_id"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "access_app_id": access_app_id,
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -995,11 +732,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -1007,632 +743,488 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_applications_get",
+    name: "zeroTrust_access_applications_get",
     title: "Get an Access application",
-    description: "Fetches information about an Access application.",
+    description: "Fetches information about an Access application.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "oneOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_app_id"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "access_app_id": access_app_id,
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-9",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_all_headers": access_allow_all_headers_output,
-        "access_allow_all_methods": access_allow_all_methods_output,
-        "access_allow_all_origins": access_allow_all_origins_output,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2_output,
-        "access_allow_credentials": access_allow_credentials_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_allowed_headers": access_allowed_headers_output,
-        "access_allowed_idps": access_allowed_idps_output,
-        "access_allowed_methods": access_allowed_methods_output,
-        "access_allowed_origins": access_allowed_origins_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url_output,
-        "access_app_launcher_props": access_app_launcher_props_output,
-        "access_app_launcher_visible": access_app_launcher_visible_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_resp_embedded_policies": access_app_resp_embedded_policies_output,
-        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra_output,
-        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted_output,
-        "access_app_response": access_app_response_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_aud-2": access_aud_2_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_basic_app_response_props": access_basic_app_response_props_output,
-        "access_bg_color": access_bg_color_output,
-        "access_biso_props": access_biso_props_output,
-        "access_bookmark_props": access_bookmark_props_output,
-        "access_button_color": access_button_color_output,
-        "access_button_text_color": access_button_text_color_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_cors_headers": access_cors_headers_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_deny_message": access_custom_deny_message_output,
-        "access_custom_deny_url": access_custom_deny_url_output,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url_output,
-        "access_custom_pages-2": access_custom_pages_2_output,
-        "access_decision": access_decision_output,
-        "access_destination_overrides": access_destination_overrides_output,
-        "access_destinations": access_destinations_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain": access_domain_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_enable_binding_cookie": access_enable_binding_cookie_output,
-        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination_output,
-        "access_end_user_all_workers_destination": access_end_user_all_workers_destination_output,
-        "access_end_user_destinations": access_end_user_destinations_output,
-        "access_end_user_oauth_configuration": access_end_user_oauth_configuration_output,
-        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination_output,
-        "access_end_user_props": access_end_user_props_output,
-        "access_end_user_public_destination": access_end_user_public_destination_output,
-        "access_end_user_worker_destination": access_end_user_worker_destination_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_feature_app_props": access_feature_app_props_output,
-        "access_footer_links": access_footer_links_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_header_bg_color": access_header_bg_color_output,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute_output,
-        "access_identifier": access_identifier_output,
-        "access_image_url": access_image_url_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_infra_props": access_infra_props_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_landing_page_design": access_landing_page_design_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_logo_url": access_logo_url_output,
-        "access_max_age": access_max_age_output,
-        "access_mcp_portal_props": access_mcp_portal_props_output,
-        "access_mcp_props": access_mcp_props_output,
-        "access_message": access_message_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-8": access_name_8_output,
-        "access_name-9": access_name_9_output,
-        "access_oauth_configuration": access_oauth_configuration_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_oidc_saas_app": access_oidc_saas_app_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_options_preflight_bypass": access_options_preflight_bypass_output,
-        "access_path_cookie_attribute": access_path_cookie_attribute_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_port": access_port_output,
-        "access_precedence": access_precedence_output,
-        "access_protocol_infra_app": access_protocol_infra_app_output,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app_output,
-        "access_proxy_endpoint_props": access_proxy_endpoint_props_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_rdp_props": access_rdp_props_output,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header_output,
-        "access_require-2": access_require_2_output,
-        "access_rule": access_rule_output,
-        "access_saas_props": access_saas_props_output,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_saml_saas_app": access_saml_saas_app_output,
-        "access_scim_config": access_scim_config_output,
-        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token_output,
-        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic_output,
-        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2_output,
-        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token_output,
-        "access_scim_config_mapping": access_scim_config_mapping_output,
-        "access_scim_config_multi_authentication": access_scim_config_multi_authentication_output,
-        "access_scim_config_single_authentication": access_scim_config_single_authentication_output,
-        "access_self_hosted_domains": access_self_hosted_domains_output,
-        "access_self_hosted_props": access_self_hosted_props_output,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-2": access_session_duration_2_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-9": access_single_response_9_output,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
-        "access_ssh_props": access_ssh_props_output,
-        "access_tags-2": access_tags_2_output,
-        "access_target_attributes": access_target_attributes_output,
-        "access_target_criteria_base": access_target_criteria_base_output,
-        "access_target_criteria_infra_app": access_target_criteria_infra_app_output,
-        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app_output,
-        "access_target_rule": access_target_rule_output,
-        "access_target_rule_attributes": access_target_rule_attributes_output,
-        "access_timestamp": access_timestamp_output,
-        "access_title": access_title_output,
-        "access_type": access_type_output,
-        "access_updated_at": access_updated_at_output,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid": access_uuid_output,
-        "access_uuid-2": access_uuid_2_output,
-        "access_vnc_props": access_vnc_props_output,
-        "access_warp_props": access_warp_props_output,
-      },
-    },
-    annotations: {
-      "destructiveHint": false,
-      "idempotentHint": true,
-      "openWorldHint": true,
-      "readOnlyHint": true,
-      "title": "Get an Access application"
-    },
-    method: "GET",
-    path: "/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}",
-    extensions: {
-      "x-api-token-group": [
-        "Access: Apps and Policies Write",
-        "Access: Apps and Policies Read"
-      ],
-      "x-stability": "beta"
-    },
-    responses: {
-      schemas: {
-        "200": {
-          "$ref": "#/$defs/access_single_response-9"
-        },
-        "4XX": {
-          "$ref": "#/$defs/access_api-response-common-failure"
-        }
-      },
-      $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_all_headers": access_allow_all_headers_output,
-        "access_allow_all_methods": access_allow_all_methods_output,
-        "access_allow_all_origins": access_allow_all_origins_output,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2_output,
-        "access_allow_credentials": access_allow_credentials_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_allowed_headers": access_allowed_headers_output,
-        "access_allowed_idps": access_allowed_idps_output,
-        "access_allowed_methods": access_allowed_methods_output,
-        "access_allowed_origins": access_allowed_origins_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url_output,
-        "access_app_launcher_props": access_app_launcher_props_output,
-        "access_app_launcher_visible": access_app_launcher_visible_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_resp_embedded_policies": access_app_resp_embedded_policies_output,
-        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra_output,
-        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted_output,
-        "access_app_response": access_app_response_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_aud-2": access_aud_2_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_basic_app_response_props": access_basic_app_response_props_output,
-        "access_bg_color": access_bg_color_output,
-        "access_biso_props": access_biso_props_output,
-        "access_bookmark_props": access_bookmark_props_output,
-        "access_button_color": access_button_color_output,
-        "access_button_text_color": access_button_text_color_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_cors_headers": access_cors_headers_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_deny_message": access_custom_deny_message_output,
-        "access_custom_deny_url": access_custom_deny_url_output,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url_output,
-        "access_custom_pages-2": access_custom_pages_2_output,
-        "access_decision": access_decision_output,
-        "access_destination_overrides": access_destination_overrides_output,
-        "access_destinations": access_destinations_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain": access_domain_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_enable_binding_cookie": access_enable_binding_cookie_output,
-        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination_output,
-        "access_end_user_all_workers_destination": access_end_user_all_workers_destination_output,
-        "access_end_user_destinations": access_end_user_destinations_output,
-        "access_end_user_oauth_configuration": access_end_user_oauth_configuration_output,
-        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination_output,
-        "access_end_user_props": access_end_user_props_output,
-        "access_end_user_public_destination": access_end_user_public_destination_output,
-        "access_end_user_worker_destination": access_end_user_worker_destination_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_feature_app_props": access_feature_app_props_output,
-        "access_footer_links": access_footer_links_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_header_bg_color": access_header_bg_color_output,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute_output,
-        "access_identifier": access_identifier_output,
-        "access_image_url": access_image_url_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_infra_props": access_infra_props_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_landing_page_design": access_landing_page_design_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_logo_url": access_logo_url_output,
-        "access_max_age": access_max_age_output,
-        "access_mcp_portal_props": access_mcp_portal_props_output,
-        "access_mcp_props": access_mcp_props_output,
-        "access_message": access_message_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-8": access_name_8_output,
-        "access_name-9": access_name_9_output,
-        "access_oauth_configuration": access_oauth_configuration_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_oidc_saas_app": access_oidc_saas_app_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_options_preflight_bypass": access_options_preflight_bypass_output,
-        "access_path_cookie_attribute": access_path_cookie_attribute_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_port": access_port_output,
-        "access_precedence": access_precedence_output,
-        "access_protocol_infra_app": access_protocol_infra_app_output,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app_output,
-        "access_proxy_endpoint_props": access_proxy_endpoint_props_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_rdp_props": access_rdp_props_output,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header_output,
-        "access_require-2": access_require_2_output,
-        "access_rule": access_rule_output,
-        "access_saas_props": access_saas_props_output,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_saml_saas_app": access_saml_saas_app_output,
-        "access_scim_config": access_scim_config_output,
-        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token_output,
-        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic_output,
-        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2_output,
-        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token_output,
-        "access_scim_config_mapping": access_scim_config_mapping_output,
-        "access_scim_config_multi_authentication": access_scim_config_multi_authentication_output,
-        "access_scim_config_single_authentication": access_scim_config_single_authentication_output,
-        "access_self_hosted_domains": access_self_hosted_domains_output,
-        "access_self_hosted_props": access_self_hosted_props_output,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-2": access_session_duration_2_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-9": access_single_response_9_output,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
-        "access_ssh_props": access_ssh_props_output,
-        "access_tags-2": access_tags_2_output,
-        "access_target_attributes": access_target_attributes_output,
-        "access_target_criteria_base": access_target_criteria_base_output,
-        "access_target_criteria_infra_app": access_target_criteria_infra_app_output,
-        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app_output,
-        "access_target_rule": access_target_rule_output,
-        "access_target_rule_attributes": access_target_rule_attributes_output,
-        "access_timestamp": access_timestamp_output,
-        "access_title": access_title_output,
-        "access_type": access_type_output,
-        "access_updated_at": access_updated_at_output,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid": access_uuid_output,
-        "access_uuid-2": access_uuid_2_output,
-        "access_vnc_props": access_vnc_props_output,
-        "access_warp_props": access_warp_props_output,
-      },
-    },
-    request: (args) => ({
-      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/apps/${pathParam(args, "app_id")}`,
-    }),
-  },
-  {
-    name: "zero_trust_access_applications_list",
-    title: "List Access applications",
-    description: "Lists all Access applications in an account or zone.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "aud": {
-          "description": "The aud of the app.",
-          "type": "string"
-        },
-        "domain": {
-          "description": "The domain of the app.",
-          "type": "string"
-        },
-        "exact": {
-          "description": "True for only exact string matches against passed name/domain query parameters.",
-          "type": "boolean"
-        },
-        "name": {
-          "description": "The name of the app.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 1000,
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "Search for apps by other listed query parameters.",
-          "type": "string"
-        },
-        "target_attributes": {
-          "description": "Target Criteria attributes in key=value format.",
-          "type": "string"
-        }
-      },
-      required: [
-        "account_or_zone",
-        "account_or_zone_id"
-      ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_allowed_headers": access_allowed_headers,
+        "access_allowed_idps": access_allowed_idps,
+        "access_allowed_methods": access_allowed_methods,
+        "access_allowed_origins": access_allowed_origins,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-single": access_api$$response$$single,
+        "access_app_launcher_props": access_app_launcher_props,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_resp_embedded_policies": access_app_resp_embedded_policies,
+        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra,
+        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted,
+        "access_app_response": access_app_response,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_basic_app_response_props": access_basic_app_response_props,
+        "access_biso_props": access_biso_props,
+        "access_bookmark_props": access_bookmark_props,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_cors_headers": access_cors_headers,
+        "access_country_rule": access_country_rule,
+        "access_custom_pages-2": access_custom_pages$$2,
+        "access_destination_overrides": access_destination_overrides,
+        "access_destinations": access_destinations,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination,
+        "access_end_user_all_workers_destination": access_end_user_all_workers_destination,
+        "access_end_user_destinations": access_end_user_destinations,
+        "access_end_user_oauth_configuration": access_end_user_oauth_configuration,
+        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination,
+        "access_end_user_props": access_end_user_props,
+        "access_end_user_public_destination": access_end_user_public_destination,
+        "access_end_user_worker_destination": access_end_user_worker_destination,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_feature_app_props": access_feature_app_props,
+        "access_footer_links": access_footer_links,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_infra_props": access_infra_props,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_landing_page_design": access_landing_page_design,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_mcp_portal_props": access_mcp_portal_props,
+        "access_mcp_props": access_mcp_props,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oauth_configuration": access_oauth_configuration,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_oidc_saas_app": access_oidc_saas_app,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_proxy_endpoint_props": access_proxy_endpoint_props,
+        "access_rdp_props": access_rdp_props,
+        "access_require-2": access_require$$2,
+        "access_rule": access_rule,
+        "access_saas_props": access_saas_props,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_saml_saas_app": access_saml_saas_app,
+        "access_scim_config": access_scim_config,
+        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token,
+        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic,
+        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2,
+        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token,
+        "access_scim_config_mapping": access_scim_config_mapping,
+        "access_scim_config_multi_authentication": access_scim_config_multi_authentication,
+        "access_scim_config_single_authentication": access_scim_config_single_authentication,
+        "access_self_hosted_domains": access_self_hosted_domains,
+        "access_self_hosted_props": access_self_hosted_props,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-9": access_single_response$$9,
+        "access_ssh_props": access_ssh_props,
+        "access_tags-2": access_tags$$2,
+        "access_target_attributes": access_target_attributes,
+        "access_target_criteria_base": access_target_criteria_base,
+        "access_target_criteria_infra_app": access_target_criteria_infra_app,
+        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app,
+        "access_target_rule": access_target_rule,
+        "access_target_rule_attributes": access_target_rule_attributes,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
+        "access_vnc_props": access_vnc_props,
+        "access_warp_props": access_warp_props,
+      },
+    },
+    annotations: {
+      "destructiveHint": false,
+      "idempotentHint": true,
+      "openWorldHint": true,
+      "readOnlyHint": true,
+      "title": "Get an Access application"
+    },
+    method: "GET",
+    path: "/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}",
+    extensions: {
+      "x-api-token-group": [
+        "Access: Apps and Policies Write",
+        "Access: Apps and Policies Read"
+      ],
+      "x-stability": "beta"
+    },
+    responses: {
+      schemas: {
+        "200": {
+          "$ref": "#/$defs/access_single_response-9"
+        },
+        "4XX": {
+          "$ref": "#/$defs/access_api-response-common-failure"
+        }
+      },
+      $defs: {
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_allowed_headers": access_allowed_headers,
+        "access_allowed_idps": access_allowed_idps,
+        "access_allowed_methods": access_allowed_methods,
+        "access_allowed_origins": access_allowed_origins,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_app_launcher_props": access_app_launcher_props,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_resp_embedded_policies": access_app_resp_embedded_policies,
+        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra,
+        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted,
+        "access_app_response": access_app_response,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_basic_app_response_props": access_basic_app_response_props,
+        "access_biso_props": access_biso_props,
+        "access_bookmark_props": access_bookmark_props,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_cors_headers": access_cors_headers,
+        "access_country_rule": access_country_rule,
+        "access_custom_pages-2": access_custom_pages$$2,
+        "access_destination_overrides": access_destination_overrides,
+        "access_destinations": access_destinations,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination,
+        "access_end_user_all_workers_destination": access_end_user_all_workers_destination,
+        "access_end_user_destinations": access_end_user_destinations,
+        "access_end_user_oauth_configuration": access_end_user_oauth_configuration,
+        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination,
+        "access_end_user_props": access_end_user_props,
+        "access_end_user_public_destination": access_end_user_public_destination,
+        "access_end_user_worker_destination": access_end_user_worker_destination,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_feature_app_props": access_feature_app_props,
+        "access_footer_links": access_footer_links,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_infra_props": access_infra_props,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_landing_page_design": access_landing_page_design,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_mcp_portal_props": access_mcp_portal_props,
+        "access_mcp_props": access_mcp_props,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oauth_configuration": access_oauth_configuration,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_oidc_saas_app": access_oidc_saas_app,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_proxy_endpoint_props": access_proxy_endpoint_props,
+        "access_rdp_props": access_rdp_props,
+        "access_require-2": access_require$$2,
+        "access_rule": access_rule,
+        "access_saas_props": access_saas_props,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_saml_saas_app": access_saml_saas_app,
+        "access_scim_config": access_scim_config,
+        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token,
+        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic,
+        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2,
+        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token,
+        "access_scim_config_mapping": access_scim_config_mapping,
+        "access_scim_config_multi_authentication": access_scim_config_multi_authentication,
+        "access_scim_config_single_authentication": access_scim_config_single_authentication,
+        "access_self_hosted_domains": access_self_hosted_domains,
+        "access_self_hosted_props": access_self_hosted_props,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-9": access_single_response$$9,
+        "access_ssh_props": access_ssh_props,
+        "access_tags-2": access_tags$$2,
+        "access_target_attributes": access_target_attributes,
+        "access_target_criteria_base": access_target_criteria_base,
+        "access_target_criteria_infra_app": access_target_criteria_infra_app,
+        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app,
+        "access_target_rule": access_target_rule,
+        "access_target_rule_attributes": access_target_rule_attributes,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
+        "access_vnc_props": access_vnc_props,
+        "access_warp_props": access_warp_props,
+      },
+    },
+    request: (args) => ({
+      path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/apps/${pathParam(args, "app_id")}`,
+    }),
+  },
+  {
+    name: "zeroTrust_access_applications_list",
+    title: "List Access applications",
+    description: "Lists all Access applications in an account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/apps",
+    inputSchema: {
+      type: "object",
+      properties: {
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "aud": {
+              "description": "The aud of the app.",
+              "type": "string"
+            },
+            "domain": {
+              "description": "The domain of the app.",
+              "type": "string"
+            },
+            "exact": {
+              "description": "True for only exact string matches against passed name/domain query parameters.",
+              "type": "boolean"
+            },
+            "name": {
+              "description": "The name of the app.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 1000,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search for apps by other listed query parameters.",
+              "type": "string"
+            },
+            "target_attributes": {
+              "description": "Target Criteria attributes in key=value format.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      },
+      required: [
+        "path"
+      ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-8",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_all_headers": access_allow_all_headers_output,
-        "access_allow_all_methods": access_allow_all_methods_output,
-        "access_allow_all_origins": access_allow_all_origins_output,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2_output,
-        "access_allow_credentials": access_allow_credentials_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_allowed_headers": access_allowed_headers_output,
-        "access_allowed_idps": access_allowed_idps_output,
-        "access_allowed_methods": access_allowed_methods_output,
-        "access_allowed_origins": access_allowed_origins_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url_output,
-        "access_app_launcher_props": access_app_launcher_props_output,
-        "access_app_launcher_visible": access_app_launcher_visible_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_resp_embedded_policies": access_app_resp_embedded_policies_output,
-        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra_output,
-        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted_output,
-        "access_app_response": access_app_response_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_aud-2": access_aud_2_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_basic_app_response_props": access_basic_app_response_props_output,
-        "access_bg_color": access_bg_color_output,
-        "access_biso_props": access_biso_props_output,
-        "access_bookmark_props": access_bookmark_props_output,
-        "access_button_color": access_button_color_output,
-        "access_button_text_color": access_button_text_color_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_cors_headers": access_cors_headers_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_deny_message": access_custom_deny_message_output,
-        "access_custom_deny_url": access_custom_deny_url_output,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url_output,
-        "access_custom_pages-2": access_custom_pages_2_output,
-        "access_decision": access_decision_output,
-        "access_destination_overrides": access_destination_overrides_output,
-        "access_destinations": access_destinations_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain": access_domain_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_enable_binding_cookie": access_enable_binding_cookie_output,
-        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination_output,
-        "access_end_user_all_workers_destination": access_end_user_all_workers_destination_output,
-        "access_end_user_destinations": access_end_user_destinations_output,
-        "access_end_user_oauth_configuration": access_end_user_oauth_configuration_output,
-        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination_output,
-        "access_end_user_props": access_end_user_props_output,
-        "access_end_user_public_destination": access_end_user_public_destination_output,
-        "access_end_user_worker_destination": access_end_user_worker_destination_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_feature_app_props": access_feature_app_props_output,
-        "access_footer_links": access_footer_links_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_header_bg_color": access_header_bg_color_output,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute_output,
-        "access_identifier": access_identifier_output,
-        "access_image_url": access_image_url_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_infra_props": access_infra_props_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_landing_page_design": access_landing_page_design_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_logo_url": access_logo_url_output,
-        "access_max_age": access_max_age_output,
-        "access_mcp_portal_props": access_mcp_portal_props_output,
-        "access_mcp_props": access_mcp_props_output,
-        "access_message": access_message_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-8": access_name_8_output,
-        "access_name-9": access_name_9_output,
-        "access_oauth_configuration": access_oauth_configuration_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_oidc_saas_app": access_oidc_saas_app_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_options_preflight_bypass": access_options_preflight_bypass_output,
-        "access_path_cookie_attribute": access_path_cookie_attribute_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_port": access_port_output,
-        "access_precedence": access_precedence_output,
-        "access_protocol_infra_app": access_protocol_infra_app_output,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app_output,
-        "access_proxy_endpoint_props": access_proxy_endpoint_props_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_rdp_props": access_rdp_props_output,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header_output,
-        "access_require-2": access_require_2_output,
-        "access_response_collection-8": access_response_collection_8_output,
-        "access_rule": access_rule_output,
-        "access_saas_props": access_saas_props_output,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_saml_saas_app": access_saml_saas_app_output,
-        "access_scim_config": access_scim_config_output,
-        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token_output,
-        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic_output,
-        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2_output,
-        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token_output,
-        "access_scim_config_mapping": access_scim_config_mapping_output,
-        "access_scim_config_multi_authentication": access_scim_config_multi_authentication_output,
-        "access_scim_config_single_authentication": access_scim_config_single_authentication_output,
-        "access_self_hosted_domains": access_self_hosted_domains_output,
-        "access_self_hosted_props": access_self_hosted_props_output,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-2": access_session_duration_2_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
-        "access_ssh_props": access_ssh_props_output,
-        "access_tags-2": access_tags_2_output,
-        "access_target_attributes": access_target_attributes_output,
-        "access_target_criteria_base": access_target_criteria_base_output,
-        "access_target_criteria_infra_app": access_target_criteria_infra_app_output,
-        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app_output,
-        "access_target_rule": access_target_rule_output,
-        "access_target_rule_attributes": access_target_rule_attributes_output,
-        "access_timestamp": access_timestamp_output,
-        "access_title": access_title_output,
-        "access_type": access_type_output,
-        "access_updated_at": access_updated_at_output,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid": access_uuid_output,
-        "access_uuid-2": access_uuid_2_output,
-        "access_vnc_props": access_vnc_props_output,
-        "access_warp_props": access_warp_props_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_allowed_headers": access_allowed_headers,
+        "access_allowed_idps": access_allowed_idps,
+        "access_allowed_methods": access_allowed_methods,
+        "access_allowed_origins": access_allowed_origins,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_app_launcher_props": access_app_launcher_props,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_resp_embedded_policies": access_app_resp_embedded_policies,
+        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra,
+        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted,
+        "access_app_response": access_app_response,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_basic_app_response_props": access_basic_app_response_props,
+        "access_biso_props": access_biso_props,
+        "access_bookmark_props": access_bookmark_props,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_cors_headers": access_cors_headers,
+        "access_country_rule": access_country_rule,
+        "access_custom_pages-2": access_custom_pages$$2,
+        "access_destination_overrides": access_destination_overrides,
+        "access_destinations": access_destinations,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination,
+        "access_end_user_all_workers_destination": access_end_user_all_workers_destination,
+        "access_end_user_destinations": access_end_user_destinations,
+        "access_end_user_oauth_configuration": access_end_user_oauth_configuration,
+        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination,
+        "access_end_user_props": access_end_user_props,
+        "access_end_user_public_destination": access_end_user_public_destination,
+        "access_end_user_worker_destination": access_end_user_worker_destination,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_feature_app_props": access_feature_app_props,
+        "access_footer_links": access_footer_links,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_infra_props": access_infra_props,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_landing_page_design": access_landing_page_design,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_mcp_portal_props": access_mcp_portal_props,
+        "access_mcp_props": access_mcp_props,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oauth_configuration": access_oauth_configuration,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_oidc_saas_app": access_oidc_saas_app,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_proxy_endpoint_props": access_proxy_endpoint_props,
+        "access_rdp_props": access_rdp_props,
+        "access_require-2": access_require$$2,
+        "access_response_collection-8": access_response_collection$$8,
+        "access_rule": access_rule,
+        "access_saas_props": access_saas_props,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_saml_saas_app": access_saml_saas_app,
+        "access_scim_config": access_scim_config,
+        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token,
+        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic,
+        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2,
+        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token,
+        "access_scim_config_mapping": access_scim_config_mapping,
+        "access_scim_config_multi_authentication": access_scim_config_multi_authentication,
+        "access_scim_config_single_authentication": access_scim_config_single_authentication,
+        "access_self_hosted_domains": access_self_hosted_domains,
+        "access_self_hosted_props": access_self_hosted_props,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_ssh_props": access_ssh_props,
+        "access_tags-2": access_tags$$2,
+        "access_target_attributes": access_target_attributes,
+        "access_target_criteria_base": access_target_criteria_base,
+        "access_target_criteria_infra_app": access_target_criteria_infra_app,
+        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app,
+        "access_target_rule": access_target_rule,
+        "access_target_rule_attributes": access_target_rule_attributes,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
+        "access_vnc_props": access_vnc_props,
+        "access_warp_props": access_warp_props,
       },
     },
     annotations: {
@@ -1662,225 +1254,182 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_all_headers": access_allow_all_headers_output,
-        "access_allow_all_methods": access_allow_all_methods_output,
-        "access_allow_all_origins": access_allow_all_origins_output,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2_output,
-        "access_allow_credentials": access_allow_credentials_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_allowed_headers": access_allowed_headers_output,
-        "access_allowed_idps": access_allowed_idps_output,
-        "access_allowed_methods": access_allowed_methods_output,
-        "access_allowed_origins": access_allowed_origins_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url_output,
-        "access_app_launcher_props": access_app_launcher_props_output,
-        "access_app_launcher_visible": access_app_launcher_visible_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_resp_embedded_policies": access_app_resp_embedded_policies_output,
-        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra_output,
-        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted_output,
-        "access_app_response": access_app_response_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_aud-2": access_aud_2_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_basic_app_response_props": access_basic_app_response_props_output,
-        "access_bg_color": access_bg_color_output,
-        "access_biso_props": access_biso_props_output,
-        "access_bookmark_props": access_bookmark_props_output,
-        "access_button_color": access_button_color_output,
-        "access_button_text_color": access_button_text_color_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_cors_headers": access_cors_headers_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_deny_message": access_custom_deny_message_output,
-        "access_custom_deny_url": access_custom_deny_url_output,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url_output,
-        "access_custom_pages-2": access_custom_pages_2_output,
-        "access_decision": access_decision_output,
-        "access_destination_overrides": access_destination_overrides_output,
-        "access_destinations": access_destinations_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain": access_domain_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_enable_binding_cookie": access_enable_binding_cookie_output,
-        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination_output,
-        "access_end_user_all_workers_destination": access_end_user_all_workers_destination_output,
-        "access_end_user_destinations": access_end_user_destinations_output,
-        "access_end_user_oauth_configuration": access_end_user_oauth_configuration_output,
-        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination_output,
-        "access_end_user_props": access_end_user_props_output,
-        "access_end_user_public_destination": access_end_user_public_destination_output,
-        "access_end_user_worker_destination": access_end_user_worker_destination_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_feature_app_props": access_feature_app_props_output,
-        "access_footer_links": access_footer_links_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_header_bg_color": access_header_bg_color_output,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute_output,
-        "access_identifier": access_identifier_output,
-        "access_image_url": access_image_url_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_infra_props": access_infra_props_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_landing_page_design": access_landing_page_design_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_logo_url": access_logo_url_output,
-        "access_max_age": access_max_age_output,
-        "access_mcp_portal_props": access_mcp_portal_props_output,
-        "access_mcp_props": access_mcp_props_output,
-        "access_message": access_message_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-8": access_name_8_output,
-        "access_name-9": access_name_9_output,
-        "access_oauth_configuration": access_oauth_configuration_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_oidc_saas_app": access_oidc_saas_app_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_options_preflight_bypass": access_options_preflight_bypass_output,
-        "access_path_cookie_attribute": access_path_cookie_attribute_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_port": access_port_output,
-        "access_precedence": access_precedence_output,
-        "access_protocol_infra_app": access_protocol_infra_app_output,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app_output,
-        "access_proxy_endpoint_props": access_proxy_endpoint_props_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_rdp_props": access_rdp_props_output,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header_output,
-        "access_require-2": access_require_2_output,
-        "access_response_collection-8": access_response_collection_8_output,
-        "access_rule": access_rule_output,
-        "access_saas_props": access_saas_props_output,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_saml_saas_app": access_saml_saas_app_output,
-        "access_scim_config": access_scim_config_output,
-        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token_output,
-        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic_output,
-        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2_output,
-        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token_output,
-        "access_scim_config_mapping": access_scim_config_mapping_output,
-        "access_scim_config_multi_authentication": access_scim_config_multi_authentication_output,
-        "access_scim_config_single_authentication": access_scim_config_single_authentication_output,
-        "access_self_hosted_domains": access_self_hosted_domains_output,
-        "access_self_hosted_props": access_self_hosted_props_output,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-2": access_session_duration_2_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
-        "access_ssh_props": access_ssh_props_output,
-        "access_tags-2": access_tags_2_output,
-        "access_target_attributes": access_target_attributes_output,
-        "access_target_criteria_base": access_target_criteria_base_output,
-        "access_target_criteria_infra_app": access_target_criteria_infra_app_output,
-        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app_output,
-        "access_target_rule": access_target_rule_output,
-        "access_target_rule_attributes": access_target_rule_attributes_output,
-        "access_timestamp": access_timestamp_output,
-        "access_title": access_title_output,
-        "access_type": access_type_output,
-        "access_updated_at": access_updated_at_output,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid": access_uuid_output,
-        "access_uuid-2": access_uuid_2_output,
-        "access_vnc_props": access_vnc_props_output,
-        "access_warp_props": access_warp_props_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_allowed_headers": access_allowed_headers,
+        "access_allowed_idps": access_allowed_idps,
+        "access_allowed_methods": access_allowed_methods,
+        "access_allowed_origins": access_allowed_origins,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_app_launcher_props": access_app_launcher_props,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_resp_embedded_policies": access_app_resp_embedded_policies,
+        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra,
+        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted,
+        "access_app_response": access_app_response,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_basic_app_response_props": access_basic_app_response_props,
+        "access_biso_props": access_biso_props,
+        "access_bookmark_props": access_bookmark_props,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_cors_headers": access_cors_headers,
+        "access_country_rule": access_country_rule,
+        "access_custom_pages-2": access_custom_pages$$2,
+        "access_destination_overrides": access_destination_overrides,
+        "access_destinations": access_destinations,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination,
+        "access_end_user_all_workers_destination": access_end_user_all_workers_destination,
+        "access_end_user_destinations": access_end_user_destinations,
+        "access_end_user_oauth_configuration": access_end_user_oauth_configuration,
+        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination,
+        "access_end_user_props": access_end_user_props,
+        "access_end_user_public_destination": access_end_user_public_destination,
+        "access_end_user_worker_destination": access_end_user_worker_destination,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_feature_app_props": access_feature_app_props,
+        "access_footer_links": access_footer_links,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_infra_props": access_infra_props,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_landing_page_design": access_landing_page_design,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_mcp_portal_props": access_mcp_portal_props,
+        "access_mcp_props": access_mcp_props,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oauth_configuration": access_oauth_configuration,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_oidc_saas_app": access_oidc_saas_app,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_proxy_endpoint_props": access_proxy_endpoint_props,
+        "access_rdp_props": access_rdp_props,
+        "access_require-2": access_require$$2,
+        "access_response_collection-8": access_response_collection$$8,
+        "access_rule": access_rule,
+        "access_saas_props": access_saas_props,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_saml_saas_app": access_saml_saas_app,
+        "access_scim_config": access_scim_config,
+        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token,
+        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic,
+        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2,
+        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token,
+        "access_scim_config_mapping": access_scim_config_mapping,
+        "access_scim_config_multi_authentication": access_scim_config_multi_authentication,
+        "access_scim_config_single_authentication": access_scim_config_single_authentication,
+        "access_self_hosted_domains": access_self_hosted_domains,
+        "access_self_hosted_props": access_self_hosted_props,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_ssh_props": access_ssh_props,
+        "access_tags-2": access_tags$$2,
+        "access_target_attributes": access_target_attributes,
+        "access_target_criteria_base": access_target_criteria_base,
+        "access_target_criteria_infra_app": access_target_criteria_infra_app,
+        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app,
+        "access_target_rule": access_target_rule,
+        "access_target_rule_attributes": access_target_rule_attributes,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
+        "access_vnc_props": access_vnc_props,
+        "access_warp_props": access_warp_props,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/apps`,
       query: [
-        ["name", args["name"], true],
-        ["domain", args["domain"], true],
-        ["aud", args["aud"], true],
-        ["target_attributes", args["target_attributes"], true],
-        ["exact", args["exact"], true],
-        ["search", args["search"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["domain", param(args, "query", "domain"), true],
+        ["aud", param(args, "query", "aud"), true],
+        ["target_attributes", param(args, "query", "target_attributes"), true],
+        ["exact", param(args, "query", "exact"), true],
+        ["search", param(args, "query", "search"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_applications_revoke_tokens",
+    name: "zeroTrust_access_applications_revokeTokens",
     title: "Revoke application tokens",
-    description: "Revokes all tokens issued for an application.\n\nConfirm with the user before calling this tool. This operation invalidates every service token for the app.",
+    description: "Revokes all tokens issued for an application.\n\nConfirm with the user before calling this tool. This operation invalidates every service token for the app.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/revoke_tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "oneOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_app_id"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "access_app_id": access_app_id,
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_empty_response-2",
       $defs: {
-        "access_empty_response-2": access_empty_response_2_output,
+        "access_empty_response-2": access_empty_response$$2,
       },
     },
     annotations: {
@@ -1908,9 +1457,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_empty_response-2": access_empty_response_2_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_empty_response-2": access_empty_response$$2,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -1918,46 +1467,179 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_applications_update",
+    name: "zeroTrust_access_applications_update",
     title: "Update an Access application",
-    description: "Updates an Access application.",
+    description: "Updates an Access application.\n\nPUT /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_app_id"
-        },
         "body": {
           "$ref": "#/$defs/access_app_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "oneOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "access_access_group_rule": access_access_group_rule$,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats$,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats$,
+        "access_allowed_headers": access_allowed_headers$,
+        "access_allowed_idps": access_allowed_idps$,
+        "access_allowed_methods": access_allowed_methods$,
+        "access_allowed_origins": access_allowed_origins$,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule$,
+        "access_app_launcher_props": access_app_launcher_props$,
+        "access_app_policy_link": access_app_policy_link,
+        "access_app_policy_request": access_app_policy_request,
+        "access_app_req_embedded_policies": access_app_req_embedded_policies,
+        "access_app_req_embedded_scim_config": access_app_req_embedded_scim_config,
+        "access_app_request": access_app_request,
+        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra$,
+        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted$,
+        "access_approval_group": access_approval_group$,
+        "access_approval_groups": access_approval_groups$,
+        "access_auth_context_rule": access_auth_context_rule$,
+        "access_authentication_method_rule": access_authentication_method_rule$,
+        "access_azure_group_rule": access_azure_group_rule$,
+        "access_base_policy_req": access_base_policy_req,
+        "access_biso_props": access_biso_props$,
+        "access_bookmark_props": access_bookmark_props$,
+        "access_certificate_rule": access_certificate_rule$,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule$,
+        "access_common_name_rule": access_common_name_rule$,
+        "access_connection_rules": access_connection_rules$,
+        "access_connection_rules_infra": access_connection_rules_infra$,
+        "access_connection_rules_rdp": access_connection_rules_rdp$,
+        "access_connection_rules_ssh": access_connection_rules_ssh$,
+        "access_cors_headers": access_cors_headers$,
+        "access_country_rule": access_country_rule$,
+        "access_custom_pages-2": access_custom_pages$$2$,
+        "access_destination_overrides": access_destination_overrides$,
+        "access_destinations": access_destinations$,
+        "access_device_posture_rule": access_device_posture_rule$,
+        "access_domain_rule": access_domain_rule$,
+        "access_email_list_rule": access_email_list_rule$,
+        "access_email_rule": access_email_rule$,
+        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination$,
+        "access_end_user_all_workers_destination": access_end_user_all_workers_destination$,
+        "access_end_user_destinations": access_end_user_destinations$,
+        "access_end_user_oauth_configuration": access_end_user_oauth_configuration$,
+        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination$,
+        "access_end_user_props": access_end_user_props$,
+        "access_end_user_public_destination": access_end_user_public_destination$,
+        "access_end_user_worker_destination": access_end_user_worker_destination$,
+        "access_everyone_rule": access_everyone_rule$,
+        "access_exclude-2": access_exclude$$2$,
+        "access_external_evaluation_rule": access_external_evaluation_rule$,
+        "access_feature_app_props": access_feature_app_props$,
+        "access_footer_links": access_footer_links$,
+        "access_github_organization_rule": access_github_organization_rule$,
+        "access_gsuite_group_rule": access_gsuite_group_rule$,
+        "access_include-2": access_include$$2$,
+        "access_infra_app_req_embedded_policies": access_infra_app_req_embedded_policies,
+        "access_infra_mfa_config": access_infra_mfa_config$,
+        "access_infra_policy_req": access_infra_policy_req,
+        "access_infra_props": access_infra_props$,
+        "access_ip_list_rule": access_ip_list_rule$,
+        "access_ip_rule": access_ip_rule$,
+        "access_landing_page_design": access_landing_page_design$,
+        "access_linked_app_token_rule": access_linked_app_token_rule$,
+        "access_login_method_rule": access_login_method_rule$,
+        "access_mcp_portal_props": access_mcp_portal_props$,
+        "access_mcp_props": access_mcp_props$,
+        "access_mfa_config": access_mfa_config$,
+        "access_oauth_configuration": access_oauth_configuration$,
+        "access_oidc_claim_rule": access_oidc_claim_rule$,
+        "access_oidc_saas_app": access_oidc_saas_app$,
+        "access_okta_group_rule": access_okta_group_rule$,
+        "access_policy_req": access_policy_req,
+        "access_proxy_endpoint_props": access_proxy_endpoint_props$,
+        "access_rdp_props": access_rdp_props$,
+        "access_require-2": access_require$$2$,
+        "access_rule": access_rule$,
+        "access_saas_props": access_saas_props$,
+        "access_saml_group_rule": access_saml_group_rule$,
+        "access_saml_saas_app": access_saml_saas_app$,
+        "access_scim_config": access_scim_config$,
+        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token$,
+        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic$,
+        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2$,
+        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token$,
+        "access_scim_config_mapping": access_scim_config_mapping$,
+        "access_scim_config_multi_authentication": access_scim_config_multi_authentication$,
+        "access_scim_config_single_authentication": access_scim_config_single_authentication$,
+        "access_self_hosted_domains": access_self_hosted_domains$,
+        "access_self_hosted_props": access_self_hosted_props$,
+        "access_service_token_rule": access_service_token_rule$,
+        "access_service_token_tag_rule": access_service_token_tag_rule$,
+        "access_ssh_props": access_ssh_props$,
+        "access_tags-2": access_tags$$2$,
+        "access_target_attributes": access_target_attributes$,
+        "access_target_criteria_base": access_target_criteria_base$,
+        "access_target_criteria_infra_app": access_target_criteria_infra_app$,
+        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app$,
+        "access_target_rule": access_target_rule$,
+        "access_target_rule_attributes": access_target_rule_attributes$,
+        "access_user_risk_score_rule": access_user_risk_score_rule$,
+        "access_usernames": access_usernames$,
+        "access_vnc_props": access_vnc_props$,
+        "access_warp_props": access_warp_props$,
+      },
+    },
+    outputSchema: {
+      "allOf": [
+        {
+          "$ref": "#/$defs/access_single_response-9"
+        },
+        {
+          "properties": {
+            "result": {
+              "$ref": "#/$defs/access_app_response"
+            }
+          },
+          "type": "object"
+        }
+      ],
       $defs: {
         "access_access_group_rule": access_access_group_rule,
-        "access_allow_all_headers": access_allow_all_headers,
-        "access_allow_all_methods": access_allow_all_methods,
-        "access_allow_all_origins": access_allow_all_origins,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2,
-        "access_allow_credentials": access_allow_credentials,
-        "access_allow_email_alias": access_allow_email_alias,
-        "access_allow_iframe": access_allow_iframe,
         "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
         "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
         "access_allowed_headers": access_allowed_headers,
@@ -1965,30 +1647,22 @@ export const tools: readonly Tool[] = [
         "access_allowed_methods": access_allowed_methods,
         "access_allowed_origins": access_allowed_origins,
         "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
-        "access_app_id": access_app_id,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url,
+        "access_api-response-single": access_api$$response$$single,
         "access_app_launcher_props": access_app_launcher_props,
-        "access_app_launcher_visible": access_app_launcher_visible,
-        "access_app_policy_link": access_app_policy_link,
-        "access_app_policy_request": access_app_policy_request,
-        "access_app_req_embedded_policies": access_app_req_embedded_policies,
-        "access_app_req_embedded_scim_config": access_app_req_embedded_scim_config,
-        "access_app_request": access_app_request,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_resp_embedded_policies": access_app_resp_embedded_policies,
         "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra,
         "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted,
+        "access_app_response": access_app_response,
         "access_approval_group": access_approval_group,
         "access_approval_groups": access_approval_groups,
-        "access_approval_required": access_approval_required,
         "access_auth_context_rule": access_auth_context_rule,
         "access_authentication_method_rule": access_authentication_method_rule,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2,
         "access_azure_group_rule": access_azure_group_rule,
-        "access_base_policy_req": access_base_policy_req,
-        "access_bg_color": access_bg_color,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_basic_app_response_props": access_basic_app_response_props,
         "access_biso_props": access_biso_props,
         "access_bookmark_props": access_bookmark_props,
-        "access_button_color": access_button_color,
-        "access_button_text_color": access_button_text_color,
         "access_certificate_rule": access_certificate_rule,
         "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
         "access_common_name_rule": access_common_name_rule,
@@ -1998,21 +1672,13 @@ export const tools: readonly Tool[] = [
         "access_connection_rules_ssh": access_connection_rules_ssh,
         "access_cors_headers": access_cors_headers,
         "access_country_rule": access_country_rule,
-        "access_created_at": access_created_at,
-        "access_custom_deny_message": access_custom_deny_message,
-        "access_custom_deny_url": access_custom_deny_url,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url,
-        "access_custom_pages-2": access_custom_pages_2,
-        "access_decision": access_decision,
+        "access_custom_pages-2": access_custom_pages$$2,
         "access_destination_overrides": access_destination_overrides,
         "access_destinations": access_destinations,
         "access_device_posture_rule": access_device_posture_rule,
-        "access_domain": access_domain,
         "access_domain_rule": access_domain_rule,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting,
         "access_email_list_rule": access_email_list_rule,
         "access_email_rule": access_email_rule,
-        "access_enable_binding_cookie": access_enable_binding_cookie,
         "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination,
         "access_end_user_all_workers_destination": access_end_user_all_workers_destination,
         "access_end_user_destinations": access_end_user_destinations,
@@ -2022,57 +1688,36 @@ export const tools: readonly Tool[] = [
         "access_end_user_public_destination": access_end_user_public_destination,
         "access_end_user_worker_destination": access_end_user_worker_destination,
         "access_everyone_rule": access_everyone_rule,
-        "access_exclude-2": access_exclude_2,
+        "access_exclude-2": access_exclude$$2,
         "access_external_evaluation_rule": access_external_evaluation_rule,
         "access_feature_app_props": access_feature_app_props,
         "access_footer_links": access_footer_links,
         "access_github_organization_rule": access_github_organization_rule,
         "access_gsuite_group_rule": access_gsuite_group_rule,
-        "access_header_bg_color": access_header_bg_color,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute,
-        "access_identifier": access_identifier,
-        "access_image_url": access_image_url,
-        "access_include-2": access_include_2,
-        "access_infra_app_req_embedded_policies": access_infra_app_req_embedded_policies,
+        "access_include-2": access_include$$2,
+        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies,
         "access_infra_mfa_config": access_infra_mfa_config,
-        "access_infra_policy_req": access_infra_policy_req,
+        "access_infra_policy_resp": access_infra_policy_resp,
         "access_infra_props": access_infra_props,
         "access_ip_list_rule": access_ip_list_rule,
         "access_ip_rule": access_ip_rule,
-        "access_isolation_required": access_isolation_required,
         "access_landing_page_design": access_landing_page_design,
         "access_linked_app_token_rule": access_linked_app_token_rule,
         "access_login_method_rule": access_login_method_rule,
-        "access_logo_url": access_logo_url,
-        "access_max_age": access_max_age,
         "access_mcp_portal_props": access_mcp_portal_props,
         "access_mcp_props": access_mcp_props,
-        "access_message": access_message,
+        "access_messages": access_messages,
         "access_mfa_config": access_mfa_config,
-        "access_name-8": access_name_8,
-        "access_name-9": access_name_9,
         "access_oauth_configuration": access_oauth_configuration,
         "access_oidc_claim_rule": access_oidc_claim_rule,
         "access_oidc_saas_app": access_oidc_saas_app,
         "access_okta_group_rule": access_okta_group_rule,
-        "access_options_preflight_bypass": access_options_preflight_bypass,
-        "access_path_cookie_attribute": access_path_cookie_attribute,
-        "access_policy_req": access_policy_req,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id,
-        "access_port": access_port,
-        "access_precedence": access_precedence,
-        "access_protocol_infra_app": access_protocol_infra_app,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app,
+        "access_policy_resp": access_policy_resp,
         "access_proxy_endpoint_props": access_proxy_endpoint_props,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt,
-        "access_purpose_justification_required": access_purpose_justification_required,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format,
         "access_rdp_props": access_rdp_props,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header,
-        "access_require-2": access_require_2,
+        "access_require-2": access_require$$2,
         "access_rule": access_rule,
         "access_saas_props": access_saas_props,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute,
         "access_saml_group_rule": access_saml_group_rule,
         "access_saml_saas_app": access_saml_saas_app,
         "access_scim_config": access_scim_config,
@@ -2085,214 +1730,23 @@ export const tools: readonly Tool[] = [
         "access_scim_config_single_authentication": access_scim_config_single_authentication,
         "access_self_hosted_domains": access_self_hosted_domains,
         "access_self_hosted_props": access_self_hosted_props,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect,
         "access_service_token_rule": access_service_token_rule,
         "access_service_token_tag_rule": access_service_token_tag_rule,
-        "access_session_duration-2": access_session_duration_2,
-        "access_session_duration-3": access_session_duration_3,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page,
-        "access_skip_interstitial": access_skip_interstitial,
+        "access_single_response-9": access_single_response$$9,
         "access_ssh_props": access_ssh_props,
-        "access_tags-2": access_tags_2,
+        "access_tags-2": access_tags$$2,
         "access_target_attributes": access_target_attributes,
         "access_target_criteria_base": access_target_criteria_base,
         "access_target_criteria_infra_app": access_target_criteria_infra_app,
         "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app,
         "access_target_rule": access_target_rule,
         "access_target_rule_attributes": access_target_rule_attributes,
-        "access_timestamp": access_timestamp,
-        "access_title": access_title,
-        "access_type": access_type,
-        "access_updated_at": access_updated_at,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url,
         "access_user_risk_score_rule": access_user_risk_score_rule,
         "access_usernames": access_usernames,
-        "access_uuid": access_uuid,
-        "access_uuid-2": access_uuid_2,
         "access_vnc_props": access_vnc_props,
         "access_warp_props": access_warp_props,
       },
     },
-    outputSchema: {
-      "allOf": [
-        {
-          "$ref": "#/$defs/access_single_response-9"
-        },
-        {
-          "properties": {
-            "result": {
-              "$ref": "#/$defs/access_app_response"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_all_headers": access_allow_all_headers_output,
-        "access_allow_all_methods": access_allow_all_methods_output,
-        "access_allow_all_origins": access_allow_all_origins_output,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2_output,
-        "access_allow_credentials": access_allow_credentials_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_allowed_headers": access_allowed_headers_output,
-        "access_allowed_idps": access_allowed_idps_output,
-        "access_allowed_methods": access_allowed_methods_output,
-        "access_allowed_origins": access_allowed_origins_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url_output,
-        "access_app_launcher_props": access_app_launcher_props_output,
-        "access_app_launcher_visible": access_app_launcher_visible_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_resp_embedded_policies": access_app_resp_embedded_policies_output,
-        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra_output,
-        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted_output,
-        "access_app_response": access_app_response_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_aud-2": access_aud_2_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_basic_app_response_props": access_basic_app_response_props_output,
-        "access_bg_color": access_bg_color_output,
-        "access_biso_props": access_biso_props_output,
-        "access_bookmark_props": access_bookmark_props_output,
-        "access_button_color": access_button_color_output,
-        "access_button_text_color": access_button_text_color_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_cors_headers": access_cors_headers_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_deny_message": access_custom_deny_message_output,
-        "access_custom_deny_url": access_custom_deny_url_output,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url_output,
-        "access_custom_pages-2": access_custom_pages_2_output,
-        "access_decision": access_decision_output,
-        "access_destination_overrides": access_destination_overrides_output,
-        "access_destinations": access_destinations_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain": access_domain_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_enable_binding_cookie": access_enable_binding_cookie_output,
-        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination_output,
-        "access_end_user_all_workers_destination": access_end_user_all_workers_destination_output,
-        "access_end_user_destinations": access_end_user_destinations_output,
-        "access_end_user_oauth_configuration": access_end_user_oauth_configuration_output,
-        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination_output,
-        "access_end_user_props": access_end_user_props_output,
-        "access_end_user_public_destination": access_end_user_public_destination_output,
-        "access_end_user_worker_destination": access_end_user_worker_destination_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_feature_app_props": access_feature_app_props_output,
-        "access_footer_links": access_footer_links_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_header_bg_color": access_header_bg_color_output,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute_output,
-        "access_identifier": access_identifier_output,
-        "access_image_url": access_image_url_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_infra_props": access_infra_props_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_landing_page_design": access_landing_page_design_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_logo_url": access_logo_url_output,
-        "access_max_age": access_max_age_output,
-        "access_mcp_portal_props": access_mcp_portal_props_output,
-        "access_mcp_props": access_mcp_props_output,
-        "access_message": access_message_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-8": access_name_8_output,
-        "access_name-9": access_name_9_output,
-        "access_oauth_configuration": access_oauth_configuration_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_oidc_saas_app": access_oidc_saas_app_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_options_preflight_bypass": access_options_preflight_bypass_output,
-        "access_path_cookie_attribute": access_path_cookie_attribute_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_port": access_port_output,
-        "access_precedence": access_precedence_output,
-        "access_protocol_infra_app": access_protocol_infra_app_output,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app_output,
-        "access_proxy_endpoint_props": access_proxy_endpoint_props_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_rdp_props": access_rdp_props_output,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header_output,
-        "access_require-2": access_require_2_output,
-        "access_rule": access_rule_output,
-        "access_saas_props": access_saas_props_output,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_saml_saas_app": access_saml_saas_app_output,
-        "access_scim_config": access_scim_config_output,
-        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token_output,
-        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic_output,
-        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2_output,
-        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token_output,
-        "access_scim_config_mapping": access_scim_config_mapping_output,
-        "access_scim_config_multi_authentication": access_scim_config_multi_authentication_output,
-        "access_scim_config_single_authentication": access_scim_config_single_authentication_output,
-        "access_self_hosted_domains": access_self_hosted_domains_output,
-        "access_self_hosted_props": access_self_hosted_props_output,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-2": access_session_duration_2_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-9": access_single_response_9_output,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
-        "access_ssh_props": access_ssh_props_output,
-        "access_tags-2": access_tags_2_output,
-        "access_target_attributes": access_target_attributes_output,
-        "access_target_criteria_base": access_target_criteria_base_output,
-        "access_target_criteria_infra_app": access_target_criteria_infra_app_output,
-        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app_output,
-        "access_target_rule": access_target_rule_output,
-        "access_target_rule_attributes": access_target_rule_attributes_output,
-        "access_timestamp": access_timestamp_output,
-        "access_title": access_title_output,
-        "access_type": access_type_output,
-        "access_updated_at": access_updated_at_output,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid": access_uuid_output,
-        "access_uuid-2": access_uuid_2_output,
-        "access_vnc_props": access_vnc_props_output,
-        "access_warp_props": access_warp_props_output,
-      },
-    },
     annotations: {
       "destructiveHint": true,
       "idempotentHint": true,
@@ -2330,170 +1784,113 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allow_all_headers": access_allow_all_headers_output,
-        "access_allow_all_methods": access_allow_all_methods_output,
-        "access_allow_all_origins": access_allow_all_origins_output,
-        "access_allow_authenticate_via_warp-2": access_allow_authenticate_via_warp_2_output,
-        "access_allow_credentials": access_allow_credentials_output,
-        "access_allow_email_alias": access_allow_email_alias_output,
-        "access_allow_iframe": access_allow_iframe_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_allowed_headers": access_allowed_headers_output,
-        "access_allowed_idps": access_allowed_idps_output,
-        "access_allowed_methods": access_allowed_methods_output,
-        "access_allowed_origins": access_allowed_origins_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_launcher_logo_url": access_app_launcher_logo_url_output,
-        "access_app_launcher_props": access_app_launcher_props_output,
-        "access_app_launcher_visible": access_app_launcher_visible_output,
-        "access_app_policy_response": access_app_policy_response_output,
-        "access_app_resp_embedded_policies": access_app_resp_embedded_policies_output,
-        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra_output,
-        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted_output,
-        "access_app_response": access_app_response_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_aud-2": access_aud_2_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_auto_redirect_to_identity-2": access_auto_redirect_to_identity_2_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_basic_app_response_props": access_basic_app_response_props_output,
-        "access_bg_color": access_bg_color_output,
-        "access_biso_props": access_biso_props_output,
-        "access_bookmark_props": access_bookmark_props_output,
-        "access_button_color": access_button_color_output,
-        "access_button_text_color": access_button_text_color_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_infra": access_connection_rules_infra_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_connection_rules_ssh": access_connection_rules_ssh_output,
-        "access_cors_headers": access_cors_headers_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_deny_message": access_custom_deny_message_output,
-        "access_custom_deny_url": access_custom_deny_url_output,
-        "access_custom_non_identity_deny_url": access_custom_non_identity_deny_url_output,
-        "access_custom_pages-2": access_custom_pages_2_output,
-        "access_decision": access_decision_output,
-        "access_destination_overrides": access_destination_overrides_output,
-        "access_destinations": access_destinations_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain": access_domain_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_eager_redirect_cookie_setting": access_eager_redirect_cookie_setting_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_enable_binding_cookie": access_enable_binding_cookie_output,
-        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination_output,
-        "access_end_user_all_workers_destination": access_end_user_all_workers_destination_output,
-        "access_end_user_destinations": access_end_user_destinations_output,
-        "access_end_user_oauth_configuration": access_end_user_oauth_configuration_output,
-        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination_output,
-        "access_end_user_props": access_end_user_props_output,
-        "access_end_user_public_destination": access_end_user_public_destination_output,
-        "access_end_user_worker_destination": access_end_user_worker_destination_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_feature_app_props": access_feature_app_props_output,
-        "access_footer_links": access_footer_links_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_header_bg_color": access_header_bg_color_output,
-        "access_http_only_cookie_attribute": access_http_only_cookie_attribute_output,
-        "access_identifier": access_identifier_output,
-        "access_image_url": access_image_url_output,
-        "access_include-2": access_include_2_output,
-        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies_output,
-        "access_infra_mfa_config": access_infra_mfa_config_output,
-        "access_infra_policy_resp": access_infra_policy_resp_output,
-        "access_infra_props": access_infra_props_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_landing_page_design": access_landing_page_design_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_logo_url": access_logo_url_output,
-        "access_max_age": access_max_age_output,
-        "access_mcp_portal_props": access_mcp_portal_props_output,
-        "access_mcp_props": access_mcp_props_output,
-        "access_message": access_message_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-8": access_name_8_output,
-        "access_name-9": access_name_9_output,
-        "access_oauth_configuration": access_oauth_configuration_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_oidc_saas_app": access_oidc_saas_app_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_options_preflight_bypass": access_options_preflight_bypass_output,
-        "access_path_cookie_attribute": access_path_cookie_attribute_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_port": access_port_output,
-        "access_precedence": access_precedence_output,
-        "access_protocol_infra_app": access_protocol_infra_app_output,
-        "access_protocol_self_hosted_app": access_protocol_self_hosted_app_output,
-        "access_proxy_endpoint_props": access_proxy_endpoint_props_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_rdp_props": access_rdp_props_output,
-        "access_read_service_tokens_from_header": access_read_service_tokens_from_header_output,
-        "access_require-2": access_require_2_output,
-        "access_rule": access_rule_output,
-        "access_saas_props": access_saas_props_output,
-        "access_same_site_cookie_attribute": access_same_site_cookie_attribute_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_saml_saas_app": access_saml_saas_app_output,
-        "access_scim_config": access_scim_config_output,
-        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token_output,
-        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic_output,
-        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2_output,
-        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token_output,
-        "access_scim_config_mapping": access_scim_config_mapping_output,
-        "access_scim_config_multi_authentication": access_scim_config_multi_authentication_output,
-        "access_scim_config_single_authentication": access_scim_config_single_authentication_output,
-        "access_self_hosted_domains": access_self_hosted_domains_output,
-        "access_self_hosted_props": access_self_hosted_props_output,
-        "access_service_auth_401_redirect": access_service_auth_401_redirect_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-2": access_session_duration_2_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-9": access_single_response_9_output,
-        "access_skip_app_launcher_login_page": access_skip_app_launcher_login_page_output,
-        "access_skip_interstitial": access_skip_interstitial_output,
-        "access_ssh_props": access_ssh_props_output,
-        "access_tags-2": access_tags_2_output,
-        "access_target_attributes": access_target_attributes_output,
-        "access_target_criteria_base": access_target_criteria_base_output,
-        "access_target_criteria_infra_app": access_target_criteria_infra_app_output,
-        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app_output,
-        "access_target_rule": access_target_rule_output,
-        "access_target_rule_attributes": access_target_rule_attributes_output,
-        "access_timestamp": access_timestamp_output,
-        "access_title": access_title_output,
-        "access_type": access_type_output,
-        "access_updated_at": access_updated_at_output,
-        "access_use_clientless_isolation_app_launcher_url": access_use_clientless_isolation_app_launcher_url_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_usernames": access_usernames_output,
-        "access_uuid": access_uuid_output,
-        "access_uuid-2": access_uuid_2_output,
-        "access_vnc_props": access_vnc_props_output,
-        "access_warp_props": access_warp_props_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_allowed_headers": access_allowed_headers,
+        "access_allowed_idps": access_allowed_idps,
+        "access_allowed_methods": access_allowed_methods,
+        "access_allowed_origins": access_allowed_origins,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_app_launcher_props": access_app_launcher_props,
+        "access_app_policy_response": access_app_policy_response,
+        "access_app_resp_embedded_policies": access_app_resp_embedded_policies,
+        "access_app_resp_embedded_target_criteria_infra": access_app_resp_embedded_target_criteria_infra,
+        "access_app_resp_embedded_target_criteria_self_hosted": access_app_resp_embedded_target_criteria_self_hosted,
+        "access_app_response": access_app_response,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_basic_app_response_props": access_basic_app_response_props,
+        "access_biso_props": access_biso_props,
+        "access_bookmark_props": access_bookmark_props,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_infra": access_connection_rules_infra,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_connection_rules_ssh": access_connection_rules_ssh,
+        "access_cors_headers": access_cors_headers,
+        "access_country_rule": access_country_rule,
+        "access_custom_pages-2": access_custom_pages$$2,
+        "access_destination_overrides": access_destination_overrides,
+        "access_destinations": access_destinations,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_end_user_all_preview_workers_destination": access_end_user_all_preview_workers_destination,
+        "access_end_user_all_workers_destination": access_end_user_all_workers_destination,
+        "access_end_user_destinations": access_end_user_destinations,
+        "access_end_user_oauth_configuration": access_end_user_oauth_configuration,
+        "access_end_user_preview_worker_destination": access_end_user_preview_worker_destination,
+        "access_end_user_props": access_end_user_props,
+        "access_end_user_public_destination": access_end_user_public_destination,
+        "access_end_user_worker_destination": access_end_user_worker_destination,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_feature_app_props": access_feature_app_props,
+        "access_footer_links": access_footer_links,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_infra_app_resp_embedded_policies": access_infra_app_resp_embedded_policies,
+        "access_infra_mfa_config": access_infra_mfa_config,
+        "access_infra_policy_resp": access_infra_policy_resp,
+        "access_infra_props": access_infra_props,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_landing_page_design": access_landing_page_design,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_mcp_portal_props": access_mcp_portal_props,
+        "access_mcp_props": access_mcp_props,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oauth_configuration": access_oauth_configuration,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_oidc_saas_app": access_oidc_saas_app,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_proxy_endpoint_props": access_proxy_endpoint_props,
+        "access_rdp_props": access_rdp_props,
+        "access_require-2": access_require$$2,
+        "access_rule": access_rule,
+        "access_saas_props": access_saas_props,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_saml_saas_app": access_saml_saas_app,
+        "access_scim_config": access_scim_config,
+        "access_scim_config_authentication_access_service_token": access_scim_config_authentication_access_service_token,
+        "access_scim_config_authentication_http_basic": access_scim_config_authentication_http_basic,
+        "access_scim_config_authentication_oauth2": access_scim_config_authentication_oauth2,
+        "access_scim_config_authentication_oauth_bearer_token": access_scim_config_authentication_oauth_bearer_token,
+        "access_scim_config_mapping": access_scim_config_mapping,
+        "access_scim_config_multi_authentication": access_scim_config_multi_authentication,
+        "access_scim_config_single_authentication": access_scim_config_single_authentication,
+        "access_self_hosted_domains": access_self_hosted_domains,
+        "access_self_hosted_props": access_self_hosted_props,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-9": access_single_response$$9,
+        "access_ssh_props": access_ssh_props,
+        "access_tags-2": access_tags$$2,
+        "access_target_attributes": access_target_attributes,
+        "access_target_criteria_base": access_target_criteria_base,
+        "access_target_criteria_infra_app": access_target_criteria_infra_app,
+        "access_target_criteria_self_hosted_app": access_target_criteria_self_hosted_app,
+        "access_target_rule": access_target_rule,
+        "access_target_rule_attributes": access_target_rule_attributes,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
+        "access_usernames": access_usernames,
+        "access_vnc_props": access_vnc_props,
+        "access_warp_props": access_warp_props,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/userPolicyChecks/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/applications/userPolicyChecks/outputs.ts
index 98c54cc72..17fa8e62a 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/userPolicyChecks/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/userPolicyChecks/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_policy_check_response` in responses.
  */
-export const access_policy_check_response_output: JsonSchema = {
+export const access_policy_check_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -18,7 +18,7 @@ export const access_policy_check_response_output: JsonSchema = {
             "app_state": {
               "properties": {
                 "app_uid": {
-                  "$ref": "#/$defs/access_uuid"
+                  "type": "string"
                 },
                 "aud": {
                   "type": "string"
@@ -76,7 +76,7 @@ export const access_policy_check_response_output: JsonSchema = {
                   "type": "string"
                 },
                 "user_uuid": {
-                  "$ref": "#/$defs/access_uuid"
+                  "type": "string"
                 },
                 "version": {
                   "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/access/applications/userPolicyChecks/tools.ts b/src/generated/forge-mcp/zeroTrust/access/applications/userPolicyChecks/tools.ts
index 24852e154..67d37d369 100644
--- a/src/generated/forge-mcp/zeroTrust/access/applications/userPolicyChecks/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/applications/userPolicyChecks/tools.ts
@@ -3,60 +3,70 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
-  access_uuid_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
-import { access_app_id } from "../schemas.js";
-import { access_policy_check_response_output } from "./outputs.js";
+import { access_policy_check_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.applications.user_policy_checks`.
+ * The tools of `zeroTrust.access.applications.userPolicyChecks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_applications_user_policy_checks_list",
+    name: "zeroTrust_access_applications_userPolicyChecks_list",
     title: "Test Access policies",
-    description: "Tests if a specific user has permission to access an application.",
+    description: "Tests if a specific user has permission to access an application.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/user_policy_checks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "app_id": {
+              "oneOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "description": "UUID.",
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "app_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "app_id": {
-          "$ref": "#/$defs/access_app_id"
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "app_id"
+        "path"
       ],
-      $defs: {
-        "access_app_id": access_app_id,
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_policy_check_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_policy_check_response": access_policy_check_response_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_policy_check_response": access_policy_check_response,
       },
     },
     annotations: {
@@ -84,11 +94,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_policy_check_response": access_policy_check_response_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_policy_check_response": access_policy_check_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/customPages/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/customPages/outputs.ts
index faf6ee795..0c8058fc2 100644
--- a/src/generated/forge-mcp/zeroTrust/access/customPages/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/customPages/outputs.ts
@@ -3,48 +3,56 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_app_count-2` in responses.
- */
-export const access_app_count_2_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `access_contract_version` in responses.
- */
-export const access_contract_version_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `access_custom_page` in responses.
  */
-export const access_custom_page_output: JsonSchema = {
+export const access_custom_page: JsonSchema = {
   "properties": {
     "app_count": {
-      "$ref": "#/$defs/access_app_count-2"
+      "type": "integer"
     },
     "contract_version": {
-      "$ref": "#/$defs/access_contract_version"
+      "type": "integer"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "custom_html": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-11"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/access_type-2"
+      "enum": [
+        "identity_denied",
+        "forbidden",
+        "login",
+        "interstitial"
+      ],
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/access_uuid"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "required": [
@@ -58,28 +66,50 @@ export const access_custom_page_output: JsonSchema = {
 /**
  * The schema of `access_custom_page_without_html` in responses.
  */
-export const access_custom_page_without_html_output: JsonSchema = {
+export const access_custom_page_without_html: JsonSchema = {
   "properties": {
     "app_count": {
-      "$ref": "#/$defs/access_app_count-2"
+      "type": "integer"
     },
     "contract_version": {
-      "$ref": "#/$defs/access_contract_version"
+      "type": "integer"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "name": {
-      "$ref": "#/$defs/access_name-11"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/access_type-2"
+      "enum": [
+        "identity_denied",
+        "forbidden",
+        "login",
+        "interstitial"
+      ],
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/access_uuid"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "warnings": {
       "items": {
@@ -95,17 +125,10 @@ export const access_custom_page_without_html_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_name-11` in responses.
- */
-export const access_name_11_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_response_collection-11` in responses.
  */
-export const access_response_collection_11_output: JsonSchema = {
+export const access_response_collection$$11: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -127,7 +150,7 @@ export const access_response_collection_11_output: JsonSchema = {
 /**
  * The schema of `access_single_response-12` in responses.
  */
-export const access_single_response_12_output: JsonSchema = {
+export const access_single_response$$12: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -146,7 +169,7 @@ export const access_single_response_12_output: JsonSchema = {
 /**
  * The schema of `access_single_response_without_html` in responses.
  */
-export const access_single_response_without_html_output: JsonSchema = {
+export const access_single_response_without_html: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -165,7 +188,7 @@ export const access_single_response_without_html_output: JsonSchema = {
 /**
  * The schema of `access_template_violation` in responses.
  */
-export const access_template_violation_output: JsonSchema = {
+export const access_template_violation: JsonSchema = {
   "properties": {
     "message": {
       "type": "string"
@@ -184,23 +207,10 @@ export const access_template_violation_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_type-2` in responses.
- */
-export const access_type_2_output: JsonSchema = {
-  "enum": [
-    "identity_denied",
-    "forbidden",
-    "login",
-    "interstitial"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_validate_response` in responses.
  */
-export const access_validate_response_output: JsonSchema = {
+export const access_validate_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -219,7 +229,7 @@ export const access_validate_response_output: JsonSchema = {
 /**
  * The schema of `access_validation_result` in responses.
  */
-export const access_validation_result_output: JsonSchema = {
+export const access_validation_result: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -228,7 +238,13 @@ export const access_validation_result_output: JsonSchema = {
       "type": "array"
     },
     "page_type": {
-      "$ref": "#/$defs/access_type-2"
+      "enum": [
+        "identity_denied",
+        "forbidden",
+        "login",
+        "interstitial"
+      ],
+      "type": "string"
     },
     "version": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/access/customPages/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/customPages/schemas.ts
index 4e52a78e9..8b0a2bd75 100644
--- a/src/generated/forge-mcp/zeroTrust/access/customPages/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/customPages/schemas.ts
@@ -3,56 +3,62 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_app_count-2`.
- */
-export const access_app_count_2: JsonSchema = {
-  "description": "Number of apps the custom page is assigned to.",
-  "type": "integer"
-};
-
-/**
- * The schema of `access_contract_version`.
- */
-export const access_contract_version: JsonSchema = {
-  "description": "Contract version of the page's Liquid template. Present (>= 1) marks a sanitized template; absent or 0 marks a legacy page served verbatim.",
-  "type": "integer"
-};
-
 /**
  * The schema of `access_custom_page`.
  */
 export const access_custom_page: JsonSchema = {
   "properties": {
     "app_count": {
-      "$ref": "#/$defs/access_app_count-2",
-      "description": "Number of apps the custom page is assigned to."
+      "description": "Number of apps the custom page is assigned to.",
+      "type": "integer"
     },
     "contract_version": {
-      "$ref": "#/$defs/access_contract_version",
-      "description": "Contract version of the page's Liquid template. Present (>= 1) marks a sanitized template; absent or 0 marks a legacy page served verbatim."
+      "description": "Contract version of the page's Liquid template. Present (>= 1) marks a sanitized template; absent or 0 marks a legacy page served verbatim.",
+      "type": "integer"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "custom_html": {
       "description": "Custom page HTML.",
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-11",
-      "description": "Custom page name."
+      "description": "Custom page name.",
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/access_type-2",
-      "description": "Custom page type."
+      "description": "Custom page type.",
+      "enum": [
+        "identity_denied",
+        "forbidden",
+        "login",
+        "interstitial"
+      ],
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/access_uuid",
-      "description": "UUID."
+      "description": "UUID.",
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "required": [
@@ -74,8 +80,14 @@ export const access_custom_page_validate: JsonSchema = {
       "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/access_type-2",
-      "description": "Custom page type."
+      "description": "Custom page type.",
+      "enum": [
+        "identity_denied",
+        "forbidden",
+        "login",
+        "interstitial"
+      ],
+      "type": "string"
     },
     "version": {
       "description": "Contract version to validate against; omit for the latest.",
@@ -88,25 +100,3 @@ export const access_custom_page_validate: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `access_name-11`.
- */
-export const access_name_11: JsonSchema = {
-  "description": "Custom page name.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_type-2`.
- */
-export const access_type_2: JsonSchema = {
-  "description": "Custom page type.",
-  "enum": [
-    "identity_denied",
-    "forbidden",
-    "login",
-    "interstitial"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/customPages/tools.ts b/src/generated/forge-mcp/zeroTrust/access/customPages/tools.ts
index aea5bfcf9..af007e87e 100644
--- a/src/generated/forge-mcp/zeroTrust/access/customPages/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/customPages/tools.ts
@@ -1,100 +1,74 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_created_at_output,
-  access_messages_output,
-  access_timestamp_output,
-  access_updated_at_output,
-  access_uuid_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
+import { access_id_response$$3 } from "../outputs.js";
 import {
-  access_created_at,
-  access_identifier,
-  access_timestamp,
-  access_updated_at,
-  access_uuid,
-} from "../../schemas.js";
-import { access_id_response_3_output } from "../outputs.js";
-import {
-  access_app_count_2_output,
-  access_contract_version_output,
-  access_custom_page_output,
-  access_custom_page_without_html_output,
-  access_name_11_output,
-  access_response_collection_11_output,
-  access_single_response_12_output,
-  access_single_response_without_html_output,
-  access_template_violation_output,
-  access_type_2_output,
-  access_validate_response_output,
-  access_validation_result_output,
+  access_custom_page,
+  access_custom_page_without_html,
+  access_response_collection$$11,
+  access_single_response$$12,
+  access_single_response_without_html,
+  access_template_violation,
+  access_validate_response,
+  access_validation_result,
 } from "./outputs.js";
 import {
-  access_app_count_2,
-  access_contract_version,
-  access_custom_page,
+  access_custom_page as access_custom_page$,
   access_custom_page_validate,
-  access_name_11,
-  access_type_2,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.custom_pages`.
+ * The tools of `zeroTrust.access.customPages`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_custom_pages_create",
+    name: "zeroTrust_access_customPages_create",
     title: "Create a custom page",
-    description: "Create a custom page",
+    description: "Create a custom page\n\nPOST /accounts/{account_id}/access/custom_pages",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_custom_page"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_app_count-2": access_app_count_2,
-        "access_contract_version": access_contract_version,
-        "access_created_at": access_created_at,
-        "access_custom_page": access_custom_page,
-        "access_identifier": access_identifier,
-        "access_name-11": access_name_11,
-        "access_timestamp": access_timestamp,
-        "access_type-2": access_type_2,
-        "access_updated_at": access_updated_at,
-        "access_uuid": access_uuid,
+        "access_custom_page": access_custom_page$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response_without_html",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count-2": access_app_count_2_output,
-        "access_contract_version": access_contract_version_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_page_without_html": access_custom_page_without_html_output,
-        "access_messages": access_messages_output,
-        "access_name-11": access_name_11_output,
-        "access_single_response_without_html": access_single_response_without_html_output,
-        "access_template_violation": access_template_violation_output,
-        "access_timestamp": access_timestamp_output,
-        "access_type-2": access_type_2_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_page_without_html": access_custom_page_without_html,
+        "access_messages": access_messages,
+        "access_single_response_without_html": access_single_response_without_html,
+        "access_template_violation": access_template_violation,
       },
     },
     annotations: {
@@ -124,22 +98,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count-2": access_app_count_2_output,
-        "access_contract_version": access_contract_version_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_page_without_html": access_custom_page_without_html_output,
-        "access_messages": access_messages_output,
-        "access_name-11": access_name_11_output,
-        "access_single_response_without_html": access_single_response_without_html_output,
-        "access_template_violation": access_template_violation_output,
-        "access_timestamp": access_timestamp_output,
-        "access_type-2": access_type_2_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
-        "access_validate_response": access_validate_response_output,
-        "access_validation_result": access_validation_result_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_page_without_html": access_custom_page_without_html,
+        "access_messages": access_messages,
+        "access_single_response_without_html": access_single_response_without_html,
+        "access_template_violation": access_template_violation,
+        "access_validate_response": access_validate_response,
+        "access_validation_result": access_validation_result,
       },
     },
     request: (args) => ({
@@ -148,37 +114,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_custom_pages_delete",
+    name: "zeroTrust_access_customPages_delete",
     title: "Delete a custom page",
-    description: "Delete a custom page",
+    description: "Delete a custom page\n\nDELETE /accounts/{account_id}/access/custom_pages/{custom_page_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "custom_page_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "custom_page_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "custom_page_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "custom_page_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response-3",
       $defs: {
-        "access_api-response-common": access_api_response_common_output,
-        "access_id_response-3": access_id_response_3_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common": access_api$$response$$common,
+        "access_id_response-3": access_id_response$$3,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -205,11 +176,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_id_response-3": access_id_response_3_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_id_response-3": access_id_response$$3,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -217,45 +187,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_custom_pages_get",
+    name: "zeroTrust_access_customPages_get",
     title: "Get a custom page",
-    description: "Fetches a custom page and also returns its HTML.",
+    description: "Fetches a custom page and also returns its HTML.\n\nGET /accounts/{account_id}/access/custom_pages/{custom_page_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "custom_page_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "custom_page_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "custom_page_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "custom_page_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-12",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count-2": access_app_count_2_output,
-        "access_contract_version": access_contract_version_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_page": access_custom_page_output,
-        "access_messages": access_messages_output,
-        "access_name-11": access_name_11_output,
-        "access_single_response-12": access_single_response_12_output,
-        "access_timestamp": access_timestamp_output,
-        "access_type-2": access_type_2_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_page": access_custom_page,
+        "access_messages": access_messages,
+        "access_single_response-12": access_single_response$$12,
       },
     },
     annotations: {
@@ -283,19 +251,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count-2": access_app_count_2_output,
-        "access_contract_version": access_contract_version_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_page": access_custom_page_output,
-        "access_messages": access_messages_output,
-        "access_name-11": access_name_11_output,
-        "access_single_response-12": access_single_response_12_output,
-        "access_timestamp": access_timestamp_output,
-        "access_type-2": access_type_2_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_page": access_custom_page,
+        "access_messages": access_messages,
+        "access_single_response-12": access_single_response$$12,
       },
     },
     request: (args) => ({
@@ -303,51 +263,56 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_custom_pages_list",
+    name: "zeroTrust_access_customPages_list",
     title: "List custom pages",
-    description: "List custom pages",
+    description: "List custom pages\n\nGET /accounts/{account_id}/access/custom_pages",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 50,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-11",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_app_count-2": access_app_count_2_output,
-        "access_contract_version": access_contract_version_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_page_without_html": access_custom_page_without_html_output,
-        "access_messages": access_messages_output,
-        "access_name-11": access_name_11_output,
-        "access_response_collection-11": access_response_collection_11_output,
-        "access_template_violation": access_template_violation_output,
-        "access_timestamp": access_timestamp_output,
-        "access_type-2": access_type_2_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_custom_page_without_html": access_custom_page_without_html,
+        "access_messages": access_messages,
+        "access_response_collection-11": access_response_collection$$11,
+        "access_template_violation": access_template_violation,
       },
     },
     annotations: {
@@ -375,83 +340,68 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_app_count-2": access_app_count_2_output,
-        "access_contract_version": access_contract_version_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_page_without_html": access_custom_page_without_html_output,
-        "access_messages": access_messages_output,
-        "access_name-11": access_name_11_output,
-        "access_response_collection-11": access_response_collection_11_output,
-        "access_template_violation": access_template_violation_output,
-        "access_timestamp": access_timestamp_output,
-        "access_type-2": access_type_2_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_custom_page_without_html": access_custom_page_without_html,
+        "access_messages": access_messages,
+        "access_response_collection-11": access_response_collection$$11,
+        "access_template_violation": access_template_violation,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/custom_pages`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_custom_pages_update",
+    name: "zeroTrust_access_customPages_update",
     title: "Update a custom page",
-    description: "Update a custom page",
+    description: "Update a custom page\n\nPUT /accounts/{account_id}/access/custom_pages/{custom_page_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_custom_page"
         },
-        "custom_page_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "custom_page_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "custom_page_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "custom_page_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_app_count-2": access_app_count_2,
-        "access_contract_version": access_contract_version,
-        "access_created_at": access_created_at,
-        "access_custom_page": access_custom_page,
-        "access_identifier": access_identifier,
-        "access_name-11": access_name_11,
-        "access_timestamp": access_timestamp,
-        "access_type-2": access_type_2,
-        "access_updated_at": access_updated_at,
-        "access_uuid": access_uuid,
+        "access_custom_page": access_custom_page$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response_without_html",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count-2": access_app_count_2_output,
-        "access_contract_version": access_contract_version_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_page_without_html": access_custom_page_without_html_output,
-        "access_messages": access_messages_output,
-        "access_name-11": access_name_11_output,
-        "access_single_response_without_html": access_single_response_without_html_output,
-        "access_template_violation": access_template_violation_output,
-        "access_timestamp": access_timestamp_output,
-        "access_type-2": access_type_2_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_page_without_html": access_custom_page_without_html,
+        "access_messages": access_messages,
+        "access_single_response_without_html": access_single_response_without_html,
+        "access_template_violation": access_template_violation,
       },
     },
     annotations: {
@@ -481,22 +431,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count-2": access_app_count_2_output,
-        "access_contract_version": access_contract_version_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_page_without_html": access_custom_page_without_html_output,
-        "access_messages": access_messages_output,
-        "access_name-11": access_name_11_output,
-        "access_single_response_without_html": access_single_response_without_html_output,
-        "access_template_violation": access_template_violation_output,
-        "access_timestamp": access_timestamp_output,
-        "access_type-2": access_type_2_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
-        "access_validate_response": access_validate_response_output,
-        "access_validation_result": access_validation_result_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_page_without_html": access_custom_page_without_html,
+        "access_messages": access_messages,
+        "access_single_response_without_html": access_single_response_without_html,
+        "access_template_violation": access_template_violation,
+        "access_validate_response": access_validate_response,
+        "access_validation_result": access_validation_result,
       },
     },
     request: (args) => ({
@@ -505,38 +447,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_custom_pages_validate",
+    name: "zeroTrust_access_customPages_validate",
     title: "Validate a custom page template",
-    description: "Validate a Liquid template and return its errors and warnings without persisting it.",
+    description: "Validate a Liquid template and return its errors and warnings without persisting it.\n\nPOST /accounts/{account_id}/access/custom_pages/validate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_custom_page_validate"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
         "access_custom_page_validate": access_custom_page_validate,
-        "access_identifier": access_identifier,
-        "access_type-2": access_type_2,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_validate_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_template_violation": access_template_violation_output,
-        "access_type-2": access_type_2_output,
-        "access_validate_response": access_validate_response_output,
-        "access_validation_result": access_validation_result_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_template_violation": access_template_violation,
+        "access_validate_response": access_validate_response,
+        "access_validation_result": access_validation_result,
       },
     },
     annotations: {
@@ -563,13 +512,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_template_violation": access_template_violation_output,
-        "access_type-2": access_type_2_output,
-        "access_validate_response": access_validate_response_output,
-        "access_validation_result": access_validation_result_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_template_violation": access_template_violation,
+        "access_validate_response": access_validate_response,
+        "access_validation_result": access_validation_result,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/outputs.ts
index d2387ced8..8f0ade763 100644
--- a/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/outputs.ts
@@ -3,29 +3,24 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_public_key` in responses.
- */
-export const zero_trust_gateway_public_key_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_settings` in responses.
  */
-export const zero_trust_gateway_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_settings: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "public_key": {
-      "$ref": "#/$defs/zero-trust-gateway_public_key"
+      "type": "string"
     },
     "seed_id": {
-      "$ref": "#/$defs/zero-trust-gateway_uuid-5"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -34,7 +29,7 @@ export const zero_trust_gateway_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_single_response-6` in responses.
  */
-export const zero_trust_gateway_single_response_6_output: JsonSchema = {
+export const zero$$trust$$gateway_single_response$$6: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -49,10 +44,3 @@ export const zero_trust_gateway_single_response_6_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_uuid-5` in responses.
- */
-export const zero_trust_gateway_uuid_5_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/schemas.ts
deleted file mode 100644
index 780f8b353..000000000
--- a/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../../_/tool.js";
-
-/**
- * The schema of `zero-trust-gateway_public_key`.
- */
-export const zero_trust_gateway_public_key: JsonSchema = {
-  "description": "Provide the Base64-encoded HPKE public key that encrypts SSH session logs. See https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/tools.ts b/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/tools.ts
index ac79d224e..95712ea47 100644
--- a/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/infrastructure/auditSshSettings/tools.ts
@@ -3,53 +3,52 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../../outputs.js";
-import { zero_trust_gateway_identifier_2 } from "../../../schemas.js";
 import {
-  zero_trust_gateway_public_key_output,
-  zero_trust_gateway_settings_output,
-  zero_trust_gateway_single_response_6_output,
-  zero_trust_gateway_uuid_5_output,
+  zero$$trust$$gateway_settings,
+  zero$$trust$$gateway_single_response$$6,
 } from "./outputs.js";
-import { zero_trust_gateway_public_key } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.infrastructure.audit_ssh_settings`.
+ * The tools of `zeroTrust.access.infrastructure.auditSshSettings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_infrastructure_audit_ssh_settings_get",
+    name: "zeroTrust_access_infrastructure_auditSshSettings_get",
     title: "Get Zero Trust SSH settings",
-    description: "Retrieve SSH with Access for Infrastructure settings for an account.",
+    description: "Retrieve SSH with Access for Infrastructure settings for an account.\n\nGET /accounts/{account_id}/gateway/audit_ssh_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-6",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_public_key": zero_trust_gateway_public_key_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_settings": zero_trust_gateway_settings_output,
-        "zero-trust-gateway_single_response-6": zero_trust_gateway_single_response_6_output,
-        "zero-trust-gateway_uuid-5": zero_trust_gateway_uuid_5_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_settings": zero$$trust$$gateway_settings,
+        "zero-trust-gateway_single_response-6": zero$$trust$$gateway_single_response$$6,
       },
     },
     annotations: {
@@ -78,14 +77,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_public_key": zero_trust_gateway_public_key_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_settings": zero_trust_gateway_settings_output,
-        "zero-trust-gateway_single_response-6": zero_trust_gateway_single_response_6_output,
-        "zero-trust-gateway_uuid-5": zero_trust_gateway_uuid_5_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_settings": zero$$trust$$gateway_settings,
+        "zero-trust-gateway_single_response-6": zero$$trust$$gateway_single_response$$6,
       },
     },
     request: (args) => ({
@@ -93,34 +89,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_infrastructure_audit_ssh_settings_rotate_seed",
+    name: "zeroTrust_access_infrastructure_auditSshSettings_rotateSeed",
     title: "Rotate Zero Trust SSH account seed",
-    description: "Rotate the SSH account seed that generates the host key identity when connecting through the Cloudflare SSH Proxy.",
+    description: "Rotate the SSH account seed that generates the host key identity when connecting through the Cloudflare SSH Proxy.\n\nPOST /accounts/{account_id}/gateway/audit_ssh_settings/rotate_seed",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-6",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_public_key": zero_trust_gateway_public_key_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_settings": zero_trust_gateway_settings_output,
-        "zero-trust-gateway_single_response-6": zero_trust_gateway_single_response_6_output,
-        "zero-trust-gateway_uuid-5": zero_trust_gateway_uuid_5_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_settings": zero$$trust$$gateway_settings,
+        "zero-trust-gateway_single_response-6": zero$$trust$$gateway_single_response$$6,
       },
     },
     annotations: {
@@ -149,14 +149,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_public_key": zero_trust_gateway_public_key_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_settings": zero_trust_gateway_settings_output,
-        "zero-trust-gateway_single_response-6": zero_trust_gateway_single_response_6_output,
-        "zero-trust-gateway_uuid-5": zero_trust_gateway_uuid_5_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_settings": zero$$trust$$gateway_settings,
+        "zero-trust-gateway_single_response-6": zero$$trust$$gateway_single_response$$6,
       },
     },
     request: (args) => ({
@@ -164,48 +161,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_infrastructure_audit_ssh_settings_update",
+    name: "zeroTrust_access_infrastructure_auditSshSettings_update",
     title: "Update Zero Trust SSH settings",
-    description: "Update SSH with Access for Infrastructure settings for an account.",
+    description: "Update SSH with Access for Infrastructure settings for an account.\n\nPUT /accounts/{account_id}/gateway/audit_ssh_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "public_key": {
-              "$ref": "#/$defs/zero-trust-gateway_public_key",
-              "description": "Provide the Base64-encoded HPKE public key that encrypts SSH session logs. See https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging."
+              "description": "Provide the Base64-encoded HPKE public key that encrypts SSH session logs. See https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging.",
+              "type": "string"
             }
           },
           "required": [
             "public_key"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_public_key": zero_trust_gateway_public_key,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-6",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_public_key": zero_trust_gateway_public_key_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_settings": zero_trust_gateway_settings_output,
-        "zero-trust-gateway_single_response-6": zero_trust_gateway_single_response_6_output,
-        "zero-trust-gateway_uuid-5": zero_trust_gateway_uuid_5_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_settings": zero$$trust$$gateway_settings,
+        "zero-trust-gateway_single_response-6": zero$$trust$$gateway_single_response$$6,
       },
     },
     annotations: {
@@ -234,14 +234,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_public_key": zero_trust_gateway_public_key_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_settings": zero_trust_gateway_settings_output,
-        "zero-trust-gateway_single_response-6": zero_trust_gateway_single_response_6_output,
-        "zero-trust-gateway_uuid-5": zero_trust_gateway_uuid_5_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_settings": zero$$trust$$gateway_settings,
+        "zero-trust-gateway_single_response-6": zero$$trust$$gateway_single_response$$6,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/infrastructure/sshCa/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/infrastructure/sshCa/outputs.ts
index 6a536d835..bf0b1db9f 100644
--- a/src/generated/forge-mcp/zeroTrust/access/infrastructure/sshCa/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/infrastructure/sshCa/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_certificates-2` in responses.
  */
-export const access_certificates_2_output: JsonSchema = {
+export const access_certificates$$2: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -21,7 +21,7 @@ export const access_certificates_2_output: JsonSchema = {
 /**
  * The schema of `access_response_collection-7` in responses.
  */
-export const access_response_collection_7_output: JsonSchema = {
+export const access_response_collection$$7: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -43,7 +43,7 @@ export const access_response_collection_7_output: JsonSchema = {
 /**
  * The schema of `access_single_response-8` in responses.
  */
-export const access_single_response_8_output: JsonSchema = {
+export const access_single_response$$8: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/infrastructure/sshCa/tools.ts b/src/generated/forge-mcp/zeroTrust/access/infrastructure/sshCa/tools.ts
index 84efe8b61..11f3619eb 100644
--- a/src/generated/forge-mcp/zeroTrust/access/infrastructure/sshCa/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/infrastructure/sshCa/tools.ts
@@ -3,51 +3,56 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_id_response_output,
-  access_messages_output,
-  access_uuid_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_id_response,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
 import {
-  access_certificates_2_output,
-  access_response_collection_7_output,
-  access_single_response_8_output,
+  access_certificates$$2,
+  access_response_collection$$7,
+  access_single_response$$8,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.infrastructure.ssh_ca`.
+ * The tools of `zeroTrust.access.infrastructure.sshCa`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_infrastructure_ssh_ca_create",
+    name: "zeroTrust_access_infrastructure_sshCa_create",
     title: "Add a new SSH Certificate Authority (CA)",
-    description: "Adds a new SSH Certificate Authority (CA).",
+    description: "Adds a new SSH Certificate Authority (CA).\n\nPOST /accounts/{account_id}/access/gateway_ca",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-8",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_certificates-2": access_certificates_2_output,
-        "access_messages": access_messages_output,
-        "access_single_response-8": access_single_response_8_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_certificates-2": access_certificates$$2,
+        "access_messages": access_messages,
+        "access_single_response-8": access_single_response$$8,
       },
     },
     annotations: {
@@ -74,11 +79,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_certificates-2": access_certificates_2_output,
-        "access_messages": access_messages_output,
-        "access_single_response-8": access_single_response_8_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_certificates-2": access_certificates$$2,
+        "access_messages": access_messages,
+        "access_single_response-8": access_single_response$$8,
       },
     },
     request: (args) => ({
@@ -86,37 +91,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_infrastructure_ssh_ca_delete",
+    name: "zeroTrust_access_infrastructure_sshCa_delete",
     title: "Delete an SSH Certificate Authority (CA)",
-    description: "Deletes an SSH Certificate Authority.",
+    description: "Deletes an SSH Certificate Authority.\n\nDELETE /accounts/{account_id}/access/gateway_ca/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "certificate_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "certificate_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -143,11 +153,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -155,32 +164,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_infrastructure_ssh_ca_list",
+    name: "zeroTrust_access_infrastructure_sshCa_list",
     title: "List SSH Certificate Authorities (CA)",
-    description: "Lists SSH Certificate Authorities (CA).",
+    description: "Lists SSH Certificate Authorities (CA).\n\nGET /accounts/{account_id}/access/gateway_ca",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-7",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_certificates-2": access_certificates_2_output,
-        "access_messages": access_messages_output,
-        "access_response_collection-7": access_response_collection_7_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_certificates-2": access_certificates$$2,
+        "access_messages": access_messages,
+        "access_response_collection-7": access_response_collection$$7,
       },
     },
     annotations: {
@@ -208,12 +224,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_certificates-2": access_certificates_2_output,
-        "access_messages": access_messages_output,
-        "access_response_collection-7": access_response_collection_7_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_certificates-2": access_certificates$$2,
+        "access_messages": access_messages,
+        "access_response_collection-7": access_response_collection$$7,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/outputs.ts
index 7deaa1e89..37ed8d45d 100644
--- a/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/outputs.ts
@@ -6,99 +6,44 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_access-requests` in responses.
  */
-export const access_access_requests_output: JsonSchema = {
+export const access_access$$requests: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/access_action"
+      "type": "string"
     },
     "allowed": {
-      "$ref": "#/$defs/access_allowed"
+      "type": "boolean"
     },
     "app_domain": {
-      "$ref": "#/$defs/access_app_domain"
+      "type": "string"
     },
     "app_uid": {
-      "$ref": "#/$defs/access_app_uid"
+      "type": "string"
     },
     "connection": {
-      "$ref": "#/$defs/access_connection"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "ip_address": {
-      "$ref": "#/$defs/access_ip"
+      "type": "string"
     },
     "ray_id": {
-      "$ref": "#/$defs/access_ray_id"
+      "type": "string"
     },
     "user_email": {
-      "$ref": "#/$defs/access_email-3"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_action` in responses.
- */
-export const access_action_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_allowed` in responses.
- */
-export const access_allowed_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_app_domain` in responses.
- */
-export const access_app_domain_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_app_uid` in responses.
- */
-export const access_app_uid_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_connection` in responses.
- */
-export const access_connection_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_email-3` in responses.
- */
-export const access_email_3_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_ip` in responses.
- */
-export const access_ip_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_ray_id` in responses.
- */
-export const access_ray_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_response_collection-12` in responses.
  */
-export const access_response_collection_12_output: JsonSchema = {
+export const access_response_collection$$12: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-common"
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/schemas.ts
deleted file mode 100644
index 4c888b45f..000000000
--- a/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/schemas.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../../_/tool.js";
-
-/**
- * The schema of `access_email-3`.
- */
-export const access_email_3: JsonSchema = {
-  "description": "The email address of the authenticating user.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_user_id`.
- */
-export const access_user_id: JsonSchema = {
-  "description": "The UUID of the authenticating user.",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/tools.ts b/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/tools.ts
index ec011991e..ad9c46e96 100644
--- a/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/logs/accessRequests/tools.ts
@@ -1,204 +1,196 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_messages_output,
-  access_timestamp_output,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier } from "../../../schemas.js";
 import {
-  access_access_requests_output,
-  access_action_output,
-  access_allowed_output,
-  access_app_domain_output,
-  access_app_uid_output,
-  access_connection_output,
-  access_email_3_output,
-  access_ip_output,
-  access_ray_id_output,
-  access_response_collection_12_output,
+  access_access$$requests,
+  access_response_collection$$12,
 } from "./outputs.js";
-import { access_email_3, access_user_id } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.logs.access_requests`.
+ * The tools of `zeroTrust.access.logs.accessRequests`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_logs_access_requests_list",
+    name: "zeroTrust_access_logs_accessRequests_list",
     title: "Get Access authentication logs",
-    description: "Gets a list of Access authentication audit logs for an account.",
+    description: "Gets a list of Access authentication audit logs for an account.\n\nGET /accounts/{account_id}/access/logs/access_requests",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "allowed_op": {
-          "default": "eq",
-          "description": "Operator for the `allowed` filter.",
-          "enum": [
-            "eq",
-            "neq"
-          ],
-          "type": "string"
-        },
-        "app_type_op": {
-          "default": "eq",
-          "description": "Operator for the `app_type` filter.",
-          "enum": [
-            "eq",
-            "neq"
-          ],
-          "type": "string"
-        },
-        "app_uid_op": {
-          "default": "eq",
-          "description": "Operator for the `app_uid` filter.",
-          "enum": [
-            "eq",
-            "neq"
-          ],
-          "type": "string"
-        },
-        "country_code_op": {
-          "default": "eq",
-          "description": "Operator for the `country_code` filter.",
-          "enum": [
-            "eq",
-            "neq"
-          ],
-          "type": "string"
-        },
-        "direction": {
-          "default": "desc",
-          "description": "The chronological sorting order for the logs.",
-          "enum": [
-            "desc",
-            "asc"
-          ],
-          "type": "string"
-        },
-        "email": {
-          "$ref": "#/$defs/access_email-3",
-          "description": "Filter by user email. Match mode is controlled by `emailOp` (preferred) or the legacy `email_exact` flag.\n- Default (no `emailOp`, `email_exact=false` or unset): substring match — `email=@example.com` returns all events with that domain.\n- Exact match: set `emailOp=eq` (preferred) or `email_exact=true` — e.g. `email=user@example.com&email_exact=true` returns only that user.\n- Explicit substring match: set `emailOp=contains` (without `email_exact=true`). When both are set, `email_exact=true` takes precedence and the match is exact.\n- Exclusion: set `emailOp=neq`. With `email_exact=true` this is an exact-value exclusion; without it, a fuzzy substring exclusion.\n"
-        },
-        "email_exact": {
-          "default": false,
-          "description": "When true, `email` is matched exactly instead of substring matching.",
-          "type": "boolean"
-        },
-        "email_op": {
-          "default": "eq",
-          "description": "Operator for the `email` filter.\n`contains` performs a substring (case-sensitive) match. When `email_exact=true`\nis also set, `email_exact` takes precedence and `contains` is ignored.\n",
-          "enum": [
-            "eq",
-            "neq",
-            "contains"
-          ],
-          "type": "string"
-        },
-        "fields": {
-          "description": "Comma-separated list of fields to include in the response.\nWhen omitted, all fields are returned.\n",
-          "type": "string"
-        },
-        "idp_op": {
-          "default": "eq",
-          "description": "Operator for the `idp` filter.",
-          "enum": [
-            "eq",
-            "neq"
-          ],
-          "type": "string"
-        },
-        "limit": {
-          "default": 25,
-          "description": "The maximum number of log entries to retrieve.",
-          "type": "integer"
-        },
-        "non_identity_op": {
-          "default": "eq",
-          "description": "Operator for the `non_identity` filter.",
-          "enum": [
-            "eq",
-            "neq"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 25,
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "ray_id_op": {
-          "default": "eq",
-          "description": "Operator for the `ray_id` filter.",
-          "enum": [
-            "eq",
-            "neq"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "since": {
-          "description": "The earliest event timestamp to query.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "until": {
-          "description": "The latest event timestamp to query.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_user_id",
-          "deprecated": true,
-          "description": "Deprecated. Accepted for backward compatibility but no longer applied\nas a filter. Use `email` instead.\n"
-        },
-        "user_id_op": {
-          "default": "eq",
-          "deprecated": true,
-          "description": "Deprecated. Accepted for backward compatibility but no longer applied\nas a filter (the `user_id` parameter is itself deprecated).\n",
-          "enum": [
-            "eq",
-            "neq"
-          ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "allowedOp": {
+              "default": "eq",
+              "description": "Operator for the `allowed` filter.",
+              "enum": [
+                "eq",
+                "neq"
+              ],
+              "type": "string"
+            },
+            "app_typeOp": {
+              "default": "eq",
+              "description": "Operator for the `app_type` filter.",
+              "enum": [
+                "eq",
+                "neq"
+              ],
+              "type": "string"
+            },
+            "app_uidOp": {
+              "default": "eq",
+              "description": "Operator for the `app_uid` filter.",
+              "enum": [
+                "eq",
+                "neq"
+              ],
+              "type": "string"
+            },
+            "country_codeOp": {
+              "default": "eq",
+              "description": "Operator for the `country_code` filter.",
+              "enum": [
+                "eq",
+                "neq"
+              ],
+              "type": "string"
+            },
+            "direction": {
+              "default": "desc",
+              "description": "The chronological sorting order for the logs.",
+              "enum": [
+                "desc",
+                "asc"
+              ],
+              "type": "string"
+            },
+            "email": {
+              "description": "Filter by user email. Match mode is controlled by `emailOp` (preferred) or the legacy `email_exact` flag.\n- Default (no `emailOp`, `email_exact=false` or unset): substring match — `email=@example.com` returns all events with that domain.\n- Exact match: set `emailOp=eq` (preferred) or `email_exact=true` — e.g. `email=user@example.com&email_exact=true` returns only that user.\n- Explicit substring match: set `emailOp=contains` (without `email_exact=true`). When both are set, `email_exact=true` takes precedence and the match is exact.\n- Exclusion: set `emailOp=neq`. With `email_exact=true` this is an exact-value exclusion; without it, a fuzzy substring exclusion.",
+              "type": "string"
+            },
+            "emailOp": {
+              "default": "eq",
+              "description": "Operator for the `email` filter.\n`contains` performs a substring (case-sensitive) match. When `email_exact=true`\nis also set, `email_exact` takes precedence and `contains` is ignored.",
+              "enum": [
+                "eq",
+                "neq",
+                "contains"
+              ],
+              "type": "string"
+            },
+            "email_exact": {
+              "default": false,
+              "description": "When true, `email` is matched exactly instead of substring matching.",
+              "type": "boolean"
+            },
+            "fields": {
+              "description": "Comma-separated list of fields to include in the response.\nWhen omitted, all fields are returned.",
+              "type": "string"
+            },
+            "idpOp": {
+              "default": "eq",
+              "description": "Operator for the `idp` filter.",
+              "enum": [
+                "eq",
+                "neq"
+              ],
+              "type": "string"
+            },
+            "limit": {
+              "default": 25,
+              "description": "The maximum number of log entries to retrieve.",
+              "type": "integer"
+            },
+            "non_identityOp": {
+              "default": "eq",
+              "description": "Operator for the `non_identity` filter.",
+              "enum": [
+                "eq",
+                "neq"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "ray_idOp": {
+              "default": "eq",
+              "description": "Operator for the `ray_id` filter.",
+              "enum": [
+                "eq",
+                "neq"
+              ],
+              "type": "string"
+            },
+            "since": {
+              "description": "The earliest event timestamp to query.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "until": {
+              "description": "The latest event timestamp to query.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "user_id": {
+              "deprecated": true,
+              "description": "Deprecated. Accepted for backward compatibility but no longer applied\nas a filter. Use `email` instead.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "user_idOp": {
+              "default": "eq",
+              "deprecated": true,
+              "description": "Deprecated. Accepted for backward compatibility but no longer applied\nas a filter (the `user_id` parameter is itself deprecated).",
+              "enum": [
+                "eq",
+                "neq"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_email-3": access_email_3,
-        "access_identifier": access_identifier,
-        "access_user_id": access_user_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-12",
       $defs: {
-        "access_access-requests": access_access_requests_output,
-        "access_action": access_action_output,
-        "access_allowed": access_allowed_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_app_domain": access_app_domain_output,
-        "access_app_uid": access_app_uid_output,
-        "access_connection": access_connection_output,
-        "access_email-3": access_email_3_output,
-        "access_ip": access_ip_output,
-        "access_messages": access_messages_output,
-        "access_ray_id": access_ray_id_output,
-        "access_response_collection-12": access_response_collection_12_output,
-        "access_timestamp": access_timestamp_output,
+        "access_access-requests": access_access$$requests,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_response_collection-12": access_response_collection$$12,
       },
     },
     annotations: {
@@ -225,44 +217,35 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access-requests": access_access_requests_output,
-        "access_action": access_action_output,
-        "access_allowed": access_allowed_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_app_domain": access_app_domain_output,
-        "access_app_uid": access_app_uid_output,
-        "access_connection": access_connection_output,
-        "access_email-3": access_email_3_output,
-        "access_ip": access_ip_output,
-        "access_messages": access_messages_output,
-        "access_ray_id": access_ray_id_output,
-        "access_response_collection-12": access_response_collection_12_output,
-        "access_timestamp": access_timestamp_output,
+        "access_access-requests": access_access$$requests,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_response_collection-12": access_response_collection$$12,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/logs/access_requests`,
       query: [
-        ["limit", args["limit"], true],
-        ["direction", args["direction"], true],
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["email", args["email"], true],
-        ["email_exact", args["email_exact"], true],
-        ["user_id", args["user_id"], true],
-        ["allowedOp", args["allowed_op"], true],
-        ["country_codeOp", args["country_code_op"], true],
-        ["app_typeOp", args["app_type_op"], true],
-        ["app_uidOp", args["app_uid_op"], true],
-        ["ray_idOp", args["ray_id_op"], true],
-        ["emailOp", args["email_op"], true],
-        ["idpOp", args["idp_op"], true],
-        ["non_identityOp", args["non_identity_op"], true],
-        ["user_idOp", args["user_id_op"], true],
-        ["fields", args["fields"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["email", param(args, "query", "email"), true],
+        ["email_exact", param(args, "query", "email_exact"), true],
+        ["user_id", param(args, "query", "user_id"), true],
+        ["allowedOp", param(args, "query", "allowedOp"), true],
+        ["country_codeOp", param(args, "query", "country_codeOp"), true],
+        ["app_typeOp", param(args, "query", "app_typeOp"), true],
+        ["app_uidOp", param(args, "query", "app_uidOp"), true],
+        ["ray_idOp", param(args, "query", "ray_idOp"), true],
+        ["emailOp", param(args, "query", "emailOp"), true],
+        ["idpOp", param(args, "query", "idpOp"), true],
+        ["non_identityOp", param(args, "query", "non_identityOp"), true],
+        ["user_idOp", param(args, "query", "user_idOp"), true],
+        ["fields", param(args, "query", "fields"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/outputs.ts
index dd3cf1241..f6468c32a 100644
--- a/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_jit_request_event` in responses.
  */
-export const access_jit_request_event_output: JsonSchema = {
+export const access_jit_request_event: JsonSchema = {
   "properties": {
     "actor_email": {
       "type": "string"
@@ -31,34 +31,28 @@ export const access_jit_request_event_output: JsonSchema = {
       "type": "boolean"
     },
     "timestamp": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/access_jit_request_event_type"
+      "enum": [
+        "CREATED",
+        "APPROVER_DECISION",
+        "COMMITTED",
+        "CANCELED",
+        "LOGIN_SUCCESS",
+        "REDIRECT_TO_ACTIVE"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_jit_request_event_type` in responses.
- */
-export const access_jit_request_event_type_output: JsonSchema = {
-  "enum": [
-    "CREATED",
-    "APPROVER_DECISION",
-    "COMMITTED",
-    "CANCELED",
-    "LOGIN_SUCCESS",
-    "REDIRECT_TO_ACTIVE"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_jit_request_log` in responses.
  */
-export const access_jit_request_log_output: JsonSchema = {
+export const access_jit_request_log: JsonSchema = {
   "properties": {
     "app_aud": {
       "type": "string"
@@ -76,10 +70,12 @@ export const access_jit_request_log_output: JsonSchema = {
       "type": "array"
     },
     "created_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "expires_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "knock_request_id": {
       "type": "string"
@@ -91,7 +87,14 @@ export const access_jit_request_log_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/access_jit_request_status"
+      "enum": [
+        "PENDING",
+        "APPROVED",
+        "DENIED",
+        "CANCELED",
+        "SPENT"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -100,7 +103,7 @@ export const access_jit_request_log_output: JsonSchema = {
 /**
  * The schema of `access_jit_request_log_detail` in responses.
  */
-export const access_jit_request_log_detail_output: JsonSchema = {
+export const access_jit_request_log_detail: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_jit_request_log"
@@ -119,24 +122,10 @@ export const access_jit_request_log_detail_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_jit_request_status` in responses.
- */
-export const access_jit_request_status_output: JsonSchema = {
-  "enum": [
-    "PENDING",
-    "APPROVED",
-    "DENIED",
-    "CANCELED",
-    "SPENT"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_response_collection-13` in responses.
  */
-export const access_response_collection_13_output: JsonSchema = {
+export const access_response_collection$$13: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -158,7 +147,7 @@ export const access_response_collection_13_output: JsonSchema = {
 /**
  * The schema of `access_response_single` in responses.
  */
-export const access_response_single_output: JsonSchema = {
+export const access_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/schemas.ts
deleted file mode 100644
index 58b0b70e8..000000000
--- a/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/schemas.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../../_/tool.js";
-
-/**
- * The schema of `access_jit_request_status`.
- */
-export const access_jit_request_status: JsonSchema = {
-  "description": "JIT request status. `SPENT` is deprecated and interpreted as `APPROVED`.",
-  "enum": [
-    "PENDING",
-    "APPROVED",
-    "DENIED",
-    "CANCELED",
-    "SPENT"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/tools.ts b/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/tools.ts
index 07807cbb8..c0323e524 100644
--- a/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/logs/jitRequests/tools.ts
@@ -1,67 +1,66 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_messages_output,
-  access_timestamp_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier } from "../../../schemas.js";
 import {
-  access_jit_request_event_output,
-  access_jit_request_event_type_output,
-  access_jit_request_log_detail_output,
-  access_jit_request_log_output,
-  access_jit_request_status_output,
-  access_response_collection_13_output,
-  access_response_single_output,
+  access_jit_request_event,
+  access_jit_request_log,
+  access_jit_request_log_detail,
+  access_response_collection$$13,
+  access_response_single,
 } from "./outputs.js";
-import { access_jit_request_status } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.logs.jit_requests`.
+ * The tools of `zeroTrust.access.logs.jitRequests`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_logs_jit_requests_get",
+    name: "zeroTrust_access_logs_jitRequests_get",
     title: "Get an Access JIT request log",
-    description: "Gets an account-scoped Access JIT request summary and its lifecycle events in chronological order.",
+    description: "Gets an account-scoped Access JIT request summary and its lifecycle events in chronological order.\n\nGET /accounts/{account_id}/access/logs/jit_requests/{knock_request_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "knock_request_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "knock_request_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "knock_request_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "knock_request_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_single",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_jit_request_event": access_jit_request_event_output,
-        "access_jit_request_event_type": access_jit_request_event_type_output,
-        "access_jit_request_log": access_jit_request_log_output,
-        "access_jit_request_log_detail": access_jit_request_log_detail_output,
-        "access_jit_request_status": access_jit_request_status_output,
-        "access_messages": access_messages_output,
-        "access_response_single": access_response_single_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_jit_request_event": access_jit_request_event,
+        "access_jit_request_log": access_jit_request_log,
+        "access_jit_request_log_detail": access_jit_request_log_detail,
+        "access_messages": access_messages,
+        "access_response_single": access_response_single,
       },
     },
     annotations: {
@@ -86,16 +85,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_jit_request_event": access_jit_request_event_output,
-        "access_jit_request_event_type": access_jit_request_event_type_output,
-        "access_jit_request_log": access_jit_request_log_output,
-        "access_jit_request_log_detail": access_jit_request_log_detail_output,
-        "access_jit_request_status": access_jit_request_status_output,
-        "access_messages": access_messages_output,
-        "access_response_single": access_response_single_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_jit_request_event": access_jit_request_event,
+        "access_jit_request_log": access_jit_request_log,
+        "access_jit_request_log_detail": access_jit_request_log_detail,
+        "access_messages": access_messages,
+        "access_response_single": access_response_single,
       },
     },
     request: (args) => ({
@@ -103,63 +99,80 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_logs_jit_requests_list",
+    name: "zeroTrust_access_logs_jitRequests_list",
     title: "List Access JIT request logs",
-    description: "Lists account-wide Access JIT request logs reconstructed from request lifecycle events.",
+    description: "Lists account-wide Access JIT request logs reconstructed from request lifecycle events.\n\nGET /accounts/{account_id}/access/logs/jit_requests",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 25,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Case-insensitive search over request ID, requester email, application audience, and application hostname.",
-          "type": "string"
-        },
-        "since": {
-          "description": "The earliest request timestamp to query. Defaults to 366 days before the current time.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/$defs/access_jit_request_status",
-          "description": "JIT request status. `SPENT` is deprecated and interpreted as `APPROVED`."
-        },
-        "until": {
-          "description": "The latest request timestamp to query. Defaults to the current time.",
-          "format": "date-time",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Case-insensitive search over request ID, requester email, application audience, and application hostname.",
+              "type": "string"
+            },
+            "since": {
+              "description": "The earliest request timestamp to query. Defaults to 366 days before the current time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "status": {
+              "description": "JIT request status. `SPENT` is deprecated and interpreted as `APPROVED`.",
+              "enum": [
+                "PENDING",
+                "APPROVED",
+                "DENIED",
+                "CANCELED",
+                "SPENT"
+              ],
+              "type": "string"
+            },
+            "until": {
+              "description": "The latest request timestamp to query. Defaults to the current time.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_jit_request_status": access_jit_request_status,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-13",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_jit_request_log": access_jit_request_log_output,
-        "access_jit_request_status": access_jit_request_status_output,
-        "access_messages": access_messages_output,
-        "access_response_collection-13": access_response_collection_13_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_jit_request_log": access_jit_request_log,
+        "access_messages": access_messages,
+        "access_response_collection-13": access_response_collection$$13,
       },
     },
     annotations: {
@@ -181,25 +194,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_jit_request_log": access_jit_request_log_output,
-        "access_jit_request_status": access_jit_request_status_output,
-        "access_messages": access_messages_output,
-        "access_response_collection-13": access_response_collection_13_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_jit_request_log": access_jit_request_log,
+        "access_messages": access_messages,
+        "access_response_collection-13": access_response_collection$$13,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/logs/jit_requests`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["status", args["status"], true],
-        ["search", args["search"], true],
-        ["since", args["since"], true],
-        ["until", args["until"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["status", param(args, "query", "status"), true],
+        ["search", param(args, "query", "search"), true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/outputs.ts
index 3622429fb..fe9261d6d 100644
--- a/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
 /**
  * The schema of `access_responses` in responses.
  */
-export const access_responses_output: JsonSchema = {
+export const access_responses: JsonSchema = {
   "properties": {
     "cf_resource_id": {
       "type": "string"
@@ -21,7 +21,8 @@ export const access_responses_output: JsonSchema = {
       "type": "string"
     },
     "logged_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "request_body": {
       "type": "string"
@@ -48,7 +49,7 @@ export const access_responses_output: JsonSchema = {
 /**
  * The schema of `access_scim_update_logs_response` in responses.
  */
-export const access_scim_update_logs_response_output: JsonSchema = {
+export const access_scim_update_logs_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/schemas.ts
index d1965dc8e..a963009d9 100644
--- a/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
 /**
  * The schema of `access_cf_resource_id-3`.
  */
-export const access_cf_resource_id_3: JsonSchema = {
+export const access_cf_resource_id$$3: JsonSchema = {
   "description": "The unique Cloudflare-generated Id of the SCIM resource. Pass once for\na single lookup (`?cf_resource_id=A`) or repeat the parameter\n(`?cf_resource_id=A&cf_resource_id=B`) to filter by multiple resources\nin one request.",
   "items": {
     "type": "string"
@@ -14,18 +14,6 @@ export const access_cf_resource_id_3: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_direction`.
- */
-export const access_direction: JsonSchema = {
-  "description": "The chronological order used to sort the logs.",
-  "enum": [
-    "desc",
-    "asc"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_idp_id`.
  */
@@ -40,7 +28,7 @@ export const access_idp_id: JsonSchema = {
 /**
  * The schema of `access_idp_resource_id-3`.
  */
-export const access_idp_resource_id_3: JsonSchema = {
+export const access_idp_resource_id$$3: JsonSchema = {
   "description": "The IdP-generated Id of the SCIM resource. Pass once for a single\nlookup (`?idp_resource_id=A`) or repeat the parameter\n(`?idp_resource_id=A&idp_resource_id=B`) to filter by multiple\nresources in one request.",
   "items": {
     "type": "string"
@@ -48,14 +36,6 @@ export const access_idp_resource_id_3: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_limit`.
- */
-export const access_limit: JsonSchema = {
-  "description": "The maximum number of update logs to retrieve.",
-  "type": "integer"
-};
-
 /**
  * The schema of `access_request_method`.
  */
@@ -110,19 +90,10 @@ export const access_resource_user_email: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_since`.
- */
-export const access_since: JsonSchema = {
-  "description": "the timestamp of the earliest update log.",
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `access_status-2`.
  */
-export const access_status_2: JsonSchema = {
+export const access_status$$2: JsonSchema = {
   "description": "The status of the SCIM request.",
   "items": {
     "enum": [
@@ -133,12 +104,3 @@ export const access_status_2: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `access_until`.
- */
-export const access_until: JsonSchema = {
-  "description": "the timestamp of the most-recent update log.",
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/tools.ts b/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/tools.ts
index e879a898e..ccc74ec69 100644
--- a/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/logs/scim/updates/tools.ts
@@ -1,139 +1,152 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_messages_output,
-  access_timestamp_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_messages,
 } from "../../../../outputs.js";
-import { access_identifier } from "../../../../schemas.js";
 import {
-  access_responses_output,
-  access_scim_update_logs_response_output,
+  access_responses,
+  access_scim_update_logs_response,
 } from "./outputs.js";
 import {
-  access_cf_resource_id_3,
-  access_direction,
+  access_cf_resource_id$$3,
   access_idp_id,
-  access_idp_resource_id_3,
-  access_limit,
+  access_idp_resource_id$$3,
   access_request_method,
   access_resource_group_name,
   access_resource_type,
   access_resource_user_email,
-  access_since,
-  access_status_2,
-  access_until,
+  access_status$$2,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.logs.scim.updates`.
+ * The tools of `zeroTrust.access.logs.scim.updates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_logs_scim_updates_list",
+    name: "zeroTrust_access_logs_scim_updates_list",
     title: "List Access SCIM update logs",
-    description: "Lists Access SCIM update logs that maintain a record of updates made to User and Group resources synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).",
+    description: "Lists Access SCIM update logs that maintain a record of updates made to User and Group resources synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).\n\nGET /accounts/{account_id}/access/logs/scim/updates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "cf_resource_id": {
-          "$ref": "#/$defs/access_cf_resource_id-3",
-          "description": "The unique Cloudflare-generated Id of the SCIM resource. Pass once for\na single lookup (`?cf_resource_id=A`) or repeat the parameter\n(`?cf_resource_id=A&cf_resource_id=B`) to filter by multiple resources\nin one request."
-        },
-        "direction": {
-          "$ref": "#/$defs/access_direction",
-          "default": "desc",
-          "description": "The chronological order used to sort the logs."
-        },
-        "idp_id": {
-          "$ref": "#/$defs/access_idp_id",
-          "description": "The unique Id of the IdP that has SCIM enabled."
-        },
-        "idp_resource_id": {
-          "$ref": "#/$defs/access_idp_resource_id-3",
-          "description": "The IdP-generated Id of the SCIM resource. Pass once for a single\nlookup (`?idp_resource_id=A`) or repeat the parameter\n(`?idp_resource_id=A&idp_resource_id=B`) to filter by multiple\nresources in one request."
-        },
-        "limit": {
-          "$ref": "#/$defs/access_limit",
-          "default": 20,
-          "description": "The maximum number of update logs to retrieve."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "request_method": {
-          "$ref": "#/$defs/access_request_method",
-          "description": "The request method of the SCIM request."
-        },
-        "resource_group_name": {
-          "$ref": "#/$defs/access_resource_group_name",
-          "description": "The display name of the SCIM Group resource. Pass once for a single\nlookup (`?resource_group_name=A`) or repeat the parameter\n(`?resource_group_name=A&resource_group_name=B`) to filter by multiple\ngroup names in one request."
-        },
-        "resource_type": {
-          "$ref": "#/$defs/access_resource_type",
-          "description": "The resource type of the SCIM request."
-        },
-        "resource_user_email": {
-          "$ref": "#/$defs/access_resource_user_email",
-          "description": "The email address of the SCIM User resource. Pass once for a single\nlookup (`?resource_user_email=A`) or repeat the parameter\n(`?resource_user_email=A&resource_user_email=B`) to filter by multiple\nemails in one request."
-        },
-        "since": {
-          "$ref": "#/$defs/access_since",
-          "description": "the timestamp of the earliest update log."
-        },
-        "status": {
-          "$ref": "#/$defs/access_status-2",
-          "description": "The status of the SCIM request."
-        },
-        "until": {
-          "$ref": "#/$defs/access_until",
-          "description": "the timestamp of the most-recent update log."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cf_resource_id": {
+              "$ref": "#/$defs/access_cf_resource_id-3",
+              "description": "The unique Cloudflare-generated Id of the SCIM resource. Pass once for\na single lookup (`?cf_resource_id=A`) or repeat the parameter\n(`?cf_resource_id=A&cf_resource_id=B`) to filter by multiple resources\nin one request."
+            },
+            "direction": {
+              "default": "desc",
+              "description": "The chronological order used to sort the logs.",
+              "enum": [
+                "desc",
+                "asc"
+              ],
+              "type": "string"
+            },
+            "idp_id": {
+              "$ref": "#/$defs/access_idp_id",
+              "description": "The unique Id of the IdP that has SCIM enabled."
+            },
+            "idp_resource_id": {
+              "$ref": "#/$defs/access_idp_resource_id-3",
+              "description": "The IdP-generated Id of the SCIM resource. Pass once for a single\nlookup (`?idp_resource_id=A`) or repeat the parameter\n(`?idp_resource_id=A&idp_resource_id=B`) to filter by multiple\nresources in one request."
+            },
+            "limit": {
+              "default": 20,
+              "description": "The maximum number of update logs to retrieve.",
+              "type": "integer"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "request_method": {
+              "$ref": "#/$defs/access_request_method",
+              "description": "The request method of the SCIM request."
+            },
+            "resource_group_name": {
+              "$ref": "#/$defs/access_resource_group_name",
+              "description": "The display name of the SCIM Group resource. Pass once for a single\nlookup (`?resource_group_name=A`) or repeat the parameter\n(`?resource_group_name=A&resource_group_name=B`) to filter by multiple\ngroup names in one request."
+            },
+            "resource_type": {
+              "$ref": "#/$defs/access_resource_type",
+              "description": "The resource type of the SCIM request."
+            },
+            "resource_user_email": {
+              "$ref": "#/$defs/access_resource_user_email",
+              "description": "The email address of the SCIM User resource. Pass once for a single\nlookup (`?resource_user_email=A`) or repeat the parameter\n(`?resource_user_email=A&resource_user_email=B`) to filter by multiple\nemails in one request."
+            },
+            "since": {
+              "description": "the timestamp of the earliest update log.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "status": {
+              "$ref": "#/$defs/access_status-2",
+              "description": "The status of the SCIM request."
+            },
+            "until": {
+              "description": "the timestamp of the most-recent update log.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "required": [
+            "idp_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "idp_id"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_cf_resource_id-3": access_cf_resource_id_3,
-        "access_direction": access_direction,
-        "access_identifier": access_identifier,
+        "access_cf_resource_id-3": access_cf_resource_id$$3,
         "access_idp_id": access_idp_id,
-        "access_idp_resource_id-3": access_idp_resource_id_3,
-        "access_limit": access_limit,
+        "access_idp_resource_id-3": access_idp_resource_id$$3,
         "access_request_method": access_request_method,
         "access_resource_group_name": access_resource_group_name,
         "access_resource_type": access_resource_type,
         "access_resource_user_email": access_resource_user_email,
-        "access_since": access_since,
-        "access_status-2": access_status_2,
-        "access_until": access_until,
+        "access_status-2": access_status$$2,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_update_logs_response",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_messages": access_messages_output,
-        "access_responses": access_responses_output,
-        "access_scim_update_logs_response": access_scim_update_logs_response_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_responses": access_responses,
+        "access_scim_update_logs_response": access_scim_update_logs_response,
       },
     },
     annotations: {
@@ -160,32 +173,31 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_messages": access_messages_output,
-        "access_responses": access_responses_output,
-        "access_scim_update_logs_response": access_scim_update_logs_response_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_responses": access_responses,
+        "access_scim_update_logs_response": access_scim_update_logs_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/logs/scim/updates`,
       query: [
-        ["limit", args["limit"], true],
-        ["direction", args["direction"], true],
-        ["since", args["since"], true],
-        ["until", args["until"], true],
-        ["idp_id", args["idp_id"], true],
-        ["status", args["status"], true],
-        ["resource_type", args["resource_type"], true],
-        ["request_method", args["request_method"], true],
-        ["resource_user_email", args["resource_user_email"], true],
-        ["resource_group_name", args["resource_group_name"], true],
-        ["cf_resource_id", args["cf_resource_id"], true],
-        ["idp_resource_id", args["idp_resource_id"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["limit", param(args, "query", "limit"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["since", param(args, "query", "since"), true],
+        ["until", param(args, "query", "until"), true],
+        ["idp_id", param(args, "query", "idp_id"), true],
+        ["status", param(args, "query", "status"), true],
+        ["resource_type", param(args, "query", "resource_type"), true],
+        ["request_method", param(args, "query", "request_method"), true],
+        ["resource_user_email", param(args, "query", "resource_user_email"), true],
+        ["resource_group_name", param(args, "query", "resource_group_name"), true],
+        ["cf_resource_id", param(args, "query", "cf_resource_id"), true],
+        ["idp_resource_id", param(args, "query", "idp_resource_id"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/access/mfa/authenticatorCatalog/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/mfa/authenticatorCatalog/outputs.ts
index 7b170d9b2..bf1bb3665 100644
--- a/src/generated/forge-mcp/zeroTrust/access/mfa/authenticatorCatalog/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/mfa/authenticatorCatalog/outputs.ts
@@ -3,24 +3,17 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `access_aaguid` in responses.
- */
-export const access_aaguid_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
 /**
  * The schema of `access_authenticator_device_aaguid` in responses.
  */
-export const access_authenticator_device_aaguid_output: JsonSchema = {
+export const access_authenticator_device_aaguid: JsonSchema = {
   "properties": {
     "aaguid": {
-      "$ref": "#/$defs/access_aaguid"
+      "format": "uuid",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-14"
+      "type": "string"
     }
   },
   "required": [
@@ -30,17 +23,10 @@ export const access_authenticator_device_aaguid_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_name-14` in responses.
- */
-export const access_name_14_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_response_collection-17` in responses.
  */
-export const access_response_collection_17_output: JsonSchema = {
+export const access_response_collection$$17: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/access/mfa/authenticatorCatalog/tools.ts b/src/generated/forge-mcp/zeroTrust/access/mfa/authenticatorCatalog/tools.ts
index 5567af6b4..68955f3ef 100644
--- a/src/generated/forge-mcp/zeroTrust/access/mfa/authenticatorCatalog/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/mfa/authenticatorCatalog/tools.ts
@@ -3,52 +3,54 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_messages_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier } from "../../../schemas.js";
 import {
-  access_aaguid_output,
-  access_authenticator_device_aaguid_output,
-  access_name_14_output,
-  access_response_collection_17_output,
+  access_authenticator_device_aaguid,
+  access_response_collection$$17,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.mfa.authenticator_catalog`.
+ * The tools of `zeroTrust.access.mfa.authenticatorCatalog`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_mfa_authenticator_catalog_list",
+    name: "zeroTrust_access_mfa_authenticatorCatalog_list",
     title: "List authenticator device AAGUIDs",
-    description: "Returns a list of Authenticator Device AAGUIDs for MFA configuration.",
+    description: "Returns a list of Authenticator Device AAGUIDs for MFA configuration.\n\nGET /accounts/{account_id}/access/authenticator_device_aaguids",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-17",
       $defs: {
-        "access_aaguid": access_aaguid_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_authenticator_device_aaguid": access_authenticator_device_aaguid_output,
-        "access_messages": access_messages_output,
-        "access_name-14": access_name_14_output,
-        "access_response_collection-17": access_response_collection_17_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_authenticator_device_aaguid": access_authenticator_device_aaguid,
+        "access_messages": access_messages,
+        "access_response_collection-17": access_response_collection$$17,
       },
     },
     annotations: {
@@ -70,14 +72,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_aaguid": access_aaguid_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_authenticator_device_aaguid": access_authenticator_device_aaguid_output,
-        "access_messages": access_messages_output,
-        "access_name-14": access_name_14_output,
-        "access_response_collection-17": access_response_collection_17_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_authenticator_device_aaguid": access_authenticator_device_aaguid,
+        "access_messages": access_messages,
+        "access_response_collection-17": access_response_collection$$17,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/outputs.ts
index 49d49e3f7..f1a00180c 100644
--- a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `access_associated_hostnames` in responses.
  */
-export const access_associated_hostnames_output: JsonSchema = {
+export const access_associated_hostnames: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -16,51 +16,54 @@ export const access_associated_hostnames_output: JsonSchema = {
 /**
  * The schema of `access_certificates` in responses.
  */
-export const access_certificates_output: JsonSchema = {
+export const access_certificates: JsonSchema = {
   "properties": {
     "associated_hostnames": {
       "$ref": "#/$defs/access_associated_hostnames"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "expires_on": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "fingerprint": {
-      "$ref": "#/$defs/access_fingerprint"
+      "type": "string"
     },
     "id": {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-7"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_fingerprint` in responses.
- */
-export const access_fingerprint_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_name-7` in responses.
- */
-export const access_name_7_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_response_collection-6` in responses.
  */
-export const access_response_collection_6_output: JsonSchema = {
+export const access_response_collection$$6: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -82,7 +85,7 @@ export const access_response_collection_6_output: JsonSchema = {
 /**
  * The schema of `access_single_response-7` in responses.
  */
-export const access_single_response_7_output: JsonSchema = {
+export const access_single_response$$7: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/schemas.ts
index c5d4e3c6d..7d5b8e4ee 100644
--- a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/schemas.ts
@@ -13,11 +13,3 @@ export const access_associated_hostnames: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `access_name-7`.
- */
-export const access_name_7: JsonSchema = {
-  "description": "The name of the certificate.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/settings/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/settings/outputs.ts
index 96841167c..e9ef11a98 100644
--- a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/settings/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/settings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_response_collection_hostnames` in responses.
  */
-export const access_response_collection_hostnames_output: JsonSchema = {
+export const access_response_collection_hostnames: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -28,7 +28,7 @@ export const access_response_collection_hostnames_output: JsonSchema = {
 /**
  * The schema of `access_settings` in responses.
  */
-export const access_settings_output: JsonSchema = {
+export const access_settings: JsonSchema = {
   "properties": {
     "china_network": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/settings/tools.ts b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/settings/tools.ts
index 5d97d3c03..8e5519daf 100644
--- a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/settings/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/settings/tools.ts
@@ -3,58 +3,64 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_messages_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier } from "../../../schemas.js";
 import {
-  access_response_collection_hostnames_output,
-  access_settings_output,
+  access_response_collection_hostnames,
+  access_settings,
 } from "./outputs.js";
-import { access_settings } from "./schemas.js";
+import { access_settings as access_settings$ } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.mtls_certificates.settings`.
+ * The tools of `zeroTrust.access.mtlsCertificates.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_mtls_certificates_settings_get",
+    name: "zeroTrust_access_mtlsCertificates_settings_get",
     title: "List all mTLS hostname settings",
-    description: "List all mTLS hostname settings for this account or zone.",
+    description: "List all mTLS hostname settings for this account or zone.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/certificates/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection_hostnames",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_messages": access_messages_output,
-        "access_response_collection_hostnames": access_response_collection_hostnames_output,
-        "access_settings": access_settings_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_response_collection_hostnames": access_response_collection_hostnames,
+        "access_settings": access_settings,
       },
     },
     annotations: {
@@ -82,12 +88,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_messages": access_messages_output,
-        "access_response_collection_hostnames": access_response_collection_hostnames_output,
-        "access_settings": access_settings_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_response_collection_hostnames": access_response_collection_hostnames,
+        "access_settings": access_settings,
       },
     },
     request: (args) => ({
@@ -95,24 +101,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_mtls_certificates_settings_update",
+    name: "zeroTrust_access_mtlsCertificates_settings_update",
     title: "Update an mTLS certificate's hostname settings",
-    description: "Updates an mTLS certificate's hostname settings.",
+    description: "Updates an mTLS certificate's hostname settings.\n\nPUT /{account_or_zone}/{account_or_zone_id}/access/certificates/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "settings": {
@@ -126,26 +120,47 @@ export const tools: readonly Tool[] = [
             "settings"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_identifier": access_identifier,
-        "access_settings": access_settings,
+        "access_settings": access_settings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection_hostnames",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_messages": access_messages_output,
-        "access_response_collection_hostnames": access_response_collection_hostnames_output,
-        "access_settings": access_settings_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_response_collection_hostnames": access_response_collection_hostnames,
+        "access_settings": access_settings,
       },
     },
     annotations: {
@@ -172,12 +187,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_messages": access_messages_output,
-        "access_response_collection_hostnames": access_response_collection_hostnames_output,
-        "access_settings": access_settings_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_response_collection_hostnames": access_response_collection_hostnames,
+        "access_settings": access_settings,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/tools.ts b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/tools.ts
index bb973a179..bc9a62deb 100644
--- a/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/mtlsCertificates/tools.ts
@@ -1,53 +1,34 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_created_at_output,
-  access_messages_output,
-  access_timestamp_output,
-  access_updated_at_output,
-  access_uuid_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier, access_uuid } from "../../schemas.js";
-import { access_id_response_3_output } from "../outputs.js";
+import { access_id_response$$3 } from "../outputs.js";
 import {
-  access_associated_hostnames_output,
-  access_certificates_output,
-  access_fingerprint_output,
-  access_name_7_output,
-  access_response_collection_6_output,
-  access_single_response_7_output,
+  access_associated_hostnames,
+  access_certificates,
+  access_response_collection$$6,
+  access_single_response$$7,
 } from "./outputs.js";
-import { access_associated_hostnames, access_name_7 } from "./schemas.js";
+import { access_associated_hostnames as access_associated_hostnames$ } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.mtls_certificates`.
+ * The tools of `zeroTrust.access.mtlsCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_mtls_certificates_create",
+    name: "zeroTrust_access_mtlsCertificates_create",
     title: "Add an mTLS certificate",
-    description: "Adds a new mTLS root certificate to Access.",
+    description: "Adds a new mTLS root certificate to Access.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "associated_hostnames": {
@@ -59,8 +40,8 @@ export const tools: readonly Tool[] = [
               "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/access_name-7",
-              "description": "The name of the certificate."
+              "description": "The name of the certificate.",
+              "type": "string"
             }
           },
           "required": [
@@ -68,32 +49,47 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_associated_hostnames": access_associated_hostnames,
-        "access_identifier": access_identifier,
-        "access_name-7": access_name_7,
+        "access_associated_hostnames": access_associated_hostnames$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-7",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_associated_hostnames": access_associated_hostnames_output,
-        "access_certificates": access_certificates_output,
-        "access_created_at": access_created_at_output,
-        "access_fingerprint": access_fingerprint_output,
-        "access_messages": access_messages_output,
-        "access_name-7": access_name_7_output,
-        "access_single_response-7": access_single_response_7_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_associated_hostnames": access_associated_hostnames,
+        "access_certificates": access_certificates,
+        "access_messages": access_messages,
+        "access_single_response-7": access_single_response$$7,
       },
     },
     annotations: {
@@ -120,17 +116,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_associated_hostnames": access_associated_hostnames_output,
-        "access_certificates": access_certificates_output,
-        "access_created_at": access_created_at_output,
-        "access_fingerprint": access_fingerprint_output,
-        "access_messages": access_messages_output,
-        "access_name-7": access_name_7_output,
-        "access_single_response-7": access_single_response_7_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_associated_hostnames": access_associated_hostnames,
+        "access_certificates": access_certificates,
+        "access_messages": access_messages,
+        "access_single_response-7": access_single_response$$7,
       },
     },
     request: (args) => ({
@@ -139,46 +130,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_mtls_certificates_delete",
+    name: "zeroTrust_access_mtlsCertificates_delete",
     title: "Delete an mTLS certificate",
-    description: "Deletes an mTLS certificate.",
+    description: "Deletes an mTLS certificate.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/access/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "certificate_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "certificate_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "certificate_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response-3",
       $defs: {
-        "access_api-response-common": access_api_response_common_output,
-        "access_id_response-3": access_id_response_3_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common": access_api$$response$$common,
+        "access_id_response-3": access_id_response$$3,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -205,11 +201,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_id_response-3": access_id_response_3_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_id_response-3": access_id_response$$3,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -217,52 +212,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_mtls_certificates_get",
+    name: "zeroTrust_access_mtlsCertificates_get",
     title: "Get an mTLS certificate",
-    description: "Fetches a single mTLS certificate.",
+    description: "Fetches a single mTLS certificate.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "certificate_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "certificate_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "certificate_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-7",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_associated_hostnames": access_associated_hostnames_output,
-        "access_certificates": access_certificates_output,
-        "access_created_at": access_created_at_output,
-        "access_fingerprint": access_fingerprint_output,
-        "access_messages": access_messages_output,
-        "access_name-7": access_name_7_output,
-        "access_single_response-7": access_single_response_7_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_associated_hostnames": access_associated_hostnames,
+        "access_certificates": access_certificates,
+        "access_messages": access_messages,
+        "access_single_response-7": access_single_response$$7,
       },
     },
     annotations: {
@@ -290,17 +286,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_associated_hostnames": access_associated_hostnames_output,
-        "access_certificates": access_certificates_output,
-        "access_created_at": access_created_at_output,
-        "access_fingerprint": access_fingerprint_output,
-        "access_messages": access_messages_output,
-        "access_name-7": access_name_7_output,
-        "access_single_response-7": access_single_response_7_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_associated_hostnames": access_associated_hostnames,
+        "access_certificates": access_certificates,
+        "access_messages": access_messages,
+        "access_single_response-7": access_single_response$$7,
       },
     },
     request: (args) => ({
@@ -308,57 +299,65 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_mtls_certificates_list",
+    name: "zeroTrust_access_mtlsCertificates_list",
     title: "List mTLS certificates",
-    description: "Lists all mTLS root certificates.",
+    description: "Lists all mTLS root certificates.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-6",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_associated_hostnames": access_associated_hostnames_output,
-        "access_certificates": access_certificates_output,
-        "access_created_at": access_created_at_output,
-        "access_fingerprint": access_fingerprint_output,
-        "access_messages": access_messages_output,
-        "access_name-7": access_name_7_output,
-        "access_response_collection-6": access_response_collection_6_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_associated_hostnames": access_associated_hostnames,
+        "access_certificates": access_certificates,
+        "access_messages": access_messages,
+        "access_response_collection-6": access_response_collection$$6,
       },
     },
     annotations: {
@@ -386,47 +385,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_associated_hostnames": access_associated_hostnames_output,
-        "access_certificates": access_certificates_output,
-        "access_created_at": access_created_at_output,
-        "access_fingerprint": access_fingerprint_output,
-        "access_messages": access_messages_output,
-        "access_name-7": access_name_7_output,
-        "access_response_collection-6": access_response_collection_6_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_associated_hostnames": access_associated_hostnames,
+        "access_certificates": access_certificates,
+        "access_messages": access_messages,
+        "access_response_collection-6": access_response_collection$$6,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/certificates`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_mtls_certificates_update",
+    name: "zeroTrust_access_mtlsCertificates_update",
     title: "Update an mTLS certificate",
-    description: "Updates a configured mTLS certificate.",
+    description: "Updates a configured mTLS certificate.\n\nPUT /{account_or_zone}/{account_or_zone_id}/access/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "associated_hostnames": {
@@ -434,8 +416,8 @@ export const tools: readonly Tool[] = [
               "description": "The hostnames of the applications that will use this certificate."
             },
             "name": {
-              "$ref": "#/$defs/access_name-7",
-              "description": "The name of the certificate."
+              "description": "The name of the certificate.",
+              "type": "string"
             }
           },
           "required": [
@@ -443,37 +425,51 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "certificate_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "certificate_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "certificate_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_associated_hostnames": access_associated_hostnames,
-        "access_identifier": access_identifier,
-        "access_name-7": access_name_7,
-        "access_uuid": access_uuid,
+        "access_associated_hostnames": access_associated_hostnames$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-7",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_associated_hostnames": access_associated_hostnames_output,
-        "access_certificates": access_certificates_output,
-        "access_created_at": access_created_at_output,
-        "access_fingerprint": access_fingerprint_output,
-        "access_messages": access_messages_output,
-        "access_name-7": access_name_7_output,
-        "access_single_response-7": access_single_response_7_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_associated_hostnames": access_associated_hostnames,
+        "access_certificates": access_certificates,
+        "access_messages": access_messages,
+        "access_single_response-7": access_single_response$$7,
       },
     },
     annotations: {
@@ -500,17 +496,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_associated_hostnames": access_associated_hostnames_output,
-        "access_certificates": access_certificates_output,
-        "access_created_at": access_created_at_output,
-        "access_fingerprint": access_fingerprint_output,
-        "access_messages": access_messages_output,
-        "access_name-7": access_name_7_output,
-        "access_single_response-7": access_single_response_7_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_associated_hostnames": access_associated_hostnames,
+        "access_certificates": access_certificates,
+        "access_messages": access_messages,
+        "access_single_response-7": access_single_response$$7,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/outputs.ts
index 1b099593b..dd5a19707 100644
--- a/src/generated/forge-mcp/zeroTrust/access/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `access_access_group_rule` in responses.
  */
-export const access_access_group_rule_output: JsonSchema = {
+export const access_access_group_rule: JsonSchema = {
   "properties": {
     "group": {
       "properties": {
@@ -30,9 +30,13 @@ export const access_access_group_rule_output: JsonSchema = {
  * The schema of `access_allowed_clipboard_local_to_remote_formats` in
  * responses.
  */
-export const access_allowed_clipboard_local_to_remote_formats_output: JsonSchema = {
+export const access_allowed_clipboard_local_to_remote_formats: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/access_rdp_clipboard_format"
+    "enum": [
+      "text",
+      "file"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
@@ -41,9 +45,13 @@ export const access_allowed_clipboard_local_to_remote_formats_output: JsonSchema
  * The schema of `access_allowed_clipboard_remote_to_local_formats` in
  * responses.
  */
-export const access_allowed_clipboard_remote_to_local_formats_output: JsonSchema = {
+export const access_allowed_clipboard_remote_to_local_formats: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/access_rdp_clipboard_format"
+    "enum": [
+      "text",
+      "file"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
@@ -51,7 +59,7 @@ export const access_allowed_clipboard_remote_to_local_formats_output: JsonSchema
 /**
  * The schema of `access_any_valid_service_token_rule` in responses.
  */
-export const access_any_valid_service_token_rule_output: JsonSchema = {
+export const access_any_valid_service_token_rule: JsonSchema = {
   "properties": {
     "any_valid_service_token": {
       "type": "object"
@@ -66,7 +74,7 @@ export const access_any_valid_service_token_rule_output: JsonSchema = {
 /**
  * The schema of `access_approval_group` in responses.
  */
-export const access_approval_group_output: JsonSchema = {
+export const access_approval_group: JsonSchema = {
   "properties": {
     "approvals_needed": {
       "type": "number"
@@ -90,24 +98,17 @@ export const access_approval_group_output: JsonSchema = {
 /**
  * The schema of `access_approval_groups` in responses.
  */
-export const access_approval_groups_output: JsonSchema = {
+export const access_approval_groups: JsonSchema = {
   "items": {
     "$ref": "#/$defs/access_approval_group"
   },
   "type": "array"
 };
 
-/**
- * The schema of `access_approval_required` in responses.
- */
-export const access_approval_required_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_auth_context_rule` in responses.
  */
-export const access_auth_context_rule_output: JsonSchema = {
+export const access_auth_context_rule: JsonSchema = {
   "properties": {
     "auth_context": {
       "properties": {
@@ -138,7 +139,7 @@ export const access_auth_context_rule_output: JsonSchema = {
 /**
  * The schema of `access_authentication_method_rule` in responses.
  */
-export const access_authentication_method_rule_output: JsonSchema = {
+export const access_authentication_method_rule: JsonSchema = {
   "properties": {
     "auth_method": {
       "properties": {
@@ -161,7 +162,7 @@ export const access_authentication_method_rule_output: JsonSchema = {
 /**
  * The schema of `access_azure_group_rule` in responses.
  */
-export const access_azure_group_rule_output: JsonSchema = {
+export const access_azure_group_rule: JsonSchema = {
   "properties": {
     "azureAD": {
       "properties": {
@@ -188,34 +189,42 @@ export const access_azure_group_rule_output: JsonSchema = {
 /**
  * The schema of `access_base_policy_resp` in responses.
  */
-export const access_base_policy_resp_output: JsonSchema = {
+export const access_base_policy_resp: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "decision": {
-      "$ref": "#/$defs/access_decision"
+      "enum": [
+        "allow",
+        "deny",
+        "non_identity",
+        "bypass"
+      ],
+      "type": "string"
     },
     "exclude": {
       "$ref": "#/$defs/access_exclude-2"
     },
     "id": {
-      "$ref": "#/$defs/access_uuid-2"
+      "type": "string"
     },
     "include": {
       "$ref": "#/$defs/access_include-2"
     },
     "name": {
-      "$ref": "#/$defs/access_name-9"
+      "type": "string"
     },
     "policy_resolution_account_id": {
-      "$ref": "#/$defs/access_policy_resolution_account_id"
+      "type": "string"
     },
     "require": {
       "$ref": "#/$defs/access_require-2"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -224,7 +233,7 @@ export const access_base_policy_resp_output: JsonSchema = {
 /**
  * The schema of `access_certificate_rule` in responses.
  */
-export const access_certificate_rule_output: JsonSchema = {
+export const access_certificate_rule: JsonSchema = {
   "properties": {
     "certificate": {
       "type": "object"
@@ -239,12 +248,12 @@ export const access_certificate_rule_output: JsonSchema = {
 /**
  * The schema of `access_cloudflare_account_member_rule` in responses.
  */
-export const access_cloudflare_account_member_rule_output: JsonSchema = {
+export const access_cloudflare_account_member_rule: JsonSchema = {
   "properties": {
     "cloudflare_account_member": {
       "properties": {
         "account_id": {
-          "$ref": "#/$defs/access_identifier"
+          "type": "string"
         }
       },
       "type": "object"
@@ -259,7 +268,7 @@ export const access_cloudflare_account_member_rule_output: JsonSchema = {
 /**
  * The schema of `access_common_name_rule` in responses.
  */
-export const access_common_name_rule_output: JsonSchema = {
+export const access_common_name_rule: JsonSchema = {
   "properties": {
     "common_name": {
       "properties": {
@@ -282,7 +291,7 @@ export const access_common_name_rule_output: JsonSchema = {
 /**
  * The schema of `access_connection_rules` in responses.
  */
-export const access_connection_rules_output: JsonSchema = {
+export const access_connection_rules: JsonSchema = {
   "properties": {
     "rdp": {
       "$ref": "#/$defs/access_connection_rules_rdp"
@@ -294,7 +303,7 @@ export const access_connection_rules_output: JsonSchema = {
 /**
  * The schema of `access_connection_rules_rdp` in responses.
  */
-export const access_connection_rules_rdp_output: JsonSchema = {
+export const access_connection_rules_rdp: JsonSchema = {
   "properties": {
     "allowed_clipboard_local_to_remote_formats": {
       "$ref": "#/$defs/access_allowed_clipboard_local_to_remote_formats"
@@ -309,7 +318,7 @@ export const access_connection_rules_rdp_output: JsonSchema = {
 /**
  * The schema of `access_country_rule` in responses.
  */
-export const access_country_rule_output: JsonSchema = {
+export const access_country_rule: JsonSchema = {
   "properties": {
     "geo": {
       "properties": {
@@ -329,28 +338,15 @@ export const access_country_rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_decision` in responses.
- */
-export const access_decision_output: JsonSchema = {
-  "enum": [
-    "allow",
-    "deny",
-    "non_identity",
-    "bypass"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_device_posture_rule` in responses.
  */
-export const access_device_posture_rule_output: JsonSchema = {
+export const access_device_posture_rule: JsonSchema = {
   "properties": {
     "device_posture": {
       "properties": {
         "account_id": {
-          "$ref": "#/$defs/access_identifier"
+          "type": "string"
         },
         "integration_uid": {
           "type": "string"
@@ -371,7 +367,7 @@ export const access_device_posture_rule_output: JsonSchema = {
 /**
  * The schema of `access_domain_rule` in responses.
  */
-export const access_domain_rule_output: JsonSchema = {
+export const access_domain_rule: JsonSchema = {
   "properties": {
     "email_domain": {
       "properties": {
@@ -391,17 +387,10 @@ export const access_domain_rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_email-2` in responses.
- */
-export const access_email_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_email_list_rule` in responses.
  */
-export const access_email_list_rule_output: JsonSchema = {
+export const access_email_list_rule: JsonSchema = {
   "properties": {
     "email_list": {
       "properties": {
@@ -424,7 +413,7 @@ export const access_email_list_rule_output: JsonSchema = {
 /**
  * The schema of `access_email_rule` in responses.
  */
-export const access_email_rule_output: JsonSchema = {
+export const access_email_rule: JsonSchema = {
   "properties": {
     "email": {
       "properties": {
@@ -447,7 +436,7 @@ export const access_email_rule_output: JsonSchema = {
 /**
  * The schema of `access_everyone_rule` in responses.
  */
-export const access_everyone_rule_output: JsonSchema = {
+export const access_everyone_rule: JsonSchema = {
   "properties": {
     "everyone": {
       "type": "object"
@@ -462,7 +451,7 @@ export const access_everyone_rule_output: JsonSchema = {
 /**
  * The schema of `access_exclude-2` in responses.
  */
-export const access_exclude_2_output: JsonSchema = {
+export const access_exclude$$2: JsonSchema = {
   "items": {
     "$ref": "#/$defs/access_rule"
   },
@@ -472,7 +461,7 @@ export const access_exclude_2_output: JsonSchema = {
 /**
  * The schema of `access_external_evaluation_rule` in responses.
  */
-export const access_external_evaluation_rule_output: JsonSchema = {
+export const access_external_evaluation_rule: JsonSchema = {
   "properties": {
     "external_evaluation": {
       "properties": {
@@ -499,7 +488,7 @@ export const access_external_evaluation_rule_output: JsonSchema = {
 /**
  * The schema of `access_github_organization_rule` in responses.
  */
-export const access_github_organization_rule_output: JsonSchema = {
+export const access_github_organization_rule: JsonSchema = {
   "properties": {
     "github-organization": {
       "properties": {
@@ -529,7 +518,7 @@ export const access_github_organization_rule_output: JsonSchema = {
 /**
  * The schema of `access_gsuite_group_rule` in responses.
  */
-export const access_gsuite_group_rule_output: JsonSchema = {
+export const access_gsuite_group_rule: JsonSchema = {
   "properties": {
     "gsuite": {
       "properties": {
@@ -556,7 +545,7 @@ export const access_gsuite_group_rule_output: JsonSchema = {
 /**
  * The schema of `access_id_response-3` in responses.
  */
-export const access_id_response_3_output: JsonSchema = {
+export const access_id_response$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-common"
@@ -566,7 +555,7 @@ export const access_id_response_3_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/access_uuid"
+              "type": "string"
             }
           },
           "type": "object"
@@ -580,7 +569,7 @@ export const access_id_response_3_output: JsonSchema = {
 /**
  * The schema of `access_include-2` in responses.
  */
-export const access_include_2_output: JsonSchema = {
+export const access_include$$2: JsonSchema = {
   "items": {
     "$ref": "#/$defs/access_rule"
   },
@@ -590,7 +579,7 @@ export const access_include_2_output: JsonSchema = {
 /**
  * The schema of `access_ip_list_rule` in responses.
  */
-export const access_ip_list_rule_output: JsonSchema = {
+export const access_ip_list_rule: JsonSchema = {
   "properties": {
     "ip_list": {
       "properties": {
@@ -613,7 +602,7 @@ export const access_ip_list_rule_output: JsonSchema = {
 /**
  * The schema of `access_ip_rule` in responses.
  */
-export const access_ip_rule_output: JsonSchema = {
+export const access_ip_rule: JsonSchema = {
   "properties": {
     "ip": {
       "properties": {
@@ -633,17 +622,10 @@ export const access_ip_rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_isolation_required` in responses.
- */
-export const access_isolation_required_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_linked_app_token_rule` in responses.
  */
-export const access_linked_app_token_rule_output: JsonSchema = {
+export const access_linked_app_token_rule: JsonSchema = {
   "properties": {
     "linked_app_token": {
       "properties": {
@@ -666,7 +648,7 @@ export const access_linked_app_token_rule_output: JsonSchema = {
 /**
  * The schema of `access_login_method_rule` in responses.
  */
-export const access_login_method_rule_output: JsonSchema = {
+export const access_login_method_rule: JsonSchema = {
   "properties": {
     "login_method": {
       "properties": {
@@ -689,7 +671,7 @@ export const access_login_method_rule_output: JsonSchema = {
 /**
  * The schema of `access_mfa_config` in responses.
  */
-export const access_mfa_config_output: JsonSchema = {
+export const access_mfa_config: JsonSchema = {
   "properties": {
     "allowed_authenticators": {
       "items": {
@@ -712,24 +694,10 @@ export const access_mfa_config_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_name-10` in responses.
- */
-export const access_name_10_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_name-9` in responses.
- */
-export const access_name_9_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_oidc_claim_rule` in responses.
  */
-export const access_oidc_claim_rule_output: JsonSchema = {
+export const access_oidc_claim_rule: JsonSchema = {
   "properties": {
     "oidc": {
       "properties": {
@@ -760,7 +728,7 @@ export const access_oidc_claim_rule_output: JsonSchema = {
 /**
  * The schema of `access_okta_group_rule` in responses.
  */
-export const access_okta_group_rule_output: JsonSchema = {
+export const access_okta_group_rule: JsonSchema = {
   "properties": {
     "okta": {
       "properties": {
@@ -784,17 +752,10 @@ export const access_okta_group_rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_policy_resolution_account_id` in responses.
- */
-export const access_policy_resolution_account_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_policy_resp` in responses.
  */
-export const access_policy_resp_output: JsonSchema = {
+export const access_policy_resp: JsonSchema = {
   "allOf": [
     {
       "properties": {
@@ -802,25 +763,32 @@ export const access_policy_resp_output: JsonSchema = {
           "$ref": "#/$defs/access_approval_groups"
         },
         "approval_required": {
-          "$ref": "#/$defs/access_approval_required"
+          "type": "boolean"
         },
         "connection_rules": {
           "$ref": "#/$defs/access_connection_rules"
         },
         "isolation_required": {
-          "$ref": "#/$defs/access_isolation_required"
+          "type": "boolean"
         },
         "mfa_config": {
           "$ref": "#/$defs/access_mfa_config"
         },
         "purpose_justification_prompt": {
-          "$ref": "#/$defs/access_purpose_justification_prompt"
+          "type": "string"
         },
         "purpose_justification_required": {
-          "$ref": "#/$defs/access_purpose_justification_required"
+          "type": "boolean"
         },
         "session_duration": {
-          "$ref": "#/$defs/access_session_duration-3"
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
       "type": "object"
@@ -831,35 +799,10 @@ export const access_policy_resp_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_purpose_justification_prompt` in responses.
- */
-export const access_purpose_justification_prompt_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_purpose_justification_required` in responses.
- */
-export const access_purpose_justification_required_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_rdp_clipboard_format` in responses.
- */
-export const access_rdp_clipboard_format_output: JsonSchema = {
-  "enum": [
-    "text",
-    "file"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_require-2` in responses.
  */
-export const access_require_2_output: JsonSchema = {
+export const access_require$$2: JsonSchema = {
   "items": {
     "$ref": "#/$defs/access_rule"
   },
@@ -869,7 +812,7 @@ export const access_require_2_output: JsonSchema = {
 /**
  * The schema of `access_rule` in responses.
  */
-export const access_rule_output: JsonSchema = {
+export const access_rule: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/access_access_group_rule"
@@ -958,7 +901,7 @@ export const access_rule_output: JsonSchema = {
 /**
  * The schema of `access_saml_group_rule` in responses.
  */
-export const access_saml_group_rule_output: JsonSchema = {
+export const access_saml_group_rule: JsonSchema = {
   "properties": {
     "saml": {
       "properties": {
@@ -989,7 +932,7 @@ export const access_saml_group_rule_output: JsonSchema = {
 /**
  * The schema of `access_service_token_rule` in responses.
  */
-export const access_service_token_rule_output: JsonSchema = {
+export const access_service_token_rule: JsonSchema = {
   "properties": {
     "service_token": {
       "properties": {
@@ -1012,7 +955,7 @@ export const access_service_token_rule_output: JsonSchema = {
 /**
  * The schema of `access_service_token_tag_rule` in responses.
  */
-export const access_service_token_tag_rule_output: JsonSchema = {
+export const access_service_token_tag_rule: JsonSchema = {
   "properties": {
     "service_token_tag": {
       "properties": {
@@ -1036,24 +979,10 @@ export const access_service_token_tag_rule_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_session_duration-3` in responses.
- */
-export const access_session_duration_3_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `access_user_risk_score_rule` in responses.
  */
-export const access_user_risk_score_rule_output: JsonSchema = {
+export const access_user_risk_score_rule: JsonSchema = {
   "properties": {
     "user_risk_score": {
       "properties": {
@@ -1082,10 +1011,3 @@ export const access_user_risk_score_rule_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `access_uuid-2` in responses.
- */
-export const access_uuid_2_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/policies/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/policies/outputs.ts
index 9e0356d3b..70325d9b3 100644
--- a/src/generated/forge-mcp/zeroTrust/access/policies/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/policies/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_app_count` in responses.
- */
-export const access_app_count_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `access_id_response-4` in responses.
  */
-export const access_id_response_4_output: JsonSchema = {
+export const access_id_response$$4: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -23,7 +16,7 @@ export const access_id_response_4_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/access_uuid-2"
+              "type": "string"
             }
           },
           "type": "object"
@@ -37,7 +30,7 @@ export const access_id_response_4_output: JsonSchema = {
 /**
  * The schema of `access_response_collection-10` in responses.
  */
-export const access_response_collection_10_output: JsonSchema = {
+export const access_response_collection$$10: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -59,7 +52,7 @@ export const access_response_collection_10_output: JsonSchema = {
 /**
  * The schema of `access_reusable_policy_resp` in responses.
  */
-export const access_reusable_policy_resp_output: JsonSchema = {
+export const access_reusable_policy_resp: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_policy_resp"
@@ -67,10 +60,10 @@ export const access_reusable_policy_resp_output: JsonSchema = {
     {
       "properties": {
         "account_id": {
-          "$ref": "#/$defs/access_identifier"
+          "type": "string"
         },
         "app_count": {
-          "$ref": "#/$defs/access_app_count"
+          "type": "integer"
         },
         "reusable": {
           "enum": [
@@ -87,7 +80,7 @@ export const access_reusable_policy_resp_output: JsonSchema = {
 /**
  * The schema of `access_single_response-11` in responses.
  */
-export const access_single_response_11_output: JsonSchema = {
+export const access_single_response$$11: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/policies/tools.ts b/src/generated/forge-mcp/zeroTrust/access/policies/tools.ts
index af67b94f9..d6046ef2d 100644
--- a/src/generated/forge-mcp/zeroTrust/access/policies/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/policies/tools.ts
@@ -1,69 +1,14 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_identifier_output,
-  access_messages_output,
-  access_timestamp_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier } from "../../schemas.js";
-import {
-  access_access_group_rule_output,
-  access_allowed_clipboard_local_to_remote_formats_output,
-  access_allowed_clipboard_remote_to_local_formats_output,
-  access_any_valid_service_token_rule_output,
-  access_approval_group_output,
-  access_approval_groups_output,
-  access_approval_required_output,
-  access_auth_context_rule_output,
-  access_authentication_method_rule_output,
-  access_azure_group_rule_output,
-  access_base_policy_resp_output,
-  access_certificate_rule_output,
-  access_cloudflare_account_member_rule_output,
-  access_common_name_rule_output,
-  access_connection_rules_output,
-  access_connection_rules_rdp_output,
-  access_country_rule_output,
-  access_decision_output,
-  access_device_posture_rule_output,
-  access_domain_rule_output,
-  access_email_list_rule_output,
-  access_email_rule_output,
-  access_everyone_rule_output,
-  access_exclude_2_output,
-  access_external_evaluation_rule_output,
-  access_github_organization_rule_output,
-  access_gsuite_group_rule_output,
-  access_include_2_output,
-  access_ip_list_rule_output,
-  access_ip_rule_output,
-  access_isolation_required_output,
-  access_linked_app_token_rule_output,
-  access_login_method_rule_output,
-  access_mfa_config_output,
-  access_name_9_output,
-  access_oidc_claim_rule_output,
-  access_okta_group_rule_output,
-  access_policy_resolution_account_id_output,
-  access_policy_resp_output,
-  access_purpose_justification_prompt_output,
-  access_purpose_justification_required_output,
-  access_rdp_clipboard_format_output,
-  access_require_2_output,
-  access_rule_output,
-  access_saml_group_rule_output,
-  access_service_token_rule_output,
-  access_service_token_tag_rule_output,
-  access_session_duration_3_output,
-  access_user_risk_score_rule_output,
-  access_uuid_2_output,
-} from "../outputs.js";
 import {
   access_access_group_rule,
   access_allowed_clipboard_local_to_remote_formats,
@@ -71,197 +16,215 @@ import {
   access_any_valid_service_token_rule,
   access_approval_group,
   access_approval_groups,
-  access_approval_required,
   access_auth_context_rule,
   access_authentication_method_rule,
   access_azure_group_rule,
-  access_base_policy_req,
+  access_base_policy_resp,
   access_certificate_rule,
   access_cloudflare_account_member_rule,
   access_common_name_rule,
   access_connection_rules,
   access_connection_rules_rdp,
   access_country_rule,
-  access_decision,
   access_device_posture_rule,
   access_domain_rule,
   access_email_list_rule,
   access_email_rule,
   access_everyone_rule,
-  access_exclude_2,
+  access_exclude$$2,
   access_external_evaluation_rule,
   access_github_organization_rule,
   access_gsuite_group_rule,
-  access_include_2,
+  access_include$$2,
   access_ip_list_rule,
   access_ip_rule,
-  access_isolation_required,
   access_linked_app_token_rule,
   access_login_method_rule,
   access_mfa_config,
-  access_name_9,
   access_oidc_claim_rule,
   access_okta_group_rule,
-  access_policy_req,
-  access_policy_resolution_account_id,
-  access_purpose_justification_prompt,
-  access_purpose_justification_required,
-  access_rdp_clipboard_format,
-  access_require_2,
+  access_policy_resp,
+  access_require$$2,
   access_rule,
   access_saml_group_rule,
   access_service_token_rule,
   access_service_token_tag_rule,
-  access_session_duration_3,
   access_user_risk_score_rule,
-  access_uuid_2,
+} from "../outputs.js";
+import {
+  access_access_group_rule as access_access_group_rule$,
+  access_allowed_clipboard_local_to_remote_formats as access_allowed_clipboard_local_to_remote_formats$,
+  access_allowed_clipboard_remote_to_local_formats as access_allowed_clipboard_remote_to_local_formats$,
+  access_any_valid_service_token_rule as access_any_valid_service_token_rule$,
+  access_approval_group as access_approval_group$,
+  access_approval_groups as access_approval_groups$,
+  access_auth_context_rule as access_auth_context_rule$,
+  access_authentication_method_rule as access_authentication_method_rule$,
+  access_azure_group_rule as access_azure_group_rule$,
+  access_base_policy_req,
+  access_certificate_rule as access_certificate_rule$,
+  access_cloudflare_account_member_rule as access_cloudflare_account_member_rule$,
+  access_common_name_rule as access_common_name_rule$,
+  access_connection_rules as access_connection_rules$,
+  access_connection_rules_rdp as access_connection_rules_rdp$,
+  access_country_rule as access_country_rule$,
+  access_device_posture_rule as access_device_posture_rule$,
+  access_domain_rule as access_domain_rule$,
+  access_email_list_rule as access_email_list_rule$,
+  access_email_rule as access_email_rule$,
+  access_everyone_rule as access_everyone_rule$,
+  access_exclude$$2 as access_exclude$$2$,
+  access_external_evaluation_rule as access_external_evaluation_rule$,
+  access_github_organization_rule as access_github_organization_rule$,
+  access_gsuite_group_rule as access_gsuite_group_rule$,
+  access_include$$2 as access_include$$2$,
+  access_ip_list_rule as access_ip_list_rule$,
+  access_ip_rule as access_ip_rule$,
+  access_linked_app_token_rule as access_linked_app_token_rule$,
+  access_login_method_rule as access_login_method_rule$,
+  access_mfa_config as access_mfa_config$,
+  access_oidc_claim_rule as access_oidc_claim_rule$,
+  access_okta_group_rule as access_okta_group_rule$,
+  access_policy_req,
+  access_require$$2 as access_require$$2$,
+  access_rule as access_rule$,
+  access_saml_group_rule as access_saml_group_rule$,
+  access_service_token_rule as access_service_token_rule$,
+  access_service_token_tag_rule as access_service_token_tag_rule$,
+  access_user_risk_score_rule as access_user_risk_score_rule$,
 } from "../schemas.js";
 import {
-  access_app_count_output,
-  access_id_response_4_output,
-  access_response_collection_10_output,
-  access_reusable_policy_resp_output,
-  access_single_response_11_output,
+  access_id_response$$4,
+  access_response_collection$$10,
+  access_reusable_policy_resp,
+  access_single_response$$11,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.policies`.
+ * The tools of `zeroTrust.access.policies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_policies_create",
+    name: "zeroTrust_access_policies_create",
     title: "Create an Access reusable policy",
-    description: "Creates a new Access reusable policy.",
+    description: "Creates a new Access reusable policy.\n\nPOST /accounts/{account_id}/access/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_policy_req"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "access_access_group_rule": access_access_group_rule$,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats$,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats$,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule$,
+        "access_approval_group": access_approval_group$,
+        "access_approval_groups": access_approval_groups$,
+        "access_auth_context_rule": access_auth_context_rule$,
+        "access_authentication_method_rule": access_authentication_method_rule$,
+        "access_azure_group_rule": access_azure_group_rule$,
+        "access_base_policy_req": access_base_policy_req,
+        "access_certificate_rule": access_certificate_rule$,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule$,
+        "access_common_name_rule": access_common_name_rule$,
+        "access_connection_rules": access_connection_rules$,
+        "access_connection_rules_rdp": access_connection_rules_rdp$,
+        "access_country_rule": access_country_rule$,
+        "access_device_posture_rule": access_device_posture_rule$,
+        "access_domain_rule": access_domain_rule$,
+        "access_email_list_rule": access_email_list_rule$,
+        "access_email_rule": access_email_rule$,
+        "access_everyone_rule": access_everyone_rule$,
+        "access_exclude-2": access_exclude$$2$,
+        "access_external_evaluation_rule": access_external_evaluation_rule$,
+        "access_github_organization_rule": access_github_organization_rule$,
+        "access_gsuite_group_rule": access_gsuite_group_rule$,
+        "access_include-2": access_include$$2$,
+        "access_ip_list_rule": access_ip_list_rule$,
+        "access_ip_rule": access_ip_rule$,
+        "access_linked_app_token_rule": access_linked_app_token_rule$,
+        "access_login_method_rule": access_login_method_rule$,
+        "access_mfa_config": access_mfa_config$,
+        "access_oidc_claim_rule": access_oidc_claim_rule$,
+        "access_okta_group_rule": access_okta_group_rule$,
+        "access_policy_req": access_policy_req,
+        "access_require-2": access_require$$2$,
+        "access_rule": access_rule$,
+        "access_saml_group_rule": access_saml_group_rule$,
+        "access_service_token_rule": access_service_token_rule$,
+        "access_service_token_tag_rule": access_service_token_tag_rule$,
+        "access_user_risk_score_rule": access_user_risk_score_rule$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/access_single_response-11",
       $defs: {
         "access_access_group_rule": access_access_group_rule,
         "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
         "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
         "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-single": access_api$$response$$single,
         "access_approval_group": access_approval_group,
         "access_approval_groups": access_approval_groups,
-        "access_approval_required": access_approval_required,
         "access_auth_context_rule": access_auth_context_rule,
         "access_authentication_method_rule": access_authentication_method_rule,
         "access_azure_group_rule": access_azure_group_rule,
-        "access_base_policy_req": access_base_policy_req,
+        "access_base_policy_resp": access_base_policy_resp,
         "access_certificate_rule": access_certificate_rule,
         "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
         "access_common_name_rule": access_common_name_rule,
         "access_connection_rules": access_connection_rules,
         "access_connection_rules_rdp": access_connection_rules_rdp,
         "access_country_rule": access_country_rule,
-        "access_decision": access_decision,
         "access_device_posture_rule": access_device_posture_rule,
         "access_domain_rule": access_domain_rule,
         "access_email_list_rule": access_email_list_rule,
         "access_email_rule": access_email_rule,
         "access_everyone_rule": access_everyone_rule,
-        "access_exclude-2": access_exclude_2,
+        "access_exclude-2": access_exclude$$2,
         "access_external_evaluation_rule": access_external_evaluation_rule,
         "access_github_organization_rule": access_github_organization_rule,
         "access_gsuite_group_rule": access_gsuite_group_rule,
-        "access_identifier": access_identifier,
-        "access_include-2": access_include_2,
+        "access_include-2": access_include$$2,
         "access_ip_list_rule": access_ip_list_rule,
         "access_ip_rule": access_ip_rule,
-        "access_isolation_required": access_isolation_required,
         "access_linked_app_token_rule": access_linked_app_token_rule,
         "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
         "access_mfa_config": access_mfa_config,
-        "access_name-9": access_name_9,
         "access_oidc_claim_rule": access_oidc_claim_rule,
         "access_okta_group_rule": access_okta_group_rule,
-        "access_policy_req": access_policy_req,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt,
-        "access_purpose_justification_required": access_purpose_justification_required,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format,
-        "access_require-2": access_require_2,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_reusable_policy_resp": access_reusable_policy_resp,
         "access_rule": access_rule,
         "access_saml_group_rule": access_saml_group_rule,
         "access_service_token_rule": access_service_token_rule,
         "access_service_token_tag_rule": access_service_token_tag_rule,
-        "access_session_duration-3": access_session_duration_3,
+        "access_single_response-11": access_single_response$$11,
         "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
-    outputSchema: {
-      "$ref": "#/$defs/access_single_response-11",
-      $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count": access_app_count_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_reusable_policy_resp": access_reusable_policy_resp_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-11": access_single_response_11_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid-2": access_uuid_2_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -286,64 +249,51 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count": access_app_count_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_reusable_policy_resp": access_reusable_policy_resp_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-11": access_single_response_11_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_reusable_policy_resp": access_reusable_policy_resp,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-11": access_single_response$$11,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     request: (args) => ({
@@ -352,37 +302,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_policies_delete",
+    name: "zeroTrust_access_policies_delete",
     title: "Delete an Access reusable policy",
-    description: "Deletes an Access reusable policy.",
+    description: "Deletes an Access reusable policy.\n\nDELETE /accounts/{account_id}/access/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/access_uuid-2",
-          "description": "The UUID of the policy"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The UUID of the policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid-2": access_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response-4",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response-4": access_id_response_4_output,
-        "access_messages": access_messages_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response-4": access_id_response$$4,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -409,11 +364,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response-4": access_id_response_4_output,
-        "access_messages": access_messages_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response-4": access_id_response$$4,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -421,90 +375,83 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_policies_get",
+    name: "zeroTrust_access_policies_get",
     title: "Get an Access reusable policy",
-    description: "Fetches a single Access reusable policy.",
+    description: "Fetches a single Access reusable policy.\n\nGET /accounts/{account_id}/access/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "policy_id": {
-          "$ref": "#/$defs/access_uuid-2",
-          "description": "The UUID of the policy"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The UUID of the policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid-2": access_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-11",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count": access_app_count_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_reusable_policy_resp": access_reusable_policy_resp_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-11": access_single_response_11_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-single": access_api$$response$$single,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_reusable_policy_resp": access_reusable_policy_resp,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-11": access_single_response$$11,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     annotations: {
@@ -532,64 +479,51 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count": access_app_count_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_reusable_policy_resp": access_reusable_policy_resp_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-11": access_single_response_11_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_reusable_policy_resp": access_reusable_policy_resp,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-11": access_single_response$$11,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     request: (args) => ({
@@ -597,95 +531,95 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_policies_list",
+    name: "zeroTrust_access_policies_list",
     title: "List Access reusable policies",
-    description: "Lists Access reusable policies.",
+    description: "Lists Access reusable policies.\n\nGET /accounts/{account_id}/access/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 100,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-10",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_app_count": access_app_count_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_response_collection-10": access_response_collection_10_output,
-        "access_reusable_policy_resp": access_reusable_policy_resp_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_response_collection-10": access_response_collection$$10,
+        "access_reusable_policy_resp": access_reusable_policy_resp,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     annotations: {
@@ -713,213 +647,186 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_app_count": access_app_count_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_response_collection-10": access_response_collection_10_output,
-        "access_reusable_policy_resp": access_reusable_policy_resp_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_response_collection-10": access_response_collection$$10,
+        "access_reusable_policy_resp": access_reusable_policy_resp,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/policies`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_policies_update",
+    name: "zeroTrust_access_policies_update",
     title: "Update an Access reusable policy",
-    description: "Updates a Access reusable policy.",
+    description: "Updates a Access reusable policy.\n\nPUT /accounts/{account_id}/access/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_policy_req"
         },
-        "policy_id": {
-          "$ref": "#/$defs/access_uuid-2",
-          "description": "The UUID of the policy"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The UUID of the policy",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "access_access_group_rule": access_access_group_rule$,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats$,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats$,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule$,
+        "access_approval_group": access_approval_group$,
+        "access_approval_groups": access_approval_groups$,
+        "access_auth_context_rule": access_auth_context_rule$,
+        "access_authentication_method_rule": access_authentication_method_rule$,
+        "access_azure_group_rule": access_azure_group_rule$,
+        "access_base_policy_req": access_base_policy_req,
+        "access_certificate_rule": access_certificate_rule$,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule$,
+        "access_common_name_rule": access_common_name_rule$,
+        "access_connection_rules": access_connection_rules$,
+        "access_connection_rules_rdp": access_connection_rules_rdp$,
+        "access_country_rule": access_country_rule$,
+        "access_device_posture_rule": access_device_posture_rule$,
+        "access_domain_rule": access_domain_rule$,
+        "access_email_list_rule": access_email_list_rule$,
+        "access_email_rule": access_email_rule$,
+        "access_everyone_rule": access_everyone_rule$,
+        "access_exclude-2": access_exclude$$2$,
+        "access_external_evaluation_rule": access_external_evaluation_rule$,
+        "access_github_organization_rule": access_github_organization_rule$,
+        "access_gsuite_group_rule": access_gsuite_group_rule$,
+        "access_include-2": access_include$$2$,
+        "access_ip_list_rule": access_ip_list_rule$,
+        "access_ip_rule": access_ip_rule$,
+        "access_linked_app_token_rule": access_linked_app_token_rule$,
+        "access_login_method_rule": access_login_method_rule$,
+        "access_mfa_config": access_mfa_config$,
+        "access_oidc_claim_rule": access_oidc_claim_rule$,
+        "access_okta_group_rule": access_okta_group_rule$,
+        "access_policy_req": access_policy_req,
+        "access_require-2": access_require$$2$,
+        "access_rule": access_rule$,
+        "access_saml_group_rule": access_saml_group_rule$,
+        "access_service_token_rule": access_service_token_rule$,
+        "access_service_token_tag_rule": access_service_token_tag_rule$,
+        "access_user_risk_score_rule": access_user_risk_score_rule$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/access_single_response-11",
       $defs: {
         "access_access_group_rule": access_access_group_rule,
         "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
         "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
         "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-single": access_api$$response$$single,
         "access_approval_group": access_approval_group,
         "access_approval_groups": access_approval_groups,
-        "access_approval_required": access_approval_required,
         "access_auth_context_rule": access_auth_context_rule,
         "access_authentication_method_rule": access_authentication_method_rule,
         "access_azure_group_rule": access_azure_group_rule,
-        "access_base_policy_req": access_base_policy_req,
+        "access_base_policy_resp": access_base_policy_resp,
         "access_certificate_rule": access_certificate_rule,
         "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
         "access_common_name_rule": access_common_name_rule,
         "access_connection_rules": access_connection_rules,
         "access_connection_rules_rdp": access_connection_rules_rdp,
         "access_country_rule": access_country_rule,
-        "access_decision": access_decision,
         "access_device_posture_rule": access_device_posture_rule,
         "access_domain_rule": access_domain_rule,
         "access_email_list_rule": access_email_list_rule,
         "access_email_rule": access_email_rule,
         "access_everyone_rule": access_everyone_rule,
-        "access_exclude-2": access_exclude_2,
+        "access_exclude-2": access_exclude$$2,
         "access_external_evaluation_rule": access_external_evaluation_rule,
         "access_github_organization_rule": access_github_organization_rule,
         "access_gsuite_group_rule": access_gsuite_group_rule,
-        "access_identifier": access_identifier,
-        "access_include-2": access_include_2,
+        "access_include-2": access_include$$2,
         "access_ip_list_rule": access_ip_list_rule,
         "access_ip_rule": access_ip_rule,
-        "access_isolation_required": access_isolation_required,
         "access_linked_app_token_rule": access_linked_app_token_rule,
         "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
         "access_mfa_config": access_mfa_config,
-        "access_name-9": access_name_9,
         "access_oidc_claim_rule": access_oidc_claim_rule,
         "access_okta_group_rule": access_okta_group_rule,
-        "access_policy_req": access_policy_req,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt,
-        "access_purpose_justification_required": access_purpose_justification_required,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format,
-        "access_require-2": access_require_2,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_reusable_policy_resp": access_reusable_policy_resp,
         "access_rule": access_rule,
         "access_saml_group_rule": access_saml_group_rule,
         "access_service_token_rule": access_service_token_rule,
         "access_service_token_tag_rule": access_service_token_tag_rule,
-        "access_session_duration-3": access_session_duration_3,
+        "access_single_response-11": access_single_response$$11,
         "access_user_risk_score_rule": access_user_risk_score_rule,
-        "access_uuid-2": access_uuid_2,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/access_single_response-11",
-      $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count": access_app_count_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_reusable_policy_resp": access_reusable_policy_resp_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-11": access_single_response_11_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid-2": access_uuid_2_output,
       },
     },
     annotations: {
@@ -946,64 +853,51 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats_output,
-        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_app_count": access_app_count_output,
-        "access_approval_group": access_approval_group_output,
-        "access_approval_groups": access_approval_groups_output,
-        "access_approval_required": access_approval_required_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_base_policy_resp": access_base_policy_resp_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_connection_rules": access_connection_rules_output,
-        "access_connection_rules_rdp": access_connection_rules_rdp_output,
-        "access_country_rule": access_country_rule_output,
-        "access_decision": access_decision_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude-2": access_exclude_2_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include-2": access_include_2_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_isolation_required": access_isolation_required_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_mfa_config": access_mfa_config_output,
-        "access_name-9": access_name_9_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_policy_resolution_account_id": access_policy_resolution_account_id_output,
-        "access_policy_resp": access_policy_resp_output,
-        "access_purpose_justification_prompt": access_purpose_justification_prompt_output,
-        "access_purpose_justification_required": access_purpose_justification_required_output,
-        "access_rdp_clipboard_format": access_rdp_clipboard_format_output,
-        "access_require-2": access_require_2_output,
-        "access_reusable_policy_resp": access_reusable_policy_resp_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_session_duration-3": access_session_duration_3_output,
-        "access_single_response-11": access_single_response_11_output,
-        "access_timestamp": access_timestamp_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid-2": access_uuid_2_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_allowed_clipboard_local_to_remote_formats": access_allowed_clipboard_local_to_remote_formats,
+        "access_allowed_clipboard_remote_to_local_formats": access_allowed_clipboard_remote_to_local_formats,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_approval_group": access_approval_group,
+        "access_approval_groups": access_approval_groups,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_base_policy_resp": access_base_policy_resp,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_connection_rules": access_connection_rules,
+        "access_connection_rules_rdp": access_connection_rules_rdp,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude-2": access_exclude$$2,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include-2": access_include$$2,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_mfa_config": access_mfa_config,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_policy_resp": access_policy_resp,
+        "access_require-2": access_require$$2,
+        "access_reusable_policy_resp": access_reusable_policy_resp,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-11": access_single_response$$11,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/ruleGroups/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/ruleGroups/outputs.ts
index 3ace7357d..9b4c12e11 100644
--- a/src/generated/forge-mcp/zeroTrust/access/ruleGroups/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/ruleGroups/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `access_exclude` in responses.
  */
-export const access_exclude_output: JsonSchema = {
+export const access_exclude: JsonSchema = {
   "items": {
     "$ref": "#/$defs/access_rule"
   },
@@ -16,16 +16,24 @@ export const access_exclude_output: JsonSchema = {
 /**
  * The schema of `access_groups-2` in responses.
  */
-export const access_groups_2_output: JsonSchema = {
+export const access_groups$$2: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "exclude": {
       "$ref": "#/$defs/access_exclude"
     },
     "id": {
-      "$ref": "#/$defs/access_uuid"
+      "type": "string"
     },
     "include": {
       "$ref": "#/$defs/access_include"
@@ -34,13 +42,21 @@ export const access_groups_2_output: JsonSchema = {
       "$ref": "#/$defs/access_require"
     },
     "name": {
-      "$ref": "#/$defs/access_name-6"
+      "type": "string"
     },
     "require": {
       "$ref": "#/$defs/access_require"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
@@ -49,24 +65,17 @@ export const access_groups_2_output: JsonSchema = {
 /**
  * The schema of `access_include` in responses.
  */
-export const access_include_output: JsonSchema = {
+export const access_include: JsonSchema = {
   "items": {
     "$ref": "#/$defs/access_rule"
   },
   "type": "array"
 };
 
-/**
- * The schema of `access_name-6` in responses.
- */
-export const access_name_6_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_require` in responses.
  */
-export const access_require_output: JsonSchema = {
+export const access_require: JsonSchema = {
   "items": {
     "$ref": "#/$defs/access_rule"
   },
@@ -76,7 +85,7 @@ export const access_require_output: JsonSchema = {
 /**
  * The schema of `access_response_collection-2` in responses.
  */
-export const access_response_collection_2_output: JsonSchema = {
+export const access_response_collection$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -98,7 +107,7 @@ export const access_response_collection_2_output: JsonSchema = {
 /**
  * The schema of `access_single_response-4` in responses.
  */
-export const access_single_response_4_output: JsonSchema = {
+export const access_single_response$$4: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/ruleGroups/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/ruleGroups/schemas.ts
index c4220e1be..f2c63b6f8 100644
--- a/src/generated/forge-mcp/zeroTrust/access/ruleGroups/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/ruleGroups/schemas.ts
@@ -25,22 +25,6 @@ export const access_include: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_is_default`.
- */
-export const access_is_default: JsonSchema = {
-  "description": "Whether this is the default group",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_name-6`.
- */
-export const access_name_6: JsonSchema = {
-  "description": "The name of the Access group.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_require`.
  */
diff --git a/src/generated/forge-mcp/zeroTrust/access/ruleGroups/tools.ts b/src/generated/forge-mcp/zeroTrust/access/ruleGroups/tools.ts
index da3fb7693..d54b1b975 100644
--- a/src/generated/forge-mcp/zeroTrust/access/ruleGroups/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/ruleGroups/tools.ts
@@ -1,51 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_created_at_output,
-  access_id_response_output,
-  access_identifier_output,
-  access_messages_output,
-  access_timestamp_output,
-  access_updated_at_output,
-  access_uuid_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_id_response,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier, access_uuid } from "../../schemas.js";
-import {
-  access_access_group_rule_output,
-  access_any_valid_service_token_rule_output,
-  access_auth_context_rule_output,
-  access_authentication_method_rule_output,
-  access_azure_group_rule_output,
-  access_certificate_rule_output,
-  access_cloudflare_account_member_rule_output,
-  access_common_name_rule_output,
-  access_country_rule_output,
-  access_device_posture_rule_output,
-  access_domain_rule_output,
-  access_email_list_rule_output,
-  access_email_rule_output,
-  access_everyone_rule_output,
-  access_external_evaluation_rule_output,
-  access_github_organization_rule_output,
-  access_gsuite_group_rule_output,
-  access_ip_list_rule_output,
-  access_ip_rule_output,
-  access_linked_app_token_rule_output,
-  access_login_method_rule_output,
-  access_oidc_claim_rule_output,
-  access_okta_group_rule_output,
-  access_rule_output,
-  access_saml_group_rule_output,
-  access_service_token_rule_output,
-  access_service_token_tag_rule_output,
-  access_user_risk_score_rule_output,
-} from "../outputs.js";
 import {
   access_access_group_rule,
   access_any_valid_service_token_rule,
@@ -75,47 +39,62 @@ import {
   access_service_token_rule,
   access_service_token_tag_rule,
   access_user_risk_score_rule,
-} from "../schemas.js";
+} from "../outputs.js";
 import {
-  access_exclude_output,
-  access_groups_2_output,
-  access_include_output,
-  access_name_6_output,
-  access_require_output,
-  access_response_collection_2_output,
-  access_single_response_4_output,
-} from "./outputs.js";
+  access_access_group_rule as access_access_group_rule$,
+  access_any_valid_service_token_rule as access_any_valid_service_token_rule$,
+  access_auth_context_rule as access_auth_context_rule$,
+  access_authentication_method_rule as access_authentication_method_rule$,
+  access_azure_group_rule as access_azure_group_rule$,
+  access_certificate_rule as access_certificate_rule$,
+  access_cloudflare_account_member_rule as access_cloudflare_account_member_rule$,
+  access_common_name_rule as access_common_name_rule$,
+  access_country_rule as access_country_rule$,
+  access_device_posture_rule as access_device_posture_rule$,
+  access_domain_rule as access_domain_rule$,
+  access_email_list_rule as access_email_list_rule$,
+  access_email_rule as access_email_rule$,
+  access_everyone_rule as access_everyone_rule$,
+  access_external_evaluation_rule as access_external_evaluation_rule$,
+  access_github_organization_rule as access_github_organization_rule$,
+  access_gsuite_group_rule as access_gsuite_group_rule$,
+  access_ip_list_rule as access_ip_list_rule$,
+  access_ip_rule as access_ip_rule$,
+  access_linked_app_token_rule as access_linked_app_token_rule$,
+  access_login_method_rule as access_login_method_rule$,
+  access_oidc_claim_rule as access_oidc_claim_rule$,
+  access_okta_group_rule as access_okta_group_rule$,
+  access_rule as access_rule$,
+  access_saml_group_rule as access_saml_group_rule$,
+  access_service_token_rule as access_service_token_rule$,
+  access_service_token_tag_rule as access_service_token_tag_rule$,
+  access_user_risk_score_rule as access_user_risk_score_rule$,
+} from "../schemas.js";
 import {
   access_exclude,
+  access_groups$$2,
   access_include,
-  access_is_default,
-  access_name_6,
   access_require,
+  access_response_collection$$2,
+  access_single_response$$4,
+} from "./outputs.js";
+import {
+  access_exclude as access_exclude$,
+  access_include as access_include$,
+  access_require as access_require$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.rule_groups`.
+ * The tools of `zeroTrust.access.ruleGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_rule_groups_create",
+    name: "zeroTrust_access_ruleGroups_create",
     title: "Create an Access group",
-    description: "Creates a new Access group.",
+    description: "Creates a new Access group.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "exclude": {
@@ -127,12 +106,12 @@ export const tools: readonly Tool[] = [
               "description": "Rules evaluated with an OR logical operator. A user needs to meet only one of the Include rules."
             },
             "is_default": {
-              "$ref": "#/$defs/access_is_default",
-              "description": "Whether this is the default group"
+              "description": "Whether this is the default group",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/access_name-6",
-              "description": "The name of the Access group."
+              "description": "The name of the Access group.",
+              "type": "string"
             },
             "require": {
               "$ref": "#/$defs/access_require",
@@ -144,16 +123,75 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "access_access_group_rule": access_access_group_rule$,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule$,
+        "access_auth_context_rule": access_auth_context_rule$,
+        "access_authentication_method_rule": access_authentication_method_rule$,
+        "access_azure_group_rule": access_azure_group_rule$,
+        "access_certificate_rule": access_certificate_rule$,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule$,
+        "access_common_name_rule": access_common_name_rule$,
+        "access_country_rule": access_country_rule$,
+        "access_device_posture_rule": access_device_posture_rule$,
+        "access_domain_rule": access_domain_rule$,
+        "access_email_list_rule": access_email_list_rule$,
+        "access_email_rule": access_email_rule$,
+        "access_everyone_rule": access_everyone_rule$,
+        "access_exclude": access_exclude$,
+        "access_external_evaluation_rule": access_external_evaluation_rule$,
+        "access_github_organization_rule": access_github_organization_rule$,
+        "access_gsuite_group_rule": access_gsuite_group_rule$,
+        "access_include": access_include$,
+        "access_ip_list_rule": access_ip_list_rule$,
+        "access_ip_rule": access_ip_rule$,
+        "access_linked_app_token_rule": access_linked_app_token_rule$,
+        "access_login_method_rule": access_login_method_rule$,
+        "access_oidc_claim_rule": access_oidc_claim_rule$,
+        "access_okta_group_rule": access_okta_group_rule$,
+        "access_require": access_require$,
+        "access_rule": access_rule$,
+        "access_saml_group_rule": access_saml_group_rule$,
+        "access_service_token_rule": access_service_token_rule$,
+        "access_service_token_tag_rule": access_service_token_tag_rule$,
+        "access_user_risk_score_rule": access_user_risk_score_rule$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/access_single_response-4",
       $defs: {
         "access_access_group_rule": access_access_group_rule,
         "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-single": access_api$$response$$single,
         "access_auth_context_rule": access_auth_context_rule,
         "access_authentication_method_rule": access_authentication_method_rule,
         "access_azure_group_rule": access_azure_group_rule,
@@ -169,15 +207,14 @@ export const tools: readonly Tool[] = [
         "access_exclude": access_exclude,
         "access_external_evaluation_rule": access_external_evaluation_rule,
         "access_github_organization_rule": access_github_organization_rule,
+        "access_groups-2": access_groups$$2,
         "access_gsuite_group_rule": access_gsuite_group_rule,
-        "access_identifier": access_identifier,
         "access_include": access_include,
         "access_ip_list_rule": access_ip_list_rule,
         "access_ip_rule": access_ip_rule,
-        "access_is_default": access_is_default,
         "access_linked_app_token_rule": access_linked_app_token_rule,
         "access_login_method_rule": access_login_method_rule,
-        "access_name-6": access_name_6,
+        "access_messages": access_messages,
         "access_oidc_claim_rule": access_oidc_claim_rule,
         "access_okta_group_rule": access_okta_group_rule,
         "access_require": access_require,
@@ -185,55 +222,10 @@ export const tools: readonly Tool[] = [
         "access_saml_group_rule": access_saml_group_rule,
         "access_service_token_rule": access_service_token_rule,
         "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-4": access_single_response$$4,
         "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
-    outputSchema: {
-      "$ref": "#/$defs/access_single_response-4",
-      $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude": access_exclude_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_groups-2": access_groups_2_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include": access_include_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_name-6": access_name_6_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_require": access_require_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_single_response-4": access_single_response_4_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid": access_uuid_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -258,48 +250,42 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude": access_exclude_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_groups-2": access_groups_2_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include": access_include_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_name-6": access_name_6_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_require": access_require_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_single_response-4": access_single_response_4_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid": access_uuid_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude": access_exclude,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_groups-2": access_groups$$2,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include": access_include,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_require": access_require,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-4": access_single_response$$4,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     request: (args) => ({
@@ -308,46 +294,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_rule_groups_delete",
+    name: "zeroTrust_access_ruleGroups_delete",
     title: "Delete an Access group",
-    description: "Deletes an Access group.",
+    description: "Deletes an Access group.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/access/groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "group_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "group_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "group_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -374,11 +365,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -386,83 +376,83 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_rule_groups_get",
+    name: "zeroTrust_access_ruleGroups_get",
     title: "Get an Access group",
-    description: "Fetches a single Access group.",
+    description: "Fetches a single Access group.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "group_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "group_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "group_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-4",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude": access_exclude_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_groups-2": access_groups_2_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include": access_include_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_name-6": access_name_6_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_require": access_require_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_single_response-4": access_single_response_4_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid": access_uuid_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-single": access_api$$response$$single,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude": access_exclude,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_groups-2": access_groups$$2,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include": access_include,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_require": access_require,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-4": access_single_response$$4,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     annotations: {
@@ -490,48 +480,42 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude": access_exclude_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_groups-2": access_groups_2_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include": access_include_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_name-6": access_name_6_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_require": access_require_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_single_response-4": access_single_response_4_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid": access_uuid_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude": access_exclude,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_groups-2": access_groups$$2,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include": access_include,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_require": access_require,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-4": access_single_response$$4,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     request: (args) => ({
@@ -539,96 +523,103 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_rule_groups_list",
+    name: "zeroTrust_access_ruleGroups_list",
     title: "List Access groups",
-    description: "Lists all Access groups.",
+    description: "Lists all Access groups.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "name": {
-          "description": "The name of the group.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 1000,
-          "description": "Number of results per page.",
-          "type": "integer"
+          "type": "object"
         },
-        "search": {
-          "description": "Search for groups by other listed query parameters.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The name of the group.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 1000,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search for groups by other listed query parameters.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-2",
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude": access_exclude_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_groups-2": access_groups_2_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include": access_include_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_name-6": access_name_6_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_require": access_require_output,
-        "access_response_collection-2": access_response_collection_2_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid": access_uuid_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude": access_exclude,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_groups-2": access_groups$$2,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include": access_include,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_require": access_require,
+        "access_response_collection-2": access_response_collection$$2,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     annotations: {
@@ -656,80 +647,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude": access_exclude_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_groups-2": access_groups_2_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include": access_include_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_name-6": access_name_6_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_require": access_require_output,
-        "access_response_collection-2": access_response_collection_2_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid": access_uuid_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude": access_exclude,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_groups-2": access_groups$$2,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include": access_include,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_require": access_require,
+        "access_response_collection-2": access_response_collection$$2,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/groups`,
       query: [
-        ["name", args["name"], true],
-        ["search", args["search"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["search", param(args, "query", "search"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_rule_groups_update",
+    name: "zeroTrust_access_ruleGroups_update",
     title: "Update an Access group",
-    description: "Updates a configured Access group.",
+    description: "Updates a configured Access group.\n\nPUT /{account_or_zone}/{account_or_zone_id}/access/groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "exclude": {
@@ -741,12 +714,12 @@ export const tools: readonly Tool[] = [
               "description": "Rules evaluated with an OR logical operator. A user needs to meet only one of the Include rules."
             },
             "is_default": {
-              "$ref": "#/$defs/access_is_default",
-              "description": "Whether this is the default group"
+              "description": "Whether this is the default group",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/access_name-6",
-              "description": "The name of the Access group."
+              "description": "The name of the Access group.",
+              "type": "string"
             },
             "require": {
               "$ref": "#/$defs/access_require",
@@ -759,20 +732,79 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "group_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
+      $defs: {
+        "access_access_group_rule": access_access_group_rule$,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule$,
+        "access_auth_context_rule": access_auth_context_rule$,
+        "access_authentication_method_rule": access_authentication_method_rule$,
+        "access_azure_group_rule": access_azure_group_rule$,
+        "access_certificate_rule": access_certificate_rule$,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule$,
+        "access_common_name_rule": access_common_name_rule$,
+        "access_country_rule": access_country_rule$,
+        "access_device_posture_rule": access_device_posture_rule$,
+        "access_domain_rule": access_domain_rule$,
+        "access_email_list_rule": access_email_list_rule$,
+        "access_email_rule": access_email_rule$,
+        "access_everyone_rule": access_everyone_rule$,
+        "access_exclude": access_exclude$,
+        "access_external_evaluation_rule": access_external_evaluation_rule$,
+        "access_github_organization_rule": access_github_organization_rule$,
+        "access_gsuite_group_rule": access_gsuite_group_rule$,
+        "access_include": access_include$,
+        "access_ip_list_rule": access_ip_list_rule$,
+        "access_ip_rule": access_ip_rule$,
+        "access_linked_app_token_rule": access_linked_app_token_rule$,
+        "access_login_method_rule": access_login_method_rule$,
+        "access_oidc_claim_rule": access_oidc_claim_rule$,
+        "access_okta_group_rule": access_okta_group_rule$,
+        "access_require": access_require$,
+        "access_rule": access_rule$,
+        "access_saml_group_rule": access_saml_group_rule$,
+        "access_service_token_rule": access_service_token_rule$,
+        "access_service_token_tag_rule": access_service_token_tag_rule$,
+        "access_user_risk_score_rule": access_user_risk_score_rule$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/access_single_response-4",
       $defs: {
         "access_access_group_rule": access_access_group_rule,
         "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-single": access_api$$response$$single,
         "access_auth_context_rule": access_auth_context_rule,
         "access_authentication_method_rule": access_authentication_method_rule,
         "access_azure_group_rule": access_azure_group_rule,
@@ -788,15 +820,14 @@ export const tools: readonly Tool[] = [
         "access_exclude": access_exclude,
         "access_external_evaluation_rule": access_external_evaluation_rule,
         "access_github_organization_rule": access_github_organization_rule,
+        "access_groups-2": access_groups$$2,
         "access_gsuite_group_rule": access_gsuite_group_rule,
-        "access_identifier": access_identifier,
         "access_include": access_include,
         "access_ip_list_rule": access_ip_list_rule,
         "access_ip_rule": access_ip_rule,
-        "access_is_default": access_is_default,
         "access_linked_app_token_rule": access_linked_app_token_rule,
         "access_login_method_rule": access_login_method_rule,
-        "access_name-6": access_name_6,
+        "access_messages": access_messages,
         "access_oidc_claim_rule": access_oidc_claim_rule,
         "access_okta_group_rule": access_okta_group_rule,
         "access_require": access_require,
@@ -804,54 +835,8 @@ export const tools: readonly Tool[] = [
         "access_saml_group_rule": access_saml_group_rule,
         "access_service_token_rule": access_service_token_rule,
         "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-4": access_single_response$$4,
         "access_user_risk_score_rule": access_user_risk_score_rule,
-        "access_uuid": access_uuid,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/access_single_response-4",
-      $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude": access_exclude_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_groups-2": access_groups_2_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include": access_include_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_name-6": access_name_6_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_require": access_require_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_single_response-4": access_single_response_4_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid": access_uuid_output,
       },
     },
     annotations: {
@@ -878,48 +863,42 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_group_rule": access_access_group_rule_output,
-        "access_any_valid_service_token_rule": access_any_valid_service_token_rule_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_context_rule": access_auth_context_rule_output,
-        "access_authentication_method_rule": access_authentication_method_rule_output,
-        "access_azure_group_rule": access_azure_group_rule_output,
-        "access_certificate_rule": access_certificate_rule_output,
-        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule_output,
-        "access_common_name_rule": access_common_name_rule_output,
-        "access_country_rule": access_country_rule_output,
-        "access_created_at": access_created_at_output,
-        "access_device_posture_rule": access_device_posture_rule_output,
-        "access_domain_rule": access_domain_rule_output,
-        "access_email_list_rule": access_email_list_rule_output,
-        "access_email_rule": access_email_rule_output,
-        "access_everyone_rule": access_everyone_rule_output,
-        "access_exclude": access_exclude_output,
-        "access_external_evaluation_rule": access_external_evaluation_rule_output,
-        "access_github_organization_rule": access_github_organization_rule_output,
-        "access_groups-2": access_groups_2_output,
-        "access_gsuite_group_rule": access_gsuite_group_rule_output,
-        "access_identifier": access_identifier_output,
-        "access_include": access_include_output,
-        "access_ip_list_rule": access_ip_list_rule_output,
-        "access_ip_rule": access_ip_rule_output,
-        "access_linked_app_token_rule": access_linked_app_token_rule_output,
-        "access_login_method_rule": access_login_method_rule_output,
-        "access_messages": access_messages_output,
-        "access_name-6": access_name_6_output,
-        "access_oidc_claim_rule": access_oidc_claim_rule_output,
-        "access_okta_group_rule": access_okta_group_rule_output,
-        "access_require": access_require_output,
-        "access_rule": access_rule_output,
-        "access_saml_group_rule": access_saml_group_rule_output,
-        "access_service_token_rule": access_service_token_rule_output,
-        "access_service_token_tag_rule": access_service_token_tag_rule_output,
-        "access_single_response-4": access_single_response_4_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_risk_score_rule": access_user_risk_score_rule_output,
-        "access_uuid": access_uuid_output,
+        "access_access_group_rule": access_access_group_rule,
+        "access_any_valid_service_token_rule": access_any_valid_service_token_rule,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_auth_context_rule": access_auth_context_rule,
+        "access_authentication_method_rule": access_authentication_method_rule,
+        "access_azure_group_rule": access_azure_group_rule,
+        "access_certificate_rule": access_certificate_rule,
+        "access_cloudflare_account_member_rule": access_cloudflare_account_member_rule,
+        "access_common_name_rule": access_common_name_rule,
+        "access_country_rule": access_country_rule,
+        "access_device_posture_rule": access_device_posture_rule,
+        "access_domain_rule": access_domain_rule,
+        "access_email_list_rule": access_email_list_rule,
+        "access_email_rule": access_email_rule,
+        "access_everyone_rule": access_everyone_rule,
+        "access_exclude": access_exclude,
+        "access_external_evaluation_rule": access_external_evaluation_rule,
+        "access_github_organization_rule": access_github_organization_rule,
+        "access_groups-2": access_groups$$2,
+        "access_gsuite_group_rule": access_gsuite_group_rule,
+        "access_include": access_include,
+        "access_ip_list_rule": access_ip_list_rule,
+        "access_ip_rule": access_ip_rule,
+        "access_linked_app_token_rule": access_linked_app_token_rule,
+        "access_login_method_rule": access_login_method_rule,
+        "access_messages": access_messages,
+        "access_oidc_claim_rule": access_oidc_claim_rule,
+        "access_okta_group_rule": access_okta_group_rule,
+        "access_require": access_require,
+        "access_rule": access_rule,
+        "access_saml_group_rule": access_saml_group_rule,
+        "access_service_token_rule": access_service_token_rule,
+        "access_service_token_tag_rule": access_service_token_tag_rule,
+        "access_single_response-4": access_single_response$$4,
+        "access_user_risk_score_rule": access_user_risk_score_rule,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/samlEncryptionCertificates/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/samlEncryptionCertificates/outputs.ts
index f4855bd6c..1b87fa2af 100644
--- a/src/generated/forge-mcp/zeroTrust/access/samlEncryptionCertificates/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/samlEncryptionCertificates/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `access_certificate_set_list_response` in responses.
  */
-export const access_certificate_set_list_response_output: JsonSchema = {
+export const access_certificate_set_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -28,7 +28,7 @@ export const access_certificate_set_list_response_output: JsonSchema = {
 /**
  * The schema of `access_certificate_set_response` in responses.
  */
-export const access_certificate_set_response_output: JsonSchema = {
+export const access_certificate_set_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -47,7 +47,7 @@ export const access_certificate_set_response_output: JsonSchema = {
 /**
  * The schema of `access_saml_certificate-2` in responses.
  */
-export const access_saml_certificate_2_output: JsonSchema = {
+export const access_saml_certificate$$2: JsonSchema = {
   "properties": {
     "is_current": {
       "type": "boolean"
@@ -75,7 +75,7 @@ export const access_saml_certificate_2_output: JsonSchema = {
 /**
  * The schema of `access_saml_certificate_set-2` in responses.
  */
-export const access_saml_certificate_set_2_output: JsonSchema = {
+export const access_saml_certificate_set$$2: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/zeroTrust/access/samlEncryptionCertificates/tools.ts b/src/generated/forge-mcp/zeroTrust/access/samlEncryptionCertificates/tools.ts
index 673b9869d..f9f942dd4 100644
--- a/src/generated/forge-mcp/zeroTrust/access/samlEncryptionCertificates/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/samlEncryptionCertificates/tools.ts
@@ -1,59 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier, access_uuid } from "../../schemas.js";
 import {
-  access_certificate_set_list_response_output,
-  access_certificate_set_response_output,
-  access_saml_certificate_2_output,
-  access_saml_certificate_set_2_output,
+  access_certificate_set_list_response,
+  access_certificate_set_response,
+  access_saml_certificate$$2,
+  access_saml_certificate_set$$2,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.saml_encryption_certificates`.
+ * The tools of `zeroTrust.access.samlEncryptionCertificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_saml_encryption_certificates_get",
+    name: "zeroTrust_access_samlEncryptionCertificates_get",
     title: "Get SAML certificate set",
-    description: "Retrieves a specific SAML encryption certificate set by its UID, including both current and previous certificates if available.",
+    description: "Retrieves a specific SAML encryption certificate set by its UID, including both current and previous certificates if available.\n\nGET /accounts/{account_id}/access/saml_certificates/{saml_cert_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "saml_cert_set_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UID of the SAML certificate set."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "saml_cert_set_id": {
+              "description": "UID of the SAML certificate set.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "saml_cert_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "saml_cert_set_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_certificate_set_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_certificate_set_response": access_certificate_set_response_output,
-        "access_messages": access_messages_output,
-        "access_saml_certificate-2": access_saml_certificate_2_output,
-        "access_saml_certificate_set-2": access_saml_certificate_set_2_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_certificate_set_response": access_certificate_set_response,
+        "access_messages": access_messages,
+        "access_saml_certificate-2": access_saml_certificate$$2,
+        "access_saml_certificate_set-2": access_saml_certificate_set$$2,
       },
     },
     annotations: {
@@ -78,12 +83,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_certificate_set_response": access_certificate_set_response_output,
-        "access_messages": access_messages_output,
-        "access_saml_certificate-2": access_saml_certificate_2_output,
-        "access_saml_certificate_set-2": access_saml_certificate_set_2_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_certificate_set_response": access_certificate_set_response,
+        "access_messages": access_messages,
+        "access_saml_certificate-2": access_saml_certificate$$2,
+        "access_saml_certificate_set-2": access_saml_certificate_set$$2,
       },
     },
     request: (args) => ({
@@ -91,29 +96,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_saml_encryption_certificates_get_pem",
+    name: "zeroTrust_access_samlEncryptionCertificates_getPem",
     title: "Download current certificate in PEM format",
-    description: "Downloads the current SAML encryption certificate's public key in PEM format for the specified certificate set. This endpoint is useful for providing the certificate to Identity Providers for SAML assertion encryption configuration.",
+    description: "Downloads the current SAML encryption certificate's public key in PEM format for the specified certificate set. This endpoint is useful for providing the certificate to Identity Providers for SAML assertion encryption configuration.\n\nGET /accounts/{account_id}/access/saml_certificates/{saml_cert_set_id}/pem",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "saml_cert_set_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UID of the SAML certificate set."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "saml_cert_set_id": {
+              "description": "UID of the SAML certificate set.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "saml_cert_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "saml_cert_set_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -135,8 +146,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -144,47 +155,60 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_saml_encryption_certificates_list",
+    name: "zeroTrust_access_samlEncryptionCertificates_list",
     title: "List SAML certificate sets",
-    description: "Returns a paginated list of the organization's SAML encryption certificate sets.\nEach certificate set includes the current and (if present) previous certificates.",
+    description: "Returns a paginated list of the organization's SAML encryption certificate sets.\nEach certificate set includes the current and (if present) previous certificates.\n\nGET /accounts/{account_id}/access/saml_certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "id": {
-          "description": "Filter by SAML certificate set UID. Accepts a comma-separated list of UIDs.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 25,
-          "description": "Maximum number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "Filter by SAML certificate set UID. Accepts a comma-separated list of UIDs.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 25,
+              "description": "Maximum number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_certificate_set_list_response",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_certificate_set_list_response": access_certificate_set_list_response_output,
-        "access_messages": access_messages_output,
-        "access_saml_certificate-2": access_saml_certificate_2_output,
-        "access_saml_certificate_set-2": access_saml_certificate_set_2_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_certificate_set_list_response": access_certificate_set_list_response,
+        "access_messages": access_messages,
+        "access_saml_certificate-2": access_saml_certificate$$2,
+        "access_saml_certificate_set-2": access_saml_certificate_set$$2,
       },
     },
     annotations: {
@@ -206,57 +230,63 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_certificate_set_list_response": access_certificate_set_list_response_output,
-        "access_messages": access_messages_output,
-        "access_saml_certificate-2": access_saml_certificate_2_output,
-        "access_saml_certificate_set-2": access_saml_certificate_set_2_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_certificate_set_list_response": access_certificate_set_list_response,
+        "access_messages": access_messages,
+        "access_saml_certificate-2": access_saml_certificate$$2,
+        "access_saml_certificate_set-2": access_saml_certificate_set$$2,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/saml_certificates`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["id", args["id"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["id", param(args, "query", "id"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_saml_encryption_certificates_rotate",
+    name: "zeroTrust_access_samlEncryptionCertificates_rotate",
     title: "Rotate SAML certificate",
-    description: "Rotates the SAML encryption certificates within the specified certificate set. This generates a new\ncertificate and moves the current certificate to the previous slot. If a previous certificate exists,\nit will be deactivated and removed.\n\nThis endpoint ensures zero-downtime rotation by maintaining both current and previous certificates \nduring the transition period, allowing IdPs time to update their configurations. Automated rotation\nhappens 30 days before a current certificate's expiration.",
+    description: "Rotates the SAML encryption certificates within the specified certificate set. This generates a new\ncertificate and moves the current certificate to the previous slot. If a previous certificate exists,\nit will be deactivated and removed.\n\nThis endpoint ensures zero-downtime rotation by maintaining both current and previous certificates \nduring the transition period, allowing IdPs time to update their configurations. Automated rotation\nhappens 30 days before a current certificate's expiration.\n\nPOST /accounts/{account_id}/access/saml_certificates/{saml_cert_set_id}/rotate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "saml_cert_set_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UID of the SAML certificate set to rotate."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "saml_cert_set_id": {
+              "description": "UID of the SAML certificate set to rotate.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "saml_cert_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "saml_cert_set_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_certificate_set_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_certificate_set_response": access_certificate_set_response_output,
-        "access_messages": access_messages_output,
-        "access_saml_certificate-2": access_saml_certificate_2_output,
-        "access_saml_certificate_set-2": access_saml_certificate_set_2_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_certificate_set_response": access_certificate_set_response,
+        "access_messages": access_messages,
+        "access_saml_certificate-2": access_saml_certificate$$2,
+        "access_saml_certificate_set-2": access_saml_certificate_set$$2,
       },
     },
     annotations: {
@@ -281,12 +311,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_certificate_set_response": access_certificate_set_response_output,
-        "access_messages": access_messages_output,
-        "access_saml_certificate-2": access_saml_certificate_2_output,
-        "access_saml_certificate_set-2": access_saml_certificate_set_2_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_certificate_set_response": access_certificate_set_response,
+        "access_messages": access_messages,
+        "access_saml_certificate-2": access_saml_certificate$$2,
+        "access_saml_certificate_set-2": access_saml_certificate_set$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/schemas.ts
index 12eea1853..db86dda3f 100644
--- a/src/generated/forge-mcp/zeroTrust/access/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/schemas.ts
@@ -34,7 +34,12 @@ export const access_access_group_rule: JsonSchema = {
 export const access_allowed_clipboard_local_to_remote_formats: JsonSchema = {
   "description": "Clipboard formats allowed when copying from local machine to remote RDP session.",
   "items": {
-    "$ref": "#/$defs/access_rdp_clipboard_format"
+    "description": "Clipboard format for RDP connections.",
+    "enum": [
+      "text",
+      "file"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
@@ -45,7 +50,12 @@ export const access_allowed_clipboard_local_to_remote_formats: JsonSchema = {
 export const access_allowed_clipboard_remote_to_local_formats: JsonSchema = {
   "description": "Clipboard formats allowed when copying from remote RDP session to local machine.",
   "items": {
-    "$ref": "#/$defs/access_rdp_clipboard_format"
+    "description": "Clipboard format for RDP connections.",
+    "enum": [
+      "text",
+      "file"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
@@ -106,14 +116,6 @@ export const access_approval_groups: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_approval_required`.
- */
-export const access_approval_required: JsonSchema = {
-  "description": "Requires the user to request access from an administrator at the start of each session.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_auth_context_rule`.
  */
@@ -210,8 +212,14 @@ export const access_azure_group_rule: JsonSchema = {
 export const access_base_policy_req: JsonSchema = {
   "properties": {
     "decision": {
-      "$ref": "#/$defs/access_decision",
-      "description": "The action Access will take if a user matches this policy. Infrastructure application policies can only use the Allow action."
+      "description": "The action Access will take if a user matches this policy. Infrastructure application policies can only use the Allow action.",
+      "enum": [
+        "allow",
+        "deny",
+        "non_identity",
+        "bypass"
+      ],
+      "type": "string"
     },
     "exclude": {
       "$ref": "#/$defs/access_exclude-2",
@@ -224,12 +232,12 @@ export const access_base_policy_req: JsonSchema = {
       "description": "Rules evaluated with an OR logical operator. A user needs to meet only one of the Include rules."
     },
     "name": {
-      "$ref": "#/$defs/access_name-9",
-      "description": "The name of the Access policy."
+      "description": "The name of the Access policy.",
+      "type": "string"
     },
     "policy_resolution_account_id": {
-      "$ref": "#/$defs/access_policy_resolution_account_id",
-      "description": "The account ID used to resolve policy resources and identity for cross-account WARP authentication. The account must be trusted by the account that owns this policy."
+      "description": "The account ID used to resolve policy resources and identity for cross-account WARP authentication. The account must be trusted by the account that owns this policy.",
+      "type": "string"
     },
     "require": {
       "$ref": "#/$defs/access_require-2",
@@ -270,8 +278,8 @@ export const access_cloudflare_account_member_rule: JsonSchema = {
     "cloudflare_account_member": {
       "properties": {
         "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+          "description": "Identifier.",
+          "type": "string"
         }
       },
       "type": "object"
@@ -365,20 +373,6 @@ export const access_country_rule: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_decision`.
- */
-export const access_decision: JsonSchema = {
-  "description": "The action Access will take if a user matches this policy. Infrastructure application policies can only use the Allow action.",
-  "enum": [
-    "allow",
-    "deny",
-    "non_identity",
-    "bypass"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_device_posture_rule`.
  */
@@ -388,8 +382,8 @@ export const access_device_posture_rule: JsonSchema = {
     "device_posture": {
       "properties": {
         "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The ID of the account that owns the device posture integration."
+          "description": "The ID of the account that owns the device posture integration.",
+          "type": "string"
         },
         "integration_uid": {
           "description": "The ID of a device posture integration.",
@@ -433,14 +427,6 @@ export const access_domain_rule: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_email-2`.
- */
-export const access_email_2: JsonSchema = {
-  "description": "The email of the user.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_email_list_rule`.
  */
@@ -511,7 +497,7 @@ export const access_everyone_rule: JsonSchema = {
 /**
  * The schema of `access_exclude-2`.
  */
-export const access_exclude_2: JsonSchema = {
+export const access_exclude$$2: JsonSchema = {
   "description": "Rules evaluated with a NOT logical operator. To match the policy, a user cannot meet any of the Exclude rules.",
   "items": {
     "$ref": "#/$defs/access_rule"
@@ -616,7 +602,7 @@ export const access_gsuite_group_rule: JsonSchema = {
 /**
  * The schema of `access_include-2`.
  */
-export const access_include_2: JsonSchema = {
+export const access_include$$2: JsonSchema = {
   "description": "Rules evaluated with an OR logical operator. A user needs to meet only one of the Include rules.",
   "items": {
     "$ref": "#/$defs/access_rule"
@@ -674,14 +660,6 @@ export const access_ip_rule: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_isolation_required`.
- */
-export const access_isolation_required: JsonSchema = {
-  "description": "Require this application to be served in an isolated browser for users matching this policy. 'Client Web Isolation' must be on for the account in order to use this feature.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_linked_app_token_rule`.
  */
@@ -762,22 +740,6 @@ export const access_mfa_config: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_name-10`.
- */
-export const access_name_10: JsonSchema = {
-  "description": "The name of the user.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_name-9`.
- */
-export const access_name_9: JsonSchema = {
-  "description": "The name of the Access policy.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_oidc_claim_rule`.
  */
@@ -855,32 +817,39 @@ export const access_policy_req: JsonSchema = {
           "description": "Administrators who can approve a temporary authentication request."
         },
         "approval_required": {
-          "$ref": "#/$defs/access_approval_required",
-          "description": "Requires the user to request access from an administrator at the start of each session."
+          "description": "Requires the user to request access from an administrator at the start of each session.",
+          "type": "boolean"
         },
         "connection_rules": {
           "$ref": "#/$defs/access_connection_rules",
           "description": "The rules that define how users may connect to targets secured by your application."
         },
         "isolation_required": {
-          "$ref": "#/$defs/access_isolation_required",
-          "description": "Require this application to be served in an isolated browser for users matching this policy. 'Client Web Isolation' must be on for the account in order to use this feature."
+          "description": "Require this application to be served in an isolated browser for users matching this policy. 'Client Web Isolation' must be on for the account in order to use this feature.",
+          "type": "boolean"
         },
         "mfa_config": {
           "$ref": "#/$defs/access_mfa_config",
           "description": "Configures multi-factor authentication (MFA) settings."
         },
         "purpose_justification_prompt": {
-          "$ref": "#/$defs/access_purpose_justification_prompt",
-          "description": "A custom message that will appear on the purpose justification screen."
+          "description": "A custom message that will appear on the purpose justification screen.",
+          "type": "string"
         },
         "purpose_justification_required": {
-          "$ref": "#/$defs/access_purpose_justification_required",
-          "description": "Require users to enter a justification when they log in to the application."
+          "description": "Require users to enter a justification when they log in to the application.",
+          "type": "boolean"
         },
         "session_duration": {
-          "$ref": "#/$defs/access_session_duration-3",
-          "description": "The amount of time that tokens issued for the application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h."
+          "description": "The amount of time that tokens issued for the application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
       "type": "object"
@@ -891,46 +860,10 @@ export const access_policy_req: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_policy_resolution_account_id`.
- */
-export const access_policy_resolution_account_id: JsonSchema = {
-  "description": "The account ID used to resolve policy resources and identity for cross-account WARP authentication. The account must be trusted by the account that owns this policy.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_purpose_justification_prompt`.
- */
-export const access_purpose_justification_prompt: JsonSchema = {
-  "description": "A custom message that will appear on the purpose justification screen.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_purpose_justification_required`.
- */
-export const access_purpose_justification_required: JsonSchema = {
-  "description": "Require users to enter a justification when they log in to the application.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_rdp_clipboard_format`.
- */
-export const access_rdp_clipboard_format: JsonSchema = {
-  "description": "Clipboard format for RDP connections.",
-  "enum": [
-    "text",
-    "file"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `access_require-2`.
  */
-export const access_require_2: JsonSchema = {
+export const access_require$$2: JsonSchema = {
   "description": "Rules evaluated with an AND logical operator. To match the policy, a user must meet all of the Require rules.",
   "items": {
     "$ref": "#/$defs/access_rule"
@@ -1117,21 +1050,6 @@ export const access_service_token_tag_rule: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_session_duration-3`.
- */
-export const access_session_duration_3: JsonSchema = {
-  "description": "The amount of time that tokens issued for the application will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `access_user_risk_score_rule`.
  */
@@ -1166,11 +1084,3 @@ export const access_user_risk_score_rule: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `access_uuid-2`.
- */
-export const access_uuid_2: JsonSchema = {
-  "description": "The UUID of the policy",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/serviceTokens/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/serviceTokens/outputs.ts
index dccc2b3cb..b6bca920a 100644
--- a/src/generated/forge-mcp/zeroTrust/access/serviceTokens/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/serviceTokens/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_client_secret` in responses.
- */
-export const access_client_secret_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_create_response` in responses.
  */
-export const access_create_response_output: JsonSchema = {
+export const access_create_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -23,31 +16,47 @@ export const access_create_response_output: JsonSchema = {
         "result": {
           "properties": {
             "client_id": {
-              "$ref": "#/$defs/access_client_id"
+              "type": "string"
             },
             "client_secret": {
-              "$ref": "#/$defs/access_client_secret"
+              "type": "string"
             },
             "created_at": {
-              "$ref": "#/$defs/access_created_at"
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
             },
             "duration": {
-              "$ref": "#/$defs/access_duration"
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/access_enabled"
+              "type": "boolean"
             },
             "id": {
               "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/access_name-2"
+              "type": "string"
             },
             "tags": {
               "$ref": "#/$defs/access_tags"
             },
             "updated_at": {
-              "$ref": "#/$defs/access_updated_at"
+              "allOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "format": "date-time",
+                  "type": "string"
+                }
+              ]
             }
           },
           "type": "object"
@@ -61,7 +70,7 @@ export const access_create_response_output: JsonSchema = {
 /**
  * The schema of `access_response_collection-4` in responses.
  */
-export const access_response_collection_4_output: JsonSchema = {
+export const access_response_collection$$4: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/access/serviceTokens/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/serviceTokens/schemas.ts
deleted file mode 100644
index 9f80db164..000000000
--- a/src/generated/forge-mcp/zeroTrust/access/serviceTokens/schemas.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `access_client_secret_version`.
- */
-export const access_client_secret_version: JsonSchema = {
-  "description": "A version number identifying the current `client_secret` associated with the service token. Incrementing it triggers a rotation; the previous secret will still be accepted until the time indicated by `previous_client_secret_expires_at`. If the service token was reported as leaked, `previous_client_secret_expires_at` is not required, may not be in the future, and the previous secret is discarded immediately.",
-  "type": "number"
-};
-
-/**
- * The schema of `access_previous_client_secret_expires_at`.
- */
-export const access_previous_client_secret_expires_at: JsonSchema = {
-  "description": "The expiration of the previous `client_secret`. This can be modified at any point after a rotation. For example, you may extend it further into the future if you need more time to update services with the new secret; or move it into the past to immediately invalidate the previous token in case of compromise. Rotating a service token that was reported as leaked discards the previous secret entirely, so no grace period can be set.",
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/serviceTokens/tools.ts b/src/generated/forge-mcp/zeroTrust/access/serviceTokens/tools.ts
index bae392ee8..570579c7b 100644
--- a/src/generated/forge-mcp/zeroTrust/access/serviceTokens/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/serviceTokens/tools.ts
@@ -1,92 +1,58 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_client_id_output,
-  access_created_at_output,
-  access_duration_output,
-  access_enabled_output,
-  access_leak_report_url_output,
-  access_leak_reported_at_output,
-  access_leak_reporter_output,
-  access_messages_output,
-  access_name_2_output,
-  access_service_tokens_output,
-  access_single_response_2_output,
-  access_tags_output,
-  access_timestamp_output,
-  access_updated_at_output,
-  access_uuid_output,
-} from "../../outputs.js";
-import {
-  access_duration,
-  access_enabled,
-  access_identifier,
-  access_name_2,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
+  access_service$$tokens,
+  access_single_response$$2,
   access_tags,
-  access_uuid,
-} from "../../schemas.js";
+} from "../../outputs.js";
+import { access_tags as access_tags$ } from "../../schemas.js";
 import {
-  access_client_secret_output,
-  access_create_response_output,
-  access_response_collection_4_output,
+  access_create_response,
+  access_response_collection$$4,
 } from "./outputs.js";
-import {
-  access_client_secret_version,
-  access_previous_client_secret_expires_at,
-} from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.service_tokens`.
+ * The tools of `zeroTrust.access.serviceTokens`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_service_tokens_create",
+    name: "zeroTrust_access_serviceTokens_create",
     title: "Create a service token",
-    description: "Generates a new service token. **Note:** This is the only time you can get the Client Secret. If you lose the Client Secret, you will have to rotate the Client Secret or create a new service token.",
+    description: "Generates a new service token. **Note:** This is the only time you can get the Client Secret. If you lose the Client Secret, you will have to rotate the Client Secret or create a new service token.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/service_tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "client_secret_version": {
-              "$ref": "#/$defs/access_client_secret_version",
               "default": 1,
-              "description": "A version number identifying the current `client_secret` associated with the service token. Incrementing it triggers a rotation; the previous secret will still be accepted until the time indicated by `previous_client_secret_expires_at`. If the service token was reported as leaked, `previous_client_secret_expires_at` is not required, may not be in the future, and the previous secret is discarded immediately."
+              "description": "A version number identifying the current `client_secret` associated with the service token. Incrementing it triggers a rotation; the previous secret will still be accepted until the time indicated by `previous_client_secret_expires_at`. If the service token was reported as leaked, `previous_client_secret_expires_at` is not required, may not be in the future, and the previous secret is discarded immediately.",
+              "type": "number"
             },
             "duration": {
-              "$ref": "#/$defs/access_duration",
               "default": "8760h",
-              "description": "The duration for how long the service token will be valid. Must be in the format `300ms` or `2h45m`, or the special value `forever` for non-expiring tokens. Valid time units are: ns, us (or µs), ms, s, m, h. The default is 1 year in hours (8760h)."
+              "description": "The duration for how long the service token will be valid. Must be in the format `300ms` or `2h45m`, or the special value `forever` for non-expiring tokens. Valid time units are: ns, us (or µs), ms, s, m, h. The default is 1 year in hours (8760h).",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/access_enabled",
-              "description": "Whether the service token is enabled. A disabled service token cannot be used to authenticate; both its current and previous `client_secret` stop being accepted, but the token itself is preserved and can be re-enabled. A service token reported as leaked is disabled automatically and cannot be re-enabled until its secret is rotated; attempting to do so returns a 409. Defaults to enabled when omitted on create."
+              "description": "Whether the service token is enabled. A disabled service token cannot be used to authenticate; both its current and previous `client_secret` stop being accepted, but the token itself is preserved and can be re-enabled. A service token reported as leaked is disabled automatically and cannot be re-enabled until its secret is rotated; attempting to do so returns a 409. Defaults to enabled when omitted on create.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/access_name-2",
-              "description": "The name of the service token."
+              "description": "The name of the service token.",
+              "type": "string"
             },
             "previous_client_secret_expires_at": {
-              "$ref": "#/$defs/access_previous_client_secret_expires_at",
-              "description": "The expiration of the previous `client_secret`. This can be modified at any point after a rotation. For example, you may extend it further into the future if you need more time to update services with the new secret; or move it into the past to immediately invalidate the previous token in case of compromise. Rotating a service token that was reported as leaked discards the previous secret entirely, so no grace period can be set."
+              "description": "The expiration of the previous `client_secret`. This can be modified at any point after a rotation. For example, you may extend it further into the future if you need more time to update services with the new secret; or move it into the past to immediately invalidate the previous token in case of compromise. Rotating a service token that was reported as leaked discards the previous secret entirely, so no grace period can be set.",
+              "format": "date-time",
+              "type": "string"
             },
             "tags": {
               "$ref": "#/$defs/access_tags",
@@ -97,38 +63,46 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_client_secret_version": access_client_secret_version,
-        "access_duration": access_duration,
-        "access_enabled": access_enabled,
-        "access_identifier": access_identifier,
-        "access_name-2": access_name_2,
-        "access_previous_client_secret_expires_at": access_previous_client_secret_expires_at,
-        "access_tags": access_tags,
+        "access_tags": access_tags$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_create_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_client_secret": access_client_secret_output,
-        "access_create_response": access_create_response_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_create_response": access_create_response,
+        "access_messages": access_messages,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -155,19 +129,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_client_secret": access_client_secret_output,
-        "access_create_response": access_create_response_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_create_response": access_create_response,
+        "access_messages": access_messages,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
@@ -176,58 +142,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_service_tokens_delete",
+    name: "zeroTrust_access_serviceTokens_delete",
     title: "Delete a service token",
-    description: "Deletes a service token.",
+    description: "Deletes a service token.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/access/service_tokens/{service_token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "service_token_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "service_token_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "service_token_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "service_token_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-2",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -254,23 +215,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
@@ -278,58 +228,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_service_tokens_get",
+    name: "zeroTrust_access_serviceTokens_get",
     title: "Get a service token",
-    description: "Fetches a single service token.",
+    description: "Fetches a single service token.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/service_tokens/{service_token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "service_token_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "service_token_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "service_token_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "service_token_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-2",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -357,23 +302,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
@@ -381,71 +315,73 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_service_tokens_list",
+    name: "zeroTrust_access_serviceTokens_list",
     title: "List service tokens",
-    description: "Lists all service tokens.",
+    description: "Lists all service tokens.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/service_tokens",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "name": {
-          "description": "The name of the service token.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 1000,
-          "description": "Number of results per page.",
-          "type": "integer"
+          "type": "object"
         },
-        "search": {
-          "description": "Search for service tokens by other listed query parameters.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "The name of the service token.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 1000,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search for service tokens by other listed query parameters.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-4",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_response_collection-4": access_response_collection_4_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_response_collection-4": access_response_collection$$4,
+        "access_service-tokens": access_service$$tokens,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -473,80 +409,64 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_response_collection-4": access_response_collection_4_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_response_collection-4": access_response_collection$$4,
+        "access_service-tokens": access_service$$tokens,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/service_tokens`,
       query: [
-        ["name", args["name"], true],
-        ["search", args["search"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["search", param(args, "query", "search"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_service_tokens_refresh",
+    name: "zeroTrust_access_serviceTokens_refresh",
     title: "Refresh a service token",
-    description: "Refreshes the expiration of a service token.",
+    description: "Refreshes the expiration of a service token.\n\nPOST /accounts/{account_id}/access/service_tokens/{service_token_id}/refresh",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "service_token_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "service_token_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "service_token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "service_token_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-2",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -573,23 +493,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
@@ -597,16 +506,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_service_tokens_rotate",
+    name: "zeroTrust_access_serviceTokens_rotate",
     title: "Rotate a service token",
-    description: "Generates a new Client Secret for a service token and revokes the old one.",
+    description: "Generates a new Client Secret for a service token and revokes the old one.\n\nPOST /accounts/{account_id}/access/service_tokens/{service_token_id}/rotate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "previous_client_secret_expires_at": {
@@ -617,35 +522,37 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "service_token_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "service_token_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "service_token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "service_token_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_create_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_client_secret": access_client_secret_output,
-        "access_create_response": access_create_response_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_create_response": access_create_response,
+        "access_messages": access_messages,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -667,19 +574,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_client_secret": access_client_secret_output,
-        "access_create_response": access_create_response_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_create_response": access_create_response,
+        "access_messages": access_messages,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
@@ -688,47 +587,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_service_tokens_update",
+    name: "zeroTrust_access_serviceTokens_update",
     title: "Update a service token",
-    description: "Updates a configured service token.",
+    description: "Updates a configured service token.\n\nPUT /{account_or_zone}/{account_or_zone_id}/access/service_tokens/{service_token_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "client_secret_version": {
-              "$ref": "#/$defs/access_client_secret_version",
               "default": 1,
-              "description": "A version number identifying the current `client_secret` associated with the service token. Incrementing it triggers a rotation; the previous secret will still be accepted until the time indicated by `previous_client_secret_expires_at`. If the service token was reported as leaked, `previous_client_secret_expires_at` is not required, may not be in the future, and the previous secret is discarded immediately."
+              "description": "A version number identifying the current `client_secret` associated with the service token. Incrementing it triggers a rotation; the previous secret will still be accepted until the time indicated by `previous_client_secret_expires_at`. If the service token was reported as leaked, `previous_client_secret_expires_at` is not required, may not be in the future, and the previous secret is discarded immediately.",
+              "type": "number"
             },
             "duration": {
-              "$ref": "#/$defs/access_duration",
               "default": "8760h",
-              "description": "The duration for how long the service token will be valid. Must be in the format `300ms` or `2h45m`, or the special value `forever` for non-expiring tokens. Valid time units are: ns, us (or µs), ms, s, m, h. The default is 1 year in hours (8760h)."
+              "description": "The duration for how long the service token will be valid. Must be in the format `300ms` or `2h45m`, or the special value `forever` for non-expiring tokens. Valid time units are: ns, us (or µs), ms, s, m, h. The default is 1 year in hours (8760h).",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/access_enabled",
-              "description": "Whether the service token is enabled. A disabled service token cannot be used to authenticate; both its current and previous `client_secret` stop being accepted, but the token itself is preserved and can be re-enabled. A service token reported as leaked is disabled automatically and cannot be re-enabled until its secret is rotated; attempting to do so returns a 409. Defaults to enabled when omitted on create."
+              "description": "Whether the service token is enabled. A disabled service token cannot be used to authenticate; both its current and previous `client_secret` stop being accepted, but the token itself is preserved and can be re-enabled. A service token reported as leaked is disabled automatically and cannot be re-enabled until its secret is rotated; attempting to do so returns a 409. Defaults to enabled when omitted on create.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/access_name-2",
-              "description": "The name of the service token."
+              "description": "The name of the service token.",
+              "type": "string"
             },
             "previous_client_secret_expires_at": {
-              "$ref": "#/$defs/access_previous_client_secret_expires_at",
-              "description": "The expiration of the previous `client_secret`. This can be modified at any point after a rotation. For example, you may extend it further into the future if you need more time to update services with the new secret; or move it into the past to immediately invalidate the previous token in case of compromise. Rotating a service token that was reported as leaked discards the previous secret entirely, so no grace period can be set."
+              "description": "The expiration of the previous `client_secret`. This can be modified at any point after a rotation. For example, you may extend it further into the future if you need more time to update services with the new secret; or move it into the past to immediately invalidate the previous token in case of compromise. Rotating a service token that was reported as leaked discards the previous secret entirely, so no grace period can be set.",
+              "format": "date-time",
+              "type": "string"
             },
             "tags": {
               "$ref": "#/$defs/access_tags",
@@ -737,47 +625,51 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "service_token_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "service_token_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "service_token_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "service_token_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_client_secret_version": access_client_secret_version,
-        "access_duration": access_duration,
-        "access_enabled": access_enabled,
-        "access_identifier": access_identifier,
-        "access_name-2": access_name_2,
-        "access_previous_client_secret_expires_at": access_previous_client_secret_expires_at,
-        "access_tags": access_tags,
-        "access_uuid": access_uuid,
+        "access_tags": access_tags$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-2",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -804,23 +696,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/signingKeys/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/signingKeys/outputs.ts
index 0e01168b5..8b06e8441 100644
--- a/src/generated/forge-mcp/zeroTrust/access/signingKeys/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/signingKeys/outputs.ts
@@ -3,50 +3,29 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_days_until_next_rotation` in responses.
- */
-export const access_days_until_next_rotation_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `access_key_config` in responses.
  */
-export const access_key_config_output: JsonSchema = {
+export const access_key_config: JsonSchema = {
   "properties": {
     "days_until_next_rotation": {
-      "$ref": "#/$defs/access_days_until_next_rotation"
+      "type": "number"
     },
     "key_rotation_interval_days": {
-      "$ref": "#/$defs/access_key_rotation_interval_days"
+      "type": "number"
     },
     "last_key_rotation_at": {
-      "$ref": "#/$defs/access_last_key_rotation_at"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_key_rotation_interval_days` in responses.
- */
-export const access_key_rotation_interval_days_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `access_last_key_rotation_at` in responses.
- */
-export const access_last_key_rotation_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `access_single_response-13` in responses.
  */
-export const access_single_response_13_output: JsonSchema = {
+export const access_single_response$$13: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/signingKeys/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/signingKeys/schemas.ts
deleted file mode 100644
index 2d8a668a9..000000000
--- a/src/generated/forge-mcp/zeroTrust/access/signingKeys/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `access_key_rotation_interval_days`.
- */
-export const access_key_rotation_interval_days: JsonSchema = {
-  "description": "The number of days between key rotations.",
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/signingKeys/tools.ts b/src/generated/forge-mcp/zeroTrust/access/signingKeys/tools.ts
index 5c0351dc0..413141206 100644
--- a/src/generated/forge-mcp/zeroTrust/access/signingKeys/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/signingKeys/tools.ts
@@ -3,53 +3,49 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier } from "../../schemas.js";
-import {
-  access_days_until_next_rotation_output,
-  access_key_config_output,
-  access_key_rotation_interval_days_output,
-  access_last_key_rotation_at_output,
-  access_single_response_13_output,
-} from "./outputs.js";
-import { access_key_rotation_interval_days } from "./schemas.js";
+import { access_key_config, access_single_response$$13 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.signing_keys`.
+ * The tools of `zeroTrust.access.signingKeys`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_signing_keys_get",
+    name: "zeroTrust_access_signingKeys_get",
     title: "Get the Access key configuration",
-    description: "Gets the Access key rotation settings for an account.",
+    description: "Gets the Access key rotation settings for an account.\n\nGET /accounts/{account_id}/access/keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-13",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_days_until_next_rotation": access_days_until_next_rotation_output,
-        "access_key_config": access_key_config_output,
-        "access_key_rotation_interval_days": access_key_rotation_interval_days_output,
-        "access_last_key_rotation_at": access_last_key_rotation_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-13": access_single_response_13_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_key_config": access_key_config,
+        "access_messages": access_messages,
+        "access_single_response-13": access_single_response$$13,
       },
     },
     annotations: {
@@ -77,14 +73,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_days_until_next_rotation": access_days_until_next_rotation_output,
-        "access_key_config": access_key_config_output,
-        "access_key_rotation_interval_days": access_key_rotation_interval_days_output,
-        "access_last_key_rotation_at": access_last_key_rotation_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-13": access_single_response_13_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_key_config": access_key_config,
+        "access_messages": access_messages,
+        "access_single_response-13": access_single_response$$13,
       },
     },
     request: (args) => ({
@@ -92,34 +85,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_signing_keys_rotate",
+    name: "zeroTrust_access_signingKeys_rotate",
     title: "Rotate Access keys",
-    description: "Perfoms a key rotation for an account.",
+    description: "Perfoms a key rotation for an account.\n\nPOST /accounts/{account_id}/access/keys/rotate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-13",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_days_until_next_rotation": access_days_until_next_rotation_output,
-        "access_key_config": access_key_config_output,
-        "access_key_rotation_interval_days": access_key_rotation_interval_days_output,
-        "access_last_key_rotation_at": access_last_key_rotation_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-13": access_single_response_13_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_key_config": access_key_config,
+        "access_messages": access_messages,
+        "access_single_response-13": access_single_response$$13,
       },
     },
     annotations: {
@@ -146,14 +143,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_days_until_next_rotation": access_days_until_next_rotation_output,
-        "access_key_config": access_key_config_output,
-        "access_key_rotation_interval_days": access_key_rotation_interval_days_output,
-        "access_last_key_rotation_at": access_last_key_rotation_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-13": access_single_response_13_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_key_config": access_key_config,
+        "access_messages": access_messages,
+        "access_single_response-13": access_single_response$$13,
       },
     },
     request: (args) => ({
@@ -161,48 +155,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_signing_keys_update",
+    name: "zeroTrust_access_signingKeys_update",
     title: "Update the Access key configuration",
-    description: "Updates the Access key rotation settings for an account.",
+    description: "Updates the Access key rotation settings for an account.\n\nPUT /accounts/{account_id}/access/keys",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "key_rotation_interval_days": {
-              "$ref": "#/$defs/access_key_rotation_interval_days",
-              "description": "The number of days between key rotations."
+              "description": "The number of days between key rotations.",
+              "type": "number"
             }
           },
           "required": [
             "key_rotation_interval_days"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_key_rotation_interval_days": access_key_rotation_interval_days,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-13",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_days_until_next_rotation": access_days_until_next_rotation_output,
-        "access_key_config": access_key_config_output,
-        "access_key_rotation_interval_days": access_key_rotation_interval_days_output,
-        "access_last_key_rotation_at": access_last_key_rotation_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-13": access_single_response_13_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_key_config": access_key_config,
+        "access_messages": access_messages,
+        "access_single_response-13": access_single_response$$13,
       },
     },
     annotations: {
@@ -229,14 +226,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_days_until_next_rotation": access_days_until_next_rotation_output,
-        "access_key_config": access_key_config_output,
-        "access_key_rotation_interval_days": access_key_rotation_interval_days_output,
-        "access_last_key_rotation_at": access_last_key_rotation_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-13": access_single_response_13_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_key_config": access_key_config,
+        "access_messages": access_messages,
+        "access_single_response-13": access_single_response$$13,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/tags/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/tags/outputs.ts
index 1d368057e..b56a7284c 100644
--- a/src/generated/forge-mcp/zeroTrust/access/tags/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/tags/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_name-13` in responses.
- */
-export const access_name_13_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_name_response` in responses.
  */
-export const access_name_response_output: JsonSchema = {
+export const access_name_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -23,7 +16,7 @@ export const access_name_response_output: JsonSchema = {
         "result": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/access_name-13"
+              "type": "string"
             }
           },
           "type": "object"
@@ -37,7 +30,7 @@ export const access_name_response_output: JsonSchema = {
 /**
  * The schema of `access_response_collection-16` in responses.
  */
-export const access_response_collection_16_output: JsonSchema = {
+export const access_response_collection$$16: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -59,7 +52,7 @@ export const access_response_collection_16_output: JsonSchema = {
 /**
  * The schema of `access_single_response-15` in responses.
  */
-export const access_single_response_15_output: JsonSchema = {
+export const access_single_response$$15: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -78,16 +71,32 @@ export const access_single_response_15_output: JsonSchema = {
 /**
  * The schema of `access_tag` in responses.
  */
-export const access_tag_output: JsonSchema = {
+export const access_tag: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "name": {
-      "$ref": "#/$defs/access_name-13"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/zeroTrust/access/tags/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/tags/schemas.ts
index 435ada0fa..aab168f94 100644
--- a/src/generated/forge-mcp/zeroTrust/access/tags/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/tags/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_name-13`.
- */
-export const access_name_13: JsonSchema = {
-  "description": "The name of the tag",
-  "type": "string"
-};
-
 /**
  * The schema of `access_tag_without_app_count`.
  */
@@ -18,14 +10,30 @@ export const access_tag_without_app_count: JsonSchema = {
   "description": "A tag",
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "name": {
-      "$ref": "#/$defs/access_name-13",
-      "description": "The name of the tag"
+      "description": "The name of the tag",
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/zeroTrust/access/tags/tools.ts b/src/generated/forge-mcp/zeroTrust/access/tags/tools.ts
index 4563164e3..4916208a5 100644
--- a/src/generated/forge-mcp/zeroTrust/access/tags/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/tags/tools.ts
@@ -1,76 +1,68 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_created_at_output,
-  access_messages_output,
-  access_timestamp_output,
-  access_updated_at_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
 import {
-  access_created_at,
-  access_identifier,
-  access_timestamp,
-  access_updated_at,
-} from "../../schemas.js";
-import {
-  access_name_13_output,
-  access_name_response_output,
-  access_response_collection_16_output,
-  access_single_response_15_output,
-  access_tag_output,
+  access_name_response,
+  access_response_collection$$16,
+  access_single_response$$15,
+  access_tag,
 } from "./outputs.js";
-import { access_name_13, access_tag_without_app_count } from "./schemas.js";
+import { access_tag_without_app_count } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.tags`.
+ * The tools of `zeroTrust.access.tags`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_tags_create",
+    name: "zeroTrust_access_tags_create",
     title: "Create a tag",
-    description: "Create a tag",
+    description: "Create a tag\n\nPOST /accounts/{account_id}/access/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "name": {
-              "$ref": "#/$defs/access_name-13",
-              "description": "The name of the tag"
+              "description": "The name of the tag",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
             }
           },
+          "required": [
+            "account_id"
+          ],
           "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_name-13": access_name_13,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-15",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_single_response-15": access_single_response_15_output,
-        "access_tag": access_tag_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-15": access_single_response$$15,
+        "access_tag": access_tag,
       },
     },
     annotations: {
@@ -92,15 +84,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_single_response-15": access_single_response_15_output,
-        "access_tag": access_tag_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-15": access_single_response$$15,
+        "access_tag": access_tag,
       },
     },
     request: (args) => ({
@@ -109,37 +97,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_tags_delete",
+    name: "zeroTrust_access_tags_delete",
     title: "Delete a tag",
-    description: "Delete a tag",
+    description: "Delete a tag\n\nDELETE /accounts/{account_id}/access/tags/{tag_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "tag_name": {
-          "$ref": "#/$defs/access_name-13",
-          "description": "The name of the tag"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "tag_name": {
+              "description": "The name of the tag",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_name"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_name-13": access_name_13,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_name_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_name_response": access_name_response_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_name_response": access_name_response,
       },
     },
     annotations: {
@@ -161,11 +154,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_name_response": access_name_response_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_name_response": access_name_response,
       },
     },
     request: (args) => ({
@@ -173,41 +165,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_tags_get",
+    name: "zeroTrust_access_tags_get",
     title: "Get a tag",
-    description: "Get a tag",
+    description: "Get a tag\n\nGET /accounts/{account_id}/access/tags/{tag_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "tag_name": {
-          "$ref": "#/$defs/access_name-13",
-          "description": "The name of the tag"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "tag_name": {
+              "description": "The name of the tag",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_name"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_name-13": access_name_13,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-15",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_single_response-15": access_single_response_15_output,
-        "access_tag": access_tag_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-15": access_single_response$$15,
+        "access_tag": access_tag,
       },
     },
     annotations: {
@@ -229,15 +223,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_single_response-15": access_single_response_15_output,
-        "access_tag": access_tag_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-15": access_single_response$$15,
+        "access_tag": access_tag,
       },
     },
     request: (args) => ({
@@ -245,46 +235,55 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_tags_list",
+    name: "zeroTrust_access_tags_list",
     title: "List tags",
-    description: "List tags",
+    description: "List tags\n\nGET /accounts/{account_id}/access/tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-16",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_response_collection-16": access_response_collection_16_output,
-        "access_tag": access_tag_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_response_collection-16": access_response_collection$$16,
+        "access_tag": access_tag,
       },
     },
     annotations: {
@@ -306,69 +305,66 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_response_collection-16": access_response_collection_16_output,
-        "access_tag": access_tag_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_response_collection-16": access_response_collection$$16,
+        "access_tag": access_tag,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/tags`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_tags_update",
+    name: "zeroTrust_access_tags_update",
     title: "Update a tag",
-    description: "Update a tag",
+    description: "Update a tag\n\nPUT /accounts/{account_id}/access/tags/{tag_name}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_tag_without_app_count"
         },
-        "tag_name": {
-          "$ref": "#/$defs/access_name-13",
-          "description": "The name of the tag"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "tag_name": {
+              "description": "The name of the tag",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "tag_name"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "tag_name"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_created_at": access_created_at,
-        "access_identifier": access_identifier,
-        "access_name-13": access_name_13,
         "access_tag_without_app_count": access_tag_without_app_count,
-        "access_timestamp": access_timestamp,
-        "access_updated_at": access_updated_at,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-15",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_single_response-15": access_single_response_15_output,
-        "access_tag": access_tag_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-15": access_single_response$$15,
+        "access_tag": access_tag,
       },
     },
     annotations: {
@@ -390,15 +386,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_name-13": access_name_13_output,
-        "access_single_response-15": access_single_response_15_output,
-        "access_tag": access_tag_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-15": access_single_response$$15,
+        "access_tag": access_tag,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/targets/bulk/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/targets/bulk/schemas.ts
index 5e4848286..48de265b4 100644
--- a/src/generated/forge-mcp/zeroTrust/access/targets/bulk/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/targets/bulk/schemas.ts
@@ -15,8 +15,9 @@ export const infra_BatchReplaceTargetTagsItem: JsonSchema = {
       "type": "object"
     },
     "target_id": {
-      "$ref": "#/$defs/infra_TargetId",
-      "description": "Target identifier"
+      "description": "Target identifier",
+      "format": "uuid",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/zeroTrust/access/targets/bulk/tools.ts b/src/generated/forge-mcp/zeroTrust/access/targets/bulk/tools.ts
index e7d115a74..67832d6f8 100644
--- a/src/generated/forge-mcp/zeroTrust/access/targets/bulk/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/targets/bulk/tools.ts
@@ -3,41 +3,33 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  infra_api_response_common_failure_output,
-  infra_api_response_single_output,
-  infra_messages_output,
+  infra_api$$response$$common$$failure,
+  infra_api$$response$$single,
+  infra_messages,
 } from "../../../../outputs.js";
-import { infra_AccountTag } from "../../../../schemas.js";
-import {
-  infra_IPInfo_output,
-  infra_TargetArray_output,
-  infra_TargetId_output,
-  infra_Target_output,
-} from "../outputs.js";
-import { infra_IPInfo, infra_TargetId } from "../schemas.js";
+import { infra_IPInfo, infra_Target, infra_TargetArray } from "../outputs.js";
+import { infra_IPInfo as infra_IPInfo$ } from "../schemas.js";
 import { infra_BatchReplaceTargetTagsItem } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.targets.bulk`.
+ * The tools of `zeroTrust.access.targets.bulk`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_targets_bulk_delete",
+    name: "zeroTrust_access_targets_bulk_delete",
     title: "Delete targets",
-    description: "Removes one or more targets.",
+    description: "Removes one or more targets.\n\nPOST /accounts/{account_id}/infrastructure/targets/batch_delete",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
         "body": {
           "properties": {
             "target_ids": {
               "description": "List of target IDs to bulk delete",
               "items": {
-                "$ref": "#/$defs/infra_TargetId"
+                "description": "Target identifier",
+                "format": "uuid",
+                "type": "string"
               },
               "type": "array"
             }
@@ -46,16 +38,26 @@ export const tools: readonly Tool[] = [
             "target_ids"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_TargetId": infra_TargetId,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -74,8 +76,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_messages": infra_messages_output,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
@@ -84,16 +86,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_targets_bulk_replace_tags",
+    name: "zeroTrust_access_targets_bulk_replaceTags",
     title: "Replace tags on existing targets",
-    description: "Replaces tags for one or more existing infrastructure access targets.",
+    description: "Replaces tags for one or more existing infrastructure access targets.\n\nPOST /accounts/{account_id}/infrastructure/targets/batch_tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
         "body": {
           "properties": {
             "items": {
@@ -107,16 +105,28 @@ export const tools: readonly Tool[] = [
             "items"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "infra_AccountTag": infra_AccountTag,
         "infra_BatchReplaceTargetTagsItem": infra_BatchReplaceTargetTagsItem,
-        "infra_TargetId": infra_TargetId,
       },
     },
     outputSchema: {
@@ -134,12 +144,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetArray": infra_TargetArray_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_TargetArray": infra_TargetArray,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -178,13 +187,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetArray": infra_TargetArray_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_TargetArray": infra_TargetArray,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
@@ -193,16 +201,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_targets_bulk_update",
+    name: "zeroTrust_access_targets_bulk_update",
     title: "Create new targets",
-    description: "Adds one or more targets.",
+    description: "Adds one or more targets.\n\nPUT /accounts/{account_id}/infrastructure/targets/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
         "body": {
           "items": {
             "properties": {
@@ -236,15 +240,28 @@ export const tools: readonly Tool[] = [
             "type": "object"
           },
           "type": "array"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_IPInfo": infra_IPInfo,
+        "infra_IPInfo": infra_IPInfo$,
       },
     },
     outputSchema: {
@@ -262,12 +279,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetArray": infra_TargetArray_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_TargetArray": infra_TargetArray,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -306,13 +322,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetArray": infra_TargetArray_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_TargetArray": infra_TargetArray,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/targets/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/targets/outputs.ts
index a995e71ed..0ecff040e 100644
--- a/src/generated/forge-mcp/zeroTrust/access/targets/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/targets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `infra_IPInfo` in responses.
  */
-export const infra_IPInfo_output: JsonSchema = {
+export const infra_IPInfo: JsonSchema = {
   "properties": {
     "ipv4": {
       "properties": {
@@ -39,7 +39,7 @@ export const infra_IPInfo_output: JsonSchema = {
 /**
  * The schema of `infra_Target` in responses.
  */
-export const infra_Target_output: JsonSchema = {
+export const infra_Target: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -49,7 +49,8 @@ export const infra_Target_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/infra_TargetId"
+      "format": "uuid",
+      "type": "string"
     },
     "ip": {
       "$ref": "#/$defs/infra_IPInfo"
@@ -85,17 +86,9 @@ export const infra_Target_output: JsonSchema = {
 /**
  * The schema of `infra_TargetArray` in responses.
  */
-export const infra_TargetArray_output: JsonSchema = {
+export const infra_TargetArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/infra_Target"
   },
   "type": "array"
 };
-
-/**
- * The schema of `infra_TargetId` in responses.
- */
-export const infra_TargetId_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/targets/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/targets/schemas.ts
index 3dfc447d5..7897230f2 100644
--- a/src/generated/forge-mcp/zeroTrust/access/targets/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/targets/schemas.ts
@@ -42,23 +42,3 @@ export const infra_IPInfo: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `infra_SortingDirection`.
- */
-export const infra_SortingDirection: JsonSchema = {
-  "enum": [
-    "asc",
-    "desc"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `infra_TargetId`.
- */
-export const infra_TargetId: JsonSchema = {
-  "description": "Target identifier",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/targets/tools.ts b/src/generated/forge-mcp/zeroTrust/access/targets/tools.ts
index 81f4eb3ae..d1b556c2d 100644
--- a/src/generated/forge-mcp/zeroTrust/access/targets/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/targets/tools.ts
@@ -1,42 +1,28 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  infra_api_response_collection_output,
-  infra_api_response_common_failure_output,
-  infra_api_response_common_output,
-  infra_api_response_single_output,
-  infra_messages_output,
+  infra_api$$response$$collection,
+  infra_api$$response$$common,
+  infra_api$$response$$common$$failure,
+  infra_api$$response$$single,
+  infra_messages,
 } from "../../../outputs.js";
-import { infra_AccountTag } from "../../../schemas.js";
-import {
-  infra_IPInfo_output,
-  infra_TargetArray_output,
-  infra_TargetId_output,
-  infra_Target_output,
-} from "./outputs.js";
-import {
-  infra_IPInfo,
-  infra_SortingDirection,
-  infra_TargetId,
-} from "./schemas.js";
+import { infra_IPInfo, infra_Target, infra_TargetArray } from "./outputs.js";
+import { infra_IPInfo as infra_IPInfo$ } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.targets`.
+ * The tools of `zeroTrust.access.targets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_targets_create",
+    name: "zeroTrust_access_targets_create",
     title: "Create new target",
-    description: "Creates a new infrastructure access target in the account.",
+    description: "Creates a new infrastructure access target in the account.\n\nPOST /accounts/{account_id}/infrastructure/targets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
         "body": {
           "properties": {
             "hostname": {
@@ -67,15 +53,28 @@ export const tools: readonly Tool[] = [
             "ip"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_IPInfo": infra_IPInfo,
+        "infra_IPInfo": infra_IPInfo$,
       },
     },
     outputSchema: {
@@ -93,11 +92,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -131,12 +129,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
@@ -145,29 +142,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_targets_delete",
+    name: "zeroTrust_access_targets_delete",
     title: "Delete target",
-    description: "Removes a single infrastructure access target by its ID.",
+    description: "Removes a single infrastructure access target by its ID.\n\nDELETE /accounts/{account_id}/infrastructure/targets/{target_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
-        "target_id": {
-          "$ref": "#/$defs/infra_TargetId",
-          "description": "Target identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            },
+            "target_id": {
+              "description": "Target identifier",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "target_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "target_id"
+        "path"
       ],
-      $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_TargetId": infra_TargetId,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -186,8 +190,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_messages": infra_messages_output,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
@@ -195,29 +199,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_targets_get",
+    name: "zeroTrust_access_targets_get",
     title: "Get target",
-    description: "Fetches a single infrastructure access target by its ID.",
+    description: "Fetches a single infrastructure access target by its ID.\n\nGET /accounts/{account_id}/infrastructure/targets/{target_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
-        "target_id": {
-          "$ref": "#/$defs/infra_TargetId",
-          "description": "Target identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            },
+            "target_id": {
+              "description": "Target identifier",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "target_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "target_id"
+        "path"
       ],
-      $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_TargetId": infra_TargetId,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -234,11 +245,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -272,12 +282,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
@@ -285,227 +294,243 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_targets_list",
+    name: "zeroTrust_access_targets_list",
     title: "List all targets",
-    description: "Lists and sorts an account's targets. Filters are optional and are ANDed\ntogether.",
+    description: "Lists and sorts an account's targets. Filters are optional and are ANDed\ntogether.\n\nGET /accounts/{account_id}/infrastructure/targets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
-        "created_after": {
-          "description": "Date and time at which the target was created after (inclusive)",
-          "oneOf": [
-            {
-              "format": "date-time",
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
               "type": "string"
-            },
-            {
-              "type": "null"
             }
-          ]
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "created_before": {
-          "description": "Date and time at which the target was created before (inclusive)",
-          "oneOf": [
-            {
-              "format": "date-time",
-              "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "created_after": {
+              "description": "Date and time at which the target was created after (inclusive)",
+              "oneOf": [
+                {
+                  "format": "date-time",
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "direction": {
-          "$ref": "#/$defs/infra_SortingDirection",
-          "description": "The sorting direction."
-        },
-        "hostname": {
-          "description": "Hostname of a target",
-          "oneOf": [
-            {
-              "type": "string"
+            "created_before": {
+              "description": "Date and time at which the target was created before (inclusive)",
+              "oneOf": [
+                {
+                  "format": "date-time",
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "hostname_contains": {
-          "description": "Partial match to the hostname of a target",
-          "oneOf": [
-            {
+            "direction": {
+              "description": "The sorting direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
               "type": "string"
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "ip_like": {
-          "description": "Filters for targets whose IP addresses look like the specified string.\nSupports `*` as a wildcard character",
-          "oneOf": [
-            {
-              "type": "string"
+            "hostname": {
+              "description": "Hostname of a target",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "ip_v4": {
-          "description": "IPv4 address of the target",
-          "oneOf": [
-            {
-              "type": "string"
+            "hostname_contains": {
+              "description": "Partial match to the hostname of a target",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "ip_v6": {
-          "description": "IPv6 address of the target",
-          "oneOf": [
-            {
-              "type": "string"
+            "ip_like": {
+              "description": "Filters for targets whose IP addresses look like the specified string.\nSupports `*` as a wildcard character",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "ips": {
-          "description": "Filters for targets that have any of the following IP addresses. Specify\n`ips` multiple times in query parameter to build list of candidates.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "ipv4_end": {
-          "description": "Defines an IPv4 filter range's ending value (inclusive). Requires\n`ipv4_start` to be specified as well.",
-          "oneOf": [
-            {
-              "type": "string"
+            "ip_v4": {
+              "description": "IPv4 address of the target",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "ipv4_start": {
-          "description": "Defines an IPv4 filter range's starting value (inclusive). Requires\n`ipv4_end` to be specified as well.",
-          "oneOf": [
-            {
-              "type": "string"
+            "ip_v6": {
+              "description": "IPv6 address of the target",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "ipv6_end": {
-          "description": "Defines an IPv6 filter range's ending value (inclusive). Requires\n`ipv6_start` to be specified as well.",
-          "oneOf": [
-            {
-              "type": "string"
+            "ips": {
+              "description": "Filters for targets that have any of the following IP addresses. Specify\n`ips` multiple times in query parameter to build list of candidates.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "ipv6_start": {
-          "description": "Defines an IPv6 filter range's starting value (inclusive). Requires\n`ipv6_end` to be specified as well.",
-          "oneOf": [
-            {
-              "type": "string"
+            "ipv4_end": {
+              "description": "Defines an IPv4 filter range's ending value (inclusive). Requires\n`ipv4_start` to be specified as well.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "modified_after": {
-          "description": "Date and time at which the target was modified after (inclusive)",
-          "oneOf": [
-            {
-              "format": "date-time",
-              "type": "string"
+            "ipv4_start": {
+              "description": "Defines an IPv4 filter range's starting value (inclusive). Requires\n`ipv4_end` to be specified as well.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "modified_before": {
-          "description": "Date and time at which the target was modified before (inclusive)",
-          "oneOf": [
-            {
-              "format": "date-time",
-              "type": "string"
+            "ipv6_end": {
+              "description": "Defines an IPv6 filter range's ending value (inclusive). Requires\n`ipv6_start` to be specified as well.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "order": {
-          "description": "The field to sort by.",
-          "enum": [
-            "hostname",
-            "created_at"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Current page in the response",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 1000,
-          "description": "Max amount of entries returned per page",
-          "type": "integer"
-        },
-        "tag": {
-          "description": "Filter by tag key:value pairs. Multiple `tag` params are AND'd.\nFormat: `tag=key:value` (e.g., `tag=environment:production`).\nKey and value must both be non-empty; `tag=:value` and `tag=key:` return 400.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "target_ids": {
-          "description": "Filters for targets that have any of the following UUIDs. Specify\n`target_ids` multiple times in query parameter to build list of\ncandidates.",
-          "items": {
-            "format": "uuid",
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "virtual_network_id": {
-          "description": "Private virtual network identifier of the target",
-          "oneOf": [
-            {
-              "format": "uuid",
+            "ipv6_start": {
+              "description": "Defines an IPv6 filter range's starting value (inclusive). Requires\n`ipv6_end` to be specified as well.",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "modified_after": {
+              "description": "Date and time at which the target was modified after (inclusive)",
+              "oneOf": [
+                {
+                  "format": "date-time",
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "modified_before": {
+              "description": "Date and time at which the target was modified before (inclusive)",
+              "oneOf": [
+                {
+                  "format": "date-time",
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "order": {
+              "description": "The field to sort by.",
+              "enum": [
+                "hostname",
+                "created_at"
+              ],
               "type": "string"
             },
-            {
-              "type": "null"
+            "page": {
+              "default": 1,
+              "description": "Current page in the response",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 1000,
+              "description": "Max amount of entries returned per page",
+              "type": "integer"
+            },
+            "tag": {
+              "description": "Filter by tag key:value pairs. Multiple `tag` params are AND'd.\nFormat: `tag=key:value` (e.g., `tag=environment:production`).\nKey and value must both be non-empty; `tag=:value` and `tag=key:` return 400.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "target_ids": {
+              "description": "Filters for targets that have any of the following UUIDs. Specify\n`target_ids` multiple times in query parameter to build list of\ncandidates.",
+              "items": {
+                "format": "uuid",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "virtual_network_id": {
+              "description": "Private virtual network identifier of the target",
+              "oneOf": [
+                {
+                  "format": "uuid",
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
-          ]
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_SortingDirection": infra_SortingDirection,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -522,13 +547,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetArray": infra_TargetArray_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-collection": infra_api_response_collection_output,
-        "infra_api-response-common": infra_api_response_common_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_TargetArray": infra_TargetArray,
+        "infra_api-response-collection": infra_api$$response$$collection,
+        "infra_api-response-common": infra_api$$response$$common,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -562,54 +586,49 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetArray": infra_TargetArray_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-collection": infra_api_response_collection_output,
-        "infra_api-response-common": infra_api_response_common_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_TargetArray": infra_TargetArray,
+        "infra_api-response-collection": infra_api$$response$$collection,
+        "infra_api-response-common": infra_api$$response$$common,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/infrastructure/targets`,
       query: [
-        ["hostname", args["hostname"], true],
-        ["hostname_contains", args["hostname_contains"], true],
-        ["virtual_network_id", args["virtual_network_id"], true],
-        ["ip_v4", args["ip_v4"], true],
-        ["ip_v6", args["ip_v6"], true],
-        ["created_before", args["created_before"], true],
-        ["created_after", args["created_after"], true],
-        ["modified_before", args["modified_before"], true],
-        ["modified_after", args["modified_after"], true],
-        ["ips", args["ips"], true],
-        ["target_ids", args["target_ids"], true],
-        ["ip_like", args["ip_like"], true],
-        ["ipv4_start", args["ipv4_start"], true],
-        ["ipv4_end", args["ipv4_end"], true],
-        ["ipv6_start", args["ipv6_start"], true],
-        ["ipv6_end", args["ipv6_end"], true],
-        ["tag", args["tag"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["hostname", param(args, "query", "hostname"), true],
+        ["hostname_contains", param(args, "query", "hostname_contains"), true],
+        ["virtual_network_id", param(args, "query", "virtual_network_id"), true],
+        ["ip_v4", param(args, "query", "ip_v4"), true],
+        ["ip_v6", param(args, "query", "ip_v6"), true],
+        ["created_before", param(args, "query", "created_before"), true],
+        ["created_after", param(args, "query", "created_after"), true],
+        ["modified_before", param(args, "query", "modified_before"), true],
+        ["modified_after", param(args, "query", "modified_after"), true],
+        ["ips", param(args, "query", "ips"), true],
+        ["target_ids", param(args, "query", "target_ids"), true],
+        ["ip_like", param(args, "query", "ip_like"), true],
+        ["ipv4_start", param(args, "query", "ipv4_start"), true],
+        ["ipv4_end", param(args, "query", "ipv4_end"), true],
+        ["ipv6_start", param(args, "query", "ipv6_start"), true],
+        ["ipv6_end", param(args, "query", "ipv6_end"), true],
+        ["tag", param(args, "query", "tag"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_targets_update",
+    name: "zeroTrust_access_targets_update",
     title: "Update target",
-    description: "Updates an existing infrastructure access target by its ID.",
+    description: "Updates an existing infrastructure access target by its ID.\n\nPUT /accounts/{account_id}/infrastructure/targets/{target_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/infra_AccountTag",
-          "description": "Account identifier"
-        },
         "body": {
           "properties": {
             "hostname": {
@@ -641,20 +660,33 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "target_id": {
-          "$ref": "#/$defs/infra_TargetId",
-          "description": "Target identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account identifier",
+              "type": "string"
+            },
+            "target_id": {
+              "description": "Target identifier",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "target_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "target_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "infra_AccountTag": infra_AccountTag,
-        "infra_IPInfo": infra_IPInfo,
-        "infra_TargetId": infra_TargetId,
+        "infra_IPInfo": infra_IPInfo$,
       },
     },
     outputSchema: {
@@ -672,11 +704,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     annotations: {
@@ -710,12 +741,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "infra_IPInfo": infra_IPInfo_output,
-        "infra_Target": infra_Target_output,
-        "infra_TargetId": infra_TargetId_output,
-        "infra_api-response-common-failure": infra_api_response_common_failure_output,
-        "infra_api-response-single": infra_api_response_single_output,
-        "infra_messages": infra_messages_output,
+        "infra_IPInfo": infra_IPInfo,
+        "infra_Target": infra_Target,
+        "infra_api-response-common-failure": infra_api$$response$$common$$failure,
+        "infra_api-response-single": infra_api$$response$$single,
+        "infra_messages": infra_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/userPopulations/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/userPopulations/outputs.ts
index a4559841c..9257b29c5 100644
--- a/src/generated/forge-mcp/zeroTrust/access/userPopulations/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/userPopulations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `access_response_collection-3` in responses.
  */
-export const access_response_collection_3_output: JsonSchema = {
+export const access_response_collection$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -28,7 +28,7 @@ export const access_response_collection_3_output: JsonSchema = {
 /**
  * The schema of `access_single_response-5` in responses.
  */
-export const access_single_response_5_output: JsonSchema = {
+export const access_single_response$$5: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -47,19 +47,35 @@ export const access_single_response_5_output: JsonSchema = {
 /**
  * The schema of `access_user_population` in responses.
  */
-export const access_user_population_output: JsonSchema = {
+export const access_user_population: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "id": {
-      "$ref": "#/$defs/access_uuid"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_user_population_name"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "required": [
@@ -70,10 +86,3 @@ export const access_user_population_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `access_user_population_name` in responses.
- */
-export const access_user_population_name_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/userPopulations/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/userPopulations/schemas.ts
index fb6cee4cf..163ce2945 100644
--- a/src/generated/forge-mcp/zeroTrust/access/userPopulations/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/userPopulations/schemas.ts
@@ -3,22 +3,14 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_user_population_name`.
- */
-export const access_user_population_name: JsonSchema = {
-  "description": "The name of the user population. Leading and trailing whitespace is trimmed before validation. After trimming, the name must contain at least one non-whitespace character and must not exceed 128 UTF-8 bytes.\n",
-  "type": "string"
-};
-
 /**
  * The schema of `access_user_population_request`.
  */
 export const access_user_population_request: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/access_user_population_name",
-      "description": "The name of the user population. Leading and trailing whitespace is trimmed before validation. After trimming, the name must contain at least one non-whitespace character and must not exceed 128 UTF-8 bytes.\n"
+      "description": "The name of the user population. Leading and trailing whitespace is trimmed before validation. After trimming, the name must contain at least one non-whitespace character and must not exceed 128 UTF-8 bytes.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/zeroTrust/access/userPopulations/tools.ts b/src/generated/forge-mcp/zeroTrust/access/userPopulations/tools.ts
index 169787c95..bf21e2076 100644
--- a/src/generated/forge-mcp/zeroTrust/access/userPopulations/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/userPopulations/tools.ts
@@ -1,72 +1,66 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_created_at_output,
-  access_id_response_output,
-  access_messages_output,
-  access_timestamp_output,
-  access_updated_at_output,
-  access_uuid_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_id_response,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier, access_uuid } from "../../schemas.js";
 import {
-  access_response_collection_3_output,
-  access_single_response_5_output,
-  access_user_population_name_output,
-  access_user_population_output,
+  access_response_collection$$3,
+  access_single_response$$5,
+  access_user_population,
 } from "./outputs.js";
-import {
-  access_user_population_name,
-  access_user_population_request,
-} from "./schemas.js";
+import { access_user_population_request } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.user_populations`.
+ * The tools of `zeroTrust.access.userPopulations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_user_populations_create",
+    name: "zeroTrust_access_userPopulations_create",
     title: "Create a user population",
-    description: "Creates a user population in an account.",
+    description: "Creates a user population in an account.\n\nPOST /accounts/{account_id}/access/user_populations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_user_population_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_identifier": access_identifier,
-        "access_user_population_name": access_user_population_name,
         "access_user_population_request": access_user_population_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-5",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-5": access_single_response_5_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_population": access_user_population_output,
-        "access_user_population_name": access_user_population_name_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-5": access_single_response$$5,
+        "access_user_population": access_user_population,
       },
     },
     annotations: {
@@ -88,16 +82,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-5": access_single_response_5_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_population": access_user_population_output,
-        "access_user_population_name": access_user_population_name_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-5": access_single_response$$5,
+        "access_user_population": access_user_population,
       },
     },
     request: (args) => ({
@@ -106,37 +95,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_user_populations_delete",
+    name: "zeroTrust_access_userPopulations_delete",
     title: "Delete a user population",
-    description: "Deletes a user population that is not attached to an application.",
+    description: "Deletes a user population that is not attached to an application.\n\nDELETE /accounts/{account_id}/access/user_populations/{user_population_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -158,11 +152,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -170,42 +163,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_user_populations_get",
+    name: "zeroTrust_access_userPopulations_get",
     title: "Get a user population",
-    description: "Fetches a user population.",
+    description: "Fetches a user population.\n\nGET /accounts/{account_id}/access/user_populations/{user_population_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-5",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-5": access_single_response_5_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_population": access_user_population_output,
-        "access_user_population_name": access_user_population_name_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-5": access_single_response$$5,
+        "access_user_population": access_user_population,
       },
     },
     annotations: {
@@ -227,16 +221,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-5": access_single_response_5_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_population": access_user_population_output,
-        "access_user_population_name": access_user_population_name_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-5": access_single_response$$5,
+        "access_user_population": access_user_population,
       },
     },
     request: (args) => ({
@@ -244,47 +233,55 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_user_populations_list",
+    name: "zeroTrust_access_userPopulations_list",
     title: "List user populations",
-    description: "Lists the user populations in an account.",
+    description: "Lists the user populations in an account.\n\nGET /accounts/{account_id}/access/user_populations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 100,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-3",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_response_collection-3": access_response_collection_3_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_population": access_user_population_output,
-        "access_user_population_name": access_user_population_name_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_response_collection-3": access_response_collection$$3,
+        "access_user_population": access_user_population,
       },
     },
     annotations: {
@@ -306,70 +303,67 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_response_collection-3": access_response_collection_3_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_population": access_user_population_output,
-        "access_user_population_name": access_user_population_name_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_response_collection-3": access_response_collection$$3,
+        "access_user_population": access_user_population,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/user_populations`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_user_populations_update",
+    name: "zeroTrust_access_userPopulations_update",
     title: "Update a user population",
-    description: "Updates a user population's name.",
+    description: "Updates a user population's name.\n\nPUT /accounts/{account_id}/access/user_populations/{user_population_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_user_population_request"
         },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_identifier": access_identifier,
-        "access_user_population_name": access_user_population_name,
         "access_user_population_request": access_user_population_request,
-        "access_uuid": access_uuid,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-5",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-5": access_single_response_5_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_population": access_user_population_output,
-        "access_user_population_name": access_user_population_name_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-5": access_single_response$$5,
+        "access_user_population": access_user_population,
       },
     },
     annotations: {
@@ -391,16 +385,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_messages": access_messages_output,
-        "access_single_response-5": access_single_response_5_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_population": access_user_population_output,
-        "access_user_population_name": access_user_population_name_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_response-5": access_single_response$$5,
+        "access_user_population": access_user_population,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/userPopulations/users/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/userPopulations/users/outputs.ts
index 4b765342c..8dbeed52b 100644
--- a/src/generated/forge-mcp/zeroTrust/access/userPopulations/users/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/userPopulations/users/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_scim_email` in responses.
  */
-export const access_scim_email_output: JsonSchema = {
+export const access_scim_email: JsonSchema = {
   "properties": {
     "primary": {
       "type": "boolean"
@@ -24,7 +24,7 @@ export const access_scim_email_output: JsonSchema = {
 /**
  * The schema of `access_scim_meta` in responses.
  */
-export const access_scim_meta_output: JsonSchema = {
+export const access_scim_meta: JsonSchema = {
   "properties": {
     "created": {
       "format": "date-time",
@@ -50,7 +50,7 @@ export const access_scim_meta_output: JsonSchema = {
 /**
  * The schema of `access_scim_name` in responses.
  */
-export const access_scim_name_output: JsonSchema = {
+export const access_scim_name: JsonSchema = {
   "properties": {
     "familyName": {
       "type": "string"
@@ -77,7 +77,7 @@ export const access_scim_name_output: JsonSchema = {
 /**
  * The schema of `access_scim_user` in responses.
  */
-export const access_scim_user_output: JsonSchema = {
+export const access_scim_user: JsonSchema = {
   "properties": {
     "active": {
       "type": "boolean"
@@ -119,7 +119,7 @@ export const access_scim_user_output: JsonSchema = {
 /**
  * The schema of `access_scim_user_collection_response` in responses.
  */
-export const access_scim_user_collection_response_output: JsonSchema = {
+export const access_scim_user_collection_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -138,7 +138,7 @@ export const access_scim_user_collection_response_output: JsonSchema = {
 /**
  * The schema of `access_scim_user_list_response` in responses.
  */
-export const access_scim_user_list_response_output: JsonSchema = {
+export const access_scim_user_list_response: JsonSchema = {
   "properties": {
     "Resources": {
       "items": {
@@ -175,7 +175,7 @@ export const access_scim_user_list_response_output: JsonSchema = {
 /**
  * The schema of `access_scim_user_single_response` in responses.
  */
-export const access_scim_user_single_response_output: JsonSchema = {
+export const access_scim_user_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/userPopulations/users/tools.ts b/src/generated/forge-mcp/zeroTrust/access/userPopulations/users/tools.ts
index 60e3ae4f9..35d8abbcf 100644
--- a/src/generated/forge-mcp/zeroTrust/access/userPopulations/users/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/userPopulations/users/tools.ts
@@ -1,77 +1,84 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
-import {
-  access_scim_email_output,
-  access_scim_meta_output,
-  access_scim_name_output,
-  access_scim_user_collection_response_output,
-  access_scim_user_list_response_output,
-  access_scim_user_output,
-  access_scim_user_single_response_output,
-} from "./outputs.js";
 import {
   access_scim_email,
   access_scim_meta,
   access_scim_name,
-  access_scim_patch_request,
   access_scim_user,
+  access_scim_user_collection_response,
+  access_scim_user_list_response,
+  access_scim_user_single_response,
+} from "./outputs.js";
+import {
+  access_scim_email as access_scim_email$,
+  access_scim_meta as access_scim_meta$,
+  access_scim_name as access_scim_name$,
+  access_scim_patch_request,
+  access_scim_user as access_scim_user$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.user_populations.users`.
+ * The tools of `zeroTrust.access.userPopulations.users`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_user_populations_users_create",
+    name: "zeroTrust_access_userPopulations_users_create",
     title: "Create a user population user",
-    description: "Creates a SCIM user in a user population.",
+    description: "Creates a SCIM user in a user population.\n\nPOST /accounts/{account_id}/access/user_populations/{user_population_id}/users",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_scim_user"
         },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_identifier": access_identifier,
-        "access_scim_email": access_scim_email,
-        "access_scim_meta": access_scim_meta,
-        "access_scim_name": access_scim_name,
-        "access_scim_user": access_scim_user,
-        "access_uuid": access_uuid,
+        "access_scim_email": access_scim_email$,
+        "access_scim_meta": access_scim_meta$,
+        "access_scim_name": access_scim_name$,
+        "access_scim_user": access_scim_user$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_user_single_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_single_response": access_scim_user_single_response_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_single_response": access_scim_user_single_response,
       },
     },
     annotations: {
@@ -93,14 +100,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_single_response": access_scim_user_single_response_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_single_response": access_scim_user_single_response,
       },
     },
     request: (args) => ({
@@ -109,34 +116,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_user_populations_users_delete",
+    name: "zeroTrust_access_userPopulations_users_delete",
     title: "Delete a user population user",
-    description: "Deletes a SCIM user from a user population.",
+    description: "Deletes a SCIM user from a user population.\n\nDELETE /accounts/{account_id}/access/user_populations/{user_population_id}/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "user_id": {
-          "description": "The SCIM user identifier.",
-          "type": "string"
-        },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "The SCIM user identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -155,8 +168,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -164,53 +177,65 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_user_populations_users_get",
+    name: "zeroTrust_access_userPopulations_users_get",
     title: "Get a user population user",
-    description: "Fetches a SCIM user from a user population.",
+    description: "Fetches a SCIM user from a user population.\n\nGET /accounts/{account_id}/access/user_populations/{user_population_id}/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "attributes": {
-          "description": "Comma-separated SCIM attributes to return.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "The SCIM user identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id",
+            "user_id"
+          ],
+          "type": "object"
         },
-        "excluded_attributes": {
-          "description": "Comma-separated SCIM attributes to exclude from the response.",
-          "type": "string"
-        },
-        "user_id": {
-          "description": "The SCIM user identifier.",
-          "type": "string"
-        },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "attributes": {
+              "description": "Comma-separated SCIM attributes to return.",
+              "type": "string"
+            },
+            "excludedAttributes": {
+              "description": "Comma-separated SCIM attributes to exclude from the response.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_user_single_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_single_response": access_scim_user_single_response_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_single_response": access_scim_user_single_response,
       },
     },
     annotations: {
@@ -232,81 +257,93 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_single_response": access_scim_user_single_response_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_single_response": access_scim_user_single_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/user_populations/${pathParam(args, "user_population_id")}/users/${pathParam(args, "user_id")}`,
       query: [
-        ["attributes", args["attributes"], true],
-        ["excludedAttributes", args["excluded_attributes"], true],
+        ["attributes", param(args, "query", "attributes"), true],
+        ["excludedAttributes", param(args, "query", "excludedAttributes"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_user_populations_users_list",
+    name: "zeroTrust_access_userPopulations_users_list",
     title: "List users in a user population",
-    description: "Lists SCIM users in a user population.",
+    description: "Lists SCIM users in a user population.\n\nGET /accounts/{account_id}/access/user_populations/{user_population_id}/users",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "attributes": {
-          "description": "Comma-separated SCIM attributes to return.",
-          "type": "string"
-        },
-        "count": {
-          "description": "The maximum number of results to return.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id"
+          ],
+          "type": "object"
         },
-        "excluded_attributes": {
-          "description": "Comma-separated SCIM attributes to exclude from the response.",
-          "type": "string"
-        },
-        "filter": {
-          "description": "A SCIM filter expression.",
-          "type": "string"
-        },
-        "start_index": {
-          "default": 1,
-          "description": "The 1-based index of the first result to return.",
-          "type": "integer"
-        },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "attributes": {
+              "description": "Comma-separated SCIM attributes to return.",
+              "type": "string"
+            },
+            "count": {
+              "description": "The maximum number of results to return.",
+              "type": "integer"
+            },
+            "excludedAttributes": {
+              "description": "Comma-separated SCIM attributes to exclude from the response.",
+              "type": "string"
+            },
+            "filter": {
+              "description": "A SCIM filter expression.",
+              "type": "string"
+            },
+            "startIndex": {
+              "default": 1,
+              "description": "The 1-based index of the first result to return.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_user_collection_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_collection_response": access_scim_user_collection_response_output,
-        "access_scim_user_list_response": access_scim_user_list_response_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_collection_response": access_scim_user_collection_response,
+        "access_scim_user_list_response": access_scim_user_list_response,
       },
     },
     annotations: {
@@ -328,76 +365,84 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_collection_response": access_scim_user_collection_response_output,
-        "access_scim_user_list_response": access_scim_user_list_response_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_collection_response": access_scim_user_collection_response,
+        "access_scim_user_list_response": access_scim_user_list_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/user_populations/${pathParam(args, "user_population_id")}/users`,
       query: [
-        ["filter", args["filter"], true],
-        ["startIndex", args["start_index"], true],
-        ["count", args["count"], true],
-        ["attributes", args["attributes"], true],
-        ["excludedAttributes", args["excluded_attributes"], true],
+        ["filter", param(args, "query", "filter"), true],
+        ["startIndex", param(args, "query", "startIndex"), true],
+        ["count", param(args, "query", "count"), true],
+        ["attributes", param(args, "query", "attributes"), true],
+        ["excludedAttributes", param(args, "query", "excludedAttributes"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_user_populations_users_replace",
+    name: "zeroTrust_access_userPopulations_users_replace",
     title: "Replace a user population user",
-    description: "Replaces a SCIM user in a user population.",
+    description: "Replaces a SCIM user in a user population.\n\nPUT /accounts/{account_id}/access/user_populations/{user_population_id}/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_scim_user"
         },
-        "user_id": {
-          "description": "The SCIM user identifier.",
-          "type": "string"
-        },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "The SCIM user identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id",
-        "user_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_identifier": access_identifier,
-        "access_scim_email": access_scim_email,
-        "access_scim_meta": access_scim_meta,
-        "access_scim_name": access_scim_name,
-        "access_scim_user": access_scim_user,
-        "access_uuid": access_uuid,
+        "access_scim_email": access_scim_email$,
+        "access_scim_meta": access_scim_meta$,
+        "access_scim_name": access_scim_name$,
+        "access_scim_user": access_scim_user$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_user_single_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_single_response": access_scim_user_single_response_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_single_response": access_scim_user_single_response,
       },
     },
     annotations: {
@@ -419,14 +464,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_single_response": access_scim_user_single_response_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_single_response": access_scim_user_single_response,
       },
     },
     request: (args) => ({
@@ -435,50 +480,58 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_user_populations_users_update",
+    name: "zeroTrust_access_userPopulations_users_update",
     title: "Update a user population user",
-    description: "Updates a SCIM user in a user population.",
+    description: "Updates a SCIM user in a user population.\n\nPATCH /accounts/{account_id}/access/user_populations/{user_population_id}/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_scim_patch_request"
         },
-        "user_id": {
-          "description": "The SCIM user identifier.",
-          "type": "string"
-        },
-        "user_population_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "The SCIM user identifier.",
+              "type": "string"
+            },
+            "user_population_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_population_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_population_id",
-        "user_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_identifier": access_identifier,
         "access_scim_patch_request": access_scim_patch_request,
-        "access_uuid": access_uuid,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_user_single_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_single_response": access_scim_user_single_response_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_single_response": access_scim_user_single_response,
       },
     },
     annotations: {
@@ -500,14 +553,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_scim_email": access_scim_email_output,
-        "access_scim_meta": access_scim_meta_output,
-        "access_scim_name": access_scim_name_output,
-        "access_scim_user": access_scim_user_output,
-        "access_scim_user_single_response": access_scim_user_single_response_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_scim_email": access_scim_email,
+        "access_scim_meta": access_scim_meta,
+        "access_scim_name": access_scim_name,
+        "access_scim_user": access_scim_user,
+        "access_scim_user_single_response": access_scim_user_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/outputs.ts
index 551dafd72..2cb559458 100644
--- a/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_active_session_response` in responses.
  */
-export const access_active_session_response_output: JsonSchema = {
+export const access_active_session_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -37,7 +37,7 @@ export const access_active_session_response_output: JsonSchema = {
 /**
  * The schema of `access_active_sessions_response` in responses.
  */
-export const access_active_sessions_response_output: JsonSchema = {
+export const access_active_sessions_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/schemas.ts b/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/schemas.ts
deleted file mode 100644
index fc09123eb..000000000
--- a/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/schemas.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../../_/tool.js";
-
-/**
- * The schema of `access_nonce`.
- */
-export const access_nonce: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/tools.ts b/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/tools.ts
index 08f44c70b..e6a17d686 100644
--- a/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/users/activeSessions/tools.ts
@@ -3,73 +3,76 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
 import {
-  access_device_posture_check_output,
-  access_device_posture_rule_2_output,
-  access_device_session_output,
-  access_geo_output,
-  access_identity_output,
-  access_string_key_map_device_session_output,
+  access_device_posture_check,
+  access_device_posture_rule$$2,
+  access_device_session,
+  access_geo,
+  access_identity,
+  access_string_key_map_device_session,
 } from "../outputs.js";
 import {
-  access_active_session_response_output,
-  access_active_sessions_response_output,
+  access_active_session_response,
+  access_active_sessions_response,
 } from "./outputs.js";
-import { access_nonce } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.access.users.active_sessions`.
+ * The tools of `zeroTrust.access.users.activeSessions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_users_active_sessions_get",
+    name: "zeroTrust_access_users_activeSessions_get",
     title: "Get single active session",
-    description: "Get an active session for a single user.",
+    description: "Get an active session for a single user.\n\nGET /accounts/{account_id}/access/users/{user_id}/active_sessions/{nonce}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "nonce": {
-          "$ref": "#/$defs/access_nonce"
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "nonce": {
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id",
+            "nonce"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id",
-        "nonce"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_nonce": access_nonce,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_active_session_response",
       $defs: {
-        "access_active_session_response": access_active_session_response_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_device_posture_check": access_device_posture_check_output,
-        "access_device_posture_rule-2": access_device_posture_rule_2_output,
-        "access_device_session": access_device_session_output,
-        "access_geo": access_geo_output,
-        "access_identity": access_identity_output,
-        "access_messages": access_messages_output,
-        "access_string_key_map_device_session": access_string_key_map_device_session_output,
+        "access_active_session_response": access_active_session_response,
+        "access_api-response-single": access_api$$response$$single,
+        "access_device_posture_check": access_device_posture_check,
+        "access_device_posture_rule-2": access_device_posture_rule$$2,
+        "access_device_session": access_device_session,
+        "access_geo": access_geo,
+        "access_identity": access_identity,
+        "access_messages": access_messages,
+        "access_string_key_map_device_session": access_string_key_map_device_session,
       },
     },
     annotations: {
@@ -96,16 +99,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_active_session_response": access_active_session_response_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_device_posture_check": access_device_posture_check_output,
-        "access_device_posture_rule-2": access_device_posture_rule_2_output,
-        "access_device_session": access_device_session_output,
-        "access_geo": access_geo_output,
-        "access_identity": access_identity_output,
-        "access_messages": access_messages_output,
-        "access_string_key_map_device_session": access_string_key_map_device_session_output,
+        "access_active_session_response": access_active_session_response,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_device_posture_check": access_device_posture_check,
+        "access_device_posture_rule-2": access_device_posture_rule$$2,
+        "access_device_session": access_device_session,
+        "access_geo": access_geo,
+        "access_identity": access_identity,
+        "access_messages": access_messages,
+        "access_string_key_map_device_session": access_string_key_map_device_session,
       },
     },
     request: (args) => ({
@@ -113,37 +116,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_users_active_sessions_list",
+    name: "zeroTrust_access_users_activeSessions_list",
     title: "Get active sessions",
-    description: "Get active sessions for a single user.",
+    description: "Get active sessions for a single user.\n\nGET /accounts/{account_id}/access/users/{user_id}/active_sessions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_active_sessions_response",
       $defs: {
-        "access_active_sessions_response": access_active_sessions_response_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_messages": access_messages_output,
+        "access_active_sessions_response": access_active_sessions_response,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -170,11 +179,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_active_sessions_response": access_active_sessions_response_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_messages": access_messages_output,
+        "access_active_sessions_response": access_active_sessions_response,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/failedLogins/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/users/failedLogins/outputs.ts
index 7003d2df7..876a115f8 100644
--- a/src/generated/forge-mcp/zeroTrust/access/users/failedLogins/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/users/failedLogins/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_failed_login_response` in responses.
  */
-export const access_failed_login_response_output: JsonSchema = {
+export const access_failed_login_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/failedLogins/tools.ts b/src/generated/forge-mcp/zeroTrust/access/users/failedLogins/tools.ts
index 4d9d30bd7..e1ccd68cd 100644
--- a/src/generated/forge-mcp/zeroTrust/access/users/failedLogins/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/users/failedLogins/tools.ts
@@ -3,50 +3,55 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_messages_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
-import { access_failed_login_response_output } from "./outputs.js";
+import { access_failed_login_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.users.failed_logins`.
+ * The tools of `zeroTrust.access.users.failedLogins`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_users_failed_logins_list",
+    name: "zeroTrust_access_users_failedLogins_list",
     title: "Get failed logins",
-    description: "Get all failed login attempts for a single user.",
+    description: "Get all failed login attempts for a single user.\n\nGET /accounts/{account_id}/access/users/{user_id}/failed_logins",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_failed_login_response",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_failed_login_response": access_failed_login_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_failed_login_response": access_failed_login_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -73,11 +78,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_failed_login_response": access_failed_login_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_failed_login_response": access_failed_login_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/lastSeenIdentity/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/users/lastSeenIdentity/outputs.ts
index e3d22f3d9..2e7cabec2 100644
--- a/src/generated/forge-mcp/zeroTrust/access/users/lastSeenIdentity/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/users/lastSeenIdentity/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_last_seen_identity_response` in responses.
  */
-export const access_last_seen_identity_response_output: JsonSchema = {
+export const access_last_seen_identity_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/lastSeenIdentity/tools.ts b/src/generated/forge-mcp/zeroTrust/access/users/lastSeenIdentity/tools.ts
index bc0f16d7c..df3697b02 100644
--- a/src/generated/forge-mcp/zeroTrust/access/users/lastSeenIdentity/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/users/lastSeenIdentity/tools.ts
@@ -3,62 +3,67 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
 import {
-  access_device_posture_check_output,
-  access_device_posture_rule_2_output,
-  access_device_session_output,
-  access_geo_output,
-  access_identity_output,
-  access_string_key_map_device_session_output,
+  access_device_posture_check,
+  access_device_posture_rule$$2,
+  access_device_session,
+  access_geo,
+  access_identity,
+  access_string_key_map_device_session,
 } from "../outputs.js";
-import { access_last_seen_identity_response_output } from "./outputs.js";
+import { access_last_seen_identity_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.users.last_seen_identity`.
+ * The tools of `zeroTrust.access.users.lastSeenIdentity`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_users_last_seen_identity_get",
+    name: "zeroTrust_access_users_lastSeenIdentity_get",
     title: "Get last seen identity",
-    description: "Get last seen identity for a single user.",
+    description: "Get last seen identity for a single user.\n\nGET /accounts/{account_id}/access/users/{user_id}/last_seen_identity",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_last_seen_identity_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_device_posture_check": access_device_posture_check_output,
-        "access_device_posture_rule-2": access_device_posture_rule_2_output,
-        "access_device_session": access_device_session_output,
-        "access_geo": access_geo_output,
-        "access_identity": access_identity_output,
-        "access_last_seen_identity_response": access_last_seen_identity_response_output,
-        "access_messages": access_messages_output,
-        "access_string_key_map_device_session": access_string_key_map_device_session_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_device_posture_check": access_device_posture_check,
+        "access_device_posture_rule-2": access_device_posture_rule$$2,
+        "access_device_session": access_device_session,
+        "access_geo": access_geo,
+        "access_identity": access_identity,
+        "access_last_seen_identity_response": access_last_seen_identity_response,
+        "access_messages": access_messages,
+        "access_string_key_map_device_session": access_string_key_map_device_session,
       },
     },
     annotations: {
@@ -85,16 +90,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_device_posture_check": access_device_posture_check_output,
-        "access_device_posture_rule-2": access_device_posture_rule_2_output,
-        "access_device_session": access_device_session_output,
-        "access_geo": access_geo_output,
-        "access_identity": access_identity_output,
-        "access_last_seen_identity_response": access_last_seen_identity_response_output,
-        "access_messages": access_messages_output,
-        "access_string_key_map_device_session": access_string_key_map_device_session_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_device_posture_check": access_device_posture_check,
+        "access_device_posture_rule-2": access_device_posture_rule$$2,
+        "access_device_session": access_device_session,
+        "access_geo": access_geo,
+        "access_identity": access_identity,
+        "access_last_seen_identity_response": access_last_seen_identity_response,
+        "access_messages": access_messages,
+        "access_string_key_map_device_session": access_string_key_map_device_session,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/outputs.ts b/src/generated/forge-mcp/zeroTrust/access/users/outputs.ts
index 743446f62..e2eb180e4 100644
--- a/src/generated/forge-mcp/zeroTrust/access/users/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/users/outputs.ts
@@ -3,24 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_access_seat-2` in responses.
- */
-export const access_access_seat_2_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_active_device_count` in responses.
- */
-export const access_active_device_count_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `access_delete_user_response` in responses.
  */
-export const access_delete_user_response_output: JsonSchema = {
+export const access_delete_user_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -46,7 +32,7 @@ export const access_delete_user_response_output: JsonSchema = {
 /**
  * The schema of `access_device_posture_check` in responses.
  */
-export const access_device_posture_check_output: JsonSchema = {
+export const access_device_posture_check: JsonSchema = {
   "properties": {
     "exists": {
       "type": "boolean"
@@ -61,7 +47,7 @@ export const access_device_posture_check_output: JsonSchema = {
 /**
  * The schema of `access_device_posture_rule-2` in responses.
  */
-export const access_device_posture_rule_2_output: JsonSchema = {
+export const access_device_posture_rule$$2: JsonSchema = {
   "properties": {
     "check": {
       "$ref": "#/$defs/access_device_posture_check"
@@ -97,7 +83,7 @@ export const access_device_posture_rule_2_output: JsonSchema = {
 /**
  * The schema of `access_device_session` in responses.
  */
-export const access_device_session_output: JsonSchema = {
+export const access_device_session: JsonSchema = {
   "properties": {
     "last_authenticated": {
       "type": "number"
@@ -109,7 +95,7 @@ export const access_device_session_output: JsonSchema = {
 /**
  * The schema of `access_empty_response` in responses.
  */
-export const access_empty_response_output: JsonSchema = {
+export const access_empty_response: JsonSchema = {
   "properties": {
     "result": {
       "enum": [
@@ -129,17 +115,10 @@ export const access_empty_response_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_gateway_seat-2` in responses.
- */
-export const access_gateway_seat_2_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_geo` in responses.
  */
-export const access_geo_output: JsonSchema = {
+export const access_geo: JsonSchema = {
   "properties": {
     "country": {
       "type": "string"
@@ -151,7 +130,7 @@ export const access_geo_output: JsonSchema = {
 /**
  * The schema of `access_identity` in responses.
  */
-export const access_identity_output: JsonSchema = {
+export const access_identity: JsonSchema = {
   "properties": {
     "account_id": {
       "type": "string"
@@ -239,18 +218,10 @@ export const access_identity_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_last_successful_login` in responses.
- */
-export const access_last_successful_login_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `access_response_collection-25` in responses.
  */
-export const access_response_collection_25_output: JsonSchema = {
+export const access_response_collection$$25: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -291,17 +262,10 @@ export const access_response_collection_25_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_seat_uid-2` in responses.
- */
-export const access_seat_uid_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_single_user_response` in responses.
  */
-export const access_single_user_response_output: JsonSchema = {
+export const access_single_user_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -320,57 +284,53 @@ export const access_single_user_response_output: JsonSchema = {
 /**
  * The schema of `access_string_key_map_device_session` in responses.
  */
-export const access_string_key_map_device_session_output: JsonSchema = {
+export const access_string_key_map_device_session: JsonSchema = {
   "additionalProperties": {
     "$ref": "#/$defs/access_device_session"
   },
   "type": "object"
 };
 
-/**
- * The schema of `access_uid` in responses.
- */
-export const access_uid_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_users-2` in responses.
  */
-export const access_users_2_output: JsonSchema = {
+export const access_users$$2: JsonSchema = {
   "properties": {
     "access_seat": {
-      "$ref": "#/$defs/access_access_seat-2"
+      "type": "boolean"
     },
     "active_device_count": {
-      "$ref": "#/$defs/access_active_device_count"
+      "type": "number"
     },
     "created_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "email": {
-      "$ref": "#/$defs/access_email-2"
+      "type": "string"
     },
     "gateway_seat": {
-      "$ref": "#/$defs/access_gateway_seat-2"
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/access_uuid"
+      "type": "string"
     },
     "last_successful_login": {
-      "$ref": "#/$defs/access_last_successful_login"
+      "format": "date-time",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-10"
+      "type": "string"
     },
     "seat_uid": {
-      "$ref": "#/$defs/access_seat_uid-2"
+      "type": "string"
     },
     "uid": {
-      "$ref": "#/$defs/access_uid"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/zeroTrust/access/users/tools.ts b/src/generated/forge-mcp/zeroTrust/access/users/tools.ts
index 063e5b7b8..ce57b3324 100644
--- a/src/generated/forge-mcp/zeroTrust/access/users/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/access/users/tools.ts
@@ -1,92 +1,76 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_messages_output,
-  access_timestamp_output,
-  access_uuid_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier, access_uuid } from "../../schemas.js";
-import { access_email_2_output, access_name_10_output } from "../outputs.js";
-import { access_email_2, access_name_10 } from "../schemas.js";
 import {
-  access_access_seat_2_output,
-  access_active_device_count_output,
-  access_delete_user_response_output,
-  access_empty_response_output,
-  access_gateway_seat_2_output,
-  access_last_successful_login_output,
-  access_response_collection_25_output,
-  access_seat_uid_2_output,
-  access_single_user_response_output,
-  access_uid_output,
-  access_users_2_output,
+  access_delete_user_response,
+  access_empty_response,
+  access_response_collection$$25,
+  access_single_user_response,
+  access_users$$2,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.access.users`.
+ * The tools of `zeroTrust.access.users`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_access_users_create",
+    name: "zeroTrust_access_users_create",
     title: "Create a user",
-    description: "Creates a new user.",
+    description: "Creates a new user.\n\nPOST /accounts/{account_id}/access/users",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "email": {
-              "$ref": "#/$defs/access_email-2",
-              "description": "The email of the user."
+              "description": "The email of the user.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/access_name-10",
-              "description": "The name of the user."
+              "description": "The name of the user.",
+              "type": "string"
             }
           },
           "required": [
             "email"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "access_email-2": access_email_2,
-        "access_identifier": access_identifier,
-        "access_name-10": access_name_10,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_user_response",
       $defs: {
-        "access_access_seat-2": access_access_seat_2_output,
-        "access_active_device_count": access_active_device_count_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_email-2": access_email_2_output,
-        "access_gateway_seat-2": access_gateway_seat_2_output,
-        "access_last_successful_login": access_last_successful_login_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_seat_uid-2": access_seat_uid_2_output,
-        "access_single_user_response": access_single_user_response_output,
-        "access_timestamp": access_timestamp_output,
-        "access_uid": access_uid_output,
-        "access_users-2": access_users_2_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_user_response": access_single_user_response,
+        "access_users-2": access_users$$2,
       },
     },
     annotations: {
@@ -111,21 +95,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_seat-2": access_access_seat_2_output,
-        "access_active_device_count": access_active_device_count_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_email-2": access_email_2_output,
-        "access_gateway_seat-2": access_gateway_seat_2_output,
-        "access_last_successful_login": access_last_successful_login_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_seat_uid-2": access_seat_uid_2_output,
-        "access_single_user_response": access_single_user_response_output,
-        "access_timestamp": access_timestamp_output,
-        "access_uid": access_uid_output,
-        "access_users-2": access_users_2_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_user_response": access_single_user_response,
+        "access_users-2": access_users$$2,
       },
     },
     request: (args) => ({
@@ -134,36 +108,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_users_delete",
+    name: "zeroTrust_access_users_delete",
     title: "Delete a user",
-    description: "Deletes a specific user for an account. This will also revoke any active seats and tokens for the user.",
+    description: "Deletes a specific user for an account. This will also revoke any active seats and tokens for the user.\n\nDELETE /accounts/{account_id}/access/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_delete_user_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_delete_user_response": access_delete_user_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_delete_user_response": access_delete_user_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -188,10 +168,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_delete_user_response": access_delete_user_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_delete_user_response": access_delete_user_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -199,47 +179,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_users_get",
+    name: "zeroTrust_access_users_get",
     title: "Get a user",
-    description: "Gets a specific user for an account.",
+    description: "Gets a specific user for an account.\n\nGET /accounts/{account_id}/access/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_user_response",
       $defs: {
-        "access_access_seat-2": access_access_seat_2_output,
-        "access_active_device_count": access_active_device_count_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_email-2": access_email_2_output,
-        "access_gateway_seat-2": access_gateway_seat_2_output,
-        "access_last_successful_login": access_last_successful_login_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_seat_uid-2": access_seat_uid_2_output,
-        "access_single_user_response": access_single_user_response_output,
-        "access_timestamp": access_timestamp_output,
-        "access_uid": access_uid_output,
-        "access_users-2": access_users_2_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_user_response": access_single_user_response,
+        "access_users-2": access_users$$2,
       },
     },
     annotations: {
@@ -266,21 +242,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_seat-2": access_access_seat_2_output,
-        "access_active_device_count": access_active_device_count_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_email-2": access_email_2_output,
-        "access_gateway_seat-2": access_gateway_seat_2_output,
-        "access_last_successful_login": access_last_successful_login_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_seat_uid-2": access_seat_uid_2_output,
-        "access_single_user_response": access_single_user_response_output,
-        "access_timestamp": access_timestamp_output,
-        "access_uid": access_uid_output,
-        "access_users-2": access_users_2_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_user_response": access_single_user_response,
+        "access_users-2": access_users$$2,
       },
     },
     request: (args) => ({
@@ -288,64 +254,67 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_access_users_list",
+    name: "zeroTrust_access_users_list",
     title: "Get users",
-    description: "Gets a list of users for an account.",
+    description: "Gets a list of users for an account.\n\nGET /accounts/{account_id}/access/users",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "email": {
-          "description": "The email of the user.",
-          "type": "string"
-        },
-        "name": {
-          "description": "The name of the user.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 1000,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Search for users by other listed query parameters.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "email": {
+              "description": "The email of the user.",
+              "type": "string"
+            },
+            "name": {
+              "description": "The name of the user.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 1000,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search for users by other listed query parameters.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-25",
       $defs: {
-        "access_access_seat-2": access_access_seat_2_output,
-        "access_active_device_count": access_active_device_count_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_email-2": access_email_2_output,
-        "access_gateway_seat-2": access_gateway_seat_2_output,
-        "access_last_successful_login": access_last_successful_login_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_response_collection-25": access_response_collection_25_output,
-        "access_seat_uid-2": access_seat_uid_2_output,
-        "access_timestamp": access_timestamp_output,
-        "access_uid": access_uid_output,
-        "access_users-2": access_users_2_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_response_collection-25": access_response_collection$$25,
+        "access_users-2": access_users$$2,
       },
     },
     annotations: {
@@ -372,54 +341,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_seat-2": access_access_seat_2_output,
-        "access_active_device_count": access_active_device_count_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_email-2": access_email_2_output,
-        "access_gateway_seat-2": access_gateway_seat_2_output,
-        "access_last_successful_login": access_last_successful_login_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_response_collection-25": access_response_collection_25_output,
-        "access_seat_uid-2": access_seat_uid_2_output,
-        "access_timestamp": access_timestamp_output,
-        "access_uid": access_uid_output,
-        "access_users-2": access_users_2_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_response_collection-25": access_response_collection$$25,
+        "access_users-2": access_users$$2,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/users`,
       query: [
-        ["name", args["name"], true],
-        ["email", args["email"], true],
-        ["search", args["search"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["name", param(args, "query", "name"), true],
+        ["email", param(args, "query", "email"), true],
+        ["search", param(args, "query", "search"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_access_users_revoke",
+    name: "zeroTrust_access_users_revoke",
     title: "Revoke all Access tokens for a user",
-    description: "Revokes a user's access across all applications.\n\nConfirm with the user before calling this tool. This operation revokes all access tokens for a user destructively.",
+    description: "Revokes a user's access across all applications.\n\nConfirm with the user before calling this tool. This operation revokes all access tokens for a user destructively.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/organizations/revoke_user",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "devices": {
@@ -444,24 +391,49 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "devices": {
-          "description": "When set to `true`, all devices associated with the user will be revoked.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "devices": {
+              "description": "When set to `true`, all devices associated with the user will be revoked.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_empty_response",
       $defs: {
-        "access_empty_response": access_empty_response_output,
+        "access_empty_response": access_empty_response,
       },
     },
     annotations: {
@@ -488,39 +460,35 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_empty_response": access_empty_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_empty_response": access_empty_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/organizations/revoke_user`,
       query: [
-        ["devices", args["devices"], true],
+        ["devices", param(args, "query", "devices"), true],
       ],
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "zero_trust_access_users_update",
+    name: "zeroTrust_access_users_update",
     title: "Update a user",
-    description: "Updates a specific user's name for an account. Requires the user's current email as confirmation (email cannot be changed).",
+    description: "Updates a specific user's name for an account. Requires the user's current email as confirmation (email cannot be changed).\n\nPUT /accounts/{account_id}/access/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "email": {
-              "$ref": "#/$defs/access_email-2",
-              "description": "The email of the user."
+              "description": "The email of the user.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/access_name-10",
-              "description": "The name of the user."
+              "description": "The name of the user.",
+              "type": "string"
             }
           },
           "required": [
@@ -529,40 +497,38 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "access_email-2": access_email_2,
-        "access_identifier": access_identifier,
-        "access_name-10": access_name_10,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_user_response",
       $defs: {
-        "access_access_seat-2": access_access_seat_2_output,
-        "access_active_device_count": access_active_device_count_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_email-2": access_email_2_output,
-        "access_gateway_seat-2": access_gateway_seat_2_output,
-        "access_last_successful_login": access_last_successful_login_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_seat_uid-2": access_seat_uid_2_output,
-        "access_single_user_response": access_single_user_response_output,
-        "access_timestamp": access_timestamp_output,
-        "access_uid": access_uid_output,
-        "access_users-2": access_users_2_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_user_response": access_single_user_response,
+        "access_users-2": access_users$$2,
       },
     },
     annotations: {
@@ -589,21 +555,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_seat-2": access_access_seat_2_output,
-        "access_active_device_count": access_active_device_count_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_email-2": access_email_2_output,
-        "access_gateway_seat-2": access_gateway_seat_2_output,
-        "access_last_successful_login": access_last_successful_login_output,
-        "access_messages": access_messages_output,
-        "access_name-10": access_name_10_output,
-        "access_seat_uid-2": access_seat_uid_2_output,
-        "access_single_user_response": access_single_user_response_output,
-        "access_timestamp": access_timestamp_output,
-        "access_uid": access_uid_output,
-        "access_users-2": access_users_2_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_single_user_response": access_single_user_response,
+        "access_users-2": access_users$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/casb/applications/authMethods/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/applications/authMethods/outputs.ts
index 66a8b0b3a..ce109ef13 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/applications/authMethods/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/applications/authMethods/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `one_AuthMethodDetail` in responses.
  */
-export const one_AuthMethodDetail_output: JsonSchema = {
+export const one_AuthMethodDetail: JsonSchema = {
   "properties": {
     "display_name": {
       "type": "string"
@@ -66,7 +66,7 @@ export const one_AuthMethodDetail_output: JsonSchema = {
 /**
  * The schema of `one_Instructions` in responses.
  */
-export const one_Instructions_output: JsonSchema = {
+export const one_Instructions: JsonSchema = {
   "properties": {
     "markdown": {
       "type": "string"
@@ -81,7 +81,7 @@ export const one_Instructions_output: JsonSchema = {
 /**
  * The schema of `one_PaginatedAuthMethodDetailList` in responses.
  */
-export const one_PaginatedAuthMethodDetailList_output: JsonSchema = {
+export const one_PaginatedAuthMethodDetailList: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/zeroTrust/casb/applications/authMethods/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/applications/authMethods/tools.ts
index 0534d0bcc..69e3a9c40 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/applications/authMethods/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/applications/authMethods/tools.ts
@@ -1,70 +1,86 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  one_AuthMethodDetail_output,
-  one_Instructions_output,
-  one_PaginatedAuthMethodDetailList_output,
+  one_AuthMethodDetail,
+  one_Instructions,
+  one_PaginatedAuthMethodDetailList,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.casb.applications.auth_methods`.
+ * The tools of `zeroTrust.casb.applications.authMethods`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_applications_auth_methods_list",
+    name: "zeroTrust_casb_applications_authMethods_list",
     title: "Get auth methods",
-    description: "Returns available auth methods for the specified vendor, including credential schema, instructions, and example payloads. Use this to understand what credentials are required before calling POST /v2/integrations.",
+    description: "Returns available auth methods for the specified vendor, including credential schema, instructions, and example payloads. Use this to understand what credentials are required before calling POST /v2/integrations.\n\nGET /accounts/{account_id}/one/applications/{application_id}/auth-methods",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "description": "Application/vendor identifier.",
-          "enum": [
-            "ANTHROPIC",
-            "AWS",
-            "BITBUCKET",
-            "BOX",
-            "CONFLUENCE",
-            "DROPBOX",
-            "GITHUB",
-            "GOOGLE_CLOUD_PLATFORM",
-            "GOOGLE_WORKSPACE",
-            "JIRA",
-            "MICROSOFT_INTERNAL",
-            "OPENAI",
-            "SALESFORCE",
-            "SERVICENOW",
-            "SLACK",
-            "ZOOM"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "Application/vendor identifier.",
+              "enum": [
+                "ANTHROPIC",
+                "AWS",
+                "BITBUCKET",
+                "BOX",
+                "CONFLUENCE",
+                "DROPBOX",
+                "GITHUB",
+                "GOOGLE_CLOUD_PLATFORM",
+                "GOOGLE_WORKSPACE",
+                "JIRA",
+                "MICROSOFT_INTERNAL",
+                "OPENAI",
+                "SALESFORCE",
+                "SERVICENOW",
+                "SLACK",
+                "ZOOM"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
+          "type": "object"
         },
-        "page_size": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "page_size": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/one_PaginatedAuthMethodDetailList",
       $defs: {
-        "one_AuthMethodDetail": one_AuthMethodDetail_output,
-        "one_Instructions": one_Instructions_output,
-        "one_PaginatedAuthMethodDetailList": one_PaginatedAuthMethodDetailList_output,
+        "one_AuthMethodDetail": one_AuthMethodDetail,
+        "one_Instructions": one_Instructions,
+        "one_PaginatedAuthMethodDetailList": one_PaginatedAuthMethodDetailList,
       },
     },
     annotations: {
@@ -87,16 +103,16 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "one_AuthMethodDetail": one_AuthMethodDetail_output,
-        "one_Instructions": one_Instructions_output,
-        "one_PaginatedAuthMethodDetailList": one_PaginatedAuthMethodDetailList_output,
+        "one_AuthMethodDetail": one_AuthMethodDetail,
+        "one_Instructions": one_Instructions,
+        "one_PaginatedAuthMethodDetailList": one_PaginatedAuthMethodDetailList,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/one/applications/${pathParam(args, "application_id")}/auth-methods`,
       query: [
-        ["page", args["page"], true],
-        ["page_size", args["page_size"], true],
+        ["page", param(args, "query", "page"), true],
+        ["page_size", param(args, "query", "page_size"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/casb/applications/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/applications/outputs.ts
index 3e788b413..368fd2f57 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/applications/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/applications/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `one_ApplicationDetail` in responses.
  */
-export const one_ApplicationDetail_output: JsonSchema = {
+export const one_ApplicationDetail: JsonSchema = {
   "properties": {
     "auth_methods": {
       "items": {
@@ -91,7 +91,7 @@ export const one_ApplicationDetail_output: JsonSchema = {
 /**
  * The schema of `one_ApplicationDetailResponse` in responses.
  */
-export const one_ApplicationDetailResponse_output: JsonSchema = {
+export const one_ApplicationDetailResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -122,7 +122,7 @@ export const one_ApplicationDetailResponse_output: JsonSchema = {
 /**
  * The schema of `one_ApplicationList` in responses.
  */
-export const one_ApplicationList_output: JsonSchema = {
+export const one_ApplicationList: JsonSchema = {
   "properties": {
     "auth_methods": {
       "items": {
@@ -210,7 +210,7 @@ export const one_ApplicationList_output: JsonSchema = {
 /**
  * The schema of `one_AuthMethod` in responses.
  */
-export const one_AuthMethod_output: JsonSchema = {
+export const one_AuthMethod: JsonSchema = {
   "properties": {
     "display_name": {
       "type": "string"
@@ -240,7 +240,7 @@ export const one_AuthMethod_output: JsonSchema = {
 /**
  * The schema of `one_AuthMethodSummary` in responses.
  */
-export const one_AuthMethodSummary_output: JsonSchema = {
+export const one_AuthMethodSummary: JsonSchema = {
   "properties": {
     "display_name": {
       "type": "string"
@@ -259,7 +259,7 @@ export const one_AuthMethodSummary_output: JsonSchema = {
 /**
  * The schema of `one_FeatureScope` in responses.
  */
-export const one_FeatureScope_output: JsonSchema = {
+export const one_FeatureScope: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -289,7 +289,7 @@ export const one_FeatureScope_output: JsonSchema = {
 /**
  * The schema of `one_PaginatedApplicationListList` in responses.
  */
-export const one_PaginatedApplicationListList_output: JsonSchema = {
+export const one_PaginatedApplicationListList: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -363,7 +363,7 @@ export const one_PaginatedApplicationListList_output: JsonSchema = {
 /**
  * The schema of `one_Permission` in responses.
  */
-export const one_Permission_output: JsonSchema = {
+export const one_Permission: JsonSchema = {
   "properties": {
     "display_name": {
       "type": "string"
@@ -392,7 +392,7 @@ export const one_Permission_output: JsonSchema = {
 /**
  * The schema of `one_UseCaseDetail` in responses.
  */
-export const one_UseCaseDetail_output: JsonSchema = {
+export const one_UseCaseDetail: JsonSchema = {
   "properties": {
     "base_scopes": {
       "items": {
@@ -429,7 +429,7 @@ export const one_UseCaseDetail_output: JsonSchema = {
 /**
  * The schema of `one_UseCaseSummary` in responses.
  */
-export const one_UseCaseSummary_output: JsonSchema = {
+export const one_UseCaseSummary: JsonSchema = {
   "properties": {
     "display_name": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/applications/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/applications/tools.ts
index 7d9a58675..04eb7e92a 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/applications/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/applications/tools.ts
@@ -1,72 +1,82 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  one_ApplicationDetailResponse_output,
-  one_ApplicationDetail_output,
-  one_ApplicationList_output,
-  one_AuthMethodSummary_output,
-  one_AuthMethod_output,
-  one_FeatureScope_output,
-  one_PaginatedApplicationListList_output,
-  one_Permission_output,
-  one_UseCaseDetail_output,
-  one_UseCaseSummary_output,
+  one_ApplicationDetail,
+  one_ApplicationDetailResponse,
+  one_ApplicationList,
+  one_AuthMethod,
+  one_AuthMethodSummary,
+  one_FeatureScope,
+  one_PaginatedApplicationListList,
+  one_Permission,
+  one_UseCaseDetail,
+  one_UseCaseSummary,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.casb.applications`.
+ * The tools of `zeroTrust.casb.applications`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_applications_get",
+    name: "zeroTrust_casb_applications_get",
     title: "Get application details",
-    description: "Returns full application details including auth methods, use cases, and permissions.",
+    description: "Returns full application details including auth methods, use cases, and permissions.\n\nGET /accounts/{account_id}/one/applications/{application_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
-        "application_id": {
-          "description": "Application/vendor identifier.",
-          "enum": [
-            "ANTHROPIC",
-            "AWS",
-            "BITBUCKET",
-            "BOX",
-            "CONFLUENCE",
-            "DROPBOX",
-            "GITHUB",
-            "GOOGLE_CLOUD_PLATFORM",
-            "GOOGLE_WORKSPACE",
-            "JIRA",
-            "MICROSOFT_INTERNAL",
-            "OPENAI",
-            "SALESFORCE",
-            "SERVICENOW",
-            "SLACK",
-            "ZOOM"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "application_id": {
+              "description": "Application/vendor identifier.",
+              "enum": [
+                "ANTHROPIC",
+                "AWS",
+                "BITBUCKET",
+                "BOX",
+                "CONFLUENCE",
+                "DROPBOX",
+                "GITHUB",
+                "GOOGLE_CLOUD_PLATFORM",
+                "GOOGLE_WORKSPACE",
+                "JIRA",
+                "MICROSOFT_INTERNAL",
+                "OPENAI",
+                "SALESFORCE",
+                "SERVICENOW",
+                "SLACK",
+                "ZOOM"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "application_id"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "application_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/one_ApplicationDetailResponse",
       $defs: {
-        "one_ApplicationDetail": one_ApplicationDetail_output,
-        "one_ApplicationDetailResponse": one_ApplicationDetailResponse_output,
-        "one_AuthMethod": one_AuthMethod_output,
-        "one_FeatureScope": one_FeatureScope_output,
-        "one_Permission": one_Permission_output,
-        "one_UseCaseDetail": one_UseCaseDetail_output,
+        "one_ApplicationDetail": one_ApplicationDetail,
+        "one_ApplicationDetailResponse": one_ApplicationDetailResponse,
+        "one_AuthMethod": one_AuthMethod,
+        "one_FeatureScope": one_FeatureScope,
+        "one_Permission": one_Permission,
+        "one_UseCaseDetail": one_UseCaseDetail,
       },
     },
     annotations: {
@@ -89,12 +99,12 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "one_ApplicationDetail": one_ApplicationDetail_output,
-        "one_ApplicationDetailResponse": one_ApplicationDetailResponse_output,
-        "one_AuthMethod": one_AuthMethod_output,
-        "one_FeatureScope": one_FeatureScope_output,
-        "one_Permission": one_Permission_output,
-        "one_UseCaseDetail": one_UseCaseDetail_output,
+        "one_ApplicationDetail": one_ApplicationDetail,
+        "one_ApplicationDetailResponse": one_ApplicationDetailResponse,
+        "one_AuthMethod": one_AuthMethod,
+        "one_FeatureScope": one_FeatureScope,
+        "one_Permission": one_Permission,
+        "one_UseCaseDetail": one_UseCaseDetail,
       },
     },
     request: (args) => ({
@@ -102,41 +112,57 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_applications_list",
+    name: "zeroTrust_casb_applications_list",
     title: "List applications",
-    description: "Returns a list of available applications with use cases and permissions.",
+    description: "Returns a list of available applications with use cases and permissions.\n\nGET /accounts/{account_id}/one/applications",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
-        "environment": {
-          "description": "Filter by supported environment (standard, fedramp).",
-          "type": "string"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "page_size": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "environment": {
+              "description": "Filter by supported environment (standard, fedramp).",
+              "type": "string"
+            },
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "page_size": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/one_PaginatedApplicationListList",
       $defs: {
-        "one_ApplicationList": one_ApplicationList_output,
-        "one_AuthMethodSummary": one_AuthMethodSummary_output,
-        "one_PaginatedApplicationListList": one_PaginatedApplicationListList_output,
-        "one_Permission": one_Permission_output,
-        "one_UseCaseSummary": one_UseCaseSummary_output,
+        "one_ApplicationList": one_ApplicationList,
+        "one_AuthMethodSummary": one_AuthMethodSummary,
+        "one_PaginatedApplicationListList": one_PaginatedApplicationListList,
+        "one_Permission": one_Permission,
+        "one_UseCaseSummary": one_UseCaseSummary,
       },
     },
     annotations: {
@@ -159,19 +185,19 @@ export const tools: readonly Tool[] = [
         "400": null
       },
       $defs: {
-        "one_ApplicationList": one_ApplicationList_output,
-        "one_AuthMethodSummary": one_AuthMethodSummary_output,
-        "one_PaginatedApplicationListList": one_PaginatedApplicationListList_output,
-        "one_Permission": one_Permission_output,
-        "one_UseCaseSummary": one_UseCaseSummary_output,
+        "one_ApplicationList": one_ApplicationList,
+        "one_AuthMethodSummary": one_AuthMethodSummary,
+        "one_PaginatedApplicationListList": one_PaginatedApplicationListList,
+        "one_Permission": one_Permission,
+        "one_UseCaseSummary": one_UseCaseSummary,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/one/applications`,
       query: [
-        ["environment", args["environment"], true],
-        ["page", args["page"], true],
-        ["page_size", args["page_size"], true],
+        ["environment", param(args, "query", "environment"), true],
+        ["page", param(args, "query", "page"), true],
+        ["page_size", param(args, "query", "page_size"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/casb/assetSchemas/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/assetSchemas/outputs.ts
index 042333933..f4713ec65 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/assetSchemas/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/assetSchemas/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_AssetSchemaDetail` in responses.
  */
-export const posture_api_AssetSchemaDetail_output: JsonSchema = {
+export const posture$$api_AssetSchemaDetail: JsonSchema = {
   "properties": {
     "asset_class": {
       "type": "string"
@@ -25,7 +25,7 @@ export const posture_api_AssetSchemaDetail_output: JsonSchema = {
 /**
  * The schema of `posture-api_AssetSchemaListResponse` in responses.
  */
-export const posture_api_AssetSchemaListResponse_output: JsonSchema = {
+export const posture$$api_AssetSchemaListResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -47,7 +47,7 @@ export const posture_api_AssetSchemaListResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_AssetSchemaResponse` in responses.
  */
-export const posture_api_AssetSchemaResponse_output: JsonSchema = {
+export const posture$$api_AssetSchemaResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -66,7 +66,7 @@ export const posture_api_AssetSchemaResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_AssetSchemaSummary` in responses.
  */
-export const posture_api_AssetSchemaSummary_output: JsonSchema = {
+export const posture$$api_AssetSchemaSummary: JsonSchema = {
   "properties": {
     "asset_class": {
       "type": "string"
@@ -81,7 +81,7 @@ export const posture_api_AssetSchemaSummary_output: JsonSchema = {
 /**
  * The schema of `posture-api_AssetSchemaVendorGroup` in responses.
  */
-export const posture_api_AssetSchemaVendorGroup_output: JsonSchema = {
+export const posture$$api_AssetSchemaVendorGroup: JsonSchema = {
   "properties": {
     "asset_classes": {
       "items": {
diff --git a/src/generated/forge-mcp/zeroTrust/casb/assetSchemas/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/assetSchemas/tools.ts
index c32e920a3..a01757450 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/assetSchemas/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/assetSchemas/tools.ts
@@ -1,52 +1,62 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  posture_api_api_response_common_output,
-  posture_api_error_response_output,
-  posture_api_messages_output,
+  posture$$api_api$$response$$common,
+  posture$$api_error$$response,
+  posture$$api_messages,
 } from "../outputs.js";
 import {
-  posture_api_AssetSchemaDetail_output,
-  posture_api_AssetSchemaListResponse_output,
-  posture_api_AssetSchemaResponse_output,
-  posture_api_AssetSchemaSummary_output,
-  posture_api_AssetSchemaVendorGroup_output,
+  posture$$api_AssetSchemaDetail,
+  posture$$api_AssetSchemaListResponse,
+  posture$$api_AssetSchemaResponse,
+  posture$$api_AssetSchemaSummary,
+  posture$$api_AssetSchemaVendorGroup,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.casb.asset_schemas`.
+ * The tools of `zeroTrust.casb.assetSchemas`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_asset_schemas_get",
+    name: "zeroTrust_casb_assetSchemas_get",
     title: "Get asset schema by asset class",
-    description: "Returns the fields and related attributes a custom finding type may reference\nfor the given asset class (JSON Schema). Used by the custom finding types builder.",
+    description: "Returns the fields and related attributes a custom finding type may reference\nfor the given asset class (JSON Schema). Used by the custom finding types builder.\n\nGET /accounts/{account_id}/data-security/posture/asset_schemas/{asset_class}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "asset_class": {
-          "description": "Asset class identifier (PascalCase), e.g. AnthropicApiKey.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "asset_class": {
+              "description": "Asset class identifier (PascalCase), e.g. AnthropicApiKey.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "asset_class"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "asset_class"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_AssetSchemaResponse",
       $defs: {
-        "posture-api_AssetSchemaDetail": posture_api_AssetSchemaDetail_output,
-        "posture-api_AssetSchemaResponse": posture_api_AssetSchemaResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_AssetSchemaDetail": posture$$api_AssetSchemaDetail,
+        "posture-api_AssetSchemaResponse": posture$$api_AssetSchemaResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -83,11 +93,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_AssetSchemaDetail": posture_api_AssetSchemaDetail_output,
-        "posture-api_AssetSchemaResponse": posture_api_AssetSchemaResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_AssetSchemaDetail": posture$$api_AssetSchemaDetail,
+        "posture-api_AssetSchemaResponse": posture$$api_AssetSchemaResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -95,52 +105,68 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_asset_schemas_list",
+    name: "zeroTrust_casb_assetSchemas_list",
     title: "List asset schemas",
-    description: "Returns the catalog of asset classes available when authoring custom\nfindings, grouped by vendor. Optionally filter to a single vendor with\nthe `vendor` query parameter.",
+    description: "Returns the catalog of asset classes available when authoring custom\nfindings, grouped by vendor. Optionally filter to a single vendor with\nthe `vendor` query parameter.\n\nGET /accounts/{account_id}/data-security/posture/asset_schemas",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "vendor": {
-          "description": "Restrict the result to a single vendor. Unknown values return 400.",
-          "enum": [
-            "ANTHROPIC",
-            "AWS",
-            "BITBUCKET",
-            "BOX",
-            "CONFLUENCE",
-            "DROPBOX",
-            "GITHUB",
-            "GOOGLE_CLOUD_PLATFORM",
-            "GOOGLE_WORKSPACE",
-            "JIRA",
-            "MICROSOFT",
-            "OPENAI",
-            "SALESFORCE",
-            "SERVICENOW",
-            "SLACK",
-            "WORKDAY",
-            "ZOOM"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "vendor": {
+              "description": "Restrict the result to a single vendor. Unknown values return 400.",
+              "enum": [
+                "ANTHROPIC",
+                "AWS",
+                "BITBUCKET",
+                "BOX",
+                "CONFLUENCE",
+                "DROPBOX",
+                "GITHUB",
+                "GOOGLE_CLOUD_PLATFORM",
+                "GOOGLE_WORKSPACE",
+                "JIRA",
+                "MICROSOFT",
+                "OPENAI",
+                "SALESFORCE",
+                "SERVICENOW",
+                "SLACK",
+                "WORKDAY",
+                "ZOOM"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_AssetSchemaListResponse",
       $defs: {
-        "posture-api_AssetSchemaListResponse": posture_api_AssetSchemaListResponse_output,
-        "posture-api_AssetSchemaSummary": posture_api_AssetSchemaSummary_output,
-        "posture-api_AssetSchemaVendorGroup": posture_api_AssetSchemaVendorGroup_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_AssetSchemaListResponse": posture$$api_AssetSchemaListResponse,
+        "posture-api_AssetSchemaSummary": posture$$api_AssetSchemaSummary,
+        "posture-api_AssetSchemaVendorGroup": posture$$api_AssetSchemaVendorGroup,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -177,18 +203,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_AssetSchemaListResponse": posture_api_AssetSchemaListResponse_output,
-        "posture-api_AssetSchemaSummary": posture_api_AssetSchemaSummary_output,
-        "posture-api_AssetSchemaVendorGroup": posture_api_AssetSchemaVendorGroup_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_AssetSchemaListResponse": posture$$api_AssetSchemaListResponse,
+        "posture-api_AssetSchemaSummary": posture$$api_AssetSchemaSummary,
+        "posture-api_AssetSchemaVendorGroup": posture$$api_AssetSchemaVendorGroup,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/asset_schemas`,
       query: [
-        ["vendor", args["vendor"], true],
+        ["vendor", param(args, "query", "vendor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/casb/content/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/content/outputs.ts
index 53195d58f..c625cc7cb 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/content/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/content/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_ContentAsset` in responses.
  */
-export const posture_api_ContentAsset_output: JsonSchema = {
+export const posture$$api_ContentAsset: JsonSchema = {
   "properties": {
     "asset_id": {
       "format": "uuid",
@@ -54,7 +54,7 @@ export const posture_api_ContentAsset_output: JsonSchema = {
 /**
  * The schema of `posture-api_PaginatedContentAssetList` in responses.
  */
-export const posture_api_PaginatedContentAssetList_output: JsonSchema = {
+export const posture$$api_PaginatedContentAssetList: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/content/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/content/schemas.ts
index 0f743f769..2988ed9a8 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/content/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/content/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_ContentExportRequest`.
  */
-export const posture_api_ContentExportRequest: JsonSchema = {
+export const posture$$api_ContentExportRequest: JsonSchema = {
   "description": "Request body for creating content exports.",
   "properties": {
     "dlp_profile_id": {
@@ -56,7 +56,27 @@ export const posture_api_ContentExportRequest: JsonSchema = {
     "vendors": {
       "description": "Filter by vendor types.",
       "items": {
-        "$ref": "#/$defs/posture-api_VendorsEnum"
+        "description": "Supported vendor types for integrations.",
+        "enum": [
+          "ANTHROPIC",
+          "AWS",
+          "BITBUCKET",
+          "BOX",
+          "CONFLUENCE",
+          "DROPBOX",
+          "GITHUB",
+          "GOOGLE_CLOUD_PLATFORM",
+          "GOOGLE_WORKSPACE",
+          "JIRA",
+          "MICROSOFT",
+          "MICROSOFT_INTERNAL",
+          "OPENAI",
+          "SALESFORCE",
+          "SERVICENOW",
+          "SLACK",
+          "ZOOM"
+        ],
+        "type": "string"
       },
       "type": "array"
     }
@@ -70,7 +90,7 @@ export const posture_api_ContentExportRequest: JsonSchema = {
 /**
  * The schema of `posture-api_ContentOrder`.
  */
-export const posture_api_ContentOrder: JsonSchema = {
+export const posture$$api_ContentOrder: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_Order"
@@ -99,7 +119,7 @@ export const posture_api_ContentOrder: JsonSchema = {
 /**
  * The schema of `posture-api_DLPProfile`.
  */
-export const posture_api_DLPProfile: JsonSchema = {
+export const posture$$api_DLPProfile: JsonSchema = {
   "description": "DLP profile configuration.",
   "properties": {
     "entries": {
@@ -130,7 +150,7 @@ export const posture_api_DLPProfile: JsonSchema = {
 /**
  * The schema of `posture-api_DLPProfileEntry`.
  */
-export const posture_api_DLPProfileEntry: JsonSchema = {
+export const posture$$api_DLPProfileEntry: JsonSchema = {
   "description": "Entry within a DLP profile.",
   "properties": {
     "id": {
@@ -159,12 +179,16 @@ export const posture_api_DLPProfileEntry: JsonSchema = {
 /**
  * The schema of `posture-api_Order`.
  */
-export const posture_api_Order: JsonSchema = {
+export const posture$$api_Order: JsonSchema = {
   "description": "Generic ordering specification.",
   "properties": {
     "direction": {
-      "$ref": "#/$defs/posture-api_DirectionEnum",
-      "description": "Sort direction."
+      "description": "Sort direction.",
+      "enum": [
+        "asc",
+        "desc"
+      ],
+      "type": "string"
     },
     "name": {
       "description": "Field name to order by.",
diff --git a/src/generated/forge-mcp/zeroTrust/casb/content/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/content/tools.ts
index 0a47458e1..764dce93e 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/content/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/content/tools.ts
@@ -1,80 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  posture_api_CredentialHealthStatusEnum_output,
-  posture_api_DlpContext_output,
-  posture_api_ExportJobTypeEnum_output,
-  posture_api_ExportJob_output,
-  posture_api_IntegrationPolicy_output,
-  posture_api_IntegrationSummary_output,
-  posture_api_StatusEnum_output,
-  posture_api_Vendor_output,
-  posture_api_ZeroTrustProduct_output,
-  posture_api_api_response_collection_output,
-  posture_api_api_response_common_output,
-  posture_api_export_job_response_output,
-  posture_api_messages_output,
-  posture_api_result_info_output,
+  posture$$api_DlpContext,
+  posture$$api_ExportJob,
+  posture$$api_IntegrationPolicy,
+  posture$$api_IntegrationSummary,
+  posture$$api_Vendor,
+  posture$$api_ZeroTrustProduct,
+  posture$$api_api$$response$$collection,
+  posture$$api_api$$response$$common,
+  posture$$api_export$$job$$response,
+  posture$$api_messages,
+  posture$$api_result$$info,
 } from "../outputs.js";
 import {
-  posture_api_DirectionEnum,
-  posture_api_VendorsEnum,
-} from "../schemas.js";
-import {
-  posture_api_ContentAsset_output,
-  posture_api_PaginatedContentAssetList_output,
+  posture$$api_ContentAsset,
+  posture$$api_PaginatedContentAssetList,
 } from "./outputs.js";
 import {
-  posture_api_ContentExportRequest,
-  posture_api_ContentOrder,
-  posture_api_DLPProfile,
-  posture_api_DLPProfileEntry,
-  posture_api_Order,
+  posture$$api_ContentExportRequest,
+  posture$$api_ContentOrder,
+  posture$$api_DLPProfile,
+  posture$$api_DLPProfileEntry,
+  posture$$api_Order,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.content`.
+ * The tools of `zeroTrust.casb.content`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_content_export",
+    name: "zeroTrust_casb_content_export",
     title: "Create a content export",
-    description: "Creates a CSV export for content and accepts optional filters in the payload.",
+    description: "Creates a CSV export for content and accepts optional filters in the payload.\n\nPOST /accounts/{account_id}/data-security/posture/content/export",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_ContentExportRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_ContentExportRequest": posture_api_ContentExportRequest,
-        "posture-api_ContentOrder": posture_api_ContentOrder,
-        "posture-api_DLPProfile": posture_api_DLPProfile,
-        "posture-api_DLPProfileEntry": posture_api_DLPProfileEntry,
-        "posture-api_DirectionEnum": posture_api_DirectionEnum,
-        "posture-api_Order": posture_api_Order,
-        "posture-api_VendorsEnum": posture_api_VendorsEnum,
+        "posture-api_ContentExportRequest": posture$$api_ContentExportRequest,
+        "posture-api_ContentOrder": posture$$api_ContentOrder,
+        "posture-api_DLPProfile": posture$$api_DLPProfile,
+        "posture-api_DLPProfileEntry": posture$$api_DLPProfileEntry,
+        "posture-api_Order": posture$$api_Order,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_export-job-response",
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -103,12 +102,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -117,92 +114,123 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_content_list",
+    name: "zeroTrust_casb_content_list",
     title: "List DLP content findings",
-    description: "List DLP content findings",
+    description: "List DLP content findings\n\nGET /accounts/{account_id}/data-security/posture/content",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "dlp_profile_id": {
-          "description": "Filter by an DLP profile ID",
-          "format": "uuid",
-          "type": "string"
-        },
-        "integration_id": {
-          "description": "Filter by an integration ID",
-          "format": "uuid",
-          "type": "string"
-        },
-        "max_affliction_date": {
-          "description": "Filter to view findings that occurred on or before the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "min_affliction_date": {
-          "description": "Filter to view findings that occurred on or after the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "order": {
-          "description": "Which field to use when ordering content assets.",
-          "enum": [
-            "asset_name",
-            "dlp_profile_count",
-            "integration_name",
-            "latest_affliction_date"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "A search term.",
-          "type": "string"
-        },
-        "vendor": {
-          "$ref": "#/$defs/posture-api_VendorsEnum",
-          "description": "Filter by vendor"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "dlp_profile_id": {
+              "description": "Filter by an DLP profile ID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "integration_id": {
+              "description": "Filter by an integration ID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "max_affliction_date": {
+              "description": "Filter to view findings that occurred on or before the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "min_affliction_date": {
+              "description": "Filter to view findings that occurred on or after the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "order": {
+              "description": "Which field to use when ordering content assets.",
+              "enum": [
+                "asset_name",
+                "dlp_profile_count",
+                "integration_name",
+                "latest_affliction_date"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "A search term.",
+              "type": "string"
+            },
+            "vendor": {
+              "description": "Filter by vendor",
+              "enum": [
+                "ANTHROPIC",
+                "AWS",
+                "BITBUCKET",
+                "BOX",
+                "CONFLUENCE",
+                "DROPBOX",
+                "GITHUB",
+                "GOOGLE_CLOUD_PLATFORM",
+                "GOOGLE_WORKSPACE",
+                "JIRA",
+                "MICROSOFT",
+                "MICROSOFT_INTERNAL",
+                "OPENAI",
+                "SALESFORCE",
+                "SERVICENOW",
+                "SLACK",
+                "ZOOM"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "posture-api_VendorsEnum": posture_api_VendorsEnum,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_PaginatedContentAssetList",
       $defs: {
-        "posture-api_ContentAsset": posture_api_ContentAsset_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_PaginatedContentAssetList": posture_api_PaginatedContentAssetList_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_ContentAsset": posture$$api_ContentAsset,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_PaginatedContentAssetList": posture$$api_PaginatedContentAssetList,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     annotations: {
@@ -231,33 +259,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_ContentAsset": posture_api_ContentAsset_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_PaginatedContentAssetList": posture_api_PaginatedContentAssetList_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_ContentAsset": posture$$api_ContentAsset,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_PaginatedContentAssetList": posture$$api_PaginatedContentAssetList,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/content`,
       query: [
-        ["direction", args["direction"], true],
-        ["dlp_profile_id", args["dlp_profile_id"], true],
-        ["integration_id", args["integration_id"], true],
-        ["max_affliction_date", args["max_affliction_date"], true],
-        ["min_affliction_date", args["min_affliction_date"], true],
-        ["order", args["order"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["vendor", args["vendor"], true],
+        ["direction", param(args, "query", "direction"), true],
+        ["dlp_profile_id", param(args, "query", "dlp_profile_id"), true],
+        ["integration_id", param(args, "query", "integration_id"), true],
+        ["max_affliction_date", param(args, "query", "max_affliction_date"), true],
+        ["min_affliction_date", param(args, "query", "min_affliction_date"), true],
+        ["order", param(args, "query", "order"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["vendor", param(args, "query", "vendor"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/casb/exports/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/exports/outputs.ts
index e2bce95eb..b4a63d9cd 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/exports/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/exports/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_PaginatedExportJobList` in responses.
  */
-export const posture_api_PaginatedExportJobList_output: JsonSchema = {
+export const posture$$api_PaginatedExportJobList: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/exports/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/exports/tools.ts
index 3d7080596..da3071133 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/exports/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/exports/tools.ts
@@ -1,54 +1,59 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  posture_api_ExportJobTypeEnum_output,
-  posture_api_ExportJob_output,
-  posture_api_StatusEnum_output,
-  posture_api_api_response_collection_output,
-  posture_api_api_response_common_output,
-  posture_api_export_job_response_output,
-  posture_api_messages_output,
-  posture_api_result_info_output,
+  posture$$api_ExportJob,
+  posture$$api_api$$response$$collection,
+  posture$$api_api$$response$$common,
+  posture$$api_export$$job$$response,
+  posture$$api_messages,
+  posture$$api_result$$info,
 } from "../outputs.js";
-import { posture_api_StatusEnum } from "../schemas.js";
-import { posture_api_PaginatedExportJobList_output } from "./outputs.js";
+import { posture$$api_PaginatedExportJobList } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.casb.exports`.
+ * The tools of `zeroTrust.casb.exports`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_exports_get",
+    name: "zeroTrust_casb_exports_get",
     title: "Get a single export job",
-    description: "Retrieves a single export job by its unique identifier",
+    description: "Retrieves a single export job by its unique identifier\n\nGET /accounts/{account_id}/data-security/posture/exports/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Unique identifier for the export job",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Unique identifier for the export job",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_export-job-response",
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -78,12 +83,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -91,46 +94,64 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_exports_list",
+    name: "zeroTrust_casb_exports_list",
     title: "List all export jobs",
-    description: "List all export jobs for a given requestor's organization",
+    description: "List all export jobs for a given requestor's organization\n\nGET /accounts/{account_id}/data-security/posture/exports",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "status": {
-          "$ref": "#/$defs/posture-api_StatusEnum",
-          "description": "Filter on export job's status"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            },
+            "status": {
+              "description": "Filter on export job's status",
+              "enum": [
+                "Pending",
+                "Success",
+                "Failure",
+                "Rescheduled",
+                "In-Progress"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "posture-api_StatusEnum": posture_api_StatusEnum,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_PaginatedExportJobList",
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_PaginatedExportJobList": posture_api_PaginatedExportJobList_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_PaginatedExportJobList": posture$$api_PaginatedExportJobList,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     annotations: {
@@ -159,22 +180,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_PaginatedExportJobList": posture_api_PaginatedExportJobList_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_PaginatedExportJobList": posture$$api_PaginatedExportJobList,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/exports`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/outputs.ts
index 1f727ef8c..5c698df65 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_FindingTypeValidationError` in responses.
  */
-export const posture_api_FindingTypeValidationError_output: JsonSchema = {
+export const posture$$api_FindingTypeValidationError: JsonSchema = {
   "properties": {
     "code": {
       "type": "string"
@@ -37,7 +37,7 @@ export const posture_api_FindingTypeValidationError_output: JsonSchema = {
 /**
  * The schema of `posture-api_ValidateFindingTypeResponse` in responses.
  */
-export const posture_api_ValidateFindingTypeResponse_output: JsonSchema = {
+export const posture$$api_ValidateFindingTypeResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -56,7 +56,7 @@ export const posture_api_ValidateFindingTypeResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_ValidateFindingTypeResult` in responses.
  */
-export const posture_api_ValidateFindingTypeResult_output: JsonSchema = {
+export const posture$$api_ValidateFindingTypeResult: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -78,7 +78,7 @@ export const posture_api_ValidateFindingTypeResult_output: JsonSchema = {
 /**
  * The schema of `posture-api_custom-finding-type-response` in responses.
  */
-export const posture_api_custom_finding_type_response_output: JsonSchema = {
+export const posture$$api_custom$$finding$$type$$response: JsonSchema = {
   "properties": {
     "applies_to_all_integrations": {
       "type": "boolean"
@@ -89,7 +89,25 @@ export const posture_api_custom_finding_type_response_output: JsonSchema = {
     "asset_vendor": {
       "allOf": [
         {
-          "$ref": "#/$defs/posture-api_FindingTypeVendorsEnum"
+          "enum": [
+            "ANTHROPIC",
+            "AWS",
+            "BITBUCKET",
+            "BOX",
+            "CONFLUENCE",
+            "DROPBOX",
+            "GITHUB",
+            "GOOGLE_CLOUD_PLATFORM",
+            "GOOGLE_WORKSPACE",
+            "JIRA",
+            "MICROSOFT",
+            "OPENAI",
+            "SALESFORCE",
+            "SERVICENOW",
+            "SLACK",
+            "ZOOM"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -146,7 +164,13 @@ export const posture_api_custom_finding_type_response_output: JsonSchema = {
     "severity": {
       "allOf": [
         {
-          "$ref": "#/$defs/posture-api_SeverityEnum"
+          "enum": [
+            "Critical",
+            "High",
+            "Medium",
+            "Low"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -186,7 +210,7 @@ export const posture_api_custom_finding_type_response_output: JsonSchema = {
 /**
  * The schema of `posture-api_custom-finding-type-single-response` in responses.
  */
-export const posture_api_custom_finding_type_single_response_output: JsonSchema = {
+export const posture$$api_custom$$finding$$type$$single$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -205,7 +229,7 @@ export const posture_api_custom_finding_type_single_response_output: JsonSchema
 /**
  * The schema of `posture-api_finding-type-response` in responses.
  */
-export const posture_api_finding_type_response_output: JsonSchema = {
+export const posture$$api_finding$$type$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -224,7 +248,7 @@ export const posture_api_finding_type_response_output: JsonSchema = {
 /**
  * The schema of `posture-api_paginated-finding-type-list` in responses.
  */
-export const posture_api_paginated_finding_type_list_output: JsonSchema = {
+export const posture$$api_paginated$$finding$$type$$list: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/remediationTypes/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/remediationTypes/outputs.ts
index ce5ff2b3e..e8c55bccc 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/remediationTypes/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/remediationTypes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `posture-api_PaginatedRemediationTypeList` in responses.
  */
-export const posture_api_PaginatedRemediationTypeList_output: JsonSchema = {
+export const posture$$api_PaginatedRemediationTypeList: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-collection"
@@ -28,7 +28,7 @@ export const posture_api_PaginatedRemediationTypeList_output: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationType` in responses.
  */
-export const posture_api_RemediationType_output: JsonSchema = {
+export const posture$$api_RemediationType: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/remediationTypes/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/remediationTypes/tools.ts
index 30f897b05..210dee1ce 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/remediationTypes/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/remediationTypes/tools.ts
@@ -1,69 +1,85 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  posture_api_api_response_collection_output,
-  posture_api_api_response_common_output,
-  posture_api_messages_output,
-  posture_api_result_info_output,
+  posture$$api_api$$response$$collection,
+  posture$$api_api$$response$$common,
+  posture$$api_messages,
+  posture$$api_result$$info,
 } from "../../outputs.js";
 import {
-  posture_api_PaginatedRemediationTypeList_output,
-  posture_api_RemediationType_output,
+  posture$$api_PaginatedRemediationTypeList,
+  posture$$api_RemediationType,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.casb.finding_types.remediation_types`.
+ * The tools of `zeroTrust.casb.findingTypes.remediationTypes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_finding_types_remediation_types_list",
+    name: "zeroTrust_casb_findingTypes_remediationTypes_list",
     title: "List remediation types for a finding type",
-    description: "List all remediation types for a given finding type.\nThis endpoint supports both cursor and offset pagination.\nNote that `cursor` and `page` are mutually exclusive.",
+    description: "List all remediation types for a given finding type.\nThis endpoint supports both cursor and offset pagination.\nNote that `cursor` and `page` are mutually exclusive.\n\nGET /accounts/{account_id}/data-security/posture/finding_types/{finding_type_id}/remediation_types",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_type_id": {
+              "description": "A UUID string identifying the finding type.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_type_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "description": "A cursor for pagination.",
-          "type": "string"
-        },
-        "finding_type_id": {
-          "description": "A UUID string identifying the finding type.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "integration_id": {
-          "description": "Filter by an integration ID",
-          "format": "uuid",
-          "type": "string"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "A cursor for pagination.",
+              "type": "string"
+            },
+            "integration_id": {
+              "description": "Filter by an integration ID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_type_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_PaginatedRemediationTypeList",
       $defs: {
-        "posture-api_PaginatedRemediationTypeList": posture_api_PaginatedRemediationTypeList_output,
-        "posture-api_RemediationType": posture_api_RemediationType_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_PaginatedRemediationTypeList": posture$$api_PaginatedRemediationTypeList,
+        "posture-api_RemediationType": posture$$api_RemediationType,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     annotations: {
@@ -93,21 +109,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_PaginatedRemediationTypeList": posture_api_PaginatedRemediationTypeList_output,
-        "posture-api_RemediationType": posture_api_RemediationType_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_PaginatedRemediationTypeList": posture$$api_PaginatedRemediationTypeList,
+        "posture-api_RemediationType": posture$$api_RemediationType,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/finding_types/${pathParam(args, "finding_type_id")}/remediation_types`,
       query: [
-        ["integration_id", args["integration_id"], true],
-        ["cursor", args["cursor"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["integration_id", param(args, "query", "integration_id"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/schemas.ts
index 982b60527..126b1fe71 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/schemas.ts
@@ -3,36 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `posture-api_FindingTypeOriginEnum`.
- */
-export const posture_api_FindingTypeOriginEnum: JsonSchema = {
-  "description": "Finding type origins for list filters.",
-  "enum": [
-    "custom",
-    "system"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_FindingTypeSeverityEnum`.
- */
-export const posture_api_FindingTypeSeverityEnum: JsonSchema = {
-  "description": "Finding type severities for list filters.",
-  "enum": [
-    "critical",
-    "high",
-    "medium",
-    "low"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_create-finding-type-request`.
  */
-export const posture_api_create_finding_type_request: JsonSchema = {
+export const posture$$api_create$$finding$$type$$request: JsonSchema = {
   "properties": {
     "applies_to_all_integrations": {
       "description": "When true, this finding type applies to every current and future integration of the vendor.",
@@ -45,7 +19,26 @@ export const posture_api_create_finding_type_request: JsonSchema = {
     "asset_vendor": {
       "allOf": [
         {
-          "$ref": "#/$defs/posture-api_FindingTypeVendorsEnum"
+          "description": "Vendors whose assets a finding type can evaluate.",
+          "enum": [
+            "ANTHROPIC",
+            "AWS",
+            "BITBUCKET",
+            "BOX",
+            "CONFLUENCE",
+            "DROPBOX",
+            "GITHUB",
+            "GOOGLE_CLOUD_PLATFORM",
+            "GOOGLE_WORKSPACE",
+            "JIRA",
+            "MICROSOFT",
+            "OPENAI",
+            "SALESFORCE",
+            "SERVICENOW",
+            "SLACK",
+            "ZOOM"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -75,7 +68,14 @@ export const posture_api_create_finding_type_request: JsonSchema = {
     "severity": {
       "allOf": [
         {
-          "$ref": "#/$defs/posture-api_SeverityEnum"
+          "description": "The severity level of a finding.",
+          "enum": [
+            "Critical",
+            "High",
+            "Medium",
+            "Low"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -98,7 +98,7 @@ export const posture_api_create_finding_type_request: JsonSchema = {
 /**
  * The schema of `posture-api_update-finding-type-request`.
  */
-export const posture_api_update_finding_type_request: JsonSchema = {
+export const posture$$api_update$$finding$$type$$request: JsonSchema = {
   "properties": {
     "applies_to_all_integrations": {
       "description": "When true, this finding type applies to every current and future integration of the vendor.",
@@ -123,7 +123,14 @@ export const posture_api_update_finding_type_request: JsonSchema = {
     "severity": {
       "allOf": [
         {
-          "$ref": "#/$defs/posture-api_SeverityEnum"
+          "description": "The severity level of a finding.",
+          "enum": [
+            "Critical",
+            "High",
+            "Medium",
+            "Low"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/tools.ts
index 5c74ddf4d..bd067b993 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findingTypes/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findingTypes/tools.ts
@@ -1,84 +1,75 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  posture_api_BaseFindingType_output,
-  posture_api_FindingCategoryTypeEnum_output,
-  posture_api_FindingCategory_output,
-  posture_api_FindingTypeVendorsEnum_output,
-  posture_api_ObservationEnum_output,
-  posture_api_ProductEnum_output,
-  posture_api_SeverityEnum_output,
-  posture_api_api_response_collection_output,
-  posture_api_api_response_common_output,
-  posture_api_error_response_output,
-  posture_api_messages_output,
-  posture_api_result_info_output,
+  posture$$api_BaseFindingType,
+  posture$$api_FindingCategory,
+  posture$$api_api$$response$$collection,
+  posture$$api_api$$response$$common,
+  posture$$api_error$$response,
+  posture$$api_messages,
+  posture$$api_result$$info,
 } from "../outputs.js";
 import {
-  posture_api_FindingCategoryTypeEnum,
-  posture_api_FindingTypeVendorsEnum,
-  posture_api_SeverityEnum,
-} from "../schemas.js";
-import {
-  posture_api_FindingTypeValidationError_output,
-  posture_api_ValidateFindingTypeResponse_output,
-  posture_api_ValidateFindingTypeResult_output,
-  posture_api_custom_finding_type_response_output,
-  posture_api_custom_finding_type_single_response_output,
-  posture_api_finding_type_response_output,
-  posture_api_paginated_finding_type_list_output,
+  posture$$api_FindingTypeValidationError,
+  posture$$api_ValidateFindingTypeResponse,
+  posture$$api_ValidateFindingTypeResult,
+  posture$$api_custom$$finding$$type$$response,
+  posture$$api_custom$$finding$$type$$single$$response,
+  posture$$api_finding$$type$$response,
+  posture$$api_paginated$$finding$$type$$list,
 } from "./outputs.js";
 import {
-  posture_api_FindingTypeOriginEnum,
-  posture_api_FindingTypeSeverityEnum,
-  posture_api_create_finding_type_request,
-  posture_api_update_finding_type_request,
+  posture$$api_create$$finding$$type$$request,
+  posture$$api_update$$finding$$type$$request,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.finding_types`.
+ * The tools of `zeroTrust.casb.findingTypes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_finding_types_create",
+    name: "zeroTrust_casb_findingTypes_create",
     title: "Create a custom finding type",
-    description: "Create a new custom finding type with policy definition.",
+    description: "Create a new custom finding type with policy definition.\n\nPOST /accounts/{account_id}/data-security/posture/finding_types",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_create-finding-type-request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum,
-        "posture-api_create-finding-type-request": posture_api_create_finding_type_request,
+        "posture-api_create-finding-type-request": posture$$api_create$$finding$$type$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_custom-finding-type-single-response",
       $defs: {
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_custom-finding-type-response": posture_api_custom_finding_type_response_output,
-        "posture-api_custom-finding-type-single-response": posture_api_custom_finding_type_single_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_custom-finding-type-response": posture$$api_custom$$finding$$type$$response,
+        "posture-api_custom-finding-type-single-response": posture$$api_custom$$finding$$type$$single$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -123,17 +114,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_custom-finding-type-response": posture_api_custom_finding_type_response_output,
-        "posture-api_custom-finding-type-single-response": posture_api_custom_finding_type_single_response_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_custom-finding-type-response": posture$$api_custom$$finding$$type$$response,
+        "posture-api_custom-finding-type-single-response": posture$$api_custom$$finding$$type$$single$$response,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -142,26 +128,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_finding_types_delete",
+    name: "zeroTrust_casb_findingTypes_delete",
     title: "Delete a custom finding type",
-    description: "Delete an existing custom finding type.\n\n**Security**: Only custom finding types (not system-managed) can be deleted.",
+    description: "Delete an existing custom finding type.\n\n**Security**: Only custom finding types (not system-managed) can be deleted.\n\nDELETE /accounts/{account_id}/data-security/posture/finding_types/{finding_type_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "finding_type_id": {
-          "description": "A UUID string identifying the finding type.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_type_id": {
+              "description": "A UUID string identifying the finding type.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_type_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_type_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -200,9 +196,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -210,40 +206,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_finding_types_get",
+    name: "zeroTrust_casb_findingTypes_get",
     title: "Get finding by ID",
-    description: "Retrieve a specific finding type by its unique identifier.",
+    description: "Retrieve a specific finding type by its unique identifier.\n\nGET /accounts/{account_id}/data-security/posture/finding_types/{finding_type_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "finding_type_id": {
-          "description": "A UUID string identifying the finding type.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_type_id": {
+              "description": "A UUID string identifying the finding type.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_type_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_type_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-type-response",
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-type-response": posture_api_finding_type_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-type-response": posture$$api_finding$$type$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -273,16 +274,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-type-response": posture_api_finding_type_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-type-response": posture$$api_finding$$type$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -290,117 +286,158 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_finding_types_list",
+    name: "zeroTrust_casb_findingTypes_list",
     title: "List all finding types",
-    description: "List all available finding types with pagination support.",
+    description: "List all available finding types with pagination support.\n\nGET /accounts/{account_id}/data-security/posture/finding_types",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Sort direction for the primary field. Defaults to 'desc'.\nTies are resolved by case-insensitive name, then ID, both ascending regardless of direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "max_updated_at": {
-          "description": "Return only finding types updated at or before this RFC 3339 timestamp (inclusive).",
-          "format": "date-time",
-          "type": "string"
-        },
-        "min_updated_at": {
-          "description": "Return only finding types updated at or after this RFC 3339 timestamp (inclusive).",
-          "format": "date-time",
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to sort by (case-insensitive). Defaults to 'created'.\nName and vendor sorting is case-insensitive; vendor uses friendly provider names.\nAscending order: type Content then Posture; origin custom then system;\nseverity Low, Medium, High, Critical.",
-          "enum": [
-            "created",
-            "updated",
-            "match_count",
-            "name",
-            "vendor",
-            "type",
-            "origin",
-            "severity"
-          ],
-          "type": "string"
-        },
-        "origins": {
-          "description": "Filter finding types by origin. Supports multiple comma-separated, case-insensitive values.",
-          "items": {
-            "$ref": "#/$defs/posture-api_FindingTypeOriginEnum"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
-        },
-        "quarantined": {
-          "description": "When true, return only quarantined finding types; when false, return only non-quarantined finding types. Omit to return both.",
-          "type": "boolean"
-        },
-        "search": {
-          "description": "Filter finding types by name or ID (case-insensitive substring match).",
-          "type": "string"
-        },
-        "severities": {
-          "description": "Filter finding types by severity. Supports multiple comma-separated, case-insensitive values.",
-          "items": {
-            "$ref": "#/$defs/posture-api_FindingTypeSeverityEnum"
-          },
-          "type": "array"
-        },
-        "types": {
-          "description": "Filter finding types by category type. Supports multiple comma-separated, case-insensitive values.",
-          "items": {
-            "$ref": "#/$defs/posture-api_FindingCategoryTypeEnum"
-          },
-          "type": "array"
-        },
-        "vendors": {
-          "description": "Filter finding types by vendor. Supports multiple comma-separated values. Each value may be either the vendor enum (GOOGLE_WORKSPACE) or the friendly name returned by the read routes (Google Workspace).",
-          "items": {
-            "$ref": "#/$defs/posture-api_FindingTypeVendorsEnum"
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Sort direction for the primary field. Defaults to 'desc'.\nTies are resolved by case-insensitive name, then ID, both ascending regardless of direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "max_updated_at": {
+              "description": "Return only finding types updated at or before this RFC 3339 timestamp (inclusive).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "min_updated_at": {
+              "description": "Return only finding types updated at or after this RFC 3339 timestamp (inclusive).",
+              "format": "date-time",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to sort by (case-insensitive). Defaults to 'created'.\nName and vendor sorting is case-insensitive; vendor uses friendly provider names.\nAscending order: type Content then Posture; origin custom then system;\nseverity Low, Medium, High, Critical.",
+              "enum": [
+                "created",
+                "updated",
+                "match_count",
+                "name",
+                "vendor",
+                "type",
+                "origin",
+                "severity"
+              ],
+              "type": "string"
+            },
+            "origins": {
+              "description": "Filter finding types by origin. Supports multiple comma-separated, case-insensitive values.",
+              "items": {
+                "description": "Finding type origins for list filters.",
+                "enum": [
+                  "custom",
+                  "system"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            },
+            "quarantined": {
+              "description": "When true, return only quarantined finding types; when false, return only non-quarantined finding types. Omit to return both.",
+              "type": "boolean"
+            },
+            "search": {
+              "description": "Filter finding types by name or ID (case-insensitive substring match).",
+              "type": "string"
+            },
+            "severities": {
+              "description": "Filter finding types by severity. Supports multiple comma-separated, case-insensitive values.",
+              "items": {
+                "description": "Finding type severities for list filters.",
+                "enum": [
+                  "critical",
+                  "high",
+                  "medium",
+                  "low"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "types": {
+              "description": "Filter finding types by category type. Supports multiple comma-separated, case-insensitive values.",
+              "items": {
+                "description": "The type of the finding category.",
+                "enum": [
+                  "Content",
+                  "Posture"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "vendors": {
+              "description": "Filter finding types by vendor. Supports multiple comma-separated values. Each value may be either the vendor enum (GOOGLE_WORKSPACE) or the friendly name returned by the read routes (Google Workspace).",
+              "items": {
+                "description": "Vendors whose assets a finding type can evaluate.",
+                "enum": [
+                  "ANTHROPIC",
+                  "AWS",
+                  "BITBUCKET",
+                  "BOX",
+                  "CONFLUENCE",
+                  "DROPBOX",
+                  "GITHUB",
+                  "GOOGLE_CLOUD_PLATFORM",
+                  "GOOGLE_WORKSPACE",
+                  "JIRA",
+                  "MICROSOFT",
+                  "OPENAI",
+                  "SALESFORCE",
+                  "SERVICENOW",
+                  "SLACK",
+                  "ZOOM"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum,
-        "posture-api_FindingTypeOriginEnum": posture_api_FindingTypeOriginEnum,
-        "posture-api_FindingTypeSeverityEnum": posture_api_FindingTypeSeverityEnum,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_paginated-finding-type-list",
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_paginated-finding-type-list": posture_api_paginated_finding_type_list_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_paginated-finding-type-list": posture$$api_paginated$$finding$$type$$list,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     annotations: {
@@ -432,82 +469,81 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_paginated-finding-type-list": posture_api_paginated_finding_type_list_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_paginated-finding-type-list": posture$$api_paginated$$finding$$type$$list,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/finding_types`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["vendors", args["vendors"], false],
-        ["types", args["types"], false],
-        ["origins", args["origins"], false],
-        ["severities", args["severities"], false],
-        ["search", args["search"], true],
-        ["quarantined", args["quarantined"], true],
-        ["min_updated_at", args["min_updated_at"], true],
-        ["max_updated_at", args["max_updated_at"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["vendors", param(args, "query", "vendors"), false],
+        ["types", param(args, "query", "types"), false],
+        ["origins", param(args, "query", "origins"), false],
+        ["severities", param(args, "query", "severities"), false],
+        ["search", param(args, "query", "search"), true],
+        ["quarantined", param(args, "query", "quarantined"), true],
+        ["min_updated_at", param(args, "query", "min_updated_at"), true],
+        ["max_updated_at", param(args, "query", "max_updated_at"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_casb_finding_types_update",
+    name: "zeroTrust_casb_findingTypes_update",
     title: "Update a custom finding type",
-    description: "Update an existing custom finding type.\n\n**Immutable fields**: asset_vendor, asset_class, expression, and category cannot be changed after creation.\n\n**Security**: Only custom finding types (not system-managed) can be updated.",
+    description: "Update an existing custom finding type.\n\n**Immutable fields**: asset_vendor, asset_class, expression, and category cannot be changed after creation.\n\n**Security**: Only custom finding types (not system-managed) can be updated.\n\nPUT /accounts/{account_id}/data-security/posture/finding_types/{finding_type_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_update-finding-type-request"
         },
-        "finding_type_id": {
-          "description": "A UUID string identifying the finding type.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_type_id": {
+              "description": "A UUID string identifying the finding type.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_type_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_type_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_SeverityEnum": posture_api_SeverityEnum,
-        "posture-api_update-finding-type-request": posture_api_update_finding_type_request,
+        "posture-api_update-finding-type-request": posture$$api_update$$finding$$type$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_custom-finding-type-single-response",
       $defs: {
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_custom-finding-type-response": posture_api_custom_finding_type_response_output,
-        "posture-api_custom-finding-type-single-response": posture_api_custom_finding_type_single_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_custom-finding-type-response": posture$$api_custom$$finding$$type$$response,
+        "posture-api_custom-finding-type-single-response": posture$$api_custom$$finding$$type$$single$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -555,17 +591,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_custom-finding-type-response": posture_api_custom_finding_type_response_output,
-        "posture-api_custom-finding-type-single-response": posture_api_custom_finding_type_single_response_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_custom-finding-type-response": posture$$api_custom$$finding$$type$$response,
+        "posture-api_custom-finding-type-single-response": posture$$api_custom$$finding$$type$$single$$response,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -574,38 +605,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_finding_types_validate",
+    name: "zeroTrust_casb_findingTypes_validate",
     title: "Validate a custom finding type",
-    description: "Check a candidate custom finding type without creating it, so problems can\nbe corrected before publishing. The request body is the same shape as\n`CreateFindingType`, and the candidate is checked against the same rules, so\na valid result means the definition itself is sound. It is not a reservation:\na create can still be rejected for a reason that does not belong to the\ndefinition, such as the account already holding the maximum number of custom\nfinding types.\n\nA candidate that fails validation is still a **200** with\n`result.valid: false` and one entry in `result.errors` per problem — that is\nthe answer this endpoint exists to give. `4xx` is reserved for a request\nthat could not be processed at all, such as a body that will not parse.",
+    description: "Check a candidate custom finding type without creating it, so problems can\nbe corrected before publishing. The request body is the same shape as\n`CreateFindingType`, and the candidate is checked against the same rules, so\na valid result means the definition itself is sound. It is not a reservation:\na create can still be rejected for a reason that does not belong to the\ndefinition, such as the account already holding the maximum number of custom\nfinding types.\n\nA candidate that fails validation is still a **200** with\n`result.valid: false` and one entry in `result.errors` per problem — that is\nthe answer this endpoint exists to give. `4xx` is reserved for a request\nthat could not be processed at all, such as a body that will not parse.\n\nPOST /accounts/{account_id}/data-security/posture/finding_types/validate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_create-finding-type-request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum,
-        "posture-api_create-finding-type-request": posture_api_create_finding_type_request,
+        "posture-api_create-finding-type-request": posture$$api_create$$finding$$type$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_ValidateFindingTypeResponse",
       $defs: {
-        "posture-api_FindingTypeValidationError": posture_api_FindingTypeValidationError_output,
-        "posture-api_ValidateFindingTypeResponse": posture_api_ValidateFindingTypeResponse_output,
-        "posture-api_ValidateFindingTypeResult": posture_api_ValidateFindingTypeResult_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_FindingTypeValidationError": posture$$api_FindingTypeValidationError,
+        "posture-api_ValidateFindingTypeResponse": posture$$api_ValidateFindingTypeResponse,
+        "posture-api_ValidateFindingTypeResult": posture$$api_ValidateFindingTypeResult,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -644,12 +683,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_FindingTypeValidationError": posture_api_FindingTypeValidationError_output,
-        "posture-api_ValidateFindingTypeResponse": posture_api_ValidateFindingTypeResponse_output,
-        "posture-api_ValidateFindingTypeResult": posture_api_ValidateFindingTypeResult_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_FindingTypeValidationError": posture$$api_FindingTypeValidationError,
+        "posture-api_ValidateFindingTypeResponse": posture$$api_ValidateFindingTypeResponse,
+        "posture-api_ValidateFindingTypeResult": posture$$api_ValidateFindingTypeResult,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findings/instances/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/findings/instances/outputs.ts
index f17a26adc..ea22e8645 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findings/instances/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findings/instances/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `posture-api_Asset` in responses.
  */
-export const posture_api_Asset_output: JsonSchema = {
+export const posture$$api_Asset: JsonSchema = {
   "properties": {
     "category": {
       "$ref": "#/$defs/posture-api_AssetCategory"
@@ -54,7 +54,7 @@ export const posture_api_Asset_output: JsonSchema = {
 /**
  * The schema of `posture-api_AssetCategory` in responses.
  */
-export const posture_api_AssetCategory_output: JsonSchema = {
+export const posture$$api_AssetCategory: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -88,7 +88,7 @@ export const posture_api_AssetCategory_output: JsonSchema = {
 /**
  * The schema of `posture-api_AssetField` in responses.
  */
-export const posture_api_AssetField_output: JsonSchema = {
+export const posture$$api_AssetField: JsonSchema = {
   "properties": {
     "link": {
       "oneOf": [
@@ -117,7 +117,7 @@ export const posture_api_AssetField_output: JsonSchema = {
 /**
  * The schema of `posture-api_FindingInstance` in responses.
  */
-export const posture_api_FindingInstance_output: JsonSchema = {
+export const posture$$api_FindingInstance: JsonSchema = {
   "properties": {
     "affliction_date": {
       "format": "date-time",
@@ -165,7 +165,7 @@ export const posture_api_FindingInstance_output: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationJobSummary` in responses.
  */
-export const posture_api_RemediationJobSummary_output: JsonSchema = {
+export const posture$$api_RemediationJobSummary: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -179,7 +179,14 @@ export const posture_api_RemediationJobSummary_output: JsonSchema = {
       "type": "boolean"
     },
     "status": {
-      "$ref": "#/$defs/posture-api_RemediationJobStatusEnum"
+      "enum": [
+        "pending",
+        "processing",
+        "completed",
+        "failed",
+        "validating"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -194,7 +201,7 @@ export const posture_api_RemediationJobSummary_output: JsonSchema = {
 /**
  * The schema of `posture-api_WebhookInvocationSummary` in responses.
  */
-export const posture_api_WebhookInvocationSummary_output: JsonSchema = {
+export const posture$$api_WebhookInvocationSummary: JsonSchema = {
   "properties": {
     "latest_job": {
       "properties": {
@@ -245,7 +252,7 @@ export const posture_api_WebhookInvocationSummary_output: JsonSchema = {
 /**
  * The schema of `posture-api_finding-instance-response` in responses.
  */
-export const posture_api_finding_instance_response_output: JsonSchema = {
+export const posture$$api_finding$$instance$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -264,7 +271,7 @@ export const posture_api_finding_instance_response_output: JsonSchema = {
 /**
  * The schema of `posture-api_paginated-finding-instance-list` in responses.
  */
-export const posture_api_paginated_finding_instance_list_output: JsonSchema = {
+export const posture$$api_paginated$$finding$$instance$$list: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findings/instances/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/findings/instances/schemas.ts
index c1d8300ee..5511cbdd5 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findings/instances/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findings/instances/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `posture-api_FindingInstanceBulkActionRequest`.
  */
-export const posture_api_FindingInstanceBulkActionRequest: JsonSchema = {
+export const posture$$api_FindingInstanceBulkActionRequest: JsonSchema = {
   "description": "Request body for bulk actions on finding instances.",
   "properties": {
     "check_instances": {
@@ -27,7 +27,7 @@ export const posture_api_FindingInstanceBulkActionRequest: JsonSchema = {
 /**
  * The schema of `posture-api_FindingInstanceExportFilterRequest`.
  */
-export const posture_api_FindingInstanceExportFilterRequest: JsonSchema = {
+export const posture$$api_FindingInstanceExportFilterRequest: JsonSchema = {
   "description": "Filter specification for finding instance exports.",
   "properties": {
     "archived": {
@@ -63,12 +63,16 @@ export const posture_api_FindingInstanceExportFilterRequest: JsonSchema = {
 /**
  * The schema of `posture-api_FindingInstanceExportOrderFilterRequest`.
  */
-export const posture_api_FindingInstanceExportOrderFilterRequest: JsonSchema = {
+export const posture$$api_FindingInstanceExportOrderFilterRequest: JsonSchema = {
   "description": "Order specification for finding instance exports.",
   "properties": {
     "direction": {
-      "$ref": "#/$defs/posture-api_DirectionEnum",
-      "description": "Sort direction."
+      "description": "Sort direction.",
+      "enum": [
+        "asc",
+        "desc"
+      ],
+      "type": "string"
     },
     "name": {
       "description": "Which field to use when ordering the finding instances.",
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findings/instances/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/findings/instances/tools.ts
index 1ce5ecd4a..4c4aeb090 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findings/instances/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findings/instances/tools.ts
@@ -1,82 +1,87 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  posture_api_DlpContext_output,
-  posture_api_ExportJobTypeEnum_output,
-  posture_api_ExportJob_output,
-  posture_api_RemediationJobStatusEnum_output,
-  posture_api_StatusEnum_output,
-  posture_api_api_response_collection_output,
-  posture_api_api_response_common_output,
-  posture_api_export_job_response_output,
-  posture_api_messages_output,
-  posture_api_result_info_output,
+  posture$$api_DlpContext,
+  posture$$api_ExportJob,
+  posture$$api_api$$response$$collection,
+  posture$$api_api$$response$$common,
+  posture$$api_export$$job$$response,
+  posture$$api_messages,
+  posture$$api_result$$info,
 } from "../../outputs.js";
-import { posture_api_DirectionEnum } from "../../schemas.js";
 import {
-  posture_api_AssetCategory_output,
-  posture_api_AssetField_output,
-  posture_api_Asset_output,
-  posture_api_FindingInstance_output,
-  posture_api_RemediationJobSummary_output,
-  posture_api_WebhookInvocationSummary_output,
-  posture_api_finding_instance_response_output,
-  posture_api_paginated_finding_instance_list_output,
+  posture$$api_Asset,
+  posture$$api_AssetCategory,
+  posture$$api_AssetField,
+  posture$$api_FindingInstance,
+  posture$$api_RemediationJobSummary,
+  posture$$api_WebhookInvocationSummary,
+  posture$$api_finding$$instance$$response,
+  posture$$api_paginated$$finding$$instance$$list,
 } from "./outputs.js";
 import {
-  posture_api_FindingInstanceBulkActionRequest,
-  posture_api_FindingInstanceExportFilterRequest,
-  posture_api_FindingInstanceExportOrderFilterRequest,
+  posture$$api_FindingInstanceBulkActionRequest,
+  posture$$api_FindingInstanceExportFilterRequest,
+  posture$$api_FindingInstanceExportOrderFilterRequest,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.findings.instances`.
+ * The tools of `zeroTrust.casb.findings.instances`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_findings_instances_archive",
+    name: "zeroTrust_casb_findings_instances_archive",
     title: "Archive a finding",
-    description: "Archive one or more finding instances.",
+    description: "Archive one or more finding instances.\n\nPOST /accounts/{account_id}/data-security/posture/findings/{finding_id}/instances/archive",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_FindingInstanceBulkActionRequest"
         },
-        "finding_id": {
-          "contentEncoding": "base64",
-          "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_id": {
+              "contentEncoding": "base64",
+              "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_FindingInstanceBulkActionRequest": posture_api_FindingInstanceBulkActionRequest,
+        "posture-api_FindingInstanceBulkActionRequest": posture$$api_FindingInstanceBulkActionRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-instance-response",
       $defs: {
-        "posture-api_Asset": posture_api_Asset_output,
-        "posture-api_AssetCategory": posture_api_AssetCategory_output,
-        "posture-api_AssetField": posture_api_AssetField_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_FindingInstance": posture_api_FindingInstance_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_RemediationJobSummary": posture_api_RemediationJobSummary_output,
-        "posture-api_WebhookInvocationSummary": posture_api_WebhookInvocationSummary_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-instance-response": posture_api_finding_instance_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Asset": posture$$api_Asset,
+        "posture-api_AssetCategory": posture$$api_AssetCategory,
+        "posture-api_AssetField": posture$$api_AssetField,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_FindingInstance": posture$$api_FindingInstance,
+        "posture-api_RemediationJobSummary": posture$$api_RemediationJobSummary,
+        "posture-api_WebhookInvocationSummary": posture$$api_WebhookInvocationSummary,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-instance-response": posture$$api_finding$$instance$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -105,17 +110,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_Asset": posture_api_Asset_output,
-        "posture-api_AssetCategory": posture_api_AssetCategory_output,
-        "posture-api_AssetField": posture_api_AssetField_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_FindingInstance": posture_api_FindingInstance_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_RemediationJobSummary": posture_api_RemediationJobSummary_output,
-        "posture-api_WebhookInvocationSummary": posture_api_WebhookInvocationSummary_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-instance-response": posture_api_finding_instance_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Asset": posture$$api_Asset,
+        "posture-api_AssetCategory": posture$$api_AssetCategory,
+        "posture-api_AssetField": posture$$api_AssetField,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_FindingInstance": posture$$api_FindingInstance,
+        "posture-api_RemediationJobSummary": posture$$api_RemediationJobSummary,
+        "posture-api_WebhookInvocationSummary": posture$$api_WebhookInvocationSummary,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-instance-response": posture$$api_finding$$instance$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -124,43 +128,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_findings_instances_export",
+    name: "zeroTrust_casb_findings_instances_export",
     title: "Create a finding instances export",
-    description: "Creates a CSV export for Finding instances and accepts optional filters in the payload.\n\nIdentify the finding as `<integration_id>-<finding_type_id>`: join the `integration.id` and\n`finding.id` of the finding (from the List posture findings response) with a hyphen.",
+    description: "Creates a CSV export for Finding instances and accepts optional filters in the payload.\n\nIdentify the finding as `<integration_id>-<finding_type_id>`: join the `integration.id` and\n`finding.id` of the finding (from the List posture findings response) with a hyphen.\n\nPOST /accounts/{account_id}/data-security/posture/findings/{storage_namespace_id}/instances/export",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_FindingInstanceExportFilterRequest"
         },
-        "finding_namespace_id": {
-          "description": "Identifies the finding whose instances to export, in the form `<integration_id>-<finding_type_id>`.\nTake `integration.id` and `finding.id` from the finding in the List posture findings response\nand join them with a hyphen.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "storage_namespace_id": {
+              "description": "Identifies the finding whose instances to export, in the form `<integration_id>-<finding_type_id>`.\nTake `integration.id` and `finding.id` from the finding in the List posture findings response\nand join them with a hyphen.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "storage_namespace_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_namespace_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_DirectionEnum": posture_api_DirectionEnum,
-        "posture-api_FindingInstanceExportFilterRequest": posture_api_FindingInstanceExportFilterRequest,
-        "posture-api_FindingInstanceExportOrderFilterRequest": posture_api_FindingInstanceExportOrderFilterRequest,
+        "posture-api_FindingInstanceExportFilterRequest": posture$$api_FindingInstanceExportFilterRequest,
+        "posture-api_FindingInstanceExportOrderFilterRequest": posture$$api_FindingInstanceExportOrderFilterRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_export-job-response",
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -190,61 +201,68 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
-      path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/findings/${pathParam(args, "finding_namespace_id")}/instances/export`,
+      path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/findings/${pathParam(args, "storage_namespace_id")}/instances/export`,
       body: { value: args["body"], mediaType: "application/json" },
     }),
   },
   {
-    name: "zero_trust_casb_findings_instances_get",
+    name: "zeroTrust_casb_findings_instances_get",
     title: "Get a finding instance using an instance ID",
-    description: "Gets a security Finding instance by id.",
+    description: "Gets a security Finding instance by id.\n\nGET /accounts/{account_id}/data-security/posture/findings/{finding_id}/instances/{instance_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "finding_id": {
-          "contentEncoding": "base64",
-          "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
-          "type": "string"
-        },
-        "instance_id": {
-          "description": "A uuid ID identifying this Finding instance.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_id": {
+              "contentEncoding": "base64",
+              "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
+              "type": "string"
+            },
+            "instance_id": {
+              "description": "A uuid ID identifying this Finding instance.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_id",
+            "instance_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_id",
-        "instance_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-instance-response",
       $defs: {
-        "posture-api_Asset": posture_api_Asset_output,
-        "posture-api_AssetCategory": posture_api_AssetCategory_output,
-        "posture-api_AssetField": posture_api_AssetField_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_FindingInstance": posture_api_FindingInstance_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_RemediationJobSummary": posture_api_RemediationJobSummary_output,
-        "posture-api_WebhookInvocationSummary": posture_api_WebhookInvocationSummary_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-instance-response": posture_api_finding_instance_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Asset": posture$$api_Asset,
+        "posture-api_AssetCategory": posture$$api_AssetCategory,
+        "posture-api_AssetField": posture$$api_AssetField,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_FindingInstance": posture$$api_FindingInstance,
+        "posture-api_RemediationJobSummary": posture$$api_RemediationJobSummary,
+        "posture-api_WebhookInvocationSummary": posture$$api_WebhookInvocationSummary,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-instance-response": posture$$api_finding$$instance$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -274,17 +292,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_Asset": posture_api_Asset_output,
-        "posture-api_AssetCategory": posture_api_AssetCategory_output,
-        "posture-api_AssetField": posture_api_AssetField_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_FindingInstance": posture_api_FindingInstance_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_RemediationJobSummary": posture_api_RemediationJobSummary_output,
-        "posture-api_WebhookInvocationSummary": posture_api_WebhookInvocationSummary_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-instance-response": posture_api_finding_instance_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Asset": posture$$api_Asset,
+        "posture-api_AssetCategory": posture$$api_AssetCategory,
+        "posture-api_AssetField": posture$$api_AssetField,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_FindingInstance": posture$$api_FindingInstance,
+        "posture-api_RemediationJobSummary": posture$$api_RemediationJobSummary,
+        "posture-api_WebhookInvocationSummary": posture$$api_WebhookInvocationSummary,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-instance-response": posture$$api_finding$$instance$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -292,120 +309,135 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_findings_instances_list",
+    name: "zeroTrust_casb_findings_instances_list",
     title: "List instances of a finding",
-    description: "Lists all security finding instances for a given security finding.",
+    description: "Lists all security finding instances for a given security finding.\n\nGET /accounts/{account_id}/data-security/posture/findings/{finding_id}/instances",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "archived": {
-          "description": "Archived",
-          "type": "boolean"
-        },
-        "asset_ids": {
-          "description": "Filter finding instances by an array of asset IDs. Supports multiple comma-separated values.",
-          "items": {
-            "format": "uuid",
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_id": {
+              "contentEncoding": "base64",
+              "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "cursor": {
-          "description": "A cursor for pagination. Obtained from the `result_info.cursor` field of a previous response.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
+          "required": [
+            "account_id",
+            "finding_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "finding_id": {
-          "contentEncoding": "base64",
-          "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
-          "type": "string"
-        },
-        "finding_instance_ids": {
-          "description": "Filter finding instances by an array of finding instance IDs. Supports multiple comma-separated values.",
-          "items": {
-            "format": "uuid",
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "archived": {
+              "description": "Archived",
+              "type": "boolean"
+            },
+            "asset_ids": {
+              "description": "Filter finding instances by an array of asset IDs. Supports multiple comma-separated values.",
+              "items": {
+                "format": "uuid",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "cursor": {
+              "description": "A cursor for pagination. Obtained from the `result_info.cursor` field of a previous response.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "finding_instance_ids": {
+              "description": "Filter finding instances by an array of finding instance IDs. Supports multiple comma-separated values.",
+              "items": {
+                "format": "uuid",
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "max_affliction_date": {
+              "description": "Filter to view findings that occurred on or before the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "min_affliction_date": {
+              "description": "Filter to view findings that occurred on or after the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "order": {
+              "description": "Which field to use when ordering the Finding's instances.\nWhen ordering by 'remediation.status', only the most recent non-stale remediation job is considered. Stale jobs (created before the instance's affliction_date) are treated as having no status for ordering purposes.",
+              "enum": [
+                "affliction_date",
+                "asset.name",
+                "remediation.status"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            },
+            "remediation_statuses": {
+              "description": "Filter finding instances by most recent remediation job status. Supports multiple comma-separated values.\nUse 'none' to filter instances with no remediation jobs or instances where the most recent job is stale.\nNote: Stale jobs (created before the instance's affliction_date) are ignored for filtering purposes, but are still included in the 'remediations' array with stale=true.",
+              "items": {
+                "enum": [
+                  "none",
+                  "pending",
+                  "processing",
+                  "validating",
+                  "completed",
+                  "failed"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "search": {
+              "description": "A search term.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "max_affliction_date": {
-          "description": "Filter to view findings that occurred on or before the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "min_affliction_date": {
-          "description": "Filter to view findings that occurred on or after the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "order": {
-          "description": "Which field to use when ordering the Finding's instances.\nWhen ordering by 'remediation.status', only the most recent non-stale remediation job is considered. Stale jobs (created before the instance's affliction_date) are treated as having no status for ordering purposes.",
-          "enum": [
-            "affliction_date",
-            "asset.name",
-            "remediation.status"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
-        },
-        "remediation_statuses": {
-          "description": "Filter finding instances by most recent remediation job status. Supports multiple comma-separated values.\nUse 'none' to filter instances with no remediation jobs or instances where the most recent job is stale.\nNote: Stale jobs (created before the instance's affliction_date) are ignored for filtering purposes, but are still included in the 'remediations' array with stale=true.",
-          "items": {
-            "enum": [
-              "none",
-              "pending",
-              "processing",
-              "validating",
-              "completed",
-              "failed"
-            ],
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "search": {
-          "description": "A search term.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_paginated-finding-instance-list",
       $defs: {
-        "posture-api_Asset": posture_api_Asset_output,
-        "posture-api_AssetCategory": posture_api_AssetCategory_output,
-        "posture-api_AssetField": posture_api_AssetField_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_FindingInstance": posture_api_FindingInstance_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_RemediationJobSummary": posture_api_RemediationJobSummary_output,
-        "posture-api_WebhookInvocationSummary": posture_api_WebhookInvocationSummary_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_paginated-finding-instance-list": posture_api_paginated_finding_instance_list_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_Asset": posture$$api_Asset,
+        "posture-api_AssetCategory": posture$$api_AssetCategory,
+        "posture-api_AssetField": posture$$api_AssetField,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_FindingInstance": posture$$api_FindingInstance,
+        "posture-api_RemediationJobSummary": posture$$api_RemediationJobSummary,
+        "posture-api_WebhookInvocationSummary": posture$$api_WebhookInvocationSummary,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_paginated-finding-instance-list": posture$$api_paginated$$finding$$instance$$list,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     annotations: {
@@ -435,81 +467,89 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_Asset": posture_api_Asset_output,
-        "posture-api_AssetCategory": posture_api_AssetCategory_output,
-        "posture-api_AssetField": posture_api_AssetField_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_FindingInstance": posture_api_FindingInstance_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_RemediationJobSummary": posture_api_RemediationJobSummary_output,
-        "posture-api_WebhookInvocationSummary": posture_api_WebhookInvocationSummary_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_paginated-finding-instance-list": posture_api_paginated_finding_instance_list_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_Asset": posture$$api_Asset,
+        "posture-api_AssetCategory": posture$$api_AssetCategory,
+        "posture-api_AssetField": posture$$api_AssetField,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_FindingInstance": posture$$api_FindingInstance,
+        "posture-api_RemediationJobSummary": posture$$api_RemediationJobSummary,
+        "posture-api_WebhookInvocationSummary": posture$$api_WebhookInvocationSummary,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_paginated-finding-instance-list": posture$$api_paginated$$finding$$instance$$list,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/findings/${pathParam(args, "finding_id")}/instances`,
       query: [
-        ["archived", args["archived"], true],
-        ["cursor", args["cursor"], true],
-        ["direction", args["direction"], true],
-        ["max_affliction_date", args["max_affliction_date"], true],
-        ["min_affliction_date", args["min_affliction_date"], true],
-        ["order", args["order"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["remediation_statuses", args["remediation_statuses"], false],
-        ["finding_instance_ids", args["finding_instance_ids"], true],
-        ["asset_ids", args["asset_ids"], true],
+        ["archived", param(args, "query", "archived"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["max_affliction_date", param(args, "query", "max_affliction_date"), true],
+        ["min_affliction_date", param(args, "query", "min_affliction_date"), true],
+        ["order", param(args, "query", "order"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["remediation_statuses", param(args, "query", "remediation_statuses"), false],
+        ["finding_instance_ids", param(args, "query", "finding_instance_ids"), true],
+        ["asset_ids", param(args, "query", "asset_ids"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_casb_findings_instances_unarchive",
+    name: "zeroTrust_casb_findings_instances_unarchive",
     title: "Remove the archive marking from a finding instance",
-    description: "Remove the archive marking from one or more finding instances.",
+    description: "Remove the archive marking from one or more finding instances.\n\nPOST /accounts/{account_id}/data-security/posture/findings/{finding_id}/instances/unarchive",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_FindingInstanceBulkActionRequest"
         },
-        "finding_id": {
-          "contentEncoding": "base64",
-          "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_id": {
+              "contentEncoding": "base64",
+              "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_FindingInstanceBulkActionRequest": posture_api_FindingInstanceBulkActionRequest,
+        "posture-api_FindingInstanceBulkActionRequest": posture$$api_FindingInstanceBulkActionRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-instance-response",
       $defs: {
-        "posture-api_Asset": posture_api_Asset_output,
-        "posture-api_AssetCategory": posture_api_AssetCategory_output,
-        "posture-api_AssetField": posture_api_AssetField_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_FindingInstance": posture_api_FindingInstance_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_RemediationJobSummary": posture_api_RemediationJobSummary_output,
-        "posture-api_WebhookInvocationSummary": posture_api_WebhookInvocationSummary_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-instance-response": posture_api_finding_instance_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Asset": posture$$api_Asset,
+        "posture-api_AssetCategory": posture$$api_AssetCategory,
+        "posture-api_AssetField": posture$$api_AssetField,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_FindingInstance": posture$$api_FindingInstance,
+        "posture-api_RemediationJobSummary": posture$$api_RemediationJobSummary,
+        "posture-api_WebhookInvocationSummary": posture$$api_WebhookInvocationSummary,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-instance-response": posture$$api_finding$$instance$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -538,17 +578,16 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_Asset": posture_api_Asset_output,
-        "posture-api_AssetCategory": posture_api_AssetCategory_output,
-        "posture-api_AssetField": posture_api_AssetField_output,
-        "posture-api_DlpContext": posture_api_DlpContext_output,
-        "posture-api_FindingInstance": posture_api_FindingInstance_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_RemediationJobSummary": posture_api_RemediationJobSummary_output,
-        "posture-api_WebhookInvocationSummary": posture_api_WebhookInvocationSummary_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-instance-response": posture_api_finding_instance_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Asset": posture$$api_Asset,
+        "posture-api_AssetCategory": posture$$api_AssetCategory,
+        "posture-api_AssetField": posture$$api_AssetField,
+        "posture-api_DlpContext": posture$$api_DlpContext,
+        "posture-api_FindingInstance": posture$$api_FindingInstance,
+        "posture-api_RemediationJobSummary": posture$$api_RemediationJobSummary,
+        "posture-api_WebhookInvocationSummary": posture$$api_WebhookInvocationSummary,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-instance-response": posture$$api_finding$$instance$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findings/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/findings/outputs.ts
index 5f57983e3..f071d683e 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findings/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_Finding` in responses.
  */
-export const posture_api_Finding_output: JsonSchema = {
+export const posture$$api_Finding: JsonSchema = {
   "properties": {
     "active_count": {
       "type": "integer"
@@ -54,7 +54,7 @@ export const posture_api_Finding_output: JsonSchema = {
 /**
  * The schema of `posture-api_FindingRemediation` in responses.
  */
-export const posture_api_FindingRemediation_output: JsonSchema = {
+export const posture$$api_FindingRemediation: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -100,13 +100,19 @@ export const posture_api_FindingRemediation_output: JsonSchema = {
 /**
  * The schema of `posture-api_FindingSeverityOverride` in responses.
  */
-export const posture_api_FindingSeverityOverride_output: JsonSchema = {
+export const posture$$api_FindingSeverityOverride: JsonSchema = {
   "properties": {
     "created_by": {
       "type": "string"
     },
     "severity": {
-      "$ref": "#/$defs/posture-api_SeverityEnum"
+      "enum": [
+        "Critical",
+        "High",
+        "Medium",
+        "Low"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -119,7 +125,7 @@ export const posture_api_FindingSeverityOverride_output: JsonSchema = {
 /**
  * The schema of `posture-api_FindingType` in responses.
  */
-export const posture_api_FindingType_output: JsonSchema = {
+export const posture$$api_FindingType: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_BaseFindingType"
@@ -138,7 +144,7 @@ export const posture_api_FindingType_output: JsonSchema = {
 /**
  * The schema of `posture-api_finding-response` in responses.
  */
-export const posture_api_finding_response_output: JsonSchema = {
+export const posture$$api_finding$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -157,7 +163,7 @@ export const posture_api_finding_response_output: JsonSchema = {
 /**
  * The schema of `posture-api_paginated-finding-list` in responses.
  */
-export const posture_api_paginated_finding_list_output: JsonSchema = {
+export const posture$$api_paginated$$finding$$list: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findings/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/findings/schemas.ts
index 1e27f5e6d..0fa01bf5e 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findings/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findings/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_FindingBulkActionRequest`.
  */
-export const posture_api_FindingBulkActionRequest: JsonSchema = {
+export const posture$$api_FindingBulkActionRequest: JsonSchema = {
   "description": "Request body for bulk actions on findings.",
   "properties": {
     "checks": {
@@ -28,7 +28,7 @@ export const posture_api_FindingBulkActionRequest: JsonSchema = {
 /**
  * The schema of `posture-api_FindingExportFilterRequest`.
  */
-export const posture_api_FindingExportFilterRequest: JsonSchema = {
+export const posture$$api_FindingExportFilterRequest: JsonSchema = {
   "description": "Filter specification for findings export jobs.",
   "properties": {
     "ignored": {
@@ -75,14 +75,41 @@ export const posture_api_FindingExportFilterRequest: JsonSchema = {
     "severities": {
       "description": "Filter by severity levels.",
       "items": {
-        "$ref": "#/$defs/posture-api_SeveritiesEnum"
+        "description": "The severity level for export filters.",
+        "enum": [
+          "CRITICAL",
+          "HIGH",
+          "MEDIUM",
+          "LOW"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
     "vendors": {
       "description": "Filter by vendor types.",
       "items": {
-        "$ref": "#/$defs/posture-api_VendorsEnum"
+        "description": "Supported vendor types for integrations.",
+        "enum": [
+          "ANTHROPIC",
+          "AWS",
+          "BITBUCKET",
+          "BOX",
+          "CONFLUENCE",
+          "DROPBOX",
+          "GITHUB",
+          "GOOGLE_CLOUD_PLATFORM",
+          "GOOGLE_WORKSPACE",
+          "JIRA",
+          "MICROSOFT",
+          "MICROSOFT_INTERNAL",
+          "OPENAI",
+          "SALESFORCE",
+          "SERVICENOW",
+          "SLACK",
+          "ZOOM"
+        ],
+        "type": "string"
       },
       "type": "array"
     }
@@ -93,12 +120,16 @@ export const posture_api_FindingExportFilterRequest: JsonSchema = {
 /**
  * The schema of `posture-api_FindingExportOrderFilterRequest`.
  */
-export const posture_api_FindingExportOrderFilterRequest: JsonSchema = {
+export const posture$$api_FindingExportOrderFilterRequest: JsonSchema = {
   "description": "Order specification for finding exports.",
   "properties": {
     "direction": {
-      "$ref": "#/$defs/posture-api_DirectionEnum",
-      "description": "Sort direction."
+      "description": "Sort direction.",
+      "enum": [
+        "asc",
+        "desc"
+      ],
+      "type": "string"
     },
     "name": {
       "description": "Which field to use when ordering the findings.",
@@ -119,24 +150,10 @@ export const posture_api_FindingExportOrderFilterRequest: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `posture-api_SeveritiesEnum`.
- */
-export const posture_api_SeveritiesEnum: JsonSchema = {
-  "description": "The severity level for export filters.",
-  "enum": [
-    "CRITICAL",
-    "HIGH",
-    "MEDIUM",
-    "LOW"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_TuneFindingSeverityRequest`.
  */
-export const posture_api_TuneFindingSeverityRequest: JsonSchema = {
+export const posture$$api_TuneFindingSeverityRequest: JsonSchema = {
   "description": "Request body for updating a finding's severity.",
   "properties": {
     "new_severity": {
diff --git a/src/generated/forge-mcp/zeroTrust/casb/findings/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/findings/tools.ts
index 4855e60bd..606b1fa5b 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/findings/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/findings/tools.ts
@@ -1,89 +1,81 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  posture_api_BaseFindingType_output,
-  posture_api_CredentialHealthStatusEnum_output,
-  posture_api_ExportJobTypeEnum_output,
-  posture_api_ExportJob_output,
-  posture_api_FindingCategoryTypeEnum_output,
-  posture_api_FindingCategory_output,
-  posture_api_FindingTypeVendorsEnum_output,
-  posture_api_IntegrationPolicy_output,
-  posture_api_IntegrationSummary_output,
-  posture_api_ObservationEnum_output,
-  posture_api_ProductEnum_output,
-  posture_api_SeverityEnum_output,
-  posture_api_StatusEnum_output,
-  posture_api_Vendor_output,
-  posture_api_ZeroTrustProduct_output,
-  posture_api_api_response_collection_output,
-  posture_api_api_response_common_output,
-  posture_api_error_response_output,
-  posture_api_export_job_response_output,
-  posture_api_messages_output,
-  posture_api_result_info_output,
+  posture$$api_BaseFindingType,
+  posture$$api_ExportJob,
+  posture$$api_FindingCategory,
+  posture$$api_IntegrationPolicy,
+  posture$$api_IntegrationSummary,
+  posture$$api_Vendor,
+  posture$$api_ZeroTrustProduct,
+  posture$$api_api$$response$$collection,
+  posture$$api_api$$response$$common,
+  posture$$api_error$$response,
+  posture$$api_export$$job$$response,
+  posture$$api_messages,
+  posture$$api_result$$info,
 } from "../outputs.js";
 import {
-  posture_api_DirectionEnum,
-  posture_api_VendorsEnum,
-} from "../schemas.js";
-import {
-  posture_api_FindingRemediation_output,
-  posture_api_FindingSeverityOverride_output,
-  posture_api_FindingType_output,
-  posture_api_Finding_output,
-  posture_api_finding_response_output,
-  posture_api_paginated_finding_list_output,
+  posture$$api_Finding,
+  posture$$api_FindingRemediation,
+  posture$$api_FindingSeverityOverride,
+  posture$$api_FindingType,
+  posture$$api_finding$$response,
+  posture$$api_paginated$$finding$$list,
 } from "./outputs.js";
 import {
-  posture_api_FindingBulkActionRequest,
-  posture_api_FindingExportFilterRequest,
-  posture_api_FindingExportOrderFilterRequest,
-  posture_api_SeveritiesEnum,
-  posture_api_TuneFindingSeverityRequest,
+  posture$$api_FindingBulkActionRequest,
+  posture$$api_FindingExportFilterRequest,
+  posture$$api_FindingExportOrderFilterRequest,
+  posture$$api_TuneFindingSeverityRequest,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.findings`.
+ * The tools of `zeroTrust.casb.findings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_findings_export",
+    name: "zeroTrust_casb_findings_export",
     title: "Create new findings export request",
-    description: "Creates a CSV export for findings and accepts optional filters in the payload.",
+    description: "Creates a CSV export for findings and accepts optional filters in the payload.\n\nPOST /accounts/{account_id}/data-security/posture/findings/export",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_FindingExportFilterRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_DirectionEnum": posture_api_DirectionEnum,
-        "posture-api_FindingExportFilterRequest": posture_api_FindingExportFilterRequest,
-        "posture-api_FindingExportOrderFilterRequest": posture_api_FindingExportOrderFilterRequest,
-        "posture-api_SeveritiesEnum": posture_api_SeveritiesEnum,
-        "posture-api_VendorsEnum": posture_api_VendorsEnum,
+        "posture-api_FindingExportFilterRequest": posture$$api_FindingExportFilterRequest,
+        "posture-api_FindingExportOrderFilterRequest": posture$$api_FindingExportOrderFilterRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_export-job-response",
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -112,12 +104,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -126,49 +116,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_findings_get",
+    name: "zeroTrust_casb_findings_get",
     title: "Get a posture finding",
-    description: "Gets a security Finding that has been identified as being problematic.",
+    description: "Gets a security Finding that has been identified as being problematic.\n\nGET /accounts/{account_id}/data-security/posture/findings/{finding_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "finding_id": {
-          "contentEncoding": "base64",
-          "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_id": {
+              "contentEncoding": "base64",
+              "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-response",
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -208,26 +202,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -235,50 +223,54 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_findings_ignore",
+    name: "zeroTrust_casb_findings_ignore",
     title: "Mark a finding as ignored",
-    description: "Given a list of findings, mark as ignored. Does nothing if Finding is already ignored.",
+    description: "Given a list of findings, mark as ignored. Does nothing if Finding is already ignored.\n\nPOST /accounts/{account_id}/data-security/posture/findings/ignore",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_FindingBulkActionRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_FindingBulkActionRequest": posture_api_FindingBulkActionRequest,
+        "posture-api_FindingBulkActionRequest": posture$$api_FindingBulkActionRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-response",
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -306,25 +298,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -333,145 +319,171 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_findings_list",
+    name: "zeroTrust_casb_findings_list",
     title: "List posture findings",
-    description: "List all security findings that have been identified as being problematic. \nThis will return a list of findings regardless if they have been ignored or not.",
+    description: "List all security findings that have been identified as being problematic. \nThis will return a list of findings regardless if they have been ignored or not.\n\nGET /accounts/{account_id}/data-security/posture/findings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "A cursor for pagination. Obtained from the `result_info.cursor` field of a previous response.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "finding_type_ids": {
-          "description": "A comma separated list of UUIDs identifying the finding type(s).",
-          "format": "uuid",
-          "type": "string"
-        },
-        "ignored": {
-          "description": "Filter for only the ignored findings. Set to false to only see \"active\" items",
-          "type": "boolean"
-        },
-        "integration_id": {
-          "description": "Filter by an integration ID",
-          "format": "uuid",
-          "type": "string"
-        },
-        "max_affliction_date": {
-          "description": "Filter to view findings that occurred on or before the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "min_affliction_date": {
-          "description": "Filter to view findings that occurred on or after the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "observation": {
-          "description": "Filter by observation type of the finding",
-          "enum": [
-            "Activity",
-            "Insight",
-            "Issue"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "description": "Which field to use when ordering the findings.",
-          "enum": [
-            "finding.name",
-            "instance_count",
-            "integration.name",
-            "latest_affliction_date",
-            "severity"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
-        },
-        "product": {
-          "description": "Filter by product category of the finding",
-          "enum": [
-            "Cloud",
-            "Saas"
-          ],
-          "type": "string"
-        },
-        "search": {
-          "description": "A search term.",
-          "type": "string"
-        },
-        "severity": {
-          "description": "Filter by severity",
-          "enum": [
-            "Critical",
-            "High",
-            "Medium",
-            "Low"
-          ],
-          "type": "string"
-        },
-        "type": {
-          "description": "Filter by type of the finding",
-          "enum": [
-            "Content",
-            "Posture"
-          ],
-          "type": "string"
-        },
-        "vendor": {
-          "$ref": "#/$defs/posture-api_VendorsEnum",
-          "description": "Filter by vendor"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "A cursor for pagination. Obtained from the `result_info.cursor` field of a previous response.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "finding_type_ids": {
+              "description": "A comma separated list of UUIDs identifying the finding type(s).",
+              "format": "uuid",
+              "type": "string"
+            },
+            "ignored": {
+              "description": "Filter for only the ignored findings. Set to false to only see \"active\" items",
+              "type": "boolean"
+            },
+            "integration_id": {
+              "description": "Filter by an integration ID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "max_affliction_date": {
+              "description": "Filter to view findings that occurred on or before the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "min_affliction_date": {
+              "description": "Filter to view findings that occurred on or after the affliction date. Can be a date-time in ISO 8601 format or an epoch timestamp.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "observation": {
+              "description": "Filter by observation type of the finding",
+              "enum": [
+                "Activity",
+                "Insight",
+                "Issue"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "description": "Which field to use when ordering the findings.",
+              "enum": [
+                "finding.name",
+                "instance_count",
+                "integration.name",
+                "latest_affliction_date",
+                "severity"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            },
+            "product": {
+              "description": "Filter by product category of the finding",
+              "enum": [
+                "Cloud",
+                "Saas"
+              ],
+              "type": "string"
+            },
+            "search": {
+              "description": "A search term.",
+              "type": "string"
+            },
+            "severity": {
+              "description": "Filter by severity",
+              "enum": [
+                "Critical",
+                "High",
+                "Medium",
+                "Low"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "description": "Filter by type of the finding",
+              "enum": [
+                "Content",
+                "Posture"
+              ],
+              "type": "string"
+            },
+            "vendor": {
+              "description": "Filter by vendor",
+              "enum": [
+                "ANTHROPIC",
+                "AWS",
+                "BITBUCKET",
+                "BOX",
+                "CONFLUENCE",
+                "DROPBOX",
+                "GITHUB",
+                "GOOGLE_CLOUD_PLATFORM",
+                "GOOGLE_WORKSPACE",
+                "JIRA",
+                "MICROSOFT",
+                "MICROSOFT_INTERNAL",
+                "OPENAI",
+                "SALESFORCE",
+                "SERVICENOW",
+                "SLACK",
+                "ZOOM"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "posture-api_VendorsEnum": posture_api_VendorsEnum,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_paginated-finding-list",
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_paginated-finding-list": posture_api_paginated_finding_list_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_paginated-finding-list": posture$$api_paginated$$finding$$list,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     annotations: {
@@ -508,96 +520,94 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_paginated-finding-list": posture_api_paginated_finding_list_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_paginated-finding-list": posture$$api_paginated$$finding$$list,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/findings`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["direction", args["direction"], true],
-        ["ignored", args["ignored"], true],
-        ["integration_id", args["integration_id"], true],
-        ["max_affliction_date", args["max_affliction_date"], true],
-        ["min_affliction_date", args["min_affliction_date"], true],
-        ["observation", args["observation"], true],
-        ["order", args["order"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["product", args["product"], true],
-        ["search", args["search"], true],
-        ["severity", args["severity"], true],
-        ["type", args["type"], true],
-        ["vendor", args["vendor"], true],
-        ["finding_type_ids", args["finding_type_ids"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["ignored", param(args, "query", "ignored"), true],
+        ["integration_id", param(args, "query", "integration_id"), true],
+        ["max_affliction_date", param(args, "query", "max_affliction_date"), true],
+        ["min_affliction_date", param(args, "query", "min_affliction_date"), true],
+        ["observation", param(args, "query", "observation"), true],
+        ["order", param(args, "query", "order"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["product", param(args, "query", "product"), true],
+        ["search", param(args, "query", "search"), true],
+        ["severity", param(args, "query", "severity"), true],
+        ["type", param(args, "query", "type"), true],
+        ["vendor", param(args, "query", "vendor"), true],
+        ["finding_type_ids", param(args, "query", "finding_type_ids"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_casb_findings_reset_severity",
+    name: "zeroTrust_casb_findings_resetSeverity",
     title: "Reset severity for a finding back to the default",
-    description: "If a Finding's severity has been changed, reset it back to default value.\nDoes nothing if no override exists.",
+    description: "If a Finding's severity has been changed, reset it back to default value.\nDoes nothing if no override exists.\n\nPOST /accounts/{account_id}/data-security/posture/findings/{finding_id}/reset_finding_severity",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "finding_id": {
-          "contentEncoding": "base64",
-          "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_id": {
+              "contentEncoding": "base64",
+              "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-response",
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -629,26 +639,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -656,56 +660,60 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_findings_tune_severity",
+    name: "zeroTrust_casb_findings_tuneSeverity",
     title: "Update the severity for a finding",
-    description: "Update the severity of a Finding.\nThis will update the `severity_override` field on the Finding payload with the new severity value.",
+    description: "Update the severity of a Finding.\nThis will update the `severity_override` field on the Finding payload with the new severity value.\n\nPOST /accounts/{account_id}/data-security/posture/findings/{finding_id}/tune_finding_severity",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_TuneFindingSeverityRequest"
         },
-        "finding_id": {
-          "contentEncoding": "base64",
-          "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "finding_id": {
+              "contentEncoding": "base64",
+              "description": "The `id` of a finding, as returned in each item of the List posture findings response.\nIt is a base64-encoded identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "finding_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "finding_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_TuneFindingSeverityRequest": posture_api_TuneFindingSeverityRequest,
+        "posture-api_TuneFindingSeverityRequest": posture$$api_TuneFindingSeverityRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-response",
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -737,26 +745,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -765,50 +767,54 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_findings_unignore",
+    name: "zeroTrust_casb_findings_unignore",
     title: "Remove ignore marker from a finding",
-    description: "Ability to un-ignore a Finding if it's previously been ignored. Does nothing if the Finding is not ignored.",
+    description: "Ability to un-ignore a Finding if it's previously been ignored. Does nothing if the Finding is not ignored.\n\nPOST /accounts/{account_id}/data-security/posture/findings/unignore",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_FindingBulkActionRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_FindingBulkActionRequest": posture_api_FindingBulkActionRequest,
+        "posture-api_FindingBulkActionRequest": posture$$api_FindingBulkActionRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_finding-response",
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -836,25 +842,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_BaseFindingType": posture_api_BaseFindingType_output,
-        "posture-api_CredentialHealthStatusEnum": posture_api_CredentialHealthStatusEnum_output,
-        "posture-api_Finding": posture_api_Finding_output,
-        "posture-api_FindingCategory": posture_api_FindingCategory_output,
-        "posture-api_FindingCategoryTypeEnum": posture_api_FindingCategoryTypeEnum_output,
-        "posture-api_FindingRemediation": posture_api_FindingRemediation_output,
-        "posture-api_FindingSeverityOverride": posture_api_FindingSeverityOverride_output,
-        "posture-api_FindingType": posture_api_FindingType_output,
-        "posture-api_FindingTypeVendorsEnum": posture_api_FindingTypeVendorsEnum_output,
-        "posture-api_IntegrationPolicy": posture_api_IntegrationPolicy_output,
-        "posture-api_IntegrationSummary": posture_api_IntegrationSummary_output,
-        "posture-api_ObservationEnum": posture_api_ObservationEnum_output,
-        "posture-api_ProductEnum": posture_api_ProductEnum_output,
-        "posture-api_SeverityEnum": posture_api_SeverityEnum_output,
-        "posture-api_Vendor": posture_api_Vendor_output,
-        "posture-api_ZeroTrustProduct": posture_api_ZeroTrustProduct_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_finding-response": posture_api_finding_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_BaseFindingType": posture$$api_BaseFindingType,
+        "posture-api_Finding": posture$$api_Finding,
+        "posture-api_FindingCategory": posture$$api_FindingCategory,
+        "posture-api_FindingRemediation": posture$$api_FindingRemediation,
+        "posture-api_FindingSeverityOverride": posture$$api_FindingSeverityOverride,
+        "posture-api_FindingType": posture$$api_FindingType,
+        "posture-api_IntegrationPolicy": posture$$api_IntegrationPolicy,
+        "posture-api_IntegrationSummary": posture$$api_IntegrationSummary,
+        "posture-api_Vendor": posture$$api_Vendor,
+        "posture-api_ZeroTrustProduct": posture$$api_ZeroTrustProduct,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_finding-response": posture$$api_finding$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/casb/integrations/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/integrations/outputs.ts
index 0af54e47b..83ada64cb 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/integrations/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/integrations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `one_IntegrationCreateResponse` in responses.
  */
-export const one_IntegrationCreateResponse_output: JsonSchema = {
+export const one_IntegrationCreateResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -37,7 +37,7 @@ export const one_IntegrationCreateResponse_output: JsonSchema = {
 /**
  * The schema of `one_IntegrationDetailResponse` in responses.
  */
-export const one_IntegrationDetailResponse_output: JsonSchema = {
+export const one_IntegrationDetailResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -68,7 +68,7 @@ export const one_IntegrationDetailResponse_output: JsonSchema = {
 /**
  * The schema of `one_IntegrationPauseResponse` in responses.
  */
-export const one_IntegrationPauseResponse_output: JsonSchema = {
+export const one_IntegrationPauseResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -99,7 +99,7 @@ export const one_IntegrationPauseResponse_output: JsonSchema = {
 /**
  * The schema of `one_IntegrationResumeResponse` in responses.
  */
-export const one_IntegrationResumeResponse_output: JsonSchema = {
+export const one_IntegrationResumeResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -130,7 +130,7 @@ export const one_IntegrationResumeResponse_output: JsonSchema = {
 /**
  * The schema of `one_IntegrationUpdateResponse` in responses.
  */
-export const one_IntegrationUpdateResponse_output: JsonSchema = {
+export const one_IntegrationUpdateResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -161,7 +161,7 @@ export const one_IntegrationUpdateResponse_output: JsonSchema = {
 /**
  * The schema of `one_IntegrationV2Detail` in responses.
  */
-export const one_IntegrationV2Detail_output: JsonSchema = {
+export const one_IntegrationV2Detail: JsonSchema = {
   "properties": {
     "application": {
       "additionalProperties": {
@@ -296,7 +296,7 @@ export const one_IntegrationV2Detail_output: JsonSchema = {
 /**
  * The schema of `one_IntegrationV2ListItem` in responses.
  */
-export const one_IntegrationV2ListItem_output: JsonSchema = {
+export const one_IntegrationV2ListItem: JsonSchema = {
   "properties": {
     "application": {
       "additionalProperties": {
@@ -378,7 +378,7 @@ export const one_IntegrationV2ListItem_output: JsonSchema = {
 /**
  * The schema of `one_PaginatedIntegrationV2ListItemList` in responses.
  */
-export const one_PaginatedIntegrationV2ListItemList_output: JsonSchema = {
+export const one_PaginatedIntegrationV2ListItemList: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
diff --git a/src/generated/forge-mcp/zeroTrust/casb/integrations/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/integrations/tools.ts
index 3ab65c8a9..56f872408 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/integrations/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/integrations/tools.ts
@@ -1,16 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  one_IntegrationCreateResponse_output,
-  one_IntegrationDetailResponse_output,
-  one_IntegrationPauseResponse_output,
-  one_IntegrationResumeResponse_output,
-  one_IntegrationUpdateResponse_output,
-  one_IntegrationV2Detail_output,
-  one_IntegrationV2ListItem_output,
-  one_PaginatedIntegrationV2ListItemList_output,
+  one_IntegrationCreateResponse,
+  one_IntegrationDetailResponse,
+  one_IntegrationPauseResponse,
+  one_IntegrationResumeResponse,
+  one_IntegrationUpdateResponse,
+  one_IntegrationV2Detail,
+  one_IntegrationV2ListItem,
+  one_PaginatedIntegrationV2ListItemList,
 } from "./outputs.js";
 import {
   one_IntegrationV2CreateRequest,
@@ -18,28 +18,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.integrations`.
+ * The tools of `zeroTrust.casb.integrations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_integrations_create",
+    name: "zeroTrust_casb_integrations_create",
     title: "Create integration",
-    description: "Creates a new integration for the specified application. Integration creation with OAuth is not supported by API at the moment. For other auth methods, use `GET /v2/applications/{application_id}/credential-guide` to see the required credential structure and example payloads for each vendor.",
+    description: "Creates a new integration for the specified application. Integration creation with OAuth is not supported by API at the moment. For other auth methods, use `GET /v2/applications/{application_id}/credential-guide` to see the required credential structure and example payloads for each vendor.\n\nPOST /accounts/{account_id}/one/integrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/one_IntegrationV2CreateRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "one_IntegrationV2CreateRequest": one_IntegrationV2CreateRequest,
       },
@@ -47,8 +57,8 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/one_IntegrationCreateResponse",
       $defs: {
-        "one_IntegrationCreateResponse": one_IntegrationCreateResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationCreateResponse": one_IntegrationCreateResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     annotations: {
@@ -71,8 +81,8 @@ export const tools: readonly Tool[] = [
         "400": null
       },
       $defs: {
-        "one_IntegrationCreateResponse": one_IntegrationCreateResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationCreateResponse": one_IntegrationCreateResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     request: (args) => ({
@@ -81,25 +91,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_integrations_delete",
+    name: "zeroTrust_casb_integrations_delete",
     title: "Delete integration",
-    description: "Delete an integration by soft-deleting it.",
+    description: "Delete an integration by soft-deleting it.\n\nDELETE /accounts/{account_id}/one/integrations/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Integration ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Integration ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -124,31 +144,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_integrations_get",
+    name: "zeroTrust_casb_integrations_get",
     title: "Get integration details",
-    description: "Returns full integration details including use cases and permissions.",
+    description: "Returns full integration details including use cases and permissions.\n\nGET /accounts/{account_id}/one/integrations/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Integration ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Integration ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/one_IntegrationDetailResponse",
       $defs: {
-        "one_IntegrationDetailResponse": one_IntegrationDetailResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationDetailResponse": one_IntegrationDetailResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     annotations: {
@@ -171,8 +201,8 @@ export const tools: readonly Tool[] = [
         "404": null
       },
       $defs: {
-        "one_IntegrationDetailResponse": one_IntegrationDetailResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationDetailResponse": one_IntegrationDetailResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     request: (args) => ({
@@ -180,78 +210,94 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_integrations_list",
+    name: "zeroTrust_casb_integrations_list",
     title: "List integrations",
-    description: "Returns a paginated list of integrations for the account.",
+    description: "Returns a paginated list of integrations for the account.\n\nGET /accounts/{account_id}/one/integrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
-        "application": {
-          "description": "Filter by application/vendor (e.g., GOOGLE_WORKSPACE, MICROSOFT_INTERNAL).",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "dlp_enabled": {
-          "description": "Filter by DLP enabled status (true/false).",
-          "type": "boolean"
-        },
-        "order": {
-          "description": "Field to order results by.",
-          "enum": [
-            "application",
-            "created",
-            "name",
-            "status"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "page": {
-          "description": "Page number within the paginated result set.",
-          "type": "integer"
-        },
-        "page_size": {
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "Search integrations by name or application.",
-          "type": "string"
-        },
-        "status": {
-          "description": "Filter by integration status.",
-          "enum": [
-            "Healthy",
-            "Initializing",
-            "Offline",
-            "Unhealthy"
-          ],
-          "type": "string"
-        },
-        "use_cases": {
-          "description": "Filter by enabled use cases (e.g., casb, ces). Matches integrations enrolled in any of the specified values. Can be specified multiple times.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "application": {
+              "description": "Filter by application/vendor (e.g., GOOGLE_WORKSPACE, MICROSOFT_INTERNAL).",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "dlp_enabled": {
+              "description": "Filter by DLP enabled status (true/false).",
+              "type": "boolean"
+            },
+            "order": {
+              "description": "Field to order results by.",
+              "enum": [
+                "application",
+                "created",
+                "name",
+                "status"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "Page number within the paginated result set.",
+              "type": "integer"
+            },
+            "page_size": {
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search integrations by name or application.",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter by integration status.",
+              "enum": [
+                "Healthy",
+                "Initializing",
+                "Offline",
+                "Unhealthy"
+              ],
+              "type": "string"
+            },
+            "use_cases": {
+              "description": "Filter by enabled use cases (e.g., casb, ces). Matches integrations enrolled in any of the specified values. Can be specified multiple times.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/one_PaginatedIntegrationV2ListItemList",
       $defs: {
-        "one_IntegrationV2ListItem": one_IntegrationV2ListItem_output,
-        "one_PaginatedIntegrationV2ListItemList": one_PaginatedIntegrationV2ListItemList_output,
+        "one_IntegrationV2ListItem": one_IntegrationV2ListItem,
+        "one_PaginatedIntegrationV2ListItemList": one_PaginatedIntegrationV2ListItemList,
       },
     },
     annotations: {
@@ -274,51 +320,61 @@ export const tools: readonly Tool[] = [
         "400": null
       },
       $defs: {
-        "one_IntegrationV2ListItem": one_IntegrationV2ListItem_output,
-        "one_PaginatedIntegrationV2ListItemList": one_PaginatedIntegrationV2ListItemList_output,
+        "one_IntegrationV2ListItem": one_IntegrationV2ListItem,
+        "one_PaginatedIntegrationV2ListItemList": one_PaginatedIntegrationV2ListItemList,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/one/integrations`,
       query: [
-        ["application", args["application"], true],
-        ["direction", args["direction"], true],
-        ["dlp_enabled", args["dlp_enabled"], true],
-        ["order", args["order"], true],
-        ["page", args["page"], true],
-        ["page_size", args["page_size"], true],
-        ["search", args["search"], true],
-        ["status", args["status"], true],
-        ["use_cases", args["use_cases"], true],
+        ["application", param(args, "query", "application"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["dlp_enabled", param(args, "query", "dlp_enabled"), true],
+        ["order", param(args, "query", "order"), true],
+        ["page", param(args, "query", "page"), true],
+        ["page_size", param(args, "query", "page_size"), true],
+        ["search", param(args, "query", "search"), true],
+        ["status", param(args, "query", "status"), true],
+        ["use_cases", param(args, "query", "use_cases"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_casb_integrations_pause",
+    name: "zeroTrust_casb_integrations_pause",
     title: "Pause integration",
-    description: "Pauses an integration, stopping all crawlers.",
+    description: "Pauses an integration, stopping all crawlers.\n\nPOST /accounts/{account_id}/one/integrations/{id}/pause",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Integration ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Integration ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/one_IntegrationPauseResponse",
       $defs: {
-        "one_IntegrationPauseResponse": one_IntegrationPauseResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationPauseResponse": one_IntegrationPauseResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     annotations: {
@@ -341,8 +397,8 @@ export const tools: readonly Tool[] = [
         "400": null
       },
       $defs: {
-        "one_IntegrationPauseResponse": one_IntegrationPauseResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationPauseResponse": one_IntegrationPauseResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     request: (args) => ({
@@ -350,31 +406,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_integrations_resume",
+    name: "zeroTrust_casb_integrations_resume",
     title: "Resume integration",
-    description: "Resumes a paused integration, restarting crawlers.",
+    description: "Resumes a paused integration, restarting crawlers.\n\nPOST /accounts/{account_id}/one/integrations/{id}/resume",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Integration ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Integration ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/one_IntegrationResumeResponse",
       $defs: {
-        "one_IntegrationResumeResponse": one_IntegrationResumeResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationResumeResponse": one_IntegrationResumeResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     annotations: {
@@ -397,8 +463,8 @@ export const tools: readonly Tool[] = [
         "400": null
       },
       $defs: {
-        "one_IntegrationResumeResponse": one_IntegrationResumeResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationResumeResponse": one_IntegrationResumeResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     request: (args) => ({
@@ -406,28 +472,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_integrations_update",
+    name: "zeroTrust_casb_integrations_update",
     title: "Update integration",
-    description: "Updates an integration's name, permissions, DLP profiles, use cases, or credentials.",
+    description: "Updates an integration's name, permissions, DLP profiles, use cases, or credentials.\n\nPATCH /accounts/{account_id}/one/integrations/{id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account identifier.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/one_PatchedUpdateIntegrationV2Request"
         },
-        "id": {
-          "description": "Integration ID.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account identifier.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Integration ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
         "one_PatchedUpdateIntegrationV2Request": one_PatchedUpdateIntegrationV2Request,
       },
@@ -435,8 +511,8 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/one_IntegrationUpdateResponse",
       $defs: {
-        "one_IntegrationUpdateResponse": one_IntegrationUpdateResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationUpdateResponse": one_IntegrationUpdateResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     annotations: {
@@ -459,8 +535,8 @@ export const tools: readonly Tool[] = [
         "400": null
       },
       $defs: {
-        "one_IntegrationUpdateResponse": one_IntegrationUpdateResponse_output,
-        "one_IntegrationV2Detail": one_IntegrationV2Detail_output,
+        "one_IntegrationUpdateResponse": one_IntegrationUpdateResponse,
+        "one_IntegrationV2Detail": one_IntegrationV2Detail,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/casb/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/outputs.ts
index 45f40bab9..65342ce6b 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `posture-api_BaseFindingType` in responses.
  */
-export const posture_api_BaseFindingType_output: JsonSchema = {
+export const posture$$api_BaseFindingType: JsonSchema = {
   "properties": {
     "applies_to_all_integrations": {
       "type": "boolean"
@@ -17,7 +17,25 @@ export const posture_api_BaseFindingType_output: JsonSchema = {
     "asset_vendor": {
       "allOf": [
         {
-          "$ref": "#/$defs/posture-api_FindingTypeVendorsEnum"
+          "enum": [
+            "ANTHROPIC",
+            "AWS",
+            "BITBUCKET",
+            "BOX",
+            "CONFLUENCE",
+            "DROPBOX",
+            "GITHUB",
+            "GOOGLE_CLOUD_PLATFORM",
+            "GOOGLE_WORKSPACE",
+            "JIRA",
+            "MICROSOFT",
+            "OPENAI",
+            "SALESFORCE",
+            "SERVICENOW",
+            "SLACK",
+            "ZOOM"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -74,7 +92,13 @@ export const posture_api_BaseFindingType_output: JsonSchema = {
     "severity": {
       "allOf": [
         {
-          "$ref": "#/$defs/posture-api_SeverityEnum"
+          "enum": [
+            "Critical",
+            "High",
+            "Medium",
+            "Low"
+          ],
+          "type": "string"
         },
         {
           "type": "string"
@@ -102,22 +126,10 @@ export const posture_api_BaseFindingType_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `posture-api_CredentialHealthStatusEnum` in responses.
- */
-export const posture_api_CredentialHealthStatusEnum_output: JsonSchema = {
-  "enum": [
-    "Initializing",
-    "Healthy",
-    "Unhealthy"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_DlpContext` in responses.
  */
-export const posture_api_DlpContext_output: JsonSchema = {
+export const posture$$api_DlpContext: JsonSchema = {
   "properties": {
     "created": {
       "format": "date-time",
@@ -196,7 +208,7 @@ export const posture_api_DlpContext_output: JsonSchema = {
 /**
  * The schema of `posture-api_ExportJob` in responses.
  */
-export const posture_api_ExportJob_output: JsonSchema = {
+export const posture$$api_ExportJob: JsonSchema = {
   "properties": {
     "download_url": {
       "oneOf": [
@@ -243,10 +255,23 @@ export const posture_api_ExportJob_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/posture-api_StatusEnum"
+      "enum": [
+        "Pending",
+        "Success",
+        "Failure",
+        "Rescheduled",
+        "In-Progress"
+      ],
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/posture-api_ExportJobTypeEnum"
+      "enum": [
+        "finding",
+        "findingInstance",
+        "content",
+        "remediationJob"
+      ],
+      "type": "string"
     },
     "user_id": {
       "type": "string"
@@ -261,32 +286,32 @@ export const posture_api_ExportJob_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `posture-api_ExportJobTypeEnum` in responses.
- */
-export const posture_api_ExportJobTypeEnum_output: JsonSchema = {
-  "enum": [
-    "finding",
-    "findingInstance",
-    "content",
-    "remediationJob"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_FindingCategory` in responses.
  */
-export const posture_api_FindingCategory_output: JsonSchema = {
+export const posture$$api_FindingCategory: JsonSchema = {
   "properties": {
     "observation": {
-      "$ref": "#/$defs/posture-api_ObservationEnum"
+      "enum": [
+        "Issue",
+        "Insight",
+        "Activity"
+      ],
+      "type": "string"
     },
     "product": {
-      "$ref": "#/$defs/posture-api_ProductEnum"
+      "enum": [
+        "SaaS",
+        "Cloud"
+      ],
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/posture-api_FindingCategoryTypeEnum"
+      "enum": [
+        "Content",
+        "Posture"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -297,46 +322,10 @@ export const posture_api_FindingCategory_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `posture-api_FindingCategoryTypeEnum` in responses.
- */
-export const posture_api_FindingCategoryTypeEnum_output: JsonSchema = {
-  "enum": [
-    "Content",
-    "Posture"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_FindingTypeVendorsEnum` in responses.
- */
-export const posture_api_FindingTypeVendorsEnum_output: JsonSchema = {
-  "enum": [
-    "ANTHROPIC",
-    "AWS",
-    "BITBUCKET",
-    "BOX",
-    "CONFLUENCE",
-    "DROPBOX",
-    "GITHUB",
-    "GOOGLE_CLOUD_PLATFORM",
-    "GOOGLE_WORKSPACE",
-    "JIRA",
-    "MICROSOFT",
-    "OPENAI",
-    "SALESFORCE",
-    "SERVICENOW",
-    "SLACK",
-    "ZOOM"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_IntegrationPolicy` in responses.
  */
-export const posture_api_IntegrationPolicy_output: JsonSchema = {
+export const posture$$api_IntegrationPolicy: JsonSchema = {
   "properties": {
     "client_id": {
       "oneOf": [
@@ -384,14 +373,19 @@ export const posture_api_IntegrationPolicy_output: JsonSchema = {
 /**
  * The schema of `posture-api_IntegrationSummary` in responses.
  */
-export const posture_api_IntegrationSummary_output: JsonSchema = {
+export const posture$$api_IntegrationSummary: JsonSchema = {
   "properties": {
     "created": {
       "format": "date-time",
       "type": "string"
     },
     "credential_health_status": {
-      "$ref": "#/$defs/posture-api_CredentialHealthStatusEnum"
+      "enum": [
+        "Initializing",
+        "Healthy",
+        "Unhealthy"
+      ],
+      "type": "string"
     },
     "credentials_expiry": {
       "oneOf": [
@@ -465,74 +459,10 @@ export const posture_api_IntegrationSummary_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `posture-api_ObservationEnum` in responses.
- */
-export const posture_api_ObservationEnum_output: JsonSchema = {
-  "enum": [
-    "Issue",
-    "Insight",
-    "Activity"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_ProductEnum` in responses.
- */
-export const posture_api_ProductEnum_output: JsonSchema = {
-  "enum": [
-    "SaaS",
-    "Cloud"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_RemediationJobStatusEnum` in responses.
- */
-export const posture_api_RemediationJobStatusEnum_output: JsonSchema = {
-  "enum": [
-    "pending",
-    "processing",
-    "completed",
-    "failed",
-    "validating"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_SeverityEnum` in responses.
- */
-export const posture_api_SeverityEnum_output: JsonSchema = {
-  "enum": [
-    "Critical",
-    "High",
-    "Medium",
-    "Low"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_StatusEnum` in responses.
- */
-export const posture_api_StatusEnum_output: JsonSchema = {
-  "enum": [
-    "Pending",
-    "Success",
-    "Failure",
-    "Rescheduled",
-    "In-Progress"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_Vendor` in responses.
  */
-export const posture_api_Vendor_output: JsonSchema = {
+export const posture$$api_Vendor: JsonSchema = {
   "properties": {
     "description": {
       "oneOf": [
@@ -587,7 +517,7 @@ export const posture_api_Vendor_output: JsonSchema = {
 /**
  * The schema of `posture-api_ZeroTrustProduct` in responses.
  */
-export const posture_api_ZeroTrustProduct_output: JsonSchema = {
+export const posture$$api_ZeroTrustProduct: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -608,7 +538,7 @@ export const posture_api_ZeroTrustProduct_output: JsonSchema = {
 /**
  * The schema of `posture-api_api-response-collection` in responses.
  */
-export const posture_api_api_response_collection_output: JsonSchema = {
+export const posture$$api_api$$response$$collection: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/posture-api_messages"
@@ -635,7 +565,7 @@ export const posture_api_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `posture-api_api-response-common` in responses.
  */
-export const posture_api_api_response_common_output: JsonSchema = {
+export const posture$$api_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/posture-api_messages"
@@ -658,7 +588,7 @@ export const posture_api_api_response_common_output: JsonSchema = {
 /**
  * The schema of `posture-api_error-response` in responses.
  */
-export const posture_api_error_response_output: JsonSchema = {
+export const posture$$api_error$$response: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/posture-api_messages"
@@ -684,7 +614,7 @@ export const posture_api_error_response_output: JsonSchema = {
 /**
  * The schema of `posture-api_export-job-response` in responses.
  */
-export const posture_api_export_job_response_output: JsonSchema = {
+export const posture$$api_export$$job$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -703,7 +633,7 @@ export const posture_api_export_job_response_output: JsonSchema = {
 /**
  * The schema of `posture-api_messages` in responses.
  */
-export const posture_api_messages_output: JsonSchema = {
+export const posture$$api_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -736,7 +666,7 @@ export const posture_api_messages_output: JsonSchema = {
 /**
  * The schema of `posture-api_result-info` in responses.
  */
-export const posture_api_result_info_output: JsonSchema = {
+export const posture$$api_result$$info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/policies/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/policies/outputs.ts
index 32b3e0c93..562861f7b 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/policies/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/policies/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_DeletePolicyResponse` in responses.
  */
-export const posture_api_DeletePolicyResponse_output: JsonSchema = {
+export const posture$$api_DeletePolicyResponse: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -22,7 +22,7 @@ export const posture_api_DeletePolicyResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_PolicyActionsResponse` in responses.
  */
-export const posture_api_PolicyActionsResponse_output: JsonSchema = {
+export const posture$$api_PolicyActionsResponse: JsonSchema = {
   "properties": {
     "remediation_types": {
       "items": {
@@ -47,7 +47,7 @@ export const posture_api_PolicyActionsResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_PolicyRemediationTypeResponse` in responses.
  */
-export const posture_api_PolicyRemediationTypeResponse_output: JsonSchema = {
+export const posture$$api_PolicyRemediationTypeResponse: JsonSchema = {
   "properties": {
     "display_name": {
       "type": "string"
@@ -71,7 +71,7 @@ export const posture_api_PolicyRemediationTypeResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_PolicyResponse` in responses.
  */
-export const posture_api_PolicyResponse_output: JsonSchema = {
+export const posture$$api_PolicyResponse: JsonSchema = {
   "properties": {
     "actions": {
       "$ref": "#/$defs/posture-api_PolicyActionsResponse"
@@ -138,7 +138,7 @@ export const posture_api_PolicyResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_PolicyWebhookConfigResponse` in responses.
  */
-export const posture_api_PolicyWebhookConfigResponse_output: JsonSchema = {
+export const posture$$api_PolicyWebhookConfigResponse: JsonSchema = {
   "properties": {
     "display_name": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/policies/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/policies/schemas.ts
index bdcb6a968..f54a32496 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/policies/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/policies/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_CreatePolicyRequest`.
  */
-export const posture_api_CreatePolicyRequest: JsonSchema = {
+export const posture$$api_CreatePolicyRequest: JsonSchema = {
   "description": "Request body for creating a new policy configuration.",
   "properties": {
     "actions": {
@@ -56,7 +56,7 @@ export const posture_api_CreatePolicyRequest: JsonSchema = {
 /**
  * The schema of `posture-api_PolicyActionsInput`.
  */
-export const posture_api_PolicyActionsInput: JsonSchema = {
+export const posture$$api_PolicyActionsInput: JsonSchema = {
   "description": "Actions to execute when this policy is triggered, grouped by action type.\nA policy must contain at least one action across all groups and may include\nat most one remediation.",
   "properties": {
     "remediation_types": {
@@ -81,7 +81,7 @@ export const posture_api_PolicyActionsInput: JsonSchema = {
 /**
  * The schema of `posture-api_PolicyRemediationActionInput`.
  */
-export const posture_api_PolicyRemediationActionInput: JsonSchema = {
+export const posture$$api_PolicyRemediationActionInput: JsonSchema = {
   "description": "A remediation action to be executed.",
   "properties": {
     "remediation_type_id": {
@@ -99,7 +99,7 @@ export const posture_api_PolicyRemediationActionInput: JsonSchema = {
 /**
  * The schema of `posture-api_PolicyWebhookActionInput`.
  */
-export const posture_api_PolicyWebhookActionInput: JsonSchema = {
+export const posture$$api_PolicyWebhookActionInput: JsonSchema = {
   "description": "A webhook action to be executed.",
   "properties": {
     "webhook_config_id": {
@@ -117,7 +117,7 @@ export const posture_api_PolicyWebhookActionInput: JsonSchema = {
 /**
  * The schema of `posture-api_UpdatePolicyRequest`.
  */
-export const posture_api_UpdatePolicyRequest: JsonSchema = {
+export const posture$$api_UpdatePolicyRequest: JsonSchema = {
   "description": "Request body for updating an existing policy configuration.",
   "properties": {
     "actions": {
diff --git a/src/generated/forge-mcp/zeroTrust/casb/policies/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/policies/tools.ts
index 9a51ad1be..5e00d1e74 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/policies/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/policies/tools.ts
@@ -1,57 +1,67 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  posture_api_api_response_collection_output,
-  posture_api_api_response_common_output,
-  posture_api_error_response_output,
-  posture_api_messages_output,
-  posture_api_result_info_output,
+  posture$$api_api$$response$$collection,
+  posture$$api_api$$response$$common,
+  posture$$api_error$$response,
+  posture$$api_messages,
+  posture$$api_result$$info,
 } from "../outputs.js";
 import {
-  posture_api_DeletePolicyResponse_output,
-  posture_api_PolicyActionsResponse_output,
-  posture_api_PolicyRemediationTypeResponse_output,
-  posture_api_PolicyResponse_output,
-  posture_api_PolicyWebhookConfigResponse_output,
+  posture$$api_DeletePolicyResponse,
+  posture$$api_PolicyActionsResponse,
+  posture$$api_PolicyRemediationTypeResponse,
+  posture$$api_PolicyResponse,
+  posture$$api_PolicyWebhookConfigResponse,
 } from "./outputs.js";
 import {
-  posture_api_CreatePolicyRequest,
-  posture_api_PolicyActionsInput,
-  posture_api_PolicyRemediationActionInput,
-  posture_api_PolicyWebhookActionInput,
-  posture_api_UpdatePolicyRequest,
+  posture$$api_CreatePolicyRequest,
+  posture$$api_PolicyActionsInput,
+  posture$$api_PolicyRemediationActionInput,
+  posture$$api_PolicyWebhookActionInput,
+  posture$$api_UpdatePolicyRequest,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.policies`.
+ * The tools of `zeroTrust.casb.policies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_policies_create",
+    name: "zeroTrust_casb_policies_create",
     title: "Create a new policy configuration",
-    description: "Creates a new policy configuration that defines automated actions to be executed \nwhen security findings are detected. A policy can include multiple remediation \nand/or webhook actions that will be triggered automatically.",
+    description: "Creates a new policy configuration that defines automated actions to be executed \nwhen security findings are detected. A policy can include multiple remediation \nand/or webhook actions that will be triggered automatically.\n\nPOST /accounts/{account_id}/data-security/posture/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_CreatePolicyRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_CreatePolicyRequest": posture_api_CreatePolicyRequest,
-        "posture-api_PolicyActionsInput": posture_api_PolicyActionsInput,
-        "posture-api_PolicyRemediationActionInput": posture_api_PolicyRemediationActionInput,
-        "posture-api_PolicyWebhookActionInput": posture_api_PolicyWebhookActionInput,
+        "posture-api_CreatePolicyRequest": posture$$api_CreatePolicyRequest,
+        "posture-api_PolicyActionsInput": posture$$api_PolicyActionsInput,
+        "posture-api_PolicyRemediationActionInput": posture$$api_PolicyRemediationActionInput,
+        "posture-api_PolicyWebhookActionInput": posture$$api_PolicyWebhookActionInput,
       },
     },
     outputSchema: {
@@ -69,12 +79,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_PolicyActionsResponse": posture_api_PolicyActionsResponse_output,
-        "posture-api_PolicyRemediationTypeResponse": posture_api_PolicyRemediationTypeResponse_output,
-        "posture-api_PolicyResponse": posture_api_PolicyResponse_output,
-        "posture-api_PolicyWebhookConfigResponse": posture_api_PolicyWebhookConfigResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_PolicyActionsResponse": posture$$api_PolicyActionsResponse,
+        "posture-api_PolicyRemediationTypeResponse": posture$$api_PolicyRemediationTypeResponse,
+        "posture-api_PolicyResponse": posture$$api_PolicyResponse,
+        "posture-api_PolicyWebhookConfigResponse": posture$$api_PolicyWebhookConfigResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -125,13 +135,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_PolicyActionsResponse": posture_api_PolicyActionsResponse_output,
-        "posture-api_PolicyRemediationTypeResponse": posture_api_PolicyRemediationTypeResponse_output,
-        "posture-api_PolicyResponse": posture_api_PolicyResponse_output,
-        "posture-api_PolicyWebhookConfigResponse": posture_api_PolicyWebhookConfigResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_PolicyActionsResponse": posture$$api_PolicyActionsResponse,
+        "posture-api_PolicyRemediationTypeResponse": posture$$api_PolicyRemediationTypeResponse,
+        "posture-api_PolicyResponse": posture$$api_PolicyResponse,
+        "posture-api_PolicyWebhookConfigResponse": posture$$api_PolicyWebhookConfigResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -140,26 +150,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_policies_delete",
+    name: "zeroTrust_casb_policies_delete",
     title: "Delete a policy configuration",
-    description: "Deletes a policy configuration.",
+    description: "Deletes a policy configuration.\n\nDELETE /accounts/{account_id}/data-security/posture/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "policy_id": {
-          "description": "A UUID identifying the policy.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "A UUID identifying the policy.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -176,9 +196,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_DeletePolicyResponse": posture_api_DeletePolicyResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_DeletePolicyResponse": posture$$api_DeletePolicyResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -229,10 +249,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_DeletePolicyResponse": posture_api_DeletePolicyResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_DeletePolicyResponse": posture$$api_DeletePolicyResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -240,26 +260,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_policies_get",
+    name: "zeroTrust_casb_policies_get",
     title: "Get a policy configuration by ID",
-    description: "Retrieves the details of a specific policy configuration, including its\nassociated remediation and webhook actions.",
+    description: "Retrieves the details of a specific policy configuration, including its\nassociated remediation and webhook actions.\n\nGET /accounts/{account_id}/data-security/posture/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "policy_id": {
-          "description": "The UUID of the policy configuration to retrieve.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "The UUID of the policy configuration to retrieve.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -276,12 +306,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_PolicyActionsResponse": posture_api_PolicyActionsResponse_output,
-        "posture-api_PolicyRemediationTypeResponse": posture_api_PolicyRemediationTypeResponse_output,
-        "posture-api_PolicyResponse": posture_api_PolicyResponse_output,
-        "posture-api_PolicyWebhookConfigResponse": posture_api_PolicyWebhookConfigResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_PolicyActionsResponse": posture$$api_PolicyActionsResponse,
+        "posture-api_PolicyRemediationTypeResponse": posture$$api_PolicyRemediationTypeResponse,
+        "posture-api_PolicyResponse": posture$$api_PolicyResponse,
+        "posture-api_PolicyWebhookConfigResponse": posture$$api_PolicyWebhookConfigResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -333,13 +363,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_PolicyActionsResponse": posture_api_PolicyActionsResponse_output,
-        "posture-api_PolicyRemediationTypeResponse": posture_api_PolicyRemediationTypeResponse_output,
-        "posture-api_PolicyResponse": posture_api_PolicyResponse_output,
-        "posture-api_PolicyWebhookConfigResponse": posture_api_PolicyWebhookConfigResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_PolicyActionsResponse": posture$$api_PolicyActionsResponse,
+        "posture-api_PolicyRemediationTypeResponse": posture$$api_PolicyRemediationTypeResponse,
+        "posture-api_PolicyResponse": posture$$api_PolicyResponse,
+        "posture-api_PolicyWebhookConfigResponse": posture$$api_PolicyWebhookConfigResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -347,24 +377,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_policies_list",
+    name: "zeroTrust_casb_policies_list",
     title: "List policy configurations",
-    description: "Returns a list of integration-scoped policy configurations for the given account. This endpoint supports cursor based pagination. By default, results are returned in sorted order based on created_at.",
+    description: "Returns a list of integration-scoped policy configurations for the given account. This endpoint supports cursor based pagination. By default, results are returned in sorted order based on created_at.\n\nGET /accounts/{account_id}/data-security/posture/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "cursor": {
-          "description": "Cursor for pagination. Obtained from the `result_info.cursor` field of a previous response.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Cursor for pagination. Obtained from the `result_info.cursor` field of a previous response.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -384,13 +430,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_PolicyActionsResponse": posture_api_PolicyActionsResponse_output,
-        "posture-api_PolicyRemediationTypeResponse": posture_api_PolicyRemediationTypeResponse_output,
-        "posture-api_PolicyResponse": posture_api_PolicyResponse_output,
-        "posture-api_PolicyWebhookConfigResponse": posture_api_PolicyWebhookConfigResponse_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_PolicyActionsResponse": posture$$api_PolicyActionsResponse,
+        "posture-api_PolicyRemediationTypeResponse": posture$$api_PolicyRemediationTypeResponse,
+        "posture-api_PolicyResponse": posture$$api_PolicyResponse,
+        "posture-api_PolicyWebhookConfigResponse": posture$$api_PolicyWebhookConfigResponse,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     annotations: {
@@ -442,54 +488,64 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_PolicyActionsResponse": posture_api_PolicyActionsResponse_output,
-        "posture-api_PolicyRemediationTypeResponse": posture_api_PolicyRemediationTypeResponse_output,
-        "posture-api_PolicyResponse": posture_api_PolicyResponse_output,
-        "posture-api_PolicyWebhookConfigResponse": posture_api_PolicyWebhookConfigResponse_output,
-        "posture-api_api-response-collection": posture_api_api_response_collection_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_result-info": posture_api_result_info_output,
+        "posture-api_PolicyActionsResponse": posture$$api_PolicyActionsResponse,
+        "posture-api_PolicyRemediationTypeResponse": posture$$api_PolicyRemediationTypeResponse,
+        "posture-api_PolicyResponse": posture$$api_PolicyResponse,
+        "posture-api_PolicyWebhookConfigResponse": posture$$api_PolicyWebhookConfigResponse,
+        "posture-api_api-response-collection": posture$$api_api$$response$$collection,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_result-info": posture$$api_result$$info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/policies`,
       query: [
-        ["cursor", args["cursor"], true],
+        ["cursor", param(args, "query", "cursor"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_casb_policies_update",
+    name: "zeroTrust_casb_policies_update",
     title: "Update a policy configuration",
-    description: "Updates an existing policy configuration and replaces its actions.",
+    description: "Updates an existing policy configuration and replaces its actions.\n\nPUT /accounts/{account_id}/data-security/posture/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_UpdatePolicyRequest"
         },
-        "policy_id": {
-          "description": "Policy configuration ID",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "Policy configuration ID",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_PolicyActionsInput": posture_api_PolicyActionsInput,
-        "posture-api_PolicyRemediationActionInput": posture_api_PolicyRemediationActionInput,
-        "posture-api_PolicyWebhookActionInput": posture_api_PolicyWebhookActionInput,
-        "posture-api_UpdatePolicyRequest": posture_api_UpdatePolicyRequest,
+        "posture-api_PolicyActionsInput": posture$$api_PolicyActionsInput,
+        "posture-api_PolicyRemediationActionInput": posture$$api_PolicyRemediationActionInput,
+        "posture-api_PolicyWebhookActionInput": posture$$api_PolicyWebhookActionInput,
+        "posture-api_UpdatePolicyRequest": posture$$api_UpdatePolicyRequest,
       },
     },
     outputSchema: {
@@ -507,12 +563,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_PolicyActionsResponse": posture_api_PolicyActionsResponse_output,
-        "posture-api_PolicyRemediationTypeResponse": posture_api_PolicyRemediationTypeResponse_output,
-        "posture-api_PolicyResponse": posture_api_PolicyResponse_output,
-        "posture-api_PolicyWebhookConfigResponse": posture_api_PolicyWebhookConfigResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_PolicyActionsResponse": posture$$api_PolicyActionsResponse,
+        "posture-api_PolicyRemediationTypeResponse": posture$$api_PolicyRemediationTypeResponse,
+        "posture-api_PolicyResponse": posture$$api_PolicyResponse,
+        "posture-api_PolicyWebhookConfigResponse": posture$$api_PolicyWebhookConfigResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -563,13 +619,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_PolicyActionsResponse": posture_api_PolicyActionsResponse_output,
-        "posture-api_PolicyRemediationTypeResponse": posture_api_PolicyRemediationTypeResponse_output,
-        "posture-api_PolicyResponse": posture_api_PolicyResponse_output,
-        "posture-api_PolicyWebhookConfigResponse": posture_api_PolicyWebhookConfigResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_PolicyActionsResponse": posture$$api_PolicyActionsResponse,
+        "posture-api_PolicyRemediationTypeResponse": posture$$api_PolicyRemediationTypeResponse,
+        "posture-api_PolicyResponse": posture$$api_PolicyResponse,
+        "posture-api_PolicyWebhookConfigResponse": posture$$api_PolicyWebhookConfigResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/outputs.ts
index 09e5479d0..6658b158f 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `posture-api_CreateRemediationJobResponse` in responses.
  */
-export const posture_api_CreateRemediationJobResponse_output: JsonSchema = {
+export const posture$$api_CreateRemediationJobResponse: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -57,7 +57,7 @@ export const posture_api_CreateRemediationJobResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_PaginatedRemediationJobList` in responses.
  */
-export const posture_api_PaginatedRemediationJobList_output: JsonSchema = {
+export const posture$$api_PaginatedRemediationJobList: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -121,7 +121,7 @@ export const posture_api_PaginatedRemediationJobList_output: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationJob` in responses.
  */
-export const posture_api_RemediationJob_output: JsonSchema = {
+export const posture$$api_RemediationJob: JsonSchema = {
   "properties": {
     "asset": {
       "$ref": "#/$defs/posture-api_RemediationJobAsset"
@@ -159,7 +159,14 @@ export const posture_api_RemediationJob_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/posture-api_RemediationJobStatusEnum"
+      "enum": [
+        "pending",
+        "processing",
+        "completed",
+        "failed",
+        "validating"
+      ],
+      "type": "string"
     },
     "triggered_by_actor": {
       "oneOf": [
@@ -209,7 +216,7 @@ export const posture_api_RemediationJob_output: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationJobAsset` in responses.
  */
-export const posture_api_RemediationJobAsset_output: JsonSchema = {
+export const posture$$api_RemediationJobAsset: JsonSchema = {
   "properties": {
     "category": {
       "$ref": "#/$defs/posture-api_RemediationJobAssetCategory"
@@ -254,7 +261,7 @@ export const posture_api_RemediationJobAsset_output: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationJobAssetCategory` in responses.
  */
-export const posture_api_RemediationJobAssetCategory_output: JsonSchema = {
+export const posture$$api_RemediationJobAssetCategory: JsonSchema = {
   "properties": {
     "service": {
       "type": "string"
@@ -263,7 +270,26 @@ export const posture_api_RemediationJobAssetCategory_output: JsonSchema = {
       "type": "string"
     },
     "vendor": {
-      "$ref": "#/$defs/posture-api_VendorsDisplayNameEnum"
+      "enum": [
+        "AWS",
+        "Anthropic",
+        "Bitbucket",
+        "Box",
+        "Confluence",
+        "Dropbox",
+        "GitHub",
+        "Google Cloud Platform",
+        "Google Workspace",
+        "Jira",
+        "Microsoft",
+        "Microsoft Internal",
+        "OpenAI",
+        "Slack",
+        "Salesforce",
+        "ServiceNow",
+        "Zoom"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -277,7 +303,7 @@ export const posture_api_RemediationJobAssetCategory_output: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationJobAssetField` in responses.
  */
-export const posture_api_RemediationJobAssetField_output: JsonSchema = {
+export const posture$$api_RemediationJobAssetField: JsonSchema = {
   "properties": {
     "link": {
       "oneOf": [
@@ -316,7 +342,7 @@ export const posture_api_RemediationJobAssetField_output: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationJobFailure` in responses.
  */
-export const posture_api_RemediationJobFailure_output: JsonSchema = {
+export const posture$$api_RemediationJobFailure: JsonSchema = {
   "properties": {
     "error": {
       "type": "string"
@@ -332,29 +358,3 @@ export const posture_api_RemediationJobFailure_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `posture-api_VendorsDisplayNameEnum` in responses.
- */
-export const posture_api_VendorsDisplayNameEnum_output: JsonSchema = {
-  "enum": [
-    "AWS",
-    "Anthropic",
-    "Bitbucket",
-    "Box",
-    "Confluence",
-    "Dropbox",
-    "GitHub",
-    "Google Cloud Platform",
-    "Google Workspace",
-    "Jira",
-    "Microsoft",
-    "Microsoft Internal",
-    "OpenAI",
-    "Slack",
-    "Salesforce",
-    "ServiceNow",
-    "Zoom"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/schemas.ts
index f6b896ed8..40432a9d5 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/schemas.ts
@@ -3,22 +3,10 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `posture-api_RemediationJobActorTypeEnum`.
- */
-export const posture_api_RemediationJobActorTypeEnum: JsonSchema = {
-  "description": "Type of actor that triggered the remediation job.",
-  "enum": [
-    "user",
-    "account_token"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_RemediationJobsCreateRequest`.
  */
-export const posture_api_RemediationJobsCreateRequest: JsonSchema = {
+export const posture$$api_RemediationJobsCreateRequest: JsonSchema = {
   "description": "Request body for creating remediation jobs.",
   "properties": {
     "finding_instance_ids": {
@@ -45,7 +33,7 @@ export const posture_api_RemediationJobsCreateRequest: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationJobsExportFilterRequest`.
  */
-export const posture_api_RemediationJobsExportFilterRequest: JsonSchema = {
+export const posture$$api_RemediationJobsExportFilterRequest: JsonSchema = {
   "description": "Filter specification for remediation jobs export.",
   "properties": {
     "integration_id": {
@@ -81,7 +69,15 @@ export const posture_api_RemediationJobsExportFilterRequest: JsonSchema = {
     "status": {
       "description": "Filter by remediation job status.",
       "items": {
-        "$ref": "#/$defs/posture-api_RemediationJobStatusEnum"
+        "description": "Status of a remediation job.",
+        "enum": [
+          "pending",
+          "processing",
+          "completed",
+          "failed",
+          "validating"
+        ],
+        "type": "string"
       },
       "type": "array"
     }
@@ -92,12 +88,16 @@ export const posture_api_RemediationJobsExportFilterRequest: JsonSchema = {
 /**
  * The schema of `posture-api_RemediationJobsExportOrderFilterRequest`.
  */
-export const posture_api_RemediationJobsExportOrderFilterRequest: JsonSchema = {
+export const posture$$api_RemediationJobsExportOrderFilterRequest: JsonSchema = {
   "description": "Order specification for remediation jobs exports.",
   "properties": {
     "direction": {
-      "$ref": "#/$defs/posture-api_DirectionEnum",
-      "description": "Sort direction."
+      "description": "Sort direction.",
+      "enum": [
+        "asc",
+        "desc"
+      ],
+      "type": "string"
     },
     "name": {
       "description": "Which field to use when ordering the remediation jobs.",
diff --git a/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/tools.ts
index bca3e69d5..b9729f064 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/remediations/jobs/tools.ts
@@ -1,75 +1,74 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  posture_api_ExportJobTypeEnum_output,
-  posture_api_ExportJob_output,
-  posture_api_RemediationJobStatusEnum_output,
-  posture_api_StatusEnum_output,
-  posture_api_api_response_common_output,
-  posture_api_error_response_output,
-  posture_api_export_job_response_output,
-  posture_api_messages_output,
+  posture$$api_ExportJob,
+  posture$$api_api$$response$$common,
+  posture$$api_error$$response,
+  posture$$api_export$$job$$response,
+  posture$$api_messages,
 } from "../../outputs.js";
 import {
-  posture_api_DirectionEnum,
-  posture_api_RemediationJobStatusEnum,
-} from "../../schemas.js";
-import {
-  posture_api_CreateRemediationJobResponse_output,
-  posture_api_PaginatedRemediationJobList_output,
-  posture_api_RemediationJobAssetCategory_output,
-  posture_api_RemediationJobAssetField_output,
-  posture_api_RemediationJobAsset_output,
-  posture_api_RemediationJobFailure_output,
-  posture_api_RemediationJob_output,
-  posture_api_VendorsDisplayNameEnum_output,
+  posture$$api_CreateRemediationJobResponse,
+  posture$$api_PaginatedRemediationJobList,
+  posture$$api_RemediationJob,
+  posture$$api_RemediationJobAsset,
+  posture$$api_RemediationJobAssetCategory,
+  posture$$api_RemediationJobAssetField,
+  posture$$api_RemediationJobFailure,
 } from "./outputs.js";
 import {
-  posture_api_RemediationJobActorTypeEnum,
-  posture_api_RemediationJobsCreateRequest,
-  posture_api_RemediationJobsExportFilterRequest,
-  posture_api_RemediationJobsExportOrderFilterRequest,
+  posture$$api_RemediationJobsCreateRequest,
+  posture$$api_RemediationJobsExportFilterRequest,
+  posture$$api_RemediationJobsExportOrderFilterRequest,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.remediations.jobs`.
+ * The tools of `zeroTrust.casb.remediations.jobs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_remediations_jobs_create",
+    name: "zeroTrust_casb_remediations_jobs_create",
     title: "Creates remediation jobs",
-    description: "Create one or more remediation jobs tied to a specific Cloudflare Account.",
+    description: "Create one or more remediation jobs tied to a specific Cloudflare Account.\n\nPOST /accounts/{account_id}/data-security/posture/remediations/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_RemediationJobsCreateRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_RemediationJobsCreateRequest": posture_api_RemediationJobsCreateRequest,
+        "posture-api_RemediationJobsCreateRequest": posture$$api_RemediationJobsCreateRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_CreateRemediationJobResponse",
       $defs: {
-        "posture-api_CreateRemediationJobResponse": posture_api_CreateRemediationJobResponse_output,
-        "posture-api_RemediationJob": posture_api_RemediationJob_output,
-        "posture-api_RemediationJobAsset": posture_api_RemediationJobAsset_output,
-        "posture-api_RemediationJobAssetCategory": posture_api_RemediationJobAssetCategory_output,
-        "posture-api_RemediationJobAssetField": posture_api_RemediationJobAssetField_output,
-        "posture-api_RemediationJobFailure": posture_api_RemediationJobFailure_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_VendorsDisplayNameEnum": posture_api_VendorsDisplayNameEnum_output,
+        "posture-api_CreateRemediationJobResponse": posture$$api_CreateRemediationJobResponse,
+        "posture-api_RemediationJob": posture$$api_RemediationJob,
+        "posture-api_RemediationJobAsset": posture$$api_RemediationJobAsset,
+        "posture-api_RemediationJobAssetCategory": posture$$api_RemediationJobAssetCategory,
+        "posture-api_RemediationJobAssetField": posture$$api_RemediationJobAssetField,
+        "posture-api_RemediationJobFailure": posture$$api_RemediationJobFailure,
       },
     },
     annotations: {
@@ -102,17 +101,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_CreateRemediationJobResponse": posture_api_CreateRemediationJobResponse_output,
-        "posture-api_RemediationJob": posture_api_RemediationJob_output,
-        "posture-api_RemediationJobAsset": posture_api_RemediationJobAsset_output,
-        "posture-api_RemediationJobAssetCategory": posture_api_RemediationJobAssetCategory_output,
-        "posture-api_RemediationJobAssetField": posture_api_RemediationJobAssetField_output,
-        "posture-api_RemediationJobFailure": posture_api_RemediationJobFailure_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_VendorsDisplayNameEnum": posture_api_VendorsDisplayNameEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_CreateRemediationJobResponse": posture$$api_CreateRemediationJobResponse,
+        "posture-api_RemediationJob": posture$$api_RemediationJob,
+        "posture-api_RemediationJobAsset": posture$$api_RemediationJobAsset,
+        "posture-api_RemediationJobAssetCategory": posture$$api_RemediationJobAssetCategory,
+        "posture-api_RemediationJobAssetField": posture$$api_RemediationJobAssetField,
+        "posture-api_RemediationJobFailure": posture$$api_RemediationJobFailure,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -121,39 +118,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_remediations_jobs_export",
+    name: "zeroTrust_casb_remediations_jobs_export",
     title: "Create a remediation jobs export",
-    description: "Creates a CSV export for remediation jobs and accepts optional filters in the payload.",
+    description: "Creates a CSV export for remediation jobs and accepts optional filters in the payload.\n\nPOST /accounts/{account_id}/data-security/posture/remediations/jobs/export",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_RemediationJobsExportFilterRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_DirectionEnum": posture_api_DirectionEnum,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum,
-        "posture-api_RemediationJobsExportFilterRequest": posture_api_RemediationJobsExportFilterRequest,
-        "posture-api_RemediationJobsExportOrderFilterRequest": posture_api_RemediationJobsExportOrderFilterRequest,
+        "posture-api_RemediationJobsExportFilterRequest": posture$$api_RemediationJobsExportFilterRequest,
+        "posture-api_RemediationJobsExportOrderFilterRequest": posture$$api_RemediationJobsExportOrderFilterRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_export-job-response",
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -182,12 +185,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_ExportJob": posture_api_ExportJob_output,
-        "posture-api_ExportJobTypeEnum": posture_api_ExportJobTypeEnum_output,
-        "posture-api_StatusEnum": posture_api_StatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_export-job-response": posture_api_export_job_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_ExportJob": posture$$api_ExportJob,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_export-job-response": posture$$api_export$$job$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -196,98 +197,120 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_remediations_jobs_list",
+    name: "zeroTrust_casb_remediations_jobs_list",
     title: "List remediation jobs",
-    description: "List all remediation jobs tied to a specific Cloudflare Account. Note that `cursor` and `page` are mutually exclusive.",
+    description: "List all remediation jobs tied to a specific Cloudflare Account. Note that `cursor` and `page` are mutually exclusive.\n\nGET /accounts/{account_id}/data-security/posture/remediations/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "A cursor for pagination.",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to order results.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "integration_id": {
-          "description": "Filter by an integration ID",
-          "format": "uuid",
-          "type": "string"
-        },
-        "max_updated_at": {
-          "description": "Filter to view remediations updated on or before the max updated datetime. Can be a date-time in ISO 8601 format or an epoch timestamp.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "min_updated_at": {
-          "description": "Filter to view remediations updated on or after the min updated datetime. Can be a date-time in ISO 8601 format or an epoch timestamp.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "order": {
-          "description": "An optional param to sort the results by the given field.",
-          "enum": [
-            "created_at",
-            "affliction_date",
-            "integration_name",
-            "status",
-            "last_updated_at",
-            "asset_name",
-            "finding_type_name"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "description": "A page number within the paginated result set.",
-          "type": "integer"
+          "type": "object"
         },
-        "per_page": {
-          "description": "Number of results to return per page.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "A search term.",
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/$defs/posture-api_RemediationJobStatusEnum",
-          "description": "Filter to view remediations with the given status."
-        },
-        "triggered_by_actor": {
-          "description": "Filter remediations by what kind of actor triggered them. Supports multiple comma-separated values.",
-          "items": {
-            "$ref": "#/$defs/posture-api_RemediationJobActorTypeEnum"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "A cursor for pagination.",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to order results.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "integration_id": {
+              "description": "Filter by an integration ID",
+              "format": "uuid",
+              "type": "string"
+            },
+            "max_updated_at": {
+              "description": "Filter to view remediations updated on or before the max updated datetime. Can be a date-time in ISO 8601 format or an epoch timestamp.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "min_updated_at": {
+              "description": "Filter to view remediations updated on or after the min updated datetime. Can be a date-time in ISO 8601 format or an epoch timestamp.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "order": {
+              "description": "An optional param to sort the results by the given field.",
+              "enum": [
+                "created_at",
+                "affliction_date",
+                "integration_name",
+                "status",
+                "last_updated_at",
+                "asset_name",
+                "finding_type_name"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "description": "A page number within the paginated result set.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of results to return per page.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "A search term.",
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter to view remediations with the given status.",
+              "enum": [
+                "pending",
+                "processing",
+                "completed",
+                "failed",
+                "validating"
+              ],
+              "type": "string"
+            },
+            "triggered_by_actor": {
+              "description": "Filter remediations by what kind of actor triggered them. Supports multiple comma-separated values.",
+              "items": {
+                "description": "Type of actor that triggered the remediation job.",
+                "enum": [
+                  "user",
+                  "account_token"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "posture-api_RemediationJobActorTypeEnum": posture_api_RemediationJobActorTypeEnum,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_PaginatedRemediationJobList",
       $defs: {
-        "posture-api_PaginatedRemediationJobList": posture_api_PaginatedRemediationJobList_output,
-        "posture-api_RemediationJob": posture_api_RemediationJob_output,
-        "posture-api_RemediationJobAsset": posture_api_RemediationJobAsset_output,
-        "posture-api_RemediationJobAssetCategory": posture_api_RemediationJobAssetCategory_output,
-        "posture-api_RemediationJobAssetField": posture_api_RemediationJobAssetField_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_VendorsDisplayNameEnum": posture_api_VendorsDisplayNameEnum_output,
+        "posture-api_PaginatedRemediationJobList": posture$$api_PaginatedRemediationJobList,
+        "posture-api_RemediationJob": posture$$api_RemediationJob,
+        "posture-api_RemediationJobAsset": posture$$api_RemediationJobAsset,
+        "posture-api_RemediationJobAssetCategory": posture$$api_RemediationJobAssetCategory,
+        "posture-api_RemediationJobAssetField": posture$$api_RemediationJobAssetField,
       },
     },
     annotations: {
@@ -316,31 +339,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_PaginatedRemediationJobList": posture_api_PaginatedRemediationJobList_output,
-        "posture-api_RemediationJob": posture_api_RemediationJob_output,
-        "posture-api_RemediationJobAsset": posture_api_RemediationJobAsset_output,
-        "posture-api_RemediationJobAssetCategory": posture_api_RemediationJobAssetCategory_output,
-        "posture-api_RemediationJobAssetField": posture_api_RemediationJobAssetField_output,
-        "posture-api_RemediationJobStatusEnum": posture_api_RemediationJobStatusEnum_output,
-        "posture-api_VendorsDisplayNameEnum": posture_api_VendorsDisplayNameEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_PaginatedRemediationJobList": posture$$api_PaginatedRemediationJobList,
+        "posture-api_RemediationJob": posture$$api_RemediationJob,
+        "posture-api_RemediationJobAsset": posture$$api_RemediationJobAsset,
+        "posture-api_RemediationJobAssetCategory": posture$$api_RemediationJobAssetCategory,
+        "posture-api_RemediationJobAssetField": posture$$api_RemediationJobAssetField,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/data-security/posture/remediations/jobs`,
       query: [
-        ["cursor", args["cursor"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
-        ["min_updated_at", args["min_updated_at"], true],
-        ["max_updated_at", args["max_updated_at"], true],
-        ["status", args["status"], true],
-        ["triggered_by_actor", args["triggered_by_actor"], false],
-        ["integration_id", args["integration_id"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
+        ["min_updated_at", param(args, "query", "min_updated_at"), true],
+        ["max_updated_at", param(args, "query", "max_updated_at"), true],
+        ["status", param(args, "query", "status"), true],
+        ["triggered_by_actor", param(args, "query", "triggered_by_actor"), false],
+        ["integration_id", param(args, "query", "integration_id"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/casb/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/schemas.ts
deleted file mode 100644
index 0b26799cc..000000000
--- a/src/generated/forge-mcp/zeroTrust/casb/schemas.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `posture-api_DirectionEnum`.
- */
-export const posture_api_DirectionEnum: JsonSchema = {
-  "description": "Sort direction.",
-  "enum": [
-    "asc",
-    "desc"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_FindingCategoryTypeEnum`.
- */
-export const posture_api_FindingCategoryTypeEnum: JsonSchema = {
-  "description": "The type of the finding category.",
-  "enum": [
-    "Content",
-    "Posture"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_FindingTypeVendorsEnum`.
- */
-export const posture_api_FindingTypeVendorsEnum: JsonSchema = {
-  "description": "Vendors whose assets a finding type can evaluate.",
-  "enum": [
-    "ANTHROPIC",
-    "AWS",
-    "BITBUCKET",
-    "BOX",
-    "CONFLUENCE",
-    "DROPBOX",
-    "GITHUB",
-    "GOOGLE_CLOUD_PLATFORM",
-    "GOOGLE_WORKSPACE",
-    "JIRA",
-    "MICROSOFT",
-    "OPENAI",
-    "SALESFORCE",
-    "SERVICENOW",
-    "SLACK",
-    "ZOOM"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_RemediationJobStatusEnum`.
- */
-export const posture_api_RemediationJobStatusEnum: JsonSchema = {
-  "description": "Status of a remediation job.",
-  "enum": [
-    "pending",
-    "processing",
-    "completed",
-    "failed",
-    "validating"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_SeverityEnum`.
- */
-export const posture_api_SeverityEnum: JsonSchema = {
-  "description": "The severity level of a finding.",
-  "enum": [
-    "Critical",
-    "High",
-    "Medium",
-    "Low"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_StatusEnum`.
- */
-export const posture_api_StatusEnum: JsonSchema = {
-  "description": "Status of an export job.",
-  "enum": [
-    "Pending",
-    "Success",
-    "Failure",
-    "Rescheduled",
-    "In-Progress"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `posture-api_VendorsEnum`.
- */
-export const posture_api_VendorsEnum: JsonSchema = {
-  "description": "Supported vendor types for integrations.",
-  "enum": [
-    "ANTHROPIC",
-    "AWS",
-    "BITBUCKET",
-    "BOX",
-    "CONFLUENCE",
-    "DROPBOX",
-    "GITHUB",
-    "GOOGLE_CLOUD_PLATFORM",
-    "GOOGLE_WORKSPACE",
-    "JIRA",
-    "MICROSOFT",
-    "MICROSOFT_INTERNAL",
-    "OPENAI",
-    "SALESFORCE",
-    "SERVICENOW",
-    "SLACK",
-    "ZOOM"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/outputs.ts
index 95de826dd..0cdbc16f7 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `posture-api_CreateWebhookJobsResponse` in responses.
  */
-export const posture_api_CreateWebhookJobsResponse_output: JsonSchema = {
+export const posture$$api_CreateWebhookJobsResponse: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -46,7 +46,7 @@ export const posture_api_CreateWebhookJobsResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_WebhookJob` in responses.
  */
-export const posture_api_WebhookJob_output: JsonSchema = {
+export const posture$$api_WebhookJob: JsonSchema = {
   "properties": {
     "asset_data": {
       "type": "object"
@@ -59,7 +59,13 @@ export const posture_api_WebhookJob_output: JsonSchema = {
       "type": "object"
     },
     "failure_reason": {
-      "$ref": "#/$defs/posture-api_WebhookJobFailureReasonEnum"
+      "enum": [
+        "Permission Denied",
+        "Integration Unavailable",
+        "Service Temporarily Unavailable",
+        "System Error"
+      ],
+      "type": "string"
     },
     "id": {
       "format": "uuid",
@@ -77,10 +83,20 @@ export const posture_api_WebhookJob_output: JsonSchema = {
       "$ref": "#/$defs/posture-api_WebhookJobParameters"
     },
     "status": {
-      "$ref": "#/$defs/posture-api_WebhookJobStatusEnum"
+      "enum": [
+        "pending",
+        "processing",
+        "completed",
+        "failed"
+      ],
+      "type": "string"
     },
     "triggered_by_actor": {
-      "$ref": "#/$defs/posture-api_WebhookJobActorTypeEnum"
+      "enum": [
+        "user",
+        "account_token"
+      ],
+      "type": "string"
     },
     "triggered_by_id": {
       "type": "string"
@@ -105,21 +121,10 @@ export const posture_api_WebhookJob_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `posture-api_WebhookJobActorTypeEnum` in responses.
- */
-export const posture_api_WebhookJobActorTypeEnum_output: JsonSchema = {
-  "enum": [
-    "user",
-    "account_token"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_WebhookJobFailure` in responses.
  */
-export const posture_api_WebhookJobFailure_output: JsonSchema = {
+export const posture$$api_WebhookJobFailure: JsonSchema = {
   "properties": {
     "error": {
       "type": "string"
@@ -141,23 +146,10 @@ export const posture_api_WebhookJobFailure_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `posture-api_WebhookJobFailureReasonEnum` in responses.
- */
-export const posture_api_WebhookJobFailureReasonEnum_output: JsonSchema = {
-  "enum": [
-    "Permission Denied",
-    "Integration Unavailable",
-    "Service Temporarily Unavailable",
-    "System Error"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `posture-api_WebhookJobParameters` in responses.
  */
-export const posture_api_WebhookJobParameters_output: JsonSchema = {
+export const posture$$api_WebhookJobParameters: JsonSchema = {
   "properties": {
     "finding_instance_id": {
       "format": "uuid",
@@ -169,16 +161,3 @@ export const posture_api_WebhookJobParameters_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `posture-api_WebhookJobStatusEnum` in responses.
- */
-export const posture_api_WebhookJobStatusEnum_output: JsonSchema = {
-  "enum": [
-    "pending",
-    "processing",
-    "completed",
-    "failed"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/schemas.ts
index 2c5029077..5494078ed 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `posture-api_CreateWebhookJobsRequest`.
  */
-export const posture_api_CreateWebhookJobsRequest: JsonSchema = {
+export const posture$$api_CreateWebhookJobsRequest: JsonSchema = {
   "description": "Request body for creating up to 100 webhook jobs. The number of jobs is the product of webhook_ids and finding_instance_ids.",
   "properties": {
     "finding_instance_ids": {
diff --git a/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/tools.ts
index fe937db07..439c291e6 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/webhooks/jobs/tools.ts
@@ -3,60 +3,64 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  posture_api_api_response_common_output,
-  posture_api_error_response_output,
-  posture_api_messages_output,
+  posture$$api_api$$response$$common,
+  posture$$api_error$$response,
+  posture$$api_messages,
 } from "../../outputs.js";
 import {
-  posture_api_CreateWebhookJobsResponse_output,
-  posture_api_WebhookJobActorTypeEnum_output,
-  posture_api_WebhookJobFailureReasonEnum_output,
-  posture_api_WebhookJobFailure_output,
-  posture_api_WebhookJobParameters_output,
-  posture_api_WebhookJobStatusEnum_output,
-  posture_api_WebhookJob_output,
+  posture$$api_CreateWebhookJobsResponse,
+  posture$$api_WebhookJob,
+  posture$$api_WebhookJobFailure,
+  posture$$api_WebhookJobParameters,
 } from "./outputs.js";
-import { posture_api_CreateWebhookJobsRequest } from "./schemas.js";
+import { posture$$api_CreateWebhookJobsRequest } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.webhooks.jobs`.
+ * The tools of `zeroTrust.casb.webhooks.jobs`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_webhooks_jobs_create",
+    name: "zeroTrust_casb_webhooks_jobs_create",
     title: "Create webhook jobs",
-    description: "Creates webhook jobs to send a finding instance to one or more configured webhooks.",
+    description: "Creates webhook jobs to send a finding instance to one or more configured webhooks.\n\nPOST /accounts/{account_id}/data-security/posture/webhooks/jobs",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_CreateWebhookJobsRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_CreateWebhookJobsRequest": posture_api_CreateWebhookJobsRequest,
+        "posture-api_CreateWebhookJobsRequest": posture$$api_CreateWebhookJobsRequest,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_CreateWebhookJobsResponse",
       $defs: {
-        "posture-api_CreateWebhookJobsResponse": posture_api_CreateWebhookJobsResponse_output,
-        "posture-api_WebhookJob": posture_api_WebhookJob_output,
-        "posture-api_WebhookJobActorTypeEnum": posture_api_WebhookJobActorTypeEnum_output,
-        "posture-api_WebhookJobFailure": posture_api_WebhookJobFailure_output,
-        "posture-api_WebhookJobFailureReasonEnum": posture_api_WebhookJobFailureReasonEnum_output,
-        "posture-api_WebhookJobParameters": posture_api_WebhookJobParameters_output,
-        "posture-api_WebhookJobStatusEnum": posture_api_WebhookJobStatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_CreateWebhookJobsResponse": posture$$api_CreateWebhookJobsResponse,
+        "posture-api_WebhookJob": posture$$api_WebhookJob,
+        "posture-api_WebhookJobFailure": posture$$api_WebhookJobFailure,
+        "posture-api_WebhookJobParameters": posture$$api_WebhookJobParameters,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -95,16 +99,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_CreateWebhookJobsResponse": posture_api_CreateWebhookJobsResponse_output,
-        "posture-api_WebhookJob": posture_api_WebhookJob_output,
-        "posture-api_WebhookJobActorTypeEnum": posture_api_WebhookJobActorTypeEnum_output,
-        "posture-api_WebhookJobFailure": posture_api_WebhookJobFailure_output,
-        "posture-api_WebhookJobFailureReasonEnum": posture_api_WebhookJobFailureReasonEnum_output,
-        "posture-api_WebhookJobParameters": posture_api_WebhookJobParameters_output,
-        "posture-api_WebhookJobStatusEnum": posture_api_WebhookJobStatusEnum_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_CreateWebhookJobsResponse": posture$$api_CreateWebhookJobsResponse,
+        "posture-api_WebhookJob": posture$$api_WebhookJob,
+        "posture-api_WebhookJobFailure": posture$$api_WebhookJobFailure,
+        "posture-api_WebhookJobParameters": posture$$api_WebhookJobParameters,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/casb/webhooks/outputs.ts b/src/generated/forge-mcp/zeroTrust/casb/webhooks/outputs.ts
index 7ccd44b5b..6ae9020c8 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/webhooks/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/webhooks/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_EvaluateNewWebhookResponse` in responses.
  */
-export const posture_api_EvaluateNewWebhookResponse_output: JsonSchema = {
+export const posture$$api_EvaluateNewWebhookResponse: JsonSchema = {
   "properties": {
     "message": {
       "type": "string"
@@ -29,7 +29,7 @@ export const posture_api_EvaluateNewWebhookResponse_output: JsonSchema = {
 /**
  * The schema of `posture-api_Webhook` in responses.
  */
-export const posture_api_Webhook_output: JsonSchema = {
+export const posture$$api_Webhook: JsonSchema = {
   "properties": {
     "authentication_type": {
       "enum": [
@@ -100,7 +100,7 @@ export const posture_api_Webhook_output: JsonSchema = {
 /**
  * The schema of `posture-api_webhook-list-response` in responses.
  */
-export const posture_api_webhook_list_response_output: JsonSchema = {
+export const posture$$api_webhook$$list$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
@@ -122,7 +122,7 @@ export const posture_api_webhook_list_response_output: JsonSchema = {
 /**
  * The schema of `posture-api_webhook-response` in responses.
  */
-export const posture_api_webhook_response_output: JsonSchema = {
+export const posture$$api_webhook$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/posture-api_api-response-common"
diff --git a/src/generated/forge-mcp/zeroTrust/casb/webhooks/schemas.ts b/src/generated/forge-mcp/zeroTrust/casb/webhooks/schemas.ts
index 7c6817387..1929055b0 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/webhooks/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/webhooks/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `posture-api_CreateWebhookRequest`.
  */
-export const posture_api_CreateWebhookRequest: JsonSchema = {
+export const posture$$api_CreateWebhookRequest: JsonSchema = {
   "description": "Request body for creating a new webhook configuration.",
   "properties": {
     "authentication_type": {
@@ -60,7 +60,7 @@ export const posture_api_CreateWebhookRequest: JsonSchema = {
 /**
  * The schema of `posture-api_EvaluateNewWebhookRequest`.
  */
-export const posture_api_EvaluateNewWebhookRequest: JsonSchema = {
+export const posture$$api_EvaluateNewWebhookRequest: JsonSchema = {
   "description": "Request body for testing a webhook configuration before creating it.",
   "properties": {
     "authentication_type": {
@@ -100,7 +100,7 @@ export const posture_api_EvaluateNewWebhookRequest: JsonSchema = {
 /**
  * The schema of `posture-api_UpdateWebhookRequest`.
  */
-export const posture_api_UpdateWebhookRequest: JsonSchema = {
+export const posture$$api_UpdateWebhookRequest: JsonSchema = {
   "description": "Request body for updating an existing webhook configuration.",
   "properties": {
     "authentication_type": {
@@ -154,7 +154,7 @@ export const posture_api_UpdateWebhookRequest: JsonSchema = {
 /**
  * The schema of `posture-api_WebhookHeaderInput`.
  */
-export const posture_api_WebhookHeaderInput: JsonSchema = {
+export const posture$$api_WebhookHeaderInput: JsonSchema = {
   "description": "A header to include in webhook requests. On Create/Evaluate, both key and value are required. On Update, omitting value means \"keep existing value\".",
   "properties": {
     "key": {
diff --git a/src/generated/forge-mcp/zeroTrust/casb/webhooks/tools.ts b/src/generated/forge-mcp/zeroTrust/casb/webhooks/tools.ts
index d1e390d98..bb98468ef 100644
--- a/src/generated/forge-mcp/zeroTrust/casb/webhooks/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/casb/webhooks/tools.ts
@@ -3,49 +3,59 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  posture_api_api_response_common_output,
-  posture_api_error_response_output,
-  posture_api_messages_output,
+  posture$$api_api$$response$$common,
+  posture$$api_error$$response,
+  posture$$api_messages,
 } from "../outputs.js";
 import {
-  posture_api_EvaluateNewWebhookResponse_output,
-  posture_api_Webhook_output,
-  posture_api_webhook_list_response_output,
-  posture_api_webhook_response_output,
+  posture$$api_EvaluateNewWebhookResponse,
+  posture$$api_Webhook,
+  posture$$api_webhook$$list$$response,
+  posture$$api_webhook$$response,
 } from "./outputs.js";
 import {
-  posture_api_CreateWebhookRequest,
-  posture_api_EvaluateNewWebhookRequest,
-  posture_api_UpdateWebhookRequest,
-  posture_api_WebhookHeaderInput,
+  posture$$api_CreateWebhookRequest,
+  posture$$api_EvaluateNewWebhookRequest,
+  posture$$api_UpdateWebhookRequest,
+  posture$$api_WebhookHeaderInput,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.casb.webhooks`.
+ * The tools of `zeroTrust.casb.webhooks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_casb_webhooks_create",
+    name: "zeroTrust_casb_webhooks_create",
     title: "Create a new webhook configuration",
-    description: "Creates a new webhook configuration for sending finding notifications to external endpoints.",
+    description: "Creates a new webhook configuration for sending finding notifications to external endpoints.\n\nPOST /accounts/{account_id}/data-security/posture/webhooks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_CreateWebhookRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_CreateWebhookRequest": posture_api_CreateWebhookRequest,
-        "posture-api_WebhookHeaderInput": posture_api_WebhookHeaderInput,
+        "posture-api_CreateWebhookRequest": posture$$api_CreateWebhookRequest,
+        "posture-api_WebhookHeaderInput": posture$$api_WebhookHeaderInput,
       },
     },
     outputSchema: {
@@ -63,9 +73,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_Webhook": posture_api_Webhook_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Webhook": posture$$api_Webhook,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -116,10 +126,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_Webhook": posture_api_Webhook_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Webhook": posture$$api_Webhook,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -128,32 +138,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_webhooks_delete",
+    name: "zeroTrust_casb_webhooks_delete",
     title: "Delete a webhook configuration",
-    description: "Soft deletes a webhook configuration by its unique identifier.\nThe webhook will be marked as deleted and will no longer be available for use.",
+    description: "Soft deletes a webhook configuration by its unique identifier.\nThe webhook will be marked as deleted and will no longer be available for use.\n\nDELETE /accounts/{account_id}/data-security/posture/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "webhook_id": {
-          "description": "A UUID identifying the webhook configuration.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "A UUID identifying the webhook configuration.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "webhook_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_api-response-common",
       $defs: {
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -184,9 +204,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -194,27 +214,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_webhooks_evaluate",
+    name: "zeroTrust_casb_webhooks_evaluate",
     title: "Test a webhook configuration before creating it",
-    description: "Sends a test webhook event to the specified destination URL to verify the webhook endpoint \nis reachable and properly configured. This allows customers to validate their webhook \nconfiguration before creating the actual webhook resource.\n\nThe test payload includes:\n- event_type: \"webhook.test\"\n- timestamp: Current UTC timestamp\n- message: Test message indicating this is from Cloudflare CASB\n- data: Object with test: true",
+    description: "Sends a test webhook event to the specified destination URL to verify the webhook endpoint \nis reachable and properly configured. This allows customers to validate their webhook \nconfiguration before creating the actual webhook resource.\n\nThe test payload includes:\n- event_type: \"webhook.test\"\n- timestamp: Current UTC timestamp\n- message: Test message indicating this is from Cloudflare CASB\n- data: Object with test: true\n\nPOST /accounts/{account_id}/data-security/posture/webhooks/evaluate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_EvaluateNewWebhookRequest"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_EvaluateNewWebhookRequest": posture_api_EvaluateNewWebhookRequest,
-        "posture-api_WebhookHeaderInput": posture_api_WebhookHeaderInput,
+        "posture-api_EvaluateNewWebhookRequest": posture$$api_EvaluateNewWebhookRequest,
+        "posture-api_WebhookHeaderInput": posture$$api_WebhookHeaderInput,
       },
     },
     outputSchema: {
@@ -232,9 +262,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_EvaluateNewWebhookResponse": posture_api_EvaluateNewWebhookResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_EvaluateNewWebhookResponse": posture$$api_EvaluateNewWebhookResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -282,10 +312,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_EvaluateNewWebhookResponse": posture_api_EvaluateNewWebhookResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_EvaluateNewWebhookResponse": posture$$api_EvaluateNewWebhookResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -294,26 +324,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_webhooks_evaluate_existing",
+    name: "zeroTrust_casb_webhooks_evaluateExisting",
     title: "Test an existing webhook configuration",
-    description: "Sends a test webhook event using an existing webhook configuration.\nThis allows customers to verify their webhook endpoint is still reachable and properly \nconfigured after creating the webhook resource.\n\nThe test payload includes:\n- event_type: \"webhook.test\"\n- timestamp: Current UTC timestamp\n- message: Test message indicating this is from Cloudflare CASB\n- data: Object with test: true",
+    description: "Sends a test webhook event using an existing webhook configuration.\nThis allows customers to verify their webhook endpoint is still reachable and properly \nconfigured after creating the webhook resource.\n\nThe test payload includes:\n- event_type: \"webhook.test\"\n- timestamp: Current UTC timestamp\n- message: Test message indicating this is from Cloudflare CASB\n- data: Object with test: true\n\nPOST /accounts/{account_id}/data-security/posture/webhooks/{webhook_id}/evaluate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "webhook_id": {
-          "description": "A UUID identifying the webhook configuration.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "A UUID identifying the webhook configuration.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "webhook_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -330,9 +370,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_EvaluateNewWebhookResponse": posture_api_EvaluateNewWebhookResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_EvaluateNewWebhookResponse": posture$$api_EvaluateNewWebhookResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -383,10 +423,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_EvaluateNewWebhookResponse": posture_api_EvaluateNewWebhookResponse_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_EvaluateNewWebhookResponse": posture$$api_EvaluateNewWebhookResponse,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
@@ -394,34 +434,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_webhooks_get",
+    name: "zeroTrust_casb_webhooks_get",
     title: "Get webhook configuration by ID",
-    description: "Retrieves a specific webhook configuration by its unique identifier.",
+    description: "Retrieves a specific webhook configuration by its unique identifier.\n\nGET /accounts/{account_id}/data-security/posture/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
-        "webhook_id": {
-          "description": "A UUID identifying the webhook configuration.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "A UUID identifying the webhook configuration.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "webhook_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_webhook-response",
       $defs: {
-        "posture-api_Webhook": posture_api_Webhook_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_webhook-response": posture_api_webhook_response_output,
+        "posture-api_Webhook": posture$$api_Webhook,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_webhook-response": posture$$api_webhook$$response,
       },
     },
     annotations: {
@@ -461,11 +511,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_Webhook": posture_api_Webhook_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_webhook-response": posture_api_webhook_response_output,
+        "posture-api_Webhook": posture$$api_Webhook,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_webhook-response": posture$$api_webhook$$response,
       },
     },
     request: (args) => ({
@@ -473,28 +523,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_webhooks_list",
+    name: "zeroTrust_casb_webhooks_list",
     title: "List webhook configurations",
-    description: "Retrieves all webhook configurations for the authenticated account.\nReturns an array of webhook configurations that can be used to send finding notifications.",
+    description: "Retrieves all webhook configurations for the authenticated account.\nReturns an array of webhook configurations that can be used to send finding notifications.\n\nGET /accounts/{account_id}/data-security/posture/webhooks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/posture-api_webhook-list-response",
       $defs: {
-        "posture-api_Webhook": posture_api_Webhook_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_webhook-list-response": posture_api_webhook_list_response_output,
+        "posture-api_Webhook": posture$$api_Webhook,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_webhook-list-response": posture$$api_webhook$$list$$response,
       },
     },
     annotations: {
@@ -528,11 +588,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_Webhook": posture_api_Webhook_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
-        "posture-api_webhook-list-response": posture_api_webhook_list_response_output,
+        "posture-api_Webhook": posture$$api_Webhook,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
+        "posture-api_webhook-list-response": posture$$api_webhook$$list$$response,
       },
     },
     request: (args) => ({
@@ -540,33 +600,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_casb_webhooks_update",
+    name: "zeroTrust_casb_webhooks_update",
     title: "Update an existing webhook configuration",
-    description: "Updates an existing webhook configuration with new settings.",
+    description: "Updates an existing webhook configuration with new settings.\n\nPUT /accounts/{account_id}/data-security/posture/webhooks/{webhook_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID for the user making the request.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/posture-api_UpdateWebhookRequest"
         },
-        "webhook_id": {
-          "description": "A UUID identifying the webhook configuration.",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID for the user making the request.",
+              "type": "string"
+            },
+            "webhook_id": {
+              "description": "A UUID identifying the webhook configuration.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "webhook_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "webhook_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "posture-api_UpdateWebhookRequest": posture_api_UpdateWebhookRequest,
-        "posture-api_WebhookHeaderInput": posture_api_WebhookHeaderInput,
+        "posture-api_UpdateWebhookRequest": posture$$api_UpdateWebhookRequest,
+        "posture-api_WebhookHeaderInput": posture$$api_WebhookHeaderInput,
       },
     },
     outputSchema: {
@@ -584,9 +654,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "posture-api_Webhook": posture_api_Webhook_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Webhook": posture$$api_Webhook,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     annotations: {
@@ -637,10 +707,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "posture-api_Webhook": posture_api_Webhook_output,
-        "posture-api_api-response-common": posture_api_api_response_common_output,
-        "posture-api_error-response": posture_api_error_response_output,
-        "posture-api_messages": posture_api_messages_output,
+        "posture-api_Webhook": posture$$api_Webhook,
+        "posture-api_api-response-common": posture$$api_api$$response$$common,
+        "posture-api_error-response": posture$$api_error$$response,
+        "posture-api_messages": posture$$api_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/connectivitySettings/outputs.ts b/src/generated/forge-mcp/zeroTrust/connectivitySettings/outputs.ts
index 5bdab80ff..2fb2d8fe2 100644
--- a/src/generated/forge-mcp/zeroTrust/connectivitySettings/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/connectivitySettings/outputs.ts
@@ -3,25 +3,11 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `tunnel_icmp_proxy_enabled` in responses.
- */
-export const tunnel_icmp_proxy_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `tunnel_offramp_warp_enabled` in responses.
- */
-export const tunnel_offramp_warp_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `tunnel_zero_trust_connectivity_settings_response` in
  * responses.
  */
-export const tunnel_zero_trust_connectivity_settings_response_output: JsonSchema = {
+export const tunnel_zero_trust_connectivity_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tunnel_api-response-common"
@@ -31,10 +17,10 @@ export const tunnel_zero_trust_connectivity_settings_response_output: JsonSchema
         "result": {
           "properties": {
             "icmp_proxy_enabled": {
-              "$ref": "#/$defs/tunnel_icmp_proxy_enabled"
+              "type": "boolean"
             },
             "offramp_warp_enabled": {
-              "$ref": "#/$defs/tunnel_offramp_warp_enabled"
+              "type": "boolean"
             }
           },
           "type": "object"
diff --git a/src/generated/forge-mcp/zeroTrust/connectivitySettings/schemas.ts b/src/generated/forge-mcp/zeroTrust/connectivitySettings/schemas.ts
deleted file mode 100644
index 275e65e44..000000000
--- a/src/generated/forge-mcp/zeroTrust/connectivitySettings/schemas.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `tunnel_icmp_proxy_enabled`.
- */
-export const tunnel_icmp_proxy_enabled: JsonSchema = {
-  "description": "A flag to enable the ICMP proxy for the account network.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `tunnel_offramp_warp_enabled`.
- */
-export const tunnel_offramp_warp_enabled: JsonSchema = {
-  "description": "A flag to enable WARP to WARP traffic.",
-  "type": "boolean"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/connectivitySettings/tools.ts b/src/generated/forge-mcp/zeroTrust/connectivitySettings/tools.ts
index 39c3c9888..e109a6aba 100644
--- a/src/generated/forge-mcp/zeroTrust/connectivitySettings/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/connectivitySettings/tools.ts
@@ -3,68 +3,62 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  tunnel_api_response_common_failure_output,
-  tunnel_api_response_common_output,
-  tunnel_messages_output,
+  tunnel_api$$response$$common,
+  tunnel_api$$response$$common$$failure,
+  tunnel_messages,
 } from "../../outputs.js";
-import { tunnel_account_id } from "../../schemas.js";
-import {
-  tunnel_icmp_proxy_enabled_output,
-  tunnel_offramp_warp_enabled_output,
-  tunnel_zero_trust_connectivity_settings_response_output,
-} from "./outputs.js";
-import {
-  tunnel_icmp_proxy_enabled,
-  tunnel_offramp_warp_enabled,
-} from "./schemas.js";
+import { tunnel_zero_trust_connectivity_settings_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.connectivity_settings`.
+ * The tools of `zeroTrust.connectivitySettings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_connectivity_settings_edit",
+    name: "zeroTrust_connectivitySettings_edit",
     title: "Updates the Zero Trust Connectivity Settings",
-    description: "Updates the Zero Trust Connectivity Settings for the given account.",
+    description: "Updates the Zero Trust Connectivity Settings for the given account.\n\nPATCH /accounts/{account_id}/zerotrust/connectivity_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
-        },
         "body": {
           "properties": {
             "icmp_proxy_enabled": {
-              "$ref": "#/$defs/tunnel_icmp_proxy_enabled",
-              "description": "A flag to enable the ICMP proxy for the account network."
+              "description": "A flag to enable the ICMP proxy for the account network.",
+              "type": "boolean"
             },
             "offramp_warp_enabled": {
-              "$ref": "#/$defs/tunnel_offramp_warp_enabled",
-              "description": "A flag to enable WARP to WARP traffic."
+              "description": "A flag to enable WARP to WARP traffic.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
             }
           },
+          "required": [
+            "account_id"
+          ],
           "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-        "tunnel_icmp_proxy_enabled": tunnel_icmp_proxy_enabled,
-        "tunnel_offramp_warp_enabled": tunnel_offramp_warp_enabled,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_zero_trust_connectivity_settings_response",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_icmp_proxy_enabled": tunnel_icmp_proxy_enabled_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_offramp_warp_enabled": tunnel_offramp_warp_enabled_output,
-        "tunnel_zero_trust_connectivity_settings_response": tunnel_zero_trust_connectivity_settings_response_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_zero_trust_connectivity_settings_response": tunnel_zero_trust_connectivity_settings_response,
       },
     },
     annotations: {
@@ -91,12 +85,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_icmp_proxy_enabled": tunnel_icmp_proxy_enabled_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_offramp_warp_enabled": tunnel_offramp_warp_enabled_output,
-        "tunnel_zero_trust_connectivity_settings_response": tunnel_zero_trust_connectivity_settings_response_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_zero_trust_connectivity_settings_response": tunnel_zero_trust_connectivity_settings_response,
       },
     },
     request: (args) => ({
@@ -105,32 +97,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_connectivity_settings_get",
+    name: "zeroTrust_connectivitySettings_get",
     title: "Get Zero Trust Connectivity Settings",
-    description: "Gets the Zero Trust Connectivity Settings for the given account.",
+    description: "Gets the Zero Trust Connectivity Settings for the given account.\n\nGET /accounts/{account_id}/zerotrust/connectivity_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/tunnel_account_id",
-          "description": "Cloudflare account ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "tunnel_account_id": tunnel_account_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tunnel_zero_trust_connectivity_settings_response",
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_icmp_proxy_enabled": tunnel_icmp_proxy_enabled_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_offramp_warp_enabled": tunnel_offramp_warp_enabled_output,
-        "tunnel_zero_trust_connectivity_settings_response": tunnel_zero_trust_connectivity_settings_response_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_zero_trust_connectivity_settings_response": tunnel_zero_trust_connectivity_settings_response,
       },
     },
     annotations: {
@@ -159,12 +156,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tunnel_api-response-common": tunnel_api_response_common_output,
-        "tunnel_api-response-common-failure": tunnel_api_response_common_failure_output,
-        "tunnel_icmp_proxy_enabled": tunnel_icmp_proxy_enabled_output,
-        "tunnel_messages": tunnel_messages_output,
-        "tunnel_offramp_warp_enabled": tunnel_offramp_warp_enabled_output,
-        "tunnel_zero_trust_connectivity_settings_response": tunnel_zero_trust_connectivity_settings_response_output,
+        "tunnel_api-response-common": tunnel_api$$response$$common,
+        "tunnel_api-response-common-failure": tunnel_api$$response$$common$$failure,
+        "tunnel_messages": tunnel_messages,
+        "tunnel_zero_trust_connectivity_settings_response": tunnel_zero_trust_connectivity_settings_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/outputs.ts
index 7abf1a2eb..45450c3c2 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_BasicAuthCredential` in responses.
  */
-export const cws_BasicAuthCredential_output: JsonSchema = {
+export const cws_BasicAuthCredential: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -36,7 +36,7 @@ export const cws_BasicAuthCredential_output: JsonSchema = {
 /**
  * The schema of `cws_PageResponseBasicAuthCredential` in responses.
  */
-export const cws_PageResponseBasicAuthCredential_output: JsonSchema = {
+export const cws_PageResponseBasicAuthCredential: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -97,7 +97,7 @@ export const cws_PageResponseBasicAuthCredential_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseBasicAuthCredential` in responses.
  */
-export const cws_ResponseBasicAuthCredential_output: JsonSchema = {
+export const cws_ResponseBasicAuthCredential: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/secrets/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/secrets/outputs.ts
index c70ff7af8..5a37c4dbb 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/secrets/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/secrets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `cws_BasicAuthSecretResponse` in responses.
  */
-export const cws_BasicAuthSecretResponse_output: JsonSchema = {
+export const cws_BasicAuthSecretResponse: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -31,7 +31,7 @@ export const cws_BasicAuthSecretResponse_output: JsonSchema = {
 /**
  * The schema of `cws_PageResponseBasicAuthSecretResponse` in responses.
  */
-export const cws_PageResponseBasicAuthSecretResponse_output: JsonSchema = {
+export const cws_PageResponseBasicAuthSecretResponse: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -92,7 +92,7 @@ export const cws_PageResponseBasicAuthSecretResponse_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseBasicAuthSecretResponse` in responses.
  */
-export const cws_ResponseBasicAuthSecretResponse_output: JsonSchema = {
+export const cws_ResponseBasicAuthSecretResponse: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/secrets/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/secrets/tools.ts
index ddeba4cbc..938d3beaf 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/secrets/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/secrets/tools.ts
@@ -1,51 +1,61 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../../outputs.js";
 import {
-  cws_BasicAuthSecretResponse_output,
-  cws_PageResponseBasicAuthSecretResponse_output,
-  cws_ResponseBasicAuthSecretResponse_output,
+  cws_BasicAuthSecretResponse,
+  cws_PageResponseBasicAuthSecretResponse,
+  cws_ResponseBasicAuthSecretResponse,
 } from "./outputs.js";
 import { cws_CreateBasicAuthSecretBody } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.basic_auth_credentials.secrets`.
+ * The tools of `zeroTrust.cws.basicAuthCredentials.secrets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_basic_auth_credentials_secrets_create",
+    name: "zeroTrust_cws_basicAuthCredentials_secrets_create",
     title: "Add a secret to a basic-auth credential",
-    description: "Adds a password secret to the credential.\n\nThis method is beta.",
+    description: "Adds a password secret to the credential.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/basic-auth-credentials/{credential_id}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreateBasicAuthSecretBody"
         },
-        "credential_id": {
-          "description": "ID of the parent credential",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "ID of the parent credential",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreateBasicAuthSecretBody": cws_CreateBasicAuthSecretBody,
       },
@@ -53,10 +63,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseBasicAuthSecretResponse",
       $defs: {
-        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseBasicAuthSecretResponse": cws_ResponseBasicAuthSecretResponse_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseBasicAuthSecretResponse": cws_ResponseBasicAuthSecretResponse,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -87,11 +97,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseBasicAuthSecretResponse": cws_ResponseBasicAuthSecretResponse_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseBasicAuthSecretResponse": cws_ResponseBasicAuthSecretResponse,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -100,40 +110,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_basic_auth_credentials_secrets_delete",
+    name: "zeroTrust_cws_basicAuthCredentials_secrets_delete",
     title: "Delete a basic-auth secret",
-    description: "Deletes the specified secret from the credential.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this basic-auth secret?",
+    description: "Deletes the specified secret from the credential.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this basic-auth secret?\n\nDELETE /accounts/{account_id}/cws/basic-auth-credentials/{credential_id}/secrets/{secret_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "credential_id": {
-          "description": "ID of the parent credential",
-          "format": "uuid",
-          "type": "string"
-        },
-        "secret_id": {
-          "description": "ID of the secret to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "ID of the parent credential",
+              "format": "uuid",
+              "type": "string"
+            },
+            "secret_id": {
+              "description": "ID of the secret to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_id",
+            "secret_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_id",
-        "secret_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -161,11 +181,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -173,40 +193,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_basic_auth_credentials_secrets_get",
+    name: "zeroTrust_cws_basicAuthCredentials_secrets_get",
     title: "Get a basic-auth secret by ID",
-    description: "Returns the specified secret's metadata without exposing its password or hash.\n\nThis method is beta.",
+    description: "Returns the specified secret's metadata without exposing its password or hash.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/basic-auth-credentials/{credential_id}/secrets/{secret_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "credential_id": {
-          "description": "ID of the parent credential",
-          "format": "uuid",
-          "type": "string"
-        },
-        "secret_id": {
-          "description": "ID of the secret to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "ID of the parent credential",
+              "format": "uuid",
+              "type": "string"
+            },
+            "secret_id": {
+              "description": "ID of the secret to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_id",
+            "secret_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_id",
-        "secret_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseBasicAuthSecretResponse",
       $defs: {
-        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseBasicAuthSecretResponse": cws_ResponseBasicAuthSecretResponse_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseBasicAuthSecretResponse": cws_ResponseBasicAuthSecretResponse,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -234,11 +264,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseBasicAuthSecretResponse": cws_ResponseBasicAuthSecretResponse_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseBasicAuthSecretResponse": cws_ResponseBasicAuthSecretResponse,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -246,61 +276,77 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_basic_auth_credentials_secrets_list",
+    name: "zeroTrust_cws_basicAuthCredentials_secrets_list",
     title: "List secrets for a basic-auth credential",
-    description: "Returns a paginated list of secrets belonging to the credential.\n\nThis method is beta.",
+    description: "Returns a paginated list of secrets belonging to the credential.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/basic-auth-credentials/{credential_id}/secrets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "credential_id": {
-          "description": "ID of the parent credential",
-          "format": "uuid",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "created_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "ID of the parent credential",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseBasicAuthSecretResponse",
       $defs: {
-        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseBasicAuthSecretResponse": cws_PageResponseBasicAuthSecretResponse_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseBasicAuthSecretResponse": cws_PageResponseBasicAuthSecretResponse,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     annotations: {
@@ -328,21 +374,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseBasicAuthSecretResponse": cws_PageResponseBasicAuthSecretResponse_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_BasicAuthSecretResponse": cws_BasicAuthSecretResponse,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseBasicAuthSecretResponse": cws_PageResponseBasicAuthSecretResponse,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/basic-auth-credentials/${pathParam(args, "credential_id")}/secrets`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/tools.ts
index f9ca38cad..176ff62f3 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/basicAuthCredentials/tools.ts
@@ -1,45 +1,55 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
 import {
-  cws_BasicAuthCredential_output,
-  cws_PageResponseBasicAuthCredential_output,
-  cws_ResponseBasicAuthCredential_output,
+  cws_BasicAuthCredential,
+  cws_PageResponseBasicAuthCredential,
+  cws_ResponseBasicAuthCredential,
 } from "./outputs.js";
 import { cws_CreateBasicAuthCredentialInputBody } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.basic_auth_credentials`.
+ * The tools of `zeroTrust.cws.basicAuthCredentials`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_basic_auth_credentials_create",
+    name: "zeroTrust_cws_basicAuthCredentials_create",
     title: "Create a basic-auth credential",
-    description: "Creates a basic-auth credential with the specified username.\n\nThis method is beta.",
+    description: "Creates a basic-auth credential with the specified username.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/basic-auth-credentials",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreateBasicAuthCredentialInputBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreateBasicAuthCredentialInputBody": cws_CreateBasicAuthCredentialInputBody,
       },
@@ -47,10 +57,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseBasicAuthCredential",
       $defs: {
-        "cws_BasicAuthCredential": cws_BasicAuthCredential_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseBasicAuthCredential": cws_ResponseBasicAuthCredential_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_BasicAuthCredential": cws_BasicAuthCredential,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseBasicAuthCredential": cws_ResponseBasicAuthCredential,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -78,11 +88,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_BasicAuthCredential": cws_BasicAuthCredential_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseBasicAuthCredential": cws_ResponseBasicAuthCredential_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_BasicAuthCredential": cws_BasicAuthCredential,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseBasicAuthCredential": cws_ResponseBasicAuthCredential,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -91,34 +101,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_basic_auth_credentials_delete",
+    name: "zeroTrust_cws_basicAuthCredentials_delete",
     title: "Delete a basic-auth credential",
-    description: "Deletes the credential and its secrets if it is not attached to a deployment.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this basic-auth credential?",
+    description: "Deletes the credential and its secrets if it is not attached to a deployment.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this basic-auth credential?\n\nDELETE /accounts/{account_id}/cws/basic-auth-credentials/{credential_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "credential_id": {
-          "description": "ID of the credential to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "ID of the credential to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -146,11 +166,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -158,34 +178,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_basic_auth_credentials_get",
+    name: "zeroTrust_cws_basicAuthCredentials_get",
     title: "Get a basic-auth credential by ID",
-    description: "Returns the basic-auth credential with the specified ID.\n\nThis method is beta.",
+    description: "Returns the basic-auth credential with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/basic-auth-credentials/{credential_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "credential_id": {
-          "description": "ID of the credential to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "credential_id": {
+              "description": "ID of the credential to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "credential_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "credential_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseBasicAuthCredential",
       $defs: {
-        "cws_BasicAuthCredential": cws_BasicAuthCredential_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseBasicAuthCredential": cws_ResponseBasicAuthCredential_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_BasicAuthCredential": cws_BasicAuthCredential,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseBasicAuthCredential": cws_ResponseBasicAuthCredential,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -213,11 +243,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_BasicAuthCredential": cws_BasicAuthCredential_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseBasicAuthCredential": cws_ResponseBasicAuthCredential_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_BasicAuthCredential": cws_BasicAuthCredential,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseBasicAuthCredential": cws_ResponseBasicAuthCredential,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -225,66 +255,82 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_basic_auth_credentials_list",
+    name: "zeroTrust_cws_basicAuthCredentials_list",
     title: "List basic-auth credentials for an account",
-    description: "Returns a paginated list of basic-auth credentials in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of basic-auth credentials in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/basic-auth-credentials",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "deployment_id": {
-          "description": "Filter to credentials attached to this deployment",
-          "format": "uuid",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "username",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
+          "type": "object"
         },
-        "username": {
-          "description": "Filter by username (case-insensitive substring match)",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "Filter to credentials attached to this deployment",
+              "format": "uuid",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "username",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            },
+            "username": {
+              "description": "Filter by username (case-insensitive substring match)",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseBasicAuthCredential",
       $defs: {
-        "cws_BasicAuthCredential": cws_BasicAuthCredential_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseBasicAuthCredential": cws_PageResponseBasicAuthCredential_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_BasicAuthCredential": cws_BasicAuthCredential,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseBasicAuthCredential": cws_PageResponseBasicAuthCredential,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     annotations: {
@@ -312,23 +358,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_BasicAuthCredential": cws_BasicAuthCredential_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseBasicAuthCredential": cws_PageResponseBasicAuthCredential_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_BasicAuthCredential": cws_BasicAuthCredential,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseBasicAuthCredential": cws_PageResponseBasicAuthCredential,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/basic-auth-credentials`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["username", args["username"], false],
-        ["deployment_id", args["deployment_id"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["username", param(args, "query", "username"), false],
+        ["deployment_id", param(args, "query", "deployment_id"), false],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/cws/deployments/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/deployments/outputs.ts
index 9be019ef1..d18237718 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/deployments/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/deployments/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_Deployment` in responses.
  */
-export const cws_Deployment_output: JsonSchema = {
+export const cws_Deployment: JsonSchema = {
   "properties": {
     "basic_auth_credential_ids": {
       "oneOf": [
@@ -100,7 +100,7 @@ export const cws_Deployment_output: JsonSchema = {
 /**
  * The schema of `cws_PageResponseDeployment` in responses.
  */
-export const cws_PageResponseDeployment_output: JsonSchema = {
+export const cws_PageResponseDeployment: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -161,7 +161,7 @@ export const cws_PageResponseDeployment_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseDeployment` in responses.
  */
-export const cws_ResponseDeployment_output: JsonSchema = {
+export const cws_ResponseDeployment: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/deployments/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/deployments/tools.ts
index ad44b5f00..3455e4c32 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/deployments/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/deployments/tools.ts
@@ -1,19 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
 import {
-  cws_Deployment_output,
-  cws_PageResponseDeployment_output,
-  cws_ResponseDeployment_output,
+  cws_Deployment,
+  cws_PageResponseDeployment,
+  cws_ResponseDeployment,
 } from "./outputs.js";
 import {
   cws_CreateDeploymentInputBody,
@@ -21,28 +21,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.deployments`.
+ * The tools of `zeroTrust.cws.deployments`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_deployments_create",
+    name: "zeroTrust_cws_deployments_create",
     title: "Create a new deployment",
-    description: "Creates a deployment with the specified policy sets, domain ACL, and basic-auth credentials.\n\nThis method is beta.",
+    description: "Creates a deployment with the specified policy sets, domain ACL, and basic-auth credentials.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreateDeploymentInputBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreateDeploymentInputBody": cws_CreateDeploymentInputBody,
       },
@@ -50,10 +60,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeployment",
       $defs: {
-        "cws_Deployment": cws_Deployment_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeployment": cws_ResponseDeployment_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_Deployment": cws_Deployment,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeployment": cws_ResponseDeployment,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -81,11 +91,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_Deployment": cws_Deployment_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeployment": cws_ResponseDeployment_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_Deployment": cws_Deployment,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeployment": cws_ResponseDeployment,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -94,34 +104,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_deployments_delete",
+    name: "zeroTrust_cws_deployments_delete",
     title: "Delete a deployment",
-    description: "Deletes the deployment and detaches its associated resources. The resources are not deleted.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this deployment?",
+    description: "Deletes the deployment and detaches its associated resources. The resources are not deleted.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this deployment?\n\nDELETE /accounts/{account_id}/cws/deployments/{deployment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "deployment_id": {
-          "description": "ID of the deployment to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "ID of the deployment to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "deployment_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -149,11 +169,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -161,34 +181,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_deployments_get",
+    name: "zeroTrust_cws_deployments_get",
     title: "Get a deployment by ID",
-    description: "Returns the deployment with the specified ID.\n\nThis method is beta.",
+    description: "Returns the deployment with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/deployments/{deployment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "deployment_id": {
-          "description": "ID of the deployment to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "ID of the deployment to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "deployment_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeployment",
       $defs: {
-        "cws_Deployment": cws_Deployment_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeployment": cws_ResponseDeployment_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_Deployment": cws_Deployment,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeployment": cws_ResponseDeployment,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -216,11 +246,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_Deployment": cws_Deployment_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeployment": cws_ResponseDeployment_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_Deployment": cws_Deployment,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeployment": cws_ResponseDeployment,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -228,61 +258,77 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_deployments_list",
+    name: "zeroTrust_cws_deployments_list",
     title: "List deployments",
-    description: "Returns a paginated list of deployments in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of deployments in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/deployments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Filter by deployment name (case-insensitive substring match)",
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by deployment name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseDeployment",
       $defs: {
-        "cws_Deployment": cws_Deployment_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseDeployment": cws_PageResponseDeployment_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_Deployment": cws_Deployment,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseDeployment": cws_PageResponseDeployment,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     annotations: {
@@ -310,50 +356,60 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_Deployment": cws_Deployment_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseDeployment": cws_PageResponseDeployment_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_Deployment": cws_Deployment,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseDeployment": cws_PageResponseDeployment,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/deployments`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["name", args["name"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["name", param(args, "query", "name"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_deployments_update",
+    name: "zeroTrust_cws_deployments_update",
     title: "Update a deployment",
-    description: "Replaces the deployment's mutable configuration and resource attachments.\n\nThis method is beta.",
+    description: "Replaces the deployment's mutable configuration and resource attachments.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/deployments/{deployment_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_UpdateDeploymentInputBody"
         },
-        "deployment_id": {
-          "description": "ID of the deployment to update",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "ID of the deployment to update",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "deployment_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "deployment_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_UpdateDeploymentInputBody": cws_UpdateDeploymentInputBody,
       },
@@ -361,10 +417,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeployment",
       $defs: {
-        "cws_Deployment": cws_Deployment_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeployment": cws_ResponseDeployment_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_Deployment": cws_Deployment,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeployment": cws_ResponseDeployment,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -392,11 +448,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_Deployment": cws_Deployment_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeployment": cws_ResponseDeployment_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_Deployment": cws_Deployment,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeployment": cws_ResponseDeployment,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/domainAcls/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/domainAcls/outputs.ts
index 794a4860f..c79ea27a2 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/domainAcls/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/domainAcls/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_DomainACL` in responses.
  */
-export const cws_DomainACL_output: JsonSchema = {
+export const cws_DomainACL: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -58,7 +58,7 @@ export const cws_DomainACL_output: JsonSchema = {
 /**
  * The schema of `cws_DomainACLEntry` in responses.
  */
-export const cws_DomainACLEntry_output: JsonSchema = {
+export const cws_DomainACLEntry: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -81,7 +81,7 @@ export const cws_DomainACLEntry_output: JsonSchema = {
 /**
  * The schema of `cws_PageResponseDomainACL` in responses.
  */
-export const cws_PageResponseDomainACL_output: JsonSchema = {
+export const cws_PageResponseDomainACL: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -142,7 +142,7 @@ export const cws_PageResponseDomainACL_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseDomainACL` in responses.
  */
-export const cws_ResponseDomainACL_output: JsonSchema = {
+export const cws_ResponseDomainACL: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/domainAcls/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/domainAcls/tools.ts
index e2bc3e7f5..e2e0758d3 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/domainAcls/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/domainAcls/tools.ts
@@ -1,63 +1,73 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
 import {
-  cws_DomainACLEntry_output,
-  cws_DomainACL_output,
-  cws_PageResponseDomainACL_output,
-  cws_ResponseDomainACL_output,
+  cws_DomainACL,
+  cws_DomainACLEntry,
+  cws_PageResponseDomainACL,
+  cws_ResponseDomainACL,
 } from "./outputs.js";
 import {
   cws_CreateDomainACLInputBody,
-  cws_DomainACLEntry,
+  cws_DomainACLEntry as cws_DomainACLEntry$,
   cws_UpdateDomainACLInputBody,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.domain_acls`.
+ * The tools of `zeroTrust.cws.domainAcls`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_domain_acls_create",
+    name: "zeroTrust_cws_domainAcls_create",
     title: "Create a new domain ACL",
-    description: "Creates a domain access control list with its default action and entries.\n\nThis method is beta.",
+    description: "Creates a domain access control list with its default action and entries.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/domain-acls",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreateDomainACLInputBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreateDomainACLInputBody": cws_CreateDomainACLInputBody,
-        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_DomainACLEntry": cws_DomainACLEntry$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDomainACL",
       $defs: {
-        "cws_DomainACL": cws_DomainACL_output,
-        "cws_DomainACLEntry": cws_DomainACLEntry_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDomainACL": cws_ResponseDomainACL_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DomainACL": cws_DomainACL,
+        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDomainACL": cws_ResponseDomainACL,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -85,12 +95,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DomainACL": cws_DomainACL_output,
-        "cws_DomainACLEntry": cws_DomainACLEntry_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDomainACL": cws_ResponseDomainACL_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DomainACL": cws_DomainACL,
+        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDomainACL": cws_ResponseDomainACL,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -99,34 +109,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_domain_acls_delete",
+    name: "zeroTrust_cws_domainAcls_delete",
     title: "Delete a domain ACL",
-    description: "Deletes the domain ACL if it is not attached to a deployment.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this domain ACL?",
+    description: "Deletes the domain ACL if it is not attached to a deployment.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this domain ACL?\n\nDELETE /accounts/{account_id}/cws/domain-acls/{domain_acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "domain_acl_id": {
-          "description": "ID of the domain ACL to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "domain_acl_id": {
+              "description": "ID of the domain ACL to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_acl_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -154,11 +174,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -166,35 +186,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_domain_acls_get",
+    name: "zeroTrust_cws_domainAcls_get",
     title: "Get a domain ACL by ID",
-    description: "Returns the domain access control list with the specified ID.\n\nThis method is beta.",
+    description: "Returns the domain access control list with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/domain-acls/{domain_acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "domain_acl_id": {
-          "description": "ID of the domain ACL to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "domain_acl_id": {
+              "description": "ID of the domain ACL to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_acl_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDomainACL",
       $defs: {
-        "cws_DomainACL": cws_DomainACL_output,
-        "cws_DomainACLEntry": cws_DomainACLEntry_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDomainACL": cws_ResponseDomainACL_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DomainACL": cws_DomainACL,
+        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDomainACL": cws_ResponseDomainACL,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -222,12 +252,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DomainACL": cws_DomainACL_output,
-        "cws_DomainACLEntry": cws_DomainACLEntry_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDomainACL": cws_ResponseDomainACL_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DomainACL": cws_DomainACL,
+        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDomainACL": cws_ResponseDomainACL,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -235,67 +265,83 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_domain_acls_list",
+    name: "zeroTrust_cws_domainAcls_list",
     title: "List domain ACLs",
-    description: "Returns a paginated list of domain access control lists in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of domain access control lists in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/domain-acls",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "deployment_id": {
-          "description": "Filter to domain ACLs attached to this deployment",
-          "format": "uuid",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Filter by domain ACL name (case-insensitive substring match)",
-          "type": "string"
+          "type": "object"
         },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "Filter to domain ACLs attached to this deployment",
+              "format": "uuid",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by domain ACL name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseDomainACL",
       $defs: {
-        "cws_DomainACL": cws_DomainACL_output,
-        "cws_DomainACLEntry": cws_DomainACLEntry_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseDomainACL": cws_PageResponseDomainACL_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_DomainACL": cws_DomainACL,
+        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseDomainACL": cws_PageResponseDomainACL,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     annotations: {
@@ -323,65 +369,75 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DomainACL": cws_DomainACL_output,
-        "cws_DomainACLEntry": cws_DomainACLEntry_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseDomainACL": cws_PageResponseDomainACL_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_DomainACL": cws_DomainACL,
+        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseDomainACL": cws_PageResponseDomainACL,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/domain-acls`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["name", args["name"], false],
-        ["deployment_id", args["deployment_id"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["name", param(args, "query", "name"), false],
+        ["deployment_id", param(args, "query", "deployment_id"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_domain_acls_update",
+    name: "zeroTrust_cws_domainAcls_update",
     title: "Update a domain ACL and replace its entries",
-    description: "Replaces the domain access control list's name, default action, and entries.\n\nThis method is beta.",
+    description: "Replaces the domain access control list's name, default action, and entries.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/domain-acls/{domain_acl_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_UpdateDomainACLInputBody"
         },
-        "domain_acl_id": {
-          "description": "ID of the domain ACL to update",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "domain_acl_id": {
+              "description": "ID of the domain ACL to update",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "domain_acl_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "domain_acl_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_DomainACLEntry": cws_DomainACLEntry$,
         "cws_UpdateDomainACLInputBody": cws_UpdateDomainACLInputBody,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDomainACL",
       $defs: {
-        "cws_DomainACL": cws_DomainACL_output,
-        "cws_DomainACLEntry": cws_DomainACLEntry_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDomainACL": cws_ResponseDomainACL_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DomainACL": cws_DomainACL,
+        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDomainACL": cws_ResponseDomainACL,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -409,12 +465,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DomainACL": cws_DomainACL_output,
-        "cws_DomainACLEntry": cws_DomainACLEntry_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDomainACL": cws_ResponseDomainACL_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DomainACL": cws_DomainACL,
+        "cws_DomainACLEntry": cws_DomainACLEntry,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDomainACL": cws_ResponseDomainACL,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/outputs.ts
index cbb5eac55..52b43ab46 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cws_DeletedResult` in responses.
  */
-export const cws_DeletedResult_output: JsonSchema = {
+export const cws_DeletedResult: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -22,7 +22,7 @@ export const cws_DeletedResult_output: JsonSchema = {
 /**
  * The schema of `cws_ErrorResponse` in responses.
  */
-export const cws_ErrorResponse_output: JsonSchema = {
+export const cws_ErrorResponse: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -72,7 +72,7 @@ export const cws_ErrorResponse_output: JsonSchema = {
 /**
  * The schema of `cws_MessageSource` in responses.
  */
-export const cws_MessageSource_output: JsonSchema = {
+export const cws_MessageSource: JsonSchema = {
   "properties": {
     "pointer": {
       "type": "string"
@@ -87,7 +87,7 @@ export const cws_MessageSource_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseDeletedResult` in responses.
  */
-export const cws_ResponseDeletedResult_output: JsonSchema = {
+export const cws_ResponseDeletedResult: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -134,7 +134,7 @@ export const cws_ResponseDeletedResult_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseMessage` in responses.
  */
-export const cws_ResponseMessage_output: JsonSchema = {
+export const cws_ResponseMessage: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
@@ -156,7 +156,7 @@ export const cws_ResponseMessage_output: JsonSchema = {
 /**
  * The schema of `cws_ResultInfo` in responses.
  */
-export const cws_ResultInfo_output: JsonSchema = {
+export const cws_ResultInfo: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/cws/policies/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/policies/outputs.ts
index 769af381a..3c2077265 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/policies/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/policies/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_PageResponsePolicy` in responses.
  */
-export const cws_PageResponsePolicy_output: JsonSchema = {
+export const cws_PageResponsePolicy: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -67,7 +67,7 @@ export const cws_PageResponsePolicy_output: JsonSchema = {
 /**
  * The schema of `cws_Policy` in responses.
  */
-export const cws_Policy_output: JsonSchema = {
+export const cws_Policy: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -123,7 +123,7 @@ export const cws_Policy_output: JsonSchema = {
 /**
  * The schema of `cws_ResponsePolicy` in responses.
  */
-export const cws_ResponsePolicy_output: JsonSchema = {
+export const cws_ResponsePolicy: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/policies/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/policies/tools.ts
index cb10a0324..895504ba3 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/policies/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/policies/tools.ts
@@ -1,19 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
 import {
-  cws_PageResponsePolicy_output,
-  cws_Policy_output,
-  cws_ResponsePolicy_output,
+  cws_PageResponsePolicy,
+  cws_Policy,
+  cws_ResponsePolicy,
 } from "./outputs.js";
 import {
   cws_CreatePolicyInputBody,
@@ -21,28 +21,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.policies`.
+ * The tools of `zeroTrust.cws.policies`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_policies_create",
+    name: "zeroTrust_cws_policies_create",
     title: "Create a new policy",
-    description: "Creates a policy from inline Rego source, an entrypoint, and a filter expression.\n\nThis method is beta.",
+    description: "Creates a policy from inline Rego source, an entrypoint, and a filter expression.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreatePolicyInputBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreatePolicyInputBody": cws_CreatePolicyInputBody,
       },
@@ -50,10 +60,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponsePolicy",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_Policy": cws_Policy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicy": cws_ResponsePolicy_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_Policy": cws_Policy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicy": cws_ResponsePolicy,
       },
     },
     annotations: {
@@ -84,11 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_Policy": cws_Policy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicy": cws_ResponsePolicy_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_Policy": cws_Policy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicy": cws_ResponsePolicy,
       },
     },
     request: (args) => ({
@@ -97,34 +107,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_policies_delete",
+    name: "zeroTrust_cws_policies_delete",
     title: "Delete a policy",
-    description: "Deletes the policy and cascades its policy-set membership rows. The policy sets remain.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this policy?",
+    description: "Deletes the policy and cascades its policy-set membership rows. The policy sets remain.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this policy?\n\nDELETE /accounts/{account_id}/cws/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "policy_id": {
-          "description": "ID of the policy to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "ID of the policy to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -152,11 +172,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -164,34 +184,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_policies_get",
+    name: "zeroTrust_cws_policies_get",
     title: "Get a policy by ID",
-    description: "Returns the policy with the specified ID.\n\nThis method is beta.",
+    description: "Returns the policy with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "policy_id": {
-          "description": "ID of the policy to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "ID of the policy to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponsePolicy",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_Policy": cws_Policy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicy": cws_ResponsePolicy_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_Policy": cws_Policy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicy": cws_ResponsePolicy,
       },
     },
     annotations: {
@@ -219,11 +249,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_Policy": cws_Policy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicy": cws_ResponsePolicy_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_Policy": cws_Policy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicy": cws_ResponsePolicy,
       },
     },
     request: (args) => ({
@@ -231,70 +261,86 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_policies_list",
+    name: "zeroTrust_cws_policies_list",
     title: "List policies",
-    description: "Returns a paginated list of policies in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of policies in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Filter by policy name (case-insensitive substring match)",
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "package_path": {
-          "description": "Filter by package path (case-sensitive literal substring match)",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
-        },
-        "policy_set_id": {
-          "description": "Filter to policies attached to (members of) this policy set",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by policy name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "package_path": {
+              "description": "Filter by package path (case-sensitive literal substring match)",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            },
+            "policy_set_id": {
+              "description": "Filter to policies attached to (members of) this policy set",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponsePolicy",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponsePolicy": cws_PageResponsePolicy_output,
-        "cws_Policy": cws_Policy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponsePolicy": cws_PageResponsePolicy,
+        "cws_Policy": cws_Policy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     annotations: {
@@ -322,52 +368,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponsePolicy": cws_PageResponsePolicy_output,
-        "cws_Policy": cws_Policy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponsePolicy": cws_PageResponsePolicy,
+        "cws_Policy": cws_Policy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/policies`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["name", args["name"], false],
-        ["policy_set_id", args["policy_set_id"], false],
-        ["package_path", args["package_path"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["name", param(args, "query", "name"), false],
+        ["policy_set_id", param(args, "query", "policy_set_id"), false],
+        ["package_path", param(args, "query", "package_path"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_policies_update",
+    name: "zeroTrust_cws_policies_update",
     title: "Update a policy",
-    description: "Replaces the policy's configuration. Omit tags or use {} to clear them.\n\nThis method is beta.",
+    description: "Replaces the policy's configuration. Omit tags or use {} to clear them.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/policies/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_UpdatePolicyInputBody"
         },
-        "policy_id": {
-          "description": "ID of the policy to update",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "policy_id": {
+              "description": "ID of the policy to update",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_UpdatePolicyInputBody": cws_UpdatePolicyInputBody,
       },
@@ -375,10 +431,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponsePolicy",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_Policy": cws_Policy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicy": cws_ResponsePolicy_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_Policy": cws_Policy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicy": cws_ResponsePolicy,
       },
     },
     annotations: {
@@ -409,11 +465,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_Policy": cws_Policy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicy": cws_ResponsePolicy_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_Policy": cws_Policy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicy": cws_ResponsePolicy,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/policySets/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/policySets/outputs.ts
index 940cfebe2..ed0d787da 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/policySets/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/policySets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_PageResponsePolicySet` in responses.
  */
-export const cws_PageResponsePolicySet_output: JsonSchema = {
+export const cws_PageResponsePolicySet: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -67,7 +67,7 @@ export const cws_PageResponsePolicySet_output: JsonSchema = {
 /**
  * The schema of `cws_PolicySet` in responses.
  */
-export const cws_PolicySet_output: JsonSchema = {
+export const cws_PolicySet: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -151,7 +151,7 @@ export const cws_PolicySet_output: JsonSchema = {
 /**
  * The schema of `cws_PolicySetPolicy` in responses.
  */
-export const cws_PolicySetPolicy_output: JsonSchema = {
+export const cws_PolicySetPolicy: JsonSchema = {
   "properties": {
     "enforce": {
       "type": "boolean"
@@ -171,7 +171,7 @@ export const cws_PolicySetPolicy_output: JsonSchema = {
 /**
  * The schema of `cws_ResponsePolicySet` in responses.
  */
-export const cws_ResponsePolicySet_output: JsonSchema = {
+export const cws_ResponsePolicySet: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/policySets/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/policySets/tools.ts
index c66a50c0b..2cd1be74b 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/policySets/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/policySets/tools.ts
@@ -1,20 +1,20 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
 import {
-  cws_PageResponsePolicySet_output,
-  cws_PolicySetPolicy_output,
-  cws_PolicySet_output,
-  cws_ResponsePolicySet_output,
+  cws_PageResponsePolicySet,
+  cws_PolicySet,
+  cws_PolicySetPolicy,
+  cws_ResponsePolicySet,
 } from "./outputs.js";
 import {
   cws_CreatePolicySetInputBody,
@@ -23,28 +23,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.policy_sets`.
+ * The tools of `zeroTrust.cws.policySets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_policy_sets_create",
+    name: "zeroTrust_cws_policySets_create",
     title: "Create a new policy set",
-    description: "Creates a policy set containing the specified policies and workload targets.\n\nThis method is beta.",
+    description: "Creates a policy set containing the specified policies and workload targets.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/policy-sets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreatePolicySetInputBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreatePolicySetInputBody": cws_CreatePolicySetInputBody,
         "cws_PolicySetPolicyInput": cws_PolicySetPolicyInput,
@@ -53,11 +63,11 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponsePolicySet",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PolicySet": cws_PolicySet_output,
-        "cws_PolicySetPolicy": cws_PolicySetPolicy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicySet": cws_ResponsePolicySet_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PolicySet": cws_PolicySet,
+        "cws_PolicySetPolicy": cws_PolicySetPolicy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicySet": cws_ResponsePolicySet,
       },
     },
     annotations: {
@@ -85,12 +95,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PolicySet": cws_PolicySet_output,
-        "cws_PolicySetPolicy": cws_PolicySetPolicy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicySet": cws_ResponsePolicySet_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PolicySet": cws_PolicySet,
+        "cws_PolicySetPolicy": cws_PolicySetPolicy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicySet": cws_ResponsePolicySet,
       },
     },
     request: (args) => ({
@@ -99,34 +109,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_policy_sets_delete",
+    name: "zeroTrust_cws_policySets_delete",
     title: "Delete a policy set",
-    description: "Deletes the policy set and cascades its deployment attachment and policy and workload membership rows. The referenced deployments, policies, and workloads remain.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this policy set?",
+    description: "Deletes the policy set and cascades its deployment attachment and policy and workload membership rows. The referenced deployments, policies, and workloads remain.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this policy set?\n\nDELETE /accounts/{account_id}/cws/policy-sets/{policy_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "policy_set_id": {
-          "description": "ID of the policy set to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "policy_set_id": {
+              "description": "ID of the policy set to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_set_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -154,11 +174,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -166,35 +186,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_policy_sets_get",
+    name: "zeroTrust_cws_policySets_get",
     title: "Get a policy set by ID",
-    description: "Returns the policy set with the specified ID.\n\nThis method is beta.",
+    description: "Returns the policy set with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/policy-sets/{policy_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "policy_set_id": {
-          "description": "ID of the policy set to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "policy_set_id": {
+              "description": "ID of the policy set to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_set_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponsePolicySet",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PolicySet": cws_PolicySet_output,
-        "cws_PolicySetPolicy": cws_PolicySetPolicy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicySet": cws_ResponsePolicySet_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PolicySet": cws_PolicySet,
+        "cws_PolicySetPolicy": cws_PolicySetPolicy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicySet": cws_ResponsePolicySet,
       },
     },
     annotations: {
@@ -222,12 +252,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PolicySet": cws_PolicySet_output,
-        "cws_PolicySetPolicy": cws_PolicySetPolicy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicySet": cws_ResponsePolicySet_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PolicySet": cws_PolicySet,
+        "cws_PolicySetPolicy": cws_PolicySetPolicy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicySet": cws_ResponsePolicySet,
       },
     },
     request: (args) => ({
@@ -235,67 +265,83 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_policy_sets_list",
+    name: "zeroTrust_cws_policySets_list",
     title: "List policy sets",
-    description: "Returns a paginated list of policy sets in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of policy sets in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/policy-sets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "deployment_id": {
-          "description": "Filter to policy sets attached to this deployment",
-          "format": "uuid",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Filter by policy set name (case-insensitive substring match)",
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "deployment_id": {
+              "description": "Filter to policy sets attached to this deployment",
+              "format": "uuid",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by policy set name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponsePolicySet",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponsePolicySet": cws_PageResponsePolicySet_output,
-        "cws_PolicySet": cws_PolicySet_output,
-        "cws_PolicySetPolicy": cws_PolicySetPolicy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponsePolicySet": cws_PageResponsePolicySet,
+        "cws_PolicySet": cws_PolicySet,
+        "cws_PolicySetPolicy": cws_PolicySetPolicy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     annotations: {
@@ -323,52 +369,62 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponsePolicySet": cws_PageResponsePolicySet_output,
-        "cws_PolicySet": cws_PolicySet_output,
-        "cws_PolicySetPolicy": cws_PolicySetPolicy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponsePolicySet": cws_PageResponsePolicySet,
+        "cws_PolicySet": cws_PolicySet,
+        "cws_PolicySetPolicy": cws_PolicySetPolicy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/policy-sets`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["name", args["name"], false],
-        ["deployment_id", args["deployment_id"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["name", param(args, "query", "name"), false],
+        ["deployment_id", param(args, "query", "deployment_id"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_policy_sets_update",
+    name: "zeroTrust_cws_policySets_update",
     title: "Update a policy set",
-    description: "Replaces the policy set's configuration. Omit tags or use {} to clear them.\n\nThis method is beta.",
+    description: "Replaces the policy set's configuration. Omit tags or use {} to clear them.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/policy-sets/{policy_set_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_UpdatePolicySetInputBody"
         },
-        "policy_set_id": {
-          "description": "ID of the policy set to update",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "policy_set_id": {
+              "description": "ID of the policy set to update",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_set_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_set_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_PolicySetPolicyInput": cws_PolicySetPolicyInput,
         "cws_UpdatePolicySetInputBody": cws_UpdatePolicySetInputBody,
@@ -377,11 +433,11 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponsePolicySet",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PolicySet": cws_PolicySet_output,
-        "cws_PolicySetPolicy": cws_PolicySetPolicy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicySet": cws_ResponsePolicySet_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PolicySet": cws_PolicySet,
+        "cws_PolicySetPolicy": cws_PolicySetPolicy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicySet": cws_ResponsePolicySet,
       },
     },
     annotations: {
@@ -409,12 +465,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PolicySet": cws_PolicySet_output,
-        "cws_PolicySetPolicy": cws_PolicySetPolicy_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponsePolicySet": cws_ResponsePolicySet_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PolicySet": cws_PolicySet,
+        "cws_PolicySetPolicy": cws_PolicySetPolicy,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponsePolicySet": cws_ResponsePolicySet,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/regoMetadata/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/regoMetadata/outputs.ts
index 7c8e62dff..6847a67d7 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/regoMetadata/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/regoMetadata/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_JSONDocument` in responses.
  */
-export const cws_JSONDocument_output: JsonSchema = {
+export const cws_JSONDocument: JsonSchema = {
   "anyOf": [
     {
       "additionalProperties": {
@@ -35,7 +35,7 @@ export const cws_JSONDocument_output: JsonSchema = {
 /**
  * The schema of `cws_JSONValue` in responses.
  */
-export const cws_JSONValue_output: JsonSchema = {
+export const cws_JSONValue: JsonSchema = {
   "anyOf": [
     {
       "additionalProperties": {
@@ -67,7 +67,7 @@ export const cws_JSONValue_output: JsonSchema = {
 /**
  * The schema of `cws_PageResponseRegoMetadata` in responses.
  */
-export const cws_PageResponseRegoMetadata_output: JsonSchema = {
+export const cws_PageResponseRegoMetadata: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -128,7 +128,7 @@ export const cws_PageResponseRegoMetadata_output: JsonSchema = {
 /**
  * The schema of `cws_RegoMetadata` in responses.
  */
-export const cws_RegoMetadata_output: JsonSchema = {
+export const cws_RegoMetadata: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -166,7 +166,7 @@ export const cws_RegoMetadata_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseRegoMetadata` in responses.
  */
-export const cws_ResponseRegoMetadata_output: JsonSchema = {
+export const cws_ResponseRegoMetadata: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/regoMetadata/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/regoMetadata/tools.ts
index 6d9701d0e..b0d440f34 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/regoMetadata/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/regoMetadata/tools.ts
@@ -1,66 +1,76 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
-import {
-  cws_JSONDocument_output,
-  cws_JSONValue_output,
-  cws_PageResponseRegoMetadata_output,
-  cws_RegoMetadata_output,
-  cws_ResponseRegoMetadata_output,
-} from "./outputs.js";
 import {
   cws_JSONDocument,
   cws_JSONValue,
+  cws_PageResponseRegoMetadata,
+  cws_RegoMetadata,
+  cws_ResponseRegoMetadata,
+} from "./outputs.js";
+import {
+  cws_JSONDocument as cws_JSONDocument$,
+  cws_JSONValue as cws_JSONValue$,
   cws_RegoMetadataBody,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.rego_metadata`.
+ * The tools of `zeroTrust.cws.regoMetadata`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_rego_metadata_create",
+    name: "zeroTrust_cws_regoMetadata_create",
     title: "Create a new rego metadata document",
-    description: "Creates a JSON document that Rego can access through its import path.\n\nThis method is beta.",
+    description: "Creates a JSON document that Rego can access through its import path.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/rego-metadata",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_RegoMetadataBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cws_JSONDocument": cws_JSONDocument,
-        "cws_JSONValue": cws_JSONValue,
+        "cws_JSONDocument": cws_JSONDocument$,
+        "cws_JSONValue": cws_JSONValue$,
         "cws_RegoMetadataBody": cws_RegoMetadataBody,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseRegoMetadata",
       $defs: {
-        "cws_JSONDocument": cws_JSONDocument_output,
-        "cws_JSONValue": cws_JSONValue_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoMetadata": cws_RegoMetadata_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata_output,
+        "cws_JSONDocument": cws_JSONDocument,
+        "cws_JSONValue": cws_JSONValue,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoMetadata": cws_RegoMetadata,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata,
       },
     },
     annotations: {
@@ -88,13 +98,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_JSONDocument": cws_JSONDocument_output,
-        "cws_JSONValue": cws_JSONValue_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoMetadata": cws_RegoMetadata_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_JSONDocument": cws_JSONDocument,
+        "cws_JSONValue": cws_JSONValue,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoMetadata": cws_RegoMetadata,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata,
       },
     },
     request: (args) => ({
@@ -103,34 +113,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_rego_metadata_delete",
+    name: "zeroTrust_cws_regoMetadata_delete",
     title: "Delete a rego metadata document",
-    description: "Deletes the specified Rego metadata document.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this Rego metadata document?",
+    description: "Deletes the specified Rego metadata document.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this Rego metadata document?\n\nDELETE /accounts/{account_id}/cws/rego-metadata/{rego_metadata_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "rego_metadata_id": {
-          "description": "ID of the rego metadata document to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "rego_metadata_id": {
+              "description": "ID of the rego metadata document to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rego_metadata_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rego_metadata_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -158,11 +178,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -170,36 +190,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_rego_metadata_get",
+    name: "zeroTrust_cws_regoMetadata_get",
     title: "Get a rego metadata document by ID",
-    description: "Returns the Rego metadata document with the specified ID.\n\nThis method is beta.",
+    description: "Returns the Rego metadata document with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/rego-metadata/{rego_metadata_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "rego_metadata_id": {
-          "description": "ID of the rego metadata document to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "rego_metadata_id": {
+              "description": "ID of the rego metadata document to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rego_metadata_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rego_metadata_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseRegoMetadata",
       $defs: {
-        "cws_JSONDocument": cws_JSONDocument_output,
-        "cws_JSONValue": cws_JSONValue_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoMetadata": cws_RegoMetadata_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata_output,
+        "cws_JSONDocument": cws_JSONDocument,
+        "cws_JSONValue": cws_JSONValue,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoMetadata": cws_RegoMetadata,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata,
       },
     },
     annotations: {
@@ -227,13 +257,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_JSONDocument": cws_JSONDocument_output,
-        "cws_JSONValue": cws_JSONValue_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoMetadata": cws_RegoMetadata_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_JSONDocument": cws_JSONDocument,
+        "cws_JSONValue": cws_JSONValue,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoMetadata": cws_RegoMetadata,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata,
       },
     },
     request: (args) => ({
@@ -241,67 +271,83 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_rego_metadata_list",
+    name: "zeroTrust_cws_regoMetadata_list",
     title: "List Rego metadata documents",
-    description: "Returns a paginated list of Rego metadata documents in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of Rego metadata documents in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/rego-metadata",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "import_path": {
-          "description": "Filter by import path (case-sensitive literal substring match)",
-          "type": "string"
-        },
-        "name": {
-          "description": "Filter by rego metadata name (case-insensitive substring match)",
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "import_path": {
+              "description": "Filter by import path (case-sensitive literal substring match)",
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by rego metadata name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseRegoMetadata",
       $defs: {
-        "cws_JSONDocument": cws_JSONDocument_output,
-        "cws_JSONValue": cws_JSONValue_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseRegoMetadata": cws_PageResponseRegoMetadata_output,
-        "cws_RegoMetadata": cws_RegoMetadata_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_JSONDocument": cws_JSONDocument,
+        "cws_JSONValue": cws_JSONValue,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseRegoMetadata": cws_PageResponseRegoMetadata,
+        "cws_RegoMetadata": cws_RegoMetadata,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     annotations: {
@@ -329,68 +375,78 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_JSONDocument": cws_JSONDocument_output,
-        "cws_JSONValue": cws_JSONValue_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseRegoMetadata": cws_PageResponseRegoMetadata_output,
-        "cws_RegoMetadata": cws_RegoMetadata_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_JSONDocument": cws_JSONDocument,
+        "cws_JSONValue": cws_JSONValue,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseRegoMetadata": cws_PageResponseRegoMetadata,
+        "cws_RegoMetadata": cws_RegoMetadata,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/rego-metadata`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["name", args["name"], false],
-        ["import_path", args["import_path"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["name", param(args, "query", "name"), false],
+        ["import_path", param(args, "query", "import_path"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_rego_metadata_update",
+    name: "zeroTrust_cws_regoMetadata_update",
     title: "Update a rego metadata document",
-    description: "Replaces the metadata document's name, import path, and JSON data.\n\nThis method is beta.",
+    description: "Replaces the metadata document's name, import path, and JSON data.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/rego-metadata/{rego_metadata_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_RegoMetadataBody"
         },
-        "rego_metadata_id": {
-          "description": "ID of the rego metadata document to update",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "rego_metadata_id": {
+              "description": "ID of the rego metadata document to update",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rego_metadata_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rego_metadata_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cws_JSONDocument": cws_JSONDocument,
-        "cws_JSONValue": cws_JSONValue,
+        "cws_JSONDocument": cws_JSONDocument$,
+        "cws_JSONValue": cws_JSONValue$,
         "cws_RegoMetadataBody": cws_RegoMetadataBody,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseRegoMetadata",
       $defs: {
-        "cws_JSONDocument": cws_JSONDocument_output,
-        "cws_JSONValue": cws_JSONValue_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoMetadata": cws_RegoMetadata_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata_output,
+        "cws_JSONDocument": cws_JSONDocument,
+        "cws_JSONValue": cws_JSONValue,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoMetadata": cws_RegoMetadata,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata,
       },
     },
     annotations: {
@@ -418,13 +474,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_JSONDocument": cws_JSONDocument_output,
-        "cws_JSONValue": cws_JSONValue_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoMetadata": cws_RegoMetadata_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_JSONDocument": cws_JSONDocument,
+        "cws_JSONValue": cws_JSONValue,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoMetadata": cws_RegoMetadata,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoMetadata": cws_ResponseRegoMetadata,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/regoModules/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/regoModules/outputs.ts
index d2ab4bf55..08f202b5d 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/regoModules/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/regoModules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_PageResponseRegoModule` in responses.
  */
-export const cws_PageResponseRegoModule_output: JsonSchema = {
+export const cws_PageResponseRegoModule: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -67,7 +67,7 @@ export const cws_PageResponseRegoModule_output: JsonSchema = {
 /**
  * The schema of `cws_RegoModule` in responses.
  */
-export const cws_RegoModule_output: JsonSchema = {
+export const cws_RegoModule: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -105,7 +105,7 @@ export const cws_RegoModule_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseRegoModule` in responses.
  */
-export const cws_ResponseRegoModule_output: JsonSchema = {
+export const cws_ResponseRegoModule: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/regoModules/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/regoModules/tools.ts
index 6b0d7cf6e..c5f1ddbd8 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/regoModules/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/regoModules/tools.ts
@@ -1,19 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
 import {
-  cws_PageResponseRegoModule_output,
-  cws_RegoModule_output,
-  cws_ResponseRegoModule_output,
+  cws_PageResponseRegoModule,
+  cws_RegoModule,
+  cws_ResponseRegoModule,
 } from "./outputs.js";
 import {
   cws_CreateRegoModuleInputBody,
@@ -21,28 +21,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.rego_modules`.
+ * The tools of `zeroTrust.cws.regoModules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_rego_modules_create",
+    name: "zeroTrust_cws_regoModules_create",
     title: "Create a new Rego module",
-    description: "Creates a library Rego module and derives its package path from the source.\n\nThis method is beta.",
+    description: "Creates a library Rego module and derives its package path from the source.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/rego-modules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreateRegoModuleInputBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreateRegoModuleInputBody": cws_CreateRegoModuleInputBody,
       },
@@ -50,10 +60,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseRegoModule",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoModule": cws_RegoModule_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoModule": cws_ResponseRegoModule_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoModule": cws_RegoModule,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoModule": cws_ResponseRegoModule,
       },
     },
     annotations: {
@@ -84,11 +94,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoModule": cws_RegoModule_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoModule": cws_ResponseRegoModule_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoModule": cws_RegoModule,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoModule": cws_ResponseRegoModule,
       },
     },
     request: (args) => ({
@@ -97,34 +107,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_rego_modules_delete",
+    name: "zeroTrust_cws_regoModules_delete",
     title: "Delete a Rego module",
-    description: "Deletes the module if no policy or library references its rules.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this Rego module?",
+    description: "Deletes the module if no policy or library references its rules.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this Rego module?\n\nDELETE /accounts/{account_id}/cws/rego-modules/{rego_module_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "rego_module_id": {
-          "description": "ID of the Rego module to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "rego_module_id": {
+              "description": "ID of the Rego module to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rego_module_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rego_module_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -152,11 +172,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -164,34 +184,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_rego_modules_get",
+    name: "zeroTrust_cws_regoModules_get",
     title: "Get a Rego module by ID",
-    description: "Returns the library Rego module with the specified ID.\n\nThis method is beta.",
+    description: "Returns the library Rego module with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/rego-modules/{rego_module_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "rego_module_id": {
-          "description": "ID of the Rego module to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "rego_module_id": {
+              "description": "ID of the Rego module to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rego_module_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rego_module_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseRegoModule",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoModule": cws_RegoModule_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoModule": cws_ResponseRegoModule_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoModule": cws_RegoModule,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoModule": cws_ResponseRegoModule,
       },
     },
     annotations: {
@@ -219,11 +249,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoModule": cws_RegoModule_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoModule": cws_ResponseRegoModule_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoModule": cws_RegoModule,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoModule": cws_ResponseRegoModule,
       },
     },
     request: (args) => ({
@@ -231,65 +261,81 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_rego_modules_list",
+    name: "zeroTrust_cws_regoModules_list",
     title: "List Rego modules",
-    description: "Returns a paginated list of library Rego modules in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of library Rego modules in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/rego-modules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Filter by Rego module name (case-insensitive substring match)",
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "package_path": {
-          "description": "Filter by package path (case-sensitive literal substring match)",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by Rego module name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "package_path": {
+              "description": "Filter by package path (case-sensitive literal substring match)",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseRegoModule",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseRegoModule": cws_PageResponseRegoModule_output,
-        "cws_RegoModule": cws_RegoModule_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseRegoModule": cws_PageResponseRegoModule,
+        "cws_RegoModule": cws_RegoModule,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     annotations: {
@@ -317,51 +363,61 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseRegoModule": cws_PageResponseRegoModule_output,
-        "cws_RegoModule": cws_RegoModule_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseRegoModule": cws_PageResponseRegoModule,
+        "cws_RegoModule": cws_RegoModule,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/rego-modules`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["name", args["name"], false],
-        ["package_path", args["package_path"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["name", param(args, "query", "name"), false],
+        ["package_path", param(args, "query", "package_path"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_rego_modules_update",
+    name: "zeroTrust_cws_regoModules_update",
     title: "Update a Rego module",
-    description: "Replaces the module and validates policies and libraries that depend on it.\n\nThis method is beta.",
+    description: "Replaces the module and validates policies and libraries that depend on it.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/rego-modules/{rego_module_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_UpdateRegoModuleInputBody"
         },
-        "rego_module_id": {
-          "description": "ID of the Rego module to update",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "rego_module_id": {
+              "description": "ID of the Rego module to update",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rego_module_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rego_module_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_UpdateRegoModuleInputBody": cws_UpdateRegoModuleInputBody,
       },
@@ -369,10 +425,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseRegoModule",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoModule": cws_RegoModule_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoModule": cws_ResponseRegoModule_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoModule": cws_RegoModule,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoModule": cws_ResponseRegoModule,
       },
     },
     annotations: {
@@ -403,11 +459,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_RegoModule": cws_RegoModule_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseRegoModule": cws_ResponseRegoModule_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_RegoModule": cws_RegoModule,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseRegoModule": cws_ResponseRegoModule,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/nodes/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/nodes/outputs.ts
index 1fe2146c0..85ef02824 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/nodes/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/nodes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `cws_PageResponseTenantStructureNode` in responses.
  */
-export const cws_PageResponseTenantStructureNode_output: JsonSchema = {
+export const cws_PageResponseTenantStructureNode: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -67,7 +67,7 @@ export const cws_PageResponseTenantStructureNode_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseTenantNodeBatchResult` in responses.
  */
-export const cws_ResponseTenantNodeBatchResult_output: JsonSchema = {
+export const cws_ResponseTenantNodeBatchResult: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -114,7 +114,7 @@ export const cws_ResponseTenantNodeBatchResult_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseTenantStructureNode` in responses.
  */
-export const cws_ResponseTenantStructureNode_output: JsonSchema = {
+export const cws_ResponseTenantStructureNode: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -161,7 +161,7 @@ export const cws_ResponseTenantStructureNode_output: JsonSchema = {
 /**
  * The schema of `cws_TenantNodeBatchResult` in responses.
  */
-export const cws_TenantNodeBatchResult_output: JsonSchema = {
+export const cws_TenantNodeBatchResult: JsonSchema = {
   "properties": {
     "created": {
       "items": {
@@ -193,7 +193,7 @@ export const cws_TenantNodeBatchResult_output: JsonSchema = {
 /**
  * The schema of `cws_TenantStructureNode` in responses.
  */
-export const cws_TenantStructureNode_output: JsonSchema = {
+export const cws_TenantStructureNode: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/nodes/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/nodes/tools.ts
index 6a00a705a..c1010da82 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/nodes/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/nodes/tools.ts
@@ -1,21 +1,21 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../../outputs.js";
 import {
-  cws_PageResponseTenantStructureNode_output,
-  cws_ResponseTenantNodeBatchResult_output,
-  cws_ResponseTenantStructureNode_output,
-  cws_TenantNodeBatchResult_output,
-  cws_TenantStructureNode_output,
+  cws_PageResponseTenantStructureNode,
+  cws_ResponseTenantNodeBatchResult,
+  cws_ResponseTenantStructureNode,
+  cws_TenantNodeBatchResult,
+  cws_TenantStructureNode,
 } from "./outputs.js";
 import {
   cws_BatchTenantNodesInputBody,
@@ -25,34 +25,44 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.tenant_structures.nodes`.
+ * The tools of `zeroTrust.cws.tenantStructures.nodes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_tenant_structures_nodes_batch",
+    name: "zeroTrust_cws_tenantStructures_nodes_batch",
     title: "Apply a batch of tenant node mutations",
-    description: "Atomically validates and applies 1 to 500 unordered node operations. Creates may reference new parents but cannot reuse a native_id deleted in the same batch. Maximum body size: 1 MiB.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Apply this tenant node batch?",
+    description: "Atomically validates and applies 1 to 500 unordered node operations. Creates may reference new parents but cannot reuse a native_id deleted in the same batch. Maximum body size: 1 MiB.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Apply this tenant node batch?\n\nPOST /accounts/{account_id}/cws/tenant-structures/{structure_id}/nodes/batch",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_BatchTenantNodesInputBody"
         },
-        "structure_id": {
-          "description": "ID of the parent tenant structure",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the parent tenant structure",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_BatchTenantNodesInputBody": cws_BatchTenantNodesInputBody,
         "cws_TenantNodeBatchDelete": cws_TenantNodeBatchDelete,
@@ -63,12 +73,12 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseTenantNodeBatchResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantNodeBatchResult": cws_ResponseTenantNodeBatchResult_output,
-        "cws_TenantNodeBatchResult": cws_TenantNodeBatchResult_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantNodeBatchResult": cws_ResponseTenantNodeBatchResult,
+        "cws_TenantNodeBatchResult": cws_TenantNodeBatchResult,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     annotations: {
@@ -99,13 +109,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantNodeBatchResult": cws_ResponseTenantNodeBatchResult_output,
-        "cws_TenantNodeBatchResult": cws_TenantNodeBatchResult_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantNodeBatchResult": cws_ResponseTenantNodeBatchResult,
+        "cws_TenantNodeBatchResult": cws_TenantNodeBatchResult,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     request: (args) => ({
@@ -114,30 +124,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_nodes_create",
+    name: "zeroTrust_cws_tenantStructures_nodes_create",
     title: "Add a node to a tenant structure",
-    description: "Adds a validated cloud-native node to the tenant hierarchy.\n\nThis method is beta.",
+    description: "Adds a validated cloud-native node to the tenant hierarchy.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/tenant-structures/{structure_id}/nodes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_TenantNodeBody"
         },
-        "structure_id": {
-          "description": "ID of the parent tenant structure",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the parent tenant structure",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_TenantNodeBody": cws_TenantNodeBody,
       },
@@ -145,10 +165,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseTenantStructureNode",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     annotations: {
@@ -176,11 +196,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     request: (args) => ({
@@ -189,40 +209,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_nodes_delete",
+    name: "zeroTrust_cws_tenantStructures_nodes_delete",
     title: "Delete a tenant node",
-    description: "Deletes a childless node from the tenant hierarchy.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this tenant node?",
+    description: "Deletes a childless node from the tenant hierarchy.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this tenant node?\n\nDELETE /accounts/{account_id}/cws/tenant-structures/{structure_id}/nodes/{node_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "node_id": {
-          "description": "ID of the node to delete",
-          "format": "uuid",
-          "type": "string"
-        },
-        "structure_id": {
-          "description": "ID of the parent tenant structure",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "node_id": {
+              "description": "ID of the node to delete",
+              "format": "uuid",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the parent tenant structure",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id",
+            "node_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id",
-        "node_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -250,11 +280,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -262,40 +292,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_nodes_get",
+    name: "zeroTrust_cws_tenantStructures_nodes_get",
     title: "Get a tenant node by ID",
-    description: "Returns the tenant node with the specified ID.\n\nThis method is beta.",
+    description: "Returns the tenant node with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/tenant-structures/{structure_id}/nodes/{node_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "node_id": {
-          "description": "ID of the node to retrieve",
-          "format": "uuid",
-          "type": "string"
-        },
-        "structure_id": {
-          "description": "ID of the parent tenant structure",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "node_id": {
+              "description": "ID of the node to retrieve",
+              "format": "uuid",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the parent tenant structure",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id",
+            "node_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id",
-        "node_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseTenantStructureNode",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     annotations: {
@@ -323,11 +363,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     request: (args) => ({
@@ -335,79 +375,95 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_nodes_list",
+    name: "zeroTrust_cws_tenantStructures_nodes_list",
     title: "List nodes for a tenant structure",
-    description: "Returns a paginated list of nodes in the tenant structure.\n\nThis method is beta.",
+    description: "Returns a paginated list of nodes in the tenant structure.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/tenant-structures/{structure_id}/nodes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the parent tenant structure",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id"
           ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Filter by node name (case-insensitive substring match)",
-          "type": "string"
-        },
-        "native_id": {
-          "description": "Filter by exact cloud-native identifier",
-          "type": "string"
-        },
-        "node_kind": {
-          "description": "Filter by exact node kind",
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
-        },
-        "parent": {
-          "description": "Filter by exact parent native ID",
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
-        },
-        "structure_id": {
-          "description": "ID of the parent tenant structure",
-          "format": "uuid",
-          "type": "string"
+          "type": "object"
+        },
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by node name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "native_id": {
+              "description": "Filter by exact cloud-native identifier",
+              "type": "string"
+            },
+            "node_kind": {
+              "description": "Filter by exact node kind",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "parent": {
+              "description": "Filter by exact parent native ID",
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseTenantStructureNode",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseTenantStructureNode": cws_PageResponseTenantStructureNode_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseTenantStructureNode": cws_PageResponseTenantStructureNode,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     annotations: {
@@ -435,59 +491,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseTenantStructureNode": cws_PageResponseTenantStructureNode_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseTenantStructureNode": cws_PageResponseTenantStructureNode,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/tenant-structures/${pathParam(args, "structure_id")}/nodes`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["node_kind", args["node_kind"], false],
-        ["native_id", args["native_id"], false],
-        ["name", args["name"], false],
-        ["parent", args["parent"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["node_kind", param(args, "query", "node_kind"), false],
+        ["native_id", param(args, "query", "native_id"), false],
+        ["name", param(args, "query", "name"), false],
+        ["parent", param(args, "query", "parent"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_nodes_update",
+    name: "zeroTrust_cws_tenantStructures_nodes_update",
     title: "Update a tenant node",
-    description: "Updates the node's display name or parent while preserving its immutable identity fields.\n\nThis method is beta.",
+    description: "Updates the node's display name or parent while preserving its immutable identity fields.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/tenant-structures/{structure_id}/nodes/{node_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_TenantNodeBody"
         },
-        "node_id": {
-          "description": "ID of the node to update",
-          "format": "uuid",
-          "type": "string"
-        },
-        "structure_id": {
-          "description": "ID of the parent tenant structure",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "node_id": {
+              "description": "ID of the node to update",
+              "format": "uuid",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the parent tenant structure",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id",
+            "node_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id",
-        "node_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_TenantNodeBody": cws_TenantNodeBody,
       },
@@ -495,10 +561,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseTenantStructureNode",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     annotations: {
@@ -526,11 +592,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode_output,
-        "cws_TenantStructureNode": cws_TenantStructureNode_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructureNode": cws_ResponseTenantStructureNode,
+        "cws_TenantStructureNode": cws_TenantStructureNode,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/outputs.ts
index af00ae435..9276f03df 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_PageResponseTenantStructure` in responses.
  */
-export const cws_PageResponseTenantStructure_output: JsonSchema = {
+export const cws_PageResponseTenantStructure: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -67,7 +67,7 @@ export const cws_PageResponseTenantStructure_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseTenantStructure` in responses.
  */
-export const cws_ResponseTenantStructure_output: JsonSchema = {
+export const cws_ResponseTenantStructure: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -114,7 +114,7 @@ export const cws_ResponseTenantStructure_output: JsonSchema = {
 /**
  * The schema of `cws_TenantStructure` in responses.
  */
-export const cws_TenantStructure_output: JsonSchema = {
+export const cws_TenantStructure: JsonSchema = {
   "properties": {
     "application": {
       "enum": [
diff --git a/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/tools.ts
index 271c2c548..43dcae826 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/tenantStructures/tools.ts
@@ -1,19 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
 import {
-  cws_PageResponseTenantStructure_output,
-  cws_ResponseTenantStructure_output,
-  cws_TenantStructure_output,
+  cws_PageResponseTenantStructure,
+  cws_ResponseTenantStructure,
+  cws_TenantStructure,
 } from "./outputs.js";
 import {
   cws_CreateTenantStructureInputBody,
@@ -21,28 +21,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.tenant_structures`.
+ * The tools of `zeroTrust.cws.tenantStructures`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_tenant_structures_create",
+    name: "zeroTrust_cws_tenantStructures_create",
     title: "Create a tenant structure",
-    description: "Creates an empty tenant hierarchy for the selected cloud application.\n\nThis method is beta.",
+    description: "Creates an empty tenant hierarchy for the selected cloud application.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/tenant-structures",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreateTenantStructureInputBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreateTenantStructureInputBody": cws_CreateTenantStructureInputBody,
       },
@@ -50,10 +60,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseTenantStructure",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructure": cws_ResponseTenantStructure_output,
-        "cws_TenantStructure": cws_TenantStructure_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructure": cws_ResponseTenantStructure,
+        "cws_TenantStructure": cws_TenantStructure,
       },
     },
     annotations: {
@@ -81,11 +91,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructure": cws_ResponseTenantStructure_output,
-        "cws_TenantStructure": cws_TenantStructure_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructure": cws_ResponseTenantStructure,
+        "cws_TenantStructure": cws_TenantStructure,
       },
     },
     request: (args) => ({
@@ -94,34 +104,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_delete",
+    name: "zeroTrust_cws_tenantStructures_delete",
     title: "Delete a tenant structure",
-    description: "Deletes the tenant structure and all nodes in its hierarchy.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this tenant structure?",
+    description: "Deletes the tenant structure and all nodes in its hierarchy.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this tenant structure?\n\nDELETE /accounts/{account_id}/cws/tenant-structures/{structure_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "structure_id": {
-          "description": "ID of the tenant structure to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the tenant structure to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -149,11 +169,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -161,34 +181,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_get",
+    name: "zeroTrust_cws_tenantStructures_get",
     title: "Get a tenant structure by ID",
-    description: "Returns the tenant structure with the specified ID.\n\nThis method is beta.",
+    description: "Returns the tenant structure with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/tenant-structures/{structure_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "structure_id": {
-          "description": "ID of the tenant structure to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the tenant structure to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseTenantStructure",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructure": cws_ResponseTenantStructure_output,
-        "cws_TenantStructure": cws_TenantStructure_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructure": cws_ResponseTenantStructure,
+        "cws_TenantStructure": cws_TenantStructure,
       },
     },
     annotations: {
@@ -216,11 +246,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructure": cws_ResponseTenantStructure_output,
-        "cws_TenantStructure": cws_TenantStructure_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructure": cws_ResponseTenantStructure,
+        "cws_TenantStructure": cws_TenantStructure,
       },
     },
     request: (args) => ({
@@ -228,65 +258,81 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_list",
+    name: "zeroTrust_cws_tenantStructures_list",
     title: "List tenant structures for an account",
-    description: "Returns a paginated list of tenant structures in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of tenant structures in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/tenant-structures",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "import_path": {
-          "description": "Filter by import path (case-sensitive literal substring match)",
-          "type": "string"
+          "type": "object"
         },
-        "name": {
-          "description": "Filter by tenant structure name (case-insensitive substring match)",
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
-          ],
-          "type": "string"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "import_path": {
+              "description": "Filter by import path (case-sensitive literal substring match)",
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by tenant structure name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseTenantStructure",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseTenantStructure": cws_PageResponseTenantStructure_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
-        "cws_TenantStructure": cws_TenantStructure_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseTenantStructure": cws_PageResponseTenantStructure,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
+        "cws_TenantStructure": cws_TenantStructure,
       },
     },
     annotations: {
@@ -314,51 +360,61 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseTenantStructure": cws_PageResponseTenantStructure_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
-        "cws_TenantStructure": cws_TenantStructure_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseTenantStructure": cws_PageResponseTenantStructure,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
+        "cws_TenantStructure": cws_TenantStructure,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/tenant-structures`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["name", args["name"], false],
-        ["import_path", args["import_path"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["name", param(args, "query", "name"), false],
+        ["import_path", param(args, "query", "import_path"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_tenant_structures_update",
+    name: "zeroTrust_cws_tenantStructures_update",
     title: "Update a tenant structure",
-    description: "Updates the tenant structure's name and import path; its application remains immutable.\n\nThis method is beta.",
+    description: "Updates the tenant structure's name and import path; its application remains immutable.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/tenant-structures/{structure_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_UpdateTenantStructureInputBody"
         },
-        "structure_id": {
-          "description": "ID of the tenant structure to update",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "structure_id": {
+              "description": "ID of the tenant structure to update",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "structure_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "structure_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_UpdateTenantStructureInputBody": cws_UpdateTenantStructureInputBody,
       },
@@ -366,10 +422,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseTenantStructure",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructure": cws_ResponseTenantStructure_output,
-        "cws_TenantStructure": cws_TenantStructure_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructure": cws_ResponseTenantStructure,
+        "cws_TenantStructure": cws_TenantStructure,
       },
     },
     annotations: {
@@ -397,11 +453,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseTenantStructure": cws_ResponseTenantStructure_output,
-        "cws_TenantStructure": cws_TenantStructure_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseTenantStructure": cws_ResponseTenantStructure,
+        "cws_TenantStructure": cws_TenantStructure,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/cws/workloads/outputs.ts b/src/generated/forge-mcp/zeroTrust/cws/workloads/outputs.ts
index c6121223c..8ac6829c4 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/workloads/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/workloads/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `cws_PageResponseWorkload` in responses.
  */
-export const cws_PageResponseWorkload_output: JsonSchema = {
+export const cws_PageResponseWorkload: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -67,7 +67,7 @@ export const cws_PageResponseWorkload_output: JsonSchema = {
 /**
  * The schema of `cws_ResponseWorkload` in responses.
  */
-export const cws_ResponseWorkload_output: JsonSchema = {
+export const cws_ResponseWorkload: JsonSchema = {
   "properties": {
     "errors": {
       "oneOf": [
@@ -114,7 +114,7 @@ export const cws_ResponseWorkload_output: JsonSchema = {
 /**
  * The schema of `cws_Workload` in responses.
  */
-export const cws_Workload_output: JsonSchema = {
+export const cws_Workload: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/zeroTrust/cws/workloads/tools.ts b/src/generated/forge-mcp/zeroTrust/cws/workloads/tools.ts
index 43c9edfa0..183ea191b 100644
--- a/src/generated/forge-mcp/zeroTrust/cws/workloads/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/cws/workloads/tools.ts
@@ -1,19 +1,19 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  cws_DeletedResult_output,
-  cws_ErrorResponse_output,
-  cws_MessageSource_output,
-  cws_ResponseDeletedResult_output,
-  cws_ResponseMessage_output,
-  cws_ResultInfo_output,
+  cws_DeletedResult,
+  cws_ErrorResponse,
+  cws_MessageSource,
+  cws_ResponseDeletedResult,
+  cws_ResponseMessage,
+  cws_ResultInfo,
 } from "../outputs.js";
 import {
-  cws_PageResponseWorkload_output,
-  cws_ResponseWorkload_output,
-  cws_Workload_output,
+  cws_PageResponseWorkload,
+  cws_ResponseWorkload,
+  cws_Workload,
 } from "./outputs.js";
 import {
   cws_CreateWorkloadInputBody,
@@ -21,28 +21,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.cws.workloads`.
+ * The tools of `zeroTrust.cws.workloads`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_cws_workloads_create",
+    name: "zeroTrust_cws_workloads_create",
     title: "Create a new workload",
-    description: "Creates a reusable workload selector from a filter expression.\n\nThis method is beta.",
+    description: "Creates a reusable workload selector from a filter expression.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/cws/workloads",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_CreateWorkloadInputBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_CreateWorkloadInputBody": cws_CreateWorkloadInputBody,
       },
@@ -50,10 +60,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseWorkload",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseWorkload": cws_ResponseWorkload_output,
-        "cws_Workload": cws_Workload_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseWorkload": cws_ResponseWorkload,
+        "cws_Workload": cws_Workload,
       },
     },
     annotations: {
@@ -81,11 +91,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseWorkload": cws_ResponseWorkload_output,
-        "cws_Workload": cws_Workload_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseWorkload": cws_ResponseWorkload,
+        "cws_Workload": cws_Workload,
       },
     },
     request: (args) => ({
@@ -94,34 +104,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_workloads_delete",
+    name: "zeroTrust_cws_workloads_delete",
     title: "Delete a workload",
-    description: "Deletes the workload if it is not targeted by a policy set.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this workload?",
+    description: "Deletes the workload if it is not targeted by a policy set.\n\nThis method is beta.\n\nConfirm with the user before calling this tool. Delete this workload?\n\nDELETE /accounts/{account_id}/cws/workloads/{workload_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "workload_id": {
-          "description": "ID of the workload to delete",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "workload_id": {
+              "description": "ID of the workload to delete",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workload_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workload_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseDeletedResult",
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     annotations: {
@@ -149,11 +169,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_DeletedResult": cws_DeletedResult_output,
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseDeletedResult": cws_ResponseDeletedResult_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
+        "cws_DeletedResult": cws_DeletedResult,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseDeletedResult": cws_ResponseDeletedResult,
+        "cws_ResponseMessage": cws_ResponseMessage,
       },
     },
     request: (args) => ({
@@ -161,34 +181,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_workloads_get",
+    name: "zeroTrust_cws_workloads_get",
     title: "Get a workload by ID",
-    description: "Returns the workload with the specified ID.\n\nThis method is beta.",
+    description: "Returns the workload with the specified ID.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/workloads/{workload_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "workload_id": {
-          "description": "ID of the workload to retrieve",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "workload_id": {
+              "description": "ID of the workload to retrieve",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workload_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workload_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseWorkload",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseWorkload": cws_ResponseWorkload_output,
-        "cws_Workload": cws_Workload_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseWorkload": cws_ResponseWorkload,
+        "cws_Workload": cws_Workload,
       },
     },
     annotations: {
@@ -216,11 +246,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseWorkload": cws_ResponseWorkload_output,
-        "cws_Workload": cws_Workload_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseWorkload": cws_ResponseWorkload,
+        "cws_Workload": cws_Workload,
       },
     },
     request: (args) => ({
@@ -228,66 +258,82 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_cws_workloads_list",
+    name: "zeroTrust_cws_workloads_list",
     title: "List workloads",
-    description: "Returns a paginated list of workloads in the account.\n\nThis method is beta.",
+    description: "Returns a paginated list of workloads in the account.\n\nThis method is beta.\n\nGET /accounts/{account_id}/cws/workloads",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Pagination cursor from previous response",
-          "type": "string"
-        },
-        "direction": {
-          "default": "asc",
-          "description": "Sort direction (default: asc)",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "Filter by workload name (case-insensitive substring match)",
-          "type": "string"
-        },
-        "order": {
-          "default": "created_at",
-          "description": "Field to order results by (default: created_at)",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "per_page": {
-          "default": 20,
-          "description": "Number of items per page (1-100, default 20)",
-          "type": "integer"
-        },
-        "policy_set_id": {
-          "description": "Filter to workloads attached to this policy set",
-          "format": "uuid",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Pagination cursor from previous response",
+              "type": "string"
+            },
+            "direction": {
+              "default": "asc",
+              "description": "Sort direction (default: asc)",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "Filter by workload name (case-insensitive substring match)",
+              "type": "string"
+            },
+            "order": {
+              "default": "created_at",
+              "description": "Field to order results by (default: created_at)",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of items per page (1-100, default 20)",
+              "type": "integer"
+            },
+            "policy_set_id": {
+              "description": "Filter to workloads attached to this policy set",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cws_PageResponseWorkload",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseWorkload": cws_PageResponseWorkload_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
-        "cws_Workload": cws_Workload_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseWorkload": cws_PageResponseWorkload,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
+        "cws_Workload": cws_Workload,
       },
     },
     annotations: {
@@ -315,51 +361,61 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_PageResponseWorkload": cws_PageResponseWorkload_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResultInfo": cws_ResultInfo_output,
-        "cws_Workload": cws_Workload_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_PageResponseWorkload": cws_PageResponseWorkload,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResultInfo": cws_ResultInfo,
+        "cws_Workload": cws_Workload,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/cws/workloads`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["per_page", args["per_page"], false],
-        ["order", args["order"], false],
-        ["direction", args["direction"], false],
-        ["name", args["name"], false],
-        ["policy_set_id", args["policy_set_id"], false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["order", param(args, "query", "order"), false],
+        ["direction", param(args, "query", "direction"), false],
+        ["name", param(args, "query", "name"), false],
+        ["policy_set_id", param(args, "query", "policy_set_id"), false],
       ],
     }),
   },
   {
-    name: "zero_trust_cws_workloads_update",
+    name: "zeroTrust_cws_workloads_update",
     title: "Update a workload",
-    description: "Replaces the workload's configuration. Omit tags or use {} to clear them.\n\nThis method is beta.",
+    description: "Replaces the workload's configuration. Omit tags or use {} to clear them.\n\nThis method is beta.\n\nPUT /accounts/{account_id}/cws/workloads/{workload_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Cloudflare account ID (32-character hexadecimal string)",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/cws_UpdateWorkloadInputBody"
         },
-        "workload_id": {
-          "description": "ID of the workload to update",
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Cloudflare account ID (32-character hexadecimal string)",
+              "type": "string"
+            },
+            "workload_id": {
+              "description": "ID of the workload to update",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "workload_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "workload_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "cws_UpdateWorkloadInputBody": cws_UpdateWorkloadInputBody,
       },
@@ -367,10 +423,10 @@ export const tools: readonly Tool[] = [
     outputSchema: {
       "$ref": "#/$defs/cws_ResponseWorkload",
       $defs: {
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseWorkload": cws_ResponseWorkload_output,
-        "cws_Workload": cws_Workload_output,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseWorkload": cws_ResponseWorkload,
+        "cws_Workload": cws_Workload,
       },
     },
     annotations: {
@@ -398,11 +454,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cws_ErrorResponse": cws_ErrorResponse_output,
-        "cws_MessageSource": cws_MessageSource_output,
-        "cws_ResponseMessage": cws_ResponseMessage_output,
-        "cws_ResponseWorkload": cws_ResponseWorkload_output,
-        "cws_Workload": cws_Workload_output,
+        "cws_ErrorResponse": cws_ErrorResponse,
+        "cws_MessageSource": cws_MessageSource,
+        "cws_ResponseMessage": cws_ResponseMessage,
+        "cws_ResponseWorkload": cws_ResponseWorkload,
+        "cws_Workload": cws_Workload,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/clientVersions/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/clientVersions/outputs.ts
index 06fe22a5c..b2807ef69 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/clientVersions/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/clientVersions/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_client_version` in responses.
  */
-export const teams_devices_client_version_output: JsonSchema = {
+export const teams$$devices_client_version: JsonSchema = {
   "properties": {
     "package_size": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/clientVersions/targetEnvironments/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/clientVersions/targetEnvironments/outputs.ts
index 4363f79a3..536451482 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/clientVersions/targetEnvironments/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/clientVersions/targetEnvironments/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `teams-devices_target_environment_info` in responses.
  */
-export const teams_devices_target_environment_info_output: JsonSchema = {
+export const teams$$devices_target_environment_info: JsonSchema = {
   "properties": {
     "display_name": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/clientVersions/targetEnvironments/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/clientVersions/targetEnvironments/tools.ts
index 50f9364a9..ec5309176 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/clientVersions/targetEnvironments/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/clientVersions/targetEnvironments/tools.ts
@@ -3,29 +3,39 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  teams_devices_v4_error_response_output,
-  teams_devices_v4_response_message_output,
+  teams$$devices_v4_error_response,
+  teams$$devices_v4_response_message,
 } from "../../outputs.js";
-import { teams_devices_target_environment_info_output } from "./outputs.js";
+import { teams$$devices_target_environment_info } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.devices.client_versions.target_environments`.
+ * The tools of `zeroTrust.devices.clientVersions.targetEnvironments`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_client_versions_target_environments_list",
+    name: "zeroTrust_devices_clientVersions_targetEnvironments_list",
     title: "List available target environments",
-    description: "Retrieves a list of all available target environments with their display names. This endpoint is in Beta.\n\nThis method is beta.",
+    description: "Retrieves a list of all available target environments with their display names. This endpoint is in Beta.\n\nThis method is beta.\n\nGET /accounts/{account_id}/devices/client-versions/target-environments",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -59,8 +69,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_target_environment_info": teams_devices_target_environment_info_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_target_environment_info": teams$$devices_target_environment_info,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -111,9 +121,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_target_environment_info": teams_devices_target_environment_info_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_target_environment_info": teams$$devices_target_environment_info,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/clientVersions/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/clientVersions/tools.ts
index 77279981c..b042c4813 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/clientVersions/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/clientVersions/tools.ts
@@ -1,56 +1,75 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  teams_devices_pagination_info_output,
-  teams_devices_v4_error_response_output,
-  teams_devices_v4_response_message_output,
+  teams$$devices_pagination_info,
+  teams$$devices_v4_error_response,
+  teams$$devices_v4_response_message,
 } from "../outputs.js";
-import { teams_devices_client_version_output } from "./outputs.js";
+import { teams$$devices_client_version } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.devices.client_versions`.
+ * The tools of `zeroTrust.devices.clientVersions`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_client_versions_list",
+    name: "zeroTrust_devices_clientVersions_list",
     title: "List client versions",
-    description: "Lists available WARP client versions for a specific target environment and release track. This endpoint is in Beta.\n\nThis method is beta.",
+    description: "Lists available WARP client versions for a specific target environment and release track. This endpoint is in Beta.\n\nThis method is beta.\n\nGET /accounts/{account_id}/devices/client-versions",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "The page number to return.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "The maximum number of versions to return per page.",
-          "type": "integer"
-        },
-        "release_track": {
-          "description": "The release track (ga for General Availability, beta for Beta releases).",
-          "enum": [
-            "ga",
-            "beta"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "target_environment": {
-          "description": "The target environment for the client version (e.g., windows, macos).",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "The page number to return.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "The maximum number of versions to return per page.",
+              "type": "integer"
+            },
+            "release_track": {
+              "description": "The release track (ga for General Availability, beta for Beta releases).",
+              "enum": [
+                "ga",
+                "beta"
+              ],
+              "type": "string"
+            },
+            "target_environment": {
+              "description": "The target environment for the client version (e.g., windows, macos).",
+              "type": "string"
+            }
+          },
+          "required": [
+            "target_environment",
+            "release_track"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "target_environment",
-        "release_track"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -88,9 +107,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_client_version": teams_devices_client_version_output,
-        "teams-devices_pagination_info": teams_devices_pagination_info_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_client_version": teams$$devices_client_version,
+        "teams-devices_pagination_info": teams$$devices_pagination_info,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -145,19 +164,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_client_version": teams_devices_client_version_output,
-        "teams-devices_pagination_info": teams_devices_pagination_info_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_client_version": teams$$devices_client_version,
+        "teams-devices_pagination_info": teams$$devices_pagination_info,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/client-versions`,
       query: [
-        ["target_environment", args["target_environment"], true],
-        ["release_track", args["release_track"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["target_environment", param(args, "query", "target_environment"), true],
+        ["release_track", param(args, "query", "release_track"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/outputs.ts
index 4e4205274..bb1c0648e 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/outputs.ts
@@ -6,22 +6,22 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_deployment_group` in responses.
  */
-export const teams_devices_deployment_group_output: JsonSchema = {
+export const teams$$devices_deployment_group: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/teams-devices_deployment_group_created_at"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/teams-devices_deployment_group_id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/teams-devices_deployment_group_name"
+      "type": "string"
     },
     "policy_ids": {
       "$ref": "#/$defs/teams-devices_deployment_group_policy_ids"
     },
     "updated_at": {
-      "$ref": "#/$defs/teams-devices_deployment_group_updated_at"
+      "type": "string"
     },
     "version_config": {
       "items": {
@@ -40,31 +40,10 @@ export const teams_devices_deployment_group_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_deployment_group_created_at` in responses.
- */
-export const teams_devices_deployment_group_created_at_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_deployment_group_id` in responses.
- */
-export const teams_devices_deployment_group_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_deployment_group_name` in responses.
- */
-export const teams_devices_deployment_group_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_deployment_group_policy_ids` in responses.
  */
-export const teams_devices_deployment_group_policy_ids_output: JsonSchema = {
+export const teams$$devices_deployment_group_policy_ids: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -78,17 +57,10 @@ export const teams_devices_deployment_group_policy_ids_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_deployment_group_updated_at` in responses.
- */
-export const teams_devices_deployment_group_updated_at_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_version_config` in responses.
  */
-export const teams_devices_version_config_output: JsonSchema = {
+export const teams$$devices_version_config: JsonSchema = {
   "properties": {
     "target_environment": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/schemas.ts
index f6da27492..c52fae2ed 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/schemas.ts
@@ -6,11 +6,11 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_deployment_group_create_request`.
  */
-export const teams_devices_deployment_group_create_request: JsonSchema = {
+export const teams$$devices_deployment_group_create_request: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/teams-devices_deployment_group_name",
-      "description": "A user-friendly name for the deployment group."
+      "description": "A user-friendly name for the deployment group.",
+      "type": "string"
     },
     "policy_ids": {
       "description": "Contains an optional list of policy IDs assigned to a group.",
@@ -35,22 +35,14 @@ export const teams_devices_deployment_group_create_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_deployment_group_name`.
- */
-export const teams_devices_deployment_group_name: JsonSchema = {
-  "description": "A user-friendly name for the deployment group.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_deployment_group_update_request`.
  */
-export const teams_devices_deployment_group_update_request: JsonSchema = {
+export const teams$$devices_deployment_group_update_request: JsonSchema = {
   "properties": {
     "name": {
-      "$ref": "#/$defs/teams-devices_deployment_group_name",
-      "description": "A user-friendly name for the deployment group."
+      "description": "A user-friendly name for the deployment group.",
+      "type": "string"
     },
     "policy_ids": {
       "description": "Replaces the entire list of policy IDs.",
@@ -73,7 +65,7 @@ export const teams_devices_deployment_group_update_request: JsonSchema = {
 /**
  * The schema of `teams-devices_version_config`.
  */
-export const teams_devices_version_config: JsonSchema = {
+export const teams$$devices_version_config: JsonSchema = {
   "properties": {
     "target_environment": {
       "description": "The target environment for the client version (e.g., windows, macos).",
diff --git a/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/tools.ts
index 7200a21eb..cac0a5b91 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/deploymentGroups/tools.ts
@@ -1,54 +1,58 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  teams_devices_pagination_info_output,
-  teams_devices_v4_error_response_output,
-  teams_devices_v4_response_message_output,
+  teams$$devices_pagination_info,
+  teams$$devices_v4_error_response,
+  teams$$devices_v4_response_message,
 } from "../outputs.js";
 import {
-  teams_devices_deployment_group_created_at_output,
-  teams_devices_deployment_group_id_output,
-  teams_devices_deployment_group_name_output,
-  teams_devices_deployment_group_output,
-  teams_devices_deployment_group_policy_ids_output,
-  teams_devices_deployment_group_updated_at_output,
-  teams_devices_version_config_output,
+  teams$$devices_deployment_group,
+  teams$$devices_deployment_group_policy_ids,
+  teams$$devices_version_config,
 } from "./outputs.js";
 import {
-  teams_devices_deployment_group_create_request,
-  teams_devices_deployment_group_name,
-  teams_devices_deployment_group_update_request,
-  teams_devices_version_config,
+  teams$$devices_deployment_group_create_request,
+  teams$$devices_deployment_group_update_request,
+  teams$$devices_version_config as teams$$devices_version_config$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.deployment_groups`.
+ * The tools of `zeroTrust.devices.deploymentGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_deployment_groups_create",
+    name: "zeroTrust_devices_deploymentGroups_create",
     title: "Create deployment group",
-    description: "Creates a new deployment group. Policy IDs must be unique across all deployment groups. This endpoint is in Beta.\n\nThis method is beta.",
+    description: "Creates a new deployment group. Policy IDs must be unique across all deployment groups. This endpoint is in Beta.\n\nThis method is beta.\n\nPOST /accounts/{account_id}/devices/deployment-groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/teams-devices_deployment_group_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_deployment_group_create_request": teams_devices_deployment_group_create_request,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name,
-        "teams-devices_version_config": teams_devices_version_config,
+        "teams-devices_deployment_group_create_request": teams$$devices_deployment_group_create_request,
+        "teams-devices_version_config": teams$$devices_version_config$,
       },
     },
     outputSchema: {
@@ -80,14 +84,10 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_deployment_group": teams_devices_deployment_group_output,
-        "teams-devices_deployment_group_created_at": teams_devices_deployment_group_created_at_output,
-        "teams-devices_deployment_group_id": teams_devices_deployment_group_id_output,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name_output,
-        "teams-devices_deployment_group_policy_ids": teams_devices_deployment_group_policy_ids_output,
-        "teams-devices_deployment_group_updated_at": teams_devices_deployment_group_updated_at_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
-        "teams-devices_version_config": teams_devices_version_config_output,
+        "teams-devices_deployment_group": teams$$devices_deployment_group,
+        "teams-devices_deployment_group_policy_ids": teams$$devices_deployment_group_policy_ids,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
+        "teams-devices_version_config": teams$$devices_version_config,
       },
     },
     annotations: {
@@ -138,15 +138,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_deployment_group": teams_devices_deployment_group_output,
-        "teams-devices_deployment_group_created_at": teams_devices_deployment_group_created_at_output,
-        "teams-devices_deployment_group_id": teams_devices_deployment_group_id_output,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name_output,
-        "teams-devices_deployment_group_policy_ids": teams_devices_deployment_group_policy_ids_output,
-        "teams-devices_deployment_group_updated_at": teams_devices_deployment_group_updated_at_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
-        "teams-devices_version_config": teams_devices_version_config_output,
+        "teams-devices_deployment_group": teams$$devices_deployment_group,
+        "teams-devices_deployment_group_policy_ids": teams$$devices_deployment_group_policy_ids,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
+        "teams-devices_version_config": teams$$devices_version_config,
       },
     },
     request: (args) => ({
@@ -155,23 +151,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_deployment_groups_delete",
+    name: "zeroTrust_devices_deploymentGroups_delete",
     title: "Delete deployment group",
-    description: "Deletes a deployment group. Associated policies no longer apply and devices stop receiving version targets. This endpoint is in Beta.\n\nThis method is beta.",
+    description: "Deletes a deployment group. Associated policies no longer apply and devices stop receiving version targets. This endpoint is in Beta.\n\nThis method is beta.\n\nDELETE /accounts/{account_id}/devices/deployment-groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -207,7 +213,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -263,8 +269,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
@@ -272,23 +278,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_deployment_groups_get",
+    name: "zeroTrust_devices_deploymentGroups_get",
     title: "Get deployment group",
-    description: "Fetches a single deployment group by its ID. This endpoint is in Beta.\n\nThis method is beta.",
+    description: "Fetches a single deployment group by its ID. This endpoint is in Beta.\n\nThis method is beta.\n\nGET /accounts/{account_id}/devices/deployment-groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -319,14 +335,10 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_deployment_group": teams_devices_deployment_group_output,
-        "teams-devices_deployment_group_created_at": teams_devices_deployment_group_created_at_output,
-        "teams-devices_deployment_group_id": teams_devices_deployment_group_id_output,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name_output,
-        "teams-devices_deployment_group_policy_ids": teams_devices_deployment_group_policy_ids_output,
-        "teams-devices_deployment_group_updated_at": teams_devices_deployment_group_updated_at_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
-        "teams-devices_version_config": teams_devices_version_config_output,
+        "teams-devices_deployment_group": teams$$devices_deployment_group,
+        "teams-devices_deployment_group_policy_ids": teams$$devices_deployment_group_policy_ids,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
+        "teams-devices_version_config": teams$$devices_version_config,
       },
     },
     annotations: {
@@ -374,15 +386,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_deployment_group": teams_devices_deployment_group_output,
-        "teams-devices_deployment_group_created_at": teams_devices_deployment_group_created_at_output,
-        "teams-devices_deployment_group_id": teams_devices_deployment_group_id_output,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name_output,
-        "teams-devices_deployment_group_policy_ids": teams_devices_deployment_group_policy_ids_output,
-        "teams-devices_deployment_group_updated_at": teams_devices_deployment_group_updated_at_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
-        "teams-devices_version_config": teams_devices_version_config_output,
+        "teams-devices_deployment_group": teams$$devices_deployment_group,
+        "teams-devices_deployment_group_policy_ids": teams$$devices_deployment_group_policy_ids,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
+        "teams-devices_version_config": teams$$devices_version_config,
       },
     },
     request: (args) => ({
@@ -390,29 +398,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_deployment_groups_list",
+    name: "zeroTrust_devices_deploymentGroups_list",
     title: "List deployment groups",
-    description: "Lists all deployment groups for an account. Use deployment groups to assign target WARP client versions to specific devices. This endpoint is in Beta.\n\nThis method is beta.",
+    description: "Lists all deployment groups for an account. Use deployment groups to assign target WARP client versions to specific devices. This endpoint is in Beta.\n\nThis method is beta.\n\nGET /accounts/{account_id}/devices/deployment-groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "The page number to return.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "The maximum number of deployment groups to return per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "The page number to return.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "The maximum number of deployment groups to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -450,15 +474,11 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_deployment_group": teams_devices_deployment_group_output,
-        "teams-devices_deployment_group_created_at": teams_devices_deployment_group_created_at_output,
-        "teams-devices_deployment_group_id": teams_devices_deployment_group_id_output,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name_output,
-        "teams-devices_deployment_group_policy_ids": teams_devices_deployment_group_policy_ids_output,
-        "teams-devices_deployment_group_updated_at": teams_devices_deployment_group_updated_at_output,
-        "teams-devices_pagination_info": teams_devices_pagination_info_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
-        "teams-devices_version_config": teams_devices_version_config_output,
+        "teams-devices_deployment_group": teams$$devices_deployment_group,
+        "teams-devices_deployment_group_policy_ids": teams$$devices_deployment_group_policy_ids,
+        "teams-devices_pagination_info": teams$$devices_pagination_info,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
+        "teams-devices_version_config": teams$$devices_version_config,
       },
     },
     annotations: {
@@ -513,52 +533,57 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_deployment_group": teams_devices_deployment_group_output,
-        "teams-devices_deployment_group_created_at": teams_devices_deployment_group_created_at_output,
-        "teams-devices_deployment_group_id": teams_devices_deployment_group_id_output,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name_output,
-        "teams-devices_deployment_group_policy_ids": teams_devices_deployment_group_policy_ids_output,
-        "teams-devices_deployment_group_updated_at": teams_devices_deployment_group_updated_at_output,
-        "teams-devices_pagination_info": teams_devices_pagination_info_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
-        "teams-devices_version_config": teams_devices_version_config_output,
+        "teams-devices_deployment_group": teams$$devices_deployment_group,
+        "teams-devices_deployment_group_policy_ids": teams$$devices_deployment_group_policy_ids,
+        "teams-devices_pagination_info": teams$$devices_pagination_info,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
+        "teams-devices_version_config": teams$$devices_version_config,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/deployment-groups`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_devices_deployment_groups_update",
+    name: "zeroTrust_devices_deploymentGroups_update",
     title: "Update deployment group",
-    description: "Updates a deployment group. Returns 409 if any newly added policy IDs already belong to another deployment group. This endpoint is in Beta.\n\nThis method is beta.",
+    description: "Updates a deployment group. Returns 409 if any newly added policy IDs already belong to another deployment group. This endpoint is in Beta.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/devices/deployment-groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/teams-devices_deployment_group_update_request"
         },
-        "group_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "group_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name,
-        "teams-devices_deployment_group_update_request": teams_devices_deployment_group_update_request,
-        "teams-devices_version_config": teams_devices_version_config,
+        "teams-devices_deployment_group_update_request": teams$$devices_deployment_group_update_request,
+        "teams-devices_version_config": teams$$devices_version_config$,
       },
     },
     outputSchema: {
@@ -590,14 +615,10 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_deployment_group": teams_devices_deployment_group_output,
-        "teams-devices_deployment_group_created_at": teams_devices_deployment_group_created_at_output,
-        "teams-devices_deployment_group_id": teams_devices_deployment_group_id_output,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name_output,
-        "teams-devices_deployment_group_policy_ids": teams_devices_deployment_group_policy_ids_output,
-        "teams-devices_deployment_group_updated_at": teams_devices_deployment_group_updated_at_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
-        "teams-devices_version_config": teams_devices_version_config_output,
+        "teams-devices_deployment_group": teams$$devices_deployment_group,
+        "teams-devices_deployment_group_policy_ids": teams$$devices_deployment_group_policy_ids,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
+        "teams-devices_version_config": teams$$devices_version_config,
       },
     },
     annotations: {
@@ -648,15 +669,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_deployment_group": teams_devices_deployment_group_output,
-        "teams-devices_deployment_group_created_at": teams_devices_deployment_group_created_at_output,
-        "teams-devices_deployment_group_id": teams_devices_deployment_group_id_output,
-        "teams-devices_deployment_group_name": teams_devices_deployment_group_name_output,
-        "teams-devices_deployment_group_policy_ids": teams_devices_deployment_group_policy_ids_output,
-        "teams-devices_deployment_group_updated_at": teams_devices_deployment_group_updated_at_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
-        "teams-devices_version_config": teams_devices_version_config_output,
+        "teams-devices_deployment_group": teams$$devices_deployment_group,
+        "teams-devices_deployment_group_policy_ids": teams$$devices_deployment_group_policy_ids,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
+        "teams-devices_version_config": teams$$devices_version_config,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/outputs.ts
index 2de150275..1d61afd29 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/outputs.ts
@@ -3,23 +3,17 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `teams-devices_disconnect` in responses.
- */
-export const teams_devices_disconnect_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_global_warp_override` in responses.
  */
-export const teams_devices_global_warp_override_output: JsonSchema = {
+export const teams$$devices_global_warp_override: JsonSchema = {
   "properties": {
     "disconnect": {
-      "$ref": "#/$defs/teams-devices_disconnect"
+      "type": "boolean"
     },
     "timestamp": {
-      "$ref": "#/$defs/teams-devices_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -28,7 +22,7 @@ export const teams_devices_global_warp_override_output: JsonSchema = {
 /**
  * The schema of `teams-devices_global_warp_override_response` in responses.
  */
-export const teams_devices_global_warp_override_response_output: JsonSchema = {
+export const teams$$devices_global_warp_override_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
@@ -43,11 +37,3 @@ export const teams_devices_global_warp_override_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `teams-devices_timestamp` in responses.
- */
-export const teams_devices_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/schemas.ts
index 290a51877..a671e4422 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/schemas.ts
@@ -3,27 +3,19 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `teams-devices_disconnect`.
- */
-export const teams_devices_disconnect: JsonSchema = {
-  "description": "Disconnects all devices on the account using Global WARP override.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_global_warp_override_request`.
  */
-export const teams_devices_global_warp_override_request: JsonSchema = {
+export const teams$$devices_global_warp_override_request: JsonSchema = {
   "description": "Global WARP override request",
   "properties": {
     "disconnect": {
-      "$ref": "#/$defs/teams-devices_disconnect",
-      "description": "Disconnects all devices on the account using Global WARP override."
+      "description": "Disconnects all devices on the account using Global WARP override.",
+      "type": "boolean"
     },
     "justification": {
-      "$ref": "#/$defs/teams-devices_justification",
-      "description": "Reasoning for setting the Global WARP override state. This will be surfaced in the audit log."
+      "description": "Reasoning for setting the Global WARP override state. This will be surfaced in the audit log.",
+      "type": "string"
     }
   },
   "required": [
@@ -31,11 +23,3 @@ export const teams_devices_global_warp_override_request: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `teams-devices_justification`.
- */
-export const teams_devices_justification: JsonSchema = {
-  "description": "Reasoning for setting the Global WARP override state. This will be surfaced in the audit log.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/tools.ts
index fabd3d627..84491c803 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/emergencyDisconnect/tools.ts
@@ -3,56 +3,54 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  teams_devices_api_response_common_failure_output,
-  teams_devices_api_response_common_output,
-  teams_devices_api_response_single_output,
-  teams_devices_messages_output,
+  teams$$devices_api$$response$$common,
+  teams$$devices_api$$response$$common$$failure,
+  teams$$devices_api$$response$$single,
+  teams$$devices_messages,
 } from "../outputs.js";
-import { teams_devices_identifier } from "../schemas.js";
 import {
-  teams_devices_disconnect_output,
-  teams_devices_global_warp_override_output,
-  teams_devices_global_warp_override_response_output,
-  teams_devices_timestamp_output,
+  teams$$devices_global_warp_override,
+  teams$$devices_global_warp_override_response,
 } from "./outputs.js";
-import {
-  teams_devices_disconnect,
-  teams_devices_global_warp_override_request,
-  teams_devices_justification,
-} from "./schemas.js";
+import { teams$$devices_global_warp_override_request } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.emergency_disconnect`.
+ * The tools of `zeroTrust.devices.emergencyDisconnect`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_emergency_disconnect_get",
+    name: "zeroTrust_devices_emergencyDisconnect_get",
     title: "Get Global Disconnect",
-    description: "Fetch the Global WARP disconnect state.",
+    description: "Fetch the Global WARP disconnect state.\n\nGET /accounts/{account_id}/devices/resilience/disconnect",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_global_warp_override_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_disconnect": teams_devices_disconnect_output,
-        "teams-devices_global_warp_override": teams_devices_global_warp_override_output,
-        "teams-devices_global_warp_override_response": teams_devices_global_warp_override_response_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_timestamp": teams_devices_timestamp_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_global_warp_override": teams$$devices_global_warp_override,
+        "teams-devices_global_warp_override_response": teams$$devices_global_warp_override_response,
+        "teams-devices_messages": teams$$devices_messages,
       },
     },
     annotations: {
@@ -82,14 +80,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_disconnect": teams_devices_disconnect_output,
-        "teams-devices_global_warp_override": teams_devices_global_warp_override_output,
-        "teams-devices_global_warp_override_response": teams_devices_global_warp_override_response_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_timestamp": teams_devices_timestamp_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_global_warp_override": teams$$devices_global_warp_override,
+        "teams-devices_global_warp_override_response": teams$$devices_global_warp_override_response,
+        "teams-devices_messages": teams$$devices_messages,
       },
     },
     request: (args) => ({
@@ -97,40 +93,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_emergency_disconnect_set",
+    name: "zeroTrust_devices_emergencyDisconnect_set",
     title: "Set Global Disconnect",
-    description: "Sets the Global WARP disconnect state.",
+    description: "Sets the Global WARP disconnect state.\n\nPOST /accounts/{account_id}/devices/resilience/disconnect",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "$ref": "#/$defs/teams-devices_global_warp_override_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_disconnect": teams_devices_disconnect,
-        "teams-devices_global_warp_override_request": teams_devices_global_warp_override_request,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_justification": teams_devices_justification,
+        "teams-devices_global_warp_override_request": teams$$devices_global_warp_override_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_global_warp_override_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_disconnect": teams_devices_disconnect_output,
-        "teams-devices_global_warp_override": teams_devices_global_warp_override_output,
-        "teams-devices_global_warp_override_response": teams_devices_global_warp_override_response_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_timestamp": teams_devices_timestamp_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_global_warp_override": teams$$devices_global_warp_override,
+        "teams-devices_global_warp_override_response": teams$$devices_global_warp_override_response,
+        "teams-devices_messages": teams$$devices_messages,
       },
     },
     annotations: {
@@ -157,14 +158,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_disconnect": teams_devices_disconnect_output,
-        "teams-devices_global_warp_override": teams_devices_global_warp_override_output,
-        "teams-devices_global_warp_override_response": teams_devices_global_warp_override_response_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_timestamp": teams_devices_timestamp_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_global_warp_override": teams$$devices_global_warp_override,
+        "teams-devices_global_warp_override_response": teams$$devices_global_warp_override_response,
+        "teams-devices_messages": teams$$devices_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/outputs.ts
index e795fd0d3..b26aec3fe 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/outputs.ts
@@ -6,34 +6,41 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_ip_profile` in responses.
  */
-export const teams_devices_ip_profile_output: JsonSchema = {
+export const teams$$devices_ip_profile: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/teams-devices_ip_profile_created_at"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/teams-devices_ip_profile_description"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "enabled": {
-      "$ref": "#/$defs/teams-devices_ip_profile_enabled"
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/teams-devices_ip_profile_id"
+      "type": "string"
     },
     "match": {
-      "$ref": "#/$defs/teams-devices_ip_profile_match"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/teams-devices_ip_profile_name"
+      "type": "string"
     },
     "precedence": {
-      "$ref": "#/$defs/teams-devices_ip_profile_precedence"
+      "type": "integer"
     },
     "subnet_id": {
-      "$ref": "#/$defs/teams-devices_ip_profile_subnet_id"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/teams-devices_ip_profile_updated_at"
+      "type": "string"
     }
   },
   "required": [
@@ -49,73 +56,3 @@ export const teams_devices_ip_profile_output: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `teams-devices_ip_profile_created_at` in responses.
- */
-export const teams_devices_ip_profile_created_at_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_description` in responses.
- */
-export const teams_devices_ip_profile_description_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `teams-devices_ip_profile_enabled` in responses.
- */
-export const teams_devices_ip_profile_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_id` in responses.
- */
-export const teams_devices_ip_profile_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_match` in responses.
- */
-export const teams_devices_ip_profile_match_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_name` in responses.
- */
-export const teams_devices_ip_profile_name_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_precedence` in responses.
- */
-export const teams_devices_ip_profile_precedence_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_subnet_id` in responses.
- */
-export const teams_devices_ip_profile_subnet_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_updated_at` in responses.
- */
-export const teams_devices_ip_profile_updated_at_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/schemas.ts
index 6bf2a8faf..19ccd7da4 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_ip_profile_create_request`.
  */
-export const teams_devices_ip_profile_create_request: JsonSchema = {
+export const teams$$devices_ip_profile_create_request: JsonSchema = {
   "properties": {
     "description": {
       "description": "An optional description of the Device IP profile.",
@@ -25,20 +25,20 @@ export const teams_devices_ip_profile_create_request: JsonSchema = {
       "type": "boolean"
     },
     "match": {
-      "$ref": "#/$defs/teams-devices_ip_profile_match",
-      "description": "The wirefilter expression to match registrations. Available values: \"identity.name\", \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.saml_attributes\"."
+      "description": "The wirefilter expression to match registrations. Available values: \"identity.name\", \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.saml_attributes\".",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/teams-devices_ip_profile_name",
-      "description": "A user-friendly name for the Device IP profile."
+      "description": "A user-friendly name for the Device IP profile.",
+      "type": "string"
     },
     "precedence": {
-      "$ref": "#/$defs/teams-devices_ip_profile_precedence",
-      "description": "The precedence of the Device IP profile. Lower values indicate higher precedence. Device IP profile will be evaluated in ascending order of this field."
+      "description": "The precedence of the Device IP profile. Lower values indicate higher precedence. Device IP profile will be evaluated in ascending order of this field.",
+      "type": "integer"
     },
     "subnet_id": {
-      "$ref": "#/$defs/teams-devices_ip_profile_subnet_id",
-      "description": "The ID of the Subnet."
+      "description": "The ID of the Subnet.",
+      "type": "string"
     }
   },
   "required": [
@@ -50,74 +50,34 @@ export const teams_devices_ip_profile_create_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_ip_profile_enabled`.
- */
-export const teams_devices_ip_profile_enabled: JsonSchema = {
-  "description": "Whether the Device IP profile is enabled.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_match`.
- */
-export const teams_devices_ip_profile_match: JsonSchema = {
-  "description": "The wirefilter expression to match registrations. Available values: \"identity.name\", \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.saml_attributes\".",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_name`.
- */
-export const teams_devices_ip_profile_name: JsonSchema = {
-  "description": "A user-friendly name for the Device IP profile.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_precedence`.
- */
-export const teams_devices_ip_profile_precedence: JsonSchema = {
-  "description": "The precedence of the Device IP profile. Lower values indicate higher precedence. Device IP profile will be evaluated in ascending order of this field.",
-  "type": "integer"
-};
-
-/**
- * The schema of `teams-devices_ip_profile_subnet_id`.
- */
-export const teams_devices_ip_profile_subnet_id: JsonSchema = {
-  "description": "The ID of the Subnet.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_ip_profile_update_request`.
  */
-export const teams_devices_ip_profile_update_request: JsonSchema = {
+export const teams$$devices_ip_profile_update_request: JsonSchema = {
   "properties": {
     "description": {
       "description": "An optional description of the Device IP profile.",
       "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/teams-devices_ip_profile_enabled",
-      "description": "Whether the Device IP profile is enabled."
+      "description": "Whether the Device IP profile is enabled.",
+      "type": "boolean"
     },
     "match": {
-      "$ref": "#/$defs/teams-devices_ip_profile_match",
-      "description": "The wirefilter expression to match registrations. Available values: \"identity.name\", \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.saml_attributes\"."
+      "description": "The wirefilter expression to match registrations. Available values: \"identity.name\", \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.saml_attributes\".",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/teams-devices_ip_profile_name",
-      "description": "A user-friendly name for the Device IP profile."
+      "description": "A user-friendly name for the Device IP profile.",
+      "type": "string"
     },
     "precedence": {
-      "$ref": "#/$defs/teams-devices_ip_profile_precedence",
-      "description": "The precedence of the Device IP profile. Lower values indicate higher precedence. Device IP profile will be evaluated in ascending order of this field."
+      "description": "The precedence of the Device IP profile. Lower values indicate higher precedence. Device IP profile will be evaluated in ascending order of this field.",
+      "type": "integer"
     },
     "subnet_id": {
-      "$ref": "#/$defs/teams-devices_ip_profile_subnet_id",
-      "description": "The ID of the Subnet."
+      "description": "The ID of the Subnet.",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/tools.ts
index 2825d7020..1dc15b2fa 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/ipProfiles/tools.ts
@@ -1,62 +1,52 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  teams_devices_pagination_info_output,
-  teams_devices_v4_error_response_output,
-  teams_devices_v4_response_message_output,
+  teams$$devices_pagination_info,
+  teams$$devices_v4_error_response,
+  teams$$devices_v4_response_message,
 } from "../outputs.js";
+import { teams$$devices_ip_profile } from "./outputs.js";
 import {
-  teams_devices_ip_profile_created_at_output,
-  teams_devices_ip_profile_description_output,
-  teams_devices_ip_profile_enabled_output,
-  teams_devices_ip_profile_id_output,
-  teams_devices_ip_profile_match_output,
-  teams_devices_ip_profile_name_output,
-  teams_devices_ip_profile_output,
-  teams_devices_ip_profile_precedence_output,
-  teams_devices_ip_profile_subnet_id_output,
-  teams_devices_ip_profile_updated_at_output,
-} from "./outputs.js";
-import {
-  teams_devices_ip_profile_create_request,
-  teams_devices_ip_profile_enabled,
-  teams_devices_ip_profile_match,
-  teams_devices_ip_profile_name,
-  teams_devices_ip_profile_precedence,
-  teams_devices_ip_profile_subnet_id,
-  teams_devices_ip_profile_update_request,
+  teams$$devices_ip_profile_create_request,
+  teams$$devices_ip_profile_update_request,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.ip_profiles`.
+ * The tools of `zeroTrust.devices.ipProfiles`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_ip_profiles_create",
+    name: "zeroTrust_devices_ipProfiles_create",
     title: "Create IP profile",
-    description: "Creates a WARP Device IP profile. Currently, only IPv4 Device subnets can be associated.",
+    description: "Creates a WARP Device IP profile. Currently, only IPv4 Device subnets can be associated.\n\nPOST /accounts/{account_id}/devices/ip-profiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/teams-devices_ip_profile_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_ip_profile_create_request": teams_devices_ip_profile_create_request,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id,
+        "teams-devices_ip_profile_create_request": teams$$devices_ip_profile_create_request,
       },
     },
     outputSchema: {
@@ -88,17 +78,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_ip_profile": teams_devices_ip_profile_output,
-        "teams-devices_ip_profile_created_at": teams_devices_ip_profile_created_at_output,
-        "teams-devices_ip_profile_description": teams_devices_ip_profile_description_output,
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled_output,
-        "teams-devices_ip_profile_id": teams_devices_ip_profile_id_output,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match_output,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name_output,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence_output,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id_output,
-        "teams-devices_ip_profile_updated_at": teams_devices_ip_profile_updated_at_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_ip_profile": teams$$devices_ip_profile,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -151,18 +132,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_ip_profile": teams_devices_ip_profile_output,
-        "teams-devices_ip_profile_created_at": teams_devices_ip_profile_created_at_output,
-        "teams-devices_ip_profile_description": teams_devices_ip_profile_description_output,
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled_output,
-        "teams-devices_ip_profile_id": teams_devices_ip_profile_id_output,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match_output,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name_output,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence_output,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id_output,
-        "teams-devices_ip_profile_updated_at": teams_devices_ip_profile_updated_at_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_ip_profile": teams$$devices_ip_profile,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
@@ -171,23 +143,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_ip_profiles_delete",
+    name: "zeroTrust_devices_ipProfiles_delete",
     title: "Delete IP profile",
-    description: "Delete a WARP Device IP profile.",
+    description: "Delete a WARP Device IP profile.\n\nDELETE /accounts/{account_id}/devices/ip-profiles/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "profile_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "profile_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -223,7 +205,7 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -281,8 +263,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
@@ -290,23 +272,33 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_ip_profiles_get",
+    name: "zeroTrust_devices_ipProfiles_get",
     title: "Get IP profile",
-    description: "Fetches a single WARP Device IP profile.",
+    description: "Fetches a single WARP Device IP profile.\n\nGET /accounts/{account_id}/devices/ip-profiles/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "profile_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "profile_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -337,17 +329,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_ip_profile": teams_devices_ip_profile_output,
-        "teams-devices_ip_profile_created_at": teams_devices_ip_profile_created_at_output,
-        "teams-devices_ip_profile_description": teams_devices_ip_profile_description_output,
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled_output,
-        "teams-devices_ip_profile_id": teams_devices_ip_profile_id_output,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match_output,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name_output,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence_output,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id_output,
-        "teams-devices_ip_profile_updated_at": teams_devices_ip_profile_updated_at_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_ip_profile": teams$$devices_ip_profile,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -401,18 +384,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_ip_profile": teams_devices_ip_profile_output,
-        "teams-devices_ip_profile_created_at": teams_devices_ip_profile_created_at_output,
-        "teams-devices_ip_profile_description": teams_devices_ip_profile_description_output,
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled_output,
-        "teams-devices_ip_profile_id": teams_devices_ip_profile_id_output,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match_output,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name_output,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence_output,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id_output,
-        "teams-devices_ip_profile_updated_at": teams_devices_ip_profile_updated_at_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_ip_profile": teams$$devices_ip_profile,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
@@ -420,29 +394,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_ip_profiles_list",
+    name: "zeroTrust_devices_ipProfiles_list",
     title: "List IP profiles",
-    description: "Lists WARP Device IP profiles.",
+    description: "Lists WARP Device IP profiles.\n\nGET /accounts/{account_id}/devices/ip-profiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "The page number to return.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "The number of IP profiles to return per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "The page number to return.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "The number of IP profiles to return per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -479,18 +469,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_ip_profile": teams_devices_ip_profile_output,
-        "teams-devices_ip_profile_created_at": teams_devices_ip_profile_created_at_output,
-        "teams-devices_ip_profile_description": teams_devices_ip_profile_description_output,
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled_output,
-        "teams-devices_ip_profile_id": teams_devices_ip_profile_id_output,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match_output,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name_output,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence_output,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id_output,
-        "teams-devices_ip_profile_updated_at": teams_devices_ip_profile_updated_at_output,
-        "teams-devices_pagination_info": teams_devices_pagination_info_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_ip_profile": teams$$devices_ip_profile,
+        "teams-devices_pagination_info": teams$$devices_pagination_info,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -550,58 +531,54 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_ip_profile": teams_devices_ip_profile_output,
-        "teams-devices_ip_profile_created_at": teams_devices_ip_profile_created_at_output,
-        "teams-devices_ip_profile_description": teams_devices_ip_profile_description_output,
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled_output,
-        "teams-devices_ip_profile_id": teams_devices_ip_profile_id_output,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match_output,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name_output,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence_output,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id_output,
-        "teams-devices_ip_profile_updated_at": teams_devices_ip_profile_updated_at_output,
-        "teams-devices_pagination_info": teams_devices_pagination_info_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_ip_profile": teams$$devices_ip_profile,
+        "teams-devices_pagination_info": teams$$devices_pagination_info,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/ip-profiles`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_devices_ip_profiles_update",
+    name: "zeroTrust_devices_ipProfiles_update",
     title: "Update IP profile",
-    description: "Updates a WARP Device IP profile. Currently, only IPv4 Device subnets can be associated.",
+    description: "Updates a WARP Device IP profile. Currently, only IPv4 Device subnets can be associated.\n\nPATCH /accounts/{account_id}/devices/ip-profiles/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/teams-devices_ip_profile_update_request"
         },
-        "profile_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "profile_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id,
-        "teams-devices_ip_profile_update_request": teams_devices_ip_profile_update_request,
+        "teams-devices_ip_profile_update_request": teams$$devices_ip_profile_update_request,
       },
     },
     outputSchema: {
@@ -633,17 +610,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_ip_profile": teams_devices_ip_profile_output,
-        "teams-devices_ip_profile_created_at": teams_devices_ip_profile_created_at_output,
-        "teams-devices_ip_profile_description": teams_devices_ip_profile_description_output,
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled_output,
-        "teams-devices_ip_profile_id": teams_devices_ip_profile_id_output,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match_output,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name_output,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence_output,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id_output,
-        "teams-devices_ip_profile_updated_at": teams_devices_ip_profile_updated_at_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_ip_profile": teams$$devices_ip_profile,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -696,18 +664,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_ip_profile": teams_devices_ip_profile_output,
-        "teams-devices_ip_profile_created_at": teams_devices_ip_profile_created_at_output,
-        "teams-devices_ip_profile_description": teams_devices_ip_profile_description_output,
-        "teams-devices_ip_profile_enabled": teams_devices_ip_profile_enabled_output,
-        "teams-devices_ip_profile_id": teams_devices_ip_profile_id_output,
-        "teams-devices_ip_profile_match": teams_devices_ip_profile_match_output,
-        "teams-devices_ip_profile_name": teams_devices_ip_profile_name_output,
-        "teams-devices_ip_profile_precedence": teams_devices_ip_profile_precedence_output,
-        "teams-devices_ip_profile_subnet_id": teams_devices_ip_profile_subnet_id_output,
-        "teams-devices_ip_profile_updated_at": teams_devices_ip_profile_updated_at_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_ip_profile": teams$$devices_ip_profile,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/networks/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/networks/outputs.ts
index 038be6486..2ffa62731 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/networks/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/networks/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `teams-devices_components-schemas-response_collection` in
  * responses.
  */
-export const teams_devices_components_schemas_response_collection_output: JsonSchema = {
+export const teams$$devices_components$$schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-collection"
@@ -30,7 +30,7 @@ export const teams_devices_components_schemas_response_collection_output: JsonSc
  * The schema of `teams-devices_components-schemas-single_response` in
  * responses.
  */
-export const teams_devices_components_schemas_single_response_output: JsonSchema = {
+export const teams$$devices_components$$schemas$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
@@ -46,56 +46,41 @@ export const teams_devices_components_schemas_single_response_output: JsonSchema
   ]
 };
 
-/**
- * The schema of `teams-devices_components-schemas-type` in responses.
- */
-export const teams_devices_components_schemas_type_output: JsonSchema = {
-  "enum": [
-    "tls"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_device-managed-networks` in responses.
  */
-export const teams_devices_device_managed_networks_output: JsonSchema = {
+export const teams$$devices_device$$managed$$networks: JsonSchema = {
   "properties": {
     "config": {
       "$ref": "#/$defs/teams-devices_schemas-config_response"
     },
     "name": {
-      "$ref": "#/$defs/teams-devices_device-managed-networks_components-schemas-name"
+      "type": "string"
     },
     "network_id": {
-      "$ref": "#/$defs/teams-devices_uuid"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/teams-devices_components-schemas-type"
+      "enum": [
+        "tls"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_device-managed-networks_components-schemas-name`
- * in responses.
- */
-export const teams_devices_device_managed_networks_components_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_schemas-config_response` in responses.
  */
-export const teams_devices_schemas_config_response_output: JsonSchema = {
+export const teams$$devices_schemas$$config_response: JsonSchema = {
   "$ref": "#/$defs/teams-devices_tls_config_response"
 };
 
 /**
  * The schema of `teams-devices_tls_config_response` in responses.
  */
-export const teams_devices_tls_config_response_output: JsonSchema = {
+export const teams$$devices_tls_config_response: JsonSchema = {
   "properties": {
     "sha256": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/networks/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/networks/schemas.ts
index f9759bbb0..09ecbc1b3 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/networks/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/networks/schemas.ts
@@ -3,30 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `teams-devices_components-schemas-type`.
- */
-export const teams_devices_components_schemas_type: JsonSchema = {
-  "description": "The type of device managed network.",
-  "enum": [
-    "tls"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of
- * `teams-devices_device-managed-networks_components-schemas-name`.
- */
-export const teams_devices_device_managed_networks_components_schemas_name: JsonSchema = {
-  "description": "The name of the device managed network. This name must be unique.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_schemas-config_request`.
  */
-export const teams_devices_schemas_config_request: JsonSchema = {
+export const teams$$devices_schemas$$config_request: JsonSchema = {
   "$ref": "#/$defs/teams-devices_tls_config_request",
   "description": "The configuration object containing information for the WARP client to detect the managed network."
 };
@@ -34,7 +14,7 @@ export const teams_devices_schemas_config_request: JsonSchema = {
 /**
  * The schema of `teams-devices_tls_config_request`.
  */
-export const teams_devices_tls_config_request: JsonSchema = {
+export const teams$$devices_tls_config_request: JsonSchema = {
   "properties": {
     "sha256": {
       "description": "The SHA-256 hash of the TLS certificate presented by the host found at tls_sockaddr. If absent, regular certificate verification (trusted roots, valid timestamp, etc) will be used to validate the certificate.",
diff --git a/src/generated/forge-mcp/zeroTrust/devices/networks/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/networks/tools.ts
index a30d48b25..a002b6ea9 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/networks/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/networks/tools.ts
@@ -3,57 +3,51 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  teams_devices_api_response_collection_output,
-  teams_devices_api_response_common_failure_output,
-  teams_devices_api_response_common_output,
-  teams_devices_api_response_single_output,
-  teams_devices_messages_output,
-  teams_devices_result_info_output,
-  teams_devices_uuid_output,
+  teams$$devices_api$$response$$collection,
+  teams$$devices_api$$response$$common,
+  teams$$devices_api$$response$$common$$failure,
+  teams$$devices_api$$response$$single,
+  teams$$devices_messages,
+  teams$$devices_result_info,
 } from "../outputs.js";
-import { teams_devices_identifier, teams_devices_uuid } from "../schemas.js";
 import {
-  teams_devices_components_schemas_response_collection_output,
-  teams_devices_components_schemas_single_response_output,
-  teams_devices_components_schemas_type_output,
-  teams_devices_device_managed_networks_components_schemas_name_output,
-  teams_devices_device_managed_networks_output,
-  teams_devices_schemas_config_response_output,
-  teams_devices_tls_config_response_output,
+  teams$$devices_components$$schemas$$response_collection,
+  teams$$devices_components$$schemas$$single_response,
+  teams$$devices_device$$managed$$networks,
+  teams$$devices_schemas$$config_response,
+  teams$$devices_tls_config_response,
 } from "./outputs.js";
 import {
-  teams_devices_components_schemas_type,
-  teams_devices_device_managed_networks_components_schemas_name,
-  teams_devices_schemas_config_request,
-  teams_devices_tls_config_request,
+  teams$$devices_schemas$$config_request,
+  teams$$devices_tls_config_request,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.networks`.
+ * The tools of `zeroTrust.devices.networks`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_networks_create",
+    name: "zeroTrust_devices_networks_create",
     title: "Create a device managed network",
-    description: "Creates a new device managed network.",
+    description: "Creates a new device managed network.\n\nPOST /accounts/{account_id}/devices/networks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "config": {
               "$ref": "#/$defs/teams-devices_schemas-config_request"
             },
             "name": {
-              "$ref": "#/$defs/teams-devices_device-managed-networks_components-schemas-name",
-              "description": "The name of the device managed network. This name must be unique."
+              "description": "The name of the device managed network. This name must be unique.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/teams-devices_components-schemas-type",
-              "description": "The type of device managed network."
+              "description": "The type of device managed network.",
+              "enum": [
+                "tls"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -62,33 +56,40 @@ export const tools: readonly Tool[] = [
             "type"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_schemas-config_request": teams_devices_schemas_config_request,
-        "teams-devices_tls_config_request": teams_devices_tls_config_request,
+        "teams-devices_schemas-config_request": teams$$devices_schemas$$config_request,
+        "teams-devices_tls_config_request": teams$$devices_tls_config_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_components-schemas-single_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-single_response": teams_devices_components_schemas_single_response_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_components-schemas-single_response": teams$$devices_components$$schemas$$single_response,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     annotations: {
@@ -115,17 +116,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-single_response": teams_devices_components_schemas_single_response_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_components-schemas-single_response": teams$$devices_components$$schemas$$single_response,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     request: (args) => ({
@@ -134,43 +132,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_networks_delete",
+    name: "zeroTrust_devices_networks_delete",
     title: "Delete a device managed network",
-    description: "Deletes a device managed network and fetches a list of the remaining device managed networks for an account.",
+    description: "Deletes a device managed network and fetches a list of the remaining device managed networks for an account.\n\nDELETE /accounts/{account_id}/devices/networks/{network_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
-        "network_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "network_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "network_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "network_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_uuid": teams_devices_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_components-schemas-response_collection",
       $defs: {
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_components-schemas-response_collection": teams_devices_components_schemas_response_collection_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_components-schemas-response_collection": teams$$devices_components$$schemas$$response_collection,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     annotations: {
@@ -197,18 +198,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_components-schemas-response_collection": teams_devices_components_schemas_response_collection_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_components-schemas-response_collection": teams$$devices_components$$schemas$$response_collection,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     request: (args) => ({
@@ -216,42 +214,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_networks_get",
+    name: "zeroTrust_devices_networks_get",
     title: "Get device managed network details",
-    description: "Fetches details for a single managed network.",
+    description: "Fetches details for a single managed network.\n\nGET /accounts/{account_id}/devices/networks/{network_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
-        "network_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "network_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "network_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "network_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_uuid": teams_devices_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_components-schemas-single_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-single_response": teams_devices_components_schemas_single_response_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_components-schemas-single_response": teams$$devices_components$$schemas$$single_response,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     annotations: {
@@ -273,17 +274,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-single_response": teams_devices_components_schemas_single_response_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_components-schemas-single_response": teams$$devices_components$$schemas$$single_response,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     request: (args) => ({
@@ -291,37 +289,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_networks_list",
+    name: "zeroTrust_devices_networks_list",
     title: "List your device managed networks",
-    description: "Fetches a list of managed networks for an account.",
+    description: "Fetches a list of managed networks for an account.\n\nGET /accounts/{account_id}/devices/networks",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_components-schemas-response_collection",
       $defs: {
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_components-schemas-response_collection": teams_devices_components_schemas_response_collection_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_components-schemas-response_collection": teams$$devices_components$$schemas$$response_collection,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     annotations: {
@@ -343,18 +345,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_components-schemas-response_collection": teams_devices_components_schemas_response_collection_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_components-schemas-response_collection": teams$$devices_components$$schemas$$response_collection,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     request: (args) => ({
@@ -362,63 +361,69 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_networks_update",
+    name: "zeroTrust_devices_networks_update",
     title: "Update a device managed network",
-    description: "Updates a configured device managed network.",
+    description: "Updates a configured device managed network.\n\nPUT /accounts/{account_id}/devices/networks/{network_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "config": {
               "$ref": "#/$defs/teams-devices_schemas-config_request"
             },
             "name": {
-              "$ref": "#/$defs/teams-devices_device-managed-networks_components-schemas-name",
-              "description": "The name of the device managed network. This name must be unique."
+              "description": "The name of the device managed network. This name must be unique.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/teams-devices_components-schemas-type",
-              "description": "The type of device managed network."
+              "description": "The type of device managed network.",
+              "enum": [
+                "tls"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "network_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "network_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "network_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "network_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_schemas-config_request": teams_devices_schemas_config_request,
-        "teams-devices_tls_config_request": teams_devices_tls_config_request,
-        "teams-devices_uuid": teams_devices_uuid,
+        "teams-devices_schemas-config_request": teams$$devices_schemas$$config_request,
+        "teams-devices_tls_config_request": teams$$devices_tls_config_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_components-schemas-single_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-single_response": teams_devices_components_schemas_single_response_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_components-schemas-single_response": teams$$devices_components$$schemas$$single_response,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     annotations: {
@@ -445,17 +450,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-single_response": teams_devices_components_schemas_single_response_output,
-        "teams-devices_components-schemas-type": teams_devices_components_schemas_type_output,
-        "teams-devices_device-managed-networks": teams_devices_device_managed_networks_output,
-        "teams-devices_device-managed-networks_components-schemas-name": teams_devices_device_managed_networks_components_schemas_name_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-config_response": teams_devices_schemas_config_response_output,
-        "teams-devices_tls_config_response": teams_devices_tls_config_response_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_components-schemas-single_response": teams$$devices_components$$schemas$$single_response,
+        "teams-devices_device-managed-networks": teams$$devices_device$$managed$$networks,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-config_response": teams$$devices_schemas$$config_response,
+        "teams-devices_tls_config_response": teams$$devices_tls_config_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/outputs.ts
index 65af12f12..df9b2e4be 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `teams-devices_api-response-collection` in responses.
  */
-export const teams_devices_api_response_collection_output: JsonSchema = {
+export const teams$$devices_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-common"
@@ -38,7 +38,7 @@ export const teams_devices_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `teams-devices_api-response-common` in responses.
  */
-export const teams_devices_api_response_common_output: JsonSchema = {
+export const teams$$devices_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/teams-devices_messages"
@@ -81,7 +81,7 @@ export const teams_devices_api_response_common_output: JsonSchema = {
 /**
  * The schema of `teams-devices_api-response-common-failure` in responses.
  */
-export const teams_devices_api_response_common_failure_output: JsonSchema = {
+export const teams$$devices_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/teams-devices_messages"
@@ -111,7 +111,7 @@ export const teams_devices_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `teams-devices_api-response-single` in responses.
  */
-export const teams_devices_api_response_single_output: JsonSchema = {
+export const teams$$devices_api$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-common"
@@ -137,17 +137,10 @@ export const teams_devices_api_response_single_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_components-schemas-uuid` in responses.
- */
-export const teams_devices_components_schemas_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_cursor_result_info` in responses.
  */
-export const teams_devices_cursor_result_info_output: JsonSchema = {
+export const teams$$devices_cursor_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -177,17 +170,10 @@ export const teams_devices_cursor_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_email` in responses.
- */
-export const teams_devices_email_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_empty_body` in responses.
  */
-export const teams_devices_empty_body_output: JsonSchema = {
+export const teams$$devices_empty_body: JsonSchema = {
   "oneOf": [
     {
       "type": "object"
@@ -201,7 +187,7 @@ export const teams_devices_empty_body_output: JsonSchema = {
 /**
  * The schema of `teams-devices_messages` in responses.
  */
-export const teams_devices_messages_output: JsonSchema = {
+export const teams$$devices_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -223,7 +209,7 @@ export const teams_devices_messages_output: JsonSchema = {
 /**
  * The schema of `teams-devices_pagination_info` in responses.
  */
-export const teams_devices_pagination_info_output: JsonSchema = {
+export const teams$$devices_pagination_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -253,7 +239,7 @@ export const teams_devices_pagination_info_output: JsonSchema = {
 /**
  * The schema of `teams-devices_physical_device` in responses.
  */
-export const teams_devices_physical_device_output: JsonSchema = {
+export const teams$$devices_physical_device: JsonSchema = {
   "properties": {
     "active_registrations": {
       "type": "integer"
@@ -435,7 +421,7 @@ export const teams_devices_physical_device_output: JsonSchema = {
 /**
  * The schema of `teams-devices_policy_summary` in responses.
  */
-export const teams_devices_policy_summary_output: JsonSchema = {
+export const teams$$devices_policy_summary: JsonSchema = {
   "properties": {
     "default": {
       "type": "boolean"
@@ -466,7 +452,7 @@ export const teams_devices_policy_summary_output: JsonSchema = {
 /**
  * The schema of `teams-devices_registration_details` in responses.
  */
-export const teams_devices_registration_details_output: JsonSchema = {
+export const teams$$devices_registration_details: JsonSchema = {
   "properties": {
     "policy": {
       "oneOf": [
@@ -482,21 +468,10 @@ export const teams_devices_registration_details_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_registration_type` in responses.
- */
-export const teams_devices_registration_type_output: JsonSchema = {
-  "enum": [
-    "warp",
-    "browser_extension"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_result_info` in responses.
  */
-export const teams_devices_result_info_output: JsonSchema = {
+export const teams$$devices_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -517,13 +492,13 @@ export const teams_devices_result_info_output: JsonSchema = {
 /**
  * The schema of `teams-devices_user` in responses.
  */
-export const teams_devices_user_output: JsonSchema = {
+export const teams$$devices_user: JsonSchema = {
   "properties": {
     "email": {
-      "$ref": "#/$defs/teams-devices_email"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/teams-devices_components-schemas-uuid"
+      "type": "string"
     },
     "name": {
       "type": "string"
@@ -532,17 +507,10 @@ export const teams_devices_user_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_uuid` in responses.
- */
-export const teams_devices_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_v4_error_response` in responses.
  */
-export const teams_devices_v4_error_response_output: JsonSchema = {
+export const teams$$devices_v4_error_response: JsonSchema = {
   "properties": {
     "errors": {
       "items": {
@@ -586,7 +554,7 @@ export const teams_devices_v4_error_response_output: JsonSchema = {
 /**
  * The schema of `teams-devices_v4_response_message` in responses.
  */
-export const teams_devices_v4_response_message_output: JsonSchema = {
+export const teams$$devices_v4_response_message: JsonSchema = {
   "properties": {
     "code": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/outputs.ts
index c9582880e..31584fd6f 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_override_code` in responses.
  */
-export const teams_devices_override_code_output: JsonSchema = {
+export const teams$$devices_override_code: JsonSchema = {
   "properties": {
     "code": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/schemas.ts
index 272850d3c..1a89cb241 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_override_code_create_request`.
  */
-export const teams_devices_override_code_create_request: JsonSchema = {
+export const teams$$devices_override_code_create_request: JsonSchema = {
   "properties": {
     "device_id": {
       "description": "Physical device ID. Required when scope is device and forbidden when scope is account.",
diff --git a/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/tools.ts
index cbd0dd5a6..f26ec996d 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/overrideCodes/tools.ts
@@ -3,36 +3,46 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  teams_devices_v4_error_response_output,
-  teams_devices_v4_response_message_output,
+  teams$$devices_v4_error_response,
+  teams$$devices_v4_response_message,
 } from "../outputs.js";
-import { teams_devices_override_code_output } from "./outputs.js";
-import { teams_devices_override_code_create_request } from "./schemas.js";
+import { teams$$devices_override_code } from "./outputs.js";
+import { teams$$devices_override_code_create_request } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.override_codes`.
+ * The tools of `zeroTrust.devices.overrideCodes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_override_codes_create",
+    name: "zeroTrust_devices_overrideCodes_create",
     title: "Generate an uninstall protection override code",
-    description: "Generates an account-wide or device-specific uninstall protection override code.",
+    description: "Generates an account-wide or device-specific uninstall protection override code.\n\nPOST /accounts/{account_id}/devices/override_codes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/teams-devices_override_code_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_override_code_create_request": teams_devices_override_code_create_request,
+        "teams-devices_override_code_create_request": teams$$devices_override_code_create_request,
       },
     },
     outputSchema: {
@@ -64,8 +74,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_override_code": teams_devices_override_code_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_override_code": teams$$devices_override_code,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -116,9 +126,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_override_code": teams_devices_override_code_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_override_code": teams$$devices_override_code,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/outputs.ts
index 91f1e85ff..7d1badf85 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/outputs.ts
@@ -3,55 +3,51 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `teams-devices_components-schemas-name` in responses.
- */
-export const teams_devices_components_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_config_response` in responses.
  */
-export const teams_devices_config_response_output: JsonSchema = {
+export const teams$$devices_config_response: JsonSchema = {
   "$ref": "#/$defs/teams-devices_workspace_one_config_response"
 };
 
 /**
  * The schema of `teams-devices_device-posture-integrations` in responses.
  */
-export const teams_devices_device_posture_integrations_output: JsonSchema = {
+export const teams$$devices_device$$posture$$integrations: JsonSchema = {
   "properties": {
     "config": {
       "$ref": "#/$defs/teams-devices_config_response"
     },
     "id": {
-      "$ref": "#/$defs/teams-devices_uuid"
+      "type": "string"
     },
     "interval": {
-      "$ref": "#/$defs/teams-devices_interval"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/teams-devices_components-schemas-name"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/teams-devices_schemas-type"
+      "enum": [
+        "workspace_one",
+        "crowdstrike_s2s",
+        "uptycs",
+        "intune",
+        "kolide",
+        "tanium_s2s",
+        "sentinelone_s2s",
+        "custom_s2s"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_interval` in responses.
- */
-export const teams_devices_interval_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_schemas-id_response` in responses.
  */
-export const teams_devices_schemas_id_response_output: JsonSchema = {
+export const teams$$devices_schemas$$id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
@@ -77,7 +73,7 @@ export const teams_devices_schemas_id_response_output: JsonSchema = {
 /**
  * The schema of `teams-devices_schemas-response_collection` in responses.
  */
-export const teams_devices_schemas_response_collection_output: JsonSchema = {
+export const teams$$devices_schemas$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-collection"
@@ -99,7 +95,7 @@ export const teams_devices_schemas_response_collection_output: JsonSchema = {
 /**
  * The schema of `teams-devices_schemas-single_response` in responses.
  */
-export const teams_devices_schemas_single_response_output: JsonSchema = {
+export const teams$$devices_schemas$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
@@ -115,27 +111,10 @@ export const teams_devices_schemas_single_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_schemas-type` in responses.
- */
-export const teams_devices_schemas_type_output: JsonSchema = {
-  "enum": [
-    "workspace_one",
-    "crowdstrike_s2s",
-    "uptycs",
-    "intune",
-    "kolide",
-    "tanium_s2s",
-    "sentinelone_s2s",
-    "custom_s2s"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_workspace_one_config_response` in responses.
  */
-export const teams_devices_workspace_one_config_response_output: JsonSchema = {
+export const teams$$devices_workspace_one_config_response: JsonSchema = {
   "properties": {
     "api_url": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/schemas.ts
index 060ebf922..5305e0819 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/schemas.ts
@@ -3,18 +3,10 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `teams-devices_components-schemas-name`.
- */
-export const teams_devices_components_schemas_name: JsonSchema = {
-  "description": "The name of the device posture integration.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_config_request`.
  */
-export const teams_devices_config_request: JsonSchema = {
+export const teams$$devices_config_request: JsonSchema = {
   "description": "The configuration object containing third-party integration information.",
   "oneOf": [
     {
@@ -47,7 +39,7 @@ export const teams_devices_config_request: JsonSchema = {
 /**
  * The schema of `teams-devices_crowdstrike_config_request`.
  */
-export const teams_devices_crowdstrike_config_request: JsonSchema = {
+export const teams$$devices_crowdstrike_config_request: JsonSchema = {
   "description": "Crowdstrike Config",
   "properties": {
     "api_url": {
@@ -79,7 +71,7 @@ export const teams_devices_crowdstrike_config_request: JsonSchema = {
 /**
  * The schema of `teams-devices_custom_s2s_config_request`.
  */
-export const teams_devices_custom_s2s_config_request: JsonSchema = {
+export const teams$$devices_custom_s2s_config_request: JsonSchema = {
   "description": "Custom Device Posture Integration Config",
   "properties": {
     "access_client_id": {
@@ -103,18 +95,10 @@ export const teams_devices_custom_s2s_config_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_interval`.
- */
-export const teams_devices_interval: JsonSchema = {
-  "description": "The interval between each posture check with the third-party API. Use `m` for minutes (e.g. `5m`) and `h` for hours (e.g. `12h`).",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_intune_config_request`.
  */
-export const teams_devices_intune_config_request: JsonSchema = {
+export const teams$$devices_intune_config_request: JsonSchema = {
   "description": "Intune Config",
   "properties": {
     "client_id": {
@@ -141,7 +125,7 @@ export const teams_devices_intune_config_request: JsonSchema = {
 /**
  * The schema of `teams-devices_kolide_config_request`.
  */
-export const teams_devices_kolide_config_request: JsonSchema = {
+export const teams$$devices_kolide_config_request: JsonSchema = {
   "description": "Kolide Config",
   "properties": {
     "client_id": {
@@ -160,28 +144,10 @@ export const teams_devices_kolide_config_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_schemas-type`.
- */
-export const teams_devices_schemas_type: JsonSchema = {
-  "description": "The type of device posture integration.",
-  "enum": [
-    "workspace_one",
-    "crowdstrike_s2s",
-    "uptycs",
-    "intune",
-    "kolide",
-    "tanium_s2s",
-    "sentinelone_s2s",
-    "custom_s2s"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_sentinelone_s2s_config_request`.
  */
-export const teams_devices_sentinelone_s2s_config_request: JsonSchema = {
+export const teams$$devices_sentinelone_s2s_config_request: JsonSchema = {
   "description": "SentinelOne S2S Config",
   "properties": {
     "api_url": {
@@ -203,7 +169,7 @@ export const teams_devices_sentinelone_s2s_config_request: JsonSchema = {
 /**
  * The schema of `teams-devices_tanium_config_request`.
  */
-export const teams_devices_tanium_config_request: JsonSchema = {
+export const teams$$devices_tanium_config_request: JsonSchema = {
   "description": "Tanium Config",
   "properties": {
     "access_client_id": {
@@ -233,7 +199,7 @@ export const teams_devices_tanium_config_request: JsonSchema = {
 /**
  * The schema of `teams-devices_uptycs_config_request`.
  */
-export const teams_devices_uptycs_config_request: JsonSchema = {
+export const teams$$devices_uptycs_config_request: JsonSchema = {
   "description": "Uptycs Config",
   "properties": {
     "api_url": {
@@ -265,7 +231,7 @@ export const teams_devices_uptycs_config_request: JsonSchema = {
 /**
  * The schema of `teams-devices_workspace_one_config_request`.
  */
-export const teams_devices_workspace_one_config_request: JsonSchema = {
+export const teams$$devices_workspace_one_config_request: JsonSchema = {
   "description": "Workspace One Config",
   "properties": {
     "api_url": {
diff --git a/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/tools.ts
index 9604f6e32..c45d76a17 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/posture/integrations/tools.ts
@@ -3,71 +3,70 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  teams_devices_api_response_collection_output,
-  teams_devices_api_response_common_failure_output,
-  teams_devices_api_response_common_output,
-  teams_devices_api_response_single_output,
-  teams_devices_messages_output,
-  teams_devices_result_info_output,
-  teams_devices_uuid_output,
+  teams$$devices_api$$response$$collection,
+  teams$$devices_api$$response$$common,
+  teams$$devices_api$$response$$common$$failure,
+  teams$$devices_api$$response$$single,
+  teams$$devices_messages,
+  teams$$devices_result_info,
 } from "../../outputs.js";
-import { teams_devices_identifier, teams_devices_uuid } from "../../schemas.js";
 import {
-  teams_devices_components_schemas_name_output,
-  teams_devices_config_response_output,
-  teams_devices_device_posture_integrations_output,
-  teams_devices_interval_output,
-  teams_devices_schemas_id_response_output,
-  teams_devices_schemas_response_collection_output,
-  teams_devices_schemas_single_response_output,
-  teams_devices_schemas_type_output,
-  teams_devices_workspace_one_config_response_output,
+  teams$$devices_config_response,
+  teams$$devices_device$$posture$$integrations,
+  teams$$devices_schemas$$id_response,
+  teams$$devices_schemas$$response_collection,
+  teams$$devices_schemas$$single_response,
+  teams$$devices_workspace_one_config_response,
 } from "./outputs.js";
 import {
-  teams_devices_components_schemas_name,
-  teams_devices_config_request,
-  teams_devices_crowdstrike_config_request,
-  teams_devices_custom_s2s_config_request,
-  teams_devices_interval,
-  teams_devices_intune_config_request,
-  teams_devices_kolide_config_request,
-  teams_devices_schemas_type,
-  teams_devices_sentinelone_s2s_config_request,
-  teams_devices_tanium_config_request,
-  teams_devices_uptycs_config_request,
-  teams_devices_workspace_one_config_request,
+  teams$$devices_config_request,
+  teams$$devices_crowdstrike_config_request,
+  teams$$devices_custom_s2s_config_request,
+  teams$$devices_intune_config_request,
+  teams$$devices_kolide_config_request,
+  teams$$devices_sentinelone_s2s_config_request,
+  teams$$devices_tanium_config_request,
+  teams$$devices_uptycs_config_request,
+  teams$$devices_workspace_one_config_request,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.posture.integrations`.
+ * The tools of `zeroTrust.devices.posture.integrations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_posture_integrations_create",
+    name: "zeroTrust_devices_posture_integrations_create",
     title: "Create posture integration",
-    description: "Create a new device posture integration.",
+    description: "Create a new device posture integration.\n\nPOST /accounts/{account_id}/devices/posture/integration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "config": {
               "$ref": "#/$defs/teams-devices_config_request"
             },
             "interval": {
-              "$ref": "#/$defs/teams-devices_interval",
-              "description": "The interval between each posture check with the third-party API. Use `m` for minutes (e.g. `5m`) and `h` for hours (e.g. `12h`)."
+              "description": "The interval between each posture check with the third-party API. Use `m` for minutes (e.g. `5m`) and `h` for hours (e.g. `12h`).",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/teams-devices_components-schemas-name",
-              "description": "The name of the device posture integration."
+              "description": "The name of the device posture integration.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/teams-devices_schemas-type",
-              "description": "The type of device posture integration."
+              "description": "The type of device posture integration.",
+              "enum": [
+                "workspace_one",
+                "crowdstrike_s2s",
+                "uptycs",
+                "intune",
+                "kolide",
+                "tanium_s2s",
+                "sentinelone_s2s",
+                "custom_s2s"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -77,42 +76,47 @@ export const tools: readonly Tool[] = [
             "type"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name,
-        "teams-devices_config_request": teams_devices_config_request,
-        "teams-devices_crowdstrike_config_request": teams_devices_crowdstrike_config_request,
-        "teams-devices_custom_s2s_config_request": teams_devices_custom_s2s_config_request,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_interval": teams_devices_interval,
-        "teams-devices_intune_config_request": teams_devices_intune_config_request,
-        "teams-devices_kolide_config_request": teams_devices_kolide_config_request,
-        "teams-devices_schemas-type": teams_devices_schemas_type,
-        "teams-devices_sentinelone_s2s_config_request": teams_devices_sentinelone_s2s_config_request,
-        "teams-devices_tanium_config_request": teams_devices_tanium_config_request,
-        "teams-devices_uptycs_config_request": teams_devices_uptycs_config_request,
-        "teams-devices_workspace_one_config_request": teams_devices_workspace_one_config_request,
+        "teams-devices_config_request": teams$$devices_config_request,
+        "teams-devices_crowdstrike_config_request": teams$$devices_crowdstrike_config_request,
+        "teams-devices_custom_s2s_config_request": teams$$devices_custom_s2s_config_request,
+        "teams-devices_intune_config_request": teams$$devices_intune_config_request,
+        "teams-devices_kolide_config_request": teams$$devices_kolide_config_request,
+        "teams-devices_sentinelone_s2s_config_request": teams$$devices_sentinelone_s2s_config_request,
+        "teams-devices_tanium_config_request": teams$$devices_tanium_config_request,
+        "teams-devices_uptycs_config_request": teams$$devices_uptycs_config_request,
+        "teams-devices_workspace_one_config_request": teams$$devices_workspace_one_config_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_schemas-single_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name_output,
-        "teams-devices_config_response": teams_devices_config_response_output,
-        "teams-devices_device-posture-integrations": teams_devices_device_posture_integrations_output,
-        "teams-devices_interval": teams_devices_interval_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-single_response": teams_devices_schemas_single_response_output,
-        "teams-devices_schemas-type": teams_devices_schemas_type_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_config_response": teams_devices_workspace_one_config_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_config_response": teams$$devices_config_response,
+        "teams-devices_device-posture-integrations": teams$$devices_device$$posture$$integrations,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-single_response": teams$$devices_schemas$$single_response,
+        "teams-devices_workspace_one_config_response": teams$$devices_workspace_one_config_response,
       },
     },
     annotations: {
@@ -139,18 +143,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name_output,
-        "teams-devices_config_response": teams_devices_config_response_output,
-        "teams-devices_device-posture-integrations": teams_devices_device_posture_integrations_output,
-        "teams-devices_interval": teams_devices_interval_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-single_response": teams_devices_schemas_single_response_output,
-        "teams-devices_schemas-type": teams_devices_schemas_type_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_config_response": teams_devices_workspace_one_config_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_config_response": teams$$devices_config_response,
+        "teams-devices_device-posture-integrations": teams$$devices_device$$posture$$integrations,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-single_response": teams$$devices_schemas$$single_response,
+        "teams-devices_workspace_one_config_response": teams$$devices_workspace_one_config_response,
       },
     },
     request: (args) => ({
@@ -159,36 +159,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_posture_integrations_delete",
+    name: "zeroTrust_devices_posture_integrations_delete",
     title: "Delete posture integration",
-    description: "Delete a configured device posture integration.",
+    description: "Delete a configured device posture integration.\n\nDELETE /accounts/{account_id}/devices/posture/integration/{integration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
-        "integration_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "integration_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "integration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "integration_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_uuid": teams_devices_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_schemas-id_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-id_response": teams_devices_schemas_id_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-id_response": teams$$devices_schemas$$id_response,
       },
     },
     annotations: {
@@ -215,11 +221,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-id_response": teams_devices_schemas_id_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-id_response": teams$$devices_schemas$$id_response,
       },
     },
     request: (args) => ({
@@ -227,43 +233,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_posture_integrations_get",
+    name: "zeroTrust_devices_posture_integrations_get",
     title: "Get posture integration",
-    description: "Fetches details for a single device posture integration.",
+    description: "Fetches details for a single device posture integration.\n\nGET /accounts/{account_id}/devices/posture/integration/{integration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
-        "integration_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "integration_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "integration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "integration_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_uuid": teams_devices_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_schemas-single_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name_output,
-        "teams-devices_config_response": teams_devices_config_response_output,
-        "teams-devices_device-posture-integrations": teams_devices_device_posture_integrations_output,
-        "teams-devices_interval": teams_devices_interval_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-single_response": teams_devices_schemas_single_response_output,
-        "teams-devices_schemas-type": teams_devices_schemas_type_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_config_response": teams_devices_workspace_one_config_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_config_response": teams$$devices_config_response,
+        "teams-devices_device-posture-integrations": teams$$devices_device$$posture$$integrations,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-single_response": teams$$devices_schemas$$single_response,
+        "teams-devices_workspace_one_config_response": teams$$devices_workspace_one_config_response,
       },
     },
     annotations: {
@@ -285,18 +293,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name_output,
-        "teams-devices_config_response": teams_devices_config_response_output,
-        "teams-devices_device-posture-integrations": teams_devices_device_posture_integrations_output,
-        "teams-devices_interval": teams_devices_interval_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-single_response": teams_devices_schemas_single_response_output,
-        "teams-devices_schemas-type": teams_devices_schemas_type_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_config_response": teams_devices_workspace_one_config_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_config_response": teams$$devices_config_response,
+        "teams-devices_device-posture-integrations": teams$$devices_device$$posture$$integrations,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-single_response": teams$$devices_schemas$$single_response,
+        "teams-devices_workspace_one_config_response": teams$$devices_workspace_one_config_response,
       },
     },
     request: (args) => ({
@@ -304,38 +308,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_posture_integrations_list",
+    name: "zeroTrust_devices_posture_integrations_list",
     title: "List posture integrations",
-    description: "Fetches the list of device posture integrations for an account.",
+    description: "Fetches the list of device posture integrations for an account.\n\nGET /accounts/{account_id}/devices/posture/integration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_schemas-response_collection",
       $defs: {
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name_output,
-        "teams-devices_config_response": teams_devices_config_response_output,
-        "teams-devices_device-posture-integrations": teams_devices_device_posture_integrations_output,
-        "teams-devices_interval": teams_devices_interval_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_schemas-response_collection": teams_devices_schemas_response_collection_output,
-        "teams-devices_schemas-type": teams_devices_schemas_type_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_config_response": teams_devices_workspace_one_config_response_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_config_response": teams$$devices_config_response,
+        "teams-devices_device-posture-integrations": teams$$devices_device$$posture$$integrations,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_schemas-response_collection": teams$$devices_schemas$$response_collection,
+        "teams-devices_workspace_one_config_response": teams$$devices_workspace_one_config_response,
       },
     },
     annotations: {
@@ -357,19 +364,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name_output,
-        "teams-devices_config_response": teams_devices_config_response_output,
-        "teams-devices_device-posture-integrations": teams_devices_device_posture_integrations_output,
-        "teams-devices_interval": teams_devices_interval_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_schemas-response_collection": teams_devices_schemas_response_collection_output,
-        "teams-devices_schemas-type": teams_devices_schemas_type_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_config_response": teams_devices_workspace_one_config_response_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_config_response": teams$$devices_config_response,
+        "teams-devices_device-posture-integrations": teams$$devices_device$$posture$$integrations,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_schemas-response_collection": teams$$devices_schemas$$response_collection,
+        "teams-devices_workspace_one_config_response": teams$$devices_workspace_one_config_response,
       },
     },
     request: (args) => ({
@@ -377,76 +380,87 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_posture_integrations_update",
+    name: "zeroTrust_devices_posture_integrations_update",
     title: "Update posture integration",
-    description: "Updates a configured device posture integration.",
+    description: "Updates a configured device posture integration.\n\nPATCH /accounts/{account_id}/devices/posture/integration/{integration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "config": {
               "$ref": "#/$defs/teams-devices_config_request"
             },
             "interval": {
-              "$ref": "#/$defs/teams-devices_interval",
-              "description": "The interval between each posture check with the third-party API. Use `m` for minutes (e.g. `5m`) and `h` for hours (e.g. `12h`)."
+              "description": "The interval between each posture check with the third-party API. Use `m` for minutes (e.g. `5m`) and `h` for hours (e.g. `12h`).",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/teams-devices_components-schemas-name",
-              "description": "The name of the device posture integration."
+              "description": "The name of the device posture integration.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/teams-devices_schemas-type",
-              "description": "The type of device posture integration."
+              "description": "The type of device posture integration.",
+              "enum": [
+                "workspace_one",
+                "crowdstrike_s2s",
+                "uptycs",
+                "intune",
+                "kolide",
+                "tanium_s2s",
+                "sentinelone_s2s",
+                "custom_s2s"
+              ],
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "integration_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "integration_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "integration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "integration_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name,
-        "teams-devices_config_request": teams_devices_config_request,
-        "teams-devices_crowdstrike_config_request": teams_devices_crowdstrike_config_request,
-        "teams-devices_custom_s2s_config_request": teams_devices_custom_s2s_config_request,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_interval": teams_devices_interval,
-        "teams-devices_intune_config_request": teams_devices_intune_config_request,
-        "teams-devices_kolide_config_request": teams_devices_kolide_config_request,
-        "teams-devices_schemas-type": teams_devices_schemas_type,
-        "teams-devices_sentinelone_s2s_config_request": teams_devices_sentinelone_s2s_config_request,
-        "teams-devices_tanium_config_request": teams_devices_tanium_config_request,
-        "teams-devices_uptycs_config_request": teams_devices_uptycs_config_request,
-        "teams-devices_uuid": teams_devices_uuid,
-        "teams-devices_workspace_one_config_request": teams_devices_workspace_one_config_request,
+        "teams-devices_config_request": teams$$devices_config_request,
+        "teams-devices_crowdstrike_config_request": teams$$devices_crowdstrike_config_request,
+        "teams-devices_custom_s2s_config_request": teams$$devices_custom_s2s_config_request,
+        "teams-devices_intune_config_request": teams$$devices_intune_config_request,
+        "teams-devices_kolide_config_request": teams$$devices_kolide_config_request,
+        "teams-devices_sentinelone_s2s_config_request": teams$$devices_sentinelone_s2s_config_request,
+        "teams-devices_tanium_config_request": teams$$devices_tanium_config_request,
+        "teams-devices_uptycs_config_request": teams$$devices_uptycs_config_request,
+        "teams-devices_workspace_one_config_request": teams$$devices_workspace_one_config_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_schemas-single_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name_output,
-        "teams-devices_config_response": teams_devices_config_response_output,
-        "teams-devices_device-posture-integrations": teams_devices_device_posture_integrations_output,
-        "teams-devices_interval": teams_devices_interval_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-single_response": teams_devices_schemas_single_response_output,
-        "teams-devices_schemas-type": teams_devices_schemas_type_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_config_response": teams_devices_workspace_one_config_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_config_response": teams$$devices_config_response,
+        "teams-devices_device-posture-integrations": teams$$devices_device$$posture$$integrations,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-single_response": teams$$devices_schemas$$single_response,
+        "teams-devices_workspace_one_config_response": teams$$devices_workspace_one_config_response,
       },
     },
     annotations: {
@@ -473,18 +487,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_components-schemas-name": teams_devices_components_schemas_name_output,
-        "teams-devices_config_response": teams_devices_config_response_output,
-        "teams-devices_device-posture-integrations": teams_devices_device_posture_integrations_output,
-        "teams-devices_interval": teams_devices_interval_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_schemas-single_response": teams_devices_schemas_single_response_output,
-        "teams-devices_schemas-type": teams_devices_schemas_type_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_config_response": teams_devices_workspace_one_config_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_config_response": teams$$devices_config_response,
+        "teams-devices_device-posture-integrations": teams$$devices_device$$posture$$integrations,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_schemas-single_response": teams$$devices_schemas$$single_response,
+        "teams-devices_workspace_one_config_response": teams$$devices_workspace_one_config_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/posture/rules/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/posture/rules/outputs.ts
index d8beb951d..6e91f94da 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/posture/rules/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/posture/rules/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * The schema of `teams-devices_access_serial_number_list_input_request` in
  * responses.
  */
-export const teams_devices_access_serial_number_list_input_request_output: JsonSchema = {
+export const teams$$devices_access_serial_number_list_input_request: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -22,7 +22,7 @@ export const teams_devices_access_serial_number_list_input_request_output: JsonS
 /**
  * The schema of `teams-devices_antivirus_input_request` in responses.
  */
-export const teams_devices_antivirus_input_request_output: JsonSchema = {
+export const teams$$devices_antivirus_input_request: JsonSchema = {
   "properties": {
     "update_window_days": {
       "type": "number"
@@ -34,7 +34,7 @@ export const teams_devices_antivirus_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_application_input_request` in responses.
  */
-export const teams_devices_application_input_request_output: JsonSchema = {
+export const teams$$devices_application_input_request: JsonSchema = {
   "properties": {
     "operating_system": {
       "enum": [
@@ -64,7 +64,7 @@ export const teams_devices_application_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_carbonblack_input_request` in responses.
  */
-export const teams_devices_carbonblack_input_request_output: JsonSchema = {
+export const teams$$devices_carbonblack_input_request: JsonSchema = {
   "properties": {
     "operating_system": {
       "enum": [
@@ -94,7 +94,7 @@ export const teams_devices_carbonblack_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_checkDisks` in responses.
  */
-export const teams_devices_checkDisks_output: JsonSchema = {
+export const teams$$devices_checkDisks: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -104,7 +104,7 @@ export const teams_devices_checkDisks_output: JsonSchema = {
 /**
  * The schema of `teams-devices_client_certificate_input_request` in responses.
  */
-export const teams_devices_client_certificate_input_request_output: JsonSchema = {
+export const teams$$devices_client_certificate_input_request: JsonSchema = {
   "properties": {
     "certificate_id": {
       "type": "string"
@@ -124,7 +124,7 @@ export const teams_devices_client_certificate_input_request_output: JsonSchema =
  * The schema of `teams-devices_client_certificate_v2_input_request` in
  * responses.
  */
-export const teams_devices_client_certificate_v2_input_request_output: JsonSchema = {
+export const teams$$devices_client_certificate_v2_input_request: JsonSchema = {
   "properties": {
     "certificate_id": {
       "type": "string"
@@ -137,7 +137,11 @@ export const teams_devices_client_certificate_v2_input_request_output: JsonSchem
     },
     "extended_key_usage": {
       "items": {
-        "$ref": "#/$defs/teams-devices_extended_key_usage_enum"
+        "enum": [
+          "clientAuth",
+          "emailProtection"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
@@ -178,7 +182,7 @@ export const teams_devices_client_certificate_v2_input_request_output: JsonSchem
 /**
  * The schema of `teams-devices_crowdstrike_input_request` in responses.
  */
-export const teams_devices_crowdstrike_input_request_output: JsonSchema = {
+export const teams$$devices_crowdstrike_input_request: JsonSchema = {
   "properties": {
     "connection_id": {
       "type": "string"
@@ -236,7 +240,7 @@ export const teams_devices_crowdstrike_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_custom_s2s_input_request` in responses.
  */
-export const teams_devices_custom_s2s_input_request_output: JsonSchema = {
+export const teams$$devices_custom_s2s_input_request: JsonSchema = {
   "properties": {
     "connection_id": {
       "type": "string"
@@ -263,29 +267,22 @@ export const teams_devices_custom_s2s_input_request_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_description` in responses.
- */
-export const teams_devices_description_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_device-posture-rules` in responses.
  */
-export const teams_devices_device_posture_rules_output: JsonSchema = {
+export const teams$$devices_device$$posture$$rules: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/teams-devices_description"
+      "type": "string"
     },
     "enabled": {
       "type": "boolean"
     },
     "expiration": {
-      "$ref": "#/$defs/teams-devices_expiration"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/teams-devices_uuid"
+      "type": "string"
     },
     "input": {
       "$ref": "#/$defs/teams-devices_input"
@@ -294,13 +291,38 @@ export const teams_devices_device_posture_rules_output: JsonSchema = {
       "$ref": "#/$defs/teams-devices_match"
     },
     "name": {
-      "$ref": "#/$defs/teams-devices_name"
+      "type": "string"
     },
     "schedule": {
-      "$ref": "#/$defs/teams-devices_schedule"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/teams-devices_type"
+      "enum": [
+        "file",
+        "application",
+        "tanium",
+        "gateway",
+        "warp",
+        "disk_encryption",
+        "serial_number",
+        "sentinelone",
+        "carbonblack",
+        "firewall",
+        "os_version",
+        "domain_joined",
+        "client_certificate",
+        "client_certificate_v2",
+        "antivirus",
+        "unique_client_id",
+        "kolide",
+        "tanium_s2s",
+        "crowdstrike_s2s",
+        "intune",
+        "workspace_one",
+        "sentinelone_s2s",
+        "custom_s2s"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
@@ -309,13 +331,13 @@ export const teams_devices_device_posture_rules_output: JsonSchema = {
 /**
  * The schema of `teams-devices_disk_encryption_input_request` in responses.
  */
-export const teams_devices_disk_encryption_input_request_output: JsonSchema = {
+export const teams$$devices_disk_encryption_input_request: JsonSchema = {
   "properties": {
     "checkDisks": {
       "$ref": "#/$defs/teams-devices_checkDisks"
     },
     "requireAll": {
-      "$ref": "#/$defs/teams-devices_requireAll"
+      "type": "boolean"
     }
   },
   "type": "object"
@@ -324,7 +346,7 @@ export const teams_devices_disk_encryption_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_domain_joined_input_request` in responses.
  */
-export const teams_devices_domain_joined_input_request_output: JsonSchema = {
+export const teams$$devices_domain_joined_input_request: JsonSchema = {
   "properties": {
     "domain": {
       "type": "string"
@@ -342,28 +364,10 @@ export const teams_devices_domain_joined_input_request_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_expiration` in responses.
- */
-export const teams_devices_expiration_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_extended_key_usage_enum` in responses.
- */
-export const teams_devices_extended_key_usage_enum_output: JsonSchema = {
-  "enum": [
-    "clientAuth",
-    "emailProtection"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_file_input_request` in responses.
  */
-export const teams_devices_file_input_request_output: JsonSchema = {
+export const teams$$devices_file_input_request: JsonSchema = {
   "properties": {
     "exists": {
       "type": "boolean"
@@ -396,7 +400,7 @@ export const teams_devices_file_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_firewall_input_request` in responses.
  */
-export const teams_devices_firewall_input_request_output: JsonSchema = {
+export const teams$$devices_firewall_input_request: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -419,7 +423,7 @@ export const teams_devices_firewall_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_id_response` in responses.
  */
-export const teams_devices_id_response_output: JsonSchema = {
+export const teams$$devices_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
@@ -429,7 +433,7 @@ export const teams_devices_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/teams-devices_uuid"
+              "type": "string"
             }
           },
           "type": "object"
@@ -443,7 +447,7 @@ export const teams_devices_id_response_output: JsonSchema = {
 /**
  * The schema of `teams-devices_input` in responses.
  */
-export const teams_devices_input_output: JsonSchema = {
+export const teams$$devices_input: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/teams-devices_file_input_request"
@@ -511,7 +515,7 @@ export const teams_devices_input_output: JsonSchema = {
 /**
  * The schema of `teams-devices_intune_input_request` in responses.
  */
-export const teams_devices_intune_input_request_output: JsonSchema = {
+export const teams$$devices_intune_input_request: JsonSchema = {
   "properties": {
     "compliance_status": {
       "enum": [
@@ -538,7 +542,7 @@ export const teams_devices_intune_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_kolide_input_request` in responses.
  */
-export const teams_devices_kolide_input_request_output: JsonSchema = {
+export const teams$$devices_kolide_input_request: JsonSchema = {
   "properties": {
     "auth_state": {
       "items": {
@@ -579,7 +583,7 @@ export const teams_devices_kolide_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_match` in responses.
  */
-export const teams_devices_match_output: JsonSchema = {
+export const teams$$devices_match: JsonSchema = {
   "items": {
     "$ref": "#/$defs/teams-devices_match_item"
   },
@@ -589,26 +593,27 @@ export const teams_devices_match_output: JsonSchema = {
 /**
  * The schema of `teams-devices_match_item` in responses.
  */
-export const teams_devices_match_item_output: JsonSchema = {
+export const teams$$devices_match_item: JsonSchema = {
   "properties": {
     "platform": {
-      "$ref": "#/$defs/teams-devices_platform"
+      "enum": [
+        "windows",
+        "mac",
+        "linux",
+        "android",
+        "ios",
+        "chromeos"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_name` in responses.
- */
-export const teams_devices_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_os_version_input_request` in responses.
  */
-export const teams_devices_os_version_input_request_output: JsonSchema = {
+export const teams$$devices_os_version_input_request: JsonSchema = {
   "properties": {
     "operating_system": {
       "enum": [
@@ -650,39 +655,17 @@ export const teams_devices_os_version_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_paths` in responses.
  */
-export const teams_devices_paths_output: JsonSchema = {
+export const teams$$devices_paths: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_platform` in responses.
- */
-export const teams_devices_platform_output: JsonSchema = {
-  "enum": [
-    "windows",
-    "mac",
-    "linux",
-    "android",
-    "ios",
-    "chromeos"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_requireAll` in responses.
- */
-export const teams_devices_requireAll_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_response_collection` in responses.
  */
-export const teams_devices_response_collection_output: JsonSchema = {
+export const teams$$devices_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-collection"
@@ -701,17 +684,10 @@ export const teams_devices_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_schedule` in responses.
- */
-export const teams_devices_schedule_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_sentinelone_input_request` in responses.
  */
-export const teams_devices_sentinelone_input_request_output: JsonSchema = {
+export const teams$$devices_sentinelone_input_request: JsonSchema = {
   "properties": {
     "operating_system": {
       "enum": [
@@ -741,7 +717,7 @@ export const teams_devices_sentinelone_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_sentinelone_s2s_input_request` in responses.
  */
-export const teams_devices_sentinelone_s2s_input_request_output: JsonSchema = {
+export const teams$$devices_sentinelone_s2s_input_request: JsonSchema = {
   "properties": {
     "active_threats": {
       "type": "number"
@@ -796,7 +772,7 @@ export const teams_devices_sentinelone_s2s_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_single_response` in responses.
  */
-export const teams_devices_single_response_output: JsonSchema = {
+export const teams$$devices_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
@@ -815,7 +791,7 @@ export const teams_devices_single_response_output: JsonSchema = {
 /**
  * The schema of `teams-devices_tanium_input_request` in responses.
  */
-export const teams_devices_tanium_input_request_output: JsonSchema = {
+export const teams$$devices_tanium_input_request: JsonSchema = {
   "properties": {
     "connection_id": {
       "type": "string"
@@ -865,60 +841,21 @@ export const teams_devices_tanium_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_trust_stores` in responses.
  */
-export const teams_devices_trust_stores_output: JsonSchema = {
+export const teams$$devices_trust_stores: JsonSchema = {
   "items": {
-    "$ref": "#/$defs/teams-devices_trust_stores_enum"
+    "enum": [
+      "system",
+      "user"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_trust_stores_enum` in responses.
- */
-export const teams_devices_trust_stores_enum_output: JsonSchema = {
-  "enum": [
-    "system",
-    "user"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_type` in responses.
- */
-export const teams_devices_type_output: JsonSchema = {
-  "enum": [
-    "file",
-    "application",
-    "tanium",
-    "gateway",
-    "warp",
-    "disk_encryption",
-    "serial_number",
-    "sentinelone",
-    "carbonblack",
-    "firewall",
-    "os_version",
-    "domain_joined",
-    "client_certificate",
-    "client_certificate_v2",
-    "antivirus",
-    "unique_client_id",
-    "kolide",
-    "tanium_s2s",
-    "crowdstrike_s2s",
-    "intune",
-    "workspace_one",
-    "sentinelone_s2s",
-    "custom_s2s"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_unique_client_id_input_request` in responses.
  */
-export const teams_devices_unique_client_id_input_request_output: JsonSchema = {
+export const teams$$devices_unique_client_id_input_request: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -942,7 +879,7 @@ export const teams_devices_unique_client_id_input_request_output: JsonSchema = {
 /**
  * The schema of `teams-devices_workspace_one_input_request` in responses.
  */
-export const teams_devices_workspace_one_input_request_output: JsonSchema = {
+export const teams$$devices_workspace_one_input_request: JsonSchema = {
   "properties": {
     "compliance_status": {
       "enum": [
diff --git a/src/generated/forge-mcp/zeroTrust/devices/posture/rules/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/posture/rules/schemas.ts
index 968f36061..2a5671944 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/posture/rules/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/posture/rules/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `teams-devices_access_serial_number_list_input_request`.
  */
-export const teams_devices_access_serial_number_list_input_request: JsonSchema = {
+export const teams$$devices_access_serial_number_list_input_request: JsonSchema = {
   "description": "Serial Number",
   "properties": {
     "id": {
@@ -23,7 +23,7 @@ export const teams_devices_access_serial_number_list_input_request: JsonSchema =
 /**
  * The schema of `teams-devices_antivirus_input_request`.
  */
-export const teams_devices_antivirus_input_request: JsonSchema = {
+export const teams$$devices_antivirus_input_request: JsonSchema = {
   "description": "Antivirus",
   "properties": {
     "update_window_days": {
@@ -37,7 +37,7 @@ export const teams_devices_antivirus_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_application_input_request`.
  */
-export const teams_devices_application_input_request: JsonSchema = {
+export const teams$$devices_application_input_request: JsonSchema = {
   "description": "Application",
   "properties": {
     "operating_system": {
@@ -72,7 +72,7 @@ export const teams_devices_application_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_carbonblack_input_request`.
  */
-export const teams_devices_carbonblack_input_request: JsonSchema = {
+export const teams$$devices_carbonblack_input_request: JsonSchema = {
   "description": "Carbonblack",
   "properties": {
     "operating_system": {
@@ -107,7 +107,7 @@ export const teams_devices_carbonblack_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_checkDisks`.
  */
-export const teams_devices_checkDisks: JsonSchema = {
+export const teams$$devices_checkDisks: JsonSchema = {
   "description": "List of volume names to be checked for encryption.",
   "items": {
     "type": "string"
@@ -118,7 +118,7 @@ export const teams_devices_checkDisks: JsonSchema = {
 /**
  * The schema of `teams-devices_client_certificate_input_request`.
  */
-export const teams_devices_client_certificate_input_request: JsonSchema = {
+export const teams$$devices_client_certificate_input_request: JsonSchema = {
   "description": "Client Certificate",
   "properties": {
     "certificate_id": {
@@ -140,7 +140,7 @@ export const teams_devices_client_certificate_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_client_certificate_v2_input_request`.
  */
-export const teams_devices_client_certificate_v2_input_request: JsonSchema = {
+export const teams$$devices_client_certificate_v2_input_request: JsonSchema = {
   "description": "Client Certificate V2",
   "properties": {
     "certificate_id": {
@@ -158,7 +158,11 @@ export const teams_devices_client_certificate_v2_input_request: JsonSchema = {
     "extended_key_usage": {
       "description": "List of values indicating purposes for which the certificate public key can be used.",
       "items": {
-        "$ref": "#/$defs/teams-devices_extended_key_usage_enum"
+        "enum": [
+          "clientAuth",
+          "emailProtection"
+        ],
+        "type": "string"
       },
       "type": "array"
     },
@@ -203,7 +207,7 @@ export const teams_devices_client_certificate_v2_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_crowdstrike_input_request`.
  */
-export const teams_devices_crowdstrike_input_request: JsonSchema = {
+export const teams$$devices_crowdstrike_input_request: JsonSchema = {
   "description": "Crowdstrike S2S Input",
   "properties": {
     "connection_id": {
@@ -271,7 +275,7 @@ export const teams_devices_crowdstrike_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_custom_s2s_input_request`.
  */
-export const teams_devices_custom_s2s_input_request: JsonSchema = {
+export const teams$$devices_custom_s2s_input_request: JsonSchema = {
   "description": "Custom Device Posture Integration Input",
   "properties": {
     "connection_id": {
@@ -302,18 +306,10 @@ export const teams_devices_custom_s2s_input_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_description`.
- */
-export const teams_devices_description: JsonSchema = {
-  "description": "The description of the device posture rule.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_disk_encryption_input_request`.
  */
-export const teams_devices_disk_encryption_input_request: JsonSchema = {
+export const teams$$devices_disk_encryption_input_request: JsonSchema = {
   "description": "Disk Encryption",
   "properties": {
     "checkDisks": {
@@ -321,8 +317,8 @@ export const teams_devices_disk_encryption_input_request: JsonSchema = {
       "description": "List of volume names to be checked for encryption."
     },
     "requireAll": {
-      "$ref": "#/$defs/teams-devices_requireAll",
-      "description": "Whether to check all disks for encryption."
+      "description": "Whether to check all disks for encryption.",
+      "type": "boolean"
     }
   },
   "type": "object"
@@ -331,7 +327,7 @@ export const teams_devices_disk_encryption_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_domain_joined_input_request`.
  */
-export const teams_devices_domain_joined_input_request: JsonSchema = {
+export const teams$$devices_domain_joined_input_request: JsonSchema = {
   "description": "Domain Joined",
   "properties": {
     "domain": {
@@ -352,29 +348,10 @@ export const teams_devices_domain_joined_input_request: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_expiration`.
- */
-export const teams_devices_expiration: JsonSchema = {
-  "description": "Sets the expiration time for a posture check result. If empty, the result remains valid until it is overwritten by new data from the WARP client.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_extended_key_usage_enum`.
- */
-export const teams_devices_extended_key_usage_enum: JsonSchema = {
-  "enum": [
-    "clientAuth",
-    "emailProtection"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_file_input_request`.
  */
-export const teams_devices_file_input_request: JsonSchema = {
+export const teams$$devices_file_input_request: JsonSchema = {
   "description": "File Check",
   "properties": {
     "exists": {
@@ -413,7 +390,7 @@ export const teams_devices_file_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_firewall_input_request`.
  */
-export const teams_devices_firewall_input_request: JsonSchema = {
+export const teams$$devices_firewall_input_request: JsonSchema = {
   "description": "Firewall",
   "properties": {
     "enabled": {
@@ -439,7 +416,7 @@ export const teams_devices_firewall_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_input`.
  */
-export const teams_devices_input: JsonSchema = {
+export const teams$$devices_input: JsonSchema = {
   "description": "The value to be checked against.",
   "oneOf": [
     {
@@ -508,7 +485,7 @@ export const teams_devices_input: JsonSchema = {
 /**
  * The schema of `teams-devices_intune_input_request`.
  */
-export const teams_devices_intune_input_request: JsonSchema = {
+export const teams$$devices_intune_input_request: JsonSchema = {
   "description": "Intune S2S Input",
   "properties": {
     "compliance_status": {
@@ -538,7 +515,7 @@ export const teams_devices_intune_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_kolide_input_request`.
  */
-export const teams_devices_kolide_input_request: JsonSchema = {
+export const teams$$devices_kolide_input_request: JsonSchema = {
   "description": "Kolide S2S Input",
   "properties": {
     "auth_state": {
@@ -584,7 +561,7 @@ export const teams_devices_kolide_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_match`.
  */
-export const teams_devices_match: JsonSchema = {
+export const teams$$devices_match: JsonSchema = {
   "description": "The conditions that the client must match to run the rule.",
   "items": {
     "$ref": "#/$defs/teams-devices_match_item"
@@ -595,27 +572,27 @@ export const teams_devices_match: JsonSchema = {
 /**
  * The schema of `teams-devices_match_item`.
  */
-export const teams_devices_match_item: JsonSchema = {
+export const teams$$devices_match_item: JsonSchema = {
   "properties": {
     "platform": {
-      "$ref": "#/$defs/teams-devices_platform"
+      "enum": [
+        "windows",
+        "mac",
+        "linux",
+        "android",
+        "ios",
+        "chromeos"
+      ],
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_name`.
- */
-export const teams_devices_name: JsonSchema = {
-  "description": "The name of the device posture rule.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_os_version_input_request`.
  */
-export const teams_devices_os_version_input_request: JsonSchema = {
+export const teams$$devices_os_version_input_request: JsonSchema = {
   "description": "OS Version",
   "properties": {
     "operating_system": {
@@ -664,7 +641,7 @@ export const teams_devices_os_version_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_paths`.
  */
-export const teams_devices_paths: JsonSchema = {
+export const teams$$devices_paths: JsonSchema = {
   "description": "List of paths to check for client certificate on linux.",
   "items": {
     "type": "string"
@@ -672,41 +649,10 @@ export const teams_devices_paths: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_platform`.
- */
-export const teams_devices_platform: JsonSchema = {
-  "enum": [
-    "windows",
-    "mac",
-    "linux",
-    "android",
-    "ios",
-    "chromeos"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_requireAll`.
- */
-export const teams_devices_requireAll: JsonSchema = {
-  "description": "Whether to check all disks for encryption.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_schedule`.
- */
-export const teams_devices_schedule: JsonSchema = {
-  "description": "Polling frequency for the WARP client posture check. Default: `5m` (poll every five minutes). Minimum: `1m`.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_sentinelone_input_request`.
  */
-export const teams_devices_sentinelone_input_request: JsonSchema = {
+export const teams$$devices_sentinelone_input_request: JsonSchema = {
   "description": "Sentinelone",
   "properties": {
     "operating_system": {
@@ -741,7 +687,7 @@ export const teams_devices_sentinelone_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_sentinelone_s2s_input_request`.
  */
-export const teams_devices_sentinelone_s2s_input_request: JsonSchema = {
+export const teams$$devices_sentinelone_s2s_input_request: JsonSchema = {
   "description": "SentinelOne S2S Input",
   "properties": {
     "active_threats": {
@@ -804,7 +750,7 @@ export const teams_devices_sentinelone_s2s_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_tanium_input_request`.
  */
-export const teams_devices_tanium_input_request: JsonSchema = {
+export const teams$$devices_tanium_input_request: JsonSchema = {
   "description": "Tanium S2S Input",
   "properties": {
     "connection_id": {
@@ -861,62 +807,22 @@ export const teams_devices_tanium_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_trust_stores`.
  */
-export const teams_devices_trust_stores: JsonSchema = {
+export const teams$$devices_trust_stores: JsonSchema = {
   "description": "List of trust stores to check for client certificate.",
   "items": {
-    "$ref": "#/$defs/teams-devices_trust_stores_enum"
+    "enum": [
+      "system",
+      "user"
+    ],
+    "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_trust_stores_enum`.
- */
-export const teams_devices_trust_stores_enum: JsonSchema = {
-  "enum": [
-    "system",
-    "user"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_type`.
- */
-export const teams_devices_type: JsonSchema = {
-  "description": "The type of device posture rule.",
-  "enum": [
-    "file",
-    "application",
-    "tanium",
-    "gateway",
-    "warp",
-    "disk_encryption",
-    "serial_number",
-    "sentinelone",
-    "carbonblack",
-    "firewall",
-    "os_version",
-    "domain_joined",
-    "client_certificate",
-    "client_certificate_v2",
-    "antivirus",
-    "unique_client_id",
-    "kolide",
-    "tanium_s2s",
-    "crowdstrike_s2s",
-    "intune",
-    "workspace_one",
-    "sentinelone_s2s",
-    "custom_s2s"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_unique_client_id_input_request`.
  */
-export const teams_devices_unique_client_id_input_request: JsonSchema = {
+export const teams$$devices_unique_client_id_input_request: JsonSchema = {
   "description": "Unique Client ID",
   "properties": {
     "id": {
@@ -943,7 +849,7 @@ export const teams_devices_unique_client_id_input_request: JsonSchema = {
 /**
  * The schema of `teams-devices_workspace_one_input_request`.
  */
-export const teams_devices_workspace_one_input_request: JsonSchema = {
+export const teams$$devices_workspace_one_input_request: JsonSchema = {
   "description": "Workspace One S2S Input",
   "properties": {
     "compliance_status": {
diff --git a/src/generated/forge-mcp/zeroTrust/devices/posture/rules/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/posture/rules/tools.ts
index c7ec52883..307cecd31 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/posture/rules/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/posture/rules/tools.ts
@@ -3,117 +3,94 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  teams_devices_api_response_collection_output,
-  teams_devices_api_response_common_failure_output,
-  teams_devices_api_response_common_output,
-  teams_devices_api_response_single_output,
-  teams_devices_messages_output,
-  teams_devices_result_info_output,
-  teams_devices_uuid_output,
+  teams$$devices_api$$response$$collection,
+  teams$$devices_api$$response$$common,
+  teams$$devices_api$$response$$common$$failure,
+  teams$$devices_api$$response$$single,
+  teams$$devices_messages,
+  teams$$devices_result_info,
 } from "../../outputs.js";
-import { teams_devices_identifier, teams_devices_uuid } from "../../schemas.js";
 import {
-  teams_devices_access_serial_number_list_input_request_output,
-  teams_devices_antivirus_input_request_output,
-  teams_devices_application_input_request_output,
-  teams_devices_carbonblack_input_request_output,
-  teams_devices_checkDisks_output,
-  teams_devices_client_certificate_input_request_output,
-  teams_devices_client_certificate_v2_input_request_output,
-  teams_devices_crowdstrike_input_request_output,
-  teams_devices_custom_s2s_input_request_output,
-  teams_devices_description_output,
-  teams_devices_device_posture_rules_output,
-  teams_devices_disk_encryption_input_request_output,
-  teams_devices_domain_joined_input_request_output,
-  teams_devices_expiration_output,
-  teams_devices_extended_key_usage_enum_output,
-  teams_devices_file_input_request_output,
-  teams_devices_firewall_input_request_output,
-  teams_devices_id_response_output,
-  teams_devices_input_output,
-  teams_devices_intune_input_request_output,
-  teams_devices_kolide_input_request_output,
-  teams_devices_match_item_output,
-  teams_devices_match_output,
-  teams_devices_name_output,
-  teams_devices_os_version_input_request_output,
-  teams_devices_paths_output,
-  teams_devices_platform_output,
-  teams_devices_requireAll_output,
-  teams_devices_response_collection_output,
-  teams_devices_schedule_output,
-  teams_devices_sentinelone_input_request_output,
-  teams_devices_sentinelone_s2s_input_request_output,
-  teams_devices_single_response_output,
-  teams_devices_tanium_input_request_output,
-  teams_devices_trust_stores_enum_output,
-  teams_devices_trust_stores_output,
-  teams_devices_type_output,
-  teams_devices_unique_client_id_input_request_output,
-  teams_devices_workspace_one_input_request_output,
+  teams$$devices_access_serial_number_list_input_request,
+  teams$$devices_antivirus_input_request,
+  teams$$devices_application_input_request,
+  teams$$devices_carbonblack_input_request,
+  teams$$devices_checkDisks,
+  teams$$devices_client_certificate_input_request,
+  teams$$devices_client_certificate_v2_input_request,
+  teams$$devices_crowdstrike_input_request,
+  teams$$devices_custom_s2s_input_request,
+  teams$$devices_device$$posture$$rules,
+  teams$$devices_disk_encryption_input_request,
+  teams$$devices_domain_joined_input_request,
+  teams$$devices_file_input_request,
+  teams$$devices_firewall_input_request,
+  teams$$devices_id_response,
+  teams$$devices_input,
+  teams$$devices_intune_input_request,
+  teams$$devices_kolide_input_request,
+  teams$$devices_match,
+  teams$$devices_match_item,
+  teams$$devices_os_version_input_request,
+  teams$$devices_paths,
+  teams$$devices_response_collection,
+  teams$$devices_sentinelone_input_request,
+  teams$$devices_sentinelone_s2s_input_request,
+  teams$$devices_single_response,
+  teams$$devices_tanium_input_request,
+  teams$$devices_trust_stores,
+  teams$$devices_unique_client_id_input_request,
+  teams$$devices_workspace_one_input_request,
 } from "./outputs.js";
 import {
-  teams_devices_access_serial_number_list_input_request,
-  teams_devices_antivirus_input_request,
-  teams_devices_application_input_request,
-  teams_devices_carbonblack_input_request,
-  teams_devices_checkDisks,
-  teams_devices_client_certificate_input_request,
-  teams_devices_client_certificate_v2_input_request,
-  teams_devices_crowdstrike_input_request,
-  teams_devices_custom_s2s_input_request,
-  teams_devices_description,
-  teams_devices_disk_encryption_input_request,
-  teams_devices_domain_joined_input_request,
-  teams_devices_expiration,
-  teams_devices_extended_key_usage_enum,
-  teams_devices_file_input_request,
-  teams_devices_firewall_input_request,
-  teams_devices_input,
-  teams_devices_intune_input_request,
-  teams_devices_kolide_input_request,
-  teams_devices_match,
-  teams_devices_match_item,
-  teams_devices_name,
-  teams_devices_os_version_input_request,
-  teams_devices_paths,
-  teams_devices_platform,
-  teams_devices_requireAll,
-  teams_devices_schedule,
-  teams_devices_sentinelone_input_request,
-  teams_devices_sentinelone_s2s_input_request,
-  teams_devices_tanium_input_request,
-  teams_devices_trust_stores,
-  teams_devices_trust_stores_enum,
-  teams_devices_type,
-  teams_devices_unique_client_id_input_request,
-  teams_devices_workspace_one_input_request,
+  teams$$devices_access_serial_number_list_input_request as teams$$devices_access_serial_number_list_input_request$,
+  teams$$devices_antivirus_input_request as teams$$devices_antivirus_input_request$,
+  teams$$devices_application_input_request as teams$$devices_application_input_request$,
+  teams$$devices_carbonblack_input_request as teams$$devices_carbonblack_input_request$,
+  teams$$devices_checkDisks as teams$$devices_checkDisks$,
+  teams$$devices_client_certificate_input_request as teams$$devices_client_certificate_input_request$,
+  teams$$devices_client_certificate_v2_input_request as teams$$devices_client_certificate_v2_input_request$,
+  teams$$devices_crowdstrike_input_request as teams$$devices_crowdstrike_input_request$,
+  teams$$devices_custom_s2s_input_request as teams$$devices_custom_s2s_input_request$,
+  teams$$devices_disk_encryption_input_request as teams$$devices_disk_encryption_input_request$,
+  teams$$devices_domain_joined_input_request as teams$$devices_domain_joined_input_request$,
+  teams$$devices_file_input_request as teams$$devices_file_input_request$,
+  teams$$devices_firewall_input_request as teams$$devices_firewall_input_request$,
+  teams$$devices_input as teams$$devices_input$,
+  teams$$devices_intune_input_request as teams$$devices_intune_input_request$,
+  teams$$devices_kolide_input_request as teams$$devices_kolide_input_request$,
+  teams$$devices_match as teams$$devices_match$,
+  teams$$devices_match_item as teams$$devices_match_item$,
+  teams$$devices_os_version_input_request as teams$$devices_os_version_input_request$,
+  teams$$devices_paths as teams$$devices_paths$,
+  teams$$devices_sentinelone_input_request as teams$$devices_sentinelone_input_request$,
+  teams$$devices_sentinelone_s2s_input_request as teams$$devices_sentinelone_s2s_input_request$,
+  teams$$devices_tanium_input_request as teams$$devices_tanium_input_request$,
+  teams$$devices_trust_stores as teams$$devices_trust_stores$,
+  teams$$devices_unique_client_id_input_request as teams$$devices_unique_client_id_input_request$,
+  teams$$devices_workspace_one_input_request as teams$$devices_workspace_one_input_request$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.posture.rules`.
+ * The tools of `zeroTrust.devices.posture.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_posture_rules_create",
+    name: "zeroTrust_devices_posture_rules_create",
     title: "Create posture rule",
-    description: "Creates a new device posture rule.",
+    description: "Creates a new device posture rule.\n\nPOST /accounts/{account_id}/devices/posture",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/teams-devices_description",
-              "description": "The description of the device posture rule."
+              "description": "The description of the device posture rule.",
+              "type": "string"
             },
             "expiration": {
-              "$ref": "#/$defs/teams-devices_expiration",
-              "description": "Sets the expiration time for a posture check result. If empty, the result remains valid until it is overwritten by new data from the WARP client."
+              "description": "Sets the expiration time for a posture check result. If empty, the result remains valid until it is overwritten by new data from the WARP client.",
+              "type": "string"
             },
             "input": {
               "$ref": "#/$defs/teams-devices_input",
@@ -124,16 +101,41 @@ export const tools: readonly Tool[] = [
               "description": "The conditions that the client must match to run the rule."
             },
             "name": {
-              "$ref": "#/$defs/teams-devices_name",
-              "description": "The name of the device posture rule."
+              "description": "The name of the device posture rule.",
+              "type": "string"
             },
             "schedule": {
-              "$ref": "#/$defs/teams-devices_schedule",
-              "description": "Polling frequency for the WARP client posture check. Default: `5m` (poll every five minutes). Minimum: `1m`."
+              "description": "Polling frequency for the WARP client posture check. Default: `5m` (poll every five minutes). Minimum: `1m`.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/teams-devices_type",
-              "description": "The type of device posture rule."
+              "description": "The type of device posture rule.",
+              "enum": [
+                "file",
+                "application",
+                "tanium",
+                "gateway",
+                "warp",
+                "disk_encryption",
+                "serial_number",
+                "sentinelone",
+                "carbonblack",
+                "firewall",
+                "os_version",
+                "domain_joined",
+                "client_certificate",
+                "client_certificate_v2",
+                "antivirus",
+                "unique_client_id",
+                "kolide",
+                "tanium_s2s",
+                "crowdstrike_s2s",
+                "intune",
+                "workspace_one",
+                "sentinelone_s2s",
+                "custom_s2s"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -141,95 +143,88 @@ export const tools: readonly Tool[] = [
             "type"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request,
-        "teams-devices_application_input_request": teams_devices_application_input_request,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request,
-        "teams-devices_checkDisks": teams_devices_checkDisks,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request,
-        "teams-devices_description": teams_devices_description,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request,
-        "teams-devices_expiration": teams_devices_expiration,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum,
-        "teams-devices_file_input_request": teams_devices_file_input_request,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_input": teams_devices_input,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request,
-        "teams-devices_match": teams_devices_match,
-        "teams-devices_match_item": teams_devices_match_item,
-        "teams-devices_name": teams_devices_name,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request,
-        "teams-devices_paths": teams_devices_paths,
-        "teams-devices_platform": teams_devices_platform,
-        "teams-devices_requireAll": teams_devices_requireAll,
-        "teams-devices_schedule": teams_devices_schedule,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request,
-        "teams-devices_trust_stores": teams_devices_trust_stores,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum,
-        "teams-devices_type": teams_devices_type,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request$,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request$,
+        "teams-devices_application_input_request": teams$$devices_application_input_request$,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request$,
+        "teams-devices_checkDisks": teams$$devices_checkDisks$,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request$,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request$,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request$,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request$,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request$,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request$,
+        "teams-devices_file_input_request": teams$$devices_file_input_request$,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request$,
+        "teams-devices_input": teams$$devices_input$,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request$,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request$,
+        "teams-devices_match": teams$$devices_match$,
+        "teams-devices_match_item": teams$$devices_match_item$,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request$,
+        "teams-devices_paths": teams$$devices_paths$,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request$,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request$,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request$,
+        "teams-devices_trust_stores": teams$$devices_trust_stores$,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request$,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_single_response",
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request_output,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_application_input_request": teams_devices_application_input_request_output,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request_output,
-        "teams-devices_checkDisks": teams_devices_checkDisks_output,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request_output,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request_output,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request_output,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request_output,
-        "teams-devices_description": teams_devices_description_output,
-        "teams-devices_device-posture-rules": teams_devices_device_posture_rules_output,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request_output,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request_output,
-        "teams-devices_expiration": teams_devices_expiration_output,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum_output,
-        "teams-devices_file_input_request": teams_devices_file_input_request_output,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request_output,
-        "teams-devices_input": teams_devices_input_output,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request_output,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request_output,
-        "teams-devices_match": teams_devices_match_output,
-        "teams-devices_match_item": teams_devices_match_item_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_name": teams_devices_name_output,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request_output,
-        "teams-devices_paths": teams_devices_paths_output,
-        "teams-devices_platform": teams_devices_platform_output,
-        "teams-devices_requireAll": teams_devices_requireAll_output,
-        "teams-devices_schedule": teams_devices_schedule_output,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request_output,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request_output,
-        "teams-devices_single_response": teams_devices_single_response_output,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request_output,
-        "teams-devices_trust_stores": teams_devices_trust_stores_output,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum_output,
-        "teams-devices_type": teams_devices_type_output,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request_output,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_application_input_request": teams$$devices_application_input_request,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request,
+        "teams-devices_checkDisks": teams$$devices_checkDisks,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request,
+        "teams-devices_device-posture-rules": teams$$devices_device$$posture$$rules,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request,
+        "teams-devices_file_input_request": teams$$devices_file_input_request,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request,
+        "teams-devices_input": teams$$devices_input,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request,
+        "teams-devices_match": teams$$devices_match,
+        "teams-devices_match_item": teams$$devices_match_item,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request,
+        "teams-devices_paths": teams$$devices_paths,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request,
+        "teams-devices_single_response": teams$$devices_single_response,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request,
+        "teams-devices_trust_stores": teams$$devices_trust_stores,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request,
       },
     },
     annotations: {
@@ -256,48 +251,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request_output,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_application_input_request": teams_devices_application_input_request_output,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request_output,
-        "teams-devices_checkDisks": teams_devices_checkDisks_output,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request_output,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request_output,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request_output,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request_output,
-        "teams-devices_description": teams_devices_description_output,
-        "teams-devices_device-posture-rules": teams_devices_device_posture_rules_output,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request_output,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request_output,
-        "teams-devices_expiration": teams_devices_expiration_output,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum_output,
-        "teams-devices_file_input_request": teams_devices_file_input_request_output,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request_output,
-        "teams-devices_input": teams_devices_input_output,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request_output,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request_output,
-        "teams-devices_match": teams_devices_match_output,
-        "teams-devices_match_item": teams_devices_match_item_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_name": teams_devices_name_output,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request_output,
-        "teams-devices_paths": teams_devices_paths_output,
-        "teams-devices_platform": teams_devices_platform_output,
-        "teams-devices_requireAll": teams_devices_requireAll_output,
-        "teams-devices_schedule": teams_devices_schedule_output,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request_output,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request_output,
-        "teams-devices_single_response": teams_devices_single_response_output,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request_output,
-        "teams-devices_trust_stores": teams_devices_trust_stores_output,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum_output,
-        "teams-devices_type": teams_devices_type_output,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request_output,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_application_input_request": teams$$devices_application_input_request,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request,
+        "teams-devices_checkDisks": teams$$devices_checkDisks,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request,
+        "teams-devices_device-posture-rules": teams$$devices_device$$posture$$rules,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request,
+        "teams-devices_file_input_request": teams$$devices_file_input_request,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request,
+        "teams-devices_input": teams$$devices_input,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request,
+        "teams-devices_match": teams$$devices_match,
+        "teams-devices_match_item": teams$$devices_match_item,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request,
+        "teams-devices_paths": teams$$devices_paths,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request,
+        "teams-devices_single_response": teams$$devices_single_response,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request,
+        "teams-devices_trust_stores": teams$$devices_trust_stores,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request,
       },
     },
     request: (args) => ({
@@ -306,37 +291,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_posture_rules_delete",
+    name: "zeroTrust_devices_posture_rules_delete",
     title: "Delete posture rule",
-    description: "Deletes a device posture rule.",
+    description: "Deletes a device posture rule.\n\nDELETE /accounts/{account_id}/devices/posture/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
-        "rule_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_uuid": teams_devices_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_id_response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_id_response": teams_devices_id_response_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_id_response": teams$$devices_id_response,
+        "teams-devices_messages": teams$$devices_messages,
       },
     },
     annotations: {
@@ -363,12 +353,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_id_response": teams_devices_id_response_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_id_response": teams$$devices_id_response,
+        "teams-devices_messages": teams$$devices_messages,
       },
     },
     request: (args) => ({
@@ -376,73 +365,69 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_posture_rules_get",
+    name: "zeroTrust_devices_posture_rules_get",
     title: "Get posture rule",
-    description: "Fetches a single device posture rule.",
+    description: "Fetches a single device posture rule.\n\nGET /accounts/{account_id}/devices/posture/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
-        "rule_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_uuid": teams_devices_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_single_response",
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request_output,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_application_input_request": teams_devices_application_input_request_output,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request_output,
-        "teams-devices_checkDisks": teams_devices_checkDisks_output,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request_output,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request_output,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request_output,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request_output,
-        "teams-devices_description": teams_devices_description_output,
-        "teams-devices_device-posture-rules": teams_devices_device_posture_rules_output,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request_output,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request_output,
-        "teams-devices_expiration": teams_devices_expiration_output,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum_output,
-        "teams-devices_file_input_request": teams_devices_file_input_request_output,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request_output,
-        "teams-devices_input": teams_devices_input_output,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request_output,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request_output,
-        "teams-devices_match": teams_devices_match_output,
-        "teams-devices_match_item": teams_devices_match_item_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_name": teams_devices_name_output,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request_output,
-        "teams-devices_paths": teams_devices_paths_output,
-        "teams-devices_platform": teams_devices_platform_output,
-        "teams-devices_requireAll": teams_devices_requireAll_output,
-        "teams-devices_schedule": teams_devices_schedule_output,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request_output,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request_output,
-        "teams-devices_single_response": teams_devices_single_response_output,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request_output,
-        "teams-devices_trust_stores": teams_devices_trust_stores_output,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum_output,
-        "teams-devices_type": teams_devices_type_output,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request_output,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_application_input_request": teams$$devices_application_input_request,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request,
+        "teams-devices_checkDisks": teams$$devices_checkDisks,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request,
+        "teams-devices_device-posture-rules": teams$$devices_device$$posture$$rules,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request,
+        "teams-devices_file_input_request": teams$$devices_file_input_request,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request,
+        "teams-devices_input": teams$$devices_input,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request,
+        "teams-devices_match": teams$$devices_match,
+        "teams-devices_match_item": teams$$devices_match_item,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request,
+        "teams-devices_paths": teams$$devices_paths,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request,
+        "teams-devices_single_response": teams$$devices_single_response,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request,
+        "teams-devices_trust_stores": teams$$devices_trust_stores,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request,
       },
     },
     annotations: {
@@ -464,48 +449,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request_output,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_application_input_request": teams_devices_application_input_request_output,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request_output,
-        "teams-devices_checkDisks": teams_devices_checkDisks_output,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request_output,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request_output,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request_output,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request_output,
-        "teams-devices_description": teams_devices_description_output,
-        "teams-devices_device-posture-rules": teams_devices_device_posture_rules_output,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request_output,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request_output,
-        "teams-devices_expiration": teams_devices_expiration_output,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum_output,
-        "teams-devices_file_input_request": teams_devices_file_input_request_output,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request_output,
-        "teams-devices_input": teams_devices_input_output,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request_output,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request_output,
-        "teams-devices_match": teams_devices_match_output,
-        "teams-devices_match_item": teams_devices_match_item_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_name": teams_devices_name_output,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request_output,
-        "teams-devices_paths": teams_devices_paths_output,
-        "teams-devices_platform": teams_devices_platform_output,
-        "teams-devices_requireAll": teams_devices_requireAll_output,
-        "teams-devices_schedule": teams_devices_schedule_output,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request_output,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request_output,
-        "teams-devices_single_response": teams_devices_single_response_output,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request_output,
-        "teams-devices_trust_stores": teams_devices_trust_stores_output,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum_output,
-        "teams-devices_type": teams_devices_type_output,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request_output,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_application_input_request": teams$$devices_application_input_request,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request,
+        "teams-devices_checkDisks": teams$$devices_checkDisks,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request,
+        "teams-devices_device-posture-rules": teams$$devices_device$$posture$$rules,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request,
+        "teams-devices_file_input_request": teams$$devices_file_input_request,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request,
+        "teams-devices_input": teams$$devices_input,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request,
+        "teams-devices_match": teams$$devices_match,
+        "teams-devices_match_item": teams$$devices_match_item,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request,
+        "teams-devices_paths": teams$$devices_paths,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request,
+        "teams-devices_single_response": teams$$devices_single_response,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request,
+        "teams-devices_trust_stores": teams$$devices_trust_stores,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request,
       },
     },
     request: (args) => ({
@@ -513,68 +488,65 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_posture_rules_list",
+    name: "zeroTrust_devices_posture_rules_list",
     title: "List posture rules",
-    description: "Fetches device posture rules for a Zero Trust account.",
+    description: "Fetches device posture rules for a Zero Trust account.\n\nGET /accounts/{account_id}/devices/posture",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_response_collection",
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request_output,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request_output,
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_application_input_request": teams_devices_application_input_request_output,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request_output,
-        "teams-devices_checkDisks": teams_devices_checkDisks_output,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request_output,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request_output,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request_output,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request_output,
-        "teams-devices_description": teams_devices_description_output,
-        "teams-devices_device-posture-rules": teams_devices_device_posture_rules_output,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request_output,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request_output,
-        "teams-devices_expiration": teams_devices_expiration_output,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum_output,
-        "teams-devices_file_input_request": teams_devices_file_input_request_output,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request_output,
-        "teams-devices_input": teams_devices_input_output,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request_output,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request_output,
-        "teams-devices_match": teams_devices_match_output,
-        "teams-devices_match_item": teams_devices_match_item_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_name": teams_devices_name_output,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request_output,
-        "teams-devices_paths": teams_devices_paths_output,
-        "teams-devices_platform": teams_devices_platform_output,
-        "teams-devices_requireAll": teams_devices_requireAll_output,
-        "teams-devices_response_collection": teams_devices_response_collection_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_schedule": teams_devices_schedule_output,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request_output,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request_output,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request_output,
-        "teams-devices_trust_stores": teams_devices_trust_stores_output,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum_output,
-        "teams-devices_type": teams_devices_type_output,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request_output,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_application_input_request": teams$$devices_application_input_request,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request,
+        "teams-devices_checkDisks": teams$$devices_checkDisks,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request,
+        "teams-devices_device-posture-rules": teams$$devices_device$$posture$$rules,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request,
+        "teams-devices_file_input_request": teams$$devices_file_input_request,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request,
+        "teams-devices_input": teams$$devices_input,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request,
+        "teams-devices_match": teams$$devices_match,
+        "teams-devices_match_item": teams$$devices_match_item,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request,
+        "teams-devices_paths": teams$$devices_paths,
+        "teams-devices_response_collection": teams$$devices_response_collection,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request,
+        "teams-devices_trust_stores": teams$$devices_trust_stores,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request,
       },
     },
     annotations: {
@@ -596,49 +568,39 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request_output,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request_output,
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_application_input_request": teams_devices_application_input_request_output,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request_output,
-        "teams-devices_checkDisks": teams_devices_checkDisks_output,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request_output,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request_output,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request_output,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request_output,
-        "teams-devices_description": teams_devices_description_output,
-        "teams-devices_device-posture-rules": teams_devices_device_posture_rules_output,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request_output,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request_output,
-        "teams-devices_expiration": teams_devices_expiration_output,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum_output,
-        "teams-devices_file_input_request": teams_devices_file_input_request_output,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request_output,
-        "teams-devices_input": teams_devices_input_output,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request_output,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request_output,
-        "teams-devices_match": teams_devices_match_output,
-        "teams-devices_match_item": teams_devices_match_item_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_name": teams_devices_name_output,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request_output,
-        "teams-devices_paths": teams_devices_paths_output,
-        "teams-devices_platform": teams_devices_platform_output,
-        "teams-devices_requireAll": teams_devices_requireAll_output,
-        "teams-devices_response_collection": teams_devices_response_collection_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_schedule": teams_devices_schedule_output,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request_output,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request_output,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request_output,
-        "teams-devices_trust_stores": teams_devices_trust_stores_output,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum_output,
-        "teams-devices_type": teams_devices_type_output,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request_output,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_application_input_request": teams$$devices_application_input_request,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request,
+        "teams-devices_checkDisks": teams$$devices_checkDisks,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request,
+        "teams-devices_device-posture-rules": teams$$devices_device$$posture$$rules,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request,
+        "teams-devices_file_input_request": teams$$devices_file_input_request,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request,
+        "teams-devices_input": teams$$devices_input,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request,
+        "teams-devices_match": teams$$devices_match,
+        "teams-devices_match_item": teams$$devices_match_item,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request,
+        "teams-devices_paths": teams$$devices_paths,
+        "teams-devices_response_collection": teams$$devices_response_collection,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request,
+        "teams-devices_trust_stores": teams$$devices_trust_stores,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request,
       },
     },
     request: (args) => ({
@@ -646,24 +608,21 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_posture_rules_update",
+    name: "zeroTrust_devices_posture_rules_update",
     title: "Update posture rule",
-    description: "Updates a device posture rule.",
+    description: "Updates a device posture rule.\n\nPUT /accounts/{account_id}/devices/posture/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/teams-devices_description",
-              "description": "The description of the device posture rule."
+              "description": "The description of the device posture rule.",
+              "type": "string"
             },
             "expiration": {
-              "$ref": "#/$defs/teams-devices_expiration",
-              "description": "Sets the expiration time for a posture check result. If empty, the result remains valid until it is overwritten by new data from the WARP client."
+              "description": "Sets the expiration time for a posture check result. If empty, the result remains valid until it is overwritten by new data from the WARP client.",
+              "type": "string"
             },
             "input": {
               "$ref": "#/$defs/teams-devices_input",
@@ -674,16 +633,41 @@ export const tools: readonly Tool[] = [
               "description": "The conditions that the client must match to run the rule."
             },
             "name": {
-              "$ref": "#/$defs/teams-devices_name",
-              "description": "The name of the device posture rule."
+              "description": "The name of the device posture rule.",
+              "type": "string"
             },
             "schedule": {
-              "$ref": "#/$defs/teams-devices_schedule",
-              "description": "Polling frequency for the WARP client posture check. Default: `5m` (poll every five minutes). Minimum: `1m`."
+              "description": "Polling frequency for the WARP client posture check. Default: `5m` (poll every five minutes). Minimum: `1m`.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/teams-devices_type",
-              "description": "The type of device posture rule."
+              "description": "The type of device posture rule.",
+              "enum": [
+                "file",
+                "application",
+                "tanium",
+                "gateway",
+                "warp",
+                "disk_encryption",
+                "serial_number",
+                "sentinelone",
+                "carbonblack",
+                "firewall",
+                "os_version",
+                "domain_joined",
+                "client_certificate",
+                "client_certificate_v2",
+                "antivirus",
+                "unique_client_id",
+                "kolide",
+                "tanium_s2s",
+                "crowdstrike_s2s",
+                "intune",
+                "workspace_one",
+                "sentinelone_s2s",
+                "custom_s2s"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -692,100 +676,92 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "rule_id": {
-          "$ref": "#/$defs/teams-devices_uuid",
-          "description": "API UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "API UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request,
-        "teams-devices_application_input_request": teams_devices_application_input_request,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request,
-        "teams-devices_checkDisks": teams_devices_checkDisks,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request,
-        "teams-devices_description": teams_devices_description,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request,
-        "teams-devices_expiration": teams_devices_expiration,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum,
-        "teams-devices_file_input_request": teams_devices_file_input_request,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_input": teams_devices_input,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request,
-        "teams-devices_match": teams_devices_match,
-        "teams-devices_match_item": teams_devices_match_item,
-        "teams-devices_name": teams_devices_name,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request,
-        "teams-devices_paths": teams_devices_paths,
-        "teams-devices_platform": teams_devices_platform,
-        "teams-devices_requireAll": teams_devices_requireAll,
-        "teams-devices_schedule": teams_devices_schedule,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request,
-        "teams-devices_trust_stores": teams_devices_trust_stores,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum,
-        "teams-devices_type": teams_devices_type,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request,
-        "teams-devices_uuid": teams_devices_uuid,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request$,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request$,
+        "teams-devices_application_input_request": teams$$devices_application_input_request$,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request$,
+        "teams-devices_checkDisks": teams$$devices_checkDisks$,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request$,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request$,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request$,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request$,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request$,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request$,
+        "teams-devices_file_input_request": teams$$devices_file_input_request$,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request$,
+        "teams-devices_input": teams$$devices_input$,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request$,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request$,
+        "teams-devices_match": teams$$devices_match$,
+        "teams-devices_match_item": teams$$devices_match_item$,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request$,
+        "teams-devices_paths": teams$$devices_paths$,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request$,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request$,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request$,
+        "teams-devices_trust_stores": teams$$devices_trust_stores$,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request$,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_single_response",
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request_output,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_application_input_request": teams_devices_application_input_request_output,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request_output,
-        "teams-devices_checkDisks": teams_devices_checkDisks_output,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request_output,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request_output,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request_output,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request_output,
-        "teams-devices_description": teams_devices_description_output,
-        "teams-devices_device-posture-rules": teams_devices_device_posture_rules_output,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request_output,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request_output,
-        "teams-devices_expiration": teams_devices_expiration_output,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum_output,
-        "teams-devices_file_input_request": teams_devices_file_input_request_output,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request_output,
-        "teams-devices_input": teams_devices_input_output,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request_output,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request_output,
-        "teams-devices_match": teams_devices_match_output,
-        "teams-devices_match_item": teams_devices_match_item_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_name": teams_devices_name_output,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request_output,
-        "teams-devices_paths": teams_devices_paths_output,
-        "teams-devices_platform": teams_devices_platform_output,
-        "teams-devices_requireAll": teams_devices_requireAll_output,
-        "teams-devices_schedule": teams_devices_schedule_output,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request_output,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request_output,
-        "teams-devices_single_response": teams_devices_single_response_output,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request_output,
-        "teams-devices_trust_stores": teams_devices_trust_stores_output,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum_output,
-        "teams-devices_type": teams_devices_type_output,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request_output,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_application_input_request": teams$$devices_application_input_request,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request,
+        "teams-devices_checkDisks": teams$$devices_checkDisks,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request,
+        "teams-devices_device-posture-rules": teams$$devices_device$$posture$$rules,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request,
+        "teams-devices_file_input_request": teams$$devices_file_input_request,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request,
+        "teams-devices_input": teams$$devices_input,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request,
+        "teams-devices_match": teams$$devices_match,
+        "teams-devices_match_item": teams$$devices_match_item,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request,
+        "teams-devices_paths": teams$$devices_paths,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request,
+        "teams-devices_single_response": teams$$devices_single_response,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request,
+        "teams-devices_trust_stores": teams$$devices_trust_stores,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request,
       },
     },
     annotations: {
@@ -812,48 +788,38 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_access_serial_number_list_input_request": teams_devices_access_serial_number_list_input_request_output,
-        "teams-devices_antivirus_input_request": teams_devices_antivirus_input_request_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_application_input_request": teams_devices_application_input_request_output,
-        "teams-devices_carbonblack_input_request": teams_devices_carbonblack_input_request_output,
-        "teams-devices_checkDisks": teams_devices_checkDisks_output,
-        "teams-devices_client_certificate_input_request": teams_devices_client_certificate_input_request_output,
-        "teams-devices_client_certificate_v2_input_request": teams_devices_client_certificate_v2_input_request_output,
-        "teams-devices_crowdstrike_input_request": teams_devices_crowdstrike_input_request_output,
-        "teams-devices_custom_s2s_input_request": teams_devices_custom_s2s_input_request_output,
-        "teams-devices_description": teams_devices_description_output,
-        "teams-devices_device-posture-rules": teams_devices_device_posture_rules_output,
-        "teams-devices_disk_encryption_input_request": teams_devices_disk_encryption_input_request_output,
-        "teams-devices_domain_joined_input_request": teams_devices_domain_joined_input_request_output,
-        "teams-devices_expiration": teams_devices_expiration_output,
-        "teams-devices_extended_key_usage_enum": teams_devices_extended_key_usage_enum_output,
-        "teams-devices_file_input_request": teams_devices_file_input_request_output,
-        "teams-devices_firewall_input_request": teams_devices_firewall_input_request_output,
-        "teams-devices_input": teams_devices_input_output,
-        "teams-devices_intune_input_request": teams_devices_intune_input_request_output,
-        "teams-devices_kolide_input_request": teams_devices_kolide_input_request_output,
-        "teams-devices_match": teams_devices_match_output,
-        "teams-devices_match_item": teams_devices_match_item_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_name": teams_devices_name_output,
-        "teams-devices_os_version_input_request": teams_devices_os_version_input_request_output,
-        "teams-devices_paths": teams_devices_paths_output,
-        "teams-devices_platform": teams_devices_platform_output,
-        "teams-devices_requireAll": teams_devices_requireAll_output,
-        "teams-devices_schedule": teams_devices_schedule_output,
-        "teams-devices_sentinelone_input_request": teams_devices_sentinelone_input_request_output,
-        "teams-devices_sentinelone_s2s_input_request": teams_devices_sentinelone_s2s_input_request_output,
-        "teams-devices_single_response": teams_devices_single_response_output,
-        "teams-devices_tanium_input_request": teams_devices_tanium_input_request_output,
-        "teams-devices_trust_stores": teams_devices_trust_stores_output,
-        "teams-devices_trust_stores_enum": teams_devices_trust_stores_enum_output,
-        "teams-devices_type": teams_devices_type_output,
-        "teams-devices_unique_client_id_input_request": teams_devices_unique_client_id_input_request_output,
-        "teams-devices_uuid": teams_devices_uuid_output,
-        "teams-devices_workspace_one_input_request": teams_devices_workspace_one_input_request_output,
+        "teams-devices_access_serial_number_list_input_request": teams$$devices_access_serial_number_list_input_request,
+        "teams-devices_antivirus_input_request": teams$$devices_antivirus_input_request,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_application_input_request": teams$$devices_application_input_request,
+        "teams-devices_carbonblack_input_request": teams$$devices_carbonblack_input_request,
+        "teams-devices_checkDisks": teams$$devices_checkDisks,
+        "teams-devices_client_certificate_input_request": teams$$devices_client_certificate_input_request,
+        "teams-devices_client_certificate_v2_input_request": teams$$devices_client_certificate_v2_input_request,
+        "teams-devices_crowdstrike_input_request": teams$$devices_crowdstrike_input_request,
+        "teams-devices_custom_s2s_input_request": teams$$devices_custom_s2s_input_request,
+        "teams-devices_device-posture-rules": teams$$devices_device$$posture$$rules,
+        "teams-devices_disk_encryption_input_request": teams$$devices_disk_encryption_input_request,
+        "teams-devices_domain_joined_input_request": teams$$devices_domain_joined_input_request,
+        "teams-devices_file_input_request": teams$$devices_file_input_request,
+        "teams-devices_firewall_input_request": teams$$devices_firewall_input_request,
+        "teams-devices_input": teams$$devices_input,
+        "teams-devices_intune_input_request": teams$$devices_intune_input_request,
+        "teams-devices_kolide_input_request": teams$$devices_kolide_input_request,
+        "teams-devices_match": teams$$devices_match,
+        "teams-devices_match_item": teams$$devices_match_item,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_os_version_input_request": teams$$devices_os_version_input_request,
+        "teams-devices_paths": teams$$devices_paths,
+        "teams-devices_sentinelone_input_request": teams$$devices_sentinelone_input_request,
+        "teams-devices_sentinelone_s2s_input_request": teams$$devices_sentinelone_s2s_input_request,
+        "teams-devices_single_response": teams$$devices_single_response,
+        "teams-devices_tanium_input_request": teams$$devices_tanium_input_request,
+        "teams-devices_trust_stores": teams$$devices_trust_stores,
+        "teams-devices_unique_client_id_input_request": teams$$devices_unique_client_id_input_request,
+        "teams-devices_workspace_one_input_request": teams$$devices_workspace_one_input_request,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/outputs.ts
index 841b9233b..e0a77b303 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `teams-devices_browser_extension_config` in responses.
  */
-export const teams_devices_browser_extension_config_output: JsonSchema = {
+export const teams$$devices_browser_extension_config: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -33,50 +33,43 @@ export const teams_devices_browser_extension_config_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_default` in responses.
- */
-export const teams_devices_default_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_device_settings_policy` in responses.
  */
-export const teams_devices_device_settings_policy_output: JsonSchema = {
+export const teams$$devices_device_settings_policy: JsonSchema = {
   "properties": {
     "allow_mode_switch": {
-      "$ref": "#/$defs/teams-devices_allow_mode_switch"
+      "type": "boolean"
     },
     "allow_updates": {
-      "$ref": "#/$defs/teams-devices_allow_updates"
+      "type": "boolean"
     },
     "allowed_to_leave": {
-      "$ref": "#/$defs/teams-devices_allowed_to_leave"
+      "type": "boolean"
     },
     "auto_connect": {
-      "$ref": "#/$defs/teams-devices_auto_connect"
+      "type": "number"
     },
     "browser_extension_config": {
       "$ref": "#/$defs/teams-devices_browser_extension_config"
     },
     "captive_portal": {
-      "$ref": "#/$defs/teams-devices_captive_portal"
+      "type": "number"
     },
     "default": {
-      "$ref": "#/$defs/teams-devices_default"
+      "type": "boolean"
     },
     "description": {
-      "$ref": "#/$defs/teams-devices_schemas-description"
+      "type": "string"
     },
     "disable_auto_fallback": {
-      "$ref": "#/$defs/teams-devices_disable_auto_fallback"
+      "type": "boolean"
     },
     "dns_search_suffixes": {
       "$ref": "#/$defs/teams-devices_dns_search_suffixes"
     },
     "enable_device_credential_authentication": {
-      "$ref": "#/$defs/teams-devices_enable_device_credential_authentication"
+      "type": "boolean"
     },
     "enabled": {
       "type": "boolean"
@@ -85,13 +78,13 @@ export const teams_devices_device_settings_policy_output: JsonSchema = {
       "$ref": "#/$defs/teams-devices_exclude"
     },
     "exclude_office_ips": {
-      "$ref": "#/$defs/teams-devices_exclude_office_ips"
+      "type": "boolean"
     },
     "fallback_domains": {
       "$ref": "#/$defs/teams-devices_fallback_domains"
     },
     "gateway_unique_id": {
-      "$ref": "#/$defs/teams-devices_gateway_unique_id"
+      "type": "string"
     },
     "global_acceleration": {
       "$ref": "#/$defs/teams-devices_global_acceleration"
@@ -100,40 +93,44 @@ export const teams_devices_device_settings_policy_output: JsonSchema = {
       "$ref": "#/$defs/teams-devices_include"
     },
     "lan_allow_minutes": {
-      "$ref": "#/$defs/teams-devices_lan_allow_minutes"
+      "type": "number"
     },
     "lan_allow_subnet_size": {
-      "$ref": "#/$defs/teams-devices_lan_allow_subnet_size"
+      "type": "number"
     },
     "match": {
-      "$ref": "#/$defs/teams-devices_schemas-match"
+      "type": "string"
     },
     "name": {
       "type": "string"
     },
     "policy_id": {
-      "$ref": "#/$defs/teams-devices_schemas-uuid"
+      "type": "string"
     },
     "precedence": {
-      "$ref": "#/$defs/teams-devices_precedence"
+      "type": "number"
     },
     "profile_type": {
-      "$ref": "#/$defs/teams-devices_profile_type"
+      "enum": [
+        "warp",
+        "browser_extension"
+      ],
+      "type": "string"
     },
     "register_interface_ip_with_dns": {
-      "$ref": "#/$defs/teams-devices_register_interface_ip_with_dns"
+      "type": "boolean"
     },
     "sccm_vpn_boundary_support": {
-      "$ref": "#/$defs/teams-devices_sccm_vpn_boundary_support"
+      "type": "boolean"
     },
     "service_mode_v2": {
       "$ref": "#/$defs/teams-devices_service_mode_v2"
     },
     "support_url": {
-      "$ref": "#/$defs/teams-devices_support_url"
+      "type": "string"
     },
     "switch_locked": {
-      "$ref": "#/$defs/teams-devices_switch_locked"
+      "type": "boolean"
     },
     "target_tests": {
       "items": {
@@ -142,10 +139,10 @@ export const teams_devices_device_settings_policy_output: JsonSchema = {
       "type": "array"
     },
     "tunnel_protocol": {
-      "$ref": "#/$defs/teams-devices_tunnel_protocol"
+      "type": "string"
     },
     "uninstall_protection": {
-      "$ref": "#/$defs/teams-devices_uninstall_protection"
+      "type": "boolean"
     },
     "virtual_networks": {
       "$ref": "#/$defs/teams-devices_virtual_networks"
@@ -157,7 +154,7 @@ export const teams_devices_device_settings_policy_output: JsonSchema = {
 /**
  * The schema of `teams-devices_device_settings_response` in responses.
  */
-export const teams_devices_device_settings_response_output: JsonSchema = {
+export const teams$$devices_device_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
@@ -177,7 +174,7 @@ export const teams_devices_device_settings_response_output: JsonSchema = {
  * The schema of `teams-devices_device_settings_response_collection` in
  * responses.
  */
-export const teams_devices_device_settings_response_collection_output: JsonSchema = {
+export const teams$$devices_device_settings_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-collection"
@@ -196,31 +193,10 @@ export const teams_devices_device_settings_response_collection_output: JsonSchem
   ]
 };
 
-/**
- * The schema of `teams-devices_precedence` in responses.
- */
-export const teams_devices_precedence_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_schemas-description` in responses.
- */
-export const teams_devices_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_schemas-match` in responses.
- */
-export const teams_devices_schemas_match_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_target_dex_test` in responses.
  */
-export const teams_devices_target_dex_test_output: JsonSchema = {
+export const teams$$devices_target_dex_test: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/schemas.ts
index a91f791e4..52feaea41 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `teams-devices_browser_extension_config`.
  */
-export const teams_devices_browser_extension_config: JsonSchema = {
+export const teams$$devices_browser_extension_config: JsonSchema = {
   "description": "Browser extension proxy settings. Required when profile_type is browser_extension and invalid for WARP profiles.",
   "oneOf": [
     {
@@ -35,35 +35,3 @@ export const teams_devices_browser_extension_config: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `teams-devices_default`.
- */
-export const teams_devices_default: JsonSchema = {
-  "description": "Whether the policy is the account default. WARP group profiles cannot set this field.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_precedence`.
- */
-export const teams_devices_precedence: JsonSchema = {
-  "description": "The precedence of the policy. Lower values indicate higher precedence. Policies will be evaluated in ascending order of this field.",
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_schemas-description`.
- */
-export const teams_devices_schemas_description: JsonSchema = {
-  "description": "A description of the policy.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_schemas-match`.
- */
-export const teams_devices_schemas_match: JsonSchema = {
-  "description": "The wirefilter expression to match devices. Available values: \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.service_token_uuid\", \"identity.saml_attributes\", \"network\", \"os.name\", \"os.version\", \"device.tags\".",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/tools.ts
index 62f28ba33..3dc788a82 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/profiles/custom/tools.ts
@@ -1,171 +1,108 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  teams_devices_api_response_collection_output,
-  teams_devices_api_response_common_failure_output,
-  teams_devices_api_response_common_output,
-  teams_devices_api_response_single_output,
-  teams_devices_messages_output,
-  teams_devices_result_info_output,
+  teams$$devices_api$$response$$collection,
+  teams$$devices_api$$response$$common,
+  teams$$devices_api$$response$$common$$failure,
+  teams$$devices_api$$response$$single,
+  teams$$devices_messages,
+  teams$$devices_result_info,
 } from "../../outputs.js";
-import { teams_devices_identifier } from "../../schemas.js";
 import {
-  teams_devices_allow_mode_switch_output,
-  teams_devices_allow_updates_output,
-  teams_devices_allowed_to_leave_output,
-  teams_devices_auto_connect_output,
-  teams_devices_captive_portal_output,
-  teams_devices_disable_auto_fallback_output,
-  teams_devices_dns_search_suffix_output,
-  teams_devices_dns_search_suffixes_output,
-  teams_devices_enable_device_credential_authentication_output,
-  teams_devices_exclude_office_ips_output,
-  teams_devices_exclude_output,
-  teams_devices_exclude_split_tunnel_with_address_output,
-  teams_devices_exclude_split_tunnel_with_host_output,
-  teams_devices_fallback_domain_output,
-  teams_devices_fallback_domains_output,
-  teams_devices_gateway_unique_id_output,
-  teams_devices_global_acceleration_output,
-  teams_devices_include_output,
-  teams_devices_include_split_tunnel_address_output,
-  teams_devices_include_split_tunnel_description_output,
-  teams_devices_include_split_tunnel_host_output,
-  teams_devices_include_split_tunnel_with_address_output,
-  teams_devices_include_split_tunnel_with_host_output,
-  teams_devices_ip_output,
-  teams_devices_lan_allow_minutes_output,
-  teams_devices_lan_allow_subnet_size_output,
-  teams_devices_profile_type_output,
-  teams_devices_register_interface_ip_with_dns_output,
-  teams_devices_sccm_vpn_boundary_support_output,
-  teams_devices_schemas_uuid_output,
-  teams_devices_service_mode_v2_output,
-  teams_devices_split_tunnel_address_output,
-  teams_devices_split_tunnel_description_output,
-  teams_devices_split_tunnel_host_output,
-  teams_devices_split_tunnel_include_output,
-  teams_devices_split_tunnel_output,
-  teams_devices_support_url_output,
-  teams_devices_switch_locked_output,
-  teams_devices_tunnel_protocol_output,
-  teams_devices_uninstall_protection_output,
-  teams_devices_virtual_networks_output,
+  teams$$devices_dns_search_suffix,
+  teams$$devices_dns_search_suffixes,
+  teams$$devices_exclude,
+  teams$$devices_exclude_split_tunnel_with_address,
+  teams$$devices_exclude_split_tunnel_with_host,
+  teams$$devices_fallback_domain,
+  teams$$devices_fallback_domains,
+  teams$$devices_global_acceleration,
+  teams$$devices_include,
+  teams$$devices_include_split_tunnel_with_address,
+  teams$$devices_include_split_tunnel_with_host,
+  teams$$devices_service_mode_v2,
+  teams$$devices_split_tunnel,
+  teams$$devices_split_tunnel_include,
+  teams$$devices_virtual_networks,
 } from "../outputs.js";
 import {
-  teams_devices_allow_mode_switch,
-  teams_devices_allow_updates,
-  teams_devices_allowed_to_leave,
-  teams_devices_auto_connect,
-  teams_devices_captive_portal,
-  teams_devices_disable_auto_fallback,
-  teams_devices_dns_search_suffix,
-  teams_devices_dns_search_suffixes,
-  teams_devices_enable_device_credential_authentication,
-  teams_devices_exclude_office_ips,
-  teams_devices_exclude_request,
-  teams_devices_exclude_split_tunnel_with_address,
-  teams_devices_exclude_split_tunnel_with_host,
-  teams_devices_global_acceleration,
-  teams_devices_include_request,
-  teams_devices_include_split_tunnel_address,
-  teams_devices_include_split_tunnel_description,
-  teams_devices_include_split_tunnel_host,
-  teams_devices_include_split_tunnel_with_address,
-  teams_devices_include_split_tunnel_with_host,
-  teams_devices_lan_allow_minutes,
-  teams_devices_lan_allow_subnet_size,
-  teams_devices_profile_type,
-  teams_devices_register_interface_ip_with_dns,
-  teams_devices_sccm_vpn_boundary_support,
-  teams_devices_schemas_uuid,
-  teams_devices_service_mode_v2,
-  teams_devices_split_tunnel,
-  teams_devices_split_tunnel_address,
-  teams_devices_split_tunnel_description,
-  teams_devices_split_tunnel_host,
-  teams_devices_split_tunnel_include,
-  teams_devices_support_url,
-  teams_devices_switch_locked,
-  teams_devices_tunnel_protocol,
-  teams_devices_uninstall_protection,
-  teams_devices_virtual_networks,
+  teams$$devices_dns_search_suffix as teams$$devices_dns_search_suffix$,
+  teams$$devices_dns_search_suffixes as teams$$devices_dns_search_suffixes$,
+  teams$$devices_exclude_request,
+  teams$$devices_exclude_split_tunnel_with_address as teams$$devices_exclude_split_tunnel_with_address$,
+  teams$$devices_exclude_split_tunnel_with_host as teams$$devices_exclude_split_tunnel_with_host$,
+  teams$$devices_global_acceleration as teams$$devices_global_acceleration$,
+  teams$$devices_include_request,
+  teams$$devices_include_split_tunnel_with_address as teams$$devices_include_split_tunnel_with_address$,
+  teams$$devices_include_split_tunnel_with_host as teams$$devices_include_split_tunnel_with_host$,
+  teams$$devices_service_mode_v2 as teams$$devices_service_mode_v2$,
+  teams$$devices_split_tunnel as teams$$devices_split_tunnel$,
+  teams$$devices_split_tunnel_include as teams$$devices_split_tunnel_include$,
+  teams$$devices_virtual_networks as teams$$devices_virtual_networks$,
 } from "../schemas.js";
 import {
-  teams_devices_browser_extension_config_output,
-  teams_devices_default_output,
-  teams_devices_device_settings_policy_output,
-  teams_devices_device_settings_response_collection_output,
-  teams_devices_device_settings_response_output,
-  teams_devices_precedence_output,
-  teams_devices_schemas_description_output,
-  teams_devices_schemas_match_output,
-  teams_devices_target_dex_test_output,
+  teams$$devices_browser_extension_config,
+  teams$$devices_device_settings_policy,
+  teams$$devices_device_settings_response,
+  teams$$devices_device_settings_response_collection,
+  teams$$devices_target_dex_test,
 } from "./outputs.js";
-import {
-  teams_devices_browser_extension_config,
-  teams_devices_default,
-  teams_devices_precedence,
-  teams_devices_schemas_description,
-  teams_devices_schemas_match,
-} from "./schemas.js";
+import { teams$$devices_browser_extension_config as teams$$devices_browser_extension_config$ } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.profiles.custom`.
+ * The tools of `zeroTrust.devices.profiles.custom`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_profiles_custom_create",
+    name: "zeroTrust_devices_profiles_custom_create",
     title: "Create a device settings profile",
-    description: "Creates a device settings profile to be applied to certain devices matching the criteria.",
+    description: "Creates a device settings profile to be applied to certain devices matching the criteria.\n\nPOST /accounts/{account_id}/devices/policy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "allow_mode_switch": {
-              "$ref": "#/$defs/teams-devices_allow_mode_switch",
               "default": false,
-              "description": "Whether to allow the user to switch WARP between modes."
+              "description": "Whether to allow the user to switch WARP between modes.",
+              "type": "boolean"
             },
             "allow_updates": {
-              "$ref": "#/$defs/teams-devices_allow_updates",
               "default": false,
-              "description": "Whether to receive update notifications when a new version of the client is available."
+              "description": "Whether to receive update notifications when a new version of the client is available.",
+              "type": "boolean"
             },
             "allowed_to_leave": {
-              "$ref": "#/$defs/teams-devices_allowed_to_leave",
               "default": true,
-              "description": "Whether to allow devices to leave the organization."
+              "description": "Whether to allow devices to leave the organization.",
+              "type": "boolean"
             },
             "auto_connect": {
-              "$ref": "#/$defs/teams-devices_auto_connect",
               "default": 0,
-              "description": "The amount of time in seconds to reconnect after having been disabled."
+              "description": "The amount of time in seconds to reconnect after having been disabled.",
+              "type": "number"
             },
             "browser_extension_config": {
               "$ref": "#/$defs/teams-devices_browser_extension_config",
               "description": "Browser extension proxy settings. Required when profile_type is browser_extension and invalid for WARP profiles."
             },
             "captive_portal": {
-              "$ref": "#/$defs/teams-devices_captive_portal",
               "default": 180,
-              "description": "Turn on the captive portal after the specified amount of time."
+              "description": "Turn on the captive portal after the specified amount of time.",
+              "type": "number"
             },
             "default": {
-              "$ref": "#/$defs/teams-devices_default",
               "default": false,
-              "description": "Whether the policy is the account default. WARP group profiles cannot set this field."
+              "description": "Whether the policy is the account default. WARP group profiles cannot set this field.",
+              "type": "boolean"
             },
             "description": {
               "allOf": [
                 {
-                  "$ref": "#/$defs/teams-devices_schemas-description"
+                  "description": "A description of the policy.",
+                  "type": "string"
                 },
                 {
                   "type": "string"
@@ -173,9 +110,9 @@ export const tools: readonly Tool[] = [
               ]
             },
             "disable_auto_fallback": {
-              "$ref": "#/$defs/teams-devices_disable_auto_fallback",
               "default": false,
-              "description": "If the `dns_server` field of a fallback domain is not present, the client will fall back to a best guess of the default/system DNS resolvers unless this policy option is set to `true`."
+              "description": "If the `dns_server` field of a fallback domain is not present, the client will fall back to a best guess of the default/system DNS resolvers unless this policy option is set to `true`.",
+              "type": "boolean"
             },
             "dns_search_suffixes": {
               "$ref": "#/$defs/teams-devices_dns_search_suffixes",
@@ -183,9 +120,9 @@ export const tools: readonly Tool[] = [
               "description": "List of DNS search suffixes to apply to clients. Suffixes are evaluated in order. Use an empty array to clear."
             },
             "enable_device_credential_authentication": {
-              "$ref": "#/$defs/teams-devices_enable_device_credential_authentication",
               "default": false,
-              "description": "Determines whether the WARP client can silently reauthenticate the user with device credentials (Microsoft Entra) instead of prompting for browser-based reauthentication."
+              "description": "Determines whether the WARP client can silently reauthenticate the user with device credentials (Microsoft Entra) instead of prompting for browser-based reauthentication.",
+              "type": "boolean"
             },
             "enabled": {
               "default": true,
@@ -197,9 +134,9 @@ export const tools: readonly Tool[] = [
               "description": "List of routes excluded in the WARP client's tunnel. Both 'exclude' and 'include' cannot be set in the same request."
             },
             "exclude_office_ips": {
-              "$ref": "#/$defs/teams-devices_exclude_office_ips",
               "default": false,
-              "description": "Whether to add Microsoft IPs to Split Tunnel exclusions."
+              "description": "Whether to add Microsoft IPs to Split Tunnel exclusions.",
+              "type": "boolean"
             },
             "global_acceleration": {
               "$ref": "#/$defs/teams-devices_global_acceleration",
@@ -210,62 +147,66 @@ export const tools: readonly Tool[] = [
               "description": "List of routes included in the WARP client's tunnel. Both 'exclude' and 'include' cannot be set in the same request."
             },
             "lan_allow_minutes": {
-              "$ref": "#/$defs/teams-devices_lan_allow_minutes",
-              "description": "The amount of time in minutes a user is allowed access to their LAN. A value of 0 will allow LAN access until the next WARP reconnection, such as a reboot or a laptop waking from sleep. Note that this field is omitted from the response if null or unset."
+              "description": "The amount of time in minutes a user is allowed access to their LAN. A value of 0 will allow LAN access until the next WARP reconnection, such as a reboot or a laptop waking from sleep. Note that this field is omitted from the response if null or unset.",
+              "type": "number"
             },
             "lan_allow_subnet_size": {
-              "$ref": "#/$defs/teams-devices_lan_allow_subnet_size",
-              "description": "The size of the subnet for the local access network. Note that this field is omitted from the response if null or unset."
+              "description": "The size of the subnet for the local access network. Note that this field is omitted from the response if null or unset.",
+              "type": "number"
             },
             "match": {
-              "$ref": "#/$defs/teams-devices_schemas-match",
-              "description": "The wirefilter expression to match devices. Available values: \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.service_token_uuid\", \"identity.saml_attributes\", \"network\", \"os.name\", \"os.version\", \"device.tags\"."
+              "description": "The wirefilter expression to match devices. Available values: \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.service_token_uuid\", \"identity.saml_attributes\", \"network\", \"os.name\", \"os.version\", \"device.tags\".",
+              "type": "string"
             },
             "name": {
               "description": "The name of the device settings profile.",
               "type": "string"
             },
             "precedence": {
-              "$ref": "#/$defs/teams-devices_precedence",
-              "description": "The precedence of the policy. Lower values indicate higher precedence. Policies will be evaluated in ascending order of this field."
+              "description": "The precedence of the policy. Lower values indicate higher precedence. Policies will be evaluated in ascending order of this field.",
+              "type": "number"
             },
             "profile_type": {
-              "$ref": "#/$defs/teams-devices_profile_type",
               "default": "warp",
-              "description": "The client type to which the device settings profile applies. This field is set when the profile is created and cannot be changed."
+              "description": "The client type to which the device settings profile applies. This field is set when the profile is created and cannot be changed.",
+              "enum": [
+                "warp",
+                "browser_extension"
+              ],
+              "type": "string"
             },
             "register_interface_ip_with_dns": {
-              "$ref": "#/$defs/teams-devices_register_interface_ip_with_dns",
               "default": true,
-              "description": "Determines if the operating system will register WARP's local interface IP with your on-premises DNS server."
+              "description": "Determines if the operating system will register WARP's local interface IP with your on-premises DNS server.",
+              "type": "boolean"
             },
             "sccm_vpn_boundary_support": {
-              "$ref": "#/$defs/teams-devices_sccm_vpn_boundary_support",
               "default": false,
-              "description": "Determines whether the WARP client indicates to SCCM that it is inside a VPN boundary. (Windows only)."
+              "description": "Determines whether the WARP client indicates to SCCM that it is inside a VPN boundary. (Windows only).",
+              "type": "boolean"
             },
             "service_mode_v2": {
               "$ref": "#/$defs/teams-devices_service_mode_v2"
             },
             "support_url": {
-              "$ref": "#/$defs/teams-devices_support_url",
               "default": "",
-              "description": "The URL to launch when the Send Feedback button is clicked."
+              "description": "The URL to launch when the Send Feedback button is clicked.",
+              "type": "string"
             },
             "switch_locked": {
-              "$ref": "#/$defs/teams-devices_switch_locked",
               "default": false,
-              "description": "Whether to allow the user to turn off the WARP switch and disconnect the client."
+              "description": "Whether to allow the user to turn off the WARP switch and disconnect the client.",
+              "type": "boolean"
             },
             "tunnel_protocol": {
-              "$ref": "#/$defs/teams-devices_tunnel_protocol",
               "default": "",
-              "description": "Determines which tunnel protocol to use."
+              "description": "Determines which tunnel protocol to use.",
+              "type": "string"
             },
             "uninstall_protection": {
-              "$ref": "#/$defs/teams-devices_uninstall_protection",
               "default": false,
-              "description": "Determines whether uninstalling the WARP client requires an override code. (Windows only)."
+              "description": "Determines whether uninstalling the WARP client requires an override code. (Windows only).",
+              "type": "boolean"
             },
             "virtual_networks": {
               "$ref": "#/$defs/teams-devices_virtual_networks",
@@ -276,112 +217,67 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch,
-        "teams-devices_allow_updates": teams_devices_allow_updates,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave,
-        "teams-devices_auto_connect": teams_devices_auto_connect,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config,
-        "teams-devices_captive_portal": teams_devices_captive_portal,
-        "teams-devices_default": teams_devices_default,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips,
-        "teams-devices_exclude_request": teams_devices_exclude_request,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_include_request": teams_devices_include_request,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size,
-        "teams-devices_precedence": teams_devices_precedence,
-        "teams-devices_profile_type": teams_devices_profile_type,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support,
-        "teams-devices_schemas-description": teams_devices_schemas_description,
-        "teams-devices_schemas-match": teams_devices_schemas_match,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include,
-        "teams-devices_support_url": teams_devices_support_url,
-        "teams-devices_switch_locked": teams_devices_switch_locked,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config$,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix$,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes$,
+        "teams-devices_exclude_request": teams$$devices_exclude_request,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address$,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host$,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration$,
+        "teams-devices_include_request": teams$$devices_include_request,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address$,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host$,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2$,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel$,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include$,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_device_settings_response",
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response": teams_devices_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response": teams$$devices_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     annotations: {
@@ -408,59 +304,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response": teams_devices_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response": teams$$devices_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     request: (args) => ({
@@ -469,84 +335,60 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_profiles_custom_delete",
+    name: "zeroTrust_devices_profiles_custom_delete",
     title: "Delete a device settings profile",
-    description: "Deletes a device settings profile and fetches a list of the remaining profiles for an account.",
+    description: "Deletes a device settings profile and fetches a list of the remaining profiles for an account.\n\nDELETE /accounts/{account_id}/devices/policy/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
-        "policy_id": {
-          "$ref": "#/$defs/teams-devices_schemas-uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "policy_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_device_settings_response_collection",
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response_collection": teams_devices_device_settings_response_collection_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response_collection": teams$$devices_device_settings_response_collection,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     annotations: {
@@ -573,60 +415,30 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response_collection": teams_devices_device_settings_response_collection_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response_collection": teams$$devices_device_settings_response_collection,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     request: (args) => ({
@@ -634,83 +446,59 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_profiles_custom_get",
+    name: "zeroTrust_devices_profiles_custom_get",
     title: "Get device settings profile by ID",
-    description: "Fetches a device settings profile by ID.",
+    description: "Fetches a device settings profile by ID.\n\nGET /accounts/{account_id}/devices/policy/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
-        "policy_id": {
-          "$ref": "#/$defs/teams-devices_schemas-uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "policy_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_device_settings_response",
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response": teams_devices_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response": teams$$devices_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     annotations: {
@@ -732,59 +520,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response": teams_devices_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response": teams$$devices_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     request: (args) => ({
@@ -792,85 +550,71 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_profiles_custom_list",
+    name: "zeroTrust_devices_profiles_custom_list",
     title: "List device settings profiles",
-    description: "Fetches a list of the device settings profiles for an account.",
+    description: "Fetches a list of the device settings profiles for an account.\n\nGET /accounts/{account_id}/devices/policies",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "profile_type": {
-          "$ref": "#/$defs/teams-devices_profile_type",
-          "default": "warp",
-          "description": "Filter profiles by client type. When omitted, only WARP profiles are returned."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "profile_type": {
+              "default": "warp",
+              "description": "Filter profiles by client type. When omitted, only WARP profiles are returned.",
+              "enum": [
+                "warp",
+                "browser_extension"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_profile_type": teams_devices_profile_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_device_settings_response_collection",
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response_collection": teams_devices_device_settings_response_collection_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response_collection": teams$$devices_device_settings_response_collection,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     annotations: {
@@ -892,123 +636,90 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-collection": teams_devices_api_response_collection_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response_collection": teams_devices_device_settings_response_collection_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_result_info": teams_devices_result_info_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-collection": teams$$devices_api$$response$$collection,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response_collection": teams$$devices_device_settings_response_collection,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_result_info": teams$$devices_result_info,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/policies`,
       query: [
-        ["profile_type", args["profile_type"], true],
+        ["profile_type", param(args, "query", "profile_type"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_devices_profiles_custom_update",
+    name: "zeroTrust_devices_profiles_custom_update",
     title: "Update a device settings profile",
-    description: "Updates a configured device settings profile.",
+    description: "Updates a configured device settings profile.\n\nPATCH /accounts/{account_id}/devices/policy/{policy_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "allow_mode_switch": {
-              "$ref": "#/$defs/teams-devices_allow_mode_switch",
               "default": false,
-              "description": "Whether to allow the user to switch WARP between modes."
+              "description": "Whether to allow the user to switch WARP between modes.",
+              "type": "boolean"
             },
             "allow_updates": {
-              "$ref": "#/$defs/teams-devices_allow_updates",
               "default": false,
-              "description": "Whether to receive update notifications when a new version of the client is available."
+              "description": "Whether to receive update notifications when a new version of the client is available.",
+              "type": "boolean"
             },
             "allowed_to_leave": {
-              "$ref": "#/$defs/teams-devices_allowed_to_leave",
               "default": true,
-              "description": "Whether to allow devices to leave the organization."
+              "description": "Whether to allow devices to leave the organization.",
+              "type": "boolean"
             },
             "auto_connect": {
-              "$ref": "#/$defs/teams-devices_auto_connect",
               "default": 0,
-              "description": "The amount of time in seconds to reconnect after having been disabled."
+              "description": "The amount of time in seconds to reconnect after having been disabled.",
+              "type": "number"
             },
             "browser_extension_config": {
               "$ref": "#/$defs/teams-devices_browser_extension_config",
               "description": "Browser extension proxy settings. Required when profile_type is browser_extension and invalid for WARP profiles."
             },
             "captive_portal": {
-              "$ref": "#/$defs/teams-devices_captive_portal",
               "default": 180,
-              "description": "Turn on the captive portal after the specified amount of time."
+              "description": "Turn on the captive portal after the specified amount of time.",
+              "type": "number"
             },
             "default": {
-              "$ref": "#/$defs/teams-devices_default",
               "default": false,
-              "description": "Whether the policy is the account default. WARP group profiles cannot set this field."
+              "description": "Whether the policy is the account default. WARP group profiles cannot set this field.",
+              "type": "boolean"
             },
             "description": {
-              "$ref": "#/$defs/teams-devices_schemas-description",
-              "description": "A description of the policy."
+              "description": "A description of the policy.",
+              "type": "string"
             },
             "disable_auto_fallback": {
-              "$ref": "#/$defs/teams-devices_disable_auto_fallback",
               "default": false,
-              "description": "If the `dns_server` field of a fallback domain is not present, the client will fall back to a best guess of the default/system DNS resolvers unless this policy option is set to `true`."
+              "description": "If the `dns_server` field of a fallback domain is not present, the client will fall back to a best guess of the default/system DNS resolvers unless this policy option is set to `true`.",
+              "type": "boolean"
             },
             "dns_search_suffixes": {
               "$ref": "#/$defs/teams-devices_dns_search_suffixes",
@@ -1016,9 +727,9 @@ export const tools: readonly Tool[] = [
               "description": "List of DNS search suffixes to apply to clients. Suffixes are evaluated in order. Use an empty array to clear."
             },
             "enable_device_credential_authentication": {
-              "$ref": "#/$defs/teams-devices_enable_device_credential_authentication",
               "default": false,
-              "description": "Determines whether the WARP client can silently reauthenticate the user with device credentials (Microsoft Entra) instead of prompting for browser-based reauthentication."
+              "description": "Determines whether the WARP client can silently reauthenticate the user with device credentials (Microsoft Entra) instead of prompting for browser-based reauthentication.",
+              "type": "boolean"
             },
             "enabled": {
               "description": "Whether the policy will be applied to matching devices.",
@@ -1029,9 +740,9 @@ export const tools: readonly Tool[] = [
               "description": "List of routes excluded in the WARP client's tunnel. Both 'exclude' and 'include' cannot be set in the same request."
             },
             "exclude_office_ips": {
-              "$ref": "#/$defs/teams-devices_exclude_office_ips",
               "default": false,
-              "description": "Whether to add Microsoft IPs to Split Tunnel exclusions."
+              "description": "Whether to add Microsoft IPs to Split Tunnel exclusions.",
+              "type": "boolean"
             },
             "global_acceleration": {
               "$ref": "#/$defs/teams-devices_global_acceleration",
@@ -1042,57 +753,57 @@ export const tools: readonly Tool[] = [
               "description": "List of routes included in the WARP client's tunnel. Both 'exclude' and 'include' cannot be set in the same request."
             },
             "lan_allow_minutes": {
-              "$ref": "#/$defs/teams-devices_lan_allow_minutes",
-              "description": "The amount of time in minutes a user is allowed access to their LAN. A value of 0 will allow LAN access until the next WARP reconnection, such as a reboot or a laptop waking from sleep. Note that this field is omitted from the response if null or unset."
+              "description": "The amount of time in minutes a user is allowed access to their LAN. A value of 0 will allow LAN access until the next WARP reconnection, such as a reboot or a laptop waking from sleep. Note that this field is omitted from the response if null or unset.",
+              "type": "number"
             },
             "lan_allow_subnet_size": {
-              "$ref": "#/$defs/teams-devices_lan_allow_subnet_size",
-              "description": "The size of the subnet for the local access network. Note that this field is omitted from the response if null or unset."
+              "description": "The size of the subnet for the local access network. Note that this field is omitted from the response if null or unset.",
+              "type": "number"
             },
             "match": {
-              "$ref": "#/$defs/teams-devices_schemas-match",
-              "description": "The wirefilter expression to match devices. Available values: \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.service_token_uuid\", \"identity.saml_attributes\", \"network\", \"os.name\", \"os.version\", \"device.tags\"."
+              "description": "The wirefilter expression to match devices. Available values: \"identity.email\", \"identity.groups.id\", \"identity.groups.name\", \"identity.groups.email\", \"identity.service_token_uuid\", \"identity.saml_attributes\", \"network\", \"os.name\", \"os.version\", \"device.tags\".",
+              "type": "string"
             },
             "name": {
               "description": "The name of the device settings profile.",
               "type": "string"
             },
             "precedence": {
-              "$ref": "#/$defs/teams-devices_precedence",
-              "description": "The precedence of the policy. Lower values indicate higher precedence. Policies will be evaluated in ascending order of this field."
+              "description": "The precedence of the policy. Lower values indicate higher precedence. Policies will be evaluated in ascending order of this field.",
+              "type": "number"
             },
             "register_interface_ip_with_dns": {
-              "$ref": "#/$defs/teams-devices_register_interface_ip_with_dns",
               "default": true,
-              "description": "Determines if the operating system will register WARP's local interface IP with your on-premises DNS server."
+              "description": "Determines if the operating system will register WARP's local interface IP with your on-premises DNS server.",
+              "type": "boolean"
             },
             "sccm_vpn_boundary_support": {
-              "$ref": "#/$defs/teams-devices_sccm_vpn_boundary_support",
               "default": false,
-              "description": "Determines whether the WARP client indicates to SCCM that it is inside a VPN boundary. (Windows only)."
+              "description": "Determines whether the WARP client indicates to SCCM that it is inside a VPN boundary. (Windows only).",
+              "type": "boolean"
             },
             "service_mode_v2": {
               "$ref": "#/$defs/teams-devices_service_mode_v2"
             },
             "support_url": {
-              "$ref": "#/$defs/teams-devices_support_url",
               "default": "",
-              "description": "The URL to launch when the Send Feedback button is clicked."
+              "description": "The URL to launch when the Send Feedback button is clicked.",
+              "type": "string"
             },
             "switch_locked": {
-              "$ref": "#/$defs/teams-devices_switch_locked",
               "default": false,
-              "description": "Whether to allow the user to turn off the WARP switch and disconnect the client."
+              "description": "Whether to allow the user to turn off the WARP switch and disconnect the client.",
+              "type": "boolean"
             },
             "tunnel_protocol": {
-              "$ref": "#/$defs/teams-devices_tunnel_protocol",
               "default": "",
-              "description": "Determines which tunnel protocol to use."
+              "description": "Determines which tunnel protocol to use.",
+              "type": "string"
             },
             "uninstall_protection": {
-              "$ref": "#/$defs/teams-devices_uninstall_protection",
               "default": false,
-              "description": "Determines whether uninstalling the WARP client requires an override code. (Windows only)."
+              "description": "Determines whether uninstalling the WARP client requires an override code. (Windows only).",
+              "type": "boolean"
             },
             "virtual_networks": {
               "$ref": "#/$defs/teams-devices_virtual_networks",
@@ -1101,115 +812,70 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "policy_id": {
-          "$ref": "#/$defs/teams-devices_schemas-uuid"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "policy_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "policy_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "policy_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch,
-        "teams-devices_allow_updates": teams_devices_allow_updates,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave,
-        "teams-devices_auto_connect": teams_devices_auto_connect,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config,
-        "teams-devices_captive_portal": teams_devices_captive_portal,
-        "teams-devices_default": teams_devices_default,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips,
-        "teams-devices_exclude_request": teams_devices_exclude_request,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_include_request": teams_devices_include_request,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size,
-        "teams-devices_precedence": teams_devices_precedence,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support,
-        "teams-devices_schemas-description": teams_devices_schemas_description,
-        "teams-devices_schemas-match": teams_devices_schemas_match,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include,
-        "teams-devices_support_url": teams_devices_support_url,
-        "teams-devices_switch_locked": teams_devices_switch_locked,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config$,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix$,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes$,
+        "teams-devices_exclude_request": teams$$devices_exclude_request,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address$,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host$,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration$,
+        "teams-devices_include_request": teams$$devices_include_request,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address$,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host$,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2$,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel$,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include$,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_device_settings_response",
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response": teams_devices_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response": teams$$devices_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     annotations: {
@@ -1236,59 +902,29 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_browser_extension_config": teams_devices_browser_extension_config_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default": teams_devices_default_output,
-        "teams-devices_device_settings_policy": teams_devices_device_settings_policy_output,
-        "teams-devices_device_settings_response": teams_devices_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes_output,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_precedence": teams_devices_precedence_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-description": teams_devices_schemas_description_output,
-        "teams-devices_schemas-match": teams_devices_schemas_match_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_target_dex_test": teams_devices_target_dex_test_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_browser_extension_config": teams$$devices_browser_extension_config,
+        "teams-devices_device_settings_policy": teams$$devices_device_settings_policy,
+        "teams-devices_device_settings_response": teams$$devices_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_target_dex_test": teams$$devices_target_dex_test,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/profiles/default/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/profiles/default/outputs.ts
index 22bb7c310..3bd569c7b 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/profiles/default/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/profiles/default/outputs.ts
@@ -6,34 +6,34 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `teams-devices_default_device_settings_policy` in responses.
  */
-export const teams_devices_default_device_settings_policy_output: JsonSchema = {
+export const teams$$devices_default_device_settings_policy: JsonSchema = {
   "properties": {
     "allow_mode_switch": {
-      "$ref": "#/$defs/teams-devices_allow_mode_switch"
+      "type": "boolean"
     },
     "allow_updates": {
-      "$ref": "#/$defs/teams-devices_allow_updates"
+      "type": "boolean"
     },
     "allowed_to_leave": {
-      "$ref": "#/$defs/teams-devices_allowed_to_leave"
+      "type": "boolean"
     },
     "auto_connect": {
-      "$ref": "#/$defs/teams-devices_auto_connect"
+      "type": "number"
     },
     "captive_portal": {
-      "$ref": "#/$defs/teams-devices_captive_portal"
+      "type": "number"
     },
     "default": {
       "type": "boolean"
     },
     "disable_auto_fallback": {
-      "$ref": "#/$defs/teams-devices_disable_auto_fallback"
+      "type": "boolean"
     },
     "dns_search_suffixes": {
       "$ref": "#/$defs/teams-devices_dns_search_suffixes"
     },
     "enable_device_credential_authentication": {
-      "$ref": "#/$defs/teams-devices_enable_device_credential_authentication"
+      "type": "boolean"
     },
     "enabled": {
       "type": "boolean"
@@ -42,13 +42,13 @@ export const teams_devices_default_device_settings_policy_output: JsonSchema = {
       "$ref": "#/$defs/teams-devices_exclude"
     },
     "exclude_office_ips": {
-      "$ref": "#/$defs/teams-devices_exclude_office_ips"
+      "type": "boolean"
     },
     "fallback_domains": {
       "$ref": "#/$defs/teams-devices_fallback_domains"
     },
     "gateway_unique_id": {
-      "$ref": "#/$defs/teams-devices_gateway_unique_id"
+      "type": "string"
     },
     "global_acceleration": {
       "$ref": "#/$defs/teams-devices_global_acceleration"
@@ -57,31 +57,35 @@ export const teams_devices_default_device_settings_policy_output: JsonSchema = {
       "$ref": "#/$defs/teams-devices_include"
     },
     "policy_id": {
-      "$ref": "#/$defs/teams-devices_schemas-uuid"
+      "type": "string"
     },
     "profile_type": {
-      "$ref": "#/$defs/teams-devices_profile_type"
+      "enum": [
+        "warp",
+        "browser_extension"
+      ],
+      "type": "string"
     },
     "register_interface_ip_with_dns": {
-      "$ref": "#/$defs/teams-devices_register_interface_ip_with_dns"
+      "type": "boolean"
     },
     "sccm_vpn_boundary_support": {
-      "$ref": "#/$defs/teams-devices_sccm_vpn_boundary_support"
+      "type": "boolean"
     },
     "service_mode_v2": {
       "$ref": "#/$defs/teams-devices_service_mode_v2"
     },
     "support_url": {
-      "$ref": "#/$defs/teams-devices_support_url"
+      "type": "string"
     },
     "switch_locked": {
-      "$ref": "#/$defs/teams-devices_switch_locked"
+      "type": "boolean"
     },
     "tunnel_protocol": {
-      "$ref": "#/$defs/teams-devices_tunnel_protocol"
+      "type": "string"
     },
     "uninstall_protection": {
-      "$ref": "#/$defs/teams-devices_uninstall_protection"
+      "type": "boolean"
     },
     "virtual_networks": {
       "$ref": "#/$defs/teams-devices_virtual_networks"
@@ -93,7 +97,7 @@ export const teams_devices_default_device_settings_policy_output: JsonSchema = {
 /**
  * The schema of `teams-devices_default_device_settings_response` in responses.
  */
-export const teams_devices_default_device_settings_response_output: JsonSchema = {
+export const teams$$devices_default_device_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/profiles/default/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/profiles/default/tools.ts
index 98c2d3f5d..172acfe14 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/profiles/default/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/profiles/default/tools.ts
@@ -3,164 +3,100 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  teams_devices_api_response_common_failure_output,
-  teams_devices_api_response_common_output,
-  teams_devices_api_response_single_output,
-  teams_devices_messages_output,
+  teams$$devices_api$$response$$common,
+  teams$$devices_api$$response$$common$$failure,
+  teams$$devices_api$$response$$single,
+  teams$$devices_messages,
 } from "../../outputs.js";
-import { teams_devices_identifier } from "../../schemas.js";
 import {
-  teams_devices_allow_mode_switch_output,
-  teams_devices_allow_updates_output,
-  teams_devices_allowed_to_leave_output,
-  teams_devices_auto_connect_output,
-  teams_devices_captive_portal_output,
-  teams_devices_disable_auto_fallback_output,
-  teams_devices_dns_search_suffix_output,
-  teams_devices_dns_search_suffixes_output,
-  teams_devices_enable_device_credential_authentication_output,
-  teams_devices_exclude_office_ips_output,
-  teams_devices_exclude_output,
-  teams_devices_exclude_split_tunnel_with_address_output,
-  teams_devices_exclude_split_tunnel_with_host_output,
-  teams_devices_fallback_domain_output,
-  teams_devices_fallback_domains_output,
-  teams_devices_gateway_unique_id_output,
-  teams_devices_global_acceleration_output,
-  teams_devices_include_output,
-  teams_devices_include_split_tunnel_address_output,
-  teams_devices_include_split_tunnel_description_output,
-  teams_devices_include_split_tunnel_host_output,
-  teams_devices_include_split_tunnel_with_address_output,
-  teams_devices_include_split_tunnel_with_host_output,
-  teams_devices_ip_output,
-  teams_devices_profile_type_output,
-  teams_devices_register_interface_ip_with_dns_output,
-  teams_devices_sccm_vpn_boundary_support_output,
-  teams_devices_schemas_uuid_output,
-  teams_devices_service_mode_v2_output,
-  teams_devices_split_tunnel_address_output,
-  teams_devices_split_tunnel_description_output,
-  teams_devices_split_tunnel_host_output,
-  teams_devices_split_tunnel_include_output,
-  teams_devices_split_tunnel_output,
-  teams_devices_support_url_output,
-  teams_devices_switch_locked_output,
-  teams_devices_tunnel_protocol_output,
-  teams_devices_uninstall_protection_output,
-  teams_devices_virtual_networks_output,
+  teams$$devices_dns_search_suffix,
+  teams$$devices_dns_search_suffixes,
+  teams$$devices_exclude,
+  teams$$devices_exclude_split_tunnel_with_address,
+  teams$$devices_exclude_split_tunnel_with_host,
+  teams$$devices_fallback_domain,
+  teams$$devices_fallback_domains,
+  teams$$devices_global_acceleration,
+  teams$$devices_include,
+  teams$$devices_include_split_tunnel_with_address,
+  teams$$devices_include_split_tunnel_with_host,
+  teams$$devices_service_mode_v2,
+  teams$$devices_split_tunnel,
+  teams$$devices_split_tunnel_include,
+  teams$$devices_virtual_networks,
 } from "../outputs.js";
 import {
-  teams_devices_allow_mode_switch,
-  teams_devices_allow_updates,
-  teams_devices_allowed_to_leave,
-  teams_devices_auto_connect,
-  teams_devices_captive_portal,
-  teams_devices_disable_auto_fallback,
-  teams_devices_dns_search_suffix,
-  teams_devices_dns_search_suffixes,
-  teams_devices_enable_device_credential_authentication,
-  teams_devices_exclude_office_ips,
-  teams_devices_exclude_request,
-  teams_devices_exclude_split_tunnel_with_address,
-  teams_devices_exclude_split_tunnel_with_host,
-  teams_devices_global_acceleration,
-  teams_devices_include_request,
-  teams_devices_include_split_tunnel_address,
-  teams_devices_include_split_tunnel_description,
-  teams_devices_include_split_tunnel_host,
-  teams_devices_include_split_tunnel_with_address,
-  teams_devices_include_split_tunnel_with_host,
-  teams_devices_lan_allow_minutes,
-  teams_devices_lan_allow_subnet_size,
-  teams_devices_register_interface_ip_with_dns,
-  teams_devices_sccm_vpn_boundary_support,
-  teams_devices_service_mode_v2,
-  teams_devices_split_tunnel,
-  teams_devices_split_tunnel_address,
-  teams_devices_split_tunnel_description,
-  teams_devices_split_tunnel_host,
-  teams_devices_split_tunnel_include,
-  teams_devices_support_url,
-  teams_devices_switch_locked,
-  teams_devices_tunnel_protocol,
-  teams_devices_uninstall_protection,
-  teams_devices_virtual_networks,
+  teams$$devices_dns_search_suffix as teams$$devices_dns_search_suffix$,
+  teams$$devices_dns_search_suffixes as teams$$devices_dns_search_suffixes$,
+  teams$$devices_exclude_request,
+  teams$$devices_exclude_split_tunnel_with_address as teams$$devices_exclude_split_tunnel_with_address$,
+  teams$$devices_exclude_split_tunnel_with_host as teams$$devices_exclude_split_tunnel_with_host$,
+  teams$$devices_global_acceleration as teams$$devices_global_acceleration$,
+  teams$$devices_include_request,
+  teams$$devices_include_split_tunnel_with_address as teams$$devices_include_split_tunnel_with_address$,
+  teams$$devices_include_split_tunnel_with_host as teams$$devices_include_split_tunnel_with_host$,
+  teams$$devices_service_mode_v2 as teams$$devices_service_mode_v2$,
+  teams$$devices_split_tunnel as teams$$devices_split_tunnel$,
+  teams$$devices_split_tunnel_include as teams$$devices_split_tunnel_include$,
+  teams$$devices_virtual_networks as teams$$devices_virtual_networks$,
 } from "../schemas.js";
 import {
-  teams_devices_default_device_settings_policy_output,
-  teams_devices_default_device_settings_response_output,
+  teams$$devices_default_device_settings_policy,
+  teams$$devices_default_device_settings_response,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.devices.profiles.default`.
+ * The tools of `zeroTrust.devices.profiles.default`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_profiles_default_get",
+    name: "zeroTrust_devices_profiles_default_get",
     title: "Get the default device settings profile",
-    description: "Fetches the default device settings profile for an account.",
+    description: "Fetches the default device settings profile for an account.\n\nGET /accounts/{account_id}/devices/policy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_default_device_settings_response",
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default_device_settings_policy": teams_devices_default_device_settings_policy_output,
-        "teams-devices_default_device_settings_response": teams_devices_default_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_default_device_settings_policy": teams$$devices_default_device_settings_policy,
+        "teams-devices_default_device_settings_response": teams$$devices_default_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     annotations: {
@@ -182,51 +118,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default_device_settings_policy": teams_devices_default_device_settings_policy_output,
-        "teams-devices_default_device_settings_response": teams_devices_default_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_default_device_settings_policy": teams$$devices_default_device_settings_policy,
+        "teams-devices_default_device_settings_response": teams$$devices_default_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     request: (args) => ({
@@ -234,46 +146,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_profiles_default_update",
+    name: "zeroTrust_devices_profiles_default_update",
     title: "Update the default device settings profile",
-    description: "Updates the default device settings profile for an account.",
+    description: "Updates the default device settings profile for an account.\n\nPATCH /accounts/{account_id}/devices/policy",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "properties": {
             "allow_mode_switch": {
-              "$ref": "#/$defs/teams-devices_allow_mode_switch",
               "default": false,
-              "description": "Whether to allow the user to switch WARP between modes."
+              "description": "Whether to allow the user to switch WARP between modes.",
+              "type": "boolean"
             },
             "allow_updates": {
-              "$ref": "#/$defs/teams-devices_allow_updates",
               "default": false,
-              "description": "Whether to receive update notifications when a new version of the client is available."
+              "description": "Whether to receive update notifications when a new version of the client is available.",
+              "type": "boolean"
             },
             "allowed_to_leave": {
-              "$ref": "#/$defs/teams-devices_allowed_to_leave",
               "default": true,
-              "description": "Whether to allow devices to leave the organization."
+              "description": "Whether to allow devices to leave the organization.",
+              "type": "boolean"
             },
             "auto_connect": {
-              "$ref": "#/$defs/teams-devices_auto_connect",
               "default": 0,
-              "description": "The amount of time in seconds to reconnect after having been disabled."
+              "description": "The amount of time in seconds to reconnect after having been disabled.",
+              "type": "number"
             },
             "captive_portal": {
-              "$ref": "#/$defs/teams-devices_captive_portal",
               "default": 180,
-              "description": "Turn on the captive portal after the specified amount of time."
+              "description": "Turn on the captive portal after the specified amount of time.",
+              "type": "number"
             },
             "disable_auto_fallback": {
-              "$ref": "#/$defs/teams-devices_disable_auto_fallback",
               "default": false,
-              "description": "If the `dns_server` field of a fallback domain is not present, the client will fall back to a best guess of the default/system DNS resolvers unless this policy option is set to `true`."
+              "description": "If the `dns_server` field of a fallback domain is not present, the client will fall back to a best guess of the default/system DNS resolvers unless this policy option is set to `true`.",
+              "type": "boolean"
             },
             "dns_search_suffixes": {
               "$ref": "#/$defs/teams-devices_dns_search_suffixes",
@@ -281,18 +190,18 @@ export const tools: readonly Tool[] = [
               "description": "List of DNS search suffixes to apply to clients. Suffixes are evaluated in order. Use an empty array to clear."
             },
             "enable_device_credential_authentication": {
-              "$ref": "#/$defs/teams-devices_enable_device_credential_authentication",
               "default": false,
-              "description": "Determines whether the WARP client can silently reauthenticate the user with device credentials (Microsoft Entra) instead of prompting for browser-based reauthentication."
+              "description": "Determines whether the WARP client can silently reauthenticate the user with device credentials (Microsoft Entra) instead of prompting for browser-based reauthentication.",
+              "type": "boolean"
             },
             "exclude": {
               "$ref": "#/$defs/teams-devices_exclude_request",
               "description": "List of routes excluded in the WARP client's tunnel. Both 'exclude' and 'include' cannot be set in the same request."
             },
             "exclude_office_ips": {
-              "$ref": "#/$defs/teams-devices_exclude_office_ips",
               "default": false,
-              "description": "Whether to add Microsoft IPs to Split Tunnel exclusions."
+              "description": "Whether to add Microsoft IPs to Split Tunnel exclusions.",
+              "type": "boolean"
             },
             "global_acceleration": {
               "$ref": "#/$defs/teams-devices_global_acceleration",
@@ -303,45 +212,45 @@ export const tools: readonly Tool[] = [
               "description": "List of routes included in the WARP client's tunnel. Both 'exclude' and 'include' cannot be set in the same request."
             },
             "lan_allow_minutes": {
-              "$ref": "#/$defs/teams-devices_lan_allow_minutes",
-              "description": "The amount of time in minutes a user is allowed access to their LAN. A value of 0 will allow LAN access until the next WARP reconnection, such as a reboot or a laptop waking from sleep. Note that this field is omitted from the response if null or unset."
+              "description": "The amount of time in minutes a user is allowed access to their LAN. A value of 0 will allow LAN access until the next WARP reconnection, such as a reboot or a laptop waking from sleep. Note that this field is omitted from the response if null or unset.",
+              "type": "number"
             },
             "lan_allow_subnet_size": {
-              "$ref": "#/$defs/teams-devices_lan_allow_subnet_size",
-              "description": "The size of the subnet for the local access network. Note that this field is omitted from the response if null or unset."
+              "description": "The size of the subnet for the local access network. Note that this field is omitted from the response if null or unset.",
+              "type": "number"
             },
             "register_interface_ip_with_dns": {
-              "$ref": "#/$defs/teams-devices_register_interface_ip_with_dns",
               "default": true,
-              "description": "Determines if the operating system will register WARP's local interface IP with your on-premises DNS server."
+              "description": "Determines if the operating system will register WARP's local interface IP with your on-premises DNS server.",
+              "type": "boolean"
             },
             "sccm_vpn_boundary_support": {
-              "$ref": "#/$defs/teams-devices_sccm_vpn_boundary_support",
               "default": false,
-              "description": "Determines whether the WARP client indicates to SCCM that it is inside a VPN boundary. (Windows only)."
+              "description": "Determines whether the WARP client indicates to SCCM that it is inside a VPN boundary. (Windows only).",
+              "type": "boolean"
             },
             "service_mode_v2": {
               "$ref": "#/$defs/teams-devices_service_mode_v2"
             },
             "support_url": {
-              "$ref": "#/$defs/teams-devices_support_url",
               "default": "",
-              "description": "The URL to launch when the Send Feedback button is clicked."
+              "description": "The URL to launch when the Send Feedback button is clicked.",
+              "type": "string"
             },
             "switch_locked": {
-              "$ref": "#/$defs/teams-devices_switch_locked",
               "default": false,
-              "description": "Whether to allow the user to turn off the WARP switch and disconnect the client."
+              "description": "Whether to allow the user to turn off the WARP switch and disconnect the client.",
+              "type": "boolean"
             },
             "tunnel_protocol": {
-              "$ref": "#/$defs/teams-devices_tunnel_protocol",
               "default": "",
-              "description": "Determines which tunnel protocol to use."
+              "description": "Determines which tunnel protocol to use.",
+              "type": "string"
             },
             "uninstall_protection": {
-              "$ref": "#/$defs/teams-devices_uninstall_protection",
               "default": false,
-              "description": "Determines whether uninstalling the WARP client requires an override code. (Windows only)."
+              "description": "Determines whether uninstalling the WARP client requires an override code. (Windows only).",
+              "type": "boolean"
             },
             "virtual_networks": {
               "$ref": "#/$defs/teams-devices_virtual_networks",
@@ -349,98 +258,64 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch,
-        "teams-devices_allow_updates": teams_devices_allow_updates,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave,
-        "teams-devices_auto_connect": teams_devices_auto_connect,
-        "teams-devices_captive_portal": teams_devices_captive_portal,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips,
-        "teams-devices_exclude_request": teams_devices_exclude_request,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration,
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_include_request": teams_devices_include_request,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host,
-        "teams-devices_lan_allow_minutes": teams_devices_lan_allow_minutes,
-        "teams-devices_lan_allow_subnet_size": teams_devices_lan_allow_subnet_size,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include,
-        "teams-devices_support_url": teams_devices_support_url,
-        "teams-devices_switch_locked": teams_devices_switch_locked,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix$,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes$,
+        "teams-devices_exclude_request": teams$$devices_exclude_request,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address$,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host$,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration$,
+        "teams-devices_include_request": teams$$devices_include_request,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address$,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host$,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2$,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel$,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include$,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_default_device_settings_response",
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default_device_settings_policy": teams_devices_default_device_settings_policy_output,
-        "teams-devices_default_device_settings_response": teams_devices_default_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_default_device_settings_policy": teams$$devices_default_device_settings_policy,
+        "teams-devices_default_device_settings_response": teams$$devices_default_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     annotations: {
@@ -467,51 +342,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_allow_mode_switch": teams_devices_allow_mode_switch_output,
-        "teams-devices_allow_updates": teams_devices_allow_updates_output,
-        "teams-devices_allowed_to_leave": teams_devices_allowed_to_leave_output,
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_auto_connect": teams_devices_auto_connect_output,
-        "teams-devices_captive_portal": teams_devices_captive_portal_output,
-        "teams-devices_default_device_settings_policy": teams_devices_default_device_settings_policy_output,
-        "teams-devices_default_device_settings_response": teams_devices_default_device_settings_response_output,
-        "teams-devices_disable_auto_fallback": teams_devices_disable_auto_fallback_output,
-        "teams-devices_dns_search_suffix": teams_devices_dns_search_suffix_output,
-        "teams-devices_dns_search_suffixes": teams_devices_dns_search_suffixes_output,
-        "teams-devices_enable_device_credential_authentication": teams_devices_enable_device_credential_authentication_output,
-        "teams-devices_exclude": teams_devices_exclude_output,
-        "teams-devices_exclude_office_ips": teams_devices_exclude_office_ips_output,
-        "teams-devices_exclude_split_tunnel_with_address": teams_devices_exclude_split_tunnel_with_address_output,
-        "teams-devices_exclude_split_tunnel_with_host": teams_devices_exclude_split_tunnel_with_host_output,
-        "teams-devices_fallback_domain": teams_devices_fallback_domain_output,
-        "teams-devices_fallback_domains": teams_devices_fallback_domains_output,
-        "teams-devices_gateway_unique_id": teams_devices_gateway_unique_id_output,
-        "teams-devices_global_acceleration": teams_devices_global_acceleration_output,
-        "teams-devices_include": teams_devices_include_output,
-        "teams-devices_include_split_tunnel_address": teams_devices_include_split_tunnel_address_output,
-        "teams-devices_include_split_tunnel_description": teams_devices_include_split_tunnel_description_output,
-        "teams-devices_include_split_tunnel_host": teams_devices_include_split_tunnel_host_output,
-        "teams-devices_include_split_tunnel_with_address": teams_devices_include_split_tunnel_with_address_output,
-        "teams-devices_include_split_tunnel_with_host": teams_devices_include_split_tunnel_with_host_output,
-        "teams-devices_ip": teams_devices_ip_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_profile_type": teams_devices_profile_type_output,
-        "teams-devices_register_interface_ip_with_dns": teams_devices_register_interface_ip_with_dns_output,
-        "teams-devices_sccm_vpn_boundary_support": teams_devices_sccm_vpn_boundary_support_output,
-        "teams-devices_schemas-uuid": teams_devices_schemas_uuid_output,
-        "teams-devices_service_mode_v2": teams_devices_service_mode_v2_output,
-        "teams-devices_split_tunnel": teams_devices_split_tunnel_output,
-        "teams-devices_split_tunnel_address": teams_devices_split_tunnel_address_output,
-        "teams-devices_split_tunnel_description": teams_devices_split_tunnel_description_output,
-        "teams-devices_split_tunnel_host": teams_devices_split_tunnel_host_output,
-        "teams-devices_split_tunnel_include": teams_devices_split_tunnel_include_output,
-        "teams-devices_support_url": teams_devices_support_url_output,
-        "teams-devices_switch_locked": teams_devices_switch_locked_output,
-        "teams-devices_tunnel_protocol": teams_devices_tunnel_protocol_output,
-        "teams-devices_uninstall_protection": teams_devices_uninstall_protection_output,
-        "teams-devices_virtual_networks": teams_devices_virtual_networks_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_default_device_settings_policy": teams$$devices_default_device_settings_policy,
+        "teams-devices_default_device_settings_response": teams$$devices_default_device_settings_response,
+        "teams-devices_dns_search_suffix": teams$$devices_dns_search_suffix,
+        "teams-devices_dns_search_suffixes": teams$$devices_dns_search_suffixes,
+        "teams-devices_exclude": teams$$devices_exclude,
+        "teams-devices_exclude_split_tunnel_with_address": teams$$devices_exclude_split_tunnel_with_address,
+        "teams-devices_exclude_split_tunnel_with_host": teams$$devices_exclude_split_tunnel_with_host,
+        "teams-devices_fallback_domain": teams$$devices_fallback_domain,
+        "teams-devices_fallback_domains": teams$$devices_fallback_domains,
+        "teams-devices_global_acceleration": teams$$devices_global_acceleration,
+        "teams-devices_include": teams$$devices_include,
+        "teams-devices_include_split_tunnel_with_address": teams$$devices_include_split_tunnel_with_address,
+        "teams-devices_include_split_tunnel_with_host": teams$$devices_include_split_tunnel_with_host,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_service_mode_v2": teams$$devices_service_mode_v2,
+        "teams-devices_split_tunnel": teams$$devices_split_tunnel,
+        "teams-devices_split_tunnel_include": teams$$devices_split_tunnel_include,
+        "teams-devices_virtual_networks": teams$$devices_virtual_networks,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/profiles/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/profiles/outputs.ts
index 15ddefa4a..f988c6f1c 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/profiles/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/profiles/outputs.ts
@@ -3,52 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `teams-devices_allow_mode_switch` in responses.
- */
-export const teams_devices_allow_mode_switch_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_allow_updates` in responses.
- */
-export const teams_devices_allow_updates_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_allowed_to_leave` in responses.
- */
-export const teams_devices_allowed_to_leave_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_auto_connect` in responses.
- */
-export const teams_devices_auto_connect_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_captive_portal` in responses.
- */
-export const teams_devices_captive_portal_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_disable_auto_fallback` in responses.
- */
-export const teams_devices_disable_auto_fallback_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_dns_search_suffix` in responses.
  */
-export const teams_devices_dns_search_suffix_output: JsonSchema = {
+export const teams$$devices_dns_search_suffix: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -66,48 +24,33 @@ export const teams_devices_dns_search_suffix_output: JsonSchema = {
 /**
  * The schema of `teams-devices_dns_search_suffixes` in responses.
  */
-export const teams_devices_dns_search_suffixes_output: JsonSchema = {
+export const teams$$devices_dns_search_suffixes: JsonSchema = {
   "items": {
     "$ref": "#/$defs/teams-devices_dns_search_suffix"
   },
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_enable_device_credential_authentication` in
- * responses.
- */
-export const teams_devices_enable_device_credential_authentication_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_exclude` in responses.
  */
-export const teams_devices_exclude_output: JsonSchema = {
+export const teams$$devices_exclude: JsonSchema = {
   "items": {
     "$ref": "#/$defs/teams-devices_split_tunnel"
   },
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_exclude_office_ips` in responses.
- */
-export const teams_devices_exclude_office_ips_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_exclude_split_tunnel_with_address` in responses.
  */
-export const teams_devices_exclude_split_tunnel_with_address_output: JsonSchema = {
+export const teams$$devices_exclude_split_tunnel_with_address: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/teams-devices_split_tunnel_address"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/teams-devices_split_tunnel_description"
+      "type": "string"
     }
   },
   "required": [
@@ -119,13 +62,13 @@ export const teams_devices_exclude_split_tunnel_with_address_output: JsonSchema
 /**
  * The schema of `teams-devices_exclude_split_tunnel_with_host` in responses.
  */
-export const teams_devices_exclude_split_tunnel_with_host_output: JsonSchema = {
+export const teams$$devices_exclude_split_tunnel_with_host: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/teams-devices_split_tunnel_description"
+      "type": "string"
     },
     "host": {
-      "$ref": "#/$defs/teams-devices_split_tunnel_host"
+      "type": "string"
     }
   },
   "required": [
@@ -137,14 +80,14 @@ export const teams_devices_exclude_split_tunnel_with_host_output: JsonSchema = {
 /**
  * The schema of `teams-devices_fallback_domain` in responses.
  */
-export const teams_devices_fallback_domain_output: JsonSchema = {
+export const teams$$devices_fallback_domain: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
     },
     "dns_server": {
       "items": {
-        "$ref": "#/$defs/teams-devices_ip"
+        "type": "string"
       },
       "type": "array"
     },
@@ -161,24 +104,17 @@ export const teams_devices_fallback_domain_output: JsonSchema = {
 /**
  * The schema of `teams-devices_fallback_domains` in responses.
  */
-export const teams_devices_fallback_domains_output: JsonSchema = {
+export const teams$$devices_fallback_domains: JsonSchema = {
   "items": {
     "$ref": "#/$defs/teams-devices_fallback_domain"
   },
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_gateway_unique_id` in responses.
- */
-export const teams_devices_gateway_unique_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_global_acceleration` in responses.
  */
-export const teams_devices_global_acceleration_output: JsonSchema = {
+export const teams$$devices_global_acceleration: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -230,44 +166,23 @@ export const teams_devices_global_acceleration_output: JsonSchema = {
 /**
  * The schema of `teams-devices_include` in responses.
  */
-export const teams_devices_include_output: JsonSchema = {
+export const teams$$devices_include: JsonSchema = {
   "items": {
     "$ref": "#/$defs/teams-devices_split_tunnel_include"
   },
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_include_split_tunnel_address` in responses.
- */
-export const teams_devices_include_split_tunnel_address_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_include_split_tunnel_description` in responses.
- */
-export const teams_devices_include_split_tunnel_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_include_split_tunnel_host` in responses.
- */
-export const teams_devices_include_split_tunnel_host_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_include_split_tunnel_with_address` in responses.
  */
-export const teams_devices_include_split_tunnel_with_address_output: JsonSchema = {
+export const teams$$devices_include_split_tunnel_with_address: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/teams-devices_include_split_tunnel_address"
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/teams-devices_include_split_tunnel_description"
+      "type": "string"
     }
   },
   "required": [
@@ -279,13 +194,13 @@ export const teams_devices_include_split_tunnel_with_address_output: JsonSchema
 /**
  * The schema of `teams-devices_include_split_tunnel_with_host` in responses.
  */
-export const teams_devices_include_split_tunnel_with_host_output: JsonSchema = {
+export const teams$$devices_include_split_tunnel_with_host: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/teams-devices_include_split_tunnel_description"
+      "type": "string"
     },
     "host": {
-      "$ref": "#/$defs/teams-devices_include_split_tunnel_host"
+      "type": "string"
     }
   },
   "required": [
@@ -294,63 +209,10 @@ export const teams_devices_include_split_tunnel_with_host_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_ip` in responses.
- */
-export const teams_devices_ip_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_lan_allow_minutes` in responses.
- */
-export const teams_devices_lan_allow_minutes_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_lan_allow_subnet_size` in responses.
- */
-export const teams_devices_lan_allow_subnet_size_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_profile_type` in responses.
- */
-export const teams_devices_profile_type_output: JsonSchema = {
-  "enum": [
-    "warp",
-    "browser_extension"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_register_interface_ip_with_dns` in responses.
- */
-export const teams_devices_register_interface_ip_with_dns_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_sccm_vpn_boundary_support` in responses.
- */
-export const teams_devices_sccm_vpn_boundary_support_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_schemas-uuid` in responses.
- */
-export const teams_devices_schemas_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_service_mode_v2` in responses.
  */
-export const teams_devices_service_mode_v2_output: JsonSchema = {
+export const teams$$devices_service_mode_v2: JsonSchema = {
   "properties": {
     "mode": {
       "type": "string"
@@ -365,7 +227,7 @@ export const teams_devices_service_mode_v2_output: JsonSchema = {
 /**
  * The schema of `teams-devices_split_tunnel` in responses.
  */
-export const teams_devices_split_tunnel_output: JsonSchema = {
+export const teams$$devices_split_tunnel: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/teams-devices_exclude_split_tunnel_with_address"
@@ -376,31 +238,10 @@ export const teams_devices_split_tunnel_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_split_tunnel_address` in responses.
- */
-export const teams_devices_split_tunnel_address_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_split_tunnel_description` in responses.
- */
-export const teams_devices_split_tunnel_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_split_tunnel_host` in responses.
- */
-export const teams_devices_split_tunnel_host_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_split_tunnel_include` in responses.
  */
-export const teams_devices_split_tunnel_include_output: JsonSchema = {
+export const teams$$devices_split_tunnel_include: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/teams-devices_include_split_tunnel_with_address"
@@ -411,38 +252,10 @@ export const teams_devices_split_tunnel_include_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_support_url` in responses.
- */
-export const teams_devices_support_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_switch_locked` in responses.
- */
-export const teams_devices_switch_locked_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_tunnel_protocol` in responses.
- */
-export const teams_devices_tunnel_protocol_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_uninstall_protection` in responses.
- */
-export const teams_devices_uninstall_protection_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_virtual_networks` in responses.
  */
-export const teams_devices_virtual_networks_output: JsonSchema = {
+export const teams$$devices_virtual_networks: JsonSchema = {
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/zeroTrust/devices/profiles/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/profiles/schemas.ts
index cba044418..085797bbe 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/profiles/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/profiles/schemas.ts
@@ -3,58 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `teams-devices_allow_mode_switch`.
- */
-export const teams_devices_allow_mode_switch: JsonSchema = {
-  "description": "Whether to allow the user to switch WARP between modes.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_allow_updates`.
- */
-export const teams_devices_allow_updates: JsonSchema = {
-  "description": "Whether to receive update notifications when a new version of the client is available.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_allowed_to_leave`.
- */
-export const teams_devices_allowed_to_leave: JsonSchema = {
-  "description": "Whether to allow devices to leave the organization.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_auto_connect`.
- */
-export const teams_devices_auto_connect: JsonSchema = {
-  "description": "The amount of time in seconds to reconnect after having been disabled.",
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_captive_portal`.
- */
-export const teams_devices_captive_portal: JsonSchema = {
-  "description": "Turn on the captive portal after the specified amount of time.",
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_disable_auto_fallback`.
- */
-export const teams_devices_disable_auto_fallback: JsonSchema = {
-  "description": "If the `dns_server` field of a fallback domain is not present, the client will fall back to a best guess of the default/system DNS resolvers unless this policy option is set to `true`.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_dns_search_suffix`.
  */
-export const teams_devices_dns_search_suffix: JsonSchema = {
+export const teams$$devices_dns_search_suffix: JsonSchema = {
   "properties": {
     "description": {
       "description": "A description of the DNS search suffix.",
@@ -74,7 +26,7 @@ export const teams_devices_dns_search_suffix: JsonSchema = {
 /**
  * The schema of `teams-devices_dns_search_suffixes`.
  */
-export const teams_devices_dns_search_suffixes: JsonSchema = {
+export const teams$$devices_dns_search_suffixes: JsonSchema = {
   "description": "List of DNS search suffixes to apply to clients. Suffixes are evaluated in order. Use an empty array to clear.",
   "items": {
     "$ref": "#/$defs/teams-devices_dns_search_suffix"
@@ -82,26 +34,10 @@ export const teams_devices_dns_search_suffixes: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_enable_device_credential_authentication`.
- */
-export const teams_devices_enable_device_credential_authentication: JsonSchema = {
-  "description": "Determines whether the WARP client can silently reauthenticate the user with device credentials (Microsoft Entra) instead of prompting for browser-based reauthentication.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_exclude_office_ips`.
- */
-export const teams_devices_exclude_office_ips: JsonSchema = {
-  "description": "Whether to add Microsoft IPs to Split Tunnel exclusions.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_exclude_request`.
  */
-export const teams_devices_exclude_request: JsonSchema = {
+export const teams$$devices_exclude_request: JsonSchema = {
   "description": "List of routes excluded in the WARP client's tunnel. Both 'exclude' and 'include' cannot be set in the same request.",
   "items": {
     "$ref": "#/$defs/teams-devices_split_tunnel"
@@ -112,15 +48,15 @@ export const teams_devices_exclude_request: JsonSchema = {
 /**
  * The schema of `teams-devices_exclude_split_tunnel_with_address`.
  */
-export const teams_devices_exclude_split_tunnel_with_address: JsonSchema = {
+export const teams$$devices_exclude_split_tunnel_with_address: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/teams-devices_split_tunnel_address",
-      "description": "The address in CIDR format to exclude from the tunnel. If `address` is present, `host` must not be present."
+      "description": "The address in CIDR format to exclude from the tunnel. If `address` is present, `host` must not be present.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/teams-devices_split_tunnel_description",
-      "description": "A description of the Split Tunnel item, displayed in the client UI."
+      "description": "A description of the Split Tunnel item, displayed in the client UI.",
+      "type": "string"
     }
   },
   "required": [
@@ -132,15 +68,15 @@ export const teams_devices_exclude_split_tunnel_with_address: JsonSchema = {
 /**
  * The schema of `teams-devices_exclude_split_tunnel_with_host`.
  */
-export const teams_devices_exclude_split_tunnel_with_host: JsonSchema = {
+export const teams$$devices_exclude_split_tunnel_with_host: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/teams-devices_split_tunnel_description",
-      "description": "A description of the Split Tunnel item, displayed in the client UI."
+      "description": "A description of the Split Tunnel item, displayed in the client UI.",
+      "type": "string"
     },
     "host": {
-      "$ref": "#/$defs/teams-devices_split_tunnel_host",
-      "description": "The domain name to exclude from the tunnel. If `host` is present, `address` must not be present."
+      "description": "The domain name to exclude from the tunnel. If `host` is present, `address` must not be present.",
+      "type": "string"
     }
   },
   "required": [
@@ -152,7 +88,7 @@ export const teams_devices_exclude_split_tunnel_with_host: JsonSchema = {
 /**
  * The schema of `teams-devices_global_acceleration`.
  */
-export const teams_devices_global_acceleration: JsonSchema = {
+export const teams$$devices_global_acceleration: JsonSchema = {
   "description": "Global Acceleration settings for China. When configured, WARP clients connect to the Global Accelerator addresses instead of the default ones. Please contact your account representative to enable this feature on your account. See https://developers.cloudflare.com/china-network/concepts/global-acceleration/.",
   "oneOf": [
     {
@@ -213,7 +149,7 @@ export const teams_devices_global_acceleration: JsonSchema = {
 /**
  * The schema of `teams-devices_include_request`.
  */
-export const teams_devices_include_request: JsonSchema = {
+export const teams$$devices_include_request: JsonSchema = {
   "description": "List of routes included in the WARP client's tunnel. Both 'exclude' and 'include' cannot be set in the same request.",
   "items": {
     "$ref": "#/$defs/teams-devices_split_tunnel_include"
@@ -221,42 +157,18 @@ export const teams_devices_include_request: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `teams-devices_include_split_tunnel_address`.
- */
-export const teams_devices_include_split_tunnel_address: JsonSchema = {
-  "description": "The address in CIDR format to include in the tunnel. If `address` is present, `host` must not be present.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_include_split_tunnel_description`.
- */
-export const teams_devices_include_split_tunnel_description: JsonSchema = {
-  "description": "A description of the Split Tunnel item, displayed in the client UI.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_include_split_tunnel_host`.
- */
-export const teams_devices_include_split_tunnel_host: JsonSchema = {
-  "description": "The domain name to include in the tunnel. If `host` is present, `address` must not be present.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_include_split_tunnel_with_address`.
  */
-export const teams_devices_include_split_tunnel_with_address: JsonSchema = {
+export const teams$$devices_include_split_tunnel_with_address: JsonSchema = {
   "properties": {
     "address": {
-      "$ref": "#/$defs/teams-devices_include_split_tunnel_address",
-      "description": "The address in CIDR format to include in the tunnel. If `address` is present, `host` must not be present."
+      "description": "The address in CIDR format to include in the tunnel. If `address` is present, `host` must not be present.",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/teams-devices_include_split_tunnel_description",
-      "description": "A description of the Split Tunnel item, displayed in the client UI."
+      "description": "A description of the Split Tunnel item, displayed in the client UI.",
+      "type": "string"
     }
   },
   "required": [
@@ -268,15 +180,15 @@ export const teams_devices_include_split_tunnel_with_address: JsonSchema = {
 /**
  * The schema of `teams-devices_include_split_tunnel_with_host`.
  */
-export const teams_devices_include_split_tunnel_with_host: JsonSchema = {
+export const teams$$devices_include_split_tunnel_with_host: JsonSchema = {
   "properties": {
     "description": {
-      "$ref": "#/$defs/teams-devices_include_split_tunnel_description",
-      "description": "A description of the Split Tunnel item, displayed in the client UI."
+      "description": "A description of the Split Tunnel item, displayed in the client UI.",
+      "type": "string"
     },
     "host": {
-      "$ref": "#/$defs/teams-devices_include_split_tunnel_host",
-      "description": "The domain name to include in the tunnel. If `host` is present, `address` must not be present."
+      "description": "The domain name to include in the tunnel. If `host` is present, `address` must not be present.",
+      "type": "string"
     }
   },
   "required": [
@@ -285,61 +197,10 @@ export const teams_devices_include_split_tunnel_with_host: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `teams-devices_lan_allow_minutes`.
- */
-export const teams_devices_lan_allow_minutes: JsonSchema = {
-  "description": "The amount of time in minutes a user is allowed access to their LAN. A value of 0 will allow LAN access until the next WARP reconnection, such as a reboot or a laptop waking from sleep. Note that this field is omitted from the response if null or unset.",
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_lan_allow_subnet_size`.
- */
-export const teams_devices_lan_allow_subnet_size: JsonSchema = {
-  "description": "The size of the subnet for the local access network. Note that this field is omitted from the response if null or unset.",
-  "type": "number"
-};
-
-/**
- * The schema of `teams-devices_profile_type`.
- */
-export const teams_devices_profile_type: JsonSchema = {
-  "description": "The client type to which the device settings profile applies. This field is set when the profile is created and cannot be changed.",
-  "enum": [
-    "warp",
-    "browser_extension"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_register_interface_ip_with_dns`.
- */
-export const teams_devices_register_interface_ip_with_dns: JsonSchema = {
-  "description": "Determines if the operating system will register WARP's local interface IP with your on-premises DNS server.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_sccm_vpn_boundary_support`.
- */
-export const teams_devices_sccm_vpn_boundary_support: JsonSchema = {
-  "description": "Determines whether the WARP client indicates to SCCM that it is inside a VPN boundary. (Windows only).",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_schemas-uuid`.
- */
-export const teams_devices_schemas_uuid: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_service_mode_v2`.
  */
-export const teams_devices_service_mode_v2: JsonSchema = {
+export const teams$$devices_service_mode_v2: JsonSchema = {
   "properties": {
     "mode": {
       "description": "The mode to run the WARP client under.",
@@ -356,7 +217,7 @@ export const teams_devices_service_mode_v2: JsonSchema = {
 /**
  * The schema of `teams-devices_split_tunnel`.
  */
-export const teams_devices_split_tunnel: JsonSchema = {
+export const teams$$devices_split_tunnel: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/teams-devices_exclude_split_tunnel_with_address"
@@ -367,34 +228,10 @@ export const teams_devices_split_tunnel: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_split_tunnel_address`.
- */
-export const teams_devices_split_tunnel_address: JsonSchema = {
-  "description": "The address in CIDR format to exclude from the tunnel. If `address` is present, `host` must not be present.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_split_tunnel_description`.
- */
-export const teams_devices_split_tunnel_description: JsonSchema = {
-  "description": "A description of the Split Tunnel item, displayed in the client UI.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_split_tunnel_host`.
- */
-export const teams_devices_split_tunnel_host: JsonSchema = {
-  "description": "The domain name to exclude from the tunnel. If `host` is present, `address` must not be present.",
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_split_tunnel_include`.
  */
-export const teams_devices_split_tunnel_include: JsonSchema = {
+export const teams$$devices_split_tunnel_include: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/teams-devices_include_split_tunnel_with_address"
@@ -405,42 +242,10 @@ export const teams_devices_split_tunnel_include: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `teams-devices_support_url`.
- */
-export const teams_devices_support_url: JsonSchema = {
-  "description": "The URL to launch when the Send Feedback button is clicked.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_switch_locked`.
- */
-export const teams_devices_switch_locked: JsonSchema = {
-  "description": "Whether to allow the user to turn off the WARP switch and disconnect the client.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `teams-devices_tunnel_protocol`.
- */
-export const teams_devices_tunnel_protocol: JsonSchema = {
-  "description": "Determines which tunnel protocol to use.",
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_uninstall_protection`.
- */
-export const teams_devices_uninstall_protection: JsonSchema = {
-  "description": "Determines whether uninstalling the WARP client requires an override code. (Windows only).",
-  "type": "boolean"
-};
-
 /**
  * The schema of `teams-devices_virtual_networks`.
  */
-export const teams_devices_virtual_networks: JsonSchema = {
+export const teams$$devices_virtual_networks: JsonSchema = {
   "description": "Virtual network access settings for the device.",
   "oneOf": [
     {
diff --git a/src/generated/forge-mcp/zeroTrust/devices/registrations/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/registrations/outputs.ts
index b95a8ba4a..dbacdf327 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/registrations/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/registrations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_registration` in responses.
  */
-export const teams_devices_registration_output: JsonSchema = {
+export const teams$$devices_registration: JsonSchema = {
   "properties": {
     "created_at": {
       "type": "string"
@@ -47,7 +47,11 @@ export const teams_devices_registration_output: JsonSchema = {
       "$ref": "#/$defs/teams-devices_policy_summary"
     },
     "registration_type": {
-      "$ref": "#/$defs/teams-devices_registration_type"
+      "enum": [
+        "warp",
+        "browser_extension"
+      ],
+      "type": "string"
     },
     "revoked_at": {
       "oneOf": [
@@ -111,7 +115,7 @@ export const teams_devices_registration_output: JsonSchema = {
 /**
  * The schema of `teams-devices_registration_device_details` in responses.
  */
-export const teams_devices_registration_device_details_output: JsonSchema = {
+export const teams$$devices_registration_device_details: JsonSchema = {
   "properties": {
     "client_version": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/registrations/overrideCodes/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/registrations/overrideCodes/outputs.ts
index 921627b5a..b936d1d1d 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/registrations/overrideCodes/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/registrations/overrideCodes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `teams-devices_override_codes` in responses.
  */
-export const teams_devices_override_codes_output: JsonSchema = {
+export const teams$$devices_override_codes: JsonSchema = {
   "properties": {
     "disable_for_time": {
       "additionalProperties": {
diff --git a/src/generated/forge-mcp/zeroTrust/devices/registrations/overrideCodes/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/registrations/overrideCodes/tools.ts
index 7b70e5b47..5bfa34bd4 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/registrations/overrideCodes/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/registrations/overrideCodes/tools.ts
@@ -3,33 +3,43 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  teams_devices_v4_error_response_output,
-  teams_devices_v4_response_message_output,
+  teams$$devices_v4_error_response,
+  teams$$devices_v4_response_message,
 } from "../../outputs.js";
-import { teams_devices_override_codes_output } from "./outputs.js";
+import { teams$$devices_override_codes } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.devices.registrations.override_codes`.
+ * The tools of `zeroTrust.devices.registrations.overrideCodes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_registrations_override_codes_get",
+    name: "zeroTrust_devices_registrations_overrideCodes_get",
     title: "Get override codes",
-    description: "Fetches one-time use admin override codes for a registration. This relies on the **Admin Override** setting being enabled in your device configuration.",
+    description: "Fetches one-time use admin override codes for a registration. This relies on the **Admin Override** setting being enabled in your device configuration.\n\nGET /accounts/{account_id}/devices/registrations/{registration_id}/override_codes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "registration_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "registration_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "registration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "registration_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -60,8 +70,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_override_codes": teams_devices_override_codes_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_override_codes": teams$$devices_override_codes,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -115,9 +125,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_override_codes": teams_devices_override_codes_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_override_codes": teams$$devices_override_codes,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/registrations/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/registrations/tools.ts
index 5197717c6..5c7211983 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/registrations/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/registrations/tools.ts
@@ -1,50 +1,65 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  teams_devices_components_schemas_uuid_output,
-  teams_devices_cursor_result_info_output,
-  teams_devices_email_output,
-  teams_devices_empty_body_output,
-  teams_devices_policy_summary_output,
-  teams_devices_registration_type_output,
-  teams_devices_user_output,
-  teams_devices_v4_error_response_output,
-  teams_devices_v4_response_message_output,
+  teams$$devices_cursor_result_info,
+  teams$$devices_empty_body,
+  teams$$devices_policy_summary,
+  teams$$devices_user,
+  teams$$devices_v4_error_response,
+  teams$$devices_v4_response_message,
 } from "../outputs.js";
-import { teams_devices_registration_type } from "../schemas.js";
 import {
-  teams_devices_registration_device_details_output,
-  teams_devices_registration_output,
+  teams$$devices_registration,
+  teams$$devices_registration_device_details,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.devices.registrations`.
+ * The tools of `zeroTrust.devices.registrations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_registrations_bulk_delete",
+    name: "zeroTrust_devices_registrations_bulkDelete",
     title: "Delete registrations",
-    description: "Deletes a list of WARP registrations.",
+    description: "Deletes a list of WARP registrations.\n\nDELETE /accounts/{account_id}/devices/registrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "id": {
-          "description": "A list of registration IDs to delete.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "description": "A list of registration IDs to delete.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "required": [
+            "id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "id"
+        "path",
+        "query"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -78,9 +93,9 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_cursor_result_info": teams_devices_cursor_result_info_output,
-        "teams-devices_empty_body": teams_devices_empty_body_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_cursor_result_info": teams$$devices_cursor_result_info,
+        "teams-devices_empty_body": teams$$devices_empty_body,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -136,37 +151,47 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_cursor_result_info": teams_devices_cursor_result_info_output,
-        "teams-devices_empty_body": teams_devices_empty_body_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_cursor_result_info": teams$$devices_cursor_result_info,
+        "teams-devices_empty_body": teams$$devices_empty_body,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/registrations`,
       query: [
-        ["id", args["id"], true],
+        ["id", param(args, "query", "id"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_devices_registrations_delete",
+    name: "zeroTrust_devices_registrations_delete",
     title: "Delete registration",
-    description: "Deletes a WARP registration.",
+    description: "Deletes a WARP registration.\n\nDELETE /accounts/{account_id}/devices/registrations/{registration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "registration_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "registration_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "registration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "registration_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -196,8 +221,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_empty_body": teams_devices_empty_body_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_empty_body": teams$$devices_empty_body,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -249,9 +274,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_empty_body": teams_devices_empty_body_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_empty_body": teams$$devices_empty_body,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
@@ -259,27 +284,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_registrations_get",
+    name: "zeroTrust_devices_registrations_get",
     title: "Get registration",
-    description: "Fetches a single WARP registration.",
+    description: "Fetches a single WARP registration.\n\nGET /accounts/{account_id}/devices/registrations/{registration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "include": {
-          "description": "Comma-separated list of additional information that should be included in the registration response. Supported values are: \"policy\".\n",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "registration_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "registration_id"
+          ],
+          "type": "object"
         },
-        "registration_id": {
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include": {
+              "description": "Comma-separated list of additional information that should be included in the registration response. Supported values are: \"policy\".",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "registration_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -310,14 +351,11 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration": teams_devices_registration_output,
-        "teams-devices_registration_device_details": teams_devices_registration_device_details_output,
-        "teams-devices_registration_type": teams_devices_registration_type_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration": teams$$devices_registration,
+        "teams-devices_registration_device_details": teams$$devices_registration_device_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -365,120 +403,134 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration": teams_devices_registration_output,
-        "teams-devices_registration_device_details": teams_devices_registration_device_details_output,
-        "teams-devices_registration_type": teams_devices_registration_type_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration": teams$$devices_registration,
+        "teams-devices_registration_device_details": teams$$devices_registration_device_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/registrations/${pathParam(args, "registration_id")}`,
       query: [
-        ["include", args["include"], true],
+        ["include", param(args, "query", "include"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_devices_registrations_list",
+    name: "zeroTrust_devices_registrations_list",
     title: "List registrations",
-    description: "Lists WARP registrations.",
+    description: "Lists WARP registrations.\n\nGET /accounts/{account_id}/devices/registrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque token indicating the starting position when requesting the next set of records. A cursor value can be obtained from the result_info.cursor field in the response.",
-          "type": "string"
-        },
-        "device_id": {
-          "description": "Filter by WARP device ID.",
-          "type": "string"
-        },
-        "id": {
-          "description": "Filter by registration ID.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "include": {
-          "description": "Comma-separated list of additional information that should be included in the registration response. Supported values are: \"policy\".\n",
-          "type": "string"
-        },
-        "per_page": {
-          "description": "The maximum number of devices to return in a single response.",
-          "type": "integer"
-        },
-        "policy_id": {
-          "description": "Filter by the ID of the device settings profile assigned to the registration.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "registration_type": {
-          "$ref": "#/$defs/teams-devices_registration_type",
-          "description": "Filter by registration client type."
-        },
-        "search": {
-          "description": "Filter by registration details.",
-          "type": "string"
-        },
-        "seen_after": {
-          "description": "Filter by the last_seen timestamp - returns only registrations last seen after this timestamp.",
-          "type": "string"
-        },
-        "seen_before": {
-          "description": "Filter by the last_seen timestamp - returns only registrations last seen before this timestamp.",
-          "type": "string"
-        },
-        "sort_by": {
-          "description": "The registration field to order results by.",
-          "enum": [
-            "id",
-            "user.name",
-            "user.email",
-            "last_seen_at",
-            "created_at"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "description": "Sort direction.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "status": {
-          "description": "Filter by registration status. Defaults to 'active'.",
-          "enum": [
-            "active",
-            "all",
-            "revoked"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "user_id": {
-          "description": "Filter by user ID.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Opaque token indicating the starting position when requesting the next set of records. A cursor value can be obtained from the result_info.cursor field in the response.",
+              "type": "string"
+            },
+            "device.id": {
+              "description": "Filter by WARP device ID.",
+              "type": "string"
+            },
+            "id": {
+              "description": "Filter by registration ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "include": {
+              "description": "Comma-separated list of additional information that should be included in the registration response. Supported values are: \"policy\".",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "The maximum number of devices to return in a single response.",
+              "type": "integer"
+            },
+            "policy.id": {
+              "description": "Filter by the ID of the device settings profile assigned to the registration.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "registration_type": {
+              "description": "Filter by registration client type.",
+              "enum": [
+                "warp",
+                "browser_extension"
+              ],
+              "type": "string"
+            },
+            "search": {
+              "description": "Filter by registration details.",
+              "type": "string"
+            },
+            "seen_after": {
+              "description": "Filter by the last_seen timestamp - returns only registrations last seen after this timestamp.",
+              "type": "string"
+            },
+            "seen_before": {
+              "description": "Filter by the last_seen timestamp - returns only registrations last seen before this timestamp.",
+              "type": "string"
+            },
+            "sort_by": {
+              "description": "The registration field to order results by.",
+              "enum": [
+                "id",
+                "user.name",
+                "user.email",
+                "last_seen_at",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "sort_order": {
+              "description": "Sort direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "status": {
+              "description": "Filter by registration status. Defaults to 'active'.",
+              "enum": [
+                "active",
+                "all",
+                "revoked"
+              ],
+              "type": "string"
+            },
+            "user.id": {
+              "description": "Filter by user ID.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_registration_type": teams_devices_registration_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -515,15 +567,12 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_cursor_result_info": teams_devices_cursor_result_info_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration": teams_devices_registration_output,
-        "teams-devices_registration_device_details": teams_devices_registration_device_details_output,
-        "teams-devices_registration_type": teams_devices_registration_type_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_cursor_result_info": teams$$devices_cursor_result_info,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration": teams$$devices_registration,
+        "teams-devices_registration_device_details": teams$$devices_registration_device_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -577,35 +626,32 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_cursor_result_info": teams_devices_cursor_result_info_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration": teams_devices_registration_output,
-        "teams-devices_registration_device_details": teams_devices_registration_device_details_output,
-        "teams-devices_registration_type": teams_devices_registration_type_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_cursor_result_info": teams$$devices_cursor_result_info,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration": teams$$devices_registration,
+        "teams-devices_registration_device_details": teams$$devices_registration_device_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/registrations`,
       query: [
-        ["user.id", args["user_id"], true],
-        ["seen_after", args["seen_after"], false],
-        ["seen_before", args["seen_before"], false],
-        ["status", args["status"], false],
-        ["registration_type", args["registration_type"], false],
-        ["per_page", args["per_page"], false],
-        ["search", args["search"], false],
-        ["sort_by", args["sort_by"], false],
-        ["sort_order", args["sort_order"], false],
-        ["cursor", args["cursor"], false],
-        ["id", args["id"], true],
-        ["device.id", args["device_id"], false],
-        ["policy.id", args["policy_id"], false],
-        ["include", args["include"], true],
+        ["user.id", param(args, "query", "user.id"), true],
+        ["seen_after", param(args, "query", "seen_after"), false],
+        ["seen_before", param(args, "query", "seen_before"), false],
+        ["status", param(args, "query", "status"), false],
+        ["registration_type", param(args, "query", "registration_type"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["search", param(args, "query", "search"), false],
+        ["sort_by", param(args, "query", "sort_by"), false],
+        ["sort_order", param(args, "query", "sort_order"), false],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["id", param(args, "query", "id"), true],
+        ["device.id", param(args, "query", "device.id"), false],
+        ["policy.id", param(args, "query", "policy.id"), false],
+        ["include", param(args, "query", "include"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/devices/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/schemas.ts
index e572202c9..b6c20739f 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/schemas.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `teams-devices_identifier`.
- */
-export const teams_devices_identifier: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `teams-devices_physical_device_update_request`.
  */
-export const teams_devices_physical_device_update_request: JsonSchema = {
+export const teams$$devices_physical_device_update_request: JsonSchema = {
   "properties": {
     "tags": {
       "additionalProperties": {
@@ -25,23 +18,3 @@ export const teams_devices_physical_device_update_request: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `teams-devices_registration_type`.
- */
-export const teams_devices_registration_type: JsonSchema = {
-  "description": "The registration client type, derived from device_type.",
-  "enum": [
-    "warp",
-    "browser_extension"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `teams-devices_uuid`.
- */
-export const teams_devices_uuid: JsonSchema = {
-  "description": "API UUID.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/devices/settings/outputs.ts b/src/generated/forge-mcp/zeroTrust/devices/settings/outputs.ts
index f092b4816..8e3ee8b36 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/settings/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/settings/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `teams-devices_zero-trust-account-device-settings` in
  * responses.
  */
-export const teams_devices_zero_trust_account_device_settings_output: JsonSchema = {
+export const teams$$devices_zero$$trust$$account$$device$$settings: JsonSchema = {
   "properties": {
     "disable_for_time": {
       "type": "number"
@@ -44,7 +44,7 @@ export const teams_devices_zero_trust_account_device_settings_output: JsonSchema
  * The schema of `teams-devices_zero-trust-account-device-settings-response` in
  * responses.
  */
-export const teams_devices_zero_trust_account_device_settings_response_output: JsonSchema = {
+export const teams$$devices_zero$$trust$$account$$device$$settings$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/teams-devices_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/devices/settings/schemas.ts b/src/generated/forge-mcp/zeroTrust/devices/settings/schemas.ts
index d24053ad2..e6f8c1c97 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/settings/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/settings/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `teams-devices_zero-trust-account-device-settings`.
  */
-export const teams_devices_zero_trust_account_device_settings: JsonSchema = {
+export const teams$$devices_zero$$trust$$account$$device$$settings: JsonSchema = {
   "properties": {
     "disable_for_time": {
       "description": "Sets the time limit, in seconds, that a user can use an override code to bypass WARP.",
diff --git a/src/generated/forge-mcp/zeroTrust/devices/settings/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/settings/tools.ts
index 1d6a469be..a7a12e8c3 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/settings/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/settings/tools.ts
@@ -3,48 +3,54 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  teams_devices_api_response_common_failure_output,
-  teams_devices_api_response_common_output,
-  teams_devices_api_response_single_output,
-  teams_devices_messages_output,
+  teams$$devices_api$$response$$common,
+  teams$$devices_api$$response$$common$$failure,
+  teams$$devices_api$$response$$single,
+  teams$$devices_messages,
 } from "../outputs.js";
-import { teams_devices_identifier } from "../schemas.js";
 import {
-  teams_devices_zero_trust_account_device_settings_output,
-  teams_devices_zero_trust_account_device_settings_response_output,
+  teams$$devices_zero$$trust$$account$$device$$settings,
+  teams$$devices_zero$$trust$$account$$device$$settings$$response,
 } from "./outputs.js";
-import { teams_devices_zero_trust_account_device_settings } from "./schemas.js";
+import { teams$$devices_zero$$trust$$account$$device$$settings as teams$$devices_zero$$trust$$account$$device$$settings$ } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices.settings`.
+ * The tools of `zeroTrust.devices.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_settings_delete",
+    name: "zeroTrust_devices_settings_delete",
     title: "Reset device settings",
-    description: "Resets the current device settings for a Zero Trust account.",
+    description: "Resets the current device settings for a Zero Trust account.\n\nDELETE /accounts/{account_id}/devices/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_zero-trust-account-device-settings-response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_zero-trust-account-device-settings": teams_devices_zero_trust_account_device_settings_output,
-        "teams-devices_zero-trust-account-device-settings-response": teams_devices_zero_trust_account_device_settings_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_zero-trust-account-device-settings": teams$$devices_zero$$trust$$account$$device$$settings,
+        "teams-devices_zero-trust-account-device-settings-response": teams$$devices_zero$$trust$$account$$device$$settings$$response,
       },
     },
     annotations: {
@@ -71,12 +77,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_zero-trust-account-device-settings": teams_devices_zero_trust_account_device_settings_output,
-        "teams-devices_zero-trust-account-device-settings-response": teams_devices_zero_trust_account_device_settings_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_zero-trust-account-device-settings": teams$$devices_zero$$trust$$account$$device$$settings,
+        "teams-devices_zero-trust-account-device-settings-response": teams$$devices_zero$$trust$$account$$device$$settings$$response,
       },
     },
     request: (args) => ({
@@ -84,31 +90,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_settings_get",
+    name: "zeroTrust_devices_settings_get",
     title: "Get device settings",
-    description: "Describes the current device settings for a Zero Trust account.",
+    description: "Describes the current device settings for a Zero Trust account.\n\nGET /accounts/{account_id}/devices/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_zero-trust-account-device-settings-response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_zero-trust-account-device-settings": teams_devices_zero_trust_account_device_settings_output,
-        "teams-devices_zero-trust-account-device-settings-response": teams_devices_zero_trust_account_device_settings_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_zero-trust-account-device-settings": teams$$devices_zero$$trust$$account$$device$$settings,
+        "teams-devices_zero-trust-account-device-settings-response": teams$$devices_zero$$trust$$account$$device$$settings$$response,
       },
     },
     annotations: {
@@ -130,12 +143,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_zero-trust-account-device-settings": teams_devices_zero_trust_account_device_settings_output,
-        "teams-devices_zero-trust-account-device-settings-response": teams_devices_zero_trust_account_device_settings_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_zero-trust-account-device-settings": teams$$devices_zero$$trust$$account$$device$$settings,
+        "teams-devices_zero-trust-account-device-settings-response": teams$$devices_zero$$trust$$account$$device$$settings$$response,
       },
     },
     request: (args) => ({
@@ -143,36 +156,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_settings_update",
+    name: "zeroTrust_devices_settings_update",
     title: "Update device settings",
-    description: "Updates the device settings for a Zero Trust account.",
+    description: "Updates the device settings for a Zero Trust account.\n\nPATCH /accounts/{account_id}/devices/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/teams-devices_identifier"
-        },
         "body": {
           "$ref": "#/$defs/teams-devices_zero-trust-account-device-settings"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_identifier": teams_devices_identifier,
-        "teams-devices_zero-trust-account-device-settings": teams_devices_zero_trust_account_device_settings,
+        "teams-devices_zero-trust-account-device-settings": teams$$devices_zero$$trust$$account$$device$$settings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/teams-devices_zero-trust-account-device-settings-response",
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_zero-trust-account-device-settings": teams_devices_zero_trust_account_device_settings_output,
-        "teams-devices_zero-trust-account-device-settings-response": teams_devices_zero_trust_account_device_settings_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_zero-trust-account-device-settings": teams$$devices_zero$$trust$$account$$device$$settings,
+        "teams-devices_zero-trust-account-device-settings-response": teams$$devices_zero$$trust$$account$$device$$settings$$response,
       },
     },
     annotations: {
@@ -199,12 +221,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_api-response-common": teams_devices_api_response_common_output,
-        "teams-devices_api-response-common-failure": teams_devices_api_response_common_failure_output,
-        "teams-devices_api-response-single": teams_devices_api_response_single_output,
-        "teams-devices_messages": teams_devices_messages_output,
-        "teams-devices_zero-trust-account-device-settings": teams_devices_zero_trust_account_device_settings_output,
-        "teams-devices_zero-trust-account-device-settings-response": teams_devices_zero_trust_account_device_settings_response_output,
+        "teams-devices_api-response-common": teams$$devices_api$$response$$common,
+        "teams-devices_api-response-common-failure": teams$$devices_api$$response$$common$$failure,
+        "teams-devices_api-response-single": teams$$devices_api$$response$$single,
+        "teams-devices_messages": teams$$devices_messages,
+        "teams-devices_zero-trust-account-device-settings": teams$$devices_zero$$trust$$account$$device$$settings,
+        "teams-devices_zero-trust-account-device-settings-response": teams$$devices_zero$$trust$$account$$device$$settings$$response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/devices/tools.ts b/src/generated/forge-mcp/zeroTrust/devices/tools.ts
index 1b056b597..83ef1e163 100644
--- a/src/generated/forge-mcp/zeroTrust/devices/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/devices/tools.ts
@@ -1,46 +1,51 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  teams_devices_components_schemas_uuid_output,
-  teams_devices_cursor_result_info_output,
-  teams_devices_email_output,
-  teams_devices_empty_body_output,
-  teams_devices_physical_device_output,
-  teams_devices_policy_summary_output,
-  teams_devices_registration_details_output,
-  teams_devices_user_output,
-  teams_devices_v4_error_response_output,
-  teams_devices_v4_response_message_output,
+  teams$$devices_cursor_result_info,
+  teams$$devices_empty_body,
+  teams$$devices_physical_device,
+  teams$$devices_policy_summary,
+  teams$$devices_registration_details,
+  teams$$devices_user,
+  teams$$devices_v4_error_response,
+  teams$$devices_v4_response_message,
 } from "./outputs.js";
-import {
-  teams_devices_physical_device_update_request,
-  teams_devices_registration_type,
-} from "./schemas.js";
+import { teams$$devices_physical_device_update_request } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.devices`.
+ * The tools of `zeroTrust.devices`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_devices_delete",
+    name: "zeroTrust_devices_delete",
     title: "Delete device",
-    description: "Deletes a WARP device.",
+    description: "Deletes a WARP device.\n\nDELETE /accounts/{account_id}/devices/physical-devices/{device_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "device_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "device_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "device_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "device_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -70,8 +75,8 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_empty_body": teams_devices_empty_body_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_empty_body": teams$$devices_empty_body,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -123,9 +128,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_empty_body": teams_devices_empty_body_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_empty_body": teams$$devices_empty_body,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
@@ -133,27 +138,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_devices_get",
+    name: "zeroTrust_devices_get",
     title: "Get device",
-    description: "Fetches a single WARP device.",
+    description: "Fetches a single WARP device.\n\nGET /accounts/{account_id}/devices/physical-devices/{device_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "device_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "device_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "device_id"
+          ],
+          "type": "object"
         },
-        "include": {
-          "description": "Comma-separated list of additional information that should be included in the device response. Supported values are: \"last_seen_registration.policy\".\n",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include": {
+              "description": "Comma-separated list of additional information that should be included in the device response. Supported values are: \"last_seen_registration.policy\".",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "device_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -184,13 +205,11 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_physical_device": teams_devices_physical_device_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration_details": teams_devices_registration_details_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_physical_device": teams$$devices_physical_device,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration_details": teams$$devices_registration_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -238,122 +257,137 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_physical_device": teams_devices_physical_device_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration_details": teams_devices_registration_details_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_physical_device": teams$$devices_physical_device,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration_details": teams$$devices_registration_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/physical-devices/${pathParam(args, "device_id")}`,
       query: [
-        ["include", args["include"], true],
+        ["include", param(args, "query", "include"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_devices_list",
+    name: "zeroTrust_devices_list",
     title: "List devices",
-    description: "Lists WARP devices.",
+    description: "Lists WARP devices.\n\nGET /accounts/{account_id}/devices/physical-devices",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "active_registrations": {
-          "description": "Include or exclude devices with active registrations. The default is \"only\" - return only devices with active registrations.",
-          "enum": [
-            "include",
-            "only",
-            "exclude"
-          ],
-          "type": "string"
-        },
-        "cursor": {
-          "description": "Opaque token indicating the starting position when requesting the next set of records. A cursor value can be obtained from the result_info.cursor field in the response.",
-          "type": "string"
-        },
-        "has_registration_type": {
-          "$ref": "#/$defs/teams-devices_registration_type",
-          "description": "Filter by the type of active registration associated with the device."
-        },
-        "id": {
-          "description": "Filter by a one or more device IDs.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "include": {
-          "description": "Comma-separated list of additional information that should be included in the device response. Supported values are: \"last_seen_registration.policy\".\n",
-          "type": "string"
-        },
-        "last_seen_registration_policy_id": {
-          "description": "Filter by the ID of the device settings profile assigned to the device registration.",
-          "format": "uuid",
-          "type": "string"
-        },
-        "last_seen_user_email": {
-          "description": "Filter by the last seen user's email.",
-          "type": "string"
-        },
-        "per_page": {
-          "description": "The maximum number of devices to return in a single response.",
-          "type": "integer"
-        },
-        "search": {
-          "description": "Search by device details.",
-          "type": "string"
-        },
-        "seen_after": {
-          "description": "Filter by the last_seen timestamp - returns only devices last seen after this timestamp.",
-          "type": "string"
-        },
-        "seen_before": {
-          "description": "Filter by the last_seen timestamp - returns only devices last seen before this timestamp.",
-          "type": "string"
-        },
-        "sort_by": {
-          "description": "The device field to order results by.",
-          "enum": [
-            "name",
-            "id",
-            "client_version",
-            "last_seen_user.email",
-            "last_seen_at",
-            "active_registrations",
-            "created_at"
-          ],
-          "type": "string"
-        },
-        "sort_order": {
-          "description": "Sort direction.",
-          "enum": [
-            "asc",
-            "desc"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "tag": {
-          "description": "Filter by one or more device tags in key:value format. Devices must match all provided tags.",
-          "items": {
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "active_registrations": {
+              "description": "Include or exclude devices with active registrations. The default is \"only\" - return only devices with active registrations.",
+              "enum": [
+                "include",
+                "only",
+                "exclude"
+              ],
+              "type": "string"
+            },
+            "cursor": {
+              "description": "Opaque token indicating the starting position when requesting the next set of records. A cursor value can be obtained from the result_info.cursor field in the response.",
+              "type": "string"
+            },
+            "has_registration_type": {
+              "description": "Filter by the type of active registration associated with the device.",
+              "enum": [
+                "warp",
+                "browser_extension"
+              ],
+              "type": "string"
+            },
+            "id": {
+              "description": "Filter by a one or more device IDs.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "include": {
+              "description": "Comma-separated list of additional information that should be included in the device response. Supported values are: \"last_seen_registration.policy\".",
+              "type": "string"
+            },
+            "last_seen_registration.policy.id": {
+              "description": "Filter by the ID of the device settings profile assigned to the device registration.",
+              "format": "uuid",
+              "type": "string"
+            },
+            "last_seen_user.email": {
+              "description": "Filter by the last seen user's email.",
+              "type": "string"
+            },
+            "per_page": {
+              "description": "The maximum number of devices to return in a single response.",
+              "type": "integer"
+            },
+            "search": {
+              "description": "Search by device details.",
+              "type": "string"
+            },
+            "seen_after": {
+              "description": "Filter by the last_seen timestamp - returns only devices last seen after this timestamp.",
+              "type": "string"
+            },
+            "seen_before": {
+              "description": "Filter by the last_seen timestamp - returns only devices last seen before this timestamp.",
+              "type": "string"
+            },
+            "sort_by": {
+              "description": "The device field to order results by.",
+              "enum": [
+                "name",
+                "id",
+                "client_version",
+                "last_seen_user.email",
+                "last_seen_at",
+                "active_registrations",
+                "created_at"
+              ],
+              "type": "string"
+            },
+            "sort_order": {
+              "description": "Sort direction.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "tag": {
+              "description": "Filter by one or more device tags in key:value format. Devices must match all provided tags.",
+              "items": {
+                "type": "string"
+              },
+              "maxItems": 10,
+              "type": "array"
+            }
           },
-          "maxItems": 10,
-          "type": "array"
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "teams-devices_registration_type": teams_devices_registration_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "properties": {
@@ -390,14 +424,12 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_cursor_result_info": teams_devices_cursor_result_info_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_physical_device": teams_devices_physical_device_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration_details": teams_devices_registration_details_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_cursor_result_info": teams$$devices_cursor_result_info,
+        "teams-devices_physical_device": teams$$devices_physical_device,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration_details": teams$$devices_registration_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -451,61 +483,69 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_cursor_result_info": teams_devices_cursor_result_info_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_physical_device": teams_devices_physical_device_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration_details": teams_devices_registration_details_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_cursor_result_info": teams$$devices_cursor_result_info,
+        "teams-devices_physical_device": teams$$devices_physical_device,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration_details": teams$$devices_registration_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/devices/physical-devices`,
       query: [
-        ["cursor", args["cursor"], false],
-        ["sort_by", args["sort_by"], false],
-        ["sort_order", args["sort_order"], false],
-        ["last_seen_user.email", args["last_seen_user_email"], false],
-        ["seen_after", args["seen_after"], false],
-        ["seen_before", args["seen_before"], false],
-        ["per_page", args["per_page"], false],
-        ["search", args["search"], false],
-        ["active_registrations", args["active_registrations"], false],
-        ["has_registration_type", args["has_registration_type"], false],
-        ["id", args["id"], true],
-        ["tag", args["tag"], true],
-        ["last_seen_registration.policy.id", args["last_seen_registration_policy_id"], false],
-        ["include", args["include"], true],
+        ["cursor", param(args, "query", "cursor"), false],
+        ["sort_by", param(args, "query", "sort_by"), false],
+        ["sort_order", param(args, "query", "sort_order"), false],
+        ["last_seen_user.email", param(args, "query", "last_seen_user.email"), false],
+        ["seen_after", param(args, "query", "seen_after"), false],
+        ["seen_before", param(args, "query", "seen_before"), false],
+        ["per_page", param(args, "query", "per_page"), false],
+        ["search", param(args, "query", "search"), false],
+        ["active_registrations", param(args, "query", "active_registrations"), false],
+        ["has_registration_type", param(args, "query", "has_registration_type"), false],
+        ["id", param(args, "query", "id"), true],
+        ["tag", param(args, "query", "tag"), true],
+        ["last_seen_registration.policy.id", param(args, "query", "last_seen_registration.policy.id"), false],
+        ["include", param(args, "query", "include"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_devices_update",
+    name: "zeroTrust_devices_update",
     title: "Update device",
-    description: "Updates properties of a WARP device.\n\nThis method is beta.",
+    description: "Updates properties of a WARP device.\n\nThis method is beta.\n\nPATCH /accounts/{account_id}/devices/physical-devices/{device_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/teams-devices_physical_device_update_request"
         },
-        "device_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "device_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "device_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "device_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "teams-devices_physical_device_update_request": teams_devices_physical_device_update_request,
+        "teams-devices_physical_device_update_request": teams$$devices_physical_device_update_request,
       },
     },
     outputSchema: {
@@ -537,13 +577,11 @@ export const tools: readonly Tool[] = [
       ],
       "type": "object",
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_physical_device": teams_devices_physical_device_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration_details": teams_devices_registration_details_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_physical_device": teams$$devices_physical_device,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration_details": teams$$devices_registration_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     annotations: {
@@ -597,14 +635,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "teams-devices_components-schemas-uuid": teams_devices_components_schemas_uuid_output,
-        "teams-devices_email": teams_devices_email_output,
-        "teams-devices_physical_device": teams_devices_physical_device_output,
-        "teams-devices_policy_summary": teams_devices_policy_summary_output,
-        "teams-devices_registration_details": teams_devices_registration_details_output,
-        "teams-devices_user": teams_devices_user_output,
-        "teams-devices_v4_error_response": teams_devices_v4_error_response_output,
-        "teams-devices_v4_response_message": teams_devices_v4_response_message_output,
+        "teams-devices_physical_device": teams$$devices_physical_device,
+        "teams-devices_policy_summary": teams$$devices_policy_summary,
+        "teams-devices_registration_details": teams$$devices_registration_details,
+        "teams-devices_user": teams$$devices_user,
+        "teams-devices_v4_error_response": teams$$devices_v4_error_response,
+        "teams-devices_v4_response_message": teams$$devices_v4_response_message,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dex/colos/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/colos/outputs.ts
index e62a4fcf9..0f8c03305 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/colos/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/colos/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `digital-experience-monitoring_colos_response` in responses.
  */
-export const digital_experience_monitoring_colos_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_colos_response: JsonSchema = {
   "items": {
     "properties": {
       "airportCode": {
diff --git a/src/generated/forge-mcp/zeroTrust/dex/colos/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/colos/tools.ts
index ad19b7c58..5efdf026d 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/colos/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/colos/tools.ts
@@ -1,55 +1,70 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_messages,
 } from "../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../schemas.js";
-import { digital_experience_monitoring_colos_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_colos_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.colos`.
+ * The tools of `zeroTrust.dex.colos`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_colos_list",
+    name: "zeroTrust_dex_colos_list",
     title: "List Cloudflare colos",
-    description: "List Cloudflare colos that account's devices were connected to during a time period, sorted by usage starting from the most used colo. Colos without traffic are also returned and sorted alphabetically.",
+    description: "List Cloudflare colos that account's devices were connected to during a time period, sorted by usage starting from the most used colo. Colos without traffic are also returned and sorted alphabetically.\n\nGET /accounts/{account_id}/dex/colos",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "from": {
-          "description": "Start time for connection period in ISO (RFC3339 - ISO 8601) format.",
-          "type": "string"
-        },
-        "sort_by": {
-          "description": "Type of usage that colos should be sorted by. If unspecified, returns all Cloudflare colos sorted alphabetically.",
-          "enum": [
-            "fleet-status-usage",
-            "application-tests-usage"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "to": {
-          "description": "End time for connection period in ISO (RFC3339 - ISO 8601) format.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "from": {
+              "description": "Start time for connection period in ISO (RFC3339 - ISO 8601) format.",
+              "type": "string"
+            },
+            "sortBy": {
+              "description": "Type of usage that colos should be sorted by. If unspecified, returns all Cloudflare colos sorted alphabetically.",
+              "enum": [
+                "fleet-status-usage",
+                "application-tests-usage"
+              ],
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for connection period in ISO (RFC3339 - ISO 8601) format.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "from",
+            "to"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -66,9 +81,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_colos_response": digital_experience_monitoring_colos_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_colos_response": digital$$experience$$monitoring_colos_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -110,18 +125,18 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_colos_response": digital_experience_monitoring_colos_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_colos_response": digital$$experience$$monitoring_colos_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/colos`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["sortBy", args["sort_by"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["sortBy", param(args, "query", "sortBy"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/commands/eligibleDevices/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/commands/eligibleDevices/outputs.ts
index 562d70aa8..566710cb1 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/commands/eligibleDevices/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/commands/eligibleDevices/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * The schema of `digital-experience-monitoring_commands_devices_response` in
  * responses.
  */
-export const digital_experience_monitoring_commands_devices_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_commands_devices_response: JsonSchema = {
   "properties": {
     "devices": {
       "items": {
@@ -28,19 +28,19 @@ export const digital_experience_monitoring_commands_devices_response_output: Jso
             "type": "string"
           },
           "platform": {
-            "$ref": "#/$defs/digital-experience-monitoring_platform"
+            "type": "string"
           },
           "registrationId": {
             "type": "string"
           },
           "status": {
-            "$ref": "#/$defs/digital-experience-monitoring_status"
+            "type": "string"
           },
           "timestamp": {
-            "$ref": "#/$defs/digital-experience-monitoring_timestamp"
+            "type": "string"
           },
           "version": {
-            "$ref": "#/$defs/digital-experience-monitoring_version"
+            "type": "string"
           }
         },
         "type": "object"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/commands/eligibleDevices/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/commands/eligibleDevices/tools.ts
index 8e0269b3b..5ef68b9e3 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/commands/eligibleDevices/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/commands/eligibleDevices/tools.ts
@@ -1,57 +1,68 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_collection_output,
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_platform_output,
-  digital_experience_monitoring_status_output,
-  digital_experience_monitoring_timestamp_output,
-  digital_experience_monitoring_version_output,
+  digital$$experience$$monitoring_api$$response$$collection,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_messages,
 } from "../../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../../schemas.js";
-import { digital_experience_monitoring_commands_devices_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_commands_devices_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.commands.eligible_devices`.
+ * The tools of `zeroTrust.dex.commands.eligibleDevices`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_commands_eligible_devices_list",
+    name: "zeroTrust_dex_commands_eligibleDevices_list",
     title: "List devices eligible for remote captures",
-    description: "List devices with WARP client support for remote captures which have been connected in the last 1 hour.",
+    description: "List devices with WARP client support for remote captures which have been connected in the last 1 hour.\n\nGET /accounts/{account_id}/dex/commands/devices",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "number"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "search": {
-          "description": "Filter devices by name or email.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "number"
+            },
+            "search": {
+              "description": "Filter devices by name or email.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "page",
+            "per_page"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "page",
-        "per_page"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -68,14 +79,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_commands_devices_response": digital_experience_monitoring_commands_devices_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_platform": digital_experience_monitoring_platform_output,
-        "digital-experience-monitoring_status": digital_experience_monitoring_status_output,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp_output,
-        "digital-experience-monitoring_version": digital_experience_monitoring_version_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_commands_devices_response": digital$$experience$$monitoring_commands_devices_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -117,23 +124,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_commands_devices_response": digital_experience_monitoring_commands_devices_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_platform": digital_experience_monitoring_platform_output,
-        "digital-experience-monitoring_status": digital_experience_monitoring_status_output,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp_output,
-        "digital-experience-monitoring_version": digital_experience_monitoring_version_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_commands_devices_response": digital$$experience$$monitoring_commands_devices_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/commands/devices`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["search", args["search"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["search", param(args, "query", "search"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/commands/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/commands/outputs.ts
index 3b337b33d..2e9db5d81 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/commands/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/commands/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `digital-experience-monitoring_get_commands_response` in
  * responses.
  */
-export const digital_experience_monitoring_get_commands_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_get_commands_response: JsonSchema = {
   "properties": {
     "commands": {
       "items": {
@@ -68,7 +68,7 @@ export const digital_experience_monitoring_get_commands_response_output: JsonSch
  * The schema of `digital-experience-monitoring_post_commands_response` in
  * responses.
  */
-export const digital_experience_monitoring_post_commands_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_post_commands_response: JsonSchema = {
   "properties": {
     "commands": {
       "items": {
diff --git a/src/generated/forge-mcp/zeroTrust/dex/commands/quota/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/commands/quota/outputs.ts
index cf9caa00c..4c8a48152 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/commands/quota/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/commands/quota/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * The schema of `digital-experience-monitoring_get_commands_quota_response` in
  * responses.
  */
-export const digital_experience_monitoring_get_commands_quota_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_get_commands_quota_response: JsonSchema = {
   "properties": {
     "quota": {
       "type": "number"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/commands/quota/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/commands/quota/tools.ts
index 92d984386..6a24d1832 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/commands/quota/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/commands/quota/tools.ts
@@ -3,36 +3,42 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_collection_output,
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$collection,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_messages,
 } from "../../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../../schemas.js";
-import { digital_experience_monitoring_get_commands_quota_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_get_commands_quota_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.commands.quota`.
+ * The tools of `zeroTrust.dex.commands.quota`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_commands_quota_get",
+    name: "zeroTrust_dex_commands_quota_get",
     title: "Returns account commands usage, quota, and reset time",
-    description: "Retrieves the current quota usage and limits for device commands within a specific account, including the time when the quota will reset",
+    description: "Retrieves the current quota usage and limits for device commands within a specific account, including the time when the quota will reset\n\nGET /accounts/{account_id}/dex/commands/quota",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -49,10 +55,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_get_commands_quota_response": digital_experience_monitoring_get_commands_quota_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_get_commands_quota_response": digital$$experience$$monitoring_get_commands_quota_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -94,11 +100,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_get_commands_quota_response": digital_experience_monitoring_get_commands_quota_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_get_commands_quota_response": digital$$experience$$monitoring_get_commands_quota_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dex/commands/results/schemas.ts b/src/generated/forge-mcp/zeroTrust/dex/commands/results/schemas.ts
deleted file mode 100644
index 020b33e84..000000000
--- a/src/generated/forge-mcp/zeroTrust/dex/commands/results/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../../_/tool.js";
-
-/**
- * The schema of `digital-experience-monitoring_command_id`.
- */
-export const digital_experience_monitoring_command_id: JsonSchema = {
-  "description": "Unique identifier for a command",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dex/commands/results/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/commands/results/tools.ts
index 61eb39939..e81bfebe2 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/commands/results/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/commands/results/tools.ts
@@ -3,45 +3,49 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_messages,
 } from "../../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../../schemas.js";
-import { digital_experience_monitoring_command_id } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dex.commands.results`.
+ * The tools of `zeroTrust.dex.commands.results`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_commands_results_get",
+    name: "zeroTrust_dex_commands_results_get",
     title: "Download command output file",
-    description: "Downloads artifacts for an executed command. Bulk downloads are not supported",
+    description: "Downloads artifacts for an executed command. Bulk downloads are not supported\n\nGET /accounts/{account_id}/dex/commands/{command_id}/downloads/{filename}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "command_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_command_id",
-          "description": "Unique identifier for command."
-        },
-        "filename": {
-          "description": "The name of the file to be downloaded, including the `.zip` extension.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "command_id": {
+              "description": "Unique identifier for command.",
+              "type": "string"
+            },
+            "filename": {
+              "description": "The name of the file to be downloaded, including the `.zip` extension.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "command_id",
+            "filename"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "command_id",
-        "filename"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_command_id": digital_experience_monitoring_command_id,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": false,
@@ -68,8 +72,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dex/commands/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/commands/tools.ts
index ae1e56572..d070778c4 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/commands/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/commands/tools.ts
@@ -1,34 +1,29 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_collection_output,
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$collection,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_messages,
 } from "../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../schemas.js";
 import {
-  digital_experience_monitoring_get_commands_response_output,
-  digital_experience_monitoring_post_commands_response_output,
+  digital$$experience$$monitoring_get_commands_response,
+  digital$$experience$$monitoring_post_commands_response,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.commands`.
+ * The tools of `zeroTrust.dex.commands`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_commands_create",
+    name: "zeroTrust_dex_commands_create",
     title: "Create account commands",
-    description: "Initiate commands for up to 10 devices per account.",
+    description: "Initiate commands for up to 10 devices per account.\n\nPOST /accounts/{account_id}/dex/commands",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
         "body": {
           "properties": {
             "commands": {
@@ -123,15 +118,26 @@ export const tools: readonly Tool[] = [
             "commands"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -148,10 +154,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_post_commands_response": digital_experience_monitoring_post_commands_response_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_post_commands_response": digital$$experience$$monitoring_post_commands_response,
       },
     },
     annotations: {
@@ -190,11 +196,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_post_commands_response": digital_experience_monitoring_post_commands_response_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_post_commands_response": digital$$experience$$monitoring_post_commands_response,
       },
     },
     request: (args) => ({
@@ -203,71 +209,87 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dex_commands_list",
+    name: "zeroTrust_dex_commands_list",
     title: "List account commands",
-    description: "Retrieves a paginated list of commands issued to devices under the specified account, optionally filtered by time range, device, or other parameters",
+    description: "Retrieves a paginated list of commands issued to devices under the specified account, optionally filtered by time range, device, or other parameters\n\nGET /accounts/{account_id}/dex/commands",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "command_type": {
-          "description": "Optionally filter executed commands by command type.",
-          "enum": [
-            "pcap",
-            "speed-test",
-            "warp-diag"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "device_id": {
-          "description": "Unique identifier for a device.",
-          "type": "string"
-        },
-        "from": {
-          "description": "Start time for the query in ISO (RFC3339 - ISO 8601) format.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "number"
+          "type": "object"
         },
-        "status": {
-          "description": "Optionally filter executed commands by status.",
-          "enum": [
-            "PENDING_EXEC",
-            "PENDING_UPLOAD",
-            "SUCCESS",
-            "FAILED"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "command_type": {
+              "description": "Optionally filter executed commands by command type.",
+              "enum": [
+                "pcap",
+                "speed-test",
+                "warp-diag"
+              ],
+              "type": "string"
+            },
+            "device_id": {
+              "description": "Unique identifier for a device.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start time for the query in ISO (RFC3339 - ISO 8601) format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "number"
+            },
+            "status": {
+              "description": "Optionally filter executed commands by status.",
+              "enum": [
+                "PENDING_EXEC",
+                "PENDING_UPLOAD",
+                "SUCCESS",
+                "FAILED"
+              ],
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for the query in ISO (RFC3339 - ISO 8601) format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "user_email": {
+              "description": "Email tied to the device.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "page",
+            "per_page"
           ],
-          "type": "string"
-        },
-        "to": {
-          "description": "End time for the query in ISO (RFC3339 - ISO 8601) format.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "user_email": {
-          "description": "Email tied to the device.",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "page",
-        "per_page"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -284,10 +306,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_get_commands_response": digital_experience_monitoring_get_commands_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_get_commands_response": digital$$experience$$monitoring_get_commands_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -329,24 +351,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_get_commands_response": digital_experience_monitoring_get_commands_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_get_commands_response": digital$$experience$$monitoring_get_commands_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/commands`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["device_id", args["device_id"], true],
-        ["user_email", args["user_email"], true],
-        ["command_type", args["command_type"], true],
-        ["status", args["status"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["device_id", param(args, "query", "device_id"), true],
+        ["user_email", param(args, "query", "user_email"), true],
+        ["command_type", param(args, "query", "command_type"), true],
+        ["status", param(args, "query", "status"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/live/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/live/outputs.ts
index 9b948cb5b..d8bb9b2ca 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/live/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/live/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
  * The schema of `digital-experience-monitoring_fleet_status_live_response` in
  * responses.
  */
-export const digital_experience_monitoring_fleet_status_live_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_fleet_status_live_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/digital-experience-monitoring_api-response-single"
@@ -84,7 +84,7 @@ export const digital_experience_monitoring_fleet_status_live_response_output: Js
                   ]
                 },
                 "uniqueDevicesTotal": {
-                  "$ref": "#/$defs/digital-experience-monitoring_uniqueDevicesTotal"
+                  "type": "number"
                 }
               },
               "type": "object"
@@ -101,10 +101,10 @@ export const digital_experience_monitoring_fleet_status_live_response_output: Js
 /**
  * The schema of `digital-experience-monitoring_live_stat` in responses.
  */
-export const digital_experience_monitoring_live_stat_output: JsonSchema = {
+export const digital$$experience$$monitoring_live_stat: JsonSchema = {
   "properties": {
     "uniqueDevicesTotal": {
-      "$ref": "#/$defs/digital-experience-monitoring_uniqueDevicesTotal"
+      "type": "number"
     },
     "value": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/live/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/live/tools.ts
index 2909c8753..cc97a4068 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/live/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/live/tools.ts
@@ -1,58 +1,69 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../../../schemas.js";
-import { digital_experience_monitoring_since_minutes } from "../../schemas.js";
-import { digital_experience_monitoring_uniqueDevicesTotal_output } from "../outputs.js";
 import {
-  digital_experience_monitoring_fleet_status_live_response_output,
-  digital_experience_monitoring_live_stat_output,
+  digital$$experience$$monitoring_fleet_status_live_response,
+  digital$$experience$$monitoring_live_stat,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.devices.aggregates.live`.
+ * The tools of `zeroTrust.dex.devices.aggregates.live`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_devices_aggregates_live_get",
+    name: "zeroTrust_dex_devices_aggregates_live_get",
     title: "Get live aggregate device details by dimension",
-    description: "Get details for live (up to 60 minutes) devices using WARP.",
+    description: "Get details for live (up to 60 minutes) devices using WARP.\n\nGET /accounts/{account_id}/dex/fleet-status/live",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "since_minutes": {
-          "$ref": "#/$defs/digital-experience-monitoring_since_minutes",
-          "default": 10,
-          "description": "Number of minutes before current time."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "since_minutes": {
+              "default": 10,
+              "description": "Number of minutes before current time.",
+              "type": "number"
+            }
+          },
+          "required": [
+            "since_minutes"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "since_minutes"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_since_minutes": digital_experience_monitoring_since_minutes,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_fleet_status_live_response",
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_fleet_status_live_response": digital_experience_monitoring_fleet_status_live_response_output,
-        "digital-experience-monitoring_live_stat": digital_experience_monitoring_live_stat_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uniqueDevicesTotal": digital_experience_monitoring_uniqueDevicesTotal_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_fleet_status_live_response": digital$$experience$$monitoring_fleet_status_live_response,
+        "digital-experience-monitoring_live_stat": digital$$experience$$monitoring_live_stat,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -82,18 +93,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_fleet_status_live_response": digital_experience_monitoring_fleet_status_live_response_output,
-        "digital-experience-monitoring_live_stat": digital_experience_monitoring_live_stat_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uniqueDevicesTotal": digital_experience_monitoring_uniqueDevicesTotal_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_fleet_status_live_response": digital$$experience$$monitoring_fleet_status_live_response,
+        "digital-experience-monitoring_live_stat": digital$$experience$$monitoring_live_stat,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/fleet-status/live`,
       query: [
-        ["since_minutes", args["since_minutes"], true],
+        ["since_minutes", param(args, "query", "since_minutes"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/outputs.ts
deleted file mode 100644
index 370c69fef..000000000
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/outputs.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../../_/tool.js";
-
-/**
- * The schema of `digital-experience-monitoring_uniqueDevicesTotal` in
- * responses.
- */
-export const digital_experience_monitoring_uniqueDevicesTotal_output: JsonSchema = {
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/overTime/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/overTime/outputs.ts
index a01126122..a9dcdfd42 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/overTime/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/overTime/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
  * The schema of `digital-experience-monitoring_fleet_status_over_time_response`
  * in responses.
  */
-export const digital_experience_monitoring_fleet_status_over_time_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_fleet_status_over_time_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/digital-experience-monitoring_api-response-single"
@@ -31,7 +31,7 @@ export const digital_experience_monitoring_fleet_status_over_time_response_outpu
                   "type": "array"
                 },
                 "uniqueDevicesTotal": {
-                  "$ref": "#/$defs/digital-experience-monitoring_uniqueDevicesTotal"
+                  "type": "number"
                 }
               },
               "type": "object"
@@ -49,13 +49,13 @@ export const digital_experience_monitoring_fleet_status_over_time_response_outpu
  * The schema of `digital-experience-monitoring_schemas-aggregate_stat` in
  * responses.
  */
-export const digital_experience_monitoring_schemas_aggregate_stat_output: JsonSchema = {
+export const digital$$experience$$monitoring_schemas$$aggregate_stat: JsonSchema = {
   "properties": {
     "timestamp": {
-      "$ref": "#/$defs/digital-experience-monitoring_timestamp"
+      "type": "string"
     },
     "uniqueDevicesTotal": {
-      "$ref": "#/$defs/digital-experience-monitoring_uniqueDevicesTotal"
+      "type": "number"
     },
     "value": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/overTime/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/overTime/tools.ts
index 550d396fa..326db82f5 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/overTime/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/devices/aggregates/overTime/tools.ts
@@ -1,78 +1,81 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_timestamp_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../../outputs.js";
 import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_colo,
-  digital_experience_monitoring_timestamp,
-} from "../../../schemas.js";
-import { digital_experience_monitoring_device_id } from "../../schemas.js";
-import { digital_experience_monitoring_uniqueDevicesTotal_output } from "../outputs.js";
-import {
-  digital_experience_monitoring_fleet_status_over_time_response_output,
-  digital_experience_monitoring_schemas_aggregate_stat_output,
+  digital$$experience$$monitoring_fleet_status_over_time_response,
+  digital$$experience$$monitoring_schemas$$aggregate_stat,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.devices.aggregates.over_time`.
+ * The tools of `zeroTrust.dex.devices.aggregates.overTime`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_devices_aggregates_over_time_get",
+    name: "zeroTrust_dex_devices_aggregates_overTime_get",
     title: "Get over time aggregate details for devices by dimension",
-    description: "Get aggregate details for devices using WARP, up to 7 days.",
+    description: "Get aggregate details for devices using WARP, up to 7 days.\n\nGET /accounts/{account_id}/dex/fleet-status/over-time",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "$ref": "#/$defs/digital-experience-monitoring_colo",
-          "description": "Cloudflare colo airport code."
-        },
-        "device_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_device_id",
-          "description": "Device-specific ID, given as UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "from": {
-          "$ref": "#/$defs/digital-experience-monitoring_timestamp",
-          "description": "Start of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch."
-        },
-        "to": {
-          "$ref": "#/$defs/digital-experience-monitoring_timestamp",
-          "description": "End of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "Cloudflare colo airport code.",
+              "type": "string"
+            },
+            "device_id": {
+              "description": "Device-specific ID, given as UUID.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch.",
+              "type": "string"
+            },
+            "to": {
+              "description": "End of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "to",
+            "from"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "to",
-        "from"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo,
-        "digital-experience-monitoring_device_id": digital_experience_monitoring_device_id,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_fleet_status_over_time_response",
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_fleet_status_over_time_response": digital_experience_monitoring_fleet_status_over_time_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-aggregate_stat": digital_experience_monitoring_schemas_aggregate_stat_output,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp_output,
-        "digital-experience-monitoring_uniqueDevicesTotal": digital_experience_monitoring_uniqueDevicesTotal_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_fleet_status_over_time_response": digital$$experience$$monitoring_fleet_status_over_time_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_schemas-aggregate_stat": digital$$experience$$monitoring_schemas$$aggregate_stat,
       },
     },
     annotations: {
@@ -102,22 +105,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_fleet_status_over_time_response": digital_experience_monitoring_fleet_status_over_time_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-aggregate_stat": digital_experience_monitoring_schemas_aggregate_stat_output,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp_output,
-        "digital-experience-monitoring_uniqueDevicesTotal": digital_experience_monitoring_uniqueDevicesTotal_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_fleet_status_over_time_response": digital$$experience$$monitoring_fleet_status_over_time_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_schemas-aggregate_stat": digital$$experience$$monitoring_schemas$$aggregate_stat,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/fleet-status/over-time`,
       query: [
-        ["to", args["to"], true],
-        ["from", args["from"], true],
-        ["colo", args["colo"], true],
-        ["device_id", args["device_id"], true],
+        ["to", param(args, "query", "to"), true],
+        ["from", param(args, "query", "from"), true],
+        ["colo", param(args, "query", "colo"), true],
+        ["device_id", param(args, "query", "device_id"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/outputs.ts
index e26ce1027..b27cf9a95 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/devices/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `digital-experience-monitoring_cpu_pct_by_app` in responses.
  */
-export const digital_experience_monitoring_cpu_pct_by_app_output: JsonSchema = {
+export const digital$$experience$$monitoring_cpu_pct_by_app: JsonSchema = {
   "properties": {
     "cpu_pct": {
       "oneOf": [
@@ -35,7 +35,7 @@ export const digital_experience_monitoring_cpu_pct_by_app_output: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_device` in responses.
  */
-export const digital_experience_monitoring_device_output: JsonSchema = {
+export const digital$$experience$$monitoring_device: JsonSchema = {
   "properties": {
     "alwaysOn": {
       "oneOf": [
@@ -78,7 +78,7 @@ export const digital_experience_monitoring_device_output: JsonSchema = {
       ]
     },
     "colo": {
-      "$ref": "#/$defs/digital-experience-monitoring_colo"
+      "type": "string"
     },
     "connectionType": {
       "oneOf": [
@@ -270,7 +270,7 @@ export const digital_experience_monitoring_device_output: JsonSchema = {
       ]
     },
     "mode": {
-      "$ref": "#/$defs/digital-experience-monitoring_mode"
+      "type": "string"
     },
     "networkRcvdBps": {
       "oneOf": [
@@ -303,10 +303,10 @@ export const digital_experience_monitoring_device_output: JsonSchema = {
       ]
     },
     "personEmail": {
-      "$ref": "#/$defs/digital-experience-monitoring_personEmail"
+      "type": "string"
     },
     "platform": {
-      "$ref": "#/$defs/digital-experience-monitoring_platform"
+      "type": "string"
     },
     "ramAvailableKb": {
       "oneOf": [
@@ -362,7 +362,7 @@ export const digital_experience_monitoring_device_output: JsonSchema = {
       ]
     },
     "status": {
-      "$ref": "#/$defs/digital-experience-monitoring_status"
+      "type": "string"
     },
     "switchLocked": {
       "oneOf": [
@@ -375,7 +375,7 @@ export const digital_experience_monitoring_device_output: JsonSchema = {
       ]
     },
     "timestamp": {
-      "$ref": "#/$defs/digital-experience-monitoring_timestamp"
+      "type": "string"
     },
     "tunnelStats": {
       "oneOf": [
@@ -398,7 +398,7 @@ export const digital_experience_monitoring_device_output: JsonSchema = {
       ]
     },
     "version": {
-      "$ref": "#/$defs/digital-experience-monitoring_version"
+      "type": "string"
     },
     "wifiStrengthDbm": {
       "oneOf": [
@@ -426,7 +426,7 @@ export const digital_experience_monitoring_device_output: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_directional_stat` in responses.
  */
-export const digital_experience_monitoring_directional_stat_output: JsonSchema = {
+export const digital$$experience$$monitoring_directional_stat: JsonSchema = {
   "properties": {
     "downstream": {
       "oneOf": [
@@ -456,7 +456,7 @@ export const digital_experience_monitoring_directional_stat_output: JsonSchema =
  * The schema of `digital-experience-monitoring_fleet_status_devices_response`
  * in responses.
  */
-export const digital_experience_monitoring_fleet_status_devices_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_fleet_status_devices_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/digital-experience-monitoring_api-response-collection"
@@ -475,25 +475,11 @@ export const digital_experience_monitoring_fleet_status_devices_response_output:
   ]
 };
 
-/**
- * The schema of `digital-experience-monitoring_mode` in responses.
- */
-export const digital_experience_monitoring_mode_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_personEmail` in responses.
- */
-export const digital_experience_monitoring_personEmail_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `digital-experience-monitoring_ram_used_pct_by_app` in
  * responses.
  */
-export const digital_experience_monitoring_ram_used_pct_by_app_output: JsonSchema = {
+export const digital$$experience$$monitoring_ram_used_pct_by_app: JsonSchema = {
   "properties": {
     "name": {
       "oneOf": [
@@ -522,7 +508,7 @@ export const digital_experience_monitoring_ram_used_pct_by_app_output: JsonSchem
 /**
  * The schema of `digital-experience-monitoring_rtt_stats` in responses.
  */
-export const digital_experience_monitoring_rtt_stats_output: JsonSchema = {
+export const digital$$experience$$monitoring_rtt_stats: JsonSchema = {
   "properties": {
     "minRttUs": {
       "oneOf": [
@@ -561,7 +547,7 @@ export const digital_experience_monitoring_rtt_stats_output: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_schemas-ip_info` in responses.
  */
-export const digital_experience_monitoring_schemas_ip_info_output: JsonSchema = {
+export const digital$$experience$$monitoring_schemas$$ip_info: JsonSchema = {
   "properties": {
     "address": {
       "oneOf": [
@@ -668,7 +654,7 @@ export const digital_experience_monitoring_schemas_ip_info_output: JsonSchema =
 /**
  * The schema of `digital-experience-monitoring_tunnel_stats` in responses.
  */
-export const digital_experience_monitoring_tunnel_stats_output: JsonSchema = {
+export const digital$$experience$$monitoring_tunnel_stats: JsonSchema = {
   "properties": {
     "bytesLost": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/overTime/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/overTime/outputs.ts
index d08ac98ea..8897d4d3b 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/overTime/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/devices/overTime/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * The schema of `digital-experience-monitoring_device_state_over_time` in
  * responses.
  */
-export const digital_experience_monitoring_device_state_over_time_output: JsonSchema = {
+export const digital$$experience$$monitoring_device_state_over_time: JsonSchema = {
   "properties": {
     "battery_cycles": {
       "items": {
@@ -144,7 +144,7 @@ export const digital_experience_monitoring_device_state_over_time_output: JsonSc
  * `digital-experience-monitoring_device_state_top_networks_summary` in
  * responses.
  */
-export const digital_experience_monitoring_device_state_top_networks_summary_output: JsonSchema = {
+export const digital$$experience$$monitoring_device_state_top_networks_summary: JsonSchema = {
   "properties": {
     "count": {
       "type": "integer"
@@ -164,7 +164,7 @@ export const digital_experience_monitoring_device_state_top_networks_summary_out
  * The schema of `digital-experience-monitoring_device_status_over_time_result`
  * in responses.
  */
-export const digital_experience_monitoring_device_status_over_time_result_output: JsonSchema = {
+export const digital$$experience$$monitoring_device_status_over_time_result: JsonSchema = {
   "properties": {
     "over_time": {
       "$ref": "#/$defs/digital-experience-monitoring_device_state_over_time"
@@ -186,7 +186,7 @@ export const digital_experience_monitoring_device_status_over_time_result_output
 /**
  * The schema of `digital-experience-monitoring_timeslot_cpu_apps` in responses.
  */
-export const digital_experience_monitoring_timeslot_cpu_apps_output: JsonSchema = {
+export const digital$$experience$$monitoring_timeslot_cpu_apps: JsonSchema = {
   "properties": {
     "timestamp": {
       "type": "string"
@@ -208,7 +208,7 @@ export const digital_experience_monitoring_timeslot_cpu_apps_output: JsonSchema
 /**
  * The schema of `digital-experience-monitoring_timeslot_float` in responses.
  */
-export const digital_experience_monitoring_timeslot_float_output: JsonSchema = {
+export const digital$$experience$$monitoring_timeslot_float: JsonSchema = {
   "properties": {
     "timestamp": {
       "type": "string"
@@ -227,7 +227,7 @@ export const digital_experience_monitoring_timeslot_float_output: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_timeslot_int` in responses.
  */
-export const digital_experience_monitoring_timeslot_int_output: JsonSchema = {
+export const digital$$experience$$monitoring_timeslot_int: JsonSchema = {
   "properties": {
     "timestamp": {
       "type": "string"
@@ -246,7 +246,7 @@ export const digital_experience_monitoring_timeslot_int_output: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_timeslot_ram_apps` in responses.
  */
-export const digital_experience_monitoring_timeslot_ram_apps_output: JsonSchema = {
+export const digital$$experience$$monitoring_timeslot_ram_apps: JsonSchema = {
   "properties": {
     "timestamp": {
       "type": "string"
@@ -269,7 +269,7 @@ export const digital_experience_monitoring_timeslot_ram_apps_output: JsonSchema
  * The schema of `digital-experience-monitoring_timeslot_rtt_stats` in
  * responses.
  */
-export const digital_experience_monitoring_timeslot_rtt_stats_output: JsonSchema = {
+export const digital$$experience$$monitoring_timeslot_rtt_stats: JsonSchema = {
   "properties": {
     "timestamp": {
       "type": "string"
@@ -288,7 +288,7 @@ export const digital_experience_monitoring_timeslot_rtt_stats_output: JsonSchema
 /**
  * The schema of `digital-experience-monitoring_timeslot_string` in responses.
  */
-export const digital_experience_monitoring_timeslot_string_output: JsonSchema = {
+export const digital$$experience$$monitoring_timeslot_string: JsonSchema = {
   "properties": {
     "timestamp": {
       "type": "string"
@@ -308,7 +308,7 @@ export const digital_experience_monitoring_timeslot_string_output: JsonSchema =
  * The schema of `digital-experience-monitoring_timeslot_tunnel_stats` in
  * responses.
  */
-export const digital_experience_monitoring_timeslot_tunnel_stats_output: JsonSchema = {
+export const digital$$experience$$monitoring_timeslot_tunnel_stats: JsonSchema = {
   "properties": {
     "timestamp": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/overTime/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/overTime/tools.ts
index 14b69622c..a7d09631b 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/overTime/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/devices/overTime/tools.ts
@@ -1,91 +1,98 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../outputs.js";
 import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_colo,
-  digital_experience_monitoring_timestamp,
-} from "../../schemas.js";
-import {
-  digital_experience_monitoring_cpu_pct_by_app_output,
-  digital_experience_monitoring_directional_stat_output,
-  digital_experience_monitoring_ram_used_pct_by_app_output,
-  digital_experience_monitoring_rtt_stats_output,
-  digital_experience_monitoring_tunnel_stats_output,
+  digital$$experience$$monitoring_cpu_pct_by_app,
+  digital$$experience$$monitoring_directional_stat,
+  digital$$experience$$monitoring_ram_used_pct_by_app,
+  digital$$experience$$monitoring_rtt_stats,
+  digital$$experience$$monitoring_tunnel_stats,
 } from "../outputs.js";
-import { digital_experience_monitoring_device_id } from "../schemas.js";
 import {
-  digital_experience_monitoring_device_state_over_time_output,
-  digital_experience_monitoring_device_state_top_networks_summary_output,
-  digital_experience_monitoring_device_status_over_time_result_output,
-  digital_experience_monitoring_timeslot_cpu_apps_output,
-  digital_experience_monitoring_timeslot_float_output,
-  digital_experience_monitoring_timeslot_int_output,
-  digital_experience_monitoring_timeslot_ram_apps_output,
-  digital_experience_monitoring_timeslot_rtt_stats_output,
-  digital_experience_monitoring_timeslot_string_output,
-  digital_experience_monitoring_timeslot_tunnel_stats_output,
+  digital$$experience$$monitoring_device_state_over_time,
+  digital$$experience$$monitoring_device_state_top_networks_summary,
+  digital$$experience$$monitoring_device_status_over_time_result,
+  digital$$experience$$monitoring_timeslot_cpu_apps,
+  digital$$experience$$monitoring_timeslot_float,
+  digital$$experience$$monitoring_timeslot_int,
+  digital$$experience$$monitoring_timeslot_ram_apps,
+  digital$$experience$$monitoring_timeslot_rtt_stats,
+  digital$$experience$$monitoring_timeslot_string,
+  digital$$experience$$monitoring_timeslot_tunnel_stats,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.devices.over_time`.
+ * The tools of `zeroTrust.dex.devices.overTime`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_devices_over_time_get",
+    name: "zeroTrust_dex_devices_overTime_get",
     title: "Get the status over time for a device",
-    description: "Get time-bucketed status metrics for a specific device.",
+    description: "Get time-bucketed status metrics for a specific device.\n\nGET /accounts/{account_id}/dex/devices/{device_id}/fleet-status/over-time",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "$ref": "#/$defs/digital-experience-monitoring_colo",
-          "description": "List of data centers to filter results."
-        },
-        "device_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_device_id",
-          "description": "Device-specific ID, given as UUID."
-        },
-        "from": {
-          "$ref": "#/$defs/digital-experience-monitoring_timestamp",
-          "description": "Start of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch."
-        },
-        "interval": {
-          "description": "Time interval for aggregate time slots.",
-          "enum": [
-            "minute",
-            "hour"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "device_id": {
+              "description": "Device-specific ID, given as UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "device_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "to": {
-          "$ref": "#/$defs/digital-experience-monitoring_timestamp",
-          "description": "End of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "List of data centers to filter results.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch.",
+              "type": "string"
+            },
+            "interval": {
+              "description": "Time interval for aggregate time slots.",
+              "enum": [
+                "minute",
+                "hour"
+              ],
+              "type": "string"
+            },
+            "to": {
+              "description": "End of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "from",
+            "to",
+            "interval"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "device_id",
-        "from",
-        "to",
-        "interval"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo,
-        "digital-experience-monitoring_device_id": digital_experience_monitoring_device_id,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -102,23 +109,23 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_cpu_pct_by_app": digital_experience_monitoring_cpu_pct_by_app_output,
-        "digital-experience-monitoring_device_state_over_time": digital_experience_monitoring_device_state_over_time_output,
-        "digital-experience-monitoring_device_state_top_networks_summary": digital_experience_monitoring_device_state_top_networks_summary_output,
-        "digital-experience-monitoring_device_status_over_time_result": digital_experience_monitoring_device_status_over_time_result_output,
-        "digital-experience-monitoring_directional_stat": digital_experience_monitoring_directional_stat_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_ram_used_pct_by_app": digital_experience_monitoring_ram_used_pct_by_app_output,
-        "digital-experience-monitoring_rtt_stats": digital_experience_monitoring_rtt_stats_output,
-        "digital-experience-monitoring_timeslot_cpu_apps": digital_experience_monitoring_timeslot_cpu_apps_output,
-        "digital-experience-monitoring_timeslot_float": digital_experience_monitoring_timeslot_float_output,
-        "digital-experience-monitoring_timeslot_int": digital_experience_monitoring_timeslot_int_output,
-        "digital-experience-monitoring_timeslot_ram_apps": digital_experience_monitoring_timeslot_ram_apps_output,
-        "digital-experience-monitoring_timeslot_rtt_stats": digital_experience_monitoring_timeslot_rtt_stats_output,
-        "digital-experience-monitoring_timeslot_string": digital_experience_monitoring_timeslot_string_output,
-        "digital-experience-monitoring_timeslot_tunnel_stats": digital_experience_monitoring_timeslot_tunnel_stats_output,
-        "digital-experience-monitoring_tunnel_stats": digital_experience_monitoring_tunnel_stats_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_cpu_pct_by_app": digital$$experience$$monitoring_cpu_pct_by_app,
+        "digital-experience-monitoring_device_state_over_time": digital$$experience$$monitoring_device_state_over_time,
+        "digital-experience-monitoring_device_state_top_networks_summary": digital$$experience$$monitoring_device_state_top_networks_summary,
+        "digital-experience-monitoring_device_status_over_time_result": digital$$experience$$monitoring_device_status_over_time_result,
+        "digital-experience-monitoring_directional_stat": digital$$experience$$monitoring_directional_stat,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_ram_used_pct_by_app": digital$$experience$$monitoring_ram_used_pct_by_app,
+        "digital-experience-monitoring_rtt_stats": digital$$experience$$monitoring_rtt_stats,
+        "digital-experience-monitoring_timeslot_cpu_apps": digital$$experience$$monitoring_timeslot_cpu_apps,
+        "digital-experience-monitoring_timeslot_float": digital$$experience$$monitoring_timeslot_float,
+        "digital-experience-monitoring_timeslot_int": digital$$experience$$monitoring_timeslot_int,
+        "digital-experience-monitoring_timeslot_ram_apps": digital$$experience$$monitoring_timeslot_ram_apps,
+        "digital-experience-monitoring_timeslot_rtt_stats": digital$$experience$$monitoring_timeslot_rtt_stats,
+        "digital-experience-monitoring_timeslot_string": digital$$experience$$monitoring_timeslot_string,
+        "digital-experience-monitoring_timeslot_tunnel_stats": digital$$experience$$monitoring_timeslot_tunnel_stats,
+        "digital-experience-monitoring_tunnel_stats": digital$$experience$$monitoring_tunnel_stats,
       },
     },
     annotations: {
@@ -160,33 +167,33 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_cpu_pct_by_app": digital_experience_monitoring_cpu_pct_by_app_output,
-        "digital-experience-monitoring_device_state_over_time": digital_experience_monitoring_device_state_over_time_output,
-        "digital-experience-monitoring_device_state_top_networks_summary": digital_experience_monitoring_device_state_top_networks_summary_output,
-        "digital-experience-monitoring_device_status_over_time_result": digital_experience_monitoring_device_status_over_time_result_output,
-        "digital-experience-monitoring_directional_stat": digital_experience_monitoring_directional_stat_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_ram_used_pct_by_app": digital_experience_monitoring_ram_used_pct_by_app_output,
-        "digital-experience-monitoring_rtt_stats": digital_experience_monitoring_rtt_stats_output,
-        "digital-experience-monitoring_timeslot_cpu_apps": digital_experience_monitoring_timeslot_cpu_apps_output,
-        "digital-experience-monitoring_timeslot_float": digital_experience_monitoring_timeslot_float_output,
-        "digital-experience-monitoring_timeslot_int": digital_experience_monitoring_timeslot_int_output,
-        "digital-experience-monitoring_timeslot_ram_apps": digital_experience_monitoring_timeslot_ram_apps_output,
-        "digital-experience-monitoring_timeslot_rtt_stats": digital_experience_monitoring_timeslot_rtt_stats_output,
-        "digital-experience-monitoring_timeslot_string": digital_experience_monitoring_timeslot_string_output,
-        "digital-experience-monitoring_timeslot_tunnel_stats": digital_experience_monitoring_timeslot_tunnel_stats_output,
-        "digital-experience-monitoring_tunnel_stats": digital_experience_monitoring_tunnel_stats_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_cpu_pct_by_app": digital$$experience$$monitoring_cpu_pct_by_app,
+        "digital-experience-monitoring_device_state_over_time": digital$$experience$$monitoring_device_state_over_time,
+        "digital-experience-monitoring_device_state_top_networks_summary": digital$$experience$$monitoring_device_state_top_networks_summary,
+        "digital-experience-monitoring_device_status_over_time_result": digital$$experience$$monitoring_device_status_over_time_result,
+        "digital-experience-monitoring_directional_stat": digital$$experience$$monitoring_directional_stat,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_ram_used_pct_by_app": digital$$experience$$monitoring_ram_used_pct_by_app,
+        "digital-experience-monitoring_rtt_stats": digital$$experience$$monitoring_rtt_stats,
+        "digital-experience-monitoring_timeslot_cpu_apps": digital$$experience$$monitoring_timeslot_cpu_apps,
+        "digital-experience-monitoring_timeslot_float": digital$$experience$$monitoring_timeslot_float,
+        "digital-experience-monitoring_timeslot_int": digital$$experience$$monitoring_timeslot_int,
+        "digital-experience-monitoring_timeslot_ram_apps": digital$$experience$$monitoring_timeslot_ram_apps,
+        "digital-experience-monitoring_timeslot_rtt_stats": digital$$experience$$monitoring_timeslot_rtt_stats,
+        "digital-experience-monitoring_timeslot_string": digital$$experience$$monitoring_timeslot_string,
+        "digital-experience-monitoring_timeslot_tunnel_stats": digital$$experience$$monitoring_timeslot_tunnel_stats,
+        "digital-experience-monitoring_tunnel_stats": digital$$experience$$monitoring_tunnel_stats,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/devices/${pathParam(args, "device_id")}/fleet-status/over-time`,
       query: [
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["interval", args["interval"], true],
-        ["colo", args["colo"], true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["interval", param(args, "query", "interval"), true],
+        ["colo", param(args, "query", "colo"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/schemas.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/schemas.ts
deleted file mode 100644
index b9b2a06ad..000000000
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/schemas.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `digital-experience-monitoring_device_id`.
- */
-export const digital_experience_monitoring_device_id: JsonSchema = {
-  "description": "Unique identifier for the physical device (UUID).",
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_mode`.
- */
-export const digital_experience_monitoring_mode: JsonSchema = {
-  "description": "The mode under which the WARP client is run.",
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_page`.
- */
-export const digital_experience_monitoring_page: JsonSchema = {
-  "description": "Page number of paginated results.",
-  "type": "number"
-};
-
-/**
- * The schema of `digital-experience-monitoring_per_page`.
- */
-export const digital_experience_monitoring_per_page: JsonSchema = {
-  "description": "Number of results per page.",
-  "type": "number"
-};
-
-/**
- * The schema of `digital-experience-monitoring_since_minutes`.
- */
-export const digital_experience_monitoring_since_minutes: JsonSchema = {
-  "description": "Number of minutes before current time.",
-  "type": "number"
-};
-
-/**
- * The schema of `digital-experience-monitoring_sort_by`.
- */
-export const digital_experience_monitoring_sort_by: JsonSchema = {
-  "description": "Dimension to sort results by.",
-  "enum": [
-    "colo",
-    "device_id",
-    "mode",
-    "platform",
-    "status",
-    "timestamp",
-    "version"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_source`.
- */
-export const digital_experience_monitoring_source: JsonSchema = {
-  "description": "Specifies fleet status details source.",
-  "enum": [
-    "last_seen",
-    "hourly",
-    "raw"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_time_now`.
- */
-export const digital_experience_monitoring_time_now: JsonSchema = {
-  "description": "Current time. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dex/devices/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/devices/tools.ts
index 7fdf94b13..0f7fdf4cd 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/devices/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/devices/tools.ts
@@ -1,113 +1,93 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_collection_output,
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_colo_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_platform_output,
-  digital_experience_monitoring_status_output,
-  digital_experience_monitoring_timestamp_output,
-  digital_experience_monitoring_version_output,
+  digital$$experience$$monitoring_api$$response$$collection,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_messages,
 } from "../outputs.js";
 import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_colo,
-  digital_experience_monitoring_platform,
-  digital_experience_monitoring_status,
-  digital_experience_monitoring_timestamp,
-  digital_experience_monitoring_version,
-} from "../schemas.js";
-import {
-  digital_experience_monitoring_cpu_pct_by_app_output,
-  digital_experience_monitoring_device_output,
-  digital_experience_monitoring_directional_stat_output,
-  digital_experience_monitoring_fleet_status_devices_response_output,
-  digital_experience_monitoring_mode_output,
-  digital_experience_monitoring_personEmail_output,
-  digital_experience_monitoring_ram_used_pct_by_app_output,
-  digital_experience_monitoring_rtt_stats_output,
-  digital_experience_monitoring_schemas_ip_info_output,
-  digital_experience_monitoring_tunnel_stats_output,
+  digital$$experience$$monitoring_cpu_pct_by_app,
+  digital$$experience$$monitoring_device,
+  digital$$experience$$monitoring_directional_stat,
+  digital$$experience$$monitoring_fleet_status_devices_response,
+  digital$$experience$$monitoring_ram_used_pct_by_app,
+  digital$$experience$$monitoring_rtt_stats,
+  digital$$experience$$monitoring_schemas$$ip_info,
+  digital$$experience$$monitoring_tunnel_stats,
 } from "./outputs.js";
-import {
-  digital_experience_monitoring_device_id,
-  digital_experience_monitoring_mode,
-  digital_experience_monitoring_page,
-  digital_experience_monitoring_per_page,
-  digital_experience_monitoring_since_minutes,
-  digital_experience_monitoring_sort_by,
-  digital_experience_monitoring_source,
-  digital_experience_monitoring_time_now,
-} from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dex.devices`.
+ * The tools of `zeroTrust.dex.devices`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_devices_get",
+    name: "zeroTrust_dex_devices_get",
     title: "Get the latest status of a device.",
-    description: "Get the latest status of a device given device_id from the device_state table.",
+    description: "Get the latest status of a device given device_id from the device_state table.\n\nGET /accounts/{account_id}/dex/devices/{device_id}/fleet-status/live",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "$ref": "#/$defs/digital-experience-monitoring_colo",
-          "description": "List of data centers to filter results."
-        },
-        "device_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_device_id",
-          "description": "Device-specific ID, given as UUID."
-        },
-        "since_minutes": {
-          "$ref": "#/$defs/digital-experience-monitoring_since_minutes",
-          "default": 10,
-          "description": "Number of minutes before current time."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "device_id": {
+              "description": "Device-specific ID, given as UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "device_id"
+          ],
+          "type": "object"
         },
-        "time_now": {
-          "$ref": "#/$defs/digital-experience-monitoring_time_now",
-          "deprecated": true,
-          "description": "Current time in ISO format."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "List of data centers to filter results.",
+              "type": "string"
+            },
+            "since_minutes": {
+              "default": 10,
+              "description": "Number of minutes before current time.",
+              "type": "number"
+            },
+            "time_now": {
+              "deprecated": true,
+              "description": "Current time in ISO format.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "since_minutes"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "device_id",
-        "since_minutes"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo,
-        "digital-experience-monitoring_device_id": digital_experience_monitoring_device_id,
-        "digital-experience-monitoring_since_minutes": digital_experience_monitoring_since_minutes,
-        "digital-experience-monitoring_time_now": digital_experience_monitoring_time_now,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_device",
       $defs: {
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo_output,
-        "digital-experience-monitoring_cpu_pct_by_app": digital_experience_monitoring_cpu_pct_by_app_output,
-        "digital-experience-monitoring_device": digital_experience_monitoring_device_output,
-        "digital-experience-monitoring_directional_stat": digital_experience_monitoring_directional_stat_output,
-        "digital-experience-monitoring_mode": digital_experience_monitoring_mode_output,
-        "digital-experience-monitoring_personEmail": digital_experience_monitoring_personEmail_output,
-        "digital-experience-monitoring_platform": digital_experience_monitoring_platform_output,
-        "digital-experience-monitoring_ram_used_pct_by_app": digital_experience_monitoring_ram_used_pct_by_app_output,
-        "digital-experience-monitoring_rtt_stats": digital_experience_monitoring_rtt_stats_output,
-        "digital-experience-monitoring_schemas-ip_info": digital_experience_monitoring_schemas_ip_info_output,
-        "digital-experience-monitoring_status": digital_experience_monitoring_status_output,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp_output,
-        "digital-experience-monitoring_tunnel_stats": digital_experience_monitoring_tunnel_stats_output,
-        "digital-experience-monitoring_version": digital_experience_monitoring_version_output,
+        "digital-experience-monitoring_cpu_pct_by_app": digital$$experience$$monitoring_cpu_pct_by_app,
+        "digital-experience-monitoring_device": digital$$experience$$monitoring_device,
+        "digital-experience-monitoring_directional_stat": digital$$experience$$monitoring_directional_stat,
+        "digital-experience-monitoring_ram_used_pct_by_app": digital$$experience$$monitoring_ram_used_pct_by_app,
+        "digital-experience-monitoring_rtt_stats": digital$$experience$$monitoring_rtt_stats,
+        "digital-experience-monitoring_schemas-ip_info": digital$$experience$$monitoring_schemas$$ip_info,
+        "digital-experience-monitoring_tunnel_stats": digital$$experience$$monitoring_tunnel_stats,
       },
     },
     annotations: {
@@ -137,139 +117,144 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo_output,
-        "digital-experience-monitoring_cpu_pct_by_app": digital_experience_monitoring_cpu_pct_by_app_output,
-        "digital-experience-monitoring_device": digital_experience_monitoring_device_output,
-        "digital-experience-monitoring_directional_stat": digital_experience_monitoring_directional_stat_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_mode": digital_experience_monitoring_mode_output,
-        "digital-experience-monitoring_personEmail": digital_experience_monitoring_personEmail_output,
-        "digital-experience-monitoring_platform": digital_experience_monitoring_platform_output,
-        "digital-experience-monitoring_ram_used_pct_by_app": digital_experience_monitoring_ram_used_pct_by_app_output,
-        "digital-experience-monitoring_rtt_stats": digital_experience_monitoring_rtt_stats_output,
-        "digital-experience-monitoring_schemas-ip_info": digital_experience_monitoring_schemas_ip_info_output,
-        "digital-experience-monitoring_status": digital_experience_monitoring_status_output,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp_output,
-        "digital-experience-monitoring_tunnel_stats": digital_experience_monitoring_tunnel_stats_output,
-        "digital-experience-monitoring_version": digital_experience_monitoring_version_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_cpu_pct_by_app": digital$$experience$$monitoring_cpu_pct_by_app,
+        "digital-experience-monitoring_device": digital$$experience$$monitoring_device,
+        "digital-experience-monitoring_directional_stat": digital$$experience$$monitoring_directional_stat,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_ram_used_pct_by_app": digital$$experience$$monitoring_ram_used_pct_by_app,
+        "digital-experience-monitoring_rtt_stats": digital$$experience$$monitoring_rtt_stats,
+        "digital-experience-monitoring_schemas-ip_info": digital$$experience$$monitoring_schemas$$ip_info,
+        "digital-experience-monitoring_tunnel_stats": digital$$experience$$monitoring_tunnel_stats,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/devices/${pathParam(args, "device_id")}/fleet-status/live`,
       query: [
-        ["since_minutes", args["since_minutes"], true],
-        ["time_now", args["time_now"], true],
-        ["colo", args["colo"], true],
+        ["since_minutes", param(args, "query", "since_minutes"), true],
+        ["time_now", param(args, "query", "time_now"), true],
+        ["colo", param(args, "query", "colo"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_dex_devices_list",
+    name: "zeroTrust_dex_devices_list",
     title: "List details of devices using WARP.",
-    description: "List details of devices using WARP.",
+    description: "List details of devices using WARP.\n\nGET /accounts/{account_id}/dex/fleet-status/devices",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "$ref": "#/$defs/digital-experience-monitoring_colo",
-          "description": "Cloudflare colo airport code."
-        },
-        "device_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_device_id",
-          "description": "Device-specific ID, given as UUID."
-        },
-        "device_mode": {
-          "$ref": "#/$defs/digital-experience-monitoring_mode",
-          "description": "The mode under which the WARP client is run."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "from": {
-          "$ref": "#/$defs/digital-experience-monitoring_timestamp",
-          "description": "Start of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch."
-        },
-        "page": {
-          "$ref": "#/$defs/digital-experience-monitoring_page",
-          "default": 1,
-          "description": "Page number of paginated results."
-        },
-        "per_page": {
-          "$ref": "#/$defs/digital-experience-monitoring_per_page",
-          "description": "Number of results per page."
-        },
-        "platform": {
-          "$ref": "#/$defs/digital-experience-monitoring_platform",
-          "description": "Operating system."
-        },
-        "sort_by": {
-          "$ref": "#/$defs/digital-experience-monitoring_sort_by",
-          "default": "timestamp",
-          "description": "Dimension to sort results by."
-        },
-        "source": {
-          "$ref": "#/$defs/digital-experience-monitoring_source",
-          "default": "last_seen",
-          "description": "Source:\n  * `hourly` - device details aggregated hourly, up to 7 days prior\n  * `last_seen` - device details, up to 60 minutes prior. Time windows exceeding 60 minutes will be rejected from June 1st, 2026. Please use 'hourly' or 'raw' instead for longer time ranges.\n  * `raw` - device details, up to 7 days prior\n"
-        },
-        "status": {
-          "$ref": "#/$defs/digital-experience-monitoring_status",
-          "description": "Network status."
-        },
-        "to": {
-          "$ref": "#/$defs/digital-experience-monitoring_timestamp",
-          "description": "End of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch."
-        },
-        "warp_version": {
-          "$ref": "#/$defs/digital-experience-monitoring_version",
-          "description": "WARP client version."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "Cloudflare colo airport code.",
+              "type": "string"
+            },
+            "device_id": {
+              "description": "Device-specific ID, given as UUID.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch.",
+              "type": "string"
+            },
+            "mode": {
+              "description": "The mode under which the WARP client is run.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "number"
+            },
+            "platform": {
+              "description": "Operating system.",
+              "type": "string"
+            },
+            "sort_by": {
+              "default": "timestamp",
+              "description": "Dimension to sort results by.",
+              "enum": [
+                "colo",
+                "device_id",
+                "mode",
+                "platform",
+                "status",
+                "timestamp",
+                "version"
+              ],
+              "type": "string"
+            },
+            "source": {
+              "default": "last_seen",
+              "description": "Source:\n  * `hourly` - device details aggregated hourly, up to 7 days prior\n  * `last_seen` - device details, up to 60 minutes prior. Time windows exceeding 60 minutes will be rejected from June 1st, 2026. Please use 'hourly' or 'raw' instead for longer time ranges.\n  * `raw` - device details, up to 7 days prior",
+              "enum": [
+                "last_seen",
+                "hourly",
+                "raw"
+              ],
+              "type": "string"
+            },
+            "status": {
+              "description": "Network status.",
+              "type": "string"
+            },
+            "to": {
+              "description": "End of the time range to query. Timestamp can be provided in ISO 8601 datetime format or milliseconds since epoch.",
+              "type": "string"
+            },
+            "version": {
+              "description": "WARP client version.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "to",
+            "from",
+            "page",
+            "per_page"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "to",
-        "from",
-        "page",
-        "per_page"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo,
-        "digital-experience-monitoring_device_id": digital_experience_monitoring_device_id,
-        "digital-experience-monitoring_mode": digital_experience_monitoring_mode,
-        "digital-experience-monitoring_page": digital_experience_monitoring_page,
-        "digital-experience-monitoring_per_page": digital_experience_monitoring_per_page,
-        "digital-experience-monitoring_platform": digital_experience_monitoring_platform,
-        "digital-experience-monitoring_sort_by": digital_experience_monitoring_sort_by,
-        "digital-experience-monitoring_source": digital_experience_monitoring_source,
-        "digital-experience-monitoring_status": digital_experience_monitoring_status,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp,
-        "digital-experience-monitoring_version": digital_experience_monitoring_version,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_fleet_status_devices_response",
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo_output,
-        "digital-experience-monitoring_cpu_pct_by_app": digital_experience_monitoring_cpu_pct_by_app_output,
-        "digital-experience-monitoring_device": digital_experience_monitoring_device_output,
-        "digital-experience-monitoring_directional_stat": digital_experience_monitoring_directional_stat_output,
-        "digital-experience-monitoring_fleet_status_devices_response": digital_experience_monitoring_fleet_status_devices_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_mode": digital_experience_monitoring_mode_output,
-        "digital-experience-monitoring_personEmail": digital_experience_monitoring_personEmail_output,
-        "digital-experience-monitoring_platform": digital_experience_monitoring_platform_output,
-        "digital-experience-monitoring_ram_used_pct_by_app": digital_experience_monitoring_ram_used_pct_by_app_output,
-        "digital-experience-monitoring_rtt_stats": digital_experience_monitoring_rtt_stats_output,
-        "digital-experience-monitoring_schemas-ip_info": digital_experience_monitoring_schemas_ip_info_output,
-        "digital-experience-monitoring_status": digital_experience_monitoring_status_output,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp_output,
-        "digital-experience-monitoring_tunnel_stats": digital_experience_monitoring_tunnel_stats_output,
-        "digital-experience-monitoring_version": digital_experience_monitoring_version_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_cpu_pct_by_app": digital$$experience$$monitoring_cpu_pct_by_app,
+        "digital-experience-monitoring_device": digital$$experience$$monitoring_device,
+        "digital-experience-monitoring_directional_stat": digital$$experience$$monitoring_directional_stat,
+        "digital-experience-monitoring_fleet_status_devices_response": digital$$experience$$monitoring_fleet_status_devices_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_ram_used_pct_by_app": digital$$experience$$monitoring_ram_used_pct_by_app,
+        "digital-experience-monitoring_rtt_stats": digital$$experience$$monitoring_rtt_stats,
+        "digital-experience-monitoring_schemas-ip_info": digital$$experience$$monitoring_schemas$$ip_info,
+        "digital-experience-monitoring_tunnel_stats": digital$$experience$$monitoring_tunnel_stats,
       },
     },
     annotations: {
@@ -299,42 +284,35 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo_output,
-        "digital-experience-monitoring_cpu_pct_by_app": digital_experience_monitoring_cpu_pct_by_app_output,
-        "digital-experience-monitoring_device": digital_experience_monitoring_device_output,
-        "digital-experience-monitoring_directional_stat": digital_experience_monitoring_directional_stat_output,
-        "digital-experience-monitoring_fleet_status_devices_response": digital_experience_monitoring_fleet_status_devices_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_mode": digital_experience_monitoring_mode_output,
-        "digital-experience-monitoring_personEmail": digital_experience_monitoring_personEmail_output,
-        "digital-experience-monitoring_platform": digital_experience_monitoring_platform_output,
-        "digital-experience-monitoring_ram_used_pct_by_app": digital_experience_monitoring_ram_used_pct_by_app_output,
-        "digital-experience-monitoring_rtt_stats": digital_experience_monitoring_rtt_stats_output,
-        "digital-experience-monitoring_schemas-ip_info": digital_experience_monitoring_schemas_ip_info_output,
-        "digital-experience-monitoring_status": digital_experience_monitoring_status_output,
-        "digital-experience-monitoring_timestamp": digital_experience_monitoring_timestamp_output,
-        "digital-experience-monitoring_tunnel_stats": digital_experience_monitoring_tunnel_stats_output,
-        "digital-experience-monitoring_version": digital_experience_monitoring_version_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_cpu_pct_by_app": digital$$experience$$monitoring_cpu_pct_by_app,
+        "digital-experience-monitoring_device": digital$$experience$$monitoring_device,
+        "digital-experience-monitoring_directional_stat": digital$$experience$$monitoring_directional_stat,
+        "digital-experience-monitoring_fleet_status_devices_response": digital$$experience$$monitoring_fleet_status_devices_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_ram_used_pct_by_app": digital$$experience$$monitoring_ram_used_pct_by_app,
+        "digital-experience-monitoring_rtt_stats": digital$$experience$$monitoring_rtt_stats,
+        "digital-experience-monitoring_schemas-ip_info": digital$$experience$$monitoring_schemas$$ip_info,
+        "digital-experience-monitoring_tunnel_stats": digital$$experience$$monitoring_tunnel_stats,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/fleet-status/devices`,
       query: [
-        ["to", args["to"], true],
-        ["from", args["from"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["sort_by", args["sort_by"], true],
-        ["colo", args["colo"], true],
-        ["device_id", args["device_id"], true],
-        ["mode", args["device_mode"], true],
-        ["status", args["status"], true],
-        ["platform", args["platform"], true],
-        ["version", args["warp_version"], true],
-        ["source", args["source"], true],
+        ["to", param(args, "query", "to"), true],
+        ["from", param(args, "query", "from"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
+        ["colo", param(args, "query", "colo"), true],
+        ["device_id", param(args, "query", "device_id"), true],
+        ["mode", param(args, "query", "mode"), true],
+        ["status", param(args, "query", "status"), true],
+        ["platform", param(args, "query", "platform"), true],
+        ["version", param(args, "query", "version"), true],
+        ["source", param(args, "query", "source"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/isps/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/isps/outputs.ts
index 23b53d662..9546e6bd1 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/isps/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/isps/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `digital-experience-monitoring_device_isp` in responses.
  */
-export const digital_experience_monitoring_device_isp_output: JsonSchema = {
+export const digital$$experience$$monitoring_device_isp: JsonSchema = {
   "properties": {
     "ip": {
       "$ref": "#/$defs/digital-experience-monitoring_ip_info"
@@ -34,7 +34,7 @@ export const digital_experience_monitoring_device_isp_output: JsonSchema = {
  * The schema of `digital-experience-monitoring_device_isps_response` in
  * responses.
  */
-export const digital_experience_monitoring_device_isps_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_device_isps_response: JsonSchema = {
   "properties": {
     "isps": {
       "items": {
@@ -52,7 +52,7 @@ export const digital_experience_monitoring_device_isps_response_output: JsonSche
 /**
  * The schema of `digital-experience-monitoring_ip_info` in responses.
  */
-export const digital_experience_monitoring_ip_info_output: JsonSchema = {
+export const digital$$experience$$monitoring_ip_info: JsonSchema = {
   "properties": {
     "address": {
       "type": "string"
@@ -82,7 +82,7 @@ export const digital_experience_monitoring_ip_info_output: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_ip_location` in responses.
  */
-export const digital_experience_monitoring_ip_location_output: JsonSchema = {
+export const digital$$experience$$monitoring_ip_location: JsonSchema = {
   "properties": {
     "city": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/isps/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/isps/tools.ts
index a75aff614..d86332a51 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/isps/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/isps/tools.ts
@@ -1,93 +1,104 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_collection_output,
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$collection,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_messages,
 } from "../outputs.js";
 import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_uuid,
-} from "../schemas.js";
-import {
-  digital_experience_monitoring_device_isp_output,
-  digital_experience_monitoring_device_isps_response_output,
-  digital_experience_monitoring_ip_info_output,
-  digital_experience_monitoring_ip_location_output,
+  digital$$experience$$monitoring_device_isp,
+  digital$$experience$$monitoring_device_isps_response,
+  digital$$experience$$monitoring_ip_info,
+  digital$$experience$$monitoring_ip_location,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.isps`.
+ * The tools of `zeroTrust.dex.isps`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_isps_list",
+    name: "zeroTrust_dex_isps_list",
     title: "List device ISPs",
-    description: "List ISP information observed for a specific device during traceroute tests.",
+    description: "List ISP information observed for a specific device during traceroute tests.\n\nGET /accounts/{account_id}/dex/devices/{device_id}/isps",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "cursor": {
-          "description": "Cursor for cursor-based pagination. Mutually exclusive with page.",
-          "type": "string"
-        },
-        "device_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Device-specific ID, given as UUID."
-        },
-        "from": {
-          "description": "Start time for the query in ISO 8601 format.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results. Mutually exclusive with cursor.",
-          "type": "integer"
-        },
-        "per_page": {
-          "description": "Number of items per page",
-          "type": "integer"
-        },
-        "sort_by": {
-          "default": "time_start",
-          "description": "The field to sort results by.",
-          "enum": [
-            "time_start"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "device_id": {
+              "description": "Device-specific ID, given as UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "device_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "sort_order": {
-          "default": "DESC",
-          "description": "The order to sort results.",
-          "enum": [
-            "ASC",
-            "DESC"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cursor": {
+              "description": "Cursor for cursor-based pagination. Mutually exclusive with page.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start time for the query in ISO 8601 format.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results. Mutually exclusive with cursor.",
+              "type": "integer"
+            },
+            "per_page": {
+              "description": "Number of items per page",
+              "type": "integer"
+            },
+            "sort_by": {
+              "default": "time_start",
+              "description": "The field to sort results by.",
+              "enum": [
+                "time_start"
+              ],
+              "type": "string"
+            },
+            "sort_order": {
+              "default": "DESC",
+              "description": "The order to sort results.",
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for the query in ISO 8601 format.",
+              "format": "date-time",
+              "type": "string"
+            }
+          },
+          "required": [
+            "per_page"
           ],
-          "type": "string"
-        },
-        "to": {
-          "description": "End time for the query in ISO 8601 format.",
-          "format": "date-time",
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "device_id",
-        "per_page"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -104,13 +115,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_device_isp": digital_experience_monitoring_device_isp_output,
-        "digital-experience-monitoring_device_isps_response": digital_experience_monitoring_device_isps_response_output,
-        "digital-experience-monitoring_ip_info": digital_experience_monitoring_ip_info_output,
-        "digital-experience-monitoring_ip_location": digital_experience_monitoring_ip_location_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_device_isp": digital$$experience$$monitoring_device_isp,
+        "digital-experience-monitoring_device_isps_response": digital$$experience$$monitoring_device_isps_response,
+        "digital-experience-monitoring_ip_info": digital$$experience$$monitoring_ip_info,
+        "digital-experience-monitoring_ip_location": digital$$experience$$monitoring_ip_location,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -152,26 +163,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_device_isp": digital_experience_monitoring_device_isp_output,
-        "digital-experience-monitoring_device_isps_response": digital_experience_monitoring_device_isps_response_output,
-        "digital-experience-monitoring_ip_info": digital_experience_monitoring_ip_info_output,
-        "digital-experience-monitoring_ip_location": digital_experience_monitoring_ip_location_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_device_isp": digital$$experience$$monitoring_device_isp,
+        "digital-experience-monitoring_device_isps_response": digital$$experience$$monitoring_device_isps_response,
+        "digital-experience-monitoring_ip_info": digital$$experience$$monitoring_ip_info,
+        "digital-experience-monitoring_ip_location": digital$$experience$$monitoring_ip_location,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/devices/${pathParam(args, "device_id")}/isps`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["cursor", args["cursor"], true],
-        ["sort_by", args["sort_by"], true],
-        ["sort_order", args["sort_order"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["cursor", param(args, "query", "cursor"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/outputs.ts
index 92c7361d8..3569a1375 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `digital-experience-monitoring_api-response-collection` in
  * responses.
  */
-export const digital_experience_monitoring_api_response_collection_output: JsonSchema = {
+export const digital$$experience$$monitoring_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/digital-experience-monitoring_api-response-common"
@@ -44,7 +44,7 @@ export const digital_experience_monitoring_api_response_collection_output: JsonS
  * The schema of `digital-experience-monitoring_api-response-common` in
  * responses.
  */
-export const digital_experience_monitoring_api_response_common_output: JsonSchema = {
+export const digital$$experience$$monitoring_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/digital-experience-monitoring_messages"
@@ -71,7 +71,7 @@ export const digital_experience_monitoring_api_response_common_output: JsonSchem
  * The schema of `digital-experience-monitoring_api-response-common-failure` in
  * responses.
  */
-export const digital_experience_monitoring_api_response_common_failure_output: JsonSchema = {
+export const digital$$experience$$monitoring_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/digital-experience-monitoring_messages"
@@ -102,7 +102,7 @@ export const digital_experience_monitoring_api_response_common_failure_output: J
  * The schema of `digital-experience-monitoring_api-response-single` in
  * responses.
  */
-export const digital_experience_monitoring_api_response_single_output: JsonSchema = {
+export const digital$$experience$$monitoring_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/digital-experience-monitoring_messages"
@@ -125,18 +125,11 @@ export const digital_experience_monitoring_api_response_single_output: JsonSchem
   "type": "object"
 };
 
-/**
- * The schema of `digital-experience-monitoring_colo` in responses.
- */
-export const digital_experience_monitoring_colo_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `digital-experience-monitoring_device-dex-test-schemas-data` in
  * responses.
  */
-export const digital_experience_monitoring_device_dex_test_schemas_data_output: JsonSchema = {
+export const digital$$experience$$monitoring_device$$dex$$test$$schemas$$data: JsonSchema = {
   "properties": {
     "host": {
       "type": "string"
@@ -165,7 +158,7 @@ export const digital_experience_monitoring_device_dex_test_schemas_data_output:
 /**
  * The schema of `digital-experience-monitoring_messages` in responses.
  */
-export const digital_experience_monitoring_messages_output: JsonSchema = {
+export const digital$$experience$$monitoring_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -194,38 +187,3 @@ export const digital_experience_monitoring_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `digital-experience-monitoring_platform` in responses.
- */
-export const digital_experience_monitoring_platform_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_status` in responses.
- */
-export const digital_experience_monitoring_status_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_timestamp` in responses.
- */
-export const digital_experience_monitoring_timestamp_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_uuid` in responses.
- */
-export const digital_experience_monitoring_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_version` in responses.
- */
-export const digital_experience_monitoring_version_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dex/overview/tests/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/overview/tests/outputs.ts
index 1fc18398d..a1a534879 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/overview/tests/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/overview/tests/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `digital-experience-monitoring_aggregate_stat` in responses.
  */
-export const digital_experience_monitoring_aggregate_stat_output: JsonSchema = {
+export const digital$$experience$$monitoring_aggregate_stat: JsonSchema = {
   "properties": {
     "avgMs": {
       "oneOf": [
@@ -42,7 +42,7 @@ export const digital_experience_monitoring_aggregate_stat_output: JsonSchema = {
  * The schema of `digital-experience-monitoring_aggregate_time_period` in
  * responses.
  */
-export const digital_experience_monitoring_aggregate_time_period_output: JsonSchema = {
+export const digital$$experience$$monitoring_aggregate_time_period: JsonSchema = {
   "properties": {
     "units": {
       "enum": [
@@ -67,7 +67,7 @@ export const digital_experience_monitoring_aggregate_time_period_output: JsonSch
  * The schema of `digital-experience-monitoring_aggregate_time_slot` in
  * responses.
  */
-export const digital_experience_monitoring_aggregate_time_slot_output: JsonSchema = {
+export const digital$$experience$$monitoring_aggregate_time_slot: JsonSchema = {
   "properties": {
     "avgMs": {
       "type": "integer"
@@ -86,7 +86,7 @@ export const digital_experience_monitoring_aggregate_time_slot_output: JsonSchem
 /**
  * The schema of `digital-experience-monitoring_tests_response` in responses.
  */
-export const digital_experience_monitoring_tests_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_tests_response: JsonSchema = {
   "properties": {
     "overviewMetrics": {
       "properties": {
@@ -171,7 +171,7 @@ export const digital_experience_monitoring_tests_response_output: JsonSchema = {
             "type": "array"
           },
           "id": {
-            "$ref": "#/$defs/digital-experience-monitoring_uuid"
+            "type": "string"
           },
           "interval": {
             "type": "string"
@@ -198,7 +198,7 @@ export const digital_experience_monitoring_tests_response_output: JsonSchema = {
                       "type": "boolean"
                     },
                     "id": {
-                      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+                      "type": "string"
                     },
                     "name": {
                       "type": "string"
@@ -287,7 +287,7 @@ export const digital_experience_monitoring_tests_response_output: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_timing_aggregates` in responses.
  */
-export const digital_experience_monitoring_timing_aggregates_output: JsonSchema = {
+export const digital$$experience$$monitoring_timing_aggregates: JsonSchema = {
   "properties": {
     "avgMs": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/dex/overview/tests/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/overview/tests/tools.ts
index 0072e1b67..c9a934e39 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/overview/tests/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/overview/tests/tools.ts
@@ -1,81 +1,92 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_uuid_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../../schemas.js";
 import {
-  digital_experience_monitoring_aggregate_stat_output,
-  digital_experience_monitoring_aggregate_time_period_output,
-  digital_experience_monitoring_aggregate_time_slot_output,
-  digital_experience_monitoring_tests_response_output,
-  digital_experience_monitoring_timing_aggregates_output,
+  digital$$experience$$monitoring_aggregate_stat,
+  digital$$experience$$monitoring_aggregate_time_period,
+  digital$$experience$$monitoring_aggregate_time_slot,
+  digital$$experience$$monitoring_tests_response,
+  digital$$experience$$monitoring_timing_aggregates,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.overview.tests`.
+ * The tools of `zeroTrust.dex.overview.tests`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_overview_tests_list",
+    name: "zeroTrust_dex_overview_tests_list",
     title: "List DEX test analytics",
-    description: "List DEX tests with overview metrics.",
+    description: "List DEX tests with overview metrics.\n\nGET /accounts/{account_id}/dex/tests/overview",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
-          "type": "string"
-        },
-        "device_id": {
-          "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "kind": {
-          "description": "Filter by test type.",
-          "enum": [
-            "http",
-            "traceroute"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 10,
-          "description": "Number of items per page",
-          "type": "number"
-        },
-        "registration_id": {
-          "description": "Optionally filter results to a specific device registration. Must be used in combination with a single deviceId.",
-          "type": "string"
+          "type": "object"
         },
-        "test_name": {
-          "description": "Optionally filter results by test name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
+              "type": "string"
+            },
+            "deviceId": {
+              "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "kind": {
+              "description": "Filter by test type.",
+              "enum": [
+                "http",
+                "traceroute"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 10,
+              "description": "Number of items per page",
+              "type": "number"
+            },
+            "registration_id": {
+              "description": "Optionally filter results to a specific device registration. Must be used in combination with a single deviceId.",
+              "type": "string"
+            },
+            "testName": {
+              "description": "Optionally filter results by test name.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -92,14 +103,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_aggregate_stat": digital_experience_monitoring_aggregate_stat_output,
-        "digital-experience-monitoring_aggregate_time_period": digital_experience_monitoring_aggregate_time_period_output,
-        "digital-experience-monitoring_aggregate_time_slot": digital_experience_monitoring_aggregate_time_slot_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_tests_response": digital_experience_monitoring_tests_response_output,
-        "digital-experience-monitoring_timing_aggregates": digital_experience_monitoring_timing_aggregates_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_aggregate_stat": digital$$experience$$monitoring_aggregate_stat,
+        "digital-experience-monitoring_aggregate_time_period": digital$$experience$$monitoring_aggregate_time_period,
+        "digital-experience-monitoring_aggregate_time_slot": digital$$experience$$monitoring_aggregate_time_slot,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_tests_response": digital$$experience$$monitoring_tests_response,
+        "digital-experience-monitoring_timing_aggregates": digital$$experience$$monitoring_timing_aggregates,
       },
     },
     annotations: {
@@ -141,27 +151,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_aggregate_stat": digital_experience_monitoring_aggregate_stat_output,
-        "digital-experience-monitoring_aggregate_time_period": digital_experience_monitoring_aggregate_time_period_output,
-        "digital-experience-monitoring_aggregate_time_slot": digital_experience_monitoring_aggregate_time_slot_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_tests_response": digital_experience_monitoring_tests_response_output,
-        "digital-experience-monitoring_timing_aggregates": digital_experience_monitoring_timing_aggregates_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_aggregate_stat": digital$$experience$$monitoring_aggregate_stat,
+        "digital-experience-monitoring_aggregate_time_period": digital$$experience$$monitoring_aggregate_time_period,
+        "digital-experience-monitoring_aggregate_time_slot": digital$$experience$$monitoring_aggregate_time_slot,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_tests_response": digital$$experience$$monitoring_tests_response,
+        "digital-experience-monitoring_timing_aggregates": digital$$experience$$monitoring_timing_aggregates,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/tests/overview`,
       query: [
-        ["colo", args["colo"], true],
-        ["testName", args["test_name"], true],
-        ["deviceId", args["device_id"], true],
-        ["registration_id", args["registration_id"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["kind", args["kind"], true],
+        ["colo", param(args, "query", "colo"), true],
+        ["testName", param(args, "query", "testName"), true],
+        ["deviceId", param(args, "query", "deviceId"), true],
+        ["registration_id", param(args, "query", "registration_id"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["kind", param(args, "query", "kind"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/overview/tests/uniqueDevices/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/overview/tests/uniqueDevices/outputs.ts
index 9d3ed9ff0..ffce9333a 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/overview/tests/uniqueDevices/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/overview/tests/uniqueDevices/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
  * The schema of `digital-experience-monitoring_unique_devices_response` in
  * responses.
  */
-export const digital_experience_monitoring_unique_devices_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_unique_devices_response: JsonSchema = {
   "properties": {
     "uniqueDevicesTotal": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/overview/tests/uniqueDevices/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/overview/tests/uniqueDevices/tools.ts
index 1859629da..e4fdd8a5a 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/overview/tests/uniqueDevices/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/overview/tests/uniqueDevices/tools.ts
@@ -1,48 +1,60 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../../../schemas.js";
-import { digital_experience_monitoring_unique_devices_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_unique_devices_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.overview.tests.unique_devices`.
+ * The tools of `zeroTrust.dex.overview.tests.uniqueDevices`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_overview_tests_unique_devices_get",
+    name: "zeroTrust_dex_overview_tests_uniqueDevices_get",
     title: "Get count of devices targeted",
-    description: "Returns unique count of devices that have run synthetic application monitoring tests in the past 7 days.",
+    description: "Returns unique count of devices that have run synthetic application monitoring tests in the past 7 days.\n\nGET /accounts/{account_id}/dex/tests/unique-devices",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "device_id": {
-          "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
           },
-          "type": "array"
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "test_name": {
-          "description": "Optionally filter results by test name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "deviceId": {
+              "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "testName": {
+              "description": "Optionally filter results by test name.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -59,9 +71,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_unique_devices_response": digital_experience_monitoring_unique_devices_response_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_unique_devices_response": digital$$experience$$monitoring_unique_devices_response,
       },
     },
     annotations: {
@@ -103,17 +115,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_unique_devices_response": digital_experience_monitoring_unique_devices_response_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_unique_devices_response": digital$$experience$$monitoring_unique_devices_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/tests/unique-devices`,
       query: [
-        ["testName", args["test_name"], true],
-        ["deviceId", args["device_id"], true],
+        ["testName", param(args, "query", "testName"), true],
+        ["deviceId", param(args, "query", "deviceId"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/rules/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/rules/outputs.ts
index c9e5bcade..cfb469c16 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/rules/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `digital-experience-monitoring_dex-rule` in responses.
  */
-export const digital_experience_monitoring_dex_rule_output: JsonSchema = {
+export const digital$$experience$$monitoring_dex$$rule: JsonSchema = {
   "properties": {
     "created_at": {
       "type": "string"
@@ -15,7 +15,7 @@ export const digital_experience_monitoring_dex_rule_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "match": {
       "type": "string"
@@ -45,7 +45,7 @@ export const digital_experience_monitoring_dex_rule_output: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_dex-targeted-test` in responses.
  */
-export const digital_experience_monitoring_dex_targeted_test_output: JsonSchema = {
+export const digital$$experience$$monitoring_dex$$targeted$$test: JsonSchema = {
   "properties": {
     "data": {
       "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-data"
@@ -73,7 +73,7 @@ export const digital_experience_monitoring_dex_targeted_test_output: JsonSchema
  * The schema of `digital-experience-monitoring_list_rules_response` in
  * responses.
  */
-export const digital_experience_monitoring_list_rules_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_list_rules_response: JsonSchema = {
   "properties": {
     "rules": {
       "items": {
diff --git a/src/generated/forge-mcp/zeroTrust/dex/rules/schemas.ts b/src/generated/forge-mcp/zeroTrust/dex/rules/schemas.ts
index 790e91eb0..ec4edc687 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/rules/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/rules/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `digital-experience-monitoring_create_rule_body`.
  */
-export const digital_experience_monitoring_create_rule_body: JsonSchema = {
+export const digital$$experience$$monitoring_create_rule_body: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -30,7 +30,7 @@ export const digital_experience_monitoring_create_rule_body: JsonSchema = {
 /**
  * The schema of `digital-experience-monitoring_patch_rule_body`.
  */
-export const digital_experience_monitoring_patch_rule_body: JsonSchema = {
+export const digital$$experience$$monitoring_patch_rule_body: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/rules/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/rules/tools.ts
index 0753ab2cf..4bf479a4e 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/rules/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/rules/tools.ts
@@ -1,56 +1,60 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_collection_output,
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_device_dex_test_schemas_data_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_uuid_output,
+  digital$$experience$$monitoring_api$$response$$collection,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+  digital$$experience$$monitoring_messages,
 } from "../outputs.js";
 import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_uuid,
-} from "../schemas.js";
-import {
-  digital_experience_monitoring_dex_rule_output,
-  digital_experience_monitoring_dex_targeted_test_output,
-  digital_experience_monitoring_list_rules_response_output,
+  digital$$experience$$monitoring_dex$$rule,
+  digital$$experience$$monitoring_dex$$targeted$$test,
+  digital$$experience$$monitoring_list_rules_response,
 } from "./outputs.js";
 import {
-  digital_experience_monitoring_create_rule_body,
-  digital_experience_monitoring_patch_rule_body,
+  digital$$experience$$monitoring_create_rule_body,
+  digital$$experience$$monitoring_patch_rule_body,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dex.rules`.
+ * The tools of `zeroTrust.dex.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_rules_create",
+    name: "zeroTrust_dex_rules_create",
     title: "Create a DEX Rule",
-    description: "Create a DEX Rule.",
+    description: "Create a DEX Rule.\n\nPOST /accounts/{account_id}/dex/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/digital-experience-monitoring_create_rule_body"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_create_rule_body": digital_experience_monitoring_create_rule_body,
+        "digital-experience-monitoring_create_rule_body": digital$$experience$$monitoring_create_rule_body,
       },
     },
     outputSchema: {
@@ -68,12 +72,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_dex-rule": digital_experience_monitoring_dex_rule_output,
-        "digital-experience-monitoring_dex-targeted-test": digital_experience_monitoring_dex_targeted_test_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_dex-rule": digital$$experience$$monitoring_dex$$rule,
+        "digital-experience-monitoring_dex-targeted-test": digital$$experience$$monitoring_dex$$targeted$$test,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -112,13 +115,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_dex-rule": digital_experience_monitoring_dex_rule_output,
-        "digital-experience-monitoring_dex-targeted-test": digital_experience_monitoring_dex_targeted_test_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_dex-rule": digital$$experience$$monitoring_dex$$rule,
+        "digital-experience-monitoring_dex-targeted-test": digital$$experience$$monitoring_dex$$targeted$$test,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
@@ -127,29 +129,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dex_rules_delete",
+    name: "zeroTrust_dex_rules_delete",
     title: "Delete a DEX Rule",
-    description: "Delete a DEX Rule.",
+    description: "Delete a DEX Rule.\n\nDELETE /accounts/{account_id}/dex/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier of the rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Unique identifier of the rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -173,8 +181,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -220,9 +228,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
@@ -230,29 +238,35 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dex_rules_get",
+    name: "zeroTrust_dex_rules_get",
     title: "Get DEX Rule",
-    description: "Get details for a DEX Rule.",
+    description: "Get details for a DEX Rule.\n\nGET /accounts/{account_id}/dex/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier of the rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Unique identifier of the rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -269,12 +283,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_dex-rule": digital_experience_monitoring_dex_rule_output,
-        "digital-experience-monitoring_dex-targeted-test": digital_experience_monitoring_dex_targeted_test_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_dex-rule": digital$$experience$$monitoring_dex$$rule,
+        "digital-experience-monitoring_dex-targeted-test": digital$$experience$$monitoring_dex$$targeted$$test,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -316,13 +329,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_dex-rule": digital_experience_monitoring_dex_rule_output,
-        "digital-experience-monitoring_dex-targeted-test": digital_experience_monitoring_dex_targeted_test_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_dex-rule": digital$$experience$$monitoring_dex$$rule,
+        "digital-experience-monitoring_dex-targeted-test": digital$$experience$$monitoring_dex$$targeted$$test,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
@@ -330,57 +342,73 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dex_rules_list",
+    name: "zeroTrust_dex_rules_list",
     title: "List DEX Rules",
-    description: "List DEX Rules.",
+    description: "List DEX Rules.\n\nGET /accounts/{account_id}/dex/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "name": {
-          "description": "Filter results by rule name.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "number"
-        },
-        "sort_by": {
-          "default": "name",
-          "description": "Which property to sort results by.",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "sort_order": {
-          "default": "ASC",
-          "description": "Sort direction for sort_by property.",
-          "enum": [
-            "ASC",
-            "DESC"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "name": {
+              "description": "Filter results by rule name.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "number"
+            },
+            "sort_by": {
+              "default": "name",
+              "description": "Which property to sort results by.",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "sort_order": {
+              "default": "ASC",
+              "description": "Sort direction for sort_by property.",
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "page",
+            "per_page"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "page",
-        "per_page"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -397,14 +425,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_dex-rule": digital_experience_monitoring_dex_rule_output,
-        "digital-experience-monitoring_dex-targeted-test": digital_experience_monitoring_dex_targeted_test_output,
-        "digital-experience-monitoring_list_rules_response": digital_experience_monitoring_list_rules_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_dex-rule": digital$$experience$$monitoring_dex$$rule,
+        "digital-experience-monitoring_dex-targeted-test": digital$$experience$$monitoring_dex$$targeted$$test,
+        "digital-experience-monitoring_list_rules_response": digital$$experience$$monitoring_list_rules_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -446,56 +473,63 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_dex-rule": digital_experience_monitoring_dex_rule_output,
-        "digital-experience-monitoring_dex-targeted-test": digital_experience_monitoring_dex_targeted_test_output,
-        "digital-experience-monitoring_list_rules_response": digital_experience_monitoring_list_rules_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_dex-rule": digital$$experience$$monitoring_dex$$rule,
+        "digital-experience-monitoring_dex-targeted-test": digital$$experience$$monitoring_dex$$targeted$$test,
+        "digital-experience-monitoring_list_rules_response": digital$$experience$$monitoring_list_rules_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/rules`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["sort_order", args["sort_order"], true],
-        ["sort_by", args["sort_by"], true],
-        ["name", args["name"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
+        ["sort_by", param(args, "query", "sort_by"), true],
+        ["name", param(args, "query", "name"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_dex_rules_update",
+    name: "zeroTrust_dex_rules_update",
     title: "Update a DEX Rule",
-    description: "Update a DEX Rule.",
+    description: "Update a DEX Rule.\n\nPATCH /accounts/{account_id}/dex/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/digital-experience-monitoring_patch_rule_body"
         },
-        "rule_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier of the rule."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Unique identifier of the rule.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_patch_rule_body": digital_experience_monitoring_patch_rule_body,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
+        "digital-experience-monitoring_patch_rule_body": digital$$experience$$monitoring_patch_rule_body,
       },
     },
     outputSchema: {
@@ -513,12 +547,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_dex-rule": digital_experience_monitoring_dex_rule_output,
-        "digital-experience-monitoring_dex-targeted-test": digital_experience_monitoring_dex_targeted_test_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_dex-rule": digital$$experience$$monitoring_dex$$rule,
+        "digital-experience-monitoring_dex-targeted-test": digital$$experience$$monitoring_dex$$targeted$$test,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -557,13 +590,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_dex-rule": digital_experience_monitoring_dex_rule_output,
-        "digital-experience-monitoring_dex-targeted-test": digital_experience_monitoring_dex_targeted_test_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_dex-rule": digital$$experience$$monitoring_dex$$rule,
+        "digital-experience-monitoring_dex-targeted-test": digital$$experience$$monitoring_dex$$targeted$$test,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dex/schemas.ts b/src/generated/forge-mcp/zeroTrust/dex/schemas.ts
index 678196a75..e4237b737 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/schemas.ts
@@ -3,26 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `digital-experience-monitoring_account_identifier`.
- */
-export const digital_experience_monitoring_account_identifier: JsonSchema = {
-  "description": "Unique identifier linked to an account.",
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_colo`.
- */
-export const digital_experience_monitoring_colo: JsonSchema = {
-  "description": "Cloudflare colo airport code.",
-  "type": "string"
-};
-
 /**
  * The schema of `digital-experience-monitoring_device-dex-test-schemas-data`.
  */
-export const digital_experience_monitoring_device_dex_test_schemas_data: JsonSchema = {
+export const digital$$experience$$monitoring_device$$dex$$test$$schemas$$data: JsonSchema = {
   "description": "The configuration object which contains the details for the WARP client to conduct the test.",
   "properties": {
     "host": {
@@ -51,42 +35,3 @@ export const digital_experience_monitoring_device_dex_test_schemas_data: JsonSch
   ],
   "type": "object"
 };
-
-/**
- * The schema of `digital-experience-monitoring_platform`.
- */
-export const digital_experience_monitoring_platform: JsonSchema = {
-  "description": "Operating system.",
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_status`.
- */
-export const digital_experience_monitoring_status: JsonSchema = {
-  "description": "Network status.",
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_timestamp`.
- */
-export const digital_experience_monitoring_timestamp: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_uuid`.
- */
-export const digital_experience_monitoring_uuid: JsonSchema = {
-  "description": "API Resource UUID tag.",
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_version`.
- */
-export const digital_experience_monitoring_version: JsonSchema = {
-  "description": "WARP client version.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/http/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/http/outputs.ts
index b45b4a623..dab257b69 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/http/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/http/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * The schema of `digital-experience-monitoring_http_details_response` in
  * responses.
  */
-export const digital_experience_monitoring_http_details_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_http_details_response: JsonSchema = {
   "properties": {
     "host": {
       "type": "string"
@@ -166,7 +166,7 @@ export const digital_experience_monitoring_http_details_response_output: JsonSch
                 "type": "boolean"
               },
               "id": {
-                "$ref": "#/$defs/digital-experience-monitoring_uuid"
+                "type": "string"
               },
               "name": {
                 "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/http/percentiles/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/http/percentiles/outputs.ts
index 92e98077f..3e1d1b977 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/http/percentiles/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/http/percentiles/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
  * `digital-experience-monitoring_http_details_percentiles_response` in
  * responses.
  */
-export const digital_experience_monitoring_http_details_percentiles_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_http_details_percentiles_response: JsonSchema = {
   "properties": {
     "dnsResponseTimeMs": {
       "$ref": "#/$defs/digital-experience-monitoring_percentiles"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/http/percentiles/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/http/percentiles/tools.ts
index 81ce21d05..be8bf529e 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/http/percentiles/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/http/percentiles/tools.ts
@@ -1,68 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../../outputs.js";
-import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_uuid,
-} from "../../../schemas.js";
-import { digital_experience_monitoring_percentiles_output } from "../../outputs.js";
-import { digital_experience_monitoring_http_details_percentiles_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_percentiles } from "../../outputs.js";
+import { digital$$experience$$monitoring_http_details_percentiles_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.test_results.http.percentiles`.
+ * The tools of `zeroTrust.dex.testResults.http.percentiles`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_test_results_http_percentiles_get",
+    name: "zeroTrust_dex_testResults_http_percentiles_get",
     title: "Get percentiles for an http test",
-    description: "Get percentiles for an http test for a given time period between 1 hour and 7 days.",
+    description: "Get percentiles for an http test for a given time period between 1 hour and 7 days.\n\nGET /accounts/{account_id}/dex/http-tests/{test_id}/percentiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
-          "type": "string"
-        },
-        "device_id": {
-          "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "test_id": {
+              "description": "Unique identifier for a specific test.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "from": {
-          "description": "Start time for the query in ISO (RFC3339 - ISO 8601) format.",
-          "type": "string"
-        },
-        "test_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier for a specific test."
+          "required": [
+            "account_id",
+            "test_id"
+          ],
+          "type": "object"
         },
-        "to": {
-          "description": "End time for the query in ISO (RFC3339 - ISO 8601) format.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
+              "type": "string"
+            },
+            "deviceId": {
+              "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "from": {
+              "description": "Start time for the query in ISO (RFC3339 - ISO 8601) format.",
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for the query in ISO (RFC3339 - ISO 8601) format.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "from",
+            "to"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "test_id",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -79,10 +90,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_http_details_percentiles_response": digital_experience_monitoring_http_details_percentiles_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_percentiles": digital_experience_monitoring_percentiles_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_http_details_percentiles_response": digital$$experience$$monitoring_http_details_percentiles_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_percentiles": digital$$experience$$monitoring_percentiles,
       },
     },
     annotations: {
@@ -124,20 +135,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_http_details_percentiles_response": digital_experience_monitoring_http_details_percentiles_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_percentiles": digital_experience_monitoring_percentiles_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_http_details_percentiles_response": digital$$experience$$monitoring_http_details_percentiles_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_percentiles": digital$$experience$$monitoring_percentiles,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/http-tests/${pathParam(args, "test_id")}/percentiles`,
       query: [
-        ["deviceId", args["device_id"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["colo", args["colo"], true],
+        ["deviceId", param(args, "query", "deviceId"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["colo", param(args, "query", "colo"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/http/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/http/tools.ts
index 1e86bf239..bd1ea47be 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/http/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/http/tools.ts
@@ -1,81 +1,91 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_uuid_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../outputs.js";
 import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_uuid,
-} from "../../schemas.js";
-import {
-  digital_experience_monitoring_test_stat_over_time_output,
-  digital_experience_monitoring_test_stat_pct_over_time_output,
+  digital$$experience$$monitoring_test_stat_over_time,
+  digital$$experience$$monitoring_test_stat_pct_over_time,
 } from "../outputs.js";
-import { digital_experience_monitoring_http_details_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_http_details_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.test_results.http`.
+ * The tools of `zeroTrust.dex.testResults.http`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_test_results_http_get",
+    name: "zeroTrust_dex_testResults_http_get",
     title: "Get details and aggregate metrics for an http test",
-    description: "Get test details and aggregate performance metrics for an http test for a given time period between 1 hour and 7 days.",
+    description: "Get test details and aggregate performance metrics for an http test for a given time period between 1 hour and 7 days.\n\nGET /accounts/{account_id}/dex/http-tests/{test_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
-          "type": "string"
-        },
-        "device_id": {
-          "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "test_id": {
+              "description": "Unique identifier for a specific test.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "from": {
-          "description": "Start time for aggregate metrics in ISO ms.",
-          "type": "string"
-        },
-        "interval": {
-          "description": "Time interval for aggregate time slots.",
-          "enum": [
-            "minute",
-            "hour"
+          "required": [
+            "account_id",
+            "test_id"
           ],
-          "type": "string"
-        },
-        "test_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier for a specific test."
+          "type": "object"
         },
-        "to": {
-          "description": "End time for aggregate metrics in ISO ms.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
+              "type": "string"
+            },
+            "deviceId": {
+              "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "from": {
+              "description": "Start time for aggregate metrics in ISO ms.",
+              "type": "string"
+            },
+            "interval": {
+              "description": "Time interval for aggregate time slots.",
+              "enum": [
+                "minute",
+                "hour"
+              ],
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for aggregate metrics in ISO ms.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "from",
+            "to",
+            "interval"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "test_id",
-        "from",
-        "to",
-        "interval"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -92,12 +102,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_http_details_response": digital_experience_monitoring_http_details_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_test_stat_over_time": digital_experience_monitoring_test_stat_over_time_output,
-        "digital-experience-monitoring_test_stat_pct_over_time": digital_experience_monitoring_test_stat_pct_over_time_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_http_details_response": digital$$experience$$monitoring_http_details_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_test_stat_over_time": digital$$experience$$monitoring_test_stat_over_time,
+        "digital-experience-monitoring_test_stat_pct_over_time": digital$$experience$$monitoring_test_stat_pct_over_time,
       },
     },
     annotations: {
@@ -139,23 +148,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_http_details_response": digital_experience_monitoring_http_details_response_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_test_stat_over_time": digital_experience_monitoring_test_stat_over_time_output,
-        "digital-experience-monitoring_test_stat_pct_over_time": digital_experience_monitoring_test_stat_pct_over_time_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_http_details_response": digital$$experience$$monitoring_http_details_response,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_test_stat_over_time": digital$$experience$$monitoring_test_stat_over_time,
+        "digital-experience-monitoring_test_stat_pct_over_time": digital$$experience$$monitoring_test_stat_pct_over_time,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/http-tests/${pathParam(args, "test_id")}`,
       query: [
-        ["deviceId", args["device_id"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["interval", args["interval"], true],
-        ["colo", args["colo"], true],
+        ["deviceId", param(args, "query", "deviceId"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["interval", param(args, "query", "interval"), true],
+        ["colo", param(args, "query", "colo"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/outputs.ts
index 8506b2a19..c231b4caf 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `digital-experience-monitoring_percentiles` in responses.
  */
-export const digital_experience_monitoring_percentiles_output: JsonSchema = {
+export const digital$$experience$$monitoring_percentiles: JsonSchema = {
   "properties": {
     "p50": {
       "oneOf": [
@@ -56,7 +56,7 @@ export const digital_experience_monitoring_percentiles_output: JsonSchema = {
  * The schema of `digital-experience-monitoring_test_stat_over_time` in
  * responses.
  */
-export const digital_experience_monitoring_test_stat_over_time_output: JsonSchema = {
+export const digital$$experience$$monitoring_test_stat_over_time: JsonSchema = {
   "properties": {
     "avg": {
       "oneOf": [
@@ -117,7 +117,7 @@ export const digital_experience_monitoring_test_stat_over_time_output: JsonSchem
  * The schema of `digital-experience-monitoring_test_stat_pct_over_time` in
  * responses.
  */
-export const digital_experience_monitoring_test_stat_pct_over_time_output: JsonSchema = {
+export const digital$$experience$$monitoring_test_stat_pct_over_time: JsonSchema = {
   "properties": {
     "avg": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/networkPath/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/networkPath/outputs.ts
index c83461d40..b1beb901e 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/networkPath/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/networkPath/outputs.ts
@@ -3,33 +3,26 @@
 
 import type { JsonSchema } from "../../../../../_/tool.js";
 
-/**
- * The schema of `digital-experience-monitoring_execution_context` in responses.
- */
-export const digital_experience_monitoring_execution_context_output: JsonSchema = {
-  "enum": [
-    "EXECUTION_CONTEXT_INVALID",
-    "OUT_OF_TUNNEL",
-    "IN_TUNNEL"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of
  * `digital-experience-monitoring_traceroute_test_result_network_path_response`
  * in responses.
  */
-export const digital_experience_monitoring_traceroute_test_result_network_path_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_traceroute_test_result_network_path_response: JsonSchema = {
   "properties": {
     "colo": {
-      "$ref": "#/$defs/digital-experience-monitoring_colo"
+      "type": "string"
     },
     "deviceName": {
       "type": "string"
     },
     "execution_context": {
-      "$ref": "#/$defs/digital-experience-monitoring_execution_context"
+      "enum": [
+        "EXECUTION_CONTEXT_INVALID",
+        "OUT_OF_TUNNEL",
+        "IN_TUNNEL"
+      ],
+      "type": "string"
     },
     "hops": {
       "items": {
@@ -164,10 +157,10 @@ export const digital_experience_monitoring_traceroute_test_result_network_path_r
       "type": "array"
     },
     "resultId": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "testId": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "testName": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/networkPath/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/networkPath/tools.ts
index dd41b7d68..b007802ec 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/networkPath/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/networkPath/tools.ts
@@ -3,49 +3,46 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_colo_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_uuid_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../../outputs.js";
-import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_uuid,
-} from "../../../schemas.js";
-import {
-  digital_experience_monitoring_execution_context_output,
-  digital_experience_monitoring_traceroute_test_result_network_path_response_output,
-} from "./outputs.js";
+import { digital$$experience$$monitoring_traceroute_test_result_network_path_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.test_results.traceroute.network_path`.
+ * The tools of `zeroTrust.dex.testResults.traceroute.networkPath`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_test_results_traceroute_network_path_get",
+    name: "zeroTrust_dex_testResults_traceroute_networkPath_get",
     title: "Get details for a specific traceroute test run",
-    description: "Get a breakdown of hops and performance metrics for a specific traceroute test run",
+    description: "Get a breakdown of hops and performance metrics for a specific traceroute test run\n\nGET /accounts/{account_id}/dex/traceroute-test-results/{test_result_id}/network-path",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "test_result_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier for a specific traceroute test."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "test_result_id": {
+              "description": "Unique identifier for a specific traceroute test.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "test_result_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "test_result_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -62,12 +59,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo_output,
-        "digital-experience-monitoring_execution_context": digital_experience_monitoring_execution_context_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_traceroute_test_result_network_path_response": digital_experience_monitoring_traceroute_test_result_network_path_response_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_traceroute_test_result_network_path_response": digital$$experience$$monitoring_traceroute_test_result_network_path_response,
       },
     },
     annotations: {
@@ -109,13 +103,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_colo": digital_experience_monitoring_colo_output,
-        "digital-experience-monitoring_execution_context": digital_experience_monitoring_execution_context_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_traceroute_test_result_network_path_response": digital_experience_monitoring_traceroute_test_result_network_path_response_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_traceroute_test_result_network_path_response": digital$$experience$$monitoring_traceroute_test_result_network_path_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/outputs.ts
index eb98b0156..8519e72d0 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * The schema of `digital-experience-monitoring_traceroute_details_response` in
  * responses.
  */
-export const digital_experience_monitoring_traceroute_details_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_traceroute_details_response: JsonSchema = {
   "properties": {
     "host": {
       "type": "string"
@@ -33,7 +33,7 @@ export const digital_experience_monitoring_traceroute_details_response_output: J
                 "type": "boolean"
               },
               "id": {
-                "$ref": "#/$defs/digital-experience-monitoring_uuid"
+                "type": "string"
               },
               "name": {
                 "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/percentiles/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/percentiles/outputs.ts
index 0de45a362..870f131e0 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/percentiles/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/percentiles/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../../../../_/tool.js";
  * `digital-experience-monitoring_traceroute_details_percentiles_response` in
  * responses.
  */
-export const digital_experience_monitoring_traceroute_details_percentiles_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_traceroute_details_percentiles_response: JsonSchema = {
   "properties": {
     "hopsCount": {
       "$ref": "#/$defs/digital-experience-monitoring_percentiles"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/percentiles/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/percentiles/tools.ts
index 542384dd5..c0e8ac481 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/percentiles/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/percentiles/tools.ts
@@ -1,68 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../../outputs.js";
-import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_uuid,
-} from "../../../schemas.js";
-import { digital_experience_monitoring_percentiles_output } from "../../outputs.js";
-import { digital_experience_monitoring_traceroute_details_percentiles_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_percentiles } from "../../outputs.js";
+import { digital$$experience$$monitoring_traceroute_details_percentiles_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.test_results.traceroute.percentiles`.
+ * The tools of `zeroTrust.dex.testResults.traceroute.percentiles`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_test_results_traceroute_percentiles_get",
+    name: "zeroTrust_dex_testResults_traceroute_percentiles_get",
     title: "Get percentiles for a traceroute test",
-    description: "Get percentiles for a traceroute test for a given time period between 1 hour and 7 days.",
+    description: "Get percentiles for a traceroute test for a given time period between 1 hour and 7 days.\n\nGET /accounts/{account_id}/dex/traceroute-tests/{test_id}/percentiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
-          "type": "string"
-        },
-        "device_id": {
-          "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "test_id": {
+              "description": "Unique identifier for a specific test.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "from": {
-          "description": "Start time for the query in ISO (RFC3339 - ISO 8601) format.",
-          "type": "string"
-        },
-        "test_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier for a specific test."
+          "required": [
+            "account_id",
+            "test_id"
+          ],
+          "type": "object"
         },
-        "to": {
-          "description": "End time for the query in ISO (RFC3339 - ISO 8601) format.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
+              "type": "string"
+            },
+            "deviceId": {
+              "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "from": {
+              "description": "Start time for the query in ISO (RFC3339 - ISO 8601) format.",
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for the query in ISO (RFC3339 - ISO 8601) format.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "from",
+            "to"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "test_id",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -79,10 +90,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_percentiles": digital_experience_monitoring_percentiles_output,
-        "digital-experience-monitoring_traceroute_details_percentiles_response": digital_experience_monitoring_traceroute_details_percentiles_response_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_percentiles": digital$$experience$$monitoring_percentiles,
+        "digital-experience-monitoring_traceroute_details_percentiles_response": digital$$experience$$monitoring_traceroute_details_percentiles_response,
       },
     },
     annotations: {
@@ -124,20 +135,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_percentiles": digital_experience_monitoring_percentiles_output,
-        "digital-experience-monitoring_traceroute_details_percentiles_response": digital_experience_monitoring_traceroute_details_percentiles_response_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_percentiles": digital$$experience$$monitoring_percentiles,
+        "digital-experience-monitoring_traceroute_details_percentiles_response": digital$$experience$$monitoring_traceroute_details_percentiles_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/traceroute-tests/${pathParam(args, "test_id")}/percentiles`,
       query: [
-        ["deviceId", args["device_id"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["colo", args["colo"], true],
+        ["deviceId", param(args, "query", "deviceId"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["colo", param(args, "query", "colo"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/tools.ts
index 9382c67b1..c0a596174 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/testResults/traceroute/tools.ts
@@ -1,81 +1,91 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_uuid_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../outputs.js";
 import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_uuid,
-} from "../../schemas.js";
-import {
-  digital_experience_monitoring_test_stat_over_time_output,
-  digital_experience_monitoring_test_stat_pct_over_time_output,
+  digital$$experience$$monitoring_test_stat_over_time,
+  digital$$experience$$monitoring_test_stat_pct_over_time,
 } from "../outputs.js";
-import { digital_experience_monitoring_traceroute_details_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_traceroute_details_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.test_results.traceroute`.
+ * The tools of `zeroTrust.dex.testResults.traceroute`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_test_results_traceroute_get",
+    name: "zeroTrust_dex_testResults_traceroute_get",
     title: "Get details and aggregate metrics for a traceroute test",
-    description: "Get test details and aggregate performance metrics for a traceroute test for a given time period between 1 hour and 7 days.",
+    description: "Get test details and aggregate performance metrics for a traceroute test for a given time period between 1 hour and 7 days.\n\nGET /accounts/{account_id}/dex/traceroute-tests/{test_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "colo": {
-          "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
-          "type": "string"
-        },
-        "device_id": {
-          "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "test_id": {
+              "description": "Unique identifier for a specific test.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "from": {
-          "description": "Start time for aggregate metrics in ISO ms.",
-          "type": "string"
-        },
-        "interval": {
-          "description": "Time interval for aggregate time slots.",
-          "enum": [
-            "minute",
-            "hour"
+          "required": [
+            "account_id",
+            "test_id"
           ],
-          "type": "string"
-        },
-        "test_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier for a specific test."
+          "type": "object"
         },
-        "to": {
-          "description": "End time for aggregate metrics in ISO ms.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "colo": {
+              "description": "Optionally filter result stats to a Cloudflare colo. Cannot be used in combination with deviceId param.",
+              "type": "string"
+            },
+            "deviceId": {
+              "description": "Optionally filter result stats to a specific device(s). Cannot be used in combination with colo param.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "from": {
+              "description": "Start time for aggregate metrics in ISO ms.",
+              "type": "string"
+            },
+            "interval": {
+              "description": "Time interval for aggregate time slots.",
+              "enum": [
+                "minute",
+                "hour"
+              ],
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for aggregate metrics in ISO ms.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "from",
+            "to",
+            "interval"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "test_id",
-        "from",
-        "to",
-        "interval"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -92,12 +102,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_test_stat_over_time": digital_experience_monitoring_test_stat_over_time_output,
-        "digital-experience-monitoring_test_stat_pct_over_time": digital_experience_monitoring_test_stat_pct_over_time_output,
-        "digital-experience-monitoring_traceroute_details_response": digital_experience_monitoring_traceroute_details_response_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_test_stat_over_time": digital$$experience$$monitoring_test_stat_over_time,
+        "digital-experience-monitoring_test_stat_pct_over_time": digital$$experience$$monitoring_test_stat_pct_over_time,
+        "digital-experience-monitoring_traceroute_details_response": digital$$experience$$monitoring_traceroute_details_response,
       },
     },
     annotations: {
@@ -139,23 +148,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_test_stat_over_time": digital_experience_monitoring_test_stat_over_time_output,
-        "digital-experience-monitoring_test_stat_pct_over_time": digital_experience_monitoring_test_stat_pct_over_time_output,
-        "digital-experience-monitoring_traceroute_details_response": digital_experience_monitoring_traceroute_details_response_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_test_stat_over_time": digital$$experience$$monitoring_test_stat_over_time,
+        "digital-experience-monitoring_test_stat_pct_over_time": digital$$experience$$monitoring_test_stat_pct_over_time,
+        "digital-experience-monitoring_traceroute_details_response": digital$$experience$$monitoring_traceroute_details_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/traceroute-tests/${pathParam(args, "test_id")}`,
       query: [
-        ["deviceId", args["device_id"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["interval", args["interval"], true],
-        ["colo", args["colo"], true],
+        ["deviceId", param(args, "query", "deviceId"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["interval", param(args, "query", "interval"), true],
+        ["colo", param(args, "query", "colo"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/tests/networkPath/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/tests/networkPath/outputs.ts
index 01e3bf22c..7a9f19d32 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/tests/networkPath/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/tests/networkPath/outputs.ts
@@ -8,13 +8,13 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * `digital-experience-monitoring_traceroute_test_network_path_response` in
  * responses.
  */
-export const digital_experience_monitoring_traceroute_test_network_path_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_traceroute_test_network_path_response: JsonSchema = {
   "properties": {
     "deviceName": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "interval": {
       "type": "string"
@@ -101,7 +101,7 @@ export const digital_experience_monitoring_traceroute_test_network_path_response
                     ]
                   },
                   "id": {
-                    "$ref": "#/$defs/digital-experience-monitoring_uuid"
+                    "type": "string"
                   },
                   "timestamp": {
                     "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dex/tests/networkPath/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/tests/networkPath/tools.ts
index c5f16505a..0fe253246 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/tests/networkPath/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/tests/networkPath/tools.ts
@@ -1,71 +1,81 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_uuid_output,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_messages,
 } from "../../outputs.js";
-import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_uuid,
-} from "../../schemas.js";
-import { digital_experience_monitoring_traceroute_test_network_path_response_output } from "./outputs.js";
+import { digital$$experience$$monitoring_traceroute_test_network_path_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.tests.network_path`.
+ * The tools of `zeroTrust.dex.tests.networkPath`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_tests_network_path_get",
+    name: "zeroTrust_dex_tests_networkPath_get",
     title: "Get network path breakdown for a traceroute test",
-    description: "Get a breakdown of metrics by hop for individual traceroute test runs.",
+    description: "Get a breakdown of metrics by hop for individual traceroute test runs.\n\nGET /accounts/{account_id}/dex/traceroute-tests/{test_id}/network-path",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "device_id": {
-          "description": "Device to filter traceroute result runs to.",
-          "type": "string"
-        },
-        "from": {
-          "description": "Start time for aggregate metrics in ISO ms.",
-          "type": "string"
-        },
-        "interval": {
-          "description": "Time interval for aggregate time slots.",
-          "enum": [
-            "minute",
-            "hour"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "test_id": {
+              "description": "Unique identifier for a specific test.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "test_id"
           ],
-          "type": "string"
-        },
-        "test_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier for a specific test."
+          "type": "object"
         },
-        "to": {
-          "description": "End time for aggregate metrics in ISO ms.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "deviceId": {
+              "description": "Device to filter traceroute result runs to.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start time for aggregate metrics in ISO ms.",
+              "type": "string"
+            },
+            "interval": {
+              "description": "Time interval for aggregate time slots.",
+              "enum": [
+                "minute",
+                "hour"
+              ],
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for aggregate metrics in ISO ms.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "deviceId",
+            "from",
+            "to",
+            "interval"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "test_id",
-        "device_id",
-        "from",
-        "to",
-        "interval"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -82,10 +92,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_traceroute_test_network_path_response": digital_experience_monitoring_traceroute_test_network_path_response_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_traceroute_test_network_path_response": digital$$experience$$monitoring_traceroute_test_network_path_response,
       },
     },
     annotations: {
@@ -127,20 +136,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_traceroute_test_network_path_response": digital_experience_monitoring_traceroute_test_network_path_response_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_traceroute_test_network_path_response": digital$$experience$$monitoring_traceroute_test_network_path_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/traceroute-tests/${pathParam(args, "test_id")}/network-path`,
       query: [
-        ["deviceId", args["device_id"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["interval", args["interval"], true],
+        ["deviceId", param(args, "query", "deviceId"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["interval", param(args, "query", "interval"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dex/tests/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/tests/outputs.ts
index 2d66d91a3..0b14dfd1d 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/tests/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/tests/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../_/tool.js";
  * The schema of `digital-experience-monitoring_api-response-collection-common`
  * in responses.
  */
-export const digital_experience_monitoring_api_response_collection_common_output: JsonSchema = {
+export const digital$$experience$$monitoring_api$$response$$collection$$common: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/digital-experience-monitoring_api-response-common"
@@ -33,28 +33,11 @@ export const digital_experience_monitoring_api_response_collection_common_output
   ]
 };
 
-/**
- * The schema of
- * `digital-experience-monitoring_device-dex-test-schemas-description` in
- * responses.
- */
-export const digital_experience_monitoring_device_dex_test_schemas_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_device-dex-test-schemas-enabled`
- * in responses.
- */
-export const digital_experience_monitoring_device_dex_test_schemas_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `digital-experience-monitoring_device-dex-test-schemas-http` in
  * responses.
  */
-export const digital_experience_monitoring_device_dex_test_schemas_http_output: JsonSchema = {
+export const digital$$experience$$monitoring_device$$dex$$test$$schemas$$http: JsonSchema = {
   "properties": {
     "created": {
       "format": "date-time",
@@ -64,16 +47,16 @@ export const digital_experience_monitoring_device_dex_test_schemas_http_output:
       "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-data"
     },
     "description": {
-      "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-description"
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-enabled"
+      "type": "boolean"
     },
     "interval": {
-      "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-interval"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-name"
+      "type": "string"
     },
     "target_policies": {
       "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-target-policies"
@@ -82,7 +65,7 @@ export const digital_experience_monitoring_device_dex_test_schemas_http_output:
       "type": "boolean"
     },
     "test_id": {
-      "$ref": "#/$defs/digital-experience-monitoring_schemas-test-id"
+      "type": "string"
     },
     "updated": {
       "format": "date-time",
@@ -98,28 +81,11 @@ export const digital_experience_monitoring_device_dex_test_schemas_http_output:
   "type": "object"
 };
 
-/**
- * The schema of
- * `digital-experience-monitoring_device-dex-test-schemas-interval` in
- * responses.
- */
-export const digital_experience_monitoring_device_dex_test_schemas_interval_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_device-dex-test-schemas-name` in
- * responses.
- */
-export const digital_experience_monitoring_device_dex_test_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `digital-experience-monitoring_device-dex-test-target-policies`
  * in responses.
  */
-export const digital_experience_monitoring_device_dex_test_target_policies_output: JsonSchema = {
+export const digital$$experience$$monitoring_device$$dex$$test$$target$$policies: JsonSchema = {
   "items": {
     "$ref": "#/$defs/digital-experience-monitoring_dex_target_policy"
   },
@@ -130,7 +96,7 @@ export const digital_experience_monitoring_device_dex_test_target_policies_outpu
  * The schema of `digital-experience-monitoring_dex-delete-response-collection`
  * in responses.
  */
-export const digital_experience_monitoring_dex_delete_response_collection_output: JsonSchema = {
+export const digital$$experience$$monitoring_dex$$delete$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/digital-experience-monitoring_api-response-common"
@@ -158,7 +124,7 @@ export const digital_experience_monitoring_dex_delete_response_collection_output
  * The schema of `digital-experience-monitoring_dex-response_collection` in
  * responses.
  */
-export const digital_experience_monitoring_dex_response_collection_output: JsonSchema = {
+export const digital$$experience$$monitoring_dex$$response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/digital-experience-monitoring_api-response-collection-common"
@@ -181,7 +147,7 @@ export const digital_experience_monitoring_dex_response_collection_output: JsonS
  * The schema of `digital-experience-monitoring_dex-single_response` in
  * responses.
  */
-export const digital_experience_monitoring_dex_single_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_dex$$single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/digital-experience-monitoring_api-response-single"
@@ -200,13 +166,13 @@ export const digital_experience_monitoring_dex_single_response_output: JsonSchem
 /**
  * The schema of `digital-experience-monitoring_dex_target_policy` in responses.
  */
-export const digital_experience_monitoring_dex_target_policy_output: JsonSchema = {
+export const digital$$experience$$monitoring_dex_target_policy: JsonSchema = {
   "properties": {
     "default": {
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "name": {
       "type": "string"
@@ -217,10 +183,3 @@ export const digital_experience_monitoring_dex_target_policy_output: JsonSchema
   ],
   "type": "object"
 };
-
-/**
- * The schema of `digital-experience-monitoring_schemas-test-id` in responses.
- */
-export const digital_experience_monitoring_schemas_test_id_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dex/tests/schemas.ts b/src/generated/forge-mcp/zeroTrust/dex/tests/schemas.ts
index 784e05f05..12b996c0a 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/tests/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/tests/schemas.ts
@@ -3,48 +3,30 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of
- * `digital-experience-monitoring_device-dex-test-schemas-description`.
- */
-export const digital_experience_monitoring_device_dex_test_schemas_description: JsonSchema = {
-  "description": "Additional details about the test.",
-  "type": "string"
-};
-
-/**
- * The schema of
- * `digital-experience-monitoring_device-dex-test-schemas-enabled`.
- */
-export const digital_experience_monitoring_device_dex_test_schemas_enabled: JsonSchema = {
-  "description": "Determines whether or not the test is active.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `digital-experience-monitoring_device-dex-test-schemas-http`.
  */
-export const digital_experience_monitoring_device_dex_test_schemas_http: JsonSchema = {
+export const digital$$experience$$monitoring_device$$dex$$test$$schemas$$http: JsonSchema = {
   "properties": {
     "data": {
       "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-data",
       "description": "The configuration object which contains the details for the WARP client to conduct the test."
     },
     "description": {
-      "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-description",
-      "description": "Additional details about the test."
+      "description": "Additional details about the test.",
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-enabled",
-      "description": "Determines whether or not the test is active."
+      "description": "Determines whether or not the test is active.",
+      "type": "boolean"
     },
     "interval": {
-      "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-interval",
-      "description": "How often the test will run."
+      "description": "How often the test will run.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-name",
-      "description": "The name of the DEX test. Must be unique."
+      "description": "The name of the DEX test. Must be unique.",
+      "type": "string"
     },
     "target_policies": {
       "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-target-policies"
@@ -62,28 +44,11 @@ export const digital_experience_monitoring_device_dex_test_schemas_http: JsonSch
   "type": "object"
 };
 
-/**
- * The schema of
- * `digital-experience-monitoring_device-dex-test-schemas-interval`.
- */
-export const digital_experience_monitoring_device_dex_test_schemas_interval: JsonSchema = {
-  "description": "How often the test will run.",
-  "type": "string"
-};
-
-/**
- * The schema of `digital-experience-monitoring_device-dex-test-schemas-name`.
- */
-export const digital_experience_monitoring_device_dex_test_schemas_name: JsonSchema = {
-  "description": "The name of the DEX test. Must be unique.",
-  "type": "string"
-};
-
 /**
  * The schema of
  * `digital-experience-monitoring_device-dex-test-target-policies`.
  */
-export const digital_experience_monitoring_device_dex_test_target_policies: JsonSchema = {
+export const digital$$experience$$monitoring_device$$dex$$test$$target$$policies: JsonSchema = {
   "description": "DEX rules targeted by this test",
   "items": {
     "$ref": "#/$defs/digital-experience-monitoring_dex_target_policy"
@@ -94,15 +59,15 @@ export const digital_experience_monitoring_device_dex_test_target_policies: Json
 /**
  * The schema of `digital-experience-monitoring_dex_target_policy`.
  */
-export const digital_experience_monitoring_dex_target_policy: JsonSchema = {
+export const digital$$experience$$monitoring_dex_target_policy: JsonSchema = {
   "properties": {
     "default": {
       "description": "Whether the DEX rule is the account default.",
       "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid",
-      "description": "The id of the DEX rule."
+      "description": "The id of the DEX rule.",
+      "type": "string"
     },
     "name": {
       "description": "The name of the DEX rule.",
@@ -114,11 +79,3 @@ export const digital_experience_monitoring_dex_target_policy: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `digital-experience-monitoring_schemas-test-id`.
- */
-export const digital_experience_monitoring_schemas_test_id: JsonSchema = {
-  "description": "The unique identifier for the test.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dex/tests/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/tests/tools.ts
index dfdda4613..9acf1335b 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/tests/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/tests/tools.ts
@@ -1,97 +1,80 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_api_response_single_output,
-  digital_experience_monitoring_device_dex_test_schemas_data_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_uuid_output,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_api$$response$$single,
+  digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+  digital$$experience$$monitoring_messages,
 } from "../outputs.js";
+import { digital$$experience$$monitoring_device$$dex$$test$$schemas$$data as digital$$experience$$monitoring_device$$dex$$test$$schemas$$data$ } from "../schemas.js";
 import {
-  digital_experience_monitoring_account_identifier,
-  digital_experience_monitoring_device_dex_test_schemas_data,
-  digital_experience_monitoring_uuid,
-} from "../schemas.js";
-import {
-  digital_experience_monitoring_api_response_collection_common_output,
-  digital_experience_monitoring_device_dex_test_schemas_description_output,
-  digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-  digital_experience_monitoring_device_dex_test_schemas_http_output,
-  digital_experience_monitoring_device_dex_test_schemas_interval_output,
-  digital_experience_monitoring_device_dex_test_schemas_name_output,
-  digital_experience_monitoring_device_dex_test_target_policies_output,
-  digital_experience_monitoring_dex_delete_response_collection_output,
-  digital_experience_monitoring_dex_response_collection_output,
-  digital_experience_monitoring_dex_single_response_output,
-  digital_experience_monitoring_dex_target_policy_output,
-  digital_experience_monitoring_schemas_test_id_output,
+  digital$$experience$$monitoring_api$$response$$collection$$common,
+  digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+  digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+  digital$$experience$$monitoring_dex$$delete$$response$$collection,
+  digital$$experience$$monitoring_dex$$response_collection,
+  digital$$experience$$monitoring_dex$$single_response,
+  digital$$experience$$monitoring_dex_target_policy,
 } from "./outputs.js";
 import {
-  digital_experience_monitoring_device_dex_test_schemas_description,
-  digital_experience_monitoring_device_dex_test_schemas_enabled,
-  digital_experience_monitoring_device_dex_test_schemas_http,
-  digital_experience_monitoring_device_dex_test_schemas_interval,
-  digital_experience_monitoring_device_dex_test_schemas_name,
-  digital_experience_monitoring_device_dex_test_target_policies,
-  digital_experience_monitoring_dex_target_policy,
-  digital_experience_monitoring_schemas_test_id,
+  digital$$experience$$monitoring_device$$dex$$test$$schemas$$http as digital$$experience$$monitoring_device$$dex$$test$$schemas$$http$,
+  digital$$experience$$monitoring_device$$dex$$test$$target$$policies as digital$$experience$$monitoring_device$$dex$$test$$target$$policies$,
+  digital$$experience$$monitoring_dex_target_policy as digital$$experience$$monitoring_dex_target_policy$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dex.tests`.
+ * The tools of `zeroTrust.dex.tests`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_tests_create",
+    name: "zeroTrust_dex_tests_create",
     title: "Create Device DEX test",
-    description: "Create a DEX test.",
+    description: "Create a DEX test.\n\nPOST /accounts/{account_id}/dex/devices/dex_tests",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-http"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data$,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http$,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies$,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_dex-single_response",
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-single_response": digital_experience_monitoring_dex_single_response_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-single_response": digital$$experience$$monitoring_dex$$single_response,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -118,20 +101,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-single_response": digital_experience_monitoring_dex_single_response_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-single_response": digital$$experience$$monitoring_dex$$single_response,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
@@ -140,46 +117,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dex_tests_delete",
+    name: "zeroTrust_dex_tests_delete",
     title: "Delete Device DEX test",
-    description: "Delete a Device DEX test. Returns the remaining device dex tests for the account.",
+    description: "Delete a Device DEX test. Returns the remaining device dex tests for the account.\n\nDELETE /accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "dex_test_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier for a DEX test."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "dex_test_id": {
+              "description": "Unique identifier for a DEX test.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dex_test_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dex_test_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_dex-delete-response-collection",
       $defs: {
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-delete-response-collection": digital_experience_monitoring_dex_delete_response_collection_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-delete-response-collection": digital$$experience$$monitoring_dex$$delete$$response$$collection,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -206,20 +183,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-delete-response-collection": digital_experience_monitoring_dex_delete_response_collection_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-delete-response-collection": digital$$experience$$monitoring_dex$$delete$$response$$collection,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
@@ -227,46 +198,46 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dex_tests_get",
+    name: "zeroTrust_dex_tests_get",
     title: "Get Device DEX test",
-    description: "Fetch a single DEX test.",
+    description: "Fetch a single DEX test.\n\nGET /accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "dex_test_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_schemas-test-id",
-          "description": "Unique identifier for a DEX test."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "dex_test_id": {
+              "description": "Unique identifier for a DEX test.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dex_test_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dex_test_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_dex-single_response",
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-single_response": digital_experience_monitoring_dex_single_response_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-single_response": digital$$experience$$monitoring_dex$$single_response,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -296,20 +267,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-single_response": digital_experience_monitoring_dex_single_response_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-single_response": digital$$experience$$monitoring_dex$$single_response,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
@@ -317,63 +282,70 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dex_tests_list",
+    name: "zeroTrust_dex_tests_list",
     title: "List Device DEX tests",
-    description: "Fetch all DEX tests.",
+    description: "Fetch all DEX tests.\n\nGET /accounts/{account_id}/dex/devices/dex_tests",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "kind": {
-          "description": "Filter by test type.",
-          "enum": [
-            "http",
-            "traceroute"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 10,
-          "description": "Number of results per page.",
-          "type": "number"
+          "type": "object"
         },
-        "test_name": {
-          "description": "Filter by test name.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "kind": {
+              "description": "Filter by test type.",
+              "enum": [
+                "http",
+                "traceroute"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 10,
+              "description": "Number of results per page.",
+              "type": "number"
+            },
+            "testName": {
+              "description": "Filter by test name.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_dex-response_collection",
       $defs: {
-        "digital-experience-monitoring_api-response-collection-common": digital_experience_monitoring_api_response_collection_common_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-response_collection": digital_experience_monitoring_dex_response_collection_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-collection-common": digital$$experience$$monitoring_api$$response$$collection$$common,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-response_collection": digital$$experience$$monitoring_dex$$response_collection,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -403,86 +375,78 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection-common": digital_experience_monitoring_api_response_collection_common_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-response_collection": digital_experience_monitoring_dex_response_collection_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-collection-common": digital$$experience$$monitoring_api$$response$$collection$$common,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-response_collection": digital$$experience$$monitoring_dex$$response_collection,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/devices/dex_tests`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["testName", args["test_name"], true],
-        ["kind", args["kind"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["testName", param(args, "query", "testName"), true],
+        ["kind", param(args, "query", "kind"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_dex_tests_update",
+    name: "zeroTrust_dex_tests_update",
     title: "Update Device DEX test",
-    description: "Update a DEX test.",
+    description: "Update a DEX test.\n\nPUT /accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
         "body": {
           "$ref": "#/$defs/digital-experience-monitoring_device-dex-test-schemas-http"
         },
-        "dex_test_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_uuid",
-          "description": "Unique identifier for a DEX test."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            },
+            "dex_test_id": {
+              "description": "Unique identifier for a DEX test.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dex_test_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dex_test_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data$,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http$,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies$,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/digital-experience-monitoring_dex-single_response",
       $defs: {
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-single_response": digital_experience_monitoring_dex_single_response_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-single_response": digital$$experience$$monitoring_dex$$single_response,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     annotations: {
@@ -509,20 +473,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_api-response-single": digital_experience_monitoring_api_response_single_output,
-        "digital-experience-monitoring_device-dex-test-schemas-data": digital_experience_monitoring_device_dex_test_schemas_data_output,
-        "digital-experience-monitoring_device-dex-test-schemas-description": digital_experience_monitoring_device_dex_test_schemas_description_output,
-        "digital-experience-monitoring_device-dex-test-schemas-enabled": digital_experience_monitoring_device_dex_test_schemas_enabled_output,
-        "digital-experience-monitoring_device-dex-test-schemas-http": digital_experience_monitoring_device_dex_test_schemas_http_output,
-        "digital-experience-monitoring_device-dex-test-schemas-interval": digital_experience_monitoring_device_dex_test_schemas_interval_output,
-        "digital-experience-monitoring_device-dex-test-schemas-name": digital_experience_monitoring_device_dex_test_schemas_name_output,
-        "digital-experience-monitoring_device-dex-test-target-policies": digital_experience_monitoring_device_dex_test_target_policies_output,
-        "digital-experience-monitoring_dex-single_response": digital_experience_monitoring_dex_single_response_output,
-        "digital-experience-monitoring_dex_target_policy": digital_experience_monitoring_dex_target_policy_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_schemas-test-id": digital_experience_monitoring_schemas_test_id_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_api-response-single": digital$$experience$$monitoring_api$$response$$single,
+        "digital-experience-monitoring_device-dex-test-schemas-data": digital$$experience$$monitoring_device$$dex$$test$$schemas$$data,
+        "digital-experience-monitoring_device-dex-test-schemas-http": digital$$experience$$monitoring_device$$dex$$test$$schemas$$http,
+        "digital-experience-monitoring_device-dex-test-target-policies": digital$$experience$$monitoring_device$$dex$$test$$target$$policies,
+        "digital-experience-monitoring_dex-single_response": digital$$experience$$monitoring_dex$$single_response,
+        "digital-experience-monitoring_dex_target_policy": digital$$experience$$monitoring_dex_target_policy,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dex/warpChangeEvents/outputs.ts b/src/generated/forge-mcp/zeroTrust/dex/warpChangeEvents/outputs.ts
index f96148323..365806de7 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/warpChangeEvents/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/warpChangeEvents/outputs.ts
@@ -3,26 +3,17 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `digital-experience-monitoring_timestamp_datetime` in
- * responses.
- */
-export const digital_experience_monitoring_timestamp_datetime_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `digital-experience-monitoring_warp_config_change_event` in
  * responses.
  */
-export const digital_experience_monitoring_warp_config_change_event_output: JsonSchema = {
+export const digital$$experience$$monitoring_warp_config_change_event: JsonSchema = {
   "properties": {
     "device_id": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "device_registration": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "from": {
       "$ref": "#/$defs/digital-experience-monitoring_warp_config_details"
@@ -31,13 +22,14 @@ export const digital_experience_monitoring_warp_config_change_event_output: Json
       "type": "string"
     },
     "registration_id": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "serial_number": {
       "type": "string"
     },
     "timestamp": {
-      "$ref": "#/$defs/digital-experience-monitoring_timestamp_datetime"
+      "format": "date-time",
+      "type": "string"
     },
     "to": {
       "$ref": "#/$defs/digital-experience-monitoring_warp_config_details"
@@ -53,13 +45,13 @@ export const digital_experience_monitoring_warp_config_change_event_output: Json
  * The schema of `digital-experience-monitoring_warp_config_details` in
  * responses.
  */
-export const digital_experience_monitoring_warp_config_details_output: JsonSchema = {
+export const digital$$experience$$monitoring_warp_config_details: JsonSchema = {
   "properties": {
     "account_name": {
       "type": "string"
     },
     "account_tag": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "config_name": {
       "type": "string"
@@ -72,7 +64,7 @@ export const digital_experience_monitoring_warp_config_details_output: JsonSchem
  * The schema of `digital-experience-monitoring_warp_events_response` in
  * responses.
  */
-export const digital_experience_monitoring_warp_events_response_output: JsonSchema = {
+export const digital$$experience$$monitoring_warp_events_response: JsonSchema = {
   "items": {
     "oneOf": [
       {
@@ -90,7 +82,7 @@ export const digital_experience_monitoring_warp_events_response_output: JsonSche
  * The schema of `digital-experience-monitoring_warp_toggle_change_event` in
  * responses.
  */
-export const digital_experience_monitoring_warp_toggle_change_event_output: JsonSchema = {
+export const digital$$experience$$monitoring_warp_toggle_change_event: JsonSchema = {
   "properties": {
     "account_name": {
       "type": "string"
@@ -99,22 +91,23 @@ export const digital_experience_monitoring_warp_toggle_change_event_output: Json
       "type": "string"
     },
     "device_id": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "device_registration": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "hostname": {
       "type": "string"
     },
     "registration_id": {
-      "$ref": "#/$defs/digital-experience-monitoring_uuid"
+      "type": "string"
     },
     "serial_number": {
       "type": "string"
     },
     "timestamp": {
-      "$ref": "#/$defs/digital-experience-monitoring_timestamp_datetime"
+      "format": "date-time",
+      "type": "string"
     },
     "toggle": {
       "enum": [
diff --git a/src/generated/forge-mcp/zeroTrust/dex/warpChangeEvents/tools.ts b/src/generated/forge-mcp/zeroTrust/dex/warpChangeEvents/tools.ts
index 3f8c39228..808c13da6 100644
--- a/src/generated/forge-mcp/zeroTrust/dex/warpChangeEvents/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dex/warpChangeEvents/tools.ts
@@ -1,99 +1,112 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  digital_experience_monitoring_api_response_collection_output,
-  digital_experience_monitoring_api_response_common_failure_output,
-  digital_experience_monitoring_api_response_common_output,
-  digital_experience_monitoring_messages_output,
-  digital_experience_monitoring_uuid_output,
+  digital$$experience$$monitoring_api$$response$$collection,
+  digital$$experience$$monitoring_api$$response$$common,
+  digital$$experience$$monitoring_api$$response$$common$$failure,
+  digital$$experience$$monitoring_messages,
 } from "../outputs.js";
-import { digital_experience_monitoring_account_identifier } from "../schemas.js";
 import {
-  digital_experience_monitoring_timestamp_datetime_output,
-  digital_experience_monitoring_warp_config_change_event_output,
-  digital_experience_monitoring_warp_config_details_output,
-  digital_experience_monitoring_warp_events_response_output,
-  digital_experience_monitoring_warp_toggle_change_event_output,
+  digital$$experience$$monitoring_warp_config_change_event,
+  digital$$experience$$monitoring_warp_config_details,
+  digital$$experience$$monitoring_warp_events_response,
+  digital$$experience$$monitoring_warp_toggle_change_event,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dex.warp_change_events`.
+ * The tools of `zeroTrust.dex.warpChangeEvents`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dex_warp_change_events_list",
+    name: "zeroTrust_dex_warpChangeEvents_list",
     title: "List WARP change events.",
-    description: "List WARP configuration and enablement toggle change events by device.",
+    description: "List WARP configuration and enablement toggle change events by device.\n\nGET /accounts/{account_id}/dex/warp-change-events",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/digital-experience-monitoring_account_identifier",
-          "description": "Unique Cloudflare account ID."
-        },
-        "account_name": {
-          "description": "Filter events by account name.",
-          "type": "string"
-        },
-        "config_name": {
-          "description": "Filter events by WARP configuration name changed from or to. Applicable to type='config' events only.",
-          "type": "string"
-        },
-        "from": {
-          "description": "Start time for the query in ISO (RFC3339 - ISO 8601) format.",
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "description": "Number of results per page.",
-          "type": "number"
-        },
-        "sort_order": {
-          "default": "ASC",
-          "description": "Sort response by event timestamp.",
-          "enum": [
-            "ASC",
-            "DESC"
-          ],
-          "type": "string"
-        },
-        "to": {
-          "description": "End time for the query in ISO (RFC3339 - ISO 8601) format.",
-          "type": "string"
-        },
-        "toggle": {
-          "description": "Filter events by type toggle value. Applicable to type='toggle' events only.",
-          "enum": [
-            "on",
-            "off"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Unique Cloudflare account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "type": {
-          "description": "Filter events by type 'config' or 'toggle'.",
-          "enum": [
-            "config",
-            "toggle"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "account_name": {
+              "description": "Filter events by account name.",
+              "type": "string"
+            },
+            "config_name": {
+              "description": "Filter events by WARP configuration name changed from or to. Applicable to type='config' events only.",
+              "type": "string"
+            },
+            "from": {
+              "description": "Start time for the query in ISO (RFC3339 - ISO 8601) format.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "description": "Number of results per page.",
+              "type": "number"
+            },
+            "sort_order": {
+              "default": "ASC",
+              "description": "Sort response by event timestamp.",
+              "enum": [
+                "ASC",
+                "DESC"
+              ],
+              "type": "string"
+            },
+            "to": {
+              "description": "End time for the query in ISO (RFC3339 - ISO 8601) format.",
+              "type": "string"
+            },
+            "toggle": {
+              "description": "Filter events by type toggle value. Applicable to type='toggle' events only.",
+              "enum": [
+                "on",
+                "off"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "description": "Filter events by type 'config' or 'toggle'.",
+              "enum": [
+                "config",
+                "toggle"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "page",
+            "per_page",
+            "from",
+            "to"
           ],
-          "type": "string"
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "page",
-        "per_page",
-        "from",
-        "to"
+        "path",
+        "query"
       ],
-      $defs: {
-        "digital-experience-monitoring_account_identifier": digital_experience_monitoring_account_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -110,15 +123,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_timestamp_datetime": digital_experience_monitoring_timestamp_datetime_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
-        "digital-experience-monitoring_warp_config_change_event": digital_experience_monitoring_warp_config_change_event_output,
-        "digital-experience-monitoring_warp_config_details": digital_experience_monitoring_warp_config_details_output,
-        "digital-experience-monitoring_warp_events_response": digital_experience_monitoring_warp_events_response_output,
-        "digital-experience-monitoring_warp_toggle_change_event": digital_experience_monitoring_warp_toggle_change_event_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_warp_config_change_event": digital$$experience$$monitoring_warp_config_change_event,
+        "digital-experience-monitoring_warp_config_details": digital$$experience$$monitoring_warp_config_details,
+        "digital-experience-monitoring_warp_events_response": digital$$experience$$monitoring_warp_events_response,
+        "digital-experience-monitoring_warp_toggle_change_event": digital$$experience$$monitoring_warp_toggle_change_event,
       },
     },
     annotations: {
@@ -160,30 +171,28 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "digital-experience-monitoring_api-response-collection": digital_experience_monitoring_api_response_collection_output,
-        "digital-experience-monitoring_api-response-common": digital_experience_monitoring_api_response_common_output,
-        "digital-experience-monitoring_api-response-common-failure": digital_experience_monitoring_api_response_common_failure_output,
-        "digital-experience-monitoring_messages": digital_experience_monitoring_messages_output,
-        "digital-experience-monitoring_timestamp_datetime": digital_experience_monitoring_timestamp_datetime_output,
-        "digital-experience-monitoring_uuid": digital_experience_monitoring_uuid_output,
-        "digital-experience-monitoring_warp_config_change_event": digital_experience_monitoring_warp_config_change_event_output,
-        "digital-experience-monitoring_warp_config_details": digital_experience_monitoring_warp_config_details_output,
-        "digital-experience-monitoring_warp_events_response": digital_experience_monitoring_warp_events_response_output,
-        "digital-experience-monitoring_warp_toggle_change_event": digital_experience_monitoring_warp_toggle_change_event_output,
+        "digital-experience-monitoring_api-response-collection": digital$$experience$$monitoring_api$$response$$collection,
+        "digital-experience-monitoring_api-response-common": digital$$experience$$monitoring_api$$response$$common,
+        "digital-experience-monitoring_api-response-common-failure": digital$$experience$$monitoring_api$$response$$common$$failure,
+        "digital-experience-monitoring_messages": digital$$experience$$monitoring_messages,
+        "digital-experience-monitoring_warp_config_change_event": digital$$experience$$monitoring_warp_config_change_event,
+        "digital-experience-monitoring_warp_config_details": digital$$experience$$monitoring_warp_config_details,
+        "digital-experience-monitoring_warp_events_response": digital$$experience$$monitoring_warp_events_response,
+        "digital-experience-monitoring_warp_toggle_change_event": digital$$experience$$monitoring_warp_toggle_change_event,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dex/warp-change-events`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["from", args["from"], true],
-        ["to", args["to"], true],
-        ["type", args["type"], true],
-        ["toggle", args["toggle"], true],
-        ["config_name", args["config_name"], true],
-        ["account_name", args["account_name"], true],
-        ["sort_order", args["sort_order"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["from", param(args, "query", "from"), true],
+        ["to", param(args, "query", "to"), true],
+        ["type", param(args, "query", "type"), true],
+        ["toggle", param(args, "query", "toggle"), true],
+        ["config_name", param(args, "query", "config_name"), true],
+        ["account_name", param(args, "query", "account_name"), true],
+        ["sort_order", param(args, "query", "sort_order"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/customPromptTopics/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/customPromptTopics/outputs.ts
index 9d20c2f02..95050082f 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/customPromptTopics/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/customPromptTopics/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_CustomPromptTopic` in responses.
  */
-export const dlp_CustomPromptTopic_output: JsonSchema = {
+export const dlp_CustomPromptTopic: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/customPromptTopics/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/customPromptTopics/tools.ts
index 1401c1a5b..4297b04ad 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/customPromptTopics/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/customPromptTopics/tools.ts
@@ -3,40 +3,50 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_CustomPromptTopic_output } from "./outputs.js";
+import { dlp_CustomPromptTopic } from "./outputs.js";
 import {
   dlp_CustomPromptTopicUpdate,
   dlp_NewCustomPromptTopic,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.custom_prompt_topics`.
+ * The tools of `zeroTrust.dlp.customPromptTopics`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_custom_prompt_topics_create",
+    name: "zeroTrust_dlp_customPromptTopics_create",
     title: "Create custom prompt topic",
-    description: "Creates a DLP custom prompt topic entry.",
+    description: "Creates a DLP custom prompt topic entry.\n\nPOST /accounts/{account_id}/dlp/custom_prompt_topics",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewCustomPromptTopic",
           "description": "A new custom prompt topic to create."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewCustomPromptTopic": dlp_NewCustomPromptTopic,
       },
@@ -56,9 +66,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_CustomPromptTopic": dlp_CustomPromptTopic_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomPromptTopic": dlp_CustomPromptTopic,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -100,10 +110,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_CustomPromptTopic": dlp_CustomPromptTopic_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomPromptTopic": dlp_CustomPromptTopic,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -112,24 +122,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_custom_prompt_topics_delete",
+    name: "zeroTrust_dlp_customPromptTopics_delete",
     title: "Delete custom prompt topic",
-    description: "Deletes a DLP custom prompt topic entry.",
+    description: "Deletes a DLP custom prompt topic entry.\n\nDELETE /accounts/{account_id}/dlp/custom_prompt_topics/{entry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "entry_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "entry_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "entry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "entry_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -146,9 +166,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -190,10 +210,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -201,24 +221,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_custom_prompt_topics_get",
+    name: "zeroTrust_dlp_customPromptTopics_get",
     title: "Get custom prompt topic",
-    description: "Fetches a DLP custom prompt topic entry by ID.",
+    description: "Fetches a DLP custom prompt topic entry by ID.\n\nGET /accounts/{account_id}/dlp/custom_prompt_topics/{entry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "entry_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "entry_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "entry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "entry_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -235,9 +265,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_CustomPromptTopic": dlp_CustomPromptTopic_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomPromptTopic": dlp_CustomPromptTopic,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -277,10 +307,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_CustomPromptTopic": dlp_CustomPromptTopic_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomPromptTopic": dlp_CustomPromptTopic,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -288,19 +318,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_custom_prompt_topics_list",
+    name: "zeroTrust_dlp_customPromptTopics_list",
     title: "List custom prompt topics",
-    description: "Lists all DLP custom prompt topic entries in an account.",
+    description: "Lists all DLP custom prompt topic entries in an account.\n\nGET /accounts/{account_id}/dlp/custom_prompt_topics",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -320,9 +360,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_CustomPromptTopic": dlp_CustomPromptTopic_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomPromptTopic": dlp_CustomPromptTopic,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -365,10 +405,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_CustomPromptTopic": dlp_CustomPromptTopic_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomPromptTopic": dlp_CustomPromptTopic,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -376,29 +416,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_custom_prompt_topics_update",
+    name: "zeroTrust_dlp_customPromptTopics_update",
     title: "Update custom prompt topic",
-    description: "Updates a DLP custom prompt topic entry.",
+    description: "Updates a DLP custom prompt topic entry.\n\nPUT /accounts/{account_id}/dlp/custom_prompt_topics/{entry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_CustomPromptTopicUpdate",
           "description": "Update to be applied to the custom prompt topic."
         },
-        "entry_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "entry_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "entry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "entry_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_CustomPromptTopicUpdate": dlp_CustomPromptTopicUpdate,
       },
@@ -418,9 +468,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_CustomPromptTopic": dlp_CustomPromptTopic_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomPromptTopic": dlp_CustomPromptTopic,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -462,10 +512,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_CustomPromptTopic": dlp_CustomPromptTopic_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomPromptTopic": dlp_CustomPromptTopic,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/dataClasses/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/dataClasses/outputs.ts
index 1ffb03aee..4812f9ccc 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/dataClasses/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/dataClasses/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_DataClass` in responses.
  */
-export const dlp_DataClass_output: JsonSchema = {
+export const dlp_DataClass: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -65,7 +65,7 @@ export const dlp_DataClass_output: JsonSchema = {
 /**
  * The schema of `dlp_DataClassArray` in responses.
  */
-export const dlp_DataClassArray_output: JsonSchema = {
+export const dlp_DataClassArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_DataClass"
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/dataClasses/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/dataClasses/tools.ts
index 18f50fa1d..f7afa5de2 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/dataClasses/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/dataClasses/tools.ts
@@ -3,42 +3,52 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_SensitivityLevelRef_output } from "../outputs.js";
-import { dlp_SensitivityLevelRef } from "../schemas.js";
-import { dlp_DataClassArray_output, dlp_DataClass_output } from "./outputs.js";
+import { dlp_SensitivityLevelRef } from "../outputs.js";
+import { dlp_SensitivityLevelRef as dlp_SensitivityLevelRef$ } from "../schemas.js";
+import { dlp_DataClass, dlp_DataClassArray } from "./outputs.js";
 import { dlp_DataClassUpdate, dlp_NewDataClass } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.data_classes`.
+ * The tools of `zeroTrust.dlp.dataClasses`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_data_classes_create",
+    name: "zeroTrust_dlp_dataClasses_create",
     title: "Creates a new data class",
-    description: "Creates a data class for use in DLP profiles.",
+    description: "Creates a data class for use in DLP profiles.\n\nPOST /accounts/{account_id}/dlp/data_classes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewDataClass",
           "description": "Attributes of the new data class."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewDataClass": dlp_NewDataClass,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef$,
       },
     },
     outputSchema: {
@@ -56,10 +66,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataClass": dlp_DataClass_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataClass": dlp_DataClass,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -98,11 +108,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataClass": dlp_DataClass_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataClass": dlp_DataClass,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -111,24 +121,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_classes_delete",
+    name: "zeroTrust_dlp_dataClasses_delete",
     title: "Delete a single data class",
-    description: "Deletes a data class from the account.",
+    description: "Deletes a data class from the account.\n\nDELETE /accounts/{account_id}/dlp/data_classes/{data_class_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "data_class_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "data_class_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "data_class_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "data_class_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -145,9 +165,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -186,10 +206,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -197,24 +217,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_classes_get",
+    name: "zeroTrust_dlp_dataClasses_get",
     title: "Retrieve a specific data class",
-    description: "Gets the configuration for a data class.",
+    description: "Gets the configuration for a data class.\n\nGET /accounts/{account_id}/dlp/data_classes/{data_class_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "data_class_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "data_class_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "data_class_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "data_class_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -231,10 +261,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataClass": dlp_DataClass_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataClass": dlp_DataClass,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -274,11 +304,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataClass": dlp_DataClass_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataClass": dlp_DataClass,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -286,19 +316,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_classes_list",
+    name: "zeroTrust_dlp_dataClasses_list",
     title: "Retrieve all data classes in an account",
-    description: "Lists data classes configured for the account.",
+    description: "Lists data classes configured for the account.\n\nGET /accounts/{account_id}/dlp/data_classes",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -315,11 +355,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataClass": dlp_DataClass_output,
-        "dlp_DataClassArray": dlp_DataClassArray_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataClass": dlp_DataClass,
+        "dlp_DataClassArray": dlp_DataClassArray,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -359,12 +399,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataClass": dlp_DataClass_output,
-        "dlp_DataClassArray": dlp_DataClassArray_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataClass": dlp_DataClass,
+        "dlp_DataClassArray": dlp_DataClassArray,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -372,32 +412,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_classes_update",
+    name: "zeroTrust_dlp_dataClasses_update",
     title: "Update the attributes of a single data class",
-    description: "Updates the configuration for a data class.",
+    description: "Updates the configuration for a data class.\n\nPUT /accounts/{account_id}/dlp/data_classes/{data_class_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_DataClassUpdate",
           "description": "Attributes of the data class to update."
         },
-        "data_class_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "data_class_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "data_class_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "data_class_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_DataClassUpdate": dlp_DataClassUpdate,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef$,
       },
     },
     outputSchema: {
@@ -415,10 +465,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataClass": dlp_DataClass_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataClass": dlp_DataClass,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -457,11 +507,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataClass": dlp_DataClass_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataClass": dlp_DataClass,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategories/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategories/outputs.ts
index 5bf76901f..98046610c 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategories/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategories/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_DataTagCategory` in responses.
  */
-export const dlp_DataTagCategory_output: JsonSchema = {
+export const dlp_DataTagCategory: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -64,7 +64,7 @@ export const dlp_DataTagCategory_output: JsonSchema = {
 /**
  * The schema of `dlp_DataTagCategoryArray` in responses.
  */
-export const dlp_DataTagCategoryArray_output: JsonSchema = {
+export const dlp_DataTagCategoryArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_DataTagCategory"
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategories/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategories/tools.ts
index a101ea8ed..8fd5718e4 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategories/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategories/tools.ts
@@ -3,17 +3,14 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_DataTag_output } from "../outputs.js";
+import { dlp_DataTag } from "../outputs.js";
 import { dlp_DataTagUpdate, dlp_NewDataTag } from "../schemas.js";
-import {
-  dlp_DataTagCategoryArray_output,
-  dlp_DataTagCategory_output,
-} from "./outputs.js";
+import { dlp_DataTagCategory, dlp_DataTagCategoryArray } from "./outputs.js";
 import {
   dlp_DataTagCategoryTagUpdate,
   dlp_DataTagCategoryUpdate,
@@ -21,28 +18,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.data_tag_categories`.
+ * The tools of `zeroTrust.dlp.dataTagCategories`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_data_tag_categories_create",
+    name: "zeroTrust_dlp_dataTagCategories_create",
     title: "Creates a new data tag category.",
-    description: "Creates a data tag category, optionally from a template.",
+    description: "Creates a data tag category, optionally from a template.\n\nPOST /accounts/{account_id}/dlp/data_tag_categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewDataTagCategory",
           "description": "Attributes of the new data tag category."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewDataTag": dlp_NewDataTag,
         "dlp_NewDataTagCategory": dlp_NewDataTagCategory,
@@ -63,10 +70,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagCategory": dlp_DataTagCategory_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagCategory": dlp_DataTagCategory,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -105,11 +112,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagCategory": dlp_DataTagCategory_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagCategory": dlp_DataTagCategory,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -118,24 +125,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tag_categories_delete",
+    name: "zeroTrust_dlp_dataTagCategories_delete",
     title: "Delete a single data tag category.",
-    description: "Deletes a data tag category and its tags.",
+    description: "Deletes a data tag category and its tags.\n\nDELETE /accounts/{account_id}/dlp/data_tag_categories/{category_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "category_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "category_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -152,9 +169,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -193,10 +210,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -204,24 +221,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tag_categories_get",
+    name: "zeroTrust_dlp_dataTagCategories_get",
     title: "Retrieve a specific data tag category.",
-    description: "Gets a data tag category and its tags.",
+    description: "Gets a data tag category and its tags.\n\nGET /accounts/{account_id}/dlp/data_tag_categories/{category_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "category_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "category_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -238,10 +265,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagCategory": dlp_DataTagCategory_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagCategory": dlp_DataTagCategory,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -281,11 +308,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagCategory": dlp_DataTagCategory_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagCategory": dlp_DataTagCategory,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -293,19 +320,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tag_categories_list",
+    name: "zeroTrust_dlp_dataTagCategories_list",
     title: "Retrieve all data tag categories in an account",
-    description: "Lists data tag categories configured for the account.",
+    description: "Lists data tag categories configured for the account.\n\nGET /accounts/{account_id}/dlp/data_tag_categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -322,11 +359,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagCategory": dlp_DataTagCategory_output,
-        "dlp_DataTagCategoryArray": dlp_DataTagCategoryArray_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagCategory": dlp_DataTagCategory,
+        "dlp_DataTagCategoryArray": dlp_DataTagCategoryArray,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -366,12 +403,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagCategory": dlp_DataTagCategory_output,
-        "dlp_DataTagCategoryArray": dlp_DataTagCategoryArray_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagCategory": dlp_DataTagCategory,
+        "dlp_DataTagCategoryArray": dlp_DataTagCategoryArray,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -379,29 +416,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tag_categories_update",
+    name: "zeroTrust_dlp_dataTagCategories_update",
     title: "Update the attributes of a single data tag category.",
-    description: "Updates a data tag category and its tags.",
+    description: "Updates a data tag category and its tags.\n\nPUT /accounts/{account_id}/dlp/data_tag_categories/{category_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_DataTagCategoryUpdate",
           "description": "Attributes of the data tag category to update."
         },
-        "category_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "category_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_DataTagCategoryTagUpdate": dlp_DataTagCategoryTagUpdate,
         "dlp_DataTagCategoryUpdate": dlp_DataTagCategoryUpdate,
@@ -423,10 +470,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagCategory": dlp_DataTagCategory_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagCategory": dlp_DataTagCategory,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -465,11 +512,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagCategory": dlp_DataTagCategory_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagCategory": dlp_DataTagCategory,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategoryTemplates/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategoryTemplates/outputs.ts
index 4e18655c0..8e3fde3fd 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategoryTemplates/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategoryTemplates/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_DataTagCategoryTemplate` in responses.
  */
-export const dlp_DataTagCategoryTemplate_output: JsonSchema = {
+export const dlp_DataTagCategoryTemplate: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -37,7 +37,7 @@ export const dlp_DataTagCategoryTemplate_output: JsonSchema = {
 /**
  * The schema of `dlp_DataTagCategoryTemplateArray` in responses.
  */
-export const dlp_DataTagCategoryTemplateArray_output: JsonSchema = {
+export const dlp_DataTagCategoryTemplateArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_DataTagCategoryTemplate"
   },
@@ -47,7 +47,7 @@ export const dlp_DataTagCategoryTemplateArray_output: JsonSchema = {
 /**
  * The schema of `dlp_DataTagTemplate` in responses.
  */
-export const dlp_DataTagTemplate_output: JsonSchema = {
+export const dlp_DataTagTemplate: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategoryTemplates/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategoryTemplates/tools.ts
index e2ccb2ac1..5f51f4e0a 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategoryTemplates/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/dataTagCategoryTemplates/tools.ts
@@ -3,39 +3,49 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
 import {
-  dlp_DataTagCategoryTemplateArray_output,
-  dlp_DataTagCategoryTemplate_output,
-  dlp_DataTagTemplate_output,
+  dlp_DataTagCategoryTemplate,
+  dlp_DataTagCategoryTemplateArray,
+  dlp_DataTagTemplate,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dlp.data_tag_category_templates`.
+ * The tools of `zeroTrust.dlp.dataTagCategoryTemplates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_data_tag_category_templates_get",
+    name: "zeroTrust_dlp_dataTagCategoryTemplates_get",
     title: "Retrieve a specific data tag category template.",
-    description: "Gets an available data tag category template.",
+    description: "Gets an available data tag category template.\n\nGET /accounts/{account_id}/dlp/data_tag_category_templates/{template_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "template_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "template_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "template_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "template_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -52,10 +62,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTagCategoryTemplate": dlp_DataTagCategoryTemplate_output,
-        "dlp_DataTagTemplate": dlp_DataTagTemplate_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTagCategoryTemplate": dlp_DataTagCategoryTemplate,
+        "dlp_DataTagTemplate": dlp_DataTagTemplate,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -98,11 +108,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTagCategoryTemplate": dlp_DataTagCategoryTemplate_output,
-        "dlp_DataTagTemplate": dlp_DataTagTemplate_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTagCategoryTemplate": dlp_DataTagCategoryTemplate,
+        "dlp_DataTagTemplate": dlp_DataTagTemplate,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -110,19 +120,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tag_category_templates_list",
+    name: "zeroTrust_dlp_dataTagCategoryTemplates_list",
     title: "Retrieve all data tag category templates in an account",
-    description: "Lists available data tag category templates.",
+    description: "Lists available data tag category templates.\n\nGET /accounts/{account_id}/dlp/data_tag_category_templates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -139,11 +159,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTagCategoryTemplate": dlp_DataTagCategoryTemplate_output,
-        "dlp_DataTagCategoryTemplateArray": dlp_DataTagCategoryTemplateArray_output,
-        "dlp_DataTagTemplate": dlp_DataTagTemplate_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTagCategoryTemplate": dlp_DataTagCategoryTemplate,
+        "dlp_DataTagCategoryTemplateArray": dlp_DataTagCategoryTemplateArray,
+        "dlp_DataTagTemplate": dlp_DataTagTemplate,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -186,12 +206,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTagCategoryTemplate": dlp_DataTagCategoryTemplate_output,
-        "dlp_DataTagCategoryTemplateArray": dlp_DataTagCategoryTemplateArray_output,
-        "dlp_DataTagTemplate": dlp_DataTagTemplate_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTagCategoryTemplate": dlp_DataTagCategoryTemplate,
+        "dlp_DataTagCategoryTemplateArray": dlp_DataTagCategoryTemplateArray,
+        "dlp_DataTagTemplate": dlp_DataTagTemplate,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/dataTags/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/dataTags/outputs.ts
index 20fe1fa0a..1f005aadf 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/dataTags/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/dataTags/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_DataTagArray` in responses.
  */
-export const dlp_DataTagArray_output: JsonSchema = {
+export const dlp_DataTagArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_DataTag"
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/dataTags/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/dataTags/tools.ts
index 84d254887..a53df1ba3 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/dataTags/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/dataTags/tools.ts
@@ -3,43 +3,53 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_DataTag_output } from "../outputs.js";
+import { dlp_DataTag } from "../outputs.js";
 import { dlp_DataTagUpdate, dlp_NewDataTag } from "../schemas.js";
-import { dlp_DataTagArray_output } from "./outputs.js";
+import { dlp_DataTagArray } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dlp.data_tags`.
+ * The tools of `zeroTrust.dlp.dataTags`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_data_tags_create",
+    name: "zeroTrust_dlp_dataTags_create",
     title: "Creates a new data tag.",
-    description: "Creates a data tag in a category.",
+    description: "Creates a data tag in a category.\n\nPOST /accounts/{account_id}/dlp/data_tag_categories/{category_id}/data_tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewDataTag",
           "description": "Attributes of the new data tag."
         },
-        "category_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "category_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewDataTag": dlp_NewDataTag,
       },
@@ -59,9 +69,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -100,10 +110,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -112,29 +122,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tags_delete",
+    name: "zeroTrust_dlp_dataTags_delete",
     title: "Delete a single data tag.",
-    description: "Deletes a data tag from a category.",
+    description: "Deletes a data tag from a category.\n\nDELETE /accounts/{account_id}/dlp/data_tag_categories/{category_id}/data_tags/{tag_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "category_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "tag_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "category_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "tag_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id",
+            "tag_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id",
-        "tag_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -151,9 +171,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -192,10 +212,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -203,29 +223,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tags_get",
+    name: "zeroTrust_dlp_dataTags_get",
     title: "Retrieve a specific data tag.",
-    description: "Gets a data tag from a category.",
+    description: "Gets a data tag from a category.\n\nGET /accounts/{account_id}/dlp/data_tag_categories/{category_id}/data_tags/{tag_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "category_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "tag_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "category_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "tag_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id",
+            "tag_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id",
-        "tag_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -242,9 +272,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -284,10 +314,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -295,24 +325,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tags_list",
+    name: "zeroTrust_dlp_dataTags_list",
     title: "Retrieve all data tags in a data tag category",
-    description: "Lists data tags in a category.",
+    description: "Lists data tags in a category.\n\nGET /accounts/{account_id}/dlp/data_tag_categories/{category_id}/data_tags",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "category_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "category_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -329,10 +369,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagArray": dlp_DataTagArray_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagArray": dlp_DataTagArray,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -372,11 +412,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_DataTagArray": dlp_DataTagArray_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_DataTagArray": dlp_DataTagArray,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -384,34 +424,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_data_tags_update",
+    name: "zeroTrust_dlp_dataTags_update",
     title: "Update the attributes of a single data tag.",
-    description: "Updates a data tag in a category.",
+    description: "Updates a data tag in a category.\n\nPUT /accounts/{account_id}/dlp/data_tag_categories/{category_id}/data_tags/{tag_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_DataTagUpdate",
           "description": "Attributes of the data tag to update."
         },
-        "category_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "tag_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "category_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "tag_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "category_id",
+            "tag_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "category_id",
-        "tag_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_DataTagUpdate": dlp_DataTagUpdate,
       },
@@ -431,9 +481,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -472,10 +522,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DataTag": dlp_DataTag_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DataTag": dlp_DataTag,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/datasets/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/datasets/outputs.ts
index f5e84eac6..dc119ab2c 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/datasets/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/datasets/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_Dataset` in responses.
  */
-export const dlp_Dataset_output: JsonSchema = {
+export const dlp_Dataset: JsonSchema = {
   "properties": {
     "case_sensitive": {
       "type": "boolean"
@@ -48,7 +48,15 @@ export const dlp_Dataset_output: JsonSchema = {
       "type": "boolean"
     },
     "status": {
-      "$ref": "#/$defs/dlp_DatasetUploadStatus"
+      "enum": [
+        "empty",
+        "uploading",
+        "pending",
+        "processing",
+        "failed",
+        "complete"
+      ],
+      "type": "string"
     },
     "updated_at": {
       "format": "date-time",
@@ -79,7 +87,7 @@ export const dlp_Dataset_output: JsonSchema = {
 /**
  * The schema of `dlp_DatasetArray` in responses.
  */
-export const dlp_DatasetArray_output: JsonSchema = {
+export const dlp_DatasetArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_Dataset"
   },
@@ -89,7 +97,7 @@ export const dlp_DatasetArray_output: JsonSchema = {
 /**
  * The schema of `dlp_DatasetColumn` in responses.
  */
-export const dlp_DatasetColumn_output: JsonSchema = {
+export const dlp_DatasetColumn: JsonSchema = {
   "properties": {
     "entry_id": {
       "format": "uuid",
@@ -102,7 +110,15 @@ export const dlp_DatasetColumn_output: JsonSchema = {
       "type": "integer"
     },
     "upload_status": {
-      "$ref": "#/$defs/dlp_DatasetUploadStatus"
+      "enum": [
+        "empty",
+        "uploading",
+        "pending",
+        "processing",
+        "failed",
+        "complete"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -117,7 +133,7 @@ export const dlp_DatasetColumn_output: JsonSchema = {
 /**
  * The schema of `dlp_DatasetCreation` in responses.
  */
-export const dlp_DatasetCreation_output: JsonSchema = {
+export const dlp_DatasetCreation: JsonSchema = {
   "properties": {
     "dataset": {
       "$ref": "#/$defs/dlp_Dataset"
@@ -147,7 +163,7 @@ export const dlp_DatasetCreation_output: JsonSchema = {
 /**
  * The schema of `dlp_DatasetNewVersion` in responses.
  */
-export const dlp_DatasetNewVersion_output: JsonSchema = {
+export const dlp_DatasetNewVersion: JsonSchema = {
   "properties": {
     "case_sensitive": {
       "type": "boolean"
@@ -182,13 +198,21 @@ export const dlp_DatasetNewVersion_output: JsonSchema = {
 /**
  * The schema of `dlp_DatasetUpload` in responses.
  */
-export const dlp_DatasetUpload_output: JsonSchema = {
+export const dlp_DatasetUpload: JsonSchema = {
   "properties": {
     "num_cells": {
       "type": "integer"
     },
     "status": {
-      "$ref": "#/$defs/dlp_DatasetUploadStatus"
+      "enum": [
+        "empty",
+        "uploading",
+        "pending",
+        "processing",
+        "failed",
+        "complete"
+      ],
+      "type": "string"
     },
     "version": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/datasets/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/datasets/tools.ts
index 9a1a3f599..4866202d6 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/datasets/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/datasets/tools.ts
@@ -3,44 +3,53 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_DatasetUploadStatus_output } from "../outputs.js";
 import {
-  dlp_DatasetArray_output,
-  dlp_DatasetColumn_output,
-  dlp_DatasetCreation_output,
-  dlp_DatasetNewVersion_output,
-  dlp_DatasetUpload_output,
-  dlp_Dataset_output,
+  dlp_Dataset,
+  dlp_DatasetArray,
+  dlp_DatasetColumn,
+  dlp_DatasetCreation,
+  dlp_DatasetNewVersion,
+  dlp_DatasetUpload,
 } from "./outputs.js";
 import { dlp_DatasetUpdate, dlp_NewDataset } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.datasets`.
+ * The tools of `zeroTrust.dlp.datasets`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_datasets_create",
+    name: "zeroTrust_dlp_datasets_create",
     title: "Create a new dataset",
-    description: "Creates a new DLP (Data Loss Prevention) dataset for storing custom detection patterns. Datasets can contain exact match data, word lists, or EDM (Exact Data Match) configurations.",
+    description: "Creates a new DLP (Data Loss Prevention) dataset for storing custom detection patterns. Datasets can contain exact match data, word lists, or EDM (Exact Data Match) configurations.\n\nPOST /accounts/{account_id}/dlp/datasets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewDataset",
           "description": "Dataset description."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewDataset": dlp_NewDataset,
       },
@@ -60,13 +69,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Dataset": dlp_Dataset_output,
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetCreation": dlp_DatasetCreation_output,
-        "dlp_DatasetUpload": dlp_DatasetUpload_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Dataset": dlp_Dataset,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetCreation": dlp_DatasetCreation,
+        "dlp_DatasetUpload": dlp_DatasetUpload,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -105,14 +113,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Dataset": dlp_Dataset_output,
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetCreation": dlp_DatasetCreation_output,
-        "dlp_DatasetUpload": dlp_DatasetUpload_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Dataset": dlp_Dataset,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetCreation": dlp_DatasetCreation,
+        "dlp_DatasetUpload": dlp_DatasetUpload,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -121,24 +128,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_datasets_delete",
+    name: "zeroTrust_dlp_datasets_delete",
     title: "Delete a dataset",
-    description: "This deletes all versions of the dataset.",
+    description: "This deletes all versions of the dataset.\n\nDELETE /accounts/{account_id}/dlp/datasets/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "dataset_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "dataset_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -162,8 +179,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -171,24 +188,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_datasets_get",
+    name: "zeroTrust_dlp_datasets_get",
     title: "Fetch a specific dataset",
-    description: "Gets a dataset and its latest upload status.",
+    description: "Gets a dataset and its latest upload status.\n\nGET /accounts/{account_id}/dlp/datasets/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "dataset_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "dataset_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -205,12 +232,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Dataset": dlp_Dataset_output,
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetUpload": dlp_DatasetUpload_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Dataset": dlp_Dataset,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetUpload": dlp_DatasetUpload,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -250,13 +276,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Dataset": dlp_Dataset_output,
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetUpload": dlp_DatasetUpload_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Dataset": dlp_Dataset,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetUpload": dlp_DatasetUpload,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -264,19 +289,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_datasets_list",
+    name: "zeroTrust_dlp_datasets_list",
     title: "Fetch all datasets",
-    description: "Lists all DLP datasets configured for the account, including custom word lists and EDM datasets.",
+    description: "Lists all DLP datasets configured for the account, including custom word lists and EDM datasets.\n\nGET /accounts/{account_id}/dlp/datasets",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -293,13 +328,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Dataset": dlp_Dataset_output,
-        "dlp_DatasetArray": dlp_DatasetArray_output,
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetUpload": dlp_DatasetUpload_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Dataset": dlp_Dataset,
+        "dlp_DatasetArray": dlp_DatasetArray,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetUpload": dlp_DatasetUpload,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -339,14 +373,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Dataset": dlp_Dataset_output,
-        "dlp_DatasetArray": dlp_DatasetArray_output,
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetUpload": dlp_DatasetUpload_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Dataset": dlp_Dataset,
+        "dlp_DatasetArray": dlp_DatasetArray,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetUpload": dlp_DatasetUpload,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -354,24 +387,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_datasets_prepare_upload",
+    name: "zeroTrust_dlp_datasets_prepareUpload",
     title: "Prepare to upload a new version of a dataset",
-    description: "Creates a new version of a DLP dataset, allowing you to stage changes before activation. Used for single-column EDM and custom word lists.",
+    description: "Creates a new version of a DLP dataset, allowing you to stage changes before activation. Used for single-column EDM and custom word lists.\n\nPOST /accounts/{account_id}/dlp/datasets/{dataset_id}/upload",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "dataset_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "dataset_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -388,11 +431,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetNewVersion": dlp_DatasetNewVersion_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetNewVersion": dlp_DatasetNewVersion,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -431,12 +473,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetNewVersion": dlp_DatasetNewVersion_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetNewVersion": dlp_DatasetNewVersion,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -444,29 +485,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_datasets_update",
+    name: "zeroTrust_dlp_datasets_update",
     title: "Update details about a dataset",
-    description: "Updates the configuration of an existing DLP dataset, such as its name, description, or detection settings.",
+    description: "Updates the configuration of an existing DLP dataset, such as its name, description, or detection settings.\n\nPUT /accounts/{account_id}/dlp/datasets/{dataset_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_DatasetUpdate",
           "description": "Dataset description."
         },
-        "dataset_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "dataset_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "dataset_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "dataset_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_DatasetUpdate": dlp_DatasetUpdate,
       },
@@ -486,12 +537,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Dataset": dlp_Dataset_output,
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetUpload": dlp_DatasetUpload_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Dataset": dlp_Dataset,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetUpload": dlp_DatasetUpload,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -530,13 +580,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Dataset": dlp_Dataset_output,
-        "dlp_DatasetColumn": dlp_DatasetColumn_output,
-        "dlp_DatasetUpload": dlp_DatasetUpload_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Dataset": dlp_Dataset,
+        "dlp_DatasetColumn": dlp_DatasetColumn,
+        "dlp_DatasetUpload": dlp_DatasetUpload,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/documentFingerprints/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/documentFingerprints/outputs.ts
index 4ef02622b..922660566 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/documentFingerprints/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/documentFingerprints/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_DocumentFingerprint` in responses.
  */
-export const dlp_DocumentFingerprint_output: JsonSchema = {
+export const dlp_DocumentFingerprint: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -40,7 +40,15 @@ export const dlp_DocumentFingerprint_output: JsonSchema = {
       "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/dlp_DatasetUploadStatus"
+      "enum": [
+        "empty",
+        "uploading",
+        "pending",
+        "processing",
+        "failed",
+        "complete"
+      ],
+      "type": "string"
     },
     "updated_at": {
       "format": "date-time",
@@ -73,7 +81,7 @@ export const dlp_DocumentFingerprint_output: JsonSchema = {
 /**
  * The schema of `dlp_DocumentFingerprintArray` in responses.
  */
-export const dlp_DocumentFingerprintArray_output: JsonSchema = {
+export const dlp_DocumentFingerprintArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_DocumentFingerprint"
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/documentFingerprints/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/documentFingerprints/tools.ts
index ba6c3e154..a78fa310d 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/documentFingerprints/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/documentFingerprints/tools.ts
@@ -3,14 +3,13 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_DatasetUploadStatus_output } from "../outputs.js";
 import {
-  dlp_DocumentFingerprintArray_output,
-  dlp_DocumentFingerprint_output,
+  dlp_DocumentFingerprint,
+  dlp_DocumentFingerprintArray,
 } from "./outputs.js";
 import {
   dlp_NewDocumentFingerprint,
@@ -18,28 +17,38 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.document_fingerprints`.
+ * The tools of `zeroTrust.dlp.documentFingerprints`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_document_fingerprints_create",
+    name: "zeroTrust_dlp_documentFingerprints_create",
     title: "Creates a new document fingerprint.",
-    description: "Creates a new document fingerprint for DLP scanning. Document fingerprints detect documents that are structurally similar to the uploaded sample.",
+    description: "Creates a new document fingerprint for DLP scanning. Document fingerprints detect documents that are structurally similar to the uploaded sample.\n\nPOST /accounts/{account_id}/dlp/document_fingerprints",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewDocumentFingerprint",
           "description": "Attributes of the new document fingerprint."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewDocumentFingerprint": dlp_NewDocumentFingerprint,
       },
@@ -59,10 +68,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprint": dlp_DocumentFingerprint_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DocumentFingerprint": dlp_DocumentFingerprint,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -101,11 +109,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprint": dlp_DocumentFingerprint_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DocumentFingerprint": dlp_DocumentFingerprint,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -114,24 +121,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_document_fingerprints_delete",
+    name: "zeroTrust_dlp_documentFingerprints_delete",
     title: "Delete a single document fingerprint.",
-    description: "Removes a document fingerprint from DLP configuration. Documents matching this fingerprint will no longer be detected.",
+    description: "Removes a document fingerprint from DLP configuration. Documents matching this fingerprint will no longer be detected.\n\nDELETE /accounts/{account_id}/dlp/document_fingerprints/{document_fingerprint_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "document_fingerprint_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "document_fingerprint_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "document_fingerprint_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "document_fingerprint_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -155,8 +172,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -164,24 +181,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_document_fingerprints_get",
+    name: "zeroTrust_dlp_documentFingerprints_get",
     title: "Retrieve data about a specific document fingerprint.",
-    description: "Gets a document fingerprint and its latest upload status.",
+    description: "Gets a document fingerprint and its latest upload status.\n\nGET /accounts/{account_id}/dlp/document_fingerprints/{document_fingerprint_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "document_fingerprint_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "document_fingerprint_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "document_fingerprint_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "document_fingerprint_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -198,10 +225,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprint": dlp_DocumentFingerprint_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DocumentFingerprint": dlp_DocumentFingerprint,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -241,11 +267,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprint": dlp_DocumentFingerprint_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DocumentFingerprint": dlp_DocumentFingerprint,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -253,19 +278,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_document_fingerprints_list",
+    name: "zeroTrust_dlp_documentFingerprints_list",
     title: "Retrieve data about all document fingerprints.",
-    description: "Lists all document fingerprints configured for DLP scanning in the account.",
+    description: "Lists all document fingerprints configured for DLP scanning in the account.\n\nGET /accounts/{account_id}/dlp/document_fingerprints",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -282,11 +317,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprint": dlp_DocumentFingerprint_output,
-        "dlp_DocumentFingerprintArray": dlp_DocumentFingerprintArray_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DocumentFingerprint": dlp_DocumentFingerprint,
+        "dlp_DocumentFingerprintArray": dlp_DocumentFingerprintArray,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -326,12 +360,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprint": dlp_DocumentFingerprint_output,
-        "dlp_DocumentFingerprintArray": dlp_DocumentFingerprintArray_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DocumentFingerprint": dlp_DocumentFingerprint,
+        "dlp_DocumentFingerprintArray": dlp_DocumentFingerprintArray,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -339,29 +372,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_document_fingerprints_update",
+    name: "zeroTrust_dlp_documentFingerprints_update",
     title: "Update the attributes of a single document fingerprint.",
-    description: "Updates metadata for an existing document fingerprint, such as its name or description.",
+    description: "Updates metadata for an existing document fingerprint, such as its name or description.\n\nPOST /accounts/{account_id}/dlp/document_fingerprints/{document_fingerprint_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_UpdateDocumentFingerprint",
           "description": "Attributes of the document fingerprint to update."
         },
-        "document_fingerprint_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "document_fingerprint_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "document_fingerprint_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "document_fingerprint_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_UpdateDocumentFingerprint": dlp_UpdateDocumentFingerprint,
       },
@@ -381,10 +424,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprint": dlp_DocumentFingerprint_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DocumentFingerprint": dlp_DocumentFingerprint,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -423,11 +465,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprint": dlp_DocumentFingerprint_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DocumentFingerprint": dlp_DocumentFingerprint,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/email/accountMapping/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/email/accountMapping/outputs.ts
index 37f241dce..0cc5b9551 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/email/accountMapping/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/email/accountMapping/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `dlp_AddinAccountMapping` in responses.
  */
-export const dlp_AddinAccountMapping_output: JsonSchema = {
+export const dlp_AddinAccountMapping: JsonSchema = {
   "properties": {
     "addin_identifier_token": {
       "format": "uuid",
@@ -26,7 +26,7 @@ export const dlp_AddinAccountMapping_output: JsonSchema = {
 /**
  * The schema of `dlp_AddinAuth` in responses.
  */
-export const dlp_AddinAuth_output: JsonSchema = {
+export const dlp_AddinAuth: JsonSchema = {
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/email/accountMapping/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/email/accountMapping/tools.ts
index f06497df5..2ad0d0447 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/email/accountMapping/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/email/accountMapping/tools.ts
@@ -3,41 +3,51 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../../outputs.js";
+import { dlp_AddinAccountMapping, dlp_AddinAuth } from "./outputs.js";
 import {
-  dlp_AddinAccountMapping_output,
-  dlp_AddinAuth_output,
-} from "./outputs.js";
-import { dlp_AddinAuth, dlp_UpdateAddinAccountMapping } from "./schemas.js";
+  dlp_AddinAuth as dlp_AddinAuth$,
+  dlp_UpdateAddinAccountMapping,
+} from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.email.account_mapping`.
+ * The tools of `zeroTrust.dlp.email.accountMapping`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_email_account_mapping_create",
+    name: "zeroTrust_dlp_email_accountMapping_create",
     title: "Create mapping",
-    description: "Creates a mapping between a Cloudflare account and an email provider for DLP email scanning integration.",
+    description: "Creates a mapping between a Cloudflare account and an email provider for DLP email scanning integration.\n\nPOST /accounts/{account_id}/dlp/email/account_mapping",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_UpdateAddinAccountMapping",
           "description": "Account mapping."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_AddinAuth": dlp_AddinAuth,
+        "dlp_AddinAuth": dlp_AddinAuth$,
         "dlp_UpdateAddinAccountMapping": dlp_UpdateAddinAccountMapping,
       },
     },
@@ -56,10 +66,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AddinAccountMapping": dlp_AddinAccountMapping_output,
-        "dlp_AddinAuth": dlp_AddinAuth_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AddinAccountMapping": dlp_AddinAccountMapping,
+        "dlp_AddinAuth": dlp_AddinAuth,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -98,11 +108,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AddinAccountMapping": dlp_AddinAccountMapping_output,
-        "dlp_AddinAuth": dlp_AddinAuth_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AddinAccountMapping": dlp_AddinAccountMapping,
+        "dlp_AddinAuth": dlp_AddinAuth,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -111,19 +121,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_email_account_mapping_get",
+    name: "zeroTrust_dlp_email_accountMapping_get",
     title: "Get mapping",
-    description: "Retrieves the email provider mapping configuration for DLP email scanning.",
+    description: "Retrieves the email provider mapping configuration for DLP email scanning.\n\nGET /accounts/{account_id}/dlp/email/account_mapping",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -140,10 +160,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AddinAccountMapping": dlp_AddinAccountMapping_output,
-        "dlp_AddinAuth": dlp_AddinAuth_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AddinAccountMapping": dlp_AddinAccountMapping,
+        "dlp_AddinAuth": dlp_AddinAuth,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -183,11 +203,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AddinAccountMapping": dlp_AddinAccountMapping_output,
-        "dlp_AddinAuth": dlp_AddinAuth_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AddinAccountMapping": dlp_AddinAccountMapping,
+        "dlp_AddinAuth": dlp_AddinAuth,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/email/rules/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/email/rules/outputs.ts
index 5896e1549..c15c8e96d 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/email/rules/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/email/rules/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `dlp_EmailRule` in responses.
  */
-export const dlp_EmailRule_output: JsonSchema = {
+export const dlp_EmailRule: JsonSchema = {
   "properties": {
     "action": {
       "$ref": "#/$defs/dlp_EmailRuleAction"
@@ -65,7 +65,7 @@ export const dlp_EmailRule_output: JsonSchema = {
 /**
  * The schema of `dlp_EmailRuleAction` in responses.
  */
-export const dlp_EmailRuleAction_output: JsonSchema = {
+export const dlp_EmailRuleAction: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -93,7 +93,7 @@ export const dlp_EmailRuleAction_output: JsonSchema = {
 /**
  * The schema of `dlp_EmailRuleArray` in responses.
  */
-export const dlp_EmailRuleArray_output: JsonSchema = {
+export const dlp_EmailRuleArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_EmailRule"
   },
@@ -103,13 +103,24 @@ export const dlp_EmailRuleArray_output: JsonSchema = {
 /**
  * The schema of `dlp_EmailRuleCondition` in responses.
  */
-export const dlp_EmailRuleCondition_output: JsonSchema = {
+export const dlp_EmailRuleCondition: JsonSchema = {
   "properties": {
     "operator": {
-      "$ref": "#/$defs/dlp_EmailRuleOperator"
+      "enum": [
+        "InList",
+        "NotInList",
+        "MatchRegex",
+        "NotMatchRegex"
+      ],
+      "type": "string"
     },
     "selector": {
-      "$ref": "#/$defs/dlp_EmailRuleSelector"
+      "enum": [
+        "Recipients",
+        "Sender",
+        "DLPProfiles"
+      ],
+      "type": "string"
     },
     "value": {
       "$ref": "#/$defs/dlp_EmailRuleValue"
@@ -123,35 +134,10 @@ export const dlp_EmailRuleCondition_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_EmailRuleOperator` in responses.
- */
-export const dlp_EmailRuleOperator_output: JsonSchema = {
-  "enum": [
-    "InList",
-    "NotInList",
-    "MatchRegex",
-    "NotMatchRegex"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `dlp_EmailRuleSelector` in responses.
- */
-export const dlp_EmailRuleSelector_output: JsonSchema = {
-  "enum": [
-    "Recipients",
-    "Sender",
-    "DLPProfiles"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_EmailRuleValue` in responses.
  */
-export const dlp_EmailRuleValue_output: JsonSchema = {
+export const dlp_EmailRuleValue: JsonSchema = {
   "oneOf": [
     {
       "items": {
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/email/rules/schemas.ts b/src/generated/forge-mcp/zeroTrust/dlp/email/rules/schemas.ts
index 88bb13e53..56698030d 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/email/rules/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/email/rules/schemas.ts
@@ -78,10 +78,21 @@ export const dlp_EmailRuleAction: JsonSchema = {
 export const dlp_EmailRuleCondition: JsonSchema = {
   "properties": {
     "operator": {
-      "$ref": "#/$defs/dlp_EmailRuleOperator"
+      "enum": [
+        "InList",
+        "NotInList",
+        "MatchRegex",
+        "NotMatchRegex"
+      ],
+      "type": "string"
     },
     "selector": {
-      "$ref": "#/$defs/dlp_EmailRuleSelector"
+      "enum": [
+        "Recipients",
+        "Sender",
+        "DLPProfiles"
+      ],
+      "type": "string"
     },
     "value": {
       "$ref": "#/$defs/dlp_EmailRuleValue"
@@ -95,31 +106,6 @@ export const dlp_EmailRuleCondition: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_EmailRuleOperator`.
- */
-export const dlp_EmailRuleOperator: JsonSchema = {
-  "enum": [
-    "InList",
-    "NotInList",
-    "MatchRegex",
-    "NotMatchRegex"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `dlp_EmailRuleSelector`.
- */
-export const dlp_EmailRuleSelector: JsonSchema = {
-  "enum": [
-    "Recipients",
-    "Sender",
-    "DLPProfiles"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_EmailRuleValue`.
  */
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/email/rules/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/email/rules/tools.ts
index 0c6e67a20..94fdf167c 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/email/rules/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/email/rules/tools.ts
@@ -3,52 +3,58 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../../outputs.js";
 import {
-  dlp_EmailRuleAction_output,
-  dlp_EmailRuleArray_output,
-  dlp_EmailRuleCondition_output,
-  dlp_EmailRuleOperator_output,
-  dlp_EmailRuleSelector_output,
-  dlp_EmailRuleValue_output,
-  dlp_EmailRule_output,
-} from "./outputs.js";
-import {
-  dlp_CreateEmailRule,
+  dlp_EmailRule,
   dlp_EmailRuleAction,
+  dlp_EmailRuleArray,
   dlp_EmailRuleCondition,
-  dlp_EmailRuleOperator,
-  dlp_EmailRuleSelector,
   dlp_EmailRuleValue,
+} from "./outputs.js";
+import {
+  dlp_CreateEmailRule,
+  dlp_EmailRuleAction as dlp_EmailRuleAction$,
+  dlp_EmailRuleCondition as dlp_EmailRuleCondition$,
+  dlp_EmailRuleValue as dlp_EmailRuleValue$,
   dlp_UpdateEmailRulePriorities,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.email.rules`.
+ * The tools of `zeroTrust.dlp.email.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_email_rules_bulk_edit",
+    name: "zeroTrust_dlp_email_rules_bulkEdit",
     title: "Update email scanner rule priorities",
-    description: "Reorders DLP email scanning rules by updating their priority values. Higher priority rules are evaluated first.",
+    description: "Reorders DLP email scanning rules by updating their priority values. Higher priority rules are evaluated first.\n\nPATCH /accounts/{account_id}/dlp/email/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_UpdateEmailRulePriorities",
           "description": "Rule priorities."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_UpdateEmailRulePriorities": dlp_UpdateEmailRulePriorities,
       },
@@ -68,14 +74,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -114,15 +118,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -131,31 +133,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_email_rules_create",
+    name: "zeroTrust_dlp_email_rules_create",
     title: "Create email scanner rule",
-    description: "Creates a new DLP email scanning rule that defines what content patterns to detect in email messages and what actions to take.",
+    description: "Creates a new DLP email scanning rule that defines what content patterns to detect in email messages and what actions to take.\n\nPOST /accounts/{account_id}/dlp/email/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_CreateEmailRule",
           "description": "Rule description."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_CreateEmailRule": dlp_CreateEmailRule,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction$,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition$,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue$,
       },
     },
     outputSchema: {
@@ -173,14 +183,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -219,15 +227,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -236,24 +242,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_email_rules_delete",
+    name: "zeroTrust_dlp_email_rules_delete",
     title: "Delete email scanner rule",
-    description: "Removes a DLP email scanning rule. The rule will no longer be applied to email messages.",
+    description: "Removes a DLP email scanning rule. The rule will no longer be applied to email messages.\n\nDELETE /accounts/{account_id}/dlp/email/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "rule_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -270,14 +286,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -316,15 +330,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -332,24 +344,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_email_rules_get",
+    name: "zeroTrust_dlp_email_rules_get",
     title: "Get an email scanner rule",
-    description: "Gets detailed configuration for a specific DLP email scanning rule, including detection patterns and actions.",
+    description: "Gets detailed configuration for a specific DLP email scanning rule, including detection patterns and actions.\n\nGET /accounts/{account_id}/dlp/email/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "rule_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -366,14 +388,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -413,15 +433,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -429,19 +447,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_email_rules_list",
+    name: "zeroTrust_dlp_email_rules_list",
     title: "List all email scanner rules",
-    description: "Lists all email scanner rules for an account.",
+    description: "Lists all email scanner rules for an account.\n\nGET /accounts/{account_id}/dlp/email/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -458,15 +486,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleArray": dlp_EmailRuleArray_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleArray": dlp_EmailRuleArray,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -506,16 +532,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleArray": dlp_EmailRuleArray_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleArray": dlp_EmailRuleArray,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -523,36 +547,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_email_rules_update",
+    name: "zeroTrust_dlp_email_rules_update",
     title: "Update email scanner rule",
-    description: "Updates a DLP email scanning rule.",
+    description: "Updates a DLP email scanning rule.\n\nPUT /accounts/{account_id}/dlp/email/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_CreateEmailRule",
           "description": "Rule description."
         },
-        "rule_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "rule_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_CreateEmailRule": dlp_CreateEmailRule,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction$,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition$,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue$,
       },
     },
     outputSchema: {
@@ -570,14 +602,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -616,15 +646,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_EmailRule": dlp_EmailRule_output,
-        "dlp_EmailRuleAction": dlp_EmailRuleAction_output,
-        "dlp_EmailRuleCondition": dlp_EmailRuleCondition_output,
-        "dlp_EmailRuleOperator": dlp_EmailRuleOperator_output,
-        "dlp_EmailRuleSelector": dlp_EmailRuleSelector_output,
-        "dlp_EmailRuleValue": dlp_EmailRuleValue_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_EmailRule": dlp_EmailRule,
+        "dlp_EmailRuleAction": dlp_EmailRuleAction,
+        "dlp_EmailRuleCondition": dlp_EmailRuleCondition,
+        "dlp_EmailRuleValue": dlp_EmailRuleValue,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/entries/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/entries/outputs.ts
index 982c8e394..b04f7778c 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/entries/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/entries/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_EntryProfile` in responses.
  */
-export const dlp_EntryProfile_output: JsonSchema = {
+export const dlp_EntryProfile: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -26,7 +26,7 @@ export const dlp_EntryProfile_output: JsonSchema = {
 /**
  * The schema of `dlp_EntryWithSharedProfiles` in responses.
  */
-export const dlp_EntryWithSharedProfiles_output: JsonSchema = {
+export const dlp_EntryWithSharedProfiles: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dlp_EntryWithUploadStatus"
@@ -51,7 +51,7 @@ export const dlp_EntryWithSharedProfiles_output: JsonSchema = {
 /**
  * The schema of `dlp_EntryWithUploadStatus` in responses.
  */
-export const dlp_EntryWithUploadStatus_output: JsonSchema = {
+export const dlp_EntryWithUploadStatus: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dlp_Entry"
@@ -59,7 +59,15 @@ export const dlp_EntryWithUploadStatus_output: JsonSchema = {
     {
       "properties": {
         "upload_status": {
-          "$ref": "#/$defs/dlp_DatasetUploadStatus"
+          "enum": [
+            "empty",
+            "uploading",
+            "pending",
+            "processing",
+            "failed",
+            "complete"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/entries/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/entries/tools.ts
index e8e543164..1ab914ec9 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/entries/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/entries/tools.ts
@@ -3,62 +3,68 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
 import {
-  dlp_CustomEntry_output,
-  dlp_CustomPromptTopicEntry_output,
-  dlp_DatasetUploadStatus_output,
-  dlp_DocumentFingerprintEntry_output,
-  dlp_EntryConfidence_output,
-  dlp_Entry_output,
-  dlp_ExactDataEntry_output,
-  dlp_IntegrationEntry_output,
-  dlp_Pattern_output,
-  dlp_PredefinedEntryVariant_output,
-  dlp_PredefinedEntry_output,
-  dlp_PromptTopicType_output,
-  dlp_Validation_output,
-  dlp_WordListEntry_output,
+  dlp_CustomEntry,
+  dlp_CustomPromptTopicEntry,
+  dlp_DocumentFingerprintEntry,
+  dlp_Entry,
+  dlp_EntryConfidence,
+  dlp_ExactDataEntry,
+  dlp_IntegrationEntry,
+  dlp_Pattern,
+  dlp_PredefinedEntry,
+  dlp_PredefinedEntryVariant,
+  dlp_WordListEntry,
 } from "../outputs.js";
-import { dlp_Pattern, dlp_Validation } from "../schemas.js";
+import { dlp_Pattern as dlp_Pattern$ } from "../schemas.js";
 import {
-  dlp_EntryProfile_output,
-  dlp_EntryWithSharedProfiles_output,
-  dlp_EntryWithUploadStatus_output,
+  dlp_EntryProfile,
+  dlp_EntryWithSharedProfiles,
+  dlp_EntryWithUploadStatus,
 } from "./outputs.js";
 import { dlp_EntryUpdate, dlp_NewEntry } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.entries`.
+ * The tools of `zeroTrust.dlp.entries`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_entries_create",
+    name: "zeroTrust_dlp_entries_create",
     title: "Create custom entry",
-    description: "Creates a DLP custom entry.",
+    description: "Creates a DLP custom entry.\n\nPOST /accounts/{account_id}/dlp/entries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewEntry",
           "description": "A new entry to create."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewEntry": dlp_NewEntry,
-        "dlp_Pattern": dlp_Pattern,
-        "dlp_Validation": dlp_Validation,
+        "dlp_Pattern": dlp_Pattern$,
       },
     },
     outputSchema: {
@@ -76,11 +82,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -119,12 +124,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -133,24 +137,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_entries_delete",
+    name: "zeroTrust_dlp_entries_delete",
     title: "Delete custom entry",
-    description: "Deletes a DLP custom entry.",
+    description: "Deletes a DLP custom entry.\n\nDELETE /accounts/{account_id}/dlp/entries/{entry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "entry_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "entry_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "entry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "entry_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -167,9 +181,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -208,10 +222,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -219,24 +233,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_entries_get",
+    name: "zeroTrust_dlp_entries_get",
     title: "Get DLP Entry",
-    description: "Fetches a DLP entry by ID.",
+    description: "Fetches a DLP entry by ID.\n\nGET /accounts/{account_id}/dlp/entries/{entry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "entry_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "entry_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "entry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "entry_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -253,25 +277,22 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_EntryProfile": dlp_EntryProfile_output,
-        "dlp_EntryWithSharedProfiles": dlp_EntryWithSharedProfiles_output,
-        "dlp_EntryWithUploadStatus": dlp_EntryWithUploadStatus_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_EntryProfile": dlp_EntryProfile,
+        "dlp_EntryWithSharedProfiles": dlp_EntryWithSharedProfiles,
+        "dlp_EntryWithUploadStatus": dlp_EntryWithUploadStatus,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -311,26 +332,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_EntryProfile": dlp_EntryProfile_output,
-        "dlp_EntryWithSharedProfiles": dlp_EntryWithSharedProfiles_output,
-        "dlp_EntryWithUploadStatus": dlp_EntryWithUploadStatus_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_EntryProfile": dlp_EntryProfile,
+        "dlp_EntryWithSharedProfiles": dlp_EntryWithSharedProfiles,
+        "dlp_EntryWithUploadStatus": dlp_EntryWithUploadStatus,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -338,19 +356,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_entries_list",
+    name: "zeroTrust_dlp_entries_list",
     title: "List all entries",
-    description: "Lists all DLP entries in an account.",
+    description: "Lists all DLP entries in an account.\n\nGET /accounts/{account_id}/dlp/entries",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -370,23 +398,20 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_EntryWithUploadStatus": dlp_EntryWithUploadStatus_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_EntryWithUploadStatus": dlp_EntryWithUploadStatus,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -429,24 +454,21 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DatasetUploadStatus": dlp_DatasetUploadStatus_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_EntryWithUploadStatus": dlp_EntryWithUploadStatus_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_EntryWithUploadStatus": dlp_EntryWithUploadStatus,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -454,33 +476,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_entries_update",
+    name: "zeroTrust_dlp_entries_update",
     title: "Update entry",
-    description: "Updates a DLP entry.",
+    description: "Updates a DLP entry.\n\nPUT /accounts/{account_id}/dlp/entries/{entry_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_EntryUpdate",
           "description": "Update to be applied to the entry."
         },
-        "entry_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "entry_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "entry_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "entry_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_EntryUpdate": dlp_EntryUpdate,
-        "dlp_Pattern": dlp_Pattern,
-        "dlp_Validation": dlp_Validation,
+        "dlp_Pattern": dlp_Pattern$,
       },
     },
     outputSchema: {
@@ -498,21 +529,19 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -551,22 +580,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/limits/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/limits/outputs.ts
index ba6b1f140..da027cfc9 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/limits/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/limits/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_Limits` in responses.
  */
-export const dlp_Limits_output: JsonSchema = {
+export const dlp_Limits: JsonSchema = {
   "properties": {
     "max_custom_regex_entries": {
       "type": "integer"
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/limits/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/limits/tools.ts
index 8f4d0c621..fcde08fc9 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/limits/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/limits/tools.ts
@@ -3,30 +3,40 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_Limits_output } from "./outputs.js";
+import { dlp_Limits } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dlp.limits`.
+ * The tools of `zeroTrust.dlp.limits`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_limits_list",
+    name: "zeroTrust_dlp_limits_list",
     title: "Fetch limits associated with DLP for account",
-    description: "Retrieves current DLP usage limits and quotas for the account, including\nmaximum allowed counts and current usage for custom entries, dataset cells,\nand document fingerprints.",
+    description: "Retrieves current DLP usage limits and quotas for the account, including\nmaximum allowed counts and current usage for custom entries, dataset cells,\nand document fingerprints.\n\nGET /accounts/{account_id}/dlp/limits",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -43,9 +53,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Limits": dlp_Limits_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Limits": dlp_Limits,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -85,10 +95,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Limits": dlp_Limits_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Limits": dlp_Limits,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/outputs.ts
index 41e04cd7a..1aac637b9 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `dlp_CustomEntry` in responses.
  */
-export const dlp_CustomEntry_output: JsonSchema = {
+export const dlp_CustomEntry: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -72,7 +72,7 @@ export const dlp_CustomEntry_output: JsonSchema = {
 /**
  * The schema of `dlp_CustomPromptTopicEntry` in responses.
  */
-export const dlp_CustomPromptTopicEntry_output: JsonSchema = {
+export const dlp_CustomPromptTopicEntry: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -116,7 +116,7 @@ export const dlp_CustomPromptTopicEntry_output: JsonSchema = {
 /**
  * The schema of `dlp_DataTag` in responses.
  */
-export const dlp_DataTag_output: JsonSchema = {
+export const dlp_DataTag: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -153,25 +153,10 @@ export const dlp_DataTag_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_DatasetUploadStatus` in responses.
- */
-export const dlp_DatasetUploadStatus_output: JsonSchema = {
-  "enum": [
-    "empty",
-    "uploading",
-    "pending",
-    "processing",
-    "failed",
-    "complete"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_DocumentFingerprintEntry` in responses.
  */
-export const dlp_DocumentFingerprintEntry_output: JsonSchema = {
+export const dlp_DocumentFingerprintEntry: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -215,7 +200,7 @@ export const dlp_DocumentFingerprintEntry_output: JsonSchema = {
 /**
  * The schema of `dlp_Entry` in responses.
  */
-export const dlp_Entry_output: JsonSchema = {
+export const dlp_Entry: JsonSchema = {
   "oneOf": [
     {
       "allOf": [
@@ -370,7 +355,7 @@ export const dlp_Entry_output: JsonSchema = {
 /**
  * The schema of `dlp_EntryConfidence` in responses.
  */
-export const dlp_EntryConfidence_output: JsonSchema = {
+export const dlp_EntryConfidence: JsonSchema = {
   "properties": {
     "ai_context_available": {
       "type": "boolean"
@@ -389,7 +374,7 @@ export const dlp_EntryConfidence_output: JsonSchema = {
 /**
  * The schema of `dlp_ExactDataEntry` in responses.
  */
-export const dlp_ExactDataEntry_output: JsonSchema = {
+export const dlp_ExactDataEntry: JsonSchema = {
   "properties": {
     "case_sensitive": {
       "type": "boolean"
@@ -441,7 +426,7 @@ export const dlp_ExactDataEntry_output: JsonSchema = {
 /**
  * The schema of `dlp_IntegrationEntry` in responses.
  */
-export const dlp_IntegrationEntry_output: JsonSchema = {
+export const dlp_IntegrationEntry: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -486,13 +471,16 @@ export const dlp_IntegrationEntry_output: JsonSchema = {
 /**
  * The schema of `dlp_Pattern` in responses.
  */
-export const dlp_Pattern_output: JsonSchema = {
+export const dlp_Pattern: JsonSchema = {
   "properties": {
     "regex": {
       "type": "string"
     },
     "validation": {
-      "$ref": "#/$defs/dlp_Validation"
+      "enum": [
+        "luhn"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -504,7 +492,7 @@ export const dlp_Pattern_output: JsonSchema = {
 /**
  * The schema of `dlp_PredefinedEntry` in responses.
  */
-export const dlp_PredefinedEntry_output: JsonSchema = {
+export const dlp_PredefinedEntry: JsonSchema = {
   "properties": {
     "confidence": {
       "$ref": "#/$defs/dlp_EntryConfidence"
@@ -549,7 +537,7 @@ export const dlp_PredefinedEntry_output: JsonSchema = {
 /**
  * The schema of `dlp_PredefinedEntryVariant` in responses.
  */
-export const dlp_PredefinedEntryVariant_output: JsonSchema = {
+export const dlp_PredefinedEntryVariant: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -564,7 +552,11 @@ export const dlp_PredefinedEntryVariant_output: JsonSchema = {
           ]
         },
         "topic_type": {
-          "$ref": "#/$defs/dlp_PromptTopicType"
+          "enum": [
+            "Intent",
+            "Content"
+          ],
+          "type": "string"
         },
         "type": {
           "enum": [
@@ -606,21 +598,10 @@ export const dlp_PredefinedEntryVariant_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `dlp_PromptTopicType` in responses.
- */
-export const dlp_PromptTopicType_output: JsonSchema = {
-  "enum": [
-    "Intent",
-    "Content"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_SensitivityLevel` in responses.
  */
-export const dlp_SensitivityLevel_output: JsonSchema = {
+export const dlp_SensitivityLevel: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -660,7 +641,7 @@ export const dlp_SensitivityLevel_output: JsonSchema = {
 /**
  * The schema of `dlp_SensitivityLevelRef` in responses.
  */
-export const dlp_SensitivityLevelRef_output: JsonSchema = {
+export const dlp_SensitivityLevelRef: JsonSchema = {
   "properties": {
     "group_id": {
       "format": "uuid",
@@ -678,20 +659,10 @@ export const dlp_SensitivityLevelRef_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_Validation` in responses.
- */
-export const dlp_Validation_output: JsonSchema = {
-  "enum": [
-    "luhn"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_WordListEntry` in responses.
  */
-export const dlp_WordListEntry_output: JsonSchema = {
+export const dlp_WordListEntry: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/patterns/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/patterns/outputs.ts
index 955af8456..a1bf27797 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/patterns/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/patterns/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_RegexValidationResult` in responses.
  */
-export const dlp_RegexValidationResult_output: JsonSchema = {
+export const dlp_RegexValidationResult: JsonSchema = {
   "properties": {
     "valid": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/patterns/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/patterns/tools.ts
index 0d8064445..5643b5ef8 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/patterns/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/patterns/tools.ts
@@ -3,37 +3,47 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_RegexValidationResult_output } from "./outputs.js";
+import { dlp_RegexValidationResult } from "./outputs.js";
 import { dlp_RegexValidationQuery } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.patterns`.
+ * The tools of `zeroTrust.dlp.patterns`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_patterns_validate",
+    name: "zeroTrust_dlp_patterns_validate",
     title: "Validate a DLP regex pattern",
-    description: "Validates whether this pattern is a valid regular expression. Rejects it if\nthe regular expression is too complex or can match an unbounded-length\nstring. The regex will be rejected if it uses `*` or `+`. Bound the maximum\nnumber of characters that can be matched using a range, e.g. `{1,100}`.",
+    description: "Validates whether this pattern is a valid regular expression. Rejects it if\nthe regular expression is too complex or can match an unbounded-length\nstring. The regex will be rejected if it uses `*` or `+`. Bound the maximum\nnumber of characters that can be matched using a range, e.g. `{1,100}`.\n\nPOST /accounts/{account_id}/dlp/patterns/validate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_RegexValidationQuery",
           "description": "Validation query."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_RegexValidationQuery": dlp_RegexValidationQuery,
       },
@@ -53,9 +63,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RegexValidationResult": dlp_RegexValidationResult_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RegexValidationResult": dlp_RegexValidationResult,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -94,10 +104,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RegexValidationResult": dlp_RegexValidationResult_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RegexValidationResult": dlp_RegexValidationResult,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/profiles/custom/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/profiles/custom/tools.ts
index 2b1888a98..863db87ec 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/profiles/custom/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/profiles/custom/tools.ts
@@ -3,42 +3,41 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../../outputs.js";
 import {
-  dlp_CustomEntry_output,
-  dlp_CustomPromptTopicEntry_output,
-  dlp_DocumentFingerprintEntry_output,
-  dlp_EntryConfidence_output,
-  dlp_Entry_output,
-  dlp_ExactDataEntry_output,
-  dlp_IntegrationEntry_output,
-  dlp_Pattern_output,
-  dlp_PredefinedEntryVariant_output,
-  dlp_PredefinedEntry_output,
-  dlp_PromptTopicType_output,
-  dlp_SensitivityLevelRef_output,
-  dlp_Validation_output,
-  dlp_WordListEntry_output,
-} from "../../outputs.js";
-import {
+  dlp_CustomEntry,
+  dlp_CustomPromptTopicEntry,
+  dlp_DocumentFingerprintEntry,
+  dlp_Entry,
+  dlp_EntryConfidence,
+  dlp_ExactDataEntry,
+  dlp_IntegrationEntry,
   dlp_Pattern,
+  dlp_PredefinedEntry,
+  dlp_PredefinedEntryVariant,
   dlp_SensitivityLevelRef,
-  dlp_Validation,
+  dlp_WordListEntry,
+} from "../../outputs.js";
+import {
+  dlp_Pattern as dlp_Pattern$,
+  dlp_SensitivityLevelRef as dlp_SensitivityLevelRef$,
 } from "../../schemas.js";
 import {
-  dlp_Confidence_output,
-  dlp_ContextAwareness_output,
-  dlp_CustomProfile_output,
-  dlp_IntegrationProfile_output,
-  dlp_PredefinedProfile_output,
-  dlp_Profile_output,
-  dlp_SkipConfig_output,
+  dlp_ContextAwareness,
+  dlp_CustomProfile,
+  dlp_IntegrationProfile,
+  dlp_PredefinedProfile,
+  dlp_Profile,
+  dlp_SkipConfig,
 } from "../outputs.js";
-import { dlp_ContextAwareness, dlp_SkipConfig } from "../schemas.js";
+import {
+  dlp_ContextAwareness as dlp_ContextAwareness$,
+  dlp_SkipConfig as dlp_SkipConfig$,
+} from "../schemas.js";
 import {
   dlp_CustomProfileUpdate,
   dlp_EntryOfNewProfile,
@@ -52,39 +51,48 @@ import {
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.profiles.custom`.
+ * The tools of `zeroTrust.dlp.profiles.custom`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_profiles_custom_create",
+    name: "zeroTrust_dlp_profiles_custom_create",
     title: "Create custom profile",
-    description: "Creates a DLP custom profile.",
+    description: "Creates a DLP custom profile.\n\nPOST /accounts/{account_id}/dlp/profiles/custom",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewCustomProfile",
           "description": "A new profile to create."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_ContextAwareness": dlp_ContextAwareness$,
         "dlp_EntryOfNewProfile": dlp_EntryOfNewProfile,
         "dlp_NewCustomEntry": dlp_NewCustomEntry,
         "dlp_NewCustomProfile": dlp_NewCustomProfile,
         "dlp_NewSharedEntry": dlp_NewSharedEntry,
         "dlp_NewWordListEntry": dlp_NewWordListEntry,
-        "dlp_Pattern": dlp_Pattern,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
-        "dlp_SkipConfig": dlp_SkipConfig,
-        "dlp_Validation": dlp_Validation,
+        "dlp_Pattern": dlp_Pattern$,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef$,
+        "dlp_SkipConfig": dlp_SkipConfig$,
       },
     },
     outputSchema: {
@@ -102,29 +110,26 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -163,30 +168,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -195,24 +197,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_profiles_custom_delete",
+    name: "zeroTrust_dlp_profiles_custom_delete",
     title: "Delete custom profile",
-    description: "Deletes a DLP custom profile.",
+    description: "Deletes a DLP custom profile.\n\nDELETE /accounts/{account_id}/dlp/profiles/custom/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "profile_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "profile_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -229,9 +241,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -270,10 +282,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -281,40 +293,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_profiles_custom_update",
+    name: "zeroTrust_dlp_profiles_custom_update",
     title: "Update custom profile",
-    description: "Updates a DLP custom profile.",
+    description: "Updates a DLP custom profile.\n\nPUT /accounts/{account_id}/dlp/profiles/custom/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_CustomProfileUpdate",
           "description": "The updated parameters for the profile."
         },
-        "profile_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "profile_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_ContextAwareness": dlp_ContextAwareness$,
         "dlp_CustomProfileUpdate": dlp_CustomProfileUpdate,
         "dlp_NewCustomEntry": dlp_NewCustomEntry,
         "dlp_NewCustomEntryWithId": dlp_NewCustomEntryWithId,
-        "dlp_Pattern": dlp_Pattern,
+        "dlp_Pattern": dlp_Pattern$,
         "dlp_ProfileEntryUpdate": dlp_ProfileEntryUpdate,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef$,
         "dlp_SharedEntryUpdate": dlp_SharedEntryUpdate,
-        "dlp_SkipConfig": dlp_SkipConfig,
-        "dlp_Validation": dlp_Validation,
+        "dlp_SkipConfig": dlp_SkipConfig$,
       },
     },
     outputSchema: {
@@ -332,29 +353,26 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -393,30 +411,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/profiles/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/profiles/outputs.ts
index 8b93e460f..c1c49fa6e 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/profiles/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/profiles/outputs.ts
@@ -3,23 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `dlp_Confidence` in responses.
- */
-export const dlp_Confidence_output: JsonSchema = {
-  "enum": [
-    "low",
-    "medium",
-    "high",
-    "very_high"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_ContextAwareness` in responses.
  */
-export const dlp_ContextAwareness_output: JsonSchema = {
+export const dlp_ContextAwareness: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -38,7 +25,7 @@ export const dlp_ContextAwareness_output: JsonSchema = {
 /**
  * The schema of `dlp_CustomProfile` in responses.
  */
-export const dlp_CustomProfile_output: JsonSchema = {
+export const dlp_CustomProfile: JsonSchema = {
   "properties": {
     "ai_context_enabled": {
       "type": "boolean"
@@ -47,7 +34,13 @@ export const dlp_CustomProfile_output: JsonSchema = {
       "type": "integer"
     },
     "confidence_threshold": {
-      "$ref": "#/$defs/dlp_Confidence"
+      "enum": [
+        "low",
+        "medium",
+        "high",
+        "very_high"
+      ],
+      "type": "string"
     },
     "context_awareness": {
       "$ref": "#/$defs/dlp_ContextAwareness"
@@ -127,7 +120,7 @@ export const dlp_CustomProfile_output: JsonSchema = {
 /**
  * The schema of `dlp_IntegrationProfile` in responses.
  */
-export const dlp_IntegrationProfile_output: JsonSchema = {
+export const dlp_IntegrationProfile: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -186,7 +179,7 @@ export const dlp_IntegrationProfile_output: JsonSchema = {
 /**
  * The schema of `dlp_PredefinedProfile` in responses.
  */
-export const dlp_PredefinedProfile_output: JsonSchema = {
+export const dlp_PredefinedProfile: JsonSchema = {
   "properties": {
     "ai_context_enabled": {
       "type": "boolean"
@@ -195,7 +188,13 @@ export const dlp_PredefinedProfile_output: JsonSchema = {
       "type": "integer"
     },
     "confidence_threshold": {
-      "$ref": "#/$defs/dlp_Confidence"
+      "enum": [
+        "low",
+        "medium",
+        "high",
+        "very_high"
+      ],
+      "type": "string"
     },
     "context_awareness": {
       "$ref": "#/$defs/dlp_ContextAwareness"
@@ -232,7 +231,7 @@ export const dlp_PredefinedProfile_output: JsonSchema = {
 /**
  * The schema of `dlp_Profile` in responses.
  */
-export const dlp_Profile_output: JsonSchema = {
+export const dlp_Profile: JsonSchema = {
   "oneOf": [
     {
       "allOf": [
@@ -303,7 +302,7 @@ export const dlp_Profile_output: JsonSchema = {
 /**
  * The schema of `dlp_ProfileArray` in responses.
  */
-export const dlp_ProfileArray_output: JsonSchema = {
+export const dlp_ProfileArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_Profile"
   },
@@ -313,7 +312,7 @@ export const dlp_ProfileArray_output: JsonSchema = {
 /**
  * The schema of `dlp_SkipConfig` in responses.
  */
-export const dlp_SkipConfig_output: JsonSchema = {
+export const dlp_SkipConfig: JsonSchema = {
   "properties": {
     "files": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/profiles/predefined/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/profiles/predefined/tools.ts
index 885b0f700..7b9200ed4 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/profiles/predefined/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/profiles/predefined/tools.ts
@@ -3,74 +3,84 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../../outputs.js";
 import {
-  dlp_CustomEntry_output,
-  dlp_CustomPromptTopicEntry_output,
-  dlp_DocumentFingerprintEntry_output,
-  dlp_EntryConfidence_output,
-  dlp_Entry_output,
-  dlp_ExactDataEntry_output,
-  dlp_IntegrationEntry_output,
-  dlp_Pattern_output,
-  dlp_PredefinedEntryVariant_output,
-  dlp_PredefinedEntry_output,
-  dlp_PromptTopicType_output,
-  dlp_SensitivityLevelRef_output,
-  dlp_Validation_output,
-  dlp_WordListEntry_output,
+  dlp_CustomEntry,
+  dlp_CustomPromptTopicEntry,
+  dlp_DocumentFingerprintEntry,
+  dlp_Entry,
+  dlp_EntryConfidence,
+  dlp_ExactDataEntry,
+  dlp_IntegrationEntry,
+  dlp_Pattern,
+  dlp_PredefinedEntry,
+  dlp_PredefinedEntryVariant,
+  dlp_SensitivityLevelRef,
+  dlp_WordListEntry,
 } from "../../outputs.js";
 import {
-  dlp_Confidence_output,
-  dlp_ContextAwareness_output,
-  dlp_CustomProfile_output,
-  dlp_IntegrationProfile_output,
-  dlp_PredefinedProfile_output,
-  dlp_Profile_output,
-  dlp_SkipConfig_output,
+  dlp_ContextAwareness,
+  dlp_CustomProfile,
+  dlp_IntegrationProfile,
+  dlp_PredefinedProfile,
+  dlp_Profile,
+  dlp_SkipConfig,
 } from "../outputs.js";
-import { dlp_ContextAwareness, dlp_SkipConfig } from "../schemas.js";
+import {
+  dlp_ContextAwareness as dlp_ContextAwareness$,
+  dlp_SkipConfig as dlp_SkipConfig$,
+} from "../schemas.js";
 import {
   dlp_PredefinedProfileEntryUpdate,
   dlp_PredefinedProfileUpdate,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.profiles.predefined`.
+ * The tools of `zeroTrust.dlp.profiles.predefined`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_profiles_predefined_update",
+    name: "zeroTrust_dlp_profiles_predefined_update",
     title: "Update predefined profile",
-    description: "Updates a DLP predefined profile. Only supports enabling/disabling entries.",
+    description: "Updates a DLP predefined profile. Only supports enabling/disabling entries.\n\nPUT /accounts/{account_id}/dlp/profiles/predefined/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_PredefinedProfileUpdate",
           "description": "The updated parameters for the predefined profile."
         },
-        "profile_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "profile_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_ContextAwareness": dlp_ContextAwareness$,
         "dlp_PredefinedProfileEntryUpdate": dlp_PredefinedProfileEntryUpdate,
         "dlp_PredefinedProfileUpdate": dlp_PredefinedProfileUpdate,
-        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_SkipConfig": dlp_SkipConfig$,
       },
     },
     outputSchema: {
@@ -88,29 +98,26 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -149,30 +156,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/profiles/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/profiles/tools.ts
index 906ff95de..25d533102 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/profiles/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/profiles/tools.ts
@@ -1,62 +1,69 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
 import {
-  dlp_CustomEntry_output,
-  dlp_CustomPromptTopicEntry_output,
-  dlp_DocumentFingerprintEntry_output,
-  dlp_EntryConfidence_output,
-  dlp_Entry_output,
-  dlp_ExactDataEntry_output,
-  dlp_IntegrationEntry_output,
-  dlp_Pattern_output,
-  dlp_PredefinedEntryVariant_output,
-  dlp_PredefinedEntry_output,
-  dlp_PromptTopicType_output,
-  dlp_SensitivityLevelRef_output,
-  dlp_Validation_output,
-  dlp_WordListEntry_output,
+  dlp_CustomEntry,
+  dlp_CustomPromptTopicEntry,
+  dlp_DocumentFingerprintEntry,
+  dlp_Entry,
+  dlp_EntryConfidence,
+  dlp_ExactDataEntry,
+  dlp_IntegrationEntry,
+  dlp_Pattern,
+  dlp_PredefinedEntry,
+  dlp_PredefinedEntryVariant,
+  dlp_SensitivityLevelRef,
+  dlp_WordListEntry,
 } from "../outputs.js";
 import {
-  dlp_Confidence_output,
-  dlp_ContextAwareness_output,
-  dlp_CustomProfile_output,
-  dlp_IntegrationProfile_output,
-  dlp_PredefinedProfile_output,
-  dlp_ProfileArray_output,
-  dlp_Profile_output,
-  dlp_SkipConfig_output,
+  dlp_ContextAwareness,
+  dlp_CustomProfile,
+  dlp_IntegrationProfile,
+  dlp_PredefinedProfile,
+  dlp_Profile,
+  dlp_ProfileArray,
+  dlp_SkipConfig,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dlp.profiles`.
+ * The tools of `zeroTrust.dlp.profiles`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_profiles_get",
+    name: "zeroTrust_dlp_profiles_get",
     title: "Get DLP Profile",
-    description: "Fetches a DLP profile by ID.",
+    description: "Fetches a DLP profile by ID.\n\nGET /accounts/{account_id}/dlp/profiles/{profile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "profile_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "profile_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "profile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "profile_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -73,29 +80,26 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -135,30 +139,27 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -166,23 +167,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_profiles_list",
+    name: "zeroTrust_dlp_profiles_list",
     title: "List all profiles",
-    description: "Lists all DLP profiles in an account.",
+    description: "Lists all DLP profiles in an account.\n\nGET /accounts/{account_id}/dlp/profiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "all": {
-          "description": "Return all profiles, including those that current account does not have access to.",
-          "type": "boolean"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "all": {
+              "description": "Return all profiles, including those that current account does not have access to.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -199,30 +216,27 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_ProfileArray": dlp_ProfileArray_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_ProfileArray": dlp_ProfileArray,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -262,37 +276,34 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Confidence": dlp_Confidence_output,
-        "dlp_ContextAwareness": dlp_ContextAwareness_output,
-        "dlp_CustomEntry": dlp_CustomEntry_output,
-        "dlp_CustomProfile": dlp_CustomProfile_output,
-        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry_output,
-        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry_output,
-        "dlp_Entry": dlp_Entry_output,
-        "dlp_EntryConfidence": dlp_EntryConfidence_output,
-        "dlp_ExactDataEntry": dlp_ExactDataEntry_output,
-        "dlp_IntegrationEntry": dlp_IntegrationEntry_output,
-        "dlp_IntegrationProfile": dlp_IntegrationProfile_output,
-        "dlp_Pattern": dlp_Pattern_output,
-        "dlp_PredefinedEntry": dlp_PredefinedEntry_output,
-        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant_output,
-        "dlp_PredefinedProfile": dlp_PredefinedProfile_output,
-        "dlp_Profile": dlp_Profile_output,
-        "dlp_ProfileArray": dlp_ProfileArray_output,
-        "dlp_PromptTopicType": dlp_PromptTopicType_output,
-        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef_output,
-        "dlp_SkipConfig": dlp_SkipConfig_output,
-        "dlp_Validation": dlp_Validation_output,
-        "dlp_WordListEntry": dlp_WordListEntry_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_ContextAwareness": dlp_ContextAwareness,
+        "dlp_CustomEntry": dlp_CustomEntry,
+        "dlp_CustomProfile": dlp_CustomProfile,
+        "dlp_CustomPromptTopicEntry": dlp_CustomPromptTopicEntry,
+        "dlp_DocumentFingerprintEntry": dlp_DocumentFingerprintEntry,
+        "dlp_Entry": dlp_Entry,
+        "dlp_EntryConfidence": dlp_EntryConfidence,
+        "dlp_ExactDataEntry": dlp_ExactDataEntry,
+        "dlp_IntegrationEntry": dlp_IntegrationEntry,
+        "dlp_IntegrationProfile": dlp_IntegrationProfile,
+        "dlp_Pattern": dlp_Pattern,
+        "dlp_PredefinedEntry": dlp_PredefinedEntry,
+        "dlp_PredefinedEntryVariant": dlp_PredefinedEntryVariant,
+        "dlp_PredefinedProfile": dlp_PredefinedProfile,
+        "dlp_Profile": dlp_Profile,
+        "dlp_ProfileArray": dlp_ProfileArray,
+        "dlp_SensitivityLevelRef": dlp_SensitivityLevelRef,
+        "dlp_SkipConfig": dlp_SkipConfig,
+        "dlp_WordListEntry": dlp_WordListEntry,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dlp/profiles`,
       query: [
-        ["all", args["all"], true],
+        ["all", param(args, "query", "all"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/schemas.ts b/src/generated/forge-mcp/zeroTrust/dlp/schemas.ts
index de4838329..fe15d6dcb 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/schemas.ts
@@ -91,7 +91,11 @@ export const dlp_Pattern: JsonSchema = {
       "type": "string"
     },
     "validation": {
-      "$ref": "#/$defs/dlp_Validation"
+      "deprecated": true,
+      "enum": [
+        "luhn"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -150,14 +154,3 @@ export const dlp_SensitivityLevelUpdate: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `dlp_Validation`.
- */
-export const dlp_Validation: JsonSchema = {
-  "deprecated": true,
-  "enum": [
-    "luhn"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroupTemplates/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroupTemplates/outputs.ts
index 0ad8dd41d..ade4794af 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroupTemplates/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroupTemplates/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_SensitivityGroupTemplate` in responses.
  */
-export const dlp_SensitivityGroupTemplate_output: JsonSchema = {
+export const dlp_SensitivityGroupTemplate: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -37,7 +37,7 @@ export const dlp_SensitivityGroupTemplate_output: JsonSchema = {
 /**
  * The schema of `dlp_SensitivityGroupTemplateArray` in responses.
  */
-export const dlp_SensitivityGroupTemplateArray_output: JsonSchema = {
+export const dlp_SensitivityGroupTemplateArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_SensitivityGroupTemplate"
   },
@@ -47,7 +47,7 @@ export const dlp_SensitivityGroupTemplateArray_output: JsonSchema = {
 /**
  * The schema of `dlp_SensitivityLevelTemplate` in responses.
  */
-export const dlp_SensitivityLevelTemplate_output: JsonSchema = {
+export const dlp_SensitivityLevelTemplate: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroupTemplates/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroupTemplates/tools.ts
index ff8e68f40..24d738d3f 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroupTemplates/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroupTemplates/tools.ts
@@ -3,39 +3,49 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
 import {
-  dlp_SensitivityGroupTemplateArray_output,
-  dlp_SensitivityGroupTemplate_output,
-  dlp_SensitivityLevelTemplate_output,
+  dlp_SensitivityGroupTemplate,
+  dlp_SensitivityGroupTemplateArray,
+  dlp_SensitivityLevelTemplate,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dlp.sensitivity_group_templates`.
+ * The tools of `zeroTrust.dlp.sensitivityGroupTemplates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_sensitivity_group_templates_get",
+    name: "zeroTrust_dlp_sensitivityGroupTemplates_get",
     title: "Retrieve a specific sensitivity group template.",
-    description: "Gets an available sensitivity group template.",
+    description: "Gets an available sensitivity group template.\n\nGET /accounts/{account_id}/dlp/sensitivity_groups/templates/{template_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "template_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "template_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "template_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "template_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -52,10 +62,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityGroupTemplate": dlp_SensitivityGroupTemplate_output,
-        "dlp_SensitivityLevelTemplate": dlp_SensitivityLevelTemplate_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroupTemplate": dlp_SensitivityGroupTemplate,
+        "dlp_SensitivityLevelTemplate": dlp_SensitivityLevelTemplate,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -98,11 +108,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityGroupTemplate": dlp_SensitivityGroupTemplate_output,
-        "dlp_SensitivityLevelTemplate": dlp_SensitivityLevelTemplate_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroupTemplate": dlp_SensitivityGroupTemplate,
+        "dlp_SensitivityLevelTemplate": dlp_SensitivityLevelTemplate,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -110,19 +120,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_group_templates_list",
+    name: "zeroTrust_dlp_sensitivityGroupTemplates_list",
     title: "Retrieve all sensitivity group templates in an account",
-    description: "Lists available sensitivity group templates.",
+    description: "Lists available sensitivity group templates.\n\nGET /accounts/{account_id}/dlp/sensitivity_groups/templates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -139,11 +159,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityGroupTemplate": dlp_SensitivityGroupTemplate_output,
-        "dlp_SensitivityGroupTemplateArray": dlp_SensitivityGroupTemplateArray_output,
-        "dlp_SensitivityLevelTemplate": dlp_SensitivityLevelTemplate_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroupTemplate": dlp_SensitivityGroupTemplate,
+        "dlp_SensitivityGroupTemplateArray": dlp_SensitivityGroupTemplateArray,
+        "dlp_SensitivityLevelTemplate": dlp_SensitivityLevelTemplate,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -186,12 +206,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityGroupTemplate": dlp_SensitivityGroupTemplate_output,
-        "dlp_SensitivityGroupTemplateArray": dlp_SensitivityGroupTemplateArray_output,
-        "dlp_SensitivityLevelTemplate": dlp_SensitivityLevelTemplate_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroupTemplate": dlp_SensitivityGroupTemplate,
+        "dlp_SensitivityGroupTemplateArray": dlp_SensitivityGroupTemplateArray,
+        "dlp_SensitivityLevelTemplate": dlp_SensitivityLevelTemplate,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroups/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroups/outputs.ts
index c934df160..4b029a915 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroups/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroups/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_SensitivityGroup` in responses.
  */
-export const dlp_SensitivityGroup_output: JsonSchema = {
+export const dlp_SensitivityGroup: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -64,7 +64,7 @@ export const dlp_SensitivityGroup_output: JsonSchema = {
 /**
  * The schema of `dlp_SensitivityGroupArray` in responses.
  */
-export const dlp_SensitivityGroupArray_output: JsonSchema = {
+export const dlp_SensitivityGroupArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_SensitivityGroup"
   },
@@ -74,7 +74,7 @@ export const dlp_SensitivityGroupArray_output: JsonSchema = {
 /**
  * The schema of `dlp_SensitivityLevelOrder` in responses.
  */
-export const dlp_SensitivityLevelOrder_output: JsonSchema = {
+export const dlp_SensitivityLevelOrder: JsonSchema = {
   "properties": {
     "level_ids": {
       "items": {
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroups/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroups/tools.ts
index 82d9f1898..1440d8375 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroups/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityGroups/tools.ts
@@ -3,51 +3,61 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_SensitivityLevel_output } from "../outputs.js";
+import { dlp_SensitivityLevel } from "../outputs.js";
 import {
   dlp_NewSensitivityLevel,
   dlp_SensitivityLevelUpdate,
 } from "../schemas.js";
 import {
-  dlp_SensitivityGroupArray_output,
-  dlp_SensitivityGroup_output,
-  dlp_SensitivityLevelOrder_output,
+  dlp_SensitivityGroup,
+  dlp_SensitivityGroupArray,
+  dlp_SensitivityLevelOrder,
 } from "./outputs.js";
 import {
   dlp_NewSensitivityGroup,
   dlp_SensitivityGroupLevelUpdate,
   dlp_SensitivityGroupUpdate,
-  dlp_SensitivityLevelOrder,
+  dlp_SensitivityLevelOrder as dlp_SensitivityLevelOrder$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.sensitivity_groups`.
+ * The tools of `zeroTrust.dlp.sensitivityGroups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_sensitivity_groups_create",
+    name: "zeroTrust_dlp_sensitivityGroups_create",
     title: "Creates a new sensitivity group.",
-    description: "Creates a sensitivity group, optionally from a template.",
+    description: "Creates a sensitivity group, optionally from a template.\n\nPOST /accounts/{account_id}/dlp/sensitivity_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewSensitivityGroup",
           "description": "Attributes of the new sensitivity group."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewSensitivityGroup": dlp_NewSensitivityGroup,
         "dlp_NewSensitivityLevel": dlp_NewSensitivityLevel,
@@ -68,10 +78,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityGroup": dlp_SensitivityGroup_output,
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroup": dlp_SensitivityGroup,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -110,11 +120,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityGroup": dlp_SensitivityGroup_output,
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroup": dlp_SensitivityGroup,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -123,24 +133,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_groups_delete",
+    name: "zeroTrust_dlp_sensitivityGroups_delete",
     title: "Delete a single sensitivity group.",
-    description: "Deletes a sensitivity group and its levels.",
+    description: "Deletes a sensitivity group and its levels.\n\nDELETE /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -157,9 +177,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -198,10 +218,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -209,24 +229,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_groups_get",
+    name: "zeroTrust_dlp_sensitivityGroups_get",
     title: "Retrieve a specific sensitivity group.",
-    description: "Gets a sensitivity group and its levels.",
+    description: "Gets a sensitivity group and its levels.\n\nGET /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -243,10 +273,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityGroup": dlp_SensitivityGroup_output,
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroup": dlp_SensitivityGroup,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -286,11 +316,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityGroup": dlp_SensitivityGroup_output,
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroup": dlp_SensitivityGroup,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -298,24 +328,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_groups_get_level_order",
+    name: "zeroTrust_dlp_sensitivityGroups_getLevelOrder",
     title: "Retrieve the ordered list of level IDs for a sensitivity group.",
-    description: "Gets the current order of sensitivity levels in a group.",
+    description: "Gets the current order of sensitivity levels in a group.\n\nGET /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}/level_order",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -332,9 +372,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -374,10 +414,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -385,19 +425,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_groups_list",
+    name: "zeroTrust_dlp_sensitivityGroups_list",
     title: "Retrieve all sensitivity groups in an account",
-    description: "Lists sensitivity groups configured for the account.",
+    description: "Lists sensitivity groups configured for the account.\n\nGET /accounts/{account_id}/dlp/sensitivity_groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -414,11 +464,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityGroup": dlp_SensitivityGroup_output,
-        "dlp_SensitivityGroupArray": dlp_SensitivityGroupArray_output,
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroup": dlp_SensitivityGroup,
+        "dlp_SensitivityGroupArray": dlp_SensitivityGroupArray,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -458,12 +508,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityGroup": dlp_SensitivityGroup_output,
-        "dlp_SensitivityGroupArray": dlp_SensitivityGroupArray_output,
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroup": dlp_SensitivityGroup,
+        "dlp_SensitivityGroupArray": dlp_SensitivityGroupArray,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -471,29 +521,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_groups_update",
+    name: "zeroTrust_dlp_sensitivityGroups_update",
     title: "Update the attributes of a single sensitivity group.",
-    description: "Updates a sensitivity group and its levels.",
+    description: "Updates a sensitivity group and its levels.\n\nPUT /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_SensitivityGroupUpdate",
           "description": "Attributes of the sensitivity group to update."
         },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_SensitivityGroupLevelUpdate": dlp_SensitivityGroupLevelUpdate,
         "dlp_SensitivityGroupUpdate": dlp_SensitivityGroupUpdate,
@@ -515,10 +575,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityGroup": dlp_SensitivityGroup_output,
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroup": dlp_SensitivityGroup,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -557,11 +617,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityGroup": dlp_SensitivityGroup_output,
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityGroup": dlp_SensitivityGroup,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -570,31 +630,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_groups_update_level_order",
+    name: "zeroTrust_dlp_sensitivityGroups_updateLevelOrder",
     title: "Set the ordering of levels within a sensitivity group.",
-    description: "Updates the order of sensitivity levels in a group.",
+    description: "Updates the order of sensitivity levels in a group.\n\nPUT /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}/level_order",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_SensitivityLevelOrder",
           "description": "Desired ordered list of level IDs."
         },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder,
+        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder$,
       },
     },
     outputSchema: {
@@ -612,9 +682,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -653,10 +723,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevelOrder": dlp_SensitivityLevelOrder,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityLevels/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityLevels/outputs.ts
index e90e04572..694b296f3 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityLevels/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityLevels/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_SensitivityLevelArray` in responses.
  */
-export const dlp_SensitivityLevelArray_output: JsonSchema = {
+export const dlp_SensitivityLevelArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_SensitivityLevel"
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityLevels/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityLevels/tools.ts
index f662f5189..bfe7f07dd 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/sensitivityLevels/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/sensitivityLevels/tools.ts
@@ -3,46 +3,56 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_SensitivityLevel_output } from "../outputs.js";
+import { dlp_SensitivityLevel } from "../outputs.js";
 import {
   dlp_NewSensitivityLevel,
   dlp_SensitivityLevelUpdate,
 } from "../schemas.js";
-import { dlp_SensitivityLevelArray_output } from "./outputs.js";
+import { dlp_SensitivityLevelArray } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dlp.sensitivity_levels`.
+ * The tools of `zeroTrust.dlp.sensitivityLevels`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_sensitivity_levels_create",
+    name: "zeroTrust_dlp_sensitivityLevels_create",
     title: "Creates a new sensitivity level.",
-    description: "Creates a sensitivity level in a group.",
+    description: "Creates a sensitivity level in a group.\n\nPOST /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}/levels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_NewSensitivityLevel",
           "description": "Attributes of the new sensitivity level."
         },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_NewSensitivityLevel": dlp_NewSensitivityLevel,
       },
@@ -62,9 +72,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -103,10 +113,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -115,29 +125,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_levels_delete",
+    name: "zeroTrust_dlp_sensitivityLevels_delete",
     title: "Delete a single sensitivity level.",
-    description: "Deletes a sensitivity level from a group.",
+    description: "Deletes a sensitivity level from a group.\n\nDELETE /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}/levels/{sensitivity_level_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "sensitivity_level_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "sensitivity_level_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id",
+            "sensitivity_level_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id",
-        "sensitivity_level_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -154,9 +174,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -195,10 +215,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -206,29 +226,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_levels_get",
+    name: "zeroTrust_dlp_sensitivityLevels_get",
     title: "Retrieve a specific sensitivity level.",
-    description: "Gets a sensitivity level from a group.",
+    description: "Gets a sensitivity level from a group.\n\nGET /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}/levels/{sensitivity_level_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "sensitivity_level_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "sensitivity_level_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id",
+            "sensitivity_level_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id",
-        "sensitivity_level_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -245,9 +275,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -287,10 +317,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -298,24 +328,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_levels_list",
+    name: "zeroTrust_dlp_sensitivityLevels_list",
     title: "Retrieve all sensitivity levels in a sensitivity group",
-    description: "Lists sensitivity levels in a sensitivity group.",
+    description: "Lists sensitivity levels in a sensitivity group.\n\nGET /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}/levels",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -332,10 +372,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_SensitivityLevelArray": dlp_SensitivityLevelArray_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_SensitivityLevelArray": dlp_SensitivityLevelArray,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -375,11 +415,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_SensitivityLevelArray": dlp_SensitivityLevelArray_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_SensitivityLevelArray": dlp_SensitivityLevelArray,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -387,34 +427,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_sensitivity_levels_update",
+    name: "zeroTrust_dlp_sensitivityLevels_update",
     title: "Update the attributes of a single sensitivity level.",
-    description: "Updates a sensitivity level in a group.",
+    description: "Updates a sensitivity level in a group.\n\nPUT /accounts/{account_id}/dlp/sensitivity_groups/{sensitivity_group_id}/levels/{sensitivity_level_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_SensitivityLevelUpdate",
           "description": "Attributes of the sensitivity level to update."
         },
-        "sensitivity_group_id": {
-          "format": "uuid",
-          "type": "string"
-        },
-        "sensitivity_level_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "sensitivity_group_id": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "sensitivity_level_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "sensitivity_group_id",
+            "sensitivity_level_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "sensitivity_group_id",
-        "sensitivity_level_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_SensitivityLevelUpdate": dlp_SensitivityLevelUpdate,
       },
@@ -434,9 +484,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -475,10 +525,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_SensitivityLevel": dlp_SensitivityLevel_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_SensitivityLevel": dlp_SensitivityLevel,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/settings/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/settings/outputs.ts
index 689761bcd..b376f2432 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/settings/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/settings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_DlpSettings` in responses.
  */
-export const dlp_DlpSettings_output: JsonSchema = {
+export const dlp_DlpSettings: JsonSchema = {
   "properties": {
     "ai_context_analysis": {
       "type": "boolean"
@@ -26,26 +26,19 @@ export const dlp_DlpSettings_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_PayloadLogMaskingLevel` in responses.
- */
-export const dlp_PayloadLogMaskingLevel_output: JsonSchema = {
-  "enum": [
-    "full",
-    "partial",
-    "clear",
-    "default"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_PayloadLogSetting` in responses.
  */
-export const dlp_PayloadLogSetting_output: JsonSchema = {
+export const dlp_PayloadLogSetting: JsonSchema = {
   "properties": {
     "masking_level": {
-      "$ref": "#/$defs/dlp_PayloadLogMaskingLevel"
+      "enum": [
+        "full",
+        "partial",
+        "clear",
+        "default"
+      ],
+      "type": "string"
     },
     "public_key": {
       "oneOf": [
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/settings/schemas.ts b/src/generated/forge-mcp/zeroTrust/dlp/settings/schemas.ts
index 986bc21f7..51429013d 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/settings/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/settings/schemas.ts
@@ -40,20 +40,6 @@ export const dlp_DlpSettingsUpdate: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_PayloadLogMaskingLevel`.
- */
-export const dlp_PayloadLogMaskingLevel: JsonSchema = {
-  "description": "Masking level for payload logs.\n\n- `full`: The entire payload is masked.\n- `partial`: Only partial payload content is masked.\n- `clear`: No masking is applied to the payload content.\n- `default`: DLP uses its default masking behavior.",
-  "enum": [
-    "full",
-    "partial",
-    "clear",
-    "default"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_PayloadLogSettingUpdate`.
  */
@@ -61,8 +47,15 @@ export const dlp_PayloadLogSettingUpdate: JsonSchema = {
   "description": "Request model for payload log settings within the DLP settings endpoint.\nUnlike the legacy endpoint, null and missing are treated identically here\n(both mean \"not provided\" for PATCH, \"reset to default\" for PUT).",
   "properties": {
     "masking_level": {
-      "$ref": "#/$defs/dlp_PayloadLogMaskingLevel",
-      "default": "default"
+      "default": "default",
+      "description": "Masking level for payload logs.\n\n- `full`: The entire payload is masked.\n- `partial`: Only partial payload content is masked.\n- `clear`: No masking is applied to the payload content.\n- `default`: DLP uses its default masking behavior.",
+      "enum": [
+        "full",
+        "partial",
+        "clear",
+        "default"
+      ],
+      "type": "string"
     },
     "public_key": {
       "description": "Base64-encoded public key for encrypting payload logs.\n\n- Set to a non-empty base64 string to enable payload logging with the given key.\n- Set to an empty string to disable payload logging.\n- Omit or set to null to leave unchanged (PATCH) or reset to disabled (PUT).",
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/settings/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/settings/tools.ts
index 20685c41f..4e13717c0 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/settings/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/settings/tools.ts
@@ -3,39 +3,44 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import {
-  dlp_DlpSettings_output,
-  dlp_PayloadLogMaskingLevel_output,
-  dlp_PayloadLogSetting_output,
-} from "./outputs.js";
+import { dlp_DlpSettings, dlp_PayloadLogSetting } from "./outputs.js";
 import {
   dlp_DlpSettingsUpdate,
-  dlp_PayloadLogMaskingLevel,
   dlp_PayloadLogSettingUpdate,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.settings`.
+ * The tools of `zeroTrust.dlp.settings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_settings_delete",
+    name: "zeroTrust_dlp_settings_delete",
     title: "Delete (reset) DLP account-level settings to initial values.",
-    description: "Deletes account-level DLP settings and returns the initial values.",
+    description: "Deletes account-level DLP settings and returns the initial values.\n\nDELETE /accounts/{account_id}/dlp/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -52,11 +57,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DlpSettings": dlp_DlpSettings_output,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel_output,
-        "dlp_PayloadLogSetting": dlp_PayloadLogSetting_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DlpSettings": dlp_DlpSettings,
+        "dlp_PayloadLogSetting": dlp_PayloadLogSetting,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -95,12 +99,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DlpSettings": dlp_DlpSettings_output,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel_output,
-        "dlp_PayloadLogSetting": dlp_PayloadLogSetting_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DlpSettings": dlp_DlpSettings,
+        "dlp_PayloadLogSetting": dlp_PayloadLogSetting,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -108,27 +111,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_settings_edit",
+    name: "zeroTrust_dlp_settings_edit",
     title: "Partially update DLP account-level settings.",
-    description: "Missing fields keep their existing values.",
+    description: "Missing fields keep their existing values.\n\nPATCH /accounts/{account_id}/dlp/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_DlpSettingsUpdate",
           "description": "DLP settings fields to update."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_DlpSettingsUpdate": dlp_DlpSettingsUpdate,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel,
         "dlp_PayloadLogSettingUpdate": dlp_PayloadLogSettingUpdate,
       },
     },
@@ -147,11 +159,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DlpSettings": dlp_DlpSettings_output,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel_output,
-        "dlp_PayloadLogSetting": dlp_PayloadLogSetting_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DlpSettings": dlp_DlpSettings,
+        "dlp_PayloadLogSetting": dlp_PayloadLogSetting,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -190,12 +201,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DlpSettings": dlp_DlpSettings_output,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel_output,
-        "dlp_PayloadLogSetting": dlp_PayloadLogSetting_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DlpSettings": dlp_DlpSettings,
+        "dlp_PayloadLogSetting": dlp_PayloadLogSetting,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -204,19 +214,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_settings_get",
+    name: "zeroTrust_dlp_settings_get",
     title: "Get DLP account-level settings.",
-    description: "Gets the account-level DLP settings.",
+    description: "Gets the account-level DLP settings.\n\nGET /accounts/{account_id}/dlp/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -233,11 +253,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DlpSettings": dlp_DlpSettings_output,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel_output,
-        "dlp_PayloadLogSetting": dlp_PayloadLogSetting_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DlpSettings": dlp_DlpSettings,
+        "dlp_PayloadLogSetting": dlp_PayloadLogSetting,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -277,12 +296,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DlpSettings": dlp_DlpSettings_output,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel_output,
-        "dlp_PayloadLogSetting": dlp_PayloadLogSetting_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DlpSettings": dlp_DlpSettings,
+        "dlp_PayloadLogSetting": dlp_PayloadLogSetting,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -290,27 +308,36 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_settings_update",
+    name: "zeroTrust_dlp_settings_update",
     title: "Update DLP account-level settings (full replacement).",
-    description: "Missing fields are reset to initial (unconfigured) values.",
+    description: "Missing fields are reset to initial (unconfigured) values.\n\nPUT /accounts/{account_id}/dlp/settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_DlpSettingsUpdate",
           "description": "New DLP settings."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_DlpSettingsUpdate": dlp_DlpSettingsUpdate,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel,
         "dlp_PayloadLogSettingUpdate": dlp_PayloadLogSettingUpdate,
       },
     },
@@ -329,11 +356,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_DlpSettings": dlp_DlpSettings_output,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel_output,
-        "dlp_PayloadLogSetting": dlp_PayloadLogSetting_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DlpSettings": dlp_DlpSettings,
+        "dlp_PayloadLogSetting": dlp_PayloadLogSetting,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -372,12 +398,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_DlpSettings": dlp_DlpSettings_output,
-        "dlp_PayloadLogMaskingLevel": dlp_PayloadLogMaskingLevel_output,
-        "dlp_PayloadLogSetting": dlp_PayloadLogSetting_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_DlpSettings": dlp_DlpSettings,
+        "dlp_PayloadLogSetting": dlp_PayloadLogSetting,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/outputs.ts
index eab3aaa00..c03102c98 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_AttachedEntry` in responses.
  */
-export const dlp_AttachedEntry_output: JsonSchema = {
+export const dlp_AttachedEntry: JsonSchema = {
   "properties": {
     "id": {
       "format": "uuid",
@@ -16,7 +16,16 @@ export const dlp_AttachedEntry_output: JsonSchema = {
       "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/dlp_EntryType"
+      "enum": [
+        "custom",
+        "custom_prompt_topic",
+        "predefined",
+        "integration",
+        "exact_data",
+        "document_fingerprint",
+        "word_list"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -27,41 +36,18 @@ export const dlp_AttachedEntry_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_EntryType` in responses.
- */
-export const dlp_EntryType_output: JsonSchema = {
-  "enum": [
-    "custom",
-    "custom_prompt_topic",
-    "predefined",
-    "integration",
-    "exact_data",
-    "document_fingerprint",
-    "word_list"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `dlp_ProximityWeight` in responses.
- */
-export const dlp_ProximityWeight_output: JsonSchema = {
-  "enum": [
-    "strong",
-    "moderate",
-    "weak"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_ProximityWord` in responses.
  */
-export const dlp_ProximityWord_output: JsonSchema = {
+export const dlp_ProximityWord: JsonSchema = {
   "properties": {
     "weight": {
-      "$ref": "#/$defs/dlp_ProximityWeight"
+      "enum": [
+        "strong",
+        "moderate",
+        "weak"
+      ],
+      "type": "string"
     },
     "word": {
       "type": "string"
@@ -77,7 +63,7 @@ export const dlp_ProximityWord_output: JsonSchema = {
 /**
  * The schema of `dlp_ProximityWordValidator` in responses.
  */
-export const dlp_ProximityWordValidator_output: JsonSchema = {
+export const dlp_ProximityWordValidator: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -118,7 +104,7 @@ export const dlp_ProximityWordValidator_output: JsonSchema = {
 /**
  * The schema of `dlp_Validator` in responses.
  */
-export const dlp_Validator_output: JsonSchema = {
+export const dlp_Validator: JsonSchema = {
   "oneOf": [
     {
       "allOf": [
@@ -168,7 +154,7 @@ export const dlp_Validator_output: JsonSchema = {
 /**
  * The schema of `dlp_ValidatorArray` in responses.
  */
-export const dlp_ValidatorArray_output: JsonSchema = {
+export const dlp_ValidatorArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_Validator"
   },
@@ -178,7 +164,7 @@ export const dlp_ValidatorArray_output: JsonSchema = {
 /**
  * The schema of `dlp_ValidatorReferences` in responses.
  */
-export const dlp_ValidatorReferences_output: JsonSchema = {
+export const dlp_ValidatorReferences: JsonSchema = {
   "properties": {
     "entries": {
       "items": {
@@ -197,34 +183,27 @@ export const dlp_ValidatorReferences_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_WorkerDefault` in responses.
- */
-export const dlp_WorkerDefault_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "number"
-    },
-    {
-      "enum": [
-        "veto"
-      ],
-      "type": "string"
-    }
-  ]
-};
-
 /**
  * The schema of `dlp_WorkerValidator` in responses.
  */
-export const dlp_WorkerValidator_output: JsonSchema = {
+export const dlp_WorkerValidator: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
       "type": "string"
     },
     "default": {
-      "$ref": "#/$defs/dlp_WorkerDefault"
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "enum": [
+            "veto"
+          ],
+          "type": "string"
+        }
+      ]
     },
     "id": {
       "format": "uuid",
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/proximityWords/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/proximityWords/outputs.ts
index 647acf326..50668fc1b 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/proximityWords/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/proximityWords/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `dlp_ProximityWordValidatorArray` in responses.
  */
-export const dlp_ProximityWordValidatorArray_output: JsonSchema = {
+export const dlp_ProximityWordValidatorArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_ProximityWordValidator"
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/proximityWords/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/proximityWords/tools.ts
index 15994817f..4a280f075 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/proximityWords/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/proximityWords/tools.ts
@@ -3,49 +3,56 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../../outputs.js";
 import {
-  dlp_AttachedEntry_output,
-  dlp_EntryType_output,
-  dlp_ProximityWeight_output,
-  dlp_ProximityWordValidator_output,
-  dlp_ProximityWord_output,
-  dlp_ValidatorReferences_output,
+  dlp_AttachedEntry,
+  dlp_ProximityWord,
+  dlp_ProximityWordValidator,
+  dlp_ValidatorReferences,
 } from "../outputs.js";
-import { dlp_ProximityWeight, dlp_ProximityWord } from "../schemas.js";
-import { dlp_ProximityWordValidatorArray_output } from "./outputs.js";
+import { dlp_ProximityWord as dlp_ProximityWord$ } from "../schemas.js";
+import { dlp_ProximityWordValidatorArray } from "./outputs.js";
 import { dlp_ProximityWordValidatorWrite } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.validators.proximity_words`.
+ * The tools of `zeroTrust.dlp.validators.proximityWords`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_validators_proximity_words_create",
+    name: "zeroTrust_dlp_validators_proximityWords_create",
     title: "Create a proximity word validator",
-    description: "Creates a reusable list of weighted words that detection entries can attach to in order to\nrefine their matches. An account may own at most 100 validators across all kinds.",
+    description: "Creates a reusable list of weighted words that detection entries can attach to in order to\nrefine their matches. An account may own at most 100 validators across all kinds.\n\nPOST /accounts/{account_id}/dlp/validators/proximity_words",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_ProximityWordValidatorWrite",
           "description": "Attributes of the new validator."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_ProximityWeight": dlp_ProximityWeight,
-        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWord": dlp_ProximityWord$,
         "dlp_ProximityWordValidatorWrite": dlp_ProximityWordValidatorWrite,
       },
     },
@@ -64,14 +71,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -110,15 +115,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -127,24 +130,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_proximity_words_delete",
+    name: "zeroTrust_dlp_validators_proximityWords_delete",
     title: "Delete a proximity word validator",
-    description: "Deletes a `proximity_words` validator. Fails with `409` while any detection entry is still\nattached to it; detach it from those entries first.",
+    description: "Deletes a `proximity_words` validator. Fails with `409` while any detection entry is still\nattached to it; detach it from those entries first.\n\nDELETE /accounts/{account_id}/dlp/validators/proximity_words/{validator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "validator_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "validator_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "validator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "validator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -161,9 +174,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -202,10 +215,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -213,24 +226,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_proximity_words_get",
+    name: "zeroTrust_dlp_validators_proximityWords_get",
     title: "Get a proximity word validator",
-    description: "Fetches a `proximity_words` validator by ID.",
+    description: "Fetches a `proximity_words` validator by ID.\n\nGET /accounts/{account_id}/dlp/validators/proximity_words/{validator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "validator_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "validator_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "validator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "validator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -247,14 +270,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -294,15 +315,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -310,19 +329,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_proximity_words_list",
+    name: "zeroTrust_dlp_validators_proximityWords_list",
     title: "List proximity word validators",
-    description: "Lists the `proximity_words` validators configured for the account.",
+    description: "Lists the `proximity_words` validators configured for the account.\n\nGET /accounts/{account_id}/dlp/validators/proximity_words",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -339,15 +368,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_ProximityWordValidatorArray": dlp_ProximityWordValidatorArray_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_ProximityWordValidatorArray": dlp_ProximityWordValidatorArray,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -387,16 +414,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_ProximityWordValidatorArray": dlp_ProximityWordValidatorArray_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_ProximityWordValidatorArray": dlp_ProximityWordValidatorArray,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -404,32 +429,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_proximity_words_update",
+    name: "zeroTrust_dlp_validators_proximityWords_update",
     title: "Update a proximity word validator",
-    description: "Replaces the name and word list of a `proximity_words` validator. Attachments to detection\nentries are owned from the entry side and are not affected.",
+    description: "Replaces the name and word list of a `proximity_words` validator. Attachments to detection\nentries are owned from the entry side and are not affected.\n\nPUT /accounts/{account_id}/dlp/validators/proximity_words/{validator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_ProximityWordValidatorWrite",
           "description": "Attributes of the validator to update."
         },
-        "validator_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "validator_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "validator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "validator_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_ProximityWeight": dlp_ProximityWeight,
-        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWord": dlp_ProximityWord$,
         "dlp_ProximityWordValidatorWrite": dlp_ProximityWordValidatorWrite,
       },
     },
@@ -448,14 +482,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -494,15 +526,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/schemas.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/schemas.ts
index a759971f8..3ae1b89e6 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/schemas.ts
@@ -3,19 +3,6 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `dlp_ProximityWeight`.
- */
-export const dlp_ProximityWeight: JsonSchema = {
-  "description": "How much a word contributes to a match's confidence when it is found nearby.\n\nSeparate from a profile's high/medium/low confidence threshold: this describes how telling the\nword is, not how confident the resulting match is.",
-  "enum": [
-    "strong",
-    "moderate",
-    "weak"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_ProximityWord`.
  */
@@ -23,8 +10,13 @@ export const dlp_ProximityWord: JsonSchema = {
   "description": "A word that raises a match's confidence when it appears near the match.",
   "properties": {
     "weight": {
-      "$ref": "#/$defs/dlp_ProximityWeight",
-      "description": "How much a word contributes to a match's confidence when it is found nearby.\n\nSeparate from a profile's high/medium/low confidence threshold: this describes how telling the\nword is, not how confident the resulting match is."
+      "description": "How much a word contributes to a match's confidence when it is found nearby.\n\nSeparate from a profile's high/medium/low confidence threshold: this describes how telling the\nword is, not how confident the resulting match is.",
+      "enum": [
+        "strong",
+        "moderate",
+        "weak"
+      ],
+      "type": "string"
     },
     "word": {
       "description": "The word or phrase to look for. Must contain 1–128 characters and is matched\ncase-insensitively.",
@@ -37,32 +29,3 @@ export const dlp_ProximityWord: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `dlp_ValidatorKind`.
- */
-export const dlp_ValidatorKind: JsonSchema = {
-  "description": "The type of a validator, and the accepted values of the `kind` filter when listing.",
-  "enum": [
-    "proximity_words",
-    "worker"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `dlp_WorkerDefault`.
- */
-export const dlp_WorkerDefault: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "number"
-    },
-    {
-      "enum": [
-        "veto"
-      ],
-      "type": "string"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/tools.ts
index cba15fa92..4cbdcb162 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/tools.ts
@@ -1,49 +1,55 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
 import {
-  dlp_AttachedEntry_output,
-  dlp_EntryType_output,
-  dlp_ProximityWeight_output,
-  dlp_ProximityWordValidator_output,
-  dlp_ProximityWord_output,
-  dlp_ValidatorArray_output,
-  dlp_ValidatorReferences_output,
-  dlp_Validator_output,
-  dlp_WorkerDefault_output,
-  dlp_WorkerValidator_output,
+  dlp_AttachedEntry,
+  dlp_ProximityWord,
+  dlp_ProximityWordValidator,
+  dlp_Validator,
+  dlp_ValidatorArray,
+  dlp_ValidatorReferences,
+  dlp_WorkerValidator,
 } from "./outputs.js";
-import { dlp_ValidatorKind } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.validators`.
+ * The tools of `zeroTrust.dlp.validators`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_validators_get",
+    name: "zeroTrust_dlp_validators_get",
     title: "Get a validator",
-    description: "Fetches a validator of any kind by ID.",
+    description: "Fetches a validator of any kind by ID.\n\nGET /accounts/{account_id}/dlp/validators/{validator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "validator_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "validator_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "validator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "validator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -60,17 +66,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_Validator": dlp_Validator_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_Validator": dlp_Validator,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -110,18 +113,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_Validator": dlp_Validator_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_Validator": dlp_Validator,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -129,33 +129,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_list",
+    name: "zeroTrust_dlp_validators_list",
     title: "List validators",
-    description: "Lists the validators configured for the account, of every kind.",
+    description: "Lists the validators configured for the account, of every kind.\n\nGET /accounts/{account_id}/dlp/validators",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "kind": {
-          "description": "Only return validators of this kind. Omit to return every kind.",
-          "oneOf": [
-            {
-              "$ref": "#/$defs/dlp_ValidatorKind"
-            },
-            {
-              "type": "null"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "kind": {
+              "description": "Only return validators of this kind. Omit to return every kind.",
+              "oneOf": [
+                {
+                  "description": "The type of a validator, and the accepted values of the `kind` filter when listing.",
+                  "enum": [
+                    "proximity_words",
+                    "worker"
+                  ],
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
-          ]
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "dlp_ValidatorKind": dlp_ValidatorKind,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -172,18 +190,15 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_Validator": dlp_Validator_output,
-        "dlp_ValidatorArray": dlp_ValidatorArray_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_Validator": dlp_Validator,
+        "dlp_ValidatorArray": dlp_ValidatorArray,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -223,25 +238,22 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ProximityWeight": dlp_ProximityWeight_output,
-        "dlp_ProximityWord": dlp_ProximityWord_output,
-        "dlp_ProximityWordValidator": dlp_ProximityWordValidator_output,
-        "dlp_Validator": dlp_Validator_output,
-        "dlp_ValidatorArray": dlp_ValidatorArray_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ProximityWord": dlp_ProximityWord,
+        "dlp_ProximityWordValidator": dlp_ProximityWordValidator,
+        "dlp_Validator": dlp_Validator,
+        "dlp_ValidatorArray": dlp_ValidatorArray,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/dlp/validators`,
       query: [
-        ["kind", args["kind"], true],
+        ["kind", param(args, "query", "kind"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/outputs.ts
index c87f080e8..1750c06d3 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `dlp_WorkerValidatorArray` in responses.
  */
-export const dlp_WorkerValidatorArray_output: JsonSchema = {
+export const dlp_WorkerValidatorArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_WorkerValidator"
   },
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/schemas.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/schemas.ts
index 6db872f46..48eb1fc22 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/schemas.ts
@@ -10,7 +10,17 @@ export const dlp_WorkerValidatorWrite: JsonSchema = {
   "description": "The attributes of a worker validator.",
   "properties": {
     "default": {
-      "$ref": "#/$defs/dlp_WorkerDefault"
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "enum": [
+            "veto"
+          ],
+          "type": "string"
+        }
+      ]
     },
     "name": {
       "description": "A name for this validator, at most 50 characters.",
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/status/outputs.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/status/outputs.ts
index bdb3b7703..34a7b6cd2 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/status/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/status/outputs.ts
@@ -3,26 +3,19 @@
 
 import type { JsonSchema } from "../../../../../_/tool.js";
 
-/**
- * The schema of `dlp_WorkerStatus` in responses.
- */
-export const dlp_WorkerStatus_output: JsonSchema = {
-  "enum": [
-    "worker_not_found",
-    "worker_error",
-    "configured",
-    "active"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_WorkerValidatorStatus` in responses.
  */
-export const dlp_WorkerValidatorStatus_output: JsonSchema = {
+export const dlp_WorkerValidatorStatus: JsonSchema = {
   "properties": {
     "status": {
-      "$ref": "#/$defs/dlp_WorkerStatus"
+      "enum": [
+        "worker_not_found",
+        "worker_error",
+        "configured",
+        "active"
+      ],
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/status/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/status/tools.ts
index 64c1364f6..31b8a863b 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/status/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/status/tools.ts
@@ -3,38 +3,45 @@
 
 import { type Tool, pathParam } from "../../../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../../../outputs.js";
-import {
-  dlp_WorkerStatus_output,
-  dlp_WorkerValidatorStatus_output,
-} from "./outputs.js";
+import { dlp_WorkerValidatorStatus } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.dlp.validators.worker.status`.
+ * The tools of `zeroTrust.dlp.validators.worker.status`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_validators_worker_status_get",
+    name: "zeroTrust_dlp_validators_worker_status_get",
     title: "Get a worker validator status",
-    description: "Reports whether the validator's Worker can be used. Returns `worker_not_found` if the Worker\ncannot be found, and `worker_error` if the Worker does not have a valid validation entrypoint\nor is returning incorrect responses.",
+    description: "Reports whether the validator's Worker can be used. Returns `worker_not_found` if the Worker\ncannot be found, and `worker_error` if the Worker does not have a valid validation entrypoint\nor is returning incorrect responses.\n\nGET /accounts/{account_id}/dlp/validators/worker/{validator_id}/status",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "validator_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "validator_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "validator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "validator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -51,10 +58,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_WorkerStatus": dlp_WorkerStatus_output,
-        "dlp_WorkerValidatorStatus": dlp_WorkerValidatorStatus_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_WorkerValidatorStatus": dlp_WorkerValidatorStatus,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -94,11 +100,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_WorkerStatus": dlp_WorkerStatus_output,
-        "dlp_WorkerValidatorStatus": dlp_WorkerValidatorStatus_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_WorkerValidatorStatus": dlp_WorkerValidatorStatus,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/tools.ts b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/tools.ts
index a9fb590ad..f2493a44c 100644
--- a/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/dlp/validators/worker/tools.ts
@@ -3,47 +3,53 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../../outputs.js";
 import {
-  dlp_AttachedEntry_output,
-  dlp_EntryType_output,
-  dlp_ValidatorReferences_output,
-  dlp_WorkerDefault_output,
-  dlp_WorkerValidator_output,
+  dlp_AttachedEntry,
+  dlp_ValidatorReferences,
+  dlp_WorkerValidator,
 } from "../outputs.js";
-import { dlp_WorkerDefault } from "../schemas.js";
-import { dlp_WorkerValidatorArray_output } from "./outputs.js";
+import { dlp_WorkerValidatorArray } from "./outputs.js";
 import { dlp_WorkerValidatorWrite } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.dlp.validators.worker`.
+ * The tools of `zeroTrust.dlp.validators.worker`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_dlp_validators_worker_create",
+    name: "zeroTrust_dlp_validators_worker_create",
     title: "Create a worker validator",
-    description: "Registers a customer Worker as a validator. An account may own at most 100 validators across\nall kinds.",
+    description: "Registers a customer Worker as a validator. An account may own at most 100 validators across\nall kinds.\n\nPOST /accounts/{account_id}/dlp/validators/worker",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_WorkerValidatorWrite",
           "description": "Attributes of the new validator."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_WorkerDefault": dlp_WorkerDefault,
         "dlp_WorkerValidatorWrite": dlp_WorkerValidatorWrite,
       },
     },
@@ -62,13 +68,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -107,14 +111,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -123,24 +125,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_worker_delete",
+    name: "zeroTrust_dlp_validators_worker_delete",
     title: "Delete a worker validator",
-    description: "Deletes a `worker` validator. Fails with `409` while any detection entry is still attached to\nit; detach it from those entries first.",
+    description: "Deletes a `worker` validator. Fails with `409` while any detection entry is still attached to\nit; detach it from those entries first.\n\nDELETE /accounts/{account_id}/dlp/validators/worker/{validator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "validator_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "validator_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "validator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "validator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -157,9 +169,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -198,10 +210,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -209,24 +221,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_worker_get",
+    name: "zeroTrust_dlp_validators_worker_get",
     title: "Get a worker validator",
-    description: "Fetches a `worker` validator by ID.",
+    description: "Fetches a `worker` validator by ID.\n\nGET /accounts/{account_id}/dlp/validators/worker/{validator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "validator_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "validator_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "validator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "validator_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -243,13 +265,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -289,14 +309,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -304,19 +322,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_worker_list",
+    name: "zeroTrust_dlp_validators_worker_list",
     title: "List worker validators",
-    description: "Lists the `worker` validators configured for the account.",
+    description: "Lists the `worker` validators configured for the account.\n\nGET /accounts/{account_id}/dlp/validators/worker",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -333,14 +361,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_WorkerValidatorArray": dlp_WorkerValidatorArray_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_WorkerValidatorArray": dlp_WorkerValidatorArray,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -380,15 +406,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_WorkerValidatorArray": dlp_WorkerValidatorArray_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_WorkerValidatorArray": dlp_WorkerValidatorArray,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -396,31 +420,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_dlp_validators_worker_update",
+    name: "zeroTrust_dlp_validators_worker_update",
     title: "Update a worker validator",
-    description: "Replaces the name, script tag and fallback verdict of a `worker` validator. Attachments to\ndetection entries are owned from the entry side and are not affected.",
+    description: "Replaces the name, script tag and fallback verdict of a `worker` validator. Attachments to\ndetection entries are owned from the entry side and are not affected.\n\nPUT /accounts/{account_id}/dlp/validators/worker/{validator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_WorkerValidatorWrite",
           "description": "Attributes of the validator to update."
         },
-        "validator_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "validator_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "validator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "validator_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_WorkerDefault": dlp_WorkerDefault,
         "dlp_WorkerValidatorWrite": dlp_WorkerValidatorWrite,
       },
     },
@@ -439,13 +472,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -484,14 +515,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_AttachedEntry": dlp_AttachedEntry_output,
-        "dlp_EntryType": dlp_EntryType_output,
-        "dlp_ValidatorReferences": dlp_ValidatorReferences_output,
-        "dlp_WorkerDefault": dlp_WorkerDefault_output,
-        "dlp_WorkerValidator": dlp_WorkerValidator_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_AttachedEntry": dlp_AttachedEntry,
+        "dlp_ValidatorReferences": dlp_ValidatorReferences,
+        "dlp_WorkerValidator": dlp_WorkerValidator,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/appTypes/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/appTypes/outputs.ts
index ccd04da20..b9c0f1bcd 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/appTypes/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/appTypes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_app-types` in responses.
  */
-export const zero_trust_gateway_app_types_output: JsonSchema = {
+export const zero$$trust$$gateway_app$$types: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_application"
@@ -17,36 +17,23 @@ export const zero_trust_gateway_app_types_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_app_id` in responses.
- */
-export const zero_trust_gateway_app_id_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `zero-trust-gateway_app_type_id` in responses.
- */
-export const zero_trust_gateway_app_type_id_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `zero-trust-gateway_application` in responses.
  */
-export const zero_trust_gateway_application_output: JsonSchema = {
+export const zero$$trust$$gateway_application: JsonSchema = {
   "properties": {
     "application_type_id": {
-      "$ref": "#/$defs/zero-trust-gateway_app_type_id"
+      "type": "integer"
     },
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_app_id"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-4"
+      "type": "string"
     }
   },
   "type": "object"
@@ -55,35 +42,29 @@ export const zero_trust_gateway_application_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_application_type` in responses.
  */
-export const zero_trust_gateway_application_type_output: JsonSchema = {
+export const zero$$trust$$gateway_application_type: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_app_type_id"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-4"
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_name-4` in responses.
- */
-export const zero_trust_gateway_name_4_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_response_collection-7` in responses.
  */
-export const zero_trust_gateway_response_collection_7_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection$$7: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/appTypes/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/appTypes/tools.ts
index cb82abb9d..83bf9f147 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/appTypes/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/appTypes/tools.ts
@@ -3,64 +3,62 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_messages_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_result_info_output,
-  zero_trust_gateway_timestamp_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
-import { zero_trust_gateway_identifier_3 } from "../schemas.js";
 import {
-  zero_trust_gateway_app_id_output,
-  zero_trust_gateway_app_type_id_output,
-  zero_trust_gateway_app_types_output,
-  zero_trust_gateway_application_output,
-  zero_trust_gateway_application_type_output,
-  zero_trust_gateway_name_4_output,
-  zero_trust_gateway_response_collection_7_output,
+  zero$$trust$$gateway_app$$types,
+  zero$$trust$$gateway_application,
+  zero$$trust$$gateway_application_type,
+  zero$$trust$$gateway_response_collection$$7,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.gateway.app_types`.
+ * The tools of `zeroTrust.gateway.appTypes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_app_types_list",
+    name: "zeroTrust_gateway_appTypes_list",
     title: "List application and application type mappings",
-    description: "List all application and application type mappings.",
+    description: "List all application and application type mappings.\n\nGET /accounts/{account_id}/gateway/app_types",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-3",
-          "description": "Provide the identifier string."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Provide the identifier string.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-3": zero_trust_gateway_identifier_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-7",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_app-types": zero_trust_gateway_app_types_output,
-        "zero-trust-gateway_app_id": zero_trust_gateway_app_id_output,
-        "zero-trust-gateway_app_type_id": zero_trust_gateway_app_type_id_output,
-        "zero-trust-gateway_application": zero_trust_gateway_application_output,
-        "zero-trust-gateway_application_type": zero_trust_gateway_application_type_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-4": zero_trust_gateway_name_4_output,
-        "zero-trust-gateway_response_collection-7": zero_trust_gateway_response_collection_7_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_app-types": zero$$trust$$gateway_app$$types,
+        "zero-trust-gateway_application": zero$$trust$$gateway_application,
+        "zero-trust-gateway_application_type": zero$$trust$$gateway_application_type,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-7": zero$$trust$$gateway_response_collection$$7,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     annotations: {
@@ -95,19 +93,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_app-types": zero_trust_gateway_app_types_output,
-        "zero-trust-gateway_app_id": zero_trust_gateway_app_id_output,
-        "zero-trust-gateway_app_type_id": zero_trust_gateway_app_type_id_output,
-        "zero-trust-gateway_application": zero_trust_gateway_application_output,
-        "zero-trust-gateway_application_type": zero_trust_gateway_application_type_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-4": zero_trust_gateway_name_4_output,
-        "zero-trust-gateway_response_collection-7": zero_trust_gateway_response_collection_7_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_app-types": zero$$trust$$gateway_app$$types,
+        "zero-trust-gateway_application": zero$$trust$$gateway_application,
+        "zero-trust-gateway_application_type": zero$$trust$$gateway_application_type,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-7": zero$$trust$$gateway_response_collection$$7,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/categories/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/categories/outputs.ts
index 898dc89b2..cb4a04292 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/categories/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/categories/outputs.ts
@@ -3,32 +3,32 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_beta` in responses.
- */
-export const zero_trust_gateway_beta_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `zero-trust-gateway_categories` in responses.
  */
-export const zero_trust_gateway_categories_output: JsonSchema = {
+export const zero$$trust$$gateway_categories: JsonSchema = {
   "properties": {
     "beta": {
-      "$ref": "#/$defs/zero-trust-gateway_beta"
+      "type": "boolean"
     },
     "class": {
-      "$ref": "#/$defs/zero-trust-gateway_class"
+      "enum": [
+        "free",
+        "premium",
+        "blocked",
+        "removalPending",
+        "noBlock"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/zero-trust-gateway_description-3"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_id"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-5"
+      "type": "string"
     },
     "subcategories": {
       "items": {
@@ -40,45 +40,10 @@ export const zero_trust_gateway_categories_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_class` in responses.
- */
-export const zero_trust_gateway_class_output: JsonSchema = {
-  "enum": [
-    "free",
-    "premium",
-    "blocked",
-    "removalPending",
-    "noBlock"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_description-3` in responses.
- */
-export const zero_trust_gateway_description_3_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_id` in responses.
- */
-export const zero_trust_gateway_id_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `zero-trust-gateway_name-5` in responses.
- */
-export const zero_trust_gateway_name_5_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_response_collection-8` in responses.
  */
-export const zero_trust_gateway_response_collection_8_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection$$8: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
@@ -100,22 +65,29 @@ export const zero_trust_gateway_response_collection_8_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_subcategory` in responses.
  */
-export const zero_trust_gateway_subcategory_output: JsonSchema = {
+export const zero$$trust$$gateway_subcategory: JsonSchema = {
   "properties": {
     "beta": {
-      "$ref": "#/$defs/zero-trust-gateway_beta"
+      "type": "boolean"
     },
     "class": {
-      "$ref": "#/$defs/zero-trust-gateway_class"
+      "enum": [
+        "free",
+        "premium",
+        "blocked",
+        "removalPending",
+        "noBlock"
+      ],
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/zero-trust-gateway_description-3"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_id"
+      "type": "integer"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-5"
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/categories/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/categories/tools.ts
index f69eb7145..114a0be40 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/categories/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/categories/tools.ts
@@ -3,64 +3,60 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_messages_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_result_info_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
-import { zero_trust_gateway_identifier_3 } from "../schemas.js";
 import {
-  zero_trust_gateway_beta_output,
-  zero_trust_gateway_categories_output,
-  zero_trust_gateway_class_output,
-  zero_trust_gateway_description_3_output,
-  zero_trust_gateway_id_output,
-  zero_trust_gateway_name_5_output,
-  zero_trust_gateway_response_collection_8_output,
-  zero_trust_gateway_subcategory_output,
+  zero$$trust$$gateway_categories,
+  zero$$trust$$gateway_response_collection$$8,
+  zero$$trust$$gateway_subcategory,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.gateway.categories`.
+ * The tools of `zeroTrust.gateway.categories`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_categories_list",
+    name: "zeroTrust_gateway_categories_list",
     title: "List categories",
-    description: "List all categories.",
+    description: "List all categories.\n\nGET /accounts/{account_id}/gateway/categories",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-3",
-          "description": "Provide the identifier string."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Provide the identifier string.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-3": zero_trust_gateway_identifier_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-8",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_beta": zero_trust_gateway_beta_output,
-        "zero-trust-gateway_categories": zero_trust_gateway_categories_output,
-        "zero-trust-gateway_class": zero_trust_gateway_class_output,
-        "zero-trust-gateway_description-3": zero_trust_gateway_description_3_output,
-        "zero-trust-gateway_id": zero_trust_gateway_id_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-5": zero_trust_gateway_name_5_output,
-        "zero-trust-gateway_response_collection-8": zero_trust_gateway_response_collection_8_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_subcategory": zero_trust_gateway_subcategory_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_categories": zero$$trust$$gateway_categories,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-8": zero$$trust$$gateway_response_collection$$8,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
+        "zero-trust-gateway_subcategory": zero$$trust$$gateway_subcategory,
       },
     },
     annotations: {
@@ -95,19 +91,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_beta": zero_trust_gateway_beta_output,
-        "zero-trust-gateway_categories": zero_trust_gateway_categories_output,
-        "zero-trust-gateway_class": zero_trust_gateway_class_output,
-        "zero-trust-gateway_description-3": zero_trust_gateway_description_3_output,
-        "zero-trust-gateway_id": zero_trust_gateway_id_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-5": zero_trust_gateway_name_5_output,
-        "zero-trust-gateway_response_collection-8": zero_trust_gateway_response_collection_8_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_subcategory": zero_trust_gateway_subcategory_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_categories": zero$$trust$$gateway_categories,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-8": zero$$trust$$gateway_response_collection$$8,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
+        "zero-trust-gateway_subcategory": zero$$trust$$gateway_subcategory,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/certificates/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/certificates/outputs.ts
index 17ffe2eb3..7ad34165a 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/certificates/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/certificates/outputs.ts
@@ -3,41 +3,36 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_binding_status` in responses.
- */
-export const zero_trust_gateway_binding_status_output: JsonSchema = {
-  "enum": [
-    "pending_deployment",
-    "available",
-    "pending_deletion",
-    "inactive"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_certificates` in responses.
  */
-export const zero_trust_gateway_certificates_output: JsonSchema = {
+export const zero$$trust$$gateway_certificates: JsonSchema = {
   "properties": {
     "binding_status": {
-      "$ref": "#/$defs/zero-trust-gateway_binding_status"
+      "enum": [
+        "pending_deployment",
+        "available",
+        "pending_deletion",
+        "inactive"
+      ],
+      "type": "string"
     },
     "certificate": {
       "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "expires_on": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "fingerprint": {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_uuid"
+      "type": "string"
     },
     "in_use": {
       "type": "boolean"
@@ -49,32 +44,31 @@ export const zero_trust_gateway_certificates_output: JsonSchema = {
       "type": "string"
     },
     "region": {
-      "$ref": "#/$defs/zero-trust-gateway_region"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/zero-trust-gateway_type"
+      "enum": [
+        "custom",
+        "gateway_managed"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "uploaded_on": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_region` in responses.
- */
-export const zero_trust_gateway_region_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_response_collection` in responses.
  */
-export const zero_trust_gateway_response_collection_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
@@ -96,7 +90,7 @@ export const zero_trust_gateway_response_collection_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_single_response` in responses.
  */
-export const zero_trust_gateway_single_response_output: JsonSchema = {
+export const zero$$trust$$gateway_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -111,21 +105,3 @@ export const zero_trust_gateway_single_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_type` in responses.
- */
-export const zero_trust_gateway_type_output: JsonSchema = {
-  "enum": [
-    "custom",
-    "gateway_managed"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_uuid` in responses.
- */
-export const zero_trust_gateway_uuid_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/certificates/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/certificates/schemas.ts
index 0e383b3aa..e00601fc8 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/certificates/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/certificates/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_generate-cert-request`.
  */
-export const zero_trust_gateway_generate_cert_request: JsonSchema = {
+export const zero$$trust$$gateway_generate$$cert$$request: JsonSchema = {
   "properties": {
     "validity_period_days": {
       "description": "Sets the certificate validity period in days (range: 1-10,950 days / ~30 years). Defaults to 1,825 days (5 years). **Important**: This field is only settable during the certificate creation.  Certificates becomes immutable after creation - use the `/activate` and `/deactivate` endpoints to manage certificate lifecycle.",
@@ -15,11 +15,3 @@ export const zero_trust_gateway_generate_cert_request: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `zero-trust-gateway_uuid`.
- */
-export const zero_trust_gateway_uuid: JsonSchema = {
-  "description": "Identify the certificate with a UUID.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/certificates/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/certificates/tools.ts
index d76890a95..7dac0b7d3 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/certificates/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/certificates/tools.ts
@@ -3,72 +3,64 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
-import { zero_trust_gateway_identifier_2 } from "../../schemas.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_result_info_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
 import {
-  zero_trust_gateway_binding_status_output,
-  zero_trust_gateway_certificates_output,
-  zero_trust_gateway_region_output,
-  zero_trust_gateway_response_collection_output,
-  zero_trust_gateway_single_response_output,
-  zero_trust_gateway_type_output,
-  zero_trust_gateway_uuid_output,
+  zero$$trust$$gateway_certificates,
+  zero$$trust$$gateway_response_collection,
+  zero$$trust$$gateway_single_response,
 } from "./outputs.js";
-import {
-  zero_trust_gateway_generate_cert_request,
-  zero_trust_gateway_uuid,
-} from "./schemas.js";
+import { zero$$trust$$gateway_generate$$cert$$request } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.gateway.certificates`.
+ * The tools of `zeroTrust.gateway.certificates`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_certificates_activate",
+    name: "zeroTrust_gateway_certificates_activate",
     title: "Activate a Zero Trust certificate",
-    description: "Bind a single Zero Trust certificate to the edge.",
+    description: "Bind a single Zero Trust certificate to the edge.\n\nPOST /accounts/{account_id}/gateway/certificates/{certificate_id}/activate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "certificate_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid",
-          "description": "Identify the certificate with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "certificate_id": {
+              "description": "Identify the certificate with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     annotations: {
@@ -97,16 +89,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     request: (args) => ({
@@ -114,40 +101,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_certificates_create",
+    name: "zeroTrust_gateway_certificates_create",
     title: "Create Zero Trust certificate",
-    description: "Create a new Zero Trust certificate.",
+    description: "Create a new Zero Trust certificate.\n\nPOST /accounts/{account_id}/gateway/certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "$ref": "#/$defs/zero-trust-gateway_generate-cert-request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_generate-cert-request": zero_trust_gateway_generate_cert_request,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
+        "zero-trust-gateway_generate-cert-request": zero$$trust$$gateway_generate$$cert$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     annotations: {
@@ -176,16 +167,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     request: (args) => ({
@@ -194,42 +180,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_certificates_deactivate",
+    name: "zeroTrust_gateway_certificates_deactivate",
     title: "Deactivate a Zero Trust certificate",
-    description: "Unbind a single Zero Trust certificate from the edge.",
+    description: "Unbind a single Zero Trust certificate from the edge.\n\nPOST /accounts/{account_id}/gateway/certificates/{certificate_id}/deactivate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "certificate_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid",
-          "description": "Identify the certificate with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "certificate_id": {
+              "description": "Identify the certificate with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     annotations: {
@@ -258,16 +245,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     request: (args) => ({
@@ -275,42 +257,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_certificates_delete",
+    name: "zeroTrust_gateway_certificates_delete",
     title: "Delete Zero Trust certificate",
-    description: "Delete a gateway-managed Zero Trust certificate. You must deactivate the certificate from the edge (inactive) before deleting it.",
+    description: "Delete a gateway-managed Zero Trust certificate. You must deactivate the certificate from the edge (inactive) before deleting it.\n\nDELETE /accounts/{account_id}/gateway/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "certificate_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid",
-          "description": "Identify the certificate with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "certificate_id": {
+              "description": "Identify the certificate with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     annotations: {
@@ -339,16 +322,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     request: (args) => ({
@@ -356,42 +334,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_certificates_get",
+    name: "zeroTrust_gateway_certificates_get",
     title: "Get Zero Trust certificate details",
-    description: "Get a single Zero Trust certificate.",
+    description: "Get a single Zero Trust certificate.\n\nGET /accounts/{account_id}/gateway/certificates/{certificate_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "certificate_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid",
-          "description": "Identify the certificate with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "certificate_id": {
+              "description": "Identify the certificate with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "certificate_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "certificate_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     annotations: {
@@ -420,16 +399,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_single_response": zero_trust_gateway_single_response_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response": zero$$trust$$gateway_single_response,
       },
     },
     request: (args) => ({
@@ -437,38 +411,40 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_certificates_list",
+    name: "zeroTrust_gateway_certificates_list",
     title: "List Zero Trust certificates",
-    description: "List all Zero Trust certificates for an account.",
+    description: "List all Zero Trust certificates for an account.\n\nGET /accounts/{account_id}/gateway/certificates",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_response_collection": zero_trust_gateway_response_collection_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection": zero$$trust$$gateway_response_collection,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     annotations: {
@@ -497,18 +473,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_binding_status": zero_trust_gateway_binding_status_output,
-        "zero-trust-gateway_certificates": zero_trust_gateway_certificates_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_region": zero_trust_gateway_region_output,
-        "zero-trust-gateway_response_collection": zero_trust_gateway_response_collection_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_type": zero_trust_gateway_type_output,
-        "zero-trust-gateway_uuid": zero_trust_gateway_uuid_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_certificates": zero$$trust$$gateway_certificates,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection": zero$$trust$$gateway_response_collection,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/configurations/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/configurations/outputs.ts
index 1cf36c6f4..4d5ebf720 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/configurations/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/configurations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_activity-log-settings` in responses.
  */
-export const zero_trust_gateway_activity_log_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_activity$$log$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -32,18 +32,39 @@ export const zero_trust_gateway_activity_log_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_anti-virus-settings` in responses.
  */
-export const zero_trust_gateway_anti_virus_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_anti$$virus$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
         "enabled_download_phase": {
-          "$ref": "#/$defs/zero-trust-gateway_enabled_download_phase"
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "enabled_upload_phase": {
-          "$ref": "#/$defs/zero-trust-gateway_enabled_upload_phase"
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "fail_closed": {
-          "$ref": "#/$defs/zero-trust-gateway_fail_closed"
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "notification_settings": {
           "$ref": "#/$defs/zero-trust-gateway_notification_settings"
@@ -60,7 +81,7 @@ export const zero_trust_gateway_anti_virus_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_block-page-settings` in responses.
  */
-export const zero_trust_gateway_block_page_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_block$$page$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -154,7 +175,7 @@ export const zero_trust_gateway_block_page_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_body-scanning-settings` in responses.
  */
-export const zero_trust_gateway_body_scanning_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_body$$scanning$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -177,7 +198,7 @@ export const zero_trust_gateway_body_scanning_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_browser-isolation-settings` in responses.
  */
-export const zero_trust_gateway_browser_isolation_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_browser$$isolation$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -199,7 +220,7 @@ export const zero_trust_gateway_browser_isolation_settings_output: JsonSchema =
 /**
  * The schema of `zero-trust-gateway_certificate-settings` in responses.
  */
-export const zero_trust_gateway_certificate_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_certificate$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -221,7 +242,7 @@ export const zero_trust_gateway_certificate_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_custom-certificate-settings` in responses.
  */
-export const zero_trust_gateway_custom_certificate_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_custom$$certificate$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -257,38 +278,10 @@ export const zero_trust_gateway_custom_certificate_settings_output: JsonSchema =
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_enabled_download_phase` in responses.
- */
-export const zero_trust_gateway_enabled_download_phase_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `zero-trust-gateway_enabled_upload_phase` in responses.
- */
-export const zero_trust_gateway_enabled_upload_phase_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `zero-trust-gateway_extended-email-matching` in responses.
  */
-export const zero_trust_gateway_extended_email_matching_output: JsonSchema = {
+export const zero$$trust$$gateway_extended$$email$$matching: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -320,24 +313,10 @@ export const zero_trust_gateway_extended_email_matching_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_fail_closed` in responses.
- */
-export const zero_trust_gateway_fail_closed_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `zero-trust-gateway_fips-settings` in responses.
  */
-export const zero_trust_gateway_fips_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_fips$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -356,7 +335,7 @@ export const zero_trust_gateway_fips_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_gateway-account-settings` in responses.
  */
-export const zero_trust_gateway_gateway_account_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_gateway$$account$$settings: JsonSchema = {
   "properties": {
     "settings": {
       "properties": {
@@ -394,7 +373,14 @@ export const zero_trust_gateway_gateway_account_settings_output: JsonSchema = {
           "$ref": "#/$defs/zero-trust-gateway_inspection-settings"
         },
         "max_ttl_secs": {
-          "$ref": "#/$defs/zero-trust-gateway_max-ttl-secs"
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "protocol_detection": {
           "$ref": "#/$defs/zero-trust-gateway_protocol-detection"
@@ -415,7 +401,7 @@ export const zero_trust_gateway_gateway_account_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_gateway_account_config` in responses.
  */
-export const zero_trust_gateway_gateway_account_config_output: JsonSchema = {
+export const zero$$trust$$gateway_gateway_account_config: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -430,10 +416,12 @@ export const zero_trust_gateway_gateway_account_config_output: JsonSchema = {
             {
               "properties": {
                 "created_at": {
-                  "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+                  "format": "date-time",
+                  "type": "string"
                 },
                 "updated_at": {
-                  "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+                  "format": "date-time",
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -449,7 +437,7 @@ export const zero_trust_gateway_gateway_account_config_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_host-selector-settings` in responses.
  */
-export const zero_trust_gateway_host_selector_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_host$$selector$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -475,7 +463,7 @@ export const zero_trust_gateway_host_selector_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_inspection-settings` in responses.
  */
-export const zero_trust_gateway_inspection_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_inspection$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -495,24 +483,10 @@ export const zero_trust_gateway_inspection_settings_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_max-ttl-secs` in responses.
- */
-export const zero_trust_gateway_max_ttl_secs_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `zero-trust-gateway_notification_settings` in responses.
  */
-export const zero_trust_gateway_notification_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_notification_settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -540,7 +514,7 @@ export const zero_trust_gateway_notification_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_protocol-detection` in responses.
  */
-export const zero_trust_gateway_protocol_detection_output: JsonSchema = {
+export const zero$$trust$$gateway_protocol$$detection: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -566,7 +540,7 @@ export const zero_trust_gateway_protocol_detection_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_sandbox` in responses.
  */
-export const zero_trust_gateway_sandbox_output: JsonSchema = {
+export const zero$$trust$$gateway_sandbox: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -599,7 +573,7 @@ export const zero_trust_gateway_sandbox_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_tls-settings` in responses.
  */
-export const zero_trust_gateway_tls_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_tls$$settings: JsonSchema = {
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/configurations/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/configurations/schemas.ts
index ef238e68e..50094a7b7 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/configurations/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/configurations/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_activity-log-settings`.
  */
-export const zero_trust_gateway_activity_log_settings: JsonSchema = {
+export const zero$$trust$$gateway_activity$$log$$settings: JsonSchema = {
   "description": "Specify activity log settings.",
   "oneOf": [
     {
@@ -34,22 +34,43 @@ export const zero_trust_gateway_activity_log_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_anti-virus-settings`.
  */
-export const zero_trust_gateway_anti_virus_settings: JsonSchema = {
+export const zero$$trust$$gateway_anti$$virus$$settings: JsonSchema = {
   "description": "Specify anti-virus settings.",
   "oneOf": [
     {
       "properties": {
         "enabled_download_phase": {
-          "$ref": "#/$defs/zero-trust-gateway_enabled_download_phase",
-          "description": "Specify whether to enable anti-virus scanning on downloads."
+          "description": "Specify whether to enable anti-virus scanning on downloads.",
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "enabled_upload_phase": {
-          "$ref": "#/$defs/zero-trust-gateway_enabled_upload_phase",
-          "description": "Specify whether to enable anti-virus scanning on uploads."
+          "description": "Specify whether to enable anti-virus scanning on uploads.",
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "fail_closed": {
-          "$ref": "#/$defs/zero-trust-gateway_fail_closed",
-          "description": "Specify whether to block requests for unscannable files."
+          "description": "Specify whether to block requests for unscannable files.",
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "notification_settings": {
           "$ref": "#/$defs/zero-trust-gateway_notification_settings",
@@ -67,7 +88,7 @@ export const zero_trust_gateway_anti_virus_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_block-page-settings`.
  */
-export const zero_trust_gateway_block_page_settings: JsonSchema = {
+export const zero$$trust$$gateway_block$$page$$settings: JsonSchema = {
   "description": "Specify block page layout settings.",
   "oneOf": [
     {
@@ -145,7 +166,7 @@ export const zero_trust_gateway_block_page_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_body-scanning-settings`.
  */
-export const zero_trust_gateway_body_scanning_settings: JsonSchema = {
+export const zero$$trust$$gateway_body$$scanning$$settings: JsonSchema = {
   "description": "Specify the DLP inspection mode.",
   "oneOf": [
     {
@@ -170,7 +191,7 @@ export const zero_trust_gateway_body_scanning_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_browser-isolation-settings`.
  */
-export const zero_trust_gateway_browser_isolation_settings: JsonSchema = {
+export const zero$$trust$$gateway_browser$$isolation$$settings: JsonSchema = {
   "description": "Specify Clientless Browser Isolation settings.",
   "oneOf": [
     {
@@ -195,7 +216,7 @@ export const zero_trust_gateway_browser_isolation_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_certificate-settings`.
  */
-export const zero_trust_gateway_certificate_settings: JsonSchema = {
+export const zero$$trust$$gateway_certificate$$settings: JsonSchema = {
   "description": "Specify certificate settings for Gateway TLS interception. If unset, the Cloudflare Root CA handles interception.",
   "oneOf": [
     {
@@ -219,7 +240,7 @@ export const zero_trust_gateway_certificate_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_custom-certificate-settings`.
  */
-export const zero_trust_gateway_custom_certificate_settings: JsonSchema = {
+export const zero$$trust$$gateway_custom$$certificate$$settings: JsonSchema = {
   "deprecated": true,
   "description": "Specify custom certificate settings for BYO-PKI. This field is deprecated; use `certificate` instead.",
   "oneOf": [
@@ -252,40 +273,10 @@ export const zero_trust_gateway_custom_certificate_settings: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_enabled_download_phase`.
- */
-export const zero_trust_gateway_enabled_download_phase: JsonSchema = {
-  "description": "Specify whether to enable anti-virus scanning on downloads.",
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `zero-trust-gateway_enabled_upload_phase`.
- */
-export const zero_trust_gateway_enabled_upload_phase: JsonSchema = {
-  "description": "Specify whether to enable anti-virus scanning on uploads.",
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `zero-trust-gateway_extended-email-matching`.
  */
-export const zero_trust_gateway_extended_email_matching: JsonSchema = {
+export const zero$$trust$$gateway_extended$$email$$matching: JsonSchema = {
   "description": "Configures user email settings for firewall policies. When you enable this, the system standardizes email addresses in the identity portion of the rule to match extended email variants in firewall policies. When you disable this setting, the system matches email addresses exactly as you provide them. Enable this setting if your email uses `.` or `+` modifiers.",
   "oneOf": [
     {
@@ -310,25 +301,10 @@ export const zero_trust_gateway_extended_email_matching: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_fail_closed`.
- */
-export const zero_trust_gateway_fail_closed: JsonSchema = {
-  "description": "Specify whether to block requests for unscannable files.",
-  "oneOf": [
-    {
-      "type": "boolean"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `zero-trust-gateway_fips-settings`.
  */
-export const zero_trust_gateway_fips_settings: JsonSchema = {
+export const zero$$trust$$gateway_fips$$settings: JsonSchema = {
   "description": "Specify FIPS settings.",
   "oneOf": [
     {
@@ -349,7 +325,7 @@ export const zero_trust_gateway_fips_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_gateway-account-settings`.
  */
-export const zero_trust_gateway_gateway_account_settings: JsonSchema = {
+export const zero$$trust$$gateway_gateway$$account$$settings: JsonSchema = {
   "description": "Specify account settings.",
   "properties": {
     "settings": {
@@ -400,8 +376,15 @@ export const zero_trust_gateway_gateway_account_settings: JsonSchema = {
           "description": "Define the proxy inspection mode."
         },
         "max_ttl_secs": {
-          "$ref": "#/$defs/zero-trust-gateway_max-ttl-secs",
-          "description": "Account-level cap on DNS response TTLs, in seconds. Gateway rewrites DNS responses so returned record TTLs do not exceed this value. Null means no cap. Each DNS location can inherit, override, or disable it through the location `max_ttl` setting."
+          "description": "Account-level cap on DNS response TTLs, in seconds. Gateway rewrites DNS responses so returned record TTLs do not exceed this value. Null means no cap. Each DNS location can inherit, override, or disable it through the location `max_ttl` setting.",
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "protocol_detection": {
           "$ref": "#/$defs/zero-trust-gateway_protocol-detection",
@@ -425,7 +408,7 @@ export const zero_trust_gateway_gateway_account_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_host-selector-settings`.
  */
-export const zero_trust_gateway_host_selector_settings: JsonSchema = {
+export const zero$$trust$$gateway_host$$selector$$settings: JsonSchema = {
   "description": "Enable host selection in egress policies.",
   "oneOf": [
     {
@@ -453,7 +436,7 @@ export const zero_trust_gateway_host_selector_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_inspection-settings`.
  */
-export const zero_trust_gateway_inspection_settings: JsonSchema = {
+export const zero$$trust$$gateway_inspection$$settings: JsonSchema = {
   "description": "Define the proxy inspection mode.",
   "oneOf": [
     {
@@ -475,25 +458,10 @@ export const zero_trust_gateway_inspection_settings: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_max-ttl-secs`.
- */
-export const zero_trust_gateway_max_ttl_secs: JsonSchema = {
-  "description": "Account-level cap on DNS response TTLs, in seconds. Gateway rewrites DNS responses so returned record TTLs do not exceed this value. Null means no cap. Each DNS location can inherit, override, or disable it through the location `max_ttl` setting.",
-  "oneOf": [
-    {
-      "type": "integer"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `zero-trust-gateway_notification_settings`.
  */
-export const zero_trust_gateway_notification_settings: JsonSchema = {
+export const zero$$trust$$gateway_notification_settings: JsonSchema = {
   "description": "Configure the message the user's device shows during an antivirus scan.",
   "oneOf": [
     {
@@ -526,7 +494,7 @@ export const zero_trust_gateway_notification_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_protocol-detection`.
  */
-export const zero_trust_gateway_protocol_detection: JsonSchema = {
+export const zero$$trust$$gateway_protocol$$detection: JsonSchema = {
   "description": "Specify whether to detect protocols from the initial bytes of client traffic.",
   "oneOf": [
     {
@@ -554,7 +522,7 @@ export const zero_trust_gateway_protocol_detection: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_sandbox`.
  */
-export const zero_trust_gateway_sandbox: JsonSchema = {
+export const zero$$trust$$gateway_sandbox: JsonSchema = {
   "description": "Specify whether to enable the sandbox.",
   "oneOf": [
     {
@@ -590,7 +558,7 @@ export const zero_trust_gateway_sandbox: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_tls-settings`.
  */
-export const zero_trust_gateway_tls_settings: JsonSchema = {
+export const zero$$trust$$gateway_tls$$settings: JsonSchema = {
   "description": "Specify whether to inspect encrypted HTTP traffic.",
   "oneOf": [
     {
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/configurations/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/configurations/tools.ts
index 8ee6654f1..17500c452 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/configurations/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/configurations/tools.ts
@@ -3,132 +3,122 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
-import { zero_trust_gateway_identifier } from "../schemas.js";
 import {
-  zero_trust_gateway_activity_log_settings_output,
-  zero_trust_gateway_anti_virus_settings_output,
-  zero_trust_gateway_block_page_settings_output,
-  zero_trust_gateway_body_scanning_settings_output,
-  zero_trust_gateway_browser_isolation_settings_output,
-  zero_trust_gateway_certificate_settings_output,
-  zero_trust_gateway_custom_certificate_settings_output,
-  zero_trust_gateway_enabled_download_phase_output,
-  zero_trust_gateway_enabled_upload_phase_output,
-  zero_trust_gateway_extended_email_matching_output,
-  zero_trust_gateway_fail_closed_output,
-  zero_trust_gateway_fips_settings_output,
-  zero_trust_gateway_gateway_account_config_output,
-  zero_trust_gateway_gateway_account_settings_output,
-  zero_trust_gateway_host_selector_settings_output,
-  zero_trust_gateway_inspection_settings_output,
-  zero_trust_gateway_max_ttl_secs_output,
-  zero_trust_gateway_notification_settings_output,
-  zero_trust_gateway_protocol_detection_output,
-  zero_trust_gateway_sandbox_output,
-  zero_trust_gateway_tls_settings_output,
+  zero$$trust$$gateway_activity$$log$$settings,
+  zero$$trust$$gateway_anti$$virus$$settings,
+  zero$$trust$$gateway_block$$page$$settings,
+  zero$$trust$$gateway_body$$scanning$$settings,
+  zero$$trust$$gateway_browser$$isolation$$settings,
+  zero$$trust$$gateway_certificate$$settings,
+  zero$$trust$$gateway_custom$$certificate$$settings,
+  zero$$trust$$gateway_extended$$email$$matching,
+  zero$$trust$$gateway_fips$$settings,
+  zero$$trust$$gateway_gateway$$account$$settings,
+  zero$$trust$$gateway_gateway_account_config,
+  zero$$trust$$gateway_host$$selector$$settings,
+  zero$$trust$$gateway_inspection$$settings,
+  zero$$trust$$gateway_notification_settings,
+  zero$$trust$$gateway_protocol$$detection,
+  zero$$trust$$gateway_sandbox,
+  zero$$trust$$gateway_tls$$settings,
 } from "./outputs.js";
 import {
-  zero_trust_gateway_activity_log_settings,
-  zero_trust_gateway_anti_virus_settings,
-  zero_trust_gateway_block_page_settings,
-  zero_trust_gateway_body_scanning_settings,
-  zero_trust_gateway_browser_isolation_settings,
-  zero_trust_gateway_certificate_settings,
-  zero_trust_gateway_custom_certificate_settings,
-  zero_trust_gateway_enabled_download_phase,
-  zero_trust_gateway_enabled_upload_phase,
-  zero_trust_gateway_extended_email_matching,
-  zero_trust_gateway_fail_closed,
-  zero_trust_gateway_fips_settings,
-  zero_trust_gateway_gateway_account_settings,
-  zero_trust_gateway_host_selector_settings,
-  zero_trust_gateway_inspection_settings,
-  zero_trust_gateway_max_ttl_secs,
-  zero_trust_gateway_notification_settings,
-  zero_trust_gateway_protocol_detection,
-  zero_trust_gateway_sandbox,
-  zero_trust_gateway_tls_settings,
+  zero$$trust$$gateway_activity$$log$$settings as zero$$trust$$gateway_activity$$log$$settings$,
+  zero$$trust$$gateway_anti$$virus$$settings as zero$$trust$$gateway_anti$$virus$$settings$,
+  zero$$trust$$gateway_block$$page$$settings as zero$$trust$$gateway_block$$page$$settings$,
+  zero$$trust$$gateway_body$$scanning$$settings as zero$$trust$$gateway_body$$scanning$$settings$,
+  zero$$trust$$gateway_browser$$isolation$$settings as zero$$trust$$gateway_browser$$isolation$$settings$,
+  zero$$trust$$gateway_certificate$$settings as zero$$trust$$gateway_certificate$$settings$,
+  zero$$trust$$gateway_custom$$certificate$$settings as zero$$trust$$gateway_custom$$certificate$$settings$,
+  zero$$trust$$gateway_extended$$email$$matching as zero$$trust$$gateway_extended$$email$$matching$,
+  zero$$trust$$gateway_fips$$settings as zero$$trust$$gateway_fips$$settings$,
+  zero$$trust$$gateway_gateway$$account$$settings as zero$$trust$$gateway_gateway$$account$$settings$,
+  zero$$trust$$gateway_host$$selector$$settings as zero$$trust$$gateway_host$$selector$$settings$,
+  zero$$trust$$gateway_inspection$$settings as zero$$trust$$gateway_inspection$$settings$,
+  zero$$trust$$gateway_notification_settings as zero$$trust$$gateway_notification_settings$,
+  zero$$trust$$gateway_protocol$$detection as zero$$trust$$gateway_protocol$$detection$,
+  zero$$trust$$gateway_sandbox as zero$$trust$$gateway_sandbox$,
+  zero$$trust$$gateway_tls$$settings as zero$$trust$$gateway_tls$$settings$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.gateway.configurations`.
+ * The tools of `zeroTrust.gateway.configurations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_configurations_edit",
+    name: "zeroTrust_gateway_configurations_edit",
     title: "Patch Zero Trust account configuration",
-    description: "Update (PATCH) a single subcollection of settings such as `antivirus`, `tls_decrypt`, `activity_log`, `block_page`, `browser_isolation`, `fips`, `body_scanning`, `certificate`, or `max_ttl_secs` without updating the entire configuration object. This endpoint returns an error if any settings collection lacks proper configuration.",
+    description: "Update (PATCH) a single subcollection of settings such as `antivirus`, `tls_decrypt`, `activity_log`, `block_page`, `browser_isolation`, `fips`, `body_scanning`, `certificate`, or `max_ttl_secs` without updating the entire configuration object. This endpoint returns an error if any settings collection lacks proper configuration.\n\nPATCH /accounts/{account_id}/gateway/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "$ref": "#/$defs/zero-trust-gateway_gateway-account-settings"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_activity-log-settings": zero_trust_gateway_activity_log_settings,
-        "zero-trust-gateway_anti-virus-settings": zero_trust_gateway_anti_virus_settings,
-        "zero-trust-gateway_block-page-settings": zero_trust_gateway_block_page_settings,
-        "zero-trust-gateway_body-scanning-settings": zero_trust_gateway_body_scanning_settings,
-        "zero-trust-gateway_browser-isolation-settings": zero_trust_gateway_browser_isolation_settings,
-        "zero-trust-gateway_certificate-settings": zero_trust_gateway_certificate_settings,
-        "zero-trust-gateway_custom-certificate-settings": zero_trust_gateway_custom_certificate_settings,
-        "zero-trust-gateway_enabled_download_phase": zero_trust_gateway_enabled_download_phase,
-        "zero-trust-gateway_enabled_upload_phase": zero_trust_gateway_enabled_upload_phase,
-        "zero-trust-gateway_extended-email-matching": zero_trust_gateway_extended_email_matching,
-        "zero-trust-gateway_fail_closed": zero_trust_gateway_fail_closed,
-        "zero-trust-gateway_fips-settings": zero_trust_gateway_fips_settings,
-        "zero-trust-gateway_gateway-account-settings": zero_trust_gateway_gateway_account_settings,
-        "zero-trust-gateway_host-selector-settings": zero_trust_gateway_host_selector_settings,
-        "zero-trust-gateway_identifier": zero_trust_gateway_identifier,
-        "zero-trust-gateway_inspection-settings": zero_trust_gateway_inspection_settings,
-        "zero-trust-gateway_max-ttl-secs": zero_trust_gateway_max_ttl_secs,
-        "zero-trust-gateway_notification_settings": zero_trust_gateway_notification_settings,
-        "zero-trust-gateway_protocol-detection": zero_trust_gateway_protocol_detection,
-        "zero-trust-gateway_sandbox": zero_trust_gateway_sandbox,
-        "zero-trust-gateway_tls-settings": zero_trust_gateway_tls_settings,
+        "zero-trust-gateway_activity-log-settings": zero$$trust$$gateway_activity$$log$$settings$,
+        "zero-trust-gateway_anti-virus-settings": zero$$trust$$gateway_anti$$virus$$settings$,
+        "zero-trust-gateway_block-page-settings": zero$$trust$$gateway_block$$page$$settings$,
+        "zero-trust-gateway_body-scanning-settings": zero$$trust$$gateway_body$$scanning$$settings$,
+        "zero-trust-gateway_browser-isolation-settings": zero$$trust$$gateway_browser$$isolation$$settings$,
+        "zero-trust-gateway_certificate-settings": zero$$trust$$gateway_certificate$$settings$,
+        "zero-trust-gateway_custom-certificate-settings": zero$$trust$$gateway_custom$$certificate$$settings$,
+        "zero-trust-gateway_extended-email-matching": zero$$trust$$gateway_extended$$email$$matching$,
+        "zero-trust-gateway_fips-settings": zero$$trust$$gateway_fips$$settings$,
+        "zero-trust-gateway_gateway-account-settings": zero$$trust$$gateway_gateway$$account$$settings$,
+        "zero-trust-gateway_host-selector-settings": zero$$trust$$gateway_host$$selector$$settings$,
+        "zero-trust-gateway_inspection-settings": zero$$trust$$gateway_inspection$$settings$,
+        "zero-trust-gateway_notification_settings": zero$$trust$$gateway_notification_settings$,
+        "zero-trust-gateway_protocol-detection": zero$$trust$$gateway_protocol$$detection$,
+        "zero-trust-gateway_sandbox": zero$$trust$$gateway_sandbox$,
+        "zero-trust-gateway_tls-settings": zero$$trust$$gateway_tls$$settings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_gateway_account_config",
       $defs: {
-        "zero-trust-gateway_activity-log-settings": zero_trust_gateway_activity_log_settings_output,
-        "zero-trust-gateway_anti-virus-settings": zero_trust_gateway_anti_virus_settings_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_block-page-settings": zero_trust_gateway_block_page_settings_output,
-        "zero-trust-gateway_body-scanning-settings": zero_trust_gateway_body_scanning_settings_output,
-        "zero-trust-gateway_browser-isolation-settings": zero_trust_gateway_browser_isolation_settings_output,
-        "zero-trust-gateway_certificate-settings": zero_trust_gateway_certificate_settings_output,
-        "zero-trust-gateway_custom-certificate-settings": zero_trust_gateway_custom_certificate_settings_output,
-        "zero-trust-gateway_enabled_download_phase": zero_trust_gateway_enabled_download_phase_output,
-        "zero-trust-gateway_enabled_upload_phase": zero_trust_gateway_enabled_upload_phase_output,
-        "zero-trust-gateway_extended-email-matching": zero_trust_gateway_extended_email_matching_output,
-        "zero-trust-gateway_fail_closed": zero_trust_gateway_fail_closed_output,
-        "zero-trust-gateway_fips-settings": zero_trust_gateway_fips_settings_output,
-        "zero-trust-gateway_gateway-account-settings": zero_trust_gateway_gateway_account_settings_output,
-        "zero-trust-gateway_gateway_account_config": zero_trust_gateway_gateway_account_config_output,
-        "zero-trust-gateway_host-selector-settings": zero_trust_gateway_host_selector_settings_output,
-        "zero-trust-gateway_inspection-settings": zero_trust_gateway_inspection_settings_output,
-        "zero-trust-gateway_max-ttl-secs": zero_trust_gateway_max_ttl_secs_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_notification_settings": zero_trust_gateway_notification_settings_output,
-        "zero-trust-gateway_protocol-detection": zero_trust_gateway_protocol_detection_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_sandbox": zero_trust_gateway_sandbox_output,
-        "zero-trust-gateway_tls-settings": zero_trust_gateway_tls_settings_output,
+        "zero-trust-gateway_activity-log-settings": zero$$trust$$gateway_activity$$log$$settings,
+        "zero-trust-gateway_anti-virus-settings": zero$$trust$$gateway_anti$$virus$$settings,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_block-page-settings": zero$$trust$$gateway_block$$page$$settings,
+        "zero-trust-gateway_body-scanning-settings": zero$$trust$$gateway_body$$scanning$$settings,
+        "zero-trust-gateway_browser-isolation-settings": zero$$trust$$gateway_browser$$isolation$$settings,
+        "zero-trust-gateway_certificate-settings": zero$$trust$$gateway_certificate$$settings,
+        "zero-trust-gateway_custom-certificate-settings": zero$$trust$$gateway_custom$$certificate$$settings,
+        "zero-trust-gateway_extended-email-matching": zero$$trust$$gateway_extended$$email$$matching,
+        "zero-trust-gateway_fips-settings": zero$$trust$$gateway_fips$$settings,
+        "zero-trust-gateway_gateway-account-settings": zero$$trust$$gateway_gateway$$account$$settings,
+        "zero-trust-gateway_gateway_account_config": zero$$trust$$gateway_gateway_account_config,
+        "zero-trust-gateway_host-selector-settings": zero$$trust$$gateway_host$$selector$$settings,
+        "zero-trust-gateway_inspection-settings": zero$$trust$$gateway_inspection$$settings,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_notification_settings": zero$$trust$$gateway_notification_settings,
+        "zero-trust-gateway_protocol-detection": zero$$trust$$gateway_protocol$$detection,
+        "zero-trust-gateway_sandbox": zero$$trust$$gateway_sandbox,
+        "zero-trust-gateway_tls-settings": zero$$trust$$gateway_tls$$settings,
       },
     },
     annotations: {
@@ -157,31 +147,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_activity-log-settings": zero_trust_gateway_activity_log_settings_output,
-        "zero-trust-gateway_anti-virus-settings": zero_trust_gateway_anti_virus_settings_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_block-page-settings": zero_trust_gateway_block_page_settings_output,
-        "zero-trust-gateway_body-scanning-settings": zero_trust_gateway_body_scanning_settings_output,
-        "zero-trust-gateway_browser-isolation-settings": zero_trust_gateway_browser_isolation_settings_output,
-        "zero-trust-gateway_certificate-settings": zero_trust_gateway_certificate_settings_output,
-        "zero-trust-gateway_custom-certificate-settings": zero_trust_gateway_custom_certificate_settings_output,
-        "zero-trust-gateway_enabled_download_phase": zero_trust_gateway_enabled_download_phase_output,
-        "zero-trust-gateway_enabled_upload_phase": zero_trust_gateway_enabled_upload_phase_output,
-        "zero-trust-gateway_extended-email-matching": zero_trust_gateway_extended_email_matching_output,
-        "zero-trust-gateway_fail_closed": zero_trust_gateway_fail_closed_output,
-        "zero-trust-gateway_fips-settings": zero_trust_gateway_fips_settings_output,
-        "zero-trust-gateway_gateway-account-settings": zero_trust_gateway_gateway_account_settings_output,
-        "zero-trust-gateway_gateway_account_config": zero_trust_gateway_gateway_account_config_output,
-        "zero-trust-gateway_host-selector-settings": zero_trust_gateway_host_selector_settings_output,
-        "zero-trust-gateway_inspection-settings": zero_trust_gateway_inspection_settings_output,
-        "zero-trust-gateway_max-ttl-secs": zero_trust_gateway_max_ttl_secs_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_notification_settings": zero_trust_gateway_notification_settings_output,
-        "zero-trust-gateway_protocol-detection": zero_trust_gateway_protocol_detection_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_sandbox": zero_trust_gateway_sandbox_output,
-        "zero-trust-gateway_tls-settings": zero_trust_gateway_tls_settings_output,
+        "zero-trust-gateway_activity-log-settings": zero$$trust$$gateway_activity$$log$$settings,
+        "zero-trust-gateway_anti-virus-settings": zero$$trust$$gateway_anti$$virus$$settings,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_block-page-settings": zero$$trust$$gateway_block$$page$$settings,
+        "zero-trust-gateway_body-scanning-settings": zero$$trust$$gateway_body$$scanning$$settings,
+        "zero-trust-gateway_browser-isolation-settings": zero$$trust$$gateway_browser$$isolation$$settings,
+        "zero-trust-gateway_certificate-settings": zero$$trust$$gateway_certificate$$settings,
+        "zero-trust-gateway_custom-certificate-settings": zero$$trust$$gateway_custom$$certificate$$settings,
+        "zero-trust-gateway_extended-email-matching": zero$$trust$$gateway_extended$$email$$matching,
+        "zero-trust-gateway_fips-settings": zero$$trust$$gateway_fips$$settings,
+        "zero-trust-gateway_gateway-account-settings": zero$$trust$$gateway_gateway$$account$$settings,
+        "zero-trust-gateway_gateway_account_config": zero$$trust$$gateway_gateway_account_config,
+        "zero-trust-gateway_host-selector-settings": zero$$trust$$gateway_host$$selector$$settings,
+        "zero-trust-gateway_inspection-settings": zero$$trust$$gateway_inspection$$settings,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_notification_settings": zero$$trust$$gateway_notification_settings,
+        "zero-trust-gateway_protocol-detection": zero$$trust$$gateway_protocol$$detection,
+        "zero-trust-gateway_sandbox": zero$$trust$$gateway_sandbox,
+        "zero-trust-gateway_tls-settings": zero$$trust$$gateway_tls$$settings,
       },
     },
     request: (args) => ({
@@ -190,51 +175,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_configurations_get",
+    name: "zeroTrust_gateway_configurations_get",
     title: "Get Zero Trust account configuration",
-    description: "Retrieve the current Zero Trust account configuration.",
+    description: "Retrieve the current Zero Trust account configuration.\n\nGET /accounts/{account_id}/gateway/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier": zero_trust_gateway_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_gateway_account_config",
       $defs: {
-        "zero-trust-gateway_activity-log-settings": zero_trust_gateway_activity_log_settings_output,
-        "zero-trust-gateway_anti-virus-settings": zero_trust_gateway_anti_virus_settings_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_block-page-settings": zero_trust_gateway_block_page_settings_output,
-        "zero-trust-gateway_body-scanning-settings": zero_trust_gateway_body_scanning_settings_output,
-        "zero-trust-gateway_browser-isolation-settings": zero_trust_gateway_browser_isolation_settings_output,
-        "zero-trust-gateway_certificate-settings": zero_trust_gateway_certificate_settings_output,
-        "zero-trust-gateway_custom-certificate-settings": zero_trust_gateway_custom_certificate_settings_output,
-        "zero-trust-gateway_enabled_download_phase": zero_trust_gateway_enabled_download_phase_output,
-        "zero-trust-gateway_enabled_upload_phase": zero_trust_gateway_enabled_upload_phase_output,
-        "zero-trust-gateway_extended-email-matching": zero_trust_gateway_extended_email_matching_output,
-        "zero-trust-gateway_fail_closed": zero_trust_gateway_fail_closed_output,
-        "zero-trust-gateway_fips-settings": zero_trust_gateway_fips_settings_output,
-        "zero-trust-gateway_gateway-account-settings": zero_trust_gateway_gateway_account_settings_output,
-        "zero-trust-gateway_gateway_account_config": zero_trust_gateway_gateway_account_config_output,
-        "zero-trust-gateway_host-selector-settings": zero_trust_gateway_host_selector_settings_output,
-        "zero-trust-gateway_inspection-settings": zero_trust_gateway_inspection_settings_output,
-        "zero-trust-gateway_max-ttl-secs": zero_trust_gateway_max_ttl_secs_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_notification_settings": zero_trust_gateway_notification_settings_output,
-        "zero-trust-gateway_protocol-detection": zero_trust_gateway_protocol_detection_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_sandbox": zero_trust_gateway_sandbox_output,
-        "zero-trust-gateway_tls-settings": zero_trust_gateway_tls_settings_output,
+        "zero-trust-gateway_activity-log-settings": zero$$trust$$gateway_activity$$log$$settings,
+        "zero-trust-gateway_anti-virus-settings": zero$$trust$$gateway_anti$$virus$$settings,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_block-page-settings": zero$$trust$$gateway_block$$page$$settings,
+        "zero-trust-gateway_body-scanning-settings": zero$$trust$$gateway_body$$scanning$$settings,
+        "zero-trust-gateway_browser-isolation-settings": zero$$trust$$gateway_browser$$isolation$$settings,
+        "zero-trust-gateway_certificate-settings": zero$$trust$$gateway_certificate$$settings,
+        "zero-trust-gateway_custom-certificate-settings": zero$$trust$$gateway_custom$$certificate$$settings,
+        "zero-trust-gateway_extended-email-matching": zero$$trust$$gateway_extended$$email$$matching,
+        "zero-trust-gateway_fips-settings": zero$$trust$$gateway_fips$$settings,
+        "zero-trust-gateway_gateway-account-settings": zero$$trust$$gateway_gateway$$account$$settings,
+        "zero-trust-gateway_gateway_account_config": zero$$trust$$gateway_gateway_account_config,
+        "zero-trust-gateway_host-selector-settings": zero$$trust$$gateway_host$$selector$$settings,
+        "zero-trust-gateway_inspection-settings": zero$$trust$$gateway_inspection$$settings,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_notification_settings": zero$$trust$$gateway_notification_settings,
+        "zero-trust-gateway_protocol-detection": zero$$trust$$gateway_protocol$$detection,
+        "zero-trust-gateway_sandbox": zero$$trust$$gateway_sandbox,
+        "zero-trust-gateway_tls-settings": zero$$trust$$gateway_tls$$settings,
       },
     },
     annotations: {
@@ -263,31 +250,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_activity-log-settings": zero_trust_gateway_activity_log_settings_output,
-        "zero-trust-gateway_anti-virus-settings": zero_trust_gateway_anti_virus_settings_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_block-page-settings": zero_trust_gateway_block_page_settings_output,
-        "zero-trust-gateway_body-scanning-settings": zero_trust_gateway_body_scanning_settings_output,
-        "zero-trust-gateway_browser-isolation-settings": zero_trust_gateway_browser_isolation_settings_output,
-        "zero-trust-gateway_certificate-settings": zero_trust_gateway_certificate_settings_output,
-        "zero-trust-gateway_custom-certificate-settings": zero_trust_gateway_custom_certificate_settings_output,
-        "zero-trust-gateway_enabled_download_phase": zero_trust_gateway_enabled_download_phase_output,
-        "zero-trust-gateway_enabled_upload_phase": zero_trust_gateway_enabled_upload_phase_output,
-        "zero-trust-gateway_extended-email-matching": zero_trust_gateway_extended_email_matching_output,
-        "zero-trust-gateway_fail_closed": zero_trust_gateway_fail_closed_output,
-        "zero-trust-gateway_fips-settings": zero_trust_gateway_fips_settings_output,
-        "zero-trust-gateway_gateway-account-settings": zero_trust_gateway_gateway_account_settings_output,
-        "zero-trust-gateway_gateway_account_config": zero_trust_gateway_gateway_account_config_output,
-        "zero-trust-gateway_host-selector-settings": zero_trust_gateway_host_selector_settings_output,
-        "zero-trust-gateway_inspection-settings": zero_trust_gateway_inspection_settings_output,
-        "zero-trust-gateway_max-ttl-secs": zero_trust_gateway_max_ttl_secs_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_notification_settings": zero_trust_gateway_notification_settings_output,
-        "zero-trust-gateway_protocol-detection": zero_trust_gateway_protocol_detection_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_sandbox": zero_trust_gateway_sandbox_output,
-        "zero-trust-gateway_tls-settings": zero_trust_gateway_tls_settings_output,
+        "zero-trust-gateway_activity-log-settings": zero$$trust$$gateway_activity$$log$$settings,
+        "zero-trust-gateway_anti-virus-settings": zero$$trust$$gateway_anti$$virus$$settings,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_block-page-settings": zero$$trust$$gateway_block$$page$$settings,
+        "zero-trust-gateway_body-scanning-settings": zero$$trust$$gateway_body$$scanning$$settings,
+        "zero-trust-gateway_browser-isolation-settings": zero$$trust$$gateway_browser$$isolation$$settings,
+        "zero-trust-gateway_certificate-settings": zero$$trust$$gateway_certificate$$settings,
+        "zero-trust-gateway_custom-certificate-settings": zero$$trust$$gateway_custom$$certificate$$settings,
+        "zero-trust-gateway_extended-email-matching": zero$$trust$$gateway_extended$$email$$matching,
+        "zero-trust-gateway_fips-settings": zero$$trust$$gateway_fips$$settings,
+        "zero-trust-gateway_gateway-account-settings": zero$$trust$$gateway_gateway$$account$$settings,
+        "zero-trust-gateway_gateway_account_config": zero$$trust$$gateway_gateway_account_config,
+        "zero-trust-gateway_host-selector-settings": zero$$trust$$gateway_host$$selector$$settings,
+        "zero-trust-gateway_inspection-settings": zero$$trust$$gateway_inspection$$settings,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_notification_settings": zero$$trust$$gateway_notification_settings,
+        "zero-trust-gateway_protocol-detection": zero$$trust$$gateway_protocol$$detection,
+        "zero-trust-gateway_sandbox": zero$$trust$$gateway_sandbox,
+        "zero-trust-gateway_tls-settings": zero$$trust$$gateway_tls$$settings,
       },
     },
     request: (args) => ({
@@ -295,75 +277,75 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_configurations_update",
+    name: "zeroTrust_gateway_configurations_update",
     title: "Update Zero Trust account configuration",
-    description: "Update the current Zero Trust account configuration.",
+    description: "Update the current Zero Trust account configuration.\n\nPUT /accounts/{account_id}/gateway/configuration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "$ref": "#/$defs/zero-trust-gateway_gateway-account-settings"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_activity-log-settings": zero_trust_gateway_activity_log_settings,
-        "zero-trust-gateway_anti-virus-settings": zero_trust_gateway_anti_virus_settings,
-        "zero-trust-gateway_block-page-settings": zero_trust_gateway_block_page_settings,
-        "zero-trust-gateway_body-scanning-settings": zero_trust_gateway_body_scanning_settings,
-        "zero-trust-gateway_browser-isolation-settings": zero_trust_gateway_browser_isolation_settings,
-        "zero-trust-gateway_certificate-settings": zero_trust_gateway_certificate_settings,
-        "zero-trust-gateway_custom-certificate-settings": zero_trust_gateway_custom_certificate_settings,
-        "zero-trust-gateway_enabled_download_phase": zero_trust_gateway_enabled_download_phase,
-        "zero-trust-gateway_enabled_upload_phase": zero_trust_gateway_enabled_upload_phase,
-        "zero-trust-gateway_extended-email-matching": zero_trust_gateway_extended_email_matching,
-        "zero-trust-gateway_fail_closed": zero_trust_gateway_fail_closed,
-        "zero-trust-gateway_fips-settings": zero_trust_gateway_fips_settings,
-        "zero-trust-gateway_gateway-account-settings": zero_trust_gateway_gateway_account_settings,
-        "zero-trust-gateway_host-selector-settings": zero_trust_gateway_host_selector_settings,
-        "zero-trust-gateway_identifier": zero_trust_gateway_identifier,
-        "zero-trust-gateway_inspection-settings": zero_trust_gateway_inspection_settings,
-        "zero-trust-gateway_max-ttl-secs": zero_trust_gateway_max_ttl_secs,
-        "zero-trust-gateway_notification_settings": zero_trust_gateway_notification_settings,
-        "zero-trust-gateway_protocol-detection": zero_trust_gateway_protocol_detection,
-        "zero-trust-gateway_sandbox": zero_trust_gateway_sandbox,
-        "zero-trust-gateway_tls-settings": zero_trust_gateway_tls_settings,
+        "zero-trust-gateway_activity-log-settings": zero$$trust$$gateway_activity$$log$$settings$,
+        "zero-trust-gateway_anti-virus-settings": zero$$trust$$gateway_anti$$virus$$settings$,
+        "zero-trust-gateway_block-page-settings": zero$$trust$$gateway_block$$page$$settings$,
+        "zero-trust-gateway_body-scanning-settings": zero$$trust$$gateway_body$$scanning$$settings$,
+        "zero-trust-gateway_browser-isolation-settings": zero$$trust$$gateway_browser$$isolation$$settings$,
+        "zero-trust-gateway_certificate-settings": zero$$trust$$gateway_certificate$$settings$,
+        "zero-trust-gateway_custom-certificate-settings": zero$$trust$$gateway_custom$$certificate$$settings$,
+        "zero-trust-gateway_extended-email-matching": zero$$trust$$gateway_extended$$email$$matching$,
+        "zero-trust-gateway_fips-settings": zero$$trust$$gateway_fips$$settings$,
+        "zero-trust-gateway_gateway-account-settings": zero$$trust$$gateway_gateway$$account$$settings$,
+        "zero-trust-gateway_host-selector-settings": zero$$trust$$gateway_host$$selector$$settings$,
+        "zero-trust-gateway_inspection-settings": zero$$trust$$gateway_inspection$$settings$,
+        "zero-trust-gateway_notification_settings": zero$$trust$$gateway_notification_settings$,
+        "zero-trust-gateway_protocol-detection": zero$$trust$$gateway_protocol$$detection$,
+        "zero-trust-gateway_sandbox": zero$$trust$$gateway_sandbox$,
+        "zero-trust-gateway_tls-settings": zero$$trust$$gateway_tls$$settings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_gateway_account_config",
       $defs: {
-        "zero-trust-gateway_activity-log-settings": zero_trust_gateway_activity_log_settings_output,
-        "zero-trust-gateway_anti-virus-settings": zero_trust_gateway_anti_virus_settings_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_block-page-settings": zero_trust_gateway_block_page_settings_output,
-        "zero-trust-gateway_body-scanning-settings": zero_trust_gateway_body_scanning_settings_output,
-        "zero-trust-gateway_browser-isolation-settings": zero_trust_gateway_browser_isolation_settings_output,
-        "zero-trust-gateway_certificate-settings": zero_trust_gateway_certificate_settings_output,
-        "zero-trust-gateway_custom-certificate-settings": zero_trust_gateway_custom_certificate_settings_output,
-        "zero-trust-gateway_enabled_download_phase": zero_trust_gateway_enabled_download_phase_output,
-        "zero-trust-gateway_enabled_upload_phase": zero_trust_gateway_enabled_upload_phase_output,
-        "zero-trust-gateway_extended-email-matching": zero_trust_gateway_extended_email_matching_output,
-        "zero-trust-gateway_fail_closed": zero_trust_gateway_fail_closed_output,
-        "zero-trust-gateway_fips-settings": zero_trust_gateway_fips_settings_output,
-        "zero-trust-gateway_gateway-account-settings": zero_trust_gateway_gateway_account_settings_output,
-        "zero-trust-gateway_gateway_account_config": zero_trust_gateway_gateway_account_config_output,
-        "zero-trust-gateway_host-selector-settings": zero_trust_gateway_host_selector_settings_output,
-        "zero-trust-gateway_inspection-settings": zero_trust_gateway_inspection_settings_output,
-        "zero-trust-gateway_max-ttl-secs": zero_trust_gateway_max_ttl_secs_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_notification_settings": zero_trust_gateway_notification_settings_output,
-        "zero-trust-gateway_protocol-detection": zero_trust_gateway_protocol_detection_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_sandbox": zero_trust_gateway_sandbox_output,
-        "zero-trust-gateway_tls-settings": zero_trust_gateway_tls_settings_output,
+        "zero-trust-gateway_activity-log-settings": zero$$trust$$gateway_activity$$log$$settings,
+        "zero-trust-gateway_anti-virus-settings": zero$$trust$$gateway_anti$$virus$$settings,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_block-page-settings": zero$$trust$$gateway_block$$page$$settings,
+        "zero-trust-gateway_body-scanning-settings": zero$$trust$$gateway_body$$scanning$$settings,
+        "zero-trust-gateway_browser-isolation-settings": zero$$trust$$gateway_browser$$isolation$$settings,
+        "zero-trust-gateway_certificate-settings": zero$$trust$$gateway_certificate$$settings,
+        "zero-trust-gateway_custom-certificate-settings": zero$$trust$$gateway_custom$$certificate$$settings,
+        "zero-trust-gateway_extended-email-matching": zero$$trust$$gateway_extended$$email$$matching,
+        "zero-trust-gateway_fips-settings": zero$$trust$$gateway_fips$$settings,
+        "zero-trust-gateway_gateway-account-settings": zero$$trust$$gateway_gateway$$account$$settings,
+        "zero-trust-gateway_gateway_account_config": zero$$trust$$gateway_gateway_account_config,
+        "zero-trust-gateway_host-selector-settings": zero$$trust$$gateway_host$$selector$$settings,
+        "zero-trust-gateway_inspection-settings": zero$$trust$$gateway_inspection$$settings,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_notification_settings": zero$$trust$$gateway_notification_settings,
+        "zero-trust-gateway_protocol-detection": zero$$trust$$gateway_protocol$$detection,
+        "zero-trust-gateway_sandbox": zero$$trust$$gateway_sandbox,
+        "zero-trust-gateway_tls-settings": zero$$trust$$gateway_tls$$settings,
       },
     },
     annotations: {
@@ -392,31 +374,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_activity-log-settings": zero_trust_gateway_activity_log_settings_output,
-        "zero-trust-gateway_anti-virus-settings": zero_trust_gateway_anti_virus_settings_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_block-page-settings": zero_trust_gateway_block_page_settings_output,
-        "zero-trust-gateway_body-scanning-settings": zero_trust_gateway_body_scanning_settings_output,
-        "zero-trust-gateway_browser-isolation-settings": zero_trust_gateway_browser_isolation_settings_output,
-        "zero-trust-gateway_certificate-settings": zero_trust_gateway_certificate_settings_output,
-        "zero-trust-gateway_custom-certificate-settings": zero_trust_gateway_custom_certificate_settings_output,
-        "zero-trust-gateway_enabled_download_phase": zero_trust_gateway_enabled_download_phase_output,
-        "zero-trust-gateway_enabled_upload_phase": zero_trust_gateway_enabled_upload_phase_output,
-        "zero-trust-gateway_extended-email-matching": zero_trust_gateway_extended_email_matching_output,
-        "zero-trust-gateway_fail_closed": zero_trust_gateway_fail_closed_output,
-        "zero-trust-gateway_fips-settings": zero_trust_gateway_fips_settings_output,
-        "zero-trust-gateway_gateway-account-settings": zero_trust_gateway_gateway_account_settings_output,
-        "zero-trust-gateway_gateway_account_config": zero_trust_gateway_gateway_account_config_output,
-        "zero-trust-gateway_host-selector-settings": zero_trust_gateway_host_selector_settings_output,
-        "zero-trust-gateway_inspection-settings": zero_trust_gateway_inspection_settings_output,
-        "zero-trust-gateway_max-ttl-secs": zero_trust_gateway_max_ttl_secs_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_notification_settings": zero_trust_gateway_notification_settings_output,
-        "zero-trust-gateway_protocol-detection": zero_trust_gateway_protocol_detection_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_sandbox": zero_trust_gateway_sandbox_output,
-        "zero-trust-gateway_tls-settings": zero_trust_gateway_tls_settings_output,
+        "zero-trust-gateway_activity-log-settings": zero$$trust$$gateway_activity$$log$$settings,
+        "zero-trust-gateway_anti-virus-settings": zero$$trust$$gateway_anti$$virus$$settings,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_block-page-settings": zero$$trust$$gateway_block$$page$$settings,
+        "zero-trust-gateway_body-scanning-settings": zero$$trust$$gateway_body$$scanning$$settings,
+        "zero-trust-gateway_browser-isolation-settings": zero$$trust$$gateway_browser$$isolation$$settings,
+        "zero-trust-gateway_certificate-settings": zero$$trust$$gateway_certificate$$settings,
+        "zero-trust-gateway_custom-certificate-settings": zero$$trust$$gateway_custom$$certificate$$settings,
+        "zero-trust-gateway_extended-email-matching": zero$$trust$$gateway_extended$$email$$matching,
+        "zero-trust-gateway_fips-settings": zero$$trust$$gateway_fips$$settings,
+        "zero-trust-gateway_gateway-account-settings": zero$$trust$$gateway_gateway$$account$$settings,
+        "zero-trust-gateway_gateway_account_config": zero$$trust$$gateway_gateway_account_config,
+        "zero-trust-gateway_host-selector-settings": zero$$trust$$gateway_host$$selector$$settings,
+        "zero-trust-gateway_inspection-settings": zero$$trust$$gateway_inspection$$settings,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_notification_settings": zero$$trust$$gateway_notification_settings,
+        "zero-trust-gateway_protocol-detection": zero$$trust$$gateway_protocol$$detection,
+        "zero-trust-gateway_sandbox": zero$$trust$$gateway_sandbox,
+        "zero-trust-gateway_tls-settings": zero$$trust$$gateway_tls$$settings,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/dnsDestinationIps/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/dnsDestinationIps/outputs.ts
index 6d1157ff0..95d9ac1da 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/dnsDestinationIps/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/dnsDestinationIps/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_dns_destination_ip_pair` in responses.
  */
-export const zero_trust_gateway_dns_destination_ip_pair_output: JsonSchema = {
+export const zero$$trust$$gateway_dns_destination_ip_pair: JsonSchema = {
   "properties": {
     "backup_ip": {
       "type": "string"
@@ -38,7 +38,7 @@ export const zero_trust_gateway_dns_destination_ip_pair_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_response_collection-2` in responses.
  */
-export const zero_trust_gateway_response_collection_2_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/dnsDestinationIps/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/dnsDestinationIps/tools.ts
index 8de7fdf4c..55ef42748 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/dnsDestinationIps/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/dnsDestinationIps/tools.ts
@@ -3,52 +3,58 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_messages_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_result_info_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
-import { zero_trust_gateway_identifier } from "../schemas.js";
 import {
-  zero_trust_gateway_dns_destination_ip_pair_output,
-  zero_trust_gateway_response_collection_2_output,
+  zero$$trust$$gateway_dns_destination_ip_pair,
+  zero$$trust$$gateway_response_collection$$2,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.gateway.dns_destination_ips`.
+ * The tools of `zeroTrust.gateway.dnsDestinationIps`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_dns_destination_ips_list",
+    name: "zeroTrust_gateway_dnsDestinationIps_list",
     title: "List Zero Trust Gateway DNS destination IPv4 address pairs",
-    description: "List Zero Trust Gateway IPv4 address pairs for an account.",
+    description: "List Zero Trust Gateway IPv4 address pairs for an account.\n\nGET /accounts/{account_id}/gateway/dns_destination_ips",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier": zero_trust_gateway_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-2",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_dns_destination_ip_pair": zero_trust_gateway_dns_destination_ip_pair_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_response_collection-2": zero_trust_gateway_response_collection_2_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_dns_destination_ip_pair": zero$$trust$$gateway_dns_destination_ip_pair,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-2": zero$$trust$$gateway_response_collection$$2,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     annotations: {
@@ -84,13 +90,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_dns_destination_ip_pair": zero_trust_gateway_dns_destination_ip_pair_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_response_collection-2": zero_trust_gateway_response_collection_2_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_dns_destination_ip_pair": zero$$trust$$gateway_dns_destination_ip_pair,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-2": zero$$trust$$gateway_response_collection$$2,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/lists/items/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/lists/items/outputs.ts
index e34af97ed..2e5181dd5 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/lists/items/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/lists/items/outputs.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * The schema of `zero-trust-gateway_list_item_response_collection` in
  * responses.
  */
-export const zero_trust_gateway_list_item_response_collection_output: JsonSchema = {
+export const zero$$trust$$gateway_list_item_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/lists/items/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/lists/items/tools.ts
index e0143a967..a84146b0e 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/lists/items/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/lists/items/tools.ts
@@ -1,77 +1,79 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_messages,
 } from "../../../outputs.js";
-import { zero_trust_gateway_identifier_2 } from "../../../schemas.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_result_info_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_result_info,
 } from "../../outputs.js";
-import {
-  zero_trust_gateway_description_item_output,
-  zero_trust_gateway_items_output,
-  zero_trust_gateway_value_output,
-} from "../outputs.js";
-import { zero_trust_gateway_uuid_2 } from "../schemas.js";
-import { zero_trust_gateway_list_item_response_collection_output } from "./outputs.js";
+import { zero$$trust$$gateway_items } from "../outputs.js";
+import { zero$$trust$$gateway_list_item_response_collection } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.gateway.lists.items`.
+ * The tools of `zeroTrust.gateway.lists.items`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_lists_items_list",
+    name: "zeroTrust_gateway_lists_items_list",
     title: "Get Zero Trust list items",
-    description: "Fetch all items in a single Zero Trust list.",
+    description: "Fetch all items in a single Zero Trust list.\n\nGET /accounts/{account_id}/gateway/lists/{list_id}/items",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "list_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-2",
-          "description": "Identify the API resource with a UUID."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "Identify the API resource with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "Number of items per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of items per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_list_item_response_collection",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_list_item_response_collection": zero_trust_gateway_list_item_response_collection_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_list_item_response_collection": zero$$trust$$gateway_list_item_response_collection,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     annotations: {
@@ -100,23 +102,20 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_list_item_response_collection": zero_trust_gateway_list_item_response_collection_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_list_item_response_collection": zero$$trust$$gateway_list_item_response_collection,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/gateway/lists/${pathParam(args, "list_id")}/items`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/lists/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/lists/outputs.ts
index 040d3be2e..f8cb8b00b 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/lists/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/lists/outputs.ts
@@ -3,41 +3,21 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_count` in responses.
- */
-export const zero_trust_gateway_count_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `zero-trust-gateway_description` in responses.
- */
-export const zero_trust_gateway_description_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_description_item` in responses.
- */
-export const zero_trust_gateway_description_item_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_items` in responses.
  */
-export const zero_trust_gateway_items_output: JsonSchema = {
+export const zero$$trust$$gateway_items: JsonSchema = {
   "items": {
     "properties": {
       "created_at": {
-        "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+        "format": "date-time",
+        "type": "string"
       },
       "description": {
-        "$ref": "#/$defs/zero-trust-gateway_description_item"
+        "type": "string"
       },
       "value": {
-        "$ref": "#/$defs/zero-trust-gateway_value"
+        "type": "string"
       }
     },
     "type": "object"
@@ -48,7 +28,7 @@ export const zero_trust_gateway_items_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_list_single_response` in responses.
  */
-export const zero_trust_gateway_list_single_response_output: JsonSchema = {
+export const zero$$trust$$gateway_list_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -67,47 +47,53 @@ export const zero_trust_gateway_list_single_response_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_lists` in responses.
  */
-export const zero_trust_gateway_lists_output: JsonSchema = {
+export const zero$$trust$$gateway_lists: JsonSchema = {
   "properties": {
     "count": {
-      "$ref": "#/$defs/zero-trust-gateway_count"
+      "type": "number"
     },
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/zero-trust-gateway_description"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_uuid-2"
+      "type": "string"
     },
     "items": {
       "$ref": "#/$defs/zero-trust-gateway_items"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name"
+      "type": "string"
     },
     "type": {
-      "$ref": "#/$defs/zero-trust-gateway_type-2"
+      "enum": [
+        "SERIAL",
+        "URL",
+        "DOMAIN",
+        "EMAIL",
+        "IP",
+        "CATEGORY",
+        "LOCATION",
+        "DEVICE",
+        "AAGUID"
+      ],
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_name` in responses.
- */
-export const zero_trust_gateway_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_response_collection-3` in responses.
  */
-export const zero_trust_gateway_response_collection_3_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
@@ -130,7 +116,7 @@ export const zero_trust_gateway_response_collection_3_output: JsonSchema = {
  * The schema of `zero-trust-gateway_single_response_with_list_items` in
  * responses.
  */
-export const zero_trust_gateway_single_response_with_list_items_output: JsonSchema = {
+export const zero$$trust$$gateway_single_response_with_list_items: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -140,25 +126,38 @@ export const zero_trust_gateway_single_response_with_list_items_output: JsonSche
         "result": {
           "properties": {
             "created_at": {
-              "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+              "format": "date-time",
+              "type": "string"
             },
             "description": {
-              "$ref": "#/$defs/zero-trust-gateway_description"
+              "type": "string"
             },
             "id": {
-              "$ref": "#/$defs/zero-trust-gateway_uuid-2"
+              "type": "string"
             },
             "items": {
               "$ref": "#/$defs/zero-trust-gateway_items"
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name"
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/zero-trust-gateway_type-2"
+              "enum": [
+                "SERIAL",
+                "URL",
+                "DOMAIN",
+                "EMAIL",
+                "IP",
+                "CATEGORY",
+                "LOCATION",
+                "DEVICE",
+                "AAGUID"
+              ],
+              "type": "string"
             },
             "updated_at": {
-              "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+              "format": "date-time",
+              "type": "string"
             }
           },
           "type": "object"
@@ -168,35 +167,3 @@ export const zero_trust_gateway_single_response_with_list_items_output: JsonSche
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_type-2` in responses.
- */
-export const zero_trust_gateway_type_2_output: JsonSchema = {
-  "enum": [
-    "SERIAL",
-    "URL",
-    "DOMAIN",
-    "EMAIL",
-    "IP",
-    "CATEGORY",
-    "LOCATION",
-    "DEVICE",
-    "AAGUID"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_uuid-2` in responses.
- */
-export const zero_trust_gateway_uuid_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_value` in responses.
- */
-export const zero_trust_gateway_value_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/lists/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/lists/schemas.ts
index 1f4a7f13e..6d0912353 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/lists/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/lists/schemas.ts
@@ -3,82 +3,23 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_description`.
- */
-export const zero_trust_gateway_description: JsonSchema = {
-  "description": "Provide the list description.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_description_item`.
- */
-export const zero_trust_gateway_description_item: JsonSchema = {
-  "description": "Provide the list item description (optional).",
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_items-input`.
  */
-export const zero_trust_gateway_items_input: JsonSchema = {
+export const zero$$trust$$gateway_items$$input: JsonSchema = {
   "description": "Add items to the list.",
   "items": {
     "properties": {
       "description": {
-        "$ref": "#/$defs/zero-trust-gateway_description_item",
-        "description": "Provide the list item description (optional)."
+        "description": "Provide the list item description (optional).",
+        "type": "string"
       },
       "value": {
-        "$ref": "#/$defs/zero-trust-gateway_value",
-        "description": "Specify the item value."
+        "description": "Specify the item value.",
+        "type": "string"
       }
     },
     "type": "object"
   },
   "type": "array"
 };
-
-/**
- * The schema of `zero-trust-gateway_name`.
- */
-export const zero_trust_gateway_name: JsonSchema = {
-  "description": "Specify the list name.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_type-2`.
- */
-export const zero_trust_gateway_type_2: JsonSchema = {
-  "description": "Specify the list type.",
-  "enum": [
-    "SERIAL",
-    "URL",
-    "DOMAIN",
-    "EMAIL",
-    "IP",
-    "CATEGORY",
-    "LOCATION",
-    "DEVICE",
-    "AAGUID"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_uuid-2`.
- */
-export const zero_trust_gateway_uuid_2: JsonSchema = {
-  "description": "Identify the API resource with a UUID.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_value`.
- */
-export const zero_trust_gateway_value: JsonSchema = {
-  "description": "Specify the item value.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/lists/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/lists/tools.ts
index 3d6d43788..175ea5e5e 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/lists/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/lists/tools.ts
@@ -1,76 +1,66 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
-import { zero_trust_gateway_identifier_2 } from "../../schemas.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_empty_response_output,
-  zero_trust_gateway_result_info_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_empty_response,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
 import {
-  zero_trust_gateway_count_output,
-  zero_trust_gateway_description_item_output,
-  zero_trust_gateway_description_output,
-  zero_trust_gateway_items_output,
-  zero_trust_gateway_list_single_response_output,
-  zero_trust_gateway_lists_output,
-  zero_trust_gateway_name_output,
-  zero_trust_gateway_response_collection_3_output,
-  zero_trust_gateway_single_response_with_list_items_output,
-  zero_trust_gateway_type_2_output,
-  zero_trust_gateway_uuid_2_output,
-  zero_trust_gateway_value_output,
+  zero$$trust$$gateway_items,
+  zero$$trust$$gateway_list_single_response,
+  zero$$trust$$gateway_lists,
+  zero$$trust$$gateway_response_collection$$3,
+  zero$$trust$$gateway_single_response_with_list_items,
 } from "./outputs.js";
-import {
-  zero_trust_gateway_description,
-  zero_trust_gateway_description_item,
-  zero_trust_gateway_items_input,
-  zero_trust_gateway_name,
-  zero_trust_gateway_type_2,
-  zero_trust_gateway_uuid_2,
-  zero_trust_gateway_value,
-} from "./schemas.js";
+import { zero$$trust$$gateway_items$$input } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.gateway.lists`.
+ * The tools of `zeroTrust.gateway.lists`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_lists_create",
+    name: "zeroTrust_gateway_lists_create",
     title: "Create Zero Trust list",
-    description: "Creates a new Zero Trust list.",
+    description: "Creates a new Zero Trust list.\n\nPOST /accounts/{account_id}/gateway/lists",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/zero-trust-gateway_description",
-              "description": "Provide the list description."
+              "description": "Provide the list description.",
+              "type": "string"
             },
             "items": {
               "$ref": "#/$defs/zero-trust-gateway_items-input",
               "description": "Add items to the list."
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name",
-              "description": "Specify the list name."
+              "description": "Specify the list name.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/zero-trust-gateway_type-2",
-              "description": "Specify the list type."
+              "description": "Specify the list type.",
+              "enum": [
+                "SERIAL",
+                "URL",
+                "DOMAIN",
+                "EMAIL",
+                "IP",
+                "CATEGORY",
+                "LOCATION",
+                "DEVICE",
+                "AAGUID"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -78,36 +68,37 @@ export const tools: readonly Tool[] = [
             "type"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_description": zero_trust_gateway_description,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_items-input": zero_trust_gateway_items_input,
-        "zero-trust-gateway_name": zero_trust_gateway_name,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2,
-        "zero-trust-gateway_value": zero_trust_gateway_value,
+        "zero-trust-gateway_items-input": zero$$trust$$gateway_items$$input,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response_with_list_items",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response_with_list_items": zero_trust_gateway_single_response_with_list_items_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response_with_list_items": zero$$trust$$gateway_single_response_with_list_items,
       },
     },
     annotations: {
@@ -136,18 +127,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response_with_list_items": zero_trust_gateway_single_response_with_list_items_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response_with_list_items": zero$$trust$$gateway_single_response_with_list_items,
       },
     },
     request: (args) => ({
@@ -156,36 +140,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_lists_delete",
+    name: "zeroTrust_gateway_lists_delete",
     title: "Delete Zero Trust list",
-    description: "Deletes a Zero Trust list.",
+    description: "Deletes a Zero Trust list.\n\nDELETE /accounts/{account_id}/gateway/lists/{list_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "list_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-2",
-          "description": "Identify the API resource with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "Identify the API resource with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_empty_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -214,10 +204,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -225,16 +215,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_lists_edit",
+    name: "zeroTrust_gateway_lists_edit",
     title: "Patch Zero Trust list.",
-    description: "Appends or removes an item from a configured Zero Trust list.",
+    description: "Appends or removes an item from a configured Zero Trust list.\n\nPATCH /accounts/{account_id}/gateway/lists/{list_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "append": {
@@ -244,47 +230,50 @@ export const tools: readonly Tool[] = [
             "remove": {
               "description": "Lists of item values you want to remove.",
               "items": {
-                "$ref": "#/$defs/zero-trust-gateway_value"
+                "description": "Specify the item value.",
+                "type": "string"
               },
               "type": "array"
             }
           },
           "type": "object"
         },
-        "list_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-2",
-          "description": "Identify the API resource with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "Identify the API resource with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_items-input": zero_trust_gateway_items_input,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2,
-        "zero-trust-gateway_value": zero_trust_gateway_value,
+        "zero-trust-gateway_items-input": zero$$trust$$gateway_items$$input,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_list_single_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_count": zero_trust_gateway_count_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_list_single_response": zero_trust_gateway_list_single_response_output,
-        "zero-trust-gateway_lists": zero_trust_gateway_lists_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_list_single_response": zero$$trust$$gateway_list_single_response,
+        "zero-trust-gateway_lists": zero$$trust$$gateway_lists,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -313,20 +302,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_count": zero_trust_gateway_count_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_list_single_response": zero_trust_gateway_list_single_response_output,
-        "zero-trust-gateway_lists": zero_trust_gateway_lists_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_list_single_response": zero$$trust$$gateway_list_single_response,
+        "zero-trust-gateway_lists": zero$$trust$$gateway_lists,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -335,46 +316,44 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_lists_get",
+    name: "zeroTrust_gateway_lists_get",
     title: "Get Zero Trust list details",
-    description: "Fetch a single Zero Trust list.",
+    description: "Fetch a single Zero Trust list.\n\nGET /accounts/{account_id}/gateway/lists/{list_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "list_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-2",
-          "description": "Identify the API resource with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "Identify the API resource with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_list_single_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_count": zero_trust_gateway_count_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_list_single_response": zero_trust_gateway_list_single_response_output,
-        "zero-trust-gateway_lists": zero_trust_gateway_lists_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_list_single_response": zero$$trust$$gateway_list_single_response,
+        "zero-trust-gateway_lists": zero$$trust$$gateway_lists,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -403,20 +382,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_count": zero_trust_gateway_count_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_list_single_response": zero_trust_gateway_list_single_response_output,
-        "zero-trust-gateway_lists": zero_trust_gateway_lists_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_list_single_response": zero$$trust$$gateway_list_single_response,
+        "zero-trust-gateway_lists": zero$$trust$$gateway_lists,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -424,77 +395,92 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_lists_list",
+    name: "zeroTrust_gateway_lists_list",
     title: "List Zero Trust lists",
-    description: "Fetch all Zero Trust lists for an account.",
+    description: "Fetch all Zero Trust lists for an account.\n\nGET /accounts/{account_id}/gateway/lists",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "direction": {
-          "description": "Sort direction. Applies to the field named in `order_by`; when `order_by`\nis omitted it applies to the default `created_at` ordering. When\n`direction` is omitted the default is field-specific: explicitly choosing\n`created_at` or `updated_at` defaults to descending (newest first); `name`\nand `item_count` default to ascending; and the default `created_at`\nordering used when `order_by` is omitted is ascending (for backwards\ncompatibility).\n  * `asc` — ascending.\n  * `desc` — descending.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter the returned lists by one or more `field:value` pairs.\nRepeat the parameter to apply multiple filters; they are combined with\nlogical AND (a list must satisfy every filter to be returned).\n\nSupported fields and their matching behaviour:\n  * `name` — case-insensitive substring match on the list name.\n  * `id` — substring match on the list ID (UUID), with or without dashes.\n  * `type` — exact match on the list type. Supersedes the legacy `type` query\n    parameter when both are supplied. Must be one of the valid type values.\n  * `item_count` — exact integer match on the number of items in the list.\n\nEach entry must match one of the per-field patterns below: the field must be\none of `name`, `id`, `type`, or `item_count`; `name`/`id` accept any value,\n`type` is restricted to the valid list type values, and `item_count` must be\na non-negative integer.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "order_by": {
-          "description": "Field to sort the returned lists by. When omitted, results are ordered by\n`created_at` in ascending order (i.e. creation order) for backwards\ncompatibility. Supported values:\n  * `name` — sort alphabetically by list name.\n  * `created_at` — sort by creation time; defaults to descending unless `direction` is set.\n  * `updated_at` — sort by last-modified time; defaults to descending unless `direction` is set.\n  * `item_count` — sort by number of items in the list.",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at",
-            "item_count"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
-        },
-        "search": {
-          "description": "Case-insensitive substring match on the list name or description. When\ncombined with `filter`, both must match (logical AND).",
-          "type": "string"
+          "type": "object"
         },
-        "type": {
-          "$ref": "#/$defs/zero-trust-gateway_type-2",
-          "deprecated": true,
-          "description": "Specify the list type."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Sort direction. Applies to the field named in `order_by`; when `order_by`\nis omitted it applies to the default `created_at` ordering. When\n`direction` is omitted the default is field-specific: explicitly choosing\n`created_at` or `updated_at` defaults to descending (newest first); `name`\nand `item_count` default to ascending; and the default `created_at`\nordering used when `order_by` is omitted is ascending (for backwards\ncompatibility).\n  * `asc` — ascending.\n  * `desc` — descending.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter the returned lists by one or more `field:value` pairs.\nRepeat the parameter to apply multiple filters; they are combined with\nlogical AND (a list must satisfy every filter to be returned).\n\nSupported fields and their matching behaviour:\n  * `name` — case-insensitive substring match on the list name.\n  * `id` — substring match on the list ID (UUID), with or without dashes.\n  * `type` — exact match on the list type. Supersedes the legacy `type` query\n    parameter when both are supplied. Must be one of the valid type values.\n  * `item_count` — exact integer match on the number of items in the list.\n\nEach entry must match one of the per-field patterns below: the field must be\none of `name`, `id`, `type`, or `item_count`; `name`/`id` accept any value,\n`type` is restricted to the valid list type values, and `item_count` must be\na non-negative integer.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "order_by": {
+              "description": "Field to sort the returned lists by. When omitted, results are ordered by\n`created_at` in ascending order (i.e. creation order) for backwards\ncompatibility. Supported values:\n  * `name` — sort alphabetically by list name.\n  * `created_at` — sort by creation time; defaults to descending unless `direction` is set.\n  * `updated_at` — sort by last-modified time; defaults to descending unless `direction` is set.\n  * `item_count` — sort by number of items in the list.",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at",
+                "item_count"
+              ],
+              "type": "string"
+            },
+            "search": {
+              "description": "Case-insensitive substring match on the list name or description. When\ncombined with `filter`, both must match (logical AND).",
+              "type": "string"
+            },
+            "type": {
+              "deprecated": true,
+              "description": "Specify the list type.",
+              "enum": [
+                "SERIAL",
+                "URL",
+                "DOMAIN",
+                "EMAIL",
+                "IP",
+                "CATEGORY",
+                "LOCATION",
+                "DEVICE",
+                "AAGUID"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-3",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_count": zero_trust_gateway_count_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_lists": zero_trust_gateway_lists_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-3": zero_trust_gateway_response_collection_3_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_lists": zero$$trust$$gateway_lists,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-3": zero$$trust$$gateway_response_collection$$3,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     annotations: {
@@ -523,59 +509,47 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_count": zero_trust_gateway_count_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_lists": zero_trust_gateway_lists_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-3": zero_trust_gateway_response_collection_3_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_lists": zero$$trust$$gateway_lists,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-3": zero$$trust$$gateway_response_collection$$3,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/gateway/lists`,
       query: [
-        ["type", args["type"], true],
-        ["filter", args["filter"], true],
-        ["search", args["search"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
+        ["type", param(args, "query", "type"), true],
+        ["filter", param(args, "query", "filter"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_gateway_lists_update",
+    name: "zeroTrust_gateway_lists_update",
     title: "Update Zero Trust list",
-    description: "Updates a configured Zero Trust list. Skips updating list items if not included in the payload. A non empty list items will overwrite the existing list.",
+    description: "Updates a configured Zero Trust list. Skips updating list items if not included in the payload. A non empty list items will overwrite the existing list.\n\nPUT /accounts/{account_id}/gateway/lists/{list_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "description": {
-              "$ref": "#/$defs/zero-trust-gateway_description",
-              "description": "Provide the list description."
+              "description": "Provide the list description.",
+              "type": "string"
             },
             "items": {
               "$ref": "#/$defs/zero-trust-gateway_items-input",
               "description": "Add items to the list."
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name",
-              "description": "Specify the list name."
+              "description": "Specify the list name.",
+              "type": "string"
             }
           },
           "required": [
@@ -583,42 +557,42 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "list_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-2",
-          "description": "Identify the API resource with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "list_id": {
+              "description": "Identify the API resource with a UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "list_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "list_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_description": zero_trust_gateway_description,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_items-input": zero_trust_gateway_items_input,
-        "zero-trust-gateway_name": zero_trust_gateway_name,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2,
-        "zero-trust-gateway_value": zero_trust_gateway_value,
+        "zero-trust-gateway_items-input": zero$$trust$$gateway_items$$input,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_list_single_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_count": zero_trust_gateway_count_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_list_single_response": zero_trust_gateway_list_single_response_output,
-        "zero-trust-gateway_lists": zero_trust_gateway_lists_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_list_single_response": zero$$trust$$gateway_list_single_response,
+        "zero-trust-gateway_lists": zero$$trust$$gateway_lists,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -647,20 +621,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_count": zero_trust_gateway_count_output,
-        "zero-trust-gateway_description": zero_trust_gateway_description_output,
-        "zero-trust-gateway_description_item": zero_trust_gateway_description_item_output,
-        "zero-trust-gateway_items": zero_trust_gateway_items_output,
-        "zero-trust-gateway_list_single_response": zero_trust_gateway_list_single_response_output,
-        "zero-trust-gateway_lists": zero_trust_gateway_lists_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name": zero_trust_gateway_name_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_type-2": zero_trust_gateway_type_2_output,
-        "zero-trust-gateway_uuid-2": zero_trust_gateway_uuid_2_output,
-        "zero-trust-gateway_value": zero_trust_gateway_value_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_items": zero$$trust$$gateway_items,
+        "zero-trust-gateway_list_single_response": zero$$trust$$gateway_list_single_response,
+        "zero-trust-gateway_lists": zero$$trust$$gateway_lists,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/locations/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/locations/outputs.ts
index 36829d983..ce19e9928 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/locations/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/locations/outputs.ts
@@ -3,46 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_client-default` in responses.
- */
-export const zero_trust_gateway_client_default_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `zero-trust-gateway_dns-destination-ips-id-read` in responses.
- */
-export const zero_trust_gateway_dns_destination_ips_id_read_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_dns64-enabled` in responses.
- */
-export const zero_trust_gateway_dns64_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `zero-trust-gateway_dns_destination_ipv6_block_id` in
- * responses.
- */
-export const zero_trust_gateway_dns_destination_ipv6_block_id_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
 /**
  * The schema of `zero-trust-gateway_doh_endpoint` in responses.
  */
-export const zero_trust_gateway_doh_endpoint_output: JsonSchema = {
+export const zero$$trust$$gateway_doh_endpoint: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -60,7 +24,7 @@ export const zero_trust_gateway_doh_endpoint_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_dot_endpoint` in responses.
  */
-export const zero_trust_gateway_dot_endpoint_output: JsonSchema = {
+export const zero$$trust$$gateway_dot_endpoint: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -72,17 +36,10 @@ export const zero_trust_gateway_dot_endpoint_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_ecs-support` in responses.
- */
-export const zero_trust_gateway_ecs_support_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `zero-trust-gateway_endpoints` in responses.
  */
-export const zero_trust_gateway_endpoints_output: JsonSchema = {
+export const zero$$trust$$gateway_endpoints: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -113,17 +70,10 @@ export const zero_trust_gateway_endpoints_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_ip` in responses.
- */
-export const zero_trust_gateway_ip_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_ip_network` in responses.
  */
-export const zero_trust_gateway_ip_network_output: JsonSchema = {
+export const zero$$trust$$gateway_ip_network: JsonSchema = {
   "properties": {
     "network": {
       "type": "string"
@@ -138,7 +88,7 @@ export const zero_trust_gateway_ip_network_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ip_networks` in responses.
  */
-export const zero_trust_gateway_ip_networks_output: JsonSchema = {
+export const zero$$trust$$gateway_ip_networks: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -155,7 +105,7 @@ export const zero_trust_gateway_ip_networks_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv4_endpoint` in responses.
  */
-export const zero_trust_gateway_ipv4_endpoint_output: JsonSchema = {
+export const zero$$trust$$gateway_ipv4_endpoint: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -167,7 +117,7 @@ export const zero_trust_gateway_ipv4_endpoint_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv4_network` in responses.
  */
-export const zero_trust_gateway_ipv4_network_output: JsonSchema = {
+export const zero$$trust$$gateway_ipv4_network: JsonSchema = {
   "properties": {
     "network": {
       "type": "string"
@@ -182,7 +132,7 @@ export const zero_trust_gateway_ipv4_network_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv4_networks` in responses.
  */
-export const zero_trust_gateway_ipv4_networks_output: JsonSchema = {
+export const zero$$trust$$gateway_ipv4_networks: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -199,7 +149,7 @@ export const zero_trust_gateway_ipv4_networks_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv6_endpoint` in responses.
  */
-export const zero_trust_gateway_ipv6_endpoint_output: JsonSchema = {
+export const zero$$trust$$gateway_ipv6_endpoint: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -214,7 +164,7 @@ export const zero_trust_gateway_ipv6_endpoint_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv6_network` in responses.
  */
-export const zero_trust_gateway_ipv6_network_output: JsonSchema = {
+export const zero$$trust$$gateway_ipv6_network: JsonSchema = {
   "properties": {
     "network": {
       "type": "string"
@@ -229,7 +179,7 @@ export const zero_trust_gateway_ipv6_network_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv6_networks` in responses.
  */
-export const zero_trust_gateway_ipv6_networks_output: JsonSchema = {
+export const zero$$trust$$gateway_ipv6_networks: JsonSchema = {
   "oneOf": [
     {
       "items": {
@@ -246,37 +196,45 @@ export const zero_trust_gateway_ipv6_networks_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_locations` in responses.
  */
-export const zero_trust_gateway_locations_output: JsonSchema = {
+export const zero$$trust$$gateway_locations: JsonSchema = {
   "properties": {
     "client_default": {
-      "$ref": "#/$defs/zero-trust-gateway_client-default"
+      "type": "boolean"
     },
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "dns64_enabled": {
-      "$ref": "#/$defs/zero-trust-gateway_dns64-enabled"
+      "type": "boolean"
     },
     "dns_destination_ips_id": {
-      "$ref": "#/$defs/zero-trust-gateway_dns-destination-ips-id-read"
+      "type": "string"
     },
     "dns_destination_ipv6_block_id": {
-      "$ref": "#/$defs/zero-trust-gateway_dns_destination_ipv6_block_id"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "doh_subdomain": {
-      "$ref": "#/$defs/zero-trust-gateway_subdomain"
+      "type": "string"
     },
     "ecs_support": {
-      "$ref": "#/$defs/zero-trust-gateway_ecs-support"
+      "type": "boolean"
     },
     "endpoints": {
       "$ref": "#/$defs/zero-trust-gateway_endpoints"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+      "type": "string"
     },
     "ip": {
-      "$ref": "#/$defs/zero-trust-gateway_ip"
+      "type": "string"
     },
     "ipv4_destination": {
       "type": "string"
@@ -288,13 +246,14 @@ export const zero_trust_gateway_locations_output: JsonSchema = {
       "$ref": "#/$defs/zero-trust-gateway_max-ttl"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-2"
+      "type": "string"
     },
     "networks": {
       "$ref": "#/$defs/zero-trust-gateway_ipv4_networks"
     },
     "updated_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
@@ -303,7 +262,7 @@ export const zero_trust_gateway_locations_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_max-ttl` in responses.
  */
-export const zero_trust_gateway_max_ttl_output: JsonSchema = {
+export const zero$$trust$$gateway_max$$ttl: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -337,17 +296,10 @@ export const zero_trust_gateway_max_ttl_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_name-2` in responses.
- */
-export const zero_trust_gateway_name_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_response_collection-5` in responses.
  */
-export const zero_trust_gateway_response_collection_5_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection$$5: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
@@ -369,7 +321,7 @@ export const zero_trust_gateway_response_collection_5_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_single_response-3` in responses.
  */
-export const zero_trust_gateway_single_response_3_output: JsonSchema = {
+export const zero$$trust$$gateway_single_response$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -384,10 +336,3 @@ export const zero_trust_gateway_single_response_3_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_subdomain` in responses.
- */
-export const zero_trust_gateway_subdomain_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/locations/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/locations/schemas.ts
index 561285c13..542195336 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/locations/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/locations/schemas.ts
@@ -3,34 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_client-default`.
- */
-export const zero_trust_gateway_client_default: JsonSchema = {
-  "description": "Indicate whether this location is the default location.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `zero-trust-gateway_dns-destination-ips-id-write`.
- */
-export const zero_trust_gateway_dns_destination_ips_id_write: JsonSchema = {
-  "description": "Specify the identifier of the pair of IPv4 addresses assigned to this location. When creating a location, if this field is absent or set to null, the pair of shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned. When updating a location, if this field is absent or set to null, the pre-assigned pair remains unchanged.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_dns64-enabled`.
- */
-export const zero_trust_gateway_dns64_enabled: JsonSchema = {
-  "description": "Enable DNS64 synthesis for DNS queries matched to this location. When updating a location, omitting this field resets it to false.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `zero-trust-gateway_doh_endpoint`.
  */
-export const zero_trust_gateway_doh_endpoint: JsonSchema = {
+export const zero$$trust$$gateway_doh_endpoint: JsonSchema = {
   "properties": {
     "enabled": {
       "description": "Indicate whether the DOH endpoint is enabled for this location.",
@@ -51,7 +27,7 @@ export const zero_trust_gateway_doh_endpoint: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_dot_endpoint`.
  */
-export const zero_trust_gateway_dot_endpoint: JsonSchema = {
+export const zero$$trust$$gateway_dot_endpoint: JsonSchema = {
   "properties": {
     "enabled": {
       "description": "Indicate whether the DOT endpoint is enabled for this location.",
@@ -65,18 +41,10 @@ export const zero_trust_gateway_dot_endpoint: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_ecs-support`.
- */
-export const zero_trust_gateway_ecs_support: JsonSchema = {
-  "description": "Indicate whether the location must resolve EDNS queries.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `zero-trust-gateway_endpoints`.
  */
-export const zero_trust_gateway_endpoints: JsonSchema = {
+export const zero$$trust$$gateway_endpoints: JsonSchema = {
   "description": "Configure the destination endpoints for this location.",
   "oneOf": [
     {
@@ -111,7 +79,7 @@ export const zero_trust_gateway_endpoints: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ip_network`.
  */
-export const zero_trust_gateway_ip_network: JsonSchema = {
+export const zero$$trust$$gateway_ip_network: JsonSchema = {
   "properties": {
     "network": {
       "description": "Specify the IP address or IP CIDR.",
@@ -127,7 +95,7 @@ export const zero_trust_gateway_ip_network: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ip_networks`.
  */
-export const zero_trust_gateway_ip_networks: JsonSchema = {
+export const zero$$trust$$gateway_ip_networks: JsonSchema = {
   "description": "Specify the list of allowed source IP network ranges for this endpoint. When the list is empty, the endpoint allows all source IPs. The list takes effect only if the endpoint is enabled for this location.",
   "oneOf": [
     {
@@ -145,7 +113,7 @@ export const zero_trust_gateway_ip_networks: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv4_endpoint`.
  */
-export const zero_trust_gateway_ipv4_endpoint: JsonSchema = {
+export const zero$$trust$$gateway_ipv4_endpoint: JsonSchema = {
   "properties": {
     "enabled": {
       "description": "Indicate whether the IPv4 endpoint is enabled for this location.",
@@ -158,7 +126,7 @@ export const zero_trust_gateway_ipv4_endpoint: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv4_network`.
  */
-export const zero_trust_gateway_ipv4_network: JsonSchema = {
+export const zero$$trust$$gateway_ipv4_network: JsonSchema = {
   "properties": {
     "network": {
       "description": "Specify the IPv4 address or IPv4 CIDR. Limit IPv4 CIDRs to a maximum of /24.",
@@ -174,7 +142,7 @@ export const zero_trust_gateway_ipv4_network: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv4_networks`.
  */
-export const zero_trust_gateway_ipv4_networks: JsonSchema = {
+export const zero$$trust$$gateway_ipv4_networks: JsonSchema = {
   "description": "Specify the list of network ranges from which requests at this location originate. The list takes effect only if it is non-empty and the IPv4 endpoint is enabled for this location.",
   "oneOf": [
     {
@@ -192,7 +160,7 @@ export const zero_trust_gateway_ipv4_networks: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv6_endpoint`.
  */
-export const zero_trust_gateway_ipv6_endpoint: JsonSchema = {
+export const zero$$trust$$gateway_ipv6_endpoint: JsonSchema = {
   "properties": {
     "enabled": {
       "description": "Indicate whether the IPV6 endpoint is enabled for this location.",
@@ -209,7 +177,7 @@ export const zero_trust_gateway_ipv6_endpoint: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv6_network`.
  */
-export const zero_trust_gateway_ipv6_network: JsonSchema = {
+export const zero$$trust$$gateway_ipv6_network: JsonSchema = {
   "properties": {
     "network": {
       "description": "Specify the IPv6 address or IPv6 CIDR.",
@@ -225,7 +193,7 @@ export const zero_trust_gateway_ipv6_network: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_ipv6_networks`.
  */
-export const zero_trust_gateway_ipv6_networks: JsonSchema = {
+export const zero$$trust$$gateway_ipv6_networks: JsonSchema = {
   "description": "Specify the list of allowed source IPv6 network ranges for this endpoint. When the list is empty, the endpoint allows all source IPs. The list takes effect only if the endpoint is enabled for this location.",
   "oneOf": [
     {
@@ -243,7 +211,7 @@ export const zero_trust_gateway_ipv6_networks: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_max-ttl`.
  */
-export const zero_trust_gateway_max_ttl: JsonSchema = {
+export const zero$$trust$$gateway_max$$ttl: JsonSchema = {
   "description": "Controls how DNS response TTLs are capped for this location relative to the account `max_ttl_secs` setting. Omitting `max_ttl` on update resets it to `inherit`.",
   "oneOf": [
     {
@@ -279,11 +247,3 @@ export const zero_trust_gateway_max_ttl: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_name-2`.
- */
-export const zero_trust_gateway_name_2: JsonSchema = {
-  "description": "Specify the location name.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/locations/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/locations/tools.ts
index e0750dcd2..d0e96e97a 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/locations/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/locations/tools.ts
@@ -1,102 +1,81 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
-import { zero_trust_gateway_identifier_2 } from "../../schemas.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_empty_response_output,
-  zero_trust_gateway_result_info_output,
-  zero_trust_gateway_uuid_3_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_empty_response,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
-import { zero_trust_gateway_uuid_3 } from "../schemas.js";
 import {
-  zero_trust_gateway_client_default_output,
-  zero_trust_gateway_dns64_enabled_output,
-  zero_trust_gateway_dns_destination_ips_id_read_output,
-  zero_trust_gateway_dns_destination_ipv6_block_id_output,
-  zero_trust_gateway_doh_endpoint_output,
-  zero_trust_gateway_dot_endpoint_output,
-  zero_trust_gateway_ecs_support_output,
-  zero_trust_gateway_endpoints_output,
-  zero_trust_gateway_ip_network_output,
-  zero_trust_gateway_ip_networks_output,
-  zero_trust_gateway_ip_output,
-  zero_trust_gateway_ipv4_endpoint_output,
-  zero_trust_gateway_ipv4_network_output,
-  zero_trust_gateway_ipv4_networks_output,
-  zero_trust_gateway_ipv6_endpoint_output,
-  zero_trust_gateway_ipv6_network_output,
-  zero_trust_gateway_ipv6_networks_output,
-  zero_trust_gateway_locations_output,
-  zero_trust_gateway_max_ttl_output,
-  zero_trust_gateway_name_2_output,
-  zero_trust_gateway_response_collection_5_output,
-  zero_trust_gateway_single_response_3_output,
-  zero_trust_gateway_subdomain_output,
+  zero$$trust$$gateway_doh_endpoint,
+  zero$$trust$$gateway_dot_endpoint,
+  zero$$trust$$gateway_endpoints,
+  zero$$trust$$gateway_ip_network,
+  zero$$trust$$gateway_ip_networks,
+  zero$$trust$$gateway_ipv4_endpoint,
+  zero$$trust$$gateway_ipv4_network,
+  zero$$trust$$gateway_ipv4_networks,
+  zero$$trust$$gateway_ipv6_endpoint,
+  zero$$trust$$gateway_ipv6_network,
+  zero$$trust$$gateway_ipv6_networks,
+  zero$$trust$$gateway_locations,
+  zero$$trust$$gateway_max$$ttl,
+  zero$$trust$$gateway_response_collection$$5,
+  zero$$trust$$gateway_single_response$$3,
 } from "./outputs.js";
 import {
-  zero_trust_gateway_client_default,
-  zero_trust_gateway_dns64_enabled,
-  zero_trust_gateway_dns_destination_ips_id_write,
-  zero_trust_gateway_doh_endpoint,
-  zero_trust_gateway_dot_endpoint,
-  zero_trust_gateway_ecs_support,
-  zero_trust_gateway_endpoints,
-  zero_trust_gateway_ip_network,
-  zero_trust_gateway_ip_networks,
-  zero_trust_gateway_ipv4_endpoint,
-  zero_trust_gateway_ipv4_network,
-  zero_trust_gateway_ipv4_networks,
-  zero_trust_gateway_ipv6_endpoint,
-  zero_trust_gateway_ipv6_network,
-  zero_trust_gateway_ipv6_networks,
-  zero_trust_gateway_max_ttl,
-  zero_trust_gateway_name_2,
+  zero$$trust$$gateway_doh_endpoint as zero$$trust$$gateway_doh_endpoint$,
+  zero$$trust$$gateway_dot_endpoint as zero$$trust$$gateway_dot_endpoint$,
+  zero$$trust$$gateway_endpoints as zero$$trust$$gateway_endpoints$,
+  zero$$trust$$gateway_ip_network as zero$$trust$$gateway_ip_network$,
+  zero$$trust$$gateway_ip_networks as zero$$trust$$gateway_ip_networks$,
+  zero$$trust$$gateway_ipv4_endpoint as zero$$trust$$gateway_ipv4_endpoint$,
+  zero$$trust$$gateway_ipv4_network as zero$$trust$$gateway_ipv4_network$,
+  zero$$trust$$gateway_ipv4_networks as zero$$trust$$gateway_ipv4_networks$,
+  zero$$trust$$gateway_ipv6_endpoint as zero$$trust$$gateway_ipv6_endpoint$,
+  zero$$trust$$gateway_ipv6_network as zero$$trust$$gateway_ipv6_network$,
+  zero$$trust$$gateway_ipv6_networks as zero$$trust$$gateway_ipv6_networks$,
+  zero$$trust$$gateway_max$$ttl as zero$$trust$$gateway_max$$ttl$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.gateway.locations`.
+ * The tools of `zeroTrust.gateway.locations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_locations_create",
+    name: "zeroTrust_gateway_locations_create",
     title: "Create a Zero Trust Gateway location",
-    description: "Create a new Zero Trust Gateway location.",
+    description: "Create a new Zero Trust Gateway location.\n\nPOST /accounts/{account_id}/gateway/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "client_default": {
-              "$ref": "#/$defs/zero-trust-gateway_client-default",
               "default": false,
-              "description": "Indicate whether this location is the default location."
+              "description": "Indicate whether this location is the default location.",
+              "type": "boolean"
             },
             "dns64_enabled": {
-              "$ref": "#/$defs/zero-trust-gateway_dns64-enabled",
               "default": false,
-              "description": "Enable DNS64 synthesis for DNS queries matched to this location. When updating a location, omitting this field resets it to false."
+              "description": "Enable DNS64 synthesis for DNS queries matched to this location. When updating a location, omitting this field resets it to false.",
+              "type": "boolean"
             },
             "dns_destination_ips_id": {
-              "$ref": "#/$defs/zero-trust-gateway_dns-destination-ips-id-write",
-              "description": "Specify the identifier of the pair of IPv4 addresses assigned to this location. When creating a location, if this field is absent or set to null, the pair of shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned. When updating a location, if this field is absent or set to null, the pre-assigned pair remains unchanged."
+              "description": "Specify the identifier of the pair of IPv4 addresses assigned to this location. When creating a location, if this field is absent or set to null, the pair of shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned. When updating a location, if this field is absent or set to null, the pre-assigned pair remains unchanged.",
+              "type": "string"
             },
             "ecs_support": {
-              "$ref": "#/$defs/zero-trust-gateway_ecs-support",
               "default": false,
-              "description": "Indicate whether the location must resolve EDNS queries."
+              "description": "Indicate whether the location must resolve EDNS queries.",
+              "type": "boolean"
             },
             "endpoints": {
               "$ref": "#/$defs/zero-trust-gateway_endpoints",
@@ -110,8 +89,8 @@ export const tools: readonly Tool[] = [
               "description": "Controls how DNS response TTLs are capped for this location relative to the account `max_ttl_secs` setting. Omitting `max_ttl` on update resets it to `inherit`."
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name-2",
-              "description": "Specify the location name."
+              "description": "Specify the location name.",
+              "type": "string"
             },
             "networks": {
               "$ref": "#/$defs/zero-trust-gateway_ipv4_networks",
@@ -122,62 +101,60 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default,
-        "zero-trust-gateway_dns-destination-ips-id-write": zero_trust_gateway_dns_destination_ips_id_write,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint$,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint$,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints$,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network$,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks$,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint$,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network$,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks$,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint$,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network$,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks$,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-3",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default_output,
-        "zero-trust-gateway_dns-destination-ips-id-read": zero_trust_gateway_dns_destination_ips_id_read_output,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled_output,
-        "zero-trust-gateway_dns_destination_ipv6_block_id": zero_trust_gateway_dns_destination_ipv6_block_id_output,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint_output,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint_output,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support_output,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints_output,
-        "zero-trust-gateway_ip": zero_trust_gateway_ip_output,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network_output,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks_output,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint_output,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network_output,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks_output,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint_output,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network_output,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks_output,
-        "zero-trust-gateway_locations": zero_trust_gateway_locations_output,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-3": zero_trust_gateway_single_response_3_output,
-        "zero-trust-gateway_subdomain": zero_trust_gateway_subdomain_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks,
+        "zero-trust-gateway_locations": zero$$trust$$gateway_locations,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response-3": zero$$trust$$gateway_single_response$$3,
       },
     },
     annotations: {
@@ -212,33 +189,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default_output,
-        "zero-trust-gateway_dns-destination-ips-id-read": zero_trust_gateway_dns_destination_ips_id_read_output,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled_output,
-        "zero-trust-gateway_dns_destination_ipv6_block_id": zero_trust_gateway_dns_destination_ipv6_block_id_output,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint_output,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint_output,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support_output,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints_output,
-        "zero-trust-gateway_ip": zero_trust_gateway_ip_output,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network_output,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks_output,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint_output,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network_output,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks_output,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint_output,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network_output,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks_output,
-        "zero-trust-gateway_locations": zero_trust_gateway_locations_output,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-3": zero_trust_gateway_single_response_3_output,
-        "zero-trust-gateway_subdomain": zero_trust_gateway_subdomain_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks,
+        "zero-trust-gateway_locations": zero$$trust$$gateway_locations,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response-3": zero$$trust$$gateway_single_response$$3,
       },
     },
     request: (args) => ({
@@ -247,35 +214,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_locations_delete",
+    name: "zeroTrust_gateway_locations_delete",
     title: "Delete a Zero Trust Gateway location",
-    description: "Delete a configured Zero Trust Gateway location.",
+    description: "Delete a configured Zero Trust Gateway location.\n\nDELETE /accounts/{account_id}/gateway/locations/{location_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "location_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "location_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "location_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "location_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_empty_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -310,10 +283,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -321,58 +294,54 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_locations_get",
+    name: "zeroTrust_gateway_locations_get",
     title: "Get Zero Trust Gateway location details",
-    description: "Get a single Zero Trust Gateway location.",
+    description: "Get a single Zero Trust Gateway location.\n\nGET /accounts/{account_id}/gateway/locations/{location_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "location_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "location_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "location_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "location_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-3",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default_output,
-        "zero-trust-gateway_dns-destination-ips-id-read": zero_trust_gateway_dns_destination_ips_id_read_output,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled_output,
-        "zero-trust-gateway_dns_destination_ipv6_block_id": zero_trust_gateway_dns_destination_ipv6_block_id_output,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint_output,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint_output,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support_output,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints_output,
-        "zero-trust-gateway_ip": zero_trust_gateway_ip_output,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network_output,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks_output,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint_output,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network_output,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks_output,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint_output,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network_output,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks_output,
-        "zero-trust-gateway_locations": zero_trust_gateway_locations_output,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-3": zero_trust_gateway_single_response_3_output,
-        "zero-trust-gateway_subdomain": zero_trust_gateway_subdomain_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks,
+        "zero-trust-gateway_locations": zero$$trust$$gateway_locations,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response-3": zero$$trust$$gateway_single_response$$3,
       },
     },
     annotations: {
@@ -408,33 +377,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default_output,
-        "zero-trust-gateway_dns-destination-ips-id-read": zero_trust_gateway_dns_destination_ips_id_read_output,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled_output,
-        "zero-trust-gateway_dns_destination_ipv6_block_id": zero_trust_gateway_dns_destination_ipv6_block_id_output,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint_output,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint_output,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support_output,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints_output,
-        "zero-trust-gateway_ip": zero_trust_gateway_ip_output,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network_output,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks_output,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint_output,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network_output,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks_output,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint_output,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network_output,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks_output,
-        "zero-trust-gateway_locations": zero_trust_gateway_locations_output,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-3": zero_trust_gateway_single_response_3_output,
-        "zero-trust-gateway_subdomain": zero_trust_gateway_subdomain_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks,
+        "zero-trust-gateway_locations": zero$$trust$$gateway_locations,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response-3": zero$$trust$$gateway_single_response$$3,
       },
     },
     request: (args) => ({
@@ -442,83 +401,86 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_locations_list",
+    name: "zeroTrust_gateway_locations_list",
     title: "List Zero Trust Gateway locations",
-    description: "List Zero Trust Gateway locations for an account.",
+    description: "List Zero Trust Gateway locations for an account.\n\nGET /accounts/{account_id}/gateway/locations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "direction": {
-          "description": "Sort direction. Only takes effect when `order_by` is also provided; it\nis ignored otherwise. When `direction` is omitted the effective\ndirection is field-specific: `created_at` and `updated_at` default to\ndescending (newest first); `name` defaults to ascending.\n  * `asc` — ascending.\n  * `desc` — descending.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter the returned locations by one or more `field:value` pairs.\nRepeat the parameter to apply multiple filters; they are combined with\nlogical AND (a location must satisfy every filter to be returned).\n\nSupported fields and their matching behaviour:\n  * `name` — case-insensitive substring match on the location name.\n  * `id` — substring match on the location ID (UUID), with or without dashes.\n  * `is_default` — whether it is the default for the account.\n\nEach entry must match one of the per-field patterns below:\n  * the field must be one of `name`, `id`, or `is_default`;\n  * `name`/`id` accept any value;\n  * `is_default` only accepts `true` or `false`; any other value returns `400`",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "order_by": {
-          "description": "Field to sort the returned locations by. When omitted, the order of\nresults is unspecified. Supported values:\n  * `name` — sort alphabetically by location name.\n  * `created_at` — sort by creation time; defaults to descending unless `direction` is set.\n  * `updated_at` — sort by last-modified time; defaults to descending unless `direction` is set.",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "search": {
-          "description": "Case-insensitive substring match on the location name. When combined\nwith `filter`, both must match (logical AND).",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Sort direction. Only takes effect when `order_by` is also provided; it\nis ignored otherwise. When `direction` is omitted the effective\ndirection is field-specific: `created_at` and `updated_at` default to\ndescending (newest first); `name` defaults to ascending.\n  * `asc` — ascending.\n  * `desc` — descending.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter the returned locations by one or more `field:value` pairs.\nRepeat the parameter to apply multiple filters; they are combined with\nlogical AND (a location must satisfy every filter to be returned).\n\nSupported fields and their matching behaviour:\n  * `name` — case-insensitive substring match on the location name.\n  * `id` — substring match on the location ID (UUID), with or without dashes.\n  * `is_default` — whether it is the default for the account.\n\nEach entry must match one of the per-field patterns below:\n  * the field must be one of `name`, `id`, or `is_default`;\n  * `name`/`id` accept any value;\n  * `is_default` only accepts `true` or `false`; any other value returns `400`",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "order_by": {
+              "description": "Field to sort the returned locations by. When omitted, the order of\nresults is unspecified. Supported values:\n  * `name` — sort alphabetically by location name.\n  * `created_at` — sort by creation time; defaults to descending unless `direction` is set.\n  * `updated_at` — sort by last-modified time; defaults to descending unless `direction` is set.",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "search": {
+              "description": "Case-insensitive substring match on the location name. When combined\nwith `filter`, both must match (logical AND).",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-5",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default_output,
-        "zero-trust-gateway_dns-destination-ips-id-read": zero_trust_gateway_dns_destination_ips_id_read_output,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled_output,
-        "zero-trust-gateway_dns_destination_ipv6_block_id": zero_trust_gateway_dns_destination_ipv6_block_id_output,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint_output,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint_output,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support_output,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints_output,
-        "zero-trust-gateway_ip": zero_trust_gateway_ip_output,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network_output,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks_output,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint_output,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network_output,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks_output,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint_output,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network_output,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks_output,
-        "zero-trust-gateway_locations": zero_trust_gateway_locations_output,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-5": zero_trust_gateway_response_collection_5_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_subdomain": zero_trust_gateway_subdomain_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks,
+        "zero-trust-gateway_locations": zero$$trust$$gateway_locations,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-5": zero$$trust$$gateway_response_collection$$5,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     annotations: {
@@ -554,78 +516,64 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default_output,
-        "zero-trust-gateway_dns-destination-ips-id-read": zero_trust_gateway_dns_destination_ips_id_read_output,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled_output,
-        "zero-trust-gateway_dns_destination_ipv6_block_id": zero_trust_gateway_dns_destination_ipv6_block_id_output,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint_output,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint_output,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support_output,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints_output,
-        "zero-trust-gateway_ip": zero_trust_gateway_ip_output,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network_output,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks_output,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint_output,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network_output,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks_output,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint_output,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network_output,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks_output,
-        "zero-trust-gateway_locations": zero_trust_gateway_locations_output,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-5": zero_trust_gateway_response_collection_5_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_subdomain": zero_trust_gateway_subdomain_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks,
+        "zero-trust-gateway_locations": zero$$trust$$gateway_locations,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-5": zero$$trust$$gateway_response_collection$$5,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/gateway/locations`,
       query: [
-        ["filter", args["filter"], true],
-        ["search", args["search"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
+        ["filter", param(args, "query", "filter"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_gateway_locations_update",
+    name: "zeroTrust_gateway_locations_update",
     title: "Update a Zero Trust Gateway location",
-    description: "Update a configured Zero Trust Gateway location.",
+    description: "Update a configured Zero Trust Gateway location.\n\nPUT /accounts/{account_id}/gateway/locations/{location_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "client_default": {
-              "$ref": "#/$defs/zero-trust-gateway_client-default",
               "default": false,
-              "description": "Indicate whether this location is the default location."
+              "description": "Indicate whether this location is the default location.",
+              "type": "boolean"
             },
             "dns64_enabled": {
-              "$ref": "#/$defs/zero-trust-gateway_dns64-enabled",
               "default": false,
-              "description": "Enable DNS64 synthesis for DNS queries matched to this location. When updating a location, omitting this field resets it to false."
+              "description": "Enable DNS64 synthesis for DNS queries matched to this location. When updating a location, omitting this field resets it to false.",
+              "type": "boolean"
             },
             "dns_destination_ips_id": {
-              "$ref": "#/$defs/zero-trust-gateway_dns-destination-ips-id-write",
-              "description": "Specify the identifier of the pair of IPv4 addresses assigned to this location. When creating a location, if this field is absent or set to null, the pair of shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned. When updating a location, if this field is absent or set to null, the pre-assigned pair remains unchanged."
+              "description": "Specify the identifier of the pair of IPv4 addresses assigned to this location. When creating a location, if this field is absent or set to null, the pair of shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned. When updating a location, if this field is absent or set to null, the pre-assigned pair remains unchanged.",
+              "type": "string"
             },
             "ecs_support": {
-              "$ref": "#/$defs/zero-trust-gateway_ecs-support",
               "default": false,
-              "description": "Indicate whether the location must resolve EDNS queries."
+              "description": "Indicate whether the location must resolve EDNS queries.",
+              "type": "boolean"
             },
             "endpoints": {
               "$ref": "#/$defs/zero-trust-gateway_endpoints",
@@ -639,8 +587,8 @@ export const tools: readonly Tool[] = [
               "description": "Controls how DNS response TTLs are capped for this location relative to the account `max_ttl_secs` setting. Omitting `max_ttl` on update resets it to `inherit`."
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name-2",
-              "description": "Specify the location name."
+              "description": "Specify the location name.",
+              "type": "string"
             },
             "networks": {
               "$ref": "#/$defs/zero-trust-gateway_ipv4_networks",
@@ -652,66 +600,63 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "location_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "location_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "location_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "location_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default,
-        "zero-trust-gateway_dns-destination-ips-id-write": zero_trust_gateway_dns_destination_ips_id_write,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint$,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint$,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints$,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network$,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks$,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint$,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network$,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks$,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint$,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network$,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks$,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-3",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default_output,
-        "zero-trust-gateway_dns-destination-ips-id-read": zero_trust_gateway_dns_destination_ips_id_read_output,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled_output,
-        "zero-trust-gateway_dns_destination_ipv6_block_id": zero_trust_gateway_dns_destination_ipv6_block_id_output,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint_output,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint_output,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support_output,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints_output,
-        "zero-trust-gateway_ip": zero_trust_gateway_ip_output,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network_output,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks_output,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint_output,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network_output,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks_output,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint_output,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network_output,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks_output,
-        "zero-trust-gateway_locations": zero_trust_gateway_locations_output,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-3": zero_trust_gateway_single_response_3_output,
-        "zero-trust-gateway_subdomain": zero_trust_gateway_subdomain_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks,
+        "zero-trust-gateway_locations": zero$$trust$$gateway_locations,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response-3": zero$$trust$$gateway_single_response$$3,
       },
     },
     annotations: {
@@ -746,33 +691,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_client-default": zero_trust_gateway_client_default_output,
-        "zero-trust-gateway_dns-destination-ips-id-read": zero_trust_gateway_dns_destination_ips_id_read_output,
-        "zero-trust-gateway_dns64-enabled": zero_trust_gateway_dns64_enabled_output,
-        "zero-trust-gateway_dns_destination_ipv6_block_id": zero_trust_gateway_dns_destination_ipv6_block_id_output,
-        "zero-trust-gateway_doh_endpoint": zero_trust_gateway_doh_endpoint_output,
-        "zero-trust-gateway_dot_endpoint": zero_trust_gateway_dot_endpoint_output,
-        "zero-trust-gateway_ecs-support": zero_trust_gateway_ecs_support_output,
-        "zero-trust-gateway_endpoints": zero_trust_gateway_endpoints_output,
-        "zero-trust-gateway_ip": zero_trust_gateway_ip_output,
-        "zero-trust-gateway_ip_network": zero_trust_gateway_ip_network_output,
-        "zero-trust-gateway_ip_networks": zero_trust_gateway_ip_networks_output,
-        "zero-trust-gateway_ipv4_endpoint": zero_trust_gateway_ipv4_endpoint_output,
-        "zero-trust-gateway_ipv4_network": zero_trust_gateway_ipv4_network_output,
-        "zero-trust-gateway_ipv4_networks": zero_trust_gateway_ipv4_networks_output,
-        "zero-trust-gateway_ipv6_endpoint": zero_trust_gateway_ipv6_endpoint_output,
-        "zero-trust-gateway_ipv6_network": zero_trust_gateway_ipv6_network_output,
-        "zero-trust-gateway_ipv6_networks": zero_trust_gateway_ipv6_networks_output,
-        "zero-trust-gateway_locations": zero_trust_gateway_locations_output,
-        "zero-trust-gateway_max-ttl": zero_trust_gateway_max_ttl_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-2": zero_trust_gateway_name_2_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-3": zero_trust_gateway_single_response_3_output,
-        "zero-trust-gateway_subdomain": zero_trust_gateway_subdomain_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_doh_endpoint": zero$$trust$$gateway_doh_endpoint,
+        "zero-trust-gateway_dot_endpoint": zero$$trust$$gateway_dot_endpoint,
+        "zero-trust-gateway_endpoints": zero$$trust$$gateway_endpoints,
+        "zero-trust-gateway_ip_network": zero$$trust$$gateway_ip_network,
+        "zero-trust-gateway_ip_networks": zero$$trust$$gateway_ip_networks,
+        "zero-trust-gateway_ipv4_endpoint": zero$$trust$$gateway_ipv4_endpoint,
+        "zero-trust-gateway_ipv4_network": zero$$trust$$gateway_ipv4_network,
+        "zero-trust-gateway_ipv4_networks": zero$$trust$$gateway_ipv4_networks,
+        "zero-trust-gateway_ipv6_endpoint": zero$$trust$$gateway_ipv6_endpoint,
+        "zero-trust-gateway_ipv6_network": zero$$trust$$gateway_ipv6_network,
+        "zero-trust-gateway_ipv6_networks": zero$$trust$$gateway_ipv6_networks,
+        "zero-trust-gateway_locations": zero$$trust$$gateway_locations,
+        "zero-trust-gateway_max-ttl": zero$$trust$$gateway_max$$ttl,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_single_response-3": zero$$trust$$gateway_single_response$$3,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/logging/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/logging/outputs.ts
index 4f828b46d..aadc5f68b 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/logging/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/logging/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_account-log-options` in responses.
  */
-export const zero_trust_gateway_account_log_options_output: JsonSchema = {
+export const zero$$trust$$gateway_account$$log$$options: JsonSchema = {
   "properties": {
     "log_all": {
       "type": "boolean"
@@ -22,7 +22,7 @@ export const zero_trust_gateway_account_log_options_output: JsonSchema = {
  * The schema of `zero-trust-gateway_gateway-account-logging-settings` in
  * responses.
  */
-export const zero_trust_gateway_gateway_account_logging_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_gateway$$account$$logging$$settings: JsonSchema = {
   "properties": {
     "redact_pii": {
       "type": "boolean"
@@ -49,7 +49,7 @@ export const zero_trust_gateway_gateway_account_logging_settings_output: JsonSch
  * The schema of `zero-trust-gateway_gateway-account-logging-settings-response`
  * in responses.
  */
-export const zero_trust_gateway_gateway_account_logging_settings_response_output: JsonSchema = {
+export const zero$$trust$$gateway_gateway$$account$$logging$$settings$$response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/logging/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/logging/schemas.ts
index 10207ddd6..672270906 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/logging/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/logging/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_account-log-options`.
  */
-export const zero_trust_gateway_account_log_options: JsonSchema = {
+export const zero$$trust$$gateway_account$$log$$options: JsonSchema = {
   "properties": {
     "log_all": {
       "default": false,
@@ -25,7 +25,7 @@ export const zero_trust_gateway_account_log_options: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_gateway-account-logging-settings`.
  */
-export const zero_trust_gateway_gateway_account_logging_settings: JsonSchema = {
+export const zero$$trust$$gateway_gateway$$account$$logging$$settings: JsonSchema = {
   "properties": {
     "redact_pii": {
       "default": false,
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/logging/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/logging/tools.ts
index ca27a50e0..bf17716cb 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/logging/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/logging/tools.ts
@@ -3,52 +3,58 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
-import { zero_trust_gateway_identifier } from "../schemas.js";
 import {
-  zero_trust_gateway_account_log_options_output,
-  zero_trust_gateway_gateway_account_logging_settings_output,
-  zero_trust_gateway_gateway_account_logging_settings_response_output,
+  zero$$trust$$gateway_account$$log$$options,
+  zero$$trust$$gateway_gateway$$account$$logging$$settings,
+  zero$$trust$$gateway_gateway$$account$$logging$$settings$$response,
 } from "./outputs.js";
 import {
-  zero_trust_gateway_account_log_options,
-  zero_trust_gateway_gateway_account_logging_settings,
+  zero$$trust$$gateway_account$$log$$options as zero$$trust$$gateway_account$$log$$options$,
+  zero$$trust$$gateway_gateway$$account$$logging$$settings as zero$$trust$$gateway_gateway$$account$$logging$$settings$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.gateway.logging`.
+ * The tools of `zeroTrust.gateway.logging`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_logging_get",
+    name: "zeroTrust_gateway_logging_get",
     title: "Get logging settings for the Zero Trust account",
-    description: "Retrieve the current logging settings for the Zero Trust account.",
+    description: "Retrieve the current logging settings for the Zero Trust account.\n\nGET /accounts/{account_id}/gateway/logging",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier": zero_trust_gateway_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_gateway-account-logging-settings-response",
       $defs: {
-        "zero-trust-gateway_account-log-options": zero_trust_gateway_account_log_options_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_gateway-account-logging-settings": zero_trust_gateway_gateway_account_logging_settings_output,
-        "zero-trust-gateway_gateway-account-logging-settings-response": zero_trust_gateway_gateway_account_logging_settings_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_account-log-options": zero$$trust$$gateway_account$$log$$options,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_gateway-account-logging-settings": zero$$trust$$gateway_gateway$$account$$logging$$settings,
+        "zero-trust-gateway_gateway-account-logging-settings-response": zero$$trust$$gateway_gateway$$account$$logging$$settings$$response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -77,12 +83,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_account-log-options": zero_trust_gateway_account_log_options_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_gateway-account-logging-settings": zero_trust_gateway_gateway_account_logging_settings_output,
-        "zero-trust-gateway_gateway-account-logging-settings-response": zero_trust_gateway_gateway_account_logging_settings_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_account-log-options": zero$$trust$$gateway_account$$log$$options,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_gateway-account-logging-settings": zero$$trust$$gateway_gateway$$account$$logging$$settings,
+        "zero-trust-gateway_gateway-account-logging-settings-response": zero$$trust$$gateway_gateway$$account$$logging$$settings$$response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -90,38 +96,47 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_logging_update",
+    name: "zeroTrust_gateway_logging_update",
     title: "Update Zero Trust account logging settings",
-    description: "Update logging settings for the current Zero Trust account.",
+    description: "Update logging settings for the current Zero Trust account.\n\nPUT /accounts/{account_id}/gateway/logging",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "$ref": "#/$defs/zero-trust-gateway_gateway-account-logging-settings"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_account-log-options": zero_trust_gateway_account_log_options,
-        "zero-trust-gateway_gateway-account-logging-settings": zero_trust_gateway_gateway_account_logging_settings,
-        "zero-trust-gateway_identifier": zero_trust_gateway_identifier,
+        "zero-trust-gateway_account-log-options": zero$$trust$$gateway_account$$log$$options$,
+        "zero-trust-gateway_gateway-account-logging-settings": zero$$trust$$gateway_gateway$$account$$logging$$settings$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_gateway-account-logging-settings-response",
       $defs: {
-        "zero-trust-gateway_account-log-options": zero_trust_gateway_account_log_options_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_gateway-account-logging-settings": zero_trust_gateway_gateway_account_logging_settings_output,
-        "zero-trust-gateway_gateway-account-logging-settings-response": zero_trust_gateway_gateway_account_logging_settings_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_account-log-options": zero$$trust$$gateway_account$$log$$options,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_gateway-account-logging-settings": zero$$trust$$gateway_gateway$$account$$logging$$settings,
+        "zero-trust-gateway_gateway-account-logging-settings-response": zero$$trust$$gateway_gateway$$account$$logging$$settings$$response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -150,12 +165,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_account-log-options": zero_trust_gateway_account_log_options_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_gateway-account-logging-settings": zero_trust_gateway_gateway_account_logging_settings_output,
-        "zero-trust-gateway_gateway-account-logging-settings-response": zero_trust_gateway_gateway_account_logging_settings_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_account-log-options": zero$$trust$$gateway_account$$log$$options,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_gateway-account-logging-settings": zero$$trust$$gateway_gateway$$account$$logging$$settings,
+        "zero-trust-gateway_gateway-account-logging-settings-response": zero$$trust$$gateway_gateway$$account$$logging$$settings$$response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/outputs.ts
index afc1f67a1..4243b977c 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_api-response-collection` in responses.
  */
-export const zero_trust_gateway_api_response_collection_output: JsonSchema = {
+export const zero$$trust$$gateway_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-common"
@@ -25,7 +25,7 @@ export const zero_trust_gateway_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_api-response-common` in responses.
  */
-export const zero_trust_gateway_api_response_common_output: JsonSchema = {
+export const zero$$trust$$gateway_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zero-trust-gateway_messages"
@@ -48,17 +48,10 @@ export const zero_trust_gateway_api_response_common_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_cf_account_id` in responses.
- */
-export const zero_trust_gateway_cf_account_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_empty_response` in responses.
  */
-export const zero_trust_gateway_empty_response_output: JsonSchema = {
+export const zero$$trust$$gateway_empty_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -77,7 +70,7 @@ export const zero_trust_gateway_empty_response_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_gateway_account` in responses.
  */
-export const zero_trust_gateway_gateway_account_output: JsonSchema = {
+export const zero$$trust$$gateway_gateway_account: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -87,13 +80,13 @@ export const zero_trust_gateway_gateway_account_output: JsonSchema = {
         "result": {
           "properties": {
             "gateway_tag": {
-              "$ref": "#/$defs/zero-trust-gateway_gateway_tag"
+              "type": "string"
             },
             "id": {
-              "$ref": "#/$defs/zero-trust-gateway_cf_account_id"
+              "type": "string"
             },
             "provider_name": {
-              "$ref": "#/$defs/zero-trust-gateway_provider_name"
+              "type": "string"
             }
           },
           "type": "object"
@@ -104,24 +97,10 @@ export const zero_trust_gateway_gateway_account_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_gateway_tag` in responses.
- */
-export const zero_trust_gateway_gateway_tag_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_provider_name` in responses.
- */
-export const zero_trust_gateway_provider_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_result_info` in responses.
  */
-export const zero_trust_gateway_result_info_output: JsonSchema = {
+export const zero$$trust$$gateway_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -138,18 +117,3 @@ export const zero_trust_gateway_result_info_output: JsonSchema = {
   },
   "type": "object"
 };
-
-/**
- * The schema of `zero-trust-gateway_timestamp` in responses.
- */
-export const zero_trust_gateway_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_uuid-3` in responses.
- */
-export const zero_trust_gateway_uuid_3_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/outputs.ts
index 2f11e5448..235e23c52 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/outputs.ts
@@ -3,55 +3,36 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_contents` in responses.
- */
-export const zero_trust_gateway_contents_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_description-4` in responses.
- */
-export const zero_trust_gateway_description_4_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_name-7` in responses.
- */
-export const zero_trust_gateway_name_7_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_pacfile` in responses.
  */
-export const zero_trust_gateway_pacfile_output: JsonSchema = {
+export const zero$$trust$$gateway_pacfile: JsonSchema = {
   "properties": {
     "contents": {
-      "$ref": "#/$defs/zero-trust-gateway_contents"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "description": {
-      "$ref": "#/$defs/zero-trust-gateway_description-4"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-7"
+      "type": "string"
     },
     "slug": {
-      "$ref": "#/$defs/zero-trust-gateway_slug"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "url": {
-      "$ref": "#/$defs/zero-trust-gateway_url"
+      "type": "string"
     }
   },
   "type": "object"
@@ -60,7 +41,7 @@ export const zero_trust_gateway_pacfile_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_response_collection-10` in responses.
  */
-export const zero_trust_gateway_response_collection_10_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection$$10: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
@@ -71,25 +52,27 @@ export const zero_trust_gateway_response_collection_10_output: JsonSchema = {
           "items": {
             "properties": {
               "created_at": {
-                "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+                "format": "date-time",
+                "type": "string"
               },
               "description": {
-                "$ref": "#/$defs/zero-trust-gateway_description-4"
+                "type": "string"
               },
               "id": {
-                "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+                "type": "string"
               },
               "name": {
-                "$ref": "#/$defs/zero-trust-gateway_name-7"
+                "type": "string"
               },
               "slug": {
-                "$ref": "#/$defs/zero-trust-gateway_slug"
+                "type": "string"
               },
               "updated_at": {
-                "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+                "format": "date-time",
+                "type": "string"
               },
               "url": {
-                "$ref": "#/$defs/zero-trust-gateway_url"
+                "type": "string"
               }
             },
             "type": "object"
@@ -118,7 +101,7 @@ export const zero_trust_gateway_response_collection_10_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_single_response-7` in responses.
  */
-export const zero_trust_gateway_single_response_7_output: JsonSchema = {
+export const zero$$trust$$gateway_single_response$$7: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -133,17 +116,3 @@ export const zero_trust_gateway_single_response_7_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_slug` in responses.
- */
-export const zero_trust_gateway_slug_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_url` in responses.
- */
-export const zero_trust_gateway_url_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/schemas.ts
deleted file mode 100644
index 729b9326d..000000000
--- a/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/schemas.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `zero-trust-gateway_contents`.
- */
-export const zero_trust_gateway_contents: JsonSchema = {
-  "description": "Actual contents of the PAC file",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_description-4`.
- */
-export const zero_trust_gateway_description_4: JsonSchema = {
-  "description": "Detailed description of the PAC file.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_name-7`.
- */
-export const zero_trust_gateway_name_7: JsonSchema = {
-  "description": "Name of the PAC file.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/tools.ts
index 6bb6aaf1f..d553fcf4f 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/pacfiles/tools.ts
@@ -1,66 +1,48 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
-import { zero_trust_gateway_identifier_2 } from "../../schemas.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_empty_response_output,
-  zero_trust_gateway_result_info_output,
-  zero_trust_gateway_uuid_3_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_empty_response,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
-import { zero_trust_gateway_uuid_3 } from "../schemas.js";
 import {
-  zero_trust_gateway_contents_output,
-  zero_trust_gateway_description_4_output,
-  zero_trust_gateway_name_7_output,
-  zero_trust_gateway_pacfile_output,
-  zero_trust_gateway_response_collection_10_output,
-  zero_trust_gateway_single_response_7_output,
-  zero_trust_gateway_slug_output,
-  zero_trust_gateway_url_output,
+  zero$$trust$$gateway_pacfile,
+  zero$$trust$$gateway_response_collection$$10,
+  zero$$trust$$gateway_single_response$$7,
 } from "./outputs.js";
-import {
-  zero_trust_gateway_contents,
-  zero_trust_gateway_description_4,
-  zero_trust_gateway_name_7,
-} from "./schemas.js";
 
 /**
- * The tools of `zero_trust.gateway.pacfiles`.
+ * The tools of `zeroTrust.gateway.pacfiles`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_pacfiles_create",
+    name: "zeroTrust_gateway_pacfiles_create",
     title: "Create a PAC file",
-    description: "Create a new Zero Trust Gateway PAC file.",
+    description: "Create a new Zero Trust Gateway PAC file.\n\nPOST /accounts/{account_id}/gateway/pacfiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "contents": {
-              "$ref": "#/$defs/zero-trust-gateway_contents",
-              "description": "Actual contents of the PAC file"
+              "description": "Actual contents of the PAC file",
+              "type": "string"
             },
             "description": {
-              "$ref": "#/$defs/zero-trust-gateway_description-4",
-              "description": "Detailed description of the PAC file."
+              "description": "Detailed description of the PAC file.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name-7",
-              "description": "Name of the PAC file."
+              "description": "Name of the PAC file.",
+              "type": "string"
             },
             "slug": {
               "description": "URL-friendly version of the PAC file name. If not provided, it will be auto-generated",
@@ -72,33 +54,34 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "zero-trust-gateway_contents": zero_trust_gateway_contents,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-7",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_contents": zero_trust_gateway_contents_output,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7_output,
-        "zero-trust-gateway_pacfile": zero_trust_gateway_pacfile_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-7": zero_trust_gateway_single_response_7_output,
-        "zero-trust-gateway_slug": zero_trust_gateway_slug_output,
-        "zero-trust-gateway_url": zero_trust_gateway_url_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_pacfile": zero$$trust$$gateway_pacfile,
+        "zero-trust-gateway_single_response-7": zero$$trust$$gateway_single_response$$7,
       },
     },
     annotations: {
@@ -132,18 +115,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_contents": zero_trust_gateway_contents_output,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7_output,
-        "zero-trust-gateway_pacfile": zero_trust_gateway_pacfile_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-7": zero_trust_gateway_single_response_7_output,
-        "zero-trust-gateway_slug": zero_trust_gateway_slug_output,
-        "zero-trust-gateway_url": zero_trust_gateway_url_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_pacfile": zero$$trust$$gateway_pacfile,
+        "zero-trust-gateway_single_response-7": zero$$trust$$gateway_single_response$$7,
       },
     },
     request: (args) => ({
@@ -152,35 +128,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_pacfiles_delete",
+    name: "zeroTrust_gateway_pacfiles_delete",
     title: "Delete a PAC file",
-    description: "Delete a configured Zero Trust Gateway PAC file.",
+    description: "Delete a configured Zero Trust Gateway PAC file.\n\nDELETE /accounts/{account_id}/gateway/pacfiles/{pacfile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "pacfile_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "pacfile_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pacfile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pacfile_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_empty_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -214,10 +196,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -225,43 +207,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_pacfiles_get",
+    name: "zeroTrust_gateway_pacfiles_get",
     title: "Get a PAC file",
-    description: "Get a single Zero Trust Gateway PAC file.",
+    description: "Get a single Zero Trust Gateway PAC file.\n\nGET /accounts/{account_id}/gateway/pacfiles/{pacfile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "pacfile_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "pacfile_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pacfile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pacfile_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-7",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_contents": zero_trust_gateway_contents_output,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7_output,
-        "zero-trust-gateway_pacfile": zero_trust_gateway_pacfile_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-7": zero_trust_gateway_single_response_7_output,
-        "zero-trust-gateway_slug": zero_trust_gateway_slug_output,
-        "zero-trust-gateway_url": zero_trust_gateway_url_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_pacfile": zero$$trust$$gateway_pacfile,
+        "zero-trust-gateway_single_response-7": zero$$trust$$gateway_single_response$$7,
       },
     },
     annotations: {
@@ -296,18 +277,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_contents": zero_trust_gateway_contents_output,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7_output,
-        "zero-trust-gateway_pacfile": zero_trust_gateway_pacfile_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-7": zero_trust_gateway_single_response_7_output,
-        "zero-trust-gateway_slug": zero_trust_gateway_slug_output,
-        "zero-trust-gateway_url": zero_trust_gateway_url_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_pacfile": zero$$trust$$gateway_pacfile,
+        "zero-trust-gateway_single_response-7": zero$$trust$$gateway_single_response$$7,
       },
     },
     request: (args) => ({
@@ -315,48 +289,55 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_pacfiles_list",
+    name: "zeroTrust_gateway_pacfiles_list",
     title: "List PAC files",
-    description: "List all Zero Trust Gateway PAC files for an account.",
+    description: "List all Zero Trust Gateway PAC files for an account.\n\nGET /accounts/{account_id}/gateway/pacfiles",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 50,
-          "description": "Number of items per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 50,
+              "description": "Number of items per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-10",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-10": zero_trust_gateway_response_collection_10_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_slug": zero_trust_gateway_slug_output,
-        "zero-trust-gateway_url": zero_trust_gateway_url_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-10": zero$$trust$$gateway_response_collection$$10,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     annotations: {
@@ -391,52 +372,42 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-10": zero_trust_gateway_response_collection_10_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_slug": zero_trust_gateway_slug_output,
-        "zero-trust-gateway_url": zero_trust_gateway_url_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-10": zero$$trust$$gateway_response_collection$$10,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/gateway/pacfiles`,
       query: [
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_gateway_pacfiles_update",
+    name: "zeroTrust_gateway_pacfiles_update",
     title: "Update a Zero Trust Gateway PAC file",
-    description: "Update a configured Zero Trust Gateway PAC file.",
+    description: "Update a configured Zero Trust Gateway PAC file.\n\nPUT /accounts/{account_id}/gateway/pacfiles/{pacfile_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "contents": {
-              "$ref": "#/$defs/zero-trust-gateway_contents",
-              "description": "Actual contents of the PAC file"
+              "description": "Actual contents of the PAC file",
+              "type": "string"
             },
             "description": {
-              "$ref": "#/$defs/zero-trust-gateway_description-4",
-              "description": "Detailed description of the PAC file."
+              "description": "Detailed description of the PAC file.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name-7",
-              "description": "Name of the PAC file."
+              "description": "Name of the PAC file.",
+              "type": "string"
             }
           },
           "required": [
@@ -446,37 +417,37 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "pacfile_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "pacfile_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "pacfile_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "pacfile_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "zero-trust-gateway_contents": zero_trust_gateway_contents,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-7",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_contents": zero_trust_gateway_contents_output,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7_output,
-        "zero-trust-gateway_pacfile": zero_trust_gateway_pacfile_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-7": zero_trust_gateway_single_response_7_output,
-        "zero-trust-gateway_slug": zero_trust_gateway_slug_output,
-        "zero-trust-gateway_url": zero_trust_gateway_url_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_pacfile": zero$$trust$$gateway_pacfile,
+        "zero-trust-gateway_single_response-7": zero$$trust$$gateway_single_response$$7,
       },
     },
     annotations: {
@@ -510,18 +481,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_contents": zero_trust_gateway_contents_output,
-        "zero-trust-gateway_description-4": zero_trust_gateway_description_4_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-7": zero_trust_gateway_name_7_output,
-        "zero-trust-gateway_pacfile": zero_trust_gateway_pacfile_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-7": zero_trust_gateway_single_response_7_output,
-        "zero-trust-gateway_slug": zero_trust_gateway_slug_output,
-        "zero-trust-gateway_url": zero_trust_gateway_url_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_pacfile": zero$$trust$$gateway_pacfile,
+        "zero-trust-gateway_single_response-7": zero$$trust$$gateway_single_response$$7,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/outputs.ts
index 207e726b6..1035d9882 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/outputs.ts
@@ -6,30 +6,24 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_ips` in responses.
  */
-export const zero_trust_gateway_ips_output: JsonSchema = {
+export const zero$$trust$$gateway_ips: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `zero-trust-gateway_name-6` in responses.
- */
-export const zero_trust_gateway_name_6_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_proxy-endpoint-identity` in responses.
  */
-export const zero_trust_gateway_proxy_endpoint_identity_output: JsonSchema = {
+export const zero$$trust$$gateway_proxy$$endpoint$$identity: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+      "type": "string"
     },
     "kind": {
       "enum": [
@@ -38,13 +32,14 @@ export const zero_trust_gateway_proxy_endpoint_identity_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-6"
+      "type": "string"
     },
     "subdomain": {
-      "$ref": "#/$defs/zero-trust-gateway_subdomain-2"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "required": [
@@ -57,13 +52,14 @@ export const zero_trust_gateway_proxy_endpoint_identity_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_proxy-endpoint-ip` in responses.
  */
-export const zero_trust_gateway_proxy_endpoint_ip_output: JsonSchema = {
+export const zero$$trust$$gateway_proxy$$endpoint$$ip: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+      "type": "string"
     },
     "ips": {
       "$ref": "#/$defs/zero-trust-gateway_ips"
@@ -75,13 +71,14 @@ export const zero_trust_gateway_proxy_endpoint_ip_output: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-6"
+      "type": "string"
     },
     "subdomain": {
-      "$ref": "#/$defs/zero-trust-gateway_subdomain-2"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "required": [
@@ -94,7 +91,7 @@ export const zero_trust_gateway_proxy_endpoint_ip_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_proxy-endpoints` in responses.
  */
-export const zero_trust_gateway_proxy_endpoints_output: JsonSchema = {
+export const zero$$trust$$gateway_proxy$$endpoints: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_proxy-endpoint-ip"
@@ -108,7 +105,7 @@ export const zero_trust_gateway_proxy_endpoints_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_response_collection-9` in responses.
  */
-export const zero_trust_gateway_response_collection_9_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection$$9: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
@@ -130,7 +127,7 @@ export const zero_trust_gateway_response_collection_9_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_single_response-5` in responses.
  */
-export const zero_trust_gateway_single_response_5_output: JsonSchema = {
+export const zero$$trust$$gateway_single_response$$5: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -145,10 +142,3 @@ export const zero_trust_gateway_single_response_5_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_subdomain-2` in responses.
- */
-export const zero_trust_gateway_subdomain_2_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/schemas.ts
index 17cb53494..62f75a971 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `zero-trust-gateway_ips`.
  */
-export const zero_trust_gateway_ips: JsonSchema = {
+export const zero$$trust$$gateway_ips: JsonSchema = {
   "description": "Specify the list of CIDRs to restrict ingress connections.",
   "items": {
     "type": "string"
@@ -14,18 +14,10 @@ export const zero_trust_gateway_ips: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `zero-trust-gateway_name-6`.
- */
-export const zero_trust_gateway_name_6: JsonSchema = {
-  "description": "Specify the name of the proxy endpoint.",
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_proxy-endpoint-identity-create`.
  */
-export const zero_trust_gateway_proxy_endpoint_identity_create: JsonSchema = {
+export const zero$$trust$$gateway_proxy$$endpoint$$identity$$create: JsonSchema = {
   "properties": {
     "kind": {
       "description": "The proxy endpoint kind",
@@ -35,8 +27,8 @@ export const zero_trust_gateway_proxy_endpoint_identity_create: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-6",
-      "description": "Specify the name of the proxy endpoint."
+      "description": "Specify the name of the proxy endpoint.",
+      "type": "string"
     }
   },
   "required": [
@@ -49,7 +41,7 @@ export const zero_trust_gateway_proxy_endpoint_identity_create: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_proxy-endpoint-ip-create`.
  */
-export const zero_trust_gateway_proxy_endpoint_ip_create: JsonSchema = {
+export const zero$$trust$$gateway_proxy$$endpoint$$ip$$create: JsonSchema = {
   "properties": {
     "kind": {
       "description": "The proxy endpoint kind",
@@ -59,8 +51,8 @@ export const zero_trust_gateway_proxy_endpoint_ip_create: JsonSchema = {
       "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-6",
-      "description": "Specify the name of the proxy endpoint."
+      "description": "Specify the name of the proxy endpoint.",
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/tools.ts
index 800b6995f..b52f8b6e5 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/proxyEndpoints/tools.ts
@@ -1,54 +1,43 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
-import { zero_trust_gateway_identifier_2 } from "../../schemas.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_empty_response_output,
-  zero_trust_gateway_result_info_output,
-  zero_trust_gateway_uuid_3_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_empty_response,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
-import { zero_trust_gateway_uuid_3 } from "../schemas.js";
 import {
-  zero_trust_gateway_ips_output,
-  zero_trust_gateway_name_6_output,
-  zero_trust_gateway_proxy_endpoint_identity_output,
-  zero_trust_gateway_proxy_endpoint_ip_output,
-  zero_trust_gateway_proxy_endpoints_output,
-  zero_trust_gateway_response_collection_9_output,
-  zero_trust_gateway_single_response_5_output,
-  zero_trust_gateway_subdomain_2_output,
+  zero$$trust$$gateway_ips,
+  zero$$trust$$gateway_proxy$$endpoint$$identity,
+  zero$$trust$$gateway_proxy$$endpoint$$ip,
+  zero$$trust$$gateway_proxy$$endpoints,
+  zero$$trust$$gateway_response_collection$$9,
+  zero$$trust$$gateway_single_response$$5,
 } from "./outputs.js";
 import {
-  zero_trust_gateway_ips,
-  zero_trust_gateway_name_6,
-  zero_trust_gateway_proxy_endpoint_identity_create,
-  zero_trust_gateway_proxy_endpoint_ip_create,
+  zero$$trust$$gateway_ips as zero$$trust$$gateway_ips$,
+  zero$$trust$$gateway_proxy$$endpoint$$identity$$create,
+  zero$$trust$$gateway_proxy$$endpoint$$ip$$create,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.gateway.proxy_endpoints`.
+ * The tools of `zeroTrust.gateway.proxyEndpoints`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_proxy_endpoints_create",
+    name: "zeroTrust_gateway_proxyEndpoints_create",
     title: "Create a proxy endpoint",
-    description: "Create a new Zero Trust Gateway proxy endpoint.",
+    description: "Create a new Zero Trust Gateway proxy endpoint.\n\nPOST /accounts/{account_id}/gateway/proxy_endpoints",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "allOf": [
             {
@@ -76,33 +65,41 @@ export const tools: readonly Tool[] = [
               ]
             }
           ]
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6,
-        "zero-trust-gateway_proxy-endpoint-identity-create": zero_trust_gateway_proxy_endpoint_identity_create,
-        "zero-trust-gateway_proxy-endpoint-ip-create": zero_trust_gateway_proxy_endpoint_ip_create,
+        "zero-trust-gateway_proxy-endpoint-identity-create": zero$$trust$$gateway_proxy$$endpoint$$identity$$create,
+        "zero-trust-gateway_proxy-endpoint-ip-create": zero$$trust$$gateway_proxy$$endpoint$$ip$$create,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-5",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6_output,
-        "zero-trust-gateway_proxy-endpoint-identity": zero_trust_gateway_proxy_endpoint_identity_output,
-        "zero-trust-gateway_proxy-endpoint-ip": zero_trust_gateway_proxy_endpoint_ip_output,
-        "zero-trust-gateway_proxy-endpoints": zero_trust_gateway_proxy_endpoints_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-5": zero_trust_gateway_single_response_5_output,
-        "zero-trust-gateway_subdomain-2": zero_trust_gateway_subdomain_2_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_proxy-endpoint-identity": zero$$trust$$gateway_proxy$$endpoint$$identity,
+        "zero-trust-gateway_proxy-endpoint-ip": zero$$trust$$gateway_proxy$$endpoint$$ip,
+        "zero-trust-gateway_proxy-endpoints": zero$$trust$$gateway_proxy$$endpoints,
+        "zero-trust-gateway_single_response-5": zero$$trust$$gateway_single_response$$5,
       },
     },
     annotations: {
@@ -131,18 +128,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6_output,
-        "zero-trust-gateway_proxy-endpoint-identity": zero_trust_gateway_proxy_endpoint_identity_output,
-        "zero-trust-gateway_proxy-endpoint-ip": zero_trust_gateway_proxy_endpoint_ip_output,
-        "zero-trust-gateway_proxy-endpoints": zero_trust_gateway_proxy_endpoints_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-5": zero_trust_gateway_single_response_5_output,
-        "zero-trust-gateway_subdomain-2": zero_trust_gateway_subdomain_2_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_proxy-endpoint-identity": zero$$trust$$gateway_proxy$$endpoint$$identity,
+        "zero-trust-gateway_proxy-endpoint-ip": zero$$trust$$gateway_proxy$$endpoint$$ip,
+        "zero-trust-gateway_proxy-endpoints": zero$$trust$$gateway_proxy$$endpoints,
+        "zero-trust-gateway_single_response-5": zero$$trust$$gateway_single_response$$5,
       },
     },
     request: (args) => ({
@@ -151,35 +144,41 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_proxy_endpoints_delete",
+    name: "zeroTrust_gateway_proxyEndpoints_delete",
     title: "Delete a proxy endpoint",
-    description: "Delete a configured Zero Trust Gateway proxy endpoint.",
+    description: "Delete a configured Zero Trust Gateway proxy endpoint.\n\nDELETE /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "proxy_endpoint_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "proxy_endpoint_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "proxy_endpoint_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "proxy_endpoint_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_empty_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -208,10 +207,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -219,16 +218,12 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_proxy_endpoints_edit",
+    name: "zeroTrust_gateway_proxyEndpoints_edit",
     title: "Update a proxy endpoint",
-    description: "Update a configured Zero Trust Gateway proxy endpoint.",
+    description: "Update a configured Zero Trust Gateway proxy endpoint.\n\nPATCH /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "ips": {
@@ -236,42 +231,49 @@ export const tools: readonly Tool[] = [
               "description": "Specify the list of CIDRs to restrict ingress connections."
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name-6",
-              "description": "Specify the name of the proxy endpoint."
+              "description": "Specify the name of the proxy endpoint.",
+              "type": "string"
             }
           },
           "type": "object"
         },
-        "proxy_endpoint_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "proxy_endpoint_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "proxy_endpoint_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "proxy_endpoint_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-5",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6_output,
-        "zero-trust-gateway_proxy-endpoint-identity": zero_trust_gateway_proxy_endpoint_identity_output,
-        "zero-trust-gateway_proxy-endpoint-ip": zero_trust_gateway_proxy_endpoint_ip_output,
-        "zero-trust-gateway_proxy-endpoints": zero_trust_gateway_proxy_endpoints_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-5": zero_trust_gateway_single_response_5_output,
-        "zero-trust-gateway_subdomain-2": zero_trust_gateway_subdomain_2_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_proxy-endpoint-identity": zero$$trust$$gateway_proxy$$endpoint$$identity,
+        "zero-trust-gateway_proxy-endpoint-ip": zero$$trust$$gateway_proxy$$endpoint$$ip,
+        "zero-trust-gateway_proxy-endpoints": zero$$trust$$gateway_proxy$$endpoints,
+        "zero-trust-gateway_single_response-5": zero$$trust$$gateway_single_response$$5,
       },
     },
     annotations: {
@@ -300,18 +302,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6_output,
-        "zero-trust-gateway_proxy-endpoint-identity": zero_trust_gateway_proxy_endpoint_identity_output,
-        "zero-trust-gateway_proxy-endpoint-ip": zero_trust_gateway_proxy_endpoint_ip_output,
-        "zero-trust-gateway_proxy-endpoints": zero_trust_gateway_proxy_endpoints_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-5": zero_trust_gateway_single_response_5_output,
-        "zero-trust-gateway_subdomain-2": zero_trust_gateway_subdomain_2_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_proxy-endpoint-identity": zero$$trust$$gateway_proxy$$endpoint$$identity,
+        "zero-trust-gateway_proxy-endpoint-ip": zero$$trust$$gateway_proxy$$endpoint$$ip,
+        "zero-trust-gateway_proxy-endpoints": zero$$trust$$gateway_proxy$$endpoints,
+        "zero-trust-gateway_single_response-5": zero$$trust$$gateway_single_response$$5,
       },
     },
     request: (args) => ({
@@ -320,43 +318,45 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_proxy_endpoints_get",
+    name: "zeroTrust_gateway_proxyEndpoints_get",
     title: "Get a proxy endpoint",
-    description: "Get a single Zero Trust Gateway proxy endpoint.",
+    description: "Get a single Zero Trust Gateway proxy endpoint.\n\nGET /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "proxy_endpoint_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-3"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "proxy_endpoint_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "proxy_endpoint_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "proxy_endpoint_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-5",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6_output,
-        "zero-trust-gateway_proxy-endpoint-identity": zero_trust_gateway_proxy_endpoint_identity_output,
-        "zero-trust-gateway_proxy-endpoint-ip": zero_trust_gateway_proxy_endpoint_ip_output,
-        "zero-trust-gateway_proxy-endpoints": zero_trust_gateway_proxy_endpoints_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-5": zero_trust_gateway_single_response_5_output,
-        "zero-trust-gateway_subdomain-2": zero_trust_gateway_subdomain_2_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_proxy-endpoint-identity": zero$$trust$$gateway_proxy$$endpoint$$identity,
+        "zero-trust-gateway_proxy-endpoint-ip": zero$$trust$$gateway_proxy$$endpoint$$ip,
+        "zero-trust-gateway_proxy-endpoints": zero$$trust$$gateway_proxy$$endpoints,
+        "zero-trust-gateway_single_response-5": zero$$trust$$gateway_single_response$$5,
       },
     },
     annotations: {
@@ -385,18 +385,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6_output,
-        "zero-trust-gateway_proxy-endpoint-identity": zero_trust_gateway_proxy_endpoint_identity_output,
-        "zero-trust-gateway_proxy-endpoint-ip": zero_trust_gateway_proxy_endpoint_ip_output,
-        "zero-trust-gateway_proxy-endpoints": zero_trust_gateway_proxy_endpoints_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_single_response-5": zero_trust_gateway_single_response_5_output,
-        "zero-trust-gateway_subdomain-2": zero_trust_gateway_subdomain_2_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_proxy-endpoint-identity": zero$$trust$$gateway_proxy$$endpoint$$identity,
+        "zero-trust-gateway_proxy-endpoint-ip": zero$$trust$$gateway_proxy$$endpoint$$ip,
+        "zero-trust-gateway_proxy-endpoints": zero$$trust$$gateway_proxy$$endpoints,
+        "zero-trust-gateway_single_response-5": zero$$trust$$gateway_single_response$$5,
       },
     },
     request: (args) => ({
@@ -404,68 +400,77 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_proxy_endpoints_list",
+    name: "zeroTrust_gateway_proxyEndpoints_list",
     title: "List proxy endpoints",
-    description: "List all Zero Trust Gateway proxy endpoints for an account.",
+    description: "List all Zero Trust Gateway proxy endpoints for an account.\n\nGET /accounts/{account_id}/gateway/proxy_endpoints",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "direction": {
-          "description": "Sort direction. Only takes effect when `order_by` is also provided; it\nis ignored otherwise. When `direction` is omitted the effective\ndirection is field-specific: `created_at` and `updated_at` default to\ndescending (newest first); `name` defaults to ascending.\n  * `asc` — ascending.\n  * `desc` — descending.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter the returned proxy endpoints by one or more `field:value` pairs.\nRepeat the parameter to apply multiple filters; they are combined with\nlogical AND (an endpoint must satisfy every filter to be returned).\n\nSupported fields and their matching behaviour:\n  * `name` — case-insensitive substring match on the endpoint name.\n  * `id` — substring match on the endpoint ID (UUID), with or without dashes.\n  * `kind` — exact match on the endpoint kind. The value must be `ip` or `identity`; any other value returns `400`.\n\nEach entry must match one of the per-field patterns below: the field\nmust be one of `name`, `id`, or `kind`; `name`/`id` accept any value,\nwhile `kind` only accepts `ip` or `identity`.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "order_by": {
-          "description": "Field to sort the returned endpoints by. When omitted, the order of\nresults is unspecified. Supported values:\n  * `name` — sort alphabetically by endpoint name.\n  * `created_at` — sort by creation time; defaults to descending unless `direction` is set.\n  * `updated_at` — sort by last-modified time; defaults to descending unless `direction` is set.",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "search": {
-          "description": "Case-insensitive substring match on the endpoint name. When combined\nwith `filter`, both must match (logical AND).",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Sort direction. Only takes effect when `order_by` is also provided; it\nis ignored otherwise. When `direction` is omitted the effective\ndirection is field-specific: `created_at` and `updated_at` default to\ndescending (newest first); `name` defaults to ascending.\n  * `asc` — ascending.\n  * `desc` — descending.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter the returned proxy endpoints by one or more `field:value` pairs.\nRepeat the parameter to apply multiple filters; they are combined with\nlogical AND (an endpoint must satisfy every filter to be returned).\n\nSupported fields and their matching behaviour:\n  * `name` — case-insensitive substring match on the endpoint name.\n  * `id` — substring match on the endpoint ID (UUID), with or without dashes.\n  * `kind` — exact match on the endpoint kind. The value must be `ip` or `identity`; any other value returns `400`.\n\nEach entry must match one of the per-field patterns below: the field\nmust be one of `name`, `id`, or `kind`; `name`/`id` accept any value,\nwhile `kind` only accepts `ip` or `identity`.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "order_by": {
+              "description": "Field to sort the returned endpoints by. When omitted, the order of\nresults is unspecified. Supported values:\n  * `name` — sort alphabetically by endpoint name.\n  * `created_at` — sort by creation time; defaults to descending unless `direction` is set.\n  * `updated_at` — sort by last-modified time; defaults to descending unless `direction` is set.",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at"
+              ],
+              "type": "string"
+            },
+            "search": {
+              "description": "Case-insensitive substring match on the endpoint name. When combined\nwith `filter`, both must match (logical AND).",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-9",
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6_output,
-        "zero-trust-gateway_proxy-endpoint-identity": zero_trust_gateway_proxy_endpoint_identity_output,
-        "zero-trust-gateway_proxy-endpoint-ip": zero_trust_gateway_proxy_endpoint_ip_output,
-        "zero-trust-gateway_proxy-endpoints": zero_trust_gateway_proxy_endpoints_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-9": zero_trust_gateway_response_collection_9_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_subdomain-2": zero_trust_gateway_subdomain_2_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_proxy-endpoint-identity": zero$$trust$$gateway_proxy$$endpoint$$identity,
+        "zero-trust-gateway_proxy-endpoint-ip": zero$$trust$$gateway_proxy$$endpoint$$ip,
+        "zero-trust-gateway_proxy-endpoints": zero$$trust$$gateway_proxy$$endpoints,
+        "zero-trust-gateway_response_collection-9": zero$$trust$$gateway_response_collection$$9,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     annotations: {
@@ -494,29 +499,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_ips": zero_trust_gateway_ips_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-6": zero_trust_gateway_name_6_output,
-        "zero-trust-gateway_proxy-endpoint-identity": zero_trust_gateway_proxy_endpoint_identity_output,
-        "zero-trust-gateway_proxy-endpoint-ip": zero_trust_gateway_proxy_endpoint_ip_output,
-        "zero-trust-gateway_proxy-endpoints": zero_trust_gateway_proxy_endpoints_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-9": zero_trust_gateway_response_collection_9_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_subdomain-2": zero_trust_gateway_subdomain_2_output,
-        "zero-trust-gateway_uuid-3": zero_trust_gateway_uuid_3_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_ips": zero$$trust$$gateway_ips,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_proxy-endpoint-identity": zero$$trust$$gateway_proxy$$endpoint$$identity,
+        "zero-trust-gateway_proxy-endpoint-ip": zero$$trust$$gateway_proxy$$endpoint$$ip,
+        "zero-trust-gateway_proxy-endpoints": zero$$trust$$gateway_proxy$$endpoints,
+        "zero-trust-gateway_response_collection-9": zero$$trust$$gateway_response_collection$$9,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/gateway/proxy_endpoints`,
       query: [
-        ["filter", args["filter"], true],
-        ["search", args["search"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
+        ["filter", param(args, "query", "filter"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/rules/outputs.ts b/src/generated/forge-mcp/zeroTrust/gateway/rules/outputs.ts
index 927e848ca..f0f078310 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/rules/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/rules/outputs.ts
@@ -3,65 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_action` in responses.
- */
-export const zero_trust_gateway_action_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off",
-    "allow",
-    "block",
-    "scan",
-    "noscan",
-    "safesearch",
-    "ytrestricted",
-    "isolate",
-    "noisolate",
-    "override",
-    "l4_override",
-    "egress",
-    "resolve",
-    "quarantine",
-    "redirect",
-    "forward"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_deleted_at` in responses.
- */
-export const zero_trust_gateway_deleted_at_output: JsonSchema = {
-  "oneOf": [
-    {
-      "format": "date-time",
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
-
-/**
- * The schema of `zero-trust-gateway_description-2` in responses.
- */
-export const zero_trust_gateway_description_2_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_device_posture` in responses.
- */
-export const zero_trust_gateway_device_posture_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_dns_resolver_settings_v4` in responses.
  */
-export const zero_trust_gateway_dns_resolver_settings_v4_output: JsonSchema = {
+export const zero$$trust$$gateway_dns_resolver_settings_v4: JsonSchema = {
   "properties": {
     "ip": {
       "type": "string"
@@ -85,7 +30,7 @@ export const zero_trust_gateway_dns_resolver_settings_v4_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_dns_resolver_settings_v6` in responses.
  */
-export const zero_trust_gateway_dns_resolver_settings_v6_output: JsonSchema = {
+export const zero$$trust$$gateway_dns_resolver_settings_v6: JsonSchema = {
   "properties": {
     "ip": {
       "type": "string"
@@ -106,17 +51,10 @@ export const zero_trust_gateway_dns_resolver_settings_v6_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_enabled` in responses.
- */
-export const zero_trust_gateway_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `zero-trust-gateway_expiration` in responses.
  */
-export const zero_trust_gateway_expiration_output: JsonSchema = {
+export const zero$$trust$$gateway_expiration: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -129,7 +67,8 @@ export const zero_trust_gateway_expiration_output: JsonSchema = {
         "expires_at": {
           "allOf": [
             {
-              "$ref": "#/$defs/zero-trust-gateway_timestamp"
+              "format": "date-time",
+              "type": "string"
             },
             {
               "type": "string"
@@ -151,7 +90,7 @@ export const zero_trust_gateway_expiration_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_filters` in responses.
  */
-export const zero_trust_gateway_filters_output: JsonSchema = {
+export const zero$$trust$$gateway_filters: JsonSchema = {
   "items": {
     "enum": [
       "http",
@@ -167,38 +106,10 @@ export const zero_trust_gateway_filters_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `zero-trust-gateway_identity` in responses.
- */
-export const zero_trust_gateway_identity_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_name-3` in responses.
- */
-export const zero_trust_gateway_name_3_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_precedence` in responses.
- */
-export const zero_trust_gateway_precedence_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `zero-trust-gateway_read_only` in responses.
- */
-export const zero_trust_gateway_read_only_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `zero-trust-gateway_response_collection-6` in responses.
  */
-export const zero_trust_gateway_response_collection_6_output: JsonSchema = {
+export const zero$$trust$$gateway_response_collection$$6: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-collection"
@@ -220,7 +131,7 @@ export const zero_trust_gateway_response_collection_6_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_rule-settings` in responses.
  */
-export const zero_trust_gateway_rule_settings_output: JsonSchema = {
+export const zero$$trust$$gateway_rule$$settings: JsonSchema = {
   "properties": {
     "add_headers": {
       "oneOf": [
@@ -695,25 +606,53 @@ export const zero_trust_gateway_rule_settings_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_rules` in responses.
  */
-export const zero_trust_gateway_rules_output: JsonSchema = {
+export const zero$$trust$$gateway_rules: JsonSchema = {
   "properties": {
     "action": {
-      "$ref": "#/$defs/zero-trust-gateway_action"
+      "enum": [
+        "on",
+        "off",
+        "allow",
+        "block",
+        "scan",
+        "noscan",
+        "safesearch",
+        "ytrestricted",
+        "isolate",
+        "noisolate",
+        "override",
+        "l4_override",
+        "egress",
+        "resolve",
+        "quarantine",
+        "redirect",
+        "forward"
+      ],
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "deleted_at": {
-      "$ref": "#/$defs/zero-trust-gateway_deleted_at"
+      "oneOf": [
+        {
+          "format": "date-time",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "description": {
-      "$ref": "#/$defs/zero-trust-gateway_description-2"
+      "type": "string"
     },
     "device_posture": {
-      "$ref": "#/$defs/zero-trust-gateway_device_posture"
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/zero-trust-gateway_enabled"
+      "type": "boolean"
     },
     "expiration": {
       "$ref": "#/$defs/zero-trust-gateway_expiration"
@@ -722,19 +661,20 @@ export const zero_trust_gateway_rules_output: JsonSchema = {
       "$ref": "#/$defs/zero-trust-gateway_filters"
     },
     "id": {
-      "$ref": "#/$defs/zero-trust-gateway_uuid-4"
+      "format": "uuid",
+      "type": "string"
     },
     "identity": {
-      "$ref": "#/$defs/zero-trust-gateway_identity"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/zero-trust-gateway_name-3"
+      "type": "string"
     },
     "precedence": {
-      "$ref": "#/$defs/zero-trust-gateway_precedence"
+      "type": "integer"
     },
     "read_only": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only"
+      "type": "boolean"
     },
     "rule_settings": {
       "$ref": "#/$defs/zero-trust-gateway_rule-settings"
@@ -743,22 +683,30 @@ export const zero_trust_gateway_rules_output: JsonSchema = {
       "$ref": "#/$defs/zero-trust-gateway_schedule"
     },
     "sharable": {
-      "$ref": "#/$defs/zero-trust-gateway_sharable"
+      "type": "boolean"
     },
     "source_account": {
-      "$ref": "#/$defs/zero-trust-gateway_source_account"
+      "type": "string"
     },
     "traffic": {
-      "$ref": "#/$defs/zero-trust-gateway_traffic"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/zero-trust-gateway_read_only_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "version": {
-      "$ref": "#/$defs/zero-trust-gateway_version"
+      "type": "integer"
     },
     "warning_status": {
-      "$ref": "#/$defs/zero-trust-gateway_warning_status"
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "required": [
@@ -775,7 +723,7 @@ export const zero_trust_gateway_rules_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_schedule` in responses.
  */
-export const zero_trust_gateway_schedule_output: JsonSchema = {
+export const zero$$trust$$gateway_schedule: JsonSchema = {
   "oneOf": [
     {
       "properties": {
@@ -812,17 +760,10 @@ export const zero_trust_gateway_schedule_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zero-trust-gateway_sharable` in responses.
- */
-export const zero_trust_gateway_sharable_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `zero-trust-gateway_single_response-4` in responses.
  */
-export const zero_trust_gateway_single_response_4_output: JsonSchema = {
+export const zero$$trust$$gateway_single_response$$4: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zero-trust-gateway_api-response-single"
@@ -837,46 +778,3 @@ export const zero_trust_gateway_single_response_4_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_source_account` in responses.
- */
-export const zero_trust_gateway_source_account_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_traffic` in responses.
- */
-export const zero_trust_gateway_traffic_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_uuid-4` in responses.
- */
-export const zero_trust_gateway_uuid_4_output: JsonSchema = {
-  "format": "uuid",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_version` in responses.
- */
-export const zero_trust_gateway_version_output: JsonSchema = {
-  "type": "integer"
-};
-
-/**
- * The schema of `zero-trust-gateway_warning_status` in responses.
- */
-export const zero_trust_gateway_warning_status_output: JsonSchema = {
-  "oneOf": [
-    {
-      "type": "string"
-    },
-    {
-      "type": "null"
-    }
-  ]
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/rules/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/rules/schemas.ts
index 6e29aaca9..b05a6f984 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/rules/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/rules/schemas.ts
@@ -3,53 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `zero-trust-gateway_action`.
- */
-export const zero_trust_gateway_action: JsonSchema = {
-  "description": "Specify the action to perform when the associated traffic, identity, and device posture expressions either absent or evaluate to `true`.",
-  "enum": [
-    "on",
-    "off",
-    "allow",
-    "block",
-    "scan",
-    "noscan",
-    "safesearch",
-    "ytrestricted",
-    "isolate",
-    "noisolate",
-    "override",
-    "l4_override",
-    "egress",
-    "resolve",
-    "quarantine",
-    "redirect",
-    "forward"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_description-2`.
- */
-export const zero_trust_gateway_description_2: JsonSchema = {
-  "description": "Specify the rule description.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_device_posture`.
- */
-export const zero_trust_gateway_device_posture: JsonSchema = {
-  "description": "Specify the wirefilter expression used for device posture check. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
-  "type": "string"
-};
-
 /**
  * The schema of `zero-trust-gateway_dns_resolver_settings_v4`.
  */
-export const zero_trust_gateway_dns_resolver_settings_v4: JsonSchema = {
+export const zero$$trust$$gateway_dns_resolver_settings_v4: JsonSchema = {
   "properties": {
     "ip": {
       "description": "Specify the IPv4 address of the upstream resolver.",
@@ -77,7 +34,7 @@ export const zero_trust_gateway_dns_resolver_settings_v4: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_dns_resolver_settings_v6`.
  */
-export const zero_trust_gateway_dns_resolver_settings_v6: JsonSchema = {
+export const zero$$trust$$gateway_dns_resolver_settings_v6: JsonSchema = {
   "properties": {
     "ip": {
       "description": "Specify the IPv6 address of the upstream resolver.",
@@ -102,18 +59,10 @@ export const zero_trust_gateway_dns_resolver_settings_v6: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zero-trust-gateway_enabled`.
- */
-export const zero_trust_gateway_enabled: JsonSchema = {
-  "description": "Specify whether the rule is enabled.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `zero-trust-gateway_expiration`.
  */
-export const zero_trust_gateway_expiration: JsonSchema = {
+export const zero$$trust$$gateway_expiration: JsonSchema = {
   "description": "Defines the expiration time stamp and default duration of a DNS policy. Takes precedence over the policy's `schedule` configuration, if any. This  does not apply to HTTP or network policies. Settable only for `dns` rules.",
   "oneOf": [
     {
@@ -125,7 +74,8 @@ export const zero_trust_gateway_expiration: JsonSchema = {
         "expires_at": {
           "allOf": [
             {
-              "$ref": "#/$defs/zero-trust-gateway_timestamp"
+              "format": "date-time",
+              "type": "string"
             },
             {
               "type": "string"
@@ -147,7 +97,7 @@ export const zero_trust_gateway_expiration: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_filters`.
  */
-export const zero_trust_gateway_filters: JsonSchema = {
+export const zero$$trust$$gateway_filters: JsonSchema = {
   "description": "Specify the protocol or layer to evaluate the traffic, identity, and device posture expressions. Can only contain a single value.",
   "items": {
     "enum": [
@@ -164,34 +114,10 @@ export const zero_trust_gateway_filters: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `zero-trust-gateway_identity`.
- */
-export const zero_trust_gateway_identity: JsonSchema = {
-  "description": "Specify the wirefilter expression used for identity matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_name-3`.
- */
-export const zero_trust_gateway_name_3: JsonSchema = {
-  "description": "Specify the rule name.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_precedence`.
- */
-export const zero_trust_gateway_precedence: JsonSchema = {
-  "description": "Set the order of your rules. Lower values indicate higher precedence. At each processing phase, evaluate applicable rules in ascending order of this value. Refer to [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform) to manage precedence via Terraform.",
-  "type": "integer"
-};
-
 /**
  * The schema of `zero-trust-gateway_rule-settings`.
  */
-export const zero_trust_gateway_rule_settings: JsonSchema = {
+export const zero$$trust$$gateway_rule$$settings: JsonSchema = {
   "description": "Defines settings for this rule. Settings apply only to specific rule types and must use compatible selectors. If Terraform detects drift, confirm the setting supports your rule type and check whether the API modifies the value. Use API-returned values in your configuration to prevent drift.",
   "properties": {
     "add_headers": {
@@ -732,7 +658,7 @@ export const zero_trust_gateway_rule_settings: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_schedule`.
  */
-export const zero_trust_gateway_schedule: JsonSchema = {
+export const zero$$trust$$gateway_schedule: JsonSchema = {
   "description": "Defines the schedule for activating DNS policies. Settable only for `dns` and `dns_resolver` rules.",
   "oneOf": [
     {
@@ -777,20 +703,3 @@ export const zero_trust_gateway_schedule: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `zero-trust-gateway_traffic`.
- */
-export const zero_trust_gateway_traffic: JsonSchema = {
-  "description": "Specify the wirefilter expression used for traffic matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_uuid-4`.
- */
-export const zero_trust_gateway_uuid_4: JsonSchema = {
-  "description": "Identify the API resource with a UUID.",
-  "format": "uuid",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/rules/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/rules/tools.ts
index 54f264a62..8088c952d 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/rules/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/rules/tools.ts
@@ -1,100 +1,87 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
-  zero_trust_gateway_read_only_timestamp_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../../outputs.js";
-import { zero_trust_gateway_identifier_2 } from "../../schemas.js";
 import {
-  zero_trust_gateway_api_response_collection_output,
-  zero_trust_gateway_api_response_common_output,
-  zero_trust_gateway_empty_response_output,
-  zero_trust_gateway_result_info_output,
-  zero_trust_gateway_timestamp_output,
+  zero$$trust$$gateway_api$$response$$collection,
+  zero$$trust$$gateway_api$$response$$common,
+  zero$$trust$$gateway_empty_response,
+  zero$$trust$$gateway_result_info,
 } from "../outputs.js";
-import { zero_trust_gateway_timestamp } from "../schemas.js";
 import {
-  zero_trust_gateway_action_output,
-  zero_trust_gateway_deleted_at_output,
-  zero_trust_gateway_description_2_output,
-  zero_trust_gateway_device_posture_output,
-  zero_trust_gateway_dns_resolver_settings_v4_output,
-  zero_trust_gateway_dns_resolver_settings_v6_output,
-  zero_trust_gateway_enabled_output,
-  zero_trust_gateway_expiration_output,
-  zero_trust_gateway_filters_output,
-  zero_trust_gateway_identity_output,
-  zero_trust_gateway_name_3_output,
-  zero_trust_gateway_precedence_output,
-  zero_trust_gateway_read_only_output,
-  zero_trust_gateway_response_collection_6_output,
-  zero_trust_gateway_rule_settings_output,
-  zero_trust_gateway_rules_output,
-  zero_trust_gateway_schedule_output,
-  zero_trust_gateway_sharable_output,
-  zero_trust_gateway_single_response_4_output,
-  zero_trust_gateway_source_account_output,
-  zero_trust_gateway_traffic_output,
-  zero_trust_gateway_uuid_4_output,
-  zero_trust_gateway_version_output,
-  zero_trust_gateway_warning_status_output,
+  zero$$trust$$gateway_dns_resolver_settings_v4,
+  zero$$trust$$gateway_dns_resolver_settings_v6,
+  zero$$trust$$gateway_expiration,
+  zero$$trust$$gateway_filters,
+  zero$$trust$$gateway_response_collection$$6,
+  zero$$trust$$gateway_rule$$settings,
+  zero$$trust$$gateway_rules,
+  zero$$trust$$gateway_schedule,
+  zero$$trust$$gateway_single_response$$4,
 } from "./outputs.js";
 import {
-  zero_trust_gateway_action,
-  zero_trust_gateway_description_2,
-  zero_trust_gateway_device_posture,
-  zero_trust_gateway_dns_resolver_settings_v4,
-  zero_trust_gateway_dns_resolver_settings_v6,
-  zero_trust_gateway_enabled,
-  zero_trust_gateway_expiration,
-  zero_trust_gateway_filters,
-  zero_trust_gateway_identity,
-  zero_trust_gateway_name_3,
-  zero_trust_gateway_precedence,
-  zero_trust_gateway_rule_settings,
-  zero_trust_gateway_schedule,
-  zero_trust_gateway_traffic,
-  zero_trust_gateway_uuid_4,
+  zero$$trust$$gateway_dns_resolver_settings_v4 as zero$$trust$$gateway_dns_resolver_settings_v4$,
+  zero$$trust$$gateway_dns_resolver_settings_v6 as zero$$trust$$gateway_dns_resolver_settings_v6$,
+  zero$$trust$$gateway_expiration as zero$$trust$$gateway_expiration$,
+  zero$$trust$$gateway_filters as zero$$trust$$gateway_filters$,
+  zero$$trust$$gateway_rule$$settings as zero$$trust$$gateway_rule$$settings$,
+  zero$$trust$$gateway_schedule as zero$$trust$$gateway_schedule$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.gateway.rules`.
+ * The tools of `zeroTrust.gateway.rules`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_rules_create",
+    name: "zeroTrust_gateway_rules_create",
     title: "Create a Zero Trust Gateway rule",
-    description: "Create a new Zero Trust Gateway rule.",
+    description: "Create a new Zero Trust Gateway rule.\n\nPOST /accounts/{account_id}/gateway/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "action": {
-              "$ref": "#/$defs/zero-trust-gateway_action",
-              "description": "Specify the action to perform when the associated traffic, identity, and device posture expressions either absent or evaluate to `true`."
+              "description": "Specify the action to perform when the associated traffic, identity, and device posture expressions either absent or evaluate to `true`.",
+              "enum": [
+                "on",
+                "off",
+                "allow",
+                "block",
+                "scan",
+                "noscan",
+                "safesearch",
+                "ytrestricted",
+                "isolate",
+                "noisolate",
+                "override",
+                "l4_override",
+                "egress",
+                "resolve",
+                "quarantine",
+                "redirect",
+                "forward"
+              ],
+              "type": "string"
             },
             "description": {
-              "$ref": "#/$defs/zero-trust-gateway_description-2",
-              "description": "Specify the rule description."
+              "description": "Specify the rule description.",
+              "type": "string"
             },
             "device_posture": {
-              "$ref": "#/$defs/zero-trust-gateway_device_posture",
               "default": "",
-              "description": "Specify the wirefilter expression used for device posture check. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response."
+              "description": "Specify the wirefilter expression used for device posture check. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/zero-trust-gateway_enabled",
               "default": false,
-              "description": "Specify whether the rule is enabled."
+              "description": "Specify whether the rule is enabled.",
+              "type": "boolean"
             },
             "expiration": {
               "$ref": "#/$defs/zero-trust-gateway_expiration",
@@ -105,17 +92,17 @@ export const tools: readonly Tool[] = [
               "description": "Specify the protocol or layer to evaluate the traffic, identity, and device posture expressions. Can only contain a single value."
             },
             "identity": {
-              "$ref": "#/$defs/zero-trust-gateway_identity",
               "default": "",
-              "description": "Specify the wirefilter expression used for identity matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response."
+              "description": "Specify the wirefilter expression used for identity matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name-3",
-              "description": "Specify the rule name."
+              "description": "Specify the rule name.",
+              "type": "string"
             },
             "precedence": {
-              "$ref": "#/$defs/zero-trust-gateway_precedence",
-              "description": "Set the order of your rules. Lower values indicate higher precedence. At each processing phase, evaluate applicable rules in ascending order of this value. Refer to [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform) to manage precedence via Terraform."
+              "description": "Set the order of your rules. Lower values indicate higher precedence. At each processing phase, evaluate applicable rules in ascending order of this value. Refer to [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform) to manage precedence via Terraform.",
+              "type": "integer"
             },
             "rule_settings": {
               "$ref": "#/$defs/zero-trust-gateway_rule-settings",
@@ -126,9 +113,9 @@ export const tools: readonly Tool[] = [
               "description": "Defines the schedule for activating DNS policies. Settable only for `dns` and `dns_resolver` rules."
             },
             "traffic": {
-              "$ref": "#/$defs/zero-trust-gateway_traffic",
               "default": "",
-              "description": "Specify the wirefilter expression used for traffic matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response."
+              "description": "Specify the wirefilter expression used for traffic matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
+              "type": "string"
             }
           },
           "required": [
@@ -136,61 +123,48 @@ export const tools: readonly Tool[] = [
             "name"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4$,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6$,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration$,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters$,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings$,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-4",
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_single_response-4": zero_trust_gateway_single_response_4_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
+        "zero-trust-gateway_single_response-4": zero$$trust$$gateway_single_response$$4,
       },
     },
     annotations: {
@@ -219,34 +193,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_single_response-4": zero_trust_gateway_single_response_4_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
+        "zero-trust-gateway_single_response-4": zero$$trust$$gateway_single_response$$4,
       },
     },
     request: (args) => ({
@@ -255,36 +212,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_rules_delete",
+    name: "zeroTrust_gateway_rules_delete",
     title: "Delete a Zero Trust Gateway rule",
-    description: "Delete a Zero Trust Gateway rule.",
+    description: "Delete a Zero Trust Gateway rule.\n\nDELETE /accounts/{account_id}/gateway/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-4",
-          "description": "Identify the API resource with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Identify the API resource with a UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_empty_response",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -313,10 +277,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_empty_response": zero_trust_gateway_empty_response_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_empty_response": zero$$trust$$gateway_empty_response,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -324,60 +288,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_rules_get",
+    name: "zeroTrust_gateway_rules_get",
     title: "Get Zero Trust Gateway rule details.",
-    description: "Get a single Zero Trust Gateway rule.",
+    description: "Get a single Zero Trust Gateway rule.\n\nGET /accounts/{account_id}/gateway/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-4",
-          "description": "Identify the API resource with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Identify the API resource with a UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-4",
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_single_response-4": zero_trust_gateway_single_response_4_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
+        "zero-trust-gateway_single_response-4": zero$$trust$$gateway_single_response$$4,
       },
     },
     annotations: {
@@ -406,34 +360,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_single_response-4": zero_trust_gateway_single_response_4_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
+        "zero-trust-gateway_single_response-4": zero$$trust$$gateway_single_response$$4,
       },
     },
     request: (args) => ({
@@ -441,85 +378,81 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_rules_list",
+    name: "zeroTrust_gateway_rules_list",
     title: "List Zero Trust Gateway rules",
-    description: "List Zero Trust Gateway rules for an account.",
+    description: "List Zero Trust Gateway rules for an account.\n\nGET /accounts/{account_id}/gateway/rules",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "direction": {
-          "description": "Sort direction. When `order_by` is omitted, this controls the direction\nof the existing precedence ordering. Shared rules remain first in either\ndirection. Accepted values are `asc` and `desc`.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "filter": {
-          "description": "Filter the returned rules by one or more `field:value` pairs. Repeat the\nparameter to combine filters with logical AND.\n\nSupported fields are `name`, `id`, `action`, `enabled`, `source_account`,\n`is_shared`, `filters`, and `expression` (max 1024 bytes). The `source_account`\nvalue is matched as a normalized UUID substring. The `filters` value must\nbe one of the rule filter names and matches a member of the rule's `filters`\narray. The `expression` filter performs a case-insensitive literal\nsubstring match across traffic, identity, and device posture expressions.",
-          "items": {
-            "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
           },
-          "type": "array"
-        },
-        "order_by": {
-          "description": "Field to sort the returned rules by. Supported values are `name`,\n`created_at`, `updated_at`, and `precedence`.",
-          "enum": [
-            "name",
-            "created_at",
-            "updated_at",
-            "precedence"
+          "required": [
+            "account_id"
           ],
-          "type": "string"
+          "type": "object"
         },
-        "search": {
-          "description": "Case-insensitive substring search across rule name and description.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "direction": {
+              "description": "Sort direction. When `order_by` is omitted, this controls the direction\nof the existing precedence ordering. Shared rules remain first in either\ndirection. Accepted values are `asc` and `desc`.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "filter": {
+              "description": "Filter the returned rules by one or more `field:value` pairs. Repeat the\nparameter to combine filters with logical AND.\n\nSupported fields are `name`, `id`, `action`, `enabled`, `source_account`,\n`is_shared`, `filters`, and `expression` (max 1024 bytes). The `source_account`\nvalue is matched as a normalized UUID substring. The `filters` value must\nbe one of the rule filter names and matches a member of the rule's `filters`\narray. The `expression` filter performs a case-insensitive literal\nsubstring match across traffic, identity, and device posture expressions.",
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "order_by": {
+              "description": "Field to sort the returned rules by. Supported values are `name`,\n`created_at`, `updated_at`, and `precedence`.",
+              "enum": [
+                "name",
+                "created_at",
+                "updated_at",
+                "precedence"
+              ],
+              "type": "string"
+            },
+            "search": {
+              "description": "Case-insensitive substring search across rule name and description.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-6",
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-6": zero_trust_gateway_response_collection_6_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-6": zero$$trust$$gateway_response_collection$$6,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
       },
     },
     annotations: {
@@ -548,99 +481,72 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-6": zero_trust_gateway_response_collection_6_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-6": zero$$trust$$gateway_response_collection$$6,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/gateway/rules`,
       query: [
-        ["filter", args["filter"], true],
-        ["search", args["search"], true],
-        ["order_by", args["order_by"], true],
-        ["direction", args["direction"], true],
+        ["filter", param(args, "query", "filter"), true],
+        ["search", param(args, "query", "search"), true],
+        ["order_by", param(args, "query", "order_by"), true],
+        ["direction", param(args, "query", "direction"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_gateway_rules_list_tenant",
+    name: "zeroTrust_gateway_rules_listTenant",
     title: "List Zero Trust Gateway rules inherited from the parent account",
-    description: "List Zero Trust Gateway rules for the parent account of an account in the MSP configuration.",
+    description: "List Zero Trust Gateway rules for the parent account of an account in the MSP configuration.\n\nGET /accounts/{account_id}/gateway/rules/tenant",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_response_collection-6",
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-6": zero_trust_gateway_response_collection_6_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-6": zero$$trust$$gateway_response_collection$$6,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
       },
     },
     annotations: {
@@ -669,36 +575,19 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-collection": zero_trust_gateway_api_response_collection_output,
-        "zero-trust-gateway_api-response-common": zero_trust_gateway_api_response_common_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_response_collection-6": zero_trust_gateway_response_collection_6_output,
-        "zero-trust-gateway_result_info": zero_trust_gateway_result_info_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-collection": zero$$trust$$gateway_api$$response$$collection,
+        "zero-trust-gateway_api-response-common": zero$$trust$$gateway_api$$response$$common,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_response_collection-6": zero$$trust$$gateway_response_collection$$6,
+        "zero-trust-gateway_result_info": zero$$trust$$gateway_result_info,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
       },
     },
     request: (args) => ({
@@ -706,60 +595,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_rules_reset_expiration",
+    name: "zeroTrust_gateway_rules_resetExpiration",
     title: "Reset the expiration of a Zero Trust Gateway Rule",
-    description: "Resets the expiration of a Zero Trust Gateway Rule if its duration elapsed and it has a default duration. The Zero Trust Gateway Rule must have values  for both `expiration.expires_at` and `expiration.duration`.",
+    description: "Resets the expiration of a Zero Trust Gateway Rule if its duration elapsed and it has a default duration. The Zero Trust Gateway Rule must have values  for both `expiration.expires_at` and `expiration.duration`.\n\nPOST /accounts/{account_id}/gateway/rules/{rule_id}/reset_expiration",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
-        "rule_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-4",
-          "description": "Identify the API resource with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Identify the API resource with a UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-4",
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_single_response-4": zero_trust_gateway_single_response_4_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
+        "zero-trust-gateway_single_response-4": zero$$trust$$gateway_single_response$$4,
       },
     },
     annotations: {
@@ -788,34 +667,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_single_response-4": zero_trust_gateway_single_response_4_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
+        "zero-trust-gateway_single_response-4": zero$$trust$$gateway_single_response$$4,
       },
     },
     request: (args) => ({
@@ -823,35 +685,50 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_rules_update",
+    name: "zeroTrust_gateway_rules_update",
     title: "Update a Zero Trust Gateway rule",
-    description: "Update a configured Zero Trust Gateway rule.",
+    description: "Update a configured Zero Trust Gateway rule.\n\nPUT /accounts/{account_id}/gateway/rules/{rule_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier-2",
-          "description": "Specify the Cloudflare account identifier."
-        },
         "body": {
           "properties": {
             "action": {
-              "$ref": "#/$defs/zero-trust-gateway_action",
-              "description": "Specify the action to perform when the associated traffic, identity, and device posture expressions either absent or evaluate to `true`."
+              "description": "Specify the action to perform when the associated traffic, identity, and device posture expressions either absent or evaluate to `true`.",
+              "enum": [
+                "on",
+                "off",
+                "allow",
+                "block",
+                "scan",
+                "noscan",
+                "safesearch",
+                "ytrestricted",
+                "isolate",
+                "noisolate",
+                "override",
+                "l4_override",
+                "egress",
+                "resolve",
+                "quarantine",
+                "redirect",
+                "forward"
+              ],
+              "type": "string"
             },
             "description": {
-              "$ref": "#/$defs/zero-trust-gateway_description-2",
-              "description": "Specify the rule description."
+              "description": "Specify the rule description.",
+              "type": "string"
             },
             "device_posture": {
-              "$ref": "#/$defs/zero-trust-gateway_device_posture",
               "default": "",
-              "description": "Specify the wirefilter expression used for device posture check. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response."
+              "description": "Specify the wirefilter expression used for device posture check. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
+              "type": "string"
             },
             "enabled": {
-              "$ref": "#/$defs/zero-trust-gateway_enabled",
               "default": false,
-              "description": "Specify whether the rule is enabled."
+              "description": "Specify whether the rule is enabled.",
+              "type": "boolean"
             },
             "expiration": {
               "$ref": "#/$defs/zero-trust-gateway_expiration",
@@ -862,17 +739,17 @@ export const tools: readonly Tool[] = [
               "description": "Specify the protocol or layer to evaluate the traffic, identity, and device posture expressions. Can only contain a single value."
             },
             "identity": {
-              "$ref": "#/$defs/zero-trust-gateway_identity",
               "default": "",
-              "description": "Specify the wirefilter expression used for identity matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response."
+              "description": "Specify the wirefilter expression used for identity matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
+              "type": "string"
             },
             "name": {
-              "$ref": "#/$defs/zero-trust-gateway_name-3",
-              "description": "Specify the rule name."
+              "description": "Specify the rule name.",
+              "type": "string"
             },
             "precedence": {
-              "$ref": "#/$defs/zero-trust-gateway_precedence",
-              "description": "Set the order of your rules. Lower values indicate higher precedence. At each processing phase, evaluate applicable rules in ascending order of this value. Refer to [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform) to manage precedence via Terraform."
+              "description": "Set the order of your rules. Lower values indicate higher precedence. At each processing phase, evaluate applicable rules in ascending order of this value. Refer to [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform) to manage precedence via Terraform.",
+              "type": "integer"
             },
             "rule_settings": {
               "$ref": "#/$defs/zero-trust-gateway_rule-settings",
@@ -883,9 +760,9 @@ export const tools: readonly Tool[] = [
               "description": "Defines the schedule for activating DNS policies. Settable only for `dns` and `dns_resolver` rules."
             },
             "traffic": {
-              "$ref": "#/$defs/zero-trust-gateway_traffic",
               "default": "",
-              "description": "Specify the wirefilter expression used for traffic matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response."
+              "description": "Specify the wirefilter expression used for traffic matching. The API automatically formats and sanitizes expressions before storing them. To prevent Terraform state drift, use the formatted expression returned in the API response.",
+              "type": "string"
             }
           },
           "required": [
@@ -894,66 +771,53 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "rule_id": {
-          "$ref": "#/$defs/zero-trust-gateway_uuid-4",
-          "description": "Identify the API resource with a UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            },
+            "rule_id": {
+              "description": "Identify the API resource with a UUID.",
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "rule_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "rule_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters,
-        "zero-trust-gateway_identifier-2": zero_trust_gateway_identifier_2,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4$,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6$,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration$,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters$,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings$,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_single_response-4",
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_single_response-4": zero_trust_gateway_single_response_4_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
+        "zero-trust-gateway_single_response-4": zero$$trust$$gateway_single_response$$4,
       },
     },
     annotations: {
@@ -982,34 +846,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_action": zero_trust_gateway_action_output,
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_deleted_at": zero_trust_gateway_deleted_at_output,
-        "zero-trust-gateway_description-2": zero_trust_gateway_description_2_output,
-        "zero-trust-gateway_device_posture": zero_trust_gateway_device_posture_output,
-        "zero-trust-gateway_dns_resolver_settings_v4": zero_trust_gateway_dns_resolver_settings_v4_output,
-        "zero-trust-gateway_dns_resolver_settings_v6": zero_trust_gateway_dns_resolver_settings_v6_output,
-        "zero-trust-gateway_enabled": zero_trust_gateway_enabled_output,
-        "zero-trust-gateway_expiration": zero_trust_gateway_expiration_output,
-        "zero-trust-gateway_filters": zero_trust_gateway_filters_output,
-        "zero-trust-gateway_identity": zero_trust_gateway_identity_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_name-3": zero_trust_gateway_name_3_output,
-        "zero-trust-gateway_precedence": zero_trust_gateway_precedence_output,
-        "zero-trust-gateway_read_only": zero_trust_gateway_read_only_output,
-        "zero-trust-gateway_read_only_timestamp": zero_trust_gateway_read_only_timestamp_output,
-        "zero-trust-gateway_rule-settings": zero_trust_gateway_rule_settings_output,
-        "zero-trust-gateway_rules": zero_trust_gateway_rules_output,
-        "zero-trust-gateway_schedule": zero_trust_gateway_schedule_output,
-        "zero-trust-gateway_sharable": zero_trust_gateway_sharable_output,
-        "zero-trust-gateway_single_response-4": zero_trust_gateway_single_response_4_output,
-        "zero-trust-gateway_source_account": zero_trust_gateway_source_account_output,
-        "zero-trust-gateway_timestamp": zero_trust_gateway_timestamp_output,
-        "zero-trust-gateway_traffic": zero_trust_gateway_traffic_output,
-        "zero-trust-gateway_uuid-4": zero_trust_gateway_uuid_4_output,
-        "zero-trust-gateway_version": zero_trust_gateway_version_output,
-        "zero-trust-gateway_warning_status": zero_trust_gateway_warning_status_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_dns_resolver_settings_v4": zero$$trust$$gateway_dns_resolver_settings_v4,
+        "zero-trust-gateway_dns_resolver_settings_v6": zero$$trust$$gateway_dns_resolver_settings_v6,
+        "zero-trust-gateway_expiration": zero$$trust$$gateway_expiration,
+        "zero-trust-gateway_filters": zero$$trust$$gateway_filters,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
+        "zero-trust-gateway_rule-settings": zero$$trust$$gateway_rule$$settings,
+        "zero-trust-gateway_rules": zero$$trust$$gateway_rules,
+        "zero-trust-gateway_schedule": zero$$trust$$gateway_schedule,
+        "zero-trust-gateway_single_response-4": zero$$trust$$gateway_single_response$$4,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/schemas.ts b/src/generated/forge-mcp/zeroTrust/gateway/schemas.ts
deleted file mode 100644
index 4aeb1f5e4..000000000
--- a/src/generated/forge-mcp/zeroTrust/gateway/schemas.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `zero-trust-gateway_identifier`.
- */
-export const zero_trust_gateway_identifier: JsonSchema = {
-  "description": "Specify the Cloudflare account identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_identifier-3`.
- */
-export const zero_trust_gateway_identifier_3: JsonSchema = {
-  "description": "Provide the identifier string.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_timestamp`.
- */
-export const zero_trust_gateway_timestamp: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_uuid-3`.
- */
-export const zero_trust_gateway_uuid_3: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/gateway/tools.ts b/src/generated/forge-mcp/zeroTrust/gateway/tools.ts
index ffe938114..bdc4f8251 100644
--- a/src/generated/forge-mcp/zeroTrust/gateway/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/gateway/tools.ts
@@ -3,50 +3,48 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  zero_trust_gateway_api_response_common_failure_output,
-  zero_trust_gateway_api_response_single_output,
-  zero_trust_gateway_messages_output,
+  zero$$trust$$gateway_api$$response$$common$$failure,
+  zero$$trust$$gateway_api$$response$$single,
+  zero$$trust$$gateway_messages,
 } from "../outputs.js";
-import {
-  zero_trust_gateway_cf_account_id_output,
-  zero_trust_gateway_gateway_account_output,
-  zero_trust_gateway_gateway_tag_output,
-  zero_trust_gateway_provider_name_output,
-} from "./outputs.js";
-import { zero_trust_gateway_identifier } from "./schemas.js";
+import { zero$$trust$$gateway_gateway_account } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.gateway`.
+ * The tools of `zeroTrust.gateway`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_gateway_create",
+    name: "zeroTrust_gateway_create",
     title: "Create Zero Trust account",
-    description: "Create a Zero Trust account for an existing Cloudflare account.",
+    description: "Create a Zero Trust account for an existing Cloudflare account.\n\nPOST /accounts/{account_id}/gateway",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier": zero_trust_gateway_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_gateway_account",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_cf_account_id": zero_trust_gateway_cf_account_id_output,
-        "zero-trust-gateway_gateway_account": zero_trust_gateway_gateway_account_output,
-        "zero-trust-gateway_gateway_tag": zero_trust_gateway_gateway_tag_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_provider_name": zero_trust_gateway_provider_name_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_gateway_account": zero$$trust$$gateway_gateway_account,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -80,13 +78,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_cf_account_id": zero_trust_gateway_cf_account_id_output,
-        "zero-trust-gateway_gateway_account": zero_trust_gateway_gateway_account_output,
-        "zero-trust-gateway_gateway_tag": zero_trust_gateway_gateway_tag_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_provider_name": zero_trust_gateway_provider_name_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_gateway_account": zero$$trust$$gateway_gateway_account,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
@@ -94,33 +89,37 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_gateway_list",
+    name: "zeroTrust_gateway_list",
     title: "Get Zero Trust account information",
-    description: "Retrieve information about the current Zero Trust account.",
+    description: "Retrieve information about the current Zero Trust account.\n\nGET /accounts/{account_id}/gateway",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/zero-trust-gateway_identifier",
-          "description": "Specify the Cloudflare account identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Specify the Cloudflare account identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "zero-trust-gateway_identifier": zero_trust_gateway_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zero-trust-gateway_gateway_account",
       $defs: {
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_cf_account_id": zero_trust_gateway_cf_account_id_output,
-        "zero-trust-gateway_gateway_account": zero_trust_gateway_gateway_account_output,
-        "zero-trust-gateway_gateway_tag": zero_trust_gateway_gateway_tag_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_provider_name": zero_trust_gateway_provider_name_output,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_gateway_account": zero$$trust$$gateway_gateway_account,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     annotations: {
@@ -155,13 +154,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zero-trust-gateway_api-response-common-failure": zero_trust_gateway_api_response_common_failure_output,
-        "zero-trust-gateway_api-response-single": zero_trust_gateway_api_response_single_output,
-        "zero-trust-gateway_cf_account_id": zero_trust_gateway_cf_account_id_output,
-        "zero-trust-gateway_gateway_account": zero_trust_gateway_gateway_account_output,
-        "zero-trust-gateway_gateway_tag": zero_trust_gateway_gateway_tag_output,
-        "zero-trust-gateway_messages": zero_trust_gateway_messages_output,
-        "zero-trust-gateway_provider_name": zero_trust_gateway_provider_name_output,
+        "zero-trust-gateway_api-response-common-failure": zero$$trust$$gateway_api$$response$$common$$failure,
+        "zero-trust-gateway_api-response-single": zero$$trust$$gateway_api$$response$$single,
+        "zero-trust-gateway_gateway_account": zero$$trust$$gateway_gateway_account,
+        "zero-trust-gateway_messages": zero$$trust$$gateway_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/federationGrants/outputs.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/federationGrants/outputs.ts
index 858c6841b..f47f2ceae 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/federationGrants/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/federationGrants/outputs.ts
@@ -6,13 +6,21 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `access_idp_federation_grant` in responses.
  */
-export const access_idp_federation_grant_output: JsonSchema = {
+export const access_idp_federation_grant: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "id": {
-      "$ref": "#/$defs/access_identifier"
+      "type": "string"
     },
     "idp_id": {
       "format": "uuid",
@@ -30,7 +38,7 @@ export const access_idp_federation_grant_output: JsonSchema = {
 /**
  * The schema of `access_idp_federation_grant_id_response` in responses.
  */
-export const access_idp_federation_grant_id_response_output: JsonSchema = {
+export const access_idp_federation_grant_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -40,7 +48,7 @@ export const access_idp_federation_grant_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/access_identifier"
+              "type": "string"
             }
           },
           "type": "object"
@@ -54,7 +62,7 @@ export const access_idp_federation_grant_id_response_output: JsonSchema = {
 /**
  * The schema of `access_idp_federation_grant_list_response` in responses.
  */
-export const access_idp_federation_grant_list_response_output: JsonSchema = {
+export const access_idp_federation_grant_list_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -76,7 +84,7 @@ export const access_idp_federation_grant_list_response_output: JsonSchema = {
 /**
  * The schema of `access_idp_federation_grant_response` in responses.
  */
-export const access_idp_federation_grant_response_output: JsonSchema = {
+export const access_idp_federation_grant_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/federationGrants/tools.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/federationGrants/tools.ts
index 6b22aa8ca..340882d29 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/federationGrants/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/federationGrants/tools.ts
@@ -3,62 +3,64 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_created_at_output,
-  access_identifier_output,
-  access_messages_output,
-  access_timestamp_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier } from "../../schemas.js";
 import {
-  access_idp_federation_grant_id_response_output,
-  access_idp_federation_grant_list_response_output,
-  access_idp_federation_grant_output,
-  access_idp_federation_grant_response_output,
+  access_idp_federation_grant,
+  access_idp_federation_grant_id_response,
+  access_idp_federation_grant_list_response,
+  access_idp_federation_grant_response,
 } from "./outputs.js";
 import { access_idp_federation_grant_create_request } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.identity_providers.federation_grants`.
+ * The tools of `zeroTrust.identityProviders.federationGrants`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_identity_providers_federation_grants_create",
+    name: "zeroTrust_identityProviders_federationGrants_create",
     title: "Create an IdP federation grant",
-    description: "Creates an IdP federation grant for the specified identity provider, making it\navailable for federation to other accounts in the same Cloudflare organization.\n\nThe account must belong to a Cloudflare organization. One-time pin and\nCloudflare-managed identity providers cannot be federated. An account\ncan federate at most five identity providers at a time.",
+    description: "Creates an IdP federation grant for the specified identity provider, making it\navailable for federation to other accounts in the same Cloudflare organization.\n\nThe account must belong to a Cloudflare organization. One-time pin and\nCloudflare-managed identity providers cannot be federated. An account\ncan federate at most five identity providers at a time.\n\nPOST /accounts/{account_id}/access/idp_federation_grants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "$ref": "#/$defs/access_idp_federation_grant_create_request"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_identifier": access_identifier,
         "access_idp_federation_grant_create_request": access_idp_federation_grant_create_request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_idp_federation_grant_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_identifier": access_identifier_output,
-        "access_idp_federation_grant": access_idp_federation_grant_output,
-        "access_idp_federation_grant_response": access_idp_federation_grant_response_output,
-        "access_messages": access_messages_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_idp_federation_grant": access_idp_federation_grant,
+        "access_idp_federation_grant_response": access_idp_federation_grant_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -83,14 +85,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_identifier": access_identifier_output,
-        "access_idp_federation_grant": access_idp_federation_grant_output,
-        "access_idp_federation_grant_response": access_idp_federation_grant_response_output,
-        "access_messages": access_messages_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_idp_federation_grant": access_idp_federation_grant,
+        "access_idp_federation_grant_response": access_idp_federation_grant_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -99,36 +98,42 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_federation_grants_delete",
+    name: "zeroTrust_identityProviders_federationGrants_delete",
     title: "Delete an IdP federation grant",
-    description: "Deletes an IdP federation grant. The identity provider remains in the account,\nbut it is no longer available for federation to other accounts.",
+    description: "Deletes an IdP federation grant. The identity provider remains in the account,\nbut it is no longer available for federation to other accounts.\n\nDELETE /accounts/{account_id}/access/idp_federation_grants/{grant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "grant_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "UID of the IdP federation grant."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "grant_id": {
+              "description": "UID of the IdP federation grant.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "grant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "grant_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_idp_federation_grant_id_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_identifier": access_identifier_output,
-        "access_idp_federation_grant_id_response": access_idp_federation_grant_id_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_idp_federation_grant_id_response": access_idp_federation_grant_id_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -153,11 +158,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_identifier": access_identifier_output,
-        "access_idp_federation_grant_id_response": access_idp_federation_grant_id_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_idp_federation_grant_id_response": access_idp_federation_grant_id_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -165,39 +169,43 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_federation_grants_get",
+    name: "zeroTrust_identityProviders_federationGrants_get",
     title: "Get an IdP federation grant",
-    description: "Retrieves a single IdP federation grant by its UID.",
+    description: "Retrieves a single IdP federation grant by its UID.\n\nGET /accounts/{account_id}/access/idp_federation_grants/{grant_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "grant_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "UID of the IdP federation grant."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "grant_id": {
+              "description": "UID of the IdP federation grant.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "grant_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "grant_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_idp_federation_grant_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_identifier": access_identifier_output,
-        "access_idp_federation_grant": access_idp_federation_grant_output,
-        "access_idp_federation_grant_response": access_idp_federation_grant_response_output,
-        "access_messages": access_messages_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_idp_federation_grant": access_idp_federation_grant,
+        "access_idp_federation_grant_response": access_idp_federation_grant_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -225,14 +233,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_created_at": access_created_at_output,
-        "access_identifier": access_identifier_output,
-        "access_idp_federation_grant": access_idp_federation_grant_output,
-        "access_idp_federation_grant_response": access_idp_federation_grant_response_output,
-        "access_messages": access_messages_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_idp_federation_grant": access_idp_federation_grant,
+        "access_idp_federation_grant_response": access_idp_federation_grant_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -240,35 +245,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_federation_grants_list",
+    name: "zeroTrust_identityProviders_federationGrants_list",
     title: "List IdP federation grants",
-    description: "Lists the IdP federation grants owned by the account.",
+    description: "Lists the IdP federation grants owned by the account.\n\nGET /accounts/{account_id}/access/idp_federation_grants",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_idp_federation_grant_list_response",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_created_at": access_created_at_output,
-        "access_identifier": access_identifier_output,
-        "access_idp_federation_grant": access_idp_federation_grant_output,
-        "access_idp_federation_grant_list_response": access_idp_federation_grant_list_response_output,
-        "access_messages": access_messages_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_idp_federation_grant": access_idp_federation_grant,
+        "access_idp_federation_grant_list_response": access_idp_federation_grant_list_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -293,15 +302,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_created_at": access_created_at_output,
-        "access_identifier": access_identifier_output,
-        "access_idp_federation_grant": access_idp_federation_grant_output,
-        "access_idp_federation_grant_list_response": access_idp_federation_grant_list_response_output,
-        "access_messages": access_messages_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_idp_federation_grant": access_idp_federation_grant,
+        "access_idp_federation_grant_list_response": access_idp_federation_grant_list_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/outputs.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/outputs.ts
index ba4fdd2b7..52e8e4fe2 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `access_azureAD` in responses.
  */
-export const access_azureAD_output: JsonSchema = {
+export const access_azureAD: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -54,7 +54,7 @@ export const access_azureAD_output: JsonSchema = {
 /**
  * The schema of `access_centrify` in responses.
  */
-export const access_centrify_output: JsonSchema = {
+export const access_centrify: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -91,7 +91,7 @@ export const access_centrify_output: JsonSchema = {
 /**
  * The schema of `access_cloudflare` in responses.
  */
-export const access_cloudflare_output: JsonSchema = {
+export const access_cloudflare: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -124,7 +124,7 @@ export const access_cloudflare_output: JsonSchema = {
 /**
  * The schema of `access_custom-claims-support` in responses.
  */
-export const access_custom_claims_support_output: JsonSchema = {
+export const access_custom$$claims$$support: JsonSchema = {
   "properties": {
     "claims": {
       "items": {
@@ -142,7 +142,7 @@ export const access_custom_claims_support_output: JsonSchema = {
 /**
  * The schema of `access_duo` in responses.
  */
-export const access_duo_output: JsonSchema = {
+export const access_duo: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -178,7 +178,7 @@ export const access_duo_output: JsonSchema = {
 /**
  * The schema of `access_facebook` in responses.
  */
-export const access_facebook_output: JsonSchema = {
+export const access_facebook: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -197,7 +197,7 @@ export const access_facebook_output: JsonSchema = {
 /**
  * The schema of `access_generic-oauth-config` in responses.
  */
-export const access_generic_oauth_config_output: JsonSchema = {
+export const access_generic$$oauth$$config: JsonSchema = {
   "properties": {
     "client_id": {
       "type": "string"
@@ -212,7 +212,7 @@ export const access_generic_oauth_config_output: JsonSchema = {
 /**
  * The schema of `access_github` in responses.
  */
-export const access_github_output: JsonSchema = {
+export const access_github: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -231,7 +231,7 @@ export const access_github_output: JsonSchema = {
 /**
  * The schema of `access_google` in responses.
  */
-export const access_google_output: JsonSchema = {
+export const access_google: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -257,7 +257,7 @@ export const access_google_output: JsonSchema = {
 /**
  * The schema of `access_google-apps` in responses.
  */
-export const access_google_apps_output: JsonSchema = {
+export const access_google$$apps: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -302,16 +302,16 @@ export const access_google_apps_output: JsonSchema = {
 /**
  * The schema of `access_identity-provider` in responses.
  */
-export const access_identity_provider_output: JsonSchema = {
+export const access_identity$$provider: JsonSchema = {
   "properties": {
     "config": {
       "type": "object"
     },
     "id": {
-      "$ref": "#/$defs/access_uuid"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-3"
+      "type": "string"
     },
     "read_only": {
       "type": "boolean"
@@ -385,7 +385,7 @@ export const access_identity_provider_output: JsonSchema = {
 /**
  * The schema of `access_identity-providers` in responses.
  */
-export const access_identity_providers_output: JsonSchema = {
+export const access_identity$$providers: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/access_azureAD"
@@ -444,7 +444,7 @@ export const access_identity_providers_output: JsonSchema = {
 /**
  * The schema of `access_linkedin` in responses.
  */
-export const access_linkedin_output: JsonSchema = {
+export const access_linkedin: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -460,17 +460,10 @@ export const access_linkedin_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_name-3` in responses.
- */
-export const access_name_3_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_oidc` in responses.
  */
-export const access_oidc_output: JsonSchema = {
+export const access_oidc: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -519,7 +512,7 @@ export const access_oidc_output: JsonSchema = {
 /**
  * The schema of `access_okta` in responses.
  */
-export const access_okta_output: JsonSchema = {
+export const access_okta: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -556,7 +549,7 @@ export const access_okta_output: JsonSchema = {
 /**
  * The schema of `access_onelogin` in responses.
  */
-export const access_onelogin_output: JsonSchema = {
+export const access_onelogin: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -590,7 +583,7 @@ export const access_onelogin_output: JsonSchema = {
 /**
  * The schema of `access_onetimepin` in responses.
  */
-export const access_onetimepin_output: JsonSchema = {
+export const access_onetimepin: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -620,7 +613,7 @@ export const access_onetimepin_output: JsonSchema = {
 /**
  * The schema of `access_passkeys` in responses.
  */
-export const access_passkeys_output: JsonSchema = {
+export const access_passkeys: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -653,7 +646,7 @@ export const access_passkeys_output: JsonSchema = {
 /**
  * The schema of `access_pingone` in responses.
  */
-export const access_pingone_output: JsonSchema = {
+export const access_pingone: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -687,7 +680,7 @@ export const access_pingone_output: JsonSchema = {
 /**
  * The schema of `access_response_collection` in responses.
  */
-export const access_response_collection_output: JsonSchema = {
+export const access_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -761,7 +754,7 @@ export const access_response_collection_output: JsonSchema = {
 /**
  * The schema of `access_saml` in responses.
  */
-export const access_saml_output: JsonSchema = {
+export const access_saml: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -829,7 +822,7 @@ export const access_saml_output: JsonSchema = {
 /**
  * The schema of `access_saml_certificate` in responses.
  */
-export const access_saml_certificate_output: JsonSchema = {
+export const access_saml_certificate: JsonSchema = {
   "properties": {
     "is_current": {
       "type": "boolean"
@@ -858,7 +851,7 @@ export const access_saml_certificate_output: JsonSchema = {
 /**
  * The schema of `access_saml_certificate_set` in responses.
  */
-export const access_saml_certificate_set_output: JsonSchema = {
+export const access_saml_certificate_set: JsonSchema = {
   "properties": {
     "created_at": {
       "format": "date-time",
@@ -897,7 +890,7 @@ export const access_saml_certificate_set_output: JsonSchema = {
 /**
  * The schema of `access_single_response-3` in responses.
  */
-export const access_single_response_3_output: JsonSchema = {
+export const access_single_response$$3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -916,7 +909,7 @@ export const access_single_response_3_output: JsonSchema = {
 /**
  * The schema of `access_yandex` in responses.
  */
-export const access_yandex_output: JsonSchema = {
+export const access_yandex: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/samlCertificate/outputs.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/samlCertificate/outputs.ts
index 0b7f7d51d..fbaadbd7d 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/samlCertificate/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/samlCertificate/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `access_saml_certificate_set_response` in responses.
  */
-export const access_saml_certificate_set_response_output: JsonSchema = {
+export const access_saml_certificate_set_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/samlCertificate/tools.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/samlCertificate/tools.ts
index c810b9177..74dea5484 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/samlCertificate/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/samlCertificate/tools.ts
@@ -3,54 +3,59 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier, access_uuid } from "../../schemas.js";
 import {
-  access_saml_certificate_output,
-  access_saml_certificate_set_output,
+  access_saml_certificate,
+  access_saml_certificate_set,
 } from "../outputs.js";
-import { access_saml_certificate_set_response_output } from "./outputs.js";
+import { access_saml_certificate_set_response } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.identity_providers.saml_certificate`.
+ * The tools of `zeroTrust.identityProviders.samlCertificate`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_identity_providers_saml_certificate_create",
+    name: "zeroTrust_identityProviders_samlCertificate_create",
     title: "Create SAML encryption certificate for Identity Provider",
-    description: "Creates a new SAML encryption certificate set and assigns it to the specified \nSAML Identity Provider. This endpoint is idempotent - if the IdP already has \na certificate set assigned, the existing certificate set is returned with a 200 status.\n\n**Workflow for enabling SAML encryption:**\n1. Call this endpoint to create and assign a certificate set to the IdP\n2. Update the IdP configuration (PUT `/identity_providers/{id}`) with:\n   - `config.enable_encryption: true`\n   - `saml_certificate_set_id: <uid from step 1>`\n3. Configure the certificate's public key in your external SAML Identity Provider",
+    description: "Creates a new SAML encryption certificate set and assigns it to the specified \nSAML Identity Provider. This endpoint is idempotent - if the IdP already has \na certificate set assigned, the existing certificate set is returned with a 200 status.\n\n**Workflow for enabling SAML encryption:**\n1. Call this endpoint to create and assign a certificate set to the IdP\n2. Update the IdP configuration (PUT `/identity_providers/{id}`) with:\n   - `config.enable_encryption: true`\n   - `saml_certificate_set_id: <uid from step 1>`\n3. Configure the certificate's public key in your external SAML Identity Provider\n\nPOST /accounts/{account_id}/access/identity_providers/{identity_provider_id}/saml_certificate",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identity_provider_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identity_provider_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_saml_certificate_set_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_saml_certificate_set_response": access_saml_certificate_set_response_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_saml_certificate_set_response": access_saml_certificate_set_response,
       },
     },
     annotations: {
@@ -81,12 +86,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_messages": access_messages_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_saml_certificate_set_response": access_saml_certificate_set_response_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_saml_certificate_set_response": access_saml_certificate_set_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/schemas.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/schemas.ts
index 76a82d005..e59e27250 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/schemas.ts
@@ -132,7 +132,7 @@ export const access_cloudflare: JsonSchema = {
 /**
  * The schema of `access_custom-claims-support`.
  */
-export const access_custom_claims_support: JsonSchema = {
+export const access_custom$$claims$$support: JsonSchema = {
   "properties": {
     "claims": {
       "description": "Custom claims",
@@ -212,7 +212,7 @@ export const access_facebook: JsonSchema = {
 /**
  * The schema of `access_generic-oauth-config`.
  */
-export const access_generic_oauth_config: JsonSchema = {
+export const access_generic$$oauth$$config: JsonSchema = {
   "properties": {
     "client_id": {
       "description": "Your OAuth Client ID",
@@ -276,7 +276,7 @@ export const access_google: JsonSchema = {
 /**
  * The schema of `access_google-apps`.
  */
-export const access_google_apps: JsonSchema = {
+export const access_google$$apps: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_identity-provider"
@@ -325,22 +325,22 @@ export const access_google_apps: JsonSchema = {
 /**
  * The schema of `access_identity-provider`.
  */
-export const access_identity_provider: JsonSchema = {
+export const access_identity$$provider: JsonSchema = {
   "properties": {
     "config": {
       "description": "The configuration parameters for the identity provider. To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).",
       "type": "object"
     },
     "id": {
-      "$ref": "#/$defs/access_uuid",
-      "description": "UUID."
+      "description": "UUID.",
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-3",
-      "description": "The name of the identity provider, shown to users on the login page."
+      "description": "The name of the identity provider, shown to users on the login page.",
+      "type": "string"
     },
     "saml_certificate_set_id": {
-      "description": "The UID of the SAML encryption certificate set assigned to this Identity Provider.\nOnly present for SAML identity providers with encryption configured.\nCreate a certificate set via POST to `/identity_providers/{id}/saml_certificate`.\n",
+      "description": "The UID of the SAML encryption certificate set assigned to this Identity Provider.\nOnly present for SAML identity providers with encryption configured.\nCreate a certificate set via POST to `/identity_providers/{id}/saml_certificate`.",
       "format": "uuid",
       "type": "string"
     },
@@ -410,7 +410,7 @@ export const access_identity_provider: JsonSchema = {
 /**
  * The schema of `access_identity-providers`.
  */
-export const access_identity_providers: JsonSchema = {
+export const access_identity$$providers: JsonSchema = {
   "anyOf": [
     {
       "$ref": "#/$defs/access_azureAD"
@@ -486,14 +486,6 @@ export const access_linkedin: JsonSchema = {
   "description": "LinkedIn"
 };
 
-/**
- * The schema of `access_name-3`.
- */
-export const access_name_3: JsonSchema = {
-  "description": "The name of the identity provider, shown to users on the login page.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_oidc`.
  */
@@ -745,7 +737,7 @@ export const access_saml: JsonSchema = {
             },
             "enable_encryption": {
               "default": false,
-              "description": "Enable SAML assertion encryption. When enabled, the Identity Provider will encrypt \nSAML assertions using the certificate from the assigned certificate set.\n\nTo enable encryption:\n1. Create a certificate set via POST to `/identity_providers/{id}/saml_certificate`\n2. Set this field to `true` and include `saml_certificate_set_id` in the PUT request\n3. Configure the public certificate in your external Identity Provider\n\nNote: Requires `saml_certificate_set_id` to be set when `true`.\n",
+              "description": "Enable SAML assertion encryption. When enabled, the Identity Provider will encrypt \nSAML assertions using the certificate from the assigned certificate set.\n\nTo enable encryption:\n1. Create a certificate set via POST to `/identity_providers/{id}/saml_certificate`\n2. Set this field to `true` and include `saml_certificate_set_id` in the PUT request\n3. Configure the public certificate in your external Identity Provider\n\nNote: Requires `saml_certificate_set_id` to be set when `true`.",
               "type": "boolean"
             },
             "force_authn": {
@@ -782,7 +774,7 @@ export const access_saml: JsonSchema = {
               "type": "string"
             },
             "max_sso_url_length": {
-              "description": "The maximum URL length the IdP accepts for the SSO redirect URL.\nWhen the constructed SSO URL would exceed this length, the RelayState\nis stored server-side and a short nonce is passed to the IdP instead.\nSet this if your IdP enforces a URL length limit.\n",
+              "description": "The maximum URL length the IdP accepts for the SSO redirect URL.\nWhen the constructed SSO URL would exceed this length, the RelayState\nis stored server-side and a short nonce is passed to the IdP instead.\nSet this if your IdP enforces a URL length limit.",
               "type": "integer"
             },
             "sign_request": {
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/outputs.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/outputs.ts
index 444a9a85b..f2c843eac 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/outputs.ts
@@ -3,26 +3,19 @@
 
 import type { JsonSchema } from "../../../../_/tool.js";
 
-/**
- * The schema of `access_externalId` in responses.
- */
-export const access_externalId_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_group_details` in responses.
  */
-export const access_group_details_output: JsonSchema = {
+export const access_group_details: JsonSchema = {
   "properties": {
     "displayName": {
       "type": "string"
     },
     "externalId": {
-      "$ref": "#/$defs/access_externalId"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/access_id"
+      "type": "string"
     },
     "members": {
       "items": {
@@ -67,16 +60,16 @@ export const access_group_details_output: JsonSchema = {
 /**
  * The schema of `access_groups` in responses.
  */
-export const access_groups_output: JsonSchema = {
+export const access_groups: JsonSchema = {
   "properties": {
     "displayName": {
       "type": "string"
     },
     "externalId": {
-      "$ref": "#/$defs/access_externalId"
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/access_id"
+      "type": "string"
     },
     "meta": {
       "$ref": "#/$defs/access_meta"
@@ -94,7 +87,7 @@ export const access_groups_output: JsonSchema = {
 /**
  * The schema of `access_scim_group_response` in responses.
  */
-export const access_scim_group_response_output: JsonSchema = {
+export const access_scim_group_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -113,7 +106,7 @@ export const access_scim_group_response_output: JsonSchema = {
 /**
  * The schema of `access_scim_groups_response` in responses.
  */
-export const access_scim_groups_response_output: JsonSchema = {
+export const access_scim_groups_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/schemas.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/schemas.ts
index e88f73771..5f93ba21c 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/schemas.ts
@@ -26,11 +26,3 @@ export const access_idp_resource_id: JsonSchema = {
   "maxItems": 50,
   "type": "array"
 };
-
-/**
- * The schema of `access_name-4`.
- */
-export const access_name_4: JsonSchema = {
-  "description": "The display name of the SCIM Group resource.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/tools.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/tools.ts
index 601dd82a4..3bd50bc54 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/groups/tools.ts
@@ -1,62 +1,62 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
-import { access_id_output, access_meta_output } from "../outputs.js";
+import { access_meta } from "../outputs.js";
 import {
-  access_externalId_output,
-  access_group_details_output,
-  access_groups_output,
-  access_scim_group_response_output,
-  access_scim_groups_response_output,
+  access_group_details,
+  access_groups,
+  access_scim_group_response,
+  access_scim_groups_response,
 } from "./outputs.js";
-import {
-  access_cf_resource_id,
-  access_idp_resource_id,
-  access_name_4,
-} from "./schemas.js";
+import { access_cf_resource_id, access_idp_resource_id } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.identity_providers.scim.groups`.
+ * The tools of `zeroTrust.identityProviders.scim.groups`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_identity_providers_scim_groups_delete",
+    name: "zeroTrust_identityProviders_scim_groups_delete",
     title: "Delete a SCIM Group resource",
-    description: "Deletes a SCIM Group resource from the identity provider's SCIM population.",
+    description: "Deletes a SCIM Group resource from the identity provider's SCIM population.\n\nDELETE /accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "group_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identity_provider_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identity_provider_id",
-        "group_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -80,8 +80,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -89,45 +89,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_scim_groups_get",
+    name: "zeroTrust_identityProviders_scim_groups_get",
     title: "Get a SCIM Group resource",
-    description: "Returns a SCIM Group resource, including its direct members, synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).",
+    description: "Returns a SCIM Group resource, including its direct members, synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).\n\nGET /accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/groups/{group_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "group_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "group_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identity_provider_id",
+            "group_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identity_provider_id",
-        "group_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_group_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_externalId": access_externalId_output,
-        "access_group_details": access_group_details_output,
-        "access_id": access_id_output,
-        "access_messages": access_messages_output,
-        "access_meta": access_meta_output,
-        "access_scim_group_response": access_scim_group_response_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_group_details": access_group_details,
+        "access_messages": access_messages,
+        "access_meta": access_meta,
+        "access_scim_group_response": access_scim_group_response,
       },
     },
     annotations: {
@@ -155,14 +159,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_externalId": access_externalId_output,
-        "access_group_details": access_group_details_output,
-        "access_id": access_id_output,
-        "access_messages": access_messages_output,
-        "access_meta": access_meta_output,
-        "access_scim_group_response": access_scim_group_response_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_group_details": access_group_details,
+        "access_messages": access_messages,
+        "access_meta": access_meta,
+        "access_scim_group_response": access_scim_group_response,
       },
     },
     request: (args) => ({
@@ -170,66 +172,77 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_scim_groups_list",
+    name: "zeroTrust_identityProviders_scim_groups_list",
     title: "List SCIM Group resources",
-    description: "Lists SCIM Group resources synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).",
+    description: "Lists SCIM Group resources synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).\n\nGET /accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/groups",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "cf_resource_id": {
-          "$ref": "#/$defs/access_cf_resource_id",
-          "description": "The unique Cloudflare-generated Id of the SCIM Group resource; also known as the \"Id\".\nPass once for a single lookup (`?cf_resource_id=A`) or repeat the parameter\n(`?cf_resource_id=A&cf_resource_id=B`) to look up multiple groups in one request,\nup to 50 values. Mutually exclusive with `idp_resource_id`, `name`,\n`search_contains`, and `search_starts_with`."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
-        },
-        "idp_resource_id": {
-          "$ref": "#/$defs/access_idp_resource_id",
-          "description": "The IdP-generated Id of the SCIM Group resource; also known as the \"external Id\".\nPass once for a single lookup (`?idp_resource_id=A`) or repeat the parameter\n(`?idp_resource_id=A&idp_resource_id=B`) to look up multiple groups in one request,\nup to 50 values. Mutually exclusive with `cf_resource_id`, `name`,\n`search_contains`, and `search_starts_with`."
-        },
-        "name": {
-          "$ref": "#/$defs/access_name-4",
-          "description": "The display name of the SCIM Group resource."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identity_provider_id"
+          ],
+          "type": "object"
         },
-        "per_page": {
-          "default": 100,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cf_resource_id": {
+              "$ref": "#/$defs/access_cf_resource_id",
+              "description": "The unique Cloudflare-generated Id of the SCIM Group resource; also known as the \"Id\".\nPass once for a single lookup (`?cf_resource_id=A`) or repeat the parameter\n(`?cf_resource_id=A&cf_resource_id=B`) to look up multiple groups in one request,\nup to 50 values. Mutually exclusive with `idp_resource_id`, `name`,\n`search_contains`, and `search_starts_with`."
+            },
+            "idp_resource_id": {
+              "$ref": "#/$defs/access_idp_resource_id",
+              "description": "The IdP-generated Id of the SCIM Group resource; also known as the \"external Id\".\nPass once for a single lookup (`?idp_resource_id=A`) or repeat the parameter\n(`?idp_resource_id=A&idp_resource_id=B`) to look up multiple groups in one request,\nup to 50 values. Mutually exclusive with `cf_resource_id`, `name`,\n`search_contains`, and `search_starts_with`."
+            },
+            "name": {
+              "description": "The display name of the SCIM Group resource.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of results per page.",
+              "type": "integer"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identity_provider_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
         "access_cf_resource_id": access_cf_resource_id,
-        "access_identifier": access_identifier,
         "access_idp_resource_id": access_idp_resource_id,
-        "access_name-4": access_name_4,
-        "access_uuid": access_uuid,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_groups_response",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_externalId": access_externalId_output,
-        "access_groups": access_groups_output,
-        "access_id": access_id_output,
-        "access_messages": access_messages_output,
-        "access_meta": access_meta_output,
-        "access_scim_groups_response": access_scim_groups_response_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_groups": access_groups,
+        "access_messages": access_messages,
+        "access_meta": access_meta,
+        "access_scim_groups_response": access_scim_groups_response,
       },
     },
     annotations: {
@@ -257,25 +270,23 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_externalId": access_externalId_output,
-        "access_groups": access_groups_output,
-        "access_id": access_id_output,
-        "access_messages": access_messages_output,
-        "access_meta": access_meta_output,
-        "access_scim_groups_response": access_scim_groups_response_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_groups": access_groups,
+        "access_messages": access_messages,
+        "access_meta": access_meta,
+        "access_scim_groups_response": access_scim_groups_response,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/identity_providers/${pathParam(args, "identity_provider_id")}/scim/groups`,
       query: [
-        ["cf_resource_id", args["cf_resource_id"], true],
-        ["idp_resource_id", args["idp_resource_id"], true],
-        ["name", args["name"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["cf_resource_id", param(args, "query", "cf_resource_id"), true],
+        ["idp_resource_id", param(args, "query", "idp_resource_id"), true],
+        ["name", param(args, "query", "name"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/outputs.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/outputs.ts
index 6fa77cd12..f48038859 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_id` in responses.
- */
-export const access_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_meta` in responses.
  */
-export const access_meta_output: JsonSchema = {
+export const access_meta: JsonSchema = {
   "properties": {
     "created": {
       "format": "date-time",
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/outputs.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/outputs.ts
index 5d0917b2d..be3255669 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_scim_user_response` in responses.
  */
-export const access_scim_user_response_output: JsonSchema = {
+export const access_scim_user_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -25,7 +25,7 @@ export const access_scim_user_response_output: JsonSchema = {
 /**
  * The schema of `access_scim_users_response` in responses.
  */
-export const access_scim_users_response_output: JsonSchema = {
+export const access_scim_users_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -47,7 +47,7 @@ export const access_scim_users_response_output: JsonSchema = {
 /**
  * The schema of `access_users` in responses.
  */
-export const access_users_output: JsonSchema = {
+export const access_users: JsonSchema = {
   "properties": {
     "active": {
       "type": "boolean"
@@ -76,7 +76,7 @@ export const access_users_output: JsonSchema = {
       "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/access_id"
+      "type": "string"
     },
     "meta": {
       "$ref": "#/$defs/access_meta"
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/schemas.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/schemas.ts
index 6fd0ebf54..d77c01339 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
 /**
  * The schema of `access_cf_resource_id-2`.
  */
-export const access_cf_resource_id_2: JsonSchema = {
+export const access_cf_resource_id$$2: JsonSchema = {
   "description": "The unique Cloudflare-generated Id of the SCIM User resource; also known as the \"Id\".\nPass once for a single lookup (`?cf_resource_id=A`) or repeat the parameter\n(`?cf_resource_id=A&cf_resource_id=B`) to look up multiple users in one request,\nup to 50 values. Mutually exclusive with `idp_resource_id`, `username`, `email`,\n`name`, `search_contains`, and `search_starts_with`.",
   "items": {
     "type": "string"
@@ -15,18 +15,10 @@ export const access_cf_resource_id_2: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_email`.
- */
-export const access_email: JsonSchema = {
-  "description": "The email address of the SCIM User resource.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_idp_resource_id-2`.
  */
-export const access_idp_resource_id_2: JsonSchema = {
+export const access_idp_resource_id$$2: JsonSchema = {
   "description": "The IdP-generated Id of the SCIM User resource; also known as the \"external Id\".\nPass once for a single lookup (`?idp_resource_id=A`) or repeat the parameter\n(`?idp_resource_id=A&idp_resource_id=B`) to look up multiple users in one request,\nup to 50 values. Mutually exclusive with `cf_resource_id`, `username`, `email`,\n`name`, `search_contains`, and `search_starts_with`.",
   "items": {
     "type": "string"
@@ -34,19 +26,3 @@ export const access_idp_resource_id_2: JsonSchema = {
   "maxItems": 50,
   "type": "array"
 };
-
-/**
- * The schema of `access_name-5`.
- */
-export const access_name_5: JsonSchema = {
-  "description": "The name of the SCIM User resource.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_username`.
- */
-export const access_username: JsonSchema = {
-  "description": "The username of the SCIM User resource.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/tools.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/tools.ts
index d6677ec9f..526d64bd4 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/scim/users/tools.ts
@@ -1,62 +1,64 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../../../_/tool.js";
+import { type Tool, param, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
-import { access_id_output, access_meta_output } from "../outputs.js";
+import { access_meta } from "../outputs.js";
 import {
-  access_scim_user_response_output,
-  access_scim_users_response_output,
-  access_users_output,
+  access_scim_user_response,
+  access_scim_users_response,
+  access_users,
 } from "./outputs.js";
 import {
-  access_cf_resource_id_2,
-  access_email,
-  access_idp_resource_id_2,
-  access_name_5,
-  access_username,
+  access_cf_resource_id$$2,
+  access_idp_resource_id$$2,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.identity_providers.scim.users`.
+ * The tools of `zeroTrust.identityProviders.scim.users`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_identity_providers_scim_users_delete",
+    name: "zeroTrust_identityProviders_scim_users_delete",
     title: "Delete a SCIM User resource",
-    description: "Deletes a SCIM User resource from the identity provider's SCIM population.",
+    description: "Deletes a SCIM User resource from the identity provider's SCIM population.\n\nDELETE /accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identity_provider_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identity_provider_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     annotations: {
       "destructiveHint": true,
@@ -80,8 +82,8 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -89,44 +91,49 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_scim_users_get",
+    name: "zeroTrust_identityProviders_scim_users_get",
     title: "Get a SCIM User resource",
-    description: "Returns a SCIM User resource synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).",
+    description: "Returns a SCIM User resource synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).\n\nGET /accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/users/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identity_provider_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identity_provider_id",
-        "user_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_user_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_id": access_id_output,
-        "access_messages": access_messages_output,
-        "access_meta": access_meta_output,
-        "access_scim_user_response": access_scim_user_response_output,
-        "access_users": access_users_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_meta": access_meta,
+        "access_scim_user_response": access_scim_user_response,
+        "access_users": access_users,
       },
     },
     annotations: {
@@ -154,13 +161,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_id": access_id_output,
-        "access_messages": access_messages_output,
-        "access_meta": access_meta_output,
-        "access_scim_user_response": access_scim_user_response_output,
-        "access_users": access_users_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_meta": access_meta,
+        "access_scim_user_response": access_scim_user_response,
+        "access_users": access_users,
       },
     },
     request: (args) => ({
@@ -168,75 +174,85 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_scim_users_list",
+    name: "zeroTrust_identityProviders_scim_users_list",
     title: "List SCIM User resources",
-    description: "Lists SCIM User resources synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).",
+    description: "Lists SCIM User resources synced to Cloudflare via the System for Cross-domain Identity Management (SCIM).\n\nGET /accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/users",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "cf_resource_id": {
-          "$ref": "#/$defs/access_cf_resource_id-2",
-          "description": "The unique Cloudflare-generated Id of the SCIM User resource; also known as the \"Id\".\nPass once for a single lookup (`?cf_resource_id=A`) or repeat the parameter\n(`?cf_resource_id=A&cf_resource_id=B`) to look up multiple users in one request,\nup to 50 values. Mutually exclusive with `idp_resource_id`, `username`, `email`,\n`name`, `search_contains`, and `search_starts_with`."
-        },
-        "email": {
-          "$ref": "#/$defs/access_email",
-          "description": "The email address of the SCIM User resource."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
-        },
-        "idp_resource_id": {
-          "$ref": "#/$defs/access_idp_resource_id-2",
-          "description": "The IdP-generated Id of the SCIM User resource; also known as the \"external Id\".\nPass once for a single lookup (`?idp_resource_id=A`) or repeat the parameter\n(`?idp_resource_id=A&idp_resource_id=B`) to look up multiple users in one request,\nup to 50 values. Mutually exclusive with `cf_resource_id`, `username`, `email`,\n`name`, `search_contains`, and `search_starts_with`."
-        },
-        "name": {
-          "$ref": "#/$defs/access_name-5",
-          "description": "The name of the SCIM User resource."
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 100,
-          "description": "Number of results per page.",
-          "type": "integer"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "identity_provider_id"
+          ],
+          "type": "object"
         },
-        "username": {
-          "$ref": "#/$defs/access_username",
-          "description": "The username of the SCIM User resource."
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "cf_resource_id": {
+              "$ref": "#/$defs/access_cf_resource_id-2",
+              "description": "The unique Cloudflare-generated Id of the SCIM User resource; also known as the \"Id\".\nPass once for a single lookup (`?cf_resource_id=A`) or repeat the parameter\n(`?cf_resource_id=A&cf_resource_id=B`) to look up multiple users in one request,\nup to 50 values. Mutually exclusive with `idp_resource_id`, `username`, `email`,\n`name`, `search_contains`, and `search_starts_with`."
+            },
+            "email": {
+              "description": "The email address of the SCIM User resource.",
+              "type": "string"
+            },
+            "idp_resource_id": {
+              "$ref": "#/$defs/access_idp_resource_id-2",
+              "description": "The IdP-generated Id of the SCIM User resource; also known as the \"external Id\".\nPass once for a single lookup (`?idp_resource_id=A`) or repeat the parameter\n(`?idp_resource_id=A&idp_resource_id=B`) to look up multiple users in one request,\nup to 50 values. Mutually exclusive with `cf_resource_id`, `username`, `email`,\n`name`, `search_contains`, and `search_starts_with`."
+            },
+            "name": {
+              "description": "The name of the SCIM User resource.",
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 100,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "username": {
+              "description": "The username of the SCIM User resource.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "identity_provider_id"
+        "path"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_cf_resource_id-2": access_cf_resource_id_2,
-        "access_email": access_email,
-        "access_identifier": access_identifier,
-        "access_idp_resource_id-2": access_idp_resource_id_2,
-        "access_name-5": access_name_5,
-        "access_username": access_username,
-        "access_uuid": access_uuid,
+        "access_cf_resource_id-2": access_cf_resource_id$$2,
+        "access_idp_resource_id-2": access_idp_resource_id$$2,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_scim_users_response",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_id": access_id_output,
-        "access_messages": access_messages_output,
-        "access_meta": access_meta_output,
-        "access_scim_users_response": access_scim_users_response_output,
-        "access_users": access_users_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_meta": access_meta,
+        "access_scim_users_response": access_scim_users_response,
+        "access_users": access_users,
       },
     },
     annotations: {
@@ -264,26 +280,25 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_id": access_id_output,
-        "access_messages": access_messages_output,
-        "access_meta": access_meta_output,
-        "access_scim_users_response": access_scim_users_response_output,
-        "access_users": access_users_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_meta": access_meta,
+        "access_scim_users_response": access_scim_users_response,
+        "access_users": access_users,
       },
     },
     request: (args) => ({
       path: `/accounts/${pathParam(args, "account_id")}/access/identity_providers/${pathParam(args, "identity_provider_id")}/scim/users`,
       query: [
-        ["cf_resource_id", args["cf_resource_id"], true],
-        ["idp_resource_id", args["idp_resource_id"], true],
-        ["username", args["username"], true],
-        ["email", args["email"], true],
-        ["name", args["name"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["cf_resource_id", param(args, "query", "cf_resource_id"), true],
+        ["idp_resource_id", param(args, "query", "idp_resource_id"), true],
+        ["username", param(args, "query", "username"), true],
+        ["email", param(args, "query", "email"), true],
+        ["name", param(args, "query", "name"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zeroTrust/identityProviders/tools.ts b/src/generated/forge-mcp/zeroTrust/identityProviders/tools.ts
index f9f2c1ac2..d88a01be0 100644
--- a/src/generated/forge-mcp/zeroTrust/identityProviders/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/identityProviders/tools.ts
@@ -1,118 +1,150 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_api_response_single_output,
-  access_id_response_output,
-  access_messages_output,
-  access_uuid_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_id_response,
+  access_messages,
 } from "../outputs.js";
-import { access_identifier, access_uuid } from "../schemas.js";
-import {
-  access_azureAD_output,
-  access_centrify_output,
-  access_cloudflare_output,
-  access_custom_claims_support_output,
-  access_duo_output,
-  access_facebook_output,
-  access_generic_oauth_config_output,
-  access_github_output,
-  access_google_apps_output,
-  access_google_output,
-  access_identity_provider_output,
-  access_identity_providers_output,
-  access_linkedin_output,
-  access_name_3_output,
-  access_oidc_output,
-  access_okta_output,
-  access_onelogin_output,
-  access_onetimepin_output,
-  access_passkeys_output,
-  access_pingone_output,
-  access_response_collection_output,
-  access_saml_certificate_output,
-  access_saml_certificate_set_output,
-  access_saml_output,
-  access_single_response_3_output,
-  access_yandex_output,
-} from "./outputs.js";
 import {
   access_azureAD,
   access_centrify,
   access_cloudflare,
-  access_custom_claims_support,
+  access_custom$$claims$$support,
   access_duo,
   access_facebook,
-  access_generic_oauth_config,
+  access_generic$$oauth$$config,
   access_github,
   access_google,
-  access_google_apps,
-  access_identity_provider,
-  access_identity_providers,
+  access_google$$apps,
+  access_identity$$provider,
+  access_identity$$providers,
   access_linkedin,
-  access_name_3,
   access_oidc,
   access_okta,
   access_onelogin,
   access_onetimepin,
   access_passkeys,
   access_pingone,
+  access_response_collection,
   access_saml,
+  access_saml_certificate,
+  access_saml_certificate_set,
+  access_single_response$$3,
   access_yandex,
+} from "./outputs.js";
+import {
+  access_azureAD as access_azureAD$,
+  access_centrify as access_centrify$,
+  access_cloudflare as access_cloudflare$,
+  access_custom$$claims$$support as access_custom$$claims$$support$,
+  access_duo as access_duo$,
+  access_facebook as access_facebook$,
+  access_generic$$oauth$$config as access_generic$$oauth$$config$,
+  access_github as access_github$,
+  access_google as access_google$,
+  access_google$$apps as access_google$$apps$,
+  access_identity$$provider as access_identity$$provider$,
+  access_identity$$providers as access_identity$$providers$,
+  access_linkedin as access_linkedin$,
+  access_oidc as access_oidc$,
+  access_okta as access_okta$,
+  access_onelogin as access_onelogin$,
+  access_onetimepin as access_onetimepin$,
+  access_passkeys as access_passkeys$,
+  access_pingone as access_pingone$,
+  access_saml as access_saml$,
+  access_yandex as access_yandex$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.identity_providers`.
+ * The tools of `zeroTrust.identityProviders`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_identity_providers_create",
+    name: "zeroTrust_identityProviders_create",
     title: "Add an Access identity provider",
-    description: "Adds a new identity provider to Access.",
+    description: "Adds a new identity provider to Access.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/identity_providers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/access_identity-providers"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
+        "access_azureAD": access_azureAD$,
+        "access_centrify": access_centrify$,
+        "access_cloudflare": access_cloudflare$,
+        "access_custom-claims-support": access_custom$$claims$$support$,
+        "access_duo": access_duo$,
+        "access_facebook": access_facebook$,
+        "access_generic-oauth-config": access_generic$$oauth$$config$,
+        "access_github": access_github$,
+        "access_google": access_google$,
+        "access_google-apps": access_google$$apps$,
+        "access_identity-provider": access_identity$$provider$,
+        "access_identity-providers": access_identity$$providers$,
+        "access_linkedin": access_linkedin$,
+        "access_oidc": access_oidc$,
+        "access_okta": access_okta$,
+        "access_onelogin": access_onelogin$,
+        "access_onetimepin": access_onetimepin$,
+        "access_passkeys": access_passkeys$,
+        "access_pingone": access_pingone$,
+        "access_saml": access_saml$,
+        "access_yandex": access_yandex$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/access_single_response-3",
+      $defs: {
+        "access_api-response-single": access_api$$response$$single,
         "access_azureAD": access_azureAD,
         "access_centrify": access_centrify,
         "access_cloudflare": access_cloudflare,
-        "access_custom-claims-support": access_custom_claims_support,
+        "access_custom-claims-support": access_custom$$claims$$support,
         "access_duo": access_duo,
         "access_facebook": access_facebook,
-        "access_generic-oauth-config": access_generic_oauth_config,
+        "access_generic-oauth-config": access_generic$$oauth$$config,
         "access_github": access_github,
         "access_google": access_google,
-        "access_google-apps": access_google_apps,
-        "access_identifier": access_identifier,
-        "access_identity-provider": access_identity_provider,
-        "access_identity-providers": access_identity_providers,
+        "access_google-apps": access_google$$apps,
+        "access_identity-provider": access_identity$$provider,
+        "access_identity-providers": access_identity$$providers,
         "access_linkedin": access_linkedin,
-        "access_name-3": access_name_3,
+        "access_messages": access_messages,
         "access_oidc": access_oidc,
         "access_okta": access_okta,
         "access_onelogin": access_onelogin,
@@ -120,43 +152,12 @@ export const tools: readonly Tool[] = [
         "access_passkeys": access_passkeys,
         "access_pingone": access_pingone,
         "access_saml": access_saml,
-        "access_uuid": access_uuid,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_single_response-3": access_single_response$$3,
         "access_yandex": access_yandex,
       },
     },
-    outputSchema: {
-      "$ref": "#/$defs/access_single_response-3",
-      $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_azureAD": access_azureAD_output,
-        "access_centrify": access_centrify_output,
-        "access_cloudflare": access_cloudflare_output,
-        "access_custom-claims-support": access_custom_claims_support_output,
-        "access_duo": access_duo_output,
-        "access_facebook": access_facebook_output,
-        "access_generic-oauth-config": access_generic_oauth_config_output,
-        "access_github": access_github_output,
-        "access_google": access_google_output,
-        "access_google-apps": access_google_apps_output,
-        "access_identity-provider": access_identity_provider_output,
-        "access_identity-providers": access_identity_providers_output,
-        "access_linkedin": access_linkedin_output,
-        "access_messages": access_messages_output,
-        "access_name-3": access_name_3_output,
-        "access_oidc": access_oidc_output,
-        "access_okta": access_okta_output,
-        "access_onelogin": access_onelogin_output,
-        "access_onetimepin": access_onetimepin_output,
-        "access_passkeys": access_passkeys_output,
-        "access_pingone": access_pingone_output,
-        "access_saml": access_saml_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_single_response-3": access_single_response_3_output,
-        "access_uuid": access_uuid_output,
-        "access_yandex": access_yandex_output,
-      },
-    },
     annotations: {
       "destructiveHint": false,
       "idempotentHint": false,
@@ -181,35 +182,33 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_azureAD": access_azureAD_output,
-        "access_centrify": access_centrify_output,
-        "access_cloudflare": access_cloudflare_output,
-        "access_custom-claims-support": access_custom_claims_support_output,
-        "access_duo": access_duo_output,
-        "access_facebook": access_facebook_output,
-        "access_generic-oauth-config": access_generic_oauth_config_output,
-        "access_github": access_github_output,
-        "access_google": access_google_output,
-        "access_google-apps": access_google_apps_output,
-        "access_identity-provider": access_identity_provider_output,
-        "access_identity-providers": access_identity_providers_output,
-        "access_linkedin": access_linkedin_output,
-        "access_messages": access_messages_output,
-        "access_name-3": access_name_3_output,
-        "access_oidc": access_oidc_output,
-        "access_okta": access_okta_output,
-        "access_onelogin": access_onelogin_output,
-        "access_onetimepin": access_onetimepin_output,
-        "access_passkeys": access_passkeys_output,
-        "access_pingone": access_pingone_output,
-        "access_saml": access_saml_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_single_response-3": access_single_response_3_output,
-        "access_uuid": access_uuid_output,
-        "access_yandex": access_yandex_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_azureAD": access_azureAD,
+        "access_centrify": access_centrify,
+        "access_cloudflare": access_cloudflare,
+        "access_custom-claims-support": access_custom$$claims$$support,
+        "access_duo": access_duo,
+        "access_facebook": access_facebook,
+        "access_generic-oauth-config": access_generic$$oauth$$config,
+        "access_github": access_github,
+        "access_google": access_google,
+        "access_google-apps": access_google$$apps,
+        "access_identity-provider": access_identity$$provider,
+        "access_identity-providers": access_identity$$providers,
+        "access_linkedin": access_linkedin,
+        "access_messages": access_messages,
+        "access_oidc": access_oidc,
+        "access_okta": access_okta,
+        "access_onelogin": access_onelogin,
+        "access_onetimepin": access_onetimepin,
+        "access_passkeys": access_passkeys,
+        "access_pingone": access_pingone,
+        "access_saml": access_saml,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_single_response-3": access_single_response$$3,
+        "access_yandex": access_yandex,
       },
     },
     request: (args) => ({
@@ -218,46 +217,51 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_delete",
+    name: "zeroTrust_identityProviders_delete",
     title: "Delete an Access identity provider",
-    description: "Deletes an identity provider from Access.",
+    description: "Deletes an identity provider from Access.\n\nDELETE /{account_or_zone}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "identity_provider_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "identity_provider_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_id_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -284,11 +288,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_id_response": access_id_response_output,
-        "access_messages": access_messages_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_id_response": access_id_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
@@ -296,70 +299,74 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_get",
+    name: "zeroTrust_identityProviders_get",
     title: "Get an Access identity provider",
-    description: "Fetches a configured identity provider.",
+    description: "Fetches a configured identity provider.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "identity_provider_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "identity_provider_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response-3",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_azureAD": access_azureAD_output,
-        "access_centrify": access_centrify_output,
-        "access_cloudflare": access_cloudflare_output,
-        "access_custom-claims-support": access_custom_claims_support_output,
-        "access_duo": access_duo_output,
-        "access_facebook": access_facebook_output,
-        "access_generic-oauth-config": access_generic_oauth_config_output,
-        "access_github": access_github_output,
-        "access_google": access_google_output,
-        "access_google-apps": access_google_apps_output,
-        "access_identity-provider": access_identity_provider_output,
-        "access_identity-providers": access_identity_providers_output,
-        "access_linkedin": access_linkedin_output,
-        "access_messages": access_messages_output,
-        "access_name-3": access_name_3_output,
-        "access_oidc": access_oidc_output,
-        "access_okta": access_okta_output,
-        "access_onelogin": access_onelogin_output,
-        "access_onetimepin": access_onetimepin_output,
-        "access_passkeys": access_passkeys_output,
-        "access_pingone": access_pingone_output,
-        "access_saml": access_saml_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_single_response-3": access_single_response_3_output,
-        "access_uuid": access_uuid_output,
-        "access_yandex": access_yandex_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_azureAD": access_azureAD,
+        "access_centrify": access_centrify,
+        "access_cloudflare": access_cloudflare,
+        "access_custom-claims-support": access_custom$$claims$$support,
+        "access_duo": access_duo,
+        "access_facebook": access_facebook,
+        "access_generic-oauth-config": access_generic$$oauth$$config,
+        "access_github": access_github,
+        "access_google": access_google,
+        "access_google-apps": access_google$$apps,
+        "access_identity-provider": access_identity$$provider,
+        "access_identity-providers": access_identity$$providers,
+        "access_linkedin": access_linkedin,
+        "access_messages": access_messages,
+        "access_oidc": access_oidc,
+        "access_okta": access_okta,
+        "access_onelogin": access_onelogin,
+        "access_onetimepin": access_onetimepin,
+        "access_passkeys": access_passkeys,
+        "access_pingone": access_pingone,
+        "access_saml": access_saml,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_single_response-3": access_single_response$$3,
+        "access_yandex": access_yandex,
       },
     },
     annotations: {
@@ -387,35 +394,33 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_azureAD": access_azureAD_output,
-        "access_centrify": access_centrify_output,
-        "access_cloudflare": access_cloudflare_output,
-        "access_custom-claims-support": access_custom_claims_support_output,
-        "access_duo": access_duo_output,
-        "access_facebook": access_facebook_output,
-        "access_generic-oauth-config": access_generic_oauth_config_output,
-        "access_github": access_github_output,
-        "access_google": access_google_output,
-        "access_google-apps": access_google_apps_output,
-        "access_identity-provider": access_identity_provider_output,
-        "access_identity-providers": access_identity_providers_output,
-        "access_linkedin": access_linkedin_output,
-        "access_messages": access_messages_output,
-        "access_name-3": access_name_3_output,
-        "access_oidc": access_oidc_output,
-        "access_okta": access_okta_output,
-        "access_onelogin": access_onelogin_output,
-        "access_onetimepin": access_onetimepin_output,
-        "access_passkeys": access_passkeys_output,
-        "access_pingone": access_pingone_output,
-        "access_saml": access_saml_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_single_response-3": access_single_response_3_output,
-        "access_uuid": access_uuid_output,
-        "access_yandex": access_yandex_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_azureAD": access_azureAD,
+        "access_centrify": access_centrify,
+        "access_cloudflare": access_cloudflare,
+        "access_custom-claims-support": access_custom$$claims$$support,
+        "access_duo": access_duo,
+        "access_facebook": access_facebook,
+        "access_generic-oauth-config": access_generic$$oauth$$config,
+        "access_github": access_github,
+        "access_google": access_google,
+        "access_google-apps": access_google$$apps,
+        "access_identity-provider": access_identity$$provider,
+        "access_identity-providers": access_identity$$providers,
+        "access_linkedin": access_linkedin,
+        "access_messages": access_messages,
+        "access_oidc": access_oidc,
+        "access_okta": access_okta,
+        "access_onelogin": access_onelogin,
+        "access_onetimepin": access_onetimepin,
+        "access_passkeys": access_passkeys,
+        "access_pingone": access_pingone,
+        "access_saml": access_saml,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_single_response-3": access_single_response$$3,
+        "access_yandex": access_yandex,
       },
     },
     request: (args) => ({
@@ -423,78 +428,89 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_identity_providers_list",
+    name: "zeroTrust_identityProviders_list",
     title: "List Access identity providers",
-    description: "Lists all configured identity providers.",
+    description: "Lists all configured identity providers.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/identity_providers",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         },
-        "page": {
-          "default": 1,
-          "description": "Page number of results.",
-          "type": "integer"
-        },
-        "per_page": {
-          "default": 200,
-          "description": "Number of results per page.",
-          "type": "integer"
-        },
-        "scim_enabled": {
-          "description": "Indicates to Access to only retrieve identity providers that have the System for Cross-Domain Identity Management (SCIM) enabled.",
-          "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "page": {
+              "default": 1,
+              "description": "Page number of results.",
+              "type": "integer"
+            },
+            "per_page": {
+              "default": 200,
+              "description": "Number of results per page.",
+              "type": "integer"
+            },
+            "scim_enabled": {
+              "description": "Indicates to Access to only retrieve identity providers that have the System for Cross-Domain Identity Management (SCIM) enabled.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection",
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_azureAD": access_azureAD_output,
-        "access_centrify": access_centrify_output,
-        "access_cloudflare": access_cloudflare_output,
-        "access_custom-claims-support": access_custom_claims_support_output,
-        "access_duo": access_duo_output,
-        "access_facebook": access_facebook_output,
-        "access_generic-oauth-config": access_generic_oauth_config_output,
-        "access_github": access_github_output,
-        "access_google": access_google_output,
-        "access_google-apps": access_google_apps_output,
-        "access_identity-provider": access_identity_provider_output,
-        "access_linkedin": access_linkedin_output,
-        "access_messages": access_messages_output,
-        "access_name-3": access_name_3_output,
-        "access_oidc": access_oidc_output,
-        "access_okta": access_okta_output,
-        "access_onelogin": access_onelogin_output,
-        "access_onetimepin": access_onetimepin_output,
-        "access_passkeys": access_passkeys_output,
-        "access_pingone": access_pingone_output,
-        "access_response_collection": access_response_collection_output,
-        "access_saml": access_saml_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_uuid": access_uuid_output,
-        "access_yandex": access_yandex_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_azureAD": access_azureAD,
+        "access_centrify": access_centrify,
+        "access_cloudflare": access_cloudflare,
+        "access_custom-claims-support": access_custom$$claims$$support,
+        "access_duo": access_duo,
+        "access_facebook": access_facebook,
+        "access_generic-oauth-config": access_generic$$oauth$$config,
+        "access_github": access_github,
+        "access_google": access_google,
+        "access_google-apps": access_google$$apps,
+        "access_identity-provider": access_identity$$provider,
+        "access_linkedin": access_linkedin,
+        "access_messages": access_messages,
+        "access_oidc": access_oidc,
+        "access_okta": access_okta,
+        "access_onelogin": access_onelogin,
+        "access_onetimepin": access_onetimepin,
+        "access_passkeys": access_passkeys,
+        "access_pingone": access_pingone,
+        "access_response_collection": access_response_collection,
+        "access_saml": access_saml,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_yandex": access_yandex,
       },
     },
     annotations: {
@@ -522,95 +538,129 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_azureAD": access_azureAD_output,
-        "access_centrify": access_centrify_output,
-        "access_cloudflare": access_cloudflare_output,
-        "access_custom-claims-support": access_custom_claims_support_output,
-        "access_duo": access_duo_output,
-        "access_facebook": access_facebook_output,
-        "access_generic-oauth-config": access_generic_oauth_config_output,
-        "access_github": access_github_output,
-        "access_google": access_google_output,
-        "access_google-apps": access_google_apps_output,
-        "access_identity-provider": access_identity_provider_output,
-        "access_linkedin": access_linkedin_output,
-        "access_messages": access_messages_output,
-        "access_name-3": access_name_3_output,
-        "access_oidc": access_oidc_output,
-        "access_okta": access_okta_output,
-        "access_onelogin": access_onelogin_output,
-        "access_onetimepin": access_onetimepin_output,
-        "access_passkeys": access_passkeys_output,
-        "access_pingone": access_pingone_output,
-        "access_response_collection": access_response_collection_output,
-        "access_saml": access_saml_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_uuid": access_uuid_output,
-        "access_yandex": access_yandex_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_azureAD": access_azureAD,
+        "access_centrify": access_centrify,
+        "access_cloudflare": access_cloudflare,
+        "access_custom-claims-support": access_custom$$claims$$support,
+        "access_duo": access_duo,
+        "access_facebook": access_facebook,
+        "access_generic-oauth-config": access_generic$$oauth$$config,
+        "access_github": access_github,
+        "access_google": access_google,
+        "access_google-apps": access_google$$apps,
+        "access_identity-provider": access_identity$$provider,
+        "access_linkedin": access_linkedin,
+        "access_messages": access_messages,
+        "access_oidc": access_oidc,
+        "access_okta": access_okta,
+        "access_onelogin": access_onelogin,
+        "access_onetimepin": access_onetimepin,
+        "access_passkeys": access_passkeys,
+        "access_pingone": access_pingone,
+        "access_response_collection": access_response_collection,
+        "access_saml": access_saml,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_yandex": access_yandex,
       },
     },
     request: (args) => ({
       path: `/${pathParam(args, "account_or_zone")}/${pathParam(args, "account_or_zone_id")}/access/identity_providers`,
       query: [
-        ["scim_enabled", args["scim_enabled"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
+        ["scim_enabled", param(args, "query", "scim_enabled"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
       ],
     }),
   },
   {
-    name: "zero_trust_identity_providers_update",
+    name: "zeroTrust_identityProviders_update",
     title: "Update an Access identity provider",
-    description: "Updates a configured identity provider.",
+    description: "Updates a configured identity provider.\n\nPUT /{account_or_zone}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "$ref": "#/$defs/access_identity-providers"
         },
-        "identity_provider_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            },
+            "identity_provider_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id",
+            "identity_provider_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
-        "identity_provider_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
+        "access_azureAD": access_azureAD$,
+        "access_centrify": access_centrify$,
+        "access_cloudflare": access_cloudflare$,
+        "access_custom-claims-support": access_custom$$claims$$support$,
+        "access_duo": access_duo$,
+        "access_facebook": access_facebook$,
+        "access_generic-oauth-config": access_generic$$oauth$$config$,
+        "access_github": access_github$,
+        "access_google": access_google$,
+        "access_google-apps": access_google$$apps$,
+        "access_identity-provider": access_identity$$provider$,
+        "access_identity-providers": access_identity$$providers$,
+        "access_linkedin": access_linkedin$,
+        "access_oidc": access_oidc$,
+        "access_okta": access_okta$,
+        "access_onelogin": access_onelogin$,
+        "access_onetimepin": access_onetimepin$,
+        "access_passkeys": access_passkeys$,
+        "access_pingone": access_pingone$,
+        "access_saml": access_saml$,
+        "access_yandex": access_yandex$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/access_single_response-3",
+      $defs: {
+        "access_api-response-single": access_api$$response$$single,
         "access_azureAD": access_azureAD,
         "access_centrify": access_centrify,
         "access_cloudflare": access_cloudflare,
-        "access_custom-claims-support": access_custom_claims_support,
+        "access_custom-claims-support": access_custom$$claims$$support,
         "access_duo": access_duo,
         "access_facebook": access_facebook,
-        "access_generic-oauth-config": access_generic_oauth_config,
+        "access_generic-oauth-config": access_generic$$oauth$$config,
         "access_github": access_github,
         "access_google": access_google,
-        "access_google-apps": access_google_apps,
-        "access_identifier": access_identifier,
-        "access_identity-provider": access_identity_provider,
-        "access_identity-providers": access_identity_providers,
+        "access_google-apps": access_google$$apps,
+        "access_identity-provider": access_identity$$provider,
+        "access_identity-providers": access_identity$$providers,
         "access_linkedin": access_linkedin,
-        "access_name-3": access_name_3,
+        "access_messages": access_messages,
         "access_oidc": access_oidc,
         "access_okta": access_okta,
         "access_onelogin": access_onelogin,
@@ -618,43 +668,12 @@ export const tools: readonly Tool[] = [
         "access_passkeys": access_passkeys,
         "access_pingone": access_pingone,
         "access_saml": access_saml,
-        "access_uuid": access_uuid,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_single_response-3": access_single_response$$3,
         "access_yandex": access_yandex,
       },
     },
-    outputSchema: {
-      "$ref": "#/$defs/access_single_response-3",
-      $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_azureAD": access_azureAD_output,
-        "access_centrify": access_centrify_output,
-        "access_cloudflare": access_cloudflare_output,
-        "access_custom-claims-support": access_custom_claims_support_output,
-        "access_duo": access_duo_output,
-        "access_facebook": access_facebook_output,
-        "access_generic-oauth-config": access_generic_oauth_config_output,
-        "access_github": access_github_output,
-        "access_google": access_google_output,
-        "access_google-apps": access_google_apps_output,
-        "access_identity-provider": access_identity_provider_output,
-        "access_identity-providers": access_identity_providers_output,
-        "access_linkedin": access_linkedin_output,
-        "access_messages": access_messages_output,
-        "access_name-3": access_name_3_output,
-        "access_oidc": access_oidc_output,
-        "access_okta": access_okta_output,
-        "access_onelogin": access_onelogin_output,
-        "access_onetimepin": access_onetimepin_output,
-        "access_passkeys": access_passkeys_output,
-        "access_pingone": access_pingone_output,
-        "access_saml": access_saml_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_single_response-3": access_single_response_3_output,
-        "access_uuid": access_uuid_output,
-        "access_yandex": access_yandex_output,
-      },
-    },
     annotations: {
       "destructiveHint": true,
       "idempotentHint": true,
@@ -679,35 +698,33 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_azureAD": access_azureAD_output,
-        "access_centrify": access_centrify_output,
-        "access_cloudflare": access_cloudflare_output,
-        "access_custom-claims-support": access_custom_claims_support_output,
-        "access_duo": access_duo_output,
-        "access_facebook": access_facebook_output,
-        "access_generic-oauth-config": access_generic_oauth_config_output,
-        "access_github": access_github_output,
-        "access_google": access_google_output,
-        "access_google-apps": access_google_apps_output,
-        "access_identity-provider": access_identity_provider_output,
-        "access_identity-providers": access_identity_providers_output,
-        "access_linkedin": access_linkedin_output,
-        "access_messages": access_messages_output,
-        "access_name-3": access_name_3_output,
-        "access_oidc": access_oidc_output,
-        "access_okta": access_okta_output,
-        "access_onelogin": access_onelogin_output,
-        "access_onetimepin": access_onetimepin_output,
-        "access_passkeys": access_passkeys_output,
-        "access_pingone": access_pingone_output,
-        "access_saml": access_saml_output,
-        "access_saml_certificate": access_saml_certificate_output,
-        "access_saml_certificate_set": access_saml_certificate_set_output,
-        "access_single_response-3": access_single_response_3_output,
-        "access_uuid": access_uuid_output,
-        "access_yandex": access_yandex_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_azureAD": access_azureAD,
+        "access_centrify": access_centrify,
+        "access_cloudflare": access_cloudflare,
+        "access_custom-claims-support": access_custom$$claims$$support,
+        "access_duo": access_duo,
+        "access_facebook": access_facebook,
+        "access_generic-oauth-config": access_generic$$oauth$$config,
+        "access_github": access_github,
+        "access_google": access_google,
+        "access_google-apps": access_google$$apps,
+        "access_identity-provider": access_identity$$provider,
+        "access_identity-providers": access_identity$$providers,
+        "access_linkedin": access_linkedin,
+        "access_messages": access_messages,
+        "access_oidc": access_oidc,
+        "access_okta": access_okta,
+        "access_onelogin": access_onelogin,
+        "access_onetimepin": access_onetimepin,
+        "access_passkeys": access_passkeys,
+        "access_pingone": access_pingone,
+        "access_saml": access_saml,
+        "access_saml_certificate": access_saml_certificate,
+        "access_saml_certificate_set": access_saml_certificate_set,
+        "access_single_response-3": access_single_response$$3,
+        "access_yandex": access_yandex,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/organization/doh/outputs.ts b/src/generated/forge-mcp/zeroTrust/organization/doh/outputs.ts
deleted file mode 100644
index 0c614c4a1..000000000
--- a/src/generated/forge-mcp/zeroTrust/organization/doh/outputs.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `access_doh_jwt_duration` in responses.
- */
-export const access_doh_jwt_duration_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/organization/doh/schemas.ts b/src/generated/forge-mcp/zeroTrust/organization/doh/schemas.ts
deleted file mode 100644
index 4adf41f0a..000000000
--- a/src/generated/forge-mcp/zeroTrust/organization/doh/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../../_/tool.js";
-
-/**
- * The schema of `access_doh_jwt_duration`.
- */
-export const access_doh_jwt_duration: JsonSchema = {
-  "description": "The duration the DoH JWT is valid for. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.  Note that the maximum duration for this setting is the same as the key rotation period on the account. Default expiration is 24h",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/organization/doh/tools.ts b/src/generated/forge-mcp/zeroTrust/organization/doh/tools.ts
index fc1ba1c19..e76062c7b 100644
--- a/src/generated/forge-mcp/zeroTrust/organization/doh/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/organization/doh/tools.ts
@@ -3,50 +3,43 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_client_id_output,
-  access_created_at_output,
-  access_duration_output,
-  access_enabled_output,
-  access_leak_report_url_output,
-  access_leak_reported_at_output,
-  access_leak_reporter_output,
-  access_messages_output,
-  access_name_2_output,
-  access_service_tokens_output,
-  access_single_response_2_output,
-  access_tags_output,
-  access_timestamp_output,
-  access_updated_at_output,
-  access_uuid_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
+  access_service$$tokens,
+  access_single_response$$2,
+  access_tags,
 } from "../../outputs.js";
-import { access_identifier } from "../../schemas.js";
-import { access_doh_jwt_duration_output } from "./outputs.js";
-import { access_doh_jwt_duration } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.organization.doh`.
+ * The tools of `zeroTrust.organization.doh`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_organization_doh_get",
+    name: "zeroTrust_organization_doh_get",
     title: "Get your Zero Trust organization DoH settings",
-    description: "Returns the DoH settings for your Zero Trust organization.",
+    description: "Returns the DoH settings for your Zero Trust organization.\n\nGET /accounts/{account_id}/access/organizations/doh",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -68,22 +61,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -129,23 +111,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
@@ -153,21 +124,17 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_organization_doh_update",
+    name: "zeroTrust_organization_doh_update",
     title: "Update your Zero Trust organization DoH settings",
-    description: "Updates the DoH settings for your Zero Trust organization.",
+    description: "Updates the DoH settings for your Zero Trust organization.\n\nPUT /accounts/{account_id}/access/organizations/doh",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "doh_jwt_duration": {
-              "$ref": "#/$defs/access_doh_jwt_duration",
-              "description": "The duration the DoH JWT is valid for. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.  Note that the maximum duration for this setting is the same as the key rotation period on the account. Default expiration is 24h"
+              "description": "The duration the DoH JWT is valid for. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.  Note that the maximum duration for this setting is the same as the key rotation period on the account. Default expiration is 24h",
+              "type": "string"
             },
             "service_token_id": {
               "description": "The uuid of the service token you want to use for DoH authentication",
@@ -175,15 +142,25 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_doh_jwt_duration": access_doh_jwt_duration,
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -195,7 +172,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "doh_jwt_duration": {
-                  "$ref": "#/$defs/access_doh_jwt_duration"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -205,23 +182,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_doh_jwt_duration": access_doh_jwt_duration_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     annotations: {
@@ -250,7 +215,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "doh_jwt_duration": {
-                      "$ref": "#/$defs/access_doh_jwt_duration"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -265,24 +230,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_client_id": access_client_id_output,
-        "access_created_at": access_created_at_output,
-        "access_doh_jwt_duration": access_doh_jwt_duration_output,
-        "access_duration": access_duration_output,
-        "access_enabled": access_enabled_output,
-        "access_leak_report_url": access_leak_report_url_output,
-        "access_leak_reported_at": access_leak_reported_at_output,
-        "access_leak_reporter": access_leak_reporter_output,
-        "access_messages": access_messages_output,
-        "access_name-2": access_name_2_output,
-        "access_service-tokens": access_service_tokens_output,
-        "access_single_response-2": access_single_response_2_output,
-        "access_tags": access_tags_output,
-        "access_timestamp": access_timestamp_output,
-        "access_updated_at": access_updated_at_output,
-        "access_uuid": access_uuid_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_service-tokens": access_service$$tokens,
+        "access_single_response-2": access_single_response$$2,
+        "access_tags": access_tags,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/organization/outputs.ts b/src/generated/forge-mcp/zeroTrust/organization/outputs.ts
index 190cf2abb..9b867ae1a 100644
--- a/src/generated/forge-mcp/zeroTrust/organization/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/organization/outputs.ts
@@ -3,31 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `access_allow_authenticate_via_warp` in responses.
- */
-export const access_allow_authenticate_via_warp_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_auth_domain` in responses.
- */
-export const access_auth_domain_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_auto_redirect_to_identity` in responses.
- */
-export const access_auto_redirect_to_identity_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_custom_pages` in responses.
  */
-export const access_custom_pages_output: JsonSchema = {
+export const access_custom_pages: JsonSchema = {
   "properties": {
     "forbidden": {
       "type": "string"
@@ -39,35 +18,21 @@ export const access_custom_pages_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_deny_unmatched_requests` in responses.
- */
-export const access_deny_unmatched_requests_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_deny_unmatched_requests_exempted_zone_names` in
  * responses.
  */
-export const access_deny_unmatched_requests_exempted_zone_names_output: JsonSchema = {
+export const access_deny_unmatched_requests_exempted_zone_names: JsonSchema = {
   "items": {
     "type": "string"
   },
   "type": "array"
 };
 
-/**
- * The schema of `access_disable_end_user_app_creation` in responses.
- */
-export const access_disable_end_user_app_creation_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_get_response` in responses.
  */
-export const access_get_response_output: JsonSchema = {
+export const access_get_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -98,17 +63,10 @@ export const access_get_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_is_ui_read_only` in responses.
- */
-export const access_is_ui_read_only_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_login_design` in responses.
  */
-export const access_login_design_output: JsonSchema = {
+export const access_login_design: JsonSchema = {
   "properties": {
     "background_color": {
       "type": "string"
@@ -132,7 +90,7 @@ export const access_login_design_output: JsonSchema = {
 /**
  * The schema of `access_mfa_piv_key_requirements` in responses.
  */
-export const access_mfa_piv_key_requirements_output: JsonSchema = {
+export const access_mfa_piv_key_requirements: JsonSchema = {
   "properties": {
     "pin_policy": {
       "enum": [
@@ -182,24 +140,10 @@ export const access_mfa_piv_key_requirements_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_mfa_required_for_all_apps` in responses.
- */
-export const access_mfa_required_for_all_apps_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_name` in responses.
- */
-export const access_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_org_mfa_config` in responses.
  */
-export const access_org_mfa_config_output: JsonSchema = {
+export const access_org_mfa_config: JsonSchema = {
   "properties": {
     "allowed_authenticators": {
       "items": {
@@ -231,34 +175,42 @@ export const access_org_mfa_config_output: JsonSchema = {
 /**
  * The schema of `access_organizations` in responses.
  */
-export const access_organizations_output: JsonSchema = {
+export const access_organizations: JsonSchema = {
   "properties": {
     "allow_authenticate_via_warp": {
-      "$ref": "#/$defs/access_allow_authenticate_via_warp"
+      "type": "boolean"
     },
     "auth_domain": {
-      "$ref": "#/$defs/access_auth_domain"
+      "type": "string"
     },
     "auto_redirect_to_identity": {
-      "$ref": "#/$defs/access_auto_redirect_to_identity"
+      "type": "boolean"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "custom_pages": {
       "$ref": "#/$defs/access_custom_pages"
     },
     "deny_unmatched_requests": {
-      "$ref": "#/$defs/access_deny_unmatched_requests"
+      "type": "boolean"
     },
     "deny_unmatched_requests_exempted_zone_names": {
       "$ref": "#/$defs/access_deny_unmatched_requests_exempted_zone_names"
     },
     "disable_end_user_app_creation": {
-      "$ref": "#/$defs/access_disable_end_user_app_creation"
+      "type": "boolean"
     },
     "is_ui_read_only": {
-      "$ref": "#/$defs/access_is_ui_read_only"
+      "type": "boolean"
     },
     "login_design": {
       "$ref": "#/$defs/access_login_design"
@@ -270,34 +222,42 @@ export const access_organizations_output: JsonSchema = {
       "$ref": "#/$defs/access_mfa_piv_key_requirements"
     },
     "mfa_required_for_all_apps": {
-      "$ref": "#/$defs/access_mfa_required_for_all_apps"
+      "type": "boolean"
     },
     "name": {
-      "$ref": "#/$defs/access_name"
+      "type": "string"
     },
     "service_token_inactivity": {
       "$ref": "#/$defs/access_service_token_inactivity"
     },
     "session_duration": {
-      "$ref": "#/$defs/access_session_duration"
+      "type": "string"
     },
     "strict_service_token_auth": {
-      "$ref": "#/$defs/access_strict_service_token_auth"
+      "type": "boolean"
     },
     "ui_read_only_toggle_reason": {
-      "$ref": "#/$defs/access_ui_read_only_toggle_reason"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "user_seat_expiration_inactive_time": {
-      "$ref": "#/$defs/access_user_seat_expiration_inactive_time"
+      "type": "string"
     },
     "warp_auth_non_browser_401": {
-      "$ref": "#/$defs/access_warp_auth_non_browser_401"
+      "type": "boolean"
     },
     "warp_auth_session_duration": {
-      "$ref": "#/$defs/access_warp_auth_session_duration"
+      "type": "string"
     }
   },
   "type": "object"
@@ -306,7 +266,7 @@ export const access_organizations_output: JsonSchema = {
 /**
  * The schema of `access_service_token_inactivity` in responses.
  */
-export const access_service_token_inactivity_output: JsonSchema = {
+export const access_service_token_inactivity: JsonSchema = {
   "properties": {
     "action": {
       "enum": [
@@ -330,17 +290,10 @@ export const access_service_token_inactivity_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_session_duration` in responses.
- */
-export const access_session_duration_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_single_response` in responses.
  */
-export const access_single_response_output: JsonSchema = {
+export const access_single_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -355,38 +308,3 @@ export const access_single_response_output: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `access_strict_service_token_auth` in responses.
- */
-export const access_strict_service_token_auth_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_ui_read_only_toggle_reason` in responses.
- */
-export const access_ui_read_only_toggle_reason_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_user_seat_expiration_inactive_time` in responses.
- */
-export const access_user_seat_expiration_inactive_time_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_warp_auth_non_browser_401` in responses.
- */
-export const access_warp_auth_non_browser_401_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_warp_auth_session_duration` in responses.
- */
-export const access_warp_auth_session_duration_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/organization/schemas.ts b/src/generated/forge-mcp/zeroTrust/organization/schemas.ts
index d741f4cfe..01a5a9eca 100644
--- a/src/generated/forge-mcp/zeroTrust/organization/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/organization/schemas.ts
@@ -3,30 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `access_allow_authenticate_via_warp`.
- */
-export const access_allow_authenticate_via_warp: JsonSchema = {
-  "description": "When set to true, users can authenticate via WARP for any application in your organization. Application settings will take precedence over this value.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_auth_domain`.
- */
-export const access_auth_domain: JsonSchema = {
-  "description": "The unique subdomain assigned to your Zero Trust organization. If omitted on creation, a unique subdomain is auto-generated in the format `adjective-noun-hex4` (e.g. `frosty-moon-7a3b.cloudflareaccess.com`).",
-  "type": "string"
-};
-
-/**
- * The schema of `access_auto_redirect_to_identity`.
- */
-export const access_auto_redirect_to_identity: JsonSchema = {
-  "description": "When set to `true`, users skip the identity provider selection step during login.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_custom_pages`.
  */
@@ -44,14 +20,6 @@ export const access_custom_pages: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_deny_unmatched_requests`.
- */
-export const access_deny_unmatched_requests: JsonSchema = {
-  "description": "Determines whether to deny all requests to Cloudflare-protected resources that lack an associated Access application. If enabled, you must explicitly configure an Access application and policy to allow traffic to your Cloudflare-protected resources. For domains you want to be public across all subdomains, add the domain to the `deny_unmatched_requests_exempted_zone_names` array.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_deny_unmatched_requests_exempted_zone_names`.
  */
@@ -63,22 +31,6 @@ export const access_deny_unmatched_requests_exempted_zone_names: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_disable_end_user_app_creation`.
- */
-export const access_disable_end_user_app_creation: JsonSchema = {
-  "description": "Whether creation of end user applications is disabled for this organization.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_is_ui_read_only`.
- */
-export const access_is_ui_read_only: JsonSchema = {
-  "description": "Lock all settings as Read-Only in the Dashboard, regardless of user permission. Updates may only be made via the API or Terraform for this account when enabled.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_login_design`.
  */
@@ -167,22 +119,6 @@ export const access_mfa_piv_key_requirements: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_mfa_required_for_all_apps`.
- */
-export const access_mfa_required_for_all_apps: JsonSchema = {
-  "description": "Determines whether global MFA settings apply to applications by default. The organization must have MFA enabled with at least one authentication method and a session duration configured. Note: 'allowed_authenticators' cannot contain only the infrastructure SSH authenticators ('piv_key' and 'ssh_fido2_key') if the organization has any non-infrastructure applications.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_name`.
- */
-export const access_name: JsonSchema = {
-  "description": "The name of your Zero Trust organization. When omitted on creation, defaults to the provided auth_domain; when both are omitted, defaults to the auto-generated subdomain slug (e.g. frosty-moon-7a3b).",
-  "type": "string"
-};
-
 /**
  * The schema of `access_org_mfa_config`.
  */
@@ -250,51 +186,3 @@ export const access_service_token_inactivity: JsonSchema = {
   ],
   "type": "object"
 };
-
-/**
- * The schema of `access_session_duration`.
- */
-export const access_session_duration: JsonSchema = {
-  "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_strict_service_token_auth`.
- */
-export const access_strict_service_token_auth: JsonSchema = {
-  "description": "Enables new behaviors for requests made with Access service tokens. Unauthorized requests emit audit logs, and return a 401 or 403 status code in the response instead of redirecting to the login page. Successful requests no longer receive a CF_Authorization cookie in the response. Zero Trust organizations created on or after October 5, 2026 will have this setting enabled by default, and cannot disable it.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_ui_read_only_toggle_reason`.
- */
-export const access_ui_read_only_toggle_reason: JsonSchema = {
-  "description": "A description of the reason why the UI read only field is being toggled.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_user_seat_expiration_inactive_time`.
- */
-export const access_user_seat_expiration_inactive_time: JsonSchema = {
-  "description": "The amount of time a user seat is inactive before it expires. When the user seat exceeds the set time of inactivity, the user is removed as an active seat and no longer counts against your Teams seat count.  Minimum value for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_warp_auth_non_browser_401`.
- */
-export const access_warp_auth_non_browser_401: JsonSchema = {
-  "description": "When enabled, unsuccessful WARP authentication requests with a non-HTML Accept header return a 401 response instead of redirecting to the login page.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_warp_auth_session_duration`.
- */
-export const access_warp_auth_session_duration: JsonSchema = {
-  "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `30m` or `2h45m`. Valid time units are: m, h.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/organization/tools.ts b/src/generated/forge-mcp/zeroTrust/organization/tools.ts
index f05f0aab3..08bf90569 100644
--- a/src/generated/forge-mcp/zeroTrust/organization/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/organization/tools.ts
@@ -3,118 +3,74 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_created_at_output,
-  access_messages_output,
-  access_timestamp_output,
-  access_updated_at_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../outputs.js";
-import { access_identifier } from "../schemas.js";
 import {
-  access_allow_authenticate_via_warp_output,
-  access_auth_domain_output,
-  access_auto_redirect_to_identity_output,
-  access_custom_pages_output,
-  access_deny_unmatched_requests_exempted_zone_names_output,
-  access_deny_unmatched_requests_output,
-  access_disable_end_user_app_creation_output,
-  access_get_response_output,
-  access_is_ui_read_only_output,
-  access_login_design_output,
-  access_mfa_piv_key_requirements_output,
-  access_mfa_required_for_all_apps_output,
-  access_name_output,
-  access_org_mfa_config_output,
-  access_organizations_output,
-  access_service_token_inactivity_output,
-  access_session_duration_output,
-  access_single_response_output,
-  access_strict_service_token_auth_output,
-  access_ui_read_only_toggle_reason_output,
-  access_user_seat_expiration_inactive_time_output,
-  access_warp_auth_non_browser_401_output,
-  access_warp_auth_session_duration_output,
-} from "./outputs.js";
-import {
-  access_allow_authenticate_via_warp,
-  access_auth_domain,
-  access_auto_redirect_to_identity,
   access_custom_pages,
-  access_deny_unmatched_requests,
   access_deny_unmatched_requests_exempted_zone_names,
-  access_disable_end_user_app_creation,
-  access_is_ui_read_only,
+  access_get_response,
   access_login_design,
   access_mfa_piv_key_requirements,
-  access_mfa_required_for_all_apps,
-  access_name,
   access_org_mfa_config,
+  access_organizations,
   access_service_token_inactivity,
-  access_session_duration,
-  access_strict_service_token_auth,
-  access_ui_read_only_toggle_reason,
-  access_user_seat_expiration_inactive_time,
-  access_warp_auth_non_browser_401,
-  access_warp_auth_session_duration,
+  access_single_response,
+} from "./outputs.js";
+import {
+  access_custom_pages as access_custom_pages$,
+  access_deny_unmatched_requests_exempted_zone_names as access_deny_unmatched_requests_exempted_zone_names$,
+  access_login_design as access_login_design$,
+  access_mfa_piv_key_requirements as access_mfa_piv_key_requirements$,
+  access_org_mfa_config as access_org_mfa_config$,
+  access_service_token_inactivity as access_service_token_inactivity$,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.organization`.
+ * The tools of `zeroTrust.organization`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_organization_create",
+    name: "zeroTrust_organization_create",
     title: "Create your Zero Trust organization",
-    description: "Sets up a Zero Trust organization for your account or zone.",
+    description: "Sets up a Zero Trust organization for your account or zone.\n\nPOST /{account_or_zone}/{account_or_zone_id}/access/organizations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "allow_authenticate_via_warp": {
-              "$ref": "#/$defs/access_allow_authenticate_via_warp",
               "default": false,
-              "description": "When set to true, users can authenticate via WARP for any application in your organization. Application settings will take precedence over this value."
+              "description": "When set to true, users can authenticate via WARP for any application in your organization. Application settings will take precedence over this value.",
+              "type": "boolean"
             },
             "auth_domain": {
-              "$ref": "#/$defs/access_auth_domain",
-              "description": "The unique subdomain assigned to your Zero Trust organization. If omitted on creation, a unique subdomain is auto-generated in the format `adjective-noun-hex4` (e.g. `frosty-moon-7a3b.cloudflareaccess.com`)."
+              "description": "The unique subdomain assigned to your Zero Trust organization. If omitted on creation, a unique subdomain is auto-generated in the format `adjective-noun-hex4` (e.g. `frosty-moon-7a3b.cloudflareaccess.com`).",
+              "type": "string"
             },
             "auto_redirect_to_identity": {
-              "$ref": "#/$defs/access_auto_redirect_to_identity",
               "default": false,
-              "description": "When set to `true`, users skip the identity provider selection step during login."
+              "description": "When set to `true`, users skip the identity provider selection step during login.",
+              "type": "boolean"
             },
             "deny_unmatched_requests": {
-              "$ref": "#/$defs/access_deny_unmatched_requests",
-              "description": "Determines whether to deny all requests to Cloudflare-protected resources that lack an associated Access application. If enabled, you must explicitly configure an Access application and policy to allow traffic to your Cloudflare-protected resources. For domains you want to be public across all subdomains, add the domain to the `deny_unmatched_requests_exempted_zone_names` array."
+              "description": "Determines whether to deny all requests to Cloudflare-protected resources that lack an associated Access application. If enabled, you must explicitly configure an Access application and policy to allow traffic to your Cloudflare-protected resources. For domains you want to be public across all subdomains, add the domain to the `deny_unmatched_requests_exempted_zone_names` array.",
+              "type": "boolean"
             },
             "deny_unmatched_requests_exempted_zone_names": {
               "$ref": "#/$defs/access_deny_unmatched_requests_exempted_zone_names",
               "description": "Contains zone names to exempt from the `deny_unmatched_requests` feature. Requests to a subdomain in an exempted zone will block unauthenticated traffic by default if there is a configured Access application and policy that matches the request."
             },
             "disable_end_user_app_creation": {
-              "$ref": "#/$defs/access_disable_end_user_app_creation",
               "default": false,
-              "description": "Whether creation of end user applications is disabled for this organization."
+              "description": "Whether creation of end user applications is disabled for this organization.",
+              "type": "boolean"
             },
             "is_ui_read_only": {
-              "$ref": "#/$defs/access_is_ui_read_only",
               "default": false,
-              "description": "Lock all settings as Read-Only in the Dashboard, regardless of user permission. Updates may only be made via the API or Terraform for this account when enabled."
+              "description": "Lock all settings as Read-Only in the Dashboard, regardless of user permission. Updates may only be made via the API or Terraform for this account when enabled.",
+              "type": "boolean"
             },
             "login_design": {
               "$ref": "#/$defs/access_login_design"
@@ -128,105 +84,95 @@ export const tools: readonly Tool[] = [
               "description": "Configures PIV key requirements for MFA using hardware security keys."
             },
             "mfa_required_for_all_apps": {
-              "$ref": "#/$defs/access_mfa_required_for_all_apps",
               "default": false,
-              "description": "Determines whether global MFA settings apply to applications by default. The organization must have MFA enabled with at least one authentication method and a session duration configured. Note: 'allowed_authenticators' cannot contain only the infrastructure SSH authenticators ('piv_key' and 'ssh_fido2_key') if the organization has any non-infrastructure applications."
+              "description": "Determines whether global MFA settings apply to applications by default. The organization must have MFA enabled with at least one authentication method and a session duration configured. Note: 'allowed_authenticators' cannot contain only the infrastructure SSH authenticators ('piv_key' and 'ssh_fido2_key') if the organization has any non-infrastructure applications.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/access_name",
-              "description": "The name of your Zero Trust organization. When omitted on creation, defaults to the provided auth_domain; when both are omitted, defaults to the auto-generated subdomain slug (e.g. frosty-moon-7a3b)."
+              "description": "The name of your Zero Trust organization. When omitted on creation, defaults to the provided auth_domain; when both are omitted, defaults to the auto-generated subdomain slug (e.g. frosty-moon-7a3b).",
+              "type": "string"
             },
             "service_token_inactivity": {
               "$ref": "#/$defs/access_service_token_inactivity",
               "description": "Configures automatic enforcement for inactive service tokens. A service token is inactive if no policy references it, and it has not successfully authenticated with an Access application during the selected inactivity period. This setting applies to every service token in your Zero Trust account."
             },
             "session_duration": {
-              "$ref": "#/$defs/access_session_duration",
-              "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h."
+              "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
+              "type": "string"
             },
             "strict_service_token_auth": {
-              "$ref": "#/$defs/access_strict_service_token_auth",
-              "description": "Enables new behaviors for requests made with Access service tokens. Unauthorized requests emit audit logs, and return a 401 or 403 status code in the response instead of redirecting to the login page. Successful requests no longer receive a CF_Authorization cookie in the response. Zero Trust organizations created on or after October 5, 2026 will have this setting enabled by default, and cannot disable it."
+              "description": "Enables new behaviors for requests made with Access service tokens. Unauthorized requests emit audit logs, and return a 401 or 403 status code in the response instead of redirecting to the login page. Successful requests no longer receive a CF_Authorization cookie in the response. Zero Trust organizations created on or after October 5, 2026 will have this setting enabled by default, and cannot disable it.",
+              "type": "boolean"
             },
             "ui_read_only_toggle_reason": {
-              "$ref": "#/$defs/access_ui_read_only_toggle_reason",
-              "description": "A description of the reason why the UI read only field is being toggled."
+              "description": "A description of the reason why the UI read only field is being toggled.",
+              "type": "string"
             },
             "user_seat_expiration_inactive_time": {
-              "$ref": "#/$defs/access_user_seat_expiration_inactive_time",
-              "description": "The amount of time a user seat is inactive before it expires. When the user seat exceeds the set time of inactivity, the user is removed as an active seat and no longer counts against your Teams seat count.  Minimum value for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`."
+              "description": "The amount of time a user seat is inactive before it expires. When the user seat exceeds the set time of inactivity, the user is removed as an active seat and no longer counts against your Teams seat count.  Minimum value for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.",
+              "type": "string"
             },
             "warp_auth_non_browser_401": {
-              "$ref": "#/$defs/access_warp_auth_non_browser_401",
               "default": false,
-              "description": "When enabled, unsuccessful WARP authentication requests with a non-HTML Accept header return a 401 response instead of redirecting to the login page."
+              "description": "When enabled, unsuccessful WARP authentication requests with a non-HTML Accept header return a 401 response instead of redirecting to the login page.",
+              "type": "boolean"
             },
             "warp_auth_session_duration": {
-              "$ref": "#/$defs/access_warp_auth_session_duration",
-              "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `30m` or `2h45m`. Valid time units are: m, h."
+              "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `30m` or `2h45m`. Valid time units are: m, h.",
+              "type": "string"
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_allow_authenticate_via_warp": access_allow_authenticate_via_warp,
-        "access_auth_domain": access_auth_domain,
-        "access_auto_redirect_to_identity": access_auto_redirect_to_identity,
-        "access_deny_unmatched_requests": access_deny_unmatched_requests,
-        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names,
-        "access_disable_end_user_app_creation": access_disable_end_user_app_creation,
-        "access_identifier": access_identifier,
-        "access_is_ui_read_only": access_is_ui_read_only,
-        "access_login_design": access_login_design,
-        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements,
-        "access_mfa_required_for_all_apps": access_mfa_required_for_all_apps,
-        "access_name": access_name,
-        "access_org_mfa_config": access_org_mfa_config,
-        "access_service_token_inactivity": access_service_token_inactivity,
-        "access_session_duration": access_session_duration,
-        "access_strict_service_token_auth": access_strict_service_token_auth,
-        "access_ui_read_only_toggle_reason": access_ui_read_only_toggle_reason,
-        "access_user_seat_expiration_inactive_time": access_user_seat_expiration_inactive_time,
-        "access_warp_auth_non_browser_401": access_warp_auth_non_browser_401,
-        "access_warp_auth_session_duration": access_warp_auth_session_duration,
+        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names$,
+        "access_login_design": access_login_design$,
+        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements$,
+        "access_org_mfa_config": access_org_mfa_config$,
+        "access_service_token_inactivity": access_service_token_inactivity$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_single_response",
       $defs: {
-        "access_allow_authenticate_via_warp": access_allow_authenticate_via_warp_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_domain": access_auth_domain_output,
-        "access_auto_redirect_to_identity": access_auto_redirect_to_identity_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_pages": access_custom_pages_output,
-        "access_deny_unmatched_requests": access_deny_unmatched_requests_output,
-        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names_output,
-        "access_disable_end_user_app_creation": access_disable_end_user_app_creation_output,
-        "access_is_ui_read_only": access_is_ui_read_only_output,
-        "access_login_design": access_login_design_output,
-        "access_messages": access_messages_output,
-        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements_output,
-        "access_mfa_required_for_all_apps": access_mfa_required_for_all_apps_output,
-        "access_name": access_name_output,
-        "access_org_mfa_config": access_org_mfa_config_output,
-        "access_organizations": access_organizations_output,
-        "access_service_token_inactivity": access_service_token_inactivity_output,
-        "access_session_duration": access_session_duration_output,
-        "access_single_response": access_single_response_output,
-        "access_strict_service_token_auth": access_strict_service_token_auth_output,
-        "access_timestamp": access_timestamp_output,
-        "access_ui_read_only_toggle_reason": access_ui_read_only_toggle_reason_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_seat_expiration_inactive_time": access_user_seat_expiration_inactive_time_output,
-        "access_warp_auth_non_browser_401": access_warp_auth_non_browser_401_output,
-        "access_warp_auth_session_duration": access_warp_auth_session_duration_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_pages": access_custom_pages,
+        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names,
+        "access_login_design": access_login_design,
+        "access_messages": access_messages,
+        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements,
+        "access_org_mfa_config": access_org_mfa_config,
+        "access_organizations": access_organizations,
+        "access_service_token_inactivity": access_service_token_inactivity,
+        "access_single_response": access_single_response,
       },
     },
     annotations: {
@@ -253,34 +199,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_allow_authenticate_via_warp": access_allow_authenticate_via_warp_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_domain": access_auth_domain_output,
-        "access_auto_redirect_to_identity": access_auto_redirect_to_identity_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_pages": access_custom_pages_output,
-        "access_deny_unmatched_requests": access_deny_unmatched_requests_output,
-        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names_output,
-        "access_disable_end_user_app_creation": access_disable_end_user_app_creation_output,
-        "access_is_ui_read_only": access_is_ui_read_only_output,
-        "access_login_design": access_login_design_output,
-        "access_messages": access_messages_output,
-        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements_output,
-        "access_mfa_required_for_all_apps": access_mfa_required_for_all_apps_output,
-        "access_name": access_name_output,
-        "access_org_mfa_config": access_org_mfa_config_output,
-        "access_organizations": access_organizations_output,
-        "access_service_token_inactivity": access_service_token_inactivity_output,
-        "access_session_duration": access_session_duration_output,
-        "access_single_response": access_single_response_output,
-        "access_strict_service_token_auth": access_strict_service_token_auth_output,
-        "access_timestamp": access_timestamp_output,
-        "access_ui_read_only_toggle_reason": access_ui_read_only_toggle_reason_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_seat_expiration_inactive_time": access_user_seat_expiration_inactive_time_output,
-        "access_warp_auth_non_browser_401": access_warp_auth_non_browser_401_output,
-        "access_warp_auth_session_duration": access_warp_auth_session_duration_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_pages": access_custom_pages,
+        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names,
+        "access_login_design": access_login_design,
+        "access_messages": access_messages,
+        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements,
+        "access_org_mfa_config": access_org_mfa_config,
+        "access_organizations": access_organizations,
+        "access_service_token_inactivity": access_service_token_inactivity,
+        "access_single_response": access_single_response,
       },
     },
     request: (args) => ({
@@ -289,63 +218,53 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_organization_get",
+    name: "zeroTrust_organization_get",
     title: "Get your Zero Trust organization",
-    description: "Returns the configuration for your Zero Trust organization.",
+    description: "Returns the configuration for your Zero Trust organization.\n\nGET /{account_or_zone}/{account_or_zone_id}/access/organizations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
           ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_get_response",
       $defs: {
-        "access_allow_authenticate_via_warp": access_allow_authenticate_via_warp_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_domain": access_auth_domain_output,
-        "access_auto_redirect_to_identity": access_auto_redirect_to_identity_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_pages": access_custom_pages_output,
-        "access_deny_unmatched_requests": access_deny_unmatched_requests_output,
-        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names_output,
-        "access_disable_end_user_app_creation": access_disable_end_user_app_creation_output,
-        "access_get_response": access_get_response_output,
-        "access_is_ui_read_only": access_is_ui_read_only_output,
-        "access_login_design": access_login_design_output,
-        "access_messages": access_messages_output,
-        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements_output,
-        "access_mfa_required_for_all_apps": access_mfa_required_for_all_apps_output,
-        "access_name": access_name_output,
-        "access_org_mfa_config": access_org_mfa_config_output,
-        "access_organizations": access_organizations_output,
-        "access_service_token_inactivity": access_service_token_inactivity_output,
-        "access_session_duration": access_session_duration_output,
-        "access_strict_service_token_auth": access_strict_service_token_auth_output,
-        "access_timestamp": access_timestamp_output,
-        "access_ui_read_only_toggle_reason": access_ui_read_only_toggle_reason_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_seat_expiration_inactive_time": access_user_seat_expiration_inactive_time_output,
-        "access_warp_auth_non_browser_401": access_warp_auth_non_browser_401_output,
-        "access_warp_auth_session_duration": access_warp_auth_session_duration_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_pages": access_custom_pages,
+        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names,
+        "access_get_response": access_get_response,
+        "access_login_design": access_login_design,
+        "access_messages": access_messages,
+        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements,
+        "access_org_mfa_config": access_org_mfa_config,
+        "access_organizations": access_organizations,
+        "access_service_token_inactivity": access_service_token_inactivity,
       },
     },
     annotations: {
@@ -374,34 +293,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_allow_authenticate_via_warp": access_allow_authenticate_via_warp_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_domain": access_auth_domain_output,
-        "access_auto_redirect_to_identity": access_auto_redirect_to_identity_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_pages": access_custom_pages_output,
-        "access_deny_unmatched_requests": access_deny_unmatched_requests_output,
-        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names_output,
-        "access_disable_end_user_app_creation": access_disable_end_user_app_creation_output,
-        "access_get_response": access_get_response_output,
-        "access_is_ui_read_only": access_is_ui_read_only_output,
-        "access_login_design": access_login_design_output,
-        "access_messages": access_messages_output,
-        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements_output,
-        "access_mfa_required_for_all_apps": access_mfa_required_for_all_apps_output,
-        "access_name": access_name_output,
-        "access_org_mfa_config": access_org_mfa_config_output,
-        "access_organizations": access_organizations_output,
-        "access_service_token_inactivity": access_service_token_inactivity_output,
-        "access_session_duration": access_session_duration_output,
-        "access_strict_service_token_auth": access_strict_service_token_auth_output,
-        "access_timestamp": access_timestamp_output,
-        "access_ui_read_only_toggle_reason": access_ui_read_only_toggle_reason_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_seat_expiration_inactive_time": access_user_seat_expiration_inactive_time_output,
-        "access_warp_auth_non_browser_401": access_warp_auth_non_browser_401_output,
-        "access_warp_auth_session_duration": access_warp_auth_session_duration_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_pages": access_custom_pages,
+        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names,
+        "access_get_response": access_get_response,
+        "access_login_design": access_login_design,
+        "access_messages": access_messages,
+        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements,
+        "access_org_mfa_config": access_org_mfa_config,
+        "access_organizations": access_organizations,
+        "access_service_token_inactivity": access_service_token_inactivity,
       },
     },
     request: (args) => ({
@@ -409,60 +311,48 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_organization_update",
+    name: "zeroTrust_organization_update",
     title: "Update your Zero Trust organization",
-    description: "Updates the configuration for your Zero Trust organization.",
+    description: "Updates the configuration for your Zero Trust organization.\n\nPUT /{account_or_zone}/{account_or_zone_id}/access/organizations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_or_zone": {
-          "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
-          "enum": [
-            "accounts",
-            "zones"
-          ],
-          "type": "string"
-        },
-        "account_or_zone_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "The account ID or zone ID, as selected by account_or_zone."
-        },
         "body": {
           "properties": {
             "allow_authenticate_via_warp": {
-              "$ref": "#/$defs/access_allow_authenticate_via_warp",
               "default": false,
-              "description": "When set to true, users can authenticate via WARP for any application in your organization. Application settings will take precedence over this value."
+              "description": "When set to true, users can authenticate via WARP for any application in your organization. Application settings will take precedence over this value.",
+              "type": "boolean"
             },
             "auth_domain": {
-              "$ref": "#/$defs/access_auth_domain",
-              "description": "The unique subdomain assigned to your Zero Trust organization. If omitted on creation, a unique subdomain is auto-generated in the format `adjective-noun-hex4` (e.g. `frosty-moon-7a3b.cloudflareaccess.com`)."
+              "description": "The unique subdomain assigned to your Zero Trust organization. If omitted on creation, a unique subdomain is auto-generated in the format `adjective-noun-hex4` (e.g. `frosty-moon-7a3b.cloudflareaccess.com`).",
+              "type": "string"
             },
             "auto_redirect_to_identity": {
-              "$ref": "#/$defs/access_auto_redirect_to_identity",
               "default": false,
-              "description": "When set to `true`, users skip the identity provider selection step during login."
+              "description": "When set to `true`, users skip the identity provider selection step during login.",
+              "type": "boolean"
             },
             "custom_pages": {
               "$ref": "#/$defs/access_custom_pages"
             },
             "deny_unmatched_requests": {
-              "$ref": "#/$defs/access_deny_unmatched_requests",
-              "description": "Determines whether to deny all requests to Cloudflare-protected resources that lack an associated Access application. If enabled, you must explicitly configure an Access application and policy to allow traffic to your Cloudflare-protected resources. For domains you want to be public across all subdomains, add the domain to the `deny_unmatched_requests_exempted_zone_names` array."
+              "description": "Determines whether to deny all requests to Cloudflare-protected resources that lack an associated Access application. If enabled, you must explicitly configure an Access application and policy to allow traffic to your Cloudflare-protected resources. For domains you want to be public across all subdomains, add the domain to the `deny_unmatched_requests_exempted_zone_names` array.",
+              "type": "boolean"
             },
             "deny_unmatched_requests_exempted_zone_names": {
               "$ref": "#/$defs/access_deny_unmatched_requests_exempted_zone_names",
               "description": "Contains zone names to exempt from the `deny_unmatched_requests` feature. Requests to a subdomain in an exempted zone will block unauthenticated traffic by default if there is a configured Access application and policy that matches the request."
             },
             "disable_end_user_app_creation": {
-              "$ref": "#/$defs/access_disable_end_user_app_creation",
               "default": false,
-              "description": "Whether creation of end user applications is disabled for this organization."
+              "description": "Whether creation of end user applications is disabled for this organization.",
+              "type": "boolean"
             },
             "is_ui_read_only": {
-              "$ref": "#/$defs/access_is_ui_read_only",
               "default": false,
-              "description": "Lock all settings as Read-Only in the Dashboard, regardless of user permission. Updates may only be made via the API or Terraform for this account when enabled."
+              "description": "Lock all settings as Read-Only in the Dashboard, regardless of user permission. Updates may only be made via the API or Terraform for this account when enabled.",
+              "type": "boolean"
             },
             "login_design": {
               "$ref": "#/$defs/access_login_design"
@@ -476,106 +366,96 @@ export const tools: readonly Tool[] = [
               "description": "Configures PIV key requirements for MFA using hardware security keys."
             },
             "mfa_required_for_all_apps": {
-              "$ref": "#/$defs/access_mfa_required_for_all_apps",
               "default": false,
-              "description": "Determines whether global MFA settings apply to applications by default. The organization must have MFA enabled with at least one authentication method and a session duration configured. Note: 'allowed_authenticators' cannot contain only the infrastructure SSH authenticators ('piv_key' and 'ssh_fido2_key') if the organization has any non-infrastructure applications."
+              "description": "Determines whether global MFA settings apply to applications by default. The organization must have MFA enabled with at least one authentication method and a session duration configured. Note: 'allowed_authenticators' cannot contain only the infrastructure SSH authenticators ('piv_key' and 'ssh_fido2_key') if the organization has any non-infrastructure applications.",
+              "type": "boolean"
             },
             "name": {
-              "$ref": "#/$defs/access_name",
-              "description": "The name of your Zero Trust organization. When omitted on creation, defaults to the provided auth_domain; when both are omitted, defaults to the auto-generated subdomain slug (e.g. frosty-moon-7a3b)."
+              "description": "The name of your Zero Trust organization. When omitted on creation, defaults to the provided auth_domain; when both are omitted, defaults to the auto-generated subdomain slug (e.g. frosty-moon-7a3b).",
+              "type": "string"
             },
             "service_token_inactivity": {
               "$ref": "#/$defs/access_service_token_inactivity",
               "description": "Configures automatic enforcement for inactive service tokens. A service token is inactive if no policy references it, and it has not successfully authenticated with an Access application during the selected inactivity period. This setting applies to every service token in your Zero Trust account."
             },
             "session_duration": {
-              "$ref": "#/$defs/access_session_duration",
-              "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h."
+              "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h.",
+              "type": "string"
             },
             "strict_service_token_auth": {
-              "$ref": "#/$defs/access_strict_service_token_auth",
-              "description": "Enables new behaviors for requests made with Access service tokens. Unauthorized requests emit audit logs, and return a 401 or 403 status code in the response instead of redirecting to the login page. Successful requests no longer receive a CF_Authorization cookie in the response. Zero Trust organizations created on or after October 5, 2026 will have this setting enabled by default, and cannot disable it."
+              "description": "Enables new behaviors for requests made with Access service tokens. Unauthorized requests emit audit logs, and return a 401 or 403 status code in the response instead of redirecting to the login page. Successful requests no longer receive a CF_Authorization cookie in the response. Zero Trust organizations created on or after October 5, 2026 will have this setting enabled by default, and cannot disable it.",
+              "type": "boolean"
             },
             "ui_read_only_toggle_reason": {
-              "$ref": "#/$defs/access_ui_read_only_toggle_reason",
-              "description": "A description of the reason why the UI read only field is being toggled."
+              "description": "A description of the reason why the UI read only field is being toggled.",
+              "type": "string"
             },
             "user_seat_expiration_inactive_time": {
-              "$ref": "#/$defs/access_user_seat_expiration_inactive_time",
-              "description": "The amount of time a user seat is inactive before it expires. When the user seat exceeds the set time of inactivity, the user is removed as an active seat and no longer counts against your Teams seat count.  Minimum value for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`."
+              "description": "The amount of time a user seat is inactive before it expires. When the user seat exceeds the set time of inactivity, the user is removed as an active seat and no longer counts against your Teams seat count.  Minimum value for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.",
+              "type": "string"
             },
             "warp_auth_non_browser_401": {
-              "$ref": "#/$defs/access_warp_auth_non_browser_401",
               "default": false,
-              "description": "When enabled, unsuccessful WARP authentication requests with a non-HTML Accept header return a 401 response instead of redirecting to the login page."
+              "description": "When enabled, unsuccessful WARP authentication requests with a non-HTML Accept header return a 401 response instead of redirecting to the login page.",
+              "type": "boolean"
             },
             "warp_auth_session_duration": {
-              "$ref": "#/$defs/access_warp_auth_session_duration",
-              "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `30m` or `2h45m`. Valid time units are: m, h."
+              "description": "The amount of time that tokens issued for applications will be valid. Must be in the format `30m` or `2h45m`. Valid time units are: m, h.",
+              "type": "string"
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_or_zone": {
+              "description": "Whether account_or_zone_id is an account ID (`accounts`) or a zone ID (`zones`).",
+              "enum": [
+                "accounts",
+                "zones"
+              ],
+              "type": "string"
+            },
+            "account_or_zone_id": {
+              "description": "The account ID or zone ID, as selected by account_or_zone.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_or_zone",
+            "account_or_zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_or_zone",
-        "account_or_zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_allow_authenticate_via_warp": access_allow_authenticate_via_warp,
-        "access_auth_domain": access_auth_domain,
-        "access_auto_redirect_to_identity": access_auto_redirect_to_identity,
+        "access_custom_pages": access_custom_pages$,
+        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names$,
+        "access_login_design": access_login_design$,
+        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements$,
+        "access_org_mfa_config": access_org_mfa_config$,
+        "access_service_token_inactivity": access_service_token_inactivity$,
+      },
+    },
+    outputSchema: {
+      "$ref": "#/$defs/access_single_response",
+      $defs: {
+        "access_api-response-single": access_api$$response$$single,
         "access_custom_pages": access_custom_pages,
-        "access_deny_unmatched_requests": access_deny_unmatched_requests,
         "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names,
-        "access_disable_end_user_app_creation": access_disable_end_user_app_creation,
-        "access_identifier": access_identifier,
-        "access_is_ui_read_only": access_is_ui_read_only,
         "access_login_design": access_login_design,
+        "access_messages": access_messages,
         "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements,
-        "access_mfa_required_for_all_apps": access_mfa_required_for_all_apps,
-        "access_name": access_name,
         "access_org_mfa_config": access_org_mfa_config,
+        "access_organizations": access_organizations,
         "access_service_token_inactivity": access_service_token_inactivity,
-        "access_session_duration": access_session_duration,
-        "access_strict_service_token_auth": access_strict_service_token_auth,
-        "access_ui_read_only_toggle_reason": access_ui_read_only_toggle_reason,
-        "access_user_seat_expiration_inactive_time": access_user_seat_expiration_inactive_time,
-        "access_warp_auth_non_browser_401": access_warp_auth_non_browser_401,
-        "access_warp_auth_session_duration": access_warp_auth_session_duration,
-      },
-    },
-    outputSchema: {
-      "$ref": "#/$defs/access_single_response",
-      $defs: {
-        "access_allow_authenticate_via_warp": access_allow_authenticate_via_warp_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_domain": access_auth_domain_output,
-        "access_auto_redirect_to_identity": access_auto_redirect_to_identity_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_pages": access_custom_pages_output,
-        "access_deny_unmatched_requests": access_deny_unmatched_requests_output,
-        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names_output,
-        "access_disable_end_user_app_creation": access_disable_end_user_app_creation_output,
-        "access_is_ui_read_only": access_is_ui_read_only_output,
-        "access_login_design": access_login_design_output,
-        "access_messages": access_messages_output,
-        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements_output,
-        "access_mfa_required_for_all_apps": access_mfa_required_for_all_apps_output,
-        "access_name": access_name_output,
-        "access_org_mfa_config": access_org_mfa_config_output,
-        "access_organizations": access_organizations_output,
-        "access_service_token_inactivity": access_service_token_inactivity_output,
-        "access_session_duration": access_session_duration_output,
-        "access_single_response": access_single_response_output,
-        "access_strict_service_token_auth": access_strict_service_token_auth_output,
-        "access_timestamp": access_timestamp_output,
-        "access_ui_read_only_toggle_reason": access_ui_read_only_toggle_reason_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_seat_expiration_inactive_time": access_user_seat_expiration_inactive_time_output,
-        "access_warp_auth_non_browser_401": access_warp_auth_non_browser_401_output,
-        "access_warp_auth_session_duration": access_warp_auth_session_duration_output,
+        "access_single_response": access_single_response,
       },
     },
     annotations: {
@@ -602,34 +482,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_allow_authenticate_via_warp": access_allow_authenticate_via_warp_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_auth_domain": access_auth_domain_output,
-        "access_auto_redirect_to_identity": access_auto_redirect_to_identity_output,
-        "access_created_at": access_created_at_output,
-        "access_custom_pages": access_custom_pages_output,
-        "access_deny_unmatched_requests": access_deny_unmatched_requests_output,
-        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names_output,
-        "access_disable_end_user_app_creation": access_disable_end_user_app_creation_output,
-        "access_is_ui_read_only": access_is_ui_read_only_output,
-        "access_login_design": access_login_design_output,
-        "access_messages": access_messages_output,
-        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements_output,
-        "access_mfa_required_for_all_apps": access_mfa_required_for_all_apps_output,
-        "access_name": access_name_output,
-        "access_org_mfa_config": access_org_mfa_config_output,
-        "access_organizations": access_organizations_output,
-        "access_service_token_inactivity": access_service_token_inactivity_output,
-        "access_session_duration": access_session_duration_output,
-        "access_single_response": access_single_response_output,
-        "access_strict_service_token_auth": access_strict_service_token_auth_output,
-        "access_timestamp": access_timestamp_output,
-        "access_ui_read_only_toggle_reason": access_ui_read_only_toggle_reason_output,
-        "access_updated_at": access_updated_at_output,
-        "access_user_seat_expiration_inactive_time": access_user_seat_expiration_inactive_time_output,
-        "access_warp_auth_non_browser_401": access_warp_auth_non_browser_401_output,
-        "access_warp_auth_session_duration": access_warp_auth_session_duration_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_custom_pages": access_custom_pages,
+        "access_deny_unmatched_requests_exempted_zone_names": access_deny_unmatched_requests_exempted_zone_names,
+        "access_login_design": access_login_design,
+        "access_messages": access_messages,
+        "access_mfa_piv_key_requirements": access_mfa_piv_key_requirements,
+        "access_org_mfa_config": access_org_mfa_config,
+        "access_organizations": access_organizations,
+        "access_service_token_inactivity": access_service_token_inactivity,
+        "access_single_response": access_single_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/organization/trustSettings/outputs.ts b/src/generated/forge-mcp/zeroTrust/organization/trustSettings/outputs.ts
index a6ae4279e..0ed5727e6 100644
--- a/src/generated/forge-mcp/zeroTrust/organization/trustSettings/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/organization/trustSettings/outputs.ts
@@ -3,17 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_grant_trust_to_all_accounts_in_org` in responses.
- */
-export const access_grant_trust_to_all_accounts_in_org_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_trust_settings_response` in responses.
  */
-export const access_trust_settings_response_output: JsonSchema = {
+export const access_trust_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -23,7 +16,7 @@ export const access_trust_settings_response_output: JsonSchema = {
         "result": {
           "properties": {
             "grant_trust_to_all_accounts_in_org": {
-              "$ref": "#/$defs/access_grant_trust_to_all_accounts_in_org"
+              "type": "boolean"
             },
             "trusting_accounts": {
               "$ref": "#/$defs/access_trusting_accounts"
@@ -43,7 +36,7 @@ export const access_trust_settings_response_output: JsonSchema = {
 /**
  * The schema of `access_trusting_accounts` in responses.
  */
-export const access_trusting_accounts_output: JsonSchema = {
+export const access_trusting_accounts: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/zeroTrust/organization/trustSettings/schemas.ts b/src/generated/forge-mcp/zeroTrust/organization/trustSettings/schemas.ts
index d7bdd25c4..318641ddc 100644
--- a/src/generated/forge-mcp/zeroTrust/organization/trustSettings/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/organization/trustSettings/schemas.ts
@@ -3,14 +3,6 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `access_grant_trust_to_all_accounts_in_org`.
- */
-export const access_grant_trust_to_all_accounts_in_org: JsonSchema = {
-  "description": "Whether all accounts in the organization are trusted to use this account's cross-account Access resources.",
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_trusting_accounts`.
  */
diff --git a/src/generated/forge-mcp/zeroTrust/organization/trustSettings/tools.ts b/src/generated/forge-mcp/zeroTrust/organization/trustSettings/tools.ts
index 1b0fd430c..faaff9937 100644
--- a/src/generated/forge-mcp/zeroTrust/organization/trustSettings/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/organization/trustSettings/tools.ts
@@ -3,52 +3,53 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier } from "../../schemas.js";
 import {
-  access_grant_trust_to_all_accounts_in_org_output,
-  access_trust_settings_response_output,
-  access_trusting_accounts_output,
-} from "./outputs.js";
-import {
-  access_grant_trust_to_all_accounts_in_org,
+  access_trust_settings_response,
   access_trusting_accounts,
-} from "./schemas.js";
+} from "./outputs.js";
+import { access_trusting_accounts as access_trusting_accounts$ } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.organization.trust_settings`.
+ * The tools of `zeroTrust.organization.trustSettings`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_organization_trust_settings_delete",
+    name: "zeroTrust_organization_trustSettings_delete",
     title: "Delete Zero Trust organization trust settings",
-    description: "Resets the trust settings for your Zero Trust organization.",
+    description: "Resets the trust settings for your Zero Trust organization.\n\nDELETE /accounts/{account_id}/access/organizations/trust_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_trust_settings_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org_output,
-        "access_messages": access_messages_output,
-        "access_trust_settings_response": access_trust_settings_response_output,
-        "access_trusting_accounts": access_trusting_accounts_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_trust_settings_response": access_trust_settings_response,
+        "access_trusting_accounts": access_trusting_accounts,
       },
     },
     annotations: {
@@ -75,12 +76,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org_output,
-        "access_messages": access_messages_output,
-        "access_trust_settings_response": access_trust_settings_response_output,
-        "access_trusting_accounts": access_trusting_accounts_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_trust_settings_response": access_trust_settings_response,
+        "access_trusting_accounts": access_trusting_accounts,
       },
     },
     request: (args) => ({
@@ -88,32 +88,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_organization_trust_settings_get",
+    name: "zeroTrust_organization_trustSettings_get",
     title: "Get Zero Trust organization trust settings",
-    description: "Returns the trust settings for your Zero Trust organization.",
+    description: "Returns the trust settings for your Zero Trust organization.\n\nGET /accounts/{account_id}/access/organizations/trust_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
-      $defs: {
-        "access_identifier": access_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_trust_settings_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org_output,
-        "access_messages": access_messages_output,
-        "access_trust_settings_response": access_trust_settings_response_output,
-        "access_trusting_accounts": access_trusting_accounts_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_trust_settings_response": access_trust_settings_response,
+        "access_trusting_accounts": access_trusting_accounts,
       },
     },
     annotations: {
@@ -142,12 +148,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org_output,
-        "access_messages": access_messages_output,
-        "access_trust_settings_response": access_trust_settings_response_output,
-        "access_trusting_accounts": access_trusting_accounts_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_trust_settings_response": access_trust_settings_response,
+        "access_trusting_accounts": access_trusting_accounts,
       },
     },
     request: (args) => ({
@@ -155,21 +160,17 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_organization_trust_settings_replace",
+    name: "zeroTrust_organization_trustSettings_replace",
     title: "Replace Zero Trust organization trust settings",
-    description: "Replaces the trust settings for your Zero Trust organization.",
+    description: "Replaces the trust settings for your Zero Trust organization.\n\nPUT /accounts/{account_id}/access/organizations/trust_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "grant_trust_to_all_accounts_in_org": {
-              "$ref": "#/$defs/access_grant_trust_to_all_accounts_in_org",
-              "description": "Whether all accounts in the organization are trusted to use this account's cross-account Access resources."
+              "description": "Whether all accounts in the organization are trusted to use this account's cross-account Access resources.",
+              "type": "boolean"
             },
             "trusting_accounts": {
               "$ref": "#/$defs/access_trusting_accounts",
@@ -180,26 +181,37 @@ export const tools: readonly Tool[] = [
             "grant_trust_to_all_accounts_in_org"
           ],
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org,
-        "access_identifier": access_identifier,
-        "access_trusting_accounts": access_trusting_accounts,
+        "access_trusting_accounts": access_trusting_accounts$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_trust_settings_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org_output,
-        "access_messages": access_messages_output,
-        "access_trust_settings_response": access_trust_settings_response_output,
-        "access_trusting_accounts": access_trusting_accounts_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_trust_settings_response": access_trust_settings_response,
+        "access_trusting_accounts": access_trusting_accounts,
       },
     },
     annotations: {
@@ -226,12 +238,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org_output,
-        "access_messages": access_messages_output,
-        "access_trust_settings_response": access_trust_settings_response_output,
-        "access_trusting_accounts": access_trusting_accounts_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_trust_settings_response": access_trust_settings_response,
+        "access_trusting_accounts": access_trusting_accounts,
       },
     },
     request: (args) => ({
@@ -240,21 +251,17 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_organization_trust_settings_update",
+    name: "zeroTrust_organization_trustSettings_update",
     title: "Update Zero Trust organization trust settings",
-    description: "Updates the trust settings for your Zero Trust organization.",
+    description: "Updates the trust settings for your Zero Trust organization.\n\nPATCH /accounts/{account_id}/access/organizations/trust_settings",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
         "body": {
           "properties": {
             "grant_trust_to_all_accounts_in_org": {
-              "$ref": "#/$defs/access_grant_trust_to_all_accounts_in_org",
-              "description": "Whether all accounts in the organization are trusted to use this account's cross-account Access resources."
+              "description": "Whether all accounts in the organization are trusted to use this account's cross-account Access resources.",
+              "type": "boolean"
             },
             "trusting_accounts": {
               "$ref": "#/$defs/access_trusting_accounts",
@@ -262,26 +269,37 @@ export const tools: readonly Tool[] = [
             }
           },
           "type": "object"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org,
-        "access_identifier": access_identifier,
-        "access_trusting_accounts": access_trusting_accounts,
+        "access_trusting_accounts": access_trusting_accounts$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_trust_settings_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org_output,
-        "access_messages": access_messages_output,
-        "access_trust_settings_response": access_trust_settings_response_output,
-        "access_trusting_accounts": access_trusting_accounts_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_trust_settings_response": access_trust_settings_response,
+        "access_trusting_accounts": access_trusting_accounts,
       },
     },
     annotations: {
@@ -308,12 +326,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_grant_trust_to_all_accounts_in_org": access_grant_trust_to_all_accounts_in_org_output,
-        "access_messages": access_messages_output,
-        "access_trust_settings_response": access_trust_settings_response_output,
-        "access_trusting_accounts": access_trusting_accounts_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_messages": access_messages,
+        "access_trust_settings_response": access_trust_settings_response,
+        "access_trusting_accounts": access_trusting_accounts,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/outputs.ts b/src/generated/forge-mcp/zeroTrust/outputs.ts
index 00c9b7753..3121497bb 100644
--- a/src/generated/forge-mcp/zeroTrust/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../_/tool.js";
 /**
  * The schema of `access_api-response-collection` in responses.
  */
-export const access_api_response_collection_output: JsonSchema = {
+export const access_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-common"
@@ -42,7 +42,7 @@ export const access_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `access_api-response-common` in responses.
  */
-export const access_api_response_common_output: JsonSchema = {
+export const access_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/access_messages"
@@ -68,7 +68,7 @@ export const access_api_response_common_output: JsonSchema = {
 /**
  * The schema of `access_api-response-common-failure` in responses.
  */
-export const access_api_response_common_failure_output: JsonSchema = {
+export const access_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/access_messages"
@@ -98,7 +98,7 @@ export const access_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `access_api-response-single` in responses.
  */
-export const access_api_response_single_output: JsonSchema = {
+export const access_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/access_messages"
@@ -121,45 +121,10 @@ export const access_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_client_id` in responses.
- */
-export const access_client_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_created_at` in responses.
- */
-export const access_created_at_output: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/access_timestamp"
-    }
-  ]
-};
-
-/**
- * The schema of `access_duration` in responses.
- */
-export const access_duration_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_enabled` in responses.
- */
-export const access_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_id_response` in responses.
  */
-export const access_id_response_output: JsonSchema = {
+export const access_id_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -169,7 +134,7 @@ export const access_id_response_output: JsonSchema = {
         "result": {
           "properties": {
             "id": {
-              "$ref": "#/$defs/access_uuid"
+              "type": "string"
             }
           },
           "type": "object"
@@ -180,39 +145,10 @@ export const access_id_response_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_identifier` in responses.
- */
-export const access_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_leak_report_url` in responses.
- */
-export const access_leak_report_url_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `access_leak_reported_at` in responses.
- */
-export const access_leak_reported_at_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `access_leak_reporter` in responses.
- */
-export const access_leak_reporter_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_messages` in responses.
  */
-export const access_messages_output: JsonSchema = {
+export const access_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -242,32 +178,34 @@ export const access_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `access_name-2` in responses.
- */
-export const access_name_2_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_service-tokens` in responses.
  */
-export const access_service_tokens_output: JsonSchema = {
+export const access_service$$tokens: JsonSchema = {
   "properties": {
     "client_id": {
-      "$ref": "#/$defs/access_client_id"
+      "type": "string"
     },
     "created_at": {
-      "$ref": "#/$defs/access_created_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     },
     "duration": {
-      "$ref": "#/$defs/access_duration"
+      "type": "string"
     },
     "enabled": {
-      "$ref": "#/$defs/access_enabled"
+      "type": "boolean"
     },
     "expires_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "id": {
       "allOf": [
@@ -275,7 +213,7 @@ export const access_service_tokens_output: JsonSchema = {
           "type": "string"
         },
         {
-          "$ref": "#/$defs/access_uuid"
+          "type": "string"
         }
       ]
     },
@@ -285,27 +223,37 @@ export const access_service_tokens_output: JsonSchema = {
           "type": "string"
         },
         {
-          "$ref": "#/$defs/access_timestamp"
+          "format": "date-time",
+          "type": "string"
         }
       ]
     },
     "leak_report_url": {
-      "$ref": "#/$defs/access_leak_report_url"
+      "type": "string"
     },
     "leak_reported_at": {
-      "$ref": "#/$defs/access_leak_reported_at"
+      "format": "date-time",
+      "type": "string"
     },
     "leak_reporter": {
-      "$ref": "#/$defs/access_leak_reporter"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/access_name-2"
+      "type": "string"
     },
     "tags": {
       "$ref": "#/$defs/access_tags"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_updated_at"
+      "allOf": [
+        {
+          "type": "string"
+        },
+        {
+          "format": "date-time",
+          "type": "string"
+        }
+      ]
     }
   },
   "type": "object"
@@ -314,7 +262,7 @@ export const access_service_tokens_output: JsonSchema = {
 /**
  * The schema of `access_single_response-2` in responses.
  */
-export const access_single_response_2_output: JsonSchema = {
+export const access_single_response$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
@@ -333,7 +281,7 @@ export const access_single_response_2_output: JsonSchema = {
 /**
  * The schema of `access_tags` in responses.
  */
-export const access_tags_output: JsonSchema = {
+export const access_tags: JsonSchema = {
   "oneOf": [
     {
       "additionalProperties": {
@@ -347,39 +295,10 @@ export const access_tags_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_timestamp` in responses.
- */
-export const access_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `access_updated_at` in responses.
- */
-export const access_updated_at_output: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/access_timestamp"
-    }
-  ]
-};
-
-/**
- * The schema of `access_uuid` in responses.
- */
-export const access_uuid_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_Empty` in responses.
  */
-export const dlp_Empty_output: JsonSchema = {
+export const dlp_Empty: JsonSchema = {
   "oneOf": [
     {
       "type": "object"
@@ -393,7 +312,7 @@ export const dlp_Empty_output: JsonSchema = {
 /**
  * The schema of `dlp_api-response-common-failure` in responses.
  */
-export const dlp_api_response_common_failure_output: JsonSchema = {
+export const dlp_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dlp_messages"
@@ -423,7 +342,7 @@ export const dlp_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `dlp_api-response-single` in responses.
  */
-export const dlp_api_response_single_output: JsonSchema = {
+export const dlp_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dlp_messages"
@@ -449,7 +368,7 @@ export const dlp_api_response_single_output: JsonSchema = {
 /**
  * The schema of `dlp_messages` in responses.
  */
-export const dlp_messages_output: JsonSchema = {
+export const dlp_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -482,7 +401,7 @@ export const dlp_messages_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_api-response-common-failure` in responses.
  */
-export const zero_trust_gateway_api_response_common_failure_output: JsonSchema = {
+export const zero$$trust$$gateway_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zero-trust-gateway_messages"
@@ -512,7 +431,7 @@ export const zero_trust_gateway_api_response_common_failure_output: JsonSchema =
 /**
  * The schema of `zero-trust-gateway_api-response-single` in responses.
  */
-export const zero_trust_gateway_api_response_single_output: JsonSchema = {
+export const zero$$trust$$gateway_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zero-trust-gateway_messages"
@@ -538,7 +457,7 @@ export const zero_trust_gateway_api_response_single_output: JsonSchema = {
 /**
  * The schema of `zero-trust-gateway_messages` in responses.
  */
-export const zero_trust_gateway_messages_output: JsonSchema = {
+export const zero$$trust$$gateway_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -556,11 +475,3 @@ export const zero_trust_gateway_messages_output: JsonSchema = {
   },
   "type": "array"
 };
-
-/**
- * The schema of `zero-trust-gateway_read_only_timestamp` in responses.
- */
-export const zero_trust_gateway_read_only_timestamp_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/outputs.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/outputs.ts
index 56757b4cd..40a1bbd6c 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_Behavior` in responses.
  */
-export const dlp_Behavior_output: JsonSchema = {
+export const dlp_Behavior: JsonSchema = {
   "properties": {
     "description": {
       "type": "string"
@@ -18,7 +18,12 @@ export const dlp_Behavior_output: JsonSchema = {
       "type": "string"
     },
     "risk_level": {
-      "$ref": "#/$defs/dlp_RiskLevel"
+      "enum": [
+        "low",
+        "medium",
+        "high"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -33,7 +38,7 @@ export const dlp_Behavior_output: JsonSchema = {
 /**
  * The schema of `dlp_Behaviors` in responses.
  */
-export const dlp_Behaviors_output: JsonSchema = {
+export const dlp_Behaviors: JsonSchema = {
   "properties": {
     "behaviors": {
       "additionalProperties": {
@@ -51,13 +56,18 @@ export const dlp_Behaviors_output: JsonSchema = {
 /**
  * The schema of `dlp_UpdateBehavior` in responses.
  */
-export const dlp_UpdateBehavior_output: JsonSchema = {
+export const dlp_UpdateBehavior: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
     },
     "risk_level": {
-      "$ref": "#/$defs/dlp_RiskLevel"
+      "enum": [
+        "low",
+        "medium",
+        "high"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -70,7 +80,7 @@ export const dlp_UpdateBehavior_output: JsonSchema = {
 /**
  * The schema of `dlp_UpdateBehaviors` in responses.
  */
-export const dlp_UpdateBehaviors_output: JsonSchema = {
+export const dlp_UpdateBehaviors: JsonSchema = {
   "properties": {
     "behaviors": {
       "additionalProperties": {
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/schemas.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/schemas.ts
index 3e68ef65b..235b42240 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/schemas.ts
@@ -12,7 +12,12 @@ export const dlp_UpdateBehavior: JsonSchema = {
       "type": "boolean"
     },
     "risk_level": {
-      "$ref": "#/$defs/dlp_RiskLevel"
+      "enum": [
+        "low",
+        "medium",
+        "high"
+      ],
+      "type": "string"
     }
   },
   "required": [
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/tools.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/tools.ts
index 5dec944f8..11e9aa8d7 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/behaviours/tools.ts
@@ -3,38 +3,49 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
-import { dlp_RiskLevel_output } from "../outputs.js";
-import { dlp_RiskLevel } from "../schemas.js";
 import {
-  dlp_Behavior_output,
-  dlp_Behaviors_output,
-  dlp_UpdateBehavior_output,
-  dlp_UpdateBehaviors_output,
+  dlp_Behavior,
+  dlp_Behaviors,
+  dlp_UpdateBehavior,
+  dlp_UpdateBehaviors,
 } from "./outputs.js";
-import { dlp_UpdateBehavior, dlp_UpdateBehaviors } from "./schemas.js";
+import {
+  dlp_UpdateBehavior as dlp_UpdateBehavior$,
+  dlp_UpdateBehaviors as dlp_UpdateBehaviors$,
+} from "./schemas.js";
 
 /**
- * The tools of `zero_trust.risk_scoring.behaviours`.
+ * The tools of `zeroTrust.riskScoring.behaviours`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_risk_scoring_behaviours_get",
+    name: "zeroTrust_riskScoring_behaviours_get",
     title: "Get all behaviors and associated configuration",
-    description: "Retrieves configured risk score behaviors that define how user actions affect their overall risk score.",
+    description: "Retrieves configured risk score behaviors that define how user actions affect their overall risk score.\n\nGET /accounts/{account_id}/zt_risk_scoring/behaviors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -51,11 +62,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Behavior": dlp_Behavior_output,
-        "dlp_Behaviors": dlp_Behaviors_output,
-        "dlp_RiskLevel": dlp_RiskLevel_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Behavior": dlp_Behavior,
+        "dlp_Behaviors": dlp_Behaviors,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -95,12 +105,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Behavior": dlp_Behavior_output,
-        "dlp_Behaviors": dlp_Behaviors_output,
-        "dlp_RiskLevel": dlp_RiskLevel_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Behavior": dlp_Behavior,
+        "dlp_Behaviors": dlp_Behaviors,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -108,29 +117,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_risk_scoring_behaviours_update",
+    name: "zeroTrust_riskScoring_behaviours_update",
     title: "Update configuration for risk behaviors",
-    description: "Updates risk score behavior configurations, defining weights and thresholds for risk calculation.",
+    description: "Updates risk score behavior configurations, defining weights and thresholds for risk calculation.\n\nPUT /accounts/{account_id}/zt_risk_scoring/behaviors",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Account ID.",
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_UpdateBehaviors",
           "description": "Behaviors."
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Account ID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "dlp_RiskLevel": dlp_RiskLevel,
-        "dlp_UpdateBehavior": dlp_UpdateBehavior,
-        "dlp_UpdateBehaviors": dlp_UpdateBehaviors,
+        "dlp_UpdateBehavior": dlp_UpdateBehavior$,
+        "dlp_UpdateBehaviors": dlp_UpdateBehaviors$,
       },
     },
     outputSchema: {
@@ -148,11 +166,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RiskLevel": dlp_RiskLevel_output,
-        "dlp_UpdateBehavior": dlp_UpdateBehavior_output,
-        "dlp_UpdateBehaviors": dlp_UpdateBehaviors_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_UpdateBehavior": dlp_UpdateBehavior,
+        "dlp_UpdateBehaviors": dlp_UpdateBehaviors,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -191,12 +208,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RiskLevel": dlp_RiskLevel_output,
-        "dlp_UpdateBehavior": dlp_UpdateBehavior_output,
-        "dlp_UpdateBehaviors": dlp_UpdateBehaviors_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_UpdateBehavior": dlp_UpdateBehavior,
+        "dlp_UpdateBehaviors": dlp_UpdateBehaviors,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/outputs.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/outputs.ts
index cb42da76b..e4d14d616 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_RiskScoreIntegration` in responses.
  */
-export const dlp_RiskScoreIntegration_output: JsonSchema = {
+export const dlp_RiskScoreIntegration: JsonSchema = {
   "properties": {
     "account_tag": {
       "type": "string"
@@ -23,7 +23,10 @@ export const dlp_RiskScoreIntegration_output: JsonSchema = {
       "type": "string"
     },
     "integration_type": {
-      "$ref": "#/$defs/dlp_RiskScoreIntegrationType"
+      "enum": [
+        "Okta"
+      ],
+      "type": "string"
     },
     "reference_id": {
       "type": "string"
@@ -51,19 +54,9 @@ export const dlp_RiskScoreIntegration_output: JsonSchema = {
 /**
  * The schema of `dlp_RiskScoreIntegrationArray` in responses.
  */
-export const dlp_RiskScoreIntegrationArray_output: JsonSchema = {
+export const dlp_RiskScoreIntegrationArray: JsonSchema = {
   "items": {
     "$ref": "#/$defs/dlp_RiskScoreIntegration"
   },
   "type": "array"
 };
-
-/**
- * The schema of `dlp_RiskScoreIntegrationType` in responses.
- */
-export const dlp_RiskScoreIntegrationType_output: JsonSchema = {
-  "enum": [
-    "Okta"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/references/tools.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/references/tools.ts
index de2a026fc..828f9e6e6 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/references/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/references/tools.ts
@@ -3,37 +3,44 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../../outputs.js";
-import {
-  dlp_RiskScoreIntegrationType_output,
-  dlp_RiskScoreIntegration_output,
-} from "../outputs.js";
+import { dlp_RiskScoreIntegration } from "../outputs.js";
 
 /**
- * The tools of `zero_trust.risk_scoring.integrations.references`.
+ * The tools of `zeroTrust.riskScoring.integrations.references`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_risk_scoring_integrations_references_get",
+    name: "zeroTrust_riskScoring_integrations_references_get",
     title: "Get risk score integration by reference id.",
-    description: "Retrieves a Zero Trust risk score integration using its external reference ID.",
+    description: "Retrieves a Zero Trust risk score integration using its external reference ID.\n\nGET /accounts/{account_id}/zt_risk_scoring/integrations/reference_id/{reference_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "reference_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "reference_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "reference_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "reference_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -50,10 +57,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -93,11 +99,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/schemas.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/schemas.ts
index 5389a6b55..f0674a658 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/schemas.ts
@@ -9,7 +9,10 @@ import type { JsonSchema } from "../../../_/tool.js";
 export const dlp_CreateIntegrationBody: JsonSchema = {
   "properties": {
     "integration_type": {
-      "$ref": "#/$defs/dlp_RiskScoreIntegrationType"
+      "enum": [
+        "Okta"
+      ],
+      "type": "string"
     },
     "reference_id": {
       "description": "A reference id that can be supplied by the client. Currently this should be set to the Access-Okta IDP ID (a UUIDv4).\nhttps://developers.cloudflare.com/api/operations/access-identity-providers-get-an-access-identity-provider",
@@ -34,16 +37,6 @@ export const dlp_CreateIntegrationBody: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_RiskScoreIntegrationType`.
- */
-export const dlp_RiskScoreIntegrationType: JsonSchema = {
-  "enum": [
-    "Okta"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_UpdateIntegrationBody`.
  */
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/tools.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/tools.ts
index eca05d0de..4e7c7a8e3 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/integrations/tools.ts
@@ -3,47 +3,54 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../../outputs.js";
 import {
-  dlp_RiskScoreIntegrationArray_output,
-  dlp_RiskScoreIntegrationType_output,
-  dlp_RiskScoreIntegration_output,
+  dlp_RiskScoreIntegration,
+  dlp_RiskScoreIntegrationArray,
 } from "./outputs.js";
 import {
   dlp_CreateIntegrationBody,
-  dlp_RiskScoreIntegrationType,
   dlp_UpdateIntegrationBody,
 } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.risk_scoring.integrations`.
+ * The tools of `zeroTrust.riskScoring.integrations`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_risk_scoring_integrations_create",
+    name: "zeroTrust_riskScoring_integrations_create",
     title: "Create new risk score integration.",
-    description: "Creates a new Zero Trust risk score integration, connecting external risk signals to Cloudflare's risk scoring system.",
+    description: "Creates a new Zero Trust risk score integration, connecting external risk signals to Cloudflare's risk scoring system.\n\nPOST /accounts/{account_id}/zt_risk_scoring/integrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_CreateIntegrationBody"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_CreateIntegrationBody": dlp_CreateIntegrationBody,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType,
       },
     },
     outputSchema: {
@@ -61,10 +68,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -103,11 +109,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -116,24 +121,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_risk_scoring_integrations_delete",
+    name: "zeroTrust_riskScoring_integrations_delete",
     title: "Delete a risk score integration.",
-    description: "Removes a Zero Trust risk score integration, disconnecting the external risk signal source.",
+    description: "Removes a Zero Trust risk score integration, disconnecting the external risk signal source.\n\nDELETE /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "integration_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "integration_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "integration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "integration_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -150,9 +165,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -191,10 +206,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -202,24 +217,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_risk_scoring_integrations_get",
+    name: "zeroTrust_riskScoring_integrations_get",
     title: "Get risk score integration by id.",
-    description: "Gets a Zero Trust risk score integration by ID.",
+    description: "Gets a Zero Trust risk score integration by ID.\n\nGET /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "integration_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "integration_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "integration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "integration_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -236,10 +261,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -279,11 +303,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -291,19 +314,29 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_risk_scoring_integrations_list",
+    name: "zeroTrust_riskScoring_integrations_list",
     title: "List all risk score integrations for the account.",
-    description: "Lists all configured Zero Trust risk score integrations for the account.",
+    description: "Lists all configured Zero Trust risk score integrations for the account.\n\nGET /accounts/{account_id}/zt_risk_scoring/integrations",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -320,11 +353,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationArray": dlp_RiskScoreIntegrationArray_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_RiskScoreIntegrationArray": dlp_RiskScoreIntegrationArray,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -364,12 +396,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationArray": dlp_RiskScoreIntegrationArray_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_RiskScoreIntegrationArray": dlp_RiskScoreIntegrationArray,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -377,28 +408,38 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_risk_scoring_integrations_update",
+    name: "zeroTrust_riskScoring_integrations_update",
     title: "Update a risk score integration.",
-    description: "Overwrite the reference_id, tenant_url, and active values with the ones provided.",
+    description: "Overwrite the reference_id, tenant_url, and active values with the ones provided.\n\nPUT /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
         "body": {
           "$ref": "#/$defs/dlp_UpdateIntegrationBody"
         },
-        "integration_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "integration_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "integration_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "integration_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
         "dlp_UpdateIntegrationBody": dlp_UpdateIntegrationBody,
       },
@@ -418,10 +459,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -460,11 +500,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration_output,
-        "dlp_RiskScoreIntegrationType": dlp_RiskScoreIntegrationType_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskScoreIntegration": dlp_RiskScoreIntegration,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/outputs.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/outputs.ts
index a6f865532..1f26098ec 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `dlp_RiskEvent` in responses.
  */
-export const dlp_RiskEvent_output: JsonSchema = {
+export const dlp_RiskEvent: JsonSchema = {
   "properties": {
     "event_details": {
       "type": "object"
@@ -18,7 +18,12 @@ export const dlp_RiskEvent_output: JsonSchema = {
       "type": "string"
     },
     "risk_level": {
-      "$ref": "#/$defs/dlp_RiskLevel"
+      "enum": [
+        "low",
+        "medium",
+        "high"
+      ],
+      "type": "string"
     },
     "timestamp": {
       "format": "date-time",
@@ -37,7 +42,7 @@ export const dlp_RiskEvent_output: JsonSchema = {
 /**
  * The schema of `dlp_RiskEvents` in responses.
  */
-export const dlp_RiskEvents_output: JsonSchema = {
+export const dlp_RiskEvents: JsonSchema = {
   "properties": {
     "email": {
       "type": "string"
@@ -63,7 +68,12 @@ export const dlp_RiskEvents_output: JsonSchema = {
       "type": "string"
     },
     "risk_level": {
-      "$ref": "#/$defs/dlp_RiskLevel"
+      "enum": [
+        "low",
+        "medium",
+        "high"
+      ],
+      "type": "string"
     }
   },
   "required": [
@@ -74,22 +84,10 @@ export const dlp_RiskEvents_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `dlp_RiskLevel` in responses.
- */
-export const dlp_RiskLevel_output: JsonSchema = {
-  "enum": [
-    "low",
-    "medium",
-    "high"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `dlp_api-response-collection` in responses.
  */
-export const dlp_api_response_collection_output: JsonSchema = {
+export const dlp_api$$response$$collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/dlp_api-response-common"
@@ -125,7 +123,7 @@ export const dlp_api_response_collection_output: JsonSchema = {
 /**
  * The schema of `dlp_api-response-common` in responses.
  */
-export const dlp_api_response_common_output: JsonSchema = {
+export const dlp_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/dlp_messages"
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/schemas.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/schemas.ts
deleted file mode 100644
index 29f5e0781..000000000
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/schemas.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `dlp_RiskLevel`.
- */
-export const dlp_RiskLevel: JsonSchema = {
-  "enum": [
-    "low",
-    "medium",
-    "high"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/summary/outputs.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/summary/outputs.ts
index 29ba7f645..9448104d1 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/summary/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/summary/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../../_/tool.js";
 /**
  * The schema of `dlp_RiskSummary` in responses.
  */
-export const dlp_RiskSummary_output: JsonSchema = {
+export const dlp_RiskSummary: JsonSchema = {
   "properties": {
     "users": {
       "items": {
@@ -24,7 +24,7 @@ export const dlp_RiskSummary_output: JsonSchema = {
 /**
  * The schema of `dlp_UserRiskInfo` in responses.
  */
-export const dlp_UserRiskInfo_output: JsonSchema = {
+export const dlp_UserRiskInfo: JsonSchema = {
   "properties": {
     "email": {
       "type": "string"
@@ -37,7 +37,12 @@ export const dlp_UserRiskInfo_output: JsonSchema = {
       "type": "string"
     },
     "max_risk_level": {
-      "$ref": "#/$defs/dlp_RiskLevel"
+      "enum": [
+        "low",
+        "medium",
+        "high"
+      ],
+      "type": "string"
     },
     "name": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/summary/tools.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/summary/tools.ts
index bcc9cf5bd..cce029a15 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/summary/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/summary/tools.ts
@@ -3,34 +3,43 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  dlp_api_response_common_failure_output,
-  dlp_messages_output,
+  dlp_api$$response$$common$$failure,
+  dlp_messages,
 } from "../../outputs.js";
 import {
-  dlp_RiskLevel_output,
-  dlp_api_response_collection_output,
-  dlp_api_response_common_output,
+  dlp_api$$response$$collection,
+  dlp_api$$response$$common,
 } from "../outputs.js";
-import { dlp_RiskSummary_output, dlp_UserRiskInfo_output } from "./outputs.js";
+import { dlp_RiskSummary, dlp_UserRiskInfo } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.risk_scoring.summary`.
+ * The tools of `zeroTrust.riskScoring.summary`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_risk_scoring_summary_get",
+    name: "zeroTrust_riskScoring_summary_get",
     title: "Get risk score info for all users in the account",
-    description: "Gets an aggregate summary of risk scores across the account, including distribution and trends.",
+    description: "Gets an aggregate summary of risk scores across the account, including distribution and trends.\n\nGET /accounts/{account_id}/zt_risk_scoring/summary",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -47,12 +56,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RiskLevel": dlp_RiskLevel_output,
-        "dlp_RiskSummary": dlp_RiskSummary_output,
-        "dlp_UserRiskInfo": dlp_UserRiskInfo_output,
-        "dlp_api-response-collection": dlp_api_response_collection_output,
-        "dlp_api-response-common": dlp_api_response_common_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskSummary": dlp_RiskSummary,
+        "dlp_UserRiskInfo": dlp_UserRiskInfo,
+        "dlp_api-response-collection": dlp_api$$response$$collection,
+        "dlp_api-response-common": dlp_api$$response$$common,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -91,13 +99,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RiskLevel": dlp_RiskLevel_output,
-        "dlp_RiskSummary": dlp_RiskSummary_output,
-        "dlp_UserRiskInfo": dlp_UserRiskInfo_output,
-        "dlp_api-response-collection": dlp_api_response_collection_output,
-        "dlp_api-response-common": dlp_api_response_common_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskSummary": dlp_RiskSummary,
+        "dlp_UserRiskInfo": dlp_UserRiskInfo,
+        "dlp_api-response-collection": dlp_api$$response$$collection,
+        "dlp_api-response-common": dlp_api$$response$$common,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/riskScoring/tools.ts b/src/generated/forge-mcp/zeroTrust/riskScoring/tools.ts
index a15228bd8..5334b161b 100644
--- a/src/generated/forge-mcp/zeroTrust/riskScoring/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/riskScoring/tools.ts
@@ -3,42 +3,51 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  dlp_Empty_output,
-  dlp_api_response_common_failure_output,
-  dlp_api_response_single_output,
-  dlp_messages_output,
+  dlp_Empty,
+  dlp_api$$response$$common$$failure,
+  dlp_api$$response$$single,
+  dlp_messages,
 } from "../outputs.js";
 import {
-  dlp_RiskEvent_output,
-  dlp_RiskEvents_output,
-  dlp_RiskLevel_output,
-  dlp_api_response_collection_output,
-  dlp_api_response_common_output,
+  dlp_RiskEvent,
+  dlp_RiskEvents,
+  dlp_api$$response$$collection,
+  dlp_api$$response$$common,
 } from "./outputs.js";
 
 /**
- * The tools of `zero_trust.risk_scoring`.
+ * The tools of `zeroTrust.riskScoring`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_risk_scoring_get",
+    name: "zeroTrust_riskScoring_get",
     title: "Get risk event/score information for a specific user",
-    description: "Retrieves the detailed risk score breakdown for a specific user, including contributing factors.",
+    description: "Retrieves the detailed risk score breakdown for a specific user, including contributing factors.\n\nGET /accounts/{account_id}/zt_risk_scoring/{user_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "user_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "user_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -55,12 +64,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_RiskEvent": dlp_RiskEvent_output,
-        "dlp_RiskEvents": dlp_RiskEvents_output,
-        "dlp_RiskLevel": dlp_RiskLevel_output,
-        "dlp_api-response-collection": dlp_api_response_collection_output,
-        "dlp_api-response-common": dlp_api_response_common_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskEvent": dlp_RiskEvent,
+        "dlp_RiskEvents": dlp_RiskEvents,
+        "dlp_api-response-collection": dlp_api$$response$$collection,
+        "dlp_api-response-common": dlp_api$$response$$common,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -99,13 +107,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_RiskEvent": dlp_RiskEvent_output,
-        "dlp_RiskEvents": dlp_RiskEvents_output,
-        "dlp_RiskLevel": dlp_RiskLevel_output,
-        "dlp_api-response-collection": dlp_api_response_collection_output,
-        "dlp_api-response-common": dlp_api_response_common_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_RiskEvent": dlp_RiskEvent,
+        "dlp_RiskEvents": dlp_RiskEvents,
+        "dlp_api-response-collection": dlp_api$$response$$collection,
+        "dlp_api-response-common": dlp_api$$response$$common,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
@@ -113,24 +120,34 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zero_trust_risk_scoring_reset",
+    name: "zeroTrust_riskScoring_reset",
     title: "Clear the risk score for a particular user",
-    description: "Resets risk scores for specified users, clearing their accumulated risk history.\n\nConfirm with the user before calling this tool. This operation wipes risk-scoring history.",
+    description: "Resets risk scores for specified users, clearing their accumulated risk history.\n\nConfirm with the user before calling this tool. This operation wipes risk-scoring history.\n\nPOST /accounts/{account_id}/zt_risk_scoring/{user_id}/reset",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "type": "string"
-        },
-        "user_id": {
-          "format": "uuid",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "type": "string"
+            },
+            "user_id": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id"
+        "path"
       ],
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -147,9 +164,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     annotations: {
@@ -188,10 +205,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "dlp_Empty": dlp_Empty_output,
-        "dlp_api-response-common-failure": dlp_api_response_common_failure_output,
-        "dlp_api-response-single": dlp_api_response_single_output,
-        "dlp_messages": dlp_messages_output,
+        "dlp_Empty": dlp_Empty,
+        "dlp_api-response-common-failure": dlp_api$$response$$common$$failure,
+        "dlp_api-response-single": dlp_api$$response$$single,
+        "dlp_messages": dlp_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/schemas.ts b/src/generated/forge-mcp/zeroTrust/schemas.ts
index 9b48459e1..f1a73072b 100644
--- a/src/generated/forge-mcp/zeroTrust/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/schemas.ts
@@ -3,52 +3,6 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `access_created_at`.
- */
-export const access_created_at: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/access_timestamp"
-    }
-  ]
-};
-
-/**
- * The schema of `access_duration`.
- */
-export const access_duration: JsonSchema = {
-  "description": "The duration for how long the service token will be valid. Must be in the format `300ms` or `2h45m`, or the special value `forever` for non-expiring tokens. Valid time units are: ns, us (or µs), ms, s, m, h. The default is 1 year in hours (8760h).",
-  "type": "string"
-};
-
-/**
- * The schema of `access_enabled`.
- */
-export const access_enabled: JsonSchema = {
-  "description": "Whether the service token is enabled. A disabled service token cannot be used to authenticate; both its current and previous `client_secret` stop being accepted, but the token itself is preserved and can be re-enabled. A service token reported as leaked is disabled automatically and cannot be re-enabled until its secret is rotated; attempting to do so returns a 409. Defaults to enabled when omitted on create.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_identifier`.
- */
-export const access_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
-
-/**
- * The schema of `access_name-2`.
- */
-export const access_name_2: JsonSchema = {
-  "description": "The name of the service token.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_tags`.
  */
@@ -66,41 +20,3 @@ export const access_tags: JsonSchema = {
     }
   ]
 };
-
-/**
- * The schema of `access_timestamp`.
- */
-export const access_timestamp: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `access_updated_at`.
- */
-export const access_updated_at: JsonSchema = {
-  "allOf": [
-    {
-      "type": "string"
-    },
-    {
-      "$ref": "#/$defs/access_timestamp"
-    }
-  ]
-};
-
-/**
- * The schema of `access_uuid`.
- */
-export const access_uuid: JsonSchema = {
-  "description": "UUID.",
-  "type": "string"
-};
-
-/**
- * The schema of `zero-trust-gateway_identifier-2`.
- */
-export const zero_trust_gateway_identifier_2: JsonSchema = {
-  "description": "Specify the Cloudflare account identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zeroTrust/seats/outputs.ts b/src/generated/forge-mcp/zeroTrust/seats/outputs.ts
index 29b0298d0..80b34ebf1 100644
--- a/src/generated/forge-mcp/zeroTrust/seats/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/seats/outputs.ts
@@ -3,24 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `access_access_seat` in responses.
- */
-export const access_access_seat_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_gateway_seat` in responses.
- */
-export const access_gateway_seat_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `access_response_collection-14` in responses.
  */
-export const access_response_collection_14_output: JsonSchema = {
+export const access_response_collection$$14: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-collection"
@@ -39,32 +25,27 @@ export const access_response_collection_14_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `access_seat_uid` in responses.
- */
-export const access_seat_uid_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `access_seats` in responses.
  */
-export const access_seats_output: JsonSchema = {
+export const access_seats: JsonSchema = {
   "properties": {
     "access_seat": {
-      "$ref": "#/$defs/access_access_seat"
+      "type": "boolean"
     },
     "created_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     },
     "gateway_seat": {
-      "$ref": "#/$defs/access_gateway_seat"
+      "type": "boolean"
     },
     "seat_uid": {
-      "$ref": "#/$defs/access_seat_uid"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/access_timestamp"
+      "format": "date-time",
+      "type": "string"
     }
   },
   "type": "object"
diff --git a/src/generated/forge-mcp/zeroTrust/seats/schemas.ts b/src/generated/forge-mcp/zeroTrust/seats/schemas.ts
index daefb88d6..da018d8d3 100644
--- a/src/generated/forge-mcp/zeroTrust/seats/schemas.ts
+++ b/src/generated/forge-mcp/zeroTrust/seats/schemas.ts
@@ -3,52 +3,22 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `access_access_seat`.
- */
-export const access_access_seat: JsonSchema = {
-  "description": "True if the seat is part of Access.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_gateway_seat`.
- */
-export const access_gateway_seat: JsonSchema = {
-  "description": "True if the seat is part of Gateway.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `access_identifier-2`.
- */
-export const access_identifier_2: JsonSchema = {
-  "allOf": [
-    {
-      "$ref": "#/$defs/access_identifier"
-    },
-    {
-      "type": "string"
-    }
-  ]
-};
-
 /**
  * The schema of `access_seat`.
  */
 export const access_seat: JsonSchema = {
   "properties": {
     "access_seat": {
-      "$ref": "#/$defs/access_access_seat",
-      "description": "True if the seat is part of Access."
+      "description": "True if the seat is part of Access.",
+      "type": "boolean"
     },
     "gateway_seat": {
-      "$ref": "#/$defs/access_gateway_seat",
-      "description": "True if the seat is part of Gateway."
+      "description": "True if the seat is part of Gateway.",
+      "type": "boolean"
     },
     "seat_uid": {
-      "$ref": "#/$defs/access_seat_uid",
-      "description": "The unique API identifier for the Zero Trust seat."
+      "description": "The unique API identifier for the Zero Trust seat.",
+      "type": "string"
     }
   },
   "required": [
@@ -59,14 +29,6 @@ export const access_seat: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `access_seat_uid`.
- */
-export const access_seat_uid: JsonSchema = {
-  "description": "The unique API identifier for the Zero Trust seat.",
-  "type": "string"
-};
-
 /**
  * The schema of `access_seats_definition`.
  */
diff --git a/src/generated/forge-mcp/zeroTrust/seats/tools.ts b/src/generated/forge-mcp/zeroTrust/seats/tools.ts
index d65e2b58b..d035c944e 100644
--- a/src/generated/forge-mcp/zeroTrust/seats/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/seats/tools.ts
@@ -3,73 +3,67 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  access_api_response_collection_output,
-  access_api_response_common_failure_output,
-  access_api_response_common_output,
-  access_messages_output,
-  access_timestamp_output,
+  access_api$$response$$collection,
+  access_api$$response$$common,
+  access_api$$response$$common$$failure,
+  access_messages,
 } from "../outputs.js";
-import { access_identifier } from "../schemas.js";
-import {
-  access_access_seat_output,
-  access_gateway_seat_output,
-  access_response_collection_14_output,
-  access_seat_uid_output,
-  access_seats_output,
-} from "./outputs.js";
-import {
-  access_access_seat,
-  access_gateway_seat,
-  access_identifier_2,
-  access_seat,
-  access_seat_uid,
-  access_seats_definition,
-} from "./schemas.js";
+import { access_response_collection$$14, access_seats } from "./outputs.js";
+import { access_seat, access_seats_definition } from "./schemas.js";
 
 /**
- * The tools of `zero_trust.seats`.
+ * The tools of `zeroTrust.seats`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_seats_edit",
+    name: "zeroTrust_seats_edit",
     title: "Update a user seat",
-    description: "Removes a user from a Zero Trust seat when both `access_seat` and `gateway_seat` are set to false.",
+    description: "Removes a user from a Zero Trust seat when both `access_seat` and `gateway_seat` are set to false.\n\nPATCH /accounts/{account_id}/access/seats",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier-2"
-        },
         "body": {
           "$ref": "#/$defs/access_seats_definition"
+        },
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "allOf": [
+                {
+                  "description": "Identifier.",
+                  "type": "string"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "required": [
+            "account_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "access_access_seat": access_access_seat,
-        "access_gateway_seat": access_gateway_seat,
-        "access_identifier": access_identifier,
-        "access_identifier-2": access_identifier_2,
         "access_seat": access_seat,
-        "access_seat_uid": access_seat_uid,
         "access_seats_definition": access_seats_definition,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/access_response_collection-14",
       $defs: {
-        "access_access_seat": access_access_seat_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_gateway_seat": access_gateway_seat_output,
-        "access_messages": access_messages_output,
-        "access_response_collection-14": access_response_collection_14_output,
-        "access_seat_uid": access_seat_uid_output,
-        "access_seats": access_seats_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_messages": access_messages,
+        "access_response_collection-14": access_response_collection$$14,
+        "access_seats": access_seats,
       },
     },
     annotations: {
@@ -96,16 +90,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_access_seat": access_access_seat_output,
-        "access_api-response-collection": access_api_response_collection_output,
-        "access_api-response-common": access_api_response_common_output,
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_gateway_seat": access_gateway_seat_output,
-        "access_messages": access_messages_output,
-        "access_response_collection-14": access_response_collection_14_output,
-        "access_seat_uid": access_seat_uid_output,
-        "access_seats": access_seats_output,
-        "access_timestamp": access_timestamp_output,
+        "access_api-response-collection": access_api$$response$$collection,
+        "access_api-response-common": access_api$$response$$common,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_messages": access_messages,
+        "access_response_collection-14": access_response_collection$$14,
+        "access_seats": access_seats,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/users/mfa/authenticators/tools.ts b/src/generated/forge-mcp/zeroTrust/users/mfa/authenticators/tools.ts
index 69f0de3ff..98e182a7f 100644
--- a/src/generated/forge-mcp/zeroTrust/users/mfa/authenticators/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/users/mfa/authenticators/tools.ts
@@ -3,55 +3,58 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../../outputs.js";
-import { access_identifier, access_uuid } from "../../../schemas.js";
-import { access_delete_authenticator_response_output } from "../../outputs.js";
-import { access_authenticator_id } from "../../schemas.js";
+import { access_delete_authenticator_response } from "../../outputs.js";
 
 /**
- * The tools of `zero_trust.users.mfa.authenticators`.
+ * The tools of `zeroTrust.users.mfa.authenticators`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_users_mfa_authenticators_delete",
+    name: "zeroTrust_users_mfa_authenticators_delete",
     title: "Delete a user's authenticator",
-    description: "Deletes a specific MFA device or passkey, including a PIV key or FIDO2 key enrollment, for a user. Admin deletion remains available when MFA is disabled. Successful deletion revokes the enrollment and returns a null result.",
+    description: "Deletes a specific MFA device or passkey, including a PIV key or FIDO2 key enrollment, for a user. Admin deletion remains available when MFA is disabled. Successful deletion revokes the enrollment and returns a null result.\n\nDELETE /accounts/{account_id}/access/users/{user_id}/mfa_authenticators/{authenticator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "authenticator_id": {
-          "$ref": "#/$defs/access_authenticator_id",
-          "description": "The unique identifier for the MFA device."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "authenticator_id": {
+              "description": "The unique identifier for the MFA device.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id",
+            "authenticator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id",
-        "authenticator_id"
+        "path"
       ],
-      $defs: {
-        "access_authenticator_id": access_authenticator_id,
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_delete_authenticator_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_delete_authenticator_response": access_delete_authenticator_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_delete_authenticator_response": access_delete_authenticator_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -76,10 +79,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_delete_authenticator_response": access_delete_authenticator_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_delete_authenticator_response": access_delete_authenticator_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/users/outputs.ts b/src/generated/forge-mcp/zeroTrust/users/outputs.ts
index e701c2dbf..1177ce084 100644
--- a/src/generated/forge-mcp/zeroTrust/users/outputs.ts
+++ b/src/generated/forge-mcp/zeroTrust/users/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `access_delete_authenticator_response` in responses.
  */
-export const access_delete_authenticator_response_output: JsonSchema = {
+export const access_delete_authenticator_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/access_api-response-single"
diff --git a/src/generated/forge-mcp/zeroTrust/users/passkeys/tools.ts b/src/generated/forge-mcp/zeroTrust/users/passkeys/tools.ts
index 710245a56..609989217 100644
--- a/src/generated/forge-mcp/zeroTrust/users/passkeys/tools.ts
+++ b/src/generated/forge-mcp/zeroTrust/users/passkeys/tools.ts
@@ -3,55 +3,58 @@
 
 import { type Tool, pathParam } from "../../../_/tool.js";
 import {
-  access_api_response_common_failure_output,
-  access_api_response_single_output,
-  access_messages_output,
+  access_api$$response$$common$$failure,
+  access_api$$response$$single,
+  access_messages,
 } from "../../outputs.js";
-import { access_identifier, access_uuid } from "../../schemas.js";
-import { access_delete_authenticator_response_output } from "../outputs.js";
-import { access_authenticator_id } from "../schemas.js";
+import { access_delete_authenticator_response } from "../outputs.js";
 
 /**
- * The tools of `zero_trust.users.passkeys`.
+ * The tools of `zeroTrust.users.passkeys`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zero_trust_users_passkeys_delete",
+    name: "zeroTrust_users_passkeys_delete",
     title: "Delete a user's passkey",
-    description: "Alias of the authenticator deletion endpoint for passkey management. The identifier is the passkey's authenticator ID from the last-seen identity response. Successful deletion revokes the enrollment and returns a null result.",
+    description: "Alias of the authenticator deletion endpoint for passkey management. The identifier is the passkey's authenticator ID from the last-seen identity response. Successful deletion revokes the enrollment and returns a null result.\n\nDELETE /accounts/{account_id}/access/users/{user_id}/passkeys/{authenticator_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "$ref": "#/$defs/access_identifier",
-          "description": "Identifier."
-        },
-        "authenticator_id": {
-          "$ref": "#/$defs/access_authenticator_id",
-          "description": "The unique identifier for the MFA device."
-        },
-        "user_id": {
-          "$ref": "#/$defs/access_uuid",
-          "description": "UUID."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "account_id": {
+              "description": "Identifier.",
+              "type": "string"
+            },
+            "authenticator_id": {
+              "description": "The unique identifier for the MFA device.",
+              "type": "string"
+            },
+            "user_id": {
+              "description": "UUID.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "account_id",
+            "user_id",
+            "authenticator_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "account_id",
-        "user_id",
-        "authenticator_id"
+        "path"
       ],
-      $defs: {
-        "access_authenticator_id": access_authenticator_id,
-        "access_identifier": access_identifier,
-        "access_uuid": access_uuid,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/access_delete_authenticator_response",
       $defs: {
-        "access_api-response-single": access_api_response_single_output,
-        "access_delete_authenticator_response": access_delete_authenticator_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-single": access_api$$response$$single,
+        "access_delete_authenticator_response": access_delete_authenticator_response,
+        "access_messages": access_messages,
       },
     },
     annotations: {
@@ -76,10 +79,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "access_api-response-common-failure": access_api_response_common_failure_output,
-        "access_api-response-single": access_api_response_single_output,
-        "access_delete_authenticator_response": access_delete_authenticator_response_output,
-        "access_messages": access_messages_output,
+        "access_api-response-common-failure": access_api$$response$$common$$failure,
+        "access_api-response-single": access_api$$response$$single,
+        "access_delete_authenticator_response": access_delete_authenticator_response,
+        "access_messages": access_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zeroTrust/users/schemas.ts b/src/generated/forge-mcp/zeroTrust/users/schemas.ts
deleted file mode 100644
index 1a5d52f95..000000000
--- a/src/generated/forge-mcp/zeroTrust/users/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `access_authenticator_id`.
- */
-export const access_authenticator_id: JsonSchema = {
-  "description": "The unique identifier for the MFA device.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/activationCheck/outputs.ts b/src/generated/forge-mcp/zones/activationCheck/outputs.ts
index 069950af5..899ba3149 100644
--- a/src/generated/forge-mcp/zones/activationCheck/outputs.ts
+++ b/src/generated/forge-mcp/zones/activationCheck/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `zone-activation_api-response-common-failure` in responses.
  */
-export const zone_activation_api_response_common_failure_output: JsonSchema = {
+export const zone$$activation_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zone-activation_messages"
@@ -36,7 +36,7 @@ export const zone_activation_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `zone-activation_api-response-single` in responses.
  */
-export const zone_activation_api_response_single_output: JsonSchema = {
+export const zone$$activation_api$$response$$single: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zone-activation_messages"
@@ -59,17 +59,10 @@ export const zone_activation_api_response_single_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zone-activation_identifier` in responses.
- */
-export const zone_activation_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zone-activation_messages` in responses.
  */
-export const zone_activation_messages_output: JsonSchema = {
+export const zone$$activation_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
diff --git a/src/generated/forge-mcp/zones/activationCheck/schemas.ts b/src/generated/forge-mcp/zones/activationCheck/schemas.ts
deleted file mode 100644
index b7a7195d4..000000000
--- a/src/generated/forge-mcp/zones/activationCheck/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `zone-activation_identifier`.
- */
-export const zone_activation_identifier: JsonSchema = {
-  "description": "Identifier.",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/activationCheck/tools.ts b/src/generated/forge-mcp/zones/activationCheck/tools.ts
index 743426fbf..6a8dfa7c5 100644
--- a/src/generated/forge-mcp/zones/activationCheck/tools.ts
+++ b/src/generated/forge-mcp/zones/activationCheck/tools.ts
@@ -3,35 +3,40 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  zone_activation_api_response_common_failure_output,
-  zone_activation_api_response_single_output,
-  zone_activation_identifier_output,
-  zone_activation_messages_output,
+  zone$$activation_api$$response$$common$$failure,
+  zone$$activation_api$$response$$single,
+  zone$$activation_messages,
 } from "./outputs.js";
-import { zone_activation_identifier } from "./schemas.js";
 
 /**
- * The tools of `zones.activation_check`.
+ * The tools of `zones.activationCheck`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_activation_check_activate",
+    name: "zones_activationCheck_activate",
     title: "Rerun the Activation Check",
-    description: "Triggeres a new activation check for a PENDING Zone. This can be\ntriggered every 5 min for paygo/ent customers, every hour for FREE\nZones.",
+    description: "Triggeres a new activation check for a PENDING Zone. This can be\ntriggered every 5 min for paygo/ent customers, every hour for FREE\nZones.\n\nPUT /zones/{zone_id}/activation_check",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/zone-activation_identifier",
-          "description": "Zone ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zone-activation_identifier": zone_activation_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -43,7 +48,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/zone-activation_identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -53,9 +58,8 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zone-activation_api-response-single": zone_activation_api_response_single_output,
-        "zone-activation_identifier": zone_activation_identifier_output,
-        "zone-activation_messages": zone_activation_messages_output,
+        "zone-activation_api-response-single": zone$$activation_api$$response$$single,
+        "zone-activation_messages": zone$$activation_messages,
       },
     },
     annotations: {
@@ -84,7 +88,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "id": {
-                      "$ref": "#/$defs/zone-activation_identifier"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -99,10 +103,9 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zone-activation_api-response-common-failure": zone_activation_api_response_common_failure_output,
-        "zone-activation_api-response-single": zone_activation_api_response_single_output,
-        "zone-activation_identifier": zone_activation_identifier_output,
-        "zone-activation_messages": zone_activation_messages_output,
+        "zone-activation_api-response-common-failure": zone$$activation_api$$response$$common$$failure,
+        "zone-activation_api-response-single": zone$$activation_api$$response$$single,
+        "zone-activation_messages": zone$$activation_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/aegis/outputs.ts b/src/generated/forge-mcp/zones/aegis/outputs.ts
index 516247d55..fe4e9947e 100644
--- a/src/generated/forge-mcp/zones/aegis/outputs.ts
+++ b/src/generated/forge-mcp/zones/aegis/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_aegis` in responses.
  */
-export const cache_settings_aegis_output: JsonSchema = {
+export const cache$$settings_aegis: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -31,7 +31,7 @@ export const cache_settings_aegis_output: JsonSchema = {
 /**
  * The schema of `cache-settings_aegis_response_value` in responses.
  */
-export const cache_settings_aegis_response_value_output: JsonSchema = {
+export const cache$$settings_aegis_response_value: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/cache-settings_aegis"
@@ -43,7 +43,7 @@ export const cache_settings_aegis_response_value_output: JsonSchema = {
 /**
  * The schema of `cache-settings_aegis_value` in responses.
  */
-export const cache_settings_aegis_value_output: JsonSchema = {
+export const cache$$settings_aegis_value: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
diff --git a/src/generated/forge-mcp/zones/aegis/schemas.ts b/src/generated/forge-mcp/zones/aegis/schemas.ts
index 52e0b9fd2..7c7615eba 100644
--- a/src/generated/forge-mcp/zones/aegis/schemas.ts
+++ b/src/generated/forge-mcp/zones/aegis/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_aegis_value`.
  */
-export const cache_settings_aegis_value: JsonSchema = {
+export const cache$$settings_aegis_value: JsonSchema = {
   "description": "Value of the zone setting.",
   "properties": {
     "enabled": {
diff --git a/src/generated/forge-mcp/zones/aegis/tools.ts b/src/generated/forge-mcp/zones/aegis/tools.ts
index 1ee24ae30..0c82549eb 100644
--- a/src/generated/forge-mcp/zones/aegis/tools.ts
+++ b/src/generated/forge-mcp/zones/aegis/tools.ts
@@ -3,26 +3,21 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_editable_output,
-  cache_settings_messages_output,
-  cache_settings_modified_on_output,
-  cache_settings_result_object_delete_output,
-  cache_settings_result_object_output,
-  cache_settings_setting_id_output,
-  cache_settings_setting_value_output,
-  cache_settings_zone_cache_settings_delete_response_single_output,
-  cache_settings_zone_cache_settings_response_single_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
+  cache$$settings_result$$object,
+  cache$$settings_result$$object$$delete,
+  cache$$settings_zone_cache_settings_delete_response_single,
+  cache$$settings_zone_cache_settings_response_single,
 } from "../../outputs.js";
-import { cache_settings_identifier } from "../../schemas.js";
 import {
-  cache_settings_aegis_output,
-  cache_settings_aegis_response_value_output,
-  cache_settings_aegis_value_output,
+  cache$$settings_aegis,
+  cache$$settings_aegis_response_value,
+  cache$$settings_aegis_value,
 } from "./outputs.js";
-import { cache_settings_aegis_value } from "./schemas.js";
+import { cache$$settings_aegis_value as cache$$settings_aegis_value$ } from "./schemas.js";
 
 /**
  * The tools of `zones.aegis`.
@@ -31,21 +26,28 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_aegis_delete",
     title: "Delete aegis setting",
-    description: "Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your account so that you can increase your origin security by only allowing traffic from a small list of IP addresses.",
+    description: "Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your account so that you can increase your origin security by only allowing traffic from a small list of IP addresses.\n\nDELETE /zones/{zone_id}/settings/aegis",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -57,17 +59,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_aegis": cache_settings_aegis_output,
-        "cache-settings_aegis_response_value": cache_settings_aegis_response_value_output,
-        "cache-settings_aegis_value": cache_settings_aegis_value_output,
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object-delete": cache_settings_result_object_delete_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_zone_cache_settings_delete_response_single": cache_settings_zone_cache_settings_delete_response_single_output,
+        "cache-settings_aegis": cache$$settings_aegis,
+        "cache-settings_aegis_response_value": cache$$settings_aegis_response_value,
+        "cache-settings_aegis_value": cache$$settings_aegis_value,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object-delete": cache$$settings_result$$object$$delete,
+        "cache-settings_zone_cache_settings_delete_response_single": cache$$settings_zone_cache_settings_delete_response_single,
       },
     },
     annotations: {
@@ -113,18 +112,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_aegis": cache_settings_aegis_output,
-        "cache-settings_aegis_response_value": cache_settings_aegis_response_value_output,
-        "cache-settings_aegis_value": cache_settings_aegis_value_output,
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object-delete": cache_settings_result_object_delete_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_zone_cache_settings_delete_response_single": cache_settings_zone_cache_settings_delete_response_single_output,
+        "cache-settings_aegis": cache$$settings_aegis,
+        "cache-settings_aegis_response_value": cache$$settings_aegis_response_value,
+        "cache-settings_aegis_value": cache$$settings_aegis_value,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object-delete": cache$$settings_result$$object$$delete,
+        "cache-settings_zone_cache_settings_delete_response_single": cache$$settings_zone_cache_settings_delete_response_single,
       },
     },
     request: (args) => ({
@@ -134,7 +130,7 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_aegis_edit",
     title: "Change aegis setting",
-    description: "Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your account so that you can increase your origin security by only allowing traffic from a small list of IP addresses.",
+    description: "Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your account so that you can increase your origin security by only allowing traffic from a small list of IP addresses.\n\nPATCH /zones/{zone_id}/settings/aegis",
     inputSchema: {
       type: "object",
       properties: {
@@ -150,18 +146,27 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_aegis_value": cache_settings_aegis_value,
-        "cache-settings_identifier": cache_settings_identifier,
+        "cache-settings_aegis_value": cache$$settings_aegis_value$,
       },
     },
     outputSchema: {
@@ -174,18 +179,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_aegis": cache_settings_aegis_output,
-        "cache-settings_aegis_response_value": cache_settings_aegis_response_value_output,
-        "cache-settings_aegis_value": cache_settings_aegis_value_output,
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_aegis": cache$$settings_aegis,
+        "cache-settings_aegis_response_value": cache$$settings_aegis_response_value,
+        "cache-settings_aegis_value": cache$$settings_aegis_value,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -231,19 +232,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_aegis": cache_settings_aegis_output,
-        "cache-settings_aegis_response_value": cache_settings_aegis_response_value_output,
-        "cache-settings_aegis_value": cache_settings_aegis_value_output,
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_aegis": cache$$settings_aegis,
+        "cache-settings_aegis_response_value": cache$$settings_aegis_response_value,
+        "cache-settings_aegis_value": cache$$settings_aegis_value,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -254,21 +251,28 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_aegis_get",
     title: "Get aegis setting",
-    description: "Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your account so that you can increase your origin security by only allowing traffic from a small list of IP addresses.",
+    description: "Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your account so that you can increase your origin security by only allowing traffic from a small list of IP addresses.\n\nGET /zones/{zone_id}/settings/aegis",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -280,18 +284,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_aegis": cache_settings_aegis_output,
-        "cache-settings_aegis_response_value": cache_settings_aegis_response_value_output,
-        "cache-settings_aegis_value": cache_settings_aegis_value_output,
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_aegis": cache$$settings_aegis,
+        "cache-settings_aegis_response_value": cache$$settings_aegis_response_value,
+        "cache-settings_aegis_value": cache$$settings_aegis_value,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -339,19 +339,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_aegis": cache_settings_aegis_output,
-        "cache-settings_aegis_response_value": cache_settings_aegis_response_value_output,
-        "cache-settings_aegis_value": cache_settings_aegis_value_output,
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_aegis": cache$$settings_aegis,
+        "cache-settings_aegis_response_value": cache$$settings_aegis_response_value,
+        "cache-settings_aegis_value": cache$$settings_aegis_value,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/automaticPlatformOptimization/outputs.ts b/src/generated/forge-mcp/zones/automaticPlatformOptimization/outputs.ts
index a61a12878..292b4ec29 100644
--- a/src/generated/forge-mcp/zones/automaticPlatformOptimization/outputs.ts
+++ b/src/generated/forge-mcp/zones/automaticPlatformOptimization/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_automatic_platform_optimization_response` in responses.
  */
-export const speed_automatic_platform_optimization_response_output: JsonSchema = {
+export const speed_automatic_platform_optimization_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -31,7 +31,7 @@ export const speed_automatic_platform_optimization_response_output: JsonSchema =
 /**
  * The schema of `speed_automatic_platform_optimization_value` in responses.
  */
-export const speed_automatic_platform_optimization_value_output: JsonSchema = {
+export const speed_automatic_platform_optimization_value: JsonSchema = {
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/zones/automaticPlatformOptimization/schemas.ts b/src/generated/forge-mcp/zones/automaticPlatformOptimization/schemas.ts
index d3b1d7a28..11aede4ce 100644
--- a/src/generated/forge-mcp/zones/automaticPlatformOptimization/schemas.ts
+++ b/src/generated/forge-mcp/zones/automaticPlatformOptimization/schemas.ts
@@ -7,7 +7,7 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `speed_automatic_platform_optimization_value`.
  */
 export const speed_automatic_platform_optimization_value: JsonSchema = {
-  "description": "Configuration for Automatic Platform Optimization (APO) for WordPress.\nSet to \"off\" to disable, or provide an object to configure APO settings.\n",
+  "description": "Configuration for Automatic Platform Optimization (APO) for WordPress.\nSet to \"off\" to disable, or provide an object to configure APO settings.",
   "oneOf": [
     {
       "properties": {
diff --git a/src/generated/forge-mcp/zones/automaticPlatformOptimization/tools.ts b/src/generated/forge-mcp/zones/automaticPlatformOptimization/tools.ts
index 5d2c0ffdb..8c11f2e40 100644
--- a/src/generated/forge-mcp/zones/automaticPlatformOptimization/tools.ts
+++ b/src/generated/forge-mcp/zones/automaticPlatformOptimization/tools.ts
@@ -3,26 +3,25 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
 import {
-  speed_automatic_platform_optimization_response_output,
-  speed_automatic_platform_optimization_value_output,
+  speed_automatic_platform_optimization_response,
+  speed_automatic_platform_optimization_value,
 } from "./outputs.js";
-import { speed_automatic_platform_optimization_value } from "./schemas.js";
+import { speed_automatic_platform_optimization_value as speed_automatic_platform_optimization_value$ } from "./schemas.js";
 
 /**
- * The tools of `zones.automatic_platform_optimization`.
+ * The tools of `zones.automaticPlatformOptimization`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_automatic_platform_optimization_edit",
+    name: "zones_automaticPlatformOptimization_edit",
     title: "Change Automatic Platform Optimization setting",
-    description: "Automatic Platform Optimization (APO) for WordPress is a performance feature that serves your\nWordPress site from Cloudflare's edge network, reducing load times for visitors.\nRefer to the APO documentation for more information.",
+    description: "Automatic Platform Optimization (APO) for WordPress is a performance feature that serves your\nWordPress site from Cloudflare's edge network, reducing load times for visitors.\nRefer to the APO documentation for more information.\n\nPATCH /zones/{zone_id}/settings/automatic_platform_optimization",
     inputSchema: {
       type: "object",
       properties: {
@@ -30,7 +29,7 @@ export const tools: readonly Tool[] = [
           "properties": {
             "value": {
               "$ref": "#/$defs/speed_automatic_platform_optimization_value",
-              "description": "Configuration for Automatic Platform Optimization (APO) for WordPress.\nSet to \"off\" to disable, or provide an object to configure APO settings.\n"
+              "description": "Configuration for Automatic Platform Optimization (APO) for WordPress.\nSet to \"off\" to disable, or provide an object to configure APO settings."
             }
           },
           "required": [
@@ -38,18 +37,27 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value,
-        "speed_identifier": speed_identifier,
+        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value$,
       },
     },
     outputSchema: {
@@ -67,11 +75,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_automatic_platform_optimization_response": speed_automatic_platform_optimization_response_output,
-        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_automatic_platform_optimization_response": speed_automatic_platform_optimization_response,
+        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -121,12 +129,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_automatic_platform_optimization_response": speed_automatic_platform_optimization_response_output,
-        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_automatic_platform_optimization_response": speed_automatic_platform_optimization_response,
+        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
@@ -135,23 +143,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_automatic_platform_optimization_get",
+    name: "zones_automaticPlatformOptimization_get",
     title: "Get Automatic Platform Optimization setting",
-    description: "Automatic Platform Optimization (APO) for WordPress is a performance feature that serves your\nWordPress site from Cloudflare's edge network, reducing load times for visitors.\nRefer to the APO documentation for more information.",
+    description: "Automatic Platform Optimization (APO) for WordPress is a performance feature that serves your\nWordPress site from Cloudflare's edge network, reducing load times for visitors.\nRefer to the APO documentation for more information.\n\nGET /zones/{zone_id}/settings/automatic_platform_optimization",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -168,11 +183,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_automatic_platform_optimization_response": speed_automatic_platform_optimization_response_output,
-        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_automatic_platform_optimization_response": speed_automatic_platform_optimization_response,
+        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -223,12 +238,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_automatic_platform_optimization_response": speed_automatic_platform_optimization_response_output,
-        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_automatic_platform_optimization_response": speed_automatic_platform_optimization_response,
+        "speed_automatic_platform_optimization_value": speed_automatic_platform_optimization_value,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/binaryAst/outputs.ts b/src/generated/forge-mcp/zones/binaryAst/outputs.ts
index af5fd44e0..ec1ccf9ef 100644
--- a/src/generated/forge-mcp/zones/binaryAst/outputs.ts
+++ b/src/generated/forge-mcp/zones/binaryAst/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_binary_ast_response` in responses.
  */
-export const speed_binary_ast_response_output: JsonSchema = {
+export const speed_binary_ast_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -20,22 +20,15 @@ export const speed_binary_ast_response_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/speed_binary_ast_value"
+          "enum": [
+            "off",
+            "on",
+            "latest"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `speed_binary_ast_value` in responses.
- */
-export const speed_binary_ast_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on",
-    "latest"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/binaryAst/schemas.ts b/src/generated/forge-mcp/zones/binaryAst/schemas.ts
deleted file mode 100644
index de3c784d3..000000000
--- a/src/generated/forge-mcp/zones/binaryAst/schemas.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `speed_binary_ast_value`.
- */
-export const speed_binary_ast_value: JsonSchema = {
-  "description": "Controls Binary AST behavior:\n- \"off\": Feature disabled.\n- \"on\": Binary AST enabled.\n- \"latest\": Binary AST enabled using the latest version.\n",
-  "enum": [
-    "off",
-    "on",
-    "latest"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/binaryAst/tools.ts b/src/generated/forge-mcp/zones/binaryAst/tools.ts
index a68a22b9e..4d1b8fda2 100644
--- a/src/generated/forge-mcp/zones/binaryAst/tools.ts
+++ b/src/generated/forge-mcp/zones/binaryAst/tools.ts
@@ -3,34 +3,34 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import {
-  speed_binary_ast_response_output,
-  speed_binary_ast_value_output,
-} from "./outputs.js";
-import { speed_binary_ast_value } from "./schemas.js";
+import { speed_binary_ast_response } from "./outputs.js";
 
 /**
- * The tools of `zones.binary_ast`.
+ * The tools of `zones.binaryAst`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_binary_ast_edit",
+    name: "zones_binaryAst_edit",
     title: "Change Binary AST setting",
-    description: "Binary AST is a new binary encoding for JavaScript that enables faster parsing of scripts.\nWhen enabled, Cloudflare will serve a binary-encoded version of JavaScript to compatible browsers.",
+    description: "Binary AST is a new binary encoding for JavaScript that enables faster parsing of scripts.\nWhen enabled, Cloudflare will serve a binary-encoded version of JavaScript to compatible browsers.\n\nPATCH /zones/{zone_id}/settings/binary_ast",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/speed_binary_ast_value",
-              "description": "Controls Binary AST behavior:\n- \"off\": Feature disabled.\n- \"on\": Binary AST enabled.\n- \"latest\": Binary AST enabled using the latest version.\n"
+              "description": "Controls Binary AST behavior:\n- \"off\": Feature disabled.\n- \"on\": Binary AST enabled.\n- \"latest\": Binary AST enabled using the latest version.",
+              "enum": [
+                "off",
+                "on",
+                "latest"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -38,19 +38,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "speed_binary_ast_value": speed_binary_ast_value,
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -67,11 +73,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_binary_ast_response": speed_binary_ast_response_output,
-        "speed_binary_ast_value": speed_binary_ast_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_binary_ast_response": speed_binary_ast_response,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -121,12 +126,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_binary_ast_response": speed_binary_ast_response_output,
-        "speed_binary_ast_value": speed_binary_ast_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_binary_ast_response": speed_binary_ast_response,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
@@ -135,23 +139,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_binary_ast_get",
+    name: "zones_binaryAst_get",
     title: "Get Binary AST setting",
-    description: "Binary AST is a new binary encoding for JavaScript that enables faster parsing of scripts.\nWhen enabled, Cloudflare will serve a binary-encoded version of JavaScript to compatible browsers.",
+    description: "Binary AST is a new binary encoding for JavaScript that enables faster parsing of scripts.\nWhen enabled, Cloudflare will serve a binary-encoded version of JavaScript to compatible browsers.\n\nGET /zones/{zone_id}/settings/binary_ast",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -168,11 +179,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_binary_ast_response": speed_binary_ast_response_output,
-        "speed_binary_ast_value": speed_binary_ast_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_binary_ast_response": speed_binary_ast_response,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -223,12 +233,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_binary_ast_response": speed_binary_ast_response_output,
-        "speed_binary_ast_value": speed_binary_ast_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_binary_ast_response": speed_binary_ast_response,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/fonts/outputs.ts b/src/generated/forge-mcp/zones/fonts/outputs.ts
index d88541eee..18c0f8777 100644
--- a/src/generated/forge-mcp/zones/fonts/outputs.ts
+++ b/src/generated/forge-mcp/zones/fonts/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_cloudflare_fonts` in responses.
  */
-export const speed_cloudflare_fonts_output: JsonSchema = {
+export const speed_cloudflare_fonts: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -20,21 +20,14 @@ export const speed_cloudflare_fonts_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/speed_cloudflare_fonts_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `speed_cloudflare_fonts_value` in responses.
- */
-export const speed_cloudflare_fonts_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/fonts/schemas.ts b/src/generated/forge-mcp/zones/fonts/schemas.ts
deleted file mode 100644
index c3a63230e..000000000
--- a/src/generated/forge-mcp/zones/fonts/schemas.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `speed_cloudflare_fonts_value`.
- */
-export const speed_cloudflare_fonts_value: JsonSchema = {
-  "description": "Whether the feature is enabled or disabled.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/fonts/tools.ts b/src/generated/forge-mcp/zones/fonts/tools.ts
index fce9ddcb9..2e2562696 100644
--- a/src/generated/forge-mcp/zones/fonts/tools.ts
+++ b/src/generated/forge-mcp/zones/fonts/tools.ts
@@ -3,17 +3,12 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import {
-  speed_cloudflare_fonts_output,
-  speed_cloudflare_fonts_value_output,
-} from "./outputs.js";
-import { speed_cloudflare_fonts_value } from "./schemas.js";
+import { speed_cloudflare_fonts } from "./outputs.js";
 
 /**
  * The tools of `zones.fonts`.
@@ -22,16 +17,20 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_fonts_edit",
     title: "Change Cloudflare Fonts setting",
-    description: "Enhance your website's font delivery with Cloudflare Fonts. Deliver Google Hosted fonts from your own domain,\nboost performance, and enhance user privacy. Refer to the Cloudflare Fonts documentation for more information.",
+    description: "Enhance your website's font delivery with Cloudflare Fonts. Deliver Google Hosted fonts from your own domain,\nboost performance, and enhance user privacy. Refer to the Cloudflare Fonts documentation for more information.\n\nPATCH /zones/{zone_id}/settings/fonts",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/speed_cloudflare_fonts_value",
               "default": "off",
-              "description": "Whether the feature is enabled or disabled."
+              "description": "Whether the feature is enabled or disabled.",
+              "enum": [
+                "on",
+                "off"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -39,19 +38,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "speed_cloudflare_fonts_value": speed_cloudflare_fonts_value,
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -68,11 +73,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_cloudflare_fonts": speed_cloudflare_fonts_output,
-        "speed_cloudflare_fonts_value": speed_cloudflare_fonts_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_cloudflare_fonts": speed_cloudflare_fonts,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -122,12 +126,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_cloudflare_fonts": speed_cloudflare_fonts_output,
-        "speed_cloudflare_fonts_value": speed_cloudflare_fonts_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_cloudflare_fonts": speed_cloudflare_fonts,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
@@ -138,21 +141,28 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_fonts_get",
     title: "Get Cloudflare Fonts setting",
-    description: "Enhance your website's font delivery with Cloudflare Fonts. Deliver Google Hosted fonts from your own domain,\nboost performance, and enhance user privacy. Refer to the Cloudflare Fonts documentation for more information.",
+    description: "Enhance your website's font delivery with Cloudflare Fonts. Deliver Google Hosted fonts from your own domain,\nboost performance, and enhance user privacy. Refer to the Cloudflare Fonts documentation for more information.\n\nGET /zones/{zone_id}/settings/fonts",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -169,11 +179,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_cloudflare_fonts": speed_cloudflare_fonts_output,
-        "speed_cloudflare_fonts_value": speed_cloudflare_fonts_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_cloudflare_fonts": speed_cloudflare_fonts,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -224,12 +233,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_cloudflare_fonts": speed_cloudflare_fonts_output,
-        "speed_cloudflare_fonts_value": speed_cloudflare_fonts_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_cloudflare_fonts": speed_cloudflare_fonts,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/h2Prioritization/outputs.ts b/src/generated/forge-mcp/zones/h2Prioritization/outputs.ts
index 2f92cee6c..53973e738 100644
--- a/src/generated/forge-mcp/zones/h2Prioritization/outputs.ts
+++ b/src/generated/forge-mcp/zones/h2Prioritization/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_h2_prioritization_response` in responses.
  */
-export const speed_h2_prioritization_response_output: JsonSchema = {
+export const speed_h2_prioritization_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -20,22 +20,15 @@ export const speed_h2_prioritization_response_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/speed_h2_prioritization_value"
+          "enum": [
+            "off",
+            "on",
+            "custom"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `speed_h2_prioritization_value` in responses.
- */
-export const speed_h2_prioritization_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on",
-    "custom"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/h2Prioritization/schemas.ts b/src/generated/forge-mcp/zones/h2Prioritization/schemas.ts
deleted file mode 100644
index a4319a009..000000000
--- a/src/generated/forge-mcp/zones/h2Prioritization/schemas.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `speed_h2_prioritization_value`.
- */
-export const speed_h2_prioritization_value: JsonSchema = {
-  "description": "Controls HTTP/2 Prioritization behavior:\n- \"off\": Use browser default prioritization.\n- \"on\": Use Cloudflare's optimized prioritization.\n- \"custom\": Use custom prioritization rules.\n",
-  "enum": [
-    "off",
-    "on",
-    "custom"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/h2Prioritization/tools.ts b/src/generated/forge-mcp/zones/h2Prioritization/tools.ts
index 4b7f70bed..fea34010b 100644
--- a/src/generated/forge-mcp/zones/h2Prioritization/tools.ts
+++ b/src/generated/forge-mcp/zones/h2Prioritization/tools.ts
@@ -3,34 +3,34 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import {
-  speed_h2_prioritization_response_output,
-  speed_h2_prioritization_value_output,
-} from "./outputs.js";
-import { speed_h2_prioritization_value } from "./schemas.js";
+import { speed_h2_prioritization_response } from "./outputs.js";
 
 /**
- * The tools of `zones.h2_prioritization`.
+ * The tools of `zones.h2Prioritization`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_h2_prioritization_edit",
+    name: "zones_h2Prioritization_edit",
     title: "Change HTTP/2 Prioritization setting",
-    description: "HTTP/2 Prioritization controls the order in which assets are delivered to browsers.\nCloudflare's HTTP/2 Prioritization overrides the default browser prioritization order,\nimproving the loading performance of web pages.",
+    description: "HTTP/2 Prioritization controls the order in which assets are delivered to browsers.\nCloudflare's HTTP/2 Prioritization overrides the default browser prioritization order,\nimproving the loading performance of web pages.\n\nPATCH /zones/{zone_id}/settings/h2_prioritization",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/speed_h2_prioritization_value",
-              "description": "Controls HTTP/2 Prioritization behavior:\n- \"off\": Use browser default prioritization.\n- \"on\": Use Cloudflare's optimized prioritization.\n- \"custom\": Use custom prioritization rules.\n"
+              "description": "Controls HTTP/2 Prioritization behavior:\n- \"off\": Use browser default prioritization.\n- \"on\": Use Cloudflare's optimized prioritization.\n- \"custom\": Use custom prioritization rules.",
+              "enum": [
+                "off",
+                "on",
+                "custom"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -38,19 +38,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "speed_h2_prioritization_value": speed_h2_prioritization_value,
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -67,11 +73,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_h2_prioritization_response": speed_h2_prioritization_response_output,
-        "speed_h2_prioritization_value": speed_h2_prioritization_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_h2_prioritization_response": speed_h2_prioritization_response,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -121,12 +126,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_h2_prioritization_response": speed_h2_prioritization_response_output,
-        "speed_h2_prioritization_value": speed_h2_prioritization_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_h2_prioritization_response": speed_h2_prioritization_response,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
@@ -135,23 +139,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_h2_prioritization_get",
+    name: "zones_h2Prioritization_get",
     title: "Get HTTP/2 Prioritization setting",
-    description: "HTTP/2 Prioritization controls the order in which assets are delivered to browsers.\nCloudflare's HTTP/2 Prioritization overrides the default browser prioritization order,\nimproving the loading performance of web pages.",
+    description: "HTTP/2 Prioritization controls the order in which assets are delivered to browsers.\nCloudflare's HTTP/2 Prioritization overrides the default browser prioritization order,\nimproving the loading performance of web pages.\n\nGET /zones/{zone_id}/settings/h2_prioritization",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -168,11 +179,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_h2_prioritization_response": speed_h2_prioritization_response_output,
-        "speed_h2_prioritization_value": speed_h2_prioritization_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_h2_prioritization_response": speed_h2_prioritization_response,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -223,12 +233,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_h2_prioritization_response": speed_h2_prioritization_response_output,
-        "speed_h2_prioritization_value": speed_h2_prioritization_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_h2_prioritization_response": speed_h2_prioritization_response,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/holds/outputs.ts b/src/generated/forge-mcp/zones/holds/outputs.ts
index 02e7a5f9d..bb20c3cb6 100644
--- a/src/generated/forge-mcp/zones/holds/outputs.ts
+++ b/src/generated/forge-mcp/zones/holds/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `zones_api-response-common-3` in responses.
  */
-export const zones_api_response_common_3_output: JsonSchema = {
+export const zones_api$$response$$common$$3: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zones_messages"
@@ -49,7 +49,7 @@ export const zones_api_response_common_3_output: JsonSchema = {
 /**
  * The schema of `zones_api-response-single-2` in responses.
  */
-export const zones_api_response_single_2_output: JsonSchema = {
+export const zones_api$$response$$single$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_api-response-common-3"
diff --git a/src/generated/forge-mcp/zones/holds/tools.ts b/src/generated/forge-mcp/zones/holds/tools.ts
index 7bf28528e..813b0ca52 100644
--- a/src/generated/forge-mcp/zones/holds/tools.ts
+++ b/src/generated/forge-mcp/zones/holds/tools.ts
@@ -1,16 +1,15 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../../_/tool.js";
+import { type Tool, param, pathParam } from "../../_/tool.js";
 import {
-  zones_api_response_common_failure_2_output,
-  zones_messages_2_output,
+  zones_api$$response$$common$$failure$$2,
+  zones_messages$$2,
 } from "../../outputs.js";
-import { zones_identifier_2 } from "../../schemas.js";
-import { zones_messages_output } from "../outputs.js";
+import { zones_messages } from "../outputs.js";
 import {
-  zones_api_response_common_3_output,
-  zones_api_response_single_2_output,
+  zones_api$$response$$common$$3,
+  zones_api$$response$$single$$2,
 } from "./outputs.js";
 
 /**
@@ -20,25 +19,38 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_holds_create",
     title: "Create Zone Hold",
-    description: "Enforce a zone hold on the zone, blocking the creation and activation of zones with this zone's hostname.\nZone holds cannot be enabled on CDN-only zones.",
+    description: "Enforce a zone hold on the zone, blocking the creation and activation of zones with this zone's hostname.\nZone holds cannot be enabled on CDN-only zones.\n\nPOST /zones/{zone_id}/hold",
     inputSchema: {
       type: "object",
       properties: {
-        "include_subdomains": {
-          "description": "If provided, the zone hold will extend to block any subdomain of the given zone, as well\nas SSL4SaaS Custom Hostnames. For example, a zone hold on a zone with the hostname\n'example.com' and include_subdomains=true will block 'example.com',\n'staging.example.com', 'api.staging.example.com', etc.",
-          "type": "boolean"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Zone ID"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "include_subdomains": {
+              "description": "If provided, the zone hold will extend to block any subdomain of the given zone, as well\nas SSL4SaaS Custom Hostnames. For example, a zone hold on a zone with the hostname\n'example.com' and include_subdomains=true will block 'example.com',\n'staging.example.com', 'api.staging.example.com', etc.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier-2": zones_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -66,9 +78,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_api-response-common-3": zones_api_response_common_3_output,
-        "zones_api-response-single-2": zones_api_response_single_2_output,
-        "zones_messages": zones_messages_output,
+        "zones_api-response-common-3": zones_api$$response$$common$$3,
+        "zones_api-response-single-2": zones_api$$response$$single$$2,
+        "zones_messages": zones_messages,
       },
     },
     annotations: {
@@ -118,42 +130,55 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common-3": zones_api_response_common_3_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single-2": zones_api_response_single_2_output,
-        "zones_messages": zones_messages_output,
-        "zones_messages-2": zones_messages_2_output,
+        "zones_api-response-common-3": zones_api$$response$$common$$3,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single-2": zones_api$$response$$single$$2,
+        "zones_messages": zones_messages,
+        "zones_messages-2": zones_messages$$2,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/hold`,
       query: [
-        ["include_subdomains", args["include_subdomains"], true],
+        ["include_subdomains", param(args, "query", "include_subdomains"), true],
       ],
     }),
   },
   {
     name: "zones_holds_delete",
     title: "Remove Zone Hold",
-    description: "Stop enforcement of a zone hold on the zone, permanently or temporarily, allowing the\ncreation and activation of zones with this zone's hostname.\nExisting zone holds can be removed from CDN-only zones when `hold_after` is not provided.\nActive holds are automatically disabled when a zone transitions to CDN-only mode.",
+    description: "Stop enforcement of a zone hold on the zone, permanently or temporarily, allowing the\ncreation and activation of zones with this zone's hostname.\nExisting zone holds can be removed from CDN-only zones when `hold_after` is not provided.\nActive holds are automatically disabled when a zone transitions to CDN-only mode.\n\nDELETE /zones/{zone_id}/hold",
     inputSchema: {
       type: "object",
       properties: {
-        "hold_after": {
-          "description": "If `hold_after` is provided, the hold will be temporarily disabled,\nthen automatically re-enabled by the system at the time specified\nin this RFC3339-formatted timestamp. Otherwise, the hold will be\ndisabled indefinitely. `hold_after` cannot be provided for CDN-only zones.",
-          "type": "string"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Zone ID"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "hold_after": {
+              "description": "If `hold_after` is provided, the hold will be temporarily disabled,\nthen automatically re-enabled by the system at the time specified\nin this RFC3339-formatted timestamp. Otherwise, the hold will be\ndisabled indefinitely. `hold_after` cannot be provided for CDN-only zones.",
+              "type": "string"
+            }
+          },
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier-2": zones_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -181,9 +206,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_api-response-common-3": zones_api_response_common_3_output,
-        "zones_api-response-single-2": zones_api_response_single_2_output,
-        "zones_messages": zones_messages_output,
+        "zones_api-response-common-3": zones_api$$response$$common$$3,
+        "zones_api-response-single-2": zones_api$$response$$single$$2,
+        "zones_messages": zones_messages,
       },
     },
     annotations: {
@@ -233,24 +258,24 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common-3": zones_api_response_common_3_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single-2": zones_api_response_single_2_output,
-        "zones_messages": zones_messages_output,
-        "zones_messages-2": zones_messages_2_output,
+        "zones_api-response-common-3": zones_api$$response$$common$$3,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single-2": zones_api$$response$$single$$2,
+        "zones_messages": zones_messages,
+        "zones_messages-2": zones_messages$$2,
       },
     },
     request: (args) => ({
       path: `/zones/${pathParam(args, "zone_id")}/hold`,
       query: [
-        ["hold_after", args["hold_after"], true],
+        ["hold_after", param(args, "query", "hold_after"), true],
       ],
     }),
   },
   {
     name: "zones_holds_edit",
     title: "Update Zone Hold",
-    description: "Update the `hold_after` and/or `include_subdomains` values on an existing zone hold.\nThe hold is enabled if the `hold_after` date-time value is in the past.\nExisting zone holds can be removed from CDN-only zones by setting `hold_after` to `null`.\nOther zone hold updates cannot be made on CDN-only zones.\nActive holds are automatically disabled when a zone transitions to CDN-only mode.",
+    description: "Update the `hold_after` and/or `include_subdomains` values on an existing zone hold.\nThe hold is enabled if the `hold_after` date-time value is in the past.\nExisting zone holds can be removed from CDN-only zones by setting `hold_after` to `null`.\nOther zone hold updates cannot be made on CDN-only zones.\nActive holds are automatically disabled when a zone transitions to CDN-only mode.\n\nPATCH /zones/{zone_id}/hold",
     inputSchema: {
       type: "object",
       properties: {
@@ -276,18 +301,25 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Zone ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "zones_identifier-2": zones_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -315,9 +347,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_api-response-common-3": zones_api_response_common_3_output,
-        "zones_api-response-single-2": zones_api_response_single_2_output,
-        "zones_messages": zones_messages_output,
+        "zones_api-response-common-3": zones_api$$response$$common$$3,
+        "zones_api-response-single-2": zones_api$$response$$single$$2,
+        "zones_messages": zones_messages,
       },
     },
     annotations: {
@@ -375,11 +407,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common-3": zones_api_response_common_3_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single-2": zones_api_response_single_2_output,
-        "zones_messages": zones_messages_output,
-        "zones_messages-2": zones_messages_2_output,
+        "zones_api-response-common-3": zones_api$$response$$common$$3,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single-2": zones_api$$response$$single$$2,
+        "zones_messages": zones_messages,
+        "zones_messages-2": zones_messages$$2,
       },
     },
     request: (args) => ({
@@ -390,21 +422,28 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_holds_get",
     title: "Get Zone Hold",
-    description: "Retrieve whether the zone is subject to a zone hold, and metadata about the hold.",
+    description: "Retrieve whether the zone is subject to a zone hold, and metadata about the hold.\n\nGET /zones/{zone_id}/hold",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier-2",
-          "description": "Zone ID"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Zone ID",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier-2": zones_identifier_2,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -432,9 +471,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_api-response-common-3": zones_api_response_common_3_output,
-        "zones_api-response-single-2": zones_api_response_single_2_output,
-        "zones_messages": zones_messages_output,
+        "zones_api-response-common-3": zones_api$$response$$common$$3,
+        "zones_api-response-single-2": zones_api$$response$$single$$2,
+        "zones_messages": zones_messages,
       },
     },
     annotations: {
@@ -522,11 +561,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common-3": zones_api_response_common_3_output,
-        "zones_api-response-common-failure-2": zones_api_response_common_failure_2_output,
-        "zones_api-response-single-2": zones_api_response_single_2_output,
-        "zones_messages": zones_messages_output,
-        "zones_messages-2": zones_messages_2_output,
+        "zones_api-response-common-3": zones_api$$response$$common$$3,
+        "zones_api-response-common-failure-2": zones_api$$response$$common$$failure$$2,
+        "zones_api-response-single-2": zones_api$$response$$single$$2,
+        "zones_messages": zones_messages,
+        "zones_messages-2": zones_messages$$2,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/hostnames/settings/outputs.ts b/src/generated/forge-mcp/zones/hostnames/settings/outputs.ts
index 3cffd96c4..2431f166e 100644
--- a/src/generated/forge-mcp/zones/hostnames/settings/outputs.ts
+++ b/src/generated/forge-mcp/zones/hostnames/settings/outputs.ts
@@ -3,26 +3,11 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_created_at-4` in responses.
- */
-export const tls_certificates_and_hostnames_created_at_4_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_hostname-3` in responses.
- */
-export const tls_certificates_and_hostnames_hostname_3_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_per_hostname_settings_response`
  * in responses.
  */
-export const tls_certificates_and_hostnames_per_hostname_settings_response_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_per_hostname_settings_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -41,19 +26,21 @@ export const tls_certificates_and_hostnames_per_hostname_settings_response_outpu
 /**
  * The schema of `tls-certificates-and-hostnames_settingObject` in responses.
  */
-export const tls_certificates_and_hostnames_settingObject_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_settingObject: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_created_at-4"
+      "format": "date-time",
+      "type": "string"
     },
     "hostname": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-3"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-12"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at-5"
+      "format": "date-time",
+      "type": "string"
     },
     "value": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_value"
@@ -62,25 +49,10 @@ export const tls_certificates_and_hostnames_settingObject_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `tls-certificates-and-hostnames_status-12` in responses.
- */
-export const tls_certificates_and_hostnames_status_12_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_updated_at-5` in responses.
- */
-export const tls_certificates_and_hostnames_updated_at_5_output: JsonSchema = {
-  "format": "date-time",
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_value` in responses.
  */
-export const tls_certificates_and_hostnames_value_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_value: JsonSchema = {
   "oneOf": [
     {
       "items": {
diff --git a/src/generated/forge-mcp/zones/hostnames/settings/schemas.ts b/src/generated/forge-mcp/zones/hostnames/settings/schemas.ts
index ed7b85558..52a8eacfd 100644
--- a/src/generated/forge-mcp/zones/hostnames/settings/schemas.ts
+++ b/src/generated/forge-mcp/zones/hostnames/settings/schemas.ts
@@ -3,31 +3,10 @@
 
 import type { JsonSchema } from "../../../_/tool.js";
 
-/**
- * The schema of `tls-certificates-and-hostnames_hostname-3`.
- */
-export const tls_certificates_and_hostnames_hostname_3: JsonSchema = {
-  "description": "The hostname for which the tls settings are set.",
-  "type": "string"
-};
-
-/**
- * The schema of `tls-certificates-and-hostnames_setting_id`.
- */
-export const tls_certificates_and_hostnames_setting_id: JsonSchema = {
-  "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`.",
-  "enum": [
-    "ciphers",
-    "min_tls_version",
-    "http2"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `tls-certificates-and-hostnames_value`.
  */
-export const tls_certificates_and_hostnames_value: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_value: JsonSchema = {
   "description": "The TLS setting value.\nThe type depends on the `setting_id` used in the request path:\n- `ciphers`: an array of allowed cipher suite strings in BoringSSL format (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: a string indicating the minimum TLS version — one of `\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"` (e.g., `\"1.2\"`).\n- `http2`: a string indicating whether HTTP/2 is enabled — `\"on\"` or `\"off\"` (e.g., `\"on\"`).",
   "oneOf": [
     {
diff --git a/src/generated/forge-mcp/zones/hostnames/settings/tls/outputs.ts b/src/generated/forge-mcp/zones/hostnames/settings/tls/outputs.ts
index d04cc6759..966ce5731 100644
--- a/src/generated/forge-mcp/zones/hostnames/settings/tls/outputs.ts
+++ b/src/generated/forge-mcp/zones/hostnames/settings/tls/outputs.ts
@@ -8,7 +8,7 @@ import type { JsonSchema } from "../../../../_/tool.js";
  * `tls-certificates-and-hostnames_per_hostname_settings_response_collection` in
  * responses.
  */
-export const tls_certificates_and_hostnames_per_hostname_settings_response_collection_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_per_hostname_settings_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-collection"
@@ -19,16 +19,18 @@ export const tls_certificates_and_hostnames_per_hostname_settings_response_colle
           "items": {
             "properties": {
               "created_at": {
-                "$ref": "#/$defs/tls-certificates-and-hostnames_created_at-4"
+                "format": "date-time",
+                "type": "string"
               },
               "hostname": {
-                "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-3"
+                "type": "string"
               },
               "status": {
-                "$ref": "#/$defs/tls-certificates-and-hostnames_status-12"
+                "type": "string"
               },
               "updated_at": {
-                "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at-5"
+                "format": "date-time",
+                "type": "string"
               },
               "value": {
                 "$ref": "#/$defs/tls-certificates-and-hostnames_value"
@@ -74,7 +76,7 @@ export const tls_certificates_and_hostnames_per_hostname_settings_response_colle
  * `tls-certificates-and-hostnames_per_hostname_settings_response_delete` in
  * responses.
  */
-export const tls_certificates_and_hostnames_per_hostname_settings_response_delete_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_per_hostname_settings_response_delete: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/tls-certificates-and-hostnames_api-response-single"
@@ -94,19 +96,21 @@ export const tls_certificates_and_hostnames_per_hostname_settings_response_delet
  * The schema of `tls-certificates-and-hostnames_settingObjectDelete` in
  * responses.
  */
-export const tls_certificates_and_hostnames_settingObjectDelete_output: JsonSchema = {
+export const tls$$certificates$$and$$hostnames_settingObjectDelete: JsonSchema = {
   "properties": {
     "created_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_created_at-4"
+      "format": "date-time",
+      "type": "string"
     },
     "hostname": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-3"
+      "type": "string"
     },
     "status": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_status-12"
+      "type": "string"
     },
     "updated_at": {
-      "$ref": "#/$defs/tls-certificates-and-hostnames_updated_at-5"
+      "format": "date-time",
+      "type": "string"
     },
     "value": {
       "$ref": "#/$defs/tls-certificates-and-hostnames_value"
diff --git a/src/generated/forge-mcp/zones/hostnames/settings/tls/tools.ts b/src/generated/forge-mcp/zones/hostnames/settings/tls/tools.ts
index a54ec0493..d39fd60e6 100644
--- a/src/generated/forge-mcp/zones/hostnames/settings/tls/tools.ts
+++ b/src/generated/forge-mcp/zones/hostnames/settings/tls/tools.ts
@@ -3,31 +3,22 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_collection_output,
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_common_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$collection,
+  tls$$certificates$$and$$hostnames_api$$response$$common,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_created_at_4_output,
-  tls_certificates_and_hostnames_hostname_3_output,
-  tls_certificates_and_hostnames_per_hostname_settings_response_output,
-  tls_certificates_and_hostnames_settingObject_output,
-  tls_certificates_and_hostnames_status_12_output,
-  tls_certificates_and_hostnames_updated_at_5_output,
-  tls_certificates_and_hostnames_value_output,
+  tls$$certificates$$and$$hostnames_per_hostname_settings_response,
+  tls$$certificates$$and$$hostnames_settingObject,
+  tls$$certificates$$and$$hostnames_value,
 } from "../outputs.js";
+import { tls$$certificates$$and$$hostnames_value as tls$$certificates$$and$$hostnames_value$ } from "../schemas.js";
 import {
-  tls_certificates_and_hostnames_hostname_3,
-  tls_certificates_and_hostnames_setting_id,
-  tls_certificates_and_hostnames_value,
-} from "../schemas.js";
-import {
-  tls_certificates_and_hostnames_per_hostname_settings_response_collection_output,
-  tls_certificates_and_hostnames_per_hostname_settings_response_delete_output,
-  tls_certificates_and_hostnames_settingObjectDelete_output,
+  tls$$certificates$$and$$hostnames_per_hostname_settings_response_collection,
+  tls$$certificates$$and$$hostnames_per_hostname_settings_response_delete,
+  tls$$certificates$$and$$hostnames_settingObjectDelete,
 } from "./outputs.js";
 
 /**
@@ -37,46 +28,52 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_hostnames_settings_tls_delete",
     title: "Delete TLS setting for hostname",
-    description: "Delete the tls setting value for the hostname.",
+    description: "Delete the tls setting value for the hostname.\n\nDELETE /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
-        "hostname": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-3",
-          "description": "The hostname for which the tls settings are set."
-        },
-        "setting_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_setting_id",
-          "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "hostname": {
+              "description": "The hostname for which the tls settings are set.",
+              "type": "string"
+            },
+            "setting_id": {
+              "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`.",
+              "enum": [
+                "ciphers",
+                "min_tls_version",
+                "http2"
+              ],
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "setting_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "setting_id",
-        "hostname"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_setting_id": tls_certificates_and_hostnames_setting_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_per_hostname_settings_response_delete",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-4": tls_certificates_and_hostnames_created_at_4_output,
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_per_hostname_settings_response_delete": tls_certificates_and_hostnames_per_hostname_settings_response_delete_output,
-        "tls-certificates-and-hostnames_settingObjectDelete": tls_certificates_and_hostnames_settingObjectDelete_output,
-        "tls-certificates-and-hostnames_status-12": tls_certificates_and_hostnames_status_12_output,
-        "tls-certificates-and-hostnames_updated_at-5": tls_certificates_and_hostnames_updated_at_5_output,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_per_hostname_settings_response_delete": tls$$certificates$$and$$hostnames_per_hostname_settings_response_delete,
+        "tls-certificates-and-hostnames_settingObjectDelete": tls$$certificates$$and$$hostnames_settingObjectDelete,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value,
       },
     },
     annotations: {
@@ -121,16 +118,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-4": tls_certificates_and_hostnames_created_at_4_output,
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_per_hostname_settings_response_delete": tls_certificates_and_hostnames_per_hostname_settings_response_delete_output,
-        "tls-certificates-and-hostnames_settingObjectDelete": tls_certificates_and_hostnames_settingObjectDelete_output,
-        "tls-certificates-and-hostnames_status-12": tls_certificates_and_hostnames_status_12_output,
-        "tls-certificates-and-hostnames_updated_at-5": tls_certificates_and_hostnames_updated_at_5_output,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_per_hostname_settings_response_delete": tls$$certificates$$and$$hostnames_per_hostname_settings_response_delete,
+        "tls-certificates-and-hostnames_settingObjectDelete": tls$$certificates$$and$$hostnames_settingObjectDelete,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value,
       },
     },
     request: (args) => ({
@@ -140,40 +133,47 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_hostnames_settings_tls_get",
     title: "List TLS setting for hostnames",
-    description: "List the requested TLS setting for the hostnames under this zone.",
+    description: "List the requested TLS setting for the hostnames under this zone.\n\nGET /zones/{zone_id}/hostnames/settings/{setting_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "setting_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_setting_id",
-          "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "setting_id": {
+              "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`.",
+              "enum": [
+                "ciphers",
+                "min_tls_version",
+                "http2"
+              ],
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "setting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "setting_id"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_setting_id": tls_certificates_and_hostnames_setting_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_per_hostname_settings_response_collection",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_created_at-4": tls_certificates_and_hostnames_created_at_4_output,
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_per_hostname_settings_response_collection": tls_certificates_and_hostnames_per_hostname_settings_response_collection_output,
-        "tls-certificates-and-hostnames_status-12": tls_certificates_and_hostnames_status_12_output,
-        "tls-certificates-and-hostnames_updated_at-5": tls_certificates_and_hostnames_updated_at_5_output,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_per_hostname_settings_response_collection": tls$$certificates$$and$$hostnames_per_hostname_settings_response_collection,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value,
       },
     },
     annotations: {
@@ -219,16 +219,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-collection": tls_certificates_and_hostnames_api_response_collection_output,
-        "tls-certificates-and-hostnames_api-response-common": tls_certificates_and_hostnames_api_response_common_output,
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_created_at-4": tls_certificates_and_hostnames_created_at_4_output,
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_per_hostname_settings_response_collection": tls_certificates_and_hostnames_per_hostname_settings_response_collection_output,
-        "tls-certificates-and-hostnames_status-12": tls_certificates_and_hostnames_status_12_output,
-        "tls-certificates-and-hostnames_updated_at-5": tls_certificates_and_hostnames_updated_at_5_output,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value_output,
+        "tls-certificates-and-hostnames_api-response-collection": tls$$certificates$$and$$hostnames_api$$response$$collection,
+        "tls-certificates-and-hostnames_api-response-common": tls$$certificates$$and$$hostnames_api$$response$$common,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_per_hostname_settings_response_collection": tls$$certificates$$and$$hostnames_per_hostname_settings_response_collection,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value,
       },
     },
     request: (args) => ({
@@ -238,7 +234,7 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_hostnames_settings_tls_update",
     title: "Edit TLS setting for hostname",
-    description: "Update the tls setting value for the hostname.",
+    description: "Update the tls setting value for the hostname.\n\nPUT /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
@@ -254,44 +250,52 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "hostname": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-3",
-          "description": "The hostname for which the tls settings are set."
-        },
-        "setting_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_setting_id",
-          "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "hostname": {
+              "description": "The hostname for which the tls settings are set.",
+              "type": "string"
+            },
+            "setting_id": {
+              "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`.",
+              "enum": [
+                "ciphers",
+                "min_tls_version",
+                "http2"
+              ],
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "setting_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "setting_id",
-        "hostname",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_setting_id": tls_certificates_and_hostnames_setting_id,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_per_hostname_settings_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-4": tls_certificates_and_hostnames_created_at_4_output,
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_per_hostname_settings_response": tls_certificates_and_hostnames_per_hostname_settings_response_output,
-        "tls-certificates-and-hostnames_settingObject": tls_certificates_and_hostnames_settingObject_output,
-        "tls-certificates-and-hostnames_status-12": tls_certificates_and_hostnames_status_12_output,
-        "tls-certificates-and-hostnames_updated_at-5": tls_certificates_and_hostnames_updated_at_5_output,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_per_hostname_settings_response": tls$$certificates$$and$$hostnames_per_hostname_settings_response,
+        "tls-certificates-and-hostnames_settingObject": tls$$certificates$$and$$hostnames_settingObject,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value,
       },
     },
     annotations: {
@@ -336,16 +340,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-4": tls_certificates_and_hostnames_created_at_4_output,
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_per_hostname_settings_response": tls_certificates_and_hostnames_per_hostname_settings_response_output,
-        "tls-certificates-and-hostnames_settingObject": tls_certificates_and_hostnames_settingObject_output,
-        "tls-certificates-and-hostnames_status-12": tls_certificates_and_hostnames_status_12_output,
-        "tls-certificates-and-hostnames_updated_at-5": tls_certificates_and_hostnames_updated_at_5_output,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_per_hostname_settings_response": tls$$certificates$$and$$hostnames_per_hostname_settings_response,
+        "tls-certificates-and-hostnames_settingObject": tls$$certificates$$and$$hostnames_settingObject,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/hostnames/settings/tlsSingle/tools.ts b/src/generated/forge-mcp/zones/hostnames/settings/tlsSingle/tools.ts
index cbf4f71b9..4eb525524 100644
--- a/src/generated/forge-mcp/zones/hostnames/settings/tlsSingle/tools.ts
+++ b/src/generated/forge-mcp/zones/hostnames/settings/tlsSingle/tools.ts
@@ -3,72 +3,69 @@
 
 import { type Tool, pathParam } from "../../../../_/tool.js";
 import {
-  tls_certificates_and_hostnames_api_response_common_failure_output,
-  tls_certificates_and_hostnames_api_response_single_output,
-  tls_certificates_and_hostnames_messages_output,
+  tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+  tls$$certificates$$and$$hostnames_api$$response$$single,
+  tls$$certificates$$and$$hostnames_messages,
 } from "../../../../outputs.js";
-import { tls_certificates_and_hostnames_identifier } from "../../../../schemas.js";
 import {
-  tls_certificates_and_hostnames_created_at_4_output,
-  tls_certificates_and_hostnames_hostname_3_output,
-  tls_certificates_and_hostnames_per_hostname_settings_response_output,
-  tls_certificates_and_hostnames_settingObject_output,
-  tls_certificates_and_hostnames_status_12_output,
-  tls_certificates_and_hostnames_updated_at_5_output,
-  tls_certificates_and_hostnames_value_output,
+  tls$$certificates$$and$$hostnames_per_hostname_settings_response,
+  tls$$certificates$$and$$hostnames_settingObject,
+  tls$$certificates$$and$$hostnames_value,
 } from "../outputs.js";
-import {
-  tls_certificates_and_hostnames_hostname_3,
-  tls_certificates_and_hostnames_setting_id,
-} from "../schemas.js";
 
 /**
- * The tools of `zones.hostnames.settings.tls_single`.
+ * The tools of `zones.hostnames.settings.tlsSingle`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_hostnames_settings_tls_single_get",
+    name: "zones_hostnames_settings_tlsSingle_get",
     title: "Get TLS setting for hostname",
-    description: "Get the requested TLS setting for the hostname.",
+    description: "Get the requested TLS setting for the hostname.\n\nGET /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}",
     inputSchema: {
       type: "object",
       properties: {
-        "hostname": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_hostname-3",
-          "description": "The hostname for which the tls settings are set."
-        },
-        "setting_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_setting_id",
-          "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`."
-        },
-        "zone_id": {
-          "$ref": "#/$defs/tls-certificates-and-hostnames_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "hostname": {
+              "description": "The hostname for which the tls settings are set.",
+              "type": "string"
+            },
+            "setting_id": {
+              "description": "The TLS Setting name.\nThe value type depends on the setting:\n- `ciphers`: value is an array of cipher suite strings (e.g., `[\"ECDHE-RSA-AES128-GCM-SHA256\", \"AES128-GCM-SHA256\"]`).\n- `min_tls_version`: value is a TLS version string (`\"1.0\"`, `\"1.1\"`, `\"1.2\"`, or `\"1.3\"`).\n- `http2`: value is `\"on\"` or `\"off\"`.",
+              "enum": [
+                "ciphers",
+                "min_tls_version",
+                "http2"
+              ],
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "setting_id",
+            "hostname"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "setting_id",
-        "hostname"
+        "path"
       ],
-      $defs: {
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3,
-        "tls-certificates-and-hostnames_identifier": tls_certificates_and_hostnames_identifier,
-        "tls-certificates-and-hostnames_setting_id": tls_certificates_and_hostnames_setting_id,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/tls-certificates-and-hostnames_per_hostname_settings_response",
       $defs: {
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-4": tls_certificates_and_hostnames_created_at_4_output,
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_per_hostname_settings_response": tls_certificates_and_hostnames_per_hostname_settings_response_output,
-        "tls-certificates-and-hostnames_settingObject": tls_certificates_and_hostnames_settingObject_output,
-        "tls-certificates-and-hostnames_status-12": tls_certificates_and_hostnames_status_12_output,
-        "tls-certificates-and-hostnames_updated_at-5": tls_certificates_and_hostnames_updated_at_5_output,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value_output,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_per_hostname_settings_response": tls$$certificates$$and$$hostnames_per_hostname_settings_response,
+        "tls-certificates-and-hostnames_settingObject": tls$$certificates$$and$$hostnames_settingObject,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value,
       },
     },
     annotations: {
@@ -105,16 +102,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "tls-certificates-and-hostnames_api-response-common-failure": tls_certificates_and_hostnames_api_response_common_failure_output,
-        "tls-certificates-and-hostnames_api-response-single": tls_certificates_and_hostnames_api_response_single_output,
-        "tls-certificates-and-hostnames_created_at-4": tls_certificates_and_hostnames_created_at_4_output,
-        "tls-certificates-and-hostnames_hostname-3": tls_certificates_and_hostnames_hostname_3_output,
-        "tls-certificates-and-hostnames_messages": tls_certificates_and_hostnames_messages_output,
-        "tls-certificates-and-hostnames_per_hostname_settings_response": tls_certificates_and_hostnames_per_hostname_settings_response_output,
-        "tls-certificates-and-hostnames_settingObject": tls_certificates_and_hostnames_settingObject_output,
-        "tls-certificates-and-hostnames_status-12": tls_certificates_and_hostnames_status_12_output,
-        "tls-certificates-and-hostnames_updated_at-5": tls_certificates_and_hostnames_updated_at_5_output,
-        "tls-certificates-and-hostnames_value": tls_certificates_and_hostnames_value_output,
+        "tls-certificates-and-hostnames_api-response-common-failure": tls$$certificates$$and$$hostnames_api$$response$$common$$failure,
+        "tls-certificates-and-hostnames_api-response-single": tls$$certificates$$and$$hostnames_api$$response$$single,
+        "tls-certificates-and-hostnames_messages": tls$$certificates$$and$$hostnames_messages,
+        "tls-certificates-and-hostnames_per_hostname_settings_response": tls$$certificates$$and$$hostnames_per_hostname_settings_response,
+        "tls-certificates-and-hostnames_settingObject": tls$$certificates$$and$$hostnames_settingObject,
+        "tls-certificates-and-hostnames_value": tls$$certificates$$and$$hostnames_value,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/imageResizing/outputs.ts b/src/generated/forge-mcp/zones/imageResizing/outputs.ts
index 1e67f16e2..cecfd9b2f 100644
--- a/src/generated/forge-mcp/zones/imageResizing/outputs.ts
+++ b/src/generated/forge-mcp/zones/imageResizing/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_image_resizing_response` in responses.
  */
-export const speed_image_resizing_response_output: JsonSchema = {
+export const speed_image_resizing_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -20,23 +20,16 @@ export const speed_image_resizing_response_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/speed_image_resizing_value"
+          "enum": [
+            "off",
+            "on",
+            "open",
+            "latest"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `speed_image_resizing_value` in responses.
- */
-export const speed_image_resizing_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on",
-    "open",
-    "latest"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/imageResizing/schemas.ts b/src/generated/forge-mcp/zones/imageResizing/schemas.ts
deleted file mode 100644
index d054364d0..000000000
--- a/src/generated/forge-mcp/zones/imageResizing/schemas.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `speed_image_resizing_value`.
- */
-export const speed_image_resizing_value: JsonSchema = {
-  "description": "Controls Image Resizing behavior:\n- \"off\": Feature disabled.\n- \"on\": Resizing is enabled for same-zone images only.\n- \"open\": Resizing is enabled for images from any origin.\n- \"latest\": Resizing is enabled for same-zone images using the latest version.\n",
-  "enum": [
-    "off",
-    "on",
-    "open",
-    "latest"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/imageResizing/tools.ts b/src/generated/forge-mcp/zones/imageResizing/tools.ts
index 3453011d6..89c795807 100644
--- a/src/generated/forge-mcp/zones/imageResizing/tools.ts
+++ b/src/generated/forge-mcp/zones/imageResizing/tools.ts
@@ -3,34 +3,35 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import {
-  speed_image_resizing_response_output,
-  speed_image_resizing_value_output,
-} from "./outputs.js";
-import { speed_image_resizing_value } from "./schemas.js";
+import { speed_image_resizing_response } from "./outputs.js";
 
 /**
- * The tools of `zones.image_resizing`.
+ * The tools of `zones.imageResizing`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_image_resizing_edit",
+    name: "zones_imageResizing_edit",
     title: "Change Image Transformations setting",
-    description: "Sets the Image Transformations setting for a zone. Accepted values are `off`, `on`, `open`, and `latest`.",
+    description: "Sets the Image Transformations setting for a zone. Accepted values are `off`, `on`, `open`, and `latest`.\n\nPATCH /zones/{zone_id}/settings/image_resizing",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/speed_image_resizing_value",
-              "description": "Controls Image Resizing behavior:\n- \"off\": Feature disabled.\n- \"on\": Resizing is enabled for same-zone images only.\n- \"open\": Resizing is enabled for images from any origin.\n- \"latest\": Resizing is enabled for same-zone images using the latest version.\n"
+              "description": "Controls Image Resizing behavior:\n- \"off\": Feature disabled.\n- \"on\": Resizing is enabled for same-zone images only.\n- \"open\": Resizing is enabled for images from any origin.\n- \"latest\": Resizing is enabled for same-zone images using the latest version.",
+              "enum": [
+                "off",
+                "on",
+                "open",
+                "latest"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -38,19 +39,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-        "speed_image_resizing_value": speed_image_resizing_value,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -67,11 +74,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_image_resizing_response": speed_image_resizing_response_output,
-        "speed_image_resizing_value": speed_image_resizing_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_image_resizing_response": speed_image_resizing_response,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -121,12 +127,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_image_resizing_response": speed_image_resizing_response_output,
-        "speed_image_resizing_value": speed_image_resizing_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_image_resizing_response": speed_image_resizing_response,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
@@ -135,23 +140,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_image_resizing_get",
+    name: "zones_imageResizing_get",
     title: "Get Image Transformations setting",
-    description: "Gets the Image Transformations setting for a zone. Accepted values are `off`, `on`, `open`, and `latest`.",
+    description: "Gets the Image Transformations setting for a zone. Accepted values are `off`, `on`, `open`, and `latest`.\n\nGET /zones/{zone_id}/settings/image_resizing",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -168,11 +180,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_image_resizing_response": speed_image_resizing_response_output,
-        "speed_image_resizing_value": speed_image_resizing_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_image_resizing_response": speed_image_resizing_response,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -223,12 +234,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_image_resizing_response": speed_image_resizing_response_output,
-        "speed_image_resizing_value": speed_image_resizing_value_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_image_resizing_response": speed_image_resizing_response,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/originH2MaxStreams/outputs.ts b/src/generated/forge-mcp/zones/originH2MaxStreams/outputs.ts
index 7bb4f65a2..f0247382b 100644
--- a/src/generated/forge-mcp/zones/originH2MaxStreams/outputs.ts
+++ b/src/generated/forge-mcp/zones/originH2MaxStreams/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_origin_h2_max_streams` in responses.
  */
-export const cache_settings_origin_h2_max_streams_output: JsonSchema = {
+export const cache$$settings_origin_h2_max_streams: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -20,7 +20,7 @@ export const cache_settings_origin_h2_max_streams_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/cache-settings_origin_h2_max_streams_value"
+          "type": "integer"
         }
       },
       "type": "object"
@@ -32,7 +32,7 @@ export const cache_settings_origin_h2_max_streams_output: JsonSchema = {
  * The schema of `cache-settings_origin_h2_max_streams_response_value` in
  * responses.
  */
-export const cache_settings_origin_h2_max_streams_response_value_output: JsonSchema = {
+export const cache$$settings_origin_h2_max_streams_response_value: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_api-response-common"
@@ -47,10 +47,3 @@ export const cache_settings_origin_h2_max_streams_response_value_output: JsonSch
     }
   ]
 };
-
-/**
- * The schema of `cache-settings_origin_h2_max_streams_value` in responses.
- */
-export const cache_settings_origin_h2_max_streams_value_output: JsonSchema = {
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/zones/originH2MaxStreams/schemas.ts b/src/generated/forge-mcp/zones/originH2MaxStreams/schemas.ts
deleted file mode 100644
index 9d9c4a0fa..000000000
--- a/src/generated/forge-mcp/zones/originH2MaxStreams/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `cache-settings_origin_h2_max_streams_value`.
- */
-export const cache_settings_origin_h2_max_streams_value: JsonSchema = {
-  "description": "Value of the Origin H2 Max Streams Setting.",
-  "type": "integer"
-};
diff --git a/src/generated/forge-mcp/zones/originH2MaxStreams/tools.ts b/src/generated/forge-mcp/zones/originH2MaxStreams/tools.ts
index a2e0f3054..8aa7ba61a 100644
--- a/src/generated/forge-mcp/zones/originH2MaxStreams/tools.ts
+++ b/src/generated/forge-mcp/zones/originH2MaxStreams/tools.ts
@@ -3,35 +3,32 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_messages_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
 } from "../../outputs.js";
-import { cache_settings_identifier } from "../../schemas.js";
 import {
-  cache_settings_origin_h2_max_streams_output,
-  cache_settings_origin_h2_max_streams_response_value_output,
-  cache_settings_origin_h2_max_streams_value_output,
+  cache$$settings_origin_h2_max_streams,
+  cache$$settings_origin_h2_max_streams_response_value,
 } from "./outputs.js";
-import { cache_settings_origin_h2_max_streams_value } from "./schemas.js";
 
 /**
- * The tools of `zones.origin_h2_max_streams`.
+ * The tools of `zones.originH2MaxStreams`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_origin_h2_max_streams_edit",
+    name: "zones_originH2MaxStreams_edit",
     title: "Change Origin H2 Max Streams Setting",
-    description: "Origin H2 Max Streams configures the max number of concurrent requests that Cloudflare will send within the same connection when communicating with the origin server, if the origin supports it. Note that if your origin does not support H2 multiplexing, 5xx errors may be observed, particularly 520s. Also note that the default value is `100` for all plan types except Enterprise where it is `1`. `1` means that H2 multiplexing is disabled.",
+    description: "Origin H2 Max Streams configures the max number of concurrent requests that Cloudflare will send within the same connection when communicating with the origin server, if the origin supports it. Note that if your origin does not support H2 multiplexing, 5xx errors may be observed, particularly 520s. Also note that the default value is `100` for all plan types except Enterprise where it is `1`. `1` means that H2 multiplexing is disabled.\n\nPATCH /zones/{zone_id}/settings/origin_h2_max_streams",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/cache-settings_origin_h2_max_streams_value",
-              "description": "Value of the Origin H2 Max Streams Setting."
+              "description": "Value of the Origin H2 Max Streams Setting.",
+              "type": "integer"
             }
           },
           "required": [
@@ -39,29 +36,34 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_origin_h2_max_streams_value": cache_settings_origin_h2_max_streams_value,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cache-settings_origin_h2_max_streams_response_value",
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_h2_max_streams": cache_settings_origin_h2_max_streams_output,
-        "cache-settings_origin_h2_max_streams_response_value": cache_settings_origin_h2_max_streams_response_value_output,
-        "cache-settings_origin_h2_max_streams_value": cache_settings_origin_h2_max_streams_value_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_h2_max_streams": cache$$settings_origin_h2_max_streams,
+        "cache-settings_origin_h2_max_streams_response_value": cache$$settings_origin_h2_max_streams_response_value,
       },
     },
     annotations: {
@@ -100,13 +102,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_h2_max_streams": cache_settings_origin_h2_max_streams_output,
-        "cache-settings_origin_h2_max_streams_response_value": cache_settings_origin_h2_max_streams_response_value_output,
-        "cache-settings_origin_h2_max_streams_value": cache_settings_origin_h2_max_streams_value_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_h2_max_streams": cache$$settings_origin_h2_max_streams,
+        "cache-settings_origin_h2_max_streams_response_value": cache$$settings_origin_h2_max_streams_response_value,
       },
     },
     request: (args) => ({
@@ -115,33 +116,39 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_origin_h2_max_streams_get",
+    name: "zones_originH2MaxStreams_get",
     title: "Get Origin H2 Max Streams Setting",
-    description: "Origin H2 Max Streams configures the max number of concurrent requests that Cloudflare will send within the same connection when communicating with the origin server, if the origin supports it. Note that if your origin does not support H2 multiplexing, 5xx errors may be observed, particularly 520s. Also note that the default value is `100` for all plan types except Enterprise where it is `1`. `1` means that H2 multiplexing is disabled.",
+    description: "Origin H2 Max Streams configures the max number of concurrent requests that Cloudflare will send within the same connection when communicating with the origin server, if the origin supports it. Note that if your origin does not support H2 multiplexing, 5xx errors may be observed, particularly 520s. Also note that the default value is `100` for all plan types except Enterprise where it is `1`. `1` means that H2 multiplexing is disabled.\n\nGET /zones/{zone_id}/settings/origin_h2_max_streams",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/cache-settings_origin_h2_max_streams_response_value",
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_h2_max_streams": cache_settings_origin_h2_max_streams_output,
-        "cache-settings_origin_h2_max_streams_response_value": cache_settings_origin_h2_max_streams_response_value_output,
-        "cache-settings_origin_h2_max_streams_value": cache_settings_origin_h2_max_streams_value_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_h2_max_streams": cache$$settings_origin_h2_max_streams,
+        "cache-settings_origin_h2_max_streams_response_value": cache$$settings_origin_h2_max_streams_response_value,
       },
     },
     annotations: {
@@ -182,13 +189,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_origin_h2_max_streams": cache_settings_origin_h2_max_streams_output,
-        "cache-settings_origin_h2_max_streams_response_value": cache_settings_origin_h2_max_streams_response_value_output,
-        "cache-settings_origin_h2_max_streams_value": cache_settings_origin_h2_max_streams_value_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_h2_max_streams": cache$$settings_origin_h2_max_streams,
+        "cache-settings_origin_h2_max_streams_response_value": cache$$settings_origin_h2_max_streams_response_value,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/originMaxHttpVersion/outputs.ts b/src/generated/forge-mcp/zones/originMaxHttpVersion/outputs.ts
index 9a2f4bc94..bc83f4279 100644
--- a/src/generated/forge-mcp/zones/originMaxHttpVersion/outputs.ts
+++ b/src/generated/forge-mcp/zones/originMaxHttpVersion/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_origin_max_http_version` in responses.
  */
-export const cache_settings_origin_max_http_version_output: JsonSchema = {
+export const cache$$settings_origin_max_http_version: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -20,7 +20,11 @@ export const cache_settings_origin_max_http_version_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/cache-settings_origin_max_http_version_value"
+          "enum": [
+            "2",
+            "1"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -32,7 +36,7 @@ export const cache_settings_origin_max_http_version_output: JsonSchema = {
  * The schema of `cache-settings_origin_max_http_version_response_value` in
  * responses.
  */
-export const cache_settings_origin_max_http_version_response_value_output: JsonSchema = {
+export const cache$$settings_origin_max_http_version_response_value: JsonSchema = {
   "properties": {
     "result": {
       "$ref": "#/$defs/cache-settings_origin_max_http_version"
@@ -40,14 +44,3 @@ export const cache_settings_origin_max_http_version_response_value_output: JsonS
   },
   "type": "object"
 };
-
-/**
- * The schema of `cache-settings_origin_max_http_version_value` in responses.
- */
-export const cache_settings_origin_max_http_version_value_output: JsonSchema = {
-  "enum": [
-    "2",
-    "1"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/originMaxHttpVersion/schemas.ts b/src/generated/forge-mcp/zones/originMaxHttpVersion/schemas.ts
deleted file mode 100644
index b63510e9e..000000000
--- a/src/generated/forge-mcp/zones/originMaxHttpVersion/schemas.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `cache-settings_origin_max_http_version_value`.
- */
-export const cache_settings_origin_max_http_version_value: JsonSchema = {
-  "description": "Value of the Origin Max HTTP Version Setting.",
-  "enum": [
-    "2",
-    "1"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/originMaxHttpVersion/tools.ts b/src/generated/forge-mcp/zones/originMaxHttpVersion/tools.ts
index 8c09abefe..0fe9f6f17 100644
--- a/src/generated/forge-mcp/zones/originMaxHttpVersion/tools.ts
+++ b/src/generated/forge-mcp/zones/originMaxHttpVersion/tools.ts
@@ -3,41 +3,38 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_editable_output,
-  cache_settings_messages_output,
-  cache_settings_modified_on_output,
-  cache_settings_result_object_output,
-  cache_settings_setting_id_output,
-  cache_settings_setting_value_output,
-  cache_settings_zone_cache_settings_response_single_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
+  cache$$settings_result$$object,
+  cache$$settings_zone_cache_settings_response_single,
 } from "../../outputs.js";
-import { cache_settings_identifier } from "../../schemas.js";
 import {
-  cache_settings_origin_max_http_version_output,
-  cache_settings_origin_max_http_version_response_value_output,
-  cache_settings_origin_max_http_version_value_output,
+  cache$$settings_origin_max_http_version,
+  cache$$settings_origin_max_http_version_response_value,
 } from "./outputs.js";
-import { cache_settings_origin_max_http_version_value } from "./schemas.js";
 
 /**
- * The tools of `zones.origin_max_http_version`.
+ * The tools of `zones.originMaxHttpVersion`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_origin_max_http_version_edit",
+    name: "zones_originMaxHttpVersion_edit",
     title: "Change Origin Max HTTP Version Setting",
-    description: "Origin Max HTTP Setting Version sets the highest HTTP version Cloudflare will attempt to use with your origin. This setting allows Cloudflare to make HTTP/2 requests to your origin. (Refer to [Enable HTTP/2 to Origin](https://developers.cloudflare.com/cache/how-to/enable-http2-to-origin/), for more information.). The default value is \"2\" for all plan types except Enterprise where it is \"1\".",
+    description: "Origin Max HTTP Setting Version sets the highest HTTP version Cloudflare will attempt to use with your origin. This setting allows Cloudflare to make HTTP/2 requests to your origin. (Refer to [Enable HTTP/2 to Origin](https://developers.cloudflare.com/cache/how-to/enable-http2-to-origin/), for more information.). The default value is \"2\" for all plan types except Enterprise where it is \"1\".\n\nPATCH /zones/{zone_id}/settings/origin_max_http_version",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/cache-settings_origin_max_http_version_value",
-              "description": "Value of the Origin Max HTTP Version Setting."
+              "description": "Value of the Origin Max HTTP Version Setting.",
+              "enum": [
+                "2",
+                "1"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -45,19 +42,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_origin_max_http_version_value": cache_settings_origin_max_http_version_value,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -69,18 +72,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_max_http_version": cache_settings_origin_max_http_version_output,
-        "cache-settings_origin_max_http_version_response_value": cache_settings_origin_max_http_version_response_value_output,
-        "cache-settings_origin_max_http_version_value": cache_settings_origin_max_http_version_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_max_http_version": cache$$settings_origin_max_http_version,
+        "cache-settings_origin_max_http_version_response_value": cache$$settings_origin_max_http_version_response_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -126,19 +124,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_max_http_version": cache_settings_origin_max_http_version_output,
-        "cache-settings_origin_max_http_version_response_value": cache_settings_origin_max_http_version_response_value_output,
-        "cache-settings_origin_max_http_version_value": cache_settings_origin_max_http_version_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_max_http_version": cache$$settings_origin_max_http_version,
+        "cache-settings_origin_max_http_version_response_value": cache$$settings_origin_max_http_version_response_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -147,23 +140,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_origin_max_http_version_get",
+    name: "zones_originMaxHttpVersion_get",
     title: "Get Origin Max HTTP Version Setting",
-    description: "Origin Max HTTP Setting Version sets the highest HTTP version Cloudflare will attempt to use with your origin. This setting allows Cloudflare to make HTTP/2 requests to your origin. (Refer to [Enable HTTP/2 to Origin](https://developers.cloudflare.com/cache/how-to/enable-http2-to-origin/), for more information.). The default value is \"2\" for all plan types except Enterprise where it is \"1\".",
+    description: "Origin Max HTTP Setting Version sets the highest HTTP version Cloudflare will attempt to use with your origin. This setting allows Cloudflare to make HTTP/2 requests to your origin. (Refer to [Enable HTTP/2 to Origin](https://developers.cloudflare.com/cache/how-to/enable-http2-to-origin/), for more information.). The default value is \"2\" for all plan types except Enterprise where it is \"1\".\n\nGET /zones/{zone_id}/settings/origin_max_http_version",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -175,18 +175,13 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_max_http_version": cache_settings_origin_max_http_version_output,
-        "cache-settings_origin_max_http_version_response_value": cache_settings_origin_max_http_version_response_value_output,
-        "cache-settings_origin_max_http_version_value": cache_settings_origin_max_http_version_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_max_http_version": cache$$settings_origin_max_http_version,
+        "cache-settings_origin_max_http_version_response_value": cache$$settings_origin_max_http_version_response_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -234,19 +229,14 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_max_http_version": cache_settings_origin_max_http_version_output,
-        "cache-settings_origin_max_http_version_response_value": cache_settings_origin_max_http_version_response_value_output,
-        "cache-settings_origin_max_http_version_value": cache_settings_origin_max_http_version_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_max_http_version": cache$$settings_origin_max_http_version,
+        "cache-settings_origin_max_http_version_response_value": cache$$settings_origin_max_http_version_response_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/originTlsComplianceModes/outputs.ts b/src/generated/forge-mcp/zones/originTlsComplianceModes/outputs.ts
index e97174d1d..a892d3340 100644
--- a/src/generated/forge-mcp/zones/originTlsComplianceModes/outputs.ts
+++ b/src/generated/forge-mcp/zones/originTlsComplianceModes/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_origin_tls_compliance_modes` in responses.
  */
-export const cache_settings_origin_tls_compliance_modes_output: JsonSchema = {
+export const cache$$settings_origin_tls_compliance_modes: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/cache-settings_base"
@@ -29,7 +29,7 @@ export const cache_settings_origin_tls_compliance_modes_output: JsonSchema = {
  * The schema of `cache-settings_origin_tls_compliance_modes_response_value` in
  * responses.
  */
-export const cache_settings_origin_tls_compliance_modes_response_value_output: JsonSchema = {
+export const cache$$settings_origin_tls_compliance_modes_response_value: JsonSchema = {
   "properties": {
     "result": {
       "allOf": [
@@ -57,7 +57,7 @@ export const cache_settings_origin_tls_compliance_modes_response_value_output: J
  * The schema of `cache-settings_origin_tls_compliance_modes_value` in
  * responses.
  */
-export const cache_settings_origin_tls_compliance_modes_value_output: JsonSchema = {
+export const cache$$settings_origin_tls_compliance_modes_value: JsonSchema = {
   "items": {
     "type": "string"
   },
diff --git a/src/generated/forge-mcp/zones/originTlsComplianceModes/schemas.ts b/src/generated/forge-mcp/zones/originTlsComplianceModes/schemas.ts
index 79481cbd8..71dbd45cc 100644
--- a/src/generated/forge-mcp/zones/originTlsComplianceModes/schemas.ts
+++ b/src/generated/forge-mcp/zones/originTlsComplianceModes/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `cache-settings_origin_tls_compliance_modes_value`.
  */
-export const cache_settings_origin_tls_compliance_modes_value: JsonSchema = {
+export const cache$$settings_origin_tls_compliance_modes_value: JsonSchema = {
   "description": "List of TLS compliance modes that constrain the key-exchange algorithms Cloudflare may use when establishing the TLS connection to the zone's origin. Currently supported values are `fips` (FIPS-approved curves) and `pqh` (post-quantum hybrid). Future modes (e.g. `cnsa2`) may be added; clients should treat unknown values as opaque strings. Multiple modes are combined as the intersection of their permitted algorithm lists; selections whose intersection is empty are rejected. An empty list clears the constraint.",
   "items": {
     "type": "string"
diff --git a/src/generated/forge-mcp/zones/originTlsComplianceModes/tools.ts b/src/generated/forge-mcp/zones/originTlsComplianceModes/tools.ts
index 006ecdb89..d3e76d1e8 100644
--- a/src/generated/forge-mcp/zones/originTlsComplianceModes/tools.ts
+++ b/src/generated/forge-mcp/zones/originTlsComplianceModes/tools.ts
@@ -3,49 +3,51 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  cache_settings_api_response_common_failure_output,
-  cache_settings_api_response_common_output,
-  cache_settings_base_output,
-  cache_settings_editable_output,
-  cache_settings_messages_output,
-  cache_settings_modified_on_output,
-  cache_settings_result_object_delete_output,
-  cache_settings_result_object_output,
-  cache_settings_setting_id_output,
-  cache_settings_setting_value_output,
-  cache_settings_zone_cache_settings_delete_response_single_output,
-  cache_settings_zone_cache_settings_response_single_output,
+  cache$$settings_api$$response$$common,
+  cache$$settings_api$$response$$common$$failure,
+  cache$$settings_base,
+  cache$$settings_messages,
+  cache$$settings_result$$object,
+  cache$$settings_result$$object$$delete,
+  cache$$settings_zone_cache_settings_delete_response_single,
+  cache$$settings_zone_cache_settings_response_single,
 } from "../../outputs.js";
-import { cache_settings_identifier } from "../../schemas.js";
 import {
-  cache_settings_origin_tls_compliance_modes_output,
-  cache_settings_origin_tls_compliance_modes_response_value_output,
-  cache_settings_origin_tls_compliance_modes_value_output,
+  cache$$settings_origin_tls_compliance_modes,
+  cache$$settings_origin_tls_compliance_modes_response_value,
+  cache$$settings_origin_tls_compliance_modes_value,
 } from "./outputs.js";
-import { cache_settings_origin_tls_compliance_modes_value } from "./schemas.js";
+import { cache$$settings_origin_tls_compliance_modes_value as cache$$settings_origin_tls_compliance_modes_value$ } from "./schemas.js";
 
 /**
- * The tools of `zones.origin_tls_compliance_modes`.
+ * The tools of `zones.originTlsComplianceModes`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_origin_tls_compliance_modes_delete",
+    name: "zones_originTlsComplianceModes_delete",
     title: "Delete Origin TLS Compliance Modes setting",
-    description: "Delete the Origin TLS Compliance Modes setting for the zone, removing any configured compliance constraint. After deletion, Cloudflare's default behavior applies (no compliance filtering of the key-exchange algorithm list sent to the origin).",
+    description: "Delete the Origin TLS Compliance Modes setting for the zone, removing any configured compliance constraint. After deletion, Cloudflare's default behavior applies (no compliance filtering of the key-exchange algorithm list sent to the origin).\n\nDELETE /zones/{zone_id}/settings/origin_tls_compliance_modes",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -62,15 +64,12 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_tls_compliance_modes": cache_settings_origin_tls_compliance_modes_output,
-        "cache-settings_result-object-delete": cache_settings_result_object_delete_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_zone_cache_settings_delete_response_single": cache_settings_zone_cache_settings_delete_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_tls_compliance_modes": cache$$settings_origin_tls_compliance_modes,
+        "cache-settings_result-object-delete": cache$$settings_result$$object$$delete,
+        "cache-settings_zone_cache_settings_delete_response_single": cache$$settings_zone_cache_settings_delete_response_single,
       },
     },
     annotations: {
@@ -112,16 +111,13 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_tls_compliance_modes": cache_settings_origin_tls_compliance_modes_output,
-        "cache-settings_result-object-delete": cache_settings_result_object_delete_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_zone_cache_settings_delete_response_single": cache_settings_zone_cache_settings_delete_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_tls_compliance_modes": cache$$settings_origin_tls_compliance_modes,
+        "cache-settings_result-object-delete": cache$$settings_result$$object$$delete,
+        "cache-settings_zone_cache_settings_delete_response_single": cache$$settings_zone_cache_settings_delete_response_single,
       },
     },
     request: (args) => ({
@@ -129,9 +125,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_origin_tls_compliance_modes_edit",
+    name: "zones_originTlsComplianceModes_edit",
     title: "Change Origin TLS Compliance Modes setting",
-    description: "Update the set of TLS compliance modes for the zone. PATCH performs a full replace of the modes list, not a merge — the request body is treated as the complete new list, and any modes not present in it are removed. (To remove a single mode from an existing configuration, send the updated list without it.) The request body must be of the form `{\"value\": [\"fips\", \"pqh\"]}`. Currently supported modes are `fips` and `pqh`; an empty list clears the constraint. Future modes (e.g. `cnsa2`) may be added; clients should treat unknown values as opaque strings. Invalid mode values are rejected with a 4xx response.",
+    description: "Update the set of TLS compliance modes for the zone. PATCH performs a full replace of the modes list, not a merge — the request body is treated as the complete new list, and any modes not present in it are removed. (To remove a single mode from an existing configuration, send the updated list without it.) The request body must be of the form `{\"value\": [\"fips\", \"pqh\"]}`. Currently supported modes are `fips` and `pqh`; an empty list clears the constraint. Future modes (e.g. `cnsa2`) may be added; clients should treat unknown values as opaque strings. Invalid mode values are rejected with a 4xx response.\n\nPATCH /zones/{zone_id}/settings/origin_tls_compliance_modes",
     inputSchema: {
       type: "object",
       properties: {
@@ -147,18 +143,27 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_origin_tls_compliance_modes_value": cache_settings_origin_tls_compliance_modes_value,
+        "cache-settings_origin_tls_compliance_modes_value": cache$$settings_origin_tls_compliance_modes_value$,
       },
     },
     outputSchema: {
@@ -171,18 +176,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_tls_compliance_modes": cache_settings_origin_tls_compliance_modes_output,
-        "cache-settings_origin_tls_compliance_modes_response_value": cache_settings_origin_tls_compliance_modes_response_value_output,
-        "cache-settings_origin_tls_compliance_modes_value": cache_settings_origin_tls_compliance_modes_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_tls_compliance_modes": cache$$settings_origin_tls_compliance_modes,
+        "cache-settings_origin_tls_compliance_modes_response_value": cache$$settings_origin_tls_compliance_modes_response_value,
+        "cache-settings_origin_tls_compliance_modes_value": cache$$settings_origin_tls_compliance_modes_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -219,19 +220,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_tls_compliance_modes": cache_settings_origin_tls_compliance_modes_output,
-        "cache-settings_origin_tls_compliance_modes_response_value": cache_settings_origin_tls_compliance_modes_response_value_output,
-        "cache-settings_origin_tls_compliance_modes_value": cache_settings_origin_tls_compliance_modes_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_tls_compliance_modes": cache$$settings_origin_tls_compliance_modes,
+        "cache-settings_origin_tls_compliance_modes_response_value": cache$$settings_origin_tls_compliance_modes_response_value,
+        "cache-settings_origin_tls_compliance_modes_value": cache$$settings_origin_tls_compliance_modes_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -240,23 +237,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_origin_tls_compliance_modes_get",
+    name: "zones_originTlsComplianceModes_get",
     title: "Get Origin TLS Compliance Modes setting",
-    description: "Origin TLS Compliance Modes constrains the set of TLS key-exchange algorithms Cloudflare may use when establishing the TLS connection to the zone's origin. The value is a list of named compliance modes (currently `fips` and `pqh`). Multiple modes are combined as the intersection of their permitted algorithm lists. An empty list (or no rule configured) means no compliance constraint is applied.",
+    description: "Origin TLS Compliance Modes constrains the set of TLS key-exchange algorithms Cloudflare may use when establishing the TLS connection to the zone's origin. The value is a list of named compliance modes (currently `fips` and `pqh`). Multiple modes are combined as the intersection of their permitted algorithm lists. An empty list (or no rule configured) means no compliance constraint is applied.\n\nGET /zones/{zone_id}/settings/origin_tls_compliance_modes",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -268,18 +272,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_tls_compliance_modes": cache_settings_origin_tls_compliance_modes_output,
-        "cache-settings_origin_tls_compliance_modes_response_value": cache_settings_origin_tls_compliance_modes_response_value_output,
-        "cache-settings_origin_tls_compliance_modes_value": cache_settings_origin_tls_compliance_modes_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_tls_compliance_modes": cache$$settings_origin_tls_compliance_modes,
+        "cache-settings_origin_tls_compliance_modes_response_value": cache$$settings_origin_tls_compliance_modes_response_value,
+        "cache-settings_origin_tls_compliance_modes_value": cache$$settings_origin_tls_compliance_modes_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -316,19 +316,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_tls_compliance_modes": cache_settings_origin_tls_compliance_modes_output,
-        "cache-settings_origin_tls_compliance_modes_response_value": cache_settings_origin_tls_compliance_modes_response_value_output,
-        "cache-settings_origin_tls_compliance_modes_value": cache_settings_origin_tls_compliance_modes_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_tls_compliance_modes": cache$$settings_origin_tls_compliance_modes,
+        "cache-settings_origin_tls_compliance_modes_response_value": cache$$settings_origin_tls_compliance_modes_response_value,
+        "cache-settings_origin_tls_compliance_modes_value": cache$$settings_origin_tls_compliance_modes_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
@@ -336,9 +332,9 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_origin_tls_compliance_modes_update",
+    name: "zones_originTlsComplianceModes_update",
     title: "Replace Origin TLS Compliance Modes setting",
-    description: "Replace the entire set of TLS compliance modes for the zone with the list provided in the request body. PUT performs a full replace, not a merge — any modes not present in the request body are removed. The request body must be of the form `{\"value\": [\"fips\", \"pqh\"]}`. Currently supported modes are `fips` and `pqh`; an empty list clears the constraint. Future modes (e.g. `cnsa2`) may be added; clients should treat unknown values as opaque strings. Invalid mode values are rejected with a 4xx response.",
+    description: "Replace the entire set of TLS compliance modes for the zone with the list provided in the request body. PUT performs a full replace, not a merge — any modes not present in the request body are removed. The request body must be of the form `{\"value\": [\"fips\", \"pqh\"]}`. Currently supported modes are `fips` and `pqh`; an empty list clears the constraint. Future modes (e.g. `cnsa2`) may be added; clients should treat unknown values as opaque strings. Invalid mode values are rejected with a 4xx response.\n\nPUT /zones/{zone_id}/settings/origin_tls_compliance_modes",
     inputSchema: {
       type: "object",
       properties: {
@@ -354,18 +350,27 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/cache-settings_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "cache-settings_identifier": cache_settings_identifier,
-        "cache-settings_origin_tls_compliance_modes_value": cache_settings_origin_tls_compliance_modes_value,
+        "cache-settings_origin_tls_compliance_modes_value": cache$$settings_origin_tls_compliance_modes_value$,
       },
     },
     outputSchema: {
@@ -378,18 +383,14 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_tls_compliance_modes": cache_settings_origin_tls_compliance_modes_output,
-        "cache-settings_origin_tls_compliance_modes_response_value": cache_settings_origin_tls_compliance_modes_response_value_output,
-        "cache-settings_origin_tls_compliance_modes_value": cache_settings_origin_tls_compliance_modes_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_tls_compliance_modes": cache$$settings_origin_tls_compliance_modes,
+        "cache-settings_origin_tls_compliance_modes_response_value": cache$$settings_origin_tls_compliance_modes_response_value,
+        "cache-settings_origin_tls_compliance_modes_value": cache$$settings_origin_tls_compliance_modes_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     annotations: {
@@ -426,19 +427,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "cache-settings_api-response-common": cache_settings_api_response_common_output,
-        "cache-settings_api-response-common-failure": cache_settings_api_response_common_failure_output,
-        "cache-settings_base": cache_settings_base_output,
-        "cache-settings_editable": cache_settings_editable_output,
-        "cache-settings_messages": cache_settings_messages_output,
-        "cache-settings_modified_on": cache_settings_modified_on_output,
-        "cache-settings_origin_tls_compliance_modes": cache_settings_origin_tls_compliance_modes_output,
-        "cache-settings_origin_tls_compliance_modes_response_value": cache_settings_origin_tls_compliance_modes_response_value_output,
-        "cache-settings_origin_tls_compliance_modes_value": cache_settings_origin_tls_compliance_modes_value_output,
-        "cache-settings_result-object": cache_settings_result_object_output,
-        "cache-settings_setting_id": cache_settings_setting_id_output,
-        "cache-settings_setting_value": cache_settings_setting_value_output,
-        "cache-settings_zone_cache_settings_response_single": cache_settings_zone_cache_settings_response_single_output,
+        "cache-settings_api-response-common": cache$$settings_api$$response$$common,
+        "cache-settings_api-response-common-failure": cache$$settings_api$$response$$common$$failure,
+        "cache-settings_base": cache$$settings_base,
+        "cache-settings_messages": cache$$settings_messages,
+        "cache-settings_origin_tls_compliance_modes": cache$$settings_origin_tls_compliance_modes,
+        "cache-settings_origin_tls_compliance_modes_response_value": cache$$settings_origin_tls_compliance_modes_response_value,
+        "cache-settings_origin_tls_compliance_modes_value": cache$$settings_origin_tls_compliance_modes_value,
+        "cache-settings_result-object": cache$$settings_result$$object,
+        "cache-settings_zone_cache_settings_response_single": cache$$settings_zone_cache_settings_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/outputs.ts b/src/generated/forge-mcp/zones/outputs.ts
index 128059c16..5aa202aac 100644
--- a/src/generated/forge-mcp/zones/outputs.ts
+++ b/src/generated/forge-mcp/zones/outputs.ts
@@ -3,30 +3,10 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `bill-subs-api_schemas-frequency` in responses.
- */
-export const bill_subs_api_schemas_frequency_output: JsonSchema = {
-  "enum": [
-    "weekly",
-    "monthly",
-    "quarterly",
-    "yearly"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_schemas-name` in responses.
- */
-export const bill_subs_api_schemas_name_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zones_api-response-common` in responses.
  */
-export const zones_api_response_common_output: JsonSchema = {
+export const zones_api$$response$$common: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zones_messages"
@@ -49,7 +29,7 @@ export const zones_api_response_common_output: JsonSchema = {
 /**
  * The schema of `zones_api-response-common-failure` in responses.
  */
-export const zones_api_response_common_failure_output: JsonSchema = {
+export const zones_api$$response$$common$$failure: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zones_messages"
@@ -83,7 +63,7 @@ export const zones_api_response_common_failure_output: JsonSchema = {
 /**
  * The schema of `zones_api-response-single-id` in responses.
  */
-export const zones_api_response_single_id_output: JsonSchema = {
+export const zones_api$$response$$single$$id: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_api-response-common"
@@ -95,7 +75,7 @@ export const zones_api_response_single_id_output: JsonSchema = {
             {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/zones_identifier"
+                  "type": "string"
                 }
               },
               "required": [
@@ -114,17 +94,10 @@ export const zones_api_response_single_id_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_identifier` in responses.
- */
-export const zones_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zones_messages` in responses.
  */
-export const zones_messages_output: JsonSchema = {
+export const zones_messages: JsonSchema = {
   "items": {
     "properties": {
       "code": {
@@ -143,17 +116,10 @@ export const zones_messages_output: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `zones_paused` in responses.
- */
-export const zones_paused_output: JsonSchema = {
-  "type": "boolean"
-};
-
 /**
  * The schema of `zones_result_info` in responses.
  */
-export const zones_result_info_output: JsonSchema = {
+export const zones_result_info: JsonSchema = {
   "properties": {
     "count": {
       "type": "number"
@@ -174,23 +140,10 @@ export const zones_result_info_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_type` in responses.
- */
-export const zones_type_output: JsonSchema = {
-  "enum": [
-    "full",
-    "partial",
-    "secondary",
-    "internal"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_zone` in responses.
  */
-export const zones_zone_output: JsonSchema = {
+export const zones_zone: JsonSchema = {
   "properties": {
     "account": {
       "properties": {
@@ -302,7 +255,7 @@ export const zones_zone_output: JsonSchema = {
     "owner": {
       "properties": {
         "id": {
-          "$ref": "#/$defs/zones_identifier"
+          "type": "string"
         },
         "name": {
           "type": "string"
@@ -314,7 +267,7 @@ export const zones_zone_output: JsonSchema = {
       "type": "object"
     },
     "paused": {
-      "$ref": "#/$defs/zones_paused"
+      "type": "boolean"
     },
     "permissions": {
       "items": {
@@ -337,7 +290,7 @@ export const zones_zone_output: JsonSchema = {
           "type": "string"
         },
         "id": {
-          "$ref": "#/$defs/zones_identifier"
+          "type": "string"
         },
         "is_subscribed": {
           "type": "boolean"
@@ -369,7 +322,7 @@ export const zones_zone_output: JsonSchema = {
     "tenant": {
       "properties": {
         "id": {
-          "$ref": "#/$defs/zones_identifier"
+          "type": "string"
         },
         "name": {
           "type": "string"
@@ -380,13 +333,19 @@ export const zones_zone_output: JsonSchema = {
     "tenant_unit": {
       "properties": {
         "id": {
-          "$ref": "#/$defs/zones_identifier"
+          "type": "string"
         }
       },
       "type": "object"
     },
     "type": {
-      "$ref": "#/$defs/zones_type"
+      "enum": [
+        "full",
+        "partial",
+        "secondary",
+        "internal"
+      ],
+      "type": "string"
     },
     "vanity_name_servers": {
       "items": {
diff --git a/src/generated/forge-mcp/zones/plans/outputs.ts b/src/generated/forge-mcp/zones/plans/outputs.ts
index 9c386df91..718b80366 100644
--- a/src/generated/forge-mcp/zones/plans/outputs.ts
+++ b/src/generated/forge-mcp/zones/plans/outputs.ts
@@ -6,70 +6,41 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `bill-subs-api_available-rate-plan` in responses.
  */
-export const bill_subs_api_available_rate_plan_output: JsonSchema = {
+export const bill$$subs$$api_available$$rate$$plan: JsonSchema = {
   "properties": {
     "can_subscribe": {
-      "$ref": "#/$defs/bill-subs-api_can_subscribe"
+      "type": "boolean"
     },
     "currency": {
-      "$ref": "#/$defs/bill-subs-api_currency"
+      "type": "string"
     },
     "externally_managed": {
-      "$ref": "#/$defs/bill-subs-api_externally_managed"
+      "type": "boolean"
     },
     "frequency": {
-      "$ref": "#/$defs/bill-subs-api_schemas-frequency"
+      "enum": [
+        "weekly",
+        "monthly",
+        "quarterly",
+        "yearly"
+      ],
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/bill-subs-api_identifier"
+      "type": "string"
     },
     "is_subscribed": {
-      "$ref": "#/$defs/bill-subs-api_is_subscribed"
+      "type": "boolean"
     },
     "legacy_id": {
-      "$ref": "#/$defs/bill-subs-api_legacy_id"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/bill-subs-api_schemas-name"
+      "type": "string"
     },
     "price": {
-      "$ref": "#/$defs/bill-subs-api_schemas-price"
+      "type": "number"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `bill-subs-api_can_subscribe` in responses.
- */
-export const bill_subs_api_can_subscribe_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bill-subs-api_externally_managed` in responses.
- */
-export const bill_subs_api_externally_managed_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bill-subs-api_is_subscribed` in responses.
- */
-export const bill_subs_api_is_subscribed_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `bill-subs-api_legacy_id` in responses.
- */
-export const bill_subs_api_legacy_id_output: JsonSchema = {
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_schemas-price` in responses.
- */
-export const bill_subs_api_schemas_price_output: JsonSchema = {
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/zones/plans/tools.ts b/src/generated/forge-mcp/zones/plans/tools.ts
index 54a1d7fc7..952844b8a 100644
--- a/src/generated/forge-mcp/zones/plans/tools.ts
+++ b/src/generated/forge-mcp/zones/plans/tools.ts
@@ -3,28 +3,14 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_collection_output,
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_currency_output,
-  bill_subs_api_identifier_output,
-  bill_subs_api_messages_output,
-  bill_subs_api_result_info_output,
+  bill$$subs$$api_api$$response$$collection,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_messages,
+  bill$$subs$$api_result_info,
 } from "../../outputs.js";
-import { bill_subs_api_identifier } from "../../schemas.js";
-import {
-  bill_subs_api_schemas_frequency_output,
-  bill_subs_api_schemas_name_output,
-} from "../outputs.js";
-import {
-  bill_subs_api_available_rate_plan_output,
-  bill_subs_api_can_subscribe_output,
-  bill_subs_api_externally_managed_output,
-  bill_subs_api_is_subscribed_output,
-  bill_subs_api_legacy_id_output,
-  bill_subs_api_schemas_price_output,
-} from "./outputs.js";
+import { bill$$subs$$api_available$$rate$$plan } from "./outputs.js";
 
 /**
  * The tools of `zones.plans`.
@@ -33,26 +19,33 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_plans_get",
     title: "Available Plan Details",
-    description: "Details of the available plan that the zone can subscribe to.",
+    description: "Details of the available plan that the zone can subscribe to.\n\nGET /zones/{zone_id}/available_plans/{plan_identifier}",
     inputSchema: {
       type: "object",
       properties: {
-        "plan_identifier": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "plan_identifier": {
+              "description": "Identifier",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "plan_identifier"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "plan_identifier"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -69,19 +62,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_available-rate-plan": bill_subs_api_available_rate_plan_output,
-        "bill-subs-api_can_subscribe": bill_subs_api_can_subscribe_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_externally_managed": bill_subs_api_externally_managed_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_is_subscribed": bill_subs_api_is_subscribed_output,
-        "bill-subs-api_legacy_id": bill_subs_api_legacy_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_schemas-frequency": bill_subs_api_schemas_frequency_output,
-        "bill-subs-api_schemas-name": bill_subs_api_schemas_name_output,
-        "bill-subs-api_schemas-price": bill_subs_api_schemas_price_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_available-rate-plan": bill$$subs$$api_available$$rate$$plan,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -132,20 +116,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_available-rate-plan": bill_subs_api_available_rate_plan_output,
-        "bill-subs-api_can_subscribe": bill_subs_api_can_subscribe_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_externally_managed": bill_subs_api_externally_managed_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_is_subscribed": bill_subs_api_is_subscribed_output,
-        "bill-subs-api_legacy_id": bill_subs_api_legacy_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_schemas-frequency": bill_subs_api_schemas_frequency_output,
-        "bill-subs-api_schemas-name": bill_subs_api_schemas_name_output,
-        "bill-subs-api_schemas-price": bill_subs_api_schemas_price_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_available-rate-plan": bill$$subs$$api_available$$rate$$plan,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -155,21 +130,28 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_plans_list",
     title: "List Available Plans",
-    description: "Lists available plans the zone can subscribe to.",
+    description: "Lists available plans the zone can subscribe to.\n\nGET /zones/{zone_id}/available_plans",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -189,20 +171,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_available-rate-plan": bill_subs_api_available_rate_plan_output,
-        "bill-subs-api_can_subscribe": bill_subs_api_can_subscribe_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_externally_managed": bill_subs_api_externally_managed_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_is_subscribed": bill_subs_api_is_subscribed_output,
-        "bill-subs-api_legacy_id": bill_subs_api_legacy_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
-        "bill-subs-api_schemas-frequency": bill_subs_api_schemas_frequency_output,
-        "bill-subs-api_schemas-name": bill_subs_api_schemas_name_output,
-        "bill-subs-api_schemas-price": bill_subs_api_schemas_price_output,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_available-rate-plan": bill$$subs$$api_available$$rate$$plan,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
       },
     },
     annotations: {
@@ -256,21 +229,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_available-rate-plan": bill_subs_api_available_rate_plan_output,
-        "bill-subs-api_can_subscribe": bill_subs_api_can_subscribe_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_externally_managed": bill_subs_api_externally_managed_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_is_subscribed": bill_subs_api_is_subscribed_output,
-        "bill-subs-api_legacy_id": bill_subs_api_legacy_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
-        "bill-subs-api_schemas-frequency": bill_subs_api_schemas_frequency_output,
-        "bill-subs-api_schemas-name": bill_subs_api_schemas_name_output,
-        "bill-subs-api_schemas-price": bill_subs_api_schemas_price_output,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_available-rate-plan": bill$$subs$$api_available$$rate$$plan,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/ratePlans/outputs.ts b/src/generated/forge-mcp/zones/ratePlans/outputs.ts
index e3c69214d..218ec8acf 100644
--- a/src/generated/forge-mcp/zones/ratePlans/outputs.ts
+++ b/src/generated/forge-mcp/zones/ratePlans/outputs.ts
@@ -3,46 +3,25 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `bill-subs-api_components-schemas-name` in responses.
- */
-export const bill_subs_api_components_schemas_name_output: JsonSchema = {
-  "enum": [
-    "zones",
-    "page_rules",
-    "dedicated_certificates",
-    "dedicated_certificates_custom"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `bill-subs-api_default` in responses.
- */
-export const bill_subs_api_default_output: JsonSchema = {
-  "type": "number"
-};
-
-/**
- * The schema of `bill-subs-api_duration` in responses.
- */
-export const bill_subs_api_duration_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `bill-subs-api_plan_component_value` in responses.
  */
-export const bill_subs_api_plan_component_value_output: JsonSchema = {
+export const bill$$subs$$api_plan_component_value: JsonSchema = {
   "properties": {
     "default": {
-      "$ref": "#/$defs/bill-subs-api_default"
+      "type": "number"
     },
     "name": {
-      "$ref": "#/$defs/bill-subs-api_components-schemas-name"
+      "enum": [
+        "zones",
+        "page_rules",
+        "dedicated_certificates",
+        "dedicated_certificates_custom"
+      ],
+      "type": "string"
     },
     "unit_price": {
-      "$ref": "#/$defs/bill-subs-api_unit_price"
+      "type": "number"
     }
   },
   "type": "object"
@@ -51,7 +30,7 @@ export const bill_subs_api_plan_component_value_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_plan_response_collection` in responses.
  */
-export const bill_subs_api_plan_response_collection_output: JsonSchema = {
+export const bill$$subs$$api_plan_response_collection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-collection"
@@ -70,18 +49,10 @@ export const bill_subs_api_plan_response_collection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `bill-subs-api_rate-plan_components-schemas-identifier` in
- * responses.
- */
-export const bill_subs_api_rate_plan_components_schemas_identifier_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `bill-subs-api_schemas-component_values` in responses.
  */
-export const bill_subs_api_schemas_component_values_output: JsonSchema = {
+export const bill$$subs$$api_schemas$$component_values: JsonSchema = {
   "items": {
     "$ref": "#/$defs/bill-subs-api_plan_component_value"
   },
@@ -91,33 +62,32 @@ export const bill_subs_api_schemas_component_values_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_schemas-rate-plan` in responses.
  */
-export const bill_subs_api_schemas_rate_plan_output: JsonSchema = {
+export const bill$$subs$$api_schemas$$rate$$plan: JsonSchema = {
   "properties": {
     "components": {
       "$ref": "#/$defs/bill-subs-api_schemas-component_values"
     },
     "currency": {
-      "$ref": "#/$defs/bill-subs-api_currency"
+      "type": "string"
     },
     "duration": {
-      "$ref": "#/$defs/bill-subs-api_duration"
+      "type": "number"
     },
     "frequency": {
-      "$ref": "#/$defs/bill-subs-api_schemas-frequency"
+      "enum": [
+        "weekly",
+        "monthly",
+        "quarterly",
+        "yearly"
+      ],
+      "type": "string"
     },
     "id": {
-      "$ref": "#/$defs/bill-subs-api_rate-plan_components-schemas-identifier"
+      "type": "string"
     },
     "name": {
-      "$ref": "#/$defs/bill-subs-api_schemas-name"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `bill-subs-api_unit_price` in responses.
- */
-export const bill_subs_api_unit_price_output: JsonSchema = {
-  "type": "number"
-};
diff --git a/src/generated/forge-mcp/zones/ratePlans/tools.ts b/src/generated/forge-mcp/zones/ratePlans/tools.ts
index 2d64281ca..3ac200e19 100644
--- a/src/generated/forge-mcp/zones/ratePlans/tools.ts
+++ b/src/generated/forge-mcp/zones/ratePlans/tools.ts
@@ -3,72 +3,60 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_collection_output,
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_currency_output,
-  bill_subs_api_messages_output,
-  bill_subs_api_result_info_output,
+  bill$$subs$$api_api$$response$$collection,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_messages,
+  bill$$subs$$api_result_info,
 } from "../../outputs.js";
-import { bill_subs_api_identifier } from "../../schemas.js";
 import {
-  bill_subs_api_schemas_frequency_output,
-  bill_subs_api_schemas_name_output,
-} from "../outputs.js";
-import {
-  bill_subs_api_components_schemas_name_output,
-  bill_subs_api_default_output,
-  bill_subs_api_duration_output,
-  bill_subs_api_plan_component_value_output,
-  bill_subs_api_plan_response_collection_output,
-  bill_subs_api_rate_plan_components_schemas_identifier_output,
-  bill_subs_api_schemas_component_values_output,
-  bill_subs_api_schemas_rate_plan_output,
-  bill_subs_api_unit_price_output,
+  bill$$subs$$api_plan_component_value,
+  bill$$subs$$api_plan_response_collection,
+  bill$$subs$$api_schemas$$component_values,
+  bill$$subs$$api_schemas$$rate$$plan,
 } from "./outputs.js";
 
 /**
- * The tools of `zones.rate_plans`.
+ * The tools of `zones.ratePlans`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_rate_plans_get",
+    name: "zones_ratePlans_get",
     title: "List Available Rate Plans",
-    description: "Lists all rate plans the zone can subscribe to.",
+    description: "Lists all rate plans the zone can subscribe to.\n\nGET /zones/{zone_id}/available_rate_plans",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_plan_response_collection",
       $defs: {
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_components-schemas-name": bill_subs_api_components_schemas_name_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_default": bill_subs_api_default_output,
-        "bill-subs-api_duration": bill_subs_api_duration_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_plan_component_value": bill_subs_api_plan_component_value_output,
-        "bill-subs-api_plan_response_collection": bill_subs_api_plan_response_collection_output,
-        "bill-subs-api_rate-plan_components-schemas-identifier": bill_subs_api_rate_plan_components_schemas_identifier_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
-        "bill-subs-api_schemas-component_values": bill_subs_api_schemas_component_values_output,
-        "bill-subs-api_schemas-frequency": bill_subs_api_schemas_frequency_output,
-        "bill-subs-api_schemas-name": bill_subs_api_schemas_name_output,
-        "bill-subs-api_schemas-rate-plan": bill_subs_api_schemas_rate_plan_output,
-        "bill-subs-api_unit_price": bill_subs_api_unit_price_output,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_plan_component_value": bill$$subs$$api_plan_component_value,
+        "bill-subs-api_plan_response_collection": bill$$subs$$api_plan_response_collection,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
+        "bill-subs-api_schemas-component_values": bill$$subs$$api_schemas$$component_values,
+        "bill-subs-api_schemas-rate-plan": bill$$subs$$api_schemas$$rate$$plan,
       },
     },
     annotations: {
@@ -107,23 +95,15 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-collection": bill_subs_api_api_response_collection_output,
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_components-schemas-name": bill_subs_api_components_schemas_name_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_default": bill_subs_api_default_output,
-        "bill-subs-api_duration": bill_subs_api_duration_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_plan_component_value": bill_subs_api_plan_component_value_output,
-        "bill-subs-api_plan_response_collection": bill_subs_api_plan_response_collection_output,
-        "bill-subs-api_rate-plan_components-schemas-identifier": bill_subs_api_rate_plan_components_schemas_identifier_output,
-        "bill-subs-api_result_info": bill_subs_api_result_info_output,
-        "bill-subs-api_schemas-component_values": bill_subs_api_schemas_component_values_output,
-        "bill-subs-api_schemas-frequency": bill_subs_api_schemas_frequency_output,
-        "bill-subs-api_schemas-name": bill_subs_api_schemas_name_output,
-        "bill-subs-api_schemas-rate-plan": bill_subs_api_schemas_rate_plan_output,
-        "bill-subs-api_unit_price": bill_subs_api_unit_price_output,
+        "bill-subs-api_api-response-collection": bill$$subs$$api_api$$response$$collection,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_plan_component_value": bill$$subs$$api_plan_component_value,
+        "bill-subs-api_plan_response_collection": bill$$subs$$api_plan_response_collection,
+        "bill-subs-api_result_info": bill$$subs$$api_result_info,
+        "bill-subs-api_schemas-component_values": bill$$subs$$api_schemas$$component_values,
+        "bill-subs-api_schemas-rate-plan": bill$$subs$$api_schemas$$rate$$plan,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/rum/outputs.ts b/src/generated/forge-mcp/zones/rum/outputs.ts
index a6b8c9b2a..95e1498ee 100644
--- a/src/generated/forge-mcp/zones/rum/outputs.ts
+++ b/src/generated/forge-mcp/zones/rum/outputs.ts
@@ -3,24 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `rum_editable` in responses.
- */
-export const rum_editable_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `rum_id` in responses.
- */
-export const rum_id_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `rum_rum-site-response-single` in responses.
  */
-export const rum_rum_site_response_single_output: JsonSchema = {
+export const rum_rum$$site$$response$$single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/rum_api-response-common"
@@ -39,24 +25,17 @@ export const rum_rum_site_response_single_output: JsonSchema = {
 /**
  * The schema of `rum_rum_site` in responses.
  */
-export const rum_rum_site_output: JsonSchema = {
+export const rum_rum_site: JsonSchema = {
   "properties": {
     "editable": {
-      "$ref": "#/$defs/rum_editable"
+      "type": "boolean"
     },
     "id": {
-      "$ref": "#/$defs/rum_id"
+      "type": "string"
     },
     "value": {
-      "$ref": "#/$defs/rum_value"
+      "type": "string"
     }
   },
   "type": "object"
 };
-
-/**
- * The schema of `rum_value` in responses.
- */
-export const rum_value_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/rum/schemas.ts b/src/generated/forge-mcp/zones/rum/schemas.ts
index 553948afb..6edb8b273 100644
--- a/src/generated/forge-mcp/zones/rum/schemas.ts
+++ b/src/generated/forge-mcp/zones/rum/schemas.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `rum_toggle-rum-request`.
  */
-export const rum_toggle_rum_request: JsonSchema = {
+export const rum_toggle$$rum$$request: JsonSchema = {
   "properties": {
     "value": {
       "description": "Value can either be On or Off.",
diff --git a/src/generated/forge-mcp/zones/rum/tools.ts b/src/generated/forge-mcp/zones/rum/tools.ts
index 3d52d9837..5d53150bb 100644
--- a/src/generated/forge-mcp/zones/rum/tools.ts
+++ b/src/generated/forge-mcp/zones/rum/tools.ts
@@ -3,20 +3,13 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  rum_api_response_common_failure_output,
-  rum_api_response_common_output,
-  rum_messages_2_output,
-  rum_messages_output,
+  rum_api$$response$$common,
+  rum_api$$response$$common$$failure,
+  rum_messages,
+  rum_messages$$2,
 } from "../../outputs.js";
-import { rum_identifier } from "../../schemas.js";
-import {
-  rum_editable_output,
-  rum_id_output,
-  rum_rum_site_output,
-  rum_rum_site_response_single_output,
-  rum_value_output,
-} from "./outputs.js";
-import { rum_toggle_rum_request } from "./schemas.js";
+import { rum_rum$$site$$response$$single, rum_rum_site } from "./outputs.js";
+import { rum_toggle$$rum$$request } from "./schemas.js";
 
 /**
  * The tools of `zones.rum`.
@@ -25,37 +18,43 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_rum_edit",
     title: "Toggle RUM on/off for a zone",
-    description: "Toggles RUM on/off for an existing zone.",
+    description: "Toggles RUM on/off for an existing zone.\n\nPATCH /zones/{zone_id}/settings/rum",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/rum_toggle-rum-request"
         },
-        "zone_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "rum_identifier": rum_identifier,
-        "rum_toggle-rum-request": rum_toggle_rum_request,
+        "rum_toggle-rum-request": rum_toggle$$rum$$request,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/rum_rum-site-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_editable": rum_editable_output,
-        "rum_id": rum_id_output,
-        "rum_messages": rum_messages_output,
-        "rum_rum-site-response-single": rum_rum_site_response_single_output,
-        "rum_rum_site": rum_rum_site_output,
-        "rum_value": rum_value_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rum-site-response-single": rum_rum$$site$$response$$single,
+        "rum_rum_site": rum_rum_site,
       },
     },
     annotations: {
@@ -88,15 +87,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_editable": rum_editable_output,
-        "rum_id": rum_id_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rum-site-response-single": rum_rum_site_response_single_output,
-        "rum_rum_site": rum_rum_site_output,
-        "rum_value": rum_value_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rum-site-response-single": rum_rum$$site$$response$$single,
+        "rum_rum_site": rum_rum_site,
       },
     },
     request: (args) => ({
@@ -107,32 +103,36 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_rum_get",
     title: "Get RUM status for a zone",
-    description: "Retrieves RUM status for a zone.",
+    description: "Retrieves RUM status for a zone.\n\nGET /zones/{zone_id}/settings/rum",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/rum_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "rum_identifier": rum_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/rum_rum-site-response-single",
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_editable": rum_editable_output,
-        "rum_id": rum_id_output,
-        "rum_messages": rum_messages_output,
-        "rum_rum-site-response-single": rum_rum_site_response_single_output,
-        "rum_rum_site": rum_rum_site_output,
-        "rum_value": rum_value_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_messages": rum_messages,
+        "rum_rum-site-response-single": rum_rum$$site$$response$$single,
+        "rum_rum_site": rum_rum_site,
       },
     },
     annotations: {
@@ -166,15 +166,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "rum_api-response-common": rum_api_response_common_output,
-        "rum_api-response-common-failure": rum_api_response_common_failure_output,
-        "rum_editable": rum_editable_output,
-        "rum_id": rum_id_output,
-        "rum_messages": rum_messages_output,
-        "rum_messages-2": rum_messages_2_output,
-        "rum_rum-site-response-single": rum_rum_site_response_single_output,
-        "rum_rum_site": rum_rum_site_output,
-        "rum_value": rum_value_output,
+        "rum_api-response-common": rum_api$$response$$common,
+        "rum_api-response-common-failure": rum_api$$response$$common$$failure,
+        "rum_messages": rum_messages,
+        "rum_messages-2": rum_messages$$2,
+        "rum_rum-site-response-single": rum_rum$$site$$response$$single,
+        "rum_rum_site": rum_rum_site,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/schemas.ts b/src/generated/forge-mcp/zones/schemas.ts
index 11b1bacee..61661903c 100644
--- a/src/generated/forge-mcp/zones/schemas.ts
+++ b/src/generated/forge-mcp/zones/schemas.ts
@@ -3,44 +3,6 @@
 
 import type { JsonSchema } from "../_/tool.js";
 
-/**
- * The schema of `zones_identifier`.
- */
-export const zones_identifier: JsonSchema = {
-  "description": "Identifier",
-  "type": "string"
-};
-
-/**
- * The schema of `zones_name`.
- */
-export const zones_name: JsonSchema = {
-  "description": "The domain name. Per [RFC 1035](https://datatracker.ietf.org/doc/html/rfc1035#section-2.3.4) the overall zone name can be up to 253 characters, with each segment (\"label\") not exceeding 63 characters.",
-  "type": "string"
-};
-
-/**
- * The schema of `zones_paused`.
- */
-export const zones_paused: JsonSchema = {
-  "description": "Indicates whether the zone is only using Cloudflare DNS services. A\ntrue value means the zone will not receive security or performance\nbenefits.\n",
-  "type": "boolean"
-};
-
-/**
- * The schema of `zones_type`.
- */
-export const zones_type: JsonSchema = {
-  "description": "A full zone implies that DNS is hosted with Cloudflare. A partial zone is\ntypically a partner-hosted zone or a CNAME setup.\n",
-  "enum": [
-    "full",
-    "partial",
-    "secondary",
-    "internal"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_vanity_name_servers`.
  */
diff --git a/src/generated/forge-mcp/zones/settings/outputs.ts b/src/generated/forge-mcp/zones/settings/outputs.ts
index 02c931a11..c21e3743e 100644
--- a/src/generated/forge-mcp/zones/settings/outputs.ts
+++ b/src/generated/forge-mcp/zones/settings/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `zones_0rtt` in responses.
  */
-export const zones_0rtt_output: JsonSchema = {
+export const zones_0rtt: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -20,7 +20,11 @@ export const zones_0rtt_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_0rtt_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -28,21 +32,10 @@ export const zones_0rtt_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_0rtt_value` in responses.
- */
-export const zones_0rtt_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_advanced_ddos` in responses.
  */
-export const zones_advanced_ddos_output: JsonSchema = {
+export const zones_advanced_ddos: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -56,7 +49,11 @@ export const zones_advanced_ddos_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_advanced_ddos_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -64,21 +61,10 @@ export const zones_advanced_ddos_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_advanced_ddos_value` in responses.
- */
-export const zones_advanced_ddos_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_always_online` in responses.
  */
-export const zones_always_online_output: JsonSchema = {
+export const zones_always_online: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -92,7 +78,11 @@ export const zones_always_online_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_always_online_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -100,21 +90,10 @@ export const zones_always_online_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_always_online_value` in responses.
- */
-export const zones_always_online_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_always_use_https-2` in responses.
  */
-export const zones_always_use_https_2_output: JsonSchema = {
+export const zones_always_use_https$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -128,7 +107,11 @@ export const zones_always_use_https_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_always_use_https_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -136,21 +119,10 @@ export const zones_always_use_https_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_always_use_https_value` in responses.
- */
-export const zones_always_use_https_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_api-response-common-4` in responses.
  */
-export const zones_api_response_common_4_output: JsonSchema = {
+export const zones_api$$response$$common$$4: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zones_messages"
@@ -173,7 +145,7 @@ export const zones_api_response_common_4_output: JsonSchema = {
 /**
  * The schema of `zones_api-response-common-failure-3` in responses.
  */
-export const zones_api_response_common_failure_3_output: JsonSchema = {
+export const zones_api$$response$$common$$failure$$3: JsonSchema = {
   "properties": {
     "errors": {
       "$ref": "#/$defs/zones_messages"
@@ -207,7 +179,7 @@ export const zones_api_response_common_failure_3_output: JsonSchema = {
 /**
  * The schema of `zones_automatic_https_rewrites-2` in responses.
  */
-export const zones_automatic_https_rewrites_2_output: JsonSchema = {
+export const zones_automatic_https_rewrites$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -221,7 +193,11 @@ export const zones_automatic_https_rewrites_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_automatic_https_rewrites_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -229,21 +205,10 @@ export const zones_automatic_https_rewrites_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_automatic_https_rewrites_value` in responses.
- */
-export const zones_automatic_https_rewrites_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_automatic_platform_optimization` in responses.
  */
-export const zones_automatic_platform_optimization_output: JsonSchema = {
+export const zones_automatic_platform_optimization: JsonSchema = {
   "properties": {
     "cache_by_device_type": {
       "type": "boolean"
@@ -281,7 +246,7 @@ export const zones_automatic_platform_optimization_output: JsonSchema = {
 /**
  * The schema of `zones_base` in responses.
  */
-export const zones_base_output: JsonSchema = {
+export const zones_base: JsonSchema = {
   "properties": {
     "editable": {
       "enum": [
@@ -337,7 +302,7 @@ export const zones_base_output: JsonSchema = {
 /**
  * The schema of `zones_brotli` in responses.
  */
-export const zones_brotli_output: JsonSchema = {
+export const zones_brotli: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -351,7 +316,11 @@ export const zones_brotli_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_brotli_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -359,21 +328,10 @@ export const zones_brotli_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_brotli_value` in responses.
- */
-export const zones_brotli_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_browser_cache_ttl-2` in responses.
  */
-export const zones_browser_cache_ttl_2_output: JsonSchema = {
+export const zones_browser_cache_ttl$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -387,7 +345,7 @@ export const zones_browser_cache_ttl_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_browser_cache_ttl_value"
+          "type": "integer"
         }
       },
       "type": "object"
@@ -395,17 +353,10 @@ export const zones_browser_cache_ttl_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_browser_cache_ttl_value` in responses.
- */
-export const zones_browser_cache_ttl_value_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `zones_browser_check-2` in responses.
  */
-export const zones_browser_check_2_output: JsonSchema = {
+export const zones_browser_check$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -419,7 +370,11 @@ export const zones_browser_check_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_browser_check_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -427,21 +382,10 @@ export const zones_browser_check_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_browser_check_value` in responses.
- */
-export const zones_browser_check_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_cache-rules_aegis` in responses.
  */
-export const zones_cache_rules_aegis_output: JsonSchema = {
+export const zones_cache$$rules_aegis: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_cache-rules_base"
@@ -466,7 +410,7 @@ export const zones_cache_rules_aegis_output: JsonSchema = {
 /**
  * The schema of `zones_cache-rules_aegis_value` in responses.
  */
-export const zones_cache_rules_aegis_value_output: JsonSchema = {
+export const zones_cache$$rules_aegis_value: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -481,7 +425,7 @@ export const zones_cache_rules_aegis_value_output: JsonSchema = {
 /**
  * The schema of `zones_cache-rules_base` in responses.
  */
-export const zones_cache_rules_base_output: JsonSchema = {
+export const zones_cache$$rules_base: JsonSchema = {
   "properties": {
     "id": {
       "type": "string"
@@ -507,7 +451,7 @@ export const zones_cache_rules_base_output: JsonSchema = {
 /**
  * The schema of `zones_cache-rules_origin_h2_max_streams` in responses.
  */
-export const zones_cache_rules_origin_h2_max_streams_output: JsonSchema = {
+export const zones_cache$$rules_origin_h2_max_streams: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_cache-rules_base"
@@ -521,7 +465,7 @@ export const zones_cache_rules_origin_h2_max_streams_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_cache-rules_origin_h2_max_streams_value"
+          "type": "integer"
         }
       },
       "type": "object"
@@ -529,17 +473,10 @@ export const zones_cache_rules_origin_h2_max_streams_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_cache-rules_origin_h2_max_streams_value` in responses.
- */
-export const zones_cache_rules_origin_h2_max_streams_value_output: JsonSchema = {
-  "type": "integer"
-};
-
 /**
  * The schema of `zones_cache-rules_origin_max_http_version` in responses.
  */
-export const zones_cache_rules_origin_max_http_version_output: JsonSchema = {
+export const zones_cache$$rules_origin_max_http_version: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_cache-rules_base"
@@ -553,7 +490,11 @@ export const zones_cache_rules_origin_max_http_version_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_cache-rules_origin_max_http_version_value"
+          "enum": [
+            "2",
+            "1"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -561,21 +502,10 @@ export const zones_cache_rules_origin_max_http_version_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_cache-rules_origin_max_http_version_value` in responses.
- */
-export const zones_cache_rules_origin_max_http_version_value_output: JsonSchema = {
-  "enum": [
-    "2",
-    "1"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_cache_level-2` in responses.
  */
-export const zones_cache_level_2_output: JsonSchema = {
+export const zones_cache_level$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -589,7 +519,12 @@ export const zones_cache_level_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_cache_level_value"
+          "enum": [
+            "aggressive",
+            "basic",
+            "simplified"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -597,22 +532,10 @@ export const zones_cache_level_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_cache_level_value` in responses.
- */
-export const zones_cache_level_value_output: JsonSchema = {
-  "enum": [
-    "aggressive",
-    "basic",
-    "simplified"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_challenge_ttl` in responses.
  */
-export const zones_challenge_ttl_output: JsonSchema = {
+export const zones_challenge_ttl: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -626,7 +549,23 @@ export const zones_challenge_ttl_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_challenge_ttl_value"
+          "enum": [
+            300,
+            900,
+            1800,
+            2700,
+            3600,
+            7200,
+            10800,
+            14400,
+            28800,
+            57600,
+            86400,
+            604800,
+            2592000,
+            31536000
+          ],
+          "type": "integer"
         }
       },
       "type": "object"
@@ -634,33 +573,10 @@ export const zones_challenge_ttl_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_challenge_ttl_value` in responses.
- */
-export const zones_challenge_ttl_value_output: JsonSchema = {
-  "enum": [
-    300,
-    900,
-    1800,
-    2700,
-    3600,
-    7200,
-    10800,
-    14400,
-    28800,
-    57600,
-    86400,
-    604800,
-    2592000,
-    31536000
-  ],
-  "type": "integer"
-};
-
 /**
  * The schema of `zones_china_network_enabled` in responses.
  */
-export const zones_china_network_enabled_output: JsonSchema = {
+export const zones_china_network_enabled: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -674,7 +590,11 @@ export const zones_china_network_enabled_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_china_network_enabled_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -682,21 +602,10 @@ export const zones_china_network_enabled_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_china_network_enabled_value` in responses.
- */
-export const zones_china_network_enabled_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_ciphers` in responses.
  */
-export const zones_ciphers_output: JsonSchema = {
+export const zones_ciphers: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -721,7 +630,7 @@ export const zones_ciphers_output: JsonSchema = {
 /**
  * The schema of `zones_ciphers_value` in responses.
  */
-export const zones_ciphers_value_output: JsonSchema = {
+export const zones_ciphers_value: JsonSchema = {
   "items": {
     "type": "string"
   },
@@ -731,7 +640,7 @@ export const zones_ciphers_value_output: JsonSchema = {
 /**
  * The schema of `zones_cname_flattening` in responses.
  */
-export const zones_cname_flattening_output: JsonSchema = {
+export const zones_cname_flattening: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -745,7 +654,11 @@ export const zones_cname_flattening_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_cname_flattening_value"
+          "enum": [
+            "flatten_at_root",
+            "flatten_all"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -753,21 +666,10 @@ export const zones_cname_flattening_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_cname_flattening_value` in responses.
- */
-export const zones_cname_flattening_value_output: JsonSchema = {
-  "enum": [
-    "flatten_at_root",
-    "flatten_all"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_content_converter` in responses.
  */
-export const zones_content_converter_output: JsonSchema = {
+export const zones_content_converter: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -781,7 +683,11 @@ export const zones_content_converter_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_content_converter_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -789,21 +695,10 @@ export const zones_content_converter_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_content_converter_value` in responses.
- */
-export const zones_content_converter_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_development_mode` in responses.
  */
-export const zones_development_mode_output: JsonSchema = {
+export const zones_development_mode: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -820,7 +715,11 @@ export const zones_development_mode_output: JsonSchema = {
           "type": "number"
         },
         "value": {
-          "$ref": "#/$defs/zones_development_mode_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -828,21 +727,10 @@ export const zones_development_mode_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_development_mode_value` in responses.
- */
-export const zones_development_mode_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_early_hints` in responses.
  */
-export const zones_early_hints_output: JsonSchema = {
+export const zones_early_hints: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -856,7 +744,11 @@ export const zones_early_hints_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_early_hints_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -864,21 +756,10 @@ export const zones_early_hints_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_early_hints_value` in responses.
- */
-export const zones_early_hints_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_edge_cache_ttl-2` in responses.
  */
-export const zones_edge_cache_ttl_2_output: JsonSchema = {
+export const zones_edge_cache_ttl$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -892,7 +773,30 @@ export const zones_edge_cache_ttl_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_edge_cache_ttl_value"
+          "enum": [
+            30,
+            60,
+            300,
+            1200,
+            1800,
+            3600,
+            7200,
+            10800,
+            14400,
+            18000,
+            28800,
+            43200,
+            57600,
+            72000,
+            86400,
+            172800,
+            259200,
+            345600,
+            432000,
+            518400,
+            604800
+          ],
+          "type": "integer"
         }
       },
       "type": "object"
@@ -900,40 +804,10 @@ export const zones_edge_cache_ttl_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_edge_cache_ttl_value` in responses.
- */
-export const zones_edge_cache_ttl_value_output: JsonSchema = {
-  "enum": [
-    30,
-    60,
-    300,
-    1200,
-    1800,
-    3600,
-    7200,
-    10800,
-    14400,
-    18000,
-    28800,
-    43200,
-    57600,
-    72000,
-    86400,
-    172800,
-    259200,
-    345600,
-    432000,
-    518400,
-    604800
-  ],
-  "type": "integer"
-};
-
 /**
  * The schema of `zones_email_obfuscation-2` in responses.
  */
-export const zones_email_obfuscation_2_output: JsonSchema = {
+export const zones_email_obfuscation$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -947,7 +821,11 @@ export const zones_email_obfuscation_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_email_obfuscation_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -955,21 +833,10 @@ export const zones_email_obfuscation_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_email_obfuscation_value` in responses.
- */
-export const zones_email_obfuscation_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_h2_prioritization` in responses.
  */
-export const zones_h2_prioritization_output: JsonSchema = {
+export const zones_h2_prioritization: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -983,7 +850,12 @@ export const zones_h2_prioritization_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_h2_prioritization_value"
+          "enum": [
+            "on",
+            "off",
+            "custom"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -991,22 +863,10 @@ export const zones_h2_prioritization_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_h2_prioritization_value` in responses.
- */
-export const zones_h2_prioritization_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off",
-    "custom"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_hotlink_protection` in responses.
  */
-export const zones_hotlink_protection_output: JsonSchema = {
+export const zones_hotlink_protection: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1020,7 +880,11 @@ export const zones_hotlink_protection_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_hotlink_protection_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1028,21 +892,10 @@ export const zones_hotlink_protection_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_hotlink_protection_value` in responses.
- */
-export const zones_hotlink_protection_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_http2` in responses.
  */
-export const zones_http2_output: JsonSchema = {
+export const zones_http2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1056,7 +909,11 @@ export const zones_http2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_http2_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1064,21 +921,10 @@ export const zones_http2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_http2_value` in responses.
- */
-export const zones_http2_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_http3` in responses.
  */
-export const zones_http3_output: JsonSchema = {
+export const zones_http3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1092,7 +938,11 @@ export const zones_http3_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_http3_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1100,21 +950,10 @@ export const zones_http3_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_http3_value` in responses.
- */
-export const zones_http3_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_image_resizing` in responses.
  */
-export const zones_image_resizing_output: JsonSchema = {
+export const zones_image_resizing: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1128,7 +967,12 @@ export const zones_image_resizing_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_image_resizing_value"
+          "enum": [
+            "on",
+            "off",
+            "open"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1136,22 +980,10 @@ export const zones_image_resizing_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_image_resizing_value` in responses.
- */
-export const zones_image_resizing_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off",
-    "open"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_ip_geolocation-2` in responses.
  */
-export const zones_ip_geolocation_2_output: JsonSchema = {
+export const zones_ip_geolocation$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1165,7 +997,11 @@ export const zones_ip_geolocation_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_ip_geolocation_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1173,21 +1009,10 @@ export const zones_ip_geolocation_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_ip_geolocation_value` in responses.
- */
-export const zones_ip_geolocation_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_ipv6` in responses.
  */
-export const zones_ipv6_output: JsonSchema = {
+export const zones_ipv6: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1201,7 +1026,11 @@ export const zones_ipv6_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_ipv6_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1209,21 +1038,10 @@ export const zones_ipv6_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_ipv6_value` in responses.
- */
-export const zones_ipv6_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_max_upload` in responses.
  */
-export const zones_max_upload_output: JsonSchema = {
+export const zones_max_upload: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1237,7 +1055,35 @@ export const zones_max_upload_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_max_upload_value"
+          "enum": [
+            100,
+            125,
+            150,
+            175,
+            200,
+            225,
+            250,
+            275,
+            300,
+            325,
+            350,
+            375,
+            400,
+            425,
+            450,
+            475,
+            500,
+            1000,
+            1500,
+            2000,
+            2500,
+            3000,
+            3500,
+            4000,
+            4500,
+            5000
+          ],
+          "type": "integer"
         }
       },
       "type": "object"
@@ -1245,45 +1091,10 @@ export const zones_max_upload_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_max_upload_value` in responses.
- */
-export const zones_max_upload_value_output: JsonSchema = {
-  "enum": [
-    100,
-    125,
-    150,
-    175,
-    200,
-    225,
-    250,
-    275,
-    300,
-    325,
-    350,
-    375,
-    400,
-    425,
-    450,
-    475,
-    500,
-    1000,
-    1500,
-    2000,
-    2500,
-    3000,
-    3500,
-    4000,
-    4500,
-    5000
-  ],
-  "type": "integer"
-};
-
 /**
  * The schema of `zones_min_tls_version` in responses.
  */
-export const zones_min_tls_version_output: JsonSchema = {
+export const zones_min_tls_version: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1297,7 +1108,13 @@ export const zones_min_tls_version_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_min_tls_version_value"
+          "enum": [
+            "1.0",
+            "1.1",
+            "1.2",
+            "1.3"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1305,23 +1122,10 @@ export const zones_min_tls_version_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_min_tls_version_value` in responses.
- */
-export const zones_min_tls_version_value_output: JsonSchema = {
-  "enum": [
-    "1.0",
-    "1.1",
-    "1.2",
-    "1.3"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_mirage-2` in responses.
  */
-export const zones_mirage_2_output: JsonSchema = {
+export const zones_mirage$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1335,7 +1139,11 @@ export const zones_mirage_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_mirage_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1343,21 +1151,10 @@ export const zones_mirage_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_mirage_value` in responses.
- */
-export const zones_mirage_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_nel` in responses.
  */
-export const zones_nel_output: JsonSchema = {
+export const zones_nel: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1382,7 +1179,7 @@ export const zones_nel_output: JsonSchema = {
 /**
  * The schema of `zones_nel_value` in responses.
  */
-export const zones_nel_value_output: JsonSchema = {
+export const zones_nel_value: JsonSchema = {
   "properties": {
     "enabled": {
       "type": "boolean"
@@ -1394,7 +1191,7 @@ export const zones_nel_value_output: JsonSchema = {
 /**
  * The schema of `zones_opportunistic_encryption-2` in responses.
  */
-export const zones_opportunistic_encryption_2_output: JsonSchema = {
+export const zones_opportunistic_encryption$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1408,7 +1205,11 @@ export const zones_opportunistic_encryption_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_opportunistic_encryption_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1416,21 +1217,10 @@ export const zones_opportunistic_encryption_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_opportunistic_encryption_value` in responses.
- */
-export const zones_opportunistic_encryption_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_opportunistic_onion` in responses.
  */
-export const zones_opportunistic_onion_output: JsonSchema = {
+export const zones_opportunistic_onion: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1444,7 +1234,11 @@ export const zones_opportunistic_onion_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_opportunistic_onion_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1452,21 +1246,10 @@ export const zones_opportunistic_onion_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_opportunistic_onion_value` in responses.
- */
-export const zones_opportunistic_onion_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_orange_to_orange` in responses.
  */
-export const zones_orange_to_orange_output: JsonSchema = {
+export const zones_orange_to_orange: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1480,7 +1263,11 @@ export const zones_orange_to_orange_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_orange_to_orange_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1488,21 +1275,10 @@ export const zones_orange_to_orange_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_orange_to_orange_value` in responses.
- */
-export const zones_orange_to_orange_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_origin_error_page_pass_thru-2` in responses.
  */
-export const zones_origin_error_page_pass_thru_2_output: JsonSchema = {
+export const zones_origin_error_page_pass_thru$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1516,7 +1292,11 @@ export const zones_origin_error_page_pass_thru_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_origin_error_page_pass_thru_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1524,21 +1304,10 @@ export const zones_origin_error_page_pass_thru_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_origin_error_page_pass_thru_value` in responses.
- */
-export const zones_origin_error_page_pass_thru_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_polish-2` in responses.
  */
-export const zones_polish_2_output: JsonSchema = {
+export const zones_polish$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1552,7 +1321,12 @@ export const zones_polish_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_polish_value"
+          "enum": [
+            "off",
+            "lossless",
+            "lossy"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1560,22 +1334,10 @@ export const zones_polish_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_polish_value` in responses.
- */
-export const zones_polish_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "lossless",
-    "lossy"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_pre_render` in responses.
  */
-export const zones_pre_render_output: JsonSchema = {
+export const zones_pre_render: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1589,7 +1351,11 @@ export const zones_pre_render_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_pre_render_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1597,21 +1363,10 @@ export const zones_pre_render_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_pre_render_value` in responses.
- */
-export const zones_pre_render_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_prefetch_preload` in responses.
  */
-export const zones_prefetch_preload_output: JsonSchema = {
+export const zones_prefetch_preload: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1625,7 +1380,11 @@ export const zones_prefetch_preload_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_prefetch_preload_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1633,21 +1392,10 @@ export const zones_prefetch_preload_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_prefetch_preload_value` in responses.
- */
-export const zones_prefetch_preload_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_privacy_pass` in responses.
  */
-export const zones_privacy_pass_output: JsonSchema = {
+export const zones_privacy_pass: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1661,7 +1409,11 @@ export const zones_privacy_pass_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_privacy_pass_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1669,21 +1421,10 @@ export const zones_privacy_pass_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_privacy_pass_value` in responses.
- */
-export const zones_privacy_pass_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_proxy_read_timeout` in responses.
  */
-export const zones_proxy_read_timeout_output: JsonSchema = {
+export const zones_proxy_read_timeout: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1697,7 +1438,7 @@ export const zones_proxy_read_timeout_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_proxy_read_timeout_value"
+          "type": "number"
         }
       },
       "type": "object"
@@ -1705,17 +1446,10 @@ export const zones_proxy_read_timeout_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_proxy_read_timeout_value` in responses.
- */
-export const zones_proxy_read_timeout_value_output: JsonSchema = {
-  "type": "number"
-};
-
 /**
  * The schema of `zones_pseudo_ipv4` in responses.
  */
-export const zones_pseudo_ipv4_output: JsonSchema = {
+export const zones_pseudo_ipv4: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1729,7 +1463,12 @@ export const zones_pseudo_ipv4_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_pseudo_ipv4_value"
+          "enum": [
+            "off",
+            "add_header",
+            "overwrite_header"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1737,22 +1476,10 @@ export const zones_pseudo_ipv4_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_pseudo_ipv4_value` in responses.
- */
-export const zones_pseudo_ipv4_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "add_header",
-    "overwrite_header"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_redirects_for_ai_training` in responses.
  */
-export const zones_redirects_for_ai_training_output: JsonSchema = {
+export const zones_redirects_for_ai_training: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1766,7 +1493,11 @@ export const zones_redirects_for_ai_training_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_redirects_for_ai_training_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1774,21 +1505,10 @@ export const zones_redirects_for_ai_training_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_redirects_for_ai_training_value` in responses.
- */
-export const zones_redirects_for_ai_training_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_replace_insecure_js` in responses.
  */
-export const zones_replace_insecure_js_output: JsonSchema = {
+export const zones_replace_insecure_js: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1802,7 +1522,11 @@ export const zones_replace_insecure_js_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_replace_insecure_js_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1810,21 +1534,10 @@ export const zones_replace_insecure_js_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_replace_insecure_js_value` in responses.
- */
-export const zones_replace_insecure_js_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_response_buffering-2` in responses.
  */
-export const zones_response_buffering_2_output: JsonSchema = {
+export const zones_response_buffering$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1838,7 +1551,11 @@ export const zones_response_buffering_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_response_buffering_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1846,21 +1563,10 @@ export const zones_response_buffering_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_response_buffering_value` in responses.
- */
-export const zones_response_buffering_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_rocket_loader-2` in responses.
  */
-export const zones_rocket_loader_2_output: JsonSchema = {
+export const zones_rocket_loader$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1874,7 +1580,11 @@ export const zones_rocket_loader_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_rocket_loader_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1882,21 +1592,10 @@ export const zones_rocket_loader_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_rocket_loader_value` in responses.
- */
-export const zones_rocket_loader_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_schemas-automatic_platform_optimization` in responses.
  */
-export const zones_schemas_automatic_platform_optimization_output: JsonSchema = {
+export const zones_schemas$$automatic_platform_optimization: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1921,7 +1620,7 @@ export const zones_schemas_automatic_platform_optimization_output: JsonSchema =
 /**
  * The schema of `zones_search_for_agents` in responses.
  */
-export const zones_search_for_agents_output: JsonSchema = {
+export const zones_search_for_agents: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1935,7 +1634,11 @@ export const zones_search_for_agents_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_search_for_agents_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -1943,21 +1646,10 @@ export const zones_search_for_agents_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_search_for_agents_value` in responses.
- */
-export const zones_search_for_agents_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_security_header` in responses.
  */
-export const zones_security_header_output: JsonSchema = {
+export const zones_security_header: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -1982,7 +1674,7 @@ export const zones_security_header_output: JsonSchema = {
 /**
  * The schema of `zones_security_header_value` in responses.
  */
-export const zones_security_header_value_output: JsonSchema = {
+export const zones_security_header_value: JsonSchema = {
   "properties": {
     "strict_transport_security": {
       "properties": {
@@ -2011,7 +1703,7 @@ export const zones_security_header_value_output: JsonSchema = {
 /**
  * The schema of `zones_security_level-2` in responses.
  */
-export const zones_security_level_2_output: JsonSchema = {
+export const zones_security_level$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2025,7 +1717,15 @@ export const zones_security_level_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_security_level_value"
+          "enum": [
+            "off",
+            "essentially_off",
+            "low",
+            "medium",
+            "high",
+            "under_attack"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2033,25 +1733,10 @@ export const zones_security_level_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_security_level_value` in responses.
- */
-export const zones_security_level_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "essentially_off",
-    "low",
-    "medium",
-    "high",
-    "under_attack"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_server_side_exclude` in responses.
  */
-export const zones_server_side_exclude_output: JsonSchema = {
+export const zones_server_side_exclude: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2065,7 +1750,11 @@ export const zones_server_side_exclude_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_server_side_exclude_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2073,21 +1762,10 @@ export const zones_server_side_exclude_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_server_side_exclude_value` in responses.
- */
-export const zones_server_side_exclude_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_setting` in responses.
  */
-export const zones_setting_output: JsonSchema = {
+export const zones_setting: JsonSchema = {
   "oneOf": [
     {
       "$ref": "#/$defs/zones_0rtt"
@@ -2296,7 +1974,7 @@ export const zones_setting_output: JsonSchema = {
 /**
  * The schema of `zones_sha1_support` in responses.
  */
-export const zones_sha1_support_output: JsonSchema = {
+export const zones_sha1_support: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2310,7 +1988,11 @@ export const zones_sha1_support_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_sha1_support_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2318,21 +2000,10 @@ export const zones_sha1_support_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_sha1_support_value` in responses.
- */
-export const zones_sha1_support_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_sort_query_string_for_cache-2` in responses.
  */
-export const zones_sort_query_string_for_cache_2_output: JsonSchema = {
+export const zones_sort_query_string_for_cache$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2346,7 +2017,11 @@ export const zones_sort_query_string_for_cache_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_sort_query_string_for_cache_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2354,21 +2029,10 @@ export const zones_sort_query_string_for_cache_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_sort_query_string_for_cache_value` in responses.
- */
-export const zones_sort_query_string_for_cache_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_ssl-2` in responses.
  */
-export const zones_ssl_2_output: JsonSchema = {
+export const zones_ssl$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2382,7 +2046,13 @@ export const zones_ssl_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_ssl_value"
+          "enum": [
+            "off",
+            "flexible",
+            "full",
+            "strict"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2393,10 +2063,10 @@ export const zones_ssl_2_output: JsonSchema = {
 /**
  * The schema of `zones_ssl_recommender` in responses.
  */
-export const zones_ssl_recommender_output: JsonSchema = {
+export const zones_ssl_recommender: JsonSchema = {
   "properties": {
     "enabled": {
-      "$ref": "#/$defs/zones_ssl_recommender_enabled"
+      "type": "boolean"
     },
     "id": {
       "enum": [
@@ -2408,30 +2078,10 @@ export const zones_ssl_recommender_output: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_ssl_recommender_enabled` in responses.
- */
-export const zones_ssl_recommender_enabled_output: JsonSchema = {
-  "type": "boolean"
-};
-
-/**
- * The schema of `zones_ssl_value` in responses.
- */
-export const zones_ssl_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "flexible",
-    "full",
-    "strict"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_tls_1_2_only` in responses.
  */
-export const zones_tls_1_2_only_output: JsonSchema = {
+export const zones_tls_1_2_only: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2445,7 +2095,11 @@ export const zones_tls_1_2_only_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_tls_1_2_only_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2453,21 +2107,10 @@ export const zones_tls_1_2_only_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_tls_1_2_only_value` in responses.
- */
-export const zones_tls_1_2_only_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_tls_1_3` in responses.
  */
-export const zones_tls_1_3_output: JsonSchema = {
+export const zones_tls_1_3: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2481,7 +2124,12 @@ export const zones_tls_1_3_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_tls_1_3_value"
+          "enum": [
+            "on",
+            "off",
+            "zrt"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2489,22 +2137,10 @@ export const zones_tls_1_3_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_tls_1_3_value` in responses.
- */
-export const zones_tls_1_3_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off",
-    "zrt"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_tls_client_auth` in responses.
  */
-export const zones_tls_client_auth_output: JsonSchema = {
+export const zones_tls_client_auth: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2518,7 +2154,11 @@ export const zones_tls_client_auth_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_tls_client_auth_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2526,21 +2166,10 @@ export const zones_tls_client_auth_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_tls_client_auth_value` in responses.
- */
-export const zones_tls_client_auth_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_transformations` in responses.
  */
-export const zones_transformations_output: JsonSchema = {
+export const zones_transformations: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2554,7 +2183,12 @@ export const zones_transformations_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_image_resizing_value"
+          "enum": [
+            "on",
+            "off",
+            "open"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2565,7 +2199,7 @@ export const zones_transformations_output: JsonSchema = {
 /**
  * The schema of `zones_transformations_allowed_origins` in responses.
  */
-export const zones_transformations_allowed_origins_output: JsonSchema = {
+export const zones_transformations_allowed_origins: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2579,7 +2213,7 @@ export const zones_transformations_allowed_origins_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_transformations_allowed_origins_value"
+          "type": "string"
         }
       },
       "type": "object"
@@ -2587,17 +2221,10 @@ export const zones_transformations_allowed_origins_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_transformations_allowed_origins_value` in responses.
- */
-export const zones_transformations_allowed_origins_value_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zones_true_client_ip_header-2` in responses.
  */
-export const zones_true_client_ip_header_2_output: JsonSchema = {
+export const zones_true_client_ip_header$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2611,7 +2238,11 @@ export const zones_true_client_ip_header_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_true_client_ip_header_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2619,21 +2250,10 @@ export const zones_true_client_ip_header_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_true_client_ip_header_value` in responses.
- */
-export const zones_true_client_ip_header_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_waf-2` in responses.
  */
-export const zones_waf_2_output: JsonSchema = {
+export const zones_waf$$2: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2647,7 +2267,11 @@ export const zones_waf_2_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_waf_value"
+          "enum": [
+            "on",
+            "off"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2655,21 +2279,10 @@ export const zones_waf_2_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_waf_value` in responses.
- */
-export const zones_waf_value_output: JsonSchema = {
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_webmcp_enabled` in responses.
  */
-export const zones_webmcp_enabled_output: JsonSchema = {
+export const zones_webmcp_enabled: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2683,7 +2296,11 @@ export const zones_webmcp_enabled_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_webmcp_enabled_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2691,21 +2308,10 @@ export const zones_webmcp_enabled_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_webmcp_enabled_value` in responses.
- */
-export const zones_webmcp_enabled_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_webmcp_mcp_url` in responses.
  */
-export const zones_webmcp_mcp_url_output: JsonSchema = {
+export const zones_webmcp_mcp_url: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2719,7 +2325,7 @@ export const zones_webmcp_mcp_url_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_webmcp_mcp_url_value"
+          "type": "string"
         }
       },
       "type": "object"
@@ -2727,17 +2333,10 @@ export const zones_webmcp_mcp_url_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_webmcp_mcp_url_value` in responses.
- */
-export const zones_webmcp_mcp_url_value_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zones_webmcp_packs` in responses.
  */
-export const zones_webmcp_packs_output: JsonSchema = {
+export const zones_webmcp_packs: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2751,7 +2350,7 @@ export const zones_webmcp_packs_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_webmcp_packs_value"
+          "type": "string"
         }
       },
       "type": "object"
@@ -2759,17 +2358,10 @@ export const zones_webmcp_packs_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_webmcp_packs_value` in responses.
- */
-export const zones_webmcp_packs_value_output: JsonSchema = {
-  "type": "string"
-};
-
 /**
  * The schema of `zones_webp` in responses.
  */
-export const zones_webp_output: JsonSchema = {
+export const zones_webp: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2783,7 +2375,11 @@ export const zones_webp_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_webp_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
@@ -2791,21 +2387,10 @@ export const zones_webp_output: JsonSchema = {
   ]
 };
 
-/**
- * The schema of `zones_webp_value` in responses.
- */
-export const zones_webp_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_websockets` in responses.
  */
-export const zones_websockets_output: JsonSchema = {
+export const zones_websockets: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/zones_base"
@@ -2819,21 +2404,14 @@ export const zones_websockets_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/zones_websockets_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `zones_websockets_value` in responses.
- */
-export const zones_websockets_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/settings/schemas.ts b/src/generated/forge-mcp/zones/settings/schemas.ts
index ad463abdf..cb01386ca 100644
--- a/src/generated/forge-mcp/zones/settings/schemas.ts
+++ b/src/generated/forge-mcp/zones/settings/schemas.ts
@@ -3,66 +3,6 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `zones_0rtt_value`.
- */
-export const zones_0rtt_value: JsonSchema = {
-  "description": "Value of the 0-RTT setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_advanced_ddos_value`.
- */
-export const zones_advanced_ddos_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: Defaults to on for Business+ plans",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_always_online_value`.
- */
-export const zones_always_online_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_always_use_https_value`.
- */
-export const zones_always_use_https_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_automatic_https_rewrites_value`.
- */
-export const zones_automatic_https_rewrites_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: Default value depends on the zone's plan level.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_automatic_platform_optimization`.
  */
@@ -111,42 +51,10 @@ export const zones_automatic_platform_optimization: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_brotli_value`.
- */
-export const zones_brotli_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_browser_cache_ttl_value`.
- */
-export const zones_browser_cache_ttl_value: JsonSchema = {
-  "description": "Value of the zone setting in seconds.\nMinimum values by plan:\n- Free: 1 second\n- Pro: 1 second\n- Business: 1 second\n- Enterprise: 1 second\nSetting a TTL of 0 is equivalent to selecting `Respect Existing Headers` and is allowed for all plans.",
-  "type": "integer"
-};
-
-/**
- * The schema of `zones_browser_check_value`.
- */
-export const zones_browser_check_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_cache-rules_aegis_value`.
  */
-export const zones_cache_rules_aegis_value: JsonSchema = {
+export const zones_cache$$rules_aegis_value: JsonSchema = {
   "description": "Value of the zone setting.",
   "properties": {
     "enabled": {
@@ -161,75 +69,6 @@ export const zones_cache_rules_aegis_value: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_cache-rules_origin_h2_max_streams_value`.
- */
-export const zones_cache_rules_origin_h2_max_streams_value: JsonSchema = {
-  "description": "Value of the Origin H2 Max Streams Setting.",
-  "type": "integer"
-};
-
-/**
- * The schema of `zones_cache-rules_origin_max_http_version_value`.
- */
-export const zones_cache_rules_origin_max_http_version_value: JsonSchema = {
-  "description": "Value of the Origin Max HTTP Version Setting.",
-  "enum": [
-    "2",
-    "1"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_cache_level_value`.
- */
-export const zones_cache_level_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "aggressive",
-    "basic",
-    "simplified"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_challenge_ttl_value`.
- */
-export const zones_challenge_ttl_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    300,
-    900,
-    1800,
-    2700,
-    3600,
-    7200,
-    10800,
-    14400,
-    28800,
-    57600,
-    86400,
-    604800,
-    2592000,
-    31536000
-  ],
-  "type": "integer"
-};
-
-/**
- * The schema of `zones_china_network_enabled_value`.
- */
-export const zones_china_network_enabled_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_ciphers_value`.
  */
@@ -241,247 +80,6 @@ export const zones_ciphers_value: JsonSchema = {
   "type": "array"
 };
 
-/**
- * The schema of `zones_cname_flattening_value`.
- */
-export const zones_cname_flattening_value: JsonSchema = {
-  "deprecated": true,
-  "description": "Value of the cname flattening setting.",
-  "enum": [
-    "flatten_at_root",
-    "flatten_all"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_content_converter_value`.
- */
-export const zones_content_converter_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_development_mode_value`.
- */
-export const zones_development_mode_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_early_hints_value`.
- */
-export const zones_early_hints_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_edge_cache_ttl_value`.
- */
-export const zones_edge_cache_ttl_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: The minimum TTL available depends on the plan level of the zone. (Enterprise = 30, Business = 1800, Pro = 3600, Free = 7200)",
-  "enum": [
-    30,
-    60,
-    300,
-    1200,
-    1800,
-    3600,
-    7200,
-    10800,
-    14400,
-    18000,
-    28800,
-    43200,
-    57600,
-    72000,
-    86400,
-    172800,
-    259200,
-    345600,
-    432000,
-    518400,
-    604800
-  ],
-  "type": "integer"
-};
-
-/**
- * The schema of `zones_email_obfuscation_value`.
- */
-export const zones_email_obfuscation_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_h2_prioritization_value`.
- */
-export const zones_h2_prioritization_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off",
-    "custom"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_hotlink_protection_value`.
- */
-export const zones_hotlink_protection_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_http2_value`.
- */
-export const zones_http2_value: JsonSchema = {
-  "description": "Value of the HTTP2 setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_http3_value`.
- */
-export const zones_http3_value: JsonSchema = {
-  "description": "Value of the HTTP3 setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_image_resizing_value`.
- */
-export const zones_image_resizing_value: JsonSchema = {
-  "description": "Whether the feature is enabled, disabled, or enabled in `open proxy` mode.",
-  "enum": [
-    "on",
-    "off",
-    "open"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_ip_geolocation_value`.
- */
-export const zones_ip_geolocation_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_ipv6_value`.
- */
-export const zones_ipv6_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_max_upload_value`.
- */
-export const zones_max_upload_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: The size depends on the plan level of the zone. (Enterprise = 5000, Business = 200, Pro = 100, Free = 100)",
-  "enum": [
-    100,
-    125,
-    150,
-    175,
-    200,
-    225,
-    250,
-    275,
-    300,
-    325,
-    350,
-    375,
-    400,
-    425,
-    450,
-    475,
-    500,
-    1000,
-    1500,
-    2000,
-    2500,
-    3000,
-    3500,
-    4000,
-    4500,
-    5000
-  ],
-  "type": "integer"
-};
-
-/**
- * The schema of `zones_min_tls_version_value`.
- */
-export const zones_min_tls_version_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "1.0",
-    "1.1",
-    "1.2",
-    "1.3"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_mirage_value`.
- */
-export const zones_mirage_value: JsonSchema = {
-  "deprecated": true,
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_nel_value`.
  */
@@ -496,186 +94,6 @@ export const zones_nel_value: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_opportunistic_encryption_value`.
- */
-export const zones_opportunistic_encryption_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: Default value depends on the zone's plan level.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_opportunistic_onion_value`.
- */
-export const zones_opportunistic_onion_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: Default value depends on the zone's plan level.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_orange_to_orange_value`.
- */
-export const zones_orange_to_orange_value: JsonSchema = {
-  "deprecated": true,
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_origin_error_page_pass_thru_value`.
- */
-export const zones_origin_error_page_pass_thru_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_polish_value`.
- */
-export const zones_polish_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "lossless",
-    "lossy"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_pre_render_value`.
- */
-export const zones_pre_render_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_prefetch_preload_value`.
- */
-export const zones_prefetch_preload_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_privacy_pass_value`.
- */
-export const zones_privacy_pass_value: JsonSchema = {
-  "deprecated": true,
-  "description": "Value of the Privacy Pass v1 (deprecated) zone setting",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_proxy_read_timeout_value`.
- */
-export const zones_proxy_read_timeout_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: Value must be between 1 and 6000",
-  "type": "number"
-};
-
-/**
- * The schema of `zones_pseudo_ipv4_value`.
- */
-export const zones_pseudo_ipv4_value: JsonSchema = {
-  "description": "Value of the Pseudo IPv4 setting.",
-  "enum": [
-    "off",
-    "add_header",
-    "overwrite_header"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_redirects_for_ai_training_value`.
- */
-export const zones_redirects_for_ai_training_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_replace_insecure_js_value`.
- */
-export const zones_replace_insecure_js_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_response_buffering_value`.
- */
-export const zones_response_buffering_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_rocket_loader_value`.
- */
-export const zones_rocket_loader_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_search_for_agents_value`.
- */
-export const zones_search_for_agents_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_security_header_value`.
  */
@@ -711,401 +129,554 @@ export const zones_security_header_value: JsonSchema = {
   "type": "object"
 };
 
-/**
- * The schema of `zones_security_level_value`.
- */
-export const zones_security_level_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "essentially_off",
-    "low",
-    "medium",
-    "high",
-    "under_attack"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_server_side_exclude_value`.
- */
-export const zones_server_side_exclude_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_setting_name`.
- */
-export const zones_setting_name: JsonSchema = {
-  "description": "Setting name",
-  "type": "string"
-};
-
 /**
  * The schema of `zones_setting_value`.
  */
 export const zones_setting_value: JsonSchema = {
   "oneOf": [
     {
-      "$ref": "#/$defs/zones_0rtt_value"
+      "description": "Value of the 0-RTT setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_advanced_ddos_value"
+      "description": "Value of the zone setting.\nNotes: Defaults to on for Business+ plans",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
       "$ref": "#/$defs/zones_cache-rules_aegis_value"
     },
     {
-      "$ref": "#/$defs/zones_always_online_value"
-    },
-    {
-      "$ref": "#/$defs/zones_always_use_https_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_automatic_https_rewrites_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_brotli_value"
+      "description": "Value of the zone setting.\nNotes: Default value depends on the zone's plan level.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_browser_cache_ttl_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_browser_check_value"
+      "description": "Value of the zone setting in seconds.\nMinimum values by plan:\n- Free: 1 second\n- Pro: 1 second\n- Business: 1 second\n- Enterprise: 1 second\nSetting a TTL of 0 is equivalent to selecting `Respect Existing Headers` and is allowed for all plans.",
+      "type": "integer"
     },
     {
-      "$ref": "#/$defs/zones_cache_level_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_challenge_ttl_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "aggressive",
+        "basic",
+        "simplified"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_china_network_enabled_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        300,
+        900,
+        1800,
+        2700,
+        3600,
+        7200,
+        10800,
+        14400,
+        28800,
+        57600,
+        86400,
+        604800,
+        2592000,
+        31536000
+      ],
+      "type": "integer"
+    },
+    {
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_content_converter_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
       "$ref": "#/$defs/zones_ciphers_value"
     },
     {
-      "$ref": "#/$defs/zones_cname_flattening_value"
-    },
-    {
-      "$ref": "#/$defs/zones_development_mode_value"
-    },
-    {
-      "$ref": "#/$defs/zones_early_hints_value"
+      "deprecated": true,
+      "description": "Value of the cname flattening setting.",
+      "enum": [
+        "flatten_at_root",
+        "flatten_all"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_edge_cache_ttl_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_email_obfuscation_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_h2_prioritization_value"
+      "description": "Value of the zone setting.\nNotes: The minimum TTL available depends on the plan level of the zone. (Enterprise = 30, Business = 1800, Pro = 3600, Free = 7200)",
+      "enum": [
+        30,
+        60,
+        300,
+        1200,
+        1800,
+        3600,
+        7200,
+        10800,
+        14400,
+        18000,
+        28800,
+        43200,
+        57600,
+        72000,
+        86400,
+        172800,
+        259200,
+        345600,
+        432000,
+        518400,
+        604800
+      ],
+      "type": "integer"
+    },
+    {
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_hotlink_protection_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off",
+        "custom"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_http2_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_http3_value"
+      "description": "Value of the HTTP2 setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_image_resizing_value"
+      "description": "Value of the HTTP3 setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_ip_geolocation_value"
+      "description": "Whether the feature is enabled, disabled, or enabled in `open proxy` mode.",
+      "enum": [
+        "on",
+        "off",
+        "open"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_ipv6_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_max_upload_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_min_tls_version_value"
+      "description": "Value of the zone setting.\nNotes: The size depends on the plan level of the zone. (Enterprise = 5000, Business = 200, Pro = 100, Free = 100)",
+      "enum": [
+        100,
+        125,
+        150,
+        175,
+        200,
+        225,
+        250,
+        275,
+        300,
+        325,
+        350,
+        375,
+        400,
+        425,
+        450,
+        475,
+        500,
+        1000,
+        1500,
+        2000,
+        2500,
+        3000,
+        3500,
+        4000,
+        4500,
+        5000
+      ],
+      "type": "integer"
+    },
+    {
+      "description": "Value of the zone setting.",
+      "enum": [
+        "1.0",
+        "1.1",
+        "1.2",
+        "1.3"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_mirage_value"
+      "deprecated": true,
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
       "$ref": "#/$defs/zones_nel_value"
     },
     {
-      "$ref": "#/$defs/zones_opportunistic_encryption_value"
+      "description": "Value of the zone setting.\nNotes: Default value depends on the zone's plan level.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_opportunistic_onion_value"
+      "description": "Value of the zone setting.\nNotes: Default value depends on the zone's plan level.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_orange_to_orange_value"
+      "deprecated": true,
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_origin_error_page_pass_thru_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_cache-rules_origin_h2_max_streams_value"
+      "description": "Value of the Origin H2 Max Streams Setting.",
+      "type": "integer"
     },
     {
-      "$ref": "#/$defs/zones_cache-rules_origin_max_http_version_value"
+      "description": "Value of the Origin Max HTTP Version Setting.",
+      "enum": [
+        "2",
+        "1"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_polish_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "lossless",
+        "lossy"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_prefetch_preload_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_pre_render_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_privacy_pass_value"
+      "deprecated": true,
+      "description": "Value of the Privacy Pass v1 (deprecated) zone setting",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_proxy_read_timeout_value"
+      "description": "Value of the zone setting.\nNotes: Value must be between 1 and 6000",
+      "type": "number"
     },
     {
-      "$ref": "#/$defs/zones_pseudo_ipv4_value"
+      "description": "Value of the Pseudo IPv4 setting.",
+      "enum": [
+        "off",
+        "add_header",
+        "overwrite_header"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_redirects_for_ai_training_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_replace_insecure_js_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_response_buffering_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_rocket_loader_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
       "$ref": "#/$defs/zones_automatic_platform_optimization"
     },
     {
-      "$ref": "#/$defs/zones_search_for_agents_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
       "$ref": "#/$defs/zones_security_header_value"
     },
     {
-      "$ref": "#/$defs/zones_security_level_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "essentially_off",
+        "low",
+        "medium",
+        "high",
+        "under_attack"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_server_side_exclude_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_sha1_support_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_sort_query_string_for_cache_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_ssl_value"
+      "description": "Value of the zone setting.\nNotes: Depends on the zone's plan level",
+      "enum": [
+        "off",
+        "flexible",
+        "full",
+        "strict"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_tls_1_2_only_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_tls_1_3_value"
+      "description": "Value of the zone setting.\nNotes: Default value depends on the zone's plan level.",
+      "enum": [
+        "on",
+        "off",
+        "zrt"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_tls_client_auth_value"
+      "description": "value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_true_client_ip_header_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_waf_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "on",
+        "off"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_webmcp_enabled_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_webmcp_mcp_url_value"
+      "description": "Root-relative path (with optional query string) of this zone's MCP\nendpoint, for example \"/api/mcp\". Surfaced to the injected bridge as the\ndata-mcp-url attribute. Absolute and protocol-relative URLs, fragments,\nand characters outside RFC 3986 paths and queries are rejected. An empty\nvalue clears the override so the bridge uses /mcp.",
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_webmcp_packs_value"
+      "description": "Comma-separated list of WebMCP tool-pack names to activate for this\nzone (for example, \"c2pa,mcp-server-client\"), surfaced to the injected\nbridge as the data-packs attribute. An empty value clears the override\nso the bridge uses its built-in default pack set.",
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_webp_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     },
     {
-      "$ref": "#/$defs/zones_websockets_value"
+      "description": "Value of the zone setting.",
+      "enum": [
+        "off",
+        "on"
+      ],
+      "type": "string"
     }
   ]
 };
 
-/**
- * The schema of `zones_sha1_support_value`.
- */
-export const zones_sha1_support_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_sort_query_string_for_cache_value`.
- */
-export const zones_sort_query_string_for_cache_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_ssl_recommender_enabled`.
- */
-export const zones_ssl_recommender_enabled: JsonSchema = {
-  "description": "ssl-recommender enrollment setting.",
-  "type": "boolean"
-};
-
-/**
- * The schema of `zones_ssl_value`.
- */
-export const zones_ssl_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: Depends on the zone's plan level",
-  "enum": [
-    "off",
-    "flexible",
-    "full",
-    "strict"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_tls_1_2_only_value`.
- */
-export const zones_tls_1_2_only_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_tls_1_3_value`.
- */
-export const zones_tls_1_3_value: JsonSchema = {
-  "description": "Value of the zone setting.\nNotes: Default value depends on the zone's plan level.",
-  "enum": [
-    "on",
-    "off",
-    "zrt"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_tls_client_auth_value`.
- */
-export const zones_tls_client_auth_value: JsonSchema = {
-  "description": "value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_true_client_ip_header_value`.
- */
-export const zones_true_client_ip_header_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_waf_value`.
- */
-export const zones_waf_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "on",
-    "off"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_webmcp_enabled_value`.
- */
-export const zones_webmcp_enabled_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_webmcp_mcp_url_value`.
- */
-export const zones_webmcp_mcp_url_value: JsonSchema = {
-  "description": "Root-relative path (with optional query string) of this zone's MCP\nendpoint, for example \"/api/mcp\". Surfaced to the injected bridge as the\ndata-mcp-url attribute. Absolute and protocol-relative URLs, fragments,\nand characters outside RFC 3986 paths and queries are rejected. An empty\nvalue clears the override so the bridge uses /mcp.",
-  "type": "string"
-};
-
-/**
- * The schema of `zones_webmcp_packs_value`.
- */
-export const zones_webmcp_packs_value: JsonSchema = {
-  "description": "Comma-separated list of WebMCP tool-pack names to activate for this\nzone (for example, \"c2pa,mcp-server-client\"), surfaced to the injected\nbridge as the data-packs attribute. An empty value clears the override\nso the bridge uses its built-in default pack set.",
-  "type": "string"
-};
-
-/**
- * The schema of `zones_webp_value`.
- */
-export const zones_webp_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
-/**
- * The schema of `zones_websockets_value`.
- */
-export const zones_websockets_value: JsonSchema = {
-  "description": "Value of the zone setting.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
-
 /**
  * The schema of `zones_zone_settings_single_request`.
  */
@@ -1114,9 +685,9 @@ export const zones_zone_settings_single_request: JsonSchema = {
     {
       "properties": {
         "enabled": {
-          "$ref": "#/$defs/zones_ssl_recommender_enabled",
           "default": false,
-          "description": "ssl-recommender enrollment setting."
+          "description": "ssl-recommender enrollment setting.",
+          "type": "boolean"
         }
       },
       "type": "object"
diff --git a/src/generated/forge-mcp/zones/settings/tools.ts b/src/generated/forge-mcp/zones/settings/tools.ts
index 060d345ed..f094a1b32 100644
--- a/src/generated/forge-mcp/zones/settings/tools.ts
+++ b/src/generated/forge-mcp/zones/settings/tools.ts
@@ -2,216 +2,93 @@
 /* eslint-disable */
 
 import { type Tool, pathParam } from "../../_/tool.js";
-import { zones_messages_output } from "../outputs.js";
-import { zones_identifier } from "../schemas.js";
+import { zones_messages } from "../outputs.js";
 import {
-  zones_0rtt_output,
-  zones_0rtt_value_output,
-  zones_advanced_ddos_output,
-  zones_advanced_ddos_value_output,
-  zones_always_online_output,
-  zones_always_online_value_output,
-  zones_always_use_https_2_output,
-  zones_always_use_https_value_output,
-  zones_api_response_common_4_output,
-  zones_api_response_common_failure_3_output,
-  zones_automatic_https_rewrites_2_output,
-  zones_automatic_https_rewrites_value_output,
-  zones_automatic_platform_optimization_output,
-  zones_base_output,
-  zones_brotli_output,
-  zones_brotli_value_output,
-  zones_browser_cache_ttl_2_output,
-  zones_browser_cache_ttl_value_output,
-  zones_browser_check_2_output,
-  zones_browser_check_value_output,
-  zones_cache_level_2_output,
-  zones_cache_level_value_output,
-  zones_cache_rules_aegis_output,
-  zones_cache_rules_aegis_value_output,
-  zones_cache_rules_base_output,
-  zones_cache_rules_origin_h2_max_streams_output,
-  zones_cache_rules_origin_h2_max_streams_value_output,
-  zones_cache_rules_origin_max_http_version_output,
-  zones_cache_rules_origin_max_http_version_value_output,
-  zones_challenge_ttl_output,
-  zones_challenge_ttl_value_output,
-  zones_china_network_enabled_output,
-  zones_china_network_enabled_value_output,
-  zones_ciphers_output,
-  zones_ciphers_value_output,
-  zones_cname_flattening_output,
-  zones_cname_flattening_value_output,
-  zones_content_converter_output,
-  zones_content_converter_value_output,
-  zones_development_mode_output,
-  zones_development_mode_value_output,
-  zones_early_hints_output,
-  zones_early_hints_value_output,
-  zones_edge_cache_ttl_2_output,
-  zones_edge_cache_ttl_value_output,
-  zones_email_obfuscation_2_output,
-  zones_email_obfuscation_value_output,
-  zones_h2_prioritization_output,
-  zones_h2_prioritization_value_output,
-  zones_hotlink_protection_output,
-  zones_hotlink_protection_value_output,
-  zones_http2_output,
-  zones_http2_value_output,
-  zones_http3_output,
-  zones_http3_value_output,
-  zones_image_resizing_output,
-  zones_image_resizing_value_output,
-  zones_ip_geolocation_2_output,
-  zones_ip_geolocation_value_output,
-  zones_ipv6_output,
-  zones_ipv6_value_output,
-  zones_max_upload_output,
-  zones_max_upload_value_output,
-  zones_min_tls_version_output,
-  zones_min_tls_version_value_output,
-  zones_mirage_2_output,
-  zones_mirage_value_output,
-  zones_nel_output,
-  zones_nel_value_output,
-  zones_opportunistic_encryption_2_output,
-  zones_opportunistic_encryption_value_output,
-  zones_opportunistic_onion_output,
-  zones_opportunistic_onion_value_output,
-  zones_orange_to_orange_output,
-  zones_orange_to_orange_value_output,
-  zones_origin_error_page_pass_thru_2_output,
-  zones_origin_error_page_pass_thru_value_output,
-  zones_polish_2_output,
-  zones_polish_value_output,
-  zones_pre_render_output,
-  zones_pre_render_value_output,
-  zones_prefetch_preload_output,
-  zones_prefetch_preload_value_output,
-  zones_privacy_pass_output,
-  zones_privacy_pass_value_output,
-  zones_proxy_read_timeout_output,
-  zones_proxy_read_timeout_value_output,
-  zones_pseudo_ipv4_output,
-  zones_pseudo_ipv4_value_output,
-  zones_redirects_for_ai_training_output,
-  zones_redirects_for_ai_training_value_output,
-  zones_replace_insecure_js_output,
-  zones_replace_insecure_js_value_output,
-  zones_response_buffering_2_output,
-  zones_response_buffering_value_output,
-  zones_rocket_loader_2_output,
-  zones_rocket_loader_value_output,
-  zones_schemas_automatic_platform_optimization_output,
-  zones_search_for_agents_output,
-  zones_search_for_agents_value_output,
-  zones_security_header_output,
-  zones_security_header_value_output,
-  zones_security_level_2_output,
-  zones_security_level_value_output,
-  zones_server_side_exclude_output,
-  zones_server_side_exclude_value_output,
-  zones_setting_output,
-  zones_sha1_support_output,
-  zones_sha1_support_value_output,
-  zones_sort_query_string_for_cache_2_output,
-  zones_sort_query_string_for_cache_value_output,
-  zones_ssl_2_output,
-  zones_ssl_recommender_enabled_output,
-  zones_ssl_recommender_output,
-  zones_ssl_value_output,
-  zones_tls_1_2_only_output,
-  zones_tls_1_2_only_value_output,
-  zones_tls_1_3_output,
-  zones_tls_1_3_value_output,
-  zones_tls_client_auth_output,
-  zones_tls_client_auth_value_output,
-  zones_transformations_allowed_origins_output,
-  zones_transformations_allowed_origins_value_output,
-  zones_transformations_output,
-  zones_true_client_ip_header_2_output,
-  zones_true_client_ip_header_value_output,
-  zones_waf_2_output,
-  zones_waf_value_output,
-  zones_webmcp_enabled_output,
-  zones_webmcp_enabled_value_output,
-  zones_webmcp_mcp_url_output,
-  zones_webmcp_mcp_url_value_output,
-  zones_webmcp_packs_output,
-  zones_webmcp_packs_value_output,
-  zones_webp_output,
-  zones_webp_value_output,
-  zones_websockets_output,
-  zones_websockets_value_output,
-} from "./outputs.js";
-import {
-  zones_0rtt_value,
-  zones_advanced_ddos_value,
-  zones_always_online_value,
-  zones_always_use_https_value,
-  zones_automatic_https_rewrites_value,
+  zones_0rtt,
+  zones_advanced_ddos,
+  zones_always_online,
+  zones_always_use_https$$2,
+  zones_api$$response$$common$$4,
+  zones_api$$response$$common$$failure$$3,
+  zones_automatic_https_rewrites$$2,
   zones_automatic_platform_optimization,
-  zones_brotli_value,
-  zones_browser_cache_ttl_value,
-  zones_browser_check_value,
-  zones_cache_level_value,
-  zones_cache_rules_aegis_value,
-  zones_cache_rules_origin_h2_max_streams_value,
-  zones_cache_rules_origin_max_http_version_value,
-  zones_challenge_ttl_value,
-  zones_china_network_enabled_value,
+  zones_base,
+  zones_brotli,
+  zones_browser_cache_ttl$$2,
+  zones_browser_check$$2,
+  zones_cache$$rules_aegis,
+  zones_cache$$rules_aegis_value,
+  zones_cache$$rules_base,
+  zones_cache$$rules_origin_h2_max_streams,
+  zones_cache$$rules_origin_max_http_version,
+  zones_cache_level$$2,
+  zones_challenge_ttl,
+  zones_china_network_enabled,
+  zones_ciphers,
   zones_ciphers_value,
-  zones_cname_flattening_value,
-  zones_content_converter_value,
-  zones_development_mode_value,
-  zones_early_hints_value,
-  zones_edge_cache_ttl_value,
-  zones_email_obfuscation_value,
-  zones_h2_prioritization_value,
-  zones_hotlink_protection_value,
-  zones_http2_value,
-  zones_http3_value,
-  zones_image_resizing_value,
-  zones_ip_geolocation_value,
-  zones_ipv6_value,
-  zones_max_upload_value,
-  zones_min_tls_version_value,
-  zones_mirage_value,
+  zones_cname_flattening,
+  zones_content_converter,
+  zones_development_mode,
+  zones_early_hints,
+  zones_edge_cache_ttl$$2,
+  zones_email_obfuscation$$2,
+  zones_h2_prioritization,
+  zones_hotlink_protection,
+  zones_http2,
+  zones_http3,
+  zones_image_resizing,
+  zones_ip_geolocation$$2,
+  zones_ipv6,
+  zones_max_upload,
+  zones_min_tls_version,
+  zones_mirage$$2,
+  zones_nel,
   zones_nel_value,
-  zones_opportunistic_encryption_value,
-  zones_opportunistic_onion_value,
-  zones_orange_to_orange_value,
-  zones_origin_error_page_pass_thru_value,
-  zones_polish_value,
-  zones_pre_render_value,
-  zones_prefetch_preload_value,
-  zones_privacy_pass_value,
-  zones_proxy_read_timeout_value,
-  zones_pseudo_ipv4_value,
-  zones_redirects_for_ai_training_value,
-  zones_replace_insecure_js_value,
-  zones_response_buffering_value,
-  zones_rocket_loader_value,
-  zones_search_for_agents_value,
+  zones_opportunistic_encryption$$2,
+  zones_opportunistic_onion,
+  zones_orange_to_orange,
+  zones_origin_error_page_pass_thru$$2,
+  zones_polish$$2,
+  zones_pre_render,
+  zones_prefetch_preload,
+  zones_privacy_pass,
+  zones_proxy_read_timeout,
+  zones_pseudo_ipv4,
+  zones_redirects_for_ai_training,
+  zones_replace_insecure_js,
+  zones_response_buffering$$2,
+  zones_rocket_loader$$2,
+  zones_schemas$$automatic_platform_optimization,
+  zones_search_for_agents,
+  zones_security_header,
   zones_security_header_value,
-  zones_security_level_value,
-  zones_server_side_exclude_value,
-  zones_setting_name,
+  zones_security_level$$2,
+  zones_server_side_exclude,
+  zones_setting,
+  zones_sha1_support,
+  zones_sort_query_string_for_cache$$2,
+  zones_ssl$$2,
+  zones_ssl_recommender,
+  zones_tls_1_2_only,
+  zones_tls_1_3,
+  zones_tls_client_auth,
+  zones_transformations,
+  zones_transformations_allowed_origins,
+  zones_true_client_ip_header$$2,
+  zones_waf$$2,
+  zones_webmcp_enabled,
+  zones_webmcp_mcp_url,
+  zones_webmcp_packs,
+  zones_webp,
+  zones_websockets,
+} from "./outputs.js";
+import {
+  zones_automatic_platform_optimization as zones_automatic_platform_optimization$,
+  zones_cache$$rules_aegis_value as zones_cache$$rules_aegis_value$,
+  zones_ciphers_value as zones_ciphers_value$,
+  zones_nel_value as zones_nel_value$,
+  zones_security_header_value as zones_security_header_value$,
   zones_setting_value,
-  zones_sha1_support_value,
-  zones_sort_query_string_for_cache_value,
-  zones_ssl_recommender_enabled,
-  zones_ssl_value,
-  zones_tls_1_2_only_value,
-  zones_tls_1_3_value,
-  zones_tls_client_auth_value,
-  zones_true_client_ip_header_value,
-  zones_waf_value,
-  zones_webmcp_enabled_value,
-  zones_webmcp_mcp_url_value,
-  zones_webmcp_packs_value,
-  zones_webp_value,
-  zones_websockets_value,
   zones_zone_settings_single_request,
 } from "./schemas.js";
 
@@ -222,96 +99,44 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_settings_edit",
     title: "Edit zone setting",
-    description: "Updates a single zone setting by the identifier",
+    description: "Updates a single zone setting by the identifier\n\nPATCH /zones/{zone_id}/settings/{setting_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/zones_zone_settings_single_request"
         },
-        "setting_id": {
-          "$ref": "#/$defs/zones_setting_name",
-          "description": "Setting name"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "setting_id": {
+              "description": "Setting name",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "setting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "setting_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zones_0rtt_value": zones_0rtt_value,
-        "zones_advanced_ddos_value": zones_advanced_ddos_value,
-        "zones_always_online_value": zones_always_online_value,
-        "zones_always_use_https_value": zones_always_use_https_value,
-        "zones_automatic_https_rewrites_value": zones_automatic_https_rewrites_value,
-        "zones_automatic_platform_optimization": zones_automatic_platform_optimization,
-        "zones_brotli_value": zones_brotli_value,
-        "zones_browser_cache_ttl_value": zones_browser_cache_ttl_value,
-        "zones_browser_check_value": zones_browser_check_value,
-        "zones_cache-rules_aegis_value": zones_cache_rules_aegis_value,
-        "zones_cache-rules_origin_h2_max_streams_value": zones_cache_rules_origin_h2_max_streams_value,
-        "zones_cache-rules_origin_max_http_version_value": zones_cache_rules_origin_max_http_version_value,
-        "zones_cache_level_value": zones_cache_level_value,
-        "zones_challenge_ttl_value": zones_challenge_ttl_value,
-        "zones_china_network_enabled_value": zones_china_network_enabled_value,
-        "zones_ciphers_value": zones_ciphers_value,
-        "zones_cname_flattening_value": zones_cname_flattening_value,
-        "zones_content_converter_value": zones_content_converter_value,
-        "zones_development_mode_value": zones_development_mode_value,
-        "zones_early_hints_value": zones_early_hints_value,
-        "zones_edge_cache_ttl_value": zones_edge_cache_ttl_value,
-        "zones_email_obfuscation_value": zones_email_obfuscation_value,
-        "zones_h2_prioritization_value": zones_h2_prioritization_value,
-        "zones_hotlink_protection_value": zones_hotlink_protection_value,
-        "zones_http2_value": zones_http2_value,
-        "zones_http3_value": zones_http3_value,
-        "zones_identifier": zones_identifier,
-        "zones_image_resizing_value": zones_image_resizing_value,
-        "zones_ip_geolocation_value": zones_ip_geolocation_value,
-        "zones_ipv6_value": zones_ipv6_value,
-        "zones_max_upload_value": zones_max_upload_value,
-        "zones_min_tls_version_value": zones_min_tls_version_value,
-        "zones_mirage_value": zones_mirage_value,
-        "zones_nel_value": zones_nel_value,
-        "zones_opportunistic_encryption_value": zones_opportunistic_encryption_value,
-        "zones_opportunistic_onion_value": zones_opportunistic_onion_value,
-        "zones_orange_to_orange_value": zones_orange_to_orange_value,
-        "zones_origin_error_page_pass_thru_value": zones_origin_error_page_pass_thru_value,
-        "zones_polish_value": zones_polish_value,
-        "zones_pre_render_value": zones_pre_render_value,
-        "zones_prefetch_preload_value": zones_prefetch_preload_value,
-        "zones_privacy_pass_value": zones_privacy_pass_value,
-        "zones_proxy_read_timeout_value": zones_proxy_read_timeout_value,
-        "zones_pseudo_ipv4_value": zones_pseudo_ipv4_value,
-        "zones_redirects_for_ai_training_value": zones_redirects_for_ai_training_value,
-        "zones_replace_insecure_js_value": zones_replace_insecure_js_value,
-        "zones_response_buffering_value": zones_response_buffering_value,
-        "zones_rocket_loader_value": zones_rocket_loader_value,
-        "zones_search_for_agents_value": zones_search_for_agents_value,
-        "zones_security_header_value": zones_security_header_value,
-        "zones_security_level_value": zones_security_level_value,
-        "zones_server_side_exclude_value": zones_server_side_exclude_value,
-        "zones_setting_name": zones_setting_name,
+        "zones_automatic_platform_optimization": zones_automatic_platform_optimization$,
+        "zones_cache-rules_aegis_value": zones_cache$$rules_aegis_value$,
+        "zones_ciphers_value": zones_ciphers_value$,
+        "zones_nel_value": zones_nel_value$,
+        "zones_security_header_value": zones_security_header_value$,
         "zones_setting_value": zones_setting_value,
-        "zones_sha1_support_value": zones_sha1_support_value,
-        "zones_sort_query_string_for_cache_value": zones_sort_query_string_for_cache_value,
-        "zones_ssl_recommender_enabled": zones_ssl_recommender_enabled,
-        "zones_ssl_value": zones_ssl_value,
-        "zones_tls_1_2_only_value": zones_tls_1_2_only_value,
-        "zones_tls_1_3_value": zones_tls_1_3_value,
-        "zones_tls_client_auth_value": zones_tls_client_auth_value,
-        "zones_true_client_ip_header_value": zones_true_client_ip_header_value,
-        "zones_waf_value": zones_waf_value,
-        "zones_webmcp_enabled_value": zones_webmcp_enabled_value,
-        "zones_webmcp_mcp_url_value": zones_webmcp_mcp_url_value,
-        "zones_webmcp_packs_value": zones_webmcp_packs_value,
-        "zones_webp_value": zones_webp_value,
-        "zones_websockets_value": zones_websockets_value,
         "zones_zone_settings_single_request": zones_zone_settings_single_request,
       },
     },
@@ -330,144 +155,83 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_0rtt": zones_0rtt_output,
-        "zones_0rtt_value": zones_0rtt_value_output,
-        "zones_advanced_ddos": zones_advanced_ddos_output,
-        "zones_advanced_ddos_value": zones_advanced_ddos_value_output,
-        "zones_always_online": zones_always_online_output,
-        "zones_always_online_value": zones_always_online_value_output,
-        "zones_always_use_https-2": zones_always_use_https_2_output,
-        "zones_always_use_https_value": zones_always_use_https_value_output,
-        "zones_api-response-common-4": zones_api_response_common_4_output,
-        "zones_automatic_https_rewrites-2": zones_automatic_https_rewrites_2_output,
-        "zones_automatic_https_rewrites_value": zones_automatic_https_rewrites_value_output,
-        "zones_automatic_platform_optimization": zones_automatic_platform_optimization_output,
-        "zones_base": zones_base_output,
-        "zones_brotli": zones_brotli_output,
-        "zones_brotli_value": zones_brotli_value_output,
-        "zones_browser_cache_ttl-2": zones_browser_cache_ttl_2_output,
-        "zones_browser_cache_ttl_value": zones_browser_cache_ttl_value_output,
-        "zones_browser_check-2": zones_browser_check_2_output,
-        "zones_browser_check_value": zones_browser_check_value_output,
-        "zones_cache-rules_aegis": zones_cache_rules_aegis_output,
-        "zones_cache-rules_aegis_value": zones_cache_rules_aegis_value_output,
-        "zones_cache-rules_base": zones_cache_rules_base_output,
-        "zones_cache-rules_origin_h2_max_streams": zones_cache_rules_origin_h2_max_streams_output,
-        "zones_cache-rules_origin_h2_max_streams_value": zones_cache_rules_origin_h2_max_streams_value_output,
-        "zones_cache-rules_origin_max_http_version": zones_cache_rules_origin_max_http_version_output,
-        "zones_cache-rules_origin_max_http_version_value": zones_cache_rules_origin_max_http_version_value_output,
-        "zones_cache_level-2": zones_cache_level_2_output,
-        "zones_cache_level_value": zones_cache_level_value_output,
-        "zones_challenge_ttl": zones_challenge_ttl_output,
-        "zones_challenge_ttl_value": zones_challenge_ttl_value_output,
-        "zones_china_network_enabled": zones_china_network_enabled_output,
-        "zones_china_network_enabled_value": zones_china_network_enabled_value_output,
-        "zones_ciphers": zones_ciphers_output,
-        "zones_ciphers_value": zones_ciphers_value_output,
-        "zones_cname_flattening": zones_cname_flattening_output,
-        "zones_cname_flattening_value": zones_cname_flattening_value_output,
-        "zones_content_converter": zones_content_converter_output,
-        "zones_content_converter_value": zones_content_converter_value_output,
-        "zones_development_mode": zones_development_mode_output,
-        "zones_development_mode_value": zones_development_mode_value_output,
-        "zones_early_hints": zones_early_hints_output,
-        "zones_early_hints_value": zones_early_hints_value_output,
-        "zones_edge_cache_ttl-2": zones_edge_cache_ttl_2_output,
-        "zones_edge_cache_ttl_value": zones_edge_cache_ttl_value_output,
-        "zones_email_obfuscation-2": zones_email_obfuscation_2_output,
-        "zones_email_obfuscation_value": zones_email_obfuscation_value_output,
-        "zones_h2_prioritization": zones_h2_prioritization_output,
-        "zones_h2_prioritization_value": zones_h2_prioritization_value_output,
-        "zones_hotlink_protection": zones_hotlink_protection_output,
-        "zones_hotlink_protection_value": zones_hotlink_protection_value_output,
-        "zones_http2": zones_http2_output,
-        "zones_http2_value": zones_http2_value_output,
-        "zones_http3": zones_http3_output,
-        "zones_http3_value": zones_http3_value_output,
-        "zones_image_resizing": zones_image_resizing_output,
-        "zones_image_resizing_value": zones_image_resizing_value_output,
-        "zones_ip_geolocation-2": zones_ip_geolocation_2_output,
-        "zones_ip_geolocation_value": zones_ip_geolocation_value_output,
-        "zones_ipv6": zones_ipv6_output,
-        "zones_ipv6_value": zones_ipv6_value_output,
-        "zones_max_upload": zones_max_upload_output,
-        "zones_max_upload_value": zones_max_upload_value_output,
-        "zones_messages": zones_messages_output,
-        "zones_min_tls_version": zones_min_tls_version_output,
-        "zones_min_tls_version_value": zones_min_tls_version_value_output,
-        "zones_mirage-2": zones_mirage_2_output,
-        "zones_mirage_value": zones_mirage_value_output,
-        "zones_nel": zones_nel_output,
-        "zones_nel_value": zones_nel_value_output,
-        "zones_opportunistic_encryption-2": zones_opportunistic_encryption_2_output,
-        "zones_opportunistic_encryption_value": zones_opportunistic_encryption_value_output,
-        "zones_opportunistic_onion": zones_opportunistic_onion_output,
-        "zones_opportunistic_onion_value": zones_opportunistic_onion_value_output,
-        "zones_orange_to_orange": zones_orange_to_orange_output,
-        "zones_orange_to_orange_value": zones_orange_to_orange_value_output,
-        "zones_origin_error_page_pass_thru-2": zones_origin_error_page_pass_thru_2_output,
-        "zones_origin_error_page_pass_thru_value": zones_origin_error_page_pass_thru_value_output,
-        "zones_polish-2": zones_polish_2_output,
-        "zones_polish_value": zones_polish_value_output,
-        "zones_pre_render": zones_pre_render_output,
-        "zones_pre_render_value": zones_pre_render_value_output,
-        "zones_prefetch_preload": zones_prefetch_preload_output,
-        "zones_prefetch_preload_value": zones_prefetch_preload_value_output,
-        "zones_privacy_pass": zones_privacy_pass_output,
-        "zones_privacy_pass_value": zones_privacy_pass_value_output,
-        "zones_proxy_read_timeout": zones_proxy_read_timeout_output,
-        "zones_proxy_read_timeout_value": zones_proxy_read_timeout_value_output,
-        "zones_pseudo_ipv4": zones_pseudo_ipv4_output,
-        "zones_pseudo_ipv4_value": zones_pseudo_ipv4_value_output,
-        "zones_redirects_for_ai_training": zones_redirects_for_ai_training_output,
-        "zones_redirects_for_ai_training_value": zones_redirects_for_ai_training_value_output,
-        "zones_replace_insecure_js": zones_replace_insecure_js_output,
-        "zones_replace_insecure_js_value": zones_replace_insecure_js_value_output,
-        "zones_response_buffering-2": zones_response_buffering_2_output,
-        "zones_response_buffering_value": zones_response_buffering_value_output,
-        "zones_rocket_loader-2": zones_rocket_loader_2_output,
-        "zones_rocket_loader_value": zones_rocket_loader_value_output,
-        "zones_schemas-automatic_platform_optimization": zones_schemas_automatic_platform_optimization_output,
-        "zones_search_for_agents": zones_search_for_agents_output,
-        "zones_search_for_agents_value": zones_search_for_agents_value_output,
-        "zones_security_header": zones_security_header_output,
-        "zones_security_header_value": zones_security_header_value_output,
-        "zones_security_level-2": zones_security_level_2_output,
-        "zones_security_level_value": zones_security_level_value_output,
-        "zones_server_side_exclude": zones_server_side_exclude_output,
-        "zones_server_side_exclude_value": zones_server_side_exclude_value_output,
-        "zones_setting": zones_setting_output,
-        "zones_sha1_support": zones_sha1_support_output,
-        "zones_sha1_support_value": zones_sha1_support_value_output,
-        "zones_sort_query_string_for_cache-2": zones_sort_query_string_for_cache_2_output,
-        "zones_sort_query_string_for_cache_value": zones_sort_query_string_for_cache_value_output,
-        "zones_ssl-2": zones_ssl_2_output,
-        "zones_ssl_recommender": zones_ssl_recommender_output,
-        "zones_ssl_recommender_enabled": zones_ssl_recommender_enabled_output,
-        "zones_ssl_value": zones_ssl_value_output,
-        "zones_tls_1_2_only": zones_tls_1_2_only_output,
-        "zones_tls_1_2_only_value": zones_tls_1_2_only_value_output,
-        "zones_tls_1_3": zones_tls_1_3_output,
-        "zones_tls_1_3_value": zones_tls_1_3_value_output,
-        "zones_tls_client_auth": zones_tls_client_auth_output,
-        "zones_tls_client_auth_value": zones_tls_client_auth_value_output,
-        "zones_transformations": zones_transformations_output,
-        "zones_transformations_allowed_origins": zones_transformations_allowed_origins_output,
-        "zones_transformations_allowed_origins_value": zones_transformations_allowed_origins_value_output,
-        "zones_true_client_ip_header-2": zones_true_client_ip_header_2_output,
-        "zones_true_client_ip_header_value": zones_true_client_ip_header_value_output,
-        "zones_waf-2": zones_waf_2_output,
-        "zones_waf_value": zones_waf_value_output,
-        "zones_webmcp_enabled": zones_webmcp_enabled_output,
-        "zones_webmcp_enabled_value": zones_webmcp_enabled_value_output,
-        "zones_webmcp_mcp_url": zones_webmcp_mcp_url_output,
-        "zones_webmcp_mcp_url_value": zones_webmcp_mcp_url_value_output,
-        "zones_webmcp_packs": zones_webmcp_packs_output,
-        "zones_webmcp_packs_value": zones_webmcp_packs_value_output,
-        "zones_webp": zones_webp_output,
-        "zones_webp_value": zones_webp_value_output,
-        "zones_websockets": zones_websockets_output,
-        "zones_websockets_value": zones_websockets_value_output,
+        "zones_0rtt": zones_0rtt,
+        "zones_advanced_ddos": zones_advanced_ddos,
+        "zones_always_online": zones_always_online,
+        "zones_always_use_https-2": zones_always_use_https$$2,
+        "zones_api-response-common-4": zones_api$$response$$common$$4,
+        "zones_automatic_https_rewrites-2": zones_automatic_https_rewrites$$2,
+        "zones_automatic_platform_optimization": zones_automatic_platform_optimization,
+        "zones_base": zones_base,
+        "zones_brotli": zones_brotli,
+        "zones_browser_cache_ttl-2": zones_browser_cache_ttl$$2,
+        "zones_browser_check-2": zones_browser_check$$2,
+        "zones_cache-rules_aegis": zones_cache$$rules_aegis,
+        "zones_cache-rules_aegis_value": zones_cache$$rules_aegis_value,
+        "zones_cache-rules_base": zones_cache$$rules_base,
+        "zones_cache-rules_origin_h2_max_streams": zones_cache$$rules_origin_h2_max_streams,
+        "zones_cache-rules_origin_max_http_version": zones_cache$$rules_origin_max_http_version,
+        "zones_cache_level-2": zones_cache_level$$2,
+        "zones_challenge_ttl": zones_challenge_ttl,
+        "zones_china_network_enabled": zones_china_network_enabled,
+        "zones_ciphers": zones_ciphers,
+        "zones_ciphers_value": zones_ciphers_value,
+        "zones_cname_flattening": zones_cname_flattening,
+        "zones_content_converter": zones_content_converter,
+        "zones_development_mode": zones_development_mode,
+        "zones_early_hints": zones_early_hints,
+        "zones_edge_cache_ttl-2": zones_edge_cache_ttl$$2,
+        "zones_email_obfuscation-2": zones_email_obfuscation$$2,
+        "zones_h2_prioritization": zones_h2_prioritization,
+        "zones_hotlink_protection": zones_hotlink_protection,
+        "zones_http2": zones_http2,
+        "zones_http3": zones_http3,
+        "zones_image_resizing": zones_image_resizing,
+        "zones_ip_geolocation-2": zones_ip_geolocation$$2,
+        "zones_ipv6": zones_ipv6,
+        "zones_max_upload": zones_max_upload,
+        "zones_messages": zones_messages,
+        "zones_min_tls_version": zones_min_tls_version,
+        "zones_mirage-2": zones_mirage$$2,
+        "zones_nel": zones_nel,
+        "zones_nel_value": zones_nel_value,
+        "zones_opportunistic_encryption-2": zones_opportunistic_encryption$$2,
+        "zones_opportunistic_onion": zones_opportunistic_onion,
+        "zones_orange_to_orange": zones_orange_to_orange,
+        "zones_origin_error_page_pass_thru-2": zones_origin_error_page_pass_thru$$2,
+        "zones_polish-2": zones_polish$$2,
+        "zones_pre_render": zones_pre_render,
+        "zones_prefetch_preload": zones_prefetch_preload,
+        "zones_privacy_pass": zones_privacy_pass,
+        "zones_proxy_read_timeout": zones_proxy_read_timeout,
+        "zones_pseudo_ipv4": zones_pseudo_ipv4,
+        "zones_redirects_for_ai_training": zones_redirects_for_ai_training,
+        "zones_replace_insecure_js": zones_replace_insecure_js,
+        "zones_response_buffering-2": zones_response_buffering$$2,
+        "zones_rocket_loader-2": zones_rocket_loader$$2,
+        "zones_schemas-automatic_platform_optimization": zones_schemas$$automatic_platform_optimization,
+        "zones_search_for_agents": zones_search_for_agents,
+        "zones_security_header": zones_security_header,
+        "zones_security_header_value": zones_security_header_value,
+        "zones_security_level-2": zones_security_level$$2,
+        "zones_server_side_exclude": zones_server_side_exclude,
+        "zones_setting": zones_setting,
+        "zones_sha1_support": zones_sha1_support,
+        "zones_sort_query_string_for_cache-2": zones_sort_query_string_for_cache$$2,
+        "zones_ssl-2": zones_ssl$$2,
+        "zones_ssl_recommender": zones_ssl_recommender,
+        "zones_tls_1_2_only": zones_tls_1_2_only,
+        "zones_tls_1_3": zones_tls_1_3,
+        "zones_tls_client_auth": zones_tls_client_auth,
+        "zones_transformations": zones_transformations,
+        "zones_transformations_allowed_origins": zones_transformations_allowed_origins,
+        "zones_true_client_ip_header-2": zones_true_client_ip_header$$2,
+        "zones_waf-2": zones_waf$$2,
+        "zones_webmcp_enabled": zones_webmcp_enabled,
+        "zones_webmcp_mcp_url": zones_webmcp_mcp_url,
+        "zones_webmcp_packs": zones_webmcp_packs,
+        "zones_webp": zones_webp,
+        "zones_websockets": zones_websockets,
       },
     },
     annotations: {
@@ -517,145 +281,84 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_0rtt": zones_0rtt_output,
-        "zones_0rtt_value": zones_0rtt_value_output,
-        "zones_advanced_ddos": zones_advanced_ddos_output,
-        "zones_advanced_ddos_value": zones_advanced_ddos_value_output,
-        "zones_always_online": zones_always_online_output,
-        "zones_always_online_value": zones_always_online_value_output,
-        "zones_always_use_https-2": zones_always_use_https_2_output,
-        "zones_always_use_https_value": zones_always_use_https_value_output,
-        "zones_api-response-common-4": zones_api_response_common_4_output,
-        "zones_api-response-common-failure-3": zones_api_response_common_failure_3_output,
-        "zones_automatic_https_rewrites-2": zones_automatic_https_rewrites_2_output,
-        "zones_automatic_https_rewrites_value": zones_automatic_https_rewrites_value_output,
-        "zones_automatic_platform_optimization": zones_automatic_platform_optimization_output,
-        "zones_base": zones_base_output,
-        "zones_brotli": zones_brotli_output,
-        "zones_brotli_value": zones_brotli_value_output,
-        "zones_browser_cache_ttl-2": zones_browser_cache_ttl_2_output,
-        "zones_browser_cache_ttl_value": zones_browser_cache_ttl_value_output,
-        "zones_browser_check-2": zones_browser_check_2_output,
-        "zones_browser_check_value": zones_browser_check_value_output,
-        "zones_cache-rules_aegis": zones_cache_rules_aegis_output,
-        "zones_cache-rules_aegis_value": zones_cache_rules_aegis_value_output,
-        "zones_cache-rules_base": zones_cache_rules_base_output,
-        "zones_cache-rules_origin_h2_max_streams": zones_cache_rules_origin_h2_max_streams_output,
-        "zones_cache-rules_origin_h2_max_streams_value": zones_cache_rules_origin_h2_max_streams_value_output,
-        "zones_cache-rules_origin_max_http_version": zones_cache_rules_origin_max_http_version_output,
-        "zones_cache-rules_origin_max_http_version_value": zones_cache_rules_origin_max_http_version_value_output,
-        "zones_cache_level-2": zones_cache_level_2_output,
-        "zones_cache_level_value": zones_cache_level_value_output,
-        "zones_challenge_ttl": zones_challenge_ttl_output,
-        "zones_challenge_ttl_value": zones_challenge_ttl_value_output,
-        "zones_china_network_enabled": zones_china_network_enabled_output,
-        "zones_china_network_enabled_value": zones_china_network_enabled_value_output,
-        "zones_ciphers": zones_ciphers_output,
-        "zones_ciphers_value": zones_ciphers_value_output,
-        "zones_cname_flattening": zones_cname_flattening_output,
-        "zones_cname_flattening_value": zones_cname_flattening_value_output,
-        "zones_content_converter": zones_content_converter_output,
-        "zones_content_converter_value": zones_content_converter_value_output,
-        "zones_development_mode": zones_development_mode_output,
-        "zones_development_mode_value": zones_development_mode_value_output,
-        "zones_early_hints": zones_early_hints_output,
-        "zones_early_hints_value": zones_early_hints_value_output,
-        "zones_edge_cache_ttl-2": zones_edge_cache_ttl_2_output,
-        "zones_edge_cache_ttl_value": zones_edge_cache_ttl_value_output,
-        "zones_email_obfuscation-2": zones_email_obfuscation_2_output,
-        "zones_email_obfuscation_value": zones_email_obfuscation_value_output,
-        "zones_h2_prioritization": zones_h2_prioritization_output,
-        "zones_h2_prioritization_value": zones_h2_prioritization_value_output,
-        "zones_hotlink_protection": zones_hotlink_protection_output,
-        "zones_hotlink_protection_value": zones_hotlink_protection_value_output,
-        "zones_http2": zones_http2_output,
-        "zones_http2_value": zones_http2_value_output,
-        "zones_http3": zones_http3_output,
-        "zones_http3_value": zones_http3_value_output,
-        "zones_image_resizing": zones_image_resizing_output,
-        "zones_image_resizing_value": zones_image_resizing_value_output,
-        "zones_ip_geolocation-2": zones_ip_geolocation_2_output,
-        "zones_ip_geolocation_value": zones_ip_geolocation_value_output,
-        "zones_ipv6": zones_ipv6_output,
-        "zones_ipv6_value": zones_ipv6_value_output,
-        "zones_max_upload": zones_max_upload_output,
-        "zones_max_upload_value": zones_max_upload_value_output,
-        "zones_messages": zones_messages_output,
-        "zones_min_tls_version": zones_min_tls_version_output,
-        "zones_min_tls_version_value": zones_min_tls_version_value_output,
-        "zones_mirage-2": zones_mirage_2_output,
-        "zones_mirage_value": zones_mirage_value_output,
-        "zones_nel": zones_nel_output,
-        "zones_nel_value": zones_nel_value_output,
-        "zones_opportunistic_encryption-2": zones_opportunistic_encryption_2_output,
-        "zones_opportunistic_encryption_value": zones_opportunistic_encryption_value_output,
-        "zones_opportunistic_onion": zones_opportunistic_onion_output,
-        "zones_opportunistic_onion_value": zones_opportunistic_onion_value_output,
-        "zones_orange_to_orange": zones_orange_to_orange_output,
-        "zones_orange_to_orange_value": zones_orange_to_orange_value_output,
-        "zones_origin_error_page_pass_thru-2": zones_origin_error_page_pass_thru_2_output,
-        "zones_origin_error_page_pass_thru_value": zones_origin_error_page_pass_thru_value_output,
-        "zones_polish-2": zones_polish_2_output,
-        "zones_polish_value": zones_polish_value_output,
-        "zones_pre_render": zones_pre_render_output,
-        "zones_pre_render_value": zones_pre_render_value_output,
-        "zones_prefetch_preload": zones_prefetch_preload_output,
-        "zones_prefetch_preload_value": zones_prefetch_preload_value_output,
-        "zones_privacy_pass": zones_privacy_pass_output,
-        "zones_privacy_pass_value": zones_privacy_pass_value_output,
-        "zones_proxy_read_timeout": zones_proxy_read_timeout_output,
-        "zones_proxy_read_timeout_value": zones_proxy_read_timeout_value_output,
-        "zones_pseudo_ipv4": zones_pseudo_ipv4_output,
-        "zones_pseudo_ipv4_value": zones_pseudo_ipv4_value_output,
-        "zones_redirects_for_ai_training": zones_redirects_for_ai_training_output,
-        "zones_redirects_for_ai_training_value": zones_redirects_for_ai_training_value_output,
-        "zones_replace_insecure_js": zones_replace_insecure_js_output,
-        "zones_replace_insecure_js_value": zones_replace_insecure_js_value_output,
-        "zones_response_buffering-2": zones_response_buffering_2_output,
-        "zones_response_buffering_value": zones_response_buffering_value_output,
-        "zones_rocket_loader-2": zones_rocket_loader_2_output,
-        "zones_rocket_loader_value": zones_rocket_loader_value_output,
-        "zones_schemas-automatic_platform_optimization": zones_schemas_automatic_platform_optimization_output,
-        "zones_search_for_agents": zones_search_for_agents_output,
-        "zones_search_for_agents_value": zones_search_for_agents_value_output,
-        "zones_security_header": zones_security_header_output,
-        "zones_security_header_value": zones_security_header_value_output,
-        "zones_security_level-2": zones_security_level_2_output,
-        "zones_security_level_value": zones_security_level_value_output,
-        "zones_server_side_exclude": zones_server_side_exclude_output,
-        "zones_server_side_exclude_value": zones_server_side_exclude_value_output,
-        "zones_setting": zones_setting_output,
-        "zones_sha1_support": zones_sha1_support_output,
-        "zones_sha1_support_value": zones_sha1_support_value_output,
-        "zones_sort_query_string_for_cache-2": zones_sort_query_string_for_cache_2_output,
-        "zones_sort_query_string_for_cache_value": zones_sort_query_string_for_cache_value_output,
-        "zones_ssl-2": zones_ssl_2_output,
-        "zones_ssl_recommender": zones_ssl_recommender_output,
-        "zones_ssl_recommender_enabled": zones_ssl_recommender_enabled_output,
-        "zones_ssl_value": zones_ssl_value_output,
-        "zones_tls_1_2_only": zones_tls_1_2_only_output,
-        "zones_tls_1_2_only_value": zones_tls_1_2_only_value_output,
-        "zones_tls_1_3": zones_tls_1_3_output,
-        "zones_tls_1_3_value": zones_tls_1_3_value_output,
-        "zones_tls_client_auth": zones_tls_client_auth_output,
-        "zones_tls_client_auth_value": zones_tls_client_auth_value_output,
-        "zones_transformations": zones_transformations_output,
-        "zones_transformations_allowed_origins": zones_transformations_allowed_origins_output,
-        "zones_transformations_allowed_origins_value": zones_transformations_allowed_origins_value_output,
-        "zones_true_client_ip_header-2": zones_true_client_ip_header_2_output,
-        "zones_true_client_ip_header_value": zones_true_client_ip_header_value_output,
-        "zones_waf-2": zones_waf_2_output,
-        "zones_waf_value": zones_waf_value_output,
-        "zones_webmcp_enabled": zones_webmcp_enabled_output,
-        "zones_webmcp_enabled_value": zones_webmcp_enabled_value_output,
-        "zones_webmcp_mcp_url": zones_webmcp_mcp_url_output,
-        "zones_webmcp_mcp_url_value": zones_webmcp_mcp_url_value_output,
-        "zones_webmcp_packs": zones_webmcp_packs_output,
-        "zones_webmcp_packs_value": zones_webmcp_packs_value_output,
-        "zones_webp": zones_webp_output,
-        "zones_webp_value": zones_webp_value_output,
-        "zones_websockets": zones_websockets_output,
-        "zones_websockets_value": zones_websockets_value_output,
+        "zones_0rtt": zones_0rtt,
+        "zones_advanced_ddos": zones_advanced_ddos,
+        "zones_always_online": zones_always_online,
+        "zones_always_use_https-2": zones_always_use_https$$2,
+        "zones_api-response-common-4": zones_api$$response$$common$$4,
+        "zones_api-response-common-failure-3": zones_api$$response$$common$$failure$$3,
+        "zones_automatic_https_rewrites-2": zones_automatic_https_rewrites$$2,
+        "zones_automatic_platform_optimization": zones_automatic_platform_optimization,
+        "zones_base": zones_base,
+        "zones_brotli": zones_brotli,
+        "zones_browser_cache_ttl-2": zones_browser_cache_ttl$$2,
+        "zones_browser_check-2": zones_browser_check$$2,
+        "zones_cache-rules_aegis": zones_cache$$rules_aegis,
+        "zones_cache-rules_aegis_value": zones_cache$$rules_aegis_value,
+        "zones_cache-rules_base": zones_cache$$rules_base,
+        "zones_cache-rules_origin_h2_max_streams": zones_cache$$rules_origin_h2_max_streams,
+        "zones_cache-rules_origin_max_http_version": zones_cache$$rules_origin_max_http_version,
+        "zones_cache_level-2": zones_cache_level$$2,
+        "zones_challenge_ttl": zones_challenge_ttl,
+        "zones_china_network_enabled": zones_china_network_enabled,
+        "zones_ciphers": zones_ciphers,
+        "zones_ciphers_value": zones_ciphers_value,
+        "zones_cname_flattening": zones_cname_flattening,
+        "zones_content_converter": zones_content_converter,
+        "zones_development_mode": zones_development_mode,
+        "zones_early_hints": zones_early_hints,
+        "zones_edge_cache_ttl-2": zones_edge_cache_ttl$$2,
+        "zones_email_obfuscation-2": zones_email_obfuscation$$2,
+        "zones_h2_prioritization": zones_h2_prioritization,
+        "zones_hotlink_protection": zones_hotlink_protection,
+        "zones_http2": zones_http2,
+        "zones_http3": zones_http3,
+        "zones_image_resizing": zones_image_resizing,
+        "zones_ip_geolocation-2": zones_ip_geolocation$$2,
+        "zones_ipv6": zones_ipv6,
+        "zones_max_upload": zones_max_upload,
+        "zones_messages": zones_messages,
+        "zones_min_tls_version": zones_min_tls_version,
+        "zones_mirage-2": zones_mirage$$2,
+        "zones_nel": zones_nel,
+        "zones_nel_value": zones_nel_value,
+        "zones_opportunistic_encryption-2": zones_opportunistic_encryption$$2,
+        "zones_opportunistic_onion": zones_opportunistic_onion,
+        "zones_orange_to_orange": zones_orange_to_orange,
+        "zones_origin_error_page_pass_thru-2": zones_origin_error_page_pass_thru$$2,
+        "zones_polish-2": zones_polish$$2,
+        "zones_pre_render": zones_pre_render,
+        "zones_prefetch_preload": zones_prefetch_preload,
+        "zones_privacy_pass": zones_privacy_pass,
+        "zones_proxy_read_timeout": zones_proxy_read_timeout,
+        "zones_pseudo_ipv4": zones_pseudo_ipv4,
+        "zones_redirects_for_ai_training": zones_redirects_for_ai_training,
+        "zones_replace_insecure_js": zones_replace_insecure_js,
+        "zones_response_buffering-2": zones_response_buffering$$2,
+        "zones_rocket_loader-2": zones_rocket_loader$$2,
+        "zones_schemas-automatic_platform_optimization": zones_schemas$$automatic_platform_optimization,
+        "zones_search_for_agents": zones_search_for_agents,
+        "zones_security_header": zones_security_header,
+        "zones_security_header_value": zones_security_header_value,
+        "zones_security_level-2": zones_security_level$$2,
+        "zones_server_side_exclude": zones_server_side_exclude,
+        "zones_setting": zones_setting,
+        "zones_sha1_support": zones_sha1_support,
+        "zones_sort_query_string_for_cache-2": zones_sort_query_string_for_cache$$2,
+        "zones_ssl-2": zones_ssl$$2,
+        "zones_ssl_recommender": zones_ssl_recommender,
+        "zones_tls_1_2_only": zones_tls_1_2_only,
+        "zones_tls_1_3": zones_tls_1_3,
+        "zones_tls_client_auth": zones_tls_client_auth,
+        "zones_transformations": zones_transformations,
+        "zones_transformations_allowed_origins": zones_transformations_allowed_origins,
+        "zones_true_client_ip_header-2": zones_true_client_ip_header$$2,
+        "zones_waf-2": zones_waf$$2,
+        "zones_webmcp_enabled": zones_webmcp_enabled,
+        "zones_webmcp_mcp_url": zones_webmcp_mcp_url,
+        "zones_webmcp_packs": zones_webmcp_packs,
+        "zones_webp": zones_webp,
+        "zones_websockets": zones_websockets,
       },
     },
     request: (args) => ({
@@ -666,27 +369,33 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_settings_get",
     title: "Get zone setting",
-    description: "Fetch a single zone setting by name",
+    description: "Fetch a single zone setting by name\n\nGET /zones/{zone_id}/settings/{setting_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "setting_id": {
-          "$ref": "#/$defs/zones_setting_name",
-          "description": "Setting name"
-        },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "setting_id": {
+              "description": "Setting name",
+              "type": "string"
+            },
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id",
+            "setting_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
-        "setting_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier": zones_identifier,
-        "zones_setting_name": zones_setting_name,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -703,144 +412,83 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_0rtt": zones_0rtt_output,
-        "zones_0rtt_value": zones_0rtt_value_output,
-        "zones_advanced_ddos": zones_advanced_ddos_output,
-        "zones_advanced_ddos_value": zones_advanced_ddos_value_output,
-        "zones_always_online": zones_always_online_output,
-        "zones_always_online_value": zones_always_online_value_output,
-        "zones_always_use_https-2": zones_always_use_https_2_output,
-        "zones_always_use_https_value": zones_always_use_https_value_output,
-        "zones_api-response-common-4": zones_api_response_common_4_output,
-        "zones_automatic_https_rewrites-2": zones_automatic_https_rewrites_2_output,
-        "zones_automatic_https_rewrites_value": zones_automatic_https_rewrites_value_output,
-        "zones_automatic_platform_optimization": zones_automatic_platform_optimization_output,
-        "zones_base": zones_base_output,
-        "zones_brotli": zones_brotli_output,
-        "zones_brotli_value": zones_brotli_value_output,
-        "zones_browser_cache_ttl-2": zones_browser_cache_ttl_2_output,
-        "zones_browser_cache_ttl_value": zones_browser_cache_ttl_value_output,
-        "zones_browser_check-2": zones_browser_check_2_output,
-        "zones_browser_check_value": zones_browser_check_value_output,
-        "zones_cache-rules_aegis": zones_cache_rules_aegis_output,
-        "zones_cache-rules_aegis_value": zones_cache_rules_aegis_value_output,
-        "zones_cache-rules_base": zones_cache_rules_base_output,
-        "zones_cache-rules_origin_h2_max_streams": zones_cache_rules_origin_h2_max_streams_output,
-        "zones_cache-rules_origin_h2_max_streams_value": zones_cache_rules_origin_h2_max_streams_value_output,
-        "zones_cache-rules_origin_max_http_version": zones_cache_rules_origin_max_http_version_output,
-        "zones_cache-rules_origin_max_http_version_value": zones_cache_rules_origin_max_http_version_value_output,
-        "zones_cache_level-2": zones_cache_level_2_output,
-        "zones_cache_level_value": zones_cache_level_value_output,
-        "zones_challenge_ttl": zones_challenge_ttl_output,
-        "zones_challenge_ttl_value": zones_challenge_ttl_value_output,
-        "zones_china_network_enabled": zones_china_network_enabled_output,
-        "zones_china_network_enabled_value": zones_china_network_enabled_value_output,
-        "zones_ciphers": zones_ciphers_output,
-        "zones_ciphers_value": zones_ciphers_value_output,
-        "zones_cname_flattening": zones_cname_flattening_output,
-        "zones_cname_flattening_value": zones_cname_flattening_value_output,
-        "zones_content_converter": zones_content_converter_output,
-        "zones_content_converter_value": zones_content_converter_value_output,
-        "zones_development_mode": zones_development_mode_output,
-        "zones_development_mode_value": zones_development_mode_value_output,
-        "zones_early_hints": zones_early_hints_output,
-        "zones_early_hints_value": zones_early_hints_value_output,
-        "zones_edge_cache_ttl-2": zones_edge_cache_ttl_2_output,
-        "zones_edge_cache_ttl_value": zones_edge_cache_ttl_value_output,
-        "zones_email_obfuscation-2": zones_email_obfuscation_2_output,
-        "zones_email_obfuscation_value": zones_email_obfuscation_value_output,
-        "zones_h2_prioritization": zones_h2_prioritization_output,
-        "zones_h2_prioritization_value": zones_h2_prioritization_value_output,
-        "zones_hotlink_protection": zones_hotlink_protection_output,
-        "zones_hotlink_protection_value": zones_hotlink_protection_value_output,
-        "zones_http2": zones_http2_output,
-        "zones_http2_value": zones_http2_value_output,
-        "zones_http3": zones_http3_output,
-        "zones_http3_value": zones_http3_value_output,
-        "zones_image_resizing": zones_image_resizing_output,
-        "zones_image_resizing_value": zones_image_resizing_value_output,
-        "zones_ip_geolocation-2": zones_ip_geolocation_2_output,
-        "zones_ip_geolocation_value": zones_ip_geolocation_value_output,
-        "zones_ipv6": zones_ipv6_output,
-        "zones_ipv6_value": zones_ipv6_value_output,
-        "zones_max_upload": zones_max_upload_output,
-        "zones_max_upload_value": zones_max_upload_value_output,
-        "zones_messages": zones_messages_output,
-        "zones_min_tls_version": zones_min_tls_version_output,
-        "zones_min_tls_version_value": zones_min_tls_version_value_output,
-        "zones_mirage-2": zones_mirage_2_output,
-        "zones_mirage_value": zones_mirage_value_output,
-        "zones_nel": zones_nel_output,
-        "zones_nel_value": zones_nel_value_output,
-        "zones_opportunistic_encryption-2": zones_opportunistic_encryption_2_output,
-        "zones_opportunistic_encryption_value": zones_opportunistic_encryption_value_output,
-        "zones_opportunistic_onion": zones_opportunistic_onion_output,
-        "zones_opportunistic_onion_value": zones_opportunistic_onion_value_output,
-        "zones_orange_to_orange": zones_orange_to_orange_output,
-        "zones_orange_to_orange_value": zones_orange_to_orange_value_output,
-        "zones_origin_error_page_pass_thru-2": zones_origin_error_page_pass_thru_2_output,
-        "zones_origin_error_page_pass_thru_value": zones_origin_error_page_pass_thru_value_output,
-        "zones_polish-2": zones_polish_2_output,
-        "zones_polish_value": zones_polish_value_output,
-        "zones_pre_render": zones_pre_render_output,
-        "zones_pre_render_value": zones_pre_render_value_output,
-        "zones_prefetch_preload": zones_prefetch_preload_output,
-        "zones_prefetch_preload_value": zones_prefetch_preload_value_output,
-        "zones_privacy_pass": zones_privacy_pass_output,
-        "zones_privacy_pass_value": zones_privacy_pass_value_output,
-        "zones_proxy_read_timeout": zones_proxy_read_timeout_output,
-        "zones_proxy_read_timeout_value": zones_proxy_read_timeout_value_output,
-        "zones_pseudo_ipv4": zones_pseudo_ipv4_output,
-        "zones_pseudo_ipv4_value": zones_pseudo_ipv4_value_output,
-        "zones_redirects_for_ai_training": zones_redirects_for_ai_training_output,
-        "zones_redirects_for_ai_training_value": zones_redirects_for_ai_training_value_output,
-        "zones_replace_insecure_js": zones_replace_insecure_js_output,
-        "zones_replace_insecure_js_value": zones_replace_insecure_js_value_output,
-        "zones_response_buffering-2": zones_response_buffering_2_output,
-        "zones_response_buffering_value": zones_response_buffering_value_output,
-        "zones_rocket_loader-2": zones_rocket_loader_2_output,
-        "zones_rocket_loader_value": zones_rocket_loader_value_output,
-        "zones_schemas-automatic_platform_optimization": zones_schemas_automatic_platform_optimization_output,
-        "zones_search_for_agents": zones_search_for_agents_output,
-        "zones_search_for_agents_value": zones_search_for_agents_value_output,
-        "zones_security_header": zones_security_header_output,
-        "zones_security_header_value": zones_security_header_value_output,
-        "zones_security_level-2": zones_security_level_2_output,
-        "zones_security_level_value": zones_security_level_value_output,
-        "zones_server_side_exclude": zones_server_side_exclude_output,
-        "zones_server_side_exclude_value": zones_server_side_exclude_value_output,
-        "zones_setting": zones_setting_output,
-        "zones_sha1_support": zones_sha1_support_output,
-        "zones_sha1_support_value": zones_sha1_support_value_output,
-        "zones_sort_query_string_for_cache-2": zones_sort_query_string_for_cache_2_output,
-        "zones_sort_query_string_for_cache_value": zones_sort_query_string_for_cache_value_output,
-        "zones_ssl-2": zones_ssl_2_output,
-        "zones_ssl_recommender": zones_ssl_recommender_output,
-        "zones_ssl_recommender_enabled": zones_ssl_recommender_enabled_output,
-        "zones_ssl_value": zones_ssl_value_output,
-        "zones_tls_1_2_only": zones_tls_1_2_only_output,
-        "zones_tls_1_2_only_value": zones_tls_1_2_only_value_output,
-        "zones_tls_1_3": zones_tls_1_3_output,
-        "zones_tls_1_3_value": zones_tls_1_3_value_output,
-        "zones_tls_client_auth": zones_tls_client_auth_output,
-        "zones_tls_client_auth_value": zones_tls_client_auth_value_output,
-        "zones_transformations": zones_transformations_output,
-        "zones_transformations_allowed_origins": zones_transformations_allowed_origins_output,
-        "zones_transformations_allowed_origins_value": zones_transformations_allowed_origins_value_output,
-        "zones_true_client_ip_header-2": zones_true_client_ip_header_2_output,
-        "zones_true_client_ip_header_value": zones_true_client_ip_header_value_output,
-        "zones_waf-2": zones_waf_2_output,
-        "zones_waf_value": zones_waf_value_output,
-        "zones_webmcp_enabled": zones_webmcp_enabled_output,
-        "zones_webmcp_enabled_value": zones_webmcp_enabled_value_output,
-        "zones_webmcp_mcp_url": zones_webmcp_mcp_url_output,
-        "zones_webmcp_mcp_url_value": zones_webmcp_mcp_url_value_output,
-        "zones_webmcp_packs": zones_webmcp_packs_output,
-        "zones_webmcp_packs_value": zones_webmcp_packs_value_output,
-        "zones_webp": zones_webp_output,
-        "zones_webp_value": zones_webp_value_output,
-        "zones_websockets": zones_websockets_output,
-        "zones_websockets_value": zones_websockets_value_output,
+        "zones_0rtt": zones_0rtt,
+        "zones_advanced_ddos": zones_advanced_ddos,
+        "zones_always_online": zones_always_online,
+        "zones_always_use_https-2": zones_always_use_https$$2,
+        "zones_api-response-common-4": zones_api$$response$$common$$4,
+        "zones_automatic_https_rewrites-2": zones_automatic_https_rewrites$$2,
+        "zones_automatic_platform_optimization": zones_automatic_platform_optimization,
+        "zones_base": zones_base,
+        "zones_brotli": zones_brotli,
+        "zones_browser_cache_ttl-2": zones_browser_cache_ttl$$2,
+        "zones_browser_check-2": zones_browser_check$$2,
+        "zones_cache-rules_aegis": zones_cache$$rules_aegis,
+        "zones_cache-rules_aegis_value": zones_cache$$rules_aegis_value,
+        "zones_cache-rules_base": zones_cache$$rules_base,
+        "zones_cache-rules_origin_h2_max_streams": zones_cache$$rules_origin_h2_max_streams,
+        "zones_cache-rules_origin_max_http_version": zones_cache$$rules_origin_max_http_version,
+        "zones_cache_level-2": zones_cache_level$$2,
+        "zones_challenge_ttl": zones_challenge_ttl,
+        "zones_china_network_enabled": zones_china_network_enabled,
+        "zones_ciphers": zones_ciphers,
+        "zones_ciphers_value": zones_ciphers_value,
+        "zones_cname_flattening": zones_cname_flattening,
+        "zones_content_converter": zones_content_converter,
+        "zones_development_mode": zones_development_mode,
+        "zones_early_hints": zones_early_hints,
+        "zones_edge_cache_ttl-2": zones_edge_cache_ttl$$2,
+        "zones_email_obfuscation-2": zones_email_obfuscation$$2,
+        "zones_h2_prioritization": zones_h2_prioritization,
+        "zones_hotlink_protection": zones_hotlink_protection,
+        "zones_http2": zones_http2,
+        "zones_http3": zones_http3,
+        "zones_image_resizing": zones_image_resizing,
+        "zones_ip_geolocation-2": zones_ip_geolocation$$2,
+        "zones_ipv6": zones_ipv6,
+        "zones_max_upload": zones_max_upload,
+        "zones_messages": zones_messages,
+        "zones_min_tls_version": zones_min_tls_version,
+        "zones_mirage-2": zones_mirage$$2,
+        "zones_nel": zones_nel,
+        "zones_nel_value": zones_nel_value,
+        "zones_opportunistic_encryption-2": zones_opportunistic_encryption$$2,
+        "zones_opportunistic_onion": zones_opportunistic_onion,
+        "zones_orange_to_orange": zones_orange_to_orange,
+        "zones_origin_error_page_pass_thru-2": zones_origin_error_page_pass_thru$$2,
+        "zones_polish-2": zones_polish$$2,
+        "zones_pre_render": zones_pre_render,
+        "zones_prefetch_preload": zones_prefetch_preload,
+        "zones_privacy_pass": zones_privacy_pass,
+        "zones_proxy_read_timeout": zones_proxy_read_timeout,
+        "zones_pseudo_ipv4": zones_pseudo_ipv4,
+        "zones_redirects_for_ai_training": zones_redirects_for_ai_training,
+        "zones_replace_insecure_js": zones_replace_insecure_js,
+        "zones_response_buffering-2": zones_response_buffering$$2,
+        "zones_rocket_loader-2": zones_rocket_loader$$2,
+        "zones_schemas-automatic_platform_optimization": zones_schemas$$automatic_platform_optimization,
+        "zones_search_for_agents": zones_search_for_agents,
+        "zones_security_header": zones_security_header,
+        "zones_security_header_value": zones_security_header_value,
+        "zones_security_level-2": zones_security_level$$2,
+        "zones_server_side_exclude": zones_server_side_exclude,
+        "zones_setting": zones_setting,
+        "zones_sha1_support": zones_sha1_support,
+        "zones_sort_query_string_for_cache-2": zones_sort_query_string_for_cache$$2,
+        "zones_ssl-2": zones_ssl$$2,
+        "zones_ssl_recommender": zones_ssl_recommender,
+        "zones_tls_1_2_only": zones_tls_1_2_only,
+        "zones_tls_1_3": zones_tls_1_3,
+        "zones_tls_client_auth": zones_tls_client_auth,
+        "zones_transformations": zones_transformations,
+        "zones_transformations_allowed_origins": zones_transformations_allowed_origins,
+        "zones_true_client_ip_header-2": zones_true_client_ip_header$$2,
+        "zones_waf-2": zones_waf$$2,
+        "zones_webmcp_enabled": zones_webmcp_enabled,
+        "zones_webmcp_mcp_url": zones_webmcp_mcp_url,
+        "zones_webmcp_packs": zones_webmcp_packs,
+        "zones_webp": zones_webp,
+        "zones_websockets": zones_websockets,
       },
     },
     annotations: {
@@ -891,145 +539,84 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_0rtt": zones_0rtt_output,
-        "zones_0rtt_value": zones_0rtt_value_output,
-        "zones_advanced_ddos": zones_advanced_ddos_output,
-        "zones_advanced_ddos_value": zones_advanced_ddos_value_output,
-        "zones_always_online": zones_always_online_output,
-        "zones_always_online_value": zones_always_online_value_output,
-        "zones_always_use_https-2": zones_always_use_https_2_output,
-        "zones_always_use_https_value": zones_always_use_https_value_output,
-        "zones_api-response-common-4": zones_api_response_common_4_output,
-        "zones_api-response-common-failure-3": zones_api_response_common_failure_3_output,
-        "zones_automatic_https_rewrites-2": zones_automatic_https_rewrites_2_output,
-        "zones_automatic_https_rewrites_value": zones_automatic_https_rewrites_value_output,
-        "zones_automatic_platform_optimization": zones_automatic_platform_optimization_output,
-        "zones_base": zones_base_output,
-        "zones_brotli": zones_brotli_output,
-        "zones_brotli_value": zones_brotli_value_output,
-        "zones_browser_cache_ttl-2": zones_browser_cache_ttl_2_output,
-        "zones_browser_cache_ttl_value": zones_browser_cache_ttl_value_output,
-        "zones_browser_check-2": zones_browser_check_2_output,
-        "zones_browser_check_value": zones_browser_check_value_output,
-        "zones_cache-rules_aegis": zones_cache_rules_aegis_output,
-        "zones_cache-rules_aegis_value": zones_cache_rules_aegis_value_output,
-        "zones_cache-rules_base": zones_cache_rules_base_output,
-        "zones_cache-rules_origin_h2_max_streams": zones_cache_rules_origin_h2_max_streams_output,
-        "zones_cache-rules_origin_h2_max_streams_value": zones_cache_rules_origin_h2_max_streams_value_output,
-        "zones_cache-rules_origin_max_http_version": zones_cache_rules_origin_max_http_version_output,
-        "zones_cache-rules_origin_max_http_version_value": zones_cache_rules_origin_max_http_version_value_output,
-        "zones_cache_level-2": zones_cache_level_2_output,
-        "zones_cache_level_value": zones_cache_level_value_output,
-        "zones_challenge_ttl": zones_challenge_ttl_output,
-        "zones_challenge_ttl_value": zones_challenge_ttl_value_output,
-        "zones_china_network_enabled": zones_china_network_enabled_output,
-        "zones_china_network_enabled_value": zones_china_network_enabled_value_output,
-        "zones_ciphers": zones_ciphers_output,
-        "zones_ciphers_value": zones_ciphers_value_output,
-        "zones_cname_flattening": zones_cname_flattening_output,
-        "zones_cname_flattening_value": zones_cname_flattening_value_output,
-        "zones_content_converter": zones_content_converter_output,
-        "zones_content_converter_value": zones_content_converter_value_output,
-        "zones_development_mode": zones_development_mode_output,
-        "zones_development_mode_value": zones_development_mode_value_output,
-        "zones_early_hints": zones_early_hints_output,
-        "zones_early_hints_value": zones_early_hints_value_output,
-        "zones_edge_cache_ttl-2": zones_edge_cache_ttl_2_output,
-        "zones_edge_cache_ttl_value": zones_edge_cache_ttl_value_output,
-        "zones_email_obfuscation-2": zones_email_obfuscation_2_output,
-        "zones_email_obfuscation_value": zones_email_obfuscation_value_output,
-        "zones_h2_prioritization": zones_h2_prioritization_output,
-        "zones_h2_prioritization_value": zones_h2_prioritization_value_output,
-        "zones_hotlink_protection": zones_hotlink_protection_output,
-        "zones_hotlink_protection_value": zones_hotlink_protection_value_output,
-        "zones_http2": zones_http2_output,
-        "zones_http2_value": zones_http2_value_output,
-        "zones_http3": zones_http3_output,
-        "zones_http3_value": zones_http3_value_output,
-        "zones_image_resizing": zones_image_resizing_output,
-        "zones_image_resizing_value": zones_image_resizing_value_output,
-        "zones_ip_geolocation-2": zones_ip_geolocation_2_output,
-        "zones_ip_geolocation_value": zones_ip_geolocation_value_output,
-        "zones_ipv6": zones_ipv6_output,
-        "zones_ipv6_value": zones_ipv6_value_output,
-        "zones_max_upload": zones_max_upload_output,
-        "zones_max_upload_value": zones_max_upload_value_output,
-        "zones_messages": zones_messages_output,
-        "zones_min_tls_version": zones_min_tls_version_output,
-        "zones_min_tls_version_value": zones_min_tls_version_value_output,
-        "zones_mirage-2": zones_mirage_2_output,
-        "zones_mirage_value": zones_mirage_value_output,
-        "zones_nel": zones_nel_output,
-        "zones_nel_value": zones_nel_value_output,
-        "zones_opportunistic_encryption-2": zones_opportunistic_encryption_2_output,
-        "zones_opportunistic_encryption_value": zones_opportunistic_encryption_value_output,
-        "zones_opportunistic_onion": zones_opportunistic_onion_output,
-        "zones_opportunistic_onion_value": zones_opportunistic_onion_value_output,
-        "zones_orange_to_orange": zones_orange_to_orange_output,
-        "zones_orange_to_orange_value": zones_orange_to_orange_value_output,
-        "zones_origin_error_page_pass_thru-2": zones_origin_error_page_pass_thru_2_output,
-        "zones_origin_error_page_pass_thru_value": zones_origin_error_page_pass_thru_value_output,
-        "zones_polish-2": zones_polish_2_output,
-        "zones_polish_value": zones_polish_value_output,
-        "zones_pre_render": zones_pre_render_output,
-        "zones_pre_render_value": zones_pre_render_value_output,
-        "zones_prefetch_preload": zones_prefetch_preload_output,
-        "zones_prefetch_preload_value": zones_prefetch_preload_value_output,
-        "zones_privacy_pass": zones_privacy_pass_output,
-        "zones_privacy_pass_value": zones_privacy_pass_value_output,
-        "zones_proxy_read_timeout": zones_proxy_read_timeout_output,
-        "zones_proxy_read_timeout_value": zones_proxy_read_timeout_value_output,
-        "zones_pseudo_ipv4": zones_pseudo_ipv4_output,
-        "zones_pseudo_ipv4_value": zones_pseudo_ipv4_value_output,
-        "zones_redirects_for_ai_training": zones_redirects_for_ai_training_output,
-        "zones_redirects_for_ai_training_value": zones_redirects_for_ai_training_value_output,
-        "zones_replace_insecure_js": zones_replace_insecure_js_output,
-        "zones_replace_insecure_js_value": zones_replace_insecure_js_value_output,
-        "zones_response_buffering-2": zones_response_buffering_2_output,
-        "zones_response_buffering_value": zones_response_buffering_value_output,
-        "zones_rocket_loader-2": zones_rocket_loader_2_output,
-        "zones_rocket_loader_value": zones_rocket_loader_value_output,
-        "zones_schemas-automatic_platform_optimization": zones_schemas_automatic_platform_optimization_output,
-        "zones_search_for_agents": zones_search_for_agents_output,
-        "zones_search_for_agents_value": zones_search_for_agents_value_output,
-        "zones_security_header": zones_security_header_output,
-        "zones_security_header_value": zones_security_header_value_output,
-        "zones_security_level-2": zones_security_level_2_output,
-        "zones_security_level_value": zones_security_level_value_output,
-        "zones_server_side_exclude": zones_server_side_exclude_output,
-        "zones_server_side_exclude_value": zones_server_side_exclude_value_output,
-        "zones_setting": zones_setting_output,
-        "zones_sha1_support": zones_sha1_support_output,
-        "zones_sha1_support_value": zones_sha1_support_value_output,
-        "zones_sort_query_string_for_cache-2": zones_sort_query_string_for_cache_2_output,
-        "zones_sort_query_string_for_cache_value": zones_sort_query_string_for_cache_value_output,
-        "zones_ssl-2": zones_ssl_2_output,
-        "zones_ssl_recommender": zones_ssl_recommender_output,
-        "zones_ssl_recommender_enabled": zones_ssl_recommender_enabled_output,
-        "zones_ssl_value": zones_ssl_value_output,
-        "zones_tls_1_2_only": zones_tls_1_2_only_output,
-        "zones_tls_1_2_only_value": zones_tls_1_2_only_value_output,
-        "zones_tls_1_3": zones_tls_1_3_output,
-        "zones_tls_1_3_value": zones_tls_1_3_value_output,
-        "zones_tls_client_auth": zones_tls_client_auth_output,
-        "zones_tls_client_auth_value": zones_tls_client_auth_value_output,
-        "zones_transformations": zones_transformations_output,
-        "zones_transformations_allowed_origins": zones_transformations_allowed_origins_output,
-        "zones_transformations_allowed_origins_value": zones_transformations_allowed_origins_value_output,
-        "zones_true_client_ip_header-2": zones_true_client_ip_header_2_output,
-        "zones_true_client_ip_header_value": zones_true_client_ip_header_value_output,
-        "zones_waf-2": zones_waf_2_output,
-        "zones_waf_value": zones_waf_value_output,
-        "zones_webmcp_enabled": zones_webmcp_enabled_output,
-        "zones_webmcp_enabled_value": zones_webmcp_enabled_value_output,
-        "zones_webmcp_mcp_url": zones_webmcp_mcp_url_output,
-        "zones_webmcp_mcp_url_value": zones_webmcp_mcp_url_value_output,
-        "zones_webmcp_packs": zones_webmcp_packs_output,
-        "zones_webmcp_packs_value": zones_webmcp_packs_value_output,
-        "zones_webp": zones_webp_output,
-        "zones_webp_value": zones_webp_value_output,
-        "zones_websockets": zones_websockets_output,
-        "zones_websockets_value": zones_websockets_value_output,
+        "zones_0rtt": zones_0rtt,
+        "zones_advanced_ddos": zones_advanced_ddos,
+        "zones_always_online": zones_always_online,
+        "zones_always_use_https-2": zones_always_use_https$$2,
+        "zones_api-response-common-4": zones_api$$response$$common$$4,
+        "zones_api-response-common-failure-3": zones_api$$response$$common$$failure$$3,
+        "zones_automatic_https_rewrites-2": zones_automatic_https_rewrites$$2,
+        "zones_automatic_platform_optimization": zones_automatic_platform_optimization,
+        "zones_base": zones_base,
+        "zones_brotli": zones_brotli,
+        "zones_browser_cache_ttl-2": zones_browser_cache_ttl$$2,
+        "zones_browser_check-2": zones_browser_check$$2,
+        "zones_cache-rules_aegis": zones_cache$$rules_aegis,
+        "zones_cache-rules_aegis_value": zones_cache$$rules_aegis_value,
+        "zones_cache-rules_base": zones_cache$$rules_base,
+        "zones_cache-rules_origin_h2_max_streams": zones_cache$$rules_origin_h2_max_streams,
+        "zones_cache-rules_origin_max_http_version": zones_cache$$rules_origin_max_http_version,
+        "zones_cache_level-2": zones_cache_level$$2,
+        "zones_challenge_ttl": zones_challenge_ttl,
+        "zones_china_network_enabled": zones_china_network_enabled,
+        "zones_ciphers": zones_ciphers,
+        "zones_ciphers_value": zones_ciphers_value,
+        "zones_cname_flattening": zones_cname_flattening,
+        "zones_content_converter": zones_content_converter,
+        "zones_development_mode": zones_development_mode,
+        "zones_early_hints": zones_early_hints,
+        "zones_edge_cache_ttl-2": zones_edge_cache_ttl$$2,
+        "zones_email_obfuscation-2": zones_email_obfuscation$$2,
+        "zones_h2_prioritization": zones_h2_prioritization,
+        "zones_hotlink_protection": zones_hotlink_protection,
+        "zones_http2": zones_http2,
+        "zones_http3": zones_http3,
+        "zones_image_resizing": zones_image_resizing,
+        "zones_ip_geolocation-2": zones_ip_geolocation$$2,
+        "zones_ipv6": zones_ipv6,
+        "zones_max_upload": zones_max_upload,
+        "zones_messages": zones_messages,
+        "zones_min_tls_version": zones_min_tls_version,
+        "zones_mirage-2": zones_mirage$$2,
+        "zones_nel": zones_nel,
+        "zones_nel_value": zones_nel_value,
+        "zones_opportunistic_encryption-2": zones_opportunistic_encryption$$2,
+        "zones_opportunistic_onion": zones_opportunistic_onion,
+        "zones_orange_to_orange": zones_orange_to_orange,
+        "zones_origin_error_page_pass_thru-2": zones_origin_error_page_pass_thru$$2,
+        "zones_polish-2": zones_polish$$2,
+        "zones_pre_render": zones_pre_render,
+        "zones_prefetch_preload": zones_prefetch_preload,
+        "zones_privacy_pass": zones_privacy_pass,
+        "zones_proxy_read_timeout": zones_proxy_read_timeout,
+        "zones_pseudo_ipv4": zones_pseudo_ipv4,
+        "zones_redirects_for_ai_training": zones_redirects_for_ai_training,
+        "zones_replace_insecure_js": zones_replace_insecure_js,
+        "zones_response_buffering-2": zones_response_buffering$$2,
+        "zones_rocket_loader-2": zones_rocket_loader$$2,
+        "zones_schemas-automatic_platform_optimization": zones_schemas$$automatic_platform_optimization,
+        "zones_search_for_agents": zones_search_for_agents,
+        "zones_security_header": zones_security_header,
+        "zones_security_header_value": zones_security_header_value,
+        "zones_security_level-2": zones_security_level$$2,
+        "zones_server_side_exclude": zones_server_side_exclude,
+        "zones_setting": zones_setting,
+        "zones_sha1_support": zones_sha1_support,
+        "zones_sort_query_string_for_cache-2": zones_sort_query_string_for_cache$$2,
+        "zones_ssl-2": zones_ssl$$2,
+        "zones_ssl_recommender": zones_ssl_recommender,
+        "zones_tls_1_2_only": zones_tls_1_2_only,
+        "zones_tls_1_3": zones_tls_1_3,
+        "zones_tls_client_auth": zones_tls_client_auth,
+        "zones_transformations": zones_transformations,
+        "zones_transformations_allowed_origins": zones_transformations_allowed_origins,
+        "zones_true_client_ip_header-2": zones_true_client_ip_header$$2,
+        "zones_waf-2": zones_waf$$2,
+        "zones_webmcp_enabled": zones_webmcp_enabled,
+        "zones_webmcp_mcp_url": zones_webmcp_mcp_url,
+        "zones_webmcp_packs": zones_webmcp_packs,
+        "zones_webp": zones_webp,
+        "zones_websockets": zones_websockets,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/speedBrain/outputs.ts b/src/generated/forge-mcp/zones/speedBrain/outputs.ts
index e8f6b5d31..0e294dce6 100644
--- a/src/generated/forge-mcp/zones/speedBrain/outputs.ts
+++ b/src/generated/forge-mcp/zones/speedBrain/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_cloudflare_speed_brain_response` in responses.
  */
-export const speed_cloudflare_speed_brain_response_output: JsonSchema = {
+export const speed_cloudflare_speed_brain_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
diff --git a/src/generated/forge-mcp/zones/speedBrain/tools.ts b/src/generated/forge-mcp/zones/speedBrain/tools.ts
index 018308fc4..b5cf454e3 100644
--- a/src/generated/forge-mcp/zones/speedBrain/tools.ts
+++ b/src/generated/forge-mcp/zones/speedBrain/tools.ts
@@ -3,22 +3,21 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import { speed_cloudflare_speed_brain_response_output } from "./outputs.js";
+import { speed_cloudflare_speed_brain_response } from "./outputs.js";
 
 /**
- * The tools of `zones.speed_brain`.
+ * The tools of `zones.speedBrain`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_speed_brain_edit",
+    name: "zones_speedBrain_edit",
     title: "Change Cloudflare Speed Brain setting",
-    description: "Speed Brain lets compatible browsers speculate on content which can be prefetched or preloaded, making website\nnavigation faster. Refer to the Cloudflare Speed Brain documentation for more information.",
+    description: "Speed Brain lets compatible browsers speculate on content which can be prefetched or preloaded, making website\nnavigation faster. Refer to the Cloudflare Speed Brain documentation for more information.\n\nPATCH /zones/{zone_id}/settings/speed_brain",
     inputSchema: {
       type: "object",
       properties: {
@@ -38,18 +37,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -66,10 +72,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_cloudflare_speed_brain_response": speed_cloudflare_speed_brain_response_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_cloudflare_speed_brain_response": speed_cloudflare_speed_brain_response,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -119,11 +125,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_cloudflare_speed_brain_response": speed_cloudflare_speed_brain_response_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_cloudflare_speed_brain_response": speed_cloudflare_speed_brain_response,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
@@ -132,23 +138,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_speed_brain_get",
+    name: "zones_speedBrain_get",
     title: "Get Cloudflare Speed Brain setting",
-    description: "Speed Brain lets compatible browsers speculate on content which can be prefetched or preloaded, making website\nnavigation faster. Refer to the Cloudflare Speed Brain documentation for more information.",
+    description: "Speed Brain lets compatible browsers speculate on content which can be prefetched or preloaded, making website\nnavigation faster. Refer to the Cloudflare Speed Brain documentation for more information.\n\nGET /zones/{zone_id}/settings/speed_brain",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -165,10 +178,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_cloudflare_speed_brain_response": speed_cloudflare_speed_brain_response_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_cloudflare_speed_brain_response": speed_cloudflare_speed_brain_response,
+        "speed_messages": speed_messages,
       },
     },
     annotations: {
@@ -219,11 +232,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_cloudflare_speed_brain_response": speed_cloudflare_speed_brain_response_output,
-        "speed_messages": speed_messages_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_cloudflare_speed_brain_response": speed_cloudflare_speed_brain_response,
+        "speed_messages": speed_messages,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/subscriptions/outputs.ts b/src/generated/forge-mcp/zones/subscriptions/outputs.ts
index 71f3954ad..9d400669b 100644
--- a/src/generated/forge-mcp/zones/subscriptions/outputs.ts
+++ b/src/generated/forge-mcp/zones/subscriptions/outputs.ts
@@ -3,31 +3,10 @@
 
 import type { JsonSchema } from "../../_/tool.js";
 
-/**
- * The schema of `bill-subs-api_frequency_response` in responses.
- */
-export const bill_subs_api_frequency_response_output: JsonSchema = {
-  "allOf": [
-    {
-      "$ref": "#/$defs/bill-subs-api_frequency"
-    },
-    {
-      "enum": [
-        "weekly",
-        "monthly",
-        "quarterly",
-        "yearly",
-        "not-applicable"
-      ],
-      "type": "string"
-    }
-  ]
-};
-
 /**
  * The schema of `bill-subs-api_subscription_response` in responses.
  */
-export const bill_subs_api_subscription_response_output: JsonSchema = {
+export const bill$$subs$$api_subscription_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_subscription-v2"
@@ -35,7 +14,27 @@ export const bill_subs_api_subscription_response_output: JsonSchema = {
     {
       "properties": {
         "frequency": {
-          "$ref": "#/$defs/bill-subs-api_frequency_response"
+          "allOf": [
+            {
+              "enum": [
+                "weekly",
+                "monthly",
+                "quarterly",
+                "yearly"
+              ],
+              "type": "string"
+            },
+            {
+              "enum": [
+                "weekly",
+                "monthly",
+                "quarterly",
+                "yearly",
+                "not-applicable"
+              ],
+              "type": "string"
+            }
+          ]
         }
       },
       "type": "object"
@@ -46,7 +45,7 @@ export const bill_subs_api_subscription_response_output: JsonSchema = {
 /**
  * The schema of `bill-subs-api_zone_subscription_response_single` in responses.
  */
-export const bill_subs_api_zone_subscription_response_single_output: JsonSchema = {
+export const bill$$subs$$api_zone_subscription_response_single: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/bill-subs-api_api-response-single"
diff --git a/src/generated/forge-mcp/zones/subscriptions/tools.ts b/src/generated/forge-mcp/zones/subscriptions/tools.ts
index e1c1464bd..950500996 100644
--- a/src/generated/forge-mcp/zones/subscriptions/tools.ts
+++ b/src/generated/forge-mcp/zones/subscriptions/tools.ts
@@ -3,40 +3,26 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  bill_subs_api_api_response_common_failure_output,
-  bill_subs_api_api_response_common_output,
-  bill_subs_api_api_response_single_output,
-  bill_subs_api_component_value_output,
-  bill_subs_api_component_values_output,
-  bill_subs_api_currency_output,
-  bill_subs_api_current_period_end_output,
-  bill_subs_api_current_period_start_output,
-  bill_subs_api_frequency_output,
-  bill_subs_api_identifier_output,
-  bill_subs_api_install_id_output,
-  bill_subs_api_messages_output,
-  bill_subs_api_name_output,
-  bill_subs_api_price_output,
-  bill_subs_api_rate_plan_output,
-  bill_subs_api_schemas_identifier_output,
-  bill_subs_api_state_output,
-  bill_subs_api_subscription_v2_output,
-  bill_subs_api_zone_output,
+  bill$$subs$$api_api$$response$$common,
+  bill$$subs$$api_api$$response$$common$$failure,
+  bill$$subs$$api_api$$response$$single,
+  bill$$subs$$api_component_value,
+  bill$$subs$$api_component_values,
+  bill$$subs$$api_messages,
+  bill$$subs$$api_rate_plan,
+  bill$$subs$$api_subscription$$v2,
+  bill$$subs$$api_zone,
 } from "../../outputs.js";
 import {
-  bill_subs_api_component_value,
-  bill_subs_api_component_values,
-  bill_subs_api_frequency,
-  bill_subs_api_identifier,
-  bill_subs_api_install_id,
-  bill_subs_api_rate_plan,
-  bill_subs_api_subscription_v2,
-  bill_subs_api_zone,
+  bill$$subs$$api_component_value as bill$$subs$$api_component_value$,
+  bill$$subs$$api_component_values as bill$$subs$$api_component_values$,
+  bill$$subs$$api_rate_plan as bill$$subs$$api_rate_plan$,
+  bill$$subs$$api_subscription$$v2 as bill$$subs$$api_subscription$$v2$,
+  bill$$subs$$api_zone as bill$$subs$$api_zone$,
 } from "../../schemas.js";
 import {
-  bill_subs_api_frequency_response_output,
-  bill_subs_api_subscription_response_output,
-  bill_subs_api_zone_subscription_response_single_output,
+  bill$$subs$$api_subscription_response,
+  bill$$subs$$api_zone_subscription_response_single,
 } from "./outputs.js";
 
 /**
@@ -46,57 +32,53 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_subscriptions_create",
     title: "Create Zone Subscription",
-    description: "Create a zone subscription, either plan or add-ons.",
+    description: "Create a zone subscription, either plan or add-ons.\n\nPOST /zones/{zone_id}/subscription",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/bill-subs-api_subscription-v2"
         },
-        "zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_component_value": bill_subs_api_component_value,
-        "bill-subs-api_component_values": bill_subs_api_component_values,
-        "bill-subs-api_frequency": bill_subs_api_frequency,
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_install_id": bill_subs_api_install_id,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2,
-        "bill-subs-api_zone": bill_subs_api_zone,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value$,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values$,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan$,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2$,
+        "bill-subs-api_zone": bill$$subs$$api_zone$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_zone_subscription_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_frequency_response": bill_subs_api_frequency_response_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2_output,
-        "bill-subs-api_subscription_response": bill_subs_api_subscription_response_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
-        "bill-subs-api_zone_subscription_response_single": bill_subs_api_zone_subscription_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_subscription_response": bill$$subs$$api_subscription_response,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
+        "bill-subs-api_zone_subscription_response_single": bill$$subs$$api_zone_subscription_response_single,
       },
     },
     annotations: {
@@ -135,28 +117,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_frequency_response": bill_subs_api_frequency_response_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2_output,
-        "bill-subs-api_subscription_response": bill_subs_api_subscription_response_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
-        "bill-subs-api_zone_subscription_response_single": bill_subs_api_zone_subscription_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_subscription_response": bill$$subs$$api_subscription_response,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
+        "bill-subs-api_zone_subscription_response_single": bill$$subs$$api_zone_subscription_response_single,
       },
     },
     request: (args) => ({
@@ -167,21 +138,28 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_subscriptions_delete",
     title: "Delete Zone Subscription",
-    description: "Deletes a zone's subscription.",
+    description: "Deletes a zone's subscription.\n\nDELETE /zones/{zone_id}/subscription",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -193,7 +171,7 @@ export const tools: readonly Tool[] = [
             "result": {
               "properties": {
                 "subscription_id": {
-                  "$ref": "#/$defs/bill-subs-api_schemas-identifier"
+                  "type": "string"
                 }
               },
               "type": "object"
@@ -203,10 +181,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     annotations: {
@@ -246,7 +223,7 @@ export const tools: readonly Tool[] = [
                 "result": {
                   "properties": {
                     "subscription_id": {
-                      "$ref": "#/$defs/bill-subs-api_schemas-identifier"
+                      "type": "string"
                     }
                   },
                   "type": "object"
@@ -261,11 +238,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
       },
     },
     request: (args) => ({
@@ -275,46 +251,42 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_subscriptions_get",
     title: "Zone Subscription Details",
-    description: "Lists zone subscription details.",
+    description: "Lists zone subscription details.\n\nGET /zones/{zone_id}/subscription",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_zone_subscription_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_frequency_response": bill_subs_api_frequency_response_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2_output,
-        "bill-subs-api_subscription_response": bill_subs_api_subscription_response_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
-        "bill-subs-api_zone_subscription_response_single": bill_subs_api_zone_subscription_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_subscription_response": bill$$subs$$api_subscription_response,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
+        "bill-subs-api_zone_subscription_response_single": bill$$subs$$api_zone_subscription_response_single,
       },
     },
     annotations: {
@@ -353,28 +325,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_frequency_response": bill_subs_api_frequency_response_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2_output,
-        "bill-subs-api_subscription_response": bill_subs_api_subscription_response_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
-        "bill-subs-api_zone_subscription_response_single": bill_subs_api_zone_subscription_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_subscription_response": bill$$subs$$api_subscription_response,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
+        "bill-subs-api_zone_subscription_response_single": bill$$subs$$api_zone_subscription_response_single,
       },
     },
     request: (args) => ({
@@ -384,57 +345,53 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_subscriptions_update",
     title: "Update Zone Subscription",
-    description: "Updates zone subscriptions, either plan or add-ons.",
+    description: "Updates zone subscriptions, either plan or add-ons.\n\nPUT /zones/{zone_id}/subscription",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "$ref": "#/$defs/bill-subs-api_subscription-v2"
         },
-        "zone_id": {
-          "$ref": "#/$defs/bill-subs-api_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "bill-subs-api_component_value": bill_subs_api_component_value,
-        "bill-subs-api_component_values": bill_subs_api_component_values,
-        "bill-subs-api_frequency": bill_subs_api_frequency,
-        "bill-subs-api_identifier": bill_subs_api_identifier,
-        "bill-subs-api_install_id": bill_subs_api_install_id,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2,
-        "bill-subs-api_zone": bill_subs_api_zone,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value$,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values$,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan$,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2$,
+        "bill-subs-api_zone": bill$$subs$$api_zone$,
       },
     },
     outputSchema: {
       "$ref": "#/$defs/bill-subs-api_zone_subscription_response_single",
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_frequency_response": bill_subs_api_frequency_response_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2_output,
-        "bill-subs-api_subscription_response": bill_subs_api_subscription_response_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
-        "bill-subs-api_zone_subscription_response_single": bill_subs_api_zone_subscription_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_subscription_response": bill$$subs$$api_subscription_response,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
+        "bill-subs-api_zone_subscription_response_single": bill$$subs$$api_zone_subscription_response_single,
       },
     },
     annotations: {
@@ -473,28 +430,17 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "bill-subs-api_api-response-common": bill_subs_api_api_response_common_output,
-        "bill-subs-api_api-response-common-failure": bill_subs_api_api_response_common_failure_output,
-        "bill-subs-api_api-response-single": bill_subs_api_api_response_single_output,
-        "bill-subs-api_component_value": bill_subs_api_component_value_output,
-        "bill-subs-api_component_values": bill_subs_api_component_values_output,
-        "bill-subs-api_currency": bill_subs_api_currency_output,
-        "bill-subs-api_current_period_end": bill_subs_api_current_period_end_output,
-        "bill-subs-api_current_period_start": bill_subs_api_current_period_start_output,
-        "bill-subs-api_frequency": bill_subs_api_frequency_output,
-        "bill-subs-api_frequency_response": bill_subs_api_frequency_response_output,
-        "bill-subs-api_identifier": bill_subs_api_identifier_output,
-        "bill-subs-api_install_id": bill_subs_api_install_id_output,
-        "bill-subs-api_messages": bill_subs_api_messages_output,
-        "bill-subs-api_name": bill_subs_api_name_output,
-        "bill-subs-api_price": bill_subs_api_price_output,
-        "bill-subs-api_rate_plan": bill_subs_api_rate_plan_output,
-        "bill-subs-api_schemas-identifier": bill_subs_api_schemas_identifier_output,
-        "bill-subs-api_state": bill_subs_api_state_output,
-        "bill-subs-api_subscription-v2": bill_subs_api_subscription_v2_output,
-        "bill-subs-api_subscription_response": bill_subs_api_subscription_response_output,
-        "bill-subs-api_zone": bill_subs_api_zone_output,
-        "bill-subs-api_zone_subscription_response_single": bill_subs_api_zone_subscription_response_single_output,
+        "bill-subs-api_api-response-common": bill$$subs$$api_api$$response$$common,
+        "bill-subs-api_api-response-common-failure": bill$$subs$$api_api$$response$$common$$failure,
+        "bill-subs-api_api-response-single": bill$$subs$$api_api$$response$$single,
+        "bill-subs-api_component_value": bill$$subs$$api_component_value,
+        "bill-subs-api_component_values": bill$$subs$$api_component_values,
+        "bill-subs-api_messages": bill$$subs$$api_messages,
+        "bill-subs-api_rate_plan": bill$$subs$$api_rate_plan,
+        "bill-subs-api_subscription-v2": bill$$subs$$api_subscription$$v2,
+        "bill-subs-api_subscription_response": bill$$subs$$api_subscription_response,
+        "bill-subs-api_zone": bill$$subs$$api_zone,
+        "bill-subs-api_zone_subscription_response_single": bill$$subs$$api_zone_subscription_response_single,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/tools.ts b/src/generated/forge-mcp/zones/tools.ts
index f35da62a6..4b826048f 100644
--- a/src/generated/forge-mcp/zones/tools.ts
+++ b/src/generated/forge-mcp/zones/tools.ts
@@ -1,25 +1,16 @@
 // Code generated by forge. DO NOT EDIT.
 /* eslint-disable */
 
-import { type Tool, pathParam } from "../_/tool.js";
+import { type Tool, param, pathParam } from "../_/tool.js";
 import {
-  zones_api_response_common_failure_output,
-  zones_api_response_common_output,
-  zones_api_response_single_id_output,
-  zones_identifier_output,
-  zones_messages_output,
-  zones_paused_output,
-  zones_result_info_output,
-  zones_type_output,
-  zones_zone_output,
+  zones_api$$response$$common,
+  zones_api$$response$$common$$failure,
+  zones_api$$response$$single$$id,
+  zones_messages,
+  zones_result_info,
+  zones_zone,
 } from "./outputs.js";
-import {
-  zones_identifier,
-  zones_name,
-  zones_paused,
-  zones_type,
-  zones_vanity_name_servers,
-} from "./schemas.js";
+import { zones_vanity_name_servers } from "./schemas.js";
 
 /**
  * The tools of `zones`.
@@ -28,7 +19,7 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_create",
     title: "Create Zone",
-    description: "Creates a new zone (domain) in your Cloudflare account.\n\nThe zone is created in a pending state and must be activated by updating your domain's\nnameservers to point to Cloudflare, or by completing the verification process for partial\n(CNAME) setups.",
+    description: "Creates a new zone (domain) in your Cloudflare account.\n\nThe zone is created in a pending state and must be activated by updating your domain's\nnameservers to point to Cloudflare, or by completing the verification process for partial\n(CNAME) setups.\n\nPOST /zones",
     inputSchema: {
       type: "object",
       properties: {
@@ -37,20 +28,26 @@ export const tools: readonly Tool[] = [
             "account": {
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/zones_identifier",
-                  "description": "Identifier"
+                  "description": "Identifier",
+                  "type": "string"
                 }
               },
               "type": "object"
             },
             "name": {
-              "$ref": "#/$defs/zones_name",
-              "description": "The domain name. Per [RFC 1035](https://datatracker.ietf.org/doc/html/rfc1035#section-2.3.4) the overall zone name can be up to 253 characters, with each segment (\"label\") not exceeding 63 characters."
+              "description": "The domain name. Per [RFC 1035](https://datatracker.ietf.org/doc/html/rfc1035#section-2.3.4) the overall zone name can be up to 253 characters, with each segment (\"label\") not exceeding 63 characters.",
+              "type": "string"
             },
             "type": {
-              "$ref": "#/$defs/zones_type",
               "default": "full",
-              "description": "A full zone implies that DNS is hosted with Cloudflare. A partial zone is\ntypically a partner-hosted zone or a CNAME setup.\n"
+              "description": "A full zone implies that DNS is hosted with Cloudflare. A partial zone is\ntypically a partner-hosted zone or a CNAME setup.",
+              "enum": [
+                "full",
+                "partial",
+                "secondary",
+                "internal"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -63,11 +60,7 @@ export const tools: readonly Tool[] = [
       required: [
         "body"
       ],
-      $defs: {
-        "zones_identifier": zones_identifier,
-        "zones_name": zones_name,
-        "zones_type": zones_type,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -84,12 +77,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
-        "zones_paused": zones_paused_output,
-        "zones_type": zones_type_output,
-        "zones_zone": zones_zone_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_messages": zones_messages,
+        "zones_zone": zones_zone,
       },
     },
     annotations: {
@@ -129,13 +119,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_api-response-common-failure": zones_api_response_common_failure_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
-        "zones_paused": zones_paused_output,
-        "zones_type": zones_type_output,
-        "zones_zone": zones_zone_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_api-response-common-failure": zones_api$$response$$common$$failure,
+        "zones_messages": zones_messages,
+        "zones_zone": zones_zone,
       },
     },
     request: (args) => ({
@@ -146,29 +133,35 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_delete",
     title: "Delete Zone",
-    description: "Deletes an existing zone.",
+    description: "Deletes an existing zone.\n\nDELETE /zones/{zone_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier": zones_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "$ref": "#/$defs/zones_api-response-single-id",
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_api-response-single-id": zones_api_response_single_id_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_api-response-single-id": zones_api$$response$$single$$id,
+        "zones_messages": zones_messages,
       },
     },
     annotations: {
@@ -206,11 +199,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_api-response-common-failure": zones_api_response_common_failure_output,
-        "zones_api-response-single-id": zones_api_response_single_id_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_api-response-common-failure": zones_api$$response$$common$$failure,
+        "zones_api-response-single-id": zones_api$$response$$single$$id,
+        "zones_messages": zones_messages,
       },
     },
     request: (args) => ({
@@ -220,29 +212,29 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_edit",
     title: "Edit Zone",
-    description: "Edits a zone. Only one zone property can be changed at a time.",
+    description: "Edits a zone. Only one zone property can be changed at a time.\n\nPATCH /zones/{zone_id}",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "paused": {
-              "$ref": "#/$defs/zones_paused",
               "default": false,
-              "description": "Indicates whether the zone is only using Cloudflare DNS services. A\ntrue value means the zone will not receive security or performance\nbenefits.\n"
+              "description": "Indicates whether the zone is only using Cloudflare DNS services. A\ntrue value means the zone will not receive security or performance\nbenefits.",
+              "type": "boolean"
             },
             "plan": {
-              "description": "(Deprecated) Please use the `/zones/{zone_id}/subscription` API\nto update a zone's plan. Changing this value will create/cancel\nassociated subscriptions. To view available plans for this zone,\nsee Zone Plans.\n",
+              "description": "(Deprecated) Please use the `/zones/{zone_id}/subscription` API\nto update a zone's plan. Changing this value will create/cancel\nassociated subscriptions. To view available plans for this zone,\nsee Zone Plans.",
               "properties": {
                 "id": {
-                  "$ref": "#/$defs/zones_identifier",
-                  "description": "Identifier"
+                  "description": "Identifier",
+                  "type": "string"
                 }
               },
               "type": "object"
             },
             "type": {
-              "description": "A full zone implies that DNS is hosted with Cloudflare. A partial\nzone is typically a partner-hosted zone or a CNAME setup. This\nparameter is only available to Enterprise customers or if it has\nbeen explicitly enabled on a zone.\n",
+              "description": "A full zone implies that DNS is hosted with Cloudflare. A partial\nzone is typically a partner-hosted zone or a CNAME setup. This\nparameter is only available to Enterprise customers or if it has\nbeen explicitly enabled on a zone.",
               "enum": [
                 "full",
                 "partial",
@@ -259,18 +251,26 @@ export const tools: readonly Tool[] = [
           },
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "zones_identifier": zones_identifier,
-        "zones_paused": zones_paused,
         "zones_vanity_name_servers": zones_vanity_name_servers,
       },
     },
@@ -289,12 +289,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
-        "zones_paused": zones_paused_output,
-        "zones_type": zones_type_output,
-        "zones_zone": zones_zone_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_messages": zones_messages,
+        "zones_zone": zones_zone,
       },
     },
     annotations: {
@@ -339,13 +336,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_api-response-common-failure": zones_api_response_common_failure_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
-        "zones_paused": zones_paused_output,
-        "zones_type": zones_type_output,
-        "zones_zone": zones_zone_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_api-response-common-failure": zones_api$$response$$common$$failure,
+        "zones_messages": zones_messages,
+        "zones_zone": zones_zone,
       },
     },
     request: (args) => ({
@@ -356,21 +350,28 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_get",
     title: "Zone Details",
-    description: "Retrieves detailed information about a specific zone identified by its zone ID.\n\nReturns zone configuration, status, nameservers, and associated metadata.",
+    description: "Retrieves detailed information about a specific zone identified by its zone ID.\n\nReturns zone configuration, status, nameservers, and associated metadata.\n\nGET /zones/{zone_id}",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/zones_identifier",
-          "description": "Identifier"
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "zones_identifier": zones_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -387,12 +388,9 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
-        "zones_paused": zones_paused_output,
-        "zones_type": zones_type_output,
-        "zones_zone": zones_zone_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_messages": zones_messages,
+        "zones_zone": zones_zone,
       },
     },
     annotations: {
@@ -480,13 +478,10 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_api-response-common-failure": zones_api_response_common_failure_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
-        "zones_paused": zones_paused_output,
-        "zones_type": zones_type_output,
-        "zones_zone": zones_zone_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_api-response-common-failure": zones_api$$response$$common$$failure,
+        "zones_messages": zones_messages,
+        "zones_zone": zones_zone,
       },
     },
     request: (args) => ({
@@ -496,84 +491,91 @@ export const tools: readonly Tool[] = [
   {
     name: "zones_list",
     title: "List Zones",
-    description: "Lists, searches, sorts, and filters your zones. Listing zones across more than 500 accounts\nis currently not allowed.",
+    description: "Lists, searches, sorts, and filters your zones. Listing zones across more than 500 accounts\nis currently not allowed.\n\nGET /zones",
     inputSchema: {
       type: "object",
       properties: {
-        "account_id": {
-          "description": "Filter by an account ID.",
-          "type": "string"
-        },
-        "account_name": {
-          "description": "An account Name. Optional filter operators can be provided to extend refine the search:\n  * `equal` (default)\n  * `not_equal`\n  * `starts_with`\n  * `ends_with`\n  * `contains`\n  * `starts_with_case_sensitive`\n  * `ends_with_case_sensitive`\n  * `contains_case_sensitive`\n",
-          "type": "string"
-        },
-        "direction": {
-          "description": "Direction to order zones.",
-          "enum": [
-            "asc",
-            "desc"
-          ],
-          "type": "string"
-        },
-        "match": {
-          "default": "all",
-          "description": "Whether to match all search requirements or at least one (any).",
-          "enum": [
-            "any",
-            "all"
-          ],
-          "type": "string"
-        },
-        "name": {
-          "description": "A domain name. Optional filter operators can be provided to extend refine the search:\n  * `equal` (default)\n  * `not_equal`\n  * `starts_with`\n  * `ends_with`\n  * `contains`\n  * `starts_with_case_sensitive`\n  * `ends_with_case_sensitive`\n  * `contains_case_sensitive`\n",
-          "type": "string"
-        },
-        "order": {
-          "description": "Field to order zones by.",
-          "enum": [
-            "name",
-            "status",
-            "account.id",
-            "account.name",
-            "plan.id"
-          ],
-          "type": "string"
-        },
-        "page": {
-          "default": 1,
-          "description": "Page number of paginated results.",
-          "type": "number"
-        },
-        "per_page": {
-          "default": 20,
-          "description": "Number of zones per page.",
-          "type": "number"
-        },
-        "status": {
-          "description": "Specify a zone status to filter by.",
-          "enum": [
-            "initializing",
-            "pending",
-            "active",
-            "moved"
-          ],
-          "type": "string"
-        },
-        "type": {
-          "description": "Zone types to filter by. Multiple types can be specified as a comma-separated list (e.g., ?type=full,partial,secondary). When this parameter is not provided, zones with type \"internal\" are excluded from the results.",
-          "items": {
-            "enum": [
-              "full",
-              "partial",
-              "secondary",
-              "internal"
-            ],
-            "type": "string"
+        "query": {
+          "additionalProperties": false,
+          "properties": {
+            "account.id": {
+              "description": "Filter by an account ID.",
+              "type": "string"
+            },
+            "account.name": {
+              "description": "An account Name. Optional filter operators can be provided to extend refine the search:\n  * `equal` (default)\n  * `not_equal`\n  * `starts_with`\n  * `ends_with`\n  * `contains`\n  * `starts_with_case_sensitive`\n  * `ends_with_case_sensitive`\n  * `contains_case_sensitive`",
+              "type": "string"
+            },
+            "direction": {
+              "description": "Direction to order zones.",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            },
+            "match": {
+              "default": "all",
+              "description": "Whether to match all search requirements or at least one (any).",
+              "enum": [
+                "any",
+                "all"
+              ],
+              "type": "string"
+            },
+            "name": {
+              "description": "A domain name. Optional filter operators can be provided to extend refine the search:\n  * `equal` (default)\n  * `not_equal`\n  * `starts_with`\n  * `ends_with`\n  * `contains`\n  * `starts_with_case_sensitive`\n  * `ends_with_case_sensitive`\n  * `contains_case_sensitive`",
+              "type": "string"
+            },
+            "order": {
+              "description": "Field to order zones by.",
+              "enum": [
+                "name",
+                "status",
+                "account.id",
+                "account.name",
+                "plan.id"
+              ],
+              "type": "string"
+            },
+            "page": {
+              "default": 1,
+              "description": "Page number of paginated results.",
+              "type": "number"
+            },
+            "per_page": {
+              "default": 20,
+              "description": "Number of zones per page.",
+              "type": "number"
+            },
+            "status": {
+              "description": "Specify a zone status to filter by.",
+              "enum": [
+                "initializing",
+                "pending",
+                "active",
+                "moved"
+              ],
+              "type": "string"
+            },
+            "type": {
+              "description": "Zone types to filter by. Multiple types can be specified as a comma-separated list (e.g., ?type=full,partial,secondary). When this parameter is not provided, zones with type \"internal\" are excluded from the results.",
+              "items": {
+                "enum": [
+                  "full",
+                  "partial",
+                  "secondary",
+                  "internal"
+                ],
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "type": "array"
+          "type": "object"
         }
       },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -601,13 +603,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
-        "zones_paused": zones_paused_output,
-        "zones_result_info": zones_result_info_output,
-        "zones_type": zones_type_output,
-        "zones_zone": zones_zone_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_messages": zones_messages,
+        "zones_result_info": zones_result_info,
+        "zones_zone": zones_zone,
       },
     },
     annotations: {
@@ -657,29 +656,26 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "zones_api-response-common": zones_api_response_common_output,
-        "zones_api-response-common-failure": zones_api_response_common_failure_output,
-        "zones_identifier": zones_identifier_output,
-        "zones_messages": zones_messages_output,
-        "zones_paused": zones_paused_output,
-        "zones_result_info": zones_result_info_output,
-        "zones_type": zones_type_output,
-        "zones_zone": zones_zone_output,
+        "zones_api-response-common": zones_api$$response$$common,
+        "zones_api-response-common-failure": zones_api$$response$$common$$failure,
+        "zones_messages": zones_messages,
+        "zones_result_info": zones_result_info,
+        "zones_zone": zones_zone,
       },
     },
     request: (args) => ({
       path: `/zones`,
       query: [
-        ["name", args["name"], true],
-        ["status", args["status"], true],
-        ["type", args["type"], false],
-        ["account.id", args["account_id"], true],
-        ["account.name", args["account_name"], true],
-        ["page", args["page"], true],
-        ["per_page", args["per_page"], true],
-        ["order", args["order"], true],
-        ["direction", args["direction"], true],
-        ["match", args["match"], true],
+        ["name", param(args, "query", "name"), true],
+        ["status", param(args, "query", "status"), true],
+        ["type", param(args, "query", "type"), false],
+        ["account.id", param(args, "query", "account.id"), true],
+        ["account.name", param(args, "query", "account.name"), true],
+        ["page", param(args, "query", "page"), true],
+        ["per_page", param(args, "query", "per_page"), true],
+        ["order", param(args, "query", "order"), true],
+        ["direction", param(args, "query", "direction"), true],
+        ["match", param(args, "query", "match"), true],
       ],
     }),
   },
diff --git a/src/generated/forge-mcp/zones/transformationsAllowedOrigins/outputs.ts b/src/generated/forge-mcp/zones/transformationsAllowedOrigins/outputs.ts
index ce7b5ac4b..dc53ae851 100644
--- a/src/generated/forge-mcp/zones/transformationsAllowedOrigins/outputs.ts
+++ b/src/generated/forge-mcp/zones/transformationsAllowedOrigins/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_transformations_allowed_origins_response` in responses.
  */
-export const speed_transformations_allowed_origins_response_output: JsonSchema = {
+export const speed_transformations_allowed_origins_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -20,17 +20,10 @@ export const speed_transformations_allowed_origins_response_output: JsonSchema =
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/speed_transformations_allowed_origins_value"
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `speed_transformations_allowed_origins_value` in responses.
- */
-export const speed_transformations_allowed_origins_value_output: JsonSchema = {
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/transformationsAllowedOrigins/schemas.ts b/src/generated/forge-mcp/zones/transformationsAllowedOrigins/schemas.ts
deleted file mode 100644
index 6fe537f69..000000000
--- a/src/generated/forge-mcp/zones/transformationsAllowedOrigins/schemas.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `speed_transformations_allowed_origins_value`.
- */
-export const speed_transformations_allowed_origins_value: JsonSchema = {
-  "description": "Comma-separated list of allowed origin domains for image and video transformations.\nUse \"*\" to allow all origins (default).\n",
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/transformationsAllowedOrigins/tools.ts b/src/generated/forge-mcp/zones/transformationsAllowedOrigins/tools.ts
index c08b99286..d2c4d8661 100644
--- a/src/generated/forge-mcp/zones/transformationsAllowedOrigins/tools.ts
+++ b/src/generated/forge-mcp/zones/transformationsAllowedOrigins/tools.ts
@@ -3,34 +3,29 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import {
-  speed_transformations_allowed_origins_response_output,
-  speed_transformations_allowed_origins_value_output,
-} from "./outputs.js";
-import { speed_transformations_allowed_origins_value } from "./schemas.js";
+import { speed_transformations_allowed_origins_response } from "./outputs.js";
 
 /**
- * The tools of `zones.transformations_allowed_origins`.
+ * The tools of `zones.transformationsAllowedOrigins`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_transformations_allowed_origins_edit",
+    name: "zones_transformationsAllowedOrigins_edit",
     title: "Change Image Transformations Allowed Origins setting",
-    description: "Media Transformations Allowed Origins restricts transformations for images and video served through\nCloudflare's network to requests originating from specified domains. Refer to the\nImage Transformations and Video Transformations documentation for more information.",
+    description: "Media Transformations Allowed Origins restricts transformations for images and video served through\nCloudflare's network to requests originating from specified domains. Refer to the\nImage Transformations and Video Transformations documentation for more information.\n\nPATCH /zones/{zone_id}/settings/transformations_allowed_origins",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/speed_transformations_allowed_origins_value",
-              "description": "Comma-separated list of allowed origin domains for image and video transformations.\nUse \"*\" to allow all origins (default).\n"
+              "description": "Comma-separated list of allowed origin domains for image and video transformations.\nUse \"*\" to allow all origins (default).",
+              "type": "string"
             }
           },
           "required": [
@@ -38,19 +33,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-        "speed_transformations_allowed_origins_value": speed_transformations_allowed_origins_value,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -67,11 +68,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_allowed_origins_response": speed_transformations_allowed_origins_response_output,
-        "speed_transformations_allowed_origins_value": speed_transformations_allowed_origins_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_allowed_origins_response": speed_transformations_allowed_origins_response,
       },
     },
     annotations: {
@@ -116,12 +116,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_allowed_origins_response": speed_transformations_allowed_origins_response_output,
-        "speed_transformations_allowed_origins_value": speed_transformations_allowed_origins_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_allowed_origins_response": speed_transformations_allowed_origins_response,
       },
     },
     request: (args) => ({
@@ -130,23 +129,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_transformations_allowed_origins_get",
+    name: "zones_transformationsAllowedOrigins_get",
     title: "Get Image Transformations Allowed Origins setting",
-    description: "Media Transformations Allowed Origins restricts transformations for images and video served through\nCloudflare's network to requests originating from specified domains. Refer to the\nImage Transformations and Video Transformations documentation for more information.",
+    description: "Media Transformations Allowed Origins restricts transformations for images and video served through\nCloudflare's network to requests originating from specified domains. Refer to the\nImage Transformations and Video Transformations documentation for more information.\n\nGET /zones/{zone_id}/settings/transformations_allowed_origins",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -163,11 +169,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_allowed_origins_response": speed_transformations_allowed_origins_response_output,
-        "speed_transformations_allowed_origins_value": speed_transformations_allowed_origins_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_allowed_origins_response": speed_transformations_allowed_origins_response,
       },
     },
     annotations: {
@@ -213,12 +218,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_allowed_origins_response": speed_transformations_allowed_origins_response_output,
-        "speed_transformations_allowed_origins_value": speed_transformations_allowed_origins_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_allowed_origins_response": speed_transformations_allowed_origins_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/transformationsC2pa/outputs.ts b/src/generated/forge-mcp/zones/transformationsC2pa/outputs.ts
index 6b71d852b..a061d29a7 100644
--- a/src/generated/forge-mcp/zones/transformationsC2pa/outputs.ts
+++ b/src/generated/forge-mcp/zones/transformationsC2pa/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_transformations_c2pa_response` in responses.
  */
-export const speed_transformations_c2pa_response_output: JsonSchema = {
+export const speed_transformations_c2pa_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -20,21 +20,14 @@ export const speed_transformations_c2pa_response_output: JsonSchema = {
           "type": "string"
         },
         "value": {
-          "$ref": "#/$defs/speed_transformations_c2pa_value"
+          "enum": [
+            "off",
+            "on"
+          ],
+          "type": "string"
         }
       },
       "type": "object"
     }
   ]
 };
-
-/**
- * The schema of `speed_transformations_c2pa_value` in responses.
- */
-export const speed_transformations_c2pa_value_output: JsonSchema = {
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/transformationsC2pa/schemas.ts b/src/generated/forge-mcp/zones/transformationsC2pa/schemas.ts
deleted file mode 100644
index 6dbedc480..000000000
--- a/src/generated/forge-mcp/zones/transformationsC2pa/schemas.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by forge. DO NOT EDIT.
-/* eslint-disable */
-
-import type { JsonSchema } from "../../_/tool.js";
-
-/**
- * The schema of `speed_transformations_c2pa_value`.
- */
-export const speed_transformations_c2pa_value: JsonSchema = {
-  "description": "Whether C2PA signing is enabled for image transformations.",
-  "enum": [
-    "off",
-    "on"
-  ],
-  "type": "string"
-};
diff --git a/src/generated/forge-mcp/zones/transformationsC2pa/tools.ts b/src/generated/forge-mcp/zones/transformationsC2pa/tools.ts
index 9d1da8a7e..26be9e0e7 100644
--- a/src/generated/forge-mcp/zones/transformationsC2pa/tools.ts
+++ b/src/generated/forge-mcp/zones/transformationsC2pa/tools.ts
@@ -3,34 +3,33 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
-import {
-  speed_transformations_c2pa_response_output,
-  speed_transformations_c2pa_value_output,
-} from "./outputs.js";
-import { speed_transformations_c2pa_value } from "./schemas.js";
+import { speed_transformations_c2pa_response } from "./outputs.js";
 
 /**
- * The tools of `zones.transformations_c2pa`.
+ * The tools of `zones.transformationsC2pa`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_transformations_c2pa_edit",
+    name: "zones_transformationsC2pa_edit",
     title: "Change Image Transformations C2PA setting",
-    description: "C2PA (Coalition for Content Provenance and Authenticity) signing adds cryptographic metadata\nto images processed through Cloudflare Image Transformations, enabling verification of image\nauthenticity and provenance.",
+    description: "C2PA (Coalition for Content Provenance and Authenticity) signing adds cryptographic metadata\nto images processed through Cloudflare Image Transformations, enabling verification of image\nauthenticity and provenance.\n\nPATCH /zones/{zone_id}/settings/transformations_c2pa",
     inputSchema: {
       type: "object",
       properties: {
         "body": {
           "properties": {
             "value": {
-              "$ref": "#/$defs/speed_transformations_c2pa_value",
-              "description": "Whether C2PA signing is enabled for image transformations."
+              "description": "Whether C2PA signing is enabled for image transformations.",
+              "enum": [
+                "off",
+                "on"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -38,19 +37,25 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-        "speed_transformations_c2pa_value": speed_transformations_c2pa_value,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -67,11 +72,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_c2pa_response": speed_transformations_c2pa_response_output,
-        "speed_transformations_c2pa_value": speed_transformations_c2pa_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_c2pa_response": speed_transformations_c2pa_response,
       },
     },
     annotations: {
@@ -116,12 +120,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_c2pa_response": speed_transformations_c2pa_response_output,
-        "speed_transformations_c2pa_value": speed_transformations_c2pa_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_c2pa_response": speed_transformations_c2pa_response,
       },
     },
     request: (args) => ({
@@ -130,23 +133,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_transformations_c2pa_get",
+    name: "zones_transformationsC2pa_get",
     title: "Get Image Transformations C2PA setting",
-    description: "C2PA (Coalition for Content Provenance and Authenticity) signing adds cryptographic metadata\nto images processed through Cloudflare Image Transformations, enabling verification of image\nauthenticity and provenance.",
+    description: "C2PA (Coalition for Content Provenance and Authenticity) signing adds cryptographic metadata\nto images processed through Cloudflare Image Transformations, enabling verification of image\nauthenticity and provenance.\n\nGET /zones/{zone_id}/settings/transformations_c2pa",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -163,11 +173,10 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_c2pa_response": speed_transformations_c2pa_response_output,
-        "speed_transformations_c2pa_value": speed_transformations_c2pa_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_c2pa_response": speed_transformations_c2pa_response,
       },
     },
     annotations: {
@@ -213,12 +222,11 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_c2pa_response": speed_transformations_c2pa_response_output,
-        "speed_transformations_c2pa_value": speed_transformations_c2pa_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_c2pa_response": speed_transformations_c2pa_response,
       },
     },
     request: (args) => ({
diff --git a/src/generated/forge-mcp/zones/transformationsConfig/outputs.ts b/src/generated/forge-mcp/zones/transformationsConfig/outputs.ts
index 29b3e58a4..cb5110514 100644
--- a/src/generated/forge-mcp/zones/transformationsConfig/outputs.ts
+++ b/src/generated/forge-mcp/zones/transformationsConfig/outputs.ts
@@ -6,7 +6,7 @@ import type { JsonSchema } from "../../_/tool.js";
 /**
  * The schema of `speed_transformations_config_response` in responses.
  */
-export const speed_transformations_config_response_output: JsonSchema = {
+export const speed_transformations_config_response: JsonSchema = {
   "allOf": [
     {
       "$ref": "#/$defs/speed_base"
@@ -31,7 +31,7 @@ export const speed_transformations_config_response_output: JsonSchema = {
 /**
  * The schema of `speed_transformations_config_value` in responses.
  */
-export const speed_transformations_config_value_output: JsonSchema = {
+export const speed_transformations_config_value: JsonSchema = {
   "properties": {
     "allowed_origins": {
       "type": "string"
diff --git a/src/generated/forge-mcp/zones/transformationsConfig/schemas.ts b/src/generated/forge-mcp/zones/transformationsConfig/schemas.ts
index ccf05a37c..e4426ea87 100644
--- a/src/generated/forge-mcp/zones/transformationsConfig/schemas.ts
+++ b/src/generated/forge-mcp/zones/transformationsConfig/schemas.ts
@@ -7,10 +7,10 @@ import type { JsonSchema } from "../../_/tool.js";
  * The schema of `speed_transformations_config_value`.
  */
 export const speed_transformations_config_value: JsonSchema = {
-  "description": "Combined configuration value for Transformations. All fields are optional on PATCH;\nomitted fields are left unchanged.\n",
+  "description": "Combined configuration value for Transformations. All fields are optional on PATCH;\nomitted fields are left unchanged.",
   "properties": {
     "allowed_origins": {
-      "description": "Comma-separated list of allowed origin domains for image and video transformations.\nUse \"*\" to allow all origins (default).\n",
+      "description": "Comma-separated list of allowed origin domains for image and video transformations.\nUse \"*\" to allow all origins (default).",
       "type": "string"
     },
     "c2pa": {
@@ -22,7 +22,7 @@ export const speed_transformations_config_value: JsonSchema = {
       "type": "string"
     },
     "transformations": {
-      "description": "Controls Image Transformations behavior:\n- \"off\": Feature disabled.\n- \"on\": Transformations enabled for same-zone images only.\n- \"open\": Transformations enabled for images from any origin.\n- \"latest\": Transformations enabled using the latest version.\n",
+      "description": "Controls Image Transformations behavior:\n- \"off\": Feature disabled.\n- \"on\": Transformations enabled for same-zone images only.\n- \"open\": Transformations enabled for images from any origin.\n- \"latest\": Transformations enabled using the latest version.",
       "enum": [
         "off",
         "on",
diff --git a/src/generated/forge-mcp/zones/transformationsConfig/tools.ts b/src/generated/forge-mcp/zones/transformationsConfig/tools.ts
index 5e23eff40..67122b1fe 100644
--- a/src/generated/forge-mcp/zones/transformationsConfig/tools.ts
+++ b/src/generated/forge-mcp/zones/transformationsConfig/tools.ts
@@ -3,26 +3,25 @@
 
 import { type Tool, pathParam } from "../../_/tool.js";
 import {
-  speed_api_response_common_failure_output,
-  speed_api_response_common_output,
-  speed_base_output,
-  speed_messages_output,
+  speed_api$$response$$common,
+  speed_api$$response$$common$$failure,
+  speed_base,
+  speed_messages,
 } from "../../outputs.js";
-import { speed_identifier } from "../../schemas.js";
 import {
-  speed_transformations_config_response_output,
-  speed_transformations_config_value_output,
+  speed_transformations_config_response,
+  speed_transformations_config_value,
 } from "./outputs.js";
-import { speed_transformations_config_value } from "./schemas.js";
+import { speed_transformations_config_value as speed_transformations_config_value$ } from "./schemas.js";
 
 /**
- * The tools of `zones.transformations_config`.
+ * The tools of `zones.transformationsConfig`.
  */
 export const tools: readonly Tool[] = [
   {
-    name: "zones_transformations_config_edit",
+    name: "zones_transformationsConfig_edit",
     title: "Change Transformations configuration",
-    description: "Updates one or more fields of the combined Transformations configuration for a zone.\nOmitted fields are left unchanged. The response always returns the full current state\nof all three sub-settings.",
+    description: "Updates one or more fields of the combined Transformations configuration for a zone.\nOmitted fields are left unchanged. The response always returns the full current state\nof all three sub-settings.\n\nPATCH /zones/{zone_id}/settings/transformations_config",
     inputSchema: {
       type: "object",
       properties: {
@@ -30,7 +29,7 @@ export const tools: readonly Tool[] = [
           "properties": {
             "value": {
               "$ref": "#/$defs/speed_transformations_config_value",
-              "description": "Combined configuration value for Transformations. All fields are optional on PATCH;\nomitted fields are left unchanged.\n"
+              "description": "Combined configuration value for Transformations. All fields are optional on PATCH;\nomitted fields are left unchanged."
             }
           },
           "required": [
@@ -38,18 +37,27 @@ export const tools: readonly Tool[] = [
           ],
           "type": "object"
         },
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id",
+        "path",
         "body"
       ],
+      additionalProperties: false,
       $defs: {
-        "speed_identifier": speed_identifier,
-        "speed_transformations_config_value": speed_transformations_config_value,
+        "speed_transformations_config_value": speed_transformations_config_value$,
       },
     },
     outputSchema: {
@@ -67,11 +75,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_config_response": speed_transformations_config_response_output,
-        "speed_transformations_config_value": speed_transformations_config_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_config_response": speed_transformations_config_response,
+        "speed_transformations_config_value": speed_transformations_config_value,
       },
     },
     annotations: {
@@ -116,12 +124,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_config_response": speed_transformations_config_response_output,
-        "speed_transformations_config_value": speed_transformations_config_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_config_response": speed_transformations_config_response,
+        "speed_transformations_config_value": speed_transformations_config_value,
       },
     },
     request: (args) => ({
@@ -130,23 +138,30 @@ export const tools: readonly Tool[] = [
     }),
   },
   {
-    name: "zones_transformations_config_get",
+    name: "zones_transformationsConfig_get",
     title: "Get Transformations configuration",
-    description: "Returns the combined Transformations configuration for a zone, including the transformations\ntoggle, allowed origins, and C2PA signing settings in a single response.",
+    description: "Returns the combined Transformations configuration for a zone, including the transformations\ntoggle, allowed origins, and C2PA signing settings in a single response.\n\nGET /zones/{zone_id}/settings/transformations_config",
     inputSchema: {
       type: "object",
       properties: {
-        "zone_id": {
-          "$ref": "#/$defs/speed_identifier",
-          "description": "Identifier."
+        "path": {
+          "additionalProperties": false,
+          "properties": {
+            "zone_id": {
+              "description": "Identifier.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "zone_id"
+          ],
+          "type": "object"
         }
       },
       required: [
-        "zone_id"
+        "path"
       ],
-      $defs: {
-        "speed_identifier": speed_identifier,
-      },
+      additionalProperties: false,
     },
     outputSchema: {
       "allOf": [
@@ -163,11 +178,11 @@ export const tools: readonly Tool[] = [
         }
       ],
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_config_response": speed_transformations_config_response_output,
-        "speed_transformations_config_value": speed_transformations_config_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_config_response": speed_transformations_config_response,
+        "speed_transformations_config_value": speed_transformations_config_value,
       },
     },
     annotations: {
@@ -213,12 +228,12 @@ export const tools: readonly Tool[] = [
         }
       },
       $defs: {
-        "speed_api-response-common": speed_api_response_common_output,
-        "speed_api-response-common-failure": speed_api_response_common_failure_output,
-        "speed_base": speed_base_output,
-        "speed_messages": speed_messages_output,
-        "speed_transformations_config_response": speed_transformations_config_response_output,
-        "speed_transformations_config_value": speed_transformations_config_value_output,
+        "speed_api-response-common": speed_api$$response$$common,
+        "speed_api-response-common-failure": speed_api$$response$$common$$failure,
+        "speed_base": speed_base,
+        "speed_messages": speed_messages,
+        "speed_transformations_config_response": speed_transformations_config_response,
+        "speed_transformations_config_value": speed_transformations_config_value,
       },
     },
     request: (args) => ({
diff --git a/src/tools/forge-tools.ts b/src/tools/forge-tools.ts
index 180ba0b02..3546f9814 100644
--- a/src/tools/forge-tools.ts
+++ b/src/tools/forge-tools.ts
@@ -113,7 +113,9 @@ async function callForgeTool(
     case 'invalid':
       return toolError(plan.message)
     case 'needs_account':
-      return toolError(missingAccountMessage(props, FORGE_ACCOUNT_DISCOVERY_GUIDANCE))
+      return toolError(
+        missingAccountMessage(props, FORGE_ACCOUNT_DISCOVERY_GUIDANCE, plan.argument)
+      )
     case 'request':
       break
   }
diff --git a/tests/filtered-lists.test.ts b/tests/filtered-lists.test.ts
index a91a0f4ae..ccfefcf4e 100644
--- a/tests/filtered-lists.test.ts
+++ b/tests/filtered-lists.test.ts
@@ -304,13 +304,13 @@ describe('forge tools', () => {
     answer(`/zones/${ZONE_ID}/access/apps`, cfSuccess([]))
     answer(`/accounts/${ACCOUNT_ID}/access/apps`, cfSuccess([]))
     const apps = (args: Record<string, unknown>) =>
-      callDirectTool(token, 'zero_trust_access_applications_list', args, FORGE_QUERY)
+      callDirectTool(token, 'zeroTrust_access_applications_list', args, FORGE_QUERY)
 
     expectChallenge(
-      await apps({ account_or_zone: 'zones', account_or_zone_id: ZONE_ID }),
+      await apps({ path: { account_or_zone: 'zones', account_or_zone_id: ZONE_ID } }),
       'zone-access.read'
     )
-    expectChallenge(await apps({ account_or_zone: 'accounts' }), 'access.read')
+    expectChallenge(await apps({ path: { account_or_zone: 'accounts' } }), 'access.read')
   })
 })
 
diff --git a/tests/forge-tools-cloudflare.test.ts b/tests/forge-tools-cloudflare.test.ts
index 3b69bbd3c..eff6e4e59 100644
--- a/tests/forge-tools-cloudflare.test.ts
+++ b/tests/forge-tools-cloudflare.test.ts
@@ -14,8 +14,14 @@ function generated(path: string, extensions?: Tool['extensions']): Tool {
     description: 'Example.',
     inputSchema: {
       type: 'object',
-      properties: Object.fromEntries(keys.map((key) => [key, { type: 'string' }])),
-      required: keys
+      properties: {
+        path: {
+          type: 'object',
+          properties: Object.fromEntries(keys.map((key) => [key, { type: 'string' }])),
+          required: keys
+        }
+      },
+      required: ['path']
     },
     annotations: {
       readOnlyHint: true,
@@ -30,29 +36,49 @@ function generated(path: string, extensions?: Tool['extensions']): Tool {
   }
 }
 
+/** The `path` argument of `tool`'s input schema. */
+function pathOf(tool: Tool): {
+  properties: Record<string, unknown>
+  required?: string[]
+} {
+  return tool.inputSchema.properties?.path as {
+    properties: Record<string, unknown>
+    required?: string[]
+  }
+}
+
 describe('the Cloudflare policy for generated tools', () => {
-  it('makes account_id optional with one description', () => {
+  it('makes path.account_id optional with one description', () => {
     const tool = cloudflareTool(generated('/accounts/{account_id}/workers/scripts/{script_name}'))
 
-    expect(tool.inputSchema.properties).toEqual({
-      account_id: { type: 'string', description: FORGE_ACCOUNT_ID_DESCRIPTION },
-      script_name: { type: 'string' }
+    expect(tool.inputSchema.properties?.path).toEqual({
+      type: 'object',
+      properties: {
+        account_id: { type: 'string', description: FORGE_ACCOUNT_ID_DESCRIPTION },
+        script_name: { type: 'string' }
+      },
+      required: ['script_name']
     })
-    expect(tool.inputSchema.required).toEqual(['script_name'])
+    expect(tool.inputSchema.required).toEqual(['path'])
+  })
+
+  it('makes path optional when the account was its only required parameter', () => {
+    const tool = cloudflareTool(generated('/accounts/{account_id}/d1/database'))
+
+    expect(tool.inputSchema.properties?.path).not.toHaveProperty('required')
+    expect(tool.inputSchema).not.toHaveProperty('required')
   })
 
   it('keeps a merged path’s account_or_zone and makes its account_or_zone_id optional', () => {
     const merged = generated('/{account_or_zone}/{account_or_zone_id}/access/apps')
-    const tool = cloudflareTool(merged)
+    const path = pathOf(cloudflareTool(merged))
 
-    expect(tool.inputSchema.properties?.account_or_zone).toBe(
-      merged.inputSchema.properties?.account_or_zone
-    )
-    expect(tool.inputSchema.properties?.account_or_zone_id).toEqual({
+    expect(path.properties.account_or_zone).toBe(pathOf(merged).properties.account_or_zone)
+    expect(path.properties.account_or_zone_id).toEqual({
       type: 'string',
       description: ACCOUNT_OR_ZONE_ID_DESCRIPTION
     })
-    expect(tool.inputSchema.required).toEqual(['account_or_zone'])
+    expect(path.required).toEqual(['account_or_zone'])
   })
 
   it('gets the two values of account_or_zone from the document (cloudflare/forge#59)', () => {
@@ -60,7 +86,7 @@ describe('the Cloudflare policy for generated tools', () => {
 
     expect(merged.length).toBeGreaterThan(0)
     for (const tool of merged) {
-      expect(tool.inputSchema.properties?.account_or_zone).toMatchObject({
+      expect(pathOf(tool).properties.account_or_zone).toMatchObject({
         type: 'string',
         enum: ['accounts', 'zones']
       })
@@ -87,7 +113,7 @@ describe('the Cloudflare policy for generated tools', () => {
     const requiring = tools
       .map(cloudflareTool)
       .filter((tool) =>
-        (tool.inputSchema.required ?? []).some(
+        (tool.inputSchema.properties?.path ? (pathOf(tool).required ?? []) : []).some(
           (key) => key === 'account_id' || key === 'account_or_zone_id'
         )
       )
diff --git a/tests/forge-tools-plan.test.ts b/tests/forge-tools-plan.test.ts
index aae0f7ca7..87226d8cd 100644
--- a/tests/forge-tools-plan.test.ts
+++ b/tests/forge-tools-plan.test.ts
@@ -14,7 +14,7 @@ function plan(name: string, args: Record<string, unknown>, options: Partial<Plan
 
 describe('planning a generated tool call', () => {
   it("fills in the session's account and carries the method's permissions", async () => {
-    const result = await plan('d1_list', { per_page: 5 }, { sessionAccountId: ACCOUNT })
+    const result = await plan('d1_list', { query: { per_page: 5 } }, { sessionAccountId: ACCOUNT })
 
     expect(result).toMatchObject({
       kind: 'request',
@@ -27,12 +27,52 @@ describe('planning a generated tool call', () => {
     expect(result.kind === 'request' && result.headers).not.toHaveProperty('authorization')
   })
 
-  it('asks for an account when the session has several', async () => {
-    expect(await plan('d1_list', {})).toEqual({ kind: 'needs_account' })
+  it('asks for an account when the session has several, naming where it goes', async () => {
+    expect(await plan('d1_list', {})).toEqual({
+      kind: 'needs_account',
+      argument: 'path.account_id'
+    })
+    expect(
+      await plan('zeroTrust_access_applications_list', { path: { account_or_zone: 'accounts' } })
+    ).toEqual({ kind: 'needs_account', argument: 'path.account_or_zone_id' })
+  })
+
+  it('refuses a misspelled parameter and lists the ones its place takes', async () => {
+    expect(await plan('d1_list', { query: { nmae: 'db' } }, { sessionAccountId: ACCOUNT })).toEqual(
+      {
+        kind: 'invalid',
+        message:
+          'Unknown arguments for d1_list: query.nmae is not an argument; query takes name, page, per_page. ' +
+          'It takes path, query.'
+      }
+    )
+  })
+
+  it('reports a misplaced account_id as misplaced, not as a missing account', async () => {
+    const result = await plan('d1_list', { account_id: ACCOUNT })
+
+    expect(result).toMatchObject({ kind: 'invalid' })
+    expect(result.kind === 'invalid' && result.message).toContain('account_id goes in path')
+  })
+
+  it('refuses parameters passed at the top level, and says where they go', async () => {
+    const result = await plan(
+      'd1_list',
+      { account_id: ACCOUNT, per_page: 5, verbose: true },
+      { sessionAccountId: ACCOUNT }
+    )
+
+    expect(result).toEqual({
+      kind: 'invalid',
+      message:
+        'Unknown arguments for d1_list: account_id goes in path: { "path": { "account_id": … } }; ' +
+        'per_page goes in query: { "query": { "per_page": … } }; verbose is not an argument. ' +
+        'It takes path, query.'
+    })
   })
 
   it('keeps an account the caller passed, and sends the body', async () => {
-    const result = await plan('d1_create', { account_id: 'mine', body: { name: 'db' } })
+    const result = await plan('d1_create', { path: { account_id: 'mine' }, body: { name: 'db' } })
 
     expect(result).toMatchObject({
       kind: 'request',
@@ -44,13 +84,12 @@ describe('planning a generated tool call', () => {
   })
 
   it('fills in the account for a merged account-or-zone path called with accounts', async () => {
-    const zone = await plan('zero_trust_access_applications_list', {
-      account_or_zone: 'zones',
-      account_or_zone_id: 'z1'
+    const zone = await plan('zeroTrust_access_applications_list', {
+      path: { account_or_zone: 'zones', account_or_zone_id: 'z1' }
     })
     const account = await plan(
-      'zero_trust_access_applications_list',
-      { account_or_zone: 'accounts' },
+      'zeroTrust_access_applications_list',
+      { path: { account_or_zone: 'accounts' } },
       { sessionAccountId: ACCOUNT }
     )
 
@@ -68,7 +107,15 @@ describe('planning a generated tool call', () => {
   it('reports arguments the request cannot be built from', async () => {
     expect(await plan('zones_get', {})).toEqual({
       kind: 'invalid',
-      message: 'Missing required arguments: zone_id'
+      message: 'Missing required arguments: path'
+    })
+    expect(await plan('zones_get', { path: {} })).toEqual({
+      kind: 'invalid',
+      message: 'Missing required arguments: path.zone_id'
+    })
+    expect(await plan('zones_get', { path: 'z1' })).toEqual({
+      kind: 'invalid',
+      message: 'path must be an object'
     })
   })
 })
diff --git a/tests/forge-tools-worker.test.ts b/tests/forge-tools-worker.test.ts
index 2caaf0c88..15b538eea 100644
--- a/tests/forge-tools-worker.test.ts
+++ b/tests/forge-tools-worker.test.ts
@@ -75,7 +75,8 @@ describe('generated direct tools (?codemode=false&experimentalForge=true)', () =
       ...generatedTools.map((tool) => tool.name)
     ])
     const d1 = tools.find((tool) => tool.name === 'd1_list')!
-    expect(d1.inputSchema.required ?? []).not.toContain('account_id')
+    expect(d1.inputSchema.required ?? []).not.toContain('path')
+    expect(d1.inputSchema.properties?.path).not.toHaveProperty('required')
     expect(generatedTools.find((tool) => tool.name === 'd1_list')?.responses).toBeDefined()
     for (const key of ['request', 'method', 'path', 'extensions', 'responses']) {
       expect(d1).not.toHaveProperty(key)
@@ -134,7 +135,9 @@ describe('generated direct tools (?codemode=false&experimentalForge=true)', () =
       })
     )
 
-    const result = await callForgeTool(ACCOUNT_TOKEN, 'd1_list', { name: 'prod', per_page: 5 })
+    const result = await callForgeTool(ACCOUNT_TOKEN, 'd1_list', {
+      query: { name: 'prod', per_page: 5 }
+    })
 
     expect(result.result?.isError).toBeFalsy()
     expect(toolText(result)).toContain('db-1')
@@ -170,11 +173,11 @@ describe('generated direct tools (?codemode=false&experimentalForge=true)', () =
       )
     )
     const call = (args: Record<string, unknown>) =>
-      callForgeTool(ACCOUNT_TOKEN, 'zero_trust_access_applications_list', args)
+      callForgeTool(ACCOUNT_TOKEN, 'zeroTrust_access_applications_list', args)
 
-    const accounts = await call({ account_or_zone: 'accounts' })
-    const zoneWithoutId = await call({ account_or_zone: 'zones' })
-    const zone = await call({ account_or_zone: 'zones', account_or_zone_id: ZONE_ID })
+    const accounts = await call({ path: { account_or_zone: 'accounts' } })
+    const zoneWithoutId = await call({ path: { account_or_zone: 'zones' } })
+    const zone = await call({ path: { account_or_zone: 'zones', account_or_zone_id: ZONE_ID } })
 
     expect(toolText(accounts)).toContain('app-1')
     expect(zoneWithoutId.result?.isError).toBe(true)
@@ -182,6 +185,31 @@ describe('generated direct tools (?codemode=false&experimentalForge=true)', () =
     expect(toolText(zone)).toContain('zone-app')
   })
 
+  it('asks for path.account_id when the session has several accounts', async () => {
+    mockIdentityProbe({
+      user: { id: 'u1', email: 'u@example.com' },
+      accounts: [
+        { id: ACCOUNT_ID, name: 'Acc One' },
+        { id: '00000000000000000000000000000002', name: 'Acc Two' }
+      ]
+    })
+
+    const result = await callForgeTool('multi-account-user-token-forge', 'd1_list', {})
+
+    expect(result.result?.isError).toBe(true)
+    expect(toolText(result)).toContain(
+      "No account selected. Pass path.account_id with one of this session's accounts:"
+    )
+    expect(toolText(result)).toContain(`- ${ACCOUNT_ID} (Acc One)`)
+  })
+
+  it('refuses a parameter passed at the top level instead of ignoring it', async () => {
+    const result = await callForgeTool(ACCOUNT_TOKEN, 'd1_list', { per_page: 5 })
+
+    expect(result.result?.isError).toBe(true)
+    expect(toolText(result)).toContain('per_page goes in query: { "query": { "per_page": … } }')
+  })
+
   it("explains a refused call and names the token's account", async () => {
     server.use(
       http.get(`${API_BASE}/accounts/not-mine/d1/database`, () =>
@@ -189,7 +217,9 @@ describe('generated direct tools (?codemode=false&experimentalForge=true)', () =
       )
     )
 
-    const result = await callForgeTool(ACCOUNT_TOKEN, 'd1_list', { account_id: 'not-mine' })
+    const result = await callForgeTool(ACCOUNT_TOKEN, 'd1_list', {
+      path: { account_id: 'not-mine' }
+    })
 
     expect(result.result?.isError).toBe(true)
     const text = toolText(result)
@@ -249,7 +279,7 @@ describe('generated direct tools (?codemode=false&experimentalForge=true)', () =
 
     it('returns the whole response by default', async () => {
       const result = await callForgeTool(ACCOUNT_TOKEN, 'workers_legacy_scripts_list', {
-        account_id: ACCOUNT_ID
+        path: { account_id: ACCOUNT_ID }
       })
 
       expect(JSON.parse(toolText(result))).toEqual(cfSuccess(SCRIPTS))
@@ -259,7 +289,7 @@ describe('generated direct tools (?codemode=false&experimentalForge=true)', () =
       const result = await callForgeTool(
         ACCOUNT_TOKEN,
         'workers_legacy_scripts_list',
-        { account_id: ACCOUNT_ID },
+        { path: { account_id: ACCOUNT_ID } },
         `${FORGE_URL}&truncateToolResult=true`
       )
       const text = toolText(result)
@@ -359,7 +389,7 @@ describe('generated direct tools (?codemode=false&experimentalForge=true)', () =
       })
 
       it('leaves structuredContent out of an error', async () => {
-        const result = await callModern('d1_list', { account_id: 'not-mine' })
+        const result = await callModern('d1_list', { path: { account_id: 'not-mine' } })
 
         expect(result.result?.isError).toBe(true)
         expect(result.result).not.toHaveProperty('structuredContent')
diff --git a/tests/response-validation-worker.test.ts b/tests/response-validation-worker.test.ts
index ed153c827..4818853e2 100644
--- a/tests/response-validation-worker.test.ts
+++ b/tests/response-validation-worker.test.ts
@@ -92,7 +92,7 @@ describe('direct-tool response schema checks', () => {
         'd1_list', // the generated tool whose schema was used
         '200',
         'type',
-        '#/components/schemas/d1_database-identifier/type',
+        '#/components/schemas/d1_database-response/properties/uuid/type',
         '/result/*/uuid',
         source.release
       ],
@@ -133,7 +133,7 @@ describe('direct-tool response schema checks', () => {
       'd1_list',
       '200',
       'type',
-      '#/components/schemas/d1_database-identifier/type'
+      '#/components/schemas/d1_database-response/properties/uuid/type'
     ])
   })
 
@@ -146,13 +146,13 @@ describe('direct-tool response schema checks', () => {
     const writeSpy = vi.spyOn(env.MCP_METRICS, 'writeDataPoint')
     vi.spyOn(console, 'warn').mockImplementation(() => {})
 
-    await forgeTool('zero_trust_access_applications_list', { account_or_zone: 'accounts' })
+    await forgeTool('zeroTrust_access_applications_list', { path: { account_or_zone: 'accounts' } })
 
     await vi.waitFor(() => expect(mismatches(writeSpy)).toHaveLength(1))
     expect(mismatches(writeSpy)[0].blobs?.slice(5, 12)).toEqual([
       '/{account_or_zone}/{account_or_zone_id}/access/apps',
       'access',
-      'zero_trust_access_applications_list',
+      'zeroTrust_access_applications_list',
       '200',
       'type',
       '#/components/schemas/access_response_collection-8/allOf/1/properties/result/type',